diff --git a/.github/labeler.yml b/.github/labeler.yml
index f0a8e854b026..f199f9037eca 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -551,7 +551,6 @@
               - pkgs/by-name/*/*tree-sitter*/**/*
               - pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix
               - pkgs/development/python-modules/*tree-sitter*/**/*
-              - pkgs/development/tools/parsing/tree-sitter/**/*
 
 "6.topic: updaters":
   - any:
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 7d6f7ff5e92a..8ef6e37133f5 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -49,7 +49,7 @@ jobs:
 
       - name: Create backport PRs
         id: backport
-        uses: korthout/backport-action@3c06f323a58619da1e8522229ebc8d5de2633e46 # v4.3.0
+        uses: korthout/backport-action@ad30f01dbe543be4a24431001c38f3617af8c745 # v4.4.0
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           add_author_as_reviewer: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dca724aa467a..591516bb93cf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -62,7 +62,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
         with:
           # Sandbox is disabled on MacOS by default.
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index bd640e5f530e..fa16aec65997 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -120,7 +120,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
 
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         continue-on-error: true
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 17fddddde51d..4939fa5ec329 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -132,7 +132,7 @@ jobs:
             core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)
 
       - name: Install Nix
-        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
+        uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
 
       - name: Load supported versions
         id: versions
@@ -180,7 +180,7 @@ jobs:
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
+        uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
 
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         continue-on-error: true
@@ -270,7 +270,7 @@ jobs:
           merge-multiple: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
+        uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
 
       - name: Combine all output paths and eval stats
         run: |
@@ -465,7 +465,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
+        uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
 
       - name: Ensure flake outputs on all systems still evaluate
         run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 43653e3c4b3b..536a4757026c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
 
       # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
       # because the cache would be invalidated on every commit - treefmt checks every file.
@@ -70,7 +70,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
 
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         continue-on-error: true
@@ -100,7 +100,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
+      - uses: cachix/install-nix-action@ab739621df7a23f52766f9ccc97f38da6b7af14f # v31.10.5
 
       - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         continue-on-error: true
diff --git a/ci/OWNERS b/ci/OWNERS
index 7d5d50fd8ff4..cf158b7b9154 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -475,11 +475,12 @@ nixos/tests/incus/                      @adamcstephens
 pkgs/by-name/in/incus/                  @adamcstephens
 pkgs/by-name/lx/lxc*                    @adamcstephens
 
-# Flutter
+# ExpidusOS, Flutter
 /pkgs/development/compilers/flutter @RossComputerGuy
+/pkgs/desktops/expidus              @RossComputerGuy
 
 # GNU Tar & Zip
-/pkgs/tools/archivers/gnutar        @RossComputerGuy
+/pkgs/by-name/gn/gnutar        @RossComputerGuy
 /pkgs/by-name/zi/zip           @RossComputerGuy
 
 # SELinux
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 2ed6c577ecb4..4d651afe092e 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -188,12 +188,7 @@ let
             kernel: rebuilds: lib.nameValuePair "10.rebuild-${kernel}-stdenv" (lib.elem "stdenv" rebuilds)
           ) rebuildsByKernel
           // {
-            "10.rebuild-nixos-tests" =
-              lib.elem "nixosTests.simple" (extractPackageNames diffAttrs.rebuilds)
-              &&
-                # Only set this label when no other label with indication for staging has been set.
-                # This avoids confusion whether to target staging or batch this with kernel updates.
-                lib.last (lib.sort lib.lessThan (lib.attrValues rebuildCountByKernel)) <= 500;
+            "10.rebuild-nixos-tests" = lib.elem "nixosTests.simple" (extractPackageNames diffAttrs.rebuilds);
           };
       }
     );
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index bf6b25b52759..fe4f90ff3baa 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -66,8 +66,9 @@ function runChecklist({
     if (allByName) {
       // We can only determine the below, if all packages are in by-name, since
       // we can't reliably relate changed files to packages outside by-name.
-      checklist[`${user.login} is a maintainer of all touched packages.`] =
-        eligible.has(user.id)
+      checklist[
+        `${user.login} is a maintainer of all touched packages on the ${pull_request.base.ref} branch.`
+      ] = eligible.has(user.id)
     }
   } else {
     // This is only used when no user is passed, i.e. for labeling.
diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md
index 9e5f553a990f..894d52c4b6b6 100644
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@@ -920,14 +920,14 @@ respectively. Otherwise, the fetcher uses `fetchzip`.
 
 This is used with Radicle repositories. The arguments expected are similar to `fetchgit`.
 
-Requires a `seed` argument (e.g. `seed.radicle.xyz` or `rosa.radicle.xyz`) and a `repo` argument
+Requires a `seed` argument (e.g. `seed.radicle.dev` or `rosa.radicle.network`) and a `repo` argument
 (the repository id *without* the `rad:` prefix). Also accepts an optional `node` argument which
 contains the id of the node from which to fetch the specified ref. If `node` is `null` (the
 default), a canonical ref is fetched instead.
 
 ```nix
 fetchFromRadicle {
-  seed = "seed.radicle.xyz";
+  seed = "seed.radicle.dev";
   repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5"; # heartwood
   tag = "releases/1.3.0";
   hash = "sha256-4o88BWKGGOjCIQy7anvzbA/kPOO+ZsLMzXJhE61odjw=";
@@ -942,7 +942,7 @@ contains the full revision id of the Radicle patch to fetch.
 
 ```nix
 fetchRadiclePatch {
-  seed = "rosa.radicle.xyz";
+  seed = "rosa.radicle.network";
   repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5"; # radicle-explorer
   revision = "d97d872386c70607beda2fb3fc2e60449e0f4ce4"; # patch: d77e064
   hash = "sha256-ttnNqj0lhlSP6BGzEhhUOejKkkPruM9yMwA5p9Di4bk=";
diff --git a/doc/build-helpers/special.md b/doc/build-helpers/special.md
index 9da278f094dd..58ff18054c6e 100644
--- a/doc/build-helpers/special.md
+++ b/doc/build-helpers/special.md
@@ -3,6 +3,7 @@
 This chapter describes several special build helpers.
 
 ```{=include=} sections
+special/buildenv.section.md
 special/fakenss.section.md
 special/fhs-environments.section.md
 special/makesetuphook.section.md
diff --git a/doc/build-helpers/special/buildenv.section.md b/doc/build-helpers/special/buildenv.section.md
new file mode 100644
index 000000000000..e21898c2a27f
--- /dev/null
+++ b/doc/build-helpers/special/buildenv.section.md
@@ -0,0 +1,101 @@
+# buildEnv {#sec-buildEnv}
+
+`buildEnv` constructs a derivation containing directories and symbolic links, which resembles the profile layout where a list of derivations or store paths are installed.
+
+Unlike [`symlinkJoin`](#trivial-builder-symlinkJoin), `buildEnv` takes special care of the outputs to link and checks for content collisions across the paths by default.
+A common use case for `buildEnv` is constructing environment wrappers, such as an interpreter with modules or a program with extensions.
+For example, [`python.withPackage`](#attributes-on-interpreters-packages) is based on `buildEnv`.
+
+## Arguments {#sec-buildEnv-arguments}
+
+`buildEnv` takes [fixed-point arguments (`buildEnv (finalAttrs: { })`)](#chap-build-helpers-finalAttrs) as well as a plain attribute set.
+
+Unless otherwise noted, arguments can be overridden directly using [`<pkg>.overrideAttrs`](#sec-pkg-overrideAttrs).
+
+`buildEnv` enforces [structured attributes (`{ __structuredAttrs = true; }`)](https://nix.dev/manual/nix/2.18/language/advanced-attributes.html#adv-attr-structuredAttrs).
+
+- `name` or `pname` and `version` (required):
+    The name of the environment.
+
+- `paths` (required):
+    The derivations or store paths to symlink ("install").
+
+    The elements can be any path-like object that string-interpolates to a store path.
+    The priority of each path is taken from `<path>.meta.priority` and falls back to `lib.meta.defaultPriority` if not set.
+
+    The argument `paths` is passed as attribute `passthru.paths` to prevent unexpected context pollution.
+    `passthru.paths` can be overridden with `<pkg>.overrideAttrs`.
+
+-   `extraOutputsToInstall` (default to `[ ]`):
+    Package outputs to include in addition to what `meta.outputsToInstall` specifies.
+
+-   `includeClosures` (default to `false`):
+    Whether to include closures of all input paths.
+    The list of the closure paths are constructed with `writeClosure`.
+    They are installed with lower priority and with build-time exceptions silenced.
+
+-   `extraPrefix` (default to `""`):
+    Root the result in directory `"$out${extraPrefix}"`, e.g. `"/share"`.
+
+-   `ignoreCollisions` (default: `false`):
+    Don't fail the build upon content collisions.
+
+-   `checkCollisionContents` (default: `true`):
+    If there is a collision, check whether the contents and permissions match; and only if not, throw a collision error.
+
+-   `ignoreSingleFileOutputs` (default: `false`):
+    Don't fail the build upon single-file outputs.
+
+-   `manifest` (default: `""`):
+    The manifest file (if any). A symlink `$out/manifest` will be created to it.
+
+-   `pathsToLink` (default: `[ "/" ]`):
+    The paths (relative to each element of `paths`) that we want to symlink (e.g., `["/bin"]`).
+    Any file outside the directories in this list won't be symlinked into the produced environment.
+
+-   `postBuild` (default: `""`):
+    Shell commands to run after building the symlink tree.
+
+-   `passthru` and `meta` (default: `{ }`):
+    `stdenv.mkDerivation`-supported attributes not passing down to `builtins.derivation`.
+
+-   `derivationArgs` (default: `{ }`):
+    Additional `stdenv.mkDerivation` arguments, such as `nativeBuildInputs`/`buildInputs` for `postBuild` dependencies and setup hooks.
+
+    `derivationArgs` is not passed down to `stdenv.mkDerivation`.
+    Override its attributes directly via `<pkg>.overrideAttrs` and reference directly via `finalAttrs`.
+
+## Build-time exceptions {#sec-buildEnv-exceptions}
+
+There are situations where the specified `paths` might not produce sensible profile layout.
+By default, the builder fails early upon detecting these exceptions.
+`buildEnv` provides arguments to fine-tune or ignore certain exceptions.
+
+### Path collisions {#ssec-buildEnv-collisions}
+
+Path collisions occur when files provided by two more output paths with the same priority overlap with each other, making the result profile layout potentially affected by the order of elements of `paths`.
+This is undesirable in several use cases, such as when `paths` are determined by merging Nix modules.
+
+If the argument `checkCollisionContents` is `true`, the builder checks whether the overlapping paths share the same content and mode, and fails only if not.
+
+The argument `ignoreCollisions` silence the collision checks and allow the files to be overwritten based on the order of chosen output paths.
+
+In addition to silencing this exception with `ignoreCollisions`, one can also adjust the priority of colliding packages and store paths.
+Store paths can specify priority in the form
+
+```nix
+{
+  outPath = <path>;
+  meta.priority = <priority>;
+}
+```
+
+And [`lib.meta.setPrio`](#function-library-lib.meta.setPrio)-related Nixpkgs Library functions also apply to a string-like attribute set (`{ outPath = <path>; }`).
+
+### Single-file outputs {#ssec-buildEnv-singleFileOutputs}
+
+When an output path provides a single file instead of a directory, it inherently cannot merge into the result layout.
+All discoverable packages should configure their `meta.outputsToInstall` correctly, so that single-file outputs won't be installed into a profile.
+
+Set `ignoreSingleFileOutputs` to `true` to drop all single-file output paths silently.
+This option is useful when the specified paths contain the output paths of package tests.
diff --git a/doc/hooks/npm-config-hook.section.md b/doc/hooks/npm-config-hook.section.md
index 0b1298457605..1b931c4c1c61 100644
--- a/doc/hooks/npm-config-hook.section.md
+++ b/doc/hooks/npm-config-hook.section.md
@@ -13,7 +13,7 @@ Primarily made for a multi-language environment.
 
 #### `npmDeps` {#npm-config-hook-deps}
 
-Derivation that contains the NPM package dependencies.
+Derivation that contains the npm package dependencies.
 Usually built with `fetchNpmDeps`.
 This attribute is required or the hook will abort the build.
 
diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md
index 33fa5128ea44..7b643efa30d8 100644
--- a/doc/languages-frameworks/beam.section.md
+++ b/doc/languages-frameworks/beam.section.md
@@ -93,7 +93,7 @@ there are 3 steps: frontend dependencies (javascript), backend dependencies (eli
 
 ##### mixRelease - Frontend dependencies (javascript) {#mix-release-javascript-deps}
 
-For phoenix projects, inside of Nixpkgs you can either use yarn2nix (mkYarnModule) or node2nix. An example with yarn2nix can be found [here](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39). An example with node2nix will follow. To package something outside of nixpkgs, you have alternatives like [npmlock2nix](https://github.com/nix-community/npmlock2nix) or [nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage)
+For phoenix projects, inside of Nixpkgs you can either use `fetchYarnDeps` or `buildNpmPackage`. An example with `fetchYarnDeps` can be found [here](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/pl/plausible/package.nix). An example with `fetchYarnDeps` will follow. To package something outside of nixpkgs, you have alternatives like [npmlock2nix](https://github.com/nix-community/npmlock2nix) or [nix-npm-buildpackage](https://github.com/serokell/nix-npm-buildpackage)
 
 ##### mixRelease - backend dependencies (mix) {#mix-release-mix-deps}
 
diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index d4594751e55d..362130e5ba5f 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -45,17 +45,14 @@ If a particular lock file is present, it is a strong indication of which package
 
 It's better to try to use a Nix tool that understands the lock file.
 Using a different tool might give you a hard-to-understand error because different packages have been installed.
-An example of problems that could arise can be found [here](https://github.com/NixOS/nixpkgs/pull/126629).
-Upstream use npm, but this is an attempt to package it with `yarn2nix` (that uses yarn.lock).
 
 Using a different tool forces you to commit a lock file to the repository.
 These files are fairly large, so when packaging for nixpkgs, this approach does not scale well.
 
 Exceptions to this rule are:
 
-- When you encounter one of the bugs from a Nix tool. In each of the tool-specific instructions, known problems will be detailed. If you have a problem with a particular tool, then it's best to try another tool, even if this means you will have to re-create a lock file and commit it to Nixpkgs. In general `yarn2nix` has fewer known problems, and so a simple search in Nixpkgs will reveal many `yarn.lock` files committed.
+- When you encounter one of the bugs from a Nix tool. In each of the tool-specific instructions, known problems will be detailed. If you have a problem with a particular tool, then it's best to try another tool, even if this means you will have to re-create a lock file and commit it to Nixpkgs.
 - Some lock files contain particular version of a package that has been pulled off npm for some reason. In that case, you can recreate upstream lock (by removing the original and `npm install`, `yarn`, ...) and commit this to nixpkgs.
-- The only tool that supports workspaces (a feature of npm that helps manage sub-directories with different package.json from a single top level package.json) is `yarn2nix`. If upstream has workspaces you should try `yarn2nix`.
 
 ### Try to use upstream package.json {#javascript-upstream-package-json}
 
@@ -92,7 +89,7 @@ Exceptions to this rule are:
 Each tool has an abstraction to just build the node_modules (dependencies) directory.
 You can always use the `stdenv.mkDerivation` with the node_modules to build the package (symlink the node_modules directory and then use the package build command).
 The node_modules abstraction can be also used to build some web framework frontends.
-For an example of this see how [plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix) is built. `mkYarnModules` to make the derivation containing node_modules.
+For an example of this see how [plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/pl/plausible/package.nix) is built.
 Then when building the frontend you can just symlink the node_modules directory.
 
 ## Tool-specific instructions {#javascript-tool-specific}
@@ -486,40 +483,29 @@ In this example, `prePnpmInstall` will be run by both `pnpmConfigHook` and by th
 
 #### pnpm `fetcherVersion` {#javascript-pnpm-fetcherVersion}
 
-This is the version of the output of `fetchPnpmDeps`, if you haven't set it already, you can use `1` with your current hash:
+This is the version of the output of `fetchPnpmDeps`. New packages should use `3`:
 
 ```nix
 {
   # ...
   pnpmDeps = fetchPnpmDeps {
     # ...
-    fetcherVersion = 1;
-    hash = "..."; # you can use your already set hash here
-  };
-}
-```
-
-After upgrading to a newer `fetcherVersion`, you need to regenerate the hash:
-
-```nix
-{
-  # ...
-  pnpmDeps = fetchPnpmDeps {
-    # ...
-    fetcherVersion = 2;
+    fetcherVersion = 3;
     hash = "..."; # clear this hash and generate a new one
   };
 }
 ```
 
+When upgrading to a newer `fetcherVersion`, you need to regenerate the hash.
+
 This variable ensures that we can make changes to the output of `fetchPnpmDeps` without breaking existing hashes.
 Changes can include workarounds or bug fixes to existing PNPM issues.
 
 ##### Version history {#javascript-pnpm-fetcherVersion-versionHistory}
 
-- 1: Initial version, nothing special
+- 1: Initial version, nothing special. **Deprecated: Scheduled for removal in the 26.11 release.**. New packages must not use this value.
 - 2: [Ensure consistent permissions](https://github.com/NixOS/nixpkgs/pull/422975)
-- 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950)
+- 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950). **Recommended**
 
 ### Yarn {#javascript-yarn}
 
@@ -598,139 +584,6 @@ To install the package `yarnInstallHook` uses both `npm` and `yarn` to cleanup p
 
 - `yarnKeepDevDeps`: Disables the removal of devDependencies from `node_modules` before installation.
 
-#### yarn2nix {#javascript-yarn2nix}
-
-> [!WARNING]
-> The `yarn2nix` functions have been deprecated in favor of `yarnConfigHook`, `yarnBuildHook` and `yarnInstallHook` (for Yarn v1) and `yarn-berry_*.*` tooling (Yarn v3 and v4). Documentation for `yarn2nix` functions still appears here for the sake of the packages that still use them. See also a tracking issue [#324246](https://github.com/NixOS/nixpkgs/issues/324246).
-
-##### Preparation {#javascript-yarn2nix-preparation}
-
-You will need at least a `yarn.lock` file. If upstream does not have one you need to generate it and reference it in your package definition.
-
-If the downloaded files contain the `package.json` and `yarn.lock` files they can be used like this:
-
-```nix
-{
-  offlineCache = fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
-    hash = "....";
-  };
-}
-```
-
-##### mkYarnPackage {#javascript-yarn2nix-mkYarnPackage}
-
-> [!WARNING]
-> The `mkYarnPackage` functions have been deprecated in favor of `yarnConfigHook`, `yarnBuildHook` and `yarnInstallHook` (for Yarn v1) and `yarn-berry_*.*` tooling (Yarn v3 and v4). Documentation for `mkYarnPackage` functions still appears here for the sake of the packages that still use them. See also a tracking issue [#324246](https://github.com/NixOS/nixpkgs/issues/324246).
-
-`mkYarnPackage` will by default try to generate a binary. For packages only generating static assets (Svelte, Vue, React, Webpack, ...), you will need to explicitly override the build step with your instructions.
-
-It's important to use the `--offline` flag. For example if you script is `"build": "something"` in `package.json` use:
-
-```nix
-{
-  nativeBuildInputs = [ writableTmpDirAsHomeHook ];
-
-  buildPhase = ''
-    runHook preBuild
-
-    yarn --offline build
-
-    runHook postBuild
-  '';
-}
-```
-
-The `distPhase` is packing the package's dependencies in a tarball using `yarn pack`. You can disable it using:
-
-```nix
-{ doDist = false; }
-```
-
-The configure phase can sometimes fail because it makes many assumptions that may not always apply. One common override is:
-
-```nix
-{
-  configurePhase = ''
-    runHook preConfigure
-
-    ln -s $node_modules node_modules
-
-    runHook postConfigure
-  '';
-}
-```
-
-or if you need a writeable node_modules directory:
-
-```nix
-{
-  configurePhase = ''
-    runHook preConfigure
-
-    cp -r $node_modules node_modules
-    chmod +w node_modules
-
-    runHook postConfigure
-  '';
-}
-```
-
-##### mkYarnModules {#javascript-yarn2nix-mkYarnModules}
-
-This will generate a derivation including the `node_modules` directory.
-If you have to build a derivation for an integrated web framework (Rails, Phoenix, etc.), this is probably the easiest way.
-
-#### Overriding dependency behavior {#javascript-mkYarnPackage-overriding-dependencies}
-
-In the `mkYarnPackage` record the property `pkgConfig` can be used to override packages when you encounter problems building.
-
-For instance, say your package is throwing errors when trying to invoke node-sass:
-
-```
-ENOENT: no such file or directory, scandir '/build/source/node_modules/node-sass/vendor'
-```
-
-To fix this we will specify different versions of build inputs to use, as well as some post install steps to get the software built the way we want:
-
-```nix
-mkYarnPackage rec {
-  pkgConfig = {
-    node-sass = {
-      buildInputs = with final; [
-        python
-        libsass
-        pkg-config
-      ];
-      postInstall = ''
-        LIBSASS_EXT=auto yarn --offline run build
-        rm build/config.gypi
-      '';
-    };
-  };
-}
-```
-
-##### Pitfalls {#javascript-yarn2nix-pitfalls}
-
-- If version is missing from upstream package.json, yarn will silently install nothing. In that case, you will need to override package.json as shown in the [package.json section](#javascript-upstream-package-json)
-- Having trouble with `node-gyp`? Try adding these lines to the `yarnPreBuild` steps:
-
-  ```nix
-  {
-    yarnPreBuild = ''
-      mkdir -p $HOME/.node-gyp/${nodejs.version}
-      echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
-      ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
-      export npm_config_nodedir=${nodejs}
-    '';
-  }
-  ```
-
-  - The `echo 9` steps comes from this answer: <https://stackoverflow.com/a/49139496>
-  - Exporting the headers in `npm_config_nodedir` comes from this issue: <https://github.com/nodejs/node-gyp/issues/1191#issuecomment-301243919>
-- `offlineCache` (described [above](#javascript-yarn2nix-preparation)) must be specified to avoid [Import From Derivation](#ssec-import-from-derivation) (IFD) when used inside Nixpkgs.
-
 #### Yarn Berry v3/v4 {#javascript-yarn-v3-v4}
 Yarn Berry (v3 / v4) have similar formats, they start with blocks like these:
 
diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md
index 33579f70e41b..daae60efc3e8 100644
--- a/doc/languages-frameworks/maven.section.md
+++ b/doc/languages-frameworks/maven.section.md
@@ -17,14 +17,14 @@ Consider the following package:
   maven,
 }:
 
-maven.buildMavenPackage rec {
+maven.buildMavenPackage (finalAttrs: {
   pname = "jd-cli";
   version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "intoolswetrust";
     repo = "jd-cli";
-    tag = "jd-cli-${version}";
+    tag = "jd-cli-${finalAttrs.version}";
     hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
   };
 
@@ -50,7 +50,7 @@ maven.buildMavenPackage rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ majiir ];
   };
-}
+})
 ```
 
 This package calls `maven.buildMavenPackage` to do its work. The primary difference from `stdenv.mkDerivation` is the `mvnHash` variable, which is a hash of all of the Maven dependencies.
@@ -133,7 +133,7 @@ step 2 which will most probably fail the build. The `go-offline` plugin cannot
 handle these so-called [dynamic dependencies](https://github.com/qaware/go-offline-maven-plugin?tab=readme-ov-file#dynamic-dependencies).
 In that case you must add these dynamic dependencies manually with:
 ```nix
-maven.buildMavenPackage rec {
+maven.buildMavenPackage {
   manualMvnArtifacts = [
     # add dynamic test dependencies here
     "org.apache.maven.surefire:surefire-junit-platform:3.1.2"
diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md
index 3b0db2c03629..6296a0389ec2 100644
--- a/doc/languages-frameworks/neovim.section.md
+++ b/doc/languages-frameworks/neovim.section.md
@@ -115,6 +115,25 @@ patch those plugins but expose the necessary configuration under
 `PLUGIN.passthru.initLua` for neovim plugins. For instance, the `unicode-vim` plugin
 needs the path towards a unicode database so we expose the following snippet `vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"` under `vimPlugins.unicode-vim.passthru.initLua`.
 
+### Plugin license overrides {#neovim-plugin-license-overrides}
+
+Generated Vim and Neovim plugins get their `meta.license` from GitHub license metadata when possible.
+Some upstream repositories do not expose a license file that GitHub can detect, or only mention the license in a README.
+In those cases, add a manual `meta.license` override in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix).
+
+For example, if upstream documents that a plugin uses the Vim license but GitHub does not detect it:
+
+```nix
+{
+  foo-nvim = super.foo-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      # README says this plugin is distributed under the Vim license.
+      license = lib.licenses.vim;
+    };
+  });
+}
+```
+
 ## LuaRocks based plugins {#neovim-luarocks-based-plugins}
 
 In order to automatically handle plugin dependencies, several Neovim plugins
diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md
index a78bbf724206..ee6961b6ffc0 100644
--- a/doc/languages-frameworks/php.section.md
+++ b/doc/languages-frameworks/php.section.md
@@ -214,12 +214,6 @@ code, while others choose not to.
 
 In Nix, there are multiple approaches to building a Composer-based project.
 
-::: {.warning}
-`buildComposerProject2` has a [known bug](https://github.com/NixOS/nixpkgs/issues/451395)
-where the `vendorHash` changes every time a Composer release happens that changes the
-`autoload.php` or vendored composer code.
-:::
-
 One such method is the `php.buildComposerProject2` helper function, which serves
 as a wrapper around `mkDerivation`.
 
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 23a03b8c259e..da76fb682b39 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -207,6 +207,62 @@ following are specific to `buildPythonPackage`:
 * `setupPyGlobalFlags ? []`: List of flags passed to `setup.py` command.
 * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command.
 
+##### Using fixed-point arguments {#buildpythonpackage-fixed-point-arguments}
+
+Both `buildPythonPackage` and `buildPythonApplication` support [fixed-point arguments](#chap-build-helpers-finalAttrs), similar to `stdenv.mkDerivation`.
+This allows you to reference the final attributes of the derivation.
+
+Instead of using `rec`:
+
+```nix
+buildPythonPackage rec {
+  pname = "pyspread";
+  version = "2.4";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-...";
+  };
+}
+```
+
+You can use the `finalAttrs` pattern:
+
+```nix
+buildPythonPackage (finalAttrs: {
+  pname = "pyspread";
+  version = "2.4";
+  src = fetchPypi {
+    pname = "pyspread";
+    inherit (finalAttrs) version;
+    hash = "sha256-...";
+  };
+})
+```
+
+See the [general documentation on fixed-point arguments](#chap-build-helpers-finalAttrs) for more details on the benefits of this pattern.
+
+::: {.note}
+
+Some `buildPythonPackage`/`buildPythonApplication` arguments are passed down indirectly to `stdenv.mkDerivation` via `passthru`.
+Therefore the final state of these attributes can be accessed via `finalAttrs.passthru.${name}`.
+[`<pkg>.overrideAttrs`](#sec-pkg-overrideAttrs) can override them using the `passthru = prevAttrs.passthru // { foo = "bar"; }` pattern.
+Such arguments include:
+
+- `disabled`
+- `pyproject`
+- `format`
+- `build-system`
+- `dependencies`
+- `optional-dependencies`
+
+<!--
+TODO(@doronbehar): When `.overridePythonAttrs` will be removed, the above text might need to be revised. See:
+
+- https://github.com/NixOS/nixpkgs/pull/379637
+- https://github.com/NixOS/nixpkgs/pull/469804
+-->
+:::
+
 The [`stdenv.mkDerivation`](#sec-using-stdenv) function accepts various parameters for describing
 build inputs (see "Specifying dependencies"). The following are of special
 interest for Python packages, either because these are primarily used, or
@@ -237,29 +293,23 @@ the overrides for packages in the package set.
 ```nix
 with import <nixpkgs> { };
 
-(
-  let
-    python =
-      let
-        packageOverrides = self: super: {
-          pandas = super.pandas.overridePythonAttrs (old: rec {
-            version = "0.19.1";
-            src = fetchPypi {
-              pname = "pandas";
-              inherit version;
-              hash = "sha256-JQn+rtpy/OA2deLszSKEuxyttqBzcAil50H+JDHUdCE=";
-            };
-          });
-        };
-      in
-      pkgs.python3.override {
-        inherit packageOverrides;
-        self = python;
-      };
-
-  in
-  python.withPackages (ps: [ ps.blaze ])
-).env
+let
+  python = pkgs.python3.override {
+    packageOverrides = self: super: {
+      pandas = super.pandas.overridePythonAttrs (
+        finalAttrs: prevAttrs: {
+          version = "0.19.1";
+          src = fetchPypi {
+            pname = "pandas";
+            inherit (finalAttrs) version;
+            hash = "sha256-JQn+rtpy/OA2deLszSKEuxyttqBzcAil50H+JDHUdCE=";
+          };
+        }
+      );
+    };
+  };
+in
+(python.withPackages (ps: [ ps.blaze ])).env
 ```
 
 The next example shows a non trivial overriding of the `blas` implementation to
diff --git a/doc/languages-frameworks/tcl.section.md b/doc/languages-frameworks/tcl.section.md
index 71ec9d89eb50..ff1a978304d3 100644
--- a/doc/languages-frameworks/tcl.section.md
+++ b/doc/languages-frameworks/tcl.section.md
@@ -13,19 +13,20 @@ Tcl packages are typically built with `tclPackages.mkTclDerivation`.
 Tcl dependencies go in `buildInputs`/`nativeBuildInputs`/... like other packages.
 For more complex package definitions, such as packages with mixed languages, use `tcl.tclPackageHook`.
 
-Where possible, make sure to enable stubs for maximum compatibility, usually with the `--enable-stubs` configure flag.
+Where possible, make sure to enable stubs for maximum compatibility.
+If you are using `mkTclDerivation`, `--enable-stubs` will be automatically added to `configureFlags`.
 
 Here is a simple package example to be called with `tclPackages.callPackage`.
 
 ```
 { lib, fetchzip, mkTclDerivation, openssl }:
 
-mkTclDerivation rec {
+mkTclDerivation (finalAttrs: {
   pname = "tcltls";
   version = "1.7.22";
 
   src = fetchzip {
-    url = "https://core.tcl-lang.org/tcltls/uv/tcltls-${version}.tar.gz";
+    url = "https://core.tcl-lang.org/tcltls/uv/tcltls-${finalAttrs.version}.tar.gz";
     hash = "sha256-TOouWcQc3MNyJtaAGUGbaQoaCWVe6g3BPERct/V65vk=";
   };
 
@@ -33,7 +34,6 @@ mkTclDerivation rec {
 
   configureFlags = [
     "--with-ssl-dir=${openssl.dev}"
-    "--enable-stubs"
   ];
 
   meta = {
@@ -43,7 +43,7 @@ mkTclDerivation rec {
     license = lib.licenses.tcltk;
     platforms = lib.platforms.unix;
   };
-}
+})
 ```
 
 All Tcl libraries are declared in `pkgs/top-level/tcl-packages.nix` and are defined in `pkgs/development/tcl-modules/`.
@@ -52,3 +52,35 @@ Its use is documented in `pkgs/development/tcl-modules/by-name/README.md`.
 
 All Tcl applications reside elsewhere.
 In case a package is used as both a library and an application (for example `expect`), it should be defined in `tcl-packages.nix`, with an alias elsewhere.
+
+### Using tclRequiresCheck {#using-tclrequirescheck}
+
+Although unit tests are highly preferred to validate correctness of a package, not
+all packages have test suites that can be run easily, and some have none at all.
+To help ensure the package still works, [`tclRequiresCheck`](#using-tclrequirescheck) can attempt to `package require`
+the listed modules.
+
+```nix
+{
+  tclRequiresCheck = [
+    "json"
+    "doctools"
+  ];
+}
+```
+
+roughly translates to:
+
+```nix
+{
+  preDist = ''
+    TCLLIBPATH="$out/lib $TCLLIBPATH"
+    tclsh <<<'exit [catch {package require json; package require doctools}]'
+  '';
+}
+```
+
+However, this is done in its own phase, and not dependent on whether [`doCheck = true;`](#var-stdenv-doCheck).
+
+This can also be useful in verifying that the package doesn't assume commonly
+present packages (e.g. `tcllib`).
diff --git a/doc/redirects.json b/doc/redirects.json
index 3aead0a64e8d..84a102769702 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -379,6 +379,9 @@
   "sec-build-helper-extendMkDerivation": [
     "index.html#sec-build-helper-extendMkDerivation"
   ],
+  "sec-buildEnv-exceptions": [
+    "index.html#sec-buildEnv-exceptions"
+  ],
   "sec-building-packages-with-llvm": [
     "index.html#sec-building-packages-with-llvm"
   ],
@@ -445,7 +448,13 @@
     "index.html#overriding-the-generator",
     "index.html#javascript-node2nix",
     "index.html#javascript-node2nix-preparation",
-    "index.html#javascript-node2nix-pitfalls"
+    "index.html#javascript-node2nix-pitfalls",
+    "index.html#javascript-yarn2nix-mkYarnPackage",
+    "index.html#javascript-yarn2nix",
+    "index.html#javascript-yarn2nix-preparation",
+    "index.html#javascript-yarn2nix-mkYarnModules",
+    "index.html#javascript-mkYarnPackage-overriding-dependencies",
+    "index.html#javascript-yarn2nix-pitfalls"
   ],
   "sec-nixpkgs-release-26.05-lib": [
     "release-notes.html#sec-nixpkgs-release-26.05-lib"
@@ -770,6 +779,12 @@
   "sec-treefmt-options-reference": [
     "index.html#sec-treefmt-options-reference"
   ],
+  "ssec-buildEnv-collisions": [
+    "index.html#ssec-buildEnv-collisions"
+  ],
+  "ssec-buildEnv-singleFileOutputs": [
+    "index.html#ssec-buildEnv-singleFileOutputs"
+  ],
   "ssec-cosmic-common-issues": [
     "index.html#ssec-cosmic-common-issues"
   ],
@@ -878,6 +893,9 @@
   "typst-package-scope-and-usage": [
     "index.html#typst-package-scope-and-usage"
   ],
+  "using-tclrequirescheck": [
+    "index.html#using-tclrequirescheck"
+  ],
   "var-go-buildTestBinaries": [
     "index.html#var-go-buildTestBinaries"
   ],
@@ -2182,6 +2200,12 @@
   "chap-special": [
     "index.html#chap-special"
   ],
+  "sec-buildEnv": [
+    "index.html#sec-buildEnv"
+  ],
+  "sec-buildEnv-arguments": [
+    "index.html#sec-buildEnv-arguments"
+  ],
   "sec-fakeNss": [
     "index.html#sec-fakeNss"
   ],
@@ -3702,24 +3726,6 @@
   "javascript-yarninstallhook": [
     "index.html#javascript-yarninstallhook"
   ],
-  "javascript-yarn2nix": [
-    "index.html#javascript-yarn2nix"
-  ],
-  "javascript-yarn2nix-preparation": [
-    "index.html#javascript-yarn2nix-preparation"
-  ],
-  "javascript-yarn2nix-mkYarnPackage": [
-    "index.html#javascript-yarn2nix-mkYarnPackage"
-  ],
-  "javascript-yarn2nix-mkYarnModules": [
-    "index.html#javascript-yarn2nix-mkYarnModules"
-  ],
-  "javascript-mkYarnPackage-overriding-dependencies": [
-    "index.html#javascript-mkYarnPackage-overriding-dependencies"
-  ],
-  "javascript-yarn2nix-pitfalls": [
-    "index.html#javascript-yarn2nix-pitfalls"
-  ],
   "javascript-yarnBerry-missing-hashes": [
     "index.html#javascript-yarnBerry-missing-hashes"
   ],
@@ -4053,6 +4059,9 @@
   "buildpythonpackage-parameters": [
     "index.html#buildpythonpackage-parameters"
   ],
+  "buildpythonpackage-fixed-point-arguments": [
+    "index.html#buildpythonpackage-fixed-point-arguments"
+  ],
   "overriding-python-build-helpers": [
     "index.html#overriding-python-build-helpers"
   ],
@@ -4477,6 +4486,9 @@
     "index.html#neovim-plugin-required-snippet",
     "index.html#vim-plugin-required-snippet"
   ],
+  "neovim-plugin-license-overrides": [
+    "index.html#neovim-plugin-license-overrides"
+  ],
   "updating-plugins-in-nixpkgs": [
     "index.html#updating-plugins-in-nixpkgs"
   ],
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index baa6daea1584..81ebbd485efd 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -324,6 +324,13 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
+- `buildEnv` now takes fixed-point arguments (`finalAttrs: { }`).
+  The custom overrider `<env-pkg>.override` is deprecated but kept in this release. It will be removed in future releases after tree-wide transition.
+  The argument `paths` is passed as `passthru.paths` to avoid bringing in unexpected context.
+
+- `buildEnv` now takes `derivationArgs` for additional arguments to pass to `stdenv.mkDerivation`.
+  A compatibility layer is added for directly-specified arguments `nativeBuildInputs` and `buildInputs`.
+
 - Added `rewriteURL` attribute to the nixpkgs `config`, to allow for rewriting the URLs downloaded by `fetchurl`.
 
 - Added `hashedMirrors` attribute to the nixpkgs `config`, to allow for customization of the hashed mirrors used by `fetchurl`.
@@ -348,7 +355,7 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
 
 - `fetchgit` now accepts a `rootDir` argument to limit the resulting source to one subdirectory of the whole Git repository. Corresponding `--root-dir` option added to `nix-prefetch-git`.
 
-- `fetchNpmDeps` now accepts a `npmRegistryOverridesString` argument to pass NPM registry overrides to the fetcher.
+- `fetchNpmDeps` now accepts a `npmRegistryOverridesString` argument to pass npm registry overrides to the fetcher.
 
 - `ffmpeg_8`, `ffmpeg_8-headless`, and `ffmpeg_8-full` have been added. The default version of FFmpeg is now `ffmpeg_8`. You can install previous versions from package attributes such as `ffmpeg_7`.
 
diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index d86b3b2da8a3..bb962fe90445 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -80,11 +80,15 @@
 
 - Note that the above `nodePackages` removal also coincides with the removal of `node2nix` and its tooling, which have been deprecated for a long time.
 
+- `buildEnv`-constructed packages now take only [structured attributes (`{ __structuredAttrs = true; }`)](https://nix.dev/manual/nix/2.18/language/advanced-attributes.html#adv-attr-structuredAttrs).
+
 - `xfce.mkXfceDerivation` has been deprecated (i.e. conditioned behind `nixpkgs.config.allowAliases`)
   and will be removed in NixOS 26.11, please use `stdenv.mkDerivation` directly. You can migrate by
   adding `pkg-config`, `xfce4-dev-tools`, and `wrapGAppsHook3` to your `nativeBuildInputs` and
   `--enable-maintainer-mode` to your `configureFlags`.
 
+- `yarn2nix`/`yarn2nix-moretea` and its tooling(`mkYarnPackage`, `mkYarnModules`, and `fixup_yarn_lock`) have been removed as they were unmaintainable in nixpkgs. If you want to build with Yarn V1 going forward, use the hooks instead(`yarnBuildHook`, `yarnConfigHook`, and `yarnInstallHook`). See the yarn v1 documentation in the nixpkgs manual for more details.
+
 - `albert` has been updated to the version 34.0.5. This release redesigns the query system to support stateful asynchronous handlers and infinite scrolling, and adds internationalized tokenization.
   This update introduces several breaking changes: the Python plugin interface is now v5.0, the `PATH` plugin has been renamed to `Commandline`, and the QStylesheets-based widgets box model frontend has been removed.
   For more information read the [changelog for 34.0.0](https://albertlauncher.github.io/2026/01/19/albert-v34.0.0-released/).
@@ -133,12 +137,21 @@
 
 - `pulsar` has finally migrated from electron v12 to v30, backup `~/.pulsar` before upgrading. See [Pulsar on Electron 30: what it means for you](https://blog.pulsar-edit.dev/posts/20251202-savetheclocktower-pulsar-on-electron-30/).
 
+- `mactracker` has been updated to major version 8, which now [requires macOS 11 Big Sur or later](https://mactracker.ca/releasenotes-mac.html#:~:text=System%20requirements%20updated%20to%20macOS%2011%20Big%20Sur%20and%20later). The previous version supported Mac OS X 10.6.8 or later.
+
 - `bartender` has been updated to major version 6. This removes support for MacOS Sonoma (and adds support for Tahoe). For more information, see [the release notes](https://www.macbartender.com/Bartender6/release_notes/) or [the Bartender 6 support page](https://www.macbartender.com/Bartender6/support/).
 
 - `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.
 
 - Varnish Cache has been updated to major version 8, `varnish` now refers to `varnish80`. That release contains breaking changes, see [Upgrading to Varnish-Cache 8.0](https://vinyl-cache.org/docs/8.0/whats-new/upgrading-8.0.html).
   Note that the Varnish 6 LTS release remains available as `varnish60`.
+  The Varnish Cache open-source project renamed itself to Vinyl Cache. Please migrate to `vinyl-cache`. See the `vinyl-cache` release notes entry for more information.
+  Varnish 8 is not supported for the entire NixOS 26.05 release cycle.
+
+- Vinyl Cache has been introduced with the major version 9 as the Varnish Cache open source project renamed itself to Vinyl Cache. Please migrate to Vinyl Cache 9 when you still use Varnish Cache.
+  A new module has also been introduced for this migration: `services.vinyl-cache`.
+  This release contains breaking changes, see [Upgrading to Vinyl Cache 9.0](https://vinyl-cache.org/docs/9.0/whats-new/upgrading-9.0.html).
+  The `varnish-modules` project is currently not packaged for Vinyl Cache, as it is incompatible.
 
 - `eslint` has been updated from version 9 to version 10. Please see https://eslint.org/blog/2026/02/eslint-v10.0.0-released/ for details about the breaking changes included in the update.
 
@@ -162,6 +175,10 @@
 
 - the `xorg` package set has been deprecated, packages have moved to the top level.
 
+- `python3Packages.buildPythonPackage` and `python3Packages.buildPythonApplication` now throw errors in the presence of `pytestFlagsArray`.
+  Please use [`pytestFlags` and `(enabled|disabled)(TestPaths|Tests|TestMarks)`](#using-pytestcheckhook) instead.
+  If modifying the Nix expression is not feasible, users can remediate the error by overriding `pytestFlagsArray` with `null` or `[ ]`.
+
 - `python3Packages.pygame` has been been renamed to `python3Packages.pygame-original`, the attribute `python3Packages.pygame` will from python 3.14 default to the more actively maintained `python3Packages.pygame-ce`
 
 - `fastly` has been updated to major version 14. For more information, you can check the [release notes](https://github.com/fastly/cli/releases/tag/v14.0.0)
@@ -247,11 +264,16 @@
 
 - `python3packages.pillow-avif-plugin` has been removed as the functionality is included in `python3packages.pillow` directly since version 11.3.
 
+- `wasistlos` (previously known as `whatsapp-for-linux`) has been removed because it was unmaintained and archived upstream.
+  Multiple alternatives exist: `karere`, `whatsie` and `zapzap` among others.
+
 - `light` has been removed because it was unmaintained.
   `brightnessctl` and `acpilight` provide similar functionality.
 
 - `opensmtpd-filter-dkimsign` is now installed into `libexec/smtpd` instead of `libexec/opensmtpd` so that now it is properly linked into the environment built by `services.opensmtpd.procPackages`. If you hardcoded path to `filter-dkimsign` please consider using this option.
 
+- `shisho` has been removed because it's archived. `semgrep`, `opengrep`, and `ast-grep` provide similar functionality.
+
 - `services.openssh.settings.AcceptEnv` now explicitly defined as an option that takes a list of strings, to facilitate option merging. Setting it to a string value is no longer supported.
 
 - All Xfce packages have been moved to top level (e.g. if you previously added `pkgs.xfce.xfce4-whiskermenu-plugin` to `environment.systemPackages`, you will need to change it to `pkgs.xfce4-whiskermenu-plugin`). The `xfce` scope will be removed in NixOS 26.11.
@@ -268,10 +290,16 @@
 
 - The default packages in `services.jenkins.packages` have been dropped, since not every Jenkins installation needs any package at all. It's more reasonable to leave it empty and let users configure what they need.
 
+- The `pie` hardening flag has been removed and will now error, after being deprecated in 25.11. Compilers are expected to enable PIE by default, as has been common practice since 2016 outside of Nixpkgs. If a package needs `pie` disabled pass `-no-pie` in `CFLAGS`. It is unlikely this will be necessary in many cases; due to the prevalence of default PIE toolchains, most packages incompatible with PIE already pass `-no-pie`.
+
 ## Other Notable Changes {#sec-nixpkgs-release-26.05-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
+- `nvidia-x11` proprietary kernel modules are now provided separately as `nvidia_x11.mod`, while `nvidia_x11.open` remains the open-source kernel module package.
+
+- `linuxPackages.nvidiaPackages` now follows NVIDIA's official release branches by exposing `production`, `new_feature`, and `beta`. The convenience aliases `latest` (newer of `production` and `new_feature`) and `bleeding_edge` (newer of `latest` and `beta`) are provided; note that `beta` now refers strictly to the beta branch.
+
 - `balatro` now supports the Google Play and Xbox PC versions of the game.  Pass the `apk` or `Assets.zip` as `balatro.override { src = "…" }`.
 
 - `uptime-kuma` has been updated to v2, which requires an automated migration that can take a few hours. **A backup is highly recommended.**
@@ -280,6 +308,8 @@
 
 - The `libcxxhardeningextensive` hardening flag has been **disabled** by default. Enabling it by default in 25.11 was unintentional and may have had a negative effect on performance in some cases. `libcxxhardeningfast` remains enabled by default.
 
+- The packages `ibtool`, `actool` and `re-plistbuddy` have been added, providing reimplementations of the corresponding proprietary Apple tools. They are more compatible with the originals than the previously existing `xcbuild` package, and should enable more darwin software to be built from source.
+
 - Switch inhibitors were introduced, which add a pre-switch check that compares a list of strings between the previous and the new generation, and refuses to switch into the new generation when there is a difference between the two lists. This allows to avoid switching into a system when for instance the systemd version changed by adding `config.systemd.package.version` to the switch inhibitors for your system. You can still forcefully switch into any generation by setting `NIXOS_NO_CHECK=1`.
 
 - GNU Taler has been updated to version 1.3.
@@ -290,6 +320,12 @@
 
 - `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes.
 
+- `fetchPnpmDeps`' `fetcherVersion = 1` is deprecated and scheduled for removal
+  in the 26.11 release. A deprecation warning has been added. Packages still on
+  `fetcherVersion = 1` should migrate to `fetcherVersion = 3` and regenerate
+  their hashes. See the [pnpm `fetcherVersion`
+  section](#javascript-pnpm-fetcherVersion) of the manual for details.
+
 - `buildNpmPackage` now supports `npmDepsFetcherVersion` (and `fetchNpmDeps` now supports `fetcherVersion`). Set to `2` to enable packument caching, which fixes builds for projects using npm workspaces.
 
 - Added `dell-bios-fan-control` package and service.
@@ -331,6 +367,8 @@ gnuradioMinimal.override {
 }
 ```
 
+- Added `headplane` and `headplane-agent` packages, and `services.headplane` service.
+
 ## Nixpkgs Library {#sec-nixpkgs-release-26.05-lib}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/doc/style.css b/doc/style.css
index a4bb35d923b4..7549ee2e1145 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -490,3 +490,7 @@ div.appendix .variablelist .term {
   font-family: Roboto;
   src: url(Roboto.ttf);
 }
+
+.chapter {
+  content-visibility: auto;
+}
diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix
index 60b5913a6e86..6d3593f8f247 100644
--- a/lib/fileset/default.nix
+++ b/lib/fileset/default.nix
@@ -123,7 +123,6 @@ let
     pathExists
     seq
     typeOf
-    nixVersion
     ;
 
   inherit (lib.lists)
@@ -138,7 +137,6 @@ let
 
   inherit (lib.strings)
     isStringLike
-    versionOlder
     ;
 
   inherit (lib.filesystem)
diff --git a/lib/filesystem.nix b/lib/filesystem.nix
index 27f3ab1c5ce1..9f05c05eb7cd 100644
--- a/lib/filesystem.nix
+++ b/lib/filesystem.nix
@@ -201,7 +201,7 @@ in
         in
         if builtins.length matches != 0 then
           { inherit path matches; }
-        else if path == /. then
+        else if toString path == "/" then
           null
         else
           go (dirOf path);
@@ -211,7 +211,7 @@ in
           base = baseNameOf file;
           type = (builtins.readDir parent).${base} or null;
         in
-        file == /. || type == "directory";
+        toString file == "/" || type == "directory";
     in
     go (if isDir then file else parent);
 
@@ -371,7 +371,6 @@ in
     let
       inherit (lib)
         concatMapAttrs
-        id
         makeScope
         recurseIntoAttrs
         removeSuffix
diff --git a/lib/meta.nix b/lib/meta.nix
index 3341caf0e0fb..3079f79f2f50 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -19,7 +19,6 @@ let
     isString
     match
     typeOf
-    elemAt
     ;
 
 in
diff --git a/lib/network/internal.nix b/lib/network/internal.nix
index 2e439c15f16c..adda711444fd 100644
--- a/lib/network/internal.nix
+++ b/lib/network/internal.nix
@@ -23,7 +23,6 @@ let
   */
   ipv6Bits = 128;
   ipv6Pieces = 8; # 'x:x:x:x:x:x:x:x'
-  ipv6PieceBits = 16; # One piece in range from 0 to 0xffff.
   ipv6PieceMaxValue = 65535; # 2^16 - 1
 in
 let
diff --git a/lib/options.nix b/lib/options.nix
index 6191a876cdd4..accbb56ff34a 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -468,7 +468,7 @@ rec {
     : 3\. Function argument
   */
   mergeUniqueOption =
-    args@{
+    {
       message,
       # WARNING: the default merge function assumes that the definition is a valid (option) value. You MUST pass a merge function if the return value needs to be
       #   - type checked beyond what .check does (which should be very little; only on the value head; not attribute values, etc)
diff --git a/lib/services/lib.nix b/lib/services/lib.nix
index 88db80f91494..02587b6bc810 100644
--- a/lib/services/lib.nix
+++ b/lib/services/lib.nix
@@ -37,17 +37,63 @@ rec {
   );
 
   /**
-    This is the entrypoint for the portable part of modular services.
+    Entrypoint for integrating modular services into a containing module system.
 
-    It provides the various options that are consumed by service manager implementations.
+    Each containing system (NixOS, ...) calls `configure` to
+    obtain a `serviceSubmodule` type for its services option. The returned submodule
+    includes the portable service base and any service-manager-specific modules
+    passed via `extraRootModules`.
+
+    **Implementing for a new system** (e.g. home-manager, nix-darwin):
+
+    ```nix
+    # darwin/modules/services/system.nix
+    { lib, config, pkgs, ... }:
+    let
+      portable-lib = import <nixpkgs/lib/services/lib.nix> { inherit lib; };
+
+      modularServiceConfiguration = portable-lib.configure {
+        serviceManagerPkgs = pkgs;
+        extraRootModules = [
+          ./launchd-service.nix    # launchd-specific options (plist generation, etc.)
+        ];
+      };
+    in
+    {
+      options.services = lib.mkOption {
+        type = lib.types.attrsOf modularServiceConfiguration.serviceSubmodule;
+        default = { };
+      };
+
+      config = {
+        # Convert service tree -> launchd plists, assertions, etc.
+        # (analogous to how NixOS converts to systemd units)
+        launchd.agents = ...;
+        assertions = ...;
+        warnings = ...;
+      };
+    }
+    ```
+
+    lib.services.configure :: AttrSet -> { serviceSubmodule :: SubmoduleType }
 
     # Inputs
 
-    `serviceManagerPkgs`: A Nixpkgs instance which will be used for built-in logic such as converting `configData.<path>.text` to a store path.
+    `serviceManagerPkgs`
 
-    `extraRootModules`: Modules to be loaded into the "root" service submodule, but not into its sub-`services`. That's the modules' own responsibility.
+    : 1\. A Nixpkgs instance used for built-in logic such as converting
+    `configData.<path>.text` to a store path.
 
-    `extraRootSpecialArgs`: Fixed module arguments that are provided in a similar manner to `extraRootModules`.
+    `extraRootModules`
+
+    : 2\. Modules to be loaded into the "root" service submodule, but not
+    into its sub-`services`. That's the modules' own responsibility.
+    Typically contains service-manager-specific option modules
+    (e.g. systemd unit options, launchd plist options).
+
+    `extraRootSpecialArgs`
+
+    : 3\. Fixed module arguments provided alongside `extraRootModules`.
 
     # Output
 
diff --git a/lib/sources.nix b/lib/sources.nix
index 230512bbaa77..43bc2ab2dbe3 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -311,7 +311,13 @@ let
           fileName = path + "/${file}";
           packedRefsName = path + "/packed-refs";
           absolutePath =
-            base: path: if lib.hasPrefix "/" path then path else toString (/. + "${base}/${path}");
+            base: path:
+            if lib.hasPrefix "/" path then
+              path
+            else if lib.hasPrefix "/" base then
+              "${base}/${path}"
+            else
+              "/${base}/${path}";
         in
         if
           pathIsRegularFile path
diff --git a/lib/strings.nix b/lib/strings.nix
index d6170fdf39e3..848e61a65ddf 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -337,6 +337,7 @@ rec {
 
   /**
     Concatenate a list of strings, adding a newline at the end of each one.
+    Defined as `concatMapStrings (s: s + "\n")`.
 
     # Inputs
 
@@ -360,7 +361,7 @@ rec {
 
     :::
   */
-  concatLines = str: concatStringsSep "\n" str + "\n";
+  concatLines = concatMapStrings (s: s + "\n");
 
   /**
     Given string `s`, replace every occurrence of the string `from` with the string `to`.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index eb06f12f25a0..f60ece0c8f5c 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -300,6 +300,8 @@ let
             "powerpc"
           else if final.isRiscV then
             "riscv"
+          else if final.isSh4 then
+            "sh"
           else if final.isS390 then
             "s390"
           else if final.isLoongArch64 then
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 10d72f0f6c10..e9fa908dfc88 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -40,6 +40,7 @@ let
     "i686-linux"
     "loongarch64-linux"
     "m68k-linux"
+    "sh4-linux"
     "microblaze-linux"
     "microblazeel-linux"
     "mips-linux"
@@ -145,6 +146,7 @@ in
   or1k = filterDoubles predicates.isOr1k;
   m68k = filterDoubles predicates.isM68k;
   arc = filterDoubles predicates.isArc;
+  sh4 = filterDoubles predicates.isSh4;
   s390 = filterDoubles predicates.isS390;
   s390x = filterDoubles predicates.isS390x;
   loongarch64 = filterDoubles predicates.isLoongArch64;
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 274d6a1af729..14693ca44e97 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -243,6 +243,10 @@ rec {
     config = "arc-unknown-linux-gnu";
   };
 
+  sh4 = {
+    config = "sh4-unknown-linux-gnu";
+  };
+
   s390 = {
     config = "s390-unknown-linux-gnu";
   };
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 499f0ce774d5..36a4036f210a 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -234,6 +234,11 @@ rec {
         family = "arc";
       };
     };
+    isSh4 = {
+      cpu = {
+        family = "sh";
+      };
+    };
     isS390 = {
       cpu = {
         family = "s390";
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 974bcbdc2465..626b5bcb41ac 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -284,6 +284,12 @@ rec {
         family = "m68k";
       };
 
+      sh4 = {
+        bits = 32;
+        significantByte = littleEndian;
+        family = "sh";
+      };
+
       powerpc = {
         bits = 32;
         significantByte = bigEndian;
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index e230888d9fcb..b80ed1efc8e8 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -632,6 +632,15 @@ rec {
     else if platform.isPower64 then
       if platform.isLittleEndian then powernv else ppc64
 
+    else if platform.isSh4 then
+      {
+        linux-kernel = {
+          target = "vmlinux";
+          # SH arch doesn't have a 'make install' target.
+          installTarget = "vmlinux";
+        };
+      }
+
     else
       { };
 }
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 916994152754..e2872dcafce9 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -51,7 +51,6 @@ let
     filter
     filterAttrs
     fix
-    fold
     foldAttrs
     foldl
     foldl'
@@ -559,6 +558,10 @@ runTests {
     ];
     expected = "a\nb\nc\n";
   };
+  testConcatLinesEmpty = {
+    expr = concatLines [ ];
+    expected = "";
+  };
 
   testMakeIncludePathWithPkgs = {
     expr = (
@@ -4790,7 +4793,7 @@ runTests {
   # for sub-directories
   testPackagesFromDirectoryNestedScopes =
     let
-      inherit (lib) makeScope recurseIntoAttrs;
+      inherit (lib) makeScope;
       emptyScope = makeScope lib.callPackageWith (_: { });
     in
     {
diff --git a/lib/tests/modules/deferred-module-error.nix b/lib/tests/modules/deferred-module-error.nix
index aec15dc53495..2f74421b2da5 100644
--- a/lib/tests/modules/deferred-module-error.nix
+++ b/lib/tests/modules/deferred-module-error.nix
@@ -3,16 +3,10 @@ let
   inherit (lib)
     types
     mkOption
-    setDefaultModuleLocation
     evalModules
     ;
   inherit (types)
     deferredModule
-    lazyAttrsOf
-    submodule
-    str
-    raw
-    enum
     ;
 in
 {
diff --git a/lib/tests/modules/deferred-module.nix b/lib/tests/modules/deferred-module.nix
index 0b280b824674..e14afb54f213 100644
--- a/lib/tests/modules/deferred-module.nix
+++ b/lib/tests/modules/deferred-module.nix
@@ -1,12 +1,11 @@
 { lib, ... }:
 let
-  inherit (lib) types mkOption setDefaultModuleLocation;
+  inherit (lib) types mkOption;
   inherit (types)
     deferredModule
     lazyAttrsOf
     submodule
     str
-    raw
     enum
     ;
 in
diff --git a/lib/tests/modules/disable-module-bad-key.nix b/lib/tests/modules/disable-module-bad-key.nix
index a29a00e2e093..825f3b3139bf 100644
--- a/lib/tests/modules/disable-module-bad-key.nix
+++ b/lib/tests/modules/disable-module-bad-key.nix
@@ -1,15 +1,4 @@
 { lib, ... }:
-let
-  inherit (lib) mkOption types;
-
-  moduleWithKey =
-    { config, ... }:
-    {
-      config = {
-        enable = true;
-      };
-    };
-in
 {
   imports = [
     ./declare-enable.nix
diff --git a/lib/tests/modules/types-attrTag.nix b/lib/tests/modules/types-attrTag.nix
index f30c1fc904f8..d48badae391f 100644
--- a/lib/tests/modules/types-attrTag.nix
+++ b/lib/tests/modules/types-attrTag.nix
@@ -6,7 +6,6 @@
 }:
 let
   inherit (lib) mkOption types;
-  forceDeep = x: builtins.deepSeq x x;
   mergedSubOption = (options.merged.type.getSubOptions options.merged.loc).extensible;
 in
 {
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index 9348e37a9d7b..e912d18cc73c 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -171,6 +171,7 @@ lib.runTests (
       "i686-linux"
       "loongarch64-linux"
       "m68k-linux"
+      "sh4-linux"
       "microblaze-linux"
       "microblazeel-linux"
       "mips-linux"
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6bcd9116a8f2..b0917d818018 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -145,6 +145,12 @@
     githubId = 67933444;
     keys = [ { fingerprint = "B39E B98E 8860 DAFB 0567  0073 A614 B7D2 5134 987A"; } ];
   };
+  _0xgsvs = {
+    email = "venkat.subrahmanyam.34@gmail.com";
+    name = "0xgsvs";
+    github = "0xgsvs";
+    githubId = 161702876;
+  };
   _0xMillyByte = {
     email = "emilia.daelman@gmail.com";
     name = "Emilia Daelman";
@@ -1009,6 +1015,12 @@
     githubId = 56970006;
     keys = [ { fingerprint = "50E2 669C AB38 2F4A 5F72  1667 0D6B FC01 D45E DADD"; } ];
   };
+  akosseres = {
+    name = "Ákos Seres";
+    email = "seresakos2000@gmail.com";
+    github = "AkosSeres";
+    githubId = 11257907;
+  };
   akotro = {
     name = "Antonis Kotronakis";
     email = "mail@akotro.dev";
@@ -3958,6 +3970,12 @@
     name = "Joseph Madden";
     keys = [ { fingerprint = "3CF8 E983 2219 AB4B 0E19  158E 6112 1921 C9F8 117C"; } ];
   };
+  brett = {
+    email = "brett@librum.org";
+    github = "brett";
+    githubId = 523;
+    name = "Brett Eisenberg";
+  };
   brettlyons = {
     email = "blyons@fastmail.com";
     github = "brettlyons";
@@ -4842,6 +4860,12 @@
     github = "CHN-beta";
     githubId = 35858462;
   };
+  choco98 = {
+    name = "Conor Boyle";
+    email = "conorboyle07@protonmail.com";
+    github = "chocoblocko9";
+    githubId = 91826251;
+  };
   ChocolateLoverRaj = {
     email = "paranjperajas@gmail.com";
     github = "ChocolateLoverRaj";
@@ -5302,12 +5326,6 @@
     githubId = 27779510;
     keys = [ { fingerprint = "FDF5 EF67 8CC1 FE22 1845  6A22 CF7B BB5B C756 1BD3"; } ];
   };
-  coffeeispower = {
-    email = "tiagodinis33@proton.me";
-    github = "coffeeispower";
-    name = "Tiago Dinis";
-    githubId = 92828847;
-  };
   cofob = {
     name = "Egor Ternovoy";
     email = "cofob@riseup.net";
@@ -5442,6 +5460,12 @@
     name = "Simon Hauser";
     githubId = 15233006;
   };
+  connor-grady = {
+    email = "connor.grady@gmail.com";
+    github = "connor-grady";
+    githubId = 50903811;
+    name = "Connor Grady";
+  };
   connorbaker = {
     email = "ConnorBaker01@gmail.com";
     matrix = "@connorbaker:matrix.org";
@@ -7234,12 +7258,6 @@
     githubId = 187309685;
     name = "Drew Council";
   };
-  dritter = {
-    email = "dritter03@googlemail.com";
-    github = "dritter";
-    githubId = 1544760;
-    name = "Dominik Ritter";
-  };
   drperceptron = {
     github = "drperceptron";
     githubId = 92106371;
@@ -7739,6 +7757,12 @@
     githubId = 411447;
     name = "Leo Gaspard";
   };
+  ekzyis = {
+    email = "ramdip.singhgill@gmail.com";
+    github = "ekzyis";
+    githubId = 27162016;
+    name = "Ramdip Gill";
+  };
   elasticdog = {
     email = "aaron@elasticdog.com";
     github = "elasticdog";
@@ -7886,6 +7910,12 @@
     githubId = 45268815;
     name = "Flavio Galán";
   };
+  ElSebas41 = {
+    email = "achavezaiquipa@gmail.com";
+    github = "ElSebas41";
+    githubId = 189925713;
+    name = "Angel Chavez";
+  };
   elvishjerricco = {
     email = "elvishjerricco@gmail.com";
     matrix = "@elvishjerricco:matrix.org";
@@ -10607,7 +10637,7 @@
   };
   hekazu = {
     name = "Henri Peurasaari";
-    email = "henri.peurasaari@helsinki.fi";
+    email = "henri.peurasaari@alumni.helsinki.fi";
     github = "hekazu";
     githubId = 16819092;
   };
@@ -11273,6 +11303,12 @@
     githubId = 55025025;
     name = "Feather Lin";
   };
+  igor-ramazanov = {
+    email = "personal@igorramazanov.tech";
+    github = "igor-ramazanov";
+    githubId = 12570166;
+    name = "Igor Ramazanov";
+  };
   igsha = {
     email = "igor.sharonov@gmail.com";
     github = "igsha";
@@ -11655,6 +11691,11 @@
     github = "IsotoxalDev";
     githubId = 62714538;
   };
+  issai = {
+    name = "Issai";
+    github = "TheLimifiedLime";
+    githubId = 69121493;
+  };
   istoph = {
     email = "chr@istoph.de";
     name = "Christoph Hüffelmann";
@@ -12384,6 +12425,13 @@
     githubId = 9425955;
     name = "Jean-François Labonté";
   };
+  jelni = {
+    email = "nixpkgs@jel.gay";
+    github = "jelni";
+    githubId = 25802745;
+    matrix = "@me:jel.gay";
+    name = "jel";
+  };
   jemand771 = {
     email = "willy@jemand771.net";
     github = "jemand771";
@@ -12514,6 +12562,11 @@
     githubId = 277474;
     keys = [ { fingerprint = "F1F1 3395 8E8E 9CC4 D9FC  9647 1931 9CD8 416A 642B"; } ];
   };
+  jfr = {
+    name = "Joseph Fox-Rabinovitz";
+    github = " joe-saronic";
+    githubId = 156837150;
+  };
   jfroche = {
     name = "Jean-François Roche";
     email = "jfroche@pyxel.be";
@@ -13215,6 +13268,12 @@
     github = "joshainglis";
     githubId = 1281131;
   };
+  joshgodsiff = {
+    name = "Josh Godsiff";
+    email = "josh.godsiff@gmail.com";
+    github = "joshgodsiff";
+    githubId = 145132;
+  };
   joshheinrichs-shopify = {
     name = "Josh Heinrichs";
     email = "josh.heinrichs@shopify.com";
@@ -13844,6 +13903,13 @@
     matrix = "@katexochen:matrix.org";
     name = "Paul Meyer";
   };
+  katok = {
+    name = "katok";
+    email = "kat.ok.timofey@gmail.com";
+    matrix = "@kat.ok:matrix.org";
+    github = "Hi-Timofey";
+    githubId = 43324422;
+  };
   katrinafyi = {
     name = "katrinafyi";
     github = "katrinafyi";
@@ -14236,6 +14302,13 @@
     githubId = 10689811;
     name = "Torben Schweren";
   };
+  kittyandrew = {
+    email = "alias.nixpkgs.maintainer@kittymail.me";
+    github = "kittyandrew";
+    githubId = 45767571;
+    matrix = "@kittyandrew:ndrew.me";
+    name = "kittyandrew";
+  };
   kittywitch = {
     email = "kat@inskip.me";
     github = "kittywitch";
@@ -14453,6 +14526,12 @@
     githubId = 913109;
     name = "Emil Fresk";
   };
+  korkutkardes7 = {
+    email = "korkutkardes7@hotmail.com";
+    github = "KorkutKardes7";
+    githubId = 148012191;
+    name = "Korkut Kardeşseven";
+  };
   kornholi = {
     email = "kornholijo@gmail.com";
     github = "kornholi";
@@ -17994,7 +18073,7 @@
     keys = [ { fingerprint = "C3E7 F8C4 9CBC 9320 D360  B117 8516 D0FA 7D8F 58FC"; } ];
   };
   Misaka13514 = {
-    name = "Misaka13514";
+    name = "Rine Amakawa";
     email = "Misaka13514@gmail.com";
     matrix = "@misaka13514:matrix.org";
     github = "Misaka13514";
@@ -18440,6 +18519,11 @@
     githubId = 8165792;
     name = "Mark Karpov";
   };
+  mrmaxmeier = {
+    github = "mrmaxmeier";
+    githubId = 3913977;
+    name = "Mrmaxmeier";
+  };
   mrmebelman = {
     email = "burzakovskij@protonmail.com";
     github = "MrMebelMan";
@@ -19445,6 +19529,14 @@
     name = "Nicolas Goudry";
     keys = [ { fingerprint = "21B6 A59A 4E89 0B1B 83E3 0CDB 01C8 8C03 5450 9AA9"; } ];
   };
+  nicolas-guichard = {
+    name = "Nicolas Qiu Guichard";
+    email = "nicolas@guichard.eu";
+    matrix = "@nicolas:guichard.eu";
+    github = "nicolas-guichard";
+    githubId = 11260285;
+    keys = [ { fingerprint = "22B2 237B 0158 EE61 704C E191 7684 D229 0313 47AA"; } ];
+  };
   nicomem = {
     email = "nix@nicomem.com";
     github = "nicomem";
@@ -23305,12 +23397,6 @@
     githubId = 641278;
     name = "Robert T. McGibbon";
   };
-  rmgpinto = {
-    email = "hessian_loom_0u@icloud.com";
-    github = "rmgpinto";
-    githubId = 24584;
-    name = "Ricardo Gândara Pinto";
-  };
   rnhmjoj = {
     email = "rnhmjoj@inventati.org";
     matrix = "@rnhmjoj:eurofusion.eu";
@@ -24639,6 +24725,7 @@
     name = "Greg Pfeil";
   };
   sempiternal-aurora = {
+    email = "myrialsarvay@gmail.com";
     github = "sempiternal-aurora";
     githubId = 78790545;
     name = "Myria Sarvay";
@@ -25994,6 +26081,19 @@
     github = "StayBlue";
     githubId = 23127866;
   };
+  stealthbadger747 = {
+    email = "parawell.erik@gmail.com";
+    github = "StealthBadger747";
+    githubId = 26052996;
+    name = "Erik Parawell";
+  };
+  stealthybox = {
+    email = "leigh@null.net";
+    github = "stealthybox";
+    githubId = 2754700;
+    name = "Leigh Capili";
+    keys = [ { fingerprint = "05E7 89C9 142C DD05 8261  4EF8 5943 2144 444F B382"; } ];
+  };
   steamwalker = {
     email = "steamwalker@xs4all.nl";
     github = "steamwalker";
@@ -26246,12 +26346,6 @@
     githubId = 90754995;
     name = "sudo-mac";
   };
-  sudoforge = {
-    github = "sudoforge";
-    githubId = 3893293;
-    name = "sudoforge";
-    keys = [ { fingerprint = "7EBCE51F278D30AE1C34036341BF61468C327D5A"; } ];
-  };
   sudosubin = {
     email = "sudosubin@gmail.com";
     github = "sudosubin";
@@ -27730,6 +27824,12 @@
     githubId = 7727887;
     name = "Tomas Kala";
   };
+  tomasrivera = {
+    email = "tomas.riveral@icloud.com";
+    github = "tomasriveral";
+    githubId = 137088692;
+    name = "Tomás Rivera";
+  };
   tomberek = {
     email = "tomberek@gmail.com";
     matrix = "@tomberek:matrix.org";
diff --git a/maintainers/scripts/check-hydra-by-maintainer.nix b/maintainers/scripts/check-hydra-by-maintainer.nix
index 29e7d146456c..21e16c88c340 100644
--- a/maintainers/scripts/check-hydra-by-maintainer.nix
+++ b/maintainers/scripts/check-hydra-by-maintainer.nix
@@ -68,9 +68,6 @@ pkgs.stdenvNoCC.mkDerivation {
   '';
   shellHook =
     let
-      # trying to only add spaces as necessary for optional args
-      # with optStr don't need spaces between nix templating
-      optStr = cond: string: lib.optionalString cond "${string} ";
       args = [
         "hydra-check"
       ]
diff --git a/maintainers/scripts/haskell/dependencies.nix b/maintainers/scripts/haskell/dependencies.nix
index 718e626f7860..bd3594bcbd07 100644
--- a/maintainers/scripts/haskell/dependencies.nix
+++ b/maintainers/scripts/haskell/dependencies.nix
@@ -1,6 +1,6 @@
 # Nix script to calculate the Haskell dependencies of every haskellPackage. Used by ./hydra-report.hs.
 let
-  pkgs = import ../../.. { };
+  pkgs = import ../../.. { config.allowAliases = false; };
   inherit (pkgs) lib;
   getDeps =
     _: pkg:
diff --git a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
index d128433ce32b..1448f3666e1c 100755
--- a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
+++ b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
@@ -20,6 +20,6 @@ cat > $tmpfile << EOF
 dont-distribute-packages:
 EOF
 
-nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort --ignore-case >> $tmpfile
+nix-instantiate --show-trace --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort --ignore-case >> $tmpfile
 
 mv $tmpfile $config_file
diff --git a/maintainers/scripts/haskell/transitive-broken-packages.nix b/maintainers/scripts/haskell/transitive-broken-packages.nix
index f4a69e6e69a2..890bec72663d 100644
--- a/maintainers/scripts/haskell/transitive-broken-packages.nix
+++ b/maintainers/scripts/haskell/transitive-broken-packages.nix
@@ -1,11 +1,16 @@
 let
   nixpkgs = import ../../..;
   inherit (nixpkgs { }) pkgs lib;
+  isVersioned = attr: builtins.match "[A-Za-z0-9-]+(_[0-9]+)+" attr != null;
   getEvaluating =
     x:
-    builtins.attrNames (
+    lib.mapAttrsToList (_: v: v.pname) (
       lib.filterAttrs (
-        _: v: (builtins.tryEval (v.outPath or null)).success && lib.isDerivation v && !v.meta.broken
+        n: v:
+        !(isVersioned n)
+        && (builtins.tryEval (v.outPath or null)).success
+        && lib.isDerivation v
+        && !v.meta.broken
       ) x
     );
   brokenDeps = lib.subtractLists (getEvaluating pkgs.haskellPackages) (
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index e049064c7564..598f4663f909 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -111,4 +111,9 @@ sed -r \
 # ShellCheck: latest version of command-line dev tool.
 # Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs.
 
+# Work around Stackage LTS including a bogus version of cassava which has been deprecated on Hackage.
+# See <https://github.com/haskell-hvr/cassava/issues/248>.
+# TODO(@sternenseemann): drop this once the situation has been resolved in Stackage LTS
+sed -e 's/cassava ==0.5.5.0/cassava >= 0.5.4.0 && (> 0.5.5.0 || < 0.5.5.0) && < 0.6.0.0/' -i "$stackage_config"
+
 echo "$old_version -> $version"
diff --git a/maintainers/scripts/update-ruby-packages.checks.nix b/maintainers/scripts/update-ruby-packages.checks.nix
index 8df808beae69..d08c695f0e1d 100644
--- a/maintainers/scripts/update-ruby-packages.checks.nix
+++ b/maintainers/scripts/update-ruby-packages.checks.nix
@@ -17,12 +17,9 @@ in
 let
   inherit (builtins)
     attrNames
-    concatStrings
     filter
-    genList
     isNull
     length
-    stringLength
     toJSON
     ;
   inherit (pkgs.lib)
diff --git a/nixos/doc/manual/configuration/mattermost.chapter.md b/nixos/doc/manual/configuration/mattermost.chapter.md
index a7c3c1554efc..4d3d9b2057c7 100644
--- a/nixos/doc/manual/configuration/mattermost.chapter.md
+++ b/nixos/doc/manual/configuration/mattermost.chapter.md
@@ -99,7 +99,7 @@ these assumptions the best it can.
 
 Here is how to build the above Todo plugin. Note that we rely on
 package-lock.json being assembled correctly, so must use a version where it is!
-If there is no lockfile or the lockfile is incorrect, Nix cannot fetch NPM build
+If there is no lockfile or the lockfile is incorrect, Nix cannot fetch npm build
 and runtime dependencies for a sandbox build.
 
 ```nix
diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 2cad40493dc5..88cb8f37f146 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -1466,6 +1466,24 @@
   "module-services-mailman-other-mtas": [
     "index.html#module-services-mailman-other-mtas"
   ],
+  "test-opt-requiredFeatures": [
+    "index.html#test-opt-requiredFeatures"
+  ],
+  "test-opt-requiredFeatures.apple-virt": [
+    "index.html#test-opt-requiredFeatures.apple-virt"
+  ],
+  "test-opt-requiredFeatures.devnet": [
+    "index.html#test-opt-requiredFeatures.devnet"
+  ],
+  "test-opt-requiredFeatures.kvm": [
+    "index.html#test-opt-requiredFeatures.kvm"
+  ],
+  "test-opt-requiredFeatures.nixos-test": [
+    "index.html#test-opt-requiredFeatures.nixos-test"
+  ],
+  "test-opt-requiredFeatures.uid-range": [
+    "index.html#test-opt-requiredFeatures.uid-range"
+  ],
   "trezor": [
     "index.html#trezor"
   ],
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 4780b1cbfe10..4b3044a950b6 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -139,7 +139,7 @@
 
 - [`pay-respects`](https://codeberg.org/iff/pay-respects), a terminal command correction program, alternative to `thefuck`, written in Rust. Available as [programs.pay-respects](options.html#opt-programs.pay-respects).
 
-- [Radicle](https://radicle.xyz), an open source, peer-to-peer code collaboration stack built on Git. Available as [services.radicle](#opt-services.radicle.enable).
+- [Radicle](https://radicle.dev), an open source, peer-to-peer code collaboration stack built on Git. Available as [services.radicle](#opt-services.radicle.enable).
 
 - [Ordinal](https://github.com/snu-sf/Ordinal), A library for ordinal numbers in the Coq proof assistant.
 
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 862b3e88ae86..d84ab817d727 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -149,9 +149,9 @@
 
 - [qBittorrent](https://www.qbittorrent.org/), a bittorrent client programmed in C++ / Qt that uses libtorrent by Arvid Norberg. Available as [services.qbittorrent](#opt-services.qbittorrent.enable).
 
-- [radicle-ci-broker](https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8), a tool for running CI for repositories in the local [Radicle](https://radicle.xyz/) node. Available as [services.radicle.ci.broker.enable](#opt-services.radicle.ci.broker.enable).
+- [radicle-ci-broker](https://radicle.network/nodes/seed.radicle.dev/rad:zwTxygwuz5LDGBq255RA2CbNGrz8), a tool for running CI for repositories in the local [Radicle](https://radicle.dev/) node. Available as [services.radicle.ci.broker.enable](#opt-services.radicle.ci.broker.enable).
 
-- [radicle-native-ci](https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE), an adapter for the [Radicle CI broker](https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8), for performing CI runs locally. Available as [services.radicle.ci.adapters.native](#opt-services.radicle.ci.adapters.native.instances).
+- [radicle-native-ci](https://radicle.network/nodes/seed.radicle.dev/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE), an adapter for the [Radicle CI broker](https://radicle.network/nodes/seed.radicle.dev/rad:zwTxygwuz5LDGBq255RA2CbNGrz8), for performing CI runs locally. Available as [services.radicle.ci.adapters.native](#opt-services.radicle.ci.adapters.native.instances).
 
 - [rauc](https://rauc.io/) (the Robust Auto-Update Controller), a daemon that allows reliable and secure software updates in embedded Linux systems. Available at [services.rauc](#opt-services.rauc.enable).
 
diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index f883372fd450..a652c7a3657c 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -42,12 +42,28 @@
 
 - The default kernel package has been updated from 6.12 to 6.18. All supported kernels remain available.
 
+- The default D-Bus implementation has been switched from `dbus` to `dbus-broker`. dbus-broker provides
+  higher performance and reliability while maintaining compatibility with the D-Bus reference implementation.
+
+  Note that changing `services.dbus.implementation` is a **switch inhibitor**: switching between
+  implementations requires a reboot rather than just `nixos-rebuild switch`, because restarting D-Bus
+  mid-session is unsafe.
+
+  Users who wish to keep the classic daemon can set: `services.dbus.implementation = "dbus";`
+
+- The NixOS integration test driver now supports `systemd-nspawn` containers as an alternative backend to QEMU virtual machines ([#470248](https://github.com/NixOS/nixpkgs/pull/470248), [#478109](https://github.com/NixOS/nixpkgs/pull/478109), [#479968](https://github.com/NixOS/nixpkgs/pull/479968)).
+  Most NixOS integration tests do not require a full VM, and switching them to containers can considerably reduce test time and resource usage.
+  Container-based tests also run fine on Nix builders that are themselves VMs without KVM, and because containers can bind-mount host device nodes, they make it possible to exercise GPU/CUDA workloads from within NixOS integration tests.
+  See [the NixOS manual section on writing tests](https://nixos.org/manual/nixos/stable/#sec-writing-nixos-tests) for details on how to opt in and on the limitations of the container backend.
+
 ## New Modules {#sec-release-26.05-new-modules}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 - [OpenThread Border Router](https://openthread.io/), a Thread border router for POSIX-based platforms that bridges Thread mesh networks to IP networks. Available as [services.openthread-border-router](#opt-services.openthread-border-router.enable).
 
+- [Atuin](https://atuin.sh), magical shell history — sync, search and backup your terminal history. Available as [programs.atuin](#opt-programs.atuin.enable).
+
 - [Meshtastic](https://meshtastic.org), an open-source, off-grid, decentralised mesh network
   designed to run on affordable, low-power devices. Available as [services.meshtasticd]
   (#opt-services.meshtasticd.enable).
@@ -64,6 +80,8 @@
 
 - [reaction](https://reaction.ppom.me/), a daemon that scans program outputs for repeated patterns, and takes action. A common usage is to scan ssh and webserver logs, and to ban hosts that cause multiple authentication errors. A modern alternative to fail2ban. Available as [services.reaction](#opt-services.reaction.enable).
 
+- [vinyl-cache] as the Varnish Cache project renamed itself. Available as [services.vinyl-cache](#opt-services.vinyl-cache.enable). To aid the migration, the old `services.varnish` module is still available.
+
 - [papra](https://papra.app/), an open-source document management platform designed to help you organize, secure, and archive your files effortlessly. Available as [services.papra](#opt-services.papra.enable).
 
 - [rqbit](https://github.com/ikatson/rqbit), a bittorrent client written in Rust. It has HTTP API and Web UI, and can be used as a library. Available as [services.rqbit](#opt-services.rqbit.enable).
@@ -100,6 +118,8 @@
 
 - [Ente Auth](https://ente.io/auth/), an open source 2FA authenticator, with end-to-end encrypted backups. Available as [programs.ente-auth](#opt-programs.ente-auth.enable).
 
+- [linkding](https://linkding.link/), a self-hosted bookmark manager designed to be minimal, fast, and easy to set up. Available as [services.linkding](#opt-services.linkding.enable).
+
 - [Tinyauth](https://tinyauth.app/), a simple authentication middleware for web apps, with OAuth and LDAP support. Available as [services.tinyauth](#opt-services.tinyauth.enable).
 
 - [Strichliste](https://www.strichliste.org), a digital self-service tallysheet used in hackerspaces, clubs and offices. Available as [services.strichliste](#opt-services.strichliste.enable).
@@ -116,6 +136,8 @@
 
 - [RSSHub](https://github.com/DIYgod/RSSHub), a service to convert many sources into rss. Available as `services.rsshub`.
 
+- [ReFrame](https://github.com/AlynxZhou/reframe), a DRM/KMS based remote desktop for Linux that supports Wayland/NVIDIA/headless/login.
+
 - [Komodo Periphery](https://github.com/moghtech/komodo), a multi-server Docker and Git deployment agent by Komodo. Available as [services.komodo-periphery](#opt-services.komodo-periphery.enable).
 
 - [Shoko](https://shokoanime.com), an anime management system. Available as [services.shoko](#opt-services.shoko.enable).
@@ -126,7 +148,9 @@
 
 - [tabbyAPI](https://github.com/theroyallab/tabbyAPI), the official OpenAI compatible API server for Exllama. Available as [services.tabbyapi](#opt-services.tabbyapi.enable).
 
-- [Tdarr](https://tdarr.io), Audio/Video Library Analytics & Transcode/Remux Automation. Available as [services.tdarr](#opt-services.tdarr.enable)
+- [Tdarr](https://tdarr.io), Audio/Video Library Analytics & Transcode/Remux Automation. Available as [services.tdarr](#opt-services.tdarr.enable).
+
+- [Headplane](https://headplane.net), a feature-complete Web UI for Headscale. Available as [services.headplane](#opt-services.headplane.enable).
 
 - [whois](https://packages.qa.debian.org/w/whois.html), an intelligent WHOIS client. Available as `programs.whois`.
 
@@ -147,6 +171,8 @@
 
 - `services.crabfit` was removed because its upstream packages are unmaintained and insecure.
 
+- `services.mosquitto` now generates per-listener authentication and access control via the upstream `password-file` and `acl-file` plugins instead of the deprecated `password_file` and `acl_file` options. The plugins contain the same code, so behaviour is unchanged, but [](#opt-services.mosquitto.package) must now be at least version 2.1.
+
 - `sing-box` has been updated to 1.13.0, which has removed some deprecated options.  See [upstream documentation](https://sing-box.sagernet.org/configuration/) for details and migration options.
 
 - `services.statsd` has been removed because the packages it relies on do not exist anymore in nixpkgs.
@@ -167,6 +193,9 @@
 
 - `services.uptime` has been removed because the package it relies on does not exist anymore in nixpkgs.
 
+- `services.mattermost` now defaults to version 11, which has dropped support for MySQL in favor of Postgres. As a result, all support for MySQL has been removed from the module.
+  See the [migration steps](https://docs.mattermost.com/deployment-guide/manual-postgres-migration.html) if you were not running Postgres.
+
 - `post-resume.target` has been removed. See {manpage}`systemd.special(7)` about `sleep.target` for instructions on ordering a process after resume with `ExecStop=`.
 
 - `services.kubernetes.addons.dns.coredns` has been renamed to `services.kubernetes.addons.dns.corednsImage` and now expects a
@@ -256,6 +285,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
 - `ceph` has been upgraded to v20. See the [Ceph "tentacle" release notes](https://docs.ceph.com/en/latest/releases/tentacle/#v20-2-0-tentacle) for details and recommended upgrade procedure.
   Note that **upgrades of server-side components are one-way**, and downgrading e.g. an OSD from *Tentacle* to *Squid* is not just not supported but is known to break.
 
+- `services.unifi`'s `jrePackage` option now defaults to `jdk25_headless` instead of `jdk17_headless`, in order to be compatible with new versions of `unifi`.
+
 - The `networking.wireless` module has been security hardened by default: the `wpa_supplicant` daemon now runs under an unprivileged user with restricted access to the system.
 
   As part of these changes, `/etc/wpa_supplicant.conf` has been deprecated: the NixOS-generated configuration file is now linked to `/etc/wpa_supplicant/nixos.conf` and `/etc/wpa_supplicant/imperative.conf` has been added for imperatively configuring `wpa_supplicant` or when using [allowAuxiliaryImperativeNetworks](#opt-networking.wireless.allowAuxiliaryImperativeNetworks).
@@ -316,9 +347,17 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- [hardware.xpadneo](#opt-hardware.xpadneo.enable) now supports configuring kernel module parameters via a freeform [settings](#opt-hardware.xpadneo.settings) option, with convenience options for [rumble attenuation](#opt-hardware.xpadneo.rumbleAttenuation) and [controller quirks](#opt-hardware.xpadneo.quirks).
+- `switch-to-configuration` now reloads a service instead of restarting it when the only change to its unit is `ExecReload=`, and takes no action when `ExecReload=` is removed. Previously both cases triggered a restart.
 
-- The `services.prometheus.exporters` module interface now accepts an optional `socketOpts` attribute, allowing individual exporter modules to describe an accompanying `systemd.sockets.prometheus-${name}-exporter` unit alongside their service, enabling socket activation support.
+- [`hardware.nvidia.branch`](#opt-hardware.nvidia.branch) was added to select the NVIDIA driver branch; setting [`hardware.nvidia.package`](#opt-hardware.nvidia.package) overrides this.
+
+- The NixOS NVIDIA module wiring has been updated to match the new `nvidia-x11` output layout.
+
+- `nixos/nvidia` now uses EGL external platform ICD libraries built from source (`egl-gbm`, `egl-wayland`, `egl-wayland2`, `egl-x11`) instead of relying on vendor-provided binaries for these components.
+
+- `hardware.nvidia.moduleParams` was added to configure NVIDIA kernel module parameters declaratively. These parameters are now written to `modprobe` configuration instead of being passed through global kernel command-line parameters.
+
+- [hardware.xpadneo](#opt-hardware.xpadneo.enable) now supports configuring kernel module parameters via a freeform [settings](#opt-hardware.xpadneo.settings) option, with convenience options for [rumble attenuation](#opt-hardware.xpadneo.rumbleAttenuation) and [controller quirks](#opt-hardware.xpadneo.quirks).
 
 - Wine has been updated to the 11.0 branch. Please check the [upstream announcement](https://gitlab.winehq.org/wine/wine/-/releases/wine-11.0) for more details.
 
@@ -337,6 +376,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
 
 - Cinnamon has been updated to 6.6, please check the [upstream announcement](https://www.linuxmint.com/rel_zena_whatsnew.php) for more details.
 
+- Rspamd has been updated to 4.0. Please check the upstream [migration](https://docs.rspamd.com/tutorials/migration/#migration-to-rspamd-400) documentation, especially if you run a sharded Redis deployment.
+
 - Budgie has been updated to 10.10, please check the [upstream announcement](https://buddiesofbudgie.org/blog/budgie-10-10-released) for more details.
 
 - `fonts.fontconfig.useEmbeddedBitmaps` is now set to `true` by default.
@@ -356,6 +397,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
 
 - `systemd.network.*` has been updated to support all configuration options from upstream `networkd` version 259.
 
+- `networking.resolvconf.enable` now defaults to `true` unconditionally instead of `!(config.environment.etc ? "resolv.conf")`.If you set `environment.etc."resolv.conf"` yourself, then you should also set `networking.resolvconf.enable = false`.
+
 - `services.openssh` now supports generating host SSH keys by setting `services.openssh.generateHostKeys = true` while leaving `services.openssh.enable` disabled.  This is particularly useful for systems that have no need of an SSH daemon but want SSH host keys for other purposes such as using agenix or sops-nix.
 
 - `services.openssh.enableRecommendedAlgorithms` has been added to allow users to opt out of NixOS's curated set of recommended algorithms. This set to true by default, and thus is not a breaking change. Users may want to set this to false if they prefer upstream's default algorithms. See <https://github.com/NixOS/nixpkgs/pull/471330>.
diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix
index 8397eca39c51..13c529d53619 100644
--- a/nixos/lib/systemd-lib.nix
+++ b/nixos/lib/systemd-lib.nix
@@ -278,6 +278,21 @@ rec {
       attr ? ${name} && !(hasPrefix "@" attr.${name})
     ) "Systemd ${group} field `${name}' is not a systemd credential";
 
+  assertRouteMetricOrTriple =
+    name: group: attr:
+    let
+      isMetric = n: 0 <= n && 4294967295 >= n;
+
+      parts = splitString ":" attr.${name};
+      partsValid =
+        length parts == 3 && all (p: (match "[0-9]+" p) != null && isMetric (toIntBase10 p)) parts;
+      valid = (isInt attr.${name} && isMetric attr.${name}) || partsValid;
+    in
+    optional (attr ? ${name} && !valid) (
+      "Systemd ${group} field `${name}' must either be an integer in the range [0,4294967295]"
+      + " or a string containing three integers separated with `:`"
+    );
+
   checkUnitConfig =
     group: checks: attrs:
     let
diff --git a/nixos/lib/systemd-network-units.nix b/nixos/lib/systemd-network-units.nix
index 5d3e9b3c9351..ada010e2c58d 100644
--- a/nixos/lib/systemd-network-units.nix
+++ b/nixos/lib/systemd-network-units.nix
@@ -413,6 +413,10 @@ in
       [QuickFairQueueingClass]
       ${attrsToSection def.quickFairQueueingConfigClass}
     ''
+    + optionalString (def.mobileNetworkConfig != { }) ''
+      [MobileNetwork]
+      ${attrsToSection def.mobileNetworkConfig}
+    ''
     + flip concatMapStrings def.bridgeVLANs (x: ''
       [BridgeVLAN]
       ${attrsToSection x}
diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix
index 69ba17863012..77638397d11c 100644
--- a/nixos/lib/test-driver/default.nix
+++ b/nixos/lib/test-driver/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
 
   buildPythonApplication,
   colorama,
@@ -59,6 +60,8 @@ buildPythonApplication {
     socat
     util-linux
     vde2
+  ]
+  ++ lib.optionals stdenv.isLinux [
     vhost-device-vsock
   ]
   ++ lib.optionals enableNspawn [
diff --git a/nixos/lib/test-driver/src/test_driver/driver.py b/nixos/lib/test-driver/src/test_driver/driver.py
index 8b6a5dfef5a0..9ee11ff41ea0 100644
--- a/nixos/lib/test-driver/src/test_driver/driver.py
+++ b/nixos/lib/test-driver/src/test_driver/driver.py
@@ -315,7 +315,7 @@ class Driver:
 
         general_symbols = dict(
             start_all=self.start_all,
-            test_script=self.config.test_script,
+            test_script=self.test_script,
             machines=self.machines,
             machines_qemu=self.machines_qemu,
             machines_nspawn=self.machines_nspawn,
@@ -360,8 +360,6 @@ class Driver:
         if not self.config.enable_ssh_backdoor:
             return
 
-        assert self.vhost_vsock is not None
-
         if self.machines:
             print("SSH backdoor enabled, the machines can be accessed like this:")
             print(
diff --git a/nixos/lib/testing/driver-configuration.nix b/nixos/lib/testing/driver-configuration.nix
index 36e512f94f6b..222332d51fad 100644
--- a/nixos/lib/testing/driver-configuration.nix
+++ b/nixos/lib/testing/driver-configuration.nix
@@ -1,7 +1,7 @@
 {
   config,
   lib,
-  pkgs,
+  hostPkgs,
   ...
 }:
 let
@@ -75,9 +75,9 @@ in
         ) (lib.attrValues config.nodes ++ lib.attrValues config.containers)
       );
       global_timeout = config.globalTimeout;
-      test_script = pkgs.writeText "test-script" config.testScriptString;
+      test_script = hostPkgs.writeText "test-script" config.testScriptString;
       enable_ssh_backdoor = config.sshBackdoor.enable;
     };
-    driverConfigurationFile = pkgs.writers.writeJSON "driverConfiguration.json" config.driverConfiguration;
+    driverConfigurationFile = hostPkgs.writers.writeJSON "driverConfiguration.json" config.driverConfiguration;
   };
 }
diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix
index c6802d61dd43..40584b10e00d 100644
--- a/nixos/lib/testing/driver.nix
+++ b/nixos/lib/testing/driver.nix
@@ -9,6 +9,8 @@ let
 
   inherit (config) sshBackdoor;
 
+  inherit (hostPkgs.stdenv.hostPlatform) isLinux;
+
   # Reifies and correctly wraps the python test driver for
   # the respective qemu version and with or without ocr support
   testDriver = config.pythonTestDriverPackage.override {
@@ -251,7 +253,7 @@ in
         # depending on whether debugging is enabled.
         #
         # If needed, this can still be turned off.
-        virtualisation.qemu.enableSharedMemory = lib.mkDefault true;
+        virtualisation.qemu.enableSharedMemory = lib.mkDefault isLinux;
 
         assertions = [
           {
diff --git a/nixos/lib/testing/run.nix b/nixos/lib/testing/run.nix
index fcdd81412123..71d4e46f6d4f 100644
--- a/nixos/lib/testing/run.nix
+++ b/nixos/lib/testing/run.nix
@@ -3,6 +3,7 @@
   hostPkgs,
   lib,
   containers,
+  nodes,
   options,
   ...
 }:
@@ -28,9 +29,62 @@ let
     */
     f:
     lib.mkOverride (opt.highestPrio - 1) (f opt.value);
+
+  requiredFeaturesModuleType = {
+    freeformType = types.attrsOf types.bool;
+    options = {
+      devnet = mkOption {
+        type = types.bool;
+        default =
+          builtins.length (lib.attrNames containers) > 0 && builtins.length (lib.attrNames nodes) > 0;
+        defaultText = lib.literalMD "`true` if both VMs and containers are present.";
+        description = ''
+          This heuristic setting that assumes that the majority of tests requires VMs and containers
+          to communicate over network. To support such tests, adding "/dev/net" to `nix.settings.extra-sandbox-paths` is necessary.
+
+          Override this to `false` if the heuristic is wrong in some cases.
+        '';
+      };
+      nixos-test = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Standard requirement for NixOS integration tests";
+      };
+      uid-range = mkOption {
+        type = types.bool;
+        default = builtins.length (lib.attrNames containers) > 0;
+        defaultText = lib.literalMD "`true` if containers are present.";
+        description = "Containers use systemd-nspawn, which requires pid 0 inside of the sandbox. `uid-range` enables that.";
+      };
+      kvm = mkOption {
+        type = types.bool;
+        default = isLinux;
+        defaultText = lib.literalMD "`true` if built to run on Linux.";
+        description = "Whether Linux KVM virtualization is required when running this test. Can be disabled to allow emulated execution.";
+      };
+      apple-virt = mkOption {
+        type = types.bool;
+        default = isDarwin;
+        defaultText = lib.literalMD "`true` if built to run on Darwin.";
+        description = "Whether Apple virtualization functionality is required for running this test.";
+      };
+    };
+  };
 in
 {
   options = {
+    requiredFeatures = mkOption {
+      description = "Builder features that are required for running this test.";
+      example = lib.literalExpression ''
+        {
+          cuda = true;
+          devnet = mkForce false;
+        }
+      '';
+      type = types.submodule requiredFeaturesModuleType;
+      default = { }; # this is necessary due to a bug in the module system.
+    };
+
     passthru = mkOption {
       type = types.lazyAttrsOf types.raw;
       description = ''
@@ -98,13 +152,7 @@ in
       {
         name = "vm-test-run-${config.name}";
 
-        requiredSystemFeatures = [
-          "nixos-test"
-        ]
-        # Containers use systemd-nspawn, which requires pid 0 inside of the sandbox.
-        ++ lib.optional (builtins.length (lib.attrNames containers) > 0) "uid-range"
-        ++ lib.optional isLinux "kvm"
-        ++ lib.optional isDarwin "apple-virt";
+        requiredSystemFeatures = lib.attrNames (lib.filterAttrs (_: v: v) config.requiredFeatures);
 
         nativeBuildInputs = lib.optionals config.enableDebugHook [
           hostPkgs.openssh
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 9316b739fda2..62214cacc101 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -518,8 +518,7 @@ in
 
         useEmbeddedBitmaps = lib.mkOption {
           type = lib.types.bool;
-          default = lib.versionAtLeast config.system.stateVersion "26.05";
-          defaultText = lib.literalExpression "lib.versionAtLeast config.system.stateVersion \"26.05\"";
+          default = true;
           description = "Use embedded bitmaps in fonts like Calibri.";
         };
 
diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix
index e5831c0a71db..6b8a34f1a029 100644
--- a/nixos/modules/config/resolvconf.nix
+++ b/nixos/modules/config/resolvconf.nix
@@ -69,8 +69,7 @@ in
 
       enable = lib.mkOption {
         type = lib.types.bool;
-        default = !(config.environment.etc ? "resolv.conf");
-        defaultText = lib.literalExpression ''!(config.environment.etc ? "resolv.conf")'';
+        default = true;
         description = ''
           Whether DNS configuration is managed by resolvconf.
         '';
@@ -170,6 +169,17 @@ in
     }
 
     (lib.mkIf cfg.enable {
+      assertions = [
+        {
+          assertion = !(config.environment.etc ? "resolv.conf");
+          message = ''
+            networking.resolvconf.enable is true but environment.etc."resolv.conf"
+            is also set. Set networking.resolvconf.enable = false if another
+            service manages /etc/resolv.conf.
+          '';
+        }
+      ];
+
       users.groups.resolvconf = { };
 
       networking.resolvconf.subscriberFiles = [ "/etc/resolv.conf" ];
diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index a45fe8d88d56..1d5a1487bb3d 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
 
   sysctlOption = lib.mkOptionType {
@@ -61,11 +66,32 @@ in
 
   config = {
 
-    environment.etc."sysctl.d/60-nixos.conf".text = lib.concatStrings (
-      lib.mapAttrsToList (
-        n: v: lib.optionalString (v != null) "${n}=${if v == false then "0" else toString v}\n"
-      ) config.boot.kernel.sysctl
-    );
+    environment.etc = {
+      "sysctl.d/55-nixos-aslr-entropy.conf".source =
+        pkgs.runCommand "55-nixos-aslr-entropy.conf"
+          {
+            inherit (config.boot.kernelPackages.kernel) configfile;
+          }
+          ''
+            mmap_rnd_bits_max=$(grep "^CONFIG_ARCH_MMAP_RND_BITS_MAX=" $configfile | grep --only-matching "[0-9]*$")
+            if [[ -z "$mmap_rnd_bits_max" ]]; then
+              echo "Unable to determine mmap_rnd_bits_max. Check your kernel configfile is valid."
+              exit 1
+            fi
+            mmap_rnd_compat_bits_max=$(grep "^CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=" $configfile | grep --only-matching "[0-9]*$")
+            if [[ -z "$mmap_rnd_compat_bits_max" ]]; then
+              echo "Unable to determine mmap_rnd_compat_bits_max. Check your kernel configfile is valid."
+              exit 1
+            fi
+            echo "vm.mmap_rnd_bits=$mmap_rnd_bits_max" >> $out
+            echo "vm.mmap_rnd_compat_bits=$mmap_rnd_compat_bits_max" >> $out
+          '';
+      "sysctl.d/60-nixos.conf".text = lib.concatStrings (
+        lib.mapAttrsToList (
+          n: v: lib.optionalString (v != null) "${n}=${if v == false then "0" else toString v}\n"
+        ) config.boot.kernel.sysctl
+      );
+    };
 
     systemd.services.systemd-sysctl = {
       wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix
index 66a9d691c6b7..43bb633a1064 100644
--- a/nixos/modules/config/terminfo.nix
+++ b/nixos/modules/config/terminfo.nix
@@ -66,6 +66,17 @@
       source = "${config.system.path}/share/terminfo";
     };
 
+    boot.initrd.systemd.contents = lib.listToAttrs (
+      lib.map
+        (ti: lib.nameValuePair "/etc/terminfo/${ti}" { source = "${pkgs.ncurses}/share/terminfo/${ti}"; })
+        [
+          "l/linux"
+          "v/vt100"
+          "v/vt102"
+          "v/vt220"
+        ]
+    );
+
     environment.profileRelativeSessionVariables = {
       TERMINFO_DIRS = [ "/share/terminfo" ];
     };
diff --git a/nixos/modules/hardware/facter/amd-cpu.nix b/nixos/modules/hardware/facter/amd-cpu.nix
new file mode 100644
index 000000000000..ea779bd7d38f
--- /dev/null
+++ b/nixos/modules/hardware/facter/amd-cpu.nix
@@ -0,0 +1,24 @@
+{ lib, config, ... }:
+let
+  facterLib = import ./lib.nix lib;
+
+  inherit (config.hardware.facter) report;
+  isBaremetal = config.hardware.facter.detected.virtualisation.none.enable;
+  hasAmdCpu = facterLib.hasAmdCpu report;
+
+  kver = config.boot.kernelPackages.kernel.version;
+in
+lib.mkIf (config.hardware.facter.enable && isBaremetal && hasAmdCpu) {
+  boot = lib.mkMerge [
+    (lib.mkIf ((lib.versionAtLeast kver "5.17") && (lib.versionOlder kver "6.1")) {
+      kernelParams = [ "initcall_blacklist=acpi_cpufreq_init" ];
+      kernelModules = [ "amd-pstate" ];
+    })
+    (lib.mkIf ((lib.versionAtLeast kver "6.1") && (lib.versionOlder kver "6.3")) {
+      kernelParams = [ "amd_pstate=passive" ];
+    })
+    (lib.mkIf (lib.versionAtLeast kver "6.3") {
+      kernelParams = [ "amd_pstate=active" ];
+    })
+  ];
+}
diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix
index a748be44d411..7174f4afe160 100644
--- a/nixos/modules/hardware/facter/default.nix
+++ b/nixos/modules/hardware/facter/default.nix
@@ -5,6 +5,7 @@
 }:
 {
   imports = [
+    ./amd-cpu.nix
     ./boot.nix
     ./bluetooth.nix
     ./camera
diff --git a/nixos/modules/hardware/openrazer.nix b/nixos/modules/hardware/openrazer.nix
index 64a35dbef706..6a1589529893 100644
--- a/nixos/modules/hardware/openrazer.nix
+++ b/nixos/modules/hardware/openrazer.nix
@@ -6,11 +6,10 @@
 }:
 let
   cfg = config.hardware.openrazer;
-  kernelPackages = config.boot.kernelPackages;
 
   toPyBoolStr = b: if b then "True" else "False";
 
-  daemonExe = "${pkgs.openrazer-daemon}/bin/openrazer-daemon --config ${daemonConfFile}";
+  daemonExe = "${cfg.packages.daemon}/bin/openrazer-daemon --config ${daemonConfFile}";
 
   daemonConfFile = pkgs.writeTextFile {
     name = "razer.conf";
@@ -132,6 +131,14 @@ in
           can start and interact with the OpenRazer userspace daemon.
         '';
       };
+
+      packages = {
+        kernel = lib.mkPackageOption pkgs "openrazer kernel" { } // {
+          default = config.boot.kernelPackages.openrazer;
+          defaultText = lib.literalExpression "config.boot.kernelPackages.openrazer";
+        };
+        daemon = lib.mkPackageOption pkgs [ "python3Packages" "openrazer-daemon" ] { };
+      };
     };
   };
 
@@ -143,14 +150,16 @@ in
   ];
 
   config = lib.mkIf cfg.enable {
-    boot.extraModulePackages = [ kernelPackages.openrazer ];
+    boot.extraModulePackages = [ cfg.packages.kernel ];
     boot.kernelModules = drivers;
 
     # Makes the man pages available so you can successfully run
     # > systemctl --user help openrazer-daemon
-    environment.systemPackages = [ pkgs.python3Packages.openrazer-daemon.man ];
+    environment.systemPackages = lib.mkIf (cfg.packages.daemon ? man) [
+      cfg.packages.daemon.man
+    ];
 
-    services.udev.packages = [ kernelPackages.openrazer ];
+    services.udev.packages = [ cfg.packages.kernel ];
     services.dbus.packages = [ dbusServiceFile ];
 
     # A user must be a member of the openrazer group in order to start
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index fca939797b69..3aebc4a800f5 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -93,7 +93,10 @@ in
     ];
     boot.kernelModules = lib.optional useBbswitch "bbswitch";
     boot.extraModulePackages =
-      lib.optional useBbswitch kernel.bbswitch ++ lib.optional useNvidia kernel.nvidia_x11.bin;
+      lib.optional useBbswitch kernel.bbswitch
+      ++ lib.optional useNvidia (
+        if config.hardware.nvidia.open == true then kernel.nvidia_x11.open else kernel.nvidia_x11.mod
+      );
 
     environment.systemPackages = [
       bumblebee
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index d8c42c128438..dc3d6cb134f7 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -6,10 +6,12 @@
 }:
 let
   nvidiaEnabled = lib.elem "nvidia" config.services.xserver.videoDrivers;
-  nvidia_x11 = if nvidiaEnabled || cfg.datacenter.enable then cfg.package else null;
+  nvidia_x11 = if cfg.enabled then cfg.package else null;
 
   cfg = config.hardware.nvidia;
 
+  inherit (config.boot.kernelPackages) nvidiaPackages;
+
   useOpenModules = cfg.open == true;
 
   pCfg = cfg.prime;
@@ -27,7 +29,7 @@ in
       enabled = lib.mkOption {
         readOnly = true;
         type = lib.types.bool;
-        default = nvidia_x11 != null;
+        default = nvidiaEnabled || cfg.datacenter.enable;
         defaultText = lib.literalMD "`true` if NVIDIA support is enabled";
         description = "True if NVIDIA support is enabled";
       };
@@ -296,15 +298,63 @@ in
         It also drastically increases the time the driver needs to clock down after load
       '';
 
-      package = lib.mkOption {
-        default =
-          config.boot.kernelPackages.nvidiaPackages."${if cfg.datacenter.enable then "dc" else "stable"}";
+      branch = lib.mkOption {
+        type =
+          (lib.types.enum (builtins.attrNames (lib.filterAttrs (_: lib.isDerivation) nvidiaPackages)))
+          // {
+            description = "one of the available driver branches in `pkgs/os-specific/linux/nvidia-x11/default.nix`";
+          };
+        default = if cfg.datacenter.enable then "dc" else "stable";
         defaultText = lib.literalExpression ''
-          config.boot.kernelPackages.nvidiaPackages."\$\{if cfg.datacenter.enable then "dc" else "stable"}"
+          if config.hardware.nvidia.datacenter.enable then "dc" else "stable"
         '';
-        example = "config.boot.kernelPackages.nvidiaPackages.legacy_470";
+        example = "bleeding_edge";
+        description = ''
+          The branch of the NVIDIA driver to use.
+
+          Note: if {option}`hardware.nvidia.package` is set, it overrides this option.
+
+          Commonly interesting branches for end users:
+
+          - production, new_feature, beta:
+            NVIDIA's official production / new feature / beta release branches.
+
+          - stable:
+            The default; the highest stable version.
+
+          - latest:
+            Whichever is newer of `production` and `new_feature`.
+
+          - bleeding_edge:
+            Whichever is newer of `latest` and `beta`.
+
+          - legacy_580:
+            The long-lived 580 series (LTSB), for GPUs that newer driver branches
+            no longer support (often Maxwell through Volta; roughly GeForce GTX 9xx
+            through 10xx, plus rare Volta cards like TITAN V).
+
+          - vulkan_beta:
+            The Vulkan developer beta driver, for users interested in testing new
+            Vulkan features.
+        '';
+      };
+
+      package = lib.mkOption {
+        type = lib.types.package;
+        default = nvidiaPackages.${cfg.branch};
+        defaultText = lib.literalExpression "config.boot.kernelPackages.nvidiaPackages.\${config.hardware.nvidia.branch}";
+        example = lib.literalExpression "config.boot.kernelPackages.nvidiaPackages.legacy_470";
         description = ''
           The NVIDIA driver package to use.
+
+          Prefer using {option}`hardware.nvidia.branch` when possible.
+
+          If you set this option, it is recommended to pick a package from
+          `config.boot.kernelPackages.nvidiaPackages` so the driver build matches
+          your configured kernel.
+
+          For custom versions, you can use `nvidiaPackages.mkDriver`; see
+          `pkgs/os-specific/linux/nvidia-x11/default.nix` for examples.
         '';
       };
 
@@ -332,6 +382,20 @@ in
       videoAcceleration = lib.mkEnableOption "video acceleration (VA-API)" // {
         default = true;
       };
+
+      moduleParams = lib.mkOption {
+        type = lib.types.attrsOf (lib.types.attrsOf lib.types.raw);
+        default = { };
+        example = ''
+          {
+            nvidia = {
+              NVreg_UsePageAttributeTable = 1;
+              NVreg_RegistryDwords = "EnableBrightnessControl=1"
+            };
+          }
+        '';
+        description = "Additional parameters to pass to the NVIDIA kernel module.";
+      };
     };
   };
 
@@ -356,6 +420,13 @@ in
                 It is suggested to use the open source kernel modules on Turing or later GPUs (RTX series, GTX 16xx), and the closed source modules otherwise.
               '';
             }
+            {
+              assertion = !cfg.open || (nvidia_x11.open != null);
+              message = ''
+                The selected NVIDIA package does not provide open kernel modules.
+                Set hardware.nvidia.open = false or choose a package branch with open module support.
+              '';
+            }
           ];
           boot = {
             blacklistedKernelModules = [
@@ -394,10 +465,52 @@ in
             KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 0'"
             KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 1'"
           '';
-          hardware.graphics = {
-            extraPackages = [ nvidia_x11.out ];
-            extraPackages32 = [ nvidia_x11.lib32 ];
-          };
+          hardware.graphics =
+            let
+              icd = [
+                "egl-wayland"
+              ]
+              # GBM support was added in 495.
+              ++ lib.optionals (lib.versionAtLeast nvidia_x11.version "495") [
+                "egl-gbm"
+              ]
+              # ICDs below use a new driver interface, which is added in the 560 series drivers.
+              ++ lib.optionals (lib.versionAtLeast nvidia_x11.version "560") [
+                "egl-wayland2"
+                "egl-x11"
+              ];
+              combineIcdPkgs =
+                icd: pkgs:
+                pkgs.symlinkJoin {
+                  name = "nvidia-egl-external-platforms${lib.optionalString pkgs.stdenv.is32bit "-x32"}";
+                  paths = lib.attrVals icd pkgs;
+                  # Remediate reversed priorities in pre-595 drivers,
+                  # https://github.com/NixOS/nixpkgs/pull/497342#issuecomment-4034876793
+                  postBuild = lib.optionalString (lib.versionOlder nvidia_x11.version "595") ''
+                    pushd $out/share/egl/egl_external_platform.d
+                    for f in [0-9][0-9]_*; do
+                      num=''${f:0:2}
+                      rest=''${f:2}
+                      new=$(printf "%02d" $((99 - 10#$num)))
+                      mv -- "$f" "tmp-$new$rest"
+                    done
+                    for f in tmp-*; do
+                      mv -- "$f" "''${f#tmp-}"
+                    done
+                    popd
+                  '';
+                };
+            in
+            {
+              extraPackages = [
+                nvidia_x11.out
+                (combineIcdPkgs icd pkgs)
+              ];
+              extraPackages32 = [
+                nvidia_x11.lib32
+                (combineIcdPkgs icd pkgs.pkgsi686Linux)
+              ];
+            };
           environment.systemPackages = [ nvidia_x11.bin ];
         }
 
@@ -482,6 +595,17 @@ in
                 -> (useOpenModules && lib.versionAtLeast nvidia_x11.version "595");
               message = "NVIDIA driver support for kernel suspend notifiers requires NVIDIA driver version 595 or newer, and the open source kernel modules.";
             }
+
+            {
+              assertion =
+                removeAttrs cfg.moduleParams [
+                  "nvidia"
+                  "nvidia-drm"
+                  "nvidia-modeset"
+                  "nvidia-uvm"
+                ] == { };
+              message = "You can only use `hardware.nvidia.moduleParams` to set parameters for the kernel modules of NVIDIA drivers.";
+            }
           ];
 
           # If Optimus/PRIME is enabled, we:
@@ -673,8 +797,25 @@ in
             lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)
               "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";
 
+          hardware.nvidia.moduleParams = lib.mkMerge (
+            lib.optional (offloadCfg.enable || cfg.modesetting.enable) { nvidia-drm.modeset = 1; }
+            ++ lib.optional (
+              (offloadCfg.enable || cfg.modesetting.enable) && lib.versionAtLeast nvidia_x11.version "545"
+            ) { nvidia-drm.fbdev = 1; }
+            ++ lib.optional (cfg.powerManagement.enable && cfg.powerManagement.kernelSuspendNotifier) {
+              nvidia.NVreg_UseKernelSuspendNotifiers = 1;
+            }
+            ++ lib.optional cfg.powerManagement.enable { nvidia.NVreg_PreserveVideoMemoryAllocations = 1; }
+            ++ lib.optional (
+              useOpenModules
+              && lib.versionAtLeast nvidia_x11.version "515.43.04"
+              && lib.versionOlder nvidia_x11.version "545.23.06"
+            ) { nvidia.NVreg_OpenRmEnableUnsupportedGpus = 1; }
+            ++ lib.optional cfg.powerManagement.finegrained { nvidia.NVreg_DynamicPowerManagement = "0x02"; }
+          );
+
           boot = {
-            extraModulePackages = if useOpenModules then [ nvidia_x11.open ] else [ nvidia_x11.bin ];
+            extraModulePackages = if useOpenModules then [ nvidia_x11.open ] else [ nvidia_x11.mod ];
             # nvidia-uvm is required by CUDA applications.
             kernelModules = lib.optionals config.services.xserver.enable [
               "nvidia"
@@ -682,27 +823,16 @@ in
               "nvidia_drm"
             ];
 
-            # If requested enable modesetting via kernel parameters.
-            kernelParams =
-              lib.optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"
-              ++ lib.optional (
-                (offloadCfg.enable || cfg.modesetting.enable) && lib.versionAtLeast nvidia_x11.version "545"
-              ) "nvidia-drm.fbdev=1"
-              ++ lib.optional (
-                cfg.powerManagement.enable && cfg.powerManagement.kernelSuspendNotifier
-              ) "nvidia.NVreg_UseKernelSuspendNotifiers=1"
-              ++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
-              ++ lib.optional (
-                useOpenModules
-                && lib.versionAtLeast nvidia_x11.version "515.43.04"
-                && lib.versionOlder nvidia_x11.version "545.23.06"
-              ) "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
-              ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off";
+            kernelParams = lib.optional (
+              config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport
+            ) "ibt=off";
 
-            # enable finegrained power management
-            extraModprobeConfig = lib.optionalString cfg.powerManagement.finegrained ''
-              options nvidia "NVreg_DynamicPowerManagement=0x02"
-            '';
+            extraModprobeConfig =
+              let
+                mergeParams = lib.concatMapAttrsStringSep " " (k: v: "${k}=${toString v}");
+                genModprobeLine = module: params: "options ${module} ${mergeParams params}";
+              in
+              lib.concatMapAttrsStringSep "\n" genModprobeLine cfg.moduleParams;
           };
           services.udev.extraRules = lib.optionalString cfg.powerManagement.finegrained (
             lib.optionalString (lib.versionOlder config.boot.kernelPackages.kernel.version "5.5") ''
@@ -728,7 +858,7 @@ in
         })
         # Data Center
         (lib.mkIf (cfg.datacenter.enable) {
-          boot.extraModulePackages = [ nvidia_x11.bin ];
+          boot.extraModulePackages = if useOpenModules then [ nvidia_x11.open ] else [ nvidia_x11.mod ];
 
           systemd = {
             tmpfiles.rules =
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index ef8606bfc977..ce02bec09c6b 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -92,7 +92,7 @@ in
             -i ${channelSources} --quiet --option build-use-substitutes false \
             ${lib.optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root
           mkdir -m 0700 -p /root/.nix-defexpr
-          ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
+          ln -sfvT /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
           mkdir -m 0755 -p /var/lib/nixos
           touch /var/lib/nixos/did-channel-init
         fi
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 67788669e7a6..cefe69707a17 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -136,19 +136,21 @@ let
           libPath = filter (pkgs.path + "/lib");
           pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib");
           nixosPath = filteredModules + "/nixos";
-          NIX_ABORT_ON_WARN = warningsAreErrors;
+          env.NIX_ABORT_ON_WARN = warningsAreErrors;
           modules =
             "[ "
             + concatMapStringsSep " " (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy
             + " ]";
-          passAsFile = [ "modules" ];
           disallowedReferences = [
             filteredModules
             libPath
             pkgsLibPath
           ];
+          __structuredAttrs = true;
         }
         ''
+          modulesPath="$TMPDIR/modules"
+          printf "%s" "$modules" > "$modulesPath"
           export NIX_STORE_DIR=$TMPDIR/store
           export NIX_STATE_DIR=$TMPDIR/state
           ${pkgs.buildPackages.nix}/bin/nix-instantiate \
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 774140f86d92..74d4753a913b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -168,6 +168,7 @@
   ./programs/appimage.nix
   ./programs/arp-scan.nix
   ./programs/atop.nix
+  ./programs/atuin.nix
   ./programs/ausweisapp.nix
   ./programs/autoenv.nix
   ./programs/autojump.nix
@@ -691,6 +692,7 @@
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/openrgb.nix
   ./services/hardware/pcscd.nix
+  ./services/hardware/pdudaemon.nix
   ./services/hardware/pid-fan-controller.nix
   ./services/hardware/pommed.nix
   ./services/hardware/power-profiles-daemon.nix
@@ -726,6 +728,7 @@
   ./services/home-automation/esphome.nix
   ./services/home-automation/evcc.nix
   ./services/home-automation/govee2mqtt.nix
+  ./services/home-automation/home-assistant-matter-hub.nix
   ./services/home-automation/home-assistant.nix
   ./services/home-automation/homebridge.nix
   ./services/home-automation/matter-server.nix
@@ -1210,7 +1213,6 @@
   ./services/networking/geph.nix
   ./services/networking/ghostunnel.nix
   ./services/networking/git-daemon.nix
-  ./services/networking/globalprotect-vpn.nix
   ./services/networking/gns3-server.nix
   ./services/networking/gnunet.nix
   ./services/networking/go-autoconfig.nix
@@ -1224,6 +1226,7 @@
   ./services/networking/hans.nix
   ./services/networking/haproxy.nix
   ./services/networking/harmonia.nix
+  ./services/networking/headplane.nix
   ./services/networking/headscale.nix
   ./services/networking/hickory-dns.nix
   ./services/networking/hostapd.nix
@@ -1306,6 +1309,7 @@
   ./services/networking/netbird.nix
   ./services/networking/netbird/server.nix
   ./services/networking/netclient.nix
+  ./services/networking/netfoil.nix
   ./services/networking/networkd-dispatcher.nix
   ./services/networking/networkmanager.nix
   ./services/networking/newt.nix
@@ -1318,6 +1322,7 @@
   ./services/networking/nix-store-gcs-proxy.nix
   ./services/networking/nixops-dns.nix
   ./services/networking/nm-file-secret-agent.nix
+  ./services/networking/nmtrust.nix
   ./services/networking/nncp.nix
   ./services/networking/nntp-proxy.nix
   ./services/networking/nomad.nix
@@ -1698,6 +1703,7 @@
   ./services/web-apps/librespeed.nix
   ./services/web-apps/libretranslate.nix
   ./services/web-apps/limesurvey.nix
+  ./services/web-apps/linkding.nix
   ./services/web-apps/linkwarden.nix
   ./services/web-apps/lubelogger.nix
   ./services/web-apps/mainsail.nix
@@ -1837,6 +1843,7 @@
   ./services/web-servers/unit/default.nix
   ./services/web-servers/uwsgi.nix
   ./services/web-servers/varnish/default.nix
+  ./services/web-servers/vinyl-cache/default.nix
   ./services/x11/clight.nix
   ./services/x11/colord.nix
   ./services/x11/desktop-managers/default.nix
diff --git a/nixos/modules/profiles/nix-builder-vm.nix b/nixos/modules/profiles/nix-builder-vm.nix
index e34360f7f339..f52b54eb52f8 100644
--- a/nixos/modules/profiles/nix-builder-vm.nix
+++ b/nixos/modules/profiles/nix-builder-vm.nix
@@ -138,10 +138,6 @@ in
     #
     # TODO(winter): Move to qemu-vm? Trying it here for now as a
     # low impact change that'll probably improve people's experience.
-    #
-    # (I have no clue what is going on in https://github.com/nix-darwin/nix-darwin/issues/1081
-    # though, as this fix would only apply to one person in that thread... hopefully someone
-    # comes across with a reproducer if this doesn't do it.)
     system.systemBuilderArgs.allowSubstitutes = true;
 
     nix.settings = {
@@ -251,6 +247,9 @@ in
       # To prevent gratuitous rebuilds on each change to Nixpkgs
       nixos.revision = null;
 
+      # To prevent channels and Git checkouts resulting in different system drvs
+      nixos.versionSuffix = "";
+
       # to be updated by module maintainers, see nixpkgs#325610
       stateVersion = "24.05";
     };
diff --git a/nixos/modules/programs/atuin.nix b/nixos/modules/programs/atuin.nix
new file mode 100644
index 000000000000..51541959606a
--- /dev/null
+++ b/nixos/modules/programs/atuin.nix
@@ -0,0 +1,195 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) escapeShellArgs;
+
+  cfg = config.programs.atuin;
+
+  tomlFormat = pkgs.formats.toml { };
+
+  settingsFile = tomlFormat.generate "atuin-config" cfg.settings;
+in
+{
+  options.programs.atuin = {
+    enable = lib.mkEnableOption "atuin";
+
+    package = lib.mkPackageOption pkgs "atuin" { };
+
+    enableBashIntegration = lib.mkEnableOption "Bash integration" // {
+      default = config.programs.bash.enable;
+      defaultText = lib.literalExpression "config.programs.bash.enable";
+    };
+
+    enableZshIntegration = lib.mkEnableOption "Zsh integration" // {
+      default = config.programs.zsh.enable;
+      defaultText = lib.literalExpression "config.programs.zsh.enable";
+    };
+
+    enableFishIntegration = lib.mkEnableOption "Fish integration" // {
+      default = config.programs.fish.enable;
+      defaultText = lib.literalExpression "config.programs.fish.enable";
+    };
+
+    flags = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+      example = [
+        "--disable-up-arrow"
+        "--disable-ctrl-r"
+      ];
+      description = ''
+        Flags to append to the shell hook.
+      '';
+    };
+
+    settings = lib.mkOption {
+      type = tomlFormat.type;
+      default = { };
+      example = lib.literalExpression ''
+        {
+          auto_sync = true;
+          sync_frequency = "5m";
+          sync_address = "https://api.atuin.sh";
+          search_mode = "prefix";
+        }
+      '';
+      description = ''
+        Configuration written to {file}`/etc/atuin/config.toml`.
+
+        See <https://docs.atuin.sh/configuration/config/> for the full list
+        of options.
+      '';
+    };
+
+    daemon = {
+      enable = lib.mkEnableOption "the Atuin daemon" // {
+        default = pkgs.stdenv.hostPlatform.isLinux;
+        defaultText = lib.literalExpression "pkgs.stdenv.hostPlatform.isLinux";
+      };
+
+      logLevel = lib.mkOption {
+        type = lib.types.enum [
+          "trace"
+          "debug"
+          "info"
+          "warn"
+          "error"
+        ];
+        default = "info";
+        description = ''
+          Log level for the Atuin daemon.
+        '';
+      };
+    };
+
+    themes = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.oneOf [
+          tomlFormat.type
+          lib.types.path
+          lib.types.lines
+        ]
+      );
+      description = ''
+        Each theme is written to
+        {file}`/etc/atuin/themes/theme-name.toml`
+        where the name of each attribute is the theme-name
+
+        See <https://docs.atuin.sh/guide/theming/> for the full list
+        of options.
+      '';
+      default = { };
+      example = lib.literalExpression ''
+        {
+          "my-theme" = {
+            theme.name = "My Theme";
+            colors = {
+              Base = "#000000";
+              Title = "#FFFFFF";
+            };
+          };
+        }
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    # Atuin only reads from ATUIN_CONFIG_DIR or XDG_CONFIG_HOME, not XDG_CONFIG_DIRS,
+    # so we must set ATUIN_CONFIG_DIR to point to the system-wide config location.
+    environment.variables.ATUIN_CONFIG_DIR = "/etc/atuin";
+
+    environment.etc = lib.mkMerge [
+      (lib.mkIf (cfg.settings != { }) {
+        "atuin/config.toml".source = settingsFile;
+      })
+
+      (lib.mkIf (cfg.themes != { }) (
+        builtins.mapAttrs' (
+          name: theme:
+          lib.nameValuePair "atuin/themes/${name}.toml" {
+            source =
+              if builtins.isString theme then
+                pkgs.writeText "atuin-theme-${name}" theme
+              else if builtins.isPath theme || lib.isStorePath theme then
+                theme
+              else
+                tomlFormat.generate "atuin-theme-${name}" theme;
+          }
+        ) cfg.themes
+      ))
+    ];
+
+    programs.bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ''
+      if [[ :$SHELLOPTS: =~ :(vi|emacs): ]]; then
+        eval "$(${lib.getExe cfg.package} init bash ${escapeShellArgs cfg.flags})"
+      fi
+    '';
+
+    programs.zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration ''
+      if [[ $options[zle] = on ]]; then
+        eval "$(${lib.getExe cfg.package} init zsh ${escapeShellArgs cfg.flags})"
+      fi
+    '';
+
+    programs.fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration ''
+      ${lib.getExe cfg.package} init fish ${escapeShellArgs cfg.flags} | source
+    '';
+
+    systemd = lib.mkIf (cfg.daemon.enable && pkgs.stdenv.hostPlatform.isLinux) {
+      user.services.atuin-daemon = {
+        unitConfig = {
+          Description = "Atuin daemon";
+          Requires = [ "atuin-daemon.socket" ];
+        };
+        serviceConfig = {
+          ExecStart = "${lib.getExe cfg.package} daemon start";
+          Environment = [ "ATUIN_LOG=${cfg.daemon.logLevel}" ];
+          Restart = "on-failure";
+          RestartSteps = 3;
+          RestartMaxDelaySec = 6;
+        };
+      };
+
+      user.sockets.atuin-daemon = {
+        unitConfig = {
+          Description = "Atuin daemon socket";
+        };
+        socketConfig = {
+          ListenStream = "%t/atuin/atuin.sock";
+          SocketMode = "0640";
+          DirectoryMode = "0740";
+          RemoveOnStop = true;
+        };
+        wantedBy = [ "sockets.target" ];
+      };
+    };
+  };
+
+  meta.maintainers = cfg.package.meta.maintainers;
+}
diff --git a/nixos/modules/programs/bat.nix b/nixos/modules/programs/bat.nix
index 9d220cf7aa1c..d3fe0096c13d 100644
--- a/nixos/modules/programs/bat.nix
+++ b/nixos/modules/programs/bat.nix
@@ -5,9 +5,9 @@
   ...
 }:
 let
-  inherit (builtins) isList elem;
+  inherit (builtins) isList;
   inherit (lib)
-    getExe
+    concatMapStrings
     literalExpression
     maintainers
     mapAttrs'
@@ -36,33 +36,6 @@ let
       boolToString value
     else
       toString value;
-
-  initScript =
-    {
-      program,
-      shell,
-      flags ? [ ],
-    }:
-    if (shell != "fish") then
-      ''
-        eval "$(${getExe program} ${toString flags})"
-      ''
-    else
-      ''
-        ${getExe program} ${toString flags} | source
-      '';
-
-  shellInit =
-    shell:
-    optionalString (elem pkgs.bat-extras.batpipe cfg.extraPackages) (initScript {
-      program = pkgs.bat-extras.batpipe;
-      inherit shell;
-    })
-    + optionalString (elem pkgs.bat-extras.batman cfg.extraPackages) (initScript {
-      program = pkgs.bat-extras.batman;
-      inherit shell;
-      flags = [ "--export-env" ];
-    });
 in
 {
   options.programs.bat = {
@@ -112,17 +85,21 @@ in
       );
     };
 
-    programs = {
-      bash = mkIf (!config.programs.fish.enable) {
-        interactiveShellInit = shellInit "bash";
+    programs =
+      let
+        shellInit = shell: concatMapStrings (pkg: pkg.shellInit shell) cfg.extraPackages;
+      in
+      {
+        bash = mkIf (!config.programs.fish.enable) {
+          interactiveShellInit = shellInit "bash";
+        };
+        fish = mkIf config.programs.fish.enable {
+          interactiveShellInit = shellInit "fish";
+        };
+        zsh = mkIf (!config.programs.fish.enable && config.programs.zsh.enable) {
+          interactiveShellInit = shellInit "zsh";
+        };
       };
-      fish = mkIf config.programs.fish.enable {
-        interactiveShellInit = shellInit "fish";
-      };
-      zsh = mkIf (!config.programs.fish.enable && config.programs.zsh.enable) {
-        interactiveShellInit = shellInit "zsh";
-      };
-    };
   };
   meta.maintainers = with maintainers; [ sigmasquadron ];
 }
diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix
index 51ec0922c4f7..e6ea41778172 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -61,7 +61,7 @@ in
   config = lib.mkMerge [
     {
       programs.command-not-found = {
-        enable = lib.mkOptionDefault (builtins.pathExists cfg.dbPath);
+        enable = lib.mkDefault (builtins.pathExists cfg.dbPath);
         dbPath = pkgs.path + "/programs.sqlite";
       };
     }
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index dac854aeb4f3..86c29477ebcc 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -199,16 +199,16 @@ in
             ''
           else
             indentFishFile "nixos-env-preinit.fish" ''
-              # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
-              # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
-              set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions
+              # This happens before embedded:config.fish sets fish_function_path, so it is currently
+              # unset. We set it and then completely erase it, leaving its configuration to embedded:config.fish
+              set fish_function_path ${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d
 
               # source the NixOS environment config
               if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
                 fenv source ${config.system.build.setEnvironment}
               end
 
-              # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
+              # clear fish_function_path so that it will be correctly set when we return to embedded:config.fish
               set -e fish_function_path
             '';
       }
@@ -301,11 +301,20 @@ in
                     find -L $package/share/man -type f | xargs ${pkgs.python3.pythonOnBuildForHost.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null
                   fi
                 '';
+            packages =
+              if
+                config.documentation.enable && config.documentation.nixos.enable && config.documentation.man.enable
+              then
+                builtins.filter (pkg: pkg != config.system.build.manual.nixos-configuration-reference-manpage) (
+                  cfge.systemPackages ++ cfg.extraCompletionPackages
+                )
+              else
+                cfge.systemPackages ++ cfg.extraCompletionPackages;
           in
           pkgs.buildEnv {
             name = "system_fish-completions";
             ignoreCollisions = true;
-            paths = map generateCompletions (config.environment.systemPackages ++ cfg.extraCompletionPackages);
+            paths = map generateCompletions packages;
           };
       })
 
diff --git a/nixos/modules/programs/nh.nix b/nixos/modules/programs/nh.nix
index 6ed9f1e919d2..baf8d920061f 100644
--- a/nixos/modules/programs/nh.nix
+++ b/nixos/modules/programs/nh.nix
@@ -76,12 +76,6 @@ in
         [ ];
 
     assertions = [
-      # Not strictly required but probably a good assertion to have
-      {
-        assertion = cfg.clean.enable -> cfg.enable;
-        message = "programs.nh.clean.enable requires programs.nh.enable";
-      }
-
       {
         assertion = (cfg.flake != null) -> !(lib.hasSuffix ".nix" cfg.flake);
         message = "nh.flake must be a directory, not a nix file";
diff --git a/nixos/modules/programs/winbox.nix b/nixos/modules/programs/winbox.nix
index 78639f8d3ab9..62f010259754 100644
--- a/nixos/modules/programs/winbox.nix
+++ b/nixos/modules/programs/winbox.nix
@@ -25,7 +25,10 @@ in
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
     networking.firewall = lib.mkIf cfg.openFirewall {
-      allowedUDPPorts = [ 5678 ];
+      allowedUDPPorts = [
+        5678
+        20561
+      ];
       allowedUDPPortRanges = [
         {
           from = 40000;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index bd9f0dea099d..352cdf9b7f7f 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -214,6 +214,13 @@ in
     ] "The fourStoreEndpoint module has been removed")
     (mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed")
+    (mkRemovedOptionModule
+      [
+        "services"
+        "globalprotect"
+      ]
+      "The corresponding package was removed from nixpkgs, as it depended on qt5 webengine. A replacements based on tauri exist upstream, but requires non-trivial maintainance in nixpkgs to update."
+    )
     (mkRemovedOptionModule
       [
         "services"
diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix
index 2a2e816512e9..b5de6e9e8d94 100644
--- a/nixos/modules/security/acme/default.nix
+++ b/nixos/modules/security/acme/default.nix
@@ -677,10 +677,6 @@ let
       };
     in
     {
-      imports = [
-        (lib.mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ])
-      ];
-
       options = {
         validMinDays = lib.mkOption {
           type = lib.types.nullOr lib.types.int;
diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index f1a5eecd98a8..a2a5cb366850 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -143,68 +143,81 @@ in
     };
   };
 
-  config = lib.mkIf (cfg.enable && cfg.stateful) {
-    systemd.services = {
-      dhparams-init = {
-        description = "Clean Up Old Diffie-Hellman Parameters";
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      warnings = [
+        ''
+          The `security.dhparam` module is deprecated and scheduled for removal in NixOS 26.11.
+          Generating your own params has been shown to be problematic in RFC 7919 (2016).
 
-        # Clean up even when no DH params is set
-        wantedBy = [ "multi-user.target" ];
+          Remove any uses of DHE and migrate to ECDHE (RFC 8422, 2018) and
+          Hybrid PQ (draft-ietf-tls-ecdhe-mlkem, 2026) key exchange algorithms.
+        ''
+      ];
+    })
+    (lib.mkIf (cfg.enable && cfg.stateful) {
+      systemd.services = {
+        dhparams-init = {
+          description = "Clean Up Old Diffie-Hellman Parameters";
 
-        serviceConfig.RemainAfterExit = true;
-        serviceConfig.Type = "oneshot";
+          # Clean up even when no DH params is set
+          wantedBy = [ "multi-user.target" ];
 
-        script = ''
-          if [ ! -d ${cfg.path} ]; then
-            mkdir -p ${cfg.path}
-          fi
+          serviceConfig.RemainAfterExit = true;
+          serviceConfig.Type = "oneshot";
 
-          # Remove old dhparams
-          for file in ${cfg.path}/*; do
-            if [ ! -f "$file" ]; then
-              continue
+          script = ''
+            if [ ! -d ${cfg.path} ]; then
+              mkdir -p ${cfg.path}
             fi
-            ${lib.concatStrings (
-              lib.mapAttrsToList (
-                name:
-                { bits, path, ... }:
-                ''
-                  if [ "$file" = ${lib.escapeShellArg path} ] && \
-                     ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \
-                     | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then
-                    continue
-                  fi
-                ''
-              ) cfg.params
-            )}
-            rm "$file"
-          done
 
-          # TODO: Ideally this would be removing the *former* cfg.path, though
-          # this does not seem really important as changes to it are quite
-          # unlikely
-          rmdir --ignore-fail-on-non-empty ${cfg.path}
-        '';
-      };
-    }
-    // lib.mapAttrs' (
-      name:
-      { bits, path, ... }:
-      lib.nameValuePair "dhparams-gen-${name}" {
-        description = "Generate Diffie-Hellman Parameters for ${name}";
-        after = [ "dhparams-init.service" ];
-        before = [ "${name}.service" ];
-        requiredBy = [ "${name}.service" ];
-        wantedBy = [ "multi-user.target" ];
-        unitConfig.ConditionPathExists = "!${path}";
-        serviceConfig.Type = "oneshot";
-        script = ''
-          mkdir -p ${lib.escapeShellArg cfg.path}
-          ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \
-            ${toString bits}
-        '';
+            # Remove old dhparams
+            for file in ${cfg.path}/*; do
+              if [ ! -f "$file" ]; then
+                continue
+              fi
+              ${lib.concatStrings (
+                lib.mapAttrsToList (
+                  name:
+                  { bits, path, ... }:
+                  ''
+                    if [ "$file" = ${lib.escapeShellArg path} ] && \
+                       ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \
+                       | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then
+                      continue
+                    fi
+                  ''
+                ) cfg.params
+              )}
+              rm "$file"
+            done
+
+            # TODO: Ideally this would be removing the *former* cfg.path, though
+            # this does not seem really important as changes to it are quite
+            # unlikely
+            rmdir --ignore-fail-on-non-empty ${cfg.path}
+          '';
+        };
       }
-    ) cfg.params;
-  };
+      // lib.mapAttrs' (
+        name:
+        { bits, path, ... }:
+        lib.nameValuePair "dhparams-gen-${name}" {
+          description = "Generate Diffie-Hellman Parameters for ${name}";
+          after = [ "dhparams-init.service" ];
+          before = [ "${name}.service" ];
+          requiredBy = [ "${name}.service" ];
+          wantedBy = [ "multi-user.target" ];
+          unitConfig.ConditionPathExists = "!${path}";
+          serviceConfig.Type = "oneshot";
+          script = ''
+            mkdir -p ${lib.escapeShellArg cfg.path}
+            ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \
+              ${toString bits}
+          '';
+        }
+      ) cfg.params;
+    })
+  ];
 
 }
diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix
index 1ec1950a0970..05ab6e8bce87 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@@ -55,6 +55,7 @@ in
 
       settings = lib.mkOption {
         inherit (settingsFormat) type;
+        default = { };
         example.mpd = {
           enabled = true;
           hostname = "::";
diff --git a/nixos/modules/services/backup/duplicity.nix b/nixos/modules/services/backup/duplicity.nix
index fa0b00db6b2c..b4d9c94748d5 100644
--- a/nixos/modules/services/backup/duplicity.nix
+++ b/nixos/modules/services/backup/duplicity.nix
@@ -47,7 +47,7 @@ in
     includeFileList = lib.mkOption {
       type = lib.types.nullOr lib.types.path;
       default = null;
-      example = /path/to/fileList.txt;
+      example = "/path/to/fileList.txt";
       description = ''
         File containing newline-separated list of paths to include into the
         backups. See the FILE SELECTION section in {manpage}`duplicity(1)` for
@@ -58,7 +58,7 @@ in
     excludeFileList = lib.mkOption {
       type = lib.types.nullOr lib.types.path;
       default = null;
-      example = /path/to/fileList.txt;
+      example = "/path/to/fileList.txt";
       description = ''
         File containing newline-separated list of paths to exclude into the
         backups. See the FILE SELECTION section in {manpage}`duplicity(1)` for
diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix
index 6b374e0b0213..9610cf0f7b1a 100644
--- a/nixos/modules/services/backup/restic-rest-server.nix
+++ b/nixos/modules/services/backup/restic-rest-server.nix
@@ -94,7 +94,7 @@ in
           ${lib.optionalString cfg.appendOnly "--append-only"} \
           ${lib.optionalString cfg.privateRepos "--private-repos"} \
           ${lib.optionalString cfg.prometheus "--prometheus"} \
-          ${lib.escapeShellArgs cfg.extraFlags} \
+          ${lib.escapeShellArgs cfg.extraFlags}
         '';
         Type = "simple";
         User = "restic";
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 65df56ef39f1..2fd38e50459d 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -360,7 +360,7 @@ in
         ${lib.optionalString haveLocalDB ''
           if ! [ -e ${baseDir}/.db-created ]; then
             runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra
-            runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -- -O hydra hydra
+            runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra
             touch ${baseDir}/.db-created
           fi
           echo "create extension if not exists pg_trgm" | runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra
diff --git a/nixos/modules/services/continuous-integration/radicle/adapters/native.nix b/nixos/modules/services/continuous-integration/radicle/adapters/native.nix
index 3cbc191a96d6..24604c54c9b8 100644
--- a/nixos/modules/services/continuous-integration/radicle/adapters/native.nix
+++ b/nixos/modules/services/continuous-integration/radicle/adapters/native.nix
@@ -81,7 +81,7 @@ in
                 };
                 description = ''
                   Configuration of radicle-native-ci.
-                  See <https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE#configuration> for more information.
+                  See <https://radicle.network/nodes/seed.radicle.dev/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE#configuration> for more information.
                 '';
                 default = { };
               };
diff --git a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix
index 6c285ea656f7..1c287147ae91 100644
--- a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix
+++ b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix
@@ -135,7 +135,7 @@ in
       };
       description = ''
         Configuration of radicle-ci-broker.
-        See <https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8/tree/doc/userguide.md#configuration> for more information.
+        See <https://radicle.network/nodes/seed.radicle.dev/rad:zwTxygwuz5LDGBq255RA2CbNGrz8/tree/doc/userguide.md#configuration> for more information.
       '';
       default = { };
       example = lib.literalExpression ''
diff --git a/nixos/modules/services/databases/dgraph.nix b/nixos/modules/services/databases/dgraph.nix
index 9e0a463b0b37..f92e9d81e74e 100644
--- a/nixos/modules/services/databases/dgraph.nix
+++ b/nixos/modules/services/databases/dgraph.nix
@@ -16,7 +16,7 @@ let
       ''
         mkdir -p $out/bin
         makeWrapper ${cfg.package}/bin/dgraph $out/bin/dgraph \
-          --prefix PATH : "${lib.makeBinPath [ pkgs.nodejs ]}" \
+          --prefix PATH : "${lib.makeBinPath [ pkgs.nodejs ]}"
       '';
   securityOptions = {
     NoNewPrivileges = true;
diff --git a/nixos/modules/services/desktops/dunst.nix b/nixos/modules/services/desktops/dunst.nix
index a1198f828021..5713a300347e 100644
--- a/nixos/modules/services/desktops/dunst.nix
+++ b/nixos/modules/services/desktops/dunst.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  toml = pkgs.formats.toml { };
+  gitIni = pkgs.formats.gitIni { };
   cfg = config.services.dunst;
 in
 {
@@ -22,7 +22,7 @@ in
     };
 
     settings = lib.mkOption {
-      type = toml.type;
+      type = gitIni.type;
       default = { };
       description = "Dunst configuration, see dunst(5)";
       example = lib.literalExpression ''
@@ -69,7 +69,7 @@ in
 
     environment = {
       systemPackages = [ cfg.package ];
-      etc."xdg/dunst/dunstrc".source = toml.generate "dunstrc" cfg.settings;
+      etc."xdg/dunst/dunstrc".source = gitIni.generate "dunstrc" cfg.settings;
     };
 
     services.dbus.packages = [ cfg.package ];
diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix
index 93320b9be90a..c908ff3e3de1 100644
--- a/nixos/modules/services/display-managers/cosmic-greeter.nix
+++ b/nixos/modules/services/display-managers/cosmic-greeter.nix
@@ -73,7 +73,9 @@ in
       extraGroups = [ "video" ];
     };
     # Required for authentication
-    security.pam.services.cosmic-greeter = { };
+    security.pam.services.cosmic-greeter = {
+      allowNullPassword = true;
+    };
 
     hardware.graphics.enable = true;
     services.accounts-daemon.enable = true;
diff --git a/nixos/modules/services/hardware/pdudaemon.nix b/nixos/modules/services/hardware/pdudaemon.nix
new file mode 100644
index 000000000000..3f400848436e
--- /dev/null
+++ b/nixos/modules/services/hardware/pdudaemon.nix
@@ -0,0 +1,146 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.services.pdudaemon;
+  configFile = pkgs.writeText "pdudaemon.conf" (
+    lib.generators.toJSON { } {
+      daemon = {
+        hostname = cfg.bindAddress;
+        port = cfg.port;
+        logging_level = cfg.logLevel;
+        listener = cfg.listener;
+      };
+      pdus = cfg.pdus;
+    }
+  );
+in
+{
+  meta = {
+    maintainers = with lib.maintainers; [
+      aiyion
+      emantor
+    ];
+  };
+
+  options = {
+    services.pdudaemon = {
+      enable = lib.mkEnableOption "PDUDaemon";
+
+      package = lib.mkPackageOption pkgs "pdudaemon" { };
+
+      bindAddress = lib.mkOption {
+        default = "0.0.0.0";
+        type = lib.types.str;
+        description = "Bind address for the PDUDaemon.";
+      };
+
+      port = lib.mkOption {
+        default = 16421;
+        type = lib.types.port;
+        description = "Port to bind to.";
+      };
+
+      openFirewall = lib.mkOption {
+        default = false;
+        type = lib.types.bool;
+        description = ''
+          Whether to automatically open the PDUDaemon listen port in the firewall.
+        '';
+      };
+
+      listener = lib.mkOption {
+        default = "http";
+        type = lib.types.enum [
+          "http"
+          "tcp"
+        ];
+        description = "Which kind of listener to provide.";
+      };
+
+      logLevel = lib.mkOption {
+        default = "error";
+        type = lib.types.enum [
+          "debug"
+          "info"
+          "warning"
+          "error"
+        ];
+        description = "PDUDaemon log level.";
+      };
+
+      pdus = lib.mkOption {
+        type = with lib.types; attrsOf anything;
+        default = { };
+        description = ''
+          Structural pdus section of PDUDaemon's pdudaemon.conf.
+          Refer to <https://github.com/pdudaemon/pdudaemon/blob/main/share/pdudaemon.conf>
+          for more examples.
+        '';
+        example = lib.literalExpression ''
+          {
+            cbs350-poe-switch = {
+              driver = "snmpv1";
+              community = "private";
+              oid = ".1.3.6.1.2.1.105.1.1.1.3.1.*;
+              onsetting = 1;
+              offsetting = 2;
+            };
+            energenie = {
+              driver = "EG-PMS";
+              device = "aa:bb:cc:xx:yy";
+            };
+            local = {
+              driver = "localcmdline";
+            };
+          };
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ];
+
+    systemd.services.pdudaemon = {
+      after = [ "network-online.target" ];
+      description = "Control and Queueing daemon for PDUs";
+      serviceConfig = {
+        ExecStart = "${lib.getExe cfg.package} --conf ${configFile}";
+        Type = "simple";
+        DynamicUser = "yes";
+        StateDirectory = "pdudaemon";
+        ProtectHome = true;
+        Restart = "on-failure";
+        CapabilityBoundingSet = "";
+        PrivateDevices = true;
+        ProtectClock = true;
+        ProtectKernelLogs = true;
+        ProtectControlGroups = true;
+        ProtectKernelModules = true;
+        SystemCallArchitectures = "native";
+        MemoryDenyWriteExecute = true;
+        RestrictNamespaces = true;
+        ProtectHostname = true;
+        LockPersonality = true;
+        ProtectKernelTunables = true;
+        RestrictRealtime = true;
+        ProtectProc = "invisible";
+        ProcSubset = "pid";
+        PrivateUsers = true;
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged"
+          "~@resources"
+        ];
+      };
+
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+    };
+  };
+}
diff --git a/nixos/modules/services/hardware/pid-fan-controller.nix b/nixos/modules/services/hardware/pid-fan-controller.nix
index a90e515868d4..725cc96330c0 100644
--- a/nixos/modules/services/hardware/pid-fan-controller.nix
+++ b/nixos/modules/services/hardware/pid-fan-controller.nix
@@ -6,183 +6,70 @@
 }:
 let
   cfg = config.services.pid-fan-controller;
-  heatSource = {
-    options = {
-      name = lib.mkOption {
-        type = lib.types.uniq lib.types.nonEmptyStr;
-        description = "Name of the heat source.";
-      };
-      wildcardPath = lib.mkOption {
-        type = lib.types.nonEmptyStr;
-        description = ''
-          Path of the heat source's `hwmon` `temp_input` file.
-          This path can contain multiple wildcards, but has to resolve to
-          exactly one result.
-        '';
-      };
-      pidParams = {
-        setPoint = lib.mkOption {
-          type = lib.types.ints.unsigned;
-          description = "Set point of the controller in °C.";
-        };
-        P = lib.mkOption {
-          description = "K_p of PID controller.";
-          type = lib.types.float;
-        };
-        I = lib.mkOption {
-          description = "K_i of PID controller.";
-          type = lib.types.float;
-        };
-        D = lib.mkOption {
-          description = "K_d of PID controller.";
-          type = lib.types.float;
-        };
-      };
-    };
-  };
-
-  fan = {
-    options = {
-      wildcardPath = lib.mkOption {
-        type = lib.types.str;
-        description = ''
-          Wildcard path of the `hwmon` `pwm` file.
-          If the fans are not to be found in `/sys/class/hwmon/hwmon*` the corresponding
-          kernel module (like `nct6775`) needs to be added to `boot.kernelModules`.
-          See the [`hwmon` Documentation](https://www.kernel.org/doc/html/latest/hwmon/index.html).
-        '';
-      };
-      minPwm = lib.mkOption {
-        default = 0;
-        type = lib.types.ints.u8;
-        description = "Minimum PWM value.";
-      };
-      maxPwm = lib.mkOption {
-        default = 255;
-        type = lib.types.ints.u8;
-        description = "Maximum PWM value.";
-      };
-      cutoff = lib.mkOption {
-        default = false;
-        type = lib.types.bool;
-        description = "Whether to stop the fan when `minPwm` is reached.";
-      };
-      heatPressureSrcs = lib.mkOption {
-        type = lib.types.nonEmptyListOf lib.types.str;
-        description = "Heat pressure sources affected by the fan.";
-      };
-    };
-  };
+  settingsFormat = pkgs.formats.json { };
 in
 {
   options.services.pid-fan-controller = {
     enable = lib.mkEnableOption "the PID fan controller, which controls the configured fans by running a closed-loop PID control loop";
     package = lib.mkPackageOption pkgs "pid-fan-controller" { };
-    settings = {
-      interval = lib.mkOption {
-        default = 500;
-        type = lib.types.int;
-        description = "Interval between controller cycles in milliseconds.";
-      };
-      heatSources = lib.mkOption {
-        type = lib.types.listOf (lib.types.submodule heatSource);
-        description = "List of heat sources to be monitored.";
-        example = ''
-          [
-            {
-              name = "cpu";
-              wildcardPath = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon*/temp1_input";
-              pidParams = {
-                setPoint = 60;
-                P = -5.0e-3;
-                I = -2.0e-3;
-                D = -6.0e-3;
-              };
-            }
-          ];
-        '';
-      };
-      fans = lib.mkOption {
-        type = lib.types.listOf (lib.types.submodule fan);
-        description = "List of fans to be controlled.";
-        example = ''
-          [
-            {
-              wildcardPath = "/sys/devices/platform/nct6775.2592/hwmon/hwmon*/pwm1";
-              minPwm = 60;
-              maxPwm = 255;
-              heatPressureSrcs = [
-                "cpu"
-                "gpu"
-              ];
-            }
-          ];
-        '';
+    settings = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = lib.types.either settingsFormat.type (lib.types.listOf settingsFormat.type);
       };
+      default = { };
+      description = ''
+        Configuration for pid-fan-controller, see
+        <https://github.com/zimward/pid-fan-controller>
+        for supported values.
+      '';
     };
   };
-  config = lib.mkIf cfg.enable {
-    #map camel cased attrs into snake case for config
-    environment.etc."pid-fan-settings.json".text = builtins.toJSON {
-      interval = cfg.settings.interval;
-      heat_srcs = map (heatSrc: {
-        name = heatSrc.name;
-        wildcard_path = heatSrc.wildcardPath;
-        PID_params = {
-          set_point = heatSrc.pidParams.setPoint;
-          P = heatSrc.pidParams.P;
-          I = heatSrc.pidParams.I;
-          D = heatSrc.pidParams.D;
-        };
-      }) cfg.settings.heatSources;
-      fans = map (fan: {
-        wildcard_path = fan.wildcardPath;
-        min_pwm = fan.minPwm;
-        max_pwm = fan.maxPwm;
-        cutoff = fan.cutoff;
-        heat_pressure_srcs = fan.heatPressureSrcs;
-      }) cfg.settings.fans;
-    };
 
-    systemd.services.pid-fan-controller = {
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = [ (lib.getExe cfg.package) ];
-        ExecStopPost = [ "${lib.getExe cfg.package} disable" ];
-        Restart = "always";
-        #This service needs to run as root to write to /sys.
-        #therefore it should operate with the least amount of privileges needed
-        ProtectHome = "yes";
-        #strict is not possible as it needs /sys
-        ProtectSystem = "full";
-        ProtectProc = "invisible";
-        PrivateNetwork = "yes";
-        NoNewPrivileges = "yes";
-        MemoryDenyWriteExecute = "yes";
-        RestrictNamespaces = "~user pid net uts mnt";
-        ProtectKernelModules = "yes";
-        RestrictRealtime = "yes";
-        SystemCallFilter = "@system-service";
-        CapabilityBoundingSet = "~CAP_KILL CAP_WAKE_ALARM CAP_IPC_LOC CAP_BPF CAP_LINUX_IMMUTABLE CAP_BLOCK_SUSPEND CAP_MKNOD";
-      };
-      # restart unit if config changed
-      restartTriggers = [ config.environment.etc."pid-fan-settings.json".source ];
+  config =
+    let
+      oldConfig = cfg.settings ? heatSources;
+      configFile = settingsFormat.generate "pid-fan-settings.json" (
+        if oldConfig then
+          {
+            interval = cfg.settings.interval or 500;
+            heat_srcs = map (heatSrc: {
+              name = heatSrc.name or "";
+              wildcard_path = heatSrc.wildcardPath;
+              PID_params = {
+                set_point = heatSrc.pidParams.setPoint;
+                P = heatSrc.pidParams.P;
+                I = heatSrc.pidParams.I;
+                D = heatSrc.pidParams.D;
+              };
+            }) cfg.settings.heatSources;
+            fans = map (fan: {
+              wildcard_path = fan.wildcardPath;
+              min_pwm = fan.minPwm;
+              max_pwm = fan.maxPwm;
+              cutoff = fan.cutoff or false;
+              heat_pressure_srcs = fan.heatPressureSrcs;
+            }) cfg.settings.fans;
+          }
+        else
+          cfg.settings
+      );
+    in
+    lib.mkIf cfg.enable {
+      systemd.packages = [ cfg.package ];
+      systemd.services.pid-fan-controller.environment.PID_FAN_CONFIG = toString configFile;
+      systemd.services.pid-fan-controller.wantedBy = [ "multi-user.target" ];
+      systemd.services.pid-fan-controller-sleep.wantedBy = [ "sleep.target" ];
+
+      warnings =
+        if oldConfig then
+          [
+            ''
+              The configuration of `pid-fan-controller` is no longer deeply configured and the rewriting will be removed in 26.11!
+              Please switch to using underscore case as shown in the upstream documentation.
+            ''
+          ]
+        else
+          [ ];
     };
-    #sleep hook to restart the service as it breaks otherwise
-    systemd.services.pid-fan-controller-sleep = {
-      before = [ "sleep.target" ];
-      wantedBy = [ "sleep.target" ];
-      unitConfig = {
-        StopWhenUnneeded = "yes";
-      };
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        ExecStart = [ "systemctl stop pid-fan-controller.service" ];
-        ExecStop = [ "systemctl restart pid-fan-controller.service" ];
-      };
-    };
-  };
   meta.maintainers = with lib.maintainers; [ zimward ];
 }
diff --git a/nixos/modules/services/home-automation/esphome.nix b/nixos/modules/services/home-automation/esphome.nix
index b33a55da33aa..f172a3179d32 100644
--- a/nixos/modules/services/home-automation/esphome.nix
+++ b/nixos/modules/services/home-automation/esphome.nix
@@ -145,6 +145,7 @@ in
         RuntimeDirectoryMode = "0750";
         EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
         ReadWritePaths = [ stateDir ];
+        ExecPaths = [ stateDir ];
 
         # Hardening
         CapabilityBoundingSet = "";
diff --git a/nixos/modules/services/home-automation/evcc.nix b/nixos/modules/services/home-automation/evcc.nix
index 9708a3ce16f1..e6bde74d5f26 100644
--- a/nixos/modules/services/home-automation/evcc.nix
+++ b/nixos/modules/services/home-automation/evcc.nix
@@ -41,7 +41,7 @@ in
     environmentFile = mkOption {
       type = nullOr path;
       default = null;
-      example = /run/keys/evcc;
+      example = "/run/keys/evcc";
       description = ''
         File with environment variables to pass into the runtime environment.
 
diff --git a/nixos/modules/services/home-automation/home-assistant-matter-hub.nix b/nixos/modules/services/home-automation/home-assistant-matter-hub.nix
new file mode 100644
index 000000000000..465707642f15
--- /dev/null
+++ b/nixos/modules/services/home-automation/home-assistant-matter-hub.nix
@@ -0,0 +1,100 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.home-assistant-matter-hub;
+  settingsFormat = pkgs.formats.json { };
+  configFile = settingsFormat.generate "home-assistant-matter-hub.json" cfg.settings;
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    kranzes
+    marie
+  ];
+
+  options.services.home-assistant-matter-hub = {
+    enable = lib.mkEnableOption "home-assistant-matter-hub, a Matter bridge for Home Assistant";
+
+    package = lib.mkPackageOption pkgs "home-assistant-matter-hub" { };
+
+    openFirewall = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Whether to open the Matter commissioning ports (UDP/TCP 5540) in the
+        firewall.
+      '';
+    };
+
+    accessTokenFile = lib.mkOption {
+      type = lib.types.externalPath;
+      example = "/run/secrets/home-assistant-matter-hub-token";
+      description = ''
+        Path to a file containing a Home Assistant long-lived access token.
+        The file is loaded as a systemd credential and read into
+        `HAMH_HOME_ASSISTANT_ACCESS_TOKEN` at service start.
+      '';
+    };
+
+    settings = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = settingsFormat.type;
+        options = {
+          homeAssistantUrl = lib.mkOption {
+            type = lib.types.str;
+            example = lib.literalExpression "config.services.home-assistant.config.homeassistant.internal_url";
+            description = "HTTP URL of the Home Assistant instance to bridge.";
+          };
+
+          httpPort = lib.mkOption {
+            type = lib.types.port;
+            default = 8482;
+            description = "Port the web interface listens on.";
+          };
+        };
+      };
+      default = { };
+      example = lib.literalExpression ''
+        {
+          homeAssistantUrl = config.services.home-assistant.config.homeassistant.internal_url;
+        }
+      '';
+      description = ''
+        Configuration written to a JSON file and passed to
+        `home-assistant-matter-hub start --config`. Keys use camelCase, matching
+        the long-form CLI flags. See
+        <https://riddix.github.io/home-assistant-matter-hub/getting-started/installation#23-configuration-options>
+        for the full list of options.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    networking.firewall = lib.mkIf cfg.openFirewall {
+      allowedTCPPorts = [ 5540 ];
+      allowedUDPPorts = [ 5540 ];
+    };
+
+    systemd.services.home-assistant-matter-hub = {
+      description = "Home Assistant Matter Hub";
+      documentation = [ "https://riddix.github.io/home-assistant-matter-hub/" ];
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      script = ''
+        export HAMH_HOME_ASSISTANT_ACCESS_TOKEN=$(systemd-creds cat HAMH_HOME_ASSISTANT_ACCESS_TOKEN)
+        exec ${lib.getExe cfg.package} start --config=${configFile} --storage-location="$1"
+      '';
+      scriptArgs = "%S/home-assistant-matter-hub";
+
+      serviceConfig = {
+        LoadCredential = [ "HAMH_HOME_ASSISTANT_ACCESS_TOKEN:${cfg.accessTokenFile}" ];
+        DynamicUser = true;
+        StateDirectory = "home-assistant-matter-hub";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix
index 0bd3a0c2bd99..32dcf0347d2e 100644
--- a/nixos/modules/services/mail/maddy.nix
+++ b/nixos/modules/services/mail/maddy.nix
@@ -329,8 +329,8 @@ in
           This option does not delete accounts which are not (anymore) listed.
         '';
         example = {
-          "user1@localhost".passwordFile = /secrets/user1-localhost;
-          "user2@localhost".passwordFile = /secrets/user2-localhost;
+          "user1@localhost".passwordFile = "/secrets/user1-localhost";
+          "user2@localhost".passwordFile = "/secrets/user2-localhost";
         };
         type = lib.types.attrsOf (
           lib.types.submodule {
diff --git a/nixos/modules/services/matrix/tuwunel.nix b/nixos/modules/services/matrix/tuwunel.nix
index 1c760c6293cb..6296fd6cb6cf 100644
--- a/nixos/modules/services/matrix/tuwunel.nix
+++ b/nixos/modules/services/matrix/tuwunel.nix
@@ -81,7 +81,6 @@ in
             description = ''
               Addresses (IPv4 or IPv6) to listen on for connections by the reverse proxy/tls terminator.
               If set to `null`, tuwunel will listen on IPv4 and IPv6 localhost.
-              Must be `null` if `unix_socket_path` is set.
             '';
           };
           global.port = lib.mkOption {
@@ -167,14 +166,6 @@ in
 
   config = lib.mkIf cfg.enable {
     assertions = [
-      {
-        assertion = !(cfg.settings ? global.unix_socket_path) || !(cfg.settings ? global.address);
-        message = ''
-          In `services.matrix-tuwunel.settings.global`, `unix_socket_path` and `address` cannot be set at the
-          same time.
-          Leave one of the two options unset or explicitly set them to `null`.
-        '';
-      }
       {
         assertion = cfg.user != defaultUser -> config ? users.users.${cfg.user};
         message = "If `services.matrix-tuwunel.user` is changed, the configured user must already exist.";
diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix
index 5c08fc478e45..d9e76154f0a8 100644
--- a/nixos/modules/services/misc/jellyfin.nix
+++ b/nixos/modules/services/misc/jellyfin.nix
@@ -480,6 +480,11 @@ in
           ];
           SystemCallErrorNumber = "EPERM";
         };
+        unitConfig.RequiresMountsFor = [
+          cfg.configDir
+          cfg.logDir
+          cfg.cacheDir
+        ];
       };
     };
 
diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix
index bce6d68047f8..827229bc3da9 100644
--- a/nixos/modules/services/misc/open-webui.nix
+++ b/nixos/modules/services/misc/open-webui.nix
@@ -56,7 +56,7 @@ in
         '';
         description = ''
           Extra environment variables for Open-WebUI.
-          For more details see <https://docs.openwebui.com/getting-started/env-configuration>
+          For more details see <https://docs.openwebui.com/reference/env-configuration>
         '';
       };
 
diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix
index da174a6b5331..6a1956ed526e 100644
--- a/nixos/modules/services/misc/radicle.nix
+++ b/nixos/modules/services/misc/radicle.nix
@@ -41,7 +41,7 @@ let
       pkgs.gitMinimal
     ];
     documentation = [
-      "https://docs.radicle.xyz/guides/seeder"
+      "https://radicle.dev/guides/seeder"
     ];
     after = [
       "network.target"
@@ -225,7 +225,7 @@ in
         };
       settings = lib.mkOption {
         description = ''
-          See <https://app.radicle.xyz/nodes/seed.radicle.garden/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/radicle/src/node/config.rs#L275>
+          See <https://radicle.network/nodes/iris.radicle.network/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/radicle/src/node/config.rs#L275>
         '';
         default = { };
         example = lib.literalExpression ''
diff --git a/nixos/modules/services/misc/servarr/sonarr.nix b/nixos/modules/services/misc/servarr/sonarr.nix
index 283eac6b3d3b..a54d00097dd8 100644
--- a/nixos/modules/services/misc/servarr/sonarr.nix
+++ b/nixos/modules/services/misc/servarr/sonarr.nix
@@ -124,6 +124,7 @@ in
       // lib.optionalAttrs (cfg.dataDir == "/var/lib/sonarr/.config/NzbDrone") {
         StateDirectory = "sonarr";
       };
+      unitConfig.RequiresMountsFor = [ cfg.dataDir ];
     };
 
     networking.firewall = lib.mkIf cfg.openFirewall {
diff --git a/nixos/modules/services/monitoring/grafana-to-ntfy.nix b/nixos/modules/services/monitoring/grafana-to-ntfy.nix
index db35792363b8..e4b0bc2d09d9 100644
--- a/nixos/modules/services/monitoring/grafana-to-ntfy.nix
+++ b/nixos/modules/services/monitoring/grafana-to-ntfy.nix
@@ -9,9 +9,11 @@ let
   cfg = config.services.grafana-to-ntfy;
 in
 {
+  meta.maintainers = with lib.maintainers; [ kittyandrew ];
+
   options = {
     services.grafana-to-ntfy = {
-      enable = lib.mkEnableOption "Grafana-to-ntfy (ntfy.sh) alerts channel";
+      enable = lib.mkEnableOption "grafana-to-ntfy, a Grafana/Alertmanager to ntfy.sh bridge";
 
       package = lib.mkPackageOption pkgs "grafana-to-ntfy" { };
 
@@ -33,64 +35,127 @@ in
         };
 
         ntfyBAuthPass = lib.mkOption {
-          type = lib.types.path;
+          type = lib.types.nullOr lib.types.path;
           description = ''
             The path to the password for the specified ntfy-sh user.
             Setting this option is required when using a ntfy-sh instance with access control enabled.
           '';
           default = null;
+          example = "/run/secrets/grafana-to-ntfy-ntfy-pass";
         };
 
         bauthUser = lib.mkOption {
-          type = lib.types.str;
+          type = lib.types.nullOr lib.types.str;
           description = ''
-            The user that you will authenticate with in the Grafana webhook settings.
-            You can set this to whatever you like, as this is not the same as the ntfy-sh user.
+            The user for Basic Auth on incoming webhook requests from Grafana or Alertmanager.
+            When set together with {option}`bauthPass`, incoming requests require Basic Auth.
+            When both are null, the endpoint is open (unauthenticated).
           '';
-          default = "admin";
+          default = null;
+          example = "admin";
         };
 
         bauthPass = lib.mkOption {
-          type = lib.types.path;
-          description = "The path to the password you will use in the Grafana webhook settings.";
+          type = lib.types.nullOr lib.types.path;
+          description = ''
+            Path to the password file for Basic Auth on incoming webhook requests.
+            When set together with {option}`bauthUser`, incoming requests require Basic Auth.
+            When both are null, the endpoint is open (unauthenticated).
+          '';
+          default = null;
+          example = "/run/secrets/grafana-to-ntfy-bauth-pass";
+        };
+
+        markdown = lib.mkOption {
+          type = lib.types.bool;
+          description = "Enable Markdown formatting in ntfy notifications. Sets the X-Markdown header.";
+          default = false;
+        };
+
+        port = lib.mkOption {
+          type = lib.types.port;
+          description = "Port to listen on.";
+          default = 8080;
+        };
+
+        address = lib.mkOption {
+          type = lib.types.str;
+          description = "Address to listen on.";
+          default = "127.0.0.1";
+          example = "0.0.0.0";
         };
       };
     };
   };
 
   config = lib.mkIf cfg.enable {
-    systemd.services.grafana-to-ntfy = {
-      wantedBy = [ "multi-user.target" ];
+    assertions = [
+      {
+        assertion = (cfg.settings.bauthUser == null) == (cfg.settings.bauthPass == null);
+        message = "services.grafana-to-ntfy: bauthUser and bauthPass must both be set or both be null";
+      }
+      {
+        assertion = (cfg.settings.ntfyBAuthUser == null) == (cfg.settings.ntfyBAuthPass == null);
+        message = "services.grafana-to-ntfy: ntfyBAuthUser and ntfyBAuthPass must both be set or both be null";
+      }
+    ];
 
-      script = ''
-        export BAUTH_PASS=$(${lib.getExe' config.systemd.package "systemd-creds"} cat BAUTH_PASS_FILE)
-        ${lib.optionalString (cfg.settings.ntfyBAuthPass != null) ''
-          export NTFY_BAUTH_PASS=$(${lib.getExe' config.systemd.package "systemd-creds"} cat NTFY_BAUTH_PASS_FILE)
-        ''}
-        exec ${lib.getExe cfg.package}
-      '';
+    systemd.services.grafana-to-ntfy = {
+      description = "Grafana/Alertmanager to ntfy.sh bridge";
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+
+      script =
+        let
+          optionalCred = name: envVar: ''
+            export ${envVar}="$(${lib.getExe' config.systemd.package "systemd-creds"} cat ${name})"
+          '';
+        in
+        ''
+          ${lib.optionalString (cfg.settings.bauthPass != null) (optionalCred "BAUTH_PASS_FILE" "BAUTH_PASS")}
+          ${lib.optionalString (cfg.settings.ntfyBAuthPass != null) (
+            optionalCred "NTFY_BAUTH_PASS_FILE" "NTFY_BAUTH_PASS"
+          )}
+          exec ${lib.getExe cfg.package}
+        '';
 
       environment = {
         NTFY_URL = cfg.settings.ntfyUrl;
+        ROCKET_PORT = toString cfg.settings.port;
+        ROCKET_ADDRESS = cfg.settings.address;
+      }
+      // lib.optionalAttrs (cfg.settings.bauthUser != null) {
         BAUTH_USER = cfg.settings.bauthUser;
       }
       // lib.optionalAttrs (cfg.settings.ntfyBAuthUser != null) {
         NTFY_BAUTH_USER = cfg.settings.ntfyBAuthUser;
+      }
+      // lib.optionalAttrs cfg.settings.markdown {
+        MARKDOWN = "true";
       };
 
       serviceConfig = {
-        LoadCredential = [
-          "BAUTH_PASS_FILE:${cfg.settings.bauthPass}"
-        ]
-        ++ lib.optional (
-          cfg.settings.ntfyBAuthPass != null
-        ) "NTFY_BAUTH_PASS_FILE:${cfg.settings.ntfyBAuthPass}";
+        LoadCredential =
+          lib.optional (cfg.settings.bauthPass != null) "BAUTH_PASS_FILE:${cfg.settings.bauthPass}"
+          ++ lib.optional (
+            cfg.settings.ntfyBAuthPass != null
+          ) "NTFY_BAUTH_PASS_FILE:${cfg.settings.ntfyBAuthPass}";
 
         DynamicUser = true;
+
+        Restart = "always";
+        RestartSec = 5;
+
+        # Hardening
+        AmbientCapabilities = [ "" ];
         CapabilityBoundingSet = [ "" ];
-        DeviceAllow = "";
+        DevicePolicy = "closed";
         LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
         PrivateDevices = true;
+        PrivateTmp = true;
         PrivateUsers = true;
         ProcSubset = "pid";
         ProtectClock = true;
@@ -101,6 +166,8 @@ in
         ProtectKernelModules = true;
         ProtectKernelTunables = true;
         ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        RemoveIPC = true;
         RestrictAddressFamilies = [
           "AF_INET"
           "AF_INET6"
@@ -108,11 +175,12 @@ in
         ];
         RestrictNamespaces = true;
         RestrictRealtime = true;
-        MemoryDenyWriteExecute = true;
+        RestrictSUIDSGID = true;
         SystemCallArchitectures = "native";
         SystemCallFilter = [
           "@system-service"
           "~@privileged"
+          "~@resources"
         ];
         UMask = "0077";
       };
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 0d6c7eb055d4..40eca66a2afb 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -2091,7 +2091,7 @@ in
         set -o errexit -o pipefail -o nounset -o errtrace
         shopt -s inherit_errexit
 
-        exec ${cfg.package}/bin/grafana server -homepath ${cfg.dataDir} -config ${configFile}
+        exec ${lib.getExe cfg.package} server -homepath ${cfg.dataDir} -config ${configFile}
       '';
       serviceConfig = {
         WorkingDirectory = cfg.dataDir;
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.md b/nixos/modules/services/monitoring/prometheus/exporters.md
index f12be9b5f874..f0bff8154291 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.md
+++ b/nixos/modules/services/monitoring/prometheus/exporters.md
@@ -138,23 +138,12 @@ example:
           DynamicUser = false;
           ExecStart = ''
             ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \
-              --web.systemd-socket \
+              --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
               --web.telemetry-path ${cfg.telemetryPath} \
               ${lib.concatStringsSep " \\\n  " cfg.extraFlags}
           '';
         };
       };
-
-      # `socketOpts` is an optional attribute set describing a
-      # `systemd.sockets.prometheus-${name}-exporter` unit that
-      # accompanies the exporter's service. When set, it is merged
-      # with a default definition that includes
-      # `wantedBy = [ "sockets.target" ]`, enabling socket activation
-      # for exporters that support it.
-      # Note that this attribute is optional.
-      socketOpts = {
-        socketConfig.ListenStream = "${cfg.listenAddress}:${toString cfg.port}";
-      };
     }
     ```
   - This should already be enough for the postfix exporter. Additionally one
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index a6317a032235..057839834d52 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -36,15 +36,10 @@ let
   #   - extraOpts   (types.attrs): extra configuration options to
   #                                configure the exporter with, which
   #                                are appended to the default options
-  #   - socketOpts  (types.attrs): optional config that is merged with
-  #                                the default definition of the
-  #                                exporter's systemd socket unit. When
-  #                                set, a `prometheus-${name}-exporter.socket`
-  #                                unit is created, enabling socket activation.
   #
-  #  Note that `extraOpts` and `socketOpts` are optional, but a script
-  #  for the exporter's systemd service must be provided by specifying
-  #  either `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart`
+  #  Note that `extraOpts` is optional, but a script for the exporter's
+  #  systemd service must be provided by specifying either
+  #  `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart`
 
   exporterOpts =
     (genAttrs
@@ -316,7 +311,6 @@ let
       name,
       conf,
       serviceOpts,
-      socketOpts,
     }:
     let
       enableDynamicUser = serviceOpts.serviceConfig.DynamicUser or true;
@@ -374,19 +368,13 @@ let
         "-m comment --comment ${name}-exporter -j nixos-fw-accept"
       ]);
       networking.firewall.extraInputRules = mkIf (conf.openFirewall && nftables) conf.firewallRules;
-      systemd.sockets."prometheus-${name}-exporter" = mkIf (socketOpts != null) (mkMerge [
-        {
-          wantedBy = [ "sockets.target" ];
-        }
-        socketOpts
-      ]);
       systemd.services."prometheus-${name}-exporter" = mkMerge [
         {
           wantedBy = [ "multi-user.target" ];
           after = [ "network.target" ];
           serviceConfig.Restart = mkDefault "always";
           serviceConfig.PrivateTmp = mkDefault true;
-          serviceConfig.WorkingDirectory = mkDefault /tmp;
+          serviceConfig.WorkingDirectory = mkDefault "/tmp";
           serviceConfig.DynamicUser = mkDefault enableDynamicUser;
           serviceConfig.User = mkDefault conf.user;
           serviceConfig.Group = conf.group;
@@ -615,7 +603,6 @@ in
       mkExporterConf {
         inherit name;
         inherit (conf) serviceOpts;
-        socketOpts = conf.socketOpts or null;
         conf = cfg.${name};
       }
     ) exporterOpts)
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
index c053fc5417c1..55847902aa05 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
@@ -23,13 +23,10 @@ let
     if (builtins.isPath file) || (lib.isStorePath file) then
       file
     else
-      (
-        lib.warn ''
-          ${logPrefix}: configuration file "${file}" is being copied to the nix-store.
-          If you would like to avoid that, please set enableConfigCheck to false.
-        '' /.
-        + file
-      );
+      (lib.warn ''
+        ${logPrefix}: configuration file "${file}" is being copied to the nix-store.
+        If you would like to avoid that, please set enableConfigCheck to false.
+      '' (builtins.toFile (builtins.baseNameOf file) (builtins.readFile file)));
   checkConfigLocation =
     file:
     if lib.hasPrefix "/tmp/" file then
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
index b67ac32b443a..02663ce94b4f 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
@@ -86,7 +86,7 @@ in
     let
       collectSettingsArgs = optionalString (cfg.collectdBinary.enable) ''
         --collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
-        --collectd.security-level ${cfg.collectdBinary.securityLevel} \
+        --collectd.security-level ${cfg.collectdBinary.securityLevel}
       '';
     in
     {
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix b/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix
index d95a3867fdcc..22cc859013f6 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/ecoflow.nix
@@ -27,7 +27,7 @@ in
     };
     ecoflowAccessKeyFile = mkOption {
       type = types.path;
-      default = /etc/ecoflow-access-key;
+      default = "/etc/ecoflow-access-key";
       description = ''
         Path to the file with your personal api access string from the Ecoflow development website <https://developer-eu.ecoflow.com>.
         Do to share or commit your plaintext scecrets to a public repo use: agenix or soaps.
@@ -35,7 +35,7 @@ in
     };
     ecoflowSecretKeyFile = mkOption {
       type = types.path;
-      default = /etc/ecoflow-secret-key;
+      default = "/etc/ecoflow-secret-key";
       description = ''
         Path to the file with your personal api secret string from the Ecoflow development website <https://developer-eu.ecoflow.com>.
         Do to share or commit your plaintext scecrets to a public repo use: agenix or soaps.
@@ -43,7 +43,7 @@ in
     };
     ecoflowEmailFile = mkOption {
       type = types.path;
-      default = /etc/ecoflow-email;
+      default = "/etc/ecoflow-email";
       description = ''
         Path to the file with your personal ecoflow app login email address.
         Do to share or commit your plaintext scecrets to a public repo use: agenix or soaps.
@@ -51,7 +51,7 @@ in
     };
     ecoflowPasswordFile = mkOption {
       type = types.path;
-      default = /etc/ecoflow-password;
+      default = "/etc/ecoflow-password";
       description = ''
         Path to the file with your personal ecoflow app login email password.
         Do to share or commit your plaintext passwords to a public repo use: agenix or soaps here!
@@ -59,7 +59,7 @@ in
     };
     ecoflowDevicesFile = mkOption {
       type = types.path;
-      default = /etc/ecoflow-devices;
+      default = "/etc/ecoflow-devices";
       description = ''
         File must contain one line, example: R3300000,R3400000,NC430000,....
         The list of devices serial numbers separated by comma. For instance: SN1,SN2,SN3.
@@ -69,7 +69,7 @@ in
     };
     ecoflowDevicesPrettyNamesFile = mkOption {
       type = types.path;
-      default = /etc/ecoflow-devices-pretty-names;
+      default = "/etc/ecoflow-devices-pretty-names";
       description = ''
         File must contain one line, example: {"R3300000":"Delta 2","R3400000":"Delta Pro",...}
         The key/value map of custom names for your devices. Key is a serial number, value is a device name you want
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
index 82bb7c804294..2c4a82f0e044 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -39,7 +39,6 @@ in
       '';
     };
   };
-
   serviceOpts = {
     serviceConfig = {
       DynamicUser = false;
@@ -48,7 +47,7 @@ in
         ${pkgs.prometheus-node-exporter}/bin/node_exporter \
           ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \
           ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
-          --web.systemd-socket ${concatStringsSep " " cfg.extraFlags}
+          --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
       '';
       RestrictAddressFamilies =
         optionals (collectorIsEnabled "logind" || collectorIsEnabled "systemd") [
@@ -68,8 +67,4 @@ in
       ProtectHome = true;
     };
   };
-
-  socketOpts = {
-    socketConfig.ListenStream = "${cfg.listenAddress}:${toString cfg.port}";
-  };
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
index e0abda068b2f..53a4056b86dd 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
@@ -85,7 +85,6 @@ in
       };
     };
   };
-
   serviceOpts = {
     after = mkIf cfg.systemd.enable [ cfg.systemd.unit ];
     serviceConfig = {
@@ -96,7 +95,7 @@ in
       SupplementaryGroups = mkIf cfg.systemd.enable [ "systemd-journal" ];
       ExecStart = ''
         ${lib.getExe cfg.package} \
-          --web.systemd-socket \
+          --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
           --web.telemetry-path ${cfg.telemetryPath} \
           --postfix.showq_path ${escapeShellArg cfg.showqPath} \
           ${concatStringsSep " \\\n  " (
@@ -116,8 +115,4 @@ in
       '';
     };
   };
-
-  socketOpts = {
-    socketConfig.ListenStream = "${cfg.listenAddress}:${toString cfg.port}";
-  };
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
index b65c73d2dec7..768d27b0fdeb 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
@@ -24,13 +24,10 @@ let
     if (builtins.isPath file) || (lib.isStorePath file) then
       file
     else
-      (
-        lib.warn ''
-          ${logPrefix}: configuration file "${file}" is being copied to the nix-store.
-          If you would like to avoid that, please set enableConfigCheck to false.
-        '' /.
-        + file
-      );
+      (lib.warn ''
+        ${logPrefix}: configuration file "${file}" is being copied to the nix-store.
+        If you would like to avoid that, please set enableConfigCheck to false.
+      '' (builtins.toFile (builtins.baseNameOf file) (builtins.readFile file)));
 
   checkConfig =
     file:
diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix
index 1c3cbd9a7a3a..db1054209b8e 100644
--- a/nixos/modules/services/monitoring/scrutiny.nix
+++ b/nixos/modules/services/monitoring/scrutiny.nix
@@ -236,6 +236,44 @@ in
           RuntimeDirectoryMode = "0700";
           StateDirectory = "scrutiny";
           StateDirectoryMode = "0750";
+
+          RemoveIPC = true;
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          MemoryDenyWriteExecute = true;
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+            "~@resources"
+          ];
+          SystemCallArchitectures = "native";
+          LockPersonality = true;
+          CapabilityBoundingSet = "";
+          NoNewPrivileges = true;
+          PrivateTmp = true;
+          PrivateMounts = true;
+          PrivateDevices = true;
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectSystem = "strict";
+          ProtectProc = "invisible";
+          ProcSubset = "pid";
+          RestrictAddressFamilies = [
+            "AF_NETLINK"
+            "AF_INET"
+            "AF_INET6"
+            "AF_UNIX"
+          ];
+          SocketBindDeny = "any";
+          SocketBindAllow = [
+            "tcp:${toString cfg.settings.web.listen.port}"
+          ];
         };
       };
     })
diff --git a/nixos/modules/services/monitoring/vmalert.nix b/nixos/modules/services/monitoring/vmalert.nix
index 0baaa039e395..6dc6a6dc6043 100644
--- a/nixos/modules/services/monitoring/vmalert.nix
+++ b/nixos/modules/services/monitoring/vmalert.nix
@@ -25,14 +25,16 @@ let
     in
     attrsOf (either valueType (listOf valueType));
 
+  mkCliVal = value: if isPath value then "${value}" else toString value;
+
   mkLine =
     key: value:
     if value == true then
       "-${key}"
     else if isList value then
-      concatMapStringsSep " " (v: "-${key}=${escapeShellArg (toString v)}") value
+      concatMapStringsSep " " (v: "-${key}=${escapeShellArg (mkCliVal v)}") value
     else
-      "-${key}=${escapeShellArg (toString value)}";
+      "-${key}=${escapeShellArg (mkCliVal value)}";
 
   vmalertName = name: "vmalert" + lib.optionalString (name != "") ("-" + name);
   enabledInstances = lib.filterAttrs (name: conf: conf.enable) config.services.vmalert.instances;
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index c4d692812c47..908aaec2d070 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -93,6 +93,8 @@ in
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
 
+    services.epmd.enable = true;
+
     users.users = lib.optionalAttrs (cfg.user == "ejabberd") {
       ejabberd = {
         group = cfg.group;
@@ -109,7 +111,11 @@ in
     systemd.services.ejabberd = {
       description = "ejabberd server";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      after = [
+        "network.target"
+        "epmd.socket"
+      ];
+      wants = [ "epmd.socket" ];
       path = [
         pkgs.findutils
         pkgs.coreutils
diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix
index d2aceb5a9bb1..08e9400702da 100644
--- a/nixos/modules/services/networking/epmd.nix
+++ b/nixos/modules/services/networking/epmd.nix
@@ -5,6 +5,8 @@
   ...
 }:
 let
+  inherit (lib.types) listOf oneOf str;
+
   cfg = config.services.epmd;
 in
 {
@@ -21,7 +23,10 @@ in
     };
     package = lib.mkPackageOption pkgs "erlang" { };
     listenStream = lib.mkOption {
-      type = lib.types.str;
+      type = oneOf [
+        str
+        (listOf str)
+      ];
       default = "[::]:4369";
       description = ''
         the listenStream used by the systemd socket.
diff --git a/nixos/modules/services/networking/globalprotect-vpn.nix b/nixos/modules/services/networking/globalprotect-vpn.nix
deleted file mode 100644
index 626a9cd0130d..000000000000
--- a/nixos/modules/services/networking/globalprotect-vpn.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.services.globalprotect;
-
-  execStart =
-    if cfg.csdWrapper == null then
-      "${pkgs.globalprotect-openconnect}/bin/gpservice"
-    else
-      "${pkgs.globalprotect-openconnect}/bin/gpservice --csd-wrapper=${cfg.csdWrapper}";
-in
-
-{
-  options.services.globalprotect = {
-    enable = lib.mkEnableOption "globalprotect";
-
-    settings = lib.mkOption {
-      description = ''
-        GlobalProtect-openconnect configuration. For more information, visit
-        <https://github.com/yuezk/GlobalProtect-openconnect/wiki/Configuration>.
-      '';
-      default = { };
-      example = {
-        "vpn1.company.com" = {
-          openconnect-args = "--script=/path/to/vpnc-script";
-        };
-      };
-      type = lib.types.attrs;
-    };
-
-    csdWrapper = lib.mkOption {
-      description = ''
-        A script that will produce a Host Integrity Protection (HIP) report,
-        as described at <https://www.infradead.org/openconnect/hip.html>
-      '';
-      default = null;
-      example = lib.literalExpression ''"''${pkgs.openconnect}/libexec/openconnect/hipreport.sh"'';
-      type = lib.types.nullOr lib.types.path;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.dbus.packages = [ pkgs.globalprotect-openconnect ];
-
-    environment.etc."gpservice/gp.conf".text = lib.generators.toINI { } cfg.settings;
-
-    systemd.services.gpservice = {
-      description = "GlobalProtect openconnect DBus service";
-      serviceConfig = {
-        Type = "dbus";
-        BusName = "com.yuezk.qt.GPService";
-        ExecStart = execStart;
-      };
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-    };
-  };
-}
diff --git a/nixos/modules/services/networking/headplane.nix b/nixos/modules/services/networking/headplane.nix
new file mode 100644
index 000000000000..5fac2f04e37d
--- /dev/null
+++ b/nixos/modules/services/networking/headplane.nix
@@ -0,0 +1,479 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib)
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    types
+    ;
+  inherit (lib.attrsets) filterAttrsRecursive;
+  cfg = config.services.headplane;
+  settingsFormat = pkgs.formats.yaml { };
+  filterSettings = lib.converge (
+    filterAttrsRecursive (
+      _: v:
+      !lib.elem v [
+        { }
+        null
+      ]
+    )
+  );
+  agentSettings = cfg.settings.integration.agent;
+  settings = cfg.settings // {
+    integration = cfg.settings.integration // {
+      agent = if agentSettings == null || !agentSettings.enabled then null else agentSettings;
+    };
+  };
+  settingsFile = settingsFormat.generate "headplane-config.yaml" (filterSettings settings);
+in
+{
+  options.services.headplane = {
+    enable = mkEnableOption "Headplane";
+    package = mkPackageOption pkgs "headplane" { };
+
+    agent.package = mkPackageOption pkgs "headplane-agent" { };
+
+    debug = mkEnableOption "debug logging";
+
+    settings = mkOption {
+      description = ''
+        Headplane configuration options. Generates a YAML config file.
+        See: https://github.com/tale/headplane/blob/main/config.example.yaml
+      '';
+      type = types.submodule {
+        options = {
+          server = mkOption {
+            type = types.submodule {
+              options = {
+                host = mkOption {
+                  type = types.str;
+                  default = "127.0.0.1";
+                  description = "The host address to bind to.";
+                  example = "0.0.0.0";
+                };
+
+                port = mkOption {
+                  type = types.port;
+                  default = 3000;
+                  description = "The port to listen on.";
+                };
+
+                cookie_secret_path = mkOption {
+                  type = types.nullOr types.path;
+                  default = null;
+                  description = ''
+                    Path to a file containing the cookie secret.
+                    The secret must be exactly 32 characters long.
+                  '';
+                  example = lib.literalExpression "config.sops.secrets.headplane_cookie.path";
+                };
+
+                cookie_secure = mkOption {
+                  type = types.bool;
+                  default = true;
+                  description = ''
+                    Should the cookies only work over HTTPS?
+                    Set to false if running via HTTP without a proxy.
+                    Recommended to be true in production.
+                  '';
+                };
+
+                data_path = mkOption {
+                  type = types.path;
+                  default = "/var/lib/headplane";
+                  description = ''
+                    The path to persist Headplane specific data.
+                    All data going forward is stored in this directory, including the internal database and any cache related files.
+                    Data formats prior to 0.6.1 will automatically be migrated.
+                  '';
+                  example = "/var/lib/headplane";
+                };
+              };
+            };
+            default = { };
+            description = "Server configuration for Headplane web application.";
+          };
+
+          headscale = mkOption {
+            type = types.submodule {
+              options = {
+                url = mkOption {
+                  type = types.str;
+                  default = "http://127.0.0.1:${toString config.services.headscale.port}";
+                  defaultText = lib.literalExpression "http://127.0.0.1:\${toString config.services.headscale.port}";
+                  description = ''
+                    The URL to your Headscale instance.
+                    All API requests are routed through this URL.
+                    THIS IS NOT the gRPC endpoint, but the HTTP endpoint.
+                    IMPORTANT: If you are using TLS this MUST be set to `https://`.
+                  '';
+                  example = "https://headscale.example.com";
+                };
+
+                tls_cert_path = mkOption {
+                  type = types.nullOr types.path;
+                  default = null;
+                  description = ''
+                    Path to a file containing the TLS certificate.
+                  '';
+                  example = lib.literalExpression "config.sops.secrets.tls_cert.path";
+                };
+
+                public_url = mkOption {
+                  type = types.nullOr types.str;
+                  default = config.services.headscale.settings.server_url;
+                  defaultText = lib.literalExpression "config.services.headscale.settings.server_url";
+                  description = "Public URL if different. This affects certain parts of the web UI.";
+                  example = "https://headscale.example.com";
+                };
+
+                config_path = mkOption {
+                  type = types.nullOr types.path;
+                  default = config.services.headscale.configFile;
+                  defaultText = lib.literalExpression "config.services.headscale.configFile";
+                  description = ''
+                    Path to the Headscale configuration file.
+                    This is optional, but HIGHLY recommended for the best experience.
+                    If this is read only, Headplane will show your configuration settings
+                    in the Web UI, but they cannot be changed.
+                  '';
+                  example = "/etc/headscale/config.yaml";
+                };
+
+                config_strict = mkEnableOption ''
+                  Headplane internally validates the Headscale configuration
+                  to ensure that it changes the configuration in a safe way.
+                  Disabled by default because it clashes with how the Headplane works in NixOS.
+                '';
+
+                dns_records_path = mkOption {
+                  type = types.nullOr types.path;
+                  default = null;
+                  description = ''
+                    If you are using `dns.extra_records_path` in your Headscale configuration, you need to set this to the path for Headplane to be able to read the DNS records.
+                    Ensure that the file is both readable and writable by the Headplane process.
+                    When using this, Headplane will no longer need to automatically restart Headscale for DNS record changes.
+                  '';
+                  example = "/var/lib/headplane/extra_records.json";
+                };
+              };
+            };
+            default = { };
+            description = "Headscale specific settings for Headplane integration.";
+          };
+
+          integration = mkOption {
+            type = types.submodule {
+              options = {
+                agent = mkOption {
+                  type = types.nullOr (
+                    types.submodule {
+                      options = {
+                        enabled = mkOption {
+                          type = types.bool;
+                          default = false;
+                          description = ''
+                            The Headplane agent allows retrieving information about nodes.
+                            This allows the UI to display version, OS, and connectivity data.
+                            You will see the Headplane agent in your Tailnet as a node when it connects.
+                          '';
+                        };
+
+                        executable_path = mkOption {
+                          type = types.path;
+                          readOnly = true;
+                          default = "${cfg.agent.package}/bin/hp_agent";
+                          defaultText = lib.literalExpression ''"''${config.services.headplane.agent.package}/bin/hp_agent"'';
+                          description = ''
+                            Path to the headplane agent binary.
+                          '';
+                        };
+
+                        pre_authkey_path = mkOption {
+                          type = types.nullOr types.path;
+                          default = null;
+                          description = ''
+                            Path to a file containing the agent preauth key.
+                            To connect to your Tailnet, you need to generate a pre-auth key.
+                            This can be done via the web UI or through the `headscale` CLI.
+                          '';
+                          example = lib.literalExpression "config.sops.secrets.agent_pre_authkey.path";
+                        };
+
+                        host_name = mkOption {
+                          type = types.str;
+                          default = "headplane-agent";
+                          description = "Optionally change the name of the agent in the Tailnet";
+                        };
+
+                        cache_ttl = mkOption {
+                          type = types.ints.positive;
+                          default = 180000;
+                          description = ''
+                            How long to cache agent information (in milliseconds).
+                            If you want data to update faster, reduce the TTL, but this will increase the frequency of requests to Headscale.
+                          '';
+                        };
+
+                        cache_path = mkOption {
+                          type = types.path;
+                          default = "/var/lib/headplane/agent_cache.json";
+                          description = "Where to store the agent cache.";
+                        };
+
+                        work_dir = mkOption {
+                          type = types.path;
+                          default = "/var/lib/headplane/agent";
+                          description = ''
+                            Do not change this unless you are running a custom deployment.
+                            The work_dir represents where the agent will store its data to be able to automatically reauthenticate with your Tailnet.
+                            It needs to be writable by the user running the Headplane process.
+                          '';
+                        };
+                      };
+                    }
+                  );
+                  default = null;
+                  description = "Agent configuration for the Headplane agent.";
+                };
+
+                proc = mkOption {
+                  type = types.submodule {
+                    options = {
+                      enabled = mkOption {
+                        type = types.bool;
+                        default = true;
+                        description = ''
+                          Enable "Native" integration that works when Headscale and
+                          Headplane are running outside of a container. There is no additional
+                          configuration, but you need to ensure that the Headplane process
+                          can terminate the Headscale process.
+                        '';
+                      };
+                    };
+                  };
+                  default = { };
+                  description = "Native process integration settings.";
+                };
+              };
+            };
+            default = { };
+            description = "Integration configurations for Headplane to interact with Headscale.";
+          };
+
+          oidc = mkOption {
+            type = types.nullOr (
+              types.submodule {
+                options = {
+                  issuer = mkOption {
+                    type = types.str;
+                    description = "URL to OpenID issuer.";
+                    example = "https://provider.example.com/issuer-url";
+                  };
+
+                  client_id = mkOption {
+                    type = types.str;
+                    description = "The client ID for the OIDC client.";
+                    example = "your-client-id";
+                  };
+
+                  client_secret_path = mkOption {
+                    type = types.nullOr types.path;
+                    default = null;
+                    description = ''
+                      Path to a file containing the OIDC client secret.
+                    '';
+                    example = lib.literalExpression "config.sops.secrets.oidc_client_secret.path";
+                  };
+
+                  disable_api_key_login = mkOption {
+                    type = types.bool;
+                    default = false;
+                    description = "Whether to disable API key login.";
+                  };
+
+                  token_endpoint_auth_method = mkOption {
+                    type = types.enum [
+                      "client_secret_post"
+                      "client_secret_basic"
+                      "client_secret_jwt"
+                    ];
+                    default = "client_secret_post";
+                    description = "The token endpoint authentication method.";
+                  };
+
+                  headscale_api_key_path = mkOption {
+                    type = types.nullOr types.path;
+                    default = null;
+                    description = ''
+                      Path to a file containing the Headscale API key.
+                      Required when `services.headplane.settings.oidc` is set.
+                    '';
+                    example = lib.literalExpression "config.sops.secrets.headscale_api_key.path";
+                  };
+
+                  redirect_uri = mkOption {
+                    type = types.nullOr types.str;
+                    default = null;
+                    description = ''
+                      This should point to your publicly accessible URL
+                      for your Headplane instance with /admin/oidc/callback.
+                    '';
+                    example = "https://headscale.example.com/admin/oidc/callback";
+                  };
+
+                  user_storage_file = mkOption {
+                    type = types.path;
+                    default = "/var/lib/headplane/users.json";
+                    description = ''
+                      Path to a file containing the users and their permissions for Headplane.
+                    '';
+                    example = "/var/lib/headplane/users.json";
+                  };
+
+                  profile_picture_source = mkOption {
+                    type = types.enum [
+                      "oidc"
+                      "gravatar"
+                    ];
+                    default = "oidc";
+                    description = "Source for user profile pictures.";
+                  };
+
+                  strict_validation = mkOption {
+                    type = types.bool;
+                    default = true;
+                    description = "Enable strict validation of OIDC configuration.";
+                  };
+
+                  scope = mkOption {
+                    type = types.str;
+                    default = "openid email profile";
+                    description = "OIDC scope to request.";
+                  };
+
+                  extra_params = mkOption {
+                    type = types.nullOr (types.attrsOf types.str);
+                    default = null;
+                    description = "Extra parameters to send to the OIDC provider.";
+                    example = {
+                      prompt = "consent";
+                    };
+                  };
+
+                  authorization_endpoint = mkOption {
+                    type = types.nullOr types.str;
+                    default = null;
+                    description = "Custom authorization endpoint URL.";
+                    example = "https://provider.example.com/authorize";
+                  };
+
+                  token_endpoint = mkOption {
+                    type = types.nullOr types.str;
+                    default = null;
+                    description = "Custom token endpoint URL.";
+                    example = "https://provider.example.com/token";
+                  };
+
+                  userinfo_endpoint = mkOption {
+                    type = types.nullOr types.str;
+                    default = null;
+                    description = "Custom userinfo endpoint URL.";
+                    example = "https://provider.example.com/userinfo";
+                  };
+                };
+              }
+            );
+            default = null;
+            description = "OIDC Configuration for authentication.";
+          };
+        };
+      };
+      default = { };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = config.services.headscale.enable;
+        message = ''
+          services.headplane requires services.headscale.enable = true.
+          The headplane module references the headscale systemd unit
+          (in `after`/`requires`) and reads its configFile, port, user,
+          and group. Enable headscale or disable headplane.
+        '';
+      }
+      {
+        assertion = cfg.settings.server.cookie_secret_path != null;
+        message = ''
+          services.headplane.settings.server.cookie_secret_path must be set.
+          Headplane refuses to start without either `cookie_secret` or
+          `cookie_secret_path` (validated at startup, see upstream
+          app/server/config/schema.ts). The NixOS module only exposes the
+          *_path form to keep secrets out of the world-readable /nix/store.
+          Provide a path to a file containing a 32-character secret, e.g.
+          via systemd `LoadCredential` or sops-nix.
+        '';
+      }
+      {
+        assertion =
+          cfg.settings.integration.agent == null
+          || !cfg.settings.integration.agent.enabled
+          || cfg.settings.integration.agent.pre_authkey_path != null;
+        message = ''
+          services.headplane.settings.integration.agent.pre_authkey_path must be set
+          when services.headplane.settings.integration.agent.enabled is true.
+        '';
+      }
+      {
+        assertion = cfg.settings.oidc == null || cfg.settings.oidc.headscale_api_key_path != null;
+        message = ''
+          services.headplane.settings.oidc.headscale_api_key_path must be set
+          when services.headplane.settings.oidc is non-null. Headplane's OIDC
+          flow requires a Headscale API key to mint sessions; upstream config
+          validation rejects an OIDC block without it.
+        '';
+      }
+    ];
+
+    environment = {
+      systemPackages = [ cfg.package ];
+      etc."headplane/config.yaml".source = "${settingsFile}";
+    };
+
+    systemd.services.headplane = {
+      description = "Headscale Web UI";
+
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [
+        "network-online.target"
+        config.systemd.services.headscale.name
+      ];
+      requires = [ config.systemd.services.headscale.name ];
+
+      environment = {
+        HEADPLANE_DEBUG_LOG = toString cfg.debug;
+      };
+      serviceConfig = {
+        User = config.services.headscale.user;
+        Group = config.services.headscale.group;
+        StateDirectory = "headplane";
+
+        ExecStart = lib.getExe cfg.package;
+        Restart = "always";
+        RestartSec = 5;
+
+        # TODO: Harden `systemd` security according to the "The Principle of Least Power".
+        # See: `$ systemd-analyze security headplane`.
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/networking/livekit-ingress.nix b/nixos/modules/services/networking/livekit-ingress.nix
index 7aaf6d1397af..d67d9fe120b6 100644
--- a/nixos/modules/services/networking/livekit-ingress.nix
+++ b/nixos/modules/services/networking/livekit-ingress.nix
@@ -10,6 +10,20 @@ let
   format = pkgs.formats.yaml { };
   settings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings;
 
+  optionalPort = (lib.types.ints.between (-1) 65535);
+
+  normalisePort =
+    defaultPort: configValue:
+    if configValue == -1 then
+      null
+    else if configValue == 0 then
+      defaultPort
+    else
+      configValue;
+
+  actualRTMPPort = normalisePort 1935 cfg.settings.rtmp_port;
+  actualWHIPPort = normalisePort 8080 cfg.settings.whip_port;
+
   isLocallyDistributed = config.services.livekit.enable;
 in
 {
@@ -43,15 +57,15 @@ in
         freeformType = format.type;
         options = {
           rtmp_port = lib.mkOption {
-            type = lib.types.port;
+            type = optionalPort;
             default = 1935;
-            description = "TCP port for RTMP connections";
+            description = "TCP port for RTMP connections. -1 to disable";
           };
 
           whip_port = lib.mkOption {
-            type = lib.types.port;
+            type = optionalPort;
             default = 8080;
-            description = "TCP port for WHIP connections";
+            description = "TCP port for WHIP connections. -1 to disable";
           };
 
           redis = {
@@ -120,10 +134,21 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.openFirewall.rtmp -> actualRTMPPort != null;
+        message = "services.livekit-ingress: configured to open RTMP port, but the RTMP service is disabled";
+      }
+      {
+        assertion = cfg.openFirewall.whip -> actualWHIPPort != null;
+        message = "services.livekit-ingress: configured to open WHIP port, but the WHIP service is disabled";
+      }
+    ];
+
     networking.firewall = {
       allowedTCPPorts = lib.mkMerge [
-        (lib.mkIf cfg.openFirewall.rtmp [ cfg.settings.rtmp_port ])
-        (lib.mkIf cfg.openFirewall.whip [ cfg.settings.whip_port ])
+        (lib.mkIf cfg.openFirewall.rtmp [ actualRTMPPort ])
+        (lib.mkIf cfg.openFirewall.whip [ actualWHIPPort ])
       ];
       allowedUDPPortRanges = lib.mkIf cfg.openFirewall.rtc [
         {
diff --git a/nixos/modules/services/networking/mosquitto.md b/nixos/modules/services/networking/mosquitto.md
index 53b5beb16b89..b1a6fabb1f2a 100644
--- a/nixos/modules/services/networking/mosquitto.md
+++ b/nixos/modules/services/networking/mosquitto.md
@@ -83,9 +83,10 @@ localhost).
 
 Almost all options of Mosquitto are available for configuration at their appropriate levels, some
 as NixOS options written in camel case, the remainders under `settings` with their exact names in
-the Mosquitto config file. The exceptions are `acl_file` (which is always set according to the
-`acl` attributes of a listener and its users) and `per_listener_settings` (which is always set to
-`true`).
+the Mosquitto config file. The exceptions are `per_listener_settings` (which is always set to
+`true`) and the per-listener access control, which is always configured via instances of the
+`acl-file` and `password-file` plugins generated from the `acl` and `users` attributes of each
+listener.
 
 ### Password authentication {#module-services-mosquitto-config-passwords}
 
@@ -101,8 +102,8 @@ will not be able to use the broker.
 
 ### ACL format {#module-services-mosquitto-config-acl}
 
-Every listener has a Mosquitto `acl_file` attached to it. This ACL is configured via two
-attributes of the config:
+Every listener has an instance of the Mosquitto `acl-file` plugin attached to it. This ACL is
+configured via two attributes of the config:
 
   * the `acl` attribute of the listener configures pattern ACL entries and topic ACL entries
     for anonymous users. Each entry must be prefixed with `pattern` or `topic` to distinguish
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index fd16442ad185..21b531533513 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -7,6 +7,8 @@
 let
   cfg = config.services.mosquitto;
 
+  pluginLibDir = "${lib.getLib cfg.package}/lib";
+
   # note that mosquitto config parsing is very simplistic as of may 2021.
   # often times they'll e.g. strtok() a line, check the first two tokens, and ignore the rest.
   # there's no escaping available either, so we have to prevent any being necessary.
@@ -239,8 +241,8 @@ let
         options = lib.mkOption {
           type = attrsOf optionType;
           description = ''
-            Options for the auth plugin. Each key turns into a `auth_opt_*`
-             line in the config.
+            Options for the plugin. Each key turns into a `plugin_opt_*`
+            line in the config.
           '';
           default = { };
         };
@@ -257,12 +259,13 @@ let
   formatAuthPlugin =
     plugin:
     [
-      "auth_plugin ${plugin.plugin}"
+      "plugin ${plugin.plugin}"
       "auth_plugin_deny_special_chars ${optionToString plugin.denySpecialChars}"
     ]
-    ++ formatFreeform { prefix = "auth_opt_"; } plugin.options;
+    ++ formatFreeform { prefix = "plugin_opt_"; } plugin.options;
 
   freeformListenerKeys = {
+    accept_protocol_versions = 1;
     allow_anonymous = 1;
     allow_zero_length_clientid = 1;
     auto_id_prefix = 1;
@@ -274,13 +277,18 @@ let
     "ciphers_tls1.3" = 1;
     crlfile = 1;
     dhparamfile = 1;
+    disable_client_cert_date_checks = 1;
+    enable_proxy_protocol = 1;
     http_dir = 1;
     keyfile = 1;
+    listener_allow_anonymous = 1;
+    listener_auto_id_prefix = 1;
     max_connections = 1;
     max_qos = 1;
     max_topic_alias = 1;
     mount_point = 1;
     protocol = 1;
+    proxy_protocol_v2_require_tls = 1;
     psk_file = 1;
     psk_hint = 1;
     require_certificate = 1;
@@ -292,6 +300,7 @@ let
     use_identity_as_username = 1;
     use_subject_as_username = 1;
     use_username_as_clientid = 1;
+    websockets_origin = 1;
   };
 
   listenerOptions =
@@ -393,10 +402,16 @@ let
     idx: listener:
     [
       "listener ${toString listener.port} ${toString listener.address}"
-      "acl_file ${cfg.dataDir}/acl-${toString idx}.conf"
     ]
-    ++ lib.optional (!listener.omitPasswordAuth) "password_file ${cfg.dataDir}/passwd-${toString idx}"
     ++ formatFreeform { } listener.settings
+    ++ [
+      "plugin ${pluginLibDir}/mosquitto_acl_file.so"
+      "plugin_opt_acl_file ${cfg.dataDir}/acl-${toString idx}.conf"
+    ]
+    ++ lib.optionals (!listener.omitPasswordAuth) [
+      "plugin ${pluginLibDir}/mosquitto_password_file.so"
+      "plugin_opt_password_file ${cfg.dataDir}/passwd-${toString idx}"
+    ]
     ++ lib.concatMap formatAuthPlugin listener.authPlugins;
 
   freeformBridgeKeys = {
@@ -413,7 +428,11 @@ let
     bridge_outgoing_retain = 1;
     bridge_protocol_version = 1;
     bridge_psk = 1;
+    bridge_receive_maximum = 1;
+    bridge_reload_type = 1;
     bridge_require_ocsp = 1;
+    bridge_session_expiry_interval = 1;
+    bridge_tls_use_os_certs = 1;
     bridge_tls_version = 1;
     cleansession = 1;
     idle_timeout = 1;
@@ -512,6 +531,9 @@ let
     autosave_on_changes = 1;
     check_retain_source = 1;
     connection_messages = 1;
+    enable_control_api = 1;
+    global_max_clients = 1;
+    global_max_connections = 1;
     log_facility = 1;
     log_timestamp = 1;
     log_timestamp_format = 1;
@@ -634,6 +656,13 @@ let
   globalAsserts =
     prefix: cfg:
     lib.flatten [
+      {
+        assertion = lib.versionAtLeast cfg.package.version "2.1";
+        message = ''
+          ${prefix}.package must be at least version 2.1, since the generated
+          configuration relies on the acl-file and password-file plugins.
+        '';
+      }
       (assertKeysValid "${prefix}.settings" freeformGlobalKeys cfg.settings)
       (lib.imap0 (n: l: listenerAsserts "${prefix}.listener.${toString n}" l) cfg.listeners)
       (lib.mapAttrsToList (n: b: bridgeAsserts "${prefix}.bridge.${n}" b) cfg.bridges)
diff --git a/nixos/modules/services/networking/netfoil.nix b/nixos/modules/services/networking/netfoil.nix
new file mode 100644
index 000000000000..df5c5a5e1d6e
--- /dev/null
+++ b/nixos/modules/services/networking/netfoil.nix
@@ -0,0 +1,263 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.netfoil;
+in
+{
+  options = {
+    services.netfoil = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Enable Netfoil, a minimal, filtering, DNS proxy";
+      };
+      listen = {
+        port = lib.mkOption {
+          type = lib.types.int;
+          default = 53;
+          description = "Port on which Netfoil listens for incoming connections";
+        };
+        ipAddress = lib.mkOption {
+          type = lib.types.str;
+          default = "127.0.0.1";
+          description = "IP address on which Netfoil listens for incoming connections";
+        };
+      };
+      logAllowed = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Log allowed DNS queries";
+      };
+      doHUrl = lib.mkOption {
+        type = lib.types.str;
+        default = "https://security.cloudflare-dns.com/dns-query";
+        description = "The DoH URL to use for upstream DNS queries";
+      };
+      doHIPs = lib.mkOption {
+        type = lib.types.str;
+        default = "1.1.1.2,1.0.0.2";
+        description = "The DoH IPs to use for upstream DNS queries";
+      };
+      logDenied = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Log denied DNS queries";
+      };
+      config = lib.mkOption {
+        type = lib.types.attrsOf lib.types.str;
+        default = { };
+        description = "Additional configuration options for Netfoil";
+      };
+      rules = {
+        allow = {
+          exact = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "List of exact domain names to allow";
+          };
+          ipv4 = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "List of ipv4 CIDR ranges to allow";
+          };
+          ipv6 = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "List of ipv6 CIDR ranges to allow";
+          };
+          tld = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "List of TLDs to allow";
+          };
+        };
+        deny = {
+          exact = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "List of exact domain names to deny";
+          };
+          ipv4 = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "List of ipv4 CIDR ranges to deny";
+          };
+          ipv6 = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "List of ipv6 CIDR ranges to deny";
+          };
+          tld = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "List of TLDs to deny";
+          };
+        };
+        known = {
+          knownTlds = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [
+              ".com"
+              ".net"
+              ".org"
+              ".edu"
+              ".gov"
+              ".mil"
+              ".int"
+            ];
+            description = "List of known TLDs";
+          };
+        };
+        pin = {
+          a = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "List of A records to pin <domain:ipv4>";
+          };
+          responseDomain = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "List of domains to pin <domain:domain>";
+          };
+        };
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable (
+    let
+      configFile = lib.concatStringsSep "\n" (
+        [
+          "LogAllowed=${lib.boolToString cfg.logAllowed}"
+          "LogDenied=${lib.boolToString cfg.logDenied}"
+          "DoHURL=${cfg.doHUrl}"
+          "DoHIPs=${cfg.doHIPs}"
+        ]
+        ++ (map (key: "${key} = \"${cfg.config.${key}}\"") (lib.attrNames cfg.config))
+        ++ lib.optional ((lib.length cfg.rules.pin.responseDomain) != 0) "PinResponseDomain=true"
+      );
+      configDir = pkgs.buildEnv {
+        name = "netfoil-config";
+        paths = [
+          (pkgs.writeTextDir "config" configFile)
+          (pkgs.writeTextDir "allow.exact" (lib.concatStringsSep "\n" cfg.rules.allow.exact))
+          (pkgs.writeTextDir "allow.ipv4" (lib.concatStringsSep "\n" cfg.rules.allow.ipv4))
+          (pkgs.writeTextDir "allow.ipv6" (lib.concatStringsSep "\n" cfg.rules.allow.ipv6))
+          (pkgs.writeTextDir "allow.suffix" (lib.concatStringsSep "\n" cfg.rules.allow.tld))
+          (pkgs.writeTextDir "allow.tld" (lib.concatStringsSep "\n" cfg.rules.allow.tld))
+          (pkgs.writeTextDir "deny.exact" (lib.concatStringsSep "\n" cfg.rules.deny.exact))
+          (pkgs.writeTextDir "deny.ipv4" (lib.concatStringsSep "\n" cfg.rules.deny.ipv4))
+          (pkgs.writeTextDir "deny.ipv6" (lib.concatStringsSep "\n" cfg.rules.deny.ipv6))
+          (pkgs.writeTextDir "deny.suffix" (lib.concatStringsSep "\n" cfg.rules.deny.tld))
+          (pkgs.writeTextDir "deny.tld" (lib.concatStringsSep "\n" cfg.rules.deny.tld))
+          (pkgs.writeTextDir "known.tld" (lib.concatStringsSep "\n" cfg.rules.known.knownTlds))
+          (pkgs.writeTextDir "pin.a" (lib.concatStringsSep "\n" cfg.rules.pin.a))
+          (pkgs.writeTextDir "pin.response-domain" (lib.concatStringsSep "\n" cfg.rules.pin.responseDomain))
+        ];
+      };
+    in
+    {
+      systemd = {
+        services.netfoil = {
+          enable = true;
+          description = "Netfoil DNS proxy";
+          after = [ "network.target" ];
+          requires = [ "netfoil.socket" ];
+          wantedBy = [ "multi-user.target" ];
+          serviceConfig = {
+            Type = "simple";
+            ExecStart = "${pkgs.netfoil}/bin/netfoil --config-directory ${configDir}";
+            Restart = "always";
+            RestartSec = "5";
+            DynamicUser = true;
+            BindReadOnlyPaths = [
+              "${pkgs.netfoil}"
+              "${configDir}"
+              "/etc/ssl"
+              builtins.storeDir
+            ];
+            Slice = "netfoil.slice";
+            AmbientCapabilities = "";
+            CapabilityBoundingSet = [ ];
+            SystenCallArchitectures = "native";
+            SystemCallFilter = [
+              "@basic-io"
+              "@file-system"
+              "@network-io"
+              "@signal"
+              "@process"
+              "@io-event"
+              "@system-service"
+              "@resources"
+            ];
+            RuntimeDirectory = "netfoil";
+            RuntimeDirectoryMode = "0755";
+            RootDirectory = "/run/netfoil";
+            RestrictAddressFamilies = "AF_INET AF_INET6";
+            RestrictNamespaces = true;
+            RestrictRealtime = true;
+            RestrictSUIDSGID = true;
+
+            # This might set AllowDevices=char-rtc r
+            ProtectClock = true;
+
+            ProtectKernelModules = true;
+            ProtectKernelLogs = true;
+
+            LockPersonality = true;
+            MemoryDenyWriteExecute = true;
+
+            RemoveIPC = true;
+            UMask = "0077";
+
+            # IPC namespace
+            PrivateIPC = true;
+
+            # UTS namespace
+            ProtectHostname = true;
+
+            # Changes mounts (custom is more strict)
+            # https://github.com/systemd/systemd/blob/main/src/core/namespace.c
+            #
+            ProtectControlGroups = true;
+            ProtectHome = true;
+            ProtectProc = "invisible";
+            ProcSubset = "pid";
+            ProtectSystem = "strict";
+            PrivateTmp = true;
+
+            #
+            # seccomp _sysctl (custom filter does not allow it anyway)
+            # /proc and /sys mounts (custom is more strict)
+            ProtectKernelTunables = true;
+            #
+            # seccomp @raw-io (custom filter does not allow it anyway)
+            PrivateDevices = true;
+            DevicePolicy = "closed";
+
+            SocketBindDeny = "any";
+
+            CPUQuota = "50%";
+            MemoryMax = "100M";
+            TasksMax = "100";
+          };
+        };
+        slices.netfoil = {
+          description = "Slice for Netfoil DNS proxy";
+        };
+        sockets.netfoil = {
+          description = "Netfoil DNS proxy socket";
+          wantedBy = [ "sockets.target" ];
+          socketConfig = {
+            ListenDatagram = "${cfg.listen.ipAddress}:${toString cfg.listen.port}";
+            Service = "netfoil.service";
+          };
+        };
+      };
+    }
+  );
+}
diff --git a/nixos/modules/services/networking/nmtrust.nix b/nixos/modules/services/networking/nmtrust.nix
new file mode 100644
index 000000000000..30c917b4e3d6
--- /dev/null
+++ b/nixos/modules/services/networking/nmtrust.nix
@@ -0,0 +1,391 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.nmtrust;
+
+  # Resolve trusted UUIDs from ensureProfiles + extra
+  profileUUIDs = map (
+    name: config.networking.networkmanager.ensureProfiles.profiles.${name}.connection.uuid
+  ) cfg.trustedConnections;
+
+  trustedUUIDs = profileUUIDs ++ cfg.trustedUUIDsExtra;
+
+  userNames = builtins.attrNames cfg.userUnits;
+
+  # The package reads config from /etc/nmtrust/config at runtime
+  trustHelper = pkgs.nmtrust;
+
+  # Trust target names
+  trustTargets = [
+    "nmtrust-trusted"
+    "nmtrust-untrusted"
+    "nmtrust-offline"
+  ];
+
+  # Generate Conflicts= for a target (all other trust targets)
+  conflictsFor = target: map (t: "${t}.target") (builtins.filter (t: t != target) trustTargets);
+
+  # Uses StopWhenUnneeded instead of PartOf to avoid same-transaction
+  # issues: when transitioning between targets that both want a unit
+  # (e.g. offline -> trusted for allowOffline units), PartOf on the
+  # old target would stop the unit before WantedBy on the new target
+  # can restart it. StopWhenUnneeded only stops the unit when NO
+  # active target wants it.
+  mkUnitOverrides =
+    unitName: unitCfg:
+    let
+      targets = [
+        "nmtrust-trusted.target"
+      ]
+      ++ lib.optional unitCfg.allowOffline "nmtrust-offline.target";
+    in
+    {
+      unitConfig.StopWhenUnneeded = true;
+      wantedBy = targets;
+    };
+
+  # NM dispatcher script
+  dispatcherScript = pkgs.writeShellScript "nmtrust-dispatcher" ''
+    case "$2" in
+      up|down|vpn-up|vpn-down|connectivity-change)
+        ${config.systemd.package}/bin/systemd-run \
+          --no-block \
+          --on-active=1s \
+          --unit=nmtrust-apply-debounce \
+          ${config.systemd.package}/bin/systemctl start nmtrust-apply.service \
+          2>/dev/null || true
+        ;;
+    esac
+  '';
+
+in
+{
+
+  #
+  # Options
+  #
+
+  options.services.nmtrust = {
+
+    enable = lib.mkEnableOption "network trust management";
+
+    trustedConnections = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+      description = ''
+        List of NetworkManager profile names from
+        {option}`networking.networkmanager.ensureProfiles`.
+        UUIDs are resolved at evaluation time.
+      '';
+    };
+
+    trustedUUIDsExtra = lib.mkOption {
+      type = lib.types.listOf (
+        lib.types.strMatching "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
+      );
+      default = [ ];
+      description = ''
+        Additional trusted connection UUIDs not managed via
+        {option}`networking.networkmanager.ensureProfiles`.
+        Must be valid UUID format.
+      '';
+    };
+
+    excludedConnectionPatterns = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+      description = ''
+        Glob patterns matched against connection names at runtime using
+        fnmatch(3) with FNM_NOESCAPE. Connection names are treated as
+        literal strings (no backslash interpretation).
+        Matching connections are ignored when computing trust state.
+      '';
+    };
+
+    mixedPolicy = lib.mkOption {
+      type = lib.types.enum [
+        "trusted"
+        "untrusted"
+      ];
+      default = "untrusted";
+      description = ''
+        How to treat mixed trust state (some connections trusted,
+        some untrusted).
+      '';
+    };
+
+    evalFailurePolicy = lib.mkOption {
+      type = lib.types.enum [
+        "untrusted"
+        "offline"
+      ];
+      default = "untrusted";
+      description = ''
+        How to handle trust evaluation failures (D-Bus errors, NM
+        unavailable). `"untrusted"` (default) is fail-closed: trusted-only
+        units stop. `"offline"` allows units with
+        {option}`allowOffline` to run.
+      '';
+    };
+
+    systemUnits = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.submodule {
+          options.allowOffline = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+            description = "Whether this unit should also run when offline.";
+          };
+        }
+      );
+      default = { };
+      description = ''
+        System units to bind to the trusted network target.
+        Keys are systemd unit names.
+      '';
+    };
+
+    userUnits = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.attrsOf (
+          lib.types.submodule {
+            options.allowOffline = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = "Whether this unit should also run when offline.";
+            };
+          }
+        )
+      );
+      default = { };
+      example = lib.literalExpression ''
+        {
+          alice = {
+            "etesync-dav.service" = { };
+            "syncthing.service" = { allowOffline = true; };
+          };
+        }
+      '';
+      description = ''
+        Per-user units to bind to the trusted network target.
+        Outer keys are usernames, inner keys are systemd unit names.
+        Users must have linger enabled
+        ({option}`users.users.<name>.linger`).
+      '';
+    };
+  };
+
+  #
+  # Config
+  #
+
+  config = lib.mkIf cfg.enable {
+
+    # --- Assertions ---
+
+    assertions =
+      # NetworkManager is required
+      [
+        {
+          assertion = config.networking.networkmanager.enable;
+          message = "services.nmtrust requires networking.networkmanager.enable = true.";
+        }
+      ]
+      ++
+        # trustedConnections -> ensureProfiles UUID resolution
+        (map (name: {
+          assertion =
+            config.networking.networkmanager.ensureProfiles.profiles ? ${name}
+            && config.networking.networkmanager.ensureProfiles.profiles.${name}.connection ? uuid;
+          message =
+            "services.nmtrust.trustedConnections references '${name}' "
+            + "but no matching networking.networkmanager.ensureProfiles entry with a UUID exists.";
+        }) cfg.trustedConnections)
+      ++
+        # userUnits -> user existence
+        (map (username: {
+          assertion = config.users.users ? ${username};
+          message =
+            "services.nmtrust.userUnits references user '${username}' "
+            + "but no matching users.users entry exists.";
+        }) userNames)
+      ++
+        # userUnits -> linger enabled
+        (map (username: {
+          assertion =
+            let
+              l = config.users.users.${username}.linger;
+            in
+            l != null && l;
+          message =
+            "services.nmtrust.userUnits references user '${username}' but "
+            + "linger is not enabled. Set users.users.${username}.linger = true to "
+            + "ensure the user's systemd instance is running for trust-based unit management. "
+            + "Note: enabling linger causes ALL of this user's enabled user services to run "
+            + "persistently, not just trust-managed units.";
+        }) (builtins.filter (u: config.users.users ? ${u}) userNames));
+
+    # --- Helper package on PATH ---
+
+    environment.systemPackages = [ trustHelper ];
+
+    # --- Runtime config file ---
+
+    environment.etc."nmtrust/config" = {
+      text =
+        let
+          toBashArray = xs: "(" + lib.concatMapStringsSep " " (x: lib.escapeShellArg x) xs + ")";
+        in
+        ''
+          # Generated by NixOS module — do not edit
+          TRUSTED_UUIDS=${toBashArray trustedUUIDs}
+          EXCLUDED_PATTERNS=${toBashArray (cfg.excludedConnectionPatterns)}
+          MIXED_POLICY=${lib.escapeShellArg cfg.mixedPolicy}
+          EVAL_FAILURE_POLICY=${lib.escapeShellArg cfg.evalFailurePolicy}
+          MANAGED_USERS=${toBashArray userNames}
+        '';
+    };
+
+    # --- tmpfiles.d ---
+
+    systemd.tmpfiles.rules = [
+      "d /run/nmtrust 0700 root root -"
+    ];
+
+    # --- System trust targets ---
+
+    systemd.targets = lib.listToAttrs (
+      map (target: {
+        name = target;
+        value = {
+          description = "Network Trust State: ${
+            if target == "nmtrust-trusted" then
+              "Trusted"
+            else if target == "nmtrust-untrusted" then
+              "Untrusted"
+            else
+              "Offline"
+          }";
+          unitConfig.Conflicts = conflictsFor target;
+        };
+      }) trustTargets
+    );
+
+    # --- User trust targets ---
+
+    systemd.user.targets = lib.listToAttrs (
+      map (target: {
+        name = target;
+        value = {
+          description = "Network Trust State: ${
+            if target == "nmtrust-trusted" then
+              "Trusted (User)"
+            else if target == "nmtrust-untrusted" then
+              "Untrusted (User)"
+            else
+              "Offline (User)"
+          }";
+          unitConfig.Conflicts = conflictsFor target;
+        };
+      }) trustTargets
+    );
+
+    # --- System unit overrides + services ---
+
+    # Strip .service/.timer/.socket suffixes — NixOS appends them automatically
+    systemd.services =
+      lib.mapAttrs' (name: value: {
+        name = lib.removeSuffix ".service" (lib.removeSuffix ".timer" (lib.removeSuffix ".socket" name));
+        value = mkUnitOverrides name value;
+      }) cfg.systemUnits
+      // {
+        nmtrust-apply = {
+          description = "Evaluate and apply network trust state";
+          after = [ "NetworkManager.service" ];
+          serviceConfig = {
+            Type = "oneshot";
+            ExecStart = "${trustHelper}/bin/nmtrust apply";
+            Restart = "on-failure";
+            RestartSec = "5";
+            ProtectSystem = "strict";
+            ReadWritePaths = [ "/run/nmtrust" ];
+            ProtectHome = true;
+            NoNewPrivileges = true;
+            PrivateTmp = true;
+          };
+        };
+        nmtrust-eval = {
+          description = "Evaluate network trust state on boot";
+          wantedBy = [ "network-online.target" ];
+          wants = [ "network-online.target" ];
+          after = [
+            "NetworkManager.service"
+            "network-online.target"
+          ];
+          restartTriggers = [
+            config.environment.etc."nmtrust/config".source
+          ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+            ExecStart = "${trustHelper}/bin/nmtrust apply";
+            Restart = "on-failure";
+            RestartSec = "5";
+            ProtectSystem = "strict";
+            ReadWritePaths = [ "/run/nmtrust" ];
+            ProtectHome = true;
+            NoNewPrivileges = true;
+            PrivateTmp = true;
+          };
+        };
+      };
+
+    # --- User unit overrides ---
+
+    # When the same unit appears under multiple users, union their wantedBy
+    # lists. systemd.user.services is system-wide, so per-user allowOffline
+    # differences are resolved by taking the most permissive value (any
+    # true wins).
+    systemd.user.services = lib.foldl' (
+      acc: username:
+      lib.foldl' (
+        acc': unitName:
+        let
+          strippedName = lib.removeSuffix ".service" (
+            lib.removeSuffix ".timer" (lib.removeSuffix ".socket" unitName)
+          );
+          incoming = mkUnitOverrides unitName cfg.userUnits.${username}.${unitName};
+          existing = acc'.${strippedName} or null;
+        in
+        acc'
+        // {
+          ${strippedName} =
+            if existing == null then
+              incoming
+            else
+              existing
+              // {
+                wantedBy = lib.unique (existing.wantedBy ++ incoming.wantedBy);
+              };
+        }
+      ) acc (builtins.attrNames cfg.userUnits.${username})
+    ) { } userNames;
+
+    # --- NM dispatcher ---
+
+    networking.networkmanager.dispatcherScripts = [
+      {
+        source = dispatcherScript;
+        type = "basic";
+      }
+    ];
+  };
+
+  meta.maintainers = [ lib.maintainers.brett ];
+
+}
diff --git a/nixos/modules/services/networking/reframe.nix b/nixos/modules/services/networking/reframe.nix
new file mode 100644
index 000000000000..b05f33772eaa
--- /dev/null
+++ b/nixos/modules/services/networking/reframe.nix
@@ -0,0 +1,190 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+let
+  cfg = config.services.reframe;
+  iniFmt = pkgs.formats.ini { };
+in
+{
+  options.programs.reframe = {
+    enable = lib.mkEnableOption "DRM/KMS based remote desktop for Linux that supports Wayland/NVIDIA/headless/login…";
+    package = lib.mkPackageOption pkgs "reframe" { };
+    configs = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.submodule {
+          options = {
+            reframe = {
+              card = lib.mkOption {
+                type = lib.types.str;
+                default = "";
+                description = "Select monitor via DRM card. All available cards and connectors can be found in `/sys/class/drm/`.";
+                example = "card0";
+              };
+              connector = lib.mkOption {
+                type = lib.types.str;
+                default = "";
+                description = "Select monitor via connector. All available cards and connectors can be found in `/sys/class/drm/`.";
+                example = "eDP-1";
+              };
+              rotation = lib.mkOption {
+                type = lib.types.enum [
+                  0
+                  90
+                  180
+                  270
+                ];
+                default = 0;
+                description = ''
+                  This is the angle you rotate the monitor, not the angle of display content relative to the monitor!
+                  Valid angles are clockwise `0`, `90`, `180`, `270`.
+                '';
+              };
+              desktop-width = lib.mkOption {
+                type = lib.types.int;
+                default = 0;
+                description = ''
+                  If you have more than 1 monitor, set those values to the logical size of the whole virtual desktop.
+                  You can get those value by finding the pointer position of the right most and bottom most border of your monitors.
+                '';
+              };
+              desktop-height = lib.mkOption {
+                type = lib.types.int;
+                default = 0;
+                description = ''
+                  If you have more than 1 monitor, set those values to the logical size of the whole virtual desktop.
+                  You can get those value by finding the pointer position of the right most and bottom most border of your monitors.
+                '';
+              };
+              monitor-x = lib.mkOption {
+                type = lib.types.int;
+                default = 0;
+                description = ''
+                  If you have more than 1 monitor, set those values to the logical position of the top left corner of your selected monitor.
+                '';
+              };
+              monitor-y = lib.mkOption {
+                type = lib.types.int;
+                default = 0;
+                description = ''
+                  If you have more than 1 monitor, set those values to the logical position of the top left corner of your selected monitor.
+                '';
+              };
+              default-width = lib.mkOption {
+                type = lib.types.int;
+                default = 0;
+                description = ''
+                  If your client does not support resizing, use those to force a size. Empty or `0` means monitor size.
+                '';
+              };
+              default-height = lib.mkOption {
+                type = lib.types.int;
+                default = 0;
+                description = ''
+                  If your client does not support resizing, use those to force a size. Empty or `0` means monitor size.
+                '';
+              };
+              resize = lib.mkOption {
+                type = lib.types.bool;
+                default = true;
+                description = ''
+                  Set to `false` to prohibit client resizing.
+                '';
+              };
+              cursor = lib.mkOption {
+                type = lib.types.bool;
+                default = true;
+                description = ''
+                  Set to `false` to ignore DRM cursor plane.
+                '';
+              };
+              wakeup = lib.mkOption {
+                type = lib.types.bool;
+                default = true;
+                description = ''
+                  Set to `false` if you already disabled automatic screen blank.
+                '';
+              };
+              damage = lib.mkOption {
+                type = lib.types.enum [
+                  ""
+                  "cpu"
+                  "gpu"
+                ];
+                default = true;
+                description = ''
+                  Set to `gpu` to use GPU damage region detection, which may be more efficiency but may cause artifacts depending on GPU vendors.
+                  Set to `cpu` to use CPU damage region detection if you get bugs with `gpu`.
+                  Empty to disable damage region detection, which may require higher network bandwidth.
+                '';
+              };
+              fps = lib.mkOption {
+                type = lib.types.int;
+                default = 30;
+              };
+            };
+            vnc = {
+              ip = lib.mkOption {
+                type = lib.types.str;
+                default = "";
+                description = ''
+                  Empty means accept all incoming connections.
+                '';
+              };
+              port = lib.mkOption {
+                type = lib.types.port;
+                default = 5933;
+              };
+              password = lib.mkOption {
+                type = lib.types.str;
+                default = "";
+                description = ''
+                  Empty means no password.
+                '';
+              };
+              type = lib.mkOption {
+                type = lib.types.enum [
+                  "libvncserver"
+                  "neatvnc"
+                ];
+                default = "libvncserver";
+                description = ''
+                  Set to `neatvnc` to prefer neatvnc, which provides more efficient encoding methods but maybe more unstable.
+                '';
+              };
+            };
+          };
+        }
+      );
+      default = { };
+      description = "Configurations for ReFrame";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    systemd.packages = [ cfg.package ];
+    systemd.tmpfiles.packages = [ cfg.package ];
+    users.users.reframe = {
+      isSystemUser = true;
+      group = "reframe";
+      description = "ReFrame Remote Desktop";
+    };
+    users.groups.reframe = { };
+    environment.etc = builtins.mapAttrs' (
+      name: value:
+      lib.nameValuePair "reframe/${name}.conf" {
+        mode = "0644";
+        user = "root";
+        group = "root";
+        source = iniFmt.generate "${name}.conf" value;
+      }
+    ) cfg.configs;
+  };
+
+  meta.maintainers = with lib.maintainers; [
+    bitbloxhub
+  ];
+}
diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix
index 5c8942ca6076..d13875925cd2 100644
--- a/nixos/modules/services/networking/teamspeak3.nix
+++ b/nixos/modules/services/networking/teamspeak3.nix
@@ -185,7 +185,7 @@ in
             ${optionalString (cfg.fileTransferIP != null) "filetransfer_ip=${cfg.fileTransferIP}"} \
             ${optionalString (cfg.queryIP != null) "query_ip=${cfg.queryIP}"} \
             ${optionalString (cfg.queryIP != null) "query_ssh_ip=${cfg.queryIP}"} \
-            ${optionalString (cfg.queryIP != null) "query_http_ip=${cfg.queryIP}"} \
+            ${optionalString (cfg.queryIP != null) "query_http_ip=${cfg.queryIP}"}
         '';
         WorkingDirectory = cfg.dataDir;
         User = user;
diff --git a/nixos/modules/services/networking/tetrd.nix b/nixos/modules/services/networking/tetrd.nix
index 939c1227886f..7b7b050bb0d7 100644
--- a/nixos/modules/services/networking/tetrd.nix
+++ b/nixos/modules/services/networking/tetrd.nix
@@ -14,6 +14,9 @@
       etc."resolv.conf".source = "/etc/tetrd/resolv.conf";
     };
 
+    # Our resolv.conf will override resolvconf's version.
+    networking.resolvconf.enable = false;
+
     systemd = {
       tmpfiles.rules = [ "f /etc/tetrd/resolv.conf - - -" ];
 
diff --git a/nixos/modules/services/networking/thelounge.nix b/nixos/modules/services/networking/thelounge.nix
index a9d4447cda32..d46aef2f32e5 100644
--- a/nixos/modules/services/networking/thelounge.nix
+++ b/nixos/modules/services/networking/thelounge.nix
@@ -112,6 +112,8 @@ in
     systemd.services.thelounge = {
       description = "The Lounge web IRC client";
       wantedBy = [ "multi-user.target" ];
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
       preStart = "ln -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js";
       environment.THELOUNGE_PACKAGES = mkIf (cfg.plugins != [ ]) "${plugins}";
       serviceConfig = {
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 1e6236e6d47c..eaee405f8bda 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -41,7 +41,7 @@ in
     };
 
     services.unifi.jrePackage = lib.mkPackageOption pkgs "jdk" {
-      default = "jdk17_headless";
+      default = "jdk25_headless";
       extraDescription = ''
         Check the UniFi controller release notes to ensure it is supported.
       '';
diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix
index 059337e3a425..57f436c5443e 100644
--- a/nixos/modules/services/security/authelia.nix
+++ b/nixos/modules/services/security/authelia.nix
@@ -10,9 +10,11 @@ let
 
   format = pkgs.formats.yaml { };
 
+  autheliaName = name: "authelia" + lib.optionalString (name != "") "-${name}";
+
   autheliaOpts =
     with lib;
-    { name, ... }:
+    { name, config, ... }:
     {
       options = {
         enable = mkEnableOption "Authelia instance";
@@ -23,21 +25,28 @@ let
           description = ''
             Name is used as a suffix for the service name, user, and group.
             By default it takes the value you use for `<instance>` in:
-            {option}`services.authelia.<instance>`
+            {option}`services.authelia.instances.<instance>`
+
+            When set to the empty string `""`, the service name, user, and group
+            will be just `authelia` without a suffix.
           '';
         };
 
         package = mkPackageOption pkgs "authelia" { };
 
         user = mkOption {
-          default = "authelia-${name}";
           type = types.str;
+          defaultText = lib.literalExpression ''
+            if name == "" then "authelia" else "authelia-''${name}"
+          '';
           description = "The name of the user for this authelia instance.";
         };
 
         group = mkOption {
-          default = "authelia-${name}";
           type = types.str;
+          defaultText = lib.literalExpression ''
+            if name == "" then "authelia" else "authelia-''${name}"
+          '';
           description = "The name of the group for this authelia instance.";
         };
 
@@ -252,6 +261,11 @@ let
           '';
         };
       };
+
+      config = {
+        user = mkDefault (autheliaName config.name);
+        group = mkDefault (autheliaName config.name);
+      };
     };
 
   writeOidcJwksConfigFile =
@@ -382,7 +396,7 @@ in
             ExecStart = "${execCommand} ${configArg}";
             Restart = "always";
             RestartSec = "5s";
-            StateDirectory = "authelia-${instance.name}";
+            StateDirectory = autheliaName instance.name;
             StateDirectoryMode = "0700";
 
             # Security options:
@@ -431,11 +445,8 @@ in
           };
         };
       mkInstanceUsersConfig = instance: {
-        groups."authelia-${instance.name}" = lib.mkIf (instance.group == "authelia-${instance.name}") {
-          name = "authelia-${instance.name}";
-        };
-        users."authelia-${instance.name}" = lib.mkIf (instance.user == "authelia-${instance.name}") {
-          name = "authelia-${instance.name}";
+        groups.${autheliaName instance.name} = lib.mkIf (instance.group == autheliaName instance.name) { };
+        users.${autheliaName instance.name} = lib.mkIf (instance.user == autheliaName instance.name) {
           isSystemUser = true;
           group = instance.group;
         };
@@ -468,7 +479,7 @@ in
         map (
           instance:
           lib.mkIf instance.enable {
-            "authelia-${instance.name}" = mkInstanceServiceConfig instance;
+            ${autheliaName instance.name} = mkInstanceServiceConfig instance;
           }
         ) instances
       );
@@ -481,5 +492,6 @@ in
     jk
     dit7ya
     nicomem
+    connor-grady
   ];
 }
diff --git a/nixos/modules/services/security/spire/agent-tpm.nix b/nixos/modules/services/security/spire/agent-tpm.nix
new file mode 100644
index 000000000000..6630050aee57
--- /dev/null
+++ b/nixos/modules/services/security/spire/agent-tpm.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+let
+  cfg = config.services.spire.agent;
+in
+{
+  options.services.spire.agent.settings.plugins.NodeAttestor.tpm = lib.mkOption {
+    default = null;
+    description = "TPM 2.0 node attestation plugin. When set, automatically enables security.tpm2 and grants the spire-agent user access to the TPM device.";
+    type = lib.types.nullOr (
+      lib.types.submodule {
+        freeformType = (pkgs.formats.hcl1 { }).type;
+        options.plugin_cmd = lib.mkOption {
+          type = lib.types.str;
+          default = lib.getExe' pkgs.spire-tpm-plugin "tpm_attestor_agent";
+          defaultText = lib.literalExpression ''lib.getExe' pkgs.spire-tpm-plugin "tpm_attestor_agent"'';
+          description = "Path to the TPM attestor agent plugin binary.";
+        };
+      }
+    );
+  };
+
+  config = lib.mkIf (cfg.enable && cfg.settings.plugins.NodeAttestor.tpm != null) {
+    security.tpm2.enable = true;
+
+    systemd.services.spire-agent.serviceConfig.SupplementaryGroups = [
+      config.security.tpm2.tssGroup
+    ];
+  };
+}
diff --git a/nixos/modules/services/security/spire/agent.nix b/nixos/modules/services/security/spire/agent.nix
index f66c0ff5a970..dc5cfa7a992e 100644
--- a/nixos/modules/services/security/spire/agent.nix
+++ b/nixos/modules/services/security/spire/agent.nix
@@ -26,28 +26,38 @@ in
           agent = {
             trust_domain = lib.mkOption {
               type = lib.types.str;
-              description = "The trust domain that this agent belongs to";
+              description = "The trust domain that this agent belongs to (should be no more than 255 characters)";
               example = "example.com";
             };
             data_dir = lib.mkOption {
               type = lib.types.str;
               default = "$STATE_DIRECTORY";
-              description = "The directory where the SPIRE agent stores its data";
+              description = "A directory the agent can use for its runtime data";
             };
             server_address = lib.mkOption {
               type = lib.types.str;
-              description = "The address of the SPIRE server";
+              description = "DNS name or IP address of the SPIRE server";
               example = "server.example.com";
             };
             server_port = lib.mkOption {
               type = lib.types.port;
               default = 8081;
-              description = "The port on which the SPIRE server is listening";
+              description = "Port number of the SPIRE server";
             };
             socket_path = lib.mkOption {
               type = lib.types.path;
               default = "/run/spire/agent/public/api.sock";
-              description = "The path to the SPIRE agent socket";
+              description = "Location to bind the SPIRE Agent API socket (Unix only)";
+            };
+            join_token = lib.mkOption {
+              type = lib.types.nullOr lib.types.str;
+              default = null;
+              description = "An optional token which has been generated by the SPIRE server";
+            };
+            join_token_file = lib.mkOption {
+              type = lib.types.nullOr lib.types.str;
+              default = null;
+              description = "Path to a file containing an optional join token which has been generated by the SPIRE server";
             };
           };
           plugins = lib.mkOption {
@@ -55,8 +65,39 @@ in
               Built-in plugin types can be found at [the plugin types documentation](https://spiffe.io/docs/latest/deploying/spire_agent/#plugin-types).
               See [plugin configuration](https://spiffe.io/docs/latest/deploying/spire_agent/#plugin-configuration) for options and how to configure external plugins.
             '';
-            # TODO: We can probably enforce some of these constraints with a submodule
-            type = format.type;
+            type = lib.types.submodule {
+              freeformType = format.type;
+              options.NodeAttestor = lib.mkOption {
+                default = { };
+                description = ''
+                  Gathers information used to attest the agent's identity to the server. Generally paired with a server plugin of the same type.
+                '';
+                type = lib.types.submodule {
+                  freeformType = format.type;
+                  options.join_token = lib.mkOption {
+                    default = null;
+                    description = ''
+                      The `join_token` is responsible for attesting the agent's identity using a one-time-use pre-shared key.
+
+                      Must be used in conjunction with the server-side `join_token` plugin.
+                    '';
+                    type = lib.types.nullOr (
+                      lib.types.submodule {
+                        freeformType = format.type;
+                        options.plugin_data = lib.mkOption {
+                          type = lib.types.submodule { };
+                          default = { };
+                          description = ''
+                            As a special case for node attestors, the join token itself is configured by a CLI flag (`-joinToken`)
+                            or by configuring `join_token` in the agent's main config body.
+                          '';
+                        };
+                      }
+                    );
+                  };
+                };
+              };
+            };
             example = {
               KeyManager.memory.plugin_data = { };
               NodeAttestor.join_token.plugin_data = { };
@@ -71,7 +112,7 @@ in
     configFile = lib.mkOption {
       type = lib.types.path;
       defaultText = "Config file generated from services.spire.agent.settings";
-      default = format.generate "agent.conf" cfg.settings;
+      default = format.generate "agent.conf" (lib.filterAttrsRecursive (_: v: v != null) cfg.settings);
       description = ''
         Path to the SPIRE agent configuration file. See [the documentation](https://spiffe.io/docs/latest/deploying/spire_agent/) for more information.
       '';
@@ -80,10 +121,12 @@ in
     expandEnv = lib.mkOption {
       type = lib.types.bool;
       default = true;
-      description = "Expand environment variables in SPIRE config file";
+      description = "Expand environment $VARIABLES in the config file";
     };
 
   };
+  imports = [ ./agent-tpm.nix ];
+
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
 
diff --git a/nixos/modules/services/security/spire/server-tpm.nix b/nixos/modules/services/security/spire/server-tpm.nix
new file mode 100644
index 000000000000..1d8c7c4a1b95
--- /dev/null
+++ b/nixos/modules/services/security/spire/server-tpm.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+let
+  format = pkgs.formats.hcl1 { };
+in
+{
+  options.services.spire.server.settings.plugins.NodeAttestor.tpm = lib.mkOption {
+    default = null;
+    description = ''
+      TPM 2.0 node attestation plugin from
+      [spire-tpm-plugin](https://github.com/spiffe/spire-tpm-plugin).
+    '';
+    type = lib.types.nullOr (
+      lib.types.submodule {
+        freeformType = format.type;
+        options = {
+          plugin_cmd = lib.mkOption {
+            type = lib.types.str;
+            default = lib.getExe' pkgs.spire-tpm-plugin "tpm_attestor_server";
+            defaultText = lib.literalExpression ''lib.getExe' pkgs.spire-tpm-plugin "tpm_attestor_server"'';
+            description = "Path to the TPM attestor server plugin binary.";
+          };
+          plugin_data = lib.mkOption {
+            default = { };
+            description = ''
+              Plugin data for the TPM NodeAttestor. Either `ca_path`,
+              `hash_path`, or both must be configured.
+            '';
+            type = lib.types.submodule {
+              freeformType = format.type;
+              options = {
+                ca_path = lib.mkOption {
+                  type = lib.types.nullOr lib.types.str;
+                  default = null;
+                  description = ''
+                    The path to the CA directory. Contains the manufacturer CA
+                    cert that signed the TPM's EK certificate in PEM or DER
+                    format.
+                  '';
+                };
+                hash_path = lib.mkOption {
+                  type = lib.types.nullOr lib.types.str;
+                  default = null;
+                  description = ''
+                    The path to the Hash directory. Contains empty files named
+                    after the EK public key hash.
+                  '';
+                };
+              };
+            };
+          };
+        };
+      }
+    );
+  };
+}
diff --git a/nixos/modules/services/security/spire/server.nix b/nixos/modules/services/security/spire/server.nix
index 44025d77e50b..53e232988450 100644
--- a/nixos/modules/services/security/spire/server.nix
+++ b/nixos/modules/services/security/spire/server.nix
@@ -11,6 +11,8 @@ in
 {
   meta.maintainers = [ lib.maintainers.arianvp ];
 
+  imports = [ ./server-tpm.nix ];
+
   options.services.spire.server = {
     enable = lib.mkEnableOption "SPIRE Server";
 
@@ -59,8 +61,35 @@ in
               Built-in plugin types can be found at [the plugin types documentation](https://spiffe.io/docs/latest/deploying/spire_server/#plugin-types).
               See [plugin configuration](https://spiffe.io/docs/latest/deploying/spire_server/#plugin-configuration) for options and how to configure external plugins.
             '';
-            # TODO: We can probably enforce some of these constraints with a submodule
-            type = format.type;
+            type = lib.types.submodule {
+              freeformType = format.type;
+              options.NodeAttestor = lib.mkOption {
+                default = { };
+                description = ''
+                  NodeAttestor plugins implement validation logic for nodes attempting to assert their identity.
+                  They are generally paired with an agent plugin of the same type.
+                  See [the documentation](https://spiffe.io/docs/latest/deploying/spire_server/#nodeattestor)
+                  for the list of built-in NodeAttestor plugins.
+                '';
+                type = lib.types.submodule {
+                  freeformType = format.type;
+                  options.join_token = lib.mkOption {
+                    default = null;
+                    description = "Join token based node attestation.";
+                    type = lib.types.nullOr (
+                      lib.types.submodule {
+                        freeformType = format.type;
+                        options.plugin_data = lib.mkOption {
+                          type = format.type;
+                          default = { };
+                          description = "Plugin data for the join_token NodeAttestor.";
+                        };
+                      }
+                    );
+                  };
+                };
+              };
+            };
             example = {
               KeyManager.memory.plugin_data = { };
               DataStore.sql.plugin_data = {
@@ -76,7 +105,7 @@ in
 
     configFile = lib.mkOption {
       type = lib.types.path;
-      default = format.generate "server.conf" cfg.settings;
+      default = format.generate "server.conf" (lib.filterAttrsRecursive (_: v: v != null) cfg.settings);
       defaultText = "Config file generated from services.spire.server.settings";
       description = ''
         Path to the SPIRE server configuration file. See [the documentation](https://spiffe.io/docs/latest/deploying/spire_server/) for more information.
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 8cb03b08c2f6..3e4b4ecd1530 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -68,7 +68,7 @@ in
           "dbus"
           "broker"
         ];
-        default = "dbus";
+        default = "broker";
         description = ''
           The implementation to use for the message bus defined by the D-Bus specification.
           Can be either the classic dbus daemon or dbus-broker, which aims to provide high
diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix
index 01d2858602b6..35759716e08b 100644
--- a/nixos/modules/services/ttys/getty.nix
+++ b/nixos/modules/services/ttys/getty.nix
@@ -13,6 +13,8 @@ let
   baseArgs = [
     "--login-program"
     "${cfg.loginProgram}"
+    "--issue-file"
+    "/etc/issue:/etc/issue.d:/run/issue:/run/issue.d"
   ]
   ++ optionals (cfg.autologinUser != null && !cfg.autologinOnce) [
     "--autologin"
@@ -163,6 +165,9 @@ in
       ];
       environment.TTY = "%I";
       restartIfChanged = false;
+      # logind hardcodes spawning autovt@ttyN.service on VT switch. Upstream
+      # declares this alias via [Install] Alias=, which NixOS does not process.
+      aliases = [ "autovt@.service" ];
     };
 
     systemd.services."serial-getty@" = {
@@ -173,14 +178,6 @@ in
       restartIfChanged = false;
     };
 
-    systemd.services."autovt@" = {
-      serviceConfig.ExecStart = [
-        "" # override upstream default with an empty ExecStart
-        (gettyCmd "--noclear %I $TERM")
-      ];
-      restartIfChanged = false;
-    };
-
     systemd.services."container-getty@" = {
       serviceConfig.ExecStart = [
         "" # override upstream default with an empty ExecStart
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index a7fdb726dd03..85b47e1b62ce 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -25,50 +25,28 @@ let
     text = cfg.extraConfig;
   };
 
-  baseLoginOptions = "-p -- \\u";
+  baseLoginOptions = "-p";
 
-  agettyCmd =
+  loginCmd =
     enableAutologin:
-    "${lib.getExe' pkgs.util-linux "agetty"} ${
-      lib.escapeShellArgs (
-        [
-          "--login-program"
-          (toString gettyCfg.loginProgram)
-          "--login-options"
-          # these options are passed as a single parameter
-          "${lib.optionalString enableAutologin "-f "}${baseLoginOptions}"
-        ]
-        ++ lib.optionals enableAutologin [
-          "--autologin"
-          gettyCfg.autologinUser
-        ]
-        ++ gettyCfg.extraArgs
-        ++ [
-          "--8bits"
-          "--noclear"
-          "--"
-          "-"
-        ]
-      )
-    } $TERM";
+    "${gettyCfg.loginProgram} ${baseLoginOptions}${lib.optionalString enableAutologin " -f -- ${gettyCfg.autologinUser}"}";
 
-  loginScript = pkgs.writers.writeDash "kmscon-login" ''
-    kms_tty=
-    active_tty_file=/sys/class/tty/tty0/active
-    if [ -f "$active_tty_file" ]; then
-      read -r kms_tty < "$active_tty_file"
-    fi
+  loginScript = pkgs.writers.writeDash "kmscon-login" (
+    lib.optionalString (gettyCfg.autologinUser != null && gettyCfg.autologinOnce) ''
+      kms_tty=
+      active_tty_file=/sys/class/tty/tty0/active
+      if [ -f "$active_tty_file" ]; then
+        read -r kms_tty < "$active_tty_file"
+      fi
 
-    ${lib.optionalString (gettyCfg.autologinUser != null && gettyCfg.autologinOnce) ''
       autologged="/run/kmscon.autologged"
       if [ "$kms_tty" = tty1 ] && [ ! -f "$autologged" ]; then
         touch "$autologged"
-        exec ${agettyCmd true}
+        exec ${loginCmd true}
       fi
-    ''}
-
-    exec ${agettyCmd (gettyCfg.autologinUser != null && !gettyCfg.autologinOnce)}
-  '';
+    ''
+    + "exec ${loginCmd (gettyCfg.autologinUser != null && !gettyCfg.autologinOnce)}"
+  );
 in
 {
   imports = [
@@ -172,37 +150,40 @@ in
       ];
 
       restartIfChanged = false;
+      # logind spawns autovt@ttyN.service on VT switch; point it at kmscon
       aliases = [ "autovt@.service" ];
     };
 
-    systemd.suppressedSystemUnits = [ "autovt@.service" ];
+    # tty1 is special: logind does not spawn autovt@tty1, it expects a static
+    # pull-in via getty.target. With getty@ suppressed, we must replace it.
+    systemd.services."getty.target".wants = lib.mkIf (!config.services.displayManager.enable) [
+      "kmsconvt@tty1.service"
+    ];
 
-    services.kmscon.extraConfig =
-      let
-        xkb = optionals cfg.useXkbConfig (
-          lib.mapAttrsToList (n: v: "xkb-${n}=${v}") (
-            lib.filterAttrs (
-              n: v:
-              builtins.elem n [
-                "layout"
-                "model"
-                "options"
-                "variant"
-              ]
-              && v != ""
-            ) config.services.xserver.xkb
-          )
-        );
-        render = optionals cfg.hwRender [
-          "drm"
-          "hwaccel"
-        ];
-        fonts =
-          optional (cfg.fonts != null)
-            "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}";
-        term = optional (cfg.term != null) "term=${cfg.term}";
-      in
-      lib.concatLines (xkb ++ render ++ fonts ++ term);
+    systemd.suppressedSystemUnits = [ "getty@.service" ];
+
+    services.kmscon.extraConfig = lib.concatLines (
+      optionals cfg.useXkbConfig (
+        lib.mapAttrsToList (n: v: "xkb-${n}=${v}") (
+          lib.filterAttrs (
+            n: v:
+            builtins.elem n [
+              "layout"
+              "model"
+              "options"
+              "variant"
+            ]
+            && v != ""
+          ) config.services.xserver.xkb
+        )
+      )
+      ++ optionals cfg.hwRender [
+        "drm"
+        "hwaccel"
+      ]
+      ++ optional (cfg.fonts != null) "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}"
+      ++ optional (cfg.term != null) "term=${cfg.term}"
+    );
 
     hardware.graphics.enable = mkIf cfg.hwRender true;
 
diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix
index 4786cbab62d5..854922bae6d7 100644
--- a/nixos/modules/services/video/epgstation/default.nix
+++ b/nixos/modules/services/video/epgstation/default.nix
@@ -306,7 +306,7 @@ in
       group = config.users.groups.epgstation.name;
       isSystemUser = true;
 
-      # NPM insists on creating ~/.npm
+      # npm insists on creating ~/.npm
       home = "/var/cache/epgstation";
     };
 
diff --git a/nixos/modules/services/video/mirakurun.nix b/nixos/modules/services/video/mirakurun.nix
index 72cf76ee76f8..aca5a5726a61 100644
--- a/nixos/modules/services/video/mirakurun.nix
+++ b/nixos/modules/services/video/mirakurun.nix
@@ -160,7 +160,7 @@ in
       group = "video";
       isSystemUser = true;
 
-      # NPM insists on creating ~/.npm
+      # npm insists on creating ~/.npm
       home = "/var/cache/mirakurun";
     };
 
diff --git a/nixos/modules/services/web-apps/linkding.nix b/nixos/modules/services/web-apps/linkding.nix
new file mode 100644
index 000000000000..fae7fb89c4d9
--- /dev/null
+++ b/nixos/modules/services/web-apps/linkding.nix
@@ -0,0 +1,403 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib)
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    optionalAttrs
+    types
+    ;
+
+  cfg = config.services.linkding;
+in
+{
+  options.services.linkding = {
+    enable = mkEnableOption "linkding, a self-hosted bookmark manager";
+
+    package = mkPackageOption pkgs "linkding" { };
+
+    user = mkOption {
+      type = types.str;
+      default = "linkding";
+      description = ''
+        User account under which linkding runs.
+
+        ::: {.note}
+        If left as the default value this user will automatically be created
+        on system activation, otherwise you are responsible for ensuring the
+        user exists before the linkding service starts.
+        :::
+      '';
+    };
+
+    group = mkOption {
+      type = types.str;
+      default = "linkding";
+      description = ''
+        Group under which linkding runs.
+
+        ::: {.note}
+        If left as the default value this group will automatically be created
+        on system activation, otherwise you are responsible for ensuring the
+        group exists before the linkding service starts.
+        :::
+      '';
+    };
+
+    dataDir = mkOption {
+      type = types.path;
+      default = "/var/lib/linkding";
+      description = "Directory used for all mutable state: SQLite database, secret key, favicons, previews, and assets.";
+    };
+
+    address = mkOption {
+      type = types.str;
+      default = "127.0.0.1";
+      description = "Address on which linkding listens.";
+    };
+
+    port = mkOption {
+      type = types.port;
+      default = 9090;
+      description = "Port on which linkding listens.";
+    };
+
+    contextPath = mkOption {
+      type = types.str;
+      default = "";
+      example = "linkding/";
+      description = ''
+        Configures a URL context path under which linkding is accessible.
+        When set, linkding is available at `http://host:<port>/<contextPath>`.
+        Must end with a `/` when non-empty.
+      '';
+    };
+
+    environmentFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      example = "/run/secrets/linkding.env";
+      description = ''
+        Path to an environment file loaded by all linkding services.
+        Useful for injecting secrets that should not appear in the Nix store,
+        such as `LD_DB_PASSWORD` or `LD_SUPERUSER_PASSWORD`.
+      '';
+    };
+
+    settings = mkOption {
+      type = types.attrsOf types.str;
+      default = { };
+      example = {
+        LD_DISABLE_BACKGROUND_TASKS = "True";
+        LD_DISABLE_URL_VALIDATION = "True";
+        LD_ENABLE_OIDC = "True";
+      };
+      description = ''
+        Additional environment variables passed to linkding.
+        Refer to the [linkding documentation](https://linkding.link/options/)
+        for the full list of supported `LD_*` options.
+      '';
+    };
+
+    database = {
+      type = mkOption {
+        type = types.enum [
+          "sqlite"
+          "postgres"
+        ];
+        default = "sqlite";
+        description = "Database engine to use. Defaults to SQLite.";
+      };
+
+      host = mkOption {
+        type = types.str;
+        default = "localhost";
+        description = "PostgreSQL server host.";
+      };
+
+      port = mkOption {
+        type = types.port;
+        default = 5432;
+        description = "PostgreSQL server port.";
+      };
+
+      name = mkOption {
+        type = types.str;
+        default = "linkding";
+        description = "PostgreSQL database name.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "linkding";
+        description = "PostgreSQL user name.";
+      };
+
+      createLocally = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to automatically create a local PostgreSQL database and user.";
+      };
+    };
+
+    openFirewall = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Open the linkding port in the firewall.";
+    };
+  };
+
+  config = mkIf cfg.enable (
+    let
+      pkg = cfg.package;
+
+      usePostgres = cfg.database.type == "postgres";
+
+      pythonPath =
+        "${pkg.passthru.python.pkgs.makePythonPath pkg.passthru.dependencies}:${lib.getBin pkg}/${pkg.passthru.python.sitePackages}"
+        + lib.strings.optionalString usePostgres ":${pkg.passthru.python.pkgs.makePythonPath pkg.optional-dependencies.postgres}";
+
+      # Build the environment passed to every linkding process.
+      environment = {
+        DJANGO_SETTINGS_MODULE = "bookmarks.settings.prod";
+        _NIXOS_LINKDING_DATA_DIR = cfg.dataDir;
+        LD_SERVER_PORT = toString cfg.port;
+      }
+      // optionalAttrs (cfg.contextPath != "") {
+        LD_CONTEXT_PATH = cfg.contextPath;
+      }
+      // optionalAttrs usePostgres {
+        LD_DB_ENGINE = "postgres";
+        LD_DB_DATABASE = cfg.database.name;
+        LD_DB_USER = cfg.database.user;
+        LD_DB_HOST = "/run/postgresql";
+      }
+      // optionalAttrs (usePostgres && !cfg.database.createLocally) {
+        LD_DB_HOST = cfg.database.host;
+        LD_DB_PORT = toString cfg.database.port;
+      }
+      // cfg.settings;
+
+      environmentFile = pkgs.writeText "linkding-environment" (lib.generators.toKeyValue { } environment);
+
+      # Generate a uwsgi.ini for the linkding instance, adapted for NixOS from
+      # the upstream uwsgi.ini. The static-map entries serve pre-generated
+      # static files from the Nix store as well as the mutable user-data
+      # directories (favicons, previews) from the data directory.
+      uwsgiIni = pkgs.writeText "linkding-uwsgi.ini" ''
+        [uwsgi]
+        plugins-dir = ${pkg.passthru.uwsgiWithPython}/lib/uwsgi
+        plugin = python3
+        module = bookmarks.wsgi:application
+        env = DJANGO_SETTINGS_MODULE=bookmarks.settings.prod
+        processes = 2
+        threads = 2
+        buffer-size = 8192
+        die-on-term = true
+        mime-file = ${pkgs.mailcap}/etc/mime.types
+        http = ${cfg.address}:${toString cfg.port}
+        static-map = /${cfg.contextPath}static=${pkg}/${pkg.passthru.python.sitePackages}/bookmarks/static
+        static-map = /${cfg.contextPath}static=${cfg.dataDir}/favicons
+        static-map = /${cfg.contextPath}static=${cfg.dataDir}/previews
+        static-map = /${cfg.contextPath}robots.txt=${pkg}/${pkg.passthru.python.sitePackages}/bookmarks/static/robots.txt
+
+        if-env = LD_REQUEST_TIMEOUT
+        http-timeout = %(_)
+        socket-timeout = %(_)
+        harakiri = %(_)
+        endif =
+
+        if-env = LD_REQUEST_MAX_CONTENT_LENGTH
+        limit-post = %(_)
+        endif =
+
+        if-env = LD_LOG_X_FORWARDED_FOR
+        log-x-forwarded-for = %(_)
+        endif =
+
+        if-env = LD_DISABLE_REQUEST_LOGS=true
+        disable-logging = true
+        log-4xx = true
+        log-5xx = true
+        endif =
+      '';
+
+      # Manage wrapper script installed into the system PATH so administrators can
+      # run Django management commands as the linkding service user.
+      linkdingManageScript =
+        let
+          args = lib.escapeShellArgs (
+            [
+              "--uid=${cfg.user}"
+              "--gid=${cfg.group}"
+              "--working-directory=${cfg.dataDir}"
+              "--property=EnvironmentFile=${environmentFile}"
+            ]
+            ++ lib.optional (cfg.environmentFile != null) "--property=EnvironmentFile=${cfg.environmentFile}"
+            ++ [
+              "--property=ReadWritePaths=${cfg.dataDir}"
+              "--setenv=PYTHONPATH=${pythonPath}"
+              "--pty"
+              "--wait"
+              "--collect"
+              "--service-type=exec"
+              "--quiet"
+              "--"
+              "${lib.getExe' pkg "linkding"}"
+            ]
+          );
+        in
+        pkgs.writeShellScriptBin "linkding-manage" ''
+          exec ${lib.getExe' config.systemd.package "systemd-run"} ${args} "$@"
+        '';
+
+      commonServiceConfig = {
+        Slice = "system-linkding.slice";
+        User = cfg.user;
+        Group = cfg.group;
+        EnvironmentFile = [
+          environmentFile
+        ]
+        ++ lib.optional (cfg.environmentFile != null) cfg.environmentFile;
+        Environment = "PYTHONPATH=${pythonPath}";
+        WorkingDirectory = cfg.dataDir;
+        StateDirectory = [
+          "linkding"
+          "linkding/favicons"
+          "linkding/previews"
+          "linkding/assets"
+        ];
+        StateDirectoryMode = "0750";
+        # Hardening
+        NoNewPrivileges = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        ProtectSystem = "strict";
+        ProtectHome = true;
+        ReadWritePaths = [ cfg.dataDir ];
+        PrivateMounts = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        RemoveIPC = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+      };
+    in
+    {
+      assertions = [
+        {
+          assertion = cfg.database.createLocally -> usePostgres;
+          message = "services.linkding.database.createLocally requires services.linkding.database.type = \"postgres\"";
+        }
+        {
+          assertion =
+            cfg.database.createLocally -> cfg.database.host == "localhost" || cfg.database.host == "";
+          message = "services.linkding.database.host should be empty or \"localhost\" when createLocally is enabled";
+        }
+        {
+          assertion =
+            cfg.database.createLocally
+            -> cfg.database.user == cfg.user && cfg.database.user == cfg.database.name;
+          message = "services.linkding.database.user must match services.linkding.user and services.linkding.database.name when createLocally is enabled";
+        }
+        {
+          assertion = cfg.contextPath == "" || lib.hasSuffix "/" cfg.contextPath;
+          message = "services.linkding.contextPath must end with \"/\" when non-empty";
+        }
+      ];
+
+      networking.firewall = mkIf cfg.openFirewall {
+        allowedTCPPorts = [ cfg.port ];
+      };
+
+      environment.systemPackages = [ linkdingManageScript ];
+
+      users.users.${cfg.user} = {
+        isSystemUser = true;
+        group = cfg.group;
+        home = cfg.dataDir;
+      };
+
+      users.groups.${cfg.group} = { };
+
+      systemd.slices.system-linkding = {
+        description = "linkding bookmark manager System Slice";
+        documentation = [ "https://linkding.link/" ];
+      };
+
+      # One-shot setup service: run database migrations and first-time
+      # initialization steps taken from the upstream bootstrap.sh.
+      systemd.services.linkding-setup = {
+        description = "linkding database migrations and initialization";
+        after = [
+          "network.target"
+        ]
+        ++ lib.optionals (usePostgres && cfg.database.createLocally) [ "postgresql.target" ];
+        requires = lib.optionals (usePostgres && cfg.database.createLocally) [ "postgresql.target" ];
+
+        serviceConfig = commonServiceConfig // {
+          Type = "oneshot";
+          ExecStart = "${lib.getExe' pkg "linkding-bootstrap"}";
+        };
+      };
+
+      # Main WSGI service — starts after setup completes.
+      systemd.services.linkding = {
+        description = "linkding bookmark manager";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "linkding-setup.service" ];
+        requires = [ "linkding-setup.service" ];
+        startLimitBurst = 5;
+        startLimitIntervalSec = 60;
+        serviceConfig = commonServiceConfig // {
+          Type = "exec";
+          ExecStart = "${lib.getExe pkgs.uwsgi} --ini ${uwsgiIni}";
+          Restart = "on-failure";
+        };
+      };
+
+      # Background task processor (Huey). Can be disabled via
+      # services.linkding.settings.LD_DISABLE_BACKGROUND_TASKS = "True".
+      systemd.services.linkding-background-tasks =
+        mkIf ((cfg.settings.LD_DISABLE_BACKGROUND_TASKS or "False") != "True")
+          {
+            description = "linkding background task processor";
+            wantedBy = [ "multi-user.target" ];
+            after = [ "linkding-setup.service" ];
+            requires = [ "linkding-setup.service" ];
+
+            serviceConfig = commonServiceConfig // {
+              Type = "exec";
+              ExecStart = "${lib.getExe' pkg "linkding"} run_huey -f";
+              Restart = "on-failure";
+              RestartSec = "5s";
+            };
+          };
+
+      # Automatically provision a local PostgreSQL database when requested.
+      services.postgresql = mkIf cfg.database.createLocally {
+        enable = true;
+        ensureDatabases = [ cfg.database.name ];
+        ensureUsers = [
+          {
+            name = cfg.database.user;
+            ensureDBOwnership = true;
+          }
+        ];
+      };
+    }
+  );
+
+  meta.maintainers = with lib.maintainers; [ squat ];
+}
diff --git a/nixos/modules/services/web-apps/linkwarden.nix b/nixos/modules/services/web-apps/linkwarden.nix
index a7aa3cb1ee0b..d485c4926017 100644
--- a/nixos/modules/services/web-apps/linkwarden.nix
+++ b/nixos/modules/services/web-apps/linkwarden.nix
@@ -240,11 +240,11 @@ in
       requires = [
         "network-online.target"
       ]
-      ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
+      ++ lib.optionals cfg.database.createLocally [ "postgresql.target" ];
       after = [
         "network-online.target"
       ]
-      ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
+      ++ lib.optionals cfg.database.createLocally [ "postgresql.target" ];
       wantedBy = [ "multi-user.target" ];
       environment = cfg.environment // {
         # Required, otherwise chrome dumps core
@@ -262,12 +262,12 @@ in
         "network-online.target"
         "linkwarden.service"
       ]
-      ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
+      ++ lib.optionals cfg.database.createLocally [ "postgresql.target" ];
       after = [
         "network-online.target"
         "linkwarden.service"
       ]
-      ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
+      ++ lib.optionals cfg.database.createLocally [ "postgresql.target" ];
       wantedBy = [ "multi-user.target" ];
       environment = cfg.environment // {
         # Required, otherwise chrome dumps core
diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index cbec4ca230bf..26b6ebc171a9 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -27,9 +27,9 @@ let
 
   inherit (lib.modules)
     mkRenamedOptionModule
+    mkRemovedOptionModule
     mkMerge
     mkIf
-    mkDefault
     ;
 
   inherit (lib.trivial) warnIf throwIf;
@@ -55,10 +55,13 @@ let
   # Ensure that it's inside mutableDataDir since it can get rather large.
   tempDir = "${mutableDataDir}/tmp";
 
+  # Database supported by Mattermost.
+  databaseDriverName = "postgres";
+
   # Creates a database URI.
   mkDatabaseUri =
     {
-      scheme,
+      scheme ? databaseDriverName,
       user ? null,
       password ? null,
       escapeUserAndPassword ? true,
@@ -105,54 +108,24 @@ let
     let
       hostIsPath = hasInfix "/" cfg.database.host;
     in
-    if cfg.database.driver == "postgres" then
-      if cfg.database.peerAuth then
-        mkDatabaseUri {
-          scheme = cfg.database.driver;
-          inherit (cfg.database) user;
-          path = escapeURL cfg.database.name;
-          query = {
-            host = cfg.database.socketPath;
-          }
-          // cfg.database.extraConnectionOptions;
-        }
-      else
-        mkDatabaseUri {
-          scheme = cfg.database.driver;
-          inherit (cfg.database) user password;
-          host = if hostIsPath then null else cfg.database.host;
-          port = if hostIsPath then null else cfg.database.port;
-          path = escapeURL cfg.database.name;
-          query =
-            optionalAttrs hostIsPath { host = cfg.database.host; } // cfg.database.extraConnectionOptions;
-        }
-    else if cfg.database.driver == "mysql" then
-      if cfg.database.peerAuth then
-        mkDatabaseUri {
-          scheme = null;
-          inherit (cfg.database) user;
-          escapeUserAndPassword = false;
-          host = "unix(${cfg.database.socketPath})";
-          escapeHost = false;
-          path = escapeURL cfg.database.name;
-          query = cfg.database.extraConnectionOptions;
-        }
-      else
-        mkDatabaseUri {
-          scheme = null;
-          inherit (cfg.database) user password;
-          escapeUserAndPassword = false;
-          host =
-            if hostIsPath then
-              "unix(${cfg.database.host})"
-            else
-              "tcp(${cfg.database.host}:${toString cfg.database.port})";
-          escapeHost = false;
-          path = escapeURL cfg.database.name;
-          query = cfg.database.extraConnectionOptions;
+    if cfg.database.peerAuth then
+      mkDatabaseUri {
+        inherit (cfg.database) user;
+        path = escapeURL cfg.database.name;
+        query = {
+          host = cfg.database.socketPath;
         }
+        // cfg.database.extraConnectionOptions;
+      }
     else
-      throw "Invalid database driver: ${cfg.database.driver}";
+      mkDatabaseUri {
+        inherit (cfg.database) user password;
+        host = if hostIsPath then null else cfg.database.host;
+        port = if hostIsPath then null else cfg.database.port;
+        path = escapeURL cfg.database.name;
+        query =
+          optionalAttrs hostIsPath { host = cfg.database.host; } // cfg.database.extraConnectionOptions;
+      };
 
   mattermostPluginDerivations = map (
     plugin:
@@ -213,7 +186,7 @@ let
       EnableSecurityFixAlert = cfg.telemetry.enableSecurityAlerts;
     };
     TeamSettings.SiteName = cfg.siteName;
-    SqlSettings.DriverName = cfg.database.driver;
+    SqlSettings.DriverName = databaseDriverName;
     SqlSettings.DataSource =
       if cfg.database.fromEnvironment then
         null
@@ -358,6 +331,11 @@ in
         "dataDir"
       ]
     )
+    (mkRemovedOptionModule [ "services" "mattermost" "database" "driver" ] ''
+      services.mattermost.database.driver has been removed, as the only option is '${databaseDriverName}' in v11+.
+      If you were using MySQL, please migrate to Postgres:
+      https://docs.mattermost.com/deployment-guide/manual-postgres-migration.html
+    '')
   ];
 
   options = {
@@ -558,22 +536,11 @@ in
       };
 
       database = {
-        driver = mkOption {
-          type = types.enum [
-            "postgres"
-            "mysql"
-          ];
-          default = "postgres";
-          description = ''
-            The database driver to use (Postgres or MySQL).
-          '';
-        };
-
         create = mkOption {
           type = types.bool;
           default = true;
           description = ''
-            Create a local PostgreSQL or MySQL database for Mattermost automatically.
+            Create a local PostgreSQL database for Mattermost automatically.
           '';
         };
 
@@ -591,13 +558,9 @@ in
 
         socketPath = mkOption {
           type = types.path;
-          default =
-            if cfg.database.driver == "postgres" then "/run/postgresql" else "/run/mysqld/mysqld.sock";
-          defaultText = ''
-            if config.services.mattermost.database.driver == "postgres" then "/run/postgresql" else "/run/mysqld/mysqld.sock";
-          '';
+          default = "/run/postgresql";
           description = ''
-            The database (Postgres or MySQL) socket path.
+            The database socket path.
           '';
         };
 
@@ -630,11 +593,8 @@ in
 
         port = mkOption {
           type = types.port;
-          default = if cfg.database.driver == "postgres" then 5432 else 3306;
-          defaultText = ''
-            if config.services.mattermost.database.type == "postgres" then 5432 else 3306
-          '';
-          example = 3306;
+          default = 5432;
+          example = 1234;
           description = ''
             Port to use for the database.
           '';
@@ -660,34 +620,15 @@ in
 
         extraConnectionOptions = mkOption {
           type = with types; attrsOf (either int str);
-          default =
-            if cfg.database.driver == "postgres" then
-              {
-                sslmode = "disable";
-                connect_timeout = 60;
-              }
-            else if cfg.database.driver == "mysql" then
-              {
-                charset = "utf8mb4";
-                writeTimeout = "60s";
-                readTimeout = "60s";
-              }
-            else
-              throw "Invalid database driver ${cfg.database.driver}";
+          default = {
+            sslmode = "disable";
+            connect_timeout = 60;
+          };
           defaultText = ''
-            if config.mattermost.database.driver == "postgres" then
-              {
-                sslmode = "disable";
-                connect_timeout = 60;
-              }
-            else if config.mattermost.database.driver == "mysql" then
-              {
-                charset = "utf8mb4";
-                writeTimeout = "60s";
-                readTimeout = "60s";
-              }
-            else
-              throw "Invalid database driver";
+            {
+              sslmode = "disable";
+              connect_timeout = 60;
+            }
           '';
           description = ''
             Extra options that are placed in the connection URI's query parameters.
@@ -756,7 +697,7 @@ in
         };
       };
 
-      services.postgresql = mkIf (cfg.database.driver == "postgres" && cfg.database.create) {
+      services.postgresql = mkIf cfg.database.create {
         enable = true;
         ensureDatabases = singleton cfg.database.name;
         ensureUsers = singleton {
@@ -772,26 +713,6 @@ in
         };
       };
 
-      services.mysql = mkIf (cfg.database.driver == "mysql" && cfg.database.create) {
-        enable = true;
-        package = mkDefault pkgs.mariadb;
-        ensureDatabases = singleton cfg.database.name;
-        ensureUsers = singleton {
-          name = cfg.database.user;
-          ensurePermissions = {
-            "${cfg.database.name}.*" = "ALL PRIVILEGES";
-          };
-        };
-        settings = rec {
-          mysqld = {
-            collation-server = mkDefault "utf8mb4_general_ci";
-            init-connect = mkDefault "SET NAMES utf8mb4";
-            character-set-server = mkDefault "utf8mb4";
-          };
-          mysqld_safe = mysqld;
-        };
-      };
-
       environment = {
         variables = mkIf cfg.socket.export {
           MMCTL_LOCAL = "true";
@@ -840,8 +761,7 @@ in
         wantedBy = [ "multi-user.target" ];
         after = mkMerge [
           [ "network.target" ]
-          (mkIf (cfg.database.driver == "postgres" && cfg.database.create) [ "postgresql.target" ])
-          (mkIf (cfg.database.driver == "mysql" && cfg.database.create) [ "mysql.service" ])
+          (mkIf cfg.database.create [ "postgresql.target" ])
         ];
         requires = after;
 
@@ -945,8 +865,7 @@ in
         ];
 
         unitConfig.JoinsNamespaceOf = mkMerge [
-          (mkIf (cfg.database.driver == "postgres" && cfg.database.create) [ "postgresql.target" ])
-          (mkIf (cfg.database.driver == "mysql" && cfg.database.create) [ "mysql.service" ])
+          (mkIf cfg.database.create [ "postgresql.target" ])
         ];
       };
 
@@ -966,13 +885,6 @@ in
             or hostname, and services.mattermost.port to specify the port separately.
           '';
         }
-        {
-          # Can't use MySQL on version 11.
-          assertion = versionAtLeast cfg.package.version "11" -> cfg.database.driver == "postgres";
-          message = ''
-            Only Postgres is supported as the database driver in Mattermost 11 and later.
-          '';
-        }
       ];
     })
     (mkIf cfg.matterircd.enable {
diff --git a/nixos/modules/services/web-apps/node-red.nix b/nixos/modules/services/web-apps/node-red.nix
index bea41d241396..74bbcc869e67 100644
--- a/nixos/modules/services/web-apps/node-red.nix
+++ b/nixos/modules/services/web-apps/node-red.nix
@@ -29,7 +29,7 @@ in
       type = types.bool;
       default = false;
       description = ''
-        Give Node-RED access to NPM and GCC at runtime, so 'Nodes' can be
+        Give Node-RED access to npm and GCC at runtime, so 'Nodes' can be
         downloaded and managed imperatively via the 'Palette Manager'.
       '';
     };
diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix
index d56e7855775d..52dba06ec9fd 100644
--- a/nixos/modules/services/web-apps/onlyoffice.nix
+++ b/nixos/modules/services/web-apps/onlyoffice.nix
@@ -58,6 +58,12 @@ in
       description = "Port the OnlyOffice document server should listen on.";
     };
 
+    allowLocalConnections = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Whether to allow the document server to download files from private IP addresses.";
+    };
+
     examplePort = lib.mkOption {
       type = lib.types.port;
       default = null;
@@ -308,6 +314,10 @@ in
             # https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/run-document-server.sh
             FS_SECRET_STRING=$(cut -d '"' -f 2 < ${cfg.securityNonceFile})
             jq '
+            ${lib.optionalString cfg.allowLocalConnections ''
+              .services.CoAuthoring."request-filtering-agent".allowPrivateIPAddress = true |
+              .services.CoAuthoring."request-filtering-agent".allowMetaIPAddress = true |
+            ''}
               .storage.fs.secretString = "'$FS_SECRET_STRING'" |
               .services.CoAuthoring.server.port = ${toString cfg.port} |
               .services.CoAuthoring.sql.dbHost = "${cfg.postgresHost}" |
diff --git a/nixos/modules/services/web-servers/stargazer.nix b/nixos/modules/services/web-servers/stargazer.nix
index 299f7b11082f..cc16e0755ced 100644
--- a/nixos/modules/services/web-servers/stargazer.nix
+++ b/nixos/modules/services/web-servers/stargazer.nix
@@ -109,7 +109,7 @@ in
 
     store = lib.mkOption {
       type = lib.types.path;
-      default = /var/lib/gemini/certs;
+      default = "/var/lib/gemini/certs";
       description = ''
         Path to the certificate store on disk. This should be a
         persistent directory writable by Stargazer.
@@ -284,7 +284,7 @@ in
     };
 
     # Create default cert store
-    systemd.tmpfiles.rules = lib.mkIf (cfg.store == /var/lib/gemini/certs) [
+    systemd.tmpfiles.rules = lib.mkIf ((builtins.toString cfg.store) == "/var/lib/gemini/certs") [
       ''d /var/lib/gemini/certs - "${cfg.user}" "${cfg.group}" -''
     ];
 
diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index 0f1217fa9b35..3d6a41498a70 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -223,16 +223,23 @@ in
       '')
     ];
 
-    assertions = concatMap (m: [
-      {
-        assertion = (hasPrefix "/" m.address) || (hasPrefix "@" m.address) -> m.port == null;
-        message = "Listen ports must not be specified with UNIX sockets: ${builtins.toJSON m}";
-      }
-      {
-        assertion = !(hasPrefix "/" m.address) -> m.user == null && m.group == null && m.mode == null;
-        message = "Abstract UNIX sockets or IP sockets can not be used with user, group, and mode settings: ${builtins.toJSON m}";
-      }
-    ]) cfg.listen;
+    assertions =
+      (concatMap (m: [
+        {
+          assertion = (hasPrefix "/" m.address) || (hasPrefix "@" m.address) -> m.port == null;
+          message = "Listen ports must not be specified with UNIX sockets: ${builtins.toJSON m}";
+        }
+        {
+          assertion = !(hasPrefix "/" m.address) -> m.user == null && m.group == null && m.mode == null;
+          message = "Abstract UNIX sockets or IP sockets can not be used with user, group, and mode settings: ${builtins.toJSON m}";
+        }
+      ]) cfg.listen)
+      ++ [
+        {
+          assertion = cfg.package.pname != "vinyl-cache";
+          message = "services.varnish only supports Varnish Cache. Please use services.vinyl-cache.";
+        }
+      ];
 
     warnings =
       lib.optional (!isNull cfg.http_address)
diff --git a/nixos/modules/services/web-servers/vinyl-cache/default.nix b/nixos/modules/services/web-servers/vinyl-cache/default.nix
new file mode 100644
index 000000000000..5efc681247e2
--- /dev/null
+++ b/nixos/modules/services/web-servers/vinyl-cache/default.nix
@@ -0,0 +1,258 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    types
+    mkOption
+    hasPrefix
+    concatMapStringsSep
+    optionalString
+    concatMap
+    ;
+
+  cfg = config.services.vinyl-cache;
+
+  # Vinyl Cache has very strong opinions and very complicated code around handling
+  # the stateDir. After a lot of back and forth, we decided that we a)
+  # do not want a configurable option here, as most of the handling depends
+  # on the version and the compile time options. Putting everything into
+  # /var/run (RAM backed) is absolutely recommended by Vinyl Cache anyways.
+  # We do need to pay attention to the version-dependend variations, though!
+  stateDir = "/var/run/vinyld";
+
+  # from --help:
+  #   -a [<name>=]address[:port][,proto] # HTTP listen address and port
+  #      [,user=<u>][,group=<g>]   # Can be specified multiple times.
+  #      [,mode=<m>]               #   default: ":80,HTTP"
+  #                                # Proto can be "PROXY" or "HTTP" (default)
+  #                                # user, group and mode set permissions for
+  #                                #   a Unix domain socket.
+  commandLineAddresses = (
+    concatMapStringsSep " " (
+      a:
+      "-a "
+      + optionalString (!isNull a.name) "${a.name}="
+      + a.address
+      + optionalString (!isNull a.port) ":${toString a.port}"
+      + optionalString (!isNull a.proto) ",${a.proto}"
+      + optionalString (!isNull a.user) ",user=${a.user}"
+      + optionalString (!isNull a.group) ",group=${a.group}"
+      + optionalString (!isNull a.mode) ",mode=${a.mode}"
+    ) cfg.listen
+  );
+
+  addressSubmodule = types.submodule {
+    options = {
+      name = mkOption {
+        description = "Name is referenced in logs. If name is not specified, 'a0', 'a1', etc. is used.";
+        default = null;
+        type = with types; nullOr str;
+      };
+      address = mkOption {
+        description = ''
+          If given an IP address, it can be a host name ("localhost"), an IPv4 dotted-quad
+          ("127.0.0.1") or an IPv6  address enclosed in square brackets ("[::1]").
+
+          (VCL4.1 and higher) If given an absolute Path ("/path/to/listen.sock") or "@"
+          followed by the name of an abstract socket ("@myvinyld") accept connections
+          on a Unix domain socket.
+
+          The user, group and mode sub-arguments may be used to specify the permissions
+          of the socket file. These sub-arguments do not apply to  abstract sockets.
+        '';
+        type = types.str;
+      };
+      port = mkOption {
+        description = "The port to use for IP sockets. If port is not specified, port 80 (http) is used.";
+        default = null;
+        type = with types; nullOr port;
+      };
+      proto = mkOption {
+        description = "PROTO can be 'HTTP' (the default) or 'PROXY'.  Both version 1 and 2 of the proxy protocol can be used.";
+        type = types.enum [
+          "HTTP"
+          "PROXY"
+        ];
+        default = "HTTP";
+      };
+      user = mkOption {
+        description = "User name who owns the socket file.";
+        default = null;
+        type = with lib.types; nullOr str;
+      };
+      group = mkOption {
+        description = "Group name who owns the socket file.";
+        default = null;
+        type = with lib.types; nullOr str;
+      };
+      mode = mkOption {
+        description = "Permission of the socket file (3-digit octal value).";
+        default = null;
+        type = with types; nullOr str;
+      };
+    };
+  };
+  checkedAddressModule = types.addCheck addressSubmodule (
+    m:
+    (
+      if ((hasPrefix "@" m.address) || (hasPrefix "/" m.address)) then
+        # this is a unix socket
+        (m.port != null)
+      else
+      # this is not a path-based unix socket
+      if !(hasPrefix "/" m.address) && (m.group != null) || (m.user != null) || (m.mode != null) then
+        false
+      else
+        true
+    )
+  );
+  commandLine =
+    "-f ${pkgs.writeText "default.vcl" cfg.config}"
+    +
+      lib.optionalString (cfg.extraModules != [ ])
+        " -p vmod_path='${
+           lib.makeSearchPathOutput "lib" "lib/vinyl/vmods" ([ cfg.package ] ++ cfg.extraModules)
+         }' -r vmod_path";
+in
+{
+  meta.maintainers = [
+    lib.maintainers.leona
+    lib.maintainers.osnyx
+  ];
+  options = {
+    services.vinyl-cache = {
+      enable = lib.mkEnableOption "Vinyl Cache";
+
+      enableConfigCheck = lib.mkEnableOption "checking the config during build time" // {
+        default = true;
+      };
+
+      package = lib.mkPackageOption pkgs "vinyl-cache" { };
+
+      listen = lib.mkOption {
+        description = "Accept for client requests on the specified listen addresses.";
+        type = lib.types.listOf checkedAddressModule;
+        defaultText = lib.literalExpression ''[ { address="*"; port=6081; } ]'';
+        default = [
+          {
+            address = "*";
+            port = 6081;
+          }
+        ];
+      };
+
+      config = lib.mkOption {
+        type = lib.types.lines;
+        description = ''
+          Verbatim default.vcl configuration.
+        '';
+      };
+
+      extraModules = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
+        default = [ ];
+        description = ''
+          Vinyl Cache modules (except 'std').
+        '';
+      };
+
+      extraCommandLine = lib.mkOption {
+        type = lib.types.str;
+        default = "";
+        example = "-s malloc,256M";
+        description = ''
+          Command line switches for vinyld (run 'vinyld -?' to get list of options)
+        '';
+      };
+
+      enableFileLogging = lib.mkEnableOption "file based logging";
+    };
+
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.enable {
+      systemd.services.vinyl-cache = {
+        description = "Vinyl Cache";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        serviceConfig = {
+          Type = "simple";
+          ExecStart = "${cfg.package}/bin/vinyld ${commandLineAddresses} -n ${stateDir} -F ${cfg.extraCommandLine} ${commandLine}";
+          Restart = "always";
+          RestartSec = "5s";
+          User = "vinyl-cache";
+          Group = "vinyl-cache";
+          DynamicUser = true;
+          RuntimeDirectory = lib.removePrefix "/var/run/" stateDir;
+          AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+          NoNewPrivileges = true;
+          LimitNOFILE = 131072;
+        };
+      };
+
+      environment.systemPackages = [ cfg.package ];
+
+      # check .vcl syntax at compile time (e.g. before nixops deployment)
+      system.checks = lib.mkIf cfg.enableConfigCheck [
+        (pkgs.runCommand "check-vinyl-cache-syntax" { } ''
+          ${cfg.package}/bin/vinyld -C ${commandLine} 2> $out || (cat $out; exit 1)
+        '')
+      ];
+
+      assertions =
+        concatMap (m: [
+          {
+            assertion = (hasPrefix "/" m.address) || (hasPrefix "@" m.address) -> m.port == null;
+            message = "Listen ports must not be specified with UNIX sockets: ${builtins.toJSON m}";
+          }
+          {
+            assertion = !(hasPrefix "/" m.address) -> m.user == null && m.group == null && m.mode == null;
+            message = "Abstract UNIX sockets or IP sockets can not be used with user, group, and mode settings: ${builtins.toJSON m}";
+          }
+        ]) cfg.listen
+        ++ [
+          {
+            assertion = cfg.package.pname == "vinyl-cache";
+            message = "services.vinyl-cache only supports Vinyl Cache. Please use services.varnish.";
+          }
+        ];
+    })
+    (lib.mkIf (cfg.enable && cfg.enableFileLogging) {
+      systemd.services = {
+        vinylncsa = {
+          after = [ "vinyl-cache.service" ];
+          requires = [ "vinyl-cache.service" ];
+          description = "Vinyl Cache logging daemon";
+          wantedBy = [ "multi-user.target" ];
+          # We want to reopen logs with HUP. vinylncsa must run in daemon mode for that.
+          serviceConfig = {
+            Type = "forking";
+            Restart = "always";
+            RuntimeDirectory = "vinylncsa";
+            LogsDirectory = "vinyl-cache";
+            PIDFile = "/run/vinylncsa/vinylncsa.pid";
+            User = "vinyl-cache";
+            Group = "vinyl-cache";
+            ExecStart = "${cfg.package}/bin/vinylncsa -D -a -w /var/log/vinyl-cache/vinyl-cache.log -P /run/vinylncsa/vinylncsa.pid";
+            ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+          };
+        };
+      };
+
+      services.logrotate.settings.vinyl-cache = lib.mapAttrs (_: lib.mkDefault) {
+        files = [ "/var/log/vinyl-cache/*.log" ];
+        frequency = "daily";
+        rotate = 14;
+        compress = true;
+        delaycompress = true;
+        postrotate = "systemctl reload vinylncsa";
+      };
+    })
+  ];
+}
diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix
index 48adb3665f38..53d544af68e0 100644
--- a/nixos/modules/services/x11/unclutter-xfixes.nix
+++ b/nixos/modules/services/x11/unclutter-xfixes.nix
@@ -55,7 +55,7 @@ in
         ${cfg.package}/bin/unclutter \
           --timeout ${toString cfg.timeout} \
           --jitter ${toString (cfg.threshold - 1)} \
-          ${concatMapStrings (x: " --" + x) cfg.extraOptions} \
+          ${concatMapStrings (x: " --" + x) cfg.extraOptions}
       '';
       serviceConfig.RestartSec = 3;
       serviceConfig.Restart = "always";
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index bb11c8639783..d555aaac7f0f 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -69,7 +69,7 @@ in
           -jitter ${toString (cfg.threshold - 1)} \
           ${optionalString cfg.keystroke "-keystroke"} \
           ${concatMapStrings (x: " -" + x) cfg.extraOptions} \
-          -not ${concatStringsSep " " cfg.excluded} \
+          -not ${concatStringsSep " " cfg.excluded}
       '';
       serviceConfig.PassEnvironment = "DISPLAY";
       serviceConfig.RestartSec = 3;
diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix
index f6aeb70d7aa4..d34223bc96a1 100644
--- a/nixos/modules/system/activation/switchable-system.nix
+++ b/nixos/modules/system/activation/switchable-system.nix
@@ -71,41 +71,31 @@
 
       preSwitchChecks.switchInhibitors =
         let
-          realpath = lib.getExe' pkgs.coreutils "realpath";
-          mktemp = lib.getExe' pkgs.coreutils "mktemp";
-          rm = lib.getExe' pkgs.coreutils "rm";
-          jq = lib.getExe' pkgs.jq "jq";
+          jq = lib.getExe pkgs.jq;
+          empty = pkgs.writeText "empty-inhibitors" "{}";
         in
         # bash
         ''
           incoming="''${1-}"
           action="''${2-}"
 
-          if [ "$action" == "boot" ]; then
-            echo "Not checking switch inhibitors (action = $action)"
-            exit
-          fi
+          case "$action" in
+            boot|dry-activate)
+              echo "Not checking switch inhibitors (action = $action)"
+              exit
+              ;;
+          esac
 
           echo -n "Checking switch inhibitors..."
 
-          # Create a temporary file that we use in case a generation does not have
-          # the switch-inhibitors file.
-          empty="$(${mktemp} -t switch_inhibit.XXXX)"
-          # shellcheck disable=SC2329
-          clean_up() {
-            ${rm} -f "$empty"
-          }
-          trap clean_up EXIT
-          echo "{}" > "$empty"
-
-          current_inhibitors="$(${realpath} /run/current-system)/switch-inhibitors"
+          current_inhibitors="/run/current-system/switch-inhibitors"
           if [ ! -f "$current_inhibitors" ]; then
-            current_inhibitors="$empty"
+            current_inhibitors="${empty}"
           fi
 
-          new_inhibitors="$(${realpath} "$incoming")/switch-inhibitors"
+          new_inhibitors="$incoming/switch-inhibitors"
           if [ ! -f "$new_inhibitors" ]; then
-            new_inhibitors="$empty"
+            new_inhibitors="${empty}"
           fi
 
           diff="$(
@@ -115,8 +105,8 @@
               --rawfile current "$current_inhibitors" \
               --rawfile newgen "$new_inhibitors" \
             '
-              $current | try fromjson catch {} as $old |
-              $newgen | try fromjson catch {} as $new |
+              ($current | fromjson) as $old |
+              ($newgen | fromjson) as $new |
               $old |
               to_entries |
               map(
diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix
index 0cc217f537b9..62687e741638 100644
--- a/nixos/modules/system/boot/loader/limine/limine.nix
+++ b/nixos/modules/system/boot/loader/limine/limine.nix
@@ -455,6 +455,10 @@ in
           assertion = cfg.efiSupport;
           message = "Secure boot is only supported on EFI systems.";
         }
+        {
+          assertion = !cfg.enableEditor;
+          message = "Editor is unconditionally disabled by Limine.";
+        }
       ];
 
       boot.loader.limine.enrollConfig = true;
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 3769c46f64de..a533680a6539 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -610,6 +610,17 @@ let
     )
   );
 
+  systemdStage1HardwareKeyAssertionMessage = opt: ''
+    ${opt} is deprecated, and it is unsupported with systemd stage 1. Support will be removed in 26.11 along with scripted stage 1. Hardware keys in systemd stage 1 are supported with systemd-cryptsetup(8). To migrate, enroll a key in a LUKS slot with systemd-cryptenroll(1). Usually, systemd will automatically detect the configuration at runtime, but if necessary, configure the corresponding crypttab(5) options with boot.initrd.luks.devices.<name>.crypttabExtraOpts.
+
+    Note: After migrating to a new LUKS slot, the old LUKS slot used for the scripted stage 1 implementation should be removed, otherwise it could interfere with falling back to a passphrase prompt in the event the hardware key fails.
+
+    See:
+    - https://www.freedesktop.org/software/systemd/man/systemd-cryptsetup.html
+    - https://www.freedesktop.org/software/systemd/man/systemd-cryptenroll.html
+    - https://www.freedesktop.org/software/systemd/man/crypttab.html
+  '';
+
 in
 {
   imports = [
@@ -1106,21 +1117,16 @@ in
       # TODO
       {
         assertion = config.boot.initrd.systemd.enable -> !luks.gpgSupport;
-        message = "systemd stage 1 does not support GPG smartcards yet.";
+        message = systemdStage1HardwareKeyAssertionMessage "boot.initrd.luks.gpgSupport";
       }
       {
         assertion = config.boot.initrd.systemd.enable -> !luks.fido2Support;
-        message = ''
-          systemd stage 1 does not support configuring FIDO2 unlocking through `boot.initrd.luks.fido2Support`.
-          Use systemd-cryptenroll(1) to configure FIDO2 support, and set
-          `boot.initrd.luks.devices.''${DEVICE}.crypttabExtraOpts` as appropriate per crypttab(5)
-          (e.g. `fido2-device=auto`).
-        '';
+        message = systemdStage1HardwareKeyAssertionMessage "boot.initrd.luks.fido2Support";
       }
       # TODO
       {
         assertion = config.boot.initrd.systemd.enable -> !luks.yubikeySupport;
-        message = "systemd stage 1 does not support Yubikeys yet.";
+        message = systemdStage1HardwareKeyAssertionMessage "boot.initrd.luks.yubikeySupport";
       }
     ];
 
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index cc120e5d2e6e..2b14caac86fa 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -180,6 +180,12 @@ let
           "StatisticsBlockCoalesceSec"
           "MDI"
           "SR-IOVVirtualFunctions"
+          "ScatterGather"
+          "ScatterGatherFragmentList"
+          "TCPECNSegmentationOffload"
+          "TCPMangleIdSegmentationOffload"
+          "GenericReceiveOffloadList"
+          "GenericReceiveOffloadUDPForwarding"
         ])
         (assertValueOneOf "MACAddressPolicy" [
           "persistent"
@@ -271,6 +277,12 @@ let
           "auto"
         ])
         (assertRange "SR-IOVVirtualFunctions" 0 2147483647)
+        (assertValueOneOf "ScatterGather" boolValues)
+        (assertValueOneOf "ScatterGatherFragmentList" boolValues)
+        (assertValueOneOf "TCPECNSegmentationOffload" boolValues)
+        (assertValueOneOf "TCPMangleIdSegmentationOffload" boolValues)
+        (assertValueOneOf "GenericReceiveOffloadList" boolValues)
+        (assertValueOneOf "GenericReceiveOffloadUDPForwarding" boolValues)
       ];
 
       sectionSR-IOV = checkUnitConfig "SR-IOV" [
@@ -1744,8 +1756,7 @@ let
         (assertValueOneOf "UseDNR" boolValues)
         (assertValueOneOf "UseDomains" (boolValues ++ [ "route" ]))
         (assertRange "RouteTable" 0 4294967295)
-        (assertInt "RouteMetric")
-        (assertRange "RouteMetric" 0 4294967295)
+        (assertRouteMetricOrTriple "RouteMetric")
         (assertValueOneOf "QuickAck" boolValues)
         (assertValueOneOf "UseMTU" boolValues)
         (assertValueOneOf "UseHopLimit" boolValues)
@@ -2413,6 +2424,38 @@ let
         (assertInt "PVID")
         (assertRange "PVID" 0 4094)
       ];
+
+      sectionMobileNetwork = checkUnitConfig "MobileNetwork" [
+        (assertOnlyFields [
+          "APN"
+          "AllowedAuthenticationMechanisms"
+          "User"
+          "Password"
+          "IPFamily"
+          "AllowRoaming"
+          "PIN"
+          "OperatorId"
+          "RouteMetric"
+          "UseGateway"
+        ])
+        (assertValuesSomeOfOr "AllowedAuthenticationMechanisms" [
+          "none"
+          "pap"
+          "chap"
+          "mschap"
+          "mschapv2"
+          "eap"
+        ] "")
+        (assertValueOneOf "IPFamily" [
+          "ipv4"
+          "ipv6"
+          "both"
+          "any"
+        ])
+        (assertValueOneOf "AllowRoaming" boolValues)
+        (assertRange "RouteMetric" 0 4294967295)
+        (assertValueOneOf "UseGateway" boolValues)
+      ];
     };
   };
 
@@ -3747,6 +3790,20 @@ let
       '';
     };
 
+    mobileNetworkConfig = mkOption {
+      default = { };
+      example = {
+        APN = "access-point-name";
+        AllowRoaming = false;
+      };
+      type = types.addCheck (types.attrsOf unitOption) check.network.sectionMobileNetwork;
+      description = ''
+        Each attribute in this set specifies an option in the
+        `[MobileNetwork]` section of the unit.  See
+        {manpage}`systemd.network(5)` for details.
+      '';
+    };
+
     name = mkOption {
       type = types.nullOr types.str;
       default = null;
@@ -4175,8 +4232,11 @@ let
           "systemd-networkd.service"
           "systemd-networkd.socket"
           "systemd-networkd-persistent-storage.service"
+          "systemd-networkd-varlink-metrics.socket"
         ];
 
+        systemd.sockets.systemd-networkd-varlink-metrics.wantedBy = [ "sockets.target" ];
+
         environment.etc."systemd/networkd.conf" = renderConfig cfg.config;
 
         systemd.services.systemd-networkd =
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index 25569afdf78b..da2b57285a76 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -219,6 +219,10 @@ in
       # If networkmanager is enabled, ask it to interface with resolved.
       networking.networkmanager.dns = "systemd-resolved";
 
+      # Since we explicitly provide a resolv.conf, disable resolvconf
+      networking.resolvconf.enable = false;
+
+      # ... but we still set the package for correct compatibility.
       networking.resolvconf.package = config.systemd.package;
 
       nix.firewall.extraNftablesRules = [
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 2808a2ac4e21..de2168281c80 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -856,16 +856,6 @@ in
       };
     };
 
-    # Remove with systemd 259.4
-    security.polkit.extraConfig = mkIf config.security.polkit.enable ''
-      polkit.addRule(function(action, subject) {
-          if (action.id == "org.freedesktop.machine1.register-machine" &&
-              subject.user != "root") {
-              return polkit.Result.AUTH_ADMIN_KEEP;
-          }
-      });
-    '';
-
     # run0 is supposed to authenticate the user via polkit and then run a command. Without this next
     # part, run0 would fail to run the command even if authentication is successful and the user has
     # permission to run the command. This next part is only enabled if polkit is enabled because the
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 370fceb94844..9727fe33d23c 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -248,7 +248,7 @@ in
       '';
       example = literalExpression ''
         {
-          umount = ''${pkgs.util-linux}/bin/umount;
+          umount = "''${pkgs.util-linux}/bin/umount";
         }
       '';
       type = types.attrsOf types.path;
@@ -640,6 +640,10 @@ in
           ) cfg.automounts
         );
 
+      services."modprobe@" = lib.mkIf (config.system.build.kernel.config.isYes "MODULES") {
+        serviceConfig.ExecSearchPath = lib.makeBinPath [ cfg.package.kmod ];
+      };
+
       services.initrd-find-nixos-closure = lib.mkIf (!config.system.nixos-init.enable) {
         description = "Find NixOS closure";
 
diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix
index 7596228b75ff..4fa91c66d6b1 100644
--- a/nixos/modules/system/boot/systemd/journald.nix
+++ b/nixos/modules/system/boot/systemd/journald.nix
@@ -126,6 +126,8 @@ in
       "systemd-journald-sync@.service"
       "systemd-journald-audit.socket"
       "systemd-journald-dev-log.socket"
+      "systemd-journalctl.socket"
+      "systemd-journalctl@.service"
       "syslog.socket"
     ];
 
diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix
index ffafcd7ae1fd..f81baae8813e 100644
--- a/nixos/modules/system/boot/systemd/logind.nix
+++ b/nixos/modules/system/boot/systemd/logind.nix
@@ -47,7 +47,6 @@
   config = lib.mkIf config.services.logind.enable {
     systemd.additionalUpstreamSystemUnits = [
       "systemd-logind.service"
-      "autovt@.service"
       "systemd-user-sessions.service"
     ]
     ++ lib.optionals config.systemd.package.withImportd [
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index f84807613464..c2798d38ac02 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -357,8 +357,7 @@ in
         entry in the list is an attribute set with the following fields:
         `mountPoint`, `device`,
         `fsType` (a file system type recognised by
-        {command}`mount`; defaults to
-        `"auto"`), and `options`
+        {command}`mount`), and `options`
         (the mount options passed to {command}`mount` using the
         {option}`-o` flag; defaults to `[ "defaults" ]`).
 
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 9ee7a5ff86dc..7fcbde36087c 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -277,6 +277,10 @@ in
       "zfs"
       "enableUnstable"
     ] "Instead set `boot.zfs.package = pkgs.zfs_unstable;`")
+    (lib.mkRenamedOptionModule
+      [ "boot" "zfs" "allowHibernation" ]
+      [ "boot" "zfs" "unsafeAllowHibernation" ]
+    )
   ];
 
   ###### interface
@@ -305,12 +309,12 @@ in
         description = "True if ZFS filesystem support is enabled";
       };
 
-      allowHibernation = lib.mkOption {
+      unsafeAllowHibernation = lib.mkOption {
         type = lib.types.bool;
         default = false;
         description = ''
-          Allow hibernation support, this may be a unsafe option depending on your
-          setup. Make sure to NOT use Swap on ZFS.
+          Allow hibernation (suspend to disk) support. This is generally considered **UNSAFE**,
+          is not well supported by openzfs, and could lead to corruption and data loss.
         '';
       };
 
@@ -350,19 +354,18 @@ in
 
       forceImportRoot = lib.mkOption {
         type = lib.types.bool;
-        default = true;
+        default = lib.versionOlder config.system.stateVersion "26.11";
+        defaultText = lib.literalExpression ''lib.versionOlder config.system.stateVersion "26.11"'';
         description = ''
           Forcibly import the ZFS root pool(s) during early boot.
 
-          This is enabled by default for backwards compatibility purposes, but it is highly
-          recommended to disable this option, as it bypasses some of the safeguards ZFS uses
-          to protect your ZFS pools.
+          It is highly recommended to keep this option disabled as it bypasses ZFS
+          safeguard that protect your pools.
 
-          If you set this option to `false` and NixOS subsequently fails to
-          boot because it cannot import the root pool, you should boot with the
-          `zfs_force=1` option as a kernel parameter (e.g. by manually
-          editing the kernel params in grub during boot). You should only need to do this
-          once.
+          If NixOS fails to boot because it cannot import the root pool, you should boot
+          with the `zfs_force=1` option as a kernel parameter (e.g. by manually
+          editing the kernel params via your bootloader).
+          You should only need to do this after unclean shutdowns.
         '';
       };
 
@@ -372,10 +375,10 @@ in
         description = ''
           Forcibly import all ZFS pool(s).
 
-          If you set this option to `false` and NixOS subsequently fails to
-          import your non-root ZFS pool(s), you should manually import each pool with
-          "zpool import -f \<pool-name\>", and then reboot. You should only need to do
-          this once.
+          It is highly recommended to keep this option disabled as it bypasses ZFS
+          safeguard that protect your pools.
+
+          See {option}`boot.zfs.forceImportRoot` for details.
         '';
       };
 
@@ -672,12 +675,12 @@ in
           message = "ZFS requires networking.hostId to be set";
         }
         {
-          assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
+          assertion = cfgZfs.forceImportAll -> cfgZfs.forceImportRoot;
           message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot";
         }
         {
-          assertion = cfgZfs.allowHibernation -> !cfgZfs.forceImportRoot && !cfgZfs.forceImportAll;
-          message = "boot.zfs.allowHibernation while force importing is enabled will cause data corruption";
+          assertion = cfgZfs.unsafeAllowHibernation -> !cfgZfs.forceImportRoot && !cfgZfs.forceImportAll;
+          message = "boot.zfs.unsafeAllowHibernation while force importing is enabled will cause data corruption";
         }
         {
           assertion = !(lib.elem "" allPools);
@@ -694,12 +697,25 @@ in
         }
       ];
 
+      warnings =
+        lib.optional
+          (
+            options.boot.zfs.forceImportRoot.definitionsWithLocations == [
+              {
+                inherit (__curPos) file;
+                value = true;
+              }
+            ]
+          )
+          "`boot.zfs.forceImportRoot` is using the default value of `true`. It is highly recommended to set it to `false`, the new default from 26.11 on, to reduce the risk of data loss. Alternatively, you can silence this warning by explicitly setting it to `true`.";
+
       boot = {
         kernelModules = [ "zfs" ];
-        # https://github.com/openzfs/zfs/issues/260
+        # https://github.com/openzfs/zfs/issues/260#issuecomment-982142240
         # https://github.com/openzfs/zfs/issues/12842
+        # https://github.com/openzfs/zfs/issues/14118#issuecomment-1301576647
         # https://github.com/NixOS/nixpkgs/issues/106093
-        kernelParams = lib.optionals (!config.boot.zfs.allowHibernation) [ "nohibernate" ];
+        kernelParams = lib.optionals (!config.boot.zfs.unsafeAllowHibernation) [ "nohibernate" ];
 
         extraModulePackages = [
           cfgZfs.modulePackage
diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index cd49fc870e0f..a0842be7e93d 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -54,8 +54,6 @@ let
       lvm2
       lz4
       lxcfs
-      minio
-      minio-client
       nftables
       qemu-utils
       qemu_kvm
@@ -99,6 +97,10 @@ let
     ]
     ++ lib.optionals nvidiaEnabled [
       libnvidia-container
+    ]
+    ++ lib.optionals cfg.bucketSupport [
+      minio
+      minio-client
     ];
 
   # https://github.com/lxc/incus/blob/cff35a29ee3d7a2af1f937cbb6cf23776941854b/internal/server/instance/drivers/driver_qemu.go#L123
@@ -211,6 +213,13 @@ in
         description = "The incus client package to use. This package is added to PATH.";
       };
 
+      bucketSupport = lib.mkOption {
+        type = lib.types.bool;
+        description = "Enable bucket support using minio, which is an insecure and unmaintained S3 provider.";
+        default = if lib.versionAtLeast config.system.stateVersion "26.11" then false else null;
+        defaultText = lib.literalExpression ''if lib.versionAtLeast config.system.stateVersion "26.11" then false else null;'';
+      };
+
       softDaemonRestart = lib.mkOption {
         type = lib.types.bool;
         default = true;
diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index b7dde1126933..d4033df032e2 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -132,8 +132,8 @@ let
           default = [ ];
           description = "Environment files for this container.";
           example = [
-            /path/to/.env
-            /path/to/.env.secret
+            "/path/to/.env"
+            "/path/to/.env.secret"
           ];
         };
 
diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix
index 490a6beab3f6..dd3d4665db36 100644
--- a/nixos/modules/virtualisation/parallels-guest.nix
+++ b/nixos/modules/virtualisation/parallels-guest.nix
@@ -47,10 +47,24 @@ in
 
     services.timesyncd.enable = false;
 
+    # Parallels Desktop 26+ mounts shared folders under /mnt/psf by default.
+    # prltoolsd tries to create subdirectories there at runtime, which fails
+    # if /mnt/psf does not exist. Create it declaratively via tmpfiles.
+    systemd.tmpfiles.rules = [
+      "d /mnt/psf 0755 root root - -"
+    ];
+
     systemd.services.prltoolsd = {
       description = "Parallels Tools Service";
       wantedBy = [ "multi-user.target" ];
-      path = [ prl-tools ];
+      # prltoolsd mount scripts invoke coreutils (tail, mkdir, chmod)
+      # and gnused (sed) without inheriting the service PATH in all
+      # code paths. Make them available alongside prl-tools.
+      path = [
+        prl-tools
+        pkgs.coreutils
+        pkgs.gnused
+      ];
       serviceConfig = {
         ExecStart = "${prl-tools}/bin/prltoolsd -f";
         PIDFile = "/var/run/prltoolsd.pid";
diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix
index a1582e404c9f..22113785c297 100644
--- a/nixos/modules/virtualisation/proxmox-image.nix
+++ b/nixos/modules/virtualisation/proxmox-image.nix
@@ -231,6 +231,72 @@ with lib;
         || partitionTableType == "legacy+gpt";
       hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid";
       hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt";
+      postVM =
+        let
+          # Build qemu with PVE's patch that adds support for the VMA format
+          vma =
+            (pkgs.qemu_kvm.override {
+              alsaSupport = false;
+              pulseSupport = false;
+              sdlSupport = false;
+              jackSupport = false;
+              gtkSupport = false;
+              vncSupport = false;
+              smartcardSupport = false;
+              spiceSupport = false;
+              ncursesSupport = false;
+              libiscsiSupport = false;
+              tpmSupport = false;
+              numaSupport = false;
+              seccompSupport = false;
+              guestAgentSupport = false;
+            }).overrideAttrs
+              (super: rec {
+                # Check https://github.com/proxmox/pve-qemu/tree/master for the version
+                # of qemu and patch to use
+                version = "9.0.0";
+                src = pkgs.fetchurl {
+                  url = "https://download.qemu.org/qemu-${version}.tar.xz";
+                  hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk=";
+                };
+                patches = [
+                  # Proxmox' VMA tool is published as a particular patch upon QEMU
+                  "${
+                    pkgs.fetchFromGitHub {
+                      owner = "proxmox";
+                      repo = "pve-qemu";
+                      rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8";
+                      hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc=";
+                    }
+                  }/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch"
+                ];
+
+                buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
+                nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ];
+
+              });
+        in
+        ''
+          ${vma}/bin/vma create "${config.image.baseName}.vma" \
+            -c ${
+              cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)
+            }/qemu-server.conf drive-virtio0=$diskImage
+          rm $diskImage
+          ${pkgs.zstd}/bin/zstd "${config.image.baseName}.vma"
+          mv "${config.image.fileName}" $out/
+
+          mkdir -p $out/nix-support
+          echo "file vma $out/${config.image.fileName}" > $out/nix-support/hydra-build-products
+        '';
+      pveBaseConfigs = {
+        name = config.image.baseName;
+        baseName = config.image.baseName;
+        inherit (cfg) partitionTableType;
+        inherit (cfg.qemuConf) additionalSpace bootSize;
+        inherit (config.virtualisation) diskSize;
+        format = "raw";
+        inherit config lib pkgs;
+      };
     in
     {
       assertions = [
@@ -253,72 +319,15 @@ with lib;
       ];
       image.baseName = lib.mkDefault "vzdump-qemu-${cfg.filenameSuffix}";
       image.extension = "vma.zst";
-      system.build.image = config.system.build.VMA;
-      system.build.VMA = import ../../lib/make-disk-image.nix {
-        name = "proxmox-${cfg.filenameSuffix}";
-        baseName = config.image.baseName;
-        inherit (cfg) partitionTableType;
-        postVM =
-          let
-            # Build qemu with PVE's patch that adds support for the VMA format
-            vma =
-              (pkgs.qemu_kvm.override {
-                alsaSupport = false;
-                pulseSupport = false;
-                sdlSupport = false;
-                jackSupport = false;
-                gtkSupport = false;
-                vncSupport = false;
-                smartcardSupport = false;
-                spiceSupport = false;
-                ncursesSupport = false;
-                libiscsiSupport = false;
-                tpmSupport = false;
-                numaSupport = false;
-                seccompSupport = false;
-                guestAgentSupport = false;
-              }).overrideAttrs
-                (super: rec {
-                  # Check https://github.com/proxmox/pve-qemu/tree/master for the version
-                  # of qemu and patch to use
-                  version = "9.0.0";
-                  src = pkgs.fetchurl {
-                    url = "https://download.qemu.org/qemu-${version}.tar.xz";
-                    hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk=";
-                  };
-                  patches = [
-                    # Proxmox' VMA tool is published as a particular patch upon QEMU
-                    "${
-                      pkgs.fetchFromGitHub {
-                        owner = "proxmox";
-                        repo = "pve-qemu";
-                        rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8";
-                        hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc=";
-                      }
-                    }/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch"
-                  ];
-
-                  buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
-                  nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ];
-
-                });
-          in
-          ''
-            ${vma}/bin/vma create "${config.image.baseName}.vma" \
-              -c ${
-                cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)
-              }/qemu-server.conf drive-virtio0=$diskImage
-            rm $diskImage
-            ${pkgs.zstd}/bin/zstd "${config.image.baseName}.vma"
-            mv "${config.image.fileName}" $out/
-
-            mkdir -p $out/nix-support
-            echo "file vma $out/${config.image.fileName}" > $out/nix-support/hydra-build-products
-          '';
-        inherit (cfg.qemuConf) additionalSpace bootSize;
-        inherit (config.virtualisation) diskSize;
-        format = "raw";
-        inherit config lib pkgs;
+      system.build = {
+        cloudImage = import ../../lib/make-disk-image.nix pveBaseConfigs;
+        VMA = import ../../lib/make-disk-image.nix (
+          pveBaseConfigs
+          // {
+            inherit postVM;
+          }
+        );
+        image = config.system.build.VMA;
       };
 
       boot = {
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 2a528b036404..b58cdd8ac5f7 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -1362,7 +1362,7 @@ in
             + "${guest.address}:${toString guest.port},"
           else
             "'guestfwd=${proto}:${guest.address}:${toString guest.port}-"
-            + "cmd:${pkgs.netcat}/bin/nc ${host.address} ${toString host.port}',"
+            + "cmd:${hostPkgs.netcat}/bin/nc ${host.address} ${toString host.port}',"
         );
         restrictNetworkOption = lib.optionalString cfg.restrictNetwork "restrict=on,";
       in
diff --git a/nixos/release.nix b/nixos/release.nix
index f89aa205977d..eb86134241d8 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -307,7 +307,7 @@ rec {
   );
 
   # KVM image for proxmox in VMA format
-  proxmoxImage = forMatchingSystems [ "x86_64-linux" ] (
+  proxmoxVMA = forMatchingSystems [ "x86_64-linux" ] (
     system:
     with import ./.. { inherit system; };
 
@@ -321,6 +321,25 @@ rec {
     )
   );
 
+  # Keeping the old name for compatibility
+  proxmoxImage = proxmoxVMA;
+
+  # cloud-init image compatible with instructions given here:
+  # https://pve.proxmox.com/wiki/Cloud-Init_Support
+  proxmoxCloudImage = forMatchingSystems [ "x86_64-linux" ] (
+    system:
+    with import ./.. { inherit system; };
+
+    hydraJob (
+      (import lib/eval-config.nix {
+        inherit system;
+        modules = [
+          ./modules/virtualisation/proxmox-image.nix
+        ];
+      }).config.system.build.cloudImage
+    )
+  );
+
   # LXC tarball for proxmox
   proxmoxLXC = forMatchingSystems [ "x86_64-linux" ] (
     system:
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index f6093eb7e14a..b276d07786bc 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -236,6 +236,7 @@ in
   atticd = runTest ./atticd.nix;
   attr = pkgs.callPackage ./attr.nix { };
   atuin = runTest ./atuin.nix;
+  atuin-programs = runTest ./atuin-programs.nix;
   audiobookshelf = runTest ./audiobookshelf.nix;
   audit = runTest ./audit.nix;
   audit-testsuite = runTest ./audit-testsuite.nix;
@@ -677,6 +678,7 @@ in
   gotosocial = runTest ./web-apps/gotosocial.nix;
   goupile = runTest ./web-apps/goupile;
   grafana = handleTest ./grafana { };
+  grafana-to-ntfy = runTest ./grafana-to-ntfy.nix;
   graphite = runTest ./graphite.nix;
   grav = runTest ./web-apps/grav.nix;
   graylog = runTest ./graylog.nix;
@@ -891,6 +893,8 @@ in
   lighttpd = runTest ./lighttpd.nix;
   limesurvey = runTest ./limesurvey.nix;
   limine = import ./limine { inherit runTest; };
+  linkding = runTest ./web-apps/linkding.nix;
+  linkding-postgres = runTest ./web-apps/linkding-postgres.nix;
   linkwarden = runTest ./web-apps/linkwarden.nix;
   listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { };
   litellm = runTest ./litellm.nix;
@@ -1065,6 +1069,7 @@ in
   netbox_4_4 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_4; };
   netbox_4_5 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_5; };
   netdata = runTest ./netdata.nix;
+  netfoil = runTest ./netfoil.nix;
   networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; };
   networking.networkmanager = handleTest ./networking/networkmanager.nix { };
   networking.scripted = handleTest ./networking/networkd-and-scripted.nix { networkd = false; };
@@ -1136,6 +1141,7 @@ in
     pkgs.callPackage ../../pkgs/stdenv/generic/check-meta-test.nix
       { };
   nixseparatedebuginfod2 = runTest ./nixseparatedebuginfod2.nix;
+  nmtrust = runTest ./nmtrust.nix;
   node-red = runTest ./node-red.nix;
   nohang = runTest ./nohang.nix;
   nomad = runTest ./nomad.nix;
@@ -1249,6 +1255,7 @@ in
     inherit runTest;
   };
   pdns-recursor = runTest ./pdns-recursor.nix;
+  pdudaemon = runTest ./pdudaemon.nix;
   peerflix = runTest ./peerflix.nix;
   peering-manager = runTest ./web-apps/peering-manager.nix;
   peertube = handleTestOn [ "x86_64-linux" ] ./web-apps/peertube.nix { };
@@ -1375,6 +1382,7 @@ in
   qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix;
   qgis = handleTest ./qgis.nix { package = pkgs.qgis; };
   qgis-ltr = handleTest ./qgis.nix { package = pkgs.qgis-ltr; };
+  qlever = runTest ./qlever.nix;
   qownnotes = runTest ./qownnotes.nix;
   qtile = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./qtile/default.nix;
   qtile-extras = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./qtile-extras/default.nix;
@@ -1590,6 +1598,7 @@ in
   };
   systemd-initrd-simple = runTest ./systemd-initrd-simple.nix;
   systemd-initrd-swraid = runTest ./systemd-initrd-swraid.nix;
+  systemd-initrd-terminfo = runTest ./systemd-initrd-terminfo.nix;
   systemd-initrd-vconsole = runTest ./systemd-initrd-vconsole.nix;
   systemd-initrd-vlan = runTest ./systemd-initrd-vlan.nix;
   systemd-journal = runTest ./systemd-journal.nix;
@@ -1747,6 +1756,10 @@ in
   victoriametrics = import ./victoriametrics { inherit runTest; };
   victoriatraces = import ./victoriatraces { inherit runTest; };
   vikunja = runTest ./vikunja.nix;
+  vinyl-cache_9 = runTest {
+    imports = [ ./vinyl-cache.nix ];
+    _module.args.package = pkgs.vinyl-cache_9;
+  };
   virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { };
   vm-variant = handleTest ./vm-variant.nix { };
   vscode-remote-ssh = handleTestOn [ "x86_64-linux" ] ./vscode-remote-ssh.nix { };
diff --git a/nixos/tests/atuin-programs.nix b/nixos/tests/atuin-programs.nix
new file mode 100644
index 000000000000..14477bae9b08
--- /dev/null
+++ b/nixos/tests/atuin-programs.nix
@@ -0,0 +1,39 @@
+{ pkgs, ... }:
+{
+  name = "atuin";
+  meta.maintainers = pkgs.atuin.meta.maintainers;
+
+  nodes.machine = {
+    programs = {
+      bash.enable = true;
+      fish.enable = true;
+      zsh.enable = true;
+
+      atuin = {
+        enable = true;
+        settings = {
+          auto_sync = false;
+        };
+      };
+    };
+  };
+
+  testScript = ''
+    start_all()
+    machine.wait_for_unit("default.target")
+
+    # Check atuin is installed
+    machine.succeed("atuin --version")
+
+    # Check shell integration - verify the init scripts can be sourced without error
+    machine.succeed("bash -c 'eval \"$(atuin init bash)\"'")
+    machine.succeed("zsh -c 'eval \"$(atuin init zsh)\"'")
+    machine.succeed("fish -c 'atuin init fish | source'")
+
+    # Verify config file was created
+    machine.succeed("grep -q 'auto_sync = false' /etc/atuin/config.toml")
+
+    # Verify daemon socket unit is enabled
+    machine.succeed("systemctl --user --machine=root@ is-enabled atuin-daemon.socket")
+  '';
+}
diff --git a/nixos/tests/calibre-web.nix b/nixos/tests/calibre-web.nix
index cf66ed1f1921..27080e5626ba 100644
--- a/nixos/tests/calibre-web.nix
+++ b/nixos/tests/calibre-web.nix
@@ -3,6 +3,7 @@
 let
   port = 3142;
   defaultPort = 8083;
+  libraryPath = "/var/lib/test-books";
 in
 {
   name = "calibre-web";
@@ -16,7 +17,7 @@ in
           enable = true;
           listen.port = port;
           options = {
-            calibreLibrary = "/tmp/books";
+            calibreLibrary = libraryPath;
             reverseProxyAuth = {
               enable = true;
               header = "X-User";
@@ -30,7 +31,7 @@ in
     start_all()
 
     customized.succeed(
-        "mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book"
+        "mkdir -p ${libraryPath} && calibredb --library-path ${libraryPath} add -e --title test-book"
     )
     customized.succeed("systemctl restart calibre-web")
     customized.wait_for_unit("calibre-web.service")
diff --git a/nixos/tests/grafana-to-ntfy.nix b/nixos/tests/grafana-to-ntfy.nix
new file mode 100644
index 000000000000..d7e942296e3a
--- /dev/null
+++ b/nixos/tests/grafana-to-ntfy.nix
@@ -0,0 +1,166 @@
+{ lib, ... }:
+
+let
+  ports = {
+    grafana-to-ntfy = 8080;
+    ntfy-sh = 8081;
+    grafana = 3000;
+    alertmanager = 9093;
+  };
+  ntfyTopic = "grafana-alerts";
+in
+
+{
+  name = "grafana-to-ntfy";
+  meta.maintainers = with lib.maintainers; [ kittyandrew ];
+
+  nodes.machine = {
+    services.grafana-to-ntfy = {
+      enable = true;
+      settings = {
+        ntfyUrl = "http://127.0.0.1:${toString ports.ntfy-sh}/${ntfyTopic}";
+        port = ports.grafana-to-ntfy;
+        address = "127.0.0.1";
+      };
+    };
+
+    services.ntfy-sh = {
+      enable = true;
+      settings = {
+        listen-http = "127.0.0.1:${toString ports.ntfy-sh}";
+        base-url = "http://127.0.0.1:${toString ports.ntfy-sh}";
+      };
+    };
+
+    services.grafana = {
+      enable = true;
+      settings = {
+        server.http_port = ports.grafana;
+        server.http_addr = "127.0.0.1";
+        security.admin_user = "admin";
+        security.admin_password = "admin";
+        security.secret_key = "test-only-dummy-key";
+      };
+      provision.alerting = {
+        contactPoints.settings = {
+          apiVersion = 1;
+          contactPoints = [
+            {
+              orgId = 1;
+              name = "grafana-to-ntfy";
+              receivers = [
+                {
+                  uid = "cp_webhook";
+                  type = "webhook";
+                  disableResolveMessage = false;
+                  settings = {
+                    url = "http://127.0.0.1:${toString ports.grafana-to-ntfy}";
+                    httpMethod = "POST";
+                  };
+                }
+              ];
+            }
+          ];
+        };
+        policies.settings = {
+          apiVersion = 1;
+          policies = [
+            {
+              orgId = 1;
+              receiver = "grafana-to-ntfy";
+              group_by = [ "..." ];
+              group_wait = "0s";
+              group_interval = "1s";
+              repeat_interval = "1h";
+            }
+          ];
+        };
+      };
+    };
+
+    services.prometheus.alertmanager = {
+      enable = true;
+      listenAddress = "127.0.0.1";
+      port = ports.alertmanager;
+      configuration = {
+        route = {
+          receiver = "grafana-to-ntfy";
+          group_by = [ "..." ];
+          group_wait = "0s";
+          group_interval = "1s";
+          repeat_interval = "2h";
+        };
+        receivers = [
+          {
+            name = "grafana-to-ntfy";
+            webhook_configs = [
+              { url = "http://127.0.0.1:${toString ports.grafana-to-ntfy}"; }
+            ];
+          }
+        ];
+      };
+    };
+  };
+
+  interactive.nodes.machine = {
+    services.grafana-to-ntfy.settings.address = lib.mkForce "0.0.0.0";
+    services.grafana.settings.server.http_addr = lib.mkForce "0.0.0.0";
+    services.prometheus.alertmanager.listenAddress = lib.mkForce "0.0.0.0";
+    services.ntfy-sh.settings.listen-http = lib.mkForce "0.0.0.0:${toString ports.ntfy-sh}";
+    networking.firewall.enable = false;
+    virtualisation.forwardPorts = lib.mapAttrsToList (_: port: {
+      from = "host";
+      host = { inherit port; };
+      guest = { inherit port; };
+    }) ports;
+  };
+
+  testScript = ''
+    import json
+
+    machine.wait_for_unit("grafana-to-ntfy.service")
+    machine.wait_for_unit("ntfy-sh.service")
+    machine.wait_for_unit("grafana.service")
+    machine.wait_for_unit("alertmanager.service")
+    machine.wait_for_open_port(${toString ports.grafana-to-ntfy})
+    machine.wait_for_open_port(${toString ports.ntfy-sh})
+    machine.wait_for_open_port(${toString ports.grafana})
+    machine.wait_for_open_port(${toString ports.alertmanager})
+
+    with subtest("Health endpoint returns 200"):
+      machine.succeed("curl -sf http://127.0.0.1:${toString ports.grafana-to-ntfy}/health")
+
+    with subtest("Alertmanager alert arrives at ntfy"):
+      machine.succeed(
+        "curl -sf http://127.0.0.1:${toString ports.alertmanager}/api/v2/alerts"
+        " -X POST -H 'Content-Type: application/json'"
+        " -d '[{\"labels\": {\"alertname\": \"TestAlertFromAM\"}}]'"
+      )
+      # grep makes wait_until_succeeds retry: ntfy returns 200 with empty body when no messages exist
+      resp = machine.wait_until_succeeds(
+        "curl -sf 'http://127.0.0.1:${toString ports.ntfy-sh}/${ntfyTopic}/json?poll=1'"
+        " | grep '\"title\":\"Alertmanager\"'"
+      )
+      msg = json.loads(resp.strip())
+      assert msg["title"] == "Alertmanager", f"Expected title 'Alertmanager', got '{msg['title']}'"
+      assert "warning" in msg["tags"], f"Expected 'warning' in tags, got {msg['tags']}"
+      assert "firing" in msg["tags"], f"Expected 'firing' in tags, got {msg['tags']}"
+
+    with subtest("Grafana alert arrives at ntfy"):
+      machine.succeed(
+        "curl -sf http://127.0.0.1:${toString ports.grafana}/api/alertmanager/grafana/config/api/v1/receivers/test"
+        " -u admin:admin"
+        " -X POST -H 'Content-Type: application/json'"
+        """ -d '{"receivers": [{"name": "grafana-to-ntfy", "grafana_managed_receiver_configs": [{"uid": "cp_webhook", "name": "webhook", "type": "webhook", "disableResolveMessage": false, "settings": {"url": "http://127.0.0.1:${toString ports.grafana-to-ntfy}", "httpMethod": "POST"}}]}]}'"""
+      )
+      # grep ensures we wait for the Grafana message specifically (see above)
+      resp = machine.wait_until_succeeds(
+        "curl -sf 'http://127.0.0.1:${toString ports.ntfy-sh}/${ntfyTopic}/json?poll=1'"
+        " | grep 'FIRING'"
+      )
+      msg = json.loads(resp.strip())
+      assert "[FIRING:1]" in msg["title"], f"Expected Grafana title with '[FIRING:1]', got '{msg['title']}'"
+      assert "warning" in msg["tags"], f"Expected 'warning' in tags, got {msg['tags']}"
+      assert "firing" in msg["tags"], f"Expected 'firing' in tags, got {msg['tags']}"
+  '';
+}
diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix
index a09e4e8c3ace..af33c6c78316 100644
--- a/nixos/tests/incus/default.nix
+++ b/nixos/tests/incus/default.nix
@@ -45,6 +45,15 @@ in
     };
   };
 
+  channel = incusRunTest {
+    name = "channel";
+
+    instances.c1 = {
+      type = "container";
+      copyChannel = true;
+    };
+  };
+
   # used in lxc tests to verify container functionality
   container = incusRunTest {
     name = "container";
diff --git a/nixos/tests/incus/incus-tests-module.nix b/nixos/tests/incus/incus-tests-module.nix
index 8d8752fde81f..69b0d3c13825 100644
--- a/nixos/tests/incus/incus-tests-module.nix
+++ b/nixos/tests/incus/incus-tests-module.nix
@@ -60,6 +60,11 @@ in
                 default = { };
               };
 
+              copyChannel = lib.mkEnableOption ''
+                copy channel in test image. disabled by default as it forces image
+                rebuilds excessively. enable to validate channel things.
+              '';
+
               testScript = lib.mkOption {
                 type = lib.types.str;
                 description = "final script provided to test runner";
@@ -104,7 +109,7 @@ in
                   documentation.enable = lib.mkForce false;
                   documentation.nixos.enable = lib.mkForce false;
                   # including a channel forces images to be rebuilt on any changes
-                  system.installer.channel.enable = lib.mkForce false;
+                  system.installer.channel.enable = lib.mkForce config.copyChannel;
 
                   environment.etc."nix/registry.json".text = lib.mkForce "{}";
 
@@ -170,64 +175,67 @@ in
                 #
                 # container specific
                 #
-                +
-                  lib.optionalString (config.type == "container")
-                    # python
-                    ''
-                      with subtest("[${image_id}] switch-to-configuration updates /sbin/init via installBootLoader"):
-                          # Remove /sbin/init so we can verify installBootLoader recreates it
-                          server.succeed(f"incus exec {instance_name} -- rm -f /sbin/init")
-                          server.fail(f"incus exec {instance_name} -- test -e /sbin/init")
+                + lib.optionalString (config.type == "container") (
+                  # python
+                  ''
+                    with subtest("[${image_id}] switch-to-configuration updates /sbin/init via installBootLoader"):
+                        # Remove /sbin/init so we can verify installBootLoader recreates it
+                        server.succeed(f"incus exec {instance_name} -- rm -f /sbin/init")
+                        server.fail(f"incus exec {instance_name} -- test -e /sbin/init")
 
-                          server.succeed(
-                              f"incus exec {instance_name} -- /run/current-system/bin/switch-to-configuration switch"
-                          )
+                        server.succeed(
+                            f"incus exec {instance_name} -- /run/current-system/bin/switch-to-configuration switch"
+                        )
 
-                          # Verify installBootLoader recreated /sbin/init pointing to the system's init
-                          server.succeed(f"incus exec {instance_name} -- test -x /sbin/init")
-                          target = server.succeed(f"incus exec {instance_name} -- readlink -f /sbin/init").strip()
-                          current = server.succeed(f"incus exec {instance_name} -- readlink -f /run/current-system/init").strip()
-                          assert target == current, f"/sbin/init -> {target}, expected {current}"
+                        # Verify installBootLoader recreated /sbin/init pointing to the system's init
+                        server.succeed(f"incus exec {instance_name} -- test -x /sbin/init")
+                        target = server.succeed(f"incus exec {instance_name} -- readlink -f /sbin/init").strip()
+                        current = server.succeed(f"incus exec {instance_name} -- readlink -f /run/current-system/init").strip()
+                        assert target == current, f"/sbin/init -> {target}, expected {current}"
 
-                      # TODO troubleshoot VM hot memory resizing which was introduced in 6.12
-                      with subtest("[${image_id}] memory limits can be hotplug changed"):
-                          server.set_instance_config(instance_name, "limits.memory 512MB")
-                          # can't use lsmem since it sees the host's memory size
-                          server.wait_instance_exec_success(instance_name, "grep 'MemTotal:[[:space:]]*500000 kB' /proc/meminfo", timeout=1)
+                    # TODO troubleshoot VM hot memory resizing which was introduced in 6.12
+                    with subtest("[${image_id}] memory limits can be hotplug changed"):
+                        server.set_instance_config(instance_name, "limits.memory 512MB")
+                        # can't use lsmem since it sees the host's memory size
+                        server.wait_instance_exec_success(instance_name, "grep 'MemTotal:[[:space:]]*500000 kB' /proc/meminfo", timeout=1)
 
-                      # verify the patched container systemd generator from `pkgs.distrobuilder.generator`
-                      with subtest("[${image_id}] lxc-generator compatibility"):
-                          with subtest("[${image_id}] lxc-container generator configures plain container"):
-                              # default container is plain
-                              server.succeed(f"incus exec {instance_name} test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
+                    # verify the patched container systemd generator from `pkgs.distrobuilder.generator`
+                    with subtest("[${image_id}] lxc-generator compatibility"):
+                        with subtest("[${image_id}] lxc-container generator configures plain container"):
+                            # default container is plain
+                            server.succeed(f"incus exec {instance_name} test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
 
-                              server.check_instance_sysctl(instance_name)
+                            server.check_instance_sysctl(instance_name)
 
-                          with subtest("[${image_id}] lxc-container generator configures nested container"):
-                              server.set_instance_config(instance_name, "security.nesting=true", restart=True)
+                        with subtest("[${image_id}] lxc-container generator configures nested container"):
+                            server.set_instance_config(instance_name, "security.nesting=true", restart=True)
 
-                              server.fail(f"incus exec {instance_name} test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
-                              target = server.succeed(f"incus exec {instance_name} readlink -- -f /run/systemd/system/systemd-binfmt.service").strip()
-                              assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service"
+                            server.fail(f"incus exec {instance_name} test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
+                            target = server.succeed(f"incus exec {instance_name} readlink -- -f /run/systemd/system/systemd-binfmt.service").strip()
+                            assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service"
 
-                              server.check_instance_sysctl(instance_name)
+                            server.check_instance_sysctl(instance_name)
 
-                      with subtest("[${image_id}] lxcfs"):
-                          with subtest("[${image_id}] mounts lxcfs overlays"):
-                              server.succeed(f"incus exec {instance_name} mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'")
-                              server.succeed(f"incus exec {instance_name} mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'")
+                    with subtest("[${image_id}] lxcfs"):
+                        with subtest("[${image_id}] mounts lxcfs overlays"):
+                            server.succeed(f"incus exec {instance_name} mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'")
+                            server.succeed(f"incus exec {instance_name} mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'")
 
-                          with subtest("[${image_id}] supports per-instance lxcfs"):
-                              server.succeed(f"incus stop {instance_name}")
-                              server.fail(f"pgrep -a lxcfs | grep 'incus/devices/{instance_name}/lxcfs'")
+                        with subtest("[${image_id}] supports per-instance lxcfs"):
+                            server.succeed(f"incus stop {instance_name}")
+                            server.fail(f"pgrep -a lxcfs | grep 'incus/devices/{instance_name}/lxcfs'")
 
-                              server.succeed("incus config set instances.lxcfs.per_instance=true")
-
-                              server.succeed(f"incus start {instance_name}")
-                              server.wait_for_instance(instance_name)
-                              server.succeed(f"pgrep -a lxcfs | grep 'incus/devices/{instance_name}/lxcfs'")
-                    ''
+                            server.succeed("incus config set instances.lxcfs.per_instance=true")
 
+                            server.succeed(f"incus start {instance_name}")
+                            server.wait_for_instance(instance_name)
+                            server.succeed(f"pgrep -a lxcfs | grep 'incus/devices/{instance_name}/lxcfs'")
+                  ''
+                  + lib.optionalString (config.copyChannel) ''
+                    with subtest("[${image_id}] channel copied correctly"):
+                        server.succeed(f"incus exec {instance_name} -- systemctl status nix-channel-init.service")
+                  ''
+                )
                 #
                 # virtual-machine specific
                 #
diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix
index b28eb12b2ef1..34cfdc63e219 100644
--- a/nixos/tests/incus/incus-tests.nix
+++ b/nixos/tests/incus/incus-tests.nix
@@ -51,6 +51,7 @@ in
       incus = {
         enable = true;
         package = cfg.package;
+        bucketSupport = false;
 
         preseed = {
           networks = [
diff --git a/nixos/tests/kmscon.nix b/nixos/tests/kmscon.nix
index 1c67a16af2ba..f0fb27d9b0d5 100644
--- a/nixos/tests/kmscon.nix
+++ b/nixos/tests/kmscon.nix
@@ -31,7 +31,7 @@
   enableOCR = true;
 
   testScript = ''
-    machine.start()
+    machine.wait_for_unit("default.target")
 
     with subtest("ensure we can open a tty"):
       machine.wait_for_text("alice@machine")
diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix
index a87cc0aa2248..b44251e75bb4 100644
--- a/nixos/tests/lomiri-music-app.nix
+++ b/nixos/tests/lomiri-music-app.nix
@@ -135,7 +135,7 @@ in
 
     # Need to wait abit to make sure our test file gets scanned & added to the database.
     # No good feedback on when this is done... Prolly some time after extractor sub-service is started.
-    machine.wait_for_console_text("Successfully activated service 'com.lomiri.MediaScanner2.Extractor'")
+    machine.wait_for_console_text("Started \S*com.lomiri.MediaScanner2.Extractor")
     machine.sleep(10)
 
     with subtest("lomiri music launches"):
diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix
index bc74902c7f20..f1e5e7821f82 100644
--- a/nixos/tests/matrix/mjolnir.nix
+++ b/nixos/tests/matrix/mjolnir.nix
@@ -17,7 +17,7 @@ let
   csr = runWithOpenSSL "matrix.csr" ''
     openssl req \
        -new -key ${key} \
-       -out $out -subj "/CN=localhost" \
+       -out $out -subj "/CN=localhost"
   '';
   cert = runWithOpenSSL "matrix_cert.pem" ''
     openssl x509 \
diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix
index b2538ca17dfb..fdf2c4de7ad3 100644
--- a/nixos/tests/matrix/pantalaimon.nix
+++ b/nixos/tests/matrix/pantalaimon.nix
@@ -19,7 +19,7 @@ let
   csr = runWithOpenSSL "matrix.csr" ''
     openssl req \
        -new -key ${key} \
-       -out $out -subj "/CN=localhost" \
+       -out $out -subj "/CN=localhost"
   '';
   cert = runWithOpenSSL "matrix_cert.pem" ''
     openssl x509 \
diff --git a/nixos/tests/netfoil.nix b/nixos/tests/netfoil.nix
new file mode 100644
index 000000000000..8697de95bdec
--- /dev/null
+++ b/nixos/tests/netfoil.nix
@@ -0,0 +1,28 @@
+{ lib, ... }:
+{
+  name = "netfoil";
+  meta.maintainers = with lib.maintainers; [
+    marcusramberg
+    sgo
+  ];
+
+  nodes = {
+    one =
+      { config, ... }:
+      {
+        services.netfoil = {
+          enable = true;
+          listen.port = 6353;
+        };
+      };
+  };
+  interactive.sshBackdoor.enable = true;
+
+  testScript = ''
+    start_all()
+
+    with subtest("ensure netfoil starts and listens on 6353"):
+        one.wait_for_unit("netfoil.service")
+        one.wait_for_open_port(6353)
+  '';
+}
diff --git a/nixos/tests/nmtrust.nix b/nixos/tests/nmtrust.nix
new file mode 100644
index 000000000000..5954746b254d
--- /dev/null
+++ b/nixos/tests/nmtrust.nix
@@ -0,0 +1,92 @@
+{ lib, pkgs, ... }:
+{
+  name = "nmtrust";
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      networking.networkmanager.enable = true;
+
+      # Prevent the VM's built-in interfaces from polluting trust state.
+      networking.networkmanager.unmanaged = [
+        "eth0"
+        "eth1"
+        "lo"
+      ];
+
+      networking.networkmanager.ensureProfiles.profiles = {
+        trusted-net = {
+          connection = {
+            id = "trusted-net";
+            uuid = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee";
+            type = "dummy";
+            interface-name = "dummy-trusted";
+            autoconnect = "false";
+          };
+          ipv4.method = "manual";
+          ipv4.addresses = "10.99.1.1/24";
+        };
+        untrusted-net = {
+          connection = {
+            id = "untrusted-net";
+            uuid = "11111111-2222-3333-4444-555555555555";
+            type = "dummy";
+            interface-name = "dummy-untrusted";
+            autoconnect = "false";
+          };
+          ipv4.method = "manual";
+          ipv4.addresses = "10.99.2.1/24";
+        };
+      };
+
+      services.nmtrust = {
+        enable = true;
+        trustedConnections = [ "trusted-net" ];
+        systemUnits."trust-canary.service" = { };
+      };
+
+      # Canary service: runs only while the trusted target is active.
+      systemd.services.trust-canary = {
+        description = "nmtrust test canary";
+        serviceConfig = {
+          Type = "simple";
+          ExecStart = "${pkgs.coreutils}/bin/sleep infinity";
+        };
+      };
+    };
+
+  testScript = ''
+    import time
+
+    def apply(machine):
+        """Trigger nmtrust-apply and wait for it to finish."""
+        time.sleep(1)
+        machine.succeed("systemctl start nmtrust-apply.service")
+        machine.wait_until_succeeds(
+            "systemctl show nmtrust-apply.service -p ActiveState --value | grep -q inactive",
+            timeout=10,
+        )
+
+    machine.wait_for_unit("multi-user.target")
+
+    with subtest("offline on boot with no connections active"):
+        apply(machine)
+        machine.succeed("systemctl is-active nmtrust-offline.target")
+        machine.fail("systemctl is-active trust-canary.service")
+
+    with subtest("trusted when trusted connection is up"):
+        machine.succeed("nmcli connection up trusted-net")
+        apply(machine)
+        machine.succeed("systemctl is-active nmtrust-trusted.target")
+        machine.succeed("systemctl is-active trust-canary.service")
+
+    with subtest("untrusted when untrusted connection replaces trusted"):
+        machine.succeed("nmcli connection down trusted-net")
+        machine.succeed("nmcli connection up untrusted-net")
+        apply(machine)
+        machine.succeed("systemctl is-active nmtrust-untrusted.target")
+        machine.fail("systemctl is-active trust-canary.service")
+  '';
+
+  meta.maintainers = with lib.maintainers; [ brett ];
+}
diff --git a/nixos/tests/pdudaemon.nix b/nixos/tests/pdudaemon.nix
new file mode 100644
index 000000000000..71fb798f886e
--- /dev/null
+++ b/nixos/tests/pdudaemon.nix
@@ -0,0 +1,50 @@
+{ pkgs, ... }:
+{
+  name = "PDUDaemon";
+  meta.maintainers = with pkgs.lib.maintainers; [
+    aiyion
+    emantor
+  ];
+
+  nodes.pdudaemonhost =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.curl ];
+      services.pdudaemon.enable = true;
+      services.pdudaemon.openFirewall = true;
+      services.pdudaemon.pdus = {
+        testpduhost = {
+          driver = "localcmdline";
+          cmd_on = "echo '%s on' >> /tmp/pdu";
+          cmd_off = "echo '%s off' >> /tmp/pdu";
+        };
+      };
+    };
+
+  nodes.clienthost =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.curl ];
+    };
+
+  testScript =
+    { nodes, ... }:
+    #python
+    ''
+      with subtest("Wait for pdudaemon startup"):
+          pdudaemonhost.start()
+          pdudaemonhost.wait_for_unit("pdudaemon.service")
+          pdudaemonhost.wait_for_open_port(16421)
+          print(pdudaemonhost.succeed("curl 'http://localhost:16421/power/control/on?hostname=testpduhost&port=1'"))
+
+      with subtest("Connect from client"):
+          clienthost.start()
+          clienthost.wait_until_succeeds("curl 'http://pdudaemonhost:16421/power/control/off?hostname=testpduhost&port=1'")
+
+      with subtest("Check systemd hardening does not degrade unnoticed"):
+          exact_threshold = 15
+          service_name = "pdudaemon"
+          pdudaemonhost.fail(f"systemd-analyze security {service_name}.service --threshold={exact_threshold-1}")
+          pdudaemonhost.succeed(f"systemd-analyze security {service_name}.service --threshold={exact_threshold}")
+    '';
+}
diff --git a/nixos/tests/qlever.nix b/nixos/tests/qlever.nix
new file mode 100644
index 000000000000..93e390d755d2
--- /dev/null
+++ b/nixos/tests/qlever.nix
@@ -0,0 +1,52 @@
+{
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  olympics-qleverfile = "${pkgs.qlever-control.src}/src/qlever/Qleverfiles/Qleverfile.olympics";
+
+  olympics-dataset = pkgs.fetchurl {
+    url = "https://github.com/wallscope/olympics-rdf/raw/54483d539082641d48e1d49873662b3af628ca4d/data/olympics-nt-nodup.zip";
+    hash = "sha256-dY28CQKaMDUUw/pw+p9yX0EtJOnbAAplodMFaedL1B8=";
+  };
+in
+
+{
+  name = "Basic QLever test";
+  meta.maintainers = lib.teams.ngi.members;
+
+  nodes = {
+    machine =
+      {
+        pkgs,
+        ...
+      }:
+      {
+        environment.systemPackages = with pkgs; [
+          qlever
+          qlever-control
+          unzip
+        ];
+      };
+  };
+
+  testScript =
+    # python
+    ''
+      machine.succeed("cp ${olympics-dataset} /tmp/olympics.zip")
+      machine.succeed("cp ${olympics-qleverfile} /tmp/Qleverfile")
+      machine.succeed("unzip -q olympics.zip")
+
+      # use qlever binary instead of docker
+      machine.succeed("sed -i 's/SYSTEM = docker/SYSTEM = native/' /tmp/Qleverfile")
+
+      machine.succeed("qlever index")
+
+      machine.succeed("qlever start")
+      machine.wait_for_open_port(7019) # default server port
+
+      machine.succeed("qlever query")
+    '';
+}
diff --git a/nixos/tests/rancher/multi-node.nix b/nixos/tests/rancher/multi-node.nix
index 2e47db1f18e4..d44884e5002e 100644
--- a/nixos/tests/rancher/multi-node.nix
+++ b/nixos/tests/rancher/multi-node.nix
@@ -224,7 +224,7 @@ in
 
       # Now create a pod on each node via a daemonset and verify they can talk to each other.
       server.succeed("kubectl apply -f ${networkTestDaemonset}")
-      server.wait_until_succeeds(f'[ "$(kubectl get ds test -o json | jq .status.numberReady)" -eq {len(machines)} ]')
+      server.wait_until_succeeds("kubectl rollout status daemonset test")
 
       # Get pod IPs
       pods = server.succeed("kubectl get po -o json | jq '.items[].metadata.name' -r").splitlines()
diff --git a/nixos/tests/spire.nix b/nixos/tests/spire.nix
index e23732faa099..dfdeba26e635 100644
--- a/nixos/tests/spire.nix
+++ b/nixos/tests/spire.nix
@@ -1,5 +1,51 @@
+{ pkgs, ... }:
 let
   trustDomain = "example.com";
+
+  # TODO: tpm-ek test has similar stuff. Also the whole tpm provisioning should probably
+  # just use the vtpm provisioning commands in the future?
+
+  # OpenSSL config to sign the swtpm EK with TPM-specific certificate extensions
+  ekSignConf = pkgs.writeText "ek-sign.cnf" ''
+    [ tpm_policy ]
+    basicConstraints = critical, CA:FALSE
+    keyUsage = critical, keyEncipherment
+    certificatePolicies = 2.23.133.2.1
+    extendedKeyUsage = 2.23.133.8.1
+    subjectAltName = ASN1:SEQUENCE:dirname_tpm
+
+    [ dirname_tpm ]
+    seq = EXPLICIT:4,SEQUENCE:dirname_tpm_seq
+
+    [ dirname_tpm_seq ]
+    set = SET:dirname_tpm_set
+
+    [ dirname_tpm_set ]
+    seq.1 = SEQUENCE:dirname_tpm_seq_manufacturer
+    seq.2 = SEQUENCE:dirname_tpm_seq_model
+    seq.3 = SEQUENCE:dirname_tpm_seq_version
+
+    [dirname_tpm_seq_manufacturer]
+    oid = OID:2.23.133.2.1
+    str = UTF8:"id:53544D20"
+
+    [dirname_tpm_seq_model]
+    oid = OID:2.23.133.2.2
+    str = UTF8:"ST33HTPHAHD4"
+
+    [dirname_tpm_seq_version]
+    oid = OID:2.23.133.2.3
+    str = UTF8:"id:00010101"
+  '';
+
+  agent =
+    { config, ... }:
+    {
+      environment.variables.SPIFFE_ENDPOINT_SOCKET =
+        config.services.spire.agent.settings.agent.socket_path;
+      virtualisation.credentials."spire.trust_bundle".source = "./trust_bundle";
+      systemd.services.spire-agent.serviceConfig.ImportCredential = [ "spire.trust_bundle" ];
+    };
 in
 {
   name = "spire";
@@ -9,6 +55,7 @@ in
       { config, ... }:
       {
         networking.domain = trustDomain;
+        environment.etc."spire/server/certs/tpm-ca.crt".source = ./tpm-ek/ca.crt;
         services.spire.server = {
           enable = true;
           openFirewall = true;
@@ -21,21 +68,17 @@ in
                 connection_string = "$STATE_DIRECTORY/datastore.sqlite3";
               };
               NodeAttestor.join_token.plugin_data = { };
+              NodeAttestor.tpm.plugin_data.ca_path = "/etc/spire/server/certs";
             };
           };
         };
       };
 
     agent = {
-      virtualisation.credentials = {
-        "spire.join_token".source = "./join_token";
-        "spire.trust_bundle".source = "./trust_bundle";
-      };
+      imports = [ agent ];
 
-      systemd.services.spire-agent.serviceConfig.ImportCredential = [
-        "spire.join_token"
-        "spire.trust_bundle"
-      ];
+      virtualisation.credentials."spire.join_token".source = "./join_token";
+      systemd.services.spire-agent.serviceConfig.ImportCredential = [ "spire.join_token" ];
 
       services.spire.agent = {
         enable = true;
@@ -56,44 +99,116 @@ in
         };
       };
     };
+
+    tpmAgent =
+      { pkgs, lib, ... }:
+      {
+        imports = [ agent ];
+        virtualisation = {
+          useEFIBoot = true;
+          tpm = {
+            enable = true;
+            # Provision the swtpm with an EK certificate signed by testCA so that
+            # the SPIRE server can verify the agent's identity.
+            provisioning = ''
+              export PATH=${
+                lib.makeBinPath [
+                  pkgs.openssl
+                  pkgs.tpm2-tools
+                ]
+              }:$PATH
+
+              tpm2_createek -G rsa -u ek.pub -c ek.ctx -f pem
+
+              openssl x509 \
+                -extfile ${ekSignConf} \
+                -new -days 365 \
+                -subj "/CN=swtpm-ekcert" \
+                -extensions tpm_policy \
+                -CA ${./tpm-ek/ca.crt} -CAkey ${./tpm-ek/ca.priv} \
+                -out ekcert.der -outform der \
+                -force_pubkey ek.pub
+
+              tpm2_nvdefine 0x01c00002 \
+                -C o \
+                -a "ownerread|policyread|policywrite|ownerwrite|authread|authwrite" \
+                -s "$(wc -c < ekcert.der)"
+
+              tpm2_nvwrite 0x01c00002 -C o -i ekcert.der
+            '';
+          };
+        };
+
+        environment.systemPackages = [ pkgs.spire-tpm-plugin ];
+
+        services.spire.agent = {
+          enable = true;
+          settings = {
+            agent = {
+              trust_domain = trustDomain;
+              server_address = "server.${trustDomain}";
+              trust_bundle_format = "pem";
+              trust_bundle_path = "$CREDENTIALS_DIRECTORY/spire.trust_bundle";
+            };
+            plugins = {
+              KeyManager.memory.plugin_data = { };
+              NodeAttestor.tpm.plugin_data = { };
+              WorkloadAttestor.systemd.plugin_data = { };
+              WorkloadAttestor.unix.plugin_data = { };
+            };
+          };
+        };
+      };
   };
 
   testScript =
     { nodes, ... }:
     let
       adminSocket = nodes.server.services.spire.server.settings.server.socket_path;
-      workloadSocket = nodes.agent.services.spire.agent.settings.agent.socket_path;
     in
     ''
-      # TODO: instead of trust bundle to talk to the spire-server, use an upstream CA?
-      def provision(agent, spiffe_id):
+      spiffe_id = "spiffe://${trustDomain}/service/backdoor"
 
-        # expose as system credentials
+      def provision_trust_bundle(agent):
+        # TODO: instead of trust bundle to talk to the spire-server, use an upstream CA?
         bundle = server.succeed("spire-server bundle show -socketPath ${adminSocket}")
         with open(agent.state_dir / "trust_bundle", "w") as f:
           f.write(bundle)
+
+
+      def provision_join_token(agent):
         join_token = server.succeed("spire-server token generate -socketPath ${adminSocket}").split()[1]
         with open(agent.state_dir / "join_token", "w") as f:
           f.write(join_token)
+        parent_id = f"spiffe://${trustDomain}/spire/agent/join_token/{join_token}"
+        server.succeed(f"spire-server entry create -socketPath ${adminSocket} -selector 'systemd:id:backdoor.service' -parentID {parent_id} -spiffeID {spiffe_id}")
+
+
+      def provision_tpm(agent):
+        agent.wait_for_unit("tpm2.target")
+        ek_hash = agent.succeed("get_tpm_pubhash").strip()
+        parent_id = f"spiffe://${trustDomain}/spire/agent/tpm/{ek_hash}"
+        server.succeed(f"spire-server entry create -socketPath ${adminSocket} -selector 'systemd:id:backdoor.service' -parentID '{parent_id}' -spiffeID {spiffe_id}")
+
+
+      def test_agent(name, agent_node, provision_fn):
+        with subtest(f"Setup SPIRE agent with {name} attestation"):
+          provision_trust_bundle(agent_node)
+          provision_fn(agent_node)
+          agent_node.wait_for_unit("spire-agent.service")
+          agent_node.wait_until_succeeds("spire-agent healthcheck -socketPath $SPIFFE_ENDPOINT_SOCKET", timeout=90)
+        with subtest(f"Test certificate authentication from {name} agent"):
+          agent_node.wait_until_succeeds("spire-agent api fetch x509 -socketPath $SPIFFE_ENDPOINT_SOCKET -write .")
+        # TODO: Add something to communicate with
 
-        # register a workload on the node
-        parent_id=f"spiffe://${trustDomain}/spire/agent/join_token/{join_token}"
-        server.succeed(f"spire-server entry create -socketPath ${adminSocket} -selector 'systemd:id:backdoor.service' -parentID {parent_id} -spiffeID 'spiffe://${trustDomain}/service/backdoor'")
 
       with subtest("SPIRE server startup and health checks"):
         server.wait_for_unit("spire-server.service")
-        server.wait_until_succeeds("spire-server healthcheck -socketPath ${adminSocket}", timeout=5)
+        server.wait_until_succeeds("spire-server healthcheck -socketPath ${adminSocket}", timeout=30)
 
 
-      with subtest("Setup SPIRE agent on agent node"):
-        provision(agent, "spiffe://${trustDomain}/server/agent")
-        agent.wait_for_unit("spire-agent.service")
-        agent.wait_until_succeeds("spire-agent healthcheck -socketPath ${workloadSocket}", timeout=5)
+      test_agent("join_token", agent, provision_join_token)
+      test_agent("tpm", tpmAgent, provision_tpm)
 
-
-      with subtest("Test certificate authentication from agent node"):
-        agent.succeed("spire-agent api fetch x509 -socketPath ${workloadSocket} -write .")
-
-      # TODO: Add something to communicate with
     '';
 }
diff --git a/nixos/tests/starship.nix b/nixos/tests/starship.nix
index 382666d8f176..bfa758218d55 100644
--- a/nixos/tests/starship.nix
+++ b/nixos/tests/starship.nix
@@ -45,7 +45,8 @@
     machine.wait_for_unit("default.target")
 
     machine.succeed("expect-bash")
-    machine.succeed("expect-fish")
+    # FIXME: Fish test fails to display Starship while inside the test environment; works on real systems.
+    # machine.succeed("expect-fish")
     machine.succeed("expect-zsh")
   '';
 }
diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix
index 595f069202e3..480d284ada1d 100644
--- a/nixos/tests/switch-test.nix
+++ b/nixos/tests/switch-test.nix
@@ -60,6 +60,14 @@ in
         environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff
         users.mutableUsers = false;
 
+        # A lingering user so the user systemd instance is running and
+        # switch-to-configuration can exercise the user-unit path.
+        users.users.usertest = {
+          isNormalUser = true;
+          uid = 1001;
+          linger = true;
+        };
+
         # Test that no boot loader still switches, e.g. in the ISO
         boot.loader.grub.enable = false;
 
@@ -647,6 +655,90 @@ in
               '';
             };
 
+          simpleUserService.configuration = {
+            systemd.user.services.usertest = {
+              wantedBy = [ "default.target" ];
+              serviceConfig = {
+                Type = "oneshot";
+                RemainAfterExit = true;
+                ExecStart = "${pkgs.coreutils}/bin/true";
+                ExecReload = "${pkgs.coreutils}/bin/true";
+              };
+            };
+          };
+
+          simpleUserServiceModified.configuration = {
+            imports = [ simpleUserService.configuration ];
+            systemd.user.services.usertest.serviceConfig.X-Test = "1";
+          };
+
+          simpleUserServiceNostop.configuration = {
+            imports = [ simpleUserService.configuration ];
+            systemd.user.services.usertest.stopIfChanged = false;
+          };
+
+          simpleUserServiceReload.configuration = {
+            imports = [ simpleUserService.configuration ];
+            systemd.user.services.usertest = {
+              reloadIfChanged = true;
+              serviceConfig.X-Test = "1";
+            };
+          };
+
+          simpleUserServiceReloadTrigger.configuration = {
+            imports = [ simpleUserService.configuration ];
+            systemd.user.services.usertest.reloadTriggers = [ "/dev/null" ];
+          };
+
+          simpleUserServiceFailing.configuration = {
+            imports = [ simpleUserService.configuration ];
+            systemd.user.services.usertest.serviceConfig.ExecStart = lib.mkForce "${pkgs.coreutils}/bin/false";
+          };
+
+          # A unit that NixOS defines while a copy already exists in
+          # ~/.config/systemd/user (e.g. home-manager). The home copy shadows
+          # /etc, so switch-to-configuration must leave it alone.
+          userServiceMigratedShadowed.configuration = {
+            systemd.user.services.migrated = {
+              wantedBy = [ "default.target" ];
+              serviceConfig = {
+                Type = "oneshot";
+                RemainAfterExit = true;
+                ExecStart = "${pkgs.runtimeShell} -c 'echo nixos > %t/migrated-owner'";
+              };
+            };
+          };
+
+          # As above, but the per-user activation removes the home copy and
+          # stops the unit (mimicking home-manager/sd-switch dropping it).
+          # switch-to-configuration must then start the now-unmasked
+          # /etc/systemd/user copy in a second pass.
+          userServiceMigratedToNixos.configuration = {
+            imports = [ userServiceMigratedShadowed.configuration ];
+            system.userActivationScripts.fakeSdSwitch = ''
+              if [ -e "$HOME/.config/systemd/user/migrated.service" ]; then
+                rm -f "$HOME/.config/systemd/user/migrated.service"
+                rm -f "$HOME/.config/systemd/user/default.target.wants/migrated.service"
+                ${pkgs.systemd}/bin/systemctl --user daemon-reload
+                ${pkgs.systemd}/bin/systemctl --user stop migrated.service || true
+              fi
+            '';
+          };
+
+          # As above, but the previous manager leaves the unit running instead
+          # of stopping it. switch-to-configuration must restart it so the
+          # /etc definition takes effect.
+          userServiceMigratedToNixosNoStop.configuration = {
+            imports = [ userServiceMigratedShadowed.configuration ];
+            system.userActivationScripts.fakeSdSwitch = ''
+              if [ -e "$HOME/.config/systemd/user/migrated.service" ]; then
+                rm -f "$HOME/.config/systemd/user/migrated.service"
+                rm -f "$HOME/.config/systemd/user/default.target.wants/migrated.service"
+                ${pkgs.systemd}/bin/systemctl --user daemon-reload
+              fi
+            '';
+          };
+
           no_inhibitors.configuration.system.switch.inhibitors = lib.mkForce { };
 
           inhibitors.configuration.system.switch.inhibitors = lib.mkForce {
@@ -709,6 +801,15 @@ in
           "broker" = "dbus-broker.service";
         }
         .${nodes.machine.services.dbus.implementation};
+
+      # Unit file placed in ~/.config/systemd/user to simulate a unit managed
+      # by home-manager (see the userServiceMigrated* specialisations).
+      homeMigratedUnit = pkgs.writeText "migrated.service" ''
+        [Service]
+        Type=oneshot
+        RemainAfterExit=true
+        ExecStart=${pkgs.runtimeShell} -c 'echo home > %t/migrated-owner'
+      '';
     in
     # python
     ''
@@ -776,6 +877,9 @@ in
           assert_contains(out, "baz")
           # Confirm that we can set that same generation as the new boot default
           switch_to_specialisation("${machine}", "inhibitors_changed", action="boot")
+          # Confirm that dry-activate is not blocked by inhibitors
+          out = switch_to_specialisation("${machine}", "inhibitors_changed", action="dry-activate")
+          assert_contains(out, "Not checking switch inhibitors")
           # Check that we can switch into a new generation with new inhibitors, but same values for existing ones
           switch_to_specialisation("${machine}", "inhibitors_new", action="switch")
           # Check that we can switch back into a generation without inhibitors
@@ -1612,5 +1716,122 @@ in
           out = switch_to_specialisation("${machine}", "")
           # Assert switching to a different generation doesn't touch units created by generators
           machine.succeed("systemctl is-active simple-generated.service")
+
+      with subtest("user services"):
+          machine.wait_for_unit("user@1001.service")
+          user_env = "XDG_RUNTIME_DIR=/run/user/1001"
+
+          def user_systemctl(args):
+              return machine.succeed(f"sudo -u usertest {user_env} systemctl --user {args}")
+
+          # Add a user service — starting default.target should pull it in via
+          # the WantedBy dependency.
+          out = switch_to_specialisation("${machine}", "simpleUserService")
+          user_systemctl("is-active usertest.service")
+
+          # No-op switch does nothing
+          out = switch_to_specialisation("${machine}", "simpleUserService")
+          assert_lacks(out, "user units:")
+
+          # Modifying the unit stop-starts it (default stopIfChanged=true)
+          out = switch_to_specialisation("${machine}", "simpleUserServiceModified")
+          assert_contains(out, "stopping the following user units: usertest.service")
+          assert_contains(out, "starting the following user units: usertest.service")
+          user_systemctl("is-active usertest.service")
+
+          # stopIfChanged=false restarts instead
+          out = switch_to_specialisation("${machine}", "simpleUserServiceNostop")
+          assert_lacks(out, "stopping the following user units:")
+          assert_contains(out, "restarting the following user units: usertest.service")
+          user_systemctl("is-active usertest.service")
+
+          # reloadIfChanged=true reloads instead
+          out = switch_to_specialisation("${machine}", "simpleUserServiceReload")
+          assert_lacks(out, "stopping the following user units:")
+          assert_lacks(out, "restarting the following user units:")
+          assert_contains(out, "reloading the following user units: usertest.service")
+          user_systemctl("is-active usertest.service")
+
+          # reloadTriggers change triggers a reload
+          switch_to_specialisation("${machine}", "simpleUserService")
+          user_systemctl("is-active usertest.service")
+          out = switch_to_specialisation("${machine}", "simpleUserServiceReloadTrigger")
+          assert_contains(out, "reloading the following user units: usertest.service")
+          user_systemctl("is-active usertest.service")
+
+          # A failing user unit propagates a non-zero exit to the parent so
+          # the overall switch reports failure.
+          out = switch_to_specialisation("${machine}", "simpleUserServiceFailing", fail=True)
+          assert_contains(out, "stopping the following user units: usertest.service")
+          assert_contains(out, "Failed to start user unit usertest.service")
+          assert_contains(out, "warning: the following user units failed: usertest.service")
+          assert_contains(out, "warning: user activation for usertest failed")
+          # Recover for the removal assertion below.
+          switch_to_specialisation("${machine}", "simpleUserService")
+          user_systemctl("is-active usertest.service")
+
+          # Removing the unit stops it
+          out = switch_to_specialisation("${machine}", "")
+          assert_contains(out, "stopping the following user units: usertest.service")
+          machine.fail(f"sudo -u usertest {user_env} systemctl --user is-active usertest.service")
+
+          # Migration from a home-directory manager to NixOS: pre-seed a unit
+          # in ~/.config/systemd/user and start it, then switch to a config
+          # that defines the same unit in /etc/systemd/user and whose user
+          # activation removes the ~/.config copy (mimicking sd-switch).
+          def seed_home_unit():
+              machine.succeed(
+                  "sudo -u usertest mkdir -p ~usertest/.config/systemd/user/default.target.wants",
+                  "sudo -u usertest cp ${homeMigratedUnit} ~usertest/.config/systemd/user/migrated.service",
+                  "sudo -u usertest ln -sfn ../migrated.service ~usertest/.config/systemd/user/default.target.wants/migrated.service",
+              )
+              user_systemctl("daemon-reload")
+              user_systemctl("start migrated.service")
+              user_systemctl("is-active migrated.service")
+              out = machine.succeed(f"sudo -u usertest {user_env} cat /run/user/1001/migrated-owner")
+              assert_contains(out, "home")
+              out = user_systemctl("show -p FragmentPath migrated.service")
+              assert_contains(out, "/.config/systemd/user/migrated.service")
+
+          seed_home_unit()
+          out = switch_to_specialisation("${machine}", "userServiceMigratedToNixos")
+          # Pass 1 must not touch it (still owned by ~/.config at that point)
+          assert_lacks(out, "stopping the following user units: migrated.service")
+          # Pass 2 starts the now-unmasked /etc copy after sd-switch stopped it
+          assert_contains(out, "starting (post-activation) the following user units: migrated.service")
+          user_systemctl("is-active migrated.service")
+          out = user_systemctl("show -p FragmentPath migrated.service")
+          assert_contains(out, "/etc/systemd/user/migrated.service")
+          out = machine.succeed(f"sudo -u usertest {user_env} cat /run/user/1001/migrated-owner")
+          assert_contains(out, "nixos")
+
+          # Reset and test the variant where the previous manager leaves the
+          # unit running: pass 2 must restart it.
+          switch_to_specialisation("${machine}", "")
+          machine.fail(f"sudo -u usertest {user_env} systemctl --user is-active migrated.service")
+          seed_home_unit()
+          out = switch_to_specialisation("${machine}", "userServiceMigratedToNixosNoStop")
+          assert_contains(out, "restarting (post-activation) the following user units: migrated.service")
+          user_systemctl("is-active migrated.service")
+          out = user_systemctl("show -p FragmentPath migrated.service")
+          assert_contains(out, "/etc/systemd/user/migrated.service")
+          out = machine.succeed(f"sudo -u usertest {user_env} cat /run/user/1001/migrated-owner")
+          assert_contains(out, "nixos")
+
+          # Units that remain shadowed by ~/.config must be left alone in both
+          # passes even though /etc now also defines them.
+          switch_to_specialisation("${machine}", "")
+          seed_home_unit()
+          out = switch_to_specialisation("${machine}", "userServiceMigratedShadowed")
+          assert_lacks(out, "migrated.service")
+          out = user_systemctl("show -p FragmentPath migrated.service")
+          assert_contains(out, "/.config/systemd/user/migrated.service")
+          out = machine.succeed(f"sudo -u usertest {user_env} cat /run/user/1001/migrated-owner")
+          assert_contains(out, "home")
+          # Clean up
+          machine.succeed("sudo -u usertest rm -rf ~usertest/.config/systemd")
+          user_systemctl("daemon-reload")
+          user_systemctl("stop migrated.service")
+          switch_to_specialisation("${machine}", "")
     '';
 }
diff --git a/nixos/tests/systemd-initrd-modprobe.nix b/nixos/tests/systemd-initrd-modprobe.nix
index 88237f5ab801..894de6e29ffd 100644
--- a/nixos/tests/systemd-initrd-modprobe.nix
+++ b/nixos/tests/systemd-initrd-modprobe.nix
@@ -18,6 +18,10 @@
     rtt = machine.succeed("cat /sys/module/tcp_hybla/parameters/rtt0")
     assert int(rtt) == 42, "Parameter should be respected for initrd kernel modules"
 
+    with subtest("modprobe@ services work"):
+      modprobe_service_status = machine.succeed("systemctl show --property ExecMainStatus modprobe@9pnet_virtio.service")
+      t.assertEqual("ExecMainStatus=0\n", modprobe_service_status)
+
     # Make sure it sticks in stage 2
     machine.switch_root()
     machine.wait_for_unit("multi-user.target")
diff --git a/nixos/tests/systemd-initrd-terminfo.nix b/nixos/tests/systemd-initrd-terminfo.nix
new file mode 100644
index 000000000000..24870eaf428a
--- /dev/null
+++ b/nixos/tests/systemd-initrd-terminfo.nix
@@ -0,0 +1,22 @@
+{ lib, ... }:
+{
+  name = "systemd-initrd-terminfo";
+
+  meta.maintainers = [ lib.maintainers.elvishjerricco ];
+
+  nodes.machine =
+    { config, ... }:
+    {
+      boot.initrd.systemd = {
+        enable = true;
+        extraBin.script = "${config.boot.initrd.systemd.package.util-linux}/bin/script";
+      };
+      testing.initrdBackdoor = true;
+    };
+
+  testScript = ''
+    machine.wait_for_unit("initrd.target")
+    rc, out = machine.execute("echo q | script -q -e -c 'yes | less' /dev/null")
+    assert "terminals database is inaccessible" not in out
+  '';
+}
diff --git a/nixos/tests/systemd-pstore.nix b/nixos/tests/systemd-pstore.nix
index 7eeb7209e4a4..7b9fc2f5142a 100644
--- a/nixos/tests/systemd-pstore.nix
+++ b/nixos/tests/systemd-pstore.nix
@@ -1,14 +1,39 @@
 {
   name = "systemd-pstore";
 
-  nodes.machine = { };
+  nodes.machine = {
+    virtualisation.useEFIBoot = true;
+    boot.initrd.systemd.enable = true;
+    testing.initrdBackdoor = true;
+  };
 
   testScript = ''
+    machine.switch_root()
     with subtest("pstore API fs is mounted"):
       machine.succeed("stat /sys/fs/pstore")
 
     with subtest("systemd-pstore.service doesn't run because nothing crashed"):
       output = machine.execute("systemctl status systemd-pstore.service", check_return=False)[1]
       t.assertIn("condition unmet", output)
+      machine.fail("stat /var/lib/systemd/pstore/*/*/dmesg.txt")
+
+    with subtest("systemd-pstore.service saves dmesg.txt files"):
+      machine.execute("echo c > /proc/sysrq-trigger", check_return=False, check_output=False)
+      machine.wait_for_shutdown()
+      machine.switch_root()
+      machine.wait_for_unit("systemd-pstore.service")
+      machine.succeed("stat /var/lib/systemd/pstore/*/*/dmesg.txt")
+
+    with subtest("crashes in initrd can be recovered too"):
+      machine.succeed(
+        "rm -r /var/lib/systemd/pstore/*",
+        "sync",
+      )
+      machine.shutdown()
+      machine.execute("echo c > /proc/sysrq-trigger", check_return=False, check_output=False)
+      machine.wait_for_shutdown()
+      machine.switch_root()
+      machine.wait_for_unit("systemd-pstore.service")
+      machine.succeed("stat /var/lib/systemd/pstore/*/*/dmesg.txt")
   '';
 }
diff --git a/nixos/tests/timezone.nix b/nixos/tests/timezone.nix
index b5d2f6779338..938c6bed9534 100644
--- a/nixos/tests/timezone.nix
+++ b/nixos/tests/timezone.nix
@@ -44,6 +44,18 @@
           print(date_result)
           assert date_result == "1970-01-01 09:00:00\n", "Timezone was not adjusted"
 
+          # Stop systemd-timedated.service to clear /etc/localtime read cache
+          node_nulltz.systemctl("stop systemd-timedated.service")
+          timedatectl_result = node_nulltz.succeed("timedatectl status")
+          print(timedatectl_result)
+          assert "Asia/Tokyo" in timedatectl_result, "'timedatectl status' output is missing 'Asia/Tokyo'"
+
+      with subtest("imperative - Ensure /etc/localtime symlink includes '/zoneinfo/' like icu expects"):
+          # https://github.com/unicode-org/icu/blob/release-78.3/icu4c/source/common/putil.cpp#L686-L695
+          readlink_result = node_nulltz.succeed("readlink --no-newline /etc/localtime")
+          print(readlink_result)
+          assert "/zoneinfo/" in readlink_result, f"/etc/localtime symlink is missing '/zoneinfo/': {readlink_result}"
+
       with subtest("imperative - Ensure timezone adjustment persists across reboot"):
           # Adjustment should persist across a reboot
           node_nulltz.shutdown()
diff --git a/nixos/tests/vinyl-cache.nix b/nixos/tests/vinyl-cache.nix
new file mode 100644
index 000000000000..aec9415b333f
--- /dev/null
+++ b/nixos/tests/vinyl-cache.nix
@@ -0,0 +1,126 @@
+{
+  pkgs,
+  package,
+  lib,
+  ...
+}:
+let
+  testPath = pkgs.hello;
+in
+{
+  name = "vinyl";
+  meta = {
+    maintainers = [
+      lib.maintainers.leona
+      lib.maintainers.osnyx
+    ];
+  };
+
+  nodes = {
+    vinyl =
+      {
+        config,
+        pkgs,
+        lib,
+        ...
+      }:
+      {
+        services.nix-serve = {
+          enable = true;
+        };
+
+        services.vinyl-cache = {
+          inherit package;
+          enable = true;
+          enableFileLogging = true;
+          listen = [
+            {
+              address = "0.0.0.0";
+              port = 80;
+              proto = "HTTP";
+            }
+            {
+              name = "proxyport";
+              address = "0.0.0.0";
+              port = 8080;
+              proto = "PROXY";
+            }
+            {
+              address = "/var/run/vinyld/client.http.sock";
+              user = "vinyl-cache";
+              group = "vinyl-cache";
+              mode = "660";
+            }
+          ]
+          ++ lib.optionals (lib.versionAtLeast package.version "7.3") [
+            # Support added in 7.3.0
+            { address = "@asdf"; }
+          ];
+          config = ''
+            vcl 4.1;
+
+            backend nix-serve {
+              .host = "127.0.0.1";
+              .port = "${toString config.services.nix-serve.port}";
+            }
+          '';
+        };
+
+        networking.firewall.allowedTCPPorts = [ 80 ];
+        system.extraDependencies = [ testPath ];
+
+        assertions =
+          let
+            cmdline = config.systemd.services.vinyl-cache.serviceConfig.ExecStart;
+          in
+          map
+            (pattern: {
+              assertion = lib.hasInfix pattern cmdline;
+              message = "Address argument `${pattern}` missing in commandline `${cmdline}`.";
+            })
+            (
+              [
+                " -a 0.0.0.0:80,HTTP "
+                " -a proxyport=0.0.0.0:8080,PROXY "
+                " -a /var/run/vinyld/client.http.sock,HTTP,user=vinyl-cache,group=vinyl-cache,mode=660 "
+              ]
+              ++ lib.optionals (lib.versionAtLeast package.version "7.3") [
+                " -a @asdf,HTTP "
+              ]
+            );
+      };
+
+    client =
+      { lib, ... }:
+      {
+        nix.settings = {
+          require-sigs = false;
+          substituters = lib.mkForce [ "http://vinyl" ];
+        };
+      };
+  };
+
+  testScript = ''
+    from pathlib import Path
+    import os
+
+    start_all()
+    vinyl.wait_for_open_port(80)
+    vinyl.wait_for_unit("vinylncsa")
+
+    client.wait_until_succeeds("curl -f http://vinyl/nix-cache-info");
+
+    client.wait_until_succeeds("nix-store -r ${testPath}")
+    client.succeed("${testPath}/bin/hello")
+
+    output = vinyl.succeed("vinyladm status")
+    print(output)
+    assert "Child in state running" in output, "Unexpected vinyladm response"
+
+    vinyl.copy_from_machine("/var/log/vinyl-cache/vinyl-cache.log")
+
+    out_dir = os.environ.get("out", os.getcwd())
+    vinyl_log = (Path(out_dir) / "vinyl-cache.log").read_text()
+    assert "http://vinyl/nix-cache-info" in vinyl_log
+  '';
+}
diff --git a/nixos/tests/web-apps/dawarich.nix b/nixos/tests/web-apps/dawarich.nix
index 2bc7679c9853..37451a87913b 100644
--- a/nixos/tests/web-apps/dawarich.nix
+++ b/nixos/tests/web-apps/dawarich.nix
@@ -3,17 +3,50 @@
   name = "dawarich-nixos";
 
   nodes.machine =
-    { pkgs, ... }:
+    { lib, pkgs, ... }:
     {
       services.dawarich = {
         enable = true;
         localDomain = "localhost";
       };
 
-      environment.etc.geojson.source = pkgs.fetchurl {
-        url = "https://github.com/Freika/dawarich/raw/8c24764aa56a084e980e21bc2ffd13a72fd611db/spec/fixtures/files/geojson/export.json";
-        hash = "sha256-qI00E5ixKTRJduAD+qB3JzvrpoJmC55llNtSiPVyxz4=";
-      };
+      environment.etc.geojson.text =
+        let
+          # based on https://github.com/Freika/dawarich/raw/8c24764aa56a084e980e21bc2ffd13a72fd611db/spec/fixtures/files/geojson/export.json
+          # but with different timestamps to avoid points being flagged as anomalies
+          points = map (i: {
+            lat = i / 10.0;
+            lon = i / 10.0;
+            timestamp = 1609459200 + i * 1000;
+          }) (lib.range 1 10);
+
+          mkGeoJsonPoint =
+            {
+              lat,
+              lon,
+              timestamp,
+            }:
+            {
+              type = "Feature";
+              geometry = {
+                type = "Point";
+                coordinates = [
+                  lon
+                  lat
+                ];
+              };
+              properties = {
+                altitude = 1;
+                vertical_accuracy = 1;
+                accuracy = 1;
+                inherit timestamp;
+              };
+            };
+        in
+        builtins.toJSON {
+          type = "FeatureCollection";
+          features = map mkGeoJsonPoint points;
+        };
     };
 
   testScript = ''
diff --git a/nixos/tests/web-apps/linkding-postgres.nix b/nixos/tests/web-apps/linkding-postgres.nix
new file mode 100644
index 000000000000..486e8de653b3
--- /dev/null
+++ b/nixos/tests/web-apps/linkding-postgres.nix
@@ -0,0 +1,42 @@
+{ lib, ... }:
+{
+  name = "linkding-postgres";
+
+  meta = {
+    maintainers = with lib.maintainers; [ squat ];
+  };
+
+  nodes.machine =
+    { ... }:
+    {
+      services.linkding = {
+        enable = true;
+        port = 9090;
+        database = {
+          createLocally = true;
+          type = "postgres";
+        };
+      };
+    };
+
+  testScript = ''
+    machine.start()
+    machine.wait_for_unit("linkding.service")
+    machine.wait_for_open_port(9090)
+
+    with subtest("Login page loads"):
+        machine.succeed(
+            "curl -sSfL http://127.0.0.1:9090 | grep -i 'linkding'"
+        )
+
+    with subtest("Health endpoint responds"):
+        machine.succeed(
+            "curl -sSf http://127.0.0.1:9090/health"
+        )
+
+    with subtest("linkding-manage works"):
+        machine.succeed(
+            "linkding-manage version"
+        )
+  '';
+}
diff --git a/nixos/tests/web-apps/linkding.nix b/nixos/tests/web-apps/linkding.nix
new file mode 100644
index 000000000000..074e5c947a33
--- /dev/null
+++ b/nixos/tests/web-apps/linkding.nix
@@ -0,0 +1,38 @@
+{ lib, pkgs, ... }:
+{
+  name = "linkding";
+
+  meta = {
+    maintainers = with lib.maintainers; [ squat ];
+  };
+
+  nodes.machine =
+    { ... }:
+    {
+      services.linkding = {
+        enable = true;
+        port = 9090;
+      };
+    };
+
+  testScript = ''
+    machine.start()
+    machine.wait_for_unit("linkding.service")
+    machine.wait_for_open_port(9090)
+
+    with subtest("Login page loads"):
+        machine.succeed(
+            "curl -sSfL http://127.0.0.1:9090 | grep -i 'linkding'"
+        )
+
+    with subtest("Health endpoint responds"):
+        machine.succeed(
+            "curl -sSf http://127.0.0.1:9090/health"
+        )
+
+    with subtest("linkding-manage works"):
+        machine.succeed(
+            "linkding-manage version"
+        )
+  '';
+}
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 5a7c493e42b1..7851368075a0 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -23,7 +23,6 @@ let
 
       nodes.machine =
         {
-          config,
           pkgs,
           lib,
           ...
@@ -54,6 +53,8 @@ let
           # /dev/disk/by-id doesn't get populated in the NixOS test framework
           boot.zfs.devNodes = "/dev/disk/by-uuid";
 
+          boot.zfs.forceImportRoot = lib.mkDefault false;
+
           specialisation.samba.configuration = {
             services.samba = {
               enable = true;
@@ -101,6 +102,7 @@ let
             systemd.services.zfs-import-forcepool.wantedBy = lib.mkVMOverride [ "forcepool.mount" ];
             systemd.targets.zfs.wantedBy = lib.mkVMOverride [ ];
             boot.zfs.forceImportAll = true;
+            boot.zfs.forceImportRoot = true;
             virtualisation.fileSystems."/forcepool" = {
               device = "forcepool";
               fsType = "zfs";
@@ -203,7 +205,6 @@ let
 
 in
 {
-
   series_2_3 = makeZfsTest {
     zfsPackage = pkgs.zfs_2_3;
     kernelPackages = pkgs.linuxPackages;
diff --git a/pkgs/README.md b/pkgs/README.md
index 18fcbb2cd558..d895c893a18e 100644
--- a/pkgs/README.md
+++ b/pkgs/README.md
@@ -75,7 +75,7 @@ Because entries in the Nix store are inert and do nothing by themselves, package
 
 This section describes a general framework of understanding and exceptions might apply.
 
-Luckily it's pretty easy to maintain your own package set with Nix, which can then be added to the [Nix User Repository](https://github.com/nix-community/nur) project.
+Luckily it's pretty easy to maintain your own package set with Nix, which can then be added to the [Nix User Repository](https://github.com/nix-community/nur) project or included in [search.nixos.org's list of indexed 3rd-party flakes](https://github.com/NixOS/nixos-search/blob/main/flakes/manual.toml)
 
 ---
 
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
deleted file mode 100644
index f8e9cb71366c..000000000000
--- a/pkgs/applications/audio/lmms/default.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  cmake,
-  pkg-config,
-  wrapQtAppsHook,
-  alsa-lib ? null,
-  carla ? null,
-  fftwFloat,
-  fltk_1_3,
-  fluidsynth ? null,
-  lame ? null,
-  libgig ? null,
-  libjack2 ? null,
-  libpulseaudio ? null,
-  libsamplerate,
-  libsoundio ? null,
-  libsndfile,
-  libvorbis ? null,
-  portaudio ? null,
-  qtbase,
-  qtx11extras,
-  qttools,
-  SDL ? null,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "lmms";
-  version = "1.2.2";
-
-  src = fetchFromGitHub {
-    owner = "LMMS";
-    repo = "lmms";
-    rev = "v${finalAttrs.version}";
-    sha256 = "006hwv1pbh3y5whsxkjk20hsbgwkzr4dawz43afq1gil69y7xpda";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [
-    cmake
-    qttools
-    pkg-config
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    carla
-    alsa-lib
-    fftwFloat
-    fltk_1_3
-    fluidsynth
-    lame
-    libgig
-    libjack2
-    libpulseaudio
-    libsamplerate
-    libsndfile
-    libsoundio
-    libvorbis
-    portaudio
-    qtbase
-    qtx11extras
-    SDL # TODO: switch to SDL2 in the next version
-  ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/archlinux/svntogit-community/cf64acc45e3264c6923885867e2dbf8b7586a36b/trunk/lmms-carla-export.patch";
-      sha256 = "sha256-wlSewo93DYBN2PvrcV58dC9kpoo9Y587eCeya5OX+j4=";
-    })
-  ];
-
-  prePatch = ''
-    # Update CMake minimum required version and policies
-    substituteInPlace CMakeLists.txt --replace 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)' 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10)'
-    substituteInPlace CMakeLists.txt --replace 'CMAKE_POLICY(SET CMP0026 OLD)' 'CMAKE_POLICY(SET CMP0026 NEW)'
-    substituteInPlace CMakeLists.txt --replace 'CMAKE_POLICY(SET CMP0050 OLD)' 'CMAKE_POLICY(SET CMP0050 NEW)'
-    substituteInPlace CMakeLists.txt --replace 'GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION)' 'SET(BIN2RES $<TARGET_FILE:bin2res>)'
-  '';
-
-  cmakeFlags = [
-    "-DWANT_QT5=ON"
-  ]
-  ++ lib.optionals (lib.versionOlder finalAttrs.version "11.4") [
-    # Fix the build with CMake 4.
-    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
-  ];
-
-  meta = {
-    description = "DAW similar to FL Studio (music production software)";
-    mainProgram = "lmms";
-    homepage = "https://lmms.io";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-  };
-})
diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix
index b97bc975612b..2465b0256aa9 100644
--- a/pkgs/applications/audio/mopidy/mopidy.nix
+++ b/pkgs/applications/audio/mopidy/mopidy.nix
@@ -34,6 +34,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
       gst-plugins-good
       gst-plugins-ugly
       gst-plugins-rs
+      gst-libav
     ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pipewire ];
 
diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix
index 7e98225d1413..a3147bf4651e 100644
--- a/pkgs/applications/audio/mopidy/notify.nix
+++ b/pkgs/applications/audio/mopidy/notify.nix
@@ -1,19 +1,20 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   pythonPackages,
   mopidy,
 }:
 
 pythonPackages.buildPythonApplication (finalAttrs: {
   pname = "mopidy-notify";
-  version = "0.2.1";
+  version = "0.2.2";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit (finalAttrs) version;
-    pname = "Mopidy-Notify";
-    hash = "sha256-8FT4O4k0wEsdHA1vJaOW9UamJ3QLyO47HwL5XcSU3Pc=";
+  src = fetchFromGitHub {
+    owner = "phijor";
+    repo = "mopidy-notify";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oAOJvonDDmtpmzgu8Y+BczuLYpfrVlwASIFOW7rhZ94=";
   };
 
   build-system = [
@@ -37,6 +38,6 @@ pythonPackages.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/phijor/mopidy-notify";
     description = "Mopidy extension for showing desktop notifications on track change";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.nim65s ];
   };
 })
diff --git a/pkgs/applications/audio/mopidy/tidal.nix b/pkgs/applications/audio/mopidy/tidal.nix
index 8b99c3288729..7893a104579d 100644
--- a/pkgs/applications/audio/mopidy/tidal.nix
+++ b/pkgs/applications/audio/mopidy/tidal.nix
@@ -11,7 +11,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "tehkillerbee";
+    owner = "EbbLabs";
     repo = "mopidy-tidal";
     tag = "v${finalAttrs.version}";
     hash = "sha256-1u1MMLtVNZkVhmUr5DW34TlJ2s/YGRKXjqi+SrtClR4=";
@@ -33,8 +33,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   meta = {
     description = "Mopidy extension for playing music from Tidal";
-    homepage = "https://github.com/tehkillerbee/mopidy-tidal";
-    changelog = "https://github.com/tehkillerbee/mopidy-tidal/releases/tag/${finalAttrs.src.tag}";
+    homepage = "https://github.com/EbbLabs/mopidy-tidal";
+    changelog = "https://github.com/EbbLabs/mopidy-tidal/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index 858f21320109..5f49d28d97b8 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -30,10 +30,10 @@
   builderKeys ? [
     "152812300785C96444D3334D17565732E08E5E41" # achow101.gpg
     "9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg
-    # "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg (not signed 30.2)
+    # "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg (not signed 31.0)
     "D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg
-    # "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg (not signed 30.2)
-    # "67AA5B46E7AF78053167FE343B8F814A784218F8" # willcl-ark.gpg (not signed 30.2)
+    # "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg (not signed 31.0)
+    "67AA5B46E7AF78053167FE343B8F814A784218F8"
   ],
 }:
 
@@ -46,14 +46,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = if withGui then "bitcoin" else "bitcoind";
-  version = "30.2";
+  version = "31.0";
 
   src = fetchurl {
     urls = [
       "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz"
     ];
     # hash retrieved from signed SHA256SUMS
-    sha256 = "6fd00b8c42883d5c963901ad4109a35be1e5ec5c2dc763018c166c21a06c84cb";
+    sha256 = "0ba0ef5eea3aefd96cc1774be274c3d594812cfac0988809d706738bb067b3e3";
   };
 
   nativeBuildInputs = [
@@ -93,12 +93,12 @@ stdenv.mkDerivation (finalAttrs: {
 
       checksums = fetchurl {
         url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS";
-        hash = "sha256-ERE/QO2elj++mON3UYGJKaLdU86gWIRS/AufuyS/JAU=";
+        hash = "sha256-w/4sIOBYR1d/YzzMqwzH6wRHOPQnNg8x7yS96+eWk8g=";
       };
 
       signatures = fetchurl {
         url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc";
-        hash = "sha256-69TMNzKJQRDC+2YU6bKI23c8Jx44m5B1zz823SQtiyg=";
+        hash = "sha256-hkztGd2fUel7JJbe9RGSfJXGozhb085XvmqPjks96l4=";
       };
 
       verifyBuilderKeys =
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 82f23e4d0d0b..9c77e9a27eac 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -16,9 +16,9 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2025.3.3.7"; # "Android Studio Panda 3 | 2025.3.3 Patch 1"
-    sha256Hash = "sha256-FTAJ9rZPwLgIA/uPKl4d9haBxLL4O2Z+H8sY6RqaeOA=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.3.7/android-studio-panda3-patch1-linux.tar.gz";
+    version = "2025.3.4.6"; # "Android Studio Panda 4 | 2025.3.4"
+    sha256Hash = "sha256-Mqf/CayqOLSNYciIK+5+ITAiqLoNHxbABzOA+stQn9M=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.6/android-studio-panda4-linux.tar.gz";
   };
   betaVersion = {
     version = "2025.3.4.5"; # "Android Studio Panda 4 | 2025.3.4 RC 1"
@@ -26,9 +26,9 @@ let
     url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.5/android-studio-panda4-rc1-linux.tar.gz";
   };
   latestVersion = {
-    version = "2025.3.4.4"; # "Android Studio Panda 4 | 2025.3.4 Canary 4"
-    sha256Hash = "sha256-sPGJuOm5T7EZV5hhOJsZc7P8CTXyv9A6k82hM1GZGpY=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.4/android-studio-panda4-canary4-linux.tar.gz";
+    version = "2026.1.1.2"; # "Android Studio Quail 1 | 2026.1.1 Canary 2"
+    sha256Hash = "sha256-jdbxyK7V4EJI5sCk31oo77lH6uXTM0QjljUgWn5Bl3M=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.2/android-studio-quail1-canary2-linux.tar.gz";
   };
 in
 {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
index 0495f9258149..5f4e032acc72 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -333,10 +333,10 @@
     elpaBuild {
       pname = "altcaps";
       ename = "altcaps";
-      version = "1.3.0.0.20260210.221352";
+      version = "1.3.0.0.20260413.54314";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/altcaps-1.3.0.0.20260210.221352.tar";
-        sha256 = "1m97icn58an0a1x9lhby7870g5m4i7rgkmi61nz24qmrc5pcmqmw";
+        url = "https://elpa.gnu.org/devel/altcaps-1.3.0.0.20260413.54314.tar";
+        sha256 = "1jj7321nhxy7gk2cchv81nyw8fzzw7zkikgwgnj6k7kki53rhp8c";
       };
       packageRequires = [ ];
       meta = {
@@ -719,10 +719,10 @@
     elpaBuild {
       pname = "beframe";
       ename = "beframe";
-      version = "1.5.0.0.20260204.145843";
+      version = "1.5.0.0.20260413.54824";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/beframe-1.5.0.0.20260204.145843.tar";
-        sha256 = "1jkirpjfxzxspbz1whf5yjzdzxx10abr9aymks40hh72xyjgida6";
+        url = "https://elpa.gnu.org/devel/beframe-1.5.0.0.20260413.54824.tar";
+        sha256 = "1nj3gn44bd867yx34d9nzzqcfk5k3fp89wg7k83lpcc7f2a6w3dw";
       };
       packageRequires = [ ];
       meta = {
@@ -1015,10 +1015,10 @@
     elpaBuild {
       pname = "buframe";
       ename = "buframe";
-      version = "0.3.0.20260327.125525";
+      version = "0.3.0.20260415.112855";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/buframe-0.3.0.20260327.125525.tar";
-        sha256 = "0z97kqjzpgp31ik5y8ab50iw7mckx5mc3yrdr4abkl69ii6gw76q";
+        url = "https://elpa.gnu.org/devel/buframe-0.3.0.20260415.112855.tar";
+        sha256 = "1fav3n1r5w0vyvkbblfbi9xnglhmi4bvp6ikixp3lmh8bpf7as2l";
       };
       packageRequires = [ timeout ];
       meta = {
@@ -1106,10 +1106,10 @@
     elpaBuild {
       pname = "cape";
       ename = "cape";
-      version = "2.6.0.20260330.61918";
+      version = "2.6.0.20260419.184703";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cape-2.6.0.20260330.61918.tar";
-        sha256 = "1w8l2j55zmkbfx1m22fd12xbh9makaxxp97wcc69px1flx0055dh";
+        url = "https://elpa.gnu.org/devel/cape-2.6.0.20260419.184703.tar";
+        sha256 = "143b5kxykz4mgx2y7gq6vidrqnnjnc0ay809hjzbqfmpvlnf86fn";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1483,10 +1483,10 @@
     elpaBuild {
       pname = "compat";
       ename = "compat";
-      version = "30.1.0.1.0.20260328.162400";
+      version = "30.1.0.1.0.20260411.151508";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/compat-30.1.0.1.0.20260328.162400.tar";
-        sha256 = "1m3vchayxp8jzjf4cc3zc7qkgy702nfccbvdvfjjfn71wd37q4ph";
+        url = "https://elpa.gnu.org/devel/compat-30.1.0.1.0.20260411.151508.tar";
+        sha256 = "14vim5vlv57q6zl83lixj2palwbxz2dkbpivyvs56cjwqck41bvd";
       };
       packageRequires = [ seq ];
       meta = {
@@ -1547,10 +1547,10 @@
     elpaBuild {
       pname = "consult";
       ename = "consult";
-      version = "3.4.0.20260407.153027";
+      version = "3.4.0.20260421.111434";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-3.4.0.20260407.153027.tar";
-        sha256 = "0w1hl7lj26bqhnmmmk9rnahapw4pggxyri6ppcxbxx735bpy9c2r";
+        url = "https://elpa.gnu.org/devel/consult-3.4.0.20260421.111434.tar";
+        sha256 = "16gz342an0vsdj7jdy5gcrv8wwcwfqabdzsyyg1dcfzrlmvxvfja";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1570,10 +1570,10 @@
     elpaBuild {
       pname = "consult-denote";
       ename = "consult-denote";
-      version = "0.4.2.0.20260122.100152";
+      version = "0.4.2.0.20260423.93857";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-denote-0.4.2.0.20260122.100152.tar";
-        sha256 = "1d8dq183sc5sc3ki5z602w29f541cs6ljhyx5fwl7rwnj22w6yxx";
+        url = "https://elpa.gnu.org/devel/consult-denote-0.4.2.0.20260423.93857.tar";
+        sha256 = "1fcf1abqg71kp9g0nsxdnmb33m6g4kn0iwgvfd1cqslyhmdkk0c8";
       };
       packageRequires = [
         consult
@@ -1595,10 +1595,10 @@
     elpaBuild {
       pname = "consult-hoogle";
       ename = "consult-hoogle";
-      version = "0.6.0.0.20260226.73407";
+      version = "0.6.0.0.20260410.130304";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/consult-hoogle-0.6.0.0.20260226.73407.tar";
-        sha256 = "1yndkjzbydlyxzgl2zfk5m9w3hh8aq5dk1myjc0xkwczfwbw1gjm";
+        url = "https://elpa.gnu.org/devel/consult-hoogle-0.6.0.0.20260410.130304.tar";
+        sha256 = "1067wh3r087bdvg4zqbzwmzh6qssj7x7y12qs3fh96vpqrjw2a11";
       };
       packageRequires = [ consult ];
       meta = {
@@ -1660,10 +1660,10 @@
     elpaBuild {
       pname = "corfu";
       ename = "corfu";
-      version = "2.9.0.20260330.62901";
+      version = "2.9.0.20260419.183827";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/corfu-2.9.0.20260330.62901.tar";
-        sha256 = "10092p4v9kaz2mlffsq5dpnqna3qbbyx4qivxg4qjpy3w53wbznj";
+        url = "https://elpa.gnu.org/devel/corfu-2.9.0.20260419.183827.tar";
+        sha256 = "06myb0qgv8q3iak83bdpkjmd8vplqcvypl9q1y1h7qfbcy2yvssh";
       };
       packageRequires = [ compat ];
       meta = {
@@ -1877,10 +1877,10 @@
     elpaBuild {
       pname = "cursory";
       ename = "cursory";
-      version = "1.2.0.0.20260111.105552";
+      version = "1.2.0.0.20260413.54607";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/cursory-1.2.0.0.20260111.105552.tar";
-        sha256 = "0plc6a5rh2wigpif1p9wkvdjqjppakhzkviywzn7z1fxiyrldq2m";
+        url = "https://elpa.gnu.org/devel/cursory-1.2.0.0.20260413.54607.tar";
+        sha256 = "00cxb53p6l3d395vkmza1zqjrpx9rq65xy5cnv410i7lricrwpfr";
       };
       packageRequires = [ ];
       meta = {
@@ -2075,10 +2075,10 @@
     elpaBuild {
       pname = "denote";
       ename = "denote";
-      version = "4.1.3.0.20260409.181603";
+      version = "4.1.3.0.20260423.182534";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-4.1.3.0.20260409.181603.tar";
-        sha256 = "1mh0vxq1bz20f0d6n3hcrzwgfjva3f17zqkwj9hxm2xw0r9b4jhl";
+        url = "https://elpa.gnu.org/devel/denote-4.1.3.0.20260423.182534.tar";
+        sha256 = "1mh9sl4rhsmxniibrnym69xdwgswij8132b4n7k65lw75y0p05j9";
       };
       packageRequires = [ ];
       meta = {
@@ -2119,10 +2119,10 @@
     elpaBuild {
       pname = "denote-markdown";
       ename = "denote-markdown";
-      version = "0.2.1.0.20260111.93101";
+      version = "0.2.2.0.20260423.181135";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/denote-markdown-0.2.1.0.20260111.93101.tar";
-        sha256 = "0gpqcwpy2x329v73fbg7yq0zzhjy1651iffcf2y6vyirw4yy7mmx";
+        url = "https://elpa.gnu.org/devel/denote-markdown-0.2.2.0.20260423.181135.tar";
+        sha256 = "18l9aymn3v5i3y3g4bx81b16zw4mdgrkkz3939xq5dxy4wwmiqjk";
       };
       packageRequires = [ denote ];
       meta = {
@@ -2514,10 +2514,10 @@
     elpaBuild {
       pname = "dired-preview";
       ename = "dired-preview";
-      version = "0.6.0.0.20260409.181025";
+      version = "0.6.0.0.20260413.54225";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/dired-preview-0.6.0.0.20260409.181025.tar";
-        sha256 = "1ryvx8q6sgikf8zl977nhb7nb9f776384lh6aky4nfnlx62sacpb";
+        url = "https://elpa.gnu.org/devel/dired-preview-0.6.0.0.20260413.54225.tar";
+        sha256 = "0x1s8b4swr62a833zszyk9kfnh2fx5kl5rwjdfhm4mgpib50nmcy";
       };
       packageRequires = [ ];
       meta = {
@@ -2612,6 +2612,27 @@
       };
     }
   ) { };
+  dmsg = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dmsg";
+      ename = "dmsg";
+      version = "0.2.0.20260422.105206";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dmsg-0.2.0.20260422.105206.tar";
+        sha256 = "0h8l75k00hh0j2cyc2jwqkrnr7qmkz0jydbhm2qwpm3bb5pyd6bq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/devel/dmsg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   do-at-point = callPackage (
     {
       elpaBuild,
@@ -2957,10 +2978,10 @@
     elpaBuild {
       pname = "eglot";
       ename = "eglot";
-      version = "1.23.0.20260406.115439";
+      version = "1.23.0.20260422.80836";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/eglot-1.23.0.20260406.115439.tar";
-        sha256 = "0wxnvhzl2ygb1c0krrq0zqzkda55l3hqlpicq9yvckfi7d3h62ik";
+        url = "https://elpa.gnu.org/devel/eglot-1.23.0.20260422.80836.tar";
+        sha256 = "1w7pfbx6m68x6anxg1038cah2wbyb3f3mdgsqsrsj0dbh9qwzzq5";
       };
       packageRequires = [
         eldoc
@@ -3200,10 +3221,10 @@
     elpaBuild {
       pname = "emacs-lisp-intro-nl";
       ename = "emacs-lisp-intro-nl";
-      version = "0.0.20260409.83314";
+      version = "0.0.20260419.193604";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/emacs-lisp-intro-nl-0.0.20260409.83314.tar";
-        sha256 = "1cnr00p1gl6f21p1apnyz2a04zv5xc2c7c1ldkvzadpy9fj0a9r4";
+        url = "https://elpa.gnu.org/devel/emacs-lisp-intro-nl-0.0.20260419.193604.tar";
+        sha256 = "1spqwayvm830vzsyy7l768yd91f3h8agpd9wpaa6g0pd5pdhh42r";
       };
       packageRequires = [ ];
       meta = {
@@ -3310,10 +3331,10 @@
     elpaBuild {
       pname = "emms";
       ename = "emms";
-      version = "25.0.20260213.170929";
+      version = "26.0.20260414.110541";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/emms-25.0.20260213.170929.tar";
-        sha256 = "1lrwhhaqbf09lwfk65gr7hpwc5z5sigpmna48fjmrmsp8aj99rzq";
+        url = "https://elpa.gnu.org/devel/emms-26.0.20260414.110541.tar";
+        sha256 = "05vp80ybsl37bm0wpwdhdj7qlgw07cik544fwzczg8r49bd2s066";
       };
       packageRequires = [
         cl-lib
@@ -3446,10 +3467,10 @@
     elpaBuild {
       pname = "ess";
       ename = "ess";
-      version = "26.1.0.0.20260408.95243";
+      version = "26.1.0.0.20260423.92659";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ess-26.1.0.0.20260408.95243.tar";
-        sha256 = "0ddkvi7akw7dhjx1spc98s653kp48b327amyhwgw06sgkn868psa";
+        url = "https://elpa.gnu.org/devel/ess-26.1.0.0.20260423.92659.tar";
+        sha256 = "0fmq3fp4dya40ab3rg511i7p3pi2mhx98dvl27fs186ya79bgvgq";
       };
       packageRequires = [ ];
       meta = {
@@ -3784,10 +3805,10 @@
     elpaBuild {
       pname = "fontaine";
       ename = "fontaine";
-      version = "3.0.1.0.20260316.175802";
+      version = "3.0.1.0.20260413.54632";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/fontaine-3.0.1.0.20260316.175802.tar";
-        sha256 = "0plmi51lsssmz0ccfh05f7rmjfmaqgq7jnlikwm5q8ad6qlwvj2r";
+        url = "https://elpa.gnu.org/devel/fontaine-3.0.1.0.20260413.54632.tar";
+        sha256 = "1s7wz2807a49vhcj3zv7hx75kz4l9zkhi53fvppab46j2wyaw8qs";
       };
       packageRequires = [ ];
       meta = {
@@ -3895,10 +3916,10 @@
     elpaBuild {
       pname = "futur";
       ename = "futur";
-      version = "1.4.0.20260409.205429";
+      version = "1.4.0.20260423.160640";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/futur-1.4.0.20260409.205429.tar";
-        sha256 = "1crph78sjng309ciyxhcy1ci9l75pqvrq7ac2p4m55dc7yzgkl0i";
+        url = "https://elpa.gnu.org/devel/futur-1.4.0.20260423.160640.tar";
+        sha256 = "04z4660mjgnf5z4qyzbiwdi7cd9b42ncvxrvpxr9i9q51sky72jb";
       };
       packageRequires = [ ];
       meta = {
@@ -4089,10 +4110,10 @@
     elpaBuild {
       pname = "gnosis";
       ename = "gnosis";
-      version = "0.10.3.0.20260406.15023";
+      version = "0.10.3.0.20260420.110309";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/gnosis-0.10.3.0.20260406.15023.tar";
-        sha256 = "11ijgpz1pwh7cgj96lhigmh19vrqjysslpkmmrjyihdzmmfzk0wj";
+        url = "https://elpa.gnu.org/devel/gnosis-0.10.3.0.20260420.110309.tar";
+        sha256 = "0inrv51wkjycbxhhlsivfig2479v18jcvps1dq2psjas0r2crsx3";
       };
       packageRequires = [ compat ];
       meta = {
@@ -4297,10 +4318,10 @@
     elpaBuild {
       pname = "greader";
       ename = "greader";
-      version = "0.19.0.0.20260402.161715";
+      version = "0.19.0.0.20260409.233021";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/greader-0.19.0.0.20260402.161715.tar";
-        sha256 = "0fzph8cvyl66sxs5a96hhxgpg30df48nv32d8x29df4piv113zcw";
+        url = "https://elpa.gnu.org/devel/greader-0.19.0.0.20260409.233021.tar";
+        sha256 = "1lq10b8b3nkzf6lx9z1h3cv2537g4ymj5qw6xbclpxzrj07zalg7";
       };
       packageRequires = [
         compat
@@ -4342,10 +4363,10 @@
     elpaBuild {
       pname = "gtags-mode";
       ename = "gtags-mode";
-      version = "1.9.4.0.20251110.175010";
+      version = "1.9.5.0.20260413.115633";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/gtags-mode-1.9.4.0.20251110.175010.tar";
-        sha256 = "19c6ccg812lqz28pfx9jjfkms1zvfv8qs6693fd69rggsh55bp43";
+        url = "https://elpa.gnu.org/devel/gtags-mode-1.9.5.0.20260413.115633.tar";
+        sha256 = "00z5b4l05xn73wk50xw34qszv3kg0c6f586cplqwc83dnjhxwcwc";
       };
       packageRequires = [ ];
       meta = {
@@ -4559,10 +4580,10 @@
     elpaBuild {
       pname = "hyperbole";
       ename = "hyperbole";
-      version = "9.0.2pre0.20260410.71604";
+      version = "9.0.2pre0.20260422.74419";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20260410.71604.tar";
-        sha256 = "0mnxwiv6l1rpwwnaffhi0sxb5qi58wf8npp05w0swdanim27k7kr";
+        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20260422.74419.tar";
+        sha256 = "1k6qcwb9bhf062bd0d6q69n1wbk68bkmb8d30c5hnd32s2m261xp";
       };
       packageRequires = [ ];
       meta = {
@@ -4623,10 +4644,10 @@
     elpaBuild {
       pname = "indent-bars";
       ename = "indent-bars";
-      version = "1.0.0.0.20260120.94117";
+      version = "1.0.0.0.20260418.90339";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/indent-bars-1.0.0.0.20260120.94117.tar";
-        sha256 = "11ffwvv8zmkxbc74ny30cgjpwzv6v0mbdcdr1laadhbhwkdlk8am";
+        url = "https://elpa.gnu.org/devel/indent-bars-1.0.0.0.20260418.90339.tar";
+        sha256 = "0jrdzw4yr1ldcsvc5jix8ay1wfv7fmphc2q82alhv4in247c5sna";
       };
       packageRequires = [ compat ];
       meta = {
@@ -4750,10 +4771,10 @@
     elpaBuild {
       pname = "ivy";
       ename = "ivy";
-      version = "0.15.1.0.20260318.135818";
+      version = "0.15.1.0.20260413.210444";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/ivy-0.15.1.0.20260318.135818.tar";
-        sha256 = "19qzzdgkbhl49lv147blb1rznf86mhbm1d1h7gzanva17pc7cpi7";
+        url = "https://elpa.gnu.org/devel/ivy-0.15.1.0.20260413.210444.tar";
+        sha256 = "1840hsmdaqh4p5l4fbdb9gj95xaga8439zmp39adbvy6xkkqqbl4";
       };
       packageRequires = [ ];
       meta = {
@@ -4892,10 +4913,10 @@
     elpaBuild {
       pname = "jarchive";
       ename = "jarchive";
-      version = "0.11.0.0.20231010.221311";
+      version = "0.12.0.0.20260419.91017";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jarchive-0.11.0.0.20231010.221311.tar";
-        sha256 = "122qffkbl5in1y1zpphn38kmg49xpvddxzf8im9hcvigf7dik6f5";
+        url = "https://elpa.gnu.org/devel/jarchive-0.12.0.0.20260419.91017.tar";
+        sha256 = "0mdsfvggcv2iyia0vpp1lj1xarg8kjbksvxzl6w2b2q5k8j1gl8f";
       };
       packageRequires = [ ];
       meta = {
@@ -5043,10 +5064,10 @@
     elpaBuild {
       pname = "jsonrpc";
       ename = "jsonrpc";
-      version = "1.0.28.0.20260402.173109";
+      version = "1.0.28.0.20260416.174639";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/jsonrpc-1.0.28.0.20260402.173109.tar";
-        sha256 = "1fxwnk964n0g3l6f06q323cp9jq12ja2fja6q00bpf9jargjkp57";
+        url = "https://elpa.gnu.org/devel/jsonrpc-1.0.28.0.20260416.174639.tar";
+        sha256 = "0j7y9kcjdai6sd1634ln4ag0fg5x8ljzq50f25nc5miadaq93vw8";
       };
       packageRequires = [ ];
       meta = {
@@ -5150,10 +5171,10 @@
     elpaBuild {
       pname = "kubed";
       ename = "kubed";
-      version = "0.5.1.0.20260327.160729";
+      version = "0.6.1.0.20260413.204601";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/kubed-0.5.1.0.20260327.160729.tar";
-        sha256 = "1i5hn7fl08xqqhhs9ic9frdg3gj65nll2zjvc8wc88yn38c75bav";
+        url = "https://elpa.gnu.org/devel/kubed-0.6.1.0.20260413.204601.tar";
+        sha256 = "1q7ykifs44ywrq94fhvdz4svpxm2j3yj4vmq74lz5d57q702xz9l";
       };
       packageRequires = [ ];
       meta = {
@@ -5333,10 +5354,10 @@
     elpaBuild {
       pname = "lin";
       ename = "lin";
-      version = "2.0.0.0.20260324.81759";
+      version = "2.0.0.0.20260413.54759";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/lin-2.0.0.0.20260324.81759.tar";
-        sha256 = "173s99ccj6v1yalvbniia5bg59y195rjavabaxzjp70ayzb830zz";
+        url = "https://elpa.gnu.org/devel/lin-2.0.0.0.20260413.54759.tar";
+        sha256 = "18im9kd79wvhk92p8wm0hxf67c85g6f2rlppx3dkn0r601hmpv2w";
       };
       packageRequires = [ ];
       meta = {
@@ -5409,10 +5430,10 @@
     elpaBuild {
       pname = "llm";
       ename = "llm";
-      version = "0.30.1.0.20260409.235755";
+      version = "0.30.1.0.20260417.170756";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/llm-0.30.1.0.20260409.235755.tar";
-        sha256 = "0cviwq12i6p6s8k58987n43mzrhcilkddflnmwkvalyvpfbsmm1r";
+        url = "https://elpa.gnu.org/devel/llm-0.30.1.0.20260417.170756.tar";
+        sha256 = "01dzr0qli82gdm24fdqiw7gn10w1gallgcss04v5d251idgfh87q";
       };
       packageRequires = [
         compat
@@ -5627,10 +5648,10 @@
     elpaBuild {
       pname = "map";
       ename = "map";
-      version = "3.3.1.0.20260101.125434";
+      version = "3.3.1.0.20260420.130325";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/map-3.3.1.0.20260101.125434.tar";
-        sha256 = "1darxw7vam0zc0rsxm2v0a239rpc1hnaqqkakmryac2kazbsjg7n";
+        url = "https://elpa.gnu.org/devel/map-3.3.1.0.20260420.130325.tar";
+        sha256 = "1khl72238fzf8jzk3ihq5yl3w8kipr4km5awh4zqhp03skr5kp86";
       };
       packageRequires = [ ];
       meta = {
@@ -5755,10 +5776,10 @@
     elpaBuild {
       pname = "matlab-mode";
       ename = "matlab-mode";
-      version = "8.1.2.0.20260315.82315";
+      version = "8.2.0.0.20260419.100405";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/matlab-mode-8.1.2.0.20260315.82315.tar";
-        sha256 = "06wa3mzqr3scxq5gzh7gwkf148x6iqvymb6bj7yrgnqcnylgy3cw";
+        url = "https://elpa.gnu.org/devel/matlab-mode-8.2.0.0.20260419.100405.tar";
+        sha256 = "114s5ra2h4d8k0qn27blb8bzxjjlcgrrkmg1y647m2kzwfbp8hx5";
       };
       packageRequires = [ ];
       meta = {
@@ -5776,10 +5797,10 @@
     elpaBuild {
       pname = "mct";
       ename = "mct";
-      version = "1.1.0.0.20260204.175531";
+      version = "1.1.0.0.20260413.54251";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/mct-1.1.0.0.20260204.175531.tar";
-        sha256 = "1fd1nd013g3ayd3ckkjp4b6b2nf96rxfjgcs16w0f5x2zxrbkhw0";
+        url = "https://elpa.gnu.org/devel/mct-1.1.0.0.20260413.54251.tar";
+        sha256 = "1wlyg28xcyig05248nic6jia4zw0q5k0rg8l3facskisbhild7dz";
       };
       packageRequires = [ ];
       meta = {
@@ -5921,16 +5942,17 @@
       elpaBuild,
       fetchurl,
       lib,
+      transient,
     }:
     elpaBuild {
       pname = "minimail";
       ename = "minimail";
-      version = "0.3.0.20260330.82338";
+      version = "0.4.2.0.20260428.192238";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/minimail-0.3.0.20260330.82338.tar";
-        sha256 = "01fi88flq91m7fhg7q1g7jx4fzli99k9i48bavbsnjyhbz77i8pq";
+        url = "https://elpa.gnu.org/devel/minimail-0.4.2.0.20260428.192238.tar";
+        sha256 = "0wd5nay9x0sqr7l96ibi554qab5mfgh3dw493rcw7cs3cwiwsvhm";
       };
-      packageRequires = [ ];
+      packageRequires = [ transient ];
       meta = {
         homepage = "https://elpa.gnu.org/devel/minimail.html";
         license = lib.licenses.free;
@@ -5969,10 +5991,10 @@
     elpaBuild {
       pname = "minuet";
       ename = "minuet";
-      version = "0.7.1.0.20260318.10537";
+      version = "0.7.1.0.20260424.3009";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/minuet-0.7.1.0.20260318.10537.tar";
-        sha256 = "1s41pg3fpzjkk7qav3z8yqcgr6isx2a8gl63nfcc16m7hc868bga";
+        url = "https://elpa.gnu.org/devel/minuet-0.7.1.0.20260424.3009.tar";
+        sha256 = "0g9vqm9wby07pmhc6ai31krk473lif74273qbjrfzxzqbg4iavbk";
       };
       packageRequires = [
         dash
@@ -6036,10 +6058,10 @@
     elpaBuild {
       pname = "modus-themes";
       ename = "modus-themes";
-      version = "5.2.0.0.20260405.181509";
+      version = "5.2.0.0.20260418.131316";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/modus-themes-5.2.0.0.20260405.181509.tar";
-        sha256 = "0hzl0dppxh91zz868g7cvgrg3dy4whfqll38n39xdqz52wb25vj6";
+        url = "https://elpa.gnu.org/devel/modus-themes-5.2.0.0.20260418.131316.tar";
+        sha256 = "1qcb53pp05bk2fpjmli68kbmpk4wk8b7ll6iimvmgw8nlq4qzlhb";
       };
       packageRequires = [ ];
       meta = {
@@ -6378,10 +6400,10 @@
     elpaBuild {
       pname = "notmuch-indicator";
       ename = "notmuch-indicator";
-      version = "1.3.0.0.20260118.63859";
+      version = "1.3.0.0.20260413.54903";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/notmuch-indicator-1.3.0.0.20260118.63859.tar";
-        sha256 = "037k14ipdns0wwb0qssz805km2fd781y86d7dfwjzbfjpab0b7jy";
+        url = "https://elpa.gnu.org/devel/notmuch-indicator-1.3.0.0.20260413.54903.tar";
+        sha256 = "091rlqqp7ngff0x1f8fh6axyyzbxrdvwnjqyqly5axazv8sm846n";
       };
       packageRequires = [ ];
       meta = {
@@ -6591,10 +6613,10 @@
     elpaBuild {
       pname = "org";
       ename = "org";
-      version = "10.0pre0.20260406.143941";
+      version = "10.0pre0.20260421.184316";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-10.0pre0.20260406.143941.tar";
-        sha256 = "1yfs2s356ngz0h24771px3kqv4n5kp3pvimbl16ai39yq7cz06wd";
+        url = "https://elpa.gnu.org/devel/org-10.0pre0.20260421.184316.tar";
+        sha256 = "0809x9rw2smb5ya3x2272qcjjj6kx6xrj8ajlzzwiz2m1wdhz5w3";
       };
       packageRequires = [ ];
       meta = {
@@ -6832,10 +6854,10 @@
     elpaBuild {
       pname = "org-transclusion";
       ename = "org-transclusion";
-      version = "1.4.0.0.20260310.65912";
+      version = "1.4.0.0.20260417.100318";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20260310.65912.tar";
-        sha256 = "00cbsqj3cvyzsxf3fxq5wxflsah10f8g97iy5ab51kkc9hkqr90g";
+        url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20260417.100318.tar";
+        sha256 = "1vbgvzqaxrih3r749w5hs724aph6xjiqzg6qf8zb5xz0iy2q20yh";
       };
       packageRequires = [ org ];
       meta = {
@@ -7450,10 +7472,10 @@
     elpaBuild {
       pname = "posframe";
       ename = "posframe";
-      version = "1.5.1.0.20260302.25154";
+      version = "1.5.1.0.20260423.21349";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/posframe-1.5.1.0.20260302.25154.tar";
-        sha256 = "0wy3gk16sbx48aw6a9p3w648lcwgcm9lgvp4drgg1ik2r034lbq6";
+        url = "https://elpa.gnu.org/devel/posframe-1.5.1.0.20260423.21349.tar";
+        sha256 = "0ylxj2spphywm7851lyrki34gkcznjd24xpd75f47pa1wcplkc48";
       };
       packageRequires = [ ];
       meta = {
@@ -7621,10 +7643,10 @@
     elpaBuild {
       pname = "pulsar";
       ename = "pulsar";
-      version = "1.3.4.0.20260228.81404";
+      version = "1.3.4.0.20260421.185730";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/pulsar-1.3.4.0.20260228.81404.tar";
-        sha256 = "10s74i456hwxcr909x1ckaaqxfhkpzprv8c7x5ggy1gia4gi8lfg";
+        url = "https://elpa.gnu.org/devel/pulsar-1.3.4.0.20260421.185730.tar";
+        sha256 = "100nyvpnap1bjc5k4ryni0h43dpacw1nbc6kyz73q82m19m78cnx";
       };
       packageRequires = [ ];
       meta = {
@@ -7884,10 +7906,10 @@
     elpaBuild {
       pname = "realgud";
       ename = "realgud";
-      version = "1.6.0.0.20260407.121006";
+      version = "1.6.0.0.20260411.181642";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/realgud-1.6.0.0.20260407.121006.tar";
-        sha256 = "08ypm3jsgmg7asgh6qbmfvz07clacmpaaphjmf46a7k1vn4lpyk9";
+        url = "https://elpa.gnu.org/devel/realgud-1.6.0.0.20260411.181642.tar";
+        sha256 = "11rs4xcy7xz2ckvpii33mmy04flwfladpi5j70bxc5anmhn5fh68";
       };
       packageRequires = [
         load-relative
@@ -8573,10 +8595,10 @@
     elpaBuild {
       pname = "site-lisp";
       ename = "site-lisp";
-      version = "0.3.0.0.20251230.232614";
+      version = "0.3.0.0.20260411.104225";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/site-lisp-0.3.0.0.20251230.232614.tar";
-        sha256 = "0j6gv9ccjfix0dslqfkf5n0w2x13k7a1ilq2y09k66ymcyvinkf9";
+        url = "https://elpa.gnu.org/devel/site-lisp-0.3.0.0.20260411.104225.tar";
+        sha256 = "0vasl2ya4vfhprpbhnydkzjm07lsdlfgpsb3gdqzllpd77fmjnfx";
       };
       packageRequires = [ ];
       meta = {
@@ -9399,10 +9421,10 @@
     elpaBuild {
       pname = "termint";
       ename = "termint";
-      version = "0.2.0.20251215.233408";
+      version = "0.2.2.0.20260411.234846";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/termint-0.2.0.20251215.233408.tar";
-        sha256 = "07zysh8rx2lrdkkg9xiqc0wqzqaydl07wsg42rn2jbwm7vd7h3fm";
+        url = "https://elpa.gnu.org/devel/termint-0.2.2.0.20260411.234846.tar";
+        sha256 = "0xsrqxgndzmxskcmfx4184nb7yvwmv9lqdy40cjhpc8f3xwmzqwq";
       };
       packageRequires = [ ];
       meta = {
@@ -9569,10 +9591,10 @@
     elpaBuild {
       pname = "tmr";
       ename = "tmr";
-      version = "1.3.0.0.20260326.104345";
+      version = "1.3.0.0.20260423.190529";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/tmr-1.3.0.0.20260326.104345.tar";
-        sha256 = "0b28pbpv0z474kqazx60l26zgqm60naymflx3vidf0gmi5zqh1j5";
+        url = "https://elpa.gnu.org/devel/tmr-1.3.0.0.20260423.190529.tar";
+        sha256 = "1m6ymyrv2fc8j22w12ppj2l1j6cczld8kd6hn2imbxga04knni9z";
       };
       packageRequires = [ ];
       meta = {
@@ -9767,10 +9789,10 @@
     elpaBuild {
       pname = "transient";
       ename = "transient";
-      version = "0.12.0.0.20260409.182552";
+      version = "0.13.0.0.20260422.164634";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/transient-0.12.0.0.20260409.182552.tar";
-        sha256 = "045vj0i21n5p2cxhckr3vpk1vrmh6icj0lsn45jx7c65bxszqxli";
+        url = "https://elpa.gnu.org/devel/transient-0.13.0.0.20260422.164634.tar";
+        sha256 = "1mqky3s852p8fw9h9s2wqn7f40fbk8zy5rz9yxwq88w55nyw2kw5";
       };
       packageRequires = [
         compat
@@ -10124,10 +10146,10 @@
     elpaBuild {
       pname = "valign";
       ename = "valign";
-      version = "3.1.1.0.20251228.153858";
+      version = "3.1.1.0.20260416.235856";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20251228.153858.tar";
-        sha256 = "1ah9qdxlc2m6k536dyc6pfxvh1jmbfxcpcybka4r447dssq5ysfz";
+        url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20260416.235856.tar";
+        sha256 = "1apwa8sb1bpsrkk81q0z9qir71s5naiva16hn2vdjrn4cd1kzcdb";
       };
       packageRequires = [ ];
       meta = {
@@ -10210,10 +10232,10 @@
     elpaBuild {
       pname = "vc-jj";
       ename = "vc-jj";
-      version = "0.5.0.20260407.140853";
+      version = "0.5.0.20260416.141453";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vc-jj-0.5.0.20260407.140853.tar";
-        sha256 = "14yi8wirqbz3k07lxyzm26vif4cny4abfwv5i27wpfzcahb8x0k1";
+        url = "https://elpa.gnu.org/devel/vc-jj-0.5.0.20260416.141453.tar";
+        sha256 = "0x5qj0a77wjfqxyr8wv9gswm205jj52cihlpmbkspn01a93ljr04";
       };
       packageRequires = [ compat ];
       meta = {
@@ -10343,10 +10365,10 @@
     elpaBuild {
       pname = "vertico";
       ename = "vertico";
-      version = "2.8.0.20260330.62818";
+      version = "2.8.0.20260419.183845";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/vertico-2.8.0.20260330.62818.tar";
-        sha256 = "0qj9z9r9ili22d3jaxa1br4ldhjx0hfw8wc619idy712g6lh954a";
+        url = "https://elpa.gnu.org/devel/vertico-2.8.0.20260419.183845.tar";
+        sha256 = "0mxhmknbx9sjsvxz9mc5vvg8pag9ijll0s71c2in307scdmp3lvk";
       };
       packageRequires = [ compat ];
       meta = {
@@ -10495,10 +10517,10 @@
     elpaBuild {
       pname = "wcheck-mode";
       ename = "wcheck-mode";
-      version = "2021.0.20260321.190237";
+      version = "2026.0.20260412.44645";
       src = fetchurl {
-        url = "https://elpa.gnu.org/devel/wcheck-mode-2021.0.20260321.190237.tar";
-        sha256 = "0q5fwg35dgv886x7fqn6rsyp6yw9qcq4hhamdjdz98r6hg40y666";
+        url = "https://elpa.gnu.org/devel/wcheck-mode-2026.0.20260412.44645.tar";
+        sha256 = "0gbx80sv5kg8jnk5vzr3hr4lc25rhyl6jva14nr2c2v6bidfi97x";
       };
       packageRequires = [ ];
       meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index 30bd1e7f56c0..1b3e77cf6319 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -2078,10 +2078,10 @@
     elpaBuild {
       pname = "denote-markdown";
       ename = "denote-markdown";
-      version = "0.2.1";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/denote-markdown-0.2.1.tar";
-        sha256 = "1vrnvrcqdwvczls6dc351izvv2ljva3g4si9k6k177pr0r7cvpgv";
+        url = "https://elpa.gnu.org/packages/denote-markdown-0.2.2.tar";
+        sha256 = "1nb5rcjgkhw3nl2jva6lyblmfsl24cdryx3c16w8ydbx6fswhjpj";
       };
       packageRequires = [ denote ];
       meta = {
@@ -2549,6 +2549,27 @@
       };
     }
   ) { };
+  dmsg = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dmsg";
+      ename = "dmsg";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dmsg-0.2.tar";
+        sha256 = "18wnbkd707n2qh9an72wizs0yp71hys6vg0y02iclqmj7igjg28k";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dmsg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
   do-at-point = callPackage (
     {
       elpaBuild,
@@ -3226,10 +3247,10 @@
     elpaBuild {
       pname = "emms";
       ename = "emms";
-      version = "25";
+      version = "26";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/emms-25.tar";
-        sha256 = "1p194bgysn0mmnaz0n9j236dmz53dlyg202xgq03bi5sl7lrffgp";
+        url = "https://elpa.gnu.org/packages/emms-26.tar";
+        sha256 = "0qcdhml0y69xjaa9l7jb1dsvqij1ksgw2x44zhxfn4f3fwkfxhd5";
       };
       packageRequires = [
         cl-lib
@@ -4256,10 +4277,10 @@
     elpaBuild {
       pname = "gtags-mode";
       ename = "gtags-mode";
-      version = "1.9.4";
+      version = "1.9.5";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/gtags-mode-1.9.4.tar";
-        sha256 = "01bpgw839gkvy8258kc5p0zy8xv9rh4hpzb0h1hlxcllkir6idgg";
+        url = "https://elpa.gnu.org/packages/gtags-mode-1.9.5.tar";
+        sha256 = "1qb1wcim2abjprmn2bsc6d7vmad217fkc450dgwgxxx5spjgz40d";
       };
       packageRequires = [ ];
       meta = {
@@ -4810,10 +4831,10 @@
     elpaBuild {
       pname = "jarchive";
       ename = "jarchive";
-      version = "0.11.0";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/jarchive-0.11.0.tar";
-        sha256 = "17klpdrv74hgpwnhknbihg90j6sbikf4j62lq0vbfv3s7r0a0gb8";
+        url = "https://elpa.gnu.org/packages/jarchive-0.12.0.tar";
+        sha256 = "04r47jj42crpvix55gfkbc15q0fnps2n1jsgf3z82734qwp9dxmi";
       };
       packageRequires = [ ];
       meta = {
@@ -5068,10 +5089,10 @@
     elpaBuild {
       pname = "kubed";
       ename = "kubed";
-      version = "0.5.1";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/kubed-0.5.1.tar";
-        sha256 = "1mfb9961xi7b7a4g3687y4hhlq37j98qsvq8cl4gsgy3x8j7vs2p";
+        url = "https://elpa.gnu.org/packages/kubed-0.6.1.tar";
+        sha256 = "1filhadwzdkrw2dsma28b10nx62qnhxkp8g483r0il986ipnnshp";
       };
       packageRequires = [ ];
       meta = {
@@ -5671,10 +5692,10 @@
     elpaBuild {
       pname = "matlab-mode";
       ename = "matlab-mode";
-      version = "8.1.2";
+      version = "8.2.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/matlab-mode-8.1.2.tar";
-        sha256 = "17s568gnfx0d6s411wpj033a39iik9bsk1w2xkwvgnxwdvw0haxh";
+        url = "https://elpa.gnu.org/packages/matlab-mode-8.2.0.tar";
+        sha256 = "1dk39r9nkm77gllm4xln0am1b73pirds5ss7m55n7hz2w1sas20s";
       };
       packageRequires = [ ];
       meta = {
@@ -5837,16 +5858,17 @@
       elpaBuild,
       fetchurl,
       lib,
+      transient,
     }:
     elpaBuild {
       pname = "minimail";
       ename = "minimail";
-      version = "0.3";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/minimail-0.3.tar";
-        sha256 = "1p8vk9z34ylzg9hvs88wik07m5mr72bqkh19kngw7gqlg0m2ydfp";
+        url = "https://elpa.gnu.org/packages/minimail-0.4.2.tar";
+        sha256 = "1ri424g6v55405d4zr4qhnvdswd5hc9n4hs2xds40ps0h6qp05hm";
       };
-      packageRequires = [ ];
+      packageRequires = [ transient ];
       meta = {
         homepage = "https://elpa.gnu.org/packages/minimail.html";
         license = lib.licenses.free;
@@ -6483,10 +6505,10 @@
     elpaBuild {
       pname = "org";
       ename = "org";
-      version = "9.8.1";
+      version = "9.8.3";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/org-9.8.1.tar";
-        sha256 = "1i7khz2h47byl4kh9kb0y548sw7n4zp6nfldqkvzab4np4snbdk8";
+        url = "https://elpa.gnu.org/packages/org-9.8.3.tar";
+        sha256 = "0csfrn0k1fysjfwf8xmdnmizfjz62scr3kjawpafwv58gvizk32z";
       };
       packageRequires = [ ];
       meta = {
@@ -9163,10 +9185,10 @@
     elpaBuild {
       pname = "termint";
       ename = "termint";
-      version = "0.2";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/termint-0.2.tar";
-        sha256 = "000s1z2535bi5pkg7q3d4y97njy0r5xj51r94a20vjd79jq4227f";
+        url = "https://elpa.gnu.org/packages/termint-0.2.2.tar";
+        sha256 = "0iavnximqsx6vl6yx36n829h67x4pyfmm8xcp5fzjwphdmgfdann";
       };
       packageRequires = [ ];
       meta = {
@@ -9531,10 +9553,10 @@
     elpaBuild {
       pname = "transient";
       ename = "transient";
-      version = "0.12.0";
+      version = "0.13.0";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/transient-0.12.0.tar";
-        sha256 = "0ml92xzbs57npwwyp46p03kd9xi9lhr5hvbrw6nayyc51hm4c7vk";
+        url = "https://elpa.gnu.org/packages/transient-0.13.0.tar";
+        sha256 = "0rwb7l823d4nkk7zmnyi5j7id7kswxrc0h9crqyd63n14w78bksi";
       };
       packageRequires = [
         compat
@@ -10263,10 +10285,10 @@
     elpaBuild {
       pname = "wcheck-mode";
       ename = "wcheck-mode";
-      version = "2021";
+      version = "2026";
       src = fetchurl {
-        url = "https://elpa.gnu.org/packages/wcheck-mode-2021.tar";
-        sha256 = "0igsdsfw80nnrbw1ba3rgwp16ncy195kwv78ll9zbbf3y23n7kr0";
+        url = "https://elpa.gnu.org/packages/wcheck-mode-2026.tar";
+        sha256 = "019lsaihpl9w17qfhn8c5j8rp8nrvlmb16w6r8sb1iril31997sz";
       };
       packageRequires = [ ];
       meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
new file mode 100644
index 000000000000..7d93f45ed037
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  fetchFromGitHub,
+  melpaBuild,
+  nix-update-script,
+  stdenv,
+  zig_0_15,
+  emacs,
+}:
+
+let
+  zig = zig_0_15;
+
+  pname = "ghostel";
+
+  version = "0.18.1-unstable-2026-04-24";
+
+  src = fetchFromGitHub {
+    owner = "dakra";
+    repo = "ghostel";
+    rev = "fdfb68f70ca6f43277ef8a0ba4103631857e4ad4";
+    hash = "sha256-u3zUj5uUHqFEP7mjmADNB6n6n/LmGR6ne0ylalop8WI=";
+  };
+
+  module = stdenv.mkDerivation (finalAttrs: {
+    inherit pname version src;
+
+    deps = zig.fetchDeps {
+      inherit (finalAttrs) src pname version;
+      fetchAll = true;
+      hash = "sha256-ghN/UMACgkFQQEr4nH5gbbJbt/+2bz6tL2bJpbw9mGE=";
+    };
+
+    nativeBuildInputs = [ zig ];
+
+    env.EMACS_INCLUDE_DIR = "${emacs}/include";
+
+    postConfigure = ''
+      cp -rLT ${finalAttrs.deps} "$ZIG_GLOBAL_CACHE_DIR/p"
+      chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p"
+    '';
+  });
+
+  libExt = stdenv.hostPlatform.extensions.sharedLibrary;
+in
+melpaBuild {
+  inherit pname version src;
+
+  files = ''
+    (:defaults "etc" "ghostel-module${libExt}")
+  '';
+
+  preBuild = ''
+    install ${module}/lib/libghostel-module${libExt} ghostel-module${libExt}
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
+
+    inherit module;
+  };
+
+  meta = {
+    homepage = "https://github.com/dakra/ghostel";
+    description = "Terminal emulator powered by libghostty";
+    maintainers = with lib.maintainers; [ vonfry ];
+    license = lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index ebb4ea03ae4f..e48cc56a2c3e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -1194,6 +1194,13 @@ let
           # https://github.com/syl20bnr/flymake-elixir/issues/4
           flymake-elixir = addPackageRequires super.flymake-elixir [ self.flymake-easy ];
 
+          flymake-hadolint = super.flymake-hadolint.overrideAttrs (attrs: {
+            postPatch = attrs.postPatch or "" + ''
+              substituteInPlace flymake-hadolint.el \
+                --replace-fail 'flymake-hadolint-program "hadolint"' 'flymake-hadolint-program "${lib.getExe pkgs.hadolint}"'
+            '';
+          });
+
           flyparens = ignoreCompilationError super.flyparens; # elisp error
 
           fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
index ef6b6334b37e..f870cacfbf89 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
@@ -473,7 +473,6 @@
   ) { };
   boxquote = callPackage (
     {
-      cl-lib ? null,
       elpaBuild,
       fetchurl,
       lib,
@@ -481,12 +480,12 @@
     elpaBuild {
       pname = "boxquote";
       ename = "boxquote";
-      version = "2.3.0.20231216.85245";
+      version = "2.4.1.0.20260415.194925";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/boxquote-2.3.0.20231216.85245.tar";
-        sha256 = "1b5kqxpvxfzq8n0q1bqjbyb0vmrsdm02qfai28ihxqixk4q8czbi";
+        url = "https://elpa.nongnu.org/nongnu-devel/boxquote-2.4.1.0.20260415.194925.tar";
+        sha256 = "1ywdip0h1cip8wbva4dwva2gss7wakjapf8fqc795d9izyvgmx0f";
       };
-      packageRequires = [ cl-lib ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu-devel/boxquote.html";
         license = lib.licenses.free;
@@ -502,10 +501,10 @@
     elpaBuild {
       pname = "buttercup";
       ename = "buttercup";
-      version = "1.39.0.20260409.235427";
+      version = "1.40.0.20260411.203013";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.39.0.20260409.235427.tar";
-        sha256 = "03fk6mhf67jccilkjfs7jwzs6la4ry4z8s5v1q7fci2jic3911y8";
+        url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.40.0.20260411.203013.tar";
+        sha256 = "13s30dv7vhzbm80f4brza2mk7lpf3l7ffbzbjv4ln2s8rgsh6g64";
       };
       packageRequires = [ ];
       meta = {
@@ -567,10 +566,10 @@
     elpaBuild {
       pname = "casual";
       ename = "casual";
-      version = "2.15.0.0.20260406.163831";
+      version = "2.16.0.0.20260415.182614";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/casual-2.15.0.0.20260406.163831.tar";
-        sha256 = "14vgq4q3k264aizqxjlfjjm5s4m7089nj3pjbjvzzs4kfkhpnqkk";
+        url = "https://elpa.nongnu.org/nongnu-devel/casual-2.16.0.0.20260415.182614.tar";
+        sha256 = "0a0ba4b506pbv4nff8qspqjfzlfng77i3nqs3vwg1ybz6rhj7cwj";
       };
       packageRequires = [
         csv-mode
@@ -620,10 +619,10 @@
     elpaBuild {
       pname = "cider";
       ename = "cider";
-      version = "1.22.0snapshot0.20260402.44710";
+      version = "1.22.0snapshot0.20260420.43551";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.22.0snapshot0.20260402.44710.tar";
-        sha256 = "01i63fnilk7s1yswpbwxx2v0h8dafyyang2b23z15j0qhk18frlv";
+        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.22.0snapshot0.20260420.43551.tar";
+        sha256 = "14vhww7sm3hzvrag671m8l4sbh4mi4iy395vnqhpyn6wxp0z9m91";
       };
       packageRequires = [
         clojure-mode
@@ -713,10 +712,10 @@
     elpaBuild {
       pname = "cond-let";
       ename = "cond-let";
-      version = "0.2.2.0.20260201.150042";
+      version = "0.2.2.0.20260420.135245";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/cond-let-0.2.2.0.20260201.150042.tar";
-        sha256 = "0fy4kji48wj5v1jf78kmd011v5v4q5b5n32mhhixv83243hng2fb";
+        url = "https://elpa.nongnu.org/nongnu-devel/cond-let-0.2.2.0.20260420.135245.tar";
+        sha256 = "1zm81zgmf5k6akh4pngjln1xp7p561h97hkcrsbc78v7nq48x8kb";
       };
       packageRequires = [ ];
       meta = {
@@ -1665,10 +1664,10 @@
     elpaBuild {
       pname = "evil-matchit";
       ename = "evil-matchit";
-      version = "4.1.0.0.20260409.93607";
+      version = "4.1.0.0.20260412.3556";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-4.1.0.0.20260409.93607.tar";
-        sha256 = "0yn15q7vd5gq2ks4gnrgpsh1np26wwgl3s99plbsr3bzhgr0phxl";
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-4.1.0.0.20260412.3556.tar";
+        sha256 = "0pzpzlix9l3rv1g1giibhhmxwczsg8i0zjibjszds0agcyl2p7dg";
       };
       packageRequires = [ ];
       meta = {
@@ -1799,10 +1798,10 @@
     elpaBuild {
       pname = "exec-path-from-shell";
       ename = "exec-path-from-shell";
-      version = "2.2.0.20251113.132402";
+      version = "2.2.0.20260423.183347";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20251113.132402.tar";
-        sha256 = "0brfbnxa36rvql03l7pq8wja520yjzmayhfxzh94sirs4f3s5yhl";
+        url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20260423.183347.tar";
+        sha256 = "0s80hah6795p2k97qpnqj3baaw1cy9c54g38vbcczq4mn8faimk6";
       };
       packageRequires = [ ];
       meta = {
@@ -2367,10 +2366,10 @@
     elpaBuild {
       pname = "geiser-stklos";
       ename = "geiser-stklos";
-      version = "1.8.0.20240521.161150";
+      version = "1.8.0.20260411.100856";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/geiser-stklos-1.8.0.20240521.161150.tar";
-        sha256 = "13y0p8iqm4lrjg5ksb8d3rgpmjs0kwak7zicdq5m7sx1x511znd7";
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-stklos-1.8.0.20260411.100856.tar";
+        sha256 = "0mv74swpi87jkn3zmvljayppr3wn01niv9lnnhsdz29wb7gn9x0f";
       };
       packageRequires = [ geiser ];
       meta = {
@@ -2620,10 +2619,10 @@
     elpaBuild {
       pname = "gptel";
       ename = "gptel";
-      version = "0.9.9.4.0.20260410.1136";
+      version = "0.9.9.4.0.20260422.5643";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.4.0.20260410.1136.tar";
-        sha256 = "0z9wxzqmlm9r0pnmsgfjd4cpnywg42b6ip8pcy2732v9sry88mfh";
+        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.4.0.20260422.5643.tar";
+        sha256 = "07drqy9aksqsvfgg7a6r7bp430qccs6bngrs367dp0vr46mx6kw0";
       };
       packageRequires = [
         compat
@@ -2817,10 +2816,10 @@
     elpaBuild {
       pname = "helm";
       ename = "helm";
-      version = "4.0.6.0.20260214.143216";
+      version = "4.0.6.0.20260424.61638";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.6.0.20260214.143216.tar";
-        sha256 = "0v1j7vvpw5m6cjrbmzbjssw8n7r4ipxkzwl13z351lqx81q27p9b";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.6.0.20260424.61638.tar";
+        sha256 = "1h45ffmj2myiv1yg0gy1kfxwky41xfzdzy4vhzc67w1a6g6kh9jq";
       };
       packageRequires = [
         helm-core
@@ -2842,10 +2841,10 @@
     elpaBuild {
       pname = "helm-core";
       ename = "helm-core";
-      version = "4.0.6.0.20260214.143216";
+      version = "4.0.6.0.20260424.61638";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.6.0.20260214.143216.tar";
-        sha256 = "09rmliclxhzbai5cgy3f1bg1y9nk6a3xig79iz6yxfc26qs1kkh2";
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.6.0.20260424.61638.tar";
+        sha256 = "1484qsigbybnxlcb0jrx8v62fa7dqv7szia7p1lghp3q76cjlfv7";
       };
       packageRequires = [ async ];
       meta = {
@@ -3162,10 +3161,10 @@
     elpaBuild {
       pname = "isl";
       ename = "isl";
-      version = "1.6.0.20260225.43822";
+      version = "1.6.0.20260414.62054";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/isl-1.6.0.20260225.43822.tar";
-        sha256 = "05fq6l8c8w4bkfkh2cmmmdnjwa6hmfpv00avkp6r5fz4v9fnkvwq";
+        url = "https://elpa.nongnu.org/nongnu-devel/isl-1.6.0.20260414.62054.tar";
+        sha256 = "149fcgwl3r5wiw8zwb1cgy4g96nv90a8wpjk8qh0dgcdz1vgsiqq";
       };
       packageRequires = [ ];
       meta = {
@@ -3231,10 +3230,10 @@
     elpaBuild {
       pname = "jabber";
       ename = "jabber";
-      version = "0.10.5.0.20260410.45349";
+      version = "0.10.5.0.20260423.192938";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.10.5.0.20260410.45349.tar";
-        sha256 = "07nnqk811i6vvzanqh4ymnj43797fahic1n8h4pazdpibx71p0g2";
+        url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.10.5.0.20260423.192938.tar";
+        sha256 = "1q79iv4znishj6rdz1m76r0c8h72i2g47xfh6xfw2gqxbkkyilv3";
       };
       packageRequires = [ fsm ];
       meta = {
@@ -3586,10 +3585,10 @@
     elpaBuild {
       pname = "magit";
       ename = "magit";
-      version = "4.5.0.0.20260409.85727";
+      version = "4.5.0.0.20260422.220622";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.5.0.0.20260409.85727.tar";
-        sha256 = "1hpmc3v9pgdlrkddxikj238r7z6fhpfspx083jrjn51pcpjinkyp";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-4.5.0.0.20260422.220622.tar";
+        sha256 = "1sm2ixy8hnamzvapy4i2j58ydharg47xb3s1981yr2d948dl2kxd";
       };
       packageRequires = [
         compat
@@ -3619,10 +3618,10 @@
     elpaBuild {
       pname = "magit-section";
       ename = "magit-section";
-      version = "4.5.0.0.20260409.85727";
+      version = "4.5.0.0.20260422.220622";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.5.0.0.20260409.85727.tar";
-        sha256 = "0kxyw9c6xm6v8pzh575ys0w56pdjgyr4b9x1i9qwnv8yhampp2y0";
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.5.0.0.20260422.220622.tar";
+        sha256 = "13hzbc26wi6llab43gy8m6jpnm5faji7bqk5xlaxwinfqhzjfb2a";
       };
       packageRequires = [
         compat
@@ -3645,10 +3644,10 @@
     elpaBuild {
       pname = "markdown-mode";
       ename = "markdown-mode";
-      version = "2.9alpha0.20260321.14320";
+      version = "2.9alpha0.20260423.150805";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.9alpha0.20260321.14320.tar";
-        sha256 = "1a0a9d199fkkxv73fdvy1x985r0x5z4q1s48axgwh7rsv24pvbqp";
+        url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.9alpha0.20260423.150805.tar";
+        sha256 = "1ap384fyxbny1pn59grjj6x8y29hcfl1vlhim4r177j2killr4sh";
       };
       packageRequires = [ ];
       meta = {
@@ -3849,10 +3848,10 @@
     elpaBuild {
       pname = "multiple-cursors";
       ename = "multiple-cursors";
-      version = "1.5.0.0.20260117.123334";
+      version = "1.5.0.0.20260419.93113";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.5.0.0.20260117.123334.tar";
-        sha256 = "1qnn3zx296zjvs9y10gq9a7n9ja68ipsvk0qbh48ib6z8n0b4sgh";
+        url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.5.0.0.20260419.93113.tar";
+        sha256 = "0qbgka567dd72y9mlm46kwf11rdjk9s94z4vqn73kmk0k15zjg82";
       };
       packageRequires = [ cl-lib ];
       meta = {
@@ -4075,10 +4074,10 @@
     elpaBuild {
       pname = "org-journal";
       ename = "org-journal";
-      version = "2.2.0.0.20251203.115702";
+      version = "2.2.0.0.20260413.140147";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/org-journal-2.2.0.0.20251203.115702.tar";
-        sha256 = "1rdrkfhk9rj7a7r520x1n7i3ddpd122gknvw7bi1ab76rnq95zyl";
+        url = "https://elpa.nongnu.org/nongnu-devel/org-journal-2.2.0.0.20260413.140147.tar";
+        sha256 = "164mdrjiziklhvsz98i9pb01520y8r81ji7vbzkvpnxp1ia8a2m4";
       };
       packageRequires = [ org ];
       meta = {
@@ -4461,10 +4460,10 @@
     elpaBuild {
       pname = "pg";
       ename = "pg";
-      version = "0.64.0.20260406.70807";
+      version = "0.65.0.20260421.212130";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/pg-0.64.0.20260406.70807.tar";
-        sha256 = "1cb0grckwbh5xibka5nsxzl3r65hiph4xc1dph3y5la503czjj9h";
+        url = "https://elpa.nongnu.org/nongnu-devel/pg-0.65.0.20260421.212130.tar";
+        sha256 = "13a88q1hx7mkc58a3ry5ym56kn5ppqr32j18n2ms69a5if301nhs";
       };
       packageRequires = [ peg ];
       meta = {
@@ -4793,6 +4792,7 @@
   ) { };
   rpm-spec-mode = callPackage (
     {
+      compat,
       elpaBuild,
       fetchurl,
       lib,
@@ -4800,12 +4800,12 @@
     elpaBuild {
       pname = "rpm-spec-mode";
       ename = "rpm-spec-mode";
-      version = "0.16.0.20250329.13938";
+      version = "0.16.0.20260423.74352";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode-0.16.0.20250329.13938.tar";
-        sha256 = "1gmqnv1ckypns7aiz4w5kb3l8m66bfxlw8z19i3ag5im8rlpc9lp";
+        url = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode-0.16.0.20260423.74352.tar";
+        sha256 = "0pqq31x60g3ig7fmd4jh7kjz051m020kqs3pfpbiznwhjh8v63ad";
       };
-      packageRequires = [ ];
+      packageRequires = [ compat ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode.html";
         license = lib.licenses.free;
@@ -4842,10 +4842,10 @@
     elpaBuild {
       pname = "rust-mode";
       ename = "rust-mode";
-      version = "1.0.6.0.20260227.53908";
+      version = "1.0.6.0.20260416.50503";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20260227.53908.tar";
-        sha256 = "06ajn9j2dyjbqm87800fbqa0ixrvxz44x23cxp1901vrqwfdmw60";
+        url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20260416.50503.tar";
+        sha256 = "12bcjfi7s7gisx31rwncvcs7j7m57kcs7rs5jfhmmpfsm8n24yba";
       };
       packageRequires = [ ];
       meta = {
@@ -5038,10 +5038,10 @@
     elpaBuild {
       pname = "slime";
       ename = "slime";
-      version = "2.32snapshot0.20260329.213326";
+      version = "2.32snapshot0.20260421.225639";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.32snapshot0.20260329.213326.tar";
-        sha256 = "0327cbysrbizyf3r8crlmcd1wdsxkk29df98gwrrr1w6cvx3162v";
+        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.32snapshot0.20260421.225639.tar";
+        sha256 = "0gqj2nd82wljvfrqwah3qczkjq8q4i1k3cprypydxzlfh45k13jf";
       };
       packageRequires = [ macrostep ];
       meta = {
@@ -5123,10 +5123,10 @@
     elpaBuild {
       pname = "spacemacs-theme";
       ename = "spacemacs-theme";
-      version = "0.2.0.20251221.165628";
+      version = "0.2.0.20260414.205200";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20251221.165628.tar";
-        sha256 = "16d4g4cyjij8s7pzf0g0pnbsfxzxw8lwdamwaq4whmn5g320yb28";
+        url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20260414.205200.tar";
+        sha256 = "076nbpp16wy6j9ic3bhj9cj58bmah6ivhh842lkh7y7lgp6f7q7j";
       };
       packageRequires = [ ];
       meta = {
@@ -5249,10 +5249,10 @@
     elpaBuild {
       pname = "subed";
       ename = "subed";
-      version = "1.4.1.0.20260403.230353";
+      version = "1.4.2.0.20260418.123100";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/subed-1.4.1.0.20260403.230353.tar";
-        sha256 = "0cwp2cyhxiv4wl2rq7jip9864hcbhh3af9prmm347jkxv9wzhyk7";
+        url = "https://elpa.nongnu.org/nongnu-devel/subed-1.4.2.0.20260418.123100.tar";
+        sha256 = "1xdz1vglwza0lik5zqx6f8x8w3a7yq8x7wkd7zr5k932pjmhqbnd";
       };
       packageRequires = [ ];
       meta = {
@@ -5314,10 +5314,10 @@
     elpaBuild {
       pname = "symbol-overlay";
       ename = "symbol-overlay";
-      version = "4.3.0.20240913.162400";
+      version = "4.3.0.20260423.145452";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.3.0.20240913.162400.tar";
-        sha256 = "0i5rs6cqfjl1c6m8wf0wwlzbsc7zvw9x0b8g8rds9n5c23b7gv15";
+        url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.3.0.20260423.145452.tar";
+        sha256 = "16gm3gj84wd7v6qhf3p0sz2jgbbyi60kqwkb41rfiz7n79qlijpg";
       };
       packageRequires = [ seq ];
       meta = {
@@ -5575,10 +5575,10 @@
     elpaBuild {
       pname = "treesit-fold";
       ename = "treesit-fold";
-      version = "0.2.1.0.20260226.70748";
+      version = "0.2.1.0.20260417.100827";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20260226.70748.tar";
-        sha256 = "017af28xvnkqzqwxzcwiw4hsvmfwvbn1np5gqc54fybrpa9lkkzs";
+        url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20260417.100827.tar";
+        sha256 = "04v6yqj6a4aahff2kbpmj3k8jzqxa6idfgpfsd6l98yb3kqldil7";
       };
       packageRequires = [ ];
       meta = {
@@ -5660,10 +5660,10 @@
     elpaBuild {
       pname = "typst-ts-mode";
       ename = "typst-ts-mode";
-      version = "0.12.2.0.20260330.125224";
+      version = "0.12.2.0.20260415.103532";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.2.0.20260330.125224.tar";
-        sha256 = "0qjbypy1jxy7jcpvqh49b8d3b276qgbzlpj09g0bw9dz2g0mp6pr";
+        url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.2.0.20260415.103532.tar";
+        sha256 = "190jabvm3p74cd96rrbj45y68myg32zvlxjrq01zvi3jv29xbpf6";
       };
       packageRequires = [ ];
       meta = {
@@ -5808,10 +5808,10 @@
     elpaBuild {
       pname = "vm";
       ename = "vm";
-      version = "8.3.3snapshot0.20260225.71602";
+      version = "8.3.3snapshot0.20260420.63204";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.3snapshot0.20260225.71602.tar";
-        sha256 = "1w6p8cygsvwzzci2fjjy4rysb6n888frsa1ay99p66x8kq5s7n50";
+        url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.3snapshot0.20260420.63204.tar";
+        sha256 = "03804kmfwp994szv5gdgsg1sxmmdhzam8aq17r402chj6lhpla1x";
       };
       packageRequires = [ vcard ];
       meta = {
@@ -5940,10 +5940,10 @@
     elpaBuild {
       pname = "with-editor";
       ename = "with-editor";
-      version = "3.4.9.0.20260301.131715";
+      version = "3.4.9.0.20260422.182143";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.9.0.20260301.131715.tar";
-        sha256 = "1cf3xgaqbczsd77h5psdk6q5407nrmkzj9s5zf77g7zs0xwdi317";
+        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.9.0.20260422.182143.tar";
+        sha256 = "10zb39gwdbamb11msxkayzspi09fpagip93xm90lc39w850xmbbm";
       };
       packageRequires = [ compat ];
       meta = {
@@ -6050,10 +6050,10 @@
     elpaBuild {
       pname = "xah-fly-keys";
       ename = "xah-fly-keys";
-      version = "28.11.20260215192642.0.20260215.201333";
+      version = "28.11.20260416140940.0.20260416.141130";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.11.20260215192642.0.20260215.201333.tar";
-        sha256 = "08pdqfglkl150pw43llm5z3a2mpzdil315a732i7fa4a27qwkxfn";
+        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.11.20260416140940.0.20260416.141130.tar";
+        sha256 = "0mrfn3z60jgk2f9lccb3qcaa52rvh366ys97ypz5lgjlxal1sr5r";
       };
       packageRequires = [ ];
       meta = {
@@ -6114,10 +6114,10 @@
     elpaBuild {
       pname = "yaml-mode";
       ename = "yaml-mode";
-      version = "0.0.16.0.20241003.15333";
+      version = "0.0.16.0.20260420.21817";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20241003.15333.tar";
-        sha256 = "1c6lid3iwxa911zk579rvy1dq8azq6xmp0s6lahchkcq40dvbjl5";
+        url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20260420.21817.tar";
+        sha256 = "1lbh8w21g897zvi9lys47kj5vkgpr9ifp8lgpr5jcxvsrj0xbayv";
       };
       packageRequires = [ ];
       meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index 12c42b25af99..e5dfa1df3392 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -473,7 +473,6 @@
   ) { };
   boxquote = callPackage (
     {
-      cl-lib ? null,
       elpaBuild,
       fetchurl,
       lib,
@@ -481,12 +480,12 @@
     elpaBuild {
       pname = "boxquote";
       ename = "boxquote";
-      version = "2.3";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/boxquote-2.3.tar";
-        sha256 = "0fsvfy5b4k0h6fxmvvdngxap5pfypm8iik0m1jq70za7n7g8qvmy";
+        url = "https://elpa.nongnu.org/nongnu/boxquote-2.4.1.tar";
+        sha256 = "18gwx8dh2xbr90m1mvmp5jb8ssyn5cmq833sd4nsa76i021yh1l6";
       };
-      packageRequires = [ cl-lib ];
+      packageRequires = [ ];
       meta = {
         homepage = "https://elpa.nongnu.org/nongnu/boxquote.html";
         license = lib.licenses.free;
@@ -502,10 +501,10 @@
     elpaBuild {
       pname = "buttercup";
       ename = "buttercup";
-      version = "1.39";
+      version = "1.40";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/buttercup-1.39.tar";
-        sha256 = "0a2yj10jrql77l0dqyf95yzb6cd8z7z9p9jjc6lb7z8j26m208sj";
+        url = "https://elpa.nongnu.org/nongnu/buttercup-1.40.tar";
+        sha256 = "09r1yp05m7p6906isz1x6dhc7mrxsdisxa19a8py73gqsm1ymf1c";
       };
       packageRequires = [ ];
       meta = {
@@ -567,10 +566,10 @@
     elpaBuild {
       pname = "casual";
       ename = "casual";
-      version = "2.15.0";
+      version = "2.16.0";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/casual-2.15.0.tar";
-        sha256 = "1ydd6ilxh5msh5l1f86b2mi963hls4m5aipshfc0bygwfh83m7s0";
+        url = "https://elpa.nongnu.org/nongnu/casual-2.16.0.tar";
+        sha256 = "1s0d5c3aacyh1n5qy7ka4xwnmdbx3qrh0z0z41bc958zmay6mgpa";
       };
       packageRequires = [
         csv-mode
@@ -4483,10 +4482,10 @@
     elpaBuild {
       pname = "pg";
       ename = "pg";
-      version = "0.64";
+      version = "0.65";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/pg-0.64.tar";
-        sha256 = "1dip1s8l2im8j40hgn3jrqrb8mbly2wfd5fy4vmz9mn4axnxdvkn";
+        url = "https://elpa.nongnu.org/nongnu/pg-0.65.tar";
+        sha256 = "1gf93xsldhx105r5m03hiq3lzlzb3r5pjd3j99jl0gs3z8pmn8ic";
       };
       packageRequires = [ peg ];
       meta = {
@@ -5266,10 +5265,10 @@
     elpaBuild {
       pname = "subed";
       ename = "subed";
-      version = "1.4.1";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/subed-1.4.1.tar";
-        sha256 = "11rg436w2rdcpiix5hzmdb7r736nhiqpm4h8b18ac7dv6nnjjnwd";
+        url = "https://elpa.nongnu.org/nongnu/subed-1.4.2.tar";
+        sha256 = "0crpgxqk164z602iajhx7b0zxdjs5f9g8hv0q6n1vjrsby87pl1x";
       };
       packageRequires = [ ];
       meta = {
@@ -6090,10 +6089,10 @@
     elpaBuild {
       pname = "xah-fly-keys";
       ename = "xah-fly-keys";
-      version = "28.11.20260215192642";
+      version = "28.11.20260416140940";
       src = fetchurl {
-        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.11.20260215192642.tar";
-        sha256 = "0k0p60wirvp36ifaqkq6420rxfj1ys4cb8j34q7rhcbdfw1cp9dd";
+        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.11.20260416140940.tar";
+        sha256 = "0zzdwrd4h12bqlxzpj7xs4m5cdgx9nbljrnyld6qs5b19352izyl";
       };
       packageRequires = [ ];
       meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index f2d14052d625..4487c767c79c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -318,8 +318,8 @@
   "repo": "abstools/abs-mode",
   "unstable": {
    "version": [
-    20260211,
-    1320
+    20260415,
+    813
    ],
    "deps": [
     "erlang",
@@ -327,8 +327,8 @@
     "maude-mode",
     "yasnippet"
    ],
-   "commit": "aaf97a11ef799d424f34de9a651dcbe601e85b63",
-   "sha256": "0gfn3q11gl2kl885vmcby0w5l7jsm58drq0ksm9qhr0nzjg000zl"
+   "commit": "a4b8d0caa61db2f37b77e15055fad8324c35f4ae",
+   "sha256": "0cwq38g33dxxa2mwyn7h0prlq0gc831b6z2yrpfbvrbvm1iq7jy3"
   },
   "stable": {
    "version": [
@@ -2144,6 +2144,24 @@
    "sha256": "17l6j83i2xm3agrrbmg2pwccim6y9f65b1vsripv95fyxhp6l1mm"
   }
  },
+ {
+  "ename": "agent-recall",
+  "commit": "a135127179bcb1d309be1929c19250df99c9462c",
+  "sha256": "18ph8dhgx3gv82a3cm2d08p197zc3g79dgfcbn3id7wma06znp35",
+  "fetcher": "github",
+  "repo": "Marx-A00/agent-recall",
+  "unstable": {
+   "version": [
+    20260420,
+    1713
+   ],
+   "deps": [
+    "agent-shell"
+   ],
+   "commit": "a90c86c53e65f95fd19c67587ba7d904b939db3d",
+   "sha256": "15p23fvf6mc461j5rl4jzhhq2lkznfllhrcd9pagzzqwp0mjy8l1"
+  }
+ },
  {
   "ename": "agent-shell",
   "commit": "1895e21adfb5e4dfccb4d4db49c213c77fc57727",
@@ -2152,15 +2170,15 @@
   "repo": "xenodium/agent-shell",
   "unstable": {
    "version": [
-    20260408,
-    1635
+    20260423,
+    2254
    ],
    "deps": [
     "acp",
     "shell-maker"
    ],
-   "commit": "7f106a355295d6c0fde5cd589cf566df7850463f",
-   "sha256": "1s1v7jd39jjml9al3vmjrpigg64vy4b9x3y450bhm7gfx59jgj0s"
+   "commit": "21a8c8b4e735cf3f35ac857b4857817971432265",
+   "sha256": "0f8ds25x4fl1195jm4jn13wx791zn76my26f9xnxfslmiam6f36a"
   },
   "stable": {
    "version": [
@@ -2218,6 +2236,40 @@
    "sha256": "1mlvdxs4jbxxfj57h2hc6yapgz4zzqj80k4psds116kpp0y2r5ja"
   }
  },
+ {
+  "ename": "agitjo",
+  "commit": "354d1a22c8a95f74c4826d9e611766bdcfd6fd43",
+  "sha256": "0ps9gx5bbwcagd19c95f015k3fxy6kzr56jw7c1wwmahslmzkgsk",
+  "fetcher": "codeberg",
+  "repo": "halvin/agitjo",
+  "unstable": {
+   "version": [
+    20260415,
+    1451
+   ],
+   "deps": [
+    "magit",
+    "markdown-mode",
+    "transient"
+   ],
+   "commit": "47f20e04ed09724b0859cade3cb52eae31274c13",
+   "sha256": "046fcrhm0fhnq2fygbswbcyl21davbjirjl9mq7cdx5cl5x4kg5q"
+  },
+  "stable": {
+   "version": [
+    2,
+    0,
+    0
+   ],
+   "deps": [
+    "magit",
+    "markdown-mode",
+    "transient"
+   ],
+   "commit": "47f20e04ed09724b0859cade3cb52eae31274c13",
+   "sha256": "046fcrhm0fhnq2fygbswbcyl21davbjirjl9mq7cdx5cl5x4kg5q"
+  }
+ },
  {
   "ename": "agtags",
   "commit": "eb6677262303a0cad2d844db77693c00d9bc575a",
@@ -2319,27 +2371,27 @@
   "repo": "tninja/ai-code-interface.el",
   "unstable": {
    "version": [
-    20260410,
-    1636
+    20260423,
+    1511
    ],
    "deps": [
     "magit",
     "transient"
    ],
-   "commit": "7f3f558eb81b724f4f1f0a6bc59a699f4aa890a5",
-   "sha256": "1w9swqy7yqx7dlcs3yf54v43flsmzrq222dqlwc9rq88rf1q8mql"
+   "commit": "bb725e376479d0c6ac50f47fd89b7f8972db2465",
+   "sha256": "0lzxd2v7v5fysna2ywh8zks5s51kf2naqw9mp3mcmbx482n5sv86"
   },
   "stable": {
    "version": [
     1,
-    68
+    74
    ],
    "deps": [
     "magit",
     "transient"
    ],
-   "commit": "a15f64f697604818a3c769a6034dde8d13f6f89d",
-   "sha256": "1p9dhg7q16ynsyvx2f2c14b37cvi59hrvj9sc7c664zv7vmf60br"
+   "commit": "e44a49ef51ab795538cb39238c9290c0ac2783c9",
+   "sha256": "1ra6r227d5b7g0rynb8a3ngb9cpa3zjjjrbvb778bkc3h1fr6mz6"
   }
  },
  {
@@ -3544,28 +3596,28 @@
   "repo": "kickingvegas/anju",
   "unstable": {
    "version": [
-    20260405,
-    131
+    20260424,
+    156
    ],
    "deps": [
     "casual",
     "markdown-mode"
    ],
-   "commit": "9b50c67292189b599dcb17108f93be520caa5647",
-   "sha256": "1da3fq3085pp14rryq9cxc71gwyi2wipfwml361zalx54gpdbk3j"
+   "commit": "7a700608e9143f8e29a533bdeee9a6f175df6d06",
+   "sha256": "1gfwd0j1bwnggj0sjw1kcwx462qcvxjg1px2vfzmsh41zbxlv02x"
   },
   "stable": {
    "version": [
     1,
-    1,
+    2,
     0
    ],
    "deps": [
     "casual",
     "markdown-mode"
    ],
-   "commit": "9b50c67292189b599dcb17108f93be520caa5647",
-   "sha256": "1da3fq3085pp14rryq9cxc71gwyi2wipfwml361zalx54gpdbk3j"
+   "commit": "7a700608e9143f8e29a533bdeee9a6f175df6d06",
+   "sha256": "1gfwd0j1bwnggj0sjw1kcwx462qcvxjg1px2vfzmsh41zbxlv02x"
   }
  },
  {
@@ -4124,11 +4176,11 @@
   "repo": "radian-software/apheleia",
   "unstable": {
    "version": [
-    20260313,
-    35
+    20260422,
+    253
    ],
-   "commit": "e6e5d5523d229735ab5f8ec83e10beefcfd00d76",
-   "sha256": "1yf8ccaidk4swk67bhssgkslb6ymz6smhcqr2mpy13v4dp53zn7g"
+   "commit": "1720200b1271a9e70ebfc86c0f942ff02aefcdd1",
+   "sha256": "19wwb71v7jpwhrk3y1pn39sb0knizfg1vrgscflgvcgk3qc8l3kr"
   },
   "stable": {
    "version": [
@@ -4807,20 +4859,20 @@
   "url": "https://git.isincredibly.gay/srxl/astro-ts-mode.git",
   "unstable": {
    "version": [
-    20250308,
-    2341
+    20260417,
+    101
    ],
-   "commit": "886d692378d0da2071e710c1e6db02e5b2e0dd30",
-   "sha256": "07qdklcw6sfqw9d7yw32qylwaj8w4is6cfm59idhbcgwjlayw08c"
+   "commit": "1d24c9d399dee4cfea6ed9b49d8e08891665e16c",
+   "sha256": "1cm5ykq70d8346kfpd9zghb0pl9a2p4gckbqx44sqjvb5s2kip8w"
   },
   "stable": {
    "version": [
     3,
     0,
-    1
+    2
    ],
-   "commit": "886d692378d0da2071e710c1e6db02e5b2e0dd30",
-   "sha256": "07qdklcw6sfqw9d7yw32qylwaj8w4is6cfm59idhbcgwjlayw08c"
+   "commit": "1d24c9d399dee4cfea6ed9b49d8e08891665e16c",
+   "sha256": "1cm5ykq70d8346kfpd9zghb0pl9a2p4gckbqx44sqjvb5s2kip8w"
   }
  },
  {
@@ -5002,14 +5054,14 @@
   "repo": "Anoncheg1/emacs-async1",
   "unstable": {
    "version": [
-    20250929,
-    1752
+    20260421,
+    2116
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ab8786693f7750f65fbfea07702fece812c57248",
-   "sha256": "0kcgg653bvw9vdvimr1jir04cpgn2iigdjzh763jg8rz6xrjx5gm"
+   "commit": "88cccffe14bdd0a61dbb2e33edf8c335706f24dc",
+   "sha256": "0nljffwjdkcnsp4plkrsm6rfwhpdaixx22507vqf017f0n4jcn71"
   },
   "stable": {
    "version": [
@@ -6236,26 +6288,26 @@
   "repo": "ncaq/auto-sudoedit",
   "unstable": {
    "version": [
-    20230907,
-    724
+    20260420,
+    832
    ],
    "deps": [
     "f"
    ],
-   "commit": "1caa127db200f86d1cfdeaae4410a673f0ae11e0",
-   "sha256": "14rdkb4dg3vszj2yjqdijq6d73qaag0mmn7bl6a2vhc0b60lr5kj"
+   "commit": "b792e82a2e55be18c5fe945213325d6c84a2813c",
+   "sha256": "1d9hkgy19kwcwh7s1gspab6nrnj7s4d0ja0bqdldi5s0whd7iidp"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    2
    ],
    "deps": [
     "f"
    ],
-   "commit": "738fd22452f00fa05daf200f997cb5db2531a211",
-   "sha256": "1rhdvrj2rjbvl7vkb0wcp6krqxcaigl7jk9z8yvhx6s4cm2qli6q"
+   "commit": "b792e82a2e55be18c5fe945213325d6c84a2813c",
+   "sha256": "1d9hkgy19kwcwh7s1gspab6nrnj7s4d0ja0bqdldi5s0whd7iidp"
   }
  },
  {
@@ -7282,11 +7334,11 @@
   "repo": "tinted-theming/base16-emacs",
   "unstable": {
    "version": [
-    20260308,
-    202
+    20260419,
+    235
    ],
-   "commit": "bc203c6dd6de644eadda6af53d818bd04ba0d726",
-   "sha256": "03qifq69mhn2gvskzf0pjc2p973m6aa7vkpym4rsk6l8g0rwk4la"
+   "commit": "8461432c62353f302b79bf0b2db2f99b83183dbe",
+   "sha256": "1n36k7fax231x07n82licps5kvm682nz1adr93ly7np5434m0926"
   },
   "stable": {
    "version": [
@@ -7445,6 +7497,30 @@
    "sha256": "1bnv8kkg6yy09kxns78xlbl0vwc5dz0azvgvry2a0361f48f0315"
   }
  },
+ {
+  "ename": "batppuccin",
+  "commit": "3217105e265829ec768b58afcfb75322f4d6fb99",
+  "sha256": "05hm4d9qfcy7ai25qzcbbbmp9xsszy1138kf4069cj0dyw3fjw0p",
+  "fetcher": "github",
+  "repo": "bbatsov/batppuccin-emacs",
+  "unstable": {
+   "version": [
+    20260421,
+    1706
+   ],
+   "commit": "4e9c240c332e745d58cf47ad900fdeefb01f707a",
+   "sha256": "0xlhiybbnxgjgiqh88h9fp8q5gdkgwrjir2pm3afqmrhhzr3d933"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "commit": "cc5241879121b30f395327659a3224a91b104a9a",
+   "sha256": "11pgjcg2llkkfjl016i4y2gd17sx3l4x9naks808rkfk9r0an3mm"
+  }
+ },
  {
   "ename": "bats-mode",
   "commit": "d742fb825e163beb33c3873aa48a1c411711e312",
@@ -7522,11 +7598,11 @@
   "repo": "bazelbuild/emacs-bazel-mode",
   "unstable": {
    "version": [
-    20260402,
-    1058
+    20260416,
+    2100
    ],
-   "commit": "7cf45ca39ec415373db2a86134e43aaa5fbf236b",
-   "sha256": "1v8hs6kpnkwsxssrf8m3alhb3cknhjihg98h7xaxf55m6wi13pbc"
+   "commit": "da1b5bb6fae06b3c9805116114da5acfe5e62817",
+   "sha256": "1wr10qva61xqas93ijaf2h0n4nin7g39g96y174njd10p2p9g7zp"
   }
  },
  {
@@ -7908,6 +7984,25 @@
    "sha256": "0i1jgjdv5vsmbryx3qk2a02l7186qd8pmd8ikhz9qmzkxhfmsw45"
   }
  },
+ {
+  "ename": "ben",
+  "commit": "a8c8dab8bcc0d2c4671a42c5c1c7e5613ea22a73",
+  "sha256": "14i42m1m4w22qaa14bbh80gnrix5942d1hwy33rjs1l3nz7cllhp",
+  "fetcher": "codeberg",
+  "repo": "pastor/ben.el",
+  "unstable": {
+   "version": [
+    20260424,
+    826
+   ],
+   "deps": [
+    "inheritenv",
+    "seq"
+   ],
+   "commit": "139dcfef116e376138abddc7cc179cbe68f457fd",
+   "sha256": "0mscx327acxv74c54lnb0xzsqnkbzrkrwngw6qkrkbqsllbyagwc"
+  }
+ },
  {
   "ename": "benchmark-init",
   "commit": "54b9ae6fc10b0c56fcc7a0ad73743ffc85a3e9a0",
@@ -8950,11 +9045,11 @@
   "repo": "gdonald/blackjack-el",
   "unstable": {
    "version": [
-    20230821,
-    41
+    20260418,
+    1402
    ],
-   "commit": "7f9072630a159b59a146346b5dae24ab8fb5f290",
-   "sha256": "1wnm2v9cv0idyks8q6qrxrsby0adpap5ywy9ab602jjidf6ajxm4"
+   "commit": "3930d197d1f8f37de0dbb6c9875ef5279e16cdfa",
+   "sha256": "0zxpiz9kjicyf2lhq2rclj2cqaf3f518xwlm48dcrkr1hjn6yqac"
   },
   "stable": {
    "version": [
@@ -9217,14 +9312,14 @@
   "repo": "lapislazuli/blue.el",
   "unstable": {
    "version": [
-    20260308,
-    905
+    20260422,
+    644
    ],
    "deps": [
     "magit-section"
    ],
-   "commit": "dfac707031b7f460440a088e18b1f6185ff18007",
-   "sha256": "0yczp2jbxz27baangsq5iylskmnkvpds3v08jfmmck1i7shc83c3"
+   "commit": "16c7092e7483cf7b29511374bbc8c80a1359b6b9",
+   "sha256": "1f0glcg6y081wqgidakn56bdy6cx87fxw4zhdxc4l0vcsr98rc7m"
   }
  },
  {
@@ -9627,15 +9722,15 @@
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20260401,
-    1217
+    20260422,
+    1711
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "8d0e26e6c16c1e503785b3e6b62a9a6d55b4e472",
-   "sha256": "094ykn4niknciqy71v74ry70imj6xri6wrm477yavwanzdr4b2rc"
+   "commit": "5aa950cf07c3f16528232a81dcedd792f74c0471",
+   "sha256": "1ygv5hvbr9ygkdab4mqc94f6z7h10yfbllxv8v48wfx902ys4wjs"
   },
   "stable": {
    "version": [
@@ -9713,25 +9808,20 @@
   "repo": "davep/boxquote.el",
   "unstable": {
    "version": [
-    20231216,
-    852
+    20260415,
+    1949
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "8d6c307ab3b783c5042065d0ae54961adb506484",
-   "sha256": "1i3i9v09y6f03w5i9n9n4k9v31bxnsy81ys35iapa918d74lcvf3"
+   "commit": "eb14169161ddeba9a703c42f7352cb52f732cc86",
+   "sha256": "1n9d84mwmniggf4fvwi2chm8vinqf5vl0nn3lg0shd8gi5k1m4gl"
   },
   "stable": {
    "version": [
     2,
-    3
+    4,
+    1
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "fe676396fa7e4372e01bf2c3d9a62e8d53615d46",
-   "sha256": "0d7m9kcwhbgv4pikaa2dzlg9zkmwdhyx2ksn68di6xzbh838892q"
+   "commit": "eb14169161ddeba9a703c42f7352cb52f732cc86",
+   "sha256": "1n9d84mwmniggf4fvwi2chm8vinqf5vl0nn3lg0shd8gi5k1m4gl"
   }
  },
  {
@@ -10190,24 +10280,6 @@
    "sha256": "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28"
   }
  },
- {
-  "ename": "buck",
-  "commit": "b34c31c4ef9c491968e33161fd46f4f3bb761152",
-  "sha256": "0a04y4ki8hx7afvl1n7ma2ivsy8smqm7mxpbi33lp8f6f2zlfs1h",
-  "fetcher": "github",
-  "repo": "emacsattic/buck",
-  "unstable": {
-   "version": [
-    20250620,
-    1333
-   ],
-   "deps": [
-    "ghub"
-   ],
-   "commit": "3b6bd10ad5e7e6bf1ec36dce55b2b77545ec73e2",
-   "sha256": "0dlsrd2kfavvzhdvkjs1j80iaqwjxh4q2ppvihyabli14arjv4k1"
-  }
- },
  {
   "ename": "buckwalter",
   "commit": "7dd38487731cc978e104afa39f8954cfc33ba27f",
@@ -10903,19 +10975,19 @@
   "repo": "jorgenschaefer/emacs-buttercup",
   "unstable": {
    "version": [
-    20260409,
-    2354
+    20260411,
+    2019
    ],
-   "commit": "7baf9e5a60f201542309238d77aa6bb35bd77ec0",
-   "sha256": "0gvxlwhzz8ghfhx47n10k57jdaawjmnfwiywdp5m4jhxzn9i4sg2"
+   "commit": "57d03004cc730678bcdefb91ad294824975cfea4",
+   "sha256": "1b55cfh4wr40max2c42crvaa6wid7a83g28yximsin98i32q5f5r"
   },
   "stable": {
    "version": [
     1,
-    39
+    40
    ],
-   "commit": "7baf9e5a60f201542309238d77aa6bb35bd77ec0",
-   "sha256": "0gvxlwhzz8ghfhx47n10k57jdaawjmnfwiywdp5m4jhxzn9i4sg2"
+   "commit": "57d03004cc730678bcdefb91ad294824975cfea4",
+   "sha256": "1b55cfh4wr40max2c42crvaa6wid7a83g28yximsin98i32q5f5r"
   }
  },
  {
@@ -11539,8 +11611,8 @@
   "repo": "chenyanming/calibredb.el",
   "unstable": {
    "version": [
-    20250913,
-    1233
+    20260412,
+    622
    ],
    "deps": [
     "dash",
@@ -11550,13 +11622,13 @@
     "s",
     "transient"
    ],
-   "commit": "99a234167a092bc0017d11c814f0b8c0da53a107",
-   "sha256": "0jkhaf5h2qcqz8nvw80wj0xjazdpm2l9n0d5a41p20gnz54rhkbd"
+   "commit": "af6fc49edf72f0ebc42d9d3983ad00c268541092",
+   "sha256": "0ba6iqhb94a3rlkbp0v3bp6pk68yp7mmxcq8hvl51543q9w88310"
   },
   "stable": {
    "version": [
     2,
-    13,
+    14,
     0
    ],
    "deps": [
@@ -11567,8 +11639,8 @@
     "s",
     "transient"
    ],
-   "commit": "a12746cdd2605eba0ff88706473a04492dec84a2",
-   "sha256": "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m"
+   "commit": "926add4f17c1d367d4ea89c33049d2c12ffd7410",
+   "sha256": "1g0jg6a6fgvxd5bsydckbqwf899d2d9732laz4k1k476mbws5dqy"
   }
  },
  {
@@ -11741,14 +11813,14 @@
   "repo": "minad/cape",
   "unstable": {
    "version": [
-    20260311,
-    1654
+    20260419,
+    1847
    ],
    "deps": [
     "compat"
    ],
-   "commit": "a326a0575fe5ca574f6607557dbb8bd6ce83dbbd",
-   "sha256": "1a6h79v6jpr0k6p01f4ndfkxbi51yw3wsj94k54b8vasd4kbrhzb"
+   "commit": "2e15e1909754752f66096dde1b8d639d6eb25f35",
+   "sha256": "0lhjavwiyp5vd9i6xcr1g4mcb53fxmqyq0yx5f5sp00mcp6y3kg5"
   },
   "stable": {
    "version": [
@@ -12069,28 +12141,28 @@
   "repo": "kickingvegas/casual",
   "unstable": {
    "version": [
-    20260406,
-    2338
+    20260416,
+    126
    ],
    "deps": [
     "csv-mode",
     "transient"
    ],
-   "commit": "81e032d24c46159cc98ec5248e48ee3659025ad0",
-   "sha256": "1hcpjb33mzqhwkzcsad1nkfp1gr4jd226l8x1fglaynz0a4dkad8"
+   "commit": "6a3fbb40d3369614f36d9a37035942fa57572c5b",
+   "sha256": "06i7zv7x8cs87qjpvsjqg2bi68pyw2j0z9pnzbsjj81pafmm2xdy"
   },
   "stable": {
    "version": [
     2,
-    15,
+    16,
     0
    ],
    "deps": [
     "csv-mode",
     "transient"
    ],
-   "commit": "81e032d24c46159cc98ec5248e48ee3659025ad0",
-   "sha256": "1hcpjb33mzqhwkzcsad1nkfp1gr4jd226l8x1fglaynz0a4dkad8"
+   "commit": "6a3fbb40d3369614f36d9a37035942fa57572c5b",
+   "sha256": "06i7zv7x8cs87qjpvsjqg2bi68pyw2j0z9pnzbsjj81pafmm2xdy"
   }
  },
  {
@@ -12712,16 +12784,16 @@
   "repo": "worr/cfn-mode",
   "unstable": {
    "version": [
-    20260315,
-    907
+    20260419,
+    807
    ],
    "deps": [
     "f",
     "s",
     "yaml-mode"
    ],
-   "commit": "56bec3710bee04349aae12b2d22d0ec875bd7934",
-   "sha256": "17is38g5fi3zhj43bmgxnm48816ba6xvkfzmk935rp7d6dh6xzp9"
+   "commit": "2813707d1f2c98562fa873624abc79ce49db969c",
+   "sha256": "0kc3mb0q86wc9ajmdvb26wpd0fg4gllgg8s3pfb49w8qgz7z02ba"
   },
   "stable": {
    "version": [
@@ -13673,8 +13745,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20260402,
-    444
+    20260417,
+    1318
    ],
    "deps": [
     "clojure-mode",
@@ -13686,8 +13758,8 @@
     "spinner",
     "transient"
    ],
-   "commit": "a569a5ffd9959b3e7a3ada57884b5c00530cbcb3",
-   "sha256": "0giwj6bpmbqbxzhlnfxrq7lyxl8cyri8j9xm19v9fvvrxy1glwgf"
+   "commit": "b9e8a26197f5a2a6a8d1dfb21ef5eae6fe17e0b6",
+   "sha256": "11v3d5gl4p2iqfym9nxcdwyvyyzal9dkri6wwfd74w0cgkgrlw46"
   },
   "stable": {
    "version": [
@@ -14190,6 +14262,25 @@
    "sha256": "1kz2blk3dyzc35wp226ax8g6dipvvnsm1q5s4zf9qf1by96k5qd2"
   }
  },
+ {
+  "ename": "citar-vulpea",
+  "commit": "44ef6cd065f3f462186c7b758b3b9545f4aad95c",
+  "sha256": "1hcpybw8l26abd0ai348z1krqmr2hhax92fnv9h76isagwyq736d",
+  "fetcher": "github",
+  "repo": "fabcontigiani/citar-vulpea",
+  "unstable": {
+   "version": [
+    20260414,
+    1628
+   ],
+   "deps": [
+    "citar",
+    "vulpea"
+   ],
+   "commit": "44ee8c1366687213afdeca20b1889cdcd822237a",
+   "sha256": "1vc34ahbk73c7hg3n1dx29171vl8fcq2lpff5r133p6pj9fzfbkj"
+  }
+ },
  {
   "ename": "citeproc",
   "commit": "20aa56e9a4809cee1082224b1b4e65921a48bda1",
@@ -15535,20 +15626,20 @@
   "url": "https://gitlab.kitware.com/cmake/cmake.git",
   "unstable": {
    "version": [
-    20260327,
-    1308
+    20260421,
+    1337
    ],
-   "commit": "3a7d797d5b217e4cf375135831a6424c09df7d29",
-   "sha256": "0lm6y4fwly1j68njpj8g1x4am5w9sllrd8nmd6a07cjx8crbf2fl"
+   "commit": "8d3c68cc0f36108f7ebb23ba7a6bc08b9b1d81e4",
+   "sha256": "15q1qgjsgqzirq6f59q6y402bhcw6q3pvmpdh8zs5va70a37p7j5"
   },
   "stable": {
    "version": [
     4,
     3,
-    1
+    2
    ],
-   "commit": "3a7d797d5b217e4cf375135831a6424c09df7d29",
-   "sha256": "0lm6y4fwly1j68njpj8g1x4am5w9sllrd8nmd6a07cjx8crbf2fl"
+   "commit": "8d3c68cc0f36108f7ebb23ba7a6bc08b9b1d81e4",
+   "sha256": "15q1qgjsgqzirq6f59q6y402bhcw6q3pvmpdh8zs5va70a37p7j5"
   }
  },
  {
@@ -16381,6 +16472,21 @@
    "sha256": "1f0155fyvh1m20ahl6wqask4qx6jp3lfwxj894cda9j4y8gnr5iq"
   }
  },
+ {
+  "ename": "comet-trail",
+  "commit": "ba6a664dd5926c4326acc158d7e518428ff4cd26",
+  "sha256": "1xwvgfj7kd9rm0hcnby1f3x9czra75nmnz75laqvba9my6hcsrba",
+  "fetcher": "git",
+  "url": "https://git.andros.dev/andros/comet-trail.el",
+  "unstable": {
+   "version": [
+    20260413,
+    747
+   ],
+   "commit": "6bb17b3672d421f2456bf69f76138ef5b0f48647",
+   "sha256": "14ni1d417cs1ig53h5nnbsvclv4a92s684fwqbyli3hpaq2banf6"
+  }
+ },
  {
   "ename": "comint-histories",
   "commit": "0402a9b9a24a0431b01873ebe6c3e50748221133",
@@ -18602,20 +18708,20 @@
   "repo": "djgoku/compilation-history",
   "unstable": {
    "version": [
-    20260401,
-    547
+    20260413,
+    2031
    ],
-   "commit": "dba6568dc2c56131d811ff951855e6fb69447ed8",
-   "sha256": "1pbiz3bjfflz4yj9p40kwf1sax98fc2ya6a034fvkrlwyg6vrivv"
+   "commit": "cfc37a18469634696761e239d0517cfb96a2ca40",
+   "sha256": "0m2s9q08lnfqcmkaapzhs8jpimk5cn5c4b27j8968qnv9csb75py"
   },
   "stable": {
    "version": [
     0,
     2,
-    6
+    7
    ],
-   "commit": "dba6568dc2c56131d811ff951855e6fb69447ed8",
-   "sha256": "1pbiz3bjfflz4yj9p40kwf1sax98fc2ya6a034fvkrlwyg6vrivv"
+   "commit": "cfc37a18469634696761e239d0517cfb96a2ca40",
+   "sha256": "0m2s9q08lnfqcmkaapzhs8jpimk5cn5c4b27j8968qnv9csb75py"
   }
  },
  {
@@ -18626,11 +18732,11 @@
   "repo": "jamescherti/compile-angel.el",
   "unstable": {
    "version": [
-    20260326,
-    1633
+    20260421,
+    1222
    ],
-   "commit": "520e516fb794336ddaef4a4e7b02e3e9d60eda04",
-   "sha256": "18bhhsw8qfj4rx6fmvr3cp419pw5yn5lfvdwdi8dcczi8bf1f7dh"
+   "commit": "e17764996ec7a0f74f0ad4399cfdd7e44e11d8ae",
+   "sha256": "054546x4d11mrva52kg8ja3ik13v6yii34pnv56ml5wkscpsq2v9"
   },
   "stable": {
    "version": [
@@ -19185,14 +19291,14 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20260407,
-    1530
+    20260421,
+    1105
    ],
    "deps": [
     "compat"
    ],
-   "commit": "20476c690ce3ecd45460011ce6b03fd58a642181",
-   "sha256": "1sxp7yly3kslbx5lm65k64hcjbzgryzp0nalqnjjk2liarqwyr8c"
+   "commit": "14131ab6247e1b4b0f28134fba5e92a4707dbc1d",
+   "sha256": "01bjr30ka1xljwk93yzfqvb210fyc6ln9jik9gi9cinp27hmaap7"
   },
   "stable": {
    "version": [
@@ -20543,14 +20649,14 @@
   "repo": "minad/corfu",
   "unstable": {
    "version": [
-    20260309,
-    1551
+    20260419,
+    1808
    ],
    "deps": [
     "compat"
    ],
-   "commit": "d2a995c5c732d0fc439efe09440870a9de779a74",
-   "sha256": "0hb9ycq6v28nkx0qbczfks4hz26g1d1bdb48ylxb9pd26irxb9pm"
+   "commit": "1466f6f7effc0a783c8acda66471be0db11f789a",
+   "sha256": "1qsq3cay6khphq008nyfybg4iafsmszk9j4dr35sr1bzfdq0wml2"
   },
   "stable": {
    "version": [
@@ -23393,11 +23499,11 @@
   "repo": "grtcdr/darkman.el",
   "unstable": {
    "version": [
-    20241019,
-    1404
+    20260414,
+    1055
    ],
-   "commit": "beb2186e6eaf13ebe1ae56e460bcd1a4c0cb4f07",
-   "sha256": "0mw1rfv0nmpb2h79wg5mk23wr9cfyhgd6jjaxllr8gabkvajpsvg"
+   "commit": "ee99dfcdc1f48330d0fbb565f8db7664eee34643",
+   "sha256": "0yyhpcqwdcmmc4y40v1kqhxlq81pjw9bnpdv4hkv184jf8b0xicm"
   },
   "stable": {
    "version": [
@@ -23537,11 +23643,11 @@
   "repo": "nameiwillforget/d-emacs",
   "unstable": {
    "version": [
-    20260408,
-    738
+    20260421,
+    833
    ],
-   "commit": "c16b966e91a20472dda2f7d671c7b786eb5c1708",
-   "sha256": "04yqyxd0wn665zjngic8pxw14213cakmh0k6naq875pihiqj6v1k"
+   "commit": "8e23c3b0eda55ba9bcdaffa5ab7f179c23012163",
+   "sha256": "0v7zkxdpcr5wgccvz8yiwahb6j2pl89hsjxhzs7ishakxw41asxa"
   }
  },
  {
@@ -25105,11 +25211,11 @@
   "repo": "johannes-mueller/devcontainer.el",
   "unstable": {
    "version": [
-    20260313,
-    1842
+    20260418,
+    621
    ],
-   "commit": "5758aece4911a1d5f93f6c4fb2f50491021ebf40",
-   "sha256": "0xwdbbf6w18myxh75xnb1b4vrrm30zywz6czkl3lkr62d5066nzi"
+   "commit": "bc598413a18baa3ec9ef7e1a0cf0115685d23a22",
+   "sha256": "029cglg8jgi32p68b7rfpslp55ccfky5pwzmwafz75r07zq15x4z"
   }
  },
  {
@@ -26775,27 +26881,28 @@
   "repo": "jojojames/dired-sidebar",
   "unstable": {
    "version": [
-    20250212,
-    629
+    20260415,
+    638
    ],
    "deps": [
     "compat",
     "dired-subtree"
    ],
-   "commit": "3bc8927ed4d14a017eefc75d5af65022343e2ac1",
-   "sha256": "0vdx5sm7kg2xwvndhjsmixfwlsj45gz0wi5a670pr25268f47mp4"
+   "commit": "19cdf0b9ed634efb7ae7047861fbcbd9dc0ee2e9",
+   "sha256": "1jsyrj6mam68klb5ygjks98a4npx85d1xx5viwss2c11zk52699r"
   },
   "stable": {
    "version": [
     0,
-    3,
-    0
+    4,
+    1
    ],
    "deps": [
+    "compat",
     "dired-subtree"
    ],
-   "commit": "702165ad53a473992d84e0207b984b9be5114bde",
-   "sha256": "0f9cikyb53ybsawkm9g1sja2wsz2lmnc9zq63sx2h8d86acza2cp"
+   "commit": "19cdf0b9ed634efb7ae7047861fbcbd9dc0ee2e9",
+   "sha256": "1jsyrj6mam68klb5ygjks98a4npx85d1xx5viwss2c11zk52699r"
   }
  },
  {
@@ -26927,14 +27034,14 @@
   "repo": "Boruch-Baum/emacs-diredc",
   "unstable": {
    "version": [
-    20260317,
-    2222
+    20260414,
+    1238
    ],
    "deps": [
     "key-assist"
    ],
-   "commit": "79a6c6631e8b817419f24d7e85a6f8f75d393e5d",
-   "sha256": "1p5cgi0vs4brz9isj62x4xras1hic1ygnxc7n0wql86aar99j783"
+   "commit": "7bbc7bfa60c2b3c7f39f75e1600b13260315271e",
+   "sha256": "0knsbywpmdb6jbb3frgnl9p6mi6ac2brhajb2rlqxqvr8fx9xz4b"
   },
   "stable": {
    "version": [
@@ -28352,16 +28459,16 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20260410,
-    332
+    20260411,
+    1454
    ],
    "deps": [
     "compat",
     "nerd-icons",
     "shrink-path"
    ],
-   "commit": "2e70c8411be374ce6e29d06da7103e51982191e8",
-   "sha256": "09p6ar68dvi07k6i6firz0xgkks28f15xn7l7jsq8pfh8kfdxpvd"
+   "commit": "870b4b215fda881d29278d81bbab7f934a9bd8b3",
+   "sha256": "15m4c6bafc742cm3mwq9x889c3s96minp6957ipbxyd6qaxzfjly"
   },
   "stable": {
    "version": [
@@ -28446,11 +28553,11 @@
   "repo": "drghirlanda/dorgygen",
   "unstable": {
    "version": [
-    20260226,
-    245
+    20260422,
+    45
    ],
-   "commit": "577c93529479b42ee6188652a21c5f02aefe43df",
-   "sha256": "1hfa1m28mvrjm7id7ikjnxs6vj3my8clw8aj3lhl90w0ki6qdvd1"
+   "commit": "84815fda133c15fe967c6f132e146992827de1c9",
+   "sha256": "0xsljqndjgz9ccx8nslv9kckb6w8cizcqlqglgg2q7bgmhwhg742"
   }
  },
  {
@@ -29258,20 +29365,20 @@
   "repo": "ocaml/dune",
   "unstable": {
    "version": [
-    20260401,
-    1726
+    20260410,
+    1721
    ],
-   "commit": "8aefc6cb021f4c276859c8c07386d1dfbc58cec8",
-   "sha256": "0bdazsd53w12c0ya62azjc39rziixfdrw1xfdibbw7gxixfyf0kl"
+   "commit": "df26745e52be99ecdb2ff994feab1eacd858b226",
+   "sha256": "0gnv5926xmvsna0bvgymj1rr9awkrc9krij6zbjnx90mcf091bsv"
   },
   "stable": {
    "version": [
     3,
     22,
-    1
+    2
    ],
-   "commit": "8aefc6cb021f4c276859c8c07386d1dfbc58cec8",
-   "sha256": "0bdazsd53w12c0ya62azjc39rziixfdrw1xfdibbw7gxixfyf0kl"
+   "commit": "df26745e52be99ecdb2ff994feab1eacd858b226",
+   "sha256": "0gnv5926xmvsna0bvgymj1rr9awkrc9krij6zbjnx90mcf091bsv"
   }
  },
  {
@@ -29914,20 +30021,20 @@
   "repo": "redguardtoo/eacl",
   "unstable": {
    "version": [
-    20220526,
-    1434
+    20260412,
+    237
    ],
-   "commit": "4fe2cafbfeb73d806ebea8801c3522ff2886f30b",
-   "sha256": "05m121lw90rjs1a6wq8gvqxzydm4940x30xp3kh1v5x4zwwcf03b"
+   "commit": "5a304e4655a28cc817b9a633304bd64a5d5ddf53",
+   "sha256": "145z8qv1xmx0y3g00n2jivhzi8h6zc5ai3wfijmijdam0yg377p5"
   },
   "stable": {
    "version": [
     2,
     2,
-    0
+    2
    ],
-   "commit": "a9485331789de245445b2b4a9d5befc7498628a6",
-   "sha256": "1d2krw9x1mw6jn1q07nbq2qi92fms85q3i9wa2q5drs3368l55vr"
+   "commit": "5a304e4655a28cc817b9a633304bd64a5d5ddf53",
+   "sha256": "145z8qv1xmx0y3g00n2jivhzi8h6zc5ai3wfijmijdam0yg377p5"
   }
  },
  {
@@ -30277,11 +30384,11 @@
   "repo": "jamescherti/easysession.el",
   "unstable": {
    "version": [
-    20260408,
-    1450
+    20260421,
+    1132
    ],
-   "commit": "962cf2c6465acc7ef2d7d260240058a98ec2342d",
-   "sha256": "02z5w31sv091yvzhgri2aaparh6m4nhvrhglqia73ly9p7n6jr6s"
+   "commit": "77a55e7ed2ad0ea5b741193a4e5a91c91021387f",
+   "sha256": "0bzc1078r485177nnfsxxjjjxd502cm850jysg57zbwp1yydmzk4"
   },
   "stable": {
    "version": [
@@ -30464,8 +30571,8 @@
   "repo": "editor-code-assistant/eca-emacs",
   "unstable": {
    "version": [
-    20260409,
-    1748
+    20260423,
+    1754
    ],
    "deps": [
     "compat",
@@ -30474,8 +30581,8 @@
     "markdown-mode",
     "s"
    ],
-   "commit": "73d77d635e0cc6daecef879b32057a6008a724ee",
-   "sha256": "082rw6hj66ni4b6mgz072db7c037dy0nyzwknc7n0cc0a7vmh6ia"
+   "commit": "bd5a72aef67eca944a7ad0d9916eb0d0f0f11f9d",
+   "sha256": "0ngap75h8344csabhmf12y4wdii6rxb94yxvdx8aj31kggxaqn6l"
   },
   "stable": {
    "version": [
@@ -31460,26 +31567,26 @@
   "repo": "mwolson/eglot-python-preset",
   "unstable": {
    "version": [
-    20260403,
-    1656
+    20260424,
+    334
    ],
    "deps": [
     "eglot"
    ],
-   "commit": "cf6c57e2010c2fca8eedc756c4759cbd62a6e206",
-   "sha256": "0jq1i3gmczgrq935vhz0f6rgj5dshbq2lv6wcpl424r2r7fr6n1w"
+   "commit": "8219aa2b3d595af42108881b4d26750ec20105b7",
+   "sha256": "1w4vvhdjdv8ny3wg6nlvwjv7mgz0bkdi9pkvi2krzarsk6wlhiv3"
   },
   "stable": {
    "version": [
     0,
-    5,
-    2
+    6,
+    0
    ],
    "deps": [
     "eglot"
    ],
-   "commit": "cf6c57e2010c2fca8eedc756c4759cbd62a6e206",
-   "sha256": "0jq1i3gmczgrq935vhz0f6rgj5dshbq2lv6wcpl424r2r7fr6n1w"
+   "commit": "8219aa2b3d595af42108881b4d26750ec20105b7",
+   "sha256": "1w4vvhdjdv8ny3wg6nlvwjv7mgz0bkdi9pkvi2krzarsk6wlhiv3"
   }
  },
  {
@@ -31558,14 +31665,14 @@
   "repo": "mwolson/eglot-typescript-preset",
   "unstable": {
    "version": [
-    20260403,
-    1656
+    20260417,
+    1841
    ],
    "deps": [
     "eglot"
    ],
-   "commit": "97c673f6408fa35fe859330f6014c35f9dce15a8",
-   "sha256": "0k12kszfg68q343mww7ivacpkw177ca23878v13b8p00xac86app"
+   "commit": "f789a45d98eb4d5cc8129a34893a91bd36abd09c",
+   "sha256": "1jy3hp621p7lh3zrxs7rgq7kajmxb5wvqjfd4flna4vmxrjg4r3q"
   },
   "stable": {
    "version": [
@@ -31741,54 +31848,68 @@
  },
  {
   "ename": "ekg",
-  "commit": "3ed0179db9417cafa5e5fad7fd5c5148c92f3ecc",
-  "sha256": "024yp9v2drqr3a3pi7j3l3iaqn01hv5j8ggq0618yh1lhcwlv076",
+  "commit": "f0dc28550575927664937b68328761b2c0b1f089",
+  "sha256": "1s7gf6ff592jcnw9pvh7bwgsn77hb9mim0ad0207ckrsz1fv7h8g",
   "fetcher": "github",
   "repo": "ahyatt/ekg",
   "unstable": {
    "version": [
-    20260408,
-    1810
+    20260415,
+    39
    ],
    "deps": [
     "llm",
     "triples",
     "vui"
    ],
-   "commit": "cda27dc2be9c08b994b9a4dc8b68f16f4e74c19e",
-   "sha256": "0wpbf4vv311d506djips5v8jr3adz59bsnlbcncx2w3ic5gyhl2y"
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
   },
   "stable": {
    "version": [
     0,
-    8,
+    9,
     0
    ],
    "deps": [
     "llm",
-    "triples"
+    "triples",
+    "vui"
    ],
-   "commit": "f2c52383fe58802807436994709a6f453354690a",
-   "sha256": "0qlg1lksj6cy9fj0ag4c5vr0561j8p52si5hbm571xh40f4pjays"
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
   }
  },
  {
   "ename": "ekg-agent",
-  "commit": "713b74aa342d53ce85cc0560bad29d4f13e0db4f",
-  "sha256": "0xfkm93f81zjfqmfbik2xjq6skandai5fp44b3kcv6r6libx5z51",
+  "commit": "f0dc28550575927664937b68328761b2c0b1f089",
+  "sha256": "0cswwb0r9b801547ny5jbzhpc16w8nrv0k9x5wfq3mgbkcdzbzs9",
   "fetcher": "github",
   "repo": "ahyatt/ekg",
   "unstable": {
    "version": [
-    20260408,
-    1810
+    20260415,
+    39
    ],
    "deps": [
     "ekg",
     "futur"
    ],
-   "commit": "cda27dc2be9c08b994b9a4dc8b68f16f4e74c19e",
-   "sha256": "0wpbf4vv311d506djips5v8jr3adz59bsnlbcncx2w3ic5gyhl2y"
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
+  },
+  "stable": {
+   "version": [
+    0,
+    9,
+    0
+   ],
+   "deps": [
+    "ekg",
+    "futur"
+   ],
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
   }
  },
  {
@@ -31799,24 +31920,28 @@
   "repo": "ahyatt/ekg",
   "unstable": {
    "version": [
-    20260309,
-    212
+    20260415,
+    39
    ],
    "deps": [
     "denote",
     "ekg"
    ],
-   "commit": "07c630b3227bf8714728d021b4641055def18b31",
-   "sha256": "15cqim8cahaxw030jh78flb73f8n2b9zyrk65lzfndzavqfbjc2m"
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
   },
   "stable": {
    "version": [
     0,
-    8,
+    9,
     0
    ],
-   "commit": "f2c52383fe58802807436994709a6f453354690a",
-   "sha256": "0qlg1lksj6cy9fj0ag4c5vr0561j8p52si5hbm571xh40f4pjays"
+   "deps": [
+    "denote",
+    "ekg"
+   ],
+   "commit": "be6cc349a5054154470173af6521e569cb21bcb1",
+   "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l"
   }
  },
  {
@@ -32479,11 +32604,11 @@
   "repo": "casouri/eldoc-box",
   "unstable": {
    "version": [
-    20260309,
-    1639
+    20260415,
+    226
    ],
-   "commit": "8847b1aac2133e8a8211e728807fdd20d332298c",
-   "sha256": "1218a8jhbhyw6vhm53m7i4ra3zn0xl1x8pvjllpa97axjbcs15g9"
+   "commit": "2680a08ff2438ff8c2ea6f8d57f22095f857900c",
+   "sha256": "1iqha79lpydaz2i5dah11zsj060bs1livl3fpi76kh3j5ak6v5id"
   },
   "stable": {
    "version": [
@@ -33084,26 +33209,26 @@
   "repo": "sp1ff/elfeed-score",
   "unstable": {
    "version": [
-    20260125,
-    2028
+    20260419,
+    349
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "f6ef83c472e6f01d0f60130ecac768462c5a20b7",
-   "sha256": "1a2ymyb6l84jrphrfb8svrm78aq9dpp5k18y112pg19lc6wqwgbv"
+   "commit": "f6d25f6c1c967822e75ff01ad4d57be1c80f480a",
+   "sha256": "05wgqmcdhfq4qmsil2sagzxv43cqf6skn5mfq0n76rf4n6slngns"
   },
   "stable": {
    "version": [
     1,
     2,
-    11
+    12
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "f6ef83c472e6f01d0f60130ecac768462c5a20b7",
-   "sha256": "1a2ymyb6l84jrphrfb8svrm78aq9dpp5k18y112pg19lc6wqwgbv"
+   "commit": "f6d25f6c1c967822e75ff01ad4d57be1c80f480a",
+   "sha256": "05wgqmcdhfq4qmsil2sagzxv43cqf6skn5mfq0n76rf4n6slngns"
   }
  },
  {
@@ -33605,6 +33730,36 @@
    "sha256": "08k4zlawjkb0ldn4lgrhih8nzln398x7dwzpipqfyrmp0xziywma"
   }
  },
+ {
+  "ename": "elixir-iex",
+  "commit": "ed513f41a60afe9e18fc8143c687f6c309436a89",
+  "sha256": "026740s6l8cipbkg95714k04xl9hldjdfb7qaxnxm3qgcp1i3nid",
+  "fetcher": "github",
+  "repo": "mojochao/elixir-iex",
+  "unstable": {
+   "version": [
+    20260412,
+    1946
+   ],
+   "deps": [
+    "eat"
+   ],
+   "commit": "a82808ebb91b9668329459e808a75552d698433d",
+   "sha256": "1zngyvw5b5rhw4vj5b7dpfbagw1sia4m5kqlasc6z80ydv469da3"
+  },
+  "stable": {
+   "version": [
+    0,
+    10,
+    0
+   ],
+   "deps": [
+    "eat"
+   ],
+   "commit": "a82808ebb91b9668329459e808a75552d698433d",
+   "sha256": "1zngyvw5b5rhw4vj5b7dpfbagw1sia4m5kqlasc6z80ydv469da3"
+  }
+ },
  {
   "ename": "elixir-mode",
   "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4",
@@ -33965,15 +34120,15 @@
   "repo": "youngker/elogcat.el",
   "unstable": {
    "version": [
-    20230121,
-    459
+    20260423,
+    851
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "f2f19d7ab6b77b8fec55cb67524df629fe967891",
-   "sha256": "0fwl14xqnxq5d4a9wk0p1xvfkmff5inwmz2v1s8n7w1sy29zslrn"
+   "commit": "6bd7bfd75134d615bd49e5eba8a6e639ee0814ac",
+   "sha256": "1siiwizqya94vq2hr28ll3sk5q5w2kyqlj009f0ph8hxk5q22jfl"
   },
   "stable": {
    "version": [
@@ -34140,8 +34295,8 @@
   "repo": "jorgenschaefer/elpy",
   "unstable": {
    "version": [
-    20250404,
-    2349
+    20260413,
+    2143
    ],
    "deps": [
     "company",
@@ -34150,8 +34305,8 @@
     "s",
     "yasnippet"
    ],
-   "commit": "0b381f55969438ab2ccc2d1a1614045fcf7c9545",
-   "sha256": "0398zwzq5c33fi8icyy2x50q7rs819i5xkpmhbfm1s34m6prv46a"
+   "commit": "777f5a5f951ee4b717856007c337e9f37fd4ea5d",
+   "sha256": "03rkjfi08j5lz0jl0aw66sqc2rbrx55kj6yanxmd6drv63ryd1zj"
   },
   "stable": {
    "version": [
@@ -35014,8 +35169,20 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20260213,
-    2209
+    20260414,
+    1505
+   ],
+   "deps": [
+    "cl-lib",
+    "nadvice",
+    "seq"
+   ],
+   "commit": "6f704fd3c12f35e059700aaeb43ae64c35ad81b2",
+   "sha256": "0walnxi8lmnq4aj1ibk14mfz2qg73ini4dcbiaq4q9kc7mrwqhys"
+  },
+  "stable": {
+   "version": [
+    26
    ],
    "deps": [
     "cl-lib",
@@ -35024,18 +35191,6 @@
    ],
    "commit": "002a8db0913c1780149eb4a9306e6f582efe8974",
    "sha256": "0wn0ky1xpnb2hrlp48i6zr0f48gdnpsy3mzi7cdggx7wmp3cc2xq"
-  },
-  "stable": {
-   "version": [
-    25
-   ],
-   "deps": [
-    "cl-lib",
-    "nadvice",
-    "seq"
-   ],
-   "commit": "1d48a1133db2670d839f2cf2aff17d6c32aeb15f",
-   "sha256": "0pvlkybdpf1bfpjs0np89kfnxj3qjvyawk1g0b2l5jg21k6c20ww"
   }
  },
  {
@@ -35426,28 +35581,28 @@
   "repo": "isamert/empv.el",
   "unstable": {
    "version": [
-    20260406,
-    1740
+    20260419,
+    1452
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "579d9d3802ad449724db7649b90cf3593be92a75",
-   "sha256": "02bwpskklk3wpq3h0y6xzii34qkxfmbgv1wrg8yw2blq1kaghpqc"
+   "commit": "7f8af0b41a83c36acf7fe826839c02ecbffa33fc",
+   "sha256": "09lyvhp719dq5lz1ljzgmpwy30pxlsbccx1kdlkzi26jlgqnki3s"
   },
   "stable": {
    "version": [
     6,
-    1,
+    2,
     0
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "11245762388c03ecdfb550fb1b96978459d68a4f",
-   "sha256": "159s9hyn8z35ja3f297lb2335ihjyp60zkk7lsz8r3jc4vv0kgqs"
+   "commit": "61cc54f8a506b708285a3f7a3fb299616d0fab02",
+   "sha256": "1r6hchdchfpici44dynxa0ivhmmc3hrj1qdvgjvaysqymn1hbz1y"
   }
  },
  {
@@ -35935,8 +36090,8 @@
   "repo": "emacscollective/epkg",
   "unstable": {
    "version": [
-    20260301,
-    1302
+    20260416,
+    1107
    ],
    "deps": [
     "closql",
@@ -35944,8 +36099,8 @@
     "emacsql",
     "llama"
    ],
-   "commit": "fc3cba38a416ec4e26a7d8eb7bc5ee910e67aa73",
-   "sha256": "1im5di9rgvirzlnkfns6sv6wrn2sfb7k98f4i4b29kh7jwrrwzax"
+   "commit": "f3f8d26401a7a9c49d4b670dbf463dd010c26fae",
+   "sha256": "0n6agpskxxqm5618ajp9wk8i6g047yjf889lw4qp5cb2kdqslfp8"
   },
   "stable": {
    "version": [
@@ -36687,20 +36842,19 @@
   "repo": "erlang/otp",
   "unstable": {
    "version": [
-    20260407,
-    1222
+    20260420,
+    1445
    ],
-   "commit": "d0083117f9b847a7473eda1c5457a81170b1b586",
-   "sha256": "1512wp3yd5sxqmpgqx45nqgl910r3x6n9vkbz0w5fj25qk1yy8nh"
+   "commit": "a42e46bab47432b988ee60e4c9d915c858bcf32d",
+   "sha256": "0vfzzxs7dv3wadrlgb97fjc7vr8hvwghjz9hynqjvzf2i2ranl4f"
   },
   "stable": {
    "version": [
     28,
-    4,
-    2
+    5
    ],
-   "commit": "002fa5032baa0f6a8c4587c81f60e3273775a4d1",
-   "sha256": "1vsxxia8iri2mpr1xvfvwar4zh05wkaknvbdgp0538g6w8vwbzjx"
+   "commit": "f4506ee46d68694a1d23ca81c314092fd83e8f85",
+   "sha256": "15vjxb10840jvxhnnrgsd2s4j1sclwn5nkfwyd8zdbdcyn6hi203"
   }
  },
  {
@@ -37817,11 +37971,11 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20260408,
-    952
+    20260423,
+    1426
    ],
-   "commit": "d8d8e4e87a663edbeb42d7e43f8096c95bbb6e15",
-   "sha256": "110dm88j2lzkppryzzszsmhlhbf8kdwcay0519krg6j5qy5p0vb9"
+   "commit": "5a09992aa6276fc8626a41d01d58b1d85959edaf",
+   "sha256": "1f238ajfm1qjg5qqkaknw1flvrdxrzhqmsb5mswv00irbagb6bb2"
   },
   "stable": {
    "version": [
@@ -38436,36 +38590,6 @@
    "sha256": "19s6cid42q0lm2w94a7f6sxvmy3zpjdj5r5dbwcxxp5n3qfs7nip"
   }
  },
- {
-  "ename": "evedel",
-  "commit": "5bcbd3b3db68a50d8a67ece2c834d6a91b9ba4b8",
-  "sha256": "00j790q3vvp039vqq8cpdzfcwfyzcv70xmj2dwnpd06iynry3mii",
-  "fetcher": "github",
-  "repo": "daedsidog/evedel",
-  "unstable": {
-   "version": [
-    20250303,
-    1213
-   ],
-   "deps": [
-    "gptel"
-   ],
-   "commit": "d979801f5f496ff20aebf4c3343bffcd0e0d3a0b",
-   "sha256": "0y6q45rzs7sl6gjpvxd8kgg550my2jjg4kmvhj63kvvhxrixv4p3"
-  },
-  "stable": {
-   "version": [
-    0,
-    4,
-    20
-   ],
-   "deps": [
-    "gptel"
-   ],
-   "commit": "86e124da13b7d05b57a750c43bbebbec1874973c",
-   "sha256": "1i7ybd91cc8zdm245nkqnm73irwhbqqb7jj19v8zvf5908nkxzlc"
-  }
- },
  {
   "ename": "evenok",
   "commit": "c2568edb7d30ce34acd64ce0a211699ae87a0cb1",
@@ -38723,15 +38847,15 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20260330,
-    1726
+    20260423,
+    438
    ],
    "deps": [
     "annalist",
     "evil"
    ],
-   "commit": "4ad1646964638322302dfb167aec40a2455bfb78",
-   "sha256": "0ajb81dp7qfn5x0bjgjqmwqqvqfmwfpk2rpkd6dl0h0j7bbl1v51"
+   "commit": "2df40737c6cc9ccd8b69462a6f2f6a045c2d7684",
+   "sha256": "1skwz01sjhgha848gk0vw9cbxzkip1nz4hkn629z8jzw25npdna3"
   },
   "stable": {
    "version": [
@@ -40920,19 +41044,19 @@
   "repo": "purcell/exec-path-from-shell",
   "unstable": {
    "version": [
-    20251113,
-    1324
+    20260423,
+    1833
    ],
-   "commit": "7552abf032a383ff761e7d90e6b5cbb4658a728a",
-   "sha256": "1yhgn3va4pm1bfs32yf2z6m23p7s9gdi9kbgj3hycb0h308hxfg6"
+   "commit": "dae820da35ad46234cbca31626ffb6da7928694a",
+   "sha256": "1sdhrwg2yjhsxaanrvf92ywywcn977pj3n1hpmg3k9qxcz2j56kv"
   },
   "stable": {
    "version": [
     2,
-    2
+    3
    ],
-   "commit": "72ede29a0e0467b3b433e8edbee3c79bab005884",
-   "sha256": "15cjwvfv5xdhbym4ms71zdkng4381d3hsdk3kvvx2kycxff52rih"
+   "commit": "dae820da35ad46234cbca31626ffb6da7928694a",
+   "sha256": "1sdhrwg2yjhsxaanrvf92ywywcn977pj3n1hpmg3k9qxcz2j56kv"
   }
  },
  {
@@ -41707,19 +41831,25 @@
   "repo": "WJCFerguson/emacs-faff-theme",
   "unstable": {
    "version": [
-    20260409,
-    1306
+    20260413,
+    2137
    ],
-   "commit": "671a6f8350c75fd0b6c68d275db2fde705cb4ecd",
-   "sha256": "1xmcpvmvg7135wdfvy1wyrpkkkni2pncp5ivl60z2plb2l3mf976"
+   "deps": [
+    "modus-themes"
+   ],
+   "commit": "1a6ee167627a4c623f157f3afb5ec12d368889af",
+   "sha256": "13vb0c5v5hd8jzy8cp6r2fv8wixcj5gfl9060d7w0qdf1h6kx6rv"
   },
   "stable": {
    "version": [
-    3,
-    10
+    4,
+    0
    ],
-   "commit": "671a6f8350c75fd0b6c68d275db2fde705cb4ecd",
-   "sha256": "1xmcpvmvg7135wdfvy1wyrpkkkni2pncp5ivl60z2plb2l3mf976"
+   "deps": [
+    "modus-themes"
+   ],
+   "commit": "8f976f810e6f23d2afaaa13f53e11d73e941cbcf",
+   "sha256": "1083ias5bk17vcvpa4xrnpps6r1v46xnzy2b2x0azin0vj9pvc65"
   }
  },
  {
@@ -41806,11 +41936,11 @@
   "repo": "ideasman42/emacs-fancy-fill-paragraph",
   "unstable": {
    "version": [
-    20260331,
-    646
+    20260421,
+    124
    ],
-   "commit": "9f409bf7838d5aa06fc7c5ba7d2aef1fb32cabc2",
-   "sha256": "0z4hz4qz88r6v5m6p4bhgnw1dpd939jir4d8idycf1mmxsji5ng1"
+   "commit": "3f3e8fddc4f69c7c0ff933af58e8c3a71292a7cb",
+   "sha256": "1475h2i8b8b7xawkvawb76yr62y8p603id4lbhrrrrw9wvr7dnj2"
   }
  },
  {
@@ -41993,11 +42123,11 @@
   "repo": "cyberkm/fastbuild-bff-mode",
   "unstable": {
    "version": [
-    20251215,
-    1553
+    20260411,
+    905
    ],
-   "commit": "14f60c94c08c37e45a7d7205867b804dfc059160",
-   "sha256": "02a8zwffdv1dvd9nb34p3206pbg1na1hrbl1i39l9da0vwzi1qzr"
+   "commit": "fa3ea52a7542b3110d0320ba4c48ed5cbfde100b",
+   "sha256": "0iqqivlvfw4123k630h3xwhxawhvpy72y3kfvz8xfsf8r9z20sir"
   }
  },
  {
@@ -42901,11 +43031,11 @@
   "repo": "jming422/fira-code-mode",
   "unstable": {
    "version": [
-    20240228,
-    1728
+    20260413,
+    1901
    ],
-   "commit": "c48f3f16a4b497b9e455966561bbb6638efe4900",
-   "sha256": "0pbbqwms0w7n2blqan7jbk38klc85gwqw3j4w5c90shg9a8xsr01"
+   "commit": "5a8e2e96c40822b8e11a8f16392bc3ccdd6c69fd",
+   "sha256": "1hy4l8055flqg0sxkly7kwszvmy0h1wr31qpdzix2mqsaqmzrim0"
   }
  },
  {
@@ -48851,19 +48981,20 @@
   "repo": "usaoc/elisp-for",
   "unstable": {
    "version": [
-    20230828,
-    832
+    20260417,
+    457
    ],
-   "commit": "c0e9046d363a86a88fdcf73eacc09839aae4dd5a",
-   "sha256": "0wsp9s02kl2py2czmiwrb2nkh0x3y61zps6x84dpjq8yk1xk0y6a"
+   "commit": "2e18cf627ecf4c390e295a73d61ab1eba7d076f4",
+   "sha256": "0zvipypsr8l1cxrggi98zyjd95qqy3wpv5qw0gsdgwrkpmiz3a20"
   },
   "stable": {
    "version": [
     1,
-    4
+    4,
+    1
    ],
-   "commit": "08f65ee62cc4d5fcf5c6eeed5971c43709ff9e00",
-   "sha256": "125lkvvx4k5m24c72bd5z762bvhdd34fx119cwmxjxn3jn6rd47d"
+   "commit": "2e18cf627ecf4c390e295a73d61ab1eba7d076f4",
+   "sha256": "0zvipypsr8l1cxrggi98zyjd95qqy3wpv5qw0gsdgwrkpmiz3a20"
   }
  },
  {
@@ -48955,8 +49086,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20260408,
-    1922
+    20260423,
+    1757
    ],
    "deps": [
     "closql",
@@ -48971,8 +49102,8 @@
     "transient",
     "yaml"
    ],
-   "commit": "69801d0da19d62b4b68b1f1756900e47ce7e8769",
-   "sha256": "10ym872n05nlkd9q1r3dl7vkbniacxm8g9159v56f9z9r6nznwyh"
+   "commit": "3eff1dab171602db9d1b7cfb0e6e7014eac73665",
+   "sha256": "0115af0vg9bsmmizfny3k4k9hlkgclpgq6wd05fv3ibhbhc95n5a"
   },
   "stable": {
    "version": [
@@ -49867,11 +49998,11 @@
   "repo": "bbatsov/fsharp-ts-mode",
   "unstable": {
    "version": [
-    20260330,
-    1735
+    20260424,
+    617
    ],
-   "commit": "9b3e5ca533ebb06e1424db6ccff4f3ec3dde663b",
-   "sha256": "10xsmclvmxny2bgxk4s5vi3bdzpvhqvjwh94gyj5jxvv69xmlawv"
+   "commit": "415dcaf2cb83d98af86ae072a11eae2558047c6c",
+   "sha256": "0z20v2wnqqd672y7mwjgx88nh3pwq7mdvzck1sjpmqq53gb2lgj4"
   },
   "stable": {
    "version": [
@@ -50102,27 +50233,27 @@
   "repo": "jojojames/fussy",
   "unstable": {
    "version": [
-    20260216,
-    27
+    20260424,
+    408
    ],
    "deps": [
     "compat",
     "flx"
    ],
-   "commit": "17ca387c077f47553239816f41d6f0e351a21103",
-   "sha256": "1slbrqsi17zglqy229zggn094w8rckkpdnmnbw5gvhy6z40p5s5c"
+   "commit": "6366161a0e03c6c12aeba872fed3dfdc135bff9c",
+   "sha256": "1hwk15hlq82khx38xriqpd1syfr3zn4m90n65s8ijfjmaysfcg9j"
   },
   "stable": {
    "version": [
     2,
-    1
+    2
    ],
    "deps": [
     "compat",
     "flx"
    ],
-   "commit": "dd66f96400797f8db5e6335617fafe41340df85c",
-   "sha256": "1120ry2aa97jgjlzz0cpwxm0frks2vqp15i6vfjpnvm6fj09pl9m"
+   "commit": "92fb91c034707af77be9869500a5ae1ea0079b7d",
+   "sha256": "1vwxqil4mmll7zdnc1yn8g54kk7p39fyf7y62lxpakij7vxncf43"
   }
  },
  {
@@ -50524,11 +50655,11 @@
   "repo": "godotengine/emacs-gdscript-mode",
   "unstable": {
    "version": [
-    20260407,
-    556
+    20260417,
+    1926
    ],
-   "commit": "4913fdcd5aebab2c13d44a4478af1846aa9583bd",
-   "sha256": "0qxbjxbi0zajbbskppw6a5cpvx21ys1j9plmpqsjlz6fjdfhdmmp"
+   "commit": "f6ee6891e15b4aaf4e159ecf3ab8482da6fe0ea7",
+   "sha256": "1hqrc20cgqgcrbc5wqwldq7f0xxfvm3y6cnxzy4brdvg61hdg82b"
   },
   "stable": {
    "version": [
@@ -50964,14 +51095,14 @@
   "repo": "emacs-geiser/stklos",
   "unstable": {
    "version": [
-    20231004,
-    2013
+    20260411,
+    1308
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "c634fc2049f1616b772f5e9cb78c6171dcc4c34d",
-   "sha256": "0knzjrfkilzksqd482900wbv2p649azmgg5zb65q79mlkqf2qmxp"
+   "commit": "eb8f6d53ec5c4520c590572182f66efa51faf74c",
+   "sha256": "1g3fq9qf1xgsmlgbkgmpdc3679vz1hxqbzxqs4wlrfq2a2fx2q2g"
   },
   "stable": {
    "version": [
@@ -51455,20 +51586,20 @@
   "repo": "dakra/ghostel",
   "unstable": {
    "version": [
-    20260410,
-    634
+    20260423,
+    1706
    ],
-   "commit": "21d8439e62ff4e164d72a71efc1c5df10ab5d111",
-   "sha256": "1z9jv6l8j4zkipgcz1qi5v6cy46spmbjsvawrk55gmbp3fbfw3ax"
+   "commit": "63e008f32e4896ecd18e24ccfc08a3775561722c",
+   "sha256": "13pk32b32p9hw0lw957gha89dinqs8g53v73nqhzq9axrp7m9qp0"
   },
   "stable": {
    "version": [
     0,
-    9,
+    17,
     0
    ],
-   "commit": "698d9f50a54283d8413cad2dc2594e2fb0725f15",
-   "sha256": "0agc79h1xdw06wyzjcchay54wdyrnqr8ykav09dr6i3a5mvdrc8h"
+   "commit": "6117978d2089d807dd457f9cf2d9382a4a4558c6",
+   "sha256": "0mmvwms7r4l1ypvxa10s164a6shqwc7bqvrr1wgqkp5z4wqd9dsk"
   }
  },
  {
@@ -51511,8 +51642,8 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20260401,
-    1239
+    20260423,
+    1634
    ],
    "deps": [
     "compat",
@@ -51520,8 +51651,8 @@
     "llama",
     "treepy"
    ],
-   "commit": "1fb0fba075cb8b80f9819c874be584dffce50b51",
-   "sha256": "0d49qkkza9my2xz1vdyq7l3vmmjbamhsqm9xy7xikisyhsngvj73"
+   "commit": "2b6df7c3f958e64c47151d7d6ef45de38e614936",
+   "sha256": "1mm60zga2flbh2gnv5554if8d6jiwvzw3px8h87zi7y8dx8rkwmw"
   },
   "stable": {
    "version": [
@@ -52199,11 +52330,11 @@
   "repo": "sshaw/git-link",
   "unstable": {
    "version": [
-    20251116,
-    105
+    20260411,
+    1730
    ],
-   "commit": "12caebc0982d3401a0b74ccddc2d5a651122de8a",
-   "sha256": "14nmiybixnn3cvvdyp0b7yimhqmj41q3g0c6nz0x4lwjfhl5w7nc"
+   "commit": "b651de43236276cdb18ec7727f645cbf6743a499",
+   "sha256": "1zpws6z5v54g94jnsw78k42apxpffg54dlkm5i8gclsaxhn6xpdg"
   },
   "stable": {
    "version": [
@@ -54227,6 +54358,21 @@
    "sha256": "1fcm65r1sy2fmcp2i7mwc7mxqiaf4aaxda4i2qrm8s25cxsffir7"
   }
  },
+ {
+  "ename": "go-prettify-mode",
+  "commit": "6deff573962e47b665152ad2594bd862348dfa3f",
+  "sha256": "11ycr5937rzljhzgkvf393rm595pla8xqhlgk38y3d5lz44fm379",
+  "fetcher": "codeberg",
+  "repo": "snyssfx/go-prettify-mode.el",
+  "unstable": {
+   "version": [
+    20260422,
+    732
+   ],
+   "commit": "6aafd440383931b368901de66bf974bbd37a45f9",
+   "sha256": "1rrfcnyfqry6ihlkz2w05sgsvcjb8yx74f3dinzpafxa8c2lh9x4"
+  }
+ },
  {
   "ename": "go-projectile",
   "commit": "3559a179be2a5cda71ee0a5a18bead4b3a1a8138",
@@ -54781,14 +54927,14 @@
   "repo": "atykhonov/google-translate",
   "unstable": {
    "version": [
-    20250115,
-    609
+    20260419,
+    134
    ],
    "deps": [
     "popup"
    ],
-   "commit": "e84599df7c70870b33dd6c902b527d7f78310815",
-   "sha256": "1g098rbqqi26bvn0a8cpxwjx3z603n9zn7fakpnrgzz96vqhfxgx"
+   "commit": "47c5719b7dd51a37a6ad270489738187a436d920",
+   "sha256": "00ci21fmss7nisdzp47zzdbvgny6lxps4dcs4mf1bs93dhar3ksk"
   },
   "stable": {
    "version": [
@@ -55071,7 +55217,7 @@
    "version": [
     0,
     53,
-    0
+    1
    ],
    "deps": [
     "dash",
@@ -55079,8 +55225,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "029d112e05adfc13fa458b99bab4260dd08376c1",
-   "sha256": "0av7fc15422kqx8yd38qv9828mi7y788q865qhmgb4wy26aamwzz"
+   "commit": "21f582334c38f866ac587f1489d637440d1428aa",
+   "sha256": "19bwm2sn8g3a85y6kgs3fh40z2xv53k1ipddfb3qdiml1z69f33s"
   }
  },
  {
@@ -55243,15 +55389,15 @@
   "repo": "karthink/gptel",
   "unstable": {
    "version": [
-    20260410,
-    711
+    20260422,
+    756
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "8d6411b5f89d796c817ff79324973b8910e164fe",
-   "sha256": "0zl5qdp9qqh8chadsp2m3jpbpsxlywdlfkax8p97y73q1yias0q6"
+   "commit": "593786fce27b54248d4c0ae19b120cbbcf51aea9",
+   "sha256": "1g436n57r6czk7vrzq8brzvsadrc16p37wicars750i5qhph7f48"
   },
   "stable": {
    "version": [
@@ -55276,8 +55422,8 @@
   "repo": "karthink/gptel-agent",
   "unstable": {
    "version": [
-    20260409,
-    653
+    20260415,
+    611
    ],
    "deps": [
     "compat",
@@ -55285,8 +55431,8 @@
     "orderless",
     "yaml"
    ],
-   "commit": "90aaaede809fa32167507032cddf1fbe769dcd7d",
-   "sha256": "1a6c1rsgndvm1hdkc0107ai57bq2049ia2xi8hpvdik5pkfa0p0y"
+   "commit": "e2ef97d6b566b2ad751c8a0a87b8272710c95808",
+   "sha256": "0k88fav640ckjjv269zx6zlhjghr551bcamx7argvs8i5ca7r9jx"
   }
  },
  {
@@ -55896,15 +56042,15 @@
   "repo": "michelangelo-rodriguez/greader",
   "unstable": {
    "version": [
-    20260401,
-    1337
+    20260409,
+    2330
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "e3f930f6ad3f5296252409d3015d6ecce0a5e91b",
-   "sha256": "08c4i5qbr0ndbbps6y5kpp0lzfmxnwifrxssqkd9qdzj068k69k3"
+   "commit": "4b0deb0b0ef4a73ea8fe9e2b62b45321dd76a609",
+   "sha256": "1f6mz0815v862ppnf67gs13p4mfjykp2iap8iysl8yy999a23bac"
   },
   "stable": {
    "version": [
@@ -56455,24 +56601,6 @@
    "sha256": "1sqnrbhqf6pkf8hqqlw5aqq6z05wddjs4jib5znd637j9ksd546n"
   }
  },
- {
-  "ename": "gtea",
-  "commit": "b34c31c4ef9c491968e33161fd46f4f3bb761152",
-  "sha256": "1fh7xjv6hcnzzjn8yj56r8v0x80y68ymj3rx6p3f2nymhqiypiva",
-  "fetcher": "github",
-  "repo": "emacsattic/gtea",
-  "unstable": {
-   "version": [
-    20250620,
-    1334
-   ],
-   "deps": [
-    "ghub"
-   ],
-   "commit": "942988625b6ff01c958a16899ad7f7113e4b324b",
-   "sha256": "0f90wgp13w1jzqs3iq5yjy6h0wjw72czs5lvjjg20a1rsd4fykcc"
-  }
- },
  {
   "ename": "gtk-pomodoro-indicator",
   "commit": "a58f1acaafc459e055d751acdb68427e4b11275e",
@@ -56535,20 +56663,20 @@
   "repo": "bormoge/guava-themes",
   "unstable": {
    "version": [
-    20260410,
-    838
+    20260421,
+    2012
    ],
-   "commit": "384b4350270931f0fea2e625186a6408e7b47e71",
-   "sha256": "0fc030rhcs51qm00j80sks9jfq9yp7s0c3yhjbmxifss4kvpl0b6"
+   "commit": "de9bbe98c5186ab56cb460c59644bb9da6c6437c",
+   "sha256": "04xf7k1x7l13hzsyi56dzph1nhc6rmanqvdbqv7ngb8kqd810msv"
   },
   "stable": {
    "version": [
     0,
-    13,
-    2
+    15,
+    0
    ],
-   "commit": "4808e3fc9c83615880fa7d201b2f088ebacaed98",
-   "sha256": "1x0mf5jcbz8x5m2b4vifk6jz1w5vbiq6j80i3391ja810pddzfmp"
+   "commit": "50881883b9ca7fbceb9bfedb04d2a16ea01125bb",
+   "sha256": "0pkng9vra4ymjnwys4d3b6ly8marpc6zl6yl02k731lhx3a1kll7"
   }
  },
  {
@@ -57625,11 +57753,11 @@
   "repo": "ErikPrantare/hatty.el",
   "unstable": {
    "version": [
-    20250414,
-    2155
+    20260420,
+    1134
    ],
-   "commit": "20e6a92abd997c655e263cd32d7b5b0550dea409",
-   "sha256": "1hjs0zx810xkaigqwxjpfrx4b7z0kxdl9ll19i9g3nkg1s9arbxr"
+   "commit": "8af8aa074bf56c2aafd81238be2c6c2df6003664",
+   "sha256": "1aq8fiidbw051x5jnjynmq3lgf7kxp226c2vf64s80g25529vzcb"
   },
   "stable": {
    "version": [
@@ -57880,15 +58008,15 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20260214,
-    1432
+    20260424,
+    553
    ],
    "deps": [
     "helm-core",
     "wfnames"
    ],
-   "commit": "9d8de1e0810ef5a5e1f3a46c9461b78b9e86167b",
-   "sha256": "1h6w4dbq8wvy55d2wlac62q0ljd79pc2ygvkkm1i08af427b5w2m"
+   "commit": "c316c0b50317f83d0448d1e49714733215eae133",
+   "sha256": "1zyr0ra1kd4lqphz1f079wf6w0p8mmyn9rm008y61i77p8w3mgfk"
   },
   "stable": {
    "version": [
@@ -58691,14 +58819,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20260201,
-    507
+    20260412,
+    600
    ],
    "deps": [
     "async"
    ],
-   "commit": "dcaa8fb45d4f7d08390d80351a4204f848f2ec90",
-   "sha256": "1hiawmmqg1yvfi1mzjynjbjq2hs2xflzs40a84yk863hzbj056fd"
+   "commit": "8e1be2fdba8d99aab20c31f1bd08535773549fa4",
+   "sha256": "0f6q8wimad16wqarhkzkqyc47maad77r7s9mjlfpfmm3mbbi9ixa"
   },
   "stable": {
    "version": [
@@ -61708,15 +61836,15 @@
   "repo": "emacs-helm/helm-system-packages",
   "unstable": {
    "version": [
-    20260404,
-    605
+    20260411,
+    501
    ],
    "deps": [
     "helm",
     "seq"
    ],
-   "commit": "85372333d09dbf21a68ab982a3fba299461eeb9e",
-   "sha256": "0gx075q2gpvf0z8f5pbhxv3nxwk5hal0kyjaz1lqf0827vxdzkqv"
+   "commit": "ca29a21bb9177ebdb3f0d81a22b80d747d916335",
+   "sha256": "138699l123yad0i88f2khvwxnz0i7xs7yx95zpjxv8xgsxagzmx5"
   },
   "stable": {
    "version": [
@@ -62463,6 +62591,29 @@
    "sha256": "14jlh6x6pp43rw4q88xfz527zaj4r4mbydxyqr9hw6m3ihhq0vq2"
   }
  },
+ {
+  "ename": "hidepass",
+  "commit": "00d0501c18f14b802ff5e94e7fa6c401baf2c4d1",
+  "sha256": "0x3q3ghwc36xc6rk0797l4hxw0l51fvx394rw2j5yss59qc95jaf",
+  "fetcher": "github",
+  "repo": "Anoncheg1/emacs-hidepass",
+  "unstable": {
+   "version": [
+    20260415,
+    1941
+   ],
+   "commit": "0cdc0d7910501d91d5d75ae53a42726d3fca0302",
+   "sha256": "1fv98diy9nj8n8y6ndb3n6vddvbqi539b1q87vsfzfna2gwnrpn6"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "commit": "da33a03407f1fd8e23959abbc37ba50ec1317a39",
+   "sha256": "1xjl1z7nxdkc7s18jl4bbvaf3cayki865xm3w3f0py276j7gl1gw"
+  }
+ },
  {
   "ename": "hidepw",
   "commit": "f2ee7663bcedaffa935b8379cc77168035cb1f14",
@@ -63954,6 +64105,21 @@
    "sha256": "0krdbvvvzn323vx554yw7947nddl3icfjk4wf5kfx7fim5v3mdn6"
   }
  },
+ {
+  "ename": "http-server",
+  "commit": "038be2fbd45ee801be37c42f8cd2ddedd0138f05",
+  "sha256": "0cy94j82qfd7x0riz7mhas52xdbr3nhi0ch0x3whbnpjklhkq6c0",
+  "fetcher": "git",
+  "url": "https://codeberg.org/martenlienen/http-server.el.git",
+  "unstable": {
+   "version": [
+    20260419,
+    1924
+   ],
+   "commit": "973c87b418e59404dcdfe823254e5094adf290f7",
+   "sha256": "1hmkm0wp5g6ac2hdg306sl42v12x3znsz363v75k6fd1qydhkk1v"
+  }
+ },
  {
   "ename": "http-twiddle",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -64332,11 +64498,11 @@
   "url": "https://git.savannah.gnu.org/git/hyperbole.git",
   "unstable": {
    "version": [
-    20260410,
-    716
+    20260422,
+    744
    ],
-   "commit": "ba3fbc79dbc8134d026592daed2ddc531d4ae92a",
-   "sha256": "0xyq6xr385lksc37xcg6x1filz12cqs9c3g7pc3m9qdcjzfz9nxq"
+   "commit": "d16aa9cf3e496aa9a6c20d73f4494e16feb4d092",
+   "sha256": "0iv3sy2zympi1r04aqmlrz64zjf9xy51v6yf329nqybm12mkqgsx"
   },
   "stable": {
    "version": [
@@ -65382,11 +65548,11 @@
   "repo": "creichert/ido-vertical-mode.el",
   "unstable": {
    "version": [
-    20250424,
-    1552
+    20260420,
+    1855
    ],
-   "commit": "35c521789bb009a7f4b0df30b68d595fdbe056a9",
-   "sha256": "1hy8gh9j4q4rfflr84nl8cs3r09f6giyyxw8a9898kh82pg0p78l"
+   "commit": "58ad6d8b645e6211c7c564a4fbebf39a72691c7e",
+   "sha256": "05snsy05s40aki0ss8jv9mmxw7fjys1zl3whrzpj66zvbjvi0nl9"
   },
   "stable": {
    "version": [
@@ -65774,11 +65940,11 @@
   "repo": "QiangF/imbot",
   "unstable": {
    "version": [
-    20260320,
-    1418
+    20260422,
+    1521
    ],
-   "commit": "3da793875b61c9e6c340e06ab40bb4912e202656",
-   "sha256": "1cvn5p27b5h4dfid9xn6qs6rg0cmgrpnlik6hkzyccbs70y39nl4"
+   "commit": "d228085198669c559f670d48251bfc5399e72a63",
+   "sha256": "1jnyxyahzs8hm8bcnafzwxa08gvvqry3xgqaxd627wv5zddkyrbl"
   }
  },
  {
@@ -68055,11 +68221,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20260318,
-    1355
+    20260413,
+    2102
    ],
-   "commit": "1005bff8a700b92dc464f770aff8a0db5b4a1c0b",
-   "sha256": "1ydkzq9hmbwc8xrg5i2j779fwmd7zrhyq6x9xzqlpf6k1j4jcgq5"
+   "commit": "0d02f5063d36ff4fa6138f0973c83c6d3874fba0",
+   "sha256": "11p878gxwbpxkxg01jrvhkxk6wq891qwcyryrasjn4nh3nlc1vvx"
   },
   "stable": {
    "version": [
@@ -70725,20 +70891,20 @@
   "repo": "taku0/json-par",
   "unstable": {
    "version": [
-    20260307,
-    1319
+    20260418,
+    849
    ],
-   "commit": "a90a7e1bb878d2534a490366504dd716b5be6054",
-   "sha256": "1m1hv17p2dxm3rl1gj83fkrnmmmd3c8qmbn57mj53kpcdqjqmf17"
+   "commit": "9e1876e0c2a43d5350307bd834a856ebed54dcc4",
+   "sha256": "1n10zh3kvn87vyi3b44727z98k2jnd1p3mv0zjylggkz6xx9w6bs"
   },
   "stable": {
    "version": [
-    5,
-    1,
+    6,
+    0,
     0
    ],
-   "commit": "1c0e363a8d28bf66187d082c97370c2fa11adfcc",
-   "sha256": "00jig26gjvbfyiixlmbw2wxspnif73hwrwh9j2firj0kvvmq1zzc"
+   "commit": "9e1876e0c2a43d5350307bd834a856ebed54dcc4",
+   "sha256": "1n10zh3kvn87vyi3b44727z98k2jnd1p3mv0zjylggkz6xx9w6bs"
   }
  },
  {
@@ -71832,11 +71998,11 @@
   "repo": "Fabiokleis/kanagawa-emacs",
   "unstable": {
    "version": [
-    20260331,
-    505
+    20260413,
+    1643
    ],
-   "commit": "6f1bf124d0cfad0d081ae4ca9d8b0a25b98f18f6",
-   "sha256": "1fxsp3xv0qgx0g3davi2dp2a054wvzacqrp1kr11gyfvpbai88v7"
+   "commit": "c0ec6694a6574ad2d54ca671de2093c81b54888a",
+   "sha256": "1bk7x77a11nlnfl0z40bvyi0c86vyfncjrk1dggs79qw9bnx04i2"
   }
  },
  {
@@ -72866,11 +73032,11 @@
   "repo": "jamescherti/kirigami.el",
   "unstable": {
    "version": [
-    20260324,
-    100
+    20260416,
+    1901
    ],
-   "commit": "7038a9dcfa7e2d8848817508777d8ad878756cfb",
-   "sha256": "1j6l2nm5jv96636sz9w9yf32vcmkc5n9zylh6k1vf5gidgwlgxni"
+   "commit": "5236f011f420465c2abd853e7f16727c0c8eab7d",
+   "sha256": "1awvliza7fva0a74lf6xqx7gzfbby5kr7z4ki818yd98z4x1rqxf"
   },
   "stable": {
    "version": [
@@ -73386,8 +73552,8 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20260226,
-    2054
+    20260423,
+    1353
    ],
    "deps": [
     "dash",
@@ -73395,8 +73561,8 @@
     "transient",
     "yaml-mode"
    ],
-   "commit": "e32ee261fc5f20110c82746e6d106ada8411b813",
-   "sha256": "0dv9jsdp5maq0x55nzi00qnibszcvy309jl7lnx3lz0cwd40srb3"
+   "commit": "b6581c657830c21a58aba5df5239cf7ece44f1c9",
+   "sha256": "03qrdr0gf5a560ywwjj1xwq9xh19v1rliwjjdklhcq6qacaxvq0k"
   },
   "stable": {
    "version": [
@@ -73677,8 +73843,8 @@
   "repo": "isamert/lab.el",
   "unstable": {
    "version": [
-    20260405,
-    124
+    20260419,
+    1535
    ],
    "deps": [
     "async-await",
@@ -73688,13 +73854,13 @@
     "request",
     "s"
    ],
-   "commit": "953e899dee5a720e7edd94eaeb2a928fef881e0e",
-   "sha256": "03cr31cg5lw30929v6rpcchgplp79v1ppqrd4fglbj84yc0i18q9"
+   "commit": "b91086760688328e032af454c1ca3ae5061356dc",
+   "sha256": "003pm093zrx6qv2sa959sws74a4h0w8g2mcyjyqsvm0xxjshzifw"
   },
   "stable": {
    "version": [
     3,
-    6,
+    7,
     0
    ],
    "deps": [
@@ -73705,8 +73871,8 @@
     "request",
     "s"
    ],
-   "commit": "441228336e1b42e80c79cb7d0386ad423ebda84e",
-   "sha256": "1g9bn2nrxkvagampyclcibnlaalzfc6q32lh6bq5xfz8kbwqqvi8"
+   "commit": "aa3af6f8e2eb16edac2b680ecddf4823f94287de",
+   "sha256": "12xb18ssn5zf9gy2px2x6mnbjh9bny1rf7kldlvv84s86iiqzxpl"
   }
  },
  {
@@ -73795,16 +73961,16 @@
   "repo": "Deducteam/lambdapi",
   "unstable": {
    "version": [
-    20260329,
-    807
+    20260423,
+    1057
    ],
    "deps": [
     "eglot",
     "highlight",
     "math-symbol-lists"
    ],
-   "commit": "f8b222c2fe41caca3d7d1de628d4257829329ed4",
-   "sha256": "07axrpf23jdar092jpnabap5shsjlmfghhbwvk806gdh9y8dzh65"
+   "commit": "fbbe050639dfe7c1c1f2be2e6807dd31e3108e5e",
+   "sha256": "11jpn7w0iy4vp555hsc425ipjzsv0ajhph1ih5ajqkn2lxd46b8v"
   },
   "stable": {
    "version": [
@@ -75274,20 +75440,20 @@
   "repo": "merrickluo/liberime",
   "unstable": {
    "version": [
-    20240927,
-    141
+    20260427,
+    303
    ],
-   "commit": "23c0caa1bf73f4e9ab58d52dc46cf21088dc6c54",
-   "sha256": "0zq39p51mnpi3gy6pwkzs7sck56w4y4rwd2cxzm7pk9rldj18ab0"
+   "commit": "2130baba8e5e15922650bc01de95a1d6c6a1c1f7",
+   "sha256": "0zr0hk11xani4pn0yv2xlpfwargv33q610w0yw6ac1r91bn9r9z9"
   },
   "stable": {
    "version": [
     0,
     0,
-    6
+    9
    ],
-   "commit": "f13a98ddd7be658e742b0f42988b02db9d779e85",
-   "sha256": "09d9dx4jk8bgbdcn6dh9ar5rs33s2cwz08w211b3kgj41i115gl7"
+   "commit": "2130baba8e5e15922650bc01de95a1d6c6a1c1f7",
+   "sha256": "0zr0hk11xani4pn0yv2xlpfwargv33q610w0yw6ac1r91bn9r9z9"
   }
  },
  {
@@ -75545,16 +75711,16 @@
   "repo": "emacs-vs/line-reminder",
   "unstable": {
    "version": [
-    20260406,
-    657
+    20260414,
+    1746
    ],
    "deps": [
     "fringe-helper",
     "ht",
     "ov"
    ],
-   "commit": "ff080f2f1b42c627d4720cd23751b93f5c6457c2",
-   "sha256": "09v1k3ja2ia0ji4q59dlg4vwlbnxl21gwf01zcjy0rw27661hyal"
+   "commit": "9a20500704f5b21772d00e4d0a9ff16dac943400",
+   "sha256": "1chvjhihmjb2hy114mlpbsvdn1h34i7r6lc5d6haqra19m2h9vcr"
   },
   "stable": {
    "version": [
@@ -76710,16 +76876,16 @@
   "repo": "ahyatt/llm-test",
   "unstable": {
    "version": [
-    20260410,
-    537
+    20260413,
+    2012
    ],
    "deps": [
     "futur",
     "llm",
     "yaml"
    ],
-   "commit": "134b73aef30080b54bcebfa1ad42a67017fd561b",
-   "sha256": "0sx8g41alir0v8piaryilsqh9356knkz703klsakm2d2afzggc96"
+   "commit": "b01444d9a7cffd7273162043921cb47eacc48373",
+   "sha256": "1pcvqw0bafzf7qxx5c90h37i54vm7axpl68ixq699idlwg8j1jqy"
   }
  },
  {
@@ -77978,8 +78144,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20260408,
-    702
+    20260423,
+    1033
    ],
    "deps": [
     "dash",
@@ -77990,8 +78156,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "4c74da7ae51145f8e49c3544c90b410d96a742fa",
-   "sha256": "0wkvbwmd89z3rhyzfmpsdxxwk06arblwj1f6ycml68islfbdi1nr"
+   "commit": "74270b286a9c8f1fc56f97dc118ff010880ed3ff",
+   "sha256": "13avmvbldb27pwm8a4s190601jwgzfhpzx86h2yjd6g0vjvx3lkv"
   },
   "stable": {
    "version": [
@@ -78801,14 +78967,14 @@
   "repo": "kmontag/macher",
   "unstable": {
    "version": [
-    20260203,
-    2055
+    20260420,
+    107
    ],
    "deps": [
     "gptel"
    ],
-   "commit": "16672b88967c3ea452d8670285e2ab7fc705ce17",
-   "sha256": "10wz9rdyb3lx7g69wnf7gb305nzgjss9a0rln9ycy54dnhdcwzhp"
+   "commit": "2a4d2ce81076134c7521bfd3a345c5440c440c2f",
+   "sha256": "130i2qzqb9p1k6qznciab2n8m1911pm5yqv13x0fdhfd8nyj4hkj"
   },
   "stable": {
    "version": [
@@ -79070,8 +79236,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20260409,
-    857
+    20260422,
+    2206
    ],
    "deps": [
     "compat",
@@ -79082,8 +79248,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "098e6a02f18d0bee27eab0ad9e3c18a49b18d63d",
-   "sha256": "1dg29vnvhdxh9v3krr8hi1s98hn26hyn8hzpyj3fnqfiv5k3adiw"
+   "commit": "569b9656d6a2c792b07d3980796c76b121c9737e",
+   "sha256": "1y8q8d3lw4yq04kngnskw0yx6x96yzd09052cjx9anyqwcyhbhk8"
   },
   "stable": {
    "version": [
@@ -79142,14 +79308,14 @@
   "repo": "bbw9n/magit-browse-commit",
   "unstable": {
    "version": [
-    20260311,
-    511
+    20260412,
+    1414
    ],
    "deps": [
     "magit"
    ],
-   "commit": "aedf47b76642566de7992f3d6834c7fc8b77d68c",
-   "sha256": "0wh6d1q9gdx7y8j0k65y3zq6k6zi6lizgl4ixjawpsfzqhv7hcay"
+   "commit": "d7b73e3819cf4c6a178aa54f2331d22f41f010df",
+   "sha256": "0j0j1pc563lnsak6ifxjqavizkwpcrvkf0cmzj3gj53nzvp14kfw"
   }
  },
  {
@@ -79766,8 +79932,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20260330,
-    1102
+    20260422,
+    2206
    ],
    "deps": [
     "compat",
@@ -79775,8 +79941,8 @@
     "llama",
     "seq"
    ],
-   "commit": "89a51310bd8f8087c44f7ac5c902cc82dddbbe2a",
-   "sha256": "049pminf51r2dqg2cx0wnhvgswi4rmpr8qj74cgibfr7pnrsjwsl"
+   "commit": "569b9656d6a2c792b07d3980796c76b121c9737e",
+   "sha256": "1y8q8d3lw4yq04kngnskw0yx6x96yzd09052cjx9anyqwcyhbhk8"
   },
   "stable": {
    "version": [
@@ -80047,15 +80213,15 @@
   "repo": "hrishikeshs/magnus",
   "unstable": {
    "version": [
-    20260316,
-    405
+    20260421,
+    201
    ],
    "deps": [
     "transient",
     "vterm"
    ],
-   "commit": "a22c090df03321cc94514d670075ccac3f1988e8",
-   "sha256": "1aa1gixic1vkqnn4b74w65ym9q2wmk26ydc6z86z946c17k26zlx"
+   "commit": "ef87ed770acf3113f060afdd6949ac24ce46dee8",
+   "sha256": "1qlf4vc0r73jh4nxx86dw0f4g6qk4c5ypkwkj591p02x3w7l5a3s"
   }
  },
  {
@@ -80695,11 +80861,11 @@
   "repo": "whhone/markdown-indent-mode",
   "unstable": {
    "version": [
-    20260308,
-    1640
+    20260419,
+    8
    ],
-   "commit": "44aa4ddb57c0a0787302ae4ed3e054d9af12004d",
-   "sha256": "1a3nd1ljqw2f3nkv3h1czhx0w5pm1a441d87prfg23fqc6ym70p6"
+   "commit": "e8d36904be83de7ceb7fdd1c1ddaa59093129b36",
+   "sha256": "1q6yxjcbvnjspfk5vn6rvvx960ipz2i5ncwkzk0am1r7h9xfra86"
   }
  },
  {
@@ -80728,11 +80894,11 @@
   "repo": "jrblevin/markdown-mode",
   "unstable": {
    "version": [
-    20260321,
-    143
+    20260423,
+    1508
    ],
-   "commit": "182640f79c3ed66f82f0419f130dffc173ee9464",
-   "sha256": "19svykiccp3ciy660askqb62xvwlgirh9gsbsa0byxqhqr2v454z"
+   "commit": "51ccd3df38d85d0abc9d43d25fc7ea9b9131db45",
+   "sha256": "1a0ah4r2shbjb9gwa5yr534fq2rb6nyf0qbhsqsf0pvwx5lskfr4"
   },
   "stable": {
    "version": [
@@ -81106,10 +81272,10 @@
  },
  {
   "ename": "mason",
-  "commit": "7ac3767ca976c2820c07e0fc43168cdf71a1e875",
-  "sha256": "0q6b6kr9ysn14izc4ah7mbs1vxlpls9zdh5760mnif8a4qzs62a4",
+  "commit": "e0baa2dbf6b88dc5a76c002f5b4ab68dcd57c239",
+  "sha256": "0x6zyir0yjw4jqgivj84dbv8j057knn1hn4h3qsxl0bpxkc65fgq",
   "fetcher": "github",
-  "repo": "deirn/mason.el",
+  "repo": "mason-org/mason.el",
   "unstable": {
    "version": [
     20260409,
@@ -81304,20 +81470,20 @@
   "repo": "mathworks/Emacs-MATLAB-Mode",
   "unstable": {
    "version": [
-    20260315,
-    1223
+    20260419,
+    1224
    ],
-   "commit": "f21e88655823e25c6f72c38c6e508a5dada17088",
-   "sha256": "0174yi7r4qwcgpb46i9szx1b2qc20wkp1laxj00r564119sv1m0r"
+   "commit": "a42d34dfc498b8754ac89512b399b77481791406",
+   "sha256": "020ay6d8hm6z8n6p70yi4hpa0kzbc0dd2kwik3d2jgwdc9s8sb8i"
   },
   "stable": {
    "version": [
     8,
-    1,
-    2
+    2,
+    0
    ],
-   "commit": "f21e88655823e25c6f72c38c6e508a5dada17088",
-   "sha256": "0174yi7r4qwcgpb46i9szx1b2qc20wkp1laxj00r564119sv1m0r"
+   "commit": "a42d34dfc498b8754ac89512b399b77481791406",
+   "sha256": "020ay6d8hm6z8n6p70yi4hpa0kzbc0dd2kwik3d2jgwdc9s8sb8i"
   }
  },
  {
@@ -81577,11 +81743,11 @@
   "repo": "laurynas-biveinis/mcp-server-lib.el",
   "unstable": {
    "version": [
-    20260319,
-    1344
+    20260415,
+    1038
    ],
-   "commit": "69722cd8f6e2c6bb1beb921f0a44a0d71a01902f",
-   "sha256": "01gmsqkgy1ldh37d524nvbz00myz4bszc9hgy4wwda8pv56wwq5g"
+   "commit": "942d0d2da3a6b61be4d4b12e8158f8b0189963a8",
+   "sha256": "0brfaqm0f670zkgqf4k1dww1ji26rmgwpc2xxa3s23cp0csv136h"
   },
   "stable": {
    "version": [
@@ -81770,11 +81936,11 @@
   "repo": "ideasman42/emacs-meep",
   "unstable": {
    "version": [
-    20260403,
-    1210
+    20260423,
+    152
    ],
-   "commit": "73936fe0fc314519ab3a15b59ab1d8557df16a4e",
-   "sha256": "1wdys4h4a6wakkv0nr5xnr5ryzhgz6i23ia3765gl0jzzi91rmap"
+   "commit": "98a8b2bd6384237005e258a647f3d16a90bc0b97",
+   "sha256": "16q48yh2nzrf07x5j7kkb9s0ykdnvkw2glzk2ds3wf6zhq10agjl"
   }
  },
  {
@@ -82510,11 +82676,11 @@
   "repo": "kazu-yamamoto/Mew",
   "unstable": {
    "version": [
-    20260403,
-    320
+    20260424,
+    551
    ],
-   "commit": "ee3d2ac1a898f3fe8e54a6a431053b303faf96e7",
-   "sha256": "01ackbsqwql8qjajgzi8aal5rhgh9k96y3mnanj1lpc3fa0dqa3m"
+   "commit": "b53e86e1a9bd7db8634387ee54e5af62e35925ad",
+   "sha256": "0is3lvaxgsv1qvh3m0qa9s91m7wffsqjnwzyv5csd85xs6rypv16"
   },
   "stable": {
    "version": [
@@ -83252,15 +83418,15 @@
   "repo": "milanglacier/minuet-ai.el",
   "unstable": {
    "version": [
-    20260318,
-    505
+    20260424,
+    430
    ],
    "deps": [
     "dash",
     "plz"
    ],
-   "commit": "1d94d7bea657e5b17b135ec232aeb2d77cf0c5da",
-   "sha256": "1mmxlww28yrzvaqd1n4g05rmniq1x6ywsdd75ap85p7g4cbiqn19"
+   "commit": "36049820ca987c79c87cc4d9f21d16ca23ff8ebb",
+   "sha256": "15165fn161c6fvqcrpfffy7l5abs7zscarzhhvzbwppqk3r9wrq8"
   },
   "stable": {
    "version": [
@@ -84023,6 +84189,25 @@
    "sha256": "057lhrlnyhl0hdp419lvl0fqpkkp3msmzn7gynvqmjig756dra7p"
   }
  },
+ {
+  "ename": "modus-ewal-theme",
+  "commit": "fffc98c3dbde4ac52208e0af28a195c0a85c8f8c",
+  "sha256": "1qqxwlcw3ri95dfdl1fqbphrg8vxbk2rwcp1a25gn3rypzqxxm9v",
+  "fetcher": "github",
+  "repo": "deadendpl/modus-ewal-theme",
+  "unstable": {
+   "version": [
+    20260413,
+    1551
+   ],
+   "deps": [
+    "ewal",
+    "modus-themes"
+   ],
+   "commit": "4e52d98c95fb506daa2eec35c6141171f686649d",
+   "sha256": "0ph4vshvl8knbqhxbklca73zkh0pgihar85lfliyahcr32zfpiax"
+  }
+ },
  {
   "ename": "modus-themes",
   "commit": "aa92d00cfd7b5a62902a04c167679963e059b5d6",
@@ -84031,11 +84216,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20260410,
-    1158
+    20260418,
+    1313
    ],
-   "commit": "df74b73a600e203eefd9bfcc5e31f8c5888032e8",
-   "sha256": "1m3ihmlwa01m11pd05m0z2bixnbgncyyz3mi8fs5d819n0y9y8n8"
+   "commit": "7c2ce1ff0dc25215061d05a9d796d6193f93c84e",
+   "sha256": "0ymzjwqbmszjsy30057m91vwvbqyvprsjd7r0cxigqspk2qabfiy"
   },
   "stable": {
    "version": [
@@ -85814,14 +85999,14 @@
   "repo": "magnars/multiple-cursors.el",
   "unstable": {
    "version": [
-    20260410,
-    1331
+    20260419,
+    931
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "6f984c6e1d5f144027d2b6eafb6b77744fb2f8d5",
-   "sha256": "0h9kvfw6f6if3nkmypff1gcqx6w5id0254z0d7cn5q4gdfq2m9p6"
+   "commit": "94b8b07a4bab87f803123723b68227565429dfa1",
+   "sha256": "1bxj0bcdn4cdvszq67dwxggasv3xs4xh6403ldl4m475i7w5mgx9"
   },
   "stable": {
    "version": [
@@ -86424,11 +86609,11 @@
   "repo": "kenranunderscore/emacs-naga-theme",
   "unstable": {
    "version": [
-    20250608,
-    1926
+    20260422,
+    1017
    ],
-   "commit": "c150b397d1a14e470dd54d2628b2bd9d3e2faad0",
-   "sha256": "1c689cwq9ar9fa8nk9hqnrg3kyrj0cykhwwnmcwgiwxkk1cm53b9"
+   "commit": "1ffb5930e57ee0a1073b206ff09ea25ef542b6bc",
+   "sha256": "11sr87wqv7l4fp9gg4xb29m4n8vd8rhxj834y6nayy88mc3qh2ph"
   }
  },
  {
@@ -87038,11 +87223,11 @@
   "repo": "bbatsov/neocaml",
   "unstable": {
    "version": [
-    20260410,
-    1000
+    20260416,
+    647
    ],
-   "commit": "deb95d8b87641cf31d64487f627d8a51e48ff2e7",
-   "sha256": "0prsi5g8wamh6v4l6jqsws78q63i07gfxkgbvns139fckdssgr2b"
+   "commit": "06794d8d9ae1180a37b71b02ed8eadd464129b73",
+   "sha256": "1wzjsk8252clak794yhk89s2qwgcl95a8mgdyd6wvn4a4bg0ksaw"
   },
   "stable": {
    "version": [
@@ -87140,15 +87325,15 @@
   "repo": "rainstormstudio/nerd-icons-completion",
   "unstable": {
    "version": [
-    20251029,
-    2106
+    20260412,
+    243
    ],
    "deps": [
     "compat",
     "nerd-icons"
    ],
-   "commit": "d09ea987ed3d2cc64137234f27851594050e2b64",
-   "sha256": "022yfkfvcywgjplvsj5xajmc24q1c7yx0l5mvnzagjfdg4iajidv"
+   "commit": "45b585d972192a3eaeb239e15e55de7f46f8920a",
+   "sha256": "0vipmrxmk6i1by32ygqlg3kj2qx9hdz9f8y5pp33g7qvy4vmavw6"
   }
  },
  {
@@ -87189,14 +87374,14 @@
   "repo": "rainstormstudio/nerd-icons-dired",
   "unstable": {
    "version": [
-    20260206,
-    1554
+    20260415,
+    1746
    ],
    "deps": [
     "nerd-icons"
    ],
-   "commit": "929b62f01b93d30a3f42cc507fc45c84a2457b3f",
-   "sha256": "1z7nj89wm4w9c01p69wmxgj57nv4kwc4gkgbpycwv9avj2z4fad7"
+   "commit": "104acd8879528b8115589f35f1bbcbe231ad732f",
+   "sha256": "0qj603mydyi0rq8j84kvh9h20fshvvbr6b42ccijkqjzg4cs4rwv"
   }
  },
  {
@@ -87347,11 +87532,11 @@
   "repo": "Feyorsh/nethack-el",
   "unstable": {
    "version": [
-    20260409,
-    735
+    20260417,
+    234
    ],
-   "commit": "d1688d8d4c0a9cc5ffa7f880138f9fb09d205e64",
-   "sha256": "0f5i1gnv8cd3cxc10y7rjwrxxw6fr7cw6gvs8n4sqjsir6pxwz5w"
+   "commit": "4c6e483966eee5a210b99ea8de34d20146e21237",
+   "sha256": "1x5z3ncla9726pihvfw8qzdbahqii0gfh9wcfh3v03f1ggjim7hh"
   }
  },
  {
@@ -87982,11 +88167,11 @@
   "repo": "nix-community/nix-ts-mode",
   "unstable": {
    "version": [
-    20260215,
-    1421
+    20260423,
+    1718
    ],
-   "commit": "319831712125e8c9e4f14b66def518d7a633685c",
-   "sha256": "0y2l1q3cvap7jjgl47wa78c5kagj6n2lpd3bilkhxn62aj3ahm0y"
+   "commit": "50916188784786ed201a8edc70a5264eefb525e3",
+   "sha256": "14yqs2gibq7fdg79h9mcjrnxm0y6gscbvgzjlkp8gm0dmh2x8b1y"
   },
   "stable": {
    "version": [
@@ -88257,14 +88442,14 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20260406,
-    907
+    20260415,
+    2031
    ],
    "deps": [
     "compat"
    ],
-   "commit": "7bab26a5912074669aa6b4246f79bbdcfc0f65ba",
-   "sha256": "02h3rrlrjz8ymwb28v7n1lzv3kyvvba3jzzh4i4zhr3925v4chn1"
+   "commit": "3c40e8a1dd7b20c6db90874b7b3088089a48acdc",
+   "sha256": "19pbbhdad38h87mwqrhrzzbi66ml9l94rjyfh6h14xqvhy11z0y4"
   },
   "stable": {
    "version": [
@@ -89480,11 +89665,11 @@
   "repo": "Anoncheg1/emacs-oai",
   "unstable": {
    "version": [
-    20260405,
-    639
+    20260422,
+    858
    ],
-   "commit": "66ebed3e641dae8b1b8ec917a3d0228c5d2c86c6",
-   "sha256": "0cp53niqmcfvamshdpmkpri6nskxi2ygdd4q80s8isymhz916i4n"
+   "commit": "fd2fea7b49a51a1e9d6690d35b1e2f14bf389692",
+   "sha256": "00kfr18vscizfpf80a9n0yjkbrxlq9wkmrxsr0x18n458cck4fr5"
   },
   "stable": {
    "version": [
@@ -91505,20 +91690,20 @@
   "repo": "agzam/occult.el",
   "unstable": {
    "version": [
-    20260405,
-    2236
+    20260421,
+    1414
    ],
-   "commit": "3d626126ede4fd017824d44a24a577fce171bcd0",
-   "sha256": "0xi17kd63ll514jxy215bn1wm0z4wv9di0m0rffc84p1m6x8cbl2"
+   "commit": "74006325af1d96af3f26dc2dbf02baccc03d83f1",
+   "sha256": "02arn9y3i5agp4bg89rs57njqd1cvis2vvnh4l7386v319rcz2v1"
   },
   "stable": {
    "version": [
     1,
-    1,
-    1
+    2,
+    0
    ],
-   "commit": "cebdb110fe90b24c5616389e0aaa18a936a70848",
-   "sha256": "1k3nl57fp56lf9m1983qwkl20v6qvfiwbi9izr2lgfdkb67lfxg7"
+   "commit": "74006325af1d96af3f26dc2dbf02baccc03d83f1",
+   "sha256": "02arn9y3i5agp4bg89rs57njqd1cvis2vvnh4l7386v319rcz2v1"
   }
  },
  {
@@ -91896,11 +92081,11 @@
   "repo": "rnkn/olivetti",
   "unstable": {
    "version": [
-    20241030,
-    542
+    20260419,
+    703
    ],
-   "commit": "845eb7a95a3ca3325f1120c654d761b91683f598",
-   "sha256": "0hpw8q4x1ns6l838r2m0zfm7ykxsrfx893bvsn92nsn6k10p0yvr"
+   "commit": "d1bdd439421865c20e907d9abe65840c57411bc9",
+   "sha256": "1x88ncrv2mvj5lxwj79pix33mmlarh073vkx8ghdfhlk8qm05w5a"
   },
   "stable": {
    "version": [
@@ -91920,11 +92105,11 @@
   "repo": "captainflasmr/ollama-buddy",
   "unstable": {
    "version": [
-    20260410,
-    950
+    20260421,
+    1616
    ],
-   "commit": "3a1ac283ad640d66dbf358d6ea441d150e88de0c",
-   "sha256": "1x5sbag04y2vn6prrnssda6fy770wn0gizpa95mcln4vck2bhhpg"
+   "commit": "62451e54c6f523d839d46a779ebd5c03e10c38c1",
+   "sha256": "0n29n43jwscplyr8ybpb4fvsg9wcws7cslahwi9vsq0b6rg0ja2b"
   },
   "stable": {
    "version": [
@@ -92952,30 +93137,30 @@
   "repo": "eyeinsky/org-anki",
   "unstable": {
    "version": [
-    20260209,
-    1249
+    20260423,
+    741
    ],
    "deps": [
     "dash",
     "promise",
     "request"
    ],
-   "commit": "8cf3f5eb43cbe256ce892cfc867059e200a1b5bb",
-   "sha256": "1a41z676p41530vdg9kv3izc6mcnwjj7l3xbj245mvqdcyiyk7jz"
+   "commit": "2f44330aa2cd0a1f58259c9d83bb697fb0f7b0cc",
+   "sha256": "0x33724pw8xk6vwksswn7wky1q3n0cxgy0s5s25hxjwzgfg8j4n1"
   },
   "stable": {
    "version": [
     4,
     0,
-    3
+    4
    ],
    "deps": [
     "dash",
     "promise",
     "request"
    ],
-   "commit": "8cf3f5eb43cbe256ce892cfc867059e200a1b5bb",
-   "sha256": "1a41z676p41530vdg9kv3izc6mcnwjj7l3xbj245mvqdcyiyk7jz"
+   "commit": "2f44330aa2cd0a1f58259c9d83bb697fb0f7b0cc",
+   "sha256": "0x33724pw8xk6vwksswn7wky1q3n0cxgy0s5s25hxjwzgfg8j4n1"
   }
  },
  {
@@ -95125,14 +95310,14 @@
   "repo": "bastibe/org-journal",
   "unstable": {
    "version": [
-    20250525,
-    951
+    20260413,
+    1401
    ],
    "deps": [
     "org"
    ],
-   "commit": "8b9b46f988ed69baee0b3db4fde9ee5827587b1e",
-   "sha256": "0ch2g90zqmqk83y7gqdmppn577wksl817p62xa6xsp37raf4r2d7"
+   "commit": "6460f6f2b0835b4b8aa87d5fdf40cac7deb319f5",
+   "sha256": "0f0x893ivkmawhlx1wbj2calng20ln2l8crl73kbgj455nq068j6"
   },
   "stable": {
    "version": [
@@ -95298,15 +95483,15 @@
   "url": "https://repo.or.cz/org-link-beautify.git",
   "unstable": {
    "version": [
-    20260303,
-    1255
+    20260417,
+    705
    ],
    "deps": [
     "nerd-icons",
     "qrencode"
    ],
-   "commit": "e6351a77366c58f4dd6022eda5fe89aa68bccd74",
-   "sha256": "0d30q8hfprxcz4bd4vjv264a1iavs82ilfq9m7wg1kvq3qyqphgq"
+   "commit": "273e5b250fa2cc9b2dbbb63d9a7225536116fbd7",
+   "sha256": "1zhwq9mlx6bpfvqqgzmk210na7s8z9dc2cgs031by9b983rjh0bs"
   },
   "stable": {
    "version": [
@@ -95391,11 +95576,11 @@
   "repo": "Anoncheg1/emacs-org-links",
   "unstable": {
    "version": [
-    20260329,
-    1731
+    20260423,
+    1949
    ],
-   "commit": "2de5fe6f9616556b0aa0d584930673763430ade9",
-   "sha256": "1g1my6cqcdlc5vms055navjg40mij5d1rdfcw3a4amqpm4fl006b"
+   "commit": "cd2e9c074576e44469d84b5827933a035cf493c5",
+   "sha256": "01z3pph23cciv92l007s0z9rlhfgyj2ihy264s3l02csssnijma7"
   },
   "stable": {
    "version": [
@@ -95939,15 +96124,15 @@
   "repo": "org-noter/org-noter",
   "unstable": {
    "version": [
-    20260108,
-    2346
+    20260413,
+    213
    ],
    "deps": [
     "cl-lib",
     "org"
    ],
-   "commit": "81765d267e51efd8b4f5b7276000332ba3eabbf5",
-   "sha256": "06d03bv14awz5vm8y85b2wdg1vf22d4zj5s3bcz8y7qinvyfy9pm"
+   "commit": "ab9628e449d76af8b2e5a9d5fead4e03ca76a03d",
+   "sha256": "1a5q6imw3bcgb6hbz8ns91qlk6qxkzlz071ypd0jkabxs5y04x05"
   },
   "stable": {
    "version": [
@@ -96174,26 +96359,26 @@
   "repo": "skx/org-people",
   "unstable": {
    "version": [
-    20260326,
-    432
+    20260423,
+    1211
    ],
    "deps": [
     "org"
    ],
-   "commit": "95f1695fc8c01eadd1784b1d452e1052596a2149",
-   "sha256": "0czwc9qnax21dwm3mcb8l82dk9fdw7wchk2vpvx5mf811i7gyz6v"
+   "commit": "cc97f09b395f0a805020464f7bc361cb810af7a8",
+   "sha256": "1zviflgykhm1hvvckzqv8056xvl2aw884c8k3yj2j9d0z1dj40n7"
   },
   "stable": {
    "version": [
     2,
     11,
-    0
+    1
    ],
    "deps": [
     "org"
    ],
-   "commit": "95f1695fc8c01eadd1784b1d452e1052596a2149",
-   "sha256": "0czwc9qnax21dwm3mcb8l82dk9fdw7wchk2vpvx5mf811i7gyz6v"
+   "commit": "cc97f09b395f0a805020464f7bc361cb810af7a8",
+   "sha256": "1zviflgykhm1hvvckzqv8056xvl2aw884c8k3yj2j9d0z1dj40n7"
   }
  },
  {
@@ -96960,8 +97145,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20260224,
-    1637
+    20260423,
+    437
    ],
    "deps": [
     "compat",
@@ -96969,8 +97154,8 @@
     "magit-section",
     "org"
    ],
-   "commit": "20934cfb5a2e7ae037ec10bbc81ca97478738178",
-   "sha256": "1wfz4xp6l2jz3a3ji5ss0nq62lixkd2gqd6m9jag4kdic8hyd101"
+   "commit": "d42da0e594b5737d25e3662e482d110f29a2668f",
+   "sha256": "0nvbzz6q4kvv8zqwnlwkk8m469vaf8b8zh0l3d8j2gsk4whn22y3"
   },
   "stable": {
    "version": [
@@ -97456,17 +97641,18 @@
   "repo": "tanrax/org-social.el",
   "unstable": {
    "version": [
-    20260223,
-    924
+    20260418,
+    1402
    ],
    "deps": [
+    "async-http-queue",
     "emojify",
     "org",
     "request",
     "seq"
    ],
-   "commit": "367ab5cf6ae12715bb9cade7a8eb45cf8d7f8723",
-   "sha256": "1aw0zfg898ggyn139n0x2fgaygayl14gv48mq59zw6b8ffkrff52"
+   "commit": "613dcf8b65216a32afee1c42bb3273f6c4e1cd91",
+   "sha256": "14nnnfwp2wqhvv4pcwhasynrjgp6yyqkisfsqmsc87w0akfaziph"
   },
   "stable": {
    "version": [
@@ -97645,11 +97831,11 @@
   "repo": "bastibe/org-static-blog",
   "unstable": {
    "version": [
-    20250320,
-    1842
+    20260413,
+    1402
    ],
-   "commit": "728968e4a84ba28c5acedc54ece17e49d6811ad9",
-   "sha256": "1b07q89j153i7al78cg9pxaz93yk0qbdf4mwaalrwiqfkdbm5msn"
+   "commit": "353fcde0aa27ce11c3513fb4d25ac49fb0b9c57d",
+   "sha256": "01k065g9jw0a21yk63mh0ajf0vzca0w9m7k1i483qjjy5ig9x6ra"
   },
   "stable": {
    "version": [
@@ -99375,11 +99561,11 @@
   "repo": "tbanel/orgaggregate",
   "unstable": {
    "version": [
-    20260330,
-    745
+    20260412,
+    811
    ],
-   "commit": "7a60cba3f26681c4c57ebb79593ff9a8d587db5c",
-   "sha256": "10cc88wrxvlrh48q2sla1zlwaqxcrc0s6nkrxx37kgirdg6wiz6h"
+   "commit": "348394cbd9d8a25b61bccd284196c97a065b7013",
+   "sha256": "1jriyc1ir4agljygsq4qc7qdr57231ba2gy1p64pccad01nkpbxl"
   }
  },
  {
@@ -99420,11 +99606,11 @@
   "repo": "tbanel/orgtbljoin",
   "unstable": {
    "version": [
-    20260330,
-    846
+    20260412,
+    844
    ],
-   "commit": "c4a48b1e5056e58b17231bb672d25c6a3be6e681",
-   "sha256": "1sq46888344akp56p6x7yj9l3h7g7d21n520db2wb6kkhf7vxwrv"
+   "commit": "37883c21e85e71797538d154226e24666bc73047",
+   "sha256": "0asvlwp7z350v7iphmvfrsgqmw8bfgqvi3bcgpxf2w7i6624hdks"
   }
  },
  {
@@ -99930,11 +100116,11 @@
   "repo": "jamescherti/outline-indent.el",
   "unstable": {
    "version": [
-    20260324,
-    59
+    20260416,
+    1902
    ],
-   "commit": "85d1f66e82454829fcda5aa40334bb47be10586c",
-   "sha256": "1r12xvlxr6mylz0jkc63hwdsapw73xcqvqry5xbyqc6d778m0zsz"
+   "commit": "b25886d0b6a6de1b6c3e881230e41b76ad8652e0",
+   "sha256": "1bmfi4bc0zjczivq7dc7zb1z016sswpz83czsfp0ggpm4xfjv79w"
   },
   "stable": {
    "version": [
@@ -100155,8 +100341,8 @@
   "repo": "vale981/overleaf.el",
   "unstable": {
    "version": [
-    20260406,
-    118
+    20260417,
+    1854
    ],
    "deps": [
     "plz",
@@ -100164,8 +100350,8 @@
     "webdriver",
     "websocket"
    ],
-   "commit": "dc88dd79b016c90297912a81035b6ca685cc9136",
-   "sha256": "1c5bvfkf1rsh8rwskf809mi9k8448a46w8wkf5w5af8xwfsd9mng"
+   "commit": "62c31c609d7d96ec6c592eec40fba41735e40875",
+   "sha256": "1bj7jq63v52gn8jaa7bsi22ac321j21cmsxd9vl5kvvagzrjqbiv"
   },
   "stable": {
    "version": [
@@ -100698,16 +100884,16 @@
   "repo": "zzamboni/ox-leanpub",
   "unstable": {
    "version": [
-    20251028,
-    957
+    20260419,
+    2104
    ],
    "deps": [
     "org",
     "ox-gfm",
     "s"
    ],
-   "commit": "c1550a1f828afeee909850f51d7a0219a261e280",
-   "sha256": "1vi91ri2rz3q7z5qlidw357hlvnj7vqpsv85mjlkrwnqlvkkslx1"
+   "commit": "cfd521786c281ad7fa38212016226af80e163329",
+   "sha256": "1mf3s459b4s2ykj9af0j9afx3c77gndnyzlfb38ml2c17pl3jrsa"
   }
  },
  {
@@ -101228,14 +101414,14 @@
   "repo": "jmpunkt/ox-typst",
   "unstable": {
    "version": [
-    20251130,
-    1244
+    20260419,
+    1805
    ],
    "deps": [
     "org"
    ],
-   "commit": "ac8893c79fa85a92a9251a695776971526ba8d76",
-   "sha256": "0fkvkipik2lr97d4ix1zah8qnb48nk44755clmf6yv3xaa2fzxnh"
+   "commit": "d05bdf1676c7564af6d87b438c669e93904c2b10",
+   "sha256": "10y15nhb3lkcykxd12wl8maf7ygvshif6r1nnk4hxjacsa8p6dkc"
   }
  },
  {
@@ -101520,14 +101706,14 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20260301,
-    1635
+    20260421,
+    2136
    ],
    "deps": [
     "compat"
    ],
-   "commit": "de5b4dada04d85c4df7a424e23a9e637669e4e1e",
-   "sha256": "09m87nd7w327scvjcyv07qgpdz3bqb5cjwlnp6v3q572l2zy2j6p"
+   "commit": "2db42a9050923c2245bb525345a8b12bd6c0973a",
+   "sha256": "15iajmnrgm1lcl792km7c34nfw9r2dhy5hrzpvv4raijvcbhxkpq"
   },
   "stable": {
    "version": [
@@ -102604,28 +102790,28 @@
   "repo": "rjekker/password-store-menu",
   "unstable": {
    "version": [
-    20250706,
-    1858
+    20260423,
+    1011
    ],
    "deps": [
     "password-store",
     "transient"
    ],
-   "commit": "31b0884d1cdc80ad4ee7d84680c11653e659bb18",
-   "sha256": "1jz8r0h2anq5q9nz0klnn2ig89d0d133qq5gmhsgf5j29cbhgphl"
+   "commit": "b007d990f895a9bc41048080cb1dd2c2b7f1b92c",
+   "sha256": "18qxh3n4yh2f5j8knrjizwzcafh010hf5zgaafqgr9zlaaf4hcj0"
   },
   "stable": {
    "version": [
     1,
     2,
-    0
+    1
    ],
    "deps": [
     "password-store",
     "transient"
    ],
-   "commit": "31b0884d1cdc80ad4ee7d84680c11653e659bb18",
-   "sha256": "1jz8r0h2anq5q9nz0klnn2ig89d0d133qq5gmhsgf5j29cbhgphl"
+   "commit": "b007d990f895a9bc41048080cb1dd2c2b7f1b92c",
+   "sha256": "18qxh3n4yh2f5j8knrjizwzcafh010hf5zgaafqgr9zlaaf4hcj0"
   }
  },
  {
@@ -103998,25 +104184,25 @@
   "repo": "emarsden/pg-el",
   "unstable": {
    "version": [
-    20260328,
-    1624
+    20260418,
+    1149
    ],
    "deps": [
     "peg"
    ],
-   "commit": "67f50311947a54913d91852ebd6880dbe68930bc",
-   "sha256": "0w9a8y3s2dbmpqbbnxycxd38niqq2slzr26bfl4v1pfcm0w7skfz"
+   "commit": "e82be0a8a69042c102119b9c7d59619f3a2277a3",
+   "sha256": "164kfd0lc1qw3wnlxqyjmqd3yhmkkf81qmgdx0kydlrij8a7z594"
   },
   "stable": {
    "version": [
     0,
-    63
+    65
    ],
    "deps": [
     "peg"
    ],
-   "commit": "52888cb6120407654f248877b2a78a75f7df0d99",
-   "sha256": "19hh45mlb4j6a3ys3wvivj0bm5xy5vjwscnvn68b656b5jk5himh"
+   "commit": "e82be0a8a69042c102119b9c7d59619f3a2277a3",
+   "sha256": "164kfd0lc1qw3wnlxqyjmqd3yhmkkf81qmgdx0kydlrij8a7z594"
   }
  },
  {
@@ -104590,30 +104776,30 @@
   "repo": "dnouri/pi-coding-agent",
   "unstable": {
    "version": [
-    20260405,
-    21
+    20260418,
+    1713
    ],
    "deps": [
     "markdown-table-wrap",
     "md-ts-mode",
     "transient"
    ],
-   "commit": "ce067c80306616cc7c3bdf38f4c32c1a1d276e57",
-   "sha256": "1ggay80yn3vv6lmldsmzj6g6hs6zkgp21cw6rrzx7q3hxca2amw9"
+   "commit": "a07e1d0a3a2dbbac6f1d2a92656d2239f0dcb2c7",
+   "sha256": "03cdqhsqml5sbpa2pm06hphavhnyq1b11nany1cpg7hshixz37wr"
   },
   "stable": {
    "version": [
     2,
     2,
-    0
+    1
    ],
    "deps": [
     "markdown-table-wrap",
     "md-ts-mode",
     "transient"
    ],
-   "commit": "ce067c80306616cc7c3bdf38f4c32c1a1d276e57",
-   "sha256": "1ggay80yn3vv6lmldsmzj6g6hs6zkgp21cw6rrzx7q3hxca2amw9"
+   "commit": "ca0d60474cede8198329a939a902f51081543612",
+   "sha256": "16vhk22gdcyl87l1fknkzqkr7nxyqrs2hlghr3vwlmcj9igr4cfa"
   }
  },
  {
@@ -104884,11 +105070,11 @@
   "repo": "themkat/pink-bliss-uwu",
   "unstable": {
    "version": [
-    20251211,
-    1304
+    20260413,
+    1827
    ],
-   "commit": "be3ceccb6fc035ca9dbfff4a54e653b8621f949a",
-   "sha256": "133hpn0c0chs5r9a7a33l0i6jykvhdi3qa02iqnxylai65wr5jbw"
+   "commit": "26e90134adc997c8f6fbf3820fa9198afa6c832b",
+   "sha256": "0hdkpjq8rnr8303glqcl8da9pz4p5122a6isd16j3pdq2nn32mmc"
   }
  },
  {
@@ -106635,6 +106821,24 @@
    "sha256": "1x1nnc0li8jd609lnmmax2hl69wmbq84c6b2mdg0wb7zf0k29lba"
   }
  },
+ {
+  "ename": "popterm",
+  "commit": "e4d79aed1b29079b096ae3453d874fd830b369b7",
+  "sha256": "1k0kzr7ax1mzpv60ln1ky2x06yl7psznga6x4mnh52xxgwh1f95m",
+  "fetcher": "github",
+  "repo": "CsBigDataHub/popterm.el",
+  "unstable": {
+   "version": [
+    20260423,
+    2106
+   ],
+   "deps": [
+    "posframe"
+   ],
+   "commit": "7efcca742ec9a23c2e6e627b2c1d42aa752dea5d",
+   "sha256": "0j0y4rgvrvj3kkr10qyl89nmdp7yzpqa9j1yy2bxaalsff6pbdpd"
+  }
+ },
  {
   "ename": "popup",
   "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
@@ -106922,11 +107126,11 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20260302,
-    251
+    20260423,
+    213
    ],
-   "commit": "3a80911b2f45ce6926196930bb7d5cc662c7b3c8",
-   "sha256": "1rq90mrxvkyavz6qyv2dfg9spk1yskwaqiixq8diximmc67xqm4h"
+   "commit": "fcf1757baee481f617fbf2dc39f8c561207df263",
+   "sha256": "0r6kr3b5kr34kbcic61qnjyhli9imz6n4arddf3v3c34abamgvdy"
   },
   "stable": {
    "version": [
@@ -107112,10 +107316,10 @@
  },
  {
   "ename": "ppcompile",
-  "commit": "33213ca9e98ba41787d1617e6effb4c228d6c8f4",
-  "sha256": "14wwy6mp0ih9szx6jx6z0s3pdzgwj8m0ihn0apl37ivypmyzzcnb",
+  "commit": "779b9f02eefa485afd560316f364c20296cfe0d8",
+  "sha256": "0wjpk8hrb03rkkynrp68favg8mx48byw9ankhnckwd99yyl9bn4h",
   "fetcher": "github",
-  "repo": "whatacold/ppcompile",
+  "repo": "kenhuang-io/ppcompile",
   "unstable": {
    "version": [
     20220619,
@@ -107189,8 +107393,8 @@
   "repo": "blahgeek/emacs-pr-review",
   "unstable": {
    "version": [
-    20260323,
-    1418
+    20260423,
+    953
    ],
    "deps": [
     "ghub",
@@ -107198,8 +107402,8 @@
     "magit-section",
     "markdown-mode"
    ],
-   "commit": "1bb67e6a10869ccef75812f421d35b0366d95cf5",
-   "sha256": "0crwh6dkh4rp7wlphaw74mnw6dh851l7xm01i6prx5pil02nwcbd"
+   "commit": "23dcb45979e58c971d1d9a94f0af819f5d04d583",
+   "sha256": "08gw1bb87f9rs812adfadqzccm63pm06mr7b4g0dnji1sclzfryv"
   },
   "stable": {
    "version": [
@@ -107983,20 +108187,20 @@
   "repo": "jabbo/project-butler",
   "unstable": {
    "version": [
-    20240718,
-    1920
+    20260412,
+    1017
    ],
-   "commit": "7a20dd1e0672942ba971978baffa063b399151ef",
-   "sha256": "1a4d0m6gri04njm70xyc64nk8ypcvbywdhxpvvwa13sbaqq8af3p"
+   "commit": "87e5c035a4602fa4400a44a3dd413dfbf5e5c2e4",
+   "sha256": "1bglmadx8d6kx98sldx53v4na0i14l8vqwppd9agi6nrdw8bk9mn"
   },
   "stable": {
    "version": [
     0,
     4,
-    0
+    1
    ],
-   "commit": "7a20dd1e0672942ba971978baffa063b399151ef",
-   "sha256": "1a4d0m6gri04njm70xyc64nk8ypcvbywdhxpvvwa13sbaqq8af3p"
+   "commit": "87e5c035a4602fa4400a44a3dd413dfbf5e5c2e4",
+   "sha256": "1bglmadx8d6kx98sldx53v4na0i14l8vqwppd9agi6nrdw8bk9mn"
   }
  },
  {
@@ -108133,14 +108337,14 @@
   "repo": "harrybournis/project.el-rails",
   "unstable": {
    "version": [
-    20260201,
-    1909
+    20260415,
+    1855
    ],
    "deps": [
     "inflections"
    ],
-   "commit": "653e31a0b7b08445fa3efc41d741d642a46f9903",
-   "sha256": "0lk65na3l5ww1f45bv6d4zrjsbvf15lbly4val03cal9f15nds7k"
+   "commit": "d066f984eb88c6d239d19adbf8025bcafe665d53",
+   "sha256": "175vsmf3zgl7qi8sa4pnhzjk0b3qr1a02pg16nlxa0ci4kx59x34"
   }
  },
  {
@@ -110548,11 +110752,11 @@
   "repo": "python-mode-devs/python-mode",
   "unstable": {
    "version": [
-    20260131,
-    1655
+    20260410,
+    1849
    ],
-   "commit": "2a6fdb1c823bf8125f6354727db63c8894092821",
-   "sha256": "07bpqfg11xrcsmbqmchgm77gi8ljgnn3wfajd4wbfh3w65yfcfdi"
+   "commit": "c6f7bcd79d43b2a4915b75c481355601f95968a0",
+   "sha256": "09hhiwsk08c34h8v98q1s4g09byvj3r1dn18agl4x1v2528fiszk"
   },
   "stable": {
    "version": [
@@ -110644,6 +110848,29 @@
    "sha256": "0ww0qf9hsd8j31dc0p3fmsiqsir3mqbd4pwv4i29qidmbgrk3cv0"
   }
  },
+ {
+  "ename": "python-unicode-escape",
+  "commit": "02a68ff9693c954000b2573677aba6ddbdf58fb8",
+  "sha256": "050x40gdbswqq7nx0rgrvz2p5ab9pwivw9xw0nvk6wmc3kwhq95d",
+  "fetcher": "github",
+  "repo": "jb3/python-unicode-escape",
+  "unstable": {
+   "version": [
+    20260412,
+    2143
+   ],
+   "commit": "5ccc09f6bb773d6aa649aa569cf16099c2d85d0a",
+   "sha256": "09f6z62dkak3nllyvgf6657ihmar0w9i5a4x7hddaafx5rf6bn27"
+  },
+  "stable": {
+   "version": [
+    0,
+    5
+   ],
+   "commit": "5ccc09f6bb773d6aa649aa569cf16099c2d85d0a",
+   "sha256": "09f6z62dkak3nllyvgf6657ihmar0w9i5a4x7hddaafx5rf6bn27"
+  }
+ },
  {
   "ename": "python-view-data",
   "commit": "0e0050389c09b1e678f444b67d91f1596d9cc48c",
@@ -110791,11 +111018,11 @@
   "repo": "psaris/q-mode",
   "unstable": {
    "version": [
-    20260402,
-    210
+    20260418,
+    249
    ],
-   "commit": "2cc0745bf0cc4251db39b109e9d068eb5794d1eb",
-   "sha256": "0p77qgjvszyc8bslbd6z1sxkbnlygspd4ql6s4gg88ahirz7hi36"
+   "commit": "7690b9569892bf5e5f87cae290cb6a861cd1deeb",
+   "sha256": "0m9rxh51pny3cpiy4x24qqpgpfbaibdfv1yh5ckzy8hqcgkxq222"
   }
  },
  {
@@ -112203,16 +112430,16 @@
   "repo": "realgud/realgud",
   "unstable": {
    "version": [
-    20260407,
-    1610
+    20260411,
+    2216
    ],
    "deps": [
     "load-relative",
     "loc-changes",
     "test-simple"
    ],
-   "commit": "e391200705804aa035627672f5ae62d3c3113b16",
-   "sha256": "0pn2kmplbd88cnk106dv51x9p5gc6nw61crqakk0nz0wy1rs42q9"
+   "commit": "34a9065d1695c3b4bfbae076440397ad24bc8faf",
+   "sha256": "1bwdmkj0imlarki09k5i1lrhk3c1rqa899zy6n8j76xpcc57jqwl"
   },
   "stable": {
    "version": [
@@ -113761,11 +113988,11 @@
   "repo": "jjlee/rescript-mode",
   "unstable": {
    "version": [
-    20260405,
-    1650
+    20260419,
+    1929
    ],
-   "commit": "f19e2638b6b34d323096597464f422d9e2ad795f",
-   "sha256": "1lzb67va7y0acdsrq9i03i1ww03mw81nsn0v55zl0p1zjwrmffkg"
+   "commit": "202cf1202f286b4440980e46c0a0c0a8003f7ec6",
+   "sha256": "0xfrqf61y70dl600p7pqg7fmykv5jwmis2m8r3dxgxajw84vl80j"
   }
  },
  {
@@ -114520,6 +114747,36 @@
    "sha256": "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237"
   }
  },
+ {
+  "ename": "rimel",
+  "commit": "9071d1f195bcc22bbfb9c4486e5a8a5ec0d477c3",
+  "sha256": "197r8a0s0ixkkq8gh0ia23q42wgh9mxzq9pakma6wdxjljggqm5f",
+  "fetcher": "github",
+  "repo": "jixiuf/rimel",
+  "unstable": {
+   "version": [
+    20260420,
+    1036
+   ],
+   "deps": [
+    "liberime"
+   ],
+   "commit": "1b7e6c7c626b36a7f80e8c388454bb4562da11e9",
+   "sha256": "00arwm2r3m80lq41ywdn0220a12ski8iwigxnr83wfh771kb2iw1"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "deps": [
+    "liberime"
+   ],
+   "commit": "3531488f0304edb547dcad5309287d9cbc6c5e24",
+   "sha256": "06w69470dwwg16qx7yv14ig9yx409aawcx91i4abcfy8f6msxk4g"
+  }
+ },
  {
   "ename": "rinari",
   "commit": "4b243a909faa71e14ee7ca4f307df8e8136e5d7c",
@@ -114816,6 +115073,21 @@
    "sha256": "0id77k08ckr9780wbwhl5adbd7fin6lwgxi1m71fd1d9lxx9ai5x"
   }
  },
+ {
+  "ename": "rocq-timing",
+  "commit": "6ff99a634aeba7f30c346de94e5c2d4a19424e98",
+  "sha256": "02r9xp5hdpvy0vnxijhfyc30hzq188kr948jlaa31n5wbgncz2qv",
+  "fetcher": "github",
+  "repo": "Chobbes/rocq-timing-el",
+  "unstable": {
+   "version": [
+    20260417,
+    1401
+   ],
+   "commit": "5423ac37dc6a6abff74e59ac299b57746462bd02",
+   "sha256": "18jxv247ls7f1cd2lq6lrgk8qk2jg8mdavqmks8xvv2bxyk46hp7"
+  }
+ },
  {
   "ename": "roguel-ike",
   "commit": "2db1979e039e466268ca7c264988792d3046e19a",
@@ -115101,11 +115373,14 @@
   "repo": "Thaodan/rpm-spec-mode",
   "unstable": {
    "version": [
-    20250329,
-    139
+    20260423,
+    902
    ],
-   "commit": "8cd329b78c7bc6285b7b9f2c65a58a9e778a59ca",
-   "sha256": "02ll930smiixlgaf3bxs2g30gc5alc1yd1fv8spx6d4hxrp9jvy5"
+   "deps": [
+    "compat"
+   ],
+   "commit": "90c1beceff24b9f0e02c5a141efd466d5763f957",
+   "sha256": "1ili8vmq756n103fikp0vjrl47g0c46kcfzc0agw0syhndi74rvp"
   },
   "stable": {
    "version": [
@@ -115858,11 +116133,11 @@
   "repo": "rust-lang/rust-mode",
   "unstable": {
    "version": [
-    20260227,
-    539
+    20260416,
+    505
    ],
-   "commit": "668069ad8b6ca20bd0d2334db1c0d046809affd6",
-   "sha256": "1gw3nl846bkaxp1fcq4ig5gwxrd8374x03r1d7qywbd6k0ac1m0m"
+   "commit": "06cf08810018f54bf5246d8db155c90ab60d381f",
+   "sha256": "18khvsny09dbxbhfi3fl7dyy06n69p7xl5b84brfqcl9w8rgbcmr"
   },
   "stable": {
    "version": [
@@ -116538,11 +116813,11 @@
   "repo": "yoshinari-nomura/scad-ts-mode",
   "unstable": {
    "version": [
-    20260202,
-    1350
+    20260418,
+    410
    ],
-   "commit": "afaf52a34050aa1f7da12b85b25f20beffb08e2f",
-   "sha256": "0f023iw8bkyxpy78q2wqpgrn9q8hf5nqwh8y264m3nlyp2nvn8rl"
+   "commit": "9a61e0ad7a9cf2c4274553a35fc8643506d40c68",
+   "sha256": "0s3pwn37inlaz9lbpk0fgaqnnvq64is7v69fi2vdrg1hjca3k8s0"
   }
  },
  {
@@ -116697,11 +116972,11 @@
   "repo": "emacs-pe/scihub.el",
   "unstable": {
    "version": [
-    20250104,
+    20260131,
     420
    ],
-   "commit": "899d9144f7f88925a48257dfee28988628df084d",
-   "sha256": "16vz0i0zfv6fap8dff7fy2x84rmw33kmqabr99c7x92qyjl66g95"
+   "commit": "9bbc142be1dceff6705120017b75eeac3671cb36",
+   "sha256": "0ldhch4chnn0dc5g2j3yff1id345pmlgdkn65fp5g2fc120yzlb4"
   }
  },
  {
@@ -117332,36 +117607,32 @@
  },
  {
   "ename": "sekka",
-  "commit": "350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6",
-  "sha256": "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp",
+  "commit": "02b81b5a89165f9c871027a29ccfad9d7dc16733",
+  "sha256": "1jb56mk8h1s2brp6ln1d657vkcw466xzkl6qfz3qh4nffrmbqg3h",
   "fetcher": "github",
   "repo": "kiyoka/sekka",
   "unstable": {
    "version": [
-    20170803,
-    1247
+    20260422,
+    1428
    ],
    "deps": [
-    "cl-lib",
-    "concurrent",
     "popup"
    ],
-   "commit": "d1fd5d47aacba723631d5d374169a45ff2051c41",
-   "sha256": "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0"
+   "commit": "78dfe17b2e04b03b6248e39814f84a77b4f6f2b7",
+   "sha256": "1blfj3qgm1kjk7hki7b6n0d6gixy84pa8mzlcqi0hjgdzm8yl5sp"
   },
   "stable": {
    "version": [
-    1,
-    8,
-    0
+    2,
+    0,
+    1
    ],
    "deps": [
-    "cl-lib",
-    "concurrent",
     "popup"
    ],
-   "commit": "d1fd5d47aacba723631d5d374169a45ff2051c41",
-   "sha256": "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0"
+   "commit": "d55f6df4ef13090b7c556d6791c91a24c9bb107b",
+   "sha256": "14wka3l93v6w8q6vqwxd97a6qyixrbbm57g5qbzh1ck8yyq6wamv"
   }
  },
  {
@@ -118417,11 +118688,11 @@
   "stable": {
    "version": [
     0,
-    89,
-    2
+    90,
+    1
    ],
-   "commit": "ea186d05578a3b005b035df5042dff931aa72cb6",
-   "sha256": "0cvxy8i8zd2ria7z9zc7i0ql9jxf14zsc11nm242wz414mblwmqk"
+   "commit": "38951e875c1203f1dd6d4a4a3bc57e6a7ffc066a",
+   "sha256": "06ibxnb765sjcxjv2w923cnjr9664qp2pf7w3wxdp8vrbxg1s670"
   }
  },
  {
@@ -118741,11 +119012,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20260408,
-    652
+    20260416,
+    105
    ],
-   "commit": "ac4aeb3f7bf6d5a32127062b0ae311785fbc36ff",
-   "sha256": "0nh1cgh9dq8wm4ydb27zj2v1v3wczqx6dql6cz6azma10w1484l7"
+   "commit": "d62c1225a1a9634eb5c6a76ba2b1460961befd08",
+   "sha256": "0drvaqmy8pnbhikcvmnwlbmjq0mafxq074958chggbqrjlrn9199"
   }
  },
  {
@@ -119217,6 +119488,21 @@
    "sha256": "0jsfa5dfs0kl9c7pjxi1niq1mknsxnqm9gs18l0lb9ipbzb949sr"
   }
  },
+ {
+  "ename": "sidebuf",
+  "commit": "dbca8509a7a84b72e718af0c476e62991c5080a7",
+  "sha256": "1m8q3iz286k8i7w5z90an4zxk433c2iw6pf0vl753r3a64pqx3d6",
+  "fetcher": "github",
+  "repo": "rain-64/sidebuf",
+  "unstable": {
+   "version": [
+    20260415,
+    2249
+   ],
+   "commit": "89ca26d1859e89759f00065c07904d3ef5c80a4f",
+   "sha256": "19hfypy9ca0rnh66pfyzm2g93dn0q3iak4mgs8nx9vgnwsrc64sz"
+  }
+ },
  {
   "ename": "sidecar-locals",
   "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489",
@@ -119853,11 +120139,14 @@
   "repo": "captainflasmr/simply-annotate",
   "unstable": {
    "version": [
-    20260409,
-    1122
+    20260422,
+    1527
    ],
-   "commit": "dd3883222a4e214e82323bb091587aa48750ce71",
-   "sha256": "1qvg5alykhrsx7j69m69h87f6pyi00c2v1v6wk6pcw5sn37mh6j4"
+   "deps": [
+    "transient"
+   ],
+   "commit": "fe7ed2ebcda0d1899f97f06191adbf260cc5b1eb",
+   "sha256": "0c3lwzcz6lcf1jdyxlln0npdlvnc3npz0743cjzkwy757wbdnlvs"
   },
   "stable": {
    "version": [
@@ -120192,8 +120481,8 @@
   "repo": "emacs-slack/emacs-slack",
   "unstable": {
    "version": [
-    20260316,
-    1316
+    20260417,
+    1053
    ],
    "deps": [
     "alert",
@@ -120205,8 +120494,8 @@
     "ts",
     "websocket"
    ],
-   "commit": "b4a360cdff4ca5e51a1eb9b1503b390423750a2c",
-   "sha256": "10igds0b3ix6vylfh7agjmmzqn09k9gg6kyzl15q0bpyv0p5v4jr"
+   "commit": "904741295a5df0e6a127cacaf60a567924bb27f3",
+   "sha256": "0n6z7p9b3n8mlwkwzv6b588lcla9d0izmrhf8p5ajlr1pf979i92"
   }
  },
  {
@@ -120264,14 +120553,14 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20260329,
-    2133
+    20260421,
+    2256
    ],
    "deps": [
     "macrostep"
    ],
-   "commit": "b2832e7f37d712e23493b51662bc01d7bbd96e55",
-   "sha256": "1p2yhanmbw3l0cicmsdgjm1a307vvk287r3vzzgz0g16nb8b223k"
+   "commit": "b18fc71ab25ad8dd16e008ad6ed1ac1eb34be736",
+   "sha256": "0d27fqnbsl4ispi722b8q7bsd4n32rccm0p0hysq7q0b2ml2kg1g"
   },
   "stable": {
    "version": [
@@ -120522,25 +120811,19 @@
   "repo": "davep/slstats.el",
   "unstable": {
    "version": [
-    20170823,
-    849
+    20260414,
+    1947
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "e9696066abf3f2b7b818a57c062530dfd9377033",
-   "sha256": "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83"
+   "commit": "d6f0c7428e886a39e6061d093b4ef7d8d240ba0d",
+   "sha256": "1b9dk0pi9mb4ns5ym3xgmfzi3d50r8dbxppk7arb0fa89lapp2la"
   },
   "stable": {
    "version": [
     1,
-    10
+    11
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "e9696066abf3f2b7b818a57c062530dfd9377033",
-   "sha256": "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83"
+   "commit": "d6f0c7428e886a39e6061d093b4ef7d8d240ba0d",
+   "sha256": "1b9dk0pi9mb4ns5ym3xgmfzi3d50r8dbxppk7arb0fa89lapp2la"
   }
  },
  {
@@ -122675,11 +122958,11 @@
   "repo": "nashamri/spacemacs-theme",
   "unstable": {
    "version": [
-    20251221,
-    1656
+    20260414,
+    2052
    ],
-   "commit": "5635d6bbc76e6f06b99fa5dac6e6fd6675459ca6",
-   "sha256": "0mbz0j605hw82a13ky2shqr2va0ddzrvzdpp4lbgpfiinm5f8a6m"
+   "commit": "789d20c55cd01f757929d0232dd1d5227c84ad7e",
+   "sha256": "0zxydjg954kaqsc5xi4yzr0b78nk4mxvbl5ch4yw6zv15h99n68i"
   },
   "stable": {
    "version": [
@@ -122827,11 +123110,11 @@
   "repo": "ideasman42/emacs-spatial-navigate",
   "unstable": {
    "version": [
-    20251229,
-    1145
+    20260420,
+    428
    ],
-   "commit": "9f61d3894c2f77b5fafa3f3529a39cb29cd67bc7",
-   "sha256": "039vch5s45z1966sxg73ymzd7525alnnj0lvxwhqj3ncb3w0416v"
+   "commit": "764cf2ea5ded501493bfd543c5a290b8cda847d5",
+   "sha256": "0dqa4lfw8kmnpnmf62s5p0z6y15k26c5y7vfqcv32apqzynqvkva"
   }
  },
  {
@@ -122872,11 +123155,11 @@
   "repo": "condy0919/spdx.el",
   "unstable": {
    "version": [
-    20260306,
-    122
+    20260424,
+    159
    ],
-   "commit": "65773b1b0b96c8c35d068da08dd68d6839bbb076",
-   "sha256": "12k7gci3vn84wxnpjlz5628nyvg5dxj14808k3yxxzv5p1vg3gz7"
+   "commit": "2cc92e11cc1b6007d8ffdd18c541e9ac126664ed",
+   "sha256": "01qk8zkm9kla42dabpjh04s2p8zmx7qfh27i7h5i5as0d4b3wgkh"
   }
  },
  {
@@ -123868,11 +124151,11 @@
   "repo": "WardBrian/stan-ts-mode",
   "unstable": {
    "version": [
-    20260320,
-    1817
+    20260421,
+    1440
    ],
-   "commit": "14e85d2dd8930935899db4c3156db21c7980c613",
-   "sha256": "1d2j27sxqaxha0ibhi2g043g221r0cws8clhsv0xdvnz1nl81vqs"
+   "commit": "96c039101367b854834a0f37761f8df18f18085b",
+   "sha256": "0mmb00sws09vzbq8ry7i00730hyirkwhfpxsv7yydsarci38s2hx"
   },
   "stable": {
    "version": [
@@ -124546,11 +124829,11 @@
   "repo": "jamescherti/stripspace.el",
   "unstable": {
    "version": [
-    20260324,
-    55
+    20260422,
+    1404
    ],
-   "commit": "e77dadb7ad15e8eeff8c874118f8ce461b70dd44",
-   "sha256": "0vh45vhk873mqg2m9f6ym7n19r9d9wndd9zdr0g000qdbvmrmn9v"
+   "commit": "5dd864613dc2743d0970684de7c8c01a431f1ffa",
+   "sha256": "0l1rkgj5m0cka1y2qnxhisy8sx6qldw66k0bdrf1nib9dxfw3cyn"
   },
   "stable": {
    "version": [
@@ -124562,6 +124845,21 @@
    "sha256": "0vh45vhk873mqg2m9f6ym7n19r9d9wndd9zdr0g000qdbvmrmn9v"
   }
  },
+ {
+  "ename": "struct-completion",
+  "commit": "8c63f6cc2b3598f8536e0460ae84ee328dcb97bc",
+  "sha256": "0x9509zr4zmr1wypdzmhlbf3qlc0dkfh7vncbvlppq4ac55j5rcg",
+  "fetcher": "github",
+  "repo": "gggion/struct-completion.el",
+  "unstable": {
+   "version": [
+    20260408,
+    1712
+   ],
+   "commit": "68cc1742a8efa8967b76befe7df5473f7708a21c",
+   "sha256": "13psr7cfyn0pxxisgsgnbxibznzs4gzj9yzkgdl25w10pq93ll5c"
+  }
+ },
  {
   "ename": "structurizr",
   "commit": "86528fe9acbadf6b826c01700941e3cf66361faf",
@@ -124940,8 +125238,8 @@
   "repo": "kiyoka/Sumibi",
   "unstable": {
    "version": [
-    20260408,
-    1334
+    20260417,
+    1157
    ],
    "deps": [
     "deferred",
@@ -124949,8 +125247,8 @@
     "popup",
     "unicode-escape"
    ],
-   "commit": "e52bd87416458bd8bb920b33fac9afdee27140d5",
-   "sha256": "0zbpycvymqhjx8jrfq9rszl9yyvjjk35a2fkd45ghg7kfcqhlsk3"
+   "commit": "366cf1a2a9f408cc34c1412a4b06dfe01f46d97f",
+   "sha256": "0z6g97975y2vchr2bkks4v18pk9zlcpgrffm53f4jvqjgp7pdxas"
   },
   "stable": {
    "version": [
@@ -125235,8 +125533,8 @@
   "repo": "isamert/swagg.el",
   "unstable": {
    "version": [
-    20251110,
-    2034
+    20260419,
+    1333
    ],
    "deps": [
     "compat",
@@ -125245,8 +125543,8 @@
     "s",
     "yaml"
    ],
-   "commit": "87bd1f698bc4c77a1c0d6b252e15f4ee345d2afa",
-   "sha256": "1xlknc7j5vz1sv5gwr8v6vyfginflsksjyzx6qz1svibkdwp223g"
+   "commit": "efc457f6ab95814d806b43f1b83edfa8273f7f0c",
+   "sha256": "1786vnf6ifpnp3rbllbdzipqzv1gmj2r904kkkjkmwjkjjiz03x3"
   },
   "stable": {
    "version": [
@@ -125806,14 +126104,14 @@
   "repo": "wolray/symbol-overlay",
   "unstable": {
    "version": [
-    20240913,
-    1624
+    20260423,
+    1454
    ],
    "deps": [
     "seq"
    ],
-   "commit": "6151f4279bd94b5960149596b202cdcb45cacec2",
-   "sha256": "0xqzn4j27xny3gmjan9phcl60zipp49p79nv57i7mpz8y0qahc59"
+   "commit": "253b957f5082603708b469d02ae8c31c58292823",
+   "sha256": "18w7qa959na5c9rvjarrnmb3l63pdfrfv865i3nb6lx7ap6iw2jc"
   },
   "stable": {
    "version": [
@@ -125910,11 +126208,11 @@
   "repo": "zk-phi/symon",
   "unstable": {
    "version": [
-    20260301,
-    1008
+    20260411,
+    1454
    ],
-   "commit": "0d580532853999c7f6caa6de8c7acac4c151f340",
-   "sha256": "1bqwacn8hhjr9lmsz1sq6min9qrc9zcmbjj9mmgsm0a39ifszhwk"
+   "commit": "294668d63da642276a0003cb4e9d6f8b40a13788",
+   "sha256": "0k9rhhmqhv2i38bms9vlagkjw8cb6y5lmjw8yw45z7zkj03bdwpw"
   },
   "stable": {
    "version": [
@@ -126482,8 +126780,8 @@
   "repo": "mattfidler/tabbar-ruler.el",
   "unstable": {
    "version": [
-    20160802,
-    307
+    20260417,
+    2349
    ],
    "deps": [
     "cl-lib",
@@ -126491,8 +126789,8 @@
     "powerline",
     "tabbar"
    ],
-   "commit": "535568189aa12a3eff7f977d2783e57b6a65ab6a",
-   "sha256": "1csj6qhwihdf4kfahcqhm163isiwac08w4nqid1hnca184bfk6xm"
+   "commit": "2b72193e4fa9665236ec5dd17c47d0cf91ccc977",
+   "sha256": "04y6yrgqvap4gkn0c1py8qx1vp9gpnhs5xaf82qb1ak903hwwms4"
   },
   "stable": {
    "version": [
@@ -126845,6 +127143,30 @@
    "sha256": "0llk7lan5wjpc51s833b0d0kx94gvai4g0h5qmz56qjlzlx0lb1c"
   }
  },
+ {
+  "ename": "taskjuggler-mode",
+  "commit": "a5b095a1b3624890f531078974fd0eb523db9482",
+  "sha256": "01haqjgjnwya3aq5vy21npszr9x0l9xqs68lbc3wjvvk4j18756m",
+  "fetcher": "github",
+  "repo": "devrintalen/taskjuggler-mode.el",
+  "unstable": {
+   "version": [
+    20260423,
+    1854
+   ],
+   "commit": "49d3cdf2dbf4c27e037bb4c96bb0cc6d2e000fab",
+   "sha256": "1v5hln35qwy97qnc7nrql3mr53j8q2zkadnf49mw9zdw5psl383b"
+  },
+  "stable": {
+   "version": [
+    0,
+    5,
+    2
+   ],
+   "commit": "9a43c9dcf36b52d302d41aeaf6ad62aa6776a966",
+   "sha256": "1qj57mk2qz9wwihj5jlgx4ngf4b33n581cpwvpmbidi6rj1dwb77"
+  }
+ },
  {
   "ename": "taskpaper-mode",
   "commit": "f969b1cd58dfd22041a8a2b116db0f48e321e546",
@@ -126853,11 +127175,11 @@
   "repo": "saf-dmitry/taskpaper-mode",
   "unstable": {
    "version": [
-    20260117,
-    1144
+    20260414,
+    1851
    ],
-   "commit": "19828a8048b0b7803a1b597e5bea26da9edf2895",
-   "sha256": "1lppb3kj53rc5ansnajcx6m1friy7g60qqbghpaw4hc5lw9kq22z"
+   "commit": "809c15fe893bb4ffa17bf515908a37c97e74afb9",
+   "sha256": "1gd3ip106zdwqhk39jsj2xhsn0c6wa65g6navkiy6z3gb95gs3ha"
   },
   "stable": {
    "version": [
@@ -127059,15 +127381,15 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20260409,
-    1708
+    20260416,
+    546
    ],
    "deps": [
     "transient",
     "visual-fill-column"
    ],
-   "commit": "59e919e65ef123fd26c937a9bbba1aaf80b96458",
-   "sha256": "1rbhkvhmnzb2fsgjia6x37x661l7gpmz2bv2pah4952q58vlvx7p"
+   "commit": "5196e752b1dae4367d446a3fcc6169e6a7533093",
+   "sha256": "1l6lsbzha40nvbwiaqiva96vp5iyjjqls761ggzfl3bkrslk53vq"
   },
   "stable": {
    "version": [
@@ -127709,19 +128031,20 @@
   "repo": "milanglacier/termint.el",
   "unstable": {
    "version": [
-    20251216,
-    434
+    20260412,
+    348
    ],
-   "commit": "d70d34745499d30490c7b31d014cb544ce086533",
-   "sha256": "04rq4a8jwacz05bh3qnpin7mmvlyy43wdh1vxq5yzpcazdd0skhj"
+   "commit": "689549245bb6dc0429d8af06c4830c92b09f4667",
+   "sha256": "1ggxqb9b7kv32rns9gagggmq0fsj9a8i3jkhqhfwz0c75fv05jlw"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
-   "commit": "b69db24ddbcd4b5973b3ae8e7f8b3c12dd0546b3",
-   "sha256": "1d98n5jqfiilp7pz9fkqd6vy7lx4i1xdgps7f90ach3grv2dwm49"
+   "commit": "689549245bb6dc0429d8af06c4830c92b09f4667",
+   "sha256": "1ggxqb9b7kv32rns9gagggmq0fsj9a8i3jkhqhfwz0c75fv05jlw"
   }
  },
  {
@@ -128524,21 +128847,21 @@
   "repo": "facebook/fbthrift",
   "unstable": {
    "version": [
-    20260406,
-    813
+    20260420,
+    1434
    ],
-   "commit": "a7c84a7072e9b839def6239da266315c08bce5fa",
-   "sha256": "0ipqrkm5xv5sln3rc3zayv1zaq9vh7j9z7xz8rnld4ls1sa76cyg"
+   "commit": "075dc1f32336878453b628373e8e0b29775a60d3",
+   "sha256": "08l5hjwyfb4fm8zyp5im66r2mzbd72kz7z3ircsxzzf1zwaznn6f"
   },
   "stable": {
    "version": [
     2026,
     4,
-    6,
+    20,
     0
    ],
-   "commit": "a7c84a7072e9b839def6239da266315c08bce5fa",
-   "sha256": "0ipqrkm5xv5sln3rc3zayv1zaq9vh7j9z7xz8rnld4ls1sa76cyg"
+   "commit": "075dc1f32336878453b628373e8e0b29775a60d3",
+   "sha256": "08l5hjwyfb4fm8zyp5im66r2mzbd72kz7z3ircsxzzf1zwaznn6f"
   }
  },
  {
@@ -128751,11 +129074,11 @@
   "repo": "ctanas/tiles",
   "unstable": {
    "version": [
-    20260315,
-    2112
+    20260412,
+    1929
    ],
-   "commit": "f77e2cf19b4895cd7da50922db3a622e3b848ec8",
-   "sha256": "0yyxdl2qvncghhic7h9n99hv7hqxkrq075d9m35ipiqr36461867"
+   "commit": "149a5015b3d2a2ebdd15660cab9c736549af7532",
+   "sha256": "19fmzw46vyfz6kz4ksmm5w4c6vmkyjacsqznbf0d8d9qsmy1nyf8"
   }
  },
  {
@@ -129595,6 +129918,30 @@
    "sha256": "0x9ayvd8fvgnyp2zgck3dnhs2ib3lrcwbgcdypzq6mhzfs1a2651"
   }
  },
+ {
+  "ename": "tokyo-night",
+  "commit": "d33bde292749000d39db643c5747ba3a9486f835",
+  "sha256": "1cbdz14lx4a5v6mgfsnd2rh5782pvvgy78550qbifq1gf8syddfi",
+  "fetcher": "github",
+  "repo": "bbatsov/tokyo-night-emacs",
+  "unstable": {
+   "version": [
+    20260421,
+    1234
+   ],
+   "commit": "8d30673c060ab791818e9ac3fd96ebeba93b926d",
+   "sha256": "1zgjhb9ngdll284h5gf0mdjikfgifrb1z55ydmd8vcm17b83sd48"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "commit": "17856a5d0184512c165f06b32e0749230318086a",
+   "sha256": "0jbjvl70yvlqcz0xsgm0wf8s72j3pxnljxl4jdilhdqj7mfadba4"
+  }
+ },
  {
   "ename": "tomatinho",
   "commit": "3fe20de5b2b5e5abe5be7468cea7c87f5b26b237",
@@ -130312,21 +130659,21 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20260401,
-    2145
+    20260422,
+    1646
    ],
    "deps": [
     "compat",
     "cond-let",
     "seq"
    ],
-   "commit": "8b14203107950d6eba0e17d14867e05547725219",
-   "sha256": "0khb5pzipnhb21s7wdq42mx9pbsq6fqljz3xhqdsgbjbxx1p6fcl"
+   "commit": "cd97319a851db9b2ed3faecdb735c6d089edf4e1",
+   "sha256": "18pay3a7qbxw3ci2y11d3pvzbdkp8q1n4xyr4zhz1vg2n36vj56c"
   },
   "stable": {
    "version": [
     0,
-    12,
+    13,
     0
    ],
    "deps": [
@@ -130334,8 +130681,8 @@
     "cond-let",
     "seq"
    ],
-   "commit": "1f7039ef8d548d6fe858084fcbeae7588eba4190",
-   "sha256": "1z5nqmjzwgyq1gdg2v9qmxjk8m9k74l9pz4w6qa95grpsddpb68j"
+   "commit": "cd97319a851db9b2ed3faecdb735c6d089edf4e1",
+   "sha256": "18pay3a7qbxw3ci2y11d3pvzbdkp8q1n4xyr4zhz1vg2n36vj56c"
   }
  },
  {
@@ -130790,26 +131137,26 @@
   "repo": "emacs-tree-sitter/tree-sitter-langs",
   "unstable": {
    "version": [
-    20260405,
-    1707
+    20260420,
+    54
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "af477536132d2df4ddd2754b4a53e32b914a84cc",
-   "sha256": "02g5xwbq2m2m09296i9kfiy1sr212lr33x3j1gs6f9anw0kyq622"
+   "commit": "0c9390a5ec483a63c9cecd57be71520b20a858c5",
+   "sha256": "08jsvkjnqywgar2yv2a8vz85hwfiasa849dwixhrvavfqd2ss1d9"
   },
   "stable": {
    "version": [
     0,
     13,
-    41
+    45
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "af477536132d2df4ddd2754b4a53e32b914a84cc",
-   "sha256": "02g5xwbq2m2m09296i9kfiy1sr212lr33x3j1gs6f9anw0kyq622"
+   "commit": "0c9390a5ec483a63c9cecd57be71520b20a858c5",
+   "sha256": "08jsvkjnqywgar2yv2a8vz85hwfiasa849dwixhrvavfqd2ss1d9"
   }
  },
  {
@@ -131461,6 +131808,30 @@
    "sha256": "09xjwyy388gc8bg3jvr21jaahfapfrr9jjiclq8qqx93pxz4lvfz"
   }
  },
+ {
+  "ename": "trust-manager",
+  "commit": "420c42f0bf4fb2be86fd3103b0f35bfcb48184b4",
+  "sha256": "1nsm0xb6ls8vkc987ajs4qrbaclim5fc9m1i77mfwbz0znmwn32r",
+  "fetcher": "github",
+  "repo": "eshelyaron/trust-manager",
+  "unstable": {
+   "version": [
+    20260422,
+    952
+   ],
+   "commit": "3a702921eaa65ce8de552e88f6280786a645252d",
+   "sha256": "1c6v36fa8j9q0j8s5i1kdw4gkqmv6qldsswdccvyfcmbyl2wr3dw"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    0
+   ],
+   "commit": "3a702921eaa65ce8de552e88f6280786a645252d",
+   "sha256": "1c6v36fa8j9q0j8s5i1kdw4gkqmv6qldsswdccvyfcmbyl2wr3dw"
+  }
+ },
  {
   "ename": "truthy",
   "commit": "f7a7e319dbe17e2b31353e7d7cab51d557d86e9d",
@@ -133096,14 +133467,14 @@
   "repo": "tbanel/uniline",
   "unstable": {
    "version": [
-    20260407,
-    1917
+    20260411,
+    1423
    ],
    "deps": [
     "hydra"
    ],
-   "commit": "be9f828997049c1a3bc5851e1e04f6b90a64555a",
-   "sha256": "11rph2f7npyq1dpc6sikpj5ipf7ci6k0xj2kj86k1nadvci0iv4q"
+   "commit": "14a0949539679e89f706601a501ae8a8d090c71f",
+   "sha256": "1fcqr4q5dc9kfzqp6b9wfqma4qbb6dmjia639wfgdj3xqxa8ygl7"
   }
  },
  {
@@ -133477,25 +133848,25 @@
   "repo": "mekeor/unspecified-theme",
   "unstable": {
    "version": [
-    20251203,
-    2130
+    20260417,
+    842
    ],
    "deps": [
     "most-faces"
    ],
-   "commit": "f403d8f304d319729466fe019a74402d526ab0ee",
-   "sha256": "0cafm2vmm8225wf6212ylbcf4c8qnc539j4fl3459jqzs9pbg0n3"
+   "commit": "50f87d04741e3fd6404c629a647299ae9e4f2f1d",
+   "sha256": "0w2xx24gq0hk3kxsryggl213mr38gbq3xnsxs80bhx854plv3f4z"
   },
   "stable": {
    "version": [
     0,
-    4
+    5
    ],
    "deps": [
     "most-faces"
    ],
-   "commit": "f403d8f304d319729466fe019a74402d526ab0ee",
-   "sha256": "0cafm2vmm8225wf6212ylbcf4c8qnc539j4fl3459jqzs9pbg0n3"
+   "commit": "50f87d04741e3fd6404c629a647299ae9e4f2f1d",
+   "sha256": "0w2xx24gq0hk3kxsryggl213mr38gbq3xnsxs80bhx854plv3f4z"
   }
  },
  {
@@ -133748,11 +134119,11 @@
   "repo": "domq/use-package-treesit",
   "unstable": {
    "version": [
-    20260118,
-    1521
+    20260416,
+    1048
    ],
-   "commit": "c4c2b251f3c932edc87ade3523700782c0cafcd2",
-   "sha256": "0jxxgd1lkpllzg7aasj3fqqi3k590yv256ryi2n4q5fn442irgs7"
+   "commit": "398ca0df10f2894b87c07073a446a53d943a6c18",
+   "sha256": "0kpnac51ykmhkirz7shryasd7h2gvkfrhyysy55bpn8swdzknawm"
   }
  },
  {
@@ -134343,11 +134714,11 @@
   "repo": "tarsius/vcomp",
   "unstable": {
    "version": [
-    20240302,
-    2255
+    20260420,
+    1508
    ],
-   "commit": "99831d234481a61488aca4b96b842b63a79c732a",
-   "sha256": "06qcmlr16dnvwln4136vz6m0zs5mp81awy40jv8pmvhwms9fprr7"
+   "commit": "213c3f6b085182d20065caa1c53b6a543ca42694",
+   "sha256": "1ajfpxnpbg92r2dvz9jfk2fxii079gif5sar8r6pvhqyh7868yrk"
   },
   "stable": {
    "version": [
@@ -134659,11 +135030,11 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20260223,
-    2349
+    20260414,
+    1812
    ],
-   "commit": "0625fb314341a479dd472ae5e7f10375c1988131",
-   "sha256": "0njf304naa33l6cvgjh2zmblz46g27nszpf16hmyhfz3i92gzc6y"
+   "commit": "ffe668c20120ba215f14d6d5720e327fbadbd10d",
+   "sha256": "0bvz5y05b6kvax4yak193ki8mja8v544ycg31i70863q6p356vhy"
   },
   "stable": {
    "version": [
@@ -134891,14 +135262,14 @@
   "repo": "minad/vertico",
   "unstable": {
    "version": [
-    20260309,
-    1549
+    20260419,
+    1808
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0b96e8f169653cba6530da1ab0a1c28ffa44b180",
-   "sha256": "0kia499sijkmpj5l9r0r3pwc1kjyvbfxc15k85dyfq9dvc4z1drr"
+   "commit": "daa0dddeb5bc152e13ec4f166cc2f84150b7a2e8",
+   "sha256": "1vlhmvjsgcsfhpd2hcfq1zlz0r2pb6ww1rhra17kdf5cg0dnns2q"
   },
   "stable": {
    "version": [
@@ -135711,11 +136082,11 @@
   "repo": "ianyepan/vscode-dark-plus-emacs-theme",
   "unstable": {
    "version": [
-    20260219,
-    434
+    20260420,
+    8
    ],
-   "commit": "37f16729ee196dbfc533b02adea3d2129bdd8585",
-   "sha256": "1aphhpisg20cclclnygf8wrkrw9rxh2b653jnr86ikjki6j8sw98"
+   "commit": "082b012d203fed17d54b4a3b7437db545f15ddbb",
+   "sha256": "0mik95vf8nc61g33jfmb885jrrk64xghzx0ip443gigdr1pbs2yk"
   },
   "stable": {
    "version": [
@@ -135831,14 +136202,14 @@
   "repo": "jixiuf/vterm-toggle",
   "unstable": {
    "version": [
-    20260110,
-    529
+    20260420,
+    1244
    ],
    "deps": [
     "vterm"
    ],
-   "commit": "81d031f153c5fa656c744cd518b7d54c54506706",
-   "sha256": "1p9q4c2lrwckswk33wv4rymm8ixq6chn3bpzz577qs1q408sq34m"
+   "commit": "80989c6ca35416a5c85fa76277ef49a13c3eac11",
+   "sha256": "1941hls4lz4a4ww4jmns23zydzl3z948w72m7ji22y0f0hppf1af"
   }
  },
  {
@@ -136276,11 +136647,11 @@
   "repo": "darkstego/wakib-keys",
   "unstable": {
    "version": [
-    20250405,
-    1416
+    20260420,
+    1927
    ],
-   "commit": "07258b0293c9f31ba11bd89298b9f90eb232a94c",
-   "sha256": "0b3a800165rx58dvvsmlvz3gkxdgnimkxzdpxxzc1msac7dccl7b"
+   "commit": "39a8cd3c61b4d2b1f93e2de8e56906f4a648959b",
+   "sha256": "14q6a5w58sgvvpry4k1rkv8xhpxpw59qv3kri5ymd75q397g7icn"
   },
   "stable": {
    "version": [
@@ -138292,14 +138663,14 @@
   "repo": "magit/with-editor",
   "unstable": {
    "version": [
-    20260301,
-    1317
+    20260417,
+    751
    ],
    "deps": [
     "compat"
    ],
-   "commit": "64211dcb815f2533ac3d2a7e56ff36ae804d8338",
-   "sha256": "0gxmmzx7z84d4684q58ijms7d555ngasvzhfz2gna9awly5qig6z"
+   "commit": "d0935036eb894680d8ca1a4d1ed8e8d5d90005e5",
+   "sha256": "15vvc6awlk8mzqqfqn7n3k349skzg0jk645sjgmzq1sfig4yfcsy"
   },
   "stable": {
    "version": [
@@ -139019,14 +139390,14 @@
   "repo": "cjennings/emacs-wttrin",
   "unstable": {
    "version": [
-    20260404,
-    2146
+    20260422,
+    507
    ],
    "deps": [
     "xterm-color"
    ],
-   "commit": "a0f1b4f07c98ab3d4d4b50a330822d0991b733a7",
-   "sha256": "1b28z8zl53lf5cvybynsnkhs85jz346y7vvhd32l1ypwsr7s0p4d"
+   "commit": "9958ec4c4396ae8435f7e1818ff383c05df47a14",
+   "sha256": "1i4k7aj2w5mawfc9h8h7s5c3r886bmzxf4ai2q1caarhckb81wj3"
   },
   "stable": {
    "version": [
@@ -140063,11 +140434,11 @@
   "repo": "yoshiki/yaml-mode",
   "unstable": {
    "version": [
-    20241003,
-    153
+    20260420,
+    156
    ],
-   "commit": "d91f878729312a6beed77e6637c60497c5786efa",
-   "sha256": "0r5jx5rbgbhn5klhw76mcqmnkaxyc5y1lmp91fs0anw4qfy0f4h7"
+   "commit": "62cbd80507765aa8326bd6aef3aacd8d9be2d71a",
+   "sha256": "1n7hl80nqnc92bppj7iv8sr1phk3124529zr15n3lr31fydamsdg"
   },
   "stable": {
    "version": [
@@ -140300,8 +140671,8 @@
  },
  {
   "ename": "yasnippet",
-  "commit": "5d1927dc3351d3522de1baccdc4ce200ba52bd6e",
-  "sha256": "1r37vz5b8nj6hr6c2ki9fdbrs3kkb4zwimh8r4ixm10kdkk5jqds",
+  "commit": "21d2caa9d9414345d3ec10bbf74cb26a204446c3",
+  "sha256": "00qc0kkz74wljmsxjwn8xh5yj556fp3qpbd0p3anz80vspkbpvyq",
   "fetcher": "github",
   "repo": "joaotavora/yasnippet",
   "unstable": {
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 0c44afee06e7..8a39e96f900e 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -97,9 +97,10 @@
   withXwidgets ?
     !noGui
     && (withGTK3 || withPgtk || withNS || variant == "macport")
-    && (stdenv.hostPlatform.isDarwin || lib.versionOlder version "30"),
+    && (stdenv.hostPlatform.isDarwin || lib.versions.major version != "30"),
   # XXX: - upstream bug 66068 precludes newer versions of webkit2gtk (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html)
   # XXX: - Apple_SDK WebKit is compatible with Emacs.
+  # XXX: - upstream bug 80728 lifts the webkit2gtk version check added in upstream bug 66068
   withSmallJaDic ? false,
   withCompressInstall ? true,
 
@@ -165,37 +166,29 @@ stdenv.mkDerivation (finalAttrs: {
   patches =
     patches fetchpatch
     ++ lib.optionals withNativeCompilation [
-      (replaceVars
-        (
-          if lib.versionOlder finalAttrs.version "30" then
-            ./native-comp-driver-options.patch
-          else
-            ./native-comp-driver-options-30.patch
-        )
-        {
-          backendPath = (
-            lib.concatStringsSep " " (
-              map (x: ''"-B${x}"'') (
-                [
-                  # Paths necessary so the JIT compiler finds its libraries:
-                  "${lib.getLib libgccjit}/lib"
-                ]
-                ++ libGccJitLibraryPaths
-                ++ [
-                  # Executable paths necessary for compilation (ld, as):
-                  "${lib.getBin stdenv.cc.cc}/bin"
-                  "${lib.getBin stdenv.cc.bintools}/bin"
-                  "${lib.getBin stdenv.cc.bintools.bintools}/bin"
-                ]
-                ++ lib.optionals stdenv.hostPlatform.isDarwin [
-                  # The linker needs to know where to find libSystem on Darwin.
-                  "${apple-sdk.sdkroot}/usr/lib"
-                ]
-              )
+      (replaceVars ./native-comp-driver-options-30.patch {
+        backendPath = (
+          lib.concatStringsSep " " (
+            map (x: ''"-B${x}"'') (
+              [
+                # Paths necessary so the JIT compiler finds its libraries:
+                "${lib.getLib libgccjit}/lib"
+              ]
+              ++ libGccJitLibraryPaths
+              ++ [
+                # Executable paths necessary for compilation (ld, as):
+                "${lib.getBin stdenv.cc.cc}/bin"
+                "${lib.getBin stdenv.cc.bintools}/bin"
+                "${lib.getBin stdenv.cc.bintools.bintools}/bin"
+              ]
+              ++ lib.optionals stdenv.hostPlatform.isDarwin [
+                # The linker needs to know where to find libSystem on Darwin.
+                "${apple-sdk.sdkroot}/usr/lib"
+              ]
             )
-          );
-        }
-      )
+          )
+        );
+      })
     ];
 
   postPatch = lib.concatStringsSep "\n" [
@@ -251,13 +244,10 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     pkg-config
-  ]
-  ++ lib.optionals (variant == "macport") [
     texinfo
   ]
   ++ lib.optionals srcRepo [
     autoreconfHook
-    texinfo
   ]
   ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ];
 
@@ -505,11 +495,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    broken =
-      (withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) || withWebkitgtk;
-    knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [
-      "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30"
-    ];
+    broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
   }
   // meta;
 })
diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options.patch b/pkgs/applications/editors/emacs/native-comp-driver-options.patch
deleted file mode 100644
index 58eee35aed0a..000000000000
--- a/pkgs/applications/editors/emacs/native-comp-driver-options.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
-index 2c9b79334b..50c6b5ac85 100644
---- a/lisp/emacs-lisp/comp.el
-+++ b/lisp/emacs-lisp/comp.el
-@@ -178,8 +178,9 @@ native-comp-compiler-options
-   :type '(repeat string)
-   :version "28.1")
- 
--(defcustom native-comp-driver-options (when (eq system-type 'darwin)
--                                        '("-Wl,-w"))
-+(defcustom native-comp-driver-options (append (when (eq system-type 'darwin)
-+                                                '("-Wl,-w"))
-+                                              '(@backendPath@))
-   "Options passed verbatim to the native compiler's back-end driver.
- Note that not all options are meaningful; typically only the options
- affecting the assembler and linker are likely to be useful.
--- 
-2.37.3
-
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 0b6b3ad7a563..fb9d9697cd85 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -85,6 +85,7 @@ let
               AndersonTorres
               adisbladis
               jwiegley
+              linj
               panchoh
             ];
             "macport" = with lib.maintainers; [
@@ -111,10 +112,25 @@ in
     rev = "emacs-30.2";
     hash = "sha256-W2eZ+cNQhi/fMeRkwOqSKU7Vzvp43WUOpiwaLLNEXtg=";
     patches = fetchpatch: [
+      (fetchpatch {
+        name = "fix-off-by-one-mistake-80851-CVE-2026-6861.patch";
+        url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8f535370b9efbc91673b20c6987a5cae4f6dc562";
+        hash = "sha256-ny44eIi8DUa9pQhVGzhGz4H6FXU4+ki86SITLXhkwpw=";
+      })
       (builtins.path {
         name = "inhibit-lexical-cookie-warning-67916.patch";
         path = ./inhibit-lexical-cookie-warning-67916-30.patch;
       })
+      (fetchpatch {
+        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/970856
+        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/01_all_treesit-0.26.patch?id=d0f47979806d9be5a190fdb4ffa1bde439b2d616";
+        hash = "sha256-3pWeRxjAhr3ntBR3xDhoDUZDjU6xICU23NUpb/Vl6R4=";
+      })
+      (fetchpatch {
+        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/971731
+        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/02_all_ts-query-pred.patch?id=86190bf195b3e17108372d8ad89eb57037180dd2";
+        hash = "sha256-0GPyfKLSaB09a8hamrSf6lx4Qk8Big4AKMOivkN1wEM=";
+      })
     ];
   });
 
@@ -124,5 +140,22 @@ in
     variant = "macport";
     rev = "emacs-mac-30.2";
     hash = "sha256-i/W2Xa6Vk1+T1fs6fa4wJVMLLB6BK8QAPcdmPrU8NwM=";
+    patches = fetchpatch: [
+      (fetchpatch {
+        name = "fix-off-by-one-mistake-80851-CVE-2026-6861.patch";
+        url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8f535370b9efbc91673b20c6987a5cae4f6dc562";
+        hash = "sha256-ny44eIi8DUa9pQhVGzhGz4H6FXU4+ki86SITLXhkwpw=";
+      })
+      (fetchpatch {
+        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/970856
+        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/01_all_treesit-0.26.patch?id=d0f47979806d9be5a190fdb4ffa1bde439b2d616";
+        hash = "sha256-3pWeRxjAhr3ntBR3xDhoDUZDjU6xICU23NUpb/Vl6R4=";
+      })
+      (fetchpatch {
+        # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/971731
+        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/02_all_ts-query-pred.patch?id=86190bf195b3e17108372d8ad89eb57037180dd2";
+        hash = "sha256-0GPyfKLSaB09a8hamrSf6lx4Qk8Big4AKMOivkN1wEM=";
+      })
+    ];
   });
 }
diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix
index 5b905826c9e1..60f00e2ec1f3 100644
--- a/pkgs/applications/editors/jetbrains/ides/clion.nix
+++ b/pkgs/applications/editors/jetbrains/ides/clion.nix
@@ -21,20 +21,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.tar.gz";
-      hash = "sha256-r5flY2u6aCkI8q7ZcGWYLLxxcWWp3gtTkdBdKoacIB0=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.1.tar.gz";
+      hash = "sha256-6S0+ASWF7du0tHyfLu/6ZmxymP79m3bwxOxQTFfsoJs=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1-aarch64.tar.gz";
-      hash = "sha256-1N1JLpHBAFSDOYLl98KxDBpGmgVMlRFuV49/a2jGHfQ=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.1-aarch64.tar.gz";
+      hash = "sha256-niaHFXxXPh1iH26aAmHES2F/xbfkPJ18erDXFZign+g=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.dmg";
-      hash = "sha256-m3AEgpDjUDMJQ7320XuqpEHwe4ItYX8JYq0ZpITaKcs=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.1.dmg";
+      hash = "sha256-LWbFIC2xhh2Co2/BOTvScGWL9Qs77WAM4A+gxtuA4B4=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1-aarch64.dmg";
-      hash = "sha256-Crx63jFbJbCX1/XIZg22Oxd7HxFWmB3iXlJofzv03vA=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.1-aarch64.dmg";
+      hash = "sha256-8m6SbpkVdQ9QZykVlse9cK8KysXlPn/NA9WysLHh8jk=";
     };
   };
   # update-script-end: urls
@@ -48,8 +48,8 @@ in
   product = "CLion";
 
   # update-script-start: version
-  version = "2026.1";
-  buildNumber = "261.22158.273";
+  version = "2026.1.1";
+  buildNumber = "261.23567.135";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix
index ee67d4f274f4..6fcbecb4f837 100644
--- a/pkgs/applications/editors/jetbrains/ides/datagrip.nix
+++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.1.tar.gz";
-      hash = "sha256-XX5Gh+wTep4EqW7pP1nBVtxmSpuYRFg7xK+AUV0qPt4=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.2.tar.gz";
+      hash = "sha256-DaAqg6Xce1RkvEM6++7CxC72AvB1SHKFBWOzJD9RIuY=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.1-aarch64.tar.gz";
-      hash = "sha256-B/0W4u41PUJzF1Lrpkq5I+ZFwTmszFjBTCZncwiNCi0=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.2-aarch64.tar.gz";
+      hash = "sha256-QY7ZX4OiON7km4wjBEDCIcD8HxALAW9PRAHJNZ0t+YM=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.1.dmg";
-      hash = "sha256-NcfFMsdTIcsp4fd8PjchO+FdIYo3+Zy2nqrJPjsH5LQ=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.2.dmg";
+      hash = "sha256-CdhVxjc7wbvTSA/RU39bnek6kU3/G8z9Tj2uEadsZKA=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.1-aarch64.dmg";
-      hash = "sha256-W5fpsJp9QlKaVTEoanOf0tbLhhka3OkI4pdQPsdUauU=";
+      url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.2-aarch64.dmg";
+      hash = "sha256-rMiVEmkbJIIeBfOXpPVXFBFLmkW6TLnzsPCheQWszhc=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "DataGrip";
 
   # update-script-start: version
-  version = "2026.1.1";
-  buildNumber = "261.22158.354";
+  version = "2026.1.2";
+  buildNumber = "261.23567.23";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
diff --git a/pkgs/applications/editors/jetbrains/ides/dataspell.nix b/pkgs/applications/editors/jetbrains/ides/dataspell.nix
index 4937404999ba..858715bde3e2 100644
--- a/pkgs/applications/editors/jetbrains/ides/dataspell.nix
+++ b/pkgs/applications/editors/jetbrains/ides/dataspell.nix
@@ -14,20 +14,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/python/dataspell-2025.3.2.tar.gz";
-      hash = "sha256-rRcGQOEVc7nnqyFDVvkjgZlvoKZfnuSCR5TnqrMFDjo=";
+      url = "https://download.jetbrains.com/python/dataspell-2026.1.tar.gz";
+      hash = "sha256-FcbflBzHsSWvkXVtrlltvb3PjihP91s0gm3wmV3zuRA=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/python/dataspell-2025.3.2-aarch64.tar.gz";
-      hash = "sha256-WQqGvwaBkdJU9AN+LIThnZlW/HDzEpZuS0q+ir/ncfw=";
+      url = "https://download.jetbrains.com/python/dataspell-2026.1-aarch64.tar.gz";
+      hash = "sha256-JKAW0YtwNDjk3Un4e/cWipreAI8pJaJgLNvx7oOw4RQ=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/python/dataspell-2025.3.2.dmg";
-      hash = "sha256-k3GEiAnqst8EB8AFwcVMGaZYJ/jR+MGhQ59ysTP/9uI=";
+      url = "https://download.jetbrains.com/python/dataspell-2026.1.dmg";
+      hash = "sha256-w/nFLddHi/l7VqQKngxhYm/LL49eiawXhK+xGBU6Ej0=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/python/dataspell-2025.3.2-aarch64.dmg";
-      hash = "sha256-R8iT4fDtpOzI6Xcw1mR0rE0Gqhk6r8wl8HoDoaTGzfs=";
+      url = "https://download.jetbrains.com/python/dataspell-2026.1-aarch64.dmg";
+      hash = "sha256-/yZpE2aY07AedubVG6yarO4uObdaIZ4KCtKl9DaRU4c=";
     };
   };
   # update-script-end: urls
@@ -41,8 +41,8 @@ mkJetBrainsProduct {
   product = "DataSpell";
 
   # update-script-start: version
-  version = "2025.3.2";
-  buildNumber = "253.30387.154";
+  version = "2026.1";
+  buildNumber = "261.22158.332";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/applications/editors/jetbrains/ides/gateway.nix
index 3af6f0ff3cb4..432953b43c4e 100644
--- a/pkgs/applications/editors/jetbrains/ides/gateway.nix
+++ b/pkgs/applications/editors/jetbrains/ides/gateway.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.2.tar.gz";
-      hash = "sha256-6FaCc3Kqq0jjDdmSARGk4KPIU5xrUzkSINhXcY/Gs4M=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1.tar.gz";
+      hash = "sha256-hXQIvnyjosH3uEUpi43NJYnk8cMXVVlKblpiGeVlekk=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.2-aarch64.tar.gz";
-      hash = "sha256-W7OuGrk8vab0GwCTdzKZ/sWvnYQZEDNEyEQsnM3SMqU=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1-aarch64.tar.gz";
+      hash = "sha256-nsF/Oo0p+hXqSehIhrPc7i0zURDXgtf/rBpMFKgq+7c=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.2.dmg";
-      hash = "sha256-uPkK+UkAUMC+JYiGnQZmdt1DKtTqHrjpE/ghpnuGb/w=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1.dmg";
+      hash = "sha256-1pqtAR8r2ZwU/RhFMDsyFBhhRYvsPrT5F/n3kSP2viA=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.2-aarch64.dmg";
-      hash = "sha256-5LPKKtCOreiYIEWFbQNPITktjORGA8v+22tbZhUc+Uk=";
+      url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.1-aarch64.dmg";
+      hash = "sha256-orFAOXR9A/0S7lhwkD9bAXyp24HaDSlXe/rL4iT6+80=";
     };
   };
   # update-script-end: urls
@@ -40,8 +40,8 @@ mkJetBrainsProduct {
   productShort = "Gateway";
 
   # update-script-start: version
-  version = "2025.3.2";
-  buildNumber = "253.30387.104";
+  version = "2026.1.1";
+  buildNumber = "261.23567.152";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix
index a058837e8e65..602774a3d921 100644
--- a/pkgs/applications/editors/jetbrains/ides/goland.nix
+++ b/pkgs/applications/editors/jetbrains/ides/goland.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.tar.gz";
-      hash = "sha256-+TORnDso307j+WwFspoQRZ8IN2TFyy5uUvLyjiNhHiY=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.1.tar.gz";
+      hash = "sha256-ASzqw8xuRaSAwzoiBsL+6PRyuSvBh43tnF4mEmkur9s=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/go/goland-2026.1-aarch64.tar.gz";
-      hash = "sha256-inAjJw9xzpGjdo4pgoqQwM+ZyEnvLQZggPt4S/LGFxg=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.1-aarch64.tar.gz";
+      hash = "sha256-25PADBycdas3n6BWSGOJhuMaLcik5P5AfcEO6mY75js=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.dmg";
-      hash = "sha256-zFAjXSdOaf3C2zQDDriOK9F2xOxGTrAyacVHUh0Sqck=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.1.dmg";
+      hash = "sha256-kKr5/7z5gbL0YORDET0y7LgczWLEQ31lqsrHgkxrzQ8=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/go/goland-2026.1-aarch64.dmg";
-      hash = "sha256-Zo48RMtVUweV541ImYxtQTBp4L4ZhyTDxFFwK+YyrZk=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.1-aarch64.dmg";
+      hash = "sha256-zfdJrXBatvAl3wNMQ3LhF9oOxo1dEyo8wr4lCoFdm9I=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ in
   product = "Goland";
 
   # update-script-start: version
-  version = "2026.1";
-  buildNumber = "261.22158.291";
+  version = "2026.1.1";
+  buildNumber = "261.23567.143";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix
index 05bdb9677f23..6c36ecbd2a64 100644
--- a/pkgs/applications/editors/jetbrains/ides/idea.nix
+++ b/pkgs/applications/editors/jetbrains/ides/idea.nix
@@ -15,20 +15,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.tar.gz";
-      hash = "sha256-9X09uplwx3TPN3WDYprqVAQY5nfsY2VXDnbeqcsvP5s=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1.tar.gz";
+      hash = "sha256-eljThvKi5ajNfkWRZXtP5ZmurCLZYMesz1+SeEZQe/s=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1-aarch64.tar.gz";
-      hash = "sha256-wjX2ZMNcIEIsOrKMhQuG6kq3oF2d+cAnWBo6jJi+QBs=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1-aarch64.tar.gz";
+      hash = "sha256-jnVqDCmBix3njTxDga0aG89C9fvDW70gnE3I/nvHtXA=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.dmg";
-      hash = "sha256-dN5eiknRaqGJIRWmdQbfO5MriAbGa6SU7Vc6cpAcGJk=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1.dmg";
+      hash = "sha256-lPNwVLPSrmlQVFY9AD3+xzYeMG7JZnUTMl43rXjvtWM=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1-aarch64.dmg";
-      hash = "sha256-kPKuyj/QFzECs9JzSthjYCuxcUbDF/4tiLBhj9R+pgA=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.1-aarch64.dmg";
+      hash = "sha256-0nOcHiGOHS9QoncuJwtD6cl4v34mp9cOx2oOB0tFIOM=";
     };
   };
   # update-script-end: urls
@@ -43,8 +43,8 @@ mkJetBrainsProduct {
   productShort = "IDEA";
 
   # update-script-start: version
-  version = "2026.1";
-  buildNumber = "261.22158.277";
+  version = "2026.1.1";
+  buildNumber = "261.23567.138";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
index 8fc96148791c..1c19d743fd91 100644
--- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.tar.gz";
-      hash = "sha256-OpSc/Xg4nWh9XRpVN8FLaV1Gwz8kbM+S9WVk27jJ7gY=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1.tar.gz";
+      hash = "sha256-TOSiFAphV/JYrUg9tB/BAtAGjn6P0DpaYHO2W3FcCGQ=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1-aarch64.tar.gz";
-      hash = "sha256-StoSzSx4fxeeB+PnZB5PCEzPJuWCa+HeY9u6hGGlUHg=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1-aarch64.tar.gz";
+      hash = "sha256-fWguwgUQstCytAMKam4scziEeyOxVEhIxS1O81HO/yI=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.dmg";
-      hash = "sha256-KN4OVeR7TCA+PigHemh0eIT+y3hRKAGFJlEFmRc45Xg=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1.dmg";
+      hash = "sha256-W28NwTNZe3Vj19J32nY8Jrn2rFVVd+0H2NWzDCTG8nw=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1-aarch64.dmg";
-      hash = "sha256-V3TQIvaYH3+NmWIDJFyTcO7Zwdd+TPP0TSFmX5pjEhM=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.1-aarch64.dmg";
+      hash = "sha256-tm/UFH/5FX0HQ/FnjQ/Jwwaf/cpIYb4j0NvKlazBp08=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "PhpStorm";
 
   # update-script-start: version
-  version = "2026.1";
-  buildNumber = "261.22158.283";
+  version = "2026.1.1";
+  buildNumber = "261.23567.149";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
@@ -54,10 +54,7 @@ mkJetBrainsProduct {
     homepage = "https://www.jetbrains.com/phpstorm/";
     description = "PHP IDE from JetBrains";
     longDescription = "PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code.";
-    maintainers = with lib.maintainers; [
-      dritter
-      tymscar
-    ];
+    maintainers = with lib.maintainers; [ tymscar ];
     license = lib.licenses.unfree;
     sourceProvenance =
       if stdenv.hostPlatform.isDarwin then
diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
index be3499f5ce26..c4fe68c48776 100644
--- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
+++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.tar.gz";
-      hash = "sha256-BZsRMuFek5UEo16GHFcEd6gki1IaftWPA692mgefOXo=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1.tar.gz";
+      hash = "sha256-tdT8LwsHGC5jUxGsRPVw1VfKfKZ05gZsGL6kpsxcPFA=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1-aarch64.tar.gz";
-      hash = "sha256-0bPG2f/RmUO8ZmxNtsEiXGdSahn4aVw/0OHCuGuMJDY=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1-aarch64.tar.gz";
+      hash = "sha256-ns9oxsMXSPJS5KWSX0oKOyOyg8bguUnd8v1TRwV9EXw=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.dmg";
-      hash = "sha256-3FC80XSQ/zLPGLw/ois45ikZ2Y0a25/eWEqlbd1TyI8=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1.dmg";
+      hash = "sha256-Q/W6Pe3o6qwdHQm2z4bnenyEe7DrWwnov3M+JL8bS0o=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1-aarch64.dmg";
-      hash = "sha256-xD+JYmiudMJGCCJB3Pf8+mNGURJFRxMDh+Nj7xUrfz8=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.1-aarch64.dmg";
+      hash = "sha256-UPnESouBCx59e2n8inTfe+zSCkQMF2XeoNw825LTKuU=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "RubyMine";
 
   # update-script-start: version
-  version = "2026.1";
-  buildNumber = "261.22158.284";
+  version = "2026.1.1";
+  buildNumber = "261.23567.142";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
index 4e50dc485654..8853e0acf2af 100644
--- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
@@ -18,20 +18,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.tar.gz";
-      hash = "sha256-qiOgAHz/tCnyEwljTy1D0sJBhWpOXZCCf5Uq66PZjzk=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1.tar.gz";
+      hash = "sha256-UYljm43s/UOEvk0Peio2Crsdx0K5U5Seo57M34A1A1c=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1-aarch64.tar.gz";
-      hash = "sha256-jU61XQ+3zliH3y6nz6o8U/DrRkZ2vs4ff8Fd/RPb0a0=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1-aarch64.tar.gz";
+      hash = "sha256-FUDCF4pOtovjBKaNV0dEjc5PwsDLBXTTHnc3+oNDU7A=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.dmg";
-      hash = "sha256-VwVvTSUdFpPhAeWyzkID6TFNE0S1vVeR82FRfU2v3s4=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1.dmg";
+      hash = "sha256-DxrFdxSLiyH7/davL4QeAPxlKK3IA5JXzPetTYaMtck=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1-aarch64.dmg";
-      hash = "sha256-DeLkwKq01M3zmr2yZnOYXCn0CZ+0P9MtWC9bMIzKrVE=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.1-aarch64.dmg";
+      hash = "sha256-K9Gwkudx+WV25fA1IRwfDlqcK8X0I/SzrL7S2iG7IfI=";
     };
   };
   # update-script-end: urls
@@ -45,8 +45,8 @@ in
   product = "RustRover";
 
   # update-script-start: version
-  version = "2026.1";
-  buildNumber = "261.22158.331";
+  version = "2026.1.1";
+  buildNumber = "261.23567.140";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix
index 306e9235b899..845d1472ab60 100644
--- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.3.tar.gz";
-      hash = "sha256-T8HrCvG9KBb+dggeftxbCu1DyUKsqWwotzr1Kmpdza4=";
+      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1.tar.gz";
+      hash = "sha256-r9XetjreFB6qU7VQbHsFLn7boKhZylfyGsfPNumFQZw=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.3-aarch64.tar.gz";
-      hash = "sha256-O3ZyMzazc3OIpqhBFDFBc6IXmagYsvHJDgMjEDUC2zY=";
+      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1-aarch64.tar.gz";
+      hash = "sha256-Damq3svwCOrE+fTBBVY8vi/1vtFJFFqFsSWQhY9L/x4=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.3.dmg";
-      hash = "sha256-EYCr1k4wXXcVGOOPYVDWeY9rd2+UE7sgVu+gGG/w/RM=";
+      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1.dmg";
+      hash = "sha256-+s6MjE4zD4YZxnYRqsaXVthTWNnCn1HS3K7Ik+lb2cI=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.3-aarch64.dmg";
-      hash = "sha256-Q0couYUYZ+/5IVsfAAQ0GmDHHMV+PjrxCLy3ys3VXmw=";
+      url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.1-aarch64.dmg";
+      hash = "sha256-/WwGXnvYZz8MzOOQgf4BGMRP7cLIv8FA1lK8NvIgtoo=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "WebStorm";
 
   # update-script-start: version
-  version = "2025.3.3";
-  buildNumber = "253.31033.133";
+  version = "2026.1.1";
+  buildNumber = "261.23567.141";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix
index 37d776045f6e..aac0fa6f5140 100644
--- a/pkgs/applications/editors/jetbrains/source/build.nix
+++ b/pkgs/applications/editors/jetbrains/source/build.nix
@@ -45,7 +45,7 @@ let
     };
   });
 
-  jbr = jetbrains.jdk-no-jcef;
+  jbr = jetbrains.jdk-no-jcef-21;
 
   ideaSrc = fetchFromGitHub {
     owner = "jetbrains";
diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
deleted file mode 100644
index f9dbc2383f26..000000000000
--- a/pkgs/applications/editors/mindforger/default.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  curl,
-  fetchFromGitHub,
-  hunspell,
-  pkg-config,
-  qmake,
-  qtbase,
-  qtwebengine,
-  wrapGAppsHook3,
-  wrapQtAppsHook,
-}:
-let
-  version = "2.0.0";
-  srcs = {
-    mindforger = fetchFromGitHub {
-      owner = "dvorka";
-      repo = "mindforger";
-      rev = version;
-      sha256 = "sha256-+8miV2xuQcaWGdWCEXPIg6EXjAHtgD9pX7Z8ZNhpMjA=";
-    };
-    cmark-gfm = fetchFromGitHub {
-      owner = "dvorka";
-      repo = "cmark";
-      rev = "4ca8688093228c599432a87d7bd945804c573d51";
-      sha256 = "sha256-0WiG8aot8mc0h1BKPgC924UKQrgunZvKKBy9bD7nhoQ=";
-    };
-    mindforger-repository = fetchFromGitHub {
-      owner = "dvorka";
-      repo = "mindforger-repository";
-      rev = "ec81a27e5de6408bbcd3f6d7733a7c6f3b52e433";
-      sha256 = "sha256-JGTP1He7G2Obmsav64Lf7BLHp8OTvPtg38VHsrEC36o=";
-    };
-  };
-in
-stdenv.mkDerivation {
-  pname = "mindforger";
-  inherit version;
-
-  src = srcs.mindforger;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    qmake
-    wrapGAppsHook3
-    wrapQtAppsHook
-  ];
-  buildInputs = [
-    curl
-    hunspell
-    qtbase
-    qtwebengine
-  ];
-
-  # Disable the cmake hook (so we don't try to build MindForger with it), and
-  # build MindForger's internal fork of cmark-gfm ahead of MindForger itself.
-  #
-  # Moreover unpack the docs that are needed for the MacOS build.
-  postUnpack = ''
-    cp -TR ${srcs.cmark-gfm} $sourceRoot/deps/cmark-gfm
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    cp -TR ${srcs.mindforger-repository} $sourceRoot/doc
-  '';
-  dontUseCmakeConfigure = true;
-  preBuild = ''
-    (
-          mkdir deps/cmark-gfm/build &&
-          cd deps/cmark-gfm/build &&
-          cmake -DCMARK_TESTS=OFF -DCMARK_SHARED=OFF .. &&
-          cmake --build . --parallel
-      )'';
-
-  doCheck = true;
-
-  patches = [
-    ./hunspell_pkgconfig.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace lib/src/install/installer.cpp --replace /usr "$out"
-    substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out"
-    for f in app/app.pro lib/lib.pro; do
-      substituteInPlace "$f" --replace "QMAKE_CXX = g++" ""
-    done
-  '';
-
-  qmakeFlags = [
-    "-r"
-    "mindforger.pro"
-    "CONFIG+=mfnoccache"
-    "CONFIG+=mfwebengine"
-  ];
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir "$out"/Applications
-    mv app/mindforger.app "$out"/Applications/
-  '';
-
-  meta = {
-    description = "Thinking Notebook & Markdown IDE";
-    longDescription = ''
-      MindForger is actually more than an editor or IDE - it's human
-      mind inspired personal knowledge management tool
-    '';
-    homepage = "https://www.mindforger.com";
-    license = lib.licenses.gpl2Plus;
-    platforms = [
-      "aarch64-linux"
-      "x86_64-linux"
-    ];
-    maintainers = with lib.maintainers; [ cyplo ];
-    mainProgram = "mindforger";
-  };
-}
diff --git a/pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch b/pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch
deleted file mode 100644
index babbf3e42589..000000000000
--- a/pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/app/app.pro b/app/app.pro
-index 89ff5c0b..9625ecd1 100644
---- a/app/app.pro
-+++ b/app/app.pro
-@@ -159,12 +159,13 @@ macx {
- 
- } else:unix {
-     # pkgconfig-based configuration does not work @ Ubuntu
--    #  CONFIG += link_pkgconfig
--    #  PKGCONFIG += hunspell
-+    # but does on NixOS
-+    CONFIG += link_pkgconfig
-+    PKGCONFIG += hunspell
- 
--    # hardcoded paths are (unfortunately) more robust:
--    INCLUDEPATH += /usr/include/hunspell
--    LIBS += -lhunspell
-+    # Where hardcoded paths are (unfortunately) more robust^W^W^W^Wannoying:
-+    #  INCLUDEPATH += /usr/include/hunspell
-+    #  LIBS += -lhunspell
- 
-     HEADERS += \
-       ./src/qt/spelling/dictionary_provider_hunspell.h \
diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix
index e4c429c759c2..c7d3bbb29d06 100644
--- a/pkgs/applications/editors/neovim/tests/default.nix
+++ b/pkgs/applications/editors/neovim/tests/default.nix
@@ -247,6 +247,15 @@ pkgs.lib.recurseIntoAttrs rec {
       };
     };
 
+  nvim_with_no_pname_plugin = neovim.override {
+    extraName = "-with-no-pname-plugin";
+    configure.packages.plugins = {
+      start = [
+        vimPlugins.corePlugins
+      ];
+    };
+  };
+
   # regression test that ftplugin files from plugins are loaded before the ftplugin
   # files from $VIMRUNTIME
   run_nvim_with_ftplugin = runTest nvim_with_ftplugin ''
@@ -260,6 +269,10 @@ pkgs.lib.recurseIntoAttrs rec {
     [ "$result" = 0 ]
   '';
 
+  run_nvim_with_no_pname_plugin = runTest nvim_with_no_pname_plugin ''
+    ${nvim_with_no_pname_plugin}/bin/nvim -i NONE -e --headless +quit
+  '';
+
   # Generate a neovim wrapper with only a init.lua and no init.vim file
   nvim_with_only_init_lua = wrapNeovim2 "-only-lua-init-file" {
     luaRcContent = "-- some text";
diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
deleted file mode 100644
index 43f2aef74697..000000000000
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  which,
-  qttools,
-  wrapQtAppsHook,
-  libuchardet,
-  qtbase,
-  qtsvg,
-  qtwebengine,
-  qtwebsockets,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "notepadqq";
-  # shipping a beta build as there's no proper release which supports qtwebengine
-  version = "2.0.0-beta";
-
-  src = fetchFromGitHub {
-    owner = "notepadqq";
-    repo = "notepadqq";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-XA9Ay9kJApY+bDeOf0iPv+BWYFuTmIuqsLEPgRTCZCE=";
-  };
-
-  patches = [
-    # Fix: chmod in the Makefile fails randomly
-    # Move it to preFixup instead
-    ./fix-configure.patch
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    which
-    qttools
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libuchardet
-    qtbase
-    qtsvg
-    qtwebengine
-    qtwebsockets
-  ];
-
-  strictDeps = false; # breaks qmake
-
-  preConfigure = ''
-    export LRELEASE="lrelease"
-  '';
-
-  dontWrapQtApps = true;
-
-  preFixup = ''
-    chmod +x $out/bin/notepadqq
-    wrapQtApp $out/bin/notepadqq
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = "https://notepadqq.com/";
-    description = "Notepad++-like editor for the Linux desktop";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.rszibele ];
-    mainProgram = "notepadqq";
-  };
-})
diff --git a/pkgs/applications/editors/notepadqq/fix-configure.patch b/pkgs/applications/editors/notepadqq/fix-configure.patch
deleted file mode 100644
index 56c0eaadd5e0..000000000000
--- a/pkgs/applications/editors/notepadqq/fix-configure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/ui/ui.pro b/src/ui/ui.pro
-index a1346eb..f8052a2 100644
---- a/src/ui/ui.pro
-+++ b/src/ui/ui.pro
-@@ -293,16 +293,9 @@ unix:!macx {
-     appstream.path = "$$INSTALL_ROOT$$PREFIX/share/metainfo/"
-     appstream.files += "$$INSTALLFILESDIR/notepadqq.appdata.xml"
- 
--    # == Dummy target used to fix permissions at the end of the install ==
--    # A random path. Without one, qmake refuses to create the rule.
--    set_permissions.path = "$$INSTALL_ROOT$$PREFIX/bin/"
--    # We want to keep $$INSTALL_ROOT as a variable in the makefile, so we use $(INSTALL_ROOT)
--    unix:set_permissions.extra = chmod 755 $(INSTALL_ROOT)\"$$PREFIX/bin/notepadqq\"
--
-     # MAKE INSTALL
-     INSTALLS += target \
-          icon_h16 icon_h22 icon_h24 icon_h32 icon_h48 icon_h64 icon_h96 icon_h128 icon_h256 icon_h512 icon_hscalable \
--         misc_data launch shortcuts appstream \
--         set_permissions
-+         misc_data launch shortcuts appstream
- 
- }
diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index baa46ff3b5bc..c152b0d495f3 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -60,6 +60,7 @@ mapAliases (
     peskcolor-vim = throw "peskcolor-vim has been removed: abandoned by upstream"; # Added 2024-08-23
     playground = throw "playground has been archived"; # Added 2025-12-18
     pure-lua = lib.warnOnInstantiate "Please replace 'vimPlugins.pure-lua' with 'vimPlugins.moonlight-nvim' as this name was an error" moonlight-nvim; # Added 2025-11-17
+    registers-nvim = throw "the upstream repository got deleted"; # added 2026-04-30
     rust-tools-nvim = lib.warnOnInstantiate "'vimPlugins.rust-tools-nvim' is abandoned by upstream; you should use 'vimPlugins.rustaceanvim'" rust-tools-nvim;
     Spacegray-vim = throw "'vimPlugins.Spacegray-vim' has been removed: abandoned by upstream"; # Added 2025-03-24
     SpaceVim = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 43c68227e7c7..6b59a2641b7f 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -17,6 +17,7 @@ final: prev: {
       hash = "sha256-Wo6u4btFmD7bqcBCb4OtyAYtYurwJGxeKwYhPoPodOc=";
     };
     meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -30,6 +31,7 @@ final: prev: {
       hash = "sha256-tLE5P3s38cnvVaQAEq9CwAiy70Imqh9oA6rKvjdWd78=";
     };
     meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -43,6 +45,7 @@ final: prev: {
       hash = "sha256-WpKyT/PePb9PQaIUghtNYd6FUoIB/ArcG9TduXhiBAc=";
     };
     meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -56,6 +59,7 @@ final: prev: {
       hash = "sha256-J2rmiPrJ41KuIgpMRSycnbqbTBr+GrGtTlp/IgC2TBI=";
     };
     meta.homepage = "https://github.com/chrisbra/CheckAttach/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -69,19 +73,21 @@ final: prev: {
       hash = "sha256-490Y+f02VD4MhyV7fqqZmoLXXL+m3OTf6kA/p1HIYg8=";
     };
     meta.homepage = "https://github.com/vim-scripts/Colour-Sampler-Pack/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "4.7.4-unstable-2026-04-16";
+    version = "4.7.4-unstable-2026-04-26";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "5378035c2eb4089de245473dec1768e0986543bd";
-      hash = "sha256-dNDBRf/zZ7r4mNVNwST9PCm4QR9AQA/PPIbTXFT+C4k=";
+      rev = "137d3bc527518f5ea982c43c43084496732365c3";
+      hash = "sha256-jYKtDG9J7bEPDaQCorCuTZtePBTN4MAKZZqPduPSBtE=";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -95,6 +101,7 @@ final: prev: {
       hash = "sha256-VKTfLdU7SwQohuTNefuhS5KCPbGLCDsr/mTABq+8hlk=";
     };
     meta.homepage = "https://github.com/whonore/Coqtail/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -108,6 +115,7 @@ final: prev: {
       hash = "sha256-uaA48i+lhwvYP6PGH4lTBaJh0Lnkda+lxNASKUCkSP0=";
     };
     meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -121,6 +129,7 @@ final: prev: {
       hash = "sha256-fCtAs6qsvWOYRp2Z1AwQa2ByUZcUCMKfuYBoNTP7EeY=";
     };
     meta.homepage = "https://github.com/numToStr/FTerm.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -134,6 +143,7 @@ final: prev: {
       hash = "sha256-HwaKkwANoNHe512eDvuOJ48tG8nDh7r67magi8OA/Vw=";
     };
     meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -147,6 +157,7 @@ final: prev: {
       hash = "sha256-wO/FUOT54t9KR/xvrMeasmLFdJc0j2FKzZ200KyMzwU=";
     };
     meta.homepage = "https://github.com/Aaronik/GPTModels.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -160,6 +171,7 @@ final: prev: {
       hash = "sha256-f2lJfi8yDb8W1NCQMMiaypZjTknkq3R/vr9O8SfRsuo=";
     };
     meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -173,6 +185,7 @@ final: prev: {
       hash = "sha256-SsnWpV5oDKCHVYgxKAP/yv9oWSUPK95307d7cClED+w=";
     };
     meta.homepage = "https://github.com/ionide/Ionide-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -186,6 +199,7 @@ final: prev: {
       hash = "sha256-/qUlzGfo2OhHEBGaoTH8K4VVT0Zg9ocJBb84orMD4xc=";
     };
     meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -199,6 +213,7 @@ final: prev: {
       hash = "sha256-Nv81TAbBADGJp7tuKi05qr9v+FBA2ddEahjhXtBvIrw=";
     };
     meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -212,6 +227,7 @@ final: prev: {
       hash = "sha256-IANdrxjLdthOPjKuYqkWBDkbqwX0CxOO0heCFNnQFCA=";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -225,6 +241,7 @@ final: prev: {
       hash = "sha256-o8f1BrmYgMcYgoTAIZpH/YRnHE7hmWxpS8gRD/dB5rE=";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -238,6 +255,7 @@ final: prev: {
       hash = "sha256-VLZvqV8Jjiu5hb0Mh80FAbDPAIgDfC9ol5uiCrM6AAA=";
     };
     meta.homepage = "https://github.com/goropikari/LibDeflate.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Zlib";
     meta.hydraPlatforms = [ ];
   };
 
@@ -251,6 +269,7 @@ final: prev: {
       hash = "sha256-iFpk2dmcdF3krwem0Agl044ML2syw61wWPX7ldz4bhg=";
     };
     meta.homepage = "https://github.com/molleweide/LuaSnip-snippets.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -264,6 +283,7 @@ final: prev: {
       hash = "sha256-4aOLVdnmlJFQob63mGMp4xNjar3ZCfaUjKJyoBnBD3k=";
     };
     meta.homepage = "https://github.com/Valloric/MatchTagAlways/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -277,6 +297,7 @@ final: prev: {
       hash = "sha256-Oyuv8mLPiMEsZPRnIgEjBFYJjGEhMzg+gnNhSSRvGoo=";
     };
     meta.homepage = "https://github.com/numToStr/Navigator.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -290,6 +311,7 @@ final: prev: {
       hash = "sha256-iGwjkWrm/Zmq7KNybArgVNnfs1OuKfSgCu/m6E35NgU=";
     };
     meta.homepage = "https://github.com/lanx-x/NeoSolarized/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -303,6 +325,7 @@ final: prev: {
       hash = "sha256-+FLHJ1tfIplXhO/6kajdcDBTIsNYN9kCOR9IdhXL6d4=";
     };
     meta.homepage = "https://github.com/GCBallesteros/NotebookNavigator.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -316,6 +339,7 @@ final: prev: {
       hash = "sha256-MMoadYv3a+V3oNVI3C0FlzQxlPDWG3L8yLsjFrnkhdE=";
     };
     meta.homepage = "https://github.com/chrisbra/NrrwRgn/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -329,6 +353,7 @@ final: prev: {
       hash = "sha256-ZLWtsMxy9SYp+GhNSBp4NpsbNCdsRV6+cirwLZiSu3k=";
     };
     meta.homepage = "https://github.com/Eutrius/Otree.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -342,6 +367,7 @@ final: prev: {
       hash = "sha256-7WGs7nPJoRCN/vaeg9SgtJK+ZhQI3AvAytK4L/KVRpw=";
     };
     meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -355,6 +381,7 @@ final: prev: {
       hash = "sha256-Tnl2TkLY9QXk/5qX2LcX5G2aq/sysH6BnD2YqXlneIU=";
     };
     meta.homepage = "https://github.com/henriklovhaug/Preview.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -368,6 +395,7 @@ final: prev: {
       hash = "sha256-oHCTJW0bfFnljR7iYIOk4A90e5PppHN4y7nKhGr3eqo=";
     };
     meta.homepage = "https://github.com/yssl/QFEnter/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -381,6 +409,7 @@ final: prev: {
       hash = "sha256-BPvxcvC4Il9NkyY3qmAKAraORNYQNiyOvM+5DRTh3EI=";
     };
     meta.homepage = "https://github.com/chrisbra/Recover.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -394,6 +423,7 @@ final: prev: {
       hash = "sha256-2RD+9Wsfwo49yZhLoMhqtj/2VotJrcDYD0gw/8nzNbQ=";
     };
     meta.homepage = "https://github.com/vim-scripts/Rename/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -407,19 +437,21 @@ final: prev: {
       hash = "sha256-D2FoV9G5u4MrOJhZmCdZtE+C5ya5pP/DSmUGWVDXYFU=";
     };
     meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "0-unstable-2026-04-17";
+    version = "0-unstable-2026-04-30";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "250aed7415ddd6cb3ea321490c7b35094ed9148d";
-      hash = "sha256-UQ+6s4tMJ8z+UJ41ZX1HJTiDsbkYFEUSDb+N8jVBAeY=";
+      rev = "6db1246640e9e1bdf8a1d1f6d27a940fc0a572d5";
+      hash = "sha256-atJxcg6SOH/YAgnPQ6ITzPLQUkNqQQ0zz9NMH2o4m0U=";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -433,6 +465,7 @@ final: prev: {
       hash = "sha256-9GckEP8XkrJqDNSYdCi3YeIaFFmPwoKwrLgYgJxlYFU=";
     };
     meta.homepage = "https://github.com/sunjon/Shade.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -446,6 +479,7 @@ final: prev: {
       hash = "sha256-EX39LVrFST7KgiM91Udq1BEBokK7KIj5FPB9qEQZ5UE=";
     };
     meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -459,6 +493,7 @@ final: prev: {
       hash = "sha256-Rdw2KxpXKAvUhdHqAkP/r/sCwEhpP3R5jukkG1lsw9s=";
     };
     meta.homepage = "https://github.com/tmhedberg/SimpylFold/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -472,6 +507,7 @@ final: prev: {
       hash = "sha256-fPAt51rG7DI2vwtRZr8rWAlDswp6O9m4+ob5N5QpDho=";
     };
     meta.homepage = "https://github.com/vim-scripts/SmartCase/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -485,6 +521,7 @@ final: prev: {
       hash = "sha256-oRk5K/yuPj7EHteG/oRMq8pVmoiXzOv+9yVgONtlp7A=";
     };
     meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -498,6 +535,7 @@ final: prev: {
       hash = "sha256-iSTFCKdjf+SiorW1ivZMNrHcaklJo5JBgLWUTmY4rZs=";
     };
     meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -511,6 +549,7 @@ final: prev: {
       hash = "sha256-k2bp13fZvXLy4Lcm6BnfWu10eQuATU0WVPV/6lQOVFU=";
     };
     meta.homepage = "https://github.com/vim-scripts/VimCompletesMe/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -524,6 +563,7 @@ final: prev: {
       hash = "sha256-3F2BGpt4874tAGdd5WnIiBvy8E19ZYSu98KU72tnF14=";
     };
     meta.homepage = "https://github.com/hsitz/VimOrganizer/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -537,6 +577,7 @@ final: prev: {
       hash = "sha256-DnIqX2WxnOdWRDTsjXlkTPqKuXXFag5ky2UImG7X0FE=";
     };
     meta.homepage = "https://github.com/VundleVim/Vundle.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -550,6 +591,7 @@ final: prev: {
       hash = "sha256-S/2Acgw1OITlw3O1RXOXpj5eLkq0qX1s6GwXQKw7TFY=";
     };
     meta.homepage = "https://github.com/esneider/YUNOcommit.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -563,6 +605,7 @@ final: prev: {
       hash = "sha256-xuQ60dTv+GjU904SB+Nt3tclbNsOycZurdtYZWciD3A=";
     };
     meta.homepage = "https://github.com/svban/YankAssassin.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -576,6 +619,7 @@ final: prev: {
       hash = "sha256-vEMx9TgjDx8AmjHVOHurW1/zYobyRsQdNTA/rNtFt30=";
     };
     meta.homepage = "https://github.com/vim-scripts/YankRing.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -590,6 +634,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -603,6 +648,7 @@ final: prev: {
       hash = "sha256-ygmChz7YHn9lRaZiO3NRBMV0/lgNXyGwqj3BVX7awkA=";
     };
     meta.homepage = "https://github.com/vim-scripts/a.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -616,6 +662,7 @@ final: prev: {
       hash = "sha256-DVTQi6K+HMCBHVKRwh7qiiB/y+wFqfpGtrZmREa66lY=";
     };
     meta.homepage = "https://github.com/Alligator/accent.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -629,6 +676,7 @@ final: prev: {
       hash = "sha256-1ZmGW6H76tg5Cg3GOuQ9WYthl2wdmiIvuF6GBhPK93o=";
     };
     meta.homepage = "https://github.com/mileszs/ack.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -642,6 +690,7 @@ final: prev: {
       hash = "sha256-D74h9iDYHkg5pkIjvjWPawXZKYThHTUVE/XY2Lcl+kA=";
     };
     meta.homepage = "https://github.com/eikenb/acp/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -655,19 +704,21 @@ final: prev: {
       hash = "sha256-o6pu/24YYtlCRAw0pRrlccVeSPcOnMn70i8n7BKMHgc=";
     };
     meta.homepage = "https://github.com/mrtnvgr/actions.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
   actions-preview-nvim = buildVimPlugin {
     pname = "actions-preview.nvim";
-    version = "0-unstable-2026-04-09";
+    version = "0-unstable-2026-04-22";
     src = fetchFromGitHub {
       owner = "aznhe21";
       repo = "actions-preview.nvim";
-      rev = "2b604b2e8e662c03b716436f6ffebcb19663e66a";
-      hash = "sha256-FG2QxBZTtyRyzK1T2rUtmyK+Z2kt/Ot/vSDQ6JEVwBs=";
+      rev = "0ac9c2aa3cfc8c885321c0862b50b6b1c3392405";
+      hash = "sha256-ibzfF/Ebm5+1EgZ05NQCTRDB+Q7ymyRy2fZpjvwv8EA=";
     };
     meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -681,6 +732,7 @@ final: prev: {
       hash = "sha256-eQ/7sKzkJU6jVGxXeePeObMN5kX51mofhph4BqTt7jk=";
     };
     meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -694,6 +746,7 @@ final: prev: {
       hash = "sha256-4WQQwI72SRzgw0fmBfQPO8i0ULOnmx2q90Hse2FVE0Q=";
     };
     meta.homepage = "https://github.com/Mofiqul/adwaita.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -708,6 +761,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -721,6 +775,7 @@ final: prev: {
       hash = "sha256-9mXZzGZaZtjrfxhZBh8j9INuFpF/0wp70P/GBmG1LXA=";
     };
     meta.homepage = "https://github.com/Numkil/ag.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -734,6 +789,7 @@ final: prev: {
       hash = "sha256-zsH3M+nAR5HX0NZbOZfxIgOZU1bFj/GZf6J44tvjjzQ=";
     };
     meta.homepage = "https://github.com/derekelkins/agda-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -747,6 +803,7 @@ final: prev: {
       hash = "sha256-oT9xyB6ymkZnjgLwOoQdavntoCtTDB6Ts4dl+nLrwYQ=";
     };
     meta.homepage = "https://github.com/emmanueltouzery/agitator.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -760,6 +817,7 @@ final: prev: {
       hash = "sha256-Ya8/SpS+993FKLjyK2f18sTGMAKUWvqwqk9k0eC5UBI=";
     };
     meta.homepage = "https://github.com/aduros/ai.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "ISC";
     meta.hydraPlatforms = [ ];
   };
 
@@ -773,6 +831,7 @@ final: prev: {
       hash = "sha256-JJP1om3cJQC1/0wh2GFQCnMhPBgCKsiLZxc+xiuxjzg=";
     };
     meta.homepage = "https://github.com/joshuavial/aider.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -786,6 +845,7 @@ final: prev: {
       hash = "sha256-Rp/nl5dlz55aChrYUL7ir3XtWDFFS99CHS3l3FoCI7c=";
     };
     meta.homepage = "https://github.com/dchinmay2/alabaster.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -799,6 +859,7 @@ final: prev: {
       hash = "sha256-tneVWZaEywflAuBsuYCYtP/iK1h5mvLpv7nX5Hpajxw=";
     };
     meta.homepage = "https://github.com/slashmili/alchemist.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -812,6 +873,7 @@ final: prev: {
       hash = "sha256-ylXXgohtwdA3SBssckB9zrDhjXQK9OPFwt69n0LXYg8=";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -825,6 +887,7 @@ final: prev: {
       hash = "sha256-97V2Q1c3DwNUZVa9RVWIN/N5Cw6Gr622PNBNcUpmiik=";
     };
     meta.homepage = "https://github.com/vim-scripts/align/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -838,6 +901,7 @@ final: prev: {
       hash = "sha256-z8+lEs8bQS4Gz3cgQQ5Cb3oW58Et7it/tAxUtE3cLc4=";
     };
     meta.homepage = "https://github.com/Vonr/align.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -851,6 +915,7 @@ final: prev: {
       hash = "sha256-g0uhWP8OREJifcjLjNAK43lNmtWXVIEUwTORfLuX1RQ=";
     };
     meta.homepage = "https://github.com/goolord/alpha-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -864,6 +929,7 @@ final: prev: {
       hash = "sha256-f/li32jpVigbZANnnbgSArnOH4nusj0DUz7952K+Znw=";
     };
     meta.homepage = "https://github.com/sourcegraph/amp.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -877,6 +943,7 @@ final: prev: {
       hash = "sha256-KyFzPI2B0ioIABnhC6MwaHYLcuUzSqCsmcGpMei4XXk=";
     };
     meta.homepage = "https://github.com/anuvyklack/animation.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -890,6 +957,7 @@ final: prev: {
       hash = "sha256-dENwrF/O8tkzoam1sAg09IOWWZLEi+0uy3R6cJjXVT0=";
     };
     meta.homepage = "https://github.com/Olical/aniseed/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -903,6 +971,7 @@ final: prev: {
       hash = "sha256-dGlvaxZw2woaau78en3QH//a7JhI+GHTMIzW8uNjtmc=";
     };
     meta.homepage = "https://github.com/pearofducks/ansible-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -916,6 +985,7 @@ final: prev: {
       hash = "sha256-nK53ppPJWCChRVRAay/vb5DanFjrOBF00rIvHBLIBbM=";
     };
     meta.homepage = "https://github.com/ckarnell/antonys-macro-repeater/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -929,6 +999,7 @@ final: prev: {
       hash = "sha256-NdluZ0hNlPHW6XI7BYKV8wnBdXoCtBEBRmLbXBR+Z4c=";
     };
     meta.homepage = "https://github.com/solarnz/arcanist.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -942,6 +1013,7 @@ final: prev: {
       hash = "sha256-iFga589ovZztvCZ7/zeTshmVyLRXGvGLxMHP2mCBktA=";
     };
     meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -955,6 +1027,7 @@ final: prev: {
       hash = "sha256-iKGK7X7hBeap8nVnqXVYS/MddkMP9d/rBSD/s7qSldc=";
     };
     meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -968,6 +1041,7 @@ final: prev: {
       hash = "sha256-NuRh9VPztFdPdqUX8yuUes084pXkSZStWp6ewUlgqso=";
     };
     meta.homepage = "https://github.com/arsham/arshlib.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -981,19 +1055,21 @@ final: prev: {
       hash = "sha256-S94KIu2ATE9tprJw83GQj7icrMixPsZ33WjmHm5kf4g=";
     };
     meta.homepage = "https://github.com/comfysage/artio.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "EUPL-1.2";
     meta.hydraPlatforms = [ ];
   };
 
   astrocore = buildVimPlugin {
     pname = "astrocore";
-    version = "3.0.2";
+    version = "3.0.3";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrocore";
-      tag = "v3.0.2";
-      hash = "sha256-4yf49at22utcEVrLftI8X0iBrcbfVqlZpreXkM0q63E=";
+      tag = "v3.0.3";
+      hash = "sha256-EQG6jOH/US/0T4iIwPv58FC4P7k3W7jTBdfRVbqFQi8=";
     };
     meta.homepage = "https://github.com/AstroNvim/astrocore/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1007,6 +1083,7 @@ final: prev: {
       hash = "sha256-N8uwx9PpGey0itrvq/OKOEwtRxXfto0MQ5Tbb7Bnc8w=";
     };
     meta.homepage = "https://github.com/AstroNvim/astrolsp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1020,6 +1097,7 @@ final: prev: {
       hash = "sha256-rh/cbZcGhpdaprhEs9Cgi2YYNT3B+L+djwFpCn44qeI=";
     };
     meta.homepage = "https://github.com/AstroNvim/astrotheme/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1033,6 +1111,21 @@ final: prev: {
       hash = "sha256-290PxuIz8Pc1UWz6Huy0ZQH1CxGeoqN5x2U+VDCRBJc=";
     };
     meta.homepage = "https://github.com/AstroNvim/astroui/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
+    meta.hydraPlatforms = [ ];
+  };
+
+  async-nvim = buildVimPlugin {
+    pname = "async.nvim";
+    version = "0-unstable-2026-04-18";
+    src = fetchFromGitHub {
+      owner = "lewis6991";
+      repo = "async.nvim";
+      rev = "7a1d7d49933fbe902b84b55f352a3b10fd587331";
+      hash = "sha256-uyUvZVN7L7SqPAE1woc1T8dlhpH24FBj3/WD4VMwWF8=";
+    };
+    meta.homepage = "https://github.com/lewis6991/async.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1046,6 +1139,7 @@ final: prev: {
       hash = "sha256-YxZdOpV66YxNBACZRPugpk09+h42Sx/kjjDYPnOmqyI=";
     };
     meta.homepage = "https://github.com/prabirshrestha/async.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1059,6 +1153,7 @@ final: prev: {
       hash = "sha256-oemJyij+4PD60MQhEfcY2MdiGq47hB0gE+ybJXbKOXU=";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete-buffer.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1072,6 +1167,7 @@ final: prev: {
       hash = "sha256-5BGWLkyTV3HJ/Pped0k0FdLRXw0x8l5+GKYzAUmidP8=";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete-file.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1085,6 +1181,7 @@ final: prev: {
       hash = "sha256-Q6hmu5VtO0DaFhxt30aQunStaYidEoaKqPSU2SBYqfI=";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1098,6 +1195,7 @@ final: prev: {
       hash = "sha256-+bG2PIFGIkyPD2eKndn3xOWLdZYqnZo6ktTLhlsJc5I=";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete-omni.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1111,6 +1209,7 @@ final: prev: {
       hash = "sha256-kj8gY6ArhnzU/WBJZmf+E0N5OmCB99tqgNFeC3So5Ng=";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete-tags.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1124,6 +1223,7 @@ final: prev: {
       hash = "sha256-41HCRPvzwFygJ9yqz5KVSL5HcRALASNkxBpUfEg8AkI=";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete-ultisnips.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1137,6 +1237,7 @@ final: prev: {
       hash = "sha256-pRu6Kl91pwrvE5I/psq5TM16ZZRTfjaIRVWIObj52r0=";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1150,19 +1251,21 @@ final: prev: {
       hash = "sha256-cJUDUToKbfvZl4y8JROiRH1yRgPYVmkqVyDH4njxwM8=";
     };
     meta.homepage = "https://github.com/skywind3000/asyncrun.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   asynctasks-vim = buildVimPlugin {
     pname = "asynctasks.vim";
-    version = "0-unstable-2025-09-26";
+    version = "0-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "skywind3000";
       repo = "asynctasks.vim";
-      rev = "f1460492579831dfd4df85513ca0b41622c1a0c8";
-      hash = "sha256-kUz6b1f7ooT5NjYotRCjSP07P7ZO/tsZA+tXcuz3WT4=";
+      rev = "14892013f671614afae315f91ed5ef700334e773";
+      hash = "sha256-RsZ8NjOH4j4m9gO4PiQCJVzdatvhiveoSL2gESaon/8=";
     };
     meta.homepage = "https://github.com/skywind3000/asynctasks.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1176,6 +1279,7 @@ final: prev: {
       hash = "sha256-8BiMZIM8yrrmS+Mty2WnyC/k5FstlYp/fPlQVRvCRMo=";
     };
     meta.homepage = "https://github.com/vmchale/ats-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1189,6 +1293,7 @@ final: prev: {
       hash = "sha256-6BKH0HpTE+/w8S6v8U8TWhprQ93Vi+ctKDAHFiMRLdE=";
     };
     meta.homepage = "https://github.com/augmentcode/augment.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1202,6 +1307,7 @@ final: prev: {
       hash = "sha256-GSelduKp3s2M6litBAbxGBCoGnD4elNyAAXyrOQwCLw=";
     };
     meta.homepage = "https://github.com/ray-x/aurora/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1215,6 +1321,7 @@ final: prev: {
       hash = "sha256-dM9ZWncbVjRNk0VsGhngtPBM0kvSegnh1uXmljwCx8s=";
     };
     meta.homepage = "https://github.com/Jay-Madden/auto-fix-return.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1228,6 +1335,7 @@ final: prev: {
       hash = "sha256-yTv9UggjG2EDxH9HEyAn0CD2VvwdiOyO9oTD/g7c/Ck=";
     };
     meta.homepage = "https://github.com/hotwatermorning/auto-git-diff/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1241,6 +1349,7 @@ final: prev: {
       hash = "sha256-SWsefzaLn5mnVfZcO2rEGiS1tuuV28S3kk09l0QAedM=";
     };
     meta.homepage = "https://github.com/asiryk/auto-hlsearch.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1254,6 +1363,7 @@ final: prev: {
       hash = "sha256-ASK4CWWIhD1C6dwHFpMrUUXlwGrUyJrZmCIyy3LVuV8=";
     };
     meta.homepage = "https://github.com/jiangmiao/auto-pairs/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1267,6 +1377,7 @@ final: prev: {
       hash = "sha256-udN8ETRYKmVEeu+/2J6yZHnnBWtnLV7yKiOY0AvS8rg=";
     };
     meta.homepage = "https://github.com/okuuva/auto-save.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1280,6 +1391,7 @@ final: prev: {
       hash = "sha256-VboD/4FNA/LVad0Nu/ul43pcUMnwpNpP0cAhs14u3dI=";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1293,6 +1405,7 @@ final: prev: {
       hash = "sha256-DOKKyaDmfUPRTcXJvqD+0zAr63+93H0auax6Dse0Igo=";
     };
     meta.homepage = "https://github.com/m4xshen/autoclose.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1306,6 +1419,7 @@ final: prev: {
       hash = "sha256-UhiTOxHDt/NpslKbnuUswrK9aQKhm+eynI94tVU9JqA=";
     };
     meta.homepage = "https://github.com/gaoDean/autolist.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1319,6 +1433,7 @@ final: prev: {
       hash = "sha256-x8JHwQI/Z5S0IhA1EHFteGDOLTK0f8CCULqGZsk0EJQ=";
     };
     meta.homepage = "https://github.com/vim-scripts/autoload_cscope.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1332,6 +1447,7 @@ final: prev: {
       hash = "sha256-2xhvH9thJcRvh2auy+syJBGZvvayPCj4FNs4DgG6eTg=";
     };
     meta.homepage = "https://github.com/nullishamy/autosave.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "OSL-3.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1345,6 +1461,7 @@ final: prev: {
       hash = "sha256-Op/pl9wJIwYcOpF2cYG8PMZdsJ74LHOb6nAUpyi8pYc=";
     };
     meta.homepage = "https://github.com/lowitea/aw-watcher.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1358,6 +1475,7 @@ final: prev: {
       hash = "sha256-I7YYvQupeQxWr2HEpvba5n91+jYvJrcWZhQg+5rI908=";
     };
     meta.homepage = "https://github.com/ActivityWatch/aw-watcher-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1371,6 +1489,7 @@ final: prev: {
       hash = "sha256-bZls67M42MtlOsR9M8r+VeYOwIW9ynPfvSEzAxvZWWY=";
     };
     meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1384,6 +1503,7 @@ final: prev: {
       hash = "sha256-/GSzJjmMMfvXhXVOBapOj1Dt/5FHMETT6PEwlYgHEbs=";
     };
     meta.homepage = "https://github.com/AhmedAbdulrahman/aylin.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1397,6 +1517,7 @@ final: prev: {
       hash = "sha256-hFtprTDLMxKAmqF9lQZGq+GgiapjM5zUtsMWtWSrJH0=";
     };
     meta.homepage = "https://github.com/ayu-theme/ayu-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1410,6 +1531,7 @@ final: prev: {
       hash = "sha256-nu4nux21ghfcDfWtptsmaeUv4P6G+50TTDaH5wX0OXc=";
     };
     meta.homepage = "https://github.com/taybart/b64.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1423,6 +1545,7 @@ final: prev: {
       hash = "sha256-LT2mJWR5gzE65OfF09LRRoycAzkcGqRTcMdN+9jciKs=";
     };
     meta.homepage = "https://github.com/m00qek/baleia.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1436,19 +1559,21 @@ final: prev: {
       hash = "sha256-X9KrQg8TlhWGeeg2Loxv4OUBw/3Wt7XFVorDd/75CwA=";
     };
     meta.homepage = "https://github.com/ribru17/bamboo.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   barbar-nvim = buildVimPlugin {
     pname = "barbar.nvim";
-    version = "1.9.1-unstable-2025-12-02";
+    version = "1.9.1-unstable-2026-04-28";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "barbar.nvim";
-      rev = "539d73def39c9172b4d4d769f14090e08f37b29d";
-      hash = "sha256-vhoqeTU/1tw1dj5o5rmUhqpSBFPPjOfp3TZnjMtnMQ8=";
+      rev = "a4bef5b4fc1f064f2f673172252028eae18191c9";
+      hash = "sha256-D2/zgmi+dgq8w00ZdPDbppaPaXi/AYNnDOyYMG7nJ5I=";
     };
     meta.homepage = "https://github.com/romgrk/barbar.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1462,19 +1587,21 @@ final: prev: {
       hash = "sha256-Ue+GNwXUWRQ3WQAXTH7TL3fSCU2GSwtgllZ9E0yXgl8=";
     };
     meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   base16-nvim = buildVimPlugin {
     pname = "base16-nvim";
-    version = "0-unstable-2026-04-19";
+    version = "0-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "base16-nvim";
-      rev = "17781884af64e4205f84dde41d6030a61d0eb0dc";
-      hash = "sha256-j/QwImtvOHSLaoYR5nUOncmTFHrhdDPt30y3K8L2UFc=";
+      rev = "6b4f4a07b8b0c23a5cd3740631d96a97d7ccec09";
+      hash = "sha256-DQm6OGkpZq9M2ugq3fl6IHXM/dUCcRHxKFd9ngD+nWc=";
     };
     meta.homepage = "https://github.com/RRethy/base16-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1488,6 +1615,7 @@ final: prev: {
       hash = "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=";
     };
     meta.homepage = "https://github.com/chriskempson/base16-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1501,6 +1629,7 @@ final: prev: {
       hash = "sha256-AUdBZbGcPDtixHMFms9Y0EyUdAXOzvcA2AbrRdYQ4ig=";
     };
     meta.homepage = "https://github.com/nvchad/base46/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1514,6 +1643,7 @@ final: prev: {
       hash = "sha256-ip7wGrzJTf1D4ZtmJ87hnD8k1y9QtQZHKdQ7PDzfyZ0=";
     };
     meta.homepage = "https://github.com/jamespwilliams/bat.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1527,6 +1657,7 @@ final: prev: {
       hash = "sha256-fceXwNwSB2pzVQDMVU1mx1aMRpow22hY5fcVf1yDwxk=";
     };
     meta.homepage = "https://github.com/vim-scripts/bats.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1540,6 +1671,7 @@ final: prev: {
       hash = "sha256-UNguEOuk2yszPAcARPtev6xpyA0YqW++s4sh2y14RyU=";
     };
     meta.homepage = "https://github.com/rbgrouleff/bclose.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1553,19 +1685,21 @@ final: prev: {
       hash = "sha256-x6DYr+w0FIwVgrXgip8/wSrUDqkRkAs5HxXdwjY76/I=";
     };
     meta.homepage = "https://github.com/sontungexpt/better-diagnostic-virtual-text/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   better-escape-nvim = buildVimPlugin {
     pname = "better-escape.nvim";
-    version = "2.3.3-unstable-2025-04-29";
+    version = "2.3.3-unstable-2026-04-22";
     src = fetchFromGitHub {
       owner = "max397574";
       repo = "better-escape.nvim";
-      rev = "19a38aab94961016430905ebec30d272a01e9742";
-      hash = "sha256-OmCZQN9qMSSEBmZaRR5QoJ+RRm13pnu+0uAUoz6X7oA=";
+      rev = "3f4bc0b326606264ff75967f59091b5ddada0554";
+      hash = "sha256-h7Xa8McjnCOOP8WbqbmmJn9jjBMvk89Tvh0Qt1stEVU=";
     };
     meta.homepage = "https://github.com/max397574/better-escape.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1579,19 +1713,21 @@ final: prev: {
       hash = "sha256-fabA2mVZAZg5Qot4ED9cJ1YMZ4wX4OvURNhIvKltFtA=";
     };
     meta.homepage = "https://github.com/LunarVim/bigfile.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
   bitbake = buildVimPlugin {
     pname = "bitbake";
-    version = "6.0_M3";
+    version = "4.0.35";
     src = fetchFromGitHub {
       owner = "openembedded";
       repo = "bitbake";
-      tag = "yocto-6.0_M3";
-      hash = "sha256-nOnNIXRUxsYNaEBhWuzCMTg37C9/S4ekxNbCpvBe+TU=";
+      tag = "yocto-4.0.35";
+      hash = "sha256-Dm+k84uBWAbHIRc2Wqqqk9f4V0J7Cl67TrShWBb1tiY=";
     };
     meta.homepage = "https://github.com/openembedded/bitbake/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1605,6 +1741,7 @@ final: prev: {
       hash = "sha256-R1Iz9Cr8F3uTyi3HfDvfnQ9vfxLKfypUt4DXKmu+lSQ=";
     };
     meta.homepage = "https://github.com/FabijanZulj/blame.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1618,6 +1755,7 @@ final: prev: {
       hash = "sha256-e1gQiJugFnb9RyksF7RR4WIR/4PIWbgADltTIAb4COU=";
     };
     meta.homepage = "https://github.com/z4p5a9/blamer.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1631,19 +1769,21 @@ final: prev: {
       hash = "sha256-tozXOgP0dzIFd3a6mjGehUdytqerkWdfOo89CEVC/Rk=";
     };
     meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-avante/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   blink-cmp-conventional-commits = buildVimPlugin {
     pname = "blink-cmp-conventional-commits";
-    version = "0-unstable-2026-02-04";
+    version = "0-unstable-2026-04-20";
     src = fetchFromGitHub {
       owner = "disrupted";
       repo = "blink-cmp-conventional-commits";
-      rev = "faa45344aab97aa33ece53938c4c3379760e61bd";
-      hash = "sha256-nbulCccWnugVodwm6C7Xlf9D/0cpKEBL3tmnH3S15WY=";
+      rev = "28f46593ef5e03ba7525bdf6075be0c56c6ceb55";
+      hash = "sha256-eRGq2bjr6kqFoT1s4P1MIA7nIEvRTYw4OFIJbS/JD60=";
     };
     meta.homepage = "https://github.com/disrupted/blink-cmp-conventional-commits/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1657,6 +1797,7 @@ final: prev: {
       hash = "sha256-xEGAXv41UX9GUybCSzDODkhgdEd4cclBXl0k4UBmFbs=";
     };
     meta.homepage = "https://github.com/giuxtaposition/blink-cmp-copilot/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1670,6 +1811,7 @@ final: prev: {
       hash = "sha256-z41OnVbJAQe4FMvdazs0Uw8sAOyXEBJcx3IVqjOWGyI=";
     };
     meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1683,19 +1825,21 @@ final: prev: {
       hash = "sha256-DEzOzlwmvWmkR9VBF2jsgeA/bCjjgIiqY46GrcBGTfE=";
     };
     meta.homepage = "https://github.com/bydlw98/blink-cmp-env/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   blink-cmp-git = buildVimPlugin {
     pname = "blink-cmp-git";
-    version = "3.0.0-unstable-2026-02-21";
+    version = "3.0.0-unstable-2026-04-24";
     src = fetchFromGitHub {
       owner = "Kaiser-Yang";
       repo = "blink-cmp-git";
-      rev = "10783593af764424018a95e75df6ad5a8b66fe07";
-      hash = "sha256-esSFTYQP46Vy7XMpgVneh90NX/373FVpqEQeQb2jUFQ=";
+      rev = "302b9dabec3284de29665e2311118a3202cb192a";
+      hash = "sha256-s9nn6XRaCYxiwiEkv9J345hN3ppcblVHKE8WP6m+Atg=";
     };
     meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-git/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1709,6 +1853,7 @@ final: prev: {
       hash = "sha256-MlYg90l1UXNguQpCyfRVSi0hof+/jKAdoX/UnN/ZGwg=";
     };
     meta.homepage = "https://github.com/erooke/blink-cmp-latex/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1722,6 +1867,7 @@ final: prev: {
       hash = "sha256-ollZI9Bd3eAKvzS84oIzToVruYbCERKKhZpIR+cBxBE=";
     };
     meta.homepage = "https://github.com/GaetanLepage/blink-cmp-nixpkgs-maintainers/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1735,6 +1881,7 @@ final: prev: {
       hash = "sha256-0j8CljfXsEoZ+FkxB/YrT2YHvg87j1eyuhGgjxh+Dg0=";
     };
     meta.homepage = "https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1748,6 +1895,7 @@ final: prev: {
       hash = "sha256-xyh4n1dM/aJ7L9kgSAptTPSlotM7mz92tgl7232dBME=";
     };
     meta.homepage = "https://github.com/ribru17/blink-cmp-spell/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1761,6 +1909,7 @@ final: prev: {
       hash = "sha256-enoPsYF8llGShf+sx6rLYYnLLzrd+jdCdZ4gy9A2lKU=";
     };
     meta.homepage = "https://github.com/mgalliou/blink-cmp-tmux/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1774,6 +1923,7 @@ final: prev: {
       hash = "sha256-x4VSBDdcij4BkvIzkFnGVtJvq+ow1rTtZk9MWeTlzpE=";
     };
     meta.homepage = "https://github.com/archie-judd/blink-cmp-words/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1787,6 +1937,7 @@ final: prev: {
       hash = "sha256-DciQaX2lYQptpEd8wke3x67SK6zMm2UI34qxBe6eC9Q=";
     };
     meta.homepage = "https://github.com/marcoSven/blink-cmp-yanky/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -1800,6 +1951,7 @@ final: prev: {
       hash = "sha256-EMQC+2hjgAGYcBoSKkR5LV7jUsl3Oi8rL3K7FNIHXIw=";
     };
     meta.homepage = "https://github.com/Saghen/blink.compat/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1813,6 +1965,7 @@ final: prev: {
       hash = "sha256-cDvbUmnFZbPmU/HPISNV8zJV8WsH3COl3nGqgT5CbVQ=";
     };
     meta.homepage = "https://github.com/fang2hou/blink-copilot/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1826,6 +1979,7 @@ final: prev: {
       hash = "sha256-qBJ0zwkKlxZ6S6VzMusm9CCKx+EN1YOaBfdMb7xKQ5A=";
     };
     meta.homepage = "https://github.com/moyiz/blink-emoji.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1839,6 +1993,7 @@ final: prev: {
       hash = "sha256-SS66JZFCX8viYxYaObASlwtrG5h7yHbVvRBVXBNXkng=";
     };
     meta.homepage = "https://github.com/Saghen/blink.indent/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1852,19 +2007,21 @@ final: prev: {
       hash = "sha256-+sCNd10VQOFROwe6sZzSWUhskLb1k4Sg7NOQhwaTESA=";
     };
     meta.homepage = "https://github.com/MahanRahmati/blink-nerdfont.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2.2.5";
+    version = "2.2.6";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      tag = "v2.2.5";
-      hash = "sha256-ZTgRsY4efkihWAdJ6XiIdXipYLDq6DJiA303zXybzw0=";
+      tag = "v2.2.6";
+      hash = "sha256-W8FyG9WlSwp9ta0dsxhhtfJmQrc1OseieVw2k2mwWR8=";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1878,6 +2035,7 @@ final: prev: {
       hash = "sha256-MYMLRpF0xFNr4SqJGekxKA+fbhOUlv7LYZOLEwhiBSo=";
     };
     meta.homepage = "https://github.com/dundalek/bloat.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1891,19 +2049,21 @@ final: prev: {
       hash = "sha256-dqi4srdtm7TNsFPNcGpV8iwyTL+ov4AEfuQpVnikiYI=";
     };
     meta.homepage = "https://github.com/HampusHauffman/block.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   bluloco-nvim = buildVimPlugin {
     pname = "bluloco.nvim";
-    version = "1.4.0-unstable-2026-04-04";
+    version = "1.4.0-unstable-2026-04-21";
     src = fetchFromGitHub {
       owner = "uloco";
       repo = "bluloco.nvim";
-      rev = "f1a6cb87e55cd377002f1648163f434fd9837ef5";
-      hash = "sha256-5atqaCBSn/pTjoCoi10L9MgpgozMqXb0qU3BME9UPpc=";
+      rev = "4daabf6a9e6b9ecdcb19e7c78e888be0bacd866c";
+      hash = "sha256-qmVneHlI7XKTyXrSJu+lWaX6YmGQero7nTKrWR/i99c=";
     };
     meta.homepage = "https://github.com/uloco/bluloco.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1917,6 +2077,7 @@ final: prev: {
       hash = "sha256-oGplv+2q1M1pIwFj2u8ZT9WTNNImYreQtiBECGJKe/Q=";
     };
     meta.homepage = "https://github.com/rockerBOO/boo-colorscheme-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1930,6 +2091,7 @@ final: prev: {
       hash = "sha256-dmtvPgRb1CqOetyjUoUDJ+fruOotwY0ODBp8VN4kRAQ=";
     };
     meta.homepage = "https://github.com/nat-418/boole.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "0BSD";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1943,6 +2105,7 @@ final: prev: {
       hash = "sha256-As4k31PSSmrSkUemcnkxzrHd9nWXyGJguH9MKTpEnxU=";
     };
     meta.homepage = "https://github.com/turbio/bracey.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1956,6 +2119,7 @@ final: prev: {
       hash = "sha256-kZsvUcMpKVI8MCrYqKEKASfYlFeldlH8faa9xaOTFow=";
     };
     meta.homepage = "https://github.com/fruit-in/brainfuck-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "WTFPL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1969,6 +2133,7 @@ final: prev: {
       hash = "sha256-ljUNfmpImtxFCS19HC9kFlaLlqaPDltKtnx1+/6Y33U=";
     };
     meta.homepage = "https://github.com/famiu/bufdelete.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1982,6 +2147,7 @@ final: prev: {
       hash = "sha256-IRmhtjd6oXNwETCF98jIyoZJRbEeXZ8dcw6vH5ywugo=";
     };
     meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -1995,6 +2161,7 @@ final: prev: {
       hash = "sha256-JIykUDweq54RxKHNTS6QqZi2CTLPTig9nY30Gzgp08o=";
     };
     meta.homepage = "https://github.com/AndrewRadev/bufferize.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2008,6 +2175,7 @@ final: prev: {
       hash = "sha256-ae4MB6+6v3awvfSUWlau9ASJ147ZpwuX1fvJdfMwo1Q=";
     };
     meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2021,6 +2189,7 @@ final: prev: {
       hash = "sha256-K/aXbMCL/AM14faIVjNscl8eVyyfS5+LQ4X7nfqDGTU=";
     };
     meta.homepage = "https://github.com/kwkarlwang/bufjump.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2034,6 +2203,7 @@ final: prev: {
       hash = "sha256-6jqlKe8Ekm+3dvlgFCpJnI0BZzWC3KDYoOb88/itH+g=";
     };
     meta.homepage = "https://github.com/kwkarlwang/bufresize.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2047,6 +2217,7 @@ final: prev: {
       hash = "sha256-Rlv8tndDWBcLD/P9684v9VtCLmCXR2NkUl5gCxYmfIE=";
     };
     meta.homepage = "https://github.com/bullets-vim/bullets.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2060,6 +2231,7 @@ final: prev: {
       hash = "sha256-rNB44bWt6kFnrn+UyOqYHjigA9F/Iao9Osg/YTO4nhw=";
     };
     meta.homepage = "https://github.com/itchyny/calendar.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2073,6 +2245,7 @@ final: prev: {
       hash = "sha256-feQYIeTgpNU8k7p9zxkZTlsKmAKB8SVn/ioX1Py7yfQ=";
     };
     meta.homepage = "https://github.com/bkad/camelcasemotion/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2086,6 +2259,7 @@ final: prev: {
       hash = "sha256-7R4jo4tLHuS34hikP+TeI3TH16qF7CAhhmChhzJ8NtQ=";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2099,6 +2273,7 @@ final: prev: {
       hash = "sha256-Ap9UKMWfDBbWLf7Rh47JQy3EO2Tphf05RZvX9voF1Ac=";
     };
     meta.homepage = "https://github.com/catppuccin/vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2112,6 +2287,7 @@ final: prev: {
       hash = "sha256-qgO4mBfgkaMxWE9h30+2e2ARLaHIUhO/5Hudl53mkuM=";
     };
     meta.homepage = "https://github.com/tyru/caw.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2125,6 +2301,7 @@ final: prev: {
       hash = "sha256-3TZ8VmvdgQ9n63m78C3r4OIUkVQHTHBvC24ixBdhTig=";
     };
     meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2138,6 +2315,7 @@ final: prev: {
       hash = "sha256-UB0YXXC4/7BtZ06By0lT2Ad4PQtohAF8m57b71Dmxvo=";
     };
     meta.homepage = "https://github.com/Eandrju/cellular-automaton.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2151,6 +2329,7 @@ final: prev: {
       hash = "sha256-sHBPnylcJIO4dOrfZiYLPQLzCnTdwBkjXcJl1VZ8k0I=";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2164,6 +2343,7 @@ final: prev: {
       hash = "sha256-8gC+QJRZPktc/o7hBeCFjd4VbAMTPzAnIOl1MXc56Yw=";
     };
     meta.homepage = "https://github.com/vim-scripts/changeColorScheme.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2177,19 +2357,21 @@ final: prev: {
       hash = "sha256-TYkGB7cON2t4GwMaR9H1MDG2j3btBv2AR37ade8kqTY=";
     };
     meta.homepage = "https://github.com/sudormrfbin/cheatsheet.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   checkmate-nvim = buildVimPlugin {
     pname = "checkmate.nvim";
-    version = "0.12.0";
+    version = "0.12.1";
     src = fetchFromGitHub {
       owner = "bngarren";
       repo = "checkmate.nvim";
-      tag = "v0.12.0";
-      hash = "sha256-stV0WtkTj+7S1aPAbu1unP755xO275Q1D7k/pl+NbHM=";
+      tag = "v0.12.1";
+      hash = "sha256-HIZTf+lUTonfQ+pq5+MxuFNo7M73Bbpv77jNSlnVHj4=";
     };
     meta.homepage = "https://github.com/bngarren/checkmate.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2203,6 +2385,7 @@ final: prev: {
       hash = "sha256-jLgMK4jiLLdt/Xokk/j0GorCermtn2mwom6P/asgQvQ=";
     };
     meta.homepage = "https://github.com/yunlingz/ci_dark/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2216,6 +2399,7 @@ final: prev: {
       hash = "sha256-+nDYk3zkLlj9YkzfK8mbD22iLWaHpzHImxPt3EVfyV0=";
     };
     meta.homepage = "https://github.com/declancm/cinnamon.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2229,6 +2413,7 @@ final: prev: {
       hash = "sha256-vavBQv8UlgwCmVWAibgHQKG3bJ1zlzVMexdHWRMDbe8=";
     };
     meta.homepage = "https://github.com/projekt0n/circles.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2242,6 +2427,7 @@ final: prev: {
       hash = "sha256-3MEAVKAblGysBhlrCf8j7Pf79tmylkjTnQkg6cvKMjg=";
     };
     meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2255,6 +2441,7 @@ final: prev: {
       hash = "sha256-0HUtcgpmkJOjaFi8v0OHUk0hd5I3ISO1zkPJO4vr38A=";
     };
     meta.homepage = "https://github.com/xavierd/clang_complete/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2267,6 +2454,7 @@ final: prev: {
       hash = "sha256-5XES8qyl3tdMmsT+mkVcJ1sC5AKJDpHI/elsoB8XE/8=";
     };
     meta.homepage = "https://git.sr.ht/~p00f/clangd_extensions.nvim";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2280,6 +2468,7 @@ final: prev: {
       hash = "sha256-HBHlP2k4vUCbE+Sgm6vN5XE7UGnioFvj8CI6h5H+8x8=";
     };
     meta.homepage = "https://github.com/greggh/claude-code.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2293,6 +2482,7 @@ final: prev: {
       hash = "sha256-bK6fq5HZRCMnahYvgSKcCYwIEa76q/jObn9KxY7kxv8=";
     };
     meta.homepage = "https://github.com/pittcat/claude-fzf-history.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2306,19 +2496,21 @@ final: prev: {
       hash = "sha256-OBpNT1rbjnfoDQ/L+NSDyAVtgN4Nyva1hw/E9FvqZSs=";
     };
     meta.homepage = "https://github.com/pittcat/claude-fzf.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   claudecode-nvim = buildVimPlugin {
     pname = "claudecode.nvim";
-    version = "0.3.0-unstable-2026-03-04";
+    version = "0.3.0-unstable-2026-04-27";
     src = fetchFromGitHub {
       owner = "coder";
       repo = "claudecode.nvim";
-      rev = "432121f0f5b9bda041030d1e9e83b7ba3a93dd8f";
-      hash = "sha256-r8hAUpSsr8zNm+av8Mu5oILaTfEsXEnJmkzRmvi9pF8=";
+      rev = "102d835c964069c9c5e37abaf05ae4f9c3ee6f00";
+      hash = "sha256-h8wYaWBKjKrb7hYYKYs5yUS5RI0JVFo8Emcy99YK6Qw=";
     };
     meta.homepage = "https://github.com/coder/claudecode.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2332,6 +2524,7 @@ final: prev: {
       hash = "sha256-miltIeW0AZPgqoDno0Nyo287mBbV2cJaf1XahECZfr0=";
     };
     meta.homepage = "https://github.com/rhysd/clever-f.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2345,6 +2538,7 @@ final: prev: {
       hash = "sha256-j7MjRD2N+YcqAhbtD734H2cYaM43f40jDFdUv1oUKQc=";
     };
     meta.homepage = "https://github.com/bbchung/clighter8/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2358,6 +2552,7 @@ final: prev: {
       hash = "sha256-iXrDb3pSB1NZmvLpSEWwvxOoqyNfR+uXpU9azXQeAVM=";
     };
     meta.homepage = "https://github.com/ekickx/clipboard-image.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2371,6 +2566,7 @@ final: prev: {
       hash = "sha256-V7oNIu7IBAHqSrgCNoePNUPjQDU9cFThFf7XGIth0sk=";
     };
     meta.homepage = "https://github.com/laytan/cloak.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2384,19 +2580,21 @@ final: prev: {
       hash = "sha256-JXpGIHatTKjcyHWLxHEibwDrHJwaEflKDRzmOJGAvck=";
     };
     meta.homepage = "https://github.com/asheq/close-buffers.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   cmake-tools-nvim = buildVimPlugin {
     pname = "cmake-tools.nvim";
-    version = "0-unstable-2026-04-09";
+    version = "0-unstable-2026-04-28";
     src = fetchFromGitHub {
       owner = "Civitasv";
       repo = "cmake-tools.nvim";
-      rev = "bac6ba2354a52c61f731c751cdb0f4e24669bf0d";
-      hash = "sha256-qHWyDd7/hm/t5IX8gaP6VPWEJ6M3uACP6SKJpvKpX58=";
+      rev = "f9a3eb2be0b8148df470244e5c25aede3a3a28a5";
+      hash = "sha256-WJx/BYvYQDYL+/0ROXi4lzjaEcDOHSc+73qEIXxYuPI=";
     };
     meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2410,6 +2608,7 @@ final: prev: {
       hash = "sha256-wQ2vmPhVD/ImtbM5+gwqwHr1XuVWs2glWnmz9bhLcYc=";
     };
     meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2423,6 +2622,7 @@ final: prev: {
       hash = "sha256-TMo/b2ESYQ0TxcufmpXjRfwFLPGxi0oAaYHV9lddZPg=";
     };
     meta.homepage = "https://github.com/vim-scripts/cmdalias.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2436,6 +2636,7 @@ final: prev: {
       hash = "sha256-XcXAtZYrWXoSp2wOPI3WJd2OqhoPpYT6CwrIEMYHGxU=";
     };
     meta.homepage = "https://github.com/tzachar/cmp-ai/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2448,6 +2649,7 @@ final: prev: {
       hash = "sha256-ALMK7TnEB7/UZibVgOl4r6/gYsHCo6YAZcAR536VL4g=";
     };
     meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2461,6 +2663,7 @@ final: prev: {
       hash = "sha256-a0rGq0Ci6rX1ucme1w+sMNrXAbucM4xkrWX1t11XqpM=";
     };
     meta.homepage = "https://github.com/crispgm/cmp-beancount/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2474,6 +2677,7 @@ final: prev: {
       hash = "sha256-dG4U7MtnXThoa/PD+qFtCt76MQ14V1wX8GMYcvxEnbM=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-buffer/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2487,6 +2691,7 @@ final: prev: {
       hash = "sha256-TI1FR0EjzPcjsFdJQ9vXVleQwyXkmqs4TvYyZ8A6cS0=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-calc/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2500,6 +2705,7 @@ final: prev: {
       hash = "sha256-kG+NO+0hv4xNzjfJmam3LN8GkpPqfpnDKFefwdx2B9A=";
     };
     meta.homepage = "https://github.com/vappolinario/cmp-clippy/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2513,6 +2719,7 @@ final: prev: {
       hash = "sha256-w1HwR13rXRyLgWabHwJYABXO++gPEOMr46poUzOChzg=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2526,6 +2733,7 @@ final: prev: {
       hash = "sha256-IcruTOCNxYKmbo0St1U+CmrDStASPLe+rTLNU6/2Xew=";
     };
     meta.homepage = "https://github.com/dmitmel/cmp-cmdline-history/";
+    meta.license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2539,6 +2747,7 @@ final: prev: {
       hash = "sha256-uTiXG8p0Cqc4o45ckscRSSv0qGqbfwuryqWBZHEh8Mc=";
     };
     meta.homepage = "https://github.com/PaterJason/cmp-conjure/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2552,6 +2761,7 @@ final: prev: {
       hash = "sha256-PAEWX0U8qbBwC3DqfCrDDlTLoIRIlcbwS1eDu3yarTc=";
     };
     meta.homepage = "https://github.com/davidsierradz/cmp-conventionalcommits/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2565,6 +2775,7 @@ final: prev: {
       hash = "sha256-2j3Y2vvBHXLD+fPH7fbvjKadd6X/uuHI0ajkjTJR35I=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-copilot/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2578,6 +2789,7 @@ final: prev: {
       hash = "sha256-C3E2ChqlXxiD62jx6Jvwf/3WjlcnjN3G1GKJGehzoq4=";
     };
     meta.homepage = "https://github.com/delphinus/cmp-ctags/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2591,6 +2803,7 @@ final: prev: {
       hash = "sha256-wi9L4RcnJWUzTkC4u8vSTacrMxg4ftm/K7pkuwLEQ3U=";
     };
     meta.homepage = "https://github.com/rcarriga/cmp-dap/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2604,6 +2817,7 @@ final: prev: {
       hash = "sha256-pmGFs6UPbhtb/NO8L+de0PyL5+JKeEr4LJxNPZNsaeM=";
     };
     meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2617,6 +2831,7 @@ final: prev: {
       hash = "sha256-b4IFjTYvqodJokCGWyNJKShebSzz1UZ91vA5SthxORg=";
     };
     meta.homepage = "https://github.com/dmitmel/cmp-digraphs/";
+    meta.license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2630,6 +2845,7 @@ final: prev: {
       hash = "sha256-EY0yu6wugw2cweTOYkdAXW4FZFh6SdTPsVncqrnrc14=";
     };
     meta.homepage = "https://github.com/SergioRibera/cmp-dotenv/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2643,6 +2859,7 @@ final: prev: {
       hash = "sha256-Sdgetlwhhc11ufDJH6uaXtbL0EZQFZ2Qgg5yBfG1u7I=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-emoji/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2656,6 +2873,7 @@ final: prev: {
       hash = "sha256-Fadb5xapY6WiRMCDc9hoj8AaIgSt+s0Y8ZPVtvTVhWo=";
     };
     meta.homepage = "https://github.com/mtoohey31/cmp-fish/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2669,19 +2887,21 @@ final: prev: {
       hash = "sha256-8cIixO0OusqlnKrFqVutGwUfdX319k8a19Nz1xiUH2I=";
     };
     meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   cmp-fuzzy-path = buildVimPlugin {
     pname = "cmp-fuzzy-path";
-    version = "0-unstable-2024-01-17";
+    version = "0-unstable-2026-04-27";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-fuzzy-path";
-      rev = "9953c11a2510a04111b7b152cf50ae1e83f00798";
-      hash = "sha256-hJakGmszuJnPIcqrDSNAmm2x1c7ra+qUMEdoKrUop+w=";
+      rev = "c94176cda6b5d93d102634fc5fb94dda1018685d";
+      hash = "sha256-zCYhLxKPF6uR/U06IkD0qe1FJsfp3wBUFq9pFHC7CfM=";
     };
     meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2695,6 +2915,7 @@ final: prev: {
       hash = "sha256-ufbqLLgcRDoSG2XTqmMRcaHG120wtUqtovIrhLwXZ3k=";
     };
     meta.homepage = "https://github.com/petertriho/cmp-git/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2708,6 +2929,7 @@ final: prev: {
       hash = "sha256-CYJ4Px18wXDMw/58InwBDxbcO+94IzNLcwYp6iKJPRE=";
     };
     meta.homepage = "https://github.com/max397574/cmp-greek/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2721,6 +2943,7 @@ final: prev: {
       hash = "sha256-95AvId9oT9N9hqEOphKPMdKT6raxc9o0AcEY4CGeI4U=";
     };
     meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2734,6 +2957,7 @@ final: prev: {
       hash = "sha256-Nr9dnPJt824Yb/udxQ5GKFW8rToWp6r7l9wAxwP2PRY=";
     };
     meta.homepage = "https://github.com/octaltree/cmp-look/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2747,6 +2971,7 @@ final: prev: {
       hash = "sha256-7mVKH6M7YjzxVq2RrlrUL8V/hcB/NmURU9Dl9aazw3U=";
     };
     meta.homepage = "https://github.com/notomo/cmp-neosnippet/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2760,6 +2985,7 @@ final: prev: {
       hash = "sha256-jEnuHDL+PDbnZtSzoO7ExDfl0sICFYDWvXqEGaC+Seg=";
     };
     meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2773,6 +2999,7 @@ final: prev: {
       hash = "sha256-6o0eO4uuHNBbo6pqWgRtleOxd8rYaYbrl+dTjhB6M8Q=";
     };
     meta.homepage = "https://github.com/David-Kunz/cmp-npm/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2786,6 +3013,7 @@ final: prev: {
       hash = "sha256-CYZdfAsJYQyW413fRvNbsS5uayuc6fKDvDLZ2Y7j3ZQ=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2799,6 +3027,7 @@ final: prev: {
       hash = "sha256-BBvG0/yEyYs+sLPtCYAgZLz9ccGAMBCMhgmwC+gZ3kc=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2812,6 +3041,7 @@ final: prev: {
       hash = "sha256-gIlax5z+J7ZbygiUMvnKvz0m2bmck/W1swIYq6WDAGo=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2825,6 +3055,7 @@ final: prev: {
       hash = "sha256-eUnytDC6OrbJpg4fepwzCfpwKi8d8LN5QvJOZaP2niE=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2838,6 +3069,7 @@ final: prev: {
       hash = "sha256-IleS0hULag/CcwNMdf+4eRsDnBzkCCGyA4wLR7gaxvg=";
     };
     meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-tags/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2851,6 +3083,7 @@ final: prev: {
       hash = "sha256-BwjkBU5yVZKYK8bfMQSct7rftuBjYzzF06CR5I68aHE=";
     };
     meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2864,6 +3097,7 @@ final: prev: {
       hash = "sha256-PyCZGb+54l9nLR0fXM2QXACGt25nH0IlucbTXIgbJp0=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-omni/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2877,6 +3111,7 @@ final: prev: {
       hash = "sha256-zkTOczQZQ59QiqiSxya9j8tOw+gtuFd7EK4gz+AAiTo=";
     };
     meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2890,6 +3125,7 @@ final: prev: {
       hash = "sha256-XsdneGNJzmRBggk8lz9JNDQYk7wbYfUAF2oZLXzFb9c=";
     };
     meta.homepage = "https://github.com/jmbuhr/cmp-pandoc-references/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2903,6 +3139,7 @@ final: prev: {
       hash = "sha256-e4Rd2y1Wekp7aobpTGaUeoSBnlfIASDaBR8js5dh2Vw=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-path/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2916,6 +3153,7 @@ final: prev: {
       hash = "sha256-IWYyZoXYyddW9wqR50E16IXFQAsFAjf93O/NkVGb9H8=";
     };
     meta.homepage = "https://github.com/lukas-reineke/cmp-rg/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2929,6 +3167,7 @@ final: prev: {
       hash = "sha256-suw8AGXLi48hB49otZlS+DzbhwPDC9ql34dX3ufLnNA=";
     };
     meta.homepage = "https://github.com/dcampos/cmp-snippy/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2942,6 +3181,7 @@ final: prev: {
       hash = "sha256-Gf7HSocvHmTleVQytNYmmN+fFX7kl5sYHQSpUJc0CGI=";
     };
     meta.homepage = "https://github.com/f3fora/cmp-spell/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -2955,6 +3195,7 @@ final: prev: {
       hash = "sha256-DQkEX5SdTLIdI4g157bVjlJUHRkFrD1akLHvDw7KJT4=";
     };
     meta.homepage = "https://github.com/nzlov/cmp-tabby/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2968,6 +3209,7 @@ final: prev: {
       hash = "sha256-g7H6dO+SfYSVjSs24+RcngtecuxsgntaAXb6aodFF3w=";
     };
     meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2981,6 +3223,7 @@ final: prev: {
       hash = "sha256-xHnBKOOg/6n06vK7sC3shDw80ci/cl/5xgs7kobd6+s=";
     };
     meta.homepage = "https://github.com/andersevenrud/cmp-tmux/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -2994,6 +3237,7 @@ final: prev: {
       hash = "sha256-8WAk9S+/7vSz7bVHdEzjbKUokU144fvnByIeJ1gAWhU=";
     };
     meta.homepage = "https://github.com/ray-x/cmp-treesitter/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3007,6 +3251,7 @@ final: prev: {
       hash = "sha256-sPZX+dbGKOUfcjme4qG82impwYZgLbN5eRmblxPtbKI=";
     };
     meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3020,6 +3265,7 @@ final: prev: {
       hash = "sha256-V5yC4st22stUkD54/2hDGi/Axi/T0YArkVhQlDvHg7g=";
     };
     meta.homepage = "https://github.com/dmitmel/cmp-vim-lsp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3033,6 +3279,7 @@ final: prev: {
       hash = "sha256-2whCuzLc57gPerZN7Dg6tUzZplox/6P+iRMuAYfjY1E=";
     };
     meta.homepage = "https://github.com/micangl/cmp-vimtex/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3046,6 +3293,7 @@ final: prev: {
       hash = "sha256-wG63srm0ieCPoEcpYxKHOJedWajW04FnJaL+1Vlb5Ug=";
     };
     meta.homepage = "https://github.com/pontusk/cmp-vimwiki-tags/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3059,6 +3307,7 @@ final: prev: {
       hash = "sha256-2mkN03noOr5vBvRbSb35xZKorSH+8savQNZtgM9+QcM=";
     };
     meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3072,6 +3321,7 @@ final: prev: {
       hash = "sha256-RovqqMGvoUFvQB2CdYnDYa84/HQp2MotHNiuDLOgLuY=";
     };
     meta.homepage = "https://github.com/tamago324/cmp-zsh/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3085,6 +3335,7 @@ final: prev: {
       hash = "sha256-86lKQPPyqFz8jzuLajjHMKHrYnwW6+QOcPyQEx6B+gw=";
     };
     meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3098,6 +3349,7 @@ final: prev: {
       hash = "sha256-Upk3D54HwM07QbbWs8fTsHQUYO/zyIFFnft/CohV/iA=";
     };
     meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3111,6 +3363,7 @@ final: prev: {
       hash = "sha256-YmNd6atWTwAlgZItgFXgaLinTbAMWpQE5Jc/rWNstRo=";
     };
     meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3124,6 +3377,7 @@ final: prev: {
       hash = "sha256-Onq7kMrwJp3/raWcil24RbizGK8VriPVFXbd8Gvg9A0=";
     };
     meta.homepage = "https://github.com/vn-ki/coc-clap/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3137,6 +3391,7 @@ final: prev: {
       hash = "sha256-IGhwtUGEe45qzyE5Rgez0cc2fv0rm8qniNq1O90T/E4=";
     };
     meta.homepage = "https://github.com/neoclide/coc-denite/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3150,6 +3405,7 @@ final: prev: {
       hash = "sha256-12luGVkbc7FDW/Hcl2vF5+p+hSLHgegHgizrXIMrV8I=";
     };
     meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3163,6 +3419,7 @@ final: prev: {
       hash = "sha256-tfZKX/M/L0K84CIgq0g9Xnoy2meuaTd9BET7WzD3/Ms=";
     };
     meta.homepage = "https://github.com/josa42/coc-lua/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3176,19 +3433,21 @@ final: prev: {
       hash = "sha256-yG4zkgfnHIUojWcUL+AkH56lafG7TZ2yzWaa3sMd8Ps=";
     };
     meta.homepage = "https://github.com/neoclide/coc-neco/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "0.0.82-unstable-2026-04-17";
+    version = "0.0.82-unstable-2026-04-30";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "4760873cd36831c555309f884a955ab66717d8c0";
-      hash = "sha256-p/xVUvewcB6DhfHeV6tj+RH+ijeFOxA6/qARG0obcrA=";
+      rev = "e682a2e0cef815b49b3bb79a0c6d0a430c8116c8";
+      hash = "sha256-dSylKvIZhZjM/5ORCrs3+yROiIIg3fTGnchFK2i2bJY=";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3202,6 +3461,7 @@ final: prev: {
       hash = "sha256-8LtQjrk1v4dqsvTVLuyoGdrdSjMjlcKWREdApyoP+Ec=";
     };
     meta.homepage = "https://github.com/coc-extensions/coc-svelte/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3215,6 +3475,7 @@ final: prev: {
       hash = "sha256-BbmU3nKm+RFqihAM8NTqRhPm2mtSom9LFQZJZQZdKqE=";
     };
     meta.homepage = "https://github.com/iamcco/coc-tailwindcss/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3228,6 +3489,7 @@ final: prev: {
       hash = "sha256-1iSb6nOiqSwf0fQhPEwAKJBDCwL9SyBM3dw/ei8dOA8=";
     };
     meta.homepage = "https://github.com/manicmaniac/coconut.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3241,6 +3503,7 @@ final: prev: {
       hash = "sha256-SnzpyXqrAf60Vs7JbwuHmAJ/TNON8wwqNyPN3EGc2Og=";
     };
     meta.homepage = "https://github.com/ravitemer/codecompanion-history.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3254,19 +3517,21 @@ final: prev: {
       hash = "sha256-lIHyiBU3P1hxPY0CGKH1xj6cXCSKJ/2Hmc18gZLIXEU=";
     };
     meta.homepage = "https://github.com/franco-ruggeri/codecompanion-lualine.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "19.11.0";
+    version = "19.12.0";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      tag = "v19.11.0";
-      hash = "sha256-z8zcGgq5CBq5OlUZ+GfcvCgVrrFdGUMpJYR0duMigXA=";
+      tag = "v19.12.0";
+      hash = "sha256-SKqRMFG5xiJHhMCexOtQGAJRFYRgcfuInxTJvXhGhhI=";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3280,6 +3545,7 @@ final: prev: {
       hash = "sha256-QSkiyV70kFkArCnTXYRR+Dt4i5XSq072tYnOnHbKEBc=";
     };
     meta.homepage = "https://github.com/franco-ruggeri/codecompanion-spinner.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3293,6 +3559,7 @@ final: prev: {
       hash = "sha256-7Ujon82GbVqD5K+lattVCYHkkGofvVEjbeqyaUeR2rU=";
     };
     meta.homepage = "https://github.com/mrjones2014/codesettings.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3306,6 +3573,21 @@ final: prev: {
       hash = "sha256-eT6AU8kSgMFyDllcbShQd1WRO/z0S44TdSVUf61v2oo=";
     };
     meta.homepage = "https://github.com/gorbit99/codewindow.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
+  codex-nvim = buildVimPlugin {
+    pname = "codex.nvim";
+    version = "1.1.0";
+    src = fetchFromGitHub {
+      owner = "johnseth97";
+      repo = "codex.nvim";
+      tag = "v1.1.0";
+      hash = "sha256-rx5/Iso5rWYfRTnQyZ8g16FCxqjj4FgWmG+r09ebVJc=";
+    };
+    meta.homepage = "https://github.com/johnseth97/codex.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3319,6 +3601,7 @@ final: prev: {
       hash = "sha256-vN0ZrvnF4EpFHhAK1QFyORL2KyFSzngQRDgpu5dYyoY=";
     };
     meta.homepage = "https://github.com/metakirby5/codi.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3332,6 +3615,7 @@ final: prev: {
       hash = "sha256-wLmXyoVdOIsOcpshGFvDiEou++j42p2w2zYy9ZDidqo=";
     };
     meta.homepage = "https://github.com/archseer/colibri.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3345,6 +3629,7 @@ final: prev: {
       hash = "sha256-YanO/e4jlm/k5VSnMDGQ7PnWKuj+ADifg0UsZvbbkKA=";
     };
     meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3358,19 +3643,21 @@ final: prev: {
       hash = "sha256-hra7QFKWsIqtAWYNDqPv3tJUAsZfVmGTY3AQjeWvxaM=";
     };
     meta.homepage = "https://github.com/xzbdmw/colorful-menu.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   colorful-winsep-nvim = buildVimPlugin {
     pname = "colorful-winsep.nvim";
-    version = "0-unstable-2026-02-19";
+    version = "0-unstable-2026-04-26";
     src = fetchFromGitHub {
       owner = "nvim-zh";
       repo = "colorful-winsep.nvim";
-      rev = "84432d9966fafaa08dd9040c98b0011045d8e964";
-      hash = "sha256-xZKDP/9iG2+tt8nqNpirvCe5olNj/jLYrVV9D6o+UXk=";
+      rev = "6134b5cd4a38990c7b720adc90973ed32f726179";
+      hash = "sha256-11F/cax2qRDQtxbmM8TfHlmko5gxX5VrW8lPcPFfIzU=";
     };
     meta.homepage = "https://github.com/nvim-zh/colorful-winsep.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3384,6 +3671,7 @@ final: prev: {
       hash = "sha256-kL194P1Vtvsj8e2ngJpVKh+9hwsK7sBYECdfxgMd8vg=";
     };
     meta.homepage = "https://github.com/lilydjwg/colorizer/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3397,6 +3685,7 @@ final: prev: {
       hash = "sha256-KNTHHcbsJv9IJnXvnpXojYFQMULJbZP/c7WH5ksDTgM=";
     };
     meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3410,6 +3699,7 @@ final: prev: {
       hash = "sha256-yrwpVy9qiDqiMxy07hvdgx01BrQbkPy5e3OgAjuOw/k=";
     };
     meta.homepage = "https://github.com/mluders/comfy-line-numbers.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3423,6 +3713,7 @@ final: prev: {
       hash = "sha256-yp3kqhHQMtUFFPfbqgnrmmclx6r39k3ohen4Ys3s3BU=";
     };
     meta.homepage = "https://github.com/wincent/command-t/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3436,6 +3727,7 @@ final: prev: {
       hash = "sha256-bYh/rcJv03GlMhxmEUL/F/9Ao1n71C2jj8F60x0ZY40=";
     };
     meta.homepage = "https://github.com/saifulapm/commasemi.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3449,6 +3741,7 @@ final: prev: {
       hash = "sha256-2P8Zyd5ucOvihZdjgSmr7YlV0yuCn+LyHkCj9gPx/CY=";
     };
     meta.homepage = "https://github.com/LudoPinelli/comment-box.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3462,6 +3755,7 @@ final: prev: {
       hash = "sha256-h0kPue5Eqd5aeu4VoLH45pF0DmWWo1d8SnLICSQ63zc=";
     };
     meta.homepage = "https://github.com/numtostr/comment.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3475,6 +3769,7 @@ final: prev: {
       hash = "sha256-ltqRfpamivu+H5ss5aiq4/oNhGYs+CsJ1GQeVpggEBY=";
     };
     meta.homepage = "https://github.com/rhysd/committia.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3488,6 +3783,7 @@ final: prev: {
       hash = "sha256-AL4NaLxnmGyoG585njmU5SOxps51XJ4ZJa2qeGlzrlE=";
     };
     meta.homepage = "https://github.com/xeluxee/competitest.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3501,6 +3797,7 @@ final: prev: {
       hash = "sha256-UbPd2v+Oz8LXz3D4w6bUI+LTtd+IhWgigJCLqU5/l9o=";
     };
     meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3514,6 +3811,7 @@ final: prev: {
       hash = "sha256-7+1GJwFwM9n6PqHWTAZJwMNGyQAudJe2ZIdycPD05y8=";
     };
     meta.homepage = "https://github.com/Zeioth/compiler.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3527,6 +3825,7 @@ final: prev: {
       hash = "sha256-0M+CENXL1g3y+z3KfuSlGcHC4LRn5u1JpodmyYavPZM=";
     };
     meta.homepage = "https://github.com/steelsojka/completion-buffers/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3540,6 +3839,7 @@ final: prev: {
       hash = "sha256-6um9dye0MLY8K8AAsDksCpy1KbMNSdMuj+zKteSAxR4=";
     };
     meta.homepage = "https://github.com/nvim-lua/completion-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3553,6 +3853,7 @@ final: prev: {
       hash = "sha256-0/LsJnPOIjEH/hD1Mb2+OWHuVGW0uOA6imMDv2jgbbE=";
     };
     meta.homepage = "https://github.com/aca/completion-tabnine/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3566,6 +3867,7 @@ final: prev: {
       hash = "sha256-S/+Z84Ywa/zIrkkrd4I5BrFokBy751czqwZKx2tD8Xw=";
     };
     meta.homepage = "https://github.com/chikatoike/concealedyank.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3579,20 +3881,22 @@ final: prev: {
       hash = "sha256-fydXEReohZlxGgjClncOI9bqbnDPNTB07TPccXxO6bk=";
     };
     meta.homepage = "https://github.com/rhysd/conflict-marker.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "9.1.0-unstable-2026-03-10";
+    version = "9.1.0-unstable-2026-04-23";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "086a40dc7ed8242c03be9f47fbcee68699cc2395";
-      hash = "sha256-aJIUkAcFdaOWBQ3HNLLvhqALzch0BqPUZPtb2cmIeCE=";
+      rev = "dca1a190aa85f9065979ef35802fb77131911106";
+      hash = "sha256-pV7Yr2LSBDqKGeYoS4CWHGUSs8Yx4wsVXCXySt9yz0M=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3606,6 +3910,7 @@ final: prev: {
       hash = "sha256-wz+nHMR6gYXGDxSAZExd7CItONY2MERYzDapNpKFLmc=";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3619,6 +3924,7 @@ final: prev: {
       hash = "sha256-VCtnbhwZ8bIOmwUwu+ExU//FNhvsdJrac9Hdy9GKUr4=";
     };
     meta.homepage = "https://github.com/niklasdewally/conjure.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Vim";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3632,6 +3938,7 @@ final: prev: {
       hash = "sha256-p7iMPS5Vbi78PTSbAD72Y56a62W8vsruXf/tFI56r7c=";
     };
     meta.homepage = "https://github.com/wellle/context.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3645,6 +3952,7 @@ final: prev: {
       hash = "sha256-jfUVDBqE1xeOAdcK+sltTR5fJAkgejzmgPENyWMg4ws=";
     };
     meta.homepage = "https://github.com/Shougo/context_filetype.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3658,6 +3966,7 @@ final: prev: {
       hash = "sha256-Esr33dRsKGc7vOQ2jMx8enj4uIicsRNvYbc4GsqlFUk=";
     };
     meta.homepage = "https://github.com/banjo/contextfiles.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3671,6 +3980,7 @@ final: prev: {
       hash = "sha256-erRL8bY/zuwuCZfttw+avTrFV7pjv2H6v73NzY2bymM=";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3684,6 +3994,7 @@ final: prev: {
       hash = "sha256-wb6WpIMUggHjUKEI++pRgg53vyiuwEZQmYWEN7sev3M=";
     };
     meta.homepage = "https://github.com/copilotlsp-nvim/copilot-lsp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3697,6 +4008,7 @@ final: prev: {
       hash = "sha256-9e5nJI+ugkolwdzQ4/KT6Gz1rpSbOSnLfdUWT9LDJg0=";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3710,6 +4022,7 @@ final: prev: {
       hash = "sha256-HYNqPdwatrNTNUGo6I2SzmNxSI4iqX+Ls7GHQcU8+Fk=";
     };
     meta.homepage = "https://github.com/AndreM222/copilot-lualine/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3723,6 +4036,7 @@ final: prev: {
       hash = "sha256-McrihGscbvt2lqHil3NxHUfgx/IAFDf7tdbBkv4vTK4=";
     };
     meta.homepage = "https://github.com/github/copilot.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3736,6 +4050,7 @@ final: prev: {
       hash = "sha256-91OF1qsqAln/E8H1vJLQHIdnpcEmTn1NCPgSU2768EA=";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3749,6 +4064,7 @@ final: prev: {
       hash = "sha256-njWd5MYav5nHzQg6EDYmRQQVNoA4Y/3U8xBkbAsZhag=";
     };
     meta.homepage = "https://github.com/tomtomjhj/coq-lsp.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3762,6 +4078,7 @@ final: prev: {
       hash = "sha256-l+wMABt0lnKn1V6d7uhe6rUjfKsZw9XcO6RHwEVrZSI=";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3775,19 +4092,21 @@ final: prev: {
       hash = "sha256-fto7KFjMA1f7eEYZXL083nVsxeH0iHhWGGhviirj7kI=";
     };
     meta.homepage = "https://github.com/jvoorhis/coq.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "0-unstable-2026-01-06";
+    version = "0-unstable-2026-04-23";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "d939a34ceb2b57d2937890337a4aa75eb55e18a8";
-      hash = "sha256-ySWDUOXmbVAthLCx3EvRRZnBi44G0PofZq/MqUCh+6A=";
+      rev = "bcc1bf327b98042e6a77a9637cd465cbceca2679";
+      hash = "sha256-GKwfDWCKSJ6uQ8PZfKUW3MjMYtEhKVhmkJzbmdQkF9Y=";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3801,6 +4120,7 @@ final: prev: {
       hash = "sha256-Z/2hBW/bRb8wtJqBUT8tqgoXg4XqGNvp8L6xw+zHDaU=";
     };
     meta.homepage = "https://github.com/agda/cornelis/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3814,6 +4134,7 @@ final: prev: {
       hash = "sha256-zlN2n8ntfGVEWGvzl0HVohOgZhroBgNXWP/QR+RpfgU=";
     };
     meta.homepage = "https://github.com/lfilho/cosco.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3827,6 +4148,7 @@ final: prev: {
       hash = "sha256-qEn5WSjtmJwsiAFsnTSYbKp7N3Gdu0yoGSm8ASXADEg=";
     };
     meta.homepage = "https://github.com/nixprime/cpsm/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3840,6 +4162,7 @@ final: prev: {
       hash = "sha256-+6rC+bticNgMhZ+2lkPpitunSv4nHmBzCIj6ngt7gaA=";
     };
     meta.homepage = "https://github.com/saecki/crates.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3853,19 +4176,21 @@ final: prev: {
       hash = "sha256-xuXSIZUKA6SpdBnt/+Xojd1yPoSxKNVEfROaZq3p5CE=";
     };
     meta.homepage = "https://github.com/godlygeek/csapprox/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   csharpls-extended-lsp-nvim = buildVimPlugin {
     pname = "csharpls-extended-lsp.nvim";
-    version = "0.3.0-unstable-2026-04-08";
+    version = "0.3.0-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "Decodetalkers";
       repo = "csharpls-extended-lsp.nvim";
-      rev = "1480abcafab446a3f66eb026faabe25b8412fc5f";
-      hash = "sha256-90Lt+xJn0YhDO6bzFWE6gXdJPwJkW2Jfl6H6gxqlmew=";
+      rev = "be8093d19af1538aad9ee77dc5589e55b083967a";
+      hash = "sha256-MDr3n9LaQ/YTHD7egDohQ7YmT2+itWXNoMLigmZp3KQ=";
     };
     meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3879,6 +4204,7 @@ final: prev: {
       hash = "sha256-NTgIaEWqtubjFEfIrw8sKTjhNbnmJ1In0OcddRg5W0w=";
     };
     meta.homepage = "https://github.com/davidmh/cspell.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3892,6 +4218,7 @@ final: prev: {
       hash = "sha256-t3a9Qa5eMZuK+kg27hbeiW4GrQqxMMIMqd+xh/Spvws=";
     };
     meta.homepage = "https://github.com/chrisbra/csv.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Vim";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3905,6 +4232,7 @@ final: prev: {
       hash = "sha256-JHNMO+l0P1mIZ2ZMqmbyZPP4WeGWKJLrs+9H1XBhoyM=";
     };
     meta.homepage = "https://github.com/hat0uma/csvview.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3918,6 +4246,7 @@ final: prev: {
       hash = "sha256-GLVTLJ8sfucRMaSwpMc8zGYSVVOfSPFp18gO102b45Q=";
     };
     meta.homepage = "https://github.com/JazzCore/ctrlp-cmatcher/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3931,6 +4260,7 @@ final: prev: {
       hash = "sha256-ROnWmRZwhH5xGdOypD8ZLFXi7u5FPsaNfKzZZECEfYw=";
     };
     meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3944,6 +4274,7 @@ final: prev: {
       hash = "sha256-DMvHWWizsJjKHb96Hz/zOPQsd2uENfz8kI8Uvs9GUg0=";
     };
     meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3957,6 +4288,7 @@ final: prev: {
       hash = "sha256-1AukntulOAV3lwZjPsPuAFbdiINcxrLoj75iil6Q2po=";
     };
     meta.homepage = "https://github.com/amiorin/ctrlp-z/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -3970,6 +4302,7 @@ final: prev: {
       hash = "sha256-Cfqol7Ivz6gnThL63UzNOwQsz/9OLOGQDXxbfzvcESY=";
     };
     meta.homepage = "https://github.com/gbprod/cutlass.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "WTFPL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3983,6 +4316,7 @@ final: prev: {
       hash = "sha256-lz9TlZRhJIUnv/4qTT8SoimRiY/vGFlrOKT3xc3FtoQ=";
     };
     meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -3996,6 +4330,7 @@ final: prev: {
       hash = "sha256-bgS8dXy7Th6neaAsmpanrVGhwSzhz0J9ykj+vyxhk+Q=";
     };
     meta.homepage = "https://github.com/ghillb/cybu.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4009,6 +4344,7 @@ final: prev: {
       hash = "sha256-HmDQfOIoSV93wqRe7O4FPuHEmAxwoP1+Ut+sKhB62jA=";
     };
     meta.homepage = "https://github.com/terrastruct/d2-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4022,6 +4358,7 @@ final: prev: {
       hash = "sha256-ixqdTuAyetFBg5Oolh5DEK+cRb9LMSgaKL1vZV38kNs=";
     };
     meta.homepage = "https://github.com/JachymPutta/dailies.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4035,6 +4372,7 @@ final: prev: {
       hash = "sha256-KBPpOmf2v6N45TPPKhKV80u1keZ5A85ora7XHS4XdpI=";
     };
     meta.homepage = "https://github.com/Koalhack/darcubox-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4048,6 +4386,7 @@ final: prev: {
       hash = "sha256-j7pFWOD/pbhjSmSepaWhB94Sawp7uHmkRhZDlo+bzxo=";
     };
     meta.homepage = "https://github.com/ptdewey/darkearth-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4061,6 +4400,7 @@ final: prev: {
       hash = "sha256-o1UvUGjq3kiiyv/jrVxIEsl3y3wFnBvgSJpyjXTOsMw=";
     };
     meta.homepage = "https://github.com/iofq/dart.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4074,6 +4414,7 @@ final: prev: {
       hash = "sha256-nsJKWCNJ3InidTaP0/cQ65YIX/6a1/wH56rlkNkJWJE=";
     };
     meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4087,6 +4428,7 @@ final: prev: {
       hash = "sha256-bKBA4yhIQgQhS2M5XrVIhv0gsJIPnmFZ3RENWP8y7N8=";
     };
     meta.homepage = "https://github.com/joseotaviorf/dash.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4100,6 +4442,7 @@ final: prev: {
       hash = "sha256-fzk/ThE6F0ssfeXTuVyO6KiMQSZz7YLxXwB4lbDz3CA=";
     };
     meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4113,6 +4456,7 @@ final: prev: {
       hash = "sha256-VYNjVH1OtmSyvBoFxF5WBf150GwoIpjTe0Y0oK8Hp8A=";
     };
     meta.homepage = "https://github.com/Shougo/ddc-filter-matcher_head/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4126,6 +4470,7 @@ final: prev: {
       hash = "sha256-8zoRsX7ZNCNkokku0TW0LNkjXmBL8UCu8h3EAe4KQ+g=";
     };
     meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4139,6 +4484,7 @@ final: prev: {
       hash = "sha256-NJyBF550oRLpP+jGdH3T7UA1oZGyusE/gFuSk8Yk97k=";
     };
     meta.homepage = "https://github.com/tani/ddc-fuzzy/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4152,6 +4498,7 @@ final: prev: {
       hash = "sha256-wLQ9vpKgl4fyjLEWo1XIElw8CbFjpBkvYMFoMPrQTxM=";
     };
     meta.homepage = "https://github.com/Shougo/ddc-source-around/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4165,6 +4512,7 @@ final: prev: {
       hash = "sha256-UndfTc+awrlzJUziPEv5FFwwDjQTSqOVZXheQ/CERpg=";
     };
     meta.homepage = "https://github.com/LumaKernel/ddc-source-file/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4178,19 +4526,21 @@ final: prev: {
       hash = "sha256-oj+L2dy6FpOYv/j0E/tsSD0BfP9qTtWCKwrLZSsCUsc=";
     };
     meta.homepage = "https://github.com/Shougo/ddc-source-lsp/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   ddc-ui-native = buildVimPlugin {
     pname = "ddc-ui-native";
-    version = "0-unstable-2025-08-30";
+    version = "0-unstable-2026-04-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc-ui-native";
-      rev = "8c33fb2336a586b33854903e3096095780657ad1";
-      hash = "sha256-fWJDl/MdW3Ce99sqs60Cp6OghnGfsQFmIkOTDkAT9yw=";
+      rev = "4f409fc24e0c1ce2a99a2c055b6a216feef2f076";
+      hash = "sha256-hMsOqJ8Db2W15Z73jQDldwkRBbaI5p8gap8UqgKRNiY=";
     };
     meta.homepage = "https://github.com/Shougo/ddc-ui-native/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4204,6 +4554,7 @@ final: prev: {
       hash = "sha256-kQ1fK65V0NtObqBy/FhcfACUGeI5Pk4t3Kw0BPpxChw=";
     };
     meta.homepage = "https://github.com/Shougo/ddc-ui-pum/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4217,6 +4568,7 @@ final: prev: {
       hash = "sha256-vetnDOYWEg+iuMOFL2GYzVfuYgV94Jl8DzBDZxhAFf0=";
     };
     meta.homepage = "https://github.com/Shougo/ddc.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4230,6 +4582,7 @@ final: prev: {
       hash = "sha256-xA0zFVgtZLsxX3gyfbLnitfNwdsn+p29euIJtnEaPv8=";
     };
     meta.homepage = "https://github.com/MironPascalCaseFan/debugmaster.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4243,6 +4596,7 @@ final: prev: {
       hash = "sha256-IKIl4Hg/fCwBlm3kc9MC6M7uZYvbRkvRrtHRe5U5/9c=";
     };
     meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4256,6 +4610,7 @@ final: prev: {
       hash = "sha256-3j1VSBVNKIlOzDMcvwN78we+sBus/bv5P/wj9eIYq3U=";
     };
     meta.homepage = "https://github.com/Verf/deepwhite.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4269,6 +4624,7 @@ final: prev: {
       hash = "sha256-jv3Z70GrVjYYUISe4WPmO2UwqcmNl/EDMHPHm/36r8Y=";
     };
     meta.homepage = "https://github.com/kristijanhusak/defx-git/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4282,6 +4638,7 @@ final: prev: {
       hash = "sha256-//lijqO+c5VCA7OKYuF6aTINShtAZ9bo9tMFd/WZeT8=";
     };
     meta.homepage = "https://github.com/kristijanhusak/defx-icons/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4295,6 +4652,7 @@ final: prev: {
       hash = "sha256-y1aCgoPauses7fp/HU3cn1d3wmZbveybXjvHmYpz2fE=";
     };
     meta.homepage = "https://github.com/Shougo/defx.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4308,6 +4666,7 @@ final: prev: {
       hash = "sha256-tX4xzpB+62ty2zkPm8i5hXb+WX6fmhunHr7PatZ03U8=";
     };
     meta.homepage = "https://github.com/Raimondi/delimitMate/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4321,6 +4680,7 @@ final: prev: {
       hash = "sha256-jDvdyAT2lngYDSDw4c+zziUYUuNeET0FBWJA+IeD2Ts=";
     };
     meta.homepage = "https://github.com/mawkler/demicolon.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4334,6 +4694,7 @@ final: prev: {
       hash = "sha256-qggOAjHXK0ypBxTXSjmas3y97uBTbe6W2aM56qFPuC4=";
     };
     meta.homepage = "https://github.com/neoclide/denite-extra/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4347,6 +4708,7 @@ final: prev: {
       hash = "sha256-1kLALtSxZQa7EtRrHJLCIeLoYWvtIdn//oeHnSsDqkA=";
     };
     meta.homepage = "https://github.com/neoclide/denite-git/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4360,6 +4722,7 @@ final: prev: {
       hash = "sha256-wQYfTx1qsi61O66Wymvn8I/dJD2lQFAv7QiFBjuQt2c=";
     };
     meta.homepage = "https://github.com/Shougo/denite.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4373,6 +4736,7 @@ final: prev: {
       hash = "sha256-lj8yjZrwE9GfNPDIpH4tCI4TTJHkYRlFFCTdqMqWtZg=";
     };
     meta.homepage = "https://github.com/vim-denops/denops.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4386,6 +4750,7 @@ final: prev: {
       hash = "sha256-J9dftuSAmlkuurkA4GwYk67E4mKPow4o2FCoKsH2+zU=";
     };
     meta.homepage = "https://github.com/Shougo/deol.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4400,6 +4765,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/deoplete-plugins/deoplete-clang/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4413,6 +4779,7 @@ final: prev: {
       hash = "sha256-CVwxfAaw9C/vxqUxg7ykt28yIgR4eKwocPC7EtYB5xY=";
     };
     meta.homepage = "https://github.com/deoplete-plugins/deoplete-dictionary/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4426,6 +4793,7 @@ final: prev: {
       hash = "sha256-t8TfjEMJpiZXFMwFgXDD11G4wkbdEZvrDV9SrDGRRqU=";
     };
     meta.homepage = "https://github.com/ponko2/deoplete-fish/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4439,6 +4807,7 @@ final: prev: {
       hash = "sha256-9ZU9DgMkBPIu/vy01TZqLWdOvpnzmfUwa/oEErEtwYY=";
     };
     meta.homepage = "https://github.com/SevereOverfl0w/deoplete-github/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4453,6 +4822,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/deoplete-plugins/deoplete-go/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4466,6 +4836,7 @@ final: prev: {
       hash = "sha256-HWJsNAetYW0LBNag2HtFVJ14jDq4LG+3WL8AffGS2CA=";
     };
     meta.homepage = "https://github.com/Inazuma110/deoplete-greek/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4479,6 +4850,7 @@ final: prev: {
       hash = "sha256-VqgUTAXGGIWXdUrMuGigt3kd030wW8jjARPEH9nfIzU=";
     };
     meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4492,6 +4864,7 @@ final: prev: {
       hash = "sha256-Tu6r8rzCuAESW2I2+d66Swl7X1pQhWuyr4mHF15irHQ=";
     };
     meta.homepage = "https://github.com/JuliaEditorSupport/deoplete-julia/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4505,6 +4878,7 @@ final: prev: {
       hash = "sha256-nXQfuLTLLtdrdh2txUicFJBv3dCDkW24GpXjRqyF1Yg=";
     };
     meta.homepage = "https://github.com/nicoe/deoplete-khard/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4518,6 +4892,7 @@ final: prev: {
       hash = "sha256-+54rweoKj45bIbjZWFgxP3gD6h+LJpmjGafYXKo3b7A=";
     };
     meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4531,6 +4906,7 @@ final: prev: {
       hash = "sha256-aVdUV2TD6WYV5b6dyuwco0i5H9xONbn4N+LPC79yV9A=";
     };
     meta.homepage = "https://github.com/Valodim/deoplete-notmuch/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4544,6 +4920,7 @@ final: prev: {
       hash = "sha256-QgGMd+f3R89oCox7fcz0xDYhygTlrvMOC1TU+ZLwRbI=";
     };
     meta.homepage = "https://github.com/Shougo/deoplete.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4557,6 +4934,7 @@ final: prev: {
       hash = "sha256-y7xCEnMRiD+EtCoX84sdPUvnpywiuJ0C+T2v4y/KTbI=";
     };
     meta.homepage = "https://github.com/kristijanhusak/deoplete-phpactor/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4570,6 +4948,7 @@ final: prev: {
       hash = "sha256-kBTV4+vEGt/lynHCcOg3cJWHGJR8A3KGt4BoKweaTHM=";
     };
     meta.homepage = "https://github.com/sebastianmarkow/deoplete-rust/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4583,6 +4962,7 @@ final: prev: {
       hash = "sha256-er/ImvaPmw9XXfuKEylBh2c2pny1TeJKQGcKmeT2eWQ=";
     };
     meta.homepage = "https://github.com/tbodt/deoplete-tabnine/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4596,6 +4976,7 @@ final: prev: {
       hash = "sha256-CnrA0UfHvA9+CyFdTqgSIEdWSkc5fQIcjJx4EFlyBBk=";
     };
     meta.homepage = "https://github.com/carlitux/deoplete-ternjs/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4609,6 +4990,7 @@ final: prev: {
       hash = "sha256-/RYhgFuEzHk5bR/lL3QLdnASItkjPCGUjx7QO7fhzug=";
     };
     meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4622,6 +5004,7 @@ final: prev: {
       hash = "sha256-3bFonS0ctgbW/c2e3MGMizLdzSk/GrBd3cHbKRCdS38=";
     };
     meta.homepage = "https://github.com/deoplete-plugins/deoplete-zsh/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4635,6 +5018,7 @@ final: prev: {
       hash = "sha256-6EFJG4HDP8xEifelH3qtNKHRr3CaVmd9Bjk1IqNVXkk=";
     };
     meta.homepage = "https://github.com/maskudo/devdocs.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4648,6 +5032,7 @@ final: prev: {
       hash = "sha256-KykUlUYrnOiqLOsToSlTxEhU1ICEdci4eIIuJavgvNs=";
     };
     meta.homepage = "https://github.com/rhysd/devdocs.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4661,6 +5046,7 @@ final: prev: {
       hash = "sha256-Mz5FeZzFPaPGvzWAKLUhvJtnB1hW1kW0vTGArMTc2nc=";
     };
     meta.homepage = "https://github.com/mahyarmirrashed/devexcuses.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4674,6 +5060,7 @@ final: prev: {
       hash = "sha256-YUBNgjUEpQIx7wKHFjA+UIe1QLFmamQTS3FLalsz4JU=";
     };
     meta.homepage = "https://github.com/vmchale/dhall-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4687,6 +5074,7 @@ final: prev: {
       hash = "sha256-gJlM0diDmyvmW5l/QIpUe2bDTZg8XekLBcFOoxeUW4E=";
     };
     meta.homepage = "https://github.com/dgagn/diagflow.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4700,6 +5088,7 @@ final: prev: {
       hash = "sha256-pIJ5dars2igBfLHYnd/0zgBoPZbW16+4Pth8Vk5OcYc=";
     };
     meta.homepage = "https://github.com/onsails/diaglist.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4713,6 +5102,7 @@ final: prev: {
       hash = "sha256-Sa+FkZErkGsSJaQlk8B3PFYMj44SCMFd6mLZDTtahLY=";
     };
     meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4726,6 +5116,7 @@ final: prev: {
       hash = "sha256-0KgZ/3q26b7MxMPRXp4/mgfl7tIUD3PnC6TYgagDGP4=";
     };
     meta.homepage = "https://github.com/3rd/diagram.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4739,6 +5130,7 @@ final: prev: {
       hash = "sha256-J2HU746yz8iHos7od5kIdEUd4/bgAPGwC38fLZ4gK+E=";
     };
     meta.homepage = "https://github.com/monaqa/dial.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4752,6 +5144,7 @@ final: prev: {
       hash = "sha256-DZpDaQ8nV+i2k969TTo19UnBSaK5jQwzP9c/bCsRFAQ=";
     };
     meta.homepage = "https://github.com/barrettruth/diffs.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4765,6 +5158,7 @@ final: prev: {
       hash = "sha256-SX+ybIzL/w6uyCy4iZKnWnzTFwqB1oXSgyYVAdpdKi8=";
     };
     meta.homepage = "https://github.com/sindrets/diffview.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4778,6 +5172,7 @@ final: prev: {
       hash = "sha256-35pNyVO0Yx+g5nvcFOmi2npb9Bnv83mkOtQJ2eKbSyc=";
     };
     meta.homepage = "https://github.com/elihunter173/dirbuf.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4791,6 +5186,7 @@ final: prev: {
       hash = "sha256-Lwwm95UEkS8Q0Qsoh10o3sFn48wf7v7eCX/FJJV1HMI=";
     };
     meta.homepage = "https://github.com/direnv/direnv.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4804,6 +5200,7 @@ final: prev: {
       hash = "sha256-Cbko4HU0i077WbAuERdG4NwCmeIZSk8uYmNl0mOzrO0=";
     };
     meta.homepage = "https://github.com/chipsenkbeil/distant.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4817,6 +5214,7 @@ final: prev: {
       hash = "sha256-3qPbKq9IRDn1O3gMyESwy45xfHPnOGSOIyEox927aLg=";
     };
     meta.homepage = "https://github.com/doki-theme/doki-theme-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4830,6 +5228,7 @@ final: prev: {
       hash = "sha256-gsS/n0CQ41WTl0sQxEWoWe7+wzTUyVKlrgaTC+Q2Nuc=";
     };
     meta.homepage = "https://github.com/NTBBloodbath/doom-one.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4843,6 +5242,7 @@ final: prev: {
       hash = "sha256-QonW4orbtdMcoxqvB/FU7Cw5ABPExEMZwMLHIZWAWPs=";
     };
     meta.homepage = "https://github.com/MoaidHathot/dotnet.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4856,19 +5256,21 @@ final: prev: {
       hash = "sha256-h0WQdK74FHJLva3RbyA8WZfX6rAo45wKPb9z4JbYAK8=";
     };
     meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   dracula-vim = buildVimPlugin {
     pname = "dracula-vim";
-    version = "2.0.0-unstable-2026-04-13";
+    version = "2.0.0-unstable-2026-04-22";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "07b144414730cc4cf4405ab840bf46c5fa12704b";
-      hash = "sha256-RWavKi3KvQI7N+qNks3EVUSmwCY73QvGNTpZElCxdkE=";
+      rev = "e7b91facff94bdf3a248df9b683119b84672256a";
+      hash = "sha256-OkLtrd6Cq7ZwF5r5/SBc9Uyp26q/gIgHLrVKLxboLCA=";
     };
     meta.homepage = "https://github.com/dracula/vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4882,19 +5284,21 @@ final: prev: {
       hash = "sha256-N4hB5wDgoqXrXxSfzDCrqmdDtdVvq+PtOS7FBPH7qXE=";
     };
     meta.homepage = "https://github.com/stevearc/dressing.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   dropbar-nvim = buildVimPlugin {
     pname = "dropbar.nvim";
-    version = "14.2.1-unstable-2025-10-05";
+    version = "14.2.1-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "Bekaboo";
       repo = "dropbar.nvim";
-      rev = "ce202248134e3949aac375fd66c28e5207785b10";
-      hash = "sha256-FzJXZcbwk3kEqmRFwKVavL1umPugdbJVYvaBZwiEK0I=";
+      rev = "f0a42bd92aa647e44221397723453403f5e20f16";
+      hash = "sha256-EN4iN76zOn4IF7A1cT3p9a2EzlFCRa/eHR325QzPLv8=";
     };
     meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4908,6 +5312,7 @@ final: prev: {
       hash = "sha256-97QSkZHpHLq1XyLNhPz88i9VuWy6ux7ZFNJx/g44K2A=";
     };
     meta.homepage = "https://github.com/tamton-aquib/duck.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4921,19 +5326,21 @@ final: prev: {
       hash = "sha256-myMGiOiU9/xmdMJOvaJySLBvXS/xTAMULVaKGaVODw0=";
     };
     meta.homepage = "https://github.com/earthly/earthly.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     meta.hydraPlatforms = [ ];
   };
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "0-unstable-2026-04-18";
+    version = "0-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "06cc3c7ffd02ef6c62dffea46d4f6e53f1962ef2";
-      hash = "sha256-+f1RvmFUWPpvw6EqOKmS0NBCwRgMX3mzPdF/DFUnEWM=";
+      rev = "cccd08c1e86f4952cbab1e27a2bd54c7251b28de";
+      hash = "sha256-YiI+tSLCKQR1oTzUXHp7B82nFc2/0x+5pDc0AzkG/m0=";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4947,6 +5354,7 @@ final: prev: {
       hash = "sha256-RSk/KViWw48IX0NcC5hW4IGawZ6prBYxPa/kXPN4KSI=";
     };
     meta.homepage = "https://github.com/JellyApple102/easyread.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4960,6 +5368,7 @@ final: prev: {
       hash = "sha256-M9Tr9nP1BXSTj8QZFN+AVclDqPCWP13kJ9oEQavY72o=";
     };
     meta.homepage = "https://github.com/Shougo/echodoc.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -4973,6 +5382,7 @@ final: prev: {
       hash = "sha256-xUVSkygICCpA3bBqitPblRn7wRQ6fffxJQ4ej5C1ICM=";
     };
     meta.homepage = "https://github.com/ph1losof/ecolog.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4986,6 +5396,7 @@ final: prev: {
       hash = "sha256-05fAaaaoaIrmwTFdrkX2rQX8X7AyOGLOcnz5HaoQB9Y=";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -4999,6 +5410,7 @@ final: prev: {
       hash = "sha256-yn6/0UfoGeFEJ+fiIHKCvpzymMkjv0PheTsyhRY46sM=";
     };
     meta.homepage = "https://github.com/geldata/edgedb-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5012,6 +5424,7 @@ final: prev: {
       hash = "sha256-0HGxPpT4bvVTwwu+rY058eMWEfhGF3y5WHt3ifOzkUM=";
     };
     meta.homepage = "https://github.com/folke/edgy.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5025,6 +5438,7 @@ final: prev: {
       hash = "sha256-0ChRJwxnDBVuVdTEZQYxoxbAeQjqNfjNvfkorOueovU=";
     };
     meta.homepage = "https://github.com/gpanders/editorconfig.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5039,6 +5453,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5052,6 +5467,7 @@ final: prev: {
       hash = "sha256-QO4R/+qAMXV+NN3gsMcKz7Z2BHZbwbwNBoD1AxfA/aY=";
     };
     meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5065,6 +5481,7 @@ final: prev: {
       hash = "sha256-FBhSMEaa/CwBMnuyUr8Q+flRo64onAt9mGYUNtM0mZs=";
     };
     meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5078,6 +5495,7 @@ final: prev: {
       hash = "sha256-jEbxvkKEYnNJDYMmvHfxFM0nd12CH/jKYznW70yVs88=";
     };
     meta.homepage = "https://github.com/elmcast/elm-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5091,6 +5509,7 @@ final: prev: {
       hash = "sha256-CtKsqnhygVqPFjAw2QaTXhc/7+C99i04hx3sKMhrKvg=";
     };
     meta.homepage = "https://github.com/dmix/elvish.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5104,6 +5523,7 @@ final: prev: {
       hash = "sha256-wR9qoaLehfTVakMi2QYQqBMTi9Tc+I46H/wUlPShTmE=";
     };
     meta.homepage = "https://github.com/embark-theme/vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5118,6 +5538,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mattn/emmet-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5131,6 +5552,7 @@ final: prev: {
       hash = "sha256-IOeeZW2TbFEMCNxYtZYCGH5eUuRn2CkNZuiZuX4+PnU=";
     };
     meta.homepage = "https://github.com/vim-scripts/emodeline/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5144,6 +5566,7 @@ final: prev: {
       hash = "sha256-5Z/1idVQiD8K+swsr9k3NrrgXxUIs5o7v/Cep/zZDiE=";
     };
     meta.homepage = "https://github.com/ovk/endec.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5157,6 +5580,7 @@ final: prev: {
       hash = "sha256-qsPPp3H7o+GtRXha+OoVWkCq795TwnHcyxtkhwwJ0IU=";
     };
     meta.homepage = "https://github.com/vim-scripts/errormarker.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5170,6 +5594,7 @@ final: prev: {
       hash = "sha256-WhDMjhZ15J5xu4/yMKwXLOo1zhE+6B5hLsRvw9qSTsk=";
     };
     meta.homepage = "https://github.com/hachy/eva01.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5183,18 +5608,20 @@ final: prev: {
       hash = "sha256-fkNyypxo1fm0rkV1CKayLLMHObsjgSI2nndhkpXHlFc=";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   evergarden-nvim = buildVimPlugin {
     pname = "evergarden-nvim";
-    version = "0-unstable-2026-03-31";
+    version = "0-unstable-2026-04-25";
     src = fetchgit {
       url = "https://codeberg.org/evergarden/nvim";
-      rev = "f74fc61a5345818caf7c56bd4c6dcd16f17a1fdd";
-      hash = "sha256-kYfNaAx0koqFBSXKC1IuVJaZeUQC+0rT9deEqgcRt8I=";
+      rev = "762a37afe2e242144355fafe385d638ec347ec48";
+      hash = "sha256-q8nQ+F2OKL7AV92hUhHgesXMDrJakBGkLI17YvkVRa0=";
     };
     meta.homepage = "https://codeberg.org/evergarden/nvim";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5208,6 +5635,7 @@ final: prev: {
       hash = "sha256-FdcOzT3LgJBifXdEAzfMtcfrIDlYFcY1RogVxcl3Avk=";
     };
     meta.homepage = "https://github.com/google/executor.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5221,6 +5649,7 @@ final: prev: {
       hash = "sha256-qOMToZtBd39mdFZEr5WfIkHj+7TWeCPy2GJdIN+qOic=";
     };
     meta.homepage = "https://github.com/jinh0/eyeliner.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5234,6 +5663,7 @@ final: prev: {
       hash = "sha256-iUnBoa1uVsJP0RvX+AUFj3M/4hT9rD8T+YGxuAldXYo=";
     };
     meta.homepage = "https://github.com/fenetikm/falcon/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5247,6 +5677,7 @@ final: prev: {
       hash = "sha256-XeQoEgPCj2VzkiR4BiHZQVOyO37lCsgoRGXHkjMbH9s=";
     };
     meta.homepage = "https://github.com/mahyarmirrashed/famous-quotes.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5260,6 +5691,7 @@ final: prev: {
       hash = "sha256-vd3/PZz6bsm0x8hBVhuy3zQvLQ89YCBQDADCSvbyJG8=";
     };
     meta.homepage = "https://github.com/brooth/far.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5273,6 +5705,7 @@ final: prev: {
       hash = "sha256-va00sqM2Ap9faUXww5CpWJQyCixN9fIwh8p8oSLQMy8=";
     };
     meta.homepage = "https://github.com/Chaitanyabsprip/fastaction.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5286,6 +5719,7 @@ final: prev: {
       hash = "sha256-jFOIG7SQy0sIhEOSmt47f6kGye+ge5Oq3UDwm1bXPqo=";
     };
     meta.homepage = "https://github.com/pteroctopus/faster.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5299,6 +5733,7 @@ final: prev: {
       hash = "sha256-9FgxQ2wtirjW9O+8I5JuBw7w+tToRdPnqT/kCdW8FtU=";
     };
     meta.homepage = "https://github.com/konfekt/fastfold/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5312,6 +5747,7 @@ final: prev: {
       hash = "sha256-PBzE9Fcl3Yk7mxysnhst68eiGmsU+lj4SK2rZZj7yH0=";
     };
     meta.homepage = "https://github.com/madskjeldgaard/faust-nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5325,6 +5761,7 @@ final: prev: {
       hash = "sha256-L9X1ykj10tcIne1SvoYeB3LbaoZg/6fryFTa9jtN/xE=";
     };
     meta.homepage = "https://github.com/lilydjwg/fcitx.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5338,6 +5775,7 @@ final: prev: {
       hash = "sha256-Sym2wKnQUR7RE3WbutOXxLrgDmtujNGNxv01wQTbDIo=";
     };
     meta.homepage = "https://github.com/micampe/fennel.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5351,6 +5789,7 @@ final: prev: {
       hash = "sha256-7dUPFfVvmImddhPhhOLiGXd45vmNeejOQ9jTPWyXKzg=";
     };
     meta.homepage = "https://github.com/wincent/ferret/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5364,6 +5803,7 @@ final: prev: {
       hash = "sha256-r47H2vfQQM283YIMZFGjLfTxu6mHy1BN/VsiCcEbKPA=";
     };
     meta.homepage = "https://github.com/bogado/file-line/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5377,6 +5817,7 @@ final: prev: {
       hash = "sha256-Nn7FdhrMYIFrA72lW6fNubsrKss0QfH06oveOgSIHVE=";
     };
     meta.homepage = "https://github.com/lewis6991/fileline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5390,19 +5831,21 @@ final: prev: {
       hash = "sha256-EozAWJu5D8eeveHXIAUejKi2EHxpY2z7uXWQaZgZdEc=";
     };
     meta.homepage = "https://github.com/VonHeikemen/fine-cmdline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   firenvim = buildVimPlugin {
     pname = "firenvim";
-    version = "0.2.16-unstable-2026-04-16";
+    version = "0.2.16-unstable-2026-04-28";
     src = fetchFromGitHub {
       owner = "glacambre";
       repo = "firenvim";
-      rev = "b68449b92dfea73a54e4c8f2307fc244a3a574bd";
-      hash = "sha256-XjpCYydSFSTw0sDwVHS7paDejaP2JafOWrupuurfFgE=";
+      rev = "899206da6ec88e476d3f96df5e5ef48e37dc87d2";
+      hash = "sha256-xjiGO4B6YHRAau69Y6RdOXPTJg3sCt0kVLjw4uwDqc0=";
     };
     meta.homepage = "https://github.com/glacambre/firenvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5417,6 +5860,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/andviro/flake8-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5430,6 +5874,7 @@ final: prev: {
       hash = "sha256-pHh0tJd/ynfjriu8xjnKunKVDHkoXii6ZbikdkIwovY=";
     };
     meta.homepage = "https://github.com/folke/flash.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5443,6 +5888,7 @@ final: prev: {
       hash = "sha256-NaOgzTVqOpQnEIOIMlHCupZUDYnLUic9zITKFxcOg3A=";
     };
     meta.homepage = "https://github.com/willothy/flatten.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5456,6 +5902,7 @@ final: prev: {
       hash = "sha256-vlAjzRfixL5IwkpuevsgMFn9HckCa4zxeIeJp7JPwmQ=";
     };
     meta.homepage = "https://github.com/felipeagc/fleet-theme-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5469,6 +5916,7 @@ final: prev: {
       hash = "sha256-T+lArIMFTk/EFdLA7Io/U6R8X/TFeHaWfcMNAaRpmq8=";
     };
     meta.homepage = "https://github.com/ggandor/flit.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5482,6 +5930,7 @@ final: prev: {
       hash = "sha256-1skclYdku+DDDdDX7UO2kvzgyPVodRl0rrzOf+J8TsQ=";
     };
     meta.homepage = "https://github.com/ncm2/float-preview.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5495,6 +5944,7 @@ final: prev: {
       hash = "sha256-kTjE44pp02ZEJUp42p459l4WQA8oQ9SU8AuCxXFYm/k=";
     };
     meta.homepage = "https://github.com/nvzone/floaterm/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5508,6 +5958,7 @@ final: prev: {
       hash = "sha256-pbPPVSjWJQ3mRP1kixogMCRgy7BH0n5AE7hvey8C32I=";
     };
     meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5521,6 +5972,7 @@ final: prev: {
       hash = "sha256-la2C56Hi+6L54M1l6aAxfIxRjRkO6jt1w/84bEYJWf8=";
     };
     meta.homepage = "https://github.com/floobits/floobits-neovim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5534,6 +5986,7 @@ final: prev: {
       hash = "sha256-PH08FeZMvIXcE9/dfYxj4PiKwBzPCXWFAVOLSci0iNk=";
     };
     meta.homepage = "https://github.com/0xstepit/flow.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5547,6 +6000,7 @@ final: prev: {
       hash = "sha256-tOYxOUKa6Zn2Yq5peqGDEdCkpl+b+VKkSmZx7+kHZJ0=";
     };
     meta.homepage = "https://github.com/projectfluent/fluent.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5560,6 +6014,7 @@ final: prev: {
       hash = "sha256-alZBQYmo9jrsKYTL7dnObaP2op4SMQQRiEZBdhxUZiI=";
     };
     meta.homepage = "https://github.com/maxmx03/fluoromachine.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5573,6 +6028,7 @@ final: prev: {
       hash = "sha256-deLOga7lpWbhjDuww0HhKWCvtPA17dgFtF5ZoYCDvLw=";
     };
     meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5587,6 +6043,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/nvim-focus/focus.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5600,6 +6057,7 @@ final: prev: {
       hash = "sha256-FLzZGbbeUk3354Q8vbFonw57f6GbSDisRs43djTjX8I=";
     };
     meta.homepage = "https://github.com/anuvyklack/fold-preview.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5613,6 +6071,7 @@ final: prev: {
       hash = "sha256-qngq7nvxi+Ijxa4sGBRE9m/tqPXSsmznVcTG99I0Yjo=";
     };
     meta.homepage = "https://github.com/jghauser/follow-md-links.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5626,6 +6085,7 @@ final: prev: {
       hash = "sha256-SzM2P5RvnYUXYud2ubGtqdTXfQ3rshEusRWckH8a2E4=";
     };
     meta.homepage = "https://github.com/mhartington/formatter.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5639,6 +6099,7 @@ final: prev: {
       hash = "sha256-5HjlnQU2SczilpXcKgDcZ9O/sFfxpav0urZKw0oMd6Y=";
     };
     meta.homepage = "https://github.com/megaannum/forms/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5652,6 +6113,7 @@ final: prev: {
       hash = "sha256-rLKDfmuVx9SD9JTMxpMTGenFX5bCtqOQQF6H9pC78y8=";
     };
     meta.homepage = "https://github.com/rubiin/fortune.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5665,6 +6127,7 @@ final: prev: {
       hash = "sha256-VdFmSRBP7Up0j5+rp7ZkfTdQmduJjsl6EZ9gf27vgZg=";
     };
     meta.homepage = "https://github.com/charm-and-friends/freeze.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5678,6 +6141,7 @@ final: prev: {
       hash = "sha256-FzApcTbWfFkBD9WsYMhaCyn6ky8UmpUC2io/co/eByM=";
     };
     meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5691,6 +6155,7 @@ final: prev: {
       hash = "sha256-8+3oO1HAWdfEjBX6V7bLm4w+giJD1syqWPZCHZ7p94U=";
     };
     meta.homepage = "https://github.com/SuperBo/fugit2.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5704,6 +6169,7 @@ final: prev: {
       hash = "sha256-bjKPh7EwA6wtp0lilaUA7f5b1VarR9QWFBuJm1j8Qfo=";
     };
     meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5717,6 +6183,7 @@ final: prev: {
       hash = "sha256-HNgrUZm7dXxGDkfMj9WFA5i+pKTFGgNYjYy6PTu+PJ4=";
     };
     meta.homepage = "https://github.com/BeneCollyridam/futhark-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5730,6 +6197,7 @@ final: prev: {
       hash = "sha256-uB4Rg2pdl7FKJLjZiV2Q0ExKDJ1SvDx0bwZfgBvhgOs=";
     };
     meta.homepage = "https://github.com/tzachar/fuzzy.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5743,6 +6211,7 @@ final: prev: {
       hash = "sha256-GyTx/t6yH2jXwVHVldppcKmEN77YDC1feAYW5G/FEnk=";
     };
     meta.homepage = "https://github.com/rktjmp/fwatch.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5756,6 +6225,7 @@ final: prev: {
       hash = "sha256-Caf1dJiIATbs0PNjSANjA3QgHg7PdeMz9Pjoc0Ti7G4=";
     };
     meta.homepage = "https://github.com/A7Lavinraj/fyler.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5769,6 +6239,7 @@ final: prev: {
       hash = "sha256-lM5vv0ucgxvoc8ZtJwShDoY7ji6BYl6VZA2bYN0UU2s=";
     };
     meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5782,6 +6253,7 @@ final: prev: {
       hash = "sha256-Dn54yq96yBS9i6duHtHhwHp6VbFXWewrng33CEBs7Ew=";
     };
     meta.homepage = "https://github.com/monkoose/fzf-hoogle.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5795,6 +6267,7 @@ final: prev: {
       hash = "sha256-7Ga9vLbDbTA2VNyVN3+j+SXoSsx6PT/nBH8lzbxQYIw=";
     };
     meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5808,6 +6281,7 @@ final: prev: {
       hash = "sha256-VPxTYXdJaVbr2U7d6VuO4CpIyTC62uo3TAuf1MYiAXI=";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5821,6 +6295,7 @@ final: prev: {
       hash = "sha256-85mScXLgGp5SJSIPwVOt0RYTP4esV5SjzDD6dhox83U=";
     };
     meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5834,6 +6309,7 @@ final: prev: {
       hash = "sha256-T4zxIGuUzLcMeZvjBOFGh+Ms6fusQWlhlfuXcOA92xA=";
     };
     meta.homepage = "https://github.com/Zeioth/garbage-day.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5847,6 +6323,7 @@ final: prev: {
       hash = "sha256-M3xH9XsWNu7f49qRI9dgfk85iQVUKCuwAYo+xORo2Wk=";
     };
     meta.homepage = "https://github.com/gbprod/nord.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "WTFPL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5860,6 +6337,7 @@ final: prev: {
       hash = "sha256-8s9pgeBRVii4E791pXryFHlLkToyibdscqHDGHoAJXw=";
     };
     meta.homepage = "https://github.com/Teatek/gdscript-extended-lsp.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5873,6 +6351,7 @@ final: prev: {
       hash = "sha256-s12r8dvva0O2VvEPjOQvpjVpEehxsa4AWoGHXFYxQlI=";
     };
     meta.homepage = "https://github.com/David-Kunz/gen.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5886,6 +6365,7 @@ final: prev: {
       hash = "sha256-VjV142/IsiNEEAmUomQqWqYmNqQQE/ax6qi2xuy2dRM=";
     };
     meta.homepage = "https://github.com/jsfaint/gen_tags.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5899,6 +6379,7 @@ final: prev: {
       hash = "sha256-DGsfm52XLPnkWX9yRUkge7sQtfPZ3nxxQPSDArfO1h4=";
     };
     meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5912,6 +6393,7 @@ final: prev: {
       hash = "sha256-XI4FVjajin0NM+OaEN+O5vmalPpOB2RII+aOERSzjJA=";
     };
     meta.homepage = "https://github.com/ldelossa/gh.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5925,6 +6407,7 @@ final: prev: {
       hash = "sha256-hb6Da0dZOmmsRZSawVT184UTDPotby/q3B1qe9Y5YXI=";
     };
     meta.homepage = "https://github.com/ndmitchell/ghcid/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5938,6 +6421,7 @@ final: prev: {
       hash = "sha256-CrRDLhOBPcTosGX/mL7z4A5mkWtQGrR/UsDZp/6D6i8=";
     };
     meta.homepage = "https://github.com/eagletmt/ghcmod-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5951,6 +6435,7 @@ final: prev: {
       hash = "sha256-EKZXskxVKFXlDBI7lfoOlWZE7lq6Pr2MJ9rgHPGgp70=";
     };
     meta.homepage = "https://github.com/f-person/git-blame.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5964,6 +6449,7 @@ final: prev: {
       hash = "sha256-1t0kKxTGLuOvuRkoLgkoqMZpF+oKo8+gMsTdgPsSb+8=";
     };
     meta.homepage = "https://github.com/akinsho/git-conflict.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -5977,6 +6463,7 @@ final: prev: {
       hash = "sha256-PsCaSFQs0N0rnRy4wY9tPJ4c4ILQuiCc8/gmdOkz6yw=";
     };
     meta.homepage = "https://github.com/juansalvatore/git-dashboard-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5990,6 +6477,7 @@ final: prev: {
       hash = "sha256-pDz0IRlnnVHQ5G3Ga8I2wF8jDcF3hiyvMo5s5fwcV88=";
     };
     meta.homepage = "https://github.com/moyiz/git-dev.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6003,6 +6491,7 @@ final: prev: {
       hash = "sha256-9P8r04xS6aCAz2JLtesvGn2HC9SVq8EGA9y5x+fmji8=";
     };
     meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6016,6 +6505,7 @@ final: prev: {
       hash = "sha256-BM1AEpIcOd5nr4N/ZoxK9NodiUbUuY9hw7n/wRTXzzk=";
     };
     meta.homepage = "https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6029,6 +6519,7 @@ final: prev: {
       hash = "sha256-fnqJqQTNei+8Gk4vZ2hjRj8iHBXTZT15xp9FvhGB+BQ=";
     };
     meta.homepage = "https://github.com/polarmutex/git-worktree.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6042,6 +6533,7 @@ final: prev: {
       hash = "sha256-/A4hkKTzjzeoR1SuwwklraAyI8oMkhxrwBBV9xb59PA=";
     };
     meta.homepage = "https://github.com/projekt0n/github-nvim-theme/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6055,6 +6547,7 @@ final: prev: {
       hash = "sha256-9Qu+oVOtufvf+ekj2rY+T9c2y7BXh9d7hfl6ZiMYpPY=";
     };
     meta.homepage = "https://github.com/wintermute-cell/gitignore.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6068,6 +6561,7 @@ final: prev: {
       hash = "sha256-HVFP7Af4zzZZfAbMP47rjhgtWeAwnooZU2NhPjM04zk=";
     };
     meta.homepage = "https://github.com/vim-scripts/gitignore.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6080,6 +6574,7 @@ final: prev: {
       hash = "sha256-rhYz3Z1Dcffvo8E3390gOBcqfFclWJ19wTKwp6L/874=";
     };
     meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6093,6 +6588,7 @@ final: prev: {
       hash = "sha256-SlZQMc7xQ3/cCFSgZV+hK9fjEdoIdZR/ESAJ3Z1gbxk=";
     };
     meta.homepage = "https://github.com/LionyxML/gitlineage.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6106,6 +6602,7 @@ final: prev: {
       hash = "sha256-zrHvJSROjrDC5XtepOwuDrzrJG2jpnF5NJ05Iwd6DwA=";
     };
     meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6119,6 +6616,7 @@ final: prev: {
       hash = "sha256-ag7t+G5TKRajLNc4ZrNuMufJSxqJQXPpWINZSFwEmx4=";
     };
     meta.homepage = "https://github.com/trevorhauter/gitportal.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6132,6 +6630,7 @@ final: prev: {
       hash = "sha256-pt34K3xWS4Gmvlgw0znpGHWhtwS4f58s8Qz9gcWuCkI=";
     };
     meta.homepage = "https://github.com/gregsexton/gitv/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6145,6 +6644,7 @@ final: prev: {
       hash = "sha256-N3ura/clenkz2CH9jsfkxiZ/Sn7sE2piJSCGP+ZqL7A=";
     };
     meta.homepage = "https://github.com/DNLHC/glance.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6158,6 +6658,7 @@ final: prev: {
       hash = "sha256-CvBcmVWBgI+m+PS7p7PmsiPtTEfqx2kpIzz4mImONIc=";
     };
     meta.homepage = "https://github.com/ellisonleao/glow.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6171,6 +6672,7 @@ final: prev: {
       hash = "sha256-4uH9Hdynja+ulXPmZq4uvrTceQUeF65VarxHXJ+ZUsM=";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6184,6 +6686,7 @@ final: prev: {
       hash = "sha256-yRXqwBOtMCX83Idhb7bb73HW7UIS5LNpphKBBtncF7k=";
     };
     meta.homepage = "https://github.com/dchinmay2/godbolt.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6197,6 +6700,7 @@ final: prev: {
       hash = "sha256-y0SXGG5h+OrScskPrk6fD+4bGrBG40luhWx17Nb7DDs=";
     };
     meta.homepage = "https://github.com/roman/golden-ratio/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6210,6 +6714,7 @@ final: prev: {
       hash = "sha256-VYrCUf81SbnrhHBefZYUUAyP+azeYQ6xubFU1u0Q+To=";
     };
     meta.homepage = "https://github.com/buoto/gotests-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6223,6 +6728,7 @@ final: prev: {
       hash = "sha256-pvAKu5JtkZa+CnIozDvFWClycI+WBSIKGVM7XkphQqo=";
     };
     meta.homepage = "https://github.com/rmagatti/goto-preview/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6236,6 +6742,7 @@ final: prev: {
       hash = "sha256-pDt7T1U1bqKveAq0CBWTtK2mdOzf8IbfmCi1fcpB2c8=";
     };
     meta.homepage = "https://github.com/junegunn/goyo.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6249,6 +6756,7 @@ final: prev: {
       hash = "sha256-qACM6HJ9DP3t6ts5IuMIfBe36Kx5Le1ZggHit+8zFRA=";
     };
     meta.homepage = "https://github.com/brymer-meneses/grammar-guard.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6262,6 +6770,7 @@ final: prev: {
       hash = "sha256-k/WiTJEjgugfwW9/ho3xh4dgl4ZkTVMtDE5yT43L2Zc=";
     };
     meta.homepage = "https://github.com/liuchengxu/graphviz.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6275,6 +6784,7 @@ final: prev: {
       hash = "sha256-Dz60583Qic2TqO3BPSHME4Q7CiweB1gQCdFNtjNoN3U=";
     };
     meta.homepage = "https://github.com/cbochs/grapple.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6288,6 +6798,7 @@ final: prev: {
       hash = "sha256-4xB/MRTDccA5gTKe6DrN+bNfDx6fzjuIGOLdkuxg8c0=";
     };
     meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6301,6 +6812,7 @@ final: prev: {
       hash = "sha256-fmX4WuD25BaaJBZCcUyrtgq1a39tVpxLe3KE72dcQT4=";
     };
     meta.homepage = "https://github.com/morhetz/gruvbox/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6314,6 +6826,7 @@ final: prev: {
       hash = "sha256-zocBGqqQOBtymRviN1Ptfj6QJ6UI60UqQ11Me4kn/VA=";
     };
     meta.homepage = "https://github.com/Xoconoch/gruvbox-alabaster.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6327,6 +6840,7 @@ final: prev: {
       hash = "sha256-UhOYkVInyQrPy970NMKfFhq3JZA2zuWQdyDOfv9glp8=";
     };
     meta.homepage = "https://github.com/luisiacc/gruvbox-baby/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6340,6 +6854,7 @@ final: prev: {
       hash = "sha256-md1NyTV42Zi9GM9lgFcayTN05bOYhvqjQcvs6K0D4xk=";
     };
     meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6353,6 +6868,7 @@ final: prev: {
       hash = "sha256-HbrULCrdXweX7Va5DaWlIPg/He6Iel95uIsj7ZP4hDY=";
     };
     meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6366,19 +6882,21 @@ final: prev: {
       hash = "sha256-gyBfUYgSngpQn8BhKISWqgEKSyq8DuRT4csQ7q7bXM4=";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   gruvbox-material-nvim = buildVimPlugin {
     pname = "gruvbox-material.nvim";
-    version = "1.8.1";
+    version = "1.8.2";
     src = fetchFromGitHub {
       owner = "f4z3r";
       repo = "gruvbox-material.nvim";
-      tag = "v1.8.1";
-      hash = "sha256-nNBV66GHG3Km92aWhFeo3HgjWQNdMQpIl4Kq08rEmPs=";
+      tag = "v1.8.2";
+      hash = "sha256-MTOAc4Z8wvAGz99dJy5181R/Uf7G/qToyPFYNDJHjB0=";
     };
     meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6392,6 +6910,7 @@ final: prev: {
       hash = "sha256-SogU3DStdWDN6qRjOnbGzoZ9Vc+fqnNYZF7XEqFeMUw=";
     };
     meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6405,6 +6924,7 @@ final: prev: {
       hash = "sha256-ivTgnX/JrhJ0MDX2tXo0sU6ZET0udR1Mu/tOLMo8rU8=";
     };
     meta.homepage = "https://github.com/nvimdev/guard-collection/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6418,6 +6938,7 @@ final: prev: {
       hash = "sha256-jd5EBHaTo3yMzv5mR+GC5IGk+QIHt4Xbi8N/URfyczU=";
     };
     meta.homepage = "https://github.com/nvimdev/guard.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6431,19 +6952,21 @@ final: prev: {
       hash = "sha256-M/FkwCXXhojVFEcCuHo/GkuCCSX9GlVYHBUECSZxBjs=";
     };
     meta.homepage = "https://github.com/nmac427/guess-indent.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   guihua-lua = buildVimPlugin {
     pname = "guihua.lua";
-    version = "0.1-unstable-2026-04-10";
+    version = "0.1-unstable-2026-04-28";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "guihua.lua";
-      rev = "d178056728548ed8a99cce94de47b7500bd6889a";
-      hash = "sha256-GkSUwoDHFu615eTRaN2hjZJPxWe+77JqO8mEJ2YsIgw=";
+      rev = "7c364432c2f9153ed068f4eab1989edd9f3fd302";
+      hash = "sha256-rgxqLQf7psUtXwnFOiDBt6CpMyaAMdz2pg3PKj12IzE=";
     };
     meta.homepage = "https://github.com/ray-x/guihua.lua/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6457,6 +6980,7 @@ final: prev: {
       hash = "sha256-EL7NIy+g2k2KIANo2qFCF3WhGYLShVWOoqRXC2Dfquo=";
     };
     meta.homepage = "https://github.com/sjl/gundo.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6470,6 +6994,7 @@ final: prev: {
       hash = "sha256-Tb2IQR/l7TvokgpMWZBumyHULOvXQ2aGTL4P8fIEmRs=";
     };
     meta.homepage = "https://github.com/junegunn/gv.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6484,6 +7009,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/chrishrb/gx.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6497,6 +7023,7 @@ final: prev: {
       hash = "sha256-C+x83tKzV2R/JAkgOzCxtRt9flYu0iWtZf2WfL7zGgc=";
     };
     meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6510,6 +7037,7 @@ final: prev: {
       hash = "sha256-Jy9ARUHU1ySpSxxoS3hLRjxp5Lqt7juWN5Jnbdo0rg0=";
     };
     meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6522,6 +7050,7 @@ final: prev: {
       hash = "sha256-zueMmX8rHXMpnv6ukrcFcTIWVOoYrBC/0Tn2+5fTRlU=";
     };
     meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6535,6 +7064,7 @@ final: prev: {
       hash = "sha256-ksPNAYnaFbq7N5ifF+RFbLexLW2Lm1ey0agHLzhn9GA=";
     };
     meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6548,6 +7078,7 @@ final: prev: {
       hash = "sha256-qQSPVMdldksNZDPZvnTiXxty+GSUqMGz8nYEFDRezrQ=";
     };
     meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6561,19 +7092,21 @@ final: prev: {
       hash = "sha256-s+ku3EtZ2y7yarzhekW4yKaBqvjdy/PRHivfDB+g6Hg=";
     };
     meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   haskell-snippets-nvim = buildVimPlugin {
     pname = "haskell-snippets.nvim";
-    version = "1.5.0-unstable-2026-04-13";
+    version = "1.5.0-unstable-2026-04-21";
     src = fetchFromGitHub {
       owner = "mrcjkb";
       repo = "haskell-snippets.nvim";
-      rev = "7a29db90a8803d937f2122efbff696d0f290b379";
-      hash = "sha256-OR7Fibl05kk6/2LsAoxya00TW0scgh3Uc4eSw5TaH58=";
+      rev = "11868addce601fdeed56097d48ff42abeec3dfe8";
+      hash = "sha256-Y4ZNYNb7shMQ8lTAx2/8De9KgbYq8Pf+6yQhHX6a4Ck=";
     };
     meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6587,6 +7120,7 @@ final: prev: {
       hash = "sha256-4FvqwxaMu3Mznrmt4U5NZlmUAdUIiLpr9fW+kjdwcOA=";
     };
     meta.homepage = "https://github.com/neovimhaskell/haskell-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6600,6 +7134,7 @@ final: prev: {
       hash = "sha256-yfQ5RjF+1VAbLiTP6PpXb3mUV189YDs3FVuRHlBSQ4U=";
     };
     meta.homepage = "https://github.com/wenzel-hoffman/haskell-with-unicode.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6613,6 +7148,7 @@ final: prev: {
       hash = "sha256-nbNxWaBSekXuS141mXCN5hBvnqJcGFCLjhhq5ixFKSU=";
     };
     meta.homepage = "https://github.com/travitch/hasksyn/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6626,6 +7162,7 @@ final: prev: {
       hash = "sha256-//wRcgbj9VhASi379ahD+aWRxwuX4h/4xsDgQln3nHM=";
     };
     meta.homepage = "https://github.com/StackInTheWild/headhunter.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6639,6 +7176,7 @@ final: prev: {
       hash = "sha256-LWYYVnLZgw6DhO/n0rclQVnon5TvyQVUGb2smaBzcPg=";
     };
     meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6652,6 +7190,7 @@ final: prev: {
       hash = "sha256-kHoaeULWI+NrLp0am0DSKRKeA1vZIg4pt5NxZuFUDvY=";
     };
     meta.homepage = "https://github.com/rebelot/heirline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6665,6 +7204,7 @@ final: prev: {
       hash = "sha256-8trqFsA7nTKSdtkiAL0Sa9bXjh5ONtAqN7XNE/B8ukM=";
     };
     meta.homepage = "https://github.com/qvalentin/helm-ls.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6679,6 +7219,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/OXY2DEV/helpview.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6692,6 +7233,7 @@ final: prev: {
       hash = "sha256-Zhn1o2QNCDy9YREBY+12P0VlDLLFw9sE080xVkYVKGg=";
     };
     meta.homepage = "https://github.com/RaafatTurki/hex.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6705,6 +7247,7 @@ final: prev: {
       hash = "sha256-3La0U8cwGGKchGVIJ3ZJ5OBM6gDEisY73cjN9hOemsE=";
     };
     meta.homepage = "https://github.com/Yggdroot/hiPairs/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6718,6 +7261,7 @@ final: prev: {
       hash = "sha256-yU4i3uPI7qghxdevOuqzxu8gIol6pxgd7TIY6vnyfiU=";
     };
     meta.homepage = "https://github.com/tzachar/highlight-undo.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6731,6 +7275,7 @@ final: prev: {
       hash = "sha256-mm7fU/xnKzUfIvJN7tQfIRswWood7HPAmuD9PZUEN6I=";
     };
     meta.homepage = "https://github.com/pimalaya/himalaya-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6744,6 +7289,7 @@ final: prev: {
       hash = "sha256-WjmVefR0qk2ANWgyHSuYMTuCfzlVTF7tqzAL+uatKkc=";
     };
     meta.homepage = "https://github.com/m-demare/hlargs.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6757,6 +7303,7 @@ final: prev: {
       hash = "sha256-3B9j0O6sUXeOXxYmDlJb/nywHq6Q2kmbG3LkfLEaQt8=";
     };
     meta.homepage = "https://github.com/shellRaining/hlchunk.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6770,6 +7317,7 @@ final: prev: {
       hash = "sha256-6BrbvTK8JPNDgW9Ke3JqKZ1ura5F8hZeiyp5l1UYDX0=";
     };
     meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6783,6 +7331,7 @@ final: prev: {
       hash = "sha256-j/RFJgCbaH+V2K20RrQbsz0bzpN8Z6YAKzZMABYg/OU=";
     };
     meta.homepage = "https://github.com/calops/hmts.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6796,6 +7345,7 @@ final: prev: {
       hash = "sha256-+96p95cVwN6x3Ww7yDMZDRlIfuhpKoYaPi7WXYOIFU4=";
     };
     meta.homepage = "https://github.com/edluffy/hologram.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6809,6 +7359,7 @@ final: prev: {
       hash = "sha256-EaghfgNtf0Sptb3dHslfMatTBVOEhqgNtsMLtmGAp64=";
     };
     meta.homepage = "https://github.com/urbit/hoon.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6822,6 +7373,7 @@ final: prev: {
       hash = "sha256-gHRKkqAMrQmpPHEWGETj3KG0NqwCnlTT8z/cNmug/Xc=";
     };
     meta.homepage = "https://github.com/smoka7/hop.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6835,6 +7387,7 @@ final: prev: {
       hash = "sha256-hgCEl1D24kHOe3lLlw3rzjEeLLoHsGr3Erm5cv+ISnY=";
     };
     meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6848,6 +7401,7 @@ final: prev: {
       hash = "sha256-diXdGip0lb7axIOWhXPn0A618g4Ijr4NMyprS8Ed1xY=";
     };
     meta.homepage = "https://github.com/TheBlob42/houdini.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6861,6 +7415,7 @@ final: prev: {
       hash = "sha256-9pWEpDy5opC32IcnJ5F607BpwZ2fQ4Ap2qL5cnaV3Ls=";
     };
     meta.homepage = "https://github.com/lewis6991/hover.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6874,6 +7429,7 @@ final: prev: {
       hash = "sha256-bqb+PMxjlDU1FWUdgmCnFxSk8Q90wMVEuoTRaU0UAUg=";
     };
     meta.homepage = "https://github.com/othree/html5.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6887,6 +7443,7 @@ final: prev: {
       hash = "sha256-Zw+dudVej4hvT+S9Jk2IMuCWzU3b4z90fmfKDmcujug=";
     };
     meta.homepage = "https://github.com/julienvincent/hunk.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6900,6 +7457,7 @@ final: prev: {
       hash = "sha256-DODoHIcBcgZAMCgrReidDS4HsvwHvsKdpvNILvlrtts=";
     };
     meta.homepage = "https://github.com/jellydn/hurl.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6913,6 +7471,7 @@ final: prev: {
       hash = "sha256-GwsitCPMLkTJrjdIyrfzt8wqgHY/aJLNiHzdUBIOrY0=";
     };
     meta.homepage = "https://github.com/nvimtools/hydra.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6926,6 +7485,7 @@ final: prev: {
       hash = "sha256-aEONOJTy+u64OFaQyZcL6DbunlUKSsXdLAhTrEkCPEU=";
     };
     meta.homepage = "https://github.com/mboughaba/i3config.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6939,6 +7499,7 @@ final: prev: {
       hash = "sha256-bPdhL0lHQtgizqY/Nq7GYCBDur1bLX5owG7tHD0BnBE=";
     };
     meta.homepage = "https://github.com/cocopon/iceberg.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6952,6 +7513,7 @@ final: prev: {
       hash = "sha256-wcWC8ICGEpbDQX+v5XpTYTdXo+Us5jMmiKqyvkVWK/4=";
     };
     meta.homepage = "https://github.com/idris-hackers/idris-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6965,6 +7527,7 @@ final: prev: {
       hash = "sha256-qk9+MsyAWMGspGHNsJBfHx3sJ190C7T14+Ef/zD9noU=";
     };
     meta.homepage = "https://github.com/idris-community/idris2-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -6978,6 +7541,7 @@ final: prev: {
       hash = "sha256-v2oNgtjreNpbN0LV1RIdrcYLjFWj/k9fqGf/w4ig8cE=";
     };
     meta.homepage = "https://github.com/edwinb/idris2-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -6991,6 +7555,7 @@ final: prev: {
       hash = "sha256-5FXpF7tKpJcF++eBnnd2SJeVGc2k1exa4g/k93Medjw=";
     };
     meta.homepage = "https://github.com/keaising/im-select.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7004,6 +7569,7 @@ final: prev: {
       hash = "sha256-LDh5xzIqNrxeGY6+cnB923uSuo8/uEms4NUdFhSDmlg=";
     };
     meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7017,6 +7583,7 @@ final: prev: {
       hash = "sha256-qDmoUwK4k+lg4Z6JEvjfaF1utKa6PwVkBFM/HSkxH+o=";
     };
     meta.homepage = "https://github.com/lewis6991/impatient.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7030,6 +7597,7 @@ final: prev: {
       hash = "sha256-k35uJZfarjRskS9MgCjSQ3gfl57d+r8vWvw0Uq16Z30=";
     };
     meta.homepage = "https://github.com/backdround/improved-search.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7043,6 +7611,7 @@ final: prev: {
       hash = "sha256-WDvzCOCWJFNTGl6g0/BF1SLPR+Xc4vGwVLqIdhAShkg=";
     };
     meta.homepage = "https://github.com/smjonas/inc-rename.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7056,6 +7625,7 @@ final: prev: {
       hash = "sha256-2qXhaaTpw8HTAGoD+Fe/ZQkDqRHQK0IMANDop+fwAY8=";
     };
     meta.homepage = "https://github.com/b0o/incline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7069,6 +7639,7 @@ final: prev: {
       hash = "sha256-inejFiP7TUJnlJFNYlnbpQgwUVsKfxymR6r7t2DBbJ4=";
     };
     meta.homepage = "https://github.com/nishigori/increment-activator/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7082,6 +7653,7 @@ final: prev: {
       hash = "sha256-s5Ljfw9Ol5M957j2abM3EiM2HUKrhvlxqu/9oPvITK8=";
     };
     meta.homepage = "https://github.com/haya14busa/incsearch-easymotion.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7095,6 +7667,7 @@ final: prev: {
       hash = "sha256-0iMAUC9L6MUPmoiSm4t/em0sK/ntym6rATc04htMkm4=";
     };
     meta.homepage = "https://github.com/haya14busa/incsearch.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7108,6 +7681,7 @@ final: prev: {
       hash = "sha256-Vc79ff416uJFqKH8zlM1y208SxaQGpQPqGVbiz5Vflg=";
     };
     meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7121,6 +7695,7 @@ final: prev: {
       hash = "sha256-732LP5X/fQMrSWD31BYHWe29y14yqE/FyZ23BmzSe0Y=";
     };
     meta.homepage = "https://github.com/Darazaki/indent-o-matic/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7134,6 +7709,7 @@ final: prev: {
       hash = "sha256-jJOG6t18egq1uDGegDKvbz9NGmqiuHg7b2EyJZh3TMM=";
     };
     meta.homepage = "https://github.com/arsham/indent-tools.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7147,6 +7723,7 @@ final: prev: {
       hash = "sha256-l73H6AtnunKkGw/XXql4GtrADJ6fx9vJWzyFZOzbuTw=";
     };
     meta.homepage = "https://github.com/Yggdroot/indentLine/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7160,6 +7737,7 @@ final: prev: {
       hash = "sha256-/iWB1KffMORcIwnLg0WadaxjTqwVBpOK/No0J/+PMOk=";
     };
     meta.homepage = "https://github.com/ciaranm/inkpot/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7173,6 +7751,7 @@ final: prev: {
       hash = "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4=";
     };
     meta.homepage = "https://github.com/jbyuki/instant.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7186,6 +7765,7 @@ final: prev: {
       hash = "sha256-ShMECcqFQS607ZWRKHEh1cSLT/XChx5JpNOHSP3h/7I=";
     };
     meta.homepage = "https://github.com/pta2002/intellitab.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7199,6 +7779,7 @@ final: prev: {
       hash = "sha256-cdCHI3n1XtlxNMvdBWoex5v9BY//RCfHSQD9MBYORtk=";
     };
     meta.homepage = "https://github.com/parsonsmatt/intero-neovim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7212,6 +7793,7 @@ final: prev: {
       hash = "sha256-Z1omv+8iGoJ9wQrG7nMcowHbi+Z/DAfKxBPb2zu5keI=";
     };
     meta.homepage = "https://github.com/keith/investigate.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7225,6 +7807,7 @@ final: prev: {
       hash = "sha256-u1c3SwgEw+UrhCex/5qWqdul1ZX94yGuFvUtw5jrRas=";
     };
     meta.homepage = "https://github.com/neutaaaaan/iosvkem/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7238,6 +7821,7 @@ final: prev: {
       hash = "sha256-iwvN829U/V5/YLqIY+KgVIYVK3Tg9HtP+v82VhPWmmM=";
     };
     meta.homepage = "https://github.com/ajbucci/ipynb.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7251,6 +7835,7 @@ final: prev: {
       hash = "sha256-Z3oFFI9TZ45PdFcfwFvCibdAYKNj+DNwtl1LjSm26Y0=";
     };
     meta.homepage = "https://github.com/twerth/ir_black/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7264,6 +7849,7 @@ final: prev: {
       hash = "sha256-I2o1H9iRgGHmLA0v2U508hKWFCFrvZxXGWUOLtke7Do=";
     };
     meta.homepage = "https://github.com/Vigemus/iron.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7277,6 +7863,35 @@ final: prev: {
       hash = "sha256-+DcZ6IDWD1Zf2oNyPYrFz95r/fD5G9jTpYal0vGGOw8=";
     };
     meta.homepage = "https://github.com/haya14busa/is.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
+  isabelle-lsp-nvim = buildVimPlugin {
+    pname = "isabelle-lsp.nvim";
+    version = "0-unstable-2025-12-02";
+    src = fetchFromGitHub {
+      owner = "Treeniks";
+      repo = "isabelle-lsp.nvim";
+      rev = "3601b59d77cc4998de29f966ded7d4d959318be2";
+      hash = "sha256-2SijIavooMFft9S/fMcH/YE77wctAP0Oneg/YAR9+LM=";
+    };
+    meta.homepage = "https://github.com/Treeniks/isabelle-lsp.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
+  isabelle-syn-nvim = buildVimPlugin {
+    pname = "isabelle-syn.nvim";
+    version = "0-unstable-2024-05-15";
+    src = fetchFromGitHub {
+      owner = "Treeniks";
+      repo = "isabelle-syn.nvim";
+      rev = "114b06dc34edf1707be7249b5a3815733e68d4c9";
+      hash = "sha256-f04jyExUwos9w89IeKbRdRMtWIsQYe0McAUoijq7mCA=";
+    };
+    meta.homepage = "https://github.com/Treeniks/isabelle-syn.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7290,6 +7905,7 @@ final: prev: {
       hash = "sha256-RasWfUX7UTJY14bfgArdai/zyvEqdKlbwUZWzsE+Kwo=";
     };
     meta.homepage = "https://github.com/mizlan/iswap.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7303,6 +7919,7 @@ final: prev: {
       hash = "sha256-698DMT3pdIYz0Y3vEg1ohcGvRARwJ9k+xm/o7NwSAbI=";
     };
     meta.homepage = "https://github.com/vim-scripts/jdaddy.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7316,6 +7933,7 @@ final: prev: {
       hash = "sha256-8sGu6i1fJNASWYtzqB+OPe3sny2jNmVCI0WPwCl6SnU=";
     };
     meta.homepage = "https://github.com/mahyarmirrashed/jdd.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7330,6 +7948,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/davidhalter/jedi-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7343,6 +7962,7 @@ final: prev: {
       hash = "sha256-vZdvKbSOFylzfX2Cmon8plbiawnYptjmwO018xn2m3g=";
     };
     meta.homepage = "https://github.com/metalelf0/jellybeans-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7356,6 +7976,7 @@ final: prev: {
       hash = "sha256-X+37Mlyt6+ZwfYlt4ZtdHPXDgcKtiXlUoUPZVb58w/8=";
     };
     meta.homepage = "https://github.com/nanotech/jellybeans.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7369,6 +7990,7 @@ final: prev: {
       hash = "sha256-ubZo3TYi72WqcGoSoveYRYcwOYk4oNW28uAYw939u5M=";
     };
     meta.homepage = "https://github.com/HiPhish/jinja.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7382,6 +8004,7 @@ final: prev: {
       hash = "sha256-hoU+DenrgxNwvLNmDtIsJ5yB5fhRjDRPOOL8WW9bpZM=";
     };
     meta.homepage = "https://github.com/NicolasGB/jj.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7395,6 +8018,7 @@ final: prev: {
       hash = "sha256-ZxdZDlYNv3Fki9ktNB3k3NUBBh/0/10F791kt8TnSH4=";
     };
     meta.homepage = "https://github.com/vito-c/jq.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7408,6 +8032,7 @@ final: prev: {
       hash = "sha256-KtD8bprqPIn8/lyssDfHxPYgGcxgDTJawFq/HkqKX/w=";
     };
     meta.homepage = "https://github.com/neoclide/jsonc.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7420,6 +8045,7 @@ final: prev: {
       hash = "sha256-bTh/6zmYQ+XqBsccKo8i149nU5bBfFv+8UKMayHIoo4=";
     };
     meta.homepage = "https://git.myzel394.app/Myzel394/jsonfly.nvim";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7433,6 +8059,7 @@ final: prev: {
       hash = "sha256-s2SDgiid8LnouJ/Y2Bud/sfjuwyGf4l6kjMjpejL1/k=";
     };
     meta.homepage = "https://github.com/julelang/jule.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7446,6 +8073,7 @@ final: prev: {
       hash = "sha256-IiYX8sBzAvbMSzZhMBbam7xh8znK8qVSVWppZLKkemk=";
     };
     meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7459,19 +8087,35 @@ final: prev: {
       hash = "sha256-LBBRZOSqn70qruSA/vbPMTzS7y05F/z4EqC+5JlU6NM=";
     };
     meta.homepage = "https://github.com/GCBallesteros/jupytext.nvim/";
+    meta.license = lib.licenses.unfree;
+    meta.hydraPlatforms = [ ];
+  };
+
+  just-nvim = buildVimPlugin {
+    pname = "just.nvim";
+    version = "1.0.0";
+    src = fetchFromGitHub {
+      owner = "nxuv";
+      repo = "just.nvim";
+      tag = "v1.0.0";
+      hash = "sha256-pwAlfwPFnWD2qfBAuhLxSoCQoOZD7gQHEy4Nnt0GOqE=";
+    };
+    meta.homepage = "https://github.com/nxuv/just.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
   kanagawa-nvim = buildVimPlugin {
     pname = "kanagawa.nvim";
-    version = "0-unstable-2025-10-15";
+    version = "0-unstable-2026-04-20";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "aef7f5cec0a40dbe7f3304214850c472e2264b10";
-      hash = "sha256-nHcQWTX4x4ala6+fvh4EWRVcZMNk5jZiZAwWhw03ExE=";
+      rev = "8ad3b4cdcc804b332c32db8f9743667e1bb82b99";
+      hash = "sha256-vAq9ZiG3s4x/xFSKt9/o40pptj2y7S8DQqs1dJEdhVU=";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7485,6 +8129,7 @@ final: prev: {
       hash = "sha256-UDHWREwo+cCK+lxhXhAOZ7hyRaP36TRcCucJgMRwJHU=";
     };
     meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7498,6 +8143,7 @@ final: prev: {
       hash = "sha256-gvPVYFhF5pHVB+Wq7UdmMwOYQtByNNGUu8Owo4tIJGY=";
     };
     meta.homepage = "https://github.com/webhooked/kanso.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7511,6 +8157,7 @@ final: prev: {
       hash = "sha256-IajKK1EjrKs6b2rotOj+RlBBge9Ii2m/iuIuefnjAE4=";
     };
     meta.homepage = "https://github.com/imsnif/kdl.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7524,6 +8171,7 @@ final: prev: {
       hash = "sha256-IfIjh+FOzfI1AXT7n7zfBHLsPCeQoy6/XxWORULWu64=";
     };
     meta.homepage = "https://github.com/anuvyklack/keymap-layer.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7537,6 +8185,7 @@ final: prev: {
       hash = "sha256-QtES9qKa4eVOP0CLr4VkI5lIkoii1mVDHtaegkjN8DU=";
     };
     meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7550,6 +8199,7 @@ final: prev: {
       hash = "sha256-/UhbgvRSLwDHTrrB7V8b3f+mccdw8pjijFPtKxdQ1c4=";
     };
     meta.homepage = "https://github.com/serenevoid/kiwi.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7563,6 +8213,7 @@ final: prev: {
       hash = "sha256-7PKVOsb3jvuGEnP/LsrDr96wFSQMou2dgnV+hRaI444=";
     };
     meta.homepage = "https://github.com/kmonad/kmonad-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7576,6 +8227,7 @@ final: prev: {
       hash = "sha256-BX/y1rEcDqj96rDssWwrMbj93SVIfFCW3tFgsFI1d4M=";
     };
     meta.homepage = "https://github.com/frabjous/knap/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7589,6 +8241,7 @@ final: prev: {
       hash = "sha256-qUMAudof+WhyBuHJ0O8LcBOPybJAEVXYAmdIcHK2gP4=";
     };
     meta.homepage = "https://github.com/oskarnurm/koda.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7602,6 +8255,7 @@ final: prev: {
       hash = "sha256-lpa3o42jieVKqs+ZCU8HBqWsoqoc53JKMmCNmIJ0rH0=";
     };
     meta.homepage = "https://github.com/b3nj5m1n/kommentary/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7615,6 +8269,7 @@ final: prev: {
       hash = "sha256-Eiwn2nQxb92gmcf3M5JW4HEnr9Uljyj5Sg/MA7Nc7ro=";
     };
     meta.homepage = "https://github.com/udalov/kotlin-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7629,6 +8284,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7642,6 +8298,7 @@ final: prev: {
       hash = "sha256-OxeY+0Q07zD6FHa0BRhz/1k4HyJeB8/j+vrzXVSbe/4=";
     };
     meta.homepage = "https://github.com/slugbyte/lackluster.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7655,6 +8312,7 @@ final: prev: {
       hash = "sha256-ORsKlHKtfaWmojESWa3d0yqO1fqSWJ1NG9Oulh+Fpvc=";
     };
     meta.homepage = "https://github.com/qnighy/lalrpop.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7668,6 +8326,7 @@ final: prev: {
       hash = "sha256-A3PMp8Wcg+I4qpKYB27HlQLYB60jKtfhs6+MqfPS3gs=";
     };
     meta.homepage = "https://github.com/Wansmer/langmapper.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7681,6 +8340,7 @@ final: prev: {
       hash = "sha256-wY3mv4EwndrW5WXjwRptaNXBtud6gtugogo7/7EM4B8=";
     };
     meta.homepage = "https://github.com/sk1418/last256/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7694,6 +8354,7 @@ final: prev: {
       hash = "sha256-9J+W5/0r6BaN63E0n4oPti9P4RYnV+Q3bIxfdohvlfw=";
     };
     meta.homepage = "https://github.com/latex-box-team/latex-box/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7707,6 +8368,7 @@ final: prev: {
       hash = "sha256-70roDFHMY2MB2d7wPrPbWdLqhr8r8TMkYTpaGI/GRRU=";
     };
     meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7720,6 +8382,7 @@ final: prev: {
       hash = "sha256-h5404njTAfqMJFQ3MAr2PWSbV81eS4aIs0cxAXkT0EM=";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7733,6 +8396,7 @@ final: prev: {
       hash = "sha256-Tsg1wNdySi6nK00sq1qDBRkRRlpdMCXVToDJ1SiqnPQ=";
     };
     meta.homepage = "https://github.com/folke/lazydev.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7746,6 +8410,7 @@ final: prev: {
       hash = "sha256-KMaUWGXRbbx1k1VdOgy+iSCDB20WNIjJETd5XOoVTJU=";
     };
     meta.homepage = "https://github.com/crnvl96/lazydocker.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7759,6 +8424,7 @@ final: prev: {
       hash = "sha256-V5vjfwuWtSzOicZD/cTwbPVQdKrr3/2ozsm4QyT36t0=";
     };
     meta.homepage = "https://github.com/kdheepak/lazygit.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7772,19 +8438,21 @@ final: prev: {
       hash = "sha256-h97fVlawU0oLkDuuvmUbrTFzsc92DQELvynmIRjGjjk=";
     };
     meta.homepage = "https://github.com/swaits/lazyjj.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025.10.1-unstable-2026-04-19";
+    version = "2026.4.1";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "1be79c2c60c24bc5e4ac31d4c25bbae533a8bc8f";
-      hash = "sha256-UwVXVulNayx9vJijgFQullXM9JUjUCXtNd7EKp1P9u4=";
+      tag = "v2026.4.1";
+      hash = "sha256-AYClc7+z+0h5QfVGPGr7ZrzPuaD+IAMtHT/3ZnbSVLE=";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7798,6 +8466,7 @@ final: prev: {
       hash = "sha256-yS9ViuW8FoZN7Oy7tf1rzlC7qiHJwZgjNwzhf9DVtf8=";
     };
     meta.homepage = "https://github.com/leanprover/lean.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7811,31 +8480,34 @@ final: prev: {
       hash = "sha256-6ZbO0ND/JSoJVXSLNCfQzWgXoiUYJut2OGtAcpvPaMk=";
     };
     meta.homepage = "https://github.com/ggandor/leap-ast.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "0-unstable-2026-03-31";
+    version = "0-unstable-2026-04-27";
     src = fetchgit {
       url = "https://codeberg.org/andyg/leap.nvim/";
-      rev = "b960d5038c5c505c52e56a54490f9bbb1f0e6ef6";
-      hash = "sha256-3xL4cwZdrRX0pCu/oqk0hz8zOeg/VRwn5cB9I9cG4DI=";
+      rev = "156c71aabb68d520c6269db4103c8e5580e3ea67";
+      hash = "sha256-aV5v7YECkcjdjw07l65yJaDQsxZJHNoGb6U1ZKHWJ9k=";
     };
     meta.homepage = "https://codeberg.org/andyg/leap.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   leetcode-nvim = buildVimPlugin {
     pname = "leetcode.nvim";
-    version = "0.3.1-unstable-2025-09-21";
+    version = "0.3.1-unstable-2026-04-28";
     src = fetchFromGitHub {
       owner = "kawre";
       repo = "leetcode.nvim";
-      rev = "fdd3f91800b3983e27bc9fcfb99cfa7293d7f11a";
-      hash = "sha256-PqfDPTKiM64tIi/BSQKDsE5rjmmuDHcBB91I3dZ4El8=";
+      rev = "4e8b3683940a8377379ce9398e7f329e3560b42c";
+      hash = "sha256-82ppJQURAJcffgWwPHjrU9hROIKgk1hVITxNTzGtY5o=";
     };
     meta.homepage = "https://github.com/kawre/leetcode.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7849,6 +8521,7 @@ final: prev: {
       hash = "sha256-C+j5CWSGKgyHzb8R6rJOg2KZ1a6JZsWHuNmNLsv4e44=";
     };
     meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7862,6 +8535,7 @@ final: prev: {
       hash = "sha256-upb1PMgnrAuNQGdv83VvOmbLtFUDnuGYchCbxLOORcA=";
     };
     meta.homepage = "https://github.com/camspiers/lens.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7875,6 +8549,7 @@ final: prev: {
       hash = "sha256-U2rZ+Kol2Up1a2kBBFWcIdV5xwl4WwdKe4E8A2EaOG4=";
     };
     meta.homepage = "https://github.com/oribarilan/lensline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7888,6 +8563,7 @@ final: prev: {
       hash = "sha256-liRjhV+h13QqsyvhzbokKoxIQqzLvzdoR8ZQnDM69b0=";
     };
     meta.homepage = "https://github.com/thirtythreeforty/lessspace.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7901,6 +8577,7 @@ final: prev: {
       hash = "sha256-NtHCfuL2Tq1a4Xevx+xAbnzsKqnPAbU/l7JvK7p0evU=";
     };
     meta.homepage = "https://github.com/cohama/lexima.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7914,6 +8591,7 @@ final: prev: {
       hash = "sha256-ys3kgXtgaE5OGyNYZ2PuqM9FDGjxfIjRgXBUDBVIjUM=";
     };
     meta.homepage = "https://github.com/lmburns/lf.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7927,6 +8605,7 @@ final: prev: {
       hash = "sha256-t09f3sNDca3tnaTOZd6qAgEZTvbWu0tO2Nf8dlN5Jn0=";
     };
     meta.homepage = "https://github.com/ptzz/lf.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7940,6 +8619,7 @@ final: prev: {
       hash = "sha256-lBR5BU2aJJaI9LlwUDDy0lLKX7D/oUSzLohJmFvdfWk=";
     };
     meta.homepage = "https://github.com/LucHermitte/lh-brackets/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7953,6 +8633,7 @@ final: prev: {
       hash = "sha256-uV5m4xr86UnfBzqf84765fe37wGEsg+3kge1XNavbOc=";
     };
     meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -7966,6 +8647,7 @@ final: prev: {
       hash = "sha256-OOlFb/I+sIXFcj1PQLapITuvM34TrjLEzes2yeC7Iy4=";
     };
     meta.homepage = "https://github.com/max-baz/lightline-ale/";
+    meta.license = lib.meta.getLicenseFromSpdxId "ISC";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7979,6 +8661,7 @@ final: prev: {
       hash = "sha256-1iHpchPd2ZVtwbx+RFspAqaqxXScuKmxatfRpqQ83tk=";
     };
     meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -7992,19 +8675,21 @@ final: prev: {
       hash = "sha256-m6iaRm33Ethm38olNmcoLESd2XGMtXiJkfoTgFhReBU=";
     };
     meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   lightline-lsp = buildVimPlugin {
     pname = "lightline-lsp";
-    version = "0-unstable-2023-03-15";
+    version = "0-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "spywhere";
       repo = "lightline-lsp";
-      rev = "4f5d42a7320cd2444a444df4b57529c4f921e4a2";
-      hash = "sha256-sV7gQshKlTsZOxC4JjYrKCnR6vfN5OrGw8Qz85VgOCs=";
+      rev = "5c00998b7fe06c101d887479ea9b753100527037";
+      hash = "sha256-XOL0sphbhXoViIOAiOnvfsA0GMB8zx5pY0xIkQ2y8p8=";
     };
     meta.homepage = "https://github.com/spywhere/lightline-lsp/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8018,6 +8703,7 @@ final: prev: {
       hash = "sha256-YYhSlqYUXFbArn2lq80LH/WXIUbHjt087+w2y/6EjtQ=";
     };
     meta.homepage = "https://github.com/itchyny/lightline.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8031,6 +8717,7 @@ final: prev: {
       hash = "sha256-pdmtzNMC7vvIxbhpWwm0fAS/jYAmti6a0gEiFA8BBoA=";
     };
     meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8044,6 +8731,7 @@ final: prev: {
       hash = "sha256-PWrJtDMUy0GQK1XrjcslMmJCI+n7QhYxy1cEbAZVxHI=";
     };
     meta.homepage = "https://github.com/markgandolfo/lightswitch.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8057,19 +8745,21 @@ final: prev: {
       hash = "sha256-Bwsch5DoRgYEztrMrfgOm8iNcK8aWRmg6NERtXscX9E=";
     };
     meta.homepage = "https://github.com/junegunn/limelight.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   linediff-vim = buildVimPlugin {
     pname = "linediff.vim";
-    version = "0.3.0-unstable-2025-11-28";
+    version = "0.3.0-unstable-2026-04-17";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "linediff.vim";
-      rev = "29fa617fc10307a1e0ae82a8761114e465d17b06";
-      hash = "sha256-53WWr63+89BYsE8Tyj216msCCRiitcnp7aYH+hUvQyI=";
+      rev = "c3780609769a93f4f59421b6324355f37e0ee6c5";
+      hash = "sha256-27Lu2U+/XELoT7yV4r0wqsFW/w8Z1BA4UDQslq1dOg4=";
     };
     meta.homepage = "https://github.com/AndrewRadev/linediff.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8083,6 +8773,7 @@ final: prev: {
       hash = "sha256-Bf2MabUe3fy0meL6zIYgal/yFxtLKsg3b/BUI/AVlrM=";
     };
     meta.homepage = "https://github.com/lf-lang/lingua-franca.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8096,6 +8787,7 @@ final: prev: {
       hash = "sha256-N2RXXWjvGJ2TAnX/i+riPKCrs10/3bElUJVJFOG1fZw=";
     };
     meta.homepage = "https://github.com/tamago324/lir.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8109,6 +8801,7 @@ final: prev: {
       hash = "sha256-1RSPwqMSZc2jZhIyutUhI6XNTtabRf/2G+dmTmNRqls=";
     };
     meta.homepage = "https://github.com/kkharji/lispdocs.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8122,6 +8815,7 @@ final: prev: {
       hash = "sha256-T9L/jmHqQJBdOkev3izFKzCuj2c9tgUVbC4zKp+4jhE=";
     };
     meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8135,6 +8829,7 @@ final: prev: {
       hash = "sha256-TbwKzyZHw/KH2qR15UTAYbbTMkxJky9SVrcSTlppw0k=";
     };
     meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8148,6 +8843,7 @@ final: prev: {
       hash = "sha256-PUFPQA0LWXn2fjT8Cfy7SFX14hkbUH05mQF4enuxUo0=";
     };
     meta.homepage = "https://github.com/ldelossa/litee.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8161,6 +8857,7 @@ final: prev: {
       hash = "sha256-V40YM+dw16znMyhV1n/8sxFaCNT6IAyywgF8dshVUlY=";
     };
     meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8174,6 +8871,7 @@ final: prev: {
       hash = "sha256-agfevFIUb9KcKK1kiVoUbyyIubn0hs6xD3MXy/ZssuM=";
     };
     meta.homepage = "https://github.com/smjonas/live-command.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8187,6 +8885,7 @@ final: prev: {
       hash = "sha256-7EKKcpth1/hW4qgeVQm+6RnG6HKb6wnA1VsBSUO0PEI=";
     };
     meta.homepage = "https://github.com/brianhuster/live-preview.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8200,19 +8899,21 @@ final: prev: {
       hash = "sha256-dLIPF5zrnZXtPAVbOe73O819kBS6XXCaoESTilM9U4s=";
     };
     meta.homepage = "https://github.com/saecki/live-rename.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   live-share-nvim = buildVimPlugin {
     pname = "live-share.nvim";
-    version = "2.1.0";
+    version = "2.1.4";
     src = fetchFromGitHub {
       owner = "azratul";
       repo = "live-share.nvim";
-      tag = "v2.1.0";
-      hash = "sha256-TxjS68iaat+zgpF4L7Wp7y7PgW4mrc6MrvxxQBK3zsk=";
+      tag = "v2.1.4";
+      hash = "sha256-MzgSIRZpBzvCiWppthKyFy5yocj7dghefsf5aonYQlg=";
     };
     meta.homepage = "https://github.com/azratul/live-share.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8226,6 +8927,7 @@ final: prev: {
       hash = "sha256-aYX33Btw00YQqvxgPdA6xifrOpeo7c+pBeKIB7po2qQ=";
     };
     meta.homepage = "https://github.com/ggml-org/llama.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8239,6 +8941,7 @@ final: prev: {
       hash = "sha256-vjSa/ae6p/xCFIgRXOwZFsyLu6Gap+/H0DIeIHMnyVs=";
     };
     meta.homepage = "https://github.com/huggingface/llm.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8252,6 +8955,7 @@ final: prev: {
       hash = "sha256-+qVJb3u3DqFn4p2K74xQPfFzR9/KH4r7oPEndW2wuMQ=";
     };
     meta.homepage = "https://github.com/folke/lsp-colors.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8265,6 +8969,7 @@ final: prev: {
       hash = "sha256-/x76tWGtSkDmbYyMZbVlzagqQnqumHyJqWHL2syDqvI=";
     };
     meta.homepage = "https://github.com/joechrisellis/lsp-format-modifications.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8278,6 +8983,7 @@ final: prev: {
       hash = "sha256-x++L67u2mE95Zeh+ZIh6mJa+ZfMm6/5JLtHZmC/EVR4=";
     };
     meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8291,6 +8997,7 @@ final: prev: {
       hash = "sha256-06CiJ+xeMO4+OJkckcslqwloJyt2gwg514JuxV6KOfQ=";
     };
     meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8304,6 +9011,7 @@ final: prev: {
       hash = "sha256-ZrtbUT6Q+KkIJTP1YJDCy1Fxy3Mmun2hXTVQ9V36kRQ=";
     };
     meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8317,6 +9025,7 @@ final: prev: {
       hash = "sha256-j9iDwZ1oq7v6rc8XQnBDBUUXTQ5defz/a5ZrcVRisv4=";
     };
     meta.homepage = "https://github.com/ahmedkhalf/lsp-rooter.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8330,6 +9039,7 @@ final: prev: {
       hash = "sha256-gmLeVnDyL8Zf5ZG92tP3mb/LAt438BxFtAi/Xax2zLI=";
     };
     meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8343,6 +9053,7 @@ final: prev: {
       hash = "sha256-CTLsXtY/89l1zV+Y09mhThx0PEEG5KhoOw1X4f4frtc=";
     };
     meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8356,6 +9067,7 @@ final: prev: {
       hash = "sha256-002AYHIcj9f54HOqD+MvzFAod00gi9nG9PDiD6qqPXg=";
     };
     meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8368,6 +9080,7 @@ final: prev: {
       hash = "sha256-jHiIZemneQACTDYZXBJqX2/PRTBoxq403ILvt1Ej1ZM=";
     };
     meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8381,6 +9094,7 @@ final: prev: {
       hash = "sha256-yKw5UmqLgllDszVcdwuUrYd8K7Ih7RfWn5H+6Yk3n8E=";
     };
     meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8394,6 +9108,7 @@ final: prev: {
       hash = "sha256-lR755wx18PItw7uxxGg5dX6ybcrNuPA+D0oNt+hLkpI=";
     };
     meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8407,6 +9122,7 @@ final: prev: {
       hash = "sha256-K/SxOuEQF/XNeC/uiyftmylYJDGx2isWf86DBM3pTvE=";
     };
     meta.homepage = "https://github.com/deathbeam/lspecho.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8420,19 +9136,21 @@ final: prev: {
       hash = "sha256-aIopYLm/x1CgCKpcsu9pxpqL0SXXhHDPTM8DKUwGeRw=";
     };
     meta.homepage = "https://github.com/onsails/lspkind.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   lspsaga-nvim = buildVimPlugin {
     pname = "lspsaga.nvim";
-    version = "0-unstable-2026-03-03";
+    version = "0-unstable-2026-04-21";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "lspsaga.nvim";
-      rev = "562d9724e3869ffd1801c572dd149cc9f8d0cc36";
-      hash = "sha256-5jqMObzXwveN4+p4qf/kZJcUlM964rtS3yX8nndMQzk=";
+      rev = "c532fb86c3d211c5829ad58d2a0783012739bb65";
+      hash = "sha256-oFzbEkY/WKT7jbwGxeKnbQXgnY8kSmH/UsjljXozBWU=";
     };
     meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8446,6 +9164,7 @@ final: prev: {
       hash = "sha256-9DLLewfRn17BeQfZB2+FbeFI+2DhNevlBqhrvsmpYU4=";
     };
     meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8459,6 +9178,7 @@ final: prev: {
       hash = "sha256-RxesT6jAX4H7SrmQPqV0wKs5qCkFMBXzQWDl2ToHqSs=";
     };
     meta.homepage = "https://github.com/nvim-java/lua-async/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8472,6 +9192,7 @@ final: prev: {
       hash = "sha256-8HMtydFDzTxsuKvce+bIra9vZ9zHfEBHyR346W635b8=";
     };
     meta.homepage = "https://github.com/arkav/lualine-lsp-progress/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8485,6 +9206,7 @@ final: prev: {
       hash = "sha256-w58aCqK2Gj4f9hxUcngJQi0Bj1I1twTwv0af7hOyKB0=";
     };
     meta.homepage = "https://github.com/evesdropper/luasnip-latex-snippets.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8498,6 +9220,7 @@ final: prev: {
       hash = "sha256-ihVEHzFZ59VXoao/lwsZv5pvX96db+RNXRGVXCLsapY=";
     };
     meta.homepage = "https://github.com/alvarosevilla95/luatab.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8511,6 +9234,7 @@ final: prev: {
       hash = "sha256-w1QF0PeaDjxp05wpwCkK9DYldYOnhrE1u3h10/2jmSw=";
     };
     meta.homepage = "https://github.com/lopi-py/luau-lsp.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8524,6 +9248,7 @@ final: prev: {
       hash = "sha256-FCsnQ3zl4ksmGRDMU2u0H4UdmY0Qxc+9N3L5W3jgSg8=";
     };
     meta.homepage = "https://github.com/mkasa/lushtags/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8537,6 +9262,7 @@ final: prev: {
       hash = "sha256-7fkB4w28W5aY/tJEvldgU1aL3wkcpf4/qX0Yc9ISv+A=";
     };
     meta.homepage = "https://github.com/Bilal2453/luvit-meta/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8550,6 +9276,7 @@ final: prev: {
       hash = "sha256-IrMR57gk9iCk73esHO24KZeep9VrlkV5sOC4PzGexyo=";
     };
     meta.homepage = "https://github.com/dccsillag/magma-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8563,6 +9290,7 @@ final: prev: {
       hash = "sha256-iejN+W0pWyjaS0q+EJKnbvMiIiYHrJ2K1Jl6mLjcWQM=";
     };
     meta.homepage = "https://github.com/forest-nvim/maple.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8576,6 +9304,7 @@ final: prev: {
       hash = "sha256-1rkEC4+EQSG5wmos2Pvw9GYU7HTiysL85AhBxoyXmKc=";
     };
     meta.homepage = "https://github.com/winston0410/mark-radar.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8589,6 +9318,7 @@ final: prev: {
       hash = "sha256-4n9Btas7GtHMrfNNE2IX2Gm2QOoTE4rHB35w5pAbicQ=";
     };
     meta.homepage = "https://github.com/OXY2DEV/markdoc.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8602,6 +9332,7 @@ final: prev: {
       hash = "sha256-nmcMObcZW50GIV1Lz8Xd64OriwA87rO47EZ7TEyEcpw=";
     };
     meta.homepage = "https://github.com/tadmccorkle/markdown.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8615,6 +9346,7 @@ final: prev: {
       hash = "sha256-TBXdG/Ih5DusAYZJyn37zVqHcMD85VkjrCoLyTo/KBg=";
     };
     meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8628,6 +9360,7 @@ final: prev: {
       hash = "sha256-xTEKyc3+BadA0q0Kx9MMSdkzApEEYYZMtQqSCbt42Rs=";
     };
     meta.homepage = "https://github.com/David-Kunz/markid/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8641,33 +9374,36 @@ final: prev: {
       hash = "sha256-ho2b2Ulh+GTqY0QvW7zjFOSlF5g/kaxWyOjKWhTFq7c=";
     };
     meta.homepage = "https://github.com/chentoast/marks.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   markview-nvim = buildVimPlugin {
     pname = "markview.nvim";
-    version = "28.1.0";
+    version = "28.2.0";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "markview.nvim";
-      tag = "v28.1.0";
-      hash = "sha256-O0si5VWfC2ijySL6jgQU2pfUF1M+FjPpCgSis3zPjmM=";
+      tag = "v28.2.0";
+      hash = "sha256-/sO6gNKNwkQDSMjCesrHynCNSXGhDCoN8youVdJm6t4=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/OXY2DEV/markview.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2.1.0-unstable-2026-04-10";
+    version = "2.2.0";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason-lspconfig.nvim";
-      rev = "0a3b42c3e503df87aef6d6513e13148381495c3a";
-      hash = "sha256-2To5AC3lurTK5NklB6ufMRHCbf3mw1D794Kh0UBGJz8=";
+      tag = "v2.2.0";
+      hash = "sha256-wWoRUg2nvmqaEWxjYEOk1q+jQyKupgJi2LubhewcVCw=";
     };
     meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8681,19 +9417,21 @@ final: prev: {
       hash = "sha256-OlTAprysnaDspna0Q8GgbeTxWJ/YxRaHayeMxM+uUVM=";
     };
     meta.homepage = "https://github.com/jay-babu/mason-null-ls.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
   mason-nvim = buildVimPlugin {
     pname = "mason.nvim";
-    version = "2.2.1-unstable-2026-04-06";
+    version = "2.2.1-unstable-2026-04-27";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason.nvim";
-      rev = "b03fb0f20bc1d43daf558cda981a2be22e73ac42";
-      hash = "sha256-2R31RsqYChWW8nyu0ovryFd8sO9iWeqBnydL6NhRpQ0=";
+      rev = "cb8445f8ce85d957416c106b780efd51c6298f89";
+      hash = "sha256-36u0h+nepjUub1tz5Cfw7GAUL14aMCg4hGFK5w3ZZBw=";
     };
     meta.homepage = "https://github.com/mason-org/mason.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8707,6 +9445,7 @@ final: prev: {
       hash = "sha256-y1heAB1HCntH4m5wITMejVQW0XxfmxjE/ZBZHrMNges=";
     };
     meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8720,6 +9459,7 @@ final: prev: {
       hash = "sha256-OZGq2TKZx1+GSzrQAdk2fAUv3052NMfTkm5QdO+EXXk=";
     };
     meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8733,6 +9473,7 @@ final: prev: {
       hash = "sha256-tY28548sn72ZxfjTITqMRT1aLqtZCnHXSdWtqi0lLOk=";
     };
     meta.homepage = "https://github.com/vim-scripts/matchit.zip/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8746,6 +9487,7 @@ final: prev: {
       hash = "sha256-rix4puBEf1hKqPDHaliehemXCaeDI6rwMAWLm0E038Q=";
     };
     meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8759,6 +9501,7 @@ final: prev: {
       hash = "sha256-9R4WWwsLa+CGIejxQJZwfprigHWsOY5ON8tQPiKP1Js=";
     };
     meta.homepage = "https://github.com/kaicataldo/material.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8772,6 +9515,7 @@ final: prev: {
       hash = "sha256-RoiTv2yTw6pkvkrKBz2T1MV3t5X3RjIMK+z/PMRNEdE=";
     };
     meta.homepage = "https://github.com/mattn/calendar-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8785,6 +9529,7 @@ final: prev: {
       hash = "sha256-7WaBHHQj7d/y4y3jLbE2HJ3XRXtEzY5wcKdrE4+frPc=";
     };
     meta.homepage = "https://github.com/vim-scripts/mayansmoke/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8798,6 +9543,7 @@ final: prev: {
       hash = "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=";
     };
     meta.homepage = "https://github.com/ravitemer/mcphub.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8811,6 +9557,7 @@ final: prev: {
       hash = "sha256-Tgza7QAzNu0D5cuDyH/jR3rvTuoV2DRA2MBCKjiPUdE=";
     };
     meta.homepage = "https://github.com/chikamichi/mediawiki.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8824,6 +9571,7 @@ final: prev: {
       hash = "sha256-4WeIgkbc9RxGB8NqLc/Z12OxtK+v8qbQ03T1pjJ3HAE=";
     };
     meta.homepage = "https://github.com/savq/melange-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8837,6 +9585,7 @@ final: prev: {
       hash = "sha256-0w4gPMXz3ZlSgt9Pffjy1D5aplog6MD1aKvqObAhqOI=";
     };
     meta.homepage = "https://github.com/mellow-theme/mellow.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8850,6 +9599,7 @@ final: prev: {
       hash = "sha256-ld2h000ZX3jZrgpcwW5ss6L0Uvu5fWXJCBAScFnvm/k=";
     };
     meta.homepage = "https://github.com/lsig/messenger.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8863,6 +9613,7 @@ final: prev: {
       hash = "sha256-aNGcNceW4I/lxhj+4usmLrK8pOgxc+NAqYHokL/3eeE=";
     };
     meta.homepage = "https://github.com/xero/miasma.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8876,6 +9627,7 @@ final: prev: {
       hash = "sha256-X1TLibzUF1f2qoGn886Y1OcbAZNMo4LXJVRRbB9/Hng=";
     };
     meta.homepage = "https://github.com/dasupradyumna/midnight.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8889,6 +9641,7 @@ final: prev: {
       hash = "sha256-JIhAhQYGLLRucwlhzfckQYU5qjqbHtNH52JlGS5a79w=";
     };
     meta.homepage = "https://github.com/hadronized/mind.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -8902,6 +9655,7 @@ final: prev: {
       hash = "sha256-vrCIUPR3+oHpXyaYI4qEXcOvQQaE9lexWqB0XGalHYY=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.ai/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8915,6 +9669,7 @@ final: prev: {
       hash = "sha256-7VwbEcd+PEgPXMRhFG9zCijMsqhpQWtzA1LAs0kBx9k=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.align/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8928,6 +9683,7 @@ final: prev: {
       hash = "sha256-VlsDJtRqQCreS4WGVTnTddpl7GPMTkKIhRA/YauaBhQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.animate/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8941,6 +9697,7 @@ final: prev: {
       hash = "sha256-wGKFapSEWc7MUWGboe9lLTuTwgNB5whTNg6ZNGLiPwQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.base16/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8954,6 +9711,7 @@ final: prev: {
       hash = "sha256-lx+5plFDSB4ot8abgYR3fHlJzTHwDQQpUlC9DRP4V68=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.basics/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8967,6 +9725,7 @@ final: prev: {
       hash = "sha256-nyD3/+UJXWQ+zhhNUiKKfQgHBZpH8TKkr/T1Mftz7nU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bracketed/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8980,6 +9739,7 @@ final: prev: {
       hash = "sha256-dNpmKx48LDoXbXcV8deAl7QbUoC42ufKXgW+CKmNKLA=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bufremove/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -8993,6 +9753,7 @@ final: prev: {
       hash = "sha256-0OJMRCtGG2I3CmohQXcm92bXAi5QGZ1Klp/GQhOvyyk=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.clue/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9006,6 +9767,7 @@ final: prev: {
       hash = "sha256-TjArbkIwP5iPrHEx8x6bGJQEPnNQNXb+Nr9ujSQJ5tM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cmdline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9019,6 +9781,7 @@ final: prev: {
       hash = "sha256-dxw3mIsC4zrFvS156Q18V5Lhim/LpdBb29LLs4OqWL4=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.colors/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9032,19 +9795,21 @@ final: prev: {
       hash = "sha256-ADlpVkkUSyWY8dQLiGRIIBGqwMuwGhe97wJ/wGqZ/UQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.comment/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "0.17.0-unstable-2026-04-17";
+    version = "0.17.0-unstable-2026-04-21";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.completion";
-      rev = "e934b46f6471a3bd0cd37fc06d0df198b9711882";
-      hash = "sha256-h7IUnYdqjVHldagQXCmC7UI8oO4+2fmtFfdCln1pa6A=";
+      rev = "667d94669be66043123cac44e7c5d65a31657732";
+      hash = "sha256-Y2cYv06QUvKWRoF/05+ajJ41z/4D6QZAuxjNCFAtu5E=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.completion/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9058,6 +9823,7 @@ final: prev: {
       hash = "sha256-swg5gxbUVY5Zkf6MThUP53aIg2NdSsEgmaFpoHwygSw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cursorword/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9071,6 +9837,7 @@ final: prev: {
       hash = "sha256-V1cDkMnFf81BPwRjRQC/wAmfTQjsxckhAobM6X9jZeg=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.deps/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9084,6 +9851,7 @@ final: prev: {
       hash = "sha256-mXpH4pZ542tLXpth9ESi60BE3wVJtB33dRu8k8KRjks=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.diff/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9097,6 +9865,7 @@ final: prev: {
       hash = "sha256-bw3nejD8F5149CXLg88LqNUuHf4o46kAifQG6WRyzLc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.doc/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9110,19 +9879,21 @@ final: prev: {
       hash = "sha256-+SlfaXZaTjTdPJik2SDTnfb+IFri2rG+DIv59dADi2w=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.extra/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "0.17.0-unstable-2026-04-09";
+    version = "0.17.0-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.files";
-      rev = "e8db416c9f5dbce70f5501da28263d45c0a4df6b";
-      hash = "sha256-HuLh9+k6x7CEnmu5V/QIvFE965v9oiXOpUC19TvOFkM=";
+      rev = "3e247eb12ca8c05622ceb8745f9004f761b22ef8";
+      hash = "sha256-/8Hnup7ufmjKnXWOC4HmAeRedXLzVJmfWrFikYZLA6s=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.files/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9136,6 +9907,7 @@ final: prev: {
       hash = "sha256-dnhT17eTP/jSjdFl1TIFRcozt1w+jieE7tTDwvV5BGQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.fuzzy/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9149,6 +9921,7 @@ final: prev: {
       hash = "sha256-1qexFbUk/Tyv5MbaZdmhOU6xFBIHbFaoqtzGNP7SPQ0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini-git/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9162,6 +9935,7 @@ final: prev: {
       hash = "sha256-As3KIoOPhm/KAVOp0Gw1hPIOB7sI47nu2am+4gpPyo4=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9175,6 +9949,7 @@ final: prev: {
       hash = "sha256-CQLsJl3EUw71eAzd4Af0dnqfGbgEmmsWJRhwnuB+HJQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hues/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9188,6 +9963,7 @@ final: prev: {
       hash = "sha256-/arujhZe9m9VB5nZ0xzCZjkxu4ai9Rfit7y6RwrLf7s=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.icons/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9201,6 +9977,7 @@ final: prev: {
       hash = "sha256-kbydWyaslRWTvKJMsuiMgIQi/FroPhBUke4DeRWLmQI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.indentscope/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9214,6 +9991,7 @@ final: prev: {
       hash = "sha256-sJS5JSM7TRRcKaabxKokBsuRKrVoxypvi1adQ9h9Jvc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9227,6 +10005,7 @@ final: prev: {
       hash = "sha256-4ugbxE0U7mlakpHWx3zAvTlk58UCAX4RNhrGeLz4fz8=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump2d/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9240,6 +10019,7 @@ final: prev: {
       hash = "sha256-hL6fsUxmRzie3iZpbMOQ/C/iQzpJiHNB9HfsrgVTF4o=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.keymap/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9253,6 +10033,7 @@ final: prev: {
       hash = "sha256-aQ7212R5WhrGtlMzOoTeUBVSUEoKATESVrDY1m0henQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.map/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9266,6 +10047,7 @@ final: prev: {
       hash = "sha256-51eLYthhCerqi0RWWhfzGCIDp4VC+i0ZpZV9UYIuSDM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.misc/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9279,6 +10061,7 @@ final: prev: {
       hash = "sha256-+OTW77wcX1I2Ua5W6O7tX/4J22RLTxZ2YviV1Atr7OI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.move/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9292,19 +10075,21 @@ final: prev: {
       hash = "sha256-j9sUgw7yaGFBgdpRxLZOhXMUp7YlleMDpo97lHjKpYQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.notify/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "0.17.0-unstable-2026-04-17";
+    version = "0.17.0-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "418ef4930ddabe80f449c6f1323f8b6abb172d1c";
-      hash = "sha256-bHEFu4XZI9QHP41h11sSNgRG43PDSkdgTyzmJt64gLk=";
+      rev = "be81509b7160aa02264a59789164a2e1c4a6750a";
+      hash = "sha256-2ndsWJEkQjmzG5TAPR/D+OQPbSqZ/z9pR8vcPE/MOY0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9318,6 +10103,7 @@ final: prev: {
       hash = "sha256-qMdxVUKjVX1+gPvf4VI1+qgykOZejzsVsXGR4PFu8J0=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.operators/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9331,6 +10117,7 @@ final: prev: {
       hash = "sha256-ewUVK+bPzzB8NySrm7iTyNJ4se71YBediFWpUFJCNfs=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pairs/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9344,6 +10131,7 @@ final: prev: {
       hash = "sha256-aRxyI1k0+d4xMhSL9w2rofY4jinJwmfZ2WalQ6wNHiQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pick/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9357,6 +10145,7 @@ final: prev: {
       hash = "sha256-y/aHihPEBQazmeQVj/5kAlbeapBACERk2jUnBQNS3SM=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.sessions/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9370,6 +10159,7 @@ final: prev: {
       hash = "sha256-4putVLcfKrbOqpD9L/fLpKGES0ZCOmGXt3mxRfptYx8=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.snippets/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9383,6 +10173,7 @@ final: prev: {
       hash = "sha256-wgXJc58gco5mNYJpjmOZEirYo7xFSY0k8pCKAbmQbOQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.splitjoin/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9396,6 +10187,7 @@ final: prev: {
       hash = "sha256-9blx4VllXj9jNMd5LjXZoebtjgFDnrycTJu/S/ezpp4=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.starter/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9409,6 +10201,7 @@ final: prev: {
       hash = "sha256-RHMbkng5tQclXQ6qzpjgeV8NMUL4TkF1wMzrR+UdExU=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.statusline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9422,6 +10215,7 @@ final: prev: {
       hash = "sha256-H+VXj4N/7dTTcLx2uzu7TD7IJeQbR9TcgoEmS/fHloI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.surround/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9435,6 +10229,7 @@ final: prev: {
       hash = "sha256-Oqq4Q/+ykxY8d7Cxz3tlM7pmq1a3jJD8/v6ZGWJaEoQ=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.tabline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9448,6 +10243,7 @@ final: prev: {
       hash = "sha256-5c8X1+zxYBJtoQ3rvZ2hyELVce1ojBN/talNaPRrYxc=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.trailspace/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9461,6 +10257,7 @@ final: prev: {
       hash = "sha256-p2samqxhCQdp2imNejVjk1XoWDDFHsZOwQUTsYYS6WI=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.visits/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9474,19 +10271,21 @@ final: prev: {
       hash = "sha256-7MUCZSlWI7iy6LJdtzQ4320KC73PeG5gkE1lYTGY/ek=";
     };
     meta.homepage = "https://github.com/wfxr/minimap.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   minuet-ai-nvim = buildVimPlugin {
     pname = "minuet-ai.nvim";
-    version = "0.8.0-unstable-2026-04-18";
+    version = "0.9.0";
     src = fetchFromGitHub {
       owner = "milanglacier";
       repo = "minuet-ai.nvim";
-      rev = "ee03326381c93f6417fa66aeb2ca85a26c0706e7";
-      hash = "sha256-41vUpNnyKdc4MvOyFVSAgR1/EEjHgKNixAWXaLdMbsQ=";
+      tag = "v0.9.0";
+      hash = "sha256-eOhbOrzhXqlzByq34/xKaCKr7u2JX3AaddieTlEe9OQ=";
     };
     meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9500,6 +10299,7 @@ final: prev: {
       hash = "sha256-Q+zlQVR8wVB1BqVTd0lkjZaFu/snt/hcb9jxw9fc/n4=";
     };
     meta.homepage = "https://github.com/jghauser/mkdir.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9513,6 +10313,7 @@ final: prev: {
       hash = "sha256-DxoSwy8WTgfKpguNVKsII2IUNfMS4oDGO18JmqalCcQ=";
     };
     meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9526,6 +10327,7 @@ final: prev: {
       hash = "sha256-Mpze6Quz5KNQF+/59JYQCZVJgRGFzTOvC1U+6g9kh/o=";
     };
     meta.homepage = "https://github.com/SidOfc/mkdx/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9539,6 +10341,7 @@ final: prev: {
       hash = "sha256-gz97C8/tlU4SDKLaQ5Lv2NbQP8zQRsNxiIQWHoHHDJY=";
     };
     meta.homepage = "https://github.com/gsuuon/model.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9552,6 +10355,7 @@ final: prev: {
       hash = "sha256-X0KSozq68U9/hAfRBFkp0sgPb9fXzUFoQj0XKx7SBFw=";
     };
     meta.homepage = "https://github.com/mawkler/modicator.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9565,6 +10369,7 @@ final: prev: {
       hash = "sha256-5w1a8ISBM90bwajkAupBFXoucHat+lQsyD5Rr0e2SKY=";
     };
     meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9578,6 +10383,7 @@ final: prev: {
       hash = "sha256-OgzU7vm046T9gmxmqO3sRKCH0E9QAheYGoT7WbL8Ot4=";
     };
     meta.homepage = "https://github.com/tomasr/molokai/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -9591,6 +10397,7 @@ final: prev: {
       hash = "sha256-FsDtd50Ehyd6EVdyU3fIDefkZJsOIi5bMPPdV3rKZw0=";
     };
     meta.homepage = "https://github.com/benlubas/molten-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9604,6 +10411,7 @@ final: prev: {
       hash = "sha256-amJ2l4BwV8LQDTHjRULOfsp1uo3tt+SkgoM3g24oWj4=";
     };
     meta.homepage = "https://github.com/jackplus-xyz/monaspace.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9617,6 +10425,7 @@ final: prev: {
       hash = "sha256-G8qGIUD2NivfJw016bKk67VEJzOitUZIk8o8k2WTt5w=";
     };
     meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9630,6 +10439,7 @@ final: prev: {
       hash = "sha256-wydCYXsQZyojiUf4CAi15pSysFxZjdRk8x3r668bPFU=";
     };
     meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9643,6 +10453,7 @@ final: prev: {
       hash = "sha256-Ee8tcKacn7l8e9ODYm7yWj/dIt9dRMpmfQp/Zbv4ntQ=";
     };
     meta.homepage = "https://github.com/leafo/moonscript-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -9656,6 +10467,7 @@ final: prev: {
       hash = "sha256-gDpJg8u5N9xmSvWTuByjY2Ns9srWmoMf+oHJlILrQ48=";
     };
     meta.homepage = "https://github.com/yegappan/mru/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -9669,6 +10481,7 @@ final: prev: {
       hash = "sha256-JHl8Z7ESrWus2I6Pe+6gmdgCAZOzAKX7kimy71sAoe4=";
     };
     meta.homepage = "https://github.com/jake-stewart/multicursor.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9682,6 +10495,7 @@ final: prev: {
       hash = "sha256-lLXQuyVPJxrTnTwBbM6fVpbRoxMGzGZwX4y4+lI0i4Q=";
     };
     meta.homepage = "https://github.com/smoka7/multicursors.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9695,6 +10509,7 @@ final: prev: {
       hash = "sha256-4ogF5v8CJuJ6t6E+xAYhFrfWHd/g6lNEOxnEnCfIcjA=";
     };
     meta.homepage = "https://github.com/AckslD/muren.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -9708,6 +10523,7 @@ final: prev: {
       hash = "sha256-Q+ZKbL1gqJ9mq3oFuay+Omei/r2OekeH3AmYAU+2VPQ=";
     };
     meta.homepage = "https://github.com/jbyuki/nabla.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9721,6 +10537,7 @@ final: prev: {
       hash = "sha256-IFcUgDU6MZNVZm1DrqLn0i9ccuZ8Ountbt8a4cWTBwM=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9734,6 +10551,7 @@ final: prev: {
       hash = "sha256-X3l437QnBfVCAmVEAEa5ORy1JvNUhcoRiZuDw4o1B5M=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-bufword/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9747,6 +10565,7 @@ final: prev: {
       hash = "sha256-IE5IpiTDv1AkvTI29f+yXTCEaRrCeCc65MDwHV2w6Xw=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-cssomni/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9760,6 +10579,7 @@ final: prev: {
       hash = "sha256-3qmtQmG/na0yrFT2E6Vi8ev3mreXCXmEFuufivNF1CQ=";
     };
     meta.homepage = "https://github.com/yuki-yano/ncm2-dictionary/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -9773,6 +10593,7 @@ final: prev: {
       hash = "sha256-QZET/3S8NAZLF4aW/Eze4NLuZe6mREEDz72KKpednbU=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-github/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9786,6 +10607,7 @@ final: prev: {
       hash = "sha256-mCn5Wp66UtZ+xyt+4LpdeTAfMdjPqN6tK5tLs7GUAaY=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-html-subscope/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9799,6 +10621,7 @@ final: prev: {
       hash = "sha256-wIiQ8QDv8DJJH+jUCW8+XJg6gfQBy4eMW0I9p/VnqQI=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-jedi/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9812,6 +10635,7 @@ final: prev: {
       hash = "sha256-B1f/Tj7/Kb2lZArclmVE+oSi6hul0nLbl1qWaY5eBUI=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-markdown-subscope/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9825,6 +10649,7 @@ final: prev: {
       hash = "sha256-0Vtvh2+wk/AB7HDQO889bt9LXRyV6e4Q5ZCu9CySW3c=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-neoinclude/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9838,6 +10663,7 @@ final: prev: {
       hash = "sha256-GJyW/waaZvzTkAuLF4bEyu1olmACbMvdOHYpMBXxeK0=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-neosnippet/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9851,6 +10677,7 @@ final: prev: {
       hash = "sha256-JI2WumolKC1SQqdrEqG+rUEdNA7dTzujkWIOQRpSD3s=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-path/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9864,6 +10691,7 @@ final: prev: {
       hash = "sha256-Qosu06XjTHHFDgnkChg+hBV791/Hse1iSORqkzt1uhg=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-syntax/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9877,6 +10705,7 @@ final: prev: {
       hash = "sha256-UxDG/2nv3QT5VglSug+mdtNFoYqHyxJAgZA6OfR+bSg=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-tagprefix/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9890,6 +10719,7 @@ final: prev: {
       hash = "sha256-gnLhpv/Ex+XuqsfHmtjxNRjZI8+sJHWfGdGA3/LaKb0=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-tmux/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9903,6 +10733,7 @@ final: prev: {
       hash = "sha256-qoYd6s8WdQDp19n7zbMvKrADK3uvP5YUtAnaose4eDg=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-ultisnips/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -9916,6 +10747,7 @@ final: prev: {
       hash = "sha256-oikxyhCcsLhK/VlsbHV8LDfIEwkCzJFJmHf4zQrtYqU=";
     };
     meta.homepage = "https://github.com/ncm2/ncm2-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9929,6 +10761,7 @@ final: prev: {
       hash = "sha256-CqFdBvcFTTPWYaHKqZtif/JLNgsMys9Jab+ogfys4g0=";
     };
     meta.homepage = "https://github.com/eagletmt/neco-ghc/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -9942,6 +10775,7 @@ final: prev: {
       hash = "sha256-3eLPtc9KCAjgB2msyBnTmyUnM8To2BzaK/XMY0crawU=";
     };
     meta.homepage = "https://github.com/ujihisa/neco-look/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -9955,6 +10789,7 @@ final: prev: {
       hash = "sha256-qs0CRmAlSA83aK2eCRHCDWTl20qn2BrXa0IBQk3FCIo=";
     };
     meta.homepage = "https://github.com/Shougo/neco-syntax/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -9968,19 +10803,21 @@ final: prev: {
       hash = "sha256-uBUl7DTCSRN8/YGiFKSUzTAg+BllvQ8PsTy7nzul10c=";
     };
     meta.homepage = "https://github.com/Shougo/neco-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2.71";
+    version = "3.40.0";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      tag = "v2.71";
-      hash = "sha256-w4D+iq1/su5LtCsknvGB6wDlohx2WVm0iRvKagL4H5E=";
+      tag = "3.40.0";
+      hash = "sha256-/TNl/IX81qr7Mcoy0dhF3bcsewXEnPSy2n+dm31eyyw=";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9994,19 +10831,21 @@ final: prev: {
       hash = "sha256-vNQl037TW95WvLLs7eAkOsktG+fJ8gWmSfsYkJCxCTQ=";
     };
     meta.homepage = "https://github.com/Shougo/neocomplete.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2026-04-15";
+    version = "1.4.0-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "ecdb0c9bc3f3373e11be4c97e461d16b52d532d0";
-      hash = "sha256-F3ui8hSN/UPt4UjDUziXyVYUEtFVaTVETjOn/xRm7nU=";
+      rev = "314baf12e4e39dcdfffb0f75d09f56dafb621591";
+      hash = "sha256-Ub9KEweOPGSbb/ln0cGv6aQOatrv0oVmh3qLjSR2koQ=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10020,6 +10859,7 @@ final: prev: {
       hash = "sha256-o4xuQE+GAsshNCppB6pGPwmVT66K1xBll60sd68Rnfk=";
     };
     meta.homepage = "https://github.com/IogaMaster/neocord/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10033,6 +10873,7 @@ final: prev: {
       hash = "sha256-coLbmqDxfmrXQtZ9QXK05PiA4gxA+McwukBWRrfmWl8=";
     };
     meta.homepage = "https://github.com/KeitaNakamura/neodark.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10046,6 +10887,7 @@ final: prev: {
       hash = "sha256-JRipsm9ngXM+f0gnlVvdV2EXkSMKi1o7kJVehzg/0tE=";
     };
     meta.homepage = "https://github.com/folke/neodev.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10059,6 +10901,7 @@ final: prev: {
       hash = "sha256-twE2fPXxxWJqZoaNkSG0v6PzyaoDzupx/ji4oI9jlKc=";
     };
     meta.homepage = "https://github.com/sbdchd/neoformat/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10072,19 +10915,21 @@ final: prev: {
       hash = "sha256-4KVPEpu3xsO4htGxudmgr8zMMOzn+eJSb9kl3Ww0zTk=";
     };
     meta.homepage = "https://github.com/danymat/neogen/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "3.0.0-unstable-2026-04-17";
+    version = "3.0.0-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "e906fce7e44ae562f06345be99a7db02f8315236";
-      hash = "sha256-/uIp7X8drHFQT8DNuiSxFGga71HUY59PCSTguyJvaeo=";
+      rev = "88000e7e60177558d1b428a0d561c92e5d81341e";
+      hash = "sha256-g8L1o0qf8COCuvA6tD2zGwhNm1dyxdzHD5fg7THnOe0=";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10098,6 +10943,7 @@ final: prev: {
       hash = "sha256-M0a94xOPSZNRaf55+R0t5PBHY8j3pbggVrnohn41l2o=";
     };
     meta.homepage = "https://github.com/Shougo/neoinclude.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10111,6 +10957,7 @@ final: prev: {
       hash = "sha256-fveYMlGZWNVlCMAfIos0gHwYMN3WtJj94R+cXnRq3HM=";
     };
     meta.homepage = "https://github.com/neomake/neomake/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10124,6 +10971,7 @@ final: prev: {
       hash = "sha256-w/RIZYOTkDoM5gbB2T0GiPlvT1nTrTFOHwSkoo0uJ24=";
     };
     meta.homepage = "https://github.com/casedami/neomodern.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10137,6 +10985,7 @@ final: prev: {
       hash = "sha256-e6qLhVYSU7A0enXxmz3CTGv4vWmurBtofTOFRzRi0RE=";
     };
     meta.homepage = "https://github.com/Shougo/neomru.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10150,6 +10999,7 @@ final: prev: {
       hash = "sha256-N6WfR7t6zPV0GoI7wBDi1dkfNmrKcz3TaDA3OfLex7o=";
     };
     meta.homepage = "https://github.com/neomutt/neomutt.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10163,6 +11013,7 @@ final: prev: {
       hash = "sha256-0G8JDXz8cKZnUPSX4Gx/okiaHl6jGMsCep/uaU5fr+U=";
     };
     meta.homepage = "https://github.com/rafamadriz/neon/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10176,6 +11027,7 @@ final: prev: {
       hash = "sha256-PBEZDbwH1ZYAh9y2XXavbKo1SzlzO66J4e03gOh+Pwc=";
     };
     meta.homepage = "https://github.com/ii14/neorepl.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10189,6 +11041,7 @@ final: prev: {
       hash = "sha256-tvbskEQ3+uOUlGKdqAFMlbF5Vw0A08XTwuWEs2aP64o=";
     };
     meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10202,6 +11055,7 @@ final: prev: {
       hash = "sha256-rvonvl0sJNYkLbvKP5vnjWMq/e3xUkCU9uBZcjBSBcQ=";
     };
     meta.homepage = "https://github.com/karb94/neoscroll.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10215,6 +11069,7 @@ final: prev: {
       hash = "sha256-A2gQ/sStDXAyBeTia+DEhWZrmV3YNJqkfxLQkqiKpxg=";
     };
     meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10228,6 +11083,21 @@ final: prev: {
       hash = "sha256-wJL68y+WDOSLLPtOboCExwF6B0Y886dfO3a+dul9MPo=";
     };
     meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
+    meta.license = lib.licenses.unfree;
+    meta.hydraPlatforms = [ ];
+  };
+
+  neotab-nvim = buildVimPlugin {
+    pname = "neotab.nvim";
+    version = "0-unstable-2025-08-04";
+    src = fetchFromGitHub {
+      owner = "kawre";
+      repo = "neotab.nvim";
+      rev = "e99d3e28c5a2066d2d368dfe4ef3827c8d75d337";
+      hash = "sha256-pSLvpKqfi1hQrFAYmXTOUOYERtnr79M23z5so2JOGhE=";
+    };
+    meta.homepage = "https://github.com/kawre/neotab.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10241,6 +11111,7 @@ final: prev: {
       hash = "sha256-0C/yEG5KhK8BN2k+JOhe9dGgw6FYN4qHSIDXM7ZD8SQ=";
     };
     meta.homepage = "https://github.com/kassio/neoterm/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10255,19 +11126,21 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/rcasia/neotest-bash/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   neotest-ctest = buildVimPlugin {
     pname = "neotest-ctest";
-    version = "0.2.0-unstable-2026-03-26";
+    version = "0.3.0";
     src = fetchFromGitHub {
       owner = "orjangj";
       repo = "neotest-ctest";
-      rev = "4c99a85a95cea0bf22e228c9886da8be8bdb2530";
-      hash = "sha256-5wbTW/LaaoH9NZrt8A4SOFuhGtAWHyJHCXl9zyZfBDY=";
+      tag = "v0.3.0";
+      hash = "sha256-LiS/jg/XlMWvpB8CvHNXWiq2rrj2dGj//NsCTGUFjM8=";
     };
     meta.homepage = "https://github.com/orjangj/neotest-ctest/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10281,6 +11154,7 @@ final: prev: {
       hash = "sha256-oItkgTZBY79l4QnbkJpTIRZkMjcTjt70v+Us0G2oeKo=";
     };
     meta.homepage = "https://github.com/sidlatau/neotest-dart/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10294,6 +11168,7 @@ final: prev: {
       hash = "sha256-jEksgs7BDNsi8pKeZ6wEDA+pytT9oSKWbs4d0s30PuM=";
     };
     meta.homepage = "https://github.com/MarkEmmons/neotest-deno/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10307,6 +11182,7 @@ final: prev: {
       hash = "sha256-q241RKlgzgrUHxGJvGZC+voCIeTqGzdXu8KkZBCd6bo=";
     };
     meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10321,6 +11197,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/jfpedroza/neotest-elixir/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10334,6 +11211,7 @@ final: prev: {
       hash = "sha256-bHKJCVtth/F36kjq+l9hHRRPMNITc+46kmFczVAixIg=";
     };
     meta.homepage = "https://github.com/llllvvuu/neotest-foundry/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10347,6 +11225,7 @@ final: prev: {
       hash = "sha256-btvAwNck/MAS0Xv2NzmPEYLuBb50DEiMjbkW3E7tg3I=";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-go/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10360,6 +11239,7 @@ final: prev: {
       hash = "sha256-dsiBQi1zKMEwxAX+rcmNszHdKOVVvCeoSW/uMKQVhjE=";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10373,6 +11253,7 @@ final: prev: {
       hash = "sha256-xhT1i2vuYZaV+axbgqqklFK93kvOR+nmjPzqQPQyxLs=";
     };
     meta.homepage = "https://github.com/weilbith/neotest-gradle/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10387,32 +11268,35 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/alfaix/neotest-gtest/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "3.0.1-unstable-2026-04-13";
+    version = "4.1.0";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "84650446b9207ef5e19d2ade50fcda278bdfbae7";
-      hash = "sha256-/GDhQhMCOUq0um9BPdDIfxIXUonV5DdyMKCn+JpaAAc=";
+      tag = "v4.1.0";
+      hash = "sha256-pYNxBczQMUgFibHFpcWAdf4FndGKnxmbWdmFW6Gs2Lw=";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
   neotest-java = buildVimPlugin {
     pname = "neotest-java";
-    version = "0.37.0";
+    version = "0.37.1";
     src = fetchFromGitHub {
       owner = "rcasia";
       repo = "neotest-java";
-      tag = "v0.37.0";
-      hash = "sha256-PuXYAKkg+KM9dkSk/br7GDjXzmgqhteJepjbt9ZJGO8=";
+      tag = "v0.37.1";
+      hash = "sha256-t+nqylLLHITU8li1cOl97jFKkZRmvmDbSAwvmv1yk+M=";
     };
     meta.homepage = "https://github.com/rcasia/neotest-java/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10426,6 +11310,7 @@ final: prev: {
       hash = "sha256-TaEYHfNOQIX+TWZZym+h6e5kYUZLH7NfeEcEpi3QCus=";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-jest/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10439,6 +11324,7 @@ final: prev: {
       hash = "sha256-cw8o6UG2ETPAtwdIP4dAjs+d4//SbUljfYBhzMqdUZ4=";
     };
     meta.homepage = "https://github.com/zidhuss/neotest-minitest/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10452,6 +11338,7 @@ final: prev: {
       hash = "sha256-hVUYoyWT982RSFy/b/t8kzRk86BnPuqrCBMwmaRjHqs=";
     };
     meta.homepage = "https://github.com/adrigzr/neotest-mocha/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10465,6 +11352,7 @@ final: prev: {
       hash = "sha256-ONAj22+wmWKwaq0rDhCQEzA027ZLzW7JTz0eAPLNpZg=";
     };
     meta.homepage = "https://github.com/theutz/neotest-pest/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10478,6 +11366,7 @@ final: prev: {
       hash = "sha256-vKLA/FDmsbR8VlOvxE5Ini/e+r6xGvaTGb2ulCge75Q=";
     };
     meta.homepage = "https://github.com/olimorris/neotest-phpunit/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10491,6 +11380,7 @@ final: prev: {
       hash = "sha256-k+YKXrSOWI8LZjSsLUmk3Z4uu/ZGXVFggRigl5TYcb4=";
     };
     meta.homepage = "https://github.com/thenbe/neotest-playwright/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10504,6 +11394,7 @@ final: prev: {
       hash = "sha256-NQGGq1HiBmu/4OhkvNruUWw+OmzS8MQ8LL9dWwaw2oo=";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-plenary/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10517,6 +11408,7 @@ final: prev: {
       hash = "sha256-TUu50qK97RuBI1eOD0JGtSq3M7o0HwlRKjLz2SCfjlE=";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-python/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10530,6 +11422,7 @@ final: prev: {
       hash = "sha256-45DTXO0CQ/YCivDev0We7+7Ca4i0kHKZmbSc73lkPSY=";
     };
     meta.homepage = "https://github.com/olimorris/neotest-rspec/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10543,6 +11436,7 @@ final: prev: {
       hash = "sha256-ksidW2kPD3mNQv3j1KnyH7+KwNk2qPUz4HdYfeL44k4=";
     };
     meta.homepage = "https://github.com/rouge8/neotest-rust/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10556,6 +11450,7 @@ final: prev: {
       hash = "sha256-engAlfkyvYC2FsKvN2TzsBbSpnikmShhxs6pWmpeKEY=";
     };
     meta.homepage = "https://github.com/stevanmilic/neotest-scala/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10569,6 +11464,7 @@ final: prev: {
       hash = "sha256-SVr5wspFfssYxjRCh20L2LksmdyqP1pbvACk6HRAU9I=";
     };
     meta.homepage = "https://github.com/shunsambongi/neotest-testthat/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10582,6 +11478,7 @@ final: prev: {
       hash = "sha256-XpiZ95MhjIS99dBrNFfq8SfggdIeEFfOSu3THgmX3+s=";
     };
     meta.homepage = "https://github.com/marilari88/neotest-vitest/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10595,6 +11492,7 @@ final: prev: {
       hash = "sha256-nW1jkx3kZU5qOqAByaGH45Scku/TYtT1I5UoZ36/WC4=";
     };
     meta.homepage = "https://github.com/lawrence-laz/neotest-zig/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10608,6 +11506,7 @@ final: prev: {
       hash = "sha256-L53zl5XYPvT8gPpPC4IyYpK1CZk7Iv6au3xYu6OD/uY=";
     };
     meta.homepage = "https://github.com/Shatur/neovim-ayu/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10621,6 +11520,7 @@ final: prev: {
       hash = "sha256-TKcP0WAlPzWseKKLwqYhAorMlih6942ZBjnE7Ix5bUU=";
     };
     meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10634,6 +11534,7 @@ final: prev: {
       hash = "sha256-qHBDjLZIalJgU13kFb98aaQkOuxWtLlf6rq5X7ezkBs=";
     };
     meta.homepage = "https://github.com/jeffkreeftmeijer/neovim-sensible/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10647,6 +11548,7 @@ final: prev: {
       hash = "sha256-IndNFcMe5iND8XLXv4l+BGA3QXS9SDao6Z8MwwE+qI4=";
     };
     meta.homepage = "https://github.com/saxon1964/neovim-tips/";
+    meta.license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10660,6 +11562,7 @@ final: prev: {
       hash = "sha256-6jpKFiSIgr5Y+RnehHpf+lEDqugdjvidw25DozRt024=";
     };
     meta.homepage = "https://github.com/trunk-io/neovim-trunk/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10673,6 +11576,7 @@ final: prev: {
       hash = "sha256-cAN761wZ6WVdxTtdKRc3WAyu7Wh7ITGgvm7yJ6dItjo=";
     };
     meta.homepage = "https://github.com/Shougo/neoyank.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10686,6 +11590,7 @@ final: prev: {
       hash = "sha256-WULWN/KMmT5VQ4s4bhsiUmAONZLG6slCcIHRMPnYDDE=";
     };
     meta.homepage = "https://github.com/preservim/nerdcommenter/";
+    meta.license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10699,6 +11604,7 @@ final: prev: {
       hash = "sha256-yp5AE8gv1xW3cXMd24D23BXCOqCp4CJQPFRhU9YdvRo=";
     };
     meta.homepage = "https://github.com/preservim/nerdtree/";
+    meta.license = lib.meta.getLicenseFromSpdxId "WTFPL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10712,6 +11618,7 @@ final: prev: {
       hash = "sha256-H3IxxQwz3Q1nO7oSDKCtoGCsoPDWO3jRjqtwp3Kp/TQ=";
     };
     meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/";
+    meta.license = lib.meta.getLicenseFromSpdxId "WTFPL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10725,6 +11632,7 @@ final: prev: {
       hash = "sha256-/wahSooqgIAKaHw+OfRlhF2bUxjyPwe4OEm9zK9Jcv0=";
     };
     meta.homepage = "https://github.com/2KAbhishek/nerdy.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10738,6 +11646,7 @@ final: prev: {
       hash = "sha256-SmpAuhDM764kT8BG1XWztNt3CJITohhrGoaB3DBo0U0=";
     };
     meta.homepage = "https://github.com/miversen33/netman.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10751,6 +11660,7 @@ final: prev: {
       hash = "sha256-tEO+omzlaC0uFkIHebeqnGtiPbDelRTBJONEnTy0F9U=";
     };
     meta.homepage = "https://github.com/prichrd/netrw.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10764,6 +11674,7 @@ final: prev: {
       hash = "sha256-qrpwDbg/q0i9JD9ewSX714EH2ZcAFSLEJBP5a+j8V18=";
     };
     meta.homepage = "https://github.com/fiatjaf/neuron.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10777,6 +11688,7 @@ final: prev: {
       hash = "sha256-H8fKIbGNCSGoFfHYM4nC1Q2SiMhAtbYN7w9+Iz1nV9Y=";
     };
     meta.homepage = "https://github.com/Olical/nfnl/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10790,6 +11702,7 @@ final: prev: {
       hash = "sha256-KP605on3KluatHCCrlFy/dDl6gT0cmrxSWquzcRN3kQ=";
     };
     meta.homepage = "https://github.com/joeveiga/ng.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10803,6 +11716,7 @@ final: prev: {
       hash = "sha256-rGqNjdaK5HX6Cad3x+awRLz24PfsA+APWg+vKjWn490=";
     };
     meta.homepage = "https://github.com/chr4/nginx.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10815,6 +11729,7 @@ final: prev: {
       hash = "sha256-x8CryNcg3u5uCncCMTgK7yzCvk5MiomjKpdjNEoCQu4=";
     };
     meta.homepage = "https://codeberg.org/koibtw/nidhogg.nvim";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10828,19 +11743,21 @@ final: prev: {
       hash = "sha256-O74rBgyBjFcAoOaW5yghNu98vrctj3ugdvaWX1BN8f0=";
     };
     meta.homepage = "https://github.com/oxfist/night-owl.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
   nightfly = buildVimPlugin {
     pname = "nightfly";
-    version = "0-unstable-2026-04-02";
+    version = "0-unstable-2026-04-26";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-nightfly-colors";
-      rev = "250ee0eb4975e59a277f50cc03c980eef27fb483";
-      hash = "sha256-FkyUVuOydxBWRqBUb2JZrHmFL5epDG2U3BSqd865wcE=";
+      rev = "4980ccc6de5f361fc9da116240ce7592e7d9a53a";
+      hash = "sha256-UGGHRCSZXq7vxgWntXTZDTiKuIDBs0MhWdeOucO3cxo=";
     };
     meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10854,6 +11771,7 @@ final: prev: {
       hash = "sha256-HoZEwncrUnypWxyB+XR0UQDv+tNu1/NbvimxYGb7qu8=";
     };
     meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10867,6 +11785,7 @@ final: prev: {
       hash = "sha256-MCSATvt7sO9sLC4fWa/pTQzseWPt5BgPAyWGE5u4LLU=";
     };
     meta.homepage = "https://github.com/Alexis12119/nightly.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10880,6 +11799,7 @@ final: prev: {
       hash = "sha256-ZIDvVto6c9PXtE8O0vp1fL6fuDJrUrYZ0zIXtJBTw+0=";
     };
     meta.homepage = "https://github.com/zah/nim.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10893,19 +11813,21 @@ final: prev: {
       hash = "sha256-JZ1QnbQlP/G4CahzvIZYWGhUe0jH4S9TF4xl6fJu2bA=";
     };
     meta.homepage = "https://github.com/figsoda/nix-develop.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     meta.hydraPlatforms = [ ];
   };
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "0-unstable-2026-04-11";
+    version = "0-unstable-2026-04-30";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "bf56ac18a62c0c5c2596653c20bbe18d1d4ec9a6";
-      hash = "sha256-hikO7bpr6QGChbNbNUoQQucMYEW35D3+8o2XXltXo9g=";
+      rev = "cb11c522a0e7e8e9c59d678bed44f9f590c8e938";
+      hash = "sha256-Ep4HOpjQj8b0FbI25d8Iu8mQTupP8NyKqcqRT6uHxhU=";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10919,6 +11841,7 @@ final: prev: {
       hash = "sha256-ZLokeEA70pdVmKOjK5vB8tRE0zGHicsunIHgW1Px0sw=";
     };
     meta.homepage = "https://github.com/mcchrish/nnn.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10932,6 +11855,7 @@ final: prev: {
       hash = "sha256-lx/DVKRUpNaeBf3TziAWd1lxo3wup/e8zCv+rW+tkmM=";
     };
     meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -10945,6 +11869,7 @@ final: prev: {
       hash = "sha256-KNLeeaNxywouey0myeVhqRdMVxxouX/IRGOilYtWQAA=";
     };
     meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10958,6 +11883,7 @@ final: prev: {
       hash = "sha256-TtH5Kw9qgkMisuJNI2LeTHTNfQZnJXPQfs9WJGQwgys=";
     };
     meta.homepage = "https://github.com/kartikp10/noctis.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10971,19 +11897,21 @@ final: prev: {
       hash = "sha256-FKzhFVmPxshDV4mWpD3LofjRpd6pXesf9QQei1s5rAo=";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
   none-ls-nvim = buildVimPlugin {
     pname = "none-ls.nvim";
-    version = "0-unstable-2026-04-19";
+    version = "0-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "none-ls.nvim";
-      rev = "e135361b9c11755ef6c48f54a2c970c509b56239";
-      hash = "sha256-W4mPpNxLjCBIrjthHi/y8EJ5C/N97Hgf1P+7c19wSWA=";
+      rev = "241ff8214b4ec051eb51e74a61ff729c0271b429";
+      hash = "sha256-tplnARSDuc9dkaai6/rm2kS+5jTWmVQXWvJ+Ij9HmQs=";
     };
     meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -10997,6 +11925,7 @@ final: prev: {
       hash = "sha256-8uPbkaJBXsOGeYCyXSO/aMzf87PE5McwZeww4eoYZy8=";
     };
     meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11010,6 +11939,7 @@ final: prev: {
       hash = "sha256-P4fbRNeJjXOoAQiWXXHZhm4ejgMD8W7OkdEF4TpEc7g=";
     };
     meta.homepage = "https://github.com/nordtheme/vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11023,6 +11953,7 @@ final: prev: {
       hash = "sha256-ipmt0xD2zTfoh8fyYG4+09uVL2ef98FE9VwWpWJtQks=";
     };
     meta.homepage = "https://github.com/andersevenrud/nordic.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11036,6 +11967,7 @@ final: prev: {
       hash = "sha256-cKYV6qiUUCnWDfK4RfbJNRPeklXc064z4lnV+dpDBbU=";
     };
     meta.homepage = "https://github.com/vigoux/notifier.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11049,6 +11981,7 @@ final: prev: {
       hash = "sha256-9RmBC8NBwZTzIgKHYGrLk9V2wzjPCgNeVVOeH9oAbzM=";
     };
     meta.homepage = "https://github.com/jlesquembre/nterm.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "EPL-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11062,6 +11995,7 @@ final: prev: {
       hash = "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI=";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11075,6 +12009,7 @@ final: prev: {
       hash = "sha256-RisbKK1mTrYnIFfsODx7zdy76lYsHXpWWPrM6wpO9Ds=";
     };
     meta.homepage = "https://github.com/nacro90/numb.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11088,6 +12023,7 @@ final: prev: {
       hash = "sha256-WNQMaM5EQBRQC9JfvEIgFhn3K5n8q0YeiJ9NdG3E+z4=";
     };
     meta.homepage = "https://github.com/nvchad/nvchad/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11101,6 +12037,7 @@ final: prev: {
       hash = "sha256-zy1fzwGKAZNDaceoPEyXUgVd7WAT3VnHTCytBh9+m98=";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11114,6 +12051,7 @@ final: prev: {
       hash = "sha256-67PqSHuo/mkPyxUiscQs+HOkjo9NS5YlAFMAN1SRLg4=";
     };
     meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11127,6 +12065,7 @@ final: prev: {
       hash = "sha256-eDPdCU1ZBoSiMkdreExsW3AzynQjSfFFCbZQ7f+XGFM=";
     };
     meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11140,6 +12079,7 @@ final: prev: {
       hash = "sha256-4C5pxZ18EYgPu4VGvYXsaLXHXhzixV58cmxmeO/ESa8=";
     };
     meta.homepage = "https://github.com/nathanmsmith/nvim-ale-diagnostic/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11153,6 +12093,7 @@ final: prev: {
       hash = "sha256-Ykp610LPF0tWidHM16UqeaU8sJxcr5OXJdHkjWCYUTU=";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-ansible/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11166,6 +12107,7 @@ final: prev: {
       hash = "sha256-0IqXpxKCzqVz6i9QajPYJ0FdfReHQBhehrvN89/8n6U=";
     };
     meta.homepage = "https://github.com/windwp/nvim-autopairs/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11179,6 +12121,7 @@ final: prev: {
       hash = "sha256-XjSDOCwszCV7lKySInnqMU1ScCYpOhyQuNRtuRsM5mE=";
     };
     meta.homepage = "https://github.com/Canop/nvim-bacon/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11192,6 +12135,7 @@ final: prev: {
       hash = "sha256-UKolssxC+cfQ9x3Mum/mKPVY8jJBs6+DtQgvvufLFAk=";
     };
     meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11205,6 +12149,7 @@ final: prev: {
       hash = "sha256-jm6xyNel7rmyQHijP9JBBk1ZiUY7+CvCEZVO4W5R21c=";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11218,6 +12163,7 @@ final: prev: {
       hash = "sha256-nnOoi37giuQHJL3u8F3XkDp7LLceKOC4nZVep/m7qAY=";
     };
     meta.homepage = "https://github.com/ojroques/nvim-bufdel/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11231,6 +12177,7 @@ final: prev: {
       hash = "sha256-/T5RC/7Qf/Zbszs3ok+jYdh8sWCLRe8JAiHZdz3vkvo=";
     };
     meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11244,6 +12191,7 @@ final: prev: {
       hash = "sha256-pY+aP9iBuJhvDZzVEsOHZmnfaq3vUP7TfKEEQrj+Mo8=";
     };
     meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11257,6 +12205,7 @@ final: prev: {
       hash = "sha256-O0msAljyNYj4zdFBOCR43QiqHYl1e9c4MASi9MmS+R4=";
     };
     meta.homepage = "https://github.com/willothy/nvim-cokeline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11270,6 +12219,7 @@ final: prev: {
       hash = "sha256-Oe3GabiskksOjShjSlWigDj/gudWLicynQ1nCUO1tHQ=";
     };
     meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11283,6 +12233,7 @@ final: prev: {
       hash = "sha256-O2jhrjXxKaWHMfm3YJ9+92Onm0niEHfUp5kOh2gETuc=";
     };
     meta.homepage = "https://github.com/terrortylor/nvim-comment/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11296,6 +12247,7 @@ final: prev: {
       hash = "sha256-6lDm9f+Y9gORR78NzHpyGQi3k0YMmgRqt4DSSHx+3H4=";
     };
     meta.homepage = "https://github.com/roxma/nvim-completion-manager/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11309,6 +12261,7 @@ final: prev: {
       hash = "sha256-07D1qzMevOzzfN2whZL5DSgrKqOJrnPjZ+9QzpwQ7Cg=";
     };
     meta.homepage = "https://github.com/klen/nvim-config-local/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11322,6 +12275,7 @@ final: prev: {
       hash = "sha256-JQZTXahU3CMXUYZ2Sl09RO7pvvW2X3C/pco62CMfUmw=";
     };
     meta.homepage = "https://github.com/andythigpen/nvim-coverage/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11335,6 +12289,7 @@ final: prev: {
       hash = "sha256-tsdrScujrmly1aqWIIjTKvWlallmEdsf2QvSFk1Dn/s=";
     };
     meta.homepage = "https://github.com/ya2s/nvim-cursorline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11347,6 +12302,7 @@ final: prev: {
       hash = "sha256-9NF0+QoHOEAg6pd+oRBxr3ExWLqbvRrIMoMSZvNdqX4=";
     };
     meta.homepage = "https://codeberg.org/mfussenegger/nvim-dap/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11360,6 +12316,7 @@ final: prev: {
       hash = "sha256-hXfMfQ4jAnAQ+6MFTNdyJiFTVqivi5lSRvQotPoHrjY=";
     };
     meta.homepage = "https://github.com/jedrzejboczar/nvim-dap-cortex-debug/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11373,6 +12330,7 @@ final: prev: {
       hash = "sha256-5uHdDTVdfdJk6WLM6gvVDgEndFkP9SmqrqhHzaalH/k=";
     };
     meta.homepage = "https://github.com/docker/nvim-dap-docker/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11386,6 +12344,7 @@ final: prev: {
       hash = "sha256-wg9kiW2eAMmg4bvgqaAS9kt7qaVsIWl36BNqRbhZIgo=";
     };
     meta.homepage = "https://github.com/leoluz/nvim-dap-go/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11399,6 +12358,7 @@ final: prev: {
       hash = "sha256-HSYuFWJhqE8M6/Tm0/9F5l7dfLVu2kYPFOtqi66XFZk=";
     };
     meta.homepage = "https://github.com/julianolf/nvim-dap-lldb/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11411,6 +12371,7 @@ final: prev: {
       hash = "sha256-qqPoYmMPjK74Nyyl7TfsHnJCsIvOYFuQnKWn3Rh8FLU=";
     };
     meta.homepage = "https://codeberg.org/mfussenegger/nvim-dap-python/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11424,6 +12385,7 @@ final: prev: {
       hash = "sha256-CrZ799BcpX+VtYgM+U/Vds5cbxlNv3rcGpWHhB77UY4=";
     };
     meta.homepage = "https://github.com/rinx/nvim-dap-rego/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11437,6 +12399,7 @@ final: prev: {
       hash = "sha256-YIsmiWsdiUfnM+syZQqsa+wgP+aR35/IbgYeywqY1to=";
     };
     meta.homepage = "https://github.com/jonboh/nvim-dap-rr/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11450,6 +12413,7 @@ final: prev: {
       hash = "sha256-57BBhdrikDEswZe2QW+jHMSgfXIjauc6iDNpWS0YUaU=";
     };
     meta.homepage = "https://github.com/suketa/nvim-dap-ruby/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11463,6 +12427,7 @@ final: prev: {
       hash = "sha256-J/gUD4X//JtC2HB3HBeONivCQdMnXDnZJWd6jFF9+nk=";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11476,6 +12441,7 @@ final: prev: {
       hash = "sha256-YMAP9csr7SHN2h5yPJ/nx1lezX9DaE0nLjVnr6c7xyw=";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11489,6 +12455,7 @@ final: prev: {
       hash = "sha256-8hsk+EwnvoHCNhb0dcL9e4hQg9I+t/5Cy9ZoZgcz4fU=";
     };
     meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11502,6 +12469,7 @@ final: prev: {
       hash = "sha256-8dlzaI94I8ppzLRNIfjVd92kYgqr07D1akDj4VdKQto=";
     };
     meta.homepage = "https://github.com/mxsdev/nvim-dap-vscode-js/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11515,6 +12483,7 @@ final: prev: {
       hash = "sha256-YIf7JxM3lVe1HiEEfxlj8gIM7nIL4yef38HC/wUITAY=";
     };
     meta.homepage = "https://github.com/amrbashir/nvim-docs-view/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11528,6 +12497,7 @@ final: prev: {
       hash = "sha256-vc2Q2iiyx6WcEr4RYtvr4s5yYSYKst+DpNG1WNKLQCI=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-early-retirement/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11541,6 +12511,7 @@ final: prev: {
       hash = "sha256-LpZ05Y8uaediJFzTBKrjfGd5scEr/wcG+Y0YvPens9o=";
     };
     meta.homepage = "https://github.com/allendang/nvim-expand-expr/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11554,6 +12525,7 @@ final: prev: {
       hash = "sha256-clcZm8yGqE+erN1zBT38ai4keVTWieIjB14+gRwpM+U=";
     };
     meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11567,6 +12539,7 @@ final: prev: {
       hash = "sha256-qSCf+LgqU1hsSarTpw9TsPgmSxPNwBi0VznKrPz/AQ8=";
     };
     meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf-commands/";
+    meta.license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11580,6 +12553,7 @@ final: prev: {
       hash = "sha256-4l7C1uv84CCbw5uEyVBGs8XEvMnW5+M9zGar8lWRVwM=";
     };
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11593,6 +12567,7 @@ final: prev: {
       hash = "sha256-Lv92CKF0iocchQcK/AQ7TMVqGILnzd+Z8eKZZYXcwxU=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11606,6 +12581,7 @@ final: prev: {
       hash = "sha256-9YLJm/L13gTktb6VIkz2W/60cothFtF7feiKd26R5lo=";
     };
     meta.homepage = "https://github.com/booperlv/nvim-gomove/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11619,6 +12595,7 @@ final: prev: {
       hash = "sha256-LrY61knLKAn36+RnMddAzxf/wYtdnLxnnQhtHB3mQwc=";
     };
     meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11632,6 +12609,7 @@ final: prev: {
       hash = "sha256-p4T86YBklV4IRphLsaKq6MjBVqgCV9kda0n4QZ9oe4w=";
     };
     meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11645,6 +12623,7 @@ final: prev: {
       hash = "sha256-W+R/GY6a6easPnpndGAb8TuE+jqaYZlqT9ZQUdQnUwQ=";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11658,6 +12637,7 @@ final: prev: {
       hash = "sha256-umsuGGP5tOf92bzWEhqD2y6dN0FDBsmLx60f45xgmig=";
     };
     meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11671,6 +12651,7 @@ final: prev: {
       hash = "sha256-xl33sp/+wjH8Y8Uoa7j7kaQIgcMXUWYlGfCDKkZQNLk=";
     };
     meta.homepage = "https://github.com/idanarye/nvim-impairative/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11684,6 +12665,7 @@ final: prev: {
       hash = "sha256-w4BCKMbbFps6YxV3gyo5KGzBRJnU6h1vrUbYRq9cO0A=";
     };
     meta.homepage = "https://github.com/nvim-java/nvim-java/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11697,6 +12679,7 @@ final: prev: {
       hash = "sha256-cM1+Z89x2IP9CJ5Ow1kQTsp66Ay6JfVE2LcjpAbls/w=";
     };
     meta.homepage = "https://github.com/nvim-java/nvim-java-core/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11710,6 +12693,7 @@ final: prev: {
       hash = "sha256-Xrzydrlbo8B99Y1kJUri0H/3gLBHXaZ/jbIZIfhi2gU=";
     };
     meta.homepage = "https://github.com/nvim-java/nvim-java-dap/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11723,6 +12707,7 @@ final: prev: {
       hash = "sha256-2jYUDoPX4FvshhzkGcBRYCtiJ6O5vldnZoSR85F7U5E=";
     };
     meta.homepage = "https://github.com/nvim-java/nvim-java-refactor/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11736,6 +12721,7 @@ final: prev: {
       hash = "sha256-aqFg+m8EMNpQkj5aQPZaW18dtez+AsxARiEiU3ycW6I=";
     };
     meta.homepage = "https://github.com/nvim-java/nvim-java-test/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11748,6 +12734,7 @@ final: prev: {
       hash = "sha256-ySaJ/eKtYmFoTWEKoFiiNWf+B8YIwUEqg/tKUOTcFfI=";
     };
     meta.homepage = "https://codeberg.org/mfussenegger/nvim-jdtls/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11761,6 +12748,7 @@ final: prev: {
       hash = "sha256-2A1O7xSlsmG1LjwfqQxta9pdKlEu7Uj+yAVaVZolX2g=";
     };
     meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11773,6 +12761,7 @@ final: prev: {
       hash = "sha256-IaNsbBe5q7PB9Q/N/Z9nEnP6jlkQ6+xlkC0TCFnJpkk=";
     };
     meta.homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11786,6 +12775,21 @@ final: prev: {
       hash = "sha256-Ci2AwFBY8UYp57F3d+z4aTRJYtzau2cdhkqc8GWkltc=";
     };
     meta.homepage = "https://github.com/yorickpeterse/nvim-jump/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
+    meta.hydraPlatforms = [ ];
+  };
+
+  nvim-justice = buildVimPlugin {
+    pname = "nvim-justice";
+    version = "0-unstable-2026-04-13";
+    src = fetchFromGitHub {
+      owner = "chrisgrieser";
+      repo = "nvim-justice";
+      rev = "a3e0d2d73d1748d1bed45e6b1797fbc73961e53f";
+      hash = "sha256-gT+vPt9BWe1AylFqbZsoEXL8cXSpMjRdiY44Cxalwcg=";
+    };
+    meta.homepage = "https://github.com/chrisgrieser/nvim-justice/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11799,6 +12803,7 @@ final: prev: {
       hash = "sha256-BleCITG11FKFAdSLjFyqJHDN3/zYV0ONvkmeRfoK4SI=";
     };
     meta.homepage = "https://github.com/anasinnyk/nvim-k8s-crd/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11812,19 +12817,21 @@ final: prev: {
       hash = "sha256-jmF06Cl1ieYXKTnW9pWdQH4IJGicvSVJAR7ppju9qyg=";
     };
     meta.homepage = "https://github.com/ethanholz/nvim-lastplace/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   nvim-lightbulb = buildVimPlugin {
     pname = "nvim-lightbulb";
-    version = "1.0.0-unstable-2026-04-02";
+    version = "1.0.0-unstable-2026-04-27";
     src = fetchFromGitHub {
       owner = "kosayoda";
       repo = "nvim-lightbulb";
-      rev = "e974b1a93c917c840545f51b9a66cfd72c520522";
-      hash = "sha256-WHJ/MV4xKl4Unpxyxxj5j9qbxE0gP0pWe6eVXB4CGvg=";
+      rev = "b8c08c5f3b1586dfcdd9f34d7d54fe6982e01ac9";
+      hash = "sha256-F7JAGcinAcJmTmcbYQe5zboHwgLRbZMOYeSK/A6bqe8=";
     };
     meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11838,19 +12845,21 @@ final: prev: {
       hash = "sha256-J1FbDjCBPAhx+Vm2exBqdOaNF4djCgR5ZDSadDasbrs=";
     };
     meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   nvim-lilypond-suite = buildVimPlugin {
     pname = "nvim-lilypond-suite";
-    version = "0-unstable-2025-11-28";
+    version = "0-unstable-2026-04-26";
     src = fetchFromGitHub {
       owner = "martineausimon";
       repo = "nvim-lilypond-suite";
-      rev = "a1a313fd6028a196cc9aaa8c8501838fe8cc8e2a";
-      hash = "sha256-ZRP/Nw5qnsF7IT7NNwRY5mDZOmExuUmFsdaDNmFVVSw=";
+      rev = "e57ced9e0df33773566af795d70919d577c58ce2";
+      hash = "sha256-/O2rUPjjcKFl44azZ0SJxzOO9mP5bp3VA+Hgt2/Hxu8=";
     };
     meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11863,6 +12872,7 @@ final: prev: {
       hash = "sha256-5bVnAw7xxTntwmYYDZGt+3HOizlddqMOIyg/zqGbSEM=";
     };
     meta.homepage = "https://codeberg.org/mfussenegger/nvim-lint/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11876,6 +12886,7 @@ final: prev: {
       hash = "sha256-4LugE23xPGpCjqeqNtCbou4RUaUf6TBJ0dNoGhhkx6c=";
     };
     meta.homepage = "https://github.com/antosha417/nvim-lsp-file-operations/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11889,6 +12900,7 @@ final: prev: {
       hash = "sha256-t93G/RbcG6wOJSp7xIaGCKb2a/800GFcN8f00wV6lcQ=";
     };
     meta.homepage = "https://github.com/mrded/nvim-lsp-notify/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11902,6 +12914,7 @@ final: prev: {
       hash = "sha256-38YOgLDtku2BPCaNEmX0555x1QmHuuDSCZL274bBhcg=";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11915,6 +12928,7 @@ final: prev: {
       hash = "sha256-boQBpuqeGLQV0Vnx+9zecxPEHRVnJMAWVmSld6msS7E=";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11928,6 +12942,7 @@ final: prev: {
       hash = "sha256-mtySELpRakpsge5ASb4CnY+qQpiPedY+0qr++WBmg3Y=";
     };
     meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11941,6 +12956,7 @@ final: prev: {
       hash = "sha256-7jccZ45ibSiflQEJV3cyuVNISP3xt5E5579e+hHro8c=";
     };
     meta.homepage = "https://github.com/sam4llis/nvim-lua-gf/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -11954,6 +12970,7 @@ final: prev: {
       hash = "sha256-/k/vl22LDq44xut/XW7K9uLxpMNt3vOG7pD02lYRa18=";
     };
     meta.homepage = "https://github.com/bfredl/nvim-luadev/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11967,19 +12984,21 @@ final: prev: {
       hash = "sha256-zSFPXAvMuq5pL8vx1wAhHZ8h/agcwoUjioH6RIMy/AE=";
     };
     meta.homepage = "https://github.com/rafcamlet/nvim-luapad/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   nvim-metals = buildVimPlugin {
     pname = "nvim-metals";
-    version = "0.10.x-unstable-2026-04-10";
+    version = "0.10.x-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "scalameta";
       repo = "nvim-metals";
-      rev = "6970d6036218db6545f3c295d0106cc8de6d7161";
-      hash = "sha256-RY+UhnwIjWuMU9WOG4a1JvBiJ9RWZ2fUxFDnuzDR+jw=";
+      rev = "4cc98f07ec96bb748a8796831767538e0e4f9be4";
+      hash = "sha256-uXmLZMbJKUFua9Jg/LYJ9dGRz+QF+nw7Nz5n6uaGSdQ=";
     };
     meta.homepage = "https://github.com/scalameta/nvim-metals/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -11993,6 +13012,7 @@ final: prev: {
       hash = "sha256-srCbkSDKZGb04N+1IQDhCq5uIrmpTjASARaTxUvVjjM=";
     };
     meta.homepage = "https://github.com/gpanders/nvim-moonwalk/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12006,6 +13026,7 @@ final: prev: {
       hash = "sha256-TLGvVuRg8ULrrytdJuypw5IYcYvz1nqn7nGFUeBXyyw=";
     };
     meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12019,6 +13040,7 @@ final: prev: {
       hash = "sha256-rRUlGtClq4NmyDqg0NhytnxFDMVpQhuF5cPKKRJHl88=";
     };
     meta.homepage = "https://github.com/smiteshp/nvim-navic/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12032,6 +13054,7 @@ final: prev: {
       hash = "sha256-IjkpqLHGO48QRiYkELyadZK2uFXQVyklGfBJSgAbzIY=";
     };
     meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12045,6 +13068,7 @@ final: prev: {
       hash = "sha256-ACDsnUqTYok+uea9O/vW4qu/GJgV9d6WTdUCRjSALvo=";
     };
     meta.homepage = "https://github.com/ghostbuster91/nvim-next/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12058,6 +13082,7 @@ final: prev: {
       hash = "sha256-NpF2za/TsgpPrRWsCoRinL8KrynQHrPpdhZjXJXAdm0=";
     };
     meta.homepage = "https://github.com/ya2s/nvim-nonicons/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12071,6 +13096,7 @@ final: prev: {
       hash = "sha256-h7STMjY+CBTqBkIDJXgtJz4WhNeQ02ES2Jesi3jZXeM=";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-notify/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12084,6 +13110,7 @@ final: prev: {
       hash = "sha256-mW6m1SqZEpP0hVmMh6ORZY3afJoS5aUBUHlTza9b+w8=";
     };
     meta.homepage = "https://github.com/LhKipp/nvim-nu/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12097,6 +13124,7 @@ final: prev: {
       hash = "sha256-C11XegdlMo5l4NVi9txSc5uivz9qx5HCNtwQSbMm28k=";
     };
     meta.homepage = "https://github.com/sitiom/nvim-numbertoggle/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12110,6 +13138,7 @@ final: prev: {
       hash = "sha256-l47szqnNCnOU8Mnw0KQ3pDnRz0SwTF/0m6JjTfU23gw=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-origami/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12123,6 +13152,7 @@ final: prev: {
       hash = "sha256-cVivuGzsG2bKfUBklyK7in0C8Xis0aO0pfyOuTol1mU=";
     };
     meta.homepage = "https://github.com/ojroques/nvim-osc52/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12136,6 +13166,7 @@ final: prev: {
       hash = "sha256-nRaS6ViO+fqg6cZiyNZhCrIpFC6Lnn5Rv2WjQTmR2uA=";
     };
     meta.homepage = "https://github.com/julienvincent/nvim-paredit/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12149,6 +13180,7 @@ final: prev: {
       hash = "sha256-hzm+VF669NpILT6P540PriXDuOCjPq3D7YKxLv5EsQU=";
     };
     meta.homepage = "https://github.com/gpanders/nvim-parinfer/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12162,6 +13194,7 @@ final: prev: {
       hash = "sha256-Xl+aLUkAtCMQE/3j7c8jtsdKdl72H0YoEzBZptkbG88=";
     };
     meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12175,6 +13208,7 @@ final: prev: {
       hash = "sha256-5VH1ffXvQuMDm32xt2t2UlEJiKuZWbkAMTXJic/8BYI=";
     };
     meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12188,6 +13222,7 @@ final: prev: {
       hash = "sha256-w+QQ+obgKedKMHh4MnM82Wh7n7mOGk86vmzr0GFNhDc=";
     };
     meta.homepage = "https://github.com/jamestthompson3/nvim-remote-containers/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12201,6 +13236,7 @@ final: prev: {
       hash = "sha256-/cpsfbIj9R1A6YWSx/nBYwuasy3pwMkAmguLeiJrWXY=";
     };
     meta.homepage = "https://github.com/olrtg/nvim-rename-state/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12214,6 +13250,7 @@ final: prev: {
       hash = "sha256-USvXVEWoDH72e0qxkVPmYU80n5NcnIr9Zaf1AuONoYo=";
     };
     meta.homepage = "https://github.com/duane9/nvim-rg/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12227,6 +13264,7 @@ final: prev: {
       hash = "sha256-ncpV8GBkS5lRg/bOMqOUAS0s6BQAaWeaT2/P12jxT+w=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12240,6 +13278,7 @@ final: prev: {
       hash = "sha256-uhNlLndXpLiU0qYvnnCepqqCp5eA+GRxq/aWJcRts+U=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12253,6 +13292,7 @@ final: prev: {
       hash = "sha256-g+gJp7noNdLKfvp+QbnTFE++PI3FcJG7reDenkg15k0=";
     };
     meta.homepage = "https://github.com/petertriho/nvim-scrollbar/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12266,6 +13306,7 @@ final: prev: {
       hash = "sha256-McUlWmCQiyCmGP+O9pgsvINeMgHuJp6lCpcvyP1NPs0=";
     };
     meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12279,6 +13320,7 @@ final: prev: {
       hash = "sha256-YMSgq7Y/BYUMFAm0NLergVBdmySTufypk48WEpORmBQ=";
     };
     meta.homepage = "https://github.com/s1n7ax/nvim-search-and-replace/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12292,6 +13334,21 @@ final: prev: {
       hash = "sha256-XiYn/L2e/B+6LTjak3jAwRgnZ3gCbsyA0J61Dd+jZv4=";
     };
     meta.homepage = "https://github.com/michaelrommel/nvim-silicon/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
+  nvim-sioyek-highlights = buildVimPlugin {
+    pname = "nvim-sioyek-highlights";
+    version = "0-unstable-2026-02-06";
+    src = fetchFromGitHub {
+      owner = "jbuck95";
+      repo = "nvim-sioyek-highlights";
+      rev = "b8ab0a71b24c052cebaed97afe376b01fba19bf0";
+      hash = "sha256-x2Q+96/YEky8fdy4CZ/QPwcLjaOLmwmtpWiYMnS657A=";
+    };
+    meta.homepage = "https://github.com/jbuck95/nvim-sioyek-highlights/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12305,6 +13362,7 @@ final: prev: {
       hash = "sha256-1DxKqZq8B9SjDIgXPNQrWlHYMgrkCYL1K7UiPn4u+ig=";
     };
     meta.homepage = "https://github.com/garymjr/nvim-snippets/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12318,6 +13376,7 @@ final: prev: {
       hash = "sha256-W0M1YWlQNUmeLxCOvNghY5txLNqNlp01IuSl+fkeA+I=";
     };
     meta.homepage = "https://github.com/dcampos/nvim-snippy/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12331,6 +13390,7 @@ final: prev: {
       hash = "sha256-0NABkr2d86Uq3OU4lbn2dyjRbwE3+5euqh1CA+MwDtQ=";
     };
     meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12344,6 +13404,7 @@ final: prev: {
       hash = "sha256-PkCZZuigHAAlGNcVD/bBTkGyZs9e3tgmnaDuPpKrBKM=";
     };
     meta.homepage = "https://github.com/prismatic-koi/nvim-sops/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12357,6 +13418,7 @@ final: prev: {
       hash = "sha256-2ZJV23CZ8B3x4DPHGuWnq84Jp3gLvyCARuyqtrZEOos=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12370,6 +13432,7 @@ final: prev: {
       hash = "sha256-0mVWE8YimHmJO/GbTZD0cIVgwwt/sd7odeM854k/dHw=";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12383,6 +13446,7 @@ final: prev: {
       hash = "sha256-pPpG/2ZbSYPLq5lvQXU1Nqt7rv2gcvx3Uukmje03v6s=";
     };
     meta.homepage = "https://github.com/svermeulen/nvim-teal-maker/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12396,6 +13460,7 @@ final: prev: {
       hash = "sha256-/dof+kvpx2ptWPyPUbgVlwpDeCprZCb7w5mPnYLWCiY=";
     };
     meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12409,32 +13474,35 @@ final: prev: {
       hash = "sha256-mMi07UbMWmC75DFfW1b+sR2uRPxizibFwS2qcN9rpLI=";
     };
     meta.homepage = "https://github.com/klen/nvim-test/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   nvim-tinygit = buildVimPlugin {
     pname = "nvim-tinygit";
-    version = "1.0-unstable-2026-04-13";
+    version = "1.0-unstable-2026-04-20";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-tinygit";
-      rev = "59b9a750a7a0710552829d2a1dfcaa5304433359";
-      hash = "sha256-/1NCsig8s554HtcSAdsfmPj+KkNNnIVNu7iBN8Vm04Q=";
+      rev = "f12990601dfa63c623049b470dc306ca905064c8";
+      hash = "sha256-NNdwBJjVlCwR3VzN7JRMhRRNHENRO9SXNnUUr4zZ8Eg=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "1.17.0-unstable-2026-04-16";
+    version = "1.17.0-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "d277467fc0d1d0e2bca88165a1de6b526f9f6fe8";
-      hash = "sha256-SRDO1680yNSSOYCLSp+TLiwim8NzFGNFyWY6yaaQVZU=";
+      rev = "24cfcc94372e526fd9e1c2803ede9e0f1715e33f";
+      hash = "sha256-WzCT4Z1gjZo1KL2g9NydT14mP/GlDWXpAsG7ILyW9EA=";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12448,6 +13516,7 @@ final: prev: {
       hash = "sha256-PQR6tFt4lCrAZNQG7BLMD1IiCKja9wDS1S4laGJf/HE=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12461,6 +13530,7 @@ final: prev: {
       hash = "sha256-K4o+iJY8+D0PRvRvXuBqX2q3fwxizAPp/FFpm0O0I9E=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12474,6 +13544,7 @@ final: prev: {
       hash = "sha256-5l2XF8/sk94IWAauP1VDh4ylLcR5gXnoWCT01TjmHBc=";
     };
     meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12487,6 +13558,7 @@ final: prev: {
       hash = "sha256-FLZ6h1M3Kc/YjOfKhn8nKLyVTySMMpsOL2MzIoAMEes=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-locals/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12500,6 +13572,7 @@ final: prev: {
       hash = "sha256-VHq7ohBDThkBwqUIEVBb4RujBkftu96DQe/y6l7egzM=";
     };
     meta.homepage = "https://github.com/theHamsta/nvim-treesitter-pairs/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12513,6 +13586,7 @@ final: prev: {
       hash = "sha256-kjFizTo+DHCi29PTrANfleiQDXDnitbW32a50FU380s=";
     };
     meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12526,6 +13600,7 @@ final: prev: {
       hash = "sha256-RrhTSBTPveHw4DNQTi3CP16LMtQUnGBQIYv7NKWZ69w=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12539,6 +13614,7 @@ final: prev: {
       hash = "sha256-ehpGvHnY28Ym55B7ituwcvZmGmLt1x92J5M+m8j1ytU=";
     };
     meta.homepage = "https://github.com/PaterJason/nvim-treesitter-sexp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12552,6 +13628,7 @@ final: prev: {
       hash = "sha256-fOpRElIwvsFWm4AwETx7fpC3RtdH2BpCfX4YHVitqw0=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12565,6 +13642,7 @@ final: prev: {
       hash = "sha256-lf+AwSu96iKO1vWWU2D7jWHGfjXkbX9R2CX3gMZaD4M=";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12578,6 +13656,7 @@ final: prev: {
       hash = "sha256-drFqgzbg1FY7h6ie01GJ9nvppkjd3LG5yyhYKtL54xY=";
     };
     meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12591,6 +13670,7 @@ final: prev: {
       hash = "sha256-gIF4M8SSGMOjlLSfSjq6trqFSxb7ulXzVFC5nkMHg4I=";
     };
     meta.homepage = "https://github.com/AckslD/nvim-trevJ.lua/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12604,6 +13684,7 @@ final: prev: {
       hash = "sha256-bvBf9wEDxdwlMGN29v4dEPexZGuxZZr7s+6xAOrDNKI=";
     };
     meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12617,6 +13698,7 @@ final: prev: {
       hash = "sha256-UsfhWgOJ+SpqyA8D6Pckq5w1n+qVjK51K0rXYQvjqMw=";
     };
     meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12630,6 +13712,7 @@ final: prev: {
       hash = "sha256-zISVDb+YwBr5aQ/LdACKJ62eAzvtYVFpon4uh5OjA3A=";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12643,6 +13726,7 @@ final: prev: {
       hash = "sha256-xaKMcgGI++yrNnmVa3h7ohLKTSkNolcr2zofuJgYRZo=";
     };
     meta.homepage = "https://github.com/samjwill/nvim-unception/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12656,6 +13740,7 @@ final: prev: {
       hash = "sha256-M5EAMy4pbrkYTcnqTex2Ym1lKeOCpBXYh7zgMKSkPKI=";
     };
     meta.homepage = "https://github.com/apyra/nvim-unity/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12669,6 +13754,7 @@ final: prev: {
       hash = "sha256-FZKW7/9Y6MRxEbd00HBt9eGpJWbAP8GNM6p8M9s/3ts=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12682,6 +13768,7 @@ final: prev: {
       hash = "sha256-vTNEpDcZxch4Pj4lotEB/eQLxXtvhgdaqYY+8YIirDE=";
     };
     meta.homepage = "https://github.com/yioneko/nvim-vtsls/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12695,6 +13782,7 @@ final: prev: {
       hash = "sha256-nRXq/4ipl7j/ITFgoXkWLv6GFQeYXWgql6bnzOJrcQk=";
     };
     meta.homepage = "https://github.com/AckslD/nvim-whichkey-setup.lua/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12708,6 +13796,7 @@ final: prev: {
       hash = "sha256-ZavIPpQXLSRpJXJVJZp3N6QWHoTKRvVrFAw7jekNmX4=";
     };
     meta.homepage = "https://github.com/s1n7ax/nvim-window-picker/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12721,6 +13810,7 @@ final: prev: {
       hash = "sha256-T8zKVbMDGNB7FCDtkzvku4qiei12bBD+2oaoUTkLsLU=";
     };
     meta.homepage = "https://github.com/roxma/nvim-yarp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12734,6 +13824,7 @@ final: prev: {
       hash = "sha256-ghpXrJgEN0CCCEXDsqe9G34KTGpAc0x8UhMQNmakp2c=";
     };
     meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12747,6 +13838,7 @@ final: prev: {
       hash = "sha256-6ipgRlBuHyf6DkN0gqsrvzYHPYy9VDxqVuWS+SCtkqg=";
     };
     meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12760,6 +13852,7 @@ final: prev: {
       hash = "sha256-/fc5XN3SDfIEsngSsQKIDdjNhnJr2l4iFVVKoHYd0F4=";
     };
     meta.homepage = "https://github.com/zbirenbaum/nvterm/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12773,6 +13866,7 @@ final: prev: {
       hash = "sha256-4GfQ6Mo32rsoQAXKZF9Bpnm/sms2hfbrTldpLp5ySoY=";
     };
     meta.homepage = "https://github.com/nvzone/menu/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12786,6 +13880,7 @@ final: prev: {
       hash = "sha256-jdz0cR1uz1EdxFCuxndsK9gyTZ2jg8wdYA0v33SevOg=";
     };
     meta.homepage = "https://github.com/nvzone/minty/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12799,6 +13894,7 @@ final: prev: {
       hash = "sha256-PNkoz91RmlZnRrdStAz5b7pGaWv27UOQU/9abYNP/5E=";
     };
     meta.homepage = "https://github.com/nvzone/typr/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12812,19 +13908,21 @@ final: prev: {
       hash = "sha256-5Xao1+QXZOvqwCXL6zWpckJPO1LDb8I7wtikMRFQ3Jk=";
     };
     meta.homepage = "https://github.com/nvzone/volt/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
   obsidian-nvim = buildVimPlugin {
     pname = "obsidian.nvim";
-    version = "3.16.2-unstable-2026-04-18";
+    version = "3.16.2-unstable-2026-04-22";
     src = fetchFromGitHub {
       owner = "obsidian-nvim";
       repo = "obsidian.nvim";
-      rev = "d6c0e5bc30937df0657c9953d135d0ebb3af7e00";
-      hash = "sha256-ZFFtVH/NswfManJ+o5x3oLhy/foQzmVj29O7UEBVkMs=";
+      rev = "af9857e4993e0adddb897f09c2805b44a0d913ea";
+      hash = "sha256-zajt8vt/bLMCqgSgjMj/MiUFTU3TNAnr25YM+J+qg2M=";
     };
     meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12838,6 +13936,7 @@ final: prev: {
       hash = "sha256-atRXtqMIhsmwR1INrhbFsywWAgLTbT9bz/LLfcN4Lfg=";
     };
     meta.homepage = "https://github.com/tarides/ocaml.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12851,6 +13950,7 @@ final: prev: {
       hash = "sha256-95D6I9EqtTJdGI4jgljNuzs1sDjHEILiTc6NKMOlfow=";
     };
     meta.homepage = "https://github.com/nvimdev/oceanic-material/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12864,19 +13964,21 @@ final: prev: {
       hash = "sha256-f5isbjoGMsLlzWkxQAU2an4lwEiIPuXKAZGyezZlv/M=";
     };
     meta.homepage = "https://github.com/mhartington/oceanic-next/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "0-unstable-2026-04-16";
+    version = "0-unstable-2026-04-24";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "65550fa020775fb18e6eacab86b80145560bfd9c";
-      hash = "sha256-VUm7BQ5g4VyKWAZTOhxt19JAea+DLrMltt01jbO6LUg=";
+      rev = "34e67cc2d247e9b9271e2b54baeb6d4f6d1035bb";
+      hash = "sha256-rwOQs1l7j+GvbaJ1Vj42HE+lWcZrFKfTqDcvuACCDgE=";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12890,6 +13992,7 @@ final: prev: {
       hash = "sha256-5pC1ozSetRt+Jk9nWc8n9t0QSRi5Xn70YtCjADTzl5k=";
     };
     meta.homepage = "https://github.com/benomahony/oil-git.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12903,6 +14006,7 @@ final: prev: {
       hash = "sha256-1jdK1ZpdWEJrY1P/GOTTNSi+v7VUsN8BwLyTgiBBpOc=";
     };
     meta.homepage = "https://github.com/refractalize/oil-git-status.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12916,6 +14020,7 @@ final: prev: {
       hash = "sha256-IK1HhHbCI6qLgIuAciox3E43Cn4Cq2QHeRjd8l5NMnE=";
     };
     meta.homepage = "https://github.com/JezerM/oil-lsp-diagnostics.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12929,6 +14034,7 @@ final: prev: {
       hash = "sha256-zAPPMQyG8ys4ezoMDZYZzbiHc20TZrFjAiIwsIiIQN0=";
     };
     meta.homepage = "https://github.com/eero-lehtinen/oklch-color-picker.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12942,6 +14048,7 @@ final: prev: {
       hash = "sha256-8tW5tp2GiYw+PnR7rqiKfykLW/yqvGOtqauZCgEeQCg=";
     };
     meta.homepage = "https://github.com/nomnivore/ollama.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12955,19 +14062,21 @@ final: prev: {
       hash = "sha256-vb5qXvS2g5nWr5yGULbsUGdPLc0ckTJuP8WT7cXCY1U=";
     };
     meta.homepage = "https://github.com/yonlu/omni.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   omnisharp-extended-lsp-nvim = buildVimPlugin {
     pname = "omnisharp-extended-lsp.nvim";
-    version = "0-unstable-2025-10-07";
+    version = "0-unstable-2026-04-26";
     src = fetchFromGitHub {
       owner = "Hoffs";
       repo = "omnisharp-extended-lsp.nvim";
-      rev = "a47388e5417e7f1cfa6962cc441a23c4c5fb2151";
-      hash = "sha256-0cRngH9BFuBbEu7007Xqr5zVJSBUowni7jxaMxGwnzU=";
+      rev = "51e407a46ddb15e49727139b5b1ae3650cd6a069";
+      hash = "sha256-g7f0A6spV7blMHtiX4PP76Z6uB18R/f+p2nOdUeMGG0=";
     };
     meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -12981,6 +14090,7 @@ final: prev: {
       hash = "sha256-O6dp/CPt+v6mvdMhTKd03Dybswe+iqaH8FLomukeT6o=";
     };
     meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -12994,6 +14104,7 @@ final: prev: {
       hash = "sha256-IqyNgMf8hH2KpRY8gTrqREMCZwMNfDRdH/joqhGhjxI=";
     };
     meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13007,6 +14118,7 @@ final: prev: {
       hash = "sha256-qOKXR/qfm3GsPSw0A5HOxvBaWJEUkelCcJJYHFFW8zc=";
     };
     meta.homepage = "https://github.com/navarasu/onedark.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13020,6 +14132,7 @@ final: prev: {
       hash = "sha256-vb2wGkul/NAjeV4zcpI3e9ozd9YI1LbwK85tq+hTcLA=";
     };
     meta.homepage = "https://github.com/joshdick/onedark.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13033,6 +14146,7 @@ final: prev: {
       hash = "sha256-DJGrRkELm3QkH7tZXNNfo/4IXLr7r0vnevzPGG/1K4g=";
     };
     meta.homepage = "https://github.com/LunarVim/onedarker.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13046,6 +14160,7 @@ final: prev: {
       hash = "sha256-14SzvqMvcYlyIyXHUzzrdrZE9GMeFT2rEulQTX9e2oQ=";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13059,6 +14174,7 @@ final: prev: {
       hash = "sha256-F5gbDtGD2QBDGZOjr/OCJJlyQgxvQTsy8IoNNAjnDzQ=";
     };
     meta.homepage = "https://github.com/sonph/onehalf/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13072,6 +14188,7 @@ final: prev: {
       hash = "sha256-IjY0QUfe122oT+bQd0/iE7ZoRK59WUWrUSRgIKOvN2M=";
     };
     meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13085,6 +14202,7 @@ final: prev: {
       hash = "sha256-nsYbsuUplc8Fye+exMo7GGLYbAbean/tGqxNJR+Awlg=";
     };
     meta.homepage = "https://github.com/tyru/open-browser-github.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13098,19 +14216,21 @@ final: prev: {
       hash = "sha256-9QZgTv8W0BFlF0lsH1BPPAzjD6iXWXHXZf2zpouQH2s=";
     };
     meta.homepage = "https://github.com/tyru/open-browser.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "0.7.0";
+    version = "0.8.0";
     src = fetchFromGitHub {
       owner = "nickjvandyke";
       repo = "opencode.nvim";
-      tag = "v0.7.0";
-      hash = "sha256-A9uhcU1Wm4yDnaON8j6KVe7ahdKIkzW3cZwZK93RNew=";
+      tag = "v0.8.0";
+      hash = "sha256-w17WExduvXd063RO/a9pY0Gb/nCjxFr5LLCgItuQ4oY=";
     };
     meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13124,6 +14244,7 @@ final: prev: {
       hash = "sha256-/FlNLWOSIrOYiWzAcgOdu9//QTorCDV1KWb+h6eqLwk=";
     };
     meta.homepage = "https://github.com/Almo7aya/openingh.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13137,6 +14258,7 @@ final: prev: {
       hash = "sha256-xmc9/g+tCWX8H1hm2BlKQsJKOUBCMQOFb7X0aKFMVoE=";
     };
     meta.homepage = "https://github.com/salkin-mada/openscad.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13150,6 +14272,7 @@ final: prev: {
       hash = "sha256-GD+fQcnlsXMRge5Eo03m+RNVbV5iTFiOfdJ/i6t6rFc=";
     };
     meta.homepage = "https://github.com/bitbloxhub/org-notebook.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "ISC";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13163,6 +14286,7 @@ final: prev: {
       hash = "sha256-K0OnM7PdTT4ypL0IAVWb9R83SDIhgko8j4KBzIkJJNM=";
     };
     meta.homepage = "https://github.com/chipsenkbeil/org-roam.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13176,6 +14300,7 @@ final: prev: {
       hash = "sha256-OZqpCpgbo5ULYTtthCIS/3Hs4k+dVOVkY2dKxQ1KF24=";
     };
     meta.homepage = "https://github.com/rgroli/other.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13189,6 +14314,7 @@ final: prev: {
       hash = "sha256-kTDFzud+Kx3YAI36QhEi+WjVkB6Owao7PdUBX3mLXKw=";
     };
     meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13202,6 +14328,7 @@ final: prev: {
       hash = "sha256-xKu05IgOpgtt2W+WqXuTUjX66ffDrU8BDi8z7M6M1q4=";
     };
     meta.homepage = "https://github.com/hedyhli/outline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13216,6 +14343,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/overseer.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13229,6 +14357,7 @@ final: prev: {
       hash = "sha256-OdcKcS6dJbbqNT0kvexXjDOWAWyFcrp8NlVBlT0msVg=";
     };
     meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13242,6 +14371,7 @@ final: prev: {
       hash = "sha256-KCA7E766yRnV7XMrcwwpe7m1/pgiqecKtCWVtAlfGfU=";
     };
     meta.homepage = "https://github.com/vuki656/package-info.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13255,6 +14385,7 @@ final: prev: {
       hash = "sha256-fLM+ptjMd1YNoJQEI0vvr4sjaay7dfpaGhvWUy91d1M=";
     };
     meta.homepage = "https://github.com/wbthomason/packer.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13268,6 +14399,7 @@ final: prev: {
       hash = "sha256-3zgTux85/9lttmIik+IVUJhXbwJCo4SRJDAD8g6tv1U=";
     };
     meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13281,6 +14413,7 @@ final: prev: {
       hash = "sha256-ZSrDK8pOcZ/n/vuQd80JcKr2XJMQLf8tgbpzmuGKbus=";
     };
     meta.homepage = "https://github.com/JoosepAlviste/palenightfall.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13294,6 +14427,7 @@ final: prev: {
       hash = "sha256-gCyDl+2fDa5CPpibxQnp+pJSkyRl0r03Sh3+IXIoQIQ=";
     };
     meta.homepage = "https://github.com/roobert/palette.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13307,6 +14441,7 @@ final: prev: {
       hash = "sha256-JXB6hQgvJ3VfSY/tnSlZd7CRtts7l/hfTCeTmOkp0vA=";
     };
     meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13320,6 +14455,7 @@ final: prev: {
       hash = "sha256-aQhqJthjUBLXESbtPZBpBZoQpRGTpKldL8uEqa+uHpk=";
     };
     meta.homepage = "https://github.com/pappasam/papercolor-theme-slim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13333,6 +14469,7 @@ final: prev: {
       hash = "sha256-H7cuzjSTimzWYDSDAs6CnhivAoEzU0E+QgrFBzXBwCc=";
     };
     meta.homepage = "https://github.com/dundalek/parpar.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13346,6 +14483,7 @@ final: prev: {
       hash = "sha256-xXrjfZQOzqXfm0vq1eQjwjyMxQMSrzF3CNBBd3LgG9Y=";
     };
     meta.homepage = "https://github.com/frankroeder/parrot.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13359,6 +14497,7 @@ final: prev: {
       hash = "sha256-xiDjkM/SScDFqkUoyznO5ECvEebiXwcx0EsHRsMj4Rw=";
     };
     meta.homepage = "https://github.com/OXY2DEV/patterns.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13372,6 +14511,7 @@ final: prev: {
       hash = "sha256-u/Mmu/zFX4T6zaFKdMvn2jpkTbgxSjwGK7bmV/1fROQ=";
     };
     meta.homepage = "https://github.com/lewis6991/pckr.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13385,6 +14525,7 @@ final: prev: {
       hash = "sha256-QCiXDle4EN1amUP8fTjN5le2b7qV+ETuY1ywZAXTTO4=";
     };
     meta.homepage = "https://github.com/tmsvg/pear-tree/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13398,6 +14539,7 @@ final: prev: {
       hash = "sha256-Tw3tPJNGuK3pqEIgGoKIwV/j9txYXVWv2NJMs807bxI=";
     };
     meta.homepage = "https://github.com/steelsojka/pears.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13411,6 +14553,7 @@ final: prev: {
       hash = "sha256-hGIPxHwTSXTHFJ3JiVATMjEmoFhZ87fWElj1AMPMbQU=";
     };
     meta.homepage = "https://github.com/toppair/peek.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13424,6 +14567,7 @@ final: prev: {
       hash = "sha256-UUj2Bnbr8y1UCOzu2ZfX4dq7KwqBj8r8PKaDCRbgEJc=";
     };
     meta.homepage = "https://github.com/t-troebst/perfanno.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13437,6 +14581,7 @@ final: prev: {
       hash = "sha256-L9gCb+Dg8ox+WoidCxmMgJnfgWFAJyphN5INHCtEXuQ=";
     };
     meta.homepage = "https://github.com/olimorris/persisted.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13450,6 +14595,7 @@ final: prev: {
       hash = "sha256-ACuDEp4MNiP2X2LnsEjVWmajedXdCQ9gg/EK55YF7uM=";
     };
     meta.homepage = "https://github.com/folke/persistence.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13463,6 +14609,7 @@ final: prev: {
       hash = "sha256-7ZWNRyVAbQuM/y3jFuZ5QfmvI+pT4Jmo5kW2HwjDS1Y=";
     };
     meta.homepage = "https://github.com/Weissle/persistent-breakpoints.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13476,6 +14623,7 @@ final: prev: {
       hash = "sha256-rcpTLh4DUo27zv9uQo7buN2bb8QQcTkAO6AI/zhJ6mk=";
     };
     meta.homepage = "https://github.com/pest-parser/pest.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13489,6 +14637,7 @@ final: prev: {
       hash = "sha256-QfmHOm6UNnRb2gXvv5bcBAxIloOn/psO3E3BK3F0Va4=";
     };
     meta.homepage = "https://github.com/lifepillar/pgsql.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13502,19 +14651,21 @@ final: prev: {
       hash = "sha256-ee13G+e3BWUhz/4fzap1UcSP77gLOx3P+otMrsIiloM=";
     };
     meta.homepage = "https://github.com/phha/zenburn.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   pi-nvim = buildVimPlugin {
     pname = "pi.nvim";
-    version = "0-unstable-2026-03-26";
+    version = "0-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "pablopunk";
       repo = "pi.nvim";
-      rev = "cc2377f88c99871bc44b45490ef9d91a5d1c31e1";
-      hash = "sha256-xguHPNrQ16ddWbnxR38Zm6gtDP63b93pxR4bsbN9YZE=";
+      rev = "6e86a704ed6ff488fda78b64f4e564d6ee620785";
+      hash = "sha256-o5S7x1VWWQ2BnhthbVMndC2w4fnjc1h41gP/HUv4TV4=";
     };
     meta.homepage = "https://github.com/pablopunk/pi.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13528,6 +14679,7 @@ final: prev: {
       hash = "sha256-m1mP+gsse+J2pYhZDbRerUI9oboMmJbMkvRfqodC5Cs=";
     };
     meta.homepage = "https://github.com/motus/pig.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13541,6 +14693,7 @@ final: prev: {
       hash = "sha256-DdTTiq0DVSny2kTurkcUVTdyubPSAA7tfzz3UPdbd9s=";
     };
     meta.homepage = "https://github.com/goropikari/plantuml.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13554,6 +14707,7 @@ final: prev: {
       hash = "sha256-l1U/PNuEOZNCJwbvP9pgSyK5NRhKQEm0HIApQw62UzU=";
     };
     meta.homepage = "https://github.com/weirongxu/plantuml-previewer.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13567,6 +14721,7 @@ final: prev: {
       hash = "sha256-qmo5xI7Vugtsbl95RW2Pnu6cDei1Xz7Pq06HrrwPpI4=";
     };
     meta.homepage = "https://github.com/aklt/plantuml-syntax/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Vim";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13580,6 +14735,7 @@ final: prev: {
       hash = "sha256-c0c0Q1W9Nfen9jYiDUISSlCHOY+XJuNPiBCOw4masUs=";
     };
     meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13593,6 +14749,7 @@ final: prev: {
       hash = "sha256-tJ2TrypKnCnQm+6FDjX0KDr+UNoBBVvGIm+uWJtpNLc=";
     };
     meta.homepage = "https://github.com/epwalsh/pomo.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13606,6 +14763,7 @@ final: prev: {
       hash = "sha256-eWqZ1KAnEf6m2iVy9x6vk5fP2cwzJ8/RbiXVCVPaVGQ=";
     };
     meta.homepage = "https://github.com/dleonard0/pony-vim-syntax/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13620,6 +14778,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/RishabhRD/popfix/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13633,6 +14792,7 @@ final: prev: {
       hash = "sha256-dNWz/xovUg55fDZUpVs/2kLphk3lqQyvPtc9ATwbeSQ=";
     };
     meta.homepage = "https://github.com/nvim-lua/popup.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13646,6 +14806,7 @@ final: prev: {
       hash = "sha256-AcBZ3by3ONZBDuY2jpfDZSutwotlh+YHA7SgCJEmrzo=";
     };
     meta.homepage = "https://github.com/tris203/precognition.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13659,6 +14820,7 @@ final: prev: {
       hash = "sha256-ZpsunLsn//zYgUtmAm5FqKVueVd/Pa1r55ZDqxCimBk=";
     };
     meta.homepage = "https://github.com/andweeb/presence.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13672,6 +14834,7 @@ final: prev: {
       hash = "sha256-ZxxN149hohgZqf/5gvQSKc87CAtc9PXq/5ypOGHtUm0=";
     };
     meta.homepage = "https://github.com/sotte/presenting.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13685,6 +14848,7 @@ final: prev: {
       hash = "sha256-5TfSgEiMJJG1ZfCeAULcfKpunbvxkas75cfLaiM1OtE=";
     };
     meta.homepage = "https://github.com/ewilazarus/preto/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13698,6 +14862,7 @@ final: prev: {
       hash = "sha256-PQPZw0qXwMtpVE4uSxR3xUvkHE9iG4T+ZwgV6H9pUjo=";
     };
     meta.homepage = "https://github.com/anuvyklack/pretty-fold.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13711,19 +14876,21 @@ final: prev: {
       hash = "sha256-Bvp8EJnOazXfCNK8emE7LKUeT3xPNyrIIUgdNh1vuA8=";
     };
     meta.homepage = "https://github.com/vim-scripts/prev_indent/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "3.1.0-1";
+    version = "3.3.1-1";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      tag = "v3.1.0-1";
-      hash = "sha256-i3nGUb/tULq28MmiYk3C4P+FoVFSZaaO5XWx4kuTa0I=";
+      tag = "v3.3.1-1";
+      hash = "sha256-AT1Yfw6QyL+GKNicItK1oD1mQyCqH8CyyIm9LQtG0Ic=";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13737,6 +14904,7 @@ final: prev: {
       hash = "sha256-vkxiM+65k4/iAV2Y+FkFJpnB8/hArGA061JPNENjkvo=";
     };
     meta.homepage = "https://github.com/GnikDroy/projections.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13750,6 +14918,7 @@ final: prev: {
       hash = "sha256-9eM66brPjiFlY64vmBetRYrKnpDyN7+/URMm4GsGimA=";
     };
     meta.homepage = "https://github.com/kevinhwang91/promise-async/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13763,6 +14932,7 @@ final: prev: {
       hash = "sha256-oLI5GWhC1bWF8NPuHi3ZSho2f138JOsJxytdmdHP6eg=";
     };
     meta.homepage = "https://github.com/frigoeu/psc-ide-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13776,6 +14946,7 @@ final: prev: {
       hash = "sha256-wa1i0gqOUK3SAT5NVZypDSGAHX3kvybntX9C5I2zRm8=";
     };
     meta.homepage = "https://github.com/Shougo/pum.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13789,6 +14960,7 @@ final: prev: {
       hash = "sha256-IrPiiDghh5qdeaTM6M4oRzay+LvqL3sdoiM2m89O4pA=";
     };
     meta.homepage = "https://github.com/purescript-contrib/purescript-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13803,6 +14975,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/python-mode/python-mode/";
+    meta.license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13816,6 +14989,7 @@ final: prev: {
       hash = "sha256-BQjf67ah68c2+ASedWl2cbE98gR4PxWQvhoum4tonvA=";
     };
     meta.homepage = "https://github.com/vim-python/python-syntax/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13829,6 +15003,7 @@ final: prev: {
       hash = "sha256-JGz/JHxXWVi74LDJWlQfj6BxcTny0V2RYTEOxNWyjgI=";
     };
     meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13842,6 +15017,7 @@ final: prev: {
       hash = "sha256-uNToBV6iYuRrWsd7Rs2Q/4VZ/mgmg7PipIVO2YVMqBE=";
     };
     meta.homepage = "https://github.com/marcelbeumer/qfctl.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13855,19 +15031,21 @@ final: prev: {
       hash = "sha256-qqSEH2XyYjY8OsOjIMVuf85nFG3TgVquNGMhq7Hp2g0=";
     };
     meta.homepage = "https://github.com/codethread/qmk.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   quarto-nvim = buildVimPlugin {
     pname = "quarto-nvim";
-    version = "2.0.1-unstable-2026-01-29";
+    version = "2.1.0";
     src = fetchFromGitHub {
       owner = "quarto-dev";
       repo = "quarto-nvim";
-      rev = "d923bb7cfc2bde41143e1c531c28190f0fade3a2";
-      hash = "sha256-UGrbQtmJIQsOb37/IcrFxGnAfIiCHGsmMFFSkitNK9o=";
+      tag = "v2.1.0";
+      hash = "sha256-YgRiUnZ1MH5uuwNC3V9ZntphuKH3rIOlcdp+5C4zonk=";
     };
     meta.homepage = "https://github.com/quarto-dev/quarto-nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13881,6 +15059,7 @@ final: prev: {
       hash = "sha256-fOS+ia+sZAK5Ctzp0E7dgLSAVgcSZPLtXDsfZrmPaLA=";
     };
     meta.homepage = "https://github.com/unblevable/quick-scope/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13894,6 +15073,7 @@ final: prev: {
       hash = "sha256-ldKDPSzv3QTZbeesRRZbHynESlrZSogdDP+zUq5mPzA=";
     };
     meta.homepage = "https://github.com/stevearc/quicker.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13907,6 +15087,7 @@ final: prev: {
       hash = "sha256-PofmAwx2wQkZtIFtD7G9G3SgjwziZHpYNuORMvTco2Y=";
     };
     meta.homepage = "https://github.com/stefandtw/quickfix-reflector.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13920,6 +15101,7 @@ final: prev: {
       hash = "sha256-e2gx1docI9lfMVjGfkN20ywvYqsuMNAtPz4U3P2GfZs=";
     };
     meta.homepage = "https://github.com/dannyob/quickfixstatus/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13933,6 +15115,7 @@ final: prev: {
       hash = "sha256-uShIzazgemL+8ir3aJSfUijJzORvZsX/l/NFulBVIgU=";
     };
     meta.homepage = "https://github.com/jbyuki/quickmath.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13946,6 +15129,7 @@ final: prev: {
       hash = "sha256-dBHgAc3dOoeBI/lZzIJgYYTda8ZMvdThixUZebZXRHE=";
     };
     meta.homepage = "https://github.com/luochen1990/rainbow/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13958,6 +15142,7 @@ final: prev: {
       hash = "sha256-mXuANXeUUltbaE7kPi1PeREUXR+I3EdPzLgPw3gfyX8=";
     };
     meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13971,6 +15156,7 @@ final: prev: {
       hash = "sha256-Zf9VdRu/OF9h4AffOSAdM/Ypnla2wUp/iho3CV2YsH0=";
     };
     meta.homepage = "https://github.com/mechatroner/rainbow_csv/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -13984,6 +15170,7 @@ final: prev: {
       hash = "sha256-R5daQm0G9BgRiCaR2KUfMrxy9ZBHftUrKYZgSGskiOM=";
     };
     meta.homepage = "https://github.com/kien/rainbow_parentheses.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -13997,6 +15184,7 @@ final: prev: {
       hash = "sha256-Vx9O0KLYxm0cFQKfuBKoS1UijQfNLku7xzozSTAT/tM=";
     };
     meta.homepage = "https://github.com/vim-scripts/random.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14010,6 +15198,7 @@ final: prev: {
       hash = "sha256-CX12yrg2PyUhcCY8VqsSXZ6YQNA0ANRcYhroTb/WRWU=";
     };
     meta.homepage = "https://github.com/winston0410/range-highlight.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14023,6 +15212,7 @@ final: prev: {
       hash = "sha256-rqZjtPAAWaSavPCNtBI7vm627ZyffJOQ2Qs32M9uz3I=";
     };
     meta.homepage = "https://github.com/kelly-lin/ranger.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14036,6 +15226,7 @@ final: prev: {
       hash = "sha256-oTLZJNNTwbDBMLEH9jMVylXVwUrswtp4J9PB1anZ3+U=";
     };
     meta.homepage = "https://github.com/rafaqz/ranger.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "WTFPL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14049,6 +15240,7 @@ final: prev: {
       hash = "sha256-kA2tt8mm6baPU//uij8Vnl60P/eDKmYt1JKOILB8RjY=";
     };
     meta.homepage = "https://github.com/vim-scripts/rcshell.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14062,19 +15254,21 @@ final: prev: {
       hash = "sha256-+PBYi3DnkPcNBg59nXLUTqkgxUpQZ2Sxl1juHz10ZkI=";
     };
     meta.homepage = "https://github.com/ryvnf/readline.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   refactoring-nvim = buildVimPlugin {
     pname = "refactoring.nvim";
-    version = "0-unstable-2025-10-21";
+    version = "0-unstable-2026-04-30";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "6784b54587e6d8a6b9ea199318512170ffb9e418";
-      hash = "sha256-KFn1f0Va6eFbeOYxc40lN1iWL8WAwnm/H5l46o4JgvI=";
+      rev = "f75049d4564d96f66dc3cd79207d0ad6ea42c668";
+      hash = "sha256-Y0nVzrJTbtT5Su2LUVaYtFrxiIAW4tj+9HLDH9R0LQ4=";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14088,19 +15282,7 @@ final: prev: {
       hash = "sha256-dK3yUdR7HjAr6LxaNpcNPnEHz/18nmf91X85dcjOOE0=";
     };
     meta.homepage = "https://github.com/mawkler/refjump.nvim/";
-    meta.hydraPlatforms = [ ];
-  };
-
-  registers-nvim = buildVimPlugin {
-    pname = "registers.nvim";
-    version = "2.3.0-unstable-2024-11-05";
-    src = fetchFromGitHub {
-      owner = "tversteeg";
-      repo = "registers.nvim";
-      rev = "c217f8f369e0886776cda6c94eab839b30a8940d";
-      hash = "sha256-M7uR3yXYUQ4I8Gt8P6k25q67UNwksRDPKGrS/FCqrt0=";
-    };
-    meta.homepage = "https://github.com/tversteeg/registers.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14114,6 +15296,7 @@ final: prev: {
       hash = "sha256-kJABTjY6p+wFlNZ9VLmK5LvusHcbD/0aaZP6yOpR1Zc=";
     };
     meta.homepage = "https://github.com/vladdoster/remember.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14127,6 +15310,7 @@ final: prev: {
       hash = "sha256-weTaxA5M8dpx4sIKKYqHkTy0/ZoINjZ/VqAbs2FYfus=";
     };
     meta.homepage = "https://github.com/amitds1997/remote-nvim.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14140,6 +15324,7 @@ final: prev: {
       hash = "sha256-ca6DcLR/6HTRdJCinnQWE52VMDxY82cRSqJ7uJFbp9w=";
     };
     meta.homepage = "https://github.com/nosduco/remote-sshfs.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14153,19 +15338,21 @@ final: prev: {
       hash = "sha256-Nz36OESAcLqaNs4kDOIdrdAFvfiUPzUP8scvJpcPAa4=";
     };
     meta.homepage = "https://github.com/filipdutescu/renamer.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "8.12.0-unstable-2026-04-12";
+    version = "8.12.0-unstable-2026-04-26";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "0fd43fb4b1f073931c4b481f5f3b7cea3749e190";
-      hash = "sha256-wCzOiTKJ8F2Fj82LYRSoG1Ix0KDBSdQokzNGVmbu2oo=";
+      rev = "3f3eea97b80839f629c951ca660ffd125bfa5b34";
+      hash = "sha256-dh4gBQVRTa1DgOvKN8NFMQ9e1E8rbrkTvlJH9nN9S6Y=";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14179,6 +15366,7 @@ final: prev: {
       hash = "sha256-pY0BiclthomTdgJeBFmeVStRFexgsA5V1MU+YGL0OmI=";
     };
     meta.homepage = "https://github.com/gabrielpoca/replacer.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14192,6 +15380,7 @@ final: prev: {
       hash = "sha256-ykCswLzq38tO0GE4IB0dT3g239qkKpoW+d27sCorR90=";
     };
     meta.homepage = "https://github.com/9seconds/repolink.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14206,6 +15395,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/resession.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14219,6 +15409,7 @@ final: prev: {
       hash = "sha256-dhGaGq6Vq4BcIQtbt9+9EnFYcdpQISdaHjIupt/SsM4=";
     };
     meta.homepage = "https://github.com/vim-scripts/restore_view.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14232,6 +15423,7 @@ final: prev: {
       hash = "sha256-KCwTRLvF1th6o6kjxtUc0S19Qb9yg8xr0kKG4v4n7Tc=";
     };
     meta.homepage = "https://github.com/gu-fan/riv.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14245,6 +15437,7 @@ final: prev: {
       hash = "sha256-oKnJYSG9Ij6Nq9RNoLvSKdVUP/Q/bwcACIBq5YVC50A=";
     };
     meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14258,6 +15451,7 @@ final: prev: {
       hash = "sha256-TZUtQLZWyWGkjEk0TmoQe7INAMvJt4GFPCo4g3NhKiQ=";
     };
     meta.homepage = "https://github.com/mfukar/robotframework-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14271,32 +15465,35 @@ final: prev: {
       hash = "sha256-8/xJmymtVGVz2avzlamgK1cNflZ3NRL+B3c7xxbI964=";
     };
     meta.homepage = "https://github.com/ron-rs/ron.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   rose-pine = buildVimPlugin {
     pname = "rose-pine";
-    version = "3.0.2-unstable-2026-04-09";
+    version = "3.0.2-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "rose-pine";
       repo = "neovim";
-      rev = "9504524e5ed0e326534698f637f9d038ba4cd0ee";
-      hash = "sha256-e481yg0oMqY4PTEZwK1CbcJIsXN6YfBixFhx2Ab0mFg=";
+      rev = "6a961effd67f6130d36df6d1c05c48c739796dd2";
+      hash = "sha256-Jf5jycFdPGugGjGH36owtD+27qptBDjADiam2KxQ/L4=";
     };
     meta.homepage = "https://github.com/rose-pine/neovim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "0-unstable-2026-04-16";
+    version = "0-unstable-2026-04-21";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "6a5e60a7c25d9ce0835aa9c69379f1c92e0a9d56";
-      hash = "sha256-Zoi5RxWJY96C4D3k9iwU2XJb8LKUFCdq5SDHWrfa5vw=";
+      rev = "b62d1a588765f0aa1b46ed260252c9e456408835";
+      hash = "sha256-j5+Kg4B1flk4TwkZKRDW7tHbaoUyE5dKGypXsd9+qSw=";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14310,6 +15507,7 @@ final: prev: {
       hash = "sha256-3xxQzaQa/en21TQsqF8ruunpuIKlyqTLhBSnAeZShRA=";
     };
     meta.homepage = "https://github.com/keith/rspec.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14323,6 +15521,7 @@ final: prev: {
       hash = "sha256-f9VEXT3bG4ESYpGGwUDONgL/Lsq4IToZEwaZyC2vG+4=";
     };
     meta.homepage = "https://github.com/ccarpita/rtorrent-syntax-file/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14336,6 +15535,7 @@ final: prev: {
       hash = "sha256-EqWwQ/8BAC7RdS0mowxOtcJoGFu7YD/XrKSAbjQtHTg=";
     };
     meta.homepage = "https://github.com/TheLazyCat00/runner-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14349,6 +15549,7 @@ final: prev: {
       hash = "sha256-kFane5ze7VDiOzF7jdmXkr50XQsNvdb+a9HQtybEVE0=";
     };
     meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14362,6 +15563,7 @@ final: prev: {
       hash = "sha256-70kp644jOtJ4wguty/SUFX+YEsoxW12LGg3vZh7BdPY=";
     };
     meta.homepage = "https://github.com/rust-lang/rust.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14375,6 +15577,7 @@ final: prev: {
       hash = "sha256-HaAwc1MyYq4YpxgtnknaZ3VJfk65tGxkCm0zp6cs/0c=";
     };
     meta.homepage = "https://github.com/tris203/rzls.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14388,6 +15591,7 @@ final: prev: {
       hash = "sha256-xC7c35ShtElmO9CPnYDH1MDOzpK4yXJZFgybNW62fYY=";
     };
     meta.homepage = "https://github.com/hauleth/sad.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14401,6 +15605,7 @@ final: prev: {
       hash = "sha256-hImYKeuOhz1mjj8EkPXPCVn4gmMDvWb4rJp1lOhd6WQ=";
     };
     meta.homepage = "https://github.com/vmware-archive/salt-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14414,6 +15619,7 @@ final: prev: {
       hash = "sha256-ptAiiRT+eEPE08Erkjo7Y6tOaJ47+Hzrfbu+eBjtrmg=";
     };
     meta.homepage = "https://github.com/samodostal/image.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14427,6 +15633,7 @@ final: prev: {
       hash = "sha256-s6AaO2hO+7ha0G6lyOENdKZZrnYak2OHJSgc/jtLMuE=";
     };
     meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14440,19 +15647,21 @@ final: prev: {
       hash = "sha256-NpucvX0HBCu779Uk6qwBnjEp2RP6djlk6+GL+kGTlgM=";
     };
     meta.homepage = "https://github.com/cenk1cenk2/schema-companion.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   scnvim = buildVimPlugin {
     pname = "scnvim";
-    version = "0-unstable-2026-04-13";
+    version = "0-unstable-2026-04-20";
     src = fetchFromGitHub {
       owner = "davidgranstrom";
       repo = "scnvim";
-      rev = "7e0ff9ed57c58dfde0341d1e695fe54a0904e2d8";
-      hash = "sha256-PaIYXaPtwen/SWdLADsJDx7NI/OoTAjUa24AZYJyNBA=";
+      rev = "ec347b24168ac922de4dcddc181efd2fcdcfa0d0";
+      hash = "sha256-cqZF3b+DkOQUOSU502vGQx8RNzH4b97B9zqHO9v8IBI=";
     };
     meta.homepage = "https://github.com/davidgranstrom/scnvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14466,6 +15675,7 @@ final: prev: {
       hash = "sha256-HsXeGF1eSZ4wjvkzeIGmjBr0/tv3QIXT7cvbW8p+ESI=";
     };
     meta.homepage = "https://github.com/tiagovla/scope.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14479,6 +15689,7 @@ final: prev: {
       hash = "sha256-4eiGIhy/J7wZm++wMx4zAKp5qeDQCApwPSVm8P5w5O0=";
     };
     meta.homepage = "https://github.com/Root-lee/screensaver.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14492,6 +15703,7 @@ final: prev: {
       hash = "sha256-KrQndfxx0H9RRHFhAA2Rjp3D+kihkBl8CQLOllF6tnI=";
     };
     meta.homepage = "https://github.com/0xJohnnyboy/scretch.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14505,6 +15717,7 @@ final: prev: {
       hash = "sha256-ilEpAvW6l8yJgl/VV673onqhXEqJ7fRnp4bG8yG+E8w=";
     };
     meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14518,6 +15731,7 @@ final: prev: {
       hash = "sha256-8zPQtfGmH9jy5T6eO4+oFoXp+C0i1rMJX/52ImzoQ9k=";
     };
     meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14531,6 +15745,7 @@ final: prev: {
       hash = "sha256-wqqPgp2igjQ7Ztwm9L0UNeUpS4a80w/UdvU/DzynONg=";
     };
     meta.homepage = "https://github.com/mahyarmirrashed/search-and-replace.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14544,6 +15759,7 @@ final: prev: {
       hash = "sha256-XRuMV//Iyh5gNbfZ+tJGBzhd5s6XldOGL53UUzaP8Pk=";
     };
     meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14557,6 +15773,7 @@ final: prev: {
       hash = "sha256-Gu4UqLlBu7XRsnTn0Z3Toghm/Ux/ll8lH8tBN9UWDjM=";
     };
     meta.homepage = "https://github.com/RobertAudi/securemodelines/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14570,6 +15787,7 @@ final: prev: {
       hash = "sha256-1hmP0+5Iti6+uhc5x9KXpF6jV9hWf5rhebqOWKKxnL0=";
     };
     meta.homepage = "https://github.com/megaannum/self/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14583,6 +15801,7 @@ final: prev: {
       hash = "sha256-e1Ri0cXCZfYyhfuC6up8QMEWquHtgC00/Ki0bzwtJxE=";
     };
     meta.homepage = "https://github.com/jaxbot/semantic-highlight.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14596,6 +15815,7 @@ final: prev: {
       hash = "sha256-A/voYRhrihnA8GF03CCuEXhsqYTLwuSg2whM6OHMNmQ=";
     };
     meta.homepage = "https://github.com/numirias/semshi/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14609,6 +15829,7 @@ final: prev: {
       hash = "sha256-dPwFpT8O91uxnxJ9drKvou+quM4iFqFW9EyeAFdWNoU=";
     };
     meta.homepage = "https://github.com/junegunn/seoul256.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14622,6 +15843,7 @@ final: prev: {
       hash = "sha256-4KC3r5WPnxm5VUsAn+2w4HU9J/Ro8FabTE/643yYcc8=";
     };
     meta.homepage = "https://github.com/osyo-manga/shabadou.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14635,19 +15857,21 @@ final: prev: {
       hash = "sha256-mn/SBtk9YbYZRTJZ054IVsSVOlrry5gsHOXQEnd3b7M=";
     };
     meta.homepage = "https://github.com/nvzone/showkeys/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
   sidekick-nvim = buildVimPlugin {
     pname = "sidekick.nvim";
-    version = "2.3.0-unstable-2026-03-24";
+    version = "2.3.0-unstable-2026-04-22";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "sidekick.nvim";
-      rev = "17447a05f9385e5f8372b61530f6f9329cb82421";
-      hash = "sha256-scCYymquGaT9/e7nU2kuyiwFutKfAq8pGQQsOWK+7rM=";
+      rev = "208e1c5b8170c01fd1d07df0139322a76479b235";
+      hash = "sha256-I1YuIXJHP7JfETwOer6B7QDLMZGG/X59zXopb4nPel4=";
     };
     meta.homepage = "https://github.com/folke/sidekick.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14662,6 +15886,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14675,6 +15900,7 @@ final: prev: {
       hash = "sha256-CFgUligbr2Z+gE5YofyCFcQ8fnwzaNOdQwm1QoPm4D4=";
     };
     meta.homepage = "https://github.com/skim-rs/skim.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14688,6 +15914,7 @@ final: prev: {
       hash = "sha256-fy1hV8s65TcQbe2hHVp0HVX70z7sk/xp3OeEBVUGxdI=";
     };
     meta.homepage = "https://github.com/mopp/sky-color-clock.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14701,6 +15928,7 @@ final: prev: {
       hash = "sha256-l5T09tuB/LJWWvBo+gywyd7qVmFomDcoxrJHOd3WSEM=";
     };
     meta.homepage = "https://github.com/kovisoft/slimv/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14714,19 +15942,21 @@ final: prev: {
       hash = "sha256-Twsq8R2/Q3ffHTE3KTyyR8tln2ksEulo+Q9xY26mYEg=";
     };
     meta.homepage = "https://github.com/danielfalk/smart-open.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2.1.0-unstable-2026-04-17";
+    version = "2.1.0-unstable-2026-04-24";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "78b9d3bd21fe479690ae5e08a1bf3602698466d8";
-      hash = "sha256-J7uzQQQhKa6NyRPJ74D35RAy5Uju2swkZZda7m2GsAU=";
+      rev = "033a1ff747652dfa27bfbe90e0844b5cb59a741f";
+      hash = "sha256-PKDPl+M+jARmlDpAhjPsvG5clsbz6L8UaoS0mtulkv8=";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14740,6 +15970,7 @@ final: prev: {
       hash = "sha256-QAb0O/ZwTVogRyTK8+Y4ORaN6nVaeYepKgfSCF/fIPU=";
     };
     meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14753,6 +15984,7 @@ final: prev: {
       hash = "sha256-kmqjBNFjoX51gap6//iQEgcwAP3ved0bY285fj633t8=";
     };
     meta.homepage = "https://github.com/gorkunov/smartpairs.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14766,6 +15998,7 @@ final: prev: {
       hash = "sha256-DRN9YMkf1Ub5AhcBAFDn5AIFEdOscn+J0z1GCqXOk3c=";
     };
     meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14779,6 +16012,7 @@ final: prev: {
       hash = "sha256-hL0lXzkFxR7qiXzStrmY+gR+ql/A6PR8eCV310gEaGs=";
     };
     meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14792,6 +16026,7 @@ final: prev: {
       hash = "sha256-7lDH1JlTM+H/LWjMlAQPNY6A+xmS/cp+wChy4buGYIU=";
     };
     meta.homepage = "https://github.com/folke/snacks.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14805,6 +16040,7 @@ final: prev: {
       hash = "sha256-YUu5PPxXZIxrBxdIIc/XiCzWgbZwcHLRPHRLhZZgZIM=";
     };
     meta.homepage = "https://github.com/camspiers/snap/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14818,6 +16054,7 @@ final: prev: {
       hash = "sha256-dgAlf30eP8a4MP41lk3RLgSo1dbXQx5C8qbXpg1F2+o=";
     };
     meta.homepage = "https://github.com/leath-dub/snipe.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14831,6 +16068,7 @@ final: prev: {
       hash = "sha256-APFz6zknNpBDLI1nM5B4BZEm40EDvhY5nRB6W9rpurk=";
     };
     meta.homepage = "https://github.com/norcalli/snippets.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14844,19 +16082,21 @@ final: prev: {
       hash = "sha256-ChsaxWhv3OBWBYQqzC9phXBgzLevOKG3XJxh4xrOraA=";
     };
     meta.homepage = "https://github.com/shaunsingh/solarized.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
   solarized-osaka-nvim = buildVimPlugin {
     pname = "solarized-osaka.nvim";
-    version = "0-unstable-2026-02-04";
+    version = "0-unstable-2026-04-21";
     src = fetchFromGitHub {
       owner = "craftzdog";
       repo = "solarized-osaka.nvim";
-      rev = "f0c2f0ba0bd56108d53c9bfae4bb28ff6c67bbdb";
-      hash = "sha256-0AB2+ZuhlpuBFF5xmYXr1sIOIctY4b8jgcghqXZSc70=";
+      rev = "a261ee90fb3e5e82660567e4874d384e996afa4f";
+      hash = "sha256-b8gZM9/HFi4q+mWpEijO8fCBuu1eslGSNPgZOyjXMmc=";
     };
     meta.homepage = "https://github.com/craftzdog/solarized-osaka.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14869,6 +16109,7 @@ final: prev: {
       hash = "sha256-71emILbp291AZmh9Rc0S92mbkcZ88zjCvPTaumEM7Qg=";
     };
     meta.homepage = "https://gitlab.com/schrieveslaach/sonarlint.nvim";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14882,6 +16123,7 @@ final: prev: {
       hash = "sha256-GxXnfw+iKvcunFn+gM5zcknmc6KD5uDfbZEgDQ9bceY=";
     };
     meta.homepage = "https://github.com/iamkarasik/sonarqube.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14895,6 +16137,7 @@ final: prev: {
       hash = "sha256-dNOL6aUro8SlhbMWPFY9tIF4C1HYNJo70f9zX3ajbPc=";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14908,6 +16151,7 @@ final: prev: {
       hash = "sha256-ZCMevcK3lqz8pXsozd4p0bbv1DpASBOtQD0ikDTRZtc=";
     };
     meta.homepage = "https://github.com/sQVe/sort.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14921,6 +16165,7 @@ final: prev: {
       hash = "sha256-oIx3rqOb5KCpgNYmc9HRf+zFGKiuuRASEORTqqy3j70=";
     };
     meta.homepage = "https://github.com/chikatoike/sourcemap.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14934,6 +16179,7 @@ final: prev: {
       hash = "sha256-FPF9M//hxICKBT7c7KIxdGb26j42p/x4KfPQB/fOCEQ=";
     };
     meta.homepage = "https://github.com/liuchengxu/space-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14947,6 +16193,7 @@ final: prev: {
       hash = "sha256-XcS6/xg5A6cX8AOVK7BvSeX1a7lJ7w3MFvJ0TvAxZKg=";
     };
     meta.homepage = "https://github.com/FireIsGood/spaceman.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14960,6 +16207,7 @@ final: prev: {
       hash = "sha256-rXBkSrusTGH5LUFu/vZwUt4yNCl7zI0ZB/urpYuJ5u4=";
     };
     meta.homepage = "https://github.com/cxwx/specs.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -14973,6 +16221,7 @@ final: prev: {
       hash = "sha256-GvNrHog/A/Mo9U97uLE/tOF29h82bc4Lnvyd8NwLntQ=";
     };
     meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14986,6 +16235,7 @@ final: prev: {
       hash = "sha256-rLsiBIifNC8zwUNsAJ8AeTlDS9IS/y3XEKfF5FZ2hZI=";
     };
     meta.homepage = "https://github.com/ravibrock/spellwarn.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -14999,6 +16249,7 @@ final: prev: {
       hash = "sha256-Gwfx+ArykfD6MnYYswxzkULBUHCLFFEBAgK6ID/Dvu8=";
     };
     meta.homepage = "https://github.com/stsewd/sphinx.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15012,6 +16263,7 @@ final: prev: {
       hash = "sha256-a9fyf5wsajCG84+aHsCnhNpf5v20ZXEoFgdxA0V+AS4=";
     };
     meta.homepage = "https://github.com/sjl/splice.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15025,6 +16277,7 @@ final: prev: {
       hash = "sha256-a8ptV5i1eUIN5pcjl6HcZAdrCtIgctn906ahHPCqeYs=";
     };
     meta.homepage = "https://github.com/vimlab/split-term.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15039,6 +16292,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15052,6 +16306,7 @@ final: prev: {
       hash = "sha256-JkOWlqyVLcwW7hxOGj5jb8BpUge3bUHbSV0o5qOYW1c=";
     };
     meta.homepage = "https://github.com/JavaHello/spring-boot.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15065,6 +16320,7 @@ final: prev: {
       hash = "sha256-u6Mo+3hg3miqR4EmsoGZhajxiIk24+y5N+YdNW36/JQ=";
     };
     meta.homepage = "https://github.com/kkharji/sqlite.lua/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15078,6 +16334,7 @@ final: prev: {
       hash = "sha256-3Flf84WAZkzvWNPXKfB/Fruk0EWQrf8JrZGBo4Fqbig=";
     };
     meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15091,6 +16348,7 @@ final: prev: {
       hash = "sha256-6I8AFo6Oj7h1RYBlY6Iu8oLPLt3qPf5tTbsgUnCwIa4=";
     };
     meta.homepage = "https://github.com/chr4/sslsecure.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15104,6 +16362,7 @@ final: prev: {
       hash = "sha256-nghSU9Lk5f6/yflhwudylgUSxjJnJNHmHxpPu8rZ1C8=";
     };
     meta.homepage = "https://github.com/cshuaimin/ssr.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15117,6 +16376,7 @@ final: prev: {
       hash = "sha256-ATjmQRZ3TjDSgz/IrHfFekMmcS+DUt2o3sregyHMcX8=";
     };
     meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15130,6 +16390,7 @@ final: prev: {
       hash = "sha256-HkuVio/F8HOb6k9N8LkYdQ1vheuyjrqP25RforoWZSk=";
     };
     meta.homepage = "https://github.com/tamton-aquib/staline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15143,6 +16404,7 @@ final: prev: {
       hash = "sha256-wIkRcJsEVyH/i2YSLQLl0uEY6iAUuZE7Hir21Ij9ejc=";
     };
     meta.homepage = "https://github.com/eigenfoo/stan-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15156,6 +16418,7 @@ final: prev: {
       hash = "sha256-1OeQdX97wldg6FX+aPOAMBvF9awy7jvdjenhwPfeW7w=";
     };
     meta.homepage = "https://github.com/josegamez82/starrynight/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15169,6 +16432,7 @@ final: prev: {
       hash = "sha256-+a5AFO4RadBTs3W+rSVukBV9VOhWfpp+xZJ8yHF7PsQ=";
     };
     meta.homepage = "https://github.com/darfink/starsearch.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15182,6 +16446,7 @@ final: prev: {
       hash = "sha256-AXJv5l5Y5ihvV4byNJHDLsomvNVLnyYoJgK6XFm3oT4=";
     };
     meta.homepage = "https://github.com/max397574/startup.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15195,6 +16460,7 @@ final: prev: {
       hash = "sha256-nFEQRJ5V+0RskJoAVRPAe2yrkORMTg9Jm13ClTmTSgk=";
     };
     meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15208,6 +16474,7 @@ final: prev: {
       hash = "sha256-TIiv0pwBkwn7n1JFVqgcruKZ69OdxdEId4ca+M5hZ9k=";
     };
     meta.homepage = "https://github.com/arnamak/stay-centered.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15221,6 +16488,7 @@ final: prev: {
       hash = "sha256-sBtreV9MxX9fWgGwVplL9e3klWaaMSsTb+QZMshlaAc=";
     };
     meta.homepage = "https://github.com/duqcyxwd/stringbreaker.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15234,6 +16502,7 @@ final: prev: {
       hash = "sha256-aEeHKyRXf7U28N0itLd2/uNOcqZeDAyeg+saryyfYJk=";
     };
     meta.homepage = "https://github.com/folke/styler.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15247,6 +16516,7 @@ final: prev: {
       hash = "sha256-I+3BWtvBK/cewyR5C28bVtt0gS9Wk3n1dbN64oSBfiU=";
     };
     meta.homepage = "https://github.com/teto/stylish.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15260,6 +16530,7 @@ final: prev: {
       hash = "sha256-t3wgyUtHab0erJkA7kUOGvbyHTzMmWlNE5WNtjDZL0g=";
     };
     meta.homepage = "https://github.com/gbprod/substitute.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "WTFPL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15273,6 +16544,7 @@ final: prev: {
       hash = "sha256-mCG9mgrxkIfiVL5+9pi6K+mpzfwqLIhzRa3j7wzRgW8=";
     };
     meta.homepage = "https://github.com/kvrohit/substrata.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15286,6 +16558,7 @@ final: prev: {
       hash = "sha256-1z3WKIiikQqoweReUyK5O8MWSRN5y95qcxM6qzlKMME=";
     };
     meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15299,6 +16572,7 @@ final: prev: {
       hash = "sha256-tCesXoIMni0NHvCSlM7BWbQo8gVRbMBQm6fTajgQwEs=";
     };
     meta.homepage = "https://github.com/ervandew/supertab/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15312,6 +16586,7 @@ final: prev: {
       hash = "sha256-3A5KxgG54Gnp/anPYn+hkYzI4y5mV8qwu/MB/lIaWy4=";
     };
     meta.homepage = "https://github.com/ur4ltz/surround.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15325,6 +16600,7 @@ final: prev: {
       hash = "sha256-dCb6TXnnX4VAdtThntFJ4jijLpzf+HJoOXDXt/6qLZY=";
     };
     meta.homepage = "https://github.com/peterbjorgensen/sved/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15338,6 +16614,7 @@ final: prev: {
       hash = "sha256-/ghp3uLfQbv7sNnSeRk6wkV3XRR/ZsGm+xd8inrOG78=";
     };
     meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15351,6 +16628,7 @@ final: prev: {
       hash = "sha256-d0eeRitAOprm4dENV8PCYFtvSXSIzQQEImnSVGt8IVI=";
     };
     meta.homepage = "https://github.com/keith/swift.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15365,6 +16643,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/switch.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15378,6 +16657,7 @@ final: prev: {
       hash = "sha256-lZvtGgp4Pzl5VWfTqjpvAHXSQ8i781GMupolDpUR3l0=";
     };
     meta.homepage = "https://github.com/neovim-idea/switcher-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15391,6 +16671,7 @@ final: prev: {
       hash = "sha256-3oIpPETGq+EWOfAGT+5mZBPugntwSvoqc+NwlEyd2ts=";
     };
     meta.homepage = "https://github.com/Wansmer/symbol-usage.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15404,6 +16685,7 @@ final: prev: {
       hash = "sha256-rX/JTsiUMBwixU/8y31HY5zjFosFDreVAPgLKNz7L8s=";
     };
     meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15417,6 +16699,7 @@ final: prev: {
       hash = "sha256-oFhR0R+94zB/xgw42vP+GMRIf6GcckRm5sSp4/9XTXw=";
     };
     meta.homepage = "https://github.com/vim-syntastic/syntastic/";
+    meta.license = lib.meta.getLicenseFromSpdxId "WTFPL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15430,6 +16713,7 @@ final: prev: {
       hash = "sha256-YAnw/FpSLqKjvnug4bdvbGHpYWwtDKuh/DmxhK+PSu0=";
     };
     meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15443,6 +16727,7 @@ final: prev: {
       hash = "sha256-cCOlKn1n8um35kvzbk9UGZt+l8uFANse3yiNsITOkU0=";
     };
     meta.homepage = "https://github.com/kdheepak/tabline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15456,6 +16741,7 @@ final: prev: {
       hash = "sha256-uEUBsPxc1Ru7WPEvTCs6fJewP+KnZEa1aiwRG9T3M18=";
     };
     meta.homepage = "https://github.com/vim-scripts/tabmerge/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15470,6 +16756,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/codota/tabnine-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15483,6 +16770,7 @@ final: prev: {
       hash = "sha256-BtxyORvocIrxMmcZkGZPAfaYsM3cl8xjhWt7/eJUMGc=";
     };
     meta.homepage = "https://github.com/gcmt/taboo.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15496,6 +16784,7 @@ final: prev: {
       hash = "sha256-5T/nefCPCR2K1vySTG0vzh5+6weHinBLahPBL37+VtY=";
     };
     meta.homepage = "https://github.com/abecodes/tabout.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15509,6 +16798,7 @@ final: prev: {
       hash = "sha256-DgGqiYzpTOFiqLtliaInO90W0uIZp16vuMFzOP+l3/w=";
     };
     meta.homepage = "https://github.com/Shougo/tabpagebuffer.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15522,6 +16812,7 @@ final: prev: {
       hash = "sha256-qmDpdg3Tl3W4JSovRb4ODlrKMjRL5CaVI05YBn0Q0LI=";
     };
     meta.homepage = "https://github.com/godlygeek/tabular/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15535,6 +16826,7 @@ final: prev: {
       hash = "sha256-FiIJL6L3rYmCbvlNQnKnry0443mDzgTI9RxHjR5o2d0=";
     };
     meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15548,6 +16840,7 @@ final: prev: {
       hash = "sha256-2dVhKgPonsgTwxrQU8quA1zhWd4SIwNjdHnL89B+eIo=";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15561,6 +16854,7 @@ final: prev: {
       hash = "sha256-7cc0i4Z/kBdE7rBsdswd6l9t1V+eHX6it5+Ow9wTSh0=";
     };
     meta.homepage = "https://github.com/vim-scripts/taglist.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15574,6 +16868,7 @@ final: prev: {
       hash = "sha256-K9Jkd+d/XdukCDdEYvlNFEuCpFQIuVqhOGkWE9ivXyI=";
     };
     meta.homepage = "https://github.com/luckasRanarison/tailwind-tools.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15587,6 +16882,7 @@ final: prev: {
       hash = "sha256-2eUr4rB8gpax0xJ8U4O2O93UXUxF+HZV6Co8LwPZ3JE=";
     };
     meta.homepage = "https://github.com/themaxmarchuk/tailwindcss-colors.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15600,6 +16896,7 @@ final: prev: {
       hash = "sha256-VgVvcnBaWnZ4V5INtIn3ecqffo3EQvzUmxzg05WaVH4=";
     };
     meta.homepage = "https://github.com/fredehoey/tardis.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15613,6 +16910,7 @@ final: prev: {
       hash = "sha256-ThfL4J/r8Mr9WemSUwIea8gsolSX9gabJ6T0XYgAaE4=";
     };
     meta.homepage = "https://github.com/wellle/targets.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15626,6 +16924,7 @@ final: prev: {
       hash = "sha256-AXHdlfZgQYwHg18Utb5Q8zqqqr5DMa1ejOfansOLhAU=";
     };
     meta.homepage = "https://github.com/tbabej/taskwiki/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15639,6 +16938,7 @@ final: prev: {
       hash = "sha256-D8B16ejQ2csahOa49RCENCA1wRY5N0RGFnqxPjbhNR4=";
     };
     meta.homepage = "https://github.com/tomtom/tcomment_vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15653,6 +16953,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/nvim-telekasten/telekasten.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15666,6 +16967,7 @@ final: prev: {
       hash = "sha256-WPzFG8gdf0XzxsFkxgseOy6GQBu9C2KDOXeasdct0F8=";
     };
     meta.homepage = "https://github.com/ray-x/telescope-ast-grep.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15679,6 +16981,7 @@ final: prev: {
       hash = "sha256-50HiNqIeaBz1koWwNpLSa8vd+JTVALbafcufVn+S8hw=";
     };
     meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15692,6 +16995,7 @@ final: prev: {
       hash = "sha256-h5Hqn3Zv/NHZ8o4g8NtPQFWIMzC54MrMg3tDOUXxkPI=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15705,6 +17009,7 @@ final: prev: {
       hash = "sha256-rjxIzYlUAjy15PQm3JLhUCt8eE8dxZIXCf6xAxakols=";
     };
     meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15718,6 +17023,7 @@ final: prev: {
       hash = "sha256-MRs8s4dfS59V0CCu7CHIqrz35RV4OC1X69lxPLTa+98=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-dap.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15731,6 +17037,7 @@ final: prev: {
       hash = "sha256-8V3MTporANLtZkH0RuLviWlgMmR6fay0WmZ3ZOQzpKI=";
     };
     meta.homepage = "https://github.com/xiyaowong/telescope-emoji.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15744,6 +17051,7 @@ final: prev: {
       hash = "sha256-FlJ7w5Ywwq03E0oYdnFJFb+MMUMQMa+5QhDMy2O9tGQ=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15757,6 +17065,7 @@ final: prev: {
       hash = "sha256-iTSDtPxjNWPl5kMw1KSkbKtx2fIJJSs7P/NJkkkgd8g=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15770,6 +17079,7 @@ final: prev: {
       hash = "sha256-ChEM4jJonAE4qXd/dgTu2mdlpNBj5rEdpA8TgR38oRM=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15783,6 +17093,7 @@ final: prev: {
       hash = "sha256-pyir3SyJmUsYhjY7nRj67mbd0M+Z7t+TqSzE8zqOs7A=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15797,6 +17108,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15810,6 +17122,7 @@ final: prev: {
       hash = "sha256-W4rQdKEv4ydhVE1PK/R26eKQTKlqO7zVjY6EfQ/jslg=";
     };
     meta.homepage = "https://github.com/Snikimonkd/telescope-git-conflicts.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15823,6 +17136,7 @@ final: prev: {
       hash = "sha256-Neojvrrjq6S+s1ZKW389N3SK4NvInkrIUVcDX8Mj7I8=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15836,6 +17150,7 @@ final: prev: {
       hash = "sha256-6H4afMXtaZn066oBq3z8vvR7WH7WhqZkvziyOXlsNVg=";
     };
     meta.homepage = "https://github.com/alduraibi/telescope-glyph.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15849,6 +17164,7 @@ final: prev: {
       hash = "sha256-Ck7xM+m8sRkkviXdXpeDYrxr3MNpavkW4/UCih0Ohc8=";
     };
     meta.homepage = "https://github.com/jmacadie/telescope-hierarchy.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15862,6 +17178,7 @@ final: prev: {
       hash = "sha256-kGGVegympVG4lzJ0zdFjsjiioy0gSQbJuENjll3jNlQ=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-live-grep-args.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15875,6 +17192,7 @@ final: prev: {
       hash = "sha256-AgwzHr2UmwwqzlXlmQPLxdf6+EX6frvA2FJ/aJKSN3w=";
     };
     meta.homepage = "https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15888,6 +17206,7 @@ final: prev: {
       hash = "sha256-+mIQVIoreE+goSBtMucgiEPldI01JDRdCKWH/6mzey8=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15901,6 +17220,7 @@ final: prev: {
       hash = "sha256-RyrfT/uQmuer+WN9Q58InTkuFJO+VQvVsp0ZRpRp7PQ=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15914,6 +17234,7 @@ final: prev: {
       hash = "sha256-aDzqVHnHIAiXgVSsgq3WIgzDVYKabUThKuUj3aJ6T3Y=";
     };
     meta.homepage = "https://github.com/Marskey/telescope-sg/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -15927,6 +17248,7 @@ final: prev: {
       hash = "sha256-riBl0vSkRtM9Gtw/FNSKodSmqgGUpDnH7d5w+uU4ReQ=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-smart-history.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15940,6 +17262,7 @@ final: prev: {
       hash = "sha256-zYON9z3ELwjfqZ11LD6E7M+bymuBHxrSjYXhsCPEwR8=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15953,6 +17276,7 @@ final: prev: {
       hash = "sha256-YRhNmmG4gx9Ht8JwjQfbTjJyTHEuZmtP6lqnhOsk8bE=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15966,6 +17290,7 @@ final: prev: {
       hash = "sha256-dWdKntDINjfCxhZ169MW5grayRNPfUd9e/qXBQ7z3do=";
     };
     meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15979,6 +17304,7 @@ final: prev: {
       hash = "sha256-KKCBr5l6U2OoJ/rVkMP7pVeO5M6phx2MOrxc5yIn6L4=";
     };
     meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -15992,6 +17318,7 @@ final: prev: {
       hash = "sha256-5ES1vENp7Sx0N8s4r/Ci4dkdqOhPkV7drimM8NY8dlY=";
     };
     meta.homepage = "https://github.com/tom-anders/telescope-vim-bookmarks.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16005,6 +17332,7 @@ final: prev: {
       hash = "sha256-w+hcCgh5DP5xC4EQvvrba7JuAE3c72SOk4Oc3yNvbMc=";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16019,6 +17347,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16032,6 +17361,7 @@ final: prev: {
       hash = "sha256-LGfyAIbAAAF3q0NpMZx1AIgHLvk6ecpv7RyiL1q8Lxs=";
     };
     meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16045,6 +17375,7 @@ final: prev: {
       hash = "sha256-Z7GSENbICkM0q1ojZXOxFEQiytiCrXCiUE/18b20b1Q=";
     };
     meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16058,6 +17389,7 @@ final: prev: {
       hash = "sha256-7jyUPqm2N0wpnAbj6SlJmlfwg5nsmoK/63yXjPASMkc=";
     };
     meta.homepage = "https://github.com/joerdav/templ.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16071,6 +17403,7 @@ final: prev: {
       hash = "sha256-b2eAKh5cS/uDuma8wCoMr+Ash+D67SwgRyjESAC3hHI=";
     };
     meta.homepage = "https://github.com/axelvc/template-string.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16084,6 +17417,7 @@ final: prev: {
       hash = "sha256-4WFQQeDPwSv2YOf56eViHNR01zfxly2U4o8PoYiG5oQ=";
     };
     meta.homepage = "https://github.com/jacoborus/tender.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16097,6 +17431,7 @@ final: prev: {
       hash = "sha256-rM4n+l1QfulLI/m2wNqM2wq+c9o0Y+jKDN2TaEh8BTw=";
     };
     meta.homepage = "https://github.com/chomosuke/term-edit.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16110,6 +17445,7 @@ final: prev: {
       hash = "sha256-L+BNITHwcPVJBzeIDWl4+S+jQPnmLrwQ6UbimTfMZfk=";
     };
     meta.homepage = "https://github.com/rebelot/terminal.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16123,6 +17459,7 @@ final: prev: {
       hash = "sha256-eSOj397pGN9nr5KXHaAyAC7boQMs/9455MGy//X+Ei4=";
     };
     meta.homepage = "https://github.com/wincent/terminus/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16136,6 +17473,7 @@ final: prev: {
       hash = "sha256-zGP9D7ZxvB35iUxkfd0XLaiuxrFc3nTwzJkkd1uywSg=";
     };
     meta.homepage = "https://github.com/oberblastmeister/termwrapper.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16149,6 +17487,7 @@ final: prev: {
       hash = "sha256-jTXoyfMbr+HSzovf1yJXYyMoIBsOIgUBY9M4TzEt8W4=";
     };
     meta.homepage = "https://github.com/ternjs/tern_for_vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16162,6 +17501,7 @@ final: prev: {
       hash = "sha256-Hr1HXivDgigKV/0jNQsA4ZvwEu/O1uRnTw61PrvD2BY=";
     };
     meta.homepage = "https://github.com/KeitaNakamura/tex-conceal.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16175,6 +17515,7 @@ final: prev: {
       hash = "sha256-ZLPxy1JNTfjLerSVDJAxmqqQUWhm+SuVdDUcjRH8lEU=";
     };
     meta.homepage = "https://github.com/let-def/texpresso.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16188,6 +17529,7 @@ final: prev: {
       hash = "sha256-2IMufSMy9JW50VzZ3SgOtp8kYs81ANwV0eP0ZH3rTFo=";
     };
     meta.homepage = "https://github.com/johmsalas/text-case.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16201,6 +17543,7 @@ final: prev: {
       hash = "sha256-nRElktIR/KcBUBQIoC3QV7B6BtpMby8eGVC8yd/FKXM=";
     };
     meta.homepage = "https://github.com/jsongerber/thanks.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16214,6 +17557,7 @@ final: prev: {
       hash = "sha256-89L6AQSBm3AaHymcjQ3/Ka8BbS9zWrC9mq4cD7DAx3w=";
     };
     meta.homepage = "https://github.com/vhsconnect/themed-tabs.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16227,6 +17571,7 @@ final: prev: {
       hash = "sha256-1I1fr4Hq6547pyj1yUq9yoYjnc/FO0z+x0lrXkwaLXM=";
     };
     meta.homepage = "https://github.com/zaldih/themery.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16240,6 +17585,7 @@ final: prev: {
       hash = "sha256-syz2cMin29eTTdqF9z3gO4EEvHFuJmgk2xo4xIq283Y=";
     };
     meta.homepage = "https://github.com/ron89/thesaurus_query.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16253,6 +17599,7 @@ final: prev: {
       hash = "sha256-3wYyN8mlqnaIas5+kOHNSupuOB/9VN72mQntxetofSA=";
     };
     meta.homepage = "https://github.com/itchyny/thumbnail.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16266,6 +17613,7 @@ final: prev: {
       hash = "sha256-XPavAumJdwG0ocrRKXFAt79VvaxGh+Zd2uHuAfBidkk=";
     };
     meta.homepage = "https://github.com/nvzone/timerly/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16279,6 +17627,7 @@ final: prev: {
       hash = "sha256-FzEMhfvgIE7tlX1LzRQ7ZuYF9aQK6yoHuqT28+vSerc=";
     };
     meta.homepage = "https://github.com/vim-scripts/timestamp.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16292,32 +17641,35 @@ final: prev: {
       hash = "sha256-gmtFb/FirvTtWeTpalabWmt5kQiH83rE7gph3VcKcss=";
     };
     meta.homepage = "https://github.com/levouh/tint.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   tinted-nvim = buildVimPlugin {
     pname = "tinted-nvim";
-    version = "1.0.0-unstable-2026-04-19";
+    version = "1.0.0-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-nvim";
-      rev = "13502cdf2cb854b7bb25473241aeb76458523e6f";
-      hash = "sha256-OSbwHoC/5Xieqqm61h4E32NJz+zNWcQBM/qotQgXA6s=";
+      rev = "5039445d5cea8ec7d21b86b9d84336ad0b25cdf6";
+      hash = "sha256-5Mkz6i8MvJR+18NeRBHm7ZGYg9Hs1rRQJiHGTircE/0=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   tinted-vim = buildVimPlugin {
     pname = "tinted-vim";
-    version = "01-unstable-2026-04-19";
+    version = "01-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-vim";
-      rev = "3b6128ba023812420defc3e870714e2131a564dd";
-      hash = "sha256-R5VMt5t2lZAwkArkdr6seQc5lL/gmYYeHe/fIfODo0s=";
+      rev = "122dba414a17b87af85aa981c580385b26af5e81";
+      hash = "sha256-HPtPmwY+S2d+wYoae1/WufB02v2kG6fldcGaOQPa2ZI=";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16331,6 +17683,7 @@ final: prev: {
       hash = "sha256-tD1DrY4mpPf5Qo9jZEBqSxOOqzk2Ssl1srH4mu+cN5g=";
     };
     meta.homepage = "https://github.com/rachartier/tiny-cmdline.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16344,32 +17697,35 @@ final: prev: {
       hash = "sha256-zv5pccxNV/D3GFTGov48CSDC9nuGZURSWd0+tQRN+to=";
     };
     meta.homepage = "https://github.com/rachartier/tiny-devicons-auto-colors.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   tiny-glimmer-nvim = buildVimPlugin {
     pname = "tiny-glimmer.nvim";
-    version = "0-unstable-2026-04-16";
+    version = "0-unstable-2026-04-27";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-glimmer.nvim";
-      rev = "1f1f26d84882b6f216cbeba548f2359c2118a876";
-      hash = "sha256-DccGp/CzBxLszWVqfZLl/NRm82FKsLQ8Z7j286PB2i8=";
+      rev = "cc285167914e947fc130523d02927fdaf24636a6";
+      hash = "sha256-oRdeegElffDVtvv87z7z4fJH/ScTFz0wXz9sevTq10s=";
     };
     meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "0-unstable-2026-04-17";
+    version = "0-unstable-2026-04-22";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "b3b91e086795c036ecfe70429b72b26bcb302c91";
-      hash = "sha256-yYxwyXuOIb+Ac5f8OonwsJny00bqfL7cWDtcjsVtP5o=";
+      rev = "147af4e49f51dd48f41972de26552872b8ba7b25";
+      hash = "sha256-LpZuRNGSK8AHLTIPIWoQlGot89qubFRL/RZ+EMs4bnQ=";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16383,6 +17739,7 @@ final: prev: {
       hash = "sha256-HKCSJAhBJD8MsFAkn0lVy4135WkiBVJycWEKQFa1Gvg=";
     };
     meta.homepage = "https://github.com/tomtom/tinykeymap_vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16396,6 +17753,7 @@ final: prev: {
       hash = "sha256-J7jfUlY4GkEYEVqWM4xqQItZCs35MwGyFJ0FTIO1I5M=";
     };
     meta.homepage = "https://github.com/tomtom/tlib_vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16409,6 +17767,7 @@ final: prev: {
       hash = "sha256-nUxK/ng7Z7ipWqOEPZDvW/2Waf7prhJa1gVsGTACEC8=";
     };
     meta.homepage = "https://github.com/wellle/tmux-complete.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16422,6 +17781,7 @@ final: prev: {
       hash = "sha256-dKarwc0NByKV8/rMHnHqwiRTgeiXAPGsviFBP+bOaXI=";
     };
     meta.homepage = "https://github.com/aserowy/tmux.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16435,6 +17795,7 @@ final: prev: {
       hash = "sha256-o+6E0v9saWw4EP4o5beuvdKfg7oMXloTuDqpoOGTQj8=";
     };
     meta.homepage = "https://github.com/edkolev/tmuxline.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16448,6 +17809,7 @@ final: prev: {
       hash = "sha256-VGeIRfwQsHgSO89Pmn6yIP9na1F6mmYZx0HDLe9IKCQ=";
     };
     meta.homepage = "https://github.com/folke/todo-comments.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16462,6 +17824,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/freitass/todo.txt-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16475,6 +17838,7 @@ final: prev: {
       hash = "sha256-fytbX+L12TK45YKFU9K+iFJcDrwboKabihc2LtX29J4=";
     };
     meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16488,6 +17852,7 @@ final: prev: {
       hash = "sha256-THvvevUwK3p/aZW+FI2RNnduqWBcmWF5tueYwEY43FI=";
     };
     meta.homepage = "https://github.com/tiagovla/tokyodark.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16501,6 +17866,7 @@ final: prev: {
       hash = "sha256-a9iRWue7DB7s/wNdxqqB51Jya5P9X6sDftqhdmKggU0=";
     };
     meta.homepage = "https://github.com/folke/tokyonight.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16514,6 +17880,7 @@ final: prev: {
       hash = "sha256-0ypbs+7HZ5AOmQ0a4PjT888AwtKjur9dUOwdXi+LH4U=";
     };
     meta.homepage = "https://github.com/markonm/traces.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16528,6 +17895,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/LeonHeidelbach/trailblazer.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16541,6 +17909,7 @@ final: prev: {
       hash = "sha256-IQlx0PlcR1XZVZKG5cP5M8Gx6R0nC4G3+t/kVvtofYI=";
     };
     meta.homepage = "https://github.com/tjdevries/train.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16554,6 +17923,7 @@ final: prev: {
       hash = "sha256-GlN7/+TmXld2UVPN2rDP7nKqbnswiezmGXn+uGK5I5c=";
     };
     meta.homepage = "https://github.com/xiyaowong/transparent.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16567,6 +17937,7 @@ final: prev: {
       hash = "sha256-y6X7TvWgPqP6S0DTkx53eMhS0veUQwKGVcr8y+FPgSY=";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/treesitter-modules.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16580,19 +17951,21 @@ final: prev: {
       hash = "sha256-qtfZ+wc5oWiuomvzD3SWUvYr6/z2wp+kZeMjKELJHog=";
     };
     meta.homepage = "https://github.com/Wansmer/treesj/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "0-unstable-2026-04-10";
+    version = "0-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "6fbceceb8966620da8970b727b6daa358b982805";
-      hash = "sha256-ks5/R4hNYmPRdpi4W19ZWmWyCgj72bjpaaxSsmHQNkc=";
+      rev = "ba74c5ec8bd128297170476d56389125ecb23799";
+      hash = "sha256-bbvJ1Ym1bf4SKdn9KjXo3NXwQ9u+ksT8nZkC63iYR2s=";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16606,6 +17979,7 @@ final: prev: {
       hash = "sha256-Xg+kYYTKO7TZiPF3w737S9Fz25iun2gKdf/w39anl8A=";
     };
     meta.homepage = "https://github.com/tremor-rs/tremor-vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16619,6 +17993,7 @@ final: prev: {
       hash = "sha256-h4dgbcOY2ji+TeX0jlMohDe2oL5paogl7Tt6lZG9i7M=";
     };
     meta.homepage = "https://github.com/cappyzawa/trim.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16633,6 +18008,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/simonmclean/triptych.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16646,6 +18022,7 @@ final: prev: {
       hash = "sha256-6U/KWjvRMxWIxcsI2xNU/ltfgkaFG4E3BdzC7brK/DI=";
     };
     meta.homepage = "https://github.com/folke/trouble.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16659,6 +18036,7 @@ final: prev: {
       hash = "sha256-euaxTWS98i14wvuKrFvdCRigsKqrSUwZpMEmYtUBBss=";
     };
     meta.homepage = "https://github.com/Pocco81/true-zen.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16672,6 +18050,7 @@ final: prev: {
       hash = "sha256-1NoBH/FnAiuLuRhY+crX24Z6rt8NibKfUN/C//2Tff8=";
     };
     meta.homepage = "https://github.com/tesaguri/trust.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16685,6 +18064,7 @@ final: prev: {
       hash = "sha256-l/9aw6j2955MRrhOUneH6wU2/a46FAyzDQSyRzlhYOI=";
     };
     meta.homepage = "https://github.com/tronikelis/ts-autotag.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16698,6 +18078,7 @@ final: prev: {
       hash = "sha256-ORK3XpHANaqvp1bfMG2GJmAiaOsLoGW82ebL/FJtKaA=";
     };
     meta.homepage = "https://github.com/folke/ts-comments.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16711,6 +18092,7 @@ final: prev: {
       hash = "sha256-W48Jfa750jW3mB7ObDVdZXDaZDfbbA46cgMPNkPR6jg=";
     };
     meta.homepage = "https://github.com/dmmulroy/tsc.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16724,6 +18106,7 @@ final: prev: {
       hash = "sha256-WpHjAscUazGjVUzWlUrhxozpgi3MKAg/So5xBapiHhE=";
     };
     meta.homepage = "https://github.com/jgdavey/tslime.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16737,6 +18120,7 @@ final: prev: {
       hash = "sha256-RN0DMF1tkJkQ5xRDiEV/yNr455K6Iw9cLxPA91ThxPg=";
     };
     meta.homepage = "https://github.com/mtrajano/tssorter.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16750,6 +18134,7 @@ final: prev: {
       hash = "sha256-E+6yph7I1Z7NgUhjD5rkBeJ2Bx9QRbMpgd2Yu8uTPG4=";
     };
     meta.homepage = "https://github.com/Quramy/tsuquyomi/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16764,6 +18149,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/jrop/tuis.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16777,6 +18163,7 @@ final: prev: {
       hash = "sha256-MTMYohhexSzfV7qVY84JmeyC9JcxoX3FsU2k9NpeEMk=";
     };
     meta.homepage = "https://github.com/alexpasmantier/tv.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16790,6 +18177,7 @@ final: prev: {
       hash = "sha256-V6DFwvShvX6mYMRJajwOaxbHMNuCHCZzVrfT73iMuQo=";
     };
     meta.homepage = "https://github.com/folke/twilight.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16803,6 +18191,7 @@ final: prev: {
       hash = "sha256-tStomym4qd7IXj/ohYAc3akImNsOJdC7nQL+CkdMomc=";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16816,6 +18205,7 @@ final: prev: {
       hash = "sha256-CM5iwUUr7fZeGBL8A3L1NdaeWxV7Xai59ZE+l81Bm0A=";
     };
     meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16829,6 +18219,7 @@ final: prev: {
       hash = "sha256-wUCrqMY8E1rf/NDfWa2/COHzhrVwo4n8uFu5CBccZ/Q=";
     };
     meta.homepage = "https://github.com/leafgarland/typescript-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16842,6 +18233,7 @@ final: prev: {
       hash = "sha256-UHEVhlV/1cq6jaMhNNookeGPtHvSwy1AKLvb8FR6Rro=";
     };
     meta.homepage = "https://github.com/MrPicklePinosaur/typst-conceal.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16855,6 +18247,7 @@ final: prev: {
       hash = "sha256-EUYiHzDWJQM9Guk6ZM5GWE/etB+GHM48myRg/BPtOV0=";
     };
     meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16868,6 +18261,7 @@ final: prev: {
       hash = "sha256-qKY+tE7zCP7UNUeeesGGS5zJ9nudCJiQosLaI/TtD08=";
     };
     meta.homepage = "https://github.com/kaarmu/typst.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16881,6 +18275,7 @@ final: prev: {
       hash = "sha256-q9lUHeBlpCtkrDDaA77D393a/MSetZdy98sQqaOnqbk=";
     };
     meta.homepage = "https://github.com/J0schu/typstwatch.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16894,32 +18289,35 @@ final: prev: {
       hash = "sha256-JEL6ansTFn4930gz6i7zUyvCaSxHJImz8hdwoQmX7qM=";
     };
     meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   ultisnips = buildVimPlugin {
     pname = "ultisnips";
-    version = "3.2-unstable-2026-04-18";
+    version = "3.2-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
-      rev = "724e506c6c852ea9bd60720d878a09a55eb3eb74";
-      hash = "sha256-HhTFCWpE5ljk2M4z9/XHBobLMIW6DO9mpVF5BEfY624=";
+      rev = "0223456b89f7f797c5424ddef07cfc28b5cd86a5";
+      hash = "sha256-m33oxuCVimpC0GQ0unsqm7Hy7UcTE6a2ONu6h80gqEI=";
     };
     meta.homepage = "https://github.com/SirVer/ultisnips/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
   unclash-nvim = buildVimPlugin {
     pname = "unclash.nvim";
-    version = "0-unstable-2026-01-28";
+    version = "0-unstable-2026-04-25";
     src = fetchFromGitHub {
       owner = "madmaxieee";
       repo = "unclash.nvim";
-      rev = "04f6aba5e2eea8b665cba88f21082e33a7cb6e59";
-      hash = "sha256-Rd+U0WtVCV2D0rsL8Sm5B4NRK2t4W5M7n/CH1I0w6s4=";
+      rev = "6115c7540d7f3c6fcac7658f521d263d338044bf";
+      hash = "sha256-FZFSNQc+czCwporg1/mmGcDRFY73grvlcieIcEo1Qv8=";
     };
     meta.homepage = "https://github.com/madmaxieee/unclash.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16933,6 +18331,7 @@ final: prev: {
       hash = "sha256-0fSCkozz9UWkkV1PsCCnIimOHsmXw9jLd9/oF9dLjMk=";
     };
     meta.homepage = "https://github.com/mbbill/undotree/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16946,6 +18345,7 @@ final: prev: {
       hash = "sha256-Cv1ETqnqbVQgKrXTMDA1JgcqQSIzK6S7i9pZHDNI4BU=";
     };
     meta.homepage = "https://github.com/chrisbra/unicode.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16959,6 +18359,7 @@ final: prev: {
       hash = "sha256-BPoSViNDO678SWVaGl9FHfSzWLEbqFR39v+MmfOPSo4=";
     };
     meta.homepage = "https://github.com/axkirillov/unified.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16972,6 +18373,7 @@ final: prev: {
       hash = "sha256-xGbA6D1ZXZ1lmtW9BXeQtGPmXSoXmdIGzVC2p58QCiI=";
     };
     meta.homepage = "https://github.com/tummetott/unimpaired.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -16985,6 +18387,7 @@ final: prev: {
       hash = "sha256-a/2B3tbZhfCVtNwg/q2Eral6KWScGxSY9K+yWl/mIaE=";
     };
     meta.homepage = "https://github.com/afreakk/unimpaired-which-key.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -16998,6 +18401,7 @@ final: prev: {
       hash = "sha256-ku6Bxg3jJruYOgrBRUzsankQtNryDmv1nWWjhvdskXs=";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17011,6 +18415,7 @@ final: prev: {
       hash = "sha256-nKbDaZU6zRGr11OelunXgwvvYQD4og2sk3dVB1YxoX0=";
     };
     meta.homepage = "https://github.com/Shougo/unite.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17024,6 +18429,7 @@ final: prev: {
       hash = "sha256-NWv2RJiy5JkKnqdGGXPoHvCkYaZSa6poPqhDjyowRQA=";
     };
     meta.homepage = "https://github.com/sontungexpt/url-open/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17037,6 +18443,7 @@ final: prev: {
       hash = "sha256-61Bq8w7r1cwEhyKJ4pKbeZLXupIsGdbAzrpE51uIcpc=";
     };
     meta.homepage = "https://github.com/axieax/urlview.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17050,6 +18457,7 @@ final: prev: {
       hash = "sha256-5JrITA72Cgl3WOPlU6nZjewP98cCQWFHCklN+qtFpis=";
     };
     meta.homepage = "https://github.com/vim-scripts/utl.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17063,6 +18471,7 @@ final: prev: {
       hash = "sha256-RmvRKigES1/CHCtNTt/kRN46lOVp9PusVZuGh0Q0Ru0=";
     };
     meta.homepage = "https://github.com/benomahony/uv.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17076,6 +18485,7 @@ final: prev: {
       hash = "sha256-sfw6Y9NbbFzoYALgQPBuu+36OSaTFzM0tWCOjDl8ag8=";
     };
     meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17089,19 +18499,21 @@ final: prev: {
       hash = "sha256-rcyz94b5VAYGoaq1q70EtgEu+DH0O6XSXPJECEtRRJI=";
     };
     meta.homepage = "https://github.com/junegunn/vader.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   vague-nvim = buildVimPlugin {
     pname = "vague.nvim";
-    version = "2.0.0-unstable-2026-04-09";
+    version = "2.0.0-unstable-2026-04-21";
     src = fetchFromGitHub {
       owner = "vague-theme";
       repo = "vague.nvim";
-      rev = "8751181a1aa431b4e8983b0a183afef5cbc08381";
-      hash = "sha256-89Z6MzAFcZeUhMfU1amR4sxakcpsxlJxT3s6XateaBo=";
+      rev = "fd58046b9d64259d9785e4aeb6d6f494c6943cad";
+      hash = "sha256-wAjzCkTMoxEP6Xc38I5lY3tSwEgU67w/bYPYxmaGaZA=";
     };
     meta.homepage = "https://github.com/vague-theme/vague.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17115,6 +18527,7 @@ final: prev: {
       hash = "sha256-EFx2o0x2VcKmbTAu/Iy56vTamCvsP5Apfi/RkRmrE1Y=";
     };
     meta.homepage = "https://github.com/jbyuki/venn.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17128,6 +18541,7 @@ final: prev: {
       hash = "sha256-oP4TeD2FEwL1M7D3wl1BQi812x+GhPdRQvFmrZ8l4Rc=";
     };
     meta.homepage = "https://github.com/linux-cultist/venv-selector.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17141,6 +18555,7 @@ final: prev: {
       hash = "sha256-xwQGTwWDrwxWdFYd3i7alXyFGbv4ONRsNdB+3jOogBs=";
     };
     meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17154,6 +18569,7 @@ final: prev: {
       hash = "sha256-i3FhzaSTWSUMtvqhDHfGKqdHo/u9u2fGHwvmKq5P470=";
     };
     meta.homepage = "https://github.com/vifm/vifm.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17167,6 +18583,7 @@ final: prev: {
       hash = "sha256-WGSdiGoM7DEusdej7PdHRb7+1hzLuaWQgfYnXxyB3Vc=";
     };
     meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17180,6 +18597,7 @@ final: prev: {
       hash = "sha256-r26pxvcBFPP+mht1kegj9aVXLiQwWh4G66JaRLpOIiU=";
     };
     meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17193,6 +18611,7 @@ final: prev: {
       hash = "sha256-WUokqQfMPjVLKrCh6Y/XetR3ZoVyGEpkTXukmsKwcTI=";
     };
     meta.homepage = "https://github.com/dpelle/vim-LanguageTool/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17206,6 +18625,7 @@ final: prev: {
       hash = "sha256-KRoR/3TNPipJiMiRv1pAWMTeRCp2Vz4mLuml3ws/I6U=";
     };
     meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithRegister/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17219,6 +18639,7 @@ final: prev: {
       hash = "sha256-Xrzmxe0hLLwvutsKsvDWCfCLgInsg4ym49HJnCCG+xM=";
     };
     meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17232,6 +18653,7 @@ final: prev: {
       hash = "sha256-uicJ4cqoWOrc3dx6DnH/VdRFQXqVmauLyTcgyIrIwJU=";
     };
     meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17245,6 +18667,7 @@ final: prev: {
       hash = "sha256-MFXQjLIY1WJ6bGuxRr7WiIcjK9lOlMsFDit0bRmYd/s=";
     };
     meta.homepage = "https://github.com/tpope/vim-abolish/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17258,6 +18681,7 @@ final: prev: {
       hash = "sha256-UeoluK/MujaM9CbtjbJaH0tzttfvuXn+5HD0MFf7Mhs=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-actions/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17271,6 +18695,7 @@ final: prev: {
       hash = "sha256-+Oi8r3R09QpJgvtHSgdmxl+WJia54D1O9Bq0FoqqaNI=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-async/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17284,6 +18709,7 @@ final: prev: {
       hash = "sha256-xDs9ay76gU7nwB8vP+OZ6eVrVlm9RWZV6YMaZDoyXjM=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-background-cmd/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17297,6 +18723,7 @@ final: prev: {
       hash = "sha256-rA4M//UI4hw25doL5mEtK1IskDdggzWZUE3tMSCaiio=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-commenting/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17310,6 +18737,7 @@ final: prev: {
       hash = "sha256-mWpqizYkJ8IvIemRojsNA+KgSRhXVOnaKoxyLHwqoNE=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-completion/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17323,6 +18751,7 @@ final: prev: {
       hash = "sha256-8wb5B1MI27/OVJ8etuOwiDB53htQziPuVVztmfrc4lc=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-errorformats/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17336,6 +18765,7 @@ final: prev: {
       hash = "sha256-F7MFyKYmsRgO0Ae8jt6XTtYZJAqo25MR/aska3EQIOk=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17349,6 +18779,7 @@ final: prev: {
       hash = "sha256-a7oEd1L09LSdfnTMpyg/2pqd1yrhnSsHhL5yTTzJrpo=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17362,6 +18793,7 @@ final: prev: {
       hash = "sha256-rwr4LLEN3BZd83xXaIDnqEu2KTQ5P24bVgjWCDFQtLw=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17375,6 +18807,7 @@ final: prev: {
       hash = "sha256-MubWLA85j7ZIZx2BYuw8VNCD6U/3mzps4+jmxNsgaZ4=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-mru/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17388,6 +18821,7 @@ final: prev: {
       hash = "sha256-RXYjI9acjEeS6CYrsFXH4p4F8AESp+nAMg8/M5nJKfE=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-mw-utils/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17401,6 +18835,7 @@ final: prev: {
       hash = "sha256-3mcEZ8YLG823BpLAixEOOqbM8OlIQX0lvjnyBL4Xv6Q=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-nix/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17414,6 +18849,7 @@ final: prev: {
       hash = "sha256-GOrCvVGEzMV1jccODq0rv5//hmC85mRo/SfbNlYlspE=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-other/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17427,6 +18863,7 @@ final: prev: {
       hash = "sha256-OULranGRwwi+qyQOkcme5OLFLi1nJQPUb5gxLoI7hs0=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-php-manual/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17440,6 +18877,7 @@ final: prev: {
       hash = "sha256-/suZijOZVclsFapWadlsMw7F5suyf0Ml3oFXCMZ1j0Q=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-signs/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17453,6 +18891,7 @@ final: prev: {
       hash = "sha256-o3K+w7qVcqeh6PPxXkPNd9QqB+RPcKt508z4pU8JFUY=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-sql/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17466,6 +18905,7 @@ final: prev: {
       hash = "sha256-KYoxSvbvwVRui9M0VbatG+5h76nm9U2ft6YEA/QNluU=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-syntax-checker/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17479,6 +18919,7 @@ final: prev: {
       hash = "sha256-3fDgKjKhQKDIsB8ph2Q+GLw4KNEwulIbv7Vd0OpclxM=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-toggle-buffer/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17492,6 +18933,7 @@ final: prev: {
       hash = "sha256-vEcEtcSx9oGWal/FNDYBbEYiKzDBycD3wRiL69q9xMQ=";
     };
     meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17505,6 +18947,7 @@ final: prev: {
       hash = "sha256-VhGa3KrOS11I66RtoZyw+x/7yBwUsbYNJbiys/XeISI=";
     };
     meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17518,6 +18961,7 @@ final: prev: {
       hash = "sha256-vl0ZPTZ2945NXtsnPnmmc8Vw3oKK0PgSv8WOw0A14ow=";
     };
     meta.homepage = "https://github.com/junegunn/vim-after-object/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17531,6 +18975,7 @@ final: prev: {
       hash = "sha256-yCSIe1SfPZww1tvowevzXFJbpEVTV+TPLFwqCJuTwXw=";
     };
     meta.homepage = "https://github.com/danilo-augusto/vim-afterglow/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17544,19 +18989,21 @@ final: prev: {
       hash = "sha256-XFdyVtRxQGTtDGIa2ai0YKzoRnyGXwPitZo2bDw5SNg=";
     };
     meta.homepage = "https://github.com/msuperdock/vim-agda/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   vim-airline = buildVimPlugin {
     pname = "vim-airline";
-    version = "0.11-unstable-2026-04-13";
+    version = "0.11-unstable-2026-04-27";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "609e5c0ee171c370ad727b0b833e66fd34772aeb";
-      hash = "sha256-PgS2m3vqncalNNSeXpYb0x2MfEdM7eUh6uGWyM6yHsA=";
+      rev = "6e09d725c20445f79922697c226cc91086d565e2";
+      hash = "sha256-WtHcYqgctGT4F1sjZqaFjLfkkcw5HwJpNs7B2U+TfqY=";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17570,6 +19017,7 @@ final: prev: {
       hash = "sha256-9Ucs0396XA26p2WpRqrPwo+czKc7gXy3zE5usEgfRWY=";
     };
     meta.homepage = "https://github.com/enricobacis/vim-airline-clock/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17583,6 +19031,7 @@ final: prev: {
       hash = "sha256-xTgitX/kL8m/zjcxjCe4WWvhKfVPS284GoZjWkWc/gY=";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline-themes/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17596,6 +19045,7 @@ final: prev: {
       hash = "sha256-E+xLENJsOy//yKWWcVpRQEvbES9VnwaZ0E9/+U0dRJE=";
     };
     meta.homepage = "https://github.com/Konfekt/vim-alias/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17609,6 +19059,7 @@ final: prev: {
       hash = "sha256-Nh56egd4VEwnEabTr6nL/dJdZbkhK+lEUzVX7faDCm8=";
     };
     meta.homepage = "https://github.com/hsanson/vim-android/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17622,6 +19073,7 @@ final: prev: {
       hash = "sha256-YKhVMYoFpa1vUQbNb5kVemJ/0nZ8ExmFxu8CNenfrjM=";
     };
     meta.homepage = "https://github.com/b4winckler/vim-angry/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17635,6 +19087,7 @@ final: prev: {
       hash = "sha256-IRZDlMN/msiCRA3suGPVAH3JKVLP+i6/WkxujAQoGPw=";
     };
     meta.homepage = "https://github.com/osyo-manga/vim-anzu/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17648,6 +19101,7 @@ final: prev: {
       hash = "sha256-E5ZboCQmp7FDAILPoAaGULepyAR90vfrOtaQ3EfdzJg=";
     };
     meta.homepage = "https://github.com/tpope/vim-apathy/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17661,6 +19115,7 @@ final: prev: {
       hash = "sha256-C6rB7l3fkLer6K+eHxlUmVOWpxV0pJdgqkGkMjzq3hY=";
     };
     meta.homepage = "https://github.com/ThePrimeagen/vim-apm/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17674,6 +19129,7 @@ final: prev: {
       hash = "sha256-cgcNlsmEhZ8aWicJKgpnVJRl7nrMllFRDkXBhwBv7xk=";
     };
     meta.homepage = "https://github.com/PeterRincker/vim-argumentative/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17687,6 +19143,7 @@ final: prev: {
       hash = "sha256-x0ebHFe8R0IEHJ7lTA1H/wcm+qW02J1aGy7RBGfazd8=";
     };
     meta.homepage = "https://github.com/FooSoft/vim-argwrap/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17700,6 +19157,7 @@ final: prev: {
       hash = "sha256-MkuY+hIgLiIeJMzF2W6WuwlDQMTHlASs+29NvYlMqa4=";
     };
     meta.homepage = "https://github.com/haya14busa/vim-asterisk/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17713,6 +19171,7 @@ final: prev: {
       hash = "sha256-vwQ3hwSpJBCdUp5dlHuP6GPaW7EJ4Rb5kXOJ9qtrpf8=";
     };
     meta.homepage = "https://github.com/wuelnerdotexe/vim-astro/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17726,6 +19185,7 @@ final: prev: {
       hash = "sha256-XgyLGoXi1GA3Dh8YlGN7kR/Xt/DbD5rZGdA+rXPMkEg=";
     };
     meta.homepage = "https://github.com/hura/vim-asymptote/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17739,6 +19199,7 @@ final: prev: {
       hash = "sha256-sCUEGcIyJHs/Qqgl6246ZWcNokTR0h9+AA6SYzyMhtU=";
     };
     meta.homepage = "https://github.com/907th/vim-auto-save/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17752,6 +19213,7 @@ final: prev: {
       hash = "sha256-LQVXUmrNOvJr78ULU9/8SRtHec6p9iNUT1YBDuxFYVQ=";
     };
     meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17765,6 +19227,7 @@ final: prev: {
       hash = "sha256-V5rqmSqRAp358nGDTHmfR4tfntjPuHvkRTouGYMHPQI=";
     };
     meta.homepage = "https://github.com/benizi/vim-automkdir/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17778,6 +19241,7 @@ final: prev: {
       hash = "sha256-h1S5dUbOJog7SCePpldkH2P/JAv1Ebl/4Lu7mX3NFdc=";
     };
     meta.homepage = "https://github.com/jenterkin/vim-autosource/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17791,6 +19255,7 @@ final: prev: {
       hash = "sha256-Nk07QyuIqMbkgjyUmy9G4zPLrER4us5GLDdpQduSEVA=";
     };
     meta.homepage = "https://github.com/gioele/vim-autoswap/";
+    meta.license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17804,6 +19269,7 @@ final: prev: {
       hash = "sha256-cR45sboQ5XPqXfYDgV4S9LtHbdjwkdgFE7WeynhXpLM=";
     };
     meta.homepage = "https://github.com/bazelbuild/vim-bazel/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17817,6 +19283,7 @@ final: prev: {
       hash = "sha256-xJMZQ/27TgwAnvPVH1fjF6SLOA9jvXmbfcwV0NZ1kTY=";
     };
     meta.homepage = "https://github.com/moll/vim-bbye/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17830,6 +19297,7 @@ final: prev: {
       hash = "sha256-yrNZV90yiHIxw0OMSSvi5SMApR2oFT8EpvF6TiUlC88=";
     };
     meta.homepage = "https://github.com/ThePrimeagen/vim-be-good/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17843,6 +19311,7 @@ final: prev: {
       hash = "sha256-tbnB67O39OgozgknCZ1crnPZ9OBKtlGrvTeoFPnbLhc=";
     };
     meta.homepage = "https://github.com/nathangrigg/vim-beancount/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17856,6 +19325,7 @@ final: prev: {
       hash = "sha256-ra+XXdHCOB8/4EK9bh5jpvfQYXG6k+q69sYgjHZVoJg=";
     };
     meta.homepage = "https://github.com/sheoak/vim-bepoptimist/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17869,6 +19339,7 @@ final: prev: {
       hash = "sha256-29z20+6KBY74HuZE0i8GqP7Z68uu+AzthJGCLwxycdQ=";
     };
     meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17882,6 +19353,7 @@ final: prev: {
       hash = "sha256-ZS5rTj4Tq2OGOgN695PhxgPrgWBmSRbF1cWc6LdMD/E=";
     };
     meta.homepage = "https://github.com/MattesGroeger/vim-bookmarks/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17895,6 +19367,7 @@ final: prev: {
       hash = "sha256-SD4PasLmOu59mtw3HibQLWaw/T72w/TGV021+xrJI38=";
     };
     meta.homepage = "https://github.com/gyim/vim-boxdraw/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17908,6 +19381,7 @@ final: prev: {
       hash = "sha256-4huq1x2rvAbBKJYB4SLB0T1UPkeZOfzb0TWxUZBqom0=";
     };
     meta.homepage = "https://github.com/ConradIrwin/vim-bracketed-paste/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17921,6 +19395,7 @@ final: prev: {
       hash = "sha256-nWWryCynf5WgMh1Yq9UeWVRMhjJJaQ0UKAyMVXuVoLE=";
     };
     meta.homepage = "https://github.com/mtikekar/vim-bsv/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17934,6 +19409,7 @@ final: prev: {
       hash = "sha256-/9NHHzIAH7xVOXtX/IwkWmKd/a2KZMbMzO+3JJ8SL7w=";
     };
     meta.homepage = "https://github.com/jeetsukumaran/vim-buffergator/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17947,6 +19423,7 @@ final: prev: {
       hash = "sha256-WrVDyPVi0s/lOpOyzfToQg7Xa5hq5TYMHLuhPdQhmn4=";
     };
     meta.homepage = "https://github.com/bling/vim-bufferline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17960,6 +19437,7 @@ final: prev: {
       hash = "sha256-cyZN06Dn+qaL5AjbZfBZIj9Est7b+Q8BYemmWpCt7Gs=";
     };
     meta.homepage = "https://github.com/bagrat/vim-buffet/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17973,6 +19451,7 @@ final: prev: {
       hash = "sha256-rolvtTZM7nTXKtRGvqegc1jLi9Wjf4mZ+VNSN3/83Mk=";
     };
     meta.homepage = "https://github.com/qpkorr/vim-bufkill/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -17986,6 +19465,7 @@ final: prev: {
       hash = "sha256-qbLvl228beNHWVgRmgD8rbSMpuSfWwyys6SaCrGkxxw=";
     };
     meta.homepage = "https://github.com/ap/vim-buftabline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -17999,6 +19479,7 @@ final: prev: {
       hash = "sha256-0RuJ/holrLkX4ht0X000fMpcUNGFo24QkONuYLOfrWA=";
     };
     meta.homepage = "https://github.com/isobit/vim-caddyfile/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18012,6 +19493,7 @@ final: prev: {
       hash = "sha256-+tBYH0X0fzc0jpoK0rolOtVE5m69OxL78w8WjkA/rLg=";
     };
     meta.homepage = "https://github.com/tpope/vim-capslock/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18025,6 +19507,7 @@ final: prev: {
       hash = "sha256-rOxPyI/q38/ADPfddRw4EnO7RykCksPMIWkynrhwtt4=";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18038,6 +19521,7 @@ final: prev: {
       hash = "sha256-CHAStQ6mqr0oCyl9mRNMSKBKx9ITIrPuejTn3DQtV/8=";
     };
     meta.homepage = "https://github.com/m-pilia/vim-ccls/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18051,6 +19535,7 @@ final: prev: {
       hash = "sha256-H+lao2LLWu+f11xOF5aH5D4a8GY6ozmgZ/uLzgGWAGw=";
     };
     meta.homepage = "https://github.com/tpope/vim-characterize/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18064,6 +19549,7 @@ final: prev: {
       hash = "sha256-tgBDmEPEdoxszPQhfBTvpDjnTOJQUMRm+F3xo0aUoZA=";
     };
     meta.homepage = "https://github.com/t9md/vim-choosewin/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18077,6 +19563,7 @@ final: prev: {
       hash = "sha256-ufLheYnzc8EpCXERvV7LcpDoMOW4e4P/je3Q9Rh1gAI=";
     };
     meta.homepage = "https://github.com/rhysd/vim-clang-format/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18090,6 +19577,7 @@ final: prev: {
       hash = "sha256-rxbnQM0Fj6j7WFn0HKSGTPcMQ9DiOGUO0xhu2czJx0w=";
     };
     meta.homepage = "https://github.com/tpope/vim-classpath/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18103,6 +19591,7 @@ final: prev: {
       hash = "sha256-HnxYFW77MWnw5IHKTI1JpbkuXsNjRJDxRetgB6Ry4zk=";
     };
     meta.homepage = "https://github.com/guns/vim-clojure-highlight/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18116,6 +19605,7 @@ final: prev: {
       hash = "sha256-p//trww7y7ciSHN45VVnVdjBb1c71IXgXgf2s2HGKGk=";
     };
     meta.homepage = "https://github.com/guns/vim-clojure-static/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18129,6 +19619,7 @@ final: prev: {
       hash = "sha256-u7RLg6i1EG4miZzRGnT5yBQf4RuYRekHWqYKmpEi74Q=";
     };
     meta.homepage = "https://github.com/rstacruz/vim-closer/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18142,6 +19633,7 @@ final: prev: {
       hash = "sha256-WmXe+U4+qEecsRzsHqi3pYrk38wKVMxxOHtB/Lp4Rw0=";
     };
     meta.homepage = "https://github.com/alvan/vim-closetag/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18155,6 +19647,7 @@ final: prev: {
       hash = "sha256-/JcO2gCJg99di33d0ANnL33F3yUeeBg4eBVA21iZCvY=";
     };
     meta.homepage = "https://github.com/vhdirk/vim-cmake/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18168,6 +19661,7 @@ final: prev: {
       hash = "sha256-fCPetq4Wr/kuaT0Pcd6NSEAUBkkjbCE1PhTt0KLj9oI=";
     };
     meta.homepage = "https://github.com/tomasiser/vim-code-dark/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18181,6 +19675,7 @@ final: prev: {
       hash = "sha256-wcZUXW6Tv6qkGNtNfyugMDH2t1/7dfOv2Xl5NTewExY=";
     };
     meta.homepage = "https://github.com/google/vim-codefmt/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18194,6 +19689,7 @@ final: prev: {
       hash = "sha256-AvAB9ssClOOrcGQRZ70sMrcrmHlb0L+9FOh0MTLkZx4=";
     };
     meta.homepage = "https://github.com/kchmck/vim-coffee-script/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18207,6 +19703,7 @@ final: prev: {
       hash = "sha256-KZWwKUjnOIrfrVqtgjpcYTUYTxT6nXj4cTDTtwvzJ9I=";
     };
     meta.homepage = "https://github.com/kalbasit/vim-colemak/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18220,6 +19717,7 @@ final: prev: {
       hash = "sha256-j9nMjKYK7bqrGHprYp0ddLEWs1CNMudxXD13sOROVmY=";
     };
     meta.homepage = "https://github.com/owickstrom/vim-colors-paramount/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18233,6 +19731,7 @@ final: prev: {
       hash = "sha256-obLvaW7ulNr6dkMcMe4mCs3ROnz4eTnyfspDHVqloxU=";
     };
     meta.homepage = "https://github.com/altercation/vim-colors-solarized/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18246,6 +19745,7 @@ final: prev: {
       hash = "sha256-JhBnyvuKqP0ddKTUi+oVrfBd4Af/pxW4Goe+DfjB6LE=";
     };
     meta.homepage = "https://github.com/flazz/vim-colorschemes/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18259,6 +19759,7 @@ final: prev: {
       hash = "sha256-Gsswh6pjeVCLQAP/iNDt70kVXEMLlv3BjxTB+oDt0xc=";
     };
     meta.homepage = "https://github.com/jonbri/vim-colorstepper/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18272,6 +19773,7 @@ final: prev: {
       hash = "sha256-0a45pvYAbMxwN2URFX1lxIFBwWCq46LPai2GnGuL0Uo=";
     };
     meta.homepage = "https://github.com/tpope/vim-commentary/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18285,6 +19787,7 @@ final: prev: {
       hash = "sha256-xuET9UVwR82/y7APuCzyWVn9xlZJr46hPg51TkE+jkY=";
     };
     meta.homepage = "https://github.com/luan/vim-concourse/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18298,6 +19801,7 @@ final: prev: {
       hash = "sha256-mKlQkFH1665b290clIpx0BylrmOOmey/FX9XbSfC41s=";
     };
     meta.homepage = "https://github.com/romainl/vim-cool/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18311,6 +19815,7 @@ final: prev: {
       hash = "sha256-ofGDdI8DCNXGrf8rlggKpOx7DY7ccKdvRNeBi7Ipfrs=";
     };
     meta.homepage = "https://github.com/octol/vim-cpp-enhanced-highlight/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18324,6 +19829,7 @@ final: prev: {
       hash = "sha256-88QX1iF72zj+ec+yBUhHK4n9zWS8I8+ejhCDTaEolak=";
     };
     meta.homepage = "https://github.com/mhinz/vim-crates/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18337,6 +19843,7 @@ final: prev: {
       hash = "sha256-uGtPMgMt+s0GSQvpvo97diYOfhIf+pNuOQiGQ17I9uQ=";
     };
     meta.homepage = "https://github.com/vim-crystal/vim-crystal/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18350,6 +19857,7 @@ final: prev: {
       hash = "sha256-XvEPEBCvJIocIu12ZF8aqncjoBd2H4JX365MnvsD3zI=";
     };
     meta.homepage = "https://github.com/rbong/vim-crystalline/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18363,6 +19871,7 @@ final: prev: {
       hash = "sha256-ndFo3mG0UoMK3KyPoHj1L0+6p5aHG5hnJsuMtrEfTps=";
     };
     meta.homepage = "https://github.com/OrangeT/vim-csharp/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18376,6 +19885,7 @@ final: prev: {
       hash = "sha256-mkarxd+Xz9UpgrcYBjQlXqZbDQ95/Xikft9ftNPaXTU=";
     };
     meta.homepage = "https://github.com/ap/vim-css-color/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18389,6 +19899,7 @@ final: prev: {
       hash = "sha256-l1UyGjBdSCRH1EzzLE+hSI7OpYgtB0xTAy3wfxQK7ok=";
     };
     meta.homepage = "https://github.com/cue-lang/vim-cue/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18402,6 +19913,7 @@ final: prev: {
       hash = "sha256-JbfasdABxMIG3RRxOuesHaVlQsniNOFdYARVaWJSJos=";
     };
     meta.homepage = "https://github.com/itchyny/vim-cursorword/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18415,6 +19927,7 @@ final: prev: {
       hash = "sha256-UzQCdAWdM3fZIHqJBr280S71Cqf5q399wtSonUNGees=";
     };
     meta.homepage = "https://github.com/ehamberg/vim-cute-python/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18428,6 +19941,7 @@ final: prev: {
       hash = "sha256-1CA+H8wXDcA5sQLpHsJHHn9hNhWNyzZHHkVx3LqSPeA=";
     };
     meta.homepage = "https://github.com/tpope/vim-dadbod/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18441,6 +19955,7 @@ final: prev: {
       hash = "sha256-F+bCrgrRyNtgafwMSjkEBVj3LCBlxFZKajMF0K+x8D8=";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18454,6 +19969,7 @@ final: prev: {
       hash = "sha256-Of/9Ju2pkMEAZdSnDoRGxGSCBbR0e0oSRTts1VXVCf4=";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18467,6 +19983,7 @@ final: prev: {
       hash = "sha256-dZitAZGhii6MlP415zWaTDBlqumGYAZ+kndT9CtzJ/k=";
     };
     meta.homepage = "https://github.com/sunaku/vim-dasht/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18480,6 +19997,7 @@ final: prev: {
       hash = "sha256-dfvvNlfWWII6dccxaHx2hdLTLcvl0J7ghAHxDnuuEcA=";
     };
     meta.homepage = "https://github.com/ajmwagar/vim-deus/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18493,6 +20011,7 @@ final: prev: {
       hash = "sha256-9g3UdBcc34MR/BrKYqOki2Ge29k/QaRMsnyY+Pq9UE8=";
     };
     meta.homepage = "https://github.com/ryanoasis/vim-devicons/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18506,6 +20025,7 @@ final: prev: {
       hash = "sha256-M5tbfC3zZTSC6xYrVBNx3GtLfWn65qhs1+DxykrkGdQ=";
     };
     meta.homepage = "https://github.com/jeffkreeftmeijer/vim-dim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18519,6 +20039,7 @@ final: prev: {
       hash = "sha256-oDSON3C8TzWxA5tfIHb8fPVbQn8+gQ3C4sWJPSAsTpI=";
     };
     meta.homepage = "https://github.com/blueyed/vim-diminactive/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18532,19 +20053,21 @@ final: prev: {
       hash = "sha256-xfSnzYbXl6GlCQJ/c2434YrDNjtkyNsGeVVjSNJ3Ehs=";
     };
     meta.homepage = "https://github.com/will133/vim-dirdiff/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   vim-dirvish = buildVimPlugin {
     pname = "vim-dirvish";
-    version = "1.0-unstable-2025-11-14";
+    version = "1.0-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
-      rev = "6be56227a4207c93cd8b607f52f567a1e13dddb1";
-      hash = "sha256-22wI5qKpkwHZZdA75cDHD18TeinbnElyLN1x7kO6GDY=";
+      rev = "9525f46ccbf2dd585523fe3e3b72151554df3a42";
+      hash = "sha256-Ww6Rl1tdv9t1TExAjqtYz88BiN1V2t+TBXyoGSzvxsg=";
     };
     meta.homepage = "https://github.com/justinmk/vim-dirvish/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18558,6 +20081,7 @@ final: prev: {
       hash = "sha256-pX5KIDeXvHjDziJg9jR6kmQv77yt2Q/LgdQv5NkBbYc=";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dirvish-git/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18571,6 +20095,7 @@ final: prev: {
       hash = "sha256-+92jco3btPAHWbVKL0kXycL4Inji3Wi0LtfQ5vXe6B8=";
     };
     meta.homepage = "https://github.com/tpope/vim-dispatch/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18584,6 +20109,7 @@ final: prev: {
       hash = "sha256-tPalsGkfR99k467wu6PHkukRF3cAdgCEvNOmTY8bNoQ=";
     };
     meta.homepage = "https://github.com/radenling/vim-dispatch-neovim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18597,6 +20123,7 @@ final: prev: {
       hash = "sha256-LVmQZTgOv2lkry7k2R+qCJrXvHrqeSCMTA6KEmoa3co=";
     };
     meta.homepage = "https://github.com/jhradilek/vim-docbk/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18610,6 +20137,7 @@ final: prev: {
       hash = "sha256-GQI1aN1Y5xmVZrTZuGLOWqXgOfo0ndPEEAnlwN0z9vI=";
     };
     meta.homepage = "https://github.com/jhradilek/vim-snippets/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18623,6 +20151,7 @@ final: prev: {
       hash = "sha256-12pQdMoL58M36uKroct0A0T1hmrhQa3VPEBaVWk8IRg=";
     };
     meta.homepage = "https://github.com/tpope/vim-dotenv/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18636,6 +20165,7 @@ final: prev: {
       hash = "sha256-9CfWi83DCzWBARNG6AA0MQllEfQ/3UtYtYPDWLdmDwk=";
     };
     meta.homepage = "https://github.com/junegunn/vim-easy-align/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18649,6 +20179,7 @@ final: prev: {
       hash = "sha256-Ls785yG6nQGonpF5oqWc2NzMgklt3Bo7xG2xGCmsE0E=";
     };
     meta.homepage = "https://github.com/zhou13/vim-easyescape/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18662,6 +20193,7 @@ final: prev: {
       hash = "sha256-aAr8UwxGs0+ZGqWuP1WbuVlqL46V3ywzEH+q6i3Qgqg=";
     };
     meta.homepage = "https://github.com/neoclide/vim-easygit/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18675,6 +20207,7 @@ final: prev: {
       hash = "sha256-4Xc7QHlS2zdVHksIMPZUkJcd8Urq3NK0AmKUHMFUYMA=";
     };
     meta.homepage = "https://github.com/easymotion/vim-easymotion/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18688,6 +20221,7 @@ final: prev: {
       hash = "sha256-UYTofWq9aLN/oys89tdOC6yn+US3g1jDAga1olxQEEU=";
     };
     meta.homepage = "https://github.com/xolox/vim-easytags/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18701,6 +20235,7 @@ final: prev: {
       hash = "sha256-YgfWG/PjsDMW2z90sJyezFciVWn9eFEqLu4wJLydAfo=";
     };
     meta.homepage = "https://github.com/justincampbell/vim-eighties/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18714,6 +20249,7 @@ final: prev: {
       hash = "sha256-piKIpnc6FmVxpTnp/arSVMf9ljIT6Ah/CHPMGOEgs0A=";
     };
     meta.homepage = "https://github.com/elixir-editors/vim-elixir/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18727,6 +20263,7 @@ final: prev: {
       hash = "sha256-2Q1JGlxmwUggc6n9l/PqkpheSBkaYs9fbYn0+8+Lo1k=";
     };
     meta.homepage = "https://github.com/andys8/vim-elm-syntax/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18740,6 +20277,7 @@ final: prev: {
       hash = "sha256-ZuD+01VXJMSl0AmVZwXTzGfbnHg1fcVJGjnbXfRmcKE=";
     };
     meta.homepage = "https://github.com/kentarosasaki/vim-emacs-bindings/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18753,6 +20291,7 @@ final: prev: {
       hash = "sha256-3gdd2lFAMKJTqV9IV3CL7809RLkITa0Wi91dcMqvfC8=";
     };
     meta.homepage = "https://github.com/junegunn/vim-emoji/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18766,6 +20305,7 @@ final: prev: {
       hash = "sha256-DnyfqrHMRRHNlpcC0zk6oJpUcWp6Fm6OOm7+j1lKPvQ=";
     };
     meta.homepage = "https://github.com/tpope/vim-endwise/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18779,6 +20319,7 @@ final: prev: {
       hash = "sha256-eOMpCj4o9EK5mhbXEQ5Vz32/0UKbyRxNyDHhtP8QggE=";
     };
     meta.homepage = "https://github.com/Olical/vim-enmasse/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18792,6 +20333,7 @@ final: prev: {
       hash = "sha256-vVPleQoA8nlPzyG4CAmPUQbU6nf2GAfaDxmygdssHtI=";
     };
     meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18805,6 +20347,7 @@ final: prev: {
       hash = "sha256-kvAn6oUQAWCaLHO8eKkgWros2mILumDugxiL0UveZwI=";
     };
     meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18818,6 +20361,7 @@ final: prev: {
       hash = "sha256-u7p/KQcpvuemmea1WS5c2BojTC26MogpX70BcywxtxY=";
     };
     meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18831,6 +20375,7 @@ final: prev: {
       hash = "sha256-c6OHBuHSnd6tVcCR0IudYM6x7EGXkgbaJm5/2RZiKrA=";
     };
     meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18844,6 +20389,7 @@ final: prev: {
       hash = "sha256-vvt9CJfD2Y8rhFKVbvSEJYQN8jWrw6NTq8Wp/COVH1E=";
     };
     meta.homepage = "https://github.com/tpope/vim-eunuch/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18857,6 +20403,7 @@ final: prev: {
       hash = "sha256-rjqahEzXEmTtpOil9jm2xyscjJLiKRmPB0pgwFFBKGc=";
     };
     meta.homepage = "https://github.com/tommcdo/vim-exchange/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18870,6 +20417,7 @@ final: prev: {
       hash = "sha256-+5seES5Y2z8eW51tHWW66fnEFXLbShucCblvMqnkYFA=";
     };
     meta.homepage = "https://github.com/terryma/vim-expand-region/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18883,6 +20431,7 @@ final: prev: {
       hash = "sha256-CuGeS8E/ADOeSjUOnEei8dksswB9G3yILO5V11YyjmI=";
     };
     meta.homepage = "https://github.com/int3/vim-extradite/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18896,6 +20445,7 @@ final: prev: {
       hash = "sha256-2XkM4Niq8FLxr/gNOBWaleggtgeb+SVIQZeLDtintR4=";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-fern/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18909,6 +20459,7 @@ final: prev: {
       hash = "sha256-IQ1P0jqRn6qUhdRp2zoLb2Tgd57/wTKq2W43aM+lj+A=";
     };
     meta.homepage = "https://github.com/wsdjeg/vim-fetch/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18922,6 +20473,7 @@ final: prev: {
       hash = "sha256-SL3FQDvU87UPoRcca+axp2oijMBmSJo1Zwef8uZWlEA=";
     };
     meta.homepage = "https://github.com/fadein/vim-figlet/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18935,6 +20487,7 @@ final: prev: {
       hash = "sha256-/tvx0yY2XZrwtkTucLtWZsW7MnB1GkdEcxKACmvcU+g=";
     };
     meta.homepage = "https://github.com/tpope/vim-fireplace/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18948,6 +20501,7 @@ final: prev: {
       hash = "sha256-8OjCJcGW425sb8nOabCoT/MxlNR13qub/oRRBVKlcvs=";
     };
     meta.homepage = "https://github.com/dag/vim-fish/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18961,6 +20515,7 @@ final: prev: {
       hash = "sha256-6VkjYY8z1SrpFqvWPCDYRPbS3qGana2EsKeugXvm5Pk=";
     };
     meta.homepage = "https://github.com/tpope/vim-flagship/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -18974,6 +20529,7 @@ final: prev: {
       hash = "sha256-TQovzI4jc0D0tM1w+x0KPCCqOB8LMJ6da5od6voyQss=";
     };
     meta.homepage = "https://github.com/nvie/vim-flake8/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -18987,6 +20543,7 @@ final: prev: {
       hash = "sha256-tb/QToEbEIg5SIYCnfI99qPI6HgwJD2+dpeZoqlK0dU=";
     };
     meta.homepage = "https://github.com/dcharbon/vim-flatbuffers/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19000,6 +20557,7 @@ final: prev: {
       hash = "sha256-A4SpMFB1thUhF4N5I7N+HnycE/OXQQbJVMr4wo0gKUc=";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19013,6 +20571,7 @@ final: prev: {
       hash = "sha256-x8fUmcuBLEQwZD+m7gEanpPppukRa6NoalNehY/2JuM=";
     };
     meta.homepage = "https://github.com/rbong/vim-flog/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19026,6 +20585,7 @@ final: prev: {
       hash = "sha256-a0v1ievhv7duLYOMaqmDWz0PM82U00MIlcZH6Lid8Yo=";
     };
     meta.homepage = "https://github.com/thosakwe/vim-flutter/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19039,6 +20599,7 @@ final: prev: {
       hash = "sha256-T7t+fbNREwNRRnwGl2uOGfpP9+Pibeiuns7P9/ITfYY=";
     };
     meta.homepage = "https://github.com/arecarn/vim-fold-cycle/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19052,6 +20613,7 @@ final: prev: {
       hash = "sha256-VNUfBvABPUO7N6m4QtKBHpdNPu1QYtWYS8oEfjlpgrE=";
     };
     meta.homepage = "https://github.com/embear/vim-foldsearch/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19065,6 +20627,7 @@ final: prev: {
       hash = "sha256-qjqNarMKuNb6dsXeh/euV2jl7ApLih72o1V9NzsraS4=";
     };
     meta.homepage = "https://github.com/thinca/vim-ft-diff_fold/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19078,6 +20641,7 @@ final: prev: {
       hash = "sha256-VxLhfsh+VN3DvlSTvc7s0FcGkUpH/JqmKQ947MnnI+Y=";
     };
     meta.homepage = "https://github.com/tommcdo/vim-fubitive/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19091,6 +20655,7 @@ final: prev: {
       hash = "sha256-vXSOXq3Tj5g0jUwQEZ0RRlon1OEX+jv1dgofUl4QcQg=";
     };
     meta.homepage = "https://github.com/tpope/vim-fugitive/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19104,6 +20669,7 @@ final: prev: {
       hash = "sha256-SmEesr0ne7zp2SV5JySEG5Fq2kO4AairMxg8H2Xiomw=";
     };
     meta.homepage = "https://github.com/maxjacobson/vim-fzf-coauthorship/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19117,6 +20683,7 @@ final: prev: {
       hash = "sha256-9Rfn7n/cn5XQ3Ykbe4aQbGKToewQbydXuzJT8IISGNM=";
     };
     meta.homepage = "https://github.com/HealsCodes/vim-gas/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19130,6 +20697,7 @@ final: prev: {
       hash = "sha256-yx2EqdZva/06xm2rnLQX3RXCu17HpzTcv1x/U7qnqho=";
     };
     meta.homepage = "https://github.com/ruanyl/vim-gh-line/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19143,6 +20711,7 @@ final: prev: {
       hash = "sha256-sC83gfCY3vtHDQ5iKV2Ax9DqES2qBz6a4Hro1TDsd5U=";
     };
     meta.homepage = "https://github.com/raghur/vim-ghost/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19156,6 +20725,7 @@ final: prev: {
       hash = "sha256-+F+ehYUvztezq+06VegLPblAS83VpB/fm8Y30eO1VCY=";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-gina/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19169,6 +20739,7 @@ final: prev: {
       hash = "sha256-vI1A/INwip/PIuEL/2NNQ3j8iZEtPttALXM1wnmvBas=";
     };
     meta.homepage = "https://github.com/mattn/vim-gist/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19182,6 +20753,7 @@ final: prev: {
       hash = "sha256-rEaRXgDVBHjiO8ROVwoBfoxACpgEUtDaJ4y05ImGCGA=";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-gista/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19195,6 +20767,7 @@ final: prev: {
       hash = "sha256-jLEhuLcG2csnRuBXCtbz2eKOPqhUwHdlhmAfbLpD5bo=";
     };
     meta.homepage = "https://github.com/tpope/vim-git/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19208,6 +20781,7 @@ final: prev: {
       hash = "sha256-AFCgabCEmEQjCzCrGg8dDCv5K7woOEZlS6u0Dhjnplk=";
     };
     meta.homepage = "https://github.com/itchyny/vim-gitbranch/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19221,6 +20795,7 @@ final: prev: {
       hash = "sha256-TESn+hh9ceDxacWFIesi75kkorDkQNRec6ClMKI7tWs=";
     };
     meta.homepage = "https://github.com/airblade/vim-gitgutter/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19234,6 +20809,7 @@ final: prev: {
       hash = "sha256-kdPmOGYi/B52bWq6zsxvKWwoFqpqOZ04LJGOGCtNvIE=";
     };
     meta.homepage = "https://github.com/junegunn/vim-github-dashboard/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19247,6 +20823,7 @@ final: prev: {
       hash = "sha256-d5lh5S1YQ1OzlsKmj+cB9UAdbX7haAqo3eR/4s4H7FQ=";
     };
     meta.homepage = "https://github.com/stykhomyrov/vim-glsl/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19260,6 +20837,7 @@ final: prev: {
       hash = "sha256-xIchBiNEZbrz0LRIWorJEac8y4DBa4akuM4JPqM0Yp4=";
     };
     meta.homepage = "https://github.com/JafarDakhan/vim-gml/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19273,6 +20851,7 @@ final: prev: {
       hash = "sha256-B6hSEeNjJdDUDjM0DlmAxc3zRRcJz91//GPk6rCWn6I=";
     };
     meta.homepage = "https://github.com/jamessan/vim-gnupg/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19286,6 +20865,7 @@ final: prev: {
       hash = "sha256-0mmt7i8GImhVR2kmr8MOQHFybw8QDXVRrYVg/ty30zU=";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19299,6 +20879,7 @@ final: prev: {
       hash = "sha256-VvBlw2AuFCGw73UOOnhgd6baPkqp838xa7RQjAuCBpM=";
     };
     meta.homepage = "https://github.com/habamax/vim-godot/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19312,6 +20893,7 @@ final: prev: {
       hash = "sha256-8kCWoXMAvzUuexxmgX4vADsJrBEwmLtl4QTjNgcujwQ=";
     };
     meta.homepage = "https://github.com/rhysd/vim-grammarous/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19325,6 +20907,7 @@ final: prev: {
       hash = "sha256-hN+YE6PQnApdK5dKERJBVpKepicYIgsfY5mpZiiOcfE=";
     };
     meta.homepage = "https://github.com/jparise/vim-graphql/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19338,6 +20921,7 @@ final: prev: {
       hash = "sha256-MLKikTcGuZIDvkUvCMQP46CeUOF17aT9hsBGTzBAQok=";
     };
     meta.homepage = "https://github.com/mhinz/vim-grepper/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19351,6 +20935,7 @@ final: prev: {
       hash = "sha256-kQMLaFY/Rr571Dixcewg6NBpmycxgwS1p7DCvpaITLk=";
     };
     meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19364,6 +20949,7 @@ final: prev: {
       hash = "sha256-w5LcBaqotGkgQy/f/cs4dkQnLIPQ0fOoXl4n5edMe4Y=";
     };
     meta.homepage = "https://github.com/brennanfee/vim-gui-position/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19377,19 +20963,21 @@ final: prev: {
       hash = "sha256-Y+CFG55h0APxuFwHgUE+o3LJNprBWFyuuZCPrKNgzb4=";
     };
     meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   vim-habamax = buildVimPlugin {
     pname = "vim-habamax";
-    version = "0-unstable-2026-04-16";
+    version = "0-unstable-2026-04-30";
     src = fetchFromGitHub {
       owner = "habamax";
       repo = "vim-habamax";
-      rev = "20f89dedde764c7026254359a3aa0507bb0174f3";
-      hash = "sha256-vqrYsCDKz1c0uLsaCcwpG0dS+ipVNRZknsC+3i7kICI=";
+      rev = "c944829d55e41f4572261ed6e758a25c9ca33b90";
+      hash = "sha256-734j4UeqUU8PxEn8gI7Q5opC01+NM0lE1ePQqJrRtIA=";
     };
     meta.homepage = "https://github.com/habamax/vim-habamax/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19403,6 +20991,7 @@ final: prev: {
       hash = "sha256-WP7Q1GwzSZzkeZl1t3JVo0ENk89LIgEBKyJMf0bdG7k=";
     };
     meta.homepage = "https://github.com/takac/vim-hardtime/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19416,6 +21005,7 @@ final: prev: {
       hash = "sha256-UVoZqZU3EnkEiHWfR2yg8sHzh6KwA5ix8S19/4ZwXEk=";
     };
     meta.homepage = "https://github.com/chkno/vim-haskell-module-name/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19429,6 +21019,7 @@ final: prev: {
       hash = "sha256-qj7ciF1adyQ0MrPaAu5nuHc4bdc1vgwpGicITS97UPg=";
     };
     meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19442,6 +21033,7 @@ final: prev: {
       hash = "sha256-OSQwoDf5uqUyqMILkgGkhyccaPoT6R4+oS+TCEdBBs4=";
     };
     meta.homepage = "https://github.com/twinside/vim-haskellconceal/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19455,6 +21047,7 @@ final: prev: {
       hash = "sha256-+FGmFTKAXIAiJN3rU7zUCR/pds4WZAhwUDbyVqaK5V4=";
     };
     meta.homepage = "https://github.com/jvirtanen/vim-hcl/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19468,6 +21061,7 @@ final: prev: {
       hash = "sha256-cerqasD/mvLdE9g4HGs2fVaKzNed4lZ7sNyzFr35cvc=";
     };
     meta.homepage = "https://github.com/bitc/vim-hdevtools/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19481,6 +21075,7 @@ final: prev: {
       hash = "sha256-X+hTI/v7ro3z9hQl2cQOz3LbCvh4LUzBwj+u6QGbr18=";
     };
     meta.homepage = "https://github.com/towolf/vim-helm/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19495,6 +21090,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/RRethy/vim-hexokinase/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19508,6 +21104,7 @@ final: prev: {
       hash = "sha256-4vIQvMNaopyILttcHy/YmdXONooDwF0MOTPLhSBe2+g=";
     };
     meta.homepage = "https://github.com/jceb/vim-hier/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19521,6 +21118,7 @@ final: prev: {
       hash = "sha256-OTwLJgQa4/aTmxBqL5YBifsINwWVIrvEwaaZiO8WRcM=";
     };
     meta.homepage = "https://github.com/machakann/vim-highlightedyank/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19534,6 +21132,7 @@ final: prev: {
       hash = "sha256-JipB0m3amV9yOpwNfA9G86p0k22hHFu0c4Gqj8a3lvg=";
     };
     meta.homepage = "https://github.com/alx741/vim-hindent/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19547,6 +21146,7 @@ final: prev: {
       hash = "sha256-Is4N/h/x7fElqomxp0fx7nf3ICr0CcDHDPX+MFKdzHA=";
     };
     meta.homepage = "https://github.com/GEverding/vim-hocon/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19560,6 +21160,7 @@ final: prev: {
       hash = "sha256-9oDm9uNKX1wZXvi7IoxrG142R6SffWbPfDKK806JG58=";
     };
     meta.homepage = "https://github.com/Twinside/vim-hoogle/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19573,6 +21174,7 @@ final: prev: {
       hash = "sha256-63D6mRK7liVNMkYMrHfukVZDGr4pJZIFirnHCDghUj0=";
     };
     meta.homepage = "https://github.com/ntk148v/vim-horizon/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19586,6 +21188,7 @@ final: prev: {
       hash = "sha256-BezZp1kRFCwMMhBmzEdajGQv1ZfyObqjhPPP/aP+7oY=";
     };
     meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19599,6 +21202,7 @@ final: prev: {
       hash = "sha256-h90J8q8WZDHTZr6MuN9PHzbwbPGK3Bu/ErG0uZDjyX8=";
     };
     meta.homepage = "https://github.com/humanoid-colors/vim-humanoid-colorscheme/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19612,6 +21216,7 @@ final: prev: {
       hash = "sha256-alayuxDdf7q+y8jAjkFC759IU1/dDgVwGLBJorD6eCY=";
     };
     meta.homepage = "https://github.com/vim-utils/vim-husk/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19625,6 +21230,7 @@ final: prev: {
       hash = "sha256-AL5by9R8r5EzP4fdr9QUplNR57mRp8i856uCgPm+XxE=";
     };
     meta.homepage = "https://github.com/hylang/vim-hy/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Vim";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19638,6 +21244,7 @@ final: prev: {
       hash = "sha256-vLLHiLZ8MgOtke+SyW+iyzj9y4c+Vp9yQTzCIEIaeLA=";
     };
     meta.homepage = "https://github.com/w0ng/vim-hybrid/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19651,6 +21258,7 @@ final: prev: {
       hash = "sha256-TDD99syRay/MVCF4BfX1BDeX1RFlEb61ASf15lgRT2I=";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-hybrid-material/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19664,6 +21272,7 @@ final: prev: {
       hash = "sha256-V4a9D3HpT1SZUrUc1XrC6SsrtKmIcFxdSVmq0Gwt/Ik=";
     };
     meta.homepage = "https://github.com/nuchs/vim-hypr-nav/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19677,6 +21286,7 @@ final: prev: {
       hash = "sha256-x4WVkZdaUaFzb5mkM9fKPnY4tBc0CgRypjmV4W2OzpM=";
     };
     meta.homepage = "https://github.com/noc7c9/vim-iced-coffee-script/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19690,6 +21300,7 @@ final: prev: {
       hash = "sha256-KqAJRCtDBG5xsvNsqkxoBdDckg02u4NBBreYQw7BphA=";
     };
     meta.homepage = "https://github.com/RRethy/vim-illuminate/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19703,6 +21314,7 @@ final: prev: {
       hash = "sha256-YvUyNsejKmboVKb4Y2tqr/vL1Fd1MDInrZ7l/dEWqpc=";
     };
     meta.homepage = "https://github.com/preservim/vim-indent-guides/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19716,6 +21328,7 @@ final: prev: {
       hash = "sha256-fIqe85gstH9KEXrXPHdsSI3KgPYs5wDtufYKHFXKaxE=";
     };
     meta.homepage = "https://github.com/michaeljsmith/vim-indent-object/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19729,6 +21342,7 @@ final: prev: {
       hash = "sha256-ne2r1RdQnHYQ3z3jcCTr85kUPu42oYEKZhGh6FSY3y4=";
     };
     meta.homepage = "https://github.com/jeetsukumaran/vim-indentwise/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19742,6 +21356,7 @@ final: prev: {
       hash = "sha256-P51sfZTfXa0yYWNFrIOqjZj1QnPGfh35m4o9cY5NhiQ=";
     };
     meta.homepage = "https://github.com/henrik/vim-indexed-search/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19755,6 +21370,7 @@ final: prev: {
       hash = "sha256-ffh7GRMZUjXr6d2rS9V6wlz6iv+lEZX/XmF7pN12l4M=";
     };
     meta.homepage = "https://github.com/ivanov/vim-ipython/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19768,6 +21384,7 @@ final: prev: {
       hash = "sha256-QwA7+6abdo+SnMpQ+CuiE3/OT0MZ4r14SqO6DbS087o=";
     };
     meta.homepage = "https://github.com/fisadev/vim-isort/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19781,6 +21398,7 @@ final: prev: {
       hash = "sha256-4kYY0jUv5U2i+G/29vPOZHqUX/cEQTWBo9pghRg9gIw=";
     };
     meta.homepage = "https://github.com/clojure-vim/vim-jack-in/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19794,6 +21412,7 @@ final: prev: {
       hash = "sha256-ZD+V/3dC10SlP6pzSLSmKQbPeSGpVWQRhb7jFLN/fpk=";
     };
     meta.homepage = "https://github.com/mhinz/vim-janah/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19807,6 +21426,7 @@ final: prev: {
       hash = "sha256-8P6rEfd4HN40oSwPFH2hMCQTj6ixVzomjZ//+zlt5Ds=";
     };
     meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Vim";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19820,6 +21440,7 @@ final: prev: {
       hash = "sha256-uwLDmF/fvAfkcHHNAsVT+68bStN022dw/8gYm7hk8ms=";
     };
     meta.homepage = "https://github.com/pangloss/vim-javascript/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19833,6 +21454,7 @@ final: prev: {
       hash = "sha256-uJcoQ8UTS8d7xhhT8wnXSCdYJ5NeV7yLheHrj5xFhsY=";
     };
     meta.homepage = "https://github.com/jelera/vim-javascript-syntax/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19846,6 +21468,7 @@ final: prev: {
       hash = "sha256-dBNl1y9b3zTrSBkw25XaJhlscmVaA8dkznzy+wv2M7s=";
     };
     meta.homepage = "https://github.com/tpope/vim-jdaddy/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19859,6 +21482,7 @@ final: prev: {
       hash = "sha256-H6JWXWXcA/iAy80HnVzRlTy0DDR0D1VAWr1FbcbdPfI=";
     };
     meta.homepage = "https://github.com/tani/vim-jetpack/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19872,6 +21496,7 @@ final: prev: {
       hash = "sha256-D7VPO36AAj+Ny3fYbZJf7Z2Zhdt0R8BkkDb3QluOeJQ=";
     };
     meta.homepage = "https://github.com/lepture/vim-jinja/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19885,6 +21510,7 @@ final: prev: {
       hash = "sha256-3v433JmLeVVjWHkHBZusLd6l11+zN+DxZu/DZtbnLvk=";
     };
     meta.homepage = "https://github.com/seirl/vim-jinja-languages/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19898,6 +21524,7 @@ final: prev: {
       hash = "sha256-IIiBJlGmdYntwqizUy2xB8hhBJBGa1ASK9hmN8xZEvk=";
     };
     meta.homepage = "https://github.com/avm99963/vim-jjdescription/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Vim";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19912,6 +21539,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/maksimr/vim-jsbeautify/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19925,6 +21553,7 @@ final: prev: {
       hash = "sha256-N3Jlx/mdVa5XbFoXjXgUOQpF+Xu0SvvD17pQJ+fTJkQ=";
     };
     meta.homepage = "https://github.com/heavenshell/vim-jsdoc/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19938,6 +21567,7 @@ final: prev: {
       hash = "sha256-4eLcpybVnmnXdhqbTc9JejNoMKnZyyKp+7cQ7TO+KbA=";
     };
     meta.homepage = "https://github.com/elzr/vim-json/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -19951,6 +21581,7 @@ final: prev: {
       hash = "sha256-ChgUGTrLthuGSws/UpF71JYI/c2QqItax6hsh7mYX/w=";
     };
     meta.homepage = "https://github.com/google/vim-jsonnet/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19964,6 +21595,7 @@ final: prev: {
       hash = "sha256-SdE8BKpZ5civFG/ET0+GeHvGc6gK6+dWP55mQrthqVA=";
     };
     meta.homepage = "https://github.com/mogelbrod/vim-jsonpath/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19977,6 +21609,7 @@ final: prev: {
       hash = "sha256-6K75uLhqEyH325Wd/xN6JmCw/6vWGRBDKpiF5bY0p5k=";
     };
     meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -19990,6 +21623,7 @@ final: prev: {
       hash = "sha256-x6ZOejria+DL5hagCW4Vdg0yHvqEhVS3T/uIVCeyh48=";
     };
     meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20003,6 +21637,7 @@ final: prev: {
       hash = "sha256-4jNnMuYej4mCci0qNISbkDLGBmScudPlh6xiMsVrRo8=";
     };
     meta.homepage = "https://github.com/mroavi/vim-julia-cell/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20016,6 +21651,7 @@ final: prev: {
       hash = "sha256-nCW8+x64GiJkbKshi3RhfRQoceTV5QPXs0mculC8xhM=";
     };
     meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20029,6 +21665,7 @@ final: prev: {
       hash = "sha256-XoOEVCCAmD5TfyuUrHXNFmmXLIFwgJgl/fSFTbgytyg=";
     };
     meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20042,6 +21679,7 @@ final: prev: {
       hash = "sha256-L5b8Dqtu/a25f1phQGsNaBz8OVs5gJy7BG+YrEZVcAM=";
     };
     meta.homepage = "https://github.com/lark-parser/vim-lark-syntax/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20055,6 +21693,7 @@ final: prev: {
       hash = "sha256-6/Gl7l3ImGqfKkOp0kkHdSQhRCw3jM2NyzRuQfAqAh4=";
     };
     meta.homepage = "https://github.com/farmergreg/vim-lastplace/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20068,6 +21707,7 @@ final: prev: {
       hash = "sha256-peOqUNNNnpnjNgsHBlKUT7zb/upzk43VhFMxbdgO0RY=";
     };
     meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20081,6 +21721,7 @@ final: prev: {
       hash = "sha256-GzBzND7VBWrAqn+PjYTDXj4GxYW81Fb7VGIqDp4gnSs=";
     };
     meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20094,6 +21735,7 @@ final: prev: {
       hash = "sha256-W/n70utKjNPRPl4Z1xfSTGMC6QJVTZlvRiIncfJ+ONg=";
     };
     meta.homepage = "https://github.com/hecal3/vim-leader-guide/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20107,6 +21749,7 @@ final: prev: {
       hash = "sha256-z/19LF7ZnOr0R2phgv3qB4q/2jKawskdmk8keRwfgfs=";
     };
     meta.homepage = "https://github.com/mk12/vim-lean/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20120,6 +21763,7 @@ final: prev: {
       hash = "sha256-vwMBEIlKorWs0agm1FgYvbYUO6e7RNb1X+bOL15qQps=";
     };
     meta.homepage = "https://github.com/ledger/vim-ledger/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20133,6 +21777,7 @@ final: prev: {
       hash = "sha256-HlPnGklYyxBm+VPj1J8214mzCB0RgJUOTNu3MekI9Yk=";
     };
     meta.homepage = "https://github.com/preservim/vim-lexical/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20146,6 +21791,7 @@ final: prev: {
       hash = "sha256-nhitS6E7+ZwqGOL8PxeYPnEZZphtvv2L8qekb7OnxPE=";
     };
     meta.homepage = "https://github.com/lfe-support/vim-lfe/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20159,6 +21805,7 @@ final: prev: {
       hash = "sha256-6tfyTSjUu+TN6s2QK/fKXGdFohoeQikyzZ+aHIUkPOQ=";
     };
     meta.homepage = "https://github.com/josa42/vim-lightline-coc/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20172,6 +21819,7 @@ final: prev: {
       hash = "sha256-B+avg/Sm+ds1tgKf35Kr247rtYS4je0QGuYxXkr0KbI=";
     };
     meta.homepage = "https://github.com/tommcdo/vim-lion/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20185,6 +21833,7 @@ final: prev: {
       hash = "sha256-iqkjji8VhCKwjfw13QWIfP6q5EEiiktO1u7h1mHvMVY=";
     };
     meta.homepage = "https://github.com/tpope/vim-liquid/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20198,6 +21847,7 @@ final: prev: {
       hash = "sha256-uvTVn/vyoAOcnTwUfzK060XM7d3EjnReThxVfhYEU94=";
     };
     meta.homepage = "https://github.com/rhysd/vim-llvm/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20211,6 +21861,7 @@ final: prev: {
       hash = "sha256-7lvW0w3D8cv4xre1aLqN4HTg3BgdDi4silPuV6sv+PQ=";
     };
     meta.homepage = "https://github.com/embear/vim-localvimrc/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20224,6 +21875,7 @@ final: prev: {
       hash = "sha256-nMyINojfIHgJFanmzKYIteFeMTjHwat8XkS3anqpoDA=";
     };
     meta.homepage = "https://github.com/andreshazard/vim-logreview/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20237,6 +21889,7 @@ final: prev: {
       hash = "sha256-enZpz3PIemCowfRRuzN8pSHruvrpowyGqm6qXNFgDZw=";
     };
     meta.homepage = "https://github.com/mlr-msft/vim-loves-dafny/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MS-PL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20250,6 +21903,7 @@ final: prev: {
       hash = "sha256-E8q17fWXvuA7siPFINPBT4eKkHLlGU54HWkdC9+4P0U=";
     };
     meta.homepage = "https://github.com/natebosch/vim-lsc/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20263,6 +21917,7 @@ final: prev: {
       hash = "sha256-ZMqeuTKyQAknqXA4IvNCzgumcrafu0sLNp3ZFwQ6kj4=";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20276,6 +21931,7 @@ final: prev: {
       hash = "sha256-8fGLdc1OA8JCI5TjCdXLQNB22f3KZ4u3cBvb8er+z58=";
     };
     meta.homepage = "https://github.com/rhysd/vim-lsp-ale/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20289,6 +21945,7 @@ final: prev: {
       hash = "sha256-M9s+nAbrxs1ZMExPlDc6twcCM9Cg/CjAARluD+kZd5Q=";
     };
     meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20302,6 +21959,7 @@ final: prev: {
       hash = "sha256-G7+ToiCUgdwANcPtVZFqBsAEcON+mwgpaRQtOaXtpb8=";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20315,6 +21973,7 @@ final: prev: {
       hash = "sha256-pOf4epxM2KBN+JtmeeyeB+6hBr2C34bWwHFk4IFuckY=";
     };
     meta.homepage = "https://github.com/thomasfaingnaert/vim-lsp-snippets/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20328,6 +21987,7 @@ final: prev: {
       hash = "sha256-kVDZ1ireZgL8wAuVGOD0z2IDdk9k7MYFwDGbgP3YmAA=";
     };
     meta.homepage = "https://github.com/thomasfaingnaert/vim-lsp-ultisnips/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20341,6 +22001,7 @@ final: prev: {
       hash = "sha256-dZDXPFQiiGFXaXZK7ttWyP7Fcv+3JCtPYxSgXa90d7o=";
     };
     meta.homepage = "https://github.com/tbastos/vim-lua/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20354,6 +22015,7 @@ final: prev: {
       hash = "sha256-lCtftTLhZGoe4kfV43xwEvN5Xq/LVzzmENQHHCshS+M=";
     };
     meta.homepage = "https://github.com/google/vim-maktaba/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20367,19 +22029,21 @@ final: prev: {
       hash = "sha256-VLYGk6RiT/Vej3woPmpOe9ebiDDQms6B8xKw1aGouoQ=";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-manpager/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   vim-markbar = buildVimPlugin {
     pname = "vim-markbar";
-    version = "0-unstable-2024-05-10";
+    version = "0-unstable-2026-04-22";
     src = fetchFromGitHub {
       owner = "Yilin-Yang";
       repo = "vim-markbar";
-      rev = "9f5a948d44652074bf2b90d3da6a400d8a369ba5";
+      rev = "54cd772352b4da4506ce23e971f46f78446f0b6c";
       hash = "sha256-dGMO0vbi4LMQeMvA/NI98S/CsDT7LKDPrLP9NFkMZOQ=";
     };
     meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20393,6 +22057,7 @@ final: prev: {
       hash = "sha256-bkVQRCu+F7VjIdY0Ll0MYhPrAShri9AONixOXq2V7rw=";
     };
     meta.homepage = "https://github.com/preservim/vim-markdown/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20406,6 +22071,7 @@ final: prev: {
       hash = "sha256-Dj5mUFf6FvAh2YbV4L8lTlFoM4N3pozTf99RjwEdobk=";
     };
     meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20419,6 +22085,7 @@ final: prev: {
       hash = "sha256-dO3+vS5tlpo+rqOAD8IPXNHPjCuhXkYgazGGj+V5R0I=";
     };
     meta.homepage = "https://github.com/leafOfTree/vim-matchtag/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20432,6 +22099,7 @@ final: prev: {
       hash = "sha256-REbSURtBOLWhjyZyJdEQ4VQXifX6e3bv9+B9PpKlq8o=";
     };
     meta.homepage = "https://github.com/andymass/vim-matchup/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20445,6 +22113,7 @@ final: prev: {
       hash = "sha256-3yuf5d9A2anJwmOmdIrlcC0/EAHh/K2z3skrDRzfoQE=";
     };
     meta.homepage = "https://github.com/aquach/vim-mediawiki-editor/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20458,6 +22127,7 @@ final: prev: {
       hash = "sha256-l63Iek33eqSSEEAcirhLQq/pibHuiggAqc36bwCNf8Q=";
     };
     meta.homepage = "https://github.com/samoshkin/vim-mergetool/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20471,6 +22141,7 @@ final: prev: {
       hash = "sha256-c1x/KYiam9l+RX9ATwZlpLCJ380kno3sBS330eudFz0=";
     };
     meta.homepage = "https://github.com/idanarye/vim-merginal/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20484,6 +22155,7 @@ final: prev: {
       hash = "sha256-UGv7i4+K70QTD0ajTyjtQT4yQeSdHYKfT5ujkKFTmD8=";
     };
     meta.homepage = "https://github.com/david-a-wheeler/vim-metamath/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20497,6 +22169,7 @@ final: prev: {
       hash = "sha256-0XGugINNYH+o8uPePNz28Nojy1dxdVD8RYU53xA6qWU=";
     };
     meta.homepage = "https://github.com/xolox/vim-misc/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20510,6 +22183,7 @@ final: prev: {
       hash = "sha256-g/0bkSBTKFykt4/k+fV+XSErAPDkf+cu4sLGoX5VsQ0=";
     };
     meta.homepage = "https://github.com/delroth/vim-molokai-delroth/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20523,6 +22197,7 @@ final: prev: {
       hash = "sha256-PJxHKsyinieRigMNtSa/jhCQQ5WQK8wzA9lryV7CuqQ=";
     };
     meta.homepage = "https://github.com/crusoexia/vim-monokai/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20536,6 +22211,7 @@ final: prev: {
       hash = "sha256-On1kMP5JMoeNYZAn/6gCh+2gJifSOkIF/tTVDHCoJuY=";
     };
     meta.homepage = "https://github.com/phanviet/vim-monokai-pro/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20549,19 +22225,21 @@ final: prev: {
       hash = "sha256-22RXCEbnzv4c0o1hCVz/rJVHs76oN0FQ1f3URY2w4Xc=";
     };
     meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   vim-moonfly-colors = buildVimPlugin {
     pname = "vim-moonfly-colors";
-    version = "0-unstable-2026-04-02";
+    version = "0-unstable-2026-04-26";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-moonfly-colors";
-      rev = "43d8eb9dd2a1154dd8259ee3ce37cbbdb28c405c";
-      hash = "sha256-jyZKY2N0ix53x5xhYo+B31G02fKcxhYkSGlJ3VFA2Ng=";
+      rev = "4ed07bc0c6083cdd547c63f5c245e02c068b0c45";
+      hash = "sha256-78F44cldvn+D/cfeaSe4A7LURMArCvkUJER22oTUuyM=";
     };
     meta.homepage = "https://github.com/bluz71/vim-moonfly-colors/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20575,6 +22253,7 @@ final: prev: {
       hash = "sha256-4NGFiLOYNJa03vSW9x+tqjfP8+J38mFTiRL0hZwoRLY=";
     };
     meta.homepage = "https://github.com/matze/vim-move/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20588,6 +22267,7 @@ final: prev: {
       hash = "sha256-UxMuSOKwCs7YJc/ywkoP78uRIX1vWovv+1Ne7RdiqG4=";
     };
     meta.homepage = "https://github.com/lifepillar/vim-mucomplete/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20601,6 +22281,7 @@ final: prev: {
       hash = "sha256-YtDPAe0zhPesVjIC1DGUsVLKyr1hqemOCECZKSG6qjY=";
     };
     meta.homepage = "https://github.com/terryma/vim-multiple-cursors/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20614,6 +22295,7 @@ final: prev: {
       hash = "sha256-lXgNJ6fFI8RgvTu0+kWnSfJmAipSixqbgXkKVbCcPFc=";
     };
     meta.homepage = "https://github.com/simnalamburt/vim-mundo/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20627,6 +22309,7 @@ final: prev: {
       hash = "sha256-lmYt+GKuXhbOhu3HufqIFE2DvzUYlk5vGqU6tpJ2yjY=";
     };
     meta.homepage = "https://github.com/mustache/vim-mustache-handlebars/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20640,6 +22323,7 @@ final: prev: {
       hash = "sha256-aH3fdAQQjLVth0rYGnqGIGxRZgSPkmpeUfAwVg8feWY=";
     };
     meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20653,6 +22337,7 @@ final: prev: {
       hash = "sha256-PcUYAci4FehCtKftet/jLkAdocPPJrzQBHh3Q8uFOJo=";
     };
     meta.homepage = "https://github.com/jistr/vim-nerdtree-tabs/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20666,6 +22351,7 @@ final: prev: {
       hash = "sha256-gDBm1e4A+G9dM5/I2F4B+iMKC8wzYhTqe9Ei3Ppzrvw=";
     };
     meta.homepage = "https://github.com/nfnty/vim-nftables/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20679,6 +22365,7 @@ final: prev: {
       hash = "sha256-4tdDTzAaZTatKrA3UufL3a8fayxDEF18woFKEPTpGbQ=";
     };
     meta.homepage = "https://github.com/kana/vim-niceblock/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20692,6 +22379,7 @@ final: prev: {
       hash = "sha256-wb8UNs0eF6939pjZWafDoFgRh/10rKorJFZtPbTkn/k=";
     };
     meta.homepage = "https://github.com/nickel-lang/vim-nickel/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20705,6 +22393,7 @@ final: prev: {
       hash = "sha256-b1hXG3XRrWtZby+Z5J+WPREij6lFw8n73Ge6IbLBQgo=";
     };
     meta.homepage = "https://github.com/tommcdo/vim-ninja-feet/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20718,6 +22407,7 @@ final: prev: {
       hash = "sha256-Hmn8EVlvMQnQF8COeb89cgl5+A83kagOjGsmvm5WNoE=";
     };
     meta.homepage = "https://github.com/LnL7/vim-nix/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20731,6 +22421,7 @@ final: prev: {
       hash = "sha256-MWLc3ezCx7cG/HASghB4y7BwmFQq/r6sdKDIWTlihw4=";
     };
     meta.homepage = "https://github.com/symphorien/vim-nixhash/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20744,6 +22435,7 @@ final: prev: {
       hash = "sha256-fiMYfRlm/KiMQybL97RcWy3Y+0qim6kl3ZkBvCuv4ZM=";
     };
     meta.homepage = "https://github.com/noahfrederick/vim-noctu/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20757,6 +22449,7 @@ final: prev: {
       hash = "sha256-CoOpUc6VL77RTCbTg+17ned/I4OVfFIsKfbd5r+um54=";
     };
     meta.homepage = "https://github.com/fruit-in/vim-nong-theme/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20770,6 +22463,7 @@ final: prev: {
       hash = "sha256-TFByXuBhw9/OcNhe+aqY8+QN2sFvhCkWxhMgBwSV3LQ=";
     };
     meta.homepage = "https://github.com/jeffkreeftmeijer/vim-numbertoggle/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20783,6 +22477,7 @@ final: prev: {
       hash = "sha256-+7lj2Tbv5V4El54pSfFlu8jq6Rz6Pz+EIsg9DwXuADU=";
     };
     meta.homepage = "https://github.com/tpope/vim-obsession/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20796,6 +22491,7 @@ final: prev: {
       hash = "sha256-w6DargglFxNkgZl7Uchl/uPntoGo54OH6tmJzaorfIw=";
     };
     meta.homepage = "https://github.com/ocaml/vim-ocaml/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20809,6 +22505,7 @@ final: prev: {
       hash = "sha256-IGS0YgmCHLiCPAb7jHWLHEfHu3AzKiatZbAYdEvgzlI=";
     };
     meta.homepage = "https://github.com/rakr/vim-one/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20822,6 +22519,7 @@ final: prev: {
       hash = "sha256-wRqW6xu3xgJf/552zK4nGaP2NLmzdrnEEUrNWb1WGH0=";
     };
     meta.homepage = "https://github.com/petRUShka/vim-opencl/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20835,6 +22533,7 @@ final: prev: {
       hash = "sha256-lzLHlf5ELodySd7FSMAxKnuTSaK2HmifzkBtX9K/BuU=";
     };
     meta.homepage = "https://github.com/sirtaj/vim-openscad/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20848,6 +22547,7 @@ final: prev: {
       hash = "sha256-2Gyr95P5bQqy9BC2WiOU6NuXvzuHNdydvH/xH8xdkR0=";
     };
     meta.homepage = "https://github.com/kana/vim-operator-replace/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20861,6 +22561,7 @@ final: prev: {
       hash = "sha256-AtN0n1ywnB+hM8EvdP87fsL1zDRxQXXMh2nQFdCDOjk=";
     };
     meta.homepage = "https://github.com/rhysd/vim-operator-surround/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20874,6 +22575,7 @@ final: prev: {
       hash = "sha256-yykX2bTr77HMqDjFt6VQLI1qNHodxYIom5s8XrN3wps=";
     };
     meta.homepage = "https://github.com/kana/vim-operator-user/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20887,6 +22589,7 @@ final: prev: {
       hash = "sha256-hE7zSg6u9AAoPeyfXaINi6tM9VknXB95mN0+mLTOifk=";
     };
     meta.homepage = "https://github.com/jceb/vim-orgmode/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20900,6 +22603,7 @@ final: prev: {
       hash = "sha256-HXmp65oIr8LSPa8DgiRfMgveECF9qvTQIh82A3psWQ8=";
     };
     meta.homepage = "https://github.com/sdiehl/vim-ormolu/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20913,6 +22617,7 @@ final: prev: {
       hash = "sha256-SYv2zi5B/0gPltNXq7GNPIRagrTx0gLrHPSIpcTQsns=";
     };
     meta.homepage = "https://github.com/fcpg/vim-osc52/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20926,6 +22631,7 @@ final: prev: {
       hash = "sha256-MicPNz+zUrWF87h7vj5junmYsriOl3Kyqxgh/8Mz6cg=";
     };
     meta.homepage = "https://github.com/ojroques/vim-oscyank/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20939,6 +22645,7 @@ final: prev: {
       hash = "sha256-FkfOgZ4obCqj0/QMCgblOBXYcQ/tSijNAKklY9lNYgI=";
     };
     meta.homepage = "https://github.com/osyo-manga/vim-over/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -20952,6 +22659,7 @@ final: prev: {
       hash = "sha256-ZKfXnq3DlzyPzbsWqTfNM80GFgQd3uO+650jyOtiFhw=";
     };
     meta.homepage = "https://github.com/hashivim/vim-packer/";
+    meta.license = lib.meta.getLicenseFromSpdxId "ISC";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20965,6 +22673,7 @@ final: prev: {
       hash = "sha256-Zu/u5AqGs1O5Zgh/Q1HKoxidkIaeUhGT+yYkFe85tYM=";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-pager/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20978,6 +22687,7 @@ final: prev: {
       hash = "sha256-/yWE4VppahyeU6021tHjo7S88UpPzeU53IiLVEgyxPU=";
     };
     meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -20991,6 +22701,7 @@ final: prev: {
       hash = "sha256-/u25UFAM4aWDH1kyVBFTz50NFr9aors3TBqBPoUkjx8=";
     };
     meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-after/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21004,6 +22715,7 @@ final: prev: {
       hash = "sha256-9JdQYjtoPqQz6Cn3JFHQP9c7KD38pnnDx3k5mVO4cis=";
     };
     meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21017,6 +22729,7 @@ final: prev: {
       hash = "sha256-aQrjEvkme43uDT5z+c6iKYVVoH6m0wGemB+14nCeRzQ=";
     };
     meta.homepage = "https://github.com/yorickpeterse/vim-paper/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21030,6 +22743,7 @@ final: prev: {
       hash = "sha256-tRrp8J/7S8xKKw+lLOJbV7vQLHpdGbhmytVM2QlRItc=";
     };
     meta.homepage = "https://github.com/bhurlow/vim-parinfer/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21043,6 +22757,7 @@ final: prev: {
       hash = "sha256-nfJmV+PNJy1upgz52uWIf9YkLqY6ELK04uoUnEUojeA=";
     };
     meta.homepage = "https://github.com/ku1ik/vim-pasta/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21056,6 +22771,7 @@ final: prev: {
       hash = "sha256-CaNuMd4CDdN27Bnv9QJFEzZCYUVdcPRJVqj5x5cGgFc=";
     };
     meta.homepage = "https://github.com/tpope/vim-pathogen/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Vim";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21069,6 +22785,7 @@ final: prev: {
       hash = "sha256-faJqZI4oWqNTwbN6nX4nUR0hKiSx0nOcG8eDlzPH17E=";
     };
     meta.homepage = "https://github.com/junegunn/vim-peekaboo/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21082,6 +22799,7 @@ final: prev: {
       hash = "sha256-CkUROC4vyIdNbRONCgOnuPky8pZXE25KHKU9icCqWKI=";
     };
     meta.homepage = "https://github.com/preservim/vim-pencil/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21095,6 +22813,7 @@ final: prev: {
       hash = "sha256-zNvyfy4SlHqwMeo8TjRGtGgPO8k1zNAYabnTlysqn70=";
     };
     meta.homepage = "https://github.com/MeF0504/vim-pets/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21108,6 +22827,7 @@ final: prev: {
       hash = "sha256-Osm/TPV8zCVKwAaJztZSOSGe1VPFrmTsz6Iq52N077c=";
     };
     meta.homepage = "https://github.com/jparise/vim-phabricator/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21121,6 +22841,7 @@ final: prev: {
       hash = "sha256-GlS4R4b3OZLsNJk7gOCrNxDUUV05H6ffUqtlctYCXmk=";
     };
     meta.homepage = "https://github.com/justinj/vim-pico8-syntax/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21134,6 +22855,7 @@ final: prev: {
       hash = "sha256-8jvqRqkR2libYj7pC6nUpdqla9Cid8qWhA4rumMSkbY=";
     };
     meta.homepage = "https://github.com/junegunn/vim-plug/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21147,6 +22869,7 @@ final: prev: {
       hash = "sha256-N7UVzk/XUX76XcPHds+lLMZzO7gahj/9LIfof2BPThc=";
     };
     meta.homepage = "https://github.com/powerman/vim-plugin-AnsiEsc/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21160,6 +22883,7 @@ final: prev: {
       hash = "sha256-eK3fb45c6+dqt+2URW3IczIobm06Tc/6MQ0wXSGHQLc=";
     };
     meta.homepage = "https://github.com/hasundue/vim-pluto/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21173,6 +22897,7 @@ final: prev: {
       hash = "sha256-GcJRChc2cVXz6U1q4z3RmWnlpGllD4KiQ66U3uA/dg8=";
     };
     meta.homepage = "https://github.com/sheerun/vim-polyglot/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21186,6 +22911,7 @@ final: prev: {
       hash = "sha256-pn8Fpt59qzVcDaRaddc3g1vG366OeUnrIKXNWUfXWmk=";
     };
     meta.homepage = "https://github.com/jmcomets/vim-pony/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21199,6 +22925,7 @@ final: prev: {
       hash = "sha256-ioTgzkQlEd+/PSkL4cQBDskbHDbPWF3KTipDLKw13AQ=";
     };
     meta.homepage = "https://github.com/haya14busa/vim-poweryank/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21212,6 +22939,7 @@ final: prev: {
       hash = "sha256-pgSTKOUzmtzjfNeF3mKcNqqcBY44kHfC30xD5HiL9PY=";
     };
     meta.homepage = "https://github.com/prettier/vim-prettier/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21225,6 +22953,7 @@ final: prev: {
       hash = "sha256-ab7SHn1XXb3SiQKm24EYTKhsPf08psbTjEMAgjX1YVU=";
     };
     meta.homepage = "https://github.com/thinca/vim-prettyprint/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21238,6 +22967,7 @@ final: prev: {
       hash = "sha256-ga41f7QowPsLcU8wKIO9c5Zwc/aE5IslzppGHQT+/68=";
     };
     meta.homepage = "https://github.com/meain/vim-printer/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21251,6 +22981,7 @@ final: prev: {
       hash = "sha256-Xn8bQknIuZwBKptNI+mMfmlAZcCKzs1oWMYR8r+61BA=";
     };
     meta.homepage = "https://github.com/prisma/vim-prisma/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21264,6 +22995,7 @@ final: prev: {
       hash = "sha256-JEO/5xOqtIwlaSSAQVi/0rNOVhWqxL11mkr1sDXl5DE=";
     };
     meta.homepage = "https://github.com/tpope/vim-projectionist/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21277,6 +23009,7 @@ final: prev: {
       hash = "sha256-Zi9HVTYU6vABAqcvIbdcx0YtVHvKtkJupaLK3umO+DY=";
     };
     meta.homepage = "https://github.com/dhruvasagar/vim-prosession/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21290,6 +23023,7 @@ final: prev: {
       hash = "sha256-5Z4fisFwEUO2OueQo+MA3rzoBQgZdmJYM++elclwCe4=";
     };
     meta.homepage = "https://github.com/uarun/vim-protobuf/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21303,6 +23037,7 @@ final: prev: {
       hash = "sha256-G9dLjdq48x50wdd0+WjPxpgMlp00QLM8i3w1tj3s8zI=";
     };
     meta.homepage = "https://github.com/PProvost/vim-ps1/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21316,6 +23051,7 @@ final: prev: {
       hash = "sha256-VTlYf8Zcc6kXqevQTwUF4nAD2AKPYcOaJyoq66YMJBw=";
     };
     meta.homepage = "https://github.com/digitaltoad/vim-pug/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21329,6 +23065,7 @@ final: prev: {
       hash = "sha256-fE7SJ62qB9NY+Th8cPQAonyPsUljoZuoq0HQkrhLzrA=";
     };
     meta.homepage = "https://github.com/rodjek/vim-puppet/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21342,6 +23079,7 @@ final: prev: {
       hash = "sha256-8E/gUKU5KZUwRu2Tml7cDUeAL6LJwoTdu8RZN/2Enq4=";
     };
     meta.homepage = "https://github.com/Vimjas/vim-python-pep8-indent/";
+    meta.license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21355,6 +23093,7 @@ final: prev: {
       hash = "sha256-LQTwroaz7Eb/1GMwya1ucEgk74LTMil5Sn64AuT4WNQ=";
     };
     meta.homepage = "https://github.com/jeetsukumaran/vim-pythonsense/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21368,6 +23107,7 @@ final: prev: {
       hash = "sha256-7NYBN0fuls57LAmfZ6xgKdXTwEhd9CAWubnBPf5T4EU=";
     };
     meta.homepage = "https://github.com/romainl/vim-qf/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21381,6 +23121,7 @@ final: prev: {
       hash = "sha256-HOvZ0tK/stHD8NPxtSpiHUkxKQQ5geYGnhjD0X8Vamo=";
     };
     meta.homepage = "https://github.com/romainl/vim-qlist/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21394,6 +23135,7 @@ final: prev: {
       hash = "sha256-DGXSK/eNkLmniYGva2ubeDig50R6/6psgKF9yrODu+o=";
     };
     meta.homepage = "https://github.com/peterhoeg/vim-qml/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21407,6 +23149,7 @@ final: prev: {
       hash = "sha256-EoE1oc0uOopxjZ0XrfpQm4xK+acmvr6mD2I/9d2e17U=";
     };
     meta.homepage = "https://github.com/thinca/vim-quickrun/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Zlib";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21420,6 +23163,7 @@ final: prev: {
       hash = "sha256-e5+AqNaJ1I+ttYpWLMi9sC8Q79dH2D8bk22mwhKPxoU=";
     };
     meta.homepage = "https://github.com/racer-rust/vim-racer/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21433,6 +23177,7 @@ final: prev: {
       hash = "sha256-+7Xk8jhiYIP6kFRpv9uGV9fIzEPkCQTco4WidMqOlAk=";
     };
     meta.homepage = "https://github.com/wlangstroth/vim-racket/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21446,6 +23191,7 @@ final: prev: {
       hash = "sha256-OKDewqVA2Ut39lLLS4mwdC72g6EJXmBB8raFA1i4pmU=";
     };
     meta.homepage = "https://github.com/tpope/vim-ragtag/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21459,6 +23205,7 @@ final: prev: {
       hash = "sha256-0NqwCHvGeM5qale6xQR6NjG3bNRcpieDXk0W73jQUfo=";
     };
     meta.homepage = "https://github.com/tpope/vim-rails/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21472,6 +23219,7 @@ final: prev: {
       hash = "sha256-RJPRe2QY3cS27yzRMO04sxYgZifzq3UEBRRbtTKh1Pk=";
     };
     meta.homepage = "https://github.com/jordwalke/vim-reasonml/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21485,6 +23233,7 @@ final: prev: {
       hash = "sha256-G/dmkq1KtSHIl+I5p3LfO6mGPS3eyLRbEEsuLbTpGlk=";
     };
     meta.homepage = "https://github.com/tpope/vim-repeat/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21498,6 +23247,7 @@ final: prev: {
       hash = "sha256-cLltwCpFkd1reNwLKzwoUtDbImzSvTFPCmXNL9xpZlQ=";
     };
     meta.homepage = "https://github.com/rhaiscript/vim-rhai/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21511,6 +23261,7 @@ final: prev: {
       hash = "sha256-x2E2oIqW2BPUzmu5KeEUFFeH5+PXHRbjt8obIgDzYkc=";
     };
     meta.homepage = "https://github.com/tpope/vim-rhubarb/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21524,6 +23275,7 @@ final: prev: {
       hash = "sha256-JrpYcQ/mJQQUvDdsYlaaep6J6/irDIrCAb8W49JHqzk=";
     };
     meta.homepage = "https://github.com/airblade/vim-rooter/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21537,6 +23289,7 @@ final: prev: {
       hash = "sha256-O2Xc2nvJgBBjT8FkGAQsgeMZwTu6RjJhbcC4oiytJW8=";
     };
     meta.homepage = "https://github.com/tpope/vim-rsi/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21550,6 +23303,7 @@ final: prev: {
       hash = "sha256-pphvPEy3gMHB8EzmfO21yWbffpvr2Kp1Uwn1fXUvQEA=";
     };
     meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21563,6 +23317,7 @@ final: prev: {
       hash = "sha256-6GJCL2OcNEk3Qv/9TRUhXPHiaLJXEtGfl05UzLMFvEc=";
     };
     meta.homepage = "https://github.com/tpope/vim-salve/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21576,6 +23331,7 @@ final: prev: {
       hash = "sha256-V9bbiAeR2HGdwjp6htP4GQQ56UHNHQhoOXjIPV87waY=";
     };
     meta.homepage = "https://github.com/machakann/vim-sandwich/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21589,6 +23345,7 @@ final: prev: {
       hash = "sha256-R/NrlXJHdo5GrwztPGXogh9tRGA9WTRtwb96JqitDPY=";
     };
     meta.homepage = "https://github.com/mhinz/vim-sayonara/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21602,6 +23359,7 @@ final: prev: {
       hash = "sha256-JTOyLgF6OcIYvNakbUB8AHP0kN8JMUy64XbRECPB10c=";
     };
     meta.homepage = "https://github.com/derekwyatt/vim-scala/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21615,6 +23373,7 @@ final: prev: {
       hash = "sha256-RsjJj/lzKC53EA3C5HLui13YCcxIgi0aQOX/zI82C78=";
     };
     meta.homepage = "https://github.com/thinca/vim-scouter/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21628,6 +23387,7 @@ final: prev: {
       hash = "sha256-DXUK2kI+Z0+t45yUfYWQPGcBAbJsSpCOK9Qp84W16gg=";
     };
     meta.homepage = "https://github.com/tpope/vim-scriptease/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21641,6 +23401,7 @@ final: prev: {
       hash = "sha256-5szvkGCMFfYGTC3mrOXw5hGSMSYfBzRGhY11LB8ktok=";
     };
     meta.homepage = "https://github.com/inside/vim-search-pulse/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21654,6 +23415,7 @@ final: prev: {
       hash = "sha256-1eomYzMHQSAmYr+GggGcK0UM6jYcS3Vd05zOM1X2MCg=";
     };
     meta.homepage = "https://github.com/tpope/vim-sensible/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21667,19 +23429,21 @@ final: prev: {
       hash = "sha256-x5FaM97AIxbQ8pXEttZXrxpVd1ME+rVyuhCIvF/f9eA=";
     };
     meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   vim-sexp = buildVimPlugin {
     pname = "vim-sexp";
-    version = "0-unstable-2026-04-06";
+    version = "0-unstable-2026-04-26";
     src = fetchFromGitHub {
       owner = "guns";
       repo = "vim-sexp";
-      rev = "2fc0a7c7e44fe94e48156d6a5b5fea28538430eb";
-      hash = "sha256-eZvNZhfTyPrgYNrDlHNhegtssm1Ee1+o7X49Z62nxVk=";
+      rev = "983019354917f317ca7a39625a13e08f1a3e499c";
+      hash = "sha256-a5z/nUL7WNPY7Sd8oQJzIYZhn8yieBhmFGS/9X12w7w=";
     };
     meta.homepage = "https://github.com/guns/vim-sexp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21693,6 +23457,7 @@ final: prev: {
       hash = "sha256-homad7Z7nIF6jEJJGhtiZvdNLQUhb0vvmvcEku3K5/c=";
     };
     meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21706,6 +23471,7 @@ final: prev: {
       hash = "sha256-fjm6t50EqhNqNa7iKidaDjWR5Ky6eqN6eqWEcbsOTWM=";
     };
     meta.homepage = "https://github.com/itspriddle/vim-shellcheck/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21719,6 +23485,7 @@ final: prev: {
       hash = "sha256-9eZ7IZV5PSEHAACZYQ4iiCs8iZxSxWOPinkrf85rpSI=";
     };
     meta.homepage = "https://github.com/kshenoy/vim-signature/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21732,6 +23499,7 @@ final: prev: {
       hash = "sha256-xq8YiTfVVx0V1HicsAt99IgptKI799i6+bKy4gSGXY8=";
     };
     meta.homepage = "https://github.com/mhinz/vim-signify/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21745,6 +23513,7 @@ final: prev: {
       hash = "sha256-9EQ+SAAoQkLjL929dVBDCUWvaUFjVDZ7jGoSeGrpjDA=";
     };
     meta.homepage = "https://github.com/sile-typesetter/vim-sile/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21758,6 +23527,7 @@ final: prev: {
       hash = "sha256-HLj+3qJ49YRyx2uAtzSzMUtG0rZMEZDXO71fcc1BEfg=";
     };
     meta.homepage = "https://github.com/ivalkeen/vim-simpledb/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21771,6 +23541,7 @@ final: prev: {
       hash = "sha256-hC590lmKBssLCSKPF9O2cnt6TCJkklzbbhDNhf1ozUU=";
     };
     meta.homepage = "https://github.com/junegunn/vim-slash/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21784,6 +23555,7 @@ final: prev: {
       hash = "sha256-2Cr3h3uJvUL3CSoJs3aBFrkBeOBURSQItgQ4ep9sHXM=";
     };
     meta.homepage = "https://github.com/tpope/vim-sleuth/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21797,6 +23569,7 @@ final: prev: {
       hash = "sha256-wFoEmru31f7PoN8JMtTLyIj5t8wFAO4jduFOYkAJfJ8=";
     };
     meta.homepage = "https://github.com/jpalardy/vim-slime/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21810,6 +23583,7 @@ final: prev: {
       hash = "sha256-qL/HQclAQJmtXFZaF+RIgUA1GAqxu5MEDiIXHB1bjdU=";
     };
     meta.homepage = "https://github.com/mzlogin/vim-smali/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21823,6 +23597,7 @@ final: prev: {
       hash = "sha256-Ta0LuSz/bT1NKqBr6LU3hd0qATdbCT99SY8BIfYfv2g=";
     };
     meta.homepage = "https://github.com/t9md/vim-smalls/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21836,6 +23611,7 @@ final: prev: {
       hash = "sha256-rwKWi3ke0S44JUHzzEGYs30pbHsfmDyyOrn4t0bSlCg=";
     };
     meta.homepage = "https://github.com/Industrial/vim-smartbd/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21849,6 +23625,7 @@ final: prev: {
       hash = "sha256-tldt9G0tRuJH2YREQkTPGkrVm4jreHUJ2VJIqLDHKCI=";
     };
     meta.homepage = "https://github.com/Industrial/vim-smartbw/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21862,6 +23639,7 @@ final: prev: {
       hash = "sha256-5oB+h85q6s8fCrU4oatL4lyZwn7edzoTNGdyUhL7B7E=";
     };
     meta.homepage = "https://github.com/psliwka/vim-smoothie/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21875,6 +23653,7 @@ final: prev: {
       hash = "sha256-vvT/zCzPuCzgsUKBYo3XkZVY5XSctKBr+p9Gndw1Imk=";
     };
     meta.homepage = "https://github.com/bohlender/vim-smt2/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21888,6 +23667,7 @@ final: prev: {
       hash = "sha256-VkCownDdBKHXaa4KCJ+c0h4SVImmkkC4bbqP0uaQyPQ=";
     };
     meta.homepage = "https://github.com/justinmk/vim-sneak/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21901,6 +23681,7 @@ final: prev: {
       hash = "sha256-WUjS0wEVNVmPeFBUMjGBd4hE04H9RdZzFLhTY5++vjY=";
     };
     meta.homepage = "https://github.com/garbas/vim-snipmate/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21914,19 +23695,20 @@ final: prev: {
       hash = "sha256-6tcsy7rbREY9j9JRBsfWK2udl/Pa16KJTfiKTDQMMtE=";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   vim-solarized8 = buildVimPlugin {
     pname = "vim-solarized8";
     version = "1.6.4-unstable-2026-03-11";
-    src = fetchFromGitHub {
-      owner = "lifepillar";
-      repo = "vim-solarized8";
-      rev = "4433b4411de92b2446a4d32f0d8bf1b25c476bf9";
-      hash = "sha256-Og6qmrSIfhtGgait/nwJg+uNrUtY/j83cUWZj2TwUFY=";
+    src = fetchgit {
+      url = "https://codeberg.org/lifepillar/vim-solarized8/";
+      rev = "5dfbfb00be8237619c680302fc9250e391b1686a";
+      hash = "sha256-qJLlHsXKcLC+bpirfcuBj3igK9dDk8L9oVGPzWhtkEI=";
     };
-    meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
+    meta.homepage = "https://codeberg.org/lifepillar/vim-solarized8/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -21940,6 +23722,7 @@ final: prev: {
       hash = "sha256-vd/RxKc04hUBtyc4lQn3EzftCPX9whrn2k8+UvNa7uI=";
     };
     meta.homepage = "https://github.com/tomlion/vim-solidity/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21953,6 +23736,7 @@ final: prev: {
       hash = "sha256-MdJUkdyt761/5eBRYbNdjzAsOLDTruc2am+8cmyWAu8=";
     };
     meta.homepage = "https://github.com/christoomey/vim-sort-motion/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21966,19 +23750,21 @@ final: prev: {
       hash = "sha256-IMD5xHFy26B5ZcR+9/TPyINYc/w4676B4Czy0jaGK94=";
     };
     meta.homepage = "https://github.com/tpope/vim-speeddating/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "0.5.2-unstable-2026-04-11";
+    version = "0.5.2-unstable-2026-04-30";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "3aaad17ca9f8e8a9e299db481fbf653e796d334e";
-      hash = "sha256-HFl8cMKza+X4Aeu3q6jIzslatYplUBthlK95QrxPTN8=";
+      rev = "6fab3521a18b2a3ba3ad59cbad5c05e1e0e9744d";
+      hash = "sha256-FiaQLxqANOOwTdlZgRSxrD0uCJHA5zHDnnrurctMFW8=";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -21992,6 +23778,7 @@ final: prev: {
       hash = "sha256-cacNP4C9vl4h36GzWrrSZlRg53HelyYt+oXX0krHnyA=";
     };
     meta.homepage = "https://github.com/yorokobi/vim-splunk/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22005,6 +23792,7 @@ final: prev: {
       hash = "sha256-W5N/Dqxf9hSXEEJsrEkXInFwBXNBJe9Dzx9TVS12mPk=";
     };
     meta.homepage = "https://github.com/mhinz/vim-startify/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22018,6 +23806,7 @@ final: prev: {
       hash = "sha256-rfY5lcDI4PwjLEqwmli1iG7ugZuplETmAYBNAoJX0ho=";
     };
     meta.homepage = "https://github.com/dstein64/vim-startuptime/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22030,19 +23819,21 @@ final: prev: {
       hash = "sha256-YCxrSB7eRQ54iZhpcsAR930Uccj+2ZyogpYGKbcSlys=";
     };
     meta.homepage = "https://gitlab.com/LittleMorph/vim-ic10";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   vim-strip-trailing-whitespace = buildVimPlugin {
     pname = "vim-strip-trailing-whitespace";
-    version = "1.0-unstable-2022-02-01";
+    version = "1.0-unstable-2026-04-26";
     src = fetchFromGitHub {
       owner = "axelf4";
       repo = "vim-strip-trailing-whitespace";
-      rev = "59385775cbe416b2797ec5e2c7eb445a3398dd46";
-      hash = "sha256-HuzAQ3uCHaFudfFePSgoX0HvG9UuW2wNjZ0mKqmFYxM=";
+      rev = "4da5f5ab7cedf43345f9b540580babb48322a7ed";
+      hash = "sha256-mtI9ixjaTqhYzoDvl7M4BhZ8Myd4N1/biGxuzviz+1o=";
     };
     meta.homepage = "https://github.com/axelf4/vim-strip-trailing-whitespace/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22056,6 +23847,7 @@ final: prev: {
       hash = "sha256-51RENZp53McViY5ZOeuB1A8B7FW9TFO5FEEUIvPEEWM=";
     };
     meta.homepage = "https://github.com/nbouscal/vim-stylish-haskell/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22069,6 +23861,7 @@ final: prev: {
       hash = "sha256-jxGvz1KpdR+faI8BsSynXkLs+20qE0rhEkRSo4sxnw8=";
     };
     meta.homepage = "https://github.com/alx741/vim-stylishask/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22082,6 +23875,7 @@ final: prev: {
       hash = "sha256-4oOBRGSSCgRyy03X4doMWFIlfeY9BQNLtaXLPkz29bI=";
     };
     meta.homepage = "https://github.com/lunacookies/vim-substrata/";
+    meta.license = lib.meta.getLicenseFromSpdxId "ISC";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22095,6 +23889,7 @@ final: prev: {
       hash = "sha256-tlnpbDabyqKPH2lQTc5N2tHHQMkkNum0vcTkbJ+EU2A=";
     };
     meta.homepage = "https://github.com/svermeulen/vim-subversive/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22108,6 +23903,7 @@ final: prev: {
       hash = "sha256-ycodyNmEtPDDDFZ/91E8Josm3Oz7NtTiOMisTfd1reU=";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-suda/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22121,6 +23917,7 @@ final: prev: {
       hash = "sha256-DZE5tkmnT+lAvx/RQHaDEgEJXRKsy56KJY919xiH1lE=";
     };
     meta.homepage = "https://github.com/tpope/vim-surround/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22134,6 +23931,7 @@ final: prev: {
       hash = "sha256-0dyK0ei8QklZqN199jyM2dSALcIrr8z7ZLAuiPaDUc8=";
     };
     meta.homepage = "https://github.com/evanleck/vim-svelte/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22147,6 +23945,7 @@ final: prev: {
       hash = "sha256-R7g70DOr6EkYp4JhFlY4+DbCM6XRf/Jh2P7acStpIO4=";
     };
     meta.homepage = "https://github.com/machakann/vim-swap/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22159,6 +23958,7 @@ final: prev: {
       hash = "sha256-sdCXJOvB+vJE0ir+qsT/u1cHNxrksMnqeQi4D/Vg6UA=";
     };
     meta.homepage = "https://codeberg.org/pbrisbin/vim-syntax-shakespeare";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22172,6 +23972,7 @@ final: prev: {
       hash = "sha256-RLPxedKayUQXsC8TSMvq4rM631WbyWkAbUdemwOPQsg=";
     };
     meta.homepage = "https://github.com/TabbyML/vim-tabby/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22185,6 +23986,7 @@ final: prev: {
       hash = "sha256-oHK0dJKBd4i412JhMrHW51U3/rL6Qy4CFXT9RNFGeFY=";
     };
     meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22198,6 +24000,7 @@ final: prev: {
       hash = "sha256-+qh5MURjE9h4bI2K2hlFgIh7b72s09xFS5DOhQ+Vb9k=";
     };
     meta.homepage = "https://github.com/kana/vim-tabpagecd/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22211,6 +24014,7 @@ final: prev: {
       hash = "sha256-/aAkuiUyF+DSwbn5QEwev7nEN2zizLfMzNWPNWbNKvU=";
     };
     meta.homepage = "https://github.com/tpope/vim-tbone/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22224,6 +24028,7 @@ final: prev: {
       hash = "sha256-TIuKIr2JoMowVP67A8QAdE+L/JZFBdm/5Id3L5tImUI=";
     };
     meta.homepage = "https://github.com/teal-language/vim-teal/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22237,6 +24042,7 @@ final: prev: {
       hash = "sha256-h+uq29rXfkCfOH9cxlJcNOkLmAep+6Hsym6CmV7ggJg=";
     };
     meta.homepage = "https://github.com/erietz/vim-terminator/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22250,6 +24056,7 @@ final: prev: {
       hash = "sha256-MVsAR8lfsgMJHGnJ/ILevB2lrr20IAvetCFOvMVZ9Dk=";
     };
     meta.homepage = "https://github.com/hashivim/vim-terraform/";
+    meta.license = lib.meta.getLicenseFromSpdxId "ISC";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22264,6 +24071,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/juliosueiras/vim-terraform-completion/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22277,6 +24085,7 @@ final: prev: {
       hash = "sha256-vPACu8GlWxFITasOyWE9E87qqXLxG5WMn8h2XKNGD0I=";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22290,6 +24099,7 @@ final: prev: {
       hash = "sha256-BPQKXJ77nbb7oZOBj//9CHWpQu3r+0FfSd1JDhkJjAM=";
     };
     meta.homepage = "https://github.com/glts/vim-textobj-comment/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22303,6 +24113,7 @@ final: prev: {
       hash = "sha256-te7ljHY7lzu+fmbakTkPKxF312+Q0LozTLazxQvSYE8=";
     };
     meta.homepage = "https://github.com/kana/vim-textobj-entire/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22316,6 +24127,7 @@ final: prev: {
       hash = "sha256-OuaNgW1dx0PW0eKS4QpdZpeBvZUOMPMuhPCnqAUIlDM=";
     };
     meta.homepage = "https://github.com/kana/vim-textobj-function/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22329,6 +24141,7 @@ final: prev: {
       hash = "sha256-uh+DmsfNjsBnot51lk8xd+Ob2zVdyFSghoA/O6iU1yQ=";
     };
     meta.homepage = "https://github.com/gibiansky/vim-textobj-haskell/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22342,6 +24155,7 @@ final: prev: {
       hash = "sha256-h7c6PMg4rJMH1f+NibOuQW/ComTmtCMpkCqntezwKTY=";
     };
     meta.homepage = "https://github.com/kana/vim-textobj-line/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22355,6 +24169,7 @@ final: prev: {
       hash = "sha256-7jvoYMhgcPxOVDYqmvHZ8TLW8t/UtVzT84iycXKD4eg=";
     };
     meta.homepage = "https://github.com/osyo-manga/vim-textobj-multiblock/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22368,6 +24183,7 @@ final: prev: {
       hash = "sha256-SkQavbxgq9WSeoZZnwRWHaHtku82xdgBjHrTz02kNKk=";
     };
     meta.homepage = "https://github.com/preservim/vim-textobj-quote/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22381,6 +24197,7 @@ final: prev: {
       hash = "sha256-4+9SlywaEKpJL6MM2jcBjFoy2dpLqviil9idVNkeL/g=";
     };
     meta.homepage = "https://github.com/kana/vim-textobj-user/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22394,6 +24211,7 @@ final: prev: {
       hash = "sha256-Q8x7GqSK99i/yrYrgcYqFoa1KoSNIQDS/rv8TVpXEl0=";
     };
     meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22407,6 +24225,7 @@ final: prev: {
       hash = "sha256-Z9+mp5PUzz0pJCO7ZfhXcALBKUxmru/KciIOcWZ0WWU=";
     };
     meta.homepage = "https://github.com/thinca/vim-themis/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Zlib";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22420,6 +24239,7 @@ final: prev: {
       hash = "sha256-KUVmZVPwgUBugd7h4YP8wDHCJppcmqtB0rUvHsMfRnw=";
     };
     meta.homepage = "https://github.com/tmux-plugins/vim-tmux/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22433,6 +24253,7 @@ final: prev: {
       hash = "sha256-wfNbi7PJHVxswephCSB+ksT91hN/aFuvYRtYMIu7vWI=";
     };
     meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22446,6 +24267,7 @@ final: prev: {
       hash = "sha256-R40ggkvFFcHk9lhVm9nw8b174VfUrlDiy+BUgql+KKc=";
     };
     meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22459,6 +24281,7 @@ final: prev: {
       hash = "sha256-efqiRffnidYx+qjgsHyWshCFWgZp/ZrHl+Clt04pfpM=";
     };
     meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22472,6 +24295,7 @@ final: prev: {
       hash = "sha256-AWP3+2nwdzj3QirgQ13JFRrLwHu9Z3dn5BBdaH7l4Ds=";
     };
     meta.homepage = "https://github.com/milkypostman/vim-togglelist/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22485,19 +24309,21 @@ final: prev: {
       hash = "sha256-hsPQWLJbTZF+hp715kMqcfyot2RiB3bQmEamUac6Ehc=";
     };
     meta.homepage = "https://github.com/cespare/vim-toml/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   vim-tpipeline = buildVimPlugin {
     pname = "vim-tpipeline";
-    version = "1.0-unstable-2025-10-13";
+    version = "1.1";
     src = fetchFromGitHub {
       owner = "vimpostor";
       repo = "vim-tpipeline";
-      rev = "bc6dfc10e26a8dd1ec2f0512050a8a0afaa9d090";
-      hash = "sha256-p25EBXx4lDA+7lP6LukPT/rqX/bNCliRlHs0PcOp9bo=";
+      tag = "v1.1";
+      hash = "sha256-gkxtVpLd7AIjw7nxjyf9/wNhAMCx8yUsy8Ngm0N2XU8=";
     };
     meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22511,6 +24337,7 @@ final: prev: {
       hash = "sha256-WAfwgTbz9mgEpI0nMgZTzukdPyyiRehhbtSUClOO4bE=";
     };
     meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22524,6 +24351,7 @@ final: prev: {
       hash = "sha256-AJ0GGEd5vp3kFkvvdRZ4KHycrsyg9VmV4DfqDa5HdR4=";
     };
     meta.homepage = "https://github.com/tridactyl/vim-tridactyl/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22537,6 +24365,7 @@ final: prev: {
       hash = "sha256-1uiWL5gVfkaBJ19tknVccjCdLmRNYI0Mun2dQvEzrXI=";
     };
     meta.homepage = "https://github.com/ianks/vim-tsx/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22550,6 +24379,7 @@ final: prev: {
       hash = "sha256-0pajFA5JcLa8WMoOB43TXC5n05IxiYXQ7KTzCiZ0+tw=";
     };
     meta.homepage = "https://github.com/lumiliet/vim-twig/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22563,6 +24393,7 @@ final: prev: {
       hash = "sha256-3my/0EOsuB4MBAJQDflIAHg3/Rd7wkk0nW6yqElQY7o=";
     };
     meta.homepage = "https://github.com/sodapopcan/vim-twiggy/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22576,6 +24407,7 @@ final: prev: {
       hash = "sha256-ux/Hv5G50Ng8NG9VUj/EZXezQkQUDMcP5hKu1xWGyUw=";
     };
     meta.homepage = "https://github.com/rcarriga/vim-ultest/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22589,6 +24421,7 @@ final: prev: {
       hash = "sha256-Cyw+qZ3N7DvwVB6jSlWFxn6dHILj+wnmzrvdBFLvls0=";
     };
     meta.homepage = "https://github.com/arthurxavierx/vim-unicoder/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22602,6 +24435,7 @@ final: prev: {
       hash = "sha256-hsr3O/lV7rmC6zdfBVBqcbLDuumrY6r5ZmEnTttxrro=";
     };
     meta.homepage = "https://github.com/tpope/vim-unimpaired/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22615,6 +24449,7 @@ final: prev: {
       hash = "sha256-FRhYW1NFjuQHxjtvrZ/UOh/93TL03cMigKUkxTJ710Y=";
     };
     meta.homepage = "https://github.com/hashivim/vim-vagrant/";
+    meta.license = lib.meta.getLicenseFromSpdxId "ISC";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22628,6 +24463,7 @@ final: prev: {
       hash = "sha256-rpHVTwXRFfWlBbduJPSqtDjDEQTjwpi6mQ2LQJvRZiA=";
     };
     meta.homepage = "https://github.com/tpope/vim-vinegar/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22641,6 +24477,7 @@ final: prev: {
       hash = "sha256-hO33JPVQw1WTBeZtqmomwf1O0DhUd6KL7544BOPIw0U=";
     };
     meta.homepage = "https://github.com/triglav/vim-visual-increment/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22654,6 +24491,7 @@ final: prev: {
       hash = "sha256-KzBWkB/PYph6OfuF0GgNFYgqUAwMYbQQZbaaG9XuWZY=";
     };
     meta.homepage = "https://github.com/mg979/vim-visual-multi/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22667,6 +24505,7 @@ final: prev: {
       hash = "sha256-Cx1Ev4S7d/3Re3GfU+jmMlikhyQB8o5sGUX4zRdBdrw=";
     };
     meta.homepage = "https://github.com/bronson/vim-visual-star-search/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22680,6 +24519,7 @@ final: prev: {
       hash = "sha256-xG/qomvwHRqmpIxvs8Ad4yA8pLZFOfnVy70TFElk5ns=";
     };
     meta.homepage = "https://github.com/thinca/vim-visualstar/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22693,6 +24533,7 @@ final: prev: {
       hash = "sha256-BxYoaJfjsEkmCiiGryqOsO5jvmjLRvTV4U6Esqcqj0I=";
     };
     meta.homepage = "https://github.com/ngemily/vim-vp4/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22706,6 +24547,7 @@ final: prev: {
       hash = "sha256-hLKtAYNenLgcVPfs0iLEzOOz1OL0oQ3WPJm1VStx9QM=";
     };
     meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22719,6 +24561,7 @@ final: prev: {
       hash = "sha256-Ro64wc71m/SkFSPu+91tLFHuWaFfCTWH7zFPHbOg7C4=";
     };
     meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22732,6 +24575,7 @@ final: prev: {
       hash = "sha256-CYxFcKhwt18TBM9GTilNMCSHTGsuoQenzRk56ZDsW/M=";
     };
     meta.homepage = "https://github.com/posva/vim-vue/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22745,6 +24589,7 @@ final: prev: {
       hash = "sha256-9xbq2oirZSksIjZfPdvi/+Fy28c0huH2ppnt/f07R7M=";
     };
     meta.homepage = "https://github.com/leafOfTree/vim-vue-plugin/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22758,6 +24603,7 @@ final: prev: {
       hash = "sha256-8zMKrmCV4Erp0Q4WyuqyyKgZS5JGu1dXSzrhftdmNFE=";
     };
     meta.homepage = "https://github.com/fcpg/vim-waikiki/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22771,6 +24617,7 @@ final: prev: {
       hash = "sha256-3D+07D3NKndFeTSNMJiG1HJl5Cv5/GjWJUU+6FOSI/k=";
     };
     meta.homepage = "https://github.com/wakatime/vim-wakatime/";
+    meta.license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22784,6 +24631,7 @@ final: prev: {
       hash = "sha256-xLVCCE3eSv0aJQRXiY5H2kUtNOV5Fa2WUwl8a1nDb8M=";
     };
     meta.homepage = "https://github.com/osyo-manga/vim-watchdogs/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22797,6 +24645,7 @@ final: prev: {
       hash = "sha256-dKGqjEZA994HxQHBWinvUuOCz7E0ZgwXh4HX6oF0M8o=";
     };
     meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22810,6 +24659,7 @@ final: prev: {
       hash = "sha256-qcm7ihOPHS/6p4ZGhcwNSyzruIDk/Sx9rtqs01lN5UE=";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22823,6 +24673,7 @@ final: prev: {
       hash = "sha256-S1CN0Dbb2BtZx4Jhafac2AltkzV2sPAixSESBXbn7/8=";
     };
     meta.homepage = "https://github.com/wesQ3/vim-windowswap/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22836,6 +24687,7 @@ final: prev: {
       hash = "sha256-2rTYzg5arjZXim9T+WfDWb5CIA2iN7gIuthcvqifhMk=";
     };
     meta.homepage = "https://github.com/chaoren/vim-wordmotion/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22849,6 +24701,7 @@ final: prev: {
       hash = "sha256-1UTVUotFi+jVAAKimeF32qrltz2RxS1hVXtRhelHfo4=";
     };
     meta.homepage = "https://github.com/preservim/vim-wordy/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22862,6 +24715,7 @@ final: prev: {
       hash = "sha256-HMsOY+r2hUj+scN7CcB8hLa+qbNQxCV1SfCRqkFGAeI=";
     };
     meta.homepage = "https://github.com/joonty/vim-xdebug/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22875,6 +24729,7 @@ final: prev: {
       hash = "sha256-ADmotwtoRZcaJgzCg6YT3k29f7TpjHvPjy4ucfkJmOw=";
     };
     meta.homepage = "https://github.com/lyokha/vim-xkbswitch/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22888,6 +24743,7 @@ final: prev: {
       hash = "sha256-iqbfQVNCcJ2MuZFSwkOJvKGdxpkhyTwiD2LR5qzlP0M=";
     };
     meta.homepage = "https://github.com/mg979/vim-xtabline/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22901,6 +24757,7 @@ final: prev: {
       hash = "sha256-L453AAOnd3ubcefpy4WMb0vOVOqMccQDy9XqbxBtt6M=";
     };
     meta.homepage = "https://github.com/stephpy/vim-yaml/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22914,6 +24771,7 @@ final: prev: {
       hash = "sha256-AE2eoC7drlKAtM0+pr2up3ZcX505nO8K1pJy7+U0m1k=";
     };
     meta.homepage = "https://github.com/simonrw/vim-yapf/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22927,6 +24785,7 @@ final: prev: {
       hash = "sha256-dzMpm0/MGp2q2s+ijvXufXYFeQ2HdWs9cSRJ2tGR7cY=";
     };
     meta.homepage = "https://github.com/michal-h21/vim-zettel/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22940,6 +24799,7 @@ final: prev: {
       hash = "sha256-LGY83LXEqzrUZQKQyypdpmM4pR1hozaSW8+YQlVMweA=";
     };
     meta.homepage = "https://github.com/marrub--/vim-zscript/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22953,6 +24813,7 @@ final: prev: {
       hash = "sha256-ywzfawOIu/8X04ojLHgw5wGJoLZrEcB+rMwsDAfNmKI=";
     };
     meta.homepage = "https://github.com/dag/vim2hs/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -22966,6 +24827,7 @@ final: prev: {
       hash = "sha256-7wvICkTmQBAAWfbIm5xVNGweZOrow0uSgvB6WeC360M=";
     };
     meta.homepage = "https://github.com/monkoose/vim9-stargate/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Unlicense";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22979,6 +24841,7 @@ final: prev: {
       hash = "sha256-iRaYEc3v7kEveUEfsx3hLhQHIY7gcgIQtaEtKzjWWnM=";
     };
     meta.homepage = "https://github.com/dominikduda/vim_current_word/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -22992,6 +24855,7 @@ final: prev: {
       hash = "sha256-zgSKuwhuyoa67UlX4yX2JumjfHrx7Mlvg7Bv2i6TInU=";
     };
     meta.homepage = "https://github.com/andrep/vimacs/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23005,6 +24869,7 @@ final: prev: {
       hash = "sha256-mnG9yzlLThwsqh+siGfhVV0h1k4EvSCVrcjN1ndhFUg=";
     };
     meta.homepage = "https://github.com/TaDaa/vimade/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23018,6 +24883,7 @@ final: prev: {
       hash = "sha256-HievBzyVZke4AyCWAL9MlOw65X460cEEeOhwAL2brzs=";
     };
     meta.homepage = "https://github.com/jreybert/vimagit/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23031,6 +24897,7 @@ final: prev: {
       hash = "sha256-rymj9VJEJL0V+DxnHy1IPOrhobmYuVfya7YRoxb2nSQ=";
     };
     meta.homepage = "https://github.com/gotcha/vimelette/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23044,6 +24911,7 @@ final: prev: {
       hash = "sha256-4276fnfiq7p/ncfD/0OgxizVAGoUVB0n5HOBI3D0KOI=";
     };
     meta.homepage = "https://github.com/Shougo/vimfiler.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23057,6 +24925,7 @@ final: prev: {
       hash = "sha256-6JTCwVzK50gTAauTlTfVl+79vhlo6/SXmmoyDjriQGc=";
     };
     meta.homepage = "https://github.com/vimoutliner/vimoutliner/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23070,6 +24939,7 @@ final: prev: {
       hash = "sha256-XEBt9Yds73QCla3DnWeC+vK9xT47hLZxVC4mOPYE+L8=";
     };
     meta.homepage = "https://github.com/tex/vimpreviewpandoc/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23083,6 +24953,7 @@ final: prev: {
       hash = "sha256-k4+fOMcIA6jxh10oSMR1VkNj9bN+On2ycsEgQoqD1Bs=";
     };
     meta.homepage = "https://github.com/Shougo/vimproc.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23096,6 +24967,7 @@ final: prev: {
       hash = "sha256-hkSDNbvC49WAcPxHvniZNT5MfNJLO3Y+fCMUTM7OrXo=";
     };
     meta.homepage = "https://github.com/vimsence/vimsence/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23109,6 +24981,7 @@ final: prev: {
       hash = "sha256-Z12AmvKboiyHvNul06RR95vI0mKMGGEDznXhOwMyWBc=";
     };
     meta.homepage = "https://github.com/Shougo/vimshell.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23123,6 +24996,7 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23136,6 +25010,7 @@ final: prev: {
       hash = "sha256-dvrSe4dxbGl+rGScQDBK0tQUz4Pr37E3V326XcFGSQg=";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23149,19 +25024,21 @@ final: prev: {
       hash = "sha256-Bz7yi/YwOSV+xffGyCwz+uJJP9G88gDydo91HX2qK3U=";
     };
     meta.homepage = "https://github.com/preservim/vimux/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
   vimwiki = buildVimPlugin {
     pname = "vimwiki";
-    version = "2024.01.24-unstable-2024-10-14";
+    version = "2024.01.24-unstable-2026-04-30";
     src = fetchFromGitHub {
       owner = "vimwiki";
       repo = "vimwiki";
-      rev = "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8";
-      hash = "sha256-O85nZUWxIKm0gFILAkWH9WqfVcEbnbxR56grqMmum3A=";
+      rev = "a54a3002e229c4b43d69ced170ff77663a5b2c40";
+      hash = "sha256-pT9ElNdyVy53BiRHy/d1zJNtSPG0mSJmBoFq/gRizMk=";
     };
     meta.homepage = "https://github.com/vimwiki/vimwiki/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23175,6 +25052,7 @@ final: prev: {
       hash = "sha256-ozrjz34YIlDziuc9KLYM9zikTlg2YKYlIewapzN/nlY=";
     };
     meta.homepage = "https://github.com/lukas-reineke/virt-column.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23188,6 +25066,7 @@ final: prev: {
       hash = "sha256-WznB8eiwG7dIKg4LeblUQwb6E8yxAFLnV1wMwWq5/JI=";
     };
     meta.homepage = "https://github.com/jubnzv/virtual-types.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23201,19 +25080,21 @@ final: prev: {
       hash = "sha256-scElpk70TYfSfDA4BI73SZyO0RhCEUbEADpYWp9o4a0=";
     };
     meta.homepage = "https://github.com/vim-scripts/vis/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   vissort-vim = buildVimPlugin {
     pname = "vissort.vim";
-    version = "0-unstable-2025-03-29";
+    version = "0-unstable-2026-04-28";
     src = fetchFromGitHub {
       owner = "navicore";
       repo = "vissort.vim";
-      rev = "2572491531f824f9761a607807091bd7ec78373b";
-      hash = "sha256-I/aM4syuxx6DznHqY561Ya51+i+s4ZRdpOMvnFL3qFk=";
+      rev = "d5ea31590e21d23894ce91847481a4f2310eef10";
+      hash = "sha256-CMlNoGIU3Coe5H3sqFMT/CXFa7Kz2IKQZkEQ5/D/zhE=";
     };
     meta.homepage = "https://github.com/navicore/vissort.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23227,6 +25108,7 @@ final: prev: {
       hash = "sha256-7k94AyzOx4Iqwu1Vns4i69/NR1uWlwouOB0UL9VsdL0=";
     };
     meta.homepage = "https://github.com/liuchengxu/vista.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23240,6 +25122,7 @@ final: prev: {
       hash = "sha256-svKfA9p6WC6k3kbxG4TJxe2r0xpRPdbNTVk2PZcPAiY=";
     };
     meta.homepage = "https://github.com/mcauley-penney/visual-whitespace.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23253,6 +25136,7 @@ final: prev: {
       hash = "sha256-rNmgrhzewBQXQfJafF/BpfxlhHOrj/1qTJNyQ46EtsA=";
     };
     meta.homepage = "https://github.com/jannis-baum/vivify.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23266,6 +25150,7 @@ final: prev: {
       hash = "sha256-NGAvPSyttf/PDFUBSJtJVAUX2bpS+hwPeskZ0mFZ87A=";
     };
     meta.homepage = "https://github.com/EthanJWright/vs-tasks.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23279,6 +25164,7 @@ final: prev: {
       hash = "sha256-YGlTlHEuivPJzMyWfk+YmbZqftbj7Mrll8rB3vK3O2A=";
     };
     meta.homepage = "https://github.com/Mofiqul/vscode.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23292,6 +25178,7 @@ final: prev: {
       hash = "sha256-6ACKgxvzyERiGhCA103+8/HnJDiCls57zFTiahqwGQ4=";
     };
     meta.homepage = "https://github.com/dylanaraps/wal.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23305,6 +25192,7 @@ final: prev: {
       hash = "sha256-d8d5XhvVwQCoN+MZkmxv7lFpAkhJTOpVqHBsqhRKVPA=";
     };
     meta.homepage = "https://github.com/mattn/webapi-vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23318,6 +25206,7 @@ final: prev: {
       hash = "sha256-q4PZUh4QdppeKGB0hytnZi2WBE6FRTcgieka6AnqQ5k=";
     };
     meta.homepage = "https://github.com/willothy/wezterm.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23331,6 +25220,7 @@ final: prev: {
       hash = "sha256-2+slQRWbBLmMYOFfFvCV1BxS+0iUwCYEHKMEzJb1H1o=";
     };
     meta.homepage = "https://github.com/DingDean/wgsl.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23344,6 +25234,7 @@ final: prev: {
       hash = "sha256-SEppeCRrj03pXoQotW1dCKDz35b067+zUwsZbSEGaj8=";
     };
     meta.homepage = "https://github.com/AndrewRadev/whatif.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23357,6 +25248,7 @@ final: prev: {
       hash = "sha256-rKaYnXM4gRkkF/+xIFm2oCZwtAU6CeTdRWU93N+Jmbc=";
     };
     meta.homepage = "https://github.com/folke/which-key.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23370,6 +25262,7 @@ final: prev: {
       hash = "sha256-zrVRRa868Sq0V8THxq9609FDr2w3n6btISFClE1J30c=";
     };
     meta.homepage = "https://github.com/neolooong/whichpy.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23383,6 +25276,7 @@ final: prev: {
       hash = "sha256-9Dtf6x2daQ6bP7qq6jKiDY8RpKNG03r1z8AzqM6/Oaw=";
     };
     meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23396,6 +25290,7 @@ final: prev: {
       hash = "sha256-kdPDyhYlwrOydc31z6O6XvE3n9+FpHyB5TD/1kUMyyE=";
     };
     meta.homepage = "https://github.com/lervag/wiki-ft.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23409,6 +25304,7 @@ final: prev: {
       hash = "sha256-wcoiv8lPBr/r4yMw4tO6SmNQ09f1SjFqWlNDat7oXDk=";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23422,6 +25318,7 @@ final: prev: {
       hash = "sha256-jbLwoZLD6jL9QMIuUXiCbA4nP0Caw+iiHuCCGaxLZQU=";
     };
     meta.homepage = "https://github.com/gelguy/wilder.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23435,6 +25332,7 @@ final: prev: {
       hash = "sha256-HGNBUuUFtZU9ozFsM0X5QadfnK+cEiosQfnnrI6bdtI=";
     };
     meta.homepage = "https://github.com/SUSTech-data/wildfire.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23448,6 +25346,7 @@ final: prev: {
       hash = "sha256-zf4Z3n6TKXaQuEyTnCeq2L1f9PuahnmMdoF71c44EdU=";
     };
     meta.homepage = "https://github.com/gcmt/wildfire.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23461,6 +25360,7 @@ final: prev: {
       hash = "sha256-Rx8dcEs779CYAwX8FerM94OWOFrQKGKsfCu+64p1P60=";
     };
     meta.homepage = "https://github.com/fgheng/winbar.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23474,6 +25374,7 @@ final: prev: {
       hash = "sha256-Nfzd8kFqA83/0RfMUAYF4XXqhihyb22OnxDBrWW1nzU=";
     };
     meta.homepage = "https://github.com/anuvyklack/windows.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23487,6 +25388,7 @@ final: prev: {
       hash = "sha256-wjpdX37kdgIKHS39LPKYcWTawQ4rc8KYf3ezt+5WL94=";
     };
     meta.homepage = "https://github.com/Exafunction/windsurf.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23500,6 +25402,7 @@ final: prev: {
       hash = "sha256-mW3kaducHWRlDx18WcwcbWDlNnAyHgELS3XjpeFFCgs=";
     };
     meta.homepage = "https://github.com/sindrets/winshift.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23513,6 +25416,7 @@ final: prev: {
       hash = "sha256-VGCaaCilZf0YBTVSzXrUm3ql64vmvdS48j3/PBcFq4o=";
     };
     meta.homepage = "https://github.com/wannesm/wmgraphviz.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23526,6 +25430,7 @@ final: prev: {
       hash = "sha256-L+t9V6sKny6kTM1gblQNtkqzKFlWOYpQ7MVi17jbzQU=";
     };
     meta.homepage = "https://github.com/vim-scripts/wombat256.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23539,6 +25444,7 @@ final: prev: {
       hash = "sha256-rS7pTGqB7l7Jrh4XEsXxSi3ErvWgYZQiVLUyv9jskhA=";
     };
     meta.homepage = "https://github.com/lukaszkorecki/workflowish/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23552,6 +25458,7 @@ final: prev: {
       hash = "sha256-a3f0NUYooMxrZEqLer+Duv6/ktq5MH2qUoFHD8z7fZA=";
     };
     meta.homepage = "https://github.com/natecraddock/workspaces.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23565,6 +25472,7 @@ final: prev: {
       hash = "sha256-TKkeg5NGH4wvDIISn21MLkxaHr4ZK1jhifSgk3a2Vak=";
     };
     meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23578,6 +25486,7 @@ final: prev: {
       hash = "sha256-7gykRF51e7GMzOGT4Jz6/9+O7dxvCyih/k8gUtiMCwg=";
     };
     meta.homepage = "https://github.com/tweekmonster/wstrip.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23591,6 +25500,7 @@ final: prev: {
       hash = "sha256-T5c1dgokU0o+J6cvwEnH0tdr0Q2t7hYGgM9eXzF6u9A=";
     };
     meta.homepage = "https://github.com/piersolenski/wtf.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "WTFPL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23604,6 +25514,7 @@ final: prev: {
       hash = "sha256-zTGclrlxThgqEvj8K3fQ87G98g3VDqvp/dCnZwSm4I8=";
     };
     meta.homepage = "https://github.com/kyza0d/xeno.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23617,6 +25528,7 @@ final: prev: {
       hash = "sha256-A40dFf85PxFCP8hh8PNLVJflBl1LRFo8J1iZbcXxmo0=";
     };
     meta.homepage = "https://github.com/Mythos-404/xmake.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23630,6 +25542,7 @@ final: prev: {
       hash = "sha256-HFiwXOwACiu7qHZ4wsI6+zEq1KLTJyOx08JJ36chC3k=";
     };
     meta.homepage = "https://github.com/drmingdrmer/xptemplate/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23643,19 +25556,21 @@ final: prev: {
       hash = "sha256-v93VkFnGdyHpwU/pDJquTzuCEA3lZQxv1WUJRXIBCE4=";
     };
     meta.homepage = "https://github.com/guns/xterm-color-table.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
   y9nika-nvim = buildVimPlugin {
     pname = "y9nika.nvim";
-    version = "0-unstable-2026-04-15";
+    version = "0-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "y9san9";
       repo = "y9nika.nvim";
-      rev = "b6b0bfe1b00f27b1113672a570b184d725fecb7a";
-      hash = "sha256-oiYZ6qSHiYaBMDtLGUT9jWltFpm91aa2koVhS4mVDRs=";
+      rev = "8f04a16421c79564073e5e680192d0b493f79436";
+      hash = "sha256-ZGccQC4YVLlWECXsxUTPjsEIoKyE0kXjRpkXUmYAQ50=";
     };
     meta.homepage = "https://github.com/y9san9/y9nika.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23669,6 +25584,7 @@ final: prev: {
       hash = "sha256-49498W7Hadju54Vi9oOnlNouujhnS8hLQ7ji/3cvIZg=";
     };
     meta.homepage = "https://github.com/someone-stole-my-name/yaml-companion.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23682,6 +25598,7 @@ final: prev: {
       hash = "sha256-IsR9GGFYCd1YWqVRBO/HuR596+p8RQ+c5rU8eFaaDFM=";
     };
     meta.homepage = "https://github.com/cwrau/yaml-schema-detect.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23695,6 +25612,7 @@ final: prev: {
       hash = "sha256-z6USTspCiWU6UEP9TyACvzlb4MGEadBKUfxN2vJyeV0=";
     };
     meta.homepage = "https://github.com/ywpkwon/yank-path.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23708,6 +25626,7 @@ final: prev: {
       hash = "sha256-oGiXbSXo48NbaImzIKquEvplPCotLeIs4scvbhO6wyA=";
     };
     meta.homepage = "https://github.com/gbprod/yanky.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "WTFPL";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23722,19 +25641,21 @@ final: prev: {
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Vim";
     meta.hydraPlatforms = [ ];
   };
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "13.1.5-unstable-2026-04-19";
+    version = "13.1.5-unstable-2026-04-30";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "bb69f7fc634a9566edba5fc0da3a2025d7ffbae0";
-      hash = "sha256-WHp/HM4AN2kZiPs7sOIAlBWM1H7KUgFGPEEioWlxFQE=";
+      rev = "b4427509b21e470810e28a7b5cb6dc7df418ba9b";
+      hash = "sha256-rzCmSlyOsRNKxsPxGvJFysY7M6+NhJNfkB5evhXCHhE=";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23748,6 +25669,7 @@ final: prev: {
       hash = "sha256-awtWWuaAoUz3MqgNb608bwFdvZ/jxBx5ijmE8H6uHfM=";
     };
     meta.homepage = "https://github.com/lucasew-graveyard/yescapsquit.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23761,6 +25683,7 @@ final: prev: {
       hash = "sha256-F7aS8d6jJQQoIGkG2o4KNnDZAIrq0c+otIHvjdoGbtY=";
     };
     meta.homepage = "https://github.com/elkowar/yuck.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23774,6 +25697,7 @@ final: prev: {
       hash = "sha256-/B79WFWUxq8bIy6JLloQQNPEbNY7cjeiFWVUKCcAQzc=";
     };
     meta.homepage = "https://github.com/fsharp/zarchive-vim-fsharp/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23787,6 +25711,7 @@ final: prev: {
       hash = "sha256-2pGQXlZK0vp6YU7AyCyNm5kfCW02EwS54wn50zb4RuI=";
     };
     meta.homepage = "https://github.com/KabbAmine/zeavim.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23800,6 +25725,7 @@ final: prev: {
       hash = "sha256-OoxvSmZV6MCYKrH2ijGqIYhdSZG5oaRj+NFJGt0viyk=";
     };
     meta.homepage = "https://github.com/swaits/zellij-nav.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23813,6 +25739,7 @@ final: prev: {
       hash = "sha256-2PPRHYuiDETPsNv0sVx09nJ4kvhlS55Aj1DGEf96JqI=";
     };
     meta.homepage = "https://github.com/Lilja/zellij.nvim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23826,6 +25753,7 @@ final: prev: {
       hash = "sha256-vRJynz3bnkhfHKya+iEgm4PIEwT2P9kvkskgTt5UUU4=";
     };
     meta.homepage = "https://github.com/folke/zen-mode.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23839,6 +25767,7 @@ final: prev: {
       hash = "sha256-1zLxgs1EqAoGrjIr26awTFZ+NS06Ph/SDQHczBNCsaA=";
     };
     meta.homepage = "https://github.com/sand4rt/zen.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23852,6 +25781,7 @@ final: prev: {
       hash = "sha256-2fecMaB/59a/a0tUpDhipyGgwUliNf73SNTKQp3Bhck=";
     };
     meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23865,6 +25795,7 @@ final: prev: {
       hash = "sha256-QKp5EyVNFMfwCIs4lzUjpIngWzTsUAW4k5vYcQmJG6o=";
     };
     meta.homepage = "https://github.com/jnurmine/zenburn/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23878,6 +25809,7 @@ final: prev: {
       hash = "sha256-y3Y2y5cwuX9vQstSdMqmuCqhhOCiXU5ZcI+rKs+FLIo=";
     };
     meta.homepage = "https://github.com/nvimdev/zephyr-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23891,6 +25823,7 @@ final: prev: {
       hash = "sha256-W5cSp/RFbUaGhtvfowaCASfOa0mrqfxxRGR23Bt07FQ=";
     };
     meta.homepage = "https://github.com/zk-org/zk-nvim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23904,6 +25837,7 @@ final: prev: {
       hash = "sha256-EIZOyihVefJ+jZxkh9wx5H4P3eGMkThV/vfVxcCpkkY=";
     };
     meta.homepage = "https://github.com/troydm/zoomwintab.vim/";
+    meta.license = lib.licenses.unfree;
     meta.hydraPlatforms = [ ];
   };
 
@@ -23917,6 +25851,7 @@ final: prev: {
       hash = "sha256-wk037qL8htUkH6NJ+/D3y4sJHv/Eo3fkkUlsWW1fCLU=";
     };
     meta.homepage = "https://github.com/jalvesaq/zotcite/";
+    meta.license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     meta.hydraPlatforms = [ ];
   };
 
@@ -23930,6 +25865,7 @@ final: prev: {
       hash = "sha256-idKiUUqFu6xk95a5ZLn/hvcPrgmgoDb8KRWxX+hRz4Y=";
     };
     meta.homepage = "https://github.com/nanotee/zoxide.vim/";
+    meta.license = lib.meta.getLicenseFromSpdxId "MIT";
     meta.hydraPlatforms = [ ];
   };
 
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix
index 0e900bd057dc..500c0d5ced42 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix
@@ -11,13 +11,13 @@
 }:
 vimUtils.buildVimPlugin rec {
   pname = "codediff.nvim";
-  version = "2.43.10";
+  version = "2.43.15";
 
   src = fetchFromGitHub {
     owner = "esmuellert";
     repo = "codediff.nvim";
     tag = "v${version}";
-    hash = "sha256-iiDf5rbRHJePlv8kBtAID8qVGNBCKi1iipQ9nmMXI18=";
+    hash = "sha256-gaPLjH33+nBgpSZJ8b/4aneodt8wg+Jy44yXAjemToA=";
   };
 
   dependencies = [ vimPlugins.nui-nvim ];
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index 6bd7b2f4aca2..14a30d0d410a 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -5,24 +5,26 @@
   nix-update-script,
   openssl,
   perl,
-  zig_0_15,
+  zig,
+  gitMinimal,
   pkg-config,
   stdenv,
   vimUtils,
+  writableTmpDirAsHomeHook,
 }:
 let
-  version = "0.5.2";
+  version = "0.6.4";
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "fff.nvim";
     tag = "v${version}";
-    hash = "sha256-rv33dRf53m9iJwRl56z9oU0EuY1wUChsZyHOi/3gv4A=";
+    hash = "sha256-vu5yqOvVAPXHMi8sZFQuH9rNsFDffh3Ja74Be0Cs64c=";
   };
   fff-nvim-lib = rustPlatform.buildRustPackage {
     pname = "fff-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-ylQtZa3ZRs38mhge5tLLCRpnUdHYSjuZOwU+/6TO8Cw=";
+    cargoHash = "sha256-w6KwiE0rAT00fiRa1rT8uthVgcMB7EFGoG3+M5MYEBo=";
 
     cargoBuildFlags = [
       "-p"
@@ -42,8 +44,17 @@ let
       pkg-config
       perl
       rustPlatform.bindgenHook
+      writableTmpDirAsHomeHook
     ];
 
+    # Some tests need git
+    nativeCheckInputs = [ gitMinimal ];
+
+    # Tests need these permissions in order to use the FSEvents API on macOS.
+    sandboxProfile = ''
+      (allow mach-lookup (global-name "com.apple.FSEvents"))
+    '';
+
     buildInputs = [
       openssl
     ];
@@ -59,7 +70,7 @@ let
       # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime
       RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
 
-      ZIG = lib.getExe zig_0_15; # zlob requires zig
+      ZIG = lib.getExe zig; # zlob requires zig
     };
   };
 in
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix
index c22afcf7e9ae..ed57ac41a7f1 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fzf-wrapper/default.nix
@@ -11,4 +11,15 @@ vimUtils.buildVimPlugin {
   postInstall = ''
     ln -s ${fzf}/bin/fzf $target/bin/fzf
   '';
+
+  meta = {
+    inherit (fzf.meta)
+      changelog
+      description
+      homepage
+      license
+      platforms
+      ;
+    maintainers = [ ];
+  };
 }
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix
index 53efe4a19200..cc81c6815cb9 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix
@@ -6,5 +6,16 @@
 vimUtils.buildVimPlugin {
   inherit (meson) pname version src;
   preInstall = "cd data/syntax-highlighting/vim";
-  meta.maintainers = with lib.maintainers; [ vcunat ];
+
+  meta = {
+    inherit (meson.meta)
+      homepage
+      description
+      mainProgram
+      longDescription
+      license
+      platforms
+      ;
+    maintainers = with lib.maintainers; [ vcunat ];
+  };
 }
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix
index 6a92e835a642..0a2524efe301 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/tup/default.nix
@@ -17,5 +17,16 @@ vimUtils.buildVimPlugin {
     cp "${ftdetect}" vim-plugin/ftdetect/tup.vim
     cd vim-plugin
   '';
-  meta.maintainers = with lib.maintainers; [ enderger ];
+  meta = {
+    inherit (tup.meta)
+      description
+      mainProgram
+      longDescription
+      homepage
+      license
+      platforms
+      broken
+      ;
+    maintainers = with lib.maintainers; [ enderger ];
+  };
 }
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index b50e26315a48..6a9830ab6808 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -152,6 +152,12 @@ in
 
 assertNoAdditions {
   # keep-sorted start case=no block=yes newline_separated=yes
+  ack-vim = super.ack-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs {
     checkInputs = with self; [
       fzf-lua
@@ -203,6 +209,18 @@ assertNoAdditions {
     dependencies = [ self.middleclass ];
   };
 
+  argtextobj-vim = super.argtextobj-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  arrow-nvim = super.arrow-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Plus;
+    };
+  });
+
   arshlib-nvim = super.arshlib-nvim.overrideAttrs {
     dependencies = with self; [
       nui-nvim
@@ -227,11 +245,39 @@ assertNoAdditions {
     checkInputs = [ self.astrocore ];
   };
 
+  async-nvim = super.async-nvim.overrideAttrs {
+    nvimSkipModules = [
+      "docgen"
+    ];
+  };
+
   asyncrun-vim = super.asyncrun-vim.overrideAttrs {
     # Optional toggleterm integration
     checkInputs = [ self.toggleterm-nvim ];
   };
 
+  augment-vim = super.augment-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = with lib.licenses; [
+        mit
+        unfree
+      ];
+    };
+  });
+
+  auto-git-diff = super.auto-git-diff.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  auto-pairs = super.auto-pairs.overrideAttrs (old: {
+    meta = old.meta // {
+      # README contains the full MIT license text.
+      license = lib.licenses.mit;
+    };
+  });
+
   auto-session = super.auto-session.overrideAttrs {
     # Optional integration
     checkInputs = [ self.telescope-nvim ];
@@ -247,7 +293,7 @@ assertNoAdditions {
     ];
   };
 
-  bamboo-nvim = super.bamboo-nvim.overrideAttrs {
+  bamboo-nvim = super.bamboo-nvim.overrideAttrs (old: {
     # Optional integration
     checkInputs = with self; [
       barbecue-nvim
@@ -263,7 +309,10 @@ assertNoAdditions {
       "bamboo-multiplex"
       "barbecue.theme.bamboo"
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   barbar-nvim = super.barbar-nvim.overrideAttrs {
     # Optional integrations
@@ -288,7 +337,13 @@ assertNoAdditions {
     };
   });
 
-  base46 = super.base46.overrideAttrs {
+  base16-vim = super.base16-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  base46 = super.base46.overrideAttrs (old: {
     dependencies = [ self.nvchad-ui ];
     # Requires global config setup
     nvimSkipModules = [
@@ -299,11 +354,17 @@ assertNoAdditions {
       "nvchad.configs.nvimtree"
       "nvchad.configs.telescope"
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
-  bitbake = super.bitbake.overrideAttrs {
+  bitbake = super.bitbake.overrideAttrs (old: {
     sourceRoot = "source/contrib/vim";
-  };
+    meta = old.meta // {
+      license = lib.licenses.gpl2Only;
+    };
+  });
 
   blink-cmp-conventional-commits = super.blink-cmp-conventional-commits.overrideAttrs {
     dependencies = [ self.blink-cmp ];
@@ -348,14 +409,20 @@ assertNoAdditions {
   blink-cmp-words = super.blink-cmp-words.overrideAttrs (old: {
     dependencies = [ self.blink-cmp ];
     meta = old.meta // {
+      # TODO: Upstream also includes WordNet 3.0 data; add a license entry for
+      # the Princeton WordNet license and use it here.
+      license = lib.licenses.mit;
       description = "Offline word and synonym completion provider for Neovim";
       maintainers = with lib.maintainers; [ m3l6h ];
     };
   });
 
-  blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs {
+  blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs (old: {
     dependencies = [ self.blink-cmp ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs {
     dependencies = [ self.blink-cmp ];
@@ -380,6 +447,18 @@ assertNoAdditions {
     };
   });
 
+  bullets-vim = super.bullets-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  camelcasemotion = super.camelcasemotion.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   catppuccin-nvim = super.catppuccin-nvim.overrideAttrs {
     nvimSkipModules = [
       "catppuccin.groups.integrations.noice"
@@ -429,6 +508,12 @@ assertNoAdditions {
     ];
   };
 
+  CheckAttach = super.CheckAttach.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   checkmate-nvim = super.checkmate-nvim.overrideAttrs {
     checkInputs = with self; [
       # checkmate.snippets
@@ -454,19 +539,28 @@ assertNoAdditions {
     '';
   };
 
+  clangd_extensions-nvim = super.clangd_extensions-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   claude-code-nvim = super.claude-code-nvim.overrideAttrs {
     dependencies = with self; [
       plenary-nvim
     ];
   };
 
-  claude-fzf-history-nvim = super.claude-fzf-history-nvim.overrideAttrs {
+  claude-fzf-history-nvim = super.claude-fzf-history-nvim.overrideAttrs (old: {
     dependencies = with self; [
       fzf-lua
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
-  claude-fzf-nvim = super.claude-fzf-nvim.overrideAttrs {
+  claude-fzf-nvim = super.claude-fzf-nvim.overrideAttrs (old: {
     dependencies = with self; [
       claudecode-nvim
       fzf-lua
@@ -477,7 +571,16 @@ assertNoAdditions {
     preInstall = ''
       rm -r doc
     '';
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  clever-f-vim = super.clever-f-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   clighter8 = super.clighter8.overrideAttrs {
     preFixup = ''
@@ -492,6 +595,12 @@ assertNoAdditions {
     '';
   };
 
+  close-buffers-vim = super.close-buffers-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   cmake-tools-nvim = super.cmake-tools-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -511,9 +620,12 @@ assertNoAdditions {
     ];
   };
 
-  cmp-async-path = super.cmp-async-path.overrideAttrs {
+  cmp-async-path = super.cmp-async-path.overrideAttrs (old: {
     checkInputs = [ self.nvim-cmp ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   cmp-beancount = super.cmp-beancount.overrideAttrs {
     checkInputs = [ self.nvim-cmp ];
@@ -708,6 +820,36 @@ assertNoAdditions {
     ];
   };
 
+  coc-clap = super.coc-clap.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  coc-denite = super.coc-denite.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  coc-fzf = super.coc-fzf.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  coc-neco = super.coc-neco.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  coc-nvim = super.coc-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   codecompanion-history-nvim = super.codecompanion-history-nvim.overrideAttrs {
     dependencies = with self; [
       # transitive dependency for codecompanion-nvim
@@ -795,6 +937,12 @@ assertNoAdditions {
     '';
   };
 
+  conflict-marker-vim = super.conflict-marker-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   conjure = super.conjure.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
     nvimSkipModules = [
@@ -815,6 +963,12 @@ assertNoAdditions {
     nvimSkipModules = [ "context.highlight" ];
   };
 
+  context_filetype-vim = super.context_filetype-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   copilot-cmp = super.copilot-cmp.overrideAttrs {
     dependencies = [ self.copilot-lua ];
   };
@@ -852,6 +1006,12 @@ assertNoAdditions {
     ];
   };
 
+  coq-vim = super.coq-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
   coq_nvim = super.coq_nvim.overrideAttrs {
     passthru.python3Dependencies =
       ps: with ps; [
@@ -939,6 +1099,18 @@ assertNoAdditions {
     '';
   };
 
+  ctrlp-vim = super.ctrlp-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  ctrlp-z = super.ctrlp-z.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   dailies-nvim = super.dailies-nvim.overrideAttrs {
     runtimeDeps = [
       dailies
@@ -959,9 +1131,12 @@ assertNoAdditions {
     dependencies = [ self.ddc-vim ];
   };
 
-  ddc-fuzzy = super.ddc-fuzzy.overrideAttrs {
+  ddc-fuzzy = super.ddc-fuzzy.overrideAttrs (old: {
     dependencies = [ self.ddc-vim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   ddc-source-around = super.ddc-source-around.overrideAttrs {
     dependencies = [ self.ddc-vim ];
@@ -971,9 +1146,12 @@ assertNoAdditions {
     dependencies = [ self.ddc-vim ];
   };
 
-  ddc-source-lsp = super.ddc-source-lsp.overrideAttrs {
+  ddc-source-lsp = super.ddc-source-lsp.overrideAttrs (old: {
     dependencies = [ self.ddc-vim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   ddc-ui-native = super.ddc-ui-native.overrideAttrs {
     dependencies = [ self.ddc-vim ];
@@ -1010,6 +1188,12 @@ assertNoAdditions {
     };
   });
 
+  denite-nvim = super.denite-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   denops-vim = super.denops-vim.overrideAttrs {
     postPatch = ''
       # Use Nix's Deno instead of an arbitrary install
@@ -1034,6 +1218,12 @@ assertNoAdditions {
     '';
   };
 
+  deoplete-julia = super.deoplete-julia.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   deoplete-khard = super.deoplete-khard.overrideAttrs (old: {
     dependencies = [ self.deoplete-nvim ];
     passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ];
@@ -1045,6 +1235,24 @@ assertNoAdditions {
     };
   });
 
+  deoplete-lsp = super.deoplete-lsp.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  deoplete-nvim = super.deoplete-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  deoplete-zsh = super.deoplete-zsh.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   devdocs-nvim = super.devdocs-nvim.overrideAttrs {
     nvimSkipModules = [
       # Error initializing Devdocs state
@@ -1057,6 +1265,13 @@ assertNoAdditions {
     ];
   };
 
+  devdocs-vim = super.devdocs-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      # README contains the MIT license text.
+      license = lib.licenses.mit;
+    };
+  });
+
   diagram-nvim = super.diagram-nvim.overrideAttrs {
     dependencies = [ self.image-nvim ];
   };
@@ -1067,7 +1282,7 @@ assertNoAdditions {
     ];
   };
 
-  diffview-nvim = super.diffview-nvim.overrideAttrs {
+  diffview-nvim = super.diffview-nvim.overrideAttrs (old: {
     dependencies = [ self.plenary-nvim ];
 
     nvimSkipModules = [
@@ -1100,7 +1315,10 @@ assertNoAdditions {
     ];
 
     doInstallCheck = true;
-  };
+    meta = old.meta // {
+      license = lib.licenses.gpl3Plus;
+    };
+  });
 
   direnv-vim = super.direnv-vim.overrideAttrs (old: {
     preFixup = old.preFixup or "" + ''
@@ -1133,12 +1351,24 @@ assertNoAdditions {
     ];
   };
 
+  echodoc-vim = super.echodoc-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   ecolog-nvim = super.ecolog-nvim.overrideAttrs {
     nvimSkipModules = [
       "repro"
     ];
   };
 
+  editorconfig-vim = super.editorconfig-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd2;
+    };
+  });
+
   efmls-configs-nvim = super.efmls-configs-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
   };
@@ -1150,13 +1380,20 @@ assertNoAdditions {
     '';
   };
 
-  evergarden-nvim = super.evergarden-nvim.overrideAttrs {
+  evergarden-nvim = super.evergarden-nvim.overrideAttrs (old: {
     # optional modules
     nvimSkipModules = [
       "evergarden.extras"
       "minidoc"
     ];
-  };
+    meta = old.meta // {
+      # EUPL-1.2 project with bundled Catppuccin MIT files.
+      license = with lib.licenses; [
+        eupl12
+        mit
+      ];
+    };
+  });
 
   executor-nvim = super.executor-nvim.overrideAttrs {
     dependencies = [ self.nui-nvim ];
@@ -1181,6 +1418,12 @@ assertNoAdditions {
     };
   });
 
+  file-line = super.file-line.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Only;
+    };
+  });
+
   flash-nvim = super.flash-nvim.overrideAttrs {
     # Docs require lazyvim
     # dependencies = with self; [ lazy-nvim ];
@@ -1302,13 +1545,28 @@ assertNoAdditions {
     runtimeDeps = [ curl ];
   };
 
+  gentoo-syntax = super.gentoo-syntax.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   gh-nvim = super.gh-nvim.overrideAttrs {
     dependencies = [ self.litee-nvim ];
   };
 
-  ghcid = super.ghcid.overrideAttrs {
+  ghcid = super.ghcid.overrideAttrs (old: {
     configurePhase = "cd plugins/nvim";
-  };
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
+
+  ghcmod-vim = super.ghcmod-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
 
   git-conflict-nvim = super.git-conflict-nvim.overrideAttrs {
     # TODO: Remove after next fixed version
@@ -1326,6 +1584,12 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
+  gitlab-vim = super.gitlab-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   gitlinker-nvim = super.gitlinker-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -1365,6 +1629,12 @@ assertNoAdditions {
     ];
   };
 
+  gruvbox = super.gruvbox.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   guard-collection = super.guard-collection.overrideAttrs {
     dependencies = [ self.guard-nvim ];
   };
@@ -1390,6 +1660,12 @@ assertNoAdditions {
     ];
   };
 
+  gundo-vim = super.gundo-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl2Plus;
+    };
+  });
+
   gx-nvim = super.gx-nvim.overrideAttrs {
     runtimeDeps = [
       xdg-utils
@@ -1398,7 +1674,7 @@ assertNoAdditions {
     nvimRequireCheck = "gx";
   };
 
-  hardhat-nvim = super.hardhat-nvim.overrideAttrs {
+  hardhat-nvim = super.hardhat-nvim.overrideAttrs (old: {
     checkInputs = with self; [
       # optional integrations
       neotest
@@ -1414,7 +1690,16 @@ assertNoAdditions {
       # Cannot find hardhat.extmarks
       "overseer.component.hardhat.refresh_gas_extmarks"
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  hare-vim = super.hare-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
   harpoon = super.harpoon.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
@@ -1469,6 +1754,12 @@ assertNoAdditions {
     ];
   };
 
+  hop-nvim = super.hop-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
+
   hotpot-nvim = super.hotpot-nvim.overrideAttrs {
     # NOTE: Vim:E919: Directory not found in 'packpath': "pack/*/opt/hotpot-fennel-update"
     doCheck = false;
@@ -1480,6 +1771,13 @@ assertNoAdditions {
     nvimSkipModules = "hover.providers.fold_preview";
   };
 
+  html5-vim = super.html5-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      # README contains the MIT license text.
+      license = lib.licenses.mit;
+    };
+  });
+
   hunk-nvim = super.hunk-nvim.overrideAttrs {
     dependencies = [ self.nui-nvim ];
   };
@@ -1541,6 +1839,12 @@ assertNoAdditions {
     dependencies = [ self.nvim-treesitter ];
   };
 
+  intero-neovim = super.intero-neovim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
+
   iswap-nvim = super.iswap-nvim.overrideAttrs {
     dependencies = [ self.nvim-treesitter-legacy ];
   };
@@ -1562,6 +1866,12 @@ assertNoAdditions {
     dependencies = [ self.lush-nvim ];
   };
 
+  jinja-vim = super.jinja-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   jj-nvim = super.jj-nvim.overrideAttrs {
     # Don't install 30 MB of GIFs
     postPatch = ''
@@ -1569,18 +1879,46 @@ assertNoAdditions {
     '';
   };
 
+  jq-vim = super.jq-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   jsonfly-nvim = super.jsonfly-nvim.overrideAttrs (old: {
     meta = old.meta // {
+      # Top-level GPL-3.0 plus bundled luaunit BSD-2-Clause.
+      license = with lib.licenses; [
+        gpl3Only
+        bsd2
+      ];
       maintainers = old.meta.maintainers or [ ] ++ [
         lib.maintainers.myzel394
       ];
     };
   });
 
+  julia-vim = super.julia-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   jupytext-nvim = super.jupytext-nvim.overrideAttrs {
     passthru.python3Dependencies = ps: [ ps.jupytext ];
   };
 
+  just-nvim = super.just-nvim.overrideAttrs {
+    checkInputs = with self; [
+      fidget-nvim
+      nvim-notify
+      telescope-nvim
+    ];
+    dependencies = with self; [
+      plenary-nvim
+    ];
+  };
+
   kanagawa-paper-nvim = super.kanagawa-paper-nvim.overrideAttrs {
     nvimSkipModules = [
       # skipping wezterm theme switcher since it relies on a wezterm module
@@ -1617,6 +1955,12 @@ assertNoAdditions {
     }
   );
 
+  LanguageTool-nvim = super.LanguageTool-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
   };
@@ -1703,6 +2047,12 @@ assertNoAdditions {
     ];
   };
 
+  leap-nvim = super.leap-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   leetcode-nvim = super.leetcode-nvim.overrideAttrs {
     checkInputs = with self; [
       snacks-nvim
@@ -1759,14 +2109,23 @@ assertNoAdditions {
     ];
   };
 
-  lens-vim = super.lens-vim.overrideAttrs {
+  lens-vim = super.lens-vim.overrideAttrs (old: {
     # remove duplicate g:lens#animate in doc/lens.txt
     # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985
     # https://github.com/camspiers/lens.vim/pull/40/files
     patches = [
       ./patches/lens-vim/remove_duplicate_g_lens_animate.patch
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  lessspace-vim = super.lessspace-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
   lf-nvim = super.lf-nvim.overrideAttrs {
     dependencies = [ self.toggleterm-nvim ];
@@ -1776,15 +2135,39 @@ assertNoAdditions {
     dependencies = [ self.vim-floaterm ];
   };
 
+  lh-brackets = super.lh-brackets.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Only;
+    };
+  });
+
+  lh-vim-lib = super.lh-vim-lib.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Only;
+    };
+  });
+
   lightline-bufferline = super.lightline-bufferline.overrideAttrs {
     # Requires web-devicons but mini.icons can mock them up
     checkInputs = [ self.nvim-web-devicons ];
   };
 
+  lightline-lsp = super.lightline-lsp.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.isc;
+    };
+  });
+
   lightswitch-nvim = super.lightswitch-nvim.overrideAttrs {
     dependencies = [ self.nui-nvim ];
   };
 
+  lingua-franca-vim = super.lingua-franca-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd2;
+    };
+  });
+
   lir-nvim = super.lir-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -1848,10 +2231,22 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
+  lsp-format-nvim = super.lsp-format-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
 
+  lsp_lines-nvim = super.lsp_lines-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.isc;
+    };
+  });
+
   lspcontainers-nvim = super.lspcontainers-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
   };
@@ -1996,6 +2391,12 @@ assertNoAdditions {
     checkInputs = [ self.lualine-nvim ];
   };
 
+  mattn-calendar-vim = super.mattn-calendar-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   mcphub-nvim = super.mcphub-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
     checkInputs = [
@@ -2009,9 +2410,18 @@ assertNoAdditions {
     ];
   };
 
-  mind-nvim = super.mind-nvim.overrideAttrs {
+  mediawiki-vim = super.mediawiki-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
+  mind-nvim = super.mind-nvim.overrideAttrs (old: {
     dependencies = [ self.plenary-nvim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
 
   mini-nvim = super.mini-nvim.overrideAttrs {
     # reduce closure size
@@ -2062,6 +2472,12 @@ assertNoAdditions {
     nvimSkipModules = "modicator.integration.lualine.init";
   };
 
+  molokai = super.molokai.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   molten-nvim = super.molten-nvim.overrideAttrs {
     # Optional image providers
     checkInputs = with self; [
@@ -2071,15 +2487,24 @@ assertNoAdditions {
     ];
   };
 
+  mru = super.mru.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   multicursors-nvim = super.multicursors-nvim.overrideAttrs {
     dependencies = with self; [
       hydra-nvim
     ];
   };
 
-  muren-nvim = super.muren-nvim.overrideAttrs {
+  muren-nvim = super.muren-nvim.overrideAttrs (old: {
     dependencies = [ self.plenary-nvim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
   ncm2 = super.ncm2.overrideAttrs {
     dependencies = [ self.nvim-yarp ];
@@ -2109,6 +2534,24 @@ assertNoAdditions {
     dependencies = [ self.ultisnips ];
   };
 
+  neco-ghc = super.neco-ghc.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
+
+  neco-look = super.neco-look.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Plus;
+    };
+  });
+
+  neco-syntax = super.neco-syntax.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   neo-tree-nvim = super.neo-tree-nvim.overrideAttrs {
     checkInputs = [ git ];
     dependencies = with self; [
@@ -2138,6 +2581,18 @@ assertNoAdditions {
     ];
   };
 
+  neoinclude-vim = super.neoinclude-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  neomru-vim = super.neomru-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   neorepl-nvim = super.neorepl-nvim.overrideAttrs {
     nvimSkipModules = [
       # Requires main module loaded first
@@ -2163,6 +2618,24 @@ assertNoAdditions {
     ];
   };
 
+  neosnippet-snippets = super.neosnippet-snippets.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  neosnippet-vim = super.neosnippet-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  neoterm = super.neoterm.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.asl20;
+    };
+  });
+
   neotest-bash = super.neotest-bash.overrideAttrs {
     dependencies = with self; [
       neotest
@@ -2401,6 +2874,12 @@ assertNoAdditions {
     ];
   };
 
+  neovim-sensible = super.neovim-sensible.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   neovim-tips = super.neovim-tips.overrideAttrs {
     dependencies = [
       self.nui-nvim
@@ -2414,6 +2893,12 @@ assertNoAdditions {
     ];
   };
 
+  neoyank-vim = super.neoyank-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   netman-nvim = super.netman-nvim.overrideAttrs {
     # Optional neo-tree integration
     checkInputs = with self; [
@@ -2425,6 +2910,18 @@ assertNoAdditions {
     ];
   };
 
+  nginx-vim = super.nginx-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  nidhogg-nvim = super.nidhogg-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
   };
@@ -2444,13 +2941,22 @@ assertNoAdditions {
   NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs {
   };
 
+  NrrwRgn = super.NrrwRgn.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   nterm-nvim = super.nterm-nvim.overrideAttrs {
     dependencies = [ self.aniseed ];
   };
 
-  null-ls-nvim = super.null-ls-nvim.overrideAttrs {
+  null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: {
     dependencies = [ self.plenary-nvim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.unlicense;
+    };
+  });
 
   nvchad = super.nvchad.overrideAttrs {
     # You've signed up for a distro, providing dependencies.
@@ -2513,6 +3019,12 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
+  nvim-colorizer-lua = super.nvim-colorizer-lua.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Plus;
+    };
+  });
+
   nvim-coverage = super.nvim-coverage.overrideAttrs {
     dependencies = with self; [
       neotest
@@ -2524,6 +3036,12 @@ assertNoAdditions {
     ];
   };
 
+  nvim-dap = super.nvim-dap.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Only;
+    };
+  });
+
   nvim-dap-cortex-debug = super.nvim-dap-cortex-debug.overrideAttrs {
     dependencies = [ self.nvim-dap ];
   };
@@ -2532,9 +3050,12 @@ assertNoAdditions {
     dependencies = [ self.nvim-dap ];
   };
 
-  nvim-dap-python = super.nvim-dap-python.overrideAttrs {
+  nvim-dap-python = super.nvim-dap-python.overrideAttrs (old: {
     dependencies = [ self.nvim-dap ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.gpl3Only;
+    };
+  });
 
   nvim-dap-rego = super.nvim-dap-rego.overrideAttrs {
     dependencies = [ self.nvim-dap ];
@@ -2565,9 +3086,12 @@ assertNoAdditions {
     dependencies = [ self.nvim-dap ];
   };
 
-  nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs {
+  nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs (old: {
     dependencies = [ self.nvim-treesitter-legacy ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
   nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs {
     dependencies = [ self.nvim-fzf ];
@@ -2592,6 +3116,12 @@ assertNoAdditions {
     ];
   };
 
+  nvim-highlite = super.nvim-highlite.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Plus;
+    };
+  });
+
   nvim-java = super.nvim-java.overrideAttrs {
     dependencies = with self; [
       lua-async
@@ -2631,6 +3161,18 @@ assertNoAdditions {
     dependencies = [ self.nvim-java-core ];
   };
 
+  nvim-jdtls = super.nvim-jdtls.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Only;
+    };
+  });
+
+  nvim-julia-autotest = super.nvim-julia-autotest.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.agpl3Only;
+    };
+  });
+
   nvim-k8s-crd = super.nvim-k8s-crd.overrideAttrs {
     dependencies = with self; [
       plenary-nvim
@@ -2647,6 +3189,12 @@ assertNoAdditions {
     ];
   };
 
+  nvim-lint = super.nvim-lint.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Only;
+    };
+  });
+
   nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -2677,13 +3225,16 @@ assertNoAdditions {
     dependencies = [ self.nvim-lspconfig ];
   };
 
-  nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs {
+  nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs (old: {
     # Optional dependencies
     checkInputs = with self; [
       fzf-lua
       telescope-nvim
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
   nvim-nonicons = super.nvim-nonicons.overrideAttrs {
     # Requires web-devicons but mini.icons can mock them up
@@ -2711,6 +3262,18 @@ assertNoAdditions {
     ];
   };
 
+  nvim-parinfer = super.nvim-parinfer.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Only;
+    };
+  });
+
+  nvim-remote-containers = super.nvim-remote-containers.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.unfree;
+    };
+  });
+
   nvim-rip-substitute = super.nvim-rip-substitute.overrideAttrs {
     buildInputs = [ ripgrep ];
   };
@@ -2724,6 +3287,12 @@ assertNoAdditions {
     ];
   };
 
+  nvim-sioyek-highlights = super.nvim-sioyek-highlights.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   nvim-snippets = super.nvim-snippets.overrideAttrs {
     checkInputs = [
       # Optional cmp integration
@@ -2770,7 +3339,7 @@ assertNoAdditions {
     ];
   };
 
-  nvim-tree-lua = super.nvim-tree-lua.overrideAttrs {
+  nvim-tree-lua = super.nvim-tree-lua.overrideAttrs (old: {
     nvimSkipModules = [
       # Meta can't be required
       "nvim-tree._meta.api"
@@ -2800,7 +3369,10 @@ assertNoAdditions {
       "nvim-tree._meta.config.bookmarks"
       "nvim-tree._meta.config"
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.gpl3Plus;
+    };
+  });
 
   nvim-treesitter = super.nvim-treesitter.overrideAttrs (
     callPackage ./nvim-treesitter/overrides.nix { } self super
@@ -2871,6 +3443,12 @@ assertNoAdditions {
     dependencies = [ self.nvim-lspconfig ];
   };
 
+  nvim-whichkey-setup-lua = super.nvim-whichkey-setup-lua.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   nvzone-menu = super.nvzone-menu.overrideAttrs {
     # Plugin managers like Lazy.nvim expect pname to match the name of the git repository
     pname = "menu";
@@ -2921,6 +3499,12 @@ assertNoAdditions {
     ];
   };
 
+  oceanic-next = super.oceanic-next.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.asl20;
+    };
+  });
+
   octo-nvim = super.octo-nvim.overrideAttrs {
     checkInputs = with self; [
       # Pickers, can use telescope or fzf-lua
@@ -2933,9 +3517,12 @@ assertNoAdditions {
     ];
   };
 
-  oil-git-nvim = super.oil-git-nvim.overrideAttrs {
+  oil-git-nvim = super.oil-git-nvim.overrideAttrs (old: {
     dependencies = [ self.oil-nvim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   oil-git-status-nvim = super.oil-git-status-nvim.overrideAttrs {
     dependencies = [ self.oil-nvim ];
@@ -2976,6 +3563,12 @@ assertNoAdditions {
     configurePhase = "cd vim";
   };
 
+  open-browser-vim = super.open-browser-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
+
   opencode-nvim = super.opencode-nvim.overrideAttrs {
     runtimeDeps = [
       curl
@@ -3067,7 +3660,7 @@ assertNoAdditions {
     ];
   };
 
-  parrot-nvim = super.parrot-nvim.overrideAttrs {
+  parrot-nvim = super.parrot-nvim.overrideAttrs (old: {
     runtimeDeps = [
       curl
     ];
@@ -3083,7 +3676,10 @@ assertNoAdditions {
       self.blink-cmp
       self.nvim-cmp
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   peek-nvim = super.peek-nvim.overrideAttrs (old: {
     runtimeDeps = [
@@ -3193,7 +3789,7 @@ assertNoAdditions {
     ];
   };
 
-  quarto-nvim = super.quarto-nvim.overrideAttrs {
+  quarto-nvim = super.quarto-nvim.overrideAttrs (old: {
     checkInputs = [
       # Optional runner
       self.iron-nvim
@@ -3205,16 +3801,23 @@ assertNoAdditions {
     nvimSkipModules = [
       "quarto.runner.init"
     ];
-  };
+    meta = old.meta // {
+      # LICENSE says GPL-2.0-or-later.
+      license = lib.licenses.gpl2Plus;
+    };
+  });
 
-  rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs {
+  rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs (old: {
     nvimSkipModules = [
       # rainbow-delimiters.types.lua
       "rainbow-delimiters.types"
       # Test that requires an unpackaged dependency
       "rainbow-delimiters._test.highlight"
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.asl20;
+    };
+  });
 
   range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
     dependencies = [ self.cmd-parser-nvim ];
@@ -3226,9 +3829,21 @@ assertNoAdditions {
     ];
   };
 
+  rcshell-vim = super.rcshell-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
+  Recover-vim = super.Recover-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   refactoring-nvim = super.refactoring-nvim.overrideAttrs {
     dependencies = with self; [
-      plenary-nvim
+      async-nvim
     ];
   };
 
@@ -3260,6 +3875,12 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
+  riv-vim = super.riv-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   rocks-nvim = super.rocks-nvim.overrideAttrs (old: {
     passthru = old.passthru // {
       initLua = ''
@@ -3271,6 +3892,13 @@ assertNoAdditions {
 
   });
 
+  rtorrent-syntax-file = super.rtorrent-syntax-file.overrideAttrs (old: {
+    meta = old.meta // {
+      # README is the only upstream MIT notice.
+      license = lib.licenses.mit;
+    };
+  });
+
   rust-tools-nvim = super.rust-tools-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
   };
@@ -3286,6 +3914,12 @@ assertNoAdditions {
     dependencies = [ self.roslyn-nvim ];
   };
 
+  salt-vim = super.salt-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.asl20;
+    };
+  });
+
   samodostal-image-nvim = super.samodostal-image-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -3316,6 +3950,12 @@ assertNoAdditions {
     dependencies = [ self.nui-nvim ];
   };
 
+  seoul256-vim = super.seoul256-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   sidekick-nvim = super.sidekick-nvim.overrideAttrs {
     runtimeDeps = [
       copilot-language-server
@@ -3326,9 +3966,12 @@ assertNoAdditions {
     ];
   };
 
-  skim-vim = super.skim-vim.overrideAttrs {
+  skim-vim = super.skim-vim.overrideAttrs (old: {
     dependencies = [ self.skim ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   smart-open-nvim = super.smart-open-nvim.overrideAttrs {
     dependencies = with self; [
@@ -3349,6 +3992,12 @@ assertNoAdditions {
     ];
   };
 
+  smartpairs-vim = super.smartpairs-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.wtfpl;
+    };
+  });
+
   snacks-nvim = super.snacks-nvim.overrideAttrs {
     # Optional trouble integration
     checkInputs = [ self.trouble-nvim ];
@@ -3415,6 +4064,7 @@ assertNoAdditions {
 
   sonarlint-nvim = super.sonarlint-nvim.overrideAttrs (old: {
     meta = old.meta // {
+      license = lib.licenses.gpl3Only;
       maintainers = old.meta.maintainers or [ ] ++ [
         lib.maintainers.sinics
       ];
@@ -3450,6 +4100,12 @@ assertNoAdditions {
     }
   );
 
+  srcery-vim = super.srcery-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   startup-nvim = super.startup-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
@@ -3462,11 +4118,24 @@ assertNoAdditions {
     '';
   };
 
+  SudoEdit-vim = super.SudoEdit-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   supermaven-nvim = super.supermaven-nvim.overrideAttrs {
     # TODO: handle supermaven binary
     doCheck = false;
   };
 
+  supertab = super.supertab.overrideAttrs (old: {
+    meta = old.meta // {
+      # README.rst contains the BSD-3-Clause notice.
+      license = lib.licenses.bsd3;
+    };
+  });
+
   sved =
     let
       # we put the script in its own derivation to benefit the magic of wrapGAppsHook3
@@ -3520,6 +4189,18 @@ assertNoAdditions {
     ];
   };
 
+  tabular = super.tabular.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
+
+  tagbar = super.tagbar.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   tardis-nvim = super.tardis-nvim.overrideAttrs (old: {
     dependencies = [ self.plenary-nvim ];
     meta = old.meta // {
@@ -3527,6 +4208,12 @@ assertNoAdditions {
     };
   });
 
+  taskwiki = super.taskwiki.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   telekasten-nvim = super.telekasten-nvim.overrideAttrs {
     dependencies = with self; [
       plenary-nvim
@@ -3644,12 +4331,15 @@ assertNoAdditions {
     ];
   };
 
-  telescope-live-grep-args-nvim = super.telescope-live-grep-args-nvim.overrideAttrs {
+  telescope-live-grep-args-nvim = super.telescope-live-grep-args-nvim.overrideAttrs (old: {
     dependencies = with self; [
       plenary-nvim
       telescope-nvim
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.cc0;
+    };
+  });
 
   telescope-lsp-handlers-nvim = super.telescope-lsp-handlers-nvim.overrideAttrs {
     dependencies = with self; [
@@ -3739,6 +4429,12 @@ assertNoAdditions {
     dependencies = [ self.nvzone-volt ];
   };
 
+  tinted-vim = super.tinted-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   tmux-complete-vim = super.tmux-complete-vim.overrideAttrs {
     # Vim plugin with optional nvim-compe lua module
     nvimSkipModules = [ "compe_tmux" ];
@@ -3780,6 +4476,14 @@ assertNoAdditions {
     nvimSkipModules = "trouble.docs";
   };
 
+  trust-vim = super.trust-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      # TODO: Upstream includes bundled NYSL-licensed code; add an NYSL license
+      # entry and include it alongside the Apache-2.0/MIT terms.
+      license = lib.licenses.mit;
+    };
+  });
+
   tsc-nvim = super.tsc-nvim.overrideAttrs {
     postPatch = ''
       substituteInPlace lua/tsc/utils.lua --replace-fail \
@@ -3791,6 +4495,25 @@ assertNoAdditions {
     nvimSkipModules = "tsc.better-messages-test";
   };
 
+  tslime-vim = super.tslime-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.wtfpl;
+    };
+  });
+
+  tsuquyomi = super.tsuquyomi.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  tuis-nvim = super.tuis-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      # README contains the MIT license text.
+      license = lib.licenses.mit;
+    };
+  });
+
   tv-nvim = super.tv-nvim.overrideAttrs {
     runtimeDeps = [ television ];
   };
@@ -3843,17 +4566,35 @@ assertNoAdditions {
       passthru = old.passthru // {
         initLua = ''vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"'';
       };
+      meta = old.meta // {
+        license = lib.licenses.vim;
+      };
     });
 
-  unison = super.unison.overrideAttrs {
+  unison = super.unison.overrideAttrs (old: {
     # Editor stuff isn't at top level
     postPatch = "cd editor-support/vim";
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  unite-vim = super.unite-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   uv-nvim = super.uv-nvim.overrideAttrs {
     runtimeDeps = [ uv ];
   };
 
+  vader-vim = super.vader-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: {
     # on linux can use either Zenity or Yad.
     propagatedBuildInputs = [ zenity ];
@@ -3863,6 +4604,12 @@ assertNoAdditions {
     };
   });
 
+  vim-abolish = super.vim-abolish.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-addon-actions = super.vim-addon-actions.overrideAttrs {
     dependencies = with self; [
       vim-addon-mw-utils
@@ -3878,6 +4625,12 @@ assertNoAdditions {
     dependencies = [ self.vim-addon-mw-utils ];
   };
 
+  vim-addon-commenting = super.vim-addon-commenting.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-addon-completion = super.vim-addon-completion.overrideAttrs {
     dependencies = [ self.tlib_vim ];
   };
@@ -3886,6 +4639,12 @@ assertNoAdditions {
     dependencies = [ self.tlib_vim ];
   };
 
+  vim-addon-manager = super.vim-addon-manager.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-addon-mru = super.vim-addon-mru.overrideAttrs {
     dependencies = with self; [
       vim-addon-other
@@ -3935,6 +4694,12 @@ assertNoAdditions {
     ];
   };
 
+  vim-advanced-sorters = super.vim-advanced-sorters.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-agda = super.vim-agda.overrideAttrs {
     preFixup = ''
       substituteInPlace "$out"/autoload/agda.vim \
@@ -3942,6 +4707,18 @@ assertNoAdditions {
     '';
   };
 
+  vim-angry = super.vim-angry.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-apathy = super.vim-apathy.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-apm = super.vim-apm.overrideAttrs {
     nvimSkipModules = [ "run" ];
   };
@@ -3950,9 +4727,60 @@ assertNoAdditions {
     dependencies = [ self.vim-maktaba ];
   };
 
-  vim-beancount = super.vim-beancount.overrideAttrs {
+  vim-bbye = super.vim-bbye.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.agpl3Plus;
+    };
+  });
+
+  vim-beancount = super.vim-beancount.overrideAttrs (old: {
     passthru.python3Dependencies = ps: with ps; [ beancount ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-bepoptimist = super.vim-bepoptimist.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-capslock = super.vim-capslock.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-characterize = super.vim-characterize.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-clang-format = super.vim-clang-format.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-classpath = super.vim-classpath.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-clojure-static = super.vim-clojure-static.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-cmake = super.vim-cmake.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
   vim-codefmt = super.vim-codefmt.overrideAttrs {
     dependencies = [ self.vim-maktaba ];
@@ -3960,6 +4788,28 @@ assertNoAdditions {
 
   # Due to case-sensitivity issues, the hash differs on Darwin systems, see:
   # https://github.com/NixOS/nixpkgs/issues/157609
+  vim-coffee-script = super.vim-coffee-script.overrideAttrs (old: {
+    meta = old.meta // {
+      license = with lib.licenses; [
+        wtfpl
+        mit
+      ];
+    };
+  });
+
+  vim-colors-paramount = super.vim-colors-paramount.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-colors-solarized = super.vim-colors-solarized.overrideAttrs (old: {
+    meta = old.meta // {
+      # README carries the MIT license text.
+      license = lib.licenses.mit;
+    };
+  });
+
   vim-colorschemes = super.vim-colorschemes.overrideAttrs (old: {
     src = old.src.overrideAttrs (srcOld: {
       postFetch =
@@ -3970,6 +4820,18 @@ assertNoAdditions {
     });
   });
 
+  vim-commentary = super.vim-commentary.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-dadbod = super.vim-dadbod.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-dadbod-ui = super.vim-dadbod-ui.overrideAttrs {
     dependencies = [ self.vim-dadbod ];
 
@@ -3977,14 +4839,53 @@ assertNoAdditions {
     vimCommandCheck = "DBUI";
   };
 
-  vim-dasht = super.vim-dasht.overrideAttrs {
+  vim-dasht = super.vim-dasht.overrideAttrs (old: {
     preFixup = ''
       substituteInPlace $out/autoload/dasht.vim \
         --replace-fail "['dasht']" "['${dasht}/bin/dasht']"
     '';
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
-  vim-easytags = super.vim-easytags.overrideAttrs {
+  vim-DetectSpellLang = super.vim-DetectSpellLang.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.unlicense;
+    };
+  });
+
+  vim-dirvish = super.vim-dirvish.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Plus;
+    };
+  });
+
+  vim-dispatch = super.vim-dispatch.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-dotenv = super.vim-dotenv.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-easy-align = super.vim-easy-align.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-easymotion = super.vim-easymotion.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-easytags = super.vim-easytags.overrideAttrs (old: {
     dependencies = [ self.vim-misc ];
     patches = [
       (fetchpatch {
@@ -3993,24 +4894,91 @@ assertNoAdditions {
         sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4";
       })
     ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-elixir = super.vim-elixir.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.asl20;
+    };
+  });
+
+  vim-endwise = super.vim-endwise.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-erlang-omnicomplete = super.vim-erlang-omnicomplete.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-erlang-tags = super.vim-erlang-tags.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.asl20;
+    };
+  });
+
+  vim-eunuch = super.vim-eunuch.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-fireplace = super.vim-fireplace.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-flagship = super.vim-flagship.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
   vim-flog = super.vim-flog.overrideAttrs {
     # Not intended to be required, used by vim plugin
     nvimSkipModules = "flog.graph_bin";
   };
 
+  vim-fugitive = super.vim-fugitive.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-fzf-coauthorship = super.vim-fzf-coauthorship.overrideAttrs {
     dependencies = with self; [ fzf-vim ];
   };
 
-  vim-gist = super.vim-gist.overrideAttrs {
+  vim-gist = super.vim-gist.overrideAttrs (old: {
     dependencies = [ self.webapi-vim ];
-  };
+    meta = old.meta // {
+      # README carries the BSD-2-Clause text; GitHub did not detect it.
+      license = lib.licenses.bsd2;
+    };
+  });
 
   # change the go_bin_path to point to a path in the nix store. See the code in
   # fatih/vim-go here
   # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159
+  vim-github-dashboard = super.vim-github-dashboard.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-gnupg = super.vim-gnupg.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl2Plus;
+    };
+  });
+
   vim-go =
     let
       binPath = lib.makeBinPath [
@@ -4034,13 +5002,16 @@ assertNoAdditions {
         revive
       ];
     in
-    super.vim-go.overrideAttrs {
+    super.vim-go.overrideAttrs (old: {
       postPatch = ''
         sed -i autoload/go/config.vim -Ee 's@"go_bin_path", ""@"go_bin_path", "${binPath}"@g'
       '';
-    };
+      meta = old.meta // {
+        license = lib.licenses.bsd3;
+      };
+    });
 
-  vim-grammarous = super.vim-grammarous.overrideAttrs {
+  vim-grammarous = super.vim-grammarous.overrideAttrs (old: {
     # use `:GrammarousCheck` to initialize checking
     # In neovim, you also want to use set
     #   let g:grammarous#show_first_error = 1
@@ -4050,7 +5021,30 @@ assertNoAdditions {
         inherit languagetool;
       })
     ];
-  };
+    meta = old.meta // {
+      # README carries the MIT license text; GitHub did not detect it.
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-gruvbox8 = super.vim-gruvbox8.overrideAttrs (old: {
+    meta = old.meta // {
+      # README declares MIT; GitHub did not detect it.
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-hcl = super.vim-hcl.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-helm = super.vim-helm.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.bsd3;
+    };
+  });
 
   vim-hexokinase = super.vim-hexokinase.overrideAttrs (old: {
     preFixup =
@@ -4078,6 +5072,12 @@ assertNoAdditions {
     runtimeDeps = [ jq ];
   };
 
+  vim-indentwise = super.vim-indentwise.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Plus;
+    };
+  });
+
   vim-isort = super.vim-isort.overrideAttrs {
     postPatch = ''
       substituteInPlace autoload/vimisort.vim \
@@ -4085,6 +5085,61 @@ assertNoAdditions {
     '';
   };
 
+  vim-javascript = super.vim-javascript.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-jdaddy = super.vim-jdaddy.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-jsbeautify = super.vim-jsbeautify.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-json = super.vim-json.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-LanguageTool = super.vim-LanguageTool.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-ledger = super.vim-ledger.overrideAttrs (old: {
+    meta = old.meta // {
+      # README carries the GPL-2.0-or-later notice; GitHub did not detect it.
+      license = lib.licenses.gpl2Plus;
+    };
+  });
+
+  vim-lexical = super.vim-lexical.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-llvm = super.vim-llvm.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.WITH lib.licenses.asl20 lib.licenses.llvm-exception;
+    };
+  });
+
+  vim-markdown = super.vim-markdown.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   vim-matchup = super.vim-matchup.overrideAttrs {
     # Optional treesitter integration
     nvimSkipModules = "treesitter-matchup.third-party.query";
@@ -4098,13 +5153,142 @@ assertNoAdditions {
     preInstall = "cd vim";
   };
 
+  vim-misc = super.vim-misc.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-obsession = super.vim-obsession.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-openscad = super.vim-openscad.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
+  vim-operator-surround = super.vim-operator-surround.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-orgmode = super.vim-orgmode.overrideAttrs (old: {
+    meta = old.meta // {
+      # Source is AGPL-3.0-only; bundled docs are GFDL-1.3-or-later.
+      license = with lib.licenses; [
+        agpl3Only
+        fdl13Plus
+      ];
+    };
+  });
+
+  vim-peekaboo = super.vim-peekaboo.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-pencil = super.vim-pencil.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-pico8-syntax = super.vim-pico8-syntax.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-pluto = super.vim-pluto.overrideAttrs {
     dependencies = [ self.denops-vim ];
   };
 
-  vim-sensible = super.vim-sensible.overrideAttrs {
+  vim-projectionist = super.vim-projectionist.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-ps1 = super.vim-ps1.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.asl20;
+    };
+  });
+
+  vim-ragtag = super.vim-ragtag.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-rails = super.vim-rails.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-repeat = super.vim-repeat.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-ReplaceWithRegister = super.vim-ReplaceWithRegister.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-ReplaceWithSameIndentRegister = super.vim-ReplaceWithSameIndentRegister.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-rsi = super.vim-rsi.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-salve = super.vim-salve.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-scriptease = super.vim-scriptease.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-sensible = super.vim-sensible.overrideAttrs (old: {
     patches = [ ./patches/vim-sensible/fix-nix-store-path-regex.patch ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-sexp-mappings-for-regular-people =
+    super.vim-sexp-mappings-for-regular-people.overrideAttrs
+      (old: {
+        meta = old.meta // {
+          license = lib.licenses.vim;
+        };
+      });
+
+  vim-sleuth = super.vim-sleuth.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
   vim-snipmate = super.vim-snipmate.overrideAttrs {
     dependencies = with self; [
@@ -4113,9 +5297,18 @@ assertNoAdditions {
     ];
   };
 
-  vim-speeddating = super.vim-speeddating.overrideAttrs {
+  vim-speeddating = super.vim-speeddating.overrideAttrs (old: {
     dependencies = [ self.vim-repeat ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-stationeers-ic10-syntax = super.vim-stationeers-ic10-syntax.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
     postPatch = old.postPatch or "" + ''
@@ -4125,13 +5318,34 @@ assertNoAdditions {
     '';
   });
 
-  vim-surround = super.vim-surround.overrideAttrs {
+  vim-surround = super.vim-surround.overrideAttrs (old: {
     dependencies = [ self.vim-repeat ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-syntax-shakespeare = super.vim-syntax-shakespeare.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-SyntaxRange = super.vim-SyntaxRange.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
 
   vim-tabby = super.vim-tabby.overrideAttrs {
   };
 
+  vim-tbone = super.vim-tbone.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vim-textobj-entire = super.vim-textobj-entire.overrideAttrs (old: {
     dependencies = [ self.vim-textobj-user ];
     meta = old.meta // {
@@ -4148,6 +5362,15 @@ assertNoAdditions {
 
   vim-textobj-quote = super.vim-textobj-quote.overrideAttrs (old: {
     dependencies = [ self.vim-textobj-user ];
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-textobj-user = super.vim-textobj-user.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
   });
 
   vim-tpipeline = super.vim-tpipeline.overrideAttrs {
@@ -4161,9 +5384,31 @@ assertNoAdditions {
     nvimSkipModules = [ "ultest" ];
   };
 
-  vim-unimpaired = super.vim-unimpaired.overrideAttrs {
+  vim-unimpaired = super.vim-unimpaired.overrideAttrs (old: {
     dependencies = [ self.vim-repeat ];
-  };
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-vinegar = super.vim-vinegar.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vim-visual-increment = super.vim-visual-increment.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-waikiki = super.vim-waikiki.overrideAttrs (old: {
+    meta = old.meta // {
+      # README-only CC-BY-SA-4.0 notice; GitHub detection missed it.
+      license = lib.licenses.cc-by-sa-40;
+    };
+  });
 
   vim-wakatime = super.vim-wakatime.overrideAttrs {
     buildInputs = [ python3 ];
@@ -4176,9 +5421,18 @@ assertNoAdditions {
     '';
   };
 
-  vim-xdebug = super.vim-xdebug.overrideAttrs {
+  vim-wordy = super.vim-wordy.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vim-xdebug = super.vim-xdebug.overrideAttrs (old: {
     postInstall = null;
-  };
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
 
   vim-xkbswitch = super.vim-xkbswitch.overrideAttrs {
     buildInputs = [ xkb-switch ];
@@ -4198,6 +5452,12 @@ assertNoAdditions {
     ];
   };
 
+  vim-zscript = super.vim-zscript.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.cc0;
+    };
+  });
+
   vimacs = super.vimacs.overrideAttrs (old: {
     buildPhase = ''
       substituteInPlace bin/vim \
@@ -4223,6 +5483,30 @@ assertNoAdditions {
     ];
   };
 
+  vimagit = super.vimagit.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  VimCompletesMe = super.VimCompletesMe.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
+  vimfiler-vim = super.vimfiler-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
+  vimoutliner = super.vimoutliner.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.gpl3Only;
+    };
+  });
+
   vimproc-vim = super.vimproc-vim.overrideAttrs {
     buildInputs = [ which ];
 
@@ -4256,11 +5540,23 @@ assertNoAdditions {
     ];
   };
 
+  vimwiki = super.vimwiki.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   virt-column-nvim = super.virt-column-nvim.overrideAttrs {
     # Meta file
     nvimSkipModules = "virt-column.config.types";
   };
 
+  vis = super.vis.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.vim;
+    };
+  });
+
   vs-tasks-nvim = super.vs-tasks-nvim.overrideAttrs {
     checkInputs = [
       # Optional telescope integration
@@ -4271,6 +5567,12 @@ assertNoAdditions {
     ];
   };
 
+  webapi-vim = super.webapi-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.publicDomain;
+    };
+  });
+
   which-key-nvim = super.which-key-nvim.overrideAttrs {
     nvimSkipModules = [ "which-key.docs" ];
   };
@@ -4309,6 +5611,12 @@ assertNoAdditions {
     ];
   };
 
+  xeno-nvim = super.xeno-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   xmake-nvim = super.xmake-nvim.overrideAttrs {
     nvimSkipModule = [
       # attempt to index upvalue 'options' (a nil value)
@@ -4318,6 +5626,13 @@ assertNoAdditions {
     ];
   };
 
+  xterm-color-table-vim = super.xterm-color-table-vim.overrideAttrs (old: {
+    meta = old.meta // {
+      # README-only MIT notice; GitHub detection missed it.
+      license = lib.licenses.mit;
+    };
+  });
+
   yaml-companion-nvim = super.yaml-companion-nvim.overrideAttrs {
     dependencies = [
       self.nvim-lspconfig
@@ -4332,6 +5647,12 @@ assertNoAdditions {
     ];
   };
 
+  yank-path-nvim = super.yank-path-nvim.overrideAttrs (old: {
+    meta = old.meta // {
+      license = lib.licenses.mit;
+    };
+  });
+
   yanky-nvim = super.yanky-nvim.overrideAttrs {
     checkInputs = with self; [
       # Optional telescope integration
diff --git a/pkgs/applications/editors/vim/plugins/utils/get-plugins.nix b/pkgs/applications/editors/vim/plugins/utils/get-plugins.nix
index 3b8e346bb5f0..c8d0c0a4167f 100644
--- a/pkgs/applications/editors/vim/plugins/utils/get-plugins.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/get-plugins.nix
@@ -17,6 +17,7 @@ let
   parse = _name: value: {
     inherit (value) pname version;
     homePage = value.meta.homepage;
+    license = value.meta.license.spdxId or null;
     checksum =
       if hasChecksum value then
         {
diff --git a/pkgs/applications/editors/vim/plugins/utils/update.py b/pkgs/applications/editors/vim/plugins/utils/update.py
index 5dd551b4f0cf..7286b8195e29 100755
--- a/pkgs/applications/editors/vim/plugins/utils/update.py
+++ b/pkgs/applications/editors/vim/plugins/utils/update.py
@@ -19,6 +19,7 @@
 #
 
 import inspect
+import json
 import logging
 import os
 import textwrap
@@ -36,18 +37,27 @@ from nixpkgs_plugin_update import PluginDesc, run_nix_expr
 treesitter = importlib.import_module("nvim-treesitter.update")
 
 
-HEADER = (
-    "# GENERATED by ./pkgs/applications/editors/vim/plugins/utils/update.py. Do not edit!"
-)
+HEADER = "# GENERATED by ./pkgs/applications/editors/vim/plugins/utils/update.py. Do not edit!"
 
 NIXPKGS_NVIMTREESITTER_FOLDER = "pkgs/applications/editors/vim/plugins/nvim-treesitter"
 
+SPDX_LICENSE_NORMALIZATION = {
+    "AGPL-3.0": "AGPL-3.0-only",
+    "GPL-2.0": "GPL-2.0-only",
+    "GPL-3.0": "GPL-3.0-only",
+    "LGPL-2.0": "LGPL-2.0-only",
+    "LGPL-2.1": "LGPL-2.1-only",
+    "LGPL-3.0": "LGPL-3.0-only",
+}
+
 
 class VimEditor(nixpkgs_plugin_update.Editor):
     nvim_treesitter_updated = False
 
     def generate_nix(
-        self, plugins: List[Tuple[PluginDesc, nixpkgs_plugin_update.Plugin]], outfile: str
+        self,
+        plugins: List[Tuple[PluginDesc, nixpkgs_plugin_update.Plugin]],
+        outfile: str,
     ):
         log.info("Generating nix code")
         log.debug("Loading nvim-treesitter source reference from nix...")
@@ -93,7 +103,10 @@ class VimEditor(nixpkgs_plugin_update.Editor):
             for pdesc, plugin in plugins:
                 content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin))
                 f.write(content)
-                if plugin.name == "nvim-treesitter" and (plugin.tag or plugin.commit) != nvim_treesitter_ref:
+                if (
+                    plugin.name == "nvim-treesitter"
+                    and (plugin.tag or plugin.commit) != nvim_treesitter_ref
+                ):
                     self.nvim_treesitter_updated = True
             f.write("}\n")
         print(f"updated {outfile}")
@@ -102,16 +115,29 @@ class VimEditor(nixpkgs_plugin_update.Editor):
         self, pdesc: PluginDesc, plugin: nixpkgs_plugin_update.Plugin, isNeovim: bool
     ) -> str:
         if isNeovim:
-            raise RuntimeError(f"Plugin {plugin.name} is already packaged in `luaPackages`, please use that")
+            raise RuntimeError(
+                f"Plugin {plugin.name} is already packaged in `luaPackages`, please use that"
+            )
         repo = pdesc.repo
 
         content = f"  {plugin.normalized_name} = "
         src_nix = repo.as_nix(plugin)
+        license_spdx_id = plugin.license
+        if license_spdx_id is not None:
+            license_spdx_id = SPDX_LICENSE_NORMALIZATION.get(
+                license_spdx_id, license_spdx_id
+            )
+        license_nix = (
+            f"    meta.license = lib.meta.getLicenseFromSpdxId {json.dumps(license_spdx_id)};\n"
+            if license_spdx_id
+            else "    meta.license = lib.licenses.unfree;\n"
+        )
         content += """{buildFn} {{
     pname = "{plugin.name}";
     version = "{plugin.version}";
     src = {src_nix};
     meta.homepage = "{repo.uri}";
+{license_nix}\
     meta.hydraPlatforms = [ ];
   }};
 
@@ -120,6 +146,7 @@ class VimEditor(nixpkgs_plugin_update.Editor):
             plugin=plugin,
             src_nix=src_nix,
             repo=repo,
+            license_nix=license_nix,
         )
         log.debug(content)
         return content
diff --git a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
index c635fead45c6..5f0290699007 100644
--- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix
@@ -218,6 +218,8 @@ let
             paths = allGrammars;
           };
 
+          allAndOptPluginNames = map (plugin: plugin.pname or null) (allPlugins ++ opt);
+
           packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" (
             if allGrammars != [ ] then allPlugins ++ [ allGrammarsSymlinked ] else allPlugins
           );
@@ -234,8 +236,8 @@ let
 
         assert
           (
-            builtins.elem vimPlugins.nvim-treesitter (opt ++ allPlugins)
-            && builtins.elem vimPlugins.nvim-treesitter-legacy (opt ++ allPlugins)
+            builtins.elem "nvim-treesitter" allAndOptPluginNames
+            && builtins.elem "nvim-treesitter-legacy" allAndOptPluginNames
           )
           -> throw "You cannot include two different versions of nvim-treesitter, perhaps you included a legacy plugin together with a new one?";
 
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 92a88315a710..273cc737a08e 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -78,6 +78,7 @@ https://github.com/AstroNvim/astrocore/,,
 https://github.com/AstroNvim/astrolsp/,,
 https://github.com/AstroNvim/astrotheme/,,
 https://github.com/AstroNvim/astroui/,,
+https://github.com/lewis6991/async.nvim/,,
 https://github.com/prabirshrestha/async.vim/,,
 https://github.com/prabirshrestha/asyncomplete-buffer.vim/,,
 https://github.com/prabirshrestha/asyncomplete-file.vim/,,
@@ -253,6 +254,7 @@ https://github.com/franco-ruggeri/codecompanion-spinner.nvim/,,
 https://github.com/olimorris/codecompanion.nvim/,,
 https://github.com/mrjones2014/codesettings.nvim/,,
 https://github.com/gorbit99/codewindow.nvim/,,
+https://github.com/johnseth97/codex.nvim/,,
 https://github.com/metakirby5/codi.vim/,,
 https://github.com/archseer/colibri.vim/,,
 https://github.com/tjdevries/colorbuddy.nvim/,,
@@ -558,6 +560,8 @@ https://github.com/ajbucci/ipynb.nvim/,,
 https://github.com/twerth/ir_black/,,
 https://github.com/Vigemus/iron.nvim/,,
 https://github.com/haya14busa/is.vim/,,
+https://github.com/Treeniks/isabelle-lsp.nvim/,,
+https://github.com/Treeniks/isabelle-syn.nvim/,,
 https://github.com/mizlan/iswap.nvim/,,
 https://github.com/vim-scripts/jdaddy.vim/,,
 https://github.com/mahyarmirrashed/jdd.nvim/,,
@@ -572,6 +576,7 @@ https://git.myzel394.app/Myzel394/jsonfly.nvim,,
 https://github.com/julelang/jule.nvim/,,
 https://github.com/JuliaEditorSupport/julia-vim/,,
 https://github.com/GCBallesteros/jupytext.nvim/,,
+https://github.com/nxuv/just.nvim/,,
 https://github.com/thesimonho/kanagawa-paper.nvim/,,
 https://github.com/rebelot/kanagawa.nvim/,,
 https://github.com/webhooked/kanso.nvim/,,
@@ -785,6 +790,7 @@ https://github.com/nvim-neorg/neorg-telescope/,,
 https://github.com/karb94/neoscroll.nvim/,,
 https://github.com/Shougo/neosnippet-snippets/,,
 https://github.com/Shougo/neosnippet.vim/,,
+https://github.com/kawre/neotab.nvim/,,
 https://github.com/kassio/neoterm/,,
 https://github.com/rcasia/neotest-bash/,,
 https://github.com/orjangj/neotest-ctest/,,
@@ -905,6 +911,7 @@ https://codeberg.org/mfussenegger/nvim-jdtls/,,
 https://github.com/gennaro-tedesco/nvim-jqx/,,
 https://gitlab.com/usmcamp0811/nvim-julia-autotest,,
 https://github.com/yorickpeterse/nvim-jump/,,
+https://github.com/chrisgrieser/nvim-justice/,,
 https://github.com/anasinnyk/nvim-k8s-crd/,,
 https://github.com/ethanholz/nvim-lastplace/,,
 https://github.com/kosayoda/nvim-lightbulb/,,
@@ -944,6 +951,7 @@ https://github.com/petertriho/nvim-scrollbar/,,
 https://github.com/dstein64/nvim-scrollview/,,
 https://github.com/s1n7ax/nvim-search-and-replace/,,
 https://github.com/michaelrommel/nvim-silicon/,,
+https://github.com/jbuck95/nvim-sioyek-highlights/,,
 https://github.com/garymjr/nvim-snippets/,,
 https://github.com/dcampos/nvim-snippy/,,
 https://github.com/ishan9299/nvim-solarized-lua/,,
@@ -1082,7 +1090,6 @@ https://github.com/vim-scripts/rcshell.vim/,,
 https://github.com/ryvnf/readline.vim/,,
 https://github.com/theprimeagen/refactoring.nvim/,,
 https://github.com/mawkler/refjump.nvim/,,
-https://github.com/tversteeg/registers.nvim/,,
 https://github.com/vladdoster/remember.nvim/,,
 https://github.com/amitds1997/remote-nvim.nvim/,,
 https://github.com/nosduco/remote-sshfs.nvim/,,
@@ -1683,7 +1690,7 @@ https://github.com/bohlender/vim-smt2/,,
 https://github.com/justinmk/vim-sneak/,,
 https://github.com/garbas/vim-snipmate/,,
 https://github.com/honza/vim-snippets/,,
-https://github.com/lifepillar/vim-solarized8/,,
+https://codeberg.org/lifepillar/vim-solarized8/,,
 https://github.com/tomlion/vim-solidity/,,
 https://github.com/christoomey/vim-sort-motion/,,
 https://github.com/tpope/vim-speeddating/,,
diff --git a/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix b/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix
index 87125c0ed7cb..d78d9bf22ca3 100644
--- a/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix
@@ -19,6 +19,8 @@ vscode-utils.buildVscodeExtension (finalAttrs: {
     installPhase = ''
       runHook preInstall
 
+      patchShebangs .
+
       npm --workspace=gemini-cli-vscode-ide-companion run prepackage
 
       # the bundled vsce is broken, using our packaged version
diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 4d2438e9d58a..0c1d59789c3e 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -1,22 +1,54 @@
 {
   lib,
-  claude-code,
+  stdenv,
+  stdenvNoCC,
+  autoPatchelfHook,
+  alsa-lib,
+  testers,
   vscode-utils,
 }:
 
-vscode-utils.buildVscodeMarketplaceExtension {
-  mktplcRef = {
-    name = "claude-code";
-    publisher = "anthropic";
-    version = "2.1.114";
-    hash = "sha256-rcEbeYsyhbhh5wj6Mo3kz2+K3uZe5XMBKpwmSaB9Pgc=";
-  };
+vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
-  postInstall = ''
-    mkdir -p "$out/$installPrefix/resources/native-binary"
-    rm -f "$out/$installPrefix/resources/native-binary/claude"*
-    ln -s "${claude-code}/bin/claude" "$out/$installPrefix/resources/native-binary/claude"
-  '';
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    (lib.getLib stdenv.cc.cc)
+    alsa-lib
+  ];
+
+  mktplcRef =
+    let
+      sources = {
+        "x86_64-linux" = {
+          arch = "linux-x64";
+          hash = "sha256-cDR/E5ATkKHUhvfQ+721M1DbNNxbSzWdnah7kEpyIxc=";
+        };
+        "aarch64-linux" = {
+          arch = "linux-arm64";
+          hash = "sha256-8vJHvwYdCdQb0kHNbM6KNp27BJh8RGrBmw++Zz7nLf4=";
+        };
+        "x86_64-darwin" = {
+          arch = "darwin-x64";
+          hash = "sha256-y93nqrqeLrOSPu+/NsKVg1yYPGT1x5XENO3VE/+uQU4=";
+        };
+        "aarch64-darwin" = {
+          arch = "darwin-arm64";
+          hash = "sha256-CYewM/KAk/WrEBiDK/aCkNc4/sGMIDnrHAoHIYU/h+o=";
+        };
+      };
+    in
+    {
+      name = "claude-code";
+      publisher = "anthropic";
+      version = "2.1.123";
+    }
+    // sources.${stdenvNoCC.hostPlatform.system}
+      or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
+
+  passthru.tests.bundled-claude-runs = testers.testVersion {
+    package = finalAttrs.finalPackage;
+    command = "${finalAttrs.finalPackage}/share/vscode/extensions/anthropic.claude-code/resources/native-binary/claude --version";
+  };
 
   meta = {
     description = "Harness the power of Claude Code without leaving your IDE";
@@ -25,5 +57,11 @@ vscode-utils.buildVscodeMarketplaceExtension {
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     maintainers = with lib.maintainers; [ xiaoxiangmoe ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
   };
-}
+})
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 55013a467a21..2fd4eca2ca34 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -85,7 +85,7 @@ let
         };
       };
 
-      "42crunch".vscode-openapi = buildVscodeMarketplaceExtension {
+      "42crunch".vscode-openapi = buildVscodeMarketplaceExtension rec {
         mktplcRef = {
           publisher = "42Crunch";
           name = "vscode-openapi";
@@ -93,7 +93,7 @@ let
           hash = "sha256-nV7RZpDd+15YmINKrFSIlFurC955bnE4A8esrKWYVnE=";
         };
         meta = {
-          changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog";
+          changelog = "https://github.com/42Crunch/vscode-openapi/blob/v${mktplcRef.version}/CHANGELOG.md";
           description = "Visual Studio Code extension with rich support for the OpenAPI Specification (OAS)";
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=42Crunch.vscode-openapi";
           homepage = "https://github.com/42Crunch/vscode-openapi";
@@ -291,8 +291,8 @@ let
         mktplcRef = {
           publisher = "antfu";
           name = "slidev";
-          version = "52.14.2";
-          hash = "sha256-Y9vAbdklsnWgLjEV6sLpWiJaKf8AOES0qgM/Hx+4UE4=";
+          version = "52.15.0";
+          hash = "sha256-iCOLP2ZOm/kwmNFrmc9NJi1nU+301y2Jgnj9FbUSbm0=";
         };
         meta = {
           license = lib.licenses.mit;
@@ -1096,8 +1096,8 @@ let
         mktplcRef = {
           name = "csharpier-vscode";
           publisher = "csharpier";
-          version = "10.0.1";
-          hash = "sha256-yO8qnL2/OKE8mAU19y+rDfS5G3zPZ0MQi81n/Bs9jFM=";
+          version = "10.0.2";
+          hash = "sha256-SIogJ+5toIwa840I6ETxiLIHbfHjuAuOdleb+cYJElc=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/csharpier.csharpier-vscode/changelog";
@@ -1174,8 +1174,8 @@ let
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.17.20";
-          hash = "sha256-7nJlPP1Xap0lSJz+HQmKKC9OZ5UfMCq8nf1B/bkyNXU=";
+          version = "3.17.36";
+          hash = "sha256-7+Ja5/zeGq+W1aCIzZu0x+CU1ERwZhwvOaZKaGSWK4c=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
@@ -1346,8 +1346,8 @@ let
         mktplcRef = {
           publisher = "discloud";
           name = "discloud";
-          version = "2.28.5";
-          hash = "sha256-G5WgFSrmQOOtsDFfmJaJxvgbKfnpQSmMf+xAJeuhvhU=";
+          version = "2.28.7";
+          hash = "sha256-0RCuCZXDJ9svmI9Kc6vBE/l0f33aB3BXCFuHLFpa8nI=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
@@ -1375,8 +1375,8 @@ let
         mktplcRef = {
           name = "competitive-programming-helper";
           publisher = "DivyanshuAgrawal";
-          version = "2025.12.1766739309";
-          hash = "sha256-innqhXTflK6yS9n3Sw1sbRKT4/BT+Aa6hsKrc1pOsZ4=";
+          version = "2026.4.1776958969";
+          hash = "sha256-Ng9Yw1Jq2lSLqczHj6tjhtINfzx1bOXlVN0K1pogIKw=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
@@ -1457,8 +1457,8 @@ let
         mktplcRef = {
           name = "protobuf-vsc";
           publisher = "DrBlury";
-          version = "1.6.0";
-          hash = "sha256-HvTJSFRKO0K7Ud9381viPrXp3TInB1FT97qZArosAjY=";
+          version = "1.6.6";
+          hash = "sha256-uMyxdLptaLZBlLEugvYQgJTZCtysmnZix9faXsQfHGk=";
         };
         meta = {
           description = "Comprehensive Protocol Buffers support with syntax highlighting, IntelliSense, diagnostics and formatting";
@@ -1744,8 +1744,8 @@ let
         mktplcRef = {
           name = "vscode-jest-runner";
           publisher = "firsttris";
-          version = "0.4.147";
-          hash = "sha256-gMlGU6XSvWEufaaszFJ7VmPM9q5oI5K/hFzIwQGTSCE=";
+          version = "0.4.148";
+          hash = "sha256-bqyi1uk4Y1PMOjVv+io3WxJMrJb7UKy368xt6TiySPg=";
         };
         meta = {
           description = "Simple way to run or debug a single (or multiple) tests from context-menu";
@@ -1760,8 +1760,8 @@ let
         mktplcRef = {
           name = "foam-vscode";
           publisher = "foam";
-          version = "0.38.0";
-          hash = "sha256-SJozi2AlV+wHD0wuhpgkG6Ve5AGIhsVDC37eE8/bnKM=";
+          version = "0.39.0";
+          hash = "sha256-kOzr8YjwHdA3Tgo4JeEAWda4tBrXjMQNBITNhmy9cP4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
@@ -1933,8 +1933,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "codespaces";
-          version = "1.18.12";
-          hash = "sha256-A/ORfMybSCm90SFg8hRx/N0Vq9XMtTjMPVzCIoG938g=";
+          version = "1.18.13";
+          hash = "sha256-tvs35GA3bZ4jExiAe0NeHx/vQV/+2zio2Q0813/MAMU=";
         };
 
         meta = {
@@ -1970,8 +1970,8 @@ let
         mktplcRef = {
           name = "vscode-github-actions";
           publisher = "github";
-          version = "0.31.3";
-          hash = "sha256-Do1z7ywF/0Do09chX0bFtkX+8Nux0fBCWfVpUagiioM=";
+          version = "0.31.5";
+          hash = "sha256-hGdcMAkzpJqX61Ki87ckFAhncOm6LmNCQh4imIg64oY=";
         };
         meta = {
           description = "Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories";
@@ -1986,8 +1986,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "vscode-pull-request-github";
-          version = "0.136.0";
-          hash = "sha256-WUdA5aD3EC45gHBo4ctxVUog8QTEIq6IXlCOPZBBXmo=";
+          version = "0.138.0";
+          hash = "sha256-tOqBBgA6HxBc5TT4/A3OWKxDvaoqw8zXCtMa+K3Ku1E=";
         };
         meta = {
           license = lib.licenses.mit;
@@ -1998,8 +1998,8 @@ let
         mktplcRef = {
           name = "gitlab-workflow";
           publisher = "gitlab";
-          version = "6.74.3";
-          hash = "sha256-2G/dyedhmjN8630yMccY58ZtNwPPtBB8HFFkZ0dLYDA=";
+          version = "6.75.1";
+          hash = "sha256-C6PqrgpQyiG5neVB12bpHMmxFRWXCPQuG0QeyVf5BKs=";
         };
         meta = {
           description = "GitLab extension for Visual Studio Code";
@@ -2324,8 +2324,8 @@ let
         mktplcRef = {
           name = "vscode-vibrancy-continued";
           publisher = "illixion";
-          version = "1.1.75";
-          hash = "sha256-49svwafMoAErwX3K/37IJ8fKx+9FgSpOqj6QPc7jpKs=";
+          version = "1.1.76";
+          hash = "sha256-QMKEFoqOzlSduwjefou1ozt3WbSbeXfxEGj6KMqR3eY=";
         };
         meta = {
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
@@ -3322,8 +3322,8 @@ let
         mktplcRef = {
           publisher = "ms-vscode";
           name = "cmake-tools";
-          version = "1.23.51";
-          hash = "sha256-5AcmkJmk5ccZjHPx/4gZ/WW6c6RlHcosaPXHjey2a0M=";
+          version = "1.23.52";
+          hash = "sha256-LfYoKiiaETtlq4Jqe1bd5WaS5nBoci9K6BugZjgY2Ho=";
         };
         meta.license = lib.licenses.mit;
       };
@@ -3534,8 +3534,8 @@ let
         mktplcRef = {
           publisher = "mvllow";
           name = "rose-pine";
-          version = "2.15.0";
-          hash = "sha256-4l4KzxrLU34dIHI7ycypyN0yi2jzRs8voAD5HE4fgII=";
+          version = "2.15.1";
+          hash = "sha256-GCN201yqr4lf2rc0ZV+iWkZi69qGOXFKhLPMhJ08U2w=";
         };
         meta = {
           license = lib.licenses.mit;
@@ -3799,8 +3799,8 @@ let
         mktplcRef = {
           name = "prisma";
           publisher = "Prisma";
-          version = "31.9.0";
-          hash = "sha256-ubUVFFfjrtoz+hI8/epCcbrU4WfQdVYy4dPHighFpK0=";
+          version = "31.10.0";
+          hash = "sha256-2KJdvzIKrNcFwxvTmXKl3z7AkClfJhyl0ZUmdUcMnzg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
@@ -3861,8 +3861,8 @@ let
         mktplcRef = {
           name = "ansible";
           publisher = "redhat";
-          version = "26.4.2";
-          hash = "sha256-mSsCeUMEmLkEuxQIBQZaVzOpOwZ7b4SaiPwOJdVuIJk=";
+          version = "26.4.4";
+          hash = "sha256-fBwehxNmePQuM+kJ4cigVQCZ9UqBlBcT6+xD/gDCv64=";
         };
         meta = {
           description = "Ansible language support";
@@ -3898,8 +3898,8 @@ let
         mktplcRef = {
           publisher = "redhat";
           name = "vscode-yaml";
-          version = "1.21.0";
-          hash = "sha256-55PBCTV6NJL+JVH+19vIoA5GKMDD8uB7z9OCOb+GjZM=";
+          version = "1.22.0";
+          hash = "sha256-Xsy2350zAxSEhJgCl5/bVwWEwaXgmnN0Y/orDjwNuw4=";
         };
         meta = {
           description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support";
@@ -4240,8 +4240,8 @@ let
         mktplcRef = {
           publisher = "shopify";
           name = "ruby-lsp";
-          version = "0.10.2";
-          hash = "sha256-FWvRGMB19uHVe97TvwI0EDjjnUqHpJNVTI0ZwfpBDKY=";
+          version = "0.10.3";
+          hash = "sha256-PzK3cQYgLmSya4YPaOTBa3P1tOb4iO+Of4JsdbZFwxk=";
         };
         meta = {
           description = "VS Code plugin for connecting with the Ruby LSP";
@@ -4357,8 +4357,8 @@ let
         mktplcRef = {
           publisher = "sonarsource";
           name = "sonarlint-vscode";
-          version = "5.1.0";
-          hash = "sha256-eGAXjN4Vp6ZlUgUxlE8gfo5OYtL/IO/8ACu3PBwePLQ=";
+          version = "5.2.0";
+          hash = "sha256-Q9wP+PqjWVyqVh0FK8lx+k4bxacyQO7aLtZX98fRl7g=";
         };
         meta.license = lib.licenses.lgpl3Only;
       };
@@ -4789,8 +4789,8 @@ let
         mktplcRef = {
           name = "opa";
           publisher = "tsandall";
-          version = "0.22.1";
-          hash = "sha256-Ov2vJIZXrq5m9VNPOX4KJvLcvHuLJPTv0CU6479CyOI=";
+          version = "0.23.0";
+          hash = "sha256-xya4Kxjc/uR4LFTZ5fAVOa0/cyHy8XHZkkapmODyMK4=";
         };
         meta = {
           changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md";
@@ -4807,8 +4807,8 @@ let
         mktplcRef = {
           name = "emacs-mcx";
           publisher = "tuttieee";
-          version = "0.110.2";
-          hash = "sha256-E2L95LQw/Oku8cJMpKVeY6VOhZzIkSkZI4+ozmFqyg4=";
+          version = "0.110.7";
+          hash = "sha256-9w78/6W/aqJxzoTBqSV7sek2zUf9gKlWFJ/0/XS9124=";
         };
         meta = {
           changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
@@ -5025,8 +5025,8 @@ let
         mktplcRef = {
           name = "vstuc";
           publisher = "VisualStudioToolsForUnity";
-          version = "1.2.1";
-          hash = "sha256-WvEjR3cBXhCdd4FdIcTYEtifTdx0nNm3Ku0WpVrJ7hM=";
+          version = "1.2.2";
+          hash = "sha256-Yh4nhRTOmQiL34wYnd7Y2OMdl837fexRm5r2hHfhjIg=";
         };
         meta = {
           description = "Integrates Visual Studio Code for Unity";
@@ -5146,8 +5146,8 @@ let
         mktplcRef = {
           publisher = "vscjava";
           name = "vscode-maven";
-          version = "0.45.2";
-          hash = "sha256-iXmOePF+i/gaYSMpEa0YPfKzmYRy1sRg64iHfqlc3AY=";
+          version = "0.45.3";
+          hash = "sha256-LR0vfQ5P81uIJPoY0CuieyjjePMwJo75TDMCpZwi80g=";
         };
         meta = {
           license = lib.licenses.mit;
@@ -5196,8 +5196,8 @@ let
         mktplcRef = {
           name = "volar";
           publisher = "Vue";
-          version = "3.2.6";
-          hash = "sha256-1R5N3JjJUZ/KPYXGq/VOzbMmQj1fzrK9HrAjA8Ja2a4=";
+          version = "3.2.7";
+          hash = "sha256-KLPb4XTm1lD44D4ajdH1Gr0J0JaN5TpaGp+bCpSuo3U=";
         };
         meta = {
           changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md";
@@ -5240,8 +5240,8 @@ let
         mktplcRef = {
           name = "csharp-ls";
           publisher = "vytautassurvila";
-          version = "0.0.31";
-          hash = "sha256-d2vHhM+/hzT/JdFzu2WtJiWY2BHGk8SicleHxwm8ciY=";
+          version = "0.0.32";
+          hash = "sha256-dc7aIUb+5fdmqVeHrysy8jjk0Sx6ThIsO9KagdQpx+M=";
         };
         meta = {
           changelog = "https://github.com/vytautassurvila/vscode-csharp-ls/blob/master/CHANGELOG.md";
diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
index 82d67d21805a..68f9f7bbe333 100644
--- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "basedpyright";
     publisher = "detachhead";
-    version = "1.39.2";
-    hash = "sha256-iSjwEPSlPWmg3cYLSCp2YmHOR8EShGuPHzXMHGoa4iM=";
+    version = "1.39.3";
+    hash = "sha256-uuWkSxjsY7ZL1QUwqkiwPTN8oGUktfm7/Hgv3Enmgqc=";
   };
   meta = {
     changelog = "https://github.com/detachhead/basedpyright/releases";
diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
index 712f3982a824..ca76e9dbb55d 100644
--- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "github";
     name = "copilot-chat";
-    version = "0.44.1";
-    hash = "sha256-xm3BG6d853ztavvTmADyTbc13xD0x9eZ4TudNpNH7+0=";
+    version = "0.44.2";
+    hash = "sha256-kjLpbA6zUta4K86yEDiLNWvy3kJ3AvF2fncCO/JVl6I=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix b/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix
index 19546d9bd0ca..fe6f30fa0b53 100644
--- a/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix
@@ -25,7 +25,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
   '';
 
   meta = {
-    changelog = "https://marketplace.visualstudio.com/items/gplane.wasm-language-tools/changelog";
     description = "Language support of WebAssembly";
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=gplane.wasm-language-tools";
     homepage = "https://github.com/g-plane/vscode-wasm";
diff --git a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix
index 647355dbb00c..31fc7cf075b7 100644
--- a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix
@@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-IoBA0fuy9XxZgswN1j9DfwDI218h2huapl1Bfs2AscI=";
+          hash = "sha256-YeF6LyQzVAXgZ5Iqr6YvNcACfiUukUsq7cybeCQdSYc=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-EfoRRJFTNr+0JAkqWJ2pXwhBtmAXs9cANLzXb4obOMs=";
+          hash = "sha256-SjirNvI83eh3Gt5rGsaiLT6TJMH6LRQAasOFNy9OMCY=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-p2AjXFqoptxAwOdsievcjD/WLm0J03Rx/sT4ejUd6xM=";
+          hash = "sha256-FjE3xTp5Mj1584bepVc4nZr3rxCR3CV+jplmA45VF44=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-C1nbQxL5YDWenLQ82tABuEWKWl/LoEizTWo/YnBQJFw=";
+          hash = "sha256-SAf3+0QSFUDq09AZQnw78ps55RM/RwoAeQuVly7vn10=";
         };
       };
     in
     {
       publisher = "kilocode";
       name = "Kilo-Code";
-      version = "7.2.0";
+      version = "7.2.20";
     }
     // sources.${stdenv.hostPlatform.system}
       or (throw "Unsupported system ${stdenv.hostPlatform.system}");
diff --git a/pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix b/pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix
index bdaf18cfbb89..678b3ec01d40 100644
--- a/pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "shfmt";
     publisher = "mkhl";
-    version = "1.5.1";
-    hash = "sha256-rk+ykkWHxgQyyOC8JyhyOinRPJHh9XxNRAVUzcF7TRI=";
+    version = "1.5.2";
+    hash = "sha256-Mff3ZpxnLp/cEB17T0KGZ4GWG8jN4VxrfR/wIEi2ouM=";
   };
 
   postInstall = ''
diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
index a1c5234b2f3d..b74a72a52c9e 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-azuretools";
     name = "vscode-containers";
-    version = "2.4.1";
-    hash = "sha256-OwxJJVW15MivWVeSlbFQNQbrxjDgpXePrPf+r3qb+As=";
+    version = "2.4.2";
+    hash = "sha256-qkQAv53y+PVKJdReffjHwoJbvj20o4DF/c6omLIWB80=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
index da8d763b3521..ebfa123e5996 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
@@ -42,15 +42,15 @@ let
   isDarwin = stdenv.hostPlatform.isDarwin;
   supported = {
     x86_64-linux = {
-      hash = "sha256-4EMCbRdPUNOmvW2c2BgdzvPLr7lWAzAKarUI9nBVBeI=";
+      hash = "sha256-5L4PrwcZ/Q3g6qlCsCebx3czLZVD2sDrDf99l9nooSo=";
       arch = "linux-x64";
     };
     aarch64-linux = {
-      hash = "sha256-bjs2xNhd/dTDlhRjC5TunV8jEV187dEduLGuuX/oUnI=";
+      hash = "sha256-nQNDPfk6BRHp7veyx18GMlEt3Xa8iDuqtHG7qzJcPS4=";
       arch = "linux-arm64";
     };
     aarch64-darwin = {
-      hash = "sha256-EZE9Vk1GRFNUiXCqohjNrNeZ/o5wl6tvamn6+tgoKGI=";
+      hash = "sha256-jhoa9UcYg2Uj8x9AZwAh68k7WCi6mpgNUUx2YsRIkjw=";
       arch = "darwin-arm64";
     };
   };
@@ -63,7 +63,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = base // {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "1.31.4";
+    version = "1.31.5";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix
index 81e0cf62478b..217701a6ac02 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix
@@ -18,19 +18,19 @@ let
   vsix = stdenv.mkDerivation (finalAttrs: {
     name = "vscode-js-debug-${finalAttrs.version}.vsix";
     pname = "vscode-js-debug-vsix";
-    version = "1.112.0";
+    version = "1.117.0";
 
     src = fetchFromGitHub {
       owner = "microsoft";
       repo = "vscode-js-debug";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-pgDrGbx4E6r5lkdY49RyEe04YZYVXbjKAB+pY5w5w7U=";
+      hash = "sha256-1Mj7nfX5iVO0hhydCV/VbqN1x77WFEzG6/ahk1kN1fw=";
     };
 
     npmDeps = fetchNpmDeps {
       name = "${finalAttrs.pname}-npm-deps";
       inherit (finalAttrs) src;
-      hash = "sha256-e+23PCPPQeHKxIT0nFEPumg2TvtNtpzil3XS5njHR9g=";
+      hash = "sha256-uTtA5XjHfuI2e9IuNAYfDNKZE8c/wa+CWqAsmd/M3Xk=";
     };
     makeCacheWritable = true;
 
diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
index e12f715bbc50..39f469d2a72b 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "windows-ai-studio";
     publisher = "ms-windows-ai-studio";
-    version = "0.34.0";
-    hash = "sha256-yOBUkFNE/6Gy675J3/PbrfkvKgJdgQVRcSEnd7rCtlU=";
+    version = "1.0.0";
+    hash = "sha256-bpq4q/ZEk75NBiwP1VUtTCV2xHed38+CiSKNkT/ClWk=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix
index f170c1a44f87..ab922608e4bc 100644
--- a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix
@@ -11,22 +11,22 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-FnMTpDXC/UIMPfcBbpZRo/T0LljFP0+syv2aTZjOczc=";
+          hash = "sha256-vm12qVJ6+KbyHdzB/Q4SrEZDUKVsKJufjbVn9OBGbns=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-bPkRzOpd7nlIg3oLvrfIrcvrxJqnRhNZNzgao8ga+OM=";
+          hash = "sha256-1dunJX+7oL2RqsK2pCScKAe/O0b3ypfgsuHXoDvvChM=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-UnRWxjmicfizn8SUspkhjjiYDJDFGI4ItIPLTnRZEy0=";
+          hash = "sha256-5IG0H3QIY6ll77aZ6/8uFeIpgjupjBx0GfFJaX7Wep4=";
         };
       };
     in
     {
       publisher = "redhat";
       name = "vscode-xml";
-      version = "0.29.0";
+      version = "0.29.2";
     }
     // sources.${stdenvNoCC.hostPlatform.system} or { };
 
diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index bd9772d19e74..582e54e64b17 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.78.0";
-    hash = "sha256-Aah8K+ZOrlpJofeJIlOgL/42QVTmLsc6Ldk2xSK3RUw=";
+    version = "3.81.0";
+    hash = "sha256-gVQmKuyUH+bXpr7X2Z23U2oKFnAV2mxhckjef2uL8KQ=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
index bdbf9b835c12..b54a3ee0ff24 100644
--- a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix
@@ -7,19 +7,19 @@
 let
   supported = {
     x86_64-linux = {
-      hash = "sha256-YoB9gH84F9h6vdRbgCJGQhBmcXQ6jzrxvF2hA7gb3aI=";
+      hash = "sha256-B1ymOFv6CPGhlyA14wis7qn+JlHv09FOt0OYyPtnyEA=";
       arch = "linux-x64";
     };
     x86_64-darwin = {
-      hash = "sha256-IDJJuSLNt0SxV8LdDX0JC3P+VR6NUAfe5u8p9vI+ik8=";
+      hash = "sha256-127gG0MZ+SikOLrDyQgmiPukkCXjR/tWOCmT9lDphBU=";
       arch = "darwin-x64";
     };
     aarch64-linux = {
-      hash = "sha256-gDufj8XYlowpKd2MQMZBsnZ2eT/pbngDlKeIFlkUKzU=";
+      hash = "sha256-UJ515dYrIdP4EyZXSrI3OzM620WUHwlemd1mfoXRw4E=";
       arch = "linux-arm64";
     };
     aarch64-darwin = {
-      hash = "sha256-biWq6nsO4XGOMSUA9/yXMejC1wTDKsuQdPU26w0r4Lg=";
+      hash = "sha256-amlxTRVVIFmcXErvGBh2ZSXoSzJN1Pmr2uWcnRRpcJU=";
       arch = "darwin-arm64";
     };
   };
@@ -34,7 +34,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = base // {
     name = "tombi";
     publisher = "tombi-toml";
-    version = "0.7.7";
+    version = "0.9.24";
   };
   meta = {
     description = "TOML Language Server";
diff --git a/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix b/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix
index 9f003a618142..f72b5bccbe77 100644
--- a/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "explorer";
     publisher = "vitest";
-    version = "1.50.1";
-    hash = "sha256-qMUslEBzYK7nH9k+UBygEt+PjOHwDg/hLvfmbYR++tc=";
+    version = "1.50.2";
+    hash = "sha256-9AmJa3vMXBx2VC20j7bGyIoascQd7SvvFTgfyBi7SLU=";
   };
   meta = {
     changelog = "https://github.com/vitest-dev/vscode/releases";
diff --git a/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix b/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix
index bef7f62efedc..a309d6d7ddc9 100644
--- a/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix
@@ -15,7 +15,7 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
     description = "Copy file paths with line numbers, code snippets, and GitHub permalinks in multiple formats";
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoshi47.selection-path-copier";
     homepage = "https://github.com/yoshi47/selection-path-copier";
-    changelog = "https://github.com/yoshi47/selection-path-copier/releases/tag/release/v${finalAttrs.version}";
+    changelog = "https://github.com/yoshi47/selection-path-copier/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aduh95 ];
   };
diff --git a/pkgs/applications/emulators/libretro/cores/atari800.nix b/pkgs/applications/emulators/libretro/cores/atari800.nix
index 0c25ee669c5d..f70bf7cc8411 100644
--- a/pkgs/applications/emulators/libretro/cores/atari800.nix
+++ b/pkgs/applications/emulators/libretro/cores/atari800.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore rec {
   core = "atari800";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-atari800";
-    rev = "a9b9c433d8cb6c8e8eb08d14d3e95b430549723a";
-    hash = "sha256-vPv6D+y+n9gMgC78cLBVeNLg3nGEAsTeBGFv+SWgH0A=";
+    rev = "7f3456f16109c34915d0bad7393b6c4df66c3850";
+    hash = "sha256-7C/0i7LUGHY8bz5wp9ut+5EtvLrAUasn0xQzslQQ1fM=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-gba.nix b/pkgs/applications/emulators/libretro/cores/beetle-gba.nix
index ba6f74a5a6a0..c623e7702342 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-gba.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-gba.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-gba";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-gba-libretro";
-    rev = "6cee80685f735ea6c2373db2622a1f1ee9f39d39";
-    hash = "sha256-a3XgExXVCUFw3GLCUkEl6now2L8qVdNOaXvrDMcT1ZE=";
+    rev = "145d4884ad246e3c16765f6d69decb2a4359b6ae";
+    hash = "sha256-4LRMPsPrYvdTJGcbbS3ZyimrWKxZSU+bP0SxUMLkYgE=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix b/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix
index b76bb0deadbf..ba8b97d555d2 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-lynx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-lynx";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-lynx-libretro";
-    rev = "40226b7b4fdd2604aa817fb7ded895b665282e25";
-    hash = "sha256-HjqNFfx4e1+DPq05Ii3scNocMn2FLA/LcI1vfT3TUes=";
+    rev = "fcdefcfb3c11d6d2e71be076a5d3df2e88ab73ed";
+    hash = "sha256-yucZWgJiqlfsgd/gQSPxSdZjt+9UfJe1Jq4vMLypDhg=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-ngp.nix b/pkgs/applications/emulators/libretro/cores/beetle-ngp.nix
index 273d19668bfb..b90d833ab114 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-ngp.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-ngp.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-ngp";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-ngp-libretro";
-    rev = "9abe025fa14a4835a9a4e14a09893520dd3019dc";
-    hash = "sha256-s/4koTwwgeEUYknpaNruY1l03ZGYSUy8KVxD/hiGs8Q=";
+    rev = "0c81ce8991a47aac5d0a7d1ae53de75bc7ddf847";
+    hash = "sha256-+HGzNSkM0bs8DoBCZ3FqxoqjBSwnKvK7K38341vUYco=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
index f478d1532d4c..bf9550bb7c38 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pce-fast";
-  version = "0-unstable-2026-04-17";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pce-fast-libretro";
-    rev = "906b6465f1d4da2d04d8735b0d24ca0af0533590";
-    hash = "sha256-xg+irszrpUu689MyP2iJDl9a/YHR4RRqLJmRdu6/4Nw=";
+    rev = "95b5274dfeda36f7e77c70daa666a63302ad83cf";
+    hash = "sha256-BEt2g63jBOrgWk0tYp8DJVC65AbeSVRQz9rIMwjj2Sg=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pcfx.nix b/pkgs/applications/emulators/libretro/cores/beetle-pcfx.nix
index a5b00be615cd..0f5331ab92a7 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pcfx.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pcfx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pcfx";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-22";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pcfx-libretro";
-    rev = "035191393485280cad1866ce3aedd626d4fa09d0";
-    hash = "sha256-jchEbKvHSE4D90ezwi//nl8vefQD4gp6YWb0eb6zkeY=";
+    rev = "650c30ea2203636a1716675854d11c608ed6eacc";
+    hash = "sha256-xB3O7N23bS2IAaWuvxIXfVodua8s1dcbZ2XAB0Lt6gc=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
index 09e805d2af59..f1bafd2160da 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-psx" + lib.optionalString withHw "-hw";
-  version = "0-unstable-2026-04-10";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-psx-libretro";
-    rev = "4fdfd541e5dce6f08883883dd27289545825e0b4";
-    hash = "sha256-DtZIi9BRrskfHFLt/UqfZBJp96QmgqGgroxyF7UTRLU=";
+    rev = "48f2ceb50392a9c142f10312ba4461e60c6b91ff";
+    hash = "sha256-lrrmGAnBNXU871GGDhQfRSVrYv/jebaUKtyMeyWm7GY=";
   };
 
   extraBuildInputs = lib.optionals withHw [
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-supafaust.nix b/pkgs/applications/emulators/libretro/cores/beetle-supafaust.nix
index 47ce3de10492..78a88ec19771 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-supafaust.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-supafaust.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-supafaust";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "supafaust";
-    rev = "584ef2c5571f1ece95f6117aa04b7e8fee213fb1";
-    hash = "sha256-aptn3igUIvU/ho+6iXAg0J7X5ymdWeTM+zL+BA06tG4=";
+    rev = "2b93c0d7dff5b8f6c4e60e049d66849923fa8bba";
+    hash = "sha256-cK+2MR4dJBhTRkPRuRtP2zWGw+mROZMgUOLc8BOxuz8=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
index b87574122c24..619d07ba98b3 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-vb";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-vb-libretro";
-    rev = "734205c5ead87a89cd1d53fe086f8f8fe660cf1d";
-    hash = "sha256-32l0CZmP1n/HGuTheaBIWoNuMWw/wMdiN9z4F5fhawI=";
+    rev = "1275bd7bddf2166be5a10e45c26c5c2a61370658";
+    hash = "sha256-3JTcAITogWP9yQ4sLZl8YlUHzu9LvWor9liQRIwf2b8=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix b/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
index 5c971144454e..4bb8aeb1326b 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-wswan.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-wswan";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-wswan-libretro";
-    rev = "392db084316475411f3f24bd1ea54dba72ecbe51";
-    hash = "sha256-GbjE2PqfZGrP9tp4TgyIzdyyC1PatGiQRSscsmcIbPQ=";
+    rev = "da6d0d9acb8d4e9bd6725ab44225a275325d8352";
+    hash = "sha256-ky/8ywP7scg8VXpqwDISw3A0zKwWbh7zAdaLhM91+Rw=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix
index b00eb6528e8e..049d841d0541 100644
--- a/pkgs/applications/emulators/libretro/cores/bsnes.nix
+++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bsnes";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bsnes-libretro";
-    rev = "399bdedb20f6e847e75e8425ca240560ea0940a6";
-    hash = "sha256-T3pmZ6WJOXyubiTzOIDipMdRDpB+RiNRnd76XbOIl84=";
+    rev = "d62d219ac22f1ed179738d107d8a4da2c4289845";
+    hash = "sha256-XYCzXAFkSFNMlRjzH4zR3lpRguOqvAJM4TBcL9Feog8=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/desmume2015.nix b/pkgs/applications/emulators/libretro/cores/desmume2015.nix
index cb8566a6b511..afcf54a597b5 100644
--- a/pkgs/applications/emulators/libretro/cores/desmume2015.nix
+++ b/pkgs/applications/emulators/libretro/cores/desmume2015.nix
@@ -10,13 +10,13 @@
 }:
 mkLibretroCore {
   core = "desmume2015";
-  version = "0-unstable-2022-04-05";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "desmume2015";
-    rev = "af397ff3d1f208c27f3922cc8f2b8e08884ba893";
-    hash = "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U=";
+    rev = "f43dd42aae0816fcc69b2ebaa9299cbfef2ce2cc";
+    hash = "sha256-jozi1aFgrvlBJ2cc+gXRHi1TguzSTz+GC4C3UNMl1D4=";
   };
 
   extraBuildInputs = [
diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/applications/emulators/libretro/cores/dolphin.nix
index e4fdc6899c51..cd32ce5399ef 100644
--- a/pkgs/applications/emulators/libretro/cores/dolphin.nix
+++ b/pkgs/applications/emulators/libretro/cores/dolphin.nix
@@ -26,13 +26,14 @@
 }:
 mkLibretroCore {
   core = "dolphin";
-  version = "0-unstable-2025-08-05";
+  version = "0-unstable-2026-04-08";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "dolphin";
-    rev = "83438f9b1a2c832319876a1fda130a5e33d4ef87";
-    hash = "sha256-q4y+3uJ1tQ2OvlEvi/JNyIO/RfuWNIEKfVZ6xEWKFCg=";
+    rev = "0cd3bb89c29535db9b7552fc86871867ccf5b471";
+    hash = "sha256-cSiJO/EvspNvHopo/RLfuz8ONpbXk2NrrSDhkiAm7/s=";
+    fetchSubmodules = true;
   };
 
   extraNativeBuildInputs = [
@@ -82,8 +83,6 @@ mkLibretroCore {
     (cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
   ];
 
-  dontUseCmakeBuildDir = true;
-
   meta = {
     description = "Port of Dolphin to libretro";
     homepage = "https://github.com/libretro/dolphin";
diff --git a/pkgs/applications/emulators/libretro/cores/dosbox.nix b/pkgs/applications/emulators/libretro/cores/dosbox.nix
index 3dfc236eb0c5..a8f4d16bff88 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox";
-  version = "0-unstable-2022-07-18";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "dosbox-libretro";
-    rev = "b7b24262c282c0caef2368c87323ff8c381b3102";
-    hash = "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=";
+    rev = "4024bf0048c261db58ef98cb5e16de291c429f4e";
+    hash = "sha256-sHq4xObXvgpaEnqtjJikN8g/io6FQdZWztifzSGPdH4=";
   };
 
   env.CXXFLAGS = "-std=gnu++11";
diff --git a/pkgs/applications/emulators/libretro/cores/eightyone.nix b/pkgs/applications/emulators/libretro/cores/eightyone.nix
index 21b32cc816ac..d249284baa13 100644
--- a/pkgs/applications/emulators/libretro/cores/eightyone.nix
+++ b/pkgs/applications/emulators/libretro/cores/eightyone.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "81";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "81-libretro";
-    rev = "f9e5fa3bef9a6d6e1e19a4b1c7e5922467b582a2";
-    hash = "sha256-c/0L0NLAFyyjQcPNmmfHW29i1As4Wk2/U3qKtClk1VE=";
+    rev = "fa7094910d040baa5fd8b11dbf6a1a618330ecd9";
+    hash = "sha256-TuAx8frehC9h+s77xcigydMxvHXLzIc/q1y4vK8/WuI=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix b/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix
index bb599efa6dc2..4720c7a6e062 100644
--- a/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix
+++ b/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix
@@ -7,13 +7,13 @@
 }:
 mkLibretroCore rec {
   core = "fbalpha2012";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fbalpha2012";
-    rev = "15af60bf24e3dc2267a38e3c8532450ebec86317";
-    hash = "sha256-7QfDk/j7akaORSekdx96mcDgsFp+kAq1/Cxtu3uPe4A=";
+    rev = "95fa35582b1ca7ce68de3313615794c8c9d8d7c0";
+    hash = "sha256-9F970HETDJsttoQOlqg2dFMzff/drR7G8MxXaSlWTHI=";
   };
 
   sourceRoot = "${src.name}/svn-current/trunk";
diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix
index 9c6d23f2df54..8efae4a3c047 100644
--- a/pkgs/applications/emulators/libretro/cores/fbneo.nix
+++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fbneo";
-  version = "0-unstable-2026-04-14";
+  version = "0-unstable-2026-04-30";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fbneo";
-    rev = "e869c6a2033b135e7fcbea4a50695e97755feae1";
-    hash = "sha256-YIva50UWylsDmAaJZI85LCphrgjh7jDYQZkpAlQr1HM=";
+    rev = "806cbc866c973caf442b4b6c6058f867b36bd1fb";
+    hash = "sha256-kHB2Zz6mjhZiYDtoMIuaFvB2C/RIU89e2JNeBzHgIuU=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix
index 6fa3f34743a3..43600cf59fca 100644
--- a/pkgs/applications/emulators/libretro/cores/fceumm.nix
+++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fceumm";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-fceumm";
-    rev = "dbf1f2eb83ebde54a32fbe4f906b5ad89a863c0b";
-    hash = "sha256-UGssF6x/H5met7f2hC6str2urvCZRj/Oqp2R0rv2RUw=";
+    rev = "448a231618186b2af0bb9d6e37aeca05467e112f";
+    hash = "sha256-Kr3DEAk8dsFnUT73pOp5qwkCbcDItQwrRMI8hobrCuI=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
index 30654fbbb865..fef644c69df9 100644
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2026-04-12";
+  version = "0-unstable-2026-04-17";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "321bdaf08b4b007a720f196ea072c1813b1b7efe";
-    hash = "sha256-9Ry5+krdhz2RCmZZh2l6DdcKTgMpcgHwOBG4c7fc/og=";
+    rev = "ae5416a5cb1df362382279172818ac4bb692dc97";
+    hash = "sha256-3eFkirJm3tBLvJrM0rcTX1tFnKnWag8s3eUL17nQc9w=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/emulators/libretro/cores/fmsx.nix b/pkgs/applications/emulators/libretro/cores/fmsx.nix
index cb3bb1e20f95..7c89f58c1eb2 100644
--- a/pkgs/applications/emulators/libretro/cores/fmsx.nix
+++ b/pkgs/applications/emulators/libretro/cores/fmsx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fmsx";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fmsx-libretro";
-    rev = "6b807c588d63677770f7f2ed8b94ca0e9da256ce";
-    hash = "sha256-vA9ODUtmmrDPbZjmRJ9IIFELLTD8g8aHmQdo/B/d1fQ=";
+    rev = "3933db571485b7c6572968f154fa8621c5568357";
+    hash = "sha256-hKN/SEnUJW1F4d6unC5k5J95pq0rNMQzLFIfIQL+0v4=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/freeintv.nix b/pkgs/applications/emulators/libretro/cores/freeintv.nix
index 6a71fc1581a6..99b7816dd38f 100644
--- a/pkgs/applications/emulators/libretro/cores/freeintv.nix
+++ b/pkgs/applications/emulators/libretro/cores/freeintv.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "freeintv";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "freeintv";
-    rev = "9b66d2b3c3406659b2fdfaade7a80f3e62772815";
-    hash = "sha256-rJatbYyrS9vkGT8+jty80rPkcGGCV9enW5L40NeFwlE=";
+    rev = "428915baf2bfc032fc03e645f4f8f9c6c3144979";
+    hash = "sha256-S8sGHS56fQaSuoUllupYdieSLFzsUE3tmM7DUssA+NY=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/fuse.nix b/pkgs/applications/emulators/libretro/cores/fuse.nix
index e98166a4d03e..08302882813c 100644
--- a/pkgs/applications/emulators/libretro/cores/fuse.nix
+++ b/pkgs/applications/emulators/libretro/cores/fuse.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fuse";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fuse-libretro";
-    rev = "b5f44e3a20a0f189e8fb999cd5cde223a0f588a6";
-    hash = "sha256-ZYk9qe+9yJmi+zsKT3IDvyiPCxivwghT68ku6WfaVa8=";
+    rev = "bce196fb774835fe65b3e5b821887a4ccf657167";
+    hash = "sha256-N66LaveZ4P66LRYpP1KwkLKT1dvG/s7JPfDyRraVkc8=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix
index 35131fb168c0..dc7d6265c953 100644
--- a/pkgs/applications/emulators/libretro/cores/gambatte.nix
+++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2026-04-11";
+  version = "0-unstable-2026-04-24";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "ac3d17d07a1119df5eb124494dfa90e47ae2e5ff";
-    hash = "sha256-5240slUbHUYb6Xp65xPvvCopdciyGK+Z8mdk7i0ALIQ=";
+    rev = "5ba6bd1ad745e04b7069d0eb2b44091364fc997a";
+    hash = "sha256-A9OQx0eXVgrGcmpMTtTe97rHCjrV3Ksi/ooLefsysbQ=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index 824bb0b16e3d..5a7bc340b77e 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2026-04-03";
+  version = "0-unstable-2026-04-24";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "b72b8c967adc50311dc3bb700c0818518bee74ef";
-    hash = "sha256-/wfV0+HfxJZigLHi8bkXVa9n/L9CRblt4BeHCMb5bjs=";
+    rev = "eb4216246a2590281ffaf4aa644155c8757025d2";
+    hash = "sha256-2gaPh3Z20eCKLQAcVs49v9R+4WjDQKdJqPWasRRwUa0=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/gpsp.nix b/pkgs/applications/emulators/libretro/cores/gpsp.nix
index c882a781f890..33071a1fa586 100644
--- a/pkgs/applications/emulators/libretro/cores/gpsp.nix
+++ b/pkgs/applications/emulators/libretro/cores/gpsp.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gpsp";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gpsp";
-    rev = "6373ff347a07ac17c50a00f20aa63d29c080abcf";
-    hash = "sha256-1aLSJ0oB8WJnIfKHHdwBQ52uVPs1XiFZvgFgrF9zUoA=";
+    rev = "eca3bee1e2d2043d42f0480012c1e7ec85498f88";
+    hash = "sha256-GvS9HoHzT1Dr3OGLJFwMdB6+lw3vyKMRHzHuLdMxpY8=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/hatari.nix b/pkgs/applications/emulators/libretro/cores/hatari.nix
index 56f9c0969af3..88480119bb42 100644
--- a/pkgs/applications/emulators/libretro/cores/hatari.nix
+++ b/pkgs/applications/emulators/libretro/cores/hatari.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "hatari";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "hatari";
-    rev = "00af13a379e7839399ff2939807f050b7fc49a0e";
-    hash = "sha256-mPe9+RX9DsrJkmydXqEBrR7EMwijhjj/yJPB2QlK3/U=";
+    rev = "6aa7c7079b3186025ebc6bad4b4251aa359a3947";
+    hash = "sha256-17L2EpLGwkWA/9XTgtIq+PNABGvgdBQDsAfAZFRKLOE=";
   };
 
   extraNativeBuildInputs = [ which ];
diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix
index 22ee3ef17097..99538b682af0 100644
--- a/pkgs/applications/emulators/libretro/cores/mame.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame.nix
@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "mame";
-  version = "0-unstable-2026-04-08";
+  version = "0-unstable-2026-04-23";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame";
-    rev = "a891bc3b98c5a9f00848c953c8768007c6d339cb";
-    hash = "sha256-u8vmZY9097h66bsZ71qoq+D+sZDkkgLukEayYVK7UI4=";
+    rev = "da690d2f5393a45e20ef941980e7d940fb9d2f19";
+    hash = "sha256-7OGD/OEAwVwT0Svepf1XtCqtWbLFXyFL8YTFqOOhVPc=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
index e4a5ab217821..20cfc978bfde 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003-plus";
-  version = "0-unstable-2026-04-08";
+  version = "0-unstable-2026-04-14";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-plus-libretro";
-    rev = "7d7fc6d9d6a5855118e6580a7b5554e08796a878";
-    hash = "sha256-J2VU9BqVLpre2nnpweYpzR3j7jYVbfcNvjQn3SFk4oI=";
+    rev = "87a1286dfaae69d3a0997ffbe66150aa4bca8505";
+    hash = "sha256-uWPZg2WoVs66XP6KhOn4bi8RP0Hy7jjcw1pNZ/U9uTU=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/mame2010.nix b/pkgs/applications/emulators/libretro/cores/mame2010.nix
index cd8ecd4c09f4..dad9fd800b6d 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2010.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2010.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "mame2010";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2010-libretro";
-    rev = "29095383c0281100fee2ee09f1438d8ae990c510";
-    hash = "sha256-syp/hoo0xZEs3poQZU1Ow4qLHRCF+31u5GrYw8aKiv4=";
+    rev = "cc63285e2109263da4eca0911ba07aec60b8109b";
+    hash = "sha256-vyOJNOnk74pvsfPq0Kg9ovQ/bS8R2ByA8SVMqixaueQ=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/mame2015.nix b/pkgs/applications/emulators/libretro/cores/mame2015.nix
index b181972e4111..6165afd0b93d 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2015.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2015.nix
@@ -7,13 +7,13 @@
 }:
 mkLibretroCore {
   core = "mame2015";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-22";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2015-libretro";
-    rev = "48fdf6532f31e3bb8b58b9ae10198b047cd8de42";
-    hash = "sha256-z/SjAx615RZUOytoDPFFXl89E5063cbc0OFIV2/HZBo=";
+    rev = "b0cd015f4de7a3979374ab70613db65415e99477";
+    hash = "sha256-EyXnHzSbLD2yAGISX8obpAUM4toVobBxM/b/Fx1F9xY=";
   };
 
   patches = [ ./patches/mame2015-python311.patch ];
diff --git a/pkgs/applications/emulators/libretro/cores/melonds.nix b/pkgs/applications/emulators/libretro/cores/melonds.nix
index 83e335680e0a..b6846e4d1e89 100644
--- a/pkgs/applications/emulators/libretro/cores/melonds.nix
+++ b/pkgs/applications/emulators/libretro/cores/melonds.nix
@@ -7,13 +7,13 @@
 }:
 mkLibretroCore {
   core = "melonds";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "melonds";
-    rev = "e548eba517ccb964ddba31dcf8f0136041f5bb05";
-    hash = "sha256-4bCunBPpBP0RWwL1vUTQxLPtCBnQ0M5pC3GAX1uTL5A=";
+    rev = "634e51477364edc39aaccd3bebf8bcab5776148c";
+    hash = "sha256-/u6CQKpb9eIls0TYpSpWoIf+IQ0CTIx48oq8LscfhFw=";
   };
 
   extraBuildInputs = [
diff --git a/pkgs/applications/emulators/libretro/cores/mesen-s.nix b/pkgs/applications/emulators/libretro/cores/mesen-s.nix
index ea349e193621..b79ae5541466 100644
--- a/pkgs/applications/emulators/libretro/cores/mesen-s.nix
+++ b/pkgs/applications/emulators/libretro/cores/mesen-s.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mesen-s";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mesen-s";
-    rev = "d4fca31a6004041d99b02199688f84c009c55967";
-    hash = "sha256-mGGTLBRJCsNJg57LWSFndIv/LLzEmVRnv6gNbllkV/Y=";
+    rev = "1d475abd174d16ecb1fb030961ff26076ab51ee6";
+    hash = "sha256-JSXkh6OyclYl3X/sJLRZsb5sdbSfanbJAKlhaFFjSrI=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/mesen.nix b/pkgs/applications/emulators/libretro/cores/mesen.nix
index 08f5bb4142eb..4975d6c2a37d 100644
--- a/pkgs/applications/emulators/libretro/cores/mesen.nix
+++ b/pkgs/applications/emulators/libretro/cores/mesen.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mesen";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mesen";
-    rev = "4df4d3681e89321cd4e571ee5cacfdef91842566";
-    hash = "sha256-f067kvu+Pp27iJiVAZczg49Qxz9DVPnGw/Hjwi6+a0Y=";
+    rev = "0102910c39ad1a62bc3f784466f3f67ca9eae335";
+    hash = "sha256-fDGG6U+yhpbcvKuSN30F0dM+NCXlPTPULNEqTZTL/Vc=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/meteor.nix b/pkgs/applications/emulators/libretro/cores/meteor.nix
index 8dfadaf04525..29779b33bfaf 100644
--- a/pkgs/applications/emulators/libretro/cores/meteor.nix
+++ b/pkgs/applications/emulators/libretro/cores/meteor.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "meteor";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "meteor-libretro";
-    rev = "13ac21ccdb81c8a99fddebf5b29482f19194ec88";
-    hash = "sha256-AUn8gTtlFaosKTlcmJCmwdDeEvXwRjkkvht+JXkM36U=";
+    rev = "77658235b09979850bb9f89298cfc6c6504f0e14";
+    hash = "sha256-l/m8HmKnOt/zJ8V+IBqKYc2UZaRBQiaqkpzUPZnKOd0=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
index 9040989338c7..cf54e72898ce 100644
--- a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
@@ -12,13 +12,13 @@
 }:
 mkLibretroCore {
   core = "mupen64plus-next";
-  version = "0-unstable-2026-03-03";
+  version = "0-unstable-2026-04-02";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mupen64plus-libretro-nx";
-    rev = "899eaf6d629b264fedc9afd45a5e01895045a90b";
-    hash = "sha256-FxRuCPMT3K0AeXj2/ZwgW7KQgB/iny1a9ydgGqnyfrQ=";
+    rev = "58b9daf940fb43f09c3984c6a7c730f4b4c24861";
+    hash = "sha256-9d1gbDDK2rOt/a9NNRQVJJmiE+UdohM/yPI5WstNmtA=";
   };
 
   # Fix for GCC 14
@@ -39,8 +39,6 @@ mkLibretroCore {
       url = "https://github.com/libretro/mupen64plus-libretro-nx/commit/3c3e7fbc70b8f533c09c964cf468ba5e8d61351c.patch?full_index=1";
       hash = "sha256-PCJLNYhhccnWLcnPaHL6tz+5qdjogJRYfzZIh3r+Vlk=";
     })
-    # Fix for GCC 15. See https://github.com/libretro/GLideN64/pull/1.
-    ./patches/mupen64plus-gcc-15.patch
   ];
 
   extraNativeBuildInputs = [
diff --git a/pkgs/applications/emulators/libretro/cores/neocd.nix b/pkgs/applications/emulators/libretro/cores/neocd.nix
index fef03cb990f8..9a5bb699732d 100644
--- a/pkgs/applications/emulators/libretro/cores/neocd.nix
+++ b/pkgs/applications/emulators/libretro/cores/neocd.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "neocd";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "neocd_libretro";
-    rev = "9216ca226f24e01e77fc2670035e97da154f3de4";
-    hash = "sha256-Mq9UOuPwmG2Di68jWUgCbBvG3jUCEMON8Kfly/aCdH4=";
+    rev = "9e9ad181bed60f84f9cff02c03617b41e8a31cfe";
+    hash = "sha256-1rmoV6jxClTSRWNzsYepP8VSHKbSB+HUOLkvRrvYz/c=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/o2em.nix b/pkgs/applications/emulators/libretro/cores/o2em.nix
index bce4470721ca..1b5d66d9b473 100644
--- a/pkgs/applications/emulators/libretro/cores/o2em.nix
+++ b/pkgs/applications/emulators/libretro/cores/o2em.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "o2em";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-o2em";
-    rev = "dee1076eb70c728d4ff47186aea9cd1c11ce7638";
-    hash = "sha256-djj7sEkUIoze1sZaZciIw7PdYDb1wETuZd4CFdZTiUM=";
+    rev = "e03d3be88f79fe940b933e53f1515d97313f6c59";
+    hash = "sha256-OSW81RXyXbv4s6hGDdQwE0FEk6xeeA0SM3d47M+mQVw=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix
index 738804e10ae3..aa4655474a4b 100644
--- a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix
+++ b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix
@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "parallel-n64";
-  version = "0-unstable-2025-12-04";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "parallel-n64";
-    rev = "1da824e13e725a7144f3245324f43d59623974f8";
-    hash = "sha256-Th8VqENewfTeRTH+lONN7ZTMLQ0G6901q6ZBNMgepL4=";
+    rev = "51aefbd38751563138b5fee3810ff653a78c4f24";
+    hash = "sha256-E+3dcc+NgwdY23K9YqbH2El+hL1n+ihN4Sby19cYRBE=";
   };
 
   patches = [
diff --git a/pkgs/applications/emulators/libretro/cores/patches/mupen64plus-gcc-15.patch b/pkgs/applications/emulators/libretro/cores/patches/mupen64plus-gcc-15.patch
deleted file mode 100644
index e34aec434506..000000000000
--- a/pkgs/applications/emulators/libretro/cores/patches/mupen64plus-gcc-15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/GLideN64/src/GLideNHQ/TxHiResLoader.h b/GLideN64/src/GLideNHQ/TxHiResLoader.h
-index 4c13651..f887c78 100644
---- a/GLideN64/src/GLideNHQ/TxHiResLoader.h
-+++ b/GLideN64/src/GLideNHQ/TxHiResLoader.h
-@@ -13,6 +13,8 @@
- #define CORRECTFILENAME(str)
- #endif /* OS_WINDOWS */
- 
-+#include <cstdint>
-+
- #include "TxCache.h"
- #include "TxQuantize.h"
- #include "TxImage.h"
diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
index fea158277b70..808ac6e5a3b9 100644
--- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
+++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "pcsx-rearmed";
-  version = "0-unstable-2026-04-15";
+  version = "0-unstable-2026-04-25";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "pcsx_rearmed";
-    rev = "00512d47f9d4d220efa4f2418b4a5896f9cd2e75";
-    hash = "sha256-ERllT1RkoLMafnHx2HSHdURoWdnF8fJlZ80pfiw18gQ=";
+    rev = "a97efbb0646dd7766bd66fe9e93118206edec36a";
+    hash = "sha256-2MAj/UdEg/kRZuGZcVQ+hBMe2pRlZWvEQnXeqb+444Y=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index b5612cca5900..a176ee898542 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2026-04-13";
+  version = "0-unstable-2026-04-23";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "3fc06a0e010a85aa296eabab266697f8012a8d74";
-    hash = "sha256-OKvsJqgn561ncoGnPweuMsrdcrY/r7rSlv+Ow05wxBY=";
+    rev = "158ec0cbdadc8778093016c9acbec9af45a9aab4";
+    hash = "sha256-UXvFsFwymGqk7GfI4qMyxEy71PqHLitV9E+C2iavud4=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index 397e75376f98..8855e73d2d1c 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-28";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "030c7a9e6b1a22bf8ee1db40f4d4b7402095bce1";
-    hash = "sha256-qy9S6/ThIA4YtO6J5R4RdPq4BvHDmwq7Y063gXXTuiQ=";
+    rev = "dbb34075bc5c72c18291547ff63d7b001ebb29ab";
+    hash = "sha256-YOOpjLUevYsQ2yWWuwqjPjaWXx2BAq7ZubbAZBtclbM=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/emulators/libretro/cores/prosystem.nix b/pkgs/applications/emulators/libretro/cores/prosystem.nix
index 7bf1b0f32e22..e3b8cf7453b2 100644
--- a/pkgs/applications/emulators/libretro/cores/prosystem.nix
+++ b/pkgs/applications/emulators/libretro/cores/prosystem.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "prosystem";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "prosystem-libretro";
-    rev = "980edb381b0bf9ea7992caab24039a537aeb510e";
-    hash = "sha256-uuh5YLKHW5aVe01GH12TqAlSp83s/PF/8Mlw105HIJg=";
+    rev = "3f465db9c82fc6764cd90c53fc66eb630e0b3710";
+    hash = "sha256-uamxOzJt5NbMGxDqyGk/8XJbN/fiFoB81DNeULIfL1U=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix
index 2c976ff2601b..a896f0aa58fe 100644
--- a/pkgs/applications/emulators/libretro/cores/puae.nix
+++ b/pkgs/applications/emulators/libretro/cores/puae.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "puae";
-  version = "0-unstable-2026-04-02";
+  version = "0-unstable-2026-05-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-uae";
-    rev = "99145bf34993e21dac14973f784821d85729a91d";
-    hash = "sha256-VIg7e6St1qkQZafTmEMsIDZoWQLkqFZPRk4Cyr43wW8=";
+    rev = "20e019d4405e33472a3c20824c53bcd79f474a1b";
+    hash = "sha256-4yQtwE7Ghm2/43u2Xcht4WctTNkQjAhMTZtXj4EoJTA=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/quicknes.nix b/pkgs/applications/emulators/libretro/cores/quicknes.nix
index 6b493d5fcc55..beb36cb6b7ff 100644
--- a/pkgs/applications/emulators/libretro/cores/quicknes.nix
+++ b/pkgs/applications/emulators/libretro/cores/quicknes.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "quicknes";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "QuickNES_Core";
-    rev = "71782569078f29214017a966b0f992b9e512bf19";
-    hash = "sha256-Bx1iZcrUG5B/wjeWf2hZEAIocM7dKgRwRPqpGzS2Cgc=";
+    rev = "7848e1ac22b1c69d056ae4cb57710651ff1dd169";
+    hash = "sha256-cgoLO1572XoDDBJiEFglWtbo3vk5EXu/U3Pn7zrxqM8=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/sameboy.nix b/pkgs/applications/emulators/libretro/cores/sameboy.nix
index 086e0c434fb1..a92d226dcede 100644
--- a/pkgs/applications/emulators/libretro/cores/sameboy.nix
+++ b/pkgs/applications/emulators/libretro/cores/sameboy.nix
@@ -7,13 +7,13 @@
 }:
 mkLibretroCore {
   core = "sameboy";
-  version = "0-unstable-2024-06-28";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "sameboy";
-    rev = "51433012a871a44555492273fd22f29867d12655";
-    hash = "sha256-vPT2uRGbXmJ62yig/yk485/TxEEKHJeWdNrM2c0IjKw=";
+    rev = "06c184f0b186f161bcdfec50ebd604fe789ed04a";
+    hash = "sha256-sGEISpIGTHsUr4/DxMf5qxyTVdjmvWfqa2hUhj05jBA=";
   };
 
   extraNativeBuildInputs = [
diff --git a/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix b/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix
index aa6e54f10b8d..7a360436d3f2 100644
--- a/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "smsplus";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "smsplus-gx";
-    rev = "41212ee3309fcf84ef0c04317a0916f0e1252c00";
-    hash = "sha256-7IKnFdSYCVrwjvtP4cTxQCCKANYSVVR6IwrhnjzqPPg=";
+    rev = "6dc7119f6f8d7f6437320405ee3b0de5f227913f";
+    hash = "sha256-kWq4yzYl0ZTnnhLfhtgPyf2CRequ6yn2DLp3Yc7EBbA=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2002.nix b/pkgs/applications/emulators/libretro/cores/snes9x2002.nix
index a698c15e200f..56c57527c59b 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x2002.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x2002.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x2002";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "snes9x2002";
-    rev = "15826a2afc1474b30c310502b5dbe25c639be59d";
-    hash = "sha256-LVTtpnmZzmKCohFwc74qLMR6cN4ntT/o/OUQOg6mdU0=";
+    rev = "39e0d8c6daf4b1b1302eeecfee8309570aeb6a82";
+    hash = "sha256-mOtCZEuXKWQEupWfFfr3Ji6m15zZuOIJ/ieKtrFGsWI=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2005.nix b/pkgs/applications/emulators/libretro/cores/snes9x2005.nix
index 64329ad7e94d..a244b5e2f0f7 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x2005.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x2005.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "snes9x2005" + lib.optionalString withBlarggAPU "-plus";
-  version = "0-unstable-2026-03-31";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "snes9x2005";
-    rev = "10519b751ebc800accf4f95cf767e5533d96c97a";
-    hash = "sha256-vMkLEEvuYBCtgWZ2ZxWKLeqFDeLoP1CYa68I8Qg2Dx4=";
+    rev = "b60356971fc9caae02cd0853676dced886a08be7";
+    hash = "sha256-6IuEFyJEoCHluSAXbk5qRTXku1XJCZ6p04BhdjqZqJQ=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index e58ec0b77599..8b89949cc74c 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2026-04-19";
+  version = "0-unstable-2026-04-28";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "8b7bc991d2500cbf2e861c25f96ff81e0d13f273";
-    hash = "sha256-jeu/7hHuPfSoJg2/6UxUqHWOGMSe0vX6cgWLmVYHABQ=";
+    rev = "0c1b944387b5ac2b1bf753c2c4221db4fdc10f79";
+    hash = "sha256-mohkp6oOP8MtRs/WHw4Rxs3FrB6h4X6/ENrRdjiiXlQ=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/tgbdual.nix b/pkgs/applications/emulators/libretro/cores/tgbdual.nix
index 2f54c2ffd9f0..1256fe11673f 100644
--- a/pkgs/applications/emulators/libretro/cores/tgbdual.nix
+++ b/pkgs/applications/emulators/libretro/cores/tgbdual.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "tgbdual";
-  version = "0-unstable-2025-05-10";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "tgbdual-libretro";
-    rev = "933707c0ba8f12360f6d79712f735a917713709a";
-    hash = "sha256-58OLuF14aSJGhmXR0RGgPpuHLXYk9LOz7LX03AEFPr4=";
+    rev = "12540f0b2d3783259a0dce34ac8aa7a86beeaa11";
+    hash = "sha256-l+WiFC5GxbdY9ulmtdqd2iKU7qKoVWqcf4YR/waSVhQ=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix b/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix
index a70c7c15ba8b..bbae8f0394d2 100644
--- a/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix
+++ b/pkgs/applications/emulators/libretro/cores/thepowdertoy.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "thepowdertoy";
-  version = "0-unstable-2025-09-16";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "ThePowderToy";
-    rev = "cb3cd4c2e5beddb98b34e6b800fa24e8f96322d9";
-    hash = "sha256-k3XWkkSuQC3IBhhI96qkTrlGH/oJu941HaAvR28V5i0=";
+    rev = "dcb5e41f1f9800192ea07ea43459413c5a065d9f";
+    hash = "sha256-FDotG/ngmrxgyN7YQ8SK/ZQHKWkwZ5hhg0qsNNXmaNc=";
   };
 
   extraNativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/emulators/libretro/cores/vba-next.nix b/pkgs/applications/emulators/libretro/cores/vba-next.nix
index 55e70b174349..a0de2732025b 100644
--- a/pkgs/applications/emulators/libretro/cores/vba-next.nix
+++ b/pkgs/applications/emulators/libretro/cores/vba-next.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "vba-next";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "vba-next";
-    rev = "d0ec7f3e209a91b903bb9d2c2397fef2bb3cca32";
-    hash = "sha256-g3Eb1bMGjt+H7awUlMCtKVu223+UvyQ2VBh8aQG1yo8=";
+    rev = "82119ba97ee57c738a2eb1dc3a45cd2122ad2232";
+    hash = "sha256-On2O4WBVLmuj5FJZyaYUtgCEl1mEZffqAvGZpKz+Or8=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/vice.nix b/pkgs/applications/emulators/libretro/cores/vice.nix
index fef84e62f32f..4a7f5397979e 100644
--- a/pkgs/applications/emulators/libretro/cores/vice.nix
+++ b/pkgs/applications/emulators/libretro/cores/vice.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "vice-${type}";
-  version = "0-unstable-2026-04-02";
+  version = "0-unstable-2026-04-23";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "vice-libretro";
-    rev = "8cf6a20017b1f331d5d3ac63b49a5fa75440073a";
-    hash = "sha256-KnqSx/wv5YTV4MnjEsgIIMnus3m5Rat4go8GzPNUZHs=";
+    rev = "626ee68726035e0bec8c05b702ed3cb378daf4f5";
+    hash = "sha256-vOZ6EEaJWdMZKIlF7oi3MKkLMjjJfVD1+yxOW+/ZNmU=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/virtualjaguar.nix b/pkgs/applications/emulators/libretro/cores/virtualjaguar.nix
index 0ce4cc4c0ab6..d33c0938c749 100644
--- a/pkgs/applications/emulators/libretro/cores/virtualjaguar.nix
+++ b/pkgs/applications/emulators/libretro/cores/virtualjaguar.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "virtualjaguar";
-  version = "0-unstable-2026-04-03";
+  version = "0-unstable-2026-05-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "virtualjaguar-libretro";
-    rev = "68265f930f6120f8f05c1f71c9fc9e417dab0d28";
-    hash = "sha256-BWpOm0DECqTqbQ1FR9YgjxjsxU7LdB4MlYHzGatcrJk=";
+    rev = "e04f953915731c15f5f9cb9b8ae44630c901f23f";
+    hash = "sha256-jjF3vyVuxViyZP1wbxZduBhURYylGdS3BKxzKnPBm7Q=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/yabause.nix b/pkgs/applications/emulators/libretro/cores/yabause.nix
index 9f12cffb3c67..611196f73712 100644
--- a/pkgs/applications/emulators/libretro/cores/yabause.nix
+++ b/pkgs/applications/emulators/libretro/cores/yabause.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "yabause";
-  version = "0-unstable-2026-04-10";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "yabause";
-    rev = "76faf7c601359bafc41785325d686644000a7ba9";
-    hash = "sha256-UHmUsqAK+As6qfvhto2aOsW9A/lZMypfn2NxFui2x8c=";
+    rev = "7cb15b8f9eea5a6fa7cae34468a6989522bcba75";
+    hash = "sha256-UWZgt0vdjncM7JCzdSWa4XZMJBJ/pnk4QpSKz459Fq0=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index a74f9fa8fee0..8fa5364dc670 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -92,6 +92,14 @@ let
     })
   ];
 
+  patches-add-dll-accept-device-paths-wine-older-than-11_1 = [
+    (pkgs.fetchpatch {
+      name = "add-dll-accept-device-paths";
+      url = "https://gitlab.winehq.org/wine/wine/-/commit/401910ae25a11032f2da7baa1666d71e8bca2496.patch";
+      hash = "sha256-2726u9/vhhx39Tq7vOw24hslmeyZZEbxRRqe7JMFvCU";
+    })
+  ];
+
   inherit (pkgs) writeShellScript;
 in
 rec {
@@ -123,7 +131,8 @@ rec {
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
       ./cert-path.patch
-    ];
+    ]
+    ++ patches-add-dll-accept-device-paths-wine-older-than-11_1;
 
     updateScript = writeShellScript "update-wine-stable" ''
       ${updateScriptPreamble}
diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix
index 7e8ce827e874..c94a12dfb25b 100644
--- a/pkgs/applications/gis/qgis/ltr.nix
+++ b/pkgs/applications/gis/qgis/ltr.nix
@@ -12,11 +12,10 @@
   # unwrapped package parameters
   withGrass ? false,
   withServer ? false,
-  withWebKit ? false,
 }:
 let
   qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix {
-    inherit withGrass withServer withWebKit;
+    inherit withGrass withServer;
   };
 in
 
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 5bfa3cfad0d0..77e6837da3a3 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -11,7 +11,6 @@
 
   withGrass,
   withServer,
-  withWebKit,
 
   darwin,
   libtasn1,
@@ -45,7 +44,6 @@
   qtsensors,
   qtserialport,
   qtsvg,
-  qtwebkit,
   qtxmlpatterns,
   qwt,
   sqlite,
@@ -87,7 +85,7 @@ let
   ];
 in
 mkDerivation rec {
-  version = "3.44.8";
+  version = "3.44.9";
   pname = "qgis-ltr-unwrapped";
   outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";
 
@@ -95,7 +93,7 @@ mkDerivation rec {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-FL/JqvcLqKhHsG96o/7Mel8wH8OaL+2LDtq6jngjW50=";
+    hash = "sha256-aeTWjzYRCKcgdB9sknrcqO5oWEuwU7OuvrvAi8W4bWE=";
   };
 
   passthru = {
@@ -150,7 +148,6 @@ mkDerivation rec {
     zstd
   ]
   ++ lib.optional withGrass grass
-  ++ lib.optional withWebKit qtwebkit
   ++ lib.optional stdenv.hostPlatform.isDarwin libtasn1
   ++ pythonBuildInputs;
 
@@ -180,12 +177,14 @@ mkDerivation rec {
 
     # See https://github.com/libspatialindex/libspatialindex/issues/276
     "-DWITH_INTERNAL_SPATIALINDEX=True"
+
+    # Unmaintained & not in nixpkgs
+    "-DWITH_QTWEBKIT=OFF"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "-DQGIS_MACAPP_BUNDLE=0" # Don't copy Qt into bundle; we fix paths in postFixup
     "-DSQLITE3_INCLUDE_DIR=${sqlite.dev}/include" # FindSqlite3.cmake incorrectly assumes framework
   ]
-  ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
   ++ lib.optional withServer [
     "-DWITH_SERVER=True"
     "-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 46bc75557ef2..26ab57b51e9e 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -370,6 +370,9 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ jtojnar ];
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
+    # Build invokes built binary to convert assets, binary hangs during plugin loading on big-endian platforms (s390x, ppc64)
+    # https://gitlab.gnome.org/GNOME/gimp/-/issues/12522
+    broken = stdenv.hostPlatform.isBigEndian;
     mainProgram = "gimp";
   };
 })
diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
deleted file mode 100644
index 26c974ed4ad5..000000000000
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  fetchFromGitHub,
-  fetchpatch,
-  pkg-config,
-  boost,
-  exiv2,
-  fftwFloat,
-  gsl,
-  ilmbase,
-  lcms2,
-  libraw,
-  libtiff,
-  openexr,
-  libsForQt5,
-  eigen,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "luminance-hdr";
-  version = "2.6.1.1";
-
-  src = fetchFromGitHub {
-    owner = "LuminanceHDR";
-    repo = "LuminanceHDR";
-    rev = "v.${finalAttrs.version}";
-    sha256 = "sha256-PWqtYGx8drfMVp7D7MzN1sIUTQ+Xz5yyeHN87p2r6PY=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "exiv2-0.28.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/2e4a7321c7d20a52da104f4aa4dc76ac7224d94b/exiv2-0.28.patch";
-      hash = "sha256-Hj+lqAd5VuTjmip8Po7YiGOWWDxnu4IMXOiEFBukXpk=";
-    })
-    (fetchpatch {
-      name = "luminance-hdr-Fix-building-with-Boost-1.85.0.patch";
-      url = "https://github.com/LuminanceHDR/LuminanceHDR/commit/33b364f76b0edca4352cf701c1557d0c0e796c4f.patch";
-      hash = "sha256-jzyfKFmmzo6WUOUn33gr1g4MbSVpRfKLUIi49PSF5cg=";
-    })
-    # Fix lots of errors of form:
-    #     include/boost/math/tools/type_traits.hpp:208:12: error: 'is_final' has not been declared in 'std'
-    (fetchpatch {
-      name = "luminancehdr-fix-boost-1.87.0-compilation.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/d5fdbad3c11b6d414d842a7751e858f51292f544/luminancehdr-fix-boost-1.87.0-compilation.patch";
-      hash = "sha256-bKJhENnOWNwKUUSrSUF9fS1Por1A7exYAeiuCa2fRJY=";
-    })
-    # Fix error:
-    #     /build/source/src/Libpfs/manip/gamma_levels.cpp:136:25: error: call of overloaded 'clamp(float, float, float)' is ambiguous
-    (fetchpatch {
-      name = "luminancehdr-clamp.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/d5fdbad3c11b6d414d842a7751e858f51292f544/clamp.patch";
-      hash = "sha256-iAcZV1lFREPzjA9J3feSdhyTougvQA11I0IQRRYOmxY=";
-    })
-  ];
-
-  env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
-
-  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qtdeclarative
-    libsForQt5.qttools
-    libsForQt5.qtwebengine
-    eigen
-    boost
-    exiv2
-    fftwFloat
-    gsl
-    ilmbase
-    lcms2
-    libraw
-    libtiff
-    openexr
-  ];
-
-  nativeBuildInputs = [
-    libsForQt5.wrapQtAppsHook
-    cmake
-    pkg-config
-  ];
-
-  meta = {
-    homepage = "https://qtpfsgui.sourceforge.net/";
-    description = "Complete open source solution for HDR photography";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch b/pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch
deleted file mode 100644
index 31c7a6382292..000000000000
--- a/pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git i/config.cc w/config.cc
-index 04b63f5..7a453d9 100644
---- i/config.cc
-+++ w/config.cc
-@@ -182,7 +182,7 @@ Preferences::Preferences():
-   pronounceOnLoadPopup( false ),
-   useInternalPlayer( InternalPlayerBackend::anyAvailable() ),
-   internalPlayerBackend( InternalPlayerBackend::defaultBackend() ),
--  checkForNewReleases( true ),
-+  checkForNewReleases( false ),
-   disallowContentFromOtherSites( false ),
-   enableWebPlugins( false ),
-   hideGoldenDictHeader( false ),
-@@ -867,8 +867,8 @@ Class load() THROW_SPEC( exError )
-       c.preferences.proxyServer.systemProxyPassword = proxy.namedItem( "systemProxyPassword" ).toElement().text();
-     }
- 
--    if ( !preferences.namedItem( "checkForNewReleases" ).isNull() )
--      c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" );
-+    //if ( !preferences.namedItem( "checkForNewReleases" ).isNull() )
-+    //  c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" );
- 
-     if ( !preferences.namedItem( "disallowContentFromOtherSites" ).isNull() )
-       c.preferences.disallowContentFromOtherSites = ( preferences.namedItem( "disallowContentFromOtherSites" ).toElement().text() == "1" );
-@@ -1819,9 +1819,9 @@ void save( Class const & c ) THROW_SPEC( exError )
-       proxy.appendChild( opt );
-     }
- 
--    opt = dd.createElement( "checkForNewReleases" );
--    opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) );
--    preferences.appendChild( opt );
-+    //opt = dd.createElement( "checkForNewReleases" );
-+    //opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) );
-+    //preferences.appendChild( opt );
- 
-     opt = dd.createElement( "disallowContentFromOtherSites" );
-     opt.appendChild( dd.createTextNode( c.preferences.disallowContentFromOtherSites ? "1" : "0" ) );
-diff --git i/preferences.cc w/preferences.cc
-index 72c3147..7e48f00 100644
---- i/preferences.cc
-+++ w/preferences.cc
-@@ -314,6 +314,7 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
-            this, SLOT( customProxyToggled( bool ) ) );
- 
-   ui.checkForNewReleases->setChecked( p.checkForNewReleases );
-+  ui.checkForNewReleases->setEnabled( false );
-   ui.disallowContentFromOtherSites->setChecked( p.disallowContentFromOtherSites );
-   ui.enableWebPlugins->setChecked( p.enableWebPlugins );
-   ui.hideGoldenDictHeader->setChecked( p.hideGoldenDictHeader );
diff --git a/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch b/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch
deleted file mode 100644
index 7a5ca0f7f3c8..000000000000
--- a/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git i/goldendict.pro w/goldendict.pro
-index 4a4a3094..082b728f 100644
---- i/goldendict.pro
-+++ w/goldendict.pro
-@@ -212,22 +212,19 @@ mac {
-         -llzo2
-     !CONFIG( no_ffmpeg_player ) {
-         LIBS += -lao \
--            -lswresample-gd \
--            -lavutil-gd \
--            -lavformat-gd \
--            -lavcodec-gd
-+            -lswresample \
-+            -lavutil \
-+            -lavformat \
-+            -lavcodec
-     }
--    INCLUDEPATH = $${PWD}/maclibs/include
--    LIBS += -L$${PWD}/maclibs/lib -framework AppKit -framework Carbon
-+    LIBS += -framework AppKit -framework Carbon
-     OBJECTIVE_SOURCES += lionsupport.mm \
-                          machotkeywrapper.mm \
-                          macmouseover.mm \
-                          speechclient_mac.mm
-     ICON = icons/macicon.icns
-     QMAKE_INFO_PLIST = myInfo.plist
--    QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/Frameworks & \
--                      cp -nR $${PWD}/maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
--                      mkdir -p GoldenDict.app/Contents/MacOS/locale & \
-+    QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale & \
-                       cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
-                       mkdir -p GoldenDict.app/Contents/MacOS/help & \
-                       cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
-@@ -235,15 +232,6 @@ mac {
-     CONFIG += zim_support
-     !CONFIG( no_chinese_conversion_support ) {
-         CONFIG += chinese_conversion_support
--        CONFIG( x86 ) {
--            QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
--                                 cp -R $${PWD}/opencc/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
--                                 cp -R $${PWD}/opencc/*.ocd GoldenDict.app/Contents/MacOS/opencc/
--        } else {
--            QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
--                                 cp -R $${PWD}/opencc/x64/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
--                                 cp -R $${PWD}/opencc/x64/*.ocd GoldenDict.app/Contents/MacOS/opencc/
--        }
-     }
- }
- DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
-diff --git i/tiff.cc w/tiff.cc
-index e3cb8bf5..95dd812f 100644
---- i/tiff.cc
-+++ w/tiff.cc
-@@ -5,7 +5,7 @@
- 
- #include "tiff.hh"
- 
--#if defined (Q_OS_MAC) || defined (Q_OS_WIN)
-+#if defined (Q_OS_WIN)
- #include "tiff/tiff.h"
- #include "tiff/tiffio.h"
- #else
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
deleted file mode 100644
index 06cff3872060..000000000000
--- a/pkgs/applications/misc/goldendict/default.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  libxtst,
-  libvorbis,
-  hunspell,
-  lzo,
-  xz,
-  bzip2,
-  libiconv,
-  qtbase,
-  qtsvg,
-  qtwebkit,
-  qtx11extras,
-  qttools,
-  qmake,
-  wrapQtAppsHook,
-  wrapGAppsHook3,
-  withCC ? true,
-  opencc,
-  withEpwing ? true,
-  libeb,
-  withExtraTiff ? true,
-  libtiff,
-  withFFmpeg ? true,
-  libao,
-  ffmpeg,
-  withMultimedia ? true,
-  withZim ? true,
-  zstd,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "goldendict";
-  version = "1.5.0";
-
-  src = fetchFromGitHub {
-    owner = "goldendict";
-    repo = "goldendict";
-    rev = version;
-    hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M=";
-  };
-
-  patches = [
-    ./0001-dont-check-for-updates.patch
-    ./0001-dont-use-maclibs.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace goldendict.pro \
-      --replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}" \
-      --replace "opencc.2" "opencc"
-  '';
-
-  nativeBuildInputs = [
-    pkg-config
-    qmake
-    wrapQtAppsHook
-    wrapGAppsHook3
-  ];
-  buildInputs = [
-    qtbase
-    qtsvg
-    qtwebkit
-    qttools
-    libvorbis
-    hunspell
-    xz
-    lzo
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtx11extras
-    libxtst
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    bzip2
-    libiconv
-  ]
-  ++ lib.optional withCC opencc
-  ++ lib.optional withEpwing libeb
-  ++ lib.optional withExtraTiff libtiff
-  ++ lib.optionals withFFmpeg [
-    libao
-    ffmpeg
-  ]
-  ++ lib.optional withZim zstd;
-
-  qmakeFlags = [
-    "goldendict.pro"
-    (lib.optional withCC "CONFIG+=chinese_conversion_support")
-    (lib.optional (!withCC) "CONFIG+=no_chinese_conversion_support")
-    (lib.optional (!withEpwing) "CONFIG+=no_epwing_support")
-    (lib.optional (!withExtraTiff) "CONFIG+=no_extra_tiff_handler")
-    (lib.optional (!withFFmpeg) "CONFIG+=no_ffmpeg_player")
-    (lib.optional (!withMultimedia) "CONFIG+=no_qtmultimedia_player")
-    (lib.optional withZim "CONFIG+=zim_support")
-  ];
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/Applications
-    mv GoldenDict.app $out/Applications
-  '';
-
-  meta = {
-    homepage = "http://goldendict.org/";
-    description = "Feature-rich dictionary lookup program";
-    platforms = with lib.platforms; linux ++ darwin;
-    mainProgram = "goldendict";
-    maintainers = with lib.maintainers; [
-      sikmir
-    ];
-    license = lib.licenses.gpl3Plus;
-  };
-}
diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix
deleted file mode 100644
index 7da021150311..000000000000
--- a/pkgs/applications/misc/nixnote2/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  boost,
-  qtbase,
-  qtwebkit,
-  poppler,
-  hunspell,
-  html-tidy,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "nixnote2";
-  version = "2.0.2";
-
-  src = fetchFromGitHub {
-    owner = "baumgarr";
-    repo = "nixnote2";
-    rev = "v${version}";
-    sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
-  };
-
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    boost
-    qtbase
-    qtwebkit
-    poppler
-    hunspell
-  ];
-
-  postPatch = ''
-    # Fix location of poppler-qt5.h
-    for f in threads/indexrunner.cpp html/noteformatter.cpp utilities/noteindexer.cpp gui/plugins/popplerviewer.h gui/plugins/pluginfactory.h gui/plugins/popplerviewer.cpp ; do
-      substituteInPlace $f \
-        --replace '#include <poppler-qt5.h>' '#include <poppler/qt5/poppler-qt5.h>'
-    done
-
-    substituteInPlace help/about.html --replace '__VERSION__' '${version}'
-
-    substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy'
-  '';
-
-  postInstall = ''
-    cp images/windowIcon.png $out/share/pixmaps/nixnote2.png
-    cp theme.ini $out/share/nixnote2/theme.ini
-  '';
-
-  meta = {
-    description = "Unofficial client of Evernote";
-    homepage = "http://www.nixnote.org/";
-    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ htr ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
deleted file mode 100644
index fc0ff2a6b9f9..000000000000
--- a/pkgs/applications/misc/plover/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  config,
-  fetchFromGitHub,
-  python3Packages,
-  wmctrl,
-  qtbase,
-  mkDerivationWith,
-}:
-
-{
-  dev =
-    with python3Packages;
-    mkDerivationWith buildPythonPackage rec {
-      pname = "plover";
-      version = "4.0.2";
-      format = "setuptools";
-
-      meta = {
-        broken = stdenv.hostPlatform.isDarwin;
-        description = "OpenSteno Plover stenography software";
-        maintainers = with lib.maintainers; [
-          twey
-          kovirobi
-        ];
-        license = lib.licenses.gpl2;
-      };
-
-      src = fetchFromGitHub {
-        owner = "openstenoproject";
-        repo = "plover";
-        tag = "v${version}";
-        sha256 = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
-      };
-
-      # I'm not sure why we don't find PyQt5 here but there's a similar
-      # sed on many of the platforms Plover builds for
-      postPatch = "sed -i /PyQt5/d setup.cfg";
-
-      nativeCheckInputs = [
-        pytest
-        mock
-      ];
-      propagatedBuildInputs = [
-        babel
-        pyqt5
-        xlib
-        pyserial
-        appdirs
-        wcwidth
-        setuptools
-      ];
-
-      dontWrapQtApps = true;
-
-      preFixup = ''
-        makeWrapperArgs+=("''${qtWrapperArgs[@]}")
-      '';
-    };
-}
-// lib.optionalAttrs config.allowAliases {
-  stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05
-}
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 7ffddba320fc..c47cf4fbdab4 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,15 +1,15 @@
 {
   "chromium": {
-    "version": "147.0.7727.101",
+    "version": "147.0.7727.137",
     "chromedriver": {
-      "version": "147.0.7727.102",
-      "hash_darwin": "sha256-OI5e9h2sxF5BtStqxCFQaOZWgZusw/BzjuqSUKPIL2Y=",
-      "hash_darwin_aarch64": "sha256-uE7rgMAZrk4kyafAGqIZa2z/CgLcnqhptkcSXUvBQZc="
+      "version": "147.0.7727.138",
+      "hash_darwin": "sha256-d2dEPcR2mlfkL6XGhzMsgH/OwAI+yLXdS0dF4luPRfM=",
+      "hash_darwin_aarch64": "sha256-6rguKqpJJd058DQbiLVKVd/t+E7yYe1FHHB6zlwD6bU="
     },
     "deps": {
       "depot_tools": {
-        "rev": "b9d2b54daea64fa757df5ba737e611b691dc6201",
-        "hash": "sha256-GKm6qIrlXLTBvlY+BcXFEL4hR5T63sXUkP0i1vATCAc="
+        "rev": "d0e1a84d5b0c3c556b0fbdbeb77908d9817e6bbb",
+        "hash": "sha256-mc/W0D9MEtNQPeJ66X9T28IB+pvYqDRXj9UYb9hLlvA="
       },
       "gn": {
         "version": "0-unstable-2026-03-05",
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "56536d2a8034c51b0e68e1a0483ab9f1a0165ae3",
-        "hash": "sha256-94TMvPkcWm+IEVYwTh+m1ys5du75bvJcc1RpkSKpAwc=",
+        "rev": "68ba233a543d25e75c30f1228dd3bafa2da96937",
+        "hash": "sha256-ktIkQRYWcyKnZKEhvxFGssMZ///ctd/Ue3VIYPvQzuM=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -92,8 +92,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "cbc4f074126e6f1acf72ad620a28cd4a8dd86f2a",
-        "hash": "sha256-MUgLUj2L0vmpAoxt/TJy1clsJfvYkQqe3Xm2+e4Y6tw="
+        "rev": "534e0d1c1d0fcb4b57fd6a3fb9284cd14eaa28cd",
+        "hash": "sha256-o3UV8X27G7wpaDiKDzgMZN64+d9JQrvcQXpSybxi/h4="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -132,8 +132,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "2c681aed02b0add6bcf6724175660c4b35ece843",
-        "hash": "sha256-io3X9zu6tHgqJGXjygUXMa98rXELRNl6Y330U2nRc/M="
+        "rev": "049880d58d6636a819168c00f44f8a4ed1e33e51",
+        "hash": "sha256-AHUos4ejvcsHTDdretkDHAeyLugtI6Jg14Hb9MbbPPs="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -262,8 +262,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "82a48c1595e5aefc899ed4528dbd7da0ac9e40e2",
-        "hash": "sha256-nlpFDS04LenRcQqnCkSdX/cUoC/gJcHaGUq+zrrkLSY="
+        "rev": "854a02be78c7ffea104cb523636efa991bef5c5b",
+        "hash": "sha256-CzzUueh2QXX+ExGqh5+JpnDoWF8DiFDff7fWmC01xfg="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -657,8 +657,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "f8cd2da0256752afb0059bf17e4bf2bec422967e",
-        "hash": "sha256-dtSWBpCaewkKMW3Jc1PNDQh0jSQHIPduaXsIU9rcTa0="
+        "rev": "6e0fbe154ccaf018b2dd1f0e42eec285e7d79d00",
+        "hash": "sha256-oqfNOSQB+5sbAnw4tPBXn22rk6Ai5b2aZNLJUyM181k="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -792,8 +792,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "9179833d210d105aede5d4ec516734a6bd1ef2e8",
-        "hash": "sha256-DuHZimj7Zbx0QGH2ZrdGiSJg2PTwZUipyY06ZWr2fxg="
+        "rev": "28452dff1bf86fec881a47949d4dedd4a2fe1f09",
+        "hash": "sha256-KBz94jvdVgxWuTuSoeHKNdY7wEJDGqG3xVsSVB3ubRQ="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -822,17 +822,17 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "c207e34c08865143dc6774c1c624f3cea07f7420",
-        "hash": "sha256-5rc28tPK9mOJDO3HA3F1ZgsRQmWXhoLZGeKTzxWSISw="
+        "rev": "c152c31c55cd54fd239772532a86c802d95b4617",
+        "hash": "sha256-7qEPh9l94LqyaA9qW0ZfFmmFyMNTjTJaeunLgDhtFuM="
       }
     }
   },
   "ungoogled-chromium": {
-    "version": "147.0.7727.101",
+    "version": "147.0.7727.137",
     "deps": {
       "depot_tools": {
-        "rev": "442cbd6d584d2c992ca9bcc19ecbd2235bea772e",
-        "hash": "sha256-CgEu3y/MNRcCN2EmtcVgmGW/bEPKypeyLaANtiplDJU="
+        "rev": "f2f7ec41f2c170d6f1899406f11a48411760a683",
+        "hash": "sha256-/4Zz169PVxRGFubknL+5hbUX9uRnOGArjt0dA8u0I88="
       },
       "gn": {
         "version": "0-unstable-2026-03-05",
@@ -840,16 +840,16 @@
         "hash": "sha256-3AfExm7NL5GJXyC5JCPbGC70D59doRfIZIgpt6MLy9Y="
       },
       "ungoogled-patches": {
-        "rev": "147.0.7727.101-1",
-        "hash": "sha256-w/9bzbYHZM3Ot26ZcYWB51z7T+I4OBOxflo1dWxghyQ="
+        "rev": "147.0.7727.137-1",
+        "hash": "sha256-MtsTk7aV7qpeXYBTxfEauCJlcoWYxdsQFbtN9ockSME="
       },
       "npmHash": "sha256-ByB1Ea5tduIJZXyydeBWsoS8OPABOgwHe+dNXRssdvc="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "56536d2a8034c51b0e68e1a0483ab9f1a0165ae3",
-        "hash": "sha256-94TMvPkcWm+IEVYwTh+m1ys5du75bvJcc1RpkSKpAwc=",
+        "rev": "68ba233a543d25e75c30f1228dd3bafa2da96937",
+        "hash": "sha256-ktIkQRYWcyKnZKEhvxFGssMZ///ctd/Ue3VIYPvQzuM=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -919,8 +919,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "cbc4f074126e6f1acf72ad620a28cd4a8dd86f2a",
-        "hash": "sha256-MUgLUj2L0vmpAoxt/TJy1clsJfvYkQqe3Xm2+e4Y6tw="
+        "rev": "534e0d1c1d0fcb4b57fd6a3fb9284cd14eaa28cd",
+        "hash": "sha256-o3UV8X27G7wpaDiKDzgMZN64+d9JQrvcQXpSybxi/h4="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -959,8 +959,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "2c681aed02b0add6bcf6724175660c4b35ece843",
-        "hash": "sha256-io3X9zu6tHgqJGXjygUXMa98rXELRNl6Y330U2nRc/M="
+        "rev": "049880d58d6636a819168c00f44f8a4ed1e33e51",
+        "hash": "sha256-AHUos4ejvcsHTDdretkDHAeyLugtI6Jg14Hb9MbbPPs="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1089,8 +1089,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "82a48c1595e5aefc899ed4528dbd7da0ac9e40e2",
-        "hash": "sha256-nlpFDS04LenRcQqnCkSdX/cUoC/gJcHaGUq+zrrkLSY="
+        "rev": "854a02be78c7ffea104cb523636efa991bef5c5b",
+        "hash": "sha256-CzzUueh2QXX+ExGqh5+JpnDoWF8DiFDff7fWmC01xfg="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1484,8 +1484,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "f8cd2da0256752afb0059bf17e4bf2bec422967e",
-        "hash": "sha256-dtSWBpCaewkKMW3Jc1PNDQh0jSQHIPduaXsIU9rcTa0="
+        "rev": "6e0fbe154ccaf018b2dd1f0e42eec285e7d79d00",
+        "hash": "sha256-oqfNOSQB+5sbAnw4tPBXn22rk6Ai5b2aZNLJUyM181k="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1619,8 +1619,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "9179833d210d105aede5d4ec516734a6bd1ef2e8",
-        "hash": "sha256-DuHZimj7Zbx0QGH2ZrdGiSJg2PTwZUipyY06ZWr2fxg="
+        "rev": "28452dff1bf86fec881a47949d4dedd4a2fe1f09",
+        "hash": "sha256-KBz94jvdVgxWuTuSoeHKNdY7wEJDGqG3xVsSVB3ubRQ="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1649,8 +1649,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "c207e34c08865143dc6774c1c624f3cea07f7420",
-        "hash": "sha256-5rc28tPK9mOJDO3HA3F1ZgsRQmWXhoLZGeKTzxWSISw="
+        "rev": "c152c31c55cd54fd239772532a86c802d95b4617",
+        "hash": "sha256-7qEPh9l94LqyaA9qW0ZfFmmFyMNTjTJaeunLgDhtFuM="
       }
     }
   }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 61fd96b85d4f..6a921c8c2936 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,1859 +1,2057 @@
 {
-  version = "150.0";
+  version = "150.0.1";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ach/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ach/firefox-150.0.1.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "6fda3549eeb58d2c0abee981f03cec5abdf0a99031d82be368ab11268791cf28";
+      sha256 = "8df967bb0baa0dcc1e16e6b9d36654068fa263839af105e04103bddd9a3b3cb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/af/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/af/firefox-150.0.1.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "2f564c698f6d287b2574d00380886119ba3ec088f622ebccc08e83799ecdbcaa";
+      sha256 = "e0bd056bc365ea58b008cacafbaddb4af0eea7f025aeb5a980144513f5be3dbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/an/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/an/firefox-150.0.1.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "d91484977a311430e8d883b2de04338d07b166ba1244b215e5a7e3c4381a9e08";
+      sha256 = "d29cfd51a2881834bdb4878d774cd29134f1b3d86f781853b57a1368337c16a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ar/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ar/firefox-150.0.1.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "069c5001055811f1c6e26c80d1b6b94b0d1944d29774ce294863a075bc30610f";
+      sha256 = "9953650bfb2a9da5cae6950c5649ce4ee1a1891da53a3ce94c0739039c61e620";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ast/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ast/firefox-150.0.1.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "46c58edf509744ae7b2b66fa8b9ccc35b596bb46b19fe36d72c0cfd5df147ecd";
+      sha256 = "557ddda3f673963872057b7b87438150dcab1ec707ab4a98620e5d9dd4ed4bb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/az/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/az/firefox-150.0.1.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "aee9472480d653b17ca70a27bd02d5809c686eea855c083707f4f97e20fa9e04";
+      sha256 = "b054f3f119b2cdcc2acd69d2b1595ffc51385aefa8066a887de9567e3431b7cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/be/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/be/firefox-150.0.1.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "f337bbece77ab7a80a2379d7d937f4b07c33143f33c067586b6b8b9a7a036bcd";
+      sha256 = "dc2681e0b390ee722ac3d9b8af4afc31d8ada28b5e65af2486cb08a3c85f3eee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/bg/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/bg/firefox-150.0.1.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "bc93a3c89dd4ddaeca71ab29f60fb0f03d4c575829fb6f008d5d3f768c822483";
+      sha256 = "398974bcd5c80e513db99e8d282a1c0acaff3596123f0af161de6082a989e492";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/bn/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/bn/firefox-150.0.1.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "5498489c48848ae28416d859951faed4ab176a2f7c1578f28b3d2d59631e6c53";
+      sha256 = "8ed8814129d7e2a2e15a90d6e9eb089e2b57061ad3f8085c0b2c86b21c9809ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/br/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/bo/firefox-150.0.1.tar.xz";
+      locale = "bo";
+      arch = "linux-x86_64";
+      sha256 = "4dd922931156b14ddada8dad36c14c3d046d388d2314e9720f6671a4a6ff4adf";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/bqi/firefox-150.0.1.tar.xz";
+      locale = "bqi";
+      arch = "linux-x86_64";
+      sha256 = "f5a959afa143a3c5576944758c1c6595498345a76cc12f0d649f68025d35f870";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/br/firefox-150.0.1.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "e37a97e0235c36028bd43e4358bc50a8c64819ea9d28b889dd550afab6f06396";
+      sha256 = "a10ebb49d0f1a551a8c956d3232c351769533eed0c433ac00b075ff3ed932600";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/bs/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/brx/firefox-150.0.1.tar.xz";
+      locale = "brx";
+      arch = "linux-x86_64";
+      sha256 = "2a557041f621c371be99762f31816fbc87fa6a9413f2ba148d8076c064038034";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/bs/firefox-150.0.1.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "6e8b7aa778e3423c10c26de2eacddc5fd1adb50f97c90ba5fda3379a1ed74f92";
+      sha256 = "986f07ce957f704a1c5711755bf052aa694df87998eb265ac8ce68bb59acd9f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ca-valencia/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ca-valencia/firefox-150.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "26fb6c5c4018bb318e65ce8545dd1470a76f5865d42b341c7009ec7961f1170a";
+      sha256 = "f0db798b7e2b2d5459fdba9ab143e72c151577e8416108c8df1f168fd72b37e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ca/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ca/firefox-150.0.1.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "fa1688801bd1fd16771bd31d457c70b02b15d493f709e37dc947e26f642d7f75";
+      sha256 = "128abfe1d356d6ef07202ca992c415f0b8a3b2cf319c68245272209b2752d6ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/cak/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/cak/firefox-150.0.1.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "5334bc92c4912b4500311c8ddcb149abed21ab74a8bb7a91213a3690c43a130a";
+      sha256 = "e068e8371fd28a6feaa7829cc27d853c256a6cf64c03f37521e0ac51f6ef4862";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/cs/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ckb/firefox-150.0.1.tar.xz";
+      locale = "ckb";
+      arch = "linux-x86_64";
+      sha256 = "1bf8bcf2e8dafd46719d0b52539661ce9309bee9d1b014d221b3029e8a4041f4";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/cs/firefox-150.0.1.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "0deaf31785fec9f5212a81ca7908525283205783b3670c41fc669e1288006eb4";
+      sha256 = "15201a284b7c4b3c7fef023ec6041c7fb0749e93e72bad0ab33cb2cb7ffa98e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/cy/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/cy/firefox-150.0.1.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "b19fd410e899ce9e2ed41667e0ea7500d9c6a3eb20579a45563bd7bc7afad21a";
+      sha256 = "b4b101b4df576e53abd7ddc44f6d845d485148864b09ef58c15c72f69d1bf9af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/da/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/da/firefox-150.0.1.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "bc609f518235a115c6b64c67e3cbc805098cc2a4c4b19352e951c8e60316e733";
+      sha256 = "75d1a8fe304e8e4fe2209571de9917806e56d5ef2dcf4beb0e70034464141453";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/de/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/de/firefox-150.0.1.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "5991544d554bdad4e1d485fba3e3d1bd86909bacf42afe2c794bb7cedf5192de";
+      sha256 = "ec9a6c64811db82b51b003d6f9c61719be185a2ab102be753d54886902bb0b97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/dsb/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/dsb/firefox-150.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "0925ac61578aff7ada7c5d4ce94e4bee685a4487b3930e55817325f1b21c38a1";
+      sha256 = "702f2b853c8dd9d6b851792740796903a5b471b2be7d6dce514825a3330c7054";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/el/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/el/firefox-150.0.1.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "ce06c587a2b86fa73e7e8cd93427a74498fbec28ee2603bfbf048c9962931cd0";
+      sha256 = "24291afc0c758a2823406ef48b66f7ce82f051bf1cb77bec54f605a5f7f18d12";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/en-CA/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/en-CA/firefox-150.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "7187c727aacc8b462c340bc3d68d4e2c78c53a0db6e92efdf1d3a3eb770bcdd9";
+      sha256 = "563445823374ac3a4b2d7a35902e7c8bca507590fb49bf51fc7289cb58466af0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/en-GB/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/en-GB/firefox-150.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "04802f87d51633e593682c3a67ffe5ad2278d8aefba0a7a963b1aadaf78bb2f8";
+      sha256 = "927bf825b1f72d36e28fdc9ebc04ebd79cc86265f2c4739891ba69a2f80babcf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/en-US/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/en-US/firefox-150.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "2ff987e94bfa6ed51f53d6b4baa7f0f8ec3fc26c4c47bd9f86c70d11aa0fbd60";
+      sha256 = "83871560c3d3514d3b5bdd196cd258dde23d53f5d3d89d266765bd7e8306b895";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/eo/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/eo/firefox-150.0.1.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "1983fb4d167646ec7a9c9320de1b37e4f0042fd24c890848b84a304df13e0e68";
+      sha256 = "e5b4e12d05e99bde29fc96566efc4d039d1fca07d4b257f1c0ba36b9a64d88d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/es-AR/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/es-AR/firefox-150.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "bc2e4b24152c6a2f9b2a29e9a4c7dae698f803ba2cc841a39e318a4e04f95575";
+      sha256 = "7b1914eee5c0155f95a93bfb53e641240889ffe707423abcbb130c34c6a6c6a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/es-CL/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/es-CL/firefox-150.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "0f11ee090d0927239847c22de8e4e8fde5426cb0f48ab5c40bb4819a6d0dfa9b";
+      sha256 = "29c6efef9868b0383338af0afba7ee623e1f06155a8e47a86dc6229418b399e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/es-ES/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/es-ES/firefox-150.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "cd604a866aa7f8e6086d70690671281f975d20206edbfde19f1c153d82d52081";
+      sha256 = "ce1fa5fcef78563a4d2921f600f91b378b0c81ed22b167eef0b503a274752a20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/es-MX/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/es-MX/firefox-150.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "00250676a87308cf1cb0260fd300c3d3abaebbaa01bb58952bced085496bb94b";
+      sha256 = "f31252190c4fccaea01b328a1a4a73837ae7060180ac5d610ea0cb53c028533d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/et/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/et/firefox-150.0.1.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "e6effc06ee1998a7842e3459ef87d0eb41813239df1a638b19e25cee690f4545";
+      sha256 = "b7862bdecc8492c76d110971d28da8de194cd38b0351a286fb71506f88474032";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/eu/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/eu/firefox-150.0.1.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "b55c891191869c9b38cc8abdacc73fa46f6f400571247fda0e11351d4eecb8e6";
+      sha256 = "d9686a806b870adf51f512589b23649e66a94e59a66689b0fed69dfef62844c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/fa/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/fa/firefox-150.0.1.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "8565e9302d61fe53db0aa93b54c77c2e5fa01668a0749f2180d4a2877bd436da";
+      sha256 = "bc48fd47694ab1040d7880c9dedb3461f3f87c95493a0571cf4b314c8297d1c1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ff/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ff/firefox-150.0.1.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "9cdf2a235b2900f5773abeff59d929a787576fc76e8b0f8bfbf199d8d3493c86";
+      sha256 = "a93365446a506e1453c6815d8ad8913208c11390df7d60d8fdb38636e73c9044";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/fi/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/fi/firefox-150.0.1.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "ff8901eb6714133cbbcf8cc0cac83b253686d82e9dbff693538d10a577dbbe17";
+      sha256 = "84379104f44ace79de75ae0b65b09d63a7bc519b57a00135925d38f177ddd290";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/fr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/fr/firefox-150.0.1.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "e5993ec9c373df0e3e738f00e3914fdf727b00e3b15a0ed4892e5d1416f30eff";
+      sha256 = "8ace62c3c41df014135d2f598a7e9cbfc8efa0836d0489fc4f12ed8bc5e5b820";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/fur/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/fur/firefox-150.0.1.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "25dec1f12105b87d9ec64847b97b3d66610ca10bfdefa1b0d6c9e94ccd5f1e06";
+      sha256 = "f9704f4587d080b3938b03468cfda8d9f8028f57d4ddfaff9f222622fac841c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/fy-NL/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/fy-NL/firefox-150.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "13bd01d13edc2a63d334d184adff5b5f58014e50e97c5dfc747f7c22865f67a4";
+      sha256 = "aa04c83b25a9d09f6bb7d10b95fa03b6ca9219e2c1697e3085882edb9c2b0015";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ga-IE/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ga-IE/firefox-150.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "fc08eb3c9f3e0554a8b449502a91b53562b9a1b90e9bbbe3f5ec7a69835a075c";
+      sha256 = "a63ad6d692a605f7382bbd8a39d8496b9dab813573f33697d26b8c696e453b7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/gd/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/gd/firefox-150.0.1.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "f93f7c51e96248b8f4bc342f887e698c2a8300c635dc188e243a92344bf9a40c";
+      sha256 = "7a97768ea9326f844b00f63e716ebd87b8fa4304cb949f3be6c2d0ff3b44d829";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/gl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/gl/firefox-150.0.1.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "94df516061208f827856132baab2f21a3e3099066ca324358586c5de2b8d64d2";
+      sha256 = "9421edf800c0b68c057a0bffef4071d1e76affb06d06c97f04c0429ef6825bea";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/gn/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/gn/firefox-150.0.1.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "fcdd1c0a2ea34e49c82e71b15ff6246fcc94c0a822ec857d20d84ed1194a2426";
+      sha256 = "12a62535360280796c6eb4f22c6745c16a0d45a8e473728da5d0763898bb97d4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/gu-IN/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/gu-IN/firefox-150.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "9aa1360317b7a730c5bfbaca9fd4271170299ae7d86d01352a0fe90fd6af7567";
+      sha256 = "b9b93f9ba1c1ac8e83a605ee5cb26482362024cfea5a198efd265add2470692d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/he/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/he/firefox-150.0.1.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "96b935a94a0e57cef008b0fc72de9fa46328ad47aa12eb1f348a51b684588c4f";
+      sha256 = "92f907d375d8d43b4226047b3326c00884a03bcc012b7f385c1fbea8417fb275";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/hi-IN/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hi-IN/firefox-150.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "ab8d3295c74c407cb923035f070b3dd8a8f102e7968b0786010b31c105f0ff61";
+      sha256 = "82ad07e69ab74b7256d6a623033c8e8a8c5c8c4015c59b605a876fd1fbdb8260";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/hr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hr/firefox-150.0.1.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "c07894fc729efd289a16c75bd9791bf9b45da02582aa6b16b1575f215c87baa3";
+      sha256 = "c8655f3a8b8829419a82bc63f9eade478fce4f0643b6a7e65c76e0fd63de209f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/hsb/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hsb/firefox-150.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "7639cb516533ce99038691116edc6ef571192e74f1458850de438c1cd6591239";
+      sha256 = "57d39bd2c7969b1b7de9864d8ced6f14bdbfa231fc18a7c3a5be6a54cd1e392a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/hu/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hu/firefox-150.0.1.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "9b8a83bef86262ecaa8f0c52cd8f6ea24c37307aa4e757b4e467039cbb91ec6b";
+      sha256 = "9a3ceffe953e4e935e68295a67d933073d368d07addc54b40f745709ddfdadb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/hy-AM/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hy-AM/firefox-150.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "034f14b74c65117fe19191da9a48862cfb4b43dc3d96bccba7c52c413af72b82";
+      sha256 = "a66233ddeb1ad03a1f5a14134480cbcaa64e3f58e3f30ab9fcc40bb2fb681868";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ia/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/hye/firefox-150.0.1.tar.xz";
+      locale = "hye";
+      arch = "linux-x86_64";
+      sha256 = "be4bb38c9b57ab42e055a1d2c167307c656473c4296d6f2c435e1bf81a1393a3";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ia/firefox-150.0.1.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "0c99d8783d83621cd75d74ec91b1917aaa7649030c94848af74eeca85fba4f95";
+      sha256 = "57f5feab33ae6be40c363b805785aa9e6c1b9aa8082ba600e34bad04cefb7162";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/id/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/id/firefox-150.0.1.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "7836898dd1569518d1e11f872e90b161072f786b0df1ef0a6e561066e48e4fba";
+      sha256 = "b1e7bdd4631f50e5b1910a850fae113415997563bfc4ad981cfb5f29bcaf3105";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/is/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/is/firefox-150.0.1.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "9a3425105dc9cae3c61c9c66099d8db45ebdafca3b24ba61a6ae3d9a8367aabc";
+      sha256 = "036ea67243ce666c54086d0e219bb063217f2e8321ab1dfcbf2e7690fefb353d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/it/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/it/firefox-150.0.1.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "c46f185b9357b62d4ed2d5f1fd4abc3d88174c72b97846eae87d8a7e0ac149e8";
+      sha256 = "00f38bb2ec48dec5a202774b4c50440b06b9936726922850d3663e641a09c927";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ja/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ja/firefox-150.0.1.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "86f16a1bc7e8dd1e54ff4abac9684c4380eab88ef55c45b056107aad33c197ff";
+      sha256 = "56faf471236f66aa4739287885d458324d91c715407dceaddc24bcd30d752394";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ka/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ka/firefox-150.0.1.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "711bf219c8271cebbadf735510e06f64732f96a3e82e9f02031c1b4c45210473";
+      sha256 = "e16ce6b7994cf29fc875c70eba04c6aa6172a1d508455a9e48298f942bdf7b31";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/kab/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/kab/firefox-150.0.1.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "9e808d0b0433fcaeca0f046bf3504d174afdcb51ca7fcce13cf8d5445dafaeb0";
+      sha256 = "1a6c584963332e16c55db5b16f6acaf27847a56696a3c7d3057f139fd1fbe6e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/kk/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/kk/firefox-150.0.1.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "e39c684b53088922e06f291e36360d8b7668854e7ccb090897e3c4d6afea2120";
+      sha256 = "fbd12f3014207ef7c0e4dc5c7b116eb69bd9305afd7da4e1e0535ad4237d7565";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/km/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/km/firefox-150.0.1.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "27755aaf765e65cbc3813aa780390586db75d0a54e0bf30d9b39c5457efece30";
+      sha256 = "f65d60e0d21ed87e061a1668575ce54c90699ab06decf42b0acf1c6dfa799099";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/kn/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/kn/firefox-150.0.1.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "59365d692e939a83ee409db0c593200ca5721f3c0c37dc15fd305ff9f4cad8a4";
+      sha256 = "979b78ba65f70f875f2364aa0d3621fa965a54c42e5520e2a34ef03fd80a7c02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ko/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ko/firefox-150.0.1.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "f9b40208d5d782d823caf658b3527778fd569c4beffceebeac0e593fd72ea846";
+      sha256 = "d1f7142a6bca24b26d1ede360c8e2013376e300117a10054f7a2cbaef4bd236a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/lij/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/lij/firefox-150.0.1.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "8d92d909dcf6fb2096cdf174c38fd22343b735bd406f1bd7b70ebe2ace40780b";
+      sha256 = "bf4fca76941f2b92288a79be529c6d8daae42d00dfa1509cbf0b1c4acd546f88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/lt/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/lo/firefox-150.0.1.tar.xz";
+      locale = "lo";
+      arch = "linux-x86_64";
+      sha256 = "5849e07330a477098364863d114fde1fd54fa97460183443514f0beef386b2de";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/lt/firefox-150.0.1.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "2ed3230c2989218674b5c5c454e6be6db02aa53a51171f80b710a8854364ea4b";
+      sha256 = "b3295000050b405dc8131c79a5e7c6f4ac63157bba554dc270227a0d0e1d12c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/lv/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ltg/firefox-150.0.1.tar.xz";
+      locale = "ltg";
+      arch = "linux-x86_64";
+      sha256 = "62a0d117c718d07f2f63e5976fa5ef01a98147e0d066cf8e1c7961b095f7ad86";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/lv/firefox-150.0.1.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "3cae4a5fee6856fc8d26f9f331e6209c92e368e7d8e0cca116493da5257d1e88";
+      sha256 = "4cbab42225c919b21dc7ba624bcac999188d3a7452f237ff0594653f0fc9b103";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/mk/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/meh/firefox-150.0.1.tar.xz";
+      locale = "meh";
+      arch = "linux-x86_64";
+      sha256 = "3900f5657d5655d73ceffb15a9f912cf16e5abdc9c2ea51a8e437c2ab7decb4a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/mk/firefox-150.0.1.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "4e983c39616f2a0a903f18c7b9c724d3ee30e284b91a2197346d5ef9b89333c4";
+      sha256 = "ab45fc250423d23da2f0f80abbac28abdfdca22239f629d11d8527c566f36865";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/mr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ml/firefox-150.0.1.tar.xz";
+      locale = "ml";
+      arch = "linux-x86_64";
+      sha256 = "26b8e74037fee5ef9b88a8b1fd042f8efa3909f41c2a90f7b3503376f75f0910";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/mr/firefox-150.0.1.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "018c79ec6dd8d80aaf025260ee1f0fa436d1f273a0450401b5582d325d15e808";
+      sha256 = "e720a7acde548cdc4ed45a3a6a1a633b81b523579d03af314e67943e6f6f326c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ms/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ms/firefox-150.0.1.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "fd6e53060243b54d02cf15f83ae6b6a1fd74387e32c3a872e06287e4e67e7214";
+      sha256 = "ef2e8232de91b87581572c33b4cb9dea2e197f325cbc1c389da20b08fd9025fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/my/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/my/firefox-150.0.1.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "66be74d223804ea70759e21f67388c506459b1e5dabcb99ea4c6940d8437bd5f";
+      sha256 = "f7c6592ad7b8edab343de438ddc756b1031439d5fe0be44ffae7c41bd3abf490";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/nb-NO/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/nb-NO/firefox-150.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "881700e587a36b40c3a363e721b7a8b6bc8525bfac3ef0bc0bd32c4ae55eadb6";
+      sha256 = "e76c556b97bd5e70f098b88678ce85ea80da9afe5f63f7214d18bca2678264f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ne-NP/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ne-NP/firefox-150.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "612e84a33109f3be70ebf5806d23aa82abfb1e2ee1be26be8871dcc834ef5e90";
+      sha256 = "bfcc08764cd5ae2c5afe6a8796f0fd8248c65fc8378248b23d7cdd8177478d9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/nl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/nl/firefox-150.0.1.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "8cf72e25578ef232d111fde5dc233be761467b3ccf9089d356724a202a4af507";
+      sha256 = "a38d38a5115cfdd3b8a6af0f3a227c41b81ff1df989a8f7eaedb1a8ea5c3a76d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/nn-NO/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/nn-NO/firefox-150.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "d8b7b4c09f69d8b4f72bf65efb38c1a6fd2cbb7a5e1d628c7747d53f1b752cd3";
+      sha256 = "69399f4217d4bacfc317b76c2d98e35ec1db8792f74a48e48a78ffce79cf7562";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/oc/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/oc/firefox-150.0.1.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "d85c3edbdb601e4b2f185da27dd87a5c991edd57d7093eae0ea504e8c895014b";
+      sha256 = "71acefaa84fc651a0244976c9861a98595abf7f5372e242b8e76aff6b10fdb82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/pa-IN/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/pa-IN/firefox-150.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "0b1606b64d0b712a7844cd98f51c271400c409a02875fced5830407cf6e24eb0";
+      sha256 = "3ad8da6f8b29e0523383ab75b0312b11a316ff3b7a7e7fc53482f899b7e75cca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/pl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/pl/firefox-150.0.1.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "e2e48642bcf8b73ae19be2212f4c5faecea12d90ab03467f9ce778a02ac54f92";
+      sha256 = "4dc09fb01345cf5e4e6a38f2977821e0bca4ecac57ea6ab37069e89325489fad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/pt-BR/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/pt-BR/firefox-150.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "d2c9dc14be5395be1e99782644a0dd69cd381bd0558ba905e59842baf2d9fd77";
+      sha256 = "7e178f959ed18806149625c05d64a3867b71c36d327defe3bafa4f1a294d2dbe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/pt-PT/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/pt-PT/firefox-150.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "78ca0c4486fd2b5f36e74fb75de94be6be3ae9863283fc40c098dde7bd056ae5";
+      sha256 = "0fd02b1e54dcbfdf33e20d078d3ab9e252e2f7be9f4cf6b4ab2a6e84e7ba673a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/rm/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/rm/firefox-150.0.1.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "5fdcc6ea08da8d9539bdb6b058370880b8387d8b724663e692ac69a70ae1688d";
+      sha256 = "8f3a004e64a884e6e6adc71bc1958e4bb0624f1ddf9641b595a9aad77a78a103";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ro/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ro/firefox-150.0.1.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "ccbd22c2e0a5b42b0a7385e5d18f1f4318f9aee45db45e979f66606b5b38cde1";
+      sha256 = "39d91e36bd820f514b1555c7efc4119e178be0bfc50d7d80cbd235dc79fa3f88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ru/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ru/firefox-150.0.1.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "12fa20208db2048f35cda8c868103dcee372fec4fa111fa46e135aaab7d4a556";
+      sha256 = "3ea866bea819fe2924b31c2d230864ded8e79c520efe5a0077807d40d6ff1f8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sat/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sat/firefox-150.0.1.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "719e550ad69aced566f63f2863f5f8f1fd2dd5e7f1bb31606eeee830d151760e";
+      sha256 = "108a14c809facc50001caa056ac5662a01a71920b879eb04f64e71199b9c679c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sc/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sc/firefox-150.0.1.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "cd215721dba4cf36b00eaf5a3bf29af623c7f86b21e6f4abe54b0f00f6a52214";
+      sha256 = "af53472a3e87aadf764521da7c8de117bd05d99df70d40b1d7e7ccde6b77de5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sco/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/scn/firefox-150.0.1.tar.xz";
+      locale = "scn";
+      arch = "linux-x86_64";
+      sha256 = "1487280795ec63cf95df8aa086ce47f344db0e68114eb3c0d1bb7e9d6952b324";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sco/firefox-150.0.1.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "434a248ede9771a58f7315585609b659287dacfd2f077b3b7726f17d3f32817b";
+      sha256 = "f2892f2af3fc11a9850cbc3cd35efea9303631265b83af5df4c9b491a7725cbd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/si/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/si/firefox-150.0.1.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "9eea0ae86f75db6996f5bd2030f5edff11e9071f294ff4bac39cbf1405cab6bd";
+      sha256 = "22b3677a751ec0ecfbba034727ee3422c455e06b3c4bf1689c6078d5bf4f5621";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sk/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sk/firefox-150.0.1.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "76393f918ffbf5697ac29eb5548545ac3f81d26d1fd126d434eef22037525c9e";
+      sha256 = "be838c44417a55bda3daa5b32d1319f366659c84f718bbd47877e7aeaae4b4c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/skr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/skr/firefox-150.0.1.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "47b2a99f38081ecaebd470c9c92c3764dc22a0d5e8a5b5d1ebd3ef8a5778c6ed";
+      sha256 = "116eabc0df45208024ad748dccd0560d402ef0e07120668cf38f460752dacf93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sl/firefox-150.0.1.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "58fb7c5d61b347c1ecb6273f95345fc45adf3cc82951faa3a6704fe0d97475db";
+      sha256 = "1d9cd0ee1d9c1ee32836dfd2528df34b20b58a6f7b048ac992856239b6c9f45a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/son/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/son/firefox-150.0.1.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "d3eff42279227c045c0c5deeecc2955c316639a1c624d2f431be9eb8dc208981";
+      sha256 = "d664e04da60898edc227eb6c978c94d09d9c704186ab11c7f1b3d069d371ee0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sq/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sq/firefox-150.0.1.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "01223c61da469892fee98effddd3d8c862f2037e1fe0f9a063c0f8d54ca45f66";
+      sha256 = "1809114fcc1f39a7cf5fba17c7cdb7c388d7db200140e72e43eb68cf51e56ede";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sr/firefox-150.0.1.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "7341c99e41b96ae73b3eca82aaed9a53d9d7f93148511598a340f2df2c5f1bd7";
+      sha256 = "721c182205e4117a8d361e1b7b01e5544b6883c08c55baa0228ee220414fbd00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/sv-SE/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/sv-SE/firefox-150.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "534c40d3b5187ea53514457b74c84e9221fe0e59b7a9c7a543ebb00f2c6b0ebc";
+      sha256 = "47f22dc1ea086df633dbc2cbc4e758a6cbc9d54b01e0c90904a3d0d4cf4b3d79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/szl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/szl/firefox-150.0.1.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "89059713ba528500e256bf36b59b3b29b518e2fe6a1cce387765b5668d377899";
+      sha256 = "f87f2c5233d5ae337c0e7e495636b40279fa94c5d193b0f1f81dd3457e7a9e29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ta/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ta/firefox-150.0.1.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "819e223804e6bf19269556a603f5e1de22864973aeb6c02b07dbf5883bddec65";
+      sha256 = "c1b15e4ee9698f76104efbff260cd74a3ce94a6511f4f4c3117291dbbb624309";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/te/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/te/firefox-150.0.1.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "d0d619885daa8b580cceb419267b213bcb428f240cf33b5cddbb56a371b7b5a2";
+      sha256 = "dd0dc5f8dd74e75104054f1f654adaefcac5bae0f1c41bf516c4962e9d9aa9f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/tg/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/tg/firefox-150.0.1.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "de0a569e50ea10f2581292f91c87b6c9e589c8eaaa925a9154d3c99ef2970fa2";
+      sha256 = "1d304edba33e9dca7e72905593de1d3e14ebbd56602ba43c00450e9a13cd34a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/th/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/th/firefox-150.0.1.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "e24b9a1c30995b3edcea1c62eeaa16d24fe51a917dfd5d77bbb4f28a88298316";
+      sha256 = "73ca92e278c3eaf6598a76679f47b6efc4d617686247ba1fe2f19acdd30668ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/tl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/tl/firefox-150.0.1.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "572e70a6f3f5095c00ef5c5381f4ed3d686f0cda2b754dd80b2b7f475e36b882";
+      sha256 = "fa1fcddcb3f1d87d326f05613de3a99ab3d4f445b4b14245c5ea4e308020fc70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/tr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/tr/firefox-150.0.1.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "491929752bf6aad4637418779679e09fd4c11831c5c9ae8e5ebe54ec07524bac";
+      sha256 = "e3f709f5180be6086baf6ecaa3aaeb1acf0760ab37ae7a31b733ab0b974b5848";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/trs/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/trs/firefox-150.0.1.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "38ff7c7e4e0296a8774c2fd51b68c966f9c0a9d2b80cb66f3ece90f0b9f3c2b5";
+      sha256 = "aae7fdb048cc4bc752070183d24db7acd19f41545e4dff1448274d161a72dbb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/uk/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/uk/firefox-150.0.1.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "477afc4e02ce89b72e999237d36f2088e89abdb9a6e6afb199e1a4ede58d48ee";
+      sha256 = "acb0a8a039bb68c7dcf7447c2166c3b38b0adc8d2b06647cb88fb8cdacb5265c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/ur/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/ur/firefox-150.0.1.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "ff286564a782108c772c8b050464499f08b97e40c108ebbde703de5c539b240e";
+      sha256 = "4203ffc02c641c0418b32a542c3e17ee79b37cfe0f84daa6c5be1222dd078916";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/uz/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/uz/firefox-150.0.1.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "88178214e9aa0e4e00b6c7bab3651efe4bf9fbc552b2e3a5fe6374aa4d9c3f79";
+      sha256 = "49c275a012b480aee408f3f4e344f2e7c94e1944dfa897ff12e957ad2faaea68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/vi/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/vi/firefox-150.0.1.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "7f8823ed0456189dc3ee7e42ecc605c3445fdab99a82aacb9ce6d7ed5ad9d15b";
+      sha256 = "b899bef5925fe50e87d9b035ef4f74b9346fcee88d8a71da56aafec924abfb5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/xh/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/wo/firefox-150.0.1.tar.xz";
+      locale = "wo";
+      arch = "linux-x86_64";
+      sha256 = "81d19e8b73c5400067b6c10d822389227b362ba8e0b4a5f259ad5180d44e8e53";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/xh/firefox-150.0.1.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "8988a0e5547a5039bdafd01193e3159d96757a36630420f7d5f2ee6e350df329";
+      sha256 = "93550d5d0fc22862165f7ea6be56866184c0e9682ddd78fe9c2e39bb8ee91429";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/zh-CN/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/zh-CN/firefox-150.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "c4ec491f484bf7ee35e91f89e297a943b785ab2d657de3e1352320b7de967b01";
+      sha256 = "6e636a89f9b8b5843a0771be51019cbed3e423b54ccf5343f571afa10c55bdbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-x86_64/zh-TW/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-x86_64/zh-TW/firefox-150.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "dd81e74e904f74b72247f56d92b180bfe8fecec5732f76d3650ebbd5d8051944";
+      sha256 = "ae716b38a97120a13bc0d83a1eb8645ba7e172ae7a6e9bb154923ad42d195650";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ach/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ach/firefox-150.0.1.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "bfb5d97c838501a93f4a8148ecc00de102a51f8d2bfb2019da7e331ea9fbd7b5";
+      sha256 = "910dd87259210daba781325b2e50c546ead88bb15f94f7e516f5c8bc52038acd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/af/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/af/firefox-150.0.1.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "f2e2444bce5853d147ebfd62b6663b626207964a3cb34558865a27aa9a499cc7";
+      sha256 = "dbe844fe5cc2f8584bc066ccb3edca2d1114730155802ac3b43d6e2c7bfa916d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/an/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/an/firefox-150.0.1.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "773d7793172b12ca5ef9931bfdfe45527332b8214a47aa8cce7cec056b9e5ba5";
+      sha256 = "459950fdeae20b8ea1ba5eb33a34fcfb68e1dde611e37432acbbfa5d35d2b412";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ar/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ar/firefox-150.0.1.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "fe2c2721d91dfbf210b2f965abd49ffa0853a9f3ffb7245e09d4b5c432977608";
+      sha256 = "908d14dc45cfebaf9ad6109640931d325cb7f3dd3ebcda18e367f762114f2ddb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ast/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ast/firefox-150.0.1.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "3d2a9d32b4b65c9d820c7369acf38abd7601fafb2762c8450666bf14cb60fb62";
+      sha256 = "b138b3ae317e1af4846a348428752a5f3d81133bb3ca7d0cb4cac78a671455e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/az/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/az/firefox-150.0.1.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "d85d3df76c17e39520f81fbeb763c73ed5f8208a40d91aec2fe73e4b4ef8bd73";
+      sha256 = "8d05dc93c246be985255edcff836b3a4dcb00c5e4d18ebb5ddf90b2b0245ed04";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/be/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/be/firefox-150.0.1.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "ff61b2f17609e9088765a8c2c27c73aefe679ab364178be923e9bd79e7e82c64";
+      sha256 = "700cdb0e00e83b606158fd7a3008e3df758af53131f525a1f2c61128d3c57559";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/bg/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/bg/firefox-150.0.1.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "24d052f7057bd679445abdadf3594ee298913b25d7b6d037c46a4a3d817c2580";
+      sha256 = "fad7345dc157a279a45c14f5cf6ae5375ec647718bb407647ad05c4481c32829";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/bn/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/bn/firefox-150.0.1.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "d6753fb7c487243faa6767c30d459c69a2c5b922f0b448efe31e17a0f7228050";
+      sha256 = "3634edd19c446c4a0467f8f3854ddf7a81e30656aeaf9d4561ab0c653d5b6089";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/br/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/bo/firefox-150.0.1.tar.xz";
+      locale = "bo";
+      arch = "linux-aarch64";
+      sha256 = "b8105ebcf2d955572f7a36bf9a03f4c05d63a11df83baec3496769dfe97acdc7";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/bqi/firefox-150.0.1.tar.xz";
+      locale = "bqi";
+      arch = "linux-aarch64";
+      sha256 = "44fc51ff937c71ce644bfef7a942731b2a47ee66a34bf24d9438588cb8b224e5";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/br/firefox-150.0.1.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "01c695d79b76c7b688dbdce4c7be454562b048900a6170ce1831f644cdb2649d";
+      sha256 = "6d2bf509548feeace1904f6e0d9fdf035372777062c4f1c84c085875b7224d17";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/bs/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/brx/firefox-150.0.1.tar.xz";
+      locale = "brx";
+      arch = "linux-aarch64";
+      sha256 = "b935ea946b2f6955a4302cd22a204538ae96e674aafb217f2bc26c2d7da7c828";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/bs/firefox-150.0.1.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "53ef34e6bde6bd751dfca50e833ce7662cbd916c1202885f560cf0880fb05d4e";
+      sha256 = "e3e9d0e21b157948294403b1714c07d1cbdbb5254b2f1032d032784b28ddb80d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ca-valencia/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ca-valencia/firefox-150.0.1.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "169695d4ac628ff56655e37dfce77dafb7f4d52f02f76dfd9791b2ceacf5faff";
+      sha256 = "32610991c8831417b8df60b57f01743692809fe439833b99e6579738720988e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ca/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ca/firefox-150.0.1.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "54ecf88b598f7a0ff1f75a575b09ab6ce210eaf606b85be137282c301fc9a0e2";
+      sha256 = "111f8191b7584db3e84ccfb1138c36dd11a385bf00281b99f74e5ed32aaa1a95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/cak/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/cak/firefox-150.0.1.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "7d68e7c8307f72b14f588f35f7ea8d4570d28e07c1a779c025be01a8b54a7ab5";
+      sha256 = "e81a113824976a5a9eeb531e91040e1b7c904a66fc480b013ea6f409a171041b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/cs/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ckb/firefox-150.0.1.tar.xz";
+      locale = "ckb";
+      arch = "linux-aarch64";
+      sha256 = "579f0f3bd781d8cade5be3e5b3b4826b3ff65135cded7e24395a11d6bcc274d1";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/cs/firefox-150.0.1.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "1d0d62000802d037a2386f5375bfcb924ec7830c9822390ccf18097dde958a99";
+      sha256 = "03e7b4241c6ba9bb91ce71702d7affa989e9c505ac9cd79d78ed392f4a394a55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/cy/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/cy/firefox-150.0.1.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "96afc930c806785ef41a37bd6fe1c52746289efb311eaba17af187c76e8aaf88";
+      sha256 = "c7f966b86291160687e79c105d1d3f5203386112e171511d80d065a663b05bd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/da/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/da/firefox-150.0.1.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "0519613f94868e1a0a6e07d646c0ff0ca606a6b1d7c850d7f4496f774fa86353";
+      sha256 = "4b8cc62221236e8d698505ec650bc42cf6bd08fbe8f8537d5ce6d703a1a45836";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/de/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/de/firefox-150.0.1.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "f6cc63dee1b96ed41d60934e002a44a4a16da79f15c06297fba10f13abcc7d13";
+      sha256 = "607fe83aaa513237cca04bab5425c97911fc34d89a53fdcc13f53b1a7e5c9e53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/dsb/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/dsb/firefox-150.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "692524f3a8df532855c2880ac2e4bba10637d79cfec3e687664afc285d919c20";
+      sha256 = "b0223639f7373c0cc5b675e89e31a77d9f59b7c559da49cf866a16919a79f508";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/el/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/el/firefox-150.0.1.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "8c33b155683938adb80db55ea6a6db6df233382d38c75f99288653c2a00fe2c4";
+      sha256 = "3c97360ac2afeb34cb15dfb5755d7c89b320f69deb1564bc4ac07d3c3958a141";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/en-CA/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/en-CA/firefox-150.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "df7400d44670569befe8695660885e42ffb31a4eaee7e3c822bf01ddcdcce39d";
+      sha256 = "493a0a53f94c3a964a471d4b72163babf2ba456dcbf983cb1b53dc3063ae0fb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/en-GB/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/en-GB/firefox-150.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "ab5c228fea3531abaaa5f80b25cae5fddb56e8f94f795d44985319e1510625aa";
+      sha256 = "0bf22734ba59b5bfe8bfe7115688c7bff15f7a145b94245b0f2e929a2d7f9af3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/en-US/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/en-US/firefox-150.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "9e6e2974ddfa840544caf26efda765c4988931bf2ada85c6b107500cd916cee7";
+      sha256 = "518c3bcfe5b859a2fe0405f9fc9ac4271072dd68f3164629c4ecc14729ed9c7f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/eo/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/eo/firefox-150.0.1.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "c70bd558e0566d7c42467a7c950ff3df8a8db4d7ebedcc987464d48fa56def5f";
+      sha256 = "e4a4eb335a85640bf9723e0a63aa66713cc96aaa55696e43de887b6355b3fe80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/es-AR/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/es-AR/firefox-150.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "967de64c73a667ac467fa94a821f50c0cf18993353a1882cf6f297a9d894d5ce";
+      sha256 = "78873ac54608fd436220415e225be4d6ef37229cc0af116164f927aca3b430c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/es-CL/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/es-CL/firefox-150.0.1.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "30bcbb562ff20cf4d6d69a22507efe1882e6afb76580cd73c770b41df81cf996";
+      sha256 = "add480f9e15598a1cbed863aa7acf4c76ff703a9fd56c6695394561e231d4ede";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/es-ES/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/es-ES/firefox-150.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "95b6502bb5c79a86790444e9047ebfbcc0da1bfd4a139b1118af9a3d6034c803";
+      sha256 = "48cb9dedceb524023bc70145d685259a3e743b117fa7a7743aeebff2a07937f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/es-MX/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/es-MX/firefox-150.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "d14341b9dbdf69bd26f7020aea990e7b1260798b2126edb12f26130112ec676f";
+      sha256 = "096731da41334f1ec3112fa5b07b0c5335c358fe932155b78736eb05f56d8edf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/et/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/et/firefox-150.0.1.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "090fdb54b57196bfe50d95703fd891fc45e5b61a71f01d9f387a4ea090cf185b";
+      sha256 = "790eb765d8a1ad0d50d03c82a35345a65a7ab5ba0f0c71bf1ed249f0bd65d2e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/eu/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/eu/firefox-150.0.1.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "17f09f54c040a86218503a963871e9009ec91ff808cb83544de76978b74e32a0";
+      sha256 = "19bdb6d0b9e28572440c1eb9cada15cf7b129e366781fb90de8087c8ea58f8bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/fa/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/fa/firefox-150.0.1.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "2ba0a879cb17e11cdd40f4db120b6c4ce96ef3534427603055224600f3e0eea4";
+      sha256 = "b23b79cef42c1daf3b190e14bdc7b52eb9bdde17a19dfc0bc36074ffe9868d73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ff/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ff/firefox-150.0.1.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "968a570398cd970f1884b49e17aa2ed245f59b70f9c7d3c807ec7f75259d5e43";
+      sha256 = "d8726f896933022054b95bbc29da0a616d1094528bb1c1a77d1bd54ec57aa8f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/fi/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/fi/firefox-150.0.1.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "e7f8a50883183b11cdbbee3ec3f31b8efa72571a0e5235a13ced94a756d98ff5";
+      sha256 = "76a5db7fe2709e68074e80823151eaaddd7460e29fab797bf657c2b9db023fac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/fr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/fr/firefox-150.0.1.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "b8abb61dd340aff2d0812e3fe22b128ccacaba4acc8e2c670df99627af5c09b9";
+      sha256 = "574c9aa9e8806cd4bb60f86503be11a0ee6914a1f0710433717fce0c880352f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/fur/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/fur/firefox-150.0.1.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "37877b40446d443941f174d26735b50c8b3680e33fac023e97632c056533f586";
+      sha256 = "46239042deb73913442236ab5c49b1486d996078710fe537ae73ed11ad1d4b1c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/fy-NL/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/fy-NL/firefox-150.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "15e36db60b6b31648163dc8f740c6fc91373daa8d39ce573bb3c51bd22aa86db";
+      sha256 = "efcf678e26f400072f3976004c44c0d9236bbfe6fe0a42f335d1ba2faf4d728a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ga-IE/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ga-IE/firefox-150.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "80e113f41aba04d445315c3d27766e107e27b01598451eb7f293b7f1a176adb3";
+      sha256 = "80260ae606e9656c85ac24ea9404ac5cde7e88b531f26fa904c3c70268698e28";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/gd/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/gd/firefox-150.0.1.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "50e0a2530aae063cd0928e6d1123eefb275c722b81b29649cdae2a2a9f5f59f2";
+      sha256 = "31e77e7c5b4ec9303bf46af168a53bb360249ed87cd1f18095e50d1750dab150";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/gl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/gl/firefox-150.0.1.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "35f9737a3576583e0c3f70df8d7deb96918648b35722bc87e82eae86054ddf25";
+      sha256 = "b3189d324834fd21107a82fde12bd2be0e4dfd29017328fff6a276af8322a118";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/gn/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/gn/firefox-150.0.1.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "beed54e00bef3e35625583175a338d652e09764df312752403a7b3d7402c1d33";
+      sha256 = "9c3283d98b8716d6a2a11261eccba29d6cec6dcb7b8f4e190ecdced7e6dd7262";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/gu-IN/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/gu-IN/firefox-150.0.1.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "b85e6dddf1c4d854502724c6f661da6dc28c2f15504ff0509299ae75feae97fd";
+      sha256 = "bb6b2b8cc620e328deb9dcff90e671c5cafe702b19fafbc9af81764429ed07b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/he/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/he/firefox-150.0.1.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "815f9e01499dbb83df62380bee2ed0b5a6bee368f00a51cb14e178465135e3a9";
+      sha256 = "55b9954cfde56434b8c0dab9e76c409246cc66f6a9dc69ed0d42d7da93a6cae8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/hi-IN/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hi-IN/firefox-150.0.1.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "ccb8169a407e548ec662e2149bcd848fc19b8bb6fb7559afff412456c3fb1596";
+      sha256 = "2ec0590056f85476199e9f61a4a59e297f53a4793aad749bc88e5479a6bbb5cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/hr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hr/firefox-150.0.1.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "66e17b54c9ca0275dcc0dc17a57b64eac0360587f4d80caaf5a8f904bd9f3fbc";
+      sha256 = "bfb02b878e13f4a1d98b9631659a07ae075a607bc328c3ee5aa5ac86bd42f6d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/hsb/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hsb/firefox-150.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "001ab0ccbfe3fdbc6b057664d02929dc3ebc4e9567684749f05f483cb3ebf369";
+      sha256 = "e6d5e54117250e22c6c2329a4b8c98546d65cb27797c9a42f69cfc92c72cdb1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/hu/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hu/firefox-150.0.1.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "16babc87894317efe88d6234762b6f0c14db62323b20987abcb95d9f639f32bb";
+      sha256 = "3903debfd0638dda86b13d27c92585fa3e8fdbb750366d77d83bbe1f6b29b29e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/hy-AM/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hy-AM/firefox-150.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "419d551fca7fc4066303b980e7fff9585f7115270fbbadab3f487b559e88170a";
+      sha256 = "624f032b814ba01334ec52727bf9cbd3805cf94488994f0e1076ebeca21e8bbe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ia/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/hye/firefox-150.0.1.tar.xz";
+      locale = "hye";
+      arch = "linux-aarch64";
+      sha256 = "ffc537707535c9a19ae66ac684c4792882da0986eac643d118614c67bb3eed10";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ia/firefox-150.0.1.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "d6bddb0e06ebb26dad4fbec0589c550c0a4644133ae915a801419b8c5083e5dd";
+      sha256 = "51f84bf0c6cf4c8783553d113ce079153225e3df8c0c45462e3df70af4b31b79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/id/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/id/firefox-150.0.1.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "02da44560c02c186417906254dd427213aac0f923c17499a89cdb169832069e8";
+      sha256 = "7613525439e39b7275887b6dcd100b7bf2d3b9fb4ee0c43525974376b1040243";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/is/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/is/firefox-150.0.1.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "acc08d39f248b5b799aa5f2631eaea6a0778157887fb5c0926ff42e7b1145b8b";
+      sha256 = "c2a85e67d6bee9d9149badc4489a4d70a8716e278819e03379c309471ed93ef5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/it/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/it/firefox-150.0.1.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "96f389427893b009b4b00c0426d7c1e44f4edfe4f85c954665798273dd24cf6c";
+      sha256 = "b2847b5bd62d3551c6cea210fed3a42f67c44ea500d1d007b574f8958aa8759a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ja/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ja/firefox-150.0.1.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "a28a5dc44c81b8d7bbb36e8529ec12b9eb93a4dbbb315e510591f57df70e431d";
+      sha256 = "56620a77759b736c554a3f825b8d8e643e8d943e5330a4b2d378a6ec618a8f9a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ka/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ka/firefox-150.0.1.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "e749135cafc5505f32832b36053a7c1179d3b10ecd00bf22856855e1aa595385";
+      sha256 = "11b0d303dcd30bbcff1e918446cb0e2134ff58adf33f8836e53ba743832ebe36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/kab/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/kab/firefox-150.0.1.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "56289ea469839fb14e1755b807c8590fdfec417e3ba3e167977d0a775d47ddfa";
+      sha256 = "d2ef86d352a2a9ac56f25368f9174a152b781305055725e796118e2600b86a3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/kk/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/kk/firefox-150.0.1.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "cf264d6c21e67632ee81eb808a52b624a3a994c6b6075aa93be0fc8cf8867d5a";
+      sha256 = "b143536df5ed2798a836306c3bc677490050f37a11b1027a03b061c136e36e4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/km/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/km/firefox-150.0.1.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "fd96e17527b863213e311ee9e3221b64c6dc44db4465d926afc17cde37970f37";
+      sha256 = "e4d4285bd3ec06cc6183957d7c21374661945575bbf89815fab92211b1f4f142";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/kn/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/kn/firefox-150.0.1.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "7a47e0e8cf8917bc9626dc0ba59ef7425be9cbcdf54e2b31954402d1cc3988d9";
+      sha256 = "3d62a8980af44837d04946fecb786869583951887804791496ed9b407388df1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ko/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ko/firefox-150.0.1.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "a90d9216e1112bb9639f536e6752e8a7f0afc5f19748e4544140096b4b7d1bee";
+      sha256 = "7c3013343f1d52b2345983452bda56dab05460f374dddd03e1d198ee92d537de";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/lij/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/lij/firefox-150.0.1.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "c9868c2d93656facbef63bd0267870ca145efb0860063870b13c011debcc0570";
+      sha256 = "71211c4c8dee826dae432f77d7d26e4da19c939714890b11abcd628c9443bcad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/lt/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/lo/firefox-150.0.1.tar.xz";
+      locale = "lo";
+      arch = "linux-aarch64";
+      sha256 = "e78b38500aff29d791eef802e7bd328f9b961d53c276ea625cb36156126df70a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/lt/firefox-150.0.1.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "8fc2b840950ad2593876794170575af91c04ad334552404f5460a5d006e9d594";
+      sha256 = "d88dc2b7e1331de2ef82a6960020b7a0f27dcf8fb4c9de4de199c66ba6fc51b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/lv/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ltg/firefox-150.0.1.tar.xz";
+      locale = "ltg";
+      arch = "linux-aarch64";
+      sha256 = "45086a95b8166412ab51a8db6446c540b9dab49a779eea8656e010a5d31fca4c";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/lv/firefox-150.0.1.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "a534d5e8e12e57a3b288ca1b12be61fb270da791f6ccd33938233eb1c0f3fc07";
+      sha256 = "2bbf06086aab432fd384416da0d5ca872df102bc88d9006ddd83dd6757c5ef3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/mk/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/meh/firefox-150.0.1.tar.xz";
+      locale = "meh";
+      arch = "linux-aarch64";
+      sha256 = "7b7fe732cf7246d11b2fe5c889546abfec1649e06cac3df3212c36a65e5edc87";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/mk/firefox-150.0.1.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "101f937a0a64cc4aeb71ecc0b76334bdcf3c4bc41bc2923a845df89e1b1e4475";
+      sha256 = "3bd132654564c9d6da1fe962bb4ffa24db04e0c5cc10909312bd892bdee805f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/mr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ml/firefox-150.0.1.tar.xz";
+      locale = "ml";
+      arch = "linux-aarch64";
+      sha256 = "c2a533d488c0b1a41380aab5e8adf24bf4d228f2c3bf9105a5ca06ae598e13bc";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/mr/firefox-150.0.1.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "e9f8226415d5aa07faf0a9493d247c98f20ac1cfd64ad45dffa5b101470f266c";
+      sha256 = "584cb5c0ce829333b8789c5c0e3b0b92e360528525d1b7b26095e9aa7451ade7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ms/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ms/firefox-150.0.1.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "4860eaef1ffcc84c776645d46d09d05f792b5c939447b5e5cae5015080cba254";
+      sha256 = "a0e657870a6727167b9d09ca64a290240ad70603dd1f00041c98567cde2ac79f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/my/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/my/firefox-150.0.1.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "365b05ab1bb379d6fe3a7d47f4cad780fd06e8e4cf2d97be8b454e557b549f5d";
+      sha256 = "0be94e433659efa1195fbbd7cc3dda57a27ad792d6f27fcc3fbb4ef568c6ba24";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/nb-NO/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/nb-NO/firefox-150.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "26da7d07de34b248bf31b46456be7db188819782de4be81c3102936ce7a7c147";
+      sha256 = "13a7c44869ad992b3b5e5d96bd728da805c008ddd6911a9a0b02080c0043b1ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ne-NP/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ne-NP/firefox-150.0.1.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "f18c403279ab4355f3c3af7df37917ddee15cf12d5702ee3631416094e34e29e";
+      sha256 = "239cb386656b0b399a28fd255e5e8f87dd8cf88494ae6d2d68e9bffddd8aff82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/nl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/nl/firefox-150.0.1.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "3af9e6a79b151deb9edbe20637b484763682ce129e19c62bf64d75c1c8b3e3b3";
+      sha256 = "7d8b35934fbede88f8fe419db69823fae84ec0fe76b975ac0b91684148fdb1d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/nn-NO/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/nn-NO/firefox-150.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "ced05bce994800f362e23305269324bff93363f6971a6fb3dcd50fd6695b46a6";
+      sha256 = "8a5cb9d59f364915ccfa2422cf0b89eeb0cea0955e6104634f982c7e6c03a0d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/oc/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/oc/firefox-150.0.1.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "001a3236dc3221693f00ccf7d3ef9a772a9f85e956086113f2d5ec00097764be";
+      sha256 = "c79e5e732756d38f55b41ad41292b094c24f39d6babd3b49650ca9fbd71b8606";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/pa-IN/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/pa-IN/firefox-150.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "ed8e49b3bad3263620c3335079c72bd01c12b5ec19bf5d2a3ee2501cc9bdfc3d";
+      sha256 = "6e8f56c5b989333fb0a38bc4cda2cad8822b622dcc46614a634f4e508973f631";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/pl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/pl/firefox-150.0.1.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "3b1518027b323cfdfdc4bb95f66bd75dc43ce387a75fade39f8cdcd789483f55";
+      sha256 = "9552d9903201258af9ae36a7e83b33593280ebb560e2c43e03b0210fcc0aec5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/pt-BR/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/pt-BR/firefox-150.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "07decb7d696a9cecf4130352c77bdacf23fd0c7b486889fa40f5cf1faff22b5d";
+      sha256 = "aa0a2910705bf3ad409289403a2a53c99f050020e233c94055dc9256b7a81dbe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/pt-PT/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/pt-PT/firefox-150.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "cb011d2ba53d7eaf9d8065fbcf8a0a599ebd46d63a140af48aa68be90e2e89b8";
+      sha256 = "9c779f7c6ba13d77878cf5d3677bd8a079f30cfc69c9f140a6f4d6a31dc3ec5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/rm/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/rm/firefox-150.0.1.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "059036333a669b2e332bd1c91f8462f8f2c9197dd200686c93e8bc9c98d9a3e1";
+      sha256 = "f90c9cd8cd7d8adbc235fc6b8c7bb009e91101473f4a2e722d4746b29534daca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ro/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ro/firefox-150.0.1.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "dc0424e5288f25cf15e9dde77d21ee8b4819f2f3efcfb1a7f9759db38de69435";
+      sha256 = "b5cfb3ceee3ff68a831f4251fe653ec080b3921656814b4c8f034058ba8ead9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ru/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ru/firefox-150.0.1.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "acc30078a9be326d58972b4ec86abde7d829309915f573ff930d07453497bde0";
+      sha256 = "72c877dc903a52d2375348a16fad7ded617ba199016d6f22aada1f28c5035b62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sat/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sat/firefox-150.0.1.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "64fe33329ccf4e46a7c83eba9ace506fb0f1eaa77f84e4fe0fe2a4b79adafe04";
+      sha256 = "ac17c01232d386ae52eaa504f05b70a22db1dfcbdf463e1020b5351e07265a9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sc/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sc/firefox-150.0.1.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "6865e09f8ac77bcb4f07f9adbb6d8db55d265d60bddd589c8fffd74fe08b88c0";
+      sha256 = "a7809ab6f568896beb07b1ad7106ac6f514af736a40b5d91fe351968c421bdaa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sco/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/scn/firefox-150.0.1.tar.xz";
+      locale = "scn";
+      arch = "linux-aarch64";
+      sha256 = "e6d09b48c3ab312504f932319b4b0fb5389ac282be44221db222837f129bd3fc";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sco/firefox-150.0.1.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "aa391d7766f94b938e70c1b25c6a94e37c89d0ff9dae04b194aa9f9cb05c6bce";
+      sha256 = "139aedbb5d6293fd939ab84a9bc45980987a1e7015d0696d66bb76dd726cee44";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/si/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/si/firefox-150.0.1.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "6724d82646c653cefeadf1170ed0e137541631536d282a7e11ccfd0066f17dbf";
+      sha256 = "7c78c58f7ff019fbd9ae99fdd71085511f8469b47624bb9794b5a19c96c92373";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sk/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sk/firefox-150.0.1.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "c660a9a3fc60a8dec171931f8dc42eab78f2e8eac052ad38b234f27c1cdaaf69";
+      sha256 = "015c865fcd5ce8cb3da3bc055146ad1e3d84ac2ba034dad8db1cf5c40458ea93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/skr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/skr/firefox-150.0.1.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "c4c02f3a144f70bd0ee2e9ad112e523bd5962253afbf72b7c672cbacb09f7f69";
+      sha256 = "0886595e8ae4776a83ddcddd6c2d8bf2257f8fc7b37693b3a517c66d154527c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sl/firefox-150.0.1.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "5734549558ace1c969ed2e2b4375a08f8869b25ab560d706bb60ddb4193590c9";
+      sha256 = "96541bb42b73f27162a85b9318ced66dacee185b2d76831416453859eebd82cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/son/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/son/firefox-150.0.1.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "a5d560cea663dc82152ab9bcf7d2733396254c02dd7308709d74264553e1ae15";
+      sha256 = "84f42c1c8a6b28408dc19b9c8153d1e8b4e2f578d60b5dec175250015ab41dd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sq/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sq/firefox-150.0.1.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "3eb5c4b583205380c13eb99c13df361db7adb46324ab37e4405b892f5c923d21";
+      sha256 = "6ffeb766f19b53763691e902f6a01584720a248b52cbe08bdb530ba7f9c65971";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sr/firefox-150.0.1.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "83b9a7cc9b19d82771f29f2fc2f20e76b04c0778d51644a3ab38223d46c51c2f";
+      sha256 = "ba6d4769fe30ca2c6dafbb9d9acb18defe2c2b7c48bb80a9d7a7579d23b236ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/sv-SE/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/sv-SE/firefox-150.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "d60f17565af94a7bac9b4188a036844b170a2183d1adb9323cc0e297121007d9";
+      sha256 = "9f3b81e42d918cb964c6ecd5887658704d8192fcec57123edea739ae617cd02c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/szl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/szl/firefox-150.0.1.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "0ab6422102620f7a2f8a3109e4a1ad7cefcba8692c3ab561cc218b71134fbe16";
+      sha256 = "9deb181dcc5d6bf24c2e14cc690cd867a7c3ffa6589899a7bd98021137c0da36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ta/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ta/firefox-150.0.1.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "7e6b81fe4bf32f20d6d63b624cfbbdc4534ad39908b9057ee7ec18d90fa0f006";
+      sha256 = "00987b9eedef78a5611860970d54c567cf441f333b1fe2d8a279b0babf1cdc85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/te/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/te/firefox-150.0.1.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "5c66682d957e02c9f93eb248bdec5787a2397099b1ec63d5bfe62e15fee8a616";
+      sha256 = "68a41103ae728f3bddc4632814fb4e9cc37d338ac171903b8fc51c18e6610d4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/tg/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/tg/firefox-150.0.1.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "6151d4822fb5085e2743ace099c3fb5b06b11b10e9aaf48cd100da19e452701e";
+      sha256 = "48db88f96b0bd6719005a1e240988955b85489662957f77752e283d8eef8f5ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/th/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/th/firefox-150.0.1.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "de1cccee3e3f2734e011dde3aa4c564fefa43a493fa682b631c4f7a81c15260a";
+      sha256 = "18bb5d344710cf0a66d23fd221c55fab6c80932e4023301dcee928d48362cf91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/tl/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/tl/firefox-150.0.1.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "816f2620046c878db2f2d91ba859b8db6657dfab0f48bf12f9956247edb43ced";
+      sha256 = "a1a8beaf1a316e38282c0f1478f6b6e82ab84a341a88c0edc8e446f53b201839";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/tr/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/tr/firefox-150.0.1.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "c3e21bed21f1d8ded7b8f67fb6a5b971aaedf982358cc2adaa1d22830cd3d4b6";
+      sha256 = "1cff2234f98902f95688bbd91411d65fd577164413c6de781d34c2275d74a517";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/trs/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/trs/firefox-150.0.1.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "2e34b768fb5ade0ded463a23278e779f726dc8a98ba50640b4c11d1dd9f439cb";
+      sha256 = "3c07eafec76bf6fd6a4f50476fe81b4eae905175c05365b97107e835c2b2051e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/uk/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/uk/firefox-150.0.1.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "2d3668f7dd2250b87d3568ea9a24fd9d56eece1087f0933bb41754f39f1d563e";
+      sha256 = "bd182a49930c4627bd2ca3f83eba539fa176a5061bc7b3187991b7d068b5406c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/ur/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/ur/firefox-150.0.1.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "f5b1c24d9d01ad2aa80d83312cb5a149bbb60aa08213ab53cafbb6c5c816055d";
+      sha256 = "0554f5d004570663b78e171eb009bbaa94683adec2af2516c2dfa0646737f0d9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/uz/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/uz/firefox-150.0.1.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "6185d107063cb3d37dd57b9931cbd7880c6119bf85c381aa90115fa2b4c69d6b";
+      sha256 = "efa72ea250f4d8db45e13f6a609c46ee2fa6f86aa13c577292f169ed9c5788eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/vi/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/vi/firefox-150.0.1.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "97a3ec310672fcb164205418b4a5d253a7e8b7c45798022233f4296c24f77e5f";
+      sha256 = "3d16128d05374def7a12783a323d0ceb7ae0f547c981d81227a951155437a706";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/xh/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/wo/firefox-150.0.1.tar.xz";
+      locale = "wo";
+      arch = "linux-aarch64";
+      sha256 = "aef236467b43f37f98e867c4f75ab0da3d7d96149eaf323b8a8c9209a4305b7e";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/xh/firefox-150.0.1.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "04ff21fad2cbf864fe975706f955f98bed94a731aefa9c50e04804471ba961b6";
+      sha256 = "d6bb489a2d1cacb4ef1f1d43b04ec8c4edc4b4ab1d7bd734824b93279a39f47d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/zh-CN/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/zh-CN/firefox-150.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "b2c97b5d0b1c84fd75f52c7480b262c2f6ce9a951ad30f8ce6c985f6f78b91d8";
+      sha256 = "055524b16616bc351b18cb9d3307adf1f78887fe3f2e1f686149d04809cdeee7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/linux-aarch64/zh-TW/firefox-150.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/linux-aarch64/zh-TW/firefox-150.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "91ed18bc6d5d9d9422f07f51b0c2e5e231431facb2871d413b5da61cc4119fa6";
+      sha256 = "7d7b833febb3d1d60d62bf54a26cb6a47406b3bfb1b0f8e72657e220a2335b6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ach/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ach/Firefox%20150.0.1.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "e2f99ffde15698e329db9e7fc0ba6cf50179f5b4246b0af824c694e861c8859d";
+      sha256 = "c2518f81742075eaf16f2630799397c7627f1e1df8d79f93c81cbbcc33a409a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/af/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/af/Firefox%20150.0.1.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "f36f2dd4c98d0cad0edd619c2e7aec22f7a86893f79407e96fd49b9b309f1a8b";
+      sha256 = "e9a78ec3e57ae2c56dca47597a452fb68d8f8f16aa10dbccf1dbb334b6c09064";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/an/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/an/Firefox%20150.0.1.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "dfa35cf323f25d1eb7ee8e95fd4ce1a28d1201e1082af5782ee53a6e2831472f";
+      sha256 = "c883a4c46ddf15d287afe2067dae819071bd3d4ec8f88d01685d3d4903567cd6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ar/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ar/Firefox%20150.0.1.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "afeec7930073b35949ed52303b3efcb0874f7ece39c697f89aaa78d4c36bad82";
+      sha256 = "567d0bdd4dec097d078e1d88d04148585bb4d35257a1cce2a47bdeff33e807e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ast/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ast/Firefox%20150.0.1.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "59611ab660fd04204462ecd7c0f5378539cb32ea65ad9bf009837a52a79c742f";
+      sha256 = "ec991c807d01840f7f9e45701b682158d64850e70328337b8e1e28169d7b3831";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/az/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/az/Firefox%20150.0.1.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "ad3573544a5856de13c62b2fe44351d6dd72f7d4a620492d6d5095fa495fca31";
+      sha256 = "80c669b37157511082d2d08e9280fe0a187868a09ecd1cc98834117c6bf73151";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/be/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/be/Firefox%20150.0.1.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "2745f823e387caa1a511a0e4a9480ad00413eb97ca1ff775113f4f0cf4da4d15";
+      sha256 = "815d972f549f82b81159f001fb9a68815256d1517c5104b1707c1220850e3532";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/bg/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/bg/Firefox%20150.0.1.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "1566dfe0d417ea0b5fe474454f6ace8a30e673d61f940bb4e2f522e77ec21e64";
+      sha256 = "cc03e352f0e17a1788b017b70cf4f473fa4fa0000855ed84c796ac581d8447a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/bn/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/bn/Firefox%20150.0.1.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "509e9b7f2a205bdc985413e963aca3d56e32fceff571e1d290fc47d218838b91";
+      sha256 = "3d6b15cfc2383396b409701b21dc57420fffefa8966d760145cc748d7329f3f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/br/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/bo/Firefox%20150.0.1.dmg";
+      locale = "bo";
+      arch = "mac";
+      sha256 = "e28d2a4485e5a030a89319e6e09fc5d3f8f6957b8eaddd6fcb0b469bb1fb17f5";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/bqi/Firefox%20150.0.1.dmg";
+      locale = "bqi";
+      arch = "mac";
+      sha256 = "10c37d15762fd6850fed848415faad8d53652e0386c78d35d33e0adc2db5f1e0";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/br/Firefox%20150.0.1.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "3046278dcc38b3454e8946797669d742b845f435fbed655309205dca6d4bcfb2";
+      sha256 = "265115a1802bf1ad659a38452204125df68fe5d840c5020b1e2a6b9e373ada96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/bs/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/brx/Firefox%20150.0.1.dmg";
+      locale = "brx";
+      arch = "mac";
+      sha256 = "b9c3b988b55270a39ddce604ede130c3919f09128da5ff5749ccab95806c7d98";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/bs/Firefox%20150.0.1.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "05e4a787bf8a8778035b9ada4a31fcf3bd03bb6178592ce47782baa7caa876ec";
+      sha256 = "91e872c8e38fab0a20defe160d485ba12552403eaf0dfae1d536c35e06a80ecb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ca-valencia/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ca-valencia/Firefox%20150.0.1.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "913bcc960aebfb8bec9553308cb2e016bb9c1fe01a82f5440425480844f49717";
+      sha256 = "fad07a890ddcab9835a48cab50df18563ce25250d046ec61a5d09d55a29e9dd9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ca/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ca/Firefox%20150.0.1.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "a7efad433f593638bf2c8c9e72fb1f8bf57850ae2349638bbdec0c4180bbce3c";
+      sha256 = "e53369cfcff306e4a4e3343a5982c120108b168c0d80b0ca0915f536fb35cd01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/cak/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/cak/Firefox%20150.0.1.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "318b0df6f127c4f064304f3b26a708592d1c47a03c61d20f66661eba747eb2b6";
+      sha256 = "090adb887dd541a165ee8a6a6e4be79ee96eb491e3d96e5504795304b6f5e5ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/cs/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ckb/Firefox%20150.0.1.dmg";
+      locale = "ckb";
+      arch = "mac";
+      sha256 = "bec340f210f21848a3c8862500ae349ec65ff3ac62de9ac64607f4c76ce44d66";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/cs/Firefox%20150.0.1.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "071bf4034d1e1a7a1dccb90bec227ee4789a58500db939990c984e823a3c73a0";
+      sha256 = "01079e246026659b3c2da4e1b66141d5c597117f37e2719b409d1f595d7947fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/cy/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/cy/Firefox%20150.0.1.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "f62445587949d8e6d0ffbbc13d16be51be48b1bd1cbd947f05b7b73e94d1cbda";
+      sha256 = "7ef6d16950f8fad526606e6589bd2cba94c4da692aad3be717b113bb209eb6ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/da/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/da/Firefox%20150.0.1.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "0bba3653fa7789ea14f51d16152fc9289b9a12ecb0a375da18fa2cbc738471c1";
+      sha256 = "78c6684b85e8b3f4ad6bfc8da763782e06cf1e9018f996ef623c464dd1c02d25";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/de/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/de/Firefox%20150.0.1.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "ab4a318fc950826e7e2d174c42c36f4d5f7311199dbebdc48ee5a0e0f8e2354d";
+      sha256 = "f0d6f01a6819fc6ec3c7472372c322b387d00eb7ed3408a89d864d1a73d75631";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/dsb/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/dsb/Firefox%20150.0.1.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "2945d491b0aaf17f86e4b6e63a28d089246cb2cd0b0fa900cda1a73b1ed92837";
+      sha256 = "ad8b5d6bbb429b40761e71dca6636108c38143a5a35abce3399b55179fa0b99c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/el/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/el/Firefox%20150.0.1.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "3bcb364362142750d764812c2d86077cf87b592c4a72baccbb1a18e8de6c09c0";
+      sha256 = "218149aecc7f2b0c03b16d115aea8b71ab083c004c8e172189e07002f5c1aea7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/en-CA/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/en-CA/Firefox%20150.0.1.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "088bdd837a5771b4aed7686f2e847867a5a1534bbcb983eac6ffac954ec1c079";
+      sha256 = "9afc261a0c5e2f9807b9263dbc9a7da516a44e1e259c4a785c8d4df2f424d5f0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/en-GB/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/en-GB/Firefox%20150.0.1.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "59ce8018013a9a647c91bffa9c0637821524b677ceb78542b983d6bc88c41649";
+      sha256 = "129f84a7f63d0f1774d747fe74203422a83c38350ca915bdc74ddc81df4b22ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/en-US/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/en-US/Firefox%20150.0.1.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "203667ff6b0920f89973d477b1394d99b4b78807a613914c97bb1b3200e6da1b";
+      sha256 = "4221ec4972cb385042354b25940728e5eb7ececce7c95d2ec3f83d2323673d6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/eo/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/eo/Firefox%20150.0.1.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "e6fec1759803d73fc22797cf99334f1eac4da522dbae4ec8b06abe6747880d34";
+      sha256 = "a91efa6dc567a9f927fc018d8f35cd28f35938eea18276c036c1304ef768b943";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/es-AR/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/es-AR/Firefox%20150.0.1.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "8752226080d09bdc42bfd8b91ed7e694159401837b5aa3218fd595872d3dd926";
+      sha256 = "a5b719c37ed2602359f9de55d76afd032d71292ce366e6aee7da34c3089c52b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/es-CL/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/es-CL/Firefox%20150.0.1.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "406bfe67e7d92a3b365a314bfce1453c937d950cce47924eff577e924e28557c";
+      sha256 = "6682776a4062713cc117bd136a0336ddba951d79c53ed994b49d4a80eabfb272";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/es-ES/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/es-ES/Firefox%20150.0.1.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "0a14361560e5393d41f805bbcbac2dc24c3da16d218a18ca042d7913a552c679";
+      sha256 = "95594f5f6ede6be45cb6b41dbac1637c43efbcefd36b47bd34d350aee1d35fd3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/es-MX/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/es-MX/Firefox%20150.0.1.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "4a6b627fc6804ed5a6fa4d797cf203690461d9cdb7faa6671ec11314114e867f";
+      sha256 = "98222582878630d280e889403a7f120339c5932904602cd538c758accec2719c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/et/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/et/Firefox%20150.0.1.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "bd970085f5a9825ec8f4d96c9370a7b89a098f3812e8de27498ba497ea687499";
+      sha256 = "9036fa35657a551940f2a630be91f954b7c22ea2200b91a3cbc103ae57787a68";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/eu/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/eu/Firefox%20150.0.1.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "520f5732ca766b542c43e8fe520ce5b9e709b66b60d3cf71d36c5565a7f0a9f9";
+      sha256 = "f23ac467f480cc92bd1a32dc0d9385daf7cca1817c05b41a99707f8f6ac27ec4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/fa/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/fa/Firefox%20150.0.1.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "6d082bca5b04d9951d9bacc89b1b33f08758c695058a8adc3814c1a362f9520b";
+      sha256 = "1979583c9084856c9ddb41faf699166dd134549e5a880dc6189b07602540a40c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ff/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ff/Firefox%20150.0.1.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "16bb5c8740943579fdb32e82d5ff2b8498fde6251afd2778acfca74a8fe74b45";
+      sha256 = "a54b68ea9b7e365d66400cfce048fc8967e81dd9ba3f88c9dddbcd0ab8f12263";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/fi/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/fi/Firefox%20150.0.1.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "4119a5949a8602cd3d472342f63b0d9aeb0707e509b07db6aca8ec01aae09220";
+      sha256 = "3b744401a99db610e7d656435f584e81a5ef2a460b85c71a559777fbe2c1083d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/fr/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/fr/Firefox%20150.0.1.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "cdacb332809c8c1862ccb1623031a296357ba6a53d288403445be93ca319a62f";
+      sha256 = "0ea7b30b41db56ad0faf5167019555d22fd526dc59c2591321398a7c12d9f3ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/fur/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/fur/Firefox%20150.0.1.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "82f6933e7e04e434904d7e7bc473097200ef071b8c1f59456c0f9f01afa9bef9";
+      sha256 = "3540e96329ef85636112a66a375081f67c67d99243eb7b8606aeb89b45a495a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/fy-NL/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/fy-NL/Firefox%20150.0.1.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "dfc61dba9a4cd772be21c656e04da55ff6eed85adfe38d7cd752d139de7d813e";
+      sha256 = "176d78af8e7d7d91aef342ee7e49df1806fd60f5cbf21627b6a625583885f9d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ga-IE/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ga-IE/Firefox%20150.0.1.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "5ac1ec34a95244839f896b5d9e9f3b89b4276a5ef660880f7ccdf5466938dbfb";
+      sha256 = "4b268ecc43e3c88fe81f4ee16d186dd91d41a26c79cdb69d0eb42fca20603e6a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/gd/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/gd/Firefox%20150.0.1.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "a5fe8008b3406793d673100d7d0ec6785a8c878015c11e9c064496547013c204";
+      sha256 = "d6860f98e4ed711b075d32f21a66dfd60aaa1c5fd25660c862b06691d45f9f73";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/gl/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/gl/Firefox%20150.0.1.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "7a2fa34d2526f047b3649b480e0d5046a46a8fdbdfe05a393bcd3b513ec416d0";
+      sha256 = "227b89b5785598db1edf8b6099ab92d6bf460725fc93abd7c2afce1155879ef1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/gn/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/gn/Firefox%20150.0.1.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "b6d7bc020d2551632c0063528a35bd9c71dceaf437703f25676663b34e5a9030";
+      sha256 = "ca7b15b96a45b1209e332f3182e2440088a63d206154542a69b0f94822ce1fe3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/gu-IN/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/gu-IN/Firefox%20150.0.1.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "deced77571f57a83661c4ebe430bb945ad5135a3137524bee7cdfb39c9837150";
+      sha256 = "33ad8602102ba910bb699e008c2b3dbe1fe7dcea8d176aa074be6dc5e4d2b4cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/he/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/he/Firefox%20150.0.1.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "147b97dbe732977acbc792956f82cc954d5891ba22717a533fc429f3061c1a07";
+      sha256 = "e7651ce1935ec3dc560429a8b883f2a181efd4b01d0c91986aeb7ca65f49ec80";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/hi-IN/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hi-IN/Firefox%20150.0.1.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "2625dc7f5959adbc72391e20abd839f6f0bd12b1a0a9d6775e0d270dd43f5f03";
+      sha256 = "cb9dbb3ca3a1d7dcb4ba8e425ee8d0445236fc4163f503bfeb8dc000daad407d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/hr/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hr/Firefox%20150.0.1.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "7d1bcc51e2660c132fb880dc2678cc7c4342ec891177f25dc33206e1bf78182a";
+      sha256 = "f68d0e7950c7ea00b0621951a5e98162c7722b5c4fcf127a53704a989ee8ee93";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/hsb/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hsb/Firefox%20150.0.1.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "b63fc4a6ce0bfb1af6d7698b0ecd0dedbb3f79b4cbb5b4037b04eaf566a41aab";
+      sha256 = "b8f76b886d5678dd0391399cb0da049f5a3615c0621235501ecc3ef11bd2f476";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/hu/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hu/Firefox%20150.0.1.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "48629e9ae8212e03f2d9aa7c6d9bfc531218db350076161ae99808b9abf9069f";
+      sha256 = "8026c72dbcdd0b81782f05707f43b37a75ee15a60ed1a490d69d7f17d860f44f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/hy-AM/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hy-AM/Firefox%20150.0.1.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "249bc6e8fa8e2a46e00d13552d0ea4be0117a608f8d2a70578cbd2372465da22";
+      sha256 = "bf7f92dca25bfd91e7b5f4148b8e745dd4b37482bc5ec07a527b18d634359f46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ia/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/hye/Firefox%20150.0.1.dmg";
+      locale = "hye";
+      arch = "mac";
+      sha256 = "99b8c1127a5473c7aa4788806cce2c8b557158b13c87d66f075b50bb72e8a369";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ia/Firefox%20150.0.1.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "8f223ce9c7f32ca477bb9f1bc340e572ea2310f97ca0a04c02cbb811c17ec2b4";
+      sha256 = "bd70ef1f71281a9cd9e10a344652403a12d58311ccac0278e48c2323a3c48a29";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/id/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/id/Firefox%20150.0.1.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "bcb61e41d888ab6de6854086cbe1bbe3701a8709a48b84170264ab6576aebb73";
+      sha256 = "80995a7ee82bf576a850dbdcb79d9950b9cbdd6dc797072646d2913b02292dff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/is/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/is/Firefox%20150.0.1.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "79becad3d33edd9beb8ea1bf7dd20320b359020815fb41f07181a3e11c95fb20";
+      sha256 = "9cce4f5520c014cc6f248abfa99672dc6bc9ffd484e7535fc4c53f8de9e4845a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/it/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/it/Firefox%20150.0.1.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "6ef5871c8951a69ff4f013f6c69d360d613fa01563318b08d98f079b7070b461";
+      sha256 = "cfba534a808acb011bbc5d5597fa0faaa13bd5f2c8ebe8777926211cc48a74ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ja-JP-mac/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ja-JP-mac/Firefox%20150.0.1.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "48d16cfd50ac3101e248c6c3a61d029a5573284bf47baea329427e7338b54685";
+      sha256 = "ce9ba0877ca07b14dbc8447637ab5fe543e7352d3eb334180794374326235a5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ka/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ka/Firefox%20150.0.1.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "e0b956a354597d8f4e258f12193476bda64d3e3853528c9a28e3e3573abe64f1";
+      sha256 = "234e6fec77e8e59c7bc31d2c10fe88ce223ace6ce9f7a2d99334202bcdf1d6e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/kab/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/kab/Firefox%20150.0.1.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "975021e54d958973ed42c9f51067f083885534b44701c4f27d671bfbffd929b9";
+      sha256 = "1d98a7597b449c1cf78ead0fd074522a11d31cc400a77c3169a6344178cfbc83";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/kk/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/kk/Firefox%20150.0.1.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "832e6b87e2543d88ca3fa737e12cee984572eddba6dbd9a641a1452809259c84";
+      sha256 = "713b74d9de35b634cfe6786a828f44824b67806e3366117fa4bca0d15b1f99a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/km/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/km/Firefox%20150.0.1.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "bd9ebf1c384f0f50738eae6a2eea9fed6dc4f9044ac040a01acf6e9a7f7e6b85";
+      sha256 = "60a1ed56bbce21d3e4e8aa6f10f1dd52f49d42dd8882e5564bc38c2f07baa2b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/kn/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/kn/Firefox%20150.0.1.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "2223200b5fd4e96bef71c619255e4431f0162782ce71f4dfc7e0969d6273be10";
+      sha256 = "203220d6f154b887abe35353d1c4b257e76f9e07d648091d1d6d07fd9970c5e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ko/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ko/Firefox%20150.0.1.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "78e4bf62066f0608a218baf53ab0eae7e0c9214f335e7cb1a38072afb567513d";
+      sha256 = "42ad6d86cbec0471a71487f1eaa4abd9e652a708d5f372f10838c6f263f5a12d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/lij/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/lij/Firefox%20150.0.1.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "ac4a69804ac2938a4756774180f0cf56d4587757cef872b8d825502d2f1965fb";
+      sha256 = "c91d3a5d6c6e89865766e3fa6a5f8d266327775e8511620ca94dac482522a60e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/lt/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/lo/Firefox%20150.0.1.dmg";
+      locale = "lo";
+      arch = "mac";
+      sha256 = "18e69fb04a70af32460bd0cd16d2f1fa26264adaa75be372625700d92e8ddbac";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/lt/Firefox%20150.0.1.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "60a74fcf7a1d7ba9f7eb1cd27360ec32c45016c9c0c9c70dd8d73ceb5fe1d994";
+      sha256 = "cba75728c41dce858e6df6f079f930c9545efcffbffa5ed941bffb757db73f36";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/lv/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ltg/Firefox%20150.0.1.dmg";
+      locale = "ltg";
+      arch = "mac";
+      sha256 = "f59c199a9cae7517b2321f215e8b45acfd21cc31f6aa6013d6322e903228fb92";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/lv/Firefox%20150.0.1.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "aadbaab1bd91fbd442b8827591250ef5cff9040c21fd97d4285ba5d81d4457d8";
+      sha256 = "187119046ddbd6659f5fd6c64c5cd3a1e2ce4d82753c8e11f32c5f2e54b6b566";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/mk/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/meh/Firefox%20150.0.1.dmg";
+      locale = "meh";
+      arch = "mac";
+      sha256 = "0717720e48246523513df9a7af59080acfe238b04de5284a4ae3536dc66057d6";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/mk/Firefox%20150.0.1.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "cee675f21a7d2ebf2f402270aee057ed8f0ce0092da12ae7cdd0fc85e3b18758";
+      sha256 = "730f901596e01172902e790c01b808dd1c8451e2b32597d12e39201b146e319d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/mr/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ml/Firefox%20150.0.1.dmg";
+      locale = "ml";
+      arch = "mac";
+      sha256 = "5de15615b7ef2d142b16c75034227e8810820cc5e810ea3c2030b3dbeee78df6";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/mr/Firefox%20150.0.1.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "8868a5d395347301c55c5f78f697a1bb52de47253b7245589f34fe464c9a1c40";
+      sha256 = "0d71ad1a2ca07f2c7448e81dc7d25fad30ef169eaf075f6053099668308c7ad5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ms/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ms/Firefox%20150.0.1.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "750bc64c2ab827826aed35b6da9cca647399e3294df2cf630f5cc636d5da61bf";
+      sha256 = "f96944452b3dfc3444ce52019aa039716e911c4a7432154bca5a9b6fbbddc0b1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/my/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/my/Firefox%20150.0.1.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "038b6bcbb2721c70cfd33cdf879e83f8e5fb307c7c9cbec8ce907fb6e617730d";
+      sha256 = "8ec34d7c59ceb09a85c44e69339c649874cd0c13d3c3fb0ebc3c7f516f32a8f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/nb-NO/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/nb-NO/Firefox%20150.0.1.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "bc8935903eeea49bd45e8275f03e9e740c592e5a8169dce577dba14c1d1732a1";
+      sha256 = "178fed09b47d686a3f1cc8b49a9aeb0716d3a386cf300b096f6ff1259662677f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ne-NP/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ne-NP/Firefox%20150.0.1.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "811c118292c752ad5fe1d1f253c47ed2d7f25c23d82eaaa4b20d19b5d0ced135";
+      sha256 = "2fad9a1283c1388bc8409ff09ef51d85f35c3e94e93d4f1209eeeac7ee9dd7c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/nl/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/nl/Firefox%20150.0.1.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "41c818ea0b92df3e600c3c645f818645aa2e456f40734663fd9281b0732c4c51";
+      sha256 = "b98841b24abc26bda166f47756c91e18b779ae772dc498d173d0496b07bff636";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/nn-NO/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/nn-NO/Firefox%20150.0.1.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "3184e233f39b648dd7580262ef66591180a92ce9e1596989f195ab5e4e2cda61";
+      sha256 = "fee8e673d778c2f5a31422cc24db010a3eef70a56f0281e794fbfd24b52257e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/oc/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/oc/Firefox%20150.0.1.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "c53ccceb610e24be9130fdbf4f603d7010a9dac35e5d914842ea4f676ddc3e74";
+      sha256 = "e5fc44dad1c91d43fa110370771602e67729a5968d3dea3e8d14733bf6a95eef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/pa-IN/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/pa-IN/Firefox%20150.0.1.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "0b99e9868f1a8881fddc1cba7e22ed997edc2df4d719a3dc5641cbcab0def7ee";
+      sha256 = "7b204e5d1ce67ccc4874b8e3612f21de7b2b38ff211ecbff0d0532fa27569879";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/pl/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/pl/Firefox%20150.0.1.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "02d38b35d439946e1cc06e341b82206a36face5a98d699ef4d525aa43ceb782a";
+      sha256 = "7dfd2b8f893e320ff60f6c841f39cbfd79e55e551f04338bf1cecbb2f2de3163";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/pt-BR/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/pt-BR/Firefox%20150.0.1.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "ee872bc7eccb06694ebb40dac937c56968b25a33d11ffffe9b1792fb304dc4f3";
+      sha256 = "bf3cd9091da8ca07c81bdf40659d9a1ea36513cceb9dad064fb832fdfaba1afd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/pt-PT/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/pt-PT/Firefox%20150.0.1.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "8d44bb2dd36833035935bb29fd2006da070dd61b3017e1db3da950908eeeabfb";
+      sha256 = "4854d3b9fbab99e8665e46471b93c670c479feb72610d6464e6fdc045795bce2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/rm/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/rm/Firefox%20150.0.1.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "ecec9f55bfd0f42466eab33a9dacfa936188e82418a38ad41becf76ec26f4190";
+      sha256 = "73231634123b3c65eac7a58765408b10803f3bcf717feba31113cef3867c65e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ro/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ro/Firefox%20150.0.1.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "e6ca0b18792b55afd20aba6014cd2678fc091d6e772760a2ff14e2d39e1f6ab3";
+      sha256 = "05e53fa5b5e8177c26ee80a1fbda1890b4786ca263112a64059885004021b921";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ru/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ru/Firefox%20150.0.1.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "f009ae9bfd40cb6cf6a52ea952cd63c363acd1133fa80bb2536aff48412709fe";
+      sha256 = "d9ecff067f59b72d09a21424fbb47ac1ea7c5cfa28439dd3dc8de13415d2afb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sat/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sat/Firefox%20150.0.1.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "c6e6eed4908b8ee44d8c9d5726c93b19ed6a4c9d931b4a9caae9de842ff899b3";
+      sha256 = "d2f2e07a1401197ec19e5cebf0e8ee146429acb41287be6c555b7e20e3ac18ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sc/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sc/Firefox%20150.0.1.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "451744f61ac1bfd93fd3faf09f7a7570ee828a70191ab5290717cc28ae1e2c37";
+      sha256 = "af044d75600b326856de2b96df71f5029534614cb3b348cff831c431151d23d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sco/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/scn/Firefox%20150.0.1.dmg";
+      locale = "scn";
+      arch = "mac";
+      sha256 = "f31813be578e7ea4ef71ef4db382491b37dbad190d2d6764514acc5edb20988f";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sco/Firefox%20150.0.1.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "3f7dd6d01c68ca4cae050e44ede5b870341e66e5ff90156ff9ab083edb5605cd";
+      sha256 = "ee43e020caf91f2dfee081ffe041b0931cb8993c6c6d3d9e637001ce98151a76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/si/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/si/Firefox%20150.0.1.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "ddab892764e2019cfe657a794188808f6167bff7c32357a671a057aa0dc63e8e";
+      sha256 = "fe18a56b01250a295e73da07dbd5c4dffcaed63079d24458794c6c318ecc3c71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sk/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sk/Firefox%20150.0.1.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "afccb64c6be439428912bb49f880c3491bd8666cfecd7ad26fcd2d410fdf1a24";
+      sha256 = "836e6fb298c7652775dbde8b326ca9290c17e4d1ccb8882cec7b099a3b991b86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/skr/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/skr/Firefox%20150.0.1.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "e765f6c3844f21111f249a79610837d56237b99419bba3ee17c9b145ec35d396";
+      sha256 = "55f11b8de296808cf29906452074cd077b442fdaf6d6cf83570fbfd9e46a7dab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sl/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sl/Firefox%20150.0.1.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "f621e3fd3e525d52758a4f43537176e740e1fd90207da8eab0215fecb01600d5";
+      sha256 = "47d9b4c35e5e9652f7f89ee23478cabc3f4c0c2e5240692eaa06ea3082d4a5d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/son/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/son/Firefox%20150.0.1.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "b2ae31affc04473ee6174b7cb08d49bda96e968d2918e363ea9c3ecdcdfcc420";
+      sha256 = "cdc6253145b79f98c9565c9480b132d00e3040e734ab6bf05535817b0c32e62b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sq/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sq/Firefox%20150.0.1.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "5d921780265bf24a565fee901b2c41aecedc87ad53f7410dd14265c5cae9fb9f";
+      sha256 = "51a2e17ce3a891ed97ff2c3d33b860594467282e79191c1811d522513e0a2d6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sr/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sr/Firefox%20150.0.1.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "8c867b4e486d8b9753b4201f8a939c31710fc6bb315eacc5a079d89f2626d4ca";
+      sha256 = "230ca74cefa96cfccb1e827ca95dbe0fbb7e691af2f20f0eea6656dafcedf6b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/sv-SE/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/sv-SE/Firefox%20150.0.1.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "c70e230922d4ae6ae8f4ab5e73d4b38a11c74c6fccb14782d58ba19ae1bd5e4f";
+      sha256 = "4a352287203afbf0b48f65178a96c510e4d20e77d82c5e664c7ae4635e380a3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/szl/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/szl/Firefox%20150.0.1.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "3b33c959100bf3856ed18c3985e39fc044376c1eb8d96a8313a3813468810574";
+      sha256 = "8cf05c5f74a0223008c816592cf6409ea564addc30536d3cedaf7ef24d2fe036";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ta/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ta/Firefox%20150.0.1.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "db395f1b99caa216113dbc504a109c4e4b8c59e644d7652c54064aced8bd4735";
+      sha256 = "0e2c1a570b51a36ed18d24872a2956c73cf7efdb1698436bad78aa2f28cabd8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/te/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/te/Firefox%20150.0.1.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "800c86a587c6414d0e102d92dcd2e9e41919c6ce6fccc9a63cf0e02edf72b2d4";
+      sha256 = "2e6d6b13d894096c8b3a9b509954c73fd21781a1d68feaa20915107068a15ccc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/tg/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/tg/Firefox%20150.0.1.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "756a3e76cdba1e34455b7ac3c637020232f7099918b804bce489258d0a621dfe";
+      sha256 = "f4eeacae46aae68850828458e0e86ffca9bfee716735dabf853acb3d8118f571";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/th/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/th/Firefox%20150.0.1.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "dad99883df22810004a23231b3c0bf261742de0ae8300a5a347334c295c59303";
+      sha256 = "8785e060463c7901d96d10bb69383efbd7d288820cccd0b52b24bba2078e9df5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/tl/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/tl/Firefox%20150.0.1.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "afc55a8ec60c36b98d4729a99567af1e9174088c9e886b8c1699395ef94840f4";
+      sha256 = "50bc2996c1a2d0b882b46b0a0ad453ceb514ada7e8f9f17cd4041b3b50ec8e6d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/tr/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/tr/Firefox%20150.0.1.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "567a203a8372b78ee0b8d1a8a2ae38834bd5bc33ff0c75a547dd3d766588c6e3";
+      sha256 = "fbd033e40a0f870d7a471a56c563323ba56d6136a9594176023f307173ce3635";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/trs/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/trs/Firefox%20150.0.1.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "7fbb43a8fc8830a3de6618c36861cd4ae31263df065663be4b3de78720911636";
+      sha256 = "8011f29a2b5e610c040cce3ddb7ed57bd8f9f35a121ff51a9e5c4ae6cc42ec2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/uk/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/uk/Firefox%20150.0.1.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "a1e99a73327e9cc5dc910a85f859d4a8d17ee56db837926195432832936bf338";
+      sha256 = "12dc63014ac7b506ada38021c32fa3f014f3f532c5580df00a521a2e2efd191e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/ur/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/ur/Firefox%20150.0.1.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "dea1ca0d4db9cf690a0fc0cd09e54d61c3348331edb6b53708993ce7c9c33c41";
+      sha256 = "3d7c494e14425a9988816083fda6de822b74bdf13358278c2fda704855a6a23c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/uz/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/uz/Firefox%20150.0.1.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "1a711465583bec0d94dad20da45d3c78b068b117bfa5602e3b69dc9c6da25a96";
+      sha256 = "7d3dcf3ff39d043b700212ab6bcbb10562596fb655b1c1b3949f3d2811159477";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/vi/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/vi/Firefox%20150.0.1.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "22c6a53d890f66b01e47965f9ce9a0db22c71c0d722ad336bcf5dce930a4600d";
+      sha256 = "7335573a841a00ca790854c9fafcf151b813e4d496afec447c23558e5463e2d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/xh/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/wo/Firefox%20150.0.1.dmg";
+      locale = "wo";
+      arch = "mac";
+      sha256 = "0089bf8dcd9bcce824975b6b2d24e17ad6e1881c84248815a99452e8e3e0f24a";
+    }
+    {
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/xh/Firefox%20150.0.1.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "253552c147b314f419c6a7ada0512e357b91b69331f817709d57849d543acffb";
+      sha256 = "138cc152b5c1a87e29840222729b505958a4bb5a65659ddf0cbc3e789d0ad7c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/zh-CN/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/zh-CN/Firefox%20150.0.1.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "858c6f75ed5c40e062dac3267d2e7b559af6f0618206a1f9b3be841bee6f4882";
+      sha256 = "11b9671aca9071f24c22af18d6dc822c6185829818b27fba28f61df1e59d6d4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/150.0/mac/zh-TW/Firefox%20150.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/150.0.1/mac/zh-TW/Firefox%20150.0.1.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "45360816b33a3e30eac95e845e9aa5bcb9f012f19fbae2aca3a8b80b74c2d4ae";
+      sha256 = "7aa5f608da115a55c5589554315710f877c8a289c82e9ff2f460330f9552cfbe";
     }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
index ee0b2849228d..b4261e3197a3 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
@@ -9,11 +9,11 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "140.10.0esr";
+  version = "140.10.1esr";
   applicationName = "Firefox ESR";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "56b274df21d0a908e826af6dda89a42b77fb0f597b75542b0330d448ae22be07a3636a3187ff1b488e466cc8c5264a8a75f79901354a49e35a3e99dcb0852514";
+    sha512 = "aa3481dbdda0a302acefff52007ba2e6927962523408b942a7df673e80618fc381faf1ca70ebaac3760645bf7cb382b85658af49beca705cd636ce9de58349a5";
   };
 
   meta = {
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index 84119d35af4a..2de4bb1ad8d9 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "150.0";
+  version = "150.0.1";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "77e8eae86e7b17c33933fdea6d3b5fbe73e6613949e62c13d9ed3e593e7ba0b50701fa97fc7d56a278961d2e1cdb2902244c30a1020790091b0ae2f0cb1b4e71";
+    sha512 = "b3710e1b35002312bf248e822681039b75ec1196f8d014c88b0377c9b06f34780469152a98ad967440a51a4a0ca45418ba6239438f869ae564cc82c023645179";
   };
 
   meta = {
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
index 9b3f55377731..8382a12f067a 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "helm-dt";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "vmware-labs";
     repo = "distribution-tooling-for-helm";
     tag = "v${version}";
-    hash = "sha256-WBrRVlYruokNKW0fSRd/YESH5Vw+hKFa76R/2ABphr8=";
+    hash = "sha256-+YvYaPTUwRfEYDJ2Mkmgx22loo+Br4m7kcOa7X/5618=";
   };
 
   vendorHash = "sha256-dkE3eYZnaS+kC0kDVxaFW/Ev15TY2MY3m5xgPof7Y18=";
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix
index 07da05cc59c0..3056f1c92f40 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "helm-schema";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "losisin";
     repo = "helm-values-schema-json";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-F4tfPZnvvagWEO25JOjtYPYDn+8k6sRH0k1UvHIQRzg=";
+    hash = "sha256-2u3cJaSxfHcP9cNknWMdmWm0OjeQX1N2SdJcDGi69Ls=";
   };
 
-  vendorHash = "sha256-2HnbASIZqOPM9WOlZeEQKYbkBHXBjV0JaeKKYAAwQ3w=";
+  vendorHash = "sha256-SWzKgQn9s4Nj54s0N6D+onIbpRwXRvJqWVG8LQ31KQA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index cd24ce5ba03c..c6c5f758dfc8 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -393,10 +393,6 @@ buildGoModule (finalAttrs: {
       --replace-fail '"$LDFLAGS $STATIC" -o' \
                 '"$LDFLAGS" -o'
 
-    # Ensure the embedded tarball is reproducible: sort file order and clamp timestamps
-    substituteInPlace scripts/package-cli \
-      --replace-fail 'tar cvf' 'tar c --sort=name --mtime=@0 -vf'
-
     # Add the -e flag to process "errornous" packages. We need to modify this because the upstream
     # build-time version detection doesn't work with a vendor directory.
     substituteInPlace scripts/version.sh \
diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
index e9fc74d92306..ea15ddc99416 100644
--- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kubectl-view-allocations";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "davidB";
     repo = "kubectl-view-allocations";
     tag = version;
-    hash = "sha256-AZsieePjIFY3xXG39tfwSvRcNgLdvEQSKALXgRCkuc4=";
+    hash = "sha256-sqc6BnJCekZwW7A3YGN9OhbJsR1ZTrtRhBiGN+F2ac0=";
   };
 
-  cargoHash = "sha256-0bStmuLFkYsyd7rJlHA7/rXGtlh2CvjXWPnDwoq33v4=";
+  cargoHash = "sha256-7sGw3gK330QsbWEHEkJhegv9TF1tbQyJqPYdYe1PQ7k=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json
deleted file mode 100644
index a9287cab5d3c..000000000000
--- a/pkgs/applications/networking/cluster/rke2/1_32/images-versions.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  "images-calico-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz",
-    "sha256": "b2b1ce6fc213202829513dd99997de7979dc5dd26f4fad8e02918848928ac892"
-  },
-  "images-calico-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst",
-    "sha256": "9aae79e102c20418d184906f5e1e36bb01c6a2c41b7e9405b2a20816d0ec58ff"
-  },
-  "images-calico-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz",
-    "sha256": "52bdb3ebd6f2cbe4fe0a1894dda8f853e33bc31eaee83a352d014f3464168116"
-  },
-  "images-calico-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst",
-    "sha256": "86f6f5cfe607e15eeb7a35522325ccbea56f1d84ca27cd02c626e4356ca54c56"
-  },
-  "images-canal-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz",
-    "sha256": "1fbe1a2c48fcedcec613cee071f0b524f007a191c858952c0c6243c28a292e30"
-  },
-  "images-canal-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst",
-    "sha256": "7e3f80b037079922f6a0aaf5a701459ef550d67ca31119a0c74955254fa52b1e"
-  },
-  "images-canal-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz",
-    "sha256": "1152d6f24c5b955e37300cbfcd68a8c212c1036ce8964e2ffc22422522fa1d83"
-  },
-  "images-canal-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst",
-    "sha256": "50f4d1b1bb03523b922d7ce989d2d83f009d751d7fbf4aa8821fe52c9b9fd96d"
-  },
-  "images-cilium-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz",
-    "sha256": "c28b224620327061bb707c31733c3428a7573e2f905178ddd9d038dec7d00370"
-  },
-  "images-cilium-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst",
-    "sha256": "8db98924c2e9534574bab2584b08467cc1c379e740d345b8bad3768d1bed4c5f"
-  },
-  "images-cilium-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz",
-    "sha256": "b6a8a882c1285687a78add12e4be64c335f13de8975f9bb7c142aadbaa1f10c5"
-  },
-  "images-cilium-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst",
-    "sha256": "7ea32966e4a4fb2ad0c5fae8eece897d22e1a1515ce7d7954f7aa341c6ca51ac"
-  },
-  "images-core-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-amd64.tar.gz",
-    "sha256": "02c940745706a79eedb0b579f2368cdbdf8c54de148f4d8fda70f7ee66d7ecf2"
-  },
-  "images-core-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-amd64.tar.zst",
-    "sha256": "a52feceeb43d21fb8494def190841a046b896c4dfc8e964f3646916f1b20f829"
-  },
-  "images-core-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-arm64.tar.gz",
-    "sha256": "2d2e23a72f23bedee62d2163df68009fc099ae9c3de1aa34c5cbcfa75f1a8e73"
-  },
-  "images-core-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-core.linux-arm64.tar.zst",
-    "sha256": "e872a4ceb854138916c4a283904f658398c6894e2595c348b40f03e1cdcc6f86"
-  },
-  "images-flannel-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz",
-    "sha256": "a3f60044c7da90d4c2dd5cbc44c897ffcc2660bd1d2dcafa8a900bf8ca100589"
-  },
-  "images-flannel-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst",
-    "sha256": "d843630e86003cf4b18a1ef070b44c3a73e1431770244e853eafcecdb714bfa3"
-  },
-  "images-flannel-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz",
-    "sha256": "e4a605d5af2a79bd7901f1678e488f776774916e1c5104090e813bd45a257bc3"
-  },
-  "images-flannel-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst",
-    "sha256": "c94fecb19b6b1eaa347c49fc60def2e1251d866714e9ab05ea6ce29d5da41fb3"
-  },
-  "images-harvester-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz",
-    "sha256": "d0d213e4e6a3931950b5b61f67c9c0163838095f3fb5486e9256902aff397547"
-  },
-  "images-harvester-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst",
-    "sha256": "6a914bba0f07f9f3431058f2b1b2c5ed9d8124069f436bfea747c293b5276dff"
-  },
-  "images-harvester-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz",
-    "sha256": "a133106b2348dcbfa28c7b219a22e6cc7cf399a741196c1a435a211050aba4b5"
-  },
-  "images-harvester-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst",
-    "sha256": "0a28d456de6bdc33b806a236e0732c5bcb8bd01dc0e64e84eb2daee51467dace"
-  },
-  "images-multus-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz",
-    "sha256": "7df59c19b452c971cd5e739042d0cc3146ba061f3e54aeae25794203592e6866"
-  },
-  "images-multus-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst",
-    "sha256": "83c9451a8dfc116bddc38146f2a6eddef95d09348386e2b11c7d5479a114de34"
-  },
-  "images-multus-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz",
-    "sha256": "77a270820a7955fe9bc7b0d2b6b4b6b8b73e6f042ddd9101b89d1cc0a1b95908"
-  },
-  "images-multus-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst",
-    "sha256": "d3eb6dab20944a417d0cbc6eed3a4838c008646a40c3e6b637729f7f9251ff8c"
-  },
-  "images-traefik-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz",
-    "sha256": "24f246a655706dbcfc34fb1fbe055978f79bee25791e3ba8c0239cd370b3630a"
-  },
-  "images-traefik-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst",
-    "sha256": "3b5b1a5016c70cc91676165a21594ce9ddc8866704c54613b98e5360e59a9f30"
-  },
-  "images-traefik-linux-arm64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz",
-    "sha256": "1f553eb44e38ffe20cae2a8297c249b3d46fa1ddee859b5823102077525e2ca7"
-  },
-  "images-traefik-linux-arm64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst",
-    "sha256": "c642a0fece74ba83840a1683159c06ca029012eda63458f42919ca69d14bd724"
-  },
-  "images-vsphere-linux-amd64-tar-gz": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz",
-    "sha256": "a38d2489e69e4e25ecba96c3ecc91d087df4eb0ebb7f7dbffc9a25f3fef9e823"
-  },
-  "images-vsphere-linux-amd64-tar-zst": {
-    "url": "https://github.com/rancher/rke2/releases/download/v1.32.13%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst",
-    "sha256": "768defc1af4754f6a77ac7fda8bf9472764dab3cc82b9b3f8f9622ed17fb311c"
-  }
-}
diff --git a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix b/pkgs/applications/networking/cluster/rke2/1_32/versions.nix
deleted file mode 100644
index fedc30664a4a..000000000000
--- a/pkgs/applications/networking/cluster/rke2/1_32/versions.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  rke2Version = "1.32.13+rke2r1";
-  rke2Commit = "a361386c83e8e581c2634a408bc7e4dd44fdcedc";
-  rke2TarballHash = "sha256-jEr7wTMRUk0dOO50G0+iIKywVlBM5Et//nbt7R2mu/0=";
-  rke2VendorHash = "sha256-rptP0Pb5tgufcXMmtaYaNk/Lyqp1bmlk9upm2amKfno=";
-  k8sImageTag = "v1.32.13-rke2r1-build20260227";
-  etcdVersion = "v3.5.26-k3s1-build20260227";
-  pauseVersion = "3.6";
-  ccmVersion = "v1.32.12-0.20260211145907-0dc662e80238-build20260211";
-  dockerizedVersion = "v1.32.13-rke2r1";
-  helmJobVersion = "v0.9.14-build20260210";
-  imagesVersions = with builtins; fromJSON (readFile ./images-versions.json);
-}
diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix
index 5b3f1ceac55f..a76456652e5d 100644
--- a/pkgs/applications/networking/cluster/rke2/default.nix
+++ b/pkgs/applications/networking/cluster/rke2/default.nix
@@ -5,8 +5,6 @@ let
   extraArgs = removeAttrs args [ "callPackage" ];
 in
 rec {
-  rke2_1_32 = common (import ./1_32/versions.nix) extraArgs;
-
   rke2_1_33 = common (import ./1_33/versions.nix) extraArgs;
 
   rke2_1_34 = common (import ./1_34/versions.nix) extraArgs;
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index b80065202d8d..bf2a8c1e529c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -27,13 +27,13 @@
     "vendorHash": null
   },
   "aiven_aiven": {
-    "hash": "sha256-nh8ZxBPWeH4J8+/E0LppTmzx7WInkJVmt2NluC91OcY=",
+    "hash": "sha256-0f+ZxjMoPyOL4qatcRVk8jjn9TAZkinUX7eYQ1hv+FQ=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.54.0",
+    "rev": "v4.55.2",
     "spdx": "MIT",
-    "vendorHash": "sha256-Ai51lUT782wnua4DIcFkxXCbnSBIhTduUO91zL7LBJY="
+    "vendorHash": "sha256-toCbbqzi0h6hUeyKMClUBcWsh8+H00K0IjdkgZ5HmOs="
   },
   "akamai_akamai": {
     "hash": "sha256-/+IE06obx4Rxzz3uh5QbeS/FhGlK2qTJJFWGAlDWJaw=",
@@ -45,20 +45,20 @@
     "vendorHash": "sha256-qjtyg+b3CfF24us0Fqw1KqKEbuoqL4eLe4QCuIAp4SE="
   },
   "aliyun_alicloud": {
-    "hash": "sha256-pOoFxaAB1x2G89AsnCK7D2q6hTgfMiwE+zfdKZh3bgE=",
+    "hash": "sha256-1CeivnFt+2RaO29JdqUhoHaIh/5K1dGG23Ca/P5fjT8=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.276.0",
+    "rev": "v1.277.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Y/r9gdvPhN27nve+IZyqypZkvCXHE7Ox31JLDQd9l4k="
+    "vendorHash": "sha256-1cvxBtsehwAhF48d/i8qTi6XJxxYMAeq1MAInuUE3Sw="
   },
   "aminueza_minio": {
-    "hash": "sha256-rAdHPVw/G5uO/67yLOohHvO3/KxjyQkIpagKPd0vMOQ=",
+    "hash": "sha256-UvuHbb8aeh1pKFY9VLUdxwYZVYLRVEFCZrL/NrmpnGc=",
     "homepage": "https://registry.terraform.io/providers/aminueza/minio",
     "owner": "aminueza",
     "repo": "terraform-provider-minio",
-    "rev": "v3.32.1",
+    "rev": "v3.33.1",
     "spdx": "AGPL-3.0",
     "vendorHash": "sha256-4Jsi6YkjWakH53Ub/CALDYfL1UC/xWRBvAmJTpHTVtk="
   },
@@ -73,13 +73,13 @@
     "vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw="
   },
   "auth0_auth0": {
-    "hash": "sha256-Ha+2Z0gVNJ7oOozSWmW9XVpwlZo2LpvET03pAvh/3Mo=",
+    "hash": "sha256-4TNKFlWt6Hda/N/H50Aq2IEMGYsLs9R+GG9e9uLQqG4=",
     "homepage": "https://registry.terraform.io/providers/auth0/auth0",
     "owner": "auth0",
     "repo": "terraform-provider-auth0",
-    "rev": "v1.43.0",
+    "rev": "v1.45.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-E6NOuhalQ9bXwRp6UTS5t35K3lOmFr9krGdRWtdtjGI="
+    "vendorHash": "sha256-EyKOxwayr10RbOBDu+8Yp4FILPwCN6yu+VJq6jgeQCo="
   },
   "aviatrixsystems_aviatrix": {
     "hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",
@@ -101,22 +101,22 @@
     "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
   },
   "baidubce_baiducloud": {
-    "hash": "sha256-5OwkxWisWpnPF0wwjmqb3OKBw+a9ypSQUKRSB06EC0I=",
+    "hash": "sha256-Pdtt5XY0XbnEP8qmq0Y2xDS++IGFLBYmfR/BlUDOCbU=",
     "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
     "owner": "baidubce",
     "repo": "terraform-provider-baiducloud",
-    "rev": "v1.22.25",
+    "rev": "v1.23.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "bpg_proxmox": {
-    "hash": "sha256-e7t+9HjE3hz93Mf98KyyxvHxtciaGffoRyGEzDu4Klc=",
+    "hash": "sha256-nQIpxNiWYFHYgmiLjva+3tyOVdjrap35Zmy1nRWwpH4=",
     "homepage": "https://registry.terraform.io/providers/bpg/proxmox",
     "owner": "bpg",
     "repo": "terraform-provider-proxmox",
-    "rev": "v0.103.0",
+    "rev": "v0.104.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-KanMeY1rPgF4SgQbavvocVGTgfaYLDyrc33bHj66+CM="
+    "vendorHash": "sha256-pgFHrO71UGfH/w4Du7ocy437FNtptoDTWHmARQG/5A0="
   },
   "brightbox_brightbox": {
     "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -155,20 +155,20 @@
     "vendorHash": "sha256-SO3CX7pZ+q7ytz/55cxTPlW7ByY1zKhxkQxMiqAvm8o="
   },
   "checkly_checkly": {
-    "hash": "sha256-OCcEGqjpgsfi0hveucRw7I1j6qtqvuB54oxJS8351RY=",
+    "hash": "sha256-S83+rMPCN3Bt5kftmViYS2yUTsZsFtdiAE14WrBu+XA=",
     "homepage": "https://registry.terraform.io/providers/checkly/checkly",
     "owner": "checkly",
     "repo": "terraform-provider-checkly",
-    "rev": "v1.21.1",
+    "rev": "v1.22.0",
     "spdx": null,
-    "vendorHash": "sha256-zmXfPmc+yl3nRf6HS6Hvy73yljau1gF1D9wat+Nw/2I="
+    "vendorHash": "sha256-fY1oLzNYYNmUvOVNCWZlo2pvn2SgGjc4JnMORZdt/ss="
   },
   "ciscodevnet_aci": {
-    "hash": "sha256-MxcHtbuU2tMJpF8seEDqmsnamm58Lugi3Hw+l9wAcOU=",
+    "hash": "sha256-Z3qat3S7dv5kGpc82RxAwlgp3hfscFbkokVsgGnBRHY=",
     "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
     "owner": "CiscoDevNet",
     "repo": "terraform-provider-aci",
-    "rev": "v2.18.0",
+    "rev": "v2.19.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -200,13 +200,13 @@
     "vendorHash": "sha256-sagrygtfsZWQUuIuGTUldZYYR5OhQfpZDxDKZAaIR4Y="
   },
   "cloudflare_cloudflare": {
-    "hash": "sha256-D5Kk6xCz3CQWbGHjLKU/+SPBzCYFQlphCTMG6+LvFek=",
+    "hash": "sha256-2hlL7N6jP7or3l0HczbRhnAmMYJ0XQTXl0f+sIFdlZc=",
     "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
     "owner": "cloudflare",
     "repo": "terraform-provider-cloudflare",
-    "rev": "v5.18.0",
+    "rev": "v5.19.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-8d6cnbdPhfc/9B8JUq1HbReOYBauY6SQf3xKqgK1PeQ="
+    "vendorHash": "sha256-Gkb493fesB/jOdvnQrwt4MrNKO+YlR3+9Mu5TiaG084="
   },
   "cloudfoundry-community_cloudfoundry": {
     "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",
@@ -274,13 +274,13 @@
     "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
   },
   "datadog_datadog": {
-    "hash": "sha256-QAmtZnmdHlKI+lLqBsH6SpshxwpBvAaXWspj/a4vlpI=",
+    "hash": "sha256-HgbGKqQ27GBA2BpiwkkLIvLcNCgh05p6ZNno8cNFUso=",
     "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
     "owner": "DataDog",
     "repo": "terraform-provider-datadog",
-    "rev": "v4.5.0",
+    "rev": "v4.6.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-RVDQ7HeZkSryb6ocZJeEx2iIgw411+SByEopg7Q+b1c="
+    "vendorHash": "sha256-Q4fJbEvV6nvp9mafrOrGnKwyWmNT9CYenAeXND5hKng="
   },
   "datadrivers_nexus": {
     "hash": "sha256-yfxlDln4brI8QTFnhVsNOO3vRiqft3YWytvy2GMNBdY=",
@@ -310,11 +310,11 @@
     "vendorHash": null
   },
   "digitalocean_digitalocean": {
-    "hash": "sha256-FCi8y4m9CwMl/YHvEaK21bwDLdsI/bJCZ0PJ7kWpqBc=",
+    "hash": "sha256-qiXN8ktqhJuN7Sb9XHf5HFaBfJASEpVkE07pAHg80QU=",
     "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
     "owner": "digitalocean",
     "repo": "terraform-provider-digitalocean",
-    "rev": "v2.81.0",
+    "rev": "v2.85.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -400,13 +400,13 @@
     "vendorHash": null
   },
   "fastly_fastly": {
-    "hash": "sha256-2QfgzzWYXPOCMAX2EBodDPVEtcIHHPT4Lbh0W1+q2to=",
+    "hash": "sha256-deph1BQ/aUgTOf4Bgaxpac4V2fmy4dSdbBRa/qvvKdk=",
     "homepage": "https://registry.terraform.io/providers/fastly/fastly",
     "owner": "fastly",
     "repo": "terraform-provider-fastly",
-    "rev": "v9.1.0",
+    "rev": "v9.1.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-E64AMHGFpAhg6UNYHJXAdRWPdWWdZineW/b+Gs2O2jk="
+    "vendorHash": "sha256-lxBvfkuvf1eoprkCuPtYqOw6P7sTzS70VXTYGToazf8="
   },
   "flexibleenginecloud_flexibleengine": {
     "hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=",
@@ -463,22 +463,22 @@
     "vendorHash": "sha256-/8h2bmesnFz3tav3+iDelZSjp1Z9lreexwcw0WdYekA="
   },
   "goharbor_harbor": {
-    "hash": "sha256-+HhtRod8VNOE6KceWIviWDCPvPuLK9/WaKrgT27GUpw=",
+    "hash": "sha256-2mi1QlWPAPGVr/Q0xOQjI8R8baeyJotjjoKZyQYNJg0=",
     "homepage": "https://registry.terraform.io/providers/goharbor/harbor",
     "owner": "goharbor",
     "repo": "terraform-provider-harbor",
-    "rev": "v3.11.5",
+    "rev": "v3.11.6",
     "spdx": "MIT",
-    "vendorHash": "sha256-yOM4JcQxAvYAFPyAFfjJn4FK8pEXF3I55ddMTkijn9c="
+    "vendorHash": "sha256-874QpqIFFhzIGJZ8nKGcUe9qEpR9jQkx4nl75Cpqpww="
   },
   "grafana_grafana": {
-    "hash": "sha256-szkdeprCEbrtZkoNzS6/FlICPsZpB+fgvAovNk8LXLM=",
+    "hash": "sha256-M29iRplTonmxOXeQYAdij+ttfGYiOCLN/v6YvYN9k7w=",
     "homepage": "https://registry.terraform.io/providers/grafana/grafana",
     "owner": "grafana",
     "repo": "terraform-provider-grafana",
-    "rev": "v4.31.0",
+    "rev": "v4.35.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-xcKcXakpjBQCy5JqWsXnDDQeR+53tyRxWeoLkxsStcs="
+    "vendorHash": "sha256-VEAtUCVZ3nJ1jfDYkkek+VQ1LjNQgRstRNtsM05ebZo="
   },
   "gridscale_gridscale": {
     "hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=",
@@ -499,22 +499,22 @@
     "vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug="
   },
   "hashicorp_aws": {
-    "hash": "sha256-EaNOYM4qpWiAsemTOMpFFwJLcrlOxMVgjuECh4KhUsM=",
+    "hash": "sha256-ztoQ8xF42QdVNNBEh1Gcpvs1WjRwNB1RDTbU97sQ5jo=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
     "owner": "hashicorp",
     "repo": "terraform-provider-aws",
-    "rev": "v6.38.0",
+    "rev": "v6.42.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-picwxtQOtsBX8SkA64+ekFNDC7zIpg0CG66kelO2THk="
+    "vendorHash": "sha256-koqH8h1oixv+cH6y9Z5mjgIVGB/XWHSo/UCgQW6bh2U="
   },
   "hashicorp_awscc": {
-    "hash": "sha256-/mQ8GrCbOudqpQ3+xyJccVCVVUkGsnozNHa4Ll/66RI=",
+    "hash": "sha256-SMG66AP5IWbnwUOQBsf0p1WT1ht4a740Z7ltLgyhN2o=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
     "owner": "hashicorp",
     "repo": "terraform-provider-awscc",
-    "rev": "v1.79.0",
+    "rev": "v1.82.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ZhN2ap9U5xp2HNeAE7HmLGce19jVH4Y7GpuqrUtYf40="
+    "vendorHash": "sha256-2muLyg2LPj0broth01BZBysOdZyXaY/QzJWYjxTyKEw="
   },
   "hashicorp_azuread": {
     "hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=",
@@ -526,11 +526,11 @@
     "vendorHash": null
   },
   "hashicorp_azurerm": {
-    "hash": "sha256-dLapX7pWRKR90D19e7DZZki+VTgKLP2n9ADww2CIQg8=",
+    "hash": "sha256-YQV1akoUREn2FHtX+L9DixHo4ghm4wLSrQsAUv1nqaQ=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.69.0",
+    "rev": "v4.70.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -571,22 +571,22 @@
     "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
   },
   "hashicorp_google": {
-    "hash": "sha256-NEPyqlxtpxfpMCygkcN9d/vo/4rwKLJ7qx4WAxgdVPA=",
+    "hash": "sha256-cgIFxWNm42hKPt9J7qzkcIou736dbLX/adX+R4Y5vIY=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v7.28.0",
+    "rev": "v7.29.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-39r9+dFJYJrzL0EOK3vXLcftOSqyw/pR5q+zm2lipYY="
+    "vendorHash": "sha256-mk+fmLdbDBAqwLjQd4xZNW+DK6EDwJYnAMVSSTs2jQM="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-iEAe+eRMRSnsxS8CtmF/vr1PwGcMvhnba/eedx+hS6w=",
+    "hash": "sha256-qiROr5WjyX2CJQ4JyhNeD0pQhhhFf45RBUotRxpjT5c=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.28.0",
+    "rev": "v7.29.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-6AUZpHNEqruuOcnkmEiLe53D+cUf8TmbvEHS0kuHyzU="
+    "vendorHash": "sha256-s6mbjjbQ6VJvZ9Cz//CywP5vF27s5oKHg4GsC0gnYRM="
   },
   "hashicorp_helm": {
     "hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",
@@ -607,13 +607,13 @@
     "vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM="
   },
   "hashicorp_kubernetes": {
-    "hash": "sha256-/piMr4HFTKyZdWPtS9B1NB4TK8v0jtn9PIjHuGRSmtM=",
+    "hash": "sha256-P9ChE8AZa6LqDMOyjAx2COMGmzhCpIsiUJ9uXbTUPwo=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
     "owner": "hashicorp",
     "repo": "terraform-provider-kubernetes",
-    "rev": "v3.0.1",
+    "rev": "v3.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-IDsGPzNsVPIHWEyhfIkaNaPOrhnk/4XI1UsrIPwcq/M="
+    "vendorHash": "sha256-TvtStKCI11frbi1C1d4/f60XXJPUQBzSJIAkjN6LfBQ="
   },
   "hashicorp_local": {
     "hash": "sha256-VYzy+/BniYU++pw9koLWotEJzsIzOjpLX4aRSRupV58=",
@@ -625,13 +625,13 @@
     "vendorHash": "sha256-3qnfKHionSfT2efCl0TcHWFFgrh1bPE6Maqg4MCRq0g="
   },
   "hashicorp_nomad": {
-    "hash": "sha256-lTO1ZLB0N+WLdMDegIP1NcAC++/vsBV7EB5BDxj588I=",
+    "hash": "sha256-O3dtOB+irsUeDq1yXxfqDSyz2jfPXS1UgiL+B4RFsW4=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/nomad",
     "owner": "hashicorp",
     "repo": "terraform-provider-nomad",
-    "rev": "v2.5.2",
+    "rev": "v2.6.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-BG97FSQvb++PX/MBMNazEnbksLmZaOQsOj5QLO8Cbkc="
+    "vendorHash": "sha256-xjOOvg1gUxQHUuIHGR0ltsvIpRAPq4PW0XPYUjIGvpE="
   },
   "hashicorp_null": {
     "hash": "sha256-hPAcFWkeK1vjl1Cg/d7FaZpPhyU3pkU6VBIwxX2gEvA=",
@@ -679,13 +679,13 @@
     "vendorHash": "sha256-OvotUEh+P2b3ngaD/8lVbemnM3lrtwqduPXPjF/bqVA="
   },
   "hashicorp_vault": {
-    "hash": "sha256-e0BcPLQFUjdZPlKAnuxBB3se+MjDSj78KJy5zNlsHKA=",
+    "hash": "sha256-k/S1ez6q70vvnHMfU2aweTFzRnLlYbxUEh4xZumT1mo=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/vault",
     "owner": "hashicorp",
     "repo": "terraform-provider-vault",
-    "rev": "v5.8.0",
+    "rev": "v5.9.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-XBXkDvblC/u3lYq/dfjm38Hw8uGwumz4ZAiG+kJkNUQ="
+    "vendorHash": "sha256-0TJbC7gG5yduWrzp7MN5WWDjsdyL6RqXmOlIDs3OtaU="
   },
   "hashicorp_vsphere": {
     "hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=",
@@ -706,13 +706,13 @@
     "vendorHash": null
   },
   "hetznercloud_hcloud": {
-    "hash": "sha256-7c6sOPLH38D2sJsS9VoFl9LkZ0CNp5bFFyrVzPnXPYs=",
+    "hash": "sha256-KDtsI3AKz4xFFBxiPmjP3nHA4MDbs0ubEZPcG8HtCv0=",
     "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
     "owner": "hetznercloud",
     "repo": "terraform-provider-hcloud",
-    "rev": "v1.60.1",
+    "rev": "v1.61.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-rd7QuDdq7xRMyaQIDyXY1DI2Tt/wy3oXan/nE0HIyT0="
+    "vendorHash": "sha256-4XBSqaUCiYyCeWCFBuguuy/0z/4+UoKfySey4vlvNLk="
   },
   "huaweicloud_huaweicloud": {
     "hash": "sha256-Eg811AwJwuHZ/270+TNh6JskCGRUt0ikk6yShjtVtcU=",
@@ -751,13 +751,13 @@
     "vendorHash": null
   },
   "integrations_github": {
-    "hash": "sha256-tygj+fCzKhipsyXVMtUxjEy/TvIAGFBPYHwlJJulAVI=",
+    "hash": "sha256-lP2z7RTaiLvnKQ2nyyUUOV9KjcLAKBDUyIqi0Lv1mqQ=",
     "homepage": "https://registry.terraform.io/providers/integrations/github",
     "owner": "integrations",
     "repo": "terraform-provider-github",
-    "rev": "v6.11.1",
+    "rev": "v6.12.0",
     "spdx": "MIT",
-    "vendorHash": null
+    "vendorHash": "sha256-qzyV/rgQ79XvoTBRjjIsPFfqAXLROiIAlY7Y/d8SYcM="
   },
   "jfrog_artifactory": {
     "hash": "sha256-BSUOmqHwnDEYojtwTXBWo9oGG2FbgaODUKClZPCaK/I=",
@@ -833,13 +833,13 @@
     "vendorHash": "sha256-SJUlHerlt7Z3g1UJ7QKoCwEYolKL7SZp2O537poje3I="
   },
   "launchdarkly_launchdarkly": {
-    "hash": "sha256-lcemT7kpBlZX35Sb+ujHzSdakBQkUSmYAxTVsJkRW6A=",
+    "hash": "sha256-sFCms2grd7R52ILnRhVubLSEBTaeryS5WBL6+rcTZ/k=",
     "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
     "owner": "launchdarkly",
     "repo": "terraform-provider-launchdarkly",
-    "rev": "v2.27.0",
+    "rev": "v2.28.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-BxMhu2gcRuOlYWgx5ZOUBGdfB28+87SG1T/KAPDyei8="
+    "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM="
   },
   "linode_linode": {
     "hash": "sha256-nrNyOcaC5wKJijfubBBuEBKA6dT6Ajo33MR4P80j29k=",
@@ -923,13 +923,13 @@
     "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
   },
   "mongodb_mongodbatlas": {
-    "hash": "sha256-3zypsyMu7ZlEKtmA2brnc3Gidlkd96v1DG3C4HQLByw=",
+    "hash": "sha256-2qthbblL0yh/SZjZg+49OkLi1EVODQxGWN41xD3AMpQ=",
     "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
     "owner": "mongodb",
     "repo": "terraform-provider-mongodbatlas",
-    "rev": "v2.10.0",
+    "rev": "v2.11.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-cvnxSUCiu6S5lkT9VAyn9K6lmridRb0WZyrrvMv+B48="
+    "vendorHash": "sha256-65I0oFyE9252aRaHvmYhOX8RTyH6UDE3Ude4b/LIkdo="
   },
   "namecheap_namecheap": {
     "hash": "sha256-eV2K3KHTEXEEt1WXwfYfNMK+gLUY0EoHFQg9kLdAI3s=",
@@ -959,13 +959,13 @@
     "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
   },
   "newrelic_newrelic": {
-    "hash": "sha256-W5eEK39KkKOTfZb6KOOTwvRD1nrZkY4FuZt+9Imu9nw=",
+    "hash": "sha256-j4DQRsw7QP7d83HTIchgSVt3CPUCIJ8CKmuMSKr5GaQ=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.84.1",
+    "rev": "v3.85.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-CQVlU/V25pDz5shBpCztA3w/FVfGjLjLDHf7ky9LQHc="
+    "vendorHash": "sha256-zFg0xT6iLBxnM9ysKB/Dmveffp6Ohbj9akgr6lbU8MI="
   },
   "ns1-terraform_ns1": {
     "hash": "sha256-MX/Wd9Lztjn7uwDzJjs4bsSSp0PFzUgsu4jXke9jHL8=",
@@ -995,13 +995,13 @@
     "vendorHash": null
   },
   "nutanix_nutanix": {
-    "hash": "sha256-C24sSIslSPLLh49B2rgc9cTfUUi21HcjmAaEFESVAe0=",
+    "hash": "sha256-4YoF45LqIbEteRG2nftYT67EcuLx3kxxqU6R8KoZ5Xs=",
     "homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
     "owner": "nutanix",
     "repo": "terraform-provider-nutanix",
-    "rev": "v2.4.0",
+    "rev": "v2.4.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ucXmHK7jrahc78nE2cf5p5PPCSNV5DAQ53KM2SfJnjo="
+    "vendorHash": "sha256-/4mktOn7qjWIkpyqeEW4vzY0w0pG+0qx7KRYBkE1IkQ="
   },
   "okta_okta": {
     "hash": "sha256-Ub41ML88NKsMC6q1C67DCBTrG9qD0cBhAkizZdIRRBc=",
@@ -1031,11 +1031,11 @@
     "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
   },
   "opentelekomcloud_opentelekomcloud": {
-    "hash": "sha256-F8V/eLkKJCC5zPfNh0NC6Z6c3aZjnEoXXa+po3I1NDw=",
+    "hash": "sha256-rhufSDVO6Yu5EXwduREFg3dkA/SkjzTyW3rR+Tqivbg=",
     "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
     "owner": "opentelekomcloud",
     "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.63",
+    "rev": "v1.36.64",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-qtH6jjhzGRGaHYKjpJLPWjwRL5PQIyOPvI33BVf4cO4="
   },
@@ -1049,20 +1049,20 @@
     "vendorHash": null
   },
   "oracle_oci": {
-    "hash": "sha256-U4Laml29samuCVGCaLSH/nR/o9jbn8lK/c73OsDeE7c=",
+    "hash": "sha256-xB/wHvFmv14Lz1IR4+n7+l+RbRJCtDqZisLURK9IB4E=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v8.9.0",
+    "rev": "v8.12.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "ovh_ovh": {
-    "hash": "sha256-OYzMG/F4wnsB10WPwNRcRKjbdT469nLMeFusHQfsdm8=",
+    "hash": "sha256-xjSGnukY76k6xalVMBfXikuI2MyXvROVoA91wB8AXnI=",
     "homepage": "https://registry.terraform.io/providers/ovh/ovh",
     "owner": "ovh",
     "repo": "terraform-provider-ovh",
-    "rev": "v2.13.0",
+    "rev": "v2.13.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1076,11 +1076,11 @@
     "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
   },
   "pagerduty_pagerduty": {
-    "hash": "sha256-w5FNU3HYIrplFyyw3V6RpJ6exW83F+u/CRdr9htbuxs=",
+    "hash": "sha256-JEV+nNJjEM7RlQ6RKEawftB/OHaf8vcNHDYKhkUJRw0=",
     "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
     "owner": "PagerDuty",
     "repo": "terraform-provider-pagerduty",
-    "rev": "v3.32.2",
+    "rev": "v3.32.3",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1130,13 +1130,13 @@
     "vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A="
   },
   "rootlyhq_rootly": {
-    "hash": "sha256-OTXTCAeKsDtjtOqM6gP2/D1D5ZNblqf/1VtnZoEYNNI=",
+    "hash": "sha256-eu7GuDGBP0/08Ro7nCkMEjnhzKQ6IBZxyrX+SZr0fAk=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v5.10.0",
+    "rev": "v5.11.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-b4hzgQeuOZ5mruSZGIR9iImiVhmLnFlFSQr1RUTDx8E="
+    "vendorHash": "sha256-l/i6y+IX6xZOzQiFeC3nrW3ZjsxaVLfIyCMOLtnstMY="
   },
   "rundeck_rundeck": {
     "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",
@@ -1166,22 +1166,22 @@
     "vendorHash": "sha256-InCRL4k6v0avmnNja+b6Ozg5+injxa8EmrRHIWrq4Ag="
   },
   "sap_btp": {
-    "hash": "sha256-3UuetY6pIfZ2glG9tZOaF/Xe/MC4Mq0iVUdi8fNaEsQ=",
+    "hash": "sha256-8YQxOUgQkmH7FZFqIbSdR3QfwPcPMIV7fWwnPtfxjbc=",
     "homepage": "https://registry.terraform.io/providers/SAP/btp",
     "owner": "SAP",
     "repo": "terraform-provider-btp",
-    "rev": "v1.21.3",
+    "rev": "v1.22.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-1I2HQwFkbCawi11MJQzhvjvzjUvSzietRV9yCc6JtmI="
+    "vendorHash": "sha256-w/AmSHydCeyp/EURgPY2c/E2LjqAXXCORI53X1hEdxY="
   },
   "scaleway_scaleway": {
-    "hash": "sha256-alsM14F6NbpkO1RVDgHPoIUoakv4PHeObVdwQMwADZA=",
+    "hash": "sha256-daBVjUAmFbi5MlrroyVggXOr3i6dIfG8gT9+P8+GsIg=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.71.0",
+    "rev": "v2.74.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-a6A30IJlS6a6MjWrR/GWx7XCvilvTu9bQurCXWDLjV4="
+    "vendorHash": "sha256-MlhvbUewtVvfqM0aNM9VWmha30hoXLvCG9E3o8dsH4s="
   },
   "scottwinkler_shell": {
     "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
@@ -1247,13 +1247,13 @@
     "vendorHash": "sha256-u3WK/pLsuwySJX6GMNho8ImB+F+XXUPC6h+IQtDrOp8="
   },
   "spotinst_spotinst": {
-    "hash": "sha256-DWMa48u6D9lT6xtcYOQxWyHfMwFvI+iYufKoXgQJmC0=",
+    "hash": "sha256-0Wc+QgEeizydsvtyBdnxgLhpYuBZLMB3JGjmTDXzJY0=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.234.0",
+    "rev": "v1.235.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-iUu/SG4VprmEuYo6e8az5GARJhJWHyvyyJNSapnpWME="
+    "vendorHash": "sha256-odyKlnrYufT5pQsYuGN0hKQeQx7LzTLVNTwde97wyPc="
   },
   "statuscakedev_statuscake": {
     "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=",
@@ -1274,11 +1274,11 @@
     "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
   },
   "sysdiglabs_sysdig": {
-    "hash": "sha256-+rP7HnEF+J5NjwgnYEnFbSBdV/fyq7s2A0Xt4maLy7k=",
+    "hash": "sha256-g1al4OJTbnnOIT6ZsjMhEzB+dXvMrBUzctw+Jh2uFYI=",
     "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
     "owner": "sysdiglabs",
     "repo": "terraform-provider-sysdig",
-    "rev": "v3.7.1",
+    "rev": "v3.7.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="
   },
@@ -1310,11 +1310,11 @@
     "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
   },
   "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-tbXhMSoZ9e3md+M8Vtt/m0oPyCjFpGcJXZw49A/UFwI=",
+    "hash": "sha256-vngfpLrxer7DQN6Gtapfaw1GMUF2/uGC+xcLvhN5pWI=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.88",
+    "rev": "v1.82.89",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1373,13 +1373,13 @@
     "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y="
   },
   "topicusonderwijs_octodns": {
-    "hash": "sha256-ZfQ7OgW0kKfcoBNBe+wDFKL+hlyxyb80LrfArPBjtv4=",
+    "hash": "sha256-gbw0Na3m5X5CjoaXHPREfQIpwzQ9hpa7A3Hn+rwcjEA=",
     "homepage": "https://registry.terraform.io/providers/topicusonderwijs/octodns",
     "owner": "topicusonderwijs",
     "repo": "terraform-provider-octodns",
-    "rev": "v1.1.5",
+    "rev": "v1.2.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-6qQ1k/fCxJGseqU+kjsE29kWYOpzorCeCTldXZo4ukY="
+    "vendorHash": "sha256-da0+/aLNEuMZWD7+zMUGpc1Ch5VKyN+EyO0Mp4mZWv8="
   },
   "trozz_pocketid": {
     "hash": "sha256-/rEdOnAbVM69mA/eP6SlZhk1FZfzrYpej2aO0NUP6E4=",
@@ -1418,13 +1418,13 @@
     "vendorHash": null
   },
   "vancluever_acme": {
-    "hash": "sha256-uYlaJfXerng7VfZt08fwvdBTy9UU6DgD5WGIca36LrA=",
+    "hash": "sha256-8uMCtwldGlGqwyZXV4Q1g+9lHQqa952Sd+mywkt0weo=",
     "homepage": "https://registry.terraform.io/providers/vancluever/acme",
     "owner": "vancluever",
     "repo": "terraform-provider-acme",
-    "rev": "v2.47.0",
+    "rev": "v2.48.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-uXcqb1yTHzERpVtPnu0HCETJyo8BjI/Vw6dVeOyGXys="
+    "vendorHash": "sha256-i6Hw1hCr/LRhGjemGAzhZQYr/LsjBrT5aFVXAHDE85M="
   },
   "venafi_venafi": {
     "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",
@@ -1481,13 +1481,13 @@
     "vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0="
   },
   "vultr_vultr": {
-    "hash": "sha256-/lKhEoRNBsiQ2fTNaDFApSXgQp+jjtp8gLYRsKqzPv8=",
+    "hash": "sha256-gw4Eo4wrBDAycQyN7xGHe/w1VazTSgtIcAlBBrePrgs=",
     "homepage": "https://registry.terraform.io/providers/vultr/vultr",
     "owner": "vultr",
     "repo": "terraform-provider-vultr",
-    "rev": "v2.30.1",
+    "rev": "v2.31.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-JIv3xfK3Pda/Y1IvTHR/Ypi9b51SOA9n3xVtxOkDMMo="
+    "vendorHash": "sha256-bKf0QittBRoEbuz0JvmcyCyus1wPP3pacuYmq2RLV08="
   },
   "wgebis_mailgun": {
     "hash": "sha256-Li4eyqZ6huO5Q+XTcQ+HQCg8IOjhxGU9Z4Uw3TbMdAc=",
@@ -1499,12 +1499,12 @@
     "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
   },
   "yandex-cloud_yandex": {
-    "hash": "sha256-xRpxl65jB4pqMM7pf7SWF7XRvqhgTV3kYWx7sxAQj/A=",
+    "hash": "sha256-EtY2Z/dBtyNvOk8T+iEXduEPiB5IqW/eYA4u7llTYAc=",
     "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
     "owner": "yandex-cloud",
     "repo": "terraform-provider-yandex",
-    "rev": "v0.199.0",
+    "rev": "v0.201.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-76prUN1Qv5sP0tDj5bwnyt6KFl+aeY36wsWhLF4sWE8="
+    "vendorHash": "sha256-Mdyu8GSENgU1+8Lc2iAizZ1tJq2t9Zdh7qRPtwV94XY="
   }
 }
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 23b158b40943..3b1614ecc892 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -200,9 +200,9 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.14.9";
-    hash = "sha256-OvKc+71DxbYgdOs06RkM4doF4OTkY0NI/LR0Wgpr7tA=";
-    vendorHash = "sha256-Ajjh8k2lOKf+BGIk3Vyp8H2unljeOMUN0vXwGjs7ZHc=";
+    version = "1.15.0";
+    hash = "sha256-cKgZFCPLusXXSjcff/PmKGIdSm3wRY1DpduXBRrgcDc=";
+    vendorHash = "sha256-Gv6V5aXqTuQoG1StbD/7Ln2QrLpMsW6fbUJUkyZMkvk=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {
       inherit plugins;
diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
index 87cce491f157..aabb23a155a1 100644
--- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
@@ -1,13 +1,13 @@
 {
   pname,
-  version,
-  src,
+  source,
   meta,
   stdenv,
   binaryName,
   desktopName,
   self,
   lib,
+  fetchurl,
   undmg,
   makeWrapper,
   writeScript,
@@ -33,6 +33,9 @@ let
   ];
   enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
 
+  inherit (source) version;
+  src = fetchurl { inherit (source) url hash; };
+
   disableBreakingUpdates =
     runCommand "disable-breaking-updates.py"
       {
@@ -106,6 +109,7 @@ stdenv.mkDerivation {
   passthru = {
     # make it possible to run disableBreakingUpdates standalone
     inherit disableBreakingUpdates;
+    inherit source;
     updateScript = ./update.py;
 
     tests = {
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 182394149aa8..409078b739ec 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,6 +1,5 @@
 {
   callPackage,
-  fetchurl,
   lib,
   stdenv,
   discord,
@@ -101,13 +100,7 @@ lib.genAttrs [ "discord" "discord-ptb" "discord-canary" "discord-development" ]
   callPackage package (
     args
     // {
-      inherit pname;
-      inherit (source) version;
-
-      src = fetchurl {
-        inherit (source) url hash;
-      };
-
+      inherit pname source;
       meta = meta // {
         mainProgram = args.binaryName;
       };
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index f4616191e3bd..8304d23ce9ce 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -1,12 +1,12 @@
 {
   pname,
-  version,
-  src,
+  source,
   meta,
   binaryName,
   desktopName,
   self,
   autoPatchelfHook,
+  fetchurl,
   makeDesktopItem,
   lib,
   stdenv,
@@ -44,15 +44,18 @@
   libxrender,
   libxtst,
   libxcb,
+  libxkbcommon,
   libxshmfence,
   libgbm,
   nspr,
   nss,
+  openssl_1_1,
   pango,
   systemdLibs,
   libappindicator-gtk3,
   libdbusmenu,
-  writeScript,
+  brotli,
+  writeShellScript,
   pipewire,
   python3,
   runCommand,
@@ -85,6 +88,97 @@ let
   ];
   enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
 
+  # Starting with discord-development 0.0.235, the linux tarball ships only a
+  # small `updater_bootstrap` ELF that downloads the real app at first launch
+  #
+  # That binary always fetches the latest version from Discord's CDN with no way
+  # to pin, making the build impure and the nix version a lie
+  #
+  # Instead we fetch the app directly from the distributions API at build time:
+  # https://updates.discord.com/distributions/app/manifests/latest?channel=...
+  # The host + module distros are brotli-compressed tars on Discord's CDN at
+  # predictable URLs with SHA256 hashes in the manifest
+  isDistro = source.kind == "distro";
+
+  inherit (source) version;
+
+  src =
+    if isDistro then
+      fetchurl { inherit (source.distro) url hash; }
+    else
+      fetchurl { inherit (source) url hash; };
+
+  moduleSrcs = lib.optionalAttrs isDistro (
+    lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules
+  );
+
+  moduleVersions = lib.optionalAttrs isDistro (lib.mapAttrs (_: mod: mod.version) source.modules);
+
+  libPath = lib.makeLibraryPath (
+    [
+      libcxx
+      systemdLibs
+      libpulseaudio
+      libdrm
+      libgbm
+      stdenv.cc.cc
+      alsa-lib
+      atk
+      at-spi2-atk
+      at-spi2-core
+      cairo
+      cups
+      dbus
+      expat
+      fontconfig
+      freetype
+      gdk-pixbuf
+      glib
+      gtk3
+      libglvnd
+      libnotify
+      libx11
+      libxcomposite
+      libunity
+      libuuid
+      libva
+      libxcursor
+      libxdamage
+      libxext
+      libxfixes
+      libxi
+      libxrandr
+      libxrender
+      libxtst
+      nspr
+      nss
+      libxcb
+      libxkbcommon
+      pango
+      pipewire
+      libxscrnsaver
+      libappindicator-gtk3
+      libdbusmenu
+      wayland
+    ]
+    ++ lib.optionals withTTS [ speechd-minimal ]
+  );
+
+  # Symlink native modules from the nix store into the user config dir
+  # where Discord's JS moduleUpdater expects them.
+  stageModules = writeShellScript "discord-stage-modules" ''
+    store_modules="$1"
+    modules_dir="''${XDG_CONFIG_HOME:-$HOME/.config}/${lib.toLower binaryName}/${version}/modules"
+    if [ ! -f "$modules_dir/installed.json" ]; then
+      mkdir -p "$modules_dir"
+      for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do
+        ln -sfn "$store_modules/$m" "$modules_dir/$m"
+      done
+      echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \
+        > "$modules_dir/installed.json"
+    fi
+  '';
+
   disableBreakingUpdates =
     runCommand "disable-breaking-updates.py"
       {
@@ -123,7 +217,8 @@ stdenv.mkDerivation (finalAttrs: {
     libxshmfence
     wrapGAppsHook3
     makeShellWrapper
-  ];
+  ]
+  ++ lib.optionals isDistro [ brotli ];
 
   dontWrapGApps = true;
 
@@ -132,67 +227,59 @@ stdenv.mkDerivation (finalAttrs: {
     libgbm
     nspr
     nss
+  ]
+  # The new distro layout ships prebuilt `.node` modules:
+  # discord_dispatch is linked against openssl 1.1, discord_voice against libpulseaudio
+  ++ lib.optionals isDistro [
+    openssl_1_1
+    libpulseaudio
   ];
 
   strictDeps = true;
 
-  libPath = lib.makeLibraryPath (
-    [
-      libcxx
-      systemdLibs
-      libpulseaudio
-      libdrm
-      libgbm
-      stdenv.cc.cc
-      alsa-lib
-      atk
-      at-spi2-atk
-      at-spi2-core
-      cairo
-      cups
-      dbus
-      expat
-      fontconfig
-      freetype
-      gdk-pixbuf
-      glib
-      gtk3
-      libglvnd
-      libnotify
-      libx11
-      libxcomposite
-      libunity
-      libuuid
-      libva
-      libxcursor
-      libxdamage
-      libxext
-      libxfixes
-      libxi
-      libxrandr
-      libxrender
-      libxtst
-      nspr
-      libxcb
-      pango
-      pipewire
-      libxscrnsaver
-      libappindicator-gtk3
-      libdbusmenu
-      wayland
-    ]
-    ++ lib.optionals withTTS [ speechd-minimal ]
-  );
+  dontUnpack = isDistro;
+
+  inherit libPath;
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/256x256/apps}
-    mv * $out/opt/${binaryName}
+  ''
+  + (
+    if isDistro then
+      ''
+        # Distro layout (currently discord-ptb, discord-canary and discord-development):
+        #
+        # The host distro is a brotli-compressed tar with all files under a `files/`
+        # prefix (the channel binary, libffmpeg.so, resources/, etc). Module distros
+        # follow the same format with module contents under `files/`
+        #
+        # The module directory layout must match what Discord's node runtime
+        # expects: modules/<name>/ (the moduleUpdater extracts zips into
+        # path.join(moduleInstallPath, moduleName) see processUnzipQueue)
 
-    chmod +x $out/opt/${binaryName}/${binaryName}
-    patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
-        $out/opt/${binaryName}/${binaryName}
+        brotli -d < $src | tar xf - --strip-components=1 -C $out/opt/${binaryName}
+        chmod +x $out/opt/${binaryName}/${binaryName}
+
+        # Extract native modules
+        ${lib.concatStringsSep "\n" (
+          lib.mapAttrsToList (name: src: ''
+            mkdir -p $out/opt/${binaryName}/modules/${name}
+            brotli -d < ${src} | tar xf - --strip-components=1 -C $out/opt/${binaryName}/modules/${name}
+          '') moduleSrcs
+        )}
+
+      ''
+    else
+      ''
+        # Tarball layout (stable): the tarball unpacks into a
+        # directory containing the channel binary directly
+        mv * $out/opt/${binaryName}
+        chmod +x $out/opt/${binaryName}/${binaryName}
+      ''
+  )
+  + ''
 
     wrapProgramShell $out/opt/${binaryName}/${binaryName} \
         "''${gappsWrapperArgs[@]}" \
@@ -205,6 +292,7 @@ stdenv.mkDerivation (finalAttrs: {
         --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
         --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName} \
         ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \
+        ${lib.strings.optionalString isDistro ''--run "${stageModules} $out/opt/${binaryName}/modules"''} \
         --add-flags ${lib.escapeShellArg commandLineArgs}
 
     ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
@@ -258,6 +346,8 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     # make it possible to run disableBreakingUpdates standalone
     inherit disableBreakingUpdates;
+    # Exposed so reviewers can inspect which distro modules are pinned
+    inherit source moduleVersions;
     updateScript = ./update.py;
 
     tests = {
diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json
index 63eca3c991a1..2ca81a052f0e 100644
--- a/pkgs/applications/networking/instant-messengers/discord/sources.json
+++ b/pkgs/applications/networking/instant-messengers/discord/sources.json
@@ -1,42 +1,242 @@
 {
   "linux-canary": {
-    "hash": "sha256-wTAmrtGcJpI/DIrLQu/++WuVzMr9EcJs+AIFkAilFvk=",
-    "url": "https://canary.dl2.discordapp.net/apps/linux/0.0.927/discord-canary-0.0.927.tar.gz",
-    "version": "0.0.927"
+    "distro": {
+      "hash": "sha256-4xA+Kh6UiwtoUt5A2kPI5rcbSEc/SoZzJbwFdjMNVpE=",
+      "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/full.distro"
+    },
+    "kind": "distro",
+    "modules": {
+      "discord_cloudsync": {
+        "hash": "sha256-3dcVKm/Sz9bqhEm8xVMtRcWrU6JWtv2Dh8oz/3K489E=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_cloudsync/1/full.distro",
+        "version": 1
+      },
+      "discord_desktop_core": {
+        "hash": "sha256-7zcFkh3f9BVjHlevCkZXUFNdeLCkM2+sysuSUyPcQlA=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_desktop_core/1/full.distro",
+        "version": 1
+      },
+      "discord_dispatch": {
+        "hash": "sha256-TD1vWHt4y3xkAEc/BV2HZe3tNdP0PTZsXhVeeHvRAU4=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_dispatch/1/full.distro",
+        "version": 1
+      },
+      "discord_erlpack": {
+        "hash": "sha256-nv6kKT+ZWfwkH4BvOWtjF8VZoznzYRN0hK8kiTbcX/I=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_erlpack/1/full.distro",
+        "version": 1
+      },
+      "discord_game_utils": {
+        "hash": "sha256-Ru8zXxDGwHrpMnnraAVR0Z7jRA4PRLHX7pBz8jctar8=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_game_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_krisp": {
+        "hash": "sha256-zkhTv+8qzyrZBHpZeCzJX6z8HCK0M4Jt6Kr+InbVT80=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_krisp/1/full.distro",
+        "version": 1
+      },
+      "discord_modules": {
+        "hash": "sha256-j5UE4ZugIF4HTsOgxK3Dfp0WP3Sya1fbDjERxGu2qSM=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_modules/1/full.distro",
+        "version": 1
+      },
+      "discord_rpc": {
+        "hash": "sha256-HaUt+G05Im2uNkUB9Ry1c6X/iadc7xLrcEgJCVgpgsY=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_rpc/1/full.distro",
+        "version": 1
+      },
+      "discord_spellcheck": {
+        "hash": "sha256-8cOwisLqnxGsbqPYStBAaKEaALIM0M5d3RPLtoHxClw=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_spellcheck/1/full.distro",
+        "version": 1
+      },
+      "discord_utils": {
+        "hash": "sha256-hfQu3fT9ON0j8xEAwCRY7/ALYYq/a70W/8HeT3KhZF0=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_voice": {
+        "hash": "sha256-JJXt5wHat6AtxW1GIzsPnMHJPzX1DlPgB3kDcg9Bnts=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_voice/1/full.distro",
+        "version": 1
+      },
+      "discord_zstd": {
+        "hash": "sha256-PMlqdAI44AngVh75Eq66zHLEoJkI0262FcFUffPykCk=",
+        "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_zstd/1/full.distro",
+        "version": 1
+      }
+    },
+    "version": "1.0.962"
   },
   "linux-development": {
-    "hash": "sha256-Xe5PjHDWXU+eIAcBID34gjuADmAl1JAQLmXUAi/p4tg=",
-    "url": "https://development.dl2.discordapp.net/apps/linux/0.0.99/discord-development-0.0.99.tar.gz",
-    "version": "0.0.99"
+    "distro": {
+      "hash": "sha256-6MLiRO2GYXkBRQjzOwmKHVqMqGsVjk0E3ocvdYyg8qs=",
+      "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/full.distro"
+    },
+    "kind": "distro",
+    "modules": {
+      "discord_cloudsync": {
+        "hash": "sha256-6yEFPNHqs5Mk+1V2x4R/ZwFgwb2Z+O9iOrX78/G3ynM=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_cloudsync/1/full.distro",
+        "version": 1
+      },
+      "discord_desktop_core": {
+        "hash": "sha256-Z82Y9I4brUOvGiZhgL5V+wXRFfDH/XazWJG3OMYyo3s=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_desktop_core/1/full.distro",
+        "version": 1
+      },
+      "discord_dispatch": {
+        "hash": "sha256-MTjgc8SfL7i4O+QkYQu0Os04iAM1x85AAZxuooI5Oog=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_dispatch/1/full.distro",
+        "version": 1
+      },
+      "discord_erlpack": {
+        "hash": "sha256-JQAgkIpev2+1dlfPW/bg/Iek/cL3+V92IpZIa8e+Fp8=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_erlpack/1/full.distro",
+        "version": 1
+      },
+      "discord_game_utils": {
+        "hash": "sha256-ixKdUlXhDVmk3P41gFixSpPJCMnd3c/yLQF1J7DYI+M=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_game_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_krisp": {
+        "hash": "sha256-UJmBXQm0SXbCOjtJN72BZJCViULhpJgc0rgqDrhhNR0=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_krisp/1/full.distro",
+        "version": 1
+      },
+      "discord_modules": {
+        "hash": "sha256-+TH9x91upIuX9nwvpF9pX4w58YRqu6+hbF1RSyiykdM=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_modules/1/full.distro",
+        "version": 1
+      },
+      "discord_rpc": {
+        "hash": "sha256-cGK1qN8jUiw2l9KNbb7eucWWPw191AHzh/4C6T8gI44=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_rpc/1/full.distro",
+        "version": 1
+      },
+      "discord_spellcheck": {
+        "hash": "sha256-b/X24WJi2Mi0x7Ynqphmtr6FSYUMSR9dDPPUF/k/TN8=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_spellcheck/1/full.distro",
+        "version": 1
+      },
+      "discord_utils": {
+        "hash": "sha256-+dslIrgHH5r7sz95Ixb+5DDOQA8PEr4BcqkJTchf3WQ=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_voice": {
+        "hash": "sha256-7rg5Ct/BPJaOak0HOeTuYMbfdhHBvI4qML1nnYzZ+IE=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_voice/1/full.distro",
+        "version": 1
+      },
+      "discord_zstd": {
+        "hash": "sha256-XKJNd/9l3PJX1GTHT0hvsB9pqI6oDkAvay2L3bOIk/0=",
+        "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_zstd/1/full.distro",
+        "version": 1
+      }
+    },
+    "version": "1.0.976"
   },
   "linux-ptb": {
-    "hash": "sha256-vnzEamdX8pCzFtYLoWHvxcznHD1FCcgKnwQOx8BkWu0=",
-    "url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.183/discord-ptb-0.0.183.tar.gz",
-    "version": "0.0.183"
+    "distro": {
+      "hash": "sha256-dVLGOL//a1mCw0NyekrCemfu9u7pA9t1+UnQ8zmMCwI=",
+      "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/full.distro"
+    },
+    "kind": "distro",
+    "modules": {
+      "discord_cloudsync": {
+        "hash": "sha256-cLqmwjFWUnRnBY3iEqpyv2mtuHI4TanGxbI1cT4V9Ic=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_cloudsync/1/full.distro",
+        "version": 1
+      },
+      "discord_desktop_core": {
+        "hash": "sha256-UmAYyAVVwVZINIobQejXSEK01C/oQJBjxBQ1p45AMOg=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_desktop_core/1/full.distro",
+        "version": 1
+      },
+      "discord_dispatch": {
+        "hash": "sha256-/WfqrWgqCXSUodMqlhgiHTQAiRSfg1dfA4c3CxKZuJk=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_dispatch/1/full.distro",
+        "version": 1
+      },
+      "discord_erlpack": {
+        "hash": "sha256-MXBUoaeC1Refb80mqyZQ6vE8lRV04K5yZbhHMN5XuTY=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_erlpack/1/full.distro",
+        "version": 1
+      },
+      "discord_game_utils": {
+        "hash": "sha256-P4s5/5aeLjzaD0HwHlpHCWaiVlsq+TFlfEqfCym4rH0=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_game_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_krisp": {
+        "hash": "sha256-hwLHumM78aJv/OSX1LAxqpUGZmiVWGg2Sc6SmOdg+Oc=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_krisp/1/full.distro",
+        "version": 1
+      },
+      "discord_modules": {
+        "hash": "sha256-UGS9Znl5QWiQ5nG2I2GxUmQ3sRaaXcCyPPzh3AjAyQA=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_modules/1/full.distro",
+        "version": 1
+      },
+      "discord_rpc": {
+        "hash": "sha256-izqFS9ePjv+4VTqrrnwdlNCdpQik5Y7D3pmznP74ULA=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_rpc/1/full.distro",
+        "version": 1
+      },
+      "discord_spellcheck": {
+        "hash": "sha256-ykwur5DajvoAvNyhTb3wbtduv2NgLhrEEKKI2O/CqC8=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_spellcheck/1/full.distro",
+        "version": 1
+      },
+      "discord_utils": {
+        "hash": "sha256-HKHbGqYK8AyJu+PnVaZIv+HJr6pc6LtnnXI29rSFPmI=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_utils/1/full.distro",
+        "version": 1
+      },
+      "discord_voice": {
+        "hash": "sha256-HL/eZQpc0r+5N7LBFZdUVZWQT4nUtX3gBZlOPR1pLfs=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_voice/1/full.distro",
+        "version": 1
+      },
+      "discord_zstd": {
+        "hash": "sha256-P/8cVdak4Sz7SfHzi8DJPgZi9LRu6FWWI9hjoe8LY8o=",
+        "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_zstd/1/full.distro",
+        "version": 1
+      }
+    },
+    "version": "1.0.188"
   },
   "linux-stable": {
-    "hash": "sha256-FMIM/CWPk3Kcqp8iIg+gxiCpjD2DNk7dSBqnCBvzn5w=",
-    "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.130/discord-0.0.130.tar.gz",
-    "version": "0.0.130"
+    "hash": "sha256-N4gdcj8LYiXxvkbZhZyiWr375vaXt6JnwcoqLOKMsGg=",
+    "kind": "legacy",
+    "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.134/discord-0.0.134.tar.gz",
+    "version": "0.0.134"
   },
   "osx-canary": {
-    "hash": "sha256-9bknJCpZv07BaF5v0g7t+YrGR3+HsYCHl4gjduQsABo=",
-    "url": "https://canary.dl2.discordapp.net/apps/osx/0.0.1040/DiscordCanary.dmg",
-    "version": "0.0.1040"
+    "hash": "sha256-tR52aLUTW5iLzOQnXVS6muqsu44rXplHeXNKsR3u4Sw=",
+    "kind": "legacy",
+    "url": "https://canary.dl2.discordapp.net/apps/osx/0.0.1088/DiscordCanary.dmg",
+    "version": "0.0.1088"
   },
   "osx-development": {
-    "hash": "sha256-dCRl0gpxFdnEa81sSymj8Te0+KmmI9uXsmCXSY1EeNw=",
-    "url": "https://development.dl2.discordapp.net/apps/osx/0.0.119/DiscordDevelopment.dmg",
-    "version": "0.0.119"
+    "hash": "sha256-gyZ2H9dsGYRlkPtRSE7hwRfFl6sr4pK2kB6Jq/51dhE=",
+    "kind": "legacy",
+    "url": "https://development.dl2.discordapp.net/apps/osx/1.0.982/DiscordDevelopment.dmg",
+    "version": "1.0.982"
   },
   "osx-ptb": {
-    "hash": "sha256-SV6ZdD0CCnNNkSWyIDqCmg9dpdQr4JLbrD3+k8943PQ=",
-    "url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.226/DiscordPTB.dmg",
-    "version": "0.0.226"
+    "hash": "sha256-WlygpcUv+CrmQdZyZ0t3EEb58oopHetbKQbKsLUdI1w=",
+    "kind": "legacy",
+    "url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.231/DiscordPTB.dmg",
+    "version": "0.0.231"
   },
   "osx-stable": {
-    "hash": "sha256-vBadXUHrYhvkqzkCvGnKf25A19TKcFs5D0tzC54E0Hk=",
-    "url": "https://stable.dl2.discordapp.net/apps/osx/0.0.382/Discord.dmg",
-    "version": "0.0.382"
+    "hash": "sha256-H+Odwt2Ry3C1+OMhVdr9PjAXOnI8vmsUkSBL8dieakc=",
+    "kind": "legacy",
+    "url": "https://stable.dl2.discordapp.net/apps/osx/0.0.387/Discord.dmg",
+    "version": "0.0.387"
   }
 }
diff --git a/pkgs/applications/networking/instant-messengers/discord/update.py b/pkgs/applications/networking/instant-messengers/discord/update.py
index d2577eab8c91..49f90ca9e1c5 100755
--- a/pkgs/applications/networking/instant-messengers/discord/update.py
+++ b/pkgs/applications/networking/instant-messengers/discord/update.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i python3 -p python3
 
+from dataclasses import asdict, dataclass, field
 from enum import StrEnum
-from typing import List, Tuple
+from typing import List
 from subprocess import PIPE, Popen
 import json
 import urllib.request
@@ -33,18 +34,35 @@ class Branch(StrEnum):
     DEVELOPMENT = "development"
 
 
-Variant = Tuple[Platform, Branch]
+class Kind(StrEnum):
+    # Single tarball or dmg fetched via discord.com/api/download redirect
+    LEGACY = "legacy"
+    # Brotli-compressed host + module distros from the distributions API
+    DISTRO = "distro"
+
+
+@dataclass(frozen=True)
+class Variant:
+    platform: Platform
+    branch: Branch
+    kind: Kind
+
+
+# The distributions API rejects requests that don't send a Discord-Updater
+# User-Agent, so we can't identify ourselves as Nixpkgs here
+DISTRO_USER_AGENT = "Discord-Updater/1"
 
 
 def serialize_variant(variant: Variant) -> str:
-    platform, branch = variant
-    return f"{platform}-{branch}"
+    return f"{variant.platform}-{variant.branch}"
 
 
 def url_for_variant(variant: Variant) -> str:
-    platform, branch = variant
+    return f"https://discord.com/api/download/{variant.branch.value}?platform={variant.platform.value}&format={variant.platform.format_type()}"
 
-    return f"https://discord.com/api/download/{branch.value}?platform={platform.value}&format={platform.format_type()}"
+
+def distro_manifest_url_for_variant(variant: Variant) -> str:
+    return f"https://updates.discord.com/distributions/app/manifests/latest?channel={variant.branch.value}&platform={variant.platform.value}&arch=x64"
 
 
 def fetch_redirect_url(url: str) -> str:
@@ -75,31 +93,94 @@ def prefetch(url: str) -> str:
     return sri_hash
 
 
+@dataclass
+class LegacySource:
+    version: str
+    url: str
+    hash: str
+    kind: Kind = Kind.LEGACY
+
+
+@dataclass
+class DistroRef:
+    url: str
+    hash: str
+
+
+@dataclass
+class DistroModule:
+    version: int
+    url: str
+    hash: str
+
+
+@dataclass
+class DistroSource:
+    version: str
+    distro: DistroRef
+    modules: dict[str, DistroModule] = field(default_factory=dict)
+    kind: Kind = Kind.DISTRO
+
+
+def fetch_distro_manifest(variant: Variant) -> dict:
+    url = distro_manifest_url_for_variant(variant)
+    req = urllib.request.Request(url, headers={"User-Agent": DISTRO_USER_AGENT})
+    with urllib.request.urlopen(req) as response:
+        return json.loads(response.read())
+
+
+def version_triple_to_str(triple: list) -> str:
+    return ".".join(str(x) for x in triple)
+
+
+def fetch_distro_source(variant: Variant) -> DistroSource:
+    manifest = fetch_distro_manifest(variant)
+
+    distro_url = manifest["full"]["url"]
+    modules = {
+        name: DistroModule(
+            version=mod["full"]["module_version"],
+            url=mod["full"]["url"],
+            hash=prefetch(mod["full"]["url"]),
+        )
+        for name, mod in manifest["modules"].items()
+    }
+
+    return DistroSource(
+        version=version_triple_to_str(manifest["full"]["host_version"]),
+        distro=DistroRef(url=distro_url, hash=prefetch(distro_url)),
+        modules=modules,
+    )
+
+
+def fetch_legacy_source(variant: Variant) -> LegacySource:
+    url = fetch_redirect_url(url_for_variant(variant))
+    return LegacySource(
+        version=version_from_url(url),
+        url=url,
+        hash=prefetch(url),
+    )
+
+
 def main():
     variants: List[Variant] = [
-        (Platform.LINUX, Branch.STABLE),
-        (Platform.LINUX, Branch.PTB),
-        (Platform.LINUX, Branch.CANARY),
-        (Platform.LINUX, Branch.DEVELOPMENT),
-        (Platform.MACOS, Branch.STABLE),
-        (Platform.MACOS, Branch.PTB),
-        (Platform.MACOS, Branch.CANARY),
-        (Platform.MACOS, Branch.DEVELOPMENT),
+        Variant(Platform.LINUX, Branch.STABLE, Kind.LEGACY),
+        Variant(Platform.LINUX, Branch.PTB, Kind.DISTRO),
+        Variant(Platform.LINUX, Branch.CANARY, Kind.DISTRO),
+        Variant(Platform.LINUX, Branch.DEVELOPMENT, Kind.DISTRO),
+        Variant(Platform.MACOS, Branch.STABLE, Kind.LEGACY),
+        Variant(Platform.MACOS, Branch.PTB, Kind.LEGACY),
+        Variant(Platform.MACOS, Branch.CANARY, Kind.LEGACY),
+        Variant(Platform.MACOS, Branch.DEVELOPMENT, Kind.LEGACY),
     ]
 
     sources = {}
 
     for v in variants:
-        url = url_for_variant(v)
-        url = fetch_redirect_url(url)
-        version = version_from_url(url)
-        sri_hash = prefetch(url)
-
-        sources[serialize_variant(v)] = {
-            "url": url,
-            "version": version,
-            "hash": sri_hash,
-        }
+        source = (
+            fetch_distro_source(v) if v.kind == Kind.DISTRO else fetch_legacy_source(v)
+        )
+        sources[serialize_variant(v)] = asdict(source)
 
     with open(os.path.join(os.path.dirname(__file__), "sources.json"), "w") as f:
         json.dump(sources, f, indent=2, sort_keys=True)
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
deleted file mode 100644
index 3b6d1ddab889..000000000000
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  qtbase,
-  wrapQtAppsHook,
-  qtmultimedia,
-  qtx11extras,
-  qttools,
-  qtwebengine,
-  libidn,
-  qca-qt5,
-  libxscrnsaver,
-  hunspell,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "psi";
-  version = "1.5";
-  src = fetchFromGitHub {
-    owner = "psi-im";
-    repo = "psi";
-    rev = version;
-    sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM=";
-    fetchSubmodules = true;
-  };
-  patches = [
-    ./fix-cmake-hunspell-1.7.patch
-  ];
-  nativeBuildInputs = [
-    cmake
-    qttools
-    wrapQtAppsHook
-  ];
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    qtx11extras
-    qtwebengine
-    libidn
-    qca-qt5
-    libxscrnsaver
-    hunspell
-  ];
-
-  meta = {
-    homepage = "https://psi-im.org";
-    description = "XMPP (Jabber) client";
-    mainProgram = "psi";
-    maintainers = [ lib.maintainers.raskin ];
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch b/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch
deleted file mode 100644
index 7d5711a6f2bc..000000000000
--- a/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cmake/modules/FindHunspell.cmake b/cmake/modules/FindHunspell.cmake
-index a2d180b3..3a5aef3a 100644
---- a/cmake/modules/FindHunspell.cmake
-+++ b/cmake/modules/FindHunspell.cmake
-@@ -64,6 +64,7 @@ set(HUNSPELL_NAMES
- 	hunspell-1.4
- 	hunspell-1.5
- 	hunspell-1.6
-+	hunspell-1.7
- 	libhunspell${d}
- )
- find_library(
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
index 4bf284d1c750..73038a5e3242 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation {
   pname = "tg_owt";
-  version = "0-unstable-2026-03-09";
+  version = "0-unstable-2026-04-09";
 
   src = fetchFromGitHub {
     owner = "desktop-app";
     repo = "tg_owt";
-    rev = "26068e29bfa8d74a9dc9c8f7f94172fafbc262b8";
-    hash = "sha256-/9uJMm54LC9ZeDwmursdyGeR81vBVTpjGdRUTOX0gV0=";
+    rev = "89df288dd6ba5b2ec95b3c5eaf1e7e0c3a870fc4";
+    hash = "sha256-wdO3AACCEN3IDYWt5a+f7zrcPFoqz+c7vLpo6LZk29w=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index e1c442e386bf..b554349eeef3 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -15,7 +15,7 @@
   qtwayland,
   kcoreaddons,
   lz4,
-  xxHash,
+  xxhash,
   ffmpeg_6,
   protobuf,
   openal-soft,
@@ -45,14 +45,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop-unwrapped";
-  version = "6.7.5";
+  version = "6.7.6";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-HsXNTZY/+Xz7pIT7durOd5T/u7jML0rVBOPb4pnIXow=";
+    hash = "sha256-TGI1SLtzjjDaodQc+JIVRRiwCy9PCO3MuPfv2DpDFxo=";
   };
 
   nativeBuildInputs = [
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     qtbase
     qtsvg
     lz4
-    xxHash
+    xxhash
     ffmpeg_6
     openal-soft
     minizip-ng
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
deleted file mode 100644
index 402a40df3100..000000000000
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  qtbase,
-  qttools,
-  qtx11extras,
-  qtmultimedia,
-  qtwebkit,
-  wrapQtAppsHook,
-  cmake,
-  openssl,
-  xorgproto,
-  libx11,
-  libxscrnsaver,
-  xz,
-  zlib,
-}:
-stdenv.mkDerivation {
-  pname = "vacuum-im";
-  version = "unstable-2021-12-09";
-
-  src = fetchFromGitHub {
-    owner = "Vacuum-IM";
-    repo = "vacuum-im";
-    rev = "0abd5e11dd3e2538b8c47f5a06febedf73ae99ee";
-    sha256 = "0l9pln07zz874m1r6wnpc9vcdbpgvjdsy49cjjilc6s4p4b2c812";
-  };
-
-  nativeBuildInputs = [
-    wrapQtAppsHook
-    cmake
-  ];
-  buildInputs = [
-    qtbase
-    qttools
-    qtx11extras
-    qtmultimedia
-    qtwebkit
-    openssl
-    xorgproto
-    libx11
-    libxscrnsaver
-    xz
-    zlib
-  ];
-
-  meta = {
-    description = "XMPP client fully composed of plugins";
-    maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3;
-    homepage = "http://www.vacuum-im.org";
-  };
-}
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 12e20aba7899..54403b0ea321 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -1,5 +1,4 @@
 {
-  fetchpatch,
   fetchurl,
   lib,
   stdenv,
@@ -214,7 +213,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Mail indexer";
     homepage = "https://notmuchmail.org/";
-    changelog = "https://git.notmuchmail.org/git?p=notmuch;a=blob_plain;f=NEWS;hb=${finalAttrs.version}";
+    changelog = "https://notmuchmail.org/news/release-${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       flokli
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
index d5e7cc48d25e..55a621a3660f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "140.9.1esr";
+  version = "140.10.0esr";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/af/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/af/thunderbird-140.10.0esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "e4849ac86a43a16767466c359d76e01a4205293b91b33bc97533fd4d0dd7fccd";
+      sha256 = "5df489abe5c51ddfbca015d7accab8addf0ace36861c299b614dcf1d8c3b3ad4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ar/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/ar/thunderbird-140.10.0esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "59e398ced89144ad747884410e4e87c960edd0d4f87322aec6448167cfc559e6";
+      sha256 = "329794b5d518aa9e6fe7f0d3eaf4690e32de1416dabc298cd49ba66697666199";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ast/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/ast/thunderbird-140.10.0esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "845e4c6f6b38fcf5e85fb4a892eb116cc21c9850c4b1d73305e46a2338529eb4";
+      sha256 = "d96d4d6d92e7b47ede3fc3927134d02875c78168c03aacb1b8b6b94e10fac05e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/be/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/be/thunderbird-140.10.0esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "82f4471a430bf2e417917140fb8d0df72a0c48e6a6b709371d15f9ca50740279";
+      sha256 = "47bdb112d8fe11f0e8065584b7c216fbffc9c718151de868444c281a44e8f83c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/bg/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/bg/thunderbird-140.10.0esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "d58fd52a1bee8215b18dcd7179d9e347643676b76c4cd20158c9a26e54417f3a";
+      sha256 = "a07ba7f829f3c23dcd18bdba6525113154e3510562e77de75f0d35cb3f9cc3d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/br/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/br/thunderbird-140.10.0esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "fc482fa9cd23d192ce4df45b058b7a4ebe0543f79840f873953648754a98ce16";
+      sha256 = "1f1ab726d3985126452d4def85f30f7200d7b78c8be5d9a20880befd7915ad26";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ca/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/ca/thunderbird-140.10.0esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "bdfc1d79d23c3517896f72b2450775c5f62f00998d6261ad55feec400c93a1ff";
+      sha256 = "15f3652fc92c2e235d0aa9e91f276ad604f8a75e99fe8f692ee29687fd076f2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/cak/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/cak/thunderbird-140.10.0esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "9736e0490adf9f10641dfae095e965590b4a972ea4721ef53a7bc89be6080f9f";
+      sha256 = "191d7e387fb94847a63b0da8d2f4f1dd99003ad3661c761d79a58e407995760b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/cs/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/cs/thunderbird-140.10.0esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "a0fcd0dca794bf55adc29d13c4d27aa6e84b16a1a20ce4a7c09d953fcafae7d0";
+      sha256 = "23dd821746f866f7325b0a6405a392d7ec8a20ecb49e2f170325dd7f21342749";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/cy/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/cy/thunderbird-140.10.0esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "d128f64c0aa9dd14233b17061cbbb6ad51eb9aee94768036fa2394659f3c5fe8";
+      sha256 = "c892dbeae3824f29baf9a0710104803d6b9fb9366343b2516b4473a40f4553eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/da/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/da/thunderbird-140.10.0esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "d835fb9ba5e754a90e593141d386009d4edffc08f5539ea574546a913642c37b";
+      sha256 = "fbdc75846ec14ed627b0c1a0728706d81d5446d9ac74bed877d63277c0108ac7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/de/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/de/thunderbird-140.10.0esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "a04ef2eabeb6bd0a75f6ffa1ee05358558def1d7fb7ac5f6ab4b042a544e7403";
+      sha256 = "4ace3de5e6593527e376b2e8cbe744cdd1dd0af436e60ba3fb5cc51d3e90d617";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/dsb/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/dsb/thunderbird-140.10.0esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "1258e80190db4df8cb1ce33160ca3e36833ca8529781186742dafd4bd9685567";
+      sha256 = "ce01b2489bd975fc450ab6e20817097408245363b087017ddc2b955bf5c1f9ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/el/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/el/thunderbird-140.10.0esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "feee2a84265a9062d2777665058e1771997af807e1ac9b418006eca38052d879";
+      sha256 = "aadeb7484533ea81db273aca9bafb88d59ab94b053ce8ac99e4beebbe3e1dada";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/en-CA/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/en-CA/thunderbird-140.10.0esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "98d5a6ebfba12c196f7ee206e4057f27053105a435b332987079562bae69d31e";
+      sha256 = "fdc47c5d33143b0d6de6084c1ce86dd197ca956c3b3676946ebde1b990e654a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/en-GB/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/en-GB/thunderbird-140.10.0esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "fac99db3d90ddee69b55582707d419a2f799179253a9974a44d0742e936690c6";
+      sha256 = "5adfc7d35fe10f87ee7a60f84eb61e953d407b4837559e495ef5cb7ad0cb73ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/en-US/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/en-US/thunderbird-140.10.0esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "9144a38830c47b61fe17e5941ccc148eaae90addc51ecab37ae3ed8834c4bc99";
+      sha256 = "bb7f43d1dbdce684e7822b6052d9bf3e752e3371f71635406ca5403a2017bbb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/es-AR/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/es-AR/thunderbird-140.10.0esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "44e6dc9267d08a805a2a88a4f82d8a5aebc7c67f8c6921e986d819c4e5d0bfff";
+      sha256 = "3e82bda10413bd6cc048ba2c4c393ddd9b77ab9524d57ade530bb83890da569c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/es-ES/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/es-ES/thunderbird-140.10.0esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "28e40431d43eb33397a651e267ecd367812a1d0c6914ae51ef74ead93884c359";
+      sha256 = "bfe41d1a67565baabe61261febe9ab2496f64d39614c18b2118d581f3649c2c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/es-MX/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/es-MX/thunderbird-140.10.0esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "358ce98091e872953634fc107b10feab1d86c3d9b2d796dbe82ecea8bf1aa8c0";
+      sha256 = "ebc6c5855942aee5648c3748565f8c46293dae13c779304c549c98c6693c5603";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/et/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/et/thunderbird-140.10.0esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "f0f8cb93abf6b71d75bfa14e709e45808e150edc02799ab9c7a95d4071d67264";
+      sha256 = "11a5dff71ef1afe583b21a11c79daee30d8c94bb33aff5cfe4b48a78bbddd5b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/eu/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/eu/thunderbird-140.10.0esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "2127a975d84709a47d69db3a3ad134aca4dd99e0c7465a281e9fbcc83e51771b";
+      sha256 = "1271019f33a46756f92b697710803591b8ae61eaf2dd4b50ade76dca483cc1b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/fi/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/fi/thunderbird-140.10.0esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "aa4b86f3bf0185b1c63364b07915e3d35a7e85f640ca1a1f384d4ba3bef09d44";
+      sha256 = "cb97982ba89ffb06e67196809c2d06b5526b3bb722b6caa54edb3788b28b6d64";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/fr/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/fr/thunderbird-140.10.0esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "7b4d887d0bcb636a2923805786a77d2f57b853c507f58177bcfaabbad6e6002f";
+      sha256 = "9a52512445f36e2b8e8438bd30979e28ea7e23ecf96da797f455323c4112e6af";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/fy-NL/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/fy-NL/thunderbird-140.10.0esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "e685adc1eae1078a27e5d18da833c8991ed7ab97a3946a70296639ec37495202";
+      sha256 = "d9164e9375b548331c579d66d1ef8cd2d2ecb44500185a103208a4092b6b2146";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ga-IE/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/ga-IE/thunderbird-140.10.0esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "0c62d4827a09f44a4dcefafde53347058bf5995d22042209551f83b12b4cd31a";
+      sha256 = "8987a879a7592593ba0d049f2a6a7a4c9def7a11cd6a50a91c8d25bb4d3ff537";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/gd/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/gd/thunderbird-140.10.0esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "773220488cd7eb0f47d938448e573aee9028443cf08cb0282f50b9a48fbc5d73";
+      sha256 = "51775c8a08ed4a647cc2e7573c30fc2b9aab0546c8fd6f8a1aaf414b04825749";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/gl/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/gl/thunderbird-140.10.0esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "600908cc4f4d5f0e4e6efc70991e3270f9eb145ff2a5fd1fa25322ad63329509";
+      sha256 = "8aebaec9f8787f200138f6e0680b952305925da670f8d44b15ddd6479f196d99";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/he/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/he/thunderbird-140.10.0esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "8ba11fb997a12e640ccf1287ac9ad233bd0383351acb29a948f7967baf1f9109";
+      sha256 = "bdd08d993d96ba3d95ef02b50ff62b55c478e6be142da5b8e45a1c58cec4972b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/hr/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/hr/thunderbird-140.10.0esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "ba5b4affeb1b7a82295c39534e7edc29eed6313ebbad459d2c7c4084fcf48aff";
+      sha256 = "4a143eea0adf5236745ae54b55c1a8c12281838e06b8885a12ed0bc5c7f6d4ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/hsb/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/hsb/thunderbird-140.10.0esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "36ad544efb25e1d94206393fff6d28a4266911ed29bbba2383b36f206a6579f2";
+      sha256 = "5338fd84698d25eb73573c8b147be58cdc53cb2c0352b927cb0f2e5fa2e26043";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/hu/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/hu/thunderbird-140.10.0esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "1bcad12704a4c4f390e46e22749f7cc165b91cfeee945a2df1456d8c6ea7317e";
+      sha256 = "961b930a80626bdd78871825c3b43831a8491a7a82d2ba9d12b2bf3b3c985eb0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/hy-AM/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/hy-AM/thunderbird-140.10.0esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "b5f6ad9910cb06c84c615584362267170ab92eda40f0162571d0387d60a5ea16";
+      sha256 = "01feef722b821f13785fac8d5cb3a1eb0df63ee652de8bf1ec8f9e72c1e0174e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/id/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/id/thunderbird-140.10.0esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "ec30f2b220ff56c69cf5efd4d9cd7dd8256203929ba079ef28aae7267eb671a7";
+      sha256 = "e8a2377a7354502d3dee39dc2042cc78f43d3dba8bb9328187fbf219fb34da3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/is/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/is/thunderbird-140.10.0esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "9dc9f6af0106ef0e00f14ad0f09c1a8c6a40b881d598040b232a8eb69dfd9848";
+      sha256 = "32766c408a6586f5efc9faa31812bc893695c6ead4e8ba40d8e0ef3cfe0e88f7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/it/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/it/thunderbird-140.10.0esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "184e86f13550244367362b2a97af513a7285731f74cd89193c1bbfcde682cf56";
+      sha256 = "952b8f7afe339a074db2ae08c1dbfff104c2ea037043538ee74b034f3d8bc9fa";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ja/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/ja/thunderbird-140.10.0esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "e16db5482ad846ee8b9ebe093deb524b3aaef1e9ecfc914963ad7fb8047eb2e4";
+      sha256 = "31f99109809340e67607f6c20841dd0054c4809dec7566d4f2da5d678947e057";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ka/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/ka/thunderbird-140.10.0esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "62e75fb1c05b6f05f694ce1ff4f54118fb07a808ddd86224f8eea666cb363581";
+      sha256 = "004ccf5a98d89bf678c3acb37f87e4d4dfaa2f3ca2db49be80379c2222964030";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/kab/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/kab/thunderbird-140.10.0esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "13581ed0b4d36b0f71c86081f55c1fec08d9c48f02f43a93153968fa4d796feb";
+      sha256 = "687707c9290211f380149b359368fa8037ddeb3a8b8516354303282c86b1cc84";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/kk/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/kk/thunderbird-140.10.0esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "60a30a9eaf5a3683c3f060ab6b1542967da5e4de723de5b9ac1ee938f2b05975";
+      sha256 = "5cb2e5c100c46b8d296feff3d29afd1e1552588f411ac02998ab3f6f6f9c7987";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ko/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/ko/thunderbird-140.10.0esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "15b5f5db7cb1109d9ea06018a37f671d88dea55f6f507f7556cb2c4c35b728fe";
+      sha256 = "b89d1c07d771fbb59d7f1708aab111a67bd42cd7b5afbdbe2bb9045268ecedaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/lt/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/lt/thunderbird-140.10.0esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "17c226dd9236c9a49154a69ce5c81dca948ce7ee9ddf630c779828b1e3e8dfb5";
+      sha256 = "a3215569fc1c617984e68b0daf678958a1699425ad9c3087c22ed3c86d3f84e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/lv/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/lv/thunderbird-140.10.0esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "d82839f17d3f18bba308245a6b76199967815e9d12a6ea3e8787f06d2d6e61c2";
+      sha256 = "3cca0d6ee3a02298399e6ca6218443ce4d8b411c0c98b8deaa9d2df8e6139f6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ms/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/ms/thunderbird-140.10.0esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "3df582cc29016b5b2d42bdc2dc467e37b666012428b8d7e30710eb36fdce447f";
+      sha256 = "7351131f8804207bd748769ded49e5dd86270c8f0c1801f1a01b9df68b81a919";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/nb-NO/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/nb-NO/thunderbird-140.10.0esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "d3ed3172a064ff8080b027b2f53ade618e793286eb1b5e0d0bc94b9ba11c9886";
+      sha256 = "450115ff782000f14af0542f0faaba214230207f98bfd0750b4e0e6a7b04e6f8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/nl/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/nl/thunderbird-140.10.0esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "9338d00796ce8a4c920f5bc0bc53170a31be285cb9ea0f83acac797410aa081e";
+      sha256 = "247afc918433eb5c56a8aa94e65b4a0b33eedbc3a546cf6c3bc5676ae01ccc63";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/nn-NO/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/nn-NO/thunderbird-140.10.0esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "786683efd1b81e498a295ebc0c08a1bb33a89f2af73d08b18a077fcb1ce228cc";
+      sha256 = "ebd822ba874a3003097d6ea2f833a888900f7832568f53792598d354b40c9966";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/pa-IN/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/pa-IN/thunderbird-140.10.0esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "2f6dddcc1c5c2098faec9f49d1e41529e788c48e632e3d8882c36864d6888fb9";
+      sha256 = "b065c6b7dde8a66d3f5929b1e3161e3a8e1db35e00fc18a754aebb05a3812f0a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/pl/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/pl/thunderbird-140.10.0esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "309d0c2040db6fd39a4f67996e1962bda9b551ad895051e200f5ad0208ad6383";
+      sha256 = "22c14c478912269e55d80f08ec7d0219b7afb90313d8e7a1eaf4b798744a1d5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/pt-BR/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/pt-BR/thunderbird-140.10.0esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "98a7e8a2b7602988df602532f4bfa65d9d9ddcd229668e023597bf8dfd2c1482";
+      sha256 = "9a375d00345a1c97594dfdeb06077e5b57da51aedc47be71362fce6c01421e3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/pt-PT/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/pt-PT/thunderbird-140.10.0esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "cbf82cdfd3e9469bd3f76de0782fe95dc29207ece8c1d25d95893d2cff30b63b";
+      sha256 = "5a274ff9251346c3f7af1eed236210b6338908b6a831d30a7d11584e7a2c4257";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/rm/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/rm/thunderbird-140.10.0esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "407fdbc55d53c570d54a9ecf06722747411a1e9b60f8802b51f9415cb910e5eb";
+      sha256 = "a4ce8ecc574d0a17f7fee94f1b560e45407dd4d382fd2d5c60b95587ea100aab";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ro/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/ro/thunderbird-140.10.0esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "c926efd2c65768b57858007ad4e69decf29fcd38c3f9c6a6e464bf9f2e809815";
+      sha256 = "8365f9418f17b94e749f37be7b65c5408a3eedde6406bb7f6ae624bfc63ff2df";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/ru/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/ru/thunderbird-140.10.0esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "8c21387a6b9fb8c51e0899560c4e57762f117211920c39a0c8dcbaca48de4d26";
+      sha256 = "79f3aa0ddb6548358255ea358b6275d9a0c4a029dc5c3926247ac3ea8a7252a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/sk/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/sk/thunderbird-140.10.0esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "b6b114891f5479cf803eef5328e650129d8a7a35182379f0504346c8d39d4659";
+      sha256 = "7bbc3fbe2cc45854af8fc5fd055f5e1a277da93d8b61c7f3d61c573f182edaa3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/sl/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/sl/thunderbird-140.10.0esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "5e893f5d3e24e0003d3b88c1a149bbb421c1c8103df99d5cb215a51b5a12888b";
+      sha256 = "aee94fddf0d4dad4b560f4a9d8f39733c15d8b2bd15ab5c565ada825c15917aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/sq/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/sq/thunderbird-140.10.0esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "4ac4daeaa2a6e3c530cf4f32d097f7612351c0322c5d8564b862ca0d4ff18f82";
+      sha256 = "2ca96fe3f3e52ec3174ff9c80ab3c60a4a40f70f1d8a75804057795175194382";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/sr/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/sr/thunderbird-140.10.0esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "c53ea2e65e527353b7758379bebd7f29016291abc74099ca4add6076e10e036b";
+      sha256 = "fc0bc7182749659234ad6de716ee09212671d88cd16f7e4d767c4ac5cc43f0b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/sv-SE/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/sv-SE/thunderbird-140.10.0esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "b67626622a69f102f5dc20bfd1a8cd3a9cea46b0ed6128b330997715865a2db4";
+      sha256 = "401dfd028ebcd9d5db1dec3d9d3b65639c251e28c4664d3470740a115f1b6f0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/th/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/th/thunderbird-140.10.0esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "b96e37789071cf4801536a01f437b60abf2b4e6032ada81ec4f14405ac6ed8f7";
+      sha256 = "11ae89dd8145ca202f8c16df69ec287a432e39173acc4c9b25f4795da6817ae7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/tr/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/tr/thunderbird-140.10.0esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "628eba4bd9ec27ad4911abfdba809ee5303bccc5d646b4a0a5695e42966fba12";
+      sha256 = "1e5dd43d368a82eca70b6a86543796a61f81cc128a90c8fc0d7788cfc82c995f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/uk/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/uk/thunderbird-140.10.0esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "a56690796b615d930686989c93eed1dacbc732006e6d1b401a1daf9bb2e4fb91";
+      sha256 = "fd265197acce6ca44d7e864351234fda31ad00762dd21def22bc05b4273d3f68";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/uz/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/uz/thunderbird-140.10.0esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "e06d1b4c3194820e35600150ae36d4f1457612ed1815d53280b6ad01f255a809";
+      sha256 = "07c3d5119dc7399404afe2b7dee973183f4ba64e8894bdabf73832c5bcc1802c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/vi/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/vi/thunderbird-140.10.0esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "9a2dc59ec3694b9c61c85185bec29fafd4fe5fdfeecad8029ab2a0ef69aa1105";
+      sha256 = "ea5172b05747549b82d733a6cc90e61c3ff799bf1bf8e562ac99dd6265525ef4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/zh-CN/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/zh-CN/thunderbird-140.10.0esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "a4ae4e445bc6cba3d88f4dcbabb72dc746c6c6c047996c5bf0f43c471b798731";
+      sha256 = "9fa73783d07224d40ef2b44f960559c3f30bedf629ea6dea68185be300598463";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-x86_64/zh-TW/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-x86_64/zh-TW/thunderbird-140.10.0esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "0c0a37ed4765326777536ab524b92f4ce029501f02e64aebbd390d28d4545e64";
+      sha256 = "15c0c698d61ca5c77b2ac9adff04463ce14b9320a62c5fae0ac39568cb110f95";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/af/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/af/thunderbird-140.10.0esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "577eb56fec1f61907852fc21944edd9538505bcf05e3799e8275305d0f44283a";
+      sha256 = "8f13ac059f6c0e6e11c2ecf7232d8eda412425a089bd3f4f6dcba3e492623ea1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ar/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/ar/thunderbird-140.10.0esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "26d5bd6bb052ecbc333501c24bd30f9f2c5cfe9583c1910be7fc4046ba123a0e";
+      sha256 = "596aa32e2f6c52a0bb85059a09bcb3637e89969fbce443ca8a51203dd15f45b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ast/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/ast/thunderbird-140.10.0esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "2a657397840b5279171b97806699d048463dd888ab715e225a644e59f415c190";
+      sha256 = "9657e2337a7eecb2607dbb14d7d7cc8249d4504f94679938b7e9f238955b6358";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/be/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/be/thunderbird-140.10.0esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "8ea87e89d47c58ddaf14cbe9886f70dcc163ab6739051ee04786e7f59b8fd615";
+      sha256 = "befef01bb241ec6505c8221cfdd6199545cf5679430a1f2c557d9ab8fedb92f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/bg/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/bg/thunderbird-140.10.0esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "ee37cd7d5684013f9c23dca7ac3266425801d9edb5262e44c28f547cbc644383";
+      sha256 = "d9160078fc63b262b7a953ffe8b78edc50fb6aad4cac3f0d1dc46de15bee0d14";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/br/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/br/thunderbird-140.10.0esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "36e156bf9230faafc0f6b5040d50eb10fe021ec713222504cf0caf1b6c9be3bb";
+      sha256 = "744e01f3010c423f7e83fc290700d9762a72c38c4dc4a79540db555b85d276cf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ca/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/ca/thunderbird-140.10.0esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "9cdd54c7e281ded940acdd6261e2434297c270d98d4ed2d4c83fb95da7f900c4";
+      sha256 = "f00d34f5d4b7f353d9f876d7935e3773748ca11e248a2934695c2a64c119ad09";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/cak/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/cak/thunderbird-140.10.0esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "0e89b2b9bf6ecd27d976a00f28023b42a7e6c5a90045c2e7485a3d7be66da2f2";
+      sha256 = "ef7f739143a6c53a1e3447ce66ec49e4f57eb72d6a42bfd0522b818fc04a2d78";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/cs/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/cs/thunderbird-140.10.0esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "4c872fdb475bb55967ac0bc23cdea0f72a9eac9539c7e41772a5f623fb7027fd";
+      sha256 = "990360bf8e1d4b91f2c7127b2cd60bc8c0cd837a298937a92a15332deb200670";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/cy/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/cy/thunderbird-140.10.0esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "214b7287d770931badbdd9941ca615fa2bee67e2fbc31d667d0005575603055e";
+      sha256 = "698a29a0d68f0f7deca973fef00f3ca78f786ae4b7fd0af21733d019854e6816";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/da/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/da/thunderbird-140.10.0esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "082cac81edd750ba01156f0896b06cadcb8e457bc005466bc6430d44b64d037c";
+      sha256 = "cfdcb1927c792d825b6f561c2fb70b2621a0d7b84807c59c199da6de1bf06056";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/de/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/de/thunderbird-140.10.0esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "b78d029f2e1f5f75eb56f7487ec13b3e70b961b58372ee8de57e3927f67750e3";
+      sha256 = "88ed3c42506d2aede608b1f66b7c9232b50b9756a24968308353f44feceaac5e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/dsb/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/dsb/thunderbird-140.10.0esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "06c226f5b1ae9b73a2f5171169123d0713e3829925af6d21af334b9df33bf6b3";
+      sha256 = "52de4fe6fe51c16e5969cf0b5e1620bdfbbac906c91b46ff5d77eff66ea5fa1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/el/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/el/thunderbird-140.10.0esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "9a74121011f572dfa1ccd364ebc2e0c362a544d458d8064e0ef047b03197ff18";
+      sha256 = "f0ee840435370072c992e29f6f7d836fe20ad11b1f85d541d1b9cb527b7c454b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/en-CA/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/en-CA/thunderbird-140.10.0esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "75f62e7331511bd9bd775953b68caa09bcfff0b74e1f8602049a99981ee50111";
+      sha256 = "e869cfe105d794947725753ef273e6fdb99db5b849dd86650c9061590be79d27";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/en-GB/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/en-GB/thunderbird-140.10.0esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "a9b1b64054cdf68daa63160470b782e1b60f156fa20dab9e5812996275fb3e54";
+      sha256 = "b99cefceee4df35947715bc01ee27ab3d50d7f95d1cd3f891d2e7b006befedb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/en-US/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/en-US/thunderbird-140.10.0esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "4ec13bfb184caaf6fa015d8b1b3a49ab08d440e9c5d088a8c953cda5e7c4085d";
+      sha256 = "fac0cc4dcd1bb59e034869c3677ee898328782bef976849c56ea430342176515";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/es-AR/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/es-AR/thunderbird-140.10.0esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "9a97f2cb85b56932276a1fce4b4923bbf4a0344fb2fd229d5b7335e48eb28f88";
+      sha256 = "ff4876bf4a5542e7c23ba92a4c55b04397887d38e4f7f10b3f0485b82125b638";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/es-ES/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/es-ES/thunderbird-140.10.0esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "ba9eb540eb1018e9e652c20c516d07127690d5ab3ec7d748fe9a78865a707a83";
+      sha256 = "6301b2daa776509fdd8609440cd5e0dd6c6660383097b4b343b8accafea32466";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/es-MX/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/es-MX/thunderbird-140.10.0esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "53da6633307506781be2f519a98c9382cc77050307cb79adc767a6895ee356eb";
+      sha256 = "c192debbdbd2c3c22ed91e40299f60c8a60c82507998d51aaf31ebfe872fabab";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/et/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/et/thunderbird-140.10.0esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "af425915b6b5475d21e04321634acfbbe16dc752e6c5737dd954098ca5349469";
+      sha256 = "6365cbcbc2798dcf0226cc25d934f04767a6eb501db39b48d59357bd93a591d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/eu/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/eu/thunderbird-140.10.0esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "21ea08478da94eef6d63eeb08d7ebb53030e6ed22a1baa4f2f7ed8e70c96d387";
+      sha256 = "56929a01272aef1e46e16cafa6e4c87e65ed8aa88a07246f7e9ff2dc18160319";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/fi/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/fi/thunderbird-140.10.0esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "ddae7c234ee6f76ac40eccabcf42f980b1e1fe3324b114bab095e829a7891e83";
+      sha256 = "0d1d583500dd582b6a4315ff1d88e85e72bc309324bc4f1a3cacdebec5ede985";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/fr/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/fr/thunderbird-140.10.0esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "373faaa0879b125158267721c86586cd30d681722ea5a1b8ffe76d6026a12d32";
+      sha256 = "abd23308816c394654131294d55c40477680e2bf75af3605973164a356663a3f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/fy-NL/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/fy-NL/thunderbird-140.10.0esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "4a9e13e75d6494614343498cbf61db161e80e1cfd2992ca62166574dd5170354";
+      sha256 = "ffb71669be383f2fa895599e96cddb7f75dea33cb9e5d6cd03a408bda33cb0b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ga-IE/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/ga-IE/thunderbird-140.10.0esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "2d20d1c004e9cafeb1c1ba0ccef757b1d37edaa27b47455e3b9d6cac6d4c297c";
+      sha256 = "41c13fa98d1c48a0e956fc61aff801c2d330787591198b8f24622279d04cd061";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/gd/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/gd/thunderbird-140.10.0esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "8ab435dad604d633a42974ba9b3de9639c59d54d9c27d01aefa89458eecdbd00";
+      sha256 = "a5e9ab56a477b1a7e7df521bed1f70a66354144d7749f20966fa900b40b38d0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/gl/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/gl/thunderbird-140.10.0esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "71c06bf79d9c71d87aacfdb5b45780bc6f9d257466b8e6245f506b422bc4a3f6";
+      sha256 = "a551b971ebd4e6f66b640d65255ed18c4b0767177d0079f772548fba4fb0d003";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/he/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/he/thunderbird-140.10.0esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "3274b08391f11764dc874dd74b5e7713201bac72ab17d1f4e27e1da535c252b6";
+      sha256 = "1f924dba26fe32bd941d16bc20b036a6980328294af1d9cafaf91c0dd63f7468";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/hr/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/hr/thunderbird-140.10.0esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "181510b1747899b7537fa2265a153a20a37f6bae251075af5bf6c52d66130ddc";
+      sha256 = "aede5fb62fa613f4d76f1c15db56920e03423b6b7444eb89e1d6d58dfefdf0e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/hsb/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/hsb/thunderbird-140.10.0esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "cb8619020aee7dcbed61dc43aebdbb315837a79de6c426cb8ad5abcf7db14a28";
+      sha256 = "4f46fec84b60e286eafdeb34b46584a1ea7795c966915213503e553cc68bfed1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/hu/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/hu/thunderbird-140.10.0esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "679fbe63c07e4ce14604e073c780a5e4a2be91e60a6ef5f48bca8ec1efbf1ba0";
+      sha256 = "16ca753c319e70680955a57111fcac224942cd897332ae918490e077ef8ccc2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/hy-AM/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/hy-AM/thunderbird-140.10.0esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "b26bef096054ac16fa5bed40bf51914f5451603fb59dfb8e46b205487d915967";
+      sha256 = "f3865dc628e8cff8957f11cf8cfa8ad55d836448453776863735d479e462e863";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/id/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/id/thunderbird-140.10.0esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "a88357be5a1ec32161ea5534cb8bb1b006ad3ea77e1e55e566534cd82abb3359";
+      sha256 = "fc1858feb6868d8913f8d7c9bce8a635fed96d0a74efdd0b41b44a2c53d72ff7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/is/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/is/thunderbird-140.10.0esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "b26ed38575dc2541e92a98f2d7ce5652412ea2eda9d8aace5011f77bf413fcab";
+      sha256 = "9d2307bce176ea0d2ea844ff49a45dc80686dc8fc0173d336d703d5bca10b520";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/it/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/it/thunderbird-140.10.0esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "6e2951b63ceffffcc1a183f5c3993f96fd71bbdda8b41ed0d193a54a296d7864";
+      sha256 = "5da336e94d6bfdc17d982efdb838556048ec09f4f4049601006e9fed359b6ec8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ja/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/ja/thunderbird-140.10.0esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "4933711300e7ed212b885179a552e13639cbfebb35286cc302d6e8eb74fd7683";
+      sha256 = "6edabc6742f8d606e8bd622d4da0a2603db6daa2ec449be176473a11a271f8f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ka/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/ka/thunderbird-140.10.0esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "52bc201748049510e5021cc2db552738b7ac289cc1733e74732e8ffab2b9c579";
+      sha256 = "9a8e123faf6e71588665d78f4096595faa3c3f0d76496092c2fc892546a26c83";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/kab/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/kab/thunderbird-140.10.0esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "f7026a548b96ea977270a62163654c1e94bd12e10d923072bad9075f821ddf9f";
+      sha256 = "094682dca9f4d91dc13bb408c81d893fc55e1ad01741bf643b2576846d7115d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/kk/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/kk/thunderbird-140.10.0esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "df6774cd0869e7c042381660cacb397ffe48f86f177b40971b45aef940b6f953";
+      sha256 = "400c7b2766c148c89ac1e21fbf7d428b869ea7855270301972f1f7637d600abf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ko/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/ko/thunderbird-140.10.0esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "f28e67abf1b09d65ca313ccbe0f7f0c5f2d8ae3785daa92fc1a50889285889ea";
+      sha256 = "1795bd16e957f937653862fb725d17b3e4b34886e9bb508c0c5a0cc40a670cd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/lt/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/lt/thunderbird-140.10.0esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "7daa7b36f9884c3c3089fbf526d631f3f753f1fca4684c792e5616cdc05fdce8";
+      sha256 = "182d125083f1152e87667cae8bfc4aea6b854d9b0448813dd1b667eaad46b10d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/lv/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/lv/thunderbird-140.10.0esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "0d9bf7087ef692140d2af8db630b7d9c34b3ec616f81055fc89ff883f11fd4c9";
+      sha256 = "c633f11c39e823e1d03c2f3fbd8ed09dfb81e7035acda5cce11e5905b0ebf654";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ms/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/ms/thunderbird-140.10.0esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "2e5ada0943fb767c9edff3937d000c8d686304eebc9f41101584e666ed4089f7";
+      sha256 = "713fef048adf25b8918b3507d12f0e80cf3ade05bad204b318ce93ad51af7502";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/nb-NO/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/nb-NO/thunderbird-140.10.0esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "2d744fe27b57cf5d88337bc9e8966b2fca31ca4df9873cdec5219a511c065d57";
+      sha256 = "36dfd3d89fa53c30c8bc9606bb68ff4de267eb59917ad5db870202cb3d8549b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/nl/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/nl/thunderbird-140.10.0esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "b7c3c1544990f7d29d342d547206fab067b6c0d25767eb3df6127e9a94a0c637";
+      sha256 = "c1b769d3232060d311cec0d16ec7eb4657d6a8b1835e81dc2fd6d14b8f374c66";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/nn-NO/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/nn-NO/thunderbird-140.10.0esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "9063810ac5e8754ade82442884f5c1fce79c9c7605b19c19a164a8a5624cbb04";
+      sha256 = "57edaecceb7d332a0cfe0ee9a493e88b8b06cf366b3f38b3868675bb90914dce";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/pa-IN/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/pa-IN/thunderbird-140.10.0esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "d30cf02ecd5148251512ceae6e78c096faf46166beb35ce5fd81d61a2ebf25af";
+      sha256 = "96788044109ab58d0d1a49fbaee6af778afbd14e428f3c15c3eb0c3bb2c1ce78";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/pl/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/pl/thunderbird-140.10.0esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "9f108070c4ff90e3127ae5a3955262240f05c118998aae5671313c8cefb090f0";
+      sha256 = "c693fe97f9c6f1e3e40391cd9931ba50a5c8c110d83d4f9e08048c912386106e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/pt-BR/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/pt-BR/thunderbird-140.10.0esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "e63fa1a6847725fb27013311e8e2c6bd494a00244b47a111f6eae4fb108f1bbe";
+      sha256 = "69e376b9da6d1b4d6e59f8b4b3520144102c7eca8a9a36b3bfd1e8571f6c2c98";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/pt-PT/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/pt-PT/thunderbird-140.10.0esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "c02818baa7ca5e76ee72802dda6e195cf6c688fd40fec7181035b1513ea49595";
+      sha256 = "343102d192fcdd3ad254d3baf0c0811e387e980c036fbe1414af83053da77c97";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/rm/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/rm/thunderbird-140.10.0esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "4e672884c4a0590dcfdf27b771d654442cce2f1c7ad825d942ce2ce5e865e197";
+      sha256 = "80848b2242c3ccdfca30e7cf0dcb24bb067f2d883f2ae1e3141b4b99000e0fb2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ro/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/ro/thunderbird-140.10.0esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "c215a2cd40f7a824d0d4bbcac7d90d3aeca05e4a7635de14a73a1540bea6e6cc";
+      sha256 = "b6bc069ccd1f48e3cdb8323c0e22d83a710e7a82155f57df03f993db248378b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/ru/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/ru/thunderbird-140.10.0esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "2d14606a7619537f7c4daec4757ad59ba647843d229e55f79536734afbe3491a";
+      sha256 = "d7b2ca6123931ed1daa0017a3e26bd900ead35d609653c1ea06b7b6730eec41a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/sk/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/sk/thunderbird-140.10.0esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "1687c082d6827b4c6257d77fe1c5675fb020c9d1bdd977a670b5f1deecd3c7b3";
+      sha256 = "a6cdac2b780febaf4eab0d9396d8bbf8a75828fee5ffeb0c4b9c9f86cab46087";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/sl/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/sl/thunderbird-140.10.0esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "459d9c963f383e86b2113445b69634ae221dfa0070088cfcd83fa16a947feb5e";
+      sha256 = "eef32d39db15f2ce453f7b5f3140bd9e84757aa557d3439edd8b8b8210162a79";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/sq/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/sq/thunderbird-140.10.0esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "64ae22f34e726e291f40c63288f2e75fd6bc40ba36c81fec8c0750dea0d32afe";
+      sha256 = "7cde6b9b6485f5bfd33aeb40c90b613115af2ef9d95929077c4f8343f679f640";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/sr/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/sr/thunderbird-140.10.0esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "5c3879655e1b8db94c9c8cc7decd58cb1cf078d79877adb79da34931a4739d36";
+      sha256 = "335889601d2ba4e2bca193d23c8e5668f0e5df1314f5952e8c9762690c4480a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/sv-SE/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/sv-SE/thunderbird-140.10.0esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "9ec50094f4364c510187d9a71b58141ab82b715ce4752ceda8ffdbe21a5a72af";
+      sha256 = "bf7b1c4fffe62cbf9f60549a7acbf3ebf036d5850be801c084e719d5bd126c05";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/th/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/th/thunderbird-140.10.0esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "f595743b0533f6f12d8d1effbbd4c9abce6727c9ca92e9a247ec62e96227f5ca";
+      sha256 = "29ee0d1bf8a6645a835505f5d3f799b53a362804297ca6f9dca78c43371cb38c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/tr/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/tr/thunderbird-140.10.0esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "de3b9bfc94f6da7e27abb50b6949659bff827a3b42fbf9dddc8e37b59915a513";
+      sha256 = "4526a55bb37a0d04e9323ea9176decdeeec1bc61edafdcd8ad76a30ab1be2af3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/uk/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/uk/thunderbird-140.10.0esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "77ea1b1f7bd1c95b4223090e453770c25fc184d38a88b2c7f86c250d95c06305";
+      sha256 = "e3ff12a95d0ff9509f11e8f7c40ec0c8f4e6b170f70a8d6569f65a15f2f28b6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/uz/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/uz/thunderbird-140.10.0esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "6bd6fddb49f0238003f3b13cd790a1ddbb294bdbbe0d9f850c1b4136b59fa7b3";
+      sha256 = "d9ca7701c6ae5b98fbd345efcf240e280bc7b582dd10b07e6b0d74dbffff367f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/vi/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/vi/thunderbird-140.10.0esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "3ba0e0b5510b920bfc851ba7d64820b2f48744c95188aa5a6ce62c980bcf19fe";
+      sha256 = "c912565ab97c9c6d2163e550e2c57dc1a96ac652cfbe516aa94068b2fddc8cfb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/zh-CN/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/zh-CN/thunderbird-140.10.0esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "2c0903e124298f455406ad9f26e5d78a70ed6489513914a52a87ceb31f578ad7";
+      sha256 = "dd9c51ca0cfccde0c655b9524986292768e0aefdc5199f3d77a1624dadce3c42";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/linux-i686/zh-TW/thunderbird-140.9.1esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/linux-i686/zh-TW/thunderbird-140.10.0esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "995755cecf0ab7151e078d91179d60210e9d4f8eb670189a1a8fcc5826a7e180";
+      sha256 = "fddabf04082d74fc37ef99bfb112b8a86f3a48e4390fcdb82a0d8d14bd147525";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/af/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/af/Thunderbird%20140.10.0esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "0031b06e6cf4d9f5b312ab58526e52c7b5418b54839196e8fd33f414facf5151";
+      sha256 = "bbb19174c75b20d95521b9d459dbb14d650af77f1c69f349e9d288ab4eda7b2c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ar/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/ar/Thunderbird%20140.10.0esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "56390ce018b751d613f809590363436c4d49f2efac3e8cd483d5b060ef2fad38";
+      sha256 = "5aede8e5f0b881137580de1f16140da0464065f588bdc7a058a36fb2e1497fbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ast/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/ast/Thunderbird%20140.10.0esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "2d9e0eaab3e2295f2afb630b814878db040531ae1c172418d673b10582734d58";
+      sha256 = "a42e5eefd0158fc2a2404eaf80f45c21212c5941c092752091b61b16246bb2a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/be/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/be/Thunderbird%20140.10.0esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "f98ca6d4c67764c3b112ced0abe5d809fedcbb72997d0fec9c5d295d9832cd53";
+      sha256 = "98e6e89a911966f8bb855a0844157b6264e66738f283697ab45a647832a87319";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/bg/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/bg/Thunderbird%20140.10.0esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "e640a1bf90f74c9103ddb1d736e6c494f4c325614effd396fb60c3e9867562c3";
+      sha256 = "ef6799649da4d62bfe722ffabbacd2d4b9042c2378eadb58c09a2b4e16b85e81";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/br/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/br/Thunderbird%20140.10.0esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "11a7c414f0f00848d5f99a7d94e36cd48f72470df043ac4b32d48fa31f18a358";
+      sha256 = "313d19a9e2496940b8701066bec6346bd8d79615c3a52c8358915dc029b66837";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ca/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/ca/Thunderbird%20140.10.0esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "e24105a6fc4f632b6de40b1b5ccdfa70fc6612a615a92664890dbc5bd07db673";
+      sha256 = "c4e854af6bbff67e1a6e568b5bc8e258852917dab635c8594f2b119c8444f322";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/cak/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/cak/Thunderbird%20140.10.0esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "93ad24570866316eb6c2261131c8e2ecaf32bd36b28d76a539d9e04424a9997d";
+      sha256 = "55134c272819c7fd28cfafd6df9c1a1e1a6c1d2ec2a8170e26b1246a143e0866";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/cs/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/cs/Thunderbird%20140.10.0esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "4b43f63d00c865fc59690c22dc5a65c2b46281df81f07811418b3b25fd1c2937";
+      sha256 = "9eaf18a4b3508f7f7efd1ef95d927f2ca5171a42bd7e1df960d076a80737d9a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/cy/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/cy/Thunderbird%20140.10.0esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "cace907d8d8461b12fc6e5d8710e8968737a0bb2ca79aa6b3291cfdb7f64bc45";
+      sha256 = "efd2c80541d8cd52ab8913c96d91763eefe5e3b259e694c3794fbc9eb31582a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/da/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/da/Thunderbird%20140.10.0esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "7a44b0fe636e0f4c93321a7d7f819da462e318dfde665eb5261ad9173df45699";
+      sha256 = "6f923bca0bc0fbdb2b113311855c2793a1534af21d5e1194bded19d17ce2f92b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/de/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/de/Thunderbird%20140.10.0esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "0654bb905ba205c6ab6e9097a05818191074d61971dbd69be9bd08234a33597a";
+      sha256 = "896133419ccb3baad8c7e043b336025380fc96fdf6d0f531394c4b00718123d6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/dsb/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/dsb/Thunderbird%20140.10.0esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "03c03283fd29ae2f33ba39e98cabec200371b78f25be74b9352b5e9db9ca83ed";
+      sha256 = "06a4de6839bf44ab6b412c649e797061d6601ec1a34079878825af330004b2c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/el/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/el/Thunderbird%20140.10.0esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "eb308e58d2a0624fcb4094b1f213ad6ec791f1188773ce9516c643da401b8762";
+      sha256 = "e514d1298080395a933ee2a48537ea3a72c48d6a9be27cb3ec0486dbe91bcb42";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/en-CA/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/en-CA/Thunderbird%20140.10.0esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "2f84bb86f7a36e90670523b9594553bfd8ada1d94c1c0b296a17819a38814a58";
+      sha256 = "b26f22e39256ce70a698fb376ac07991cfc84b959f824fa7641027beba51dc13";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/en-GB/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/en-GB/Thunderbird%20140.10.0esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "876ac3332c4b446f6a14f6147a2124becc75baf20e515a2bbcd8c84ede22649f";
+      sha256 = "412fab499c04df93e9a051b5ac44d22bbc13d3249365aa2179b64b79f36bce9c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/en-US/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/en-US/Thunderbird%20140.10.0esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "50296531d845a2aead184d90ab63c1fb57a0ab598acded88a8c7fa07add32ffa";
+      sha256 = "d07f738493bf2ce1ef88c0cb3ae0f15cebde53d89cbb236f8cb068c566f896b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/es-AR/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/es-AR/Thunderbird%20140.10.0esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "a2247a5b5656a08e83ffa062f0cb5808e23a17248c1729f495b5f5619863ed46";
+      sha256 = "6ace8a160ebe8a9038cd2a76a465757259ab79f83d9d737e78f26d2e8f3c9105";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/es-ES/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/es-ES/Thunderbird%20140.10.0esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "d3d1e5308d5870eab9f0d38f0b982e4405b6ba151a6efe91a94e2f8ab83ed496";
+      sha256 = "3a4af1480b626fdc9128c10afe18d867c29266b0f842676cbc31ec575f6e8641";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/es-MX/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/es-MX/Thunderbird%20140.10.0esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "1aa4763d2a5eb429f2cc56e8f82395045263d6be180525539297d2e0f23d7ca6";
+      sha256 = "8ff56732a06552cf6fe3d96cbc9fe5bb7cdf24e0ac73fac467a1401831060c8a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/et/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/et/Thunderbird%20140.10.0esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "37856f64e2504fbc774549332acc97a2c0723188f3549772edbb583042a0647d";
+      sha256 = "3b6367f6ee0aa9902f14f2840e5a1eef1e68e139c8134edce515153b57e072bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/eu/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/eu/Thunderbird%20140.10.0esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "91c48c1527189daa146059253e6674d41e836e1d61ec4c9c8029e1c5b21a2fd9";
+      sha256 = "bebc7b3ce1451d5237ccb5a1e29139f480484ff29ae5e220824f04e72f320d54";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/fi/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/fi/Thunderbird%20140.10.0esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "60a7c6465f8b524fe393ee09c3fe217fc1d7acd2e72d19e6f70c1e38cf33bd27";
+      sha256 = "f6f15b08717d479fbb089e2c806fc7a6fa8e0c3f4bb22ed7f9736f4eb34861fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/fr/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/fr/Thunderbird%20140.10.0esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "e17458d0f37f1698aec78b382772535942df06949686d33fa51b221bae846284";
+      sha256 = "1659a5fc10bc7b0f8fa6708c9fb1d9a667f6f4791a7c3c8a1c29b3923ec5d7ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/fy-NL/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/fy-NL/Thunderbird%20140.10.0esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "e03a88a40bf86d10e335c4be43a36b2c48b56223b3adf6032f815d7afca19272";
+      sha256 = "317575e567d3c983674136654c79002fdd3f41b4ced3e456f778ed04243fcecd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ga-IE/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/ga-IE/Thunderbird%20140.10.0esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "4d9c7a53b6fb9a9396eee0f52b0dc660ae51db420e569381b7d759e0640336e7";
+      sha256 = "061a64a95f82973ce9572ee07bbe3d7134a0aae382cbf50720c4c85c27d1fe8f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/gd/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/gd/Thunderbird%20140.10.0esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "e97855d13f1a37c6a73feecdaa6d2c63d9edc61431f078d06d4c54f4118531fb";
+      sha256 = "88de7502986c3a5525ed0e37c69e313aef4beec3dcb5d8bccb4dc83b59de2e95";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/gl/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/gl/Thunderbird%20140.10.0esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "b3940c048b0c00fd813738e937028037d092e8acf31f8ee0992a33ea53ddc39d";
+      sha256 = "5c73065ef9a72608a3a8f8f918a0bfae6da8899d169e5c3095c62d269bb27ae1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/he/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/he/Thunderbird%20140.10.0esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "29c63eda8f06862323f6706f5846d7b7f90c7a4fc473f2acba8995e3d9425a82";
+      sha256 = "c54d037555a8e51e43e50becf0fc6fd3741e9fe0c3e570eb78045746da4848fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/hr/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/hr/Thunderbird%20140.10.0esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "6c481eb7f746b1976b56560dd0666db8023006fe2ae06dd5ace7b29858876592";
+      sha256 = "d4e661e3463bc619b02d2537652817d96ca2b4e4aea890d96269f13c2adbb695";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/hsb/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/hsb/Thunderbird%20140.10.0esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "513eacc874f411665cb7a9a6ed9a97064e228c17fe80f3015b18c6f92e300712";
+      sha256 = "c70577df076c93ff5d9900c71627619edf9adcc34a01d93074a33a0dba314a6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/hu/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/hu/Thunderbird%20140.10.0esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "bc3183ee3032bc7342d9a345ebf60f4ed40e85d4ca55c693a401c18bd25438f0";
+      sha256 = "06586f68825935745cedc3d1cae14f2516ff26fbdf2ef49b5a759effc4f8e1a1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/hy-AM/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/hy-AM/Thunderbird%20140.10.0esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "0daf98bc3abe2444f97d1427471a902436103b53fcd18400a2ff2abc8ff4097b";
+      sha256 = "4551e994b4446b242ccccf8992e39002fabb776a70214d6c567b06367a5da214";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/id/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/id/Thunderbird%20140.10.0esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "8b9da9fdd953f0ae740fffb4b13fac78b238162118e480328b108aaa24c202e4";
+      sha256 = "19b8ef099be8b60b6117e6bb261d156b1b4e13c4e1836b6923bd66fd40c70d58";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/is/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/is/Thunderbird%20140.10.0esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "ff37126bb4fef8588cf350b28269c74b82cda2f2bc579c7a6e0276afd6879d75";
+      sha256 = "42416aea83bdc6f0f4323faae7c6e9f4da944392e3a121816203dc6158c44b4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/it/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/it/Thunderbird%20140.10.0esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "c78e3247d89e7c52744c640b70b1ec6964ad98a78a985e2da71b1b3e42750323";
+      sha256 = "19353ba5edd74ef49c92523267de8759088cc8b4fce02752030c0c0f330d2d4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ja-JP-mac/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/ja-JP-mac/Thunderbird%20140.10.0esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "3f770b520be282cd6f0ab3308df9d2a8e2547b05137d0d7518f6a53b23d7092d";
+      sha256 = "eae044c5dd26ebf3dafae77b79c2123fd6b8bbc651f294168e0e3faad30b47ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ka/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/ka/Thunderbird%20140.10.0esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "67e8b923ded639aae11d1503ff62ccff16297cb17e96001e89fe59837c30eb2b";
+      sha256 = "2a0e1b8042de95dfe70d76d0169cead23e2388aaca182ac68f23b2f86cb7c9dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/kab/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/kab/Thunderbird%20140.10.0esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "912b87b4695bef57669779b544c14c79cd0deedfdcef447d1813ecc892f651ff";
+      sha256 = "d7640b128ee8540330bcc8d817b97398fdfbe1eeb699f662905988e6eafd8216";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/kk/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/kk/Thunderbird%20140.10.0esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "2a64c01bcffecd8b93c7e7d4bcb3b332f0d26417cf11aab2a3474314afcaf811";
+      sha256 = "2d48465207bcf6ef2e4a19e5a827af5031e0a5bdaea2651974681b3f1505be0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ko/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/ko/Thunderbird%20140.10.0esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "e330b31e230ea85349ae2afa1525479cdbf5108d58023b9ecbf492ef45ca8ad4";
+      sha256 = "82a87df1d1a6e10359e15f67adf2f959229a365fa78a18662ce2353f8e5a2799";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/lt/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/lt/Thunderbird%20140.10.0esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "95e0995e430dc478f9ebf617c9c47c38da22354c180acd13b4656a5a3c75d5d8";
+      sha256 = "ab314f76489a173ebacafbdf243883519fe2330a9b082975041ed2166e7bfa7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/lv/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/lv/Thunderbird%20140.10.0esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "143a7469f85b838a5838bc6ea9bba0c15d1f282c496bd6854879a024edd10b04";
+      sha256 = "8cb3ff05086d1ba9914118d0778e625e69bf52ca504349016e54fcc7d6be4c08";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ms/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/ms/Thunderbird%20140.10.0esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "cf3be810ca1345db4c6af0c53ee49ed5b478fe6c618ab62fb9483104d0259602";
+      sha256 = "e2a636786811cf6d6239d878fd44cf7f836fa9b3f14aaa18abb0def87b4fc852";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/nb-NO/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/nb-NO/Thunderbird%20140.10.0esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "114fbdccf07616e27de36e743e2e88251f9863f98343175c5c9fbc398eba1151";
+      sha256 = "5b5ec06eb1b36c50aaa2cc851f678e5cc9179f4d2a6a467239a6e2bede4f7193";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/nl/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/nl/Thunderbird%20140.10.0esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "a70fbc0216a3ec9e5d7fa40b54fa93e450c5086e9bd6469ff500a251cdd5951a";
+      sha256 = "d55e5f54e21ee3cc392ea1dea30490299c168454e964bd4004066bf78e294424";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/nn-NO/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/nn-NO/Thunderbird%20140.10.0esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "c8866b3b6326f835ab393b7040445664dc349fb901e810b83c285c6bd70ba644";
+      sha256 = "8ebec73f9e5ae2857dd08ed7f4fa2331ca2bcdf5c1dfe4e928ce7b35451c6505";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/pa-IN/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/pa-IN/Thunderbird%20140.10.0esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "b7a384afbbe07c1ed3b1bd3651682fd621985a0c4251069dc4134b28be44636a";
+      sha256 = "115ee6c42922d75b717e22f4adf4c038d79b72f67f33bfcd8d741dcc28326a0c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/pl/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/pl/Thunderbird%20140.10.0esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "fc582345330c689f1f5408cda1a562cb3308ef51556dc9b104226b9b7532d508";
+      sha256 = "022489756c3a50e539b9f8dd0adecf2ff177c2e64cbd0430cc252711745f38c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/pt-BR/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/pt-BR/Thunderbird%20140.10.0esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "0a97cf0c6948c242d2d787ed1018145a216bc5262f288d268be17a9d6fde5c73";
+      sha256 = "adde04f20dc91603dccdb1405240a0ce3c34c37510f1a2d81de620dd8b4a2533";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/pt-PT/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/pt-PT/Thunderbird%20140.10.0esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "2d6b36fe3b086b5ba868e17475aa3b2f9c063f72fb4e56515fb52e482005b509";
+      sha256 = "350d99ddeab4aa0ce4a7f81c0a0a26ee95c3cc26796f832b41cfe2a6af0ac64a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/rm/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/rm/Thunderbird%20140.10.0esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "bb576c73f934e8b7684337346dc1b7dfc618b46586a3c03d027c179bf711c05c";
+      sha256 = "66cec74a2c32d0ce880b1d56bd4877607c0158fca2913c71944caa34a5058b6c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ro/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/ro/Thunderbird%20140.10.0esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "dfaabb24533f94cd8433b9c9a547608a3b0e6ab4a9c861441c4aac675521e738";
+      sha256 = "6f23102c39380741aaea8c80f40e9b2f170095981ef5f0c40e541174c08a2439";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/ru/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/ru/Thunderbird%20140.10.0esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "57ce17ecddadd2a2dd997cfc918a10462f59af11715c47007e0a09d2a33568bf";
+      sha256 = "e3c9fb629eb0dadfd1e36dc9fa98817b36186f09b5a0684683aa4f74abaa587c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/sk/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/sk/Thunderbird%20140.10.0esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "ba4d947ec2ce9364ff683ab050fe0985c55372d07696f51c6791b7eb5f496892";
+      sha256 = "f066947190fb7e16fab905379b87c646096efe1de562d25bb554f8fd3a3c401b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/sl/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/sl/Thunderbird%20140.10.0esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "6a319e796363c5f48af54eddc2980368f5913fa673461b887b827521f24ec958";
+      sha256 = "b962b6d9f7ee292ddfd0907d8bc42395ea14f27f3c48f0c9ad000cefcce885f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/sq/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/sq/Thunderbird%20140.10.0esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "d804cf5b8cc7cd0fa9c1141c3bac5d6c43fddf904ab19254949ebe4d88387137";
+      sha256 = "4b2a39700695cd0aa334792a836879f79152c61a4b565e969f7eb8f9b5a8f028";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/sr/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/sr/Thunderbird%20140.10.0esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "6e3a819892859332f945cecc0b485fcd52692377e4ca2b9db070da58c0187688";
+      sha256 = "cc988e292a4ff611c092d20544faaa3f4ce23f243053414865235c28f8269631";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/sv-SE/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/sv-SE/Thunderbird%20140.10.0esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "053c7911b00d4ef30c60d6a96a422022fdc9163c879e6e8e0e0677f6090b3ba0";
+      sha256 = "98700c3aea102b77da85b3d108a6359ffd73ca5c6717ea52e07eec1de7adde0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/th/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/th/Thunderbird%20140.10.0esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "8327c7ec56f2e99bd0b5d1cd3ffafc8e387a69029de27ad954405e0c982b3102";
+      sha256 = "3aad7a2a78643607d1f8d00799563f7ed3d28c887015fc865abf578a5cf2f6ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/tr/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/tr/Thunderbird%20140.10.0esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "1e0ee12b2de52cb8831a84c64e804e7d06e89c62e5996c738139702b238b17e3";
+      sha256 = "0c2e68b9769ccd98e4fa2a300d9d71cb21ca8d6553c69003445d99bf1edeac47";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/uk/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/uk/Thunderbird%20140.10.0esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "988431461775f8bdcb3ae496600054efa6abe90f53648f393457cf10da404cea";
+      sha256 = "06cd5504c88489433efd9856a0054db1c50f943275024befcc5c95540e8305d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/uz/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/uz/Thunderbird%20140.10.0esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "f8a37dee62c05f2c72d79eebd19cc2cf7a1e43960eda48008f6e7b996af4dfc3";
+      sha256 = "2aacd20c1ecc593db44ddcb19cd7ef7cd8011498b81aa47065d2e61ff24cc070";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/vi/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/vi/Thunderbird%20140.10.0esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "fef0773954ebc81b7084f4829f258fff05e55cd3891b54375a78d2a55cd288dc";
+      sha256 = "3324f3f1dca0396e9ae085f19e4d23193475b675b8ef04101381a06c512e3f06";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/zh-CN/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/zh-CN/Thunderbird%20140.10.0esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "8b26c96c41146252189cbf810ecdc2896e987ac29e1a309ec2dd7a5dd6422b01";
+      sha256 = "28342b76d2e1300b6d7a8057ddec1215c7437f96ab7fae80dd726daa5a0aca63";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.9.1esr/mac/zh-TW/Thunderbird%20140.9.1esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.0esr/mac/zh-TW/Thunderbird%20140.10.0esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "76d87c322e1e0723c02f41b9e9db24ccdf01b87b1d18e4065dc6379fe65096dc";
+      sha256 = "e7c16e98242319a8ab57341a5f0434e3bef7f2137e9069c3b7b6988fdebfba62";
     }
   ];
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 2537991bb5a5..5bc335454a29 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,797 +1,797 @@
 {
-  version = "149.0.2";
+  version = "150.0";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/af/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/af/thunderbird-150.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "c4c30f2a5b886be43920ed8a29b84028d5fd9e3d1969d2849356e50af51dc549";
+      sha256 = "603a11f975f05ee8551231b2ea9d1e2078a70f9cf940efe7068421e7344f4724";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/ar/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ar/thunderbird-150.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "fede225c0c678d4f883380f8a049f7730046e6ad57585cbb43f2bc60fe97e95d";
+      sha256 = "544b1fc693f13821dcf319750d393690d0727136c3f8c86a43f3a6e22ff23a2e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/ast/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ast/thunderbird-150.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "48fc1a4768d8d80edeafa9ddc70aa33b0999e27619f880b2502893ba685ab3fa";
+      sha256 = "e34239b70a1a4e80103f7abf880713acc3e1fb158491808e7bd31ab16aa22dee";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/be/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/be/thunderbird-150.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "98d02926b6763f821efe2a08a492b3a80c00350a52a22a4527948edaca08fdf1";
+      sha256 = "b79b994c610160397efa907ce6ad17577c246d396d5c1f5ac538647c6e918280";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/bg/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/bg/thunderbird-150.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "2b5efd323fd01c634fe0cf56e1a559c378c992382679fe6720e884c1f2b32fa8";
+      sha256 = "1c7bd1cbe9502fa88c426ec6d4f2224743f85b8ea8ba3257927d9ef35081fe12";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/br/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/br/thunderbird-150.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "21f010bae61c77dd0699755c7a47ef60c46f5c1b3009d20324f26b2ad5bdf6ee";
+      sha256 = "df0c71bbc7fd06a1acc7610ad6b506c7be359c7161eb494a800c73192f629151";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/ca/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ca/thunderbird-150.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "7c0246e8289082bde79c37c19e99404e293d67e39f692c6e69589ee85ed085f2";
+      sha256 = "92809fc47558be9587158f306dafe0d3c09dfb3c4ba53c20b3ebea1954fc0868";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/cak/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/cak/thunderbird-150.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "f20c8dd646390760b158d82cb2d7038c163be9550faf350ba7e0757cd3b98535";
+      sha256 = "c0b26b573c5b77ec2e67b87f75ddd54bdb1964bc1d92a9fcf8fe0dc83d9d5f96";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/cs/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/cs/thunderbird-150.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "805ca468ca976e9a389297edc91c12cccb9ec6f63dca8335b6bb005de26cb7f7";
+      sha256 = "6f8604165b2addcfa17b6c4df8f28ccef6e9b06e320069c20a27e02f04253058";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/cy/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/cy/thunderbird-150.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "c78672e526c8ff0fe2f91007a83f69d01f5dc74200fbdca956dc5203810370a8";
+      sha256 = "187585e3536fa3fc61d72fcbbdb628439217755f1fa0f7bf0018a9ed893559ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/da/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/da/thunderbird-150.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "8b31e2356888d5beddd6825af1f8bb2f3aa6ac057f35c8c2938ea3a8862e5a65";
+      sha256 = "1932efa7f84ed2778f8b179ee792b1fcb3739cf87a379be41861e26be40dd04a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/de/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/de/thunderbird-150.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "2b3244b857c147bac965c6abbf743a6177ec19eca91a53666b35097a19dae325";
+      sha256 = "5639eea20c5cfe708f76fef1f0db72dc67caf1b3a8b1b074026e24dae83367f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/dsb/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/dsb/thunderbird-150.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "fface39e856f4efd203a9ce1208a49795fad8aa137aa9141736b23e689fbaf8c";
+      sha256 = "e9e8356703ffb1ba55b737e1f862f75b212467412bbf46910e445d068f1482d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/el/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/el/thunderbird-150.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "38f28a5697bc95a8a43b963cac9c73ec192717f63f5e4df96570592a2ab6e4fb";
+      sha256 = "dd25deb118eff6e8eb53640095a6fe7728a3b8dcbc605858e49a857182e2f7cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/en-CA/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/en-CA/thunderbird-150.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "ff12246dd0d616780d6ef3a896549af73feea079b146a85ff7ff3ad7530c249b";
+      sha256 = "2bbfb0ecff24ae2aae36b1a839e7e314939fbdd2772811b7d9f124ecd69e952f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/en-GB/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/en-GB/thunderbird-150.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "cf59611e0a2c492969d9bb19b1d846b96163088ed8e4674ccb2aaee8520297e1";
+      sha256 = "12f908ad0a0735b1e3b1751b29fe93e20ec8e71d1734e8ac51db8a328c781701";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/en-US/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/en-US/thunderbird-150.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "c32600291083a916b5ba5334977df1a387a87b8d81688a8cc9aa0390f8399c86";
+      sha256 = "724b96883bd656d46831e8e8d15abb83a378b95ee0ab9282319957f054bac3d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/es-AR/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/es-AR/thunderbird-150.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "7332565d9fe63686886068f60f5aa6a12dcd1be6bb95eab2af2faa1621d738e4";
+      sha256 = "fef7d09ada4d2bac62d296363d2523ec0305ed5bd3ac66e426704dca5d18c5ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/es-ES/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/es-ES/thunderbird-150.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "9cfa6e13d4ff2f6f2e3ecf7a7349c6eb30b8776b077a53a6addeab1e8ca30cfd";
+      sha256 = "22bd2958fd874888e35c4864d9d7166fc69a88c7362aec3312219f87bb8ecd34";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/es-MX/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/es-MX/thunderbird-150.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "d74f393e21b9de83143ca2a11541fe2610e05e6dcb673201d3cca3e828c090d7";
+      sha256 = "d821867bce159036aeea21c476baa7669ef07981b9ab1609af7553f3e03b11c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/et/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/et/thunderbird-150.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "644c9c035b91f0371e3435ffb73b0514c854abd497c8aad308ead4e31451c6a4";
+      sha256 = "16ae4916ff0d845cb86bc61a085868265d3b954bbc2156b7ddb4c733ce6a2653";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/eu/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/eu/thunderbird-150.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "03ee326c9e9c2febf2412711dc1de6052f2e0425b8bb3d7db31296944725b5bc";
+      sha256 = "fe1be0db05ee461800abaa48b9a1397e16ad134cb7a3848039d74710b0c0e062";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/fi/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/fi/thunderbird-150.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "b45894b64ba1c3e12d375ccb7e4dcde2d7f8d1d2ce0dded59c108634760c9f05";
+      sha256 = "9c6198e408108debdfb5f5ce9ed4f80c29d9cac445976ac0c2ee3472ea94117e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/fr/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/fr/thunderbird-150.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "31c7a7382dbf643121d59b271e5020893895ba40294b05d382f4299c8b44adf1";
+      sha256 = "059a9900c1eae3e65df61fe5723def9eaf62d8fdcbe88161392f40dabc09c456";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/fy-NL/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/fy-NL/thunderbird-150.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "7a044e5ae9095f011d6e2bb098731b393d4266bb0105bf68b1561e6640d00f6e";
+      sha256 = "be5e33d5e8b9c3fd73a0a82b6a5200293c92a4c2ce6ab9731896560dfb50bf16";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/ga-IE/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ga-IE/thunderbird-150.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "ca23e7559b3c38c90bf43d5ba35a101ec05be9adfcb6e61fb2a21537dd5809fd";
+      sha256 = "3ef3f08cf8c5834e722c1242bd8b177bcf59361684deb701cd5b3f6fc0962965";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/gd/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/gd/thunderbird-150.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "ada95c94816a151f7f97df9cba49dc0c0480d70781cba4b550c056ec798d0a23";
+      sha256 = "3576c8d73bf51902a5e4812844080abd1136a353d7dc9b5d8bda404e9116d529";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/gl/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/gl/thunderbird-150.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "a2c6c5fbfedae436e5b43669ea91ce2f23fe07cd4841b1351af6d767aadb49d2";
+      sha256 = "55447f090a76f350932c548ff5d118fdef54f64a6f84bb8b3607bff6f9190500";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/he/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/he/thunderbird-150.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "4b2f744e812a0d0e21e37549ebccb68de72f982ebbd0f39bf19e4bce484aa654";
+      sha256 = "db6cf04c8b597987f1c0a8ac00bee5bee5e2cdac143ff8e4dae22b5cbe4bfe04";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/hr/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/hr/thunderbird-150.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "eca3cef23c613d7d0bfd5164a8ddd7dccf2ccb8a14b5f2beebf8a34d64bc2b68";
+      sha256 = "6d087e4c4bac1af6f462d3065208c7f26fb3c20d7787f47075033891556cf7bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/hsb/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/hsb/thunderbird-150.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "5e1258c01f2ebcbee5281c2af085b1440fe89386cd81158ba7cccf043c8f5c61";
+      sha256 = "00c8df688bc1bf9436cb21d4f2c4bb1ae13c30167ba6b8b6122be07ddb00eb63";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/hu/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/hu/thunderbird-150.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "9bfebe446d96c4d8c2ba7a99a058bd17e9d4d1783d05c9fb643fe30b1a4aac30";
+      sha256 = "75db83e09a5bf577f7f134f28cd5005751a115e589d6fe64b95752214cd0eebf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/hy-AM/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/hy-AM/thunderbird-150.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "9d0a1d6486d79d2da3fba49878c1aadf65ac8f930af1d2392d5ea4bc47adc690";
+      sha256 = "2739326930b8e5b0d3f1d57fad820158ed65ec0353325ffcda8953db93ed6775";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/id/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/id/thunderbird-150.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "e5514c3abc6fba55b1369082f0bffbdfabc58deb67b1ab0d2ba5fc997fa0ac74";
+      sha256 = "2f973d4df278cdab6983fd4c09e782fe1342184f325a8c3b1d90ae23bccd5cbc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/is/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/is/thunderbird-150.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "31d29e59de34b12ae27e7fa7cf357857685dc76fa8bfc91a0667062a5c48625c";
+      sha256 = "a96580cc22b26cb9f35959537c923b0d92c2f1fabad582f989da52195644f670";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/it/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/it/thunderbird-150.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "443d2280a721ad5470b609a7b5e742203de505aa4ee6ebf3f0a84391867e411c";
+      sha256 = "ca2cb2af67d2a0f26f75a4a617dce3740e582b243204b6a860dc1e4f73738cd0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/ja/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ja/thunderbird-150.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "6a4c94af7b0189b3445b0384bb154c3240eef90d985fcc673bd30fb9c13408dd";
+      sha256 = "e1e7f307ea87cfd27374938a35abdb302a34d10db3eb1942b54806c07120010e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/ka/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ka/thunderbird-150.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "4d22cd98871d7242189507db89ab59aa349c9f748f029e67b7f1558352acb6c6";
+      sha256 = "ee951466bbc42d785d7de85c2c6bab219488d1786eeee152b2a27fc284d19340";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/kab/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/kab/thunderbird-150.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "43b876a0d3c33fb0d821194191122a02c6632adb82998c9eba9b973439526ca5";
+      sha256 = "4c6ab236c4d167c6386e4cfdd10055099abdc62b0000f32196e30d616be86bd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/kk/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/kk/thunderbird-150.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "1d4e08b3d0b3db685d67178a8224eb097ce9d7c0554ac99f02adc81120a3ed91";
+      sha256 = "48bdc20ec2f85dc1d9fe0ec751bcddf19611deb8504ba1d67688b0e5eba81c1e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/ko/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ko/thunderbird-150.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "351efc47a32927f0df4f0eb5337b908401fe5bc8cf355a0928d4b5ab15442157";
+      sha256 = "b33e6da7f94f470adf277aa8030513830882b8db28a73a752236b5f89331c9b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/lt/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/lt/thunderbird-150.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "89db9fabe507f4d5c21101fe2fc4486e6dcb55d91ee6049762799af266f9fd26";
+      sha256 = "c66c2bea8901207b9740733021648735b8683a4de60fec3343dd406313aeca64";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/lv/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/lv/thunderbird-150.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "07b6a3a8a132b506c07ad70c16c31b205643066a96006f0ae23d6b414d90f63b";
+      sha256 = "9b02b0563eae2626a9fc2faa37be685bee0397827ed4e38924527913e1cdc8b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/ms/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ms/thunderbird-150.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "910f934d585fc63c4dc5e678bbe4c18d80c1aceab52fa699611af78eb013f6c2";
+      sha256 = "d7395d59657576f6da0ed349b8ac0e889dd0d0c86d15d1e4688021253af6220a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/nb-NO/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/nb-NO/thunderbird-150.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "66b80e4ed4fd0215acb59d72a51f312900ca6103787c7c08711e7ddd70f017d8";
+      sha256 = "4ff74c13d0224e72d68d495d70ae11f697ad53b7a9cd1812fd5da22c8bcc9186";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/nl/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/nl/thunderbird-150.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "371b2caf1d360d1bc8467122881b919e7289e0a1bbb82972410e384a606f7564";
+      sha256 = "b2958229fdaa0a6535ac38baa3d056ab1d3624ff768a4ed3bbef02e7deb08738";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/nn-NO/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/nn-NO/thunderbird-150.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "8593f63235a4ec621c99e21c911bb7384f808d9ebd4c9053ddc82b0e1af559d4";
+      sha256 = "693e39f69bb210dc0c38fb6b67c607030546a834b670191937e4bebb0fed1100";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/pa-IN/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/pa-IN/thunderbird-150.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "ebf0aa27efdee8088eab1bd6c9aac6592101ffe600c5bf009ddf48d13b7a10eb";
+      sha256 = "64f0cea758cc5c54e488bc75884ec7ba4df6a49f6ea2573ecf8b099e5c5e8ff9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/pl/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/pl/thunderbird-150.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "4c506f0f2a41de2d677b05e73b5c1894e5e116551bbafbb076b95005780f06f9";
+      sha256 = "bd9db8e078667b2914153e47130df4d75d9e008c5f8ff63061b9afbcdaaf8c46";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/pt-BR/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/pt-BR/thunderbird-150.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "44380a82572337a33fa01c3ed4ddba8cf423b360840b348bebded983f60c200a";
+      sha256 = "8afbfb8a1fee6ce0fb4eb736c3bd861f74c478ca3f25b621768b0461a2737f99";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/pt-PT/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/pt-PT/thunderbird-150.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "fec30447d3830bfcdaf8dbe21c4ff341d26ad8c6d4dae63420d9771baccc2d39";
+      sha256 = "92e99ab883e4337cf85c57eed0ae1ef1a4d769acfc4d7f9baa904e0d3c585f60";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/rm/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/rm/thunderbird-150.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "b491eed42da231685dcada1270c32b2e18bbd860cb7c25ee7aa467df444378ec";
+      sha256 = "53e488588e12d5a8c1c9f39aef9baa54e8e9b0212102c2b6b8fde616e3a17996";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/ro/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ro/thunderbird-150.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "2d0d82f7ea7ef203c0b841f83d6729314a3cd4f4e79ae0de5d6e166119e3714b";
+      sha256 = "65b3ce9b6095cba2c9c3ddf80528dd4e33d9eeb21d012c8272426837eabc2377";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/ru/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/ru/thunderbird-150.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "4a50b638754a5de4fd9c2a9f19f7065b25d1510276ee774ef9be641be82ecfc4";
+      sha256 = "ea51fb751c40c93a116603a8ee70efe12d0ab94565120612db63fde3fc5fa4d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/sk/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/sk/thunderbird-150.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "568d933ee6ee6e62efbfa6edb38fcaaca833b53c42f96508e4675382a896c987";
+      sha256 = "4a84087fb09116569295b3f998e7314b93f5571a2de8fb28dec640f00ac676cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/sl/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/sl/thunderbird-150.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "34cb7c03760f880d285cba14c83818222c3fd799a4cdac269d03da5938368593";
+      sha256 = "2c527ac512d360a3100285fa073865daa9001b845db6e922bb73a71b869de94d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/sq/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/sq/thunderbird-150.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "84910c137ee6110aea9b990d50126f42cc3437407a4e66d300fda5fe4382bc5e";
+      sha256 = "0ebd0114ae78faf585e83326825c24c8d23e4924f35a684fdb0d887eb265f3f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/sr/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/sr/thunderbird-150.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "23457ba5d21cba2c6db8f96dcdc66d32d31e5bc45fd84c1a4926bebf55872814";
+      sha256 = "da3418a17ab307c84a1e3927400bd3e42b2292d5e46012f143789f8241ba88e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/sv-SE/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/sv-SE/thunderbird-150.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "375c44f207c36c0762cc5539ea2055c6c5238c66ca1505cecb1e5a7d646972a3";
+      sha256 = "2798d076f6eb74cc7fc20aa4eb27f18a2bc52c068752967eb97e9b3ab8a24a32";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/th/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/th/thunderbird-150.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "d129074a83c66e3aad3af726b309057518b7c8a4dcf45fd9f1277736c47651b6";
+      sha256 = "720df901ce7b9b747b151b7eaac69204945b64ddd6aaa1516e64bcc225883d20";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/tr/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/tr/thunderbird-150.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "5465b23faf61c28df00b90817c1494022cfa4253bf37ded37fe4574b1f7121bc";
+      sha256 = "7f29d029e195be863f943a2941ba66318783bc9a4e6dca5474236f268be79efb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/uk/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/uk/thunderbird-150.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "9421b1e6d926f8d4cf95e54585cd0c312ea226eb56c28688b24b7cc840515a7e";
+      sha256 = "4020ce17dfb1c4636157c82c441510495def7b2ec458fb6f4fbb7ad5ff04bf29";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/uz/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/uz/thunderbird-150.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "9a4031a40d203201924e0b6b402ebc4345c335233f5ed5a5ed02e991d92ab4b7";
+      sha256 = "690c71f6ef16341a511a134183456ad4c661f0e9e8e296477751374633f14424";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/vi/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/vi/thunderbird-150.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "b506e97e1ca192bd73788c590975d022419bf5e2149e2b8cb4be5f57dc18f9fb";
+      sha256 = "d98d304d4029ea60d711c85dfa3722ae0f828c491841397d227fda2f9e72bca2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/zh-CN/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/zh-CN/thunderbird-150.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "8b86ca20dcf6656d74e41e270b26ad4415f3c9fe7d7edfcd7f1386dfd26c1daa";
+      sha256 = "0249af83552c9ea030834569b2556ec2d189286602cbcf23af73ec6be7783a81";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/linux-x86_64/zh-TW/thunderbird-149.0.2.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/linux-x86_64/zh-TW/thunderbird-150.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "27bd6f347f6d2af1ef080f777ddf79e213572aeef89955c2b3ea83b32e1d8545";
+      sha256 = "722c3be5b64e98b57a8daced279e1b0f684f5af4078caae65b4bc629976506a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/af/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/af/Thunderbird%20150.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "8f27a92c5c99024ffee29f536e84d90b99f290555d2ce0f0c44fa70b26209b64";
+      sha256 = "e5e34f254ff4b167ed850cb2444982f8830a552358a6cc8bb911ce53daeaa8e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/ar/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ar/Thunderbird%20150.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "5ccf9f51f6ced947a19705a73d2eb87ab1942913983018da57792fd6f49ee852";
+      sha256 = "ed5db82a5a79906e7de4d08c625612a1a16cfd85b030985aa0586b7b661edc1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/ast/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ast/Thunderbird%20150.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "29f48508112d00ae634589f2187a8c4bcbe58c4af29903cbf221de4c9f4d7a9b";
+      sha256 = "55ce4114b23f203c6688fde1b4c27bd4b29c46a7f70df56dc3355ad8a32a0707";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/be/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/be/Thunderbird%20150.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "c3c98e406be6253251a9cb024061d5bd505f66565182f185d94ed70db2d257be";
+      sha256 = "b5151f40775561ab4d41517209c59b52e8aa50e21302c7688bfd1c28fce33e6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/bg/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/bg/Thunderbird%20150.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "07f2ac3bd9036d457088579fd18fbaf369b585b9c93d96c795ed72ff7cffab9d";
+      sha256 = "dfb8b3b5ed406273b3d073ebe881e4b6b2614066ca556ad8e9441778e889cf98";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/br/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/br/Thunderbird%20150.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "b9deb1035c2a54cf669f861b0892f3990eb2718b0a5b110b048eb843c22e96c6";
+      sha256 = "c6ee9640f267ddbede95188f825388518076797262e2472f6ed07e99c8ab84e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/ca/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ca/Thunderbird%20150.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "8c42235f9efc316d83429b921406445b041b9fdca8d2c13b31aaad58ed2bbabb";
+      sha256 = "f1f450823f697d81d7ee992fff6b9d6f82b83413962cc769d6a07cbec928a066";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/cak/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/cak/Thunderbird%20150.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "08662b82acddaffd1aea2335c45f4b4689ebbf33ebf4cfdd2d36821e58db3afb";
+      sha256 = "d97d0578525cffb0e3bb5e89646801ec5279758115a00efb799ac5119225bbb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/cs/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/cs/Thunderbird%20150.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "63b9608cc84007bf8107d4582199a5d5c621e89d41fa37a7eb59ebde7eefeb1b";
+      sha256 = "078481051486ed0a8f0c22b4968036a1767cb0b8db2e72e40e7de8cfa1dce609";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/cy/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/cy/Thunderbird%20150.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "2d8738d9971a55dccc62efa6626ff42e3ce0eb9e00c77ef34c9447b417b113f4";
+      sha256 = "a7fe65221494b2130725408ae18d8718d7ac1198f77e730076eec366a9f0d659";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/da/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/da/Thunderbird%20150.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "fddf7ce52908a90ffc76f489ce1e4f01f2ec000eccb92139f54ba03692c4ad22";
+      sha256 = "803d8197af10715c9912cbf1aa31d6dcf05cf3164a18eef623c4acd36b8119df";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/de/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/de/Thunderbird%20150.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "e2db8185ea5d49e6f3821b38e1d7e4b1d2b0108350efff7ce6295741bc344c82";
+      sha256 = "3c6c420c4a8a18274d2d2b0af25163e780cd57517ced984e92a2a720de9fafa5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/dsb/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/dsb/Thunderbird%20150.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "e8d00d51e29d5350ad0ff32674426b4e84add5c0463279fa4398411bda56116c";
+      sha256 = "047fa535dc650caee615cc6d13e204c29e02e13a7cd89d999c57027f8212a1ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/el/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/el/Thunderbird%20150.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "c192f7783b698e76d8474842d28a7401057ea46e585bf56370bdb9fbcb333450";
+      sha256 = "0174e0c2ee3f088537620eb9916ba11465c66f706ad358d59d34b800a850ec6f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/en-CA/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/en-CA/Thunderbird%20150.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "d5e503b012532277bcd15e97eb47719024570c54cdee733a36b757f84809766e";
+      sha256 = "a9342558d9a803ca93b489bff2bfe666dc162d7e89e9396e9f4adfa5efd7c05f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/en-GB/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/en-GB/Thunderbird%20150.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "fb3f676205b6c39b72ff897530e55c7b011406e7f848b26eda513de7724b87b1";
+      sha256 = "a45d150e923731b20b2f5ab7778b90e2de48b22d40e3a1d088c6ae66356e2903";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/en-US/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/en-US/Thunderbird%20150.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "48b2cad803d26a343d8c761bb268dea28f934e29e4c80cac96cfda60befc9153";
+      sha256 = "a867f970e8ef28796d324020f0d866aee779efd40bd760305800b4a3c9e8e60e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/es-AR/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/es-AR/Thunderbird%20150.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "b0933dcaa3b11ef50fc2f3a6700639d507e63fd943c5fa26f454705dd021cd50";
+      sha256 = "69538918e5f62051cdf535e8544f027e82e55cd8d1e876c140c8217ec541be4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/es-ES/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/es-ES/Thunderbird%20150.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "d26a7397c2f0031b42e0d313710f1abb37538571dcdf801beab99af83aa91003";
+      sha256 = "6d48d83f81a518ee204d39728d4ac102660485da27e82c2c9dbfccc98a66ab1d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/es-MX/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/es-MX/Thunderbird%20150.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "58e6e172263297e5153c6195edf4fc550cfbfa9a4760f3c711c5fba74fd0f9d2";
+      sha256 = "fcd8255d48803a6c0af7fc4c12d8ad8fd55ef2624c8d8466c051d7524f8725fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/et/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/et/Thunderbird%20150.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "4ce356c124eed2403475b5657f4264ba76cb03d6b6db47c602daf940cdf9d0ca";
+      sha256 = "3dba9f72f90be11e09b29ee8dd812583825ba80cfc07aeb91644a7d6cc81d460";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/eu/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/eu/Thunderbird%20150.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "7fc1ee0f5ee32747e36d082bbb61cb8b18831e88d71f0f13a9f4631333ccc2cd";
+      sha256 = "ef4212a8d80aaebe395f45482f2191d6cba0ab414b9bc19820f5deb71390ee0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/fi/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/fi/Thunderbird%20150.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "b85b73fed4ee7a195885e9052ddb0c141765c55f5552cdff8998c4b79298ba25";
+      sha256 = "c7b16935d01907b375e9e92772ea969d54a9d9f620ba6160c4743d92e7936efc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/fr/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/fr/Thunderbird%20150.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "82d31e46758ed9089a847eaaa149ced3a69a7d5e8f960a75f1858985ce4ef040";
+      sha256 = "a89bdf41188d0083d1b0deb906ab6b71a8fa2e5f696f5cd0e8040e93e80c39d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/fy-NL/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/fy-NL/Thunderbird%20150.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "fbed248772848b5b3d69bf8dc8c505d81e3e107ff054601407cfb5c4ab8f0f9f";
+      sha256 = "7c7a8562a44e3fad7e104ec9f31550ea7ad841e7c405dd0f189d04c52451864f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/ga-IE/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ga-IE/Thunderbird%20150.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "0f9caf95e4ca8e0896aaded75af59172f5b2480c39961158d64d35b0bf517daa";
+      sha256 = "e5fa6cdf54d03c50d38d246eaa0a977a9c54625f3e80dfb91c9bc74a2e83ea5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/gd/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/gd/Thunderbird%20150.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "e5fe370cf264a5fd8124088fb8bc7549a8fe5b15959e3cc8113031504f18308d";
+      sha256 = "b27ff1b049ca29ae6909f3b2b56d195a70ebb2d0e9888f65fb58be6952370f0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/gl/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/gl/Thunderbird%20150.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "143a0776516b81764ab8d9c210c23f4adc909ff9f4583a6c559b218ef1d612c7";
+      sha256 = "12e46cb1ec8d597ef7a92bb2793aeff41403b689352ae562978b8e51d118ab4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/he/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/he/Thunderbird%20150.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "0dcdc78e9260c2457139922179c9cfa16ff5f6253a976e9a57c18075b61101c2";
+      sha256 = "f92d36d48b426e531ff4cfde3c272009bf11a640a30404b1b4e75ed9a5b5bc76";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/hr/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/hr/Thunderbird%20150.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "305ff7ee0e5a5443c3cfa0b94a01cc0286ca69353064459a15a342d5b0cc3c3b";
+      sha256 = "c86e06144780f6993d975f580ac15402358fb6619162f78e7524c0d32069ed18";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/hsb/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/hsb/Thunderbird%20150.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "ca80ba9ced853cfd27169facc4705f34cca70299da20ad08d305795bd18f55ff";
+      sha256 = "42a1d83d6a21d86bf9a41d58c12dca0e72f7133db3c6c5f20bef9fd32ffa0da8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/hu/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/hu/Thunderbird%20150.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "65aefcf2d36d8b37f23956d9b0311b1aedbe2a85421a446351bcfe1a71e95a75";
+      sha256 = "9045d34faca947a9c0fa3ccc222a93fa23ac4b5fc12b9b2b0c107f06e797e4c8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/hy-AM/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/hy-AM/Thunderbird%20150.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "869e0047498efcab489888ba882e6cbd2a7cc8034d3bd2dea1d0274dc05bf7e4";
+      sha256 = "99c0b265dd23c8907717584b08d663bcc05ccdc544436e2d61bfd5a807630177";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/id/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/id/Thunderbird%20150.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "1599d2ff5fd49a6fbaabe9c7bd2f060048b54a9ad25353b14e9be9f6c76acf66";
+      sha256 = "8b88175966b31700a312a7e01f67ce9108eb18f6de46a08c52f6807fa3ca1fa3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/is/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/is/Thunderbird%20150.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "0166f3dab6646fd24f89a27b1c12289448035653ca67b186448dca818c44319d";
+      sha256 = "f3c3082a7e3b2abcf0d4f9a64e2fdb415d02366843df18c8beb9e2bd6a2800d0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/it/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/it/Thunderbird%20150.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "ffeaedbef4caca293eb1152dc214f60a20aa17d2c8bf03850d6aa0805d5a657a";
+      sha256 = "a51d25192f1374fff8a6d3c96a585d99ab856183ab4b1e1865b9750c96646bb1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/ja-JP-mac/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ja-JP-mac/Thunderbird%20150.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "b83d1aa694327ba33ff674c15f5ff8dc14b6556fd2bd82fd183256318378bf75";
+      sha256 = "a9849cb12238e77eb7540c8fba19c59c4a069344c6694ba3fa65ea181763af5d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/ka/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ka/Thunderbird%20150.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "5f7fa75bb17935d8eb81018e9d0b3f11d71db8253d6012971b404ac70bb707bc";
+      sha256 = "69621e44e215d086c1ed4935d1600e348b3476cf57fd976f2bad19ce1fc8027d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/kab/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/kab/Thunderbird%20150.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "26236cf10bb44b39aa4bfc31eb8a80a1bf62a91e2e32059153ff757f1131991a";
+      sha256 = "1d9392c1c20e2870822b209f525b179e23f9d9f78572cd13f256643824242de0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/kk/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/kk/Thunderbird%20150.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "72987ca1b19f8c6c4c64b50fcaa35ed2582eea7cf251966864518421115b8e7c";
+      sha256 = "4674752cd943737cadfc1fa8d9ff073ace98cc7eb7a9309d362551bb677fa352";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/ko/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ko/Thunderbird%20150.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "2977b0ac777056caf74959dc77cf81f72abc5a04012df78ec37a0a3e664e9ee5";
+      sha256 = "25f59eedc7e2aa5c141a6b325d482bf136ddedf4be5c629128d56f232502e5b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/lt/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/lt/Thunderbird%20150.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "485e24dfaf5a32497f551beda44d9ceeb95e87b71d35abf3bdd65ad703c4651c";
+      sha256 = "fda8b6a30432fa94e0afa22431eb1021554230fd6559fe58df0fc2d08256eced";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/lv/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/lv/Thunderbird%20150.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "c788fb6e00c31759445611ac332bce5d468e60e1ef8a5411e73e3e09a4a8c136";
+      sha256 = "bc1d80d157e7fc6848c1a6e6a9311b80c0802f80386f294880b3ea90fd40ebcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/ms/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ms/Thunderbird%20150.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "5e4ad372b4e6ab7cca8d834f809e08e1c5b83c44615e8358f97604bf60036586";
+      sha256 = "e0219f9eef0804ab9b9dd57fd298354ea44ff8f22d11ac0d58c14b39fedaa643";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/nb-NO/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/nb-NO/Thunderbird%20150.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "dcdfc210e14540de27c9d2fc070dbb17438c4ef04f3a9c8791037c62aa64ae07";
+      sha256 = "f588d8d2868c169dd9a774c7279a73b2a62e6a403609744468f62d63c7904a00";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/nl/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/nl/Thunderbird%20150.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "b2dd5d1eedaac34894159231f27148969d31a6255c08a64262f7a6e198cbbbe2";
+      sha256 = "d922efa82df4c5ff15cbf745c0aa1eda25677d20e35e40eb3f91d31d574c4675";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/nn-NO/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/nn-NO/Thunderbird%20150.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "b868dcb22ec276531de282370243d954d91425624e481e7387cd4a01011f4718";
+      sha256 = "483d0771c112afaf73e84ed4090f2f0d8f943367a612e4916869f086f3b4096a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/pa-IN/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/pa-IN/Thunderbird%20150.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "712c89de6a7694177b85bddc46113968d0f7b8c2c7f6d56048f153719933c7af";
+      sha256 = "ac2b4c78884ec57461f81572ec812f63a06daddbdbe12002a4279414ef721eca";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/pl/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/pl/Thunderbird%20150.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "ecf960729a5ebee422a943c8a6bfe89537750f891fc1b5dec4db3389322fa5fc";
+      sha256 = "e0fb9fb4eb5c48c9dd850c1361a9825307ffa2d5b6d982ea76fe60051d6d1e10";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/pt-BR/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/pt-BR/Thunderbird%20150.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "c94775bb9f631218ed3e59090847f205947448e4773950fb7a239417e1f6f6d6";
+      sha256 = "dfd1722f6329b671a319cc99d2980db6ab8d7dd162f85e48bce62a23f4982141";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/pt-PT/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/pt-PT/Thunderbird%20150.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "9fab306909b47c0e988305aa944adfbf2b6932865f84b7f685b22567bf342fc4";
+      sha256 = "9e5f3b0ff00937e8bbdf1b795ead5bc5a3c7ba5ac1f59d7047f9355be09d6b0d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/rm/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/rm/Thunderbird%20150.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "801ba43231270de4ba59988f9b7e1b137900e45d7a499cf20a129bba9b473641";
+      sha256 = "89782c2e789c68477234a4a0458423af944bf0a3d4a8ffded581e2d22dfe3ae9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/ro/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ro/Thunderbird%20150.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "d22358ca08cd7e4acfc9135c3a997fd4647ad03e17b5803495cfdbb94cba5f96";
+      sha256 = "28715e0125fcac13dabadb320e92ef5a64a3a44823ee963b7a94b27bd393d2ff";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/ru/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/ru/Thunderbird%20150.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "8527a473b7fc6e8adb5a1f32cb9bc4bf41309fcf200b85a5780a4f157b8e171c";
+      sha256 = "80b384086c928a37b7855171ce42a0d35878157131a0be825ca1cc6cf25e32c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/sk/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/sk/Thunderbird%20150.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "0d74c741e0ef869c3bdec2e0b19e596683de1799578dd052a56b7bfcb26b5dc4";
+      sha256 = "6315c1cf3747cb295bf588f0f2bfecb80e429f593497ba47f35b20af3ff95e72";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/sl/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/sl/Thunderbird%20150.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "50cc19ddad74730b14b5688118dfc71568716b0691997c4c1804e614578fca67";
+      sha256 = "04ed617e2d49a0b4a4840b86fe726254aed86485ecf11a15b9330930fb0e3158";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/sq/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/sq/Thunderbird%20150.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "635bf98af4f1fe3a73a9be2e64255e70c00360fdefce505ce6a2b7296253a8a9";
+      sha256 = "2ee9b0afbbb15e703fd3fead6461ca856e6c0812283ad3732d388cff151c7224";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/sr/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/sr/Thunderbird%20150.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "e237188b3ffbf459cb9185f8343dcc3ffdeb1d45d6243f225514fbf31a619c76";
+      sha256 = "1ad74172517281999050993c11e4b05a082208c23caa85d11e65ff7d3979dfa3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/sv-SE/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/sv-SE/Thunderbird%20150.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "b98e5aaf53722248dc174ca6277d10a99f5434d6009785d1c6aede16d991eac6";
+      sha256 = "271509bce61e11fd114810b5186a067e895920809cdc192b6da88e34546913ed";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/th/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/th/Thunderbird%20150.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "c3581e1f9d2d0f5db85b87130bd657122ebe73b9525cd124ed12b97a764356c8";
+      sha256 = "9db6bad978f3afaee9961e6ffc1f7e0e48255a9da412d46d5944f68ffd5ebf23";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/tr/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/tr/Thunderbird%20150.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "0b8c1a66295ae91b6277eab1616940e7fc107f892ff130202e8deae80af23a8a";
+      sha256 = "f08d4ea305ec1a8e9b4098e9c919d8033720f61976ae44804b6a1b4ff6962588";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/uk/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/uk/Thunderbird%20150.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "4d193e6939460ba9ed0e26e620493ec1b9b4a6482185550e8436c82e8434e003";
+      sha256 = "457ec9fa23d2ef14ec43d826eecd58665ba38ac308ab81a5fc02dc9f5382246b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/uz/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/uz/Thunderbird%20150.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "c54b79fb77aaa54f1b2a743280bb18833ae1dcb3755f4340ac05a0af8a36d21c";
+      sha256 = "11ef7b6cebe705b20a88d1f5caf121c75bf4297460b8512e58be610d91df6064";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/vi/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/vi/Thunderbird%20150.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "2eec3ce15cd9d4e943bf39ab2288ba9bf61eecf99580bd073d5285f0dce9087e";
+      sha256 = "d7b65901fb6aace20921ac0a27c29c0ced06b412666131b2c30e4bf795d6b4cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/zh-CN/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/zh-CN/Thunderbird%20150.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "9f7eda0004f11a7cf408a8f4c81270e39f9a37ba5901682d51a36a4385f7c158";
+      sha256 = "dbe73b0a66bde150737fc2a43deffecd129da3514dffcb600995c8fb407d8fe4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/149.0.2/mac/zh-TW/Thunderbird%20149.0.2.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/150.0/mac/zh-TW/Thunderbird%20150.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "b97d91875b6368e68902602d042b42d70f77b64ded44fc8686ab5dd271c2a0d5";
+      sha256 = "5fa4ed3d9aafc457908098eb1f9cfe6af5a66407d365cde26199380b9a8d7244";
     }
   ];
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 3339bfc44a3c..0b839ab9d9fb 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -73,8 +73,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "149.0.2";
-    sha512 = "b458139d6345bef6d07b8169aee45daae6935c2d0f540c462b1d54113c8beb2c8f17a73ce077225160dee0d2a0891fa567b57a1e5d488704c5fe0aff264f1967";
+    version = "150.0";
+    sha512 = "6e0770de0aeabdd9372b491ae0a6d20238ff154b70982de21c73b903003398f36d8f56c679ca893a1e5646a25add9e9e126ae1b6ee1f836290104b61eb09dac1";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
deleted file mode 100644
index 8bedf042692a..000000000000
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  qmake,
-  pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
-  qtwebkit,
-  sqlite,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "quiterss";
-  version = "0.19.4";
-
-  src = fetchFromGitHub {
-    owner = "QuiteRSS";
-    repo = "quiterss";
-    rev = version;
-    sha256 = "1cgvl67vhn5y7bj5gbjbgk26bhb0196bgrgsp3r5fmrislarj8s6";
-  };
-
-  nativeBuildInputs = [
-    qmake
-    pkg-config
-    wrapQtAppsHook
-  ];
-  buildInputs = [
-    qtbase
-    qttools
-    qtwebkit
-    sqlite.dev
-  ];
-
-  meta = {
-    description = "Qt-based RSS/Atom news feed reader";
-    longDescription = ''
-      QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader
-      written on Qt/C++
-    '';
-    homepage = "https://quiterss.org";
-    changelog = "https://github.com/QuiteRSS/quiterss/blob/${version}/CHANGELOG";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
index f28cbcb83196..f5cce8daac55 100644
--- a/pkgs/applications/networking/sync/lsyncd/default.nix
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -17,7 +17,11 @@
 let
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 07fbe639ada1..ddfb056d101c 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -15,7 +15,7 @@
   enableOpenSSL ? true,
   openssl,
   enableXXHash ? true,
-  xxHash,
+  xxhash,
   enableZstd ? true,
   zstd,
   nixosTests,
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional enableZstd zstd
   ++ lib.optional enableLZ4 lz4
   ++ lib.optional enableOpenSSL openssl
-  ++ lib.optional enableXXHash xxHash;
+  ++ lib.optional enableXXHash xxhash;
 
   configureFlags = [
     (lib.enableFeature enableLZ4 "lz4")
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
deleted file mode 100644
index 5f759c7faaac..000000000000
--- a/pkgs/applications/office/cb2bib/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  qmake,
-  qtbase,
-  qtwebkit,
-  qtx11extras,
-  lzo,
-  libx11,
-  wrapQtAppsHook,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "cb2bib";
-  version = "2.0.0";
-  src = fetchurl {
-    url = "https://www.molspaces.com/dl/progs/${pname}-${version}.tar.gz";
-    sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h";
-  };
-  buildInputs = [
-    qtbase
-    qtwebkit
-    qtx11extras
-    lzo
-    libx11
-  ];
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-
-  configurePhase = ''
-    runHook preConfigure
-    ./configure --prefix $out --qmakepath $QMAKE
-    runHook postConfigure
-  '';
-
-  meta = {
-    description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files";
-    homepage = "http://www.molspaces.com/d_cb2bib-overview.php";
-    maintainers = with lib.maintainers; [ edwtjo ];
-    license = lib.licenses.gpl3;
-  };
-
-}
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 2269432bf744..af72e6a6e3e0 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -8,13 +8,13 @@
 
 let
   pname = "mendeley";
-  version = "2.142.0";
+  version = "2.144.0";
 
   executableName = "${pname}-reference-manager";
 
   src = fetchurl {
     url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
-    hash = "sha256-Ic19MQRzRLmYL2nVFMBvCbloI0AoCm0MVlWJeV4i+Fs=";
+    hash = "sha256-27cUm1ChdzG9Qxo0ntUAVZMA685YFZ3nbsLkZfxR3pk=";
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix
deleted file mode 100644
index f3c0260ed765..000000000000
--- a/pkgs/applications/office/semantik/default.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitLab,
-  wafHook,
-  pkg-config,
-  cmake,
-  wrapQtAppsHook,
-  qtbase,
-  python3,
-  qtwebengine,
-  qtsvg,
-  ncurses6,
-  kio,
-  kauth,
-  kiconthemes,
-  kconfigwidgets,
-  kxmlgui,
-  kcoreaddons,
-  kconfig,
-  kwidgetsaddons,
-  ki18n,
-  sonnet,
-  kdelibs4support,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "semantik";
-  version = "1.2.10";
-
-  src = fetchFromGitLab {
-    owner = "ita1024";
-    repo = "semantik";
-    rev = "semantik-${version}";
-    hash = "sha256-qJ6MGxnxXcibF2qXZ2w7Ey/aBIEIx8Gg0dM2PnCl09Y=";
-  };
-
-  patches = [
-    ./qt5.patch
-  ];
-
-  postPatch = ''
-    echo "${lib.getDev qtwebengine}"
-    substituteInPlace wscript \
-      --replace @Qt5Base_dev@ "${lib.getDev qtbase}" \
-      --replace @KF5KIOCore_dev@ "${lib.getDev kio}" \
-      --replace @KF5Auth_dev@ "${lib.getDev kauth}" \
-      --replace @KF5IconThemes_dev@ "${lib.getDev kiconthemes}" \
-      --replace @KF5ConfigWidgets_dev@ "${lib.getDev kconfigwidgets}" \
-      --replace @KF5XmlGui_dev@ "${lib.getDev kxmlgui}" \
-      --replace @KF5CoreAddons_dev@ "${lib.getDev kcoreaddons}" \
-      --replace @KF5Config_dev@ "${lib.getDev kconfig}" \
-      --replace @KF5WidgetsAddons_dev@ "${lib.getDev kwidgetsaddons}" \
-      --replace @KF5I18n_dev@ "${lib.getDev ki18n}" \
-      --replace @KF5SonnetUi_dev@ "${lib.getDev sonnet}" \
-      --replace @Qt5Svg@ "${qtsvg}" \
-      --replace @Qt5Svg_dev@ "${lib.getDev qtsvg}" \
-      --replace @Qt5WebEngine@ "${qtwebengine}" \
-      --replace @Qt5WebEngine_dev@ "${lib.getDev qtwebengine}" \
-      --replace /usr/include/KF5/KDELibs4Support "${lib.getDev kdelibs4support}/include/KF5/KDELibs4Support"
-  '';
-
-  nativeBuildInputs = [
-    (lib.getDev qtsvg)
-    (lib.getLib qtsvg)
-    python3
-    pkg-config
-    wafHook
-    cmake
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qtbase
-    qtwebengine
-    qtsvg
-    ncurses6
-    kio
-    kauth
-    kiconthemes
-    kconfigwidgets
-    kxmlgui
-    kcoreaddons
-    kconfig
-    kwidgetsaddons
-    ki18n
-    sonnet
-    kdelibs4support
-  ];
-
-  wafConfigureFlags = [
-    "--qtlibs=${lib.getLib qtbase}/lib"
-  ];
-
-  meta = {
-    description = "Mind-mapping application for KDE";
-    license = lib.licenses.mit;
-    homepage = "https://waf.io/semantik.html";
-    platforms = lib.platforms.linux;
-    mainProgram = "semantik";
-  };
-}
diff --git a/pkgs/applications/office/semantik/qt5.patch b/pkgs/applications/office/semantik/qt5.patch
deleted file mode 100644
index c5d5f3f1306f..000000000000
--- a/pkgs/applications/office/semantik/qt5.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --color -ur a/wscript b/wscript
---- a/wscript	2020-08-17 19:49:43.389864343 +0200
-+++ b/wscript	2020-08-18 00:22:51.172556519 +0200
-@@ -149,6 +149,26 @@
- 	if not conf.env.QT_LRELEASE: conf.fatal('Semantik requires the program lrelease (from the Qt linguist package? - compilation only)')
- 	conf.find_program('python3', var='PYTHON')
- 	conf.load('python')
-+	conf.env.HAVE_QT5SVG = 1
-+	conf.env.DEFINES_QT5SVG = [ 'QT_SVG_LIB' ]
-+	conf.env.INCLUDES_QT5SVG = [ '@Qt5Svg_dev@/include/QtSvg' ]
-+	conf.env.LIBPATH_QT5SVG = '@Qt5Svg@/lib'
-+	conf.env.LIB_QT5SVG = [ 'Qt5Svg', 'Qt5Core', 'Qt5Gui', 'Qt5Widgets' ]
-+	conf.env.HAVE_QT5WEBENGINEWIDGETS = 1
-+	conf.env.DEFINES_QT5WEBENGINEWIDGETS = [ 'QT_WEBENGINEWIDGETS_LIB' ]
-+	conf.env.INCLUDES_QT5WEBENGINEWIDGETS = [ '@Qt5WebEngine_dev@/include/QtWebEngineWidgets' ]
-+	conf.env.LIBPATH_QT5WEBENGINEWIDGETS = '@Qt5WebEngine@/lib'
-+	conf.env.LIB_QT5WEBENGINEWIDGETS = [
-+		'Qt5WebEngineWidgets',
-+		'Qt5Core',
-+		'Qt5Gui',
-+		'Qt5WebEngineCore',
-+		'Qt5Widgets',
-+		'Qt5Network',
-+		'Qt5Quick',
-+		'Qt5PrintSupport'
-+	]
-+	print("conf.env.LIB_QT5SVG : ",conf.env)
- 	if not conf.env.LIB_QT5SVG: conf.fatal('Could not find Qt5Svg - Semantik requires Qt >= 5')
- 	if not conf.env.LIB_QT5WEBENGINEWIDGETS: conf.fatal('Could not find Qt5WebEngineWidgets - check `pkg-config --libs Qt5WebEngineWidgets`')
- 	if not conf.env.LIB_QT5DBUS: conf.fatal('Install Qt Dbus')
-@@ -186,7 +206,11 @@
- 		raise ValueError('Could not find QT_HOST_DATA')
- 
- 	specpath = conf.cmd_and_log(conf.env.QMAKE + ['-query', 'QMAKE_SPEC'], quiet=0, stdout=True)
-+	path = "@Qt5Base_dev@"
-+	print("\n\n[log] specpath = ",specpath,"\n")
-+	print("\n\n[log] path = ",path,"\n")
- 	specpath = os.path.join(path, 'mkspecs', specpath.strip())
-+	print("\n\n[log] specpath = ",specpath,"\n")
- 	if not os.path.exists(specpath):
- 		raise ValueError('No spec path, cannot build')
- 
-@@ -196,17 +220,29 @@
- 
- 	conf.env.append_value('INCLUDES_KDECORE', specpath)
- 
--	libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets',
--		'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui',
--		'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore',
--		'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi', 'KF5AuthCore']
-+	libs = {
-+            'KF5KIOCore': '@KF5KIOCore_dev@',
-+            'KF5Auth': '@KF5Auth_dev@',
-+            'KF5KIOWidgets': '@KF5KIOCore_dev@',
-+            'KF5IconThemes': '@KF5IconThemes_dev@',
-+            'KF5ConfigWidgets': '@KF5ConfigWidgets_dev@',
-+            'KF5XmlGui': '@KF5XmlGui_dev@',
-+            'KF5CoreAddons': '@KF5CoreAddons_dev@',
-+            'KF5ConfigGui': '@KF5Config_dev@',
-+            'KF5ConfigCore': '@KF5Config_dev@',
-+            'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@',
-+            'KF5I18n': '@KF5I18n_dev@',
-+            'KF5SonnetUi': '@KF5SonnetUi_dev@',
-+            'KF5AuthCore': '@KF5Auth_dev@',
-+        }
- 
--	for lib in libs:
-+	for lib,mkspec_path in libs.items():
-+		print("[log] mkspec : ", mkspec_path)
- 		name = lib[3:]
- 		if not name.startswith('K') and name != 'SonnetUi':
- 			name = 'K' + name
--
--		p = '%s/qt_%s.pri' % (path, name)
-+		p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name)
-+		print("[log] path :",path,", name : ",name)
- 		try:
- 			code = Utils.readf(p)
- 		except EnvironmentError:
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
deleted file mode 100644
index 5ce67c09a684..000000000000
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  wrapQtAppsHook,
-  makeDesktopItem,
-  libxrender,
-  libxrandr,
-  libxcursor,
-  libx11,
-  libxext,
-  libxi,
-  libxcb,
-  libGL,
-  glib,
-  nss,
-  nspr,
-  expat,
-  alsa-lib,
-  qtbase,
-  qtdeclarative,
-  qtsvg,
-  qtlocation,
-  qtwebchannel,
-  qtwebengine,
-}:
-
-let
-  libPath = lib.makeLibraryPath [
-    libxrender
-    libxrandr
-    libxcursor
-    libx11
-    libxext
-    libxi
-    libxcb
-    libGL
-    glib
-    nss
-    nspr
-    expat
-    alsa-lib
-    qtbase
-    qtdeclarative
-    qtsvg
-    qtlocation
-    qtwebchannel
-    qtwebengine
-  ];
-in
-stdenv.mkDerivation rec {
-  pname = "eagle";
-  version = "9.6.2";
-
-  src = fetchurl {
-    url = "https://eagle-updates.circuits.io/downloads/${
-      builtins.replaceStrings [ "." ] [ "_" ] version
-    }/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
-    sha256 = "18syygnskl286kn8aqfzzdsyzq59d2w19y1h1ynyxsnrvkyv71h0";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "eagle";
-    exec = "eagle";
-    icon = "eagle";
-    comment = "Schematic capture and PCB layout";
-    desktopName = "Eagle";
-    genericName = "Schematic editor";
-    categories = [ "Development" ];
-  };
-
-  nativeBuildInputs = [ wrapQtAppsHook ];
-
-  buildInputs = [
-    libxrender
-    libxrandr
-    libxcursor
-    libx11
-    libxext
-    libxi
-    libxcb
-    libGL
-    glib
-    nss
-    nspr
-    expat
-    alsa-lib
-    qtbase
-    qtdeclarative
-    qtsvg
-    qtlocation
-    qtwebchannel
-    qtwebengine
-  ];
-
-  installPhase = ''
-    # Extract eagle tarball
-    mkdir "$out"
-    tar -xzf "$src" -C "$out"
-
-    # Install manpage
-    mkdir -p "$out"/share/man/man1
-    ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1
-
-    patchelf \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${libPath}:$out/eagle-${version}/lib:${lib.getLib stdenv.cc.cc}/lib" \
-      "$out"/eagle-${version}/eagle
-
-    mkdir -p "$out"/bin
-    ln -s "$out"/eagle-${version}/eagle "$out"/bin/eagle
-
-    # Remove bundled libraries that are available in nixpkgs
-    # TODO: There still may be unused bundled libraries
-    rm "$out"/eagle-${version}/lib/libQt5*.so.5
-    rm "$out"/eagle-${version}/lib/{libxcb-*.so.*,libX*.so.*,libxshmfence.so.1}
-    rm "$out"/eagle-${version}/lib/{libEGL.so.1,libglapi.so.0,libgbm.so.1}
-
-    # No longer needed (we don't use the bundled Qt libraries)
-    rm -r "$out"/eagle-${version}/libexec
-    rm -r "$out"/eagle-${version}/plugins
-
-    # Make desktop item
-    mkdir -p "$out"/share/applications
-    cp "$desktopItem"/share/applications/* "$out"/share/applications/
-    mkdir -p "$out"/share/pixmaps
-    ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/pixmaps/eagle.png
-  '';
-
-  meta = {
-    description = "Schematic editor and PCB layout tool from Autodesk (formerly CadSoft)";
-    homepage = "https://www.autodesk.com/products/eagle/overview";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/science/electronics/eagle/eagle7_fixer.c b/pkgs/applications/science/electronics/eagle/eagle7_fixer.c
deleted file mode 100644
index da9da4dcbd3a..000000000000
--- a/pkgs/applications/science/electronics/eagle/eagle7_fixer.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * LD_PRELOAD trick to make Eagle (schematic editor and PCB layout tool from
- * CadSoft) work from a read-only installation directory.
- *
- * When Eagle starts, it looks for the license file in <eagle>/bin/eagle.key
- * (where <eagle> is the install path). If eagle.key is not found, Eagle checks
- * for write access to <eagle>/bin/, shows a license dialog to the user and
- * then attempts to write a license file to <eagle>/bin/.
- *
- * This will of course fail when Eagle is installed in the read-only Nix store.
- * Hence this library that redirects accesses to the those paths in the
- * following way:
- *
- *   <eagle>/bin              => $HOME
- *   <eagle>/bin/eagle.key    => $HOME/.eagle.key
- *
- * Also, if copying an example project to ~/eagle/ (in the Eagle GUI), Eagle
- * chmod's the destination with read-only permission bits (presumably because
- * the source is read-only) and fails to complete the copy operation.
- * Therefore, the mode argument in calls to chmod() is OR'ed with the S_IWUSR
- * bit (write by owner).
- *
- * Usage:
- *   gcc -shared -fPIC -DEAGLE_PATH="$out/eagle-${version}" eagle_fixer.c -o eagle_fixer.so -ldl
- *   LD_PRELOAD=$PWD/eagle_fixer.so ./result/bin/eagle
- *
- * To see the paths that are modified at runtime, set the environment variable
- * EAGLE_FIXER_DEBUG to 1.
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <dlfcn.h>
-#include <limits.h>
-#include <sys/stat.h>
-
-#ifndef EAGLE_PATH
-#error Missing EAGLE_PATH, path to the eagle-${version} installation directory.
-#endif
-
-typedef FILE *(*fopen_func_t)(const char *path, const char *mode);
-typedef int (*access_func_t)(const char *pathname, int mode);
-typedef int (*chmod_func_t)(const char *path, mode_t mode);
-
-/*
- * Map <eagle>/bin to $HOME and <eagle>/bin/eagle.key to $HOME/.eagle.key
- *
- * Path is truncated if bigger than PATH_MAX. It's not threadsafe, but that's
- * OK.
- */
-static const char *redirect(const char *pathname)
-{
-	static char buffer[PATH_MAX];
-	const char *homepath;
-	const char *new_path;
-	static int have_warned;
-
-	homepath = getenv("HOME");
-	if (!homepath) {
-		homepath = "/";
-		if (!have_warned && getenv("EAGLE_FIXER_DEBUG")) {
-			fprintf(stderr, "eagle_fixer: HOME is unset, using \"/\" (root) instead.\n");
-			have_warned = 1;
-		}
-	}
-
-	new_path = pathname;
-	if (strcmp(EAGLE_PATH "/bin", pathname) == 0) {
-		/* redirect to $HOME */
-		new_path = homepath;
-	} else if (strcmp(EAGLE_PATH "/bin/eagle.key", pathname) == 0) {
-		/* redirect to $HOME/.eagle.key */
-		snprintf(buffer, PATH_MAX, "%s/.eagle.key", homepath);
-		buffer[PATH_MAX-1] = '\0';
-		new_path = buffer;
-	}
-
-	return new_path;
-}
-
-FILE *fopen(const char *pathname, const char *mode)
-{
-	FILE *fp;
-	const char *path;
-	fopen_func_t orig_fopen;
-
-	orig_fopen = (fopen_func_t)dlsym(RTLD_NEXT, "fopen");
-	path = redirect(pathname);
-	fp = orig_fopen(path, mode);
-
-	if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) {
-		fprintf(stderr, "eagle_fixer: fopen(\"%s\", \"%s\") => \"%s\": fp=%p\n", pathname, mode, path, fp);
-	}
-
-	return fp;
-}
-
-int access(const char *pathname, int mode)
-{
-	int ret;
-	const char *path;
-	access_func_t orig_access;
-
-	orig_access = (access_func_t)dlsym(RTLD_NEXT, "access");
-	path = redirect(pathname);
-	ret = orig_access(path, mode);
-
-	if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) {
-		fprintf(stderr, "eagle_fixer: access(\"%s\", %d) => \"%s\": ret=%d\n", pathname, mode, path, ret);
-	}
-
-	return ret;
-}
-
-int chmod(const char *pathname, mode_t mode)
-{
-	int ret;
-	mode_t new_mode;
-	chmod_func_t orig_chmod;
-
-	orig_chmod = (chmod_func_t)dlsym(RTLD_NEXT, "chmod");
-	new_mode = mode | S_IWUSR;
-	ret = orig_chmod(pathname, new_mode);
-
-	if (getenv("EAGLE_FIXER_DEBUG")) {
-		fprintf(stderr, "eagle_fixer: chmod(\"%s\", %o) => %o: ret=%d\n", pathname, mode, new_mode, ret);
-	}
-
-	return ret;
-}
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index fc60ec0b1f28..021d01fffce4 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -24,7 +24,7 @@ let
       lib.optionalString (num != null) ''
         -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \
         -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \
-        -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
+        -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs
       '';
 
   start_script = ''
diff --git a/pkgs/applications/science/misc/openmodelica/combined/default.nix b/pkgs/applications/science/misc/openmodelica/combined/default.nix
deleted file mode 100644
index 57dfa173cf59..000000000000
--- a/pkgs/applications/science/misc/openmodelica/combined/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  stdenv,
-  lib,
-  openmodelica,
-  symlinkJoin,
-  gnumake,
-  blas,
-  lapack,
-  makeWrapper,
-}:
-symlinkJoin {
-  name = "openmodelica-combined";
-  paths = with openmodelica; [
-    omcompiler
-    omsimulator
-    omplot
-    omparser
-    omedit
-    omlibrary
-    omshell
-  ];
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  postBuild = ''
-    wrapProgram $out/bin/OMEdit \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          gnumake
-          stdenv.cc
-        ]
-      } \
-      --prefix LIBRARY_PATH : "${
-        lib.makeLibraryPath [
-          blas
-          lapack
-        ]
-      }" \
-      --set-default OPENMODELICALIBRARY "${openmodelica.omlibrary}/lib/omlibrary"
-  '';
-
-  meta = {
-    description = "Open-source Modelica-based modeling and simulation environment intended for industrial and academic usage";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix
deleted file mode 100644
index ece043751cdc..000000000000
--- a/pkgs/applications/science/misc/openmodelica/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  lib,
-  newScope,
-  libsForQt5,
-  clangStdenv,
-}:
-lib.makeScope newScope (
-  self:
-  let
-    callPackage = self.newScope { stdenv = clangStdenv; };
-    callQtPackage = self.newScope (libsForQt5 // { stdenv = clangStdenv; });
-  in
-  {
-    mkOpenModelicaDerivation = callPackage ./mkderivation { };
-    omcompiler = callPackage ./omcompiler { };
-    omplot = callQtPackage ./omplot { };
-    omsimulator = callPackage ./omsimulator { };
-    omparser = callPackage ./omparser { };
-    omedit = callQtPackage ./omedit { };
-    omlibrary = callPackage ./omlibrary { };
-    omshell = callQtPackage ./omshell { };
-    combined = callPackage ./combined { };
-  }
-)
diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix
deleted file mode 100644
index c5b7648e5558..000000000000
--- a/pkgs/applications/science/misc/openmodelica/mkderivation/default.nix
+++ /dev/null
@@ -1,132 +0,0 @@
-# mkOpenModelicaDerivation is an mkDerivation function for packages
-# from OpenModelica suite.
-
-{
-  stdenv,
-  lib,
-  fetchgit,
-  autoconf,
-  automake,
-  libtool,
-  cmake,
-  autoreconfHook,
-  symlinkJoin,
-}:
-pkg:
-let
-  inherit (builtins)
-    hasAttr
-    getAttr
-    length
-    elemAt
-    ;
-  inherit (lib) attrByPath concatStringsSep;
-
-  # A few helpers functions:
-
-  # getAttrDef is just a getAttr with default fallback
-  getAttrDef =
-    attr: default: x:
-    attrByPath [ attr ] default x;
-
-  # getAttr-like helper for optional append to string:
-  # "Hello" + appendByAttr "a" " " {a = "world";} = "Hello world"
-  # "Hello" + appendByAttr "a" " " {} = "Hello"
-  appendByAttr =
-    attr: sep: x:
-    lib.optionalString (hasAttr attr x) (sep + (getAttr attr x));
-
-  # Are there any OM dependencies at all?
-  ifDeps = length pkg.omdeps != 0;
-
-  # Dependencies of current OpenModelica-target joined in one file tree.
-  # Return the dep itself in case it is a single one.
-  joinedDeps =
-    if length pkg.omdeps == 1 then
-      elemAt pkg.omdeps 0
-    else
-      symlinkJoin {
-        name = pkg.pname + "-omhome";
-        paths = pkg.omdeps;
-      };
-
-  # Should we run ./configure for the target pkg?
-  omautoconf = getAttrDef "omautoconf" false pkg;
-
-  # Name of the make target
-  omtarget = getAttrDef "omtarget" pkg.pname pkg;
-
-  # Directory of target sources
-  omdir = getAttrDef "omdir" pkg.pname pkg;
-
-  # Simple to to m4 configuration scripts
-  postPatch =
-    lib.optionalString ifDeps ''
-      sed -i ''$(find -name omhome.m4) -e 's|if test ! -z "$USINGPRESETBUILDDIR"|if test ! -z "$USINGPRESETBUILDDIR" -a -z "$OMHOME"|'
-    ''
-    + appendByAttr "postPatch" "\n" pkg;
-
-  # Update shebangs in the scripts before running configuration.
-  preAutoreconf = "patchShebangs --build common" + appendByAttr "preAutoreconf" "\n" pkg;
-
-  # Tell OpenModelica where built dependencies are located.
-  configureFlags =
-    lib.optional ifDeps "--with-openmodelicahome=${joinedDeps}" ++ getAttrDef "configureFlags" [ ] pkg;
-
-  # Our own configurePhase that accounts for omautoconf
-  configurePhase = ''
-    runHook preConfigure
-    export configureFlags="''${configureFlags} --with-ombuilddir=$PWD/build --prefix=$prefix"
-    ./configure --no-recursion $configureFlags
-    ${lib.optionalString omautoconf "(cd ${omdir}; ./configure $configureFlags)"}
-    runHook postConfigure
-  '';
-
-  # Targets that we want to build ourselves:
-  deptargets = lib.forEach pkg.omdeps (dep: dep.omtarget);
-
-  # ... so we ask openmodelica makefile to skip those targets.
-  preBuild = ''
-    for target in ${concatStringsSep " " deptargets}; do
-      touch ''${target}.skip;
-    done
-  ''
-  + appendByAttr "preBuild" "\n" pkg;
-
-  makeFlags = "${omtarget}" + appendByAttr "makeFlags" " " pkg;
-
-  installFlags = "-i " + appendByAttr "installFlags" " " pkg;
-
-in
-stdenv.mkDerivation (
-  pkg
-  // {
-    inherit
-      omtarget
-      postPatch
-      preAutoreconf
-      configureFlags
-      configurePhase
-      preBuild
-      makeFlags
-      installFlags
-      ;
-
-    src = fetchgit (import ./src-main.nix);
-    version = "1.18.0";
-
-    nativeBuildInputs = getAttrDef "nativeBuildInputs" [ ] pkg ++ [
-      autoconf
-      automake
-      libtool
-      cmake
-      autoreconfHook
-    ];
-
-    buildInputs = getAttrDef "buildInputs" [ ] pkg ++ lib.optional ifDeps joinedDeps;
-
-    dontUseCmakeConfigure = true;
-
-    hardeningDisable = [ "format" ];
-  }
-)
diff --git a/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix b/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix
deleted file mode 100644
index 1ab8d9390db3..000000000000
--- a/pkgs/applications/science/misc/openmodelica/mkderivation/src-main.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  url = "https://github.com/OpenModelica/OpenModelica/";
-  rev = "49be4faa5a625a18efbbd74cc2f5be86aeea37bb";
-  sha256 = "0klqiy4sdizl1djb9hb0arcvfcjz2mmnakrjx81mmxcbr8yq2016";
-  fetchSubmodules = true;
-}
-# Update with: nix run -f ./nixpkgs/default.nix nix-prefetch-git -c nix-prefetch-git 'https://github.com/OpenModelica/OpenModelica/' 'v1.18.0' --fetch-submodules
diff --git a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix
deleted file mode 100644
index c28d7d7be3f8..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  stdenv,
-  lib,
-  gfortran,
-  flex,
-  bison,
-  jre8,
-  blas,
-  lapack,
-  curl,
-  readline,
-  expat,
-  pkg-config,
-  buildPackages,
-  targetPackages,
-  libffi,
-  binutils,
-  mkOpenModelicaDerivation,
-}:
-let
-  isCross = stdenv.buildPlatform != stdenv.hostPlatform;
-  nativeOMCompiler = buildPackages.openmodelica.omcompiler;
-in
-mkOpenModelicaDerivation (
-  {
-    pname = "omcompiler";
-    omtarget = "omc";
-    omdir = "OMCompiler";
-    omdeps = [ ];
-    omautoconf = true;
-
-    nativeBuildInputs = [
-      jre8
-      gfortran
-      flex
-      bison
-      pkg-config
-    ]
-    ++ lib.optional isCross nativeOMCompiler;
-
-    buildInputs = [
-      targetPackages.stdenv.cc.cc
-      blas
-      lapack
-      curl
-      readline
-      expat
-      libffi
-      binutils
-    ];
-
-    postPatch = ''
-      sed -i -e '/^\s*AR=ar$/ s/ar/${stdenv.cc.targetPrefix}ar/
-                 /^\s*ar / s/ar /${stdenv.cc.targetPrefix}ar /
-                 /^\s*ranlib/ s/ranlib /${stdenv.cc.targetPrefix}ranlib /' \
-          $(find ./OMCompiler -name 'Makefile*')
-    '';
-
-    env.CFLAGS = toString [
-      "-Wno-error=dynamic-exception-spec"
-      "-Wno-error=implicit-function-declaration"
-    ];
-
-    preFixup = ''
-      for entry in $(find $out -name libipopt.so); do
-        patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$entry"
-        patchelf --set-rpath '$ORIGIN':"$(patchelf --print-rpath $entry)" "$entry"
-      done
-    '';
-
-    meta = {
-      description = "Modelica compiler from OpenModelica suite";
-      homepage = "https://openmodelica.org";
-      license = lib.licenses.gpl3Only;
-      maintainers = with lib.maintainers; [
-        balodja
-      ];
-      platforms = lib.platforms.linux;
-    };
-  }
-  // lib.optionalAttrs isCross {
-    configureFlags = [ "--with-omc=${nativeOMCompiler}/bin/omc" ];
-  }
-)
diff --git a/pkgs/applications/science/misc/openmodelica/omedit/default.nix b/pkgs/applications/science/misc/openmodelica/omedit/default.nix
deleted file mode 100644
index aad694acd3a9..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omedit/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  jre8,
-  qmake,
-  qtbase,
-  qttools,
-  qtwebkit,
-  qtxmlpatterns,
-  binutils,
-  wrapQtAppsHook,
-  openmodelica,
-  openscenegraph,
-  mkOpenModelicaDerivation,
-}:
-with openmodelica;
-mkOpenModelicaDerivation {
-  pname = "omedit";
-  omdir = "OMEdit";
-  omdeps = [
-    omcompiler
-    omplot
-    omparser
-    omsimulator
-  ];
-  omautoconf = true;
-
-  nativeBuildInputs = [
-    jre8
-    qmake
-    qtbase
-    qttools
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qtwebkit
-    openscenegraph
-    qtxmlpatterns
-    binutils
-  ];
-
-  postPatch = ''
-    sed -i ''$(find -name qmake.m4) -e '/^\s*LRELEASE=/ s|LRELEASE=.*$|LRELEASE=${lib.getDev qttools}/bin/lrelease|'
-  '';
-
-  dontUseQmakeConfigure = true;
-  QMAKESPEC = "linux-clang";
-
-  meta = {
-    description = "Modelica connection editor for OpenModelica";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix
deleted file mode 100644
index 76f6d85b8bb5..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchgit,
-  bash,
-  openmodelica,
-  mkOpenModelicaDerivation,
-}:
-let
-  fakegit = import ./fakegit.nix {
-    inherit
-      lib
-      stdenv
-      fetchgit
-      bash
-      ;
-  };
-in
-mkOpenModelicaDerivation {
-  pname = "omlibrary";
-  omdir = "libraries";
-  omtarget = "omlibrary-all";
-  omdeps = [ openmodelica.omcompiler ];
-
-  postPatch = ''
-    patchShebangs --build libraries
-    cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh
-
-    # The EMOTH library is broken in OpenModelica 1.17.0
-    # Let's remove it from targets.
-    sed -i -e '/^OTHER_LIBS=/ s/EMOTH //' libraries/Makefile.libs
-  '';
-
-  meta = {
-    description = "Collection of Modelica libraries to use with OpenModelica,
-including Modelica Standard Library";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix
deleted file mode 100644
index 6ad49d7655ba..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchgit,
-  bash,
-}:
-let
-  mkscript = path: text: ''
-    mkdir -pv `dirname ${path}`
-    cat > ${path} <<"EOF"
-    #!${bash}/bin/bash
-    ME=$(basename ${path})
-    ${text}
-    EOF
-    sed -i "s@%out@$out@g" ${path}
-    chmod +x ${path}
-  '';
-
-  hashname =
-    r:
-    let
-      rpl = lib.replaceStrings [ ":" "/" ] [ "_" "_" ];
-    in
-    (rpl r.url) + "-" + (rpl r.rev);
-
-in
-stdenv.mkDerivation {
-  name = "fakegit";
-
-  buildCommand = ''
-    mkdir -pv $out/repos
-    ${lib.concatMapStrings (r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n") (
-      import ./src-libs.nix
-    )}
-
-    ${mkscript "$out/bin/checkout-git.sh" ''
-      if test "$#" -ne 4; then
-        echo "Usage: $0 DESTINATION URL GITBRANCH HASH"
-        exit 1
-      fi
-      DEST=$1
-      URL=`echo $2 | tr :/ __`
-      GITBRANCH=$3
-      REVISION=$4
-
-      REVISION=`echo $REVISION | tr :/ __`
-
-      rm -rf $DEST
-      mkdir -pv $DEST
-      echo "FAKEGIT cp -r %out/repos/$URL-$REVISION $DEST" >&2
-      cp -r %out/repos/$URL-$REVISION/* $DEST
-      chmod u+w -R $DEST
-    ''}
-  '';
-}
diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix
deleted file mode 100644
index 18491010d807..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omlibrary/src-libs.nix
+++ /dev/null
@@ -1,476 +0,0 @@
-[
-  {
-    url = "https://github.com/modelica-3rdparty/AdvancedNoise.git";
-    rev = "5ce57acd279dadd0d25b76a6b02d3f9e9d061246";
-    sha256 = "07jjbj0y6bak269md3xniqb5lgc33m92ar5qixqxj5yxdjaahfs2";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/RWTH-EBC/AixLib.git";
-    rev = "65e49ddf5c935846888a61aa303e52c909619079";
-    sha256 = "18xn8j3x3j4x9bpjgqnq0b6p3yzzsg5n62fv1ldqbbjcmi0vimd5";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/RWTH-EBC/AixLib.git";
-    rev = "v0.4.0";
-    sha256 = "0dw34mjq29n55xh51g1c9a9d0d8gbpn16gj309dfxn4v2hbnfvzx";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/AlgebraTestSuite.git";
-    rev = "b937e1a7f447138c59abec9b2092f84f16bf02e8";
-    sha256 = "0406inasx61dk7vcnziiyhxkna7g61a5hn0znnbxj817hz6q11zn";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ApproxSpline.git";
-    rev = "28420f5c1a88c9cd069defbd8c05e4a78a090675";
-    sha256 = "07gpyi2brj5zpvrlsnflqjnhbrgxvpqbdshp8lp4lh9mnj5jv95d";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/OpenModelica/BioChem.git";
-    rev = "v1.0.2";
-    sha256 = "037bvj2lqrslg8k5r0rjgdzccslj9bj25b55k4g440vabm5p05qm";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/BondGraph.git";
-    rev = "20c23e60d12989bd4668ccac47659d82d39d29cc";
-    sha256 = "0yrkk708v4bvf423xb4zgpmnaj8qhq5primdg758ayddgli23wa9";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/BrineProp.git";
-    rev = "834fb3519ca8f89efe268582d39d00a7c3991150";
-    sha256 = "1iwqh4kr36wgxc0gci63gdgbqln2sap1w4bkydk1vkss2s302lg4";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/EDF-TREE/BuildSysPro.git";
-    rev = "v3.3.0";
-    sha256 = "1cvcany3q9p1xndarxa2d8mmqxdnqk22476q8l61nayz5qy25x61";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/BuildingControlLib.git";
-    rev = "v1.0.0";
-    sha256 = "0ckdxway0m755mbrl94k4458sijzgknlzsrf7xs5bjymxchm8r2m";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/BuildingSystems.git";
-    rev = "c3070d48015ee75c1577f349cb388a498bef7270";
-    sha256 = "0r876wm6f1xx4cli1lqlylpl3zgaddmy06hcafbnzry9j38vbz4y";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/lbl-srg/modelica-buildings.git";
-    rev = "v6.0.0";
-    sha256 = "0rnnk1clji0myzr7adggki6knbl6v8381vwnqgiz8mkxbmzdwm4f";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/lbl-srg/modelica-buildings.git";
-    rev = "v7.0.0";
-    sha256 = "04n04pp4zvyg8n8h7h79c3wyk7lmn940mh7qzs0lv76g1ybypnlz";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Chemical.git";
-    rev = "5645573fced862430b7b598b4d7ec1a39c7aa0fa";
-    sha256 = "1kh7kpmjfz55pb8553srlnrh8l00nw21xf5mjzh7nx9b1rndnmyg";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/DeployStructLib.git";
-    rev = "v1.0";
-    sha256 = "1k4zw9lnd0javw4zigxc15l58yf7xdz36b7808g65qxy89w6ksr2";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/DisHeatLib.git";
-    rev = "b11f53379c122870a52f2da9b1705d2c911cd21d";
-    sha256 = "1vm96a4z0b40r0nisxrrzyvan4yphjdkx4ad655phva2636xb5rr";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/AHaumer/DriveControl.git";
-    rev = "b7233fd97a92867bb4ec2c3647c7f7e888398644";
-    sha256 = "0nyp1n8wrkjzfypsmjjzac0g9p4wbc1cxxr040fj20bqdg9l3h1b";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/christiankral/ElectroMechanicalDrives.git";
-    rev = "v2.2.0";
-    sha256 = "0012phmn1y9fgpph45lwbjk0yhm5czidf2z6khm8lddvk93wf31b";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ExternData.git";
-    rev = "v2.5.0";
-    sha256 = "19dsyq1mk5vl54fqaffzqafm5w94l011cy7pg16c7i933dbqnkki";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/ExternalMedia.git";
-    rev = "6138312c96142ff3c01190147e6277991bfa2fca";
-    sha256 = "1d9g2hbdvgz13j7kdi1kglkkllj9f00x3dwdp5piyypvs464jsn5";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ExternalMemoryLib.git";
-    rev = "6488d5815bda23c665123baa916789e283e16d2c";
-    sha256 = "06y1i5w690b3b9x23nzls8y67fl7yd7bn4xl5j0dmyi4qx33aqda";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/FMITest.git";
-    rev = "a67a276083f4010b249802ad8fc70dc30c09adfd";
-    sha256 = "0mg8jlvlwql2nsjiy7c3rdibv73bkfk149ac0450d5pc0hfn9mln";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/FailureModes.git";
-    rev = "v1.2.1";
-    sha256 = "1z8bwrld1rkydgssab5gnrd76frrbky8qxi1lvlaf2jidj6bzn1l";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/FaultTriggering.git";
-    rev = "v0.6.6";
-    sha256 = "0a08yyrbg4a49s0bgqgyds6pidx9xr47yspvl9bdak1mq34qibip";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/FeedDriveLibrary.git";
-    rev = "1.0.1";
-    sha256 = "15fi9dj6zgl0fr90cwxqjbpphj0dwrrmk74hf25j6zd85w2ycqdz";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/DLR-SR/FractionalOrder.git";
-    rev = "99918820e346c362c3ad52d782c8215e5deeac4c";
-    sha256 = "1pycss6fqh86frfdbdfffjhaz09fz1558f9azgckhf8drx6ry1qs";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Greenhouses-Library.git";
-    rev = "89ae0e8097eb0751abce2013d304fa5f9c09b885";
-    sha256 = "1q77xj6aysqsn3d7kjmcq7dihbw18iqm35ifzdi75xgf3cgwla4f";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/christiankral/HanserModelica.git";
-    rev = "v1.1.0";
-    sha256 = "0zwkrhg2y42m18p4z51izrickiv1vikgz0z7fpjia4dbppckav8i";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git";
-    rev = "3b4a4bca94d388744b2d045344ea2f9b0b4d405b";
-    sha256 = "17fzpan89075vb5vbhw5ylgxcdsmj2vjnmmka7cgzh06izb69nvh";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/ibpsa/modelica-ibpsa.git";
-    rev = "v3.0.0";
-    sha256 = "0xwgfndlw76zfmiiqadl85l9na9igsqlmfcawx526sdw2lhhgics";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/open-ideas/IDEAS.git";
-    rev = "v2.1.0";
-    sha256 = "0xp0zg6ib5536d5vl361lsn5w5faqdf6djhcmfxns629wjima8rn";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git";
-    rev = "v1.1.0";
-    sha256 = "1nvgx94iy1pws0768anrl7ssjlzslb5mbp21j7xvf6wpqfmj0npc";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/christiankral/KeyWordIO.git";
-    rev = "v0.9.0";
-    sha256 = "10kvj6zn2r6m3403ja8nkkxbfcchkz0pfk3g70ibr76zivxb5nim";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/FishSim/LibRAS.git";
-    rev = "fca9de50a484a2213f3ca1b39e275c237c471688";
-    sha256 = "0w1c87sifq8klq0f2l70qxjrlvahyxy1cx9rln80rni4d427yc1k";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/LinearMPC.git";
-    rev = "v1.0";
-    sha256 = "1crj60i5f33l9pgip0xbv6ankcga7px0644cj7c2wnzn1fjmn2k8";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/looms-polimi/MEV.git";
-    rev = "v1.0.1";
-    sha256 = "1a7ih9lc01wzaq8a8aznggpi4aqnczyzq49q5hc4fqvmfwl7l0j3";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ModPowerSystems.git";
-    rev = "df3afce27d5e935c4111f392275744a655abe216";
-    sha256 = "1b1fikm92lv6gj82imka3hxbjwv04i4h33y69yhcxdpqa6z6hm4z";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git";
-    rev = "4a91d52248b0f17415bba1d58881fc730bd94215";
-    sha256 = "19caxz6hvlrsls3b2387a24zwwnykbb138jpb42gwpy8jlh93yzi";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/OpenModelica/OpenModelica-ModelicaStandardLibrary.git";
-    rev = "cab27240a4a3ed4ea137226f056bbc0d79543f7a";
-    sha256 = "06y911i2hs7hg4ykhb8wngvxhwnaww8rsakwa7ssd047a7glzsb0";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Modelica-Arduino.git";
-    rev = "v0.1.0";
-    sha256 = "1n34dksqhrn1synv2mp2ifk4dxyhp15f5v1jb1b3dbw9n19951qb";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Modelica-GNU_ScientificLibrary.git";
-    rev = "9235ab28bdd7f0fe3e7abba48af53d73332858ec";
-    sha256 = "168g9gg12lfa863ifs41bnx6yd0yyjnal6986dgpm51dj5arw6id";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Modelica-MVEM.git";
-    rev = "v1.0.1";
-    sha256 = "1p68691dnl06lgwm4bl9g036brn4vl7m5x3gq4rxc291339frixk";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ModelicaADS.git";
-    rev = "v1.0.1";
-    sha256 = "0fhxrl07d7v3wa79d30psm1gxydc0p7s2akfirdx6dai0633skp9";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/xogeny/ModelicaBook.git";
-    rev = "v0.6.0";
-    sha256 = "0yqbll6p738yvpi1x11cjngpz2glda07mljrkjlm23p7l53x63dc";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-compliance/compliance.git";
-    rev = "8a91e75d8a26acc4de30fc0e5d5e9db83c970bd6";
-    sha256 = "1cym1wlgsvfrryq8zqzzrgs4wam1l7pc20q07hk3d615nhq21lg6";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ModelicaDFR.git";
-    rev = "37a441934d05330cf3d13e9ec551954d27eca84c";
-    sha256 = "13rpcs8cl9x15vi655150zmhmg1iaxpzvxrl3rqif46zpl5dhlj2";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/Modelica_DeviceDrivers.git";
-    rev = "v1.8.2";
-    sha256 = "16c0p9zn0qrraz59ivinibmikdd251plm1vqngznzhksjwvz6bja";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/Modelica_LinearSystems2.git";
-    rev = "v2.3.5";
-    sha256 = "0rzicynqgayydxqynnairxk7ybg4alv1xnfz8cgkrpicl2g9bacg";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Modelica_Requirements.git";
-    rev = "a427b5cb7997e9036c577d219e6b8a5d0c28389a";
-    sha256 = "1ihx46kifnfi9kw1g8nmd9sarl766whbzdk6a44alczsya4gg45k";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/Modelica_Synchronous.git";
-    rev = "c8350276bfd945086962cf4150ba941b9c57ed13";
-    sha256 = "12ad7fpjy50ky3lvl65r9d5xvlzvw5yqdnbp4rsgl3qw7s3wrmja";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/jwindahlModelon/MultiPhaseMixtureMedia.git";
-    rev = "0bda0c58af6384f8e0edf7aa7520afb369af3e38";
-    sha256 = "11bqm69504bh4h05dxlwdmjfxwls06mr49cz47kl8jmrygkfi4i2";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/OpenIPSL/OpenIPSL.git";
-    rev = "v1.5.0";
-    sha256 = "09xrcz0rdxdy220ki5zyl7920y0a4lg24p0aibna4ad15vszhhwj";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Optimisers.git";
-    rev = "e33c69edaad6dad8029167b0ca00533964a6fe37";
-    sha256 = "0hcxsrr2n4fzaxdjvgvqayz38kpfk86cclvg5pzcfmjc5bznb8bs";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/lochel/PNlib.git";
-    rev = "059545d48dd9ceeccfa3b4e47689ec8dd334dcd8";
-    sha256 = "1a0hxkgsi4klw9c8zav1dy2p1c85ald29gx82hfacwv55xl9f127";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/PVSystems.git";
-    rev = "v0.6.2";
-    sha256 = "0vcgvdaqfbn46lpzk0kvsif3d55wf8yzhkbdpf5zv04kv7zw25w9";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/PhotoVoltaics.git";
-    rev = "v1.6.0";
-    sha256 = "0zqx77z217iln3vfxn2v3c2jl0jz5kgcd96ylvimjnwr30mxr09n";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/MarekMatejak/Physiolibrary.git";
-    rev = "v2.3.1";
-    sha256 = "0nxfw63m278gaff18zz29n2s1vk4kwdbv2qvbjmcq86fl1i5b3bg";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Physiomodel.git";
-    rev = "v1.0.0";
-    sha256 = "1sdhv5qgjqv3zdq57pkkrh04ainwv9n5zqd8mb9a3ybjmwdjf6f9";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/dzimmer/PlanarMechanics.git";
-    rev = "55224a9e76de8aa7f708236bd4d7dee624ecba50";
-    sha256 = "0hf7vi44adss86x5ahk5if7bdjgw773d8mb3d8ianq12g8azycyd";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/PowerGrids/PowerGrids.git";
-    rev = "v1.0.0";
-    sha256 = "06bx8mqvmizhfwg99djdfgh2mblc4wzmg0zq4ilrp586jwfninmz";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/PowerSystems.git";
-    rev = "v1.0.0";
-    sha256 = "1xwhwich7gi6vl33zl2r78xdjklchgkjcnvww6390j20l1wjznkn";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/PowerSystems.git";
-    rev = "f0721333f4875143565147a7d043bee1c300873b";
-    sha256 = "0gbvx0gzf3akb0w7yvdxfq2y4ps91cy5b93iwnvnw7652x716813";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git";
-    rev = "v1.0.2";
-    sha256 = "0ch4la04hm059ii5wzph9gsbvqhnfqrvvpqi57qn27bm10c4la0m";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/casella/ScalableTestSuite.git";
-    rev = "v1.11.5";
-    sha256 = "0bhj1q9b8d29nrbr253zszy1w1yvyizvyr3law1pqjj6mhbqmg4i";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Servomechanisms.git";
-    rev = "3bf82ba5d3f31b4a0ae05f99ae690037358e153e";
-    sha256 = "1swka7d58wkg5pqv59lqgfi7gv6rg5vra4j6r76pn9czx9ddal8w";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/SolarTherm/SolarTherm.git";
-    rev = "203fb5af3b95c731c7fcbe2833d51fd420e80796";
-    sha256 = "1bh4y4igzd0k59xm8j14p52gnlbwkiwwy6bhhyarpr361yrchn33";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/Soltermica.git";
-    rev = "9f7224bd89335f95dffe1ccdaa094df5a3279fdf";
-    sha256 = "1bif3cnwjas6x7b8ahwkm7dbrqrfdqwwa26zmdc6zrpfncl3kqd0";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/SystemDynamics.git";
-    rev = "2f6bd9382c5aac2aff9148cd9113a418767734b6";
-    sha256 = "0ii2mj6ngwjir3gzyad8wsj86pvd6wzal91nz2y7gzwj1djchb3x";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/thom-marx/ThermalSeparation.git";
-    rev = "ffa0495ba829ecab105be4bfb3b7652625ec9c03";
-    sha256 = "1czm97bcrpp2jv0a0kd31a929wqlrlzdhdxvyy4w499dn20jzv1l";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/casella/ThermoPower.git";
-    rev = "650be2c8cbd5abc3535e92b865e509073afc8aeb";
-    sha256 = "08ijrx8xw43dadz5s3kiwa17ax9faq2wyq9gm0vlz9ddbkj0hcaq";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://openmodelica.org/git/ThermoSysPro.git";
-    rev = "db81ae1b5a6a85f6c6c7693244cafa6087e18ff5";
-    sha256 = "12fsf0xxxc1ja6vmm9ff85f8j5sg1lb7w4g57s2w3fkf4d3a7d0c";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://openmodelica.org/git/ThermoSysPro.git";
-    rev = "5cef9acb4dedf8af6f4638a4448f08a544ebd30b";
-    sha256 = "0ihnz1s4rs42yis9zym9nw29ia2lqz2yx2wblc50p6f221w7q78s";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/lenaRB/VVDRlib.git";
-    rev = "eae4981674642eddffc7f2aa3690320fcaddee0e";
-    sha256 = "0qxxk2xlas5mqyc1h8ndic208qj1sm5mr5y8664kv3py7i8jdqi4";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica/VehicleInterfaces.git";
-    rev = "v1.2.5";
-    sha256 = "044k17cpc88wprrvw03p6crm6dy6x9a6xj5104d5nln71lqz5sdq";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/WasteWater.git";
-    rev = "v2.1.0";
-    sha256 = "1dxr4m9j7b5266daj4klbrhvnkqr73sximdw9bk9v5qf0s28li99";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/WindPowerPlants.git";
-    rev = "v1.2.0";
-    sha256 = "1lyrqwsb6sm1wc7vlj72zk5cpjhhzh27fviiqayddqy2b903xish";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/ipsl.git";
-    rev = "v1.1.1";
-    sha256 = "1w2iah8c5d8n01wmxydjk0rrcxh88g8yjy2zmv403azcccq7byzp";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git";
-    rev = "v2.5.0";
-    sha256 = "1pd5xf5bgz010lryv8bj6lvlfqn9p184csiffwj8icx7rycnlcqb";
-    fetchSubmodules = true;
-  }
-  {
-    url = "https://github.com/joewa/open-bldc-modelica.git";
-    rev = "58a83b5b36f267613de4676c95163489b1ddc2e7";
-    sha256 = "0wf6dn64d2psv9b3xg5227vzpk109r3dqzi4m2wwhrilaxs3v004";
-    fetchSubmodules = true;
-  }
-]
diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh b/pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh
deleted file mode 100755
index b8f2e95923b5..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p bash
-
-CWD=$PWD
-
-chko() {
-  (
-    T=`mktemp -d`
-    trap "rm -rf $T" EXIT INT PIPE
-    cd $T
-    cat >check.nix <<EOF
-with import <nixpkgs> {};
-fetchgit `cat $CWD/../mkderivation/src-main.nix`
-EOF
-    nix-build check.nix
-    cat result/libraries/Makefile.libs
-  )
-}
-
-getsha256() {
-  URL=$(echo "$1" | sed 's/^"\(.*\)"$/\1/')
-  REV=$(echo "$2" | sed 's/^"\(.*\)"$/\1/')
-  SHA=$(nix run nixpkgs.nix-prefetch-git -c nix-prefetch-git --fetch-submodules "$URL" "$REV" 2>/dev/null | sed -n 's/.*"sha256": "\(.*\)",/\1/g p')
-  echo "{ url = $1; rev = $2; sha256 = \"$SHA\"; fetchSubmodules = true; }"
-}
-
-OUT=src-libs.nix
-
-echo '[' > $OUT
-
-chko |
-grep checkout-git.sh |
-tr \' \" |
-while read NM TGT URL BR REV ; do
-  echo Trying $TGT $URL $REV >&2
-  getsha256 $URL $REV >> $OUT || exit 1
-done
-
-echo ']' >> $OUT
diff --git a/pkgs/applications/science/misc/openmodelica/omparser/Makefile.in.patch b/pkgs/applications/science/misc/openmodelica/omparser/Makefile.in.patch
deleted file mode 100644
index a8f04203a8c9..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omparser/Makefile.in.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -23,7 +23,7 @@
- omedit-testsuite: omedit-testsuite.skip
- omedit-testsuite.skip: omedit.skip testsuite-depends
- 	$(MAKE) -f $(defaultMakefileTarget) -C OMEdit/Testsuite
--omparser: omparser.skip
-+omparser: build-dirs omparser.skip
- omparser.skip:
- 	test -f $@ || $(MAKE) -C OMParser OMBUILDDIR=@OMBUILDDIR@ "host_short=@host_short@" CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" CXXFLAGS="@CXXFLAGS@"
- omsimulator: omsimulator.skip
-@@ -134,6 +134,10 @@
- INSTALL_JAVADIR    = ${DESTDIR}${datadir}/omc/java
- INSTALL_LOCALEDIR  = ${DESTDIR}${datadir}/locale
- 
-+build-dirs:
-+	mkdir -p "@OMBUILDDIR@"/lib/@host_short@/omc
-+	mkdir -p "@OMBUILDDIR@"/include/omc
-+
- install-dirs:
- 	@test ! "${DESTDIR}/@prefix@" -ef "@OMBUILDDIR@" || (echo Error: Install and build dirs are the same && false)
- 	if [ "@APP@" = ".app" ]; then mkdir -p ${INSTALL_APPDIR}; fi
diff --git a/pkgs/applications/science/misc/openmodelica/omparser/default.nix b/pkgs/applications/science/misc/openmodelica/omparser/default.nix
deleted file mode 100644
index 3205c8359a3b..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omparser/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  pkg-config,
-  jre8,
-  libuuid,
-  openmodelica,
-  mkOpenModelicaDerivation,
-}:
-
-mkOpenModelicaDerivation {
-  pname = "omparser";
-  omdir = "OMParser";
-  omdeps = [ openmodelica.omcompiler ];
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    jre8
-    libuuid
-  ];
-
-  patches = [ ./Makefile.in.patch ];
-
-  meta = {
-    description = "Antlr4-based parser of Modelica files from OpenModelica
-suite";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/science/misc/openmodelica/omplot/default.nix b/pkgs/applications/science/misc/openmodelica/omplot/default.nix
deleted file mode 100644
index 9d3bc4ddfbe4..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omplot/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  qtbase,
-  qttools,
-  qmake,
-  wrapQtAppsHook,
-  openmodelica,
-  mkOpenModelicaDerivation,
-}:
-
-mkOpenModelicaDerivation {
-  pname = "omplot";
-  omdir = "OMPlot";
-  omdeps = [ openmodelica.omcompiler ];
-  omautoconf = true;
-
-  nativeBuildInputs = [
-    qtbase
-    qttools
-    qmake
-    wrapQtAppsHook
-  ];
-
-  postPatch = ''
-    sed -i OMPlot/Makefile.in -e 's|bindir = @includedir@|includedir = @includedir@|'
-    sed -i OMPlot/OMPlot/OMPlotGUI/*.pro -e '/INCLUDEPATH +=/s|$| ../../qwt/src|'
-    sed -i ''$(find -name qmake.m4) -e '/^\s*LRELEASE=/ s|LRELEASE=.*$|LRELEASE=${lib.getDev qttools}/bin/lrelease|'
-  '';
-
-  dontUseQmakeConfigure = true;
-  QMAKESPEC = "linux-clang";
-
-  meta = {
-    description = "Plotting tool for OpenModelica-generated results files";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/science/misc/openmodelica/omshell/default.nix b/pkgs/applications/science/misc/openmodelica/omshell/default.nix
deleted file mode 100644
index 8bd7bec280a5..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omshell/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  lib,
-  qttools,
-  qmake,
-  qtwebkit,
-  wrapQtAppsHook,
-  readline,
-  openmodelica,
-  mkOpenModelicaDerivation,
-}:
-
-mkOpenModelicaDerivation {
-  pname = "omshell";
-  omdir = "OMShell";
-  omdeps = [ openmodelica.omcompiler ];
-  omautoconf = true;
-
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    readline
-    qtwebkit
-  ];
-
-  postPatch = with openmodelica; ''
-    sed -i ''$(find -name qmake.m4) -e '/^\s*LRELEASE=/ s|LRELEASE=.*$|LRELEASE=${lib.getDev qttools}/bin/lrelease|'
-    sed -i OMShell/OMShell/OMShellGUI/*.pro -e '
-      s|\$\$\[QT_INSTALL_BINS\]/lrelease|${lib.getDev qttools}/bin/lrelease|
-      /^\s*OMCLIBS =/ s|\$\$(OMBUILDDIR)|${omcompiler}|
-      /^\s*OMCINC =/ s|\$\$(OMBUILDDIR)|${omcompiler}|
-    '
-    sed -i OMShell/OMShell/OMShellGUI/OMShell.config.in -e '
-      s|@OMBUILDDIR@|${omcompiler}|
-      s|@OPENMODELICAHOME@|${omcompiler}|
-    '
-    sed -i OMShell/mosh/src/Makefile.in -e '
-      /^CFLAGS =/ s|-I../../../build|-I${omcompiler}|
-      /^LIBS =/ s|-L@OMBUILDDIR@|-L${omcompiler}|
-      '
-  '';
-
-  dontUseQmakeConfigure = true;
-  QMAKESPEC = "linux-clang";
-
-  meta = {
-    description = "Interactive OpenModelica session shell";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix
deleted file mode 100644
index c156bfa14a8c..000000000000
--- a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  pkg-config,
-  boost,
-  readline,
-  libxml2,
-  openmodelica,
-  mkOpenModelicaDerivation,
-  fetchpatch,
-}:
-
-mkOpenModelicaDerivation {
-  pname = "omsimulator";
-  omdir = "OMSimulator";
-  omdeps = [ openmodelica.omcompiler ];
-
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/OpenModelica/OMSimulator/commit/5ef06e251d639a0224adc205cdbfa1f99bf9a956.patch";
-      stripLen = 1;
-      extraPrefix = "OMSimulator/";
-      hash = "sha256-hLsS6TNEjddm2o2Optnf8n6hh14up9bWJBoztNmisH0=";
-    })
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    readline
-    libxml2
-    boost
-  ];
-
-  env.CFLAGS = toString [
-    "-Wno-error=implicit-function-declaration"
-  ];
-
-  meta = {
-    description = "OpenModelica FMI & SSP-based co-simulation environment";
-    homepage = "https://openmodelica.org";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [
-      balodja
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix
index 6dbfa8802315..1b5fdbd9d8b6 100644
--- a/pkgs/applications/science/physics/crystfel/default.nix
+++ b/pkgs/applications/science/physics/crystfel/default.nix
@@ -88,7 +88,7 @@ let
           fetchurl {
             url = "https://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver${
               builtins.replaceStrings [ "." ] [ "" ] version
-            }/downloads/mosflm-${version}-osx-64.zip";
+            }/downloads/imosflm-${version}-osx-64.zip";
             hash = "sha256-0sXgA3zSIjhy9+zTiv+K/51yZsIgGorMtKVjdRjW+AM=";
           }
         else
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
deleted file mode 100644
index 50fa1c2a3e22..000000000000
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtscript,
-  qtwebkit,
-  qtserialport,
-  qtsvg,
-  qtdeclarative,
-  qtquickcontrols2,
-  alsa-lib,
-  libsndfile,
-  flite,
-  openssl,
-  udev,
-  SDL2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "apmplanner2";
-  version = "2.0.28";
-
-  src = fetchFromGitHub {
-    owner = "ArduPilot";
-    repo = "apm_planner";
-    rev = version;
-    sha256 = "0wvbfjnnf7sh6fpgw8gimh5hgzywj3nwrgr80r782f5gayd3v2l1";
-  };
-
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    alsa-lib
-    libsndfile
-    flite
-    openssl
-    udev
-    SDL2
-    qtbase
-    qtscript
-    qtwebkit
-    qtserialport
-    qtsvg
-    qtdeclarative
-    qtquickcontrols2
-  ];
-
-  qmakeFlags = [ "apm_planner.pro" ];
-
-  # this ugly hack is necessary, as `bin/apmplanner2` needs the contents of `share/APMPlanner2` inside of `bin/`
-  preFixup = ''
-    ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/
-    substituteInPlace $out/share/applications/apmplanner2.desktop \
-      --replace /usr $out
-  '';
-
-  meta = {
-    description = "Ground station software for autonomous vehicles";
-    longDescription = ''
-      A GUI ground control station for autonomous vehicles using the MAVLink protocol.
-      Includes support for the APM and PX4 based controllers.
-    '';
-    homepage = "https://ardupilot.org/planner2/";
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ wucke13 ];
-  };
-}
diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix
index 353b27eb27a8..4dade14100f6 100644
--- a/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/pkgs/applications/version-management/sublime-merge/default.nix
@@ -5,15 +5,15 @@ let
 in
 {
   sublime-merge = common {
-    buildVersion = "2123";
-    aarch64sha256 = "9ceHfTutGJAZlIwRUXJvpli7LtZFuz6vuDgIi7i9+kM=";
-    x64sha256 = "HxKKwc4dOX1ADPl0axn5bDr21yG5FsrrzMyK95p6sy4=";
+    buildVersion = "2125";
+    aarch64sha256 = "Zs4VKbFKkw4KRViX/QGVtVo4hluJ3HVen39Vq3Xz3KI=";
+    x64sha256 = "0Zlv4nZMb2FDUG5KLkHTXJjdRzTa3TuNL54yacFVR/c=";
   } { };
 
   sublime-merge-dev = common {
-    buildVersion = "2120";
+    buildVersion = "2124";
     dev = true;
-    aarch64sha256 = "3JKxLke1l7l+fxhIJWbXbMHK5wPgjZTEWcZd9IvrdPM=";
-    x64sha256 = "N8lhSmQnj+Ee1A2eIOkhdhQnHBK3B6vFA3vrPAbYtaI=";
+    aarch64sha256 = "jYd22OPZnC6X2Ceuzz4ZiqqD1pFsmQsrihIqY3A+gAc=";
+    x64sha256 = "3Tm9TH+kzTCElFLI44K00CXTuV98+uCswy4auXcY+YY=";
   } { };
 }
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 58a84a759c1b..ac5a3e8216ce 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -9,6 +9,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   apr,
   aprutil,
   zlib,
@@ -42,12 +43,12 @@ let
       sha256,
       extraPatches ? [ ],
     }:
-    stdenv.mkDerivation rec {
+    stdenv.mkDerivation (finalAttrs: {
       inherit version;
       pname = "subversion${lib.optionalString (!bdbSupport && perlBindings && pythonBindings) "-client"}";
 
       src = fetchurl {
-        url = "mirror://apache/subversion/subversion-${version}.tar.bz2";
+        url = "mirror://apache/subversion/subversion-${finalAttrs.version}.tar.bz2";
         inherit sha256;
       };
 
@@ -62,7 +63,8 @@ let
         autoconf
         libtool
         python3
-      ];
+      ]
+      ++ lib.optional perlBindings perl; # Needed for swig / EXTERN.h
 
       buildInputs = [
         zlib
@@ -81,7 +83,20 @@ let
       ++ lib.optional perlBindings perl
       ++ lib.optional saslSupport sasl;
 
-      patches = [ ./apr-1.patch ] ++ extraPatches;
+      strictDeps = true;
+
+      patches = [
+        ./apr-1.patch
+
+        # swig-4.4 support:
+        #   https://lists.apache.org/thread/7rtyfcmg737bnmnrwf6bjmlxx4wpq2og
+        (fetchpatch {
+          name = "swig-4.4.patch";
+          url = "https://github.com/apache/subversion/commit/bf72420e86059a894fa3aacbbd6e3bee9286e46e.patch";
+          hash = "sha256-0X9y/0qDDctKo1vu86pKu3k79zIqhOhQU9rvyG4v6jg=";
+        })
+      ]
+      ++ extraPatches;
 
       # remove vendored swig-3 files as these will shadow the swig provided
       # ones and result in compile errors
@@ -174,7 +189,7 @@ let
         maintainers = [ ];
         platforms = lib.platforms.linux ++ lib.platforms.darwin;
       };
-    };
+    });
 
 in
 {
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
deleted file mode 100644
index b3f633374529..000000000000
--- a/pkgs/applications/video/clipgrab/default.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  makeDesktopItem,
-  ffmpeg,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
-  qtbase,
-  qtdeclarative,
-  qtlocation,
-  qtquickcontrols2,
-  qtwebchannel,
-  qtwebengine,
-  yt-dlp,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "clipgrab";
-  version = "3.9.7";
-
-  src = fetchurl {
-    sha256 = "sha256-9H8raJd6MyyFICY8WUZQGLJ4teKPJUiQfqbu1HWAVIw=";
-    # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
-    url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
-  };
-
-  buildInputs = [
-    ffmpeg
-    qtbase
-    qtdeclarative
-    qtlocation
-    qtquickcontrols2
-    qtwebchannel
-    qtwebengine
-  ];
-  nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
-  ];
-
-  patches = [
-    ./yt-dlp-path.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace youtube_dl.cpp \
-      --replace 'QString YoutubeDl::path = QString();' \
-                'QString YoutubeDl::path = QString("${yt-dlp}/bin/yt-dlp");'
-  ''
-  + lib.optionalString (ffmpeg != null) ''
-    substituteInPlace converter_ffmpeg.cpp \
-      --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \
-      --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg '
-  '';
-
-  qmakeFlags = [ "clipgrab.pro" ];
-
-  desktopItem = makeDesktopItem rec {
-    name = "clipgrab";
-    exec = name;
-    icon = name;
-    desktopName = "ClipGrab";
-    comment = meta.description;
-    genericName = "Web video downloader";
-    categories = [
-      "Qt"
-      "AudioVideo"
-      "Audio"
-      "Video"
-    ];
-  };
-
-  installPhase = ''
-    runHook preInstall
-    install -Dm755 clipgrab $out/bin/clipgrab
-    install -Dm644 icon.png $out/share/pixmaps/clipgrab.png
-    cp -r ${desktopItem}/share/applications $out/share
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Video downloader for YouTube and other sites";
-    longDescription = ''
-      ClipGrab is a free downloader and converter for YouTube, Vimeo, Metacafe,
-      Dailymotion and many other online video sites. It converts downloaded
-      videos to MPEG4, MP3 or other formats in just one easy step.
-    '';
-    homepage = "https://clipgrab.org/";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    mainProgram = "clipgrab";
-  };
-}
diff --git a/pkgs/applications/video/clipgrab/yt-dlp-path.patch b/pkgs/applications/video/clipgrab/yt-dlp-path.patch
deleted file mode 100644
index 5a9a4b6dcc48..000000000000
--- a/pkgs/applications/video/clipgrab/yt-dlp-path.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/main.cpp
-+++ b/main.cpp
-@@ -91,14 +91,5 @@ int main(int argc, char *argv[])
-         w.show();
-     }
- 
--    QTimer::singleShot(0, [=] {
--       cg->getUpdateInfo();
--       QObject::connect(cg, &ClipGrab::updateInfoProcessed, [cg] {
--           bool force = QSettings().value("forceYoutubeDlDownload", false).toBool();
--           if (force) QSettings().setValue("forceYoutubeDlDownload", false);
--           cg->downloadYoutubeDl(force);
--       });
--    });
--
-     return app.exec();
- }
---- a/youtube_dl.cpp
-+++ b/youtube_dl.cpp
-@@ -8,52 +8,16 @@ YoutubeDl::YoutubeDl()
- QString YoutubeDl::path = QString();
- 
- QString YoutubeDl::find(bool force) {
--    if (!force && !path.isEmpty()) return path;
--
--    // Prefer downloaded youtube-dl
--    QString localPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, "yt-dlp");
--    QProcess* process = instance(localPath, QStringList() << "--version");
--    process->start();
--    process->waitForFinished();
--    process->deleteLater();
--    if (process->state() != QProcess::NotRunning) process->kill();
--    if (process->exitCode() == QProcess::ExitStatus::NormalExit) {
--        path = localPath;
--        return path;
--    }
--
--    // Try system-wide youtube-dlp installation
--    QString globalPath = QStandardPaths::findExecutable("yt-dlp");
--    process = instance(globalPath, QStringList() << "--version");
--    process->start();
--    process->waitForFinished();
--    process->deleteLater();
--    if (process->state() != QProcess::NotRunning) process->kill();
--    if (process->exitCode() == QProcess::ExitStatus::NormalExit) {
--        path = globalPath;
--        return path;
--    }
--
--    return "";
-+    // We supply yt-dlp from nixpkgs, so the downloading
-+    // machinery is not needed anymore.
-+    (void)force;
-+    return path;
- }
- 
- QProcess* YoutubeDl::instance(QStringList arguments) {
--    return instance(find(), arguments);
--}
--
--QProcess* YoutubeDl::instance(QString path, QStringList arguments) {
-     QProcess *process = new QProcess();
- 
--    QString execPath = QCoreApplication::applicationDirPath();
--    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
--    env.insert("PATH", execPath + ":" + env.value("PATH"));
--    process->setEnvironment(env.toStringList());
--
--    #if defined Q_OS_WIN
--        process->setProgram(execPath + "/python/python.exe");
--    #else
--        process->setProgram(QStandardPaths::findExecutable("python3"));
--    #endif
-+    process->setProgram(path);
- 
-     QSettings settings;
-     QStringList proxyArguments;
-@@ -81,7 +45,7 @@ QProcess* YoutubeDl::instance(QString path, QStringList arguments) {
-         networkArguments << "--force-ipv4";
-     }
- 
--    process->setArguments(QStringList() << path << arguments << proxyArguments << networkArguments);
-+    process->setArguments(QStringList() << arguments << proxyArguments << networkArguments);
-     return process;
- }
- 
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 2c74fde9572e..3e2d07e0f941 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -6,16 +6,15 @@ unwrapped.overrideAttrs (oldAttrs: {
   passthru =
     let
       finalKodi = oldAttrs.passthru.kodi;
-      kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = finalKodi; };
     in
     oldAttrs.passthru
     // {
-      packages = kodiPackages;
+      packages = callPackage ../../../top-level/kodi-packages.nix { kodi = finalKodi; };
       withPackages =
         func:
         callPackage ./wrapper.nix {
           kodi = finalKodi;
-          addons = kodiPackages.requiredKodiAddons (func kodiPackages);
+          addons = finalKodi.packages.requiredKodiAddons (func finalKodi.packages);
         };
     };
 })
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index 891087d979fa..15fd92f4d1a8 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -4,12 +4,9 @@
   buildEnv,
   kodi,
   addons,
-  callPackage,
 }:
 
 let
-  kodiPackages = callPackage ../../../top-level/kodi-packages.nix { inherit kodi; };
-
   # linux distros are supposed to provide pillow and pycryptodome
   requiredPythonPath =
     with kodi.pythonPackages;
@@ -26,7 +23,7 @@ let
       addonsWithPythonPath = lib.filter (addon: addon ? pythonPath) addons;
     in
     lib.concatMapStringsSep ":" (
-      addon: "${addon}${kodiPackages.addonDir}/${addon.namespace}/${addon.pythonPath}"
+      addon: "${addon}${kodi.packages.addonDir}/${addon.namespace}/${addon.pythonPath}"
     ) addonsWithPythonPath;
 in
 
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 483bf8df6d3b..b22bfb64ba47 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   which,
   qtbase,
-  qtwebkit,
   qtscript,
   libpulseaudio,
   fftwSinglePrec,
@@ -39,7 +38,6 @@
   soundtouch,
   libzip,
   libhdhomerun,
-  withWebKit ? false,
 }:
 
 stdenv.mkDerivation rec {
@@ -89,8 +87,7 @@ stdenv.mkDerivation rec {
     soundtouch
     libzip
     libhdhomerun
-  ]
-  ++ lib.optional withWebKit qtwebkit;
+  ];
   nativeBuildInputs = [
     pkg-config
     which
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index e1e9765ef1dc..b501927422c4 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -98,13 +98,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-studio";
-  version = "32.1.1";
+  version = "32.1.2";
 
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
     rev = finalAttrs.version;
-    hash = "sha256-p/fr5lO97jCl0HYA0x7ZAS7gAXvA+s7nn3XSj1UvtC4=";
+    hash = "sha256-9i7wLHpKqbcYzPlzSMF4xEpsTINQnVDPtneLJaSM+/I=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
deleted file mode 100644
index c7f28dc30aca..000000000000
--- a/pkgs/applications/video/smtube/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  qmake,
-  wrapQtAppsHook,
-  qtscript,
-  qtwebkit,
-}:
-
-stdenv.mkDerivation rec {
-  version = "21.10.0";
-  pname = "smtube";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-ZQIUAi/YC+zsYHVhlprZ5K6NGvT6LojmdQ1Z+WCg1lU=";
-  };
-
-  makeFlags = [
-    "PREFIX=$(out)"
-  ];
-
-  dontUseQmakeConfigure = true;
-
-  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
-  ];
-  buildInputs = [
-    qtscript
-    qtwebkit
-  ];
-
-  meta = {
-    description = "Play and download Youtube videos";
-    homepage = "http://smplayer.sourceforge.net/smtube.php";
-    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ vbgl ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 9030799195bb..8435e824b843 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -274,6 +274,5 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
       mjoerg
       sigmasquadron
     ];
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
   };
 })
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index b4247dda6234..d8d22f0c15ed 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -4,19 +4,18 @@
   fetchFromGitHub,
   versionCheckHook,
 }:
-
 buildGoModule rec {
   pname = "docker-compose";
-  version = "5.0.2";
+  version = "5.1.3";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "compose";
     tag = "v${version}";
-    hash = "sha256-2lyjTNd4jf+wTtnFZaRT10ga0MHZondzb+0cM0ftCuY=";
+    hash = "sha256-9c/epAjLJMQhLXcray5JylVVQVXZ04mgpCBCXJULqTU=";
   };
 
-  vendorHash = "sha256-A9RHSM6BmcaIVHWOou50T1+N/Vh8H1+KtSKeh/ZJ2JQ=";
+  vendorHash = "sha256-LL4gz1Sy0ITnMh/zz/pUoshOeobg8+yPh//QM7qgVbI=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
@@ -46,6 +45,6 @@ buildGoModule rec {
     mainProgram = "docker-compose";
     homepage = "https://github.com/docker/compose";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ airone01 ];
   };
 }
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 807e35cabb65..defcd8a39988 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -438,18 +438,18 @@ in
 
   docker_29 =
     let
-      version = "29.4.0";
+      version = "29.4.1";
     in
     callPackage dockerGen {
       inherit version;
       cliRev = "v${version}";
-      cliHash = "sha256-ObuRuiC1+2E7PMMgoXC6SEi6zsdRqVvGCDvP7J/Ws28=";
+      cliHash = "sha256-jGD+Z3koM0a2Te7cq2HdKFizZj39djvTQUmn815Mn4o=";
       mobyRev = "docker-v${version}";
-      mobyHash = "sha256-Pot3N+AvxIYG5Vg3AQK3I0jegCW4bmC0OimsGnVCiuQ=";
+      mobyHash = "sha256-R+rCR8DG4IyEdn9ol7PjawixgymjrEVMrTjaZM1wReU=";
       runcRev = "v1.3.5";
       runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0=";
-      containerdRev = "v2.2.2";
-      containerdHash = "sha256-1jYiyNHR1sXBwXdS33KWE+IB1tOZbiJyUxhsVeXwSrc=";
+      containerdRev = "v2.2.3";
+      containerdHash = "sha256-jaOLZf246kmvBHHrwgvqrhxuh+n1HE6NDqckZK4tvnM=";
       tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
       tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
     };
diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix
index 5133bc090e69..cfc28c1e8bc0 100644
--- a/pkgs/applications/virtualization/krunvm/default.nix
+++ b/pkgs/applications/virtualization/krunvm/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapProgram $out/bin/krunvm \
-      --prefix PATH : ${lib.makeBinPath [ buildah ]} \
+      --prefix PATH : ${lib.makeBinPath [ buildah ]}
   '';
 
   meta = {
diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
index dffe4664239a..755258e07856 100644
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@@ -28,13 +28,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-hyprland";
-  version = "1.3.11";
+  version = "1.3.12";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "xdg-desktop-portal-hyprland";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=";
+    hash = "sha256-B7nwX0PE0KBo1/ZtuwJtA7dBG6gdPW5tSBb0skY8DHA=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index cb482e0b577f..d1e466f63464 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -40,6 +40,10 @@
   nixosTests,
   gmobile,
   appstream,
+  qrcodegen,
+  gobject-introspection,
+  docutils,
+  gi-docgen,
 }:
 
 let
@@ -51,6 +55,8 @@ let
     repo = "libcall-ui";
     tag = "v0.1.5";
     hash = "sha256-4lSTwSRZditK51N/4s3tmIOgffe5+WyKxVq2IGqWRn4=";
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
+    forceFetchGit = true;
   };
 
   # Derived from subprojects/gvc.wrap
@@ -58,13 +64,15 @@ let
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "libgnome-volume-control";
-    rev = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6";
-    hash = "sha256-gdgTnxzH8BeYQAsvv++Yq/8wHi7ISk2LTBfU8hk12NM=";
+    rev = "d2442f455844e5292cb4a74ffc66ecc8d7595a9f";
+    hash = "sha256-10n441b7m/mvQRdrmEsxGxqjKUWzjGvnzJy256NZN5s=";
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
+    forceFetchGit = true;
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "phosh";
-  version = "0.51.0";
+  version = "0.54.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -72,7 +80,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Phosh";
     repo = "phosh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bM1eKa5/aBjAHOFYyqjs6pLmr3R/WoK3590yGiLVNM4=";
+    hash = "sha256-gByZRyUe17JY5imgtRdubJl1VH1JxlzmDQkHOtEIvj8=";
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
+    forceFetchGit = true;
   };
 
   nativeBuildInputs = [
@@ -83,6 +93,8 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     wayland-scanner
     wrapGAppsHook4
+    docutils
+    gi-docgen
   ];
 
   buildInputs = [
@@ -111,6 +123,8 @@ stdenv.mkDerivation (finalAttrs: {
     wayland
     feedbackd
     appstream
+    qrcodegen
+    gobject-introspection
   ];
 
   nativeCheckInputs = [
@@ -131,6 +145,10 @@ stdenv.mkDerivation (finalAttrs: {
     # Save some time building if tests are disabled
     "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}"
     "-Dc_args=-I${glib.dev}/include/gio-unix-2.0/"
+    "-Dsearchd=true"
+    "-Dbindings-lib=true"
+    "-Dgtk_doc=true"
+    "-Dman=true"
   ];
 
   checkPhase = ''
@@ -157,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "Pure Wayland shell prototype for GNOME on mobile devices";
+    description = "Pure Wayland shell for mobile devices";
     homepage = "https://gitlab.gnome.org/World/Phosh/phosh";
     changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${finalAttrs.version}/debian/changelog";
     license = lib.licenses.gpl3Plus;
diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
index 18bc6927040c..fe228d20af6c 100644
--- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
+++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix
@@ -28,16 +28,21 @@
   libyaml,
   mobile-broadband-provider-info,
   modemmanager,
+  gobject-introspection,
+  appstream,
+  gst_all_1,
 }:
 
 let
   # Derived from subprojects/gvc.wrap
   gvc = fetchFromGitLab {
     domain = "gitlab.gnome.org";
-    owner = "GNOME";
+    owner = "guidog";
     repo = "libgnome-volume-control";
-    rev = "5f9768a2eac29c1ed56f1fbb449a77a3523683b6";
-    hash = "sha256-gdgTnxzH8BeYQAsvv++Yq/8wHi7ISk2LTBfU8hk12NM=";
+    rev = "d2442f455844e5292cb4a74ffc66ecc8d7595a9f";
+    hash = "sha256-10n441b7m/mvQRdrmEsxGxqjKUWzjGvnzJy256NZN5s=";
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
+    forceFetchGit = true;
   };
   # Derived from subprojects/glibcellbroadcast.wrap
   libcellbroadcast = fetchFromGitLab {
@@ -46,6 +51,8 @@ let
     repo = "cellbroadcastd";
     tag = "v0.0.2";
     hash = "sha256-rs9MoC54sVrs3HK0cbX4msYWA63y+DlDOZ5LboVtW9Y=";
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
+    forceFetchGit = true;
   };
   # Derived from subprojects/libcellbroadcast/subprojects/gvdb.wrap
   gvdb = fetchFromGitLab {
@@ -54,11 +61,13 @@ let
     repo = "gvdb";
     rev = "4758f6fb7f889e074e13df3f914328f3eecb1fd3";
     hash = "sha256-4mqoHPlrMPenoGPwDqbtv4/rJ/uq9Skcm82pRvOxNIk=";
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
+    forceFetchGit = true;
   };
 in
 stdenv.mkDerivation rec {
   pname = "phosh-mobile-settings";
-  version = "0.51.0";
+  version = "0.54.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -66,7 +75,9 @@ stdenv.mkDerivation rec {
     owner = "Phosh";
     repo = "phosh-mobile-settings";
     rev = "v${version}";
-    hash = "sha256-eIRhxhU+u4cocqyw7ab5BefTp9om5UaiqrJWwN+RtoQ=";
+    hash = "sha256-TuwxzzalNhNJwPmmPJmxsHebzksPYv8jV6K0vYntQIw=";
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
+    forceFetchGit = true;
   };
 
   nativeBuildInputs = [
@@ -77,6 +88,8 @@ stdenv.mkDerivation rec {
     wayland-scanner
     wrapGAppsHook4
     glib.dev
+    gobject-introspection
+    appstream
   ];
 
   buildInputs = [
@@ -97,6 +110,7 @@ stdenv.mkDerivation rec {
     libyaml
     mobile-broadband-provider-info
     modemmanager
+    gst_all_1.gst-plugins-base
   ];
 
   postPatch = ''
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index c6723a5a0d50..f4eabda2dc2f 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -86,6 +86,8 @@ let
       targetRunFlags ? [ ],
     }:
     lib.optionalString (targets != [ ]) ''
+      concatTo bazelFlagsArray bazelFlags
+
       # See footnote called [USER and BAZEL_USE_CPP_ONLY_TOOLCHAIN variables]
       BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
       USER=homeless-shelter \
@@ -99,7 +101,7 @@ let
         "''${host_copts[@]}" \
         "''${linkopts[@]}" \
         "''${host_linkopts[@]}" \
-        $bazelFlags \
+        "''${bazelFlagsArray[@]}" \
         ${lib.strings.concatStringsSep " " additionalFlags} \
         ${lib.strings.concatStringsSep " " targets} \
         ${
@@ -239,13 +241,24 @@ stdenv.mkDerivation (
           );
 
         dontFixup = true;
-        allowedRequisites = [ ];
 
         inherit (lib.fetchers.normalizeHash { hashTypes = [ "sha256" ]; } fetchAttrs)
           outputHash
           outputHashAlgo
           ;
       }
+      // (
+        if fFetchAttrs.__structuredAttrs or false then
+          {
+            # With __structuredAttrs = true, the build always fails with “output $out is not allowed to refer to the following paths: $out”.
+            # This appears to be the same issue as in 283bca9648fc1afb01d3e4c3b5919251429da907.
+            outputChecks.out.allowedRequisites = [ "out" ];
+          }
+        else
+          {
+            allowedRequisites = [ ];
+          }
+      )
     );
 
     nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [ ] ++ [
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index cf4fc875b585..d065ec214e06 100644
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -12,10 +12,35 @@ STDOUT->autoflush(1);
 $SIG{__WARN__} = sub { warn "pkgs.buildEnv warning: ", @_ };
 $SIG{__DIE__}  = sub { die "pkgs.buildEnv error: ", @_ };
 
-my $out = $ENV{"out"};
-my $extraPrefix = $ENV{"extraPrefix"};
+my $out;
+my $extraPrefix;
+my @pathsToLink;
+my $ignoreCollisions;
+my $checkCollisionContents;
+my $ignoreSingleFileOutputs;
+my @chosenOutputsRefs;
+my $extraPathsFrom;
+my $manifest;
 
-my @pathsToLink = @{decode_json $ENV{"pathsToLinkJSON"}};
+if ($ENV{"NIX_ATTRS_JSON_FILE"} // "") {
+    open FILE, $ENV{"NIX_ATTRS_JSON_FILE"} or die "cannot open structured attrs JSON file $ENV{NIX_ATTRS_JSON_FILE}: $!";
+    my $json_text = do { local $/; <FILE> };
+    my $attrsFromJSONRef = decode_json $json_text;
+    close FILE;
+
+    my $outputsRef = $attrsFromJSONRef->{"outputs"};
+    $out = $outputsRef->{"out"} // (values %{$outputsRef})[0];
+    $extraPrefix = $attrsFromJSONRef->{"extraPrefix"};
+    @pathsToLink = @{$attrsFromJSONRef->{"pathsToLink"}};
+    $ignoreCollisions = $attrsFromJSONRef->{"ignoreCollisions"};
+    $checkCollisionContents = $attrsFromJSONRef->{"checkCollisionContents"};
+    $ignoreSingleFileOutputs = $attrsFromJSONRef->{"ignoreSingleFileOutputs"};
+    @chosenOutputsRefs = @{$attrsFromJSONRef->{"chosenOutputs"}};
+    $extraPathsFrom = $attrsFromJSONRef->{"extraPathsFrom"};
+    $manifest = $attrsFromJSONRef->{"manifest"};
+} else {
+    die "missing required environment variable NIX_ATTRS_JSON_FILE";
+}
 
 sub isInPathsToLink($path) {
     $path = "/" if $path eq "";
@@ -210,26 +235,15 @@ sub addPkg($pkgDir, $ignoreCollisions, $checkCollisionContents, $priority, $igno
     }
 }
 
-# Read packages list.
-my $pkgs;
-
-if (exists $ENV{"pkgsPath"}) {
-    open FILE, $ENV{"pkgsPath"};
-    $pkgs = <FILE>;
-    close FILE;
-} else {
-    $pkgs = $ENV{"pkgs"}
-}
-
 # Symlink to the packages that have been installed explicitly by the
 # user.
-for my $pkg (@{decode_json $pkgs}) {
+for my $pkg (@chosenOutputsRefs) {
     for my $path (@{$pkg->{paths}}) {
         addPkg($path,
-               $ENV{"ignoreCollisions"} eq "1",
-               $ENV{"checkCollisionContents"} eq "1",
+               $ignoreCollisions,
+               $checkCollisionContents,
                $pkg->{priority},
-               $ENV{"ignoreSingleFileOutputs"} eq "1")
+               $ignoreSingleFileOutputs)
            if -e $path;
     }
 }
@@ -244,21 +258,20 @@ while (scalar(keys %postponed) > 0) {
     my @pkgDirs = keys %postponed;
     %postponed = ();
     foreach my $pkgDir (sort @pkgDirs) {
-        addPkg($pkgDir, 2, $ENV{"checkCollisionContents"} eq "1", $priorityCounter++, $ENV{"ignoreSingleFileOutputs"} eq "1");
+        addPkg($pkgDir, 2, $checkCollisionContents, $priorityCounter++, $ignoreSingleFileOutputs);
     }
 }
 
-my $extraPathsFilePath = $ENV{"extraPathsFrom"};
-if ($extraPathsFilePath) {
-    open FILE, $extraPathsFilePath or die "cannot open extra paths file $extraPathsFilePath: $!";
+if ($extraPathsFrom) {
+    open FILE, $extraPathsFrom or die "cannot open extra paths file $extraPathsFrom: $!";
 
     while(my $line = <FILE>) {
         chomp $line;
         addPkg($line,
-               $ENV{"ignoreCollisions"} eq "1",
-               $ENV{"checkCollisionContents"} eq "1",
+               $ignoreCollisions,
+               $checkCollisionContents,
                1000,
-               $ENV{"ignoreSingleFileOutputs"} eq "1")
+               $ignoreSingleFileOutputs)
             if -d $line;
     }
 
@@ -286,7 +299,6 @@ foreach my $relName (sort keys %symlinks) {
 print STDERR "created $nrLinks symlinks in user environment\n";
 
 
-my $manifest = $ENV{"manifest"};
 if ($manifest) {
     symlink($manifest, "$out/manifest") or die "cannot create manifest";
 }
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index e694a9b838e1..a645224ffa54 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -1,9 +1,9 @@
-# buildEnv creates a tree of symlinks to the specified paths.  This is
-# a fork of the hardcoded buildEnv in the Nix distribution.
+# buildEnv creates a tree of symlinks to the specified paths.
+# This is a fork of the hardcoded buildEnv in the Nix distribution.
 
 {
   buildPackages,
-  runCommand,
+  stdenvNoCC,
   lib,
   replaceVars,
   writeClosure,
@@ -15,115 +15,153 @@ let
   };
 in
 
+# Backward compatibility for deprecated custom overrider <env-pkg>.override
+# TODO(@ShamrockLee): Warn, throw and remove after tree-wide transition.
 lib.makeOverridable (
-  {
-    name ? lib.throwIf (
-      pname == null || version == null
-    ) "buildEnv: expect arguments 'pname' and 'version' or 'name'" "${pname}-${version}",
-    pname ? null,
-    version ? null,
+  lib.extendMkDerivation {
+    constructDrv = stdenvNoCC.mkDerivation;
+    excludeDrvArgNames = [
+      # Override these arguments directly
+      "derivationArgs"
 
-    # The manifest file (if any).  A symlink $out/manifest will be
-    # created to it.
-    manifest ? "",
-
-    # The paths to symlink.
-    paths,
-
-    # Whether to ignore collisions or abort.
-    ignoreCollisions ? false,
-
-    # Whether to ignore outputs that are a single file instead of a directory.
-    ignoreSingleFileOutputs ? false,
-
-    # Whether to include closures of all input paths.
-    includeClosures ? false,
-
-    # If there is a collision, check whether the contents and permissions match
-    # and only if not, throw a collision error.
-    checkCollisionContents ? true,
-
-    # The paths (relative to each element of `paths') that we want to
-    # symlink (e.g., ["/bin"]).  Any file not inside any of the
-    # directories in the list is not symlinked.
-    pathsToLink ? [ "/" ],
-
-    # The package outputs to include. By default, only the default
-    # output is included.
-    extraOutputsToInstall ? [ ],
-
-    # Root the result in directory "$out${extraPrefix}", e.g. "/share".
-    extraPrefix ? "",
-
-    # Shell commands to run after building the symlink tree.
-    postBuild ? "",
-
-    # Additional inputs
-    nativeBuildInputs ? [ ], # Handy e.g. if using makeWrapper in `postBuild`.
-    buildInputs ? [ ],
-
-    passthru ? { },
-    meta ? { },
-  }:
-  let
-    chosenOutputs = map (drv: {
-      paths =
-        # First add the usual output(s): respect if user has chosen explicitly,
-        # and otherwise use `meta.outputsToInstall`. The attribute is guaranteed
-        # to exist in mkDerivation-created cases. The other cases (e.g. runCommand)
-        # aren't expected to have multiple outputs.
-        (
-          if
-            (!drv ? outputSpecified || !drv.outputSpecified) && drv.meta.outputsToInstall or null != null
-          then
-            map (outName: drv.${outName}) drv.meta.outputsToInstall
-          else
-            [ drv ]
-        )
-        # Add any extra outputs specified by the caller of `buildEnv`.
-        ++ lib.filter (p: p != null) (map (outName: drv.${outName} or null) extraOutputsToInstall);
-      priority = drv.meta.priority or lib.meta.defaultPriority;
-    }) paths;
-
-    pathsForClosure = lib.pipe chosenOutputs [
-      (map (p: p.paths))
-      lib.flatten
-      (lib.remove null)
+      # `meta.outputsToInstall` and `extraOutputsToInstall` does not necessarily include the first
+      # element of outputs, while the outPath of the latter will be the string-interpolated result.
+      # Exclude to prevent unexpected context.
+      "paths"
     ];
-  in
-  runCommand name
-    (
-      rec {
+
+    extendDrvArgs =
+      finalAttrs:
+      {
+        # The manifest file (if any).  A symlink $out/manifest will be
+        # created to it.
+        manifest ? "",
+
+        # The paths to symlink.
+        paths,
+
+        # Whether to ignore collisions or abort.
+        ignoreCollisions ? false,
+
+        # Whether to ignore outputs that are a single file instead of a directory.
+        ignoreSingleFileOutputs ? false,
+
+        # Whether to include closures of all input paths.
+        includeClosures ? false,
+
+        # If there is a collision, check whether the contents and permissions match
+        # and only if not, throw a collision error.
+        checkCollisionContents ? true,
+
+        # The paths (relative to each element of `paths') that we want to
+        # symlink (e.g., ["/bin"]).  Any file not inside any of the
+        # directories in the list is not symlinked.
+        pathsToLink ? [ "/" ],
+
+        # The package outputs to include. By default, only the default
+        # output is included.
+        extraOutputsToInstall ? [ ],
+
+        # Root the result in directory "$out${extraPrefix}", e.g. "/share".
+        extraPrefix ? "",
+
+        # Shell commands to run after building the symlink tree.
+        postBuild ? "",
+
+        passthru ? { },
+        meta ? { },
+
+        # Additional stdenv.mkDerivation arguments
+        # such as nativeBuildInputs/buildInputs for postBuild dependencies.
+        derivationArgs ? { },
+
+        # Placeholder name arguments.
+        name ? null,
+        pname ? null,
+        version ? null,
+
+        # `stdenv.mkDerivation` args before introducing derivationArgs.
+        nativeBuildInputs ? null,
+        buildInputs ? null,
+      }@args:
+      let
+        compatArgs =
+          lib.optionalAttrs (args ? nativeBuildInputs) {
+            inherit nativeBuildInputs;
+          }
+          // lib.optionalAttrs (args ? buildInputs) {
+            inherit buildInputs;
+          };
+      in
+      compatArgs
+      // derivationArgs
+      // {
+        # Explicitly opt in: builder.pl reads all configuration from file $ENV["NIX_ATTRS_JSON_FILE"].
+        __structuredAttrs = true;
+
         inherit
+          extraOutputsToInstall
           manifest
           ignoreCollisions
           checkCollisionContents
           ignoreSingleFileOutputs
-          passthru
+          includeClosures
           meta
           pathsToLink
           extraPrefix
           postBuild
-          nativeBuildInputs
-          buildInputs
           ;
-        pathsToLinkJSON = builtins.toJSON pathsToLink;
-        pkgs = builtins.toJSON chosenOutputs;
-        extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure);
-        preferLocalBuild = true;
-        allowSubstitutes = false;
-        # XXX: The size is somewhat arbitrary
-        passAsFile = if builtins.stringLength pkgs >= 128 * 1024 then [ "pkgs" ] else [ ];
-      }
-      // lib.optionalAttrs (pname != null) {
-        inherit pname;
-      }
-      // lib.optionalAttrs (version != null) {
-        inherit version;
-      }
-    )
-    ''
-      ${buildPackages.perl}/bin/perl -w ${builder}
-      eval "$postBuild"
-    ''
+
+        chosenOutputs = map (drv: {
+          paths =
+            # First add the usual output(s): respect if user has chosen explicitly,
+            # and otherwise use `meta.outputsToInstall`. The attribute is guaranteed
+            # to exist in mkDerivation-created cases. The other cases (e.g. runCommand)
+            # aren't expected to have multiple outputs.
+            (
+              if
+                (!drv ? outputSpecified || !drv.outputSpecified) && drv.meta.outputsToInstall or null != null
+              then
+                map (outName: drv.${outName}) drv.meta.outputsToInstall
+              else
+                [ drv ]
+            )
+            # Add any extra outputs specified by the caller of `buildEnv`.
+            ++ lib.filter (p: p != null) (
+              map (outName: drv.${outName} or null) finalAttrs.extraOutputsToInstall
+            );
+          priority = drv.meta.priority or lib.meta.defaultPriority;
+          # Silently use the original `paths` if `passthru.paths` is missing.
+        }) finalAttrs.passthru.paths or paths;
+
+        extraPathsFrom = lib.optionalString finalAttrs.includeClosures (
+          let
+            pathsForClosure = lib.pipe finalAttrs.chosenOutputs [
+              (map (p: p.paths))
+              lib.flatten
+              (lib.remove null)
+            ];
+          in
+          writeClosure pathsForClosure
+        );
+
+        preferLocalBuild = derivationArgs.preferLocalBuild or true;
+        allowSubstitutes = derivationArgs.allowSubstitutes or false;
+
+        buildCommand = ''
+          ${buildPackages.perl}/bin/perl -w ${builder}
+          eval "$postBuild"
+        '';
+
+        passthru = {
+          # The `paths` attribute is referenced and overridden from passthru
+          inherit paths;
+        }
+        // derivationArgs.passthru or { }
+        // passthru;
+      };
+
+    # Function argument set pattern doesn't have an ellipsis
+    inheritFunctionArgs = false;
+  }
 )
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 808fe5db2780..10175e91a070 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -786,29 +786,31 @@ stdenvNoCC.mkDerivation {
     # This confuses libtool.  So add it to the compiler tool search
     # path explicitly.
     + optionalString (!nativeTools && !isArocc) ''
+      ccLDFlags=()
+      ccCFlags=()
       if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
-        ccLDFlags+=" -L${cc_solib}/lib64"
-        ccCFlags+=" -B${cc_solib}/lib64"
+        ccLDFlags+=("-L${cc_solib}/lib64")
+        ccCFlags+=("-B${cc_solib}/lib64")
       fi
-      ccLDFlags+=" -L${cc_solib}/lib"
-      ccCFlags+=" -B${cc_solib}/lib"
+      ccLDFlags+=("-L${cc_solib}/lib")
+      ccCFlags+=("-B${cc_solib}/lib")
 
     ''
     + optionalString (cc.langAda or false && !isArocc) ''
       touch "$out/nix-support/gnat-cflags"
       touch "$out/nix-support/gnat-ldflags"
       basePath=$(echo $cc/lib/*/*/*)
-      ccCFlags+=" -B$basePath -I$basePath/adainclude"
+      ccCFlags+=("-B$basePath" "-I$basePath/adainclude")
       gnatCFlags="-I$basePath/adainclude -I$basePath/adalib"
 
       echo "$gnatCFlags" >> $out/nix-support/gnat-cflags
     ''
     + ''
-      echo "$ccLDFlags" >> $out/nix-support/cc-ldflags
-      echo "$ccCFlags" >> $out/nix-support/cc-cflags
+      echo "''${ccLDFlags[*]}" >> $out/nix-support/cc-ldflags
+      echo "''${ccCFlags[*]}" >> $out/nix-support/cc-cflags
     ''
     + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) ''
-      echo " -L${libcxx_solib}" >> $out/nix-support/cc-ldflags
+      echo "-L${libcxx_solib}" >> $out/nix-support/cc-ldflags
     ''
 
     ## Prevent clang from seeing /usr/include. There is a desire to achieve this
@@ -830,7 +832,7 @@ stdenvNoCC.mkDerivation {
           && !targetPlatform.isAndroid
         )
         ''
-          echo " -nostdlibinc" >> $out/nix-support/cc-cflags
+          echo "-nostdlibinc" >> $out/nix-support/cc-cflags
         ''
 
     ##
@@ -867,7 +869,7 @@ stdenvNoCC.mkDerivation {
           );
       in
       optionalString enable_fp ''
-        echo " -fno-omit-frame-pointer ${optionalString enable_leaf_fp "-mno-omit-leaf-frame-pointer "}" >> $out/nix-support/cc-cflags-before
+        echo "-fno-omit-frame-pointer${optionalString enable_leaf_fp " -mno-omit-leaf-frame-pointer"}" >> $out/nix-support/cc-cflags-before
       ''
     )
 
diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix
index 0a94d4e276aa..ed07a06551b5 100644
--- a/pkgs/build-support/dart/build-dart-application/default.nix
+++ b/pkgs/build-support/dart/build-dart-application/default.nix
@@ -194,10 +194,16 @@ lib.extendMkDerivation {
           # Ensure that we inherit the propagated build inputs from the dependencies.
           builtins.attrValues pubspecLockData.dependencySources;
 
+      preConfigure = args.preConfigure or "" + ''
+        ln -sf "$pubspecLockFilePath" pubspec.lock
+      '';
+
       # When stripping, it seems some ELF information is lost and the dart VM cli
       # runs instead of the expected program. Don't strip if it's an exe output.
       dontStrip = args.dontStrip or (dartOutputType == "exe");
 
+      passAsFile = [ "pubspecLockFile" ];
+
       passthru = {
         pubspecLock = pubspecLockData;
       }
diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
index 3e7fcbd69133..5962f22b572e 100644
--- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
+++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
@@ -95,9 +95,9 @@ npmConfigHook() {
     fi
 
     export CACHE_MAP_PATH="$TMP/MEOW"
-    @prefetchNpmDeps@ --map-cache
+    npmDeps="$npmDeps" @prefetchNpmDeps@ --map-cache
 
-    @prefetchNpmDeps@ --fixup-lockfile "$srcLockfile"
+    npmDeps="$npmDeps" @prefetchNpmDeps@ --fixup-lockfile "$srcLockfile"
 
     local cachePath
 
diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
index 529370d302d9..6b33c263b895 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
@@ -61,139 +61,143 @@ in
       "fetchPnpmDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
     ) true;
 
-    stdenvNoCC.mkDerivation (
-      finalAttrs:
+    lib.warnIf (fetcherVersion == 1)
+      "fetchPnpmDeps: `fetcherVersion = 1` is deprecated and scheduled for removal in the 26.11 release. Please migrate `${pname}` to `fetcherVersion = 3` and regenerate the hash. See https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
+
+      stdenvNoCC.mkDerivation
       (
-        args'
-        // {
-          name = "${pname}-pnpm-deps";
+        finalAttrs:
+        (
+          args'
+          // {
+            name = "${pname}-pnpm-deps";
 
-          nativeBuildInputs = [
-            cacert
-            jq
-            moreutils
-            pnpm # from args
-            yq
-            zstd
-          ]
-          ++ args.nativeBuildInputs or [ ];
+            nativeBuildInputs = [
+              cacert
+              jq
+              moreutils
+              pnpm # from args
+              yq
+              zstd
+            ]
+            ++ args.nativeBuildInputs or [ ];
 
-          impureEnvVars =
-            lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_REGISTRY" ] ++ args.impureEnvVars or [ ];
+            impureEnvVars =
+              lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_REGISTRY" ] ++ args.impureEnvVars or [ ];
 
-          installPhase = ''
-            runHook preInstall
+            installPhase = ''
+              runHook preInstall
 
-            lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)"
-            if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then
-              echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!"
-              exit 1
-            fi
+              lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)"
+              if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then
+                echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!"
+                exit 1
+              fi
 
-            export HOME=$(mktemp -d)
+              export HOME=$(mktemp -d)
 
-            # For fetcherVersion < 3, the pnpm store files are placed directly into $out.
-            # For fetcherVersion >= 3, it is bundled into a compressed tarball within $out,
-            # without distributing the uncompressed store files.
-            if [[ ${toString fetcherVersion} -ge 3 ]]; then
-              mkdir $out
-              storePath=$(mktemp -d)
-            else
-              storePath=$out
-            fi
+              # For fetcherVersion < 3, the pnpm store files are placed directly into $out.
+              # For fetcherVersion >= 3, it is bundled into a compressed tarball within $out,
+              # without distributing the uncompressed store files.
+              if [[ ${toString fetcherVersion} -ge 3 ]]; then
+                mkdir $out
+                storePath=$(mktemp -d)
+              else
+                storePath=$out
+              fi
 
-            # If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs,
-            # any pnpm command would fail in that directory, the following disables this
-            pushd ..
-            pnpm config set manage-package-manager-versions false
-            popd
+              # If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs,
+              # any pnpm command would fail in that directory, the following disables this
+              pushd ..
+              pnpm config set manage-package-manager-versions false
+              popd
 
-            pnpm config set store-dir $storePath
-            # Some packages produce platform dependent outputs. We do not want to cache those in the global store
-            pnpm config set side-effects-cache false
-            # As we pin pnpm versions, we don't really care about updates
-            pnpm config set update-notifier false
-            # Run any additional pnpm configuration commands that users provide.
-            ${prePnpmInstall}
-            # pnpm is going to warn us about using --force
-            # --force allows us to fetch all dependencies including ones that aren't meant for our host platform
-            pnpm install \
-                --force \
-                --ignore-scripts \
-                ${lib.escapeShellArgs filterFlags} \
-                ${lib.escapeShellArgs pnpmInstallFlags} \
-                --registry="$NIX_NPM_REGISTRY" \
-                --frozen-lockfile
+              pnpm config set store-dir $storePath
+              # Some packages produce platform dependent outputs. We do not want to cache those in the global store
+              pnpm config set side-effects-cache false
+              # As we pin pnpm versions, we don't really care about updates
+              pnpm config set update-notifier false
+              # Run any additional pnpm configuration commands that users provide.
+              ${prePnpmInstall}
+              # pnpm is going to warn us about using --force
+              # --force allows us to fetch all dependencies including ones that aren't meant for our host platform
+              pnpm install \
+                  --force \
+                  --ignore-scripts \
+                  ${lib.escapeShellArgs filterFlags} \
+                  ${lib.escapeShellArgs pnpmInstallFlags} \
+                  --registry="$NIX_NPM_REGISTRY" \
+                  --frozen-lockfile
 
-            # Store newer fetcherVersion in case pnpmConfigHook also needs it
-            if [[ ${toString fetcherVersion} -gt 1 ]]; then
-              echo ${toString fetcherVersion} > $out/.fetcher-version
-            fi
+              # Store newer fetcherVersion in case pnpmConfigHook also needs it
+              if [[ ${toString fetcherVersion} -gt 1 ]]; then
+                echo ${toString fetcherVersion} > $out/.fetcher-version
+              fi
 
-            runHook postInstall
-          '';
+              runHook postInstall
+            '';
 
-          fixupPhase = ''
-            runHook preFixup
+            fixupPhase = ''
+              runHook preFixup
 
-            # Remove timestamp and sort the json files
-            rm -rf $storePath/{v3,v10}/tmp
-            for f in $(find $storePath -name "*.json"); do
-              jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f
-            done
+              # Remove timestamp and sort the json files
+              rm -rf $storePath/{v3,v10}/tmp
+              for f in $(find $storePath -name "*.json"); do
+                jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f
+              done
 
-            # This folder contains symlinks to /build/source which we don't need
-            # since https://github.com/pnpm/pnpm/releases/tag/v10.27.0
-            rm -rf $storePath/{v3,v10}/projects
+              # This folder contains symlinks to /build/source which we don't need
+              # since https://github.com/pnpm/pnpm/releases/tag/v10.27.0
+              rm -rf $storePath/{v3,v10}/projects
 
-            # Ensure consistent permissions
-            # NOTE: For reasons not yet fully understood, pnpm might create files with
-            # inconsistent permissions, for example inside the ubuntu-24.04
-            # github actions runner.
-            # To ensure stable derivations, we need to set permissions
-            # consistently, namely:
-            # * All files with `-exec` suffix have 555.
-            # * All other files have 444.
-            # * All folders have 555.
-            # See https://github.com/NixOS/nixpkgs/pull/350063
-            # See https://github.com/NixOS/nixpkgs/issues/422889
-            if [[ ${toString fetcherVersion} -ge 2 ]]; then
-              find $storePath -type f -name "*-exec" -print0 | xargs -0 chmod 555
-              find $storePath -type f -not -name "*-exec" -print0 | xargs -0 chmod 444
-              find $storePath -type d -print0 | xargs -0 chmod 555
-            fi
+              # Ensure consistent permissions
+              # NOTE: For reasons not yet fully understood, pnpm might create files with
+              # inconsistent permissions, for example inside the ubuntu-24.04
+              # github actions runner.
+              # To ensure stable derivations, we need to set permissions
+              # consistently, namely:
+              # * All files with `-exec` suffix have 555.
+              # * All other files have 444.
+              # * All folders have 555.
+              # See https://github.com/NixOS/nixpkgs/pull/350063
+              # See https://github.com/NixOS/nixpkgs/issues/422889
+              if [[ ${toString fetcherVersion} -ge 2 ]]; then
+                find $storePath -type f -name "*-exec" -print0 | xargs --no-run-if-empty -0 chmod 555
+                find $storePath -type f -not -name "*-exec" -print0 | xargs --no-run-if-empty -0 chmod 444
+                find $storePath -type d -print0 | xargs --no-run-if-empty -0 chmod 555
+              fi
 
-            if [[ ${toString fetcherVersion} -ge 3 ]]; then
-              (
-                cd $storePath
+              if [[ ${toString fetcherVersion} -ge 3 ]]; then
+                (
+                  cd $storePath
 
-                # Build a reproducible tarball, per instructions at https://reproducible-builds.org/docs/archives/
-                tar --sort=name \
-                  --mtime="@$SOURCE_DATE_EPOCH" \
-                  --owner=0 --group=0 --numeric-owner \
-                  --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
-                  --zstd -cf $out/pnpm-store.tar.zst .
-              )
-            fi
+                  # Build a reproducible tarball, per instructions at https://reproducible-builds.org/docs/archives/
+                  tar --sort=name \
+                    --mtime="@$SOURCE_DATE_EPOCH" \
+                    --owner=0 --group=0 --numeric-owner \
+                    --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+                    --zstd -cf $out/pnpm-store.tar.zst .
+                )
+              fi
 
-            runHook postFixup
-          '';
+              runHook postFixup
+            '';
 
-          passthru = args.passthru or { } // {
-            inherit fetcherVersion;
-            serve = callPackage ./serve.nix {
-              inherit pnpm; # from args
-              pnpmDeps = finalAttrs.finalPackage;
+            passthru = args.passthru or { } // {
+              inherit fetcherVersion;
+              serve = callPackage ./serve.nix {
+                inherit pnpm; # from args
+                pnpmDeps = finalAttrs.finalPackage;
+              };
             };
-          };
 
-          dontConfigure = true;
-          dontBuild = true;
-          outputHashMode = "recursive";
-        }
-        // hash'
+            dontConfigure = true;
+            dontBuild = true;
+            outputHashMode = "recursive";
+          }
+          // hash'
+        )
       )
-    )
   );
 
   pnpmConfigHook = makeSetupHook {
diff --git a/pkgs/build-support/node/fetch-yarn-deps/common.js b/pkgs/build-support/node/fetch-yarn-deps/common.js
index 7f56ec26f491..08168a508760 100644
--- a/pkgs/build-support/node/fetch-yarn-deps/common.js
+++ b/pkgs/build-support/node/fetch-yarn-deps/common.js
@@ -1,7 +1,5 @@
 const path = require('path')
 
-// This has to match the logic in pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js
-// so that fixup_yarn_lock produces the same paths
 const urlToName = url => {
   const isCodeloadGitTarballUrl = url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')
 
diff --git a/pkgs/build-support/node/import-npm-lock/default.nix b/pkgs/build-support/node/import-npm-lock/default.nix
index 8a863709996f..e52f10a9cd40 100644
--- a/pkgs/build-support/node/import-npm-lock/default.nix
+++ b/pkgs/build-support/node/import-npm-lock/default.nix
@@ -12,6 +12,7 @@ let
     match
     elemAt
     toJSON
+    toFile
     removeAttrs
     ;
   inherit (lib) importJSON mapAttrs;
@@ -165,18 +166,15 @@ lib.fix (self: {
       {
         inherit pname version;
 
-        passAsFile = [
-          "package"
-          "packageLock"
-        ];
-
         package = toJSON packageJSON';
         packageLock = toJSON packageLock';
+
+        __structuredAttrs = true;
       }
       ''
         mkdir $out
-        cp "$packagePath" $out/package.json
-        cp "$packageLockPath" $out/package-lock.json
+        printf "%s" "$package" > $out/package.json
+        printf "%s" "$packageLock" > $out/package-lock.json
       '';
 
   # Build node modules from package.json & package-lock.json
@@ -188,6 +186,11 @@ lib.fix (self: {
       nodejs,
       derivationArgs ? { },
     }:
+    let
+      # Backwards compatibility: if derivationArgs contains passAsFile,
+      # we can't force structuredAttrs here yet.
+      __structuredAttrs = !(derivationArgs ? passAsFile);
+    in
     stdenv.mkDerivation (
       {
         pname = derivationArgs.pname or "${getName package}-node-modules";
@@ -221,17 +224,29 @@ lib.fix (self: {
         ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]
         ++ derivationArgs.nativeBuildInputs or [ ];
 
+        postPatch =
+          (
+            if __structuredAttrs then
+              ''
+                printf "%s" "$package" > package.json
+                printf "%s" "$packageLock" > package-lock.json
+              ''
+            else
+              ''
+                cp --no-preserve=mode "$packagePath" package.json
+                cp --no-preserve=mode "$packageLockPath" package-lock.json
+              ''
+          )
+          + derivationArgs.postPatch or "";
+
+        inherit __structuredAttrs;
+      }
+      // lib.optionalAttrs (!__structuredAttrs) {
         passAsFile = [
           "package"
           "packageLock"
         ]
-        ++ derivationArgs.passAsFile or [ ];
-
-        postPatch = ''
-          cp --no-preserve=mode "$packagePath" package.json
-          cp --no-preserve=mode "$packageLockPath" package-lock.json
-        ''
-        + derivationArgs.postPatch or "";
+        ++ derivationArgs.passAsFile;
       }
     );
 
diff --git a/pkgs/build-support/node/prefetch-npm-deps/default.nix b/pkgs/build-support/node/prefetch-npm-deps/default.nix
index bfa8fb863e4b..12c56a58b6ec 100644
--- a/pkgs/build-support/node/prefetch-npm-deps/default.nix
+++ b/pkgs/build-support/node/prefetch-npm-deps/default.nix
@@ -263,7 +263,7 @@
             exit 1
           fi
 
-          prefetch-npm-deps $srcLockfile $out
+          outputHash="${hash_.outputHash}" prefetch-npm-deps $srcLockfile $out
 
           runHook postBuild
         '';
@@ -274,29 +274,31 @@
         # `{ "registry.example.com": "example-registry-bearer-token", ... }`
         impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_TOKENS" ];
 
-        NIX_NPM_REGISTRY_OVERRIDES = npmRegistryOverridesString;
+        env = {
+          NIX_NPM_REGISTRY_OVERRIDES = npmRegistryOverridesString;
 
-        # Fetcher version controls which features are enabled in prefetch-npm-deps
-        # Version 2+ enables packument fetching for workspace support
-        NPM_FETCHER_VERSION = toString fetcherVersion;
+          # Fetcher version controls which features are enabled in prefetch-npm-deps
+          # Version 2+ enables packument fetching for workspace support
+          NPM_FETCHER_VERSION = toString fetcherVersion;
 
-        SSL_CERT_FILE =
-          if
-            (
-              hash_.outputHash == ""
-              || hash_.outputHash == lib.fakeSha256
-              || hash_.outputHash == lib.fakeSha512
-              || hash_.outputHash == lib.fakeHash
-            )
-          then
-            "${cacert}/etc/ssl/certs/ca-bundle.crt"
-          else
-            "/no-cert-file.crt";
+          SSL_CERT_FILE =
+            if
+              (
+                hash_.outputHash == ""
+                || hash_.outputHash == lib.fakeSha256
+                || hash_.outputHash == lib.fakeSha512
+                || hash_.outputHash == lib.fakeHash
+              )
+            then
+              "${cacert}/etc/ssl/certs/ca-bundle.crt"
+            else
+              "/no-cert-file.crt";
+        }
+        // forceGitDeps_
+        // forceEmptyCache_;
 
         outputHashMode = "recursive";
       }
       // hash_
-      // forceGitDeps_
-      // forceEmptyCache_
     );
 }
diff --git a/pkgs/build-support/node/prefetch-npm-deps/src/util.rs b/pkgs/build-support/node/prefetch-npm-deps/src/util.rs
index aca0affad824..6d57c91c184d 100644
--- a/pkgs/build-support/node/prefetch-npm-deps/src/util.rs
+++ b/pkgs/build-support/node/prefetch-npm-deps/src/util.rs
@@ -57,7 +57,7 @@ pub fn get_url(url: &Url) -> Result<Body, anyhow::Error> {
         && let Ok(tokens) = serde_json::from_str::<Map<String, Value>>(&npm_tokens)
         && let Some(token) = tokens.get(host).and_then(serde_json::Value::as_str)
     {
-        info!("Found NPM token for {host}. Adding authorization header to request.");
+        info!("Found npm token for {host}. Adding authorization header to request.");
         request = request.header("Authorization", format!("Bearer {token}"));
     }
 
diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 06f96b75ce05..ab0fec1a2a95 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -16,6 +16,9 @@
 }:
 
 let
+  getOptionalAttrs =
+    names: attrs: lib.getAttrs (lib.intersectLists names (lib.attrNames attrs)) attrs;
+
   interpolateString =
     s:
     if lib.isList s then
@@ -39,16 +42,9 @@ lib.extendMkDerivation {
   extendDrvArgs =
     finalAttrs:
     {
-      name ? "${args.pname}-${args.version}",
-
       # Name for the vendored dependencies tarball
-      cargoDepsName ? name,
+      cargoDepsName ? null,
 
-      src ? null,
-      srcs ? null,
-      preUnpack ? null,
-      unpackPhase ? null,
-      postUnpack ? null,
       cargoPatches ? [ ],
       patches ? [ ],
       sourceRoot ? null,
@@ -115,17 +111,20 @@ lib.extendMkDerivation {
           throw "cargoHash, cargoVendorDir, cargoDeps, or cargoLock must be set"
         else
           fetchCargoVendor (
-            {
-              inherit
-                src
-                srcs
-                sourceRoot
-                cargoRoot
-                preUnpack
-                unpackPhase
-                postUnpack
-                ;
-              name = cargoDepsName;
+            getOptionalAttrs [
+              "name"
+              "pname"
+              "version"
+              "src"
+              "srcs"
+              "sourceRoot"
+              "cargoRoot"
+              "preUnpack"
+              "unpackPhase"
+              "postUnpack"
+            ] finalAttrs
+            // {
+              ${if cargoDepsName != null then "name" else null} = cargoDepsName;
               patches = cargoPatches;
               hash = args.cargoHash;
             }
diff --git a/pkgs/build-support/rust/fetch-cargo-vendor-util-v2.py b/pkgs/build-support/rust/fetch-cargo-vendor-util-v2.py
new file mode 100644
index 000000000000..5dc789c93ad9
--- /dev/null
+++ b/pkgs/build-support/rust/fetch-cargo-vendor-util-v2.py
@@ -0,0 +1,416 @@
+import functools
+import hashlib
+import json
+import multiprocessing as mp
+import re
+import shutil
+import subprocess
+import sys
+import tomllib
+from os.path import islink, realpath
+from pathlib import Path
+from typing import Any, TypedDict, cast
+from urllib.parse import unquote
+
+import requests
+import tomli_w
+from requests.adapters import HTTPAdapter, Retry
+
+eprint = functools.partial(print, file=sys.stderr)
+
+
+def load_toml(path: Path) -> dict[str, Any]:
+    with open(path, "rb") as f:
+        return tomllib.load(f)
+
+
+def get_lockfile_version(cargo_lock_toml: dict[str, Any]) -> int:
+    # lockfile v1 and v2 don't have the `version` key, so assume v2
+    version = cargo_lock_toml.get("version", 2)
+
+    # TODO: add logic for differentiating between v1 and v2
+
+    return version
+
+
+def create_http_session() -> requests.Session:
+    retries = Retry(
+        total=5,
+        backoff_factor=0.5,
+        status_forcelist=[500, 502, 503, 504]
+    )
+    session = requests.Session()
+    session.headers["User-Agent"] = "nixpkgs-fetchCargoVendor/2 (https://github.com/NixOS/nixpkgs)"
+    session.mount('http://', HTTPAdapter(max_retries=retries))
+    session.mount('https://', HTTPAdapter(max_retries=retries))
+    return session
+
+
+def download_file_with_checksum(session: requests.Session, url: str, destination_path: Path) -> str:
+    sha256_hash = hashlib.sha256()
+    with session.get(url, stream=True) as response:
+        if not response.ok:
+            raise Exception(f"Failed to fetch file from {url}. Status code: {response.status_code}")
+        with open(destination_path, "wb") as file:
+            for chunk in response.iter_content(1024):  # Download in chunks
+                if chunk:  # Filter out keep-alive chunks
+                    file.write(chunk)
+                    sha256_hash.update(chunk)
+
+    # Compute the final checksum
+    checksum = sha256_hash.hexdigest()
+    return checksum
+
+
+def get_download_url_for_tarball(pkg: dict[str, Any]) -> str:
+    # TODO: support other registries
+    #       maybe fetch config.json from the registry root and get the dl key
+    #       See: https://doc.rust-lang.org/cargo/reference/registry-index.html#index-configuration
+    if pkg["source"] != "registry+https://github.com/rust-lang/crates.io-index":
+        raise Exception("Only the default crates.io registry is supported.")
+
+    # Use static.crates.io (CDN) instead of crates.io/api to avoid the 1 req/sec
+    # rate limit on the API servers.
+    return f"https://static.crates.io/crates/{pkg["name"]}/{pkg["version"]}/download"
+
+
+def download_tarball(session: requests.Session, pkg: dict[str, Any], out_dir: Path) -> None:
+
+    url = get_download_url_for_tarball(pkg)
+    filename = f"{pkg["name"]}-{pkg["version"]}.tar.gz"
+
+    # TODO: allow legacy checksum specification, see importCargoLock for example
+    #       also, don't forget about the other usage of the checksum
+    expected_checksum = pkg["checksum"]
+
+    tarball_out_dir = out_dir / "tarballs" / filename
+    eprint(f"Fetching {url} -> tarballs/{filename}")
+
+    calculated_checksum = download_file_with_checksum(session, url, tarball_out_dir)
+
+    if calculated_checksum != expected_checksum:
+        raise Exception(f"Hash mismatch! File fetched from {url} had checksum {calculated_checksum}, expected {expected_checksum}.")
+
+
+def download_git_tree(url: str, git_sha_rev: str, out_dir: Path) -> None:
+
+    tree_out_dir = out_dir / "git" / git_sha_rev
+    eprint(f"Fetching {url}#{git_sha_rev} -> git/{git_sha_rev}")
+
+    cmd = ["nix-prefetch-git", "--builder", "--quiet", "--fetch-submodules", "--url", url, "--rev", git_sha_rev, "--out", str(tree_out_dir)]
+    subprocess.check_output(cmd)
+
+
+GIT_SOURCE_REGEX = re.compile("git\\+(?P<url>[^?]+)(\\?(?P<type>rev|tag|branch)=(?P<value>.*))?#(?P<git_sha_rev>.*)")
+
+
+class GitSourceInfo(TypedDict):
+    url: str
+    type: str | None
+    value: str | None
+    git_sha_rev: str
+
+
+def parse_git_source(source: str, lockfile_version: int) -> GitSourceInfo:
+    match = GIT_SOURCE_REGEX.match(source)
+    if match is None:
+        raise Exception(f"Unable to process git source: {source}.")
+
+    source_info = cast(GitSourceInfo, match.groupdict(default=None))
+
+    # the source URL is URL-encoded in lockfile_version >=4
+    # since we just used regex to parse it we have to manually decode the escaped branch/tag name
+    if lockfile_version >= 4 and source_info["value"] is not None:
+        source_info["value"] = unquote(source_info["value"])
+
+    return source_info
+
+
+def create_vendor_staging(lockfile_path: Path, out_dir: Path) -> None:
+    cargo_lock_toml = load_toml(lockfile_path)
+    lockfile_version = get_lockfile_version(cargo_lock_toml)
+
+    git_packages: list[dict[str, Any]] = []
+    registry_packages: list[dict[str, Any]] = []
+
+    for pkg in cargo_lock_toml["package"]:
+        # ignore local dependenices
+        if "source" not in pkg.keys():
+            eprint(f"Skipping local dependency: {pkg["name"]}")
+            continue
+        source = pkg["source"]
+
+        if source.startswith("git+"):
+            git_packages.append(pkg)
+        elif source.startswith("registry+"):
+            registry_packages.append(pkg)
+        else:
+            raise Exception(f"Can't process source: {source}.")
+
+    git_sha_rev_to_url: dict[str, str] = {}
+    for pkg in git_packages:
+        source_info = parse_git_source(pkg["source"], lockfile_version)
+        git_sha_rev_to_url[source_info["git_sha_rev"]] = source_info["url"]
+
+    out_dir.mkdir(exist_ok=True)
+    shutil.copy(lockfile_path, out_dir / "Cargo.lock")
+
+    # fetch git trees sequentially, since fetching concurrently leads to flaky behaviour
+    if len(git_packages) != 0:
+        (out_dir / "git").mkdir()
+        for git_sha_rev, url in git_sha_rev_to_url.items():
+            download_git_tree(url, git_sha_rev, out_dir)
+
+    # run tarball download jobs in parallel, with at most 5 concurrent download jobs
+    with mp.Pool(min(5, mp.cpu_count())) as pool:
+        if len(registry_packages) != 0:
+            (out_dir / "tarballs").mkdir()
+            session = create_http_session()
+            tarball_args_gen = ((session, pkg, out_dir) for pkg in registry_packages)
+            pool.starmap(download_tarball, tarball_args_gen)
+
+
+def get_manifest_metadata(manifest_path: Path) -> dict[str, Any]:
+    cmd = ["cargo", "metadata", "--format-version", "1", "--no-deps", "--manifest-path", str(manifest_path)]
+    output = subprocess.check_output(cmd)
+    return json.loads(output)
+
+
+def try_get_crate_manifest_path_from_manifest_path(manifest_path: Path, crate_name: str) -> Path | None:
+    try:
+        metadata = get_manifest_metadata(manifest_path)
+    except subprocess.CalledProcessError:
+        eprint(f"Warning: cargo metadata failed for {manifest_path}, skipping")
+        return None
+
+    for pkg in metadata["packages"]:
+        if pkg["name"] == crate_name:
+            return Path(pkg["manifest_path"])
+
+    return None
+
+
+def find_crate_manifest_in_tree(tree: Path, crate_name: str) -> Path:
+    # Scan all Cargo.toml files; sort by depth/path to make ordering deterministic
+    # and prefer less-nested manifests first.
+    manifest_paths = sorted(
+        tree.glob("**/Cargo.toml"),
+        key=lambda path: (len(path.parts), str(path)),
+    )
+
+    for manifest_path in manifest_paths:
+        res = try_get_crate_manifest_path_from_manifest_path(manifest_path, crate_name)
+        if res is not None:
+            return res
+
+    raise Exception(f"Couldn't find manifest for crate {crate_name} inside {tree}.")
+
+
+def copy_and_patch_git_crate_subtree(git_tree: Path, crate_name: str, crate_out_dir: Path) -> None:
+
+    # This function will get called by copytree to decide which entries of a directory should be copied
+    # We'll copy everything except symlinks that are invalid
+    def ignore_func(dir_str: str, path_strs: list[str]) -> list[str]:
+        ignorelist: list[str] = []
+
+        dir = Path(realpath(dir_str, strict=True))
+
+        for path_str in path_strs:
+            path = dir / path_str
+            if not islink(path):
+                continue
+
+            # Filter out cyclic symlinks and symlinks pointing at nonexistant files
+            try:
+                target_path = Path(realpath(path, strict=True))
+            except OSError:
+                ignorelist.append(path_str)
+                eprint(f"Failed to resolve symlink, ignoring: {path}")
+                continue
+
+            # Filter out symlinks that point outside of the current crate's base git tree
+            # This can be useful if the nix build sandbox is turned off and there is a symlink to a common absolute path
+            if not target_path.is_relative_to(git_tree):
+                ignorelist.append(path_str)
+                eprint(f"Symlink points outside of the crate's base git tree, ignoring: {path} -> {target_path}")
+                continue
+
+        return ignorelist
+
+    crate_manifest_path = find_crate_manifest_in_tree(git_tree, crate_name)
+    crate_tree = crate_manifest_path.parent
+
+    eprint(f"Copying to {crate_out_dir}")
+    shutil.copytree(crate_tree, crate_out_dir, ignore=ignore_func)
+    crate_out_dir.chmod(0o755)
+
+    with open(crate_manifest_path, "r") as f:
+        manifest_data = f.read()
+
+    if "workspace" in manifest_data:
+        crate_manifest_metadata = get_manifest_metadata(crate_manifest_path)
+        workspace_root = Path(crate_manifest_metadata["workspace_root"])
+
+        root_manifest_path = workspace_root / "Cargo.toml"
+        manifest_path = crate_out_dir / "Cargo.toml"
+
+        manifest_path.chmod(0o644)
+        eprint(f"Patching {manifest_path}")
+
+        cmd = ["replace-workspace-values", str(manifest_path), str(root_manifest_path)]
+        subprocess.check_output(cmd)
+
+
+def extract_crate_tarball_contents(tarball_path: Path, crate_out_dir: Path) -> None:
+    eprint(f"Unpacking to {crate_out_dir}")
+    crate_out_dir.mkdir()
+    cmd = ["tar", "xf", str(tarball_path), "-C", str(crate_out_dir), "--strip-components=1"]
+    subprocess.check_output(cmd)
+
+
+def make_git_source_selector(source_info: GitSourceInfo) -> dict[str, str]:
+    selector = {}
+    selector["git"] = source_info["url"]
+    if source_info["type"] is not None:
+        selector[source_info["type"]] = source_info["value"]
+    return selector
+
+
+def make_registry_source_selector(source: str) -> dict[str, str]:
+    registry = source[9:] if source.startswith("registry+") else source
+    selector = {}
+    selector["registry"] = registry
+    return selector
+
+
+def create_vendor(vendor_staging_dir: Path, out_dir: Path) -> None:
+    lockfile_path = vendor_staging_dir / "Cargo.lock"
+    out_dir.mkdir(exist_ok=True)
+    shutil.copy(lockfile_path, out_dir / "Cargo.lock")
+
+    cargo_lock_toml = load_toml(lockfile_path)
+    lockfile_version = get_lockfile_version(cargo_lock_toml)
+
+    source_to_ind: dict[str, str] = {}
+    source_config = {}
+    next_registry_ind = 0
+    next_git_ind = 0
+
+    def add_source_replacement(
+        orig_key: str,
+        orig_selector: dict[str, str],
+        vendored_key: str,
+        vendored_dir: str
+    ) -> None:
+        source_config[vendored_key] = {}
+        source_config[vendored_key]["directory"] = vendored_dir
+        source_config[orig_key] = orig_selector
+        source_config[orig_key]["replace-with"] = vendored_key
+
+    # we reserve registry index 0 for crates-io
+    source_to_ind["registry+https://github.com/rust-lang/crates.io-index"] = "registry-0"
+    source_to_ind["sparse+https://index.crates.io/"] = "registry-0"
+    add_source_replacement(
+        orig_key="crates-io",
+        orig_selector={},  # there is an internal selector defined for the `crates-io` source
+        vendored_key="vendored-source-registry-0",
+        vendored_dir="@vendor@/source-registry-0"
+    )
+    next_registry_ind += 1
+
+    for pkg in cargo_lock_toml["package"]:
+        # ignore local dependencies
+        if "source" not in pkg.keys():
+            continue
+        source: str = pkg["source"]
+        if source in source_to_ind:
+            continue
+
+        if source.startswith("git+"):
+            ind = f"git-{next_git_ind}"
+            next_git_ind += 1
+            source_info = parse_git_source(source, lockfile_version)
+            selector = make_git_source_selector(source_info)
+        elif source.startswith("registry+") or source.startswith("sparse+"):
+            ind = f"registry-{next_registry_ind}"
+            next_registry_ind += 1
+            selector = make_registry_source_selector(source)
+        else:
+            raise Exception(f"Can't process source: {source}.")
+
+        source_to_ind[source] = ind
+        add_source_replacement(
+            orig_key=f"original-source-{ind}",
+            orig_selector=selector,
+            vendored_key=f"vendored-source-{ind}",
+            vendored_dir=f"@vendor@/source-{ind}"
+        )
+
+    config_path = out_dir / ".cargo" / "config.toml"
+    config_path.parent.mkdir()
+
+    with open(config_path, "wb") as config_file:
+        tomli_w.dump({"source": source_config}, config_file)
+
+    for pkg in cargo_lock_toml["package"]:
+
+        # ignore local dependenices
+        if "source" not in pkg.keys():
+            continue
+
+        source: str = pkg["source"]
+        source_ind = source_to_ind[source]
+        crate_dir_name = f"{pkg["name"]}-{pkg["version"]}"
+        source_dir_name = f"source-{source_ind}"
+        crate_out_dir = out_dir / source_dir_name / crate_dir_name
+        crate_out_dir.parent.mkdir(exist_ok=True)
+
+        if source.startswith("git+"):
+
+            source_info = parse_git_source(source, lockfile_version)
+
+            git_sha_rev = source_info["git_sha_rev"]
+            git_tree = vendor_staging_dir / "git" / git_sha_rev
+
+            copy_and_patch_git_crate_subtree(git_tree, pkg["name"], crate_out_dir)
+
+            # git based crates allow having no checksum information
+            with open(crate_out_dir / ".cargo-checksum.json", "w") as f:
+                json.dump({"files": {}}, f)
+
+        elif source.startswith("registry+") or source.startswith("sparse+"):
+            filename = f"{pkg["name"]}-{pkg["version"]}.tar.gz"
+
+            # TODO: change this when non-crates-io registries are supported
+            dir_name = "tarballs"
+
+            tarball_path = vendor_staging_dir / dir_name / filename
+
+            extract_crate_tarball_contents(tarball_path, crate_out_dir)
+
+            # non-git based crates need the package checksum at minimum
+            with open(crate_out_dir / ".cargo-checksum.json", "w") as f:
+                json.dump({"files": {}, "package": pkg["checksum"]}, f)
+
+        else:
+            raise Exception(f"Can't process source: {source}.")
+
+
+def main() -> None:
+    subcommand = sys.argv[1]
+
+    subcommand_func_dict = {
+        "create-vendor-staging": lambda: create_vendor_staging(lockfile_path=Path(sys.argv[2]), out_dir=Path(sys.argv[3])),
+        "create-vendor": lambda: create_vendor(vendor_staging_dir=Path(sys.argv[2]), out_dir=Path(sys.argv[3]))
+    }
+
+    subcommand_func = subcommand_func_dict.get(subcommand)
+
+    if subcommand_func is None:
+        raise Exception(f"Unknown subcommand: '{subcommand}'. Must be one of {list(subcommand_func_dict.keys())}")
+
+    subcommand_func()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix
index 5362491b260c..2802bf9e73f1 100644
--- a/pkgs/build-support/rust/fetch-cargo-vendor.nix
+++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix
@@ -22,18 +22,44 @@ let
     ];
   } (builtins.readFile ./replace-workspace-values.py);
 
-  fetchCargoVendorUtil = writers.writePython3Bin "fetch-cargo-vendor-util" {
-    libraries =
-      with python3Packages;
-      [
-        requests
-        tomli-w
-      ]
-      ++ requests.optional-dependencies.socks; # to support socks proxy envs like ALL_PROXY in requests
-    flakeIgnore = [
-      "E501"
-    ];
-  } (builtins.readFile ./fetch-cargo-vendor-util.py);
+  nix-prefetch-git' = nix-prefetch-git.override {
+    git = gitMinimal;
+    # break loop of nix-prefetch-git -> git-lfs -> asciidoctor -> ruby (yjit) -> fetchCargoVendor -> nix-prefetch-git
+    # Cargo does not currently handle git-lfs: https://github.com/rust-lang/cargo/issues/9692
+    git-lfs = null;
+  };
+
+  removedArgs = [
+    "name"
+    "pname"
+    "version"
+    "nativeBuildInputs"
+    "hash"
+  ];
+
+  mkFetchCargoVendorUtil =
+    name: src:
+    writers.writePython3Bin name {
+      libraries =
+        with python3Packages;
+        [
+          requests
+          tomli-w
+        ]
+        ++ requests.optional-dependencies.socks; # to support socks proxy envs like ALL_PROXY in requests
+      flakeIgnore = [
+        "E501"
+      ];
+    } (builtins.readFile src);
+
+  # Separate util used only by the FOD `vendorStaging` stage below. Kept
+  # distinct from fetchCargoVendorUtil so that changes to the network-facing
+  # bits (User-Agent, download URL) don't invalidate the input-addressed
+  # `-vendor` stage and force a mass rebuild of every Rust package in nixpkgs.
+  # vendorStaging is an FOD, so swapping its util is free for consumers.
+  # TODO: unify with fetchCargoVendorUtil on the next `staging` cycle.
+  fetchCargoVendorUtilV2 = mkFetchCargoVendorUtil "fetch-cargo-vendor-util-v2" ./fetch-cargo-vendor-util-v2.py;
+  fetchCargoVendorUtil = mkFetchCargoVendorUtil "fetch-cargo-vendor-util" ./fetch-cargo-vendor-util.py;
 in
 
 {
@@ -46,14 +72,6 @@ in
 # TODO: add asserts about pname version and name
 
 let
-  removedArgs = [
-    "name"
-    "pname"
-    "version"
-    "nativeBuildInputs"
-    "hash"
-  ];
-
   vendorStaging = stdenvNoCC.mkDerivation (
     {
       name = "${name}-vendor-staging";
@@ -61,14 +79,9 @@ let
       impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 
       nativeBuildInputs = [
-        fetchCargoVendorUtil
+        fetchCargoVendorUtilV2
         cacert
-        (nix-prefetch-git.override {
-          git = gitMinimal;
-          # break loop of nix-prefetch-git -> git-lfs -> asciidoctor -> ruby (yjit) -> fetchCargoVendor -> nix-prefetch-git
-          # Cargo does not currently handle git-lfs: https://github.com/rust-lang/cargo/issues/9692
-          git-lfs = null;
-        })
+        nix-prefetch-git'
       ]
       ++ nativeBuildInputs;
 
@@ -79,7 +92,7 @@ let
           cd "$cargoRoot"
         fi
 
-        fetch-cargo-vendor-util create-vendor-staging ./Cargo.lock "$out"
+        fetch-cargo-vendor-util-v2 create-vendor-staging ./Cargo.lock "$out"
 
         runHook postBuild
       '';
@@ -97,7 +110,6 @@ let
     // removeAttrs args removedArgs
   );
 in
-
 runCommand "${name}-vendor"
   {
     inherit vendorStaging;
diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix
index a3cd9b825ffc..9c172c7842f8 100644
--- a/pkgs/build-support/rust/import-cargo-lock.nix
+++ b/pkgs/build-support/rust/import-cargo-lock.nix
@@ -263,26 +263,32 @@ let
   vendorDir =
     runCommand "cargo-vendor-dir"
       (
-        if lockFile == null then
-          {
-            inherit lockFileContents;
-            passAsFile = [ "lockFileContents" ];
-          }
-        else
-          {
-            passthru = {
-              inherit lockFile;
-            };
-          }
+        {
+          __structuredAttrs = true;
+        }
+        // (
+          if lockFile == null then
+            {
+              inherit lockFileContents;
+            }
+          else
+            {
+              passthru = {
+                inherit lockFile;
+              };
+            }
+        )
       )
       ''
             mkdir -p $out/.cargo
 
             ${
-              if lockFile != null then
-                "ln -s ${lockFile} $out/Cargo.lock"
+              if lockFile == null then
+                ''
+                  printf "%s" "$lockFileContents" > "$out/Cargo.lock"
+                ''
               else
-                "cp $lockFileContentsPath $out/Cargo.lock"
+                "ln -s ${lockFile} $out/Cargo.lock"
             }
 
             cat > $out/.cargo/config.toml <<EOF
diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix
index e492d03e3026..7198fa961a91 100644
--- a/pkgs/build-support/rust/lib/default.nix
+++ b/pkgs/build-support/rust/lib/default.nix
@@ -77,7 +77,7 @@
       + lib.optionalString (rustTargetPlatform != rustHostPlatform) ''
         "CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \
         "CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \
-        "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \
+        "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}"
       '';
     };
 }
diff --git a/pkgs/build-support/rust/rustc-wrapper/default.nix b/pkgs/build-support/rust/rustc-wrapper/default.nix
index 230cf8ca032a..0ec66da5ab1a 100644
--- a/pkgs/build-support/rust/rustc-wrapper/default.nix
+++ b/pkgs/build-support/rust/rustc-wrapper/default.nix
@@ -3,38 +3,38 @@
   runCommand,
   rustc-unwrapped,
   sysroot ? null,
+  stdenvNoCC,
+  shell ? stdenvNoCC.shell,
 }:
+let
+  sysrootFlag = lib.optionalString (sysroot != null) "--sysroot ${sysroot}";
 
+  # Upstream rustc still assumes that musl = static[1].  The fix for
+  # this is to disable crt-static by default for non-static musl
+  # targets.
+  #
+  # Even though Cargo will build build.rs files for the build platform,
+  # cross-compiling _from_ musl appears to work fine, so we only need
+  # to do this when rustc's target platform is dynamically linked musl.
+  #
+  # [1]: https://github.com/rust-lang/compiler-team/issues/422
+  #
+  # WARNING: using defaultArgs is dangerous, as it will apply to all
+  # targets used by this compiler (host and target).  This means
+  # that it can't be used to set arguments that should only be
+  # applied to the target.  It's fine to do this for -crt-static,
+  # because rustc does not support +crt-static host platforms
+  # anyway.
+  defaultArgs = lib.optionalString (
+    with rustc-unwrapped.stdenv.targetPlatform; isMusl && !isStatic
+  ) "-C target-feature=-crt-static";
+in
 runCommand "${rustc-unwrapped.pname}-wrapper-${rustc-unwrapped.version}"
   {
     preferLocalBuild = true;
     strictDeps = true;
     inherit (rustc-unwrapped) outputs;
 
-    env = {
-      sysroot = lib.optionalString (sysroot != null) "--sysroot ${sysroot}";
-
-      # Upstream rustc still assumes that musl = static[1].  The fix for
-      # this is to disable crt-static by default for non-static musl
-      # targets.
-      #
-      # Even though Cargo will build build.rs files for the build platform,
-      # cross-compiling _from_ musl appears to work fine, so we only need
-      # to do this when rustc's target platform is dynamically linked musl.
-      #
-      # [1]: https://github.com/rust-lang/compiler-team/issues/422
-      #
-      # WARNING: using defaultArgs is dangerous, as it will apply to all
-      # targets used by this compiler (host and target).  This means
-      # that it can't be used to set arguments that should only be
-      # applied to the target.  It's fine to do this for -crt-static,
-      # because rustc does not support +crt-static host platforms
-      # anyway.
-      defaultArgs = lib.optionalString (
-        with rustc-unwrapped.stdenv.targetPlatform; isMusl && !isStatic
-      ) "-C target-feature=-crt-static";
-    };
-
     passthru = {
       inherit (rustc-unwrapped)
         pname
@@ -58,10 +58,18 @@ runCommand "${rustc-unwrapped.pname}-wrapper-${rustc-unwrapped.version}"
     mkdir -p $out/bin
     ln -s ${rustc-unwrapped}/bin/* $out/bin
     rm $out/bin/{rustc,rustdoc}
-    prog=${rustc-unwrapped}/bin/rustc extraFlagsVar=NIX_RUSTFLAGS \
-        substituteAll ${./rustc-wrapper.sh} $out/bin/rustc
-    prog=${rustc-unwrapped}/bin/rustdoc extraFlagsVar=NIX_RUSTDOCFLAGS \
-        substituteAll ${./rustc-wrapper.sh} $out/bin/rustdoc
+    substitute ${./rustc-wrapper.sh} $out/bin/rustc \
+      --replace-fail "@shell@" ${lib.escapeShellArg shell} \
+      --replace-fail "@sysrootFlag@" ${lib.escapeShellArg sysrootFlag} \
+      --replace-fail "@defaultArgs@" ${lib.escapeShellArg defaultArgs} \
+      --replace-fail "@prog@" ${lib.escapeShellArg rustc-unwrapped}/bin/rustc \
+      --replace-fail "@extraFlagsVar@" "NIX_RUSTFLAGS"
+    substitute ${./rustc-wrapper.sh} $out/bin/rustdoc \
+      --replace-fail "@shell@" ${lib.escapeShellArg shell} \
+      --replace-fail "@sysrootFlag@" ${lib.escapeShellArg sysrootFlag} \
+      --replace-fail "@defaultArgs@" ${lib.escapeShellArg defaultArgs} \
+      --replace-fail "@prog@" ${lib.escapeShellArg rustc-unwrapped}/bin/rustdoc \
+      --replace-fail "@extraFlagsVar@" "NIX_RUSTDOCFLAGS"
     chmod +x $out/bin/{rustc,rustdoc}
     ${lib.concatMapStrings (output: "ln -s ${rustc-unwrapped.${output}} \$${output}\n") (
       lib.remove "out" rustc-unwrapped.outputs
diff --git a/pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh b/pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh
index e33cc3e2a025..d006a38032bd 100644
--- a/pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh
+++ b/pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh
@@ -1,6 +1,6 @@
 #!@shell@
 
-defaultSysroot=(@sysroot@)
+defaultSysroot=(@sysrootFlag@)
 
 for arg; do
     case "$arg" in
diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix
index 1dfeb063abe3..025c4a149bdd 100644
--- a/pkgs/build-support/teleport/default.nix
+++ b/pkgs/build-support/teleport/default.nix
@@ -82,7 +82,7 @@ let
         version
         ;
       pnpm = pnpm_10_29_2;
-      fetcherVersion = 2;
+      fetcherVersion = 3;
       hash = pnpmHash;
     };
 
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 68ec5189177e..53cfe9317e28 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -568,7 +568,7 @@ let
 
           echo "unpacking RPMs..."
           set +o pipefail
-          for i in $rpms; do
+          for i in "''${rpms[@]}"; do
               echo "$i..."
               ${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional
           done
@@ -585,7 +585,7 @@ let
 
           echo "installing RPMs..."
           PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
-            rpm -iv --nosignature ${lib.optionalString (!runScripts) "--noscripts"} $rpms
+            rpm -iv --nosignature ${lib.optionalString (!runScripts) "--noscripts"} "''${rpms[@]}"
 
           echo "running post-install script..."
           eval "$postInstall"
@@ -730,7 +730,8 @@ let
             memSize
             ;
 
-          debs = (lib.intersperse "|" debs);
+          debsFlat = lib.flatten debs;
+          debsGrouped = debs;
 
           preVM = createEmptyImage { inherit size fullName; };
 
@@ -749,11 +750,9 @@ let
             # (which have lots of circular dependencies) from barfing.
             echo "unpacking Debs..."
 
-            for deb in $debs; do
-              if test "$deb" != "|"; then
-                echo "$deb..."
-                dpkg-deb --extract "$deb" /mnt
-              fi
+            for deb in "''${debsFlat[@]}"; do
+              echo "$deb..."
+              dpkg-deb --extract "$deb" /mnt
             done
 
             # Make the Nix store available in /mnt, because that's where the .debs live.
@@ -776,10 +775,7 @@ let
 
             export DEBIAN_FRONTEND=noninteractive
 
-            oldIFS="$IFS"
-            IFS="|"
-            for component in $debs; do
-              IFS="$oldIFS"
+            for component in "''${debsGrouped[@]}"; do
               echo
               echo ">>> INSTALLING COMPONENT: $component"
               debs=
diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index 2b5b9184a60e..ff8aa8fa2dcf 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -1,43 +1,43 @@
 {
   "stable": {
     "linux": {
-      "version": "8.12.8",
+      "version": "8.12.12",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.8.x64.tar.gz",
-          "hash": "sha256-WMApavYGR4TX1/gx8yjzaI0SHf1CEC+Ay9nAyxCOLs0="
+          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.12.x64.tar.gz",
+          "hash": "sha256-tdhuBJeCXbepDN6Z9Yqs6gE5lMUh72sOJuQSv4Qoj1M="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.8.arm64.tar.gz",
-          "hash": "sha256-Uqt44otc40/v7/f90r2BS0yK1TuctOO0VUcWGhjv0pI="
+          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.12.arm64.tar.gz",
+          "hash": "sha256-RNwZOqr29aLgNJYH/66TFEKCK3AVBhk+qnSax+Y7Dl4="
         }
       }
     },
     "darwin": {
-      "version": "8.12.8",
+      "version": "8.12.12",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.12.8-x86_64.zip",
-          "hash": "sha256-w4gfs8Ctpe73TNaXebwUoa0cEOuZfiBUWN+qngSNcj4="
+          "url": "https://downloads.1password.com/mac/1Password-8.12.12-x86_64.zip",
+          "hash": "sha256-6vVMkra7T4kVRrVn8QexBMRkHDrUoZXP/eALyBPYPow="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.12.8-aarch64.zip",
-          "hash": "sha256-tT7VG6KlIv4Q+UtG9pzkyBRnISzvAdrqOeO8zdlZPb4="
+          "url": "https://downloads.1password.com/mac/1Password-8.12.12-aarch64.zip",
+          "hash": "sha256-IqMw4dgMhHkzjMVbmZy/h3li74JZxbY8D4COeMEg+1o="
         }
       }
     }
   },
   "beta": {
     "linux": {
-      "version": "8.12.0-11.BETA",
+      "version": "8.12.12-43.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.0-11.BETA.x64.tar.gz",
-          "hash": "sha256-0PDkZAqlY/afocvc/rcly/nwZeSSbXdRyXH57aVPUoQ="
+          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.12-43.BETA.x64.tar.gz",
+          "hash": "sha256-dMnYMw+egxZZXR03EBhOyL3mdRjp0nyuxL78eVKklHs="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.0-11.BETA.arm64.tar.gz",
-          "hash": "sha256-0YDJKexCdOeU0/KPsJzI5rBUlbDEFW5N33LFXtDo3tg="
+          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.12-43.BETA.arm64.tar.gz",
+          "hash": "sha256-nge4jT8M8X2LR18vHfZTRnIEcfxVgnbcHvvAJcveZxI="
         }
       }
     },
diff --git a/pkgs/by-name/_2/_20kly/package.nix b/pkgs/by-name/_2/_20kly/package.nix
index 605def822c2c..cb5e307ba6fc 100644
--- a/pkgs/by-name/_2/_20kly/package.nix
+++ b/pkgs/by-name/_2/_20kly/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   patchPhase = ''
     substituteInPlace lightyears \
-      --replace \
+      --replace-fail \
         "LIGHTYEARS_DIR = \".\"" \
         "LIGHTYEARS_DIR = \"$out/share\""
   '';
diff --git a/pkgs/by-name/_3/_3proxy/package.nix b/pkgs/by-name/_3/_3proxy/package.nix
index 0592f143d9b6..72c98b5bf3e7 100644
--- a/pkgs/by-name/_3/_3proxy/package.nix
+++ b/pkgs/by-name/_3/_3proxy/package.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
   # Don't strip binary on install, we strip it on fixup phase anyway.
   postPatch = ''
     substituteInPlace Makefile.Linux \
-      --replace "(INSTALL_BIN) -s" "(INSTALL_BIN)" \
-      --replace "/usr" ""
+      --replace-fail "(INSTALL_BIN) -s" "(INSTALL_BIN)" \
+      --replace-fail "/usr" ""
   '';
 
   makeFlags = [
diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix
index 18968647d9e8..f3c071bd8f12 100644
--- a/pkgs/by-name/_6/_64gram/package.nix
+++ b/pkgs/by-name/_6/_64gram/package.nix
@@ -10,13 +10,13 @@ telegram-desktop.override {
   inherit withWebkit;
   unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec {
     pname = "64gram-unwrapped";
-    version = "1.1.99";
+    version = "1.2.0";
 
     src = fetchFromGitHub {
       owner = "TDesktop-x64";
       repo = "tdesktop";
       tag = "v${version}";
-      hash = "sha256-p1mdNoTjftbAeoWJ+AKVPFr87BoxOLIT5fDzWY3VXMQ=";
+      hash = "sha256-Xhyk/rCb4EakU0Nc80U1QN3PyMqlLBtcYb+zGjllhDM=";
       fetchSubmodules = true;
     };
 
diff --git a/pkgs/by-name/_7/_7zip-zstd/package.nix b/pkgs/by-name/_7/_7zip-zstd/package.nix
index a10b436ad5b6..2614b4b43472 100644
--- a/pkgs/by-name/_7/_7zip-zstd/package.nix
+++ b/pkgs/by-name/_7/_7zip-zstd/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   ''
   + lib.optionalString stdenv.hostPlatform.isMinGW ''
     substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \
-      --replace windres.exe ${stdenv.cc.targetPrefix}windres
+      --replace-fail windres.exe ${stdenv.cc.targetPrefix}windres
   '';
 
   buildPhase =
diff --git a/pkgs/by-name/_7/_7zz/package.nix b/pkgs/by-name/_7/_7zz/package.nix
index b06c35c81645..95ab0d4ef519 100644
--- a/pkgs/by-name/_7/_7zz/package.nix
+++ b/pkgs/by-name/_7/_7zz/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = lib.optionalString stdenv.hostPlatform.isMinGW ''
     substituteInPlace CPP/7zip/7zip_gcc.mak C/7zip_gcc_c.mak \
-      --replace windres.exe ${stdenv.cc.targetPrefix}windres
+      --replace-fail windres.exe ${stdenv.cc.targetPrefix}windres
   '';
 
   env.NIX_CFLAGS_COMPILE = toString (
diff --git a/pkgs/by-name/_9/_9base/package.nix b/pkgs/by-name/_9/_9base/package.nix
index 47e81a9b919e..286e9392c1b5 100644
--- a/pkgs/by-name/_9/_9base/package.nix
+++ b/pkgs/by-name/_9/_9base/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   # the 9yacc script needs to be executed to build other items
   preBuild = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     substituteInPlace ./yacc/9yacc \
-      --replace "../yacc/yacc" "${lib.getExe' pkgsBuildHost._9base "yacc"}"
+      --replace-fail "../yacc/yacc" "${lib.getExe' pkgsBuildHost._9base "yacc"}"
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/_9/_9pfs/package.nix b/pkgs/by-name/_9/_9pfs/package.nix
index d57ea3abcb37..54d50ee3cf44 100644
--- a/pkgs/by-name/_9/_9pfs/package.nix
+++ b/pkgs/by-name/_9/_9pfs/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
-    substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG"
+    substituteInPlace Makefile --replace-fail "pkg-config" "$PKG_CONFIG"
   '';
 
   makeFlags = [
diff --git a/pkgs/by-name/a2/a2jmidid/package.nix b/pkgs/by-name/a2/a2jmidid/package.nix
index 61fd1a471b76..8cf34304719a 100644
--- a/pkgs/by-name/a2/a2jmidid/package.nix
+++ b/pkgs/by-name/a2/a2jmidid/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH
-    substituteInPlace $out/bin/a2j --replace "a2j_control" "$out/bin/a2j_control"
+    substituteInPlace $out/bin/a2j --replace-fail "a2j_control" "$out/bin/a2j_control"
   '';
 
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/by-name/a2/a2ps/package.nix b/pkgs/by-name/a2/a2ps/package.nix
index 1f4b30713050..3e4510996abc 100644
--- a/pkgs/by-name/a2/a2ps/package.nix
+++ b/pkgs/by-name/a2/a2ps/package.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
-    substituteInPlace afm/make_fonts_map.sh --replace "/bin/rm" "rm"
-    substituteInPlace tests/defs.in --replace "/bin/rm" "rm"
+    substituteInPlace afm/make_fonts_map.sh --replace-fail "/bin/rm" "rm"
+    substituteInPlace tests/defs.in --replace-fail "/bin/rm" "rm"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/a5/a52dec/package.nix b/pkgs/by-name/a5/a52dec/package.nix
index d428b36d1785..1cd69b032794 100644
--- a/pkgs/by-name/a5/a52dec/package.nix
+++ b/pkgs/by-name/a5/a52dec/package.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-shared"
     # Define inline as __attribute__ ((__always_inline__))
     "ac_cv_c_inline=yes"
+    # C23 (Clang default w/ autoconf 2.73) rejects K&R-style declarations
+    "CFLAGS=-std=gnu17"
   ];
 
   makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ];
diff --git a/pkgs/by-name/aa/aaxtomp3/package.nix b/pkgs/by-name/aa/aaxtomp3/package.nix
index 8bbd43a58384..4ada59786c08 100644
--- a/pkgs/by-name/aa/aaxtomp3/package.nix
+++ b/pkgs/by-name/aa/aaxtomp3/package.nix
@@ -30,10 +30,10 @@ resholve.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace AAXtoMP3 \
-      --replace 'AAXtoMP3' 'aaxtomp3'
+      --replace-fail 'AAXtoMP3' 'aaxtomp3'
     substituteInPlace interactiveAAXtoMP3 \
-      --replace 'AAXtoMP3' 'aaxtomp3' \
-      --replace 'call="./aaxtomp3"' 'call="$AAXTOMP3"'
+      --replace-fail 'AAXtoMP3' 'aaxtomp3' \
+      --replace-fail 'call="./aaxtomp3"' 'call="$AAXTOMP3"'
   '';
 
   installPhase = ''
diff --git a/pkgs/by-name/ab/abaddon/package.nix b/pkgs/by-name/ab/abaddon/package.nix
index 538a35f6f8e9..8d989cc16bb1 100644
--- a/pkgs/by-name/ab/abaddon/package.nix
+++ b/pkgs/by-name/ab/abaddon/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abaddon";
-  version = "0.2.2";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "uowuo";
     repo = "abaddon";
     tag = "v${version}";
-    hash = "sha256-48lR1rIWMwLaTv+nIdqmQ3mHOayrC1P5OQuUb+URYh0=";
+    hash = "sha256-fSNXMbyYmUOA4x911/an02fhhhWe6a4xlLVb2DIqIOE=";
     fetchSubmodules = true;
   };
 
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     mainProgram = "abaddon";
     homepage = "https://github.com/uowuo/abaddon";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ choco98 ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ab/abcde/package.nix b/pkgs/by-name/ab/abcde/package.nix
index 1b64dcbb07e7..1dd5907bb332 100644
--- a/pkgs/by-name/ab/abcde/package.nix
+++ b/pkgs/by-name/ab/abcde/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     echo CDROMREADERSYNTAX=cdparanoia >>abcde.conf
 
     substituteInPlace "abcde" \
-      --replace "/etc/abcde.conf" "$out/etc/abcde.conf"
+      --replace-fail "/etc/abcde.conf" "$out/etc/abcde.conf"
 
     runHook postConfigure
   '';
diff --git a/pkgs/by-name/ab/abi-dumper/package.nix b/pkgs/by-name/ab/abi-dumper/package.nix
index 1008f350d17f..cb967e29f2b2 100644
--- a/pkgs/by-name/ab/abi-dumper/package.nix
+++ b/pkgs/by-name/ab/abi-dumper/package.nix
@@ -21,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   patchPhase = ''
     substituteInPlace abi-dumper.pl \
-      --replace eu-readelf ${elfutils}/bin/eu-readelf \
-      --replace vtable-dumper ${vtable-dumper}/bin/vtable-dumper \
-      --replace '"ctags"' '"${ctags}/bin/ctags"'
+      --replace-fail eu-readelf ${elfutils}/bin/eu-readelf \
+      --replace-fail vtable-dumper ${vtable-dumper}/bin/vtable-dumper \
+      --replace-fail '"ctags"' '"${ctags}/bin/ctags"'
   '';
 
   buildInputs = [
diff --git a/pkgs/by-name/ab/above/package.nix b/pkgs/by-name/ab/above/package.nix
index 2a09ad9fcc7c..1a5d95995d58 100644
--- a/pkgs/by-name/ab/above/package.nix
+++ b/pkgs/by-name/ab/above/package.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "casterbyte";
+    owner = "caster0x00";
     repo = "Above";
     tag = "v${finalAttrs.version}";
     hash = "sha256-wyXWGfthzJeHZoJe4OKe9k2BIwLae/aOUtiJpT4SfHw=";
@@ -28,8 +28,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   meta = {
     description = "Invisible network protocol sniffer";
-    homepage = "https://github.com/casterbyte/Above";
-    changelog = "https://github.com/casterbyte/Above/releases/tag/${finalAttrs.src.tag}";
+    homepage = "https://github.com/caster0x00/Above";
+    changelog = "https://github.com/caster0x00/Above/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "above";
diff --git a/pkgs/by-name/ab/abuild/package.nix b/pkgs/by-name/ab/abuild/package.nix
index 08a377463477..9b083eb24d73 100644
--- a/pkgs/by-name/ab/abuild/package.nix
+++ b/pkgs/by-name/ab/abuild/package.nix
@@ -53,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   patchPhase = ''
     substituteInPlace ./Makefile \
-      --replace 'chmod 4555' '#chmod 4555' \
-      --replace 'pkg-config' "$PKG_CONFIG"
+      --replace-fail 'chmod 4555' '#chmod 4555' \
+      --replace-fail 'pkg-config' "$PKG_CONFIG"
   '';
 
   makeFlags = [
diff --git a/pkgs/by-name/ac/acltoolkit/package.nix b/pkgs/by-name/ac/acltoolkit/package.nix
index 0c0e92304814..67505709888f 100644
--- a/pkgs/by-name/ac/acltoolkit/package.nix
+++ b/pkgs/by-name/ac/acltoolkit/package.nix
@@ -7,7 +7,9 @@
 python3.pkgs.buildPythonPackage {
   pname = "acltoolkit";
   version = "0-unstable-2023-02-03";
-  format = "setuptools";
+  pyproject = true;
+
+  build-system = with python3.pkgs; [ setuptools ];
 
   src = fetchFromGitHub {
     owner = "zblurx";
@@ -21,7 +23,7 @@ python3.pkgs.buildPythonPackage {
     sed -i -e "s/==[0-9.]*//" setup.py
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     asn1crypto
     dnspython
     impacket
diff --git a/pkgs/by-name/ac/acme-dns/package.nix b/pkgs/by-name/ac/acme-dns/package.nix
index 54b27bde9116..52531d21e63e 100644
--- a/pkgs/by-name/ac/acme-dns/package.nix
+++ b/pkgs/by-name/ac/acme-dns/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
 
   postInstall = ''
     install -D -m0444 -t $out/lib/systemd/system ./acme-dns.service
-    substituteInPlace $out/lib/systemd/system/acme-dns.service --replace "/usr/local/bin/acme-dns" "$out/bin/acme-dns"
+    substituteInPlace $out/lib/systemd/system/acme-dns.service --replace-fail "/usr/local/bin/acme-dns" "$out/bin/acme-dns"
   '';
 
   passthru.tests = { inherit (nixosTests) acme-dns; };
diff --git a/pkgs/by-name/ac/acme/package.nix b/pkgs/by-name/ac/acme/package.nix
index 3fb043ad15b7..8131a6dcdd99 100644
--- a/pkgs/by-name/ac/acme/package.nix
+++ b/pkgs/by-name/ac/acme/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace Makefile \
-      --replace "= gcc" "?= gcc"
+      --replace-fail "= gcc" "?= gcc"
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ac/acpic/package.nix b/pkgs/by-name/ac/acpic/package.nix
index 65e31d56a903..762170c1f00e 100644
--- a/pkgs/by-name/ac/acpic/package.nix
+++ b/pkgs/by-name/ac/acpic/package.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "pbr>=5.8.1,<6" "pbr"
+      --replace-fail "pbr>=5.8.1,<6" "pbr"
   '';
 
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix
index 5cf7ae30268d..c6027ed0ae27 100644
--- a/pkgs/by-name/ac/acpica-tools/package.nix
+++ b/pkgs/by-name/ac/acpica-tools/package.nix
@@ -39,6 +39,13 @@ stdenv.mkDerivation (finalAttrs: {
       "-O3"
     ];
 
+    # ACPICA emits packed structs that produce unaligned pointers. Apple's
+    # arm64 linker rejects these under chained fixups; opt back into the
+    # legacy fixup format so the link succeeds.
+    NIX_LDFLAGS = lib.optionalString (
+      stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
+    ) "-no_fixup_chains";
+
     # i686 builds fail with hardening enabled (due to -Wformat-overflow). Disable
     # -Werror altogether to make this derivation less fragile to toolchain
     # updates.
@@ -46,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # We can handle stripping ourselves.
     # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected.
-    INSTALLFLAGS = lib.optionals (!stdenv.hostPlatform.isDarwin) "-m 555";
+    INSTALLFLAGS = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-m 555";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ac/acpilight/package.nix b/pkgs/by-name/ac/acpilight/package.nix
index 737d1e5727ba..79a45f5dbe72 100644
--- a/pkgs/by-name/ac/acpilight/package.nix
+++ b/pkgs/by-name/ac/acpilight/package.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   );
 
   postConfigure = ''
-    substituteInPlace 90-backlight.rules --replace /bin ${coreutils}/bin
-    substituteInPlace Makefile --replace udevadm true
+    substituteInPlace 90-backlight.rules --replace-fail /bin ${coreutils}/bin
+    substituteInPlace Makefile --replace-fail udevadm true
   '';
 
   buildInputs = [ pyenv ];
diff --git a/pkgs/by-name/ac/acr-cli/package.nix b/pkgs/by-name/ac/acr-cli/package.nix
index 90e981bc2be7..0c18d019de71 100644
--- a/pkgs/by-name/ac/acr-cli/package.nix
+++ b/pkgs/by-name/ac/acr-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "acr-cli";
-  version = "0.18.1";
+  version = "0.19";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "acr-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VxY+Hq9aJjkr6TmyuFE9i9VliNowZataQimf8yWPXp8=";
+    hash = "sha256-Tb1OVVkEH6XmYjbe5ktgqRO/Ko1jhzpbhycZFalhgVg=";
   };
 
   vendorHash = null;
@@ -28,6 +28,12 @@ buildGoModule (finalAttrs: {
 
   executable = [ "acr" ];
 
+  # Required for some tests on darwin.
+  __darwinAllowLocalNetworking = true;
+
+  # Test checks for legacy error which has been changed in newer go versions.
+  checkFlags = [ "-skip=^TestParseDuration" ];
+
   passthru.tests.version = testers.testVersion {
     package = acr-cli;
     command = "acr version";
diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix
index 8c1ca70f674b..f8ff770ad0a5 100644
--- a/pkgs/by-name/ac/act/package.nix
+++ b/pkgs/by-name/ac/act/package.nix
@@ -8,16 +8,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "act";
-  version = "0.2.87";
+  version = "0.2.88";
 
   src = fetchFromGitHub {
     owner = "nektos";
     repo = "act";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i3DaVLspm/lP6HvRD56qToi3Vj9MijK0IfZA4n2Y5IA=";
+    hash = "sha256-/nkaJlB2opuScXb8+Jo9rXdYN1Pwc+nq+T05Y4yxcCI=";
   };
 
-  vendorHash = "sha256-MsrWfrXuIi1m0vhDR05qbD4ynNpKvKwjUgDKbaq5iLs=";
+  vendorHash = "sha256-z7FX2hrF4DkmHu0K9Atc76pa+PPLylimpoWhQCeF5uA=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/ac/activate-linux/package.nix b/pkgs/by-name/ac/activate-linux/package.nix
index e67d3ccda23f..f76a955d8ddb 100644
--- a/pkgs/by-name/ac/activate-linux/package.nix
+++ b/pkgs/by-name/ac/activate-linux/package.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm444 res/icon.png $out/share/icons/hicolor/128x128/apps/activate-linux.png
     install -Dm444 res/activate-linux.desktop -t $out/share/applications
     substituteInPlace $out/share/applications/activate-linux.desktop \
-      --replace 'Icon=icon' 'Icon=activate-linux'
+      --replace-fail 'Icon=icon' 'Icon=activate-linux'
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/ac/actkbd/package.nix b/pkgs/by-name/ac/actkbd/package.nix
index 2916d4dc93f3..6c92b5282a5c 100644
--- a/pkgs/by-name/ac/actkbd/package.nix
+++ b/pkgs/by-name/ac/actkbd/package.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   preConfigure = ''
     substituteInPlace Makefile \
-      --replace /usr/local $out \
-      --replace /etc $out/etc
+      --replace-fail /usr/local $out \
+      --replace-fail /etc $out/etc
   '';
 
   postInstall = ''
diff --git a/pkgs/by-name/ac/actool/package.nix b/pkgs/by-name/ac/actool/package.nix
index f611e06428b6..d9812655e1cd 100644
--- a/pkgs/by-name/ac/actool/package.nix
+++ b/pkgs/by-name/ac/actool/package.nix
@@ -1,30 +1,21 @@
 {
   lib,
   fetchFromGitHub,
-  python3Packages,
+  rustPlatform,
   icu,
 }:
-python3Packages.buildPythonApplication (finalAttrs: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "actool";
-  version = "1.6.0";
-  pyproject = true;
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "viraptor";
     repo = "actool";
     tag = finalAttrs.version;
-    hash = "sha256-OJJwEZEz+nNq3W1SDXt76Vx9qvEFUUL4dyem/oc2RA4=";
+    hash = "sha256-TRxA9c6q66Gso/ziqvly8IJR2AEHMc197gC9cUSuwAw=";
   };
 
-  build-system = with python3Packages; [
-    setuptools
-  ];
-
-  dependencies = with python3Packages; [
-    pillow
-    liblzfse
-    icu
-  ];
+  cargoHash = "sha256-BhR5gwIrFE0OuSAxVTY5kMfmMlPfIABfOgmX/rOvpug=";
 
   meta = {
     description = "Apple's actool reimplementation";
diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix
index eb822f2214aa..11a35fdd5227 100644
--- a/pkgs/by-name/ac/actual-server/package.nix
+++ b/pkgs/by-name/ac/actual-server/package.nix
@@ -57,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
     NODE_JQ_SKIP_INSTALL_BINARY = "true";
     SHARP_IGNORE_GLOBAL_LIBVIPS = "1";
   };
+  # during build, vite tries to access localhost
+  __darwinAllowLocalNetworking = true;
 
   postPatch = ''
     ln -sv ../../../${translations.name} ./packages/desktop-client/locale
diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix
index a83f2e28e26a..6da0013935f9 100644
--- a/pkgs/by-name/ad/ad-miner/package.nix
+++ b/pkgs/by-name/ad/ad-miner/package.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "Mazars-Tech";
+    owner = "AD-Security";
     repo = "AD_Miner";
     tag = "v${finalAttrs.version}";
     hash = "sha256-iI7jiENPYCIVJnIG/M4ft4dkR2Ja21gzR+ISeyZvUEo=";
@@ -35,8 +35,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   meta = {
     description = "Active Directory audit tool that leverages cypher queries to crunch data from Bloodhound";
-    homepage = "https://github.com/Mazars-Tech/AD_Miner";
-    changelog = "https://github.com/Mazars-Tech/AD_Miner/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    homepage = "https://github.com/AD-Security/AD_Miner";
+    changelog = "https://github.com/AD-Security/AD_Miner/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "AD-miner";
diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix
index 024b422e81f6..79878f5a553b 100644
--- a/pkgs/by-name/ad/ada/package.nix
+++ b/pkgs/by-name/ad/ada/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ada";
-  version = "3.4.3";
+  version = "3.4.4";
 
   src = fetchFromGitHub {
     owner = "ada-url";
     repo = "ada";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CSFo5aXxN1jhmD9SUh8XysObEyOvm53XPzbwJyCE0WE=";
+    hash = "sha256-kfUbsqQ+CsqnySKgeL1GFJLcDe1Irivp4CoZG93BZYg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ad/adbfs-rootless/package.nix b/pkgs/by-name/ad/adbfs-rootless/package.nix
index c899d5dbe569..dfd5429d72c4 100644
--- a/pkgs/by-name/ad/adbfs-rootless/package.nix
+++ b/pkgs/by-name/ad/adbfs-rootless/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     # very ugly way of replacing the adb calls
     substituteInPlace adbfs.cpp \
-      --replace '"adb ' '"${android-tools}/bin/adb '
+      --replace-fail '"adb ' '"${android-tools}/bin/adb '
   '';
 
   installPhase = ''
diff --git a/pkgs/by-name/ad/adcskiller/package.nix b/pkgs/by-name/ad/adcskiller/package.nix
index 7e3a98567bb2..f7fc354e5cb5 100644
--- a/pkgs/by-name/ad/adcskiller/package.nix
+++ b/pkgs/by-name/ad/adcskiller/package.nix
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication {
 
     install -vD $pname.py $out/bin/$pname
 
-    substituteInPlace $out/bin/$pname --replace '"Coercer"' '"coercer"'
+    substituteInPlace $out/bin/$pname --replace-fail '"Coercer"' '"coercer"'
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/ad/addwater/package.nix b/pkgs/by-name/ad/addwater/package.nix
index c62e8f80c977..34a4a8b68c09 100644
--- a/pkgs/by-name/ad/addwater/package.nix
+++ b/pkgs/by-name/ad/addwater/package.nix
@@ -15,7 +15,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "addwater";
-  version = "1.2.9.1";
+  version = "1.3";
   # built with meson, not a python format
   pyproject = false;
 
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "largestgithubuseronearth";
     repo = "addwater";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MzazCEYJJNKLeQza9dxWCPBjBG8t2kW6UjttTZvUK1E=";
+    hash = "sha256-ynfBP3yFw4g8ebnKKyQDdmCB7APYVgvuedcu/x5lO9w=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/ad/adguardhome/package.nix b/pkgs/by-name/ad/adguardhome/package.nix
index 858e17b6f7ec..dd3a819e9880 100644
--- a/pkgs/by-name/ad/adguardhome/package.nix
+++ b/pkgs/by-name/ad/adguardhome/package.nix
@@ -9,15 +9,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "adguardhome";
-  version = "0.107.73";
+  version = "0.107.74";
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = "AdGuardHome";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WsZDwbcF0epmsz/lP2QMcf8CnvCCoc+Z2LQaecB01WU=";
+    hash = "sha256-cAuthACY/rBVRTSv/UIarhScm+EoTUhnkQ0RUtvhAFg=";
   };
 
-  vendorHash = "sha256-od20SYVMiLmfOpstuKdc99bA3HWcAaXwcLS0tiGlWog=";
+  vendorHash = "sha256-o4hpiqQEt8gkYFeAkxPDisvLWbi7WOBZ7xMXrPt6Cdo=";
 
   dashboard = buildNpmPackage {
     inherit (finalAttrs) src version;
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
     postPatch = ''
       cd client
     '';
-    npmDepsHash = "sha256-HPWe8ZZKtToUk5CCLeEwwBBK8hEYMjgGQz3hIfFkZz4=";
+    npmDepsHash = "sha256-SOHmXvGLpjs8h0X+AJ6/jAYpxzoizhwRjIzx4SqJOCo=";
     npmBuildScript = "build-prod";
     postBuild = ''
       mkdir -p $out/build/
@@ -45,7 +45,7 @@ buildGoModule (finalAttrs: {
 
   passthru = {
     updateScript = ./update.sh;
-    schema_version = 33;
+    schema_version = 34;
     tests.adguardhome = nixosTests.adguardhome;
     tests.version = testers.testVersion {
       package = finalAttrs.finalPackage;
diff --git a/pkgs/by-name/ad/adreaper/package.nix b/pkgs/by-name/ad/adreaper/package.nix
index 796de3c530e4..806fd1a78eda 100644
--- a/pkgs/by-name/ad/adreaper/package.nix
+++ b/pkgs/by-name/ad/adreaper/package.nix
@@ -10,7 +10,7 @@ buildGoModule (finalAttrs: {
   version = "1.1";
 
   src = fetchFromGitHub {
-    owner = "AidenPearce369";
+    owner = "m0n1x90";
     repo = "ADReaper";
     rev = "ADReaperv${finalAttrs.version}";
     sha256 = "sha256-+FCb5TV9MUcRyex2M4rn2RhcIsXQFbtm1T4r7MpcRQs=";
@@ -24,8 +24,8 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Enumeration tool for Windows Active Directories";
-    homepage = "https://github.com/AidenPearce369/ADReaper";
-    changelog = "https://github.com/AidenPearce369/ADReaper/releases/tag/ADReaperv${finalAttrs.version}";
+    homepage = "https://github.com/m0n1x90/ADReaper";
+    changelog = "https://github.com/m0n1x90/ADReaper/releases/tag/ADReaperv${finalAttrs.version}";
     # Upstream doesn't have a license yet
     # https://github.com/AidenPearce369/ADReaper/issues/2
     license = with lib.licenses; [ unfree ];
diff --git a/pkgs/by-name/ad/adwaita-qt/package.nix b/pkgs/by-name/ad/adwaita-qt/package.nix
index 7f2ea1b256f1..050e25173927 100644
--- a/pkgs/by-name/ad/adwaita-qt/package.nix
+++ b/pkgs/by-name/ad/adwaita-qt/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     # Fix plugin dir
     substituteInPlace src/style/CMakeLists.txt \
-       --replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles"
+       --replace-fail "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles"
   '';
 
   passthru = {
diff --git a/pkgs/by-name/ae/aeolus/package.nix b/pkgs/by-name/ae/aeolus/package.nix
index 6242734f9045..5ecb4643828c 100644
--- a/pkgs/by-name/ae/aeolus/package.nix
+++ b/pkgs/by-name/ae/aeolus/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     sed -i source/Makefile -e /ldconfig/d
-    substituteInPlace source/main.cc --replace /etc/ "$out/etc/"
+    substituteInPlace source/main.cc --replace-fail /etc/ "$out/etc/"
   '';
 
   preBuild = "cd source";
diff --git a/pkgs/by-name/ae/aescrypt/package.nix b/pkgs/by-name/ae/aescrypt/package.nix
index eb62d9061d88..346518e34a1c 100644
--- a/pkgs/by-name/ae/aescrypt/package.nix
+++ b/pkgs/by-name/ae/aescrypt/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   preBuild = ''
-    substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc"
+    substituteInPlace src/Makefile --replace-fail "CC=gcc" "CC?=gcc"
     cd src
   '';
 
diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix
index 22e30b1905a7..4fc264ec020e 100644
--- a/pkgs/by-name/af/afterstep/package.nix
+++ b/pkgs/by-name/af/afterstep/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Causes fatal ldconfig cache generation attempt on non-NixOS Linux
     for mkfile in autoconf/Makefile.common.lib.in libAfter{Base,Image}/Makefile.in; do
       substituteInPlace $mkfile \
-        --replace 'test -w /etc' 'false'
+        --replace-fail 'test -w /etc' 'false'
     done
   '';
 
@@ -72,20 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  # A strange type of bug: dbus is not immediately found by pkg-config
   preConfigure = ''
-    # binutils 2.37 fix
-    # https://github.com/afterstep/afterstep/issues/2
-    fixupList=(
-      "autoconf/Makefile.defines.in"
-      "libAfterImage/aftershow/Makefile.in"
-      "libAfterImage/apps/Makefile.in"
-      "libAfterBase/Makefile.in"
-      "libAfterImage/Makefile.in"
-    )
-    for toFix in "''${fixupList[@]}"; do
-      substituteInPlace "$toFix" --replace "clq" "cq"
-    done
+    # A strange type of bug: dbus is not immediately found by pkg-config
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)"
   '';
 
diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix
index f0fe4b3569db..21966f3f5860 100644
--- a/pkgs/by-name/ag/agate/package.nix
+++ b/pkgs/by-name/ag/agate/package.nix
@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "agate";
-  version = "3.3.21";
+  version = "3.3.22";
 
   __darwinAllowLocalNetworking = true;
 
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "mbrubeck";
     repo = "agate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eOeLbc7jlJ4OHY+Gce7JR4VaBsP+pBG3uiB7wsgtSyk=";
+    hash = "sha256-TDBCIioVeuQz4Dj7Pf5VG+tLLokGjhgv5e6z1spr3vk=";
   };
 
-  cargoHash = "sha256-fDgsoI/SkDzHcQHQYJNguy7el7vLqpt5r05YoBR7FzY=";
+  cargoHash = "sha256-dNbtNQlbUZuZNcyydkRtzC0/Md1HrM3SDbA33exafiI=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/ag/agg/package.nix b/pkgs/by-name/ag/agg/package.nix
index 698b2ff62037..0af697f604ce 100644
--- a/pkgs/by-name/ag/agg/package.nix
+++ b/pkgs/by-name/ag/agg/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace include/agg_renderer_outline_aa.h \
-      --replace 'line_profile_aa& profile() {' 'const line_profile_aa& profile() {'
+      --replace-fail 'line_profile_aa& profile() {' 'const line_profile_aa& profile() {'
   '';
 
   # fix build with new automake, from Gentoo ebuild
diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix
index 4384666fb541..a769e9f1b9fb 100644
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  python312Packages,
+  python3Packages,
   fetchFromGitHub,
   fetchpatch,
   replaceVars,
@@ -12,9 +12,6 @@
 }:
 
 let
-  # dont support python 3.13 (Aider-AI/aider#3037)
-  python3Packages = python312Packages;
-
   aider-nltk-data = python3Packages.nltk.dataDir (d: [
     d.punkt-tab
     d.stopwords
diff --git a/pkgs/by-name/ai/airspy/package.nix b/pkgs/by-name/ai/airspy/package.nix
index ac8f3f5acabd..6b62f2edbb43 100644
--- a/pkgs/by-name/ai/airspy/package.nix
+++ b/pkgs/by-name/ai/airspy/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d"
+    substituteInPlace airspy-tools/CMakeLists.txt --replace-fail "/etc/udev/rules.d" "$out/etc/udev/rules.d"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index 57162aaa2c9a..ef93fabb59c4 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2026-04-11";
+  version = "0-unstable-2026-04-24";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "7f9131b826e12b2dabe8a06c7cc4b002b9952be1";
-    hash = "sha256-Rt4Q/fxh181bPFAhD3WgEVbq0ClQfhGjJoHa99lgguw=";
+    rev = "38f93aaaa74c0319b47ec4b9fc7f311fad86c86d";
+    hash = "sha256-GxFhcMuJ2et+AFHtEdbwr8+sFRBy6/in5yXqxgd+wJw=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables
diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix
index 5052af423744..b0f1b02f0247 100644
--- a/pkgs/by-name/ak/aks-mcp-server/package.nix
+++ b/pkgs/by-name/ak/aks-mcp-server/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aks-mcp-server";
-  version = "0.0.14";
+  version = "0.0.17";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "aks-mcp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-di5T7GKMLl42+GyRCyMStbT1XfDTAbH9zK+4qO0Bf7I=";
+    hash = "sha256-3G7IDHDY3HfjGYM8aKK4Egey1/urDVeWv99PJcCaiSo=";
   };
 
-  vendorHash = "sha256-d27ffScJukUyBd6C8VgEUqK5rHKxQv7vEvt1zsRjhKE=";
+  vendorHash = "sha256-aMs7vABZwRPPIaP6BdTau1oFfGqnzYt8wxUk2mQSVlE=";
 
   subPackages = [ "cmd/aks-mcp" ];
 
diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 5a4183634801..ef3baea985b9 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -176,6 +176,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       if !withGraphics then
         "https://github.com/alacritty/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md"
       else
-        "https://github.com/ayosec/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md";
+        "https://github.com/ayosec/alacritty/blob/v${finalAttrs.version}-graphics/CHANGELOG.md";
   };
 })
diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix
index 548ce892bcca..6d41225a7fde 100644
--- a/pkgs/by-name/al/aldente/package.nix
+++ b/pkgs/by-name/al/aldente/package.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "macOS tool to limit maximum charging percentage";
     homepage = "https://apphousekitchen.com";
-    changelog = "https://github.com/davidwernhart/aldente-charge-limiter/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/AppHouseKitchen/AlDente-Battery_Care_and_Monitoring/releases/tag/${finalAttrs.version}";
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ stepbrobd ];
diff --git a/pkgs/by-name/al/alegreya-sans/package.nix b/pkgs/by-name/al/alegreya-sans/package.nix
index c44919858224..db936895d056 100644
--- a/pkgs/by-name/al/alegreya-sans/package.nix
+++ b/pkgs/by-name/al/alegreya-sans/package.nix
@@ -1,13 +1,19 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchFromGitHub,
+  installFonts,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alegreya-sans";
   version = "2.008";
 
+  outputs = [
+    "out"
+    "webfont"
+  ];
+
   src = fetchFromGitHub {
     owner = "huertatipografica";
     repo = "Alegreya-Sans";
@@ -15,12 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "0xz5lq9fh0pj02ifazhddzh792qkxkz1z6ylj26d93wshc90jl5g";
   };
 
-  installPhase = ''
-    install -D -m 444 fonts/otf/* -t $out/share/fonts/otf
-    install -D -m 444 fonts/ttf/* -t $out/share/fonts/ttf
-    install -D -m 444 fonts/webfonts/*.woff -t $out/share/fonts/woff
-    install -D -m 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Humanist sans serif family with a calligraphic feeling";
diff --git a/pkgs/by-name/al/algolia-cli/package.nix b/pkgs/by-name/al/algolia-cli/package.nix
index 0b456a677d6f..0b035d211170 100644
--- a/pkgs/by-name/al/algolia-cli/package.nix
+++ b/pkgs/by-name/al/algolia-cli/package.nix
@@ -6,7 +6,7 @@
   installShellFiles,
 }:
 let
-  version = "1.7.3";
+  version = "1.8.2";
 in
 buildGoModule {
   pname = "algolia-cli";
@@ -16,10 +16,10 @@ buildGoModule {
     owner = "algolia";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-m7PAD9EKrl7eBzRwCHDcH+eBcFnfXIDnIm6wvOtay5g=";
+    hash = "sha256-i1x6/Ksiz8t8ho1SmcrypzQjERQ0e0Xxvnd5uIlQRoE=";
   };
 
-  vendorHash = "sha256-I6awzstThs0nC/Nyy00jCN3cpF1MXJcFTUM95E38HQI=";
+  vendorHash = "sha256-WdNuwUz64IZq3gfvFhXX536/tZ/67Ki0xiqIj7sLSEM=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix
index 7905a26f7384..cef4597e0a37 100644
--- a/pkgs/by-name/al/aligator/package.nix
+++ b/pkgs/by-name/al/aligator/package.nix
@@ -27,15 +27,29 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "aligator";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "Simple-Robotics";
     repo = "aligator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qdXZo7IvgcUFEJARwxpSaHJVRlZ6HdgRADPOiY3oCpk=";
+    hash = "sha256-8DO+lfM4mk4bA/IOEJlLaOp9snCUBHiw7RRcYEwJC7c=";
   };
 
+  # aligator 0.19.0 expect gbenchmark 1.9.5, which is not merged yet:
+  # https://github.com/NixOS/nixpkgs/pull/506375
+  postPatch = ''
+    substituteInPlace \
+        bench/lqr.cpp \
+        bench/se2-car.cpp \
+        bench/talos-walk.cpp \
+        bench/croc-talos-arm.cpp \
+        bench/gar-riccati.cpp \
+      --replace-fail \
+        "benchmark::Benchmark" \
+        "benchmark::internal::Benchmark"
+  '';
+
   outputs = [
     "doc"
     "out"
diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix
index 69011adfadfe..973628dabf07 100644
--- a/pkgs/by-name/al/alist/package.nix
+++ b/pkgs/by-name/al/alist/package.nix
@@ -103,8 +103,8 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "File list/WebDAV program that supports multiple storages";
-    homepage = "https://github.com/alist-org/alist";
-    changelog = "https://github.com/alist-org/alist/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/AlistGo/alist";
+    changelog = "https://github.com/AlistGo/alist/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       agpl3Only
       # alist-web
diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix
index a40ee4ae233b..609ae97d936d 100644
--- a/pkgs/by-name/al/alistral/package.nix
+++ b/pkgs/by-name/al/alistral/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alistral";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "RustyNova016";
     repo = "Alistral";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-b6htcjBdh4E9cCUw4ETl3AnmMO3yT6654PLKIGPOPlo=";
+    hash = "sha256-XsN4UyIXkd0YVtO/q9EcFP/sBYkH9leISmbJZ93ef6E=";
   };
 
-  cargoHash = "sha256-Udbf0h8XZ8uD7MLTNRKaIJ8AdTvzq1dDQKPXWXunR/w=";
+  cargoHash = "sha256-KFNFioZ/5moC5FNXw+hA+NrPjsqu+3V8A5mtZ4FZUHw=";
 
   buildNoDefaultFeatures = true;
   # Would be cleaner with an "--all-features" option
diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index 42dbd533885a..50564e8cf69e 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "aliyun-cli";
-  version = "3.3.8";
+  version = "3.3.11";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5RFGpfeW3nLubN920hrBVyEdJEPa/V3Dz2YdxCh9YLU=";
+    hash = "sha256-jksC63DFSbZcBjQvV7BBMSMbPMeSqUQMWN9HcIcFZSU=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/al/aliyunpan/package.nix b/pkgs/by-name/al/aliyunpan/package.nix
index bd86f235db20..19db0849ad03 100644
--- a/pkgs/by-name/al/aliyunpan/package.nix
+++ b/pkgs/by-name/al/aliyunpan/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aliyunpan";
-  version = "0.3.8";
+  version = "0.3.9";
 
   src = fetchFromGitHub {
     owner = "tickstep";
     repo = "aliyunpan";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6aukI4woQvNI8zcstF92VL7M70GKAiwj9viaTX3iJ2o=";
+    hash = "sha256-inkden/ZiIxJVZLhM6OVTV4qbesEPJbX2sn4LNZF+FE=";
   };
 
-  vendorHash = "sha256-or1C88KE0RkXL08ZjaXELqKlNP3PoY31ib4PWDdDmNA=";
+  vendorHash = "sha256-PKx40HqXm1nyqjNBSJdW5ucRAkMj9w3fbQYjAGALM1k=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index 3d89c261f569..f721b04fc9a5 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2421";
+  version = "2.0.2429";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-1ES2T8PjajmXtNM2xIxM795ub5OKQ0WRa1XH9te+8+0=";
+    hash = "sha256-ut3YoTGpHEoSIafkimU31Mt45Q14oiTGWXQQfsxia9s=";
   };
 
-  npmDepsHash = "sha256-cYCNNc9+jM6sVBc15OlNaTo0BZ7XudI5c1SODrXD548=";
+  npmDepsHash = "sha256-pxei6HxmUyMajVG+thFp3pOTWqBC6yL/nOvp6c8DXp0=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/al/allmark/package.nix b/pkgs/by-name/al/allmark/package.nix
index c764d95b66f5..4e0ff845e8dc 100644
--- a/pkgs/by-name/al/allmark/package.nix
+++ b/pkgs/by-name/al/allmark/package.nix
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Cross-platform markdown web server";
     homepage = "https://github.com/andreaskoch/allmark";
-    changelog = "https://github.com/andreaskoch/allmark/-/releases/v${finalAttrs.version}";
+    changelog = "https://github.com/andreaskoch/allmark/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       luftmensch-luftmensch
diff --git a/pkgs/by-name/am/amazon-ssm-agent/0001-makefile-don-t-use-tool-to-generate-version-file.patch b/pkgs/by-name/am/amazon-ssm-agent/0001-makefile-don-t-use-tool-to-generate-version-file.patch
new file mode 100644
index 000000000000..8f6b3befd7fb
--- /dev/null
+++ b/pkgs/by-name/am/amazon-ssm-agent/0001-makefile-don-t-use-tool-to-generate-version-file.patch
@@ -0,0 +1,35 @@
+From be3aca2216ecb4aab6d1e3c5e11ed621fd75691a Mon Sep 17 00:00:00 2001
+From: Winter M <winter@antithesis.com>
+Date: Wed, 8 Apr 2026 17:34:43 -0400
+Subject: [PATCH] makefile: don't use tool to generate version file
+
+---
+ makefile | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/makefile b/makefile
+index fa3e0943..d3bc479e 100644
+--- a/makefile
++++ b/makefile
+@@ -118,10 +118,7 @@ pre-build:
+ 	$(COPY) $(GO_SPACE)/seelog_windows.xml.template $(GO_SPACE)/bin/
+ 	$(COPY) $(GO_SPACE)/agent/integration-cli/integration-cli.json $(GO_SPACE)/bin/
+ 
+-	@echo "Regenerate version file during pre-release"
+-# Remove overrides for GOARCH and GOOS when invoking 'go run', since we want the local host's settings
+-	GOARCH= GOOS= go run $(GO_SPACE)/agent/version/versiongenerator/version-gen.go
+-	$(COPY) $(GO_SPACE)/VERSION $(GO_SPACE)/bin/
++	echo -e 'package version\nconst Version = "@VERSION@"' > $(GO_SPACE)/agent/version/version.go
+ 
+ # General build recipe. Defaults to generating a linux/amd64 non-PIE build, but can be overriden
+ # by setting appropriate variables.
+@@ -493,4 +490,4 @@ argot-check:
+ 	$(GO_SPACE)/Tools/src/run_argot.sh
+ 
+ argot-update:
+-	$(GO_SPACE)/Tools/src/run_argot.sh "true"
+\ No newline at end of file
++	$(GO_SPACE)/Tools/src/run_argot.sh "true"
+-- 
+2.53.0
+
diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix
index 3520e90d7610..2f0306c72c98 100644
--- a/pkgs/by-name/am/amazon-ssm-agent/package.nix
+++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix
@@ -5,6 +5,7 @@
   makeWrapper,
   darwin,
   fetchFromGitHub,
+  substitute,
   coreutils,
   unixtools,
   util-linux,
@@ -60,6 +61,18 @@ buildGoModule (finalAttrs: {
     # They used constants from another package that I couldn't figure
     # out how to resolve, so hardcoded the constants.
     ./0002-version-gen-don-t-use-unnecessary-constants.patch
+
+    # They run a tool on the build platform in a way that isn't quite
+    # compatible with cross (`go run`). Simplest thing is to just make
+    # the file with a hardcoded value, as we already have it from attrs.
+    (substitute {
+      src = ./0001-makefile-don-t-use-tool-to-generate-version-file.patch;
+      substitutions = [
+        "--subst-var-by"
+        "VERSION"
+        finalAttrs.version
+      ];
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix
index e33216d67a70..2bc7b78f269f 100644
--- a/pkgs/by-name/am/amdgpu_top/package.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amdgpu_top";
-  version = "0.11.3";
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "Umio-Yasuno";
     repo = "amdgpu_top";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-k+/y8YaEP8DJuW8n/Xq/Ea9DWG79Cux+PgZbSP4m3pQ=";
+    hash = "sha256-ap1X53Ou/eWhHvXOnHY7zGb6i+ZLs8LeSNpOJWm+IKc=";
   };
 
-  cargoHash = "sha256-+eMItSemE69UGfGF9CeKyEvUxvhiZjkJJPeZoVfa+dk=";
+  cargoHash = "sha256-b9OO//9M/LyS4ZMQzppvLHJHL3JyPVoSOIPVlrX1Wes=";
 
   buildInputs = [
     libdrm
diff --git a/pkgs/by-name/am/ameba-ls/package.nix b/pkgs/by-name/am/ameba-ls/package.nix
index 80abfec72dfe..dffc19c77281 100644
--- a/pkgs/by-name/am/ameba-ls/package.nix
+++ b/pkgs/by-name/am/ameba-ls/package.nix
@@ -14,7 +14,7 @@ crystal.buildCrystalPackage rec {
   version = "0.1.0";
 
   src = fetchFromGitHub {
-    owner = "crystal-lang-tools";
+    owner = "crystal-ameba";
     repo = "ameba-ls";
     tag = "v${version}";
     hash = "sha256-TEHjR+34wrq24XJNLhWZCEzcDEMDlmUHv0iiF4Z6JlI=";
@@ -47,8 +47,8 @@ crystal.buildCrystalPackage rec {
 
   meta = {
     description = "Crystal language server powered by Ameba linter";
-    homepage = "https://github.com/crystal-lang-tools/ameba-ls";
-    changelog = "https://github.com/crystal-lang-tools/ameba-ls/blob/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/crystal-ameba/ameba-ls";
+    changelog = "https://github.com/crystal-ameba/ameba-ls/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix
index 9b9c99778e3c..6733bff81d39 100644
--- a/pkgs/by-name/am/amfora/package.nix
+++ b/pkgs/by-name/am/amfora/package.nix
@@ -10,7 +10,7 @@ buildGoModule (finalAttrs: {
   version = "1.11.0";
 
   src = fetchFromGitHub {
-    owner = "makeworld-the-better-one";
+    owner = "makew0rld";
     repo = "amfora";
     tag = "v${finalAttrs.version}";
     hash = "sha256-6nY/wVqhSm+ZLA8ktrgmxoYiHK1r96aNbSf8+1YMXf8=";
@@ -26,9 +26,9 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Fancy terminal browser for the Gemini protocol";
     mainProgram = "amfora";
-    homepage = "https://github.com/makeworld-the-better-one/amfora";
+    homepage = "https://github.com/makew0rld/amfora";
     license = with lib.licenses; [ gpl3 ];
     maintainers = with lib.maintainers; [ deifactor ];
-    changelog = "https://github.com/makeworld-the-better-one/amfora/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/makew0rld/amfora/blob/v${finalAttrs.version}/CHANGELOG.md";
   };
 })
diff --git a/pkgs/by-name/am/amiberry/package.nix b/pkgs/by-name/am/amiberry/package.nix
index ee3325d581f1..b3ba6478741d 100644
--- a/pkgs/by-name/am/amiberry/package.nix
+++ b/pkgs/by-name/am/amiberry/package.nix
@@ -2,112 +2,57 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
-  copyDesktopItems,
-  makeWrapper,
+  curl,
+  enet,
   flac,
+  libGL,
   libmpeg2,
   libmpg123,
+  libpcap,
   libpng,
   libserialport,
+  nlohmann_json,
   portmidi,
-  SDL2,
-  SDL2_image,
-  SDL2_ttf,
-  makeDesktopItem,
+  sdl3,
+  sdl3-image,
+  zstd,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "amiberry";
-  version = "5.7.4";
+  version = "8.1.5";
 
   src = fetchFromGitHub {
     owner = "BlitterStudio";
     repo = "amiberry";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EOoVJYefX2pQ2Zz9bLD1RS47u/+7ZWTMwZYha0juF64=";
+    hash = "sha256-udSMQxpELpk3Shu3+weHA9S0i/WMdVnrOuLGZ0whEEI=";
   };
 
-  patches = [
-    # cmake-4 support
-    (fetchpatch {
-      name = "cmake-4.patch";
-      url = "https://github.com/BlitterStudio/amiberry/commit/dbd85a37147603875b9ca51a9409c65a26c0d60a.patch?full_index=1";
-      hash = "sha256-w8Z9yhNafbXWv3nV8GDNpks2R1+M12uG1mWWrwVaEUk=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
-    copyDesktopItems
-    makeWrapper
   ];
 
   buildInputs = [
+    curl
+    enet
     flac
+    libGL
     libmpeg2
     libmpg123
+    libpcap
     libpng
     libserialport
+    nlohmann_json
     portmidi
-    SDL2
-    SDL2_image
-    SDL2_ttf
+    sdl3
+    sdl3-image
+    zstd
   ];
 
   enableParallelBuilding = true;
 
-  # Amiberry has traditionally behaved as a "Portable" app, meaning that it was designed to expect everything
-  # under the same directory. This is not compatible with Nix package conventions.
-  # The Amiberry behavior has changed since versions 5.7.4 and 6.3.4 (see
-  # https://github.com/BlitterStudio/amiberry/wiki/FAQ#q-where-does-amiberry-look-for-its-files-can-i-change-that
-  # for more information), however this is still not compatible with Nix packaging. The AMIBERRY_DATA_DIR can go
-  # in the nix store but the Amiberry configuration files must be stored in a user writable location.
-  # Fortunately Amiberry provides environment variables for specifying these locations which we can supply with the
-  # wrapper script below.
-  # One more caveat: Amiberry expects the configuration files path (AMIBERRY_HOME_DIR) to exist, otherwise it will
-  # fall back to behaving like a "Portable" app. The wrapper below ensures that the AMIBERRY_HOME_DIR path exists,
-  # preventing that fallback.
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/bin
-    cp amiberry $out/bin/
-    cp -r abr data $out/
-    install -Dm444 data/amiberry.png $out/share/icons/hicolor/256x256/apps/amiberry.png
-    wrapProgram $out/bin/amiberry \
-      --set-default AMIBERRY_DATA_DIR $out \
-      --run 'AMIBERRY_HOME_DIR="$HOME/.amiberry"' \
-      --run 'mkdir -p \
-        $AMIBERRY_HOME_DIR/kickstarts \
-        $AMIBERRY_HOME_DIR/conf \
-        $AMIBERRY_HOME_DIR/nvram \
-        $AMIBERRY_HOME_DIR/plugins \
-        $AMIBERRY_HOME_DIR/screenshots \
-        $AMIBERRY_HOME_DIR/savestates \
-        $AMIBERRY_HOME_DIR/controllers \
-        $AMIBERRY_HOME_DIR/whdboot \
-        $AMIBERRY_HOME_DIR/lha \
-        $AMIBERRY_HOME_DIR/floppies \
-        $AMIBERRY_HOME_DIR/cdroms \
-        $AMIBERRY_HOME_DIR/harddrives'
-    runHook postInstall
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "amiberry";
-      desktopName = "Amiberry";
-      exec = "amiberry";
-      comment = "Amiga emulator";
-      icon = "amiberry";
-      categories = [
-        "System"
-        "Emulator"
-      ];
-    })
-  ];
-
   meta = {
     homepage = "https://github.com/BlitterStudio/amiberry";
     description = "Optimized Amiga emulator for Linux/macOS";
diff --git a/pkgs/by-name/am/amneziawg-go/package.nix b/pkgs/by-name/am/amneziawg-go/package.nix
index 584b70cf0539..5f43cbce15f2 100644
--- a/pkgs/by-name/am/amneziawg-go/package.nix
+++ b/pkgs/by-name/am/amneziawg-go/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "amneziawg-go";
-  version = "0.2.16";
+  version = "0.2.17";
 
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amneziawg-go";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JGmWMPVgereSZmdHUHC7ZqWCwUNfxfj3xBf/XDDHhpo=";
+    hash = "sha256-3I0rtTgW4rVjdSLEjdpv0+7k9imSAF56d5ZksJBxRLs=";
   };
 
   postPatch = ''
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     rm -f format_test.go
   '';
 
-  vendorHash = "sha256-ZO8sLOaEY3bii9RSxzXDTCcwlsQEYmZDI+X1WPXbE9c=";
+  vendorHash = "sha256-oqnDK3H+ssgAc1F85OS/qfJRE+LCnfxDy3v7bf4RxUQ=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json
index b6d4d9a07fbf..42a9d633e30e 100644
--- a/pkgs/by-name/am/amp-cli/package-lock.json
+++ b/pkgs/by-name/am/amp-cli/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@sourcegraph/amp": "^0.0.1776125492-g5cb0c2"
+        "@sourcegraph/amp": "^0.0.1777624460-g8bb2f0"
       }
     },
     "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
       }
     },
     "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1776125492-g5cb0c2",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1776125492-g5cb0c2.tgz",
-      "integrity": "sha512-LdicFMcgJLNrKAF5diTbOLykdb7znsFohcyGiZInpHl6xGyRyJdyqdeh7VdRSfP4vR5EQGIsi7+i1nQOs6ViDQ==",
+      "version": "0.0.1777624460-g8bb2f0",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1777624460-g8bb2f0.tgz",
+      "integrity": "sha512-LGr3VAfyW5W7eJNPa545KvCL11qsac0FFzu67rPrqCR2Xh7v0mP1N7S9TLHKDG74NoqmB3xdhX7o0lIk2ZoGkg==",
       "license": "Amp Commercial License",
       "dependencies": {
         "@napi-rs/keyring": "1.1.10"
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 3a8534528775..f507ceeacf83 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -9,11 +9,11 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "amp-cli";
-  version = "0.0.1776125492-g5cb0c2";
+  version = "0.0.1777624460-g8bb2f0";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-EXS32qGU+/SD5MqjXO10GRH0w8EvvP9OqCCfEQfV8Kg=";
+    hash = "sha256-HUoRVq++AsIbQxJHkI4oyPyBbFcji6BvWdWxrqdUQQ0=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x bin/amp-wrapper.js
   '';
 
-  npmDepsHash = "sha256-YT92XzPl1fnJ2a7XdjAe1+01gTeWWJ20Ca5uiLVL+Q4=";
+  npmDepsHash = "sha256-Lnnutg8LDp9UMuJ+TuoRABK7lcQNizZDltr1cMFpYEc=";
 
   propagatedBuildInputs = [
     ripgrep
diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix
index 6f38f3577a6d..1ce7a6228d1b 100644
--- a/pkgs/by-name/an/ananicy-cpp/package.nix
+++ b/pkgs/by-name/an/ananicy-cpp/package.nix
@@ -2,7 +2,6 @@
   lib,
   clangStdenv,
   fetchFromGitLab,
-  fetchpatch,
   cmake,
   pkg-config,
   spdlog,
@@ -18,42 +17,18 @@
 
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "ananicy-cpp";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitLab {
     owner = "ananicy-cpp";
     repo = "ananicy-cpp";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
+    hash = "sha256-Nl7Ugj5VPHwW85GJ44luUc2e95kFCanQhDRopGH9nTU=";
   };
 
   patches = [
     ./match-wrappers.patch
-
-    # FIXME: remove these when updating to next stable release
-    (fetchpatch {
-      name = "allow-regex-pattern-matching.patch";
-      url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/6ea2dccceec39b6c4913f617dad81d859aa20f24.patch";
-      hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs=";
-    })
-    (fetchpatch {
-      name = "use-a-reliable-path-for-mounts-file.patch";
-      url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/de6f11978db98bfd13a1e87dcdab61dbe6496710.patch";
-      hash = "sha256-9bJlFCClddlAEknfqp7Gcij7NX6tqohE2wqoalLoN5I=";
-    })
-    # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/merge_requests/30
-    (fetchpatch {
-      name = "fix-build-with-clang-19.patch";
-      url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/b2589a9b1faa2ecf54aeede40ea781c33bfb09a8.patch";
-      hash = "sha256-nfyCdhvnWj446z5aPFCXGi79Xgja8W0Eopl6I30fOBM=";
-    })
-
-    # fix build w/ glibc-2.42 (don't conflict with sched_* API from glibc 2.41)
-    (fetchpatch {
-      url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/99e64815bacaf3baa28ad89d022e33ebede94fa9.patch";
-      hash = "sha256-V9yf0nUa91DXRufDYhufybQUTP6R1CUzF51SEBMdjmA=";
-    })
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 1841b1b671ba..778010390840 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2026-04-15";
+  version = "0-unstable-2026-04-23";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "59de158ecc602270a86e58b89663d141dd688d87";
-    hash = "sha256-TwO2pINGLsrYMeUJthj+hPcej+MfFB1zjq+89/QMS+I=";
+    rev = "dcae8ac6b1213f82015135a09780c07ac54ff378";
+    hash = "sha256-rkNczo6MxmLWpSnC1SGza21Gwns1FV/ZxXBTRBZ3xM4=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix
index 5cba74ce55f1..9c1adcec8569 100644
--- a/pkgs/by-name/an/anchor/package.nix
+++ b/pkgs/by-name/an/anchor/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "anchor";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "solana-foundation";
     repo = "anchor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y5452JSBAH+GkAJ57cDjup3vyMzPac+xvNAE+W81Ong=";
+    hash = "sha256-lpLNocNrSWkf/b34PCmUKqFumdo3LcOyGMtN8O2ciEU=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-GH/R7S8jQAWGTz8Ig/u/yb9o6FPtmkAaOzgl0uiB0dk=";
+  cargoHash = "sha256-Nx5g+X9cPL71Gf9J/Zp5u6H8rrbDQW6KqTc/Ti+mzow=";
 
   # Only build the anchor-cli package
   cargoBuildFlags = [
@@ -35,7 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/solana-foundation/anchor";
     changelog = "https://github.com/solana-foundation/anchor/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ Denommus ];
+    maintainers = with lib.maintainers; [
+      Denommus
+      _0xgsvs
+    ];
     mainProgram = "anchor";
   };
 })
diff --git a/pkgs/by-name/an/anders/package.nix b/pkgs/by-name/an/anders/package.nix
index e9cfa9dbd506..8ee83c272cf4 100644
--- a/pkgs/by-name/an/anders/package.nix
+++ b/pkgs/by-name/an/anders/package.nix
@@ -6,7 +6,7 @@
 
 ocamlPackages.buildDunePackage rec {
   pname = "anders";
-  version = "1.1.1";
+  version = "5.0.0";
 
   duneVersion = "3";
 
@@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
     owner = "groupoid";
     repo = "anders";
     tag = version;
-    sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4=";
+    sha256 = "sha256-8T/+faVsmgghjxC4SkXQ5B6KDuhVO9NdwMvu7UDlk/0=";
   };
 
   strictDeps = true;
@@ -27,6 +27,6 @@ ocamlPackages.buildDunePackage rec {
     mainProgram = "anders";
     homepage = "https://homotopy.dev/";
     license = lib.licenses.isc;
-    maintainers = [ lib.maintainers.suhr ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index d2c4b7729294..c449e47c09da 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -142,12 +142,12 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   env = {
-    JAVA_HOME = jetbrains.jdk;
+    JAVA_HOME = jetbrains.jdk-21;
     ANDROID_SDK_HOME = "$(pwd)";
   };
 
   gradleFlags = [
-    "-Dorg.gradle.java.home=${jetbrains.jdk}"
+    "-Dorg.gradle.java.home=${jetbrains.jdk-21}"
   ];
 
   nativeBuildInputs = [
@@ -282,5 +282,8 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
     ];
+    # Mark broken due to a breaking change in JetBrains JCEF
+    # https://github.com/NixOS/nixpkgs/pull/485812#issuecomment-4211365591
+    broken = true;
   };
 })
diff --git a/pkgs/by-name/an/anki/addons/fsrs4anki-helper/default.nix b/pkgs/by-name/an/anki/addons/fsrs4anki-helper/default.nix
index d907594e3796..00b44473f34f 100644
--- a/pkgs/by-name/an/anki/addons/fsrs4anki-helper/default.nix
+++ b/pkgs/by-name/an/anki/addons/fsrs4anki-helper/default.nix
@@ -8,13 +8,13 @@
 
 anki-utils.buildAnkiAddon (finalAttrs: {
   pname = "fsrs4anki-helper";
-  version = "24.06.3-unstable-2026-03-30";
+  version = "24.06.3-unstable-2026-04-14";
 
   src = fetchFromGitHub {
     owner = "open-spaced-repetition";
     repo = "fsrs4anki-helper";
-    rev = "9823596b25e08e41dac06b3a24537dce6538f018";
-    hash = "sha256-Lcl2uNnjw83ShMQaYEniYGi8hyOl3J7H+YR0jaLb5xY=";
+    rev = "703c99f009fa0465237df248e2c83e43851d95b4";
+    hash = "sha256-yF0hTPdipFwhV1CcEmRRXezxc4754XCnX0HINrCgScQ=";
   };
 
   postFixup = ''
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index b1d8ff06d493..a36b1788da6e 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -82,13 +82,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "ansel";
-  version = "0-unstable-2026-03-19";
+  version = "0-unstable-2026-04-21";
 
   src = fetchFromGitHub {
     owner = "aurelienpierreeng";
     repo = "ansel";
-    rev = "5e3e2918bf6f6ce1484f7f36b8f3ff6eee7e90d9";
-    hash = "sha256-TQjWBeVCC3fq+MGb0cC9ytbdXqJw2sOzzTcBEIxzP/M=";
+    rev = "01022024bc001987ac69308c8a5d1b2b4063f239";
+    hash = "sha256-vsy4oi0iK8P2UTk0C6X9j5ItOxIYJ2xuGXOAm4uioIA=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index 08f946bbeedd..140f6f504ae9 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -130,9 +130,7 @@ buildNpmPackage (finalAttrs: {
   meta = {
     description = "P2P note-taking tool";
     homepage = "https://anytype.io/";
-    changelog = "https://community.anytype.io/t/anytype-desktop-${
-      builtins.replaceStrings [ "." ] [ "-" ] (lib.versions.majorMinor finalAttrs.version)
-    }-0-released";
+    changelog = "https://github.com/anyproto/anytype-ts/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.unfreeRedistributable;
     mainProgram = "anytype";
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/ao/ao3downloader/package.nix b/pkgs/by-name/ao/ao3downloader/package.nix
index cd9fb3456d07..ea655ebb1722 100644
--- a/pkgs/by-name/ao/ao3downloader/package.nix
+++ b/pkgs/by-name/ao/ao3downloader/package.nix
@@ -8,14 +8,14 @@
 # https://github.com/nianeyna/ao3downloader/blob/f8399bb8aca276ae7359157b90afd13925c90056/pyproject.toml#L8
 python312Packages.buildPythonApplication (finalAttrs: {
   pname = "ao3downloader";
-  version = "2026.4.7";
+  version = "2026.4.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nianeyna";
     repo = "ao3downloader";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PlMVhvUX/XeNrKfwe+/sFv8Y4k7GEzCR+xIO/zuspxM=";
+    hash = "sha256-StaF62Ho/xz8kKE5NrLo8G5PdBv493VBshR6gdK9J20=";
   };
 
   build-system = with python312Packages; [
diff --git a/pkgs/by-name/ap/aperture/package.nix b/pkgs/by-name/ap/aperture/package.nix
index 4def1c33eb7b..123319c2bab3 100644
--- a/pkgs/by-name/ap/aperture/package.nix
+++ b/pkgs/by-name/ap/aperture/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aperture";
-  version = "0.3-beta";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "aperture";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PsmaNJxWkXiFDA7IGhT+Kx1GUvv23c8L8Jz21/b48oo=";
+    hash = "sha256-XVLpIuBCavCbHcSMPFmxNxtdkr+jYy/AYjffzyKSYOg=";
   };
 
-  vendorHash = "sha256-rrDLdE7c6ykhdqOfRpuxyRO4xqYp3LZvovAppzy1wVw=";
+  vendorHash = "sha256-I7StCuL8UifVXBvchG0VRWA5nZc+nwIpK6+PQfkVGGo=";
 
   subPackages = [ "cmd/aperture" ];
 
diff --git a/pkgs/by-name/ap/apfel-llm/package.nix b/pkgs/by-name/ap/apfel-llm/package.nix
new file mode 100644
index 000000000000..17429d03f1c6
--- /dev/null
+++ b/pkgs/by-name/ap/apfel-llm/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "apfel-llm";
+  version = "1.0.5";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1
+  src = fetchurl {
+    url = "https://github.com/Arthur-Ficial/apfel/releases/download/v${finalAttrs.version}/apfel-${finalAttrs.version}-arm64-macos.tar.gz";
+    hash = "sha256-etEOYkYVPm08SRE3nuKcDigS7lCkUUgMacOl/sLv/1A=";
+  };
+
+  sourceRoot = ".";
+
+  dontBuild = true;
+  dontConfigure = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp apfel $out/bin/
+    chmod +x $out/bin/apfel
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Local Apple Intelligence LLM CLI and server";
+    homepage = "https://github.com/Arthur-Ficial/apfel";
+    changelog = "https://github.com/Arthur-Ficial/apfel/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    platforms = [ "aarch64-darwin" ];
+    mainProgram = "apfel";
+    sourceProvenance = [
+      lib.sourceTypes.binaryNativeCode
+    ];
+  };
+})
diff --git a/pkgs/by-name/ap/aphorme/package.nix b/pkgs/by-name/ap/aphorme/package.nix
index 70efedec2921..1b6c251980c7 100644
--- a/pkgs/by-name/ap/aphorme/package.nix
+++ b/pkgs/by-name/ap/aphorme/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "aphorme";
-  version = "0.1.19";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "Iaphetes";
     repo = "aphorme_launcher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI=";
+    hash = "sha256-eSJlWInGMFnn+16um7j8Dp92LYdNsfAdLJQSQIDAlaA=";
   };
 
-  cargoHash = "sha256-knxFQ9hBBc8zATwf4ntbbmT2a+33uYcqax8AAFsj/NM=";
+  cargoHash = "sha256-CRDVIY5HVMFme+fOf9tdoT+VVy5z2+s5opw/KH25YOw=";
 
   # No tests exist
   doCheck = false;
diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix
index b0b73272c95c..9f40de3c39b6 100644
--- a/pkgs/by-name/ap/apidog/package.nix
+++ b/pkgs/by-name/ap/apidog/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "apidog";
-  version = "2.8.24";
+  version = "2.8.26";
 
   src = fetchurl {
     url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage";
-    hash = "sha256-gGhA++wfgURhibGF2tXAmH0orX2VSUiJsAo3wAu6t1g=";
+    hash = "sha256-u+J5OKgqOKEE35IhMpL7LUB4UgaX2XZKfnUczfLhjoU=";
   };
 
   appimageContents = appimageTools.extract {
diff --git a/pkgs/by-name/ap/apitrace/package.nix b/pkgs/by-name/ap/apitrace/package.nix
index 86aa5a92a8d0..6f64336a32f3 100644
--- a/pkgs/by-name/ap/apitrace/package.nix
+++ b/pkgs/by-name/ap/apitrace/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apitrace";
-  version = "13.0";
+  version = "14.0";
 
   src = fetchFromGitHub {
     owner = "apitrace";
     repo = "apitrace";
     rev = finalAttrs.version;
-    hash = "sha256-ZZ2RL9nvwvHBEuKSDr1tgRhxBeg+XJKPUvSiHz6g/cg=";
+    hash = "sha256-nZBs5j095p2GerRqeMjAuNVySkLAfWX3mS+9ICXPie4=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ap/apkeep/package.nix b/pkgs/by-name/ap/apkeep/package.nix
index 06a389193cb0..3e5a1c72e1fe 100644
--- a/pkgs/by-name/ap/apkeep/package.nix
+++ b/pkgs/by-name/ap/apkeep/package.nix
@@ -8,14 +8,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "apkeep";
-  version = "0.18.0";
+  version = "1.0.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-Sk8CQaMXtPPJh2nGgGthyzuvkVViQ0jtqPjAqo2dtpg=";
+    hash = "sha256-UFkcncZJlqNa3vvrKGxpF3FSfEB4I16taJcS9RJFdrA=";
   };
 
-  cargoHash = "sha256-PTuhD73R0AxykkVeFEHaVnXrOTHJoRl0CxBJmeh3WgQ=";
+  cargoHash = "sha256-tB7kOAJ8TzuXfks//v0ghFbezCqxjy//Ow1Xvt4rA8o=";
 
   prePatch = ''
     rm .cargo/config.toml
diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix
index 60c294fe2238..0290e2b73e21 100644
--- a/pkgs/by-name/ap/apko/package.nix
+++ b/pkgs/by-name/ap/apko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YHehcCaMclkWkiOFL7FzVUKdLcIjhUXNJUaFEXNdubI=";
+    hash = "sha256-y1/tkLwVW/D6KDnoO/YtW88vA+O+qfbu53Ystx0zf2Y=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-6KLdW45fUb1smdjEuVEe3PBhmC5Z6LnlHp8OkRKghno=";
+  vendorHash = "sha256-xAXI1qGNOhPiDWc6KQX7ThDqs67XhP+O+ideQiMG6B8=";
 
   excludedPackages = [
     "internal/gen-jsonschema"
diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix
index 36d6a183f0a2..9208ca0f7e1f 100644
--- a/pkgs/by-name/ap/app2unit/package.nix
+++ b/pkgs/by-name/ap/app2unit/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "app2unit";
-  version = "1.3.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "app2unit";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-HkwcYYGNReDtPxZumnz3ZDb1sr1JcngAOqs/inO/350=";
+    sha256 = "sha256-upYW+aTJ6LCHrI0+IOYnA98uDLKPxu/wCi7uUWe/Geg=";
   };
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix
index 91917fc8b34a..838ab0e1b9a2 100644
--- a/pkgs/by-name/ap/appflowy/package.nix
+++ b/pkgs/by-name/ap/appflowy/package.nix
@@ -27,11 +27,11 @@ let
     rec {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
-        hash = "sha256-zr84SNbUuVWlLzYjQt1ZK2yk1sDgva3jzDUHsS1/7aM=";
+        hash = "sha256-6akFImNU5EQLW6f2dQRUXUC8srM32xyVI14pjVxV6Sw=";
       };
       x86_64-darwin = {
         urlSuffix = "macos-universal.zip";
-        hash = "sha256-m303tVHbyUUibBfyi8svpbbhgv/msBfh1WVIZl96XvQ=";
+        hash = "sha256-sJ4mXSYsJICXMpDZemqRF3uYgB9SWNdbzcT1s2gHpZA=";
       };
       aarch64-darwin = x86_64-darwin;
     }
@@ -40,7 +40,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "appflowy";
-  version = "0.11.5";
+  version = "0.11.8";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";
diff --git a/pkgs/by-name/ap/aprutil/clang-bdb.patch b/pkgs/by-name/ap/aprutil/clang-bdb.patch
deleted file mode 100644
index 02e9c8378c63..000000000000
--- a/pkgs/by-name/ap/aprutil/clang-bdb.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/build/dbm.m4 b/build/dbm.m4
---- a/build/dbm.m4	2013-11-23 13:00:53.000000000 -0500
-+++ b/build/dbm.m4	2023-10-22 20:16:37.764571446 -0400
-@@ -235,7 +235,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <$apu_try_berkeley_db_header>
--main ()
-+int main ()
- {
-   int major, minor, patch;
- 
diff --git a/pkgs/by-name/ap/aprutil/package.nix b/pkgs/by-name/ap/aprutil/package.nix
index f140e7a61493..1426ed26556f 100644
--- a/pkgs/by-name/ap/aprutil/package.nix
+++ b/pkgs/by-name/ap/aprutil/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   makeWrapper,
   apr,
   expat,
@@ -34,7 +35,16 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./fix-libxcrypt-build.patch
     # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors.
-    ./clang-bdb.patch
+    (fetchpatch {
+      url = "https://github.com/apache/apr-util/commit/2d838ff7319bd384a0b177f40ac19c4b6c81436d.patch?full_index=1";
+      hash = "sha256-/N6V5D1d9R6AVjHUwy3Ne839D3ZSsF3Hpn8W9sx1sXM=";
+      excludes = [ "CHANGES" ];
+    })
+    # Fix error with missing function prototype
+    (fetchpatch {
+      url = "https://github.com/apache/apr-util/commit/e67caa006c75181b45b761cd50294cb3c8e18f1a.patch?full_index=1";
+      hash = "sha256-fwKT7mGPHIgJ5uG/KAOOE/38FSNfow+GJgHCxcp9mgI=";
+    })
   ]
   ++ lib.optional stdenv.hostPlatform.isFreeBSD ./include-static-dependencies.patch;
 
diff --git a/pkgs/by-name/ap/apt-swarm/package.nix b/pkgs/by-name/ap/apt-swarm/package.nix
index 9725f132ca64..a6e2617b87a4 100644
--- a/pkgs/by-name/ap/apt-swarm/package.nix
+++ b/pkgs/by-name/ap/apt-swarm/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "apt-swarm";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "apt-swarm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zb0X6vIRKeI5Ysc88sTCJBlr9r8hrsTq5YR7YCg1L30=";
+    hash = "sha256-tDIwx+Eb/5EH9p407+FfKAwU6ZjNxyKtfFe5h7eTnHg=";
   };
 
-  cargoHash = "sha256-PELTEzhsFa1nl7iqrjnuXEI0U7L8rL9XW9XqQ04rz/s=";
+  cargoHash = "sha256-43TFrddQvmzUzk2JnggKKWljBNzO+7IYF8HsTwez7a4=";
 
   meta = {
     description = "Experimental p2p gossip network for OpenPGP signature transparency";
diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index 0f37c7e9c5a4..129d7bca5974 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -25,7 +25,7 @@
   triehash,
   udev,
   w3m,
-  xxHash,
+  xxhash,
   xz,
   zstd,
   withDocs ? true,
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
     lz4
     p11-kit
     udev
-    xxHash
+    xxhash
     xz
     zstd
   ]
diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix
index c458f0521c0c..03774520b95c 100644
--- a/pkgs/by-name/aq/aquamarine/package.nix
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@@ -23,13 +23,13 @@
 }:
 gcc15Stdenv.mkDerivation (finalAttrs: {
   pname = "aquamarine";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "aquamarine";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XnkWjCpeXfip9tqYdL0b0zzBDjq+dgdISvEdSVGdVyA=";
+    hash = "sha256-nGiqEpbQK/tg7Mzyb8kIik9uDcm3cInWDcHRquFAOS4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ar/arduino-cli/package.nix b/pkgs/by-name/ar/arduino-cli/package.nix
index 5e139aa09234..e13ab6f12ba1 100644
--- a/pkgs/by-name/ar/arduino-cli/package.nix
+++ b/pkgs/by-name/ar/arduino-cli/package.nix
@@ -78,7 +78,7 @@ let
       inherit (finalAttrs.src.meta) homepage;
       description = "Arduino from the command line";
       mainProgram = "arduino-cli";
-      changelog = "https://github.com/arduino/arduino-cli/releases/tag/${finalAttrs.version}";
+      changelog = "https://github.com/arduino/arduino-cli/releases/tag/${finalAttrs.src.tag}";
       license = with lib.licenses; [
         gpl3Only
         asl20
diff --git a/pkgs/by-name/ar/arkenfox-userjs/package.nix b/pkgs/by-name/ar/arkenfox-userjs/package.nix
index 35eafcb5edb2..5caef59efe76 100644
--- a/pkgs/by-name/ar/arkenfox-userjs/package.nix
+++ b/pkgs/by-name/ar/arkenfox-userjs/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arkenfox-userjs";
-  version = "140.1";
+  version = "144.0";
 
   src = fetchurl {
     url = "https://raw.githubusercontent.com/arkenfox/user.js/refs/tags/${finalAttrs.version}/user.js";
-    hash = "sha256-jxzIiARi+GXD+GSGPr1exeEHjR/LsXSUQPGZ+hF36xg=";
+    hash = "sha256-5KszxpFImRdc9wNeDlei1/CKyIfY+VfxGZ5+Sbvn4z4=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/ar/armagetronad/package.nix b/pkgs/by-name/ar/armagetronad/package.nix
index 2568aedbcc11..bc8e1d1dbb79 100644
--- a/pkgs/by-name/ar/armagetronad/package.nix
+++ b/pkgs/by-name/ar/armagetronad/package.nix
@@ -51,9 +51,9 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/tags
       ${latestVersionMajor} =
         let
-          version = "${latestVersionMajor}.2.5";
+          version = "${latestVersionMajor}.3.0";
           rev = "v${version}";
-          hash = "sha256-bj+oUqz0WHAjZ0iS7GlbIfLeMFSPQkH99mPaLdapkPo=";
+          hash = "sha256-xoUb0AAhaiAYA88Sn5/CfofMjGkYDLsCPVKwzHGz1XA=";
         in
         dedicatedServer: {
           inherit version;
@@ -72,8 +72,8 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/trunk/?ref_type=heads
       ${unstableVersionMajor} =
         let
-          rev = "ec0dbb09ce081be2879acf67bebcd2a2987fd0a4";
-          hash = "sha256-8fH0Q0N2bKCO0t+lOs8EamThpiial2CfEcVP3cZbHX0=";
+          rev = "16da4a669d4c4d269132a903228918c2a8b87b08";
+          hash = "sha256-nTTJwxnTYP3kBxSMNpcYaKfMVGF6U/pYa2r10d8YdCE=";
         in
         dedicatedServer: {
           version = "${unstableVersionMajor}-${lib.substring 0 8 rev}";
@@ -94,12 +94,6 @@ let
             SDL2_mixer
           ];
           extraNativeBuildInputs = [ bison ];
-          # `label()` was removed in protobuf 34
-          # <https://github.com/protocolbuffers/protobuf/commit/b76faa921fdd244f374c7be0bddd4050fc42c292>
-          postPatch = ''
-            substituteInPlace src/network/nProtoBuf.cpp \
-              --replace-fail 'field->label() == FieldDescriptor::LABEL_REPEATED' 'field->is_repeated()'
-          '';
         };
 
       # https://gitlab.com/armagetronad/armagetronad/-/commits/hack-0.2.8-sty+ct+ap/?ref_type=heads
diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix
index cfda2a98351b..1d384ca08e51 100644
--- a/pkgs/by-name/ar/armitage/package.nix
+++ b/pkgs/by-name/ar/armitage/package.nix
@@ -4,6 +4,7 @@
   fetchurl,
   fetchFromGitHub,
   jdk11,
+  jdk17,
   gradle_8,
   metasploit,
   makeWrapper,
@@ -76,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    jdk11
+    jdk17
     gradle
     makeWrapper
     copyDesktopItems
diff --git a/pkgs/by-name/ar/arnis/package.nix b/pkgs/by-name/ar/arnis/package.nix
index 2ad0ce398089..7641b3342691 100644
--- a/pkgs/by-name/ar/arnis/package.nix
+++ b/pkgs/by-name/ar/arnis/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "arnis";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "louis-e";
     repo = "arnis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FO/8cQkw6CZWMjWgjx0/2KbfnYgIbHHWdgc4c5t4AEk=";
+    hash = "sha256-7Fh/jhKVNeAlJn2PATEMkPROhsyUYTtUp+Dv0FXoIfs=";
   };
 
-  cargoHash = "sha256-R7dW2/7UInK3yLz5YHb6UYhLukPrv8NZ8lRYhQwsiMw=";
+  cargoHash = "sha256-ZKr+BBcn6vKq3JuLkHqaVHM6Ug7BfUUTEmnePs7RKyc=";
 
   nativeBuildInputs = [
     cargo-tauri.hook
diff --git a/pkgs/by-name/ar/art-standalone/package.nix b/pkgs/by-name/ar/art-standalone/package.nix
index 6f0a62d6b9eb..cb7c5904a462 100644
--- a/pkgs/by-name/ar/art-standalone/package.nix
+++ b/pkgs/by-name/ar/art-standalone/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  wolfssl,
   bionic-translation,
   python3,
   which,
@@ -35,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Do not hardocde addr2line binary path
     ./no-hardcode-path-addr2line.patch
+    ./remove-wolfssljni.patch
   ];
 
   postPatch = ''
@@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     lz4
     openssl
-    (wolfssl.override { enableJni = true; })
     xz
     zlib
   ];
diff --git a/pkgs/by-name/ar/art-standalone/remove-wolfssljni.patch b/pkgs/by-name/ar/art-standalone/remove-wolfssljni.patch
new file mode 100644
index 000000000000..f3aac163d0a7
--- /dev/null
+++ b/pkgs/by-name/ar/art-standalone/remove-wolfssljni.patch
@@ -0,0 +1,96 @@
+diff --git a/Makefile b/Makefile
+index 3383a64b36..b658f49c23 100644
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,7 @@
+ 
+ default: ____art_all
+ 
+-____art_all: dalvikvm art dex2oat libjavacore libcore libopenjdk libopenjdkjvm core-libart-hostdex core-oj-hostdex apachehttp-hostdex apache-xml-hostdex hamcrest-hostdex core-junit-hostdex junit-runner-hostdex bouncycastle-hostdex wolfssljni-hostdex okhttp-hostdex libandroidfw art-standalone.pc
++____art_all: dalvikvm art dex2oat libjavacore libcore libopenjdk libopenjdkjvm core-libart-hostdex core-oj-hostdex apachehttp-hostdex apache-xml-hostdex hamcrest-hostdex core-junit-hostdex junit-runner-hostdex bouncycastle-hostdex okhttp-hostdex libandroidfw art-standalone.pc
+ 
+ art-standalone.pc: art-standalone.pc.in
+ 	sed -e 's|@prefix@|$(____PREFIX)|g' \
+@@ -68,8 +68,7 @@
+ 	install -Dt $(____INSTALL_LIBDIR)/java/dex/art/natives/ $(____TOPDIR)/out/host/linux-x86/lib64/libjavacore.so \
+ 	                                                        $(____TOPDIR)/out/host/linux-x86/lib64/libnativehelper.so \
+ 	                                                        $(____TOPDIR)/out/host/linux-x86/lib64/libopenjdk.so \
+-	                                                        $(____TOPDIR)/out/host/linux-x86/lib64/libopenjdkjvm.so \
+-	                                                        $(____TOPDIR)/out/host/linux-x86/lib64/libwolfssljni.so
++	                                                        $(____TOPDIR)/out/host/linux-x86/lib64/libopenjdkjvm.so
+ #
+ # these are mostly internal libs which there's no point in versioning because they don't have any kind of stable ABI - so we just shove them in art/ namespace
+ # even the libunwind is actually a fork of libunwind 1.1 with added stuff that will likely never be upstreamed, especially since google stopped using libunwind
+@@ -108,8 +107,7 @@
+ 	                                                $(____TOPDIR)/out/host/linux-x86/framework/core-oj-hostdex.jar \
+ 	                                                $(____TOPDIR)/out/host/linux-x86/framework/hamcrest-hostdex.jar \
+ 	                                                $(____TOPDIR)/out/host/linux-x86/framework/junit-runner-hostdex.jar \
+-	                                                $(____TOPDIR)/out/host/linux-x86/framework/okhttp-hostdex.jar \
+-	                                                $(____TOPDIR)/out/host/linux-x86/framework/wolfssljni-hostdex.jar
++	                                                $(____TOPDIR)/out/host/linux-x86/framework/okhttp-hostdex.jar
+ #
+ # packaging note: this is needed as bootclasspath when compiling android_translation_layer. Can be in -dev package.
+ 	install -D $(____TOPDIR)/out/host/common/obj/JAVA_LIBRARIES/core-all-hostdex_intermediates/classes.jar $(____INSTALL_LIBDIR)/java/core-all_classes.jar
+diff --git a/art/runtime/parsed_options.cc b/art/runtime/parsed_options.cc
+index 1f8936114a..b8f7566401 100644
+--- a/art/runtime/parsed_options.cc
++++ b/art/runtime/parsed_options.cc
+@@ -597,8 +597,7 @@
+                                         bootclasspath_prefix + "/core-libart-hostdex.jar"  + ':' +
+                                         bootclasspath_prefix + "/hamcrest-hostdex.jar"     + ':' +
+                                         bootclasspath_prefix + "/junit-runner-hostdex.jar" + ':' +
+-                                        bootclasspath_prefix + "/okhttp-hostdex.jar"       + ':' +
+-                                        bootclasspath_prefix + "/wolfssljni-hostdex.jar";
++                                        bootclasspath_prefix + "/okhttp-hostdex.jar";
+       free(bootclasspath_prefix);
+ 
+       if(args.Exists(M::BootClassPath_a))
+diff --git a/libcore/luni/src/main/java/java/security/security.properties b/libcore/luni/src/main/java/java/security/security.properties
+index ca55328279..b17437f81e 100644
+--- a/libcore/luni/src/main/java/java/security/security.properties
++++ b/libcore/luni/src/main/java/java/security/security.properties
+@@ -18,15 +18,13 @@
+ # Providers
+ # See also: J2SE doc. "How to Implement a Provider for the JavaTM Cryptography Architecture"
+ #
+-# Android's provider of OpenSSL backed implementations
+-security.provider.1=com.wolfssl.provider.jsse.WolfSSLProvider
+ # Android's stripped down BouncyCastle provider
+-security.provider.2=com.android.org.bouncycastle.jce.provider.BouncyCastleProvider
++security.provider.1=com.android.org.bouncycastle.jce.provider.BouncyCastleProvider
+ # provides implementations that would normally be provided by sun.security.provider.Sun
+ # (CertPathValidator, CertPathBuilder and (ATL added) JKS)
+-security.provider.3=sun.security.provider.CertPathProvider
++security.provider.2=sun.security.provider.CertPathProvider
+ # Remaining Harmony providers
+-security.provider.4=org.apache.harmony.security.provider.crypto.CryptoProvider
++security.provider.3=org.apache.harmony.security.provider.crypto.CryptoProvider
+ 
+ 
+ 
+@@ -39,13 +37,6 @@
+ # javax/net/ssl/SSLSocketFactory.html#getDefault()
+ # javax/net/ssl/SSLServerSocketFactory.html#getDefault()
+ 
+-# For regular SSLSockets, we have two implementations:
+-ssl.SocketFactory.provider=com.wolfssl.provider.jsse.WolfSSLSocketFactory
+-#ssl.SocketFactory.provider=com.android.org.conscrypt.SSLSocketFactoryImpl
+-
+-# For SSLServerSockets, there's only the new, OpenSSL-based implementation:
+-ssl.ServerSocketFactory.provider=com.wolfssl.provider.jsse.WolfSSLServerSocketFactory
+-
+ # Default KeyStore type.
+ # See specification for java/security/KeyStore.html#getDefaultType()
+ keystore.type=BKS
+diff --git a/libcore/ojluni/src/main/java/sun/security/jca/Providers.java b/libcore/ojluni/src/main/java/sun/security/jca/Providers.java
+index e60c3e3ba8..ec66dcb8f0 100644
+--- a/libcore/ojluni/src/main/java/sun/security/jca/Providers.java
++++ b/libcore/ojluni/src/main/java/sun/security/jca/Providers.java
+@@ -103,7 +103,6 @@
+         */
+         "com.android.org.bouncycastle.jce.provider.BouncyCastleProvider",
+         "org.apache.harmony.security.provider.crypto.CryptoProvider", // we need SecureRandom
+-        "com.wolfssl.provider.jsse.WolfSSLProvider",
+         // END Android-changed: Use Conscrypt and BC, not the sun.security providers.
+         BACKUP_PROVIDER_CLASSNAME,
+     };
diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index 4e5ca00c16e3..cdfa9a2c8c3e 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "art";
-  version = "1.26.3";
+  version = "1.26.4";
 
   src = fetchFromGitHub {
     owner = "artpixls";
     repo = "ART";
     tag = finalAttrs.version;
-    hash = "sha256-cBhM8vYQoEGntM4GjFaNNC5fuBQxcX343qEcrdMxuSE=";
+    hash = "sha256-T7ri0fQz3OBLmr3BBQvYgSmAQaV/aMax6SOupAQDg5o=";
   };
 
   # Fix the build with CMake 4.
diff --git a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix
index e0118a35190f..58455588ff16 100644
--- a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix
+++ b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix
@@ -6,14 +6,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "arxiv-latex-cleaner";
-  version = "1.0.8";
+  version = "1.0.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google-research";
     repo = "arxiv-latex-cleaner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CQb1u1j+/px+vNqA3iXZ2oe6/0ZWeMjWrUQL9elRDEI=";
+    hash = "sha256-Q3vNGF9uOForLawJtp424Tv3MaVfUSqk4orv9gojm3M=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/as/asccli/package.nix b/pkgs/by-name/as/asccli/package.nix
index 005152770738..650d1ffeba88 100644
--- a/pkgs/by-name/as/asccli/package.nix
+++ b/pkgs/by-name/as/asccli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "asccli";
-  version = "1.2.2";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
-    owner = "rudrankriyam";
+    owner = "rorkai";
     repo = "App-Store-Connect-CLI";
     tag = "${finalAttrs.version}";
-    hash = "sha256-pwfsjVaZaYLLOaIRameDIDZPlwHS6IJrgnTtZqZFwio=";
+    hash = "sha256-9zGLR+lXxR0ku758wmNlglgUYLXa9p/fsZ4p7a7/+E4=";
   };
 
   vendorHash = "sha256-712Q7KiFQyTDjX4Srhukv3eQ84MRjnQxrpgBfqK2xa4=";
@@ -56,7 +56,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Scriptable CLI for the App Store Connect API";
     homepage = "https://asccli.sh";
-    changelog = "https://github.com/rudrankriyam/App-Store-Connect-CLI/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/rorkai/App-Store-Connect-CLI/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       DimitarNestorov
diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix
index 3e24ecc3bef2..320119581331 100644
--- a/pkgs/by-name/as/aseprite/package.nix
+++ b/pkgs/by-name/as/aseprite/package.nix
@@ -8,7 +8,6 @@
   fontconfig,
   freetype,
   giflib,
-  gitUpdater,
   glib,
   harfbuzzFull,
   libicns,
@@ -33,36 +32,29 @@
   zlib,
 }:
 
+let
+  asepriteStrings = fetchFromGitHub {
+    owner = "aseprite";
+    repo = "strings";
+    rev = "0f49265d7e7aea4b862b7d1e670ed969e8a469b8";
+    hash = "sha256-S3YkWA5ECvyyqGvojDhIZci04CTjbJzTQiJ5FZsB4lU=";
+  };
+in
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "aseprite";
-  version = "1.3.17";
+  version = "1.3.17.2";
 
-  srcs = [
-    (fetchFromGitHub {
-      name = "aseprite-source";
-      owner = "aseprite";
-      repo = "aseprite";
-      tag = "v${finalAttrs.version}";
-      fetchSubmodules = true;
-      hash = "sha256-mBFwcf+Q/h1t7HDuiX6NTAiq0BCZZk6MUid1MuA67LY=";
-    })
-
-    # Translation strings
-    (fetchFromGitHub {
-      name = "aseprite-strings";
-      owner = "aseprite";
-      repo = "strings";
-      rev = "0f49265d7e7aea4b862b7d1e670ed969e8a469b8";
-      hash = "sha256-S3YkWA5ECvyyqGvojDhIZci04CTjbJzTQiJ5FZsB4lU=";
-    })
-  ];
-
-  # Sets the main build directory to "aseprite-source" since multiple sources are fetched.
-  sourceRoot = "aseprite-source";
+  src = fetchFromGitHub {
+    owner = "aseprite";
+    repo = "aseprite";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-+rLrk/c3WLqNhXQ7J0eeqZ3h4PsbZad61Cxw0RubWgk=";
+  };
 
   # Translation files are copied without overwriting existing ones to preserve the potentially more up-to-date English file from the main source.
   postUnpack = ''
-    cp --no-clobber $PWD/aseprite-strings/* ./aseprite-source/data/strings
+    cp --no-clobber ${asepriteStrings}/* "$sourceRoot/data/strings"
   '';
 
   nativeBuildInputs = [
@@ -183,8 +175,6 @@ clangStdenv.mkDerivation (finalAttrs: {
     rmdir "$out/bin" 2>/dev/null || true
   '';
 
-  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
-
   meta = {
     homepage = "https://www.aseprite.org/";
     description = "Animated sprite editor & pixel art tool";
diff --git a/pkgs/by-name/as/assetripper/deps.json b/pkgs/by-name/as/assetripper/deps.json
index f1f5f8c75f77..63bd98783caa 100644
--- a/pkgs/by-name/as/assetripper/deps.json
+++ b/pkgs/by-name/as/assetripper/deps.json
@@ -89,11 +89,6 @@
     "version": "1.1.2",
     "hash": "sha256-FiLz2N5gjpNi5vIiuO/FtL2okjkTdBNOSAvrZ5ZcAWY="
   },
-  {
-    "pname": "AssetRipper.Primitives",
-    "version": "3.1.3",
-    "hash": "sha256-17RT4wzgcZwzWjS92fX9lsZk91BKxEM8/kHc5aG/WU0="
-  },
   {
     "pname": "AssetRipper.Primitives",
     "version": "3.1.6",
@@ -121,8 +116,8 @@
   },
   {
     "pname": "AssetRipper.SourceGenerated",
-    "version": "1.3.11.1",
-    "hash": "sha256-ZIVM61VLFQT4q8jnnZlmNcsLAPb0QsVN4V4LEGv+FKA="
+    "version": "1.3.14.2",
+    "hash": "sha256-7FZZbYV8ImJkgKLqWplWiZNzLWNV4FGQxkMuBovUzLE="
   },
   {
     "pname": "AssetRipper.Text.Html",
@@ -141,8 +136,8 @@
   },
   {
     "pname": "AssetRipper.Tpk",
-    "version": "1.1.0",
-    "hash": "sha256-1FJI8HbeJsXc77+uQngG3LJJQt7LshTKoYwtnQ+gyoc="
+    "version": "1.2.0",
+    "hash": "sha256-J1JfyN05hZCGirp650MPzQRRnb8Mk/TELIkbsqmuwV8="
   },
   {
     "pname": "Disarm",
@@ -172,13 +167,18 @@
   },
   {
     "pname": "Microsoft.AspNetCore.OpenApi",
-    "version": "10.0.5",
-    "hash": "sha256-CQXAu6Tm8nOy/rrZksIKGaLW7USEP/N1kwKBMLoh7js="
+    "version": "10.0.7",
+    "hash": "sha256-WlAW49otxYzgrmuqHewUoBsjDcAZwhNz5WVbCT4EiIA="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "10.0.3",
-    "hash": "sha256-+wTcmczUD1qSnnWZ1miijr62/glcRbNWRpEZh/OBU2g="
+    "version": "10.0.7",
+    "hash": "sha256-8K0bmY/vRqUklylaiqmUpgm3ys5s25w83cCw18sn4Gc="
+  },
+  {
+    "pname": "Microsoft.Bcl.Memory",
+    "version": "10.0.7",
+    "hash": "sha256-b/NxUzH+Ut3OIAgY0wYlp5jnE5baHr25uYzofJpe+Zo="
   },
   {
     "pname": "Microsoft.Bcl.Memory",
@@ -235,6 +235,11 @@
     "version": "2.2.1",
     "hash": "sha256-eUZF2/0w5IgGY9UtnZIk1VwwH6VCKP9iPJXVcseIc0c="
   },
+  {
+    "pname": "NAudio.Core",
+    "version": "2.3.0",
+    "hash": "sha256-KUDC2+q+dzZCRUkifePSfxAQCFi+VpIKsSDkYht/Mgw="
+  },
   {
     "pname": "NAudio.Vorbis",
     "version": "1.5.0",
@@ -277,13 +282,13 @@
   },
   {
     "pname": "SharpCompress",
-    "version": "0.38.0",
-    "hash": "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM="
+    "version": "0.47.3",
+    "hash": "sha256-q33Y/kVPNAWgfBF2Yz8lyUDrcpqkDNYgUjI3l/QSG9w="
   },
   {
     "pname": "SharpCompress",
-    "version": "0.47.1",
-    "hash": "sha256-rRzSU1SCGOj0E0or5odH7yEExH0IasSSx9RALH7QFYw="
+    "version": "0.47.4",
+    "hash": "sha256-mH0R+al2GUomIYkieYudTmF1mAnIUiifQPTp13eUFg8="
   },
   {
     "pname": "SourceGenerator.Foundations",
@@ -297,23 +302,23 @@
   },
   {
     "pname": "Swashbuckle.AspNetCore",
-    "version": "10.1.5",
-    "hash": "sha256-Xyh9X/naQzXrQ/S6iij/NTCM+jRIWBJzT7qAiSIcHTI="
+    "version": "10.1.7",
+    "hash": "sha256-6NUOoTHcPdJAtrlMVkmgKs/sxuwV1Q78QzG+tt4j4wo="
   },
   {
     "pname": "Swashbuckle.AspNetCore.Swagger",
-    "version": "10.1.5",
-    "hash": "sha256-XXz1DIP7wD3tRJXOsL9qhzOaEAP2kyKIbwZFJdLhI2A="
+    "version": "10.1.7",
+    "hash": "sha256-jRCchEG4ESpuYtbzMDGtKkR9BkLO4Ac3PQwSmu8B6m8="
   },
   {
     "pname": "Swashbuckle.AspNetCore.SwaggerGen",
-    "version": "10.1.5",
-    "hash": "sha256-4NAg4PW934OglxtKgl5x0kvzRlNJThGDpyMX+8NFE+E="
+    "version": "10.1.7",
+    "hash": "sha256-+6xUOc4EJS7KXQySb2wH2FF9yGM5rgzvlJz45QQyXBw="
   },
   {
     "pname": "Swashbuckle.AspNetCore.SwaggerUI",
-    "version": "10.1.5",
-    "hash": "sha256-/XIglebzW9xLEzX19K+lL9/rQDhrBGbfhPP4ZNPcIx0="
+    "version": "10.1.7",
+    "hash": "sha256-5JYW0MKQ0ePdMHHZrDDaWuj7BX0pvA7NT/K6M49TFm4="
   },
   {
     "pname": "System.Buffers",
@@ -337,8 +342,8 @@
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "10.0.3",
-    "hash": "sha256-+LsHlaUFMFVb60U7GFcvD1l7IpEcjdm1+Iw2g+qrUik="
+    "version": "10.0.7",
+    "hash": "sha256-/xWNrU7ZXdaewiV0YgSestYG+eWCiP13Zx42w3GMzRQ="
   },
   {
     "pname": "System.Memory",
@@ -402,13 +407,13 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "10.0.3",
-    "hash": "sha256-TuOSPfi9dfFnHvH5++zIi30JpRERp35HFpm2R0NWUAk="
+    "version": "10.0.7",
+    "hash": "sha256-6bj4zekpls9T1yPAqlK6oMeoCfl7rabEiy5vDqmOlGI="
   },
   {
     "pname": "System.Text.Json",
-    "version": "10.0.3",
-    "hash": "sha256-E1gPHMAuk2tR4cyScCfsSlDDerhlLAQCUZZMiByIk18="
+    "version": "10.0.7",
+    "hash": "sha256-QBcrNSbTpvMuNEYYCSP9E+i1CXbglJKpS9kVgeDlIsQ="
   },
   {
     "pname": "System.Threading.Tasks.Extensions",
@@ -425,11 +430,6 @@
     "version": "10.0.26100.6",
     "hash": "sha256-oC1WDA7w1kVB9adGZh2KDCvJisRcOkw4Cy87wDjh2qc="
   },
-  {
-    "pname": "ZstdSharp.Port",
-    "version": "0.8.1",
-    "hash": "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg="
-  },
   {
     "pname": "ZstdSharp.Port",
     "version": "0.8.7",
diff --git a/pkgs/by-name/as/assetripper/package.nix b/pkgs/by-name/as/assetripper/package.nix
index f9a36049de1a..2f773727e44b 100644
--- a/pkgs/by-name/as/assetripper/package.nix
+++ b/pkgs/by-name/as/assetripper/package.nix
@@ -11,13 +11,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "assetripper";
-  version = "1.3.12";
+  version = "1.3.14";
 
   src = fetchFromGitHub {
     owner = "AssetRipper";
     repo = "AssetRipper";
     tag = finalAttrs.version;
-    hash = "sha256-pBza6yuMdExKqzhds8Ib5SzRzXRdD5TdEN/Yz7V+zGA=";
+    hash = "sha256-bRz+kvDSPxyt8CNn6sszEcMIxgNNv4FQRFO7zFglPkU=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/as/assimp/package.nix b/pkgs/by-name/as/assimp/package.nix
index e09e2ed5723f..717fd1a0746f 100644
--- a/pkgs/by-name/as/assimp/package.nix
+++ b/pkgs/by-name/as/assimp/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   zlib,
   nix-update-script,
@@ -10,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "assimp";
-  version = "6.0.2";
+  version = "6.0.4";
   outputs = [
     "out"
     "lib"
@@ -21,18 +20,15 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "assimp";
     repo = "assimp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ixtqK+3iiL17GEbEVHz5S6+gJDDQP7bVuSfRMJMGEOY=";
+    hash = "sha256-ryTgsN0z9BZBz7i9aUMKuneN5oqfxpduwJlb+Q0q3Mk=";
   };
 
-  patches = [
-    # Fix build with gcc15
-    # https://github.com/assimp/assimp/pull/6283
-    (fetchpatch {
-      name = "assimp-fix-invalid-vector-gcc15.patch";
-      url = "https://github.com/assimp/assimp/commit/59bc03d931270b6354690512d0c881eec8b97678.patch";
-      hash = "sha256-O+JPwcOdyFtmFE7eZojHo1DUavF5EhLYlUyxtYo/KF4=";
-    })
-  ];
+  postPatch = ''
+    # nix build sandbox does not set /var/tmp up:
+    #   https://github.com/assimp/assimp/issues/6270
+    substituteInPlace test/unit/UnitTestFileGenerator.h \
+      --replace-fail 'define TMP_PATH "/var/tmp/"' 'define TMP_PATH "/tmp/"'
+  '';
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix
index 478a6231cd82..06f8394fbbf6 100644
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "astro-language-server";
-  version = "2.16.6";
+  version = "2.16.7";
 
   src = fetchFromGitHub {
     owner = "withastro";
     repo = "astro";
     tag = "@astrojs/language-server@${finalAttrs.version}";
-    hash = "sha256-xuAkfTVF+do7Tmk6LUOFkS7yunhVRkl+ZGpsOC7Ob4M=";
+    hash = "sha256-0UkbHGOvMJxY4RXVLx9T8oh2cnuwziEuwUfFrls4Wc0=";
   };
 
   # https://pnpm.io/filtering#--filter-package_name-1
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_10;
     fetcherVersion = 2;
-    hash = "sha256-+5S/VuZjP6LoWUPKF1NMhw317AFAJUgaY7/Tq0ZKouw=";
+    hash = "sha256-DFoIq5+cKqnmWLJ6CHhfdQEAGjvpu72qb1CSWaExODI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix
index 7a83c294b088..c93a9bfd8819 100644
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -1,23 +1,31 @@
 {
   lib,
   fetchFromGitHub,
-  buildGoModule,
+  # Requires Go 1.26, drop when that's the default.
+  buildGo126Module,
   nix-update-script,
   versionCheckHook,
+  applyPatches,
 }:
 
-buildGoModule (finalAttrs: {
+buildGo126Module (finalAttrs: {
   pname = "athens";
-  version = "0.16.2";
+  version = "0.17.0";
 
-  src = fetchFromGitHub {
-    owner = "gomods";
-    repo = "athens";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-Mv0fJ5EiU/Nxakr1sLx2rcJnQ9SEjFMn+2Gf4qsnN3w=";
+  src = applyPatches {
+    src = fetchFromGitHub {
+      owner = "gomods";
+      repo = "athens";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-4KCPYqLtqz46zr5+LB4CyG4ZQrjQaPgMEhCuGOWIJKg=";
+    };
+    # Trim the patch version, not needed anyway.
+    postPatch = ''
+      sed -i 's/go 1.26.2/go 1.26/' go.mod
+    '';
   };
 
-  vendorHash = "sha256-bn3He7ImXxrl+Or2pqzVpM8VxbfqDDupwtZbdSMd4HI=";
+  vendorHash = "sha256-he7GNkCfqLgOXuCTahvqOnwW5TpbYjlCMfMGfKGwYZ4=";
 
   env.CGO_ENABLED = "0";
   ldflags = [
diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix
index ceba14ee99c8..c81ee93a920a 100644
--- a/pkgs/by-name/at/atlantis/package.nix
+++ b/pkgs/by-name/at/atlantis/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "atlantis";
-  version = "0.41.0";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "runatlantis";
     repo = "atlantis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OnZ+rygG6TpPkZzU4UBmfnxkRrSyFWEn/rEqwpXhMio=";
+    hash = "sha256-EcFthkizJOcqxpt8VjuFRM0UPHHxSseEcWTpT/qlCxw=";
   };
 
   ldflags = [
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     "-X=main.date=1970-01-01T00:00:00Z"
   ];
 
-  vendorHash = "sha256-aAIiDFiaWRTYfmC4yqVRXtNRLrvdtLbUAV6lC3QYhdc=";
+  vendorHash = "sha256-ilKrQulEmsyv8w2ENjhfICoiXOexjUZXeb3cPeqcTqw=";
 
   subPackages = [ "." ];
 
@@ -35,6 +35,8 @@ buildGoModule (finalAttrs: {
     description = "Terraform Pull Request Automation";
     mainProgram = "atlantis";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      tebriel
+    ];
   };
 })
diff --git a/pkgs/by-name/at/attyx/package.nix b/pkgs/by-name/at/attyx/package.nix
index 1d286c3813d8..0b4d816f3c32 100644
--- a/pkgs/by-name/at/attyx/package.nix
+++ b/pkgs/by-name/at/attyx/package.nix
@@ -18,13 +18,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "attyx";
-  version = "0.3.6";
+  version = "0.3.15";
 
   src = fetchFromGitHub {
     owner = "semos-labs";
     repo = "attyx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FfHU+XZnMN3HqQFtNEZtYu3YMvBk32QcEP71plDtvjY=";
+    hash = "sha256-w71MyTlnuJBdC9HtXm9hdYNv+ONnh8Ii3i2BhmmcXz4=";
   };
 
   deps = callPackage ./build.zig.zon.nix { };
diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index ebb7e47cf50d..dac5a4961653 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru = {
     tests = {
-      inherit (nixosTests) atuin;
+      inherit (nixosTests) atuin atuin-programs;
     };
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix
index 5291f1920343..131e32a76126 100644
--- a/pkgs/by-name/au/audiobookshelf/package.nix
+++ b/pkgs/by-name/au/audiobookshelf/package.nix
@@ -15,10 +15,10 @@
 
 let
   source = {
-    version = "2.33.2";
-    hash = "sha256-YsKUoJ0SlBO3fAbMvzaEEIgo90HclB+0iLVIH4LDmEY=";
-    npmDepsHash = "sha256-h/5brNurUEMHTSu2PGODhRtIenGzhsNM558i85Cs86w=";
-    clientNpmDepsHash = "sha256-EbXkHRjOE1A7Sk4MhbJFuBwG/VY+SHhHYjscsXkSMjU=";
+    version = "2.34.0";
+    hash = "sha256-ZHPrNQ36+bS5wwoiKUQKkGLnKhHKpftI3kQ08ItReWI=";
+    npmDepsHash = "sha256-8y0+3zj3UH5wi9Nbl7X5rne0/tzz6Bf7HrxZpYVYZ3Y=";
+    clientNpmDepsHash = "sha256-xna4tZK40dOew380exp/XR32ekyiFVCTWgWNE9BpTl8=";
   };
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/au/audion/package.nix b/pkgs/by-name/au/audion/package.nix
index 67fc4fb1436b..c0220c4fb872 100644
--- a/pkgs/by-name/au/audion/package.nix
+++ b/pkgs/by-name/au/audion/package.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.2.3";
 
   src = fetchFromGitHub {
-    owner = "audiusGmbH";
+    owner = "audius";
     repo = "audion";
     tag = finalAttrs.version;
     hash = "sha256-r/ZJ9c2PEl8/AhMlsQaHkVQ9uv5R/qEW66rLSJRGxQk=";
@@ -19,8 +19,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Ping the host continuously and write results to a file";
-    homepage = "https://github.com/audiusGmbH/audion";
-    changelog = "https://github.com/audiusGmbH/audion/releases/tag/${finalAttrs.version}";
+    homepage = "https://github.com/audius/audion";
+    changelog = "https://github.com/audius/audion/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "audion";
diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix
index 88b74634cd03..d595dae37d13 100644
--- a/pkgs/by-name/au/auth0-cli/package.nix
+++ b/pkgs/by-name/au/auth0-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "auth0-cli";
-  version = "1.29.0";
+  version = "1.30.0";
 
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RAfDCYDTlinx4mxmpTqOtAMmNG7G9E8XqYYVfkhwCpY=";
+    hash = "sha256-Hl9uNYbyTtppZYxTnUirwckGrZbjdhY5IEBbXSFrNtw=";
   };
 
-  vendorHash = "sha256-OICMv7yAkY2OQu++HKfowcuvmISeLk3HzrYygW8EPbI=";
+  vendorHash = "sha256-ltVIGm1dDR9umWPM6c4XT9PbklZ20QQj6VTzQJ301A4=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix
index 7dd1eecaa8d9..d973a2995a45 100644
--- a/pkgs/by-name/au/auto-cpufreq/package.nix
+++ b/pkgs/by-name/au/auto-cpufreq/package.nix
@@ -38,6 +38,8 @@ python3Packages.buildPythonPackage rec {
   postPatch = ''
     substituteInPlace auto_cpufreq/core.py \
       --replace-fail "/opt/auto-cpufreq/override.pickle" "/var/run/override.pickle"
+    substituteInPlace auto_cpufreq/core.py \
+      --replace-fail "/opt/auto-cpufreq/turbo-override.pickle" "/var/run/turbo-override.pickle"
     substituteInPlace scripts/org.auto-cpufreq.pkexec.policy \
       --replace-fail "/opt/auto-cpufreq/venv/bin/auto-cpufreq" "$out/bin/auto-cpufreq"
     substituteInPlace auto_cpufreq/gui/app.py auto_cpufreq/gui/objects.py \
diff --git a/pkgs/by-name/av/av1an-unwrapped/package.nix b/pkgs/by-name/av/av1an-unwrapped/package.nix
index a2e9e0899709..977cda3facd7 100644
--- a/pkgs/by-name/av/av1an-unwrapped/package.nix
+++ b/pkgs/by-name/av/av1an-unwrapped/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.4.4";
 
   src = fetchFromGitHub {
-    owner = "master-of-zen";
+    owner = "rust-av";
     repo = "av1an";
     tag = finalAttrs.version;
     hash = "sha256-YF+j349777pE+evvXWTo42DQn1CE0jlfKBEXUFTfcb8=";
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # Avoids https://github.com/shssoichiro/ffmpeg-the-third/issues/63
     # https://github.com/master-of-zen/Av1an/pull/912
     (fetchpatch {
-      url = "https://github.com/master-of-zen/Av1an/commit/e6b29a5a624434eb0dc95b7e8aa31ccf624ccb9d.patch";
+      url = "https://github.com/rust-av/Av1an/commit/e6b29a5a624434eb0dc95b7e8aa31ccf624ccb9d.patch";
       hash = "sha256-nFE04hlTzApYafSzgl/XOUdchxEjKvxXy+SKr/d6+0Q=";
     })
   ];
@@ -67,8 +67,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       Cross-platform command-line AV1 / VP9 / HEVC / H264 encoding framework with per scene quality encoding.
       It can increase your encoding speed and improve cpu utilization by running multiple encoder processes in parallel.
     '';
-    homepage = "https://github.com/master-of-zen/Av1an";
-    changelog = "https://github.com/master-of-zen/Av1an/releases/tag/${finalAttrs.version}";
+    homepage = "https://github.com/rust-av/Av1an";
+    changelog = "https://github.com/rust-av/Av1an/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "av1an";
diff --git a/pkgs/by-name/av/avogadrolibs/package.nix b/pkgs/by-name/av/avogadrolibs/package.nix
index 476fa6e19eff..7c1265177be2 100644
--- a/pkgs/by-name/av/avogadrolibs/package.nix
+++ b/pkgs/by-name/av/avogadrolibs/package.nix
@@ -85,10 +85,10 @@ stdenv.mkDerivation (finalAttrs: {
   # Fix the broken CMake files to use the correct paths
   postInstall = ''
     substituteInPlace $out/lib/cmake/avogadrolibs/AvogadroLibsConfig.cmake \
-      --replace "$out/" ""
+      --replace-fail "$out/" ""
 
     substituteInPlace $out/lib/cmake/avogadrolibs/AvogadroLibsTargets.cmake \
-      --replace "_IMPORT_PREFIX}/$out" "_IMPORT_PREFIX}/"
+      --replace-fail "_IMPORT_PREFIX \"$out\"" '_IMPORT_PREFIX "/"'
   '';
 
   meta = {
diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix
index 4e2cca139fc7..fb56d0637d7e 100644
--- a/pkgs/by-name/aw/aws-nuke/package.nix
+++ b/pkgs/by-name/aw/aws-nuke/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aws-nuke";
-  version = "3.62.2";
+  version = "3.64.1";
 
   src = fetchFromGitHub {
     owner = "ekristen";
     repo = "aws-nuke";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NHZ5pPekRe7Mv4QLKvvqclmS+PCwOs2RK+N1aCu2v4I=";
+    hash = "sha256-oDQcwj3CXud7iOC9UbfQQMcTv0Jp0bCMD8TgMSoG+xw=";
   };
 
-  vendorHash = "sha256-9EM2IjQk20TY3q/4FqrvRe1Ku4lfrkgMqQnooZlpW1o=";
+  vendorHash = "sha256-NgnaGCyYe21F0T0NeLD0X0i/Q7lgXmiB5tKP0UJiht0=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index e4cdcec4065e..f45102a0947f 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "aws-vault";
-  version = "7.9.15";
+  version = "7.10.2";
 
   src = fetchFromGitHub {
     owner = "ByteNess";
     repo = "aws-vault";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-kDzFiuzSyxNyJnj3nechenhvm4bg+fSif+D+/stdTyo=";
+    hash = "sha256-d8Rk+Qkfv4fcQYt+U/QF1hF+c03dj2dWHRUtuxIi73U=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-92k0E4zCKgWyCAvXWU49dFaYuiTByYNAWxdTYDeTzoE=";
+  vendorHash = "sha256-dub/57nE3ERKJEsx5bjTWjJBwIeJcmNSYoG/7iZqe+0=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/aw/awslogs/package.nix b/pkgs/by-name/aw/awslogs/package.nix
index 9edfbff153e4..a44cfd52444d 100644
--- a/pkgs/by-name/aw/awslogs/package.nix
+++ b/pkgs/by-name/aw/awslogs/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "boto3>=1.34.75" "boto3>=1.34.58" \
+      --replace "boto3>=1.34.75" "boto3>=1.34.58"
   '';
 
   nativeCheckInputs = with python3.pkgs; [
diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
index 623925635e97..67a1e24a152e 100644
--- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
       tests/volume-control-test.cc \
       --replace-quiet 'loop(50)' 'loop(500)' \
       --replace-quiet 'loop(100)' 'loop(1000)' \
-      --replace-quiet 'loop(500)' 'loop(5000)' \
+      --replace-quiet 'loop(500)' 'loop(5000)'
   '';
 
   strictDeps = true;
diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index 7fb9055926b8..e872aa63dc30 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -61,7 +61,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "azahar";
-  version = "2125.1";
+  version = "2125.1.1";
 
   src = fetchFromGitHub {
     owner = "azahar-emu";
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
       echo "${finalAttrs.version}" > "$out/GIT-TAG"
       git -C "$out" rev-parse HEAD > "$out/GIT-COMMIT"
     '';
-    hash = "sha256-F5v52axQ4+vH6ZqEEuuMtV5PVahWmnS3PixZHqywhtM=";
+    hash = "sha256-cSnD4H7rruhnSeVPQqvzLqvL5tM1o5WZ4oZunrlHZOM=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index 343cd12664af..aa55f0912bf6 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -125,9 +125,9 @@
 
   azure-devops = mkAzExtension rec {
     pname = "azure-devops";
-    version = "1.0.2";
+    version = "1.0.3";
     url = "https://github.com/Azure/azure-cli-extensions/releases/download/azure-devops-${version}/azure_devops-${version}-py2.py3-none-any.whl";
-    hash = "sha256-4rDeAqOnRRKMP26MJxG4u9vBuos6/SQIoVgfNbBpulk=";
+    hash = "sha256-CbBskqfEktpW+ziRkdZO0kCW70FJ+vaBQjEn66nOCXM=";
     description = "Tools for managing Azure DevOps";
     propagatedBuildInputs = with python3Packages; [ distro ];
     meta.maintainers = with lib.maintainers; [ katexochen ];
@@ -174,9 +174,9 @@
 
   confcom = mkAzExtension rec {
     pname = "confcom";
-    version = "2.0.0b1";
+    version = "2.0.0b2";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl";
-    hash = "sha256-64Agk0G0nKPcM/KQYWoOudmKxelaaLouhet2IJB8QuM=";
+    hash = "sha256-1j1ASDf/g4eSixhvxBFCS4yPiX8QG/+x7IC07g5aLfw=";
     description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension";
     nativeBuildInputs = [ autoPatchelfHook ];
     buildInputs = [ openssl ];
diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix
index 7cad907eabd7..1a38572d13b5 100644
--- a/pkgs/by-name/b3/b3sum/package.nix
+++ b/pkgs/by-name/b3/b3sum/package.nix
@@ -7,14 +7,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "b3sum";
-  version = "1.8.4";
+  version = "1.8.5";
 
   src = fetchCrate {
     inherit (finalAttrs) version pname;
-    hash = "sha256-xqR2BPtuAhsVvLY2DXfmgRF3tLix+H8lcD9GSZh9pUg=";
+    hash = "sha256-odlO6J60wTrca+opzheDbz4lSDAgjDTFFUIHf6NoTXI=";
   };
 
-  cargoHash = "sha256-h/M9SOyl9Dj9QNvKyxtg0L0mNYBhH7Q4Yke5n20SSSs=";
+  cargoHash = "sha256-a/KGCU0bZ1gqB8EH7f8SN6qTuYZMakXdqddtTKNVDPs=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/ba/badrobot/package.nix b/pkgs/by-name/ba/badrobot/package.nix
index 66ef63c07eb9..628c41978e11 100644
--- a/pkgs/by-name/ba/badrobot/package.nix
+++ b/pkgs/by-name/ba/badrobot/package.nix
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "controlplaneio";
     repo = "badrobot";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-U3b5Xw+GjnAEXteivztHdcAcXx7DYtgaUbW5oax0mIk=";
   };
   vendorHash = "sha256-oYdkCEdrw1eE5tnKveeJM3upRy8hOVc24JNN1bLX+ec=";
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     homepage = "https://github.com/controlplaneio/badrobot";
-    changelog = "https://github.com/controlplaneio/badrobot/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/controlplaneio/badrobot/releases/tag/v${finalAttrs.src.tag}";
     description = "Operator Security Audit Tool";
     mainProgram = "badrobot";
     longDescription = ''
@@ -47,6 +47,8 @@ buildGoModule (finalAttrs: {
       cluster permissions.
     '';
     license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [ jk ];
+    maintainers = with lib.maintainers; [
+      jk
+    ];
   };
 })
diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index 20ccf82b3bdd..657bfffe3b30 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -21,16 +21,16 @@ let
 in
 buildNpmPackage' rec {
   pname = "balena-cli";
-  version = "24.1.3";
+  version = "24.1.4";
 
   src = fetchFromGitHub {
     owner = "balena-io";
     repo = "balena-cli";
     rev = "v${version}";
-    hash = "sha256-omx6nGHoo0yfmSTe4ikVQZ4zWU0drDzuM3gEKZo4G+k=";
+    hash = "sha256-NFZoJVhixD67dqLq0tVB2GtMHl0n6qngw1uj/Qqxz8w=";
   };
 
-  npmDepsHash = "sha256-sCQgzXUuJtM5CfHb2czvdn7ZoyME3dWz96wmvJopsCk=";
+  npmDepsHash = "sha256-yGPn9sJ5dsNIvrofqL1/F9E3T/vhI04RmZEQwjsHQa0=";
 
   makeCacheWritable = true;
 
diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix
index 634e2ccd5aba..3a1f25d3a62e 100644
--- a/pkgs/by-name/ba/bant/package.nix
+++ b/pkgs/by-name/ba/bant/package.nix
@@ -20,13 +20,13 @@ let
 in
 buildBazelPackage rec {
   pname = "bant";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "hzeller";
     repo = "bant";
     rev = "v${version}";
-    hash = "sha256-qS2oKQ9/vNX58PftEjHD+3ApXtWL90YVBHnifLtDTcU=";
+    hash = "sha256-aGm/SiHogz9LSK2LQkEOkeQWBVOHDRvUK0YEU9Tuznw=";
   };
 
   bazelFlags = [
@@ -73,6 +73,9 @@ buildBazelPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   meta = {
     description = "Bazel/Build Analysis and Navigation Tool";
     homepage = "http://bant.build/";
diff --git a/pkgs/by-name/ba/bazel_9/examples.nix b/pkgs/by-name/ba/bazel_9/examples.nix
index e820e6f9268b..27f848282eb4 100644
--- a/pkgs/by-name/ba/bazel_9/examples.nix
+++ b/pkgs/by-name/ba/bazel_9/examples.nix
@@ -62,10 +62,10 @@ in
     bazelVendorDepsFOD = {
       outputHash =
         {
-          aarch64-darwin = "sha256-MRm+Pm5mDXys8erQLKHRSClFzxWIYU7Y/otKxl5sJQg=";
-          aarch64-linux = "sha256-cJuNZapJ8LvfPRdv5V9iuy0xxCxLFI5uWTLtAa6bE/w=";
-          x86_64-darwin = "sha256-fOLRQIiRq7BATULy7W90bQ/DrW3Fn7vLut6fKFSoQDA=";
-          x86_64-linux = "sha256-nSe0ywhsTJz6ycqTZaUKfnOvpJOmwip8hYXck9HtW2Q=";
+          aarch64-darwin = "sha256-Jth981+r20azC/CqoWN3LK5USm8zUIpL9Xt88+TcL1o=";
+          aarch64-linux = "sha256-4E/QCSOXTN/dW65xz/n47tXW0PlHUOP1UP+TwJfMueI=";
+          x86_64-darwin = "sha256-t4JP4o3O9C9BehidQPVu4EATnUZodhFh1/ctITxD6JA=";
+          x86_64-linux = "sha256-HzgFpbEBZ8efA5pwUsGZjt9bKiAXslB17OZQcm3cspc=";
         }
         .${stdenv.hostPlatform.system};
       outputHashAlgo = "sha256";
@@ -100,10 +100,10 @@ in
     bazelRepoCacheFOD = {
       outputHash =
         {
-          aarch64-darwin = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk=";
-          aarch64-linux = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk=";
-          x86_64-darwin = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk=";
-          x86_64-linux = "sha256-Yk+Y3XxlmE48RCYqmSfeBtElCGlVVdJvqRtuIMWbxrk=";
+          aarch64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
+          aarch64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
+          x86_64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
+          x86_64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs=";
         }
         .${stdenv.hostPlatform.system};
       outputHashAlgo = "sha256";
@@ -139,10 +139,10 @@ in
     bazelVendorDepsFOD = {
       outputHash =
         {
-          aarch64-darwin = "sha256-6rUV8UMjFZXA053BXIruK8+OEturmtz+YeAlkivePdA=";
-          aarch64-linux = "sha256-/mv7HVsx97RLzYl12WwsI2gYf0qBr+78B5NiEpTRyrc=";
-          x86_64-darwin = "sha256-BpQFhalV5AfYSjWQp+9lxOnfbaD/NADtvrNMqznEojM=";
-          x86_64-linux = "sha256-uutDUAHYecqDYmS90jZfZ8IrhSzpWB6WgcsZPlRJVaM=";
+          aarch64-darwin = "sha256-uUl7PpR3jAKvj6VWspPE3IR4Gr/V2VrBv1MlTzOIZJs=";
+          aarch64-linux = "sha256-uhcIwDk8NAZDBynzxWk+0fLP/2XadKQRl5BlFPjf4/8=";
+          x86_64-darwin = "sha256-vi3+/ps+dhDjqYHxWSnWOXhh1jWJWwb5ifUUhN4vxrg=";
+          x86_64-linux = "sha256-YURF8Zjueq3BN5GfEx5L+C4hGmr5qfJc7OngqZ17384=";
         }
         .${stdenv.hostPlatform.system};
       outputHashAlgo = "sha256";
diff --git a/pkgs/by-name/ba/bazel_9/package.nix b/pkgs/by-name/ba/bazel_9/package.nix
index 287b30e1c357..29838dd3bb6d 100644
--- a/pkgs/by-name/ba/bazel_9/package.nix
+++ b/pkgs/by-name/ba/bazel_9/package.nix
@@ -29,7 +29,7 @@
   cctools,
   # Allow to independently override the jdks used to build and run respectively
   jdk_headless,
-  version ? "9.0.1",
+  version ? "9.1.0",
 }:
 
 let
@@ -89,7 +89,7 @@ let
 
   src = fetchzip {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    hash = "sha256-tdrSgtIXi8Xd03BgxLRWhw1bB1Zhuo0E2pWMCskBDG8=";
+    hash = "sha256-RbRM9HxcBij5gbd0aeArslc/IyjvycM5v7zOnaDT3cU=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/ba/bazel_9/patches/default_bash.patch b/pkgs/by-name/ba/bazel_9/patches/default_bash.patch
index a43a9f0aefd1..435558b8b137 100644
--- a/pkgs/by-name/ba/bazel_9/patches/default_bash.patch
+++ b/pkgs/by-name/ba/bazel_9/patches/default_bash.patch
@@ -1,22 +1,26 @@
 diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
-index a982b782e1..d49b047074 100644
+index 8ac0c2bb97..4233eccf19 100644
 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
 +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
-@@ -89,13 +89,13 @@ public class BazelRuleClassProvider {
+@@ -87,16 +87,16 @@ public class BazelRuleClassProvider {
      public boolean useStrictActionEnv;
    }
  
 -  private static final PathFragment FALLBACK_SHELL = PathFragment.create("/bin/bash");
 +  private static final PathFragment FALLBACK_SHELL = PathFragment.create("@defaultBash@");
  
-   public static final ImmutableMap<OS, PathFragment> SHELL_EXECUTABLE =
+   @VisibleForTesting
+   public static final ImmutableMap<OS, PathFragment> SHELL_EXECUTABLES =
        ImmutableMap.<OS, PathFragment>builder()
            .put(OS.WINDOWS, PathFragment.create("c:/msys64/usr/bin/bash.exe"))
 -          .put(OS.FREEBSD, PathFragment.create("/usr/local/bin/bash"))
 -          .put(OS.OPENBSD, PathFragment.create("/usr/local/bin/bash"))
+-          .put(OS.LINUX, PathFragment.create("/bin/bash"))
+-          .put(OS.DARWIN, PathFragment.create("/bin/bash"))
 +          .put(OS.FREEBSD, PathFragment.create("@defaultBash@"))
 +          .put(OS.OPENBSD, PathFragment.create("@defaultBash@"))
++          .put(OS.LINUX, PathFragment.create("@defaultBash@"))
++          .put(OS.DARWIN, PathFragment.create("@defaultBash@"))
            .put(OS.UNKNOWN, FALLBACK_SHELL)
            .buildOrThrow();
  
-
diff --git a/pkgs/by-name/ba/bazel_9/patches/deps_patches.patch b/pkgs/by-name/ba/bazel_9/patches/deps_patches.patch
index e7ac04732893..96bdec88ad75 100644
--- a/pkgs/by-name/ba/bazel_9/patches/deps_patches.patch
+++ b/pkgs/by-name/ba/bazel_9/patches/deps_patches.patch
@@ -1,5 +1,5 @@
 diff --git a/MODULE.bazel b/MODULE.bazel
-index d845a0e98d..be0aa7bd7c 100644
+index 8b49dac324..13e24c9f5c 100644
 --- a/MODULE.bazel
 +++ b/MODULE.bazel
 @@ -22,16 +22,30 @@ bazel_dep(name = "googleapis", version = "0.0.0-20250604-de157ca3")
@@ -15,7 +15,7 @@ index d845a0e98d..be0aa7bd7c 100644
  bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
  bazel_dep(name = "re2", version = "2025-11-05.bcr.1")
  bazel_dep(name = "rules_graalvm", version = "0.11.1")
- bazel_dep(name = "rules_java", version = "9.0.3")
+ bazel_dep(name = "rules_java", version = "9.1.0")
 +single_version_override(
 +    module_name = "rules_java",
 +    patches = ["//third_party:rules_java.patch"],
@@ -33,7 +33,7 @@ index d845a0e98d..be0aa7bd7c 100644
  bazel_dep(name = "rules_shell", version = "0.6.1")
  bazel_dep(name = "rules_testing", version = "0.9.0")
  bazel_dep(name = "stardoc", version = "0.8.0", repo_name = "io_bazel_skydoc")
-@@ -42,6 +56,11 @@ bazel_dep(name = "zstd-jni", version = "1.5.6-9")
+@@ -42,6 +56,12 @@ bazel_dep(name = "zstd-jni", version = "1.5.6-9")
  # Depend on apple_support second after rules_cc so that the Xcode toolchain
  # from apple_support does not win over the generic Unix toolchain from rules_cc.
  bazel_dep(name = "rules_cc", version = "0.2.17")
@@ -42,6 +42,7 @@ index d845a0e98d..be0aa7bd7c 100644
 +    patches = ["//third_party:rules_cc.patch"],
 +    patch_strip = 1,
 +)
++
  bazel_dep(name = "apple_support", version = "1.24.5")
  
  # The starlark rules in @rules_cc are hidden behind macros but docgen needs to
diff --git a/pkgs/by-name/ba/bazel_9/patches/strict_action_env.patch b/pkgs/by-name/ba/bazel_9/patches/strict_action_env.patch
index 1402c20f6bdb..69bf8831f871 100644
--- a/pkgs/by-name/ba/bazel_9/patches/strict_action_env.patch
+++ b/pkgs/by-name/ba/bazel_9/patches/strict_action_env.patch
@@ -1,13 +1,13 @@
 diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
-index a70b5559bc..10bdffe961 100644
+index 8ac0c2bb97..2925991b51 100644
 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
 +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
-@@ -466,7 +466,7 @@ public class BazelRuleClassProvider {
-       // Note that --action_env does not propagate to the host config, so it is not a viable
-       // workaround when a genrule is itself built in the host config (e.g. nested genrules). See
+@@ -357,7 +357,7 @@ public class BazelRuleClassProvider {
+       // Note that --action_env does not propagate to the exec config, so it is not a viable
+       // workaround when a genrule is itself built in the exec config (e.g. nested genrules). See
        // #8536.
 -      return "/bin:/usr/bin:/usr/local/bin";
 +      return "@strictActionEnvPatch@";
      }
-
+ 
      String newPath = "";
diff --git a/pkgs/by-name/be/beads/package.nix b/pkgs/by-name/be/beads/package.nix
index 388231d2c499..89e8f2686234 100644
--- a/pkgs/by-name/be/beads/package.nix
+++ b/pkgs/by-name/be/beads/package.nix
@@ -15,16 +15,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "beads";
-  version = "1.0.0";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "gastownhall";
     repo = "beads";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D2jShGpkOWKx9aRmRvV5bmV8t0/Y2eAE8q0m54QrRN0=";
+    hash = "sha256-K3X67XgUl55mZS4r4V/KTbXPNqCV7fPHi8HnrDime+E=";
   };
 
-  vendorHash = "sha256-7DJgqJX2HDa9gcGD8fLNHLIXvGAEivYeDYx3snCUyCE=";
+  vendorHash = "sha256-Rn1MnasYUOBbIgjFx0E6R2Zak6la1VajDkHqoiFpHtw=";
 
   subPackages = [ "cmd/bd" ];
 
diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index caad08731d46..0711a6a089f1 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -9,10 +9,10 @@
 }:
 let
   pname = "beeper";
-  version = "4.2.630";
+  version = "4.2.770";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
-    hash = "sha256-1oaJoQ9Ws9Bc+CQFojYCJc5ChgkHUVOKtWrT3ehGMNU=";
+    hash = "sha256-0x1p61zIkAGpBG0dyRwLqoKbhqI3EGTtqpdYr5sxhog=";
   };
   appimageContents = appimageTools.extract {
     inherit pname version src;
@@ -29,7 +29,7 @@ let
       sed -i -E 's/executeDownload\([^)]+\)\{/executeDownload(){return;/g' $out/resources/app/build/main/main-entry-*.mjs
 
       # hide version status element on about page otherwise a error message is shown
-      sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $out/resources/app/build/renderer/PrefsPanes-*.css
+      sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $out/resources/app/build/renderer/*.css
     '';
   };
 in
diff --git a/pkgs/by-name/be/besu/package.nix b/pkgs/by-name/be/besu/package.nix
index ef0f32f5dadf..140348fdd1b0 100644
--- a/pkgs/by-name/be/besu/package.nix
+++ b/pkgs/by-name/be/besu/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Enterprise-grade Java-based, Apache 2.0 licensed Ethereum client";
     homepage = "https://www.hyperledger.org/projects/besu";
-    changelog = "https://github.com/hyperledger/besu/blob/${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/besu-eth/besu/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/be/better-commits/package.nix b/pkgs/by-name/be/better-commits/package.nix
index 00428bcb4cad..7615c98783d6 100644
--- a/pkgs/by-name/be/better-commits/package.nix
+++ b/pkgs/by-name/be/better-commits/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "better-commits";
-  version = "1.19.1";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "Everduin94";
     repo = "better-commits";
     tag = "v${version}";
-    hash = "sha256-4akYngeDf7EqLxCzObjb5MUA8Cb3X3jlrvLEM71OcCA=";
+    hash = "sha256-JgAe55aMr6gP9/dEj3rDW5glA+ntftthJSCFYvtmWso=";
   };
 
-  npmDepsHash = "sha256-vtUtdgOJEQk9PzxOz7AlwOxWS6PTjAtrjAugXRXo89c=";
+  npmDepsHash = "sha256-7+WMrkAYKQgUdOBI4jSOTt6gxwfCwft4GcUKMvpTiYc=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/be/betula/package.nix b/pkgs/by-name/be/betula/package.nix
index 15f68995bde9..3480ee1f6ec7 100644
--- a/pkgs/by-name/be/betula/package.nix
+++ b/pkgs/by-name/be/betula/package.nix
@@ -5,15 +5,15 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "betula";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromSourcehut {
     owner = "~bouncepaw";
     repo = "betula";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zrJkQNQmkp0JiXZL3YSPEkeavEJhu5KnONfOze9pttY=";
+    hash = "sha256-14ws/iVVnvS6SRwco1iSBOZzYP6pIGhBwX5CDiwm93o=";
   };
-  vendorHash = "sha256-8YDilb03J7fd6dj9CohvDDe9ylwXrrREvCP83yGpTyg=";
+  vendorHash = "sha256-PFvMZZUvHDE8onTxrqI53+gEFvZ42zJn4Q7gtDrmRdo=";
 
   env.CGO_ENABLED = 1;
   # These tests use internet, so are failing in Nix build.
diff --git a/pkgs/by-name/bi/bigquery-emulator/package.nix b/pkgs/by-name/bi/bigquery-emulator/package.nix
index 933570797da3..86d4fb10f9ea 100644
--- a/pkgs/by-name/bi/bigquery-emulator/package.nix
+++ b/pkgs/by-name/bi/bigquery-emulator/package.nix
@@ -34,7 +34,7 @@ buildGoModule.override
     meta = {
       description = "BigQuery emulator server implemented in Go";
       homepage = "https://github.com/goccy/bigquery-emulator";
-      changelog = "https://github.com/goccy/pname/releases/tag/v${finalAttrs.version}";
+      changelog = "https://github.com/goccy/bigquery-emulator/releases/tag/v${finalAttrs.version}";
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [ tarantoj ];
       mainProgram = "bigquery-emulator";
diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index 723858e3de4b..de8832023e8c 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.4.12";
+  version = "2.4.13";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-PVax57P496gDksvyGskW3MeR9YDZFE0E8yiv2zW6L/o=";
+    hash = "sha256-Pie1oc1mc6lsdmSiOu04ci67DToDYRt36hdHsU0ZGXw=";
   };
 
-  cargoHash = "sha256-638M2/qRXTZSD4/2/PWkfo5DbsLzWlhwwSBGlkUaLBc=";
+  cargoHash = "sha256-ayFCjh1gBLOJoUnDKm+kwUzshGS0utqTewfe5wEdvQ0=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix
index 1a17df96a354..271122ea8ca1 100644
--- a/pkgs/by-name/bi/bitrise/package.nix
+++ b/pkgs/by-name/bi/bitrise/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "bitrise";
-  version = "2.39.2";
+  version = "2.39.4";
 
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-yduH5UkBwcp41pCeFyoOYtaTwvINrbMaQQlvmeRAXCY=";
+    hash = "sha256-Sg7Os1HqxyGQ7WngCFmV0s8HsFHLt/IgX79nd1tBciU=";
   };
 
   # many tests rely on writable $HOME/.bitrise and require network access
diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index 91f12f70f2d0..40e674cf912f 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -14,20 +14,20 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "bitwarden-cli";
-  version = "2026.3.0";
+  version = "2026.4.1";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     tag = "cli-v${finalAttrs.version}";
-    hash = "sha256-ecaCHk04N9h0RP8gK0o+MLgYS6Linsqi7AaC86hwQ3U=";
+    hash = "sha256-QhkuGW3R577zHpTZ1+GPhEtSUdZAKrAN/WPJhA5AA7c=";
   };
 
   postPatch = ''
     # remove code under unfree license
     rm -r bitwarden_license
 
-    # Upstream cli-v2026.3.0 bumps @napi-rs/cli to 3.5.1 in the desktop workspace,
+    # Upstream cli-v2026.4.1 bumps @napi-rs/cli to 3.5.1 in the desktop workspace,
     # but the root lockfile still points that entry at 3.2.0.
     substituteInPlace package-lock.json \
       --replace-fail \
@@ -38,7 +38,7 @@ buildNpmPackage (finalAttrs: {
   nodejs = nodejs_22;
   npmDepsFetcherVersion = 2;
 
-  npmDepsHash = "sha256-JVRwU5MUQ8YzhCW7ODiyVqbgq7/PxgMV9dlw7i32MfI=";
+  npmDepsHash = "sha256-QCN0fyXr/D39MJnwOyAvYu5hANj8flk3HMVuw9kaJwc=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     perl
@@ -97,6 +97,7 @@ buildNpmPackage (finalAttrs: {
   versionCheckKeepEnvironment = [ "HOME" ];
 
   passthru = {
+    inherit (finalAttrs) npmDeps;
     tests = {
       vaultwarden = nixosTests.vaultwarden.sqlite;
     };
diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix
index e5710dfbcdc6..2ed661c7138e 100644
--- a/pkgs/by-name/bl/bleep/package.nix
+++ b/pkgs/by-name/bl/bleep/package.nix
@@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       export PATH=$PATH:$out/bin
       installShellCompletion --cmd bleep \
         --bash <(bleep install-tab-completions-bash --stdout) \
-        --zsh <(bleep install-tab-completions-zsh --stdout) \
+        --zsh <(bleep install-tab-completions-zsh --stdout)
     '';
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/bl/blender/darwin.patch b/pkgs/by-name/bl/blender/darwin.patch
index 187c7b42d2c2..dfc1b40fdb9c 100644
--- a/pkgs/by-name/bl/blender/darwin.patch
+++ b/pkgs/by-name/bl/blender/darwin.patch
@@ -1,8 +1,7 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0611614fe18..a6dcb2f04b6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2567,7 +2567,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)
+@@ -2651,7 +2651,7 @@
    )
    if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)
      if(APPLE)
@@ -12,10 +11,9 @@ index 0611614fe18..a6dcb2f04b6 100644
          # with Xcode-11 (the Clang of which doesn't support the flag).
          message(
 diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
-index b2db64bbd2e..aac4b552655 100644
 --- a/build_files/cmake/platform/platform_apple.cmake
 +++ b/build_files/cmake/platform/platform_apple.cmake
-@@ -55,7 +55,6 @@ if(NOT DEFINED LIBDIR)
+@@ -55,7 +55,6 @@
    endif()
  endif()
  if(NOT EXISTS "${LIBDIR}/.git")
@@ -23,7 +21,7 @@ index b2db64bbd2e..aac4b552655 100644
  endif()
  if(FIRST_RUN)
    message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
-@@ -121,10 +120,6 @@ if(WITH_CODEC_SNDFILE)
+@@ -115,10 +114,6 @@
    find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
    find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
    list(APPEND LIBSNDFILE_LIBRARIES
@@ -34,48 +32,44 @@ index b2db64bbd2e..aac4b552655 100644
    )
  
    print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
-@@ -168,9 +163,7 @@ if(WITH_CODEC_FFMPEG)
+@@ -169,9 +164,7 @@
    set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
    set(FFMPEG_FIND_COMPONENTS
-     avcodec avdevice avformat avutil
+     avcodec avdevice avfilter avformat avutil
 -    mp3lame ogg opus swresample swscale
 -    theora theoradec theoraenc vorbis vorbisenc
 -    vorbisfile vpx x264)
 +    swresample swscale)
+   # Frameworks required by libavfilter, using legacy macOS CGL
+   string(APPEND PLATFORM_LINKFLAGS " -framework CoreImage -framework OpenGL")
    if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
-     list(APPEND FFMPEG_FIND_COMPONENTS aom)
-   endif()
-@@ -285,7 +278,6 @@ endif()
- add_bundled_libraries(boost/lib)
+@@ -250,7 +243,6 @@
+ endif()
  
  if(WITH_CODEC_FFMPEG)
 -  string(APPEND PLATFORM_LINKFLAGS " -liconv") # ffmpeg needs it !
  endif()
  
  if(WITH_PUGIXML)
-@@ -361,7 +353,7 @@ endif()
- # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
- if(WITH_OPENMP)
-   if(CMAKE_C_COMPILER_ID MATCHES "Clang")
--    if(${CMAKE_C_COMPILER_VERSION} VERSION_GREATER_EQUAL 17.0)
-+    if(FALSE) # clang in nix was compatible with openmp
-       if(WITH_STRICT_BUILD_OPTIONS)
-         message(SEND_ERROR "OpenMP library is not compatible with the current Clang version")
-       else()
-@@ -446,7 +438,7 @@ string(APPEND PLATFORM_LINKFLAGS
+@@ -411,12 +403,12 @@
    " -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'"
  )
  
--if(${XCODE_VERSION} VERSION_GREATER_EQUAL 15.0)
+-if(${XCODE_VERSION} VERSION_EQUAL 15.0)
 +if(FALSE)
-   if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
+   # V4.5 specific workaround: Enforce the legacy Xcode linker to avoid incorrect
+   # assembly generation caused by known bugs in the modern linker shipped with
+   # Xcode 15.0. See issue #148792 for details.
+   string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic")
+-elseif(${XCODE_VERSION} VERSION_GREATER_EQUAL 15.0)
++elseif(FALSE)
+   if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64" AND WITH_LEGACY_MACOS_X64_LINKER)
      # Silence "no platform load command found in <static library>, assuming: macOS".
-     string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic")
+     #
 diff --git a/source/blender/blendthumb/CMakeLists.txt b/source/blender/blendthumb/CMakeLists.txt
-index 935b3f94ee1..f3d73637f71 100644
 --- a/source/blender/blendthumb/CMakeLists.txt
 +++ b/source/blender/blendthumb/CMakeLists.txt
-@@ -65,15 +65,6 @@ elseif(APPLE)
+@@ -81,16 +81,6 @@
      # Prevent Xcode from overwriting the signature.
      XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ""
    )
@@ -85,8 +79,9 @@ index 935b3f94ee1..f3d73637f71 100644
 -  # Command taken from XCode build process.
 -  add_custom_command(
 -    TARGET blender-thumbnailer POST_BUILD
--    COMMAND codesign --deep --force --sign - --entitlements "${CMAKE_SOURCE_DIR}/release/darwin/thumbnailer_entitlements.plist"
--    --timestamp=none $<TARGET_BUNDLE_DIR:blender-thumbnailer>
+-    COMMAND codesign --deep --force --sign -
+-      --entitlements "${CMAKE_SOURCE_DIR}/release/darwin/thumbnailer_entitlements.plist"
+-      --timestamp=none $<TARGET_BUNDLE_DIR:blender-thumbnailer>
 -  )
  elseif(UNIX)
    # -----------------------------------------------------------------------------
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 8270bc2810e2..6a4ca6da065e 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -138,6 +138,9 @@ stdenv'.mkDerivation (finalAttrs: {
   # Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889
   ++ lib.optionals rocmSupport [
     ./hiprt-3-compat.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ./darwin.patch
   ];
 
   postPatch =
@@ -312,6 +315,7 @@ stdenv'.mkDerivation (finalAttrs: {
         apple-sdk_15
         brotli
         llvmPackages.openmp
+        openxr-loader
       ]
   )
   ++ lib.optionals stdenv.hostPlatform.isAarch64 [ sse2neon ]
@@ -446,7 +450,6 @@ stdenv'.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    broken = stdenv.hostPlatform.isDarwin;
     description = "3D Creation/Animation/Publishing System";
     homepage = "https://www.blender.org";
     # They comment two licenses: GPLv2 and Blender License, but they
diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix
index f56dfe0db76b..cd0355d27cb7 100644
--- a/pkgs/by-name/bl/bluesky-pds/package.nix
+++ b/pkgs/by-name/bl/bluesky-pds/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     cctools.libtool
   ];
 
-  # Required for `sharp` NPM dependency
+  # Required for `sharp` npm dependency
   buildInputs = [ vips ];
 
   pnpmDeps = fetchPnpmDeps {
diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix
index 3443eb54e384..1a6e1b1b46dc 100644
--- a/pkgs/by-name/bl/bluetuith/package.nix
+++ b/pkgs/by-name/bl/bluetuith/package.nix
@@ -10,7 +10,7 @@ buildGoModule (finalAttrs: {
   version = "0.2.6";
 
   src = fetchFromGitHub {
-    owner = "darkhz";
+    owner = "bluetuith-org";
     repo = "bluetuith";
     tag = "v${finalAttrs.version}";
     hash = "sha256-jxN4FLefv+edlpBnwDN/pBxZ7sHkv2w+R2tUeNCI6Tw=";
@@ -38,8 +38,8 @@ buildGoModule (finalAttrs: {
       manage Bluetooth-based networking/tethering (PANU/DUN) and remote control
       devices. The TUI has mouse support.
     '';
-    homepage = "https://github.com/darkhz/bluetuith";
-    changelog = "https://github.com/darkhz/bluetuith/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/bluetuith-org/bluetuith";
+    changelog = "https://github.com/bluetuith-org/bluetuith/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     mainProgram = "bluetuith";
diff --git a/pkgs/by-name/bl/bluez-headers/package.nix b/pkgs/by-name/bl/bluez-headers/package.nix
index a3e2e4bf15ba..06e4aa0aae1e 100644
--- a/pkgs/by-name/bl/bluez-headers/package.nix
+++ b/pkgs/by-name/bl/bluez-headers/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bluez-headers";
-  version = "5.84";
+  version = "5.86";
 
   # This package has the source, because of the emulatorAvailable check in the
   # bluez function args, that causes an infinite recursion with Python on cross
   # builds.
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
-    hash = "sha256-W6c9Aw97AAh9Z4ALDjIWAa7A+JKCfHLlosg5DYyIaxE=";
+    hash = "sha256-mfFEVAxgcFkeTFO8uXfrQmZMYrezbLNaKc9y3tM5Yh0=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index 8c7c6841cf3e..b71d91edc6e3 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bmake";
-  version = "20251111";
+  version = "20260313";
 
   src = fetchurl {
     url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz";
-    hash = "sha256-RaP4UVZ3uo85M9ghP0u2EaXDyIOAvi5GIi+kRwlQYGA=";
+    hash = "sha256-dsjzzULuBc/7R7zIElbj1edCb00I5zN4i0WYXe30+XU=";
   };
 
   patches = [
diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index e2d77c8cb443..959259c557ad 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bngblaster";
-  version = "0.9.33";
+  version = "0.9.34";
 
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
     rev = finalAttrs.version;
-    hash = "sha256-8Ka+fLDQdSadxXGd/xMt7qurdnSFE6jdi8bGnTH+mPQ=";
+    hash = "sha256-XkJyNybA0/zjYaz5S1yr6IOVnBOqdXcqRu7bCGpv3CA=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/bo/bob-nvim/package.nix b/pkgs/by-name/bo/bob-nvim/package.nix
index 7550587e0e2c..837272a0813b 100644
--- a/pkgs/by-name/bo/bob-nvim/package.nix
+++ b/pkgs/by-name/bo/bob-nvim/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bob";
-  version = "4.1.6";
+  version = "4.1.7";
 
   src = fetchFromGitHub {
     owner = "MordechaiHadad";
     repo = "bob";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XI/oNGKLXQ/fpB6MojhTsEgmmPH1pHECD5oZgc1r4rQ=";
+    hash = "sha256-2TrmLN9VPjueRRL7kcnfH+eBpEdAOAKGP8N9KZE8bH0=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  cargoHash = "sha256-YSZcYTGnMnN/srh8Z15toq+GIyRKfFd+pGkFQl5gCuo=";
+  cargoHash = "sha256-Akn0p8NBZV3M+pM91W01GIX9mF8nL7dt/kk0ufES8T0=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix
index 1b170dfb5137..7222362adeb4 100644
--- a/pkgs/by-name/bo/boinc/package.nix
+++ b/pkgs/by-name/bo/boinc/package.nix
@@ -28,14 +28,14 @@
 
 stdenv.mkDerivation rec {
   pname = "boinc";
-  version = "8.2.8";
+  version = "8.2.11";
 
   src = fetchFromGitHub {
     name = "${pname}-${version}-src";
     owner = "BOINC";
     repo = "boinc";
     rev = "client_release/${lib.versions.majorMinor version}/${version}";
-    hash = "sha256-yCsqkC6kle2oE29KP5qILe0F+5AOpFl2S3s2c09x7N4=";
+    hash = "sha256-xWEAjTWEUCTTtxfCFFMcrJD0DRVmUAgi2vE0GifTX2Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bo/bombsquad/package.nix b/pkgs/by-name/bo/bombsquad/package.nix
index 700b2930652b..6eb61c0f9647 100644
--- a/pkgs/by-name/bo/bombsquad/package.nix
+++ b/pkgs/by-name/bo/bombsquad/package.nix
@@ -2,12 +2,15 @@
   lib,
   stdenv,
   fetchurl,
-  python312,
+  python313,
   SDL2,
+  cairo,
+  pango,
   libvorbis,
   openal,
   curl,
   gnugrep,
+  gnused,
   libgcc,
   makeBinaryWrapper,
   makeDesktopItem,
@@ -22,11 +25,11 @@ let
     {
       x86_64-linux = {
         name = "BombSquad_Linux_x86_64";
-        hash = "sha256-ICjaNZSCUbslB5pELbI4e+1zXWrZzkCkv69jLRx4dr0=";
+        hash = "sha256-VHhDRzB7sSvb3Ou/Sg+PjTKFDG9sKsXueu2qLNfC06k=";
       };
-      aarch-64-linux = {
+      aarch64-linux = {
         name = "BombSquad_Linux_Arm64";
-        hash = "sha256-/m0SOQbHssk0CqZJPRLK9YKphup3dtMqkbWGzqcF0+g=";
+        hash = "sha256-usrhPOsXkJZk0HCSBIGnc4qdIu2SW7STp6Y/e6RmZlM=";
       };
     }
     .${stdenv.targetPlatform.system} or (throw "${stdenv.targetPlatform.system} is unsupported.");
@@ -39,10 +42,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "bombsquad";
-  version = "1.7.37";
+  # Note: This version trails behind the latest version by one since the latest
+  # version sometimes gets replaced for minor updates. The builds in /old/ are
+  # stable.
+  version = "1.7.61";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20240825230506if_/https://files.ballistica.net/bombsquad/builds/${archive.name}_${finalAttrs.version}.tar.gz";
+    url = "https://files.ballistica.net/bombsquad/builds/old/${archive.name}_${finalAttrs.version}.tar.gz";
     inherit (archive) hash;
   };
 
@@ -50,10 +56,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     SDL2
+    cairo
     libgcc
     libvorbis
     openal
-    python312
+    pango
+    python313
   ];
 
   nativeBuildInputs = [
@@ -98,11 +106,12 @@ stdenv.mkDerivation (finalAttrs: {
       runtimeInputs = [
         curl
         gnugrep
+        gnused
       ];
       text = ''
         curl -sL "https://files.ballistica.net/bombsquad/builds/CHANGELOG.md" \
             | grep -oP '^### \K\d+\.\d+\.\d+' \
-            | head -n 1
+            | sed -n 2p
       '';
     });
   };
@@ -117,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [
       syedahkam
-      coffeeispower
+      mrmaxmeier
     ];
     mainProgram = "bombsquad";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix
index 8c391ae97aa3..641f5969b070 100644
--- a/pkgs/by-name/bo/bootdev-cli/package.nix
+++ b/pkgs/by-name/bo/bootdev-cli/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "bootdev-cli";
-  version = "1.29.0";
+  version = "1.29.2";
 
   src = fetchFromGitHub {
     owner = "bootdotdev";
     repo = "bootdev";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i1U1AsFB/z3h/Aj+YSrfi/U1GWUyawfuL2zJiCWWPgI=";
+    hash = "sha256-POOxwveDSQ3hiybFKmI2eQQEbxN45ubmfEUkLk7i/ng=";
   };
 
   vendorHash = "sha256-ZDioEU5uPCkd+kC83cLlpgzyOsnpj2S7N+lQgsQb8uY=";
diff --git a/pkgs/by-name/bo/bootiso/package.nix b/pkgs/by-name/bo/bootiso/package.nix
index 38a7d7a3d540..59d30c2167d8 100644
--- a/pkgs/by-name/bo/bootiso/package.nix
+++ b/pkgs/by-name/bo/bootiso/package.nix
@@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation rec {
           gnugrep
           busybox
         ]
-      } \
+      }
   '';
 
   meta = {
diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index e8f012341b60..eed4f1dcc91f 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -9,7 +9,7 @@
   openssh,
   openssl,
   python3,
-  xxHash,
+  xxhash,
   zstd,
   installShellFiles,
   nixosTests,
@@ -62,7 +62,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
   buildInputs = [
     libb2
     lz4
-    xxHash
+    xxhash
     zstd
     openssl
   ]
diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index 032d11dca1e2..8c6504e6ab07 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -6,6 +6,8 @@
   ninja,
   perl,
   gitUpdater,
+
+  withShared ? !stdenv.hostPlatform.isStatic,
 }:
 
 # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md
@@ -30,6 +32,10 @@ stdenv.mkDerivation (finalAttrs: {
     perl
   ];
 
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" withShared)
+  ];
+
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.cc.isGNU [
       # Needed with GCC 12 but breaks on darwin (with clang)
@@ -47,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  passthru.updateScript = gitUpdater { };
+  passthru = {
+    updateScript = gitUpdater { };
+    isShared = withShared;
+  };
 
   meta = {
     description = "Free TLS/SSL implementation";
diff --git a/pkgs/by-name/bo/boulder/package.nix b/pkgs/by-name/bo/boulder/package.nix
index 404168f329a6..7a3c851e7876 100644
--- a/pkgs/by-name/bo/boulder/package.nix
+++ b/pkgs/by-name/bo/boulder/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "boulder";
-  version = "0.20260413.0";
+  version = "0.20260428.0";
 
   src = fetchFromGitHub {
     owner = "letsencrypt";
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
       find $out -name .git -print0 | xargs -0 rm -rf
       popd
     '';
-    hash = "sha256-8saRz7g0KsXNr5oR4a2qd4kKDR686J0TIFMzsX/zlV0=";
+    hash = "sha256-ky6geY8pIBhnpwQ4bbzQN0+EQgOfwlo8EQ0rTZdtNIA=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index 79e393d7f5a4..32aacb29cfd9 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.89.137";
+  version = "1.89.145";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-JeYoRM6ClQ7iqu+wvwaTUmdDuIS+2AXoTIU+VxAbgRg=";
+      hash = "sha256-WcLCmhbALtVHL4LEPCUyLfRZR30kdc/41pfHxvE0rJQ=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-BFbx/Ex4HdaFpfY2AKc3yAaMp6PiYwC/kmEIF0WdcwU=";
+      hash = "sha256-t7OXN+42gXd/b9fE8sd40aH2l/nW2OvtLvHCqb7/1qI=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-Ffc9se0j9ULZsZQktWzrUgBiLyC5QR1jAPg6IcHoOTI=";
+      hash = "sha256-A5SGxb+r0wEbdo7ZkUrwm6zVr86+vpOvtfBpZivmNoE=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-SOOf35CONFydjSK47xgQLHxX7weQFPl2Fh33H5qeqXo=";
+      hash = "sha256-kTk6BeKuGkteKlGBk2b5ftDeo9F+EaWwk4DoEzlfJGw=";
     };
   };
 
diff --git a/pkgs/by-name/br/brill/package.nix b/pkgs/by-name/br/brill/package.nix
index 922bf72c9790..79e85051cee1 100644
--- a/pkgs/by-name/br/brill/package.nix
+++ b/pkgs/by-name/br/brill/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -14,10 +15,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     stripRoot = false;
   };
 
+  nativeBuildInputs = [ installFonts ];
+
   installPhase = ''
     runHook preInstall
 
-    install -Dm644 *.ttf          -t $out/share/fonts/truetype
     install -Dm644 *agreement.pdf -t $out/share/licenses/brill
     install -Dm644 *use.pdf       -t $out/share/doc/brill
 
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 570c8693a478..89d0a6eb48cf 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -21,13 +21,13 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-lDsgAOCUrxhmlmYgObDwUR6gbms/q/rNIkTEwJckMyA=";
+    hash = "sha256-YVZPXrYfOFd9lUdZ0rwWnbSDO91Bn1vZyO3AwnE2pZE=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
@@ -36,7 +36,7 @@ buildNpmPackage rec {
 
   nodejs = nodejs_22;
 
-  npmDepsHash = "sha256-vz2I+0+eQk6A4SsiACipTGrYF8LtvWfGhgxqu7mChLE=";
+  npmDepsHash = "sha256-IH2AVyHwMZuyZOUsAP7qoxm5Em32hk90Tp7uvSE9bIE=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bt/btest/package.nix b/pkgs/by-name/bt/btest/package.nix
index 451e8f9c0394..48d73cd7f887 100644
--- a/pkgs/by-name/bt/btest/package.nix
+++ b/pkgs/by-name/bt/btest/package.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Bandwidth Test server and client";
     homepage = "https://github.com/manawenuz/btest-rs";
-    changelog = "https://github.com/manawenuz/btest-rs/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/manawenuz/btest-rs/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "btest";
diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix
index cb6a56e32594..1d52d0885475 100644
--- a/pkgs/by-name/bt/btop/package.nix
+++ b/pkgs/by-name/bt/btop/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "btop";
-  version = "1.4.6";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "aristocratos";
     repo = "btop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h472rcXzpBkPYAEy9JaVlanaavaz0WcdkhmwsVdDRdo=";
+    hash = "sha256-3gECGBSWcGTYQkUlD4X2zrxZVvH2x2xfh5zdZ2jJbDQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix
index 558cf5ccdea8..80f500c9ad30 100644
--- a/pkgs/by-name/bt/btrfs-progs/package.nix
+++ b/pkgs/by-name/bt/btrfs-progs/package.nix
@@ -79,6 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ];
 
+  separateDebugInfo = true;
+
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/by-name/bu/bubblewrap/package.nix b/pkgs/by-name/bu/bubblewrap/package.nix
index b8f75fa1a6c3..925037321863 100644
--- a/pkgs/by-name/bu/bubblewrap/package.nix
+++ b/pkgs/by-name/bu/bubblewrap/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bubblewrap";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "bubblewrap";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8IDMLQPeO576N1lizVudXUmTV6hNOiowjzRpEWBsZ+U=";
+    hash = "sha256-sp5XYkTuoL778p5xQRDtFbX0ocdJuRbVxJCkKbEUgZs=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json
index ced513105160..1f897e49538a 100644
--- a/pkgs/by-name/bu/buck2/hashes.json
+++ b/pkgs/by-name/bu/buck2/hashes.json
@@ -1,21 +1,21 @@
 {
+  "aarch64-darwin": {
+    "buck2": "sha256-zBZ2gEPRxyaBYmnRfYfhYDqswqfiXvxYDHrUI92Z1UQ=",
+    "rust-project": "sha256-K86j0E32w0DUwzpPT0NBUiL3rV4Ze8hzfbKDkpy9JXo="
+  },
   "x86_64-linux": {
-    "buck2": "sha256-TOgL0pLnNEAhHkKvynnM91kW06K6jZPeJnpSibYg8EU=",
-    "rust-project": "sha256-s5JY/m+yC3YNHiOxk6D43ZkWdtWLxlI4X72jSFFd3Hc="
+    "buck2": "sha256-IqDsyQ7Omy7QujT85oKrWwyirG7gwfupdxzvRoMRmQs=",
+    "rust-project": "sha256-iFSko4FTvAVlKUxJE/6FzR6H7V2SryRfEi7nRhfyhxQ="
   },
   "x86_64-darwin": {
-    "buck2": "sha256-8SvAZ30ZFsamVAheKpa2vzGty1TZECUv+BHeXLlDneQ=",
-    "rust-project": "sha256-0af+q1s7iEb6dWl4WuNxFbIskTfrHtU2uhatPyAhZNM="
+    "buck2": "sha256-G/xarAld9dXanZl7Ivcuoer3YsytmFXWED44u2U4q8g=",
+    "rust-project": "sha256-jbvvqPI7+qpONhk8UZfSiFpMGCGWRr85BocA58d+C7Y="
   },
   "aarch64-linux": {
-    "buck2": "sha256-Pka0HEEqRsQp2R435duy6gJy/RQXp5lK5Dg9+rfr9L8=",
-    "rust-project": "sha256-u3b+XscQpNZOo8OTrLSazFZvm496U4nsWti/6TRf8ZA="
+    "buck2": "sha256-VKV1vltATu3tAPmMiifba7MV9kNFH754FDda6i8cQrU=",
+    "rust-project": "sha256-oqxHdbNzQn1KHObboAd4/LTbilIJgLqMiWCgHLaPFrc="
   },
-  "aarch64-darwin": {
-    "buck2": "sha256-1Fv0LzAZUN/BbcorCBaPBbm8JAzLarhJysLqPT78XEQ=",
-    "rust-project": "sha256-PQ7WKjzAPT0uRirWzwJPxKr9V1RQajnlXUMnv8SYdso="
-  },
-  "version": "2025-12-01",
-  "preludeGit": "0a994e0b600f7d035e1ac69f374c0e37e1e19af6",
-  "preludeFod": "sha256-IQa4VatN5OaDSyoTbAj1tHNBpJV6Ost9RbLxDD23xVQ="
+  "version": "2026-04-15",
+  "preludeGit": "f0896771c4cc1ab8f87e032c5293376c89e5096b",
+  "preludeFod": "sha256-Ga4q9zzifgFDGx0TbcbBoDN29H3A4s1BZnSwwv9Mix0="
 }
diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix
index e0a630825c2c..37c480f5e3ba 100644
--- a/pkgs/by-name/bu/buf/package.nix
+++ b/pkgs/by-name/bu/buf/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "buf";
-  version = "1.68.2";
+  version = "1.68.4";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h09Q8/K8SX3B13NZlU8VJLHmkpaUhL0UKG0gwIhnUHg=";
+    hash = "sha256-qxTRUYt2JKBE5WvfXlMsdXMJtrD9MLnMjy6+3PMkpvo=";
   };
 
-  vendorHash = "sha256-3WasjCKLf8P5szPa2Rdb0qWqgPAP67x0AZA1pF5qCUU=";
+  vendorHash = "sha256-aQ4yWdHUmb0LaJ33T2vuVDS1UhYmBUYcwkbnkN7DOqQ=";
 
   patches = [
     # Skip a test that requires networking to be available to work.
diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix
index cd9ef119ae58..2913f020b813 100644
--- a/pkgs/by-name/bu/buildbox/package.nix
+++ b/pkgs/by-name/bu/buildbox/package.nix
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "buildbox";
-  version = "1.4.0";
+  version = "1.4.5";
 
   src = fetchFromGitLab {
     owner = "BuildGrid";
     repo = "buildbox/buildbox";
     tag = finalAttrs.version;
-    hash = "sha256-yZux8uXjv9kQPGGL+y0p+1pURauFHhLpCAfjvOVMGmg=";
+    hash = "sha256-f326mxdZD5INhfQAl3Rebt93r0Itk+ye8tAkw4BJsnA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bu/buku/package.nix b/pkgs/by-name/bu/buku/package.nix
index 3f91fcb4f5d3..d94f4d6ca512 100644
--- a/pkgs/by-name/bu/buku/package.nix
+++ b/pkgs/by-name/bu/buku/package.nix
@@ -8,9 +8,11 @@
 let
   serverRequire = with python3.pkgs; [
     requests
+    flasgger
     flask
     flask-admin
     flask-api
+    flask-babel
     flask-bootstrap
     flask-paginate
     flask-wtf
@@ -49,6 +51,10 @@ buildPythonApplication (finalAttrs: {
     flake8
     pytest-cov-stub
     pyyaml
+  ]
+  ++ lib.optionals withServer [
+    lxml
+    pytest-timeout
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix
index 0baa565112f7..fc5b4064c6e3 100644
--- a/pkgs/by-name/bu/bun/package.nix
+++ b/pkgs/by-name/bu/bun/package.nix
@@ -133,7 +133,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       jk
       thilobillerbeck
       cdmistman
-      coffeeispower
       diogomdp
     ];
     platforms = builtins.attrNames finalAttrs.passthru.sources;
diff --git a/pkgs/by-name/bu/bundler/package.nix b/pkgs/by-name/bu/bundler/package.nix
index 7a35a7ace0b5..584db961acd7 100644
--- a/pkgs/by-name/bu/bundler/package.nix
+++ b/pkgs/by-name/bu/bundler/package.nix
@@ -34,7 +34,7 @@ buildRubyGem rec {
   meta = {
     description = "Manage your Ruby application's gem dependencies";
     homepage = "https://bundler.io";
-    changelog = "https://github.com/rubygems/rubygems/blob/bundler-v${version}/bundler/CHANGELOG.md";
+    changelog = "https://github.com/ruby/rubygems/blob/bundler-v${version}/bundler/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       anthonyroussel
diff --git a/pkgs/by-name/bu/butterfly/git-hashes.json b/pkgs/by-name/bu/butterfly/git-hashes.json
index 90b3baf99857..8802b4f891a1 100644
--- a/pkgs/by-name/bu/butterfly/git-hashes.json
+++ b/pkgs/by-name/bu/butterfly/git-hashes.json
@@ -1,13 +1,14 @@
 {
   "dart_leap": "sha256-oO5851cIdrW/asgOePxvwUgjn1XchkH9CKJUruvlLYI=",
   "irondash_engine_context": "sha256-SaF2vZUEbamhLotu3XQhCGrDZDk9S/vQ8TGPkvJXVkw=",
-  "lw_file_system": "sha256-VxN22Gi9IjISwwbqSdgUOZojS+xu+xVErKJRgBCtHts=",
-  "lw_file_system_api": "sha256-O3VTgaxml6HuwBPHjJ5nr3n+6JdzHMN1IKkTuM8OX54=",
-  "lw_sysapi": "sha256-QfCkjNKG8bz2ra9AEMScp4lfl8ujOvnSNx8KTOr0LvE=",
-  "material_leap": "sha256-VKYKS3fa8260xYL3GOF5yjvux3bADA5DtLijwx6C89M=",
-  "networker": "sha256-YqCl/FODv8QZFnz1qVHoJLIioYhcluPiY4pP09MzvNE=",
-  "networker_crypto": "sha256-8I/qBdxxbIse7un4W9MjaifbK7TqsyYrFnIbaTuezo0=",
-  "networker_socket": "sha256-8I/qBdxxbIse7un4W9MjaifbK7TqsyYrFnIbaTuezo0=",
+  "keybinder": "sha256-to43phRcKNE8EP5QGOWN9kpq3MUc+KZqn4VPDtg0KCo=",
+  "lw_file_system": "sha256-NLcpbP7s+EUgJCWX+PzWg8cXjvac1jQ8tVVkYL/aWNQ=",
+  "lw_file_system_api": "sha256-pU+e4KtLBBzcZkdJWT0yk41wyc75Nindm+2zLj9b4SM=",
+  "lw_sysapi": "sha256-jlAVgZ7OokfoxGqXNPSbVww7GsRsayzc7eYm7aIYrKE=",
+  "material_leap": "sha256-2axYjeZMdOwaa+wangI9eRDDM12DxupYHDb1QadNECA=",
+  "networker": "sha256-0leCfD2orfatqmbBvlPLtAjy42L9Ug8G6Grj6XlhUa8=",
+  "networker_crypto": "sha256-AA8WAn4wyt/GXIPgkNrjitqmaiDW39VBKvJzoj6akms=",
+  "networker_socket": "sha256-wz6Kr/XCgQYFkMPlbVftNqGbRuGIKjRTteadGCCxT1w=",
   "super_native_extensions": "sha256-Bs83FAguu1qDnbSxXc5W2IMyAZ8pNUAh5wuu6amLKQ4=",
-  "swamp_api": "sha256-74Zr2qUeS8JnWcqqU7zAwaD8ygnni76OuTOwQqobhCk="
+  "swamp_api": "sha256-4KBgNmrwfq7VsNKcczTaG1qokFxuYfEC8H55fkV8HsM="
 }
diff --git a/pkgs/by-name/bu/butterfly/package.nix b/pkgs/by-name/bu/butterfly/package.nix
index 854074762482..2775c4a7cdee 100644
--- a/pkgs/by-name/bu/butterfly/package.nix
+++ b/pkgs/by-name/bu/butterfly/package.nix
@@ -10,13 +10,13 @@
 }:
 
 let
-  version = "2.4.4";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "LinwoodDev";
     repo = "Butterfly";
     tag = "v${version}";
-    hash = "sha256-fndhtUSawdnR5l0E5pcetBpt841aysncJb9IHoK3UKw=";
+    hash = "sha256-TmH8Hn6jwOIKsOHEoOJVeCOD+dp7OQKJhZV174F4JHU=";
   };
 in
 flutter338.buildFlutterApplication {
diff --git a/pkgs/by-name/bu/butterfly/pubspec.lock.json b/pkgs/by-name/bu/butterfly/pubspec.lock.json
index e70fd3f2d6bd..f6dd38e9f788 100644
--- a/pkgs/by-name/bu/butterfly/pubspec.lock.json
+++ b/pkgs/by-name/bu/butterfly/pubspec.lock.json
@@ -24,11 +24,21 @@
       "dependency": "direct main",
       "description": {
         "name": "animations",
-        "sha256": "18938cefd7dcc04e1ecac0db78973761a01e4bc2d6bfae0cfa596bfeac9e96ab",
+        "sha256": "a120785be876b24177e8af387929e786e7761d6574e63cad6c2ca28545b30186",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
+    },
+    "ansicolor": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ansicolor",
+        "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.3"
     },
     "archive": {
       "dependency": "direct main",
@@ -54,11 +64,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
     },
     "barcode": {
       "dependency": "direct main",
@@ -104,21 +114,21 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
+        "sha256": "aadd943f4f8cc946882c954c187e6115a84c98c81ad1d9c6cbf0895a8c85da9c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.4"
+      "version": "4.0.5"
     },
     "build_config": {
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
+        "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
     },
     "build_daemon": {
       "dependency": "transitive",
@@ -134,11 +144,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "39ad4ca8a2876779737c60e4228b4bcd35d4352ef7e14e47514093edc012c734",
+        "sha256": "521daf8d189deb79ba474e43a696b41c49fb3987818dbacf3308f1e03673a75e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.1"
+      "version": "2.13.1"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -154,11 +164,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8",
+        "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.3"
+      "version": "8.12.5"
     },
     "butterfly_api": {
       "dependency": "direct main",
@@ -167,37 +177,37 @@
         "relative": true
       },
       "source": "path",
-      "version": "2.4.4"
+      "version": "2.5.0"
     },
     "camera": {
       "dependency": "direct main",
       "description": {
         "name": "camera",
-        "sha256": "a005c6b9783d895a3a9808d65d06773d13587e22a186b6fe8ef3801b0d12f8cf",
+        "sha256": "034c38cb8014d29698dcae6d20276688a1bf74e6487dfeb274d70ea05d5f7777",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.3+1"
+      "version": "0.12.0+1"
     },
     "camera_android_camerax": {
       "dependency": "transitive",
       "description": {
         "name": "camera_android_camerax",
-        "sha256": "8516fe308bc341a5067fb1a48edff0ddfa57c0d3cdcc9dbe7ceca3ba119e2577",
+        "sha256": "2c178975759aac0f0ef7ce1ec698b6e2acd792127ea7f38fa79a424fbebeae7f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.30"
+      "version": "0.7.1+2"
     },
     "camera_avfoundation": {
       "dependency": "transitive",
       "description": {
         "name": "camera_avfoundation",
-        "sha256": "11b4aee2f5e5e038982e152b4a342c749b414aa27857899d20f4323e94cb5f0b",
+        "sha256": "90e4cc3fde331581a3b2d35d83be41dbb7393af0ab857eb27b732174289cb96d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.23+2"
+      "version": "0.10.1"
     },
     "camera_platform_interface": {
       "dependency": "transitive",
@@ -233,11 +243,11 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
+        "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.4.1"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -303,21 +313,21 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
+        "sha256": "b8fe52979ff12432ecf8f0abf6ff70410b1bb734be1c9e4f2f86807ad7166c79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.1.0"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "connectivity_plus_platform_interface",
-        "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204",
+        "sha256": "3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.1.0"
     },
     "console": {
       "dependency": "transitive",
@@ -363,21 +373,31 @@
       "dependency": "direct main",
       "description": {
         "name": "cryptography_flutter_plus",
-        "sha256": "35a8c270aae0abaac7125a6b6b33c2b3daa0ea90d85320aa7d588b6dd6c2edc9",
+        "sha256": "65bc0a78c2104cdb02f4b69e3a03abef093e660d9d9208bc81942b058b49deb2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "3.0.0"
     },
     "cryptography_plus": {
       "dependency": "direct main",
       "description": {
         "name": "cryptography_plus",
-        "sha256": "34db787df4f4740a39474b6fb0a610aa6dc13a5b5b68754b4787a79939ac0454",
+        "sha256": "edf96fc96518368b11bb1ba33b515f59aa5a55b0aa7533c0e1813399cf81130e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.1"
+      "version": "3.0.0"
+    },
+    "csslib": {
+      "dependency": "transitive",
+      "description": {
+        "name": "csslib",
+        "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.2"
     },
     "dart_leap": {
       "dependency": "transitive",
@@ -394,21 +414,21 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_mappable",
-        "sha256": "0e219930c9f7b9e0f14ae7c1de931c401875110fd5c67975b6b9492a6d3a531b",
+        "sha256": "97526bd5e1b1739be5c7379c51d391d074b6bbd109e6e92be49028ecb1a9853c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.6.1"
+      "version": "4.7.0"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "15a7db352c8fc6a4d2bc475ba901c25b39fe7157541da4c16eacce6f8be83e49",
+        "sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.5"
+      "version": "3.1.7"
     },
     "dbus": {
       "dependency": "transitive",
@@ -424,11 +444,11 @@
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus",
-        "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c",
+        "sha256": "b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.3.0"
+      "version": "12.4.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -494,11 +514,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343",
+        "sha256": "84fd4edc420fd356b4c72b733ba3b54b4b20240b9e495e3852fe015181c9ede6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.3.10"
+      "version": "11.0.1"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -588,15 +608,25 @@
       "source": "hosted",
       "version": "0.7.4"
     },
+    "flutter_native_splash": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_native_splash",
+        "sha256": "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.7"
+    },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
+        "sha256": "38d1c268de9097ff59cf0e844ac38759fc78f76836d37edad06fa21e182055a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.33"
+      "version": "2.0.34"
     },
     "flutter_secure_storage": {
       "dependency": "direct main",
@@ -662,11 +692,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95",
+        "sha256": "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.3"
+      "version": "2.2.4"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -710,11 +740,11 @@
       "dependency": "transitive",
       "description": {
         "name": "get_it",
-        "sha256": "1d648d2dd2047d7f7450d5727ca24ee435f240385753d90b49650e3cdff32e56",
+        "sha256": "568d62f0e68666fb5d95519743b3c24a34c7f19d834b0658c46e26d778461f66",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.0"
+      "version": "9.2.1"
     },
     "glob": {
       "dependency": "transitive",
@@ -730,11 +760,11 @@
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "7974313e217a7771557add6ff2238acb63f635317c35fa590d348fb238f00896",
+        "sha256": "48fb2f42ad057476fa4b733cb95e9f9ea7b0b010bb349ea491dca7dbdb18ffc4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "17.1.0"
+      "version": "17.2.0"
     },
     "graphs": {
       "dependency": "transitive",
@@ -746,15 +776,35 @@
       "source": "hosted",
       "version": "2.3.2"
     },
+    "group_button": {
+      "dependency": "transitive",
+      "description": {
+        "name": "group_button",
+        "sha256": "0610fcf28ed122bfb4b410fce161a390f7f2531d55d1d65c5375982001415940",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.3.4"
+    },
     "hooks": {
       "dependency": "transitive",
       "description": {
         "name": "hooks",
-        "sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6",
+        "sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.0.2"
+    },
+    "html": {
+      "dependency": "transitive",
+      "description": {
+        "name": "html",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.15.6"
     },
     "http": {
       "dependency": "direct main",
@@ -790,11 +840,11 @@
       "dependency": "direct main",
       "description": {
         "name": "idb_shim",
-        "sha256": "921301da0a735f336a28fc35c3abdbd4498895cc205fa1ea9f7e785e7d854ceb",
+        "sha256": "62b37b2415074f3c104e93b22c3ef24c4adc52890e74c30ed36a09dd0948a2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.8.2+4"
+      "version": "2.8.5+1"
     },
     "image": {
       "dependency": "direct main",
@@ -853,45 +903,36 @@
       "source": "hosted",
       "version": "0.7.0"
     },
-    "js": {
-      "dependency": "transitive",
-      "description": {
-        "name": "js",
-        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.2"
-    },
     "json_annotation": {
       "dependency": "direct main",
       "description": {
         "name": "json_annotation",
-        "sha256": "805fa86df56383000f640384b282ce0cb8431f1a7a2396de92fb66186d8c57df",
+        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.0"
-    },
-    "json_schema": {
-      "dependency": "transitive",
-      "description": {
-        "name": "json_schema",
-        "sha256": "f37d9c3fdfe8c9aae55fdfd5af815d24ce63c3a0f6a2c1f0982c30f43643fa1a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "5.2.2"
+      "version": "4.11.0"
     },
     "json_serializable": {
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "93fba3ad139dab2b1ce59ecc6fdce6da46a42cdb6c4399ecda30f1e7e725760d",
+        "sha256": "fbcf404b03520e6e795f6b9b39badb2b788407dfc0a50cf39158a6ae1ca78925",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.12.0"
+      "version": "6.13.1"
+    },
+    "keybinder": {
+      "dependency": "direct main",
+      "description": {
+        "path": "packages/keybinder",
+        "ref": "74c6adbd202606181703d37cfcca0708a02b3211",
+        "resolved-ref": "74c6adbd202606181703d37cfcca0708a02b3211",
+        "url": "https://github.com/LinwoodDev/dart_pkgs.git"
+      },
+      "source": "git",
+      "version": "0.0.1"
     },
     "leak_tracker": {
       "dependency": "transitive",
@@ -947,8 +988,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/lw_file_system",
-        "ref": "8e320ecf84bf7f53388c9de985a06606a6467ab1",
-        "resolved-ref": "8e320ecf84bf7f53388c9de985a06606a6467ab1",
+        "ref": "fadf61fcea99010011551f43d8a92251fc8c91ee",
+        "resolved-ref": "fadf61fcea99010011551f43d8a92251fc8c91ee",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -958,8 +999,8 @@
       "dependency": "transitive",
       "description": {
         "path": "packages/lw_file_system_api",
-        "ref": "05c726ca745112dec80c6d30a27478e1556367b7",
-        "resolved-ref": "05c726ca745112dec80c6d30a27478e1556367b7",
+        "ref": "6bb33189fcc30c211ceb7c6bcfd015732b0f8b6d",
+        "resolved-ref": "6bb33189fcc30c211ceb7c6bcfd015732b0f8b6d",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -969,8 +1010,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/lw_sysapi",
-        "ref": "c802aa8a3619f1ad9cbcc6d76298b5026b29f8a5",
-        "resolved-ref": "c802aa8a3619f1ad9cbcc6d76298b5026b29f8a5",
+        "ref": "6c2947728afd3922de9386391c138e99ce05e26f",
+        "resolved-ref": "6c2947728afd3922de9386391c138e99ce05e26f",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -980,38 +1021,38 @@
       "dependency": "direct main",
       "description": {
         "name": "markdown",
-        "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1",
+        "sha256": "ee85086ad7698b42522c6ad42fe195f1b9898e4d974a1af4576c1a3a176cada9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.0"
+      "version": "7.3.1"
     },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.17"
+      "version": "0.12.19"
     },
     "material_color_utilities": {
       "dependency": "transitive",
       "description": {
         "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+        "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.1"
+      "version": "0.13.0"
     },
     "material_leap": {
       "dependency": "direct main",
       "description": {
         "path": "packages/material_leap",
-        "ref": "cafd10fa5bc129f98fc123870e612e649150557f",
-        "resolved-ref": "cafd10fa5bc129f98fc123870e612e649150557f",
+        "ref": "2be0e27cf8f9a2166b23dd5a723fc55a47e832a9",
+        "resolved-ref": "2be0e27cf8f9a2166b23dd5a723fc55a47e832a9",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1037,6 +1078,16 @@
       "source": "hosted",
       "version": "2.0.0"
     },
+    "mocktail": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "mocktail",
+        "sha256": "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.4"
+    },
     "msix": {
       "dependency": "direct dev",
       "description": {
@@ -1051,11 +1102,11 @@
       "dependency": "transitive",
       "description": {
         "name": "native_toolchain_c",
-        "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac",
+        "sha256": "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.17.4"
+      "version": "0.17.6"
     },
     "nested": {
       "dependency": "transitive",
@@ -1091,8 +1142,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/networker/networker",
-        "ref": "4f221c5943ceb786eb7bd427eb71a8cc1346b9b8",
-        "resolved-ref": "4f221c5943ceb786eb7bd427eb71a8cc1346b9b8",
+        "ref": "54d35ef572172ac74d853d47af0140a89b36d714",
+        "resolved-ref": "54d35ef572172ac74d853d47af0140a89b36d714",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1102,8 +1153,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/networker/networker_crypto",
-        "ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
-        "resolved-ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
+        "ref": "12e0f6d0071deb7a68274dfc13f9e36360432eff",
+        "resolved-ref": "12e0f6d0071deb7a68274dfc13f9e36360432eff",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1113,8 +1164,8 @@
       "dependency": "direct main",
       "description": {
         "path": "packages/networker/networker_socket",
-        "ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
-        "resolved-ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
+        "ref": "1ab8146be49b208ba5890935561b93af71702858",
+        "resolved-ref": "1ab8146be49b208ba5890935561b93af71702858",
         "url": "https://github.com/LinwoodDev/dart_pkgs.git"
       },
       "source": "git",
@@ -1164,11 +1215,11 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
+        "sha256": "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.0"
+      "version": "9.0.1"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -1214,11 +1265,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
+        "sha256": "149441ca6e4f38193b2e004c0ca6376a3d11f51fa5a77552d8bd4d2b0c0912ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.22"
+      "version": "2.2.23"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1384,11 +1435,11 @@
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.3"
+      "version": "6.5.0"
     },
     "process": {
       "dependency": "transitive",
@@ -1440,16 +1491,6 @@
       "source": "hosted",
       "version": "3.0.2"
     },
-    "quiver": {
-      "dependency": "transitive",
-      "description": {
-        "name": "quiver",
-        "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.2"
-    },
     "reorderable_grid": {
       "dependency": "direct main",
       "description": {
@@ -1470,16 +1511,6 @@
       "source": "hosted",
       "version": "0.3.0"
     },
-    "rfc_6901": {
-      "dependency": "transitive",
-      "description": {
-        "name": "rfc_6901",
-        "sha256": "6a43b1858dca2febaf93e15639aa6b0c49ccdfd7647775f15a499f872b018154",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.1"
-    },
     "rxdart": {
       "dependency": "direct main",
       "description": {
@@ -1554,11 +1585,11 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840",
+        "sha256": "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.1"
+      "version": "12.0.2"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1574,21 +1605,21 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
+        "sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.5"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f",
+        "sha256": "e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.20"
+      "version": "2.4.23"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1614,11 +1645,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "sha256": "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "shared_preferences_web": {
       "dependency": "transitive",
@@ -1670,21 +1701,21 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17",
+        "sha256": "732792cfd197d2161a65bb029606a46e0a18ff30ef9e141a7a82172b05ea8ecd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "4.2.2"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae",
+        "sha256": "1d3b229b2934034fb2e691fbb3d53e0f75a4af7b1407f88425ed8f209bcb1b8f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.10"
+      "version": "1.3.11"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1761,12 +1792,12 @@
       "dependency": "direct main",
       "description": {
         "path": "api",
-        "ref": "1c15259fc8c5e043997ffcaafbf45348a77e3003",
-        "resolved-ref": "1c15259fc8c5e043997ffcaafbf45348a77e3003",
+        "ref": "88af0f2fe2a99e0cf121662f9fb87ed6deef7987",
+        "resolved-ref": "88af0f2fe2a99e0cf121662f9fb87ed6deef7987",
         "url": "https://github.com/LinwoodDev/Swamp.git"
       },
       "source": "git",
-      "version": "1.0.0"
+      "version": "0.2.0"
     },
     "sync_http": {
       "dependency": "transitive",
@@ -1788,6 +1819,46 @@
       "source": "hosted",
       "version": "3.4.0"
     },
+    "talker": {
+      "dependency": "direct main",
+      "description": {
+        "name": "talker",
+        "sha256": "c364edc0fbd6c648e1a78e6edd89cccd64df2150ca96d899ecd486b76c185042",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.1.16"
+    },
+    "talker_bloc_logger": {
+      "dependency": "direct main",
+      "description": {
+        "name": "talker_bloc_logger",
+        "sha256": "993820ae80c3b7c44c10f75929c56e0382a6cb432d5c3a2834a98e1ce0c900a7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.1.16"
+    },
+    "talker_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "talker_flutter",
+        "sha256": "54cbbf852101721664faf4a05639fd2fdefdc37178327990abea00390690d4bc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.1.16"
+    },
+    "talker_logger": {
+      "dependency": "transitive",
+      "description": {
+        "name": "talker_logger",
+        "sha256": "cea1b8283a28c2118a0b197057fc5beb5b0672c75e40a48725e5e452c0278ff3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.1.16"
+    },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
@@ -1802,11 +1873,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
+        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.7"
+      "version": "0.7.10"
     },
     "tuple": {
       "dependency": "transitive",
@@ -1838,15 +1909,15 @@
       "source": "hosted",
       "version": "1.4.0"
     },
-    "uri": {
+    "universal_io": {
       "dependency": "transitive",
       "description": {
-        "name": "uri",
-        "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a",
+        "name": "universal_io",
+        "sha256": "f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "2.3.1"
     },
     "url_launcher": {
       "dependency": "direct main",
@@ -1862,11 +1933,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
+        "sha256": "3bb000251e55d4a209aa0e2e563309dc9bb2befea2295fd0cec1f51760aac572",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.28"
+      "version": "6.3.29"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -1932,21 +2003,21 @@
       "dependency": "transitive",
       "description": {
         "name": "uuid",
-        "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8",
+        "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.2"
+      "version": "4.5.3"
     },
     "vector_graphics": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
+        "sha256": "81da85e9ca8885ade47f9685b953cb098970d11be4821ac765580a6607ea4373",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.19"
+      "version": "1.1.21"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -1962,11 +2033,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b",
+        "sha256": "5a88dd14c0954a5398af544651c7fb51b457a2a556949bfb25369b210ef73a74",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.20"
+      "version": "1.2.0"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -2101,6 +2172,6 @@
   },
   "sdks": {
     "dart": ">=3.10.3 <4.0.0",
-    "flutter": ">=3.38.10"
+    "flutter": "3.41.6"
   }
 }
diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix
index 6a6c527683d9..9c9ac59711a5 100644
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "c2patool";
-  version = "0.26.37";
+  version = "0.26.50";
 
   src = fetchFromGitHub {
     owner = "contentauth";
     repo = "c2pa-rs";
     tag = "c2patool-v${finalAttrs.version}";
-    hash = "sha256-bxiYY55r1Vg8ljoGlUBi5WgAU8GtcEsX030uzfMsals=";
+    hash = "sha256-4I+q+6gz+xNz+lhxyC14hZ8yyYG4qzT8TtkLxl8Y71g=";
   };
 
-  cargoHash = "sha256-AJr4auizFqumMaQzFd5G1keSIRJ3fWX7ftGHDTkPmX0=";
+  cargoHash = "sha256-Fp+EuxrPx817wjzzq8+f6vBzBe5vyhkXGRsaEqTa/Jo=";
 
   # use the non-vendored openssl
   env.OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/by-name/c6/c64-debugger/package.nix b/pkgs/by-name/c6/c64-debugger/package.nix
index 8951b52cbd57..2a1d6e9525bb 100644
--- a/pkgs/by-name/c6/c64-debugger/package.nix
+++ b/pkgs/by-name/c6/c64-debugger/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
     # Build C64 debugger
     make -C MTEngine \
-      CFLAGS="-w -O2 -fcommon" \
+      CFLAGS="-w -O2 -fcommon -std=gnu17" \
       CXXFLAGS="-w -O2 --std=c++11" \
       DEFINES="-DRUN_COMMODORE64" \
       -j$NIX_BUILD_CORES
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
 
     # Build 65XE debugger
     make -C MTEngine \
-      CFLAGS="-w -O2 -fcommon" \
+      CFLAGS="-w -O2 -fcommon -std=gnu17" \
       CXXFLAGS="-w -O2 --std=c++11" \
       DEFINES="-DRUN_ATARI" \
       -j$NIX_BUILD_CORES
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
 
     # Build NES debugger
     make -C MTEngine \
-      CFLAGS="-w -O2 -fcommon" \
+      CFLAGS="-w -O2 -fcommon -std=gnu17" \
       CXXFLAGS="-w -O2 --std=c++11" \
       DEFINES="-DRUN_NES" \
       -j$NIX_BUILD_CORES
diff --git a/pkgs/by-name/ca/calcurse/package.nix b/pkgs/by-name/ca/calcurse/package.nix
index f94876e38594..56c6daaf6f98 100644
--- a/pkgs/by-name/ca/calcurse/package.nix
+++ b/pkgs/by-name/ca/calcurse/package.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
       be used to filter and format appointments, making it suitable for use in scripts.
     '';
     homepage = "https://calcurse.org/";
-    changelog = "https://git.calcurse.org/calcurse.git/plain/CHANGES.md?h=v${finalAttrs.version}";
     license = lib.licenses.bsd2;
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/by-name/ca/calendar-cli/package.nix b/pkgs/by-name/ca/calendar-cli/package.nix
index e160cfef0863..78399f5cfd44 100644
--- a/pkgs/by-name/ca/calendar-cli/package.nix
+++ b/pkgs/by-name/ca/calendar-cli/package.nix
@@ -16,9 +16,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "tobixen";
+    owner = "pycalendar";
     repo = "calendar-cli";
-    # https://github.com/tobixen/calendar-cli/pull/113#issuecomment-3977892432
+    # https://github.com/pycalendar/calendar-cli/pull/113#issuecomment-3977892432
     tag = "v0.15.0";
     hash = "sha256-P6ClvX6C5VargAvudgSvBwObIUouTRg7SQ62KxhcKiE=";
   };
@@ -74,9 +74,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   };
 
   meta = {
-    changelog = "https://github.com/tobixen/calendar-cli/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/pycalendar/calendar-cli/releases/tag/${finalAttrs.src.tag}";
     description = "Simple command-line CalDav client";
-    homepage = "https://github.com/tobixen/calendar-cli";
+    homepage = "https://github.com/pycalendar/calendar-cli";
     license = lib.licenses.gpl3Plus;
     mainProgram = "calendar-cli";
     maintainers = with lib.maintainers; [ dotlambda ];
diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix
index 0c2cd0fa6729..4f67ba476f80 100644
--- a/pkgs/by-name/ca/calibre-web/package.nix
+++ b/pkgs/by-name/ca/calibre-web/package.nix
@@ -133,6 +133,7 @@ python3Packages.buildPythonApplication rec {
     "lxml"
     "pypdf"
     "regex"
+    "requests"
     "tornado"
     "unidecode"
     "wand"
diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix
index ef2dc653cf7d..556d5060d481 100644
--- a/pkgs/by-name/ca/caligula/package.nix
+++ b/pkgs/by-name/ca/caligula/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "caligula";
-  version = "0.4.10";
+  version = "0.4.11";
 
   src = fetchFromGitHub {
     owner = "ifd3f";
     repo = "caligula";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-oaSt6wzMzaGHPyuJ5NVcAJLblHQcHJA5a7o2wkJgZkU=";
+    hash = "sha256-2KCP7Utb785yIn8w/Ls19UPS9ylg1PtLRki87+BD+xw=";
   };
 
-  cargoHash = "sha256-B09aKzNNhgXKg3PCYmlMz3/oOeeh1FQAL7+tywg/81Q=";
+  cargoHash = "sha256-C86wu2Pc9O7YM1TnnfotzzOQlnJXJe2zmsX04JyJsjA=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
diff --git a/pkgs/by-name/ca/camilladsp/Cargo.lock b/pkgs/by-name/ca/camilladsp/Cargo.lock
index e506a654a8d1..85fe0ee27d23 100644
--- a/pkgs/by-name/ca/camilladsp/Cargo.lock
+++ b/pkgs/by-name/ca/camilladsp/Cargo.lock
@@ -4,7 +4,7 @@ version = 4
 
 [[package]]
 name = "CamillaDSP"
-version = "4.0.1"
+version = "4.1.3"
 dependencies = [
  "alsa",
  "alsa-sys",
@@ -23,13 +23,12 @@ dependencies = [
  "flexi_logger",
  "git-version",
  "json-patch",
- "lazy_static",
  "libc",
  "libpulse-binding",
  "libpulse-simple-binding",
  "log",
  "native-tls",
- "nix 0.30.1",
+ "nix",
  "num-complex",
  "num-traits",
  "objc2-audio-toolbox",
@@ -103,12 +102,12 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "annotate-snippets"
-version = "0.9.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
+checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4"
 dependencies = [
+ "anstyle",
  "unicode-width",
- "yansi-term",
 ]
 
 [[package]]
@@ -173,7 +172,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "826194e1612938c9be09b78b58323fbb2e326de3d491b4230186cf6e832d8ded"
 dependencies = [
- "bindgen 0.72.1",
+ "bindgen",
  "cc",
  "num-derive",
  "num-traits",
@@ -279,9 +278,9 @@ dependencies = [
 
 [[package]]
 name = "async-signal"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c"
+checksum = "52b5aaafa020cf5053a01f2a60e8ff5dccf550f0f77ec54a4e47285ac2bab485"
 dependencies = [
  "async-io",
  "async-lock",
@@ -381,33 +380,13 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "bindgen"
-version = "0.69.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
-dependencies = [
- "annotate-snippets",
- "bitflags 2.11.0",
- "cexpr",
- "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 1.1.0",
- "shlex",
- "syn",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
+ "annotate-snippets",
  "bitflags 2.11.0",
  "cexpr",
  "clang-sys",
@@ -417,7 +396,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 2.1.2",
+ "rustc-hash",
  "shlex",
  "syn",
 ]
@@ -485,9 +464,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.59"
+version = "1.2.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283"
+checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -505,14 +484,14 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.8"
+version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+checksum = "3c6b04e07d8080154ed4ac03546d9a2b303cc2fe1901ba0b35b301516e289368"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -636,9 +615,9 @@ dependencies = [
 
 [[package]]
 name = "convert_case"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -648,9 +627,6 @@ name = "cookie-factory"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2"
-dependencies = [
- "futures",
-]
 
 [[package]]
 name = "core-foundation"
@@ -812,9 +788,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -822,11 +798,10 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
 dependencies = [
- "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
@@ -836,9 +811,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core",
  "quote",
@@ -971,9 +946,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a043dc74da1e37d6afe657061213aa6f425f855399a11d3463c6ecccc4dfda1f"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "find-msvc-tools"
@@ -996,12 +971,6 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
 [[package]]
 name = "foldhash"
 version = "0.1.5"
@@ -1023,48 +992,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
-[[package]]
-name = "futures"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
 [[package]]
 name = "futures-core"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
-[[package]]
-name = "futures-executor"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-io"
 version = "0.3.32"
@@ -1084,23 +1017,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "futures-macro"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
-
 [[package]]
 name = "futures-task"
 version = "0.3.32"
@@ -1113,13 +1029,8 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
- "futures-channel",
  "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
  "futures-task",
- "memchr",
  "pin-project-lite",
  "slab",
 ]
@@ -1213,9 +1124,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
 
 [[package]]
 name = "heck"
@@ -1300,12 +1211,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.13.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
  "serde",
  "serde_core",
 ]
@@ -1325,15 +1236,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -1422,9 +1324,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.94"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
+checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -1460,12 +1362,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "leb128fmt"
 version = "0.1.0"
@@ -1474,9 +1370,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.184"
+version = "0.2.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
 
 [[package]]
 name = "libloading"
@@ -1554,9 +1450,9 @@ dependencies = [
 
 [[package]]
 name = "libspa"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810"
+checksum = "b6b8cfa2a7656627b4c92c6b9ef929433acd673d5ab3708cda1b18478ac00df4"
 dependencies = [
  "bitflags 2.11.0",
  "cc",
@@ -1564,18 +1460,18 @@ dependencies = [
  "cookie-factory",
  "libc",
  "libspa-sys",
- "nix 0.27.1",
- "nom",
+ "nix",
+ "nom 8.0.0",
  "system-deps",
 ]
 
 [[package]]
 name = "libspa-sys"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f"
+checksum = "901049455d2eb6decf9058235d745237952f4804bc584c5fcb41412e6adcc6e0"
 dependencies = [
- "bindgen 0.69.5",
+ "bindgen",
  "cc",
  "system-deps",
 ]
@@ -1692,17 +1588,6 @@ dependencies = [
  "jni-sys 0.3.1",
 ]
 
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.11.0",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.30.1"
@@ -1725,6 +1610,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.3"
@@ -1745,9 +1639,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967"
 
 [[package]]
 name = "num-derive"
@@ -1901,9 +1795,9 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "openssl"
-version = "0.10.76"
+version = "0.10.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf"
+checksum = "bfe4646e360ec77dff7dde40ed3d6c5fee52d156ef4a62f53973d38294dad87f"
 dependencies = [
  "bitflags 2.11.0",
  "cfg-if",
@@ -1933,9 +1827,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.112"
+version = "0.9.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb"
+checksum = "ad2f2c0eba47118757e4c6d2bff2838f3e0523380021356e7875e858372ce644"
 dependencies = [
  "cc",
  "libc",
@@ -1988,7 +1882,7 @@ version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "905787a434a2c721408e7c9a252e85f3d93ca0f118a5283022636c0e05a7ea49"
 dependencies = [
- "nom",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -2010,37 +1904,37 @@ dependencies = [
 
 [[package]]
 name = "pipewire"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda"
+checksum = "9688b89abf11d756499f7c6190711d6dbe5a3acdb30c8fbf001d6596d06a8d44"
 dependencies = [
  "anyhow",
  "bitflags 2.11.0",
  "libc",
  "libspa",
  "libspa-sys",
- "nix 0.27.1",
+ "nix",
  "once_cell",
  "pipewire-sys",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "pipewire-sys"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112"
+checksum = "cb028afee0d6ca17020b090e3b8fa2d7de23305aef975c7e5192a5050246ea36"
 dependencies = [
- "bindgen 0.69.5",
+ "bindgen",
  "libspa-sys",
  "system-deps",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
 name = "plotters"
@@ -2139,7 +2033,7 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit 0.25.10+spec-1.1.0",
+ "toml_edit",
 ]
 
 [[package]]
@@ -2174,9 +2068,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "7ec095654a25171c2124e9e3393a930bddbffdc939556c914957a4c3e0a87166"
 dependencies = [
  "rand_chacha",
  "rand_core",
@@ -2325,12 +2219,6 @@ dependencies = [
  "windowfunctions",
 ]
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.2"
@@ -2509,24 +2397,24 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "serde_with"
-version = "3.17.0"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "381b283ce7bc6b476d903296fb59d0d36633652b633b27f64db4fb46dcbfc3b9"
+checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "schemars 0.9.0",
  "schemars 1.2.1",
  "serde_core",
@@ -2537,9 +2425,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.17.0"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6d4e30573c8cb306ed6ab1dca8423eec9a463ea0e155f45399455e0368b27e0"
+checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -2621,9 +2509,9 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "6.2.2"
+version = "7.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7"
 dependencies = [
  "cfg-expr",
  "heck",
@@ -2634,9 +2522,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "tempfile"
@@ -2693,9 +2581,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.45"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "itoa",
@@ -2708,15 +2596,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.25"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2734,23 +2622,17 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.23"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
 dependencies = [
- "serde",
+ "indexmap 2.14.0",
+ "serde_core",
  "serde_spanned",
- "toml_datetime 0.6.11",
- "toml_edit 0.22.27",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-dependencies = [
- "serde",
+ "toml_datetime",
+ "toml_parser",
+ "toml_writer",
+ "winnow 1.0.1",
 ]
 
 [[package]]
@@ -2764,25 +2646,12 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.25.11+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b"
 dependencies = [
- "indexmap 2.13.1",
- "serde",
- "serde_spanned",
- "toml_datetime 0.6.11",
- "winnow 0.7.15",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.25.10+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b"
-dependencies = [
- "indexmap 2.13.1",
- "toml_datetime 1.1.1+spec-1.1.0",
+ "indexmap 2.14.0",
+ "toml_datetime",
  "toml_parser",
  "winnow 1.0.1",
 ]
@@ -2796,6 +2665,12 @@ dependencies = [
  "winnow 1.0.1",
 ]
 
+[[package]]
+name = "toml_writer"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
+
 [[package]]
 name = "tracing"
 version = "0.1.44"
@@ -2886,9 +2761,9 @@ checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unicode-xid"
@@ -2973,11 +2848,11 @@ dependencies = [
 
 [[package]]
 name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
 dependencies = [
- "wit-bindgen 0.46.0",
+ "wit-bindgen",
 ]
 
 [[package]]
@@ -2986,14 +2861,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "wit-bindgen 0.51.0",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
+checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3004,9 +2879,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.67"
+version = "0.4.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e"
+checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3014,9 +2889,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
+checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3024,9 +2899,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
+checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -3037,9 +2912,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
+checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129"
 dependencies = [
  "unicode-ident",
 ]
@@ -3061,7 +2936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
  "anyhow",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "wasm-encoder",
  "wasmparser",
 ]
@@ -3074,15 +2949,15 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
  "bitflags 2.11.0",
  "hashbrown 0.15.5",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "semver",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.94"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
+checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3433,12 +3308,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "wit-bindgen"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
-
 [[package]]
 name = "wit-bindgen"
 version = "0.51.0"
@@ -3467,7 +3336,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
  "anyhow",
  "heck",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "prettyplease",
  "syn",
  "wasm-metadata",
@@ -3498,7 +3367,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
  "bitflags 2.11.0",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "log",
  "serde",
  "serde_derive",
@@ -3517,7 +3386,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "log",
  "semver",
  "serde",
@@ -3533,27 +3402,18 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08c7c1b1a6a7c8a6b2741a6c21a4f8918e51899b111cfa08d1288202656e3975"
 dependencies = [
- "indexmap 2.13.1",
+ "indexmap 2.14.0",
  "itoa",
  "libyaml-rs",
  "ryu",
  "serde",
 ]
 
-[[package]]
-name = "yansi-term"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "zbus"
-version = "5.13.2"
+version = "5.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfeff997a0aaa3eb20c4652baf788d2dfa6d2839a0ead0b3ff69ce2f9c4bdd1"
+checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -3586,9 +3446,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.13.2"
+version = "5.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bbd5a90dbe8feee5b13def448427ae314ccd26a49cac47905cafefb9ff846f1"
+checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -3638,9 +3498,9 @@ checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
 
 [[package]]
 name = "zvariant"
-version = "5.9.2"
+version = "5.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b64ef4f40c7951337ddc7023dd03528a57a3ce3408ee9da5e948bd29b232c4"
+checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b"
 dependencies = [
  "endi",
  "enumflags2",
@@ -3652,9 +3512,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.9.2"
+version = "5.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "484d5d975eb7afb52cc6b929c13d3719a20ad650fea4120e6310de3fc55e415c"
+checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/pkgs/by-name/ca/camilladsp/package.nix b/pkgs/by-name/ca/camilladsp/package.nix
index e9c0ec4bdedd..ad7fda83b157 100644
--- a/pkgs/by-name/ca/camilladsp/package.nix
+++ b/pkgs/by-name/ca/camilladsp/package.nix
@@ -12,13 +12,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "camilladsp";
-  version = "4.0.1";
+  version = "4.1.3";
 
   src = fetchFromGitHub {
     owner = "HEnquist";
     repo = "camilladsp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PedaOmrvvE9Kxux0XwwDJfKq0fncsV/sUzZhnAp++DM=";
+    hash = "sha256-/OnD607xSPXM4AjVOZjaZQJpo7Q847Z8mq6elHmEwAU=";
   };
 
   cargoLock = {
diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix
index ddcaa2e1428c..e7a3f9c9ab08 100644
--- a/pkgs/by-name/ca/camunda-modeler/package.nix
+++ b/pkgs/by-name/ca/camunda-modeler/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "camunda-modeler";
-  version = "5.46.0";
+  version = "5.46.1";
 
   src = fetchurl {
     url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
-    hash = "sha256-uDZYy+Lkvc5YdIdn84l8QbNPcU5EQzOqTTdTezgCudw=";
+    hash = "sha256-uB+EAZgpll81RifNjKp9AkPLupbDLYHG+zFj0atsXRA=";
   };
   sourceRoot = "camunda-modeler-${version}-linux-x64";
 
diff --git a/pkgs/by-name/ca/cantus/package.nix b/pkgs/by-name/ca/cantus/package.nix
index 1850cd0f684c..8efe5ba30b2a 100644
--- a/pkgs/by-name/ca/cantus/package.nix
+++ b/pkgs/by-name/ca/cantus/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cantus";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "CodedNil";
     repo = "cantus";
     tag = finalAttrs.version;
-    hash = "sha256-pnc/fjmi932tZQsAfvvAoZ1PXEP8gckGuauR+5btei8=";
+    hash = "sha256-4bnIYOHVOPawDg4s5mPKYXURpDSVgyTmoh1WiGj/Zl8=";
   };
 
-  cargoHash = "sha256-sDZF5cWlhsBblAe0sreGbfgXKIip5raM0r9ZeJrLrLQ=";
+  cargoHash = "sha256-TbbXZGToQTH0k6KxpCsjcG/kOFY0c4L/P8QUpDyQ+2E=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix
index 8eed8a8dbdbb..4e60813d2ec8 100644
--- a/pkgs/by-name/ca/cargo-codspeed/package.nix
+++ b/pkgs/by-name/ca/cargo-codspeed/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-codspeed";
-  version = "4.5.0";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "CodSpeedHQ";
     repo = "codspeed-rust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2xKTn+fiRyXyH6womZPJoSpBC7nMH9+rBuoZrWL2kQU=";
+    hash = "sha256-Hfqh9kKTiRTWhKbsdXAK/DqBeAKxXQaYdWoZN55lcLo=";
   };
 
-  cargoHash = "sha256-jN70cNOYLPtIPEji2JF8r/6zphvekRc9y0UNR3xNAUo=";
+  cargoHash = "sha256-ix8Q+GbazKC5HIIUUVYjLTlufOQLxppqmVGznbTAXEI=";
 
   nativeBuildInputs = [
     curl
diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix
index 5b6598c3315a..a953746ad78d 100644
--- a/pkgs/by-name/ca/cargo-deb/package.nix
+++ b/pkgs/by-name/ca/cargo-deb/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-deb";
-  version = "3.6.3";
+  version = "3.6.4";
 
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = "cargo-deb";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-qYLJNhxBfSopfaNEh9FnKoKdq1Uu8nfWPOhpqzQH288=";
+    hash = "sha256-De4ouk+tub/sDSoIuEaoWYd9qjpLDA05xvuuQlaHF6M=";
   };
 
-  cargoHash = "sha256-VC116dm4XeR8ofvP3H0R5LiZOMqlUPpVGzZvTc9DhDk=";
+  cargoHash = "sha256-jac3VFOCeYKuedFHt4lEfBHlErHdfczRF6Mrs8Se88o=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/ca/cargo-docset/package.nix b/pkgs/by-name/ca/cargo-docset/package.nix
index 50c2bb71a1a3..2d9e7a091734 100644
--- a/pkgs/by-name/ca/cargo-docset/package.nix
+++ b/pkgs/by-name/ca/cargo-docset/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cargo subcommand to generate a Dash/Zeal docset for your Rust packages";
     mainProgram = "cargo-docset";
     homepage = "https://github.com/Robzz/cargo-docset";
-    changelog = "https://github.com/Robzz/cargo-docset/blob/${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/Robzz/cargo-docset/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       colinsane
diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix
index e80003a235b7..f851fb4bfe35 100644
--- a/pkgs/by-name/ca/cargo-edit/package.nix
+++ b/pkgs/by-name/ca/cargo-edit/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-edit";
-  version = "0.13.9";
+  version = "0.13.10";
 
   src = fetchFromGitHub {
     owner = "killercup";
     repo = "cargo-edit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8cl7Ev4G3w8UZltP4GnoZs2SWChVipePtUezavmftso=";
+    hash = "sha256-9CmbOIRHgYlc/bAN8BS5NyzfgRIzyneh/LC/sZFZUuo=";
   };
 
-  cargoHash = "sha256-CDrTVl7XQIpuEQc8WdVkzVMk1vHw0H0YOpQQsvQcczU=";
+  cargoHash = "sha256-O1tY0RVH4FHr7kWJ8+BUyD7LzzqlaObO0dHwrsX2biQ=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ca/cargo-info/package.nix b/pkgs/by-name/ca/cargo-info/package.nix
index 463564c1e890..f1257e14a907 100644
--- a/pkgs/by-name/ca/cargo-info/package.nix
+++ b/pkgs/by-name/ca/cargo-info/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Cargo subcommand to show crates info from crates.io";
     mainProgram = "cargo-info";
     homepage = "https://gitlab.com/imp/cargo-info";
-    changelog = "https://gitlab.com/imp/cargo-info/-/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://gitlab.com/imp/cargo-info/-/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = with lib.licenses; [
       mit
       asl20
diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix
index 52119f73c8d3..b1de6de9da8b 100644
--- a/pkgs/by-name/ca/cargo-mobile2/package.nix
+++ b/pkgs/by-name/ca/cargo-mobile2/package.nix
@@ -10,20 +10,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-mobile2";
-  version = "0.22.3";
+  version = "0.22.4";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "cargo-mobile2";
     rev = "cargo-mobile2-v${finalAttrs.version}";
-    hash = "sha256-rPLGh7/lGsmoidtr+UNrxzUgqtiHvkqZs2/la4L6zQM=";
+    hash = "sha256-DjoWjdgfNHLZkaWUjPq4tNrmHsifKKhBaRjK25WRdiE=";
   };
 
   # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
   # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
   # sourceRoot = "${src.name}/tooling/cli";
 
-  cargoHash = "sha256-ht9ofFa4H/Ux6a31vMNdKNhrX48yoYM1qAPoxCjude0=";
+  cargoHash = "sha256-m+9wPfheH9t7zxTsW7vHe4td/gyeC/nXFDHRGjK5XBg=";
 
   buildInputs = [ openssl ];
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix
index fb5fe7e22995..68b4db065e88 100644
--- a/pkgs/by-name/ca/cargo-public-api/package.nix
+++ b/pkgs/by-name/ca/cargo-public-api/package.nix
@@ -31,8 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations";
     mainProgram = "cargo-public-api";
-    homepage = "https://github.com/Enselic/cargo-public-api";
-    changelog = "https://github.com/Enselic/cargo-public-api/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/cargo-public-api/cargo-public-api";
+    changelog = "https://github.com/cargo-public-api/cargo-public-api/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index 01e4e49c080c..f4d6eed82599 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-show-asm";
-  version = "0.2.57";
+  version = "0.2.58";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-V4RCO+Nd8w3nd4ZeOOlyf6ApzVeZcGqzEMwzznTOtAE=";
+    hash = "sha256-WC6bAmvAYK0erGbzQ20uoezmbwkUxAMByeoHuYqJxsU=";
   };
 
-  cargoHash = "sha256-ObLN2NfMonQ6IkKN3tnwTuQFd4lSn7sC3QAtRr9ALcE=";
+  cargoHash = "sha256-IDCTjuTBxjzIh9M9k9I+DRO+zOMtkKwi6FbTiXFXMJo=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix
index ac8a29bf56fd..664b2660fb8f 100644
--- a/pkgs/by-name/ca/cargo-spellcheck/package.nix
+++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-spellcheck";
-  version = "0.15.5";
+  version = "0.15.7";
 
   src = fetchFromGitHub {
     owner = "drahnr";
     repo = "cargo-spellcheck";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-saRr1xEBefLoCgCxU/pyQOmmt/di+DOQHMoVc4LgRm0=";
+    hash = "sha256-tKf1PiQ1ojAbW+RKut+QczPy0wIfQcsthV4lRwvmjUw=";
   };
 
-  cargoHash = "sha256-MGjyoHejsUd6HCoZVlw1NDG6TE9Anh05IeObHmcnwg0=";
+  cargoHash = "sha256-0TsDcdO7qCVcj6eNVu/lcehwsO2IhpNzW1C9zLbXXJs=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix
index 6fe2eab2aa1b..e9b84a88192e 100644
--- a/pkgs/by-name/ca/cargo-typify/package.nix
+++ b/pkgs/by-name/ca/cargo-typify/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-typify";
-  version = "0.5.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "oxidecomputer";
     repo = "typify";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-czVxvsRhKnNnvPmONF+pTzZG1tizfCCbThgPhaI8TLo=";
+    hash = "sha256-tsZY+Ygh+9xOOAKcNh2U2k47o+uNAC2zguL+qW/wiqg=";
   };
 
-  cargoHash = "sha256-7z/gWIl2HqEkpRcWXZv6QQmLdJVJQfY7VCVP2ik5Mps=";
+  cargoHash = "sha256-K5Fj261Jh+NVipR71cYo5CqHx31czfgs6kr6uifHvaw=";
 
   nativeBuildInputs = [
     rustfmt
diff --git a/pkgs/by-name/ca/cargo-udeps/package.nix b/pkgs/by-name/ca/cargo-udeps/package.nix
index 13d6617b1e16..9cf38f94b344 100644
--- a/pkgs/by-name/ca/cargo-udeps/package.nix
+++ b/pkgs/by-name/ca/cargo-udeps/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-udeps";
-  version = "0.1.60";
+  version = "0.1.61";
 
   src = fetchFromGitHub {
     owner = "est31";
     repo = "cargo-udeps";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-NW9yjFUV+o7vv5bYD8nxSWHOXOBnDEk36xze90wYuNg=";
+    sha256 = "sha256-yT/EJWGGhQapbU1o1Gus1Vk5cAhso5ALTBecB3BH46g=";
   };
 
-  cargoHash = "sha256-vQvtc/CwV1aHeREzmzO8k1FcebbEp3FKMAJb0v2aQig=";
+  cargoHash = "sha256-DGfAsBucFRFJkjmJkpTpNfQO79jaNa5NezXKf7hYYeM=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index 6c4f49889b90..0cfaa744dda1 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-xwin";
-  version = "0.21.5";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "rust-cross";
     repo = "cargo-xwin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RgR0YBjgpk10IS62+/CdIbZ+7oSnkOC5npIqRrib6eU=";
+    hash = "sha256-lJu/TyzKDj0yHCP83ouc6e52E48taOTQ9WpWAiqUxl4=";
   };
 
-  cargoHash = "sha256-dJkfEPRyXFpMwqExvyimLMc+iOAby5yeEUpHt0MoQ6M=";
+  cargoHash = "sha256-k3PuEjiew012+m4RRVKNOdxKvFPWIxKHgG/SrBjM2WM=";
 
   meta = {
     description = "Cross compile Cargo project to Windows MSVC target with ease";
diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index eb93138b5b41..e525f11e5312 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-zigbuild";
-  version = "0.22.1";
+  version = "0.22.2";
 
   src = fetchFromGitHub {
-    owner = "messense";
+    owner = "rust-cross";
     repo = "cargo-zigbuild";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t96yIRfXLGN92xoygl32Q1rpsebySdOsrmkwQ5zH5xQ=";
+    hash = "sha256-kQnbein4NcZ8IpwCsw7hg+d+Dlg1HChnjXp3lWzECrA=";
   };
 
-  cargoHash = "sha256-HOzkO81xVcKwe4ySe1IkOYcX5i1Un0mGNX7824/eh0k=";
+  cargoHash = "sha256-QUE7rNPe0eYPSA2Dd1pSsCz2B+ZLaZBZ+psEwTMdsZ0=";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -37,8 +37,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Tool to compile Cargo projects with zig as the linker";
     mainProgram = "cargo-zigbuild";
-    homepage = "https://github.com/messense/cargo-zigbuild";
-    changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/rust-cross/cargo-zigbuild";
+    changelog = "https://github.com/rust-cross/cargo-zigbuild/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.progrm_jarvis ];
   };
diff --git a/pkgs/by-name/ca/carps-cups/package.nix b/pkgs/by-name/ca/carps-cups/package.nix
index 15d52616d8ec..efed07a5e156 100644
--- a/pkgs/by-name/ca/carps-cups/package.nix
+++ b/pkgs/by-name/ca/carps-cups/package.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation {
     description = "CUPS Linux drivers for Canon printers";
     homepage = "https://www.canon.com/";
     license = lib.licenses.gpl3Plus;
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = with lib.maintainers; [
       ewok
     ];
diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix
index 225b92cb0df5..c0d5f073b634 100644
--- a/pkgs/by-name/ca/cartridges/package.nix
+++ b/pkgs/by-name/ca/cartridges/package.nix
@@ -83,7 +83,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       You can sort and hide games or download cover art from SteamGridDB.
     '';
     homepage = "https://apps.gnome.org/Cartridges/";
-    changelog = "https://github.com/kra-mo/cartridges/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/kra-mo/cartridges/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     teams = [ lib.teams.gnome-circle ];
     mainProgram = "cartridges";
diff --git a/pkgs/by-name/ca/castget/package.nix b/pkgs/by-name/ca/castget/package.nix
index 11c3b63a416a..ea63f33a8c38 100644
--- a/pkgs/by-name/ca/castget/package.nix
+++ b/pkgs/by-name/ca/castget/package.nix
@@ -19,14 +19,14 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "castget";
   # Using unstable version since it doesn't require `ronn`, see:
-  # https://github.com/mlj/castget/commit/e97b179227b4fc7e2e2bc5a373933624c0467daa
-  version = "2.0.1-unstable-2025-01-25";
+  # https://github.com/mlj/castget/commit/218734296e2efc53071e0dbd3c4d59930b571aae
+  version = "2.0.1-unstable-2026-02-04";
 
   src = fetchFromGitHub {
     owner = "mlj";
     repo = "castget";
-    rev = "e97b179227b4fc7e2e2bc5a373933624c0467daa";
-    hash = "sha256-3t/N8JO36wjHuzIdWNstRWphC/ZR6KkZX0l9yKarS7c=";
+    rev = "218734296e2efc53071e0dbd3c4d59930b571aae";
+    hash = "sha256-GEfsGOTBkorPWLGP3eNbuiGFwDUgb4Gu6ykyS3/RNOg=";
   };
 
   # without this, the build fails because of an encoding issue with the manual page.
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
       primarily intended for automatic, unattended downloading of podcasts.
     '';
     homepage = "https://castget.johndal.com/";
-    changelog = "https://github.com/mlj/castget/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mlj/castget/blob/${finalAttrs.src.rev}/CHANGES.md";
     maintainers = with lib.maintainers; [ doronbehar ];
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ca/catch2_3/package.nix b/pkgs/by-name/ca/catch2_3/package.nix
index dcb6c7bcf2ed..525a410dbcba 100644
--- a/pkgs/by-name/ca/catch2_3/package.nix
+++ b/pkgs/by-name/ca/catch2_3/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "3.13.0";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     tag = "v${version}";
-    hash = "sha256-WKp6/NX1SQJFLijW/fKwbR1FRoboAklDiHT6WqPRBjw=";
+    hash = "sha256-tegAa+cNF7pJcW33B+VZ86ZlDG7dwS3o6QnN/XvTI2A=";
   };
 
   patches = lib.optionals stdenv.cc.isClang [
diff --git a/pkgs/by-name/ca/catppuccin-hyprland/package.nix b/pkgs/by-name/ca/catppuccin-hyprland/package.nix
new file mode 100644
index 000000000000..7739a58a7631
--- /dev/null
+++ b/pkgs/by-name/ca/catppuccin-hyprland/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "catppuccin-hyprland";
+  version = "1.3";
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "hyprland";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jkk021LLjCLpWOaInzO4Klg6UOR4Sh5IcKdUxIn7Dis=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/themes
+    cp -rva $src/themes $out/share/themes/catppuccin-hyprland-themes
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Soothing pastel theme for Hyprland";
+    homepage = "https://github.com/catppuccin/hyprland";
+    changelog = "https://github.com/catppuccin/hyprland/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ElSebas41 ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/ca/catppuccin-plymouth/package.nix b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
index e5bbddad6fe5..d3890431bbdf 100644
--- a/pkgs/by-name/ca/catppuccin-plymouth/package.nix
+++ b/pkgs/by-name/ca/catppuccin-plymouth/package.nix
@@ -19,13 +19,13 @@ assert lib.assertOneOf "${pname}: color variant" variant validVariants;
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   inherit pname;
-  version = "0-unstable-2026-02-18";
+  version = "0-unstable-2026-04-28";
 
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "plymouth";
-    rev = "da38011d25f6f36152f2409372dfadb11c8f047c";
-    hash = "sha256-3JK4lX2ZmxysITDEEkhBLkyINUeCzvu5nUgrpvWZ+ZE=";
+    rev = "198eba2071d80e4a23b8f51a5859e8f4acf8de6c";
+    hash = "sha256-2hGe8VOj1EhpwX51q8AcTfuVBByEHskBj89FX5YZqXc=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/themes/catppuccin-${variant}";
diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix
index ca8059681e24..ee3d677c0063 100644
--- a/pkgs/by-name/cb/cbmc/package.nix
+++ b/pkgs/by-name/cb/cbmc/package.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     mv $out/bin/ls_parse.py $out/share/cbmc/ls_parse.py
     chmod +x $out/share/cbmc/ls_parse.py
     wrapProgram $out/bin/goto-cc \
-      --prefix PATH : "$out/share/cbmc" \
+      --prefix PATH : "$out/share/cbmc"
   '';
 
   env.NIX_CFLAGS_COMPILE = toString (
diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix
index 41a6e1a16c37..48febc80e4fa 100644
--- a/pkgs/by-name/cc/ccache/package.nix
+++ b/pkgs/by-name/cc/ccache/package.nix
@@ -9,7 +9,7 @@
   perl,
   fmt,
   hiredis,
-  xxHash,
+  xxhash,
   zstd,
   bashInteractive,
   doctest,
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fmt
     hiredis
-    xxHash
+    xxhash
     zstd
   ];
 
diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix
index 858252ad7350..b38085055e32 100644
--- a/pkgs/by-name/cd/cdk8s-cli/package.nix
+++ b/pkgs/by-name/cd/cdk8s-cli/package.nix
@@ -12,18 +12,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cdk8s-cli";
-  version = "2.206.3";
+  version = "2.206.7";
 
   src = fetchFromGitHub {
     owner = "cdk8s-team";
     repo = "cdk8s-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ezxwAhSxDSmP4DhT4vF8nuO+TcnWgLk5szJb3RIv1xg=";
+    hash = "sha256-DdGowXfYJqCDqsNl+CDD2rqFZoPRJQrnfdfzmRb3W4A=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-fkG7gre4OOpoZf/vQAJU0Lnbl7eDsgZy0H/+4C7aWvI=";
+    hash = "sha256-I4gcymDvMlP0WcyNafbHvZAAJbN/9Z8+wM7mauFRuM0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index bd8a3b1a0844..08b9776cd476 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cdncheck";
-  version = "1.2.31";
+  version = "1.2.33";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IHImxkPuid5dALQ6YUf0eYHs4AlV5vF+w7xQXw+z05o=";
+    hash = "sha256-K7cLmNGTVv5Y5kxmqd2+iyj/mmGNdvq3QskDQLMgUUk=";
   };
 
-  vendorHash = "sha256-z/wOCtd39ENUe8WQUst4uhl8R6RwCDdcUC4OZcRJWSs=";
+  vendorHash = "sha256-aolS1mhIM8/fOeHeLQgiS8z/zO++U+36Th7wNpKlkFU=";
 
   subPackages = [ "cmd/cdncheck/" ];
 
diff --git a/pkgs/by-name/cd/cdrdao/package.nix b/pkgs/by-name/cd/cdrdao/package.nix
index ca316c70d5a9..7267728d18ab 100644
--- a/pkgs/by-name/cd/cdrdao/package.nix
+++ b/pkgs/by-name/cd/cdrdao/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   autoreconfHook,
   pkg-config,
   libiconv,
@@ -40,6 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
     libao
   ];
 
+  env = {
+    am_cv_func_iconv_works = "yes";
+  };
+
   hardeningDisable = [ "format" ];
 
   # we have glibc/include/linux as a symlink to the kernel headers,
diff --git a/pkgs/by-name/ce/censor/package.nix b/pkgs/by-name/ce/censor/package.nix
index 605ae0c26b8b..5b7b03b6ff40 100644
--- a/pkgs/by-name/ce/censor/package.nix
+++ b/pkgs/by-name/ce/censor/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "censor";
-  version = "0.7.0";
+  version = "0.7.1";
   pyproject = false;
 
   src = fetchFromCodeberg {
     owner = "censor";
     repo = "Censor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ALWctGCV1ttocbjD+F1cV9kMnb/WfWXYzv96j+KAhmk=";
+    hash = "sha256-wimLSoejojVBdHnuzLxOW4QssJZpK0GTp64oIvtSqBk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix
index e8940b342260..41a1bf48b1f0 100644
--- a/pkgs/by-name/ce/ceph-csi/package.nix
+++ b/pkgs/by-name/ce/ceph-csi/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ceph-csi";
-  version = "3.16.1";
+  version = "3.16.2";
 
   src = fetchFromGitHub {
     owner = "ceph";
     repo = "ceph-csi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dp/dSZG+kaX2S78KxreSNERZJ2BmF0oSknA62U9UT78=";
+    hash = "sha256-jdBBRSkmNgwYzNUDY9Aarp0HNHsUcSNkZD+Fvv8drHQ=";
   };
 
   preConfigure = ''
diff --git a/pkgs/by-name/ce/cerberus/package.nix b/pkgs/by-name/ce/cerberus/package.nix
index f7eaddb31a2f..30c336a6f779 100644
--- a/pkgs/by-name/ce/cerberus/package.nix
+++ b/pkgs/by-name/ce/cerberus/package.nix
@@ -3,7 +3,6 @@
   fetchpatch,
   fetchFromGitHub,
   ocamlPackages,
-  opam,
   makeBinaryWrapper,
   writableTmpDirAsHomeHook,
   unstableGitUpdater,
@@ -95,7 +94,9 @@ ocamlPackages.buildDunePackage (finalAttrs: {
   installCheckPhase = ''
     runHook preInstallCheck
 
+    # Bypass `dune exec` so its stderr warnings don't pollute test output.
     PATH="$out/bin":$PATH
+    export WITH_CERB=cerberus
 
     patchShebangs --build tests
 
diff --git a/pkgs/by-name/cf/cfitsio/cfitsio-pc-cmake.patch b/pkgs/by-name/cf/cfitsio/cfitsio-pc-cmake.patch
deleted file mode 100644
index 4a3bdb81f246..000000000000
--- a/pkgs/by-name/cf/cfitsio/cfitsio-pc-cmake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cfitsio.pc.cmake b/cfitsio.pc.cmake
-index 949b80e..6ffcaa6 100644
---- a/cfitsio.pc.cmake
-+++ b/cfitsio.pc.cmake
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
--includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+libdir="@CMAKE_INSTALL_FULL_LIBDIR@"
-+includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@"
- 
- Name: cfitsio
- Description: FITS File Subroutine Library
diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix
index e26469e27af1..fea31a4e330d 100644
--- a/pkgs/by-name/cf/cfitsio/package.nix
+++ b/pkgs/by-name/cf/cfitsio/package.nix
@@ -11,24 +11,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cfitsio";
-  version = "4.6.3";
+  version = "4.6.4";
 
   src = fetchFromGitHub {
     owner = "HEASARC";
     repo = "cfitsio";
     tag = "cfitsio-${finalAttrs.version}";
-    hash = "sha256-nKxX3YNRJZpmcP8/0O2pMsYjcH6vzAWMpqaHYO+HoUo=";
+    hash = "sha256-8AFPTr8j8f+x1h78IXOV8GHkDPWvI8w8aRxyke3Dras=";
   };
 
   outputs = [
     "bin"
     "dev"
     "out"
-    "doc"
-  ];
-
-  patches = [
-    ./cfitsio-pc-cmake.patch
   ];
 
   nativeBuildInputs = [
@@ -68,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
   # Fixup installation
   # Remove installed test tools and benchmark
   postInstall = ''
-    install -Dm644 -t "$out/share/doc/${finalAttrs.pname}" ../docs/*.pdf
     rm "$out/bin/cookbook"
     rmdir "$out/bin"
     rm "$bin/bin/smem" "$bin/bin/speed"
diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix
index 3e00f1af14a5..ad27f086988e 100644
--- a/pkgs/by-name/ch/chainsaw/package.nix
+++ b/pkgs/by-name/ch/chainsaw/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chainsaw";
-  version = "2.14.1";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "WithSecureLabs";
     repo = "chainsaw";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M+gHsh4u5CEZndMn5sUFk/69ojyaL2AftF8Ao0mKmtY=";
+    hash = "sha256-FsetcuVl1JHkVy4Haal6e16NLQz+zS9mFyqH65Qr5zU=";
   };
 
-  cargoHash = "sha256-NFyo6elDsqjFI4Kr9BG2ppM8DXictY+N+D3G5+89TJU=";
+  cargoHash = "sha256-UumlqHRssy401iiZSMq5N5r8a2f6ZLoqPuyBoDHPxYg=";
 
   ldflags = [
     "-w"
diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix
index ac1ff7f2612f..bf64bc06717b 100644
--- a/pkgs/by-name/ch/chameleon-cli/package.nix
+++ b/pkgs/by-name/ch/chameleon-cli/package.nix
@@ -23,14 +23,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chameleon-cli";
-  version = "2.1.0-unstable-2026-04-06";
+  version = "2.1.0-unstable-2026-04-19";
 
   src = fetchFromGitHub {
     owner = "RfidResearchGroup";
     repo = "ChameleonUltra";
-    rev = "93c1e150ab17b81cec40639fea7e88b1920e2c95";
+    rev = "75eb389fe97a18b5ba6c8754cdfa0ec716a2dcf1";
     rootDir = "software";
-    hash = "sha256-5yxXmKRBNmmJgiA2E3gUmGRgPZpO/CRFlMw5YFCFUUs=";
+    hash = "sha256-RnP+j6ZZxE167Xr6C0Hs/d6zV8jjQUyI91Ya8JVMrcs=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix
index 54d3dfdd81e3..8e0df74d5cc1 100644
--- a/pkgs/by-name/ch/chatzone-desktop/package.nix
+++ b/pkgs/by-name/ch/chatzone-desktop/package.nix
@@ -10,10 +10,10 @@
 
 let
   pname = "chatzone-desktop";
-  version = "5.6.0";
+  version = "5.6.1";
   src = fetchurl {
-    url = "https://ir.ozone.ru/s3/chatzone-clients/ci/5.6.0/1111/chatzone-desktop-linux-5.6.0.AppImage";
-    hash = "sha256-cMXdCXYUpgdmZntKS4YOLSJ84VVx7O83Kxa3jM+AWvI=";
+    url = "https://ir.ozone.ru/s3/chatzone-clients/ci/5.6.1/1159/chatzone-desktop-linux-5.6.1.AppImage";
+    hash = "sha256-fLwkroco9cwNoDXPB+9Qu0qRXDE36zaF8MPjHonRbfk=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in
diff --git a/pkgs/by-name/ch/checkip/package.nix b/pkgs/by-name/ch/checkip/package.nix
index fbb27510b86e..8875fe80c0fe 100644
--- a/pkgs/by-name/ch/checkip/package.nix
+++ b/pkgs/by-name/ch/checkip/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "checkip";
-  version = "0.50.0";
+  version = "0.53.0";
 
   src = fetchFromGitHub {
     owner = "jreisinger";
     repo = "checkip";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tf/PqMAOlFJrUFg5yPdARY8zTh/SjlNHp2LAX9f7QqM=";
+    hash = "sha256-n8TsbuaTsPC8CdWaUshCl4ILYJ6lkqfhFb52RGIl/f0=";
   };
 
   vendorHash = "sha256-5sUBrzo6wJfaMMvgNflcjB2QNSIeaD2TN7qBao53NFs=";
diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index b1e76369c259..fdaed38998d0 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -35,14 +35,14 @@ let
 in
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "checkov";
-  version = "3.2.521";
+  version = "3.2.525";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = finalAttrs.version;
-    hash = "sha256-xRVA5VPDevdq4LIcJRl/fbCn9iZA+pnw2hvDfHi0MIo=";
+    hash = "sha256-IphJb4D9xSddvyXRKYoZZD5qRi7dAccWQJCaLnWEwDs=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix
index 09dc613976e2..a08cd28522cc 100644
--- a/pkgs/by-name/ch/checkpwn/package.nix
+++ b/pkgs/by-name/ch/checkpwn/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "checkpwn";
-  version = "0.5.6";
+  version = "0.6.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-M0Jb+8rKn4KVuumNSsM6JEbSOoBOFy9mmXiCnUnDgak=";
+    hash = "sha256-RX3DCcCrZqv4REg+KGHOAXva8ta1PwvlXtS9MTFSlRo=";
   };
 
-  cargoHash = "sha256-8ALu1Ij4o2fdsRWhlWu6rOIfHZjIIC+fHJ07XIbH66s=";
+  cargoHash = "sha256-YIQbGOkW51KsO6vdqm8w1z4UDBmkpCUbvRIViE0a0KQ=";
 
   # requires internet access
   checkFlags = [
diff --git a/pkgs/by-name/ch/chef-cli/Gemfile.lock b/pkgs/by-name/ch/chef-cli/Gemfile.lock
index 2b7ee611977c..16e3fedfe345 100644
--- a/pkgs/by-name/ch/chef-cli/Gemfile.lock
+++ b/pkgs/by-name/ch/chef-cli/Gemfile.lock
@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.8)
+    addressable (2.8.10)
       public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1213.0)
-    aws-sdk-core (3.242.0)
+    aws-partitions (1.1241.0)
+    aws-sdk-core (3.246.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -14,61 +14,68 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.121.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.213.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-s3 (1.220.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-secretsmanager (1.128.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-secretsmanager (1.129.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.3.0)
+    bcrypt_pbkdf (1.1.2)
     benchmark (0.5.0)
-    bigdecimal (4.0.1)
+    bigdecimal (4.1.2)
     builder (3.3.0)
-    chef (18.3.0)
+    chef (19.2.12)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.3.0)
-      chef-utils (= 18.3.0)
+      bcrypt_pbkdf (~> 1.0)
+      chef-config (= 19.2.12)
+      chef-licensing (~> 1.3)
+      chef-utils (= 19.2.12)
       chef-vault
-      chef-zero (>= 14.0.11)
+      chef-zero (~> 15.1.0)
       corefoundation (~> 0.3.4)
-      diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
+      csv (~> 3.3.5)
+      diff-lcs (~> 1.6.0)
+      ed25519 (~> 1.2)
       erubis (~> 2.7)
-      ffi (>= 1.15.5)
+      ffi (>= 1.15.5, < 1.18.0)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       iniparse (~> 1.4)
-      inspec-core (>= 5)
+      inspec-core (~> 7.0.107)
       license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
-      mixlib-shellout (>= 3.1.1, < 4.0)
+      mixlib-shellout (~> 3.3.8)
       net-ftp
       net-sftp (>= 2.1.2, < 5.0)
-      ohai (~> 18.0)
+      ohai (~> 19.0)
       plist (~> 3.2)
       proxifier2 (~> 1.1)
+      syslog
       syslog-logger (~> 1.6)
-      train-core (~> 3.10)
+      train-core (~> 3.13, >= 3.13.4)
       train-rest (>= 0.4.1)
-      train-winrm (>= 0.2.5)
-      unf_ext (>= 0.0.8.2)
-      uuidtools (>= 2.1.5, < 3.0)
-      vault (~> 0.16)
-    chef-cli (5.6.23)
+      train-winrm (>= 0.2.17)
+      unf_ext (~> 0.0.9.1)
+      uri (~> 1.0.4)
+      vault (~> 0.18.2)
+    chef-cli (6.1.29)
       addressable (>= 2.3.5, < 2.9)
-      chef (~> 18.0)
+      chef (>= 18.0, < 20.0)
+      chef-licensing (~> 1.0)
       cookbook-omnifetch (~> 0.5)
-      diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
+      diff-lcs (~> 1.6)
       ffi-yajl (>= 1.0, < 3.0)
       license-acceptance (>= 1.0.11, < 3)
       minitar (~> 1.0)
@@ -76,17 +83,19 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       pastel (~> 0.7)
       solve (> 2.0, < 5.0)
-    chef-config (18.3.0)
+      syslog (~> 0.3)
+    chef-config (19.2.12)
       addressable
-      chef-utils (= 18.3.0)
+      chef-utils (= 19.2.12)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
+      racc
       tomlrb (~> 1.2)
     chef-gyoku (1.5.0)
       builder (>= 2.1.2)
       rexml (~> 3.4)
-    chef-licensing (1.4.0)
+    chef-licensing (1.4.1)
       chef-config (>= 15)
       faraday (>= 1, < 3)
       faraday-http-cache
@@ -98,9 +107,9 @@ GEM
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (18.3.0)
+    chef-utils (19.2.12)
       concurrent-ruby
-    chef-vault (4.2.5)
+    chef-vault (4.2.9)
       syslog (~> 0.3)
     chef-winrm (2.5.0)
       builder (>= 2.1.2)
@@ -134,17 +143,17 @@ GEM
       webrick
     coderay (1.1.3)
     concurrent-ruby (1.3.6)
-    connection_pool (2.5.5)
     cookbook-omnifetch (0.12.2)
       mixlib-archive (>= 0.4, < 2.0)
-    cookstyle (8.5.3)
-      rubocop (= 1.81.7)
+    cookstyle (8.6.10)
+      rubocop (= 1.84.2)
     corefoundation (0.3.13)
       ffi (>= 1.15.0)
     csv (3.3.5)
     date (3.5.1)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.2)
     domain_name (0.6.20240107)
+    ed25519 (1.4.0)
     erubi (1.13.1)
     erubis (2.7.0)
     faraday (2.14.1)
@@ -153,11 +162,11 @@ GEM
       logger
     faraday-follow_redirects (0.5.0)
       faraday (>= 1, < 3)
-    faraday-http-cache (2.6.1)
+    faraday-http-cache (2.7.0)
       faraday (>= 0.8)
     faraday-net_http (3.4.2)
       net-http (~> 0.5)
-    ffi (1.17.3)
+    ffi (1.17.4)
     ffi-libarchive (1.1.14)
       ffi (~> 1.0)
     ffi-yajl (2.7.7)
@@ -169,12 +178,12 @@ GEM
     hashie (5.1.0)
       logger
     http-accept (1.7.0)
-    http-cookie (1.1.0)
+    http-cookie (1.1.6)
       domain_name (~> 0.5)
     httpclient (2.9.0)
       mutex_m
     iniparse (1.5.0)
-    inspec-core (7.0.95)
+    inspec-core (7.0.107)
       addressable (~> 2.4)
       chef-licensing (>= 1.2.0)
       chef-telemetry (~> 1.0, >= 1.0.8)
@@ -199,13 +208,13 @@ GEM
       syslog (~> 0.1)
       thor (>= 0.20, < 1.5.0)
       tomlrb (>= 1.3, < 2.1)
-      train-core (~> 3.13, >= 3.13.4)
+      train-core (~> 3.16, >= 3.16.1)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
     io-console (0.8.2)
     ipaddress (0.8.3)
     jmespath (1.6.2)
-    json (2.18.1)
+    json (2.19.4)
     language_server-protocol (3.17.0.5)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
@@ -223,7 +232,7 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2026.0203)
+    mime-types-data (3.2026.0414)
     minitar (1.1.0)
     mixlib-archive (1.3.3)
       mixlib-log
@@ -233,10 +242,10 @@ GEM
       tomlrb
     mixlib-log (3.2.3)
       ffi (>= 1.15.5)
-    mixlib-shellout (3.4.10)
+    mixlib-shellout (3.3.9)
       chef-utils
     molinillo (0.8.0)
-    multi_json (1.19.1)
+    multi_json (1.20.1)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     net-ftp (0.3.9)
@@ -244,34 +253,33 @@ GEM
       time
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-http-persistent (4.0.8)
-      connection_pool (>= 2.2.4, < 4)
     net-protocol (0.2.2)
       timeout
     net-scp (4.1.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
-    net-ssh (7.3.0)
+    net-ssh (7.3.2)
     netrc (0.11.0)
     nori (2.7.1)
       bigdecimal
-    ohai (18.1.18)
-      chef-config (>= 14.12, < 19)
-      chef-utils (>= 16.0, < 19)
-      ffi (~> 1.9)
+    ohai (19.1.24)
+      base64
+      chef-config (>= 14.12, < 20)
+      chef-utils (>= 16.0, < 20)
+      ffi (>= 1.15.5)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli (>= 1.7.0)
       mixlib-config (>= 2.0, < 4.0)
       mixlib-log (>= 2.0.1, < 4.0)
-      mixlib-shellout (~> 3.2, >= 3.2.5)
+      mixlib-shellout (~> 3.3.6)
       plist (~> 3.1)
       train-core
       wmi-lite (~> 1.0)
     ostruct (0.6.3)
-    parallel (1.27.0)
-    parser (3.3.10.1)
+    parallel (1.28.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -285,13 +293,13 @@ GEM
       method_source (~> 1.0)
       reline (>= 0.6.0)
     pstore (0.1.4)
-    public_suffix (7.0.2)
+    public_suffix (7.0.5)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.6)
     rackup (2.3.1)
       rack (>= 3)
     rainbow (3.1.1)
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     rest-client (2.1.0)
@@ -312,11 +320,11 @@ GEM
     rspec-its (2.0.0)
       rspec-core (>= 3.13.0)
       rspec-expectations (>= 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.81.7)
+    rubocop (1.84.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -324,10 +332,10 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     ruby-progressbar (1.13.0)
@@ -351,12 +359,12 @@ GEM
     thor (1.4.0)
     time (0.4.2)
       date
-    timeout (0.6.0)
+    timeout (0.6.1)
     tomlrb (1.3.0)
-    train-core (3.16.1)
+    train-core (3.16.2)
       addressable (~> 2.5)
       ffi (>= 1.16.0, < 1.18)
-      json (>= 1.8, < 3.0)
+      json (>= 2.19.2, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 5.0)
       net-ssh (>= 2.9, < 8.0)
@@ -392,13 +400,10 @@ GEM
     unf_ext (0.0.9.1)
     unicode-display_width (2.6.0)
     unicode_utils (1.4.0)
-    uri (1.1.1)
+    uri (1.0.4)
     uuidtools (2.2.0)
-    vault (0.20.0)
+    vault (0.18.2)
       aws-sigv4
-      base64
-      connection_pool (~> 2.4)
-      net-http-persistent (~> 4.0, >= 4.0.2)
     webrick (1.9.2)
     wisper (2.0.1)
     wmi-lite (1.0.7)
diff --git a/pkgs/by-name/ch/chef-cli/gemset.nix b/pkgs/by-name/ch/chef-cli/gemset.nix
index 8be40dbcc7c5..9a7e200c42d9 100644
--- a/pkgs/by-name/ch/chef-cli/gemset.nix
+++ b/pkgs/by-name/ch/chef-cli/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw";
+      sha256 = "031lb8jq55dxb5qiknzffl7nniqfmrc4603ggxqipnxywwp5ca6a";
       type = "gem";
     };
-    version = "2.8.8";
+    version = "2.8.10";
   };
   ast = {
     groups = [ "default" ];
@@ -35,10 +35,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pp0sagj31zvmv8ca0hf0kgdfb7wwkq733sv2812gvs43pck5hay";
+      sha256 = "1gkc08r1s7mvinl7301rahylj3z7myypdbkpvj5jwy72bm1zq3nd";
       type = "gem";
     };
-    version = "1.1213.0";
+    version = "1.1241.0";
   };
   aws-sdk-core = {
     dependencies = [
@@ -54,10 +54,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1819b99lgs3i637j2y6f95vlsppw3id2hys3m30q13f7mh1k0yy1";
+      sha256 = "1k6xqkipjli9vl40d4wqxcl7035lav9f9hnczilhwmj8i7n68f1r";
       type = "gem";
     };
-    version = "3.242.0";
+    version = "3.246.0";
   };
   aws-sdk-kms = {
     dependencies = [
@@ -68,10 +68,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1q015l5gm3f230jz9l6si9s3hlw7ra76q8biqvxlwxdmnk7w2qym";
+      sha256 = "080zh4g1lcjl0bz2l0gjm8vmpd60cvi0p658bh235ypqh9zg61fl";
       type = "gem";
     };
-    version = "1.121.0";
+    version = "1.123.0";
   };
   aws-sdk-s3 = {
     dependencies = [
@@ -83,10 +83,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03g5k3jl0sgp60ppmxa267qflxlj174mrs8hnrnl10j5ak7nqndg";
+      sha256 = "0z4cl87lbyw9qgp1l52sbjnysw63zmxih9wfhjfdvv67d9gdlzr3";
       type = "gem";
     };
-    version = "1.213.0";
+    version = "1.220.0";
   };
   aws-sdk-secretsmanager = {
     dependencies = [
@@ -97,10 +97,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16ib5p04fk66qr2vfps0qr340ld5xb5dsypbdii9f40n6hfxwb6n";
+      sha256 = "0m69f1jghxlixd4b5wb2dsp38dly7nxm5si1klnajv89m23mqi00";
       type = "gem";
     };
-    version = "1.128.0";
+    version = "1.129.0";
   };
   aws-sigv4 = {
     dependencies = [ "aws-eventstream" ];
@@ -123,6 +123,16 @@
     };
     version = "0.3.0";
   };
+  bcrypt_pbkdf = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1xjcp484qc4j4z42b087npgj50sd6yixchznp4z9p1k6rqilqhf2";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
   benchmark = {
     groups = [ "default" ];
     platforms = [ ];
@@ -138,10 +148,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19y406nx17arzsbc515mjmr6k5p59afprspa1k423yd9cp8d61wb";
+      sha256 = "1g9zi8c4i7g8zz0c3hxrw6mblrjvgn7akys60clb9si7c1k1gljk";
       type = "gem";
     };
-    version = "4.0.1";
+    version = "4.1.2";
   };
   builder = {
     groups = [ "default" ];
@@ -158,12 +168,16 @@
       "addressable"
       "aws-sdk-s3"
       "aws-sdk-secretsmanager"
+      "bcrypt_pbkdf"
       "chef-config"
+      "chef-licensing"
       "chef-utils"
       "chef-vault"
       "chef-zero"
       "corefoundation"
+      "csv"
       "diff-lcs"
+      "ed25519"
       "erubis"
       "ffi"
       "ffi-libarchive"
@@ -181,27 +195,29 @@
       "ohai"
       "plist"
       "proxifier2"
+      "syslog"
       "syslog-logger"
       "train-core"
       "train-rest"
       "train-winrm"
       "unf_ext"
-      "uuidtools"
+      "uri"
       "vault"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1iafkrjiwkrv3mn420byr96y3g8ik4bqbfms3yqvhyfjx1c2z6fz";
+      sha256 = "1iqg9vk9h40szvn1y5z1n1xs02l5n2bw5sahas2mx5ira2rs09d4";
       type = "gem";
     };
-    version = "18.3.0";
+    version = "19.2.12";
   };
   chef-cli = {
     dependencies = [
       "addressable"
       "chef"
+      "chef-licensing"
       "cookbook-omnifetch"
       "diff-lcs"
       "ffi-yajl"
@@ -211,15 +227,16 @@
       "mixlib-shellout"
       "pastel"
       "solve"
+      "syslog"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mx7scgzkzsz5z9fpzk7ccng7yjv45pjp705h386fzmj6gl2w1rg";
+      sha256 = "1x3n57wb0zxqij8gccp4ss34i3w2xnh3qqzf6cqgav806sb5pyrz";
       type = "gem";
     };
-    version = "5.6.23";
+    version = "6.1.29";
   };
   chef-config = {
     dependencies = [
@@ -228,16 +245,17 @@
       "fuzzyurl"
       "mixlib-config"
       "mixlib-shellout"
+      "racc"
       "tomlrb"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pvjf3qbb3apg9vdy4zykamm7801qz4m6256wjqn73fs87zs50y1";
+      sha256 = "0999pzgsypcy5wvr42p3iagl4c96glcwfk08vlpxrc05q4jqwf24";
       type = "gem";
     };
-    version = "18.3.0";
+    version = "19.2.12";
   };
   chef-gyoku = {
     dependencies = [
@@ -268,10 +286,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xwk8dq0rbzirfxksx5yxfzwwkslxqi4ym024ayf0kd60i88cxdz";
+      sha256 = "0snnw3b3h0fydbllkgfc6gv724rlg7pv8lr9q84c972aibdsxs7h";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.4.1";
   };
   chef-telemetry = {
     dependencies = [
@@ -293,10 +311,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0087jwhqslfm3ygj507dmmdp3k0589j5jl54mkwgbabbwan7lzw2";
+      sha256 = "17jkln8gnxymvppnsbhzjza4gbhwc52shhql3yl1cn5c0lpsf0hb";
       type = "gem";
     };
-    version = "18.3.0";
+    version = "19.2.12";
   };
   chef-vault = {
     dependencies = [ "syslog" ];
@@ -304,10 +322,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "021lnj0w1lmbf5r7b4yjh8xrdxqqwi9qpynzncnsfd7v75qppjg2";
+      sha256 = "0jv3mn4z650a8jbncyvz0sfb7kgwlz4rwhxw6k0f7q8m49p6mw7z";
       type = "gem";
     };
-    version = "4.2.5";
+    version = "4.2.9";
   };
   chef-winrm = {
     dependencies = [
@@ -403,16 +421,6 @@
     };
     version = "1.3.6";
   };
-  connection_pool = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1b8nlxr5z843ii7hfk6igpr5acw3k2ih9yjrgkyz2gbmallgjkz5";
-      type = "gem";
-    };
-    version = "2.5.5";
-  };
   cookbook-omnifetch = {
     dependencies = [ "mixlib-archive" ];
     groups = [ "default" ];
@@ -430,10 +438,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04xbjydimr144rnl1azhc3hignpdpi0s1rb0xzzbi1v2may7lwn0";
+      sha256 = "0mxznj53rlcg9bcycf5i6jximl1b5mdhm4x0k0wfb8xa79zz57cv";
       type = "gem";
     };
-    version = "8.5.3";
+    version = "8.6.10";
   };
   corefoundation = {
     dependencies = [ "ffi" ];
@@ -471,10 +479,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
+      sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s";
       type = "gem";
     };
-    version = "1.5.1";
+    version = "1.6.2";
   };
   domain_name = {
     groups = [ "default" ];
@@ -486,6 +494,16 @@
     };
     version = "0.6.20240107";
   };
+  ed25519 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "01n5rbyws1ijwc5dw7s88xx3zzacxx9k97qn8x11b6k8k18pzs8n";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
   erubi = {
     groups = [ "default" ];
     platforms = [ ];
@@ -538,10 +556,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11a27jbbbkawakwf8dll9qqc7g0mkc31zv1d8m1h477yqmhswwkp";
+      sha256 = "128dkxqssnnz801z86ykpaq4sv7pnac5yrgngbm951f0wsxw8ynd";
       type = "gem";
     };
-    version = "2.6.1";
+    version = "2.7.0";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -559,10 +577,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k1xaqw2jk13q3ss7cnyvkp8fzp75dk4kazysrxgfd1rpgvkk7qf";
+      sha256 = "1kqasqvy8d7r09ri4n6bkdwbk63j7afd9ilsw34nzlgh0qp69ldw";
       type = "gem";
     };
-    version = "1.17.3";
+    version = "1.17.4";
   };
   ffi-libarchive = {
     dependencies = [ "ffi" ];
@@ -637,10 +655,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q";
+      sha256 = "1aga7z4p0dka4zcqw9i05wa4ab1q7h7cgnj328ldqqfycjz84jxs";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.6";
   };
   httpclient = {
     dependencies = [ "mutex_m" ];
@@ -697,10 +715,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mghshl98py0q1wwd2dbmx72b1641y0nqz7y68bpws1b8n2hy5df";
+      sha256 = "1wjb8ap6z5nvsqlch7bx66p620rh2skxz4niawizff1y9zcfa23x";
       type = "gem";
     };
-    version = "7.0.95";
+    version = "7.0.107";
   };
   io-console = {
     groups = [ "default" ];
@@ -737,10 +755,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy";
+      sha256 = "1b1rabz30grash5wh0lcv109w2ggggmmbclwnajqrcdk7wrps2k7";
       type = "gem";
     };
-    version = "2.18.1";
+    version = "2.19.4";
   };
   language_server-protocol = {
     groups = [ "default" ];
@@ -851,10 +869,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0bradmf21c9g4z6f3hvqmnf6i2sbgp0630y2j5rq8a7h79lksdal";
+      sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726";
       type = "gem";
     };
-    version = "3.2026.0203";
+    version = "3.2026.0414";
   };
   minitar = {
     groups = [ "default" ];
@@ -925,10 +943,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "032z85m9w8kpf232xspd9r8im6wwq4lj2s7df642m4lhdid6r2kw";
+      sha256 = "126k9zgxwj726gi0q0ywj4kdzf1gfm8z16i1nn7dw9kmn3imxpqf";
       type = "gem";
     };
-    version = "3.4.10";
+    version = "3.3.9";
   };
   molinillo = {
     groups = [ "default" ];
@@ -945,10 +963,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1drisvysgvnjlz49a0qcbs294id6mvj3i8iik5rvym68ybwfzvvs";
+      sha256 = "0vfaab23d85617ps412ydb8ap4ci1sfzi8ainn8yyifc0pl38f9g";
       type = "gem";
     };
-    version = "1.19.1";
+    version = "1.20.1";
   };
   multipart-post = {
     groups = [ "default" ];
@@ -995,17 +1013,6 @@
     };
     version = "0.9.1";
   };
-  net-http-persistent = {
-    dependencies = [ "connection_pool" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1rk03449disq3azyiymv1c3qnpqr6cxawgq556rkf5b9klqyhggg";
-      type = "gem";
-    };
-    version = "4.0.8";
-  };
   net-protocol = {
     dependencies = [ "timeout" ];
     groups = [ "default" ];
@@ -1044,10 +1051,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p";
+      sha256 = "1m1d6rs40rjvdb6df34fi3za1c2ajdiydv4jzpjj03iq7hhrw0k5";
       type = "gem";
     };
-    version = "7.3.0";
+    version = "7.3.2";
   };
   netrc = {
     groups = [ "default" ];
@@ -1072,6 +1079,7 @@
   };
   ohai = {
     dependencies = [
+      "base64"
       "chef-config"
       "chef-utils"
       "ffi"
@@ -1089,10 +1097,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1w0zrk1n6n7jl493k4vv5xaiszbmxsmaffy9xvykbfawjjb83vj2";
+      sha256 = "0n3prpm36kxxk0jx8qs90gj72382jw7az9rnqnaa88c35793ypx1";
       type = "gem";
     };
-    version = "18.1.18";
+    version = "19.1.24";
   };
   ostruct = {
     groups = [ "default" ];
@@ -1109,10 +1117,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
+      sha256 = "0w697335hi5dk5ay9kyn53399sy87y8v0y6ij93m5wmshhadxrik";
       type = "gem";
     };
-    version = "1.27.0";
+    version = "1.28.0";
   };
   parser = {
     dependencies = [
@@ -1123,10 +1131,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1256ws3w3gnfqj7r3yz2i9y1y7k38fhjphxpybkyb4fds8jsgxh6";
+      sha256 = "0m2xqvn1la62hji1mn04y59giikww95p2hs0r4y2rrz3mdxcwyni";
       type = "gem";
     };
-    version = "3.3.10.1";
+    version = "3.3.11.1";
   };
   parslet = {
     groups = [ "default" ];
@@ -1209,10 +1217,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mx84s7gn3xabb320hw8060v7amg6gmcyyhfzp0kawafiq60j54i";
+      sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs";
       type = "gem";
     };
-    version = "7.0.2";
+    version = "7.0.5";
   };
   racc = {
     groups = [ "default" ];
@@ -1229,10 +1237,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xmnrk076sqymilydqgyzhkma3hgqhcv8xhy7ks479l2a3vvcx2x";
+      sha256 = "1hhjy9gcp52dzij05gmidqac8g28ski5xm67prwmdqmjfcgqxmsy";
       type = "gem";
     };
-    version = "3.2.4";
+    version = "3.2.6";
   };
   rackup = {
     dependencies = [ "rack" ];
@@ -1260,10 +1268,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya";
+      sha256 = "1fwfw26a32rps78920nn29shqg2zmqv72i89j1fap41isshida9m";
       type = "gem";
     };
-    version = "2.11.3";
+    version = "2.12.0";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -1365,10 +1373,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "071bqrk2rblk3zq3jk1xxx0dr92y0szi5pxdm8waimxici706y89";
+      sha256 = "0iqxmw0knjiz5nf6pgr8ihs6cjzh89f0ppj3fqiz8cvms79x6sh8";
       type = "gem";
     };
-    version = "3.13.7";
+    version = "3.13.8";
   };
   rspec-support = {
     groups = [ "default" ];
@@ -1397,10 +1405,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "157hg99cq6ys670sw8xbggnvxc9yl50h1zhllki925kkihlwrdbg";
+      sha256 = "0pxzipl8a1bv62jdfykh7j4ymdr4aiffjvwsny6drwv886jwx4jn";
       type = "gem";
     };
-    version = "1.81.7";
+    version = "1.84.2";
   };
   rubocop-ast = {
     dependencies = [
@@ -1411,10 +1419,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1zbikzd6237fvlzjfxdlhwi2vbmavg1cc81y6cyr581365nnghs9";
+      sha256 = "0dahfpnzz63hyqxa03x8rypnrxzwyvh4i5a8ri34bzpnf3pg64j4";
       type = "gem";
     };
-    version = "1.49.0";
+    version = "1.49.1";
   };
   ruby-progressbar = {
     groups = [ "default" ];
@@ -1563,10 +1571,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bz11pq7n1g51f50jqmgyf5b1v64p1pfqmy5l21y6vpr37b2lwkd";
+      sha256 = "1jxcji88mh6xsqz0mfzwnxczpg7cyniph7wpavnavfz7lxl77xbq";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.6.1";
   };
   tomlrb = {
     groups = [ "default" ];
@@ -1591,10 +1599,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1paxsm06cbhq73k8p4fnb184774w0rrycwzg78lh9awlv6s3wgxw";
+      sha256 = "1vz9ylinr4fbca7ab7ipv57hxd988a13b0vlwrhlxhckdaf215cg";
       type = "gem";
     };
-    version = "3.16.1";
+    version = "3.16.2";
   };
   train-rest = {
     dependencies = [
@@ -1762,10 +1770,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
+      sha256 = "0jrl2vkdvc5aq8q3qvjmmrgjxfm784w8h7fal19qg7q7gh9msj1l";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.0.4";
   };
   uuidtools = {
     groups = [ "default" ];
@@ -1778,20 +1786,15 @@
     version = "2.2.0";
   };
   vault = {
-    dependencies = [
-      "aws-sigv4"
-      "base64"
-      "connection_pool"
-      "net-http-persistent"
-    ];
+    dependencies = [ "aws-sigv4" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0wycd7g00ji9fqlk4ka0qm5fbs37xxd273g8zsnfql61vhf5h83w";
+      sha256 = "0z6j8s8cdmkbwzfis3dpk5dm91zi5fasids8npzrxhb4hcnnqd19";
       type = "gem";
     };
-    version = "0.20.0";
+    version = "0.18.2";
   };
   webrick = {
     groups = [ "default" ];
diff --git a/pkgs/by-name/ch/chelf/package.nix b/pkgs/by-name/ch/chelf/package.nix
index 6a3ecd6db28e..4de5e4ead268 100644
--- a/pkgs/by-name/ch/chelf/package.nix
+++ b/pkgs/by-name/ch/chelf/package.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Change or display the stack size of an ELF binary";
     homepage = "https://github.com/Gottox/chelf";
     license = lib.licenses.bsd2;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
     mainProgram = "chelf";
   };
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 11ac2e2a6fd2..f45f5bcd5789 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IGCi9zDDilejWv/kZ34SLYM0ciq8QcgiM7dkXLFe5Js=";
+    hash = "sha256-vm1yz0iKErkw/l4cGPedVVaoBGLV0h4O7xA56e3IoqM=";
   };
 
   postPatch = ''
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-66Mm/Hi6qi3Zk7cNrAhFB3np5xNO7r6pWWbfsiRf+cs=";
+    hash = "sha256-cBZymB2eI93ui8rdQzBibdf44lXJC/KGwoz0EyeOk2A=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix
index 6db92f2b7043..9cc7f08fce36 100644
--- a/pkgs/by-name/ch/chezmoi/package.nix
+++ b/pkgs/by-name/ch/chezmoi/package.nix
@@ -7,16 +7,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "chezmoi";
-  version = "2.70.1";
+  version = "2.70.2";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wGNv5O339fjzEPpK4/xAkUpgbOlRq3+DN9e0R7A393Y=";
+    hash = "sha256-47tc3L3iUVt+i13qyZMxRYb59Y/id/+EMQfbZGsMJzQ=";
   };
 
-  vendorHash = "sha256-URvpoVW763bIBRFJvHMiTNobSRBA8lGualeRfNtKkYE=";
+  vendorHash = "sha256-uTbU8lrMTfyiljJ6flo88k3xJrhZJCzPuyu/hFrRTGo=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ch/chiaki-ng/package.nix b/pkgs/by-name/ch/chiaki-ng/package.nix
index 33ab111fdc25..d86a823ea27e 100644
--- a/pkgs/by-name/ch/chiaki-ng/package.nix
+++ b/pkgs/by-name/ch/chiaki-ng/package.nix
@@ -26,7 +26,7 @@
   shaderc,
   lcms2,
   libdovi,
-  xxHash,
+  xxhash,
   kdePackages,
 }:
 
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     shaderc
     lcms2
     libdovi
-    xxHash
+    xxhash
   ];
 
   env.NIX_CFLAGS_COMPILE = "-std=gnu17";
diff --git a/pkgs/by-name/ch/chiptrack/package.nix b/pkgs/by-name/ch/chiptrack/package.nix
index 33bf51c5b814..fd015fd89dab 100644
--- a/pkgs/by-name/ch/chiptrack/package.nix
+++ b/pkgs/by-name/ch/chiptrack/package.nix
@@ -1,22 +1,13 @@
 {
-  clangStdenv,
+  stdenv,
   rustPlatform,
   lib,
-  linkFarm,
-  fetchgit,
   fetchFromGitHub,
-  runCommand,
   alsa-lib,
   brotli,
   cmake,
-  expat,
   fontconfig,
-  freetype,
-  gn,
-  harfbuzz,
-  icu,
   libglvnd,
-  libjpeg,
   libxkbcommon,
   libx11,
   libxcursor,
@@ -24,23 +15,21 @@
   libxi,
   libxrandr,
   makeWrapper,
-  ninja,
   pkg-config,
   python3,
-  removeReferencesTo,
   wayland,
   zlib,
 }:
 
-rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
+rustPlatform.buildRustPackage {
   pname = "chiptrack";
-  version = "0.5";
+  version = "0.5-unstable-2026-02-09";
 
   src = fetchFromGitHub {
     owner = "jturcotte";
     repo = "chiptrack";
-    tag = "v${version}";
-    hash = "sha256-yQP5hFM5qBWdaF192PBvM4il6qpmlgUCeuwDCiw/LaQ=";
+    rev = "3cb0caa5bbc23d0579cdad8187c4371bdf0723a3";
+    hash = "sha256-jqtWmhP8h8v8bMPVgVZtraWOXRpEir6WnSoCg5EJKs0=";
   };
 
   strictDeps = true;
@@ -51,59 +40,18 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
     makeWrapper
     pkg-config
     python3
-    removeReferencesTo
   ];
 
   buildInputs = [
-    expat
     fontconfig
-    freetype
-    harfbuzz
-    icu
-    libjpeg
   ]
-  ++ lib.optionals clangStdenv.hostPlatform.isLinux [ alsa-lib ];
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
 
   # Has git dependencies
 
-  cargoHash = "sha256-3LRyAY5NmXiJRrN+jwaUX65ArBCl8BiFoaWU2fVRMA8=";
+  cargoHash = "sha256-C9sNSD51Q0U4f4xhnTQI/457uk/yFSrEdok81bDgcc0=";
 
-  env = {
-    SKIA_SOURCE_DIR =
-      let
-        repo = fetchFromGitHub {
-          owner = "rust-skia";
-          repo = "skia";
-          # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
-          tag = "m129-0.77.1";
-          hash = "sha256-WRVuQpfRnYrE7KGFRFx66fXtMFmtJbC3xUcRPK1JoOM=";
-        };
-        # The externals for skia are taken from skia/DEPS
-        # Reduced to only what's necessary
-        externals = linkFarm "skia-externals" (
-          lib.mapAttrsToList (name: value: {
-            inherit name;
-            path = fetchgit value;
-          }) (lib.importJSON ./skia-externals.json)
-        );
-      in
-      runCommand "source" { } ''
-        cp -R ${repo} $out
-        chmod -R +w $out
-        ln -s ${externals} $out/third_party/externals
-      '';
-    SKIA_GN_COMMAND = lib.getExe gn;
-    SKIA_NINJA_COMMAND = lib.getExe ninja;
-    SKIA_USE_SYSTEM_LIBRARIES = "1";
-
-    NIX_CFLAGS_COMPILE = "-I${lib.getDev harfbuzz}/include/harfbuzz";
-  };
-
-  # library skia embeds the path to its sources
   postFixup = ''
-    remove-references-to -t "$SKIA_SOURCE_DIR" \
-      $out/bin/chiptrack
-
     wrapProgram $out/bin/chiptrack \
       --prefix LD_LIBRARY_PATH : ${
         lib.makeLibraryPath (
@@ -111,7 +59,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
             brotli
             zlib
           ]
-          ++ lib.optionals clangStdenv.hostPlatform.isLinux [
+          ++ lib.optionals stdenv.hostPlatform.isLinux [
             libglvnd
             libxkbcommon
             libx11
@@ -125,8 +73,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
       }
   '';
 
-  disallowedReferences = [ env.SKIA_SOURCE_DIR ];
-
   meta = {
     description = "Programmable cross-platform sequencer for the Game Boy Advance sound chip";
     homepage = "https://github.com/jturcotte/chiptrack";
@@ -137,6 +83,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
     mainProgram = "chiptrack";
     maintainers = with lib.maintainers; [ OPNA2608 ];
     # Various issues with wrong max macOS version & misparsed target conditional checks, can't figure out the magic combination for this
-    broken = clangStdenv.hostPlatform.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index 81803db671a8..f1fb9e9cd6ae 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2026-04-14";
+  version = "0.4.0-unstable-2026-04-18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "f5d57bd5784b85f9a37e316064d508bad5a70d2b";
-    hash = "sha256-YFGp0uu7coCmDWaI9MKxNo4x6IfQXQMQ85F/z9qTBI8=";
+    rev = "e7347e6a66ef8f9edb50e3e534510c2d3ae6b329";
+    hash = "sha256-TK+lwoEoETcpVe0Xfevg3GUKPQlSKXof+gfmAs6R27Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ch/chisel/package.nix b/pkgs/by-name/ch/chisel/package.nix
index 3d8fbd94275e..0b262add6dde 100644
--- a/pkgs/by-name/ch/chisel/package.nix
+++ b/pkgs/by-name/ch/chisel/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "chisel";
-  version = "1.11.5";
+  version = "1.11.6";
 
   src = fetchFromGitHub {
     owner = "jpillora";
     repo = "chisel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9b4y09eStfVLGRGUHw1GicBWsWHy7j9nwhQ3kfmB8Wc=";
+    hash = "sha256-3pLqTOVJfp9MiorObS8I1KHB0MthzzK3oLFz+5emqxE=";
   };
 
   vendorHash = "sha256-hqHd+62csVjHY2oAvi5fwlI0LbjR/LSDg6b1SMwe8Fw=";
diff --git a/pkgs/by-name/ch/chmlib/package.nix b/pkgs/by-name/ch/chmlib/package.nix
index 28653a09f920..bf05a2c965ac 100644
--- a/pkgs/by-name/ch/chmlib/package.nix
+++ b/pkgs/by-name/ch/chmlib/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation {
   configureFlags = [
     "--enable-examples"
     "--enable-devel"
+    "CFLAGS=-std=gnu17"
   ];
 
   meta = {
diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix
index 04b828b673ef..dd31926f9880 100644
--- a/pkgs/by-name/ch/chroma/package.nix
+++ b/pkgs/by-name/ch/chroma/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "chroma";
-  version = "2.23.1";
+  version = "2.24.0";
 
   src = fetchFromGitHub {
     owner = "alecthomas";
     repo = "chroma";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Znmcds0ru9VyH/0qE7KnW7l0QeRDoh9PnUPHTYPAA6w=";
+    hash = "sha256-KfojHrRJjGT03WeBobvBO9pHsJP6I7fSxzcSlmCsaxE=";
   };
 
-  vendorHash = "sha256-3mmO5hjjIqVqKiSOrFFQH8OaQTviJVHrznMYsgHP82A=";
+  vendorHash = "sha256-Vq5k4Jz4r5iZs7Yy175Ubj92eSr4v1xCtbLYhfo3OAg=";
 
   modRoot = "./cmd/chroma";
 
diff --git a/pkgs/by-name/ci/ciao/package.nix b/pkgs/by-name/ci/ciao/package.nix
index f65f9c758114..bcce66ef8d3b 100644
--- a/pkgs/by-name/ci/ciao/package.nix
+++ b/pkgs/by-name/ci/ciao/package.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-jsHz50+R/bs19ees3kKYalYk72ET9eSAAUY7QogI0go=";
   };
 
+  postPatch = ''
+    # hotfix https://github.com/ciao-lang/ciao/issues/122
+    substituteInPlace builder/sh_src/build_car.sh \
+      --replace-fail 'ln -s "$i" "$b"' 'ln -sr "$i" "$b"'
+  '';
+
   configurePhase = ''
     ./ciao-boot.sh configure --instype=global --prefix=$prefix
   '';
diff --git a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
index 1cf673bba89f..31ca356ee79d 100644
--- a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
+++ b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cinnamon-settings-daemon";
-  version = "6.6.3";
+  version = "6.6.4";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-settings-daemon";
     tag = finalAttrs.version;
-    hash = "sha256-sa3DYH4/yRycHyrAG8IfCCpHhFNKwq8yOgLoKHprGfk=";
+    hash = "sha256-zdrT9te/C62g1MZlILbicxaDWO+uS3iW448YBTpPz1Y=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ci/circleci-cli/package.nix b/pkgs/by-name/ci/circleci-cli/package.nix
index fc3a77e54a9a..3f4babaab654 100644
--- a/pkgs/by-name/ci/circleci-cli/package.nix
+++ b/pkgs/by-name/ci/circleci-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "circleci-cli";
-  version = "0.1.34950";
+  version = "0.1.35800";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = "circleci-cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-WUfmOTVuSh/y+Tg36eJWo0AAZwpudIqte3LUZlczkVQ=";
+    sha256 = "sha256-Mxeyij1S0mrVTBNFDgnlIFCHYik47sHtrgbc1cjObbM=";
   };
 
-  vendorHash = "sha256-GRWo9oq8M7zJoWCg6iNLbR+DPXvMXF3v+YRU2BBH5+8=";
+  vendorHash = "sha256-vTYepN/srd5qb2o1O5KwcGBwvKmV1DLG3/4OdtKJpVk=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ci/circumflex/package.nix b/pkgs/by-name/ci/circumflex/package.nix
index 9f352fdd5fc2..fec1c1c85bbc 100644
--- a/pkgs/by-name/ci/circumflex/package.nix
+++ b/pkgs/by-name/ci/circumflex/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "circumflex";
-  version = "3.9";
+  version = "4.0";
 
   src = fetchFromGitHub {
     owner = "bensadeh";
     repo = "circumflex";
     tag = finalAttrs.version;
-    hash = "sha256-Wv0CSLXM6zMkK0FFAoe0oPpfD3Fq743jz+69qWh0njs=";
+    hash = "sha256-C5zjbs/34SUX23KDLLQvrVH9dNYT125cpnSCWyUhSqw=";
   };
 
-  vendorHash = "sha256-SlXTLL/6OElR5yJ86K2voq6Ui9Z+9CvXVjG0im92CTk=";
+  vendorHash = "sha256-zz0nYzjwiWnknfe82RAtCK7gOaI3j8lwwPxKqE0aGSA=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/ci/cisco-packet-tracer_8/package.nix b/pkgs/by-name/ci/cisco-packet-tracer_8/package.nix
deleted file mode 100644
index 0690c18b8fcc..000000000000
--- a/pkgs/by-name/ci/cisco-packet-tracer_8/package.nix
+++ /dev/null
@@ -1,203 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  requireFile,
-  autoPatchelfHook,
-  dpkg,
-  makeWrapper,
-  alsa-lib,
-  dbus,
-  expat,
-  fontconfig,
-  glib,
-  libdrm,
-  libglvnd,
-  libpulseaudio,
-  libudev0-shim,
-  libxkbcommon,
-  libxml2_13,
-  libxslt,
-  nspr,
-  nss,
-  wayland,
-  libxcb-wm,
-  libxcb-render-util,
-  libxcb-keysyms,
-  libxcb-image,
-  libxtst,
-  libxscrnsaver,
-  libxrender,
-  libxrandr,
-  libxi,
-  libxfixes,
-  libxext,
-  libxdamage,
-  libxcursor,
-  libxcomposite,
-  libx11,
-  libsm,
-  libice,
-  libxcb,
-  buildFHSEnv,
-  copyDesktopItems,
-  makeDesktopItem,
-  libsForQt5,
-  version ? "8.2.2",
-  packetTracerSource ? null,
-}:
-
-let
-  hashes = {
-    "8.2.0" = "sha256-GxmIXVn2Ew7lVBT7AuIRoXc0YGids4v9Gsfw1FEX7RY=";
-    "8.2.1" = "sha256-QoM4rDKkdNTJ6TBDPCAs+l17JLnspQFlly9B60hOB7o=";
-    "8.2.2" = "sha256-bNK4iR35LSyti2/cR0gPwIneCFxPP+leuA1UUKKn9y0=";
-  };
-  names = {
-    "8.2.0" = "CiscoPacketTracer_820_Ubuntu_64bit.deb";
-    "8.2.1" = "CiscoPacketTracer_821_Ubuntu_64bit.deb";
-    "8.2.2" = "CiscoPacketTracer822_amd64_signed.deb";
-  };
-
-  unwrapped = stdenvNoCC.mkDerivation {
-    name = "cisco-packet-tracer-unwrapped";
-    inherit version;
-
-    src =
-      if (packetTracerSource != null) then
-        packetTracerSource
-      else
-        requireFile {
-          name = names.${version};
-          hash = hashes.${version};
-          url = "https://www.netacad.com";
-        };
-
-    nativeBuildInputs = [
-      autoPatchelfHook
-      dpkg
-      makeWrapper
-    ];
-
-    buildInputs = [
-      alsa-lib
-      dbus
-      expat
-      fontconfig
-      glib
-      libdrm
-      libglvnd
-      libpulseaudio
-      libudev0-shim
-      libxkbcommon
-      libxml2_13
-      libxslt
-      nspr
-      nss
-      wayland
-      libice
-      libsm
-      libx11
-      libxscrnsaver
-      libxcomposite
-      libxcursor
-      libxdamage
-      libxext
-      libxfixes
-      libxi
-      libxrandr
-      libxrender
-      libxtst
-      libxcb
-      libxcb-image
-      libxcb-keysyms
-      libxcb-render-util
-      libxcb-wm
-    ];
-
-    unpackPhase = ''
-      runHook preUnpack
-
-      dpkg-deb -x $src $out
-      chmod 755 "$out"
-
-      runHook postUnpack
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer8" \
-        --set QT_QPA_PLATFORM xcb \
-        --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin"
-
-      runHook postInstall
-    '';
-  };
-
-  fhs-env = buildFHSEnv {
-    pname = "cisco-packet-tracer-fhs-env";
-    inherit version;
-    runScript = lib.getExe' unwrapped "packettracer8";
-    targetPkgs = _: [ libudev0-shim ];
-  };
-in
-
-stdenvNoCC.mkDerivation {
-  pname = "cisco-packet-tracer";
-  inherit version;
-
-  dontUnpack = true;
-
-  nativeBuildInputs = [
-    copyDesktopItems
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    ln -s ${fhs-env}/bin/${fhs-env.pname} $out/bin/packettracer8
-
-    mkdir -p $out/share/icons/hicolor/48x48/apps
-    ln -s ${unwrapped}/opt/pt/art/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-8.png
-    ln -s ${unwrapped}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/mimetypes
-    ln -s ${unwrapped}/usr/share/mime $out/share/mime
-
-    runHook postInstall
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "cisco-pt8.desktop";
-      desktopName = "Cisco Packet Tracer 8";
-      icon = "cisco-packet-tracer-8";
-      exec = "packettracer8 %f";
-      mimeTypes = [
-        "application/x-pkt"
-        "application/x-pka"
-        "application/x-pkz"
-        "application/x-pksz"
-        "application/x-pks"
-      ];
-    })
-  ];
-
-  meta = {
-    description = "Network simulation tool from Cisco";
-    homepage = "https://www.netacad.com/courses/packet-tracer";
-    license = lib.licenses.unfree;
-    mainProgram = "packettracer8";
-    maintainers = with lib.maintainers; [
-      gepbird
-    ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    knownVulnerabilities = [
-      ''
-        Cisco Packet Tracer 8 ships with qt5 qtwebengine.
-
-        ${lib.head libsForQt5.qtwebengine.meta.knownVulnerabilities}
-      ''
-    ];
-  };
-}
diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix
index 8ee2eb6fd68f..de5edae3fcab 100644
--- a/pkgs/by-name/cl/clash-rs/package.nix
+++ b/pkgs/by-name/cl/clash-rs/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clash-rs";
-  version = "0.9.7";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "Watfaq";
     repo = "clash-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-26OoAy/IiTEqESABqjLMI9zsmHgBbwmIazzoP8Au4nM=";
+    hash = "sha256-r+9tFw4B/7g/4EEYnX0Zcv4jPeGbcVgdtpAcSyk/cxA=";
   };
 
-  cargoHash = "sha256-UPCXc0uB0pg4ioBIpYQKwtyTWsMH/248WDyO9qB2jwA=";
+  cargoHash = "sha256-D/TalJ0fBD4ZoHwU6uj5P0O6xFwinL9hE91bQhxC7s8=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/cl/claude-code-bin/manifest.json b/pkgs/by-name/cl/claude-code-bin/manifest.json
deleted file mode 100644
index 5ec1c5fd1bfd..000000000000
--- a/pkgs/by-name/cl/claude-code-bin/manifest.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "version": "2.1.114",
-  "buildDate": "2026-04-17T22:43:08Z",
-  "platforms": {
-    "darwin-arm64": {
-      "binary": "claude",
-      "checksum": "bf1b4da368da7970f0d1d4a1675acea99b6f2ad94f24e9f8ccfcc7940ac67894",
-      "size": 204534752
-    },
-    "darwin-x64": {
-      "binary": "claude",
-      "checksum": "1a30360b6240056a58ba9187c8f9d2e88e949e0f970d5cf81f8d69bc65568f6a",
-      "size": 206004048
-    },
-    "linux-arm64": {
-      "binary": "claude",
-      "checksum": "9556b74e2c912e7dcaef90c91fd0dd5095364f8a9d71398de3c5c669612b828a",
-      "size": 236653120
-    },
-    "linux-x64": {
-      "binary": "claude",
-      "checksum": "12bd4b0916deb06be17ffc7b2f0485e140bf00b2db3dcb78469d66723d73c27f",
-      "size": 236411520
-    },
-    "linux-arm64-musl": {
-      "binary": "claude",
-      "checksum": "20c68c312e76fb81f52cd2006b1461a0eedd470798f44b9b4a833ad583ccc05b",
-      "size": 229378496
-    },
-    "linux-x64-musl": {
-      "binary": "claude",
-      "checksum": "fbbcfa225e948d9263c39f8be29a956ea4bd3a445f79aa9396cdc3263ea05690",
-      "size": 230676928
-    },
-    "win32-x64": {
-      "binary": "claude.exe",
-      "checksum": "6f4a961ea8a1d656c41dd71cbef202cb71d13c443f86818c721167c33f8a51fd",
-      "size": 245966496
-    },
-    "win32-arm64": {
-      "binary": "claude.exe",
-      "checksum": "acdc5b7004491662f10622124c509b018a6a6c5566adf3e217f2dd4dad64ef34",
-      "size": 242697888
-    }
-  }
-}
diff --git a/pkgs/by-name/cl/claude-code-bin/package.nix b/pkgs/by-name/cl/claude-code-bin/package.nix
deleted file mode 100644
index bd80643754fb..000000000000
--- a/pkgs/by-name/cl/claude-code-bin/package.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchurl,
-  installShellFiles,
-  makeBinaryWrapper,
-  autoPatchelfHook,
-  procps,
-  ripgrep,
-  bubblewrap,
-  socat,
-  versionCheckHook,
-  writableTmpDirAsHomeHook,
-}:
-let
-  stdenv = stdenvNoCC;
-  baseUrl = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases";
-  manifest = lib.importJSON ./manifest.json;
-  platformKey = "${stdenv.hostPlatform.node.platform}-${stdenv.hostPlatform.node.arch}";
-  platformManifestEntry = manifest.platforms.${platformKey};
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "claude-code-bin";
-  inherit (manifest) version;
-
-  src = fetchurl {
-    url = "${baseUrl}/${finalAttrs.version}/${platformKey}/claude";
-    sha256 = platformManifestEntry.checksum;
-  };
-
-  dontUnpack = true;
-  dontBuild = true;
-  __noChroot = stdenv.hostPlatform.isDarwin;
-  # otherwise the bun runtime is executed instead of the binary
-  dontStrip = true;
-
-  nativeBuildInputs = [
-    installShellFiles
-    makeBinaryWrapper
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isElf [ autoPatchelfHook ];
-
-  strictDeps = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    installBin $src
-
-    wrapProgram $out/bin/claude \
-      --set DISABLE_AUTOUPDATER 1 \
-      --set-default FORCE_AUTOUPDATE_PLUGINS 1 \
-      --set DISABLE_INSTALLATION_CHECKS 1 \
-      --set USE_BUILTIN_RIPGREP 0 \
-      --prefix PATH : ${
-        lib.makeBinPath (
-          [
-            # claude-code uses [node-tree-kill](https://github.com/pkrumins/node-tree-kill) which requires procps's pgrep(darwin) or ps(linux)
-            procps
-            # https://code.claude.com/docs/en/troubleshooting#search-and-discovery-issues
-            ripgrep
-          ]
-          # the following packages are required for the sandbox to work (Linux only)
-          ++ lib.optionals stdenv.hostPlatform.isLinux [
-            bubblewrap
-            socat
-          ]
-        )
-      }
-
-    runHook postInstall
-  '';
-
-  doInstallCheck = true;
-  nativeInstallCheckInputs = [
-    writableTmpDirAsHomeHook
-    versionCheckHook
-  ];
-  versionCheckKeepEnvironment = [ "HOME" ];
-  versionCheckProgramArg = "--version";
-
-  passthru.updateScript = ./update.sh;
-
-  meta = {
-    description = "Agentic coding tool that lives in your terminal, understands your codebase, and helps you code faster";
-    homepage = "https://github.com/anthropics/claude-code";
-    downloadPage = "https://claude.com/product/claude-code";
-    changelog = "https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md";
-    license = lib.licenses.unfree;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    platforms = [
-      "aarch64-darwin"
-      "x86_64-darwin"
-      "aarch64-linux"
-      "x86_64-linux"
-    ];
-    maintainers = with lib.maintainers; [
-      mirkolenz
-      oskarwires
-      xiaoxiangmoe
-    ];
-    mainProgram = "claude";
-  };
-})
diff --git a/pkgs/by-name/cl/claude-code-bin/update.sh b/pkgs/by-name/cl/claude-code-bin/update.sh
deleted file mode 100755
index e60893c580f1..000000000000
--- a/pkgs/by-name/cl/claude-code-bin/update.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env nix
-#!nix shell --ignore-environment .#cacert .#curl .#bash --command bash
-
-set -euo pipefail
-
-BASE_URL="https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases"
-
-VERSION=$(curl -fsSL "$BASE_URL/latest")
-
-curl -fsSL "$BASE_URL/$VERSION/manifest.json" --output pkgs/by-name/cl/claude-code-bin/manifest.json
diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
new file mode 100644
index 000000000000..6f406598f430
--- /dev/null
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -0,0 +1,47 @@
+{
+  "version": "2.1.123",
+  "commit": "54903ade25087ef906df59ec6a608cc3a50a3f06",
+  "buildDate": "2026-04-29T00:41:50Z",
+  "platforms": {
+    "darwin-arm64": {
+      "binary": "claude",
+      "checksum": "44597dff0f1c11e37c1954d4ac3965909be376e5961b558345723357253bcc90",
+      "size": 215880320
+    },
+    "darwin-x64": {
+      "binary": "claude",
+      "checksum": "ddea227d4c2b2602d650d2c5d5c812f7680701a1504bcaff81e42c165c583ef9",
+      "size": 217444560
+    },
+    "linux-arm64": {
+      "binary": "claude",
+      "checksum": "825c526035d1d75ff0bc1eebf18c887f98d07ea49ea80bd312ff416fe61a39b3",
+      "size": 247925312
+    },
+    "linux-x64": {
+      "binary": "claude",
+      "checksum": "5a78139b679a86a88a0ac5476c706a64c3105bf6a6d435ba10f3aa3fb635bdb2",
+      "size": 247732864
+    },
+    "linux-arm64-musl": {
+      "binary": "claude",
+      "checksum": "0cd6e1a18036bee71ace8cbf7ed25cc4a443e69924796fc985b6719321cb37d3",
+      "size": 240650624
+    },
+    "linux-x64-musl": {
+      "binary": "claude",
+      "checksum": "bddd41dde044863f04c0a5fce16514e7fa24e123d217e09526a88188af67dbc0",
+      "size": 241998208
+    },
+    "win32-x64": {
+      "binary": "claude.exe",
+      "checksum": "34345e5c3c2d3910772aa7ecce2c33c2fce6cf2e146ff6c031f9c01debba02c6",
+      "size": 253691552
+    },
+    "win32-arm64": {
+      "binary": "claude.exe",
+      "checksum": "bc4a102e5086f8faa1b7f2848a0fb482a01314f4004619a05da8352b905b3154",
+      "size": 249754272
+    }
+  }
+}
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
deleted file mode 100644
index 96083b99beec..000000000000
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ /dev/null
@@ -1,334 +0,0 @@
-{
-  "name": "@anthropic-ai/claude-code",
-  "version": "2.1.112",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@anthropic-ai/claude-code",
-      "version": "2.1.112",
-      "license": "SEE LICENSE IN README.md",
-      "bin": {
-        "claude": "cli.js"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "optionalDependencies": {
-        "@img/sharp-darwin-arm64": "^0.34.2",
-        "@img/sharp-darwin-x64": "^0.34.2",
-        "@img/sharp-linux-arm": "^0.34.2",
-        "@img/sharp-linux-arm64": "^0.34.2",
-        "@img/sharp-linux-x64": "^0.34.2",
-        "@img/sharp-linuxmusl-arm64": "^0.34.2",
-        "@img/sharp-linuxmusl-x64": "^0.34.2",
-        "@img/sharp-win32-arm64": "^0.34.2",
-        "@img/sharp-win32-x64": "^0.34.2"
-      }
-    },
-    "node_modules/@img/sharp-darwin-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz",
-      "integrity": "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-arm64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-darwin-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz",
-      "integrity": "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-x64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-libvips-darwin-arm64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz",
-      "integrity": "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-darwin-x64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz",
-      "integrity": "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-arm": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz",
-      "integrity": "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-arm64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz",
-      "integrity": "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linux-x64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz",
-      "integrity": "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz",
-      "integrity": "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz",
-      "integrity": "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-linux-arm": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz",
-      "integrity": "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz",
-      "integrity": "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linux-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz",
-      "integrity": "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linux-x64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linuxmusl-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz",
-      "integrity": "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-arm64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-linuxmusl-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz",
-      "integrity": "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      },
-      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-x64": "1.2.4"
-      }
-    },
-    "node_modules/@img/sharp-win32-arm64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz",
-      "integrity": "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    },
-    "node_modules/@img/sharp-win32-x64": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz",
-      "integrity": "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "Apache-2.0 AND LGPL-3.0-or-later",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/libvips"
-      }
-    }
-  }
-}
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 89dc381fe00f..ace41055c5f9 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -1,57 +1,68 @@
 # NOTE: Use the following command to update the package
 # ```sh
-# nix-shell maintainers/scripts/update.nix --argstr commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["claude-code-bin"] ["vscode-extensions" "anthropic" "claude-code"]])'
+# nix-shell maintainers/scripts/update.nix --argstr commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["vscode-extensions" "anthropic" "claude-code"]])'
 # ```
 {
   lib,
-  stdenv,
-  buildNpmPackage,
-  fetchzip,
+  stdenvNoCC,
+  fetchurl,
+  installShellFiles,
+  makeBinaryWrapper,
+  autoPatchelfHook,
+  procps,
+  ripgrep,
+  bubblewrap,
+  socat,
   versionCheckHook,
   writableTmpDirAsHomeHook,
-  bubblewrap,
-  procps,
-  socat,
 }:
-buildNpmPackage (finalAttrs: {
+let
+  stdenv = stdenvNoCC;
+  baseUrl = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases";
+  manifest = lib.importJSON ./manifest.json;
+  platformKey = "${stdenv.hostPlatform.node.platform}-${stdenv.hostPlatform.node.arch}";
+  platformManifestEntry = manifest.platforms.${platformKey};
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "claude-code";
-  version = "2.1.112";
+  inherit (manifest) version;
 
-  src = fetchzip {
-    url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-SJJqU7XHbu9IRGPMJNUg6oaMZiQUKqJhI2wm7BnR1gs=";
+  src = fetchurl {
+    url = "${baseUrl}/${finalAttrs.version}/${platformKey}/claude";
+    sha256 = platformManifestEntry.checksum;
   };
 
-  npmDepsHash = "sha256-bdkej9Z41GLew9wi1zdNX+Asauki3nT1+SHmBmaUIBU=";
+  dontUnpack = true;
+  dontBuild = true;
+  __noChroot = stdenv.hostPlatform.isDarwin;
+  # otherwise the bun runtime is executed instead of the binary
+  dontStrip = true;
+
+  nativeBuildInputs = [
+    installShellFiles
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isElf [ autoPatchelfHook ];
 
   strictDeps = true;
 
-  postPatch = ''
-    cp ${./package-lock.json} package-lock.json
+  installPhase = ''
+    runHook preInstall
 
-    # https://github.com/anthropics/claude-code/issues/15195
-    substituteInPlace cli.js \
-          --replace-fail '#!/bin/sh' '#!/usr/bin/env sh'
-  '';
+    installBin $src
 
-  dontNpmBuild = true;
-
-  env.AUTHORIZED = "1";
-
-  # `claude-code` tries to auto-update by default, this disables that functionality.
-  # https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview#environment-variables
-  # The DEV=true env var causes claude to crash with `TypeError: window.WebSocket is not a constructor`
-  postInstall = ''
     wrapProgram $out/bin/claude \
       --set DISABLE_AUTOUPDATER 1 \
       --set-default FORCE_AUTOUPDATE_PLUGINS 1 \
       --set DISABLE_INSTALLATION_CHECKS 1 \
-      --unset DEV \
+      --set USE_BUILTIN_RIPGREP 0 \
       --prefix PATH : ${
         lib.makeBinPath (
           [
             # claude-code uses [node-tree-kill](https://github.com/pkrumins/node-tree-kill) which requires procps's pgrep(darwin) or ps(linux)
             procps
+            # https://code.claude.com/docs/en/troubleshooting#search-and-discovery-issues
+            ripgrep
           ]
           # the following packages are required for the sandbox to work (Linux only)
           ++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -60,6 +71,8 @@ buildNpmPackage (finalAttrs: {
           ]
         )
       }
+
+    runHook postInstall
   '';
 
   doInstallCheck = true;
@@ -68,23 +81,32 @@ buildNpmPackage (finalAttrs: {
     versionCheckHook
   ];
   versionCheckKeepEnvironment = [ "HOME" ];
+  versionCheckProgramArg = "--version";
 
   passthru.updateScript = ./update.sh;
 
   meta = {
     description = "Agentic coding tool that lives in your terminal, understands your codebase, and helps you code faster";
     homepage = "https://github.com/anthropics/claude-code";
-    downloadPage = "https://www.npmjs.com/package/@anthropic-ai/claude-code";
+    downloadPage = "https://claude.com/product/claude-code";
+    changelog = "https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md";
     license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = [
+      "aarch64-darwin"
+      "x86_64-darwin"
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
     maintainers = with lib.maintainers; [
       adeci
       malo
       markus1189
+      mirkolenz
       omarjatoi
       oskarwires
       xiaoxiangmoe
     ];
     mainProgram = "claude";
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
   };
 })
diff --git a/pkgs/by-name/cl/claude-code/update.sh b/pkgs/by-name/cl/claude-code/update.sh
index 870f73308600..1e2125a74625 100755
--- a/pkgs/by-name/cl/claude-code/update.sh
+++ b/pkgs/by-name/cl/claude-code/update.sh
@@ -1,15 +1,12 @@
 #!/usr/bin/env nix
-#!nix shell --ignore-environment .#cacert .#nodejs .#git .#nix-update .#nix .#gnused .#findutils .#bash --command bash
+#!nix shell --ignore-environment .#cacert .#coreutils .#curl .#bash --command bash
 
 set -euo pipefail
 
-version=$(npm view @anthropic-ai/claude-code version)
+cd "$(dirname "${BASH_SOURCE[0]}")"
 
-# Update version and hashes
-AUTHORIZED=1 NIXPKGS_ALLOW_UNFREE=1 nix-update claude-code --version="$version" --generate-lockfile
+BASE_URL="https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases"
 
-# nix-update can't update package-lock.json along with npmDepsHash
-# TODO: Remove this workaround if nix-update can update package-lock.json along with npmDepsHash.
-(nix-build --expr '((import ./.) { system = builtins.currentSystem; }).claude-code.npmDeps.overrideAttrs { outputHash = ""; outputHashAlgo = "sha256"; }' 2>&1 || true) \
-| sed -nE '$s/ *got: *(sha256-[A-Za-z0-9+/=-]+).*/\1/p' \
-| xargs -I{} sed -i 's|npmDepsHash = "sha256-[^"]*";|npmDepsHash = "{}";|' pkgs/by-name/cl/claude-code/package.nix
+VERSION="${1:-$(curl -fsSL "$BASE_URL/latest")}"
+
+curl -fsSL "$BASE_URL/$VERSION/manifest.json" --output manifest.json
diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index 7335c70aa945..1122b623877f 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -11,7 +11,7 @@
 buildNpmPackage rec {
   pname = "clever-tools";
 
-  version = "4.8.0";
+  version = "4.9.0";
 
   nodejs = nodejs_22;
 
@@ -19,10 +19,10 @@ buildNpmPackage rec {
     owner = "CleverCloud";
     repo = "clever-tools";
     rev = version;
-    hash = "sha256-ei5wwx9rUfKe6hGbHuNU65kGo5quvTtRKb6sHjkEzQE=";
+    hash = "sha256-O/Uz+eG8FT3nsXGRqcRdREXNaGlTpyVgUBmNsH7tLJA=";
   };
 
-  npmDepsHash = "sha256-3gmDTBi0WpmtN+qTQXDvuXGkw0g/wdxuruMdyD4UMIc=";
+  npmDepsHash = "sha256-aps8j9Vx1LZQAWHuWmnAusCJfAuzREM+GyKdybw+Hcc=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/cl/clevis/package.nix b/pkgs/by-name/cl/clevis/package.nix
index 5bb66c74b6c5..d3358cb0df87 100644
--- a/pkgs/by-name/cl/clevis/package.nix
+++ b/pkgs/by-name/cl/clevis/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clevis";
-  version = "21";
+  version = "22";
 
   src = fetchFromGitHub {
     owner = "latchset";
     repo = "clevis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2vDQP+yvH4v46fLEWG/37r5cYP3OeDfJz71cDHEGiUg=";
+    hash = "sha256-1glqXKOP0GdzbQLMzUEgacRCafneFH9+MTHRYNgjG3Q=";
   };
 
   patches = [
diff --git a/pkgs/by-name/cl/cli11/package.nix b/pkgs/by-name/cl/cli11/package.nix
index dd2fa0bb31cb..987cf6ab26b7 100644
--- a/pkgs/by-name/cl/cli11/package.nix
+++ b/pkgs/by-name/cl/cli11/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cli11";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "CLIUtils";
     repo = "CLI11";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-q5q6TgSex0xjdWFf/4e6dhrN0qWPDjIgWBpdkCTlLys=";
+    hash = "sha256-TcOmx/qUK/w3mO0bDHX+TRxxMwJpaDFQBcpkQj3hz8A=";
   };
 
   buildInputs = [ catch2 ];
diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix
index c5aa91058ee1..6a0cae730303 100644
--- a/pkgs/by-name/cl/cliamp/package.nix
+++ b/pkgs/by-name/cl/cliamp/package.nix
@@ -16,16 +16,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cliamp";
-  version = "1.35.0";
+  version = "1.39.1";
 
   src = fetchFromGitHub {
     owner = "bjarneo";
     repo = "cliamp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8Att+SEJd2MdAgQ8SM49S4c4fM7t0/f/kHl6a+DbO2U=";
+    hash = "sha256-xGOTX6KQVtVuGPqTJGOXX80OaMlaK94qr67YecrRUEo=";
   };
 
-  vendorHash = "sha256-sS0tjZoZ81Jwn/KJnJD01fTA4z0HxEYYM89Ta398MP0=";
+  vendorHash = "sha256-A2Ygc1a9e2flZzaNAEXvr8Ui1cE89TxBfUNALmDzIo0=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/cl/clickup/package.nix b/pkgs/by-name/cl/clickup/package.nix
index dafef9c35ab6..6f77e0149a61 100644
--- a/pkgs/by-name/cl/clickup/package.nix
+++ b/pkgs/by-name/cl/clickup/package.nix
@@ -4,15 +4,18 @@
   appimageTools,
   fetchurl,
   makeWrapper,
+  writeShellApplication,
+  curl,
+  common-updater-scripts,
 }:
 let
   pname = "clickup";
-  version = "3.5.120";
+  version = "3.5.185";
 
   src = fetchurl {
     # Using archive.org because the website doesn't store older versions of the software.
-    url = "https://web.archive.org/web/20250802083833/https://desktop.clickup.com/linux";
-    hash = "sha256-LVHgXqTxDTsnVJ3zx74TzaSrEs2OD0wl0eioPd4+484=";
+    url = "https://web.archive.org/web/20260323060753/https://desktop.clickup.com/linux";
+    hash = "sha256-szPbhY1vsEG0Zq4TD2I9qVTa4wAUYfoVA2O2xP4HGeE=";
   };
 
   appimage = appimageTools.wrapType2 {
@@ -53,6 +56,36 @@ stdenvNoCC.mkDerivation {
     runHook postInstall
   '';
 
+  passthru.updateScript = lib.getExe (writeShellApplication {
+    name = "update-clickup";
+    runtimeInputs = [
+      curl
+      common-updater-scripts
+    ];
+    text = ''
+      upstream_version="$(curl --silent --location --range 0-0 --dump-header - --output /dev/null https://desktop.clickup.com/linux | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')"
+
+      current_version="$(nix-instantiate --eval --strict -A clickup.version | tr -d '"')"
+
+      if [[ "$current_version" = "$upstream_version" ]]; then
+        echo "clickup is already up-to-date at $current_version"
+        exit 0
+      fi
+
+      echo "Updating clickup from $current_version to $upstream_version"
+
+      echo "Saving new version to archive.org..."
+      archived_url="$(curl --silent --max-time 600 --output /dev/null --dump-header - "https://web.archive.org/save/https://desktop.clickup.com/linux" | grep --ignore-case '^location:' | tr -d '\r' | cut -d' ' -f2)"
+
+      if [[ -z "$archived_url" || "$archived_url" != *"web.archive.org/web/"* ]]; then
+        echo "error: failed to archive URL on archive.org" >&2
+        exit 1
+      fi
+
+      update-source-version clickup "$upstream_version" "" "$archived_url"
+    '';
+  });
+
   meta = {
     description = "All in one project management solution";
     homepage = "https://clickup.com";
diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix
index b99d50a2d6b9..38f6c7d41000 100644
--- a/pkgs/by-name/cl/clightning/package.nix
+++ b/pkgs/by-name/cl/clightning/package.nix
@@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clightning";
-  version = "26.04";
+  version = "26.04.1";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${finalAttrs.version}/clightning-v${finalAttrs.version}.zip";
-    hash = "sha256-6dxnhLkXIrfxqXi+UoBKsJw1YFIanOVGBYizJB0X3oU=";
+    hash = "sha256-MEsZ5GPCY6q/SNO+xcktfGiCZUVgl4p7pdMOiqIqFJM=";
   };
 
   # when building on darwin we need cctools to provide the correct libtool
diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix
index 034b6603ac96..7c86e6640fae 100644
--- a/pkgs/by-name/cl/clorinde/package.nix
+++ b/pkgs/by-name/cl/clorinde/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clorinde";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "halcyonnouveau";
     repo = "clorinde";
     tag = "clorinde-v${finalAttrs.version}";
-    hash = "sha256-oxco3gwLKxaXDiu3zKb5zaNGQwK5ZL94zYy2PhLFAzU=";
+    hash = "sha256-eqLY3iOunTdTZn7lfM8lLYk2e6EI1jW81BnRg/NaGuY=";
   };
 
-  cargoHash = "sha256-SM6OTOCzRUATgQMTfsaNb2DlFCW0VqbTqmbQ3O11xM8=";
+  cargoHash = "sha256-OacfUdCtRyewr8OZFBh6NphccDwQ6diWA5JqPhtMi54=";
 
   cargoBuildFlags = [ "--package=clorinde" ];
 
diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix
index 0204d898c4e7..e49e37df88e3 100644
--- a/pkgs/by-name/cl/cloud-nuke/package.nix
+++ b/pkgs/by-name/cl/cloud-nuke/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloud-nuke";
-  version = "0.49.0";
+  version = "0.50.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "cloud-nuke";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ygmgGe89YdvvP60zl8RWTXchXVNd23fodyFjiSDwQAI=";
+    hash = "sha256-I7MR2cF8ZyI8FTNGcLPMj5cZ2D9aTpK0+FdCuCPCfJU=";
   };
 
   vendorHash = "sha256-1DMwVJvr3zU96yAV2Vb4v58VNt7xg9dLCH7XGEMopjQ=";
diff --git a/pkgs/by-name/cl/cloudfoundry-cli/package.nix b/pkgs/by-name/cl/cloudfoundry-cli/package.nix
index 5bc78abfbcff..a32cc8bb88ea 100644
--- a/pkgs/by-name/cl/cloudfoundry-cli/package.nix
+++ b/pkgs/by-name/cl/cloudfoundry-cli/package.nix
@@ -8,15 +8,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloudfoundry-cli";
-  version = "8.18.0";
+  version = "8.18.3";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-M7fqd7xidW6+9Er/JhIQWliKWWm0YncCFcxry0b6JNk=";
+    sha256 = "sha256-0+osaSI+qOBGMbkVBvoT69qbXLZLHHOs6ML3kx6OIMQ=";
   };
-  vendorHash = "sha256-9BDcCZkOft0H8EEn582/eXg6fd/NzPOBGLnqECP1Dyg=";
+  vendorHash = "sha256-8ozKd8kT+QDgk1t86AIdlRObZPooO77mEFGKcpGCy3s=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/cl/cloudfox/package.nix b/pkgs/by-name/cl/cloudfox/package.nix
index 738d85a9d50c..c203d19d54dc 100644
--- a/pkgs/by-name/cl/cloudfox/package.nix
+++ b/pkgs/by-name/cl/cloudfox/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloudfox";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "BishopFox";
     repo = "cloudfox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cJUbI2DoSsU0NTa3+IB9TrZopwVww3nVZzekk6wk8VU=";
+    hash = "sha256-6GP6NwgBesU9bN997pfQ3jdHeimxOIyBBmiP/v6RT94=";
   };
 
   vendorHash = "sha256-RO/Xn8gDqCWVfI0yFuqHBj4rYh/fIMAJ80kKFj1ZFwI=";
diff --git a/pkgs/by-name/cl/cloudprober/package.nix b/pkgs/by-name/cl/cloudprober/package.nix
index d3c152dcaccc..7c23aaf4bf3a 100644
--- a/pkgs/by-name/cl/cloudprober/package.nix
+++ b/pkgs/by-name/cl/cloudprober/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloudprober";
-  version = "0.14.1";
+  version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "cloudprober";
     repo = "cloudprober";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XFMjUwsRfWAnrNsegUPqWz8Bcc/naEBhytqq/o21ras=";
+    hash = "sha256-dMogW0NQAMiSBC7//7gGmadvK5vS2H+170aW0RK58fU=";
   };
 
-  vendorHash = "sha256-+EVcYFnWPSNfxUzxuL3tAHjCCDad/7K11y3dk2CUtrU=";
+  vendorHash = "sha256-YEueI/Ms350bNkKPmLNzLljr9FDL0R7zACF4HQwHLdk=";
 
   checkFlags =
     let
diff --git a/pkgs/by-name/cl/clusterlint/package.nix b/pkgs/by-name/cl/clusterlint/package.nix
index 02e914dde2e6..21a1c84bde06 100644
--- a/pkgs/by-name/cl/clusterlint/package.nix
+++ b/pkgs/by-name/cl/clusterlint/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "clusterlint";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "clusterlint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iOd0mjVJDtALxdsmG6+ruJ8CxoNe17D9grkjRW+N34A=";
+    hash = "sha256-6QgWWSiwVZv8rYJNvfzxNsrxCqJbR/MBcCr3ESrO6Fc=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/cl/clzip/package.nix b/pkgs/by-name/cl/clzip/package.nix
index 99b1d2a35eaf..e40f815c9867 100644
--- a/pkgs/by-name/cl/clzip/package.nix
+++ b/pkgs/by-name/cl/clzip/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clzip";
-  version = "1.15";
+  version = "1.16";
 
   src = fetchurl {
     url = "mirror://savannah/lzip/clzip/clzip-${finalAttrs.version}.tar.gz";
-    hash = "sha256-KH6FFSaP+NFiRIeODi4tczwD2S3SsrhJFdde9N5sJh8=";
+    hash = "sha256-8zmjpd/CIgUy3Db5N6eljjoyeLF08oFcxWFRB+VZZuQ=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 3da84146f582..8bef9b3c12a9 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "cnspec";
-  version = "13.4.1";
+  version = "13.7.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3Uo2x30K7b7NA5OGP8YYlcoEJmFhlkL7t7ohvzUlmYI=";
+    hash = "sha256-YRQythakLR6dwd0vpyudcAwa7jHxBuWW+WOigVosRzM=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-7XwLkvG0LYL0pIbjMs78wMSqbXR5SScPAgjRxYsPwlA=";
+  vendorHash = "sha256-mcg9jh07ZvHxi/zuDWs9t3bxPW6zuAPzKTQYMtQ08/M=";
 
   subPackages = [ "apps/cnspec" ];
 
diff --git a/pkgs/by-name/co/coc-clangd/package.nix b/pkgs/by-name/co/coc-clangd/package.nix
index 42400a1f2dca..d4283b83f7a4 100644
--- a/pkgs/by-name/co/coc-clangd/package.nix
+++ b/pkgs/by-name/co/coc-clangd/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage {
   pname = "coc-clangd";
-  version = "0-unstable-2026-01-01";
+  version = "0-unstable-2026-04-01";
 
   src = fetchFromGitHub {
     owner = "clangd";
     repo = "coc-clangd";
-    rev = "d4f246f326f066637653eafdf60e12e6b159827d";
-    hash = "sha256-+ydeReWxXp93PtU0zv8OEuSpIebqi1avGNzopyKXeD0=";
+    rev = "34d9ed8e7a08f29e398720802401455733e6a481";
+    hash = "sha256-PiPH9kXmVdu9Ul0t28E1jumZILX7IwIr2OBDfCepobs=";
   };
 
-  npmDepsHash = "sha256-1331Qaz9BXOeg6NsHuIokXI6VAjiRoslbLT3hXcjgak=";
+  npmDepsHash = "sha256-QVsNztjTuHU0vu53IxjfFqllj1JxHnLwT9B9jaUnWIo=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix
index e7ecd754de28..4a6d73803aa7 100644
--- a/pkgs/by-name/co/cocogitto/package.nix
+++ b/pkgs/by-name/co/cocogitto/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cocogitto";
-  version = "6.5.0";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "oknozor";
     repo = "cocogitto";
     tag = finalAttrs.version;
-    hash = "sha256-aAVoPPeuJN6QPcuc3oBF93dP6U+74bAoSDw93XR01Vo=";
+    hash = "sha256-Z+SXB6bDxyR+Bt3Pz6uF9+sZLjbiFNYeECVFZbx40h8=";
   };
 
-  cargoHash = "sha256-yDpZHkRKsWXXHuSKnzhGrjsFLUFZEpC23tcU3FeUZK8=";
+  cargoHash = "sha256-TGcgiXLgxeOO44eNfd9F0VonTTJhOn1iEJwrO65wcxk=";
 
   # Test depend on git configuration that would likely exist in a normal user environment
   # and might be failing to create the test repository it works in.
@@ -40,6 +40,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "cog";
     homepage = "https://github.com/oknozor/cocogitto";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ gs-101 ];
   };
 })
diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 0e4f95c305e6..a1cb12b238da 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -1,22 +1,22 @@
 {
-  "version": "3.1.15",
+  "version": "3.2.11",
   "vscodeVersion": "1.105.1",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/linux/x64/Cursor-3.1.15-x86_64.AppImage",
-      "hash": "sha256-7Lgrb0SAkkm8+LZInhXLrQHoDLJa63+KvGStp03jepc="
+      "url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/linux/x64/Cursor-3.2.11-x86_64.AppImage",
+      "hash": "sha256-xRtrBvyhG97qHzZTufiEdfRIFyIWSvodIgX5J9ToNWo="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/linux/arm64/Cursor-3.1.15-aarch64.AppImage",
-      "hash": "sha256-kZf4qmOdtp3HFe/L6yehZ0cg5DklJwg+Lmnlhn6KBRM="
+      "url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/linux/arm64/Cursor-3.2.11-aarch64.AppImage",
+      "hash": "sha256-T16gRDEGGahpvHsewPv5EBoGJeu6bONuYOenK6frDkg="
     },
     "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-GIBT7DU+J/hQ/qbDUdgRrO24z66JASQlfRpVFBsCiw0="
+      "url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-zPLh24QI76ORzpCQUV30oB5RtRo7rVcOPY6oK05LngI="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/3a67af7b780e0bfc8d32aefa96b8ff1cb8817f88/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-NouEzXpKO2A3/y8FCNTXspm+Rim6a5Yi1yS1kLeevi8="
+      "url": "https://downloads.cursor.com/production/e9ee1339915a927dfb2df4a836dd9c8337e17cc2/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-XeA1/kyZiKAS7op3QXm76clOB+UYTNj4mWIwRV1ISYY="
     }
   }
 }
diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index 28dc5721b772..1ca57d0bd915 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codebook";
-  version = "0.3.37";
+  version = "0.3.38";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1eZ9HzGK/Zyjb0ffGZc08DKqwMtUh6Ei04vAtgCOQoc=";
+    hash = "sha256-dePa6QgpyY4xyK8VSzlbo1MDi3WMXSaT9X2six8dKGU=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-lWl2E5I/1Qj5TvQfxBfNsMYIIpL+yGlrA7YVokKwtqQ=";
+  cargoHash = "sha256-kR1XhVWOFKvJ9Fy8PZTQP/YwXKtpJL31BqzHBxGNbhY=";
 
   env = {
     CARGO_PROFILE_RELEASE_LTO = "fat";
diff --git a/pkgs/by-name/co/codecrafters-cli/package.nix b/pkgs/by-name/co/codecrafters-cli/package.nix
index 9c6b97dcafb0..c9d57cf22eee 100644
--- a/pkgs/by-name/co/codecrafters-cli/package.nix
+++ b/pkgs/by-name/co/codecrafters-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "codecrafters-cli";
-  version = "53";
+  version = "54";
 
   src = fetchFromGitHub {
     owner = "codecrafters-io";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LuMLYupL6OgWujJzH/gu3VRI24LjmqOwPOP2ROGcjlk=";
+    hash = "sha256-f8tasK6pWML2lbngf+1u8YQqWvRmHH9yLiiLhsCpiJY=";
     # A shortened git commit hash is part of the version output, and is
     # needed at build time. Use the `.git` directory to retrieve the
     # commit SHA, and remove the directory afterwards since it is not needed
diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix
index b54ea14506f3..0b2f0c27a9ac 100644
--- a/pkgs/by-name/co/codeql/package.nix
+++ b/pkgs/by-name/co/codeql/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.25.2";
+  version = "2.25.3";
 
   dontConfigure = true;
   dontBuild = true;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-ENPcgyZpvxMK/FXAMQmNLRFH9o6K82EOEpzzJR+YO5s=";
+    hash = "sha256-dOoGJk3YT35XlykbXcpkURXP7HUNorJPUdPF0K9v92U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/codex-acp/hashes.json b/pkgs/by-name/co/codex-acp/hashes.json
new file mode 100644
index 000000000000..c816627693e9
--- /dev/null
+++ b/pkgs/by-name/co/codex-acp/hashes.json
@@ -0,0 +1,8 @@
+{
+  "version": "0.9.4",
+  "hash": "sha256-sVmy7t1+z88WmYuupVmUA3GYA2kkv3nY7Z3Ic99f5UY=",
+  "cargoHash": "sha256-Ik6pewc6f+cmVKiqVj1g0h7cIxLhE6xOd9p/ySo/EPg=",
+  "codexRev": "c34b30a3c128bb75fcec27ef838c93c99b92fc61",
+  "codexSrcHash": "sha256-SnJHiecKNCHhkiMpbsEwpUarpKLpxn1JOHLHy2vgRog=",
+  "nodeVersionHash": "sha256-q/bOpgF6/0K3MDKXAC+bi1Rb/vCHNhKZpNDbhyYH+oc="
+}
diff --git a/pkgs/by-name/co/codex-acp/package.nix b/pkgs/by-name/co/codex-acp/package.nix
index f7c3e064941a..7d2b617c86f9 100644
--- a/pkgs/by-name/co/codex-acp/package.nix
+++ b/pkgs/by-name/co/codex-acp/package.nix
@@ -1,22 +1,61 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
+  fetchurl,
   rustPlatform,
   pkg-config,
   openssl,
+  libcap,
 }:
-rustPlatform.buildRustPackage (finalAttrs: {
+let
+  versionData = builtins.fromJSON (builtins.readFile ./hashes.json);
+  inherit (versionData)
+    version
+    hash
+    cargoHash
+    codexRev
+    codexSrcHash
+    nodeVersionHash
+    ;
+
+  # codex-core uses include_str!("../../../../node-version.txt"), so we need
+  # to place node-version.txt at the vendored workspace root.
+  nodeVersionFile = fetchurl {
+    url = "https://raw.githubusercontent.com/zed-industries/codex/${codexRev}/codex-rs/node-version.txt";
+    hash = nodeVersionHash;
+  };
+
+  # codex-linux-sandbox compiles a patched bubblewrap source tree from
+  # codex-rs/vendor/bubblewrap. Cargo vendoring flattens workspace layout,
+  # so this directory must be provided explicitly.
+  codexSrc = fetchFromGitHub {
+    owner = "zed-industries";
+    repo = "codex";
+    rev = codexRev;
+    hash = codexSrcHash;
+  };
+in
+rustPlatform.buildRustPackage {
   pname = "codex-acp";
-  version = "0.9.2";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "codex-acp";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-UtfvuejBnciksytIkTE2yFLTTy5gIB/kbOg7abTBGqQ=";
+    rev = "v${version}";
+    inherit hash;
   };
 
-  cargoHash = "sha256-pCHmYa+5xkON2BoAh7RRe5lQeUqSNgqemt0stHQly6c=";
+  inherit cargoHash;
+
+  preBuild = ''
+    cp ${nodeVersionFile} "$NIX_BUILD_TOP/codex-acp-${version}-vendor/node-version.txt"
+  '';
+
+  env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+    CODEX_BWRAP_SOURCE_DIR = "${codexSrc}/codex-rs/vendor/bubblewrap";
+  };
 
   nativeBuildInputs = [
     pkg-config
@@ -24,18 +63,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [
     openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libcap
   ];
 
   doCheck = false;
 
+  passthru.updateScript = ./update.py;
+
   meta = {
     description = "An ACP-compatible coding agent powered by Codex";
     homepage = "https://github.com/zed-industries/codex-acp";
-    changelog = "https://github.com/zed-industries/codex-acp/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/zed-industries/codex-acp/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ tlvince ];
     platforms = lib.platforms.unix;
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
     mainProgram = "codex-acp";
   };
-})
+}
diff --git a/pkgs/by-name/co/codex-acp/update.py b/pkgs/by-name/co/codex-acp/update.py
new file mode 100755
index 000000000000..38ef25c5ab45
--- /dev/null
+++ b/pkgs/by-name/co/codex-acp/update.py
@@ -0,0 +1,216 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i python3 -p python3 nix cacert
+
+"""Update script for codex-acp package.
+
+codex-acp depends on crates from zed-industries/codex via a git dependency.
+To keep the Nix expression up to date, we need to:
+- update codex-acp source hash,
+- extract the pinned codex git revision from Cargo.lock,
+- refresh node-version.txt hash for that codex revision,
+- refresh codex source hash for vendored bubblewrap on Linux,
+- recompute cargoHash.
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import re
+import subprocess
+import tarfile
+import tempfile
+import urllib.request
+from pathlib import Path
+
+SCRIPT_DIR = Path(__file__).resolve().parent
+NIXPKGS_ROOT = SCRIPT_DIR.parents[4]
+HASHES_FILE = SCRIPT_DIR / "hashes.json"
+
+OWNER = "zed-industries"
+REPO = "codex-acp"
+DUMMY_CARGO_HASH = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+ANSI_ESCAPE_RE = re.compile(r"\x1b\[[0-9;]*m")
+
+
+def run(cmd: list[str], cwd: Path | None = None) -> str:
+    result = subprocess.run(
+        cmd,
+        cwd=str(cwd) if cwd else None,
+        check=False,
+        capture_output=True,
+        text=True,
+    )
+    if result.returncode != 0:
+        output = result.stderr.strip() or result.stdout.strip()
+        msg = f"Command failed ({result.returncode}): {' '.join(cmd)}"
+        if output:
+            msg = f"{msg}\n{output}"
+        raise RuntimeError(msg)
+    return result.stdout.strip()
+
+
+def github_request(url: str) -> dict:
+    headers = {
+        "Accept": "application/vnd.github+json",
+    }
+    token = os.environ.get("GITHUB_TOKEN")
+    if token:
+        headers["Authorization"] = f"Bearer {token}"
+
+    req = urllib.request.Request(url, headers=headers)
+    with urllib.request.urlopen(req) as response:
+        return json.loads(response.read().decode("utf-8"))
+
+
+def fetch_latest_release(owner: str, repo: str) -> str:
+    data = github_request(f"https://api.github.com/repos/{owner}/{repo}/releases/latest")
+    tag_name = data["tag_name"]
+    return tag_name[1:] if tag_name.startswith("v") else tag_name
+
+
+def version_key(version: str) -> tuple[int, ...]:
+    parts = re.findall(r"\d+", version)
+    return tuple(int(part) for part in parts)
+
+
+def should_update(current: str, latest: str) -> bool:
+    return version_key(latest) > version_key(current)
+
+
+def load_hashes(path: Path) -> dict[str, str]:
+    with path.open() as f:
+        return json.load(f)
+
+
+def save_hashes(path: Path, data: dict[str, str]) -> None:
+    with path.open("w") as f:
+        json.dump(data, f, indent=2)
+        f.write("\n")
+
+
+def prefetch_sri(url: str, *, unpack: bool = False) -> str:
+    cmd = ["nix-prefetch-url", "--type", "sha256"]
+    if unpack:
+        cmd.append("--unpack")
+    cmd.append(url)
+
+    raw_hash = run(cmd, cwd=NIXPKGS_ROOT)
+    return run(
+        [
+            "nix",
+            "--extra-experimental-features",
+            "nix-command",
+            "hash",
+            "to-sri",
+            "--type",
+            "sha256",
+            raw_hash,
+        ],
+        cwd=NIXPKGS_ROOT,
+    )
+
+
+def extract_codex_rev_from_tarball(tag: str) -> str:
+    """Extract zed-industries/codex git revision from codex-acp Cargo.lock."""
+    url = f"https://github.com/{OWNER}/{REPO}/archive/refs/tags/{tag}.tar.gz"
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        tarball_path = Path(tmpdir) / "source.tar.gz"
+        urllib.request.urlretrieve(url, tarball_path)
+
+        with tarfile.open(tarball_path, "r:gz") as tar:
+            for member in tar.getmembers():
+                if not member.name.endswith("Cargo.lock"):
+                    continue
+                cargo_lock = tar.extractfile(member)
+                if cargo_lock is None:
+                    continue
+
+                content = cargo_lock.read().decode("utf-8")
+                match = re.search(r"zed-industries/codex\?branch=acp#([a-f0-9]+)", content)
+                if match:
+                    return match.group(1)
+
+    raise RuntimeError("Could not extract codex git revision from Cargo.lock")
+
+
+def calculate_dependency_hash(attr_path: str) -> str:
+    result = subprocess.run(
+        ["nix-build", "--no-out-link", "-A", attr_path],
+        cwd=str(NIXPKGS_ROOT),
+        check=False,
+        capture_output=True,
+        text=True,
+    )
+    output = ANSI_ESCAPE_RE.sub("", f"{result.stdout}\n{result.stderr}")
+
+    match = re.search(r"got:\s*(sha256-[A-Za-z0-9+/=]+)", output)
+    if match:
+        return match.group(1)
+
+    if result.returncode == 0:
+        raise RuntimeError("nix-build unexpectedly succeeded with placeholder cargoHash")
+
+    raise RuntimeError("Failed to parse cargoHash from nix-build output")
+
+
+def main() -> None:
+    data = load_hashes(HASHES_FILE)
+    current = data["version"]
+    latest = fetch_latest_release(OWNER, REPO)
+
+    print(f"Current: {current}, Latest: {latest}")
+
+    if not should_update(current, latest):
+        print("Already up to date")
+        return
+
+    tag = f"v{latest}"
+    print(f"Updating codex-acp to {latest}...")
+
+    source_url = f"https://github.com/{OWNER}/{REPO}/archive/refs/tags/{tag}.tar.gz"
+    print("Calculating source hash...")
+    source_hash = prefetch_sri(source_url, unpack=True)
+    print(f"  hash: {source_hash}")
+
+    print("Extracting codex git revision from Cargo.lock...")
+    codex_rev = extract_codex_rev_from_tarball(tag)
+    print(f"  codexRev: {codex_rev}")
+
+    codex_src_url = f"https://github.com/zed-industries/codex/archive/{codex_rev}.tar.gz"
+    print("Calculating codex source hash...")
+    codex_src_hash = prefetch_sri(codex_src_url, unpack=True)
+    print(f"  codexSrcHash: {codex_src_hash}")
+
+    node_version_url = (
+        f"https://raw.githubusercontent.com/zed-industries/codex/{codex_rev}/"
+        "codex-rs/node-version.txt"
+    )
+    print("Calculating node-version.txt hash...")
+    node_version_hash = prefetch_sri(node_version_url, unpack=False)
+    print(f"  nodeVersionHash: {node_version_hash}")
+
+    data = {
+        "version": latest,
+        "hash": source_hash,
+        "cargoHash": DUMMY_CARGO_HASH,
+        "codexRev": codex_rev,
+        "codexSrcHash": codex_src_hash,
+        "nodeVersionHash": node_version_hash,
+    }
+    save_hashes(HASHES_FILE, data)
+
+    print("Calculating cargoHash...")
+    attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", "codex-acp")
+    cargo_hash = calculate_dependency_hash(attr_path)
+    print(f"  cargoHash: {cargo_hash}")
+
+    data["cargoHash"] = cargo_hash
+    save_hashes(HASHES_FILE, data)
+
+    print(f"Updated to {latest}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index dd9ddcb0d582..03387cde9e34 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -25,18 +25,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.122.0";
+  version = "0.125.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-CpXWP64URsgt/PhQrUkrT87KG633hxRUIY0wWrTFmjk=";
+    hash = "sha256-q175gmBw+edb5+w8TM36yUeFsyIdB1/IwWzbxBbBmoA=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-2qtMLWSdYWJ+blNfCHXtgmzizuM1HgpTGa5RQ3U/AEM=";
+  cargoHash = "sha256-fDVlj7zAZnwP9YBaYaSQZXYYWrBm5IEyLT9zoorvzFg=";
 
   # Match upstream's release build (codex only) and drop the expensive
   # release profile tweaks that dominate cold build time in nixpkgs.
diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix
index 3a07a88969f3..772f501586ef 100644
--- a/pkgs/by-name/co/cog/package.nix
+++ b/pkgs/by-name/co/cog/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cog";
-  version = "0.1.8";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "cog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eIvesUCvIluSFZuiU6NI1JUrpuRGi0t2cz5uNkvE6/c=";
+    hash = "sha256-AFR9D776MRXmSR/hvXJd7xorHEl1VAio/crEvUU8kuY=";
   };
 
-  vendorHash = "sha256-OrFRYCWb//ga1R+QIkg4aMhQYAFOAxRPi5IvGjUL6I4=";
+  vendorHash = "sha256-UVcsstCSY3OZkvaujrlnGHKI3BTMcb3UN3lwOMPKLdw=";
 
   subPackages = [ "cmd/cli" ];
 
diff --git a/pkgs/by-name/co/coldsnap/package.nix b/pkgs/by-name/co/coldsnap/package.nix
index f1eadab25e62..7eb0fb8d38ab 100644
--- a/pkgs/by-name/co/coldsnap/package.nix
+++ b/pkgs/by-name/co/coldsnap/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "coldsnap";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "coldsnap";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8+YPKjHi3VURzSOflIa0x4uBkoDMYGFJiFcNJ+8NJ7Q=";
+    hash = "sha256-QQWH8cWBskXOmiZygvkNDyBX4WdsgnA0/ec6/UnmwIA=";
   };
 
-  cargoHash = "sha256-4w79zZcgIulLIArY2ErOHwaWA8g/mA2cSKCzJx4X9vM=";
+  cargoHash = "sha256-U5MinzKQYTHRXM3WndkMEbvoT9tPwIIB3QxEOwWA3zE=";
 
   buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/co/colloid-icon-theme/package.nix b/pkgs/by-name/co/colloid-icon-theme/package.nix
index 4e5d41e809fc..fe35ad973c5e 100644
--- a/pkgs/by-name/co/colloid-icon-theme/package.nix
+++ b/pkgs/by-name/co/colloid-icon-theme/package.nix
@@ -44,13 +44,13 @@ lib.checkListOfEnum "colloid-icon-theme: scheme variants"
   stdenvNoCC.mkDerivation
   rec {
     inherit pname;
-    version = "2025-02-09";
+    version = "2025-07-19";
 
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = "colloid-icon-theme";
       tag = version;
-      hash = "sha256-x2SSaIkKm1415avO7R6TPkpghM30HmMdjMFUUyPWZsk=";
+      hash = "sha256-CzFEMY3oJE3sHdIMQQi9qizG8jKo72gR8FlVK0w0p74=";
     };
 
     nativeBuildInputs = [
@@ -86,6 +86,11 @@ lib.checkListOfEnum "colloid-icon-theme: scheme variants"
       runHook postInstall
     '';
 
+    # Drop dangling symlinks from the upstream icon set.
+    postFixup = ''
+      find $out/share/icons -xtype l -delete
+    '';
+
     passthru.updateScript = gitUpdater { };
 
     meta = {
diff --git a/pkgs/by-name/co/color-transformation-language/package.nix b/pkgs/by-name/co/color-transformation-language/package.nix
index 238c9ee18b7f..c818c7aa0300 100644
--- a/pkgs/by-name/co/color-transformation-language/package.nix
+++ b/pkgs/by-name/co/color-transformation-language/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.5.5";
 
   src = fetchFromGitHub {
-    owner = "ampas";
+    owner = "aces-aswf";
     repo = "CTL";
     rev = "ctl-${finalAttrs.version}";
     hash = "sha256-X6W6IXZUMBTZJTzpAk7FmoEhSPELTmhYv68dZmqUJ2g=";
@@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Programming language for digital color management";
-    homepage = "https://github.com/ampas/CTL";
-    changelog = "https://github.com/ampas/CTL/blob/${finalAttrs.src.rev}/CHANGELOG";
+    homepage = "https://github.com/aces-aswf/CTL";
+    changelog = "https://github.com/aces-aswf/CTL/blob/${finalAttrs.src.rev}/CHANGELOG";
     license = lib.licenses.ampas;
     maintainers = with lib.maintainers; [ paperdigits ];
     mainProgram = "ctl";
diff --git a/pkgs/by-name/co/comodoro/package.nix b/pkgs/by-name/co/comodoro/package.nix
index 0faa8a3a2192..802113dd12ff 100644
--- a/pkgs/by-name/co/comodoro/package.nix
+++ b/pkgs/by-name/co/comodoro/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.1.2";
 
   src = fetchFromGitHub {
-    owner = "soywod";
+    owner = "pimalaya";
     repo = "comodoro";
     rev = "v${finalAttrs.version}";
     hash = "sha256-FnNNJ6WHR8KCsW+1hPIYddxQlUvpPc+SRbaxAcdVEUk=";
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "CLI to manage your time";
     homepage = "https://github.com/pimalaya/comodoro";
-    changelog = "https://github.com/soywod/comodoro/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/pimalaya/comodoro/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ soywod ];
     mainProgram = "comodoro";
diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix
index f9de2e88ea75..a393347d4464 100644
--- a/pkgs/by-name/co/composefs/package.nix
+++ b/pkgs/by-name/co/composefs/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.0.8";
 
   src = fetchFromGitHub {
-    owner = "containers";
+    owner = "composefs";
     repo = "composefs";
     tag = "v${finalAttrs.version}";
     hash = "sha256-nuQ3R/0eDS58HmN+0iXcYT5EtkY3J257EdtLir5vm4c=";
@@ -96,8 +96,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "File system for mounting container images";
-    homepage = "https://github.com/containers/composefs";
-    changelog = "https://github.com/containers/composefs/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/composefs/composefs";
+    changelog = "https://github.com/composefs/composefs/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       gpl2Only
       asl20
diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index c8fa25f3da41..7d0102434b68 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";
     mainProgram = "comrak";
     homepage = "https://github.com/kivikakk/comrak";
-    changelog = "https://github.com/kivikakk/comrak/blob/v${finalAttrs.version}/changelog.txt";
+    changelog = "https://github.com/kivikakk/comrak/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [
       kivikakk
diff --git a/pkgs/by-name/co/container2wasm/package.nix b/pkgs/by-name/co/container2wasm/package.nix
index 3c8a4ea6d035..697b4b815a09 100644
--- a/pkgs/by-name/co/container2wasm/package.nix
+++ b/pkgs/by-name/co/container2wasm/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "0.8.3";
 
   src = fetchFromGitHub {
-    owner = "ktock";
+    owner = "container2wasm";
     repo = "container2wasm";
     tag = "v${finalAttrs.version}";
     hash = "sha256-cE/cKMMslu4GGVV3aRcdsu7cTdsVABZLs8GX6ihgW38=";
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
-    "-X=github.com/ktock/container2wasm/version.Version=${finalAttrs.version}"
+    "-X=github.com/container2wasm/container2wasm/version.Version=${finalAttrs.version}"
   ];
 
   subPackages = [
@@ -29,8 +29,8 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Container to WASM converter";
-    homepage = "https://github.com/ktock/container2wasm";
-    changelog = "https://github.com/ktock/container2wasm/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/container2wasm/container2wasm";
+    changelog = "https://github.com/container2wasm/container2wasm/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dit7ya ];
     mainProgram = "c2w";
diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix
index 98140dbc655d..49e42328389a 100644
--- a/pkgs/by-name/co/context7-mcp/package.nix
+++ b/pkgs/by-name/co/context7-mcp/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "context7-mcp";
-  version = "2.1.8";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "upstash";
     repo = "context7";
     tag = "${tag-prefix}@${finalAttrs.version}";
-    hash = "sha256-TMvDzDcZd9hoYI84x+jewOJYkSrb1qwVRTdzD2SwG4U=";
+    hash = "sha256-MFHajv1f+Xj8BtiiDQs4Sct1IhYS4+hYY+PdVAYqkNw=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 3;
-    hash = "sha256-MHKzlxlyvQoLvoLomhToaZgnPU7H6iHLmokhotZF6VY=";
+    hash = "sha256-f3PXpCdmKh2LPD5VyFsRdLR7CEvh+GozkQFSeeNuj2c=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/co/contour/package.nix b/pkgs/by-name/co/contour/package.nix
index d89b1883f771..2bd48c0e14b6 100644
--- a/pkgs/by-name/co/contour/package.nix
+++ b/pkgs/by-name/co/contour/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "contour";
-  version = "0.6.2.8008";
+  version = "0.6.3.8249";
 
   src = fetchFromGitHub {
     owner = "contour-terminal";
     repo = "contour";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xbJxV1q7+ddhnH0jDYzqVHwARCD0EyVh3POFRkl4d1Q=";
+    hash = "sha256-+rr1bn4O5v9rXyoIx+ejL+qe5Kf2bFpgWA3DkWRcDYk=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -42,6 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
     ./remove-deep-flag-from-codesign.diff
   ];
 
+  # Dependencies are already managed by nix
+  cmakeFlags = [ "-DCONTOUR_USE_CPM=OFF" ];
+
   outputs = [
     "out"
     "terminfo"
diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix
index 17b2e646e5d4..09569c1acc11 100644
--- a/pkgs/by-name/co/cook-cli/package.nix
+++ b/pkgs/by-name/co/cook-cli/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cook-cli";
-  version = "0.27.1";
+  version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "cooklang";
     repo = "cookcli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-18TyADsUpzuaEW3AzjhIhCW4xjSLj7sqqEPk+tdJxh8=";
+    hash = "sha256-fg8qq4j9NbQvnduPRBwqp+GyQaHx2axqH39KeMZqy2k=";
   };
 
-  cargoHash = "sha256-QSLj6/tu0a4Vb1Q4I/dUoMlZTB95jsEZjl1HbpchtDo=";
+  cargoHash = "sha256-eU/iOb5gHEjWdALeVQr2K3JkD0qOwco3Vkm05HWKdIs=";
 
   # Build without the self-updating feature
   buildNoDefaultFeatures = true;
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-KnVtLFD//Nq7ilu6bY6zrlLpyrHVmwxxojOzlu7DdLQ=";
+    hash = "sha256-tBOBa2plgJ0dG5eDD9Yc9YS+Dh6rhBdqU6JiZUjTUY4=";
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/co/cooper-hewitt/package.nix b/pkgs/by-name/co/cooper-hewitt/package.nix
index f016cfe4a8e5..4fd140fa1621 100644
--- a/pkgs/by-name/co/cooper-hewitt/package.nix
+++ b/pkgs/by-name/co/cooper-hewitt/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation {
@@ -13,20 +14,13 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-bTlEXQeYNNspvnNdvQhJn6CNBrcSKYWuNWF/N6+3Vb0=";
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/fonts/opentype
-    mv *.otf $out/share/fonts/opentype
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     homepage = "https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/";
     description = "Contemporary sans serif, with characters composed of modified-geometric curves and arches";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ pancaek ];
   };
 }
diff --git a/pkgs/by-name/co/coost/package.nix b/pkgs/by-name/co/coost/package.nix
index 0ecdf3cf684b..3c7402c3a708 100644
--- a/pkgs/by-name/co/coost/package.nix
+++ b/pkgs/by-name/co/coost/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace cmake/coost.pc.in \
       --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
-      --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \
+      --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
   '';
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 7c0d40bcd392..638e90615b79 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.467.0";
+  version = "1.477.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-JSxuYBeMKTiBOSQk4IGcst0YYcXGi4V0D4EkJfEbPzo=";
+    hash = "sha256-Z3ZMlZrAktNqHpuJhCG9Twng+tIc47NhHQr1DwF2h80=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix
index 0d3e6778cf07..9c8f7cdde74b 100644
--- a/pkgs/by-name/co/copybara/package.nix
+++ b/pkgs/by-name/co/copybara/package.nix
@@ -13,11 +13,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "copybara";
-  version = "20260413";
+  version = "20260420";
 
   src = fetchurl {
     url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
-    hash = "sha256-8FmXPfxlORbIA0cAcRPGMQ7n1tI/VjJ3uI7PHQHuaZU=";
+    hash = "sha256-0ddQZ5CtsV0trTi6+AhNA2KU9hQAedz47MpxvPK27cg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/corepack/missing-hashes.json b/pkgs/by-name/co/corepack/missing-hashes.json
index b9d097b31333..0e91c9ffefed 100644
--- a/pkgs/by-name/co/corepack/missing-hashes.json
+++ b/pkgs/by-name/co/corepack/missing-hashes.json
@@ -1,50 +1,53 @@
 {
-  "@esbuild/aix-ppc64@npm:0.25.12": "deeef1c11ce6d3dde3fc87368cf600218de18cff4cefe9888a09c39cc81177305c51c2dbccf6513c1b07795c67a11297c12014366fdeb9e51f34896020dd0210",
-  "@esbuild/android-arm64@npm:0.25.12": "7364b62583e0b0e0c3997d38815f462b11b85997efad33099715ede94a3bac29a80a98709e6ba902e9ced207242308d5923b249da7af2fb83b50efab4bd693fd",
-  "@esbuild/android-arm@npm:0.25.12": "04c9b60e0447331d7005745a7e9750987db465fd94717df62276b5dd7e13a3789db95b029f6e9f735e583b95f2f50b18f2aba1a381c8b5645156bb9d21ecacf0",
-  "@esbuild/android-x64@npm:0.25.12": "a22c5c03c55c3a12693b67f1a5de8dff7b853f79261ad1562a55b25bf91d327fd8c8899444c069a3fb68175c7df6dd0f2824ba5051927a4711f5841793cc58f2",
-  "@esbuild/darwin-arm64@npm:0.25.12": "5a66f6d44f2dac62341cc73956d8a1ea346e2e66f8cbdfcda9349a0b6ad01024d6c9c2ded05a9ba720c7541575c0b4be4c4ed6f62c529c13df141bb2a247f461",
-  "@esbuild/darwin-x64@npm:0.25.12": "181a933b603253a3eab9173a97e619b59fb953c70309fd3e005e58ed32654c866f752edde7250e63f788bb857e13b28c710d87496479b2de894226bf5779661e",
-  "@esbuild/freebsd-arm64@npm:0.25.12": "7a7bd7f62d7e5e4a162bea901365bef5996ac15b3b0af361ce6adb77431f95cc9b831e8f764056f2395fc09a4117fdc7d14a583af4344770ae13dc1dc030dcb4",
-  "@esbuild/freebsd-x64@npm:0.25.12": "ca5c61ab87dadadff1cd72c62c32b3dbff6e5242ee6f7f53c579e3e11aae263bd009e18a2cbd36a065d42e7b7c43e7186832584f7436646bfc25dc637fac819d",
-  "@esbuild/linux-arm64@npm:0.25.12": "b66f73867351e0666fe00f9281bb7d8dd089d221a5cef6311826b169271b8451f5e265fb41625161a0af142641d5db1e02999aaba98dc1b8a52f4c099db07cb7",
-  "@esbuild/linux-arm@npm:0.25.12": "1ea6f003abec0177f27ee6954fcce15cecffd94aa57781e712936b6eed64d9579267bcd7612645d3b41cc7591ae411d6491c4517e3bc0de936f101e278510644",
-  "@esbuild/linux-ia32@npm:0.25.12": "df3d5ceb61b7cf4471cdba740a8ca46ae6c5a9dc6dce60440d2a62a25c36144e38b6bf301937117bb183a7b5517ee87a9735d543c785a13b1de56715e34cc7e6",
-  "@esbuild/linux-loong64@npm:0.25.12": "b38ba56880536b6bd46467673d81a49ed41661cd217065d440a384d0b4dd1bd59dbc79d6bc81c4948959116a7bc339c1f9749412705ff2a2f7a5c1bef69e2205",
-  "@esbuild/linux-mips64el@npm:0.25.12": "a8694250193ecf430fb541d1371226a922c462cafac6be65e051f13efbbdf62aa94316fc5a0805f010f60da4051517aca3bfac121b352c443803aac874024d85",
-  "@esbuild/linux-ppc64@npm:0.25.12": "f9c2ca2a75aefa5495ce3cb4e0a4086816b083dfe7d0642afc22c2eac4ea50f1ca4d3a353b6a603fffc689f57bd17e6cc3c0fe8d5727cb2d429bbdc1db1fdd38",
-  "@esbuild/linux-riscv64@npm:0.25.12": "29bc64137de629f8210e4788cef6cc021d8b432c0b28b9df05ccca6e60b772e7d23c3c9faa5da4037c7dd1574f66fdcb71775ee14298f86a571a2556beeb11d9",
-  "@esbuild/linux-s390x@npm:0.25.12": "cb32577ea8441277525a2acf888d32ef8d9ebbd7563d5d4ec9b5b387b11e9aa7d8a3f7cc3faea4524dc068a767300537aca4e127ac524030207d9745a785f30b",
-  "@esbuild/linux-x64@npm:0.25.12": "5364064fc64864df2ad963d21430b7dbeb1918a829e3d82f9c7cc87ffbca551e312338dc8016e3008288f85a9f181986056bbc782a52ee547d2435dd50738593",
-  "@esbuild/netbsd-arm64@npm:0.25.12": "9c9e0b87fd7385604fa4a118e88ba88b36ce846174016d7c71939ba2be2de57e720e3c684ec7de52eaae17edf4f6df88442c8eb1db7e4675870b357b15bc1bd2",
-  "@esbuild/netbsd-x64@npm:0.25.12": "148e7a91557ad0084af1478921bbb88ce3cb78a213e5b16250b34a28057d5ff5dd14483bec73edd959fdbd6daf617e2a56137596530de07592180c5777ac491b",
-  "@esbuild/openbsd-arm64@npm:0.25.12": "87b6070d4c63615802709e5f7c2de23d0c201186e18777200a023a1d84da1ba39bab3b0b444a468f93d4039147c333499589e9f00717d1e4a7eeb764e01082af",
-  "@esbuild/openbsd-x64@npm:0.25.12": "664bfe0fc286b1850147797d7a625b33614eba656da0fa589d93956f040559a9211ebf7b68c9e90b49b898ba330f2f81daab763c596f5c84ae4183ffa8bc0c69",
-  "@esbuild/openharmony-arm64@npm:0.25.12": "422e2d50f8948b45342301ee4c08ea988619bd025830c1a195eb41cafb1dedb35b8441a66c679a7a82fb920e56f89fb6bff85b4c4f10d09584f437be125d8745",
-  "@esbuild/sunos-x64@npm:0.25.12": "ea9f6d4d1fe803063075ffa20b3a4ae11a92a933e56d437bfa9de13bdcd2320b8057aa3e971c12fb04f1388f55185d885a2a86a96be914a42808bc636575164c",
-  "@esbuild/win32-arm64@npm:0.25.12": "f61e582d7a3fa474cf764573dd9b54a48bd4f0bb0684f4a588a79a1ba0fe37447bc8bc5d2d8809d1f27022ad0c95a5728ce7d2b5941dac78607c1e50ca14c6d7",
-  "@esbuild/win32-ia32@npm:0.25.12": "4c135f8face7b6e5682efc5972367b579f06656487d1859c3e3165d5e10a95c455bb0aa69339fc3db215084f3229ffb954d87b2780645993f70dee883cb9ba73",
-  "@esbuild/win32-x64@npm:0.25.12": "7db86204f566c4d1155458c6e383d5f560a3f7e00475c65e97549e30a222bac66bd64cfd422691a7dcead2e0518e50aab5caeb7f525dfea6875c3209d6352e8e",
-  "@rollup/rollup-android-arm-eabi@npm:4.53.2": "624c3cf3ff0b7ab780de960bce750ed28c4df7569dfc289e8c234fe1763e2e68a9747a4cb9cdb6ec1b1621e48dfd940ff8ab041c441448d053288558712ead8c",
-  "@rollup/rollup-android-arm64@npm:4.53.2": "a05e83077081eb4df811a3f3fbab914d1ed3ad945a60b8b2802dc21fa5bd0d3fe57e727c6b0eb36ba2e7cbe637f9be9bfeaf2fb05d2ed83b8f1971d4337cd21e",
-  "@rollup/rollup-darwin-arm64@npm:4.53.2": "987c4dd3b5edbd713813e1b266289352895af67f3c7649685811c0a688e2c54fd64c9dab2b37ab0eca1431ca868e61f6fa9c18e758204afacfcec4f494bd37e6",
-  "@rollup/rollup-darwin-x64@npm:4.53.2": "afddb37a1dc14017bd99b4aa8a263f9cc115b1968ea5ef51f3da1d0a4b24d869f3be771e1eb99971a52e7e72909d4a2384e4a6815c73b809cbdbad9a5d5b2e1e",
-  "@rollup/rollup-freebsd-arm64@npm:4.53.2": "590828430d14304413e746dcfd5c9133e7a389966c8677a4720b4ecd69ef049c5fddba4c6ea642e61b49b909310fb02fc00ec95cef5447c4bb26f7ac8bc739f6",
-  "@rollup/rollup-freebsd-x64@npm:4.53.2": "c9ba7207d6c9ce516d384f9ffb83c104a2b25d44a96d187a25bcaac5a830af9ef57475aeffc30adcfe0343a052db944ec4ae39af9d298f958386227defc06353",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.53.2": "f70d6dc3684b1599a90bbbab606348ce169a7fdd012d1b5c20238093e30d5b01b168e6f7cc6b6c2233df84d87ab1c05039ee40dda304c388356ebbcdafd1a521",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.53.2": "2bbc219fcaeb2b5e292650e7c9a0076ceabeaad5f1c8d6d3577a8092a565d9c8f3279030c740c86cebd35068fb4640f7f7a6c354011e925d2042d79f59af8da9",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.53.2": "53cd00ef29ad6268e84317c2e30feface713d14df22038265929a8684c76171d6ceedd965201977f0345786d39f641dc1202aed9f4b97a476cfc952cc3719174",
-  "@rollup/rollup-linux-arm64-musl@npm:4.53.2": "5a439746f54b5d657b5930075b725a6a49d4f55aef6e8bdd10c59bc7186428d83028a6a22a4edef66e3ef9a954da9b96218332eaf556c12ab7bc231d88ff12ec",
-  "@rollup/rollup-linux-loong64-gnu@npm:4.53.2": "2a906684e9a1d585755547be77ed7c6f8d69f7f484773ba8285eeb2cbe819b7d06148c167dbb163bab029ae920e46d6977822114d9c24e9103a437637bf22f59",
-  "@rollup/rollup-linux-ppc64-gnu@npm:4.53.2": "fcb23e70c88ee61725b6cc9ef2b01d63ba12b674e86e5e3a7c33e1c25fc7882a666ffb4d14c714c515330f680bc74d2615f661e3f652955102541ac2c74ca217",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.53.2": "cc98bbebc5c4d445e60f14359fb6e2f8acdd23fe81d6aba8b27fee96bce8954ca21119928116d417f389edd594888f614ad39e9a9397de3c1b6e3c3cc9e39e14",
-  "@rollup/rollup-linux-riscv64-musl@npm:4.53.2": "309f231d747bbc5b37093b713c28926c827062e45fb524fa8d07c64834a2e6b84abac110b2a9f099cf76569fa4576d02b36aa292468bf06e57196bf6dd77d2a5",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.53.2": "3f935b10cef450e4a2faff477fd9878f018066a82fc4229bd6a1e7958faaf6499cf262541fe0af03e4fddbbd3d1bd8eab6f05e743463ffdcc4b19bc4b464df8c",
-  "@rollup/rollup-linux-x64-gnu@npm:4.53.2": "4df0206018e3ea80f617028bf0fb69db8ec301fb1863cea791611717807f90e96f8fa4d2449c4e6847514dd5249402764134844bd8a07b50eddcca8069783ac4",
-  "@rollup/rollup-linux-x64-musl@npm:4.53.2": "28d1e7aa206777f600540851caba578be32abfd4379194c7d1d7a6550181eecec1bf342197b8c2096c8743d9f5e2f5641aabb9ee43e172874da438208a45a52f",
-  "@rollup/rollup-openharmony-arm64@npm:4.53.2": "9c430d3ad3cfc294ad221fa9f382e5cfa1479f44098807d43683cea4bcf786d0e5fdeef2a07e0eca5176abf47532b51a1bb8733bb7ee1c8bd11e31567421b89c",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.53.2": "ca5ac1c54519ceffde6f4c69564317b5d84fc9e670fd090ced22916e5bf9e8e25a0deb8377cedb494b8a106f61d128e282b0d4bac9ae2135eb76fdcfee511ec4",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.53.2": "01a6ae614efd77ad83115022da67b437cc7b43868741cbb4923ed2d763e2cded0bb05af5818d4fb7486abe2ab52d435727bc965c2af8efe571018d6ea0ff3e76",
-  "@rollup/rollup-win32-x64-gnu@npm:4.53.2": "ce081608eaa3009279aa5685e1671f15b495910556e396ab3c7585d3d2f5afb354d70544a2ff01654f46c723aac91fd38e0982f9ebba3ef843663d6c42e5692b",
-  "@rollup/rollup-win32-x64-msvc@npm:4.53.2": "6a4195d5ceb9533fb53daeac056d6878a6caeb03c238083db49c7a112accba15ca50e9cb2f9f4417375092ddf4819ca795954dc4a61106e42941b0cfdbb0b44c"
+  "@esbuild/aix-ppc64@npm:0.27.7": "ff8c15b43770c8df995a7274efdb1df5553a3264bff0a42a66bc96a07fc0733a6825b4a339972d2d49fc9be9bec4ac2f4f3f072730fdedc879ce4f9cbf0b242d",
+  "@esbuild/android-arm64@npm:0.27.7": "c340fffda73dfcdf3513f900403d582cbcd8a5fc4cf7abd71aa0d4945391b4c0289e4389f51616cebaac63ec652457941e3e2eefe408230521227ae128c35c9f",
+  "@esbuild/android-arm@npm:0.27.7": "4abbbcb6b0f38d345b530148ebf883d3b1b7321a5c31f9c492bf645813e85afb8984c9d75295d779dbe602807b85995d9ff47ab8e8b22fa1bc67b1cbab9c45db",
+  "@esbuild/android-x64@npm:0.27.7": "719956b9b7eb922a2bf92cc3df93f7f476ae37ad2976bc2185c97b93d63bd1f17b031aec41e9d9a7c3d75c83d6df8daa68191bdfa0d02f4dc39b6fafa6999fd7",
+  "@esbuild/darwin-arm64@npm:0.27.7": "aefb157b95bb749ebf0cd70dd39d20c00825565a0fcc248b775b4cce6252adf694bf3e4894b25368652252139bfdc0d08b75d1139a78f197ee58ed8972cdb28d",
+  "@esbuild/darwin-x64@npm:0.27.7": "898b6b02589dccb0a51655c57c407866bdb2ae5202dacce33e7d9b2f35dd117b3245f6393ffd6726373616147c3d12a462830f51da2a5cfd06e0f60cc252373e",
+  "@esbuild/freebsd-arm64@npm:0.27.7": "aaf8ebcd359f1228f5dd9d90ceca51eaa06d91570b27fa8be9da858ee124e37d45a5fed2aa4849320eb256215acf39b98623cf770ae87f0a0d50323d1acc7fbc",
+  "@esbuild/freebsd-x64@npm:0.27.7": "cc7fa741cebc7041643f1fbfe45d99ce870b8ea42e9a67f4d1cf2fddeb991623619d00865427b3d6aa63ae7618f10c5635c4d047859eaba8d5c7f317d7138d44",
+  "@esbuild/linux-arm64@npm:0.27.7": "b1aea26033d1de82966141b350405e1205ea04fa24707084b50992bfc9d0fbf99e0ad83a31ecd8f8cbc01101f3d92f648ce2cc24273c1e8ced573726393f9c68",
+  "@esbuild/linux-arm@npm:0.27.7": "0950f67b72af73de69483363f046d6a50fc85f6491adcfeadcb6014bdc8a1731e2575fc58d6c68d6834cd6be45e0b247a23f128162864e7686accda1ada3a9d6",
+  "@esbuild/linux-ia32@npm:0.27.7": "6247a3b2658de166c69099208c72ba65d8ddc5ce1575f5e8fd05d4570f3a59bfbd6a5570cfbd890e19a24258edd1b7e91cebe75e2acf182c6087297f26bba29c",
+  "@esbuild/linux-loong64@npm:0.27.7": "0d7f9b60a46e95d09889365b54ea0e2fd6e471e9ceeef27a0cc6b77616b1abe275456b50eae94bed3322dc6ee17fedebc3258dcc88a5522bd5318f6def0d0642",
+  "@esbuild/linux-mips64el@npm:0.27.7": "f3732fa442590b2219d2ec7de1d5086cd31682831dfc25516f2805326b4bd9f68a9fdbf3cce876ee764bf47765b85fdf22290b6a09f87a29c9d0c2d4af0a83c3",
+  "@esbuild/linux-ppc64@npm:0.27.7": "df156f801042116c438c9259451e716533adec6b7d7af5c75cf27feec09ee4d941281049bf979dc0bb7a5b73b955d3974ecac4391a97600a4440a4a003b820e4",
+  "@esbuild/linux-riscv64@npm:0.27.7": "76eccec1c7f047075353ef1f908998a0723f367a39aae39608f7978e5e231ea51ae25fd5258d16345567b94b77e28524cba45bc76afa5eda350adc5bda672142",
+  "@esbuild/linux-s390x@npm:0.27.7": "788799f3e6e61efe6ec0a4a5e2d413dcfe57b27518d679a3d5f82265672fe53604a348658bc09b958cedaead008b63ef02e700469aed2a725e79361458901808",
+  "@esbuild/linux-x64@npm:0.27.7": "77c8cc00c2f647f5a04ca6640711c6e83214a8c619aeb3de52fee36c51709d5f44becaff095ffa2d1d40d53d1a792e80a1702193c155614350cc14de23a48e81",
+  "@esbuild/netbsd-arm64@npm:0.27.7": "cffa469f49165446e82f3031d6601e977131fcf619204370b3fad1b2a4a7dbf57d52e26e146cd1550c80af27470fb016d4b519fb74e3e6947a50391f84b87935",
+  "@esbuild/netbsd-x64@npm:0.27.7": "123b51f84b61f13ae916c0d7b1fa057181ded0e510f762acca178fe7fb679041a30df4f740db381afe8919d41877630ccef0a16ded46248820da0af4b967c29d",
+  "@esbuild/openbsd-arm64@npm:0.27.7": "cca5a166f47d125703451c4369bd337f08516e17aa69db17ff6822c229fcd9beb9bd29b2856c0f13d9d441178011e8c081879418f376c002f72c6aeab83576ed",
+  "@esbuild/openbsd-x64@npm:0.27.7": "d9c2ca562e27331124fcddb230f5b204adfadfd87b746d8369c1c3a72fc6f6e7375684cded7ffadab6f785228d80c4a4ff2c6f593f7ce354f6d57f5b4e43c3c3",
+  "@esbuild/openharmony-arm64@npm:0.27.7": "6566b08b37e3faee6577ae43253f163ce5af22e872e30a93c08fc41e5b3525d742366b1049ba87de16c75c77abd6fce002b49b52a5a1898efb8be5eb18d8dcf3",
+  "@esbuild/sunos-x64@npm:0.27.7": "589389cd4be3de5c24bb5820e4fd1f15f665b3be6b0ab6167f435776bb367e32209d6bf477bdba481195fbe515e1999c1e73adf321a8fb8400fe72052a4aef48",
+  "@esbuild/win32-arm64@npm:0.27.7": "519a2c68186c2cd9f548d89f00f5aa3b5f2fa481fd03908d7b1c922de03bf20236d9fc21a3b4e83915d3611471843b41536c97d74273fb3369b2525767c278be",
+  "@esbuild/win32-ia32@npm:0.27.7": "76470f36efe5290ac694e675a799a46a364aeba9a734cf10869769094b8b9022adc51fdea5869c45a8fdbfcb60ef8d787ae652c264468cdc0f4afb3869157b9c",
+  "@esbuild/win32-x64@npm:0.27.7": "b4df3d0c4024f0daf0891075822718dc31d35aeb91c18c4e8ee750be69f35ebd840d184006746dd88eca0e44574e438d5ab81c614605cc707fb79cf45cf76cba",
+  "@rollup/rollup-android-arm-eabi@npm:4.60.1": "0c9e39dd1f0ad043e1f9ddf8a46d1d47b81eba33997ac59e10c41ddb4705f30c2e0cd8aa40d6a97f3f5cbfd82db71c06f819480fabab8447bfbeb6b4b5dec8a2",
+  "@rollup/rollup-android-arm64@npm:4.60.1": "9f4f86ce20eae1a0a55b41bc8e157990cadaf68441b50184c691c24bdf7b4b6a08b4d3f7ddaaca2a53e398b3a38a57d6257fb8216165b1bd5008b340487689b4",
+  "@rollup/rollup-darwin-arm64@npm:4.60.1": "f019fbddb791781b495b8506fea270fe05ba6c2d87cc5301a7910218219d952371d83432d95251e6ef76710ab45f0c28b47a691bc2b6f899541277d567f69a09",
+  "@rollup/rollup-darwin-x64@npm:4.60.1": "914faebe151f0fb2908b68907ad370a33a68e1912bd0f4450c498204bcf95605ca45057bbaa328839f4b26f392604b347c281275b41ec2a193a30dd5c7eecfce",
+  "@rollup/rollup-freebsd-arm64@npm:4.60.1": "3c3eb08b469af8ecc554ffeddcfc485f277c25ff56554d0222ace745a3c3878a912bf78abe73e98b2e1d2707cf0116b6dda65c16a8f98b1f4467e45b542f6644",
+  "@rollup/rollup-freebsd-x64@npm:4.60.1": "81ae68a65e49da671cdf2d1042c8b03b398cd5eed84156db6730a5d3ef64cc9a011a4f6f9af224954091034794092594c0a8b229312350feaa5fbae226d3a077",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.60.1": "34df701e43304676065a7b918f561016002848525eeb0e6eab695b7f70b284877ee1b903caa776dfcd94d517448d4675a4ac7761c1818f92cd418c8c7eb41dbd",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.60.1": "cf86a2a29dfa97687601bb9d8fab39263cda9571e2591f37837ca43ebec1a387145e1e9196e35dfd47bff0f84efbac7d95cf806341a52a20cd3ac395e6446f9c",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.60.1": "f69c91d1267718ce1c4ed1956911810eb1764034886c2e28ee48c86f27ba6212d1a9eef05734c31a8023f38266a0c19178197f6935efce48b299565fdfdd46ac",
+  "@rollup/rollup-linux-arm64-musl@npm:4.60.1": "1bec894eb150a2379e28f91c5afc0cabe6b03c1f67769f7ba103680bf180082ebb6de6e72b14f5bb197a9af34e825bd0fdacf8b045b0c925232b63df27061029",
+  "@rollup/rollup-linux-loong64-gnu@npm:4.60.1": "7e4abb248d0a792773aaa9fe988d10b0d7ec5f7602f84a9fbe02bf3c58e6d9e920fefc44fc1e325c0acdc653e7f520acb663412c9f8e79c5e6ed7cbc4c166bf0",
+  "@rollup/rollup-linux-loong64-musl@npm:4.60.1": "d123cc24674c272ab5d1fdde34b179fccb361b5b7dcf222508ae31ffcf70c465c2aaedf74231e2e12de83fde7164129d0359020138c41b0abf4f301600c92d1f",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.60.1": "816e4de300cc1c142165d61ae527375e2466d2319c2d2ee135d419e1b78fef1ac560d08ee8913e41ce8c185ec1bd31b491a149e3b02f05ee8f0797e965c9e2c4",
+  "@rollup/rollup-linux-ppc64-musl@npm:4.60.1": "479175a7ecce9c8ef8e2cd4207499eff5a60a1fb34bbad716cf7d710c5d42782c6b3b8edd297c0edbd2486d98c9b1538acf30af116632c4d3f2a7877c778cfb4",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.60.1": "b63bc62c03d1c11fd68259a016891d10e8d94c937fae544f81e6cf457fca6ecacd6078b48db586b32da9874a5c743904ca21f01750c87f30ecdfafe09b6ec2c5",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.60.1": "16e39ddd25fbc94a61d6ba99a9eac70908b895e22a6df3c89d12d69efa9dd363abb4a9b084b1f171f4ea3ad7d9008c652302556400cff8a38f3773561fd126a4",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.60.1": "b4c1fe6c600ec9cc86571e70e87bd2c5623ce7c6f1fb9aee25609fd917f74ac2d252219762ecbd527f7c022d91624eacffcf5f4beee0c9905dc0eee67917a1a4",
+  "@rollup/rollup-linux-x64-gnu@npm:4.60.1": "51a29100c1f762f19588759372743061e914b2b3d0bdc4efa7551fb09150a53ac7b78258b6eb972ea295d42ab4be3edb8a55f4aa5379fb503d3df550690bd1bf",
+  "@rollup/rollup-linux-x64-musl@npm:4.60.1": "c0135af93cb1ad0845c070e284d7386a8531f52326dc43c6296c30c6c3588002a9792f94a116507a283ab671b91a9f11ab599411e4bd6a4d04ecc20de88a6031",
+  "@rollup/rollup-openbsd-x64@npm:4.60.1": "589d2065bde55e1b4b327a6ac0889faa499a62d5b8081221fc184be484e88dd4edcf676a79b547af2b4a84c595dc3a087773a623873da682a406641dd51b1eec",
+  "@rollup/rollup-openharmony-arm64@npm:4.60.1": "ce8b214f2c91f4fb305b6ceed4e64daad196477749a6e6fa6b58ca2ba9b5cda2b844529f811539c895d773bdcf315b9be093bdf8fac28858235d961a38a9d83b",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.60.1": "0ca4f8f21554fde542a6c2765ec2d5fcb9698bc6d50ba66f036fedc92527583d5f22c75957695958e1ba42a894b586819fa7f213554a0ebe3e063e3d0ee2734b",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.60.1": "4a9d30180e531f7fa371415e541dba271c9be433b950e63a35024a6efcf45ec39c52ba88356b513aa594340187e7d9d9ec78396be6309087b45e93095056d33c",
+  "@rollup/rollup-win32-x64-gnu@npm:4.60.1": "8446313af387b0fcadf9e2d12b11bf55072d0a15547ba532dff326b2ece04322d08998946aa5678ea2dad3de569a782647dd5c10f113b617695caf8ed7c39291",
+  "@rollup/rollup-win32-x64-msvc@npm:4.60.1": "1fad2d7a8a5fde0af97f1485325c57b74a05808699a95d22b03961e9476869be58da291f45d65266f52c98f0e49da678daa94dc75694e98948ef6255077fa363"
 }
diff --git a/pkgs/by-name/co/corepack/package.nix b/pkgs/by-name/co/corepack/package.nix
index 6188b7fb84e8..5f6644896f49 100644
--- a/pkgs/by-name/co/corepack/package.nix
+++ b/pkgs/by-name/co/corepack/package.nix
@@ -3,7 +3,7 @@
   stdenvNoCC,
   cacert,
   yarn-berry,
-  nodejs-slim, # no need for NPM
+  nodejs-slim, # no need for npm
   fetchFromGitHub,
   nix-update-script,
   versionCheckHook,
@@ -16,13 +16,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "corepack";
-  version = "0.34.6";
+  version = "0.34.7";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "corepack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wht1w6irfjj4cG4O1mWaP+uWvi794CsxoQPhk3uoKcw=";
+    hash = "sha256-mAiYRDQ9nh4FN8nY0FKC38b1fKRVq0D4dojcAynezas=";
   };
 
   patches = [
@@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       patches
       src
       ;
-    hash = "sha256-kngfdPGent5u231BFOzDLZFLp+EueDrm88iLbSoo5+g=";
+    hash = "sha256-cmY6e29ryLs0psZ/TEqRfs4RdB7eCzfXU7aUH+yCE/s=";
   };
 
   postPatch = ''
@@ -103,6 +103,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     NOCK_ENV=replay yarn test --reporter tap --exclude tests/config.test.ts --exclude tests/Use.test.ts
   '';
   doInstallCheck = true;
+  # vitest needs to bind to `localhost` during installCheck; allow that in the Darwin sandbox.
+  __darwinAllowLocalNetworking = true;
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix
index 538bf77b47af..7fa5f127435c 100644
--- a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "cosmic-ext-applet-weather";
-  version = "0-unstable-2026-03-23";
+  version = "0-unstable-2026-04-27";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "cosmic-ext-applet-weather";
-    rev = "e98c57c586180df0abf6efbe3ee479fc4849f4f7";
-    hash = "sha256-8m1L98wt0uf1vnZ7z4meb/9hU+k5bqe7x7Pidf1lBGM=";
+    rev = "943041c6e1e49d4a6ae267350d7818213e197bc5";
+    hash = "sha256-ZTZ3IjEte3Knkm77i/C0Qq5lx8g3je6GsRlSSrWpFRQ=";
   };
 
   cargoHash = "sha256-DmPUA9qRgCMqVqBNVfyQg4UZkqnZXZvokoSAqPxg0Zc=";
diff --git a/pkgs/by-name/co/cosmic-reader/package.nix b/pkgs/by-name/co/cosmic-reader/package.nix
index b73fa7e4eb20..bac6723ecb09 100644
--- a/pkgs/by-name/co/cosmic-reader/package.nix
+++ b/pkgs/by-name/co/cosmic-reader/package.nix
@@ -19,13 +19,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-reader";
-  version = "0-unstable-2026-04-14";
+  version = "0-unstable-2026-04-16";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-reader";
-    rev = "34108afa746d7388e94a89ebfb9801395ae1f98e";
-    hash = "sha256-h5joBcL49Kegwfci1OBENEclFn2/8n1KFaF4r3DcuLc=";
+    rev = "ebea761ab6853a9ac15b1bfc90b040d620d1d00f";
+    hash = "sha256-t2UKLip5SrKG4a3Eaqf8lS2hNtrqgz8eYpSTRCbrpfM=";
   };
 
   cargoHash = "sha256-p0dg5RNXkzbi+/RB5k+jr34RNOp+Irahj0BiFUddfnk=";
diff --git a/pkgs/by-name/co/costa/package.nix b/pkgs/by-name/co/costa/package.nix
index c99a2f1da8bd..17b41340fa40 100644
--- a/pkgs/by-name/co/costa/package.nix
+++ b/pkgs/by-name/co/costa/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "COSTA";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "eth-cscs";
     repo = "COSTA";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-G/+AXGOjTbc92+6HLkDzkVJIikri0A+cB7Ft0RRQTzw=";
+    hash = "sha256-d4ouwGOoo2E5NeI+H7NbjPrPs40EjlbQc/JrADMTDVg=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/co/cozette/package.nix b/pkgs/by-name/co/cozette/package.nix
index 63c193453a8a..7e2bcf5fd033 100644
--- a/pkgs/by-name/co/cozette/package.nix
+++ b/pkgs/by-name/co/cozette/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
   version = "1.30.0";
 
   src = fetchzip {
-    url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${
+    url = "https://github.com/the-moonwitch/Cozette/releases/download/v.${version}/CozetteFonts-v-${
       builtins.replaceStrings [ "." ] [ "-" ] version
     }.zip";
     hash = "sha256-Njh6V5wTBKM/1QKmPwG1qiOYyAJSVQXLTBLN03V6DaE=";
@@ -52,8 +52,8 @@ stdenvNoCC.mkDerivation rec {
 
   meta = {
     description = "Bitmap programming font optimized for coziness";
-    homepage = "https://github.com/slavfox/cozette";
-    changelog = "https://github.com/slavfox/Cozette/blob/v.${version}/CHANGELOG.md";
+    homepage = "https://github.com/the-moonwitch/cozette";
+    changelog = "https://github.com/the-moonwitch/Cozette/blob/v.${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ brettlyons ];
diff --git a/pkgs/by-name/cp/cpeditor/package.nix b/pkgs/by-name/cp/cpeditor/package.nix
index 2cd870c271ad..839d49adf4a8 100644
--- a/pkgs/by-name/cp/cpeditor/package.nix
+++ b/pkgs/by-name/cp/cpeditor/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpeditor";
-  version = "7.0.2";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "cpeditor";
     repo = "cpeditor";
     tag = finalAttrs.version;
-    hash = "sha256-rdGdbMJ3j01RAS/xPZ9zimL0mv8ZW3vYXht6jNFyheI=";
+    hash = "sha256-zEK3137DjQmuc7Y4c/HF0n37bdokj9ci2/agSaG7nZE=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix
index 420c2fea9eae..730292092ede 100644
--- a/pkgs/by-name/cp/cpuinfo/package.nix
+++ b/pkgs/by-name/cp/cpuinfo/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpuinfo";
-  version = "0-unstable-2026-04-15";
+  version = "0-unstable-2026-04-28";
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "cpuinfo";
-    rev = "d05fbcd57dc096718c4979e7c054e628f1f3520b";
-    hash = "sha256-GF88Y83G9hh3gze0n4wySH9ix3PSGhaZey3t2aej0BQ=";
+    rev = "e829e80faba35db623b5e272c867ad72146adcda";
+    hash = "sha256-0xLxkGiUVWY+8X8ahQC5hvAKjkEQ5Blv8kNqJHPwezg=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "cpu-info";
     maintainers = with lib.maintainers; [ pawelchcki ];
     pkgConfigModules = [ "libcpuinfo" ];
-    # https://github.com/pytorch/cpuinfo/blob/d05fbcd57dc096718c4979e7c054e628f1f3520b/CMakeLists.txt#L98
+    # https://github.com/pytorch/cpuinfo/blob/e829e80faba35db623b5e272c867ad72146adcda/CMakeLists.txt#L98
     platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv;
   };
 })
diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix
index 8dbcf7d3f087..b94bca7cd5cc 100644
--- a/pkgs/by-name/cr/crocoddyl/package.nix
+++ b/pkgs/by-name/cr/crocoddyl/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "crocoddyl";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "loco-3d";
     repo = "crocoddyl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EYvakM81Ot/AtXElJbcQNo7IydBtRgy+8a0cY06CzQ8=";
+    hash = "sha256-7L4S9DQ470pTXARBuerahO9LD1LQfYOZGrYAZalMPUs=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/cr/cross-seed/package.nix b/pkgs/by-name/cr/cross-seed/package.nix
index 3e1f471e5198..435a71191e64 100644
--- a/pkgs/by-name/cr/cross-seed/package.nix
+++ b/pkgs/by-name/cr/cross-seed/package.nix
@@ -20,7 +20,7 @@ buildNpmPackage rec {
   npmDepsHash = "sha256-tR7zPoIX6yjlRx8QbRSxskvueQ1BsP3gGAlonKHH0RY=";
 
   passthru = {
-    updateScript = nix-update-script;
+    updateScript = nix-update-script { };
     tests.cross-seed = nixosTests.cross-seed;
   };
 
diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix
index a6455d8cbedc..042fdcc588e2 100644
--- a/pkgs/by-name/cr/crossplane-cli/package.nix
+++ b/pkgs/by-name/cr/crossplane-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "crossplane-cli";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "crossplane";
     repo = "crossplane";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-SRqZKr/MTdfDwN5/mqWT5AcQAjNiCcbLyuTJCOcruzE=";
+    hash = "sha256-sQ2sCgFDGogQIIWdNCAKVkorsVuNtUOcaALqE/PGwJ4=";
   };
 
-  vendorHash = "sha256-vilm41nN7Qhyu9LfVk6Me9hA3YAipLYGjhSU/JZhfEM=";
+  vendorHash = "sha256-DD0I4XLcN3pHhJKc5wBaldQU7gndszqCExSW4jqLMKQ=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix
index 7012377ac761..9338c89d5d95 100644
--- a/pkgs/by-name/cr/crowdin-cli/package.nix
+++ b/pkgs/by-name/cr/crowdin-cli/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "crowdin-cli";
-  version = "4.14.1";
+  version = "4.14.2";
 
   src = fetchurl {
     url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
-    hash = "sha256-zlouZc7DtMYTHiDOLSCtawEKTMOKgqJe01gieRxeiFI=";
+    hash = "sha256-XfOBmMkbi3XrjRBfDrJ86y1+BuJIcvhJ1tULQDsGCqE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cr/crun/package.nix b/pkgs/by-name/cr/crun/package.nix
index e6106da772a2..a177bebf906b 100644
--- a/pkgs/by-name/cr/crun/package.nix
+++ b/pkgs/by-name/cr/crun/package.nix
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "crun";
-  version = "1.27";
+  version = "1.27.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "crun";
     tag = finalAttrs.version;
-    hash = "sha256-AhNKSwKZdm/8rZsDIGwNdNcVUXFvEGQecGw3pZYjmZw=";
+    hash = "sha256-cuzw0YbbV4LU5nOP2DZghLAIYhkSY3Qf1bdm+JskHZA=";
     fetchSubmodules = true;
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index fda66e8d6f9b..5a7c2dbb9a12 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -11,16 +11,16 @@
 
 buildGo126Module (finalAttrs: {
   pname = "crush";
-  version = "0.56.0";
+  version = "0.62.1";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JtqgEI09kRg/uW/2fxMQL5+cmODO2y6aW1e5OXTH2LY=";
+    hash = "sha256-kPG7NZEZ/uHhyx9GYbIkTmybfvTPuD+TTlWbRFQ0HzA=";
   };
 
-  vendorHash = "sha256-n5pqIxN2TwiEWd3ZzFHqYSIKYPsMYAip3kDRx4ajuck=";
+  vendorHash = "sha256-XlSHxR10ov0uvnqvu99Ax0kq/R/gnkX8fLaG98tTpe4=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix
index a03ce6838b6f..241d62fd7e9d 100644
--- a/pkgs/by-name/cr/cryptsetup/package.nix
+++ b/pkgs/by-name/cr/cryptsetup/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cryptsetup";
-  version = "2.8.4";
+  version = "2.8.6";
 
   outputs = [
     "bin"
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     url =
       "mirror://kernel/linux/utils/cryptsetup/v${lib.versions.majorMinor finalAttrs.version}/"
       + "cryptsetup-${finalAttrs.version}.tar.xz";
-    hash = "sha256-RD5G+JZMmsx4D0Va+7jiOqDo7X7FBM/FngT0BvoeioM=";
+    hash = "sha256-gAQmX9mTiF0I97Yz2+BWhR3hohAwdhOk693HQ/zO/lo=";
   };
 
   patches = [
diff --git a/pkgs/by-name/cs/csvs-to-sqlite/package.nix b/pkgs/by-name/cs/csvs-to-sqlite/package.nix
index ebc7e679edd9..3093d386754e 100644
--- a/pkgs/by-name/cs/csvs-to-sqlite/package.nix
+++ b/pkgs/by-name/cs/csvs-to-sqlite/package.nix
@@ -2,35 +2,20 @@
   lib,
   python3,
   fetchFromGitHub,
-  fetchpatch,
 }:
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "csvs-to-sqlite";
-  version = "1.3";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "csvs-to-sqlite";
     rev = finalAttrs.version;
-    hash = "sha256-wV6htULG3lg2IhG2bXmc/9vjcK8/+WA7jm3iJu4ZoOE=";
+    hash = "sha256-hjimoIoHJdDyKzoJfWdRONUh7yLsR/d8n8zYbb6BKhk=";
   };
 
-  patches = [
-    # https://github.com/simonw/csvs-to-sqlite/pull/92
-    (fetchpatch {
-      name = "pandas2-compatibility-1.patch";
-      url = "https://github.com/simonw/csvs-to-sqlite/commit/fcd5b9c7485bc7b95bf2ed9507f18a60728e0bcb.patch";
-      hash = "sha256-ZmaNWxsqeNw5H5gAih66DLMmzmePD4no1B5mTf8aFvI=";
-    })
-    (fetchpatch {
-      name = "pandas2-compatibility-2.patch";
-      url = "https://github.com/simonw/csvs-to-sqlite/commit/3d190aa44e8d3a66a9a3ca5dc11c6fe46da024df.patch";
-      hash = "sha256-uYUH0Mhn6LIf+AHcn6WuCo5zFuSNWOZBM+AoqkmMnSI=";
-    })
-  ];
-
   build-system = with python3.pkgs; [
     setuptools
   ];
diff --git a/pkgs/by-name/ct/ctlptl/package.nix b/pkgs/by-name/ct/ctlptl/package.nix
index 91f8fc07822d..70308be430b2 100644
--- a/pkgs/by-name/ct/ctlptl/package.nix
+++ b/pkgs/by-name/ct/ctlptl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ctlptl";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "tilt-dev";
     repo = "ctlptl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0Y1baXkb37UKtT/lcoFdunRkxIpSCh+zfkjkZZ9SfXU=";
+    hash = "sha256-4c/sEWzKhs0PjHmZzVs8jXdWe2GWHYNFGsA9cQF5tOI=";
   };
 
-  vendorHash = "sha256-b9lzCNjO0rrK/kJlw5dssuQD/cyf/Wu/LJ2YNQ645LE=";
+  vendorHash = "sha256-nlLx2+NdhqkhpwM7E5PwKcFW+MsJLeSoXWRdtQjFV4Q=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index d23d91f68f0d..fab552cdcd88 100644
--- a/pkgs/by-name/cu/cubeb/package.nix
+++ b/pkgs/by-name/cu/cubeb/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cubeb";
-  version = "0-unstable-2026-04-06";
+  version = "0-unstable-2026-04-22";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cubeb";
-    rev = "626d7d9f906e9f3cfb70be9e58af0f5a5f399a74";
-    hash = "sha256-qo3gVlYGxKef7RVGngFDKuSODoVbSCaFZwoKY4RDaAk=";
+    rev = "a37dadd1ed5949ab0accd7087b7c5c57800eab43";
+    hash = "sha256-JUHuigIhXDF1pFGbkIp6ZKQhCpa/w2LL7HK4IpCYiek=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/cu/cubelify/package.nix b/pkgs/by-name/cu/cubelify/package.nix
index a4498cf26d09..631f1cf9cc15 100644
--- a/pkgs/by-name/cu/cubelify/package.nix
+++ b/pkgs/by-name/cu/cubelify/package.nix
@@ -6,11 +6,11 @@
 }:
 appimageTools.wrapType2 rec {
   pname = "cubelify";
-  version = "1.25.10";
+  version = "1.25.11";
 
   src = fetchurl {
     url = "https://storage.cubelify.com/overlay/v1/Cubelify%20Overlay-${version}.AppImage";
-    hash = "sha512-JgiyrcKJneihOAywZom2YQLNOejb0IidicSGVCwVHMJeUEwyFOQtUrhM4vvXwqradnogPK3LAez/dQJ58reGfA==";
+    hash = "sha512-iWOkFTH5iPw3gzirWph14f8/M0cLQgsUyGX5Xnestc1oqcrKOJgdVb65RBWgCQBywhMkEXC0h1wzaZiBaKYuAQ==";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -25,7 +25,7 @@ appimageTools.wrapType2 rec {
       install -Dm444 ${contents}/cubelify-overlay.desktop -t $out/share/applications/
       install -Dm444 ${contents}/cubelify-overlay.png -t $out/share/pixmaps/
       substituteInPlace $out/share/applications/cubelify-overlay.desktop \
-        --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=cubelify' \
+        --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=cubelify'
     '';
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/cu/curl-impersonate/package.nix b/pkgs/by-name/cu/curl-impersonate/package.nix
index 68bd68586ff5..c8d7472578f2 100644
--- a/pkgs/by-name/cu/curl-impersonate/package.nix
+++ b/pkgs/by-name/cu/curl-impersonate/package.nix
@@ -27,7 +27,7 @@
 }:
 stdenv.mkDerivation rec {
   pname = "curl-impersonate";
-  version = "1.5.2";
+  version = "1.5.5";
 
   outputs = [
     "out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "lexiforest";
     repo = "curl-impersonate";
     tag = "v${version}";
-    hash = "sha256-ca6YZBYN9WMaXL9nFC5TdX/rRTclu6i0ssQlSBMlteM=";
+    hash = "sha256-iKtNdBjAflg9evd/CmKJd8pXGPUM5sMBJEgJAbJ6vws=";
   };
 
   # Disable blanket -Werror to fix build on `gcc-13` related to minor
diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index d1cac99d8a5a..b3bd7cd1d94f 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -48,8 +48,6 @@
   rtmpdump,
   scpSupport ? zlibSupport && !stdenv.hostPlatform.isSunOS && !stdenv.hostPlatform.isCygwin,
   libssh2,
-  wolfsslSupport ? false,
-  wolfssl,
   rustlsSupport ? false,
   rustls-ffi,
   zlibSupport ? true,
@@ -80,14 +78,13 @@ assert
     (lib.count (x: x) [
       gnutlsSupport
       opensslSupport
-      wolfsslSupport
       rustlsSupport
     ]) > 1
   );
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "curl";
-  version = "8.18.0";
+  version = "8.19.0";
 
   src = fetchurl {
     urls = [
@@ -96,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
         builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
       }/curl-${finalAttrs.version}.tar.xz"
     ];
-    hash = "sha256-QN95Fm50qiAUk2XhHuTHmKRq1Xw05PaP0TEA4smpGUY=";
+    hash = "sha256-TrQUiXkNGeGQ16x+GOgoV83Wivj05mspLO1WLTM/Ed8=";
   };
 
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
@@ -160,7 +157,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional pslSupport libpsl
     ++ lib.optional rtmpSupport rtmpdump
     ++ lib.optional scpSupport libssh2
-    ++ lib.optional wolfsslSupport wolfssl
     ++ lib.optional rustlsSupport rustls-ffi
     ++ lib.optional zlibSupport zlib
     ++ lib.optional zstdSupport zstd;
@@ -192,7 +188,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2))
     (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl))
     (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2))
-    (lib.withFeatureAs wolfsslSupport "wolfssl" (lib.getDev wolfssl))
+    # TODO: Clean up on `staging`.
+    "--without-wolfssl"
   ]
   ++ lib.optional gssSupport "--with-gssapi=${lib.getDev libkrb5}"
   # For the 'urandom', maybe it should be a cross-system option
@@ -203,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--without-ca-bundle"
     "--without-ca-path"
   ]
-  ++ lib.optionals (!gnutlsSupport && !opensslSupport && !wolfsslSupport && !rustlsSupport) [
+  ++ lib.optionals (!gnutlsSupport && !opensslSupport && !rustlsSupport) [
     "--without-ssl"
   ]
   ++ lib.optionals (rustlsSupport && !stdenv.hostPlatform.isDarwin) [
diff --git a/pkgs/by-name/cx/cxx-rs/Cargo.lock b/pkgs/by-name/cx/cxx-rs/Cargo.lock
index e87b5b8a2501..f08774e5b3a5 100644
--- a/pkgs/by-name/cx/cxx-rs/Cargo.lock
+++ b/pkgs/by-name/cx/cxx-rs/Cargo.lock
@@ -4,21 +4,27 @@ version = 3
 
 [[package]]
 name = "anstyle"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
+
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "bitflags"
-version = "2.9.4"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 
 [[package]]
 name = "cc"
-version = "1.2.36"
+version = "1.2.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54"
+checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -28,24 +34,24 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "clap"
-version = "4.5.47"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.47"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -54,15 +60,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.5"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
 [[package]]
 name = "codespan-reporting"
-version = "0.12.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
+checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
 dependencies = [
  "serde",
  "termcolor",
@@ -71,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.175"
+version = "1.0.194"
 dependencies = [
  "cc",
  "cxx-build",
@@ -80,7 +86,7 @@ dependencies = [
  "cxxbridge-cmd",
  "cxxbridge-flags",
  "cxxbridge-macro",
- "foldhash",
+ "foldhash 0.2.0",
  "indoc",
  "link-cplusplus",
  "proc-macro2",
@@ -94,7 +100,7 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.175"
+version = "1.0.194"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -110,7 +116,7 @@ dependencies = [
 
 [[package]]
 name = "cxx-gen"
-version = "0.7.175"
+version = "0.7.194"
 dependencies = [
  "codespan-reporting",
  "indexmap",
@@ -126,11 +132,12 @@ dependencies = [
  "cxx",
  "cxx-build",
  "cxxbridge-flags",
+ "serde",
 ]
 
 [[package]]
 name = "cxxbridge-cmd"
-version = "1.0.175"
+version = "1.0.194"
 dependencies = [
  "clap",
  "codespan-reporting",
@@ -142,17 +149,17 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.175"
+version = "1.0.194"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.175"
+version = "1.0.194"
 dependencies = [
  "cxx",
  "indexmap",
+ "prettyplease",
  "proc-macro2",
  "quote",
- "rustversion",
  "syn",
 ]
 
@@ -166,9 +173,9 @@ dependencies = [
 
 [[package]]
 name = "dissimilar"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921"
+checksum = "aeda16ab4059c5fd2a83f2b9c9e9c981327b18aa8e3b313f7e6563799d4f093e"
 
 [[package]]
 name = "equivalent"
@@ -178,9 +185,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
  "windows-sys",
@@ -188,15 +195,21 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.1"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "foldhash"
@@ -206,14 +219,27 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
- "r-efi",
- "wasi",
+ "r-efi 5.3.0",
+ "wasip2",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+ "wasip2",
+ "wasip3",
 ]
 
 [[package]]
@@ -227,28 +253,54 @@ name = "hashbrown"
 version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash 0.1.5",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 
 [[package]]
 name = "indexmap"
-version = "2.11.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.17.0",
+ "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jobserver"
@@ -256,63 +308,85 @@ version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
-name = "libc"
-version = "0.2.175"
+name = "leb128fmt"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
+[[package]]
+name = "libc"
+version = "0.2.185"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
 
 [[package]]
 name = "link-cplusplus"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c349c75e1ab4a03bd6b33fe6cbd3c479c5dd443e44ad732664d72cb0e755475"
+checksum = "7f78c730aaa7d0b9336a299029ea49f9ee53b0ed06e9202e8cb7db9bae7b8c82"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "log"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
@@ -324,10 +398,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
-name = "rustix"
-version = "1.0.8"
+name = "r-efi"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
  "bitflags",
  "errno",
@@ -342,12 +422,6 @@ version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
-[[package]]
-name = "ryu"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
-
 [[package]]
 name = "scratch"
 version = "1.0.9"
@@ -355,19 +429,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2"
 
 [[package]]
-name = "serde"
-version = "1.0.219"
+name = "semver"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -376,23 +466,24 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.143"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
  "itoa",
  "memchr",
- "ryu",
  "serde",
+ "serde_core",
+ "zmij",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -409,9 +500,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -420,18 +511,18 @@ dependencies = [
 
 [[package]]
 name = "target-triple"
-version = "0.1.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790"
+checksum = "591ef38edfb78ca4771ee32cf494cb8771944bee237a9b91fc9c1424ac4b777b"
 
 [[package]]
 name = "tempfile"
-version = "3.21.0"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom",
+ "getrandom 0.4.2",
  "once_cell",
  "rustix",
  "windows-sys",
@@ -448,12 +539,12 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.9.5"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
 dependencies = [
  "indexmap",
- "serde",
+ "serde_core",
  "serde_spanned",
  "toml_datetime",
  "toml_parser",
@@ -463,33 +554,33 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.2"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
  "winnow",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.0.2"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
 
 [[package]]
 name = "trybuild"
-version = "1.0.110"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e257d7246e7a9fd015fb0b28b330a8d4142151a33f03e6a497754f4b1f6a8e"
+checksum = "47c635f0191bd3a2941013e5062667100969f8c4e9cd787c14f977265d73616e"
 dependencies = [
  "dissimilar",
  "glob",
@@ -503,122 +594,200 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
-name = "wasi"
-version = "0.14.3+wasi-0.2.4"
+name = "unicode-xid"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "wasip2"
+version = "1.0.3+wasi-0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.57.1",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen 0.51.0",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
 ]
 
 [[package]]
 name = "winapi-util"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
  "windows-sys",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.3"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-sys"
-version = "0.60.2"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
  "windows-link",
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
 [[package]]
 name = "winnow"
-version = "0.7.13"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0"
 
 [[package]]
 name = "wit-bindgen"
-version = "0.45.1"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/pkgs/by-name/cx/cxx-rs/package.nix b/pkgs/by-name/cx/cxx-rs/package.nix
index e6163dabf62a..2387f706e8e2 100644
--- a/pkgs/by-name/cx/cxx-rs/package.nix
+++ b/pkgs/by-name/cx/cxx-rs/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cxx-rs";
-  version = "1.0.175";
+  version = "1.0.194";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cxx";
     tag = finalAttrs.version;
-    sha256 = "sha256-haAcBBI5ol+gcqKzasyHU43ewGA0L4FlL4o1QlJJukc=";
+    sha256 = "sha256-PIeF9VuyJOIs1x02YETKIP0+nCG3RZXLMJdFNlgAFzo=";
   };
 
   cargoLock.lockFile = ./Cargo.lock;
diff --git a/pkgs/by-name/cy/cyberchef/package.nix b/pkgs/by-name/cy/cyberchef/package.nix
index 8a47c17b1849..515da83edae1 100644
--- a/pkgs/by-name/cy/cyberchef/package.nix
+++ b/pkgs/by-name/cy/cyberchef/package.nix
@@ -21,7 +21,7 @@ let
       categories = [ "Development" ];
     }
   );
-  version = "10.21.0";
+  version = "11.0.0";
 in
 stdenv.mkDerivation {
   pname = "cyberchef";
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
-    hash = "sha256-5w5Bl8LAmpx3dHAwfq4ALKKoS6zRBsh1X7p7ek4dy/s=";
+    hash = "sha256-Hom0YFel1GVdyx/1q7N93se6uLUVutp0Lu31WNhkPPA=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/cy/cyrus_sasl/package.nix b/pkgs/by-name/cy/cyrus_sasl/package.nix
index dbea208e456e..b615a4ecdde3 100644
--- a/pkgs/by-name/cy/cyrus_sasl/package.nix
+++ b/pkgs/by-name/cy/cyrus_sasl/package.nix
@@ -80,6 +80,7 @@ stdenv.mkDerivation rec {
     "--enable-login"
     "--enable-shared"
   ]
+  ++ lib.optional stdenv.cc.isClang "CFLAGS=-std=gnu17"
   ++ lib.optional enableLdap "--with-ldap=${openldap.dev}"
   ++ lib.optionals enableMySQL [
     # https://github.com/cyrusimap/cyrus-sasl/blob/ac0c278817a082c625c496ec812318c019e0b96f/docsrc/sasl/installation.rst#build-configuration
diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix
index 62b5ac36525b..b25e34befeda 100644
--- a/pkgs/by-name/d2/d2/package.nix
+++ b/pkgs/by-name/d2/d2/package.nix
@@ -6,6 +6,7 @@
   git,
   testers,
   d2,
+  libdrm,
   libgbm,
   makeWrapper,
   playwright-driver,
@@ -37,7 +38,7 @@ buildGoModule (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs = [
+  buildInputs = lib.optionals libdrm.meta.available [
     libgbm
     playwright-driver.browsers
   ];
@@ -46,10 +47,11 @@ buildGoModule (finalAttrs: {
 
   postInstall = ''
     installManPage ci/release/template/man/d2.1
-
-      # Wrap the d2 executable to set LD_LIBRARY_PATH for Playwright
-      wrapProgram $out/bin/d2 \
-        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}
+  ''
+  # Wrap the d2 executable to set LD_LIBRARY_PATH for Playwright
+  + lib.optionalString (finalAttrs.buildInputs != [ ]) ''
+    wrapProgram $out/bin/d2 \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}
   '';
 
   preCheck = ''
diff --git a/pkgs/by-name/da/daikhan/package.nix b/pkgs/by-name/da/daikhan/package.nix
index 9ce93bb6bac2..067c56fd3fdf 100644
--- a/pkgs/by-name/da/daikhan/package.nix
+++ b/pkgs/by-name/da/daikhan/package.nix
@@ -15,7 +15,7 @@
   libgee,
   gst_all_1,
   sqlite,
-  xxHash,
+  xxhash,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     gst_all_1.gst-plugins-ugly
     gst_all_1.gst-plugins-rs
     sqlite
-    xxHash
+    xxhash
   ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/da/dante/package.nix b/pkgs/by-name/da/dante/package.nix
index bf0d9fe10c0e..0f37ff5760b2 100644
--- a/pkgs/by-name/da/dante/package.nix
+++ b/pkgs/by-name/da/dante/package.nix
@@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
     if !stdenv.hostPlatform.isDarwin then
       [ "--with-libc=libc.so.6" ]
     else
-      [ "--with-libc=libc${stdenv.hostPlatform.extensions.sharedLibrary}" ];
+      [
+        "--with-libc=libc${stdenv.hostPlatform.extensions.sharedLibrary}"
+        "CFLAGS=-std=gnu17"
+      ];
 
   dontAddDisableDepTrack = stdenv.hostPlatform.isDarwin;
 
diff --git a/pkgs/by-name/da/dart_frog_cli/package.nix b/pkgs/by-name/da/dart_frog_cli/package.nix
new file mode 100644
index 000000000000..8e34f206bf52
--- /dev/null
+++ b/pkgs/by-name/da/dart_frog_cli/package.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  buildDartApplication,
+  fetchFromGitHub,
+  versionCheckHook,
+  callPackage,
+}:
+buildDartApplication (finalAttrs: {
+  pname = "dart_frog_cli";
+  version = "1.2.14";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "dart-frog-dev";
+    repo = "dart_frog";
+    tag = "dart_frog_cli-v${finalAttrs.version}";
+    hash = "sha256-B5ET/SwQzYw251Ox/RyuLM27+M//xTehke9JJSD7Gf8=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/packages/dart_frog_cli";
+
+  dartEntryPoints = {
+    "bin/dart_frog" = "bin/dart_frog.dart";
+  };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  doInstallCheck = true;
+
+  preBuild = ''
+    rm pubspec_overrides.yaml
+  '';
+
+  passthru = {
+    updateScript = lib.getExe (callPackage ./update.nix { });
+    # If your tests.nix needs the package itself, pass finalAttrs.finalPackage
+    tests = callPackage ./tests.nix { };
+  };
+
+  meta = {
+    mainProgram = "dart_frog";
+    homepage = "https://dart-frog.dev";
+    description = "Command line tools for Dart Frog";
+    longDescription = ''
+      The official command line interface for Dart Frog — a fast, minimalistic backend framework for Dart.
+    '';
+    changelog = "https://pub.dev/packages/dart_frog_cli/changelog#${
+      lib.replaceString "." "" finalAttrs.version
+    }";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "dart-frog-dev" finalAttrs.version;
+    maintainers = with lib.maintainers; [ KristijanZic ];
+  };
+})
diff --git a/pkgs/by-name/da/dart_frog_cli/pubspec.lock.json b/pkgs/by-name/da/dart_frog_cli/pubspec.lock.json
new file mode 100644
index 000000000000..b80b77adb4d4
--- /dev/null
+++ b/pkgs/by-name/da/dart_frog_cli/pubspec.lock.json
@@ -0,0 +1,797 @@
+{
+  "packages": {
+    "_fe_analyzer_shared": {
+      "dependency": "transitive",
+      "description": {
+        "name": "_fe_analyzer_shared",
+        "sha256": "a49d6cf99e8d8e7a8e93668d09ced0bbdb954d0b4fccc2f5f9241c6b87fad95c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "99.0.0"
+    },
+    "analyzer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer",
+        "sha256": "663efa951fb8a45e06f491223a604c93820598f20e6a99c25617a1576065e8b7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "12.1.0"
+    },
+    "archive": {
+      "dependency": "transitive",
+      "description": {
+        "name": "archive",
+        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.9"
+    },
+    "args": {
+      "dependency": "direct main",
+      "description": {
+        "name": "args",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.7.0"
+    },
+    "async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "async",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.13.1"
+    },
+    "boolean_selector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "boolean_selector",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "build": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build",
+        "sha256": "aadd943f4f8cc946882c954c187e6115a84c98c81ad1d9c6cbf0895a8c85da9c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.5"
+    },
+    "build_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_config",
+        "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "build_daemon": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_daemon",
+        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.1"
+    },
+    "build_runner": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "build_runner",
+        "sha256": "521daf8d189deb79ba474e43a696b41c49fb3987818dbacf3308f1e03673a75e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.13.1"
+    },
+    "build_verify": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "build_verify",
+        "sha256": "3b17b59b6d66f9d3e6014996f089902d56cec5760e051c353cc387b9da577652",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.1"
+    },
+    "build_version": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "build_version",
+        "sha256": "1063066ec338c18f0629d01077c9315f92fae3e7e0e06d0dc10e8aa3145d44f5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
+    "built_collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_collection",
+        "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.1.1"
+    },
+    "built_value": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_value",
+        "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.12.5"
+    },
+    "checked_yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "checked_yaml",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.4"
+    },
+    "cli_completion": {
+      "dependency": "direct main",
+      "description": {
+        "name": "cli_completion",
+        "sha256": "72e8ccc4545f24efa7bbdf3bff7257dc9d62b072dee77513cc54295575bc9220",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.1"
+    },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "code_builder": {
+      "dependency": "transitive",
+      "description": {
+        "name": "code_builder",
+        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.11.1"
+    },
+    "collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "collection",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.19.1"
+    },
+    "convert": {
+      "dependency": "transitive",
+      "description": {
+        "name": "convert",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "coverage": {
+      "dependency": "transitive",
+      "description": {
+        "name": "coverage",
+        "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.15.0"
+    },
+    "crypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "crypto",
+        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.7"
+    },
+    "dart_frog_gen": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dart_frog_gen",
+        "sha256": "f706052ef3423f48e946dd3d794f522fd79d73874b8cf6fed0631ed4ffe69a89",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "dart_style": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dart_style",
+        "sha256": "a4c1ccfee44c7e75ed80484071a5c142a385345e658fd8bd7c4b5c97e7198f98",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.8"
+    },
+    "equatable": {
+      "dependency": "direct main",
+      "description": {
+        "name": "equatable",
+        "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.8"
+    },
+    "ffi": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ffi",
+        "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.1"
+    },
+    "fixnum": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fixnum",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "frontend_server_client": {
+      "dependency": "transitive",
+      "description": {
+        "name": "frontend_server_client",
+        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "glob": {
+      "dependency": "transitive",
+      "description": {
+        "name": "glob",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
+    "graphs": {
+      "dependency": "transitive",
+      "description": {
+        "name": "graphs",
+        "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "http": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http",
+        "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.6.0"
+    },
+    "http_multi_server": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_multi_server",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.2"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.2"
+    },
+    "io": {
+      "dependency": "transitive",
+      "description": {
+        "name": "io",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.5"
+    },
+    "json_annotation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "json_annotation",
+        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.11.0"
+    },
+    "logging": {
+      "dependency": "transitive",
+      "description": {
+        "name": "logging",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "mason": {
+      "dependency": "direct main",
+      "description": {
+        "name": "mason",
+        "sha256": "515b28eedc3e106bbbfb95f0ff63471003396978d3413daeba0a64bcac01367b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2"
+    },
+    "mason_logger": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mason_logger",
+        "sha256": "1d46102c6f299c0df7fe986dd3dd3271d57c2ec7c00ae590660b7c3018810048",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.5"
+    },
+    "matcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "matcher",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.12.19"
+    },
+    "meta": {
+      "dependency": "direct main",
+      "description": {
+        "name": "meta",
+        "sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.18.2"
+    },
+    "mime": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mime",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
+    },
+    "mocktail": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "mocktail",
+        "sha256": "5e1bf53cc7baa8062a33b84424deb61513858ea05c601b8509e683815b5914aa",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.5"
+    },
+    "mustache_template": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mustache_template",
+        "sha256": "544ff0b837836f5ad6b351e7a676ff7c2cad4fa412c465908aeb9358caddb6fc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.4"
+    },
+    "node_preamble": {
+      "dependency": "transitive",
+      "description": {
+        "name": "node_preamble",
+        "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
+    "package_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_config",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "path": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.1"
+    },
+    "platform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "platform",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.6"
+    },
+    "pool": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pool",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.2"
+    },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.5.0"
+    },
+    "process": {
+      "dependency": "transitive",
+      "description": {
+        "name": "process",
+        "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.0.5"
+    },
+    "pub_semver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "pub_updater": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pub_updater",
+        "sha256": "739a0161d73a6974c0675b864fb0cf5147305f7b077b7f03a58fa7a9ab3e7e7d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.0"
+    },
+    "pubspec_parse": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pubspec_parse",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.0"
+    },
+    "shelf": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.2"
+    },
+    "shelf_packages_handler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_packages_handler",
+        "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "shelf_static": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_static",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
+    "shelf_web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_web_socket",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "source_map_stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_map_stack_trace",
+        "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "source_maps": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_maps",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.10.13"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.10.2"
+    },
+    "stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.12.1"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "stream_transform": {
+      "dependency": "direct main",
+      "description": {
+        "name": "stream_transform",
+        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
+    },
+    "term_glyph": {
+      "dependency": "transitive",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.2"
+    },
+    "test": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "test",
+        "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.31.0"
+    },
+    "test_api": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_api",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.11"
+    },
+    "test_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_core",
+        "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.17"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
+    "uuid": {
+      "dependency": "direct main",
+      "description": {
+        "name": "uuid",
+        "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.5.3"
+    },
+    "vm_service": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vm_service",
+        "sha256": "046d3928e16fa4dc46e8350415661755ab759d9fc97fc21b5ab295f71e4f0499",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "15.1.0"
+    },
+    "watcher": {
+      "dependency": "direct main",
+      "description": {
+        "name": "watcher",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
+    "web_socket_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket_channel",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.3"
+    },
+    "webkit_inspection_protocol": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webkit_inspection_protocol",
+        "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "win32": {
+      "dependency": "transitive",
+      "description": {
+        "name": "win32",
+        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.15.0"
+    },
+    "yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.3"
+    }
+  },
+  "sdks": {
+    "dart": ">=3.10.0 <4.0.0"
+  }
+}
diff --git a/pkgs/by-name/da/dart_frog_cli/tests.nix b/pkgs/by-name/da/dart_frog_cli/tests.nix
new file mode 100644
index 000000000000..b4076863731d
--- /dev/null
+++ b/pkgs/by-name/da/dart_frog_cli/tests.nix
@@ -0,0 +1,61 @@
+{
+  testers,
+  dart_frog_cli,
+  dart,
+}:
+
+let
+  testPkgName = "my_frog_project";
+in
+{
+  # Simple help check (Sanity test)
+  usage = testers.runCommand {
+    name = "dart-frog-usage-test";
+    buildInputs = [ dart_frog_cli ];
+    script = ''
+      export HOME=$TMPDIR
+      dart_frog --help > output.txt
+      if grep -q "Usage: dart_frog" output.txt; then
+        echo "Usage check passed ✅"
+        touch $out
+      else
+        echo "Usage check failed ❌"
+        exit 1
+      fi
+    '';
+  };
+
+  # Project creation test (Behavioral test)
+  create-project = testers.runCommand {
+    name = "dart-frog-create-test";
+    buildInputs = [
+      dart_frog_cli
+      dart
+    ];
+
+    script = ''
+      export HOME=$TMPDIR
+
+      echo "🔨 Creating new Dart Frog project..."
+      dart_frog create ${testPkgName}
+
+      echo "---------------------------------------"
+      if [ -d "${testPkgName}" ] && [ -f "${testPkgName}/pubspec.yaml" ]; then
+        printf "%-20s %-15s %s\n" "Project Created:" "${testPkgName}" "✅"
+        printf "%-20s %-15s %s\n" "Pubspec Found:"   "yes"            "✅"
+
+        # Check if it generated the default route
+        if [ -f "${testPkgName}/routes/index.dart" ]; then
+           printf "%-20s %-15s %s\n" "Default Route:" "found"         "✅"
+        fi
+
+        echo "---------------------------------------"
+        echo "Integration test passed successfully! 🚀"
+        touch $out
+      else
+        echo "Project generation failed! ❌"
+        exit 1
+      fi
+    '';
+  };
+}
diff --git a/pkgs/by-name/da/dart_frog_cli/update.nix b/pkgs/by-name/da/dart_frog_cli/update.nix
new file mode 100644
index 000000000000..f41d0f2cab26
--- /dev/null
+++ b/pkgs/by-name/da/dart_frog_cli/update.nix
@@ -0,0 +1,64 @@
+{
+  writeShellApplication,
+  common-updater-scripts,
+  nix-update,
+  yq-go,
+  dart,
+  nix,
+}:
+let
+  name = "update-dart_frog_cli";
+  packageName = "dart_frog_cli";
+  packageDir = toString ./.;
+in
+writeShellApplication {
+  inherit name;
+  runtimeInputs = [
+    common-updater-scripts
+    nix-update
+    yq-go
+    dart
+    nix
+  ];
+  text = ''
+    pname="''${UPDATE_NIX_PNAME:-${packageName}}"
+
+    main() {
+      old_version="''${UPDATE_NIX_OLD_VERSION:-$(get_version)}"
+      nix-update "$pname" --version stable --version-regex "$pname-v([0-9.]+(:?\\+[0-9]+)?)"
+      new_version=$(get_version)
+      if [[ "$new_version" == "$old_version" ]]; then
+        exit 0
+      fi
+      generate_lockfile
+    }
+
+    get_version() {
+      nix-instantiate --raw --eval --strict -A "$pname.version"
+    }
+
+    generate_lockfile() {
+      tmp_dir=$(mktemp -d)
+      trap 'rm -rf "$tmp_dir"' EXIT
+
+      src=$(nix-build --no-link . -A "$pname.src")
+
+      cp -r "$src/packages/$pname/." "$tmp_dir/"
+      chmod -R +w "$tmp_dir"
+      cd "$tmp_dir"
+
+      # Remove pubspec overrides as in the nix preBuild
+      rm pubspec_overrides.yaml
+
+      # Generate lockfile because it's not included in the source
+      if ! test -f pubspec.lock; then
+        dart pub get
+      fi
+
+      # Convert to JSON
+      yq -o=json . pubspec.lock > "${packageDir}/pubspec.lock.json"
+    }
+
+    main
+  '';
+}
diff --git a/pkgs/by-name/da/dasel/package.nix b/pkgs/by-name/da/dasel/package.nix
index 90e29faa1b1d..7b4b525cd8dc 100644
--- a/pkgs/by-name/da/dasel/package.nix
+++ b/pkgs/by-name/da/dasel/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dasel";
-  version = "3.4.1";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "TomWright";
     repo = "dasel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-W/qMrg+B/T19pguKiB4MHZF5OF3LqfH8b+5ke6feZNQ=";
+    hash = "sha256-DbVeO59k1LUSVZvcCon6vWBoaCoZRpo5xIdTHfCsB0I=";
   };
 
   vendorHash = "sha256-hHxEE0xNSP4wnT5B13BAxUPpdIWs8v7KF1MuISfaYBE=";
diff --git a/pkgs/by-name/da/dash/package.nix b/pkgs/by-name/da/dash/package.nix
index 030968dbc904..6235e5193f8a 100644
--- a/pkgs/by-name/da/dash/package.nix
+++ b/pkgs/by-name/da/dash/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dash";
-  version = "0.5.13.1";
+  version = "0.5.13.2";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz";
-    hash = "sha256-2ScbzgnBJ9mGbiXAEVgt3HWrmIlYoEvE2FU6O48w43A=";
+    hash = "sha256-5xNoJrHu1s4xk+iv+i9wsbK5Fo3ZH/p9209G6eYgVP4=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix
index be6ac75dc161..5d9f0714653e 100644
--- a/pkgs/by-name/da/dashy-ui/package.nix
+++ b/pkgs/by-name/da/dashy-ui/package.nix
@@ -17,12 +17,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "dashy-ui";
-  version = "3.3.0";
+  version = "3.3.1";
   src = fetchFromGitHub {
     owner = "lissy93";
     repo = "dashy";
     tag = finalAttrs.version;
-    hash = "sha256-Xc6zwnR0J+0DuTKNW3eHyJRvUgJgEeL3jA26wzNTMN0=";
+    hash = "sha256-EvyRLa+qUFPzmU2k5CVK8WH3D3vmcj9F8fzj3LEjYgg=";
   };
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 4b670236dbe4..dc930df6dd71 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "databricks-cli";
-  version = "0.290.1";
+  version = "0.290.2";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KSwgEju6RRFV0B0dbnutZ/xgnBeSnPW6pyIQwBYg8Ew=";
+    hash = "sha256-kIliLlOd6/1lddWK3VtxoXvP30SajDWB6zVO4gKe9Fo=";
   };
 
   # Otherwise these tests fail asserting that the version is 0.0.0-dev
diff --git a/pkgs/by-name/da/dav1d/package.nix b/pkgs/by-name/da/dav1d/package.nix
index 8645a513b61f..c0feda75a56f 100644
--- a/pkgs/by-name/da/dav1d/package.nix
+++ b/pkgs/by-name/da/dav1d/package.nix
@@ -6,7 +6,7 @@
   ninja,
   nasm,
   pkg-config,
-  xxHash,
+  xxhash,
   withTools ? false, # "dav1d" binary
   withExamples ? false,
   SDL2, # "dav1dplay" binary
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   # TODO: doxygen (currently only HTML and not build by default).
   buildInputs = [
-    xxHash
+    xxhash
   ]
   ++ lib.optional withExamples SDL2
   ++ lib.optionals useVulkan [
diff --git a/pkgs/by-name/da/davfs2/package.nix b/pkgs/by-name/da/davfs2/package.nix
index a39b9e31b478..717e69590c66 100644
--- a/pkgs/by-name/da/davfs2/package.nix
+++ b/pkgs/by-name/da/davfs2/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  autoreconfHook,
+  autoreconfHook269,
   neon,
   procps,
   replaceVars,
@@ -12,15 +12,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "davfs2";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "mirror://savannah/davfs2/davfs2-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-G9wrsjWp8uVGpqE8VZ7PQ8ZEB+PESX13uOw/YvS4TkY=";
+    sha256 = "sha256-pTaBYetQVWUdfl6BgMFgbaleeMlBtruKkobfeSPPy6k=";
   };
 
   nativeBuildInputs = [
-    autoreconfHook
+    autoreconfHook269
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix
index e80be26e650e..de6b66ae1c57 100644
--- a/pkgs/by-name/da/davmail/package.nix
+++ b/pkgs/by-name/da/davmail/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "davmail";
-  version = "6.5.1";
+  version = "6.6.0";
 
   src = fetchFromGitHub {
     owner = "mguessan";
     repo = "davmail";
     tag = finalAttrs.version;
-    hash = "sha256-D/MEWq696PFXlarQZdSrTS9VFODg7u7yhUsbCwHV9qs=";
+    hash = "sha256-La6nrbAGeZlIhs0i5dm6pIcvn+V1wQjuqBza4w+Aa3A=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index 07f66df0366f..f52df5631c1f 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -19,7 +19,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "26.0.2";
+  version = "26.0.3";
 
   src =
     let
@@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-qAjGYm164/teNcNxZwMNtBNKUOAd/7EjJMk1DtQKGFA=";
-        aarch64-linux = "sha256-tMCMRMNA1sQprDouHtRKPAE1CHWRII2/p05UqVaPcpE=";
-        x86_64-darwin = "sha256-2hSrJhlvFr/5AK9VCXU/hZke9oHgde50ng0pEAXV63Y=";
-        aarch64-darwin = "sha256-YADZ7ttETfs+3HC045eHntLj1x8GREw027GGDSGIeDw=";
+        x86_64-linux = "sha256-G6Rurk8AtHXRfdMvBMNoJTSzBdQJ5Ncy/7WFt5vr3uI=";
+        aarch64-linux = "sha256-iZK5sQfdjMlgX8bhyL2q7lleIKR479KhDydqD3kR3sU=";
+        x86_64-darwin = "sha256-A5upiZ0tts+Pyg1TDhvEVYbGqnAxooUjsZxMG2L9RVQ=";
+        aarch64-darwin = "sha256-v8CQLQRAOzLY1PqxIEFzaKo3RiLb/i9QhxPQZHSuguI=";
       };
     in
     fetchurl {
diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix
index 974b44424125..8d2687b74fbe 100644
--- a/pkgs/by-name/db/dblab/package.nix
+++ b/pkgs/by-name/db/dblab/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dblab";
-  version = "0.34.3";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "danvergara";
     repo = "dblab";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mK5DpFD1FgKmZscqJGHy+HY+GlYm2a6UgPFJHhjwtnU=";
+    hash = "sha256-0tkIDWAub+wfoJ760m1kU7XYnGNner/zLtCod6UPF60=";
   };
 
-  vendorHash = "sha256-NhBT0dBS3jKgWHxCMVV6NUMcvqCbKS+tlm3y1YI/sAE=";
+  vendorHash = "sha256-B5wyERNUkJIrKjKET9HX3F43CFW6aBtzAarkAuhxw9o=";
 
   ldflags = [ "-s -w -X main.version=${finalAttrs.version}" ];
 
diff --git a/pkgs/by-name/dc/dcp/package.nix b/pkgs/by-name/dc/dcp/package.nix
index 1102274a57d3..7086dd6bbee4 100644
--- a/pkgs/by-name/dc/dcp/package.nix
+++ b/pkgs/by-name/dc/dcp/package.nix
@@ -15,16 +15,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dcp";
-  version = "0.23.0";
+  version = "0.23.2";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "dcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gpMH6oeFbfRuRiIoLXTeqCSyaGr6aS9Y1zq5x1bEiZw=";
+    hash = "sha256-WbxFD7hq9WIfzGm3lKqr2cckUjoWwiVMNH8I7LvVSWg=";
   };
 
-  vendorHash = "sha256-JO8++V4LyzX6aDdZNdzDD3EqdUdVvT4Jsjh/e6nqVgs=";
+  vendorHash = "sha256-f5NcEgkBzOdYqBdVGYoL8EYew6LXmZwpNiIQeoett/k=";
 
   # This is required so we:
   # - Delete an inconsistent vendor directory from upstream
diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix
index 865b4fb33021..36ffba5f1a09 100644
--- a/pkgs/by-name/dd/ddev/package.nix
+++ b/pkgs/by-name/dd/ddev/package.nix
@@ -20,13 +20,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "ddev";
-  version = "1.25.1";
+  version = "1.25.2";
 
   src = fetchFromGitHub {
     owner = "ddev";
     repo = "ddev";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-kHGGUFX/xlmQsYxKPxSuRJHk2na9gU1Kd2jhNclAp5s=";
+    hash = "sha256-JcZTKGjYTvrUT6IAKfVJsJj3e4Q60uiIdK3Y9GzeIVw=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index 28dfc19017c5..ff19ad0993ee 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "19.8";
+  version = "19.8.3";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = "ddnet";
     tag = version;
-    hash = "sha256-CpzmKJ8W0uh/3x6/YSEs4SpJoSwYfCZxLDo7wvw96KU=";
+    hash = "sha256-/SfUDliB6fdc/yf2yVXHiqYlH+cIIoxz3RkP8SxsgA4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix
index 72f3fe621af5..57732a549b22 100644
--- a/pkgs/by-name/dd/ddns-go/package.nix
+++ b/pkgs/by-name/dd/ddns-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "ddns-go";
-  version = "6.16.6";
+  version = "6.16.10";
 
   src = fetchFromGitHub {
     owner = "jeessy2";
     repo = "ddns-go";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-t6sxGucolqjDGSkzJUqO0NDeK4oRqq7oG+WD/brh4NA=";
+    hash = "sha256-P9jc3MSMzHWQSi5rqaqAlX5/lgF8cNvvZXnsZ/yo5Fk=";
   };
 
   vendorHash = "sha256-MbITJ2MxyTNE6LS9rQZ10IVgQuXpmbPf5HQgoy2OuOc=";
diff --git a/pkgs/by-name/dd/ddns-updater/package.nix b/pkgs/by-name/dd/ddns-updater/package.nix
index aedb7aad733f..0609da118a59 100644
--- a/pkgs/by-name/dd/ddns-updater/package.nix
+++ b/pkgs/by-name/dd/ddns-updater/package.nix
@@ -2,6 +2,7 @@
   buildGoModule,
   fetchFromGitHub,
   lib,
+  makeWrapper,
   nixosTests,
   nix-update-script,
 }:
@@ -25,6 +26,13 @@ buildGoModule (finalAttrs: {
 
   subPackages = [ "cmd/ddns-updater" ];
 
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/ddns-updater \
+      --set GODEBUG "netdns=go"
+  '';
+
   passthru = {
     tests = {
       inherit (nixosTests) ddns-updater;
diff --git a/pkgs/by-name/de/deadbeef/package.nix b/pkgs/by-name/de/deadbeef/package.nix
index df3a2bc559bf..2e53f768298a 100644
--- a/pkgs/by-name/de/deadbeef/package.nix
+++ b/pkgs/by-name/de/deadbeef/package.nix
@@ -65,14 +65,14 @@ let
 in
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "deadbeef";
-  version = "1.10.0";
+  version = "1.10.2";
 
   src = fetchFromGitHub {
     owner = "DeaDBeeF-Player";
     repo = "deadbeef";
     fetchSubmodules = true;
     tag = finalAttrs.version;
-    hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q=";
+    hash = "sha256-9naokzS2PxnyeO8AnqwLOsrYf/8I6Ah3oesUy2f22vs=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/de/debugedit/package.nix b/pkgs/by-name/de/debugedit/package.nix
index e2a7ee58f038..65c1516da2d1 100644
--- a/pkgs/by-name/de/debugedit/package.nix
+++ b/pkgs/by-name/de/debugedit/package.nix
@@ -7,7 +7,7 @@
   autoreconfHook,
   pkg-config,
   elfutils,
-  xxHash,
+  xxhash,
   help2man,
   util-linux,
   cpio,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     elfutils
-    xxHash
+    xxhash
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix
index 105e7d99a2b6..85a26a424526 100644
--- a/pkgs/by-name/de/deck/package.nix
+++ b/pkgs/by-name/de/deck/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "deck";
-  version = "1.57.3";
+  version = "1.59.1";
 
   src = fetchFromGitHub {
     owner = "Kong";
     repo = "deck";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z9piGj46smPRMLOhQNC4zlYj7CeVl9/6VXL0y9/fQwA=";
+    hash = "sha256-nBLY3X1r4ntqzosnwc2fVo/mWb7+5RHbKL1hUGmjRp4=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
   ];
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-z28b4gg3EgY0OUS/9KZ0Y69nNC2wXRrNQEOYrST9uiY=";
+  vendorHash = "sha256-AaZxe7VYor+XIW3gH+0YfPK7weauEh/ZHUK6KK2GhbA=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd deck \
diff --git a/pkgs/by-name/de/deckmaster/package.nix b/pkgs/by-name/de/deckmaster/package.nix
index 88ff5d566351..93a8d50e16a7 100644
--- a/pkgs/by-name/de/deckmaster/package.nix
+++ b/pkgs/by-name/de/deckmaster/package.nix
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
   # Let the app find Roboto-*.ttf files (hard-coded file names).
   postFixup = ''
     wrapProgram $out/bin/deckmaster \
-      --prefix XDG_DATA_DIRS : "${roboto.out}/share/" \
+      --prefix XDG_DATA_DIRS : "${roboto.out}/share/"
   '';
 
   meta = {
diff --git a/pkgs/by-name/de/deezer-desktop/package.nix b/pkgs/by-name/de/deezer-desktop/package.nix
index ca76348ec1f9..4684cdf930a8 100644
--- a/pkgs/by-name/de/deezer-desktop/package.nix
+++ b/pkgs/by-name/de/deezer-desktop/package.nix
@@ -8,15 +8,15 @@
 }:
 
 let
-  version = "7.1.150";
+  version = "7.1.170";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
-      hash = "sha256-/q3qm+GBKVPNp+foeNQCE+0vr3bCFbfp1qKGtrwpUfM=";
+      hash = "sha256-l2+RJJZIzs6F5VC6Ei/49iJNkqWEUEY0vwGpzwSAOGc=";
     };
     aarch64-linux = fetchurl {
       url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
-      hash = "sha256-QL8tLWUmBLfFSHBI7tJN19KmeoOmA2SR8OHMhGpL/Dk=";
+      hash = "sha256-FI8YWAZz8mFIs34Ht7KkWwrFH7dpVpo4dh5pTB2khBg=";
     };
   };
 
diff --git a/pkgs/by-name/de/defuddle-cli/package.nix b/pkgs/by-name/de/defuddle-cli/package.nix
deleted file mode 100644
index 85bbbb4b2c24..000000000000
--- a/pkgs/by-name/de/defuddle-cli/package.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  buildNpmPackage,
-  fetchFromGitHub,
-  gitUpdater,
-  lib,
-}:
-
-buildNpmPackage rec {
-  pname = "defuddle-cli";
-  version = "0.6.4";
-
-  src = fetchFromGitHub {
-    owner = "kepano";
-    repo = "defuddle-cli";
-    tag = version;
-    hash = "sha256-28XmpFKzBKNhRkPOGaacJVw8hjQUZq2nwuR0vNo8aW0=";
-  };
-
-  npmDepsHash = "sha256-rRo+ty/E09OS+cWDnKQkROEdDc0hiB5g1h/+NbJe+/M=";
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = {
-    description = "Command line utility to extract clean html, markdown and metadata from web pages";
-    homepage = "https://github.com/kepano/defuddle-cli";
-    license = lib.licenses.mit;
-    mainProgram = "defuddle";
-    maintainers = with lib.maintainers; [ surfaceflinger ];
-  };
-}
diff --git a/pkgs/by-name/de/defuddle/package.nix b/pkgs/by-name/de/defuddle/package.nix
new file mode 100644
index 000000000000..ef1ca4f9e8f1
--- /dev/null
+++ b/pkgs/by-name/de/defuddle/package.nix
@@ -0,0 +1,36 @@
+{
+  buildNpmPackage,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+}:
+
+buildNpmPackage rec {
+  pname = "defuddle";
+  version = "0.17.0";
+
+  src = fetchFromGitHub {
+    owner = "kepano";
+    repo = "defuddle";
+    tag = version;
+    hash = "sha256-w1V2xdaE8Htl6NeDyfKLFHOt3UEUuI4eBPW433qD1WI=";
+  };
+
+  npmDepsHash = "sha256-D+Gn9Dcc+YNeRonnKjEcp3BzpxIdwy7J4lJvxefJSvs=";
+
+  # jsdom is both a peerDependency and devDependency; pruning
+  # devDependencies removes it, but the CLI needs it at runtime.
+  dontNpmPrune = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Command line utility to extract clean html, markdown and metadata from web pages";
+    homepage = "https://github.com/kepano/defuddle";
+    license = lib.licenses.mit;
+    mainProgram = "defuddle";
+    maintainers = with lib.maintainers; [ surfaceflinger ];
+  };
+}
diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix
deleted file mode 100644
index 8c2b289ed306..000000000000
--- a/pkgs/by-name/de/deltatouch/package.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromCodeberg,
-  fetchFromGitHub,
-  cmake,
-  intltool,
-  libdeltachat,
-  lomiri,
-  qt5,
-  quirc,
-  rustPlatform,
-}:
-
-let
-  libdeltachat' = libdeltachat.overrideAttrs rec {
-    version = "2.25.0";
-    src = fetchFromGitHub {
-      owner = "chatmail";
-      repo = "core";
-      tag = "v${version}";
-      hash = "sha256-pW1+9aljtnYJmlJOj+m0aQekYO5IsL0fduR7kIAPdN8=";
-    };
-    cargoDeps = rustPlatform.fetchCargoVendor {
-      pname = "chatmail-core";
-      inherit version src;
-      hash = "sha256-iIC9wE7P2SKeCMtc/hFTRaOGXD2F7kh1TptOoes/Qi0=";
-    };
-  };
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "deltatouch";
-  version = "2.35.0";
-
-  src = fetchFromCodeberg {
-    owner = "lk108";
-    repo = "deltatouch";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-6jzGwOkO14P7rZSBGZ6/Mzda/PM6ZVQeUCb7yfQtbkQ=";
-  };
-
-  nativeBuildInputs = [
-    qt5.wrapQtAppsHook
-    intltool
-    cmake
-  ];
-
-  buildInputs = [
-    qt5.qtbase
-    qt5.qtwebengine
-    qt5.qtquickcontrols2
-    libdeltachat'
-    lomiri.lomiri-ui-toolkit
-    lomiri.lomiri-ui-extras
-    lomiri.lomiri-api
-    lomiri.qqc2-suru-style
-    quirc
-  ];
-
-  meta = {
-    changelog = "https://codeberg.org/lk108/deltatouch/src/tag/${finalAttrs.src.tag}/CHANGELOG";
-    description = "Messaging app for Ubuntu Touch, powered by Delta Chat core";
-    longDescription = ''
-      DeltaTouch is a messenger for Ubuntu Touch based on Delta Chat core.
-      Delta Chat works over email.
-    '';
-    homepage = "https://codeberg.org/lk108/deltatouch";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ link2xt ];
-    mainProgram = "deltatouch";
-    platforms = lib.platforms.linux;
-  };
-})
diff --git a/pkgs/by-name/de/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix
index 55d1e24088f7..24f839daf75f 100644
--- a/pkgs/by-name/de/deno/librusty_v8.nix
+++ b/pkgs/by-name/de/deno/librusty_v8.nix
@@ -70,14 +70,14 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rusty-v8";
-  version = "147.1.0";
+  version = "147.2.1";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "rusty_v8";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-USCQtK5pJBpU1FTLMQ/bNwJXnVNkdX/EtCWqs2kVL50=";
+    hash = "sha256-HompYzilJ7AC+HXfJJcvPC3L0rQfdAOhMhir/7qDXG8=";
   };
 
   patches = [
@@ -97,7 +97,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch
   ];
 
-  cargoHash = "sha256-FKwXdms9j+izRKsm5TKJ8Ct8lvBuG/tYXfNzVsbs8cM=";
+  cargoHash = "sha256-2h/zATsNngMg0Tvu5oSSveQNfaVbwFbzHndmSyP4Ddo=";
 
   nativeBuildInputs = [
     llvmPackages.clang
@@ -159,6 +159,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     runHook postInstall
   '';
 
+  requiredSystemFeatures = [ "big-parallel" ];
+
   meta = {
     description = "Rust bindings for the V8 JavaScript engine";
     homepage = "https://github.com/denoland/rusty_v8";
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 08ac8a183296..ff974d7776e3 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -29,17 +29,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.7.12";
+  version = "2.7.13";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true; # required for tests
-    hash = "sha256-e1G1y9aGWhFDhsvzmLFD6VIfxU8BseWOa8bBcCC255Y=";
+    hash = "sha256-LGTA2xwT939GlAaKfUU3XA0Jx0h1P+8eFgPLmddHxlo=";
   };
 
-  cargoHash = "sha256-YahHLz4ykAcFNrh/GFVJ0fZtCNHKG9RzdCUprQDfOUo=";
+  cargoHash = "sha256-CLI54HSEOC/OVnIf0FmizVrS0adfzukFFBDl+EUP7BE=";
 
   patches = [
     ./patches/0002-tests-replace-hardcoded-paths.patch
diff --git a/pkgs/by-name/de/devbox/package.nix b/pkgs/by-name/de/devbox/package.nix
index 5f020a440a19..8be4b05a37eb 100644
--- a/pkgs/by-name/de/devbox/package.nix
+++ b/pkgs/by-name/de/devbox/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "devbox";
-  version = "0.17.1";
+  version = "0.17.2";
 
   src = fetchFromGitHub {
     owner = "jetify-com";
     repo = "devbox";
     tag = finalAttrs.version;
-    hash = "sha256-WwNbbrBm3/iWNCdHh0f+ey06BlibCPkCRXgBoyaJffU=";
+    hash = "sha256-4K7Y0GxMhnhlQP30NGAAqJSgEo6aTNCsUoOfaa+aYkE=";
   };
 
   ldflags = [
diff --git a/pkgs/by-name/de/devspace/package.nix b/pkgs/by-name/de/devspace/package.nix
index e67f2a657b0e..7a125f24f200 100644
--- a/pkgs/by-name/de/devspace/package.nix
+++ b/pkgs/by-name/de/devspace/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "devspace";
-  version = "6.3.20";
+  version = "6.3.21";
 
   src = fetchFromGitHub {
     owner = "devspace-sh";
     repo = "devspace";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-z1wKjEKr2SyLe5bp08g8rzpDxQenvrTjVWjjGO6N7ys=";
+    hash = "sha256-QCO1faP4V0fqznPyMFnmAI+N0VE9tECwSXdg6xowocM=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/de/dexter/package.nix b/pkgs/by-name/de/dexter/package.nix
index eada6fe45cca..e2c8aed27e32 100644
--- a/pkgs/by-name/de/dexter/package.nix
+++ b/pkgs/by-name/de/dexter/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dexter";
-  version = "0.5.3";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "remoteoss";
     repo = "dexter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8JjxR7Q+4OgBSIgODxIEU/0mC+bPp9Nz7uCAjfn4HiY=";
+    hash = "sha256-BmWzrbC9ka8L1/mrPOXJqnoi1YVXxRcg6tSkb8tI88Q=";
   };
 
   vendorHash = "sha256-1mJ4HdDCsZl/g8F+L+NrW2ACuiHe2aSheJO/1XfKAb4=";
diff --git a/pkgs/by-name/dg/dgop/package.nix b/pkgs/by-name/dg/dgop/package.nix
index 88531c7831ae..33885162ae67 100644
--- a/pkgs/by-name/dg/dgop/package.nix
+++ b/pkgs/by-name/dg/dgop/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dgop";
-  version = "0.2.0";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "AvengeMedia";
     repo = "dgop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CxTvTx7WYKj9usa1uZDUmCqS9+W0QoIeTGDlkhHLVho=";
+    hash = "sha256-kYEFJvJApcgVgFu6QpSoNk2t0hv7AlmBARc5HPe/n+s=";
   };
 
-  vendorHash = "sha256-4GslUKwUCO8oOqylsclJmAZL/ds0plenzcTAwAXKtrc=";
+  vendorHash = "sha256-OxcSnBIDwbPbsXRHDML/Yaxcc5caoKMIDVHLFXaoSsc=";
 
   ldflags = [
     "-w"
@@ -28,8 +28,6 @@ buildGoModule (finalAttrs: {
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
-    mv $out/bin/{cli,dgop}
-
     installShellCompletion --cmd dgop \
       --bash <($out/bin/dgop completion bash) \
       --fish <($out/bin/dgop completion fish) \
diff --git a/pkgs/by-name/dg/dgraph/package.nix b/pkgs/by-name/dg/dgraph/package.nix
index 38bd75b0e180..530c08230f09 100644
--- a/pkgs/by-name/dg/dgraph/package.nix
+++ b/pkgs/by-name/dg/dgraph/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dgraph";
-  version = "25.3.2";
+  version = "25.3.3";
 
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "dgraph";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tKKDCYaQxIW8JFKLUxg8i+QVDu4H+9GZOYTHB51YRn4=";
+    hash = "sha256-Zkx9dWEWRhUj/hwcgDyH3ikbcvjVHJnALNERunXytag=";
   };
 
-  vendorHash = "sha256-C7wJ12OjCc7WzxpVtsAsaj7leRLfcVFmp1xHcaNAsQw=";
+  vendorHash = "sha256-I+eLpWdS4Dc3XPbeJ8jlSc/ZIw6yveovcIXnfihke3s=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/dh/dhcpdump/package.nix b/pkgs/by-name/dh/dhcpdump/package.nix
index c5fd112f906a..a7f5b6a13c79 100644
--- a/pkgs/by-name/dh/dhcpdump/package.nix
+++ b/pkgs/by-name/dh/dhcpdump/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.10";
 
   src = fetchFromGitHub {
-    owner = "bbonev";
+    owner = "dhcpdump-org";
     repo = "dhcpdump";
     tag = "v${finalAttrs.version}";
     hash = "sha256-EtCwtRvAvZdfW/6MjHEXJTHoD/OknJeZJ7q0qb+CzeE=";
@@ -40,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses";
-    homepage = "https://github.com/bbonev/dhcpdump";
-    changelog = "https://github.com/bbonev/dhcpdump/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/dhcpdump-org/dhcpdump";
+    changelog = "https://github.com/dhcpdump-org/dhcpdump/releases/tag/v${finalAttrs.version}";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ nickcao ];
     license = lib.licenses.bsd2;
diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix
index 51070f8a6b7e..18541eae9074 100644
--- a/pkgs/by-name/di/di-tui/package.nix
+++ b/pkgs/by-name/di/di-tui/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "di-tui";
-  version = "1.13.3";
+  version = "1.13.4";
 
   src = fetchFromGitHub {
     owner = "acaloiaro";
     repo = "di-tui";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rT9iH9kkkWtg4H7YJUD2ElvWLUIzFHGSlH31A68pDDo=";
+    hash = "sha256-0PIKPprAqGbVFiGFxwzgmS4fYKTHfpdpWWUMuxK67tQ=";
   };
 
   vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I=";
diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 70e99e738bd6..2d664a651278 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.3.7";
+  version = "2.3.8";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-E/g2xOB8rdu1Wa8bEI2dzAgHmS+36Q0oVm3v25tTzYE=";
+    hash = "sha256-FpWLktMLgagRDf6cBfZKb2l9kIogooPVlUPien4rGek=";
   };
 
-  cargoHash = "sha256-ndQpILbt4f4YFEV+KfwQ5Pr2QM+7RkmwzKYPLR4fQfo=";
+  cargoHash = "sha256-ivB/iSDu2gzj3KAbK7Pq4DUfSeuc8h4okytuftqoylM=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/di/diffstat/package.nix b/pkgs/by-name/di/diffstat/package.nix
index 3c4ede5b1f66..fb1fc110da25 100644
--- a/pkgs/by-name/di/diffstat/package.nix
+++ b/pkgs/by-name/di/diffstat/package.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "diffstat";
-  version = "1.68";
+  version = "1.69";
 
   src = fetchurl {
     urls = [
       "https://invisible-island.net/archives/diffstat/diffstat-${finalAttrs.version}.tgz"
       "https://invisible-mirror.net/archives/diffstat/diffstat-${finalAttrs.version}.tgz"
     ];
-    hash = "sha256-ifkpSorHT8728bmsQI9D6+340gjj7+C5m0rMFtxlgsc=";
+    hash = "sha256-uwJGQHL3ad2YMv2ZlSZzTJDrTWb7VtU1FUCnUMiKd/Y=";
   };
 
   buildInputs = [ zstd ];
diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix
index b53c44e0784c..be703a666c0e 100644
--- a/pkgs/by-name/di/difftastic/package.nix
+++ b/pkgs/by-name/di/difftastic/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "difftastic";
-  version = "0.68.0";
+  version = "0.69.0";
 
   src = fetchFromGitHub {
     owner = "wilfred";
     repo = "difftastic";
     tag = finalAttrs.version;
-    hash = "sha256-4CkAifz48qLegXTBmXqJe3+LAE1uCUUb28ZgXTVggOk=";
+    hash = "sha256-86aA9B/AaLKhHbaBKL6XpcqocghijCoxyrWUE5YOdaA=";
   };
 
-  cargoHash = "sha256-MwoRr8aQAT5plkfapAY2oPrSYYmHGeqxOhCpOMEtUoc=";
+  cargoHash = "sha256-by/gl6qI6mc93Kxn0BdIhkL/gtoHcGwdzrGiT5KTmP4=";
 
   buildInputs = [ rust-jemalloc-sys ];
 
diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix
index 7781c2c965ef..7c1e4d54c732 100644
--- a/pkgs/by-name/di/dioxus-cli/package.nix
+++ b/pkgs/by-name/di/dioxus-cli/package.nix
@@ -6,6 +6,7 @@
   cacert,
   openssl,
   rustfmt,
+  installShellFiles,
   makeWrapper,
   esbuild,
   wasm-bindgen-cli_0_2_118,
@@ -16,15 +17,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dioxus-cli";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchCrate {
     pname = "dioxus-cli";
     version = finalAttrs.version;
-    hash = "sha256-iAwR43SwmOBvuHa9qZBJLCjyhQSj/XgDx0jkWR+lgrE=";
+    hash = "sha256-PKidohK85wv/ZN9WcNS+HTlVGgR5o07gWLshZhzyg5k=";
   };
 
-  cargoHash = "sha256-JS5/7hQhgN2gbMmLY2zD2GE/Ony8AAHAzj7Ituj6l90=";
+  cargoHash = "sha256-T6xLlu8XeJPm+ULgpTALTT93X55ExJhDMuhpal2QLhg=";
   buildFeatures = [
     "no-downloads"
   ]
@@ -37,6 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     cacert
+    installShellFiles
     makeWrapper
   ];
 
@@ -68,6 +70,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   postInstall = ''
+    installShellCompletion --cmd dx \
+      --bash <($out/bin/dx completions bash) \
+      --fish <($out/bin/dx completions fish) \
+      --zsh <($out/bin/dx completions zsh)
+  '';
+
+  postFixup = ''
     wrapProgram $out/bin/dx \
       --suffix PATH : ${
         lib.makeBinPath [
diff --git a/pkgs/by-name/di/directx-shader-compiler/package.nix b/pkgs/by-name/di/directx-shader-compiler/package.nix
index 5eff273801cb..3a1b7114816b 100644
--- a/pkgs/by-name/di/directx-shader-compiler/package.nix
+++ b/pkgs/by-name/di/directx-shader-compiler/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "directx-shader-compiler";
-  version = "1.9.2602";
+  version = "1.10.2605.2";
 
   # Put headers in dev, there are lot of them which aren't necessary for
   # using the compiler binary.
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "microsoft";
     repo = "DirectXShaderCompiler";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-S3ar1LTV/9fYU2B5y8x0ESB20lMnAx8XQw9n3G4z0nk=";
+    hash = "sha256-FzfXxfhAyJw7rouWJEyeVdikG5TBM81yC+9iRg5tK3c=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/di/discordo/package.nix b/pkgs/by-name/di/discordo/package.nix
index 4174b1d08334..0159b5f7de06 100644
--- a/pkgs/by-name/di/discordo/package.nix
+++ b/pkgs/by-name/di/discordo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "discordo";
-  version = "0-unstable-2026-04-14";
+  version = "0-unstable-2026-04-23";
 
   src = fetchFromGitHub {
     owner = "ayn2op";
     repo = "discordo";
-    rev = "73dbd1b315a393890ca7c634683017a188dac90c";
-    hash = "sha256-oXrksRVwJHwS0f1jSqZ0nFjNjIej3XM8bClfcI6RDfM=";
+    rev = "eaaf87c76d23288cc3b162fa41974b8ee1157177";
+    hash = "sha256-G2UuoHMMoPoJ57kRrwN9cqQNfEdhRJra5okXEKR12Aw=";
   };
 
-  vendorHash = "sha256-myXKkOeH8w+vjNbrPpw/J97mIT42Ema5XiSqHFpz8Vs=";
+  vendorHash = "sha256-I4LFqFSxqwSzZ4uCGGeYbc3oqoNi07xbkFKe4TmP04o=";
 
   env.CGO_ENABLED = 1;
 
diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix
index 551c2e1284ae..fa4d6c2db891 100644
--- a/pkgs/by-name/di/distribution/package.nix
+++ b/pkgs/by-name/di/distribution/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "distribution";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "distribution";
     repo = "distribution";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r0J1zsj4Qioe8+dByqzOgJypW+A06P2uIjetPu7w+24=";
+    hash = "sha256-KsN3QW71VwGrgrhOmwzzmTm/54+ZaTFj5kNgbta1FmI=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix
index a5bfd58b2c37..033bf01d20c9 100644
--- a/pkgs/by-name/dm/dms-shell/package.nix
+++ b/pkgs/by-name/dm/dms-shell/package.nix
@@ -28,13 +28,13 @@ buildGoModule (
   in
   {
     pname = "dms-shell";
-    version = "1.4.4.1";
+    version = "1.4.6";
 
     src = fetchFromGitHub {
       owner = "AvengeMedia";
       repo = "DankMaterialShell";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-iYBdSBvcW7bJtc84G6k5TFJEbPHQrif9KzZyE9Lbq8M=";
+      hash = "sha256-g6r/Gx8PTDzO3jCNzzySA+Ff1lmLF9nDlMCNyyoQjoE=";
     };
 
     sourceRoot = "${finalAttrs.src.name}/core";
diff --git a/pkgs/by-name/dn/dns-collector/package.nix b/pkgs/by-name/dn/dns-collector/package.nix
index 62c3a728b09a..7c595f178c0d 100644
--- a/pkgs/by-name/dn/dns-collector/package.nix
+++ b/pkgs/by-name/dn/dns-collector/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "dns-collector";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "dns-collector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UMzL+use4T0WfcbJAW7XKi3ZuSh9ZFRjYcEr+BV9mkc=";
+    hash = "sha256-Vqru5JK3QCz1ij08ezuJgozhJaEplp92c2jBOiijB+M=";
   };
   subPackages = [ "." ];
 
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-xEtMe9xrdeYDHNLbcVa9INMprF6mEHyyrAt84nUAsUI=";
+  vendorHash = "sha256-wyfbxdmF3OeWgZ9IeiCyo9PZFnSfnCmlZXM5/1Jq38w=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/dn/dnsdist/package.nix b/pkgs/by-name/dn/dnsdist/package.nix
index 78cad5c3b163..958710ca6aa1 100644
--- a/pkgs/by-name/dn/dnsdist/package.nix
+++ b/pkgs/by-name/dn/dnsdist/package.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dnsdist";
-  version = "2.0.3";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.xz";
-    hash = "sha256-oiklC4GcQNVRc6+nIC7x7yprco+Fx1Bol6Hxymq1cUk=";
+    hash = "sha256-I8Z9usIeVWTflbZ4merP7sfXwZQRiqv5jODnY8zVx64=";
   };
 
   nativeBuildInputs = [
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) cargoRoot src;
-    hash = "sha256-OU24ahqFc4DivCpO451rsHV8rofyHv+LnLgkVsFPMG4=";
+    hash = "sha256-0CfOkjMe3p7xg62jlS3ASZRlr+/nqIJLRyRT+jcDiHQ=";
   };
 
   cargoRoot = "dnsdist-rust-lib/rust";
diff --git a/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch b/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch
new file mode 100644
index 000000000000..62249150aa3b
--- /dev/null
+++ b/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch
@@ -0,0 +1,28 @@
+From 9ad74926d4f7f34ff902e1db5235535aa813c33f Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Mon, 6 Apr 2026 22:22:43 +0100
+Subject: [PATCH] Fix 1-byte buffer overflow in relay_reply4()
+
+Potential SIGSEGV when using DHCPv4-relay.
+
+Thanks to Asim Viladi Oglu Manizada for finding this.
+---
+ src/rfc2131.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rfc2131.c b/src/rfc2131.c
+index 7bdfefd..55aad03 100644
+--- a/src/rfc2131.c
++++ b/src/rfc2131.c
+@@ -3248,7 +3248,7 @@ unsigned int relay_reply4(struct dhcp_packet *mess, size_t sz, char *arrival_int
+ 
+ 	      /* delete agent info before return RFC 3046 para 2.1 */
+ 	      *opt = OPTION_END;
+-	      memset(opt + 1, 0, option_len(opt) + 2);
++	      memset(opt + 1, 0, option_len(opt) + 1);
+ 	    }
+ 	}
+       else if (mess->giaddr.s_addr == relay->local.addr4.s_addr)
+-- 
+2.20.1
+
diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix
index e1f0c831c949..72f27c99a05f 100644
--- a/pkgs/by-name/dn/dnsmasq/package.nix
+++ b/pkgs/by-name/dn/dnsmasq/package.nix
@@ -37,6 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-S/UMLBAY+fvCYDffUbkOzqDLc9RhYoRnY7kt8NbDpFg=";
   };
 
+  patches = [
+    # https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=9ad74926d4f7f34ff902e1db5235535aa813c33f
+    ./CVE-2026-6507.patch
+  ];
+
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     sed '1i#include <linux/sockios.h>' -i src/dhcp.c
   '';
diff --git a/pkgs/by-name/dn/dnsmonster/package.nix b/pkgs/by-name/dn/dnsmonster/package.nix
index f85f9ce7591d..e204effcebef 100644
--- a/pkgs/by-name/dn/dnsmonster/package.nix
+++ b/pkgs/by-name/dn/dnsmonster/package.nix
@@ -11,7 +11,7 @@ buildGo125Module (finalAttrs: {
   version = "1.2.5";
 
   src = fetchFromGitHub {
-    owner = "mosajjal";
+    owner = "FenkoHQ";
     repo = "dnsmonster";
     tag = "v${finalAttrs.version}";
     hash = "sha256-Ae7SzImNHOOpaaVLFHdfLrwGhaHkvZBt+s/sRoHYwzk=";
@@ -29,8 +29,8 @@ buildGo125Module (finalAttrs: {
 
   meta = {
     description = "Passive DNS Capture and Monitoring Toolkit";
-    homepage = "https://github.com/mosajjal/dnsmonster";
-    changelog = "https://github.com/mosajjal/dnsmonster/releases/tag/${finalAttrs.src.tag}";
+    homepage = "https://github.com/FenkoHQ/dnsmonster";
+    changelog = "https://github.com/FenkoHQ/dnsmonster/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix
index de8b54c469e4..c0aa3af4b213 100644
--- a/pkgs/by-name/dn/dnsproxy/package.nix
+++ b/pkgs/by-name/dn/dnsproxy/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dnsproxy";
-  version = "0.81.1";
+  version = "0.81.2";
 
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = "dnsproxy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eY4nmaW3jjDb4RcGWcy2l1RScxZwtBGGYQpC1zh5hVE=";
+    hash = "sha256-YjiLhfwuwuGvefySCi+eWSBj4hIOQTy4vGSifFcPDcA=";
   };
 
   vendorHash = "sha256-liX+AMxVBkxJSv1Ltt924Hjf10fho4G6tyt82tkzWZA=";
diff --git a/pkgs/by-name/do/do-agent/package.nix b/pkgs/by-name/do/do-agent/package.nix
index 18e8779676c0..b8e86264b4ed 100644
--- a/pkgs/by-name/do/do-agent/package.nix
+++ b/pkgs/by-name/do/do-agent/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "do-agent";
-  version = "3.18.10";
+  version = "3.18.12";
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "do-agent";
     rev = finalAttrs.version;
-    sha256 = "sha256-2EL+dmI97d4cjb0ZVnXbmHp0m2dGcUu3xFtOXMruUE0=";
+    sha256 = "sha256-nSRvNUWauZb8KifY9Xe7yDSvL0EREYTVzqVA5+oLhjo=";
   };
 
   ldflags = [
diff --git a/pkgs/by-name/do/docker-color-output/package.nix b/pkgs/by-name/do/docker-color-output/package.nix
index 45b1918d3ae7..7136174ab2cc 100644
--- a/pkgs/by-name/do/docker-color-output/package.nix
+++ b/pkgs/by-name/do/docker-color-output/package.nix
@@ -12,6 +12,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "devemio";
     repo = "docker-color-output";
+    # Warning: tag names are inconsistent: some have the 'v' prefix, some don't.
     tag = "v${finalAttrs.version}";
     hash = "sha256-Rpym9YckgJ583zgPpC/mQW1IGgQUppemFhAecgy3M8A=";
   };
@@ -31,7 +32,9 @@ buildGoModule (finalAttrs: {
     mainProgram = "docker-color-output";
     license = lib.licenses.mit;
     homepage = "https://github.com/devemio/docker-color-output";
-    changelog = "https://github.com/devemio/docker-color-output/releases/tag/${finalAttrs.version}";
+    # Note that due to inconsistent tag names (see above comment),
+    # we might want to check the URL before committing.
+    changelog = "https://github.com/devemio/docker-color-output/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ sguimmara ];
   };
 })
diff --git a/pkgs/by-name/do/doctest/package.nix b/pkgs/by-name/do/doctest/package.nix
index 2695157a0931..f6ffd1b9e559 100644
--- a/pkgs/by-name/do/doctest/package.nix
+++ b/pkgs/by-name/do/doctest/package.nix
@@ -2,31 +2,20 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "doctest";
-  version = "2.4.12";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "doctest";
     repo = "doctest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Fxs1EWydhqN9whx+Cn4fnZ4fhCEQvFgL5e9TUiXlnq8=";
+    hash = "sha256-7t/eknv7VtHoBgcuJmI07x//HIyqzE9HUuH5u2y7X8A=";
   };
 
-  patches = [
-    # Fix the build with Clang.
-    (fetchpatch {
-      name = "doctest-disable-warnings.patch";
-      url = "https://github.com/doctest/doctest/commit/c8d9ed2398d45aa5425d913bd930f580560df30d.patch";
-      excludes = [ ".github/workflows/main.yml" ];
-      hash = "sha256-kOBy0om6MPM2vLXZjNLXiezZqVgNr/viBI7mXrOZts8=";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [
@@ -37,23 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
-  # Fix the build with LLVM 21 / GCC 15.
-  #
-  # See:
-  #
-  # * <https://github.com/doctest/doctest/issues/928>
-  # * <https://github.com/doctest/doctest/pull/929>
-  # * <https://github.com/doctest/doctest/issues/950>
-  env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
-    "-Wno-error=nrvo"
-    "-Wno-error=missing-noreturn"
-  ];
-
   meta = {
     homepage = "https://github.com/doctest/doctest";
     description = "Fastest feature-rich C++11/14/17/20 single-header testing framework";
     platforms = lib.platforms.all;
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.nim65s ];
   };
 })
diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix
index bb4af11071fb..26b0b81c1260 100644
--- a/pkgs/by-name/do/dokieli/package.nix
+++ b/pkgs/by-name/do/dokieli/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dokieli";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-04-27";
 
   src = fetchFromGitHub {
     owner = "dokieli";
     repo = "dokieli";
-    rev = "01714c999c7b2390ae15f092ef5b7b4d6cc9c3e8";
-    hash = "sha256-PRU4X3lVRnPvvVPzabJ/J2ly4eyFwCxSsKuL0yuRy2I=";
+    rev = "4d0ad172bb02245d93abb3290a51e9743a880876";
+    hash = "sha256-Xkj2H5a5uTqGpOuLPo5BLM7vEGx5eaznX1w0CiNQFZA=";
   };
 
   missingHashes = ./missing-hashes.json;
diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix
index b6e282f5c851..ba9dd9f99663 100644
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@@ -33,7 +33,7 @@
   pugixml,
   sdl3,
   sfml,
-  xxHash,
+  xxhash,
   xz,
   zlib-ng,
   # linux-only
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtsvg
     sdl3
     sfml
-    xxHash
+    xxhash
     xz
     zlib-ng
   ]
diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix
index f9fa4e7930ac..d142a1a53a14 100644
--- a/pkgs/by-name/do/doppler/package.nix
+++ b/pkgs/by-name/do/doppler/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "doppler";
-  version = "3.75.3";
+  version = "3.76.0";
 
   src = fetchFromGitHub {
     owner = "dopplerhq";
     repo = "cli";
     rev = finalAttrs.version;
-    hash = "sha256-4OvU0Hy2uBjeyQibODi9WqdM0adUW2vTS9SCL+O2RFA=";
+    hash = "sha256-CmNSn4WRWMP07qC5APw8PTouCUOHJrz1ZYqpKhdiIDM=";
   };
 
   vendorHash = "sha256-u6SB3SXCqu7Y2aUoTAJ01mtDCxMofVQLAde1jDxVvks=";
diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index 42787161ed45..06df698995aa 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -3,27 +3,26 @@
   buildNpmPackage,
   fetchFromGitHub,
   testers,
-  dotenvx,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "dotenvx";
-  version = "1.61.1";
+  version = "1.64.0";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
-    tag = "v${version}";
-    hash = "sha256-ZNGHtscG3JSxHyKfn6d39SamPwkOXkb3xPNgyeo9JmU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Xa3xtDzvSbgba083R2g3vV8Jtv86NMEbZ/EhYxmGsKA=";
   };
 
-  npmDepsHash = "sha256-csxBcYg0iT0iPsRloLwicVqe2Fg+TprG1eZkg6gHSWs=";
+  npmDepsHash = "sha256-WeqODrueKqDFvIsXHlzWhHSdqPY/uS+VM+wCp69LN9M=";
 
   dontNpmBuild = true;
 
   passthru.tests = {
     version = testers.testVersion {
-      package = dotenvx;
+      package = finalAttrs.finalPackage;
       # access to the home directory
       command = "HOME=$TMPDIR dotenvx --version";
     };
@@ -32,7 +31,7 @@ buildNpmPackage rec {
   meta = {
     description = "Better dotenv–from the creator of `dotenv`";
     homepage = "https://github.com/dotenvx/dotenvx";
-    changelog = "https://github.com/dotenvx/dotenvx/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/dotenvx/dotenvx/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       natsukium
@@ -40,4 +39,4 @@ buildNpmPackage rec {
     ];
     mainProgram = "dotenvx";
   };
-}
+})
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
index 1eb892d89f2f..abb4ce1a531c 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Biome (JS/TS/JSON) wrapper plugin";
-  hash = "sha256-OCnhTv0UfRX4ntmkhNlswfhHbxVFiGu8ovYagEITlI8=";
+  hash = "sha256-dje/9QfRL9D16J6NXErK1HdJyMZaLpI/L/lq3WdyQso=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "biome";
@@ -17,6 +17,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-biome";
   updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
-  url = "https://plugins.dprint.dev/biome-0.12.7.wasm";
-  version = "0.12.7";
+  url = "https://plugins.dprint.dev/biome-0.12.8.wasm";
+  version = "0.12.8";
 }
diff --git a/pkgs/by-name/dr/dragonflydb/package.nix b/pkgs/by-name/dr/dragonflydb/package.nix
index 79eca3f54019..cbd5fe185d33 100644
--- a/pkgs/by-name/dr/dragonflydb/package.nix
+++ b/pkgs/by-name/dr/dragonflydb/package.nix
@@ -25,7 +25,7 @@
   re2,
   re-flex,
   uni-algo,
-  xxHash,
+  xxhash,
   zstd,
 
   # Build tools
@@ -151,7 +151,7 @@ stdenv.mkDerivation {
     cp -r --no-preserve=mode,ownership ${mimalloc224} build/deps-nixpkgs/mimalloc224
     cp -r --no-preserve=mode,ownership ${pugixml.src} build/deps-nixpkgs/pugixml
     cp -r --no-preserve=mode,ownership ${re-flex.src} build/deps-nixpkgs/reflex
-    cp -r --no-preserve=mode,ownership ${xxHash.src} build/deps-nixpkgs/xxhash
+    cp -r --no-preserve=mode,ownership ${xxhash.src} build/deps-nixpkgs/xxhash
     cp -r --no-preserve=mode,ownership ${zstd.src} build/deps-nixpkgs/zstd
 
     # c-ares is provided as a tarball, extract it
diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix
index 3b40b2d4f0d6..7680b4b60d04 100644
--- a/pkgs/by-name/dr/drawterm/package.nix
+++ b/pkgs/by-name/dr/drawterm/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "drawterm";
-  version = "0-unstable-2026-01-11";
+  version = "0-unstable-2026-04-14";
 
   src = fetchFrom9Front {
     owner = "plan9front";
     repo = "drawterm";
-    rev = "8a88fb5b8c75450d2e20ae1c7839d823bb1f6fad";
-    hash = "sha256-hejdFLYJvANKOC4Jgr9XvYl/5kU9PiKSH5cWE6d6e/o=";
+    rev = "aeb3be64bfc4c8d8c0b5fce70b26d12f7a59156a";
+    hash = "sha256-YHcdAjM5+NEuyjz2sYFZEFhr0nQzstfdJtZ/HvksNHQ=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/dr/drumkv1/package.nix b/pkgs/by-name/dr/drumkv1/package.nix
index 12b3981c5ef7..a24be4d5968a 100644
--- a/pkgs/by-name/dr/drumkv1/package.nix
+++ b/pkgs/by-name/dr/drumkv1/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "drumkv1";
-  version = "1.3.2";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/drumkv1-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Z9F9lbLSAJRlVh7tnSMNTlK7FiZhhlVfeHPlbbVuWXk=";
+    hash = "sha256-w9/bdK/qjSeBD5hfHQnGFUGDnUqPgdkM8GQ18Ps+nzM=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/dr/drupal/package.nix b/pkgs/by-name/dr/drupal/package.nix
index 3f6921f74d04..af0370aea95a 100644
--- a/pkgs/by-name/dr/drupal/package.nix
+++ b/pkgs/by-name/dr/drupal/package.nix
@@ -8,18 +8,18 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "drupal";
-  version = "11.3.6";
+  version = "11.3.8";
 
   src = fetchFromGitLab {
     domain = "git.drupalcode.org";
     owner = "project";
     repo = "drupal";
     tag = finalAttrs.version;
-    hash = "sha256-2EKpX4DXsGWBa8jtLqDnE9L97MsqfYhNR2S1r9sLxXE=";
+    hash = "sha256-z2uhUqY5z1lrq18jfqh0Tsxtc1X+sJ5BKr/Fot89HyA=";
   };
 
   composerNoPlugins = false;
-  vendorHash = "sha256-Q5h8EcD3b0pbSU5Jkpne3eYn/fprwe5nOCivKng6PkQ=";
+  vendorHash = "sha256-rTAHOt+LiG2bYZqOfG0wtW69bJisrrAA3yIhBOSIQPk=";
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/dr/dry/package.nix b/pkgs/by-name/dr/dry/package.nix
index 0b349b324b64..37e706b7130d 100644
--- a/pkgs/by-name/dr/dry/package.nix
+++ b/pkgs/by-name/dr/dry/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "dry";
-  version = "0.11.2";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "moncho";
     repo = "dry";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JGtPX6BrB3q2EQyF6x2A5Wsn5DudOSVt3IxBAjjwlC8=";
+    hash = "sha256-mS7vb1geYqzj6KnkOE7j/HRdqmdipfTsFufK3v6AgdM=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-AduDbBpCoW7GmYrBPpL7wyLvwoez81qP/+mllgoHInY=";
+  vendorHash = "sha256-e8IkL+HRAWDKiw/Za899y1cuvKlaM6gUGToKvIsTZD8=";
 
   meta = {
     description = "Terminal application to manage Docker and Docker Swarm";
diff --git a/pkgs/by-name/du/dumpyara/package.nix b/pkgs/by-name/du/dumpyara/package.nix
new file mode 100644
index 000000000000..3ace3aafdc9d
--- /dev/null
+++ b/pkgs/by-name/du/dumpyara/package.nix
@@ -0,0 +1,83 @@
+{
+  lib,
+  runCommand,
+  python3Packages,
+  fetchFromGitHub,
+  callPackage,
+  nix-update-script,
+  _7zz,
+  android-tools,
+  cpio,
+  dumpyara,
+  erofs-utils,
+  squashfsTools,
+  zip,
+}:
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "dumpyara";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sebaubuntu-python";
+    repo = "dumpyara";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-V7SX1XR+De3py6B3Fmqn1IehN0sGPxUKJ0YlGpBPHG4=";
+  };
+
+  build-system = with python3Packages; [ poetry-core ];
+
+  dependencies = with python3Packages; [
+    brotli
+    liblp
+    lz4
+    protobuf5
+    py7zr
+    sebaubuntu-libs
+    zstandard
+  ];
+
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      _7zz
+      android-tools
+      cpio
+      erofs-utils
+    ])
+  ];
+
+  passthru = {
+    tests.requiredTools =
+      runCommand "check-required-tools"
+        {
+          nativeBuildInputs = [
+            android-tools
+            dumpyara
+            squashfsTools
+            zip
+          ];
+        }
+        ''
+          echo foo > bar.txt
+          mkbootimg --kernel bar.txt -o boot.img
+          mksquashfs bar.txt system.img
+          zip system.zip *.img
+          dumpyara system.zip
+          touch $out
+        '';
+    updateScript = nix-update-script { };
+  };
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Android firmware dumper";
+    homepage = "https://github.com/sebaubuntu-python/dumpyara";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+    mainProgram = "dumpyara";
+  };
+})
diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index 88d12d8f043e..0fce7eb7f88a 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   libbsd,
   libgcrypt,
-  xxHash,
+  xxhash,
   pkg-config,
   glib,
   linuxHeaders ? stdenv.cc.libc.linuxHeaders,
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     linuxHeaders
     sqlite
     util-linux
-    xxHash
+    xxhash
   ];
 
   makeFlags = [
diff --git a/pkgs/by-name/du/duplicati/deps.json b/pkgs/by-name/du/duplicati/deps.json
index c5372b0c5fb1..eba4019bbca3 100644
--- a/pkgs/by-name/du/duplicati/deps.json
+++ b/pkgs/by-name/du/duplicati/deps.json
@@ -21,8 +21,13 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.3.3",
-    "hash": "sha256-UvENUQgoTUikjIMTL+oI93FNwr1gZfoGVtZdYzBzdts="
+    "version": "11.3.13",
+    "hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "12.0.0",
+    "hash": "sha256-pBn3o40TTYAPtjcfvaVK6wMFNSY7AHEE5wU4zDUj4FA="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
@@ -31,63 +36,78 @@
   },
   {
     "pname": "Avalonia.BuildServices",
-    "version": "0.0.31",
-    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
+    "version": "11.3.2",
+    "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40="
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.3",
-    "hash": "sha256-zg35D8NygrU8mCAsLLoPmrzXZcV31NuHNtTaiZZhOxc="
+    "version": "11.3.13",
+    "hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.3",
-    "hash": "sha256-/jYjxA5vJqU5IpJkgnlathprzdHB/ihdL35ZZBRESeU="
+    "version": "12.0.0",
+    "hash": "sha256-M18vFA8cxZDR6RBF32O82n5pQAj70Jr6CpVXUEjtEso="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.3.3",
-    "hash": "sha256-rHBFnhZ+gAqPqqDfZxBxUr3wXIpgOc9hInwzDOgdk5E="
+    "version": "11.3.13",
+    "hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.3",
-    "hash": "sha256-kUSE90HoJz9NsYCphLUQgNkxb3xHhFIlqXa6lzuGi4c="
+    "version": "12.0.0",
+    "hash": "sha256-jOAw9i1K093cfGrNOVZQgXm8nNxaFcRMhbLM3NFrGE8="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop.AtSpi",
+    "version": "12.0.0",
+    "hash": "sha256-/sXI18zP+SB8kRBZLl1WddrNxsgQRceoB3AiZwQYfWs="
+  },
+  {
+    "pname": "Avalonia.HarfBuzz",
+    "version": "12.0.0",
+    "hash": "sha256-3S0L0YqiULMBgXbwlJl7qTwhBZl8I/ahM8GF1kcK/hE="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.3",
-    "hash": "sha256-QmvN5gUsgjk7ViacdXOwHULHid0TfAKJGW3cf9A8bwQ="
+    "version": "12.0.0",
+    "hash": "sha256-QqPWE4I2TxCPHufuNkfx1r35lGN1W+c992gxzrB+RRc="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.3",
-    "hash": "sha256-gHZA53IyRAdeIg7yRIN6Pzh0AbOGd5B9mckEWsPuK7A="
+    "version": "11.3.13",
+    "hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "12.0.0",
+    "hash": "sha256-l/NCO/I3Zavlta14Q198MpYn7jtwMclUWk6cqEgqmTU="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.3",
-    "hash": "sha256-pUMqXnupxztsAP/n4U2pSgTga89gy7CBLg39y2j0EjA="
+    "version": "12.0.0",
+    "hash": "sha256-w8i8lTkf3yp78rPxg7LlcsrKF/K3J7ATOTy3D/Bt6CA="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.3.3",
-    "hash": "sha256-tWNl3jvESx96lTd6i0lxo6Y8/Y6cS5ZQrPovIolNfAE="
+    "version": "12.0.0",
+    "hash": "sha256-wpBWj5EsRPDhsoE+RFGy8Z7wS8lN2s0mW7qFgRaVOOA="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.3",
-    "hash": "sha256-nUfIEeJZgiLuy681S16Qncri6fvCGF7tYk4dSf3JY4s="
+    "version": "11.3.13",
+    "hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.3",
-    "hash": "sha256-jlQXEdbZjfRsu2MjYzHGUAyn+uvdACXCvm63HjUKqfQ="
+    "version": "12.0.0",
+    "hash": "sha256-QDS1fxNQMw3EHfrqihk05emNENjUmxLQyYgNCQp9vwM="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.3",
-    "hash": "sha256-7A+uzB7g21P+RnKO4bKOJVY35qPz5Xna8n8VGG7RoMw="
+    "version": "12.0.0",
+    "hash": "sha256-WJjJKB2q1s18BVlLDUdPIpLQC2Bhgkl7fkO42Kjv2zU="
   },
   {
     "pname": "AWSSDK.Core",
@@ -391,28 +411,28 @@
   },
   {
     "pname": "HarfBuzzSharp",
-    "version": "8.3.1.1",
-    "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
+    "version": "8.3.1.3",
+    "hash": "sha256-/+ZEhjpOs8B4tMPw3vDyuQqGGZHJEWvy3WaKMaDwmrU="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "8.3.1.1",
-    "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
+    "version": "8.3.1.3",
+    "hash": "sha256-feWOna/8ncvmrq7CxnDczv1facV2poZV5R+OyCtocpU="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "8.3.1.1",
-    "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
+    "version": "8.3.1.3",
+    "hash": "sha256-6WKsJ/jF9pHnaWcQvaezc5AV6flu3XsOxQs7i4BGYJs="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "8.3.1.1",
-    "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
+    "version": "8.3.1.3",
+    "hash": "sha256-arBiI82fXPjAqftqnG7Wc3BRzZ6+vKd7b58vQSWJVk0="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "8.3.1.1",
-    "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
+    "version": "8.3.1.3",
+    "hash": "sha256-WNUQmLWVFSwBKT9x7UdhSz9T2FA7wibvwjuPew/3yUM="
   },
   {
     "pname": "jose-jwt",
@@ -426,8 +446,8 @@
   },
   {
     "pname": "MailKit",
-    "version": "4.12.1",
-    "hash": "sha256-fwI0YTbwfzrvdkbATWGbv4D8ugOXgaPO/WFvGxQ9WS8="
+    "version": "4.16.0",
+    "hash": "sha256-4yyFxq8pJVTIgAJkyAYcuV2+/ZirENgUSk1OSD/gKIo="
   },
   {
     "pname": "MegaApiClient",
@@ -441,8 +461,8 @@
   },
   {
     "pname": "MicroCom.Runtime",
-    "version": "0.11.0",
-    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+    "version": "0.11.4",
+    "hash": "sha256-hd13T4Z9DsF1Sb56bS+SDpWjksJVzb4m/Kp37jaUhkU="
   },
   {
     "pname": "Microsoft.ApplicationInsights",
@@ -774,11 +794,6 @@
     "version": "17.14.1",
     "hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A="
   },
-  {
-    "pname": "Microsoft.NETCore.App.Host.win-x64",
-    "version": "10.0.5",
-    "hash": "sha256-Rstfo3XefLjeoW5qfVcHsCviFxWvZS+F8McWRUW7WdQ="
-  },
   {
     "pname": "Microsoft.OpenApi",
     "version": "2.3.0",
@@ -841,13 +856,8 @@
   },
   {
     "pname": "MimeKit",
-    "version": "4.12.0",
-    "hash": "sha256-4i/RvXyXQsb6LlEs7tZWz5d5ab8mw3R8Wwp7FXSbMaA="
-  },
-  {
-    "pname": "MimeKit",
-    "version": "4.15.1",
-    "hash": "sha256-MI4Wr+JWoxR9wsYhKmW8j1EdJ59W/O4jv5D9Zb8mEUw="
+    "version": "4.16.0",
+    "hash": "sha256-yWGXVm+EHvBSsZlVHdWdD+rVwdf/5hHxsUfJMSd2Afo="
   },
   {
     "pname": "Minio",
@@ -926,28 +936,28 @@
   },
   {
     "pname": "SkiaSharp",
-    "version": "2.88.9",
-    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
+    "version": "3.119.3-preview.1.1",
+    "hash": "sha256-fIrOUgx8K/qnJaQCPa06BPlkIy3PHRgrhHGkKn5d3qY="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.9",
-    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+    "version": "3.119.3-preview.1.1",
+    "hash": "sha256-JsQ9xmreA1zNaLwEHNPMaFsRygEDhemJCrbkhs8WHvQ="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.9",
-    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+    "version": "3.119.3-preview.1.1",
+    "hash": "sha256-9l1xrgVl6kH2kjW5ffluKv4ec/kqUfVnqlz9OVwP2cQ="
   },
   {
     "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "2.88.9",
-    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
+    "version": "3.119.3-preview.1.1",
+    "hash": "sha256-5UsssFayYOMcvWNBGJeChLRc9EahpIuuexNhGHnnrhU="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.9",
-    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+    "version": "3.119.3-preview.1.1",
+    "hash": "sha256-MWsHe/NBlbHGtEhUICVuuhpRYSjtU06msLCoglqmVhQ="
   },
   {
     "pname": "SMBLibrary",
@@ -1196,8 +1206,13 @@
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.21.2",
-    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+    "version": "0.90.3",
+    "hash": "sha256-jK/98C0WrkVqPPNMx+xkdGK7vhcFmDsMqX7hUmALAWM="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.92.0",
+    "hash": "sha256-WZSB9eqSOIzsBfnpOJDIIopIhNxAH+UcZuD6W94PIN4="
   },
   {
     "pname": "uplink.NET",
diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix
index 9c80ce19f120..b9ef48a7c665 100644
--- a/pkgs/by-name/du/duplicati/package.nix
+++ b/pkgs/by-name/du/duplicati/package.nix
@@ -14,9 +14,9 @@
 
 let
   # for update.sh easy to handle
-  ngclientVersion = "0.0.207";
-  ngclientRev = "42d711a541ca1ee2ff43f95cce89e8eeb224afc8";
-  ngclientHash = "sha256-VS6kb/2YGn/TBDXt62UifD7BHCWE2xiUkLcGBXzV+ww=";
+  ngclientVersion = "0.0.218";
+  ngclientRev = "67e437adee2fefa9dc2a9464d3748a8512525f71";
+  ngclientHash = "sha256-1DT/WIaQ+di8vsnsAaA5qYinhvaKImEfGn2pyljXxjw=";
 
   # from Duplicati/Server/webroot/ngclient/package.json
   ngclient = buildNpmPackage {
@@ -30,7 +30,7 @@ let
       hash = ngclientHash;
     };
 
-    npmDepsHash = "sha256-wkzSUEqoB013yNbC1sX4qRz8DuGWRB20/M+ue/thbOQ=";
+    npmDepsHash = "sha256-yytz5qMhgd/yXr11szuVslTLTjV5XpfNPyLW3mmRM1E=";
 
     nativeBuildInputs = [ bun ];
 
@@ -58,15 +58,15 @@ let
 in
 buildDotnetModule rec {
   pname = "duplicati";
-  version = "2.3.0.0";
+  version = "2.3.0.1";
   channel = "stable";
-  buildDate = "2026-04-14";
+  buildDate = "2026-04-24";
 
   src = fetchFromGitHub {
     owner = "duplicati";
     repo = "duplicati";
     tag = "v${version}_${channel}_${buildDate}";
-    hash = "sha256-X9SaH83p2RJWeJK8MfNwPgI2c3AfBHhbxOaFz4c26qU=";
+    hash = "sha256-r3Oumo2vrViTNvZDUaVoJyGMBf1/uHS6oAhn9Aegb3s=";
     stripRoot = true;
   };
 
diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix
index 657b1f05b435..f28206e12998 100644
--- a/pkgs/by-name/dw/dwarfs/package.nix
+++ b/pkgs/by-name/dw/dwarfs/package.nix
@@ -22,7 +22,7 @@
   python3,
   range-v3,
   ronn,
-  xxHash,
+  xxhash,
   utf8cpp,
   zstd,
   parallel-hashmap,
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     jemalloc
     libarchive
     lz4
-    xxHash
+    xxhash
     utf8cpp
     zstd
 
diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix
index a3bf7a998f43..271b809729ce 100644
--- a/pkgs/by-name/dw/dwproton-bin/package.nix
+++ b/pkgs/by-name/dw/dwproton-bin/package.nix
@@ -11,13 +11,18 @@ proton-ge-bin.overrideAttrs (
     inherit steamDisplayName;
 
     pname = "dwproton-bin";
-    version = "dwproton-10.0-24";
+    version = "dwproton-10.0-26";
 
     src = fetchzip {
       url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz";
-      hash = "sha256-3mfJGi2pUwPgWNZCvGD1SNHghS2HThX5Y7TrnJaEYvw=";
+      hash = "sha256-TkwhJCHPS0PdDIEL5GrxJPR09uO9U2DR8l9KWFLIF2g=";
     };
 
+    preFixup = ''
+      substituteInPlace "$steamcompattool/compatibilitytool.vdf" \
+        --replace-fail "${finalAttrs.version}" "${steamDisplayName}"
+    '';
+
     passthru.updateScript = writeScript "update-dwproton" ''
       #!/usr/bin/env nix-shell
       #!nix-shell -i bash -p curl jq common-updater-scripts
diff --git a/pkgs/by-name/dw/dwz/package.nix b/pkgs/by-name/dw/dwz/package.nix
index da4cc9bb4e2a..9e7c88f55971 100644
--- a/pkgs/by-name/dw/dwz/package.nix
+++ b/pkgs/by-name/dw/dwz/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   elfutils,
-  xxHash,
+  xxhash,
   dejagnu,
   gdb,
 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ elfutils ];
 
   buildInputs = [
-    xxHash
+    xxhash
     elfutils
   ];
 
diff --git a/pkgs/by-name/dy/dyff/package.nix b/pkgs/by-name/dy/dyff/package.nix
index 703e10522595..12487c919ade 100644
--- a/pkgs/by-name/dy/dyff/package.nix
+++ b/pkgs/by-name/dy/dyff/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dyff";
-  version = "1.11.3";
+  version = "1.11.4";
 
   src = fetchFromGitHub {
     owner = "homeport";
     repo = "dyff";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-3zfKEyVVqbzlqQ0GMjIgrIUFtsKEgu+/EEYhSGu9Fgs=";
+    sha256 = "sha256-ca7mNC5QVAZIfxHBAkIffBiuQa6VKNObO5XTnoR1i0k=";
   };
 
-  vendorHash = "sha256-hxDDfxLCGov0IYYy9wn5bub7qiGUdjsNfFbvuWAgHH4=";
+  vendorHash = "sha256-XGEe7uunEWmiOTWF7sOBDNh3GZ2f1pCvm8HTyS+gOWY=";
 
   subPackages = [
     "cmd/dyff"
diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index a76152aeaf29..10a3f4021803 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -55,17 +55,18 @@ let
     kirigami-addons
     qqc2-desktop-style
     ;
+  speexdsp' = speexdsp.override { withFftw3 = false; };
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "easyeffects";
-  version = "8.2.0";
+  version = "8.2.1";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HBCYXFFDOhwVebwPIduYNGJ61LFw9lOTZyYmt1k6CuA=";
+    hash = "sha256-bGjIqts06ruwMQIW5hk4wlG7G/7GtgFVBgSr68tkIqY=";
   };
 
   nativeBuildInputs = [
@@ -109,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     rnnoise
     rubberband
     soundtouch
-    speexdsp
+    speexdsp'
     onetbb
     webrtc-audio-processing
     zita-convolver
diff --git a/pkgs/by-name/ea/easylpac/package.nix b/pkgs/by-name/ea/easylpac/package.nix
index da85d65a62f2..3157980dad45 100644
--- a/pkgs/by-name/ea/easylpac/package.nix
+++ b/pkgs/by-name/ea/easylpac/package.nix
@@ -20,13 +20,13 @@
 
 buildGoModule rec {
   pname = "easylpac";
-  version = "0.8.0.2";
+  version = "0.8.0.3";
 
   src = fetchFromGitHub {
     owner = "creamlike1024";
     repo = "EasyLPAC";
     tag = version;
-    hash = "sha256-GxcaMyEaPIGf+/wzmmycmFssTkP5Praj4GCYbxbJU28=";
+    hash = "sha256-q76p0BqrG8opuTClYKLfmM5hdziJIrZCwQmg2NkzW/E=";
   };
 
   vendorHash = "sha256-52I8hlnoHPhygwr0dxDP50X2A7Gsh0v/0SGQFH3FG/8=";
@@ -79,6 +79,6 @@ buildGoModule rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ stargate01 ];
     mainProgram = "EasyLPAC";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/ec/ec/package.nix b/pkgs/by-name/ec/ec/package.nix
index ce8a38e28556..6e8eea5a9153 100644
--- a/pkgs/by-name/ec/ec/package.nix
+++ b/pkgs/by-name/ec/ec/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "ec";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "chojs23";
     repo = "ec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tnOr0AVPwEm9gONa7gl3TzhPC5/1WEAbW7Ew5/mNn5U=";
+    hash = "sha256-Oltl23Ihv2p1sTW62nGUt+oH6E2DB38fIuNiXRaghBU=";
   };
 
   vendorHash = "sha256-bV5y8zKculYULkFl9J95qebLOzdTT/LuYycqMmHKZ+g=";
diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix
index e8d76dac5918..be529d895c8a 100644
--- a/pkgs/by-name/ec/ecspresso/package.nix
+++ b/pkgs/by-name/ec/ecspresso/package.nix
@@ -7,20 +7,20 @@
 
 buildGoModule (finalAttrs: {
   pname = "ecspresso";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchFromGitHub {
     owner = "kayac";
     repo = "ecspresso";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EJP7wvMalb+Usd2NAUUihhbNcWXT7KaB1HM0Ao3RDTM=";
+    hash = "sha256-TW7ccNYdCAySH9QwlKskjsutiUPHfTlmTSTCpOqPdfY=";
   };
 
   subPackages = [
     "cmd/ecspresso"
   ];
 
-  vendorHash = "sha256-G7IA2aQfvvretp310uh/t/u1NiqeJQzIUHdKyJdNDeg=";
+  vendorHash = "sha256-vdj0QIqnci6P+4zWrhcxrFwvyu+hF9r6RrqtBGbVToA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ed/edhm-ui/package.nix b/pkgs/by-name/ed/edhm-ui/package.nix
index 6521f622abe3..174f0c806dbf 100644
--- a/pkgs/by-name/ed/edhm-ui/package.nix
+++ b/pkgs/by-name/ed/edhm-ui/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "edhm-ui";
-  version = "3.0.63";
+  version = "3.0.64";
 
   strictDeps = true;
 
   src = fetchzip {
     url = "https://github.com/BlueMystical/EDHM_UI/releases/download/v${finalAttrs.version}/edhm-ui-v3-linux-x64.zip";
-    hash = "sha256-f+nVupCywLlZYLKB8O1tGJKOKq3zT8PQM5mjLcp2MOY=";
+    hash = "sha256-kBCaQKGO8ySpquEWh91GyqHfHCem5q1gyVdYuWdaMB8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/eg/egl-gbm/package.nix b/pkgs/by-name/eg/egl-gbm/package.nix
new file mode 100644
index 000000000000..bda8f607105a
--- /dev/null
+++ b/pkgs/by-name/eg/egl-gbm/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  eglexternalplatform,
+  pkg-config,
+  meson,
+  ninja,
+  libGL,
+  libgbm,
+  libdrm,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "egl-gbm";
+  version = "1.1.3";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "egl-gbm";
+    tag = finalAttrs.version;
+    hash = "sha256-OoHgvFbyd6JakSKyN7N97FMJHNYV1spj7zy3f1g/PN0=";
+  };
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    libGL
+    libgbm
+    libdrm
+    eglexternalplatform
+  ];
+
+  absolutizeEglExternalPlatformIcdJson = true;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+
+  meta = {
+    description = "GBM EGL external platform library";
+    homepage = "https://github.com/NVIDIA/egl-gbm/";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      ccicnce113424
+    ];
+  };
+})
diff --git a/pkgs/by-name/eg/egl-wayland/package.nix b/pkgs/by-name/eg/egl-wayland/package.nix
index acf88b480295..c16988d026a0 100644
--- a/pkgs/by-name/eg/egl-wayland/package.nix
+++ b/pkgs/by-name/eg/egl-wayland/package.nix
@@ -8,10 +8,10 @@
   ninja,
   wayland-scanner,
   libGL,
-  libx11,
   libdrm,
   wayland,
   wayland-protocols,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   src = fetchFromGitHub {
-    owner = "Nvidia";
+    owner = "NVIDIA";
     repo = "egl-wayland";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-a98DzmzCG6DlLJ1HCl/LeD21Q7yyNbTce1poOoAnTjA=";
   };
 
@@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libGL
-    libx11
     libdrm
     wayland
     wayland-protocols
@@ -59,11 +58,21 @@ stdenv.mkDerivation (finalAttrs: {
     eglexternalplatform
   ];
 
+  absolutizeEglExternalPlatformIcdJson = true;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+
   meta = {
     description = "EGLStream-based Wayland external platform";
     homepage = "https://github.com/NVIDIA/egl-wayland/";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux ++ lib.platforms.freebsd;
-    maintainers = with lib.maintainers; [ hedning ];
+    maintainers = with lib.maintainers; [
+      hedning
+      ccicnce113424
+    ];
   };
 })
diff --git a/pkgs/by-name/eg/egl-wayland2/package.nix b/pkgs/by-name/eg/egl-wayland2/package.nix
new file mode 100644
index 000000000000..5af0b014e10a
--- /dev/null
+++ b/pkgs/by-name/eg/egl-wayland2/package.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  eglexternalplatform,
+  pkg-config,
+  meson,
+  ninja,
+  wayland-scanner,
+  libGL,
+  libgbm,
+  libdrm,
+  wayland,
+  wayland-protocols,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "egl-wayland2";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "egl-wayland2";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Udr+tihx/Si2ynFyM1FW2CIUgTg9SQn7AgrOPpGTxpY=";
+  };
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    libGL
+    libgbm
+    libdrm
+    wayland
+    wayland-protocols
+    eglexternalplatform
+  ];
+
+  absolutizeEglExternalPlatformIcdJson = true;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+
+  meta = {
+    description = "Dma-buf-based Wayland external platform library";
+    homepage = "https://github.com/NVIDIA/egl-wayland2/";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      vancluever
+      ccicnce113424
+    ];
+  };
+})
diff --git a/pkgs/by-name/eg/egl-x11/package.nix b/pkgs/by-name/eg/egl-x11/package.nix
new file mode 100644
index 000000000000..28b5a8474e56
--- /dev/null
+++ b/pkgs/by-name/eg/egl-x11/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  eglexternalplatform,
+  pkg-config,
+  meson,
+  ninja,
+  libGL,
+  libgbm,
+  libdrm,
+  libx11,
+  libxcb,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "egl-x11";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "egl-x11";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Sl/qc39H29wXsb5UYKGK7IciwTlbRBqA9omL2sgXpx0=";
+  };
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    libGL
+    libgbm
+    libdrm
+    libx11
+    libxcb
+    eglexternalplatform
+  ];
+
+  absolutizeEglExternalPlatformIcdJson = true;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+
+  meta = {
+    description = "X11/XCB external platform library";
+    homepage = "https://github.com/NVIDIA/egl-x11/";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      ccicnce113424
+    ];
+  };
+})
diff --git a/pkgs/by-name/eg/eglexternalplatform/package.nix b/pkgs/by-name/eg/eglexternalplatform/package.nix
index 3208fbcd02eb..c8ac9db06298 100644
--- a/pkgs/by-name/eg/eglexternalplatform/package.nix
+++ b/pkgs/by-name/eg/eglexternalplatform/package.nix
@@ -4,6 +4,9 @@
   fetchFromGitHub,
   meson,
   ninja,
+  buildPackages,
+  replaceVars,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -11,9 +14,9 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.2.1";
 
   src = fetchFromGitHub {
-    owner = "Nvidia";
+    owner = "NVIDIA";
     repo = "eglexternalplatform";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-tDKh1oSnOSG/XztHHYCwg1tDB7M6olOtJ8te+uan9ko=";
   };
 
@@ -22,11 +25,24 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
+  setupHook = replaceVars ./setup-hook.sh {
+    jq = lib.getExe buildPackages.jq;
+    sponge = lib.getExe' buildPackages.moreutils "sponge";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+
   meta = {
     description = "EGL External Platform interface";
     homepage = "https://github.com/NVIDIA/eglexternalplatform";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux ++ lib.platforms.freebsd;
-    maintainers = with lib.maintainers; [ hedning ];
+    maintainers = with lib.maintainers; [
+      hedning
+      ccicnce113424
+    ];
   };
 })
diff --git a/pkgs/by-name/eg/eglexternalplatform/setup-hook.sh b/pkgs/by-name/eg/eglexternalplatform/setup-hook.sh
new file mode 100644
index 000000000000..2beca684e793
--- /dev/null
+++ b/pkgs/by-name/eg/eglexternalplatform/setup-hook.sh
@@ -0,0 +1,43 @@
+# shellcheck shell=bash
+
+absolutizeIcdLibraryPath() {
+  local jsonFile="$1"
+  local libPath="$2"
+
+  if [[ -z "$jsonFile" || -z "$libPath" ]]; then
+    nixErrorLog "absolutizeIcdLibraryPath: expected <json-file> <library-prefix>"
+    return 1
+  fi
+
+  if [[ ! -f "$jsonFile" ]]; then
+    nixErrorLog "absolutizeIcdLibraryPath: JSON file not found: $jsonFile"
+    return 1
+  fi
+
+  @jq@ --arg lib "$libPath" \
+    '.ICD.library_path |= $lib + .' \
+    "$jsonFile" | @sponge@ "$jsonFile"
+}
+
+fixupEglExternalPlatformIcdJsonHook() {
+  case "${absolutizeEglExternalPlatformIcdJson-}" in
+    1|true|yes) ;;
+    *) return 0 ;;
+  esac
+
+  local jsonDir="$prefix/share/egl/egl_external_platform.d"
+
+  if [[ ! -d "$jsonDir" ]]; then
+    return 0
+  fi
+
+  local f
+  for f in "$jsonDir"/*.json; do
+    if [[ ! -e "$f" ]]; then
+      continue
+    fi
+    absolutizeIcdLibraryPath "$f" "$prefix/lib/"
+  done
+}
+
+fixupOutputHooks+=(fixupEglExternalPlatformIcdJsonHook)
diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix
index e5ae525aeb0c..5444253ec88f 100644
--- a/pkgs/by-name/ei/eigenwallet/package.nix
+++ b/pkgs/by-name/ei/eigenwallet/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eigenwallet";
-  version = "4.2.4";
+  version = "4.4.1";
 
   src = fetchurl {
     url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-2AZJ8YSRxnlWtEkG8X9Zxt+xC/2YkTGg3kDorDjQYxY=";
+    hash = "sha256-iwnDAF3iWol7wOc8HWVi/E8hgf0EcVE7RcUtm11JpOs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index 383bdcf4417d..636e7b8557a2 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -19,6 +19,7 @@
   gawk,
   fetchFromGitHub,
   fetchgit,
+  fetchNpmDeps,
   beamPackages,
   nixosTests,
   withMysql ? false,
@@ -35,6 +36,9 @@
   withRedis ? false,
   withImagemagick ? false,
   imagemagick,
+  withBootstrap ? true, # used for the built-in mod_invites page
+  nodejs,
+  npmHooks,
 }:
 
 let
@@ -76,7 +80,6 @@ let
     builder = lib.makeOverridable buildRebar3;
 
     overrides = final: prev: {
-      jiffy = prev.jiffy.override { buildPlugins = [ beamPackages.pc ]; };
       cache_tab = prev.cache_tab.override { buildPlugins = [ beamPackages.pc ]; };
       mqtree = prev.mqtree.override { buildPlugins = [ beamPackages.pc ]; };
       stringprep = prev.stringprep.override { buildPlugins = [ beamPackages.pc ]; };
@@ -137,10 +140,11 @@ let
     "ezlib"
   ];
 
+  npmToolingUsed = withBootstrap;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ejabberd";
-  version = "26.02";
+  version = "26.04";
 
   nativeBuildInputs = [
     makeWrapper
@@ -151,6 +155,10 @@ stdenv.mkDerivation (finalAttrs: {
         rebar3_hex
       ];
     })
+  ]
+  ++ lib.optionals npmToolingUsed [
+    nodejs
+    npmHooks.npmConfigHook
   ];
 
   buildInputs = [
@@ -166,11 +174,17 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional withLua allBeamDeps.luerl
   ++ lib.optional withRedis allBeamDeps.eredis;
 
+  npmDeps = lib.optionalDrvAttr npmToolingUsed (fetchNpmDeps {
+    name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
+    src = finalAttrs.src;
+    hash = "sha256-MTyoc8ozrCi3W0CXmxyLpyU8v+vlUjcbLnv/1ev/Qqo=";
+  });
+
   src = fetchFromGitHub {
     owner = "processone";
     repo = "ejabberd";
     tag = finalAttrs.version;
-    hash = "sha256-izP7Rz65Lr4LDOCzZPdDWb3TyXDSTd/8gOPSfovVGM8=";
+    hash = "sha256-PF65TgHvKeSEudEqqJVEotu2zgiWgGtRuNvbiyE0nwc=";
   };
 
   passthru.tests = {
@@ -187,6 +201,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.enableFeature withLua "lua")
     (lib.enableFeature withTools "tools")
     (lib.enableFeature withRedis "redis")
+    (lib.enableFeature withBootstrap "bootstrap")
   ]
   ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}";
 
@@ -199,6 +214,10 @@ stdenv.mkDerivation (finalAttrs: {
     touch _build/default/lib/.built
   '';
 
+  preBuild = lib.optionalString npmToolingUsed /* sh */ ''
+    npm run postinstall
+  '';
+
   env.REBAR_IGNORE_DEPS = 1;
 
   postInstall = ''
diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
index f8cb854d44d6..dde541668b75 100644
--- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix
+++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
@@ -12,53 +12,23 @@ in
 let
   self = packages // (overrides self packages);
   packages = with self; {
-    unicode_util_compat = builder {
-      name = "unicode_util_compat";
-      version = "0.7.1";
-      src = fetchHex {
-        pkg = "unicode_util_compat";
-        version = "0.7.1";
-        sha256 = "sha256-s6kXhUzjriM2GXRK0eAQLgVnMTZ3b7L6diNPPgOyNkI=";
-      };
-      beamDeps = [ ];
-    };
-    jiffy = builder {
-      name = "jiffy";
-      version = "1.1.2";
-      src = fetchHex {
-        pkg = "jiffy";
-        version = "1.1.2";
-        sha256 = "sha256-u2G8Qqcgu9M8sJpBDki7eaYQEsdMuLPnXybZiEhc84E=";
-      };
-      beamDeps = [ ];
-    };
-    base64url = builder {
-      name = "base64url";
-      version = "1.0.1";
-      src = fetchHex {
-        pkg = "base64url";
-        version = "1.0.1";
-        sha256 = "sha256-+bOt1HMaAqmwQQOYtHWzPnVmppU2Ujemve4btEdxn1w=";
-      };
-      beamDeps = [ ];
-    };
     yconf = builder {
       name = "yconf";
-      version = "1.0.22";
+      version = "1.0.23";
       src = fetchHex {
         pkg = "yconf";
-        version = "1.0.22";
-        sha256 = "sha256-rKg0V86r5wdWSEtch7p7GVX1EdSZFoaH6uqnwwDoV/E=";
+        version = "1.0.23";
+        sha256 = "sha256-JbTft1MoAmrKp3TPXG+4fUi1XuvOYw3aozYkQdrDFDc=";
       };
       beamDeps = [ fast_yaml ];
     };
     xmpp = builder {
       name = "xmpp";
-      version = "1.12.0";
+      version = "1.13.3";
       src = fetchHex {
         pkg = "xmpp";
-        version = "1.12.0";
-        sha256 = "sha256-AUuuc2WfuiVncesAe8U0hhiscn3R0QuasVqf74cWIsg=";
+        version = "1.13.3";
+        sha256 = "sha256-BWSKpNvM/uYqqnlLKSowWEY50DyR9cCGa+jDQ0tqb0g=";
       };
       beamDeps = [
         ezlib
@@ -71,11 +41,11 @@ let
     };
     stun = builder {
       name = "stun";
-      version = "1.2.21";
+      version = "1.2.22";
       src = fetchHex {
         pkg = "stun";
-        version = "1.2.21";
-        sha256 = "sha256-PX/o77nQWyQKaqmmv4uLe/8tgCiV0XBEPFiJh9weEtk=";
+        version = "1.2.22";
+        sha256 = "sha256-NAi0sR1SN6CI9TsmCgaUDDCxb0pICUiS1qkgThZDGIo=";
       };
       beamDeps = [
         fast_tls
@@ -84,11 +54,11 @@ let
     };
     stringprep = builder {
       name = "stringprep";
-      version = "1.0.33";
+      version = "1.0.34";
       src = fetchHex {
         pkg = "stringprep";
-        version = "1.0.33";
-        sha256 = "sha256-lvizC8UIh/YFsztGvKHSSMGah5MZuMSCeQ47TaXamMA=";
+        version = "1.0.34";
+        sha256 = "sha256-J+eOo3GIF2TgVvvoRdOtMEdA/14xMbwfOKZvC6qMm0c=";
       };
       beamDeps = [ p1_utils ];
     };
@@ -114,23 +84,23 @@ let
     };
     p1_utils = builder {
       name = "p1_utils";
-      version = "1.0.28";
+      version = "1.0.29";
       src = fetchHex {
         pkg = "p1_utils";
-        version = "1.0.28";
-        sha256 = "sha256-xJvUS8SkCtmWaRr4Jt1+CqVtTQzXMIFxkKH4TRp/ADM=";
+        version = "1.0.29";
+        sha256 = "sha256-IHFCHK21uP/xFOkdTZRPFIUcMyOR9uk/xQEarWSr4bk=";
       };
       beamDeps = [ ];
     };
     p1_pgsql = builder {
       name = "p1_pgsql";
-      version = "1.1.38";
+      version = "1.1.41";
       src = fetchHex {
         pkg = "p1_pgsql";
-        version = "1.1.38";
-        sha256 = "sha256-Bs9kQwCBeOujh7ou6STTYgBBuuTaGyyWloAoSgXMdZ4=";
+        version = "1.1.41";
+        sha256 = "sha256-Ju4quj1FBGTt1LP/nassalP8ILv9Mwppc5grkGUEoXI=";
       };
-      beamDeps = [ xmpp ];
+      beamDeps = [ stringprep ];
     };
     p1_oauth2 = builder {
       name = "p1_oauth2";
@@ -144,37 +114,35 @@ let
     };
     p1_mysql = builder {
       name = "p1_mysql";
-      version = "1.0.27";
+      version = "1.0.28";
       src = fetchHex {
         pkg = "p1_mysql";
-        version = "1.0.27";
-        sha256 = "sha256-BmBR8kACenZzJUfmnZagl05w3BTe2UU77yYyIYQe2ps=";
+        version = "1.0.28";
+        sha256 = "sha256-bk0A6OzlBbpQkcjas67+QVzy2Db/OVCDRMNSezZtmRk=";
       };
       beamDeps = [ ];
     };
     p1_acme = builder {
       name = "p1_acme";
-      version = "1.0.30";
+      version = "1.0.31";
       src = fetchHex {
         pkg = "p1_acme";
-        version = "1.0.30";
-        sha256 = "sha256-KTXiCRa4BtOxFmlTpNkKaQ/YB4EJYUD+XKH2XVnr1oo=";
+        version = "1.0.31";
+        sha256 = "sha256-m1kiqQq5TaWInmTeXMrTrcbmim08P7cI3VA3V7Iy2xw=";
       };
       beamDeps = [
-        base64url
         idna
-        jiffy
         jose
         yconf
       ];
     };
     mqtree = builder {
       name = "mqtree";
-      version = "1.0.19";
+      version = "1.0.20";
       src = fetchHex {
         pkg = "mqtree";
-        version = "1.0.19";
-        sha256 = "sha256-yBBlcVxJoYgoEvgKWuLYQugN0/LRMFMN81mQJIv4zjw=";
+        version = "1.0.20";
+        sha256 = "sha256-XsDge5xIp4QGSWAL+W4UC0++nlAX4d3T6JjhXAo4PtA=";
       };
       beamDeps = [ p1_utils ];
     };
@@ -200,61 +168,61 @@ let
     };
     idna = builder {
       name = "idna";
-      version = "6.1.1";
+      version = "7.1.0";
       src = fetchHex {
         pkg = "idna";
-        version = "6.1.1";
-        sha256 = "sha256-kjdut4lEEu0ZrEdeSob3tBPBufu1vRbczVeTQVeUTOo=";
+        version = "7.1.0";
+        sha256 = "sha256-aulZoCW/Nt9hqMq4UI2WVIkbVCaoTETYLer/1t34xx8=";
       };
-      beamDeps = [ unicode_util_compat ];
+      beamDeps = [ ];
     };
     fast_yaml = builder {
       name = "fast_yaml";
-      version = "1.0.39";
+      version = "1.0.40";
       src = fetchHex {
         pkg = "fast_yaml";
-        version = "1.0.39";
-        sha256 = "sha256-JMe5q54rkmnWTkX0oqEoCWatsX0x5jNlz9PuJ3+wp40=";
+        version = "1.0.40";
+        sha256 = "sha256-J3BcKZAsHG8yaLqb84fV+pKLLmVbUxEPpHuOR20ys4Y=";
       };
       beamDeps = [ p1_utils ];
     };
     fast_xml = builder {
       name = "fast_xml";
-      version = "1.1.57";
+      version = "1.1.60";
       src = fetchHex {
         pkg = "fast_xml";
-        version = "1.1.57";
-        sha256 = "sha256-7sNOkK2sr+Rn1d2rY1oBTe1zuYtAYVVLLRlyFz2SnDk=";
+        version = "1.1.60";
+        sha256 = "sha256-z54nSd1HIEcCy3oEq1BFZC+gCW/fyc/y6cptPyq9N8U=";
       };
       beamDeps = [ p1_utils ];
     };
     fast_tls = builder {
       name = "fast_tls";
-      version = "1.1.25";
+      version = "1.1.26";
       src = fetchHex {
         pkg = "fast_tls";
-        version = "1.1.25";
-        sha256 = "sha256-WeGDtXQOZw4CuKpr5nO153eeX+W/zGef4tSZPRlJqCE=";
+        version = "1.1.26";
+        sha256 = "sha256-aw1N0jCQN1Zeuqms858CgI9fghWjkQGh2jPCpbG1mz8=";
       };
       beamDeps = [ p1_utils ];
     };
     ezlib = builder {
       name = "ezlib";
-      version = "1.0.15";
+      version = "1.0.16";
       src = fetchHex {
         pkg = "ezlib";
-        version = "1.0.15";
-        sha256 = "sha256-3RS6bBJSGvXP5pI+c+PVRfSgiX3Ga/q1KH+7euOWLqs=";
+        version = "1.0.16";
+        sha256 = "sha256-tIGVQEA9Hst+rmRf3/FCqNsrR22JMojTm6u5KSIlBAU=";
       };
       beamDeps = [ p1_utils ];
     };
     esip = builder {
       name = "esip";
-      version = "1.0.59";
+      version = "1.0.60";
       src = fetchHex {
         pkg = "esip";
-        version = "1.0.59";
-        sha256 = "sha256-C98uPDSdwLFE8XMVAynmdcalGsRz16Cy42IkX6rT++Y=";
+        version = "1.0.60";
+        sha256 = "sha256-BgTL1LvI2hWSwAgwz+MGIM5PZlurEZnRSjtF+v0DFE8=";
       };
       beamDeps = [
         fast_tls
@@ -294,21 +262,21 @@ let
     };
     eimp = builder {
       name = "eimp";
-      version = "1.0.26";
+      version = "1.0.27";
       src = fetchHex {
         pkg = "eimp";
-        version = "1.0.26";
-        sha256 = "sha256-2W1OhXK538QPJx5H8MsdiEk3O8mKISIyaHgXZe1SBEw=";
+        version = "1.0.27";
+        sha256 = "sha256-PH6D4pO8+vUKG/BU/Etit7jEhKbkIY45dwmk0NhX8/w=";
       };
       beamDeps = [ p1_utils ];
     };
     cache_tab = builder {
       name = "cache_tab";
-      version = "1.0.33";
+      version = "1.0.34";
       src = fetchHex {
         pkg = "cache_tab";
-        version = "1.0.33";
-        sha256 = "sha256-QlgAnrBQsiqr4MhI4jC7pYQBpolcWML/dN+2NePDWQA=";
+        version = "1.0.34";
+        sha256 = "sha256-DbnzF/OUHBfJ+OqBJeJe+ie77Uy/JKQsQm+tp0yCtpI=";
       };
       beamDeps = [ p1_utils ];
     };
diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index 876be808c087..c8f79d529781 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "eksctl";
-  version = "0.225.0";
+  version = "0.226.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "eksctl";
     rev = finalAttrs.version;
-    hash = "sha256-aGIn6/CHC/0RGgVQJbye09V5cT2gXYhvihUv4J/1l6g=";
+    hash = "sha256-XjiM4o4xJPY+ZFtvWi5K99tQaZwNxiCla/jUeQQo+5E=";
   };
 
-  vendorHash = "sha256-6f/w++wQdedkzvwkktDvpmpkR5eCJvG2twCSKxY49ZQ=";
+  vendorHash = "sha256-HP0EdZeM2Nz6LI3EjVT7qPl47Suh45OjWptEHgqqvhg=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/el/elasticmq-server-bin/package.nix b/pkgs/by-name/el/elasticmq-server-bin/package.nix
index cffe151abb0e..a697e24816ad 100644
--- a/pkgs/by-name/el/elasticmq-server-bin/package.nix
+++ b/pkgs/by-name/el/elasticmq-server-bin/package.nix
@@ -15,11 +15,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "elasticmq-server";
-  version = "1.6.15";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-${finalAttrs.version}.jar";
-    sha256 = "sha256-alxRZFx+Ulk4KYnlIVOClajk2MmfnfUooku2dMJd7c4=";
+    sha256 = "sha256-pA39A/2OLxdBjzxhpGDB2uqQIRkUW9zpfQmoHwOqBCg=";
   };
 
   # don't do anything?
diff --git a/pkgs/by-name/el/electricsheep/package.nix b/pkgs/by-name/el/electricsheep/package.nix
index 82419173a056..82ae25f2c25e 100644
--- a/pkgs/by-name/el/electricsheep/package.nix
+++ b/pkgs/by-name/el/electricsheep/package.nix
@@ -2,9 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
   wxwidgets_3_2,
-  ffmpeg,
+  ffmpeg_7,
   lua5_1,
   curl,
   libpng,
@@ -34,6 +35,11 @@ stdenv.mkDerivation {
   patches = [
     # <https://github.com/scottdraves/electricsheep/pull/126>
     ./boost-1.85.patch
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/proj/guru.git/plain/app-misc/electricsheep/files/electricsheep-boost-system-r1.patch?id=b9f2c3c92d29ed57491a88e45dc8a99bbc73fc15";
+      hash = "sha256-wCRT0pSC9w+XXAbeCTukvPMu5mVeGdfwnkBieMmBIwA=";
+      extraPrefix = "";
+    })
   ];
 
   nativeBuildInputs = [
@@ -43,7 +49,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     wxwidgets_3_2
-    ffmpeg
+    ffmpeg_7
     lua5_1
     curl
     libpng
diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix
index af61f576933c..10d00afecf70 100644
--- a/pkgs/by-name/el/elfutils/package.nix
+++ b/pkgs/by-name/el/elfutils/package.nix
@@ -57,6 +57,11 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";
       sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";
     })
+    (fetchpatch {
+      name = "fix-aarch64_attributes.patch";
+      url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=b27adc5262e807f341ca0a4910ce04294144f79a";
+      hash = "sha256-hksO5HXL9Jv5E4o2rI4NAgQp+4z+Lg7Wn/AdW7fpr0c=";
+    })
     # https://patchwork.sourceware.org/project/elfutils/patch/20251205145241.1165646-1-arnout@bzzt.net/
     ./test-run-sysroot-reliability.patch
   ]
diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix
index 23bac93bf541..a99dcc2abdad 100644
--- a/pkgs/by-name/el/ell/package.nix
+++ b/pkgs/by-name/el/ell/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ell";
-  version = "0.82";
+  version = "0.83";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     rev = finalAttrs.version;
-    hash = "sha256-6+Aolb0Y50E5ge568je1ZdkATlCRgw8cCaW1qt0FgvE=";
+    hash = "sha256-RhT36DWIdEpe6WmA7spBt/0peBj4cpy1Qe64/SRBmPs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/em/emcee/package.nix b/pkgs/by-name/em/emcee/package.nix
index 0352f28b2099..1bc921e4fa5e 100644
--- a/pkgs/by-name/em/emcee/package.nix
+++ b/pkgs/by-name/em/emcee/package.nix
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
   version = "0.7.0";
 
   src = fetchFromGitHub {
-    owner = "loopwork-ai";
+    owner = "mattt";
     repo = "emcee";
     tag = "v${finalAttrs.version}";
     hash = "sha256-czOUhaPBxzuqZ72Y3TuzZ8r0Ab3OqGbDPZipkcak3Cw=";
@@ -41,8 +41,8 @@ buildGoModule (finalAttrs: {
       You can use emcee to connect Claude Desktop
       and other apps to external tools and data services, similar to ChatGPT plugins.
     '';
-    homepage = "https://github.com/loopwork-ai/emcee";
-    changelog = "https://github.com/loopwork-ai/emcee/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/mattt/emcee";
+    changelog = "https://github.com/mattt/emcee/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ genga898 ];
     mainProgram = "emcee";
diff --git a/pkgs/by-name/em/emhash/package.nix b/pkgs/by-name/em/emhash/package.nix
index 4d5e93928276..91fe3bc95c49 100644
--- a/pkgs/by-name/em/emhash/package.nix
+++ b/pkgs/by-name/em/emhash/package.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-dFj/QaGdTJYdcxKlS9tES6OHae8xPMnrG9ccRNM/hi8=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     cmake
   ];
diff --git a/pkgs/by-name/en/encrypted-dns-server/package.nix b/pkgs/by-name/en/encrypted-dns-server/package.nix
index eecf067344ed..ca1f51c65128 100644
--- a/pkgs/by-name/en/encrypted-dns-server/package.nix
+++ b/pkgs/by-name/en/encrypted-dns-server/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "encrypted-dns-server";
-  version = "0.9.18";
+  version = "0.9.19";
 
   src = fetchFromGitHub {
     owner = "DNSCrypt";
     repo = "encrypted-dns-server";
     tag = finalAttrs.version;
-    hash = "sha256-YM9ow1j5G6AN91/YLnRy+jOlpQPBxZa+chNZNPGUfhs=";
+    hash = "sha256-c1QamH+MiB4uDbRQx/uzh8HNyQ9npBeMUprM4V8VKLo=";
   };
 
-  cargoHash = "sha256-cHARkL8gbNBlmjbJaHJ8w268KcXTJr2PvCF+I6+K0s8=";
+  cargoHash = "sha256-io8ejF7ShSDJVadp7cPdkCfZy/mv0v4wwuvrCtkxnTE=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/en/enpass/package.nix b/pkgs/by-name/en/enpass/package.nix
index 55b21ee2a309..4628e42d3d3f 100644
--- a/pkgs/by-name/en/enpass/package.nix
+++ b/pkgs/by-name/en/enpass/package.nix
@@ -100,10 +100,7 @@ let
         "x86_64-linux"
         "i686-linux"
       ];
-      maintainers = with lib.maintainers; [
-        ewok
-        dritter
-      ];
+      maintainers = with lib.maintainers; [ ewok ];
     };
 
     nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix
index 4d2b478f4d71..1e5edb2e598f 100644
--- a/pkgs/by-name/en/envio/package.nix
+++ b/pkgs/by-name/en/envio/package.nix
@@ -1,25 +1,28 @@
 {
+  stdenv,
   lib,
   fetchFromGitHub,
   installShellFiles,
   gpgme,
+  dbus,
   libgpg-error,
   pkg-config,
   rustPlatform,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "envio";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
-    owner = "envio-cli";
+    owner = "humblepenguinn";
     repo = "envio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-je0DBoBIayFK//Aija5bnO/2z+hxNWgVkwOgxMyq5s4=";
+    hash = "sha256-uiuJ3yFuU5S0e6SrD1C4tU5Ve/VBoGmyclbokESDZAw=";
   };
 
-  cargoHash = "sha256-stb5BZ77yBUjP6p3yfdgtN6fkE7wWU6A+sPAmc8YZD0=";
+  cargoHash = "sha256-eECjTnqjy38jA5kHddPaBZaZ/1ErHB7uQPbZYNFBcSU=";
 
   nativeBuildInputs = [
     pkg-config
@@ -29,15 +32,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = [
     libgpg-error
     gpgme
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    dbus
   ];
 
   postInstall = ''
     installManPage man/*.1
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
-    homepage = "https://envio-cli.github.io/home";
-    changelog = "https://github.com/envio-cli/envio/blob/${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/humblepenguinn/envio/blob/v${finalAttrs.version}/CHANGELOG.md";
     description = "Modern and secure CLI tool for managing environment variables";
     mainProgram = "envio";
     longDescription = ''
diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix
index 248d400b58c4..9477b40bb382 100644
--- a/pkgs/by-name/en/envoy-bin/package.nix
+++ b/pkgs/by-name/en/envoy-bin/package.nix
@@ -7,7 +7,7 @@
   versionCheckHook,
 }:
 let
-  version = "1.37.1";
+  version = "1.37.2";
   inherit (stdenvNoCC.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -20,8 +20,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-ZYEeEq6PedT09kGNJ6LTL+vEzIpSM9Wuik2g4+Dz/nU=";
-      x86_64-linux = "sha256-jbkO4KoIWuaHPb8hISgW0p9sRV1HYMSuz01lk3Y9sYw=";
+      aarch64-linux = "sha256-sNf78pVUOEziPnGQCQJX/rXKE28UViazre+rstU/h4s=";
+      x86_64-linux = "sha256-MtPMIDuKvc6MLtkWopgSQ2TgxI6DtxlvVR52m2pIm/g=";
     }
     .${system} or throwSystem;
 in
@@ -67,7 +67,6 @@ stdenvNoCC.mkDerivation {
     license = lib.licenses.asl20;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = with lib.maintainers; [
-      katexochen
       charludo
     ];
     mainProgram = "envoy";
diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index f271c45e9022..3dab77796c0b 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -6,16 +6,20 @@
   makeWrapper,
   makeDesktopItem,
   copyDesktopItems,
-  electron,
+  electron_40,
   python3Packages,
   pipewire,
   libpulseaudio,
+  jq,
   autoPatchelfHook,
   bun,
   nodejs,
   withTTS ? true,
   withMiddleClickScroll ? false,
 }:
+let
+  electron = electron_40;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "equibop";
   version = "3.1.9";
@@ -40,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     bun
+    jq
     nodejs
     # XXX: Equibop *does not* ship venmic as a prebuilt node module. The package
     # seems to build with or without this hook, but I (NotAShelf) don't have the
@@ -67,15 +72,22 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # electron builds must be writable to support electron fuses
-  preBuild =
-    lib.optionalString stdenv.hostPlatform.isDarwin ''
-      cp -r ${electron.dist}/Electron.app .
-      chmod -R u+w Electron.app
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      cp -r ${electron.dist} electron-dist
-      chmod -R u+w electron-dist
-    '';
+  preBuild = ''
+    # Validate electron version matches upstream package.json
+    if [ "`jq -r '.devDependencies.electron' < package.json | cut -d. -f1 | tr -d '^'`" != "${lib.versions.major electron.version}" ]
+    then
+      echo "ERROR: electron version mismatch between package.json and nixpkgs"
+      exit 1
+    fi
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    cp -r ${electron.dist}/Electron.app .
+    chmod -R u+w Electron.app
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
+  '';
 
   buildPhase = ''
     runHook preBuild
@@ -119,10 +131,12 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     makeWrapper ${electron}/bin/electron $out/bin/equibop \
       --add-flags $out/opt/Equibop/resources/app.asar \
-      ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
+      ${lib.optionalString withTTS ''
+        --run 'if [[ "''${NIXOS_SPEECH:-default}" != "False" ]]; then NIXOS_SPEECH=True; else unset NIXOS_SPEECH; fi' \
+        --add-flags "\''${NIXOS_SPEECH:+--enable-speech-dispatcher}" \
+      ''} \
       ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]}"
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
   '';
 
   desktopItems = makeDesktopItem {
diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 1bd53a12a68c..150dcd7f059e 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -20,20 +20,20 @@ stdenv.mkDerivation (finalAttrs: {
   # the Equicord repository. Dates as tags (and automatic releases) were the compromise
   # we came to with upstream. Please do not change the version schema (e.g., to semver)
   # unless upstream changes the tag schema from dates.
-  version = "2026-04-06";
+  version = "2026-04-22";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equicord";
     tag = finalAttrs.version;
-    hash = "sha256-3wFmi+SzInP+1PH3pwBquTrU757I8z6PmvPxuyygIwU=";
+    hash = "sha256-KhGSQTnpOWSvrsoghF/kpzUVdNTZUlzpsm6UikySRHY=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-9DNn38JdFQMQh48UEJo5d6CUMbjlzs5LEma6095o508=";
+    hash = "sha256-RwppRWrEzIKZDb3QLVAMd1bHXyFwiatYNiNccVgrcWA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix
index 3d8b5ebe8e90..817dd4068163 100644
--- a/pkgs/by-name/er/erofs-utils/package.nix
+++ b/pkgs/by-name/er/erofs-utils/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   fuse,
   util-linux,
-  xxHash,
+  xxhash,
   lz4,
   xz,
   zlib,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     util-linux
-    xxHash
+    xxhash
     lz4
     zlib
     xz
diff --git a/pkgs/by-name/es/eslint/package-lock.json b/pkgs/by-name/es/eslint/package-lock.json
index 1d71732443b7..1487ee24234b 100644
--- a/pkgs/by-name/es/eslint/package-lock.json
+++ b/pkgs/by-name/es/eslint/package-lock.json
@@ -1,20 +1,20 @@
 {
   "name": "eslint",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "eslint",
-      "version": "10.2.0",
+      "version": "10.2.1",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.2",
-        "@eslint/config-array": "^0.23.4",
-        "@eslint/config-helpers": "^0.5.4",
-        "@eslint/core": "^1.2.0",
-        "@eslint/plugin-kit": "^0.7.0",
+        "@eslint/config-array": "^0.23.5",
+        "@eslint/config-helpers": "^0.5.5",
+        "@eslint/core": "^1.2.1",
+        "@eslint/plugin-kit": "^0.7.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -91,7 +91,7 @@
         "mocha": "^11.7.1",
         "node-polyfill-webpack-plugin": "^1.0.3",
         "npm-license": "^0.3.3",
-        "prettier": "3.8.1",
+        "prettier": "3.8.2",
         "progress": "^2.0.3",
         "proxyquire": "^2.0.1",
         "recast": "^0.23.0",
@@ -1866,9 +1866,9 @@
       }
     },
     "node_modules/@csstools/css-calc": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.1.1.tgz",
-      "integrity": "sha512-HJ26Z/vmsZQqs/o3a6bgKslXGFAungXGbinULZO3eMsOyNJHeBBZfup5FiZInOghgoM4Hwnmw+OgbJCNg1wwUQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.2.0.tgz",
+      "integrity": "sha512-bR9e6o2BDB12jzN/gIbjHa5wLJ4UjD1CB9pM7ehlc0ddk6EBz+yYS1EV2MF55/HUxrHcB/hehAyt5vhsA3hx7w==",
       "dev": true,
       "funding": [
         {
@@ -1890,9 +1890,9 @@
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.0.2.tgz",
-      "integrity": "sha512-0GEfbBLmTFf0dJlpsNU7zwxRIH0/BGEMuXLTCvFYxuL1tNhqzTbtnFICyJLTNK4a+RechKP75e7w42ClXSnJQw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.0.tgz",
+      "integrity": "sha512-U0KhLYmy2GVj6q4T3WaAe6NPuFYCPQoE3b0dRGxejWDgcPp8TP7S5rVdM5ZrFaqu4N67X8YaPBw14dQSYx3IyQ==",
       "dev": true,
       "funding": [
         {
@@ -1907,7 +1907,7 @@
       "license": "MIT",
       "dependencies": {
         "@csstools/color-helpers": "^6.0.2",
-        "@csstools/css-calc": "^3.1.1"
+        "@csstools/css-calc": "^3.2.0"
       },
       "engines": {
         "node": ">=20.19.0"
@@ -1941,9 +1941,9 @@
       }
     },
     "node_modules/@csstools/css-syntax-patches-for-csstree": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.2.tgz",
-      "integrity": "sha512-5GkLzz4prTIpoyeUiIu3iV6CSG3Plo7xRVOFPKI7FVEJ3mZ0A8SwK0XU3Gl7xAkiQ+mDyam+NNp875/C5y+jSA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.3.tgz",
+      "integrity": "sha512-SH60bMfrRCJF3morcdk57WklujF4Jr/EsQUzqkarfHXEFcAR1gg7fS/chAE922Sehgzc1/+Tz5H3Ypa1HiEKrg==",
       "dev": true,
       "funding": [
         {
@@ -2066,9 +2066,9 @@
       }
     },
     "node_modules/@emnapi/core": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.2.tgz",
-      "integrity": "sha512-UC+ZhH3XtczQYfOlu3lNEkdW/p4dsJ1r/bP7H8+rhao3TTTMO1ATq/4DdIi23XuGoFY+Cz0JmCbdVl0hz9jZcA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -2079,9 +2079,9 @@
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.2.tgz",
-      "integrity": "sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
+      "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -2199,12 +2199,12 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.23.4",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.4.tgz",
-      "integrity": "sha512-lf19F24LSMfF8weXvW5QEtnLqW70u7kgit5e9PSx0MsHAFclGd1T9ynvWEMDT1w5J4Qt54tomGeAhdoAku1Xow==",
+      "version": "0.23.5",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz",
+      "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^3.0.4",
+        "@eslint/object-schema": "^3.0.5",
         "debug": "^4.3.1",
         "minimatch": "^10.2.4"
       },
@@ -2213,21 +2213,21 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.4.tgz",
-      "integrity": "sha512-jJhqiY3wPMlWWO3370M86CPJ7pt8GmEwSLglMfQhjXal07RCvhmU0as4IuUEW5SJeunfItiEetHmSxCCe9lDBg==",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.5.tgz",
+      "integrity": "sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^1.2.0"
+        "@eslint/core": "^1.2.1"
       },
       "engines": {
         "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/core": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.0.tgz",
-      "integrity": "sha512-8FTGbNzTvmSlc4cZBaShkC6YvFMG0riksYWRFKXztqVdXaQbcZLXlFbSpC05s70sGEsXAw0qwhx69JiW7hQS7A==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz",
+      "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
@@ -2268,9 +2268,9 @@
       "license": "MIT"
     },
     "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2387,21 +2387,21 @@
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.4.tgz",
-      "integrity": "sha512-55lO/7+Yp0ISKRP0PsPtNTeNGapXaO085aELZmWCVc5SH3jfrqpuU6YgOdIxMS99ZHkQN1cXKE+cdIqwww9ptw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz",
+      "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==",
       "license": "Apache-2.0",
       "engines": {
         "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.0.tgz",
-      "integrity": "sha512-ejvBr8MQCbVsWNZnCwDXjUKq40MDmHalq7cJ6e9s/qzTUFIIo/afzt1Vui9T97FM/V/pN4YsFVoed5NIa96RDg==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.1.tgz",
+      "integrity": "sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^1.2.0",
+        "@eslint/core": "^1.2.1",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -2426,38 +2426,41 @@
         }
       }
     },
-    "node_modules/@gar/promise-retry": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@gar/promise-retry/-/promise-retry-1.0.3.tgz",
-      "integrity": "sha512-GmzA9ckNokPypTg10pgpeHNQe7ph+iIKKmhKu3Ob9ANkswreCx7R3cKmY781K8QK3AqVL3xVh9A42JvIAbkkSA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
     "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",
+      "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
       "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/types": "^0.15.0"
+      },
       "engines": {
         "node": ">=18.18.0"
       }
     },
     "node_modules/@humanfs/node": {
-      "version": "0.16.7",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
-      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz",
+      "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanfs/core": "^0.19.1",
+        "@humanfs/core": "^0.19.2",
+        "@humanfs/types": "^0.15.0",
         "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
         "node": ">=18.18.0"
       }
     },
+    "node_modules/@humanfs/types": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz",
+      "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -2567,9 +2570,9 @@
       }
     },
     "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.6.tgz",
+      "integrity": "sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2666,9 +2669,9 @@
       }
     },
     "node_modules/@kikobeats/time-span": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@kikobeats/time-span/-/time-span-1.0.12.tgz",
-      "integrity": "sha512-YeeiMfGaBKGoob/APJlRTZE1j8OL4cxKvjiOba49ED1IXlB+vj85q/aXMw/EZjEUMp5nBnfPmFoZEiwWLDNrYg==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/@kikobeats/time-span/-/time-span-1.0.13.tgz",
+      "integrity": "sha512-CfBK4/EZ73uN/6b5/wOfvWju1Ev/6H+uXqS2Vqd7/dEQTyOsvv4BdOHDqESp4Efa9YyrPPvN3IHU+C4z9FAo3Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2686,9 +2689,9 @@
       }
     },
     "node_modules/@metascraper/helpers": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.50.0.tgz",
-      "integrity": "sha512-w5eJO9sblf5btT0qSenQf8IlrHzifY7F7yTBB6q0RH+6gXgb9KgLno8WwWDjNeWkr+3n0D+8v0Ty5YGKGLAmyw==",
+      "version": "5.50.1",
+      "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.50.1.tgz",
+      "integrity": "sha512-F2C23cjHAL2fE5LAj+SsHGLC/8GCiI9U8m4iu92CwQScTYuDA2s9wrkDqsvSlVhnTxdAEM7JikLbyRIr+laXig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2707,7 +2710,7 @@
         "isostring": "0.0.1",
         "jsdom": "~27.4.0",
         "jsonrepair": "~3.13.2",
-        "lodash": "~4.17.23",
+        "lodash": "~4.18.0",
         "memoize-one": "~6.0.0",
         "microsoft-capitalize": "~1.0.6",
         "mime": "3",
@@ -2735,17 +2738,10 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/@metascraper/helpers/node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.2.tgz",
-      "integrity": "sha512-sNXv5oLJ7ob93xkZ1XnxisYhGYXfaG9f65/ZgYuAu3qt7b3NadcOEhLvx28hv31PgX8SZJRYrAIPQilQmFpLVw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
+      "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -2799,46 +2795,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@npmcli/agent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz",
-      "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.1",
-        "lru-cache": "^11.2.1",
-        "socks-proxy-agent": "^8.0.3"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
-    "node_modules/@npmcli/fs": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-5.0.0.tgz",
-      "integrity": "sha512-7OsC1gNORBEawOa5+j2pXN9vsicaIOH5cPXxoR6fJOmH6/EXpJB2CajXOu1fPRFun2m1lktEFX11+P89hqO/og==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
-    "node_modules/@npmcli/redact": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-4.0.0.tgz",
-      "integrity": "sha512-gOBg5YHMfZy+TfHArfVogwgfBeQnKbbGo3pSUyK/gSI0AVu+pEiDVcKlQb0D8Mg1LNRZILZ6XG8I5dJ4KuAd9Q==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
     "node_modules/@oxc-resolver/binding-android-arm-eabi": {
       "version": "11.19.1",
       "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.19.1.tgz",
@@ -2945,6 +2901,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2959,6 +2918,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2973,6 +2935,9 @@
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2987,6 +2952,9 @@
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3001,6 +2969,9 @@
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3015,6 +2986,9 @@
         "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3029,6 +3003,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3043,6 +3020,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3417,16 +3397,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.58.0.tgz",
-      "integrity": "sha512-rLoGZIf9afaRBYsPUMtvkDWykwXwUPL60HebR4JgTI8mxfFe2cQTu3AGitANp4b9B2QlVru6WzjgB2IzJKiCSA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.0.tgz",
+      "integrity": "sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.58.0",
-        "@typescript-eslint/types": "8.58.0",
-        "@typescript-eslint/typescript-estree": "8.58.0",
-        "@typescript-eslint/visitor-keys": "8.58.0",
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -3442,14 +3422,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.58.0.tgz",
-      "integrity": "sha512-8Q/wBPWLQP1j16NxoPNIKpDZFMaxl7yWIoqXWYeWO+Bbd2mjgvoF0dxP2jKZg5+x49rgKdf7Ck473M8PC3V9lg==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.0.tgz",
+      "integrity": "sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.58.0",
-        "@typescript-eslint/types": "^8.58.0",
+        "@typescript-eslint/tsconfig-utils": "^8.59.0",
+        "@typescript-eslint/types": "^8.59.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -3464,14 +3444,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.58.0.tgz",
-      "integrity": "sha512-W1Lur1oF50FxSnNdGp3Vs6P+yBRSmZiw4IIjEeYxd8UQJwhUF0gDgDD/W/Tgmh73mxgEU3qX0Bzdl/NGuSPEpQ==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.0.tgz",
+      "integrity": "sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.58.0",
-        "@typescript-eslint/visitor-keys": "8.58.0"
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3482,9 +3462,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.0.tgz",
-      "integrity": "sha512-doNSZEVJsWEu4htiVC+PR6NpM+pa+a4ClH9INRWOWCUzMst/VA9c4gXq92F8GUD1rwhNvRLkgjfYtFXegXQF7A==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.0.tgz",
+      "integrity": "sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3499,9 +3479,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.58.0.tgz",
-      "integrity": "sha512-O9CjxypDT89fbHxRfETNoAnHj/i6IpRK0CvbVN3qibxlLdo5p5hcLmUuCCrHMpxiWSwKyI8mCP7qRNYuOJ0Uww==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.0.tgz",
+      "integrity": "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3513,16 +3493,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.0.tgz",
-      "integrity": "sha512-7vv5UWbHqew/dvs+D3e1RvLv1v2eeZ9txRHPnEEBUgSNLx5ghdzjHa0sgLWYVKssH+lYmV0JaWdoubo0ncGYLA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.0.tgz",
+      "integrity": "sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.58.0",
-        "@typescript-eslint/tsconfig-utils": "8.58.0",
-        "@typescript-eslint/types": "8.58.0",
-        "@typescript-eslint/visitor-keys": "8.58.0",
+        "@typescript-eslint/project-service": "8.59.0",
+        "@typescript-eslint/tsconfig-utils": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "debug": "^4.4.3",
         "minimatch": "^10.2.2",
         "semver": "^7.7.3",
@@ -3541,16 +3521,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.58.0.tgz",
-      "integrity": "sha512-RfeSqcFeHMHlAWzt4TBjWOAtoW9lnsAGiP3GbaX9uVgTYYrMbVnGONEfUCiSss+xMHFl+eHZiipmA8WkQ7FuNA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.0.tgz",
+      "integrity": "sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.58.0",
-        "@typescript-eslint/types": "8.58.0",
-        "@typescript-eslint/typescript-estree": "8.58.0"
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3565,13 +3545,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.58.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.0.tgz",
-      "integrity": "sha512-XJ9UD9+bbDo4a4epraTwG3TsNPeiB9aShrUneAVXy8q4LuwowN+qu89/6ByLMINqvIMeI9H9hOHQtg/ijrYXzQ==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.0.tgz",
+      "integrity": "sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.58.0",
+        "@typescript-eslint/types": "8.59.0",
         "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
@@ -4315,9 +4295,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.15",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.15.tgz",
-      "integrity": "sha512-1nfKCq9wuAZFTkA2ey/3OXXx7GzFjLdkTiFVNwlJ9WqdI706CZRIhEqjuwanjMIja+84jDLa9rcyZDPDiVkASQ==",
+      "version": "2.10.21",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.21.tgz",
+      "integrity": "sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -4641,9 +4621,9 @@
       "license": "MIT"
     },
     "node_modules/builtin-modules": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-5.0.0.tgz",
-      "integrity": "sha512-bkXY9WsVpY7CvMhKSR6pZilZu9Ln5WDrKVBUXf2S443etkmEO4V58heTecXcUIsNsi4Rx8JUO4NfX1IcQl4deg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-5.1.0.tgz",
+      "integrity": "sha512-c5JxaDrzwRjq3WyJkI1AGR5xy6Gr6udlt7sQPbl09+3ckB+Zo2qqQ2KhCTBr7Q8dHB43bENGYEk4xddrFH/b7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4694,76 +4674,6 @@
         }
       }
     },
-    "node_modules/cacache": {
-      "version": "20.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-20.0.4.tgz",
-      "integrity": "sha512-M3Lab8NPYlZU2exsL3bMVvMrMqgwCnMWfdZbK28bn3pK6APT/Te/I8hjRPNu1uwORY9a1eEQoifXbKPQMfMTOA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@npmcli/fs": "^5.0.0",
-        "fs-minipass": "^3.0.0",
-        "glob": "^13.0.0",
-        "lru-cache": "^11.1.0",
-        "minipass": "^7.0.3",
-        "minipass-collect": "^2.0.1",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "p-map": "^7.0.2",
-        "ssri": "^13.0.0"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
-    "node_modules/cacache/node_modules/glob": {
-      "version": "13.0.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
-      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "minimatch": "^10.2.2",
-        "minipass": "^7.1.3",
-        "path-scurry": "^2.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/cacache/node_modules/p-map": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
-      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cacache/node_modules/path-scurry": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
-      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^11.0.0",
-        "minipass": "^7.1.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/cacheable-lookup": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
@@ -4804,15 +4714,15 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.9.tgz",
+      "integrity": "sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "get-intrinsic": "^1.3.0",
         "set-function-length": "^1.2.2"
       },
       "engines": {
@@ -4877,9 +4787,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001785",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001785.tgz",
-      "integrity": "sha512-blhOL/WNR+Km1RI/LCVAvA73xplXA7ZbjzI4YkMK9pa6T/P3F2GxjNpEkyw5repTw9IvkyrjyHpwjnhZ5FOvYQ==",
+      "version": "1.0.30001790",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz",
+      "integrity": "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==",
       "dev": true,
       "funding": [
         {
@@ -5938,9 +5848,9 @@
       }
     },
     "node_modules/data-uri-utils": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/data-uri-utils/-/data-uri-utils-1.0.12.tgz",
-      "integrity": "sha512-TvKeyxno5JjVbUhjTY3C8dfBOPpn5nN7Hs2StbsrvBEqhA/n3sc3K2cwja2Le5JXtiwxxPiIn8GrW+qzUy60yg==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/data-uri-utils/-/data-uri-utils-1.0.13.tgz",
+      "integrity": "sha512-AjIQGQHlTnjnw7w21Marztmku1lijIVA3QXvPPHTRVdMaASI1LeYB9X+HEkGCnKjn5OnHhUhucpdeC3rUpJR0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6009,9 +5919,9 @@
       }
     },
     "node_modules/debug-logfmt": {
-      "version": "1.4.10",
-      "resolved": "https://registry.npmjs.org/debug-logfmt/-/debug-logfmt-1.4.10.tgz",
-      "integrity": "sha512-+8rNw7zjXNRntMoJyp5211Y4W3nkhCCMBO7qe8Pht/9NscMklHwyTXMLUzk84YUDSksg87XRmK/LCzJdJ4eU7Q==",
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/debug-logfmt/-/debug-logfmt-1.4.11.tgz",
+      "integrity": "sha512-2zjKALi79JGKZxk9eiDMdiuoxGMOcF5FvAhX5M53nyGpoKpL7Y0AJLjuWT0xZLFwatyL6cjXBDLnbY7GL19rrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6358,9 +6268,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.331",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.331.tgz",
-      "integrity": "sha512-IbxXrsTlD3hRodkLnbxAPP4OuJYdWCeM3IOdT+CpcMoIwIoDfCmRpEtSPfwBXxVkg9xmBeY7Lz2Eo2TDn/HC3Q==",
+      "version": "1.5.343",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.343.tgz",
+      "integrity": "sha512-YHnQ3MXI08icvL9ZKnEBy05F2EQ8ob01UaMOuMbM8l+4UcAq6MPPbBTJBbsBUg3H8JeZNt+O4fjsoWth3p6IFg==",
       "dev": true,
       "license": "ISC"
     },
@@ -6425,19 +6335,6 @@
         "url": "https://github.com/fb55/encoding-sniffer?sponsor=1"
       }
     },
-    "node_modules/encoding-sniffer/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/end-of-stream": {
       "version": "1.4.5",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
@@ -7395,9 +7292,9 @@
       "license": "MIT"
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7531,9 +7428,9 @@
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
+      "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
       "dev": true,
       "funding": [
         {
@@ -7656,19 +7553,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/fs-teardown": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/fs-teardown/-/fs-teardown-0.1.3.tgz",
@@ -7827,9 +7711,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.13.7",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.7.tgz",
-      "integrity": "sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.0.tgz",
+      "integrity": "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7938,9 +7822,9 @@
       "license": "MIT"
     },
     "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7993,9 +7877,9 @@
       }
     },
     "node_modules/globby": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-16.1.1.tgz",
-      "integrity": "sha512-dW7vl+yiAJSp6aCekaVnVJxurRv7DCOLyXqEG3RYMYUg7AuJ2jCqPkZTA8ooqC2vtnkaMcV5WfFBMuEnTu1OQg==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-16.2.0.tgz",
+      "integrity": "sha512-QrJia2qDf5BB/V6HYlDTs0I0lBahyjLzpGQg3KT7FnCdTonAyPy2RtY802m2k4ALx6Dp752f82WsOczEVr3l6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8237,9 +8121,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz",
+      "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8422,21 +8306,16 @@
       }
     },
     "node_modules/iconv-lite": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
-      "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/ieee754": {
@@ -8585,16 +8464,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/ip-address": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
-      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/ip-regex": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
@@ -9009,9 +8878,9 @@
       }
     },
     "node_modules/is-uri": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/is-uri/-/is-uri-1.2.13.tgz",
-      "integrity": "sha512-6KXiOBu0Y9bvxaWzVWhDfXBdiE5jQWS5MIuRITXHdLVJ11LaOGYRYJtJqUQkjNyUbtCfZZyREdnEFlJfhzIlog==",
+      "version": "1.2.14",
+      "resolved": "https://registry.npmjs.org/is-uri/-/is-uri-1.2.14.tgz",
+      "integrity": "sha512-YhTAOlejk4o85c3bPk9ayhr6VLm3e01mp4pBhtYOEXXlkK+Eoj/Nr3x+bqTwZvUI0z0L6TVk0HZViXdxUtsWDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9284,26 +9153,26 @@
       }
     },
     "node_modules/jsdom/node_modules/entities": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
-      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-8.0.0.tgz",
+      "integrity": "sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=0.12"
+        "node": ">=20.19.0"
       },
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
     "node_modules/jsdom/node_modules/parse5": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.0.tgz",
-      "integrity": "sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.1.tgz",
+      "integrity": "sha512-z1e/HMG90obSGeidlli3hj7cbocou0/wa5HacvI3ASx34PecNjNQeaHNo5WIZpWofN9kgkqV1q5YvXe3F0FoPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "entities": "^6.0.0"
+        "entities": "^8.0.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
@@ -9395,9 +9264,9 @@
       "license": "MIT"
     },
     "node_modules/jsonfile": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
-      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
+      "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10005,9 +9874,9 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "11.2.7",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
-      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
+      "version": "11.3.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.3.5.tgz",
+      "integrity": "sha512-NxVFwLAnrd9i7KUBxC4DrUhmgjzOs+1Qm50D3oF1/oL+r1NpZ4gA7xvG0/zJ8evR7zIKn4vLf7qTNduWFtCrRw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -10040,30 +9909,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/make-fetch-happen": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.5.tgz",
-      "integrity": "sha512-uCbIa8jWWmQZt4dSnEStkVC6gdakiinAm4PiGsywIkguF0eWMdcjDz0ECYhUolFU3pFLOev9VNPCEygydXnddg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@gar/promise-retry": "^1.0.0",
-        "@npmcli/agent": "^4.0.0",
-        "@npmcli/redact": "^4.0.0",
-        "cacache": "^20.0.1",
-        "http-cache-semantics": "^4.1.1",
-        "minipass": "^7.0.2",
-        "minipass-fetch": "^5.0.0",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^1.0.0",
-        "proc-log": "^6.0.0",
-        "ssri": "^13.0.0"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
     "node_modules/markdown-it": {
       "version": "12.3.2",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
@@ -10123,13 +9968,13 @@
       }
     },
     "node_modules/markdownlint-cli2": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.22.0.tgz",
-      "integrity": "sha512-mOC9BY/XGtdX3M9n3AgERd79F0+S7w18yBBTNIQ453sI87etZfp1z4eajqSMV70CYjbxKe5ktKvT2HCpvcWx9w==",
+      "version": "0.22.1",
+      "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.22.1.tgz",
+      "integrity": "sha512-X14ZbytybDCXAViDmtN4DKLt9ZTrRn+oOrxTYlg3a65jS6QcYYbAkGPh/En2L/GDNbFYJ6lKaQSUNrrbN1bPrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "globby": "16.1.1",
+        "globby": "16.2.0",
         "js-yaml": "4.1.1",
         "jsonc-parser": "3.3.1",
         "jsonpointer": "5.0.1",
@@ -10137,7 +9982,7 @@
         "markdownlint": "0.40.0",
         "markdownlint-cli2-formatter-default": "0.0.6",
         "micromatch": "4.0.8",
-        "smol-toml": "1.6.0"
+        "smol-toml": "1.6.1"
       },
       "bin": {
         "markdownlint-cli2": "markdownlint-cli2-bin.mjs"
@@ -10210,19 +10055,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/markdownlint-cli2/node_modules/smol-toml": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.6.0.tgz",
-      "integrity": "sha512-4zemZi0HvTnYwLfrpk/CF9LOd9Lt87kAt50GnqhMpyF9U3poDAP2+iukq2bZsO/ufegbYehBkqINbsWxj4l4cw==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/cyyynthia"
-      }
-    },
     "node_modules/markdownlint-cli2/node_modules/uc.micro": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
@@ -10398,13 +10230,13 @@
       }
     },
     "node_modules/metascraper": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/metascraper/-/metascraper-5.50.0.tgz",
-      "integrity": "sha512-YuE4Bg6uB5Eh2iiSWozgHmrBonDc/qlgk49v97OI5v4WBqwgOhfnXToyixmAoU3ryDLbHouSCyq8hyPEVqnPIw==",
+      "version": "5.50.1",
+      "resolved": "https://registry.npmjs.org/metascraper/-/metascraper-5.50.1.tgz",
+      "integrity": "sha512-ldZIDB3Nh5H49Xq8cm4hv+N4MoUT6s3hvE7dB2Pvjr38BMdcuubBxPjECF17nSwWGBv9oBn4jwkND7/VI9thyQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@metascraper/helpers": "5.50.0",
+        "@metascraper/helpers": "5.50.1",
         "cheerio": "~1.1.2",
         "debug-logfmt": "~1.4.7",
         "whoops": "~5.0.7"
@@ -10414,54 +10246,54 @@
       }
     },
     "node_modules/metascraper-description": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/metascraper-description/-/metascraper-description-5.50.0.tgz",
-      "integrity": "sha512-NuR+y5QkLbszW/X5s9Nf5UKob0Qy0NrbuGkccLiQRA1NM+qSpBCq+piPPnEvWU4LEBC3v0O1gRCrngVA09bX4w==",
+      "version": "5.50.1",
+      "resolved": "https://registry.npmjs.org/metascraper-description/-/metascraper-description-5.50.1.tgz",
+      "integrity": "sha512-bDOTaDigGn7SI4NoOURPBId8RLAfQ4uCruLjiQPs+ccVo0Chnfmk1ghPKjcQifkX6D550j+jxk0eFO/QatZEDw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@metascraper/helpers": "5.50.0"
+        "@metascraper/helpers": "5.50.1"
       },
       "engines": {
         "node": ">= 22"
       }
     },
     "node_modules/metascraper-image": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/metascraper-image/-/metascraper-image-5.50.0.tgz",
-      "integrity": "sha512-22k2Pg0/RvQ3jJ7yrU8DV2qTDQQTKtsOaHPzltWHMxl5j/fBugOVfOCJJYi4jDtMNmCnLneqgzxE7+SAE9K3Iw==",
+      "version": "5.50.1",
+      "resolved": "https://registry.npmjs.org/metascraper-image/-/metascraper-image-5.50.1.tgz",
+      "integrity": "sha512-jU50Nb6KQwB3fb8LFdEfT0wd414DYyvfpEvgvQfibROf48oAHHPVWzd3gTNrywmLTMNQeKaUIXp1u45gX5rlmA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@metascraper/helpers": "5.50.0"
+        "@metascraper/helpers": "5.50.1"
       },
       "engines": {
         "node": ">= 22"
       }
     },
     "node_modules/metascraper-logo": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.50.0.tgz",
-      "integrity": "sha512-weA8eQ5N8AYYnT5i05waFQ3eVQ43LnbO+zGnKeBsthkNI7j1GP2z5WfnnWBf33iLCCjpIkIcKNKkAnPHfBiY3w==",
+      "version": "5.50.1",
+      "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.50.1.tgz",
+      "integrity": "sha512-r1M5fYcDBC3GVEUf/cWEmMPELeTktfUDLJ0FoZkrdhTcJlySLgVssmiYBpCd5azIkh2fj9bmIewb5w9TH0wojw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@metascraper/helpers": "5.50.0",
-        "lodash": "~4.17.23"
+        "@metascraper/helpers": "5.50.1",
+        "lodash": "~4.18.0"
       },
       "engines": {
         "node": ">= 22"
       }
     },
     "node_modules/metascraper-logo-favicon": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/metascraper-logo-favicon/-/metascraper-logo-favicon-5.50.0.tgz",
-      "integrity": "sha512-eNEzqUAvJlRWGGfpHhv1+zrwQxjGYaz0NZzOat/UWGY2YaIWLRJ5LKwUiugtMHMsPXLwRjNvctxd8wVX+uVABQ==",
+      "version": "5.50.1",
+      "resolved": "https://registry.npmjs.org/metascraper-logo-favicon/-/metascraper-logo-favicon-5.50.1.tgz",
+      "integrity": "sha512-xve0KB5sfII7j8W7+6KLIFe6+qLnzYJrmuoXu/lWe7j/MKxK26lNCOQHhA1/1g2gz0amyN5k7sUEWM+Tw+jIOw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@keyvhq/memoize": "~2.1.11",
-        "@metascraper/helpers": "5.50.0",
+        "@metascraper/helpers": "5.50.1",
         "lodash": "~4.17.23",
         "reachable-url": "~1.8.3"
       },
@@ -10476,21 +10308,14 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/metascraper-logo/node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/metascraper-title": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/metascraper-title/-/metascraper-title-5.50.0.tgz",
-      "integrity": "sha512-K4pTkskUGstWz/EtPrnIbTD88C2xMyfG8prd7uNU9BCUSLhleHpsu4xyJji8t8JAGwwSs3kvaxE6qAkwdqysug==",
+      "version": "5.50.1",
+      "resolved": "https://registry.npmjs.org/metascraper-title/-/metascraper-title-5.50.1.tgz",
+      "integrity": "sha512-25mie58NY79BiMLvAe7PajA/CnDLI/emWXpbJHnPwJPizZRjNEqCBpVRXKMxnJjQOgwi2NCCrASgwPOC0SXONA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@metascraper/helpers": "5.50.0"
+        "@metascraper/helpers": "5.50.1"
       },
       "engines": {
         "node": ">= 22"
@@ -10667,6 +10492,16 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/metascraper/node_modules/undici": {
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.25.0.tgz",
+      "integrity": "sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.18.1"
+      }
+    },
     "node_modules/micromark": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.2.tgz",
@@ -11231,9 +11066,9 @@
       }
     },
     "node_modules/microsoft-capitalize": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/microsoft-capitalize/-/microsoft-capitalize-1.0.7.tgz",
-      "integrity": "sha512-5CQkknFQ7Wq54JWtrv6OydAhNcGEYHlsuhYN81S1rREJskZBfAwbseA+nTvMqH7tZlEzGFz4vwrybyaxIteqqw==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/microsoft-capitalize/-/microsoft-capitalize-1.0.8.tgz",
+      "integrity": "sha512-uSzg9VkW1+ZgNcJG0AcU/Ynje5xLnLuXoJCQBWKs7DeEzmgUTF5mLVbsmj0aYppN43MWI4RGUuRANLJAIaRfLw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11366,116 +11201,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/minipass-collect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
-      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/minipass-fetch": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-5.0.2.tgz",
-      "integrity": "sha512-2d0q2a8eCi2IRg/IGubCNRJoYbA1+YPXAzQVRFmB45gdGZafyivnZ5YSEfo3JikbjGxOdntGFvBQGqaSMXlAFQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^7.0.3",
-        "minipass-sized": "^2.0.0",
-        "minizlib": "^3.0.1"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      },
-      "optionalDependencies": {
-        "iconv-lite": "^0.7.2"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.7.tgz",
-      "integrity": "sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-flush/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-flush/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-pipeline/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-pipeline/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/minipass-sized": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-2.0.0.tgz",
-      "integrity": "sha512-zSsHhto5BcUVM2m1LurnXY6M//cGhVaegT71OfOXoprxT6o780GZd792ea6FfrQkuU4usHZIUczAQMRUE2plzA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.1.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/minizlib": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
@@ -11547,9 +11272,9 @@
       "license": "MIT"
     },
     "node_modules/mocha/node_modules/brace-expansion": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11633,16 +11358,6 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "license": "MIT"
     },
-    "node_modules/negotiator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
@@ -11711,21 +11426,21 @@
       }
     },
     "node_modules/node-gyp": {
-      "version": "12.2.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.2.0.tgz",
-      "integrity": "sha512-q23WdzrQv48KozXlr0U1v9dwO/k59NHeSzn6loGcasyf0UnSrtzs8kRxM+mfwJSf0DkX0s43hcqgnSO4/VNthQ==",
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.3.0.tgz",
+      "integrity": "sha512-QNcUWM+HgJplcPzBvFBZ9VXacyGZ4+VTOb80PwWR+TlVzoHbRKULNEzpRsnaoxG3Wzr7Qh7BYxGDU3CbKib2Yg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
         "exponential-backoff": "^3.1.1",
         "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^15.0.0",
         "nopt": "^9.0.0",
         "proc-log": "^6.0.0",
         "semver": "^7.3.5",
         "tar": "^7.5.4",
         "tinyglobby": "^0.2.12",
+        "undici": "^6.25.0",
         "which": "^6.0.0"
       },
       "bin": {
@@ -11852,9 +11567,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.37",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.37.tgz",
-      "integrity": "sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==",
+      "version": "2.0.38",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz",
+      "integrity": "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==",
       "dev": true,
       "license": "MIT"
     },
@@ -11987,9 +11702,9 @@
       }
     },
     "node_modules/null-prototype-object": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/null-prototype-object/-/null-prototype-object-1.2.6.tgz",
-      "integrity": "sha512-m+HuHAqaOiqlxVAzI3GtRgS4JIk3aAZ5RbkYxxPiACXyQZzS5uxjOXMASlWNdPYZ/5d4/+YclUlI+XXNlyN7Jg==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/null-prototype-object/-/null-prototype-object-1.2.7.tgz",
+      "integrity": "sha512-pSZWCUew0zed2gxCerA4zdXRGg8ezLiWwvE8RvncezTcROXL0uz3PjSZXl5NsI04Egz0Uu46o1wyX6qr3u/ZWA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -12377,9 +12092,9 @@
       "license": "MIT"
     },
     "node_modules/parse-uri": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/parse-uri/-/parse-uri-2.0.5.tgz",
-      "integrity": "sha512-E4J7siDZ1CL5EE/0YHX9y8IVNdSB/ZqjFPIKZWtWbSi5w8Q2h1OYjHSBezG15CsA6ieZmH5srrbpv0Rtf3I8rw==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/parse-uri/-/parse-uri-2.0.6.tgz",
+      "integrity": "sha512-sB5ONhkIMyztTX2trw4OVqHhUnHS8wDFHPRN+eaHxWQ+8cFlF7nUFIDpzFksQMntTts6SEgX/VOyeAowwLqQuw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -12723,9 +12438,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
-      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.2.tgz",
+      "integrity": "sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -13073,9 +12788,9 @@
       "license": "MIT"
     },
     "node_modules/read-package-json/node_modules/brace-expansion": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13337,12 +13052,13 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.11",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
-      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+      "version": "1.22.12",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
+      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "es-errors": "^1.3.0",
         "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
@@ -13974,14 +13690,14 @@
       }
     },
     "node_modules/side-channel-list": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz",
+      "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
+        "object-inspect": "^1.13.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14117,17 +13833,6 @@
         "node": "*"
       }
     },
-    "node_modules/smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
     "node_modules/smartquotes": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/smartquotes/-/smartquotes-2.3.2.tgz",
@@ -14151,36 +13856,6 @@
         "url": "https://github.com/sponsors/cyyynthia"
       }
     },
-    "node_modules/socks": {
-      "version": "2.8.7",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
-      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ip-address": "^10.0.1",
-        "smart-buffer": "^4.2.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
-      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "^4.3.4",
-        "socks": "^2.8.3"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -14281,19 +13956,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/ssri": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-13.0.1.tgz",
-      "integrity": "sha512-QUiRf1+u9wPTL/76GTYlKttDEBWV1ga9ZXW8BG6kfdeyyM8LGPix9gROyg9V2+P0xNyF3X2Go526xKFdMZrHSQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
     "node_modules/stream-browserify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
@@ -14535,9 +14197,9 @@
       "license": "MIT"
     },
     "node_modules/tapable": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.2.tgz",
-      "integrity": "sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz",
+      "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -14793,14 +14455,14 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "version": "0.2.16",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
+      "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
+        "picomatch": "^4.0.4"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -15114,13 +14776,13 @@
       "dev": true
     },
     "node_modules/undici": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.7.tgz",
-      "integrity": "sha512-H/nlJ/h0ggGC+uRL3ovD+G0i4bqhvsDOpbDv7At5eFLlj2b41L8QliGbnl2H7SnDiYhENphh1tQFJZf+MyfLsQ==",
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.25.0.tgz",
+      "integrity": "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=20.18.1"
+        "node": ">=18.17"
       }
     },
     "node_modules/undici-types": {
@@ -15474,9 +15136,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.105.4",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.4.tgz",
-      "integrity": "sha512-jTywjboN9aHxFlToqb0K0Zs9SbBoW4zRUlGzI2tYNxVYcEi/IPpn+Xi4ye5jTLvX2YeLuic/IvxNot+Q1jMoOw==",
+      "version": "5.106.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.106.2.tgz",
+      "integrity": "sha512-wGN3qcrBQIFmQ/c0AiOAQBvrZ5lmY8vbbMv4Mxfgzqd/B6+9pXtLo73WuS1dSGXM5QYY3hZnIbvx+K1xxe6FyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15496,9 +15158,8 @@
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.2.11",
-        "json-parse-even-better-errors": "^2.3.1",
         "loader-runner": "^4.3.1",
-        "mime-types": "^2.1.27",
+        "mime-db": "^1.54.0",
         "neo-async": "^2.6.2",
         "schema-utils": "^4.3.3",
         "tapable": "^2.3.0",
@@ -15673,6 +15334,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/webpack/node_modules/mime-db": {
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/webpack/node_modules/schema-utils": {
       "version": "4.3.3",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
@@ -15707,19 +15378,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/whatwg-mimetype": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix
index 5af40686ba84..5230e636f826 100644
--- a/pkgs/by-name/es/eslint/package.nix
+++ b/pkgs/by-name/es/eslint/package.nix
@@ -6,13 +6,13 @@
 }:
 buildNpmPackage rec {
   pname = "eslint";
-  version = "10.2.0";
+  version = "10.2.1";
 
   src = fetchFromGitHub {
     owner = "eslint";
     repo = "eslint";
     tag = "v${version}";
-    hash = "sha256-JsfiBU+BiqiBAIc4DwxXYl/wtBoM9bQntiem1+vi+/s=";
+    hash = "sha256-XUVCFubLnht+OZIZRg2NzuX1/zDhqWYtQZzw8FwkTu4=";
   };
 
   # NOTE: Generating lock-file
@@ -24,7 +24,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-qpxHGNBRWN3hys5R+zJR870xIoN5VL6U3dUnKrIH0go=";
+  npmDepsHash = "sha256-SET3In91HxRdSEVAgZHETF+ahOJg/4+Jb1Jy5msVzZs=";
   npmInstallFlags = [ "--omit=dev" ];
 
   dontNpmBuild = true;
diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix
index 6744a8d4ff86..717071741339 100644
--- a/pkgs/by-name/es/esp-generate/package.nix
+++ b/pkgs/by-name/es/esp-generate/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "esp-generate";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "esp-generate";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JNSz/HRO8qxVaRZLL4qgYF3BIYVkrzyRc3wAWd+dAMo=";
+    hash = "sha256-aD+FID/YRTsJ0PY5CLpwO0NDg2izNiWEPGKVbKdFy+8=";
   };
 
-  cargoHash = "sha256-IZH6y7KXdrNO4mxkRPaWi79XQnlrxxaQNG2nahJ8TzY=";
+  cargoHash = "sha256-I3Yr81Txxp+gnBsP2OY1MWfYZo6O3Okg2YFUfhK8IJo=";
 
   meta = {
     description = "Template generation tool to create no_std applications targeting Espressif's chips";
diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix
index 871bc0a41bca..c2c904e4b147 100644
--- a/pkgs/by-name/es/espup/package.nix
+++ b/pkgs/by-name/es/espup/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "espup";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "espup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jhVUGbCxhYmWNtWoqSiuDgJBz5A/j+121E2tPmaQJx0=";
+    hash = "sha256-Qpn50VbcIibe0B1N5GU2AOFLt3NWjxEVimCrhhdY6EU=";
   };
 
-  cargoHash = "sha256-9CzKv8NBzg+e/TjX97rqqXkLZP5CsCaN+dxqh1m/IXc=";
+  cargoHash = "sha256-Apvy+jPA7xyw43Q2RSVc65TNHQMGcCz/I/qadiJkBss=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/et/eta/package.nix b/pkgs/by-name/et/eta/package.nix
index a0ba3a682422..5154b4feb65c 100644
--- a/pkgs/by-name/et/eta/package.nix
+++ b/pkgs/by-name/et/eta/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eta";
-  version = "1.0.1";
+  version = "1.0.1-unstable-2026-01-04";
 
   src = fetchFromGitHub {
     owner = "aioobe";
     repo = "eta";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-UQ8ZoxFAy5dKtXTLwPolPMd7YJeEjsK639RkGCMY6rU=";
+    rev = "7027a4012e7c697be1c9af1a9f21bfae1bd4913b";
+    hash = "sha256-18TOXDohyRGA0pmRyWgR9EPhKgZt+ZtkuTCFWbSnFlY=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/et/etebase-server/package.nix b/pkgs/by-name/et/etebase-server/package.nix
index 5c9a24226784..1308919281c0 100644
--- a/pkgs/by-name/et/etebase-server/package.nix
+++ b/pkgs/by-name/et/etebase-server/package.nix
@@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     homepage = "https://github.com/etesync/server";
     description = "Etebase (EteSync 2.0) server so you can run your own";
     mainProgram = "etebase-server";
-    changelog = "https://github.com/etesync/server/blob/${finalAttrs.version}/ChangeLog.md";
+    changelog = "https://github.com/etesync/server/blob/v${finalAttrs.version}/ChangeLog.md";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       felschr
diff --git a/pkgs/by-name/et/ethtool/package.nix b/pkgs/by-name/et/ethtool/package.nix
index cdb6ad61e124..ccaed2c7e885 100644
--- a/pkgs/by-name/et/ethtool/package.nix
+++ b/pkgs/by-name/et/ethtool/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ethtool";
-  version = "6.15";
+  version = "6.19";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/ethtool-${finalAttrs.version}.tar.xz";
-    hash = "sha256-lHfDZRFNkQEgquxTNqHRYZbIM9hIb3xtpnvt71eICt4=";
+    hash = "sha256-HCEUq24MDSqmfWmZYOsR3080HiQDE5zfKK6dqFimAl8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index 7019085acea8..b079226da18d 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -70,7 +70,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/elkowar/eww";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      coffeeispower
       w-lfchen
     ];
     mainProgram = "eww";
diff --git a/pkgs/by-name/ex/exabgp/package.nix b/pkgs/by-name/ex/exabgp/package.nix
index b76227ccf976..e89e1bfea0e4 100644
--- a/pkgs/by-name/ex/exabgp/package.nix
+++ b/pkgs/by-name/ex/exabgp/package.nix
@@ -64,7 +64,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "BGP swiss army knife of networking";
     homepage = "https://github.com/Exa-Networks/exabgp";
-    changelog = "https://github.com/Exa-Networks/exabgp/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
+    changelog = "https://github.com/Exa-Networks/exabgp/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     mainProgram = "exabgp";
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/ex/excalifont/package.nix b/pkgs/by-name/ex/excalifont/package.nix
index 2a9be4edf83b..e84c5ef98e74 100644
--- a/pkgs/by-name/ex/excalifont/package.nix
+++ b/pkgs/by-name/ex/excalifont/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "excalifont";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "excalidraw";
     repo = "excalidraw";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Nfzh5rNvHP7R418PP44FXD7xNenzmzMHu7RLAdJsE/c=";
+    hash = "sha256-XhxNXi6JwBq5vw+/6HQTp6NPX3etmCkdBdNboeBru/k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix
index d1db857f3525..b1c4c975e018 100644
--- a/pkgs/by-name/ex/exim/package.nix
+++ b/pkgs/by-name/ex/exim/package.nix
@@ -39,11 +39,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "exim";
-  version = "4.99.1";
+  version = "4.99.2";
 
   src = fetchurl {
     url = "https://ftp.exim.org/pub/exim/exim4/exim-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6ulnvUml+HmTO4xuyIwwR1ocZkYjITXzfwW1XbxONEc=";
+    hash = "sha256-JTZPGZiCcNhGllaJ3SnGYs9d4VJjmHXQ1TUqaf11Okc=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix
index 81c826cb4ac9..d8acacd3973a 100644
--- a/pkgs/by-name/ex/exo/package.nix
+++ b/pkgs/by-name/ex/exo/package.nix
@@ -18,13 +18,13 @@
   nix-update-script,
 }:
 let
-  version = "1.0.70";
+  version = "1.0.71";
   src = fetchFromGitHub {
     name = "exo";
     owner = "exo-explore";
     repo = "exo";
     tag = "v${version}";
-    hash = "sha256-ytxP5x8PyAPVne2c6OIvhdCuF68zffxypXSTlDAFnro=";
+    hash = "sha256-k3jtrJCxLx8nq1R70CtZWFyNVXEa5Ltw0MgdA0qFVXA=";
   };
 
   pyo3-bindings = python3Packages.buildPythonPackage (finalAttrs: {
diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix
index 998a94578efb..0294e7751c55 100644
--- a/pkgs/by-name/ex/exodus/package.nix
+++ b/pkgs/by-name/ex/exodus/package.nix
@@ -40,12 +40,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "exodus";
-  version = "25.28.4";
+  version = "26.1.5";
 
   src = requireFile {
     name = "exodus-linux-x64-${finalAttrs.version}.zip";
     url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip";
-    hash = "sha256-AGeFsMHSywC32iaIGI9/VY2YC3gR5bHu33rOWJlyFFM=";
+    hash = "sha256-BClWuL4dTc1lESyEXuDtpGp1K/AxICbpQIaWYLrme1M=";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix
index 80f5f017a36a..a8c982f87805 100644
--- a/pkgs/by-name/ex/expat/package.nix
+++ b/pkgs/by-name/ex/expat/package.nix
@@ -18,7 +18,7 @@
 # files.
 
 let
-  version = "2.7.4";
+  version = "2.7.5";
   tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     url =
       with finalAttrs;
       "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
-    hash = "sha256-npyrtFfB4J3pHbJwbYNlZFeSY46zvh+U27IUkwEIasA=";
+    hash = "sha256-EDLf70/xf3BGSCfaooNpsg9lhNEIvDbxerFnbh7dL5E=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index 26f51f32f3a9..5d87e1feba31 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "exploitdb";
-  version = "2026-04-11";
+  version = "2026-04-30";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     tag = finalAttrs.version;
-    hash = "sha256-Gxi+gb9PbjF2QYDYClSBqru8pebf8ay0AvJnCEYbaSc=";
+    hash = "sha256-ApOecbOVoriicvhtQ87n+8jnwbKlQqbZsmBwsI0A9B0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index 21804902d488..14c19781b51d 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "fabric-ai";
-  version = "1.4.448";
+  version = "1.4.451";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4soF/1a5w9Wm8sGUZlDO4Y0JaKV9ro4F8mXxV8HtG3A=";
+    hash = "sha256-5eKARPLPD24MQLMlSIa76R7YoR1axCmn5vL9V7Zly5o=";
   };
 
-  vendorHash = "sha256-MxQfHrF9iwoQEa0p24FnmdfHyiCOYpMRv3EukV3Onzo=";
+  vendorHash = "sha256-oSHrn2Oad6XuIFjrqeC4NGC/rasCu+49xADY15YNSbc=";
 
   # Fabric introduced plugin tests that fail in the nix build sandbox.
   doCheck = false;
diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix
index 050187ea3622..f170132fc08a 100644
--- a/pkgs/by-name/fa/factoriolab/package.nix
+++ b/pkgs/by-name/fa/factoriolab/package.nix
@@ -10,13 +10,13 @@
 }:
 buildNpmPackage rec {
   pname = "factoriolab";
-  version = "3.18.2";
+  version = "3.19.2";
 
   src = fetchFromGitHub {
     owner = "factoriolab";
     repo = "factoriolab";
     tag = "v${version}";
-    hash = "sha256-M7u9pqr7OGHgNMly1am11R6EcV6LKyPw2JzIAbzt6Wo=";
+    hash = "sha256-DjNsn3PVGf+36m+k2j9NMQTqhPj8HF6V8wqaQKUB4Ho=";
     fetchLFS = true;
   };
   buildInputs = [ vips ];
diff --git a/pkgs/by-name/fa/fairywren/package.nix b/pkgs/by-name/fa/fairywren/package.nix
index 281b44cf8b19..bfd0043cffd6 100644
--- a/pkgs/by-name/fa/fairywren/package.nix
+++ b/pkgs/by-name/fa/fairywren/package.nix
@@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2026-04-17";
+    version = "0-unstable-2026-04-27";
 
     src = fetchFromGitLab {
       owner = "aiyahm";
       repo = "FairyWren-Icons";
-      rev = "c55f846436b13fcc0c5ee745eead9bf8e3bcb0bf";
-      hash = "sha256-ESh/3PNprmD0ecSoH9JVw1r0VsWoQDw4ujpmSaoyhoM=";
+      rev = "480e57a9ee90f8de05189f92dc5651fced9bc913";
+      hash = "sha256-1iz7Sv4XjoFcpo7XqB5iRHmki0hPE0kqqkH+ATVTPpY=";
     };
 
     propagatedBuildInputs = [
diff --git a/pkgs/by-name/fa/famly-fetch/package.nix b/pkgs/by-name/fa/famly-fetch/package.nix
index c1b05c804076..b9115720c77e 100644
--- a/pkgs/by-name/fa/famly-fetch/package.nix
+++ b/pkgs/by-name/fa/famly-fetch/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "famly-fetch";
-  version = "0.4.0";
+  version = "0.5.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jacobbunk";
     repo = "famly-fetch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uyLGBNV+GiYNqy4wWxPNx/xQL0lnMsIHfPIlaIu85HA=";
+    hash = "sha256-KsdypUXHU9drghAcDcur8FUUJvm8nIzq00QFdMqPnpc=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix
index 8b9618b5a498..c504c5e888c0 100644
--- a/pkgs/by-name/fa/fasmg/package.nix
+++ b/pkgs/by-name/fa/fasmg/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fasmg";
-  version = "l4gs";
+  version = "l5p0";
 
   src = fetchzip {
     url = "https://flatassembler.net/fasmg.${finalAttrs.version}.zip";
-    sha256 = "sha256-lx46RKXVu6z3+luIizSfGf697wJvS+ccwZaOgGwGXr4=";
+    sha256 = "sha256-8nX45tHvKq6FPVhWQGNgrpkZgWuNbfsxL9YJxKa7P3I=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/fa/fastdds/package.nix b/pkgs/by-name/fa/fastdds/package.nix
index 94d46e30e87d..e7dd650186de 100644
--- a/pkgs/by-name/fa/fastdds/package.nix
+++ b/pkgs/by-name/fa/fastdds/package.nix
@@ -15,14 +15,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastdds";
-  version = "3.4.2";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "eProsima";
     repo = "Fast-DDS";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-NTdkGRbE4yVMMZ/PqLC2nZYD0uIcmo1tr+ieOBSijCM=";
+    hash = "sha256-r9ub7/ULkwVFM6Brz+rV+4yGxaGQAmpMW4xf6+jSAIQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 26885828d62f..f7c7e3245d37 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -61,13 +61,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastfetch";
-  version = "2.61.0";
+  version = "2.62.1";
 
   src = fetchFromGitHub {
     owner = "fastfetch-cli";
     repo = "fastfetch";
     tag = finalAttrs.version;
-    hash = "sha256-gy4xxY3w3OzzqLrXvpy5ruwticUKRhx/B9OU/bpukvs=";
+    hash = "sha256-lI3p0LPDg5EXQ60NIYkpv0sNeckUdZjJSsmc2XP1l0E=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/fa/faudio/package.nix b/pkgs/by-name/fa/faudio/package.nix
index 58e304a7bfa1..946d585ca59a 100644
--- a/pkgs/by-name/fa/faudio/package.nix
+++ b/pkgs/by-name/fa/faudio/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "faudio";
-  version = "26.04";
+  version = "26.05";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FAudio";
     tag = finalAttrs.version;
-    hash = "sha256-Vbz/7C8yHgNJBnh8Tk5HsEcbpiQwqL0dj0T0afEZXRw=";
+    hash = "sha256-VrY6NbmnUk6fUEa3+NukcuPRaH+RbFrT9bnN4Rnuxuk=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix
index ad1870ec19ac..dc0a5d4aa157 100644
--- a/pkgs/by-name/fb/fbthrift/package.nix
+++ b/pkgs/by-name/fb/fbthrift/package.nix
@@ -16,7 +16,7 @@
   wangle,
   zlib,
   zstd,
-  xxHash,
+  xxhash,
 
   mvfst,
 
@@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [
     mvfst
-    xxHash
+    xxhash
   ];
 
   cmakeFlags = [
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/by-name/fc/fcitx5-anthy/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
rename to pkgs/by-name/fc/fcitx5-anthy/package.nix
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/by-name/fc/fcitx5-bamboo/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
rename to pkgs/by-name/fc/fcitx5-bamboo/package.nix
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/by-name/fc/fcitx5-chewing/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
rename to pkgs/by-name/fc/fcitx5-chewing/package.nix
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/by-name/fc/fcitx5-gtk/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
rename to pkgs/by-name/fc/fcitx5-gtk/package.nix
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/by-name/fc/fcitx5-hangul/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
rename to pkgs/by-name/fc/fcitx5-hangul/package.nix
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/by-name/fc/fcitx5-m17n/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
rename to pkgs/by-name/fc/fcitx5-m17n/package.nix
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/by-name/fc/fcitx5-rime/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
rename to pkgs/by-name/fc/fcitx5-rime/package.nix
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/by-name/fc/fcitx5-table-extra/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
rename to pkgs/by-name/fc/fcitx5-table-extra/package.nix
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/by-name/fc/fcitx5-table-other/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix
rename to pkgs/by-name/fc/fcitx5-table-other/package.nix
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/by-name/fc/fcitx5/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/default.nix
rename to pkgs/by-name/fc/fcitx5/package.nix
diff --git a/pkgs/tools/inputmethods/fcitx5/update.py b/pkgs/by-name/fc/fcitx5/update.py
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx5/update.py
rename to pkgs/by-name/fc/fcitx5/update.py
diff --git a/pkgs/by-name/fe/feishu-cli/package.nix b/pkgs/by-name/fe/feishu-cli/package.nix
index ef26179f3473..e6f66c86adc1 100644
--- a/pkgs/by-name/fe/feishu-cli/package.nix
+++ b/pkgs/by-name/fe/feishu-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "feishu-cli";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "riba2534";
     repo = "feishu-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4+YEU0gRL3WF19a949QweVIdtXt8BWMummjK9ypBHXQ=";
+    hash = "sha256-n7CqaVpuzJg5oPI7RixvDp8xSA93292yY9K8jmzd+68=";
   };
 
   vendorHash = "sha256-MZv772U+3+Fcanaiuhz+OCqfIsYyCG7B4iZOnEftbi8=";
diff --git a/pkgs/by-name/fe/fence/package.nix b/pkgs/by-name/fe/fence/package.nix
index 3ce2c5b7cbd7..9b1166db7305 100644
--- a/pkgs/by-name/fe/fence/package.nix
+++ b/pkgs/by-name/fe/fence/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "fence";
-  version = "0.1.46";
+  version = "0.1.49";
 
   src = fetchFromGitHub {
     owner = "Use-Tusk";
     repo = "fence";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IoWnA7gUfp6wyVBkqtH0How6DqHnaO78GlxknA5Y8+w=";
+    hash = "sha256-G3zrm6XzQPZgHky/O32cXmzQX8tLbwqgSm5xQ3xn33A=";
   };
 
-  vendorHash = "sha256-P30NCXYX27R7F/dNhWSwiLg8T2f6J0/hlu6G3wlENFI=";
+  vendorHash = "sha256-JIkEe+wscowc1IT8gtm5C4ZnChsOhy5wTy7R//DLFTU=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix
index 104ebe0d78d9..1cd21ccad6bb 100644
--- a/pkgs/by-name/fe/fermyon-spin/package.nix
+++ b/pkgs/by-name/fe/fermyon-spin/package.nix
@@ -20,17 +20,17 @@ let
     .${system} or (throw "Unsupported system: ${system}");
 
   packageHashes = {
-    x86_64-linux = "sha256-xlBByHwsyV/ygbQZf1k4cWCI7jqcuufseVpNc4lERaM=";
-    aarch64-linux = "sha256-7/UEYdPsedLEqa/kCR23lz4tmhkhYVwFkXutRAtF8eo=";
-    x86_64-darwin = "sha256-IeA5VWobAZtBsmE15U57PmwWRGhW0l+abytRA9AEERk=";
-    aarch64-darwin = "sha256-HwO3G6MnQP8yG4rzQKt1GkxCfuSSOtC1zOrSNWQzxx4=";
+    x86_64-linux = "sha256-L0Jwo4jY/HhRJGVtKWJ5qdZY+7y59bZClry86f87Snw=";
+    aarch64-linux = "sha256-wCUt6cDAohU8kG3uII/u9gP3K6uVssGnAS1QP0B/kgE=";
+    x86_64-darwin = "sha256-G7G9hzhtL1ILQTS96qEoZU//yVozvyFjnGT8Vot4pbk=";
+    aarch64-darwin = "sha256-xwXeiyWMrN7iXk2e4m7PQmcgtLcUgHt67xShBGmn3Mk=";
   };
 
   packageHash = packageHashes.${system} or (throw "Unsupported system: ${system}");
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fermyon-spin";
-  version = "3.6.2";
+  version = "3.6.3";
 
   # Use fetchurl rather than fetchzip as these tarballs are built by the project
   # and not by GitHub (and thus are stable) - this simplifies the update script
diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index fa6101025508..c97171567097 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   python3,
   nix-update-script,
-  xxHash,
+  xxhash,
   fmt,
   libxml2,
   openssl,
@@ -192,7 +192,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional withQt qt6.wrapQtAppsHook;
 
   buildInputs = [
-    xxHash
+    xxhash
     fmt
     libxml2
     openssl
diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix
index fc4a1e38ebfa..b02f7ce3bd72 100644
--- a/pkgs/by-name/ff/ffizer/package.nix
+++ b/pkgs/by-name/ff/ffizer/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ffizer";
-  version = "2.13.9";
+  version = "2.13.10";
 
   buildFeatures = [ "cli" ];
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "ffizer";
     repo = "ffizer";
     rev = finalAttrs.version;
-    hash = "sha256-7nTtyCtppUZ3vEtiDfDMCvDztZRVDFH43bl5fgZtfFM=";
+    hash = "sha256-BaTqkfNiRLHgg3In/5zh4u5ThD+wfW7R3tjy/qsPVag=";
   };
 
-  cargoHash = "sha256-/BdODBhF+ikre/U1TzB+/DqSs7LYn7NhPKgMJT80TUM=";
+  cargoHash = "sha256-QbT6QxYP6ykDKtEWfFva16ms7b2wNOS+TrvPJV9ys2A=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/fg/fg-virgil/package.nix b/pkgs/by-name/fg/fg-virgil/package.nix
index 3131400d838c..eed73dcd1a1d 100644
--- a/pkgs/by-name/fg/fg-virgil/package.nix
+++ b/pkgs/by-name/fg/fg-virgil/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "fg-virgil";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "excalidraw";
     repo = "excalidraw";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Nfzh5rNvHP7R418PP44FXD7xNenzmzMHu7RLAdJsE/c=";
+    hash = "sha256-XhxNXi6JwBq5vw+/6HQTp6NPX3etmCkdBdNboeBru/k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix
index 8483bcf437fb..87cd65c52d07 100644
--- a/pkgs/by-name/fh/fh/package.nix
+++ b/pkgs/by-name/fh/fh/package.nix
@@ -37,10 +37,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd fh \
-      --bash <($out/bin/fh completion bash) \
-      --fish <($out/bin/fh completion fish) \
-      --zsh <($out/bin/fh completion zsh)
+    for shell in bash fish zsh; do
+      installShellCompletion --cmd fh --"$shell" <("$out/bin/fh" completion "$shell")
+    done
   '';
 
   __darwinAllowLocalNetworking = true;
@@ -48,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Official FlakeHub CLI";
     homepage = "https://github.com/DeterminateSystems/fh";
-    changelog = "https://github.com/DeterminateSystems/fh/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/DeterminateSystems/fh/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ iamanaws ];
     mainProgram = "fh";
diff --git a/pkgs/by-name/fi/field-monitor/package.nix b/pkgs/by-name/fi/field-monitor/package.nix
index 7cdfcf1421dd..8c9e1cb9330d 100644
--- a/pkgs/by-name/fi/field-monitor/package.nix
+++ b/pkgs/by-name/fi/field-monitor/package.nix
@@ -21,9 +21,11 @@
   xdg-desktop-portal,
   blueprint-compiler,
   libxml2,
+  nix-update-script,
   spice-protocol,
   spice-gtk,
   vte-gtk4,
+  gcr_4,
   gtk-vnc,
   usbredir,
   libepoxy,
@@ -32,7 +34,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "field-monitor";
-  version = "49.1";
+  version = "50.0";
 
   strictDeps = true;
 
@@ -40,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "theCapypara";
     repo = "field-monitor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vtRubZwIQRV3ySFwdPgZ1Eyxh32FPsAvissxjrV3JcE=";
+    hash = "sha256-IVHzMUjjVZHDTI6Jjq7i8wrENPerKzEiDT15otPFx9A=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-zBCt/ptxAQ3TAzklmjbajQZ4Ou1+xlvH/k74yW34t9g=";
+    hash = "sha256-c4ANjQ1OoDMMifAUpU8iNE9lSBamAR+XbEmYrYphixU=";
   };
 
   mesonBuildType = "release";
@@ -66,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    gcr_4
     glib
     gsettings-desktop-schemas
     gtk-vnc
@@ -87,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
     gst-plugins-good
   ]);
 
+  passthru.updateScript = nix-update-script { };
+
   postInstall = ''
     wrapProgram $out/bin/de.capypara.FieldMonitor --prefix PATH ':' "$out/libexec"
   '';
diff --git a/pkgs/by-name/fi/figtree/package.nix b/pkgs/by-name/fi/figtree/package.nix
index 6aeb56581ad0..f7e77e6d58ae 100644
--- a/pkgs/by-name/fi/figtree/package.nix
+++ b/pkgs/by-name/fi/figtree/package.nix
@@ -18,13 +18,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   sourceRoot = "source/fonts";
 
+  outputs = [
+    "out"
+    "webfont"
+  ];
+
   nativeBuildInputs = [ installFonts ];
 
   meta = {
     homepage = "https://github.com/erikdkennedy/figtree";
     description = "Simple and friendly geometric sans serif font";
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ mrcjkb ];
+    maintainers = with lib.maintainers; [
+      mrcjkb
+      ners
+    ];
     license = lib.licenses.ofl;
   };
 })
diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
index 3d36d5e8a399..fa9b393ff18d 100644
--- a/pkgs/by-name/fi/filebeat8/package.nix
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Tails and ships log files";
     homepage = "https://github.com/elastic/beats";
-    changelog = "https://www.elastic.co/guide/en/beats/libbeat/${finalAttrs.version}/release-notes-${finalAttrs.version}.html";
+    changelog = "https://www.elastic.co/guide/en/beats/libbeat/${lib.versions.majorMinor finalAttrs.version}/release-notes-${finalAttrs.version}.html";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ srhb ];
     mainProgram = "filebeat";
diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index 06263c18c7c8..da380b148071 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "files-cli";
-  version = "2.15.264";
+  version = "2.15.282";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-yfcGyGdCeRkMQS21B7vZPVRVvphhKVqUSN1Sw7CnhwM=";
+    hash = "sha256-2N4vftX3AZwxbebEGhc6LKkQXovv/y4JNKLNy3CpaU8=";
   };
 
-  vendorHash = "sha256-p6awrajP5n+QJLwMDMGd8U1yPwS9EP0dAhkQJF+ppzI=";
+  vendorHash = "sha256-kP8YuqtrqmE3m4ACLIsSzXNj0AtmYdLoK9w1KmjExJA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/fi/finit/package.nix b/pkgs/by-name/fi/finit/package.nix
index 8d6672388dc5..b9edd713a410 100644
--- a/pkgs/by-name/fi/finit/package.nix
+++ b/pkgs/by-name/fi/finit/package.nix
@@ -7,17 +7,21 @@
   libcap,
   libite,
   libuev,
+  shadow,
+  sysctl,
+  plymouth,
+  plymouthSupport ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "finit";
-  version = "4.16";
+  version = "4.17";
 
   src = fetchFromGitHub {
     owner = "finit-project";
     repo = "finit";
     tag = finalAttrs.version;
-    hash = "sha256-DtocGgFvt7RLqwjHczwUbsszBD5MQI5fEuq9EB2tFp4=";
+    hash = "sha256-sH4xZNMEuIS+r6rVQAKnsHtSyTe2B6gdYcmH9J8eSZ0=";
   };
 
   postPatch = ''
@@ -57,12 +61,21 @@ stdenv.mkDerivation (finalAttrs: {
 
     # monitor kernel events, like ac power status
     "--with-keventd"
+  ]
+  ++ lib.optionals plymouthSupport [
+    "--enable-plymouth-plugin=yes"
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-D_PATH_LOGIN=\"/run/current-system/sw/bin/login\""
-    "-DSYSCTL_PATH=\"/run/current-system/sw/bin/sysctl\""
-  ];
+  env.NIX_CFLAGS_COMPILE = toString (
+    [
+      "-D_PATH_LOGIN=\"${shadow}/bin/login\""
+      "-DSYSCTL_PATH=\"${sysctl}/bin/sysctl\""
+    ]
+    ++ lib.optionals plymouthSupport [
+      "-DPLYMOUTH_PATH=\"${plymouth}/bin/plymouth\""
+      "-DPLYMOUTHD_PATH=\"${plymouth}/bin/plymouthd\""
+    ]
+  );
 
   meta = {
     description = "Fast init for Linux";
diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 819485de8af4..9e46c16b7b2c 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -11,17 +11,17 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "15.14.0";
+  version = "15.16.0";
   nodejs = nodejs_22;
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-0jkeO8S47kxxnBLwaaeoc5QJobZpZjTR85kgkCZyIiQ=";
+    hash = "sha256-cYyQ7s4y+sButeuMTW1GnLqWMYwQ7Hf+yNyjeCHWK+k=";
   };
 
-  npmDepsHash = "sha256-T2tB+kOYYdt048Y6ONrRDWUd4OLJGdOd59LdNIhVLMQ=";
+  npmDepsHash = "sha256-oB3AgKYGgJOvJu68boGVpJjAEy1Npkgb/ZLatAcc5j8=";
 
   # No more package-lock.json in upstream src
   postPatch = ''
diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index fca5856cd4a5..d9afbec8e06e 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "2.2.3";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2/zfxBggXK9mJDpuofQyMZ+WWV0OHyUWTUU+4CRNOUQ=";
+    hash = "sha256-JLN13SCpMXByu3rWSclcsLBGCLFMzHGHOM+bWLJ2MPw=";
   };
 
   buildInputs = [ php ];
@@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-0p0xPBX4nKFYlpIvGVZU7ay+btjpxBO2s73wzysSzUU=";
+  vendorHash = "sha256-QobjMMPEhLvsTwlJJvf4nUi1PcZEDOaU8EzexluOI90=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-baPsbZwGu1tx6bMH2tWcZVlkZuIpSflwj9JyX9vQW/U=";
+    hash = "sha256-NkxCvC0EPMLi7GV5GG1+5niL3KIaqBsleo11/gzaX/s=";
   };
 
   composerRepository = php.mkComposerRepository {
diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index 3a9dae6eccfc..5efcb8d024b8 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii";
-  version = "6.5.9";
+  version = "6.6.1";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8Orha6/cLjE9J01m77LwpvXlYrOmb/28TzxQ/RJdvDQ=";
+    hash = "sha256-JnErWcq7aVkeZAIaINSEqmi/Fi/9wrPqFZ583EG8qyg=";
   };
 
   buildInputs = [ php ];
@@ -40,13 +40,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname src version;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-9TTlMVlW7aXckIgpB5M0IxcLDtHqMboQgP00pmfK1zg=";
+    vendorHash = "sha256-iYW5GrUaHwoJzv4WN1r5YPEMUOH15A4BmOSlKIqCcdg=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-UyViUi/bIXK2aIzRgYe3oTyIMBRHpKYHIIEb6Qq1Jkk=";
+    hash = "sha256-6zha6lTkdrcMc9EAhFvSg1LRAw0HJlUITPqguCVrx+8=";
   };
 
   preInstall = ''
diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 69127aa37d78..9ecccf3a9402 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -105,11 +105,10 @@ let
 
     test -n "$NIX_PROFILES"
     and begin
-      # We ensure that __extra_* variables are read in $__fish_datadir/config.fish
-      # with a preference for user-configured data by making sure the package-specific
-      # data comes last. Files are loaded/sourced in encounter order, duplicate
-      # basenames get skipped, so we assure this by prepending Nix profile paths
-      # (ordered in reverse of the $NIX_PROFILE variable)
+      # We ensure that __extra_* variables are read in embedded:config.fish with a preference for
+      # user-configured data by making sure the package-specific data comes last. Files are
+      # loaded/sourced in encounter order, duplicate basenames get skipped, so we assure this by
+      # prepending Nix profile paths (ordered in reverse of the $NIX_PROFILE variable)
       #
       # Note that at this point in evaluation, there is nothing whatsoever on the
       # fish_function_path. That means we don't have most fish builtins, e.g., `eval`.
@@ -135,12 +134,12 @@ let
   # `begin; begin; …; end; end` but that's ok.
   sourceWithFenv = path: ''
     begin # fenv
-      # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
-      # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
-      set fish_function_path ${fishPlugins.foreign-env}/share/fish/vendor_functions.d $__fish_datadir/functions
+      # This happens before embedded:config.fish sets fish_function_path, so it is currently unset.
+      # We set it and then completely erase it, leaving its configuration to embedded:config.fish
+      set fish_function_path ${fishPlugins.foreign-env}/share/fish/vendor_functions.d
       fenv source ${lib.escapeShellArg path}
       set -l fenv_status $status
-      # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
+      # clear fish_function_path so that it will be correctly set when we return to embedded:config.fish
       set -e fish_function_path
       test $fenv_status -eq 0
     end # fenv
diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix
index e53c55038ca3..9961bfa6934c 100644
--- a/pkgs/by-name/fl/flake-edit/package.nix
+++ b/pkgs/by-name/fl/flake-edit/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "flake-edit";
-  version = "0.3.4";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "a-kenji";
     repo = "flake-edit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nQ4CW4oY5a1ukX/FNqFyCXwat0baFYSj75iHT5Fcx3s=";
+    hash = "sha256-4wy+J+xIOSmavPgxYO+Wji9gyRomOwk0ibwQOQqJBSM=";
   };
 
-  cargoHash = "sha256-teey4OjNyiDE2ZBZnBkU84gnWTykjlktMZzJ2ll2A+w=";
+  cargoHash = "sha256-5CBSvE1darONbZMg4PsEqyhaVBUS84xcG+BafJzeaS0=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix
index ff74d7c87bc1..bbe9e8b108b6 100644
--- a/pkgs/by-name/fl/flare-signal/package.nix
+++ b/pkgs/by-name/fl/flare-signal/package.nix
@@ -24,18 +24,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare";
-  version = "0.20.2";
+  version = "0.20.4";
 
   src = fetchFromGitLab {
     owner = "schmiddi-on-mobile";
     repo = "flare";
     tag = finalAttrs.version;
-    hash = "sha256-LjUd+tq4nBJtBXeOH1SyjKS37R8f5rVvDk+jTR/Mdvs=";
+    hash = "sha256-Py5NKH8kBIBMfq3tz59fz5MZdPE6DC6NS2m5HlhSf5M=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-dXPCyHc6+iS4YMIVy0vOkPG57GEW1ce5sSgyw6k0M3U=";
+    hash = "sha256-DD6bqw0RUClkjClS2QjYOt3PMKy3d9uRZVBf7bVR4hg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/by-name/fl/fldigi/package.nix
similarity index 86%
rename from pkgs/applications/radio/fldigi/default.nix
rename to pkgs/by-name/fl/fldigi/package.nix
index 99a47f15b7f2..ce45fc6315ab 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/by-name/fl/fldigi/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  hamlib,
+  hamlib_4,
   fltk_1_3,
   libjpeg,
   libpng,
@@ -17,12 +17,12 @@
   udev,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fldigi";
   version = "4.2.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
     hash = "sha256-dis3D/6crnc6KgO1EtC3JC5+kEB8EdWrvS0xrmUBZk8=";
   };
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libxinerama
     gettext
-    hamlib
+    hamlib_4
     fltk_1_3
     libjpeg
     libpng
@@ -66,4 +66,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix
index 0920e715eb15..ff4a74a5f8cd 100644
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "flexget";
-  version = "3.19.12";
+  version = "3.19.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Flexget";
     repo = "Flexget";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BSXIC85iRVtSx1TB8yB2EassXfnlEqDpTX17+c1VauQ=";
+    hash = "sha256-mwg1Ty6saEc/41Rm9mw2f9TiyoJaUlPZfDBu6kklcz8=";
   };
 
   pythonRelaxDeps = true;
diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix
index 330d72f5f3f0..5842bd71ce81 100644
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@@ -30,8 +30,8 @@ buildNpmPackage rec {
       src
       ;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-CT0e/IaAhFqRG+FdlA6ZIXOcmy1IzDdd677XV81SgHY=";
+    fetcherVersion = 3;
+    hash = "sha256-OqaRlqL08W8V35TYBk2mvgPDl58rLQV/avnSQGBvdNY=";
   };
 
   passthru = {
diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix b/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
index 35b874442f70..239e5cbbc80b 100644
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    changelog = "https://blog.floorp.app/en/release/${finalAttrs.version}.html";
+    changelog = "https://blog.floorp.app/en/release/${finalAttrs.version}/";
     description = "Fork of Firefox that seeks balance between versatility, privacy and web openness";
     homepage = "https://floorp.app/";
     # https://github.com/Floorp-Projects/Floorp#-floorp-license-notices-
diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
index 1ea222b79fd7..15cfe38a6392 100644
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
@@ -1,21 +1,21 @@
 {
-  "version": "12.12.1",
+  "version": "12.12.2",
   "sources": {
     "aarch64-linux": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-linux-aarch64.tar.xz",
-      "sha256": "07679b57ccb91b00c5de863e7170f89c9f929190b1b10f6a9c449c3d634fed22"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.2/floorp-linux-aarch64.tar.xz",
+      "sha256": "c9dfdb6abaafb700d3ea8291ecb4b03913db7ee1753c4ae77f595c8653416dc4"
     },
     "x86_64-linux": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-linux-x86_64.tar.xz",
-      "sha256": "7f50d5d805e3acd401b933aa039d01712237d975c5d8306d46006ae2363d3080"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.2/floorp-linux-x86_64.tar.xz",
+      "sha256": "c2157e29b3b9e41fb125ed0c607fb79da3f07b9dfcb37671b7bdf0bf6d818058"
     },
     "aarch64-darwin": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-macOS-universal.dmg",
-      "sha256": "5a62aedda78804344ddde080747c9853023f13472db501f6de8b9078734f62dd"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.2/floorp-macOS-universal.dmg",
+      "sha256": "9e41880693c58cbbf694684e4c24d6db69581de9caa06b374e9d7bee65997205"
     },
     "x86_64-darwin": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.1/floorp-macOS-universal.dmg",
-      "sha256": "5a62aedda78804344ddde080747c9853023f13472db501f6de8b9078734f62dd"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.12.2/floorp-macOS-universal.dmg",
+      "sha256": "9e41880693c58cbbf694684e4c24d6db69581de9caa06b374e9d7bee65997205"
     }
   }
 }
diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix
index d6703986e4d4..eb97e067159e 100644
--- a/pkgs/by-name/fl/flow/package.nix
+++ b/pkgs/by-name/fl/flow/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "flow";
-  version = "0.309.0";
+  version = "0.311.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ml1bi5LXk2qzS1Us6ddzctfazoS3XFz2jJQy1of6txc=";
+    hash = "sha256-43a4Q1cr5Lv60OiQUbBMep3YBGNAt0cytgL0oC5BXGo=";
   };
 
   patches = [
diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index d68d7cfca833..943a1a2e19a4 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "4.2.2";
+  version = "5.0.3";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BYaJ76iX969SLxCUMyIRbHnVt5/N+wjMMvsqxFmLqUI=";
+    hash = "sha256-EMzTOOhtOs2/TzfKVt0aBc2rKIgKLV0+S9R1uEFSjVo=";
   };
 
   # The source build documentation covers some dependencies and CMake options.
diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
index 1c69c4ff92a7..a1634e6ec18e 100644
--- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
+++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
@@ -9,16 +9,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "fluxcd-operator-mcp";
-  version = "0.38.1";
+  version = "0.48.0";
 
   src = fetchFromGitHub {
     owner = "controlplaneio-fluxcd";
     repo = "fluxcd-operator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-thSUS3OQecOSaC6e5o1yRuI7FAyy/wZEvp+tIdJrtSo=";
+    hash = "sha256-Ggx38aF9o7dMFcQxYbx5hSXCE2oRRTgvUvXCAJJN6V8=";
   };
 
-  vendorHash = "sha256-Z5oKy9u/aqxoEiyDJWBBoUS5WJYWcfh77kK5wyl/pdc=";
+  vendorHash = "sha256-xG4mJQfww/pMIg9zK2XpDw7XGCLHvJPXLvBspdSRAcg=";
 
   ldflags = [
     "-s"
@@ -61,6 +61,7 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       mattfield
+      stealthybox
     ];
     mainProgram = "flux-operator-mcp";
   };
diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index 1bcb6d082fd1..96eae97cadb1 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -9,10 +9,10 @@
 }:
 
 let
-  version = "2.8.5";
-  srcHash = "sha256-2Q6l+egcRntGjieXpXz/frGGw4GMhGXxQAUOAZfxBE4=";
-  vendorHash = "sha256-D92vOyTvlpOou/1WHS6xpb4e8igZMQhm4DP7SVSLKPI=";
-  manifestsHash = "sha256-X0Cf8UZufqUWKLxYVjblYNCz5IU/s+mI+h6TpTeks5k=";
+  version = "2.8.6";
+  srcHash = "sha256-pKP4g2pTMYtx/B/Y3ow7tvDdhCSuwbszzeLVXB0W7Bo=";
+  vendorHash = "sha256-VBafft9/AuXaHWvZymy7P9gaSuO8D6IZHfK68Ixp3mI=";
+  manifestsHash = "sha256-h/HR/rJwPWXiuoj9T+LajdsdT4Jo8/EuN+O1I7e9sjI=";
 
   manifests = fetchzip {
     url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
@@ -82,6 +82,7 @@ buildGoModule rec {
       jlesquembre
       ryan4yin
       SchahinRohani
+      stealthybox
       superherointj
     ];
     mainProgram = "flux";
diff --git a/pkgs/by-name/fl/flycast/package.nix b/pkgs/by-name/fl/flycast/package.nix
index 6fa6a6ce8356..c9ab0cfedf83 100644
--- a/pkgs/by-name/fl/flycast/package.nix
+++ b/pkgs/by-name/fl/flycast/package.nix
@@ -13,18 +13,19 @@
   lua,
   miniupnpc,
   SDL2,
+  systemdLibs,
   vulkan-loader,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flycast";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OnlSkwPDUrpj9uEPEAxZO1iSgd5ZiQUJLneu14v9pKQ=";
+    hash = "sha256-Lq6Oj+U4mpwNlL/t3ZB9gjE5NAVQyhdvBwLUGu1C+j0=";
     fetchSubmodules = true;
   };
 
@@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     lua
     miniupnpc
     SDL2
+    systemdLibs
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix
index 693b37b9b691..8a35497c0404 100644
--- a/pkgs/by-name/fl/flyctl/package.nix
+++ b/pkgs/by-name/fl/flyctl/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.4.36";
+  version = "0.4.42";
 
   src = fetchFromGitHub {
     owner = "superfly";
@@ -22,11 +22,11 @@ buildGoModule rec {
       cd "$out"
       git rev-parse HEAD > COMMIT
     '';
-    hash = "sha256-WMENTGVwMICIrgMbl31cEaBpznyv3+XFtAhP8AajWyo=";
+    hash = "sha256-yAzd7bytBKxOBGs8ja48QPVdmJSvRfIzi8K2DoC0O+Y=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-qGG+xOBe8JLt+F4iTNMEC1XTs5H/rfLtUZO7QXYAaZg=";
+  vendorHash = "sha256-TUlOdRfexuxC2Of6ZHPYChCr3i1IGapLZz1/lAhnUxk=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix
index 3882140ae58f..2aadb8c25e49 100644
--- a/pkgs/by-name/fl/flyway/package.nix
+++ b/pkgs/by-name/fl/flyway/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \
       --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \
       --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/lib/flyway/*:$out/share/flyway/lib/aad/*:$out/share/flyway/lib/netty/*:$out/share/flyway/drivers/*'" \
-      --add-flags "org.flywaydb.commandline.Main" \
+      --add-flags "org.flywaydb.commandline.Main"
   '';
   passthru.tests = {
     version = testers.testVersion { package = finalAttrs.finalPackage; };
diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix
index 796520d3ddf0..a25f12fb5601 100644
--- a/pkgs/by-name/fn/fn-cli/package.nix
+++ b/pkgs/by-name/fn/fn-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fn";
-  version = "0.6.48";
+  version = "0.6.49";
 
   src = fetchFromGitHub {
     owner = "fnproject";
     repo = "cli";
     rev = finalAttrs.version;
-    hash = "sha256-TTGZoCvhJXRsGY5pGiURpHVhlCacDYiLTnyjVJHJLno=";
+    hash = "sha256-qDLBwxMDVPY2WWCAGw7jFwHX9qAnqOuz9Tgfg1EC1bc=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/fo/fontmatrix/package.nix b/pkgs/by-name/fo/fontmatrix/package.nix
deleted file mode 100644
index 1bbfc55e6f96..000000000000
--- a/pkgs/by-name/fo/fontmatrix/package.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "fontmatrix";
-  version = "0.9.100";
-
-  src = fetchFromGitHub {
-    owner = "fontmatrix";
-    repo = "fontmatrix";
-    rev = "v${version}";
-    sha256 = "sha256-DtajGhx79DiecglXHja9q/TKVq8Jl2faQdA5Ib/yT88=";
-  };
-
-  buildInputs = [
-    libsForQt5.qttools
-    libsForQt5.qtwebkit
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  meta = {
-    description = "Free/libre font explorer for Linux, Windows and Mac";
-    homepage = "https://github.com/fontmatrix/fontmatrix";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix
index 0d29bfd50b6a..245203dc7844 100644
--- a/pkgs/by-name/fo/forge-mtg/package.nix
+++ b/pkgs/by-name/fo/forge-mtg/package.nix
@@ -16,13 +16,13 @@
 }:
 
 let
-  version = "2.0.11";
+  version = "2.0.12";
 
   src = fetchFromGitHub {
     owner = "Card-Forge";
     repo = "forge";
     rev = "forge-${version}";
-    hash = "sha256-72BeLmX6TDz/Z3LwnKsEEK4BntE4dp9DsbsrAkh1K2U=";
+    hash = "sha256-OwrjpK5aqEx5HCZqU+iLJtkUtmt5yGW1bHLrX1UYf3Q=";
   };
 
   # launch4j downloads and runs a native binary during the package phase.
@@ -33,7 +33,7 @@ maven.buildMavenPackage {
   pname = "forge-mtg";
   inherit version src patches;
 
-  mvnHash = "sha256-OnxgoJhpJndYpkSmFdM+aniwrArPjPtn2E/4McU6J2k=";
+  mvnHash = "sha256-OmjrAwYzvW8ejR3/bUVQhy05vACVTG19Bznpl1SbaYs=";
 
   doCheck = false; # Needs a running Xorg
 
diff --git a/pkgs/by-name/fo/forgejo-mcp/package.nix b/pkgs/by-name/fo/forgejo-mcp/package.nix
index 944ead3c6609..3de0699793e5 100644
--- a/pkgs/by-name/fo/forgejo-mcp/package.nix
+++ b/pkgs/by-name/fo/forgejo-mcp/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "forgejo-mcp";
-  version = "2.17.0";
+  version = "2.18.0";
 
   src = fetchFromCodeberg {
     owner = "goern";
     repo = "forgejo-mcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DcpS2467MCFfIVsdYEfd5t6kPjMeLElMQbDyuXI04XE=";
+    hash = "sha256-KWNRQJHW9+21+azIKjO2ryAPEDS7Ka0BuFnCFIko+FY=";
   };
 
   vendorHash = "sha256-5CV4drUaYKtZ/RoydAatblhsqU8VWYzYByjhcb9KZVY=";
diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index f99da20163c9..977e022af41a 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -52,17 +52,17 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "forgejo-runner";
-  version = "12.8.2";
+  version = "12.9.0";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bLW33r6BdIDt8kHJzRltlePzEfduiL5PBlVO/iZ6MYg=";
+    hash = "sha256-yhcD+FiRuo+WAvKFtgAI+36/uIci9O1s9RtXT0Q75Uo=";
   };
 
-  vendorHash = "sha256-M/x814rhG9hnl4vkHLYY2LQ4YfUqIrtM0ctrBebigrA=";
+  vendorHash = "sha256-CCUyL6ZxLRQy30TQUj1yOAuR7Ctp06/0jG8Q3De6/oo=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix
index 229f3483e3c9..413b070c3143 100644
--- a/pkgs/by-name/fo/forgejo/generic.nix
+++ b/pkgs/by-name/fo/forgejo/generic.nix
@@ -126,6 +126,7 @@ buildGoModule rec {
         "TestDNSUpdate" # requires network: release.forgejo.org
         "TestMigrateWhiteBlocklist" # requires network: gitlab.com (DNS)
         "TestURLAllowedSSH/Pushmirror_URL" # requires network git.gay (DNS)
+        "TestBleveDeleteIssue" # Known Flake-y https://github.com/NixOS/nixpkgs/issues/509878
       ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 78da7be18911..45dd978fd3a5 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "15.0.0";
-  hash = "sha256-KAGHascGFj4X6b4BpRqQ8yCedNh0nvHfQgbzJh9fxAc=";
-  npmDepsHash = "sha256-AWvLcAS7EEy796kAQfiQ8sFSh/s+6zNCJEqe4qzQL3s=";
-  vendorHash = "sha256-bP7cykWKwNQrWm9jJT4YYAHRV66HaTwGkvhBqSHgWAA=";
+  version = "15.0.1";
+  hash = "sha256-40hyQ6MPskyty/LsMVczuDpbu2q3Syoj3c00HUS+pVE=";
+  npmDepsHash = "sha256-xWbnSX11RkLjtJ62qG6rD+xQAOnUuI99r9uEHakkZPY=";
+  vendorHash = "sha256-JUBAcRYgflrvoAK0OvaU/Xr6/BakgaUtYwtvBF9vyk0=";
   lts = true;
   nixUpdateExtraArgs = [
     "--override-filename"
diff --git a/pkgs/by-name/fo/fork-cleaner/package.nix b/pkgs/by-name/fo/fork-cleaner/package.nix
index 201f00d92e2d..c5c39477f603 100644
--- a/pkgs/by-name/fo/fork-cleaner/package.nix
+++ b/pkgs/by-name/fo/fork-cleaner/package.nix
@@ -13,16 +13,12 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = "fork-cleaner";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-Io/IOJYa9qDCTTf6vQvZeco1iEDV7crnvzR539QDz40=";
   };
 
   vendorHash = "sha256-+OlrXYjBiXtbMf/IRzj06J1yq2XdlQk54lnJtCmqymw=";
 
-  # allowGoReference adds the flag `-trimpath` which is also denoted by, fork-cleaner goreleaser config
-  #  <https://github.com/caarlos0/fork-cleaner/blob/645345bf97d751614270de4ade698ddbc53509c1/goreleaser.yml#L38>
-  allowGoReference = true;
-
   ldflags = [
     "-s"
     "-w"
@@ -33,7 +29,7 @@ buildGoModule {
   meta = {
     description = "Quickly clean up unused forks on your GitHub account";
     homepage = "https://github.com/caarlos0/fork-cleaner";
-    changelog = "https://github.com/caarlos0/fork-cleaner/releases/tag/${version}";
+    changelog = "https://github.com/caarlos0/fork-cleaner/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ isabelroses ];
     mainProgram = "fork-cleaner";
diff --git a/pkgs/by-name/fo/fortify-headers/package.nix b/pkgs/by-name/fo/fortify-headers/package.nix
index bb3c55484444..6cd28de051dd 100644
--- a/pkgs/by-name/fo/fortify-headers/package.nix
+++ b/pkgs/by-name/fo/fortify-headers/package.nix
@@ -2,18 +2,18 @@
   lib,
   stdenv,
   fetchurl,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fortify-headers";
-  version = "1.1alpine3";
+  version = "3.0.1";
 
   # upstream only accessible via git - unusable during bootstrap, hence
-  # extract from the alpine package
+  # extract from GitHub release.
   src = fetchurl {
-    url = "https://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/fortify-headers-1.1-r3.apk";
-    name = "fortify-headers.tar.gz"; # ensure it's extracted as a .tar.gz
-    hash = "sha256-8A8JcKHIBgXpUuIP4zs3Q1yBs5jCGd5F3H2E8UN/S2g=";
+    url = "https://github.com/jvoisin/fortify-headers/archive/refs/tags/${finalAttrs.version}.tar.gz";
+    hash = "sha256-V2rB3C25pQPYRYwen0ps6LBDfPw8UHhZ12AaO42KwOY=";
   };
 
   patches = [
@@ -21,15 +21,21 @@ stdenv.mkDerivation {
     ./restore-macros.patch
   ];
 
+  dontBuild = true;
+
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out
-    cp -r include/fortify $out/include
+    cp -r include $out/include
 
     runHook postInstall
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "git://git.2f30.org/fortify-headers";
+  };
+
   meta = {
     description = "Standalone header-based fortify-source implementation";
     homepage = "https://git.2f30.org/fortify-headers";
@@ -37,4 +43,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [ ris ];
   };
-}
+})
diff --git a/pkgs/by-name/fo/fortify-headers/restore-macros.patch b/pkgs/by-name/fo/fortify-headers/restore-macros.patch
index f7d31a329e35..ffdfd99017cf 100644
--- a/pkgs/by-name/fo/fortify-headers/restore-macros.patch
+++ b/pkgs/by-name/fo/fortify-headers/restore-macros.patch
@@ -5,9 +5,9 @@ some programs that define these miss them if removed
 push_macro and pop_macro pragmas allegedly well supported
 by gcc, clang and msvc
 
---- a/include/fortify/poll.h
-+++ b/include/fortify/poll.h
-@@ -29,6 +29,7 @@ __extension__
+--- a/include/poll.h
++++ b/include/poll.h
+@@ -29,30 +29,39 @@ __extension__
  extern "C" {
  #endif
  
@@ -15,17 +15,40 @@ by gcc, clang and msvc
  #undef poll
  
  _FORTIFY_FN(poll) int poll(struct pollfd * _FORTIFY_POS0 __f, nfds_t __n, int __s)
-@@ -40,6 +41,8 @@ _FORTIFY_FN(poll) int poll(struct pollfd * _FORTIFY_POS0 __f, nfds_t __n, int __
+ {
+ 	__typeof__(sizeof 0) __b = __bos(__f, 0);
+ 
+ 	if (__n > __b / sizeof(struct pollfd))
+ 		__builtin_trap();
  	return __orig_poll(__f, __n, __s);
  }
  
+ #if defined(_GNU_SOURCE) && (!defined(_REDIR_TIME64) || !_REDIR_TIME64)
++
++#pragma push_macro("ppoll")
+ #undef ppoll
++
+ _FORTIFY_FN(ppoll) int ppoll(struct pollfd * _FORTIFY_POS0 __f, nfds_t __n,
+                              const struct timespec *__s, const sigset_t *__m)
+ {
+ 	__typeof__(sizeof 0) __b = __bos(__f, 0);
+ 
+ 	if (__n > __b / sizeof(struct pollfd))
+ 		__builtin_trap();
+ 	return __orig_ppoll(__f, __n, __s, __m);
+ }
++
++#pragma pop_macro("ppoll")
++
+ #endif
+ 
 +#pragma pop_macro("poll")
 +
  #ifdef __cplusplus
  }
  #endif
---- a/include/fortify/stdio.h
-+++ b/include/fortify/stdio.h
+--- a/include/stdio.h
++++ b/include/stdio.h
 @@ -29,12 +29,19 @@ __extension__
  extern "C" {
  #endif
@@ -45,8 +68,8 @@ by gcc, clang and msvc
 +#pragma push_macro("sprintf")
  #undef sprintf
  
- _FORTIFY_FN(fgets) char *fgets(char * _FORTIFY_POS0 __s, int __n, FILE *__f)
-@@ -140,6 +147,14 @@ _FORTIFY_FN(sprintf) int sprintf(char *__s, const char *__f, ...)
+ __fortify_access(read_write, 1, 2)
+@@ -153,6 +160,14 @@ _FORTIFY_FN(sprintf) int sprintf(char *__s, const char *__f, ...)
  #endif /* __has_builtin(__builtin_va_arg_pack) */
  #endif /* defined(__has_builtin) */
  
@@ -61,8 +84,8 @@ by gcc, clang and msvc
  #ifdef __cplusplus
  }
  #endif
---- a/include/fortify/stdlib.h
-+++ b/include/fortify/stdlib.h
+--- a/include/stdlib.h
++++ b/include/stdlib.h
 @@ -38,7 +38,10 @@ extern "C" {
  
  /* FIXME clang */
@@ -71,10 +94,10 @@ by gcc, clang and msvc
 +#pragma push_macro("realpath")
  #undef realpath
 +
+ __fortify_warning_if(__p == NULL, "'realpath' called with path set to `NULL`; did you invert the arguments?")
  _FORTIFY_FN(realpath) char *realpath(const char *__p, char *__r)
  {
- #ifndef PATH_MAX
-@@ -60,6 +63,9 @@ _FORTIFY_FN(realpath) char *realpath(const char *__p, char *__r)
+@@ -61,6 +64,9 @@ _FORTIFY_FN(realpath) char *realpath(const char *__p, char *__r)
  	return __orig_realpath(__p, __r);
  #endif
  }
@@ -84,8 +107,8 @@ by gcc, clang and msvc
  #endif
  
  #ifdef __cplusplus
---- a/include/fortify/string.h
-+++ b/include/fortify/string.h
+--- a/include/string.h
++++ b/include/string.h
 @@ -29,12 +29,19 @@ __extension__
  extern "C" {
  #endif
@@ -105,9 +128,90 @@ by gcc, clang and msvc
 +#pragma push_macro("strncpy")
  #undef strncpy
  
- _FORTIFY_FN(memcpy) void *memcpy(void * _FORTIFY_POS0 __od,
-@@ -183,6 +190,14 @@ _FORTIFY_FN(strlcpy) size_t strlcpy(char * _FORTIFY_POS0 __d,
+ __fortify_access(write_only, 1, 3)
+@@ -84,30 +91,39 @@ _FORTIFY_FN(memset) void *memset(void * _FORTIFY_POS0 __d, int __c, size_t __n)
+ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+  || defined(_BSD_SOURCE)
++
++#pragma push_macro("stpcpy")
+ #undef stpcpy
++
+ __fortify_access(write_only, 1)
+ __fortify_access(read_only, 2)
+ _FORTIFY_FN(stpcpy) char *stpcpy(char * _FORTIFY_POS0 __d, const char *__s)
+ {
+ 	size_t __b = __bos(__d, 0);
+ 
+ 	if (strlen(__s) + 1 > __b)
+ 		__builtin_trap();
+ 	return __orig_stpcpy(__d, __s);
  }
+ 
++#pragma push_macro("stpncpy")
+ #undef stpncpy
++
+ __fortify_access(write_only, 1)
+ __fortify_access(read_only, 2)
+ _FORTIFY_FN(stpncpy) char *stpncpy(char * _FORTIFY_POS0 __d, const char *__s,
+                                    size_t __n)
+ {
+ 	size_t __b = __bos(__d, 0);
+ 
+ 	if (__n > __b && strlen(__s) + 1 > __b)
+ 		__builtin_trap();
+ 	return __orig_stpncpy(__d, __s, __n);
+ }
++
++#pragma pop_macro("stpcpy")
++#pragma pop_macro("stpncpy")
++
+ #endif
+ 
+ __fortify_access(read_write, 1)
+@@ -164,24 +180,34 @@ _FORTIFY_FN(strncpy) char *strncpy(char * _FORTIFY_POS0 __d,
+ }
+ 
+ #ifdef _GNU_SOURCE
++
++#pragma push_macro("mempcpy")
+ #undef mempcpy
++
+ __fortify_access(write_only, 1, 3)
+ __fortify_access(read_only, 2, 3)
+ _FORTIFY_FN(mempcpy) void *mempcpy(void * _FORTIFY_POS0 __d,
+                                    const void * _FORTIFY_POS0 __s, size_t __n)
+ {
+ 	size_t __bd = __bos(__d, 0);
+ 	size_t __bs = __bos(__s, 0);
+ 
+ 	if (__n > __bd || __n > __bs)
+ 		__builtin_trap();
+ 	return __orig_mempcpy(__d, __s, __n);
+ }
++
++#pragma pop_macro("mempcpy")
++
+ #endif
+ 
+ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
++
++#pragma push_macro("strlcat")
+ #undef strlcat
++#pragma push_macro("strlcpy")
+ #undef strlcpy
++
+ __fortify_access(read_write, 1)
+ __fortify_access(read_only, 2)
+ _FORTIFY_FN(strlcat) size_t strlcat(char * _FORTIFY_POS0 __d,
+@@ -205,8 +231,20 @@ _FORTIFY_FN(strlcpy) size_t strlcpy(char * _FORTIFY_POS0 __d,
+ 		__builtin_trap();
+ 	return __orig_strlcpy(__d, __s, __n);
+ }
++
++#pragma pop_macro("strlcat")
++#pragma pop_macro("strlcpy")
++
  #endif
  
 +#pragma pop_macro("memcpy")
@@ -121,8 +225,8 @@ by gcc, clang and msvc
  #ifdef __cplusplus
  }
  #endif
---- a/include/fortify/strings.h
-+++ b/include/fortify/strings.h
+--- a/include/strings.h
++++ b/include/strings.h
 @@ -29,8 +29,12 @@ extern "C" {
  #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_POSIX_SOURCE) \
   || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE+0 < 200809L) \
@@ -133,10 +237,10 @@ by gcc, clang and msvc
 +#pragma push_macro("bzero")
  #undef bzero
 +
+ __fortify_access(write_only, 2, 3)
+ __fortify_access(read_only, 1, 3)
  _FORTIFY_FN(bcopy) void bcopy(const void * _FORTIFY_POS0 __s,
-                               void * _FORTIFY_POS0 __d, size_t __n)
- {
-@@ -52,6 +56,9 @@ _FORTIFY_FN(bzero) void bzero(void * _FORTIFY_POS0 __s, size_t __n)
+@@ -55,6 +59,9 @@ _FORTIFY_FN(bzero) void bzero(void * _FORTIFY_POS0 __s, size_t __n)
  }
  #endif
  
@@ -146,8 +250,8 @@ by gcc, clang and msvc
  #ifdef __cplusplus
  }
  #endif
---- a/include/fortify/sys/socket.h
-+++ b/include/fortify/sys/socket.h
+--- a/include/sys/socket.h
++++ b/include/sys/socket.h
 @@ -29,9 +29,13 @@ __extension__
  extern "C" {
  #endif
@@ -161,8 +265,8 @@ by gcc, clang and msvc
 +#pragma push_macro("sendto")
  #undef sendto
  
- _FORTIFY_FN(recv) ssize_t recv(int __f, void * _FORTIFY_POS0 __s, size_t __n,
-@@ -76,6 +80,11 @@ _FORTIFY_FN(sendto) ssize_t sendto(int __f, const void * _FORTIFY_POS0 __s,
+ __fortify_access(write_only, 2, 3)
+@@ -80,6 +84,11 @@ _FORTIFY_FN(sendto) ssize_t sendto(int __f, const void * _FORTIFY_POS0 __s,
  	return __orig_sendto(__f, __s, __n, __fl, __a, __l);
  }
  
@@ -174,8 +278,8 @@ by gcc, clang and msvc
  #ifdef __cplusplus
  }
  #endif
---- a/include/fortify/unistd.h
-+++ b/include/fortify/unistd.h
+--- a/include/unistd.h
++++ b/include/unistd.h
 @@ -29,16 +29,27 @@ __extension__
  extern "C" {
  #endif
@@ -203,11 +307,53 @@ by gcc, clang and msvc
 +#pragma push_macro("write")
  #undef write
  
- _FORTIFY_FN(confstr) size_t confstr(int __n, char * _FORTIFY_POS0 __s, size_t __l)
-@@ -158,6 +169,18 @@ _FORTIFY_FN(write) ssize_t write(int __f, const void * _FORTIFY_POS0 __s,
- 	return __orig_write(__f, __s, __n);
+ __fortify_access(write_only, 2, 3)
+@@ -63,16 +74,22 @@ _FORTIFY_FN(getcwd) char *getcwd(char * _FORTIFY_POS0 __s, size_t __l)
  }
  
+ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
++
++#pragma push_macro("getdomainname")
+ #undef getdomainname
++
+ __fortify_access(write_only, 1, 2)
+ _FORTIFY_FN(getdomainname) int getdomainname(char * _FORTIFY_POS0 __s, size_t __l)
+ {
+ 	size_t __b = __bos(__s, 0);
+ 
+ 	if (__l > __b)
+ 		__builtin_trap();
+ 	return __orig_getdomainname(__s, __l);
+ }
++
++#pragma pop_macro("getdomainname")
++
+ #endif
+ 
+ _FORTIFY_FN(getgroups) int getgroups(int __l, gid_t * _FORTIFY_POS0 __s)
+@@ -169,21 +186,37 @@ _FORTIFY_FN(write) ssize_t write(int __f, const void * _FORTIFY_POS0 __s,
+ }
+ 
+ #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
++
++#pragma push_macro("swab")
+ #undef swab
+ 
+ _FORTIFY_FN(swab) void swab(const void * _FORTIFY_POS0 __os,
+                                  void * _FORTIFY_POS0 __od, ssize_t __n)
+ {
+ 	size_t __bs = __bos(__os, 0);
+ 	size_t __bd = __bos(__od, 0);
+ 
+ 	if ((size_t)__n > __bs || (size_t)__n > __bd)
+ 		__builtin_trap();
+ 	return __orig_swab(__os, __od, __n);
+ }
+ 
++#pragma pop_macro("swab")
++
+ #endif
+ 
 +#pragma pop_macro("confstr")
 +#pragma pop_macro("getcwd")
 +#pragma pop_macro("getgroups")
@@ -223,9 +369,9 @@ by gcc, clang and msvc
  #ifdef __cplusplus
  }
  #endif
---- a/include/fortify/wchar.h
-+++ b/include/fortify/wchar.h
-@@ -43,19 +43,33 @@ __extension__
+--- a/include/wchar.h
++++ b/include/wchar.h
+@@ -46,33 +46,49 @@ __extension__
  extern "C" {
  #endif
  
@@ -249,8 +395,6 @@ by gcc, clang and msvc
  #undef wcsrtombs
 +#pragma push_macro("wcstombs")
  #undef wcstombs
-+#pragma push_macro("wctomb")
- #undef wctomb
 +#pragma push_macro("wmemcpy")
  #undef wmemcpy
 +#pragma push_macro("wmemmove")
@@ -259,7 +403,56 @@ by gcc, clang and msvc
  #undef wmemset
  
  _FORTIFY_FN(fgetws) wchar_t *fgetws(wchar_t * _FORTIFY_POS0 __s,
-@@ -269,6 +283,21 @@ _FORTIFY_FN(wmemset) wchar_t *wmemset(wchar_t * _FORTIFY_POS0 __s,
+                                     int __n, FILE *__f)
+ {
+ 	size_t __b = __bos(__s, 0);
+ 
+ 	if ((size_t)__n > __b / sizeof(wchar_t))
+ 		__builtin_trap();
+ 	return __orig_fgetws(__s, __n, __f);
+ }
+ 
+ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)  || defined(_BSD_SOURCE)
++
++#pragma push_macro("mbsnrtowcs")
+ #undef mbsnrtowcs
++
+ _FORTIFY_FN(mbsnrtowcs) size_t mbsnrtowcs(wchar_t * _FORTIFY_POS0 __d,
+                                           const char **__s, size_t __n,
+                                           size_t __wn, mbstate_t *__st)
+@@ -92,6 +108,9 @@ _FORTIFY_FN(mbsnrtowcs) size_t mbsnrtowcs(wchar_t * _FORTIFY_POS0 __d,
+ 	}
+ 	return __r;
+ }
++
++#pragma pop_macro("mbsnrtowcs")
++
+ #endif
+ 
+ _FORTIFY_FN(mbsrtowcs) size_t mbsrtowcs(wchar_t * _FORTIFY_POS0 __d,
+@@ -187,7 +206,10 @@ _FORTIFY_FN(wcsncpy) wchar_t *wcsncpy(wchar_t * _FORTIFY_POS0 __d,
+ 
+ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)  || defined(_BSD_SOURCE)
++
++#pragma push_macro("wcsnrtombs")
+ #undef wcsnrtombs
++
+ _FORTIFY_FN(wcsnrtombs) size_t wcsnrtombs(char * _FORTIFY_POS0 __d,
+                                           const wchar_t **__s, size_t __wn,
+                                           size_t __n, mbstate_t *__st)
+@@ -207,6 +229,9 @@ _FORTIFY_FN(wcsnrtombs) size_t wcsnrtombs(char * _FORTIFY_POS0 __d,
+ 	}
+ 	return __r;
+ }
++
++#pragma pop_macro("wcsnrtombs")
++
+ #endif
+ 
+ _FORTIFY_FN(wcsrtombs) size_t wcsrtombs(char * _FORTIFY_POS0 __d,
+@@ -262,6 +287,20 @@ _FORTIFY_FN(wmemset) wchar_t *wmemset(wchar_t * _FORTIFY_POS0 __s,
  	return __orig_wmemset(__s, __c, __n);
  }
  
@@ -273,7 +466,6 @@ by gcc, clang and msvc
 +#pragma pop_macro("wcsncpy")
 +#pragma pop_macro("wcsrtombs")
 +#pragma pop_macro("wcstombs")
-+#pragma pop_macro("wctomb")
 +#pragma pop_macro("wmemcpy")
 +#pragma pop_macro("wmemmove")
 +#pragma pop_macro("wmemset")
diff --git a/pkgs/by-name/fo/fortify-headers/wchar-imports-skip.patch b/pkgs/by-name/fo/fortify-headers/wchar-imports-skip.patch
index 255ceba9f099..fcddf327eecb 100644
--- a/pkgs/by-name/fo/fortify-headers/wchar-imports-skip.patch
+++ b/pkgs/by-name/fo/fortify-headers/wchar-imports-skip.patch
@@ -8,13 +8,15 @@ supported/expected by some projects.
 having a way to almost entirely short-circuit these headers (by
 disabling _FORTIFY_SOURCE) is therefore important.
 
---- a/include/fortify/wchar.h
-+++ b/include/fortify/wchar.h
-@@ -20,21 +20,23 @@
- #if !defined(__cplusplus) && !defined(__clang__)
- __extension__
- #endif
--#include_next <limits.h>
+--- a/include/wchar.h
++++ b/include/wchar.h
+@@ -17,6 +17,13 @@
+ #ifndef _FORTIFY_WCHAR_H
+ #define _FORTIFY_WCHAR_H
+ 
++#if !defined(__cplusplus) && !defined(__clang__)
++__extension__
++#endif
 +#include_next <wchar.h>
 +
 +#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
@@ -22,18 +24,11 @@ disabling _FORTIFY_SOURCE) is therefore important.
  #if !defined(__cplusplus) && !defined(__clang__)
  __extension__
  #endif
--#include_next <stdlib.h>
-+#include_next <limits.h>
- #if !defined(__cplusplus) && !defined(__clang__)
- __extension__
- #endif
--#include_next <string.h>
-+#include_next <stdlib.h>
+@@ -32,9 +39,7 @@ __extension__
  #if !defined(__cplusplus) && !defined(__clang__)
  __extension__
  #endif
 -#include_next <wchar.h>
-+#include_next <string.h>
  
 -#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
  #include "fortify-headers.h"
diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix
index 61c667b1a7f2..1d219e19537c 100644
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -4,20 +4,21 @@
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  stdenv,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "newt";
-  version = "1.10.4";
+  version = "1.12.3";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "newt";
     tag = finalAttrs.version;
-    hash = "sha256-Dtzx/Rs7aa2GkG7Qq4pvGN4ghfS7EyVhx7rQh8sRlQU=";
+    hash = "sha256-Maw0qELlnh0m+NsQGdDC3wGYK8zi8Lbt7zwJqieR4hg=";
   };
 
-  vendorHash = "sha256-vy6Dqjek7pLdASbCrM9snq5Dt9lbwNJ0AuQboy1JWNQ=";
+  vendorHash = "sha256-+zMSzNbqmWm/DXL2xMUd5uPP5tSIybsRokwJ2zd0pf0=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
@@ -33,7 +34,13 @@ buildGoModule (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
+  __structuredAttrs = true;
+
   meta = {
+    # Networking failures in tests, even with __darwinAllowLocalNetworking on
+    # and sandbox disabled.
+    # Unclear as of 2026-04-24 whether the program works if tests are disabled.
+    broken = stdenv.hostPlatform.isDarwin;
     description = "Tunneling client for Pangolin";
     homepage = "https://github.com/fosrl/newt";
     changelog = "https://github.com/fosrl/newt/releases/tag/${finalAttrs.src.tag}";
diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix
index b3373d8a6f59..6bd26a00b0bd 100644
--- a/pkgs/by-name/fo/fosrl-olm/package.nix
+++ b/pkgs/by-name/fo/fosrl-olm/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "olm";
-  version = "1.4.4";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "olm";
     tag = finalAttrs.version;
-    hash = "sha256-G2kYzYg4RUFHgW9z44PcQPK85FsD5SVBefpzBKIwUw0=";
+    hash = "sha256-OnHOfP3dCduTe0xnZD77YZcI3GOKxGsen5i7dOiCjy8=";
   };
 
-  vendorHash = "sha256-D93SPwXAeoTLCbScjyH8AB9TJIF2b/UbLNMIQYi+B+c=";
+  vendorHash = "sha256-+KQpYGoyNI2SnEjj23GM0FqZFX6lHx7oNw9qdkkgcPU=";
 
   ldflags = [
     "-s"
@@ -24,6 +24,8 @@ buildGoModule (finalAttrs: {
 
   doInstallCheck = true;
 
+  __structuredAttrs = true;
+
   meta = {
     description = "Tunneling client for Pangolin";
     homepage = "https://github.com/fosrl/olm";
diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix
index 1e76907960a3..b7d3c0af79cc 100644
--- a/pkgs/by-name/fo/fosrl-pangolin/package.nix
+++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix
@@ -29,13 +29,13 @@ in
 
 buildNpmPackage (finalAttrs: {
   pname = "pangolin";
-  version = "1.17.0";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "pangolin";
     tag = finalAttrs.version;
-    hash = "sha256-E0GfYznHj4CKsRWQm6zHTAJ8hJw9ieFoKIOT9tcumYQ=";
+    hash = "sha256-V1yOSFN2g5MHPIXF/UFymgXrfN5tE99cuIFnWpdCVCA=";
   };
 
   npmDepsHash = "sha256-DyPfylne9Ku7sEUNN0LLlN0EOnCjcklsh+F6YP+rXv4=";
diff --git a/pkgs/by-name/fo/foxmarks/package.nix b/pkgs/by-name/fo/foxmarks/package.nix
index c5f6e0b8ffe2..75d8a217ef15 100644
--- a/pkgs/by-name/fo/foxmarks/package.nix
+++ b/pkgs/by-name/fo/foxmarks/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "CLI read-only interface for Mozilla Firefox's bookmarks";
     homepage = "https://github.com/zer0-x/foxmarks";
-    changelog = "https://github.com/zer0-x/foxmarks/blobl/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/zer0-x/foxmarks/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ loicreynier ];
   };
diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix
index 84e305c8d01a..78eec456b62e 100644
--- a/pkgs/by-name/fr/fre/package.nix
+++ b/pkgs/by-name/fr/fre/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "CLI tool for tracking your most-used directories and files";
     homepage = "https://github.com/camdencheek/fre";
-    changelog = "https://github.com/camdencheek/fre/blob/${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/camdencheek/fre/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ gaykitty ];
     mainProgram = "fre";
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 6c7d484c1940..5e04316c6f8d 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -55,13 +55,13 @@ in
 freecad-utils.makeCustomizable (
   stdenv.mkDerivation (finalAttrs: {
     pname = "freecad";
-    version = "1.1.0";
+    version = "1.1.1";
 
     src = fetchFromGitHub {
       owner = "FreeCAD";
       repo = "FreeCAD";
       tag = finalAttrs.version;
-      hash = "sha256-knyc4Ts9dd12i0SsVDeoCs37jrMxekc07KBf3wJvNgk=";
+      hash = "sha256-7/VEbs8YDM1Xwc819ab6av5fgRSIbbB6LeCM0V08vRU=";
       fetchSubmodules = true;
     };
 
diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix
index c63e58b7fe6d..d51ce7d74df9 100644
--- a/pkgs/by-name/fr/freenet/package.nix
+++ b/pkgs/by-name/fr/freenet/package.nix
@@ -18,7 +18,7 @@ let
   jdk = jdk_headless;
 
   freenet_ext = fetchurl {
-    url = "https://github.com/freenet/fred/releases/download/build01495/freenet-ext.jar";
+    url = "https://github.com/hyphanet/fred/releases/download/build01495/freenet-ext.jar";
     hash = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=";
   };
 
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ nagy ];
     platforms = with lib.platforms; linux;
-    changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md";
+    changelog = "https://github.com/hyphanet/fred/blob/build${version}/NEWS.md";
     mainProgram = "freenet";
   };
 }
diff --git a/pkgs/by-name/fr/freerouting/deps.json b/pkgs/by-name/fr/freerouting/deps.json
index 66a5f44ce708..979592b5f606 100644
--- a/pkgs/by-name/fr/freerouting/deps.json
+++ b/pkgs/by-name/fr/freerouting/deps.json
@@ -2,17 +2,63 @@
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
  "https://plugins.gradle.org/m2": {
-  "com/github/ben-manes#gradle-versions-plugin/0.52.0": {
-   "jar": "sha256-zuihUdLgvp86hcouXYeg2lyRpIHt8bx/e1e1Ywj9PA0=",
-   "module": "sha256-r6cL5O0h646QJ2hPFfpeKXXz0uRtIpN76jmhDkj3nd0=",
-   "pom": "sha256-WESi8/+pqARY0m7ex3EjeuYxXN3yBp1Qp+hUFj5A8Q0="
+  "com/diffplug/durian#durian-collect/1.2.0": {
+   "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=",
+   "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M="
   },
-  "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.52.0": {
-   "pom": "sha256-sLbWCz+UCuWgFAfwNJ6d86Ayph+FXkoXt9vakSprU3Y="
+  "com/diffplug/durian#durian-core/1.2.0": {
+   "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=",
+   "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI="
   },
-  "com/googlecode/javaewah#JavaEWAH/1.1.13": {
-   "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=",
-   "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q="
+  "com/diffplug/durian#durian-io/1.2.0": {
+   "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=",
+   "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4="
+  },
+  "com/diffplug/durian#durian-swt.os/4.3.0": {
+   "jar": "sha256-geK2Oafkvm3JtyRXE88G9cq1HynbLha5tXZFyW/eKIQ=",
+   "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=",
+   "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs="
+  },
+  "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/8.4.0": {
+   "pom": "sha256-qJGqi+ZCZ2IVBb6uY6jeAqGACX3PO/wnBZ38b510pEA="
+  },
+  "com/diffplug/spotless#spotless-lib-extra/4.5.0": {
+   "jar": "sha256-dU+ATAnfouuNU5YzEdK+aPG0pWIQEdy1UNcC6tKGUdk=",
+   "module": "sha256-Bf7t0gVQynxXCeUc7zgpPFADpcx/qrdU6dusW3Vd4KU=",
+   "pom": "sha256-UPJN+KOGtZ48rS2ylhjHOYgEgZAQYENCsX5jxubdPGU="
+  },
+  "com/diffplug/spotless#spotless-lib/4.5.0": {
+   "jar": "sha256-mM2f5ktjmNp6kPL9kG7wq8Gg5tZvUZ/mrwilhde7bak=",
+   "module": "sha256-AlNtIagrdaWmOaPNQWCgg5oanDXy3EwP9FJBtHafXTU=",
+   "pom": "sha256-SvSliKd1rChPrVC/EUkkZwAE9rgKCSkT9QSOb9Gj2fI="
+  },
+  "com/diffplug/spotless#spotless-plugin-gradle/8.4.0": {
+   "jar": "sha256-oHy1L8S4IhcWeW63AyMQakSjMZ7Itk5ugFb+gn+UOLo=",
+   "module": "sha256-lQhXXODePA1p+l+xrTWo2/iQKuoQVe/E0328FjyHMmc=",
+   "pom": "sha256-d0glMskp8EZGF/iXUT/CJNeuMlFeNIKaPO3F5WlH59s="
+  },
+  "com/github/ben-manes#gradle-versions-plugin/0.53.0": {
+   "jar": "sha256-fystvdI5f/PwQ9e2YuwNYbqr7TqqerImB6702Y7z+mI=",
+   "module": "sha256-KLvVxzKZ1dGYcjzX8klS4b9RQJXE6OrpsisVQaicEII=",
+   "pom": "sha256-aPVU+CLT1aKhQrA6XZ9Wa5FXdPtjnYwds7zfmTyeQI0="
+  },
+  "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.53.0": {
+   "pom": "sha256-yWBPdJaskfaW5HRY2KLWt91U0MqkNn88GspmphyDcvQ="
+  },
+  "com/google/code/gson#gson-parent/2.10.1": {
+   "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
+  },
+  "com/google/code/gson#gson/2.10.1": {
+   "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
+   "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
+  },
+  "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": {
+   "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=",
+   "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE="
+  },
+  "com/googlecode/javaewah#JavaEWAH/1.2.3": {
+   "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=",
+   "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM="
   },
   "com/jcraft#jsch.agentproxy.connector-factory/0.0.7": {
    "jar": "sha256-tXaTDWqCJ2ESM2U1jZAoE1HYjOwt2EWRKHPBaWGE1ss=",
@@ -73,47 +119,56 @@
    "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=",
    "pom": "sha256-H2KMRSg726uM4DwHps+3akeLjdrhgL2PNKusJz5Id24="
   },
-  "com/squareup/retrofit2#converter-moshi/2.11.0": {
-   "jar": "sha256-2/rp294LYeXFZxZIyNn9SG766a0H1XPtAb0N5GiNmyw=",
-   "module": "sha256-8jl8dvQPuHPUydGvgwtEolty75gpsCYJnikTB4uN8z4=",
-   "pom": "sha256-MB/EqjCHlmkS/fQEko2EOtcUPO8wm3fuVeD+srWoyBU="
+  "com/squareup/retrofit2#converter-moshi/3.0.0": {
+   "jar": "sha256-ZGvu0DvXflHa0N9r0FwqOcvIVi2OG5uM+RJkgXgWEaY=",
+   "module": "sha256-6q95+rrp5+RoX5c4jCsBpT45OxD22f+XaCd3pbehA1o=",
+   "pom": "sha256-M1Z1NIxZWjxU06krIS02bpb5ZNHw2yy+DrO0J/dCdPQ="
   },
-  "com/squareup/retrofit2#converter-scalars/2.11.0": {
-   "jar": "sha256-ZH1+gaxh7t9pG6adgvDVaFCHq/DVj+fYa2Q9AoCNqRE=",
-   "module": "sha256-SaqPyhyulzzMqBdmncrXltVqeQ7UdQnweTMHdc8zJnQ=",
-   "pom": "sha256-s9ShAXMYUHQencArE1u4FRHlM0wUe74tqtL1afVmNkU="
+  "com/squareup/retrofit2#converter-scalars/3.0.0": {
+   "jar": "sha256-uXzwaSmoDUm8Yy5E8hnPCnGF/Ezuhh7JCtHQ5IIIQCM=",
+   "module": "sha256-gECNEiZVQbMCRDuw++YUb0BqglP+fDdudWulhAujnKQ=",
+   "pom": "sha256-B42x+Kgsb48K0vzzn7ia4bfUf1XQIlGEksToSN1QL8c="
   },
-  "com/squareup/retrofit2#retrofit/2.11.0": {
-   "jar": "sha256-n0+7znByhYT77tONQGHzbUR36JvKdLTirIrraBmw/kM=",
-   "module": "sha256-6bsuIBhEyI5HUGJPkRSmNUtRtwlItE1ca0qU6M0HCoE=",
-   "pom": "sha256-3iKB4huk2YSrrxPcBn84C8WBaXBoxlaKu5uZjZ13cF4="
+  "com/squareup/retrofit2#retrofit/3.0.0": {
+   "jar": "sha256-acai00UbbflUmpP6t0QJTr8HpLDOT0U9bI9XXvD+yaE=",
+   "module": "sha256-PeUoKbiYIVU06G7aJo2kSf/L+VsYcD2lKdmYgyd0hPc=",
+   "pom": "sha256-/BaPqJcZiIc331OurA9JgLP07z5hIeMww2YGHJlrBoA="
   },
   "com/trilead#trilead-ssh2/1.0.0-build222": {
    "jar": "sha256-Vj3ED1sX9OIVT6QaFq5/QMxJARvFQAsIcOuvYaR7nCI=",
    "pom": "sha256-75Gy9XGcmybCOqVFwhjriwuar411/SQENmVQb7m0Gck="
   },
-  "com/vanniktech#central-portal/0.31.0": {
-   "jar": "sha256-GsMUNiQjV6MW4jN71oTxq7r1MtxagCvYbdw28Bcp0OY=",
-   "module": "sha256-FKAo3EKBTP5A1rny5XTVyl9IFO6y2QHwsccKIMrAY0g=",
-   "pom": "sha256-gidBpXylV2yZetGSm6kSA2HRCzsA7q738lQHN7ECrAw="
+  "com/vanniktech#central-portal/0.33.0": {
+   "jar": "sha256-1Q/3Fkos7tQHL4AdLkPt1yNecIlA/U9gQU3j4+rWxt0=",
+   "module": "sha256-xKqdybl38V3aZtwnb3DqULycNthXcuW+ImjSIekBwgM=",
+   "pom": "sha256-lkRgk+bAqT8VdIBdoqXU3G+Ymr6h9PLqqYSC4XtWZnw="
   },
-  "com/vanniktech#gradle-maven-publish-plugin/0.31.0": {
-   "jar": "sha256-1X3Ie7i7D0pTCtgP59itRnGPo0CLihh7Ge+oXwEHC+8=",
-   "module": "sha256-iV4wIVzJI0hiCmq8revzyCrZBQrlpW2SPIuL5UMjpUo=",
-   "pom": "sha256-l/0mpZgLNmJQRMurOtmRFoaJMgRtOHiviKwT1SU1sQ8="
+  "com/vanniktech#gradle-maven-publish-plugin/0.33.0": {
+   "jar": "sha256-98ZuWk7VKca4VBWlYJR5W408m84yt5aUxW/tWCYC1VY=",
+   "module": "sha256-iVAb28loVSXB9BGqBhibZsUq0AHl5nOdmWmtwmAyRTE=",
+   "pom": "sha256-5q8RrJZWHvZsUQIq5EjBSYfW1F0tVBC0dfa/bHr/YE8="
   },
-  "com/vanniktech#nexus/0.31.0": {
-   "jar": "sha256-Gw/b2F1DtN4WeiSOAwy5kXhNjZxV++KBkrdsnMbcMfU=",
-   "module": "sha256-07nTaSMYOe581Yy58MdwgEnNMo1wt3+d8MrDQ+oXOHw=",
-   "pom": "sha256-WVW+8/ZacFVaArcAtu85VV+dKxxqJcCz2h1SulmlTLU="
+  "com/vanniktech#nexus/0.33.0": {
+   "jar": "sha256-3G6e0+IQ8+wa7O0Bab/40iFEcr1XzbYbTsTfKd8ZvqE=",
+   "module": "sha256-zAwWFf5fDjSTipzF5BNfRbJCMb1V7Z4O+qSMlhDzFRs=",
+   "pom": "sha256-aDzsbi95y+Cn5FMo0MRjb4v867LhYLKnnrm7VX/bn7w="
   },
-  "com/vanniktech/maven/publish#com.vanniktech.maven.publish.gradle.plugin/0.31.0": {
-   "pom": "sha256-ujOevsuNfOFCZJTQ5jINW3OWi5T9CDWMhK1fWIBcBJg="
+  "com/vanniktech/maven/publish#com.vanniktech.maven.publish.gradle.plugin/0.33.0": {
+   "pom": "sha256-LdzRS9ze0cyyXov5QPp4lEGDU5yne8fjlWiAuazRkCQ="
+  },
+  "commons-codec#commons-codec/1.20.0": {
+   "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=",
+   "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys="
   },
   "de/regnis/q/sequence#sequence-library/1.0.4": {
    "jar": "sha256-Uwefbn2LoiSnc4fZt/o+6LNvn0gqLxhr7iNUdNsM0oI=",
    "pom": "sha256-St7mXSTvSwPtnrv/f77+TpCmkZ1uIGbQh1+s02AREzg="
   },
+  "dev/equo/ide#solstice/1.8.1": {
+   "jar": "sha256-bluizOgTvh1xzNwuzz5JJxsU5pG/u7GhFM86MOdzsQ0=",
+   "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=",
+   "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY="
+  },
   "gradle/plugin/net/nemerosa#versioning/3.1.0": {
    "jar": "sha256-ioN4R3z2FiGi2zTa+E5SUuDss0QHCaelmGE+d8HlXHQ=",
    "pom": "sha256-44iuHyzRiDIJW7w7Q/jZYIwpDeFkqHXFjoSsUEWlAaE="
@@ -152,6 +207,12 @@
   "org/apache#apache/23": {
    "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
   },
+  "org/apache#apache/35": {
+   "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg="
+  },
+  "org/apache/commons#commons-parent/91": {
+   "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI="
+  },
   "org/apache/sshd#sshd-common/2.8.0": {
    "jar": "sha256-gdCmJ0TBSR53vcjLqHh1Z4AvXjQc+6TIXGkAoDPZI1Q=",
    "pom": "sha256-JIqw3VkR83i95/FxgY0SG63ZaLfcKCzypKOBXBcmT5o="
@@ -166,14 +227,32 @@
   "org/eclipse/jgit#org.eclipse.jgit-parent/6.1.0.202203080745-r": {
    "pom": "sha256-3/gbocif/btk7dP/uJ9keXBGV+wpuRxfAdmquDpaS1E="
   },
+  "org/eclipse/jgit#org.eclipse.jgit-parent/7.5.0.202512021534-r": {
+   "pom": "sha256-fjiAaoU2kaSdsW6sg2/mtiYnaUOxCLZ3VKPVx0D7vA4="
+  },
   "org/eclipse/jgit#org.eclipse.jgit.ui/6.1.0.202203080745-r": {
    "jar": "sha256-ZbpBDeAaVXUYvVmOgHdALvPiHbe+uE4pcWusEEQwwSM=",
    "pom": "sha256-3ORYL0xnGsdEd/tP34bKZ8GZ16SgLOxJTjYkbVkQ36A="
   },
   "org/eclipse/jgit#org.eclipse.jgit/6.1.0.202203080745-r": {
-   "jar": "sha256-tU+fsU9iVUoTG+5t0qbfqsgnYgN75fLXgAPU3dZ8fmc=",
    "pom": "sha256-LkpfRlmqrNsmlT0fQR7Co/pJWJuDyMsKfJakUYUh5Tg="
   },
+  "org/eclipse/jgit#org.eclipse.jgit/7.5.0.202512021534-r": {
+   "jar": "sha256-FZe8eKjYwBFpdtRqlIcqLMKGVnDrpNsLn1GBGzSTbXI=",
+   "pom": "sha256-bJVN/BDxwwG9uiXT1jCfd0eYBDY891VuUei7NxRVXGQ="
+  },
+  "org/eclipse/platform#org.eclipse.osgi/3.24.100": {
+   "jar": "sha256-0g+JIDBZb7wsJdoArNvSdQ93zv1oE2wzo+J5uJSYZ6g=",
+   "pom": "sha256-+U4i9QNmKcxz7AM41+C5wFx2g70TZ4wWa8p/fIfm+oE="
+  },
+  "org/gradle/toolchains#foojay-resolver/0.8.0": {
+   "jar": "sha256-+Q5pNRY46QueyYSOdZ0hhjWQfAklQRkRUAN7CyLlFAw=",
+   "module": "sha256-jDzPVNoHLGSkDgaIKqplIzbLKe7C6iMPBtaEOrs4TVE=",
+   "pom": "sha256-pxZyrK0MCu4576V1P1yU+aSjWh2sBl4ii8rDQt6nxUg="
+  },
+  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.8.0": {
+   "pom": "sha256-O2ciN72cwejoyobvWnkgpnj2nQTS9L+9DFouedRcXLU="
+  },
   "org/jetbrains#annotations/13.0": {
    "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
    "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
@@ -193,32 +272,51 @@
    "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=",
    "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.1.10": {
-   "jar": "sha256-XyrByo3Is3o/QxTnFtNpaevwInp1GB0yaZ0Kj2RbHCE=",
-   "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=",
-   "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8="
+  "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
+   "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
+   "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.2.0": {
+   "jar": "sha256-ZdEthaO4ZcFg25FHhRcSpksQ2t1osi7qIqlb+KhnDco=",
+   "module": "sha256-pbmP3NnbAX1ULhlyJdzuGNZYpW3h2yzEHhMZbWsXaaQ=",
+   "pom": "sha256-jDyCEAfBNBFVhzm589U4LrgVUds4lc/7iVYeVsD03BY="
+  },
+  "org/junit#junit-bom/5.13.4": {
+   "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
+   "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
   },
   "org/lz4#lz4-java/1.4.1": {
    "jar": "sha256-8O+lzhMY8OPnNPNSONrMRBxlEMtvP+5tHP0+uuFeK+8=",
    "pom": "sha256-Vig2NEoy0Fbmqt30mLSREhQfpAj0CQ71bIBnP+5ZgUs="
   },
+  "org/openrewrite#plugin/7.30.0": {
+   "jar": "sha256-4v2z9miIXAdDM+HpHKqASXp2RhGByp1phzLG8FaTovE=",
+   "module": "sha256-d+bO3jFBwbKyk4kZ+Fd/JJEe0umKtf8QGamIOJXKJFs=",
+   "pom": "sha256-GYrzCiJwhahrznKnoC8gNUwcgCw5JTV+3oVOftehrm8="
+  },
+  "org/openrewrite#rewrite-bom/8.79.0": {
+   "pom": "sha256-TUuYOjiEJuq35xusJeIPGD69dLHqXfjV1dXQDZlTR7c="
+  },
+  "org/openrewrite/rewrite#org.openrewrite.rewrite.gradle.plugin/7.30.0": {
+   "pom": "sha256-0ZPpn8TX2NnkohTmcJJ8/ovC3fl8mD+zUOflrs3Ww64="
+  },
   "org/slf4j#jcl-over-slf4j/1.7.32": {
    "jar": "sha256-YPO9pZIuORKInMoTEdGyJ3U2EL9gy05ekU6LLqoDJrQ=",
    "pom": "sha256-XxjqwsVFj/zEAkFWEMO3jkmQAhaL+OyP4u/h3lBqJ1Y="
   },
-  "org/slf4j#slf4j-api/1.7.30": {
-   "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ="
+  "org/slf4j#slf4j-api/2.0.17": {
+   "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
+   "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
   },
-  "org/slf4j#slf4j-api/1.7.32": {
-   "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=",
-   "pom": "sha256-ABzeWzxrqRBwQlz+ny5pXkrri8KQotTNllMRJ6skT+U="
-  },
-  "org/slf4j#slf4j-parent/1.7.30": {
-   "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U="
+  "org/slf4j#slf4j-bom/2.0.17": {
+   "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
   },
   "org/slf4j#slf4j-parent/1.7.32": {
    "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA="
   },
+  "org/slf4j#slf4j-parent/2.0.17": {
+   "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
+  },
   "org/sonatype/oss#oss-parent/5": {
    "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
   },
@@ -242,11 +340,22 @@
   "org/tmatesoft/svnkit#svnkit/1.10.6": {
    "jar": "sha256-xcp91U2EdvJDSxnpMwySbHbifT2bShAsJ8YXzYe25Sg=",
    "pom": "sha256-bjy3A/VSiur6i7sFRFPjm4YPk/02b9DaV7GEp9PM7Wg="
+  },
+  "org/tukaani#xz/1.9": {
+   "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
+   "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo="
   }
  },
  "https://repo.maven.apache.org/maven2": {
-  "com/fasterxml#oss-parent/56": {
-   "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA="
+  "biz/aQute/bnd#biz.aQute.bnd.annotation/7.1.0": {
+   "jar": "sha256-9pwt46aVwRPRJayAU8kqaAo86dAuolhFCVzy1GJqdmM=",
+   "pom": "sha256-WCLfSRg9+SK6Wa53Oi2Mzrhq4eIPQfGYcxMd0YJJT3o="
+  },
+  "com/fasterxml#oss-parent/43": {
+   "pom": "sha256-5VhcwcNwebLjgXqJl5RXNvFYgxhE1Z0OTTpFsnYR+SY="
+  },
+  "com/fasterxml#oss-parent/55": {
+   "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0="
   },
   "com/fasterxml#oss-parent/58": {
    "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
@@ -254,191 +363,359 @@
   "com/fasterxml#oss-parent/61": {
    "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
   },
-  "com/fasterxml/jackson#jackson-base/2.18.0": {
-   "pom": "sha256-EFZMv/uFf5BlqhG1hJqMMIw1NfD1PG9Muytvt7NQf5c="
+  "com/fasterxml#oss-parent/68": {
+   "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc="
+  },
+  "com/fasterxml#oss-parent/70": {
+   "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk="
+  },
+  "com/fasterxml#oss-parent/73": {
+   "pom": "sha256-SG2NomL0LJwA8+fP/xRxRzNHz8ae3X8GT8lxlN4p1m4="
+  },
+  "com/fasterxml#oss-parent/75": {
+   "pom": "sha256-/LvxwYyQR+aRfThPIGTiG0Klj8hfsFI6ni4BXv98YZ0="
   },
   "com/fasterxml/jackson#jackson-base/2.18.2": {
    "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo="
   },
-  "com/fasterxml/jackson#jackson-bom/2.16.0": {
-   "pom": "sha256-Wqooh0QFvwT7qOLFcVkieCRGG6b31VKr246NOgum+L8="
+  "com/fasterxml/jackson#jackson-base/2.19.1": {
+   "pom": "sha256-tzFwCGYicYqn1sGsCpSbZVD5vRSkRnLBo/K457doLhQ="
+  },
+  "com/fasterxml/jackson#jackson-base/2.21.1": {
+   "pom": "sha256-YNTrZqAAoz+jfny1HiVQ2r50Z6C4rGCAbX07qXKMzWQ="
+  },
+  "com/fasterxml/jackson#jackson-base/2.21.2": {
+   "pom": "sha256-OMeJjHY7iZH/+9dpRZly4Bdr8MUFxzlRjHD3xX0W7tc="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.13.4.20221013": {
+   "pom": "sha256-y2P4/5jHzL5THjdkviyR0nW4/P4pcs1nqn8KeBojmjY="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.17.1": {
+   "pom": "sha256-n0RhIo4SkQPu16MC3BABqy5Mgt086pFcKn27jMYe/SU="
   },
   "com/fasterxml/jackson#jackson-bom/2.17.2": {
    "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
   },
-  "com/fasterxml/jackson#jackson-bom/2.18.0": {
-   "pom": "sha256-ut3oZMpztsoE3p9+5J5knhpeivj4x8FoLHRr5eI0xYc="
-  },
-  "com/fasterxml/jackson#jackson-bom/2.18.1": {
-   "pom": "sha256-84SrzK8Mb712GDdi9yVv1nkBLtgdt/KiZofouWWgFKc="
-  },
   "com/fasterxml/jackson#jackson-bom/2.18.2": {
    "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs="
   },
-  "com/fasterxml/jackson#jackson-parent/2.16": {
-   "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs="
+  "com/fasterxml/jackson#jackson-bom/2.18.3": {
+   "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.19.1": {
+   "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.20.1": {
+   "pom": "sha256-DGRn7UyMc5JSTOcDymzj7YhZbuw5DxOwwmTy+WEwilQ="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.21.1": {
+   "pom": "sha256-jXx43eEPTQjnKWzvCEzzC3etzqejbiPRUgeT/exj/yg="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.21.2": {
+   "pom": "sha256-vGxUnmMpJ7udigraIMhGe1AH07eXx/XbA6m2DR3lm+M="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.13": {
+   "pom": "sha256-K7qJl4Fyrx7/y00UPQmSGj8wgspNzxIrHe2Yv1WyrVc="
   },
   "com/fasterxml/jackson#jackson-parent/2.17": {
    "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
   },
-  "com/fasterxml/jackson#jackson-parent/2.18": {
-   "pom": "sha256-Vp3ADWi05t993oVimeHANT+kC9rxI+DfVj7L7kFlhtk="
-  },
   "com/fasterxml/jackson#jackson-parent/2.18.1": {
    "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.18.0": {
-   "module": "sha256-DwmMCDBXb8nHVdQ9fzFuinV8k4ErNXdRJbNo/rzWA10=",
-   "pom": "sha256-pqA47zy3L8FXW5w4ZdpK2arX0COo1J3K0DeRBlVx6Bw="
+  "com/fasterxml/jackson#jackson-parent/2.19.2": {
+   "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.18.2": {
-   "jar": "sha256-WBvWEADvdkiUP3gcoFaJ5W0D9gUnSDZajis6m10/oy8=",
-   "module": "sha256-4Ruvm1NubflNqmNaEBPsPgabhmuOES3cKqBEahVQUNw=",
-   "pom": "sha256-CyvWlOqJJn7qSBJqilskplI0xkM4dULSRGnRlb+6HPg="
+  "com/fasterxml/jackson#jackson-parent/2.20": {
+   "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.21": {
+   "pom": "sha256-OFHfYn+utGiHuVYQRjC3Sou7X33iLpdM8VmC4g4Dc94="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.19.1": {
+   "module": "sha256-GpQP75txqcrROLbmRlagMsS82A2DieBXDbP478JMftA=",
+   "pom": "sha256-19pMaD48eSc1pvS2xxwEF0XisdcDWQNQq5rPSufzyy0="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.21": {
+   "jar": "sha256-U8oIX0oVD3A/SeGqvZNb0DtD4eo9VdE1Q4KSryLO9Ws=",
+   "module": "sha256-yuj/7OwzKLbsuxOOJ0IY8v4cdymg6CTaVZJogQCVrUQ=",
+   "pom": "sha256-ccrFOSFR4qUozJoJF58KM0F58FxS+OWWz1jd8Suyfys="
   },
   "com/fasterxml/jackson/core#jackson-core/2.18.2": {
-   "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=",
    "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=",
    "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.18.0": {
-   "module": "sha256-LEnsfnQwbUh/lVkbqJiQRhnDKi4/0bWG+z5jIskaTmI=",
-   "pom": "sha256-+Mn0Od1EsdAkLWbmlB2pfFe6hONANu7peqHDr/vxugQ="
+  "com/fasterxml/jackson/core#jackson-core/2.19.1": {
+   "module": "sha256-SZrw5ZPg0uFL2SnjRJnXIqbtT0KxsJ4inrzUgCzsF60=",
+   "pom": "sha256-Ciaizbd+H4G9km0juNWGw5XPPYiRkyrXA3D9RhtIfRo="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.18.2": {
-   "jar": "sha256-SzZOaFDciRcvzx1N0muP9UiO2kT/RlfiLdJlID3Vqzw=",
-   "module": "sha256-jH2sL3J4GNiEeoKqTqxrAXTXnPBN+Q3iJGBy5t005wA=",
-   "pom": "sha256-STo9tkR7eo7Ls3JCNMbOZ31y20sE9roAjw6+rqe+Wp0="
+  "com/fasterxml/jackson/core#jackson-core/2.21.1": {
+   "jar": "sha256-Ht1fLkncpfjkUZlXwkt7MFC9HH7og5INozz/Ax/x98A=",
+   "module": "sha256-hP6s5gpMeONzf505lQh56H3rfrhw7P6UmjJFC5V3gv0=",
+   "pom": "sha256-Dz+1656JcESawMuY4vjntRPS1OxbGk8C4id45Pe6uNc="
+  },
+  "com/fasterxml/jackson/core#jackson-core/2.21.2": {
+   "jar": "sha256-EuhlWxACZ7RNDxTQGx9QgqUQXmFhdNxDB74adh6SQHs=",
+   "module": "sha256-mO7k69IcgrUmtDiIjgOta245Zvxucizk433UWQ0+Sic=",
+   "pom": "sha256-urDlWZZJzLWrIanPnS5XGS3h5I5tI1JNwlPWL8c8ljQ="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.19.1": {
+   "module": "sha256-XvVBTiXAofGXClB66vPoH8vMELeV2/fz8sO74iL0STw=",
+   "pom": "sha256-0FgUkLOlW0piD5Dx88rShW5vLYEOTntMrvCANYU5qMA="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.21.1": {
+   "jar": "sha256-sBHrUgLZ7IieJ/HcvfbGPwanbnoWwKGzDGBI1VbJoo4=",
+   "module": "sha256-N6LHDjuXdNyGqlnQamQn5d51nuOA5m2VK+NLIse5tbM=",
+   "pom": "sha256-vUgX0LkXlK/29LEWtXa/7ckne+LWxlHJVm9VIiLGpVA="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.21.2": {
+   "jar": "sha256-jJgvAfFI2AXwqqwjOQESRHV+DffG/4lR8vo/QzuO2Ek=",
+   "module": "sha256-qODdfyv9PgmoyLc0nGEFb96cuGL4ZOvG8jGT5fYIXzg=",
+   "pom": "sha256-z44OzcNfAtoG4n9BV2ALqddknFJy5Na3le8qQvBwomI="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-csv/2.21.2": {
+   "jar": "sha256-aC+MeXfgKkJ0hCa/VJRuMuUuL4C4S2ZCgBqxK9VBNoo=",
+   "module": "sha256-1NZFR8dJevtT0mKa/YFxTXJYnEVp8JRu77aAqKeCDwM=",
+   "pom": "sha256-qJCcwZdmVy1tQ9qUzxOZs8EBXRJqCvW4L4UYAbyzKKA="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-smile/2.21.2": {
+   "jar": "sha256-/XTGurbdotvIm6t1vlEIhLiTQO5CKithTCzw3N8jyHA=",
+   "module": "sha256-907nDdAZtSy3ORIZLQ40ZdOxxdZwNpv0ljP+QKXoSCE=",
+   "pom": "sha256-0JdO3yEFFI9YxnYcGvXpVpZxSHuqZVqyqtSUuTBq9ow="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.21.2": {
+   "jar": "sha256-GCefSfcvq94DCpGrzg0rpd0msHejbT7RmCGOSI0tfW4=",
+   "module": "sha256-3m9iVDZj2qRIXGbT4PW8xX+tt7aIMcpemHh253Sd/Mw=",
+   "pom": "sha256-OnUdOjyurrLjxdCkAzWx8em5tR5OG7usgEGJUxI9Oxc="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.21.1": {
+   "jar": "sha256-XJT6VdS5O9Tqmsbyz0ko/1CCLRxD5SHnFdOr8jAxoG0=",
+   "module": "sha256-bNi1yDkDQ3xcbsxUInLMK/FZU518pwTxMUEzFhRyiFk=",
+   "pom": "sha256-6tuelFBSKzAEqh14/1aYG9Ds/QV2hq1hLR4oH0145nA="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.21.2": {
+   "jar": "sha256-0lVRgS+gwU83yrqpQB5j6tzqQs42MRGDr1Yi1byKG8c=",
+   "module": "sha256-Nbv6GN5I02+t9tOAcCICiJ27gVOEFFHTiTs/tZhUkCQ=",
+   "pom": "sha256-sUrUxGmsJiW4G4TTD/2hSKF0QiUI+DfHIbgIDfqfkYI="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.21.2": {
+   "pom": "sha256-L7RDvIodHK0qXwJt8yz32s3VelVaVC/C5D8PMzC62G0="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.21.1": {
+   "pom": "sha256-/Evp2+ObbeFuOX8OT27t3OgZYwU4ls/q1cXGbhvx/w0="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.21.2": {
+   "pom": "sha256-Z6nrQDTygtv09Ht5iBKUG+OJxgFLCdz02MJMp42fPpU="
+  },
+  "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.21.2": {
+   "jar": "sha256-5YG78/xWItFrVzZt1B4Q/FaSH7ICh53i70h/h92bMOc=",
+   "module": "sha256-MkCHqNbUxkhBqe1R7t3lhw8xQnR2wG1QGxTWcRjSZb4=",
+   "pom": "sha256-kS6F4iGHClCQbJcISkQrJTwJfpbZ8y/Xwk7/XOyAxCs="
   },
   "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": {
-   "jar": "sha256-4tIC1GBuI66vilqWMtsG9f79W2PSUcP1A/n6qnhTDlw=",
    "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=",
    "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc="
   },
-  "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.18.0": {
-   "module": "sha256-6aQaUS6VsgUzABoREWCbYDP6M+h3km8gZkXy1PiOBes=",
-   "pom": "sha256-nKcuS5p/JlhHVuYubVJUywo0KvdNvJ5hguPWAUsgUb4="
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.21.1": {
+   "jar": "sha256-TWM3iwprU3M/CG69MBAjuiEbk4fkF71YSlQAMgzQi40=",
+   "module": "sha256-gl9IVd1UnY/LbS6pPZd6kdBfjF+70xV/P0P9Iyi7dh4=",
+   "pom": "sha256-dMXOjKDqCO8xnVps5iQk39nLk9rcAe+YF4c/t/Zpm64="
   },
-  "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.18.2": {
-   "jar": "sha256-Uxa1ItppOIvIt1Yigw7QEtXsVJFDxaQ5EDqRJFsio/8=",
-   "module": "sha256-Q5AJmjK1DI3v2vTMNAx0gWEG843VdsPZWkq3ykUez0M=",
-   "pom": "sha256-mVJ0ggsVcllY1Rr9xj4gCf9DCg4+9J8eT/kv0+YjZKg="
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.21.2": {
+   "jar": "sha256-oIPVfNHEoo/vzGvQcXQHeet/wcIqPBtARRtUd8RD8C8=",
+   "module": "sha256-OWVxUJp9tlv6x3emWatjRdujgYbax/yrWuizVVOYy94=",
+   "pom": "sha256-0Fd4iCjfgV6Y4BjJsAQBoR4boyctNNmEdqc2rG2X734="
   },
-  "com/fasterxml/jackson/module#jackson-modules-base/2.18.0": {
-   "pom": "sha256-vtjbLqeIGzWwOA9V+67R1Wv+P9o6AmB0Ww9dXqzteyk="
+  "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-base/2.21.1": {
+   "jar": "sha256-GNeO1QQ1YV1xwW4VbtCNBDd2CCll2gu+uPeJhmNMZmU=",
+   "module": "sha256-pwoRJRh7vGtL74iGcyNM8Kk5S52p4j5JUFq1MwmimMA=",
+   "pom": "sha256-IgwXgQsW98q8xmLziifwpy1v/355fz4piMXuby4A4/s="
   },
-  "com/fasterxml/jackson/module#jackson-modules-base/2.18.2": {
-   "pom": "sha256-wVCoPSPNizMiqqSYmEh0J5vi3I1f4qN5B9P1arYOJpw="
+  "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-json-provider/2.21.1": {
+   "jar": "sha256-q3oa8ekmH0mDVveOkPOdoo/1eeaq3nEKFgw1YSLtNWM=",
+   "module": "sha256-31frV4bwHW62Q4LYNR3pPhyUeTeXrQoe03L1d/wJOo8=",
+   "pom": "sha256-ftRXL7MBHucfe+CJ3DB0qdAulgO+/A1yo3/5+y4nN4g="
+  },
+  "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-providers/2.21.1": {
+   "pom": "sha256-Ewlc9+HBs0sffD7J/GMpMcRDxzA0nfUZrlr2NKmctk8="
+  },
+  "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.19.1": {
+   "module": "sha256-hG4dNpaScxDoCFyMS4q7MnZktflKTJkW2k39jUklj/c=",
+   "pom": "sha256-CnvXqaEln/hnJ4V6SZU8zv4uXQeSjijpbOfaDddt7Ss="
+  },
+  "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.21.1": {
+   "jar": "sha256-2Fn8VKVFeFIfq4dYFekMT7k9VHrxwwMR2tXrc2PkqDc=",
+   "module": "sha256-xnHMp9cRoWljA1jXcmFmjPuJxGzX3K+IP47eSNMnsSY=",
+   "pom": "sha256-UOyLNTE2r51JEYqXWo8iaGQVvokHlwtjOnWdE5lpthY="
+  },
+  "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.21.2": {
+   "jar": "sha256-4M8Wro+JsWcwzixWCR8ZVoL6EDaILACJpUnVTzpty2c=",
+   "module": "sha256-GaK/MxNsW2gpKueprtbrzJ1bOFJrQPcNk600SApQ6DI=",
+   "pom": "sha256-/hzkIDxzyvb9TJpVo/vdmWAQGHSxdB3V/uRkN7jJdPc="
+  },
+  "com/fasterxml/jackson/module#jackson-module-parameter-names/2.21.2": {
+   "jar": "sha256-HxxESb3hd3jp6FcWZzY5I0J7EIYiYip9IyBqRlWGhk4=",
+   "module": "sha256-/ZJM7XMPpGmVonQ/4+vrH4Crcs+Ae1biPbXVIY5WgMo=",
+   "pom": "sha256-LM1FHM3zlG4bcxD0QsQXdhAyD+rOHMk762rqO+/3Zrw="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-base/2.19.1": {
+   "pom": "sha256-uyZ0KcR5L6jp8JcSsoxGbRtN5eIBrOXih8ET+KaWM0Y="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-base/2.21.1": {
+   "pom": "sha256-ITty+ZmSZYCcgOT4qIzt3H6PTPyx0GaKbGlQDe7rxZE="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-base/2.21.2": {
+   "pom": "sha256-qVLG+eo23+odRjGC1fBqdFLbZ1Hcso/BrdN0ir/6WN4="
   },
   "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": {
    "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY="
   },
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.21.1": {
+   "pom": "sha256-gN/cby92+kwGXhHcdFMaAkRyRfFBWzoScCgf/NjJK1o="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.21.2": {
+   "pom": "sha256-T0KMISebw0vUTVHCeWdB53r9f523/0qTGkPHsBocRZU="
+  },
+  "com/fasterxml/woodstox#woodstox-core/7.1.1": {
+   "jar": "sha256-ArnQIunUdwT/inqFmg2/07KIKoMR63/x4YD3YMzaJxI=",
+   "pom": "sha256-r7XLRdQcH542dZCd5P7yQr3BzqRHagY0riD016VEM/8="
+  },
+  "com/github/ben-manes/caffeine#caffeine/2.9.3": {
+   "jar": "sha256-Hgp7vvHdeRZTFD8/BdDkiZNL9UgeWKh8nmGc1Gtocps=",
+   "module": "sha256-J9/TStZlaZDTxzF2NEsJkfLIJwn6swcJs93qj6MAMHA=",
+   "pom": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w="
+  },
+  "com/github/spotbugs#spotbugs-annotations/4.8.6": {
+   "jar": "sha256-RUi3SoFe1E9UgMpPBiBKiwCAncfl9qglqe3xj0A3e2U=",
+   "module": "sha256-2ye9p0GFWoGc1Q6dYSMMQv4qoqZEuU1zMTwFIXrgUjk=",
+   "pom": "sha256-3U71+ubjJmCxUtecvHW8uuM0JWxX3ID8TfDhdhWZRWI="
+  },
   "com/google/android#annotations/4.1.1.4": {
    "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=",
    "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng="
   },
-  "com/google/api#api-common/2.46.1": {
-   "jar": "sha256-ixHh4eQnAsuAlI58piqeBt34L+V6Gc1o+VSOrIDzkHE=",
-   "pom": "sha256-diOqbWZj9b9KnOJx+AVT3egdBjLw8SrzXMU6TOSpg80="
+  "com/google/api#api-common/2.53.0": {
+   "pom": "sha256-hfEZR5sbUaSepG31tUNS/Yy4/o/48Q+hmjrpqFebYjs="
   },
-  "com/google/api#gapic-generator-java-bom/2.55.1": {
-   "pom": "sha256-BO/rnxxRucOvI11DoVJthjo4OMGxzZbOptT86SqGu90="
+  "com/google/api#api-common/2.60.0": {
+   "jar": "sha256-Fui9VnoKzr1inhvJu5jVKupuh2VPShxPO7wlq6nbVLk=",
+   "pom": "sha256-DN6oxzgQsfScg2Fj9MLXT53ryqUCaU7To7nYJG9htho="
   },
-  "com/google/api#gapic-generator-java-pom-parent/2.55.1": {
-   "pom": "sha256-vxonIudPxkgBrU+9YGbBPeIt75ceMItgInkJaYXCFkw="
+  "com/google/api#gapic-generator-java-bom/2.69.0": {
+   "pom": "sha256-fvGZScqfnfDdOnxCfZHEdZTc3wS7kUkSAn9QhAWPS9I="
   },
-  "com/google/api#gax-bom/2.63.1": {
-   "pom": "sha256-WiT34MEyGsJaFWb3fR8nUqq3YXoTJNhPBTpwp8FEJXo="
+  "com/google/api#gapic-generator-java-pom-parent/2.62.0": {
+   "pom": "sha256-hX4La1G+GTsAmdgkaHw4PEkrDHiELBL+BF6yssnw+oo="
   },
-  "com/google/api#gax-grpc/2.63.1": {
-   "jar": "sha256-T4VZlSQGjc1UMf7aFykW365iLh5gWgeShTOmnZErNns=",
-   "pom": "sha256-QP43LcIR3jaZfeP9HLl98mx8C23vaf0+QGmIEKWoSkw="
+  "com/google/api#gapic-generator-java-pom-parent/2.68.0": {
+   "pom": "sha256-D1bAtMafTl8YdzuhUj12p3jYALXOoAEWi5o5CZHzQRM="
   },
-  "com/google/api#gax-httpjson/2.63.1": {
-   "jar": "sha256-KR5gb1PqAh/yW1dHvC40e59uJyhfqkgjnWdi/iUVtg0=",
-   "pom": "sha256-NjoT74bUoElJRajKhTDGUuMsejAaOOT9yw5UfsgNhU4="
+  "com/google/api#gapic-generator-java-pom-parent/2.69.0": {
+   "pom": "sha256-FAcQvP99LntqRIlJ0Vu+nM6xin55Wk+bBRQts6+3FYs="
   },
-  "com/google/api#gax-parent/2.63.1": {
-   "pom": "sha256-hD9mtfE8ZlZCkIrUAeHeRa9vtIye8ben8aJ3SEp4UTs="
+  "com/google/api#gax-bom/2.77.0": {
+   "pom": "sha256-I72S5y9hdMMwu9oZjPZAP5ebzICTOTxwd4H2T0LRvck="
   },
-  "com/google/api#gax/2.63.1": {
-   "jar": "sha256-JnUkE/drg5Hazv/0DbhnwdM9C/Y9MpVN4+m7dM3LhWg=",
-   "pom": "sha256-32FUy5HAC1OIU47+47lF5EQ20D/2FrPx5qOex8OXcRM="
+  "com/google/api#gax-grpc/2.76.0": {
+   "jar": "sha256-VBeaybFA8YD9no1ZRp4qwRVRF7g/8KJitbbYj3Fx2+E=",
+   "pom": "sha256-TcasWzKzooq871yIC8zWl4ttBldgVWAxiS+s2YYH9F0="
   },
-  "com/google/api-client#google-api-client-appengine/2.7.2": {
-   "jar": "sha256-zDXdQfCMWsgR8kO1Qowxnfes1ivvpk3f8cfYBW6U0LM=",
-   "pom": "sha256-NImEhTIALS3l1ztR1lN1flXmcP0u+H4sQam3BzpGA0U="
+  "com/google/api#gax-httpjson/2.77.0": {
+   "jar": "sha256-97halRJ+ufjtAf9WgCSzdpmk7r4ttmS1vOfZJSrXJeQ=",
+   "pom": "sha256-qpODjjC+GBsAwFKxsWZ6Vq2hXZwCMzmpy6PIYWhiICA="
+  },
+  "com/google/api#gax-parent/2.76.0": {
+   "pom": "sha256-PSjTgpd0Eu/SpNxlSLUchFWrXrFmalXi66hEKh9L6/0="
+  },
+  "com/google/api#gax-parent/2.77.0": {
+   "pom": "sha256-90m6PHvk30/PfAis7+TE9FTQRjqV+0m3PQv/AmOJ264="
+  },
+  "com/google/api#gax/2.77.0": {
+   "jar": "sha256-O01bkMTujI10ca7gftbBo/x9yl6nDAZ02bGgnxwKj40=",
+   "pom": "sha256-5N8dn2b38/DLa/Tn/dkqps+n9clIYAMmlibLxqQDsyQ="
+  },
+  "com/google/api-client#google-api-client-appengine/2.9.0": {
+   "jar": "sha256-oidSwvRJQqzJB5yoe6Ng4rxBTgVLJoxTm1aVNlEqagY=",
+   "pom": "sha256-vdYkuedmWPH6e2BzGZKSZaq3pgdR2MPfpXaCH9bQDwg="
   },
   "com/google/api-client#google-api-client-bom/2.7.2": {
    "pom": "sha256-o5uDySbr9qL5GIOI3FQpvHQcs90QFld1UyBnGD99M6w="
   },
-  "com/google/api-client#google-api-client-parent/2.7.2": {
-   "pom": "sha256-c4/ewj9isT6dL6Iv8l/LWHyphMWNzKGxWQNL02ibtJM="
+  "com/google/api-client#google-api-client-parent/2.9.0": {
+   "pom": "sha256-GwDMzYhN83uJVRy21pT2fqfLFAGCO6cODssVekUeQ9E="
   },
-  "com/google/api-client#google-api-client-servlet/2.7.2": {
-   "jar": "sha256-TP3FNHiCCDCKEVS/eIhEpFtjeCatoDyGe68VppbnoGY=",
-   "pom": "sha256-3kO6r7e2VXzv4QZoPL7Tc9LPkWeaqo8lsMPzfhpdMPM="
+  "com/google/api-client#google-api-client-servlet/2.9.0": {
+   "jar": "sha256-+1yonbgyH9gRAGaH4XaNO1wnqZz8xGlxjtF0+E6arjg=",
+   "pom": "sha256-VPvrR2K9OlsSX4CZK7uJ1KNgWmuOLLDl4vhh7+r5rxw="
   },
-  "com/google/api-client#google-api-client/2.7.2": {
-   "jar": "sha256-Y7dUt8SpI0fEmSxC0pWBL40u1rnodD7bpKjJi5Lpyps=",
-   "pom": "sha256-PNpCXKfxGpP1wEL2Y3araUAi8orbRfPTXpXhFev9xmk="
+  "com/google/api-client#google-api-client/2.9.0": {
+   "jar": "sha256-RhN3pckE6OTgCRzRtHUrye9YtyI9YIiG2WQkNtSyEnM=",
+   "pom": "sha256-26WuIKcu/3kVtBkdrj29yL9Ou6wBwt0q2AjsCgjiIW8="
   },
-  "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1/3.12.0": {
-   "jar": "sha256-TeYjr/KUthTM8isfrYiNnaWi2SSEqGCbBXGdLZI9Ebs=",
-   "pom": "sha256-9FjoYv0EZ4D7fPBFmkg4bvgG/JMz6uFneUjsJS8f6sk="
+  "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1/3.24.0": {
+   "jar": "sha256-dOQRW1GPuYY8a+MVJbVhhJQCeUPEnb41M9aAPqLFNcc=",
+   "pom": "sha256-gg10ZOX+cXH70b2Au650Sc+OfKcwYIP3r4g2yIQtiNI="
   },
-  "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta1/0.184.0": {
-   "jar": "sha256-oWqch+T3QhiuKftsfA5qCyelBoPsK/f2v7aHpHgRKnk=",
-   "pom": "sha256-YYXOpFNpP/ZfWvQsr46Ft1FRINP3FxNX7IleumIDfzs="
+  "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta1/0.196.0": {
+   "jar": "sha256-FfbELK2uoonFCv4bfWZxgSCEn2vtNQ3O5sOS3eKj+xo=",
+   "pom": "sha256-JSipv5qEcnLOCQqGbUS9Ijg1+2r8ENhkmQ8WcSbN9fw="
   },
-  "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta2/0.184.0": {
-   "jar": "sha256-9ybriUXUX6NYRG0fBGoGHjNo4IWEU2HlsEPov4s2HC8=",
-   "pom": "sha256-1titj8csyJAh+xauBP2dd/icU84JnhB6mExO4RdKn9o="
+  "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta2/0.196.0": {
+   "jar": "sha256-cQjqqkKe31BEORrVbbtgkgqYJnPRxLI3Pz74SM37j60=",
+   "pom": "sha256-9xoeUskTqUGWrzphmrsabCUDRsa/E5hI6JQsEruA8nI="
   },
-  "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1/3.12.0": {
-   "jar": "sha256-55/y9F22mVJWYJdaTwTvb4sa/2OTJxDta6yh84FVmRc=",
-   "pom": "sha256-s3ruiW6Bcc2wFOyzDvCiirPm3Bxxry5Pkjujf8SsdUY="
+  "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1/3.24.0": {
+   "jar": "sha256-5s6IZXQc+mu55BXPCijqMZgPoSJsj9bC5PUyhRTfChw=",
+   "pom": "sha256-UoCw1jbOp8sF2qFnLdXXa4kKl9aIEa1JZVqVPc1gg+g="
   },
-  "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1alpha/3.12.0": {
-   "jar": "sha256-Q54YMAQ/sJJN62Wy7EGPQ5lUyFpL9P13sNGIyXBZvfc=",
-   "pom": "sha256-nrKJAXyemoNJFyNaEEeGVhhEK9uNgrtrFGDrxkH6agI="
+  "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1alpha/3.24.0": {
+   "jar": "sha256-fa2TzXqORh8Xv8y+qfSNOpW+WF3oJn286DdUdjCQBEg=",
+   "pom": "sha256-ZPJuXJWR6lomBVO0It6Mvlr2wjP16+/Ulg7r1oMt81M="
   },
-  "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta1/0.184.0": {
-   "jar": "sha256-hjnMViPkBW/0ipHzW5T2Y7uaJzZvHHoUw4ocSLjvLhc=",
-   "pom": "sha256-qVoVE1VebLER1lCIiEWSzMGT9FZVztBSdSJhOyxVXrg="
+  "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta/3.24.0": {
+   "jar": "sha256-bDre0zkVVlo3zNsE6dkD4sv8c0NoFndVZ3bwTdZbW3I=",
+   "pom": "sha256-iFXjzbHhSbblytuf/xi3BSeZ1bSW92E2WiM19cR8cXs="
   },
-  "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta2/0.184.0": {
-   "jar": "sha256-krDF/jrUOvGTUnmUocLarL5dmCFuVpKsd2K+Xlpen/Q=",
-   "pom": "sha256-lc3/5aWp/y9pn/ztNIlx7oL1Yd8ZRkJDTd0kfflRQ+o="
+  "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta1/0.196.0": {
+   "jar": "sha256-MjW2c0CjMLd8w4Acf1IN0zaJJ/aUwXe3nGDQOOFLm8Y=",
+   "pom": "sha256-Tcof1FGo3sMOhs/sbWS0FbI/PI+zPhQ590OQU4GxwrU="
   },
-  "com/google/api/grpc#proto-google-common-protos/2.54.1": {
-   "jar": "sha256-L8/yX+ipD8rLFGqQAiLEl7oKmlMSceaxNadkUNI7HvI=",
-   "pom": "sha256-fzVVVf/csSv1/lfvkDxV1lAocME49lH+0HbNT3B7IJ0="
+  "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta2/0.196.0": {
+   "jar": "sha256-WT+3nLtlmcvpLoP4LQImmK1qNsWfGE6Q4ftUgE4D1qY=",
+   "pom": "sha256-vT8/PXZcgi1ywTWPxQSSSwne7f4UwCHH7EuReuEGogI="
   },
-  "com/google/api/grpc#proto-google-iam-v1/1.49.1": {
-   "jar": "sha256-E478oqzdcbykEzcxp/jmGcj6aoWFkBq/Lio1cANTynQ=",
-   "pom": "sha256-rk1N8JaymJnfM9B8QmnxmqyTUkPbcffMuh2V6nXIHcA="
+  "com/google/api/grpc#proto-google-common-protos/2.68.0": {
+   "jar": "sha256-paz0BTjotCRm135dTascvSZgXbUo5o0mp1A4oEJYisk=",
+   "pom": "sha256-7efrX70fhsVAcp0V9Oj8GgfvO/kEplZWkL8j20iQTcc="
   },
-  "com/google/apis#google-api-services-bigquery/v2-rev20250313-2.0.0": {
-   "jar": "sha256-jmWTYcp9BugyGRlQoWgYjnpV4AqqWnKEjCkIjYQ2el4=",
-   "pom": "sha256-gyPxaKdgRPhvs6lf5oXqnMcVANZqzHPplv72SXcau10="
+  "com/google/api/grpc#proto-google-iam-v1/1.63.0": {
+   "jar": "sha256-DsGwnStfjC1aZYZUD5889zUe/QfApGROoptIeL2AS6g=",
+   "pom": "sha256-XJuXk4Hy8YINdy3dBpzUC/1LJk0SciOGFgXMFJqx2YU="
+  },
+  "com/google/apis#google-api-services-bigquery/v2-rev20251012-2.0.0": {
+   "jar": "sha256-qy5pb1JteP0tlYFTO9VXzCxVoPX95HYi6PFYzA1dVD8=",
+   "pom": "sha256-svHdJJ9ucY98IWJ1QcintgHUQEeQRDwcz+nlLLlDwQg="
+  },
+  "com/google/apis#google-api-services-sheets/v4-rev20260213-2.0.0": {
+   "jar": "sha256-riPMDgwoIeUm7aaQCRkULe+B7PhT2ol0vPT2prGwNhI=",
+   "pom": "sha256-u5KbBQw61tc0h9NadIjODUrpVhRFkqPbNuxTfcC2njU="
   },
   "com/google/auth#google-auth-library-bom/1.30.0": {
    "pom": "sha256-mSCzPghCOTmuWu2116O+wBWYvyZkSti6bnul2ov3ajY="
   },
-  "com/google/auth#google-auth-library-bom/1.33.1": {
-   "pom": "sha256-DWWi+qKz3r8WdvFTRyOLPWiKFauUnz1J9UshC5vup+I="
+  "com/google/auth#google-auth-library-bom/1.43.0": {
+   "pom": "sha256-BpV9Cbcr5c5mX024kz4gVrhZfPHqhzp85ucqQdae7bY="
   },
-  "com/google/auth#google-auth-library-credentials/1.33.1": {
-   "jar": "sha256-M2fWJ8X00fowejxv+V21ate2Ea5Eg/4h1yh3+gN/8SU=",
-   "pom": "sha256-1L+g1iarHEiwAgUbhk3+WC7hp3JwfmV/2KshSuouniM="
+  "com/google/auth#google-auth-library-credentials/1.43.0": {
+   "jar": "sha256-cjIopfDIKdXFEXkQ0bHsCvqJgwU+tNagjiNyH2Itqgo=",
+   "pom": "sha256-n9D8K4pGu21rferY2a47n4B3CrhwZbYd9m1nolq89UI="
   },
-  "com/google/auth#google-auth-library-oauth2-http/1.33.1": {
-   "jar": "sha256-anLsK7I1DKGXABnjiNAICBNuTaLjApbp2MNG44ULDqo=",
-   "pom": "sha256-36m2t54T9RzuazU8HJK2z2W4X/JTYOjRql4o7O2pB9c="
+  "com/google/auth#google-auth-library-oauth2-http/1.43.0": {
+   "jar": "sha256-sgERNyfulhWt2XlGSx+Rg07QkMVl9aJvaYCMAW6CBhs=",
+   "pom": "sha256-UiYXgf6mXrd42a/6rEg8+C1zR3oFpDh0Patt0L/ytao="
   },
-  "com/google/auth#google-auth-library-parent/1.33.1": {
-   "pom": "sha256-rDpyUAgfZYd11n6eEQqOUmeB2I+7iNuktHkstH02Yg0="
+  "com/google/auth#google-auth-library-parent/1.43.0": {
+   "pom": "sha256-UqhTnueVTmnDfoM0435+vVvoXcNBISkBmWdAG3zbXJM="
   },
   "com/google/auto/value#auto-value-annotations/1.11.0": {
    "jar": "sha256-WgVc5CVTM7M0bhqHA9pb+P8ElTIob9zTFxLWJKvhEd0=",
@@ -447,90 +724,102 @@
   "com/google/auto/value#auto-value-parent/1.11.0": {
    "pom": "sha256-Wg0dcYVS6KRdzOASjRtrliP6lxqCzSRXUyM7pyCMsp0="
   },
-  "com/google/auto/value#auto-value/1.11.0": {
-   "jar": "sha256-qvjWN7/tPEIENrn6zxt6iNEsh4U3TkICOCeDAFMZwsM=",
-   "pom": "sha256-Gl3C8igShj2zDdO669qWFq7Ql6Ggo+HkYi+dgFEuIWc="
+  "com/google/cloud#first-party-dependencies/3.59.0": {
+   "pom": "sha256-0O+WEzt6pDL+mz/lEUmpP5PlGTS0x9kH7OVf250fehU="
   },
-  "com/google/cloud#first-party-dependencies/3.45.1": {
-   "pom": "sha256-6/JeHVfkUxklQ268l14Mug2NI70W4qGBsD8Ne8GBa5U="
+  "com/google/cloud#google-cloud-bigquery/2.62.0": {
+   "jar": "sha256-WNSk98/jMECOjgvTomPFNSm7e+prjGTX84oVduwQHF0=",
+   "pom": "sha256-NFJ5tvyGoJNyNpNRvY6oKcLgJ6w9CkH/yFgK/guLBfk="
   },
-  "com/google/cloud#google-cloud-bigquery/2.49.0": {
-   "jar": "sha256-/Xft/YhbdWtM0PnuD5nLsyJeGmmH4D/Pd9iQwQmLjI0=",
-   "pom": "sha256-MtwV0Y4nNfyKvZIs0ROk3dF20gZ7ovYtngjo/gs3tWU="
+  "com/google/cloud#google-cloud-bigquerystorage/3.24.0": {
+   "jar": "sha256-GT96MwCionOBWnky75a0uM0NGxEwQ9FV+3+ljR3fw+Y=",
+   "pom": "sha256-o8MZpm1hvd1A9qwyBKByhOzG+dwyyoVB5E3NYXG3tx4="
   },
-  "com/google/cloud#google-cloud-bigquerystorage/3.12.0": {
-   "jar": "sha256-V3PGmXAFLX/v7olB5E7Ovbx708tzjKaN0zjEUh1nD34=",
-   "pom": "sha256-RJZxHGylJlVp1rJuzqtJnRIucQKvRSofgE3jxIxKBOM="
+  "com/google/cloud#google-cloud-core-bom/2.67.0": {
+   "pom": "sha256-8UUcUqGRhgNt3yT47PvW+yWV6gChcirkyHsIShAAcg4="
   },
-  "com/google/cloud#google-cloud-core-bom/2.53.1": {
-   "pom": "sha256-3Fg9b8fIPxu4ZzBD6FF3leW5OShxdJLNYo2DYP2mvBs="
+  "com/google/cloud#google-cloud-core-http/2.67.0": {
+   "jar": "sha256-dvIjl6JLzaiB3pbkraOfHcEaPVZq8uuISMn7UF35jD4=",
+   "pom": "sha256-DNCVPPNJM6P/NAiV+JM6cyxy0tJ1gmMiAU4lIIQIY4k="
   },
-  "com/google/cloud#google-cloud-core-http/2.53.1": {
-   "jar": "sha256-yew4ILjxfKUAXmCLnwAsBJRnzMiIyGpU9E3fHrWulQY=",
-   "pom": "sha256-ucfOXO4BQlInn0OeTeLI9GieVNxQp8kSjPk6yM2g3Vo="
+  "com/google/cloud#google-cloud-core-parent/2.67.0": {
+   "pom": "sha256-7Ty1F+H/N+vmRGttsF9rLKsFokZNyjHeYN93i+f4ZwI="
   },
-  "com/google/cloud#google-cloud-core-parent/2.53.1": {
-   "pom": "sha256-+jVVS2/ZAnNaLxeRx0sFnBlo27UAZxiUXlb+Zk6ApoM="
+  "com/google/cloud#google-cloud-core/2.67.0": {
+   "jar": "sha256-M+TYVCF1Sv8g69q0Nnh1AgMuo9QqDNA6zZ9QpzfkE98=",
+   "pom": "sha256-Y2TwLSZB2Qyjg+5qhbWszq4hr6duVuxEVse6oEqQskM="
   },
-  "com/google/cloud#google-cloud-core/2.53.1": {
-   "jar": "sha256-WOAI8RmnqvaNLRP1MOmX22eXt6qnDgjFY0IWJ77TgrA=",
-   "pom": "sha256-kkCD7+kGOFNOMW8n4hgeX68rouWH0tL5UoprxsxWtvk="
+  "com/google/cloud#google-cloud-shared-config/1.16.1": {
+   "pom": "sha256-MXT7SNiJF6VCBog/zIecRqBBWXJ3Zu240qdJ0SCnnuc="
   },
-  "com/google/cloud#google-cloud-shared-config/1.14.4": {
-   "pom": "sha256-JdZSrtqJZR9/vqORqMDzoYkOmDLx166FkTowtVHUYg8="
+  "com/google/cloud#google-cloud-shared-config/1.17.0": {
+   "pom": "sha256-G6+ucuK+eVDVlWs5OFy5Z7I64enW9S8opGpfpEsvg7A="
   },
-  "com/google/cloud#google-cloud-shared-config/1.15.0": {
-   "pom": "sha256-6drXGU9AdIgPYjR+/Q1MtfIw8migajTVwdPE6hmLVIs="
+  "com/google/cloud#google-cloud-shared-dependencies/3.59.0": {
+   "pom": "sha256-4S5qub2bNcfGB+d6cw/WVGeXFTZXdPPKGWO/TnR9fq8="
   },
-  "com/google/cloud#google-cloud-shared-dependencies/3.45.1": {
-   "pom": "sha256-IwAFTjzkYszJStSakFJS52e49huMtnM/MK/bfFylvAI="
+  "com/google/cloud#native-image-shared-config/1.16.0": {
+   "pom": "sha256-oC9dmGuHE9zoAhed38jE3fhUhpEs2ygKmLKmB0KEbiY="
   },
-  "com/google/cloud#native-image-shared-config/1.12.0": {
-   "pom": "sha256-aIc9CD0SZ5QfqWL2PWc5SzXp1Ayv/0FPLmK0N7S3Yo8="
+  "com/google/cloud#native-image-shared-config/1.16.1": {
+   "pom": "sha256-QN9I9Uh8R7+4ROOiTUomQTA/I45yHXU/Ag2WnyteQYc="
   },
-  "com/google/cloud#native-image-shared-config/1.14.0": {
-   "pom": "sha256-hYFgPADWXFCDAU1tpnUm9pM/ihoB8GHUqTgzA6IpOl4="
+  "com/google/cloud#native-image-shared-config/1.17.0": {
+   "pom": "sha256-oI+9hHMAJ/x1SuKNAnOG+uhygGTdShtkKPnoIf4RKfs="
   },
-  "com/google/cloud#native-image-shared-config/1.14.4": {
-   "pom": "sha256-jl1OmgNqUS10l0iQhxE2l9b/761kQJtG5KUoLkC6xIs="
-  },
-  "com/google/cloud#native-image-shared-config/1.15.0": {
-   "pom": "sha256-GjFbRvb4f7j0NLroUbFroJk1srJ6IAE+8sWSRTz4uwo="
-  },
-  "com/google/cloud#third-party-dependencies/3.45.1": {
-   "pom": "sha256-5ztLcHd+ioYTyAcwb+ejYCutACYoBavpULZc/C8bRiA="
+  "com/google/cloud#third-party-dependencies/3.59.0": {
+   "pom": "sha256-+NGC2C8UYR+pOxUWd6jYRwJdFB/WnGxRYbfSt2EOu5w="
   },
   "com/google/code/findbugs#jsr305/3.0.2": {
    "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
    "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
   },
-  "com/google/code/gson#gson-parent/2.12.1": {
-   "pom": "sha256-yeewt+Mb574iaEl5wGgAHGUssRPE5u2JTjm2Q97gf8E="
+  "com/google/code/gson#gson-parent/2.13.2": {
+   "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0="
   },
-  "com/google/code/gson#gson/2.12.1": {
-   "jar": "sha256-6+4T1ft0d81/HMAQ4MNW34yoBwlxUkjal/eeNcy0++w=",
-   "pom": "sha256-C1c17IX0UoLx4sdpd5gAQnsVCoFj9AUJOpKAtxyrGXg="
+  "com/google/code/gson#gson/2.13.2": {
+   "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=",
+   "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y="
   },
-  "com/google/errorprone#error_prone_annotations/2.36.0": {
-   "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
-   "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
+  "com/google/errorprone#error_prone_annotations/2.10.0": {
+   "pom": "sha256-1oDcn1eKd6bc2ZKywyUOsWinIUzyf48MrB8GUmcQwMw="
   },
-  "com/google/errorprone#error_prone_parent/2.36.0": {
-   "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
+  "com/google/errorprone#error_prone_annotations/2.38.0": {
+   "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc="
   },
-  "com/google/flatbuffers#flatbuffers-java/23.5.26": {
-   "jar": "sha256-jRDKwuqYeIlgd7pDfXb9sbmgf1WoY8Vgu4oCSwQQP4s=",
-   "pom": "sha256-2uQpwGnFrFkXFDSfYZZ0cZm3kK5qkuLizzDu0mx+ATk="
+  "com/google/errorprone#error_prone_annotations/2.41.0": {
+   "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=",
+   "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
   },
-  "com/google/guava#failureaccess/1.0.2": {
-   "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=",
-   "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I="
+  "com/google/errorprone#error_prone_annotations/2.45.0": {
+   "jar": "sha256-a6YVEOIpROiuw/6XCXLQiNjaEyok8ryBekPHtwZlzCs=",
+   "pom": "sha256-lb5z+ah4dsla7xDcxUk44fHEWihQwxbDP73s1ZD1EoA="
   },
-  "com/google/guava#guava-bom/33.0.0-jre": {
-   "pom": "sha256-WbIwZqWpS4vzI5vUKICZGPsXMG49tJZpqVCaDqRph2g="
+  "com/google/errorprone#error_prone_parent/2.10.0": {
+   "pom": "sha256-B4kah8SQ+QDBIJe+6V7By24HHIp9+BBmY4fgx3Lwifo="
   },
-  "com/google/guava#guava-bom/33.4.0-jre": {
-   "pom": "sha256-OuGXeIQNiENUgMjFC69z6qKi/A8hxzrgkX0A2mU8J1Y="
+  "com/google/errorprone#error_prone_parent/2.38.0": {
+   "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w="
+  },
+  "com/google/errorprone#error_prone_parent/2.41.0": {
+   "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
+  },
+  "com/google/errorprone#error_prone_parent/2.45.0": {
+   "pom": "sha256-zgCLlZZS2RDuVHgcvGxsU8Bj0qoIOjAHj0pD/JdFZmg="
+  },
+  "com/google/flatbuffers#flatbuffers-java/24.3.25": {
+   "jar": "sha256-9bUANKU969qYCsqAO4sGlJ+TpAFjvB22zWlYHTcY41U=",
+   "pom": "sha256-Ky8lE7P7ljm1Viy/s3MknJQEKo/IkSDQvchrVqja6XQ="
+  },
+  "com/google/guava#failureaccess/1.0.3": {
+   "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
+   "pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s="
+  },
+  "com/google/guava#guava-bom/33.2.1-jre": {
+   "pom": "sha256-idCHDWKYHE6gWxx/R17+9JxHZoXSE4Do8Fdd1P7xXvw="
+  },
+  "com/google/guava#guava-bom/33.5.0-jre": {
+   "pom": "sha256-lrSg0pEG5KVpKcsaDAF0+YJAF1+tz1rlm8yi/PG/ORE="
   },
   "com/google/guava#guava-parent/26.0-android": {
    "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
@@ -538,107 +827,105 @@
   "com/google/guava#guava-parent/33.4.0-android": {
    "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM="
   },
-  "com/google/guava#guava-parent/33.4.0-jre": {
-   "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc="
+  "com/google/guava#guava-parent/33.5.0-android": {
+   "pom": "sha256-vXfMLa2RkS8aO/+nv35Xbs9XmS9Y+a+hMv1h7yULqt8="
   },
-  "com/google/guava#guava/33.4.0-android": {
-   "module": "sha256-T1fpmXE67O0x+j3jwJSyCTuU9p7+Lcne48VlWKRyZNU=",
-   "pom": "sha256-6Zh7Tm0QAgNaBekAqosGuEvGpCxoEC6R80cVybIZgO0="
+  "com/google/guava#guava-parent/33.5.0-jre": {
+   "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU="
   },
-  "com/google/guava#guava/33.4.0-jre": {
-   "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=",
-   "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=",
-   "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s="
+  "com/google/guava#guava/33.5.0-android": {
+   "module": "sha256-VBlBS+YhDjiUXoYbX2HoLM9pCnlUh32w6Qg7ynO1wNI=",
+   "pom": "sha256-fT1kSzi6wDHGFcPoun4A3CE1u63BHqWaSNvO3EIqYqA="
+  },
+  "com/google/guava#guava/33.5.0-jre": {
+   "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=",
+   "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=",
+   "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE="
   },
   "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
    "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
    "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
   },
-  "com/google/http-client#google-http-client-apache-v2/1.46.3": {
-   "jar": "sha256-tGMWOo4AEZSTN0BRQjOioAIWfF7u/XB2VFClq5O8P7Y=",
-   "pom": "sha256-yVhhxkBwEToAoc+eOeFQesgXxFrKc1Fl4xkzJI7J2wo="
+  "com/google/http-client#google-http-client-apache-v2/2.1.0": {
+   "jar": "sha256-i8hRgtIr9eo5ozxrXkzzjAvDFmpH1kh53hF6Xq20Q5s=",
+   "pom": "sha256-QJLK5/RKKG941m1JT5hzsWWgdGTingpSeZm/Vc45k38="
   },
-  "com/google/http-client#google-http-client-appengine/1.45.2": {
-   "pom": "sha256-pJ52DcJ03lzgVoYlRdTFcknPadCb+zCo5E04fkKxZVw="
+  "com/google/http-client#google-http-client-appengine/2.0.0": {
+   "pom": "sha256-hmpcwusJQ+N7U/MKEb4jjOGWSlZ19Nq96A9TBKYYBIY="
   },
-  "com/google/http-client#google-http-client-appengine/1.46.3": {
-   "jar": "sha256-sPSHlLI0Q5rZ6bRPY4dMeOjFU9A6qJ8oZMojHjxZC0M=",
-   "pom": "sha256-p9ZDOXVMtv/Km16PwHeR5J2KshWiPyz4m2cuQiWCM5o="
+  "com/google/http-client#google-http-client-appengine/2.1.0": {
+   "jar": "sha256-ddruN8NUyHxAwyRT6L6UJZfsrzs4t6xJdDEvjOSz0gc=",
+   "pom": "sha256-bQ1ACXIh/bhCz2TSnimGGQMA3/PyI71dgnsUKOqzrcM="
   },
   "com/google/http-client#google-http-client-bom/1.43.3": {
    "pom": "sha256-K9C6F9zatcBDtHXQR3XKphHUINxWEIsY402T0nmwJrk="
   },
-  "com/google/http-client#google-http-client-bom/1.45.2": {
-   "pom": "sha256-9IAlaC2K0ywkfnkpeFtgE1H2O7GchuNpb+BO58k0uSU="
+  "com/google/http-client#google-http-client-bom/2.0.0": {
+   "pom": "sha256-dI8IS3urWpyChJVOfIzvtRj+XXTc+FBbCYWMZh5Txr8="
   },
-  "com/google/http-client#google-http-client-bom/1.46.2": {
-   "pom": "sha256-6BeAyCZ1MnrqcIELkkwqYrA3r0pDCQKOCkBA2oFewNo="
+  "com/google/http-client#google-http-client-bom/2.1.0": {
+   "pom": "sha256-f2Ng6ZLuV7ldpibIe6GuFH0YoLHzPb1+2DEXQhEAglg="
   },
-  "com/google/http-client#google-http-client-bom/1.46.3": {
-   "pom": "sha256-r0QQlY2/bmzlxwD5vAs/l3IgSV2IxfGYh+R4UZ6akEM="
+  "com/google/http-client#google-http-client-gson/2.1.0": {
+   "jar": "sha256-PPcse4g3WjS/chxmT0LtyOCW4jcOQSbJuJM8PJLlkfM=",
+   "pom": "sha256-QY6j0ajD+MYQrl39G6ZbZP+4I4QybojcKoVfGlLXY6k="
   },
-  "com/google/http-client#google-http-client-gson/1.46.2": {
-   "pom": "sha256-rtOiq+NedKsn31cOeaLmWHVdgn7R2FLK0OxD2oW3hRU="
+  "com/google/http-client#google-http-client-parent/2.0.0": {
+   "pom": "sha256-a9nQvKow+LhcbYMz8OAAHX0YAV4V0gaK5msdw9Zyc9c="
   },
-  "com/google/http-client#google-http-client-gson/1.46.3": {
-   "jar": "sha256-dO7mXFY4cWWUaeuF1wPlpyI0JwEK1UWYL9xT19tXMmY=",
-   "pom": "sha256-Sjn0RPSQFro7EIJcewOXpXg+pjvxq0Rz8mfGlVgI7GQ="
+  "com/google/http-client#google-http-client-parent/2.1.0": {
+   "pom": "sha256-Tk7Y7RasAhog0XEkig7XnZ6GC0X8TFUbpyJyD8+WJ88="
   },
-  "com/google/http-client#google-http-client-parent/1.45.2": {
-   "pom": "sha256-cKoIl+oZpXKtZxOgBMDPM3pKlIPjJ9Vg7Fc8cagyL+U="
+  "com/google/http-client#google-http-client/2.1.0": {
+   "jar": "sha256-IKoJSPbOtc+psrOt3dm36ZCrQCMOCECBZCy7gSNdPu8=",
+   "pom": "sha256-UdWEULoBL8KeIshnHQGh5SeBlxK2sgDlMI1GvjSxpMc="
   },
-  "com/google/http-client#google-http-client-parent/1.46.2": {
-   "pom": "sha256-zdH6LQtME8ouzz2JCbIvQc+zj/v05SyVKqR3uiblqlM="
-  },
-  "com/google/http-client#google-http-client-parent/1.46.3": {
-   "pom": "sha256-VcDDglOHTIIdVHvyppjBSAjmzkrd/Rr+B/lzrC4sUqI="
-  },
-  "com/google/http-client#google-http-client/1.46.2": {
-   "pom": "sha256-WsHW8s3ajzhPWdxALNUCn/dTf78rdNDdxt8d+1zcBaU="
-  },
-  "com/google/http-client#google-http-client/1.46.3": {
-   "jar": "sha256-JJCgbkS38q28/ifkCZpXbA7o0mlDcYjVORrNSMbTQxA=",
-   "pom": "sha256-3+9xCym9Qan65IfqaFaA841iHnHENJJfOB1wUMKud/4="
-  },
-  "com/google/j2objc#j2objc-annotations/3.0.0": {
-   "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=",
-   "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc="
+  "com/google/j2objc#j2objc-annotations/3.1": {
+   "jar": "sha256-hNOhUFGEhfgUDqmbiphWVnSWKfZDPJK4DHWzaro7CZs=",
+   "pom": "sha256-FFcIOFAANPwbR8ggXOHJ1rJVwczdLRr9zcv3XomySjM="
   },
   "com/google/oauth-client#google-oauth-client-bom/1.36.0": {
    "pom": "sha256-9oGcT6yZOGhd1zog0o0MVkakhmeJsmh0EbavFlPkAcU="
   },
-  "com/google/oauth-client#google-oauth-client-bom/1.37.0": {
-   "pom": "sha256-1enI/oNNA3wnCBgptUai77VkTXWBIi7BQ5/ir2S+Kh8="
+  "com/google/oauth-client#google-oauth-client-bom/1.39.0": {
+   "pom": "sha256-WS9mnnI73+MyyliL/pNEWufx0e5LffxY7s6kcQjD5F8="
   },
   "com/google/oauth-client#google-oauth-client-parent/1.36.0": {
    "pom": "sha256-NkKag9g4ALNEMrnyaRRfZwaLlD2EAHjWg5eFBobkhz8="
   },
-  "com/google/oauth-client#google-oauth-client-parent/1.37.0": {
-   "pom": "sha256-BGf+8kkGcurQ896kpd40U4hNQKvWlF4h6GRs5K6KxTw="
+  "com/google/oauth-client#google-oauth-client-parent/1.39.0": {
+   "pom": "sha256-On5aiLGa/Fe/ifjsMsa5FgXXuUJ32trv/0mZlGPaDqY="
   },
   "com/google/oauth-client#google-oauth-client/1.36.0": {
    "pom": "sha256-RGUF2XB71ipzmwdpAC5Ynwfz+Xlkg3zV+W1rhUC27CQ="
   },
-  "com/google/oauth-client#google-oauth-client/1.37.0": {
-   "jar": "sha256-6mQCxsms+6FYxk8IBSnpJJL6XZlMt7G7YuTNnxJcBOA=",
-   "pom": "sha256-oD5bhIk4Vc3kp2SyQdK/88y0hI+Vmx3DEPXLbwqCrpg="
+  "com/google/oauth-client#google-oauth-client/1.39.0": {
+   "jar": "sha256-J/xh7i1SbjPTE1C16jgwkcCHk0XiYfmy5vzJeiDIb4g=",
+   "pom": "sha256-g5OwQr0u5dv0odPhmmBgyiOiTeRpoM3P9E8kDps4CbU="
   },
-  "com/google/protobuf#protobuf-bom/3.23.1": {
-   "pom": "sha256-zCdyXo5JDH81NLRlbM60rJA9I6N/A4hF81UKUZ2sBt8="
+  "com/google/protobuf#protobuf-bom/3.25.1": {
+   "pom": "sha256-Q3hpcMGst8EZyWH1PqhWpLwL9r8M7/qwrSqE8mLPFlQ="
   },
-  "com/google/protobuf#protobuf-bom/3.25.5": {
-   "pom": "sha256-CA4phBcyOLUOBkwiav/7sbAjNSApXHkKf9PWrkWT8GM="
+  "com/google/protobuf#protobuf-bom/4.33.2": {
+   "pom": "sha256-bKXx5DgMUyPLEDsDTt8RYMn7tnau3l2ZifTe8XLHxNg="
   },
-  "com/google/protobuf#protobuf-java-util/3.25.5": {
-   "jar": "sha256-2sxYssPS+o1L3cGsuIHnjWz3wTfdeLwdZ/aspzJDao0=",
-   "pom": "sha256-oJ0ZDqpqeWFrxfS1QE6UsMq1WYA6mMigkMQJmWL0H5I="
+  "com/google/protobuf#protobuf-java-util/4.33.2": {
+   "jar": "sha256-gQ7PiV/eieDw8Lw08/7Av6lJyBc+lBwV+fK7nw7XZEo=",
+   "pom": "sha256-vMXSp16QONMEfq0iqeLJBsX1eLX6JjNgTP/ciZioxbQ="
   },
-  "com/google/protobuf#protobuf-java/3.25.5": {
-   "jar": "sha256-hUAkf62eBrrvqPtF6zE4AtAZ9IXxQwDg+da1Vu2I51M=",
-   "pom": "sha256-51IDIVeno5vpvjeGaEB1RSpGzVhrKGWr0z5wdWikyK8="
+  "com/google/protobuf#protobuf-java/4.33.2": {
+   "jar": "sha256-xbWCqhJ/tixfwwdzKdUi37eTC06aYlwIdgtoGyulqrc=",
+   "pom": "sha256-GnLGjsB6XAN3R0sZl6NjrYNHpfIGuHHbQLOIt/LngZY="
   },
-  "com/google/protobuf#protobuf-parent/3.25.5": {
-   "pom": "sha256-ZMwOOtboX1rsj53Pk0HRN56VJTZP9T4j4W2NWCRnPvc="
+  "com/google/protobuf#protobuf-parent/4.33.2": {
+   "pom": "sha256-yMIhEseGDm7dx+ywHOkXb8u0BJ7aWwomvj1LufvYAhE="
+  },
+  "com/googlecode/javaewah#JavaEWAH/1.1.13": {
+   "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=",
+   "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q="
+  },
+  "com/sun/activation#all/1.2.2": {
+   "pom": "sha256-GXPUmcwsEmSv8tbQUqHHFq5hPQGK4cL2EN1qTRwkV44="
   },
   "com/sun/istack#istack-commons-runtime/4.1.2": {
    "jar": "sha256-f9Z5I2H03QD4xWr0ogzswAZt7qSo897Dg0ivI/wilu4=",
@@ -647,17 +934,33 @@
   "com/sun/istack#istack-commons/4.1.2": {
    "pom": "sha256-2Ig+twNkcB2uDjdEnIj9knUResPYYEDonxvj6dR+nJ0="
   },
-  "com/sun/xml/bind#jaxb-bom-ext/4.0.5": {
-   "pom": "sha256-vDnKsUxxStmKeyoG96ybM3bgeVVCaa03KhfXEd9Yp6E="
+  "com/tngtech/archunit#archunit-junit5-api/1.4.1": {
+   "jar": "sha256-WZ6whJcjV3PKY5BfUw1OinOEuLQp6qmRN1hQIipx7+0=",
+   "pom": "sha256-MqPqumpov+TTE5/kGBf91kHhIeIU+ulkHxuACDFkjU0="
   },
-  "com/sun/xml/bind/mvn#jaxb-parent/4.0.5": {
-   "pom": "sha256-xrVu/pzFnzx4NT0oTFXo3PFivoX4IrJs+BAjxvkI9/c="
+  "com/tngtech/archunit#archunit-junit5-engine-api/1.4.1": {
+   "jar": "sha256-VYwJC5opJDrdfS6wfuoDI/bw8Rs4RXpIN+NSKL4bEPI=",
+   "pom": "sha256-GY1dNHJVEsfTnZ0an2iUMg2ahq6A5xLtAk+ZK+sakfA="
   },
-  "com/sun/xml/bind/mvn#jaxb-runtime-parent/4.0.5": {
-   "pom": "sha256-/nf5B+HRRTqtaa92NX6tEKXkkzyKkI9XqZ2ncTBw00A="
+  "com/tngtech/archunit#archunit-junit5-engine/1.4.1": {
+   "jar": "sha256-4ADnETSA89QSvCyKJY+Q/g4rXvAF+8MXl5HjkYYQltc=",
+   "pom": "sha256-n+5dEyII4DunPwuXqZbaJD8fQU+2WcLJByK2raGRB3Y="
   },
-  "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.5": {
-   "pom": "sha256-yu7EM19YqOOcl+oK6JvqnCtJro2bD82SUjjgKNOESU8="
+  "com/tngtech/archunit#archunit-junit5/1.4.1": {
+   "jar": "sha256-bdJ7q/BOqivIbo99MpYXVGUWQ79iXsF5Q6woaWsA/90=",
+   "pom": "sha256-psKMkV437DAgaMSiFaQzD9K6A6IeqeO9jcribu2pwEg="
+  },
+  "com/tngtech/archunit#archunit/1.4.1": {
+   "jar": "sha256-apJFjFRDCOQspTTPy9tvGUfqSpyocX4IfNZx0x8tmww=",
+   "pom": "sha256-PEMEhZaX+gSgrnvQr4VeXiPI2qJvYiy8PquqO1b4KDQ="
+  },
+  "com/uber/nullaway#nullaway-bom/0.12.15": {
+   "module": "sha256-03CYL1dme13VC7urRqkNTGBvBt0WBlmNtalnX+VvB08=",
+   "pom": "sha256-K0j45WK5BRbeFEIxRvBAd9hsyuULw7dmpVwPQizHlvc="
+  },
+  "com/univocity#univocity-parsers/2.9.1": {
+   "jar": "sha256-MWhRItXjkumGcu1gCalaTBYjyhGFVnvUTulFJ9RU5cM=",
+   "pom": "sha256-Uhd9Is0IslVxE1vkcRmL51f8yM++cbcEgdAaPcIW7ds="
   },
   "commons-codec#commons-codec/1.18.0": {
    "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=",
@@ -667,80 +970,105 @@
    "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
    "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
   },
-  "io/grpc#grpc-alts/1.70.0": {
-   "jar": "sha256-tLISXos7vCt37XFX8onnhwjgNWUrlTr2v5DX9O+Y4bU=",
-   "pom": "sha256-Jk/sChAI4+jauRJry0UPEKTG4SE+irnzOVBZcVw/EiE="
+  "dev/failsafe#failsafe-parent/3.3.2": {
+   "pom": "sha256-52onlGrLqFePJthfAjPMDzlGiw58KYXcbXxs4BBVLYQ="
   },
-  "io/grpc#grpc-api/1.70.0": {
-   "jar": "sha256-RfryrBvyeR6P2rzlNoSoa2LJm4TLom+xOluj9Kv4DWw=",
-   "pom": "sha256-C7+SrQC+fNQmMXDatDAC1y9AAdzblhL7b0ofVeJNBMs="
+  "dev/failsafe#failsafe/3.3.2": {
+   "jar": "sha256-LF3Ieabax+o6eynXleJ71JuOeQiwXC8+VgU8GdeYUPU=",
+   "pom": "sha256-elPaR8MAdPlyXIyfzWg8a/gTZ9QnO9+653PzPDR8aCs="
   },
-  "io/grpc#grpc-auth/1.70.0": {
-   "jar": "sha256-dNcx7prSSwonMByRt+KThjlLTPxrbpaCEHY8kPEXQrI=",
-   "pom": "sha256-RgwaSczKe0J8/tPIG7hmkn+8DE59MMbbY9VX5Eab/yU="
+  "io/github/classgraph#classgraph/4.8.184": {
+   "jar": "sha256-blZOKc7JWjkiaKYJ8JBx1WGZOD2QascOkXU6eZjRo+g=",
+   "pom": "sha256-N7I1NJqAx1rokS+gCO3unouINL52mortCLp0xbCvgeA="
   },
-  "io/grpc#grpc-bom/1.60.0": {
-   "pom": "sha256-5pcWWUmamLYwCAsrVhiia0Kh3+VhExetDUor9bm7FJI="
+  "io/grpc#grpc-alts/1.76.3": {
+   "jar": "sha256-+hB9Nbm422uYZ5OnjH47E+O8AjodLnVURV5pioY9GKI=",
+   "pom": "sha256-5iDqeJT0iHZoSmolfAy/O+NMxDe0oMHhpMxPwtU0IdA="
   },
-  "io/grpc#grpc-bom/1.70.0": {
-   "pom": "sha256-05Jeafef8/CV7HepVsN0QpPlxg91yDcVnxLnZAQ2J7U="
+  "io/grpc#grpc-api/1.76.3": {
+   "jar": "sha256-samsYvAULwbtAck+1S1OzfQAJswYPmKI90DUHKl0uRw=",
+   "pom": "sha256-sOGVt4Mcg+bUEwsquQS+Oxl5pIQakTLXBwjS3OwNihk="
   },
-  "io/grpc#grpc-context/1.70.0": {
-   "jar": "sha256-6ygkgxwKwD50Hv2oaxQaqGOkgevEqvWlwfE6SB27QP8=",
-   "pom": "sha256-rnYbtXTUmkD593I8CK0OtCOTDfQIV3Fwd021ouVfvxQ="
+  "io/grpc#grpc-auth/1.76.3": {
+   "jar": "sha256-hPyZyrhkoajjbour7WgjyqLBuZS+RGaOs/JO0LIi4tA=",
+   "pom": "sha256-APfqi1aDFMWEvAyA1b/lrTHAFciU8aasV2qkw3tNj84="
   },
-  "io/grpc#grpc-core/1.70.0": {
-   "jar": "sha256-wrVXa4s2OxsQBmc8SS2RJQC6qhWBQwp/nAXoLMW9+6Q=",
-   "pom": "sha256-4/A0XupqaSlPwGuO1CywLBv3K5ncZcpwvCGTxltmX0o="
+  "io/grpc#grpc-bom/1.63.0": {
+   "pom": "sha256-nqMKp9l0wA3Qo962cZSovF5pOkDvitBB+hR40Ts+vv0="
   },
-  "io/grpc#grpc-googleapis/1.70.0": {
-   "jar": "sha256-1Koo5DfRptGdvwZQk7DjSwQwiWJXfjHMtI885xWNeyc=",
-   "pom": "sha256-ktQ/A+48dt7SKS8rVnhXm4RNCocnb2Yk9vLS+/D1j2I="
+  "io/grpc#grpc-bom/1.76.3": {
+   "pom": "sha256-EGIZxXxiz3mZLEeGocPmLcye98Re9mLg9D/nO95+Db8="
   },
-  "io/grpc#grpc-grpclb/1.70.0": {
-   "jar": "sha256-iHxVkr/2xPOa7/zacMjRu4cFjNiE0c04xwlj4reFCVc=",
-   "pom": "sha256-t8VIOmqyw7v1b/7enwmOyh8R4Rk3VYQ1ftXRB0mRJH4="
+  "io/grpc#grpc-bom/1.80.0": {
+   "pom": "sha256-TSeZrEUt0sx+rCALuxbjenrHJxXXO/k0AABx9Fw0cEE="
   },
-  "io/grpc#grpc-inprocess/1.70.0": {
-   "jar": "sha256-2UELBtOTg5gOFIl4XZs0fIaIOXZPtp5YgydHHVtz558=",
-   "pom": "sha256-1xcjDdZEa9hrRblwFGCOHnPtTS/iuOJz9tx0+SJ/iHw="
+  "io/grpc#grpc-context/1.76.3": {
+   "jar": "sha256-GzLo7QiY9sLT29o1C4MEkcYU4ss19KIctvrf/JXnaXo=",
+   "pom": "sha256-/+REjt3nK95loItbBR/MQaiteMkTOhq2CYUfbKZ9cWs="
   },
-  "io/grpc#grpc-netty-shaded/1.70.0": {
-   "jar": "sha256-5cU98JoT8kdNN+D/B7bHT3zJYYeaNS9LySyUY7zBQWQ=",
-   "pom": "sha256-9A6oYHUpi26hMFus6Ae+nPtyHF0e9+jHSwmaQkglcLQ="
+  "io/grpc#grpc-core/1.76.3": {
+   "jar": "sha256-yPfvkYeoMj7vkYcZ3Yq7k+UpAxi2K00HFNqrAA7ZGWs=",
+   "pom": "sha256-vMEXiKva0Gfzj4RmiDZqOz8u3zxcx+NW8lxjPciL3bs="
   },
-  "io/grpc#grpc-protobuf-lite/1.70.0": {
-   "jar": "sha256-58wsqJgWcoUcvr+Dokv7k8GysFjnXBqBenV7kU8zQD0=",
-   "pom": "sha256-n3tCXI8wKW2EqB9CtsRv+YL/G8DpUpFHatpIYQugKjg="
+  "io/grpc#grpc-googleapis/1.76.3": {
+   "jar": "sha256-4XyZY4t7sAzZnMgY62oiCCONllQcirxKR2DPVFodGjM=",
+   "pom": "sha256-mY3pUqhg6whb5f5Shm4eXQ4SSprV5moa3MKSqx5oD/s="
   },
-  "io/grpc#grpc-protobuf/1.70.0": {
-   "jar": "sha256-m5gDntgmYExG1qyPihgtQT00jsar4mRnc2sFqpLn4dM=",
-   "pom": "sha256-vbgvEfJM0qRm8ZzqmOOAXOXNE/TfrEC7MCZKaGN4+2g="
+  "io/grpc#grpc-grpclb/1.76.3": {
+   "jar": "sha256-hmXSia1TlWsGfcI3hFDxFdUIT4HzPGsIgKss0Qb/+BY=",
+   "pom": "sha256-4kKwz4d0aC3ndsJTfzAIDH1zvhV1NTW/rwzf0UfEMIs="
   },
-  "io/grpc#grpc-stub/1.70.0": {
-   "jar": "sha256-Wtqh7B90S2euFKjbw5yVicAQ+tD9VXsKApZiAuTSOhg=",
-   "pom": "sha256-kakbfQ6AJnSkU6gHm2CVQv+1IjDsa/03bRdY7sX2OtI="
+  "io/grpc#grpc-inprocess/1.76.3": {
+   "jar": "sha256-aB/LhKoNlB7MhdnEdXPywrMrhrZW5FMo0wQJ+bVe28s=",
+   "pom": "sha256-EqHf0MnftQNLSimP2JB5opwI4z/hEKh0EYnc3LIKHQY="
   },
-  "io/grpc#grpc-util/1.70.0": {
-   "jar": "sha256-aDr/k9LKvET/Idyat3lPiue0xl0YdIyEdFNTEeq+jcQ=",
-   "pom": "sha256-UBYBc8lJdZVwQfpf5wc27ylG1w9h3n9o+Bf9AdNa5xg="
+  "io/grpc#grpc-netty-shaded/1.76.3": {
+   "jar": "sha256-KGGrwCJe8ilvMfY4SjcH0LaVnI6BvHi5zRwuHS0iIto=",
+   "pom": "sha256-qhT25uZBPxp6y+o6c5ISqSwoJqjjOld3UDrzNlbad9U="
   },
-  "io/netty#netty-bom/4.1.104.Final": {
-   "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw="
+  "io/grpc#grpc-protobuf-lite/1.76.3": {
+   "jar": "sha256-qvIBgWKUYG73kVQBno/Zvb0j80rFAcxqZhDZHI/O36E=",
+   "pom": "sha256-jQ87jfgMZIcMo0fTCxs8nVESEoARndV9Y7+rEfJ6v5Q="
   },
-  "io/netty#netty-bom/4.1.115.Final": {
-   "pom": "sha256-JdyLuDN9/BhsSfyM9PaltsfPQUY2L19EDaytzQ35dhs="
+  "io/grpc#grpc-protobuf/1.76.3": {
+   "jar": "sha256-eUVPhoZ6XsJTAcxja1U6oVvFmWkISeNAq9/FHcgX0aM=",
+   "pom": "sha256-dIgXFlAvg5mNlNxxpG2762KFq4Urro6rKO+W9MGpgD4="
   },
-  "io/netty#netty-buffer/4.1.119.Final": {
-   "jar": "sha256-MiJiGNhUwuUdSTWn6+RmO3Lsua9NqIG4a/UY5hrtSNM=",
-   "pom": "sha256-ZxrAlb6wlY6qKsRVFJKWSVO3ZDD3VBbGa93g8++Qb0k="
+  "io/grpc#grpc-stub/1.76.3": {
+   "jar": "sha256-paXiolH6dzYkGPTL5NC1jmXTJ01HacXsiTX90GEVSO8=",
+   "pom": "sha256-cc7L6Zj1lTl2YkH284Z+PFXTGhpL8HjqrbizmKXciUU="
   },
-  "io/netty#netty-common/4.1.119.Final": {
-   "jar": "sha256-mRppsVlNytmSbiaOfpRTDP2qif7vQq8mkiowLT4ukhI=",
-   "pom": "sha256-PMa/2IxM0XguEknOg8O1TyruD8YVy32HoFU3i66XUyM="
+  "io/grpc#grpc-util/1.76.3": {
+   "jar": "sha256-76vqCysb4aHE452GGYvbcTh8rjtCFjgzTzOW7JwmH3A=",
+   "pom": "sha256-JSHLbqqIzNKSDR5+e5AhODhQW+HfUfu1Q5Q8QGL9scI="
   },
-  "io/netty#netty-parent/4.1.119.Final": {
-   "pom": "sha256-/zqMSVFYZZvdITF/YSVIv1jXFNswT87Gm4BJake2hgM="
+  "io/micrometer#micrometer-bom/1.16.1": {
+   "pom": "sha256-Dn3lsNyQkfGy60rmv1HvdW05/PMhPbz9LIl3nXS3mvs="
+  },
+  "io/micrometer#micrometer-core/1.9.17": {
+   "jar": "sha256-w1DP3HbAg1bxKmDoQPLb6u6nVAcS1YtUvs1sMCqGFHo=",
+   "pom": "sha256-A5aSALpYr0jxc6v17OILwK8Ic1BF+/4zAl9P2aiGqxY="
+  },
+  "io/moderne#jsonrpc/1.0.5": {
+   "jar": "sha256-g8gVdFaAxVzw6lnzhh1GqACNDJUfRultuugpXOFz9Aw=",
+   "pom": "sha256-9IC6GVfphsKSAV0bbhHDIVDggyuGoCir6XDHy5khXJE="
+  },
+  "io/netty#netty-bom/4.1.110.Final": {
+   "pom": "sha256-pJvhpK0fi/FwwdwWKLEYG1Hm2c8qJWRapyKZQJW7m/8="
+  },
+  "io/netty#netty-bom/4.2.12.Final": {
+   "pom": "sha256-Sx6sh5HJMaM9ni+4wINDJVLPh0adtBm30kNBeONPBww="
+  },
+  "io/netty#netty-buffer/4.1.110.Final": {
+   "jar": "sha256-RtdOeRJarMBVwx8YFS/cXUpWmqjWAJEgPQuqgzlzrDw=",
+   "pom": "sha256-cQrBnMAc2A32vpo/qtPCIrShoy9LVRN74HtgmdXaNWI="
+  },
+  "io/netty#netty-common/4.1.110.Final": {
+   "jar": "sha256-mFHsZlSLng1BFkzpiUPN1LvjBfaN29JOrlLkUBoNexo=",
+   "pom": "sha256-fUF/UzUwTa4eoIoGWGA4yD/orYTB01uqFe0RkhzveSA="
+  },
+  "io/netty#netty-parent/4.1.110.Final": {
+   "pom": "sha256-aFra83Nmb8FUJ8gQ+K/zpP4ZSpfH7XS2nQfFSPDULxw="
   },
   "io/opencensus#opencensus-api/0.31.1": {
    "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=",
@@ -750,28 +1078,63 @@
    "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=",
    "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s="
   },
-  "io/opentelemetry#opentelemetry-api/1.47.0": {
-   "jar": "sha256-ZWbx8RM9YR/06Lj9uOsYV3uXBCViAxU2Pum+Q4Q7FL8=",
-   "module": "sha256-zCE6CaI+2/bRdOu7k/tl0oCeD8o/m2o0Vbi7a9xE/jQ=",
-   "pom": "sha256-X2xsLNziNhUfBA1Kmp+OwQW5GV0PFrWu2FVy8wDqyR0="
+  "io/opentelemetry#opentelemetry-api/1.51.0": {
+   "jar": "sha256-7YjCh25aUlzLtW65GNeVV5e5okXxE9ULl5jRY0qQlR0=",
+   "module": "sha256-+BlpREGHeEhsVP4ytrKr3jnfbrlGzrp6vZ6xPkGAgXs=",
+   "pom": "sha256-6gZDm5dnAhhadXz8+iS8QWCj/fbKB/xphceLhB00io4="
   },
-  "io/opentelemetry#opentelemetry-bom/1.47.0": {
-   "module": "sha256-QdK1ilQMmkQ1iAmy1jZIDtR8Alovp77NenjEy3TklL4=",
-   "pom": "sha256-VcVgSi3oNT9k7MTF1CyPvxARFc+s00QWABnKY468ilc="
+  "io/opentelemetry#opentelemetry-bom/1.51.0": {
+   "module": "sha256-G2yc8yJUdi30ahrpVXZDYESr0FCpsBVyxCJcjsMiASM=",
+   "pom": "sha256-+m3pwICuLmOLLl8/l4Xj20QlSlfwKbDKlQ6TmZWY+DA="
   },
-  "io/opentelemetry#opentelemetry-context/1.47.0": {
-   "jar": "sha256-FbT8QjTm3KbVSADVcmlOy9B7pSwV/FsiG02lUXzo2Q0=",
-   "module": "sha256-M4aB6NwaH2T/tvcHjEa2+WD+lGN5ni3r6+fVjAb8XbM=",
-   "pom": "sha256-WUMqp3bD8etmBrhU53g1+iPlJBUPfg36PGUQ61ekQsM="
+  "io/opentelemetry#opentelemetry-context/1.51.0": {
+   "jar": "sha256-304wiIPvKi8oQVFAxWKZAfciI/nscTBj+TOVz/Eb9KE=",
+   "module": "sha256-lE8cBSwnAqmnz/jSjSJVSwjwMbrgiPrvrd3F+yfcero=",
+   "pom": "sha256-GyDVnq8S2i5UuQoutCP78vb1uxeLP6NyEUk6emGlfAQ="
   },
   "io/perfmark#perfmark-api/0.27.0": {
    "jar": "sha256-x7R4UD7FJOVd8ZtCTUbSfIporrgBZk+t1PBptx9S0PY=",
    "module": "sha256-n2xOamK43v0UFzrNt9spPQhjU7Ikkj7vYpP1gWGJPMo=",
    "pom": "sha256-IsF1wsGCNmdjDITnMiV2f1lwSS2ObL/7gaZXXbpHLSY="
   },
-  "jakarta/activation#jakarta.activation-api/2.1.3": {
-   "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=",
-   "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg="
+  "io/projectreactor#reactor-bom/2024.0.11": {
+   "module": "sha256-pW8KAXASMDYjk+RjGPZlT336EZnC8Pr/uAALIxI9k2c=",
+   "pom": "sha256-XFDlpW7ilcH8EG1i+yD7BUVgKQToZjDLcnv8VUnYjxE="
+  },
+  "io/quarkus/gizmo#gizmo/1.0.11.Final": {
+   "jar": "sha256-pUv7ttzOkpgTRZWzzR35YbxzJGiCXybuUpbytfiMC5k=",
+   "pom": "sha256-/9w5IIbOwtuB0m4uvTYDRxHokpwoQ1uUdpGWCFNrOP0="
+  },
+  "io/swagger/core/v3#swagger-annotations-jakarta/2.2.47": {
+   "jar": "sha256-mzCzGfHDGZPmEo0i4SZSvppohYnjDGeBnthOlbluf4g=",
+   "pom": "sha256-yDP6F7AXZgp/p2/Lp+GmHLBrs9B3GeepeEb0CRjYWF0="
+  },
+  "io/swagger/core/v3#swagger-core-jakarta/2.2.47": {
+   "jar": "sha256-5jt4weWwSeZnDKm7Q8PzXPNi7MCKxZp4OZSmpzKn1+s=",
+   "pom": "sha256-f+M3jWjP8wydRqTFmzXYp2H0yIkMziwmSLgDUc1BO1o="
+  },
+  "io/swagger/core/v3#swagger-integration-jakarta/2.2.47": {
+   "jar": "sha256-cLt02NeKtNSYX35TDWVLRIBnAx2ucnivj4a8FP7eEbE=",
+   "pom": "sha256-okwniVgLRqBbG7d4KfZzCjZwj6gRZZDAqjKwLadyW9U="
+  },
+  "io/swagger/core/v3#swagger-jaxrs2-jakarta/2.2.47": {
+   "jar": "sha256-GjZ2uzqb1Yjgqjm1ootBkQK6sXEjKMIpgFvH8KGfqRU=",
+   "pom": "sha256-Xa0AP7iJm7vhWbHHLm+1kC9sTllW7aqg6XKEKkcNuKI="
+  },
+  "io/swagger/core/v3#swagger-models-jakarta/2.2.47": {
+   "jar": "sha256-FdEPT36sHgKo/5QLQwxjT8nf4INopU3/oyFswtyBGqI=",
+   "pom": "sha256-BqphK2Z1hOJ4BzxY0I8pxiasxAggvBXrPajxpEK+0IQ="
+  },
+  "io/swagger/core/v3#swagger-project-jakarta/2.2.47": {
+   "pom": "sha256-UL3qH4opQXOIilE0IajxXHkoXGVqhSKdkcOrDs9INew="
+  },
+  "jakarta/activation#jakarta.activation-api/1.2.2": {
+   "jar": "sha256-oYepORA671hJp6+EvX4nvi0SDEEK8pFDc3X/4GH08J0=",
+   "pom": "sha256-XlD+k4BoRx9QSn78QHGCNCW1IOq8b4DHLZNevVRoMJE="
+  },
+  "jakarta/activation#jakarta.activation-api/2.1.4": {
+   "jar": "sha256-ydtSEAzmyKrJXMOQdflXINLlYbEfgFG4HBIa1O/9cAQ=",
+   "pom": "sha256-dXeXDcCfETGkpCdp4Xce0GLwjSL0DaMEH/PhbVsv3qg="
   },
   "jakarta/annotation#jakarta.annotation-api/3.0.0": {
    "jar": "sha256-sB9VVSKEz7FJQR5k6rynXpQtJtLheGsykUJQ5DMK+qI=",
@@ -789,9 +1152,15 @@
    "jar": "sha256-2TfwHBLUFvCmFah82CUcK91F91AkTr4ojEum1GnbA3c=",
    "pom": "sha256-99lfbceYkWL3oXL79NKkwTZYCw6vVu7C3pvZjTdlDFE="
   },
+  "jakarta/platform#jakarta.jakartaee-bom/10.0.0": {
+   "pom": "sha256-jnjPMtgXalHrrF0fcfE/KJm7/V3LslMOZmgo0IMI6CI="
+  },
   "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
    "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
   },
+  "jakarta/platform#jakartaee-api-parent/10.0.0": {
+   "pom": "sha256-iwNrh/lKpP/SbpntH/els3Queh9CEKTYzBHyRhcgMSc="
+  },
   "jakarta/platform#jakartaee-api-parent/9.1.0": {
    "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
   },
@@ -803,63 +1172,107 @@
    "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=",
    "pom": "sha256-qxnpAKv5Awo3+DI+Ws66WNQK+I47UqBYuOA95II1ync="
   },
-  "jakarta/ws/rs#all/3.1.0": {
-   "pom": "sha256-1P3UF4DgZarNWsCZzQSQFxk3zFEi3CyO8biKh7PJQkw="
+  "jakarta/ws/rs#all/4.0.0": {
+   "pom": "sha256-7B9Q3ekvC3vd2CpbZdwj3xHhWicr4fOs45WHiW/Ofps="
   },
-  "jakarta/ws/rs#jakarta.ws.rs-api/3.1.0": {
-   "jar": "sha256-azs2KLi0rt2g0kwzVDNemFSX2O88UQuPMCjpINW4Zj0=",
-   "pom": "sha256-xpejA+n/wxlj6xwnW793pYOn1IKWWsTxuybckeWV/78="
+  "jakarta/ws/rs#jakarta.ws.rs-api/4.0.0": {
+   "jar": "sha256-Y2ixJsvPNOaUu5uluf4+UEC3rOp85iLmNtaYuwhf0qY=",
+   "pom": "sha256-L0u+8vmKigFgS9MO9p2UFeOWFDmA3t7NuazlN6p8da8="
   },
-  "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.2": {
-   "pom": "sha256-SCzbRtTdL1r33IhMim3nPd/+ba9UnvNqbAd/1uQe7Qg="
+  "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.5": {
+   "pom": "sha256-aOeMIak0zTerSMB6lap/jLuYyvz6K7nvktVDmazNvxU="
   },
-  "jakarta/xml/bind#jakarta.xml.bind-api/4.0.2": {
-   "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=",
-   "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4="
+  "jakarta/xml/bind#jakarta.xml.bind-api/4.0.5": {
+   "jar": "sha256-XkibbIdMQRngA/8UA9tSPuOolZ7EmfPeKedyRe/M8hY=",
+   "pom": "sha256-WW9lSUZRt561ibL1eaVob6vNXLto8skowc82A0HWjBY="
   },
   "javax/annotation#javax.annotation-api/1.3.2": {
    "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=",
    "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c="
   },
+  "javax/xml/bind#jaxb-api/2.2.12": {
+   "jar": "sha256-aKYh7BhIX5UdCax29D5X7uOU2+QsuPKkxZyTKW+p3MY=",
+   "pom": "sha256-Gs08hdTP48Sa4eKsKXdCujnaW7swo60OQXbqbGNI/O8="
+  },
+  "net/bytebuddy#byte-buddy-agent/1.17.5": {
+   "jar": "sha256-xbkzStguYy9q9g3yK7vbu2LO4Eh39PQ8OLoErtm9mQE=",
+   "pom": "sha256-C4NIL7Ujtb+UdKqCp8XTzhPPOlqatdY6zpVZGfbXzBQ="
+  },
+  "net/bytebuddy#byte-buddy-parent/1.17.5": {
+   "pom": "sha256-HoN1gn7n0vXkxwyzHJFn7OxgaTz2pbdzoeZv1NJnU2c="
+  },
+  "net/bytebuddy#byte-buddy/1.17.5": {
+   "jar": "sha256-cVaMn4OWZ3IZ9lAmj79kk97UhO3NvfLa5hKcpb6B6Ns=",
+   "pom": "sha256-U81D27NbSORHJc1XbSAG4fcfIWh9BA94DMcKCn79QcI="
+  },
   "net/java#jvnet-parent/3": {
    "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
   },
+  "net/java#jvnet-parent/4": {
+   "pom": "sha256-RxOVc1VJSVKXyP+Tm5oy4IuRMCAg/3c1htJ+SXq7j7s="
+  },
+  "net/java/dev/jna#jna-platform/5.18.1": {
+   "jar": "sha256-rRTBsexPQ9OWIxIZ36Y16/go9zjqyfiQ6hvAd5WJLZo=",
+   "pom": "sha256-OdU4qVmaRHR3CDiGXtQs+j5rPRMIbLHld7i7QxSNGmU="
+  },
+  "net/java/dev/jna#jna/5.18.1": {
+   "jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=",
+   "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU="
+  },
+  "org/antlr#antlr4-master/4.13.2": {
+   "pom": "sha256-Ct2gJmhYc/ZRNgF4v/xEbO7kgzCBc5466dbo8H6NkCo="
+  },
+  "org/antlr#antlr4-runtime/4.13.2": {
+   "jar": "sha256-3T6KE6LWab+E+42DTeNc5IdfJxV2mNIGJB7ISIqtyvc=",
+   "pom": "sha256-A84HonlsURsMlNwU/YbM3W44KMV5Z60jg94wTg0Runk="
+  },
   "org/apache#apache/13": {
    "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
   },
-  "org/apache#apache/18": {
-   "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
-  },
   "org/apache#apache/21": {
    "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
   },
+  "org/apache#apache/31": {
+   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
+  },
   "org/apache#apache/33": {
    "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
   },
-  "org/apache/arrow#arrow-bom/15.0.2": {
-   "pom": "sha256-smxLzIdQ3lilf5FewSm3Ldwe4aiQQTcuBIIEz2dmB3k="
+  "org/apache#apache/35": {
+   "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg="
   },
-  "org/apache/arrow#arrow-format/15.0.2": {
-   "jar": "sha256-hM8dWwy7YHshrS1LUXNB1YlakZEES24ND/IVYLJlIyE=",
-   "pom": "sha256-YZWyjPHXfR//+fr3qXfpTwFxH5pKPdam7T/zKB9jGLw="
+  "org/apache/arrow#arrow-bom/17.0.0": {
+   "pom": "sha256-wXZw7focPy/jfqxzX8qYhVPL8L58WQ1zfD/DzctjlsM="
   },
-  "org/apache/arrow#arrow-java-root/15.0.2": {
-   "pom": "sha256-3eYwjnKSWsQMNj6gXovBzMUgoe5FFBon6XoeVQdq2UA="
+  "org/apache/arrow#arrow-format/17.0.0": {
+   "jar": "sha256-MRDMU1BZtdjyrH/Hdskwwbs6uOEDzkhjNGdg8WkrPsA=",
+   "pom": "sha256-3xKqejMY93lTgZ1hZ600kZwoo5FFrXUp0KwHKDCZ9xw="
   },
-  "org/apache/arrow#arrow-memory-core/15.0.2": {
-   "jar": "sha256-x8v4+MO0BbagQ20a5aIFH0+0p/a7ViCVTBLBSiLD3VA=",
-   "pom": "sha256-t1b9yPpEvDDHCr+nx0ylBGdvWzfJrDMNWb8vf0Kx0uU="
+  "org/apache/arrow#arrow-java-root/17.0.0": {
+   "pom": "sha256-zMwXnVRg2EbveKT4ykh3StBFi0L30LgOtPhXP2pYmAI="
   },
-  "org/apache/arrow#arrow-memory-netty/15.0.2": {
-   "jar": "sha256-MM28fUhUgVH36jBMjglZE0vtLGvCspWeqQf05/ekN7A=",
-   "pom": "sha256-Re5EvLlgCgH9YpP/VQF+GOJlkoxaw9VTm8bFU1gBZ0s="
+  "org/apache/arrow#arrow-memory-core/17.0.0": {
+   "jar": "sha256-J7fYWhUrI9ybAzVrcd7GrjM1w6cE7nD2RU+SeR62Tno=",
+   "pom": "sha256-aMT2ZL0mjaG1vu+1WL6sg35RHseDTL8J4Gd4l3vwHC4="
   },
-  "org/apache/arrow#arrow-memory/15.0.2": {
-   "pom": "sha256-GOiz1kGw1br6LdC2/IyTLpObYwUU2zV+tJEFruapgKs="
+  "org/apache/arrow#arrow-memory-netty-buffer-patch/17.0.0": {
+   "jar": "sha256-hUCssQTUEpTP6msCfmYH2pa2hcWzzZ13q7EVK2lcUjI=",
+   "pom": "sha256-97hS2fT+mnuohEGbqpiYSnhCPOF7bfmkRXLIhv9J4ek="
   },
-  "org/apache/arrow#arrow-vector/15.0.2": {
-   "jar": "sha256-xNJolSQFmqV5LYewPX+xlcam65CFdZmDxBF8OA7ki3U=",
-   "pom": "sha256-mdlD/xCSUHbFJfk+aS3DEATyaurn6qbFDswFZxUZ148="
+  "org/apache/arrow#arrow-memory-netty/17.0.0": {
+   "jar": "sha256-HcVQzYJCBW1/ztye2c022bGUxq4TkjTFZ78M5K9UuJM=",
+   "pom": "sha256-oITDhEATzPkvvq6LqsJ7naqgzRYnWnUFGDPBAqtaRDg="
+  },
+  "org/apache/arrow#arrow-memory/17.0.0": {
+   "pom": "sha256-eUNSoV5IpSSJj/H+dIRVVrLOrD9l8cnnlkGfaS8zVyI="
+  },
+  "org/apache/arrow#arrow-vector/17.0.0": {
+   "jar": "sha256-iurP+NeNkz5fADEKclqdQMJUsywyWUt1LcpHexaTQfs=",
+   "pom": "sha256-p4u7aXF31N+sigJf399QATpCk/t03X7XLgsKEkqrqqs="
+  },
+  "org/apache/commons#commons-lang3/3.20.0": {
+   "jar": "sha256-aeXJ+jXaelGl/SCZ3+VqLY0yzyM+L213DnlhRkQCY/Q=",
+   "pom": "sha256-fKg7JwnB56ngO1ds1BQiGQN5SJqAhm5UL4yLlVQRoqo="
   },
   "org/apache/commons#commons-parent/34": {
    "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
@@ -867,9 +1280,28 @@
   "org/apache/commons#commons-parent/79": {
    "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo="
   },
-  "org/apache/groovy#groovy-bom/4.0.22": {
-   "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
-   "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U="
+  "org/apache/commons#commons-parent/92": {
+   "pom": "sha256-lPbAJ7FfZAKZXdGyx+o1v+HryItoMrMTQ2i0GZhyGVM="
+  },
+  "org/apache/commons#commons-parent/93": {
+   "pom": "sha256-qItfYWWmWb+DVEGDe8xcU+mf3nm5LPu4aYjOKVTNUmc="
+  },
+  "org/apache/commons#commons-text/1.15.0": {
+   "jar": "sha256-WNLaMPBYUSoef5FOOSQd7KTf9cJ6CFtO0vqp5yCAZ/Y=",
+   "pom": "sha256-XlFoaHvO2uoqqFVrizL1r6CO/Lwx0RuUfIZ2mHvJ0jk="
+  },
+  "org/apache/groovy#groovy-bom/4.0.27": {
+   "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=",
+   "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs="
+  },
+  "org/apache/groovy#groovy-bom/4.0.31": {
+   "module": "sha256-tTtEY1VohufF/ixU8mw1vqG0hmUJhIDetVfr0fH/XHM=",
+   "pom": "sha256-1M/IWQeCE841jaj0W5wABASzG2a/atcGXDdi8Bj+fiA="
+  },
+  "org/apache/groovy#groovy/4.0.31": {
+   "jar": "sha256-5amX66Ihh0nmhvP+0nnn7d988bt9pHknAvmvrVf0iXg=",
+   "module": "sha256-JZ14uUikCwHQfbEKodOhonwaGY2po0JdQNY0b2h2voE=",
+   "pom": "sha256-73/I5prussHU7U3xvNtf2C7PrPn9dXS+4PibmYTXS9o="
   },
   "org/apache/httpcomponents#httpclient/4.5.14": {
    "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=",
@@ -888,32 +1320,39 @@
    "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=",
    "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o="
   },
-  "org/apache/logging#logging-parent/11.3.0": {
-   "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
+  "org/apache/logging/log4j#log4j-api/2.25.2": {
+   "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=",
+   "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=",
+   "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM="
   },
-  "org/apache/logging/log4j#log4j-api/2.24.3": {
-   "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=",
-   "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk="
+  "org/apache/logging/log4j#log4j-bom/2.25.2": {
+   "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw="
   },
-  "org/apache/logging/log4j#log4j-bom/2.24.3": {
-   "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg="
+  "org/apache/logging/log4j#log4j-core/2.25.2": {
+   "jar": "sha256-5Q23cBQw/5B5gYUO9SekHVGlPdABf1Oghgr8urhXAnc=",
+   "module": "sha256-JRQSc3eFDwR83jJbc7efriEzKSK+tkmiUzr9CEIlihE=",
+   "pom": "sha256-L/9GPTmclAgtmCLCG/v0cOEFHbt9S0XyWw54G8Xg9BI="
   },
-  "org/apache/logging/log4j#log4j-core/2.24.3": {
-   "jar": "sha256-frQIRZauJb08YWmOSOjQq2WpJgdYiE7Vy7nG5VxEpWo=",
-   "pom": "sha256-v9XAxKrGECQsy2H/ABCK1zeA2iCi9ym+Bjg2qXZXf1c="
-  },
-  "org/apache/logging/log4j#log4j/2.24.3": {
-   "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E="
+  "org/apache/logging/log4j#log4j/2.25.2": {
+   "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w="
   },
   "org/apiguardian#apiguardian-api/1.1.2": {
    "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
    "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
    "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
   },
+  "org/assertj#assertj-bom/3.27.6": {
+   "pom": "sha256-Irh92pqrg/odDz6kCbUk56RJIc+PX4eZnPWQRvD+C8M="
+  },
   "org/checkerframework#checker-compat-qual/2.5.6": {
    "jar": "sha256-EdE0skXpysxHRRTS1mtbhhj4A5oUZc3FW7wLNOAAi3o=",
    "pom": "sha256-FxNsR1rgzd9LMvf66tVIbCzEWgZI69MH6uDbNUuWCLE="
   },
+  "org/checkerframework#checker-qual/3.19.0": {
+   "jar": "sha256-qCfEkYPzpjInfSegpGc2hss0FQdEe51XAmEJS9dIqmg=",
+   "module": "sha256-U+GJnd48UTyh79N2q/+sDmkH6OhKvV+WYkJjTJXk0Vc=",
+   "pom": "sha256-KbqcXOGpS3AL2CPE7WEvWCe1kPGaSXdf1+uPmX+Ko3E="
+  },
   "org/checkerframework#checker-qual/3.49.0": {
    "jar": "sha256-i52aNuqvfA/CZQPIPNl9jJwPnikTzCpukqwmxzXU3L4=",
    "module": "sha256-YA0Z+9XjfemEh8OYBF4UCmUc9brRx5xcl88MyYRMQuQ=",
@@ -929,6 +1368,10 @@
   "org/codehaus/mojo#mojo-parent/84": {
    "pom": "sha256-L+UQYYsvYPzV8vuCvEssLDRASNdPML5xn8uGgp7orDA="
   },
+  "org/codehaus/woodstox#stax2-api/4.2.2": {
+   "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=",
+   "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI="
+  },
   "org/conscrypt#conscrypt-openjdk-uber/2.5.2": {
    "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=",
    "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs="
@@ -937,26 +1380,12 @@
    "jar": "sha256-9lgoX54+GjmZ4uqSaV/DOJKyWDBdKtr7cphegUUt3Qc=",
    "pom": "sha256-2mB8ukIh4FJA4wjjTR9I0LDhrfBed2Mr7MA/mp9fw5A="
   },
-  "org/eclipse/angus#angus-activation-project/2.0.2": {
-   "pom": "sha256-r5GIoQy4qk61/+bTkfHuIVnx6kp/2JDuaYYj5vN52PY="
+  "org/eclipse/angus#angus-activation-project/2.0.3": {
+   "pom": "sha256-00lnOGg3iZZGKSpFGj7PHk79EmLCkbN9FeENPZDsK80="
   },
-  "org/eclipse/angus#angus-activation/2.0.2": {
-   "jar": "sha256-bdO8/8IrzoOwc3ag4uCU5JZKMZXUEY+0PjgO81Q2zB4=",
-   "pom": "sha256-deViGn3IWMmW7nDGtNiE2QHRh4Ns5sZxIMr5VH5vxXE="
-  },
-  "org/eclipse/collections#eclipse-collections-api/11.1.0": {
-   "jar": "sha256-G4YI7PTmgfAxwpooxAP3FHb+XfOo8MDdjHrTO5GYQhI=",
-   "pom": "sha256-FrNfjbqEJ72caQTFkdzyKeN+oq2AWNatQf77jjTM5x8="
-  },
-  "org/eclipse/collections#eclipse-collections-parent/11.1.0": {
-   "pom": "sha256-jjE9sGTinEJIK8p12LuRKH1ByKPZ+xqg8qExI3JI14k="
-  },
-  "org/eclipse/collections#eclipse-collections/11.1.0": {
-   "jar": "sha256-iIF0neeRwoxszqYhMUo6FUz+du93wwBUtucUw9x2lp0=",
-   "pom": "sha256-rDVVCe3JA1Q4bVCeSSieeX0+coQ5Ugw//E9vksymD2M="
-  },
-  "org/eclipse/ee4j#project/1.0.5": {
-   "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY="
+  "org/eclipse/angus#angus-activation/2.0.3": {
+   "jar": "sha256-pr01xTjPkP/5Qa1iWMQMCPygtcnD9TbGVxFPJ84FJ6c=",
+   "pom": "sha256-NcnhYgmychJhNU6K6pcWJmSK2dQgHSIb2WkB2QA3LaA="
   },
   "org/eclipse/ee4j#project/1.0.6": {
    "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
@@ -970,42 +1399,45 @@
   "org/eclipse/ee4j#project/1.0.9": {
    "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc="
   },
-  "org/eclipse/jetty#jetty-core/12.0.19": {
-   "pom": "sha256-WlnJIoSqiWT9xOKQweakAaySfXmabfw3/eQ7GZ19ajk="
+  "org/eclipse/ee4j#project/2.0.0-M1": {
+   "pom": "sha256-GGpzaiANE3/mHNM2ANNEUBqsCzVspfHOR3PlhsDJRwc="
   },
-  "org/eclipse/jetty#jetty-http/12.0.19": {
-   "jar": "sha256-BSICiO7RSRZ9pQbSFBMamI8wuVZS7ZKSBhTBWDPGSaU=",
-   "pom": "sha256-dIGCV/cZF26ofN91AXQkAQTDMGjYCxFDr601C7TeG4E="
+  "org/eclipse/jetty#jetty-core/12.1.8": {
+   "pom": "sha256-iUrAFn9p/BOSFP5qRu81Vuoxu67IrgWPY3uc8x4m0io="
   },
-  "org/eclipse/jetty#jetty-io/12.0.19": {
-   "jar": "sha256-xs9Rz7QhmIpR0e3tAFzAabzpwqe/YcdNO5d+PFtekpc=",
-   "pom": "sha256-NGjexy5gMl01t5CFPx/CzL9r2/OPVtHxb9vyrERDZCs="
+  "org/eclipse/jetty#jetty-http/12.1.8": {
+   "jar": "sha256-MsNRmE/XTn25sxIPeqQ8A0qdf+KQOGdH/zGPTEIh2Us=",
+   "pom": "sha256-DCi4i54+S05kI8zWJjcd5ykHaYNLOhw1YHMtXiaOhDQ="
   },
-  "org/eclipse/jetty#jetty-project/12.0.19": {
-   "pom": "sha256-4+ZN8tcwhMyChBtFyR3rZnkI9GIKLliMIvORKGCfxuI="
+  "org/eclipse/jetty#jetty-io/12.1.8": {
+   "jar": "sha256-xFpozu01JvXKCXR2jKph9mg8PVWRqBn7zzwEgKZKskU=",
+   "pom": "sha256-dVmajLMrSwvAKolDr10y0QeSztMpVZRenwzn+VvWcjo="
   },
-  "org/eclipse/jetty#jetty-security/12.0.19": {
-   "jar": "sha256-NxOrBXh4etewjObIEJrL0+ne+Z4F3aD7OqdwEymme+c=",
-   "pom": "sha256-x/lnUYg9Stf9QGpYk6H8U7FXxcKzH2FC9+AbAYH8kPA="
+  "org/eclipse/jetty#jetty-project/12.1.8": {
+   "pom": "sha256-hZ8clGmMGVBcFDzh4h9D8pQhcBZlvDNU38LXBao6gpI="
   },
-  "org/eclipse/jetty#jetty-server/12.0.19": {
-   "jar": "sha256-rXPzXFuYbvpNpQCvhkeyxVbSPiTDZFs3sG/YfQqecXA=",
-   "pom": "sha256-5sj3pEpmUzDh6PYZeIHSJp+6lpLHsBes/t/QQS6vzw4="
+  "org/eclipse/jetty#jetty-security/12.1.8": {
+   "jar": "sha256-RK3Z7pW5Vdlpecx04y7HUeqAfrwPUTnrE63PwjcSxY8=",
+   "pom": "sha256-OLElGts7MltXZLOH6jxQH0r9k41uphOuLJicgphCZ8w="
   },
-  "org/eclipse/jetty#jetty-session/12.0.19": {
-   "jar": "sha256-vdYjUPrtOVBhivUPs3kkYrv6qUg24IUEVO5zZU5wulA=",
-   "pom": "sha256-cJT4uwG5bQL+YBcupTCkSxlDOG2n0wz64VtFtF9qAFU="
+  "org/eclipse/jetty#jetty-server/12.1.8": {
+   "jar": "sha256-cbiGKnIwWuu2WQm4ufPJoMeQ7zJFxgVuVrSBF67COP4=",
+   "pom": "sha256-w2I8/+mzl3IWwg10shibqFxpvDDv2Yy/jcFxGnweBRU="
   },
-  "org/eclipse/jetty#jetty-util/12.0.19": {
-   "jar": "sha256-kBuDmdZHU9jEjWyGV251jPfgLzaCR1XcIjqRCrXLxSU=",
-   "pom": "sha256-+3BLTg7ELNmVEgTn0I+XAqfoxrjn8QESYowyFxRqXW0="
+  "org/eclipse/jetty#jetty-session/12.1.8": {
+   "jar": "sha256-6+hN1BlC163aX30TBAldJ055FZmUUdhI6IfL1An5R+o=",
+   "pom": "sha256-Lgkr5cJPlt57w+0YU3VQLFzF4hASyNoOViovqZUxKaQ="
   },
-  "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.19": {
-   "jar": "sha256-unkQYcra4mm6jlFDZu+anv+MSpZDbxgwIOtHYkpZte0=",
-   "pom": "sha256-8nOgRAMEk3coOm+1AtX/XSEHBwkWqI2YEk5IaAw6pKo="
+  "org/eclipse/jetty#jetty-util/12.1.8": {
+   "jar": "sha256-AEMnFfIMPdyNT+OwGXQlOndy8YMPdxLaca8wNIsByCI=",
+   "pom": "sha256-2ttvRP4IoAh3i2Lz/46UQxAsQGqWXXer1OFmlGKKIg0="
   },
-  "org/eclipse/jetty/ee10#jetty-ee10/12.0.19": {
-   "pom": "sha256-g0v8BRMOoPBy9Yq/2YyKKLu8RYNqPi7bMXAQvFfkm+I="
+  "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.1.8": {
+   "jar": "sha256-xiUfquJBsraHnOj7kXc2bKR5P/k1b2B5O40QofH+9AQ=",
+   "pom": "sha256-43vjEy+ohTjxLH4wyv46tCZMFNI1Cp28jHp5XLmSPNE="
+  },
+  "org/eclipse/jetty/ee10#jetty-ee10/12.1.8": {
+   "pom": "sha256-dbgsGIAnJSZ2lh0VdW/S4ZO7dA1aXlzHyI83TilevYs="
   },
   "org/eclipse/parsson#parsson/1.1.7": {
    "jar": "sha256-wh2wGPisbPeYk/Gvd/HNM3k3vRKub6PUsQ9aAIGe5Ww=",
@@ -1014,121 +1446,186 @@
   "org/eclipse/parsson#project/1.1.7": {
    "pom": "sha256-r171oT3deNwLoRUh3IOhKkVytRPILxAbsxDxGGxccU0="
   },
-  "org/glassfish/hk2#external/3.0.6": {
-   "pom": "sha256-HRyIIn2+K7eMKkSn472dteOqOvcPFKZjI6qBsKXUnpw="
+  "org/functionaljava#functionaljava/5.0": {
+   "jar": "sha256-N3rRQOfSa6BPrfIZsJ1+HHS8AjL6QBCyDBx52xH5Zw4=",
+   "pom": "sha256-R9OA2YVT2vdCc5tRC/3ElIp0GHftyypTlvwpGZaJzgk="
   },
-  "org/glassfish/hk2#hk2-api/3.0.6": {
-   "jar": "sha256-wEmiGp/ZMWx+KRorwog19w0lr/tiPcFZmoO2uE7IOk8=",
-   "pom": "sha256-1qw9qzMZyFheEkaCpXfGLu1yoOZLR8Q+Bugld669aX4="
+  "org/glassfish/hk2#external/4.0.0-M3": {
+   "pom": "sha256-h4t5Hl6qPIcE76MFUNGl5XF9yA0xS+a8szPMBWgC3WM="
   },
-  "org/glassfish/hk2#hk2-locator/3.0.6": {
-   "jar": "sha256-4mZNIbAXw6oVGLkTJkYCvqYE7cVNNWEDwQr7qZq9BPw=",
-   "pom": "sha256-JxO73h0Aikt6Z2PzNSTH8AccY/qCzAaR5M4yPpicpis="
+  "org/glassfish/hk2#hk2-api/4.0.0-M3": {
+   "jar": "sha256-ZvhZkW5qfeNiKXOs9/ZyqJXJusgWIggN+7laybAhsfg=",
+   "pom": "sha256-2ldYwcrGDJCVjWfLuaP++EZVE7gyTvQ/9si2VeHjJtc="
   },
-  "org/glassfish/hk2#hk2-parent/3.0.6": {
-   "pom": "sha256-AL2rCNWOtMDpdwVCBWS2mzoGNMhYP1jATawyY/O9K2U="
+  "org/glassfish/hk2#hk2-extra-parent/3.0.0": {
+   "pom": "sha256-7QQT8DTUZlo32xhiyiquiq9NjKuJTSrKTna7zN+qgFk="
   },
-  "org/glassfish/hk2#hk2-utils/3.0.6": {
-   "jar": "sha256-/ITYWgdEtXbZ7H21hF7rmY7VMqlFDdGcjJIsPuaSYgY=",
-   "pom": "sha256-NUOJtRSguxyTA1F6CWe+GFfaFMB3p5hm9vjSNG0KeEg="
+  "org/glassfish/hk2#hk2-locator/4.0.0-M3": {
+   "jar": "sha256-KQAnOV2Vv8u19AyZI3am8hx1v2PJyNTfPPwDS6GoXe0=",
+   "pom": "sha256-UPXyftFr6i4tPdqL7CtLQIr6plzyi3ySP/KwK9cQkSY="
   },
-  "org/glassfish/hk2#osgi-resource-locator/1.0.3": {
-   "jar": "sha256-qrXXhJ98/Nosx8VBuhvTZRUdQidvFRyCU4ckXf3j3XQ=",
-   "pom": "sha256-i2Yi64HlVymfvZqoVLxax20wf3rl53BYZImli7Uziyo="
+  "org/glassfish/hk2#hk2-parent/4.0.0-M3": {
+   "pom": "sha256-r2nz6US27idzz1BnoGR+pbNkKj60iZUTT2lPQFaO4jo="
   },
-  "org/glassfish/hk2/external#aopalliance-repackaged/3.0.6": {
-   "jar": "sha256-qCttGjSDJO+I3IB8fNeq9jOYXL/3swA2+2GhuGmB2EA=",
-   "pom": "sha256-+WC9Fv4TmZXL8T1AoEJhbIueGH+CtOXDK6pGr8m5/Nw="
+  "org/glassfish/hk2#hk2-utils/4.0.0-M3": {
+   "jar": "sha256-unCHgn/omvPYJPwmVWyYXOmvoMww+qJOi2UUXKD+/PE=",
+   "pom": "sha256-YJoXFaqpUEu2K0tT6Ndf61iAfGtYdDrV88HYw9S4RIY="
   },
-  "org/glassfish/jaxb#jaxb-bom/4.0.5": {
-   "pom": "sha256-7JfsQtk308iVGXl+RCRvgN4IUIGax6euZ1xEl7cHXDk="
+  "org/glassfish/hk2#osgi-resource-locator/3.0.0": {
+   "jar": "sha256-oYZsz92qKfGNpdOd9mKJSrLdmQKZSlAA52RPbMHjflU=",
+   "pom": "sha256-nxPzihfjMzJMF7uo68PDkvZq3rkVZAN3XN5V7HMe7Pw="
   },
-  "org/glassfish/jaxb#jaxb-core/4.0.5": {
-   "jar": "sha256-rT/ZvwDePtqYWfcLbPsBHi/pkEgE4WomZQkoiOzg/co=",
-   "pom": "sha256-S1OSE3b7/exg46j+8FjMPcmdn8o+nJUOhZKYeYRghXI="
+  "org/glassfish/hk2/external#aopalliance-repackaged/4.0.0-M3": {
+   "jar": "sha256-ZcCruUbSqzoSN8YQ8kvxXwRpYVHpyvvhr6bO5S++1e0=",
+   "pom": "sha256-V9aw+yZOT3V7k1nvKC2cmXhG74JSSlA3Kj6GN8WKYe0="
   },
-  "org/glassfish/jaxb#jaxb-runtime/4.0.5": {
-   "jar": "sha256-SF2JQOdjc6fzAIFepVBL9bcmwjRCWtMJcQGdEzEkzKQ=",
-   "pom": "sha256-d8T6BuLZyVN2LC5jUXN3oa4oWbGBssEzdZy1poKojKA="
+  "org/glassfish/jaxb#jaxb-bom-ext/4.0.7": {
+   "pom": "sha256-WjlgZhzu99sPfohDSu5y90HJ7JCzYbz7NH3WOqKAjWM="
   },
-  "org/glassfish/jaxb#txw2/4.0.5": {
-   "jar": "sha256-kXNVvEUUgfMNBDsk0SMRBReWavNDg5AXc4goENykgOU=",
-   "pom": "sha256-a2gzdWAy4YOaQBRoFaWY7IsFg6Lv+9Rd311UMB9Ky6s="
+  "org/glassfish/jaxb#jaxb-bom/4.0.7": {
+   "pom": "sha256-97VFomqCDe1lZWKEf+rTMd9+DM8okww4JIGgcMn25b4="
   },
-  "org/glassfish/jersey#project/3.1.10": {
-   "pom": "sha256-HwCrKqQxlS9Eb7DXajOYoWstCgzmAP/L/g8iKp9aRSU="
+  "org/glassfish/jaxb#jaxb-core/4.0.7": {
+   "jar": "sha256-8pr1w3WSw6BqkS2ozfHRYDbmym1O7Zvm92cOYPpGZgE=",
+   "pom": "sha256-2OukbNXEQeoj8WiPh7CYbPD2sVdn5fcT7s5sDTIggCY="
   },
-  "org/glassfish/jersey/containers#jersey-container-servlet-core/3.1.10": {
-   "jar": "sha256-/RXn43IV13LM2ujUB2xBoRrT/snKiKH4qPbaz0Zju2k=",
-   "pom": "sha256-/08eBDeM5Au1jmt9dk24TJIXQ2PQlOO2W7Auqr9HOlw="
+  "org/glassfish/jaxb#jaxb-parent/4.0.7": {
+   "pom": "sha256-S74O8mgwHn9LGOIJfdUrHQLeB/DJ1osJsc6SegYxtyA="
   },
-  "org/glassfish/jersey/containers#jersey-container-servlet/3.1.10": {
-   "jar": "sha256-Sq3GbS02r7Jzs4mFgdaqUeD5kjCNVv1RuOMgHvpGH2c=",
-   "pom": "sha256-PKD2TQbThE//ImrPIn7MS7xQxeEksF9mH4QYJmZqe00="
+  "org/glassfish/jaxb#jaxb-runtime-parent/4.0.7": {
+   "pom": "sha256-RWIGwFEC/ZavVfVWO6fOjTIq8IpOca/mw17t0WpZAJo="
   },
-  "org/glassfish/jersey/containers#project/3.1.10": {
-   "pom": "sha256-srKeL9s0eph5sEbHW+rV6E9O/C0gQp9KVCoMsxkYRSM="
+  "org/glassfish/jaxb#jaxb-runtime/4.0.7": {
+   "jar": "sha256-YaXa9aGYf37XFJxaiD3fIgypv3FKjYz/yF+sMB6StfI=",
+   "pom": "sha256-jcspvdeVXmD2W9S1RphivG+4W8+Gqci2hNPI1yr8C60="
   },
-  "org/glassfish/jersey/core#jersey-client/3.1.10": {
-   "jar": "sha256-ls+GwjtRXaIKMKOWM6kg8SpCDR5fAsVe9Vd8omlNEcY=",
-   "pom": "sha256-yCh1KxtdmOSer+v/bKTR5TK1pjJ33Xw/DqUOsyhuzEE="
+  "org/glassfish/jaxb#jaxb-txw-parent/4.0.7": {
+   "pom": "sha256-hc9OOlkQCgnTXCBjjdDxrsOF28IZUk68118YeVehzTQ="
   },
-  "org/glassfish/jersey/core#jersey-common/3.1.10": {
-   "jar": "sha256-uN9d6H1I1qv1VfNAdVoFbIyymmYK+VjpWduKTLNVK1Q=",
-   "pom": "sha256-37Tr4q/ZEifpSSJXnGk6Wx6+UOupnI9HDFwZZjgipBY="
+  "org/glassfish/jaxb#txw2/4.0.7": {
+   "jar": "sha256-xyVnbyVQyqP1eUPy0Q36x+FMOrs0pqnYmsfrvxveMmk=",
+   "pom": "sha256-7LKAZJeJ3TDHbGSkyJGAWj1eMCa6wP3LHKRPmlGlCvw="
   },
-  "org/glassfish/jersey/core#jersey-server/3.1.10": {
-   "jar": "sha256-GzOpvkF7cvfO7zr+l4B4G2YSKw8dt48vglApiAcs+rA=",
-   "pom": "sha256-ablIlDXkJYVymFSLzSYiC7+lazUOaI7vltV85vp8zM0="
+  "org/glassfish/jersey#project/4.0.0": {
+   "pom": "sha256-AxgU8a/mE6OUS5+K/ekHabew9cTHZ665fFopnV+mvxU="
   },
-  "org/glassfish/jersey/ext#jersey-entity-filtering/3.1.10": {
-   "jar": "sha256-qvtmbou6oDtIguIS66TFZ/rwgdW2U0CIy12OyIWUhnM=",
-   "pom": "sha256-vGtOiqMPFeMrYKS3qYKQGJr4wwSZth5k1w1Z35ODHUU="
+  "org/glassfish/jersey/containers#jersey-container-servlet/4.0.0": {
+   "jar": "sha256-ckfY37DUlQmRaQWAYGxa2TO5F8an/oW1JW8j8oeCTA8=",
+   "pom": "sha256-V1zTMUcq1HkWWuVDODpFUoCJ8RVba/yI/WsgDkAq6T8="
   },
-  "org/glassfish/jersey/ext#project/3.1.10": {
-   "pom": "sha256-zmX1BhgfgD0o60fjmvz7Pm6/kfmaTmQsuOj2nvUWPYc="
+  "org/glassfish/jersey/containers#project/4.0.0": {
+   "pom": "sha256-P0Q/lOWOho6LjY/aaLcLiSTgSXEao9PMM12z2Q4MwsE="
   },
-  "org/glassfish/jersey/inject#jersey-hk2/3.1.10": {
-   "jar": "sha256-AO1xxJaoVqwfcyckgqer4ntalrgjwpzAj0twjI0+ZH4=",
-   "pom": "sha256-bVISCGYiCVFDE0s8bLtZSypaGgALKu3a/TYj9M09uuU="
+  "org/glassfish/jersey/core#jersey-client/4.0.0": {
+   "jar": "sha256-ng3FA4bcY/jqaNkW3OVeogSmSAl4W/k1dp38Ew9maaM=",
+   "pom": "sha256-Em+B58WqDE5cQyjIBW2aTIiYzaLG1c/7yYDj6B3OUPE="
   },
-  "org/glassfish/jersey/inject#project/3.1.10": {
-   "pom": "sha256-u1gO4XOEs5H3+uNuGHxlOqYVeVFmN2aggn/AwglTJlg="
+  "org/glassfish/jersey/core#jersey-common/4.0.0": {
+   "jar": "sha256-H5/ES2basv+CkfTHCSqn4LObs+/hu/UM5poy+gl5ZhY=",
+   "pom": "sha256-LmkrASQngfxhm6CxdtWE2VAw267AfEDG1//FVb6xr5U="
   },
-  "org/glassfish/jersey/media#jersey-media-json-binding/3.1.10": {
-   "jar": "sha256-RUFLx5YJXhtr+STdnu0jr0DhQrXjvXwq8DkKtyvhsvQ=",
-   "pom": "sha256-PwtFyLyViVmwBiZq1sNKJa7c082sINL4HA6lPra3S+o="
+  "org/glassfish/jersey/core#jersey-server/4.0.0": {
+   "jar": "sha256-ZPQgKGYxe+xYDCtl5C5/I3HBC/cIWvYTwwyLQQI0Abg=",
+   "pom": "sha256-HwcEUUOi9xKWboWKwuU6T7lTeqWOZAy7a+A3ONP228M="
   },
-  "org/glassfish/jersey/media#jersey-media-json-jackson/3.1.10": {
-   "jar": "sha256-3W8yv0OBtxqhfWEgFIUlIuEc2V81ksUzsiO3GTXCzNg=",
-   "pom": "sha256-CG9x4al4e0x7T4ts7HHzAuiQQ6DlSAP2ixo2/20eLpc="
+  "org/glassfish/jersey/ext#jersey-entity-filtering/4.0.0": {
+   "jar": "sha256-IJfOHnbNEnfhFyW4Zvim2cFDB67RI61j1NLGJj4EZjc=",
+   "pom": "sha256-EFsMA2JzfAt1wnRJTBrZdEjnXS9tCLuZfayF2jcfI5w="
   },
-  "org/glassfish/jersey/media#jersey-media-sse/3.1.10": {
-   "jar": "sha256-fE+fD5UA/BSqeX4eNdPTiyLdf4VfdkAGcAA3CWUFFm4=",
-   "pom": "sha256-GYURmdPVQFG8CAiUTYG6/CMQURJ61cKUn7afG2gFbXg="
+  "org/glassfish/jersey/ext#project/4.0.0": {
+   "pom": "sha256-duMWdMfq4DLYfQINAxps1J7QJvUhp8I/3sgMpOlBTNw="
   },
-  "org/glassfish/jersey/media#project/3.1.10": {
-   "pom": "sha256-IKAKpgkjN0iGlSW0V1WWPD1Js41DuBfIXIhZ1jc7AZw="
+  "org/glassfish/jersey/inject#jersey-hk2/4.0.0": {
+   "jar": "sha256-cZdRkWdrvjicm6EUrhlGyXFBmMrJnL3vVq2+s9Yip0E=",
+   "pom": "sha256-4DauIN1e9qyVr3h1K9jXVNqIwcKlbQwHrC7k+bha3nc="
   },
-  "org/hibernate/search#hibernate-search-bom/7.1.2.Final": {
-   "pom": "sha256-BAbGloTq1BCta0E1tShrtggnsLWiEdXl0T0iM1lATPA="
+  "org/glassfish/jersey/inject#project/4.0.0": {
+   "pom": "sha256-KxCS7+A0OpDAuAeAUVD8HabmyIfNmw0gUqs+vZhJYeE="
   },
-  "org/infinispan#infinispan-bom/15.0.11.Final": {
-   "pom": "sha256-l1ZGl2WLzh5IwN06lHdoxhNyMtYVGVhBQhz8Q7GE6Cw="
+  "org/glassfish/jersey/media#jersey-media-json-binding/4.0.0": {
+   "jar": "sha256-c2FYn9mWMPX7mz3ZFoSZVXOcMFYz77YO8sstM45jvpQ=",
+   "pom": "sha256-yGVYmv2SEdTz9eqyk1k0QBra+Htsc8ntLaY17cIBLg4="
   },
-  "org/infinispan#infinispan-build-configuration-parent/15.0.11.Final": {
-   "pom": "sha256-utwbV7pKcUvVQfHty5kdfpBpDLJCNO8kd4ju3eO3jgo="
+  "org/glassfish/jersey/media#jersey-media-json-jackson/4.0.0": {
+   "jar": "sha256-NjmDetiQNtO//eHJLb7Dfat53bHnZgtGiAXpIQi5QlI=",
+   "pom": "sha256-Xn+km+FJUOyIcTe5is91+CIjwfI7Dnug9dXaM4unBAY="
+  },
+  "org/glassfish/jersey/media#jersey-media-sse/4.0.0": {
+   "jar": "sha256-J52UNizQ8krqYemOGwuZ7zwbwrtY6rDORiD6I2RgWeA=",
+   "pom": "sha256-YoejQ3v1jRPVe2Enp73s638f5tRRZiWNrMMrSKx3pHU="
+  },
+  "org/glassfish/jersey/media#project/4.0.0": {
+   "pom": "sha256-e4ZcegGG5BiqMEipkySzRMxhM+WptxAnGOLvSFIHrX4="
+  },
+  "org/hdrhistogram#HdrHistogram/2.1.12": {
+   "jar": "sha256-m0f7rkRP6qxLfgTw6ilFaeS8KCvGnYws4qw/I1dygeI=",
+   "pom": "sha256-f7PnkMFU0bXiMXC7jL9/cO8ICa8XIp8dywENd5llEIA="
+  },
+  "org/hibernate/search#hibernate-search-bom/8.3.0.Final": {
+   "pom": "sha256-rTA228LCnKccrDyAWDr4NCKYNkfYqA9LmJmd7n00RZQ="
+  },
+  "org/infinispan#infinispan-bom/16.1.3": {
+   "pom": "sha256-/eUzwbp3B2nw2ogRH5xgKBDYYOsWHFqIdFcMM/s1pqw="
   },
   "org/javassist#javassist/3.30.2-GA": {
    "jar": "sha256-66NykJlLXkho86+Y/xE/YkSmsJk4XZrUaIEwfTywGq8=",
    "pom": "sha256-QieFHLcOQ/c6zti//mkt465EEsSmLc3/BV5RPuPYAaM="
   },
-  "org/jboss#jboss-parent/43": {
-   "pom": "sha256-PDredvuIOs25qKAzVdHfQGb/ucjHjwmyGenA/Co/Qxc="
+  "org/jboss#jandex/2.4.2.Final": {
+   "jar": "sha256-PyzlXH1x50RYFIjcUQWAaqgITAjm6RagGbq4+GmJlPA=",
+   "pom": "sha256-6l4By7dQ+V1+DkR9PLk0NadCgZU9ldZTKzyEgHwo10c="
   },
-  "org/json#json/20250107": {
-   "jar": "sha256-hdTBqxktMRf9Asf/8ewP5jreRc9W3vf+lQ7wYM8G6Z8=",
-   "pom": "sha256-ph+87jbeXMAb7ZMEYseLwEvBZBCwHZtfEABq8UoRvFY="
+  "org/jboss#jboss-parent/12": {
+   "pom": "sha256-nlb1shiYpucR6FdiGsHvts88PeFlpKowfbmYgmrU/98="
+  },
+  "org/jboss#jboss-parent/39": {
+   "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ="
+  },
+  "org/jetbrains#annotations/26.1.0": {
+   "jar": "sha256-68euwlLtDH0tBMA51/AOafe4ax9JPHQdZ7PvMbmGsFQ=",
+   "module": "sha256-W07rjbph51OBYVPgxz9WKyDgF+OTk5UtTeTdMbdyYLs=",
+   "pom": "sha256-+NxQzzqsS87HQKkJVfKADkElHpxANjC3W3UtO271vuI="
+  },
+  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.2.0": {
+   "jar": "sha256-svdD6luhL2ng815djUYGnXTI4oYQh1SKfg4Up4S8TPE=",
+   "pom": "sha256-FqFd0ZfPJBNJT3iMuWFE2aFGJnw9b38cFbejweBSNGo="
+  },
+  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.2.0": {
+   "jar": "sha256-omzI4thhkZfMTRFb6ndm6aqODx54duoETuG58wVlRgE=",
+   "pom": "sha256-vSrk4skWBWVKilUn2nV/KyJ2WA0fXq6+q9M0OvjVxGc="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/2.2.0": {
+   "jar": "sha256-Iw2RwuQQ48/KOk3HPSVUVfYv9SqsCRozOXpuML3pG/c=",
+   "pom": "sha256-3u2DHvy2Y+TPPVEh5a55byAeN7gT0sfWB7Xx+Khv5S4="
+  },
+  "org/jetbrains/kotlin#kotlin-script-runtime/2.2.0": {
+   "jar": "sha256-Ttl/0eDJux0JSO1eY8yRRWMTpZUYKVuSssFRSu9VYVA=",
+   "pom": "sha256-5QdIv0Z09lRgPnsbuDBjTsmevZwzDeukytzuwHZ8u1Y="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.2.0": {
+   "jar": "sha256-ZdEthaO4ZcFg25FHhRcSpksQ2t1osi7qIqlb+KhnDco=",
+   "module": "sha256-pbmP3NnbAX1ULhlyJdzuGNZYpW3h2yzEHhMZbWsXaaQ=",
+   "pom": "sha256-jDyCEAfBNBFVhzm589U4LrgVUds4lc/7iVYeVsD03BY="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": {
+   "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": {
+   "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=",
+   "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=",
+   "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs="
+  },
+  "org/jooq#jooq-bom/3.20.10": {
+   "pom": "sha256-uge7JqEpuey8uWsvi2XHhNxbDFGkjIETPpeyl6f2m48="
+  },
+  "org/json#json/20250517": {
+   "jar": "sha256-PqYbKgbjHt8ckRNP6RBrDrsWYovhafPbdbx6Kwa0V5Y=",
+   "pom": "sha256-caH7hqKwVTejz8HIfbQtA279u/x+nDSbY10hrB+odqc="
+  },
+  "org/jspecify#jspecify/1.0.0": {
+   "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
+   "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
+   "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
   },
   "org/junit#junit-bom/5.10.1": {
    "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=",
@@ -1138,69 +1635,357 @@
    "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
    "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
   },
-  "org/junit#junit-bom/5.10.3": {
-   "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
-   "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
-  },
   "org/junit#junit-bom/5.11.4": {
    "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
    "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
   },
-  "org/junit#junit-bom/5.12.0": {
-   "module": "sha256-v/EC0wjRgUHrv+gdhjsFmaMPe7rK291WmKnUNpL9pi8=",
-   "pom": "sha256-rhFA2ksa+nWxxD/+oO8MreDDR/r1mWO1xJk/RzJwCNQ="
+  "org/junit#junit-bom/5.12.2": {
+   "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
+   "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
+  },
+  "org/junit#junit-bom/5.13.2": {
+   "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=",
+   "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k="
+  },
+  "org/junit#junit-bom/5.13.4": {
+   "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
+   "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
+  },
+  "org/junit#junit-bom/5.14.1": {
+   "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=",
+   "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ="
   },
   "org/junit#junit-bom/5.8.2": {
    "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=",
    "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI="
   },
+  "org/junit#junit-bom/6.0.2": {
+   "module": "sha256-CXdtx1DgfltFk690n/aPkYB/nFTDMHUcn0tPHqZScdY=",
+   "pom": "sha256-w1iXvlPvCDmGw/CRGt53SctCrrQAyZH7ruUeRjn3uak="
+  },
+  "org/junit#junit-bom/6.0.3": {
+   "module": "sha256-KA48NIVfKhPeJBIZN+TPl+S565IG5g+JHk8KHPDnq6E=",
+   "pom": "sha256-plW2pdwA0b68kfsrFcDH6K6snWvc+HlZVQU3DidTAoc="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.11.4": {
+   "module": "sha256-puov77OqWGj9engK4doRYudt2jdgtIAVwqQZ0jcv88s=",
+   "pom": "sha256-US0j/znHZmWho2RVJiMLz4ib1JiEME9/6+BHsBjuszk="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.12.2": {
+   "jar": "sha256-C5ynKOS82a3FfyneuVVv+e1eCLTohDuHWrpOTj4E8JI=",
+   "module": "sha256-VFfyRO3hjRFzbwfrnF8wklrrCW5Cw1m2oEqaDgOyKes=",
+   "pom": "sha256-VmKCFmSJvUCxLDUHuZXkj44CXgmgXn0W3SuY3GQs994="
+  },
   "org/junit/jupiter#junit-jupiter-api/5.8.2": {
    "jar": "sha256-GAjuh+D3GM1uJfO3WvwXlWrIo+3EjH6bq58Z+aeeOAE=",
    "module": "sha256-fpr03/9iZ6zd0VfZ4Rug1dyRszL6dLxMZZOeRReht3A=",
    "pom": "sha256-yb3jYieVswp3NTHoXFgy+NyKp37N0xPu4jXJg8v9Anc="
   },
+  "org/junit/jupiter#junit-jupiter-engine/5.11.4": {
+   "module": "sha256-25EWOorwBaMnmFZd1nU3clGJWQ3qttoDsx292kVoahg=",
+   "pom": "sha256-sKMjsNA0REQdE9RjC0DbXvhBYNLC9YXU1kbcOIL5kgc="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/5.12.2": {
+   "jar": "sha256-9XbAa4rM3pmFBjuLyAUmy5gO7CTe4LciH8jd16zmWAA=",
+   "module": "sha256-0W0wjmqiWjCz75JNnf5PiJqb/ybqvXLvMO6oH864SBU=",
+   "pom": "sha256-PHGRdFCb6dsfqBesY7eLIfH2fQaL5HHaPQR4G9RAKqM="
+  },
   "org/junit/jupiter#junit-jupiter-engine/5.8.2": {
    "jar": "sha256-dTt3Js3RWLs0ztuUwWHiKRiW9HgyoentpT2XACCoGE4=",
    "module": "sha256-pWIExxbCN5lwyo4/4qcuOgMM2QJzKNPOFFfdEMAVDn4=",
    "pom": "sha256-Ckt92UuvnF+7ZaLpFz0IUii9ACQhNkgCWtBnAk8cZrs="
   },
+  "org/junit/jupiter#junit-jupiter-params/5.11.4": {
+   "module": "sha256-WIZbi0uZi5qxnBP45BO34dSBk3TdXfaXYMTAsLxOmJU=",
+   "pom": "sha256-jDWbvqB8ZKas3YweE7T3cFiyQys16G6ald3GMkmgrVQ="
+  },
+  "org/junit/jupiter#junit-jupiter-params/5.12.2": {
+   "jar": "sha256-shn/qUm5CnGqO2wrYGRWuCvKCyCJt0Wcj/RhFW/1mw8=",
+   "module": "sha256-x3KP8z0SJgBzLq09DW+K3XRd4+lEFRmHE5WuiZymFHQ=",
+   "pom": "sha256-pcfvF8refV90q2IHK7xrxxy9AWgGJGvOQl/LvBEISTw="
+  },
   "org/junit/jupiter#junit-jupiter-params/5.8.2": {
    "jar": "sha256-0cItb+VINWjAjIkT80q9IwNJDDSAzmwYouoxxl5EECo=",
    "module": "sha256-UCPk4+wVbsa9PPZV8wcM/Fo+iq1dUbS74CWnkulJjXM=",
    "pom": "sha256-tGngEBcBfYW8AlIlMCBS+kXPK1n5QVhCRzlGtPpJx8Y="
   },
+  "org/junit/jupiter#junit-jupiter/5.11.4": {
+   "module": "sha256-o8NT7XUWrhg16rlaCH9PCaWwzH0LiwOf53oDm4q1IQM=",
+   "pom": "sha256-qGLfEe5TmYLvyxQdnArecDe7oCZdC1idX7hNsNIS8dk="
+  },
+  "org/junit/jupiter#junit-jupiter/5.12.2": {
+   "jar": "sha256-OFSzrUNJBrgn/sR0qg2NqLVunlbV/H8uIPw/EuxL6JQ=",
+   "module": "sha256-ioIpqKD4Se/BzD/9XPlN4W6sgAYcX5M5eoXAk8nX6nA=",
+   "pom": "sha256-ka2OSkvzBCMslByQFKyRNnvroTHx21jVv+SZx5DUbxc="
+  },
   "org/junit/jupiter#junit-jupiter/5.8.2": {
    "jar": "sha256-T1wcxkMiRM0W42qg4Ct0vONKgf+VoT1j1QlR7Ezj9L0=",
    "module": "sha256-2d9Hs8dDGIOrHx8dggwpgOvL11PtxMgrmb9ewsUzrS4=",
    "pom": "sha256-Q/Vic+es8z4PW10Qecf/pCRTHwHieUqdZHOt/RCkXS4="
   },
+  "org/junit/platform#junit-platform-commons/1.11.4": {
+   "module": "sha256-C54mJcj0aLPNQTLMCoBfif5B+FLRrf/3Xz6xRlyhy2s=",
+   "pom": "sha256-zRLSt8JC8WVUjtnJQGFg3O22CAkltHz3MeD9rl+0vOI="
+  },
+  "org/junit/platform#junit-platform-commons/1.12.2": {
+   "jar": "sha256-5oOgHoXfq+pSDAVqxgFaYWJ1bmAuxlPA2oXiM/CvvBg=",
+   "module": "sha256-ZMeQwnpztFz8b4TMtotI92SQNIZ+Fo1iJ1TUlmkrwic=",
+   "pom": "sha256-TyuKkGXJCcaJLYYi1VO2qwpwMhYkSZ47acEon1nswHc="
+  },
   "org/junit/platform#junit-platform-commons/1.8.2": {
    "jar": "sha256-0uAV/KcTDnmvL0YI3FRBXksQtZLXczPey0saJ0wYUFA=",
    "module": "sha256-NChH0wRv6kNVlWkttPBdXwOeDh0eIE9NV1WQJVcIJiY=",
    "pom": "sha256-zoUuNMahhKpsgO6N8EcXE6dAgTQTTwjjwcPdh8a1mrc="
   },
+  "org/junit/platform#junit-platform-engine/1.12.2": {
+   "jar": "sha256-zvDvy1vS4F4rgI04urXGVQicDDABUnN250y2BqeRHsg=",
+   "module": "sha256-+Xsxk2wRnAgtTQOM3resDmVvRR2eXX6Jg9IqJONvoQM=",
+   "pom": "sha256-lICxinlldp0Ag8LLcRBUI/UwKo8Ea7IEfm2/8J84NJA="
+  },
   "org/junit/platform#junit-platform-engine/1.8.2": {
    "jar": "sha256-C30AD4w+jl99a4GWSZNue5k4MU6HyPmDgFIY6ldWflk=",
    "module": "sha256-66d7Nu/fdaZ/RkODM4JfnkSPVQ1SHnJJ2VA1hYDuY2s=",
    "pom": "sha256-AWhkMmYGDtko71qBgjAD7PrnmpqMC7/Xb0IBxsnXccU="
   },
+  "org/junit/platform#junit-platform-launcher/1.11.4": {
+   "module": "sha256-YMRTMgm6WHsc2n1ywIfzUaMjH5uRyU8/djlLDiI0HMQ=",
+   "pom": "sha256-tnzVOALgaqgqpZZumftCkX0iBFeEnlwIDINgdT7WfDE="
+  },
+  "org/junit/platform#junit-platform-launcher/1.12.2": {
+   "jar": "sha256-3M8sH6Cpd8U60JSthZv93dUk2XWUt2MHrXh95xmFdX8=",
+   "module": "sha256-UKBqBDdOMA57hhWIxdwNAhQh4Z8ToL2ymwYX/y/ehdE=",
+   "pom": "sha256-YZFFzSFdMiJTcr5iW7ooaD10FC/uGl39scZLUv6cC1E="
+  },
   "org/junit/platform#junit-platform-launcher/1.8.2": {
    "jar": "sha256-giFWQJ/YPmguTFGZs0YAVCmbU4oFjCxtD1ybalvbdZQ=",
    "module": "sha256-4XQA7HvnYIwfiI1yG0MAHpc2wVDUD5jIoLzalWPYyus=",
    "pom": "sha256-tfancaautzyJpud/Vtcp9LqOta/dDxD0TbRNaq25UJU="
   },
+  "org/latencyutils#LatencyUtils/2.0.3": {
+   "jar": "sha256-oyqf+gay9OAcU2D4+d97xdlFSl03PNjzYTR/paVxZew=",
+   "pom": "sha256-jwwBU3kLhK9sCTFtVpvRBu4PAIuTk+gLpHj1v2Vziig="
+  },
   "org/mockito#mockito-bom/4.11.0": {
    "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
   },
+  "org/mockito#mockito-bom/5.21.0": {
+   "pom": "sha256-nnTHreXWZeYN+Z1/Ie1LOEVCATAbEszguvioK/kw058="
+  },
+  "org/mockito#mockito-core/5.18.0": {
+   "jar": "sha256-o9TkD3/mYBb+QsAN5ONDd310Eyr8hQGODwOsYzSmDyk=",
+   "pom": "sha256-cCZWNGCaFVU3MDM5Ht/rh5Apl0EgpxL+DZrYC6JI790="
+  },
+  "org/mockito#mockito-junit-jupiter/5.18.0": {
+   "jar": "sha256-CIEdIIXe74Puy7vGeIXXpvbO+ZunJmgoAXCqxqSs0mU=",
+   "pom": "sha256-6pbNic+y9Ik1qjjyZVwGL/LGKkimAFgXk+/7qaa+iUY="
+  },
+  "org/mongodb#mongodb-driver-bom/5.6.2": {
+   "pom": "sha256-J6xTaeZs5XbBW+DeW+TU37Cm/xW8NNuL1/atPtSyAHM="
+  },
+  "org/objenesis#objenesis-parent/3.3": {
+   "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
+  },
+  "org/objenesis#objenesis-parent/3.5": {
+   "pom": "sha256-up+Z3fcpbWwF5EKdhEN52gFxrVboJ2RNdtVHu3PBz0o="
+  },
+  "org/objenesis#objenesis/3.3": {
+   "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=",
+   "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM="
+  },
+  "org/objenesis#objenesis/3.5": {
+   "jar": "sha256-b1q9Qs8+vA8r2uc9vFeCD8Shy4kwSShB4p6an53MhuA=",
+   "pom": "sha256-BSjmTxaXywaZOnlRcXd8bSSkJcmuDdKY7GQBhO30Zag="
+  },
+  "org/openrewrite#rewrite-bom/8.43.0": {
+   "pom": "sha256-aTTMvsnwC5QFTU6bRoUsacosiUeinr4iC1/tgpsw3e8="
+  },
+  "org/openrewrite#rewrite-bom/8.71.0": {
+   "pom": "sha256-zReadfc1+xrwN/gdm49XhYM27+nGNCuyLzWY9MpfwGw="
+  },
+  "org/openrewrite#rewrite-bom/8.79.0": {
+   "pom": "sha256-TUuYOjiEJuq35xusJeIPGD69dLHqXfjV1dXQDZlTR7c="
+  },
+  "org/openrewrite#rewrite-core/8.79.0": {
+   "jar": "sha256-XQ7amH73vbrtPyJ0SL2PyEFu3tbSJ4GEFuFfZeljKLM=",
+   "pom": "sha256-BZDdG9gXTY1gOhfuKybbqEUb4n5kbD/SebUHqQqfb3c="
+  },
+  "org/openrewrite#rewrite-docker/8.79.0": {
+   "jar": "sha256-QlZlAQa6IJssVdRHHKj18QwLwyGRz1tYys3shSp8HGw=",
+   "pom": "sha256-k9OwFgU/X4mviKp9OwP2yPNnX3oI94JOtK9buO7388I="
+  },
+  "org/openrewrite#rewrite-gradle/8.79.0": {
+   "jar": "sha256-EiJ5MpVuaaReBZVJle6TxYlsxwtawWc0hiEnQuJMEqI=",
+   "pom": "sha256-AFTD2KxsymGT+eyp0RaT+y4VwoCklF7Fq4qZ+R+HrYY="
+  },
+  "org/openrewrite#rewrite-groovy/8.79.0": {
+   "jar": "sha256-kq/se1bb46cgFc9bG0X3IPvYAnAWHFaHHtxzsD8Gn00=",
+   "pom": "sha256-E5PZvHKBXSEWpqmbGlIjcT3wcTLsBwRwOVx7F2MGle4="
+  },
+  "org/openrewrite#rewrite-hcl/8.43.0": {
+   "jar": "sha256-6XtijdTRnCMBseND0BS4Hi62zBNHq5eg70696Y+gZlI=",
+   "pom": "sha256-aOZIF6ywP9bSUdQKyNqQZUS+moBjWCAjp5h1Pgfk25Y="
+  },
+  "org/openrewrite#rewrite-java-11/8.79.0": {
+   "jar": "sha256-qt/i6z92UVKFMXtLcx1NQBooFs+V8naTpWMOuXY22Z0=",
+   "pom": "sha256-sgS+LUsKaEeWowDvT3TcYCzTByCQoIk/WepprUYZ08w="
+  },
+  "org/openrewrite#rewrite-java-17/8.79.0": {
+   "jar": "sha256-2H5X5zlIq38s1ypN8yT4AL0EMphW33XdWeypkFRD0CQ=",
+   "pom": "sha256-xgO+DtMGGoTsUTHoGkj/XGVH7EVBU2USN+bEIPSF/Ig="
+  },
+  "org/openrewrite#rewrite-java-21/8.79.0": {
+   "jar": "sha256-iGFOZ2iEF7PTedfehbLsenksLR6LIZB6XQG0fshnPvQ=",
+   "pom": "sha256-ShryCd7CV3IDXKNm9yzQ7P1XHMYrOeQ6IFNoicGFPSA="
+  },
+  "org/openrewrite#rewrite-java-25/8.79.0": {
+   "jar": "sha256-tpS3xoR1OOi3U4lKFJ2xFLb3h5G01h+HD9PJGaNW/ao=",
+   "pom": "sha256-94b6MYf4JtYzt3GwJ7NcRHFvZI4KRnysg3Sap/gXeeQ="
+  },
+  "org/openrewrite#rewrite-java-8/8.79.0": {
+   "jar": "sha256-MzUvlTeLhrcloY1NXxr19sJYOdPZUJGfElNnV70jTHA=",
+   "pom": "sha256-LBoLvaZm19xZLHydRJjJJ+CrR/UptL2sGjmgIj+rLmA="
+  },
+  "org/openrewrite#rewrite-java-lombok/8.79.0": {
+   "jar": "sha256-H7Q5B0pc6EKS6gdNml7R4t0JYIqr/8Y8LZi7676qYYI=",
+   "pom": "sha256-96yl1Z9rWyxibVnOl8puslPcQteq174Z29GnUAonTXY="
+  },
+  "org/openrewrite#rewrite-java/8.79.0": {
+   "jar": "sha256-miKg4c8mP6qGeTZQ1DtVdP2oe9mI1tI9373bNGFtmBg=",
+   "pom": "sha256-RO90rlUEHNNbhS2NL2LGmNcRB8arFp7ZirqQzO4mLss="
+  },
+  "org/openrewrite#rewrite-json/8.79.0": {
+   "jar": "sha256-VycvofMX/BEcQDAyOoN6Aa4gcAPtVklO72Fd9A1Vuvs=",
+   "pom": "sha256-ctB6BAtNXSXeQbEthgOjKu3Edo2Y4JC8v6p0rmssQ0M="
+  },
+  "org/openrewrite#rewrite-kotlin/8.79.0": {
+   "jar": "sha256-bHV70xvSgy488TO2hl/d9TCfj8ztkg2BSmsb+iWL804=",
+   "pom": "sha256-lfUhxJJQgEuz3lAgs4/unosEt05/c6mb2IFQrSIMMhw="
+  },
+  "org/openrewrite#rewrite-maven/8.79.0": {
+   "jar": "sha256-2dRHOW3xZNeQq4qLX9g8ux6qlVZFTeZ8eU62KqVFyMU=",
+   "pom": "sha256-CbuZu1goYhAiN3HbvBjHw/dRWPDGlGdix/JRKNylG3Y="
+  },
+  "org/openrewrite#rewrite-properties/8.79.0": {
+   "jar": "sha256-GbhYO2uJRlnjPUjiYoUHyiTNDwq04vKacfIX0xbvT3E=",
+   "pom": "sha256-7Jgx8wH29LIa+k4bD3Fmof6yxpXSEzW+rgyjjyqSfkI="
+  },
+  "org/openrewrite#rewrite-templating/1.41.4": {
+   "jar": "sha256-m75BsXCKsfUBv7YD1bY9Xa9YbW7Z8+rO5NL/46Xpnno=",
+   "module": "sha256-h94biaiiEFd25u+C/3JTRaQGuUQt9zGEROCkXdi6HaE=",
+   "pom": "sha256-heBhCgDqzoQGrB+L+Rzzy2XLfCZUq0S9SQE01M4mSWs="
+  },
+  "org/openrewrite#rewrite-toml/8.79.0": {
+   "jar": "sha256-tknViiiQhAEDgRZgzVfLBpT4TD9TkwFBmu9MaLuSpL0=",
+   "pom": "sha256-/dvcCNP87ORiFIQA3Q2iVNbbGQgpKi6IWkqPlxcxq5Y="
+  },
+  "org/openrewrite#rewrite-xml/8.79.0": {
+   "jar": "sha256-P9WFSfI1X8XCLJKdCOE+/zxVWsxnYqPtkn8gw3nLPcc=",
+   "pom": "sha256-8gKO+Cuj8hAVG5ZwnnB0smprPJajn1MinMDpfAPk3dM="
+  },
+  "org/openrewrite#rewrite-yaml/8.43.0": {
+   "pom": "sha256-72t+CkLZ1z/JSDj5GV7NAloMFwawqbmybz22VT3NDPc="
+  },
+  "org/openrewrite#rewrite-yaml/8.79.0": {
+   "jar": "sha256-ivLomlz7/wD4Xq5Cfy/l9vgr38yENdSMUtI+YMAtHWI=",
+   "pom": "sha256-VB2NXai3+zXxdEDs5gvB6skczAK8FCCNsifKzw6JDbk="
+  },
+  "org/openrewrite/meta#rewrite-analysis/2.31.8": {
+   "jar": "sha256-wSPlI7tQuMJ68v9NtY4/OcZOXv9BzQiTy4D8v1P0oU0=",
+   "pom": "sha256-Ghl+HdCfoCqe92yQDIphYUdcIo0GN7WrKM1svXU7/os="
+  },
+  "org/openrewrite/recipe#rewrite-github-actions/3.20.0": {
+   "jar": "sha256-u80ocnWnx3Z89w8c/lMLm3adpVgQJzmDqu46CVGL0t0=",
+   "pom": "sha256-+zri0b99o75Hf99+vMJqhaxK4E9JHlQMNLmfQtmR3L4="
+  },
+  "org/openrewrite/recipe#rewrite-java-dependencies/1.54.0": {
+   "jar": "sha256-oHzrBSX4/Pf74YoDDI6tdPgceIDSg4FbN+nZ4hgAnPo=",
+   "pom": "sha256-Yu3y7RDEKOU9Dtw4mr2URg4M8pfm0NYUvT1m08UOXkA="
+  },
+  "org/openrewrite/recipe#rewrite-jenkins/0.34.6": {
+   "jar": "sha256-GuPCWkEQunZygSnAwcoebGQo6+IzM/iEkMPD2tVCpng=",
+   "pom": "sha256-5KOpjbOWtahO65mgolg9Pj2EAYG+g0ztwMxUCRUkuOk="
+  },
+  "org/openrewrite/recipe#rewrite-migrate-java/3.32.0": {
+   "jar": "sha256-jEDG548RGl3bcLNlHBh0vt5F8Iv6Hk6GPiEJMF3YyNo=",
+   "pom": "sha256-yTwdBLJsBCNUIrdP15FhLtaRVUXtWMzifsw954h4d/M="
+  },
+  "org/openrewrite/recipe#rewrite-recipe-bom/3.22.0": {
+   "pom": "sha256-c2Wj/1gbUVkcheCocQgec1iZD7mMK8yJwbsUgteDbEU="
+  },
+  "org/openrewrite/recipe#rewrite-recommendations/1.15.0": {
+   "jar": "sha256-l9lBb4GjtZnn+FEcNUYWwP+gh5lTsKikhMAedlpIToM=",
+   "pom": "sha256-2U/5/BgEFyv+9YWmTVXFVYvSXlIBGLD1WMWDeHzQNiQ="
+  },
+  "org/openrewrite/recipe#rewrite-static-analysis/2.32.0": {
+   "jar": "sha256-GKwgklnT1nl3XtH33+7mWvNIgZDEuarp1AoRv/XNY28=",
+   "pom": "sha256-AMm/Yjno+JQO4cteU2+tbS7jit95WPHYy6EWNWVppfs="
+  },
+  "org/openrewrite/recipe#rewrite-terraform/3.0.0": {
+   "jar": "sha256-eRE9ddUSVt1mNDwzNfQAf6x7tfUuEcAbBme+dChn9fQ=",
+   "pom": "sha256-wty/DCXqoHDIMFh1EN5se/KMb8Ht22eHE6Sd9JGqwpk="
+  },
+  "org/openrewrite/recipe#rewrite-testing-frameworks/3.34.0": {
+   "jar": "sha256-wKVIq2/oUt4dbbSbcsimnUD4wWMsSkmyipyLHQqVO08=",
+   "pom": "sha256-rSQnvC7t3gsoavLX+1CmleI1xZccqjR+OC52X1tsnOc="
+  },
+  "org/openrewrite/tools#java-object-diff/1.0.1": {
+   "jar": "sha256-jc8DgdMGxSI86kwKy4Sv1WkexutB4Lajbdooigx+xNw=",
+   "pom": "sha256-WB1ijMi/jOggPdk0mFEiFkhqZeiG6KM7lLgZgdWrEe4="
+  },
+  "org/openrewrite/tools#jgit/1.4.1": {
+   "jar": "sha256-SjFr8Z4OsSW65JExcY4XtHaVxb+cgINZaUCB57oBy74=",
+   "pom": "sha256-jWzoE7iIlYtixhzxV94P9d0OolhGzJtzHrXo84cXVcs="
+  },
   "org/opentest4j#opentest4j/1.2.0": {
    "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
    "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
   },
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+  },
+  "org/osgi#org.osgi.annotation.bundle/2.0.0": {
+   "jar": "sha256-uclUbsW+PrwuhbpJGRUK121kWUgFKC/IlRM6R9Jkp64=",
+   "pom": "sha256-i5z4pBKev1J48mNNNQnDcig5Ya0P3MhaJFuzXXoipcg="
+  },
+  "org/osgi#org.osgi.annotation.versioning/1.1.2": {
+   "jar": "sha256-9R8jXoDfj/vDDvG1V7bqOKaWYy1nVATsEX6VKXi4uGM=",
+   "pom": "sha256-sdMBKr/6K3/Eo9C67oeESUwHOYawANZVp4j6YXqqK8g="
+  },
+  "org/osgi#org.osgi.resource/1.0.0": {
+   "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=",
+   "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA="
+  },
+  "org/osgi#org.osgi.service.serviceloader/1.0.0": {
+   "jar": "sha256-j4ds4qmqTpWx8ZUpUCVRA+JIdCUFCmVPMoVEe6YBwVQ=",
+   "pom": "sha256-dVdRq2w3oaMa+1ueSllcDdLv0rUNcDshJVuCfFDtYVM="
+  },
   "org/ow2#ow2/1.5.1": {
    "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
   },
-  "org/ow2/asm#asm-bom/9.7.1": {
-   "pom": "sha256-qNMCypF0b46grZBx9i/zoNq9Ov5h2hTMgMHIdc9hi0I="
+  "org/ow2/asm#asm-analysis/9.9.1": {
+   "jar": "sha256-YmC//I7ACN0bcTcCx5lOLJTRiKPaW++ehyeKFt9qdSI=",
+   "pom": "sha256-NiF+gtimATTPIQ+A63bdrllVkcYIXKuBa1qhDOmfy6A="
+  },
+  "org/ow2/asm#asm-bom/9.9.1": {
+   "pom": "sha256-6XiDGaZk6tWHmD4Lwx7j2oY3Ohn0LcIhDtqMmbTUcAE="
+  },
+  "org/ow2/asm#asm-tree/9.9.1": {
+   "jar": "sha256-DzVVCWtyC4ILusqwtRVYm+4CAL7gmb2hTFYXOK6De6E=",
+   "pom": "sha256-Z/7kRrpRKHEwBzjw+Vb2GlAKhS9oYf9w8KPHvwwPpAU="
+  },
+  "org/ow2/asm#asm-util/9.9.1": {
+   "jar": "sha256-xeu76vaBJq8JS0L6SAD1m8RBOr0C2Vua761yLNJX4gc=",
+   "pom": "sha256-Unlp0IpNdfm9r5y/ODfphpaimJC8AX2V/Kb/gQ8NcEw="
+  },
+  "org/ow2/asm#asm/9.9.1": {
+   "jar": "sha256-bzgoohXJIAWaXvovtVwjPWxU7FytypnOGxvdEAd8fd0=",
+   "pom": "sha256-rKaN7pui9s2Q/95yjv3H4+v89Z8/Qfv+JI0tAdW4Zq8="
+  },
+  "org/projectlombok#lombok/1.18.44": {
+   "jar": "sha256-xukb/cNYux77Je4YXpWq+bYABD5fgdA712rvwBA1v4Y=",
+   "pom": "sha256-OVHse72PKj1jcndGuCxzpU0+xEqe4l/8L2PGmW6eUGo="
   },
   "org/slf4j#slf4j-api/2.0.17": {
    "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
@@ -1216,6 +2001,9 @@
   "org/slf4j#slf4j-parent/2.0.17": {
    "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
   },
+  "org/sonatype/oss#oss-parent/5": {
+   "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
+  },
   "org/sonatype/oss#oss-parent/7": {
    "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
   },
@@ -1226,8 +2014,16 @@
    "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
    "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
   },
-  "org/testcontainers#testcontainers-bom/1.20.4": {
-   "pom": "sha256-oVFHwtqO3sE0AdHT5qCgG2Gea2e2bBA1ks7zpwzB7Ik="
+  "org/springframework#spring-framework-bom/7.0.2": {
+   "module": "sha256-+3+nBI3qzmuFDm8sqWoIn2C8tKtNKhsZOaG/PrgOHKw=",
+   "pom": "sha256-00mTsqATTgb6NDmD6zdMojzd+LNNcaRsr0sjXuCHwGc="
+  },
+  "org/springframework/security#spring-security-bom/7.0.2": {
+   "module": "sha256-+3kx5Muv0dR3FtBkvMkDAAigz2iCQDBJ5YB1D+ULC/I=",
+   "pom": "sha256-sxqFOFfStOReOcCIl7vgvHz3PyuaZfqBY+e9UACQFZ0="
+  },
+  "org/testcontainers#testcontainers-bom/2.0.4": {
+   "pom": "sha256-Ua73WDIROPjgGuJ2k4FJLj66Aew2jgM+yAgcHYchStI="
   },
   "org/threeten#threeten-extra/1.8.0": {
    "jar": "sha256-UeTSHtxOlEf3dgwFDguu5119lz84e6YFoXq9xNJP1tg=",
@@ -1236,6 +2032,37 @@
   "org/threeten#threetenbp/1.7.0": {
    "jar": "sha256-hXkX0jGaTpLcHF4663Wg2shERe0xXnrD2Cu40rKYl38=",
    "pom": "sha256-nLthSu/sbVcp7MrdZMmhnpshg/w6Dgk8APN2rPptC0Q="
+  },
+  "org/yaml#snakeyaml/2.3": {
+   "pom": "sha256-D1omWgYzGwBJ41K+MsoyLeGLF/PU27cGNdQNppLjWC8="
+  },
+  "org/yaml#snakeyaml/2.5": {
+   "jar": "sha256-5mgqzxrOd1CO8TZJy/T40J0s9UV722HSX/tqwCM9eN0=",
+   "pom": "sha256-ugGuenRMtS/o7POwI8vDLgzMjGvu+fJt53pHgII5RH0="
+  },
+  "org/yaml#snakeyaml/2.6": {
+   "jar": "sha256-yPepjnOUrdoC9jFySXEOTRtMeiWqjH6s4MLupS64v4U=",
+   "pom": "sha256-J3Ow6UiWTSHjew4dzzkCXmJ7hz4M5qoqR+I8N0MD4MQ="
+  },
+  "tech/picnic/error-prone-support#error-prone-contrib/0.28.0": {
+   "pom": "sha256-KqGnWN3IZbsOFz4s50t/BDv8hyiCDBMoHD2FpTgwF6U="
+  },
+  "tech/picnic/error-prone-support#error-prone-contrib/0.28.0/recipes": {
+   "jar": "sha256-6P1VvLhRHagTyuISmEdrPs+PPKRhG37DojZCppVuKu8="
+  },
+  "tech/picnic/error-prone-support#error-prone-support/0.28.0": {
+   "pom": "sha256-Iiyhosx5SX4TZ6kPsh/Oz4QnjfOKXKKOvn/S1vB2+I8="
+  },
+  "tech/picnic/error-prone-support#error-prone-utils/0.28.0": {
+   "jar": "sha256-EixPpNut12e+umvnfDwBWQxMBlNSra27DEbzR0GUk+w=",
+   "pom": "sha256-lO/UMlDikBl0g/TLd81hR+4VlLPnT9Z0qN23q6KYqVI="
+  },
+  "tech/picnic/error-prone-support#refaster-support/0.28.0": {
+   "jar": "sha256-3+AmLeZKXmwbAIvLA/fX3nBuIVikULwRXoROdIlRgdY=",
+   "pom": "sha256-LYzXWj49aOXnijLEib0ePEpDGFeCghKgHOcPRV8F8m8="
+  },
+  "tools/jackson#jackson-bom/3.0.3": {
+   "pom": "sha256-hOPOTqXFbXvqiGH+HEOayaGd1UqaPem4oIhL8LvHUPI="
   }
  }
 }
diff --git a/pkgs/by-name/fr/freerouting/package.nix b/pkgs/by-name/fr/freerouting/package.nix
index 62a5892a5f93..328e212d4570 100644
--- a/pkgs/by-name/fr/freerouting/package.nix
+++ b/pkgs/by-name/fr/freerouting/package.nix
@@ -4,27 +4,48 @@
   fetchFromGitHub,
   makeBinaryWrapper,
   makeDesktopItem,
-  jdk,
+  jdk25,
   gradle,
   copyDesktopItems,
-  jre,
+  jre25_minimal,
 }:
+
+let
+  jre = jre25_minimal.override {
+    modules = [
+      "java.base"
+      "java.compiler"
+      "java.desktop"
+      "java.instrument"
+      "java.naming"
+      "java.net.http"
+      "java.rmi"
+      "java.scripting"
+      "java.security.jgss"
+      "java.sql"
+      "jdk.attach"
+      "jdk.jdi"
+      "jdk.management"
+      "jdk.unsupported"
+    ];
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "freerouting";
-  version = "2.1.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "freerouting";
     repo = "freerouting";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-K4fwbvSPuKAAnIcTDBSAI1/6HuCB7c9rCGTJcyAj5dQ=";
+    hash = "sha256-bIts0ORxw9GDKRP78k0YnrfUqBliyf8v3gK/WtfNRgw=";
   };
 
-  gradleBuildTask = "executableJar";
+  gradleBuildTask = "dist";
 
   nativeBuildInputs = [
     makeBinaryWrapper
-    jdk
+    jdk25
     gradle
     copyDesktopItems
   ];
@@ -36,16 +57,29 @@ stdenv.mkDerivation (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
+  gradleFlags = [ "--no-configuration-cache" ];
+
+  postPatch = ''
+    # The rewrite-gradle plugin breaks the nixDownloadDeps task injected by fetchDeps
+    substituteInPlace build.gradle \
+      --replace-fail "rewrite 'org.openrewrite.recipe:rewrite-gradle:2.3.0'" ""
+    # Disable telemetry and contact options by default
+    substituteInPlace src/main/java/app/freerouting/settings/UserProfileSettings.java \
+      --replace-fail 'public Boolean isTelemetryAllowed = true;' 'public Boolean isTelemetryAllowed = false;'
+    substituteInPlace src/main/java/app/freerouting/settings/UserProfileSettings.java \
+      --replace-fail 'public Boolean isContactAllowed = true;' 'public Boolean isContactAllowed = false;'
+  '';
+
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/{bin,share/freerouting}
-    cp build/libs/freerouting-executable.jar $out/share/freerouting
+    cp build/dist/freerouting-executable.jar $out/share/freerouting
 
     makeWrapper ${lib.getExe jre} $out/bin/freerouting \
       --add-flags "-jar $out/share/freerouting/freerouting-executable.jar"
 
-    install -Dm644 ${finalAttrs.src}/design/icon/freerouting_icon_256x256_v1.png \
+    install -Dm644 ${finalAttrs.src}/assets/icon/freerouting_icon_256x256_v3.png \
       $out/share/icons/hicolor/256x256/apps/freerouting.png
 
     runHook postInstall
@@ -74,7 +108,10 @@ stdenv.mkDerivation (finalAttrs: {
       Freerouting is an advanced autorouter for all PCB programs that support
       the standard Specctra or Electra DSN interface. '';
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ srounce ];
+    maintainers = with lib.maintainers; [
+      srounce
+      Misaka13514
+    ];
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "freerouting";
   };
diff --git a/pkgs/by-name/fr/freetype/package.nix b/pkgs/by-name/fr/freetype/package.nix
index d9c4e6d121a9..6146ce0d8cc1 100644
--- a/pkgs/by-name/fr/freetype/package.nix
+++ b/pkgs/by-name/fr/freetype/package.nix
@@ -39,7 +39,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freetype";
-  version = "2.13.3";
+  version = "2.14.2";
 
   src =
     let
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     in
     fetchurl {
       url = "mirror://savannah/freetype/freetype-${version}.tar.xz";
-      sha256 = "sha256-BVA1BmbUJ8dNrrhdWse7NTrLpfdpVjlZlTEanG8GMok=";
+      sha256 = "sha256-S2Lcq0ySChqGA2mTMiGBQ2LmmeJvVXklFtZx5v9VteE=";
     };
 
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix
index 6f114056da82..e2b79c9631e3 100644
--- a/pkgs/by-name/fr/fresh-editor/package.nix
+++ b/pkgs/by-name/fr/fresh-editor/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fresh";
-  version = "0.2.25";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "sinelaw";
     repo = "fresh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-47m2aIc2QphYLB8yMgd/ZkIfDNymW4kE0Gtgmb0K7gk=";
+    hash = "sha256-1i87gZgAicFKEIfI3aqek8pHT+iDI7Y4awyBGzLcggo=";
   };
 
-  cargoHash = "sha256-lirATYtgg6RxJSR3fLb7Welkra1zabffGLqtg5bR4NM=";
+  cargoHash = "sha256-l88eXpCoMQV63iZ1tLwjeM+TVH/Juibr5MHX3sL6jLA=";
 
   nativeBuildInputs = [
     gzip
diff --git a/pkgs/by-name/fr/frozen-containers/package.nix b/pkgs/by-name/fr/frozen-containers/package.nix
index 89ff0ad6c745..3ef8e7dca1d0 100644
--- a/pkgs/by-name/fr/frozen-containers/package.nix
+++ b/pkgs/by-name/fr/frozen-containers/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation {
   pname = "frozen-containers";
-  version = "1.2.0-unstable-2025-07-29";
+  version = "1.2.0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "serge-sans-paille";
     repo = "frozen";
-    rev = "61dce5ae18ca59931e27675c468e64118aba8744";
-    hash = "sha256-zIczBSRDWjX9hcmYWYkbWY3NAAQwQtKhMTeHlYp4BKk=";
+    rev = "b07a5c8187bc3e6f1461efab89fe07f467e300db";
+    hash = "sha256-eZdiLKUcx1MTcW+HyoRi6U/lUbs/qAQhRw0wX3tpUjY=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix
index c29ae1c0ac7c..bd0dd47c3d2a 100644
--- a/pkgs/by-name/fr/frr/package.nix
+++ b/pkgs/by-name/fr/frr/package.nix
@@ -31,7 +31,8 @@
   readline,
   rtrlib,
   protobufc,
-  zeromq,
+  sqlite,
+  lua53Packages,
 
   # tests
   net-tools,
@@ -80,13 +81,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "frr";
-  version = "10.5.3";
+  version = "10.6.0";
 
   src = fetchFromGitHub {
     owner = "FRRouting";
     repo = "frr";
     rev = "frr-${finalAttrs.version}";
-    hash = "sha256-nVXoRApW8EZtP1HiGJ5JBJaoQXVISfPK2k+xmCtdVH0=";
+    hash = "sha256-o0h9adGvb9FEcAMYrjrjTb7MMozdXriOsK6fE0fGjss=";
   };
 
   # Without the std explicitly set, we may run into abseil-cpp
@@ -119,7 +120,8 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     readline
     rtrlib
-    zeromq
+    lua53Packages.lua
+    sqlite
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libcap
@@ -148,11 +150,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   configureFlags = [
+    "--disable-zeromq"
     "--disable-silent-rules"
     "--enable-configfile-mask=0640"
     "--enable-group=frr"
     "--enable-logfile-mask=0640"
     "--enable-multipath=${toString numMultipath}"
+    "--enable-config-rollbacks"
+    "--enable-scripting"
     "--enable-user=frr"
     "--enable-vty-group=frrvty"
     "--localstatedir=/var"
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index 3a3938ff1781..a41c089a6a5a 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -12,7 +12,7 @@ buildDotnetModule (finalAttrs: {
   version = "0.83.0";
 
   src = fetchFromGitHub {
-    owner = "fsharp";
+    owner = "ionide";
     repo = "FsAutoComplete";
     tag = "v${finalAttrs.version}";
     hash = "sha256-1WK6vb/UfqnF5KlwrjmGTPeAnEgwPswcYweeotB6j00=";
@@ -24,7 +24,7 @@ buildDotnetModule (finalAttrs: {
     rm global.json
 
     substituteInPlace src/FsAutoComplete/FsAutoComplete.fsproj \
-      --replace-fail TargetFrameworks TargetFramework \
+      --replace-fail TargetFrameworks TargetFramework
   '';
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
@@ -43,8 +43,8 @@ buildDotnetModule (finalAttrs: {
   meta = {
     description = "Backend service for rich editing or intellisense features for editors";
     mainProgram = "fsautocomplete";
-    homepage = "https://github.com/fsharp/FsAutoComplete";
-    changelog = "https://github.com/fsharp/FsAutoComplete/releases/tag/${finalAttrs.src.tag}";
+    homepage = "https://github.com/ionide/FsAutoComplete";
+    changelog = "https://github.com/ionide/FsAutoComplete/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/fs/fscan/package.nix b/pkgs/by-name/fs/fscan/package.nix
index fb6bf6f5d397..84b108f41624 100644
--- a/pkgs/by-name/fs/fscan/package.nix
+++ b/pkgs/by-name/fs/fscan/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "fscan";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "shadow1ng";
     repo = "fscan";
-    rev = finalAttrs.version;
-    hash = "sha256-OFlwL7PXKOPKIW2YCirCGCXRCGIWYMmYHMmSU2he/tw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wvtabfLoPKCmoWL083z1c3g0iOQRtTtgwZxozIaeiw0=";
   };
 
-  vendorHash = "sha256-+m87ReIUOqaTwuh/t0ow4dODG9/G21Gzw6+p/N9QOzU=";
+  vendorHash = "sha256-hDe5IMvOUeAvst8mCWNMCRWcPyJ9Ufomv1Zpjxgcj/0=";
 
   meta = {
     description = "Intranet comprehensive scanning tool";
diff --git a/pkgs/by-name/ft/ft2-clone/package.nix b/pkgs/by-name/ft/ft2-clone/package.nix
index 39313c4ecb13..8f0f7fe7f004 100644
--- a/pkgs/by-name/ft/ft2-clone/package.nix
+++ b/pkgs/by-name/ft/ft2-clone/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ft2-clone";
-  version = "2.16";
+  version = "2.17";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "ft2-clone";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+ifMydkwMmJ2d5DcYEaDzaX12JAHGAVCZLSBPrBDLFg=";
+    hash = "sha256-ebyFMZV2LBtEbf7yjO9o9mp3UEoECHAHUQm4lwUS/Ws=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/fv/fvwm3/package.nix b/pkgs/by-name/fv/fvwm3/package.nix
index 57e0fb1fd6a3..e066fa6306fe 100644
--- a/pkgs/by-name/fv/fvwm3/package.nix
+++ b/pkgs/by-name/fv/fvwm3/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   asciidoctor,
+  autoconf269,
   autoreconfHook,
   cairo,
   fetchFromGitHub,
@@ -40,7 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-y1buTWO1vHzloh2e4EK1dkD0uQa7lIFUbNMkEe5x6Vo=";
   };
 
+  # Build fails with autoconf 2.73
   nativeBuildInputs = [
+    autoconf269
     autoreconfHook
     asciidoctor
     pkg-config
diff --git a/pkgs/by-name/fw/fwup/package.nix b/pkgs/by-name/fw/fwup/package.nix
index 928b8a47aa83..40207fd2677c 100644
--- a/pkgs/by-name/fw/fwup/package.nix
+++ b/pkgs/by-name/fw/fwup/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwup";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kVkw+/Z3+ZM1wXV/OmfaVPoUKc6MRuz8GRwpvOscuEM=";
+    hash = "sha256-SIRDVlC/g+rq5m4Ind7dqPzjdCjAxRK/kAdXt6byL/8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
index 5c08854d67ab..9e679f45d6d2 100644
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@@ -311,7 +311,7 @@ stdenv.mkDerivation (finalAttrs: {
     addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share"
 
     echo "12345678901234567890123456789012" > machine-id
-    export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \
+    export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id)
   '';
 
   postInstall = ''
diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix
index 66986cf04eb4..601532bd68c4 100644
--- a/pkgs/by-name/fz/fzf/package.nix
+++ b/pkgs/by-name/fz/fzf/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "fzf";
-  version = "0.71.0";
+  version = "0.72.0";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fEHNE51VTggSwNutefCg/WueaXRE1J0D/dyVPFqhTJg=";
+    hash = "sha256-rUxbC2+VASAEBmL8WOpywk0SD0gyHArisl4pxnqK32I=";
   };
 
   vendorHash = "sha256-uFXHoseFOxGIGPiWxWfDl339vUv855VHYgSs9rnDyuI=";
diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix
index c7fbcfed9c7e..0718166c7761 100644
--- a/pkgs/by-name/ga/gaphor/package.nix
+++ b/pkgs/by-name/ga/gaphor/package.nix
@@ -13,14 +13,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gaphor";
-  version = "3.3.0";
+  version = "3.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gaphor";
     repo = "gaphor";
     tag = finalAttrs.version;
-    hash = "sha256-bgcri0mgFKz4jtGJSWtlStS3f4FzYH+ZPE1BsK+S1DI=";
+    hash = "sha256-oGOi1vyLOrElj/kbqHgPEyAwtVvVA3a1j9VSWMts/bM=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/ga/garmin-grafana/package.nix b/pkgs/by-name/ga/garmin-grafana/package.nix
index 262c1adaf30e..376c8584fd3c 100644
--- a/pkgs/by-name/ga/garmin-grafana/package.nix
+++ b/pkgs/by-name/ga/garmin-grafana/package.nix
@@ -5,7 +5,7 @@
 }:
 python3Packages.buildPythonPackage rec {
   pname = "garmin-grafana";
-  version = "0.3.0";
+  version = "0.5.0";
 
   pyproject = true;
 
@@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec {
     owner = "arpanghosh8453";
     repo = "garmin-grafana";
     tag = "v${version}";
-    hash = "sha256-nuVT6LK9KIs/FwUbdfI4xpKru4jfAyj1/vmk7ji43zk=";
+    hash = "sha256-NrT4erpdWwqFBUumQdd5GqpmhIayszzkPd8fUgDRwXY=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json
index 87311a1ef33b..28e779db05da 100644
--- a/pkgs/by-name/ga/garnet/deps.json
+++ b/pkgs/by-name/ga/garnet/deps.json
@@ -31,8 +31,8 @@
   },
   {
     "pname": "diskann-garnet",
-    "version": "1.0.23",
-    "hash": "sha256-+/2r68Sx07ziIG66BGcZ54OYnZFMjB6jCePxfuzwQH4="
+    "version": "1.0.26",
+    "hash": "sha256-xKcv20olcK/0HBKsiaB+gNXqz6YyKHEdvYVjqssIjy0="
   },
   {
     "pname": "KeraLua",
@@ -46,43 +46,38 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "10.0.3",
-    "hash": "sha256-Qeh/7eMiP/RHekoK3LoIRYHEP7vPKWn/i3cTZiRQlIM="
+    "version": "10.0.5",
+    "hash": "sha256-6rOmJD7Jzq5MPLDd1aV+7gCQwIM9j4c+iT1pGea/daI="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "10.0.3",
-    "hash": "sha256-OfcPeDv7RJvvv7ns+wCMAQCdG/He2KtxV6MRlwvp35I="
+    "version": "10.0.5",
+    "hash": "sha256-DNK+lL2jeHFYyd43zfgVY32UskEfQ4YsTapztuQbYwo="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "10.0.3",
-    "hash": "sha256-XBHZjXmKz8W55kdqZSx1Ylxr1bQtekVPt6bcxRO1u3k="
+    "version": "10.0.5",
+    "hash": "sha256-cVG2NEW1rgLfeq/Gnh/XXqzDx2Tt8ecvgCAB4uFzcQo="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "10.0.3",
-    "hash": "sha256-h/wiSaVtRCIGdkv6/soA41Dhdlmu2I9hjv/swP8OjDk="
+    "version": "10.0.5",
+    "hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "10.0.3",
-    "hash": "sha256-ShB94jEtsq5X5r6xDZQ+wotZYG3OPKOCHNGy4B7NVFs="
+    "version": "10.0.5",
+    "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "10.0.3",
-    "hash": "sha256-UmpmoOaxBJlm4FL6pGtRXKK+8YYj5hE/59ox2vGZl+A="
+    "version": "10.0.5",
+    "hash": "sha256-4gVrKZfo/YHZKgKNsgGZZYqa79XWK9wDUuiVfguUV6U="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "10.0.0",
-    "hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "10.0.3",
-    "hash": "sha256-lIStSIPTxaoCRoUBHsBPXZbuVj5io02390Wkyepyflw="
+    "version": "10.0.5",
+    "hash": "sha256-e3A/l+II+n+D7/OPwjdyQM1IBtKHfHeIdlkJmuRw77w="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -96,28 +91,28 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
-    "version": "10.0.3",
-    "hash": "sha256-aWROg7QQ+U8lOEqwqlph8/myeDe9bwaKKLTFoEMcq3A="
+    "version": "10.0.5",
+    "hash": "sha256-yp0WZcCm+SAkMP9U/B3Dg/v282pFMXbZHVzAp2GLGwA="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Console",
-    "version": "10.0.3",
-    "hash": "sha256-q+0WzmR9/V+2K+C/OPP7f8abIc/kWCrbhi+cYAC9GFw="
+    "version": "10.0.5",
+    "hash": "sha256-Epf70cMofVjqKQxTTgsmNNRW8YcpHj5c80nX8cJTv40="
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "10.0.3",
-    "hash": "sha256-KDYaVBSdNEuhs3U164RV0n20cjwrpi7uI71B0j/UFsA="
+    "version": "10.0.5",
+    "hash": "sha256-nw+m6VWXjmaBqZ1aH/l9SR9Oy62N9dmiMKloJ78kxv8="
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "10.0.3",
-    "hash": "sha256-Wia7KiEYjMilkXSDmsY7edXvtvUFw7kppv/J/cYMPXo="
+    "version": "10.0.5",
+    "hash": "sha256-VQPPvrvYWY/QpmilerCyTNLVejWeBE9mHtGTMOxXUlg="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "10.0.3",
-    "hash": "sha256-w0G+IW9kz70ug1BEuJTeS1N7werQhms3gQl6ODzNIpQ="
+    "version": "10.0.5",
+    "hash": "sha256-uvrur+0dg4zAAQcpLkkhPA77ST0tA3+EpGdDlCckC+E="
   },
   {
     "pname": "Microsoft.Identity.Client",
@@ -136,38 +131,38 @@
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
-    "version": "8.16.0",
-    "hash": "sha256-OpTFQpTtg1A8I1bBIOqv/n9pwYXTqzMI8ZLXLZDti5w="
+    "version": "8.17.0",
+    "hash": "sha256-AU+EMOZArc3rTdsnKYzAufFAtspuYQM3XYi8/VsQAio="
   },
   {
     "pname": "Microsoft.IdentityModel.JsonWebTokens",
-    "version": "8.16.0",
-    "hash": "sha256-Cctf2iuIXLMklTuCvzWv721v2mHs0HEBA47BqAKhp9I="
+    "version": "8.17.0",
+    "hash": "sha256-MH7vdhCNAae32p6UTvaDtmyvFDxa/W71qTsEQ6yC9xM="
   },
   {
     "pname": "Microsoft.IdentityModel.Logging",
-    "version": "8.16.0",
-    "hash": "sha256-355u+3LIn/QfiCHFMXD+3ipdRTnbXLAQNzC4sWEFapQ="
+    "version": "8.17.0",
+    "hash": "sha256-IM6jsPMz+l9JA0cye/v2ke51xlfP0u5HtWBqc2aKDYM="
   },
   {
     "pname": "Microsoft.IdentityModel.Protocols",
-    "version": "8.16.0",
-    "hash": "sha256-1arWAORCo4ogzYphGkkdamLinl2T9Euhu4BAdf95+ds="
+    "version": "8.17.0",
+    "hash": "sha256-T2Prc5tynPw9VY8gFBq7lqTrBlLGH63PdEE6G+2NkSk="
   },
   {
     "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect",
-    "version": "8.16.0",
-    "hash": "sha256-SgkwN+uAHQRm1VKoJdrbiMXBNa94nWrL2Pv0BVJh+qY="
+    "version": "8.17.0",
+    "hash": "sha256-jBY4s5PYGSDaAqX24pJS4lTQWULw6ftkz/AunrqQ0Cg="
   },
   {
     "pname": "Microsoft.IdentityModel.Tokens",
-    "version": "8.16.0",
-    "hash": "sha256-6s8ZLnKw32W6+KbnahCVe1v9YzpoemnpHNQ3VbFSV4M="
+    "version": "8.17.0",
+    "hash": "sha256-XcA0KXJbqMWt0I5LuHHMRLpgVQ18KcBej1BoySHeA1A="
   },
   {
     "pname": "Microsoft.IdentityModel.Validators",
-    "version": "8.16.0",
-    "hash": "sha256-dcoka+AtzN9W5UrAjw4Nm6NajvAMmOicQ4xvUKoIQIQ="
+    "version": "8.17.0",
+    "hash": "sha256-kmYad8WDMK9lZQBOCrsu3HuzXCbD+oQmRcOZU9++VPI="
   },
   {
     "pname": "System.ClientModel",
@@ -181,13 +176,13 @@
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "10.0.3",
-    "hash": "sha256-YQzu50E7/1slw8IcFkVpQd33/IyWw1hJapTIscnoF5Q="
+    "version": "10.0.5",
+    "hash": "sha256-yVXEbpbQRF+B4oYUJEWUgMUmOvZTFZzK3CWrr9pynVY="
   },
   {
     "pname": "System.IdentityModel.Tokens.Jwt",
-    "version": "8.16.0",
-    "hash": "sha256-wCEkUPnKDjO7Kpfr1vpr5Icvk69gFHgEWcSLbFtD6pg="
+    "version": "8.17.0",
+    "hash": "sha256-DmAmWVosgwWlKGJm/0wFVbeV19YD2rT+gp8utjY0n0Q="
   },
   {
     "pname": "System.IO.Hashing",
@@ -196,8 +191,8 @@
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "10.0.3",
-    "hash": "sha256-+LsHlaUFMFVb60U7GFcvD1l7IpEcjdm1+Iw2g+qrUik="
+    "version": "10.0.5",
+    "hash": "sha256-zV+G9x2d3ugEaq7ClmZbMhQe0901hxj0WtleEEglpcE="
   },
   {
     "pname": "System.Memory.Data",
@@ -206,8 +201,8 @@
   },
   {
     "pname": "System.Numerics.Tensors",
-    "version": "10.0.3",
-    "hash": "sha256-EpyBN0KGkS9aVj1DU75G60Ok+SvwbtYmEqmQJFnRi40="
+    "version": "10.0.5",
+    "hash": "sha256-psWBXBfetquCOYPsbooxhef1Wi4TlwnPVRarSHBixKw="
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
@@ -216,12 +211,12 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "10.0.3",
-    "hash": "sha256-TuOSPfi9dfFnHvH5++zIi30JpRERp35HFpm2R0NWUAk="
+    "version": "10.0.5",
+    "hash": "sha256-8dXorb9rjnaqD8EpGlyHkvKrwgcxZblQdzeLYDdk6lw="
   },
   {
     "pname": "System.Text.Json",
-    "version": "10.0.3",
-    "hash": "sha256-E1gPHMAuk2tR4cyScCfsSlDDerhlLAQCUZZMiByIk18="
+    "version": "10.0.5",
+    "hash": "sha256-Phy+3UAOvqk8U0yeCSpr4n6H7JjKMTHdrHlV2bZfiUU="
   }
 ]
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index a3619c62ce4d..2d93a6363906 100644
--- a/pkgs/by-name/ga/garnet/package.nix
+++ b/pkgs/by-name/ga/garnet/package.nix
@@ -8,13 +8,13 @@
 
 buildDotnetModule rec {
   pname = "garnet";
-  version = "1.1.1";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-Ngy49BjWQoMC7hqZFJxzrFIPxjG3eZmjKgUzZ2e2owQ=";
+    hash = "sha256-4XGJ+TnWMiphXumy42AmNnCixqLGmLftANwDz11f6TQ=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";
diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix
index 0d7dd048d2d7..8a5b783ecd8d 100644
--- a/pkgs/by-name/ga/gat/package.nix
+++ b/pkgs/by-name/ga/gat/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gat";
-  version = "0.27.0";
+  version = "0.27.1";
 
   src = fetchFromGitHub {
     owner = "koki-develop";
     repo = "gat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xydy+iKBfO1np/jtzWHFNUmXqb545ldWtwqMymaah2c=";
+    hash = "sha256-8+IpVMbV+1aXNZoIWVZF/GDsLh2G1rHudkyifguGl0g=";
   };
 
-  vendorHash = "sha256-0kNtZOTpWpeFVyRHFIf6ybM7gAWb5/JWVljm0FO5fK8=";
+  vendorHash = "sha256-UUFfM51toafSxK+x7Q7c9wPDiO22f7YfLc05u3uWLAE=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/ga/gatekeeper/package.nix b/pkgs/by-name/ga/gatekeeper/package.nix
index 8dad97fc7d3d..9ec712993a9d 100644
--- a/pkgs/by-name/ga/gatekeeper/package.nix
+++ b/pkgs/by-name/ga/gatekeeper/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gatekeeper";
-  version = "3.22.1";
+  version = "3.22.2";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "gatekeeper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lYLII1aJwrYmoyVYf08KDyvIVuCJIya/97hLQyGKz44=";
+    hash = "sha256-fW5aSZ9/X/oQM8r1NWkNHlK+pd+ji7GTWPGx0NEW9gk=";
   };
 
   vendorHash = "sha256-PnBWUvpq7d3yQP50fgACWx/zcYobIGC+KiuzLqpKDcI=";
diff --git a/pkgs/by-name/gc/gcal/add-missing-include.patch b/pkgs/by-name/gc/gcal/add-missing-include.patch
new file mode 100644
index 000000000000..fb9fb6d4a93e
--- /dev/null
+++ b/pkgs/by-name/gc/gcal/add-missing-include.patch
@@ -0,0 +1,9 @@
+diff --git a/tests/check_utils.c b/tests/check_utils.c
+index 7229e4b..a422af4 100644
+--- a/tests/check_utils.c
++++ b/tests/check_utils.c
+@@ -1,3 +1,4 @@
++#include "../config.h"
+ #include <stdlib.h>
+ 
+ #include "../src/tailor.h"
diff --git a/pkgs/by-name/gc/gcal/fix-gnulib-link.patch b/pkgs/by-name/gc/gcal/fix-gnulib-link.patch
new file mode 100644
index 000000000000..aa1c379ca462
--- /dev/null
+++ b/pkgs/by-name/gc/gcal/fix-gnulib-link.patch
@@ -0,0 +1,17 @@
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index c45abcc..01727ef 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -2003,11 +2003,7 @@ GCAL_OBJS = \
+   ../src/utils.o
+ 
+ GCAL_GNULIB_OBJS = \
+-  ../lib/fclose.o \
+-  ../lib/fflush.o \
+-  ../lib/fseeko.o \
+-  ../lib/ioctl.o \
+-  ../lib/tmpdir.o 
++  ../lib/libgnu.a
+ 
+ check_gcal_SOURCES = check_gcal.c \
+                            check_file-io.c \
diff --git a/pkgs/by-name/gc/gcal/package.nix b/pkgs/by-name/gc/gcal/package.nix
index c00dc6778a0d..948806db441e 100644
--- a/pkgs/by-name/gc/gcal/package.nix
+++ b/pkgs/by-name/gc/gcal/package.nix
@@ -4,31 +4,45 @@
   fetchurl,
   ncurses,
   gettext,
-  fetchpatch,
+  pkg-config,
+  check,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gcal";
-  version = "4.1";
+  version = "4.2.0";
 
   src = fetchurl {
-    url = "mirror://gnu/gcal/gcal-${finalAttrs.version}.tar.xz";
-    sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci";
+    url = "https://www.alteholz.dev/gnu/gcal-${finalAttrs.version}.tar.xz";
+    hash = "sha256-2L0tdBHnglHWcGSqDxymClI7+FbuPm2J0H2FoSM0eNw=";
   };
 
   patches = [
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/gcal/raw/master/f/gcal-glibc-no-libio.patch";
-      sha256 = "0l4nw9kgzsay32rsdwvs75pbp4fhx6pfm85paynfbd20cdm2n2kv";
-    })
+    ./add-missing-include.patch
+    ./fix-gnulib-link.patch
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration";
+  env = {
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration";
+    # For check_gcal
+    NIX_LDFLAGS = "-lm";
+  };
 
   enableParallelBuilding = true;
 
   buildInputs = [ ncurses ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext;
 
+  nativeBuildInputs = [
+    pkg-config
+    check
+  ];
+
+  doCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   meta = {
     description = "Program for calculating and printing calendars";
     longDescription = ''
diff --git a/pkgs/by-name/gc/gclient2nix/package.nix b/pkgs/by-name/gc/gclient2nix/package.nix
index 660062a0c3b1..b683352b3664 100644
--- a/pkgs/by-name/gc/gclient2nix/package.nix
+++ b/pkgs/by-name/gc/gclient2nix/package.nix
@@ -68,8 +68,8 @@ runCommand "gclient2nix"
     # substitutions
     depot_tools_checkout = fetchgit {
       url = "https://chromium.googlesource.com/chromium/tools/depot_tools";
-      rev = "fa63ec7437108dcb3a611c6a6c5f3d96771e9581";
-      hash = "sha256-hRIwhIdRF2GbyXbpOdi/lla+/XYM+gKosoK+T+kYYu0=";
+      rev = "977d597d75def6781f890cdce459969a9568ea07";
+      hash = "sha256-OCIay+a+DHvKKIbDMSjTf6CbHHVfp8k0n1AO3E4yx1U=";
     };
 
     passthru = {
diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index c84d81bfab7e..498590cdce87 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gcsfuse";
-  version = "3.6.0";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-E2xjJ0zy32fI34d/RcPNNwdQR4+V+jB45UehgJt2LpM=";
+    hash = "sha256-JQgjLrAqpRdq20DhG26AxkMRdJkJCrrS4/7LrDvV6NI=";
   };
 
-  vendorHash = "sha256-Ftkrb94g9w5o64EX4dKIw0jkinaaH5G8MFfbvCWS80k=";
+  vendorHash = "sha256-KDjSNJVsEuLGTgnAz9Ue+ZolxGzuqN3b/B+0LsgI9xY=";
 
   subPackages = [
     "."
diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix
index 9d0c5f6f103b..353b44e4ed0d 100644
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@@ -83,13 +83,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
-  version = "3.12.3";
+  version = "3.12.4";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "gdal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tGyZB0e2DNyi3OpiOb1Mk8R8SdQRwhxCy8fOQrauVso=";
+    hash = "sha256-sD/ZAOvMWK2+AGw6wgziDsheH+hwUwhd7i2f65cjFKg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gd/gdb/package.nix b/pkgs/by-name/gd/gdb/package.nix
index 7570b70ae0a6..361ad20350b4 100644
--- a/pkgs/by-name/gd/gdb/package.nix
+++ b/pkgs/by-name/gd/gdb/package.nix
@@ -5,6 +5,7 @@
 
   # Build time
   fetchurl,
+  fetchpatch,
   pkg-config,
   perl,
   texinfo,
@@ -21,7 +22,7 @@
   dejagnu,
   sourceHighlight,
   libiconv,
-  xxHash,
+  xxhash,
 
   withTui ? true,
   ncurses,
@@ -87,6 +88,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./debug-info-from-env.patch
+
+    (fetchurl {
+      name = "musl.patch";
+      url = "https://inbox.sourceware.org/gdb-patches/20260324164527.1446549-2-sunilkumar.dora@windriver.com/raw";
+      hash = "sha256-FC4DDVS4wtE/HXtbUqvkxu9+e7nE3DYi1zIuQP9yQO8=";
+    })
+    (fetchpatch {
+      name = "musl-aarch64.patch";
+      url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=1ccc3f6a2e28fa1f3357826374cba165b3ba3ff7";
+      hash = "sha256-Q2oTo2b+9yNN3PSsxqgxV4/9/05uFE/JMLe1CPs9Y7I=";
+    })
   ]
   ++ optionals stdenv.hostPlatform.isDarwin [
     ./darwin-target-match.patch
@@ -108,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
     zstd
     xz
     sourceHighlight
-    xxHash
+    xxhash
     dejagnu # for tests
   ]
   ++ optional withTui ncurses
@@ -182,10 +194,8 @@ stdenv.mkDerivation (finalAttrs: {
     (withFeatureAs true "auto-load-safe-path" (builtins.concatStringsSep ":" safePaths))
     (withFeature enableDebuginfod "debuginfod")
     (enableFeature (!stdenv.hostPlatform.isMusl) "nls")
-    (enableFeature (
-      !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isLoongArch64
-    ) "inprocess-agent")
   ]
+  ++ optional stdenv.hostPlatform.isStatic "--disable-inprocess-agent"
   ++ optional (!hostCpuOnly) "--enable-targets=all"
   # Workaround for Apple Silicon, "--target" must be "faked", see eg: https://github.com/Homebrew/homebrew-core/pull/209753
   ++ optional (
diff --git a/pkgs/by-name/gd/gdlv/package.nix b/pkgs/by-name/gd/gdlv/package.nix
index 23bedae6d753..95f2b90cafc3 100644
--- a/pkgs/by-name/gd/gdlv/package.nix
+++ b/pkgs/by-name/gd/gdlv/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "gdlv";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "aarzilli";
     repo = "gdlv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YHv/PfkQh0detM3p62oDWhEG8PWCupaBhwbxz8rHRdI=";
+    hash = "sha256-jR19vfYfIeXe0k3/S0Zjft9abND0uN8o2Z8SllgpUYw=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix
index b134d419084f..92b99620f611 100644
--- a/pkgs/by-name/gd/gdu/package.nix
+++ b/pkgs/by-name/gd/gdu/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gdu";
-  version = "5.35.0";
+  version = "5.36.1";
 
   src = fetchFromGitHub {
     owner = "dundee";
     repo = "gdu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zWwnM6CJBVGt4DM3Y5/ETbRdoq2yJeq53Co2ZvlwPRQ=";
+    hash = "sha256-jtIVfXCIuJPsw3ryJiMI9W0L2uMeCGKt/7dWCS519fI=";
   };
 
-  vendorHash = "sha256-+fv+agIgIq3guIfBhY8VQz85T0cm3xxTRGFHLSIMpwc=";
+  vendorHash = "sha256-L3nuVoxr+LqBT/9TrwAxJEOxOr53KlXH8rWsFTt2SNc=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ge/gearboy/package.nix b/pkgs/by-name/ge/gearboy/package.nix
index 07da3788b61c..831dd4ae0464 100644
--- a/pkgs/by-name/ge/gearboy/package.nix
+++ b/pkgs/by-name/ge/gearboy/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gearboy";
-  version = "3.8.2";
+  version = "3.8.3";
 
   src = fetchFromGitHub {
     owner = "drhelius";
     repo = "Gearboy";
     tag = finalAttrs.version;
-    hash = "sha256-JgvTt/nUV2CiSJNC3NnKpoa28xAMhRxEh9txqE9FPzU=";
+    hash = "sha256-3wyAwK61lusmVYbt9m10H4I4KUHAUAlC0bP9LqGB/OE=";
   };
 
   __structuredAttrs = true;
diff --git a/pkgs/by-name/ge/gefyra/package.nix b/pkgs/by-name/ge/gefyra/package.nix
index 5e18be3f7040..3d831bb775e7 100644
--- a/pkgs/by-name/ge/gefyra/package.nix
+++ b/pkgs/by-name/ge/gefyra/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gefyra";
-  version = "2.4.1";
+  version = "2.4.3";
 
   src = fetchzip {
     url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip";
-    hash = "sha256-XS+vtwb6UIJK7f3R3QLoyX9+P4n79Fh+v7odiot7Yic=";
+    hash = "sha256-HWcW4JX8XglcB3OkJKdaKtZ6D9Mdg3jff0nqHOS4ESg=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix
index 2b62ae43ac5a..fe494f0316ef 100644
--- a/pkgs/by-name/ge/gemini-cli-bin/package.nix
+++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix
@@ -11,11 +11,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gemini-cli-bin";
-  version = "0.38.1";
+  version = "0.39.1";
 
   src = fetchzip {
     url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini-cli-bundle.zip";
-    hash = "sha256-+XMClLm7HGWST1MESxIVHGmgyvPPqrXGUomoiDY/eUE=";
+    hash = "sha256-mDKBquxjdeIpNOFOrL2Nnsxwr9Fz8FH/Ulhpiwrv1TA=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index 68bd5414b94a..440462e68e9b 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -15,18 +15,18 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.38.1";
+  version = "0.40.1";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Iq/KxQ8rbLtXDbGzcZxspfFwar189H3mBWwOD4hO7HU=";
+    hash = "sha256-oWznf9xleb9bpW2dnMIUehkMqKCb6AecZjcVwZgBrdo=";
   };
 
   nodejs = nodejs_22;
 
-  npmDepsHash = "sha256-T3fxNFvkLR7f49GQjzzTnl3VM+VUUgJfFF5d2GGe7L4=";
+  npmDepsHash = "sha256-sscqcey+hPsfajrTspy6FScjfFmtvJMP1w56cFuu3DI=";
 
   dontPatchElf = stdenv.isDarwin;
 
diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix
index ce1bee1ef3b5..c1e9305108e7 100644
--- a/pkgs/by-name/ge/gemmi/package.nix
+++ b/pkgs/by-name/ge/gemmi/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gemmi";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "project-gemmi";
     repo = "gemmi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0MAY3mNHTv0ydtoVcJQKbOcSxCTvzH5S/5O82PjumKE=";
+    hash = "sha256-6KtLgohnDLlA2SI8GIqcjyKAucrxLBd/t8wnmbX372E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix
index 554193f78713..d09a520137e7 100644
--- a/pkgs/by-name/ge/geph/package.nix
+++ b/pkgs/by-name/ge/geph/package.nix
@@ -23,16 +23,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "geph5";
-  version = "0.2.93";
+  version = "0.2.99";
 
   src = fetchFromGitHub {
     owner = "geph-official";
     repo = "geph5";
     rev = "geph5-client-v${finalAttrs.version}";
-    hash = "sha256-ZYcGW6Ssauf5BUs75KBV+4Zub2ZCVN29cWTxeNi87cI=";
+    hash = "sha256-AWdVFpIP+LIZz6zqcx0GJxDs4ZWGR6JgpHDVAg0mHaU=";
   };
 
-  cargoHash = "sha256-0Ml8tgWghxhDJzUMMD+YGwy3fyFjKcNjbV8MDJW8rZk=";
+  cargoHash = "sha256-zFCq29vtsbwbo6JBRdX+CziKZVoxwpt6y3BYVlIqZfc=";
 
   postPatch = ''
     substituteInPlace binaries/geph5-client/src/vpn/*.sh \
diff --git a/pkgs/by-name/gf/gfie/package.nix b/pkgs/by-name/gf/gfie/package.nix
deleted file mode 100644
index 81f0a0052ce6..000000000000
--- a/pkgs/by-name/gf/gfie/package.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  dpkg,
-  autoPatchelfHook,
-  qt5,
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gfie";
-  version = "4.2";
-
-  src = fetchurl {
-    url = "http://greenfishsoftware.org/dl/gfie/gfie-${finalAttrs.version}.deb";
-    hash = "sha256-hyL0t66jRTVF1Hq2FRUobsfjLGmYgsMGDE/DBdoXhCI=";
-  };
-
-  unpackCmd = "dpkg -x $curSrc source";
-
-  nativeBuildInputs = [
-    dpkg
-    autoPatchelfHook
-    qt5.wrapQtAppsHook
-  ];
-
-  buildInputs = with qt5; [
-    qtbase
-    qtsvg
-    qtwebengine
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    mv usr/share opt $out
-    ln -s $out/opt/gfie-${finalAttrs.version}/gfie $out/bin/gfie
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Powerful image editor, especially suitable for creating icons, cursors, animations and icon libraries";
-    homepage = "https://greenfishsoftware.org/gfie.php";
-    license = with lib.licenses; [ unfree ];
-    maintainers = with lib.maintainers; [ pluiedev ];
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "gfie";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-  };
-})
diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix
index bed387a3214a..df742e4790f7 100644
--- a/pkgs/by-name/gf/gforth/package.nix
+++ b/pkgs/by-name/gf/gforth/package.nix
@@ -17,13 +17,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gforth";
-  version = "0.7.9_20260410";
+  version = "0.7.9_20260415";
 
   src = fetchFromGitHub {
     owner = "forthy42";
     repo = "gforth";
     rev = finalAttrs.version;
-    hash = "sha256-Nb5CB2k7gfG3sT+zfHGmj9G/CGccIvSIKcOuP7Altn0=";
+    hash = "sha256-eMBerL8kry9UlsXS4qdXT7jLK4f1S/q//5qkJ5qi3dA=";
   };
 
   patches = [ ./use-nproc-instead-of-fhs.patch ];
diff --git a/pkgs/by-name/gf/gfxreconstruct/package.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix
index dd0372e8cc34..6e65a5e3e96b 100644
--- a/pkgs/by-name/gf/gfxreconstruct/package.nix
+++ b/pkgs/by-name/gf/gfxreconstruct/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gfxreconstruct";
-  version = "1.0.4-unstable-2025-10-30";
+  version = "1.0.4-unstable-2026-04-29";
 
   src = fetchFromGitHub {
     owner = "LunarG";
     repo = "gfxreconstruct";
-    rev = "4f1fa3aa9870b00404e6597283b2032a885303b3";
-    hash = "sha256-HwGmtkVQJirKikb37A/dQeEr3AWmqJMfBj46UKsS5m8=";
+    rev = "41c7f2d964544813df5988d9689189f8520b1e2e";
+    hash = "sha256-xtiNxKU0gJURN4FQBZyEX2VaDqvdiMoyDJZOoMafAgM=";
     fetchSubmodules = true;
   };
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   # The python script searches in subfolders, but we want to search in the same bin directory
   prePatch = ''
     substituteInPlace tools/gfxrecon/gfxrecon.py \
-      --replace "scriptdir, '..', cmd" 'scriptdir'
+      --replace-fail "scriptdir, '..', cmd" 'scriptdir'
   '';
 
   # Fix the paths to load the layer.
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   # does not try to start the wrapper bash scripts with python.
   postInstall = ''
     substituteInPlace $out/share/vulkan/explicit_layer.d/VkLayer_gfxreconstruct.json \
-      --replace 'libVkLayer_gfxreconstruct.so' "$out/lib/libVkLayer_gfxreconstruct.so"
+      --replace-fail 'libVkLayer_gfxreconstruct.so' "$out/lib/libVkLayer_gfxreconstruct.so"
     for f in $out/bin/*.py; do
       mv -- "$f" "''${f%%.py}"
     done
@@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Graphics API Capture and Replay Tools";
     homepage = "https://github.com/LunarG/gfxreconstruct/";
-    changelog = "https://github.com/LunarG/gfxreconstruct/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ Flakebi ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/gg/ggml/package.nix b/pkgs/by-name/gg/ggml/package.nix
index e919e7cc7807..9d28576a7b8d 100644
--- a/pkgs/by-name/gg/ggml/package.nix
+++ b/pkgs/by-name/gg/ggml/package.nix
@@ -7,13 +7,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ggml";
-  version = "0.9.11";
+  version = "0.10.1";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "ggml";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-huGHwNG2wRwBP32spkHOPtdO6/I3mIxvYGLUzqQi2tc=";
+    hash = "sha256-fwENyDSRq6ecq0zKC4nnpJCs9X15et+JFTQKX4gLDng=";
   };
 
   # The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR
@@ -29,8 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
         "@CMAKE_INSTALL_FULL_LIBDIR@"
   '';
 
-  strictDeps = true;
-
   nativeBuildInputs = [
     cmake
   ];
diff --git a/pkgs/by-name/gh/gh-cherry-pick/package.nix b/pkgs/by-name/gh/gh-cherry-pick/package.nix
index a85b93ce8d4e..328f82354b60 100644
--- a/pkgs/by-name/gh/gh-cherry-pick/package.nix
+++ b/pkgs/by-name/gh/gh-cherry-pick/package.nix
@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gh-cherry-pick";
-  version = "1.2.0";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PerchunPak";
     repo = "gh-cherry-pick";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EiXWgiCV99k3810nCWA+AnlLjG8VKRCPnns9KtfGxqY=";
+    hash = "sha256-a2vhQ9upJYc+t4Juq+eukNc7dzq6MafNxDUULPZs9sQ=";
   };
 
   build-system = with python3Packages; [
@@ -20,26 +20,23 @@ python3Packages.buildPythonApplication (finalAttrs: {
     uv-dynamic-versioning
   ];
 
-  pythonRelaxDeps = [
-    "attrs"
-    "trio"
-  ];
-
   dependencies = with python3Packages; [
-    attrs
     cyclopts
     httpx
-    loguru
-    trio
-    typing-extensions
   ];
 
+  # upstream has strict dependency pins, but it doesn't break with slightly
+  # newer/older versions
+  #   (c) upstream maintainer
+  pythonRelaxDeps = true;
+
   nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-    pytest
+    faker
+    pytest-asyncio
     pytest-cov-stub
+    pytest-httpx
     pytest-mock
-    pytest-trio
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [ "gh_cherry_pick" ];
diff --git a/pkgs/by-name/gh/gh-do/package.nix b/pkgs/by-name/gh/gh-do/package.nix
index 2f873df9e472..2829afed57f1 100644
--- a/pkgs/by-name/gh/gh-do/package.nix
+++ b/pkgs/by-name/gh/gh-do/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gh-do";
-  version = "0.5.4";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "gh-do";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TzdaQ/E9D3gB1Q84SCRetLoA95c/BjJlgfZGbntjCVU=";
+    hash = "sha256-V88ijuj2s2vxqDFoQkL9CSllCIqUsYcSNBth3MQUhYw=";
   };
 
   vendorHash = "sha256-TPHDiMzJtXXRBFd8lacXeMC+AB1Gc1pMyJPJeVLCkKo=";
diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index 57c700cd4961..01d7935927b4 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "gh-gei";
-  version = "1.27.0";
+  version = "1.29.0";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
     rev = "v${version}";
-    hash = "sha256-28baWL19mF7QWMZ2UHad9PeA6in+V3FVJXdl3hzCecI=";
+    hash = "sha256-qHlORWmMBHo8PtuGG4JaWdkCdIdybNfzWDEM/JNlCOc=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;
diff --git a/pkgs/by-name/gh/gh-ost/package.nix b/pkgs/by-name/gh/gh-ost/package.nix
index 12cf533925c0..8b590cdfea62 100644
--- a/pkgs/by-name/gh/gh-ost/package.nix
+++ b/pkgs/by-name/gh/gh-ost/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gh-ost";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-ost";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-U92rdk/9JIMOjN1cJSdAVYgR1f7aKY0nyfBbwe7517M=";
+    hash = "sha256-wnHPFPA0ql6KWN9+ZvzIdXwaAhFdBc94UJK7+4no1NU=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix
index 009967f289b7..2ef315502b7d 100644
--- a/pkgs/by-name/gh/gh-poi/package.nix
+++ b/pkgs/by-name/gh/gh-poi/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gh-poi";
-  version = "0.16.4";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "seachicken";
     repo = "gh-poi";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-n/pwgNZyVpK5y5mK2xFS2pWpDyX7YGc734zkJLoKEJo=";
+    hash = "sha256-GFJWZBVRE6tz033NI5zcJIs3ziVa1KoPggKn/o65mDE=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
   vendorHash = "sha256-o3ys+Em27sx3VS3AQIP7G/tWRiBlPnvBq37jLtj9QVQ=";
 
   # Skip checks because some of test suites require fixture.
-  # See: https://github.com/seachicken/gh-poi/blob/v0.16.4/.github/workflows/contract-test.yml#L28-L29
+  # See: https://github.com/seachicken/gh-poi/blob/v0.17.0/.github/workflows/contract-test.yml#L28-L29
   doCheck = false;
 
   meta = {
diff --git a/pkgs/by-name/gh/gh-review-conductor/package.nix b/pkgs/by-name/gh/gh-review-conductor/package.nix
new file mode 100644
index 000000000000..2efaa6c77a0d
--- /dev/null
+++ b/pkgs/by-name/gh/gh-review-conductor/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "gh-review-conductor";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "gh-tui-tools";
+    repo = "gh-review-conductor";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gNQmO+Sa9n+hfy5CBSPqSXhHTzZz8D1sLrNqs+z9Rx4=";
+  };
+
+  vendorHash = "sha256-xAOTSdyNRZDKDPnCrvaepBOTDrnHLEA53K5TBxkqbDM=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/gh-tui-tools/gh-review-conductor/cmd.version=${finalAttrs.version}"
+  ];
+
+  # Tests require GitHub authentication and network access
+  doCheck = false;
+
+  __structuredAttrs = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "GitHub CLI extension to apply PR review comments and suggestions directly to your local code";
+    homepage = "https://github.com/gh-tui-tools/gh-review-conductor";
+    changelog = "https://github.com/gh-tui-tools/gh-review-conductor/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      vdemeester
+      chmouel
+    ];
+    mainProgram = "gh-prreview";
+  };
+})
diff --git a/pkgs/by-name/gh/gh-stack/package.nix b/pkgs/by-name/gh/gh-stack/package.nix
index 88ff0cc5a838..255b77891d5b 100644
--- a/pkgs/by-name/gh/gh-stack/package.nix
+++ b/pkgs/by-name/gh/gh-stack/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "gh-stack";
-  version = "0.0.1";
+  version = "0.0.2";
 
   __structuredAttrs = true;
 
@@ -16,7 +16,7 @@ buildGoModule (finalAttrs: {
     owner = "github";
     repo = "gh-stack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-om7ekHez08X1YjP0W+3p0PxmjU/za6+/gHX5GPakKAw=";
+    hash = "sha256-2mtQKrUvYkRQbxSaTCPt05Ld5jzdSrjckEiJlxalIUI=";
   };
 
   vendorHash = "sha256-s85Lz6yfY1TiIFPolU1qESDyw8XoBORyuOMdiHj6Grc=";
diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index 00c28906fa9f..dfb17f621cfc 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -5,23 +5,26 @@
   installShellFiles,
   stdenv,
   testers,
-  gh,
+  makeWrapper,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "gh";
-  version = "2.90.0";
+  version = "2.92.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yVc4UvC+CsW+pP/BJRjcOGX7h8zO2M8yM0m57Mr89JY=";
+    hash = "sha256-/7EiX4ZZPhSNgY/D5OVOako/c0ujHq05GMj3UB11bqQ=";
   };
 
-  vendorHash = "sha256-hz6oMLTibnSLB11vEWsO0O5ZFGKYJaVce6POqINObnI=";
+  vendorHash = "sha256-pBLRCIRjN3VoXbTFSq+R9/N3uAUCEjvPtk8LKKKS51s=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ];
 
   # N.B.: using the Makefile is intentional.
   # We pass "nixpkgs" for build.Date to avoid `gh --version` reporting a very old date.
@@ -34,6 +37,8 @@ buildGoModule (finalAttrs: {
   installPhase = ''
     runHook preInstall
     install -Dm755 bin/gh -t $out/bin
+    wrapProgram $out/bin/gh \
+      --set-default GH_TELEMETRY false
   ''
   + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installManPage share/man/*/*.[1-9]
@@ -51,7 +56,7 @@ buildGoModule (finalAttrs: {
   doCheck = false;
 
   passthru.tests.version = testers.testVersion {
-    package = gh;
+    package = finalAttrs.finalPackage;
   };
 
   meta = {
diff --git a/pkgs/by-name/gh/ghalint/package.nix b/pkgs/by-name/gh/ghalint/package.nix
index a6a755fe68bd..82bbefe9a324 100644
--- a/pkgs/by-name/gh/ghalint/package.nix
+++ b/pkgs/by-name/gh/ghalint/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ghalint";
-  version = "1.5.5";
+  version = "1.5.6";
 
   src = fetchFromGitHub {
     owner = "suzuki-shunsuke";
     repo = "ghalint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xAXcvvSwcJjdG2BCItBLdsu6vZiID5FmRYYF9PZe1QE=";
+    hash = "sha256-u85vX9lg5JKUvRjFloE4KZUm/qs8RmjoY/hybtJk/kc=";
   };
 
-  vendorHash = "sha256-XIalA/usvyvzrvGU7Ygf1DWSlTm1YYaN+X0Xm+YiiTI=";
+  vendorHash = "sha256-n++Rq79KHyRVhIXIdN9IOADTGEG73Wl2SUq/YEo++WM=";
 
   subPackages = [ "cmd/ghalint" ];
 
diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix
index 29981ee40ce5..e5ba6c38acbc 100644
--- a/pkgs/by-name/gh/ghciwatch/package.nix
+++ b/pkgs/by-name/gh/ghciwatch/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ghciwatch";
-  version = "1.2.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "MercuryTechnologies";
     repo = "ghciwatch";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JN2FnYHORvlqhsQF5Widm7G7Jyk8/iLCnQ+lLsklX1k=";
+    hash = "sha256-3S9nw2wvl/ORwPGfWknqhsooH3XkF87OyiGFVLK/YqA=";
   };
 
-  cargoHash = "sha256-RdoGS5VTesLaPiNeSEDrwP7ZuYWiz9uewlCntn7CqYc=";
+  cargoHash = "sha256-3vv6WPbxvZdcAr/ynzbmh6xHAPFB2Z/1TS7fMrq0EHE=";
 
   # integration tests are not run but the macros need this variable to be set
   env.GHC_VERSIONS = "";
diff --git a/pkgs/by-name/gh/ghdump/package.nix b/pkgs/by-name/gh/ghdump/package.nix
new file mode 100644
index 000000000000..6c71627ef58d
--- /dev/null
+++ b/pkgs/by-name/gh/ghdump/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "ghdump";
+  version = "0.1.1";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "drupol";
+    repo = "ghdump";
+    tag = finalAttrs.version;
+    hash = "sha256-ozOWbncNN+Jq9jJpbHvjrIIsx5+R/hzBqQvqfoxH5ZA=";
+  };
+
+  cargoHash = "sha256-G24vq74B8NyRq++FlyvR946MWKE0x1n1phTfxFSF8Gs=";
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/drupol/ghdump/releases/tag/${finalAttrs.version}";
+    description = "Export GitHub issues, pull requests, and discussions through customizable templates";
+    homepage = "https://github.com/drupol/ghdump";
+    license = lib.licenses.eupl12;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "ghdump";
+  };
+})
diff --git a/pkgs/by-name/gh/ghost-complete/package.nix b/pkgs/by-name/gh/ghost-complete/package.nix
new file mode 100644
index 000000000000..6dc779457419
--- /dev/null
+++ b/pkgs/by-name/gh/ghost-complete/package.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "ghost-complete";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "StanMarek";
+    repo = "ghost-complete";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fsGrhQK28YFksI2pNiZ6fI6KjZOXxXxrhWjxOmBNk08=";
+  };
+
+  __structuredAttrs = true;
+
+  cargoHash = "sha256-kiYdMczvnauhu/2ryO0NcK3PAI1P+xmYV8nRrIWaEB8=";
+
+  cargoBuildFlags = [ "--package=ghost-complete" ];
+
+  # Integration tests in crates/ghost-complete/tests/smoke.rs spawn a real
+  # PTY + shell and exercise terminal I/O, which isn't available in the
+  # Nix build sandbox.
+  doCheck = false;
+
+  # `ghost-complete install` imperatively copies these scripts into the
+  # user's `~/.config/ghost-complete/shell/` and edits `~/.zshrc` to source
+  # them. In a Nix world we instead expose them here so users can source
+  # them declaratively from their shell configuration (e.g. home-manager
+  # `programs.zsh.initContent` or NixOS `programs.zsh.interactiveShellInit`).
+  # The 709 completion specs are already embedded in the binary and used
+  # as an automatic fallback when no on-disk spec directory is present, so
+  # they don't need to be copied out.
+  postInstall = ''
+    install -Dm644 -t $out/share/ghost-complete/shell \
+      shell/init.zsh \
+      shell/ghost-complete.zsh \
+      shell/ghost-complete.bash \
+      shell/ghost-complete.fish
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Terminal-native autocomplete engine using PTY proxying for macOS terminals";
+    homepage = "https://github.com/StanMarek/ghost-complete";
+    changelog = "https://github.com/StanMarek/ghost-complete/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ imcvampire ];
+    mainProgram = "ghost-complete";
+    platforms = lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix
index cd1c640bad8c..3ebd9e61ab79 100644
--- a/pkgs/by-name/gh/ghostscript/package.nix
+++ b/pkgs/by-name/gh/ghostscript/package.nix
@@ -168,6 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-system-libtiff"
     "--without-tesseract"
   ]
+  ++ lib.optional stdenv.cc.isClang "CFLAGS=-std=gnu17" # FIXME: make it unconditional
   ++ lib.optionals dynamicDrivers [
     "--enable-dynamic"
     "--disable-hidden-visibility"
diff --git a/pkgs/by-name/gi/gibo/package.nix b/pkgs/by-name/gi/gibo/package.nix
index 323066d83856..6a11e5b44b7e 100644
--- a/pkgs/by-name/gi/gibo/package.nix
+++ b/pkgs/by-name/gi/gibo/package.nix
@@ -11,16 +11,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "gibo";
-  version = "3.0.20";
+  version = "3.0.21";
 
   src = fetchFromGitHub {
     owner = "simonwhitaker";
     repo = "gibo";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-u2e0YwtK3MnzIYvXNVc2a4zsoxISAcS3U+6WpgBsYUM=";
+    sha256 = "sha256-XPJy5dDQllnffz8BxJ6BYoFZCf7/x8a/6K6o0mRmKsI=";
   };
 
-  vendorHash = "sha256-YVs6S3x0u2dypb5h+pNCUkmfVK+0erzoGZzONipL49o=";
+  vendorHash = "sha256-JMViyQHqq2bkKuOcw+lbjkomoRv0kIqxMfE1Uu7rgfs=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix
index 96d93a8ec284..499b544849c1 100644
--- a/pkgs/by-name/gi/gickup/package.nix
+++ b/pkgs/by-name/gi/gickup/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gickup";
-  version = "0.10.40";
+  version = "0.10.41";
 
   src = fetchFromGitHub {
     owner = "cooperspencer";
     repo = "gickup";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/hdCgo09sMbwbF3E5vOEuyYXF/qm0H/79cDuQOlFy/Y=";
+    hash = "sha256-9aLBplZeNreXEmhjQJsQZ2wYQjHQxGtfaTcxO9Tw5kQ=";
   };
 
-  vendorHash = "sha256-9t+rjK385Co6RKeihxJprGJz0SjzKFSKNix2Sq0ZlSg=";
+  vendorHash = "sha256-lmPZlCiQXwe6FWwtDyZjqmF9I2609odpY4AjkEuqPUA=";
 
   ldflags = [ "-X main.version=${finalAttrs.version}" ];
 
diff --git a/pkgs/by-name/gi/gip/package.nix b/pkgs/by-name/gi/gip/package.nix
new file mode 100644
index 000000000000..1f0ac28a1485
--- /dev/null
+++ b/pkgs/by-name/gi/gip/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchFromGitHub,
+  openssl,
+  pkg-config,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "gip";
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "dalance";
+    repo = "gip";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UgvXaDNdH8ZN00oJ/DjIlBs86ua3JmVz1JfLk2XBVFw=";
+  };
+
+  cargoHash = "sha256-C38pV8c7znbBua130qDaguUAWamGhxfI8y0Vy0yadWc=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  __structuredAttrs = true;
+
+  # Tests that require network access
+  doCheck = false;
+
+  meta = {
+    description = "Command-line tool to get global IP address";
+    homepage = "https://github.com/dalance/gip";
+    changelog = "https://github.com/dalance/gip/releases/tag/${finalAttrs.src.tag}";
+    license = with lib.licenses; [
+      mit
+      asl20
+    ];
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "gip";
+  };
+})
diff --git a/pkgs/by-name/gi/git-bug-migration/package.nix b/pkgs/by-name/gi/git-bug-migration/package.nix
index cbc9a0288347..62d838767ffc 100644
--- a/pkgs/by-name/gi/git-bug-migration/package.nix
+++ b/pkgs/by-name/gi/git-bug-migration/package.nix
@@ -36,7 +36,6 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       DeeUnderscore
-      sudoforge
     ];
     mainProgram = "git-bug-migration";
   };
diff --git a/pkgs/by-name/gi/git-bug/package.nix b/pkgs/by-name/gi/git-bug/package.nix
index 0f7fa1834cd0..dc9051dc0c64 100644
--- a/pkgs/by-name/gi/git-bug/package.nix
+++ b/pkgs/by-name/gi/git-bug/package.nix
@@ -67,7 +67,6 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       royneary
       DeeUnderscore
-      sudoforge
     ];
     mainProgram = "git-bug";
   };
diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix
index 371c003691ec..88023fb1703f 100644
--- a/pkgs/by-name/gi/git-cliff/package.nix
+++ b/pkgs/by-name/gi/git-cliff/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "git-cliff";
-  version = "2.12.0";
+  version = "2.13.1";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "git-cliff";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8t7Bx3dPktSMxfWjaEeXxt3edt9Va7g5XZjE756EfY0=";
+    hash = "sha256-OFVJUZ3jSuDlHYIl/8KmJJW5ZbVI12wn+bVx9XeOkvI=";
   };
 
-  cargoHash = "sha256-0/NjvX3MnIgRfsE6PyYzPZ94/p2RR8PPvCntT6pPfbU=";
+  cargoHash = "sha256-wkSLz6WGsfYZobbrOaDV79Xl7f4/nDkP3z8ZFP1Cn54=";
 
   # attempts to run the program on .git in src which is not deterministic
   doCheck = false;
diff --git a/pkgs/by-name/gi/git-fork/package.nix b/pkgs/by-name/gi/git-fork/package.nix
index c52162dc663e..e130c278cc4a 100644
--- a/pkgs/by-name/gi/git-fork/package.nix
+++ b/pkgs/by-name/gi/git-fork/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     mkdir -p "$out/"{bin,Applications}
     mv Fork.app "$out/Applications/"
-    ln -s "$out/Applications/Fork.app/Contents/MacOS/Fork" "$out/bin/fork"
+    ln -s "$out/Applications/Fork.app/Contents/Resources/fork_cli" "$out/bin/fork"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/gi/git-gone/package.nix b/pkgs/by-name/gi/git-gone/package.nix
index 3bdf4b29b489..bd6a6488e1ef 100644
--- a/pkgs/by-name/gi/git-gone/package.nix
+++ b/pkgs/by-name/gi/git-gone/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchFromCodeberg,
   rustPlatform,
 }:
 
@@ -8,7 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "git-gone";
   version = "1.3.1";
 
-  src = fetchFromGitHub {
+  src = fetchFromCodeberg {
     owner = "swsnr";
     repo = "git-gone";
     tag = "v${finalAttrs.version}";
@@ -19,8 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Cleanup stale Git branches of merge requests";
-    homepage = "https://github.com/swsnr/git-gone";
-    changelog = "https://github.com/swsnr/git-gone/raw/v${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://codeberg.org/swsnr/git-gone";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       cafkafk
diff --git a/pkgs/by-name/gi/git-ls/package.nix b/pkgs/by-name/gi/git-ls/package.nix
new file mode 100644
index 000000000000..3087c43389d6
--- /dev/null
+++ b/pkgs/by-name/gi/git-ls/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+  gitMinimal,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "git-ls";
+  version = "5.10.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "llimllib";
+    repo = "git-ls";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ziG1TP+sg5v/JEJ+1J4reNHt6fpvIAfSz+esr2jucz8=";
+  };
+
+  vendorHash = "sha256-Bk6IBG+BrqY4FNVIlbSSSnqqAeL+8SJUtRXuIp4e8f8=";
+
+  ldflags = [ "-s" ];
+
+  nativeCheckInputs = [
+    gitMinimal
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "List files and git status in a repository";
+    homepage = "https://github.com/llimllib/git-ls";
+    changelog = "https://github.com/llimllib/git-ls/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ drupol ];
+    mainProgram = "git-ls";
+  };
+})
diff --git a/pkgs/by-name/gi/git-pages-cli/package.nix b/pkgs/by-name/gi/git-pages-cli/package.nix
index 36a15804ab9b..265d6b4451da 100644
--- a/pkgs/by-name/gi/git-pages-cli/package.nix
+++ b/pkgs/by-name/gi/git-pages-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-pages-cli";
-  version = "1.8.0";
+  version = "1.8.2";
 
   src = fetchFromCodeberg {
     owner = "git-pages";
     repo = "git-pages-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xM2/7cg9ZZ5wWzlJdtmU1lHYhXQQinp8S643IKzTb7U=";
+    hash = "sha256-wNHwkVvC4NlQw1cx+rM6zdmYm4zTz/e5suIcapTtssY=";
   };
 
   vendorHash = "sha256-lGnl1onxJ9x0UIf2uPZcZgx2qbj/43VG+UcQvqwd1uw=";
diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix
index 933f26a2894e..d23c7b15f9b3 100644
--- a/pkgs/by-name/gi/git-spice/package.nix
+++ b/pkgs/by-name/gi/git-spice/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-spice";
-  version = "0.24.2";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "git-spice";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Zt4PG3pWJ0h22fBJnsIVqcSk2BwwuOHdmSOrAMENN70=";
+    hash = "sha256-hE0PCjEGZE+nMLfICUjDoLzaNCsPMKSyg9y1R7tpePk=";
   };
 
-  vendorHash = "sha256-tlAex6SFTprJtpMexMjAUNanamqraHYJuwtABx52rWQ=";
+  vendorHash = "sha256-YPcQ3Yjn016S2bLjUKH2SXgTm6b1+q7McgEzjUzyggE=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/gi/git-standup/package.nix b/pkgs/by-name/gi/git-standup/package.nix
index 3a5754047697..f0480c0b1f65 100644
--- a/pkgs/by-name/gi/git-standup/package.nix
+++ b/pkgs/by-name/gi/git-standup/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.3.2";
 
   src = fetchFromGitHub {
-    owner = "kamranahmedse";
+    owner = "nilbuild";
     repo = "git-standup";
     tag = finalAttrs.version;
     hash = "sha256-x7Z4w4UzshXYc25ag6HopRrKbP+/ELkFPdsUBaUE1vY=";
@@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Recall what you did on the last working day";
-    homepage = "https://github.com/kamranahmedse/git-standup";
-    changelog = "https://github.com/kamranahmedse/git-standup/releases/tag/${finalAttrs.version}";
+    homepage = "https://github.com/nilbuild/git-standup";
+    changelog = "https://github.com/nilbuild/git-standup/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sigmanificient ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/gi/git-tools/package.nix b/pkgs/by-name/gi/git-tools/package.nix
index ca96ce256e8a..9d2d4a82923d 100644
--- a/pkgs/by-name/gi/git-tools/package.nix
+++ b/pkgs/by-name/gi/git-tools/package.nix
@@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    changelog = "https://github.com/MestreLion/git-tools/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/MestreLion/git-tools/releases/tag/${finalAttrs.src.tag}";
     description = "Assorted git tools, including git-restore-mtime";
     homepage = "https://github.com/MestreLion/git-tools";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix
index 14df721d7e21..7857c70e65ae 100644
--- a/pkgs/by-name/gi/git-town/package.nix
+++ b/pkgs/by-name/gi/git-town/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-town";
-  version = "22.7.0";
+  version = "22.7.1";
 
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nHuEwAb0FBTE3YQ0rMFYhC1YM+kh/f1cNgqN7U1E3dk=";
+    hash = "sha256-MGiWqFWA4PMyGL7QqgcDWrgM/Wo8us8GMhdsrXBgWmg=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix
index 3d193e8055e2..06d755e4a403 100644
--- a/pkgs/by-name/gi/git/package.nix
+++ b/pkgs/by-name/gi/git/package.nix
@@ -600,7 +600,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://git-scm.com/";
     description = "Distributed version control system";
     license = lib.licenses.gpl2;
-    changelog = "https://github.com/git/git/blob/v${version}/Documentation/RelNotes/${version}.txt";
+    changelog = "https://github.com/git/git/blob/v${version}/Documentation/RelNotes/${version}.adoc";
 
     longDescription = ''
       Git, a popular distributed version control system designed to
diff --git a/pkgs/by-name/gi/gitaly/git-data.json b/pkgs/by-name/gi/gitaly/git-data.json
index 1e40978f170a..9cf133b136c0 100644
--- a/pkgs/by-name/gi/gitaly/git-data.json
+++ b/pkgs/by-name/gi/gitaly/git-data.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.53-c61120cf",
-  "rev": "c61120cf654250ac63bdcb5d5ee0bbb9caeae9cd",
-  "hash": "sha256-kTdpPQOuHNTXscgqbd/GOLPe8bEPiOeBlm5RppgMpUA="
+  "version": "2.53-e417bf29",
+  "rev": "e417bf2996fbd77acabbf354ed9b5adedacf91c9",
+  "hash": "sha256-enYjs2KODFwjU0hAylZeOmoV+DMEUH8pZH4JZ+P+eNI="
 }
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 3c9b730ea3f5..38d2281e0803 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.10.3";
+  version = "18.11.1";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,10 +21,10 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-edILaF/dW7yOm5W9nV9d7Cj4+W9kshagkOb/2mfIOtQ=";
+      hash = "sha256-se3JtkYR+Mi0Kse3fQXBwxQyHmbPu2DqTNGnRHZQdTc=";
     };
 
-    vendorHash = "sha256-W7ZI8IOaW/88zWrVymDkRQqzk+aLgvdO+rPycK70Bb0=";
+    vendorHash = "sha256-123WUtoUaPIyDywcTKEhiZP2SYYHxAQoOPyCebsHYRI=";
 
     ldflags = [
       "-X ${gitaly_package}/internal/version.version=${version}"
diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index 83c82a18aa61..dde80c010b73 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -27,7 +27,7 @@ let
     pnpmDeps = fetchPnpmDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 3;
-      hash = "sha256-Atb6m5ZD9NKjYezFnYLnQqnlr72g5dz7ROfOF9fsqto=";
+      hash = "sha256-dewYYPO2wmNyYiQadoEKWJ10cghm6Lv7UE1iVlyNiEY=";
     };
 
     nativeBuildInputs = [
@@ -48,18 +48,18 @@ let
 in
 buildGoModule rec {
   pname = "gitea";
-  version = "1.25.5";
+  version = "1.26.1";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     tag = "v${gitea.version}";
-    hash = "sha256-EDj/n4dOZsdJx4zdP8GwUavZNK145Q8ENXmIL+81MY4=";
+    hash = "sha256-UlPS+gcSEzKY+g5y+k3NsL3b8FRVHnlqkiuJTz5ijFM=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-o7OIVo0/gunGMIDd0r6c9KDtku6pWwzmgm1X9qVbx4w=";
+  vendorHash = "sha256-JSyjJIdRePbSnKL6GHdjx5Xbnsniq6KHOlEFsYvMmbw=";
 
   outputs = [
     "out"
@@ -71,10 +71,17 @@ buildGoModule rec {
   # go-modules derivation doesn't provide $data
   # so we need to wait until it is built, and then
   # at that time we can then apply the substituteInPlace
-  overrideModAttrs = _: { postPatch = null; };
+  overrideModAttrs = _: {
+    postPatch = ''
+      substituteInPlace go.mod \
+        --replace-fail "go 1.26.2" "go 1.26"
+    '';
+  };
 
   postPatch = ''
     substituteInPlace modules/setting/server.go --subst-var data
+    substituteInPlace go.mod \
+      --replace-fail "go 1.26.2" "go 1.26"
   '';
 
   subPackages = [ "." ];
diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index e34c844ba02a..33dae3c156f5 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -56,24 +56,24 @@
 
 let
   pname = "gitkraken";
-  version = "11.6.0";
+  version = "12.0.1";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz";
-      hash = "sha256-MU/WB4RsNViEulvE6fB7S4QTjjMI/50enlyCIX+xar4=";
+      hash = "sha256-Tn4j9zmH8hr5rKaPFgox/LopTvEWghnPGf4JiM8y86k=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-Ty+eRZJ6bnBsrs1VtGem1+m9WDZZf/PgiOvFIazQF6I=";
+      hash = "sha256-bKbqu94JPI4VOPcphkw/vAN/ihb5wc5qh/qaw7bweG0=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-mpJNhvKIBYt3Yd+RjxSgzRP6AfnfHPRbQ0dzd5kQQIQ=";
+      hash = "sha256-h2RSdK75i1NbchGauDSvaYJyz39Bncgf+RQIfRdDQuE=";
     };
   };
 
@@ -207,9 +207,9 @@ let
 
       # SSL and permissions fix for bundled nodegit
       pushd $out/share/${pname}/resources/app.asar.unpacked/node_modules/@axosoft/nodegit/build/Release
-      mv nodegit-ubuntu-20.node nodegit-ubuntu-20-ssl-1.1.1.node
-      mv nodegit-ubuntu-20-ssl-static.node nodegit-ubuntu-20.node
-      chmod 755 nodegit-ubuntu-20.node
+      mv nodegit-x64-ubuntu-20.node nodegit-x64-ubuntu-20-ssl-1.1.1.node
+      mv nodegit-x64-ubuntu-20-ssl-static.node nodegit-x64-ubuntu-20.node
+      chmod 755 nodegit-x64-ubuntu-20.node
       popd
 
       # Devendor bundled git
diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
index 02950dc8bb42..ac939c38bc36 100644
--- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitlab-ci-ls";
-  version = "1.3.1";
+  version = "1.3.2";
   src = fetchFromGitHub {
     owner = "alesbrelih";
     repo = "gitlab-ci-ls";
     rev = "${finalAttrs.version}";
-    hash = "sha256-ZZjx6VdBZuVuHl42n0iXZkvvUku2CN7x4JCZxZTMOMk=";
+    hash = "sha256-b//Yi+7jOQv+pHyeS/t3OSBMCZZ34sP8xXCNivlShYQ=";
   };
 
-  cargoHash = "sha256-OB44JaekEl1dJB6LGTLWXgcwYac2GA3I9Ab8xt/+rkI=";
+  cargoHash = "sha256-BCV5LU8cVf40vCQCN56dlWiyvfvwF4nPUcLb+mOfsok=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch b/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch
index 91e8dfa0cf9a..b6718bdca087 100644
--- a/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch
+++ b/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch
@@ -1,16 +1,16 @@
 diff --git c/package-lock.json i/package-lock.json
-index 5607a09..44ec9a4 100644
+index 342d56e..b6d464b 100644
 --- c/package-lock.json
 +++ i/package-lock.json
-@@ -146,6 +146,7 @@
-         "eslint-formatter-gitlab": "^6.0.1",
+@@ -152,6 +152,7 @@
+         "eslint-import-resolver-typescript": "^4.4.4",
          "eslint-plugin-import": "^2.32.0",
          "execa": "^9.3.1",
 +        "extra-deps": "workspace:*",
          "fs-extra": "^11.3.2",
          "http-server": "^14.1.1",
          "ink": "^6.5.1",
-@@ -219,7 +220,9 @@
+@@ -225,7 +226,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -21,7 +21,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@adobe/css-tools": {
        "version": "4.4.4",
-@@ -524,18 +527,24 @@
+@@ -557,18 +560,24 @@
        "license": "ISC",
        "dependencies": {
          "yallist": "^3.0.2"
@@ -49,7 +49,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/helper-create-class-features-plugin": {
        "version": "7.27.1",
-@@ -563,7 +572,9 @@
+@@ -596,7 +605,9 @@
        "license": "ISC",
        "bin": {
          "semver": "bin/semver.js"
@@ -60,7 +60,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/helper-create-regexp-features-plugin": {
        "version": "7.27.1",
-@@ -587,7 +598,9 @@
+@@ -620,7 +631,9 @@
        "license": "ISC",
        "bin": {
          "semver": "bin/semver.js"
@@ -71,7 +71,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/helper-define-polyfill-provider": {
        "version": "0.6.3",
-@@ -899,7 +912,9 @@
+@@ -932,7 +945,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -82,7 +82,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-async-generators": {
        "version": "7.8.4",
-@@ -910,7 +925,9 @@
+@@ -943,7 +958,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -93,7 +93,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-bigint": {
        "version": "7.8.3",
-@@ -921,7 +938,9 @@
+@@ -954,7 +971,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -104,7 +104,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-class-properties": {
        "version": "7.12.13",
-@@ -932,7 +951,9 @@
+@@ -965,7 +984,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -115,7 +115,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-decorators": {
        "version": "7.27.1",
-@@ -989,7 +1010,9 @@
+@@ -1022,7 +1043,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -126,7 +126,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-json-strings": {
        "version": "7.8.3",
-@@ -1000,7 +1023,9 @@
+@@ -1033,7 +1056,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -137,7 +137,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-jsx": {
        "version": "7.27.1",
-@@ -1027,7 +1052,9 @@
+@@ -1060,7 +1085,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -148,7 +148,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
        "version": "7.8.3",
-@@ -1038,7 +1065,9 @@
+@@ -1071,7 +1098,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -159,7 +159,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-numeric-separator": {
        "version": "7.10.4",
-@@ -1049,7 +1078,9 @@
+@@ -1082,7 +1111,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -170,7 +170,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-object-rest-spread": {
        "version": "7.8.3",
-@@ -1060,7 +1091,9 @@
+@@ -1093,7 +1124,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -181,7 +181,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-optional-catch-binding": {
        "version": "7.8.3",
-@@ -1071,7 +1104,9 @@
+@@ -1104,7 +1137,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -192,7 +192,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-optional-chaining": {
        "version": "7.8.3",
-@@ -1082,7 +1117,9 @@
+@@ -1115,7 +1150,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -203,7 +203,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-top-level-await": {
        "version": "7.14.5",
-@@ -1096,7 +1133,9 @@
+@@ -1129,7 +1166,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0-0"
@@ -214,7 +214,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-syntax-typescript": {
        "version": "7.27.1",
-@@ -1126,7 +1165,9 @@
+@@ -1159,7 +1198,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0"
@@ -225,7 +225,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-transform-arrow-functions": {
        "version": "7.27.1",
-@@ -1264,7 +1305,9 @@
+@@ -1297,7 +1338,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=4"
@@ -236,7 +236,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@babel/plugin-transform-computed-properties": {
        "version": "7.27.1",
-@@ -4152,7 +4195,9 @@
+@@ -4269,7 +4312,9 @@
        "funding": {
          "type": "github",
          "url": "https://github.com/sponsors/nzakas"
@@ -247,7 +247,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@humanwhocodes/object-schema": {
        "version": "2.0.3",
-@@ -4443,7 +4488,9 @@
+@@ -4539,7 +4584,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -258,7 +258,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
        "version": "1.0.10",
-@@ -4451,7 +4498,9 @@
+@@ -4547,7 +4594,9 @@
        "license": "MIT",
        "dependencies": {
          "sprintf-js": "~1.0.2"
@@ -269,7 +269,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
        "version": "5.3.1",
-@@ -4459,7 +4508,9 @@
+@@ -4555,7 +4604,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=6"
@@ -280,7 +280,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
        "version": "4.1.0",
-@@ -4471,7 +4522,9 @@
+@@ -4567,7 +4618,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -290,19 +290,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-       "version": "3.14.1",
-@@ -4483,7 +4536,9 @@
-       },
-       "bin": {
-         "js-yaml": "bin/js-yaml.js"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="
-     },
-     "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-       "version": "5.0.0",
-@@ -4494,7 +4549,9 @@
+       "version": "3.14.2",
+@@ -4592,7 +4645,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -313,7 +302,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
        "version": "2.3.0",
-@@ -4508,7 +4565,9 @@
+@@ -4606,7 +4661,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -324,7 +313,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
        "version": "4.1.0",
-@@ -4519,7 +4578,9 @@
+@@ -4617,7 +4674,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -335,7 +324,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
        "version": "5.0.0",
-@@ -4527,7 +4588,9 @@
+@@ -4625,7 +4684,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -346,7 +335,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@istanbuljs/schema": {
        "version": "0.1.3",
-@@ -4535,7 +4598,9 @@
+@@ -4633,7 +4694,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -357,7 +346,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@jest/console": {
        "version": "29.7.0",
-@@ -4942,7 +5007,9 @@
+@@ -5040,7 +5103,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=6.0.0"
@@ -368,7 +357,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@jridgewell/sourcemap-codec": {
        "version": "1.5.5",
-@@ -5258,14 +5325,18 @@
+@@ -5323,14 +5388,18 @@
        },
        "engines": {
          "node": ">= 8"
@@ -389,7 +378,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@nodelib/fs.walk": {
        "version": "1.2.8",
-@@ -5276,7 +5347,9 @@
+@@ -5341,7 +5410,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -400,7 +389,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@octokit/auth-token": {
        "version": "5.1.1",
-@@ -8232,7 +8305,9 @@
+@@ -8561,7 +8632,9 @@
        "dependencies": {
          "@emnapi/wasi-threads": "1.1.0",
          "tslib": "^2.4.0"
@@ -411,7 +400,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
        "version": "1.7.1",
-@@ -8242,7 +8317,9 @@
+@@ -8571,7 +8644,9 @@
        "optional": true,
        "dependencies": {
          "tslib": "^2.4.0"
@@ -422,7 +411,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
        "version": "1.1.0",
-@@ -8252,7 +8329,9 @@
+@@ -8581,7 +8656,9 @@
        "optional": true,
        "dependencies": {
          "tslib": "^2.4.0"
@@ -433,7 +422,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
        "version": "1.1.0",
-@@ -8264,7 +8343,9 @@
+@@ -8593,7 +8670,9 @@
          "@emnapi/core": "^1.7.1",
          "@emnapi/runtime": "^1.7.1",
          "@tybys/wasm-util": "^0.10.1"
@@ -444,7 +433,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
        "version": "0.10.1",
-@@ -8274,14 +8355,18 @@
+@@ -8603,14 +8682,18 @@
        "optional": true,
        "dependencies": {
          "tslib": "^2.4.0"
@@ -465,7 +454,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
        "version": "4.1.18",
-@@ -8455,7 +8540,9 @@
+@@ -9087,7 +9170,9 @@
      },
      "node_modules/@tootallnate/quickjs-emscripten": {
        "version": "0.23.0",
@@ -476,7 +465,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@ts-stack/markdown": {
        "version": "1.5.0",
-@@ -8674,7 +8761,9 @@
+@@ -9306,7 +9391,9 @@
      "node_modules/@types/istanbul-lib-coverage": {
        "version": "2.0.4",
        "dev": true,
@@ -487,7 +476,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@types/istanbul-lib-report": {
        "version": "3.0.0",
-@@ -8682,7 +8771,9 @@
+@@ -9314,7 +9401,9 @@
        "license": "MIT",
        "dependencies": {
          "@types/istanbul-lib-coverage": "*"
@@ -498,7 +487,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@types/istanbul-reports": {
        "version": "3.0.1",
-@@ -8690,7 +8781,9 @@
+@@ -9322,7 +9411,9 @@
        "license": "MIT",
        "dependencies": {
          "@types/istanbul-lib-report": "*"
@@ -509,7 +498,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@types/jest": {
        "version": "29.5.14",
-@@ -8893,7 +8986,9 @@
+@@ -9557,7 +9648,9 @@
      "node_modules/@types/stack-utils": {
        "version": "2.0.1",
        "dev": true,
@@ -520,7 +509,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@types/statuses": {
        "version": "2.0.6",
-@@ -8979,7 +9074,9 @@
+@@ -9642,7 +9735,9 @@
      "node_modules/@types/yargs-parser": {
        "version": "21.0.0",
        "dev": true,
@@ -531,7 +520,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/@types/yauzl": {
        "version": "2.10.3",
-@@ -10071,7 +10168,9 @@
+@@ -11038,7 +11133,9 @@
      "node_modules/add-stream": {
        "version": "1.0.0",
        "dev": true,
@@ -542,7 +531,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/agent-base": {
        "version": "6.0.2",
-@@ -10081,7 +10180,9 @@
+@@ -11048,7 +11145,9 @@
        },
        "engines": {
          "node": ">= 6.0.0"
@@ -553,7 +542,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/aggregate-error": {
        "version": "3.1.0",
-@@ -10121,7 +10222,9 @@
+@@ -11089,7 +11188,9 @@
          "ajv": {
            "optional": true
          }
@@ -564,7 +553,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ajv-formats": {
        "version": "3.0.1",
-@@ -10216,7 +10319,9 @@
+@@ -11184,7 +11285,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -575,7 +564,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ansi-escapes/node_modules/type-fest": {
        "version": "0.21.3",
-@@ -10227,14 +10332,18 @@
+@@ -11195,14 +11298,18 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -596,7 +585,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ansi-styles": {
        "version": "4.3.0",
-@@ -10247,7 +10356,9 @@
+@@ -11215,7 +11322,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -607,7 +596,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ansis": {
        "version": "4.1.0",
-@@ -10273,7 +10384,9 @@
+@@ -11241,7 +11350,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -617,8 +606,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="
      },
      "node_modules/anymatch/node_modules/picomatch": {
-       "version": "2.3.1",
-@@ -11040,7 +11153,9 @@
+       "version": "2.3.2",
+@@ -11864,7 +11975,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -629,7 +618,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/babel-plugin-jest-hoist": {
        "version": "29.6.3",
-@@ -11131,7 +11246,9 @@
+@@ -11955,7 +12068,9 @@
        },
        "peerDependencies": {
          "@babel/core": "^7.0.0"
@@ -640,7 +629,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/babel-preset-jest": {
        "version": "29.6.3",
-@@ -11324,7 +11441,9 @@
+@@ -12099,7 +12214,9 @@
      },
      "node_modules/balanced-match": {
        "version": "1.0.2",
@@ -651,18 +640,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/bare-events": {
        "version": "2.6.1",
-@@ -11470,7 +11589,9 @@
-       "license": "MIT",
-       "engines": {
-         "node": ">=10.0.0"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz",
-+      "integrity": "sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g=="
-     },
-     "node_modules/before-after-hook": {
-       "version": "3.0.2",
-@@ -12045,7 +12166,9 @@
+@@ -12845,7 +12962,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=6"
@@ -673,7 +651,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/camelcase": {
        "version": "6.3.0",
-@@ -12275,7 +12398,9 @@
+@@ -13076,7 +13195,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -684,7 +662,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/cjs-module-lexer": {
        "version": "1.2.3",
-@@ -12537,7 +12662,9 @@
+@@ -13338,7 +13459,9 @@
        },
        "engines": {
          "node": ">=12"
@@ -695,7 +673,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/clone": {
        "version": "2.1.2",
-@@ -12626,7 +12753,9 @@
+@@ -13427,7 +13550,9 @@
        },
        "engines": {
          "node": ">=7.0.0"
@@ -706,7 +684,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/color-interpolate": {
        "version": "2.0.0",
-@@ -12640,7 +12769,9 @@
+@@ -13441,7 +13566,9 @@
      },
      "node_modules/color-name": {
        "version": "1.1.4",
@@ -717,7 +695,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/color-parse": {
        "version": "2.0.2",
-@@ -12681,13 +12812,13 @@
+@@ -13482,13 +13609,13 @@
      },
      "node_modules/commander": {
        "version": "14.0.2",
@@ -734,7 +712,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/compare-func": {
        "version": "2.0.0",
-@@ -12804,7 +12935,9 @@
+@@ -13605,7 +13732,9 @@
        "dependencies": {
          "ini": "^1.3.4",
          "proto-list": "~1.2.1"
@@ -745,7 +723,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/config-chain/node_modules/ini": {
        "version": "1.3.8",
-@@ -13168,7 +13301,9 @@
+@@ -13971,7 +14100,9 @@
      },
      "node_modules/convert-source-map": {
        "version": "2.0.0",
@@ -756,7 +734,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/convert-to-spaces": {
        "version": "2.0.1",
-@@ -13236,7 +13371,9 @@
+@@ -14039,7 +14170,9 @@
      "node_modules/core-util-is": {
        "version": "1.0.3",
        "dev": true,
@@ -767,7 +745,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/cors": {
        "version": "2.8.5",
-@@ -13616,7 +13753,9 @@
+@@ -14425,7 +14558,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 14"
@@ -778,7 +756,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/data-urls": {
        "version": "3.0.2",
-@@ -13828,7 +13967,9 @@
+@@ -14637,7 +14772,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -789,7 +767,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/dedent": {
        "version": "1.6.0",
-@@ -13861,12 +14002,16 @@
+@@ -14669,12 +14806,16 @@
        "license": "MIT",
        "engines": {
          "node": ">=4.0.0"
@@ -808,7 +786,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/deepmerge": {
        "version": "4.3.1",
-@@ -14191,7 +14336,9 @@
+@@ -14986,7 +15127,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -819,7 +797,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/dlv": {
        "version": "1.1.3",
-@@ -14537,7 +14684,9 @@
+@@ -15331,7 +15474,9 @@
      },
      "node_modules/emoji-regex": {
        "version": "8.0.0",
@@ -830,7 +808,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/emojilib": {
        "version": "2.4.0",
-@@ -14822,7 +14971,9 @@
+@@ -15611,7 +15756,9 @@
        "license": "MIT",
        "dependencies": {
          "is-arrayish": "^0.2.1"
@@ -841,167 +819,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/error-stack-parser-es": {
        "version": "1.0.5",
-@@ -15058,7 +15209,6 @@
-       "os": [
-         "android"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15075,7 +15225,6 @@
-       "os": [
-         "android"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15092,7 +15241,6 @@
-       "os": [
-         "darwin"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15109,7 +15257,6 @@
-       "os": [
-         "darwin"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15126,7 +15273,6 @@
-       "os": [
-         "freebsd"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15143,7 +15289,6 @@
-       "os": [
-         "freebsd"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15160,7 +15305,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15177,7 +15321,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15194,7 +15337,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15211,7 +15353,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15228,7 +15369,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15245,7 +15385,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15262,7 +15401,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15279,7 +15417,6 @@
-       "os": [
-         "linux"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15296,7 +15433,6 @@
-       "os": [
-         "netbsd"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15329,7 +15465,6 @@
-       "os": [
-         "openbsd"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15346,7 +15481,6 @@
-       "os": [
-         "sunos"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15363,7 +15497,6 @@
-       "os": [
-         "win32"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15380,7 +15513,6 @@
-       "os": [
-         "win32"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15397,7 +15529,6 @@
-       "os": [
-         "win32"
-       ],
--      "peer": true,
-       "engines": {
-         "node": ">=12"
-       }
-@@ -15867,7 +15998,9 @@
+@@ -16635,7 +16782,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1012,7 +830,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/escodegen": {
        "version": "2.1.0",
-@@ -15886,7 +16019,9 @@
+@@ -16654,7 +16803,9 @@
        },
        "optionalDependencies": {
          "source-map": "~0.6.1"
@@ -1023,7 +841,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/eslint": {
        "version": "9.32.0",
-@@ -16478,7 +16613,9 @@
+@@ -17333,7 +17484,9 @@
        },
        "engines": {
          "node": ">=4"
@@ -1034,7 +852,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/esquery": {
        "version": "1.5.0",
-@@ -16489,7 +16626,9 @@
+@@ -17344,7 +17497,9 @@
        },
        "engines": {
          "node": ">=0.10"
@@ -1045,7 +863,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/esrecurse": {
        "version": "4.3.0",
-@@ -16522,7 +16661,9 @@
+@@ -17377,7 +17532,9 @@
        "license": "BSD-2-Clause",
        "engines": {
          "node": ">=0.10.0"
@@ -1056,7 +874,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/etag": {
        "version": "1.8.1",
-@@ -16543,7 +16684,9 @@
+@@ -17398,7 +17555,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.8.x"
@@ -1067,7 +885,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/eventsource": {
        "version": "3.0.7",
-@@ -16610,7 +16753,9 @@
+@@ -17465,7 +17624,9 @@
        "dev": true,
        "engines": {
          "node": ">= 0.8.0"
@@ -1078,7 +896,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/expect": {
        "version": "29.7.0",
-@@ -16793,6 +16938,10 @@
+@@ -17513,6 +17674,10 @@
          "node": ">=0.10.0"
        }
      },
@@ -1089,7 +907,7 @@ index 5607a09..44ec9a4 100644
      "node_modules/extract-from-css": {
        "version": "0.4.4",
        "resolved": "https://registry.npmjs.org/extract-from-css/-/extract-from-css-0.4.4.tgz",
-@@ -16851,7 +17000,9 @@
+@@ -17571,7 +17736,9 @@
      },
      "node_modules/fast-deep-equal": {
        "version": "3.1.3",
@@ -1100,7 +918,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fast-diff": {
        "version": "1.3.0",
-@@ -16890,11 +17041,15 @@
+@@ -17610,12 +17777,16 @@
        },
        "engines": {
          "node": ">= 6"
@@ -1111,6 +929,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fast-json-stable-stringify": {
        "version": "2.1.0",
+       "dev": true,
 -      "license": "MIT"
 +      "license": "MIT",
 +      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -1118,7 +937,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fast-json-stringify": {
        "version": "6.0.1",
-@@ -16923,7 +17078,9 @@
+@@ -17644,7 +17815,9 @@
      "node_modules/fast-levenshtein": {
        "version": "2.0.6",
        "dev": true,
@@ -1129,7 +948,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fast-querystring": {
        "version": "1.1.2",
-@@ -17242,7 +17399,9 @@
+@@ -18005,7 +18178,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1140,7 +959,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/find-up-simple": {
        "version": "1.0.0",
-@@ -17438,7 +17597,9 @@
+@@ -18202,7 +18377,9 @@
        "dependencies": {
          "inherits": "^2.0.1",
          "readable-stream": "^2.0.0"
@@ -1151,7 +970,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fs-extra": {
        "version": "11.3.2",
-@@ -17457,7 +17618,9 @@
+@@ -18221,7 +18398,9 @@
      },
      "node_modules/fs.realpath": {
        "version": "1.0.0",
@@ -1162,7 +981,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/fsevents": {
        "version": "2.3.3",
-@@ -17468,7 +17631,9 @@
+@@ -18232,7 +18411,9 @@
        ],
        "engines": {
          "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
@@ -1173,7 +992,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/function-bind": {
        "version": "1.1.2",
-@@ -17531,14 +17696,18 @@
+@@ -18295,14 +18476,18 @@
        "license": "MIT",
        "engines": {
          "node": ">=6.9.0"
@@ -1194,7 +1013,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/get-east-asian-width": {
        "version": "1.3.1",
-@@ -17582,7 +17751,9 @@
+@@ -18346,7 +18531,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8.0.0"
@@ -1205,7 +1024,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/get-proto": {
        "version": "1.0.1",
-@@ -17602,7 +17773,9 @@
+@@ -18366,7 +18553,9 @@
        "license": "MIT",
        "dependencies": {
          "npm-conf": "~1.1.3"
@@ -1216,7 +1035,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/get-stream": {
        "version": "9.0.1",
-@@ -17661,7 +17834,9 @@
+@@ -18426,7 +18615,9 @@
        },
        "engines": {
          "node": ">= 14"
@@ -1227,7 +1046,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/get-uri/node_modules/fs-extra": {
        "version": "8.1.0",
-@@ -17673,21 +17848,27 @@
+@@ -18438,21 +18629,27 @@
        },
        "engines": {
          "node": ">=6 <7 || >=8"
@@ -1258,7 +1077,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/git-log-parser": {
        "version": "1.2.1",
-@@ -17761,7 +17942,9 @@
+@@ -18528,7 +18725,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -1269,7 +1088,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/glob-parent": {
        "version": "6.0.2",
-@@ -17771,7 +17954,9 @@
+@@ -18538,7 +18737,9 @@
        },
        "engines": {
          "node": ">=10.13.0"
@@ -1279,8 +1098,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="
      },
      "node_modules/glob/node_modules/brace-expansion": {
-       "version": "1.1.11",
-@@ -17990,12 +18175,16 @@
+       "version": "1.1.14",
+@@ -18759,12 +18960,16 @@
      },
      "node_modules/graceful-fs": {
        "version": "4.2.11",
@@ -1299,7 +1118,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/graphql": {
        "version": "16.11.0",
-@@ -18102,7 +18291,9 @@
+@@ -18872,7 +19077,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -1310,7 +1129,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/has-property-descriptors": {
        "version": "1.0.2",
-@@ -18330,7 +18521,9 @@
+@@ -19099,7 +19306,9 @@
        },
        "engines": {
          "node": ">= 14"
@@ -1321,7 +1140,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/http-proxy/node_modules/eventemitter3": {
        "version": "4.0.7",
-@@ -18419,7 +18612,9 @@
+@@ -19188,7 +19397,9 @@
        },
        "engines": {
          "node": ">= 6"
@@ -1332,7 +1151,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/human-signals": {
        "version": "8.0.0",
-@@ -18557,7 +18752,9 @@
+@@ -19329,7 +19540,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1343,7 +1162,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/import-meta-resolve": {
        "version": "4.1.0",
-@@ -18575,7 +18772,9 @@
+@@ -19347,7 +19560,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.8.19"
@@ -1354,7 +1173,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/indent-string": {
        "version": "4.0.0",
-@@ -18605,11 +18804,15 @@
+@@ -19377,11 +19592,15 @@
        "dependencies": {
          "once": "^1.3.0",
          "wrappy": "1"
@@ -1372,7 +1191,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ini": {
        "version": "4.1.3",
-@@ -18874,7 +19077,9 @@
+@@ -19646,7 +19865,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -1383,7 +1202,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ipaddr.js": {
        "version": "1.9.1",
-@@ -18931,7 +19136,9 @@
+@@ -19703,7 +19924,9 @@
      "node_modules/is-arrayish": {
        "version": "0.2.1",
        "dev": true,
@@ -1394,7 +1213,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/is-async-function": {
        "version": "2.1.1",
-@@ -19180,7 +19387,9 @@
+@@ -19961,7 +20184,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -1405,7 +1224,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/is-finalizationregistry": {
        "version": "1.1.1",
-@@ -19216,7 +19425,9 @@
+@@ -19984,7 +20209,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -1416,7 +1235,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/is-generator-fn": {
        "version": "2.1.0",
-@@ -19254,7 +19465,9 @@
+@@ -20022,7 +20249,9 @@
        },
        "engines": {
          "node": ">=0.10.0"
@@ -1427,7 +1246,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/is-hexadecimal": {
        "version": "1.0.4",
-@@ -19600,7 +19813,9 @@
+@@ -20367,7 +20596,9 @@
      "node_modules/is-url": {
        "version": "1.2.4",
        "dev": true,
@@ -1438,7 +1257,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/is-weakmap": {
        "version": "2.0.2",
-@@ -19697,16 +19912,22 @@
+@@ -20464,16 +20695,22 @@
        },
        "engines": {
          "node": ">=v0.10.0"
@@ -1464,7 +1283,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/isomorphic-git": {
        "version": "1.32.3",
-@@ -19813,7 +20034,9 @@
+@@ -20580,7 +20817,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -1475,7 +1294,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/istanbul-lib-instrument/node_modules/semver": {
        "version": "6.3.1",
-@@ -19821,7 +20044,9 @@
+@@ -20588,7 +20827,9 @@
        "license": "ISC",
        "bin": {
          "semver": "bin/semver.js"
@@ -1486,7 +1305,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/istanbul-lib-report": {
        "version": "3.0.1",
-@@ -20394,7 +20619,9 @@
+@@ -21163,7 +21404,9 @@
        },
        "engines": {
          "node": ">=10.12.0"
@@ -1497,7 +1316,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/jest-junit/node_modules/uuid": {
        "version": "8.3.2",
-@@ -20402,7 +20629,9 @@
+@@ -21171,7 +21414,9 @@
        "license": "MIT",
        "bin": {
          "uuid": "dist/bin/uuid"
@@ -1508,7 +1327,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/jest-leak-detector": {
        "version": "29.7.0",
-@@ -21163,7 +21392,9 @@
+@@ -21946,7 +22191,9 @@
      },
      "node_modules/json-schema-traverse": {
        "version": "1.0.0",
@@ -1517,9 +1336,9 @@ index 5607a09..44ec9a4 100644
 +      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
 +      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
      },
-     "node_modules/json-stable-stringify": {
-       "version": "1.3.0",
-@@ -21187,7 +21418,9 @@
+     "node_modules/json-schema-typed": {
+       "version": "8.0.2",
+@@ -21976,7 +22223,9 @@
      "node_modules/json-stable-stringify-without-jsonify": {
        "version": "1.0.1",
        "dev": true,
@@ -1530,7 +1349,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/json-stable-stringify/node_modules/isarray": {
        "version": "2.0.5",
-@@ -21210,7 +21443,9 @@
+@@ -21999,7 +22248,9 @@
        },
        "engines": {
          "node": ">=6"
@@ -1541,7 +1360,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/jsonfile": {
        "version": "6.1.0",
-@@ -21220,7 +21455,9 @@
+@@ -22009,7 +22260,9 @@
        },
        "optionalDependencies": {
          "graceful-fs": "^4.1.6"
@@ -1552,7 +1371,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/jsonify": {
        "version": "0.0.1",
-@@ -21491,7 +21728,9 @@
+@@ -22280,7 +22533,9 @@
        },
        "engines": {
          "node": ">= 0.8.0"
@@ -1563,7 +1382,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/light-my-request": {
        "version": "6.6.0",
-@@ -21872,7 +22111,9 @@
+@@ -22670,7 +22925,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1573,8 +1392,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="
      },
      "node_modules/lodash": {
-       "version": "4.17.23",
-@@ -21931,7 +22172,9 @@
+       "version": "4.18.1",
+@@ -22729,7 +22986,9 @@
      "node_modules/lodash.merge": {
        "version": "4.6.2",
        "dev": true,
@@ -1585,7 +1404,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/lodash.uniqby": {
        "version": "4.7.0",
-@@ -22408,14 +22651,18 @@
+@@ -23218,14 +23477,18 @@
      "node_modules/merge-stream": {
        "version": "2.0.0",
        "dev": true,
@@ -1606,7 +1425,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/micromark": {
        "version": "2.11.4",
-@@ -22595,7 +22842,9 @@
+@@ -23405,7 +23668,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1617,7 +1436,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/min-indent": {
        "version": "1.0.1",
-@@ -22626,7 +22875,9 @@
+@@ -23457,7 +23722,9 @@
        "license": "MIT",
        "funding": {
          "url": "https://github.com/sponsors/ljharb"
@@ -1628,7 +1447,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/minimisted": {
        "version": "2.0.1",
-@@ -22718,7 +22969,9 @@
+@@ -23502,7 +23769,9 @@
        },
        "engines": {
          "node": ">=10"
@@ -1638,8 +1457,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
      },
      "node_modules/mocha": {
-       "version": "11.7.2",
-@@ -22910,7 +23163,9 @@
+       "version": "11.7.5",
+@@ -23696,7 +23965,9 @@
      },
      "node_modules/ms": {
        "version": "2.1.2",
@@ -1650,7 +1469,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/msw": {
        "version": "2.11.2",
-@@ -23041,7 +23296,9 @@
+@@ -23843,7 +24114,9 @@
      "node_modules/natural-compare": {
        "version": "1.4.0",
        "dev": true,
@@ -1661,7 +1480,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/negotiator": {
        "version": "0.6.3",
-@@ -23159,7 +23416,9 @@
+@@ -23962,7 +24235,9 @@
          "encoding": {
            "optional": true
          }
@@ -1672,7 +1491,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/node-html-parser": {
        "version": "6.1.13",
-@@ -23217,7 +23476,9 @@
+@@ -24020,7 +24295,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -1683,7 +1502,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/normalize-url": {
        "version": "8.0.1",
-@@ -23401,7 +23662,9 @@
+@@ -24204,7 +24481,9 @@
        },
        "engines": {
          "node": ">=4"
@@ -1694,7 +1513,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm-run-path": {
        "version": "5.3.0",
-@@ -23445,7 +23708,9 @@
+@@ -24248,7 +24527,9 @@
        },
        "engines": {
          "node": ">=12"
@@ -1704,15 +1523,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="
      },
      "node_modules/npm/node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-       "version": "6.1.0",
-@@ -23457,13 +23722,17 @@
+       "version": "6.2.2",
+@@ -24260,13 +24541,17 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-regex?sponsor=1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
++      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="
      },
      "node_modules/npm/node_modules/@isaacs/cliui/node_modules/emoji-regex": {
        "version": "9.2.2",
@@ -1725,7 +1544,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@isaacs/cliui/node_modules/string-width": {
        "version": "5.1.2",
-@@ -23480,7 +23749,9 @@
+@@ -24283,7 +24568,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -1735,19 +1554,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="
      },
      "node_modules/npm/node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-       "version": "7.1.0",
-@@ -23495,7 +23766,9 @@
+       "version": "7.2.0",
+@@ -24298,7 +24585,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/strip-ansi?sponsor=1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
++      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="
      },
      "node_modules/npm/node_modules/@isaacs/fs-minipass": {
        "version": "4.0.1",
-@@ -23507,13 +23780,17 @@
+@@ -24310,13 +24599,17 @@
        },
        "engines": {
          "node": ">=18.0.0"
@@ -1767,7 +1586,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/agent": {
        "version": "3.0.0",
-@@ -23529,7 +23806,9 @@
+@@ -24332,7 +24625,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1777,19 +1596,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q=="
      },
      "node_modules/npm/node_modules/@npmcli/arborist": {
-       "version": "8.0.1",
-@@ -23578,7 +23857,9 @@
+       "version": "8.0.5",
+@@ -24382,7 +24677,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-8.0.1.tgz",
-+      "integrity": "sha512-ZyJWuvP+SdT7JmHkmtGyElm/MkQZP/i4boJXut6HDgx1tmJc/JZ9OwahRuKD+IyowJcLyB/bbaXtYh+RoTCUuw=="
++      "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-8.0.5.tgz",
++      "integrity": "sha512-dFby80JSC3e8825FRGRuhOMWFeKFHokz8j8osLOujmjOSKm6smGu/b1/gbgW0lP8d84iMZO+RxpqBbC5KgL6DQ=="
      },
      "node_modules/npm/node_modules/@npmcli/config": {
        "version": "9.0.0",
-@@ -23597,7 +23878,9 @@
+@@ -24401,7 +24698,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1800,7 +1619,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/fs": {
        "version": "4.0.0",
-@@ -23609,7 +23892,9 @@
+@@ -24413,7 +24712,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1811,7 +1630,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/git": {
        "version": "6.0.3",
-@@ -23628,7 +23913,9 @@
+@@ -24432,7 +24733,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1822,7 +1641,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/installed-package-contents": {
        "version": "3.0.0",
-@@ -23644,7 +23931,9 @@
+@@ -24448,7 +24751,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1833,7 +1652,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/map-workspaces": {
        "version": "4.0.2",
-@@ -23659,7 +23948,9 @@
+@@ -24463,7 +24768,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1844,7 +1663,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/metavuln-calculator": {
        "version": "8.0.1",
-@@ -23675,7 +23966,9 @@
+@@ -24479,7 +24786,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1854,19 +1673,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-WXlJx9cz3CfHSt9W9Opi1PTFc4WZLFomm5O8wekxQZmkyljrBRwATwDxfC9iOXJwYVmfiW1C1dUe0W2aN0UrSg=="
      },
      "node_modules/npm/node_modules/@npmcli/metavuln-calculator/node_modules/pacote": {
-       "version": "20.0.0",
-@@ -23706,7 +23999,9 @@
+       "version": "20.0.1",
+@@ -24510,7 +24819,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.0.tgz",
-+      "integrity": "sha512-pRjC5UFwZCgx9kUFDVM9YEahv4guZ1nSLqwmWiLUnDbGsjs+U5w7z6Uc8HNR1a6x8qnu5y9xtGE6D1uAuYz+0A=="
++      "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.1.tgz",
++      "integrity": "sha512-jTMLD/QK7JMUKg3g7K3M/DEqIbGm7sxclj12eQYIkL3viutSiefTs26IrqIqgGlFsviF/9dlDUZxnpGvkRXtjw=="
      },
      "node_modules/npm/node_modules/@npmcli/name-from-folder": {
        "version": "3.0.0",
-@@ -23715,7 +24010,9 @@
+@@ -24519,7 +24830,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1877,7 +1696,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/node-gyp": {
        "version": "4.0.0",
-@@ -23724,7 +24021,9 @@
+@@ -24528,7 +24841,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1888,7 +1707,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/package-json": {
        "version": "6.2.0",
-@@ -23742,7 +24041,9 @@
+@@ -24546,7 +24861,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1898,19 +1717,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-rCNLSB/JzNvot0SEyXqWZ7tX2B5dD2a1br2Dp0vSYVo5jh8Z0EZ7lS9TsZ1UtziddB1UfNUaMCc538/HztnJGA=="
      },
      "node_modules/npm/node_modules/@npmcli/promise-spawn": {
-       "version": "8.0.2",
-@@ -23754,7 +24055,9 @@
+       "version": "8.0.3",
+@@ -24558,7 +24875,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.2.tgz",
-+      "integrity": "sha512-/bNJhjc+o6qL+Dwz/bqfTQClkEO5nTQ1ZEcdCkAQjhkZMHIh22LPG7fNh1enJP1NKWDqYiiABnjFCY7E0zHYtQ=="
++      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.3.tgz",
++      "integrity": "sha512-Yb00SWaL4F8w+K8YGhQ55+xE4RUNdMHV43WZGsiTM92gS+lC0mGsn7I4hLug7pbao035S6bj3Y3w0cUNGLfmkg=="
      },
      "node_modules/npm/node_modules/@npmcli/query": {
        "version": "4.0.1",
-@@ -23766,7 +24069,9 @@
+@@ -24570,7 +24889,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1921,7 +1740,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/redact": {
        "version": "3.2.2",
-@@ -23775,7 +24080,9 @@
+@@ -24579,7 +24900,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1932,7 +1751,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@npmcli/run-script": {
        "version": "9.1.0",
-@@ -23792,7 +24099,9 @@
+@@ -24596,7 +24919,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1943,7 +1762,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/@pkgjs/parseargs": {
        "version": "0.11.0",
-@@ -23802,7 +24111,9 @@
+@@ -24606,7 +24931,9 @@
        "optional": true,
        "engines": {
          "node": ">=14"
@@ -1951,10 +1770,32 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
 +      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="
+     },
+     "node_modules/npm/node_modules/@sigstore/bundle": {
+       "version": "3.1.0",
+@@ -24618,7 +24945,9 @@
+       },
+       "engines": {
+         "node": "^18.17.0 || >=20.5.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz",
++      "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag=="
+     },
+     "node_modules/npm/node_modules/@sigstore/core": {
+       "version": "2.0.0",
+@@ -24627,7 +24956,9 @@
+       "license": "Apache-2.0",
+       "engines": {
+         "node": "^18.17.0 || >=20.5.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz",
++      "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg=="
      },
      "node_modules/npm/node_modules/@sigstore/protobuf-specs": {
        "version": "0.4.3",
-@@ -23811,7 +24122,9 @@
+@@ -24636,7 +24967,9 @@
        "license": "Apache-2.0",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1962,10 +1803,21 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.3.tgz",
 +      "integrity": "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA=="
+     },
+     "node_modules/npm/node_modules/@sigstore/sign": {
+       "version": "3.1.0",
+@@ -24653,7 +24986,9 @@
+       },
+       "engines": {
+         "node": "^18.17.0 || >=20.5.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz",
++      "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw=="
      },
      "node_modules/npm/node_modules/@sigstore/tuf": {
        "version": "3.1.1",
-@@ -23824,7 +24137,9 @@
+@@ -24666,7 +25001,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1973,10 +1825,21 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz",
 +      "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg=="
+     },
+     "node_modules/npm/node_modules/@sigstore/verify": {
+       "version": "2.1.1",
+@@ -24680,7 +25017,9 @@
+       },
+       "engines": {
+         "node": "^18.17.0 || >=20.5.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz",
++      "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w=="
      },
      "node_modules/npm/node_modules/@tufjs/canonical-json": {
        "version": "2.0.0",
-@@ -23833,7 +24148,9 @@
+@@ -24689,7 +25028,9 @@
        "license": "MIT",
        "engines": {
          "node": "^16.14.0 || >=18.0.0"
@@ -1987,7 +1850,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/abbrev": {
        "version": "3.0.1",
-@@ -23842,7 +24159,9 @@
+@@ -24698,7 +25039,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -1997,19 +1860,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg=="
      },
      "node_modules/npm/node_modules/agent-base": {
-       "version": "7.1.3",
-@@ -23851,7 +24170,9 @@
+       "version": "7.1.4",
+@@ -24707,7 +25050,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 14"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw=="
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
++      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="
      },
      "node_modules/npm/node_modules/ansi-regex": {
        "version": "5.0.1",
-@@ -23860,7 +24181,9 @@
+@@ -24716,7 +25061,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -2019,24 +1882,24 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
      },
      "node_modules/npm/node_modules/ansi-styles": {
-       "version": "6.2.1",
-@@ -23872,25 +24195,33 @@
+       "version": "6.2.3",
+@@ -24728,25 +25075,33 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-styles?sponsor=1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
++      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="
      },
      "node_modules/npm/node_modules/aproba": {
-       "version": "2.0.0",
+       "version": "2.1.0",
        "dev": true,
        "inBundle": true,
 -      "license": "ISC"
 +      "license": "ISC",
-+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
++      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz",
++      "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew=="
      },
      "node_modules/npm/node_modules/archy": {
        "version": "1.0.0",
@@ -2058,7 +1921,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/bin-links": {
        "version": "5.0.0",
-@@ -23906,7 +24237,9 @@
+@@ -24762,7 +25117,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2069,7 +1932,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/binary-extensions": {
        "version": "2.3.0",
-@@ -23918,7 +24251,9 @@
+@@ -24774,7 +25131,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -2080,7 +1943,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/brace-expansion": {
        "version": "2.0.2",
-@@ -23927,7 +24262,9 @@
+@@ -24783,7 +25142,9 @@
        "license": "MIT",
        "dependencies": {
          "balanced-match": "^1.0.0"
@@ -2091,7 +1954,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cacache": {
        "version": "19.0.1",
-@@ -23950,7 +24287,9 @@
+@@ -24806,7 +25167,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2100,9 +1963,20 @@ index 5607a09..44ec9a4 100644
 +      "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz",
 +      "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ=="
      },
-     "node_modules/npm/node_modules/cacache/node_modules/chownr": {
+     "node_modules/npm/node_modules/chalk": {
+       "version": "5.6.2",
+@@ -24818,7 +25181,9 @@
+       },
+       "funding": {
+         "url": "https://github.com/chalk/chalk?sponsor=1"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
++      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="
+     },
+     "node_modules/npm/node_modules/chownr": {
        "version": "3.0.0",
-@@ -23959,7 +24298,9 @@
+@@ -24827,7 +25192,9 @@
        "license": "BlueOak-1.0.0",
        "engines": {
          "node": ">=18"
@@ -2110,76 +1984,21 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
 +      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="
-     },
-     "node_modules/npm/node_modules/cacache/node_modules/mkdirp": {
-       "version": "3.0.1",
-@@ -23974,7 +24315,9 @@
-       },
-       "funding": {
-         "url": "https://github.com/sponsors/isaacs"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="
-     },
-     "node_modules/npm/node_modules/cacache/node_modules/tar": {
-       "version": "7.4.3",
-@@ -23991,7 +24334,9 @@
-       },
-       "engines": {
-         "node": ">=18"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
-+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw=="
-     },
-     "node_modules/npm/node_modules/cacache/node_modules/yallist": {
-       "version": "5.0.0",
-@@ -24000,7 +24345,9 @@
-       "license": "BlueOak-1.0.0",
-       "engines": {
-         "node": ">=18"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
-+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="
-     },
-     "node_modules/npm/node_modules/chalk": {
-       "version": "5.4.1",
-@@ -24012,7 +24359,9 @@
-       },
-       "funding": {
-         "url": "https://github.com/chalk/chalk?sponsor=1"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-+      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w=="
-     },
-     "node_modules/npm/node_modules/chownr": {
-       "version": "2.0.0",
-@@ -24021,7 +24370,9 @@
-       "license": "ISC",
-       "engines": {
-         "node": ">=10"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
      },
      "node_modules/npm/node_modules/ci-info": {
-       "version": "4.2.0",
-@@ -24036,7 +24387,9 @@
+       "version": "4.4.0",
+@@ -24842,7 +25209,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz",
-+      "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg=="
++      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
++      "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg=="
      },
      "node_modules/npm/node_modules/cidr-regex": {
        "version": "4.1.3",
-@@ -24048,7 +24401,9 @@
+@@ -24854,7 +25223,9 @@
        },
        "engines": {
          "node": ">=14"
@@ -2190,7 +2009,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cli-columns": {
        "version": "4.0.0",
-@@ -24061,7 +24416,9 @@
+@@ -24867,7 +25238,9 @@
        },
        "engines": {
          "node": ">= 10"
@@ -2201,7 +2020,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cmd-shim": {
        "version": "7.0.0",
-@@ -24070,7 +24427,9 @@
+@@ -24876,7 +25249,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2212,7 +2031,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/color-convert": {
        "version": "2.0.1",
-@@ -24082,19 +24441,25 @@
+@@ -24888,19 +25263,25 @@
        },
        "engines": {
          "node": ">=7.0.0"
@@ -2241,7 +2060,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cross-spawn": {
        "version": "7.0.6",
-@@ -24108,7 +24473,9 @@
+@@ -24914,7 +25295,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -2252,7 +2071,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cross-spawn/node_modules/which": {
        "version": "2.0.2",
-@@ -24123,7 +24490,9 @@
+@@ -24929,7 +25312,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -2263,7 +2082,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/cssesc": {
        "version": "3.0.0",
-@@ -24135,7 +24504,9 @@
+@@ -24941,7 +25326,9 @@
        },
        "engines": {
          "node": ">=4"
@@ -2273,26 +2092,26 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
      },
      "node_modules/npm/node_modules/debug": {
-       "version": "4.4.1",
-@@ -24152,7 +24523,9 @@
+       "version": "4.4.3",
+@@ -24958,7 +25345,9 @@
          "supports-color": {
            "optional": true
          }
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="
      },
      "node_modules/npm/node_modules/diff": {
-       "version": "5.2.0",
-@@ -24161,19 +24534,25 @@
+       "version": "5.2.2",
+@@ -24967,19 +25356,25 @@
        "license": "BSD-3-Clause",
        "engines": {
          "node": ">=0.3.1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
-+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A=="
++      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.2.tgz",
++      "integrity": "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A=="
      },
      "node_modules/npm/node_modules/eastasianwidth": {
        "version": "0.2.0",
@@ -2314,7 +2133,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/encoding": {
        "version": "0.1.13",
-@@ -24183,7 +24562,9 @@
+@@ -24989,7 +25384,9 @@
        "optional": true,
        "dependencies": {
          "iconv-lite": "^0.6.2"
@@ -2325,7 +2144,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/env-paths": {
        "version": "2.2.1",
-@@ -24192,19 +24573,25 @@
+@@ -24998,19 +25395,25 @@
        "license": "MIT",
        "engines": {
          "node": ">=6"
@@ -2344,17 +2163,17 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
      },
      "node_modules/npm/node_modules/exponential-backoff": {
-       "version": "3.1.2",
+       "version": "3.1.3",
        "dev": true,
        "inBundle": true,
 -      "license": "Apache-2.0"
 +      "license": "Apache-2.0",
-+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
-+      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA=="
++      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz",
++      "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA=="
      },
      "node_modules/npm/node_modules/fastest-levenshtein": {
        "version": "1.0.16",
-@@ -24213,7 +24600,9 @@
+@@ -25019,7 +25422,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 4.9.1"
@@ -2362,10 +2181,21 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
 +      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="
+     },
+     "node_modules/npm/node_modules/fdir": {
+       "version": "6.5.0",
+@@ -25036,7 +25441,9 @@
+         "picomatch": {
+           "optional": true
+         }
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
++      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="
      },
      "node_modules/npm/node_modules/foreground-child": {
        "version": "3.3.1",
-@@ -24229,7 +24618,9 @@
+@@ -25052,7 +25459,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -2376,7 +2206,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/fs-minipass": {
        "version": "3.0.3",
-@@ -24241,7 +24632,9 @@
+@@ -25064,7 +25473,9 @@
        },
        "engines": {
          "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -2386,15 +2216,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw=="
      },
      "node_modules/npm/node_modules/glob": {
-       "version": "10.4.5",
-@@ -24261,13 +24654,17 @@
+       "version": "10.5.0",
+@@ -25084,13 +25495,17 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="
++      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
++      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg=="
      },
      "node_modules/npm/node_modules/graceful-fs": {
        "version": "4.2.11",
@@ -2407,7 +2237,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/hosted-git-info": {
        "version": "8.1.0",
-@@ -24279,13 +24676,17 @@
+@@ -25102,13 +25517,17 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2427,7 +2257,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/http-proxy-agent": {
        "version": "7.0.2",
-@@ -24298,7 +24699,9 @@
+@@ -25121,7 +25540,9 @@
        },
        "engines": {
          "node": ">= 14"
@@ -2438,7 +2268,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/https-proxy-agent": {
        "version": "7.0.6",
-@@ -24311,7 +24714,9 @@
+@@ -25134,7 +25555,9 @@
        },
        "engines": {
          "node": ">= 14"
@@ -2449,7 +2279,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/iconv-lite": {
        "version": "0.6.3",
-@@ -24324,7 +24729,9 @@
+@@ -25147,7 +25570,9 @@
        },
        "engines": {
          "node": ">=0.10.0"
@@ -2460,7 +2290,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/ignore-walk": {
        "version": "7.0.0",
-@@ -24336,7 +24743,9 @@
+@@ -25159,7 +25584,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2471,7 +2301,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/imurmurhash": {
        "version": "0.1.4",
-@@ -24345,7 +24754,9 @@
+@@ -25168,7 +25595,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.8.19"
@@ -2482,7 +2312,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/ini": {
        "version": "5.0.0",
-@@ -24354,7 +24765,9 @@
+@@ -25177,7 +25606,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2493,7 +2323,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/init-package-json": {
        "version": "7.0.2",
-@@ -24372,7 +24785,9 @@
+@@ -25195,7 +25626,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2503,19 +2333,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-Qg6nAQulaOQZjvaSzVLtYRqZmuqOi7gTknqqgdhZy7LV5oO+ppvHWq15tZYzGyxJLTH5BxRTqTa+cPDx2pSD9Q=="
      },
      "node_modules/npm/node_modules/ip-address": {
-       "version": "9.0.5",
-@@ -24385,7 +24800,9 @@
-       },
+       "version": "10.1.0",
+@@ -25204,7 +25637,9 @@
+       "license": "MIT",
        "engines": {
          "node": ">= 12"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g=="
++      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
++      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q=="
      },
      "node_modules/npm/node_modules/ip-regex": {
        "version": "5.0.0",
-@@ -24397,7 +24814,9 @@
+@@ -25216,7 +25651,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -2526,7 +2356,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/is-cidr": {
        "version": "5.1.1",
-@@ -24409,7 +24828,9 @@
+@@ -25228,7 +25665,9 @@
        },
        "engines": {
          "node": ">=14"
@@ -2537,7 +2367,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/is-fullwidth-code-point": {
        "version": "3.0.0",
-@@ -24418,13 +24839,17 @@
+@@ -25237,13 +25676,17 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -2557,7 +2387,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/jackspeak": {
        "version": "3.4.3",
-@@ -24439,13 +24864,17 @@
+@@ -25258,7 +25701,9 @@
        },
        "optionalDependencies": {
          "@pkgjs/parseargs": "^0.11.0"
@@ -2565,19 +2395,10 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
 +      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="
-     },
-     "node_modules/npm/node_modules/jsbn": {
-       "version": "1.1.0",
-       "dev": true,
-       "inBundle": true,
--      "license": "MIT"
-+      "license": "MIT",
-+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
      },
      "node_modules/npm/node_modules/json-parse-even-better-errors": {
        "version": "4.0.0",
-@@ -24454,7 +24883,9 @@
+@@ -25267,7 +25712,9 @@
        "license": "MIT",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2588,7 +2409,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/json-stringify-nice": {
        "version": "1.1.4",
-@@ -24463,7 +24894,9 @@
+@@ -25276,7 +25723,9 @@
        "license": "ISC",
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -2599,7 +2420,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/jsonparse": {
        "version": "1.3.1",
-@@ -24472,19 +24905,25 @@
+@@ -25285,19 +25734,25 @@
          "node >= 0.2.0"
        ],
        "inBundle": true,
@@ -2628,7 +2449,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/libnpmaccess": {
        "version": "9.0.0",
-@@ -24497,7 +24936,9 @@
+@@ -25310,7 +25765,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2638,41 +2459,41 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-mTCFoxyevNgXRrvgdOhghKJnCWByBc9yp7zX4u9RBsmZjwOYdUDEBfL5DdgD1/8gahsYnauqIWFbq0iK6tO6CQ=="
      },
      "node_modules/npm/node_modules/libnpmdiff": {
-       "version": "7.0.1",
-@@ -24516,7 +24957,9 @@
+       "version": "7.0.5",
+@@ -25329,7 +25786,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/libnpmdiff/-/libnpmdiff-7.0.1.tgz",
-+      "integrity": "sha512-CPcLUr23hLwiil/nAlnMQ/eWSTXPPaX+Qe31di8JvcV2ELbbBueucZHBaXlXruUch6zIlSY6c7JCGNAqKN7yaQ=="
++      "resolved": "https://registry.npmjs.org/libnpmdiff/-/libnpmdiff-7.0.5.tgz",
++      "integrity": "sha512-pQ9Hg/j1DcHoY2tbkMKK8mIuEuDlwL9sYKmhY8foofBC8isgtjfrzXDjm4teoy91Pa2ukpnV8dXqKmFb04mc4A=="
      },
      "node_modules/npm/node_modules/libnpmexec": {
-       "version": "9.0.1",
-@@ -24537,7 +24980,9 @@
+       "version": "9.0.5",
+@@ -25350,7 +25809,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/libnpmexec/-/libnpmexec-9.0.1.tgz",
-+      "integrity": "sha512-+SI/x9p0KUkgJdW9L0nDNqtjsFRY3yA5kQKdtGYNMXX4iP/MXQjuXF8MaUAweuV6Awm8plxqn8xCPs2TelZEUg=="
++      "resolved": "https://registry.npmjs.org/libnpmexec/-/libnpmexec-9.0.5.tgz",
++      "integrity": "sha512-XAuPuoQhSgv8FEI03zvnxgr7ueeClSLUfHRwG+xtE9Ue2gjny7CIgpJsjd2a6evS0yHu8CcqtEumq50WzQ/UtQ=="
      },
      "node_modules/npm/node_modules/libnpmfund": {
-       "version": "6.0.1",
-@@ -24549,7 +24994,9 @@
+       "version": "6.0.5",
+@@ -25362,7 +25823,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/libnpmfund/-/libnpmfund-6.0.1.tgz",
-+      "integrity": "sha512-UBbHY9yhhZVffbBpFJq+TsR2KhhEqpQ2mpsIJa6pt0PPQaZ2zgOjvGUYEjURYIGwg2wL1vfQFPeAtmN5w6i3Gg=="
++      "resolved": "https://registry.npmjs.org/libnpmfund/-/libnpmfund-6.0.5.tgz",
++      "integrity": "sha512-8tGUrvobGjeAmbUxFI7ivjgWpeGsSz9CmI7FtrMdu7iGbtAcTESszl2J+R1+Pu0M+TO9fQIbyeovWGM6lI0akA=="
      },
      "node_modules/npm/node_modules/libnpmhook": {
        "version": "11.0.0",
-@@ -24562,7 +25009,9 @@
+@@ -25375,7 +25838,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2683,7 +2504,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/libnpmorg": {
        "version": "7.0.0",
-@@ -24575,7 +25024,9 @@
+@@ -25388,7 +25853,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2693,30 +2514,30 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-DcTodX31gDEiFrlIHurBQiBlBO6Var2KCqMVCk+HqZhfQXqUfhKGmFOp0UHr6HR1lkTVM0MzXOOYtUObk0r6Dg=="
      },
      "node_modules/npm/node_modules/libnpmpack": {
-       "version": "8.0.1",
-@@ -24590,7 +25041,9 @@
+       "version": "8.0.5",
+@@ -25403,7 +25870,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/libnpmpack/-/libnpmpack-8.0.1.tgz",
-+      "integrity": "sha512-E53w3QcldAXg5cG9NpXZcsgNiLw5AEtu7ufGJk6+dxudD0/U5Y6vHIws+CJiI76I9rAidXasKmmS2mwiYDncBw=="
++      "resolved": "https://registry.npmjs.org/libnpmpack/-/libnpmpack-8.0.5.tgz",
++      "integrity": "sha512-j1Zyacp6VRe1HsmOH4MWpEOLMzPKwBkmSgMn5ep83wbALPIwD7LcAvhyjM9sEFjKyFuqmX56XUvNLcF8sUayOg=="
      },
      "node_modules/npm/node_modules/libnpmpublish": {
-       "version": "10.0.1",
-@@ -24609,7 +25062,9 @@
+       "version": "10.0.2",
+@@ -25422,7 +25891,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-10.0.1.tgz",
-+      "integrity": "sha512-xNa1DQs9a8dZetNRV0ky686MNzv1MTqB3szgOlRR3Fr24x1gWRu7aB9OpLZsml0YekmtppgHBkyZ+8QZlzmEyw=="
++      "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-10.0.2.tgz",
++      "integrity": "sha512-Q+PlGO6vOZDlZ6jKPDqDLYbARfV5OBusmJZj9GPbNUiys8OK6/yrwJ8ty8ibbc4GkMspqgOMdJ/1dcJwhtpkDg=="
      },
      "node_modules/npm/node_modules/libnpmsearch": {
        "version": "8.0.0",
-@@ -24621,7 +25076,9 @@
+@@ -25434,7 +25905,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2727,7 +2548,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/libnpmteam": {
        "version": "7.0.0",
-@@ -24634,7 +25091,9 @@
+@@ -25447,7 +25920,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2738,7 +2559,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/libnpmversion": {
        "version": "7.0.0",
-@@ -24650,13 +25109,17 @@
+@@ -25463,13 +25938,17 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2758,7 +2579,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/make-fetch-happen": {
        "version": "14.0.3",
-@@ -24678,7 +25141,9 @@
+@@ -25491,7 +25970,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2766,43 +2587,32 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz",
 +      "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ=="
-     },
-     "node_modules/npm/node_modules/make-fetch-happen/node_modules/negotiator": {
-       "version": "1.0.0",
-@@ -24687,7 +25152,9 @@
-       "license": "MIT",
-       "engines": {
-         "node": ">= 0.6"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="
      },
      "node_modules/npm/node_modules/minimatch": {
-       "version": "9.0.5",
-@@ -24702,7 +25169,9 @@
+       "version": "9.0.9",
+@@ -25506,7 +25987,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
++      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg=="
      },
      "node_modules/npm/node_modules/minipass": {
-       "version": "7.1.2",
-@@ -24711,7 +25180,9 @@
-       "license": "ISC",
+       "version": "7.1.3",
+@@ -25515,7 +25998,9 @@
+       "license": "BlueOak-1.0.0",
        "engines": {
          "node": ">=16 || 14 >=14.17"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
++      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A=="
      },
      "node_modules/npm/node_modules/minipass-collect": {
        "version": "2.0.1",
-@@ -24723,7 +25194,9 @@
+@@ -25527,7 +26012,9 @@
        },
        "engines": {
          "node": ">=16 || 14 >=14.17"
@@ -2813,7 +2623,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/minipass-fetch": {
        "version": "4.0.1",
-@@ -24740,7 +25213,9 @@
+@@ -25544,7 +26031,9 @@
        },
        "optionalDependencies": {
          "encoding": "^0.1.13"
@@ -2824,7 +2634,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/minipass-flush": {
        "version": "1.0.5",
-@@ -24752,7 +25227,9 @@
+@@ -25556,7 +26045,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -2835,7 +2645,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/minipass-flush/node_modules/minipass": {
        "version": "3.3.6",
-@@ -24764,7 +25241,9 @@
+@@ -25568,13 +26059,17 @@
        },
        "engines": {
          "node": ">=8"
@@ -2843,10 +2653,19 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
 +      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
+     },
+     "node_modules/npm/node_modules/minipass-flush/node_modules/yallist": {
+       "version": "4.0.0",
+       "dev": true,
+       "inBundle": true,
+-      "license": "ISC"
++      "license": "ISC",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
      },
      "node_modules/npm/node_modules/minipass-pipeline": {
        "version": "1.2.4",
-@@ -24776,7 +25255,9 @@
+@@ -25586,7 +26081,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -2857,7 +2676,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/minipass-pipeline/node_modules/minipass": {
        "version": "3.3.6",
-@@ -24788,7 +25269,9 @@
+@@ -25598,13 +26095,17 @@
        },
        "engines": {
          "node": ">=8"
@@ -2865,10 +2684,19 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
 +      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
+     },
+     "node_modules/npm/node_modules/minipass-pipeline/node_modules/yallist": {
+       "version": "4.0.0",
+       "dev": true,
+       "inBundle": true,
+-      "license": "ISC"
++      "license": "ISC",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
      },
      "node_modules/npm/node_modules/minipass-sized": {
        "version": "1.0.3",
-@@ -24800,7 +25283,9 @@
+@@ -25616,7 +26117,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -2879,7 +2707,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/minipass-sized/node_modules/minipass": {
        "version": "3.3.6",
-@@ -24812,7 +25297,9 @@
+@@ -25628,13 +26131,17 @@
        },
        "engines": {
          "node": ">=8"
@@ -2887,28 +2715,26 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
 +      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
+     },
+     "node_modules/npm/node_modules/minipass-sized/node_modules/yallist": {
+       "version": "4.0.0",
+       "dev": true,
+       "inBundle": true,
+-      "license": "ISC"
++      "license": "ISC",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
      },
      "node_modules/npm/node_modules/minizlib": {
-       "version": "3.0.2",
-@@ -24824,7 +25311,9 @@
+       "version": "3.1.0",
+@@ -25646,13 +26153,17 @@
        },
        "engines": {
          "node": ">= 18"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
-+      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA=="
-     },
-     "node_modules/npm/node_modules/mkdirp": {
-       "version": "1.0.4",
-@@ -24836,13 +25325,17 @@
-       },
-       "engines": {
-         "node": ">=10"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
++      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
++      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw=="
      },
      "node_modules/npm/node_modules/ms": {
        "version": "2.1.3",
@@ -2921,7 +2747,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/mute-stream": {
        "version": "2.0.0",
-@@ -24851,7 +25344,9 @@
+@@ -25661,7 +26172,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2929,65 +2755,32 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
 +      "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA=="
+     },
+     "node_modules/npm/node_modules/negotiator": {
+       "version": "1.0.0",
+@@ -25670,7 +26183,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">= 0.6"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
++      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="
      },
      "node_modules/npm/node_modules/node-gyp": {
-       "version": "11.2.0",
-@@ -24875,7 +25370,9 @@
+       "version": "11.5.0",
+@@ -25694,7 +26209,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.2.0.tgz",
-+      "integrity": "sha512-T0S1zqskVUSxcsSTkAsLc7xCycrRYmtDHadDinzocrThjyQCn5kMlEBSj6H4qDbgsIOSLmmlRIeb0lZXj+UArA=="
-     },
-     "node_modules/npm/node_modules/node-gyp/node_modules/chownr": {
-       "version": "3.0.0",
-@@ -24884,7 +25381,9 @@
-       "license": "BlueOak-1.0.0",
-       "engines": {
-         "node": ">=18"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
-+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="
-     },
-     "node_modules/npm/node_modules/node-gyp/node_modules/mkdirp": {
-       "version": "3.0.1",
-@@ -24899,7 +25398,9 @@
-       },
-       "funding": {
-         "url": "https://github.com/sponsors/isaacs"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="
-     },
-     "node_modules/npm/node_modules/node-gyp/node_modules/tar": {
-       "version": "7.4.3",
-@@ -24916,7 +25417,9 @@
-       },
-       "engines": {
-         "node": ">=18"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
-+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw=="
-     },
-     "node_modules/npm/node_modules/node-gyp/node_modules/yallist": {
-       "version": "5.0.0",
-@@ -24925,7 +25428,9 @@
-       "license": "BlueOak-1.0.0",
-       "engines": {
-         "node": ">=18"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
-+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="
++      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.5.0.tgz",
++      "integrity": "sha512-ra7Kvlhxn5V9Slyus0ygMa2h+UqExPqUIkfk7Pc8QTLT956JLSy51uWFwHtIYy0vI8cB4BDhc/S03+880My/LQ=="
      },
      "node_modules/npm/node_modules/nopt": {
        "version": "8.1.0",
-@@ -24940,7 +25445,9 @@
+@@ -25709,7 +26226,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -2997,19 +2790,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A=="
      },
      "node_modules/npm/node_modules/normalize-package-data": {
-       "version": "7.0.0",
-@@ -24954,7 +25461,9 @@
+       "version": "7.0.1",
+@@ -25723,7 +26242,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-7.0.0.tgz",
-+      "integrity": "sha512-k6U0gKRIuNCTkwHGZqblCfLfBRh+w1vI6tBo+IeJwq2M8FUiOqhX7GH+GArQGScA7azd1WfyRCvxoXDO3hQDIA=="
++      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-7.0.1.tgz",
++      "integrity": "sha512-linxNAT6M0ebEYZOx2tO6vBEFsVgnPpv+AVjk0wJHfaUIbq31Jm3T6vvZaarnOeWDh8ShnwXuaAyM7WT3RzErA=="
      },
      "node_modules/npm/node_modules/npm-audit-report": {
        "version": "6.0.0",
-@@ -24963,7 +25472,9 @@
+@@ -25732,7 +26253,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3020,7 +2813,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-bundled": {
        "version": "4.0.0",
-@@ -24975,7 +25486,9 @@
+@@ -25744,7 +26267,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3030,19 +2823,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA=="
      },
      "node_modules/npm/node_modules/npm-install-checks": {
-       "version": "7.1.1",
-@@ -24987,7 +25500,9 @@
+       "version": "7.1.2",
+@@ -25756,7 +26281,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.1.tgz",
-+      "integrity": "sha512-u6DCwbow5ynAX5BdiHQ9qvexme4U3qHW3MWe5NqH+NeBm0LbiH6zvGjNNew1fY+AZZUtVHbOPF3j7mJxbUzpXg=="
++      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.2.tgz",
++      "integrity": "sha512-z9HJBCYw9Zr8BqXcllKIs5nI+QggAImbBdHphOzVYrz2CB4iQ6FzWyKmlqDZua+51nAu7FcemlbTc9VgQN5XDQ=="
      },
      "node_modules/npm/node_modules/npm-normalize-package-bin": {
        "version": "4.0.0",
-@@ -24996,7 +25511,9 @@
+@@ -25765,7 +26292,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3053,7 +2846,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-package-arg": {
        "version": "12.0.2",
-@@ -25011,7 +25528,9 @@
+@@ -25780,7 +26309,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3064,7 +2857,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-packlist": {
        "version": "9.0.0",
-@@ -25023,7 +25542,9 @@
+@@ -25792,7 +26323,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3075,7 +2868,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-pick-manifest": {
        "version": "10.0.0",
-@@ -25038,7 +25559,9 @@
+@@ -25807,7 +26340,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3086,7 +2879,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-profile": {
        "version": "11.0.1",
-@@ -25051,7 +25574,9 @@
+@@ -25820,7 +26355,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3097,7 +2890,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-registry-fetch": {
        "version": "18.0.2",
-@@ -25070,7 +25595,9 @@
+@@ -25839,7 +26376,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3108,7 +2901,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/npm-user-validate": {
        "version": "3.0.0",
-@@ -25079,7 +25606,9 @@
+@@ -25848,7 +26387,9 @@
        "license": "BSD-2-Clause",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3118,15 +2911,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-9xi0RdSmJ4mPYTC393VJPz1Sp8LyCx9cUnm/L9Qcb3cFO8gjT4mN20P9FAsea8qDHdQ7LtcN8VLh2UT47SdKCw=="
      },
      "node_modules/npm/node_modules/p-map": {
-       "version": "7.0.3",
-@@ -25091,13 +25620,17 @@
+       "version": "7.0.4",
+@@ -25860,13 +26401,17 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz",
-+      "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA=="
++      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
++      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ=="
      },
      "node_modules/npm/node_modules/package-json-from-dist": {
        "version": "1.0.1",
@@ -3138,19 +2931,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
      },
      "node_modules/npm/node_modules/pacote": {
-       "version": "19.0.1",
-@@ -25128,7 +25661,9 @@
+       "version": "19.0.2",
+@@ -25897,7 +26442,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-19.0.1.tgz",
-+      "integrity": "sha512-zIpxWAsr/BvhrkSruspG8aqCQUUrWtpwx0GjiRZQhEM/pZXrigA32ElN3vTcCPUDOFmHr6SFxwYrvVUs5NTEUg=="
++      "resolved": "https://registry.npmjs.org/pacote/-/pacote-19.0.2.tgz",
++      "integrity": "sha512-iNInrWMS+PzYbaef5EW/mU8OiCPxGuTmYn6ht5ImeXd5TZIVY4+dDmIrbpB6v0MKG/KIMMvj2UD7eKU9GbTGHA=="
      },
      "node_modules/npm/node_modules/parse-conflict-json": {
        "version": "4.0.0",
-@@ -25142,7 +25677,9 @@
+@@ -25911,7 +26458,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3161,7 +2954,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/path-key": {
        "version": "3.1.1",
-@@ -25151,7 +25688,9 @@
+@@ -25920,7 +26469,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -3172,7 +2965,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/path-scurry": {
        "version": "1.11.1",
-@@ -25167,7 +25706,9 @@
+@@ -25936,7 +26487,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -3180,21 +2973,32 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
 +      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="
+     },
+     "node_modules/npm/node_modules/picomatch": {
+       "version": "4.0.3",
+@@ -25948,7 +26501,9 @@
+       },
+       "funding": {
+         "url": "https://github.com/sponsors/jonschlinkert"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
++      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="
      },
      "node_modules/npm/node_modules/postcss-selector-parser": {
-       "version": "7.1.0",
-@@ -25180,7 +25721,9 @@
+       "version": "7.1.1",
+@@ -25961,7 +26516,9 @@
        },
        "engines": {
          "node": ">=4"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA=="
++      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
++      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg=="
      },
      "node_modules/npm/node_modules/proc-log": {
        "version": "5.0.0",
-@@ -25189,7 +25732,9 @@
+@@ -25970,7 +26527,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3205,7 +3009,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/proggy": {
        "version": "3.0.0",
-@@ -25198,7 +25743,9 @@
+@@ -25979,7 +26538,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3216,7 +3020,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/promise-all-reject-late": {
        "version": "1.0.1",
-@@ -25207,7 +25754,9 @@
+@@ -25988,7 +26549,9 @@
        "license": "ISC",
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -3227,7 +3031,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/promise-call-limit": {
        "version": "3.0.2",
-@@ -25216,7 +25765,9 @@
+@@ -25997,7 +26560,9 @@
        "license": "ISC",
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -3238,7 +3042,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/promise-retry": {
        "version": "2.0.1",
-@@ -25229,7 +25780,9 @@
+@@ -26010,7 +26575,9 @@
        },
        "engines": {
          "node": ">=10"
@@ -3249,7 +3053,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/promzard": {
        "version": "2.0.0",
-@@ -25241,7 +25794,9 @@
+@@ -26022,7 +26589,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3260,7 +3064,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/qrcode-terminal": {
        "version": "0.12.0",
-@@ -25249,7 +25804,9 @@
+@@ -26030,7 +26599,9 @@
        "inBundle": true,
        "bin": {
          "qrcode-terminal": "bin/qrcode-terminal.js"
@@ -3271,7 +3075,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/read": {
        "version": "4.1.0",
-@@ -25261,7 +25818,9 @@
+@@ -26042,7 +26613,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3282,7 +3086,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/read-cmd-shim": {
        "version": "5.0.0",
-@@ -25270,7 +25829,9 @@
+@@ -26051,7 +26624,9 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3293,7 +3097,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/read-package-json-fast": {
        "version": "4.0.0",
-@@ -25283,7 +25844,9 @@
+@@ -26064,7 +26639,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3304,7 +3108,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/retry": {
        "version": "0.12.0",
-@@ -25292,14 +25855,18 @@
+@@ -26073,14 +26650,18 @@
        "license": "MIT",
        "engines": {
          "node": ">= 4"
@@ -3324,19 +3128,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
      },
      "node_modules/npm/node_modules/semver": {
-       "version": "7.7.2",
-@@ -25311,7 +25878,9 @@
+       "version": "7.7.4",
+@@ -26092,7 +26673,9 @@
        },
        "engines": {
          "node": ">=10"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA=="
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="
      },
      "node_modules/npm/node_modules/shebang-command": {
        "version": "2.0.0",
-@@ -25323,7 +25892,9 @@
+@@ -26104,7 +26687,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -3347,7 +3151,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/shebang-regex": {
        "version": "3.0.0",
-@@ -25332,7 +25903,9 @@
+@@ -26113,7 +26698,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -3358,7 +3162,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/signal-exit": {
        "version": "4.1.0",
-@@ -25344,7 +25917,9 @@
+@@ -26125,7 +26712,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/isaacs"
@@ -3369,7 +3173,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/sigstore": {
        "version": "3.1.0",
-@@ -25361,7 +25936,9 @@
+@@ -26142,7 +26731,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3377,54 +3181,10 @@ index 5607a09..44ec9a4 100644
 +      },
 +      "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-3.1.0.tgz",
 +      "integrity": "sha512-ZpzWAFHIFqyFE56dXqgX/DkDRZdz+rRcjoIk/RQU4IX0wiCv1l8S7ZrXDHcCc+uaf+6o7w3h2l3g6GYG5TKN9Q=="
-     },
-     "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/bundle": {
-       "version": "3.1.0",
-@@ -25373,7 +25950,9 @@
-       },
-       "engines": {
-         "node": "^18.17.0 || >=20.5.0"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz",
-+      "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag=="
-     },
-     "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/core": {
-       "version": "2.0.0",
-@@ -25382,7 +25961,9 @@
-       "license": "Apache-2.0",
-       "engines": {
-         "node": "^18.17.0 || >=20.5.0"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz",
-+      "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg=="
-     },
-     "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/sign": {
-       "version": "3.1.0",
-@@ -25399,7 +25980,9 @@
-       },
-       "engines": {
-         "node": "^18.17.0 || >=20.5.0"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz",
-+      "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw=="
-     },
-     "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/verify": {
-       "version": "2.1.1",
-@@ -25413,7 +25996,9 @@
-       },
-       "engines": {
-         "node": "^18.17.0 || >=20.5.0"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz",
-+      "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w=="
      },
      "node_modules/npm/node_modules/smart-buffer": {
        "version": "4.2.0",
-@@ -25423,7 +26008,9 @@
+@@ -26152,7 +26743,9 @@
        "engines": {
          "node": ">= 6.0.0",
          "npm": ">= 3.0.0"
@@ -3434,19 +3194,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
      },
      "node_modules/npm/node_modules/socks": {
-       "version": "2.8.5",
-@@ -25437,7 +26024,9 @@
+       "version": "2.8.7",
+@@ -26166,7 +26759,9 @@
        "engines": {
          "node": ">= 10.0.0",
          "npm": ">= 3.0.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.5.tgz",
-+      "integrity": "sha512-iF+tNDQla22geJdTyJB1wM/qrX9DMRwWrciEPwWLPRWAUEM8sQiyxgckLxWT1f7+9VabJS0jTGGr4QgBuvi6Ww=="
++      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
++      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A=="
      },
      "node_modules/npm/node_modules/socks-proxy-agent": {
        "version": "8.0.5",
-@@ -25451,7 +26040,9 @@
+@@ -26180,7 +26775,9 @@
        },
        "engines": {
          "node": ">= 14"
@@ -3457,7 +3217,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/spdx-correct": {
        "version": "3.2.0",
-@@ -25461,7 +26052,9 @@
+@@ -26190,7 +26787,9 @@
        "dependencies": {
          "spdx-expression-parse": "^3.0.0",
          "spdx-license-ids": "^3.0.0"
@@ -3468,7 +3228,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/spdx-correct/node_modules/spdx-expression-parse": {
        "version": "3.0.1",
-@@ -25471,13 +26064,17 @@
+@@ -26200,13 +26799,17 @@
        "dependencies": {
          "spdx-exceptions": "^2.1.0",
          "spdx-license-ids": "^3.0.0"
@@ -3488,7 +3248,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/spdx-expression-parse": {
        "version": "4.0.0",
-@@ -25487,19 +26084,25 @@
+@@ -26216,13 +26819,17 @@
        "dependencies": {
          "spdx-exceptions": "^2.1.0",
          "spdx-license-ids": "^3.0.0"
@@ -3498,26 +3258,17 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ=="
      },
      "node_modules/npm/node_modules/spdx-license-ids": {
-       "version": "3.0.21",
+       "version": "3.0.23",
        "dev": true,
        "inBundle": true,
 -      "license": "CC0-1.0"
 +      "license": "CC0-1.0",
-+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
-+      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg=="
-     },
-     "node_modules/npm/node_modules/sprintf-js": {
-       "version": "1.1.3",
-       "dev": true,
-       "inBundle": true,
--      "license": "BSD-3-Clause"
-+      "license": "BSD-3-Clause",
-+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
++      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz",
++      "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw=="
      },
      "node_modules/npm/node_modules/ssri": {
        "version": "12.0.0",
-@@ -25511,7 +26114,9 @@
+@@ -26234,7 +26841,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3528,7 +3279,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/string-width": {
        "version": "4.2.3",
-@@ -25525,7 +26130,9 @@
+@@ -26248,7 +26857,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -3539,7 +3290,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/string-width-cjs": {
        "name": "string-width",
-@@ -25540,7 +26147,9 @@
+@@ -26263,7 +26874,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -3550,7 +3301,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/strip-ansi": {
        "version": "6.0.1",
-@@ -25552,7 +26161,9 @@
+@@ -26275,7 +26888,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -3561,7 +3312,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/strip-ansi-cjs": {
        "name": "strip-ansi",
-@@ -25565,7 +26176,9 @@
+@@ -26288,7 +26903,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -3572,7 +3323,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/supports-color": {
        "version": "9.4.0",
-@@ -25577,7 +26190,9 @@
+@@ -26300,7 +26917,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/supports-color?sponsor=1"
@@ -3582,70 +3333,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw=="
      },
      "node_modules/npm/node_modules/tar": {
-       "version": "6.2.1",
-@@ -25594,7 +26209,9 @@
+       "version": "7.5.11",
+@@ -26316,19 +26935,25 @@
        },
        "engines": {
-         "node": ">=10"
+         "node": ">=18"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="
-     },
-     "node_modules/npm/node_modules/tar/node_modules/fs-minipass": {
-       "version": "2.1.0",
-@@ -25606,7 +26223,9 @@
-       },
-       "engines": {
-         "node": ">= 8"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="
-     },
-     "node_modules/npm/node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
-       "version": "3.3.6",
-@@ -25618,7 +26237,9 @@
-       },
-       "engines": {
-         "node": ">=8"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
-     },
-     "node_modules/npm/node_modules/tar/node_modules/minipass": {
-       "version": "5.0.0",
-@@ -25627,7 +26248,9 @@
-       "license": "ISC",
-       "engines": {
-         "node": ">=8"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="
-     },
-     "node_modules/npm/node_modules/tar/node_modules/minizlib": {
-       "version": "2.1.2",
-@@ -25640,7 +26263,9 @@
-       },
-       "engines": {
-         "node": ">= 8"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="
-     },
-     "node_modules/npm/node_modules/tar/node_modules/minizlib/node_modules/minipass": {
-       "version": "3.3.6",
-@@ -25652,19 +26277,25 @@
-       },
-       "engines": {
-         "node": ">=8"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="
++      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz",
++      "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ=="
      },
      "node_modules/npm/node_modules/text-table": {
        "version": "0.2.0",
@@ -3666,41 +3362,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A=="
      },
      "node_modules/npm/node_modules/tinyglobby": {
-       "version": "0.2.14",
-@@ -25680,7 +26311,9 @@
+       "version": "0.2.15",
+@@ -26344,7 +26969,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/SuperchupuDev"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ=="
-     },
-     "node_modules/npm/node_modules/tinyglobby/node_modules/fdir": {
-       "version": "6.4.6",
-@@ -25694,7 +26327,9 @@
-         "picomatch": {
-           "optional": true
-         }
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w=="
-     },
-     "node_modules/npm/node_modules/tinyglobby/node_modules/picomatch": {
-       "version": "4.0.2",
-@@ -25706,7 +26341,9 @@
-       },
-       "funding": {
-         "url": "https://github.com/sponsors/jonschlinkert"
--      }
-+      },
-+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="
++      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
++      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ=="
      },
      "node_modules/npm/node_modules/treeverse": {
        "version": "3.0.0",
-@@ -25715,7 +26352,9 @@
+@@ -26353,7 +26980,9 @@
        "license": "ISC",
        "engines": {
          "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -3710,19 +3384,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ=="
      },
      "node_modules/npm/node_modules/tuf-js": {
-       "version": "3.0.1",
-@@ -25729,7 +26368,9 @@
+       "version": "3.1.0",
+@@ -26367,7 +26996,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.0.1.tgz",
-+      "integrity": "sha512-+68OP1ZzSF84rTckf3FA95vJ1Zlx/uaXyiiKyPd1pA4rZNkpEvDAKmsu1xUSmbF/chCRYgZ6UZkDwC7PmzmAyA=="
++      "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.1.0.tgz",
++      "integrity": "sha512-3T3T04WzowbwV2FDiGXBbr81t64g1MUGGJRgT4x5o97N+8ArdhVCAF9IxFrxuSJmM3E5Asn7nKHkao0ibcZXAg=="
      },
      "node_modules/npm/node_modules/tuf-js/node_modules/@tufjs/models": {
        "version": "3.0.1",
-@@ -25742,7 +26383,9 @@
+@@ -26380,7 +27011,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3733,7 +3407,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/unique-filename": {
        "version": "4.0.0",
-@@ -25754,7 +26397,9 @@
+@@ -26392,7 +27025,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3744,7 +3418,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/unique-slug": {
        "version": "5.0.0",
-@@ -25766,13 +26411,17 @@
+@@ -26404,13 +27039,17 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3764,7 +3438,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/validate-npm-package-license": {
        "version": "3.0.4",
-@@ -25782,7 +26431,9 @@
+@@ -26420,7 +27059,9 @@
        "dependencies": {
          "spdx-correct": "^3.0.0",
          "spdx-expression-parse": "^3.0.0"
@@ -3775,7 +3449,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": {
        "version": "3.0.1",
-@@ -25792,7 +26443,9 @@
+@@ -26430,7 +27071,9 @@
        "dependencies": {
          "spdx-exceptions": "^2.1.0",
          "spdx-license-ids": "^3.0.0"
@@ -3785,15 +3459,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="
      },
      "node_modules/npm/node_modules/validate-npm-package-name": {
-       "version": "6.0.1",
-@@ -25801,13 +26454,17 @@
+       "version": "6.0.2",
+@@ -26439,13 +27082,17 @@
        "license": "ISC",
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.1.tgz",
-+      "integrity": "sha512-OaI//3H0J7ZkR1OqlhGA8cA+Cbk/2xFOQpJOt5+s27/ta9eZwpeervh4Mxh4w0im/kdgktowaqVNR7QOrUd7Yg=="
++      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.2.tgz",
++      "integrity": "sha512-IUoow1YUtvoBBC06dXs8bR8B9vuA3aJfmQNKMoaPG/OFsPmoQvw8xh+6Ye25Gx9DQhoEom3Pcu9MKHerm/NpUQ=="
      },
      "node_modules/npm/node_modules/walk-up-path": {
        "version": "3.0.1",
@@ -3806,7 +3480,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/which": {
        "version": "5.0.0",
-@@ -25822,7 +26479,9 @@
+@@ -26460,7 +27107,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3816,19 +3490,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ=="
      },
      "node_modules/npm/node_modules/which/node_modules/isexe": {
-       "version": "3.1.1",
-@@ -25831,7 +26490,9 @@
-       "license": "ISC",
+       "version": "3.1.5",
+@@ -26469,7 +27118,9 @@
+       "license": "BlueOak-1.0.0",
        "engines": {
-         "node": ">=16"
+         "node": ">=18"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ=="
++      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz",
++      "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w=="
      },
      "node_modules/npm/node_modules/wrap-ansi": {
        "version": "8.1.0",
-@@ -25848,7 +26509,9 @@
+@@ -26486,7 +27137,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -3839,7 +3513,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/wrap-ansi-cjs": {
        "name": "wrap-ansi",
-@@ -25866,7 +26529,9 @@
+@@ -26504,7 +27157,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -3850,7 +3524,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
        "version": "4.3.0",
-@@ -25881,7 +26546,9 @@
+@@ -26519,7 +27174,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -3860,15 +3534,15 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
      },
      "node_modules/npm/node_modules/wrap-ansi/node_modules/ansi-regex": {
-       "version": "6.1.0",
-@@ -25893,13 +26560,17 @@
+       "version": "6.2.2",
+@@ -26531,13 +27188,17 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-regex?sponsor=1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
++      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="
      },
      "node_modules/npm/node_modules/wrap-ansi/node_modules/emoji-regex": {
        "version": "9.2.2",
@@ -3881,7 +3555,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/npm/node_modules/wrap-ansi/node_modules/string-width": {
        "version": "5.1.2",
-@@ -25916,7 +26587,9 @@
+@@ -26554,7 +27215,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -3891,19 +3565,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="
      },
      "node_modules/npm/node_modules/wrap-ansi/node_modules/strip-ansi": {
-       "version": "7.1.0",
-@@ -25931,7 +26604,9 @@
+       "version": "7.2.0",
+@@ -26569,7 +27232,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/strip-ansi?sponsor=1"
 -      }
 +      },
-+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
++      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="
      },
      "node_modules/npm/node_modules/write-file-atomic": {
        "version": "6.0.0",
-@@ -25944,13 +26619,17 @@
+@@ -26582,7 +27247,9 @@
        },
        "engines": {
          "node": "^18.17.0 || >=20.5.0"
@@ -3913,17 +3587,19 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-GmqrO8WJ1NuzJ2DrziEI2o57jKAVIQNf8a18W3nCYU3H7PNWqCCVTeH6/NQE93CIllIgQS98rrmVkYgTX9fFJQ=="
      },
      "node_modules/npm/node_modules/yallist": {
-       "version": "4.0.0",
-       "dev": true,
-       "inBundle": true,
--      "license": "ISC"
-+      "license": "ISC",
-+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+       "version": "5.0.0",
+@@ -26591,7 +27258,9 @@
+       "license": "BlueOak-1.0.0",
+       "engines": {
+         "node": ">=18"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
++      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="
      },
      "node_modules/nth-check": {
        "version": "2.1.1",
-@@ -26122,7 +26801,9 @@
+@@ -26763,7 +27432,9 @@
        "license": "ISC",
        "dependencies": {
          "wrappy": "1"
@@ -3934,7 +3610,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/onetime": {
        "version": "5.1.2",
-@@ -26138,6 +26819,19 @@
+@@ -26779,6 +27450,19 @@
          "url": "https://github.com/sponsors/sindresorhus"
        }
      },
@@ -3954,7 +3630,7 @@ index 5607a09..44ec9a4 100644
      "node_modules/open": {
        "version": "10.2.0",
        "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz",
-@@ -26194,7 +26888,9 @@
+@@ -26835,7 +27519,9 @@
        },
        "engines": {
          "node": ">= 0.8.0"
@@ -3963,9 +3639,9 @@ index 5607a09..44ec9a4 100644
 +      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
 +      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg=="
      },
-     "node_modules/os-homedir": {
-       "version": "1.0.2",
-@@ -26322,7 +27018,9 @@
+     "node_modules/orderedmap": {
+       "version": "2.1.1",
+@@ -26949,7 +27635,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -3976,7 +3652,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/p-limit": {
        "version": "3.1.0",
-@@ -26335,7 +27033,9 @@
+@@ -26962,7 +27650,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -3987,7 +3663,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/p-locate": {
        "version": "5.0.0",
-@@ -26348,7 +27048,9 @@
+@@ -26975,7 +27665,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -3998,7 +3674,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/p-map": {
        "version": "7.0.3",
-@@ -26404,7 +27106,9 @@
+@@ -27031,7 +27723,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=6"
@@ -4009,7 +3685,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pac-proxy-agent": {
        "version": "7.1.0",
-@@ -26812,7 +27516,9 @@
+@@ -27439,7 +28133,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -4020,7 +3696,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/path-is-absolute": {
        "version": "1.0.1",
-@@ -26820,7 +27526,9 @@
+@@ -27447,7 +28143,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -4031,7 +3707,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/path-is-inside": {
        "version": "1.0.2",
-@@ -26834,11 +27542,15 @@
+@@ -27461,11 +28159,15 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -4049,7 +3725,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/path-scurry": {
        "version": "1.11.1",
-@@ -26870,7 +27582,9 @@
+@@ -27498,7 +28200,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -4060,7 +3736,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pathe": {
        "version": "2.0.3",
-@@ -26955,7 +27669,9 @@
+@@ -27582,7 +28286,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=4"
@@ -4071,7 +3747,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pikaday": {
        "version": "1.8.2",
-@@ -27029,7 +27745,9 @@
+@@ -27656,7 +28362,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 6"
@@ -4082,7 +3758,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pixelmatch": {
        "version": "7.1.0",
-@@ -27142,7 +27860,9 @@
+@@ -27769,7 +28477,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4093,7 +3769,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pkg-dir/node_modules/find-up": {
        "version": "4.1.0",
-@@ -27154,7 +27874,9 @@
+@@ -27781,7 +28491,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4104,7 +3780,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pkg-dir/node_modules/locate-path": {
        "version": "5.0.0",
-@@ -27165,7 +27887,9 @@
+@@ -27792,7 +28504,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4115,7 +3791,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pkg-dir/node_modules/p-limit": {
        "version": "2.3.0",
-@@ -27179,7 +27903,9 @@
+@@ -27806,7 +28520,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -4126,7 +3802,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pkg-dir/node_modules/p-locate": {
        "version": "4.1.0",
-@@ -27190,7 +27916,9 @@
+@@ -27817,7 +28533,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4137,7 +3813,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/playwright": {
        "version": "1.56.1",
-@@ -27489,7 +28217,9 @@
+@@ -28115,7 +28833,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 0.8.0"
@@ -4148,7 +3824,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/prepend-http": {
        "version": "1.0.4",
-@@ -27567,7 +28297,9 @@
+@@ -28193,7 +28913,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/ansi-styles?sponsor=1"
@@ -4159,7 +3835,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pretty-ms": {
        "version": "9.0.0",
-@@ -27597,7 +28329,9 @@
+@@ -28213,7 +28935,9 @@
      "node_modules/process-nextick-args": {
        "version": "2.0.1",
        "dev": true,
@@ -4170,7 +3846,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/process-warning": {
        "version": "5.0.0",
-@@ -27670,7 +28404,9 @@
+@@ -28481,7 +29205,9 @@
      },
      "node_modules/proto-list": {
        "version": "1.2.4",
@@ -4181,7 +3857,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/protobufjs": {
        "version": "7.5.0",
-@@ -27770,7 +28506,9 @@
+@@ -28581,7 +29307,9 @@
      },
      "node_modules/proxy-from-env": {
        "version": "1.1.0",
@@ -4192,7 +3868,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/pseudomap": {
        "version": "1.0.2",
-@@ -27938,7 +28676,9 @@
+@@ -28750,7 +29478,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=6"
@@ -4201,9 +3877,9 @@ index 5607a09..44ec9a4 100644
 +      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
 +      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
      },
-     "node_modules/puppeteer": {
-       "version": "24.20.0",
-@@ -28060,7 +28800,9 @@
+     "node_modules/punycode.js": {
+       "version": "2.3.1",
+@@ -28881,7 +29611,9 @@
            "url": "https://feross.org/support"
          }
        ],
@@ -4214,7 +3890,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/quick-format-unescaped": {
        "version": "4.0.4",
-@@ -28125,7 +28867,9 @@
+@@ -28962,7 +29694,9 @@
        },
        "bin": {
          "rc": "cli.js"
@@ -4225,7 +3901,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/rc/node_modules/ini": {
        "version": "1.3.8",
-@@ -28139,7 +28883,9 @@
+@@ -28976,7 +29710,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -4236,7 +3912,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/react": {
        "version": "19.2.0",
-@@ -28277,7 +29023,9 @@
+@@ -29100,7 +29836,9 @@
      "node_modules/react-is": {
        "version": "18.2.0",
        "dev": true,
@@ -4247,7 +3923,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/react-reconciler": {
        "version": "0.33.0",
-@@ -28504,12 +29252,16 @@
+@@ -29327,12 +30065,16 @@
          "safe-buffer": "~5.1.1",
          "string_decoder": "~1.1.1",
          "util-deprecate": "~1.0.1"
@@ -4266,7 +3942,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/readdirp": {
        "version": "3.6.0",
-@@ -28801,14 +29553,18 @@
+@@ -29606,14 +30348,18 @@
        "license": "MIT",
        "engines": {
          "node": ">=0.10.0"
@@ -4287,7 +3963,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/require-in-the-middle": {
        "version": "7.5.1",
-@@ -28861,7 +29617,9 @@
+@@ -29666,7 +30412,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4298,7 +3974,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/resolve-cwd/node_modules/resolve-from": {
        "version": "5.0.0",
-@@ -28869,7 +29627,9 @@
+@@ -29674,7 +30422,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -4309,7 +3985,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/resolve-from": {
        "version": "4.0.0",
-@@ -28886,7 +29646,9 @@
+@@ -29691,7 +30441,9 @@
        "license": "MIT",
        "funding": {
          "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
@@ -4320,7 +3996,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/resolve-url": {
        "version": "0.2.1",
-@@ -28966,7 +29728,9 @@
+@@ -29771,7 +30523,9 @@
        "engines": {
          "iojs": ">=1.0.0",
          "node": ">=0.10.0"
@@ -4331,7 +4007,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/rfdc": {
        "version": "1.4.1",
-@@ -29260,7 +30024,9 @@
+@@ -30030,7 +30784,9 @@
        "license": "MIT",
        "dependencies": {
          "queue-microtask": "^1.2.2"
@@ -4342,7 +4018,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/rxjs": {
        "version": "7.8.1",
-@@ -29314,7 +30080,9 @@
+@@ -30084,7 +30840,9 @@
            "url": "https://feross.org/support"
          }
        ],
@@ -4353,7 +4029,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/safe-push-apply": {
        "version": "1.0.0",
-@@ -29909,14 +30677,18 @@
+@@ -30687,14 +31445,18 @@
        },
        "engines": {
          "node": ">=8"
@@ -4373,8 +4049,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
      },
      "node_modules/shell-quote": {
-       "version": "1.8.1",
-@@ -30013,7 +30785,9 @@
+       "version": "1.8.3",
+@@ -30794,7 +31556,9 @@
      },
      "node_modules/signal-exit": {
        "version": "3.0.7",
@@ -4385,7 +4061,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/signale": {
        "version": "1.4.0",
-@@ -30128,7 +30902,9 @@
+@@ -30909,7 +31673,9 @@
            "url": "https://feross.org/support"
          }
        ],
@@ -4396,7 +4072,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/simple-get": {
        "version": "4.0.1",
-@@ -30151,7 +30927,9 @@
+@@ -30932,7 +31698,9 @@
          "decompress-response": "^6.0.0",
          "once": "^1.3.1",
          "simple-concat": "^1.0.0"
@@ -4406,8 +4082,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="
      },
      "node_modules/simple-git": {
-       "version": "3.28.0",
-@@ -30245,7 +31023,9 @@
+       "version": "3.36.0",
+@@ -31028,7 +31796,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=8"
@@ -4418,7 +4094,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/slice-ansi": {
        "version": "7.1.0",
-@@ -30426,7 +31206,9 @@
+@@ -31260,7 +32030,9 @@
        "license": "BSD-3-Clause",
        "engines": {
          "node": ">=0.10.0"
@@ -4429,7 +4105,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/source-map-js": {
        "version": "1.2.1",
-@@ -30525,12 +31307,16 @@
+@@ -31359,12 +32131,16 @@
        "license": "ISC",
        "engines": {
          "node": ">= 10.x"
@@ -4448,7 +4124,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ssh-config": {
        "version": "5.0.4",
-@@ -30546,14 +31332,18 @@
+@@ -31390,14 +32166,18 @@
        },
        "engines": {
          "node": ">=10"
@@ -4469,7 +4145,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/stackback": {
        "version": "0.0.2",
-@@ -30682,11 +31472,15 @@
+@@ -31604,11 +32384,15 @@
        "license": "MIT",
        "dependencies": {
          "safe-buffer": "~5.1.0"
@@ -4487,7 +4163,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/string-argv": {
        "version": "0.3.2",
-@@ -30720,7 +31514,9 @@
+@@ -31643,7 +32427,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4498,7 +4174,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/string-width-cjs": {
        "name": "string-width",
-@@ -30803,7 +31599,9 @@
+@@ -31726,7 +32512,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4509,7 +4185,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/strip-ansi-cjs": {
        "name": "strip-ansi",
-@@ -30869,7 +31667,9 @@
+@@ -31792,7 +32580,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -4520,7 +4196,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/strip-literal": {
        "version": "3.1.0",
-@@ -31019,7 +31819,9 @@
+@@ -31944,7 +32734,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4531,7 +4207,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/supports-hyperlinks": {
        "version": "3.1.0",
-@@ -31044,7 +31846,9 @@
+@@ -31969,7 +32761,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/ljharb"
@@ -4542,7 +4218,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/symbol-tree": {
        "version": "3.2.4",
-@@ -31200,7 +32004,9 @@
+@@ -32111,7 +32905,9 @@
        "dependencies": {
          "debug": "4.3.1",
          "is2": "^2.0.6"
@@ -4553,7 +4229,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/tcp-port-used/node_modules/debug": {
        "version": "4.3.1",
-@@ -31216,7 +32022,9 @@
+@@ -32127,7 +32923,9 @@
          "supports-color": {
            "optional": true
          }
@@ -4564,7 +4240,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/temp-dir": {
        "version": "3.0.0",
-@@ -31224,7 +32032,9 @@
+@@ -32135,7 +32933,9 @@
        "license": "MIT",
        "engines": {
          "node": ">=14.16"
@@ -4575,7 +4251,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/tempfile": {
        "version": "5.0.0",
-@@ -31238,7 +32048,9 @@
+@@ -32149,7 +32949,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -4586,7 +4262,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/tempy": {
        "version": "3.1.0",
-@@ -31427,7 +32239,9 @@
+@@ -32338,7 +33140,9 @@
        },
        "engines": {
          "node": ">=8"
@@ -4596,8 +4272,8 @@ index 5607a09..44ec9a4 100644
 +      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="
      },
      "node_modules/test-exclude/node_modules/brace-expansion": {
-       "version": "1.1.11",
-@@ -31708,7 +32522,9 @@
+       "version": "1.1.14",
+@@ -32650,7 +33454,9 @@
      },
      "node_modules/tr46": {
        "version": "0.0.3",
@@ -4608,7 +4284,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/traverse": {
        "version": "0.6.8",
-@@ -32081,7 +32897,9 @@
+@@ -33016,7 +33822,9 @@
        },
        "engines": {
          "node": ">= 0.8.0"
@@ -4619,7 +4295,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/type-detect": {
        "version": "4.0.8",
-@@ -32534,7 +33352,9 @@
+@@ -33474,7 +34282,9 @@
        "license": "MIT",
        "engines": {
          "node": ">= 10.0.0"
@@ -4630,7 +4306,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/unpipe": {
        "version": "1.0.0",
-@@ -32752,7 +33572,9 @@
+@@ -33728,7 +34538,9 @@
        "license": "BSD-2-Clause",
        "dependencies": {
          "punycode": "^2.1.0"
@@ -4641,7 +4317,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/urix": {
        "version": "0.1.0",
-@@ -32803,7 +33625,9 @@
+@@ -33779,7 +34591,9 @@
      },
      "node_modules/util-deprecate": {
        "version": "1.0.2",
@@ -4652,7 +4328,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/uuid": {
        "version": "10.0.0",
-@@ -33515,7 +34339,9 @@
+@@ -34490,7 +35304,9 @@
        },
        "bin": {
          "installServerIntoExtension": "bin/installServerIntoExtension"
@@ -4663,7 +4339,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/vscode-languageserver-protocol": {
        "version": "3.17.5",
-@@ -33523,7 +34349,9 @@
+@@ -34498,7 +35314,9 @@
        "dependencies": {
          "vscode-jsonrpc": "8.2.0",
          "vscode-languageserver-types": "3.17.5"
@@ -4674,7 +4350,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": {
        "version": "8.2.0",
-@@ -33541,7 +34369,9 @@
+@@ -34516,7 +35334,9 @@
      },
      "node_modules/vscode-languageserver-types": {
        "version": "3.17.5",
@@ -4685,7 +4361,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/vscode-uri": {
        "version": "3.1.0",
-@@ -34054,7 +34884,9 @@
+@@ -35035,7 +35855,9 @@
      },
      "node_modules/webidl-conversions": {
        "version": "3.0.1",
@@ -4696,7 +4372,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/webpack-sources": {
        "version": "3.3.3",
-@@ -34100,7 +34932,9 @@
+@@ -35081,7 +35903,9 @@
        "dependencies": {
          "tr46": "~0.0.3",
          "webidl-conversions": "^3.0.0"
@@ -4707,7 +4383,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/which": {
        "version": "2.0.2",
-@@ -34113,7 +34947,9 @@
+@@ -35094,7 +35918,9 @@
        },
        "engines": {
          "node": ">= 8"
@@ -4718,7 +4394,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/which-boxed-primitive": {
        "version": "1.1.1",
-@@ -34189,6 +35025,16 @@
+@@ -35170,6 +35996,16 @@
          "url": "https://github.com/sponsors/ljharb"
        }
      },
@@ -4735,7 +4411,7 @@ index 5607a09..44ec9a4 100644
      "node_modules/which-typed-array": {
        "version": "1.1.19",
        "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
-@@ -34335,7 +35181,9 @@
+@@ -35315,7 +36151,9 @@
        },
        "funding": {
          "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -4746,7 +4422,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/wrap-ansi-cjs": {
        "name": "wrap-ansi",
-@@ -34356,7 +35204,9 @@
+@@ -35336,7 +36174,9 @@
      },
      "node_modules/wrappy": {
        "version": "1.0.2",
@@ -4757,7 +4433,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/write-file-atomic": {
        "version": "4.0.2",
-@@ -34368,7 +35218,9 @@
+@@ -35348,7 +36188,9 @@
        },
        "engines": {
          "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
@@ -4768,7 +4444,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/ws": {
        "version": "8.18.3",
-@@ -34420,7 +35272,9 @@
+@@ -35400,7 +36242,9 @@
      "node_modules/xml": {
        "version": "1.0.1",
        "dev": true,
@@ -4779,7 +4455,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/xml-name-validator": {
        "version": "4.0.0",
-@@ -34460,7 +35314,9 @@
+@@ -35440,7 +36284,9 @@
        "license": "ISC",
        "engines": {
          "node": ">=10"
@@ -4790,7 +4466,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/yallist": {
        "version": "2.1.2",
-@@ -34494,14 +35350,18 @@
+@@ -35478,14 +36324,18 @@
        },
        "engines": {
          "node": ">=12"
@@ -4811,7 +4487,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/yargs-unparser": {
        "version": "2.0.0",
-@@ -34534,7 +35394,9 @@
+@@ -35518,7 +36368,9 @@
        "license": "ISC",
        "engines": {
          "node": ">=12"
@@ -4822,7 +4498,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/yauzl": {
        "version": "2.10.0",
-@@ -34564,7 +35426,9 @@
+@@ -35547,7 +36399,9 @@
        },
        "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
@@ -4833,7 +4509,7 @@ index 5607a09..44ec9a4 100644
      },
      "node_modules/yoctocolors": {
        "version": "2.0.0",
-@@ -34828,6 +35692,84 @@
+@@ -35809,6 +36663,84 @@
        "version": "0.0.0",
        "devDependencies": {}
      },
@@ -4918,7 +4594,7 @@ index 5607a09..44ec9a4 100644
      "packages/lib_ai_configuration": {
        "name": "@gitlab-org/ai-configuration",
        "version": "0.0.0",
-@@ -40060,4 +41002,4 @@
+@@ -41495,4 +42427,4 @@
        }
      }
    }
@@ -4926,10 +4602,10 @@ index 5607a09..44ec9a4 100644
 +}
 \ No newline at end of file
 diff --git c/package.json i/package.json
-index 97a2104..6002fb9 100644
+index a5f3bd6..0aa8b3e 100644
 --- c/package.json
 +++ i/package.json
-@@ -179,7 +179,8 @@
+@@ -184,7 +184,8 @@
      "ts-node": "^10.9.2",
      "tsx": "^4.20.4",
      "type-fest": "^4.41.0",
diff --git a/pkgs/by-name/gi/gitlab-duo/package.nix b/pkgs/by-name/gi/gitlab-duo/package.nix
index e20b66d39fa9..3aadd7bfbbc3 100644
--- a/pkgs/by-name/gi/gitlab-duo/package.nix
+++ b/pkgs/by-name/gi/gitlab-duo/package.nix
@@ -8,10 +8,11 @@
   patch-package,
   stdenv,
   versionCheckHook,
+  ripgrep,
 }:
 buildNpmPackage (finalAttrs: {
   pname = "gitlab-duo";
-  version = "8.67.0";
+  version = "8.89.0";
 
   # DOCS https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp#node-version
   nodejs = nodejs_22;
@@ -21,7 +22,7 @@ buildNpmPackage (finalAttrs: {
     owner = "editor-extensions";
     repo = "gitlab-lsp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GnL3720MwiWtC7lHA4CrfiZUTeOV+ytWFii16OKGbAM=";
+    hash = "sha256-AiC0xxk8d/2rvRGm31vWqRuJ7nzMrITTGabv7v1LpOA=";
   };
 
   patches = [
@@ -30,13 +31,9 @@ buildNpmPackage (finalAttrs: {
     ./missing-hashes.patch
   ];
 
-  # PATCH: Only build for the current platform, not all targets
-  postPatch = ''
-    sed -i 's/SUPPORTED_TARGETS=".\+"/SUPPORTED_TARGETS="bun-$TARGET"/' packages/cli/scripts/compile_executables.sh
-  '';
-
   npmFlags = [ "--install-links" ];
-  npmDepsHash = "sha256-9b73NGu3GO5Sgus7BZ7WvOaXBvQ3UrW9BUTk6NwH+uY=";
+  npmDepsHash = "sha256-U/dwfYZqy/1CM+Emz1w44mAzY24Z8vKWBXSzSqeVmnY=";
+  npmRebuildFlags = [ "--ignore-scripts" ];
   npmBuildScript = "build:binary";
   npmWorkspace = "@gitlab/duo-cli";
   nativeBuildInputs = [
@@ -48,6 +45,8 @@ buildNpmPackage (finalAttrs: {
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "true";
   env.PUPPETEER_SKIP_DOWNLOAD = "true";
   env.TARGET = "${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}";
+  env.SUPPORTED_TARGETS = "bun-${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}";
+  env.SKIP_RIPGREP_BUNDLE = 1;
 
   postConfigure = ''
     patchShebangs --build ./packages/cli/scripts
@@ -59,6 +58,9 @@ buildNpmPackage (finalAttrs: {
 
     install -Dm755 packages/cli/bin/duo-$TARGET $out/bin/duo
 
+    wrapProgram $out/bin/duo \
+      --prefix PATH : ${lib.getExe ripgrep}
+
     runHook postInstall
   '';
 
@@ -69,7 +71,6 @@ buildNpmPackage (finalAttrs: {
   passthru.updateScript = ./update.sh;
 
   meta = {
-    broken = stdenv.hostPlatform.isDarwin;
     changelog = "https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp/-/blob/main/CHANGELOG.md";
     description = "CLI for GitLab AI assistant";
     downloadPage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp";
diff --git a/pkgs/by-name/gi/gitlab-duo/update.sh b/pkgs/by-name/gi/gitlab-duo/update.sh
index 5d1148543a0e..784b159efc01 100755
--- a/pkgs/by-name/gi/gitlab-duo/update.sh
+++ b/pkgs/by-name/gi/gitlab-duo/update.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p git jaq prefetch-npm-deps nix-update npm-lockfile-fix
+#! nix-shell -I nixpkgs=./. -i bash -p git jaq prefetch-npm-deps nix-update npm-lockfile-fix nodejs_22
 set -euo pipefail
 
 # Get new Gitlab Duo release
@@ -45,7 +45,7 @@ npm install --package-lock-only --ignore-scripts
 npm-lockfile-fix package-lock.json
 npmDepsHash="$(prefetch-npm-deps package-lock.json)"
 git add -A
-patch="$(git diff --cached)"
+patch="$(git diff --cached --no-ext-diff)"
 popd
 
 # Update nix expression with new hashes
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index fa1c02e8d9d9..fe0b9e04fc16 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-pages";
-  version = "18.10.3";
+  version = "18.11.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-TsImrWD6cLvVoasatQpWVFCAuQw3/38EfFC+igikhVo=";
+    hash = "sha256-O9YzFUVhqy16sMmViLcJ4LMumyGsvPDehkQCGproSFs=";
   };
 
-  vendorHash = "sha256-EaTYw8ydHMA3Rmr8YJvUxWBIkPhyKLc8zNUsJRTlMmE=";
+  vendorHash = "sha256-PUW4cgAiM1GTtvja894OZ4pe0SWChf5JsL4/fkns2kI=";
   subPackages = [ "." ];
 
   ldflags = [
diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index de61b497e4e3..848e71afce19 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -4,6 +4,7 @@
   bash,
   buildGoModule,
   fetchFromGitLab,
+  gitMinimal,
   nix-update-script,
   versionCheckHook,
   writableTmpDirAsHomeHook,
@@ -11,16 +12,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.10.1";
+  version = "18.11.1";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qwEzcZuyPqjuGDxNKCHc6AfBgS+Pp/PV1tK/qfofwtA=";
+    hash = "sha256-O/vaodFMt1HgGi4OVjVIfhie0j0bhbRQl1iEMrYfmn0=";
   };
 
-  vendorHash = "sha256-iO5xZAdQPmUpgUGe5CjMHOfzWVXT+eukJ/zLw5BE0NE=";
+  vendorHash = "sha256-xEvvYAVIwHwQDd38P2i6GcgFqf8FPnflWh5IEqmWQdE=";
 
   # For patchShebangs
   buildInputs = [ bash ];
@@ -86,7 +87,10 @@ buildGoModule (finalAttrs: {
       "-X ${ldflagsPackageVariablePrefix}.REVISION=v${finalAttrs.version}"
     ];
 
-  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+  nativeCheckInputs = [
+    gitMinimal
+    writableTmpDirAsHomeHook
+  ];
 
   preCheck = ''
     # Make the tests pass outside of GitLab CI
diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix
index 8d135d97193f..db0386899d74 100644
--- a/pkgs/by-name/gi/gitlab-shell/package.nix
+++ b/pkgs/by-name/gi/gitlab-shell/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-shell";
-  version = "14.47.0";
+  version = "14.49.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-1FQH7Epa9mKxJMyN+NFDIir4shosmEbh6BHcXinuTyk=";
+    hash = "sha256-8PnFRwP5vctnOh6t45crxkoVF6Z03bfYry24KfFHCww=";
   };
 
   buildInputs = [
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     ./remove-hardcoded-locations.patch
   ];
 
-  vendorHash = "sha256-KkIDo/jhBBMwa/T6VzCgeuy9kXIncJglMjab70wqYug=";
+  vendorHash = "sha256-JBKU134/Yyz49HWfU9Dw/EC4bI/o3Hs56Ou7wtzp5qM=";
 
   subPackages = [
     "cmd/gitlab-shell"
diff --git a/pkgs/by-name/gi/gitlab-triage/Gemfile.lock b/pkgs/by-name/gi/gitlab-triage/Gemfile.lock
index 46aafd360a55..556b6abf18ac 100644
--- a/pkgs/by-name/gi/gitlab-triage/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab-triage/Gemfile.lock
@@ -4,61 +4,63 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.1.3)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.2.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
-    csv (3.3.4)
+    base64 (0.3.0)
+    bigdecimal (4.1.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    csv (3.3.5)
     drb (2.2.3)
-    gitlab-triage (1.44.5)
+    gitlab-triage (1.50.0)
       activesupport (>= 5.1)
       globalid (~> 1.0, >= 1.0.1)
       graphql (< 2.1.0)
       graphql-client (~> 0.16)
       httparty (~> 0.20.0)
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
     graphql (2.0.32)
       base64
-    graphql-client (0.25.0)
+    graphql-client (0.26.0)
       activesupport (>= 3.0)
       graphql (>= 1.13.0)
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
+    json (2.19.3)
     logger (1.7.0)
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0527)
-    minitest (5.25.5)
-    multi_xml (0.7.2)
-      bigdecimal (~> 3.1)
+    mime-types-data (3.2026.0414)
+    minitest (6.0.4)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    multi_xml (0.8.1)
+      bigdecimal (>= 3.1, < 5)
+    prism (1.9.0)
     racc (1.8.1)
     securerandom (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uri (1.0.3)
+    uri (1.1.1)
 
 PLATFORMS
   ruby
-  x86_64-linux
 
 DEPENDENCIES
   csv!
@@ -66,4 +68,4 @@ DEPENDENCIES
   racc!
 
 BUNDLED WITH
-   2.6.6
+   2.7.2
diff --git a/pkgs/by-name/gi/gitlab-triage/gemset.nix b/pkgs/by-name/gi/gitlab-triage/gemset.nix
index 910b13fed95e..ea0aee864abf 100644
--- a/pkgs/by-name/gi/gitlab-triage/gemset.nix
+++ b/pkgs/by-name/gi/gitlab-triage/gemset.nix
@@ -2,12 +2,12 @@
   activesupport = {
     dependencies = [
       "base64"
-      "benchmark"
       "bigdecimal"
       "concurrent-ruby"
       "connection_pool"
       "drb"
       "i18n"
+      "json"
       "logger"
       "minitest"
       "securerandom"
@@ -18,70 +18,60 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
+      sha256 = "03m2vjhq3nmc8c3hpivxhvkjd8igg16nmv0p2fgdsgacppgy1991";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "8.1.3";
   };
   base64 = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
       type = "gem";
     };
-    version = "0.2.0";
-  };
-  benchmark = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
-      type = "gem";
-    };
-    version = "0.4.0";
+    version = "0.3.0";
   };
   bigdecimal = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qh7m151nyl3x3f467smrnpvkyinwjz96cdj5vh092yr0x7c687j";
+      sha256 = "1jjlh2zkxdl4jm2xslmrmpgr3wqgxkd0qsrir01m590xjsmyy28w";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "4.1.1";
   };
   concurrent-ruby = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
+      sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb";
       type = "gem";
     };
-    version = "1.3.5";
+    version = "1.3.6";
   };
   connection_pool = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
+      sha256 = "02ifws3c4x7b54fv17sm4cca18d2pfw1saxpdji2lbd1f6xgbzrk";
       type = "gem";
     };
-    version = "2.5.3";
+    version = "3.0.2";
   };
   csv = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kfqg0m6vqs6c67296f10cr07im5mffj90k2b5dsm51liidcsvp9";
+      sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
       type = "gem";
     };
-    version = "3.3.4";
+    version = "3.3.5";
   };
   drb = {
     groups = [ "default" ];
@@ -105,10 +95,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ya6ynljc05z4qzw6w8x9djf31ai4awp5w6xz1m9x4ks6qg1x8kw";
+      sha256 = "1mms2amjhshwcf4xjgkxa8g7aj86bnnczf11imjl5kkhnqysjmqz";
       type = "gem";
     };
-    version = "1.44.5";
+    version = "1.50.0";
   };
   globalid = {
     dependencies = [ "activesupport" ];
@@ -116,10 +106,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh";
+      sha256 = "04gzhqvsm4z4l12r9dkac9a75ah45w186ydhl0i4andldsnkkih5";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.3.0";
   };
   graphql = {
     dependencies = [ "base64" ];
@@ -141,10 +131,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xajv9r03xdn0s382xnwiwnwpy4q443bigdx3l7kczdv95bc8rly";
+      sha256 = "1wcw8n2pml22c3fdifacxy901656sjg7jacj10vlkap00wki42qr";
       type = "gem";
     };
-    version = "0.25.0";
+    version = "0.26.0";
   };
   httparty = {
     dependencies = [
@@ -166,10 +156,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
+      sha256 = "1994i044vdmzzkyr76g8rpl1fq1532wf0sb21xg5r1ilj5iphmr8";
       type = "gem";
     };
-    version = "1.14.7";
+    version = "1.14.8";
+  };
+  json = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0il6qxkxqql7n7sgrws5bi5a36v51dswqcxb6j6gm8aj62shp6r8";
+      type = "gem";
+    };
+    version = "2.19.3";
   };
   logger = {
     groups = [ "default" ];
@@ -200,20 +200,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00ks975j562zlcjg95g5qlzdc7mrc71byg8ln1fyl9yv1iw8v00i";
+      sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726";
       type = "gem";
     };
-    version = "3.2025.0527";
+    version = "3.2026.0414";
   };
   minitest = {
+    dependencies = [
+      "drb"
+      "prism"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
+      sha256 = "18fw91yyphazl5bi9bkw1p7b0rpqa72gsiwj1130zm498mk084yz";
       type = "gem";
     };
-    version = "5.25.5";
+    version = "6.0.4";
   };
   multi_xml = {
     dependencies = [ "bigdecimal" ];
@@ -221,10 +225,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kl7ax7zcj8czlxs6vn3kdhpnz1dwva4y5zwnavssfv193f9cyih";
+      sha256 = "0nnzdswa9l6w8k5ndgbv5al9f0jkg14dqwzyic4fjd5c1cls1nxd";
       type = "gem";
     };
-    version = "0.7.2";
+    version = "0.8.1";
+  };
+  prism = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv";
+      type = "gem";
+    };
+    version = "1.9.0";
   };
   racc = {
     groups = [ "default" ];
@@ -262,9 +276,9 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
+      sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.1";
   };
 }
diff --git a/pkgs/by-name/gi/gitlab-triage/package.nix b/pkgs/by-name/gi/gitlab-triage/package.nix
index 995cb334dda8..34663b44d5df 100644
--- a/pkgs/by-name/gi/gitlab-triage/package.nix
+++ b/pkgs/by-name/gi/gitlab-triage/package.nix
@@ -15,7 +15,7 @@ bundlerApp {
     description = "GitLab's issues and merge requests triage, automated";
     homepage = "https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ xanderio ];
     mainProgram = "gitlab-triage";
   };
 }
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index 4686c8e42a08..5c1661b4b490 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,17 +1,17 @@
 {
-  "version": "18.10.3",
-  "repo_hash": "sha256-x8nmMKbL8hnmQfIrnAhbQHu6Mg2PnjMJeRXUBiI7QFA=",
-  "yarn_hash": "sha256-tWpPN//SdgnRONVa1ykagVHCNs7TCboTnQLQ5Sx0DQs=",
-  "frontend_islands_yarn_hash": "sha256-OkCoiyL9FFJcWcNUbeRSBGGSauYIm7l+yxNfA0CsNEQ=",
+  "version": "18.11.1",
+  "repo_hash": "sha256-ksqJuXklQYFAosyPKAtTDgcq+qJ6TRd2PJ4wu0JpMMI=",
+  "yarn_hash": "sha256-k8JHi0f/XfSV4kICyPW01Erk3YnKw33yeUWYrOaPdTM=",
+  "frontend_islands_yarn_hash": "sha256-EvGQin+5DqqIgM36jlVkVI49WcJzVvceYnkSS9ybfcY=",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.10.3-ee",
+  "rev": "v18.11.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.10.3",
-    "GITLAB_KAS_VERSION": "18.10.3",
-    "GITLAB_PAGES_VERSION": "18.10.3",
-    "GITLAB_SHELL_VERSION": "14.47.0",
+    "GITALY_SERVER_VERSION": "18.11.1",
+    "GITLAB_KAS_VERSION": "18.11.1",
+    "GITLAB_PAGES_VERSION": "18.11.1",
+    "GITLAB_SHELL_VERSION": "14.49.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.1",
-    "GITLAB_WORKHORSE_VERSION": "18.10.3"
+    "GITLAB_WORKHORSE_VERSION": "18.11.1"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index ec2932e97170..e3907259c668 100644
--- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
@@ -10,7 +10,7 @@ in
 buildGoModule (finalAttrs: {
   pname = "gitlab-workhorse";
 
-  version = "18.10.3";
+  version = "18.11.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/workhorse";
 
-  vendorHash = "sha256-dLM+xmpPK4RA0DnZkj8dXN9FdKiRLXXQCeVLI8SqZ3Y=";
+  vendorHash = "sha256-X1+neA2g61BR1VRKXzeqNath0+SYXRbU4vzEg1KD2sY=";
   buildInputs = [ git ];
   ldflags = [ "-X main.Version=${finalAttrs.version}" ];
   doCheck = false;
diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix
index 725270f7e3ff..175f71710a05 100644
--- a/pkgs/by-name/gi/gitlab/package.nix
+++ b/pkgs/by-name/gi/gitlab/package.nix
@@ -136,7 +136,7 @@ let
             cp Cargo.lock $out
           '';
 
-          hash = "sha256-YQEldpT1pCJe5hBJmLTVyvOjnilH10mGhgYfKDSOY3k=";
+          hash = "sha256-KIMs5Zed6mcbq06oxA2eVHLfifSlcfJvACZMblDQC3M=";
         };
 
         postPatch = ''
@@ -335,6 +335,9 @@ let
       yarn run postinstall
       popd
 
+      # Creates a `infection_scanner.json` needed for the assets compiler to succeed.
+      node scripts/frontend/infection_scanner/infection_scanner.mjs
+
       bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production SKIP_YARN_INSTALL=true
 
       runHook postBuild
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
index 7098e11d58ce..10a92f3b6e81 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -39,7 +39,7 @@ gem 'action_dispatch-draw_all',
 # Need by Rails
 gem 'drb', '~> 2.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'bootsnap', '~> 1.18.6', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'bootsnap', '~> 1.23.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Avoid the precompiled native gems because Omnibus needs to build this to ensure
 # LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730
@@ -73,8 +73,6 @@ gem 'view_component', '~> 3.23.2', feature_category: :shared # rubocop:todo Gemf
 # Supported DBs
 gem 'pg', '~> 1.6.1', feature_category: :database
 
-gem 'rugged', '~> 1.9', feature_category: :gitaly
-
 gem 'faraday', '~> 2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 gem 'faraday-retry', '~> 2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 # Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef.
@@ -86,7 +84,7 @@ gem 'marginalia', '~> 1.11.1', feature_category: :database
 gem 'declarative_policy', '~> 2.1.0', feature_category: :permissions
 
 # For source code paths mapping
-gem 'coverband', '6.1.7', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'coverband', '6.2.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Authentication libraries
 gem 'devise', '~> 4.9.3', feature_category: :system_access
@@ -179,7 +177,7 @@ gem 'gitlab-topology-service-client', '~> 0.1',
   feature_category: :cell
 
 # Duo Workflow
-gem 'gitlab-duo-workflow-service-client', '~> 0.6',
+gem 'gitlab-duo-workflow-service-client', '~> 0.7',
   path: 'vendor/gems/gitlab-duo-workflow-service-client',
   feature_category: :duo_agent_platform
 
@@ -434,14 +432,17 @@ gem 'prometheus-client-mmap', '~> 1.5.0', require: 'prometheus/client', feature_
 # Event-driven reactor for Ruby
 # Required manually in config/initializers/require_async_gem
 gem 'async', '~> 2.32.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-gem 'io-event', '~> 1.12', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'io-event', '~> 1.14', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 # Security report schemas used to validate CI job artifacts of security jobs
-gem 'gitlab-security_report_schemas', '0.1.3.min15.0.0.max15.2.3', feature_category: :vulnerability_management
+gem 'gitlab-security_report_schemas', '0.2.0.min15.0.0.max15.2.4', feature_category: :vulnerability_management
 
 # Frontend bundling
-gem 'vite_rails', '~> 3.0.17', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-gem 'vite_ruby', '~> 3.9.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'vite_rails', '~> 3.10.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'vite_ruby', '~> 3.10.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+
+# Provide Rails path helpers to the frontend
+gem "js-routes", "~> 2.3", feature_category: :organization
 
 # OpenTelemetry
 group :opentelemetry do
@@ -505,9 +506,8 @@ group :development do
 end
 
 group :development, :test do
-  gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'bullet', '~> 8.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-  gem 'parser', '= 3.3.10.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+  gem 'parser', '= 3.3.11.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'pry-byebug', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'pry-rails', '~> 0.3.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'pry-shell', '~> 0.6.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@@ -594,7 +594,7 @@ group :test do
   gem 'webmock', '~> 3.26.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'rails-controller-testing', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'concurrent-ruby', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-  gem 'test-prof', '~> 1.5.0', feature_category: :tooling
+  gem 'test-prof', '~> 1.6.0', feature_category: :tooling
   gem 'rspec_junit_formatter', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'guard-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
   gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling
@@ -603,7 +603,7 @@ group :test do
   # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
   gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-  gem 'gitlab_quality-test_tooling', '~> 3.9.0', require: false, feature_category: :tooling
+  gem 'gitlab_quality-test_tooling', '~> 3.10.0', require: false, feature_category: :tooling
 end
 
 gem 'octokit', '~> 9.0', feature_category: :importers
@@ -639,7 +639,7 @@ gem 'ssh_data', '~> 2.0', feature_category: :shared # rubocop:todo Gemfile/Missi
 gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 18.8.0', feature_category: :gitaly
+gem 'gitaly', '~> 18.10.0', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
 gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
@@ -647,7 +647,7 @@ gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
 # Knowledge Graph GRPC protocol definitions
 gem 'gitlab-gkg-proto', '~> 0.7.0', feature_category: :knowledge_graph
 
-gem 'grpc', '~> 1.78.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'grpc', '~> 1.80.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
 gem 'google-protobuf', '>= 3.25', '< 5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
@@ -695,8 +695,8 @@ gem 'valid_email', '~> 0.1', feature_category: :shared # rubocop:todo Gemfile/Mi
 
 # JSON
 gem 'jsonb_accessor', '~> 1.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-gem 'json', '~> 2.13.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-gem 'json_schemer', '~> 2.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'json', '~> 2.19.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+gem 'json_schemer', '~> 2.4.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 gem 'oj', '~> 3.16.0', '>=3.16.16', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 gem 'oj-introspect', '~> 0.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 gem 'multi_json', '~> 1.17.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@@ -759,4 +759,4 @@ gem "gitlab-cloud-connector", "~> 1.45", require: 'gitlab/cloud_connector', feat
 
 gem "gvltools", "~> 0.4.0", feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 
-gem 'gitlab_query_language', '~> 0.23.0', feature_category: :integrations
+gem 'gitlab_query_language', '~> 0.26.0', feature_category: :integrations
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index a428217abd97..0139d4d72a34 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -109,6 +109,7 @@ PATH
       activesupport (>= 6.1, < 8)
       gitlab_quality-test_tooling (>= 3.8, < 4)
       rspec (~> 3.0)
+      test-prof (~> 1.5)
 
 PATH
   remote: gems/gitlab-safe_request_store
@@ -131,7 +132,13 @@ PATH
       actionview (>= 6.1.7.2)
       activesupport (>= 6.1.7.2)
       addressable (~> 2.8)
+      batch-loader (~> 2.0)
+      bigdecimal (~> 3.2)
+      nokogiri (~> 1.0)
+      oj (~> 3.16)
       rake (~> 13.0)
+      toml-rb (~> 4.1)
+      yajl-ruby (~> 1.4)
 
 PATH
   remote: gems/ipynbdiff
@@ -162,7 +169,7 @@ PATH
 PATH
   remote: vendor/gems/gitlab-duo-workflow-service-client
   specs:
-    gitlab-duo-workflow-service-client (0.6)
+    gitlab-duo-workflow-service-client (0.7)
       grpc
 
 PATH
@@ -226,7 +233,7 @@ GEM
       nkf
       rexml
     RedCloth (4.3.4)
-    acme-client (2.0.30)
+    acme-client (2.0.31)
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)
@@ -343,7 +350,6 @@ GEM
       encryptor (~> 3.0.0)
     attr_required (1.0.2)
     awesome_print (1.9.2)
-    awrence (1.2.1)
     aws-eventstream (1.3.0)
     aws-partitions (1.1001.0)
     aws-sdk-cloudformation (1.134.0)
@@ -384,7 +390,7 @@ GEM
     base32 (0.3.4)
     base64 (0.2.0)
     batch-loader (2.0.5)
-    bcrypt (3.1.21)
+    bcrypt (3.1.22)
     benchmark (0.4.1)
     benchmark-ips (2.14.0)
     benchmark-malloc (0.2.0)
@@ -393,10 +399,10 @@ GEM
     benchmark-perf (0.6.0)
     benchmark-trend (0.4.0)
     bigdecimal (3.2.3)
-    bindata (2.4.11)
+    bindata (2.5.1)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.18.6)
+    bootsnap (1.23.0)
       msgpack (~> 1.2)
     browser (5.3.1)
     builder (3.3.0)
@@ -413,7 +419,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    capybara-screenshot (1.0.26)
+    capybara-screenshot (1.0.27)
       capybara (>= 1.0, < 4)
       launchy
     carrierwave (1.3.4)
@@ -421,7 +427,7 @@ GEM
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
       ssrf_filter (~> 1.0, < 1.1.0)
-    cbor (0.5.9.8)
+    cbor (0.5.10.1)
     cgi (0.5.0)
     character_set (1.8.0)
     charlock_holmes (0.7.9)
@@ -460,13 +466,13 @@ GEM
       json
     cork (0.3.0)
       colored2 (~> 3.1)
-    cose (1.3.0)
+    cose (1.3.1)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
     countries (4.0.1)
       i18n_data (~> 0.13.0)
       sixarm_ruby_unaccent (~> 1.1)
-    coverband (6.1.7)
+    coverband (6.2.0)
       base64
       redis (>= 3.0)
     crack (0.4.3)
@@ -511,8 +517,6 @@ GEM
     debug_inspector (1.1.0)
     declarative (0.0.20)
     declarative_policy (2.1.0)
-    deprecation_toolkit (2.2.4)
-      activesupport (>= 6.1)
     derailed_benchmarks (2.2.1)
       base64
       benchmark-ips (~> 2)
@@ -732,7 +736,7 @@ GEM
     gemoji (3.0.1)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
-    gettext (3.5.1)
+    gettext (3.5.2)
       erubi
       locale (>= 2.0.5)
       prime
@@ -743,7 +747,7 @@ GEM
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitaly (18.8.3)
+    gitaly (18.10.0)
       grpc (~> 1.0)
     gitlab (4.19.0)
       httparty (~> 0.20)
@@ -807,7 +811,7 @@ GEM
       activesupport (>= 5.2.0)
       rake (~> 13.0)
       snowplow-tracker (~> 0.8.0)
-    gitlab-secret_detection (0.39.3)
+    gitlab-secret_detection (0.40.0)
       grpc (>= 1.63.0, < 2)
       grpc_reflection (~> 0.1)
       parallel (~> 1)
@@ -815,9 +819,9 @@ GEM
       sentry-ruby (~> 5.22)
       stackprof (~> 0.2.27)
       toml-rb (~> 4.1)
-    gitlab-security_report_schemas (0.1.3.min15.0.0.max15.2.3)
-      activesupport (>= 6, < 8)
-      json_schemer (~> 2.3.0)
+    gitlab-security_report_schemas (0.2.0.min15.0.0.max15.2.4)
+      activesupport (>= 6, < 8.1)
+      json_schemer (~> 2.4.0)
       mutex_m (~> 0.3.0)
     gitlab-styles (13.1.0)
       rubocop (= 1.71.1)
@@ -835,7 +839,7 @@ GEM
       omniauth (>= 1.3, < 3)
       pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
       rubyntlm (~> 0.5)
-    gitlab_quality-test_tooling (3.9.0)
+    gitlab_quality-test_tooling (3.10.1)
       activesupport (>= 7.0)
       amatch (~> 0.4.1)
       fog-google (~> 1.24, >= 1.24.1)
@@ -847,7 +851,7 @@ GEM
       rspec-parameterized (>= 1.0, < 3.0)
       table_print (= 1.5.7)
       zeitwerk (>= 2, < 3)
-    gitlab_query_language (0.23.0)
+    gitlab_query_language (0.26.0)
       rb_sys (~> 0.9.91)
     globalid (1.1.0)
       activesupport (>= 5.0)
@@ -899,11 +903,11 @@ GEM
       google-cloud-errors (~> 1.0)
       google-cloud-location (>= 0.4, < 2.a)
       grpc-google-iam-v1 (~> 1.1)
-    google-cloud-bigquery (1.52.1)
+    google-cloud-bigquery (1.62.0)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       google-apis-bigquery_v2 (~> 0.71)
-      google-apis-core (~> 0.13)
+      google-apis-core (>= 0.18, < 2)
       google-cloud-core (~> 1.6)
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
@@ -997,7 +1001,7 @@ GEM
       logger (~> 1.6)
       ostruct (~> 0.6)
       sass-embedded (~> 1.58)
-    grpc (1.78.1)
+    grpc (1.80.0)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (1.11.0)
@@ -1064,7 +1068,8 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    httpclient (2.8.3)
+    httpclient (2.9.0)
+      mutex_m
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n_data (0.13.1)
@@ -1078,7 +1083,7 @@ GEM
     invisible_captcha (2.3.0)
       rails (>= 5.2)
     io-console (0.8.0)
-    io-event (1.12.1)
+    io-event (1.14.5)
     ipaddress (0.8.3)
     irb (1.15.1)
       pp (>= 0.6.0)
@@ -1094,11 +1099,14 @@ GEM
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
     jmespath (1.6.2)
+    js-routes (2.3.6)
+      railties (>= 5)
+      sorbet-runtime
     js_regex (3.13.0)
       character_set (~> 1.4)
       regexp_parser (~> 2.10)
       regexp_property_values (~> 1.0)
-    json (2.13.1)
+    json (2.19.2)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -1106,7 +1114,7 @@ GEM
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
-    json_schemer (2.3.0)
+    json_schemer (2.4.0)
       bigdecimal
       hana (~> 1.3)
       regexp_parser (~> 2.0)
@@ -1133,8 +1141,8 @@ GEM
     kaminari-core (1.2.2)
     knapsack (4.0.0)
       rake
-    kramdown (2.5.1)
-      rexml (>= 3.3.9)
+    kramdown (2.5.2)
+      rexml (>= 3.4.4)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     kubeclient (4.12.0)
@@ -1182,7 +1190,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.25.0)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lookbook (2.3.13)
@@ -1285,7 +1293,7 @@ GEM
     octokit (9.2.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    ohai (19.1.16)
+    ohai (19.1.24)
       base64
       chef-config (>= 14.12, < 20)
       chef-utils (>= 16.0, < 20)
@@ -1322,7 +1330,7 @@ GEM
     omniauth-github (2.0.1)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8)
-    omniauth-google-oauth2 (1.2.1)
+    omniauth-google-oauth2 (1.2.2)
       jwt (>= 2.9.2)
       oauth2 (~> 2.0)
       omniauth (~> 2.0)
@@ -1566,7 +1574,7 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.27.0)
-    parser (3.3.10.1)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     parslet (1.8.2)
@@ -1634,7 +1642,7 @@ GEM
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.22)
+    rack (2.2.23)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.8.0)
@@ -1865,8 +1873,8 @@ GEM
     rubyzip (2.4.1)
     rugged (1.9.0)
     safe_yaml (1.0.4)
-    safety_net_attestation (0.4.0)
-      jwt (~> 2.0)
+    safety_net_attestation (0.5.0)
+      jwt (>= 2.0, < 4.0)
     sanitize (6.0.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -1881,7 +1889,7 @@ GEM
     seed-fu (2.3.9)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    selenium-webdriver (4.40.0)
+    selenium-webdriver (4.42.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -1956,6 +1964,7 @@ GEM
       yard-solargraph (~> 0.1)
     solargraph-rspec (0.5.4)
       solargraph (>= 0.52.0)
+    sorbet-runtime (0.6.12984)
     spamcheck (1.3.3)
       grpc (~> 1.63)
     spring (4.3.0)
@@ -2014,7 +2023,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terser (1.0.2)
       execjs (>= 0.3.0, < 3)
-    test-prof (1.5.2)
+    test-prof (1.6.1)
     test_file_finder (0.3.1)
       faraday (>= 1.0, < 3.0, != 2.0.0)
     text (1.3.1)
@@ -2030,7 +2039,7 @@ GEM
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
     tomlrb (1.3.0)
-    tpm-key_attestation (0.12.0)
+    tpm-key_attestation (0.14.1)
       bindata (~> 2.4)
       openssl (> 2.0)
       openssl-signature_algorithm (~> 1.0)
@@ -2073,7 +2082,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    undercover (0.8.3)
+    undercover (0.8.4)
       base64
       bigdecimal
       imagen (>= 0.2.0)
@@ -2115,10 +2124,10 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    vite_rails (3.0.19)
+    vite_rails (3.10.0)
       railties (>= 5.1, < 9)
       vite_ruby (~> 3.0, >= 3.2.2)
-    vite_ruby (3.9.2)
+    vite_ruby (3.10.1)
       dry-cli (>= 0.7, < 2)
       logger (~> 1.6)
       mutex_m
@@ -2128,20 +2137,19 @@ GEM
     warden (1.2.9)
       rack (>= 2.0.9)
     warning (1.5.0)
-    webauthn (3.0.0)
+    webauthn (3.4.3)
       android_key_attestation (~> 0.3.0)
-      awrence (~> 1.1)
       bindata (~> 2.4)
       cbor (~> 0.5.9)
       cose (~> 1.1)
       openssl (>= 2.2)
-      safety_net_attestation (~> 0.4.0)
-      tpm-key_attestation (~> 0.12.0)
+      safety_net_attestation (~> 0.5.0)
+      tpm-key_attestation (~> 0.14.0)
     webfinger (2.1.3)
       activesupport
       faraday (~> 2.0)
       faraday-follow_redirects
-    webmock (3.26.1)
+    webmock (3.26.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -2162,7 +2170,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yajl-ruby (1.4.3)
-    yard (0.9.37)
+    yard (0.9.38)
     yard-solargraph (0.1.0)
       yard (~> 0.9)
     zeitwerk (2.6.18)
@@ -2200,7 +2208,7 @@ DEPENDENCIES
   bcrypt (~> 3.1, >= 3.1.14)
   benchmark-ips (~> 2.14.0)
   benchmark-memory (~> 0.1)
-  bootsnap (~> 1.18.6)
+  bootsnap (~> 1.23.0)
   browser (~> 5.3.1)
   bullet (~> 8.0.0)
   bundler-checksum (~> 0.1.0)!
@@ -2214,7 +2222,7 @@ DEPENDENCIES
   concurrent-ruby (~> 1.1)
   connection_pool (~> 2.5.3)
   countries (~> 4.0.0)
-  coverband (= 6.1.7)
+  coverband (= 6.2.0)
   creole (~> 0.5.0)
   cssbundling-rails (= 1.4.3)
   csv_builder!
@@ -2222,7 +2230,6 @@ DEPENDENCIES
   database_cleaner-active_record (~> 2.2.0)
   debug (~> 1.11.0)
   declarative_policy (~> 2.1.0)
-  deprecation_toolkit (~> 2.2.3)
   derailed_benchmarks
   devfile (~> 0.5.0)
   device_detector
@@ -2265,14 +2272,14 @@ DEPENDENCIES
   gettext (~> 3.5, >= 3.5.1)
   gettext_i18n_rails (~> 1.13.0)
   git (~> 1.8)
-  gitaly (~> 18.8.0)
+  gitaly (~> 18.10.0)
   gitlab-active-context!
   gitlab-backup-cli!
   gitlab-chronic (~> 0.10.5)
   gitlab-cloud-connector (~> 1.45)
   gitlab-crystalball (~> 1.1.3)
   gitlab-dangerfiles (~> 4.10.0)
-  gitlab-duo-workflow-service-client (~> 0.6)!
+  gitlab-duo-workflow-service-client (~> 0.7)!
   gitlab-experiment (~> 1.3.0)
   gitlab-fog-azure-rm (~> 2.4.0)
   gitlab-gkg-proto (~> 0.7.0)
@@ -2292,15 +2299,15 @@ DEPENDENCIES
   gitlab-schema-validation!
   gitlab-sdk (~> 0.3.0)
   gitlab-secret_detection (< 1.0)
-  gitlab-security_report_schemas (= 0.1.3.min15.0.0.max15.2.3)
+  gitlab-security_report_schemas (= 0.2.0.min15.0.0.max15.2.4)
   gitlab-sidekiq-fetcher!
   gitlab-styles (~> 13.1.0)
   gitlab-topology-service-client (~> 0.1)!
   gitlab-utils!
   gitlab_chronic_duration (~> 0.12)
   gitlab_omniauth-ldap (~> 2.3.0)
-  gitlab_quality-test_tooling (~> 3.9.0)
-  gitlab_query_language (~> 0.23.0)
+  gitlab_quality-test_tooling (~> 3.10.0)
+  gitlab_query_language (~> 0.26.0)
   gon (~> 6.5.0)
   google-apis-androidpublisher_v3 (~> 0.92.0)
   google-apis-cloudbilling_v1 (~> 0.22.0)
@@ -2329,7 +2336,7 @@ DEPENDENCIES
   graphlyte (~> 1.0.0)
   graphql (= 2.5.11)
   graphql-docs (~> 5.2.0)
-  grpc (~> 1.78.0)
+  grpc (~> 1.80.0)
   gssapi (~> 1.3.1)
   guard-rspec
   gvltools (~> 0.4.0)
@@ -2344,13 +2351,14 @@ DEPENDENCIES
   i18n_data (~> 0.13.1)
   icalendar (~> 2.10.1)
   invisible_captcha (~> 2.3.0)
-  io-event (~> 1.12)
+  io-event (~> 1.14)
   ipaddress (~> 0.8.3)
   ipynbdiff!
   jira-ruby (~> 2.3.0)
+  js-routes (~> 2.3)
   js_regex (~> 3.8)
-  json (~> 2.13.0)
-  json_schemer (~> 2.3.0)
+  json (~> 2.19.0)
+  json_schemer (~> 2.4.0)
   jsonb_accessor (~> 1.4)
   jwt (~> 2.10.0)
   kaminari (~> 1.2.2)
@@ -2432,7 +2440,7 @@ DEPENDENCIES
   pact (~> 1.64)
   paper_trail (~> 16.0)
   parallel (~> 1.19)
-  parser (= 3.3.10.1)
+  parser (= 3.3.11.1)
   parslet (~> 1.8)
   peek (~> 1.1)
   pg (~> 1.6.1)
@@ -2483,7 +2491,6 @@ DEPENDENCIES
   ruby-progressbar (~> 1.10)
   ruby-saml (~> 1.18)
   rubyzip (~> 2.4.0)
-  rugged (~> 1.9)
   sanitize (~> 6.0.2)
   sd_notify (~> 0.1.0)
   seed-fu (~> 2.3.7)
@@ -2518,7 +2525,7 @@ DEPENDENCIES
   tanuki_emoji (~> 0.13)
   telesignenterprise (~> 2.6)
   terser (= 1.0.2)
-  test-prof (~> 1.5.0)
+  test-prof (~> 1.6.0)
   test_file_finder (~> 0.3.1)
   thrift (~> 0.22.0)
   timfel-krb5-auth (~> 0.8)
@@ -2534,8 +2541,8 @@ DEPENDENCIES
   validates_hostname (~> 1.0.13)
   version_sorter (~> 2.3)
   view_component (~> 3.23.2)
-  vite_rails (~> 3.0.17)
-  vite_ruby (~> 3.9.0)
+  vite_rails (~> 3.10.0)
+  vite_ruby (~> 3.10.1)
   vmstat (~> 2.3.0)
   warning (~> 1.5.0)
   webauthn (~> 3.0)
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index 68009ec2ebd0..3a74b9199fae 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -9,10 +9,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05h6ly5jpdpvx18fvz8ryr86z0bxv3xkr9w0wg6l7qgmrdpqk1zx";
+      sha256 = "0q7kgz3kqlwanwaqzq2mp28vyk83y2lvmhmkrpd4ppaz06yw5ik9";
       type = "gem";
     };
-    version = "2.0.30";
+    version = "2.0.31";
   };
   action_dispatch-draw_all = {
     dependencies = [ "actionpack" ];
@@ -523,16 +523,6 @@ src: {
     };
     version = "1.9.2";
   };
-  awrence = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0gj8f8c54r9cabkm41s59sa1ca5wpbipw7gq3sfl87x9296227fx";
-      type = "gem";
-    };
-    version = "1.2.1";
-  };
   aws-eventstream = {
     groups = [ "default" ];
     platforms = [ ];
@@ -739,10 +729,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1krd99p9828n07rcjjms56jaqv7v6s9pn7y6bppcfhhaflyn2r2r";
+      sha256 = "0clhya4p8lhjj7hp31inp321wgzb0b5wbwppmya5sw1dikl7400z";
       type = "gem";
     };
-    version = "3.1.21";
+    version = "3.1.22";
   };
   benchmark = {
     groups = [
@@ -846,10 +836,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0shg48ilaxn8ps8arvyb8pr6pqigdmccirks185c306dzychr3n3";
+      sha256 = "0n4ymlgik3xcg94h52dzmh583ss40rl3sn0kni63v56sq8g6l62k";
       type = "gem";
     };
-    version = "2.4.11";
+    version = "2.5.1";
   };
   binding_of_caller = {
     dependencies = [ "debug_inspector" ];
@@ -871,10 +861,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "003xl226y120cbq1n99805jw6w75gcz1gs941yz3h7li3qy3kqha";
+      sha256 = "057jsch213i42qgdsz2vg1b190n2xvvbi3hgprc8nmaqim2ly9f1";
       type = "gem";
     };
-    version = "1.18.6";
+    version = "1.23.0";
   };
   browser = {
     groups = [ "default" ];
@@ -971,10 +961,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xqc7hdiw1ql42mklpfvqd2pyfsxmy55cpx0h9y0jlkpl1q96sw1";
+      sha256 = "1wklj5laypbvc23zy15amrhg0fwmwcy3p3affzhppxrxq9n8k8dg";
       type = "gem";
     };
-    version = "1.0.26";
+    version = "1.0.27";
   };
   carrierwave = {
     dependencies = [
@@ -997,10 +987,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y";
+      sha256 = "1w3d5dhx4vjd707ihkcmq7fy78p5fgawcjdqw2byxnfw32gzgkbr";
       type = "gem";
     };
-    version = "0.5.9.8";
+    version = "0.5.10.1";
   };
   CFPropertyList = {
     dependencies = [
@@ -1290,10 +1280,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933";
+      sha256 = "1rbdzl9n8ppyp38y75hw06s17kp922ybj6jfvhz52p83dg6xpm6m";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.3.1";
   };
   countries = {
     dependencies = [
@@ -1318,10 +1308,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kl48dkfy01jcpq7cbk455q655kv3sxr9jdcv4i728zglqijaw4l";
+      sha256 = "1awaiayn8fr81nkk04vqi4v4zjr3fkibcjvsc8vsnz93b5h94s97";
       type = "gem";
     };
-    version = "6.1.7";
+    version = "6.2.0";
   };
   crack = {
     dependencies = [ "safe_yaml" ];
@@ -1583,20 +1573,6 @@ src: {
     };
     version = "2.1.0";
   };
-  deprecation_toolkit = {
-    dependencies = [ "activesupport" ];
-    groups = [
-      "development"
-      "test"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "09i5rffqgn9idg7nk47zfhrf3lnwsjws1xlqxqkj7lncmrgdgnmi";
-      type = "gem";
-    };
-    version = "2.2.4";
-  };
   derailed_benchmarks = {
     dependencies = [
       "base64"
@@ -2759,10 +2735,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0aji3873pxn6gc5qkvnv5y9025mqk0p6h22yrpyz2b3yx9qpzv03";
+      sha256 = "0x1wpyy5mgn0523f4pyv7lpxs8b4s6pfvyi24nymd7vym9cjr85d";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.5.2";
   };
   gettext_i18n_rails = {
     dependencies = [ "fast_gettext" ];
@@ -2800,10 +2776,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dqm72anvgcic66zbsnn0l4jjimwdrcdk5hbf5kp9q89b12gajk8";
+      sha256 = "1v49b92vzc744pkl3ajg448p07lc7lc78ngm1fn86nc9l45rv03v";
       type = "gem";
     };
-    version = "18.8.3";
+    version = "18.10.0";
   };
   gitlab = {
     dependencies = [
@@ -2946,7 +2922,7 @@ src: {
       path = "${src}/vendor/gems/gitlab-duo-workflow-service-client";
       type = "path";
     };
-    version = "0.6";
+    version = "0.7";
   };
   gitlab-experiment = {
     dependencies = [
@@ -3142,6 +3118,7 @@ src: {
       "activesupport"
       "gitlab_quality-test_tooling"
       "rspec"
+      "test-prof"
     ];
     groups = [
       "development"
@@ -3227,10 +3204,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01mbiqq9dfw2w68rh4bldgaldza4kg5rd440n3k9pj0bnsiglklr";
+      sha256 = "183ww04pc3dzaxdmip4318akfx50c92p7nigzw4sd9habcadxv6r";
       type = "gem";
     };
-    version = "0.39.3";
+    version = "0.40.0";
   };
   gitlab-security_report_schemas = {
     dependencies = [
@@ -3242,10 +3219,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1g8p0abh18h7xh84ga4a1z54qdixbsp7z62sab725vxlvln4lx1w";
+      sha256 = "1grrds0mr45mijagq6skk749m23jlrwjjldd4x1m20b1152prm3y";
       type = "gem";
     };
-    version = "0.1.3.min15.0.0.max15.2.3";
+    version = "0.2.0.min15.0.0.max15.2.4";
   };
   gitlab-sidekiq-fetcher = {
     dependencies = [
@@ -3301,7 +3278,13 @@ src: {
       "actionview"
       "activesupport"
       "addressable"
+      "batch-loader"
+      "bigdecimal"
+      "nokogiri"
+      "oj"
       "rake"
+      "toml-rb"
+      "yajl-ruby"
     ];
     groups = [ "monorepo" ];
     platforms = [ ];
@@ -3360,10 +3343,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z3jsijb3q25pgyddhzyb30l58rk48pkj1m2dflfv3r7vv5jiszk";
+      sha256 = "0wi8fivbig3s8pifgby9hw36ax38wc2grb93w1dv3mv94cnplbjs";
       type = "gem";
     };
-    version = "3.9.0";
+    version = "3.10.1";
   };
   gitlab_query_language = {
     dependencies = [ "rb_sys" ];
@@ -3371,10 +3354,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qanbk6c4j1rz6a81zipbr97b4k61vnac1f9ndfwzajyin4g8bda";
+      sha256 = "0pbcbv2r160sc26gbpjslg8vbrapgsznvf9v5z828v3n87hwaxil";
       type = "gem";
     };
-    version = "0.23.0";
+    version = "0.26.0";
   };
   globalid = {
     dependencies = [ "activesupport" ];
@@ -3636,10 +3619,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04zswxhyakyr7kkc15p9r6r7xpsxv41ssf5b7b52vyn7qjnmnqr0";
+      sha256 = "0r8frzq74vxw790hfz78bzaf9rsjl6yhj2zpgpmygjlajxpjjizc";
       type = "gem";
     };
-    version = "1.52.1";
+    version = "1.62.0";
   };
   google-cloud-common = {
     dependencies = [
@@ -4030,10 +4013,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0n37kw2y42qvb0s154v99ggvypqlz4bg2yp1q4jkq9h1z56abs69";
+      sha256 = "0zfhcqjplzy63lg89zgrx6h8nxi007fh03krii5x7wx1qf5hrv9d";
       type = "gem";
     };
-    version = "1.78.1";
+    version = "1.80.0";
   };
   grpc-google-iam-v1 = {
     dependencies = [
@@ -4376,14 +4359,20 @@ src: {
     version = "0.24.2";
   };
   httpclient = {
-    groups = [ "default" ];
+    dependencies = [ "mutex_m" ];
+    groups = [
+      "default"
+      "development"
+      "monorepo"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
+      sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b";
       type = "gem";
     };
-    version = "2.8.3";
+    version = "2.9.0";
   };
   i18n = {
     dependencies = [ "concurrent-ruby" ];
@@ -4494,10 +4483,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ky3rfkdf57kf3c03da0dhkb555150yxkh9kfylkan2kxkwnvjiv";
+      sha256 = "1cb3j76ybiq1sdjn93mmclxy5wps5lrnf2rfvhb391x369q3db38";
       type = "gem";
     };
-    version = "1.12.1";
+    version = "1.14.5";
   };
   ipaddress = {
     groups = [ "default" ];
@@ -4594,6 +4583,20 @@ src: {
     };
     version = "1.6.2";
   };
+  js-routes = {
+    dependencies = [
+      "railties"
+      "sorbet-runtime"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0x44b54yhwpdf1wyz12dshc382vwb04bkq51qx6yxwyxmnz20qm4";
+      type = "gem";
+    };
+    version = "2.3.6";
+  };
   js_regex = {
     dependencies = [
       "character_set"
@@ -4614,15 +4617,16 @@ src: {
       "danger"
       "default"
       "development"
+      "monorepo"
       "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1z0gmgndcqrcp5hgmgfrf8qiq9c6g4ccfs98qrgsr2d78jxz8z4f";
+      sha256 = "1kw39sqnr0lprwsd2h0zx1ic96skhqf88i14xv7c8drcicqvvqg7";
       type = "gem";
     };
-    version = "2.13.1";
+    version = "2.19.2";
   };
   json-jwt = {
     dependencies = [
@@ -4653,10 +4657,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dgbrps0ydiyxcgj5n4dny0cmzwj125x1s792l7m5jjrp1rs27wz";
+      sha256 = "093wb42zyy0a7kk7zxdvs0jivm0knlaz9lrsncjxjj2ppcbn3jsn";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
   };
   jsonb_accessor = {
     dependencies = [
@@ -4777,10 +4781,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7";
+      sha256 = "1yh2gwpwhh0p4vc0aabzn0hb55av0wkcq3gh3w8zkdk69hh4598v";
       type = "gem";
     };
-    version = "2.5.1";
+    version = "2.5.2";
   };
   kramdown-parser-gfm = {
     dependencies = [ "kramdown" ];
@@ -5037,10 +5041,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rk0n13c9nmk8di2x5gqk5r04vf8bkp7ff6z0b44wsmc7fndfpnz";
+      sha256 = "011fdngxzr1p9dq2hxqz7qq1glj2g44xnhaadjqlf48cplywfdnl";
       type = "gem";
     };
-    version = "2.25.0";
+    version = "2.25.1";
   };
   lookbook = {
     dependencies = [
@@ -5801,10 +5805,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p8yimcg2wz7sqf8s6slla2izdclris4cgyyhm8j4kvbchcmix5y";
+      sha256 = "0n3prpm36kxxk0jx8qs90gj72382jw7az9rnqnaa88c35793ypx1";
       type = "gem";
     };
-    version = "19.1.16";
+    version = "19.1.24";
   };
   oj = {
     dependencies = [
@@ -5935,10 +5939,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pdf3bx036l6ggz6lkkykv77m9k4jypwsiw1q7874czwh2v50768";
+      sha256 = "04dyy57rlgvrv69pq2pm4rsj658zbaqjy2a6i29qy10w4b8g7hvl";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.2.2";
   };
   omniauth-oauth2 = {
     dependencies = [
@@ -6992,10 +6996,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1256ws3w3gnfqj7r3yz2i9y1y7k38fhjphxpybkyb4fds8jsgxh6";
+      sha256 = "0m2xqvn1la62hji1mn04y59giikww95p2hs0r4y2rrz3mdxcwyni";
       type = "gem";
     };
-    version = "3.3.10.1";
+    version = "3.3.11.1";
   };
   parslet = {
     groups = [
@@ -7404,10 +7408,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0hj5yq200wlq1clpdvh44pqwllbxll0k3gjajxnrcn95hxzhpky5";
+      sha256 = "175ni9qsai9x2ykwvdbd5dzfyncaxpyn6dhjxjw70iq60xz9vzm8";
       type = "gem";
     };
-    version = "2.2.22";
+    version = "2.2.23";
   };
   rack-accept = {
     dependencies = [ "rack" ];
@@ -8671,10 +8675,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln";
+      sha256 = "1apjjd99bqsc22bfq66j27dp4im0amisy619hr9qbghdapfh3kf8";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.5.0";
   };
   sanitize = {
     dependencies = [
@@ -8778,10 +8782,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nsys7ghl99zn2n4zjw3bi697qqnm6pmmi7aaafln79whnlpmvqn";
+      sha256 = "0xywk9dlw8s5ahg56z4mhzv9x22197xfgijfbzf6rc43z78f3dqf";
       type = "gem";
     };
-    version = "4.40.0";
+    version = "4.42.0";
   };
   semver_dialects = {
     dependencies = [
@@ -9132,6 +9136,16 @@ src: {
     };
     version = "0.5.4";
   };
+  sorbet-runtime = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1r0gkq9p7261dfphyplbrp0iy4mchqcdcqq5468y38j7n6jj1zrz";
+      type = "gem";
+    };
+    version = "0.6.12984";
+  };
   spamcheck = {
     dependencies = [ "grpc" ];
     groups = [ "default" ];
@@ -9502,14 +9516,18 @@ src: {
     version = "1.0.2";
   };
   test-prof = {
-    groups = [ "test" ];
+    groups = [
+      "development"
+      "monorepo"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xl51w3g37isibhs2l3s6a6f5ygg31bkx3n41rvv6i9pgpxkjn0q";
+      sha256 = "17j9cai2ykcndgn0800m9nb297sx0lpminxj8bcqw4bwkb1xjch3";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.6.1";
   };
   test_file_finder = {
     dependencies = [ "faraday" ];
@@ -9666,10 +9684,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1";
+      sha256 = "0gqr27hrmg35j7kcb6c2cx3xvkqfs42zpp9jcqw0mzbs79jy9m3z";
       type = "gem";
     };
-    version = "0.12.0";
+    version = "0.14.1";
   };
   traces = {
     groups = [ "default" ];
@@ -9914,10 +9932,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wvldnkcry3q1mkssy87mi6kqmf8igb5pdj2xcki10p3kywf0am7";
+      sha256 = "176hb1i1fwknsvhzkyg3x981yhg97gdmzpq1ww38sb5vls9xz9lr";
       type = "gem";
     };
-    version = "0.8.3";
+    version = "0.8.4";
   };
   unf = {
     dependencies = [ "unf_ext" ];
@@ -10160,17 +10178,14 @@ src: {
       "railties"
       "vite_ruby"
     ];
-    groups = [
-      "development"
-      "test"
-    ];
+    groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "005mbcprdhjqx27561mb54kssjwxwij157x6wya1yp60gdkl8p0r";
+      sha256 = "0yhh5b9zw87hvmv19micvrx187d00a9kfzgzv7l47h3h91ap2i4c";
       type = "gem";
     };
-    version = "3.0.19";
+    version = "3.10.0";
   };
   vite_ruby = {
     dependencies = [
@@ -10180,17 +10195,14 @@ src: {
       "rack-proxy"
       "zeitwerk"
     ];
-    groups = [
-      "development"
-      "test"
-    ];
+    groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0wj9ia0s7vywn66pf2jn49pfsy5h5rncjjwhaymwq32r3f2pq2p1";
+      sha256 = "08nkhycypxqcyi7yxnmh2dinwsl924gk1lp7g096qqdcdgs82fzi";
       type = "gem";
     };
-    version = "3.9.2";
+    version = "3.10.1";
   };
   vmstat = {
     groups = [ "default" ];
@@ -10226,7 +10238,6 @@ src: {
   webauthn = {
     dependencies = [
       "android_key_attestation"
-      "awrence"
       "bindata"
       "cbor"
       "cose"
@@ -10238,10 +10249,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz";
+      sha256 = "1z710ndfr9yajywhji8mr5gc3j3wnr0alq754q15nh7k73wgbrlv";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.4.3";
   };
   webfinger = {
     dependencies = [
@@ -10268,10 +10279,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mqw7ca931zmqgad0fq4gw7z3gwb0pwx9cmd1b12ga4hgjsnysag";
+      sha256 = "142cbab47mjxmg8gc89d94sd3h7an9ligh38r9n88wb3xbr5cibp";
       type = "gem";
     };
-    version = "3.26.1";
+    version = "3.26.2";
   };
   webrick = {
     groups = [
@@ -10423,16 +10434,16 @@ src: {
   };
   yard = {
     groups = [
-      "default"
       "development"
+      "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14k9lb9a60r9z2zcqg08by9iljrrgjxdkbd91gw17rkqkqwi1sd6";
+      sha256 = "03q1hf12csqy5q2inafzi44179zaq9n5yrb0k2j2llqhzcmbh7vj";
       type = "gem";
     };
-    version = "0.9.37";
+    version = "0.9.38";
   };
   yard-solargraph = {
     dependencies = [ "yard" ];
diff --git a/pkgs/by-name/gi/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py
index dadd442ce871..042cd13f4c34 100755
--- a/pkgs/by-name/gi/gitlab/update.py
+++ b/pkgs/by-name/gi/gitlab/update.py
@@ -454,6 +454,7 @@ def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None:
             "pkgs/by-name/gi/gitlab-elasticsearch-indexer",
             "pkgs/by-name/gi/gitlab-kas",
             "pkgs/by-name/gi/gitlab-pages",
+            "pkgs/by-name/gi/gitlab-shell",
         ],
         cwd=NIXPKGS_PATH,
     )
diff --git a/pkgs/by-name/gi/gitlogue/package.nix b/pkgs/by-name/gi/gitlogue/package.nix
index c8ba34d49a80..d6d1c4853c28 100644
--- a/pkgs/by-name/gi/gitlogue/package.nix
+++ b/pkgs/by-name/gi/gitlogue/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitlogue";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "unhappychoice";
     repo = "gitlogue";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T9QhPWT6w6Ezdl33mPb24UB38ApZdY/JlFMWYJZw+gA=";
+    hash = "sha256-w+5X3NhHCLDXRGQx2JxpIayekMk242uia1bJSRjDDAE=";
   };
 
-  cargoHash = "sha256-7MQOf/BQ5dDR7iIOKjyKah7CJuZN4OZm+CcHso7FecI=";
+  cargoHash = "sha256-Ne0dMpQJ2W/JgCXijosqXBr8B6C1XgK4KnOjByckcms=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix
index 168f56a42d7b..9319ffafcb18 100644
--- a/pkgs/by-name/gi/gitnr/package.nix
+++ b/pkgs/by-name/gi/gitnr/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Create `.gitignore` files using one or more templates from TopTal, GitHub or your own collection";
     homepage = "https://github.com/reemus-dev/gitnr";
-    changelog = "https://github.com/reemus-dev/gitnr/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       matthiasbeyer
diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix
index c92640cb6bcd..3ad33e30d2da 100644
--- a/pkgs/by-name/gi/gitoxide/package.nix
+++ b/pkgs/by-name/gi/gitoxide/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitoxide";
-  version = "0.52.0";
+  version = "0.52.1";
 
   src = fetchFromGitHub {
     owner = "GitoxideLabs";
     repo = "gitoxide";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nOpe+w0ILxS2f7EdDo1gg31eaESobKHdQ1F4pzpxsfE=";
+    hash = "sha256-PcRX5k4rqi61VnEpbKR2avChLBhPNSEsUjvul2myWOY=";
   };
 
-  cargoHash = "sha256-z/aytFu8b23cVsZuIBcjbNUhsvoWi5saQKVgrCEq5+s=";
+  cargoHash = "sha256-zeT+2gIJbRqVtAiulccRoczd+xdYBkcWWYzbk/bRtXA=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/gi/gitqlient/dont-attempt-submodule-update.patch b/pkgs/by-name/gi/gitqlient/dont-attempt-submodule-update.patch
new file mode 100644
index 000000000000..3a335a12fe17
--- /dev/null
+++ b/pkgs/by-name/gi/gitqlient/dont-attempt-submodule-update.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 697b90dd..d3e75d2f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,19 +28,6 @@ add_compile_definitions(SHA_VER="${GQ_SHA}")
+ add_compile_definitions(VER="${VERSION}")
+ add_compile_definitions(QT_DEPRECATED_WARNINGS)
+ 
+-if (NOT EXISTS "${PROJECT_SOURCE_DIR}/src/AuxiliarCustomWidgets/.git" OR
+-    NOT EXISTS "${PROJECT_SOURCE_DIR}/src/QLogger/.git" OR
+-    NOT EXISTS "${PROJECT_SOURCE_DIR}/src/QPinnableTabWidget/.git" OR
+-    NOT EXISTS "${PROJECT_SOURCE_DIR}/src/git/.git")
+-    message(STATUS "Submodule update:")
+-    execute_process(COMMAND git submodule update --init --recursive
+-                    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-                    RESULT_VARIABLE GIT_SUBMOD_RESULT)
+-    if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+-        message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
+-    endif()
+-endif()
+-
+ find_package(Qt6 COMPONENTS Core Widgets Network REQUIRED)
+ 
+ file(GLOB SRC_FILES
diff --git a/pkgs/by-name/gi/gitqlient/install-to-store.patch b/pkgs/by-name/gi/gitqlient/install-to-store.patch
new file mode 100644
index 000000000000..0b0059393c8e
--- /dev/null
+++ b/pkgs/by-name/gi/gitqlient/install-to-store.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d3e75d2f..c8d56287 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -163,7 +163,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    target_link_options(${PROJECT_NAME} PUBLIC "-no-pie")
+    
+    set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+-   set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install/usr)
+ 
+    install(
+       PROGRAMS ${CMAKE_BINARY_DIR}/${PROJECT_NAME}
+@@ -250,7 +249,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+      include(CPack)
+ 
+ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+-   set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
+    install(
+        TARGETS ${PROJECT_NAME}
+        RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+@@ -260,7 +258,6 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    include(InstallRequiredSystemLibraries)
+ 
+-   set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
+    install(
+        TARGETS ${PROJECT_NAME}
+        RUNTIME DESTINATION .
diff --git a/pkgs/by-name/gi/gitqlient/package.nix b/pkgs/by-name/gi/gitqlient/package.nix
index 75d9dc1f4cb2..a787c695cb05 100644
--- a/pkgs/by-name/gi/gitqlient/package.nix
+++ b/pkgs/by-name/gi/gitqlient/package.nix
@@ -2,39 +2,45 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libsForQt5,
+  qt6,
+  cmake,
   gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gitqlient";
-  version = "1.6.3";
+  version = "1.6.3-unstable-2025-09-11"; # cmake does not install correctly on tagged release
 
   src = fetchFromGitHub {
     owner = "francescmm";
     repo = "gitqlient";
-    tag = "v${finalAttrs.version}";
+    rev = "faa3e2c19205123944bb88427a569c6f1b4366a1";
     fetchSubmodules = true;
-    hash = "sha256-gfWky5KTSj+5FC++QIVTJbrDOYi/dirTzs6LvTnO74A=";
+    hash = "sha256-CBgzTwJWssL0NaNqfesHkOG4pi6QQYxjxWHFcG00U0U=";
   };
 
+  patches = [
+    # fetcher removes .git directory, but cmake attempts to update submodules if .git is missing
+    ./dont-attempt-submodule-update.patch
+    # install logic in unstable is slightly better, but still attempts to install to source tree, not store
+    ./install-to-store.patch
+  ];
+
   nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.wrapQtAppsHook
+    cmake
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    libsForQt5.qtwebengine
-  ];
-
-  qmakeFlags = [
-    "GitQlient.pro"
+    qt6.qtbase
   ];
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
   };
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # QCheckBox::stateChanged is deprecated
+
   meta = {
     homepage = "https://github.com/francescmm/GitQlient";
     description = "Multi-platform Git client written with Qt";
diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix
index 391095adea84..971625b7b9fc 100644
--- a/pkgs/by-name/gi/gitui/package.nix
+++ b/pkgs/by-name/gi/gitui/package.nix
@@ -9,7 +9,6 @@
   cmake,
   xclip,
   nix-update-script,
-  fetchpatch,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -17,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.28.1";
 
   src = fetchFromGitHub {
-    owner = "extrawurst";
+    owner = "gitui-org";
     repo = "gitui";
     rev = "v${finalAttrs.version}";
     hash = "sha256-IyDms4ke5evtSjFZrWEy0AascA0g9rG/a9RjbBNzZwg=";
@@ -63,9 +62,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    changelog = "https://github.com/extrawurst/gitui/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/gitui-org/gitui/blob/v${finalAttrs.version}/CHANGELOG.md";
     description = "Blazing fast terminal-ui for Git written in Rust";
-    homepage = "https://github.com/extrawurst/gitui";
+    homepage = "https://github.com/gitui-org/gitui";
     license = lib.licenses.mit;
     mainProgram = "gitui";
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index 41403e94cb77..10ed2678e89a 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.92.1";
+  version = "1.93.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4DUEsh2T5rx/0u79+edMLAjTRUmXxlbA0SVH/EwoeVo=";
+    hash = "sha256-ra+cXfB5DtFXmpgxSTZuXUgRY8Uzsxc84cmmAGq06AE=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-fnVY1WEwzuRjHXQSGLl1c7bQXxzOHFEPlb/DhntYm2U=";
+  vendorHash = "sha256-FBYTwTGQ2ma4dEeCGpvduGAPux5g7MsxBHQy8QXXVgQ=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/gl/glances/package.nix b/pkgs/by-name/gl/glances/package.nix
index 82dacd9c4d04..8c01c74e54da 100644
--- a/pkgs/by-name/gl/glances/package.nix
+++ b/pkgs/by-name/gl/glances/package.nix
@@ -11,7 +11,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "glances";
-  version = "4.5.3.2";
+  version = "4.5.4";
   pyproject = true;
 
   disabled = python3Packages.isPyPy;
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "nicolargo";
     repo = "glances";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QMKi37+uuRkZxK1qcRIUDAElLU7njjGYUoSecBdbCO0=";
+    hash = "sha256-oIuvVI1vXPrtJjWie/iDoCBM++Z7i4IQ5DPE6Yi3npA=";
   };
 
   build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix
index f78d7c78483c..1b53399e46e3 100644
--- a/pkgs/by-name/gl/glauth/package.nix
+++ b/pkgs/by-name/gl/glauth/package.nix
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Lightweight LDAP server for development, home use, or CI";
     homepage = "https://github.com/glauth/glauth";
-    changelog = "https://github.com/glauth/glauth/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/glauth/glauth/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       bjornfor
diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index b253b6c104f0..28ef8e78a535 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glaze";
-  version = "7.3.3";
+  version = "7.5.0";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RqsJupqXvbgtGNCYszEx22KuDBH0zp9yha6dcsNlaKY=";
+    hash = "sha256-END9mrzYIsulQROqyTsPPtScFvR1+LMasD5aiyACUfU=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix
index 94b734c0240a..1333f40d5a27 100644
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gleam";
-  version = "1.15.4";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = "gleam";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BTbBcmGOoII7GP68RNl/U2PCNQdG2vdwq1/3/brMuIc=";
+    hash = "sha256-/AYtZ/nd0PIAaf9z/Uk8tw9ziczczerQO8D3g7n5sJo=";
   };
 
-  cargoHash = "sha256-+5sGYrqF8CKG5/G1QEQEnMZDFnE8D40TBGygdHBBthA=";
+  cargoHash = "sha256-3B8RSow/aLzv0wl+eMCnS42+DnUa6NdG2TuR7aAJCA8=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index 4992e5e51a60..f1b443dc3f06 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "glooctl";
-  version = "1.21.2";
+  version = "1.21.3";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EURfI5fpT9aFKrUTB2x8JZAsk0HrxWNlSYK3m2ej4fw=";
+    hash = "sha256-JAubNKBcXrNsqv7mcN8I8KYQAyj6KvjbKnr9LKG2wsg=";
   };
 
-  vendorHash = "sha256-Gl4gIbGfNNl29mWwZGVcMQ80F7A4heEStFAMdW114Os=";
+  vendorHash = "sha256-8iRotQm41EcqjHUK92wpNFcq/ODDbhAhcKSxSRFmGrA=";
 
   subPackages = [ "projects/gloo/cli/cmd" ];
 
diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 6dc3f07a3613..a750ecb148b2 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -11,11 +11,11 @@
   version ?
     # This is a workaround for update-source-version to be able to update this
     let
-      _version = "0-unstable-2026-01-07";
+      _version = "0-unstable-2026-02-05";
     in
     _version,
-  rev ? "5550ba0f4053c3cbb0bff3d60ded9d867b6fa371",
-  hash ? "sha256-SoXVnpCuNee80N4YdsTEHQd3jZNoHOwKVP6O8a67Ym0=",
+  rev ? "304bbef6c7e9a86630c12986b99c8654eb7fe648",
+  hash ? "sha256-wFCuu4GR0N7QZCwT8UAhqH5moicYQjZ4ZLI58AM4pJ0=",
 }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix
index 67500d02803a..16bfbe636829 100644
--- a/pkgs/by-name/gn/gnome-calculator/package.nix
+++ b/pkgs/by-name/gn/gnome-calculator/package.nix
@@ -9,6 +9,7 @@
   gettext,
   itstool,
   fetchurl,
+  fetchpatch,
   pkg-config,
   libxml2,
   gtk4,
@@ -34,6 +35,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-3fTNLt2hNcQcivaPnAzc2dmpFjy59/jijKLI6B/Ydlc=";
   };
 
+  patches = [
+    # Fix tests with GNU MPC 1.4.0
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-calculator/-/commit/c9bf69ce3688390a584ca7571ea5fcda5aea8863.patch";
+      hash = "sha256-FoV6SUprVdNcRORpoi+bNMTjzMM8bmXuze+6C9lqF8E=";
+    })
+  ];
+
   nativeBuildInputs = [
     appstream
     blueprint-compiler
diff --git a/pkgs/by-name/gn/gnu-efi_3/package.nix b/pkgs/by-name/gn/gnu-efi_3/package.nix
deleted file mode 100644
index ad04a677616e..000000000000
--- a/pkgs/by-name/gn/gnu-efi_3/package.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  fetchFromGitHub,
-  gnu-efi,
-  refind,
-}:
-
-gnu-efi.overrideAttrs (
-  finalAttrs: prevAttrs: {
-    version = "3.0.19";
-    src = fetchFromGitHub {
-      owner = "ncroxon";
-      repo = "gnu-efi";
-      rev = finalAttrs.version;
-      hash = "sha256-xtiKglLXm9m4li/8tqbOsyM6ThwGhyu/g4kw5sC4URY=";
-    };
-    passthru.tests = {
-      inherit refind;
-    };
-  }
-)
diff --git a/pkgs/by-name/gn/gnum4/package.nix b/pkgs/by-name/gn/gnum4/package.nix
index 9f0172f26017..73c5be0ac04e 100644
--- a/pkgs/by-name/gn/gnum4/package.nix
+++ b/pkgs/by-name/gn/gnum4/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnum4";
-  version = "1.4.20";
+  version = "1.4.21";
 
   src = fetchurl {
     url = "mirror://gnu/m4/m4-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-rGmJ7l0q7YFzl4BjDMLOCX4qZUb+uWpKVNs31GoUUuQ=";
+    hash = "sha256-3Eh+EdLwyeAVVbsa8mvk6umD7I8HJnRlBbQycYbrIfw=";
   };
 
   patches = lib.optional stdenv.hostPlatform.isCygwin gnulib.patches.memcpy-fix-backport-250512;
diff --git a/pkgs/tools/archivers/gnutar/link-libiconv.patch b/pkgs/by-name/gn/gnutar/link-libiconv.patch
similarity index 100%
rename from pkgs/tools/archivers/gnutar/link-libiconv.patch
rename to pkgs/by-name/gn/gnutar/link-libiconv.patch
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/by-name/gn/gnutar/package.nix
similarity index 75%
rename from pkgs/tools/archivers/gnutar/default.nix
rename to pkgs/by-name/gn/gnutar/package.nix
index c7e65d9ce7f9..51344245c45f 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/by-name/gn/gnutar/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   fetchurl,
   autoreconfHook,
-  updateAutotoolsGnuConfigScriptsHook,
   libintl,
   gettext,
   aclSupport ? lib.meta.availableOn stdenv.hostPlatform acl,
   acl,
+  versionCheckHook,
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
@@ -15,12 +15,12 @@
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnutar";
   version = "1.35";
 
   src = fetchurl {
-    url = "mirror://gnu/tar/tar-${version}.tar.xz";
+    url = "mirror://gnu/tar/tar-${finalAttrs.version}.tar.xz";
     sha256 = "sha256-TWL/NzQux67XSFNTI5MMfPlKz3HDWRiCsmp+pQ8+3BY=";
   };
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   # which is not safe on darwin.
   # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace src/system.c --replace '_(' 'N_('
+    substituteInPlace src/system.c --replace-fail '_(' 'N_('
   '';
 
   outputs = [
@@ -40,20 +40,16 @@ stdenv.mkDerivation rec {
     "info"
   ];
 
-  nativeBuildInputs = [ autoreconfHook ];
+  strictDeps = true;
+
+  nativeBuildInputs = [ autoreconfHook ] ++ lib.optional stdenv.hostPlatform.isCygwin gettext;
 
   # Add libintl on Darwin specifically as it fails to link (or skip)
   # NLS on it's own:
   #  "_libintl_textdomain", referenced from:
   #    _main in tar.o
   #  ld: symbol(s) not found for architecture x86_64
-  buildInputs =
-    lib.optional aclSupport acl
-    ++ lib.optional stdenv.hostPlatform.isDarwin libintl
-    # gettext gets pulled in via autoreconfHook because strictDeps is not set,
-    # and is linked against. Without this, it doesn't end up in HOST_PATH.
-    # TODO: enable strictDeps, and either make this dependency explicit, or remove it
-    ++ lib.optional stdenv.hostPlatform.isCygwin gettext;
+  buildInputs = lib.optional aclSupport acl ++ lib.optional stdenv.hostPlatform.isDarwin libintl;
 
   # May have some issues with root compilation because the bootstrap tool
   # cannot be used as a login shell for now.
@@ -61,11 +57,12 @@ stdenv.mkDerivation rec {
     stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.isSunOS
   ) "1";
 
-  doCheck = false; # fails
-  doInstallCheck = false; # fails
+  doCheck = true;
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   meta = {
-    description = "GNU implementation of the `tar' archiver";
+    description = "GNU implementation of the `tar` archiver";
     longDescription = ''
       The Tar program provides the ability to create tar archives, as
       well as various other kinds of manipulation.  For example, you
@@ -81,13 +78,10 @@ stdenv.mkDerivation rec {
       archives).
     '';
     homepage = "https://www.gnu.org/software/tar/";
-
     license = lib.licenses.gpl3Plus;
-
-    maintainers = with lib.maintainers; [ RossComputerGuy ];
     mainProgram = "tar";
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
     platforms = lib.platforms.all;
-
     priority = 10;
   };
-}
+})
diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix
index f25cfca0fed7..3b0a55e01ef4 100644
--- a/pkgs/by-name/go/go-camo/package.nix
+++ b/pkgs/by-name/go/go-camo/package.nix
@@ -9,16 +9,16 @@
 
 buildGo125Module rec {
   pname = "go-camo";
-  version = "2.7.3";
+  version = "2.7.4";
 
   src = fetchFromGitHub {
     owner = "cactus";
     repo = "go-camo";
     tag = "v${version}";
-    hash = "sha256-qRGVqs1FsdAyXKxnOZdJU3dhy7Isa0SjQZQCSWtjqL0=";
+    hash = "sha256-CWyTqQdgf37Kx3E+/aTstsQ/mdLFAGrHJndc4foNt0A=";
   };
 
-  vendorHash = "sha256-tmCvBMQWhDFqtxWT6iy8r5EhG72B4hBok31GNEvgCVU=";
+  vendorHash = "sha256-lNCMz2wJLZRXjQ5MF+4nu/tNitQb86tvPeD+NvSHW2c=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix
index 72134b331374..354eb03b0b29 100644
--- a/pkgs/by-name/go/go-dnscollector/package.nix
+++ b/pkgs/by-name/go/go-dnscollector/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-dnscollector";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "go-dnscollector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UMzL+use4T0WfcbJAW7XKi3ZuSh9ZFRjYcEr+BV9mkc=";
+    hash = "sha256-Vqru5JK3QCz1ij08ezuJgozhJaEplp92c2jBOiijB+M=";
   };
 
-  vendorHash = "sha256-xEtMe9xrdeYDHNLbcVa9INMprF6mEHyyrAt84nUAsUI=";
+  vendorHash = "sha256-wyfbxdmF3OeWgZ9IeiCyo9PZFnSfnCmlZXM5/1Jq38w=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/go/go-grip/package.nix b/pkgs/by-name/go/go-grip/package.nix
index 32d1738e88f7..ee2ad4a08459 100644
--- a/pkgs/by-name/go/go-grip/package.nix
+++ b/pkgs/by-name/go/go-grip/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "go-grip";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "chrishrb";
     repo = "go-grip";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HwD/pdWEEU+Hoo4HUJeK8y40jp1byNhw/TSpa5SNRak=";
+    hash = "sha256-uDDzkkCX/tUKRCJYt/3Qsh4qObaCNaW9I801jQphM4A=";
   };
 
   vendorHash = "sha256-QsLiCsFY6nI85jsEZtAgmObEKpBSZWhzZk+TlukM8JU=";
diff --git a/pkgs/by-name/go/go-hass-agent/package.nix b/pkgs/by-name/go/go-hass-agent/package.nix
index c3bd254510aa..e5e31ddf3951 100644
--- a/pkgs/by-name/go/go-hass-agent/package.nix
+++ b/pkgs/by-name/go/go-hass-agent/package.nix
@@ -9,20 +9,20 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "go-hass-agent";
-  version = "14.10.3";
+  version = "14.11.0";
 
   src = fetchFromGitHub {
     owner = "joshuar";
     repo = "go-hass-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7F4zxxMKNrUiKonfO7dQQuODEnFgaFRM7Rzb7n1Erys=";
+    hash = "sha256-mC/Y1z2kudBZOEQU5S17ROx3iHPpDGGSkUJe7MMb/iE=";
   };
 
-  vendorHash = "sha256-WPglpc8xqCW51LmdhGLAuB4jg96T72eRuaS61zagoNw=";
+  vendorHash = "sha256-Xz7u8SSlxlDB5HbKMbm1xVYrtp1/zy2yBgoWS3NcTew=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-baO2S+NNgNgGjMNPrtmgaiiNTHv3vScOXQIVx1Xaxow=";
+    hash = "sha256-LwOVVVGWufQ+Q3jiv0H9lf7zg3R9fXvvAlLiUWqtmZs=";
   };
 
   overrideModAttrs = oldAttrs: {
@@ -72,7 +72,10 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.mit;
     homepage = "https://github.com/joshuar/go-hass-agent";
     changelog = "https://github.com/joshuar/go-hass-agent/blob/v${finalAttrs.version}/CHANGELOG.md";
-    maintainers = [ lib.maintainers.ethancedwards8 ];
+    maintainers = with lib.maintainers; [
+      ethancedwards8
+      nadir-ishiguro
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix
index a8703a0248f8..44b0d976a03b 100644
--- a/pkgs/by-name/go/go-httpbin/package.nix
+++ b/pkgs/by-name/go/go-httpbin/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-httpbin";
-  version = "2.22.0";
+  version = "2.22.1";
 
   src = fetchFromGitHub {
     owner = "mccutchen";
     repo = "go-httpbin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+DeBJoi7bXuXx3HcO9bdGlCXiaETwsS4OawVBi3Q57o=";
+    hash = "sha256-N0lq11tF5z+n7AlrOLdJ4eZvaZljSKafpkwma6jPW3k=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/go/go-jsonnet/package.nix b/pkgs/by-name/go/go-jsonnet/package.nix
index 86d3cbf00944..b3cf773fdc33 100644
--- a/pkgs/by-name/go/go-jsonnet/package.nix
+++ b/pkgs/by-name/go/go-jsonnet/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-jsonnet";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "go-jsonnet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J92xNDpCidbiSsN6NveS6BX6Tx+qDQqkgm6pjk1wBTQ=";
+    hash = "sha256-O7b26aobvs1gHsUNM2RZ/WnIMpFJOa/XbupttTMJ8LA=";
   };
 
-  vendorHash = "sha256-Uh2rAXdye9QmmZuEqx1qeokE9Z9domyHsSFlU7YZsZw=";
+  vendorHash = "sha256-uFCvMmiZVaRYhaORI92W0pkDjDZNiWIcop70FssJiZo=";
 
   subPackages = [ "cmd/jsonnet*" ];
 
diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix
index e2d0a3114358..d63cd9f4983d 100644
--- a/pkgs/by-name/go/go-judge/package.nix
+++ b/pkgs/by-name/go/go-judge/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-judge";
-  version = "1.11.4";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "criyle";
     repo = "go-judge";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ypq44MGx4wyT4/31dF/e7zOS3I2MJPEZKcy//Zz4P0E=";
+    hash = "sha256-JxYdoDSkzb+BM76m+qzdLM31ox9jqCm3LDrjTn6q1/E=";
   };
 
-  vendorHash = "sha256-INPW1VuZ4U0Dv+p4utOZOtCU5VOBivSSPnErSdqH6Po=";
+  vendorHash = "sha256-7DwEATr5AZGXHJXwDxjLpERquXFYm3AYjU/g3v7Xmlw=";
 
   tags = [
     "nomsgpack"
diff --git a/pkgs/by-name/go/go-toml/package.nix b/pkgs/by-name/go/go-toml/package.nix
index e18ac104f70d..5ea5e58c51ea 100644
--- a/pkgs/by-name/go/go-toml/package.nix
+++ b/pkgs/by-name/go/go-toml/package.nix
@@ -25,10 +25,6 @@ buildGoModule {
     "cmd/tomltestgen"
   ];
 
-  # allowGoReference adds the flag `-trimpath` which is also denoted by, go-toml's goreleaser config
-  #  <https://github.com/pelletier/go-toml/blob/a3d5a0bb530b5206c728eed9cb57323061922bcb/.goreleaser.yaml#L13>
-  allowGoReference = true;
-
   ldflags = [
     "-s"
     "-w"
diff --git a/pkgs/by-name/go/gobgp/package.nix b/pkgs/by-name/go/gobgp/package.nix
index 74d6ff153ba5..00828ef47238 100644
--- a/pkgs/by-name/go/gobgp/package.nix
+++ b/pkgs/by-name/go/gobgp/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gobgp";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "osrg";
     repo = "gobgp";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-7Rk/Bciy4qYrLzpKGXSZbJPlOzLjfNKR+gbYIbRy7D4=";
+    sha256 = "sha256-XbErKP/F7E/e03b1rNTfpnAqkqcu2TwPtj2rV65HCnI=";
   };
 
   vendorHash = "sha256-XZIcjBMNZbNDYmZLiH5s5kFoSi62n5JruqnsnlQFP4I=";
diff --git a/pkgs/by-name/go/gobgpd/package.nix b/pkgs/by-name/go/gobgpd/package.nix
index 7b18d13d7fab..cf7f3a44af39 100644
--- a/pkgs/by-name/go/gobgpd/package.nix
+++ b/pkgs/by-name/go/gobgpd/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gobgpd";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "osrg";
     repo = "gobgp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7Rk/Bciy4qYrLzpKGXSZbJPlOzLjfNKR+gbYIbRy7D4=";
+    hash = "sha256-XbErKP/F7E/e03b1rNTfpnAqkqcu2TwPtj2rV65HCnI=";
   };
 
   vendorHash = "sha256-XZIcjBMNZbNDYmZLiH5s5kFoSi62n5JruqnsnlQFP4I=";
diff --git a/pkgs/by-name/go/gonzo/package.nix b/pkgs/by-name/go/gonzo/package.nix
index 52d953fa9aed..499706db3437 100644
--- a/pkgs/by-name/go/gonzo/package.nix
+++ b/pkgs/by-name/go/gonzo/package.nix
@@ -38,7 +38,7 @@ buildGoModule (finalAttrs: {
     description = "TUI log analysis tool";
     homepage = "https://gonzo.controltheory.com/";
     downloadPage = "https://github.com/control-theory/gonzo";
-    changelog = "https://github.com/control-theory/gonzo/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/control-theory/gonzo/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ kpbaks ];
     mainProgram = "gonzo";
diff --git a/pkgs/by-name/go/goofcord/node-modules.nix b/pkgs/by-name/go/goofcord/node-modules.nix
new file mode 100644
index 000000000000..d75d177312dd
--- /dev/null
+++ b/pkgs/by-name/go/goofcord/node-modules.nix
@@ -0,0 +1,65 @@
+# fixed output derivation for node_modules
+{
+  lib,
+  stdenv,
+  goofcord,
+  bun,
+  nodejs,
+  writableTmpDirAsHomeHook,
+}:
+stdenv.mkDerivation {
+  inherit (goofcord) version src;
+  pname = goofcord.pname + "-modules";
+
+  impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+    "GIT_PROXY_COMMAND"
+    "SOCKS_SERVER"
+  ];
+
+  nativeBuildInputs = [
+    bun
+    nodejs
+    writableTmpDirAsHomeHook
+  ];
+
+  dontConfigure = true;
+  dontFixup = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
+    export npm_config_build_from_source=true
+    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+
+    bun install \
+      --frozen-lockfile \
+      --linker=hoisted \
+      --no-progress
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -R ./node_modules $out
+
+    runHook postInstall
+  '';
+
+  outputHash =
+    {
+      x86_64-linux = "sha256-EEl+hrdMR6z1PAy+uIhl2UYtajXWiUQMQxIfYpMRw6Y=";
+      aarch64-linux = "sha256-ba+j8FGKNH3Mpql7xvLgHHuJxDGVlZ+TeZ3Oxsw3ot4=";
+    }
+    .${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}");
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+
+  meta = {
+    description = "Node modules for GoofCord";
+    license = lib.licenses.osl3;
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix
index 1e53cb891323..f80c809b4b3b 100644
--- a/pkgs/by-name/go/goofcord/package.nix
+++ b/pkgs/by-name/go/goofcord/package.nix
@@ -1,68 +1,84 @@
 {
   lib,
   stdenv,
+  callPackage,
   fetchFromGitHub,
-  pnpm_9,
-  fetchPnpmDeps,
-  pnpmConfigHook,
-  nodejs_22,
-  nix-update-script,
+  bun,
+  nodejs_24,
   electron,
-  pipewire,
-  libpulseaudio,
+  nix-update-script,
+  libxkbcommon,
+  libx11,
+  libxcb,
+  libxtst,
   makeShellWrapper,
   makeDesktopItem,
   copyDesktopItems,
 }:
-
 let
-  pnpm = pnpm_9.override { nodejs = nodejs_22; };
+  patchcordAddon = callPackage ./patchcord-addon.nix { };
+  venbindAddon = callPackage ./venbind-addon.nix { };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "goofcord";
-  version = "1.7.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Milkshiift";
     repo = "GoofCord";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-fx/RKnUhXhaWVd/KYPVxr19/Q8o1ovm2TgMTcTYjE3Q=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BnaPw9edaI1nKAu421JBkI9dAV3Xu3Yr5VQILN0QUTM=";
   };
 
   nativeBuildInputs = [
-    pnpmConfigHook
-    pnpm
-    nodejs_22
+    bun
+    nodejs_24
     makeShellWrapper
     copyDesktopItems
   ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    libpulseaudio
-    pipewire
+    libxkbcommon
+    libx11
+    libxcb
+    libxtst
     (lib.getLib stdenv.cc.cc)
   ];
 
-  pnpmDeps = fetchPnpmDeps {
-    inherit (finalAttrs) pname version src;
-    inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-NKind57XDW7I5XNmjAu4cqkK5UVNAaKewpfOTNzF2BM=";
-  };
+  node-modules = callPackage ./node-modules.nix { nodejs = nodejs_24; };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+    GOOFCORD_PATCHCORD_PATH = "${patchcordAddon}/bin/patchcord";
+    GOOFCORD_VENBIND_PATH = "${venbindAddon}/lib/libvenbind.so";
   };
 
+  configurePhase = ''
+    runHook preConfigure
+
+    cp -R ${finalAttrs.node-modules} node_modules
+    chmod -R u+w node_modules
+    patchShebangs node_modules/.bin
+    patchShebangs node_modules/@typescript/native-preview/bin
+
+    runHook postConfigure
+  '';
+
+  preBuild = lib.optionalString stdenv.hostPlatform.isLinux ''
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
+  '';
+
   buildPhase = ''
     runHook preBuild
 
-    pnpm build
+    bun run build -- --skipTypecheck
 
-    npm exec electron-builder -- \
+    node node_modules/electron-builder/out/cli/cli.js \
       --dir \
-      -c.electronDist="${electron.dist}" \
-      -c.electronVersion="${electron.version}"
+      -c.electronDist="${if stdenv.hostPlatform.isLinux then "electron-dist" else electron.dist}" \
+      -c.electronVersion="${electron.version}" \
+      -c.npmRebuild=false
 
     runHook postBuild
   '';
@@ -73,13 +89,21 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p "$out/share/lib/goofcord"
     cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/goofcord"
 
-    install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/goofcord.png"
+    install -Dm644 "assets/gf_icon.png" "$out/share/icons/hicolor/256x256/apps/goofcord.png"
 
     # use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion
     # see https://github.com/NixOS/nixpkgs/issues/172583
     makeShellWrapper "${lib.getExe electron}" "$out/bin/goofcord" \
       --add-flags "$out/share/lib/goofcord/resources/app.asar" \
       "''${gappsWrapperArgs[@]}" \
+      --prefix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          libxkbcommon
+          libx11
+          libxcb
+          libxtst
+        ]
+      }" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer --enable-wayland-ime=true}}" \
       --set-default ELECTRON_IS_DEV 0 \
       --inherit-argv0
@@ -120,11 +144,11 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Milkshiift/GoofCord";
     downloadPage = "https://github.com/Milkshiift/GoofCord";
     license = lib.licenses.osl3;
-    maintainers = with lib.maintainers; [ nyabinary ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
+    maintainers = with lib.maintainers; [
+      nyabinary
+      miniharinn
     ];
+    platforms = lib.platforms.linux;
     mainProgram = "goofcord";
   };
 })
diff --git a/pkgs/by-name/go/goofcord/patchcord-addon.nix b/pkgs/by-name/go/goofcord/patchcord-addon.nix
new file mode 100644
index 000000000000..a78dcd221439
--- /dev/null
+++ b/pkgs/by-name/go/goofcord/patchcord-addon.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+rustPlatform.buildRustPackage {
+  pname = "patchcord";
+  version = "0-unstable-2026-03-29";
+
+  src = fetchFromGitHub {
+    owner = "Milkshiift";
+    repo = "patchcord";
+    rev = "f2611630f143a53b46514d4916af0971d7aab2b5";
+    hash = "sha256-VTHS5psVqg4RjSrAs9vPkixsVwwIYE2E4o0vXVN58tE=";
+  };
+
+  cargoHash = "sha256-/IbHvs9SEuulNcWkihwFwaFcqMM0rdFBVjCWgUu7dys=";
+
+  doCheck = false;
+
+  meta = {
+    description = "Patcher for GoofCord";
+    homepage = "https://github.com/Milkshiift/patchcord";
+    license = lib.licenses.osl3;
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/go/goofcord/venbind-addon.nix b/pkgs/by-name/go/goofcord/venbind-addon.nix
new file mode 100644
index 000000000000..91be6a072bb5
--- /dev/null
+++ b/pkgs/by-name/go/goofcord/venbind-addon.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  libx11,
+  libxtst,
+  libxdmcp,
+  libxkbfile,
+  libxkbcommon,
+  libxcb,
+  wayland,
+  xorgproto,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "venbind";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "tuxinal";
+    repo = "venbind";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6gPyQ6JjqvM2AUuIxCfO0nOLJfyQTX5bbsbKDzlNSqo=";
+    fetchSubmodules = true;
+  };
+
+  cargoHash = "sha256-FZTXj8f+ezRhElovKhF3khWc5SqC+22tDHlFe9IHuwo=";
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+    pkg-config
+    cmake
+  ];
+
+  buildInputs = [
+    libx11
+    libxtst
+    libxdmcp
+    libxkbfile
+    libxkbcommon
+    libxcb
+    wayland
+    xorgproto
+  ];
+
+  doCheck = false;
+
+  meta = {
+    description = "Native module for Vencord";
+    homepage = "https://github.com/tuxinal/venbind";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index ff52f91f7ea6..d0e5d88d145d 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -184,11 +184,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "147.0.7727.101";
+    version = "147.0.7727.137";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-VU41cXkCB/JU2a1bXHGMQVF8ZK95Z7FBI6+k5yjPb80=";
+      hash = "sha256-2QKA8nk+O10cGr0gGOMSlLkxpO+WHFG1yul9a3VGq64=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -302,11 +302,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "147.0.7727.102";
+    version = "147.0.7727.138";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/adh7lit4ohn55bd2cyoftxkjiixa_147.0.7727.102/GoogleChrome-147.0.7727.102.dmg";
-      hash = "sha256-eslLqiI5DtExI1Hq31wYBNQGu4LktzeW/7Z+R/kPGzo=";
+      url = "http://dl.google.com/release2/chrome/ackheqvxll25dzx6s76qfgpa4oxa_147.0.7727.138/GoogleChrome-147.0.7727.138.dmg";
+      hash = "sha256-1WOkBxAs79ByJ3quXgh+ZR64ysIE2/2wMeIhl3sYh5o=";
     };
 
     dontPatch = true;
@@ -344,7 +344,6 @@ let
   passthru.updateScript = ./update.sh;
 
   meta = {
-    changelog = "https://chromereleases.googleblog.com/";
     description = "Freeware web browser developed by Google";
     homepage = "https://www.google.com/chrome/browser/";
     license = lib.licenses.unfree;
diff --git a/pkgs/by-name/go/google-cloud-sdk/components.json b/pkgs/by-name/go/google-cloud-sdk/components.json
index dbafc1de30ca..7a11bb526e05 100644
--- a/pkgs/by-name/go/google-cloud-sdk/components.json
+++ b/pkgs/by-name/go/google-cloud-sdk/components.json
@@ -2,10 +2,10 @@
   "components": [
     {
       "data": {
-        "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f",
-        "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8",
-        "size": 800,
-        "source": "components/google-cloud-sdk-alpha-20260109121340.tar.gz",
+        "checksum": "73eeb0b0222c8c72ce1cbba3c2ca787d7d89eabc5226463fd59a404f76280138",
+        "contents_checksum": "a0096c5a5f0a315397d46a44d19b63f26bca1607a833260032e1efa03d44c9a7",
+        "size": 761,
+        "source": "components/google-cloud-sdk-alpha-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -23,8 +23,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "2026.01.09"
+        "build_number": 20260410153504,
+        "version_string": "2026.04.10"
       }
     },
     {
@@ -58,15 +58,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.5.1"
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "37a7174a1716a9f4d84ee904940428ac424b4e20b1c4df7fe2e79704e554a8ce",
-        "contents_checksum": "21f1533ec191871a6677551d0d72687b03f1f2708fa900652875afa948a26df4",
-        "size": 21872436,
-        "source": "components/google-cloud-sdk-anthos-auth-darwin-arm-20240426154730.tar.gz",
+        "checksum": "43e4a38901f9f3c7aca9ff3c9d6fb917fd46d8dc8cddd9ac79693fe37a37e646",
+        "contents_checksum": "fbf94b7c8c316058d03c8c0197bd09b39fba9ff6af9f1baaaa4c9690d15ebb64",
+        "size": 29263433,
+        "source": "components/google-cloud-sdk-anthos-auth-darwin-arm-20260130130055.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -91,16 +91,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240426154730,
-        "version_string": "1.5.1"
+        "build_number": 20260130130055,
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "6f82815ca309a9f5a19bef98aad0a4f70393a66ce57383a4f6e4b0a8d6193a56",
-        "contents_checksum": "81a661e522f5c3b7fe610bad06a49e0a3a20fc9da69e0232150c4aa4fcaf962b",
-        "size": 22957602,
-        "source": "components/google-cloud-sdk-anthos-auth-darwin-x86_64-20240426154730.tar.gz",
+        "checksum": "610351ef1aca9d5c9f656e31427ada47347c0f6898cf59edd6b3c92f3ca15321",
+        "contents_checksum": "b3b03fa269cad88fd9fe4890b0b7fa83acf2d4f0d1640d57ca50bcce8e39d24d",
+        "size": 32060936,
+        "source": "components/google-cloud-sdk-anthos-auth-darwin-x86_64-20260130130055.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -125,16 +125,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240426154730,
-        "version_string": "1.5.1"
+        "build_number": 20260130130055,
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "d9ad352bdfd50fef92ab1b917bb60be6b2e49bb8a4b49269bd2286570e02681f",
-        "contents_checksum": "c98b7c781c86e14e0dbb2a5f5a6ab9504013d005046fb52956ffb213a7d6f51a",
-        "size": 21399471,
-        "source": "components/google-cloud-sdk-anthos-auth-linux-arm-20240426154730.tar.gz",
+        "checksum": "0679d7a92832613d617d019dc74d2f8823612f47e5a3f54fb842d26242050883",
+        "contents_checksum": "e4a1184801fa4ae0dfb92958a6a16c5c4f30fff89820aee37efdb1c4876c4b23",
+        "size": 25653603,
+        "source": "components/google-cloud-sdk-anthos-auth-linux-arm-20260130130055.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -159,16 +159,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240426154730,
-        "version_string": "1.5.1"
+        "build_number": 20260130130055,
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "c148f4a473afa336390f034d735283d6a4556c06e8e8b5bd0ecfa2f25dcfd184",
-        "contents_checksum": "4dbc4132c3126b53058c12c9113186436ac223018cf6d5e636dc0cf6b38ab1e3",
-        "size": 23109537,
-        "source": "components/google-cloud-sdk-anthos-auth-linux-x86_64-20240426154730.tar.gz",
+        "checksum": "4101e1b94b6f4545d8088ceddb98b34aa7962e1722f6521bdfde4d27501cd6e6",
+        "contents_checksum": "e7d0afe452ee39653b07cf40f8440bcb4ede745a604cfe14f550d707f70ebf1f",
+        "size": 28262679,
+        "source": "components/google-cloud-sdk-anthos-auth-linux-x86_64-20260130130055.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -193,16 +193,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240426154730,
-        "version_string": "1.5.1"
+        "build_number": 20260130130055,
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "7802808d020056ba132dc1aecda164d4979f057feff4a61071a6da850ef3e6bf",
-        "contents_checksum": "7b8a92cd15dfafa0969273ad9eca138d5f7c69fd5b54079bfd5dadf2141b103b",
-        "size": 23361404,
-        "source": "components/google-cloud-sdk-anthos-auth-windows-x86_64-20240426154730.tar.gz",
+        "checksum": "254e801ab855cd408852801cdc722ec9ad55d406fe737843b149173d4b572f22",
+        "contents_checksum": "6008ce92cd1c29c0724936ce1d60a50e8c81203e3c1da816318109da28e28038",
+        "size": 28645413,
+        "source": "components/google-cloud-sdk-anthos-auth-windows-x86_64-20260130130055.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -227,8 +227,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240426154730,
-        "version_string": "1.5.1"
+        "build_number": 20260130130055,
+        "version_string": "1.5.2"
       }
     },
     {
@@ -577,15 +577,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.9.76"
+        "version_string": "1.9.77"
       }
     },
     {
       "data": {
-        "checksum": "b1a1821583b0831db76219711dd5c5502a31d5a3a9b2f22c95c36f5457b91b7f",
-        "contents_checksum": "fe65695e8101cb234a298f5129d6f93d3d113440eb42d5dd60690a5b0be941bd",
-        "size": 4673886,
-        "source": "components/google-cloud-sdk-app-engine-go-darwin-arm-20231215195722.tar.gz",
+        "checksum": "0c4e850aa0c00fd5aa61db166b9a741bde4fb9942d5074a722a5dc154dcd373c",
+        "contents_checksum": "c082340d4a272588181c290e05f2a979be7efe266ee81773736283ed01847271",
+        "size": 5503969,
+        "source": "components/google-cloud-sdk-app-engine-go-darwin-arm-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -612,16 +612,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
-        "version_string": "1.9.76"
+        "build_number": 20260217161033,
+        "version_string": "1.9.77"
       }
     },
     {
       "data": {
-        "checksum": "0e280be54d40ebfb84015f9238e3b58df562cecf9a1ba832ea87288f1d21b63b",
-        "contents_checksum": "b453bcc5bd1c9f4f0443462810dec6a4c31071b0e18c01f57e53cd6083306806",
-        "size": 4927378,
-        "source": "components/google-cloud-sdk-app-engine-go-darwin-x86_64-20231215195722.tar.gz",
+        "checksum": "9b5a363600fc7e61b1be859451e1753c3d5cf278a17af2e344c99133607f0085",
+        "contents_checksum": "f24914202ea35a2b61c07d668f21500b2e2334293902cfbd9993f66db1c85c07",
+        "size": 5880143,
+        "source": "components/google-cloud-sdk-app-engine-go-darwin-x86_64-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -648,16 +648,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
-        "version_string": "1.9.76"
+        "build_number": 20260217161033,
+        "version_string": "1.9.77"
       }
     },
     {
       "data": {
-        "checksum": "fc68960029cfcb4e66a29e75e45ccf52459b9f25313f7e6a3cea995febf5b0d1",
-        "contents_checksum": "99a95e04cfa19eb3fed767ac461433d52c8cfd61dcc43f9c2a2b5be73c53a725",
-        "size": 4628999,
-        "source": "components/google-cloud-sdk-app-engine-go-linux-arm-20231215195722.tar.gz",
+        "checksum": "d62306f911da8a3a4857e4a82268d19925261b74d0e4f2a0e19a06cdfb0894f4",
+        "contents_checksum": "9061b1ee77e1aae118e3030d5242547940f946bbbf75a6f6c23858592a02ee48",
+        "size": 5229594,
+        "source": "components/google-cloud-sdk-app-engine-go-linux-arm-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -684,16 +684,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
-        "version_string": "1.9.76"
+        "build_number": 20260217161033,
+        "version_string": "1.9.77"
       }
     },
     {
       "data": {
-        "checksum": "492f92731d80bea2b5ef828276bf1fc54b7f32dbd52517f64fa6b211ca4684d8",
-        "contents_checksum": "6ea55d86c3fa493cb0cfc0c1edeb625493976944f92765ffcfcb72fdef46ee9c",
-        "size": 4811027,
-        "source": "components/google-cloud-sdk-app-engine-go-linux-x86-20231215195722.tar.gz",
+        "checksum": "e104ca239580b3532294ba57810e72ec57b96d290159607baedb50f6de6e4903",
+        "contents_checksum": "44153a778ae107327c0d3a1ab526f923dbf45a54b39fe94edb9635b9693fd73e",
+        "size": 5598086,
+        "source": "components/google-cloud-sdk-app-engine-go-linux-x86-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -720,16 +720,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
-        "version_string": "1.9.76"
+        "build_number": 20260217161033,
+        "version_string": "1.9.77"
       }
     },
     {
       "data": {
-        "checksum": "aaf0cc3cb9782a103c36985f5dbcdde3fbfe50b3d18df580d298f9fd5fca3cc9",
-        "contents_checksum": "e5044222f13b99b75a7559425e2c397be40229803ba1e5480e63a7a66a68a6c8",
-        "size": 4957977,
-        "source": "components/google-cloud-sdk-app-engine-go-linux-x86_64-20231215195722.tar.gz",
+        "checksum": "2b821c5052293a509526bd3aabf38b39b89d0c11721f20b0d89d7fa8aa46d79d",
+        "contents_checksum": "6b2f87e4eba5110e3be5f38ad363bac2b6f7f0b7aa5bf3478dd6c2b86aa87493",
+        "size": 5718820,
+        "source": "components/google-cloud-sdk-app-engine-go-linux-x86_64-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -756,16 +756,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
-        "version_string": "1.9.76"
+        "build_number": 20260217161033,
+        "version_string": "1.9.77"
       }
     },
     {
       "data": {
-        "checksum": "190a523aa852a05e1d286936da6ee7e50f9f8e9f430813d08de42bc4b2266c57",
-        "contents_checksum": "c67be57a817917cb43238a4ebc5fe6f59cb80c8cad3debd4bca18d019d75ead8",
-        "size": 4901455,
-        "source": "components/google-cloud-sdk-app-engine-go-windows-x86-20231215195722.tar.gz",
+        "checksum": "680dc0cb891253d5ed9f9f41ed48f386a1657d830f53dbae1444717a9d5a0943",
+        "contents_checksum": "3bb54627e50ba8213361607259cdca8235182e3cefe87be50f6b34b653dbf481",
+        "size": 5698352,
+        "source": "components/google-cloud-sdk-app-engine-go-windows-x86-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -792,16 +792,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
-        "version_string": "1.9.76"
+        "build_number": 20260217161033,
+        "version_string": "1.9.77"
       }
     },
     {
       "data": {
-        "checksum": "1d3808bff8faf031d4f3dc0352cf5832a8fab0ff6fda44add456f3351604316d",
-        "contents_checksum": "2c2bb14f552ba67a01ee7344075cee7a253d839668bdbbb5928b19ef4257c758",
-        "size": 5030525,
-        "source": "components/google-cloud-sdk-app-engine-go-windows-x86_64-20231215195722.tar.gz",
+        "checksum": "47e5faafd8f33a44d3ea72d4c500ff2cef46c1826c9376c43edaa608a42ba79f",
+        "contents_checksum": "7c6bf095c1af6da68979687f6d9448358661ef8e09d3995254ffb523bf569697",
+        "size": 5777746,
+        "source": "components/google-cloud-sdk-app-engine-go-windows-x86_64-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -828,8 +828,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
-        "version_string": "1.9.76"
+        "build_number": 20260217161033,
+        "version_string": "1.9.77"
       }
     },
     {
@@ -1050,10 +1050,10 @@
     },
     {
       "data": {
-        "checksum": "a0c6370703337512631c65254641ae984c2614d5ee1e126d2ee15f809ab3f662",
-        "contents_checksum": "63e5444f9c8dddbc7042991a499eee545ac75ffd1903d8305c47381f96485e7e",
-        "size": 162115164,
-        "source": "components/google-cloud-sdk-app-engine-java-20260102151133.tar.gz",
+        "checksum": "a5e0e706365473c8f97ae55cda35289f9248798626d6f2d0725f956628de502f",
+        "contents_checksum": "3a6453b1dad59e5fcc223756bcd0dd0e6a9f172129721c3ebe3b71b4811c3355",
+        "size": 160451301,
+        "source": "components/google-cloud-sdk-app-engine-java-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1072,8 +1072,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20260102151133,
-        "version_string": "4.0.0"
+        "build_number": 20260309182415,
+        "version_string": "5.0.0"
       }
     },
     {
@@ -1135,10 +1135,10 @@
     },
     {
       "data": {
-        "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760",
-        "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d",
-        "size": 797,
-        "source": "components/google-cloud-sdk-beta-20260109121340.tar.gz",
+        "checksum": "0034138f7ee8d13690dae0a1443a09ecbdae1e45497360c14dabd2c57a79c8a2",
+        "contents_checksum": "eee82cd34806ce26487960b9cf1705786ccf975d34390b179f7b89307dc51044",
+        "size": 758,
+        "source": "components/google-cloud-sdk-beta-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1156,8 +1156,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "2026.01.09"
+        "build_number": 20260410153504,
+        "version_string": "2026.04.10"
       }
     },
     {
@@ -1481,10 +1481,10 @@
     },
     {
       "data": {
-        "checksum": "e65aa965c6bb9b1dfd2fe86cd03d108e914fe400bb4b5c5a245c6efb42b7decc",
-        "contents_checksum": "f8ce8c5d2fd09e489df1b824959d65129207935942fdb31c4da9bb9e9ab4e375",
-        "size": 1921679,
-        "source": "components/google-cloud-sdk-bq-20260109121340.tar.gz",
+        "checksum": "14ed719ff905515c55f5e5e2296f5c18e3e73b1057dbfc08332815deb376607e",
+        "contents_checksum": "40c29ae66dbe4d732e10370c712c84492063b9f0f3f4e0220df6f55c36afdd64",
+        "size": 1931708,
+        "source": "components/google-cloud-sdk-bq-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1504,16 +1504,16 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "2.1.27"
+        "build_number": 20260327141905,
+        "version_string": "2.1.31"
       }
     },
     {
       "data": {
-        "checksum": "119851c03302a7a253d076125a7b26c2c4a660001f350d3987a0a18ec1a25d5f",
-        "contents_checksum": "239d13b0bd2ce8c978287c3a07407946f459b829fda560a93665230e0b6f7338",
+        "checksum": "abc8c83339176db3b14b0de33f9584577bc2497de0b336afb2c6826a1993b7a5",
+        "contents_checksum": "9df158b40a61db586b1b0efaeb0e354675d373c9ea3d36ab098a33d27e863bef",
         "size": 1932,
-        "source": "components/google-cloud-sdk-bq-nix-20251031202127.tar.gz",
+        "source": "components/google-cloud-sdk-bq-nix-20260323151659.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1539,16 +1539,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251031202127,
-        "version_string": "2.1.25"
+        "build_number": 20260323151659,
+        "version_string": "2.1.30"
       }
     },
     {
       "data": {
-        "checksum": "75f3592cf7fed57de06ede3989b89d381238863089b6ec1ef9d2efa44e692e37",
-        "contents_checksum": "abb474420cf1edac102c46ac1f8e56e14423512b89b2302274680fc67a41332f",
-        "size": 4016,
-        "source": "components/google-cloud-sdk-bq-win-20251031202127.tar.gz",
+        "checksum": "208605a23717689e0792ba4e356e124a6c229b3c43345da772d54547bb30b218",
+        "contents_checksum": "2158266e117090827817fdcd65aab4150e517c02b1e7e7730868a10c5546ec9b",
+        "size": 4017,
+        "source": "components/google-cloud-sdk-bq-win-20260323151659.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1571,8 +1571,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251031202127,
-        "version_string": "2.1.25"
+        "build_number": 20260323151659,
+        "version_string": "2.1.30"
       }
     },
     {
@@ -1602,7 +1602,7 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "3.13.10"
+        "version_string": "3.13.12"
       }
     },
     {
@@ -1611,7 +1611,7 @@
         "core"
       ],
       "details": {
-        "description": "Provides stand-alone Python 3.13.10 installation for UNIX.",
+        "description": "Provides stand-alone Python 3.13.11 installation for UNIX.",
         "display_name": "Bundled Python 3.13"
       },
       "gdu_only": false,
@@ -1630,15 +1630,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "3.13.10"
+        "version_string": "3.13.11"
       }
     },
     {
       "data": {
-        "checksum": "5eaba44b8ecc214b1409f35223c2b1adc6fddfd487662d03d3a8b5037d141600",
-        "contents_checksum": "8512cea4de7af7cc63b12501e7a23b45ba0f07c7debbf1fc52af75ce07539c8b",
-        "size": 145377271,
-        "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20251212160114.tar.gz",
+        "checksum": "dddbc2ac00edc8b3be16fca0dbc411b8b712217ab1849e1ad85813d79f882bcd",
+        "contents_checksum": "1643f4b21c85229e8b40db44953b40072cd4df7ccd48cfcc95c63e68acbbd214",
+        "size": 146063125,
+        "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1646,7 +1646,7 @@
         "core"
       ],
       "details": {
-        "description": "Provides stand-alone Python 3.13.10 installation for UNIX.",
+        "description": "Provides stand-alone Python 3.13.11 installation for UNIX.",
         "display_name": "Bundled Python 3.13 (Platform Specific)"
       },
       "gdu_only": false,
@@ -1664,16 +1664,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251212160114,
-        "version_string": "3.13.10"
+        "build_number": 20260403133411,
+        "version_string": "3.13.11"
       }
     },
     {
       "data": {
-        "checksum": "03f268888a532d474f14e0c26232bd7194f867c36038dfd622fdc999db1ac398",
-        "contents_checksum": "0f8f2bfd6d783331e909942b6e0455d4f8826fff85894e98fe25f61783665ff3",
-        "size": 40878094,
-        "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20251205141901.tar.gz",
+        "checksum": "0d96baac311687b5c1a91d6a7720eb9fe2f5a14907c7207344ac3597538b1c6f",
+        "contents_checksum": "e53d6df7390a516a4cc84f9e2ae655cb4c7fae462f83a3939dd9d1bcd2eb0cd8",
+        "size": 20447592,
+        "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1699,16 +1699,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "3.13.10"
+        "build_number": 20260403133411,
+        "version_string": "3.13.12"
       }
     },
     {
       "data": {
-        "checksum": "d91ed5a3017e85153162149cfb16ee29f0810e547cac833f73f83fa0b2fc5b81",
-        "contents_checksum": "271e3f92212754c2d5ae5f7a52760678ee6ecd7f538621941d1a6fa0135df1ce",
-        "size": 45768819,
-        "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20251205141901.tar.gz",
+        "checksum": "7295f06b24ac02a47ebb961084e27879b89e0e2e316787eb1cb20c45f6ef80d5",
+        "contents_checksum": "c780b4cd0be554fd140159a1dab72c2a854ded9b7056102927a3710ba36628dd",
+        "size": 22921013,
+        "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1734,8 +1734,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "3.13.10"
+        "build_number": 20260403133411,
+        "version_string": "3.13.12"
       }
     },
     {
@@ -1773,15 +1773,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.25.0"
+        "version_string": "1.25.1"
       }
     },
     {
       "data": {
-        "checksum": "3e62fba414c94f9478ea45d03120e6a3d9552205658f84c15228189cd97cbd57",
-        "contents_checksum": "e5f6c2ddf669e298755437b53bbb2caccad4344119754d89af067ce05311a0e3",
-        "size": 20763637,
-        "source": "components/google-cloud-sdk-cbt-darwin-arm-20251205141901.tar.gz",
+        "checksum": "092bf445fff0d3ce7d9a9dff3b7f7eacdc92a5f1b35e01148f4689bb627e2639",
+        "contents_checksum": "55cbc0f2ec0f3b1b36013a277f951f98723a48bdcd0ba9f6dfc752c2012a3db0",
+        "size": 20796374,
+        "source": "components/google-cloud-sdk-cbt-darwin-arm-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1806,8 +1806,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "1.25.0"
+        "build_number": 20260217161033,
+        "version_string": "1.25.1"
       }
     },
     {
@@ -1846,10 +1846,10 @@
     },
     {
       "data": {
-        "checksum": "dd2bfc02d808562bfec9d3b473fb33fa672b77b322086e42617f371e85174d7d",
-        "contents_checksum": "891936e928eec40accc4a8835284b306fb841bcd992ce348e9579c790d29771e",
-        "size": 21727193,
-        "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20251205141901.tar.gz",
+        "checksum": "18ff60ab4d412c080e2aafb3d0b37fc95a122450d92cc4dbfaeb40e787e6b485",
+        "contents_checksum": "a196ee578599e4aa45c03417c49b3787be1a3f5123f7c73cc935ed9b0ff64feb",
+        "size": 21763929,
+        "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1874,16 +1874,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "1.25.0"
+        "build_number": 20260217161033,
+        "version_string": "1.25.1"
       }
     },
     {
       "data": {
-        "checksum": "08d088df35a511a7ce33bf47a60dd56e86a9895343ff5ef043b1ba54dbc64cb4",
-        "contents_checksum": "39dca0c8e40f18624aa0391dd437c66be18d780b43f9f6609138539847be2b6e",
-        "size": 20125506,
-        "source": "components/google-cloud-sdk-cbt-linux-arm-20251205141901.tar.gz",
+        "checksum": "30dd7bac4e8d3faeb012e41862ccd2cd1731d084af481450e2c4850453f7a393",
+        "contents_checksum": "869c7b9b35fc25530c5f8d77e486e572e422f6cfab371eda3baf1095de506de0",
+        "size": 20154986,
+        "source": "components/google-cloud-sdk-cbt-linux-arm-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1908,16 +1908,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "1.25.0"
+        "build_number": 20260217161033,
+        "version_string": "1.25.1"
       }
     },
     {
       "data": {
-        "checksum": "571308b43006788220505f360b5eba52d19d84956790e2f75b0daf96437ab0c7",
-        "contents_checksum": "5e06b080fcac2ad741db7439e320b7d71738c0a75c5e6642a8c212c2d16b09d8",
-        "size": 20136500,
-        "source": "components/google-cloud-sdk-cbt-linux-x86-20251205141901.tar.gz",
+        "checksum": "36aa7410222e083ad4689184dd1ea823e29438a788ce633dfe31d0b2eeb2bb3d",
+        "contents_checksum": "97c98ea62a565e8f052c5b304bd67714a6f6ef5a747b08581370e9995f023785",
+        "size": 20181843,
+        "source": "components/google-cloud-sdk-cbt-linux-x86-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1942,16 +1942,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "1.25.0"
+        "build_number": 20260217161033,
+        "version_string": "1.25.1"
       }
     },
     {
       "data": {
-        "checksum": "6d0abcae119fe74d1236f0a6c164ef67e67ed116e3022b6d3e41a04fd1e07861",
-        "contents_checksum": "edcb8225361c8c776a97061d018758464be3a4a80a00168af617d98c56ce431d",
-        "size": 21494074,
-        "source": "components/google-cloud-sdk-cbt-linux-x86_64-20251205141901.tar.gz",
+        "checksum": "f6b2bf144c190242c49d4800f484bb2d603bfaddf6547e7c20944dd9a6f64ac1",
+        "contents_checksum": "4366b17eaeeb23b9b9f6295e5639bed2fc30b57ee6eac1f30758fcc63fedea2c",
+        "size": 21526844,
+        "source": "components/google-cloud-sdk-cbt-linux-x86_64-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1976,16 +1976,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "1.25.0"
+        "build_number": 20260217161033,
+        "version_string": "1.25.1"
       }
     },
     {
       "data": {
-        "checksum": "81e9b459a6bf6b9219d5d742ffd0fcae4b8b2f04a39c78b3e5645bb395dc6b39",
-        "contents_checksum": "0d1956330f3d0c00ae954c64fcf421e8a269bdda9beadb01cf248fa5359e762f",
-        "size": 20589169,
-        "source": "components/google-cloud-sdk-cbt-windows-x86-20251205141901.tar.gz",
+        "checksum": "20e2697d752f61f988811177ad2c9238a4bcc57670f8c086d2a418bf1ee79be7",
+        "contents_checksum": "5839cc9c1dc663038f5cd40e2970e6bb8fbb675d058bcdc795053cb6dfd2f770",
+        "size": 20631234,
+        "source": "components/google-cloud-sdk-cbt-windows-x86-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2010,16 +2010,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "1.25.0"
+        "build_number": 20260217161033,
+        "version_string": "1.25.1"
       }
     },
     {
       "data": {
-        "checksum": "29f007e1103488caeec4b5a2c580706b75d6f8ddfb4db5ab54d4e5e11a337ac1",
-        "contents_checksum": "a55a0f0f217434dad354c96943689840266361f3c9c85e8a0f3f5103a148fd13",
-        "size": 21764322,
-        "source": "components/google-cloud-sdk-cbt-windows-x86_64-20251205141901.tar.gz",
+        "checksum": "5e18637f6517cefb5bf300031d18bc326d8a8fb536b3e3e368020626817c04ec",
+        "contents_checksum": "51032dd5e908436dc1ce40cf60887e3c69a5ace04feb1952356c63d82ef8c821",
+        "size": 21805500,
+        "source": "components/google-cloud-sdk-cbt-windows-x86_64-20260217161033.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2044,8 +2044,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "1.25.0"
+        "build_number": 20260217161033,
+        "version_string": "1.25.1"
       }
     },
     {
@@ -2210,10 +2210,10 @@
     },
     {
       "data": {
-        "checksum": "981df522dca1f808def399a8185066b6425aee3430bbdb2c0d8eb45c8462be54",
-        "contents_checksum": "8576d9ff116ac2b8d1fb1f51bc733957c817f492cbbf55bf954716e0c0195801",
-        "size": 62818995,
-        "source": "components/google-cloud-sdk-cloud-firestore-emulator-20260102151133.tar.gz",
+        "checksum": "1c07a67e245e7e68884181e7a144c4a30741484dc890d8ea6c9caa4cb4eecede",
+        "contents_checksum": "9f6ed3282ab5dec172657c013163bc998d0d80c5977149821da177bdb5d49bdf",
+        "size": 66433677,
+        "source": "components/google-cloud-sdk-cloud-firestore-emulator-20260227192638.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2231,8 +2231,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20260102151133,
-        "version_string": "1.20.3"
+        "build_number": 20260227192638,
+        "version_string": "1.20.4"
       }
     },
     {
@@ -2464,15 +2464,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.5.28"
+        "version_string": "1.5.51"
       }
     },
     {
       "data": {
-        "checksum": "5a6d5859f2948814101677a3e2b2105bf58629e3f75eb3fc8402dc17ca5049f2",
-        "contents_checksum": "35e23887c12bd71dade150b3dc03bbad5599deb84513a31cedb13cce8f5d51e5",
-        "size": 39501839,
-        "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20250103155615.tar.gz",
+        "checksum": "c0efad3f3a3bb06b3067bf0b90cd4db1509d50f8b6c51416e5bbdaa149e3baff",
+        "contents_checksum": "d6092cf4d85516311b93d359c2e0e7b9d7036bfa34ec622beaf787f8da0a127e",
+        "size": 46678640,
+        "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20260323151659.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2498,8 +2498,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250103155615,
-        "version_string": "1.5.28"
+        "build_number": 20260323151659,
+        "version_string": "1.5.51"
       }
     },
     {
@@ -2536,15 +2536,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "2.19.0"
+        "version_string": "2.21.2"
       }
     },
     {
       "data": {
-        "checksum": "f13e089f19906bf8c31d2feb7ece3c736445ff21ea57b640251d268012eed172",
-        "contents_checksum": "ede9ec54de5d2d11595c37b76ae1e87f195e2ae54b31a76c448cd89577794b59",
-        "size": 15446507,
-        "source": "components/google-cloud-sdk-cloud-sql-proxy-darwin-arm-20251107144733.tar.gz",
+        "checksum": "66bfe348acc6a469d7baaa6667251e99ded817e4a1d60734be1156fffaf88d1d",
+        "contents_checksum": "1a9f95bbeb63882132da3c35e6a4c0d9f5acfe43421f71a80bc6325f050498b7",
+        "size": 15427196,
+        "source": "components/google-cloud-sdk-cloud-sql-proxy-darwin-arm-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2569,16 +2569,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251107144733,
-        "version_string": "2.19.0"
+        "build_number": 20260327141905,
+        "version_string": "2.21.2"
       }
     },
     {
       "data": {
-        "checksum": "0c628deff84f7e7330186bd467ebe389800e11f375c94938104fd53d3aa79858",
-        "contents_checksum": "fb02b34ac5238057041354730ce2c4228c70432eacdf881c4978ad4f765e21a0",
-        "size": 16209590,
-        "source": "components/google-cloud-sdk-cloud-sql-proxy-darwin-x86_64-20251107144733.tar.gz",
+        "checksum": "5a32522ce388be1ff83c030f7055a7319e3419e62bb1c605f51c3cd0e5b5dece",
+        "contents_checksum": "35b86ea5389520078207438fe96636816637de216aac9d4ae305708d3b501256",
+        "size": 16366732,
+        "source": "components/google-cloud-sdk-cloud-sql-proxy-darwin-x86_64-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2603,16 +2603,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251107144733,
-        "version_string": "2.19.0"
+        "build_number": 20260327141905,
+        "version_string": "2.21.2"
       }
     },
     {
       "data": {
-        "checksum": "120bc22776ea726d2a6431ccfc6e65752688d0ca4f713472240fcb434d79b1a4",
-        "contents_checksum": "eb88c2d5070915ba38d561ef6b145e026100e6b9542274a4c44ab19ad261f4d2",
-        "size": 15211552,
-        "source": "components/google-cloud-sdk-cloud-sql-proxy-linux-arm-20251107144733.tar.gz",
+        "checksum": "9f4cb863dbd374d7284453a9a3ec7dfbb81fb1a24c0bbdd4e5496154ff23de3b",
+        "contents_checksum": "2e8c0b1409329ebc982bc72c4d9e0158261732824ec2ef24d430b03d6c77ce81",
+        "size": 14497926,
+        "source": "components/google-cloud-sdk-cloud-sql-proxy-linux-arm-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2637,16 +2637,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251107144733,
-        "version_string": "2.19.0"
+        "build_number": 20260327141905,
+        "version_string": "2.21.2"
       }
     },
     {
       "data": {
-        "checksum": "92bf10a9a2a3fbf2dbb34649f33ebc7cbde55198332bfaae6089b4082a86fcd0",
-        "contents_checksum": "1721da0f538ae8c50099e6fc5f4dabdc4fdffa53db5e35ff568c7108f2e124a0",
-        "size": 15409221,
-        "source": "components/google-cloud-sdk-cloud-sql-proxy-linux-x86-20251107144733.tar.gz",
+        "checksum": "c4385c5426a0ccf65bdd26f1d84b9b51228800f047ae6ce30df76a36c9f59549",
+        "contents_checksum": "d225d015a9171a94d6a5506f89344392d1cb6f1a52b62b217b9bad6449994bc3",
+        "size": 15196834,
+        "source": "components/google-cloud-sdk-cloud-sql-proxy-linux-x86-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2671,16 +2671,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251107144733,
-        "version_string": "2.19.0"
+        "build_number": 20260327141905,
+        "version_string": "2.21.2"
       }
     },
     {
       "data": {
-        "checksum": "cf26370dec58ea6374f9cc85de474182ef599c64f8c6a551ae91d037a631e6a1",
-        "contents_checksum": "ceb335812013a11f9f6d37ef5921d9410d80e20b952a574130104ec381368acc",
-        "size": 16292146,
-        "source": "components/google-cloud-sdk-cloud-sql-proxy-linux-x86_64-20251107144733.tar.gz",
+        "checksum": "220b81e26f250a1c17f9c7da39bbfa23af1665a3b845b20bf3be0d14c7f9a860",
+        "contents_checksum": "8b5aae4edc1eee4e1d2f845f15adb915231300ac5b888f7cf2f171f6fdf19b58",
+        "size": 15787311,
+        "source": "components/google-cloud-sdk-cloud-sql-proxy-linux-x86_64-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2705,16 +2705,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251107144733,
-        "version_string": "2.19.0"
+        "build_number": 20260327141905,
+        "version_string": "2.21.2"
       }
     },
     {
       "data": {
-        "checksum": "a96e0578c2d4051624bd84bee2b096139e1280218e89cd4489d8323e541ee7d7",
-        "contents_checksum": "8ffcec5e731b909ac9a3c4799e4d91aa8870a965d1b6a53c73f563a336c0ffbb",
-        "size": 15437731,
-        "source": "components/google-cloud-sdk-cloud-sql-proxy-windows-x86-20251107144733.tar.gz",
+        "checksum": "f8032695f4f2740b2dc66300c208e2321fbf816a08a6865f6961c713fbb9105c",
+        "contents_checksum": "ee93caed952fb431cc26a65e4b857ed64b1948ebd78f5de26ffb3df6f5061383",
+        "size": 15249788,
+        "source": "components/google-cloud-sdk-cloud-sql-proxy-windows-x86-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2739,16 +2739,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251107144733,
-        "version_string": "2.19.0"
+        "build_number": 20260327141905,
+        "version_string": "2.21.2"
       }
     },
     {
       "data": {
-        "checksum": "a95c3e8f912e4e7486f96ca643d9f272d41fa7a144416f02a110c759e38d2ac0",
-        "contents_checksum": "512ea7b0e1f7265be8233dedb290e852cbf407ed79c509fa809afeacfc81d2db",
-        "size": 16151946,
-        "source": "components/google-cloud-sdk-cloud-sql-proxy-windows-x86_64-20251107144733.tar.gz",
+        "checksum": "f5ae1a5a4e840f5bbd0520c1d1d3acb115e64f97723a833cd936fdef77f6bcaa",
+        "contents_checksum": "e0b449f787c33095bfff5dddcd2a944e61847a2c2480e8ff4178de5ad1381549",
+        "size": 15658959,
+        "source": "components/google-cloud-sdk-cloud-sql-proxy-windows-x86_64-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2773,8 +2773,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251107144733,
-        "version_string": "2.19.0"
+        "build_number": 20260327141905,
+        "version_string": "2.21.2"
       }
     },
     {
@@ -3083,15 +3083,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.137.0"
+        "version_string": "145.0"
       }
     },
     {
       "data": {
-        "checksum": "83a1c4edc7659cfbfb56d243ec086e3ba5d15aeffdbd6d9513caf5bc8afa0d05",
-        "contents_checksum": "fa9081d527a33c1269c1be1ccea034c2a800763daf9beef2e3ae400622450e25",
-        "size": 138856602,
-        "source": "components/google-cloud-sdk-config-connector-darwin-arm-20251024121634.tar.gz",
+        "checksum": "8801dc14282d51a91d73d74d0b4113cc3ac2ac88a361ba3919d54f1f00372ab0",
+        "contents_checksum": "b03b48feb144018f4e6da74bba916acd97b9a199dc0ade3f0637af8ca2b6dc86",
+        "size": 147047036,
+        "source": "components/google-cloud-sdk-config-connector-darwin-arm-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3116,16 +3116,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "1.137.0"
+        "build_number": 20260309182415,
+        "version_string": "145.0"
       }
     },
     {
       "data": {
-        "checksum": "8409b0582cea95b02c532ab836e8e7a20e920ecd2b9a5679cff7f9444f0f18c6",
-        "contents_checksum": "15e8af8f8799633d07a4f9156173096476985a7ba107202fa4a68ab78472f7d6",
-        "size": 144755349,
-        "source": "components/google-cloud-sdk-config-connector-darwin-x86_64-20251024121634.tar.gz",
+        "checksum": "065e851fc272d5b92a5b1cc3720b329751380d34b7b3db9661d510858aaafa32",
+        "contents_checksum": "2d225168ca6680e4d8d89e1d8304c6841c9d431b091dd23df3ffc1de13163ef7",
+        "size": 153143540,
+        "source": "components/google-cloud-sdk-config-connector-darwin-x86_64-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3150,16 +3150,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "1.137.0"
+        "build_number": 20260309182415,
+        "version_string": "145.0"
       }
     },
     {
       "data": {
-        "checksum": "3ee7aba1c1346aa970d1b7f9229455a9253db11bc8d6ea74a1a795b58d63b77f",
-        "contents_checksum": "d14ef724ec2d962b26bd10a15e302e7485c2dc055b0a7ce8d4d7e41cd9563223",
-        "size": 133396187,
-        "source": "components/google-cloud-sdk-config-connector-linux-arm-20251024121634.tar.gz",
+        "checksum": "cb3ce9a7d03bef85f1fea8f9115c7202eaf2e9e00c2f9f6b8aa4f4c8364c2566",
+        "contents_checksum": "961cf6ac3944ec5522ddbcf006e00c649d32df03967124844b0e0a1781bcd66a",
+        "size": 141183667,
+        "source": "components/google-cloud-sdk-config-connector-linux-arm-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3184,16 +3184,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "1.137.0"
+        "build_number": 20260309182415,
+        "version_string": "145.0"
       }
     },
     {
       "data": {
-        "checksum": "035b33da21368e9656fc2336afaa8522cab9156bc7145ecb90078c75e0eb89a1",
-        "contents_checksum": "94bdd29121a93efc5ab241e3f98c103d2d59333fcc36647bafc851fcecbc7418",
-        "size": 141497798,
-        "source": "components/google-cloud-sdk-config-connector-linux-x86_64-20251024121634.tar.gz",
+        "checksum": "15275a5bb76f2e438491e56a88c138e62f0a2ef8e5d251d3f47660653bb18838",
+        "contents_checksum": "753523356b41406e981149adbbc26a6886b2d8adde5ed6845c2cabf796a6242d",
+        "size": 149686684,
+        "source": "components/google-cloud-sdk-config-connector-linux-x86_64-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3218,16 +3218,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "1.137.0"
+        "build_number": 20260309182415,
+        "version_string": "145.0"
       }
     },
     {
       "data": {
-        "checksum": "c782f68931857b53f7342ebc0322da7a74736bd16682a8c6eefa66d9ed12073d",
-        "contents_checksum": "9236d555e53de78003b2105319121cada9c76cffc3b045ab1a1bc4c652e77839",
-        "size": 142428274,
-        "source": "components/google-cloud-sdk-config-connector-windows-x86_64-20251024121634.tar.gz",
+        "checksum": "2b535ca533cd729b9eab3efc6655a0cdf9d71a86cfd2cda4d4732a7105d93c1d",
+        "contents_checksum": "f81535c1882d637a5900c5367da18129a21c5a3f5f1bce16bd81cd1e46b36e6c",
+        "size": 150743379,
+        "source": "components/google-cloud-sdk-config-connector-windows-x86_64-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3252,16 +3252,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "1.137.0"
+        "build_number": 20260309182415,
+        "version_string": "145.0"
       }
     },
     {
       "data": {
-        "checksum": "4ba1cbc06325c77cdfaeb29a930a681dab5ec4a83a06c31c96b8a10a47d01140",
-        "contents_checksum": "d219afb3a4822452de116932541f27401bda4c5a55c1795932d6fc20459f6325",
-        "size": 24768030,
-        "source": "components/google-cloud-sdk-core-20260109121340.tar.gz",
+        "checksum": "a8f4c5254d3f0305dd6190bc5443c13437ab46cb9e06c3cb791f7e227c33cf46",
+        "contents_checksum": "f962266f4e4c301cfd7b9fbd9f7f9ca208c357728e6c6ad92059fd4db2ae7087",
+        "size": 26586563,
+        "source": "components/google-cloud-sdk-core-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3283,16 +3283,16 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "2026.01.09"
+        "build_number": 20260410153504,
+        "version_string": "2026.04.10"
       }
     },
     {
       "data": {
-        "checksum": "9c9d98d4ee02c8b1e6f7a6987513ffef90e0cf39d5699a5b3d75089bbd29a553",
-        "contents_checksum": "03936b9be628bdb92a2c94609da221957750bc1c9e7b5ceeb9a531b57a8424ce",
-        "size": 2326,
-        "source": "components/google-cloud-sdk-core-nix-20251031202127.tar.gz",
+        "checksum": "df42b69344a9d9b7203783d732d90436d98ef62474fdb44034a66e23735fee63",
+        "contents_checksum": "aa64fad70746ed66eee52acdedd4d214c76909b14b639ac5bfcd49aecbd68217",
+        "size": 2323,
+        "source": "components/google-cloud-sdk-core-nix-20260323151659.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3320,8 +3320,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251031202127,
-        "version_string": "2025.10.31"
+        "build_number": 20260323151659,
+        "version_string": "2026.03.23"
       }
     },
     {
@@ -3663,15 +3663,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "0.3.9"
+        "version_string": "0.3.14"
       }
     },
     {
       "data": {
-        "checksum": "dd963512efc407f2a28b9a33af3df8e07f99e365680be540d934906079436917",
-        "contents_checksum": "f1c66bedcb63875010ae163989fc54b988b834763f11eb86f0f1a87a211c3add",
-        "size": 13294698,
-        "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-arm-20260109121340.tar.gz",
+        "checksum": "8793f6acfaf970f0c4d7c7413bb18b589e840d203eee1776830cdb4f546be043",
+        "contents_checksum": "c189ba59402a635dbedff66a28133659e3e650defd4ec688b661a9f7fffaa280",
+        "size": 13636903,
+        "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-arm-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3696,16 +3696,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "0.3.9"
+        "build_number": 20260309182415,
+        "version_string": "0.3.14"
       }
     },
     {
       "data": {
-        "checksum": "42e1c5e8cad09661d35b02c4bc723c3732bec69387dab9dc639fa40286e53570",
-        "contents_checksum": "136b516b51f340e33b3a8028cb5d0a41dd90c0f0fb657ca7788c1a07e90d6ced",
-        "size": 14452266,
-        "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-x86_64-20260109121340.tar.gz",
+        "checksum": "c4e607f93f56941f565748da1aa1c9b6dd20e05a27bf185faa617a2e06e5a1dc",
+        "contents_checksum": "bd6ef8a38213648ccbf50e04847de111c54e5c11d67bc09145f392c70211b0d5",
+        "size": 14896922,
+        "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-x86_64-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3730,16 +3730,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "0.3.9"
+        "build_number": 20260309182415,
+        "version_string": "0.3.14"
       }
     },
     {
       "data": {
-        "checksum": "220a61d0a533c3f6877a313c79d3a61a39591c20d241de6bd26b5b7c9d7a5c71",
-        "contents_checksum": "406e2480391a19e56ec50229566964fc9a64b6952bb5eef61103108c8cb10a51",
-        "size": 16623498,
-        "source": "components/google-cloud-sdk-enterprise-certificate-proxy-linux-x86_64-20260109121340.tar.gz",
+        "checksum": "404fdb061400e2b9cde28291139190b03231e9e08caf45dc76d14c6957c4cbee",
+        "contents_checksum": "9955e0d77a1129e8bacc19fa2378684fe1695e6a20e1589835bb666baf0a4110",
+        "size": 17003078,
+        "source": "components/google-cloud-sdk-enterprise-certificate-proxy-linux-x86_64-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3764,16 +3764,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "0.3.9"
+        "build_number": 20260309182415,
+        "version_string": "0.3.14"
       }
     },
     {
       "data": {
-        "checksum": "1c2e07b1109a5c2cb86a71e660e9bbea5dafb3281377b3fdab635fa02740786a",
-        "contents_checksum": "a655f60f699597d895a75ea1a96a91feb9ca3d408c941c08d5a354f90cbc8929",
-        "size": 14123352,
-        "source": "components/google-cloud-sdk-enterprise-certificate-proxy-windows-x86_64-20251212160114.tar.gz",
+        "checksum": "276b71545b819312b33a27aaf50db665df2bfb305fb961e52b10eadc78e011d3",
+        "contents_checksum": "64d499938545522399198f1b316ed144ad2dd7d845df102018ccd5e629b98709",
+        "size": 14491485,
+        "source": "components/google-cloud-sdk-enterprise-certificate-proxy-windows-x86_64-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3798,8 +3798,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251212160114,
-        "version_string": "0.3.7"
+        "build_number": 20260309182415,
+        "version_string": "0.3.14"
       }
     },
     {
@@ -3861,10 +3861,10 @@
     },
     {
       "data": {
-        "checksum": "83cf5d6a96a8cb3935311845bb18d8bab8403aba8f8f353d8e998f8e51397c3d",
-        "contents_checksum": "e75435399d38e3bf0bd2acf3c0b972818bcfc592c3f2b9a480d50779b911c702",
-        "size": 1497015,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-arm-20260102151133.tar.gz",
+        "checksum": "0541f660e3090697bc8b8bcbc0f242894d9575e1781dec76fd7c63823166661b",
+        "contents_checksum": "d60f3411d14daca426e49f274cde72e9d2bc1fd51225bde607239d964e46405f",
+        "size": 1558950,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-arm-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3889,16 +3889,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260102151133,
+        "build_number": 20260410153504,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "d4609a48d8b254cffc70e3bbcf42c5a44e86567d176e9121eb05a61128e4276a",
-        "contents_checksum": "68c3d4e50aaae41cafa0caa828cadd1ec4ab39b972ae23dbb0651bde570e2ca7",
-        "size": 1571391,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86_64-20260102151133.tar.gz",
+        "checksum": "9b93a36b2257ef04c1fcf1e72b0271ac2b491eb3b08e49f1fd6f63444b534d32",
+        "contents_checksum": "d3ac239b0f3f725d33b78ce5a8c2865098f80f30cdd70391eb977e9a8fab58f4",
+        "size": 1651208,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86_64-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3923,16 +3923,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260102151133,
+        "build_number": 20260410153504,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "d6fdad42b82a12318b19698b4e746d0fd5137a42b7e6a35ec7e30e644d53efa6",
-        "contents_checksum": "3ccba583602a9320984c81d6c76e275a77fc3a85508e38bb2cc6ac97481885a6",
-        "size": 1427587,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-arm-20260102151133.tar.gz",
+        "checksum": "d389d702cc09e0029f50140abffe7501324af16f2aad67c85b6cf0f35fa51058",
+        "contents_checksum": "be615287ed9702bb63fe3c6550bcedfe511cfab1a736f240c0e7704142e5685b",
+        "size": 1487655,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-arm-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3957,16 +3957,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260102151133,
+        "build_number": 20260410153504,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "4c338318f2d09a5cceca984e158ee5b3786b05b431e3b4f782a4ed616d2cc69b",
-        "contents_checksum": "c573c1b2d2c963006324876e8f1dbd143bd93aef315a8bc934c26d61f0630c1b",
-        "size": 1474444,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86-20260102151133.tar.gz",
+        "checksum": "f031f3197f82bd0b0c2773f0c544aa95a18c61cd0446794dd9b14363c19e331a",
+        "contents_checksum": "bfdeb73269d61622c38d36bff696cf69b0bae1c0363d8a46f8de18c69bb9bbe3",
+        "size": 1530370,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3991,16 +3991,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260102151133,
+        "build_number": 20260410153504,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "b69b2666f78d1edc9eceb507541350565c0a450067e4f7e85c69dd0b8549d26c",
-        "contents_checksum": "ea33bcc747a30649e2a406ff6f60fb9f0f068d99d66f949450ede07ea5d17e1a",
-        "size": 1531363,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86_64-20260102151133.tar.gz",
+        "checksum": "72fd154b4293fc2cfbafa4f9081a1a11ddd11b59b105c1176adef29e0411e0f7",
+        "contents_checksum": "75ea40c1d7251f91d3ad79a7b388940ace58231919c1462603d9faf3861eb858",
+        "size": 1609196,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86_64-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4025,16 +4025,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260102151133,
+        "build_number": 20260410153504,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "bd2697ec0be4d2a6fe7fc7417e43155104280192160dae4b3785d63fb67ec6c9",
-        "contents_checksum": "bd8f2936a09dc41b6218002b4f161622fac4d8f30f7929a66ceffcfee0cf234c",
-        "size": 1486924,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86-20260102151133.tar.gz",
+        "checksum": "52a84db60214ce54c12213a3bd863e8901acda8e155434d2329b4eb643ebe9f0",
+        "contents_checksum": "fb06d15cccf5cfe4e35de0e69eeeca294e7cd8855ad43ee1f96cf54f82696378",
+        "size": 1550513,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4059,16 +4059,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260102151133,
+        "build_number": 20260410153504,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "2906300dbe126e368a5bf3a5d9eaad622b5c0e4ed3a8e088c9c7a2fecfdaaea9",
-        "contents_checksum": "c0d4b6671810a1eb1d3205bd621ca814f262424f60745105cf65e38109a310ef",
-        "size": 1538699,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86_64-20260102151133.tar.gz",
+        "checksum": "2120256b9383959c410ffb4e3fa74a5bbd2e942fcd4237d44d3763ea85f89188",
+        "contents_checksum": "28f85192de753c26b9f44b1889425b784a11be988a5e705d4647be1c995b8d55",
+        "size": 1617397,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86_64-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4093,16 +4093,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260102151133,
+        "build_number": 20260410153504,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "7567776d3924f5cf13bbf7e29e645249a4732db2f9d61484556374e9ed9c9b5f",
-        "contents_checksum": "b3c03ddd545fef26a38d709f717330041494e1167f96302b73b69b97078dffeb",
-        "size": 16873864,
-        "source": "components/google-cloud-sdk-gcloud-deps-20251107144733.tar.gz",
+        "checksum": "649ebee16b03155a2bfbab5424452a892f42b360b4a23af2e3b8a4478d9dba98",
+        "contents_checksum": "e5ce6aeac49fffa4757f76248e5be9cf9881a19699d8bc4d2a297d6f619f4d59",
+        "size": 16981371,
+        "source": "components/google-cloud-sdk-gcloud-deps-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4126,8 +4126,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20251107144733,
-        "version_string": "2025.11.07"
+        "build_number": 20260410153504,
+        "version_string": "2026.04.10"
       }
     },
     {
@@ -4370,10 +4370,10 @@
     },
     {
       "data": {
-        "checksum": "983915c09964a5c9c65e0868311b4ee7479a052b53eaff36ce9d21a1e6c420ab",
-        "contents_checksum": "6f9cee5a14d50e92713af2b5969c66208f70d288f1f91a9472ba951053892df3",
-        "size": 8836968,
-        "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20260109121340.tar.gz",
+        "checksum": "cf587e5381873ed9fef7325b5f86eec0285bfc400a2b26522cb8a185faa87d11",
+        "contents_checksum": "2c27ac38e619b6ddcd6e88b057631bd28bddd212a3fd5c340e2659e99f5684f2",
+        "size": 9948689,
+        "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4399,7 +4399,7 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
+        "build_number": 20260410153504,
         "version_string": ""
       }
     },
@@ -4437,15 +4437,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "0.5.10"
+        "version_string": "0.5.12"
       }
     },
     {
       "data": {
-        "checksum": "ef0f048e38b665759c3c147f78e436f65e4974c779870aca1cf7473b898a4748",
-        "contents_checksum": "d26a3aa5aa20f2bf0f44deeefa5208f4deee2351d5b561363d7c44a04ca346a3",
-        "size": 3469074,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20250117151628.tar.gz",
+        "checksum": "b856c88990edab0d1167bff9ff515ec9dc872fd2f3e48c62938fc2adccdccada",
+        "contents_checksum": "91eac6b0f052871c6ef2ae56c331e77dea316ac6579ed75afeb0d2837aa5ce00",
+        "size": 3749853,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4470,16 +4470,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250117151628,
-        "version_string": "0.5.10"
+        "build_number": 20260220152956,
+        "version_string": "0.5.12"
       }
     },
     {
       "data": {
-        "checksum": "9910b17c2ecde0a5ae498ed4f2de10051ebc90d2cbfdc78d4cd94394668f2849",
-        "contents_checksum": "c1934164786737754bc3336c916db4f08af3f47d4a820354645c8c0185f3a9a0",
-        "size": 3660393,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20250117151628.tar.gz",
+        "checksum": "13d2d1d3d7fe819637629f7ead4b52ea6089c8b603c836f0c41efdb6e99b6b1f",
+        "contents_checksum": "26830948567b470b14976894fe3b412d5163d705acd4928862853eac092df362",
+        "size": 3971422,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4504,16 +4504,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250117151628,
-        "version_string": "0.5.10"
+        "build_number": 20260220152956,
+        "version_string": "0.5.12"
       }
     },
     {
       "data": {
-        "checksum": "c64b26fa47351f1a278f660ab3ae871855f35b52215592e7777afdd5515b9c35",
-        "contents_checksum": "227574bd3a12963a30bc67084b6acc999136f3fc4bf6e5c8e147487d5b8eac29",
-        "size": 3344537,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20250117151628.tar.gz",
+        "checksum": "fc8e7268e3b8e740303ff61a9242dc1b3bcd5635e297d1abef2e1a348869dadc",
+        "contents_checksum": "0d271901a543bd6f412d2feaba59586e8828d94404cf6bcf3cf0d9de276b58b8",
+        "size": 3605651,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4538,16 +4538,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250117151628,
-        "version_string": "0.5.10"
+        "build_number": 20260220152956,
+        "version_string": "0.5.12"
       }
     },
     {
       "data": {
-        "checksum": "89968bbca26e7e978bc9164e83c5613c373372e88dfe7ee6f4568c0e0402eca5",
-        "contents_checksum": "ac91d7a4fbb730154c800ee1ace4dcf05d339d72337c07f85573b40092630d88",
-        "size": 3432190,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20250117151628.tar.gz",
+        "checksum": "fceadd809469924e0440bcefe657593098c2dfe75e3a3792d7c37daa0364162c",
+        "contents_checksum": "e3c192d9a116ab76eb3fb6f2279acc9606b7bbc08ba9de332b5ace88f0d931a9",
+        "size": 3798407,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4572,16 +4572,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250117151628,
-        "version_string": "0.5.10"
+        "build_number": 20260220152956,
+        "version_string": "0.5.12"
       }
     },
     {
       "data": {
-        "checksum": "4be17cd481e9153bf5ad23e066628562551a0b9d5e05495b1b625cc49a5e73da",
-        "contents_checksum": "3ab712ee2b704672377642fa124e01f63d8a804caca4a75cdc5da77498df0a73",
-        "size": 3667085,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20250117151628.tar.gz",
+        "checksum": "6b88ad484c0eeadfc4853e98422333ae4c35b61acc51a96b72bab0ac54761db8",
+        "contents_checksum": "4e9229fdf2f66a91d5bc6c005003d89863b7767b5cf1dfa8814a5c3934b6460a",
+        "size": 3976354,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4606,16 +4606,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250117151628,
-        "version_string": "0.5.10"
+        "build_number": 20260220152956,
+        "version_string": "0.5.12"
       }
     },
     {
       "data": {
-        "checksum": "33aa0c121591920642fcd72da7a0cabbfafcdd839d8cae671a145a168ce0cd0b",
-        "contents_checksum": "6e7a5ef4ddf65f32a8075552acd1627b483d8164bf13dce39471566415a5a966",
-        "size": 3449011,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20250117151628.tar.gz",
+        "checksum": "12e12e83d7d6503d376fcde4e2a8bbb99e78e254d8316ab3d07b893d65955304",
+        "contents_checksum": "2f98a4d9293428561713103d5d130287919d70d5c056cfb0d8a2b9a0a4ce5a21",
+        "size": 3815313,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4640,16 +4640,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250117151628,
-        "version_string": "0.5.10"
+        "build_number": 20260220152956,
+        "version_string": "0.5.12"
       }
     },
     {
       "data": {
-        "checksum": "b400dc97e9ed25f1dde25847c89eb08975cb4d9405fcfd078cd85054d931c5b3",
-        "contents_checksum": "72370d25e610ab2dbd29616290c6c334287298af6f6ce266df157120bcf66776",
-        "size": 3741906,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20250117151628.tar.gz",
+        "checksum": "99eebc0e2a79fb122ca7adbd4e24995e03105cbfabbc60bf82925710a07d3ff2",
+        "contents_checksum": "152bcd6eadbb29b185628d4d7fd6b619fcf9a4ae2c2ba10a3f1febf2387ff043",
+        "size": 4050346,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4674,16 +4674,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250117151628,
-        "version_string": "0.5.10"
+        "build_number": 20260220152956,
+        "version_string": "0.5.12"
       }
     },
     {
       "data": {
-        "checksum": "7f9985fde535fb0814789507c2640de9da6cac28f70e73f90bc6022019aed9c4",
-        "contents_checksum": "134cd0b20104c6b46a48c7906c57e2e4f57c6c73370966a21d0226cc3bcfaca2",
-        "size": 12962791,
-        "source": "components/google-cloud-sdk-gsutil-20250627154417.tar.gz",
+        "checksum": "282fb40496d6ef4d3d0eaa7b29a7ea26d02506bb41f84393544edd3381c46a0f",
+        "contents_checksum": "95b0aa261263235323416ac127435fdfff219ea3bb95da5bf21e1c1a3adb4555",
+        "size": 12962580,
+        "source": "components/google-cloud-sdk-gsutil-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4703,16 +4703,16 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20250627154417,
-        "version_string": "5.35"
+        "build_number": 20260309182415,
+        "version_string": "5.36"
       }
     },
     {
       "data": {
-        "checksum": "d42ddb5d29a028aaeaea9fe8b6fe6f653222ae0a21d2467681f62257a5a4154a",
-        "contents_checksum": "e93774d79da5cfd4b40a623ce538cd687d7e5697e21cae518d927f00051ae1d0",
-        "size": 1949,
-        "source": "components/google-cloud-sdk-gsutil-nix-20251031202127.tar.gz",
+        "checksum": "a7590b08435016601eb963d4c1693a368a1296226d7bd2f8f2058c3b44dd7834",
+        "contents_checksum": "57ebeb7a58f7d9b9bd50a4856ec80cdb5626eee2fe4fab962187ffb66f1a572d",
+        "size": 1946,
+        "source": "components/google-cloud-sdk-gsutil-nix-20260323151659.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4738,16 +4738,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251031202127,
-        "version_string": "5.35"
+        "build_number": 20260323151659,
+        "version_string": "5.36"
       }
     },
     {
       "data": {
-        "checksum": "5e212c7b6ebb0ad6d5c710a657b11a48eb9f51f2f7794e0418ea7cb0c5851d01",
-        "contents_checksum": "fe9a8ea5a9d7d0ddba221c3469bcfd94c946e8076194df0ce30d7fa434ddbcd7",
-        "size": 4070,
-        "source": "components/google-cloud-sdk-gsutil-win-20251031202127.tar.gz",
+        "checksum": "4d92a5c1cf35309d9aa00cd1cb76571b55546f94f78ffd2bf9ed681bbd62211f",
+        "contents_checksum": "69a520f59f5d635c04a68a955fc0ab0a718c4691c52d057ea88919db153dcb25",
+        "size": 4068,
+        "source": "components/google-cloud-sdk-gsutil-win-20260323151659.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4770,8 +4770,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251031202127,
-        "version_string": "5.35"
+        "build_number": 20260323151659,
+        "version_string": "5.36"
       }
     },
     {
@@ -4803,15 +4803,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.20.860"
+        "version_string": "1.20.873"
       }
     },
     {
       "data": {
-        "checksum": "486a9c64c7e23cae028eb219d7470adaa8e213102037db7127dfd3259b034bfa",
-        "contents_checksum": "b455c298ad503168b3357e7532f9aa983962101f17311a43b1c54e104d2d2fae",
-        "size": 27895628,
-        "source": "components/google-cloud-sdk-istioctl-darwin-arm-20260109121340.tar.gz",
+        "checksum": "c4f6e50e7db2eba053d50b3fd4d7c543ab6c43296b5a515e117a3d3b89764276",
+        "contents_checksum": "d969a033492acc01499e224bc71c3e5facfc6ba45a6c85eaeed11791c5fbed78",
+        "size": 27619963,
+        "source": "components/google-cloud-sdk-istioctl-darwin-arm-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4836,16 +4836,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.20.860"
+        "build_number": 20260410153504,
+        "version_string": "1.20.873"
       }
     },
     {
       "data": {
-        "checksum": "86a60e9282e6b066a640cebf3aecd7c308f87ad2308c509d222737109e065913",
-        "contents_checksum": "99193c289d799a6221aae147ceb0a80882265e38351009919dc5ed9519b85c21",
-        "size": 29500373,
-        "source": "components/google-cloud-sdk-istioctl-darwin-x86_64-20260109121340.tar.gz",
+        "checksum": "a1cb292cd3453f94d0c415d3448f2438a5649c2e5cc0e32bb82b9c9e8102e4e7",
+        "contents_checksum": "fbc8d07de04a1a16e20d53f7014c8a0f9b5801d8275a5e6527fbc29497f34049",
+        "size": 29667912,
+        "source": "components/google-cloud-sdk-istioctl-darwin-x86_64-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4870,16 +4870,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.20.860"
+        "build_number": 20260410153504,
+        "version_string": "1.20.873"
       }
     },
     {
       "data": {
-        "checksum": "cf4c3d9dd6087e36879bdc53848f2c1180084f80c7d32012e439f6bc2e76b09a",
-        "contents_checksum": "25d37b80d3d3e52f9afe40edf723fe19723fda25508e829d7563634b506fb82f",
-        "size": 26048990,
-        "source": "components/google-cloud-sdk-istioctl-linux-arm-20260109121340.tar.gz",
+        "checksum": "fbbff387c46fb2d242802a547c7bb5281d4934185f79905c98c643e9ca1e24a3",
+        "contents_checksum": "e7c2599cb65aeb6add263af86be84de4f3bf0c381f047572c78419ad5279e74f",
+        "size": 25794794,
+        "source": "components/google-cloud-sdk-istioctl-linux-arm-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4904,16 +4904,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.20.860"
+        "build_number": 20260410153504,
+        "version_string": "1.20.873"
       }
     },
     {
       "data": {
-        "checksum": "bdacd8511a382ef6b73d4cb9d59d5e5e1ffa29fc9672d15931878957c96818d2",
-        "contents_checksum": "e1ccdb1f8cba998b55ea21c045b435c4a53f791e39ac290a11e0e46eac433612",
-        "size": 28447914,
-        "source": "components/google-cloud-sdk-istioctl-linux-x86_64-20260109121340.tar.gz",
+        "checksum": "b73e08d15a137da57046d240cc70df020f0947867f13705ec1249acf48d03e20",
+        "contents_checksum": "db7df82d1aae4c75c05274a20f30e82521bad04fa081cfb0590229cdd262cf11",
+        "size": 28626471,
+        "source": "components/google-cloud-sdk-istioctl-linux-x86_64-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4938,8 +4938,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.20.860"
+        "build_number": 20260410153504,
+        "version_string": "1.20.873"
       }
     },
     {
@@ -4971,15 +4971,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.0.0-beta.56"
+        "version_string": "1.0.0-beta.60"
       }
     },
     {
       "data": {
-        "checksum": "d8a45f20ead335b5e3aa8fc6c0098907494ca1fb82fa1e85d308039ff0c56c5a",
-        "contents_checksum": "30ad8a9c47700d65297e6ce2dc77aab219f2e4319ca7aee3d9e38d00f26d146a",
-        "size": 15217539,
-        "source": "components/google-cloud-sdk-kpt-darwin-arm-20250425151051.tar.gz",
+        "checksum": "58cf016d08a31e44eee0d1931ec1ee67a34e35f8ddf5c5dada828aecba5dabaf",
+        "contents_checksum": "066d99b33af4b6535beb0ccd1e3fb0beb97d38295313595f24cb1f6f148f39f3",
+        "size": 16755933,
+        "source": "components/google-cloud-sdk-kpt-darwin-arm-20260209155903.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5004,16 +5004,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250425151051,
-        "version_string": "1.0.0-beta.56"
+        "build_number": 20260209155903,
+        "version_string": "1.0.0-beta.60"
       }
     },
     {
       "data": {
-        "checksum": "46b7b6db711b7ad75d949cf6322edc99822ad97b8a02b7f1fa37e311665fcc31",
-        "contents_checksum": "556d5a5714934185ec85c676a28b19566b460ee5bb4ecba329ea09cb090ee5ee",
-        "size": 16318352,
-        "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20250425151051.tar.gz",
+        "checksum": "d832fb0bd7134ce74694b985f0d3185a5623532779d242124bd86f1848b66766",
+        "contents_checksum": "818324482c7a1ecfc13a1286fc06394457ca5daf604d8344e3473e7de8277280",
+        "size": 18236441,
+        "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20260209155903.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5038,16 +5038,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250425151051,
-        "version_string": "1.0.0-beta.56"
+        "build_number": 20260209155903,
+        "version_string": "1.0.0-beta.60"
       }
     },
     {
       "data": {
-        "checksum": "952ebd9d30a97316ab3ce7faccfe442749a75f7e1e4e12288a277505a54edade",
-        "contents_checksum": "36464c4969044c035248fb24b0d5babacfe9e45ca015bdecb6c3e4d03fd356a8",
-        "size": 14524265,
-        "source": "components/google-cloud-sdk-kpt-linux-arm-20250425151051.tar.gz",
+        "checksum": "236b4e231d0489bebf7e268b468595d8c072cb263ab53a0b3000f52c6263d845",
+        "contents_checksum": "2d584ffb4e4ea5061391edd86b4e2545ef240f437bb810296903a827bdf07c93",
+        "size": 15980447,
+        "source": "components/google-cloud-sdk-kpt-linux-arm-20260209155903.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5072,16 +5072,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250425151051,
-        "version_string": "1.0.0-beta.56"
+        "build_number": 20260209155903,
+        "version_string": "1.0.0-beta.60"
       }
     },
     {
       "data": {
-        "checksum": "172141641f25fc62aa689c773eca66e9f56a2f973bf95c18b20cd950746d80e1",
-        "contents_checksum": "81c0eeabf640b46b2ae1a52dae1a572b2a86d5cbac89eba836a544e3a8832740",
-        "size": 16021782,
-        "source": "components/google-cloud-sdk-kpt-linux-x86_64-20250425151051.tar.gz",
+        "checksum": "40484fd82d7f62a26e5c2b28948537003953c62bac5f2fe6b6db9bba27b6c9fb",
+        "contents_checksum": "0ac329379adfc89bf64c25589315a50d7e428b7ab2f9ff53c2352e02dd1fe418",
+        "size": 17922484,
+        "source": "components/google-cloud-sdk-kpt-linux-x86_64-20260209155903.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5106,16 +5106,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250425151051,
-        "version_string": "1.0.0-beta.56"
+        "build_number": 20260209155903,
+        "version_string": "1.0.0-beta.60"
       }
     },
     {
       "data": {
-        "checksum": "9f9d4881468e4a01c832471dac877b9ae6d7a649bddaff220810e15bded90131",
-        "contents_checksum": "5532802d02c18010f2b7c13dc802282ff6d682b451b7d9d725d7a59099503598",
-        "size": 36979,
-        "source": "components/google-cloud-sdk-kubectl-20250829143545.tar.gz",
+        "checksum": "9a65a1d374b13ac4ea23c9305561de7ea9026f1f5c460a8922ec0f22009f14d7",
+        "contents_checksum": "fdf440f3a6e479e4b85d7e8313cbc1d339cc163ce8dfc166ff20acc568a95db8",
+        "size": 37725,
+        "source": "components/google-cloud-sdk-kubectl-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5140,16 +5140,16 @@
       "platform": {},
       "platform_required": true,
       "version": {
-        "build_number": 20250829143545,
-        "version_string": "1.33.4"
+        "build_number": 20260220152956,
+        "version_string": "1.34.4"
       }
     },
     {
       "data": {
-        "checksum": "3f07f2ecd3cdd2461a00dcd2b8c7755cbf5630b22226a52a27c3e127384d8f00",
-        "contents_checksum": "3d4bb40734a52eea59dfc40f6873d016ebb03022ee3bdf0ece7b2ad0b3796fc5",
-        "size": 113871878,
-        "source": "components/google-cloud-sdk-kubectl-darwin-arm-20260109121340.tar.gz",
+        "checksum": "0996caca4b29d90072983e7bcf35fca1fec73b8b8be14b1dc3186f589924de5f",
+        "contents_checksum": "7daec707120074fc1524f2ff4448588d8e9dcede544f45e9ad1cf43f379a741d",
+        "size": 113993238,
+        "source": "components/google-cloud-sdk-kubectl-darwin-arm-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5175,16 +5175,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.33.5"
+        "build_number": 20260327141905,
+        "version_string": "1.34.6"
       }
     },
     {
       "data": {
-        "checksum": "bdd3411289625807ea370d1fe29b3709e052224916e87df282df64d879fb5847",
-        "contents_checksum": "dce54475a781e3682c4fd6984923068167dd9ae715ecc32325e9cfcaa4560945",
-        "size": 122516124,
-        "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20260109121340.tar.gz",
+        "checksum": "ed8d57d11f10377927fb63fd13b8eb8c61f2a72a04365cb8e42e3bc1eef53a1b",
+        "contents_checksum": "8d6903becce2d886bb0203abb743f728323a7f80694042cdc0e1314a96411e64",
+        "size": 122645470,
+        "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5210,16 +5210,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.33.5"
+        "build_number": 20260327141905,
+        "version_string": "1.34.6"
       }
     },
     {
       "data": {
-        "checksum": "f7799dab57ad34560267b74294d0254f9beeeffb99f8723db1ee018fd078b2e3",
-        "contents_checksum": "ed8353abfc7a96987bdaf14faaffaedebad0783b8d81c08ac7585189d5d0198d",
-        "size": 113141102,
-        "source": "components/google-cloud-sdk-kubectl-linux-arm-20260109121340.tar.gz",
+        "checksum": "4082ccf5276316f7a8ae6d728a2d60f279f034312342ef50edd12def95af9cae",
+        "contents_checksum": "b1cfcd3d426edcb1c9793d32c9e73f88e5eacf29ca927a04d00bbc3e3e761444",
+        "size": 113215098,
+        "source": "components/google-cloud-sdk-kubectl-linux-arm-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5245,16 +5245,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.33.5"
+        "build_number": 20260327141905,
+        "version_string": "1.34.6"
       }
     },
     {
       "data": {
-        "checksum": "e6fddb93bd770b85a398a5205903296fbaf9459aef4d915bc4c8316b8e70bb73",
-        "contents_checksum": "215cd0bffcc9dbeb961c278abc0e516dbad6ebd0d9f0c16dbf92a8cacd2ae05f",
-        "size": 111433116,
-        "source": "components/google-cloud-sdk-kubectl-linux-x86-20260109121340.tar.gz",
+        "checksum": "a4bf5ba361f502f38f35b0a84729f67b704278588987108d6a3a56b365e1531f",
+        "contents_checksum": "9c897b28dde0958f9c439d409cbbc6c2b6fdafc68b0c75fddfb787777fa028d9",
+        "size": 111548010,
+        "source": "components/google-cloud-sdk-kubectl-linux-x86-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5280,16 +5280,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.33.5"
+        "build_number": 20260327141905,
+        "version_string": "1.34.6"
       }
     },
     {
       "data": {
-        "checksum": "f2f5bb7b8cc2eef92f36b21a80a80a9a5274e58e7af9d722ee2f1a412a342916",
-        "contents_checksum": "cdbc965001f8ff086a00147ecc35d8845233599c824f2bfdd3cedb3a9f5e7a4f",
-        "size": 120096293,
-        "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20260109121340.tar.gz",
+        "checksum": "ed99dfdb12228d24a340d1d5bb942d4d23e0b5ea3ed420ddee0772cd4b52fd8a",
+        "contents_checksum": "d17e6cef8149c24d2086c643a3871c3509b38a4f48a43d0af8af5a3e959ed3ce",
+        "size": 120237169,
+        "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5315,8 +5315,8 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.33.5"
+        "build_number": 20260327141905,
+        "version_string": "1.34.6"
       }
     },
     {
@@ -5350,15 +5350,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.5.1"
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "668657665d86db6d1c2ca53116f022799e9b6202d7e6e0080acd9a89f2e69667",
-        "contents_checksum": "55b5c287ac965c8cb331fcfa27cf8a7a346ceb103eef9e7ff603067a3b8d2217",
-        "size": 21872424,
-        "source": "components/google-cloud-sdk-kubectl-oidc-darwin-arm-20240426154730.tar.gz",
+        "checksum": "dd0dd881d2f99b7b92b24a1d9d0d5a8f701b3ff1000b251c4ce7fd316ad58608",
+        "contents_checksum": "d72eeb2ff61c2e007a124155c5694b76a39eeb94fa30b0dad98deced1c9a490d",
+        "size": 29263476,
+        "source": "components/google-cloud-sdk-kubectl-oidc-darwin-arm-20260130130055.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5383,16 +5383,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240426154730,
-        "version_string": "1.5.1"
+        "build_number": 20260130130055,
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "efee37ae3fd4c68bd04b7d851a3a737d4730d1d2c1ea1d1ae0ff1c4b9b415e2e",
-        "contents_checksum": "d5caa4ebe32784b39af30c044d1526cd2c9cfc468912f151c50591818f86981f",
-        "size": 22957587,
-        "source": "components/google-cloud-sdk-kubectl-oidc-darwin-x86_64-20240426154730.tar.gz",
+        "checksum": "e4da659edbc500429117fce929be76fea86ed6b267ecc011a648f56bc46557bd",
+        "contents_checksum": "e6c603786f739ad75bac78c7cf3138e94aaf962e4be7b1b02e626d0c1e0cc796",
+        "size": 32060952,
+        "source": "components/google-cloud-sdk-kubectl-oidc-darwin-x86_64-20260130130055.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5417,16 +5417,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240426154730,
-        "version_string": "1.5.1"
+        "build_number": 20260130130055,
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "c1bffc495c0f18b7a8b7231815d03ad050d8f7da54e3ae8fb252f30bd9774553",
-        "contents_checksum": "ac25a44fb809f2b4c158abccb88b1a2e66433be79bf46092522f07b02d72ab68",
-        "size": 21399468,
-        "source": "components/google-cloud-sdk-kubectl-oidc-linux-arm-20240426154730.tar.gz",
+        "checksum": "a5ae01029887f2ae6dc44e552248f9e783f6812b837726b941778be29f7f48ca",
+        "contents_checksum": "482992cd9f4c2c9be7d7d1510ab472d4e1aa24b012e44f640669597e7766c7d4",
+        "size": 25653642,
+        "source": "components/google-cloud-sdk-kubectl-oidc-linux-arm-20260130130055.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5451,16 +5451,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240426154730,
-        "version_string": "1.5.1"
+        "build_number": 20260130130055,
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "314b8b36331fc2b67fee555fcfb7c0aa1c4c742dcb995164f9822fc513f269de",
-        "contents_checksum": "a7e6a84feb050b265084ae1ea6d8bd0898258b76e7f6226c01d9d8e65fceeb5d",
-        "size": 23109484,
-        "source": "components/google-cloud-sdk-kubectl-oidc-linux-x86_64-20240426154730.tar.gz",
+        "checksum": "a8eaaf1033f57e3ccebf30ad966e5dc6f2ae7a7e35fc9f3578b45dd45459d48a",
+        "contents_checksum": "795c9f62b43714b86fdc6766495caba44332cf8253b0b71d0e2e5f385b3c04ae",
+        "size": 28262695,
+        "source": "components/google-cloud-sdk-kubectl-oidc-linux-x86_64-20260130130055.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5485,16 +5485,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240426154730,
-        "version_string": "1.5.1"
+        "build_number": 20260130130055,
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "b72cb005890e61307350e45fed931c783f9954a18249210059f780b42ae0c6fc",
-        "contents_checksum": "cabcb7396bd79cf1e80baeb1a53da5e56497ce49a97fbd9e33127da81999e0d7",
-        "size": 23361379,
-        "source": "components/google-cloud-sdk-kubectl-oidc-windows-x86_64-20240426154730.tar.gz",
+        "checksum": "08a4227e2a4dfe5b2705ee13b373fcf60aeb4d7dadd41a0369e6f0bf74cb42e4",
+        "contents_checksum": "1ae49f76894d3e0a58928547123e2eed1bdb4e4020bb940a1af6dbcd2b7c9500",
+        "size": 28645446,
+        "source": "components/google-cloud-sdk-kubectl-oidc-windows-x86_64-20260130130055.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5519,16 +5519,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240426154730,
-        "version_string": "1.5.1"
+        "build_number": 20260130130055,
+        "version_string": "1.5.2"
       }
     },
     {
       "data": {
-        "checksum": "e5f9c6840b0196dc756c12cb76510a52b9cba84c5779149bacbd4b5fe12d6661",
-        "contents_checksum": "2444bb615ad69f758937fd1e2a7316f783ac4628d0a430dc22f268a93e8c163a",
-        "size": 116999993,
-        "source": "components/google-cloud-sdk-kubectl-windows-x86-20260109121340.tar.gz",
+        "checksum": "6b273a5667ca5d18304b1be75262496036bfe573c8522f7fc8ca7c18c8fb201e",
+        "contents_checksum": "a97a0bda438f6f30f323e35563f7b7749e0976f196bf4da5df03c912d8e0a069",
+        "size": 117143503,
+        "source": "components/google-cloud-sdk-kubectl-windows-x86-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5556,16 +5556,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.33.5"
+        "build_number": 20260327141905,
+        "version_string": "1.34.6"
       }
     },
     {
       "data": {
-        "checksum": "14de7bd830277714ab694fa62b725ae44512caf1d69deca2418a91ecee0769b3",
-        "contents_checksum": "12e50909367855a4c2254bb5fd3e101736b9499d130de0a49fb4b001feaebe40",
-        "size": 123301489,
-        "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20260109121340.tar.gz",
+        "checksum": "222f2541e5a1ac7778d44f3a4a3a66d9f7f044b8659a82d52f436548e75a9b50",
+        "contents_checksum": "d93b37257f21fc8995abe8d563325380837aeac234ef7f28755eda57a1da244f",
+        "size": 123446846,
+        "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20260327141905.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5593,8 +5593,8 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "1.33.5"
+        "build_number": 20260327141905,
+        "version_string": "1.34.6"
       }
     },
     {
@@ -5626,15 +5626,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "4.4.0"
+        "version_string": "5.7.1"
       }
     },
     {
       "data": {
-        "checksum": "b95afa06b03f17e547147d8cdbb580d2f2aed61bcaeca54ea36c36831fe650d3",
-        "contents_checksum": "b43056bfa3c4617bda2639f6cd8ab0158d426e2e2f7efcfece1c603b525dc644",
-        "size": 7742264,
-        "source": "components/google-cloud-sdk-kustomize-darwin-arm-20211105152221.tar.gz",
+        "checksum": "1e9ad095d067780fea98f158b980d4b64bdc43dfdee87ac6fc1e4da85ddc3ebf",
+        "contents_checksum": "eae9f178e44c36e658c25c8f9438c89307d0d10f1f0a0d2696f741aa2f25dcc4",
+        "size": 5479468,
+        "source": "components/google-cloud-sdk-kustomize-darwin-arm-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5659,16 +5659,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20211105152221,
-        "version_string": "4.4.0"
+        "build_number": 20260220152956,
+        "version_string": "5.7.1"
       }
     },
     {
       "data": {
-        "checksum": "3249a57333c76820058bbce9e5c1092cc236d9dd92eec06c7bd96ae5daa2ffce",
-        "contents_checksum": "2240a0c0c35f660fbf17fd02f75a042fa8476898b757b6be09e6fca83ecd744b",
-        "size": 7961940,
-        "source": "components/google-cloud-sdk-kustomize-darwin-x86_64-20211105152221.tar.gz",
+        "checksum": "7ef0f3a2b446e330000f5bce60548be0d74d6412871000a58ed521e538e795e7",
+        "contents_checksum": "178b2185ba41496372b420b42e87cb794f343a0cc2b69120c60c9517edb4c526",
+        "size": 5857304,
+        "source": "components/google-cloud-sdk-kustomize-darwin-x86_64-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5693,16 +5693,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20211105152221,
-        "version_string": "4.4.0"
+        "build_number": 20260220152956,
+        "version_string": "5.7.1"
       }
     },
     {
       "data": {
-        "checksum": "bc7d4df4872108f616b8aa3fc73542c0659dc6497c02f47c08c89a1020d033a1",
-        "contents_checksum": "64a057772ce8a7e0ced2c8aa25137e00a4bceaf8734502ddb7933f3c9c7daf23",
-        "size": 4099867,
-        "source": "components/google-cloud-sdk-kustomize-linux-arm-20211105152221.tar.gz",
+        "checksum": "e228d02a4f53966db47d53ddb0fd2217867a8a7b266ff04459860466883becc7",
+        "contents_checksum": "15de3788241898c37e1a6ab72504aad857fba04965f0f61389afdb669670a40f",
+        "size": 5269082,
+        "source": "components/google-cloud-sdk-kustomize-linux-arm-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5727,16 +5727,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20211105152221,
-        "version_string": "4.4.0"
+        "build_number": 20260220152956,
+        "version_string": "5.7.1"
       }
     },
     {
       "data": {
-        "checksum": "baa11714bcd75fef7bdf156e36b3f6fd52efef4f849bb0fd490d5287c85b3524",
-        "contents_checksum": "565e74944c349441370287bed68e8972531ba4e29f9c91aecd19ee53840a4c71",
-        "size": 4534871,
-        "source": "components/google-cloud-sdk-kustomize-linux-x86_64-20211105152221.tar.gz",
+        "checksum": "160d019ff77201b7fb380bfb75286f896ba870f2e90d35b6d354623afb9c2efd",
+        "contents_checksum": "96909f1042c4c25a1aacea0b83952e0375779b9348233577730f8cb6c743b814",
+        "size": 5758288,
+        "source": "components/google-cloud-sdk-kustomize-linux-x86_64-20260220152956.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5761,8 +5761,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20211105152221,
-        "version_string": "4.4.0"
+        "build_number": 20260220152956,
+        "version_string": "5.7.1"
       }
     },
     {
@@ -5964,15 +5964,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "0.3.1"
+        "version_string": "0.3.2"
       }
     },
     {
       "data": {
-        "checksum": "34ff02c5e08bb5e05ccbee5eb2530b70b4384e79becfcc6e60f885fcbb97b0a6",
-        "contents_checksum": "b3fe4edd8b4ee5e1628589c520a3b091d2a7eec2dca879b21d2fb73771157f06",
-        "size": 16756318,
-        "source": "components/google-cloud-sdk-log-streaming-darwin-arm-20250131143518.tar.gz",
+        "checksum": "34b8e2a9025d595687bf93612db49874c07c7a11f3e5de7130eab5ec69149d18",
+        "contents_checksum": "0311d2023385095d56513138ebc62651bd6c50fae0f03bff283b18991a424507",
+        "size": 17718439,
+        "source": "components/google-cloud-sdk-log-streaming-darwin-arm-20260123145558.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5997,16 +5997,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250131143518,
-        "version_string": "0.3.1"
+        "build_number": 20260123145558,
+        "version_string": "0.3.2"
       }
     },
     {
       "data": {
-        "checksum": "8822455914785d6f573dfa3c9cf3c49dcdaa6b76410da7dff7c3160c70d878b3",
-        "contents_checksum": "790cd048847596c3d7e1242f398f230008fef834e333d966684238da48e43611",
-        "size": 17204121,
-        "source": "components/google-cloud-sdk-log-streaming-darwin-x86_64-20250131143518.tar.gz",
+        "checksum": "af3dedd3579c2f75788649de54468438484a593b1af5a61de98ffb2bf8f06014",
+        "contents_checksum": "86990eb27e6f0410891716343b004864d0654a3dee78ae0bd666a16cdb8de202",
+        "size": 18348977,
+        "source": "components/google-cloud-sdk-log-streaming-darwin-x86_64-20260123145558.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6031,16 +6031,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250131143518,
-        "version_string": "0.3.1"
+        "build_number": 20260123145558,
+        "version_string": "0.3.2"
       }
     },
     {
       "data": {
-        "checksum": "eb6cb3cbd9dbc2671260c61ff80ddc2dc14f0f73b22800385f7da4a0d23d8f35",
-        "contents_checksum": "2c0dec61558f0b309144b2972c51e766f29e9a4386e2ae11aec0e0635d7b9578",
-        "size": 16507670,
-        "source": "components/google-cloud-sdk-log-streaming-linux-arm-20250131143518.tar.gz",
+        "checksum": "7ec0c8e190c0adbc8dbed3594ebe1a9b21527de4258ed28ae101936b7058dfb1",
+        "contents_checksum": "bb9028fe0ee28165482d8c4d90b21aea73db080513c82427f2095728a8152295",
+        "size": 16730369,
+        "source": "components/google-cloud-sdk-log-streaming-linux-arm-20260123145558.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6065,16 +6065,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250131143518,
-        "version_string": "0.3.1"
+        "build_number": 20260123145558,
+        "version_string": "0.3.2"
       }
     },
     {
       "data": {
-        "checksum": "35c7e93df8d1c80a04ce5337c5a1b77ffeac37abfa8880accd05c5ad6ac89280",
-        "contents_checksum": "364a404d6145795afddbbb00307070bd01a4623249b74d44d5d9f18ec11a2c6e",
-        "size": 19099362,
-        "source": "components/google-cloud-sdk-log-streaming-linux-x86_64-20250131143518.tar.gz",
+        "checksum": "ef7b5c28cdf250a7f19434e3ccb36d78ff03a8d45db666570440ac888cccba73",
+        "contents_checksum": "0c6f0268c809cde268da73a4f81767e1729560da371d0714d3f7770751b89634",
+        "size": 19640553,
+        "source": "components/google-cloud-sdk-log-streaming-linux-x86_64-20260123145558.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6099,16 +6099,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250131143518,
-        "version_string": "0.3.1"
+        "build_number": 20260123145558,
+        "version_string": "0.3.2"
       }
     },
     {
       "data": {
-        "checksum": "0c307951b965390108fca08b4a40426842d620293f3830734e023e2253bbcdc1",
-        "contents_checksum": "d90a1fa59db328e1137834eacce471c0673bd469a6525f2b1ed4f63d5afacb8d",
-        "size": 17516544,
-        "source": "components/google-cloud-sdk-log-streaming-windows-x86_64-20250131143518.tar.gz",
+        "checksum": "d94f824c8aa3ff17b55c9d136f03f31c83fdc10d4d8095d8bcb0e45300525d39",
+        "contents_checksum": "37093fa51ae1027dca94a18f2dd25856bf68f672fb5ab2637b0da316994ce4d4",
+        "size": 18840645,
+        "source": "components/google-cloud-sdk-log-streaming-windows-x86_64-20260123145558.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6133,8 +6133,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250131143518,
-        "version_string": "0.3.1"
+        "build_number": 20260123145558,
+        "version_string": "0.3.2"
       }
     },
     {
@@ -6195,15 +6195,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.37.0"
+        "version_string": "1.38.1"
       }
     },
     {
       "data": {
-        "checksum": "27cf75b68f9771b462227d6107d2fe8efdee6e1782e1d140c77301982f8bf325",
-        "contents_checksum": "bf2f96285e93bcd010062588c695c75f770d7b453f2d45c72edb51da0eb9b3f3",
-        "size": 51219320,
-        "source": "components/google-cloud-sdk-minikube-darwin-arm-20250929142209.tar.gz",
+        "checksum": "f5789a295d53c9fe476d33eb68a99605421ad7062684ba49e1de8bdc52c9c0fa",
+        "contents_checksum": "25aad95499adacb1e6e1bbeb06bd82f71e3d106ee8228f57b7dff24e3d40cff3",
+        "size": 51177674,
+        "source": "components/google-cloud-sdk-minikube-darwin-arm-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6228,16 +6228,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250929142209,
-        "version_string": "1.37.0"
+        "build_number": 20260309182415,
+        "version_string": "1.38.1"
       }
     },
     {
       "data": {
-        "checksum": "eb1db70ca7e833a9f5c629c86a70d8e5723e64c8bc114c48a63269ce269ef55e",
-        "contents_checksum": "dedf9c8818eed2863c518da6bec1a7581d64bd93b9f551e6c13ff2059361a676",
-        "size": 53251460,
-        "source": "components/google-cloud-sdk-minikube-darwin-x86_64-20250929142209.tar.gz",
+        "checksum": "5b3b76a5ca31e66f3253a7b0c2d696b85b6b6df35de28318448365f3791e686c",
+        "contents_checksum": "1d615a41852940176243c4a04b35bbba3a206c5f1d74363336bb38e9f420e31c",
+        "size": 53841253,
+        "source": "components/google-cloud-sdk-minikube-darwin-x86_64-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6262,16 +6262,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250929142209,
-        "version_string": "1.37.0"
+        "build_number": 20260309182415,
+        "version_string": "1.38.1"
       }
     },
     {
       "data": {
-        "checksum": "9ddc123d9136c7c1cc887385395b5f885d0479cca99332eb6addb05d1504814e",
-        "contents_checksum": "9d24a9591a9362cfed6509943a439a4022e65486bb294e01e16d02c7d7078bc6",
-        "size": 49686375,
-        "source": "components/google-cloud-sdk-minikube-linux-arm-20250929142209.tar.gz",
+        "checksum": "7b4a515437695b7e2fa8b8b4eb55dc0410c50af7a6077c5e130e7b054588535a",
+        "contents_checksum": "c72eb7b44a552ceeb8dfbf80585591687bf31240f9ad13063f352f66feaea657",
+        "size": 46196842,
+        "source": "components/google-cloud-sdk-minikube-linux-arm-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6296,16 +6296,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250929142209,
-        "version_string": "1.37.0"
+        "build_number": 20260309182415,
+        "version_string": "1.38.1"
       }
     },
     {
       "data": {
-        "checksum": "0aefe43534fef78294d28681541edb115dfd905acad2b0b4a5cecab72266f3cd",
-        "contents_checksum": "599bbd593e95049d248c8e90cf4a3ce89bd71cfb298c4bceb18b90aca278bf9c",
-        "size": 52972171,
-        "source": "components/google-cloud-sdk-minikube-linux-x86_64-20250929142209.tar.gz",
+        "checksum": "0fa86242ace88377d199eb2aab158a99225f89dd663c02201e659755aaade1e8",
+        "contents_checksum": "5c23b4c858ed8e2d88eeeb878f3c2e47ef9096a68171bfa5ec7d0a3c152fc7fc",
+        "size": 48368820,
+        "source": "components/google-cloud-sdk-minikube-linux-x86_64-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6330,16 +6330,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250929142209,
-        "version_string": "1.37.0"
+        "build_number": 20260309182415,
+        "version_string": "1.38.1"
       }
     },
     {
       "data": {
-        "checksum": "ab382b8a9281f08bcdb6f4a0f83c0db0eb8dc6b1a73dd8395ccff5b8e0287c33",
-        "contents_checksum": "88127b8f5692a301da94e308a3b4f8e40f4c37a35b349994375295c65817fcd1",
-        "size": 53104518,
-        "source": "components/google-cloud-sdk-minikube-windows-x86_64-20250929142209.tar.gz",
+        "checksum": "9927aeda9b8fa5b1dffe2a39246dc59b76cd0f18dfac7cce34375a240fde2cfa",
+        "contents_checksum": "3722edeebbd262020df9c82159b2791e4f7a6bf10ba7e5e1c5d25745384b4186",
+        "size": 50286208,
+        "source": "components/google-cloud-sdk-minikube-windows-x86_64-20260309182415.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6364,8 +6364,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20250929142209,
-        "version_string": "1.37.0"
+        "build_number": 20260309182415,
+        "version_string": "1.38.1"
       }
     },
     {
@@ -6394,15 +6394,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.23.0-rc.1"
+        "version_string": "1.23.3-rc.1"
       }
     },
     {
       "data": {
-        "checksum": "4fea061f3da59d9de422052e137c8e2bd1e2d1cda87d20ed196d0048056eeb5e",
-        "contents_checksum": "93a440b6a9c2afc7f44fac5a88c813e3e814b42a59bd47d16dfff7d671c5eec5",
-        "size": 37162258,
-        "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20251205141901.tar.gz",
+        "checksum": "95e4168b583390c3e93bada555af962063fb5c592c529640cff37370a9e6befd",
+        "contents_checksum": "6c209d0440f531bb498953756bac7ff2f5a362bc9d7bb586f8c4cb6982ccb2d3",
+        "size": 36245301,
+        "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6427,16 +6427,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "1.23.0-rc.1"
+        "build_number": 20260403133411,
+        "version_string": "1.23.3-rc.1"
       }
     },
     {
       "data": {
-        "checksum": "b4cc8053bc2048a2b1a09dddd49919faeb81d411f1d369313e94e2528b7db7f3",
-        "contents_checksum": "5e6aa4c80fcca4e69bf4bc1f1f70700c6a8d376537400a8a2f8f41af47fab5b9",
-        "size": 36961568,
-        "source": "components/google-cloud-sdk-nomos-linux-x86_64-20251205141901.tar.gz",
+        "checksum": "6b6fd6f2e89b398445ac7532e3b218fccc035d040a597ccdb810c3ee00eed2a0",
+        "contents_checksum": "d7d172dd63e03ed1f3cbe010c24ac8c31dc0557b71c5b01157207b3c9f34353a",
+        "size": 34190409,
+        "source": "components/google-cloud-sdk-nomos-linux-x86_64-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6461,8 +6461,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251205141901,
-        "version_string": "1.23.0-rc.1"
+        "build_number": 20260403133411,
+        "version_string": "1.23.3-rc.1"
       }
     },
     {
@@ -6693,10 +6693,10 @@
     },
     {
       "data": {
-        "checksum": "65f70d7b477fbcb5698489f18d024153ab713153e100e8b0fe93de974887a2a8",
-        "contents_checksum": "586d679aea5588b95fa5aa396db966d52493410c77816d6b65b06df9306bddb3",
-        "size": 823,
-        "source": "components/google-cloud-sdk-preview-20241115154308.tar.gz",
+        "checksum": "f135e5f6dd331d28f3ebf299208dbe1993838ad4f2d9d87cbde365a6b760c66c",
+        "contents_checksum": "c4caf1dd1ca46b5fb9d759606c18619ffaafff9315db4037ade8b3b628f6312b",
+        "size": 782,
+        "source": "components/google-cloud-sdk-preview-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6709,21 +6709,21 @@
       "gdu_only": false,
       "id": "preview",
       "is_configuration": false,
-      "is_hidden": true,
+      "is_hidden": false,
       "is_required": false,
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20241115154308,
-        "version_string": ""
+        "build_number": 20260410153504,
+        "version_string": "2026.04.10"
       }
     },
     {
       "data": {
-        "checksum": "d8a4ee1ad4c03a57227397547640dfdeb9ff489f4ea9c41492f22122c88d709e",
-        "contents_checksum": "8a2352d79332f9c61dbfa992050cf9e1883c27dde993d8b3a22463ed88f8e634",
-        "size": 52214510,
-        "source": "components/google-cloud-sdk-pubsub-emulator-20250923151237.tar.gz",
+        "checksum": "4729eb7b3728b8beefda189f8c11b103efe3b24d790e5e513aab2b131aba3b3a",
+        "contents_checksum": "b1e1328f3b23e41dc84a9c43b941368d65819ca7ef07ed74836f741b4b56ad7f",
+        "size": 52988278,
+        "source": "components/google-cloud-sdk-pubsub-emulator-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6741,8 +6741,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20250923151237,
-        "version_string": "0.8.25"
+        "build_number": 20260410153504,
+        "version_string": "0.8.31"
       }
     },
     {
@@ -6779,15 +6779,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "0.1.12"
+        "version_string": "0.1.15"
       }
     },
     {
       "data": {
-        "checksum": "4bc94be42e12db2693ebc77782be61208413bc7235263cb044d7403326b0a8a7",
-        "contents_checksum": "bdf7a8e4f280047443e2304efb5d6fd226b664b8bf71b69d15b93e6aa9771683",
-        "size": 5498485,
-        "source": "components/google-cloud-sdk-run-compose-darwin-arm-20251024121634.tar.gz",
+        "checksum": "234eb2d67e5cf32f6162440598d4e3f6afc088004fbae4dbbd929e6cab28f41f",
+        "contents_checksum": "9089053ba5fc8006655204ada52fd2e0468f49740248c3fbae5dce5ef17f428b",
+        "size": 5426415,
+        "source": "components/google-cloud-sdk-run-compose-darwin-arm-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6812,16 +6812,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "0.1.12"
+        "build_number": 20260403133411,
+        "version_string": "0.1.15"
       }
     },
     {
       "data": {
-        "checksum": "096c061a622e1678effdf02de43f922999d6a4190d696c47e310349c50763d82",
-        "contents_checksum": "8c5158b3a12be17e950ac3f77f7ffd66fe372978616a56c53aada737991a91fd",
-        "size": 5806218,
-        "source": "components/google-cloud-sdk-run-compose-darwin-x86_64-20251024121634.tar.gz",
+        "checksum": "dcb4d8ccb93747c36b09ab7dc47e9a9e7d8580f4c9b1a948b26345cb8785beaf",
+        "contents_checksum": "a1e26a64bfe7347d79fc11e6c3e28e1a41d13919e0778df39f8e4df9845de282",
+        "size": 5735121,
+        "source": "components/google-cloud-sdk-run-compose-darwin-x86_64-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6846,16 +6846,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "0.1.12"
+        "build_number": 20260403133411,
+        "version_string": "0.1.15"
       }
     },
     {
       "data": {
-        "checksum": "d62471c1064bd7e850285379c6cf5e0e018b9423208e013d2978363481f94967",
-        "contents_checksum": "b8d45ba6df321dea1232d966bdda77f4cc86b5c64368d578ffce4d3530192982",
-        "size": 5253315,
-        "source": "components/google-cloud-sdk-run-compose-linux-arm-20251024121634.tar.gz",
+        "checksum": "082134bc4d5ee9479ebb9801075e10dfd5dd084f274bd7a0658843d7e645e79f",
+        "contents_checksum": "86f4f26a4af179e2690f68edbd0a30fcb4866a3bf349e2d50aa628d99a915cc9",
+        "size": 5191157,
+        "source": "components/google-cloud-sdk-run-compose-linux-arm-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6880,16 +6880,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "0.1.12"
+        "build_number": 20260403133411,
+        "version_string": "0.1.15"
       }
     },
     {
       "data": {
-        "checksum": "4c33560f5ef5e2483b4535629e2d9ece5b38bc46c96a64ae008f9ff0d38b8528",
-        "contents_checksum": "ccc690296196928fa3cfbac23dff8d2d8682e9bb55776aa1daf91d7b3a421e87",
-        "size": 5726258,
-        "source": "components/google-cloud-sdk-run-compose-linux-x86-20251024121634.tar.gz",
+        "checksum": "d75d5b20c4293bae42c795496d5fb7eee388938ecd13a568c845783be156882b",
+        "contents_checksum": "a9bacfd09bed5dc1568c6891f7da6f6676647cb2df35a3256e43d07cb6f8ee18",
+        "size": 5665132,
+        "source": "components/google-cloud-sdk-run-compose-linux-x86-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6914,16 +6914,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "0.1.12"
+        "build_number": 20260403133411,
+        "version_string": "0.1.15"
       }
     },
     {
       "data": {
-        "checksum": "0b1639bd7caa723302f7efddda3a3bc9d9da1492505ad4df219f147a549ec62e",
-        "contents_checksum": "672b54726917e75eba88cce9efe1e315a6fd0b3b9ba99c1ffff923a44e300233",
-        "size": 5726312,
-        "source": "components/google-cloud-sdk-run-compose-linux-x86_64-20251024121634.tar.gz",
+        "checksum": "8696e9fc6ddcd297e22616a592c2eb33cda2e016b49429a92e6216c0928524ab",
+        "contents_checksum": "a9bacfd09bed5dc1568c6891f7da6f6676647cb2df35a3256e43d07cb6f8ee18",
+        "size": 5665135,
+        "source": "components/google-cloud-sdk-run-compose-linux-x86_64-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6948,16 +6948,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "0.1.12"
+        "build_number": 20260403133411,
+        "version_string": "0.1.15"
       }
     },
     {
       "data": {
-        "checksum": "ba0e7fa050af73bbb542e92764034e86e20d2c61f496dc7c8dd60a39665c746d",
-        "contents_checksum": "7f2df2d0a19a0c83ab3ace0592c4b93bc3e8a3a0b6a2634169e479cdc1c86a6d",
-        "size": 5910558,
-        "source": "components/google-cloud-sdk-run-compose-windows-x86-20251024121634.tar.gz",
+        "checksum": "48742e820e5e3aeb128a666236caf6085acde90c450a6615cfd06aa735ff3811",
+        "contents_checksum": "42571239b239d89d14fa7b87b40ee15ef25a72f414c24aac6a82ed420755ece8",
+        "size": 5809871,
+        "source": "components/google-cloud-sdk-run-compose-windows-x86-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6982,16 +6982,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "0.1.12"
+        "build_number": 20260403133411,
+        "version_string": "0.1.15"
       }
     },
     {
       "data": {
-        "checksum": "fc7639a892228b70de719bee4ae9839c63869af6c3f84ea60e258f911fccd512",
-        "contents_checksum": "7f2df2d0a19a0c83ab3ace0592c4b93bc3e8a3a0b6a2634169e479cdc1c86a6d",
-        "size": 5910561,
-        "source": "components/google-cloud-sdk-run-compose-windows-x86_64-20251024121634.tar.gz",
+        "checksum": "d6148357ff1a10b7816eafa189b419c980e1848c29a86751d940402e0d975307",
+        "contents_checksum": "42571239b239d89d14fa7b87b40ee15ef25a72f414c24aac6a82ed420755ece8",
+        "size": 5809874,
+        "source": "components/google-cloud-sdk-run-compose-windows-x86_64-20260403133411.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7016,8 +7016,105 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20251024121634,
-        "version_string": "0.1.12"
+        "build_number": 20260403133411,
+        "version_string": "0.1.15"
+      }
+    },
+    {
+      "dependencies": [
+        "sbom-extractor-linux-arm",
+        "sbom-extractor-linux-x86_64"
+      ],
+      "details": {
+        "description": "Tool for extracting SBOMs.",
+        "display_name": "SBOM Extractor"
+      },
+      "gdu_only": false,
+      "id": "sbom-extractor",
+      "is_configuration": false,
+      "is_hidden": false,
+      "is_required": false,
+      "platform": {
+        "architectures": [
+          "arm",
+          "x86_64"
+        ],
+        "operating_systems": [
+          "LINUX"
+        ]
+      },
+      "platform_required": false,
+      "version": {
+        "build_number": 0,
+        "version_string": "1.0.2"
+      }
+    },
+    {
+      "data": {
+        "checksum": "66c8d4e93da168f8dffab6cd43a5b6e55be4ecb268ab9b021576332dd72f620b",
+        "contents_checksum": "08e10b14cca3ec41b63d9d92625ed1cbce90f549dad8816e60fc2df562752505",
+        "size": 80715352,
+        "source": "components/google-cloud-sdk-sbom-extractor-linux-arm-20260327141905.tar.gz",
+        "type": "tar"
+      },
+      "dependencies": [
+        "sbom-extractor"
+      ],
+      "details": {
+        "description": "Tool for extracting SBOMs.",
+        "display_name": "SBOM Extractor (Platform Specific)"
+      },
+      "gdu_only": false,
+      "id": "sbom-extractor-linux-arm",
+      "is_configuration": false,
+      "is_hidden": true,
+      "is_required": false,
+      "platform": {
+        "architectures": [
+          "arm"
+        ],
+        "operating_systems": [
+          "LINUX"
+        ]
+      },
+      "platform_required": false,
+      "version": {
+        "build_number": 20260327141905,
+        "version_string": "1.0.2"
+      }
+    },
+    {
+      "data": {
+        "checksum": "b9d0a81a4c44c55e2438a8acb0fe8ff849319462a37e805378bf742f898c9b69",
+        "contents_checksum": "9308ef8ee4a8ac6ab8f29fbb76bb7f1044f35175e009ebfa8f47edb346e32c04",
+        "size": 86057091,
+        "source": "components/google-cloud-sdk-sbom-extractor-linux-x86_64-20260327141905.tar.gz",
+        "type": "tar"
+      },
+      "dependencies": [
+        "sbom-extractor"
+      ],
+      "details": {
+        "description": "Tool for extracting SBOMs.",
+        "display_name": "SBOM Extractor (Platform Specific)"
+      },
+      "gdu_only": false,
+      "id": "sbom-extractor-linux-x86_64",
+      "is_configuration": false,
+      "is_hidden": true,
+      "is_required": false,
+      "platform": {
+        "architectures": [
+          "x86_64"
+        ],
+        "operating_systems": [
+          "LINUX"
+        ]
+      },
+      "platform_required": false,
+      "version": {
+        "build_number": 20260327141905,
+        "version_string": "1.0.2"
       }
     },
     {
@@ -7052,15 +7149,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "2.17.1"
+        "version_string": "2.18.3"
       }
     },
     {
       "data": {
-        "checksum": "7300781701d99efb918d74860bb668748811deb8a0ceee25f5942c42562690a8",
-        "contents_checksum": "9f4d0ae607198098dfe7e5c09645e8fc541d06bd9748dd8debb956a16864a506",
-        "size": 35635251,
-        "source": "components/google-cloud-sdk-skaffold-darwin-arm-20260109121340.tar.gz",
+        "checksum": "143e6b3470baa0e15d2f737aad9eca886ffc1377bbfcb472dba31f4676eeb215",
+        "contents_checksum": "969e066b0a9975b10f202b952eda470d860f9b09cd79aa535400ccd77bbcd3e3",
+        "size": 35541689,
+        "source": "components/google-cloud-sdk-skaffold-darwin-arm-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7086,16 +7183,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "2.17.1"
+        "build_number": 20260410153504,
+        "version_string": "2.18.3"
       }
     },
     {
       "data": {
-        "checksum": "58e441bd59bf90088d36c7172eda5e7f013908ad091e50e25403544ceda02fd5",
-        "contents_checksum": "47d889081e983f718c72ff2aeeba33f01569aa38eb37e74411284c9af361c777",
-        "size": 39160349,
-        "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20260109121340.tar.gz",
+        "checksum": "991b665f9c1b3efc673c2b891aff955992b9bbdbf1ff1afa7d97ea92a5cbb6ad",
+        "contents_checksum": "9f1e553d3921fdbcf4fdb8b2516d89faf0bd982e5e458af8bb57e99fa0fa810e",
+        "size": 39041567,
+        "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7121,16 +7218,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "2.17.1"
+        "build_number": 20260410153504,
+        "version_string": "2.18.3"
       }
     },
     {
       "data": {
-        "checksum": "59d5787f9452c892e1d3eaad126a09cd2ae3c1cffc42293834d0c78ee5bc63d6",
-        "contents_checksum": "f0ae22ecf92b471e52c42cf9a514be118dcbedb4a1f154160198bae37d4d773b",
-        "size": 32176110,
-        "source": "components/google-cloud-sdk-skaffold-linux-arm-20260109121340.tar.gz",
+        "checksum": "587089ea6423cb661463ff0be6dcd34c7a0148b7aaa20754569c88f15bf2edd8",
+        "contents_checksum": "afa492119fc1ce0cf3fab7fe3e28d04f5dd370e4d8dfdccb0c05e8c70fe2d7a1",
+        "size": 32104271,
+        "source": "components/google-cloud-sdk-skaffold-linux-arm-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7156,16 +7253,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "2.17.1"
+        "build_number": 20260410153504,
+        "version_string": "2.18.3"
       }
     },
     {
       "data": {
-        "checksum": "80f7043b753b14ea3623ed80f752335a0e771e8b3f810ff0a92e1a29ce5ef792",
-        "contents_checksum": "0fe2e5349d5c69c04c970605366ba103ded5e0da88616568898d9b6469d8abf9",
-        "size": 35772319,
-        "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20260109121340.tar.gz",
+        "checksum": "76c8fca8d4ade485662b80de32c815aa9675f76d40e2f6e67f992fd3807fe0fe",
+        "contents_checksum": "5b7d98630b2ca88ff985c0c0b3b842fcfd714863b52d2c1fc9e4bc39f77ff385",
+        "size": 35680246,
+        "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7191,16 +7288,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "2.17.1"
+        "build_number": 20260410153504,
+        "version_string": "2.18.3"
       }
     },
     {
       "data": {
-        "checksum": "d88ddda1a88f5a21a19da7bdc5983089fb25d87123957d25bc660f6426ba6f22",
-        "contents_checksum": "6167c2f634d9b6deb62cb3f73cbfaacb61510953cf8015e178973dd10a3ab993",
-        "size": 33329612,
-        "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20260109121340.tar.gz",
+        "checksum": "3c9a8ebbd2efe9c002bf659a72857f5bf610acb803594a3d8543b745c6b3555f",
+        "contents_checksum": "68a65ea966d2024cddcdfe6b87c96f9550be2ae8f166d2b44ad522201a3bd47d",
+        "size": 33294645,
+        "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7226,8 +7323,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "2.17.1"
+        "build_number": 20260410153504,
+        "version_string": "2.18.3"
       }
     },
     {
@@ -7436,7 +7533,10 @@
     },
     {
       "dependencies": [
-        "spanner-migration-tool-linux-x86_64"
+        "spanner-migration-tool-darwin-arm",
+        "spanner-migration-tool-darwin-x86_64",
+        "spanner-migration-tool-linux-x86_64",
+        "spanner-migration-tool-windows-x86_64"
       ],
       "details": {
         "description": "Performs database migrations to Cloud Spanner databases.",
@@ -7449,24 +7549,95 @@
       "is_required": false,
       "platform": {
         "architectures": [
+          "arm",
           "x86_64"
         ],
         "operating_systems": [
-          "LINUX"
+          "LINUX",
+          "MACOSX",
+          "WINDOWS"
         ]
       },
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "3.19.0"
+        "version_string": "3.26.0"
       }
     },
     {
       "data": {
-        "checksum": "e6388401bb90c1e39cc4d95c90a352b7ca12902bb6fa398aca9f2707764ccbb9",
-        "contents_checksum": "2102698ada160865a0664339e23008bfe47d487960d60849792d39d9c0776dac",
-        "size": 31144230,
-        "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20260102151133.tar.gz",
+        "checksum": "820f323cf7378ae87f5164ffb846f4f2d6a10674c5c209cf27b1afb3dc0ada1e",
+        "contents_checksum": "5c9b0671197a4aecf0eb8b495860910451b86cb58e94d231c7bdd94681d2c636",
+        "size": 50998169,
+        "source": "components/google-cloud-sdk-spanner-migration-tool-darwin-arm-20260410153504.tar.gz",
+        "type": "tar"
+      },
+      "dependencies": [
+        "spanner-migration-tool"
+      ],
+      "details": {
+        "description": "Performs database migrations to Cloud Spanner databases.",
+        "display_name": "Spanner migration tool (Platform Specific)"
+      },
+      "gdu_only": true,
+      "id": "spanner-migration-tool-darwin-arm",
+      "is_configuration": false,
+      "is_hidden": true,
+      "is_required": false,
+      "platform": {
+        "architectures": [
+          "arm"
+        ],
+        "operating_systems": [
+          "MACOSX"
+        ]
+      },
+      "platform_required": false,
+      "version": {
+        "build_number": 20260410153504,
+        "version_string": "3.26.0"
+      }
+    },
+    {
+      "data": {
+        "checksum": "6632c78c2be0ce5f3ab6bbdb8cde36063fb275c3597c1b246a910ebb4064681c",
+        "contents_checksum": "43a6b4393dee5599f709b41762126110a023e81a9a66690ffcbdc70a52fb814a",
+        "size": 54769356,
+        "source": "components/google-cloud-sdk-spanner-migration-tool-darwin-x86_64-20260410153504.tar.gz",
+        "type": "tar"
+      },
+      "dependencies": [
+        "spanner-migration-tool"
+      ],
+      "details": {
+        "description": "Performs database migrations to Cloud Spanner databases.",
+        "display_name": "Spanner migration tool (Platform Specific)"
+      },
+      "gdu_only": true,
+      "id": "spanner-migration-tool-darwin-x86_64",
+      "is_configuration": false,
+      "is_hidden": true,
+      "is_required": false,
+      "platform": {
+        "architectures": [
+          "x86_64"
+        ],
+        "operating_systems": [
+          "MACOSX"
+        ]
+      },
+      "platform_required": false,
+      "version": {
+        "build_number": 20260410153504,
+        "version_string": "3.26.0"
+      }
+    },
+    {
+      "data": {
+        "checksum": "13e17ffae75833c5ae507bfa81faa58e74f992c4b70b6819d93829e0855d56f6",
+        "contents_checksum": "025b76341d66cb7ddc8e0f9b921f77408bee6d868f5b9530e1a4487906bf674d",
+        "size": 31853738,
+        "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7491,8 +7662,42 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20260102151133,
-        "version_string": "3.19.0"
+        "build_number": 20260410153504,
+        "version_string": "3.26.0"
+      }
+    },
+    {
+      "data": {
+        "checksum": "de59184f81ff3d3b858987fd4b235333e827a351ce895d8ae431a2cda635824b",
+        "contents_checksum": "04458bbf05e6c6c76d32b2aad99352f059c4d095ccaf91215f691afb9447a39a",
+        "size": 49547464,
+        "source": "components/google-cloud-sdk-spanner-migration-tool-windows-x86_64-20260410153504.tar.gz",
+        "type": "tar"
+      },
+      "dependencies": [
+        "spanner-migration-tool"
+      ],
+      "details": {
+        "description": "Performs database migrations to Cloud Spanner databases.",
+        "display_name": "Spanner migration tool (Platform Specific)"
+      },
+      "gdu_only": true,
+      "id": "spanner-migration-tool-windows-x86_64",
+      "is_configuration": false,
+      "is_hidden": true,
+      "is_required": false,
+      "platform": {
+        "architectures": [
+          "x86_64"
+        ],
+        "operating_systems": [
+          "WINDOWS"
+        ]
+      },
+      "platform_required": false,
+      "version": {
+        "build_number": 20260410153504,
+        "version_string": "3.26.0"
       }
     },
     {
@@ -7756,10 +7961,10 @@
     },
     {
       "data": {
-        "checksum": "305ba99f6ae9070e071144eb8bdb26c165d875eb5eabe2e994a4f0e45a85a009",
-        "contents_checksum": "35c7e43a7cafd222ce0ebc94695e537ea8b3745f9f42c6f9ca8417014b6cfcf1",
-        "size": 61751716,
-        "source": "components/google-cloud-sdk-tests-20260109121340.tar.gz",
+        "checksum": "f7a3cf8ba42abb716e22b484e9988cc13070792cc01eb3eda1fe2da94fab3fbc",
+        "contents_checksum": "64f58fbac9c41c4ff84af4a80e72b7109e522556dcbc914565fe7587eceb6d86",
+        "size": 63495337,
+        "source": "components/google-cloud-sdk-tests-20260410153504.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7777,8 +7982,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20260109121340,
-        "version_string": "2026.01.09"
+        "build_number": 20260410153504,
+        "version_string": "2026.04.10"
       }
     }
   ],
@@ -7797,11 +8002,11 @@
   ],
   "post_processing_command": "components post-process",
   "release_notes_url": "RELEASE_NOTES",
-  "revision": 20260109121340,
+  "revision": 20260410153504,
   "schema_version": {
     "no_update": false,
     "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz",
     "version": 3
   },
-  "version": "552.0.0"
+  "version": "565.0.0"
 }
diff --git a/pkgs/by-name/go/google-cloud-sdk/data.nix b/pkgs/by-name/go/google-cloud-sdk/data.nix
index cae1bd6049e0..4d9c1bff9dd6 100644
--- a/pkgs/by-name/go/google-cloud-sdk/data.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/data.nix
@@ -1,27 +1,27 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "552.0.0";
+  version = "565.0.0";
   googleCloudSdkPkgs = {
     x86_64-linux = {
-      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-552.0.0-linux-x86_64.tar.gz";
-      sha256 = "10ihffqxn2dxl6lagp4616k9cp4d73p68lcy4dzy2n5hzmfklj9s";
+      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-565.0.0-linux-x86_64.tar.gz";
+      sha256 = "0pra5cr46bf5k729m30xbs3s1vw8vkix7p33j9h8gvmqhr66fwh9";
     };
     x86_64-darwin = {
-      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-552.0.0-darwin-x86_64.tar.gz";
-      sha256 = "0s8s717dy301nbc2a2pa5zcnpg258r3hvq8lmsz19gwa7y8k8bws";
+      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-565.0.0-darwin-x86_64.tar.gz";
+      sha256 = "1hyrr6kkbaqz6nhn029l1rwyn416jcvvyd41187vgpyr5b2ldd0h";
     };
     aarch64-linux = {
-      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-552.0.0-linux-arm.tar.gz";
-      sha256 = "197kj3m999pigk6503h3y8psld0m9xlp6sviv5mz9zriaf1rxgqs";
+      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-565.0.0-linux-arm.tar.gz";
+      sha256 = "0jx0h0skicy16g2572rblj59a4f5q3fxbaxhfs03ldqr15fjg647";
     };
     aarch64-darwin = {
-      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-552.0.0-darwin-arm.tar.gz";
-      sha256 = "1m1jdsgl8dm73wgvs982rkjx4j3fqxgs2xrkqxqadpcx3nb82ysv";
+      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-565.0.0-darwin-arm.tar.gz";
+      sha256 = "1b7h0gzp58fkkln5v0dnki2j73akankhjm67205qah9hskaq06cd";
     };
     i686-linux = {
-      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-552.0.0-linux-x86.tar.gz";
-      sha256 = "1dp48vvkg1vfv2cc4g0g1cb06pdshhvxvs48r78943cbbsjql32k";
+      url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-565.0.0-linux-x86.tar.gz";
+      sha256 = "19nba1qp87yf1wr94rabvkgf584i8pkvsp01qqd5la6hhmcpg0zn";
     };
   };
 }
diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix
index 27b63ca43ba1..d90533967545 100644
--- a/pkgs/by-name/go/goose/package.nix
+++ b/pkgs/by-name/go/goose/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "goose";
-  version = "3.27.0";
+  version = "3.27.1";
 
   src = fetchFromGitHub {
     owner = "pressly";
     repo = "goose";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wpnheZJ2+xnk8N/hE5Cyf38/yODQC5+SlDml9vH0oRw=";
+    hash = "sha256-dzeB5QXjQAyJlaM6I82C4gNoj7ELA4sgkfHkXADN9+Y=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-0G6kE5ScpsIG2hLzZ9hnyig4LuN6rTdwirR+ldC2+ps=";
+  vendorHash = "sha256-JsLpcV5SSBin6U7Kj5O0mhXNdIwyV+xdteEJBxW8zuY=";
 
   # skipping: end-to-end tests require a docker daemon
   postPatch = ''
diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index c42e60715a49..d520eaedfb4e 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGo126Module (finalAttrs: {
   pname = "goreleaser";
-  version = "2.15.2";
+  version = "2.15.4";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-oRKOgqj5TKoD+BygDNjEc4vEN88WoTLAPJVxDfjWMPs=";
+    hash = "sha256-KpOttfnlVB+4YHg/SHqJHjQtK7DDO2yh6WH1kQFe/tE=";
   };
 
-  vendorHash = "sha256-u0xZpajnTlGi8i/LfJ9JVHOKFs2SUA6RSrR4MlRhZv4=";
+  vendorHash = "sha256-I4y+0yT6/SFvJbJTByHn/EPQ3rNzpUEb4/7gtF+i80o=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix
index 07d06f20a3ff..41e80d294946 100644
--- a/pkgs/by-name/go/gosec/package.nix
+++ b/pkgs/by-name/go/gosec/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gosec";
-  version = "2.25.0";
+  version = "2.26.1";
 
   src = fetchFromGitHub {
     owner = "securego";
     repo = "gosec";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ssRSI8RPwC+VSW6tPRLr4q5BE0hixWf4O92Fgu0P1aE=";
+    hash = "sha256-/iurQn0fNTonpSSFf1llmFA5+CYSb/vYFGE0JKbcL90=";
   };
 
-  vendorHash = "sha256-wXR5EMI7bvPFudAtw2/z4O//Zkbop71XAS3uyXx3iQs=";
+  vendorHash = "sha256-57fYXBbir4jPiYPtTH1iVNFPWZWfq/Sx21Z4jC3fEWs=";
 
   subPackages = [
     "cmd/gosec"
diff --git a/pkgs/by-name/go/goshs/package.nix b/pkgs/by-name/go/goshs/package.nix
index 7be75e10a864..88cf0cddf9fb 100644
--- a/pkgs/by-name/go/goshs/package.nix
+++ b/pkgs/by-name/go/goshs/package.nix
@@ -1,31 +1,27 @@
 {
+  lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
-  stdenv,
-  lib,
-  testers,
-
-  # passthru
-  goshs,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "goshs";
-  version = "2.0.1";
+  version = "2.0.6";
 
   src = fetchFromGitHub {
     owner = "patrickhener";
     repo = "goshs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Lh4jUz6dtbAwC9ErQrHe5FtxjHLL2gBRTSqLtj33GTc=";
+    hash = "sha256-HbwxBZnALbtuZ9BBkyNatDYdjExC3YtHvex0rQR8LLM=";
   };
 
-  vendorHash = "sha256-wn+t6xY4zUK6NE5kZSefHYGpMq5whFZ644ij5bDs50I=";
+  vendorHash = "sha256-i/Q9YBcmBBtEbsHRX0Q4aaWPxP2OpdUKwJuj5Oq1Yq4=";
 
-  ldflags = [
-    "-s"
-    "-w"
-  ];
+  ldflags = [ "-s" ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   doInstallCheck = true;
 
@@ -42,12 +38,7 @@ buildGoModule (finalAttrs: {
     "-skip=^TestGetIPv4Addr$"
   ];
 
-  # Disabled until https://github.com/patrickhener/goshs/issues/137 is resolved
-  # passthru.tests.version = testers.testVersion {
-  #   package = goshs;
-  #   command = "goshs -v";
-  #   version = "goshs ${finalAttrs.version}";
-  # };
+  versionCheckProgramArg = [ "-v" ];
 
   meta = {
     description = "Simple, yet feature-rich web server written in Go";
diff --git a/pkgs/by-name/go/govc/package.nix b/pkgs/by-name/go/govc/package.nix
index a37a84dbdb32..0f77e32c9f3e 100644
--- a/pkgs/by-name/go/govc/package.nix
+++ b/pkgs/by-name/go/govc/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "govc";
-  version = "0.53.0";
+  version = "0.53.1";
 
   src = fetchFromGitHub {
     owner = "vmware";
     repo = "govmomi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-//OqlBGek/UqxMUgjNDxJ1YkUNoYjeZRx1MIUgJzZys=";
+    hash = "sha256-egyXzA+0xobHcq3dGOYou4sPCHRDv2l8QWo8ZLWofKU=";
   };
 
-  vendorHash = "sha256-t5yzwXz037umvqxZ/Y9T3Cld3xyA6BOJrDSzCvFdE5o=";
+  vendorHash = "sha256-xRhjAOQKX6CU9BmdNZonDMwmnEvFXWOaP73j7wPIexk=";
 
   sourceRoot = "${finalAttrs.src.name}/govc";
 
diff --git a/pkgs/by-name/go/govulncheck/package.nix b/pkgs/by-name/go/govulncheck/package.nix
index 15d6a566b196..41906263741d 100644
--- a/pkgs/by-name/go/govulncheck/package.nix
+++ b/pkgs/by-name/go/govulncheck/package.nix
@@ -8,13 +8,13 @@
 
 buildGoLatestModule (finalAttrs: {
   pname = "govulncheck";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "vuln";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-15DTxzlK7mkUt7KCwsV5+E5dPopCwFylI0fmVB0LDEo=";
+    hash = "sha256-Xe2H0vF4CNDm1Xw7OD6m5NkqWrFtK/AXzZjqJ5SeoV8=";
   };
 
   patches = [
@@ -24,7 +24,7 @@ buildGoLatestModule (finalAttrs: {
     })
   ];
 
-  vendorHash = "sha256-+hJtGG9GGDb3D9Cgm7hreySjOlXXsc7HxHcoS2Cxfbs=";
+  vendorHash = "sha256-yGaD/jAfT0/YV2ZE8H5++p6CM5qgm+oRtlhgOojX6Zo=";
 
   subPackages = [
     "cmd/govulncheck"
diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix
index 70133d3a6e4a..245d95d910d4 100644
--- a/pkgs/by-name/go/gowall/package.nix
+++ b/pkgs/by-name/go/gowall/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gowall";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "Achno";
     repo = "gowall";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HZEVH3T4dmBE4OMPjtHj3qdeT4i27+YhZWJgYqbg5ss=";
+    hash = "sha256-mogjHIsm+N3/wtrfayiKuYe6REPVrt8xLZDpgdKkX34=";
   };
 
-  vendorHash = "sha256-zQoXrQnejng1jBKRMaQzQaZYKWxJPXjgdplnuVhazuM=";
+  vendorHash = "sha256-nRmW7jGcURbrXVwg5kxmloet2aV2s8JjhEeO1KybtME=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index 95c7aa993fb2..4c771852ffae 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -63,12 +63,12 @@ let
     };
   };
   unstable = {
-    version = "2.4.0-unstable-2026-01-30";
+    version = "26.02.0-unstable-2026-04-29";
     src = fetchFromGitHub {
       owner = "gpac";
       repo = "gpac";
-      rev = "2166130136223373dad2ef3fb72e4cbd129cb468";
-      hash = "sha256-Iw4UAKjFnV+NiG77VOfHUHPle5+YAIavtGmtrD3Uebw=";
+      rev = "525bf1af642c30af04e4df5345e6d798c0a4d8a1";
+      hash = "sha256-G/4gefsS2hUKo8VEt80YZOaGJSjrzXFrdHO/u33BiDw=";
     };
     updateScript = unstableGitUpdater {
       tagFormat = "v*";
diff --git a/pkgs/by-name/gp/gpg-tui/package.nix b/pkgs/by-name/gp/gpg-tui/package.nix
index e9873c763f32..a54e3c03ed16 100644
--- a/pkgs/by-name/gp/gpg-tui/package.nix
+++ b/pkgs/by-name/gp/gpg-tui/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gpg-tui";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "gpg-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qGm0eHpVFGn8tNdEnmQ4oIfjCxyixMFYdxih7pHvGH0=";
+    hash = "sha256-DTVtMwKAZjPwT6c7FYoaT12Axoz3j1cMFKjDDsaHyjk=";
   };
 
-  cargoHash = "sha256-XdT/6N7CJJ8LY0KmkO6PuRdnq1FZvbZrGhky1hmyr2Y=";
+  cargoHash = "sha256-d2PYJajDKukwDERSjQcPSJaYbZDftNLBYEXq+7ZdlKw=";
 
   nativeBuildInputs = [
     gpgme # for gpgme-config
diff --git a/pkgs/by-name/gp/gpredict-unstable/package.nix b/pkgs/by-name/gp/gpredict-unstable/package.nix
deleted file mode 100644
index c5aee98340e0..000000000000
--- a/pkgs/by-name/gp/gpredict-unstable/package.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  goocanvas_3,
-  nix-update-script,
-  gpredict,
-}:
-
-(gpredict.override {
-  goocanvas_2 = goocanvas_3;
-}).overrideAttrs
-  (finalAttrs: {
-    version = "2.2.1-unstable-2025-09-20";
-
-    src = fetchFromGitHub {
-      owner = "csete";
-      repo = "gpredict";
-      rev = "34af48e6bfd9647559abb1df4907a65d064fc870";
-      hash = "sha256-G4bS7w/USIzYOa+aYv3YQCbUQolV22Z/7+71GHHSUpk=";
-    };
-
-    patches = [ ];
-
-    passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
-  })
diff --git a/pkgs/by-name/gp/gpredict/package.nix b/pkgs/by-name/gp/gpredict/package.nix
index c44036ffd038..e1e6d45f80a0 100644
--- a/pkgs/by-name/gp/gpredict/package.nix
+++ b/pkgs/by-name/gp/gpredict/package.nix
@@ -2,48 +2,29 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   intltool,
   autoreconfHook,
   gtk3,
-  glib,
   curl,
-  goocanvas_2,
   gpsd,
-  hamlib_4,
   wrapGAppsHook3,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpredict";
-  version = "2.2.1";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "csete";
     repo = "gpredict";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8=";
+    hash = "sha256-lP+QakQ+uTgBY8NNEC7DwQifh3Zi0ZKbarxNGB4onq0=";
   };
 
-  patches = [
-    # Pull upstream fix for -fno-common toolchains:
-    #   https://github.com/csete/gpredict/issues/195
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch";
-      sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a";
-    })
-    # Updates URLs for TLE files
-    # https://github.com/csete/gpredict/pull/305
-    (fetchpatch {
-      name = "TLE-urls.patch";
-      url = "https://github.com/csete/gpredict/commit/8f60f856921e8ee143cd6e2d34a9183778cb0fbf.patch";
-      hash = "sha256-X/nKrqh5sjxDMLhA9LQek8AsJFqhvK/k8Ep3ug/0rMI=";
-    })
-
-  ];
+  strictDeps = true;
+  __structuredAttrs = true;
 
   nativeBuildInputs = [
     pkg-config
@@ -51,13 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
     autoreconfHook
   ];
+
   buildInputs = [
     curl
-    glib
     gtk3
-    goocanvas_2
     gpsd
-    hamlib_4
   ];
 
   passthru.updateScript = nix-update-script { };
@@ -74,9 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
-    homepage = "http://gpredict.oz9aec.net/";
+    homepage = "https://oz9aec.dk/gpredict/";
     maintainers = with lib.maintainers; [
-      markuskowa
       cmcdragonkai
       pandapip1
     ];
diff --git a/pkgs/by-name/gp/gpsbabel/package.nix b/pkgs/by-name/gp/gpsbabel/package.nix
index e2695b1a155f..ededbc422855 100644
--- a/pkgs/by-name/gp/gpsbabel/package.nix
+++ b/pkgs/by-name/gp/gpsbabel/package.nix
@@ -9,7 +9,6 @@
   shapelib,
   zlib,
   withGUI ? false,
-  withMapPreview ? (!stdenv.hostPlatform.isDarwin),
   withDoc ? false,
   docbook_xml_dtd_45,
   docbook_xsl,
@@ -73,8 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     shapelib
     zlib
   ]
-  ++ lib.optional withGUI libsForQt5.qtserialport
-  ++ lib.optional (withGUI && withMapPreview) libsForQt5.qtwebengine;
+  ++ lib.optional withGUI libsForQt5.qtserialport;
 
   nativeCheckInputs = [
     libxml2
@@ -90,8 +88,8 @@ stdenv.mkDerivation (finalAttrs: {
     "WITH_SHAPELIB=pkgconfig"
     "WITH_ZLIB=pkgconfig"
   ]
-  ++ lib.optionals (withGUI && !withMapPreview) [
-    "CONFIG+=disable-mappreview"
+  ++ lib.optionals withGUI [
+    "CONFIG+=disable-mappreview" # would require qt5 webengine
   ];
 
   makeFlags =
diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix
index 283f6e8988c3..50f7936a9211 100644
--- a/pkgs/by-name/gp/gptscript/package.nix
+++ b/pkgs/by-name/gp/gptscript/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "gptscript";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "gptscript-ai";
     repo = "gptscript";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fLpSuShRqQGK3WaiJBJqgF1fjJSmnNMqkiJ50H8kTJ4=";
+    hash = "sha256-gwSi+84SmLBxeRyZZS6qlSdiA8gZUj4h2LnU6oXmfdI=";
   };
 
-  vendorHash = "sha256-jctYQD8HZ/1VQyPtipZjk4OFszHGcEUqNHTRw+fkDKE=";
+  vendorHash = "sha256-C9dksQ7Js3omL8RWdQt6cEEGbGHnkXdgpYou2oKNm0Y=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/gp/gpupad/package.nix b/pkgs/by-name/gp/gpupad/package.nix
index 7a4def555547..91858873a9de 100644
--- a/pkgs/by-name/gp/gpupad/package.nix
+++ b/pkgs/by-name/gp/gpupad/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpupad";
-  version = "3.1.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "houmain";
     repo = "gpupad";
     tag = finalAttrs.version;
-    hash = "sha256-eZ9RhFPk7eV5xmp112E71xOc55GFkI0G8WTvyjxqGsM=";
+    hash = "sha256-7WdEdVe2lkCDHKkZpN3QTdQtsVWXdcQ3tdKd8vd1xAc=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix
index 579f0b279f6b..fcd13b6d82a7 100644
--- a/pkgs/by-name/gp/gpxsee/package.nix
+++ b/pkgs/by-name/gp/gpxsee/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "16.3";
+  version = "16.6";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     tag = finalAttrs.version;
-    hash = "sha256-24kfNtjD4zV2eTufDErPDt2O9ON1hvhWOPRaPBCxxEI=";
+    hash = "sha256-7OUYDkBfj+7B3Uu4BAsxlJJmrI3PifWLilazqj5PBx4=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/gr/gradia/0001-fix-image_stack-action-target-type.patch b/pkgs/by-name/gr/gradia/0001-fix-image_stack-action-target-type.patch
deleted file mode 100644
index 8f5158ae756b..000000000000
--- a/pkgs/by-name/gr/gradia/0001-fix-image_stack-action-target-type.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/data/ui/image_stack.blp b/data/ui/image_stack.blp
-index 478bc8c..021388b 100644
---- a/data/ui/image_stack.blp
-+++ b/data/ui/image_stack.blp
-@@ -94,7 +94,7 @@ template $GradiaImageStack: Adw.Bin {
-                       icon-name: "sidebar-show-symbolic";
-                       tooltip-text: _("Open Sidebar");
-                       action-name: "win.sidebar-shown";
--                      action-target: true;
-+                      action-target: "true";
-                       visible: false;
- 
-                       styles [
diff --git a/pkgs/by-name/gr/gradia/package.nix b/pkgs/by-name/gr/gradia/package.nix
index 6085a4fcd847..1aa6761b181d 100644
--- a/pkgs/by-name/gr/gradia/package.nix
+++ b/pkgs/by-name/gr/gradia/package.nix
@@ -24,14 +24,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gradia";
-  version = "1.12.0";
+  version = "1.13.0";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "AlexanderVanhee";
     repo = "Gradia";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iYqMuqq2AmrdNMa7dkDUGg1+gCG7wL/rDEdWAPfcQnw=";
+    hash = "sha256-9gxxl59jceZZIja/fg7ygbhjcHUo4TEEnK/IzJLsRgM=";
   };
 
   nativeBuildInputs = [
@@ -55,10 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     tesseract
   ];
 
-  patches = [
-    ./0001-fix-image_stack-action-target-type.patch
-  ];
-
   postPatch = ''
     substituteInPlace meson.build \
       --replace "/app/bin/tesseract" "${lib.getExe tesseract}"
diff --git a/pkgs/by-name/gr/grafana-to-ntfy/package.nix b/pkgs/by-name/gr/grafana-to-ntfy/package.nix
index ebeb5534d5b0..498ef0b25a47 100644
--- a/pkgs/by-name/gr/grafana-to-ntfy/package.nix
+++ b/pkgs/by-name/gr/grafana-to-ntfy/package.nix
@@ -1,28 +1,39 @@
 {
   lib,
-  rustPlatform,
   fetchFromGitHub,
+  rustPlatform,
+  nixosTests,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "grafana-to-ntfy";
-  version = "0-unstable-2025-01-25";
+  version = "2026.4.29";
 
   src = fetchFromGitHub {
     owner = "kittyandrew";
     repo = "grafana-to-ntfy";
-    rev = "64d11f553776bbf7695d9febd74da1bad659352d";
-    hash = "sha256-GO9VE9wymRk+QKGFyDpd0wS9GCY3pjpFUe37KIcnKxc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ac0T8SNCDH9kQTKIfYn9KinnrSCYIBpNByO6NQ8UntA=";
   };
 
-  cargoHash = "sha256-w4HSxdihElPz0q05vWjajQ9arZjAzd82L0kEKk1Uk8s=";
+  cargoHash = "sha256-RuWXlofcruR69sg+RO2v1DBgxaPEyu8TeZEiZP7rBV8=";
+
+  # No unit tests; all testing is NixOS VM-based integration tests
+  doCheck = false;
+
+  passthru = {
+    tests.grafana-to-ntfy = nixosTests.grafana-to-ntfy;
+    updateScript = nix-update-script { };
+  };
 
   meta = {
-    description = "Bridge to forward Grafana alerts to ntfy.sh notification service";
+    description = "Bridge to forward Grafana and Prometheus Alertmanager alerts to ntfy.sh";
     homepage = "https://github.com/kittyandrew/grafana-to-ntfy";
+    changelog = "https://github.com/kittyandrew/grafana-to-ntfy/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.agpl3Only;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ kittyandrew ];
     mainProgram = "grafana-to-ntfy";
   };
-}
+})
diff --git a/pkgs/by-name/gr/grafana/missing-hashes.json b/pkgs/by-name/gr/grafana/missing-hashes.json
index a08c50062bc6..9107957eb5a9 100644
--- a/pkgs/by-name/gr/grafana/missing-hashes.json
+++ b/pkgs/by-name/gr/grafana/missing-hashes.json
@@ -51,26 +51,16 @@
   "@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f",
   "@esbuild/win32-x64@npm:0.25.8": "4bf57733c5c4c1409cfceaf19bf5b8ce3c9b9a29705bc8a24fc72652846afd0bd478b14a17db326ae27896574ee346ffb96b2fa043f0716d1a7f30b89f8b3855",
   "@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2",
-  "@nx/nx-darwin-arm64@npm:21.3.11": "b02f760415cfe1b4803d6aac8fb25dbe7e94c120b2d2d1313561fca92cee8519f826e4cec481268c7c574de892daa38353f1c7812e254239b5385f5d9d2315ff",
-  "@nx/nx-darwin-arm64@npm:22.3.3": "1f252a2295761b0e4731b99982450ce2c67b8e350e6e45690e134ae8d0b58666a8998a8559f4167462b314310446dba15a656bc98463490c42cd4f229c202490",
-  "@nx/nx-darwin-x64@npm:21.3.11": "f6f39817f7e409ff4234002a8bac75b8be58d366554c641a12da3d6311fb0270c9915dd29a35edb29e10834693fb2744242f524c87067f1d28ec757259803643",
-  "@nx/nx-darwin-x64@npm:22.3.3": "3ed451614243d0ff851cff9d4ba68cb3ec3525e0d8f2082238934b8405f5883897a98c162543c79988ed71edf73d9373a58fbb7f069e5dc0a13e20be075dcf0e",
-  "@nx/nx-freebsd-x64@npm:21.3.11": "07a997916a58ea581593cec985144beb801e508a15b924ca92d44d73508a7dc7104065a78cd058a606817856f66b47a53e08add8e68733ce9b86c07ab3484083",
-  "@nx/nx-freebsd-x64@npm:22.3.3": "637fd184ef86bcda7a9cf76fc85ae899b21659e194f84798aab6259f348020a21debcb0f87f799e71e4a147f1712ae15e436fcd75056c8f2ee6c33a49870f5cc",
-  "@nx/nx-linux-arm-gnueabihf@npm:21.3.11": "f0549860c4399bf589bd8e769889622f6ee2e3372c26173f45ff44ea46a832abd46ca8c53fa7d1b6287cc3d8e7d6ea78cf6bb5172d4ea92724f4b770d5aa3c6e",
-  "@nx/nx-linux-arm-gnueabihf@npm:22.3.3": "439e66be856b127a7921c9e60bcbb1ffb7024229f3ebc4df4f4749f361d52f80cb7dc91d96c63c2d6f48494418b9342142622dad5aa738fc8038ea1fa138cfd2",
-  "@nx/nx-linux-arm64-gnu@npm:21.3.11": "784cdb07b35a52110b7cfc8462292b497b87b3eaf7fecedb7f66d9da05ff9feb31d384c06950bc3c5c602fd35d637671404dcd2b1ca9ed2e76e6f52c0ff1b644",
-  "@nx/nx-linux-arm64-gnu@npm:22.3.3": "cd4a762eca51574254f61bdbd25438b692e96ab358bb2b68ea70338ed6d7d845691946e8f9c96f12e07730657bc5c4ef8f9ff9baf1e476fb8eeaef3a9fd64a48",
-  "@nx/nx-linux-arm64-musl@npm:21.3.11": "2e0af30c3a4cc91f79a1febd7cb2d1b3f082d4870207ad3790b35b2c0959ebdfac51c4104cbceba7b24d31589b57689b39fb73b9b8c114bbbb07145591cb27e6",
-  "@nx/nx-linux-arm64-musl@npm:22.3.3": "63f96bb2fc0c4886c13d949f945e18cafe03c612e364712103a3242cd9887c84cbf0ae54bbe5fce30cfa55ce083dc96436bccd0dac16d8d5a2f2e4b509da8aca",
-  "@nx/nx-linux-x64-gnu@npm:21.3.11": "ff67dffc04fa63f3df7913b2acb44536798652f999b9959e2bd553ec38dec0060d4f7e29f6a162cd21498e912a968d62ffab35ddea796c96e13a363174ce8ec4",
-  "@nx/nx-linux-x64-gnu@npm:22.3.3": "26b1ba111409c239bf4ef3cb3543e79898518fb780f94ad6f49bc04206735fa21e9d330df38b21e0879efb5af83ccf4953f781d8024c88482f157d1849f9055b",
-  "@nx/nx-linux-x64-musl@npm:21.3.11": "d1dc84080c92793ee1acfdbaeb63e5531ad5a79f5a0e5c3519530bebdadbe447c469e53463bf774199f6d1fe2c7bc4a674f6b952be81b09051d0ebda4b6f51ed",
-  "@nx/nx-linux-x64-musl@npm:22.3.3": "3c921a75e283a0c48a108a9d6523d0225955217a4eb412e03de71873fb1e0f7d35479bb16dfcd53093b5165bd345635ce8645e881fc66424b5cda44507d53bcc",
-  "@nx/nx-win32-arm64-msvc@npm:21.3.11": "62a7c4c02812f821a615f20164190f50330b18415fd68d80b1b5b15458ef16a9a0a0d14ce1a96326f1e4e9dbd317f1da8bee995e85c8aea43ab1b83c98f9699c",
-  "@nx/nx-win32-arm64-msvc@npm:22.3.3": "e2b06c38ac3cc8bcfa7187520c523c2d9c0b433c11df84751ada390b11e117a6d5fc32f47c38cb2d18156ad463eff4b904216e92ee23c202eaac142e334041bb",
-  "@nx/nx-win32-x64-msvc@npm:21.3.11": "c653c2b4fb8679986afac7443fc557264c9dd4cc22ee5db8f5c0e8d6516d5f4b3cc872a9a7276c1681248877dc46637970aa40e4d2e1fef0451d4c88c9c7b27e",
-  "@nx/nx-win32-x64-msvc@npm:22.3.3": "f08a7ce3bf06e0eece6916798f5b4cef26f4be035f395f6cb930a2f5d072e3ad307f8a7cfb1738255283d6c9a1b60bdfafb36040b9d69f952ec5d22bc6cf4cde",
+  "@nx/nx-darwin-arm64@npm:22.5.4": "003e36b1b5c7e97cb253133a6a978d59edd2d75d4d57202169647ed8efaa052ea6b8025d79aefd6eec119b18423a3d6fef96c70e73a33a9a53134a64d25a3a4d",
+  "@nx/nx-darwin-x64@npm:22.5.4": "e23cd9122715c8089393ead47a0ecd0948437c10fa4cb335fae237cbd984a7e464089bd2adb27837684eddfe0e5b0c469a069a8054d379b552b3e22d2799cb9e",
+  "@nx/nx-freebsd-x64@npm:22.5.4": "1158a781e28cf886e131248ac1a70581578e51788eac92fd972938d21712085aed97116887bb687c7493548f8baba833f7baaefe9a96ec58515b9c5f2511ac14",
+  "@nx/nx-linux-arm-gnueabihf@npm:22.5.4": "947bb1a2fde49c32005b86bc8ed435db5b3a7de481da3a9769c91be9d7046908a1552ee12548138134a64ef36d7b1d37618fef3c01951532527356eae9ba7765",
+  "@nx/nx-linux-arm64-gnu@npm:22.5.4": "1873a9f9ddf02615d65ed985ecf25ad40fae0e0abffcf00ad4275f0d87bf52283c8029d7890782f436e76086065cf7ecd56d5198e90b0220e81b8dba2aad9c11",
+  "@nx/nx-linux-arm64-musl@npm:22.5.4": "bb9a637a2932d2457d8c4e8c268cef8ce0bdb63268dd444576b210e6084cc17b01d93d45e1900d741e2ca4b1af64becde5d27b1b0f365af83f8f999460ca874f",
+  "@nx/nx-linux-x64-gnu@npm:22.5.4": "3a880c441e6a057cb0e0db4141d87a1102d9995f4b81cc4eda9f9ef14c2c470dd726c689775a98741929b84dccf2efd6a64e0fac8e4aadc0b3711fad32ed92a5",
+  "@nx/nx-linux-x64-musl@npm:22.5.4": "f2be6705e8203c0db17e5fc900f609de160052617075344429d5fa6da3a0f13a90ac654e90124df6100d7b2cde62acb84d9981d791eb8c494098896c19762274",
+  "@nx/nx-win32-arm64-msvc@npm:22.5.4": "dbef169673a327f5764992da802e4adb4252d35ae8d708bef87b6f321cfb989165d2be80d35021278cbcd4243159cdd149be09519d8f694e9775bc6cbf46297d",
+  "@nx/nx-win32-x64-msvc@npm:22.5.4": "8071d2641f0959957503e353fb6fa4357910fcc3eef403fab8400d8363dbbf959d8f0c225475516e903fc32cdd5389fee7c36e784d164620cb67632ccc944797",
   "@parcel/watcher-android-arm64@npm:2.4.1": "279ac643abaccb2f9c986f35e39478e242b33bdda3128ca9e728ca1429b923d5f1bdc22268946138b0ced130ac3b2294cf2a44ff080b27c06a79062a5bbba13c",
   "@parcel/watcher-darwin-arm64@npm:2.4.1": "312fd03aaf7e75824fb84b6b99649caa4db01d55320320d88fb75ad5151bd24876555ae19fe8fdf81f92952bcf01e0a82db7c3bf540e54cee5beb20b85a6a80c",
   "@parcel/watcher-darwin-x64@npm:2.4.1": "47d8fd40e17e419459294b75c455ac7ce2a53dfcc578f2c2ab0fb0f59ad1ee6a6e87b6ecb92708139f48ed8568ffdd675fe5e57ed1468abac6a2a650fe490926",
@@ -83,54 +73,59 @@
   "@parcel/watcher-win32-arm64@npm:2.4.1": "a1395a97d1373dd7075da7234af8996302e45cb9d2507633a0f8188c239e8121e63842dded6fc13613986e0833c88435a8750b3c6b35d86b9e1af2b97430b940",
   "@parcel/watcher-win32-ia32@npm:2.4.1": "05a294e24923a02febe852154d8f8dd75fdeb53db8522c3bc87860523f1dc70d41a7507318b3ac93a24feda44526720dba2f1a7e0e20de7ca815c7dd175e3c11",
   "@parcel/watcher-win32-x64@npm:2.4.1": "28dc8dc547c4ef8b24193356bab99c4e5aafb2c8097e2d06b875c2ce4d767a9034ff82fbfac34a86fd331f8daea91a3aeee5c179ed69120c02e035f72dd44877",
-  "@rollup/rollup-android-arm-eabi@npm:4.46.1": "3db36af320f1b9e55faed805583f05ac7bff150c1b350a5bca92fe1930acd692da09aa88e118da623ffe507c6392bff3fc093ce0410017d06584904a60cfd015",
-  "@rollup/rollup-android-arm64@npm:4.46.1": "416acc45eeb6d531aa71a9d88faae1c10d885e91e8927a11db2a42627443740e770588041e14bb775cbf9ea2e66193b6a5c73919743799d0a73b19cfa080b809",
-  "@rollup/rollup-darwin-arm64@npm:4.46.1": "4ae2fdd07446b185ecaf00c867155e48b61a3efef8bfabc3a9e89ce78cf6fc1552f5c276679dd95f03b4349805f10c092fc1e8c158bb2a935e4788eb5797dae9",
-  "@rollup/rollup-darwin-x64@npm:4.46.1": "92362936476c92519f39a194fe0767b8c000f6c6ff2eb910cb6cfd4ad6980a18624f368a1a286238c3fb53cb4842ab11d47bbaabfa9420d5f34ea7895b6fc5a0",
-  "@rollup/rollup-freebsd-arm64@npm:4.46.1": "ae52a9906031e98b23c4c1ea4838f3811a6a1458665f98243269e2231c087ff8a20987726209ec9b54f90bace9771a4f7209c4d7493015dc8104f2e7d62aeb84",
-  "@rollup/rollup-freebsd-x64@npm:4.46.1": "8aeaa25e652a3409cbed62a5be329824886512e4997b779e6da5413240024ee4f77f0cd75d9c8e35e2706e79544b505421324b467d91ee3fff2f1321ce0c4240",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.46.1": "27baf0800307cc82f5ba3388f730553d4c30e4cf77dc59c5b90f86b68c9c9193467a37bec64822582a16f3ab59b6fc9c3fe8f6d6d399912a53a3973618583b76",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.46.1": "8d74daffca58b5e9599ee3643fbe0cde61f01fb54c890ef25a641e11d23403adaa6374bb4e7f520daeb181b3134bed0c159d25f0aa933ec4d66c43b703b75c3c",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.46.1": "dc6e777c7fde0a4ec99343e34bb533358af730df0060ba40446dd71fcf83322040aebf6661bb4dfb86f31873d670c42f80fb492ae58e0a251ef510b86566c8cd",
-  "@rollup/rollup-linux-arm64-musl@npm:4.46.1": "2e1d5d58788f6d9499ef0db653eba8d4de2f29acc1fc6767436122d2d8d67e1516cb5b958b3136f347bb8f416e147bdb92b7dd02a712b1ccb7802a292544c972",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.46.1": "f434514fa5153838cb5d019b1463ac82f2f843e7390220e6567cba9516d791997fecbe6b9242756328f20898d4be6726f7f2a9fbba673b9421300026d9a1e857",
-  "@rollup/rollup-linux-ppc64-gnu@npm:4.46.1": "6a64579bd64e247e1f92cfe8144669dae803b057913bee580735237e596d54bf70d5abaab3f47916df8db30a0c412b8e7c36b1f679332215239ba63f96f2c7a3",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.46.1": "aa52a1bf36877db538a57a94943ce66cc897df5a3ef130a2659b20aa3172c0f41d58e9a7a93a35fdd8ae958fcc261abe3e2d2819353ff5e84cd013466a09950e",
-  "@rollup/rollup-linux-riscv64-musl@npm:4.46.1": "68f4e4548384fb2c0c9d5f5c33bea8bc900cf3507b6b550d8fecdcb6faaedb8dbf1ae6c4fe55600944d6ef799e8a5aa3dfc7df9055ecd2046455c3e2a9e359d9",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.46.1": "830338101f2161d450ff6faf3dfcd9f009a36c884d4e2e71a20975a5d6fc459d1c560ca68cb5291f983f497b4cbfe8d0bc5afbd5572c6c6966f7076cc3ceac76",
-  "@rollup/rollup-linux-x64-gnu@npm:4.46.1": "58fbd1ebf407f9473878a485b1c1e6d3b379346c3b90f53537a2809584cc4907774c8736ce25c9b41960a278ccc813bb052e6246445d1c8c2e6c809de2fc924a",
-  "@rollup/rollup-linux-x64-musl@npm:4.46.1": "7d7a795ec3f96030c62ae9f4bc59c4e5367de13588fa27e2813787b69b9366706c1b200ef5cdf80c2a3b5b684e5a2567e0b9c293d2a5841fa11b63f57190a3ea",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.46.1": "eb0203af6adb0b38bb6ffa9cbe64dc95acf92908498df0254df15d8d1f16857da44a584729a8f7a9f2e608d6ec8e2716132186bc27349752b1c049fcfb95ee63",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.46.1": "37956d2acf2044b1ce45826407571155bdd3cd1f81f8dccf0e476021e4ec05aa0f940b2e81267a76d0d538a766d022958f67eaa12ec807b26bed0591130778f2",
-  "@rollup/rollup-win32-x64-msvc@npm:4.46.1": "2560ef23f34fd4cb86fbe61366e339509b3c94b1e823484cb601e5913d81667de3cd10b6dafa84bc56b1376861f84b5b518a9158beaff13df72bf67291519f88",
+  "@rollup/rollup-android-arm-eabi@npm:4.59.0": "b2c5a1b261311a80e412c747b1f8644d43a472d6d45486d19becd78a1a75ec87422199783ac23c1178a7e94c2924be730e822062fe040f4dbc0093e6695ca84a",
+  "@rollup/rollup-android-arm64@npm:4.59.0": "5eb6a5e2c73348d2362e1df2b6e7b7eeb3c86ac12e7a1dcbfa435e5cd0d35771d6da7c319f60934884b1a8168001d2882e99c14ffb68916e419503fa4da13c8b",
+  "@rollup/rollup-darwin-arm64@npm:4.59.0": "64b5aa35d5140be4f0df2726485a3d375fccde2279f6aea82d8d256a7325cb6094eb01108a5aefd95b295bff25010447adf1d849b496fdab911afc5807866eb1",
+  "@rollup/rollup-darwin-x64@npm:4.59.0": "b14fe9c114130c89baaf807c2a69fd4962d0a6eb5464ab6a846b2ea023a63e4e3eb092c1cd293c13c5867c61ff09f01877294755a72c202ceaf0e497316ba954",
+  "@rollup/rollup-freebsd-arm64@npm:4.59.0": "1ce79859de5a6e48c162268cf8a33deedc9a318cb6229489f705bb9fe3903b39c91cdc2529b65d09b57c8862650c0eac350df80f1b798c86f7abd652f3d44179",
+  "@rollup/rollup-freebsd-x64@npm:4.59.0": "751dd34d4aea1521f4671aa0aa1377c0f2cdf82b04c1e14c24778774298b0db6ae58a7d574a0802ccefe8ad0631c4f1b4f6a8f88729520dd20a2be313045523b",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.59.0": "6cc3a24c867feec15fe90d23920a480e95ff7ed216e57e258574dd4180086f416711724438cab144f132b4537a9d1728bd6866989a88d43c2de87a9036ef8550",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.59.0": "59022fc0788e950c15c9461a0b9b2b6e48fdf20678f97fc7c63e39c97c3200674f6ca4570eff40582e14be191361da8400c217e380a94a728d2190cab7443056",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.59.0": "78e80b5c7d01a30f4d7adaea126dc376021291d8328224eed9f29a0ff4f82ec2168afdff03d7fc5c4e4c1cb57c4056e8bb1007c5d3d5b2ef07f148130890ff2f",
+  "@rollup/rollup-linux-arm64-musl@npm:4.59.0": "35c6bda8aac1cc017b5a0841f9d392d9ba96379ac871593e9b7864a34356b1074982d0a0f7ee9d19af28f252ceeb61c026541b57e09c147c7475ab7bf1c5f6e5",
+  "@rollup/rollup-linux-loong64-gnu@npm:4.59.0": "fbb0cac0c248e465c32450cd3d369eb24cf1a75bded681a58cf99d1652b60ac5269ea6d619da429e5589360563cf6c6d879f940e3f436d8c283c957b49dace03",
+  "@rollup/rollup-linux-loong64-musl@npm:4.59.0": "39c1ef5d7e36bd84386cf8e50a7b26fabae26a7f819e481489ec8cba6528e6ae00d93e7d7aa54dda83a3166842e5e501edc1f743d31be4c971d2bb5e16f8ef90",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.59.0": "885029215e74dfd8a0afa747f53c597962c4186bfa16b86b986d85a3de460b177e1ba38f9823d5602f972dc33720a1a7b84a0bb441cc77aa2cb2b988eb90f3fb",
+  "@rollup/rollup-linux-ppc64-musl@npm:4.59.0": "6785e3d207e63b8f840da35b738b00090d20f85186ebf2654bd891556f970398847d3abf9b1ae5cf19aa098de8776454cd0b42b78e75d1142532051d6f9e9a58",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.59.0": "9ccfd99174d06ba523cad217068d527a6667a770e0332abc1f55a64b02fd09e586e542ec8731702888a771477257c00b6334911d72205093f1d10fc1baaec9b1",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.59.0": "3a1ebc6fc9683a10e8c5d4e0080897bc247a7ba52aa39b0f586e80b92cefaa5bcb570c0dcf1475b7ea87a44dc551524d7ab9f5717e6ebdf85a55d7d4447dbfd3",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.59.0": "df4cf92ef58379fd530ae14363bb8547352bf9c65ef68f6f01b6f4a1bcc558d0c4e2363361c35cb1627a2d87f30c579126dda1c91a36efe81e1002d26304f2a9",
+  "@rollup/rollup-linux-x64-gnu@npm:4.59.0": "fd48952a450a7c3f117445694878ab99941858f6c40920aef34678dea7880213af504ef490cdb269e038efbf5a497d4aab3cbf0a785ffcb0ee9bdc3b73e9c0a2",
+  "@rollup/rollup-linux-x64-musl@npm:4.59.0": "58811bbe6e78b4b0cce1b2c9f84768fe16bef8784152f01aa3e6479a92ebbe377cdd70c2d676cb5df93d62139a94eb0b5082f68347d57f2f364cc50cebc0a3b8",
+  "@rollup/rollup-openbsd-x64@npm:4.59.0": "f21f3d73b87f5298fa1d314d2d344319d55d9aea777d9551b5ede0176980a406a6e48b1f08ade1dd96e993460833a282b3abdce179f75af45d12b58ada8a1aed",
+  "@rollup/rollup-openharmony-arm64@npm:4.59.0": "b2eda04dd7fff48ca968a6a7a166aef4082cbeb2d1c41e45fd9824c80babc483ec86f6ed6e3b70ebeeedabb9f0d99cc611959652e87f6beaa9eea3c5d7691ae8",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.59.0": "656459997e6f192387a29e3a88e734f981db1af6e78c1ed857e3596b46d361398e47ab390774d2bfee17e94aa760dd16a0448fa868f3f56b5f639eede29345c8",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.59.0": "f0eabd43696d0a25bad55194bc0363ded364674ad0c1dd117d1e3fafbc4d0f077a2c60e81d756baaaa0859012949316d204c67b14c9f3ab8a80c9ea76983fc95",
+  "@rollup/rollup-win32-x64-gnu@npm:4.59.0": "c39d866bf3305397b1772c0ecc4d7bc9b9b1f0240d4425f1e938d4aaed206d8418d5b6e1e11608e7c4c4258cd723f101cc40e8beb1758d163adb1b6cd70bcc35",
+  "@rollup/rollup-win32-x64-msvc@npm:4.59.0": "34e03ac4acaf58e756ab0aec133d28c1cdcebde173e20a471f3f66292601a2a0c9b0bc2a24023ca30162ce039fddcc5c0264789d9f242945de169646b752c7cf",
   "@swc/core-darwin-arm64@npm:1.13.3": "02e4c06e113dbf57a560c04bdfb0d9abc9eefbf6277a19f8f78fb42be710defd41bfd784f427a94dd23b371ce5c604a8cfae92509fef213c9de427ab3e64b25d",
-  "@swc/core-darwin-arm64@npm:1.15.2": "811bb38ede1d92045c3c84169f7b2202bbf7caf2745d26cb9b141cb188465dd94a700733b0d9dc8a97590d9ebb1a92ef5ed40346d3fac7f88832365cca5d2678",
-  "@swc/core-darwin-arm64@npm:1.15.3": "0348e8301b4105309817952cb0242f42d82685b2403b4381e0a771f4c8aa9a1b9917dff9545505f902fa5be0e3a9ed46d6bece251673b7864c96a6e6f770936d",
+  "@swc/core-darwin-arm64@npm:1.15.17": "5699f18e1a03441a625d9304913f5cc4ecc0a348817e5527ed2463261da3b868e21e60a0f76c1d8c032d0aa95da3b745ea92683b57be85a85d0073bc889f8f42",
+  "@swc/core-darwin-arm64@npm:1.15.18": "1597877545538954d6445a21f4a102766f098aa2b0d55ded3a766993b527bf1bae9bca54e50e3289b8f6a0cdb42b550f65da38564340d954690df15d2e27f56a",
   "@swc/core-darwin-x64@npm:1.13.3": "39ed8633b500b8a32fd507c0a57ecbaed1d4840d75a1dcee9d8cafe36b378029299d9f5552404230800c186b7b972dd476401d7c216cb16f2d87c5f95ff8c58e",
-  "@swc/core-darwin-x64@npm:1.15.2": "b0fce366539c7daae5aab6041f10e9e70a767b277fff0f6ad3fea09b46d95f0208961ce1c6a0a55486718a3997ffa8dc38bd03030faa09395f9261792a42752e",
-  "@swc/core-darwin-x64@npm:1.15.3": "80d2159159976ad45256a6d2315747cf077f202fb1f1af699f2a171b31b330f7447887e3f7a5f0d15fe65a660f92d390f92fc21bc8a86a5e6554687114079cfd",
+  "@swc/core-darwin-x64@npm:1.15.17": "e52ead49ec28a4f5799436f222298b923566516a015caa667dac0a6e68c3a1d102a944e2f4b328a8ba731b3b2098453ad4a3359fa47113459ff8172ab3d009ac",
+  "@swc/core-darwin-x64@npm:1.15.18": "326b8c3309c303a53bf4ed6afbfb0baee0acdb527253e734fe5cefc6916cea598d75fb508265e482143e92fabaf2cacfe9e3a30301ed527c32a727f998a65239",
   "@swc/core-linux-arm-gnueabihf@npm:1.13.3": "d3889724b5b787db220a65424b5e5e4b2a587f658582905d5a296e8931f30bd42202c356d05d650cfb649984884b05e1513412edaf4ce97c7a055547e3d26fd0",
-  "@swc/core-linux-arm-gnueabihf@npm:1.15.2": "b55975abf42d5af0db4a149ad5e8a4935619473517acfccba978d90a300f5d97c4b883f2c3fe95bce57be36b0f0d21ad889a681f492e9e1338a87751d9858602",
-  "@swc/core-linux-arm-gnueabihf@npm:1.15.3": "f51347e0223a2ee93e2f55f7c054b9ec133591abacd36ba78ecbf1deb83c7b7f19e33a288cdb018c3192289e644bb664df0a68c9e704cb65f4655afd95cb6641",
+  "@swc/core-linux-arm-gnueabihf@npm:1.15.17": "eeae5f54a2a051fdbe45efb5b21aa08c5646afd9d5032e0388f1d55b1ecad1ba4fee27546ecd08a1076f9ae290451f73633405ea0782241e5c69294613eafdf0",
+  "@swc/core-linux-arm-gnueabihf@npm:1.15.18": "0d26738b4675ee1ff5b0322295c947f351e6d2494303248971b601e2fcfd666a17357a030f0a745e11b60065329652daa58db44abcfc7620f2da8d92733dd0ee",
   "@swc/core-linux-arm64-gnu@npm:1.13.3": "9ab7ed4e31d4dba8df4b25109248c0225c33573a0046ef7380449fe348a9404dcf4115320e649ba5b5476a38a12dbc52dfe534f7dd7ad92dc5995e9aa9513dba",
-  "@swc/core-linux-arm64-gnu@npm:1.15.2": "6345874a4385e8a1793a2c80b1e20e7883faed348e118619420c58cfcf6f7106ce76b179c10220f8fdccfa92bd5ca45c3749bc2e36075e8684b58df367a714df",
-  "@swc/core-linux-arm64-gnu@npm:1.15.3": "43521ed4c9cf545f32c8b20e3e8d7dc13574d7af0d2d52a4fa53b0d98082245efc14ecf7c336cc05ecc1ff20ab5e7e438d35ddf817d87d0d6957adf69a70c33a",
+  "@swc/core-linux-arm64-gnu@npm:1.15.17": "56740456ab0df1238fab445a363a1cf4f29422710c67011efbaaaf17fa3b2260c731489836a80a84e75b8986de459251b60082e5f91ae42c403d704921771365",
+  "@swc/core-linux-arm64-gnu@npm:1.15.18": "96aa824334204b6ae8a9c337a745a64dedd4913331f313561eb9544b853e142d9a933230d06052eb677cffbed0b1c961389f1d626936a9b5fad6400ad254229e",
   "@swc/core-linux-arm64-musl@npm:1.13.3": "39ce1201862d2368ed7a89a9f1960bcbf56da875c353da720894bccc75110d71ab2cb7f99a252518f96e678c5dd42ed2e1a588bf343e175f41a532785c03ffaf",
-  "@swc/core-linux-arm64-musl@npm:1.15.2": "7b1d51d7f566e42b178b49dd8dde9d630afc6e5d9cf89dcee1af39ad9c1016759e9cc5da37b58c52df50801c3a410edf0c00cc1a7f7ac93027a0628b5a5d05f4",
-  "@swc/core-linux-arm64-musl@npm:1.15.3": "c9d9a5847ca3e58c67fb906294e31b01e5885c5669ab57c645bc9b3707b7f6d2e6133aded89ff321c633cc632f6fe163a127739f0af8b976e3a18c06b55949bf",
+  "@swc/core-linux-arm64-musl@npm:1.15.17": "c2c63181909bf180c4d57c60eeba7eab30680ff65944c7f76f4e89fd615acb68b3fc5aaba485ee63aeecefc183777261480eeb1de03668f5be43a28001190021",
+  "@swc/core-linux-arm64-musl@npm:1.15.18": "3781cb4bfce767fb85506a69bc6fb7745ec53be2a53735750ae88f51c3d6803725a3a906cb954888c529e7f675d3ff0f746bb22c646f1ac2caebdc2be64a852e",
   "@swc/core-linux-x64-gnu@npm:1.13.3": "9e7edee322efd9b35a62d8507300adacbbcd53630a26e935cee8ede5ecf8710fac1ae60ce490cd2d6297d27196d8202a9281b6193da223689804ef9afab451c0",
-  "@swc/core-linux-x64-gnu@npm:1.15.2": "5e888708763bbe3ddf4e7c4f6de75247ca3eede869fc7964999c7e950ffeace38e36f50ffd67e4644055913a0af5d18dab895c701cf94c83321a48c31044d26b",
-  "@swc/core-linux-x64-gnu@npm:1.15.3": "a3a0249485d79867d7faac60f896c6354e2967fa1d0a9b1dae4ccd465ac16efb23fca28cf37147926070fde9f611f9b497b44b84788b3a4bb9bb1b6b3056b34d",
+  "@swc/core-linux-x64-gnu@npm:1.15.17": "69321e9b263f07d11f98e389d8f6b94fdaabaf91adea24ccbe25107a75a7b348dafbffa2746aee1caeea24d0b3d29aa5d8d160419fe36b986a5a6350f1068d30",
+  "@swc/core-linux-x64-gnu@npm:1.15.18": "26f6fe774e88f8d58a48c18666eda6345cd7064cf065f02eae683f6eaac3e345a5fdbef22a8b3aa7069e332fe95c4b496cbab438bc2b474a9fdc8b37a616be0a",
   "@swc/core-linux-x64-musl@npm:1.13.3": "89f256a8a7da0317cf0b504846cf6d077695b7f86f3cb85e727deedcc82f00fbd42c36e5ec6ff9ead3a2ab1fda748b4d3fd59d93420b6abd3629e902f5a34828",
-  "@swc/core-linux-x64-musl@npm:1.15.2": "aadabca760a39a4f4425b83557a836960998d250f7c0b5e3d8104bf4e9597cb00539d89461678dc592053d68dc0bfa4da64de215b5af74890cd1d455dec90728",
-  "@swc/core-linux-x64-musl@npm:1.15.3": "d89eb33661355eb7ed519672c221099b6e4feb326f8685fe58f9a222ee115974c320d9746d1d66d561fcd1934c0f35944fff9a56e7b16aea83994ef78da5605b",
+  "@swc/core-linux-x64-musl@npm:1.15.17": "d02f7e4b55f2b22bf042093aa9c45356e851845a0ad8b87ff967033b6cbe474c196f03f2387ac9154a10988943674bbb80739a1c7ecc8a79fb174431bc5527ce",
+  "@swc/core-linux-x64-musl@npm:1.15.18": "96b5bd1bbacebbf806f9a6a02698d68ba2a677ce86b5c2d7a92ea6083b40d55a0a84abebd16b5afd7a574e727b8c19e9039315e8ef40f6c852bbfaee26f999cd",
   "@swc/core-win32-arm64-msvc@npm:1.13.3": "18929504fef4c53a191512a9bdb5384fe2ef701f4cf43927aaaadd8fab199cf5c970f8ca48b9533e8190c4a88fc514147beb17768cf5232055b6ba075457ae09",
-  "@swc/core-win32-arm64-msvc@npm:1.15.2": "1c009bc927578943b5e08f43ef69dd6997545feeaedacc7fcd415e5a6e7d669186f0591f1e3617b0218a67567216dfa134d77c133a75f44c8f11f44d52c73532",
-  "@swc/core-win32-arm64-msvc@npm:1.15.3": "85de0d2c97997827d50ca0d1d78ec83d26dd66757795c6f694b663e8ef8f58506f8c67d515316553e467749662cda46ff7371415540c5e14401425b3f033c2d1",
+  "@swc/core-win32-arm64-msvc@npm:1.15.17": "32f56af42c1ae67467479f72d9fa12c83d0242abf92dc79b001ce570341297e2e24b66682f28b514c6ac4ce794d426a599328b4bcb35c719cced967a4ccafb46",
+  "@swc/core-win32-arm64-msvc@npm:1.15.18": "3a170183da529015301e48bd305f9ea1bcbd38259ff25f1f6e778ee4bb68fda44552c696f067005729aa77407295b1388717a31d9429844725d7ee29645bde82",
   "@swc/core-win32-ia32-msvc@npm:1.13.3": "0b7d5fc610de99bd24e0bd5430569e5b71dc0e2660a6e17aaffc7671ed0474a5a18096ea23acb83aadaa287fef5ff4c245a544c5ba38cb498ac4d843f7ca2256",
-  "@swc/core-win32-ia32-msvc@npm:1.15.2": "88e9beeafa768fb212a64b0652f66d2aa2f6728a0309ce6f8962200d65ff370638578f13b783a83d499e91ffafbfeb9160b3a5fb37521d1120b506e9ddf1e89e",
-  "@swc/core-win32-ia32-msvc@npm:1.15.3": "f8f82ed4a1e598db4b5627519c045fb1915e6fa09b80d8e374f4694e9a6c5590865530a80291d8068f4d60258ea2dff19cd74fd65627ac007fb979976481b328",
+  "@swc/core-win32-ia32-msvc@npm:1.15.17": "538f8276536cc51d790cd2f2b84e501f14796bba1bb96a09a2e4cb556efe90c8f525d42a8bdb79371b30c9a34ff32836dac34aef18fc70208ffef9a3f689b067",
+  "@swc/core-win32-ia32-msvc@npm:1.15.18": "a950c9d1d6338939734249ddb766c495e86e05509bb6a42f58d2713d419d4412c06fb0c11c7711c6612ab3e74520a8c1581449340aa3f4fe26f71c53675f37b4",
   "@swc/core-win32-x64-msvc@npm:1.13.3": "632eac6a4997f4299e710f8be1a1d6df862a852beaa3b30dc1dce9ba5acd128d6e93af6ce64f8b39e4c37318b254f4f10d27ad5df1cf5bb493de39d7f205d1b7",
-  "@swc/core-win32-x64-msvc@npm:1.15.2": "df51454cdd0a5ea999d267a3230e9c51daef93f0fefec3c3aed5d3f8c8409f89514971edb99270fece2e3342bccf3c55a28a32a87e5cd250f25c2410218ddb8f",
-  "@swc/core-win32-x64-msvc@npm:1.15.3": "c6a910e3064974cbc1d2628999be54daf624c4d1f66cb5ae82de6ad9e703c608f4aeeeb50d4d97db93f2551528554982267c2b1783260a7a3fdf026d5528a83f"
+  "@swc/core-win32-x64-msvc@npm:1.15.17": "e8636df1516b3ab23c6eeb156dc0f97014d3a77af071f035876b3185fe51bb4172de3ac7976a4270baa8bd9b1cd58d488ee4ef176e0804507593c687c3276947",
+  "@swc/core-win32-x64-msvc@npm:1.15.18": "68eac0d5148e7326b748a0f0adf44bffcfb1d0c78e366448aad9859eda537941391ea95e1863118460a49a58235ce9791ae1b20afc04a034677167e6ea43a5e2"
 }
diff --git a/pkgs/by-name/gr/grafana/package.nix b/pkgs/by-name/gr/grafana/package.nix
index 7780918825af..c44a93d6695d 100644
--- a/pkgs/by-name/gr/grafana/package.nix
+++ b/pkgs/by-name/gr/grafana/package.nix
@@ -21,7 +21,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafana";
-  version = "12.4.2";
+  version = "13.0.1";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
     owner = "grafana";
     repo = "grafana";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cA+SLXry+aomj3O7ShiVOCkZVMk0XLq6EmYuOfi+hyk=";
+    hash = "sha256-fGRvCDIOQcF743SimatyNmX0gZtO0tvgEAFuk38rl88=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -49,12 +49,12 @@ buildGoModule (finalAttrs: {
   # Since this is not a dependency attribute the buildPackages has to be specified.
   offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-dbYgn1hB3xe5KCFyLwO1Xe6YJ2vPl9xymnx4i42J0Dc=";
+    hash = "sha256-5aInVAn9UMGp8U+LEIR1D19RI9vKVrNpt5Frbr1sBJs=";
   };
 
   disallowedRequisites = [ finalAttrs.offlineCache ];
 
-  vendorHash = "sha256-q+AFeXM1NQB4WVGiahiVRiXAhLNMa/H9IL3kv6Ybl+M=";
+  vendorHash = "sha256-PEGgrkTguHvqrclzvZDQ7yk6rwTKDLXdUSjeaQFnYtU=";
 
   # Grafana seems to just set it to the latest version available
   # nowadays.
@@ -172,6 +172,6 @@ buildGoModule (finalAttrs: {
       "aarch64-darwin"
       "riscv64-linux"
     ];
-    mainProgram = "grafana-server";
+    mainProgram = "grafana";
   };
 })
diff --git a/pkgs/by-name/gr/grafanactl/package.nix b/pkgs/by-name/gr/grafanactl/package.nix
index bbe5e66d90d8..69a75b74f693 100644
--- a/pkgs/by-name/gr/grafanactl/package.nix
+++ b/pkgs/by-name/gr/grafanactl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafanactl";
-  version = "0.1.9";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafanactl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TJoTxVKfG2mfV05pkAxUJR7NKZbD9VIqRW4H8lyP2As=";
+    hash = "sha256-tlSV7yhk5ByiGm39IGo/PZHuHtyyV5QjHqDB5w3UWBM=";
   };
 
-  vendorHash = "sha256-zEE4iaZJBneYgo6avCOTG7tWZ88NDskPTYiCMb8pRR4=";
+  vendorHash = "sha256-DOEByenSD4BCQuyyLQvJxC7/UkPmpHZemMEKZbOwLbE=";
 
   ldflags = [
     "-X main.version=v${finalAttrs.version}"
diff --git a/pkgs/by-name/gr/groff/fix-underspecified-getenv-prototype.patch b/pkgs/by-name/gr/groff/fix-underspecified-getenv-prototype.patch
deleted file mode 100644
index 663f81f41c93..000000000000
--- a/pkgs/by-name/gr/groff/fix-underspecified-getenv-prototype.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit e49b934b77a76443005f92a737dae7370b50e5f7
-Author: G. Branden Robinson <g.branden.robinson@gmail.com>
-Date:   Tue Jan 23 19:39:03 2024 -0600
-
-    [libgroff]: Fix underspecified getenv() prototype.
-
-    * src/libs/libgroff/getopt.c: Do it.  Seen when building groff on a
-      non-glibc-based system (clang 17 complains).
-
----
-Link: https://lists.libreplanet.org/archive/html/groff-commit/2024-01/msg00103.html
-diff --git a/src/libs/libgroff/getopt.c b/src/libs/libgroff/getopt.c
-index 6d4ee5b3a..77f8da1ed 100644
---- a/src/libs/libgroff/getopt.c
-+++ b/src/libs/libgroff/getopt.c
-@@ -124,7 +124,7 @@ static struct _getopt_data getopt_data;
-    whose names are inconsistent.  */
- 
- #ifndef getenv
--extern char *getenv ();
-+extern char *getenv (const char *);
- #endif
- 
- #endif /* not __GNU_LIBRARY__ */
diff --git a/pkgs/by-name/gr/groff/package.nix b/pkgs/by-name/gr/groff/package.nix
index 63618b440fbb..98a75751f925 100644
--- a/pkgs/by-name/gr/groff/package.nix
+++ b/pkgs/by-name/gr/groff/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchFromGitHub,
   perl,
   enableGhostscript ? false,
   ghostscript,
@@ -17,6 +18,7 @@
   iconv,
   enableLibuchardet ? false,
   libuchardet, # for detecting input file encoding in preconv(1)
+  enableUrwFonts ? false,
   buildPackages,
   autoreconfHook,
   pkg-config,
@@ -24,22 +26,28 @@
   bison,
   bashNonInteractive,
 }:
-
+let
+  urw-fonts = fetchFromGitHub {
+    name = "groff-urw-base35-fonts";
+    owner = "ArtifexSoftware";
+    repo = "urw-base35-fonts";
+    tag = "20200910";
+    hash = "sha256-YQl5IDtodcbTV3D6vtJi7CwxVtHHl58fG6qCAoSaP4U=";
+  };
+  nativeGroffBinPath = lib.makeBinPath [
+    buildPackages.groff
+    (lib.getOutput "perl" buildPackages.groff)
+  ];
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "groff";
-  version = "1.23.0";
+  version = "1.24.1";
 
   src = fetchurl {
     url = "mirror://gnu/groff/groff-${finalAttrs.version}.tar.gz";
-    hash = "sha256-a5dX9ZK3UYtJAutq9+VFcL3Mujeocf3bLTCuOGNRHBM=";
+    hash = "sha256-dOKBl5W2r/QxrqyYPWOpyJaO6roqLrp9+LpMe0Hnz9g=";
   };
 
-  patches = [
-    # Backport e49b934 "Fix underspecified `getenv()` prototype." for non-glibc systems with C23
-    # This can be dropped in the next release, when the local getopt implementation in libgroff is removed
-    ./fix-underspecified-getenv-prototype.patch
-  ];
-
   outputs = [
     "out"
     "man"
@@ -51,25 +59,19 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   postPatch = ''
-    # BASH_PROG gets replaced with a path to the build bash which doesn't get automatically patched by patchShebangs
+    # POSIX_SHELL_PROG gets replaced with a path to the build bash which doesn't get automatically patched by patchShebangs
     substituteInPlace contrib/gdiffmk/gdiffmk.sh \
-      --replace "@BASH_PROG@" "/bin/sh"
+      --replace-fail "@POSIX_SHELL_PROG@" "/bin/sh"
   ''
   + lib.optionalString enableHtml ''
     substituteInPlace src/preproc/html/pre-html.cpp \
-      --replace "psselect" "${psutils}/bin/psselect" \
-      --replace "pnmcut" "${lib.getBin netpbm}/bin/pnmcut" \
-      --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
-      --replace "pnmtopng" "${lib.getBin netpbm}/bin/pnmtopng"
+      --replace-fail "pamcut" "${lib.getExe' netpbm "pamcut"}" \
+      --replace-fail "pnmcrop" "${lib.getExe' netpbm "pnmcrop"}" \
+      --replace-fail "pnmtopng" "${lib.getExe' netpbm "pnmtopng"}"
     substituteInPlace tmac/www.tmac.in \
-      --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
-      --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \
-      --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage"
-  ''
-  + lib.optionalString (enableGhostscript || enableHtml) ''
-    substituteInPlace contrib/pdfmark/pdfroff.sh \
-      --replace '$GROFF_GHOSTSCRIPT_INTERPRETER' "${lib.getBin ghostscript}/bin/gs" \
-      --replace '$GROFF_AWK_INTERPRETER' "${lib.getBin gawk}/bin/gawk"
+      --replace-fail "pnmcrop" "${lib.getExe' netpbm "pnmcrop"}" \
+      --replace-fail "pngtopnm" "${lib.getExe' netpbm "pngtopnm"}" \
+      --replace-fail "@PNMTOPS_NOSETPAGE@" "${lib.getExe' netpbm "pnmtops"} -nosetpage"
   '';
 
   strictDeps = true;
@@ -102,31 +104,54 @@ stdenv.mkDerivation (finalAttrs: {
   # Builds running without a chroot environment may detect the presence
   # of /usr/X11 in the host system, leading to an impure build of the
   # package. To avoid this issue, X11 support is explicitly disabled.
-  configureFlags =
-    lib.optionals (!enableGhostscript) [
-      "--without-x"
-    ]
-    ++ [
-      "ac_cv_path_PERL=${buildPackages.perl}/bin/perl"
-    ]
-    ++ lib.optionals enableGhostscript [
-      "--with-gs=${lib.getBin ghostscript}/bin/gs"
-      "--with-awk=${lib.getBin gawk}/bin/gawk"
-      "--with-appresdir=${placeholder "out"}/lib/X11/app-defaults"
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "gl_cv_func_signbit=yes"
-    ];
+  configureFlags = [
+    "ac_cv_path_PERL=${buildPackages.perl}/bin/perl"
+    "--enable-year2038"
+  ]
+  ++ lib.optionals (stdenv.cc.isClang) [
+    "CFLAGS=-std=gnu11" # https://github.com/NixOS/nixpkgs/pull/481765
+  ]
+  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "gl_cv_func_signbit=yes"
+  ]
+  ++ lib.optionals enableGhostscript [
+    "--with-gs=${lib.getExe ghostscript}"
+    "--with-appdefdir=${placeholder "out"}/lib/X11/app-defaults"
+  ]
+  ++ lib.optionals (!enableGhostscript) [
+    "--without-x"
+  ]
+  ++ lib.optionals enableUrwFonts [
+    "--with-urw-fonts-dir=${urw-fonts}/fonts"
+  ];
+
+  postConfigure = ''
+    # Move mom docs instead of linking them to avoid dangling symlinks
+    substituteInPlace Makefile \
+      --replace-fail '$(LN_S) $(exampledir)' 'mv $(exampledir)'
+  ''
+  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    # pdfmom uses GROFF_COMMAND to find the groff executable internally.
+    substituteInPlace Makefile \
+      --replace-fail 'GROFF_COMMAND=test-groff \' 'GROFF_COMMAND=$(GROFFBIN) \'
+  '';
 
   makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     # Trick to get the build system find the proper 'native' groff
     # http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html
-    "GROFF_BIN_PATH=${buildPackages.groff}/bin"
-    "GROFFBIN=${buildPackages.groff}/bin/groff"
+    "GROFF_BIN_PATH=${nativeGroffBinPath}"
+    "GROFFBIN=${lib.getExe' buildPackages.groff "groff"}"
   ];
 
   doCheck = true;
 
+  preCheck = ''
+    # The neqn-smoke-test fails on nixpkgs because neqn exec's eqn,
+    # but eqn, isn't in the PATH in the nixpkgs test env, to remedy
+    # that GROFF_BIN_PATH is set as follows:
+    export GROFF_BIN_PATH=.
+  '';
+
   postInstall = ''
     for f in 'man.local' 'mdoc.local'; do
         cat '${./site.tmac}' >>"$out/share/groff/site-tmac/$f"
@@ -146,16 +171,10 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput bin/afmtodit $perl
     moveToOutput bin/gperl $perl
     moveToOutput bin/chem $perl
-
     moveToOutput bin/gpinyin $perl
     moveToOutput lib/groff/gpinyin $perl
-    substituteInPlace $perl/bin/gpinyin \
-      --replace $out/lib/groff/gpinyin $perl/lib/groff/gpinyin
-
     moveToOutput bin/grog $perl
     moveToOutput lib/groff/grog $perl
-    substituteInPlace $perl/bin/grog \
-      --replace $out/lib/groff/grog $perl/lib/groff/grog
 
     find $perl/ -type f -print0 | xargs --null sed -i 's|${buildPackages.perl}|${perl}|'
   '';
diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix
index f1e43c9041bb..c6d882d4feee 100644
--- a/pkgs/by-name/gr/groonga/package.nix
+++ b/pkgs/by-name/gr/groonga/package.nix
@@ -9,7 +9,7 @@
   pkg-config,
   rapidjson,
   testers,
-  xxHash,
+  xxhash,
   zstd,
   postgresqlPackages,
   suggestSupport ? false,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     rapidjson
-    xxHash
+    xxhash
     zstd
     mecab
     kytea
diff --git a/pkgs/by-name/gr/grooveauthor/package.nix b/pkgs/by-name/gr/grooveauthor/package.nix
index 261ac7b44723..0db2a404a0c2 100644
--- a/pkgs/by-name/gr/grooveauthor/package.nix
+++ b/pkgs/by-name/gr/grooveauthor/package.nix
@@ -13,11 +13,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "grooveauthor";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchzip {
     url = "https://github.com/PerryAsleep/GrooveAuthor/releases/download/v${finalAttrs.version}/GrooveAuthor-v${finalAttrs.version}-linux-x64.tar.gz";
-    hash = "sha256-XuELs7Sj/M32ros5clKxKuVo/CdCja39Lwc+zsFGvFU=";
+    hash = "sha256-LjOOI1cUbYpl4tmY1eAZV3S99yQOb4V6LU9Gu/hTtnY=";
     stripRoot = false;
   };
 
@@ -70,7 +70,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --set DOTNET_ROOT ${dotnetCorePackages.runtime_8_0}/share/dotnet
+      --set DOTNET_ROOT ${dotnetCorePackages.runtime_10_0}/share/dotnet
       --suffix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath [
           alsa-lib
diff --git a/pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch b/pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch
deleted file mode 100644
index d72ffcc72190..000000000000
--- a/pkgs/by-name/gr/grpc/dynamic-lookup-darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 053b9e3784..0979b504da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -38083,3 +38083,6 @@ generate_pkgconfig(
-   "-lgrpcpp_otel_plugin"
-   "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib"
-   "grpcpp_otel_plugin.pc")
-+
-+target_link_options(upb_textformat_lib PRIVATE -Wl,-undefined,dynamic_lookup)
-+target_link_options(upb_json_lib PRIVATE -Wl,-undefined,dynamic_lookup)
diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index 8f3bc9bba869..d326773e9391 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -25,7 +25,7 @@
 # nixpkgs-update: no auto update
 stdenv.mkDerivation (finalAttrs: {
   pname = "grpc";
-  version = "1.78.0"; # N.B: if you change this, please update:
+  version = "1.80.0"; # N.B: if you change this, please update:
   # pythonPackages.grpcio
   # pythonPackages.grpcio-channelz
   # pythonPackages.grpcio-health-checking
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "grpc";
     repo = "grpc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hupso9w++lYtAMoLS/qVmUYqZyQAX3rH0I8zCLyBo40=";
+    hash = "sha256-/dpTRG5JcZY2VAsqOYNIpFW7ouSy/eC2STulP7qdSYg=";
     fetchSubmodules = true;
   };
 
@@ -49,10 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch";
       hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8=";
     })
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # fix build of 1.63.0 and newer on darwin: https://github.com/grpc/grpc/issues/36654
-    ./dynamic-lookup-darwin.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/grub/add-hidden-menu-entries.patch b/pkgs/by-name/gr/grub2/add-hidden-menu-entries.patch
similarity index 100%
rename from pkgs/tools/misc/grub/add-hidden-menu-entries.patch
rename to pkgs/by-name/gr/grub2/add-hidden-menu-entries.patch
diff --git a/pkgs/tools/misc/grub/fix-bash-completion.patch b/pkgs/by-name/gr/grub2/fix-bash-completion.patch
similarity index 100%
rename from pkgs/tools/misc/grub/fix-bash-completion.patch
rename to pkgs/by-name/gr/grub2/fix-bash-completion.patch
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/by-name/gr/grub2/package.nix
similarity index 100%
rename from pkgs/tools/misc/grub/default.nix
rename to pkgs/by-name/gr/grub2/package.nix
diff --git a/pkgs/by-name/gr/grub2_efi/package.nix b/pkgs/by-name/gr/grub2_efi/package.nix
new file mode 100644
index 000000000000..3e0d10fad501
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_efi/package.nix
@@ -0,0 +1,11 @@
+{
+  grub2,
+  ...
+}@args:
+
+grub2.override (
+  {
+    efiSupport = true;
+  }
+  // removeAttrs args [ "grub2" ]
+)
diff --git a/pkgs/by-name/gr/grub2_ieee1275/package.nix b/pkgs/by-name/gr/grub2_ieee1275/package.nix
new file mode 100644
index 000000000000..19e5542b76e8
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_ieee1275/package.nix
@@ -0,0 +1,11 @@
+{
+  grub2,
+  ...
+}@args:
+
+grub2.override (
+  {
+    ieee1275Support = true;
+  }
+  // removeAttrs args [ "grub2" ]
+)
diff --git a/pkgs/by-name/gr/grub2_light/package.nix b/pkgs/by-name/gr/grub2_light/package.nix
new file mode 100644
index 000000000000..e33c3c4f481c
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_light/package.nix
@@ -0,0 +1,11 @@
+{
+  grub2,
+  ...
+}@args:
+
+grub2.override (
+  {
+    zfsSupport = false;
+  }
+  // removeAttrs args [ "grub2" ]
+)
diff --git a/pkgs/by-name/gr/grub2_pvgrub_image/package.nix b/pkgs/by-name/gr/grub2_pvgrub_image/package.nix
new file mode 100644
index 000000000000..91e6eb469745
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_pvgrub_image/package.nix
@@ -0,0 +1,11 @@
+{
+  grub2_pvhgrub_image,
+  ...
+}@args:
+
+grub2_pvhgrub_image.override (
+  {
+    grubPlatform = "xen";
+  }
+  // removeAttrs args [ "grub2_pvhgrub_image" ]
+)
diff --git a/pkgs/by-name/gr/grub2_xen/package.nix b/pkgs/by-name/gr/grub2_xen/package.nix
new file mode 100644
index 000000000000..2e0989d29f79
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_xen/package.nix
@@ -0,0 +1,11 @@
+{
+  grub2,
+  ...
+}@args:
+
+grub2.override (
+  {
+    xenSupport = true;
+  }
+  // removeAttrs args [ "grub2" ]
+)
diff --git a/pkgs/by-name/gr/grub2_xen_pvh/package.nix b/pkgs/by-name/gr/grub2_xen_pvh/package.nix
new file mode 100644
index 000000000000..95a60b5acb7f
--- /dev/null
+++ b/pkgs/by-name/gr/grub2_xen_pvh/package.nix
@@ -0,0 +1,11 @@
+{
+  grub2,
+  ...
+}@args:
+
+grub2.override (
+  {
+    xenPvhSupport = true;
+  }
+  // removeAttrs args [ "grub2" ]
+)
diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
index 8dcf786dc094..ef97dde99380 100644
--- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
+++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix
@@ -3,8 +3,7 @@
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
-  plasma5Packages,
-  gnome-icon-theme,
+  kdePackages,
   hicolor-icon-theme,
   nix-update-script,
   folder-color ? "plasma", # Supported colors: black blue caramel citron firebrick gold green grey highland jade lavender lime olive orange pistachio plasma pumpkin purple red rust sapphire tomato violet white yellow
@@ -12,13 +11,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gruvbox-plus-icons";
-  version = "6.3.0";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "SylEleuth";
     repo = "gruvbox-plus-icon-pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4UJOiDdw5BxtOjLQjCpkQnUwQRs49GZTShpcElWjAU8=";
+    hash = "sha256-t4bQeK9jwaE3nRZEhks9QARKkxKdH9ZTSgPIby323Jc=";
   };
 
   patches = [ ./folder-color.patch ];
@@ -26,8 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ gtk3 ];
 
   propagatedBuildInputs = [
-    plasma5Packages.breeze-icons
-    gnome-icon-theme
+    kdePackages.breeze-icons
     hicolor-icon-theme
   ];
 
@@ -48,6 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   dontDropIconThemeCache = true;
   dontBuild = true;
   dontConfigure = true;
+  dontWrapQtApps = true;
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/gr/grype/0001-test_helpers-redact-support-nix.patch b/pkgs/by-name/gr/grype/0001-test_helpers-redact-support-nix.patch
new file mode 100644
index 000000000000..ced2da593b8d
--- /dev/null
+++ b/pkgs/by-name/gr/grype/0001-test_helpers-redact-support-nix.patch
@@ -0,0 +1,35 @@
+diff --git a/grype/presenter/internal/test_helpers.go b/grype/presenter/internal/test_helpers.go
+index 2bfafbc2..6e70ed87 100644
+--- a/grype/presenter/internal/test_helpers.go
++++ b/grype/presenter/internal/test_helpers.go
+@@ -1,6 +1,7 @@
+ package internal
+ 
+ import (
++	"os"
+ 	"regexp"
+ 	"testing"
+ 
+@@ -92,8 +93,21 @@ func Redact(s []byte) []byte {
+ 	cycloneDxBomRefPattern := regexp.MustCompile(`[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}`)
+ 	tempDirPattern := regexp.MustCompile(`/tmp/[^"]+`)
+ 	macTempDirPattern := regexp.MustCompile(`/var/folders/[^"]+`)
++	// nix build dir isn't always /build so we'll identify it by $TMP
++	nixDir := os.Getenv("TMP")
++	if nixDir == "" {
++		panic("missing $TMP for identifying nix build dir")
++	}
++	end := regexp.QuoteMeta(nixDir)
++	pattern := `[^"]+`
++	// add slash prefix to pattern only if required
++	// don't use strings lib to reduce chance of merge conflicts above
++	if end[len(end)-1] != '/' {
++		pattern = "/" + pattern
++	}
++	nixBuildDirPattern := regexp.MustCompile(end + pattern)
+ 
+-	for _, pattern := range []*regexp.Regexp{serialPattern, rfc3339Pattern, refPattern, uuidPattern, cycloneDxBomRefPattern, tempDirPattern, macTempDirPattern} {
++	for _, pattern := range []*regexp.Regexp{serialPattern, rfc3339Pattern, refPattern, uuidPattern, cycloneDxBomRefPattern, tempDirPattern, macTempDirPattern, nixBuildDirPattern} {
+ 		s = pattern.ReplaceAll(s, []byte(""))
+ 	}
+ 	return s
diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index edc23c41fe0c..525fb4d46505 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -7,17 +7,21 @@
   installShellFiles,
   openssl,
   net-tools,
+  zstd,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "grype";
-  version = "0.108.0";
+  version = "0.111.1";
+
+  # required for tests
+  __darwinAllowLocalNetworking = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "grype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5TYQKLVl3iM1Litp86n0aAaj3p2yKA1fbJ6bduIjfp8=";
+    hash = "sha256-eAiExxvLFkHsmslfhhbQG0ogaSMF9eOeCq0u2wUimp0=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -32,7 +36,13 @@ buildGoModule (finalAttrs: {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-8LVpcSjWdGwYv8CMuMZyaHC9+wMJNPDSNV6a8VsmA0M=";
+  vendorHash = "sha256-rsdZt+xKjIJpWS5pYx8A+ryY1D2WIKquKjsQBkxToUQ=";
+
+  patches = [
+    # several test golden files have unstable paths based on the platform
+    # this patch adjusts the `Redact` helper to also work for builds by nix.
+    ./0001-test_helpers-redact-support-nix.patch
+  ];
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -40,6 +50,7 @@ buildGoModule (finalAttrs: {
     git
     openssl
     net-tools
+    zstd
   ];
 
   subPackages = [ "cmd/grype" ];
@@ -70,54 +81,39 @@ buildGoModule (finalAttrs: {
     unset ldflags
 
     # patch utility script
-    patchShebangs grype/db/v5/distribution/test-fixtures/tls/generate-x509-cert-pair.sh
-
-    # FIXME: these tests fail when building with Nix
-    substituteInPlace test/cli/config_test.go \
-      --replace-fail "Test_configLoading" "Skip_configLoading"
-    substituteInPlace test/cli/db_providers_test.go \
-      --replace-fail "TestDBProviders" "SkipDBProviders"
-    substituteInPlace grype/presenter/cyclonedx/presenter_test.go \
-      --replace-fail "TestCycloneDxPresenterDir" "SkipCycloneDxPresenterDir" \
-      --replace-fail "Test_CycloneDX_Valid" "Skip_CycloneDX_Valid"
-
-    # remove tests that depend on docker
-    substituteInPlace test/cli/cmd_test.go \
-      --replace-fail "TestCmd" "SkipCmd"
-    substituteInPlace grype/pkg/provider_test.go \
-      --replace-fail "TestSyftLocationExcludes" "SkipSyftLocationExcludes"
-    substituteInPlace test/cli/cmd_test.go \
-      --replace-fail "Test_descriptorNameAndVersionSet" "Skip_descriptorNameAndVersionSet"
-
-    # remove tests that depend on git
-    substituteInPlace test/cli/db_validations_test.go \
-      --replace-fail "TestDBValidations" "SkipDBValidations"
-    substituteInPlace test/cli/registry_auth_test.go \
-      --replace-fail "TestRegistryAuth" "SkipRegistryAuth"
-    substituteInPlace test/cli/sbom_input_test.go \
-      --replace-fail "TestSBOMInput_FromStdin" "SkipSBOMInput_FromStdin" \
-      --replace-fail "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument"
-    substituteInPlace test/cli/subprocess_test.go \
-      --replace-fail "TestSubprocessStdin" "SkipSubprocessStdin"
-    substituteInPlace grype/internal/packagemetadata/names_test.go \
-      --replace-fail "TestAllNames" "SkipAllNames"
-    substituteInPlace test/cli/version_cmd_test.go \
-      --replace-fail "TestVersionCmdPrintsToStdout" "SkipVersionCmdPrintsToStdout"
-    substituteInPlace grype/presenter/sarif/presenter_test.go \
-      --replace-fail "Test_SarifIsValid" "SkipTest_SarifIsValid"
-    substituteInPlace test/cli/config_test.go \
-      --replace-fail "Test_dpkgUseCPEsForEOLEnvVar" "SkipTest_dpkgUseCPEsForEOLEnvVar" \
-      --replace-fail "Test_rpmUseCPEsForEOLEnvVar" "SkipTest_rpmUseCPEsForEOLEnvVar"
-
-    # May fail on NixOS, probably due bug in how syft handles tmpfs.
-    # See https://github.com/anchore/grype/issues/1822
-    substituteInPlace grype/distro/distro_test.go \
-      --replace-fail "Test_NewDistroFromRelease_Coverage" "SkipTest_NewDistroFromRelease_Coverage"
-
-    # segfault
-    rm grype/db/v5/namespace/cpe/namespace_test.go
+    patchShebangs grype/db/v5/distribution/testdata/tls/generate-x509-cert-pair.sh
   '';
 
+  checkFlags =
+    let
+      skippedTests = [
+        # depend on docker
+        "TestCmd"
+        "TestSyftLocationExcludes"
+        "Test_descriptorNameAndVersionSet"
+        # depend on .git
+        "Test_configLoading"
+        "TestDBProviders"
+        "TestDBValidations"
+        "TestRegistryAuth"
+        "TestRegistryAuthRedactions"
+        "TestSBOMInput_FromStdin"
+        "TestSBOMInput_AsArgument"
+        "TestSubprocessStdin"
+        "TestAllNames"
+        "TestVersionCmdPrintsToStdout"
+        "Test_SarifIsValid"
+        "Test_dpkgUseCPEsForEOLEnvVar"
+        "Test_rpmUseCPEsForEOLEnvVar"
+      ]
+      ++ lib.optionals stdenv.isDarwin [
+        # fails to generate x509 certificate
+        # cat: /etc/ssl/openssl.cnf: Operation not permitted
+        "Test_defaultHTTPClientHasCert"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd grype \
       --bash <($out/bin/grype completion bash) \
diff --git a/pkgs/by-name/gs/gscreenshot/package.nix b/pkgs/by-name/gs/gscreenshot/package.nix
index 9fe707bb9195..044b16161003 100644
--- a/pkgs/by-name/gs/gscreenshot/package.nix
+++ b/pkgs/by-name/gs/gscreenshot/package.nix
@@ -19,14 +19,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gscreenshot";
-  version = "3.11.0";
+  version = "3.11.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "thenaterhood";
     repo = "gscreenshot";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-ZdywZhH59L5fk1EB+o6fSj9zCOljS7T/HWpUd2tTl0o=";
+    sha256 = "sha256-24eo4ihWM/sJXj7Dp3hSp0FEP1uYzvCON2emuMiONSc=";
   };
 
   # needed for wrapGAppsHook3 to function
diff --git a/pkgs/by-name/gs/gsender/package.nix b/pkgs/by-name/gs/gsender/package.nix
index d093fe18b9aa..eb8c394e6ca3 100644
--- a/pkgs/by-name/gs/gsender/package.nix
+++ b/pkgs/by-name/gs/gsender/package.nix
@@ -5,12 +5,12 @@
 }:
 
 let
-  version = "1.6.0";
+  version = "1.6.1";
   pname = "gsender";
 
   src = fetchurl {
     url = "https://github.com/Sienci-Labs/gsender/releases/download/v${version}/gSender-${version}-Linux-Intel-64Bit.AppImage";
-    hash = "sha256-rksLPTwyTzILughUsN69o/gIPmSJ/OTKo3H9YZyaqKs=";
+    hash = "sha256-utAzkaYfeDyHNFPTTQaXyTCg3cFSZvuCvCCVzb1zH2M=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
diff --git a/pkgs/by-name/gs/gsm/package.nix b/pkgs/by-name/gs/gsm/package.nix
index 5e08a0556cbb..06f54d66a6f0 100644
--- a/pkgs/by-name/gs/gsm/package.nix
+++ b/pkgs/by-name/gs/gsm/package.nix
@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gsm";
-  version = "1.0.23";
+  version = "1.0.24";
 
   src = fetchurl {
     url = "https://www.quut.com/gsm/gsm-${version}.tar.gz";
-    sha256 = "sha256-i3WRqFrJrc6FjyBTAF5rLrIMI7i4qGjf+ylpZF+jI8A=";
+    sha256 = "sha256-o8QMZHGSg4P0q/yy6PJAEqH1Yr4vF7jWchRdWYZoGpI=";
   };
 
   patchPhase = ''
diff --git a/pkgs/by-name/gs/gss/package.nix b/pkgs/by-name/gs/gss/package.nix
index cfec67533056..86417ff8ac97 100644
--- a/pkgs/by-name/gs/gss/package.nix
+++ b/pkgs/by-name/gs/gss/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchzip,
-  autoconf,
+  autoconf269,
   automake,
   gengetopt,
   gettext,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeBuildInputs = [
-    autoconf
+    autoconf269
     automake
     gengetopt
     gettext
diff --git a/pkgs/by-name/gt/gtk3/package.nix b/pkgs/by-name/gt/gtk3/package.nix
index 98e575145d7d..3c3ffc066dbb 100644
--- a/pkgs/by-name/gt/gtk3/package.nix
+++ b/pkgs/by-name/gt/gtk3/package.nix
@@ -71,7 +71,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk+3";
-  version = "3.24.51";
+  version = "3.24.52";
 
   outputs = [
     "out"
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     in
     fetchurl {
       url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
-      hash = "sha256-ABOHfGvSPC2+Qq18cKBT0ORJvmZzZXTjeGfEnF+QWk8=";
+      hash = "sha256-gJMfpHKne5oWT2dA48C0RPrGdwBUYy01p/+dZ55ee58=";
     };
 
   patches = [
diff --git a/pkgs/by-name/gt/gts/package.nix b/pkgs/by-name/gt/gts/package.nix
index 2e05fa7cc678..e51a67eb374a 100644
--- a/pkgs/by-name/gt/gts/package.nix
+++ b/pkgs/by-name/gt/gts/package.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ gettext ];
   propagatedBuildInputs = [ glib ];
 
+  env = lib.optionalAttrs stdenv.isDarwin {
+    # Doesn't build on Darwin with -std=gnu23.
+    NIX_CFLAGS_COMPILE = "-std=gnu17";
+  };
+
   doCheck = false; # fails with "permission denied"
 
   preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
diff --git a/pkgs/by-name/gt/gtypist/package.nix b/pkgs/by-name/gt/gtypist/package.nix
index 5b3c20feb5b0..605960542202 100644
--- a/pkgs/by-name/gt/gtypist/package.nix
+++ b/pkgs/by-name/gt/gtypist/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   preFixup = ''
     wrapProgram "$out/bin/typefortune" \
-      --prefix PATH : "${fortune}/bin" \
+      --prefix PATH : "${fortune}/bin"
   '';
 
   meta = {
diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 83b1fc777d83..c09184ce77d8 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -7,6 +7,7 @@
   makeWrapper,
   ninja,
   perl,
+  perlPackages,
   brotli,
   openssl,
   libcap,
@@ -23,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2026-02-28";
+  version = "2.3.0-rolling-2026-04-15";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "725e54bc932fbe0c6e208db4e71eb1df79ec43ff";
-    hash = "sha256-SAH7AZYy6ZRRa8zhhe8voKJCqM5CxSuZA/XwT1Nb9NI=";
+    rev = "4aa96860e99cc2a2e2777433949bb05aed678ebe";
+    hash = "sha256-0utcajHyLpP+MXwW12pGWd/E58jK5//Erq0dQmzBO5U=";
   };
 
   outputs = [
@@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     makeWrapper
     ninja
+    perlPackages.JSON
   ]
   ++ lib.optionals withMruby [
     bison
@@ -72,6 +74,9 @@ stdenv.mkDerivation (finalAttrs: {
         --set "H2O_PERL" "${lib.getExe perl}" \
         --prefix "PATH" : "${lib.getBin openssl}/bin"
     done
+
+    wrapProgram "$out/bin/h2olog" \
+        --set "PERL5LIB" "$PERL5LIB"
   '';
 
   passthru = {
diff --git a/pkgs/by-name/h5/h5utils/package.nix b/pkgs/by-name/h5/h5utils/package.nix
index ac2ea6164fd7..8997c406099b 100644
--- a/pkgs/by-name/h5/h5utils/package.nix
+++ b/pkgs/by-name/h5/h5utils/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   # libdf is an alternative name for libhdf (hdf4)
   preConfigure = lib.optionalString (hdf4 != null) ''
     substituteInPlace configure \
-    --replace "-ldf" "-lhdf" \
+    --replace "-ldf" "-lhdf"
   '';
 
   preBuild = lib.optionalString hdf5.mpiSupport "export CC=${lib.getBin hdf5.mpi}/mpicc";
diff --git a/pkgs/by-name/ha/ha-mcp/package.nix b/pkgs/by-name/ha/ha-mcp/package.nix
index a70f3b510f09..2c956dd86d5e 100644
--- a/pkgs/by-name/ha/ha-mcp/package.nix
+++ b/pkgs/by-name/ha/ha-mcp/package.nix
@@ -7,27 +7,28 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "ha-mcp";
-  version = "6.7.1";
+  version = "7.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "homeassistant-ai";
     repo = "ha-mcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CQbjPEtCos0Fi6aAaIWSRMCUQKmjYviYkvJZzbCZg6Y=";
+    hash = "sha256-boWqv8lSN/UiqSRhVBgbucX+RC6q14Oa4WzkJPeZzVw=";
   };
 
   build-system = with python3Packages; [
     setuptools
   ];
 
+  pythonRelaxDeps = true;
+
   dependencies =
     with python3Packages;
     [
       cryptography
       fastmcp
       httpx
-      jq
       pydantic
       python-dotenv
       truststore
@@ -39,7 +40,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
   doCheck = false;
 
   passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9]+)$" ];
+    extraArgs = [
+      "--use-github-releases"
+      "--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9]+)$"
+    ];
   };
 
   pythonImportsCheck = [ "ha_mcp" ];
diff --git a/pkgs/by-name/ha/hackrf/package.nix b/pkgs/by-name/ha/hackrf/package.nix
index 9c5fe0cb5d70..bb254df0d31e 100644
--- a/pkgs/by-name/ha/hackrf/package.nix
+++ b/pkgs/by-name/ha/hackrf/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   libusb1,
@@ -11,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hackrf";
-  version = "2024.02.1";
+  version = "2026.01.3";
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "hackrf";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-b3nGrk2P6ZLYBSCSD7c0aIApCh3ZoVDcFftybqm4vx0=";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-/RSZ+jkh4wmb0n8Kiee9Nr5D6LPYdmZVigpsBagAaLg=";
   };
 
   nativeBuildInputs = [
@@ -30,14 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
     fftwSinglePrec
   ];
 
-  patches = [
-    # CMake < 3.5 fix. Remove upon next version bump.
-    (fetchpatch {
-      url = "https://github.com/greatscottgadgets/hackrf/commit/5c394520403c40b656a7400681e4ae167943e43f.patch";
-      hash = "sha256-FRzb+Bt5fQm94d1EDbMv8oUFwD93VZQHFpQpMDe/BAA=";
-    })
-  ];
-
   cmakeFlags = [
     "-DUDEV_RULES_GROUP=plugdev"
     "-DUDEV_RULES_PATH=lib/udev/rules.d"
@@ -49,11 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = true;
 
-  postPatch = ''
-    substituteInPlace host/cmake/modules/FindFFTW.cmake \
-      --replace "find_library (FFTW_LIBRARIES NAMES fftw3)" "find_library (FFTW_LIBRARIES NAMES fftw3f)"
-  '';
-
   meta = {
     description = "Open source SDR platform";
     homepage = "https://greatscottgadgets.com/hackrf/";
diff --git a/pkgs/by-name/ha/hacompanion/package.nix b/pkgs/by-name/ha/hacompanion/package.nix
index 607a337a1de0..f6ec236e6102 100644
--- a/pkgs/by-name/ha/hacompanion/package.nix
+++ b/pkgs/by-name/ha/hacompanion/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "hacompanion";
-  version = "1.0.26";
+  version = "1.0.27";
 
   src = fetchFromGitHub {
     owner = "tobias-kuendig";
     repo = "hacompanion";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gpBu7HsohL8/Rfy3uWtYF7llX59nJXDDR//YE3MYje8=";
+    hash = "sha256-tm9qx2SPkyzxP7fHXAzlk/iMn/67zMJlmeTq9veRg98=";
   };
 
-  vendorHash = "sha256-y2eSuMCDZTGdCs70zYdA8NKbuPPN5xmnRfMNK+AE/q8=";
+  vendorHash = "sha256-SohjueM0DwSuh7XVClYiWA/5d0V6x2vmp5aPxgmIJYY=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ha/haguichi/package.nix b/pkgs/by-name/ha/haguichi/package.nix
index 27e840b2a81f..6454262bb09a 100644
--- a/pkgs/by-name/ha/haguichi/package.nix
+++ b/pkgs/by-name/ha/haguichi/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "haguichi";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "ztefn";
     repo = "haguichi";
     tag = finalAttrs.version;
-    hash = "sha256-cVM8VbW8aFq9fXFiVfGhkIhyqSXG2zyB3HyA5tTEDVY=";
+    hash = "sha256-BKpHAlhxd8Zy/ZpPkLhXqlgZsil9JEZmVmHis1gte4Q=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 55305f07c8e3..bf5a7d8a54e9 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -21,16 +21,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "halloy";
-  version = "2026.5";
+  version = "2026.6";
 
   src = fetchFromGitHub {
     owner = "squidowl";
     repo = "halloy";
     tag = finalAttrs.version;
-    hash = "sha256-K+kNn7GPNZWXkXS+hfOjdmaWEjina6Vy4FfAJGZ5cPE=";
+    hash = "sha256-5lgsZnjoajYQi7y+ZWhNSc2x9IpxkGEEDTnQC8NJaP4=";
   };
 
-  cargoHash = "sha256-ij08oI0IIihVoHY4RS1FGpkvsWLcjCv2fp8voAae+DI=";
+  cargoHash = "sha256-9EVJGXWE4kfTWs+Ekr13rweH/mcSNG7jmXOMjEMn4hM=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix
index 38fc1693b4cf..f44341085fd3 100644
--- a/pkgs/by-name/ha/halo/package.nix
+++ b/pkgs/by-name/ha/halo/package.nix
@@ -8,10 +8,10 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "halo";
-  version = "2.23.1";
+  version = "2.24.0";
   src = fetchurl {
     url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar";
-    hash = "sha256-oU3MdmHnpf0TOwdEJb8UD2LIqEJ2BQ0puMIs1BBmA2M=";
+    hash = "sha256-71br2gG8vl3EyvC+AYzqJOtgHnhdEmcRAjXSXXXqI5s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/hanko/package.nix b/pkgs/by-name/ha/hanko/package.nix
index aab772d410fa..4cec55ee32b3 100644
--- a/pkgs/by-name/ha/hanko/package.nix
+++ b/pkgs/by-name/ha/hanko/package.nix
@@ -8,16 +8,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hanko";
-  version = "0.5.4";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "SRv6d";
     repo = "hanko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9HRoXqZ3wdD6xf33tooEHiBWSZlggjUFomblwF4cFtA=";
+    hash = "sha256-tmspfsIIxYa9fTPhHJrVRUcpC8gZ0R4prTLTDstuwbg=";
   };
 
-  cargoHash = "sha256-wHvhlWi99igZ2gKAIcBYg207JrbQNCOjlcVttIy3MV0=";
+  cargoHash = "sha256-IcQtG29qTQl4U0HwG+kvPT07RhSgUADtejV7ObWyjG0=";
+
+  # Upstream tests require network access, which is unavailable in the sandbox.
+  doCheck = false;
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 806d008ac75b..cd0f97ea0835 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -12,7 +12,6 @@
   aws-lc,
   libressl,
   openssl,
-  wolfssl,
   lua5_4,
   pcre2,
 }:
@@ -21,7 +20,6 @@ assert lib.assertOneOf "sslLibrary" sslLibrary [
   "aws-lc"
   "libressl"
   "openssl"
-  "wolfssl"
 ];
 let
   sslPkgs = {
@@ -30,10 +28,6 @@ let
       libressl
       openssl
       ;
-    wolfssl = wolfssl.override {
-      variant = "haproxy";
-      extraConfigureFlags = [ "--enable-quic" ];
-    };
   };
   sslPkg = sslPkgs.${sslLibrary};
 in
@@ -85,9 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (sslLibrary == "openssl" && lib.versionOlder openssl.version "3.5.2") [
     "USE_QUIC_OPENSSL_COMPAT=yes"
   ]
-  ++ lib.optionals (sslLibrary == "wolfssl") [
-    "USE_OPENSSL_WOLFSSL=yes"
-  ]
   ++ lib.optionals usePcre [
     "USE_PCRE2=yes"
     "USE_PCRE2_JIT=yes"
diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index 6364b535addd..9ed4eac7841f 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "harbor-cli";
-  version = "0.0.18";
+  version = "0.0.19";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vR99rFCR/FMpASyCqjIvhWBNO+Va1sACtZxOGbJaiQg=";
+    hash = "sha256-X1+uke4X7JBN5kDrsVQ+oS6RkHG8fHt6lU6+9LPBNzk=";
   };
 
-  vendorHash = "sha256-A7Hgzzdu8zIkN/mvHTWU7ZRbInWor+dVtr9al3oyjk4=";
+  vendorHash = "sha256-1Aj3QHQcswOmzeazk3Fr8gSP1VTok2U/NK3mCPSPC6o=";
 
   excludedPackages = [
     "dagger"
diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix
index cebf23db0247..823f6480f728 100644
--- a/pkgs/by-name/ha/harfbuzz/package.nix
+++ b/pkgs/by-name/ha/harfbuzz/package.nix
@@ -113,6 +113,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  # test_native_coretext_variations depends on the system fonts.
+  __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [
+    "/System/Library/Fonts"
+  ];
+
   # Slightly hacky; some pkgs expect them in a single directory.
   postFixup = lib.optionalString withIcu ''
     rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc"
diff --git a/pkgs/by-name/ha/harminv/package.nix b/pkgs/by-name/ha/harminv/package.nix
index 7fcddde46393..c60ee2b20dff 100644
--- a/pkgs/by-name/ha/harminv/package.nix
+++ b/pkgs/by-name/ha/harminv/package.nix
@@ -13,13 +13,13 @@ assert !lapack.isILP64;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "harminv";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = "harminv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HV8xylK2IOvbONYGgyaqAabp6xA7/uvN4DU7upIlZh0=";
+    hash = "sha256-a2xf1CUyWUsCE+xUZfJJaKKktn2XznFnJQRE0AxVuuY=";
   };
 
   # File is missing in the git checkout but required by autotools
diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix
index debe7bdd1de0..0d95003187cb 100644
--- a/pkgs/by-name/ha/harmonia/package.nix
+++ b/pkgs/by-name/ha/harmonia/package.nix
@@ -10,16 +10,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "harmonia";
-  version = "3.0.0";
+  version = "3.1.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "harmonia";
     tag = "harmonia-v${finalAttrs.version}";
-    hash = "sha256-BovRI3p2KXwQ6RF49NqLc0uKP/Jk+yA8E0eqScaIP68=";
+    hash = "sha256-fm8PBugKnw72/dAXsRj84jf4EZK1BcVEdEWgtojIuA0=";
   };
 
-  cargoHash = "sha256-X3A+gV32itmt0SqepioT64IGzHfrCdLsQjF6EDwCTbo=";
+  cargoHash = "sha256-qp4frhNsWDma8uYcRe3BXmfIu6btYb8IaoXhk4oI4qM=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 1af500db650f..a29356e421e8 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -8,18 +8,26 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "harper";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3NwQOs0G0b13dnCN0oif863/BJ2zAUFXsF9TpFeMDLA=";
+    hash = "sha256-9AA2uln9cnMzFvPbxiD05sfdAZKO7xzoJSfQbeRNE9Y=";
   };
 
-  buildAndTestSubdir = "harper-ls";
+  cargoHash = "sha256-P90qKrV4YK1ATwclbJ8wX+rcCdE1QetNNL96/IXeIMA=";
 
-  cargoHash = "sha256-+WUmNmFBuk9lQsUXYBEpTo49Ygul0BPRY0kcHCCC0GU=";
+  cargoBuildFlags = [
+    "--package=harper-cli"
+    "--package=harper-ls"
+  ];
+
+  cargoTestFlags = [
+    "--package=harper-cli"
+    "--package=harper-ls"
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix
index 31987ce3c8da..e905d0bd94af 100644
--- a/pkgs/by-name/ha/hashcat/package.nix
+++ b/pkgs/by-name/ha/hashcat/package.nix
@@ -14,7 +14,7 @@
   python3,
   rocmPackages ? { },
   rocmSupport ? config.rocmSupport,
-  xxHash,
+  xxhash,
   zlib,
   libiconv,
 }:
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
         simplejson
       ]
     ))
-    xxHash
+    xxhash
     zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/ha/haveged/package.nix b/pkgs/by-name/ha/haveged/package.nix
index cccefa02e042..e12e8795cd76 100644
--- a/pkgs/by-name/ha/haveged/package.nix
+++ b/pkgs/by-name/ha/haveged/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "haveged";
-  version = "1.9.19";
+  version = "1.9.20";
 
   src = fetchFromGitHub {
     owner = "jirka-h";
     repo = "haveged";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tq4OXLlyC6exJEZ80H1gQQRBgYGbu+3kGz99RxsyauI=";
+    hash = "sha256-7ymilQktEsCUTujGC2KTXN5LI2KQRbAd/4tEMxOZxpo=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ha/haven/package.nix b/pkgs/by-name/ha/haven/package.nix
index 1d972e5d73ec..a4ca107e6aeb 100644
--- a/pkgs/by-name/ha/haven/package.nix
+++ b/pkgs/by-name/ha/haven/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "1.2.2";
 
   src = fetchFromGitHub {
-    owner = "bitvora";
+    owner = "barrydeen";
     repo = "haven";
     tag = "v${finalAttrs.version}";
     hash = "sha256-gpfTgaO3VK65GBy/W/rR8181yHlvgTx9UyWReo7s2gQ=";
@@ -25,8 +25,8 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "High Availability Vault for Events on Nostr";
-    homepage = "https://github.com/bitvora/haven";
-    changelog = "https://github.com/bitvora/haven/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/barrydeen/haven";
+    changelog = "https://github.com/barrydeen/haven/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ felixzieger ];
     mainProgram = "haven";
diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix
index b086b08b541e..589d72cb43b8 100644
--- a/pkgs/by-name/ha/havn/package.nix
+++ b/pkgs/by-name/ha/havn/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "havn";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "mrjackwills";
     repo = "havn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cYhhNhrMrPvqEIrb9Vznap8UW2ZNhGSzsAEmgtGfmy4=";
+    hash = "sha256-eQyWaAPDnfAXvqOVNI9luZIdLMSj1P779yiWOhZ5dsg=";
   };
 
-  cargoHash = "sha256-wcAdRS/ACBbnwN+vKmBLOpxw4SbrfTYo+E32PX6btTs=";
+  cargoHash = "sha256-pnXPIEVzAn6ovNo7+3BNzFptleOPFDklSU/e44roahs=";
 
   checkFlags = [
     # Skip tests that require network access
diff --git a/pkgs/by-name/he/headplane-agent/package.nix b/pkgs/by-name/he/headplane-agent/package.nix
new file mode 100644
index 000000000000..a645d2e576f8
--- /dev/null
+++ b/pkgs/by-name/he/headplane-agent/package.nix
@@ -0,0 +1,39 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:
+buildGoModule (finalAttrs: {
+  pname = "headplane-agent";
+  __structuredAttrs = true;
+  # Note, if you are upgrading this, you should upgrade headplane at the same time
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "tale";
+    repo = "headplane";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hsrnmEwKXJlPjV4aIfmS6GAE414ArVRGoPPpZGmV0x4=";
+  };
+
+  vendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA=";
+  subPackages = [ "cmd/hp_agent" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+  env.CGO_ENABLED = 0;
+
+  meta = {
+    description = "Optional sidecar process providing additional features for headplane";
+    homepage = "https://github.com/tale/headplane";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      igor-ramazanov
+      stealthbadger747
+    ];
+    mainProgram = "hp_agent";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/by-name/he/headplane/package.nix b/pkgs/by-name/he/headplane/package.nix
new file mode 100644
index 000000000000..bb42ab31bcee
--- /dev/null
+++ b/pkgs/by-name/he/headplane/package.nix
@@ -0,0 +1,119 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  fetchPnpmDeps,
+  git,
+  lib,
+  makeWrapper,
+  nodejs_22,
+  pnpm_10,
+  pnpmConfigHook,
+  stdenv,
+}:
+let
+  pname = "headplane";
+  # Note, if you are upgrading this, you should upgrade headplane-agent at the same time
+  version = "0.6.1";
+  pnpmDepsHash = "sha256-AYfEL3HSRg87I+Y0fkLthFSDWgHTg5u0DBpzn6KBn1Q=";
+  src = fetchFromGitHub {
+    owner = "tale";
+    repo = "headplane";
+    tag = "v${version}";
+    hash = "sha256-hsrnmEwKXJlPjV4aIfmS6GAE414ArVRGoPPpZGmV0x4=";
+  };
+
+  headplaneSshWasm = buildGoModule {
+    pname = "headplane-ssh-wasm";
+    inherit version src;
+    subPackages = [ "cmd/hp_ssh" ];
+    vendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA=";
+    env.CGO_ENABLED = 0;
+    doCheck = false;
+    buildPhase = ''
+      export GOOS=js
+      export GOARCH=wasm
+      go build -o hp_ssh.wasm ./cmd/hp_ssh
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm444 hp_ssh.wasm "$out/hp_ssh.wasm"
+
+      # Go's WebAssembly shim (wasm_exec.js) has no stable `go env` key, and
+      # different Go packages may place it in different locations under GOROOT.
+      #   1. Ask `go env GOROOT` for the active GOROOT.
+      #   2. First try the path misc/wasm/wasm_exec.js.
+      #   3. If that fails, fall back to searching under GOROOT to handle
+      #      distro / OS / packaging layout variations.
+      goRoot="$(go env GOROOT)"
+
+      wasm_exec="$goRoot/misc/wasm/wasm_exec.js"
+      if [ ! -e "$wasm_exec" ]; then
+        wasm_exec="$(find "$goRoot" -path '*wasm_exec.js' -print -quit || true)"
+      fi
+
+      if [[ -z "$wasm_exec" || ! -e "$wasm_exec" ]]; then
+        echo "ERROR: wasm_exec.js not found under GOROOT=$goRoot" >&2
+        exit 1
+      fi
+
+      install -Dm444 "$wasm_exec" "$out/wasm_exec.js"
+      runHook postInstall
+    '';
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  inherit pname version src;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    git
+    makeWrapper
+    nodejs_22
+    pnpm_10
+    pnpmConfigHook
+  ];
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    hash = pnpmDepsHash;
+    fetcherVersion = 3;
+  };
+
+  buildPhase = ''
+    runHook preBuild
+    cp ${headplaneSshWasm}/hp_ssh.wasm app/hp_ssh.wasm
+    cp ${headplaneSshWasm}/wasm_exec.js app/wasm_exec.js
+    pnpm --offline build
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/{bin,share/headplane}
+    cp -r build $out/share/headplane/
+    cp -r node_modules $out/share/headplane/
+    cp -r drizzle $out/share/headplane/
+    substituteInPlace $out/share/headplane/build/server/index.js \
+      --replace "$PWD" "../.."
+    makeWrapper ${lib.getExe nodejs_22} $out/bin/headplane \
+      --chdir $out/share/headplane \
+      --add-flags $out/share/headplane/build/server/index.js
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Feature-complete Web UI for Headscale";
+    homepage = "https://github.com/tale/headplane";
+    changelog = "https://github.com/tale/headplane/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      igor-ramazanov
+      stealthbadger747
+    ];
+    mainProgram = "headplane";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix
index 8981a5d90c3a..bb2469185630 100644
--- a/pkgs/by-name/he/hebbot/package.nix
+++ b/pkgs/by-name/he/hebbot/package.nix
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Matrix bot which can generate \"This Week in X\" like blog posts ";
     homepage = "https://github.com/haecker-felix/hebbot";
-    changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v2.1";
     license = with lib.licenses; [ agpl3Only ];
     mainProgram = "hebbot";
     maintainers = with lib.maintainers; [ a-kenji ];
diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix
index 31cdf7cb13ab..4325ce184118 100644
--- a/pkgs/by-name/he/helix/package.nix
+++ b/pkgs/by-name/he/helix/package.nix
@@ -13,8 +13,8 @@
       tree-sitter-beancount = prev.tree-sitter-beancount.override {
         excludeBrokenTreeSitterJson = false;
       };
-      tree-sitter-dart = prev.tree-sitter-dart.overrideAttrs {
-        patches = [ ];
+      tree-sitter-git-rebase = prev.tree-sitter-git-rebase.overrideAttrs {
+        dontPatch = true;
       };
       tree-sitter-glimmer = prev.tree-sitter-glimmer.override {
         excludeBrokenTreeSitterJson = false;
@@ -22,18 +22,12 @@
       tree-sitter-janet-simple = prev.tree-sitter-janet-simple.override {
         excludeBrokenTreeSitterJson = false;
       };
-      tree-sitter-latex = prev.tree-sitter-latex.override {
-        generate = false;
-      };
       tree-sitter-qmljs = prev.tree-sitter-qmljs.overrideAttrs {
         dontCheckForBrokenSymlinks = true;
       };
       tree-sitter-sql = prev.tree-sitter-sql.override {
         generate = false;
       };
-      tree-sitter-tlaplus = prev.tree-sitter-tlaplus.overrideAttrs {
-        patches = [ ];
-      };
     }
   ),
 }:
diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix
index b6354e610e90..c523eadd1d3e 100644
--- a/pkgs/by-name/he/hermitcli/package.nix
+++ b/pkgs/by-name/he/hermitcli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "hermit";
-  version = "0.50.2";
+  version = "0.52.1";
 
   src = fetchFromGitHub {
     rev = "v${finalAttrs.version}";
     owner = "cashapp";
     repo = "hermit";
-    hash = "sha256-LSDLHqDCqdHsgLr3QVxewAtl2pLUNQJ1mmAyaW5+Io0=";
+    hash = "sha256-+3iP+cJBa+EHVw+xWyH6tyaeqbzOr8E30Ig2Xr5MPkg=";
   };
 
   vendorHash = "sha256-2sNtok5J1kBvJZ0I1FOq1ZP54TsZbzqu/M3v1nA12m8=";
diff --git a/pkgs/by-name/he/heroic-unwrapped/legendary.nix b/pkgs/by-name/he/heroic-unwrapped/legendary.nix
index 2cb52e000285..2f968468aeba 100644
--- a/pkgs/by-name/he/heroic-unwrapped/legendary.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/legendary.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "legendary-heroic";
-  version = "0.20.42";
+  version = "0.20.43";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "legendary";
     tag = finalAttrs.version;
-    hash = "sha256-ZnOQhIGAgUvZVdPpxdothKzPElp/hdvUJA0mTpXLyIM=";
+    hash = "sha256-EQBrj+GOmVD0ZEArOk1Me4LLKbs6Ezl1lTzD0k5uUsQ=";
   };
 
   build-system = with python3Packages; [
@@ -25,6 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     requests
     requests-futures
     filelock
+    pycryptodomex
   ];
 
   pythonImportsCheck = [ "legendary" ];
diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index 4e15de84522e..d4a164f14a03 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -12,7 +12,7 @@
   makeWrapper,
   # Electron updates can break Heroic, so try to use same version as upstream.
   # If the used electron version is higher than upstream's then the node-abi package might need to be updated
-  electron_39,
+  electron,
   vulkan-helper,
   gogdl,
   nile,
@@ -22,7 +22,6 @@
 
 let
   pnpm = pnpm_10_29_2;
-  electron = electron_39;
 
   legendary = callPackage ./legendary.nix { };
   epic-integration = callPackage ./epic-integration.nix { };
@@ -30,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
-  version = "2.20.1";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "HeroicGamesLauncher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nXDQxctzXI/kB6o1ShhrhiloWnpYObG66nMAwxijFto=";
+    hash = "sha256-rgLmm9krjPYjSn/wGAYbnFw7kqvuu9IBipb4ibOClOw=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -48,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-3SkCLoH4ZQzKZIdCkWOfBHt83vjxbpTpMvhMZPCysyI=";
+    hash = "sha256-O3QQsk8pvF9U5QvuMebCsy/iYz1oZIMkPeMtWohqW3w=";
   };
 
   nativeBuildInputs = [
@@ -87,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     mkdir -p "$out/opt/heroic"
-    cp -r dist/linux-unpacked/resources "$out/opt/heroic"
+    cp -r dist/*-unpacked/resources "$out/opt/heroic"
 
     bin_dir="$out/opt/heroic/resources/app.asar.unpacked/build/bin"
 
@@ -112,7 +111,13 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper "${lib.getExe electron}" "$out/bin/heroic" \
       --inherit-argv0 \
       --set ELECTRON_FORCE_IS_PACKAGED 1 \
-      --suffix PATH ":" "${umu-launcher}/bin" \
+      --suffix PATH ":" "${
+        lib.makeBinPath (
+          lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
+            umu-launcher
+          ]
+        )
+      }" \
       --add-flags --disable-gpu-compositing \
       --add-flags $out/opt/heroic/resources/app.asar \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
@@ -120,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
     install -D "flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications/com.heroicgameslauncher.hgl.desktop"
     install -D "src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg"
     substituteInPlace "$out/share/applications/com.heroicgameslauncher.hgl.desktop" \
-      --replace-fail "Exec=heroic-run --ozone-platform-hint=auto" "Exec=heroic"
+      --replace-fail "Exec=heroic-run" "Exec=heroic"
 
     runHook postInstall
   '';
@@ -142,10 +147,10 @@ stdenv.mkDerivation (finalAttrs: {
       baksa
     ];
     # Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform.
-    # It may also work on other Linux targets, but all the game stores only
-    # support x86 Linux, so it would require extra hacking to run games via QEMU
-    # user emulation.  Upstream provide Linux builds only for x86_64.
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
     mainProgram = "heroic";
   };
 })
diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix
index 9c859f85dd05..a9b7ca3f44a3 100644
--- a/pkgs/by-name/he/hexpatch/package.nix
+++ b/pkgs/by-name/he/hexpatch/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hexpatch";
-  version = "1.12.5";
+  version = "1.12.6";
 
   src = fetchFromGitHub {
     owner = "Etto48";
     repo = "HexPatch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2FTFVKFql28S3/03M64FJyrwWuI0Zeg8z/nrWZJzGIo=";
+    hash = "sha256-72OfAQxQJqiaihSZ0QhKJAsnL0ILkdfwr9k7cSb6Obw=";
   };
 
-  cargoHash = "sha256-PQEq6g+VItcIG3GBl5sOFtPVZem27+n2JTPjK23xIt8=";
+  cargoHash = "sha256-8iE9fDereQuQD02hI6UmvOa8JlFyoMZ++4yALKLLPzU=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/he/hey-mail/package.nix b/pkgs/by-name/he/hey-mail/package.nix
index eca024314d9d..26c2a482e23d 100644
--- a/pkgs/by-name/he/hey-mail/package.nix
+++ b/pkgs/by-name/he/hey-mail/package.nix
@@ -94,12 +94,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hey-mail";
-  version = "1.3.1";
-  rev = "29";
+  version = "1.3.3";
+  rev = "31";
 
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/lfWUNpR7PrPGsDfuxIhVxbj0wZHoH7bK_${finalAttrs.rev}.snap";
-    hash = "sha512-mDMFD5G+TWpcCDNphvHegwlVGebw4aauShq7wJRF7F+iXX7E65+S00JpYWHu8PhUQeoVK4DkA4JkLfMq0D2lHA==";
+    hash = "sha512-0KhmZ1xkEPuuzukeKbWW7jeNh2TOINMnOtuwpZQIM7sgDhCSl2DEZnguEKY2DvGNTTQxVWSZcuU/KSSblqIE4Q==";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix
index af2aa2003423..48c1d31fc580 100644
--- a/pkgs/by-name/hi/hickory-dns/package.nix
+++ b/pkgs/by-name/hi/hickory-dns/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hickory-dns";
-  version = "0.26.0";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "hickory-dns";
     repo = "hickory-dns";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1VryKiE7kri7XQmVpCmZjc98L9iN60UVz5bNgphjDAU=";
+    hash = "sha256-jRcq9b409O5bjta8hFLFBFC6ILf8QA2EZ8tQqk2m1Rk=";
   };
 
-  cargoHash = "sha256-El5NuGevzTpHJP5MVYjyED0UwV7xM9iwv/X7x5Gz/+I=";
+  cargoHash = "sha256-zszSkclNCLGVchWiNdtNLJeY2j5CmubjMjhwVwsvRP8=";
 
   buildFeatures = [
     "blocklist"
@@ -89,6 +89,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       adamcstephens
       colinsane
+      cpu
     ];
     platforms = lib.platforms.linux;
     license = with lib.licenses; [
diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix
index 0a077520a74a..d0a6c34b1026 100644
--- a/pkgs/by-name/hi/high-tide/package.nix
+++ b/pkgs/by-name/hi/high-tide/package.nix
@@ -20,14 +20,14 @@
 
 python313Packages.buildPythonApplication (finalAttrs: {
   pname = "high-tide";
-  version = "1.3.0";
+  version = "1.3.1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Nokse22";
     repo = "high-tide";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BJN29Ew4yN2Whk9BVuo/eaumrN/65boeWc35lwbpBXg=";
+    hash = "sha256-42R4GrFioePGOiM/p9LLE3PR/TYhhnjwa9V/kvP4SWE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix
index 754e2e8466a7..b52dfbe9e6ec 100644
--- a/pkgs/by-name/hi/highs/package.nix
+++ b/pkgs/by-name/hi/highs/package.nix
@@ -4,29 +4,26 @@
   fetchFromGitHub,
   clang,
   cmake,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highs";
-  version = "1.12.0";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "ERGO-Code";
     repo = "HiGHS";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-FRiYtbl1kWEkHHEIIOpefC9UdusmJKl6UmP3dKRkAXA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0KmA5B2g3AFCxMbN9gHdXxAEftZglhQKOqj1/TMxxps=";
   };
 
   strictDeps = true;
+  __structuredAttrs = true;
 
-  outputs = [ "out" ];
-
+  nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
-  installCheckPhase = ''
-    "$out/bin/highs" --version
-  '';
-
   nativeBuildInputs = [
     clang
     cmake
diff --git a/pkgs/by-name/hi/highscore-mgba/package.nix b/pkgs/by-name/hi/highscore-mgba/package.nix
index f629fe2e9f0b..4e95cb7b5208 100644
--- a/pkgs/by-name/hi/highscore-mgba/package.nix
+++ b/pkgs/by-name/hi/highscore-mgba/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation {
   pname = "highscore-mgba";
-  version = "0-unstable-2026-02-03";
+  version = "0-unstable-2026-04-26";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "mgba";
-    rev = "178d7dbe3c2927f2fc52a6032bc7b6c805192e9b";
-    hash = "sha256-AXOe2YoYQDeRpicYD9B9BR2l0rCJ+syYTwTnJUIcG1U=";
+    rev = "4a1ca6566fc1c0a67341ddadfc18011aa0a0578f";
+    hash = "sha256-zcRynN01O6zAcOuV/q9u7kL5elFTDJ2tA3wTJR3JBt0=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/hi/highscore-nestopia/package.nix b/pkgs/by-name/hi/highscore-nestopia/package.nix
index ca8046c548af..7bf2dfc936a6 100644
--- a/pkgs/by-name/hi/highscore-nestopia/package.nix
+++ b/pkgs/by-name/hi/highscore-nestopia/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highscore-nestopia";
-  version = "0-unstable-2025-12-30";
+  version = "0-unstable-2026-03-03";
 
   src = fetchFromGitLab {
     owner = "highscore-emu";
     repo = "nestopia";
-    rev = "529e69b6e577f42a246c8fa44ef7f3095647adaf";
-    hash = "sha256-2aBEtut6AShP1Nz0BqNTFD3/gN2cj5PY8JL8WbLE7XE=";
+    rev = "0ef62709df9ff3af8729c9d7dc257d8fbc2cd48c";
+    hash = "sha256-DRA1l5wV/jZhbFni5ZXD6agObt+XZYrPIbgkzSgUGEo=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/highscore";
diff --git a/pkgs/by-name/hi/highscore-sameboy/package.nix b/pkgs/by-name/hi/highscore-sameboy/package.nix
index 05872a1bfff9..2dbf26a11db8 100644
--- a/pkgs/by-name/hi/highscore-sameboy/package.nix
+++ b/pkgs/by-name/hi/highscore-sameboy/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highscore-sameboy";
-  version = "0-unstable-2026-02-17";
+  version = "0-unstable-2026-04-01";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "SameBoy";
-    rev = "aae1571db7de438638d4180dc451b1b348d5a135";
-    hash = "sha256-PZNWzN/C6QPTgNLIsN55cE/3DyfcUdUknAUjxZ7sJvA=";
+    rev = "f59693cc4f1f3ac547eaf25856574fb850c1da61";
+    hash = "sha256-GzBTB3lqWi+Cw24fFVN9YBa3ecOA5G9756RWM6mMxvA=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/highscore";
diff --git a/pkgs/by-name/hi/highscore-stella/package.nix b/pkgs/by-name/hi/highscore-stella/package.nix
index 11d037fa431d..2b924bb6b63a 100644
--- a/pkgs/by-name/hi/highscore-stella/package.nix
+++ b/pkgs/by-name/hi/highscore-stella/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highscore-stella";
-  version = "0-unstable-2026-01-27";
+  version = "0-unstable-2026-04-02";
 
   src = fetchFromGitHub {
     owner = "highscore-emu";
     repo = "stella";
-    rev = "689e4325099fbc348a92be40237d94bba692aff4";
-    hash = "sha256-7+/qgWUiL/dzacuFmbQiAOO+R71rFas+Tf0kpZHOjgY=";
+    rev = "d4e5a1f26fd62766e2ff9eb070f59efa89d68ed6";
+    hash = "sha256-/TbINGmvsDFxTwdaewg1Hv/fDQMk4ELz6j1TDLaffUQ=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src/os/highscore";
diff --git a/pkgs/by-name/hi/hilbish/package.nix b/pkgs/by-name/hi/hilbish/package.nix
index 13ddddda91d8..b262d6367f70 100644
--- a/pkgs/by-name/hi/hilbish/package.nix
+++ b/pkgs/by-name/hi/hilbish/package.nix
@@ -9,7 +9,7 @@ buildGoModule (finalAttrs: {
   version = "2.3.4";
 
   src = fetchFromGitHub {
-    owner = "Rosettea";
+    owner = "sammy-ette";
     repo = "Hilbish";
     tag = "v${finalAttrs.version}";
     hash = "sha256-rEBUrDdJBCywuSmsxFLl4+uSwz06km2nztH5aCGcGiE=";
@@ -38,8 +38,8 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Interactive Unix-like shell written in Go";
     mainProgram = "hilbish";
-    changelog = "https://github.com/Rosettea/Hilbish/releases/tag/v${finalAttrs.version}";
-    homepage = "https://github.com/Rosettea/Hilbish";
+    changelog = "https://github.com/sammy-ette/Hilbish/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/sammy-ette/Hilbish";
     maintainers = with lib.maintainers; [ moni ];
     license = lib.licenses.mit;
   };
diff --git a/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
index 15854a71717b..8859c68f0fd2 100644
--- a/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
+++ b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation rec {
   meta = {
     description = "Complex account balance assertions for hledger journals";
     homepage = "https://hledger.org/";
-    changelog = "https://github.com/simonmichael/hledger/blob/master/CHANGES.md";
+    changelog = "https://github.com/simonmichael/hledger/blob/${version}/hledger/CHANGES.md";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.DamienCassou ];
     platforms = lib.platforms.all; # GHC can cross-compile
diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix
index b1fbd152a13c..cdf46b5de703 100644
--- a/pkgs/by-name/hm/hmcl/package.nix
+++ b/pkgs/by-name/hm/hmcl/package.nix
@@ -50,13 +50,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hmcl";
-  version = "3.12.4";
+  version = "3.13.2";
 
   src = fetchurl {
     # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key.
     # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28
     url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar";
-    hash = "sha256-CxLs3rMW++FGF7WV9EMIb+69ZrnV2MadEHD/NMyXBIw=";
+    hash = "sha256-2OLtf47fmNiEFOkjHiDCj99seiMy25PlmRDSFKu9WFI=";
   };
 
   # - HMCL prompts users to download prebuilt Terracotta binary for
diff --git a/pkgs/by-name/hn/hnswlib/package.nix b/pkgs/by-name/hn/hnswlib/package.nix
index 915a1ba23b7a..f93998809087 100644
--- a/pkgs/by-name/hn/hnswlib/package.nix
+++ b/pkgs/by-name/hn/hnswlib/package.nix
@@ -15,13 +15,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hnswlib";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "nmslib";
     repo = "hnswlib";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1KkAX42j/I06KO4wCnDsDifN1JiENqYKR5NNHBjyuVA=";
+    hash = "sha256-tYzx92eKRFcZ+RW5mcAw1SFT5aRHvdDr9oBsWj6xZbg=";
   };
 
   # this is a header-only library, so we don't need to build it
diff --git a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix
new file mode 100644
index 000000000000..9b45a6d213b0
--- /dev/null
+++ b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  nodejs,
+  pnpm_10,
+  pnpmConfigHook,
+  fetchPnpmDeps,
+  makeWrapper,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "home-assistant-matter-hub";
+  version = "2.0.43";
+
+  src = fetchFromGitHub {
+    owner = "RiDDiX";
+    repo = "home-assistant-matter-hub";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Dls5TglEIFvVGpg8ENTb6IhCwJermmREHuJnalF4kJ4=";
+  };
+
+  # The bundled cli.js imports transitive dependencies (e.g. @noble/curves)
+  # directly, so we need a flat node_modules tree for Node's resolver to
+  # find them.
+  pnpmInstallFlags = [ "--shamefully-hoist" ];
+  pnpmWorkspaces = [ "home-assistant-matter-hub..." ];
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      pnpmInstallFlags
+      pnpmWorkspaces
+      ;
+    fetcherVersion = 3;
+    hash = "sha256-1DaR4q1QH07UR+EchfDI92bTdRY4C2IaGIRj426DURI=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # Workspace package.json files all carry "0.0.0"; the real version is
+  # injected at release time via APP_VERSION (consumed by vite for the
+  # frontend bundle and by the backend at runtime).
+  env.APP_VERSION = finalAttrs.version;
+
+  nativeBuildInputs = [
+    nodejs
+    pnpm_10
+    pnpmConfigHook
+    makeWrapper
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm --filter home-assistant-matter-hub... run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/apps/home-assistant-matter-hub
+
+    tar -xf apps/home-assistant-matter-hub/package.tgz \
+      --strip-components=1 \
+      -C $out/share/apps/home-assistant-matter-hub
+
+    # pnpm cannot recursively prune monorepos, so we follow pnpm's
+    # recommendation of removing all node_modules and reinstalling
+    # only the production dependencies we need.
+    find . -name node_modules -type d -prune -exec rm -rf {} +
+    pnpm install --offline --prod --filter-prod home-assistant-matter-hub --shamefully-hoist
+
+    # Workspace symlinks under apps/home-assistant-matter-hub/node_modules use
+    # relative paths into the top-level node_modules/.pnpm store, so we keep
+    # the original directory layout under $out/share.
+    mv node_modules $out/share/
+    mv apps/home-assistant-matter-hub/node_modules $out/share/apps/home-assistant-matter-hub/
+
+    makeWrapper ${lib.getExe nodejs} "$out/bin/home-assistant-matter-hub" \
+      --add-flags "$out/share/apps/home-assistant-matter-hub/dist/backend/cli.js" \
+      --set NODE_ENV production \
+      --set APP_VERSION ${finalAttrs.version}
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Publish your home-assistant instance using Matter";
+    homepage = "https://riddix.github.io/home-assistant-matter-hub/";
+    changelog = "https://github.com/RiDDiX/home-assistant-matter-hub/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      kranzes
+      marie
+    ];
+    mainProgram = "home-assistant-matter-hub";
+    inherit (nodejs.meta) platforms;
+  };
+})
diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index 60410234e64c..b1ff6594ddcb 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2026-04-14";
+  version = "0-unstable-2026-04-24";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "3c7524c68348ef79ce48308e0978611a050089b2";
-    hash = "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=";
+    rev = "5826802354a74af18540aef0b01bc1320f82cc17";
+    hash = "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
index 94bb3693acc1..e71d62abff52 100644
--- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
+++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
@@ -13,23 +13,23 @@
 
 buildNpmPackage.override { nodejs = nodejs_22; } (finalAttrs: {
   pname = "homebridge-config-ui-x";
-  version = "5.18.0";
+  version = "5.22.0";
 
   src = fetchFromGitHub {
     owner = "homebridge";
     repo = "homebridge-config-ui-x";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bdE/uu3uh3qgPNaDKU47wD1LtER/wJfLmwp2J624rK4=";
+    hash = "sha256-UVrl0TGSNQPnNZ76XkY+nf+a/6r037k0Y2RWe4nyBwI=";
   };
 
   # Deps hash for the root package
-  npmDepsHash = "sha256-pbmnAAQs6RVwklAoKY4LY0k+nheX2BeAgkQEFNVDofc=";
+  npmDepsHash = "sha256-AStDHQSDD2CpS9eSuDYeogs0PgHoQ4doTwzHD0XVU+A=";
 
   # Deps src and hash for ui subdirectory
   npmDeps_ui = fetchNpmDeps {
     name = "npm-deps-ui";
     src = "${finalAttrs.src}/ui";
-    hash = "sha256-uBB2WxbCXJL2Ys6sMFcLUlh88TLAz3U+XMhvDc8yFPk=";
+    hash = "sha256-20WItWmuHiNF/DNbenlxCro09O3bOTBsTD9T+gvvlJ0=";
   };
 
   # Need to also run npm ci in the ui subdirectory
diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index 370f4316e979..91f8b7fc6529 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "homer";
-  version = "26.4.1";
+  version = "26.4.2";
 
   src = fetchFromGitHub {
     owner = "bastienwirtz";
     repo = "homer";
     rev = "v${version}";
-    hash = "sha256-zb6A0h0OuSUxh43tO/ksKXvkjrJMwNCsRJwgIy7eXpk=";
+    hash = "sha256-XQjXRckrZ9LhAFp/v/OUJJ80odS5mXhQserPNx0mvwM=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec {
       ;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-7BLQHmnw+FfUm9R5//8kEBusM2O+wbTF5joHo60zKfQ=";
+    hash = "sha256-rDKnaIE1ZQ2I83RdlHWtgoMcDoFe7tE102LP2+SPmFg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ht/html2pdf/package.nix b/pkgs/by-name/ht/html2pdf/package.nix
index 2e5b249857ac..cc07d2c5fb53 100644
--- a/pkgs/by-name/ht/html2pdf/package.nix
+++ b/pkgs/by-name/ht/html2pdf/package.nix
@@ -47,10 +47,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "CLI tool to convert local HTML files to PDF";
     homepage = "https://github.com/ilaborie/html2pdf";
     changelog = "https://github.com/ilaborie/html2pdf/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with lib.licenses; [
-      mit
-      asl20
-    ];
+    license =
+      with lib.licenses;
+      OR [
+        mit
+        asl20
+      ];
     maintainers = with lib.maintainers; [
       kachick
     ];
diff --git a/pkgs/by-name/ht/html2text/gettext-0.25.patch b/pkgs/by-name/ht/html2text/gettext-0.25.patch
deleted file mode 100644
index ebc2aa9a0188..000000000000
--- a/pkgs/by-name/ht/html2text/gettext-0.25.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index af28077..e746147 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -13,6 +13,8 @@
- AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I m4
- 
-+SUBDIRS =
-+
- AM_YFLAGS = -d -Wno-yacc
- 
- bin_PROGRAMS = html2text
-diff --git a/configure.ac b/configure.ac
-index 999c6fe..30c2536 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,8 +15,11 @@
- 
- AC_PREREQ([2.71])
- AC_INIT([html2text], [2.3.0], [BUG-REPORT-ADDRESS])
-+AC_CONFIG_MACRO_DIRS([m4])
- AM_INIT_AUTOMAKE
- AM_MAINTAINER_MODE([disable])
-+AM_GNU_GETTEXT_VERSION([0.20])
-+AM_GNU_GETTEXT([external])
- AM_ICONV
- #AC_CONFIG_SRCDIR([html.h])
- #AC_CONFIG_HEADERS([config.h])
diff --git a/pkgs/by-name/ht/html2text/package.nix b/pkgs/by-name/ht/html2text/package.nix
index 1f996d3d620a..eeba214de0e5 100644
--- a/pkgs/by-name/ht/html2text/package.nix
+++ b/pkgs/by-name/ht/html2text/package.nix
@@ -5,33 +5,26 @@
   autoconf-archive,
   autoreconfHook,
   bison,
-  gettext,
   libiconv,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "html2text";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitLab {
     owner = "grobian";
     repo = "html2text";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-e/KWyc7lOdWhtFC7ZAD7sYgCsO3JzGkLUThVI7edqIQ=";
+    hash = "sha256-C229ogU2YStXWizb51whQXc6oSkVnclnOeJYlIMvHWM=";
   };
 
   nativeBuildInputs = [
     autoconf-archive
     autoreconfHook
     bison
-    gettext
   ];
 
-  # These changes have all been made in HEAD, across several commits
-  # amongst other changes.
-  # See https://gitlab.com/grobian/html2text/-/merge_requests/57
-  patches = [ ./gettext-0.25.patch ];
-
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
   meta = {
diff --git a/pkgs/by-name/ht/htop/package.nix b/pkgs/by-name/ht/htop/package.nix
index a159d4b3dce0..4ae8a43bd410 100644
--- a/pkgs/by-name/ht/htop/package.nix
+++ b/pkgs/by-name/ht/htop/package.nix
@@ -19,13 +19,13 @@ assert systemdSupport -> stdenv.hostPlatform.isLinux;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "htop" + lib.optionalString withVimKeys "-vim";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "htop-dev";
     repo = "htop";
     tag = finalAttrs.version;
-    hash = "sha256-RVJH7osffP3vU74A3e2mjGBAB0ZPMBisBL8n2kDMB+Q=";
+    hash = "sha256-mw7pixNk+AF2Hz8YUkkUleQpR8yNF0pb1NjYgID076A=";
   };
 
   patches = lib.optional withVimKeys (fetchpatch2 {
diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix
deleted file mode 100644
index 3527b5f3a167..000000000000
--- a/pkgs/by-name/ht/httplz/package.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchCrate,
-  installShellFiles,
-  makeWrapper,
-  pkg-config,
-  ronn,
-  openssl,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "httplz";
-  version = "1.13.2";
-
-  src = fetchCrate {
-    inherit (finalAttrs) version;
-    pname = "https";
-    hash = "sha256-uxEMgSrcxMZD/3GQuH9S/oYtMUPzgMR61ZzLcb65zXU=";
-  };
-
-  cargoHash = "sha256-DXSHaiiIRdyrlX4UYPFD3aTAv65k3x/PU2VW047odH0=";
-
-  nativeBuildInputs = [
-    installShellFiles
-    makeWrapper
-    pkg-config
-    ronn
-  ];
-
-  buildInputs = [ openssl ];
-
-  cargoBuildFlags = [
-    "--bin"
-    "httplz"
-  ];
-
-  postInstall = ''
-    sed -E 's/http(`| |\(|$)/httplz\1/g' http.md > httplz.1.ronn
-    RUBYOPT=-Eutf-8:utf-8 ronn --organization "http developers" -r httplz.1.ronn
-    installManPage httplz.1
-    wrapProgram $out/bin/httplz \
-      --prefix PATH : "${openssl}/bin"
-  '';
-
-  meta = {
-    description = "Basic http server for hosting a folder fast and simply";
-    mainProgram = "httplz";
-    homepage = "https://github.com/thecoshman/http";
-    changelog = "https://github.com/thecoshman/http/releases/tag/v${finalAttrs.version}";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.matthiasbeyer ];
-  };
-})
diff --git a/pkgs/by-name/hu/hubble/package.nix b/pkgs/by-name/hu/hubble/package.nix
index e42476c56892..f78497cd86fd 100644
--- a/pkgs/by-name/hu/hubble/package.nix
+++ b/pkgs/by-name/hu/hubble/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "hubble";
-  version = "1.18.6";
+  version = "1.19.3";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "hubble";
     tag = "v${version}";
-    hash = "sha256-I/+QE+HY+dU4ZIj/8vP7Ij/eInSn1pxuTNDghIsVXt0=";
+    hash = "sha256-aqHFSb0q3WyBP8uPfA02vWKvMCiO9n4MYOL4o/twlIE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/huggle/00-remove-third-party.patch b/pkgs/by-name/hu/huggle/00-remove-third-party.patch
similarity index 100%
rename from pkgs/applications/misc/huggle/00-remove-third-party.patch
rename to pkgs/by-name/hu/huggle/00-remove-third-party.patch
diff --git a/pkgs/applications/misc/huggle/01-extensions.patch b/pkgs/by-name/hu/huggle/01-extensions.patch
similarity index 100%
rename from pkgs/applications/misc/huggle/01-extensions.patch
rename to pkgs/by-name/hu/huggle/01-extensions.patch
diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/by-name/hu/huggle/package.nix
similarity index 87%
rename from pkgs/applications/misc/huggle/default.nix
rename to pkgs/by-name/hu/huggle/package.nix
index 59d375ed1cf9..70455ca0f352 100644
--- a/pkgs/applications/misc/huggle/default.nix
+++ b/pkgs/by-name/hu/huggle/package.nix
@@ -6,26 +6,25 @@
   ncurses,
   which,
   cmake,
-  wrapQtAppsHook,
-  qtwebengine,
+  qt6,
   yaml-cpp,
   libirc,
 }:
 
 stdenv.mkDerivation rec {
   pname = "huggle";
-  version = "3.4.13";
+  version = "3.4.14";
 
   src = fetchFromGitHub {
     owner = "huggle";
     repo = "huggle3-qt-lx";
     rev = version;
-    sha256 = "sha256-f7Oo6x262Ju9KY8f/xjm9gL6I1fRCaDsQWGWJMUNUfY=";
+    hash = "sha256-obArs5NqjHbuWv+zNGAuulHQz6MUIejRqNvg2l5eZxc=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
     pkg-config
     which
     cmake
@@ -33,7 +32,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     yaml-cpp
-    qtwebengine
+    qt6.qtmultimedia
+    qt6.qtwebengine
     libirc
   ];
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     "-S"
     "/build/source/src"
     "-DINSTALL_DATA_DIR=bin"
-    "-DQT5_BUILD=ON"
+    "-DQT6_BUILD=ON"
     "-DWEB_ENGINE=ON"
     "-DBUILD_SHARED_LIBS=OFF"
     "-Wno-dev"
diff --git a/pkgs/by-name/hu/humblebundle-downloader/package.nix b/pkgs/by-name/hu/humblebundle-downloader/package.nix
index 4cc84a78f0af..7be31c6e5151 100644
--- a/pkgs/by-name/hu/humblebundle-downloader/package.nix
+++ b/pkgs/by-name/hu/humblebundle-downloader/package.nix
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     mainProgram = "hbd";
     homepage = "https://github.com/xtream1101/humblebundle-downloader";
     changelog = "https://github.com/xtream1101/humblebundle-downloader/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jopejoe1 ];
   };
 })
diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix
index 9e88526868b5..c24e5e356ead 100644
--- a/pkgs/by-name/hu/hunspell/dictionaries.nix
+++ b/pkgs/by-name/hu/hunspell/dictionaries.nix
@@ -88,7 +88,7 @@ let
            --replace /dev/stderr stderr.log
 
         substituteInPlace ortograf/herramientas/remover_comentarios.sh \
-           --replace /bin/bash ${bash}/bin/bash \
+           --replace /bin/bash ${bash}/bin/bash
       '';
       buildPhase = ''
         cd ortograf/herramientas
diff --git a/pkgs/by-name/hu/hut/package.nix b/pkgs/by-name/hu/hut/package.nix
index 6b6053067bdf..fe32cf221f19 100644
--- a/pkgs/by-name/hu/hut/package.nix
+++ b/pkgs/by-name/hu/hut/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "hut";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromSourcehut {
     owner = "~xenrox";
     repo = "hut";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-pc6E3ORDmaMhoNe8GQeYZrxhe5ySQqsMPe/iUbclnGk=";
+    hash = "sha256-dbFqc+zlUihf/gz4Oo3LtbOClDDDB/khlCbI9/UgD2E=";
   };
 
-  vendorHash = "sha256-/51cv/EvcBCyCOf91vJ5M75p0bkAQqVoRUp+C+i70Os=";
+  vendorHash = "sha256-7N+Zn7tzEG3dGeqNWmY98XUUKV7Y6g8wFZcQP9wea/8=";
 
   nativeBuildInputs = [
     scdoc
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
   makeFlags = [ "PREFIX=$(out)" ];
 
   ldflags = [
-    # Recommended in 0.7.0 release notes https://git.sr.ht/~xenrox/hut/refs/v0.7.0
+    # Recommended in 0.8.0 release notes https://git.sr.ht/~xenrox/hut/refs/v0.8.0
     "-X main.version=v${finalAttrs.version}"
   ];
 
diff --git a/pkgs/by-name/hw/hwatch/package.nix b/pkgs/by-name/hw/hwatch/package.nix
index 8d2c7f624f55..f9e804317157 100644
--- a/pkgs/by-name/hw/hwatch/package.nix
+++ b/pkgs/by-name/hw/hwatch/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellCompletion --cmd hwatch \
       --bash $src/completion/bash/hwatch-completion.bash \
       --fish $src/completion/fish/hwatch.fish \
-      --zsh $src/completion/zsh/_hwatch \
+      --zsh $src/completion/zsh/_hwatch
   '';
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix
index 6414ea06147f..0678443277a9 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hwdata";
-  version = "0.405";
+  version = "0.406";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KfbERfKLwqOct7vvCf8+31VZNwhVzn4wALWgmLczu5Y=";
+    hash = "sha256-6GXXkDzunbtea+MmmWV2gpHgCgdGi75U+TV9H/6Emtk=";
   };
 
   doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)
diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix
index aece2ac3c718..743bd933fd4d 100644
--- a/pkgs/by-name/hy/hydrus/package.nix
+++ b/pkgs/by-name/hy/hydrus/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "hydrus";
-  version = "666";
+  version = "668";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ikj1COV9eIp6UBk5zmxF1hwTY12K7Ut8hLM2Nvw7jis=";
+    hash = "sha256-F6sQ2AyAIE7z7GH942sgzVbufA5GHEazoG+4YN8cFxQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index 9ff29a06b000..41fe9c8ac965 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace CMakeLists.txt \
       --replace-fail \
         "cmake_minimum_required (VERSION 2.8.11)" \
-        "cmake_minimum_required (VERSION 3.10)" \
+        "cmake_minimum_required (VERSION 3.10)"
   '';
 
   buildInputs = [ boost ];
diff --git a/pkgs/by-name/hy/hyprlauncher/package.nix b/pkgs/by-name/hy/hyprlauncher/package.nix
index 8ac724e71cd7..f3369ddfb7f0 100644
--- a/pkgs/by-name/hy/hyprlauncher/package.nix
+++ b/pkgs/by-name/hy/hyprlauncher/package.nix
@@ -19,13 +19,13 @@
 
 gcc15Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprlauncher";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprlauncher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nu3pMtkMwKsEhpBE4XMpayXDGdnrXVXrscSsxp7qf1I=";
+    hash = "sha256-FHw6S2rz716ZwuF661aT5HYN1b6qyyBDkwhEL5hzHUk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix
index b07154701402..d0c1b4d9c399 100644
--- a/pkgs/by-name/hy/hyprls/package.nix
+++ b/pkgs/by-name/hy/hyprls/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "hyprls";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "hyprland-community";
     repo = "hyprls";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5JOJ93XPJ3hFThpLQmQ+EL0wkn+nrq15pwGhZrhc2h0=";
+    hash = "sha256-020bEXaFKZ74dJF5keIXMyRf/MQj0eKNYZXHajHgKUI=";
   };
 
-  vendorHash = "sha256-xSDIGlvJjr2IF04X3uoiVvHN2qgcBSNSDHIkTUxW9eM=";
+  vendorHash = "sha256-av3IZlfb09j6Dakc9lm8rPr85I/+pscjhEcZD04scUo=";
 
   checkFlags = [
     # Not yet implemented
diff --git a/pkgs/by-name/hy/hyprpanel/package.nix b/pkgs/by-name/hy/hyprpanel/package.nix
index 5f22894d9556..458773a33908 100644
--- a/pkgs/by-name/hy/hyprpanel/package.nix
+++ b/pkgs/by-name/hy/hyprpanel/package.nix
@@ -49,7 +49,7 @@ in
 
 ags.bundle {
   pname = "hyprpanel";
-  version = "0-unstable-2026-03-23";
+  version = "0-unstable-2026-04-23";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -57,8 +57,8 @@ ags.bundle {
   src = fetchFromGitHub {
     owner = "Jas-SinghFSU";
     repo = "HyprPanel";
-    rev = "e919b4a8a8ab5f2a0752f68576ab3eed6993cefd";
-    hash = "sha256-92ZbaBfsEXEE7VaWJjv9aRSk3l9nyoYYyMe2AwTqSZI=";
+    rev = "1961ba86ad5ab880beb639e5454054b2b5037e0d";
+    hash = "sha256-QowlCOrE4jGOTDCUCEx/E8gHjqSx3r25y7v4dEBpBhk=";
   };
 
   # keep in sync with https://github.com/Jas-SinghFSU/HyprPanel/blob/master/flake.nix#L42
diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix
index 63c80826c05b..b1d4bf5ed9c2 100644
--- a/pkgs/by-name/hy/hyprpaper/package.nix
+++ b/pkgs/by-name/hy/hyprpaper/package.nix
@@ -37,13 +37,13 @@
 
 gcc15Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprpaper";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprpaper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6N1JeQx9/M3XCcxErk24FLMxTgn8GH40fpckP8X3ons=";
+    hash = "sha256-/4eWbt5XtOHzw3C9U0XPtoy8io03GxrEBd9znWMacbY=";
   };
 
   prePatch = ''
diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix
index d414e1af2629..752e54bb2134 100644
--- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix
+++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix
@@ -9,13 +9,13 @@
 }:
 gcc15Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprwayland-scanner";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprwayland-scanner";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=";
+    hash = "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/hyprwm/hyprwayland-scanner";
     description = "Hyprland version of wayland-scanner in and for C++";
-    changelog = "https://github.com/hyprwm/hyprwayland-scanner/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/hyprwm/hyprwayland-scanner/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
     teams = [ lib.teams.hyprland ];
     mainProgram = "hyprwayland-scanner";
diff --git a/pkgs/by-name/hy/hyprwhspr-rs/package.nix b/pkgs/by-name/hy/hyprwhspr-rs/package.nix
index 3438e0d923be..ccd5a633e1fe 100644
--- a/pkgs/by-name/hy/hyprwhspr-rs/package.nix
+++ b/pkgs/by-name/hy/hyprwhspr-rs/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyprwhspr-rs";
-  version = "0.3.24";
+  version = "0.3.25";
 
   src = fetchFromGitHub {
     owner = "better-slop";
     repo = "hyprwhspr-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tnscv2DYRS6BrFgshEg/X37Yh7yIBKAtUkDemg0RqgU=";
+    hash = "sha256-QG+A5tPG+YJ5qQ3dyUAd1oobMGITAK+GQnpE7zXEshc=";
   };
 
-  cargoHash = "sha256-C7gn0XJRfYaoswSJcnLNQZvYY7lxLrvKp5fUSIsZ0BY=";
+  cargoHash = "sha256-TFx7bVtdNWrjylNHI/DHwechBvOZEZtK/xxdX+RqV/k=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/hy/hyprwire/package.nix b/pkgs/by-name/hy/hyprwire/package.nix
index 8b299b0f2a5e..917ec60083d6 100644
--- a/pkgs/by-name/hy/hyprwire/package.nix
+++ b/pkgs/by-name/hy/hyprwire/package.nix
@@ -11,13 +11,13 @@
 
 gcc15Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprwire";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprwire";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PR/KER+yiHabFC/h1Wjb+9fR2Uy0lWM3Qld7jPVaWkk=";
+    hash = "sha256-AKPaKeLDy0QXRBk/XzR7RktX7CV63ejYsTUgsPdXKvg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hy/hysteria/package.nix b/pkgs/by-name/hy/hysteria/package.nix
index 8469069a1a98..36cb48b7f6b8 100644
--- a/pkgs/by-name/hy/hysteria/package.nix
+++ b/pkgs/by-name/hy/hysteria/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "hysteria";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchFromGitHub {
     owner = "apernet";
     repo = "hysteria";
     rev = "app/v${finalAttrs.version}";
-    hash = "sha256-KxCf9btvEbwP+oWL6A6rWpQsRJPifohFLDIdr+0XwzM=";
+    hash = "sha256-HgZVwaHL5q8aOxHhVt6RaHaBxoj83ujHaqLemQkLRUM=";
   };
 
-  vendorHash = "sha256-NXBxrKptXTZzEXZ5hYHtC3wbFIYgL9avJay6DJHRMLU=";
+  vendorHash = "sha256-oHxnawchsHU/M1PZ0zXR5luopso1FptXi+PL5pNgdj0=";
   proxyVendor = true;
 
   ldflags =
diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix
index 28fcc1e92e80..a99f43feac93 100644
--- a/pkgs/by-name/i2/i2pd/package.nix
+++ b/pkgs/by-name/i2/i2pd/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "i2pd";
-  version = "2.59.0";
+  version = "2.60.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = "i2pd";
     tag = finalAttrs.version;
-    hash = "sha256-PBwjP54gVtMduN//OXxd35KnRJv7sbA1MIUU+1KNUac=";
+    hash = "sha256-oVC31GpygznXbmjQ3qv3XZ58jZ9l6ibBoueuBM5Hk0M=";
   };
 
   postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
diff --git a/pkgs/by-name/ia/iaito/package.nix b/pkgs/by-name/ia/iaito/package.nix
index f576375c73d6..38cd87da1013 100644
--- a/pkgs/by-name/ia/iaito/package.nix
+++ b/pkgs/by-name/ia/iaito/package.nix
@@ -7,18 +7,21 @@
   python3,
   qt6Packages,
   radare2,
+  xvfb-run,
+  breakpointHook,
+  writableTmpDirAsHomeHook,
   stdenv,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "iaito";
-  version = "6.1.0";
+  version = "6.1.4";
 
   srcs = [
     (fetchFromGitHub {
       owner = "radareorg";
       repo = "iaito";
       tag = finalAttrs.version;
-      hash = "sha256-nvMx0zbfsphfBgxdQnk+EhRpQnJ2Qv05rF7w+zQUUQg=";
+      hash = "sha256-HKh5D96Dwo6YttWcOMlFy4H9OS3FbQvQ5RK+aOY4V5s=";
       name = "main";
     })
     (fetchFromGitHub {
@@ -47,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     qt6Packages.qttools
     qt6Packages.wrapQtAppsHook
+    breakpointHook
   ];
 
   buildInputs = [
@@ -79,6 +83,22 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  nativeInstallCheckInputs = [
+    xvfb-run
+    writableTmpDirAsHomeHook
+  ];
+
+  # `iaito -v` does only work with GUI access
+  installCheckPhase = ''
+    runHook preCheck
+    xvfb-run -a ${placeholder "out"}/bin/iaito -v | grep "${finalAttrs.version}"
+    runHook postCheck
+  '';
+
+  doInstallCheck = true;
+
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Official radare2 GUI";
     longDescription = ''
diff --git a/pkgs/by-name/ia/iaito/update.sh b/pkgs/by-name/ia/iaito/update.sh
new file mode 100755
index 000000000000..96dfb64c0a32
--- /dev/null
+++ b/pkgs/by-name/ia/iaito/update.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i sh -p curl jq nix-prefetch-github coreutils gnused gnugrep
+# shellcheck shell=sh
+set -eu
+
+# Directory of this script / the iaito package
+SCRIPT_DIR="$(readlink -f "$(dirname "$0")")"
+NIXFILE="$SCRIPT_DIR/package.nix"
+
+# Determine latest release version: use $1 if provided, otherwise auto-detect
+if [ -n "${1:-}" ]; then
+    LATEST_VERSION="$1"
+    echo "Using provided iaito version: $LATEST_VERSION"
+else
+    LATEST_VERSION=$(curl -s https://api.github.com/repos/radareorg/iaito/releases/latest | jq -r '.tag_name')
+    echo "Latest iaito version: $LATEST_VERSION"
+fi
+
+CURRENT_VERSION=$(grep 'version = ' "$NIXFILE" | head -1 | sed 's/.*"\(.*\)".*/\1/')
+echo "Current iaito version: $CURRENT_VERSION"
+
+if [ "$LATEST_VERSION" = "$CURRENT_VERSION" ]; then
+    echo "iaito is already up to date"
+    exit 0
+fi
+
+# Update main source version and hash
+echo "Updating main source to $LATEST_VERSION..."
+MAIN_HASH=$(nix-prefetch-github radareorg iaito --rev "$LATEST_VERSION" --json | jq -r '.hash')
+echo "  New main hash: $MAIN_HASH"
+
+sed -i "s|version = \"$CURRENT_VERSION\"|version = \"$LATEST_VERSION\"|" "$NIXFILE"
+sed -i "/repo = \"iaito\";$/,/})/{s|hash = \".*\"|hash = \"$MAIN_HASH\"|}" "$NIXFILE"
+
+# Update translations to latest master revision
+echo "Updating iaito-translations to latest master..."
+LATEST_TRANS_REV=$(curl -s https://api.github.com/repos/radareorg/iaito-translations/commits/master | jq -r '.sha')
+echo "  Latest translations rev: $LATEST_TRANS_REV"
+
+CURRENT_TRANS_REV=$(grep -A3 'repo = "iaito-translations"' "$NIXFILE" | grep 'rev = ' | sed 's/.*"\(.*\)".*/\1/')
+echo "  Current translations rev: $CURRENT_TRANS_REV"
+
+if [ "$LATEST_TRANS_REV" = "$CURRENT_TRANS_REV" ]; then
+    echo "  Translations unchanged"
+else
+    echo "  Updating translations: $CURRENT_TRANS_REV -> $LATEST_TRANS_REV"
+    TRANS_HASH=$(nix-prefetch-github radareorg iaito-translations --rev "$LATEST_TRANS_REV" --json | jq -r '.hash')
+    echo "  New translations hash: $TRANS_HASH"
+
+    sed -i "/repo = \"iaito-translations\"/,/})/{s|rev = \"$CURRENT_TRANS_REV\"|rev = \"$LATEST_TRANS_REV\"|}" "$NIXFILE"
+    sed -i "/repo = \"iaito-translations\"/,/})/{s|hash = \".*\"|hash = \"$TRANS_HASH\"|}" "$NIXFILE"
+fi
+
+echo "Update complete. Please verify with: nix build .#iaito"
diff --git a/pkgs/by-name/ib/ibm-plex/package.nix b/pkgs/by-name/ib/ibm-plex/package.nix
index b1f48169c21d..aa16c8884815 100644
--- a/pkgs/by-name/ib/ibm-plex/package.nix
+++ b/pkgs/by-name/ib/ibm-plex/package.nix
@@ -2,6 +2,8 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  symlinkJoin,
+  installFonts,
   families ? [ ],
 }:
 let
@@ -18,22 +20,28 @@ stdenvNoCC.mkDerivation {
   pname = "ibm-plex";
   inherit version;
 
-  srcs = map (
-    family:
-    fetchzip {
-      url = "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-${family}%40${version}/ibm-plex-${family}.zip";
-      hash = availableFamilies.${family};
-    }
-  ) selectedFamilies;
+  src = symlinkJoin {
+    name = "ibm-plex-src";
+    paths = map (
+      family:
+      fetchzip {
+        url = "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-${family}%40${version}/ibm-plex-${family}.zip";
+        hash = availableFamilies.${family};
+      }
+    ) selectedFamilies;
+    postBuild = ''
+      find "$out" \( -name hinted -or -name unhinted -or -name split \) -exec rm -fr {} +
+    '';
+  };
 
-  dontUnpack = true;
   sourceRoot = ".";
 
-  installPhase = ''
-    runHook preInstall
-    find $srcs -type f -name '*.otf' -exec install -Dm644 {} -t $out/share/fonts/opentype \;
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
+
+  outputs = [
+    "out"
+    "webfont"
+  ];
 
   passthru.updateScript = ./update.sh;
 
@@ -44,6 +52,7 @@ stdenvNoCC.mkDerivation {
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
+      ners
       romildo
       ryanccn
     ];
diff --git a/pkgs/by-name/ib/ibtool/package.nix b/pkgs/by-name/ib/ibtool/package.nix
index 9441b257e37c..7729742bf4c5 100644
--- a/pkgs/by-name/ib/ibtool/package.nix
+++ b/pkgs/by-name/ib/ibtool/package.nix
@@ -6,14 +6,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "ibtool";
-  version = "1.1.4";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "viraptor";
     repo = "ibtool";
     tag = finalAttrs.version;
-    hash = "sha256-D0AzcLBmcqdEZy1Td96CnJGgRID7FnbNeqKJ7xQUvlE=";
+    hash = "sha256-vFjB+eDw8RP28UGzmc2Sbes8/qNEj1W5fzB6Lnjx6ZI=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/id/idescriptor/package.nix b/pkgs/by-name/id/idescriptor/package.nix
index 279482cdaf16..6c337e1e735c 100644
--- a/pkgs/by-name/id/idescriptor/package.nix
+++ b/pkgs/by-name/id/idescriptor/package.nix
@@ -2,11 +2,14 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   buildGoModule,
   nix-update-script,
   copyDesktopItems,
   makeDesktopItem,
+  cargo,
   cmake,
+  corrosion,
   pkg-config,
   avahi-compat,
   ffmpeg,
@@ -25,19 +28,35 @@
   pugixml,
   qt6,
   lxqt,
+  rustPlatform,
+  rustc,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "idescriptor";
-  version = "0.3.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "iDescriptor";
     repo = "iDescriptor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tBTAJqXDqWAqrxQlEEi2kDcVqrB6WrBquxvKV2dkpQ4=";
+    hash = "sha256-AN3CVR9WWa9cG6C6q+hiDyTomT+RebHC1ghr6XyEtAo=";
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/iDescriptor/iDescriptor/commit/fc73e3146dc4884cf9bc1f7879574ac832cc21e6.patch";
+      hash = "sha256-WqEpSY/fhbsMv0bgU2Ak5japUdohaN7zsNG1BbxJnKs=";
+    })
+  ];
+
+  cargoRoot = "src/rust";
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src cargoRoot;
+    hash = "sha256-PJhMb+lMiu8ubOYVX8YVkQzeQMbBO+i6NQhvuyrCujk=";
+  };
+
   ipatool-go-modules =
     (buildGoModule {
       pname = "ipatool-go";
@@ -50,15 +69,19 @@ stdenv.mkDerivation (finalAttrs: {
     }).goModules;
 
   nativeBuildInputs = [
+    cargo
     cmake
     copyDesktopItems
     pkg-config
     go
     qt6.wrapQtAppsHook
+    rustPlatform.cargoSetupHook
+    rustc
   ];
 
   buildInputs = [
     avahi-compat
+    corrosion
     ffmpeg
     libheif
     libimobiledevice
@@ -83,9 +106,17 @@ stdenv.mkDerivation (finalAttrs: {
     lxqt.qtermwidget
   ];
 
+  cxx-qt-cmake = fetchFromGitHub {
+    owner = "kdab";
+    repo = "cxx-qt-cmake";
+    tag = "0.8.1";
+    hash = "sha256-kXSIU71iHn+SSGikGoNeMbBpSrDJ6hwhnHslmskm8nY=";
+  };
+
   cmakeFlags = [
     "-DPACKAGE_MANAGER_MANAGED=ON"
     "-DPACKAGE_MANAGER_HINT=nixpkgs"
+    "-DFETCHCONTENT_SOURCE_DIR_CXXQT=${finalAttrs.cxx-qt-cmake}"
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/if/ifstate/package.nix b/pkgs/by-name/if/ifstate/package.nix
index ff3e3042b26c..a1d813320f36 100644
--- a/pkgs/by-name/if/ifstate/package.nix
+++ b/pkgs/by-name/if/ifstate/package.nix
@@ -13,12 +13,12 @@
 }:
 
 let
-  version = "2.2.5";
+  version = "2.2.6";
   src = fetchFromCodeberg {
     owner = "routerkit";
     repo = "ifstate";
     tag = version;
-    hash = "sha256-KdOlKjs/Zv8TsCiMpA87gb7KKpl4Ohg512yiuNHcV9o=";
+    hash = "sha256-23WFKJUFYw+BZFzHXR5Vjx7Dd33CXua2u+GZV/b1K9E=";
   };
   docs = stdenv.mkDerivation {
     pname = "ifstate-docs";
diff --git a/pkgs/by-name/im/imagemagick/package.nix b/pkgs/by-name/im/imagemagick/package.nix
index 2f62b0ba131e..55c01b0cee14 100644
--- a/pkgs/by-name/im/imagemagick/package.nix
+++ b/pkgs/by-name/im/imagemagick/package.nix
@@ -41,6 +41,8 @@
   pango,
   libtiffSupport ? true,
   libtiff,
+  libultrahdrSupport ? true,
+  libultrahdr,
   libxml2Support ? true,
   libxml2,
   openjpegSupport ? !stdenv.hostPlatform.isMinGW,
@@ -86,13 +88,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.2-17";
+  version = "7.1.2-19";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     tag = finalAttrs.version;
-    hash = "sha256-niqHdNrFMwIr+9560vceRn0LyJPi6DIp6qCn5GlcVjY=";
+    hash = "sha256-4uASM+GRTe0ES6FdshUMMkVof4IlLV+CMm2l+v5qZN0=";
   };
 
   outputs = [
@@ -115,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.withFeature librsvgSupport "pango")
     (lib.withFeature liblqr1Support "lqr")
     (lib.withFeature libjxlSupport "jxl")
+    (lib.withFeature libultrahdrSupport "uhdr")
     (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
     (lib.withFeature ghostscriptSupport "gslib")
     (lib.withFeature fftwSupport "fftw")
@@ -141,6 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional libraqmSupport libraqm
   ++ lib.optional librawSupport libraw
   ++ lib.optional libtiffSupport libtiff
+  ++ lib.optional libultrahdrSupport libultrahdr
   ++ lib.optional libxml2Support libxml2
   ++ lib.optional libheifSupport libheif
   ++ lib.optional djvulibreSupport djvulibre
diff --git a/pkgs/by-name/im/imapsync/package.nix b/pkgs/by-name/im/imapsync/package.nix
index fb90b09245f1..089dc41b06e1 100644
--- a/pkgs/by-name/im/imapsync/package.nix
+++ b/pkgs/by-name/im/imapsync/package.nix
@@ -6,6 +6,7 @@
   perlPackages,
   stdenv,
   procps,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,7 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix PATH : ${lib.makeBinPath [ procps ]}
   '';
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    perl
+  ];
 
   buildInputs = with perlPackages; [
     Appcpanminus
@@ -69,6 +73,11 @@ stdenv.mkDerivation (finalAttrs: {
     perl
   ];
 
+  strictDeps = true;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   meta = {
     description = "Mail folder synchronizer between IMAP servers";
     homepage = "https://imapsync.lamiral.info";
diff --git a/pkgs/by-name/im/imath/package.nix b/pkgs/by-name/im/imath/package.nix
index f1da63b47c14..9fc0cedabc75 100644
--- a/pkgs/by-name/im/imath/package.nix
+++ b/pkgs/by-name/im/imath/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imath";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "imath";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-O8IpP2MQ7egDbHIiL5TNBygmQCiS6Q/0VSe0LypsM/g=";
+    hash = "sha256-uLGH2kMo5S6iT2gS1091qKkCAxQ/iuQ8xx9507k6SzY=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/im/imgproxy/package.nix b/pkgs/by-name/im/imgproxy/package.nix
index 02cf4fd58fd8..4a25023a5e61 100644
--- a/pkgs/by-name/im/imgproxy/package.nix
+++ b/pkgs/by-name/im/imgproxy/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "imgproxy";
-  version = "3.30.1";
+  version = "3.31.2";
 
   src = fetchFromGitHub {
     owner = "imgproxy";
     repo = "imgproxy";
-    hash = "sha256-UaJ02TQ8jbebRDF5K3zFy+4ho+dt1o/o3cEDzUQY3iU=";
+    hash = "sha256-gKSSdBtmCSiiBPon3Fj+TGyGSITND5C+hUW9xdjJPZs=";
     rev = "v${finalAttrs.version}";
   };
 
-  vendorHash = "sha256-0NIsaSMOBenDCGvnGdLB60sp08EaC/CezWogxTrcDdY=";
+  vendorHash = "sha256-coHlsBh+ujEU9D/RloONAl+TDaxEJMdvvaNEuWe4SP8=";
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix
index e0b8eac79048..553db029dd46 100644
--- a/pkgs/by-name/im/immich-public-proxy/package.nix
+++ b/pkgs/by-name/im/immich-public-proxy/package.nix
@@ -8,17 +8,17 @@
 }:
 buildNpmPackage rec {
   pname = "immich-public-proxy";
-  version = "1.15.5";
+  version = "1.15.6";
   src = fetchFromGitHub {
     owner = "alangrainger";
     repo = "immich-public-proxy";
     tag = "v${version}";
-    hash = "sha256-x3ApBZX753IaPZ46nU0p8xWIrM9fIYP5N0+XBLeSwdo=";
+    hash = "sha256-hBnWTvc6QeeWabiqzeaNs2uuhYTtYgCMoeOoDBF4Kyc=";
   };
 
   sourceRoot = "${src.name}/app";
 
-  npmDepsHash = "sha256-pjM0x/1yAQm+ZolCyUV3M0cUJT0GBifed7NrMaINpyw=";
+  npmDepsHash = "sha256-G8G1H/5POJL8DyJwXQxBbk8MjZKneerEZVQd5plzIMs=";
 
   # patch in absolute nix store paths so the process doesn't need to cwd in $out
   postPatch = ''
diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix
index 8b3d074e30fc..f0713769865e 100644
--- a/pkgs/by-name/in/inetutils/package.nix
+++ b/pkgs/by-name/in/inetutils/package.nix
@@ -42,6 +42,21 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://codeberg.org/inetutils/inetutils/commit/ccba9f748aa8d50a38d7748e2e60362edd6a32cc.patch";
       hash = "sha256-ws+ed5vb7kVMHEbqK7yj6FUT355pTv2RZEYuXs5M7Io=";
     })
+    (fetchpatch {
+      name = "CVE-2026-28372.patch";
+      url = "https://codeberg.org/inetutils/inetutils/commit/4db2f19f4caac03c7f4da6363c140bd70df31386.patch";
+      excludes = [
+        "NEWS.md"
+        "THANKS"
+      ];
+      hash = "sha256-ASgcaNC+yo3Hth4M32IVbD3jFt8mxcGtLfl+ULNt4Ag=";
+    })
+    (fetchpatch {
+      name = "CVE-2026-32746.patch";
+      url = "https://codeberg.org/inetutils/inetutils/commit/6864598a29b652a6b69a958f5cd1318aa2b258af.patch";
+      excludes = [ "NEWS.md" ];
+      hash = "sha256-gQH4BZG9rkyGtOQjBqItx+fEBda/Wgg9f46VYPV8HLw=";
+    })
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/in/influxdb/package.nix b/pkgs/by-name/in/influxdb/package.nix
index 01ffe864b954..ebc43fc75966 100644
--- a/pkgs/by-name/in/influxdb/package.nix
+++ b/pkgs/by-name/in/influxdb/package.nix
@@ -13,7 +13,7 @@ let
   libflux_version = "0.196.1";
 
   # This is copied from influxdb2 with the required flux version
-  flux = rustPlatform.buildRustPackage rec {
+  flux = rustPlatform.buildRustPackage (finalAttrs: {
     pname = "libflux";
     version = libflux_version;
     src = fetchFromGitHub {
@@ -32,7 +32,7 @@ let
       substituteInPlace flux-core/src/lib.rs \
         --replace-fail "deny(warnings, missing_docs))]" "deny(warnings), allow(dead_code, mismatched_lifetime_syntaxes, unused_assignments))]"
     '';
-    sourceRoot = "${src.name}/libflux";
+    sourceRoot = "${finalAttrs.src.name}/libflux";
 
     cargoHash = "sha256-A6j/lb47Ob+Po8r1yvqBXDVP0Hf7cNz8WFZqiVUJj+Y=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -44,26 +44,28 @@ let
       Cflags: -I/out/include
       Libs: -L/out/lib -lflux -lpthread
     '';
-    passAsFile = [ "pkgcfg" ];
     postInstall = ''
       mkdir -p $out/include $out/pkgconfig
       cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
-      substitute $pkgcfgPath $out/pkgconfig/flux.pc \
+      printf "%s" "$pkgcfg" > $out/pkgconfig/flux.pc
+      substituteInPlace $out/pkgconfig/flux.pc \
         --replace-fail /out $out
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
     '';
-  };
+
+    __structuredAttrs = true;
+  });
 in
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "influxdb";
   version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "influxdb";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Q05mKmAXxrk7IVNxUD8HHNKnWCxmNCdsr6NK7d7vOHM=";
   };
 
@@ -87,7 +89,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   excludedPackages = "test";
@@ -104,4 +106,4 @@ buildGoModule rec {
       zimbatm
     ];
   };
-}
+})
diff --git a/pkgs/by-name/in/influxdb2-cli/package.nix b/pkgs/by-name/in/influxdb2-cli/package.nix
index c7833547a8a3..4cd697ab2f86 100644
--- a/pkgs/by-name/in/influxdb2-cli/package.nix
+++ b/pkgs/by-name/in/influxdb2-cli/package.nix
@@ -7,13 +7,13 @@
 }:
 
 let
-  version = "2.7.5";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "influx-cli";
     rev = "v${version}";
-    sha256 = "sha256-0Gyoy9T5pA+40k8kKybWBMtOfpKZxw3Vvp4ZB4ptcJs=";
+    sha256 = "sha256-3DCvWaiGLw9OSs/b9za1jgrPDo2Txw5b5h46ElTMEks=";
   };
 
 in
@@ -24,7 +24,7 @@ buildGoModule {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorHash = "sha256-Ov0TPoMm0qi7kkWUUni677sCP1LwkT9+n3KHcAlQkDA=";
+  vendorHash = "sha256-NsOkQwMH/AANUBReXmGR0fFQAtosA9iSla5JXyhrPYE=";
   subPackages = [ "cmd/influx" ];
 
   ldflags = [
diff --git a/pkgs/by-name/in/influxdb2-server/package.nix b/pkgs/by-name/in/influxdb2-server/package.nix
index 48e445feae34..9142e2217731 100644
--- a/pkgs/by-name/in/influxdb2-server/package.nix
+++ b/pkgs/by-name/in/influxdb2-server/package.nix
@@ -62,16 +62,18 @@ let
       Cflags: -I/out/include
       Libs: -L/out/lib -lflux -lpthread
     '';
-    passAsFile = [ "pkgcfg" ];
     postInstall = ''
       mkdir -p $out/include $out/pkgconfig
       cp -r $NIX_BUILD_TOP/${finalAttrs.src.name}/libflux/include/influxdata $out/include
-      substitute $pkgcfgPath $out/pkgconfig/flux.pc \
+      printf "%s" "$pkgcfg" > $out/pkgconfig/flux.pc
+      substituteInPlace $out/pkgconfig/flux.pc \
         --replace-fail /out $out
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
     '';
+
+    __structuredAttrs = true;
   });
 in
 buildGoModule {
diff --git a/pkgs/by-name/in/inframap/package.nix b/pkgs/by-name/in/inframap/package.nix
index b45fa964374a..eba8500a5fed 100644
--- a/pkgs/by-name/in/inframap/package.nix
+++ b/pkgs/by-name/in/inframap/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "inframap";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "cycloidio";
     repo = "inframap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IdXP/gw81rQsaHz+uwEB9ThtHlbPYLXcYTYdwJynpVU=";
+    hash = "sha256-SH72GmEzHNF26TNCctBglSvtYXVFf6fIBmg8L74OiZg=";
   };
 
   ldflags = [
diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix
index c4ef3a8518fe..38babc30309b 100644
--- a/pkgs/by-name/in/infrastructure-agent/package.nix
+++ b/pkgs/by-name/in/infrastructure-agent/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "infrastructure-agent";
-  version = "1.73.1";
+  version = "1.74.1";
 
   src = fetchFromGitHub {
     owner = "newrelic";
     repo = "infrastructure-agent";
     rev = finalAttrs.version;
-    hash = "sha256-fxOvtMAwCR5Y9VhUsR8BF76+REH39+pyGyjxLXwRx1k=";
+    hash = "sha256-btvhrVt6xU1IMEyjs873EeErtRKzoD/PvfTRHzBw0UI=";
   };
 
   vendorHash = "sha256-xkoNVXRm8OkVd2f3cSFE1QIF6EHhh8AQh/YZYt22+MU=";
diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix
index edcfe47691ab..4eec30faba04 100644
--- a/pkgs/by-name/in/inko/package.nix
+++ b/pkgs/by-name/in/inko/package.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "inko";
-  version = "0.19.1";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "inko-lang";
     repo = "inko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZHVOwYvNRL2ObZt2PvayoqvS64MumN4oXQOgeCWbEUM=";
+    hash = "sha256-Bisw84MwdLb2pgzwQ5zpZiyNHSWtdJ2QpaFn40x+SdI=";
   };
 
-  cargoHash = "sha256-BHrbqPMQnhw8pjN8e0/qW1rPe/fMhs2iUbRVPt5ATrg=";
+  cargoHash = "sha256-+3U3rMVF3qwyTIGOb/6NIxSBdiLuf/uY/VL3tYHte+c=";
 
   buildInputs = [
     libffi
diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix
index 94edc5abac56..326f1a95ecf6 100644
--- a/pkgs/by-name/in/inputplumber/package.nix
+++ b/pkgs/by-name/in/inputplumber/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "inputplumber";
-  version = "0.76.0";
+  version = "0.76.1";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "InputPlumber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-81M/nVjLw+dI/ch+l/RJvq4ClMVCQqx+IfwPVPDB6HE=";
+    hash = "sha256-SkW79i1jutVwty18bWXJEUijDunHukF3Sxqm0VwzMz0=";
   };
 
-  cargoHash = "sha256-x/jPB3QClaYt/9fVnuz1yDUWsurcrx/mKouHMv2QsFc=";
+  cargoHash = "sha256-nHAdU/7JHPveOvUsXqdmUQtzET2Jv6T6PN83S7TwsIM=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/in/intel-cmt-cat/package.nix b/pkgs/by-name/in/intel-cmt-cat/package.nix
index 22d1b89d5fd6..7c469dc1cb6c 100644
--- a/pkgs/by-name/in/intel-cmt-cat/package.nix
+++ b/pkgs/by-name/in/intel-cmt-cat/package.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "25.04";
+  version = "26.03";
   pname = "intel-cmt-cat";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "intel-cmt-cat";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Sbxfa9F+TSv2A8nilrB0PD312v1qN++k8Pezd7wd0PA=";
+    sha256 = "sha256-uGSWpP5CWyUpdLX5F/Lpiqbcdb0Zldeh5XSjptUqLqY=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix
index 2a2fd4cf09c2..e4344c76e6da 100644
--- a/pkgs/by-name/in/intel-compute-runtime/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "intel-compute-runtime";
-  version = "26.09.37435.1";
+  version = "26.14.37833.4";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
     tag = finalAttrs.version;
-    hash = "sha256-FKqsyjkxOcqtVv+chGTFn9dhYwkWaDomWdFQlF85RDM=";
+    hash = "sha256-W8lRvxvmsWQbVj+1a6RPLnjqLY206o1yl7PN5wf5DPw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix
index 6f15f7d6be93..b1d16110f5e3 100644
--- a/pkgs/by-name/in/intel-graphics-compiler/package.nix
+++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware";
     homepage = "https://github.com/intel/intel-graphics-compiler";
-    changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/${version}";
+    changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/v${version}";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
diff --git a/pkgs/by-name/in/intel-llvm/package.nix b/pkgs/by-name/in/intel-llvm/package.nix
index 082c83ef4eb0..d63b869d2038 100644
--- a/pkgs/by-name/in/intel-llvm/package.nix
+++ b/pkgs/by-name/in/intel-llvm/package.nix
@@ -24,6 +24,19 @@ let
   #      .override { .. }
   #      .overrideAttrs { .. }
   #  })
+  #
+  # Note that this package does not support cross-compilation at the moment.
+  #
+  # TODO: Support cross
+  #  The easiest path for this will likely be to use standalone packaging,
+  #  and use the existing LLVM derivation with overrides. Though that won't
+  #  be very workable until upstream support for standalone improves,
+  #  see https://github.com/intel/llvm/issues/21877 for that.
+  #
+  #  Due to the multi-stage build, at several times during compilation
+  #  the package runs binaries that were just compiled, and for cross these
+  #  would need to be compiled for the host and not target platform,
+  #  which is non-trivial to configure.
   scope = lib.makeScope newScope (self: {
     # == Parameters for overriding ==
 
@@ -89,22 +102,23 @@ let
         ;
     };
 
-    wrapper =
-      (wrapCCWith {
-        cc = self.unwrapped;
-        # This is needed for tools like clang-scan-deps to find headers.
-        # The build commands here are the same as the vanilla LLVM derivation.
-        extraBuildCommands = ''
-          rsrc="$out/resource-root"
-          mkdir "$rsrc"
-          echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-          ln -s "${lib.getLib self.unwrapped}/lib/clang/${self.llvmMajorVersion}/include" "$rsrc"
-        '';
-      }).overrideAttrs
-        (old: {
-          # OpenCL needs to be passed through
-          propagatedBuildInputs = old.propagatedBuildInputs ++ self.unwrapped.propagatedBuildInputs;
-        });
+    wrapper = wrapCCWith {
+      cc = self.unwrapped;
+      # This is needed for tools like clang-scan-deps to find headers.
+      # The build commands here are the same as the vanilla LLVM derivation.
+      extraBuildCommands = ''
+        rsrc="$out/resource-root"
+        mkdir "$rsrc"
+        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+        ln -s "${lib.getLib self.unwrapped}/lib/clang/${self.llvmMajorVersion}/include" "$rsrc"
+      '';
+
+      extraPackages =
+        # We need to explicitly link to the dev package to get headers like sycl.hpp
+        [ self.unwrapped.dev ] # TODO: This needs to be from targetPackages once the package gets cross support
+        # OpenCL and such need to be passed through
+        ++ self.unwrapped.propagatedBuildInputs;
+    };
 
     clang-tools-wrapper = callPackage ./clang-tools.nix {
       inherit (self) unwrapped wrapper;
@@ -118,7 +132,10 @@ let
       inherit (self.unwrapped) pname version meta;
 
       strictDeps = true;
-      __structuredAttrs = true;
+      # Currently broken for symlinkJoin, can be removed once the following
+      # reaches branch master:
+      # https://github.com/NixOS/nixpkgs/pull/510526
+      __structuredAttrs = false;
 
       paths = with self; [
         # Order is important, we want files from the wrappers to take precedence
diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix
index 3f71fd07514d..7ae6748c96c2 100644
--- a/pkgs/by-name/in/intel-media-driver/package.nix
+++ b/pkgs/by-name/in/intel-media-driver/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "intel-media-driver";
-  version = "26.1.2";
+  version = "26.1.6";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "intel";
     repo = "media-driver";
     tag = "intel-media-${finalAttrs.version}";
-    hash = "sha256-Vy489YYuaI+atWiNiVyN/JXIMhSCWC5murJcn/qVb74=";
+    hash = "sha256-Jk9pIZ1V1tKi9l6u10tftClVZhYn2ECvALt26n58XC0=";
   };
 
   patches = [
diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 799226b51fde..11db7ce5dee8 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -4,7 +4,7 @@
   buildNpmPackage,
   fetchFromGitHub,
   cctools,
-  remarshal,
+  go-toml,
   ttfautohint-nox,
   # Custom font set options.
   # See https://typeof.net/Iosevka/customizer
@@ -58,19 +58,19 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "34.3.0";
+  version = "34.4.0";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
-    rev = "v${version}";
-    hash = "sha256-Se+GIx+Uea/lMOdTDhbt/H+F0yeyMHclpSp52U+pmtA=";
+    tag = "v${version}";
+    hash = "sha256-eOh1jdrgaMYhqxP+QSCBxqhkJUGYrWLTkYwGmKSNrRA=";
   };
 
-  npmDepsHash = "sha256-LSfVuNP2Ck0PUbrjHsCXmoiZfT3x/Mk+CpC9cAj96bE=";
+  npmDepsHash = "sha256-9v4PKlS8FNuhnhdJmu3J1Bl+uSPS4KqE3PBrOhf9jQw=";
 
   nativeBuildInputs = [
-    remarshal
+    go-toml
     ttfautohint-nox
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -78,6 +78,8 @@ buildNpmPackage rec {
     cctools
   ];
 
+  strictDeps = true;
+
   buildPlan =
     if builtins.isAttrs privateBuildPlan then
       builtins.toJSON { buildPlans.${pname} = privateBuildPlan; }
@@ -85,22 +87,16 @@ buildNpmPackage rec {
       privateBuildPlan;
 
   inherit extraParameters;
-  passAsFile = [
-    "extraParameters"
-  ]
-  ++ lib.optionals (
-    !(builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)
-  ) [ "buildPlan" ];
 
   configurePhase = ''
     runHook preConfigure
     ${lib.optionalString (builtins.isAttrs privateBuildPlan) ''
-      remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml
+      printf "%s" "$buildPlan" | jsontoml -use-json-number > private-build-plans.toml
     ''}
     ${lib.optionalString
       (builtins.isString privateBuildPlan && (!lib.hasPrefix builtins.storeDir privateBuildPlan))
       ''
-        cp "$buildPlanPath" private-build-plans.toml
+        printf "%s" "$buildPlan" > private-build-plans.toml
       ''
     }
     ${lib.optionalString
@@ -111,7 +107,7 @@ buildNpmPackage rec {
     }
     ${lib.optionalString (extraParameters != null) ''
       echo -e "\n" >> params/parameters.toml
-      cat "$extraParametersPath" >> params/parameters.toml
+      printf "%s" "$extraParameters" >> params/parameters.toml
     ''}
     runHook postConfigure
   '';
@@ -137,6 +133,8 @@ buildNpmPackage rec {
   enableParallelBuilding = true;
   requiredSystemFeatures = [ "big-parallel" ];
 
+  __structuredAttrs = true;
+
   meta = {
     homepage = "https://typeof.net/Iosevka/";
     downloadPage = "https://github.com/be5invis/Iosevka/releases";
diff --git a/pkgs/by-name/ip/ipaexfont/package.nix b/pkgs/by-name/ip/ipaexfont/package.nix
index 9b696656d780..c5809423182a 100644
--- a/pkgs/by-name/ip/ipaexfont/package.nix
+++ b/pkgs/by-name/ip/ipaexfont/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation {
@@ -13,13 +14,7 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-/87qJIb+v4qrtDy+ApfXxh59reOk+6RhGqFN98mc+8Q=";
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 *.ttf -t $out/share/fonts/opentype
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Japanese font package with Mincho and Gothic fonts";
diff --git a/pkgs/by-name/ip/ipget/package.nix b/pkgs/by-name/ip/ipget/package.nix
index 4043549abd34..98cabb840256 100644
--- a/pkgs/by-name/ip/ipget/package.nix
+++ b/pkgs/by-name/ip/ipget/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ipget";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "ipget";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mOZdoOl+eVMNOy5gfxeqmzOUAnc39WNJYr1l5IVId8U=";
+    hash = "sha256-dG7nb9v+gKotRPVtO8tKqkOQ089zKBk39HxXkSXoW/U=";
   };
 
-  vendorHash = "sha256-oB6XWs649Aj6MYIhWBWXNgJkycsx/kGw9iEVy3nG9iw=";
+  vendorHash = "sha256-+BOo/xSdB0xR8Rtumh+sjEL025PVxmNTmSCR1HjfW3w=";
 
   postPatch = ''
     # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies
diff --git a/pkgs/by-name/ip/ipp-usb/package.nix b/pkgs/by-name/ip/ipp-usb/package.nix
index b9878ed61d63..107f0a680da2 100644
--- a/pkgs/by-name/ip/ipp-usb/package.nix
+++ b/pkgs/by-name/ip/ipp-usb/package.nix
@@ -9,13 +9,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "ipp-usb";
-  version = "0.9.31";
+  version = "0.9.32";
 
   src = fetchFromGitHub {
     owner = "openprinting";
     repo = "ipp-usb";
     rev = finalAttrs.version;
-    sha256 = "sha256-WoJa00dSTXknoEjRO/L1yZc6pA0SfAhKsG6QqS6aDSc=";
+    sha256 = "sha256-spXp9la5FV8J/cb/1IDQM29QqzFCDzgRKwPk1f3LgkM=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ip/ipsw/package.nix b/pkgs/by-name/ip/ipsw/package.nix
index d72a1c8097eb..18f6216e99cc 100644
--- a/pkgs/by-name/ip/ipsw/package.nix
+++ b/pkgs/by-name/ip/ipsw/package.nix
@@ -6,17 +6,17 @@
 }:
 
 buildGo126Module (finalAttrs: {
-  version = "3.1.671";
+  version = "3.1.672";
   pname = "ipsw";
 
   src = fetchFromGitHub {
     owner = "blacktop";
     repo = "ipsw";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Grh0WeeslpebG+ryacUPXD3OPIbJtA1zDejothKmdxQ=";
+    hash = "sha256-wzxhTWd3aVB3RQLWajhKXlwgVvn/PgoL1+ovYO/IleA=";
   };
 
-  vendorHash = "sha256-J4S5VsGZEeDdiNNl0LlqIPG53Vg0xKuW1wsmrULetgQ=";
+  vendorHash = "sha256-cyHfH/Ljz4wuMdKkSfySSK5kPRwq9M1+C/5CG5VwHoE=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ip/iptables-legacy/package.nix b/pkgs/by-name/ip/iptables-legacy/package.nix
new file mode 100644
index 000000000000..da3f0ab09f4a
--- /dev/null
+++ b/pkgs/by-name/ip/iptables-legacy/package.nix
@@ -0,0 +1,11 @@
+{
+  iptables,
+  ...
+}@args:
+
+(iptables.override (
+  {
+    nftablesCompat = false;
+  }
+  // removeAttrs args [ "iptables" ]
+))
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/by-name/ip/iptables/package.nix
similarity index 95%
rename from pkgs/os-specific/linux/iptables/default.nix
rename to pkgs/by-name/ip/iptables/package.nix
index 1f55e2eab8b4..edac9389c652 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/by-name/ip/iptables/package.nix
@@ -29,19 +29,15 @@
   iputils,
 }:
 
-let
-  version = "1.8.12";
-  pname = "iptables";
-in
-
 stdenv.mkDerivation (finalAttrs: {
-  inherit pname version;
+  pname = "iptables";
+  version = "1.8.13";
 
   __structuredAttrs = true;
 
   src = fetchurl {
-    url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz";
-    sha256 = "jn7pYmAUkt5lA9Fx1KlICSqxj4nxEd5y4wN8H0DPuEY=";
+    url = "https://www.netfilter.org/projects/iptables/files/iptables-${finalAttrs.version}.tar.xz";
+    hash = "sha256-GvzTPano+ROs5qISZ4gWLiB+JvXV4pxlc8Dlgf/Fi5k=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix
index 404798b5bb71..9b8d5610f091 100644
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@@ -14,13 +14,10 @@
 let
   # The officially recommended version is Java 17
   java = jdk17;
-
-  # It's not clear yet if this version follows the app version, further updates will probably solve this question
-  pgd-updater-version = "1.0.0";
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "irpf";
-  version = "2026-1.0";
+  version = "2026-1.1";
 
   # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
   # Para outros sistemas operacionais -> Multi
@@ -30,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     in
     fetchzip {
       url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-      hash = "sha256-hePdoDbFPOMjdSzsJqZWyFhHX138bMuocwCNpdOEkKA=";
+      hash = "sha256-/UB8mWB3yaT+mDa3mqGm2ULqDdNcmQu+cHKNdKQa/ug=";
     };
 
   nativeBuildInputs = [
@@ -59,7 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     cp --no-preserve=mode -r help lib lib-modulos "$BASEDIR"
 
-    install -Dm644 irpf.jar Leia-me.htm offline.png online.png pgd-updater-${pgd-updater-version}.jar "$BASEDIR"
+    install -Dm644 irpf.jar Leia-me.htm offline.png online.png pgd-updater-*.*.*.jar "$BASEDIR"
 
     # make xdg-open overrideable at runtime
     makeWrapper ${lib.getExe java} $out/bin/irpf \
diff --git a/pkgs/by-name/it/itch-dl/package.nix b/pkgs/by-name/it/itch-dl/package.nix
index 73c1c8780216..a1076b02eb38 100644
--- a/pkgs/by-name/it/itch-dl/package.nix
+++ b/pkgs/by-name/it/itch-dl/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "itch-dl";
-  version = "0.6.1";
+  version = "0.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DragoonAethis";
     repo = "itch-dl";
     tag = finalAttrs.version;
-    hash = "sha256-zwsiG38wOVi3pP0gQWkZqfAmdWKadjB65qiTg68tZWg=";
+    hash = "sha256-4+Idh76o/VbdQ6hgvQsrz9AGYeOGC2hgN0kMJz+ik2E=";
   };
 
   nativeBuildInputs = with python3Packages; [
@@ -36,6 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "urllib3"
     "beautifulsoup4"
     "lxml"
+    "tqdm"
   ];
 
   meta = {
@@ -43,7 +44,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     mainProgram = "itch-dl";
     homepage = "https://github.com/DragoonAethis/itch-dl";
     changelog = "https://github.com/DragoonAethis/itch-dl/releases/tag/${finalAttrs.src.tag}";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jopejoe1 ];
   };
 })
diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix
index 033d30d73aa7..330cb67f2afb 100644
--- a/pkgs/by-name/it/iterm2/package.nix
+++ b/pkgs/by-name/it/iterm2/package.nix
@@ -15,13 +15,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "iterm2";
-  version = "3.6.6";
+  version = "3.6.10";
 
   src = fetchzip {
     url = "https://iterm2.com/downloads/stable/iTerm2-${
       lib.replaceStrings [ "." ] [ "_" ] version
     }.zip";
-    hash = "sha256-n3VoRxMOBQK/8mbVbORSBz73tsuKAUMG7dFZIbaqdHU=";
+    hash = "sha256-igdExoh3d8EZBuKkqyNqF087jUISax07rSWG3eenUbw=";
   };
 
   dontFixup = true;
diff --git a/pkgs/by-name/it/itgmania/package.nix b/pkgs/by-name/it/itgmania/package.nix
index f17bc900481b..8899ba8140f0 100644
--- a/pkgs/by-name/it/itgmania/package.nix
+++ b/pkgs/by-name/it/itgmania/package.nix
@@ -1,97 +1,23 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  nasm,
-  pkg-config,
-  copyDesktopItems,
-  alsa-lib,
-  glew,
-  glib,
-  gtk3,
-  libmad,
-  libogg,
-  libpulseaudio,
-  libusb-compat-0_1,
-  libvorbis,
-  libxtst,
-  udev,
+  symlinkJoin,
   makeWrapper,
-  makeDesktopItem,
+  itgmaniaPackages,
+  extraPackages ? [ ],
 }:
+let
+  unwrapped = itgmaniaPackages.itgmania-unwrapped;
+in
+symlinkJoin {
+  inherit (unwrapped) pname version meta;
 
-stdenv.mkDerivation (finalAttrs: {
-  pname = "itgmania";
-  version = "1.2.0";
+  paths = [ unwrapped ] ++ extraPackages;
 
-  src = fetchFromGitHub {
-    owner = "itgmania";
-    repo = "itgmania";
-    tag = "v${finalAttrs.version}";
-    fetchSubmodules = true;
-    hash = "sha256-RkV/OIDudt2XemhaFRY7IA5o7Q2w+j01tauD7KpzYpA=";
-  };
+  nativeBuildInputs = [ makeWrapper ];
 
-  nativeBuildInputs = [
-    cmake
-    nasm
-    pkg-config
-    makeWrapper
-    copyDesktopItems
-  ];
-
-  buildInputs = [
-    alsa-lib
-    glew
-    glib
-    gtk3
-    libmad
-    libogg
-    libpulseaudio
-    libusb-compat-0_1
-    libvorbis
-    libxtst
-    udev
-  ];
-
-  cmakeFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "-DWITH_MINIMAID=off" ];
-
-  postInstall = ''
+  postBuild = ''
     makeWrapper $out/itgmania/itgmania $out/bin/itgmania \
       --chdir $out/itgmania
-
-    mkdir -p $out/share/icons/hicolor/scalable/apps/
-    ln -s $out/itgmania/Data/logo.svg $out/share/icons/hicolor/scalable/apps/itgmania.svg
   '';
 
-  desktopItems = [
-    (makeDesktopItem {
-      name = "itgmania";
-      desktopName = "ITGmania";
-      genericName = "Rhythm and dance game";
-      tryExec = "itgmania";
-      exec = "itgmania";
-      terminal = false;
-      icon = "itgmania";
-      type = "Application";
-      comment = "A cross-platform rhythm video game.";
-      categories = [
-        "Game"
-        "ArcadeGame"
-      ];
-    })
-  ];
-
-  meta = {
-    homepage = "https://www.itgmania.com/";
-    description = "Fork of StepMania 5.1, improved for the post-ITG community";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      ftsimas
-      maxwell-lt
-    ];
-    mainProgram = "itgmania";
-  };
-})
+  passthru.unwrapped = unwrapped;
+}
diff --git a/pkgs/by-name/it/itgmania/packages.nix b/pkgs/by-name/it/itgmania/packages.nix
new file mode 100644
index 000000000000..257fe5e1fd86
--- /dev/null
+++ b/pkgs/by-name/it/itgmania/packages.nix
@@ -0,0 +1,10 @@
+{ lib, newScope }:
+lib.makeScope newScope (self: {
+  itgmania-unwrapped = self.callPackage ./unwrapped.nix { };
+  # Themes
+  arrowcloud-theme = self.callPackage ./themes/arrowcloud-theme.nix { };
+  digital-dance = self.callPackage ./themes/digital-dance.nix { };
+  itg2-sm5 = self.callPackage ./themes/itg2-sm5.nix { };
+  itg3encore = self.callPackage ./themes/itg3encore.nix { };
+  zmod-simply-love = self.callPackage ./themes/zmod-simply-love.nix { };
+})
diff --git a/pkgs/by-name/it/itgmania/themes/arrowcloud-theme.nix b/pkgs/by-name/it/itgmania/themes/arrowcloud-theme.nix
new file mode 100644
index 000000000000..0ec3c79b09cf
--- /dev/null
+++ b/pkgs/by-name/it/itgmania/themes/arrowcloud-theme.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "arrowcloud-theme";
+  version = "20260424";
+
+  src = fetchFromGitHub {
+    owner = "Arrow-Cloud";
+    repo = "theme";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Sdl32MARZnPYKN21xoWu8sa6E/lUloMiRrjpWfkXefc=";
+  };
+
+  postInstall = ''
+    mkdir -p "$out/itgmania/Themes/Arrow Cloud"
+    mv * "$out/itgmania/Themes/Arrow Cloud"
+  '';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+
+  meta = {
+    description = "Arrow Cloud's fork of Zmod";
+    homepage = "https://github.com/Arrow-Cloud/theme";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+  };
+})
diff --git a/pkgs/by-name/it/itgmania/themes/digital-dance.nix b/pkgs/by-name/it/itgmania/themes/digital-dance.nix
new file mode 100644
index 000000000000..f0144e4acd46
--- /dev/null
+++ b/pkgs/by-name/it/itgmania/themes/digital-dance.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  stdenv,
+  fetchFromCodeberg,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "digital-dance";
+  version = "1.1.3-unstable-2026-04-29";
+
+  src = fetchFromCodeberg {
+    owner = "JNero";
+    repo = "Digital-Dance-ITGMania";
+    rev = "a26bc9f19be8b899ed5af35c01cdd21fe48ec94f";
+    hash = "sha256-4A87hM+yG6mKfYdC2fZ5lhSDVVH4FPtXStkjC95CcLs=";
+  };
+
+  postInstall = ''
+    mkdir -p "$out/itgmania/Themes/Digital Dance"
+    mv * "$out/itgmania/Themes/Digital Dance"
+  '';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Theme for ITGMania to (hopefully) utilize all of it's features and more";
+    homepage = "https://codeberg.org/JNero/Digital-Dance-ITGMania";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+  };
+})
diff --git a/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix b/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix
new file mode 100644
index 000000000000..5234bfea09e5
--- /dev/null
+++ b/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "itg2-sm5";
+  version = "1.1.0-unstable-2025-10-08";
+
+  src = fetchFromGitHub {
+    owner = "JoseVarelaP";
+    repo = "In-The-Groove2-SM5";
+    rev = "e25f1a44efa55cd2247891f40633403910b75d21";
+    hash = "sha256-FMyT7ZA/1cqiClXDvD7CmJlOFaaWnPLuOuei6fsbzg8=";
+  };
+
+  postInstall = ''
+    mkdir -p "$out/itgmania/Themes/ITG2-SM5"
+    mv * "$out/itgmania/Themes/ITG2-SM5"
+  '';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Semi-Conversion/Recreation of In The Groove 1 & 2 to StepMania 5";
+    homepage = "https://github.com/JoseVarelaP/In-The-Groove2-SM5";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+  };
+})
diff --git a/pkgs/by-name/it/itgmania/themes/itg3encore.nix b/pkgs/by-name/it/itgmania/themes/itg3encore.nix
new file mode 100644
index 000000000000..1056080e6860
--- /dev/null
+++ b/pkgs/by-name/it/itgmania/themes/itg3encore.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "itg3encore";
+  version = "0-unstable-2026-04-29";
+
+  src = fetchFromGitHub {
+    owner = "DarkBahamut162";
+    repo = "itg3encore";
+    rev = "87ef7392f84acf3c05c03749714a8f9cd893a34e";
+    hash = "sha256-4wHDin/Nphd/BLP4HYsRQDZDWYhMRddv1D44q6Yvhto=";
+  };
+
+  postInstall = ''
+    mkdir -p "$out/itgmania/Themes/ITG3Encore"
+    mv * "$out/itgmania/Themes/ITG3Encore"
+  '';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "An upgraded port of ITG3's Encore theme";
+    homepage = "https://github.com/DarkBahamut162/itg3encore";
+    # https://github.com/DarkBahamut162/itg3encore/issues/16
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+  };
+})
diff --git a/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix b/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix
new file mode 100644
index 000000000000..3d57f82120fa
--- /dev/null
+++ b/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zmod-simply-love";
+  version = "5.8.1-april";
+
+  src = fetchFromGitHub {
+    owner = "zarzob";
+    repo = "Simply-Love-SM5";
+    tag = finalAttrs.version;
+    hash = "sha256-4EkCR9M8xip2b8ddWyUIom2HM72Ba8KdVodIyc5h4p8=";
+  };
+
+  postInstall = ''
+    mkdir -p "$out/itgmania/Themes/Zmod Simply Love"
+    mv * "$out/itgmania/Themes/Zmod Simply Love"
+  '';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+
+  meta = {
+    description = "Zmod fork of Simply Love";
+    homepage = "https://github.com/zarzob/Simply-Love-SM5";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      maxwell-lt
+      ungeskriptet
+    ];
+  };
+})
diff --git a/pkgs/by-name/it/itgmania/unwrapped.nix b/pkgs/by-name/it/itgmania/unwrapped.nix
new file mode 100644
index 000000000000..f0d65de916e3
--- /dev/null
+++ b/pkgs/by-name/it/itgmania/unwrapped.nix
@@ -0,0 +1,100 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  nasm,
+  pkg-config,
+  copyDesktopItems,
+  alsa-lib,
+  glew,
+  glib,
+  gtk3,
+  libmad,
+  libogg,
+  libpulseaudio,
+  libusb-compat-0_1,
+  libvorbis,
+  libxtst,
+  udev,
+  makeDesktopItem,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "itgmania";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "itgmania";
+    repo = "itgmania";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-bTABfTflWasuXvX+YPciUIICAFVROk/SgeClgrTUjkQ=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    nasm
+    pkg-config
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    alsa-lib
+    glew
+    glib
+    gtk3
+    libmad
+    libogg
+    libpulseaudio
+    libusb-compat-0_1
+    libvorbis
+    libxtst
+    udev
+  ];
+
+  cmakeFlags = [
+    "-DWITH_FULL_RELEASE=on"
+    "-DWITH_NIGHTLY_RELEASE=off"
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DWITH_MINIMAID=off" ];
+
+  postInstall = ''
+    mkdir -p $out/share/icons/hicolor/scalable/apps/
+    ln -s $out/itgmania/Data/logo.svg $out/share/icons/hicolor/scalable/apps/itgmania.svg
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "itgmania";
+      desktopName = "ITGmania";
+      genericName = "Rhythm and dance game";
+      tryExec = "itgmania";
+      exec = "itgmania";
+      terminal = false;
+      icon = "itgmania";
+      type = "Application";
+      comment = "A cross-platform rhythm video game.";
+      categories = [
+        "Game"
+        "ArcadeGame"
+      ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://www.itgmania.com/";
+    description = "Fork of StepMania 5.1, improved for the post-ITG community";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      ftsimas
+      maxwell-lt
+      ungeskriptet
+    ];
+    mainProgram = "itgmania";
+  };
+})
diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix
index f5e0c161ab44..41bac816c8cb 100644
--- a/pkgs/by-name/it/itsycal/package.nix
+++ b/pkgs/by-name/it/itsycal/package.nix
@@ -6,18 +6,19 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "itsycal";
-  version = "0.15.10";
+  version = "0.15.12";
 
   src = fetchzip {
     url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip";
-    hash = "sha256-6+E/4SbRIChJMc2VDMNYongsAWRtcFxtIj6lvTiexrU=";
+    hash = "sha256-2Xu1ZQnNl0o2/AYOIjxZPDnc0TxMXrqKej7CCZEVV9I=";
+    stripRoot = false;
   };
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out/Applications/Itsycal.app"
-    cp -R . "$out/Applications/Itsycal.app"
+    mkdir -p "$out/Applications"
+    cp -R Itsycal.app "$out/Applications/"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix
index 0d694260f537..c32744a4d55d 100644
--- a/pkgs/by-name/iv/iverilog/package.nix
+++ b/pkgs/by-name/iv/iverilog/package.nix
@@ -51,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   preConfigure = "sh autoconf.sh";
 
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
+
   enableParallelBuilding = true;
 
   # NOTE(jleightcap): the `make check` target only runs a "Hello, World"-esque sanity check.
diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix
index bbcb3854a019..dd4ed59c1fe4 100644
--- a/pkgs/by-name/j/j/package.nix
+++ b/pkgs/by-name/j/j/package.nix
@@ -7,28 +7,7 @@
   avx2Support ? stdenv.hostPlatform.avx2Support,
 }:
 
-stdenv.mkDerivation rec {
-  pname = "j";
-  version = "9.6.2";
-
-  src = fetchFromGitHub {
-    owner = "jsoftware";
-    repo = "jsource";
-    tag = version;
-    hash = "sha256-Afa2QzzgJYijcavurgGH/qwyofNn4rtFMIHzlqJwFGU=";
-  };
-
-  nativeBuildInputs = [ which ];
-  buildInputs = [ gmp ];
-
-  patches = [
-    ./fix-install-path.patch
-  ];
-
-  enableParallelBuilding = true;
-
-  dontConfigure = true;
-
+let
   # Emulate jplatform64.sh configuration variables
   jplatform =
     if stdenv.hostPlatform.isDarwin then
@@ -49,6 +28,28 @@ stdenv.mkDerivation rec {
       if stdenv.hostPlatform.isDarwin then "j64arm" else "j64"
     else
       "unsupported";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "j";
+  version = "9.7.1";
+
+  src = fetchFromGitHub {
+    owner = "jsoftware";
+    repo = "jsource";
+    tag = finalAttrs.version;
+    hash = "sha256-fW6Tc0UEPYFTgEFMUxZaVm2NU5LNFqszifqOqfdFJZY=";
+  };
+
+  nativeBuildInputs = [ which ];
+  buildInputs = [ gmp ];
+
+  patches = [
+    ./fix-install-path.patch
+  ];
+
+  enableParallelBuilding = true;
+
+  dontConfigure = true;
 
   env.NIX_LDFLAGS = "-lgmp";
 
@@ -94,4 +95,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.all;
     mainProgram = "jconsole";
   };
-}
+})
diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix
index ce5dc1e234f9..2849b1e6c65d 100644
--- a/pkgs/by-name/ja/jai/package.nix
+++ b/pkgs/by-name/ja/jai/package.nix
@@ -9,7 +9,7 @@
 let
   pname = "jai";
   minor = "2";
-  patch = "026";
+  patch = "029";
   version = "0.${minor}.${patch}";
   zipName = "jai-beta-${minor}-${patch}.zip";
   jai = stdenv.mkDerivation {
@@ -20,7 +20,7 @@ let
           nix-store --add-fixed sha256 ${zipName}
       '';
       name = zipName;
-      sha256 = "sha256-iWPMVGzcDlR3cP4ruPZJBAAdvFLZeM8+pCxbsSk2ZLw=";
+      sha256 = "sha256-LH49sPgtn4TccDQa1080cnCnH/zlyZa1Jc4Y1DScJOc=";
     };
     nativeBuildInputs = [ unzip ];
     buildCommand = "unzip $src -d $out";
diff --git a/pkgs/by-name/ja/janus-gateway/package.nix b/pkgs/by-name/ja/janus-gateway/package.nix
index d1233d98f734..66618388dbee 100644
--- a/pkgs/by-name/ja/janus-gateway/package.nix
+++ b/pkgs/by-name/ja/janus-gateway/package.nix
@@ -34,13 +34,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "janus-gateway";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "meetecho";
     repo = "janus-gateway";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Kt36rnBwmrf2/xDD4FR/T4Qlq4wx/Lq8fId6EgjBxkA=";
+    sha256 = "sha256-/201zFwahtN9cH+iHqeAi5FCTXUE3Z6J1G5Xh0xzc3Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix
index 90972a50e03d..62f51d330e8a 100644
--- a/pkgs/by-name/ja/jasper/package.nix
+++ b/pkgs/by-name/ja/jasper/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jasper";
-  version = "4.2.8";
+  version = "4.2.9";
 
   src = fetchFromGitHub {
     owner = "jasper-software";
     repo = "jasper";
     rev = "version-${finalAttrs.version}";
-    hash = "sha256-p/xqDsYivhG/21808hdMKFMWl4DfQ0huAHiftVjOdJM=";
+    hash = "sha256-Z3eg3xNGFpvzvDp9ldYwh0JnrqfoaZQ7jc58hcZo+Qo=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ja/jaspr_cli/package.nix b/pkgs/by-name/ja/jaspr_cli/package.nix
new file mode 100644
index 000000000000..6074c540bfe9
--- /dev/null
+++ b/pkgs/by-name/ja/jaspr_cli/package.nix
@@ -0,0 +1,94 @@
+{
+  lib,
+  buildDartApplication,
+  fetchFromGitHub,
+  versionCheckHook,
+  callPackage,
+  yq-go,
+  testers,
+}:
+# Note: Removed jaspr_cli from arguments because we use finalAttrs.finalPackage for tests
+buildDartApplication (finalAttrs: {
+  pname = "jaspr_cli";
+  version = "0.23.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # Fetch the whole monorepo
+  src = fetchFromGitHub {
+    owner = "schultek";
+    repo = "jaspr";
+    tag = "jaspr_cli-v${finalAttrs.version}";
+    hash = "sha256-V+cmnO4I4hZEdxzjnycPCTQbWpBmjESJSG9cIoMIwjo=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/packages/jaspr_cli";
+
+  dartEntryPoints = {
+    "bin/jaspr" = "bin/jaspr.dart";
+  };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  nativeBuildInputs = [ yq-go ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  doInstallCheck = true;
+
+  # Remove the resolution: workspace section.
+  # Workspace dependencies break the Nix build which expects
+  # all dependencies to be resolved via the lockfile.
+  preBuild = ''
+    yq -i 'del(.resolution)' pubspec.yaml
+  '';
+
+  passthru = {
+    updateScript = lib.getExe (callPackage ./update.nix { });
+
+    tests = {
+      # Basic execution test
+      help-text = testers.runCommand {
+        name = "jaspr-cli-help-test";
+        # Use finalPackage to refer to the finished derivation
+        buildInputs = [ finalAttrs.finalPackage ];
+        script = ''
+          jaspr --help | grep "Usage: jaspr"
+          touch $out
+        '';
+      };
+
+      # Smoke test: Can it initialize a project?
+      # Note: Using --no-pub-get because Nix has no network access
+      create-project = testers.runCommand {
+        name = "jaspr-cli-create-test";
+        buildInputs = [ finalAttrs.finalPackage ];
+        script = ''
+          export HOME=$TMPDIR
+          jaspr create -t docs my_test_project --no-pub-get
+          test -f my_test_project/pubspec.yaml
+          touch $out
+        '';
+      };
+    };
+  };
+
+  meta = {
+    mainProgram = "jaspr";
+    homepage = "https://jaspr.site";
+    description = "Command line tools for Jaspr";
+    longDescription = ''
+      Command line tools for the Jaspr, a modern web framework for building websites in Dart. Supports SPAs, SSR and SSG.
+    '';
+    changelog = "https://pub.dev/packages/jaspr_cli/changelog#${
+      lib.replaceString "." "" finalAttrs.version
+    }";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "schultek" finalAttrs.version;
+    maintainers = with lib.maintainers; [ KristijanZic ];
+  };
+})
diff --git a/pkgs/by-name/ja/jaspr_cli/pubspec.lock.json b/pkgs/by-name/ja/jaspr_cli/pubspec.lock.json
new file mode 100644
index 000000000000..badea5fdd5c5
--- /dev/null
+++ b/pkgs/by-name/ja/jaspr_cli/pubspec.lock.json
@@ -0,0 +1,887 @@
+{
+  "packages": {
+    "_fe_analyzer_shared": {
+      "dependency": "transitive",
+      "description": {
+        "name": "_fe_analyzer_shared",
+        "sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "96.0.0"
+    },
+    "analyzer": {
+      "dependency": "direct main",
+      "description": {
+        "name": "analyzer",
+        "sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.2.0"
+    },
+    "ansi_styles": {
+      "dependency": "direct main",
+      "description": {
+        "name": "ansi_styles",
+        "sha256": "9c656cc12b3c27b17dd982b2cc5c0cfdfbdabd7bc8f3ae5e8542d9867b47ce8a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.2+1"
+    },
+    "archive": {
+      "dependency": "transitive",
+      "description": {
+        "name": "archive",
+        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.9"
+    },
+    "args": {
+      "dependency": "direct main",
+      "description": {
+        "name": "args",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.7.0"
+    },
+    "async": {
+      "dependency": "direct main",
+      "description": {
+        "name": "async",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.13.1"
+    },
+    "boolean_selector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "boolean_selector",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "browser_launcher": {
+      "dependency": "direct main",
+      "description": {
+        "name": "browser_launcher",
+        "sha256": "ca2557663d3033845f2ef2b60f94fc249528324fd1affddccb7c63ac0ccd6c67",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
+    "build_daemon": {
+      "dependency": "direct main",
+      "description": {
+        "name": "build_daemon",
+        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.1"
+    },
+    "built_collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_collection",
+        "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.1.1"
+    },
+    "built_value": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_value",
+        "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.12.5"
+    },
+    "checked_yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "checked_yaml",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.4"
+    },
+    "cli_completion": {
+      "dependency": "direct main",
+      "description": {
+        "name": "cli_completion",
+        "sha256": "72e8ccc4545f24efa7bbdf3bff7257dc9d62b072dee77513cc54295575bc9220",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.1"
+    },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "cli_util": {
+      "dependency": "direct main",
+      "description": {
+        "name": "cli_util",
+        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.4.2"
+    },
+    "clock": {
+      "dependency": "transitive",
+      "description": {
+        "name": "clock",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.2"
+    },
+    "collection": {
+      "dependency": "direct main",
+      "description": {
+        "name": "collection",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.19.1"
+    },
+    "convert": {
+      "dependency": "transitive",
+      "description": {
+        "name": "convert",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "coverage": {
+      "dependency": "transitive",
+      "description": {
+        "name": "coverage",
+        "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.15.0"
+    },
+    "crypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "crypto",
+        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.7"
+    },
+    "csslib": {
+      "dependency": "transitive",
+      "description": {
+        "name": "csslib",
+        "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.2"
+    },
+    "dap": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dap",
+        "sha256": "42b0b083a09c59a118741769e218fc3738980ab591114f09d1026241d2b9c290",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
+    "dart_service_protocol_shared": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dart_service_protocol_shared",
+        "sha256": "1737875c176d7e3d87bb3a359182828b542fe20a0b34198b8d31a81af5c7a76d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.0.3"
+    },
+    "dds": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dds",
+        "sha256": "6673c5b29e502fd44dbf5836685e7c7c16b11c0fa7f91ef241e0cbf0638c8794",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.3.0"
+    },
+    "dds_service_extensions": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dds_service_extensions",
+        "sha256": "afe0fce921953ac0c5bb276bccd7e36fa5035d7769567d122523fdd09beb4d03",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "devtools_shared": {
+      "dependency": "transitive",
+      "description": {
+        "name": "devtools_shared",
+        "sha256": "2daf7a9fba6a470668b26ecbd04200f7bf992aad81a2c31d12457c7791419dea",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "12.1.0"
+    },
+    "dtd": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dtd",
+        "sha256": "09ddb228b3d1478a093556357692a4c203ff4f9d5f8cda05dfdca0ff3fb7c5d3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "dwds": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dwds",
+        "sha256": "10d22555cbb59c3e0e968da646ff7f0103e4f56698bbc37e45145de34e4bad36",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "27.0.3"
+    },
+    "equatable": {
+      "dependency": "transitive",
+      "description": {
+        "name": "equatable",
+        "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.8"
+    },
+    "extension_discovery": {
+      "dependency": "transitive",
+      "description": {
+        "name": "extension_discovery",
+        "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "ffi": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ffi",
+        "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "file": {
+      "dependency": "direct main",
+      "description": {
+        "name": "file",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.1"
+    },
+    "fixnum": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fixnum",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "frontend_server_client": {
+      "dependency": "transitive",
+      "description": {
+        "name": "frontend_server_client",
+        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "glob": {
+      "dependency": "direct main",
+      "description": {
+        "name": "glob",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
+    "html": {
+      "dependency": "direct main",
+      "description": {
+        "name": "html",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.15.6"
+    },
+    "http": {
+      "dependency": "direct main",
+      "description": {
+        "name": "http",
+        "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.6.0"
+    },
+    "http_multi_server": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_multi_server",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.2"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.2"
+    },
+    "io": {
+      "dependency": "direct main",
+      "description": {
+        "name": "io",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.5"
+    },
+    "json_annotation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "json_annotation",
+        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.11.0"
+    },
+    "json_rpc_2": {
+      "dependency": "transitive",
+      "description": {
+        "name": "json_rpc_2",
+        "sha256": "82dfd37d3b2e5030ae4729e1d7f5538cbc45eb1c73d618b9272931facac3bec1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.0"
+    },
+    "logging": {
+      "dependency": "direct main",
+      "description": {
+        "name": "logging",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "mason": {
+      "dependency": "direct main",
+      "description": {
+        "name": "mason",
+        "sha256": "515b28eedc3e106bbbfb95f0ff63471003396978d3413daeba0a64bcac01367b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2"
+    },
+    "mason_logger": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mason_logger",
+        "sha256": "1d46102c6f299c0df7fe986dd3dd3271d57c2ec7c00ae590660b7c3018810048",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.5"
+    },
+    "matcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "matcher",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.12.19"
+    },
+    "meta": {
+      "dependency": "direct main",
+      "description": {
+        "name": "meta",
+        "sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.18.2"
+    },
+    "mime": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mime",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
+    },
+    "mocktail": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "mocktail",
+        "sha256": "5e1bf53cc7baa8062a33b84424deb61513858ea05c601b8509e683815b5914aa",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.5"
+    },
+    "mustache_template": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mustache_template",
+        "sha256": "544ff0b837836f5ad6b351e7a676ff7c2cad4fa412c465908aeb9358caddb6fc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.4"
+    },
+    "node_preamble": {
+      "dependency": "transitive",
+      "description": {
+        "name": "node_preamble",
+        "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
+    "package_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_config",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "path": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.1"
+    },
+    "platform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "platform",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.6"
+    },
+    "pool": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pool",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.2"
+    },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.5.0"
+    },
+    "process": {
+      "dependency": "transitive",
+      "description": {
+        "name": "process",
+        "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.0.5"
+    },
+    "pub_semver": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "pub_updater": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pub_updater",
+        "sha256": "739a0161d73a6974c0675b864fb0cf5147305f7b077b7f03a58fa7a9ab3e7e7d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.0"
+    },
+    "shelf": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shelf",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.2"
+    },
+    "shelf_packages_handler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_packages_handler",
+        "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "shelf_proxy": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shelf_proxy",
+        "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.4"
+    },
+    "shelf_static": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shelf_static",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
+    "shelf_web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_web_socket",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "source_map_stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_map_stack_trace",
+        "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "source_maps": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_maps",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.10.13"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.10.2"
+    },
+    "sse": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sse",
+        "sha256": "a9a804dbde8bfd369da3b4aa241d44d63a6486a97388c54ec166073d88c52302",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.2.0"
+    },
+    "stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.12.1"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "stream_transform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_transform",
+        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
+    },
+    "term_glyph": {
+      "dependency": "transitive",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.2"
+    },
+    "test": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "test",
+        "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.31.0"
+    },
+    "test_api": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_api",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.11"
+    },
+    "test_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_core",
+        "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.17"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
+    "unified_analytics": {
+      "dependency": "transitive",
+      "description": {
+        "name": "unified_analytics",
+        "sha256": "406724e9231f8e30119673133c1087f9b24e2a75ba7111ea071253d57bb8f3b9",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.0.14"
+    },
+    "vm_service": {
+      "dependency": "direct main",
+      "description": {
+        "name": "vm_service",
+        "sha256": "046d3928e16fa4dc46e8350415661755ab759d9fc97fc21b5ab295f71e4f0499",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "15.1.0"
+    },
+    "vm_service_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vm_service_interface",
+        "sha256": "503c92c26cf9f77d688bf8fca27fa9ec40450adbf02ec1ec5f12828ded508ac0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
+    "watcher": {
+      "dependency": "direct main",
+      "description": {
+        "name": "watcher",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
+    "web_socket_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket_channel",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.3"
+    },
+    "webkit_inspection_protocol": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webkit_inspection_protocol",
+        "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "win32": {
+      "dependency": "transitive",
+      "description": {
+        "name": "win32",
+        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.15.0"
+    },
+    "yaml": {
+      "dependency": "direct main",
+      "description": {
+        "name": "yaml",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.3"
+    },
+    "yaml_edit": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml_edit",
+        "sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.4"
+    }
+  },
+  "sdks": {
+    "dart": ">=3.11.0 <4.0.0"
+  }
+}
diff --git a/pkgs/by-name/ja/jaspr_cli/update.nix b/pkgs/by-name/ja/jaspr_cli/update.nix
new file mode 100644
index 000000000000..8ad4ead0a7ae
--- /dev/null
+++ b/pkgs/by-name/ja/jaspr_cli/update.nix
@@ -0,0 +1,64 @@
+{
+  writeShellApplication,
+  common-updater-scripts,
+  nix-update,
+  yq-go,
+  dart,
+  nix,
+}:
+let
+  name = "update-jaspr_cli";
+  packageName = "jaspr_cli";
+  packageDir = toString ./.;
+in
+writeShellApplication {
+  inherit name;
+  runtimeInputs = [
+    common-updater-scripts
+    nix-update
+    yq-go
+    dart
+    nix
+  ];
+  text = ''
+    pname="''${UPDATE_NIX_PNAME:-${packageName}}"
+
+    main() {
+      old_version="''${UPDATE_NIX_OLD_VERSION:-$(get_version)}"
+      nix-update "$pname" --version stable --version-regex "$pname-v([0-9.]+(:?\\+[0-9]+)?)"
+      new_version=$(get_version)
+      if [[ "$new_version" == "$old_version" ]]; then
+        exit 0
+      fi
+      generate_lockfile
+    }
+
+    get_version() {
+      nix-instantiate --raw --eval --strict -A "$pname.version"
+    }
+
+    generate_lockfile() {
+      tmp_dir=$(mktemp -d)
+      trap 'rm -rf "$tmp_dir"' EXIT
+
+      src=$(nix-build --no-link . -A "$pname.src")
+
+      cp -r "$src/packages/$pname/." "$tmp_dir/"
+      chmod -R +w "$tmp_dir"
+      cd "$tmp_dir"
+
+      # Remove resolution as in the nix build
+      yq -i 'del(.resolution)' pubspec.yaml
+
+      # Generate lockfile because it's not included in the source
+      if ! test -f pubspec.lock; then
+        dart pub get
+      fi
+
+      # Convert to JSON
+      yq -o=json . pubspec.lock > "${packageDir}/pubspec.lock.json"
+    }
+
+    main
+  '';
+}
diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix
index 3ea84f2b91a2..dbfa2cd31415 100644
--- a/pkgs/by-name/jd/jdt-language-server/package.nix
+++ b/pkgs/by-name/jd/jdt-language-server/package.nix
@@ -7,15 +7,15 @@
 }:
 
 let
-  timestamp = "202602261110";
+  timestamp = "202604151538";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "jdt-language-server";
-  version = "1.57.0";
+  version = "1.58.0";
 
   src = fetchurl {
     url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
-    hash = "sha256-9/+pP+G7vqldrBPdl83NJcWC1uVttnJY2g3M6yMCYB4=";
+    hash = "sha256-Klu+VeyRtDJTkgUNxCLOrTIgokWbN2a+NeH/9FtKUNk=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/je/jellyfin-rpc/package.nix b/pkgs/by-name/je/jellyfin-rpc/package.nix
index e99c94cf431b..8163483638ee 100644
--- a/pkgs/by-name/je/jellyfin-rpc/package.nix
+++ b/pkgs/by-name/je/jellyfin-rpc/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "1.3.4";
 
   src = fetchFromGitHub {
-    owner = "Radiicall";
+    owner = "JustRadical";
     repo = "jellyfin-rpc";
     tag = finalAttrs.version;
     hash = "sha256-g4Vd++Q6rJS6nU1kR+7aItnhHc0jeFSU460iF6P1EEk=";
@@ -30,8 +30,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Displays the content you're currently watching on Discord";
-    homepage = "https://github.com/Radiicall/jellyfin-rpc";
-    changelog = "https://github.com/Radiicall/jellyfin-rpc/releases/tag/${finalAttrs.version}";
+    homepage = "https://github.com/JustRadical/jellyfin-rpc";
+    changelog = "https://github.com/JustRadical/jellyfin-rpc/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "jellyfin-rpc";
diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index 0beb6b2c0a1a..64a18cea81eb 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   buildNpmPackage,
-  nodejs_20,
+  nodejs_22,
   nix-update-script,
   pkg-config,
   xcbuild,
@@ -24,11 +24,11 @@ buildNpmPackage (finalAttrs: {
       hash = "sha256-Nrh4BNlhJyzj9cXQ6Yr7349r5H+4r9W3aldcg9+J6dU=";
     };
 
-  nodejs = nodejs_20; # does not build with 22
+  nodejs = nodejs_22;
 
   postPatch = ''
     substituteInPlace webpack.common.js \
-      --replace-fail "git describe --always --dirty" "echo ${finalAttrs.src.rev}" \
+      --replace-fail "git describe --always --dirty" "echo ${finalAttrs.src.rev}"
   '';
 
   npmDepsHash = "sha256-oxytp6n/4X1bhpfFqpqMAji86sbjV669F324zY3hoK4=";
diff --git a/pkgs/by-name/jf/jfbview/package.nix b/pkgs/by-name/jf/jfbview/package.nix
index ff649a23ff6d..5a28c3c8eea5 100644
--- a/pkgs/by-name/jf/jfbview/package.nix
+++ b/pkgs/by-name/jf/jfbview/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  pkg-config,
   freetype,
   harfbuzz,
   imlib2,
@@ -17,17 +18,23 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jfbview";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "jichu4n";
     repo = "jfbview";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-ASgKXk5iVqKsBc1uzakHs5ojUb6AptGm9LxNyFcDngc=";
+    hash = "sha256-7iyDfMuGAXXLyDNz0d4jEQ+KfJ/LyUu4v1n0GcOKeEc=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
 
   buildInputs = [
     freetype
@@ -53,11 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
-  '';
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix
index 06f70563b978..d5c7ac94e86d 100644
--- a/pkgs/by-name/jj/jj-pre-push/package.nix
+++ b/pkgs/by-name/jj/jj-pre-push/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "jj-pre-push";
-  version = "0.3.5";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "acarapetis";
     repo = "jj-pre-push";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T9IKPFGswwrszGkBCIz8et2vTgRpQ2l6ta2UfojGj7A=";
+    hash = "sha256-LULCTpsxTflqWm5ZVFHbnTI/2+4xI9MX4kbAtYzBIAI=";
   };
 
   postPatch = ''
@@ -51,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Run pre-commit.com before `jj git push`";
     homepage = "https://github.com/acarapetis/jj-pre-push";
-    changelog = "https://github.com/acarapetis/jj-pre-push/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/acarapetis/jj-pre-push/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ xanderio ];
     mainProgram = "jj-pre-push";
diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 0696e9ee61c0..6050122523e2 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "jjui";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8ckAZb6wNCkocQl2v0VCIii64W5B7VG8LFlnwhQIAT4=";
+    hash = "sha256-20NWoojFBwHs33NFNeZbk1kiZ418kYD42XTUOHuQtv8=";
   };
 
   vendorHash = "sha256-AJlJ9iHkkWNS8a4oGt8AG89StjMH9UH3WuOcZwa3VS8=";
diff --git a/pkgs/by-name/jo/joe/package.nix b/pkgs/by-name/jo/joe/package.nix
index e183f3da2972..3f8e595f80ed 100644
--- a/pkgs/by-name/jo/joe/package.nix
+++ b/pkgs/by-name/jo/joe/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "joe";
-  version = "4.6";
+  version = "4.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/joe-editor/joe-${finalAttrs.version}.tar.gz";
-    sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9";
+    sha256 = "sha256-cSsjqDo3V6k9K0p2Mludq7pVTBgrIJ0mdVN8Jyhn/Lo=";
   };
 
   patches = [ ./macos-fix.patch ];
diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix
index 0a47b643cb7f..266ced05efa0 100644
--- a/pkgs/by-name/jo/josh/package.nix
+++ b/pkgs/by-name/jo/josh/package.nix
@@ -10,13 +10,7 @@
 }:
 
 let
-  # josh-ui requires javascript dependencies, haven't tried to figure it out yet
-  cargoFlags = [
-    "--workspace"
-    "--exclude"
-    "josh-ui"
-  ];
-  version = "24.10.04";
+  version = "26.04.19";
 in
 
 rustPlatform.buildRustPackage {
@@ -27,10 +21,10 @@ rustPlatform.buildRustPackage {
     owner = "josh-project";
     repo = "josh";
     rev = "r${version}";
-    hash = "sha256-6rfNEWNeC0T/OXhCReaV5npcJjQoH6XhsZzHXGnnxOo=";
+    hash = "sha256-tWU7ZGs148fmCXJxUM1RiDIgJONMZnFXO7ksaqqoT9I=";
   };
 
-  cargoHash = "sha256-Kb0EKWae1sldDg+F3ccoztI3zbQ/BJjy+4ojnqiqKA4=";
+  cargoHash = "sha256-Ksl3dFeEpwhpiotNuM9/vg7aD2TUuHKvqUaZkbceCdY=";
 
   nativeBuildInputs = [
     pkg-config
@@ -42,12 +36,18 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  cargoBuildFlags = cargoFlags;
-  cargoTestFlags = cargoFlags;
+  cargoBuildFlags = [ "--workspace" ];
+  # josh-proxy's inline tests need to interact with a specific test environment
+  cargoTestFlags = [
+    "--workspace"
+    "--exclude"
+    "josh-proxy"
+  ];
 
   # used to teach josh itself about its version number
   env.JOSH_VERSION = "r${version}";
 
+  # josh and josh-filter are used interactively, so git is likely already in PATH
   postInstall = ''
     wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin"
   '';
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage {
     description = "Just One Single History";
     homepage = "https://josh-project.github.io/josh/";
     downloadPage = "https://github.com/josh-project/josh";
-    changelog = "https://github.com/josh-project/josh/releases/tag/${version}";
+    changelog = "https://github.com/josh-project/josh/releases/tag/r${version}";
     license = lib.licenses.mit;
     maintainers = [
       lib.maintainers.sternenseemann
diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix
index a4803bab5954..1c17d0815e58 100644
--- a/pkgs/by-name/jo/jotdown/package.nix
+++ b/pkgs/by-name/jo/jotdown/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jotdown";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "hellux";
     repo = "jotdown";
     rev = finalAttrs.version;
-    hash = "sha256-76GYcLgTmTAweV+SI93me89YUHAujE0dFetG5QLlFRs=";
+    hash = "sha256-GUETWMWNAPfTcuu7LBgexgd1CWFbSyBwBZtFjMQ67Hk=";
   };
 
-  cargoHash = "sha256-1h7nL37OtqHMLO7W1DHPo2SH7prGqHlDgMHbTQu0gBI=";
+  cargoHash = "sha256-yuzjyP1iy6pgUJev1dJPjU85A3W5n7G2B+Pa1R47KiQ=";
 
   meta = {
     description = "Minimal Djot CLI";
diff --git a/pkgs/by-name/jo/joularjx/package.nix b/pkgs/by-name/jo/joularjx/package.nix
index 0710781fa0aa..4233f4b861bc 100644
--- a/pkgs/by-name/jo/joularjx/package.nix
+++ b/pkgs/by-name/jo/joularjx/package.nix
@@ -8,18 +8,18 @@
 
 maven.buildMavenPackage rec {
   pname = "joularjx";
-  version = "2.9.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "joular";
     repo = "joularjx";
     rev = version;
-    hash = "sha256-/Drv6PVMmz3QNEu8zMokTKBZeYWMjuKczu18qKqNAx4=";
+    hash = "sha256-hr8a3Qr1LdFfGBLVJVkm6hhCW7knG4VpXj7nCtcptuU=";
   };
 
-  mvnHash = "sha256-TKHo0hZBjgBeUWYvbjF3MZ6Egp3qB2LGwWfrGrcVkOk=";
+  mvnHash = "sha256-3y39873pxlQD7d02sbVtZ2I/zcQtPZ30XrA2qY84EzA=";
 
-  mvnParameters = "-DskipTests";
+  mvnParameters = "-DskipTests -Dmaven.javadoc.skip=true";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/jp/jp-zip-codes/package.nix b/pkgs/by-name/jp/jp-zip-codes/package.nix
index 73f7efaef7bb..9d5cce37e034 100644
--- a/pkgs/by-name/jp/jp-zip-codes/package.nix
+++ b/pkgs/by-name/jp/jp-zip-codes/package.nix
@@ -7,15 +7,15 @@
 
 stdenvNoCC.mkDerivation {
   pname = "jp-zip-code";
-  version = "0-unstable-2026-04-01";
+  version = "0-unstable-2026-05-01";
 
   # This package uses a mirror as the source because the
   # original provider uses the same URL for updated content.
   src = fetchFromGitHub {
     owner = "musjj";
     repo = "jp-zip-codes";
-    rev = "5404779eb05849c61c70c4489d117bcb36ea19ab";
-    hash = "sha256-pysW1hAj8acTFOytYw/ZXknUlRP+JUvh4Ia2I2CwA6A=";
+    rev = "fd586719e8b6c55763e015963eb2b7cb7383ffec";
+    hash = "sha256-88Vr1YySNT1Z+1rqxzT6Mccv/v6wL+HtW10Fmt3SXoA=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix
index 1a98c44cc2c9..320f8d08fc5c 100644
--- a/pkgs/by-name/jr/jreleaser-cli/package.nix
+++ b/pkgs/by-name/jr/jreleaser-cli/package.nix
@@ -7,11 +7,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "jreleaser-cli";
-  version = "1.23.0";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";
-    hash = "sha256-NSJn4KSm8xC4HMXzh4m1EqlLUPGVu1SWfDUHT4umKTI=";
+    hash = "sha256-WA2lH4SCjNDqkUE5OJe2hF7/HaEIyB+dynHT4yDqzMc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/js/json-sort/package.nix b/pkgs/by-name/js/json-sort/package.nix
index 2639120b95d1..db478f1c56d2 100644
--- a/pkgs/by-name/js/json-sort/package.nix
+++ b/pkgs/by-name/js/json-sort/package.nix
@@ -8,7 +8,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "json-sort";
-  version = "0.1.1";
+  version = "1.0.0";
 
   __structuredAttrs = true;
 
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "drupol";
     repo = "json-sort";
     tag = finalAttrs.version;
-    hash = "sha256-U88bP1jVk5imwvSSxN16yaelzq1OhztgUA3MK4FbGnY=";
+    hash = "sha256-H6IjedwKVMUI8na7RbJjWRjNppq3j3+g63sUKsQ5BYQ=";
   };
 
-  cargoHash = "sha256-jnuy00eE0/AaZXURjGRt7WPTLcVY4Hl45AuoR04gqRY=";
+  cargoHash = "sha256-LBMExTj855F+PpFpqcpxTyBR3eEEF235kTbd5CmSQWo=";
 
   dontUseCargoParallelTests = true;
 
diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix
index 4a4900f50c7e..a9af868b6883 100644
--- a/pkgs/by-name/js/jsoncons/package.nix
+++ b/pkgs/by-name/js/jsoncons/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jsoncons";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "danielaparker";
     repo = "jsoncons";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p+LMT0231ZKtxoTqWjUZof3WQu+lLqAS3n20u9dYTzM=";
+    hash = "sha256-OhXcHMec+cExLLl0GuXoro93u1w/BTLY5bBh+4uUK5s=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/js/jsoncpp/package.nix b/pkgs/by-name/js/jsoncpp/package.nix
index e0f6f3405c8e..973cffb3a41c 100644
--- a/pkgs/by-name/js/jsoncpp/package.nix
+++ b/pkgs/by-name/js/jsoncpp/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jsoncpp";
-  version = "1.9.6";
+  version = "1.9.7";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "open-source-parsers";
     repo = "jsoncpp";
     rev = finalAttrs.version;
-    sha256 = "sha256-3msc3B8NyF8PUlNaAHdUDfCpcUmz8JVW2X58USJ5HRw=";
+    sha256 = "sha256-rf8d2UNTVEZhuiyChK2XnUbfGDvsfXnKADhaSp8qBwQ=";
   };
 
   /*
diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix
index 91c508cb1f5c..37e61e88a66a 100644
--- a/pkgs/by-name/js/jsonschema-cli/package.nix
+++ b/pkgs/by-name/js/jsonschema-cli/package.nix
@@ -9,15 +9,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jsonschema-cli";
-  version = "0.46.0";
+  version = "0.46.3";
 
   src = fetchCrate {
     pname = "jsonschema-cli";
     inherit (finalAttrs) version;
-    hash = "sha256-tpapiI6FYHEgmI0XY5KZNNsZxKxkEN4BIJaNQXsMIJI=";
+    hash = "sha256-/Tebhwn+H8HFTUelaQ33kuU6np3QKCrZpKfpvm7buWI=";
   };
 
-  cargoHash = "sha256-1Wih2VwK3hzdjuoAZI/1j0jPwWwL4l4y4rQRX0VV4Sc=";
+  cargoHash = "sha256-XP8IphAprOmwqHMzkcJN4rOjMZ3yNEhpvwO3tAD203Y=";
 
   preCheck = ''
     export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix
index 1bc322419cd9..5cec0ea6913a 100644
--- a/pkgs/by-name/ju/just-lsp/package.nix
+++ b/pkgs/by-name/ju/just-lsp/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "just-lsp";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "terror";
     repo = "just-lsp";
     tag = finalAttrs.version;
-    hash = "sha256-bNOQHFULe+gA9UC9JBoTaStQ1geqXqOxydIPF39w2xY=";
+    hash = "sha256-4DxyKzIcX2hVCmgMTnA/4kqlghJd38jPoL7B7PcV+NU=";
   };
 
-  cargoHash = "sha256-3JsVJ84DWNf1UTYHbreAvj6XoAGaEk6OXML4saiZBlA=";
+  cargoHash = "sha256-E6eHB1tJ2rCgkU+xoyx5yg5X0ZGFn54Ozt0fJW7qn58=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix
index e6089f6751ab..5abbadc5b51b 100644
--- a/pkgs/by-name/ju/just/package.nix
+++ b/pkgs/by-name/ju/just/package.nix
@@ -17,7 +17,7 @@
   withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
 }:
 let
-  version = "1.49.0";
+  version = "1.50.0";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -34,10 +34,10 @@ rustPlatform.buildRustPackage {
     owner = "casey";
     repo = "just";
     tag = version;
-    hash = "sha256-4vUcKHoQto4TQce4y4/MwdES0+PPlSjNvzLW77FodWs=";
+    hash = "sha256-2hq7lgjL4XbcaaWxuDfqU0UcC4DRYKL6WFjdnb5AmjY=";
   };
 
-  cargoHash = "sha256-5hhwzkNgF+i5aCUoVh1VNfkNJFttyy5cLhBwu8uHmAQ=";
+  cargoHash = "sha256-tKeVE5BpDvElnpN/CO6lOqDUwhWD1dGm7k51Z3wAviE=";
 
   nativeBuildInputs =
     lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]
diff --git a/pkgs/by-name/jw/jwhois/package.nix b/pkgs/by-name/jw/jwhois/package.nix
index a4f0de644ef2..c5f3730375c7 100644
--- a/pkgs/by-name/jw/jwhois/package.nix
+++ b/pkgs/by-name/jw/jwhois/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   lynx,
 }:
 
@@ -17,6 +18,10 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./connect.patch
     ./service-name.patch
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/jwhois/raw/422e2326397c7a48df61acb8ef649864a874272b/f/jwhois-4.0-gcc15-fix.patch";
+      hash = "sha256-bBZk2GUu8Y66u4u+zJxY/fxzzc2y17ECEJO6uNz9ngw=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix
index 66a036f93be4..bb8f98f4b4ad 100644
--- a/pkgs/by-name/jw/jwx/package.nix
+++ b/pkgs/by-name/jw/jwx/package.nix
@@ -6,19 +6,21 @@
 
 buildGoModule (finalAttrs: {
   pname = "jwx";
-  version = "3.0.13";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "lestrrat-go";
     repo = "jwx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-f2L78kS0H3FxS/qS0hP+GUXjkH3teJ1L5rrzy1oq+Wk=";
+    hash = "sha256-tVvesVrsbFONhmpFo59c/kC3vxAjWpQwnbaUmrx8O5E=";
   };
 
-  vendorHash = "sha256-BGxLwALZ6PZiErbIngaJCUjBhkg3UbfZig/MMOgAZTQ=";
+  vendorHash = "sha256-jCAHyCfTEcbtGEkxPLJvXJ90mVDyijWOoHJ5dbJouCs=";
 
   sourceRoot = "${finalAttrs.src.name}/cmd/jwx";
 
+  env.GOEXPERIMENT = "jsonv2";
+
   meta = {
     description = "Implementation of various JWx (Javascript Object Signing and Encryption/JOSE) technologies";
     mainProgram = "jwx";
diff --git a/pkgs/by-name/jx/jxscout/package.nix b/pkgs/by-name/jx/jxscout/package.nix
new file mode 100644
index 000000000000..9143fb1609bd
--- /dev/null
+++ b/pkgs/by-name/jx/jxscout/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  makeWrapper,
+  prettier,
+  bun,
+  nodejs,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "jxscout";
+  version = "0.9.5";
+
+  src = fetchFromGitHub {
+    owner = "francisconeves97";
+    repo = "jxscout";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jAtij9VJFYISXibmes+oO/Hh1MoEThkqfzmBe+z1RqQ=";
+  };
+
+  subPackages = [ "cmd/jxscout" ];
+
+  vendorHash = null;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  doCheck = true;
+
+  postInstall = ''
+    wrapProgram $out/bin/jxscout --prefix PATH : ${
+      lib.makeBinPath [
+        prettier
+        bun
+        nodejs
+      ]
+    }
+  '';
+
+  meta = {
+    description = "jxscout superpowers JavaScript analysis for security researchers (free version)";
+    homepage = "https://jxscout.app/";
+    downloadPage = "https://github.com/francisconeves97/jxscout";
+    changelog = "https://github.com/francisconeves97/jxscout/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "jxscout";
+    maintainers = with lib.maintainers; [ katok ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.windows;
+  };
+})
diff --git a/pkgs/by-name/k8/k8sgpt/package.nix b/pkgs/by-name/k8/k8sgpt/package.nix
index 91797e076b01..7c6cb3d29cd1 100644
--- a/pkgs/by-name/k8/k8sgpt/package.nix
+++ b/pkgs/by-name/k8/k8sgpt/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "k8sgpt";
-  version = "0.4.31";
+  version = "0.4.32";
 
   nativeBuildInputs = [
     installShellFiles
@@ -18,10 +18,10 @@ buildGoModule (finalAttrs: {
     owner = "k8sgpt-ai";
     repo = "k8sgpt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+cjCDcRdj6A17eT7IJ/OKgWTXex4zXz9pbmrcc2w2bM=";
+    hash = "sha256-qBo5Yi16c9oyZQObaP7Y1AM7MXcgvfz4wE0VJqyVfxE=";
   };
 
-  vendorHash = "sha256-zljqZWM1jSAC+ZhW1NNp182Ui/40u0VTtfolnPXQKqE=";
+  vendorHash = "sha256-rTHy/z2fGT6S4FX4StatxiD2Nbtqbgsqn3N0MA+oscA=";
 
   # https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED
   env.CGO_ENABLED = 0;
diff --git a/pkgs/by-name/ka/kagen/package.nix b/pkgs/by-name/ka/kagen/package.nix
index f9593f948010..cafacbff8ac7 100644
--- a/pkgs/by-name/ka/kagen/package.nix
+++ b/pkgs/by-name/ka/kagen/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "KarlsruheGraphGeneration";
     repo = "kagen";
     tag = "v${finalAttrs.version}";
-    # use vendor libmorton and xxHash
+    # use vendor libmorton and xxhash
     fetchSubmodules = true;
     hash = "sha256-VLQxeI9EzeJEp1krlLPRSct3SQmAF8cj34u3fkmppQg=";
   };
diff --git a/pkgs/by-name/ka/kakasi/package.nix b/pkgs/by-name/ka/kakasi/package.nix
index 9d6d8d0b3244..f68d277afc56 100644
--- a/pkgs/by-name/ka/kakasi/package.nix
+++ b/pkgs/by-name/ka/kakasi/package.nix
@@ -27,9 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
-  env = lib.optionalAttrs (!stdenv.cc.isClang) {
-    NIX_CFLAGS_COMPILE = "-std=gnu17";
-  };
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
 
   postPatch = ''
     for a in tests/kakasi-* ; do
diff --git a/pkgs/by-name/ka/kalign/macos-openmp-config.patch b/pkgs/by-name/ka/kalign/macos-openmp-config.patch
new file mode 100644
index 000000000000..c24f2cb4f0df
--- /dev/null
+++ b/pkgs/by-name/ka/kalign/macos-openmp-config.patch
@@ -0,0 +1,46 @@
+From fb223fceeb81f481316694560ceacc473ad04b4a Mon Sep 17 00:00:00 2001
+From: natsukium <tomoya.otabi@gmail.com>
+Date: Thu, 23 Apr 2026 16:46:54 +0900
+Subject: [PATCH] cmake: allow overriding hardcoded libomp path on macOS
+
+The OpenMP workaround hardcoded /opt/homebrew/opt/libomp, which locked
+out a custom build.
+Introduce LIBOMP_ROOT (defaulting to Homebrew) so the prefix can be
+overridden on the cmake command line.
+
+While here, restrict the block to AppleClang. The flags inside are
+AppleClang-specific (-Xpreprocessor -fopenmp, linking against the LLVM
+libomp runtime) and were previously forced on any compiler targeting
+Apple Silicon, silently breaking GCC and mis-configuring Homebrew LLVM
+Clang builds.
+---
+ CMakeLists.txt | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5a7d3f0..d76453d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -75,15 +75,15 @@ set(KALIGN_KMEANS_UPGMA_THRESHOLD "50" CACHE STRING "Number of sequences thresho
+ 
+ 
+ if(USE_OPENMP)
+-  # Configure OpenMP for macOS with Homebrew (only for arm64 native builds)
+-  if(APPLE AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" AND NOT CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+-    list(APPEND CMAKE_PREFIX_PATH /opt/homebrew)
+-    # Set OpenMP flags for Apple Clang + Homebrew libomp
+-    set(OpenMP_C_FLAGS "-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include")
++  # Configure OpenMP for macOS with external libomp (only for Apple Clang on arm64 native builds)
++  if(APPLE AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" AND NOT CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" AND CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
++    # Defaults to Homebrew
++    set(LIBOMP_ROOT "/opt/homebrew/opt/libomp" CACHE PATH "libomp install prefix")
++    set(OpenMP_C_FLAGS "-Xpreprocessor -fopenmp -I${LIBOMP_ROOT}/include")
+     set(OpenMP_C_LIB_NAMES "omp")
+-    set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include")
++    set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I${LIBOMP_ROOT}/include")
+     set(OpenMP_CXX_LIB_NAMES "omp")
+-    set(OpenMP_omp_LIBRARY /opt/homebrew/opt/libomp/lib/libomp.dylib)
++    set(OpenMP_omp_LIBRARY "${LIBOMP_ROOT}/lib/libomp.dylib")
+   endif()
+ 
+   find_package(OpenMP)
diff --git a/pkgs/by-name/ka/kalign/package.nix b/pkgs/by-name/ka/kalign/package.nix
index 86a75dd384ed..fc1d0818490d 100644
--- a/pkgs/by-name/ka/kalign/package.nix
+++ b/pkgs/by-name/ka/kalign/package.nix
@@ -11,15 +11,23 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kalign";
-  version = "3.4.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "TimoLassmann";
     repo = "kalign";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QcFNaCTqj6CFiOzQ6ezfBL0mu8PDU11hyNdkcsLOPzA=";
+    hash = "sha256-wcVzKedd8IFKql+TU4wJ4jEGDPdDfpyC5iGXrPYa0oY=";
   };
 
+  patches = [
+    # Allow overriding the hardcoded Homebrew libomp path on macOS and
+    # restrict the workaround to AppleClang so other compilers fall back
+    # to the standard OpenMP detection path.
+    # https://github.com/TimoLassmann/kalign/pull/65
+    ./macos-openmp-config.patch
+  ];
+
   nativeBuildInputs = [
     cmake
   ];
diff --git a/pkgs/by-name/ka/kando/add-deep-link-note.patch b/pkgs/by-name/ka/kando/add-deep-link-note.patch
new file mode 100644
index 000000000000..4ace5ae7e048
--- /dev/null
+++ b/pkgs/by-name/ka/kando/add-deep-link-note.patch
@@ -0,0 +1,12 @@
+diff --git a/src/main/index.ts b/src/main/index.ts
+index ad541ba..7879fdb 100644
+--- a/src/main/index.ts
++++ b/src/main/index.ts
+@@ -122,6 +122,7 @@ try {
+ 
+   if (!deepLinkSupport) {
+     console.error('Failed to register kando:// protocol. Deep links will not work.');
++    console.log("Note for nixpkgs: If you're using NixOS or home-manager on Linux, it should still work.")
+   }
+ 
+   // Choose the backend to use. We quit the app if no backend is found.
diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix
index 333d90f3fa09..9ac58eaeaeb1 100644
--- a/pkgs/by-name/ka/kando/package.nix
+++ b/pkgs/by-name/ka/kando/package.nix
@@ -22,20 +22,24 @@
 }:
 
 let
-  nodejs = nodejs_22; # NPM v11 included in nodejs_24 doesn't work with the current lockfile
+  nodejs = nodejs_22; # npm v11 included in nodejs_24 doesn't work with the current lockfile
 in
 buildNpmPackage.override { inherit nodejs; } rec {
   pname = "kando";
-  version = "2.1.2";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "kando-menu";
     repo = "kando";
     tag = "v${version}";
-    hash = "sha256-x+emk0N5AL5Nfk9d1+RehdLoEvqVe5DafZL1WRPFdrc=";
+    hash = "sha256-eCR+CL3EMV3eLXzpzKFGuec3YBWDnFjNyTEHpG51PLQ=";
   };
 
-  npmDepsHash = "sha256-zbPrQpm2IgIMqGvMzj6fzEV/lV/FszfU3fnFx3kPHr4=";
+  patches = [
+    ./add-deep-link-note.patch
+  ];
+
+  npmDepsHash = "sha256-VsWmM+CSAv3yFVelFNb3kUAeh4t+k04NFXVRz4AwFkI=";
 
   npmFlags = [ "--ignore-scripts" ];
 
@@ -130,6 +134,7 @@ buildNpmPackage.override { inherit nodejs; } rec {
       genericName = "Pie Menu";
       comment = "The Cross-Platform Pie Menu";
       categories = [ "Utility" ];
+      mimeTypes = [ "x-scheme-handler/kando" ];
     })
   ];
 
diff --git a/pkgs/by-name/ka/karere/package.nix b/pkgs/by-name/ka/karere/package.nix
index 58866325ab7f..2ab08b90c989 100644
--- a/pkgs/by-name/ka/karere/package.nix
+++ b/pkgs/by-name/ka/karere/package.nix
@@ -20,18 +20,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "karere";
-  version = "2.5.3";
+  version = "2.5.5";
 
   src = fetchFromGitHub {
     owner = "tobagin";
     repo = "karere";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0HIy//dIr3uHgapPCSxTx4Rq52g1f6JAS62eUvpEMwc=";
+    hash = "sha256-cR4+nZvz7ELy9/POX9yZiryVcCcpC63mFhZ6kvR33i8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-agZ4wBHYBgNpnu9deMbKFbJev+WXvvmtXm2s79B+SEE=";
+    hash = "sha256-h51B8iGiMWHbHogJSAKdm27QDBPzlrkCxlYOj9T4SuI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix
index df52f9b58383..1c842c896b04 100644
--- a/pkgs/by-name/ka/kargo/package.nix
+++ b/pkgs/by-name/ka/kargo/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kargo";
-  version = "1.9.5";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "akuity";
     repo = "kargo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jdRba3n9jGpZIp8E7Fz4DC3eDV4GK+MpuxBpYhpR60o=";
+    hash = "sha256-1r6XHtYbY107KwXHXv+AZd/y0TFa/LgU513bAhQPvPk=";
   };
 
   vendorHash = "sha256-ir73yLXLOs6/6YX72EeyMcGLsImRkGmH4vppwKeOD+A=";
diff --git a/pkgs/by-name/ka/kata-runtime/kata-images.nix b/pkgs/by-name/ka/kata-runtime/kata-images.nix
index d4eb2f22817b..8ed01e19354b 100644
--- a/pkgs/by-name/ka/kata-runtime/kata-images.nix
+++ b/pkgs/by-name/ka/kata-runtime/kata-images.nix
@@ -17,8 +17,8 @@ let
 
   imageHash =
     {
-      "x86_64-linux" = "sha256-roS2pGO00ORN+xxNU3/uqJG9RzhVqf8gCkt8EJJbY/g=";
-      "aarch64-linux" = "sha256-AuK5a2Qtd176B91+vSsEFwuWICpe8wcGTbXoE7B8b20=";
+      "x86_64-linux" = "sha256-sHPFf5DKsLjCiCG6PSjCEFcEtzESOxsVD162Ui/nCRc=";
+      "aarch64-linux" = "sha256-43P2MIMfE6+kB4/Ehe0NHmZhcd0/5Tnzj9vml5NxNWk=";
     }
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
diff --git a/pkgs/by-name/ka/kata-runtime/package.nix b/pkgs/by-name/ka/kata-runtime/package.nix
index b04e9d100868..d80fa2e383a3 100644
--- a/pkgs/by-name/ka/kata-runtime/package.nix
+++ b/pkgs/by-name/ka/kata-runtime/package.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "3.21.0";
+  version = "3.29.0";
 
   kata-images = callPackage ./kata-images.nix { inherit version; };
 
@@ -34,7 +34,7 @@ buildGoModule rec {
     owner = "kata-containers";
     repo = "kata-containers";
     rev = version;
-    hash = "sha256-gOPabvimKzP7U1/BRzjKPDKE0MHnhKI4j0WZPM6ZTSA=";
+    hash = "sha256-AjGqKJVrcfHLY0NosBWFOgKC3eiU9hsFXQsU+LM8XME=";
   };
 
   sourceRoot = "${src.name}/src/runtime";
diff --git a/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix b/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix
index dbc3fbdafe72..51c2617661f3 100644
--- a/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix
+++ b/pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix
@@ -5,19 +5,19 @@
   makeDesktopItem,
   copyDesktopItems,
   makeWrapper,
-  renpy,
+  renpyMinimal,
   nix-update-script,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "katawa-shoujo-re-engineered";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromCodeberg {
     # GitHub mirror at fleetingheart/ksre
     owner = "fhs";
     repo = "katawa-shoujo-re-engineered";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-M2TWc5dl7lkwM/oisM6xtJwb3Dw9i6qUadBHGdEO2bs=";
+    hash = "sha256-L8KYGV2sYXqjCppzlO40jzpusN85eOwR+muGK0SiXeA=";
   };
 
   desktopItems = [
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     copyDesktopItems
-    renpy
+    renpyMinimal
   ];
 
   postPatch = ''
@@ -45,6 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook preBuild
 
     renpy . compile
+    rm -r game/saves
 
     runHook postBuild
   '';
@@ -56,7 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mkdir -p $phome
     cp -r game $phome
     find $phome -type f -name "*.rpy" -delete
-    makeWrapper ${lib.getExe renpy} $out/bin/katawa-shoujo-re-engineered \
+    makeWrapper ${lib.getExe renpyMinimal} $out/bin/katawa-shoujo-re-engineered \
       --add-flags $phome --add-flags run
     install -D $src/web-icon.png $out/share/icons/hicolor/512x512/apps/katawa-shoujo-re-engineered.png
 
@@ -80,6 +81,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       rapiteanu
       ulysseszhan
     ];
-    platforms = renpy.meta.platforms;
+    platforms = renpyMinimal.meta.platforms;
   };
 })
diff --git a/pkgs/by-name/ka/katriawm/package.nix b/pkgs/by-name/ka/katriawm/package.nix
index f11363f8db67..e469f924206e 100644
--- a/pkgs/by-name/ka/katriawm/package.nix
+++ b/pkgs/by-name/ka/katriawm/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "katriawm";
-  version = "25.04";
+  version = "26.03";
 
   src = fetchzip {
     url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-3cWgLz4BO1X8KkhoQp3hbq5XAx9NzDhsIL3fDSQaG5M=";
+    hash = "sha256-vnnc5SkNzCLZTBxKcaHDo9F5f++7dtESD5hOB0zrxjo=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ka/kazumi/git-hashes.json b/pkgs/by-name/ka/kazumi/git-hashes.json
index 60a9c9309799..cf2fa6745ad5 100644
--- a/pkgs/by-name/ka/kazumi/git-hashes.json
+++ b/pkgs/by-name/ka/kazumi/git-hashes.json
@@ -1,6 +1,6 @@
 {
   "audio_service_mpris": "sha256-IVv1ioBpiK0VbnOFqnc9NbNn3Z+l9VN2clpCQjckBRo=",
-  "desktop_webview_window": "sha256-4nTulOxPTV7sePokTY7xJTwulyucvf4JZKw860P8pbA=",
+  "desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=",
   "media_kit": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
   "media_kit_libs_android_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
   "media_kit_libs_ios_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
@@ -10,5 +10,5 @@
   "media_kit_libs_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
   "media_kit_libs_windows_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
   "media_kit_video": "sha256-75fNdeaGtpGMOsK+oiLoIdqJe3+5cTO/8ftS0r7AU6I=",
-  "webview_windows": "sha256-YMOv3wRqsXqoccdDCv4dj10Pc1UkO9OuJWckNujMr5A="
+  "webview_windows": "sha256-5iNB/h6TzMOTxp98flg7jt2XZn0bFU6wSvYjjUXt3bk="
 }
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 2b726a92541b..6363529921f6 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -18,13 +18,13 @@
 }:
 
 let
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-r3nV7XhwvPoNqobRz/1n6iGjcjGPvcFYch5DQCP6RLE=";
+    hash = "sha256-ph9VFRBGwkEjKJGjnPGldLDOwIdHpZtEWydW80hKOFg=";
   };
 in
 flutter338.buildFlutterApplication {
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index b1f87ecf1e29..27af44111f65 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -445,8 +445,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "297b39532c426263d2fa9fde4d70d2b5bdfc8059",
-        "resolved-ref": "297b39532c426263d2fa9fde4d70d2b5bdfc8059",
+        "ref": "b429f8ba6b8a99cd0f7eb5fe8d1621f325635c3d",
+        "resolved-ref": "b429f8ba6b8a99cd0f7eb5fe8d1621f325635c3d",
         "url": "https://github.com/Predidit/linux_webview_window.git"
       },
       "source": "git",
@@ -1365,6 +1365,16 @@
       "source": "hosted",
       "version": "7.0.2"
     },
+    "photo_view": {
+      "dependency": "direct main",
+      "description": {
+        "name": "photo_view",
+        "sha256": "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.15.0"
+    },
     "platform": {
       "dependency": "transitive",
       "description": {
@@ -2145,8 +2155,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "1b9e83371356c04d8b0fb7ab1d20ebacf5cf9764",
-        "resolved-ref": "1b9e83371356c04d8b0fb7ab1d20ebacf5cf9764",
+        "ref": "d9bbeabe51562e727850fe3f60407cf0f6239a8e",
+        "resolved-ref": "d9bbeabe51562e727850fe3f60407cf0f6239a8e",
         "url": "https://github.com/Predidit/flutter-webview-windows.git"
       },
       "source": "git",
@@ -2235,6 +2245,6 @@
   },
   "sdks": {
     "dart": ">=3.10.3 <4.0.0",
-    "flutter": ">=3.41.6"
+    "flutter": ">=3.41.7"
   }
 }
diff --git a/pkgs/by-name/kc/kchmviewer/package.nix b/pkgs/by-name/kc/kchmviewer/package.nix
deleted file mode 100644
index 3e84705d0992..000000000000
--- a/pkgs/by-name/kc/kchmviewer/package.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  qt5,
-  chmlib,
-  libzip,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "kchmviewer";
-  version = "8.0";
-
-  src = fetchFromGitHub {
-    owner = "gyunaev";
-    repo = "kchmviewer";
-    tag = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
-    hash = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw=";
-  };
-
-  patches = [
-    # remove unused webkit
-    (fetchpatch {
-      url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch";
-      hash = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28=";
-    })
-    # QtWebengine fixes
-    (fetchpatch {
-      url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch";
-      hash = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY=";
-    })
-    (fetchpatch {
-      url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch";
-      hash = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY=";
-    })
-    # Fix build on macOS
-    (fetchpatch {
-      url = "https://github.com/gyunaev/kchmviewer/pull/35/commits/b68ed6fe72eaf9ee4e7e42925f5071fbd02dc6b3.patch";
-      hash = "sha256-sJA0RE0Z83tYv0S42yQYWKKeLhW+YDsrxLkY5aMKKT4=";
-    })
-    (fetchpatch {
-      url = "https://github.com/gyunaev/kchmviewer/pull/35/commits/d307e4e829c5a6f57ab0040f786c3da7fd2f0a99.patch";
-      hash = "sha256-FWYfqG8heL6AnhevueCWHQc+c6Yj4+DuIdjIwXVZ+O4=";
-    })
-  ];
-
-  buildInputs = [
-    chmlib
-    libzip
-    qt5.qtwebengine
-  ];
-
-  nativeBuildInputs = [
-    qt5.qmake
-    qt5.wrapQtAppsHook
-  ];
-
-  postInstall =
-    if stdenv.hostPlatform.isDarwin then
-      ''
-        mkdir -p $out/{Applications,bin}
-        mv bin/kchmviewer.app $out/Applications
-        ln -s $out/Applications/kchmviewer.app/Contents/MacOS/kchmviewer $out/bin/kchmviewer
-      ''
-    else
-      ''
-        install -Dm755 bin/kchmviewer -t $out/bin
-        install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps
-        install -Dm644 packages/kchmviewer.desktop -t $out/share/applications
-      '';
-
-  meta = {
-    description = "CHM (Winhelp) files viewer";
-    mainProgram = "kchmviewer";
-    homepage = "http://www.ulduzsoft.com/linux/kchmviewer/";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ sikmir ];
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/pkgs/by-name/kc/kcl-kafka/package.nix b/pkgs/by-name/kc/kcl-kafka/package.nix
index ed2e0ccf2b41..cb7307a5f2f8 100644
--- a/pkgs/by-name/kc/kcl-kafka/package.nix
+++ b/pkgs/by-name/kc/kcl-kafka/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kcl-kafka";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "twmb";
     repo = "kcl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P55k9PIUDtYMzgPHCQYQLNgprnC9MDUX6ZfgZhI9fC0=";
+    hash = "sha256-BCLwgDDVp3mqQEJnPt97nEbpaYmm8a7jzO45Vn2bUaQ=";
   };
 
-  vendorHash = "sha256-o7iSFI0zRwjlE2MVqKSpPMowR4mD2zW6wez4sqNX4Cw=";
+  vendorHash = "sha256-FTh3YLfWL1L4WiRcaz5beS4/mHbtPEXG8V85VmSndWo=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/kd/kdash/package.nix b/pkgs/by-name/kd/kdash/package.nix
index 4a343d03851d..486598023765 100644
--- a/pkgs/by-name/kd/kdash/package.nix
+++ b/pkgs/by-name/kd/kdash/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kdash";
-  version = "1.0.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "kdash-rs";
     repo = "kdash";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-1ZG0u4k95tm+k/cvLIzWD/pvVrdP3+ivTqtKr3Pniqw=";
+    sha256 = "sha256-yIBBWtdIvx9lMU9hoh0bsqYqXkSSBtfOMmUxM5UR+IQ=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Fix for build failure with gcc15
   env.NIX_CFLAGS_COMPILE = "-std=gnu17";
 
-  cargoHash = "sha256-zcvlR7BDkeTcwhGi2Fyz2VdfZH4+JOMRTIjIXkTAHOU=";
+  cargoHash = "sha256-eRXW3EBkNMClxLUKufhrz9WJVBY5UTA/JnabGJvAvF4=";
 
   meta = {
     description = "Simple and fast dashboard for Kubernetes";
diff --git a/pkgs/by-name/kd/kdeltachat/package.nix b/pkgs/by-name/kd/kdeltachat/package.nix
deleted file mode 100644
index 6308c12ddb0a..000000000000
--- a/pkgs/by-name/kd/kdeltachat/package.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  fetchFromSourcehut,
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-  libdeltachat,
-  libsForQt5,
-  rustPlatform,
-  stdenv,
-}:
-
-let
-  libdeltachat' = libdeltachat.overrideAttrs rec {
-    version = "1.155.6";
-    src = fetchFromGitHub {
-      owner = "chatmail";
-      repo = "core";
-      tag = "v${version}";
-      hash = "sha256-d7EmmyLSJjFIZM1j6LP8f4WnXiptNTAqOdJD/oPL02Y=";
-    };
-    cargoDeps = rustPlatform.fetchCargoVendor {
-      pname = "deltachat-core-rust";
-      inherit version src;
-      hash = "sha256-E01aEzNi06LQntrlA+342a8Nl5API6v7HbdmuKpfajs=";
-    };
-  };
-  inherit (libsForQt5)
-    kirigami2
-    qtbase
-    qtimageformats
-    qtmultimedia
-    qtwebengine
-    wrapQtAppsHook
-    ;
-in
-stdenv.mkDerivation {
-  pname = "kdeltachat";
-  version = "unstable-2024-01-14";
-
-  src = fetchFromSourcehut {
-    owner = "~link2xt";
-    repo = "kdeltachat";
-    rev = "d61a01c2d6d5bdcc9ca500b466ed42689b2bd5c6";
-    hash = "sha256-KmL3ODXPi1c8C5z2ySHg0vA5Vg/dZumDZTbpxkzf7A4=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    kirigami2
-    libdeltachat'
-    qtimageformats
-    qtmultimedia
-    qtwebengine
-  ];
-
-  env = {
-    # needed for qmlplugindump to work
-    QT_PLUGIN_PATH = "${qtbase.bin}/${qtbase.qtPluginPrefix}";
-    QML2_IMPORT_PATH = lib.concatMapStringsSep ":" (lib: "${lib}/${qtbase.qtQmlPrefix}") [
-      kirigami2
-      qtmultimedia
-    ];
-  };
-
-  meta = {
-    description = "Delta Chat client using Kirigami framework";
-    mainProgram = "kdeltachat";
-    homepage = "https://git.sr.ht/~link2xt/kdeltachat";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ dotlambda ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/kd/kdsingleapplication/package.nix b/pkgs/by-name/kd/kdsingleapplication/package.nix
index a1be57ca0823..07975b3ec0f1 100644
--- a/pkgs/by-name/kd/kdsingleapplication/package.nix
+++ b/pkgs/by-name/kd/kdsingleapplication/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "KDSingleApplication";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "KDAB";
     repo = "KDSingleApplication";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rglt89Gw6OHXXVOEwf0TxezDzyHEvWepeGeup7fBlLs=";
+    hash = "sha256-LmiQL8hQR5U4S/L5FS9Pb2WpOoZJyiAaWGoMkGl5aUM=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ke/ketesa/package.nix b/pkgs/by-name/ke/ketesa/package.nix
index 7d3d2cf92c66..1c5db95856e7 100644
--- a/pkgs/by-name/ke/ketesa/package.nix
+++ b/pkgs/by-name/ke/ketesa/package.nix
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ketesa";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "ketesa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Z9qtCvpyFkBhqKWn9+dre9alBJ0nwyEvE0m9X8xWbRo=";
+    hash = "sha256-Yg5M3D4etEVwLXT5+QSLqebJwBIpRKV43nYycKSi/tw=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-nlyofNcvnANXHv26BZ7bNqpfnTQj7jw0lk0yhBGXsnc=";
+    hash = "sha256-mLFCVt2LsF4/evlVyTXEdSSk4aDU2tF2m3v8j8eX8ng=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index 14bbd1340673..ee65e8acfc15 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -34,19 +34,19 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kew";
-  version = "3.7.3";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "ravachol";
     repo = "kew";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-134SOyYnMPt7pIS8fb+lSA6ouubJQMGlIXPLyoRg6xA=";
+    hash = "sha256-DtYiqAM5q6H5f1s39CMO/kA1tPFvwcmzS31gZqPz8MQ=";
   };
 
   postPatch = ''
     substituteInPlace Makefile \
       --replace-fail '$(shell uname -s)' '${uppercaseFirst stdenv.hostPlatform.parsed.kernel.name}' \
-      --replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}' \
+      --replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}'
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix
index 2583d183f81f..9c5c35275f02 100644
--- a/pkgs/by-name/ke/keychain/package.nix
+++ b/pkgs/by-name/ke/keychain/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
           openssh
           procps
         ]
-      }" \
+      }"
   '';
 
   meta = {
diff --git a/pkgs/by-name/ke/keymapp/linux.nix b/pkgs/by-name/ke/keymapp/linux.nix
index 4f8f00cb8894..2bbc75904008 100644
--- a/pkgs/by-name/ke/keymapp/linux.nix
+++ b/pkgs/by-name/ke/keymapp/linux.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     runHook preInstall
 
     install -m755 -D keymapp "$out/bin/keymapp"
-    install -Dm644 icon.png "$out/share/pixmaps/keymapp.png"
+    install -Dm644 icon.png "$out/share/icons/keymapp.png"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/kh/khard/package.nix b/pkgs/by-name/kh/khard/package.nix
index be52eab3c6d2..5adfdb61364e 100644
--- a/pkgs/by-name/kh/khard/package.nix
+++ b/pkgs/by-name/kh/khard/package.nix
@@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     python3.pkgs.pytestCheckHook
   ];
 
-  pytestFlagsArray = [
+  pytestFlags = [
     # Nixpkgs' default is `--capture=fd`, and with it, 2 command mock tests
     # fail, see: https://github.com/lucc/khard/issues/353
     "--capture=no"
diff --git a/pkgs/by-name/ki/kicad/versions.nix b/pkgs/by-name/ki/kicad/versions.nix
index 12637a617232..211d194c9b9b 100644
--- a/pkgs/by-name/ki/kicad/versions.nix
+++ b/pkgs/by-name/ki/kicad/versions.nix
@@ -25,23 +25,23 @@
   };
   "kicad-testing" = {
     kicadVersion = {
-      version = "10.0-2026-04-06";
+      version = "10.0-2026-04-22";
       src = {
-        rev = "d9de30af310c4fd84257b48ae6808ef5e3cfe70f";
-        sha256 = "0bxiyhvpncmrakfmx6kdx7jdlssbm90v5li3km558yas5pkzppgx";
+        rev = "704a11803d7b882dec23c4fa8623253ba380aadb";
+        sha256 = "04y8vfg5ffx1aawcy4np66jv7k2gqv9yvcagnqlh3k4b3adn7g3b";
       };
     };
     libVersion = {
-      version = "10.0-2026-04-06";
+      version = "10.0-2026-04-22";
       libSources = {
-        symbols.rev = "dc72a484664c0470407113a174f2b5435debbcaf";
-        symbols.sha256 = "0khfnln0f2zsz5hy31nw2rr0nflb2z3s9n9f7g41g03m9l3s43v2";
-        templates.rev = "e703d1e2ab3eb98a209ff402d2b6bf6d02dc1930";
+        symbols.rev = "49f3091e7fea8d9b935635f3328cbf07b7548625";
+        symbols.sha256 = "0iz4lb33wdsw4f82a0ln8ycgaf39gjws03mvl2j1q9npwj6xl1cm";
+        templates.rev = "66727540677590f988f8448fd3b632d3f26cc1b4";
         templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id";
-        footprints.rev = "4899503b69ff037ed102ab0fe5a0564ef3d61726";
-        footprints.sha256 = "0ymmd1rzrczpvcqzw1mld9x8xhbka0vvjy3kdqwysg4ri97f5wrm";
-        packages3d.rev = "bc82151111e9edddf4295228e6ceb5e0584c9c3e";
-        packages3d.sha256 = "0k91iw661fpzb7saryjxdcdvk1kis7dhbcpzp7xzjk84i4jvxrp5";
+        footprints.rev = "ab2f97eaa2ab7769ec3ad0487ff9bcafabe8641a";
+        footprints.sha256 = "0jqgyi1yb2zc6w56ba7xama0wnhrqwbbnf2fqvr47xihvdcvs87v";
+        packages3d.rev = "efef8c6631221341db2549c52b921e33dd05bbb4";
+        packages3d.sha256 = "0jr70ry6inzc2fy3s300z0zlmihbq95ba1zckyd1wwbpplaj1gbl";
       };
     };
   };
diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix
index 3a9ccb269773..1e4e75ed0014 100644
--- a/pkgs/by-name/ki/kimai/package.nix
+++ b/pkgs/by-name/ki/kimai/package.nix
@@ -7,13 +7,13 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "kimai";
-  version = "2.52.0";
+  version = "2.55.0";
 
   src = fetchFromGitHub {
     owner = "kimai";
     repo = "kimai";
     tag = finalAttrs.version;
-    hash = "sha256-lh+12X85MM3Efp2DUQ22itXnqnNzPzxqxQ1GNbDaaPQ=";
+    hash = "sha256-p4Y5hCWr5BVOGYUJtFJhhDftm+A/CWxbdBhPgOR1TcY=";
   };
 
   php = php.buildEnv {
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-P+YCKz6j30Xtt0BAViUCHoU6xdrzFQFHqK1PTEp4vQg=";
+  vendorHash = "sha256-Vlaqe3FTItRZDiYWzOVDL+q7HZ8TgpiLPFTDzUyL4LY=";
 
   composerNoPlugins = false;
   postInstall = ''
diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix
index 3af4c768b845..6df72bc15fd1 100644
--- a/pkgs/by-name/ki/kin-openapi/package.nix
+++ b/pkgs/by-name/ki/kin-openapi/package.nix
@@ -5,14 +5,14 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "kin-openapi";
-  version = "0.135.0";
-  vendorHash = "sha256-Tf/F7L2F3nhyf6WYsc1FFsBEcMwFHfqkNBlRfcnVRO8=";
+  version = "0.136.0";
+  vendorHash = "sha256-6pvpmETeNAbzzuOlZqTyr6udazEElLW8E+HK6eAL8X4=";
 
   src = fetchFromGitHub {
     owner = "getkin";
     repo = "kin-openapi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Hg8FK11Q3dRcuKGCBsXkoBaHXpSGQLKM6PnKEir0kBI=";
+    hash = "sha256-buCxEDo9T4omjB63BC7iJab/8xJndEouorwWAi6v93c=";
   };
 
   checkFlags =
diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix
index a4e0a5aed895..f60a97f33f07 100644
--- a/pkgs/by-name/ki/kiro-cli/package.nix
+++ b/pkgs/by-name/ki/kiro-cli/package.nix
@@ -14,23 +14,23 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "kiro-cli";
-  version = "1.29.8";
+  version = "2.2.0";
 
   src =
     let
       darwinDmg = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg";
-        hash = "sha256-fop1/P/MCCsz+SspvQLDDWn8e+Pry4iX6nAlcrilsmY=";
+        hash = "sha256-upHmDcqQ57aZCnxtfvaPZ7NEnyNgStRHV1Nbo3ND9ZM=";
       };
     in
     {
       x86_64-linux = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz";
-        hash = "sha256-oyLrb5fKyCusKGsijISxpqOWUJOM+TYqhYqX5kf1S4s=";
+        hash = "sha256-z11ujzGvSdt++9KF3xx+nUqjbzIg+ZGyMt+dEemiCq8=";
       };
       aarch64-linux = fetchurl {
         url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
-        hash = "sha256-UVpodniFUVlbL1NKuqmkdV4oY65wnD+FwGOKOycRRTA=";
+        hash = "sha256-2A3Ikang4Ii1VUeElbrxmNG1r+H5/iESEYUtK+aa5B8=";
       };
       x86_64-darwin = darwinDmg;
       aarch64-darwin = darwinDmg;
diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix
index 68ccb1edfe38..6b85602f9638 100644
--- a/pkgs/by-name/ki/kiro/package.nix
+++ b/pkgs/by-name/ki/kiro/package.nix
@@ -14,7 +14,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = extraCommandLineArgs;
 
-  version = "0.11.131";
+  version = "0.11.133";
   pname = "kiro";
 
   # You can find the current VSCode version in the About dialog:
diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json
index 38faa084eb59..c15c2c1df602 100644
--- a/pkgs/by-name/ki/kiro/sources.json
+++ b/pkgs/by-name/ki/kiro/sources.json
@@ -1,14 +1,14 @@
 {
   "x86_64-linux": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.11.131/tar/kiro-ide-0.11.131-stable-linux-x64.tar.gz",
-    "hash": "sha256-/fihQRY+srbtAa6V+SXWPkgSTLO6cBXMTFoVsMqoNxA="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.11.133/tar/kiro-ide-0.11.133-stable-linux-x64.tar.gz",
+    "hash": "sha256-D8Y1w3YmbgKvNpN3sLv+GZLcT7HAQaGjCL9YSdrHbbA="
   },
   "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.11.131/kiro-ide-0.11.131-stable-darwin-x64.dmg",
-    "hash": "sha256-uHcD1BnOuhHyzUauxohSnR7kTfHiZ6zSfeJ4Du0ELto="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.11.133/kiro-ide-0.11.133-stable-darwin-x64.dmg",
+    "hash": "sha256-kCPDrcwIx7VLW0sEEvilIO+vobWlrRqS97pbztGkAl4="
   },
   "aarch64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.11.131/kiro-ide-0.11.131-stable-darwin-arm64.dmg",
-    "hash": "sha256-fnWG55snBwD1X3UYQM9pyfnjv5Ce5lb1ZDRmaAgzaWo="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.11.133/kiro-ide-0.11.133-stable-darwin-arm64.dmg",
+    "hash": "sha256-P0BxS2xQqZSVpYQw6I496B/asN9ov9n18bEKfYjSVU4="
   }
 }
diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index b993a6140ac5..c1c2e2b2a903 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -20,7 +20,7 @@
   libxext,
   wayland-protocols,
   wayland,
-  xxHash,
+  xxhash,
   nerd-fonts,
   lcms2,
   librsync,
@@ -76,7 +76,7 @@ buildPythonApplication rec {
     librsync
     matplotlib
     openssl.dev
-    xxHash
+    xxhash
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libpng
diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/by-name/kl/klog/package.nix
similarity index 71%
rename from pkgs/applications/radio/klog/default.nix
rename to pkgs/by-name/kl/klog/package.nix
index 48e70b24d7b5..f6d13a2b05ad 100644
--- a/pkgs/applications/radio/klog/default.nix
+++ b/pkgs/by-name/kl/klog/package.nix
@@ -4,34 +4,29 @@
   fetchurl,
   hamlib,
   pkg-config,
-  qtbase,
-  qttools,
-  qtserialport,
-  qtcharts,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "klog";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://savannah/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
     sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c";
   };
 
   nativeBuildInputs = [
     pkg-config
-    wrapQtAppsHook
-    qmake
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
   ];
   buildInputs = [
     hamlib
-    qtbase
-    qtserialport
-    qtcharts
+    libsForQt5.qtbase
+    libsForQt5.qtserialport
+    libsForQt5.qtcharts
   ];
 
   qmakeFlags = [ "KLog.pro" ];
@@ -48,4 +43,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pulsation ];
   };
-}
+})
diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix
index 329c49f59af3..bcecb5c8b5eb 100644
--- a/pkgs/by-name/km/kmscon/package.nix
+++ b/pkgs/by-name/km/kmscon/package.nix
@@ -29,13 +29,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "kmscon";
-  version = "9.3.3";
+  version = "9.3.5";
 
   src = fetchFromGitHub {
     owner = "kmscon";
     repo = "kmscon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-U9jDlZb5aBzQ7IErtLsajxcN1W5/8/eNwhGIuz7aUCw=";
+    hash = "sha256-QBN1rSDmwVg7cgljhe6kVIg/xLoolmOPqS8JXZuQiXs=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/kn/knockpy/package.nix b/pkgs/by-name/kn/knockpy/package.nix
index a73ae217c24e..749cfa835ce7 100644
--- a/pkgs/by-name/kn/knockpy/package.nix
+++ b/pkgs/by-name/kn/knockpy/package.nix
@@ -6,22 +6,22 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "knockpy";
-  version = "7.0.2";
+  version = "9.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "guelfoweb";
-    repo = "knock";
+    repo = "knockpy";
     tag = finalAttrs.version;
-    hash = "sha256-tJNosM8zGzH0uMvVawoBl2d+8xkVzTIjycnHHjnMzSo=";
+    hash = "sha256-azgciGYf6Km6MuBE7RRHhcx1hhc309FTv3KOfZ25Iqo=";
   };
 
   pythonRelaxDeps = [
-    "beautifulsoup4"
     "dnspython"
+    "httpx"
     "pyopenssl"
-    "requests"
-    "tqdm"
+    "python-dotenv"
+    "rich"
   ];
 
   build-system = with python3.pkgs; [
@@ -29,22 +29,23 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   ];
 
   dependencies = with python3.pkgs; [
-    beautifulsoup4
     dnspython
+    httpx
+    h2
     pyopenssl
-    requests
-    tqdm
+    python-dotenv
+    rich
   ];
 
   # Project has no tests
   doCheck = false;
 
-  pythonImportsCheck = [ "knock" ];
+  pythonImportsCheck = [ "knockpy" ];
 
   meta = {
     description = "Tool to scan subdomains";
-    homepage = "https://github.com/guelfoweb/knock";
-    changelog = "https://github.com/guelfoweb/knock/releases/tag/${finalAttrs.version}";
+    homepage = "https://github.com/guelfoweb/knockpy";
+    changelog = "https://github.com/guelfoweb/knockpy/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "knockpy";
diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix
index 7d1edf5d7451..e515f6933a23 100644
--- a/pkgs/by-name/kn/knot-resolver_6/package.nix
+++ b/pkgs/by-name/kn/knot-resolver_6/package.nix
@@ -36,11 +36,11 @@ let
   # TODO: we could cut the `let` short here, but it would de-indent everything.
   unwrapped = stdenv.mkDerivation (finalAttrs: {
     pname = "knot-resolver_6";
-    version = "6.2.0";
+    version = "6.3.0";
 
     src = fetchurl {
       url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz";
-      hash = "sha256-tEYzvIQxgMC8fHfPexX+VxJDrpkrTdt0r97kz6gDcBs=";
+      hash = "sha256-uHMGGX90NrSQecYzNkvF33GjkyNvsl6fzn0ESAvHUY4=";
     };
 
     outputs = [
diff --git a/pkgs/by-name/ko/koffan/package.nix b/pkgs/by-name/ko/koffan/package.nix
index 05fa4eeb5bbe..8e883fb669b1 100644
--- a/pkgs/by-name/ko/koffan/package.nix
+++ b/pkgs/by-name/ko/koffan/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "koffan";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "PanSalut";
     repo = "Koffan";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GZmw4UoHoCeLhzAn0GWXR6c/61bYxtngGC2cND+XS5c=";
+    hash = "sha256-euGjcluk2xC+RgryFscP29ONT2prqR0/UxeqMosb2l4=";
   };
 
   vendorHash = "sha256-BYehi5LQQ0MIsKG/fN3DHaQwKVmxUFrvWGrKZeKj+ow=";
diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix
index 94793a80ea1e..cdf96f2b292c 100644
--- a/pkgs/by-name/ko/kokkos/package.nix
+++ b/pkgs/by-name/ko/kokkos/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kokkos";
-  version = "5.0.2";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "kokkos";
     repo = "kokkos";
     rev = finalAttrs.version;
-    hash = "sha256-KoTshYKiDiYb2VKyo7C9pzi6SdpoCOjObwI9o4fr91c=";
+    hash = "sha256-yo+E8U06o7eu2U4AbXkHpo9uwjiIDE6NoP8TgUTkmuU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 16f4ea8afc28..fc7e34984b43 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "komga";
-  version = "1.24.3";
+  version = "1.24.4";
 
   src = fetchurl {
     url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-+MZ2Rr/QYJuKBZdQtuQaq1crRRqBPo3LGRHjkl1Gupo=";
+    sha256 = "sha256-O06bHt4MgGL4Ffz0llUyX0VM/6MmnjSNGFjy3R8/J1I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix
index 1a9009d5d59b..30ec2833b282 100644
--- a/pkgs/by-name/ko/koodo-reader/package.nix
+++ b/pkgs/by-name/ko/koodo-reader/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.2.4";
 
   src = fetchFromGitHub {
-    owner = "troyeguo";
+    owner = "koodo-reader";
     repo = "koodo-reader";
     tag = "v${finalAttrs.version}";
     hash = "sha256-KUcI+0+ICMdwAF30CLM3QdS+X8UnYiHhcYkvEQ6WgS8=";
@@ -140,13 +140,13 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    changelog = "https://github.com/troyeguo/koodo-reader/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/koodo-reader/koodo-reader/releases/tag/${finalAttrs.src.tag}";
     description = "Cross-platform ebook reader";
     longDescription = ''
       A modern ebook manager and reader with sync and backup capacities
       for Windows, macOS, Linux and Web
     '';
-    homepage = "https://github.com/troyeguo/koodo-reader";
+    homepage = "https://github.com/koodo-reader/koodo-reader";
     license = lib.licenses.agpl3Only;
     mainProgram = "koodo-reader";
     maintainers = with lib.maintainers; [ tomasajt ];
diff --git a/pkgs/by-name/ko/kopia/package.nix b/pkgs/by-name/ko/kopia/package.nix
index 1c544f7127d2..24c9e6bec650 100644
--- a/pkgs/by-name/ko/kopia/package.nix
+++ b/pkgs/by-name/ko/kopia/package.nix
@@ -20,6 +20,8 @@ buildGoModule (finalAttrs: {
     hash = "sha256-5oNam99Mij78snSO6jiGPYzeD68sXEBKM2dGQtTUrww=";
   };
 
+  __structuredAttrs = true;
+
   vendorHash = "sha256-szlCiZOLU0KVWb2YX3Wmicrumn+fNm2AWdPxaJZZT90=";
 
   subPackages = [ "." ];
diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix
index 5d22548e6fc5..ec9b575858d9 100644
--- a/pkgs/by-name/ko/kor/package.nix
+++ b/pkgs/by-name/ko/kor/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kor";
-  version = "0.6.7";
+  version = "0.6.8";
 
   src = fetchFromGitHub {
     owner = "yonahd";
     repo = "kor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-d8/b1O/dEeJzf9xaTHvAUbx2tFk7LjuOnACXYEIFsME=";
+    hash = "sha256-B3YKmexo41Ms7MrjoTBdeVaIeN4YuCO7WBrkhoGzP2c=";
   };
 
-  vendorHash = "sha256-nFgf1eGbIQ1R/cj+ikYIaw2dqOSoEAG4sFPAqF1CFAQ=";
+  vendorHash = "sha256-vC5GgJI80HsDIYP0oZZk/Tlvy36QZZZDNxz68EDyb8Y=";
 
   nativeCheckInputs = [ writableTmpDirAsHomeHook ];
 
diff --git a/pkgs/by-name/kr/krbjack/package.nix b/pkgs/by-name/kr/krbjack/package.nix
index 8104b8f4502a..8dfeef3dc600 100644
--- a/pkgs/by-name/kr/krbjack/package.nix
+++ b/pkgs/by-name/kr/krbjack/package.nix
@@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Kerberos AP-REQ hijacking tool with DNS unsecure updates abuse";
     homepage = "https://github.com/almandin/krbjack";
-    changelog = "https://github.com/almandin/krbjack/releases/tag/${finalAttrs.version}}";
+    changelog = "https://github.com/almandin/krbjack/releases/tag/${finalAttrs.version}";
     license = lib.licenses.beerware;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "krbjack";
diff --git a/pkgs/by-name/ku/kubectl-klock/package.nix b/pkgs/by-name/ku/kubectl-klock/package.nix
index 213fa45cbf69..c7981dbad5ac 100644
--- a/pkgs/by-name/ku/kubectl-klock/package.nix
+++ b/pkgs/by-name/ku/kubectl-klock/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-klock";
-  version = "0.8.4";
+  version = "0.9.0";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -15,7 +15,7 @@ buildGoModule (finalAttrs: {
     owner = "applejag";
     repo = "kubectl-klock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xfoYK8Ex+gdWPJVARYlGRtZl1Yi63h72bLDJgqUJe3Q=";
+    hash = "sha256-omnDAhLhI8UoqZtY2d0cjhH38V57tcOIePGKOM+HzHI=";
   };
 
   ldflags = [
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
     "-X main.version=${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-WiVwRc92xYhk8dBNmYDfrZF0bP61dJJbqWFTFQV7lwg=";
+  vendorHash = "sha256-f9qru/YrtCP+B43/gwMx4WmiqhuK9weKqj3aAt72yBw=";
 
   postInstall = ''
     makeWrapper $out/bin/kubectl-klock $out/bin/kubectl_complete-klock --add-flags __complete
diff --git a/pkgs/by-name/ku/kubectl-oidc-login/package.nix b/pkgs/by-name/ku/kubectl-oidc-login/package.nix
deleted file mode 100644
index 5d4f1e4b8bd0..000000000000
--- a/pkgs/by-name/ku/kubectl-oidc-login/package.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  nix-update-script,
-  versionCheckHook,
-}:
-
-buildGoModule (finalAttrs: {
-  pname = "kubectl-oidc-login";
-  version = "1.36.0";
-
-  src = fetchFromGitHub {
-    owner = "int128";
-    repo = "kubelogin";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-v6kNz75+xRQHfTfBKpKaNZodQzZNmJiF+WX0wJfGZ2M=";
-  };
-
-  vendorHash = "sha256-f9Umpdlb6m38J05CanNJktS1T31SBSy1T1rOCzBUYkQ=";
-
-  ldflags = [
-    "-X main.version=${finalAttrs.version}"
-  ];
-
-  # Rename output binary to kubectl-<plugin-name> so kubectl recognizes it on $PATH.
-  postInstall = ''
-    mv $out/bin/{kubelogin,${finalAttrs.meta.mainProgram}}
-  '';
-
-  nativeInstallCheckInputs = [ versionCheckHook ];
-  doInstallCheck = true;
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Kubernetes kubelogin plugin to add OpenID Connect authentication to kubectl. Run \"kubectl oidc-login ...\"";
-    # Quirk: we have to write "oidc_login" instead of "oidc-login"
-    # (at least on Mac "aarch64-darwin" and "x86_64_linux"), otherwise calling
-    # "kubectl oidc-login <subcommand>" fails that it can't find the underlying plugin in $PATH.
-    mainProgram = "kubectl-oidc_login";
-    homepage = "https://github.com/int128/kubelogin";
-    changelog = "https://github.com/int128/kubelogin/releases/tag/v${finalAttrs.version}";
-    license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.malteneuss ];
-  };
-})
diff --git a/pkgs/by-name/ku/kubectl-rabbitmq/package.nix b/pkgs/by-name/ku/kubectl-rabbitmq/package.nix
index f64018d6c49f..49a34fe93d7c 100644
--- a/pkgs/by-name/ku/kubectl-rabbitmq/package.nix
+++ b/pkgs/by-name/ku/kubectl-rabbitmq/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-rabbitmq";
-  version = "2.20.0";
+  version = "2.20.1";
 
   src = fetchFromGitHub {
     owner = "rabbitmq";
     repo = "cluster-operator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-anJZy0XUEJ0j912g7+ltq2bMVE/KPpyBWuh7AqGgx30=";
+    hash = "sha256-84rcffEG2+AxtCbOo7KnT6mQFOMpeWJyA0HgDxjmlyc=";
   };
 
   modRoot = "kubectl-rabbitmq";
 
-  vendorHash = "sha256-UnZ47TUarqZNYrvpfNJy5tm9Yq5/eFrkMSLRqjqM9PU=";
+  vendorHash = "sha256-+++RbYcQ3qrdWeBUjd50RuCuvpSbDrTycCR7mptvhoc=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ku/kubectl-view-secret/package.nix b/pkgs/by-name/ku/kubectl-view-secret/package.nix
index df3531c7e1c5..77840712ca35 100644
--- a/pkgs/by-name/ku/kubectl-view-secret/package.nix
+++ b/pkgs/by-name/ku/kubectl-view-secret/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-view-secret";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "elsesiy";
     repo = "kubectl-view-secret";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JFVW/k+TMsIo24zBqjtpoei6YRW/rgwu0qFEHvZbc1c=";
+    hash = "sha256-U030TzoYoSjJpohv/yeR8MVrpfIwO578I/KCIPxBj5k=";
   };
 
-  vendorHash = "sha256-WgIDyj3zZK1scXarlVA82FP3FdJs5jSR88OBJhyeWls=";
+  vendorHash = "sha256-EiSqk957zurwlL0qhvRAHKQCVpmmZhDFbdplWfRg2Ec=";
 
   subPackages = [ "./cmd/" ];
 
diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix
index 4e868bb1146e..ca2a58e0e2c9 100644
--- a/pkgs/by-name/ku/kubedb-cli/package.nix
+++ b/pkgs/by-name/ku/kubedb-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubedb-cli";
-  version = "0.63.0";
+  version = "0.64.0";
 
   src = fetchFromGitHub {
     owner = "kubedb";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-RhRpKUBlsswPStUoZQ9mFkMst77t4t7OodILaC4tHV0=";
+    hash = "sha256-BkXUkL3bZg5g0ufGqL+QZ44ZXKMp5O8Ib9TjkBoQaaM=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix
index 585f15767ca9..b080ac63fe79 100644
--- a/pkgs/by-name/ku/kubedock/package.nix
+++ b/pkgs/by-name/ku/kubedock/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubedock";
-  version = "0.21.0";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "joyrex2001";
     repo = "kubedock";
     rev = finalAttrs.version;
-    hash = "sha256-ohriv6Lw5c+XvsENysplZ9FSbbVigjOILfOi3VpaGjI=";
+    hash = "sha256-mxOvk2o2Ke8AEA9SyuyqHr+G9A2qpzlE9rqKG7INr4w=";
   };
 
-  vendorHash = "sha256-EwFNwJ/JTyt+Ua1qvKMEHMbgnMaLCWN7xphV2Q3xnLU=";
+  vendorHash = "sha256-SROlRbpokMsnTscxF71upxmjhZPqTbkk50n0Htwh1lc=";
 
   # config.Build not defined as it would break r-ryantm
   ldflags = [
diff --git a/pkgs/by-name/ku/kubefwd/package.nix b/pkgs/by-name/ku/kubefwd/package.nix
index 7ebfd63a654a..c5167b321f74 100644
--- a/pkgs/by-name/ku/kubefwd/package.nix
+++ b/pkgs/by-name/ku/kubefwd/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubefwd";
-  version = "1.25.9";
+  version = "1.25.13";
 
   src = fetchFromGitHub {
     owner = "txn2";
     repo = "kubefwd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eJcmQRVrBYcT/o++d4hKUd8UWJDS/Z395M/sz8kpLfw=";
+    hash = "sha256-fAqsBqJgDyollaJNjdXI+hv3im7v0P/+cMkd4zj10kA=";
   };
 
-  vendorHash = "sha256-l0iHkuSX1ECtOYY2HIFTPFVSYiZL9fi5BDOjhxWpDyA=";
+  vendorHash = "sha256-jMGz1pgSfr4NAOYvGRBL+A1ecWCC5Okn0vPZ1qgyxB8=";
 
   subPackages = [ "cmd/kubefwd" ];
 
diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix
index e590f411d56b..b6bd4fa19747 100644
--- a/pkgs/by-name/ku/kubelogin-oidc/package.nix
+++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix
@@ -2,6 +2,8 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -35,6 +37,10 @@ buildGoModule (finalAttrs: {
     mv $out/bin/kubelogin $out/bin/kubectl-oidc_login
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Kubernetes credential plugin implementing OpenID Connect (OIDC) authentication";
     mainProgram = "kubectl-oidc_login";
@@ -42,6 +48,7 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       benley
+      malteneuss
       nevivurn
     ];
   };
diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix
index af0b18db617d..e06f96cbfd92 100644
--- a/pkgs/by-name/ku/kubeone/package.nix
+++ b/pkgs/by-name/ku/kubeone/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubeone";
-  version = "1.12.3";
+  version = "1.13.4";
 
   src = fetchFromGitHub {
     owner = "kubermatic";
     repo = "kubeone";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/fOtepUysZvJQrpdNklgSeL946tSf3Icohi0bRSLieA=";
+    hash = "sha256-PEGhLqBLDHLxa23+llB0LdaS/mGINyMzoCyPAsBU+vw=";
   };
 
-  vendorHash = "sha256-4thcMvdS2oxBai+3aOUPXd5T6f2DcW0Mm1d3y/DMGFc=";
+  vendorHash = "sha256-qXIlU1ZrJvJ0u8wSoBeESEfOMEGHkVg8kLMp/zlyfno=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ku/kubernetes/package.nix b/pkgs/by-name/ku/kubernetes/package.nix
index ba549a8e10a2..1cf3178bdbf9 100644
--- a/pkgs/by-name/ku/kubernetes/package.nix
+++ b/pkgs/by-name/ku/kubernetes/package.nix
@@ -23,13 +23,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubernetes";
-  version = "1.35.4";
+  version = "1.36.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UXYkReGD77Uu0P0iYvkK58Uj0f7CuXGMb1WJBD7/61U=";
+    hash = "sha256-6waSybeFc6xMIT93WLR1OPN/bhcHzvUzJGZliEuEQIM=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix
index 1476f05d774f..ef233f4fb9b5 100644
--- a/pkgs/by-name/ku/kubevirt/package.nix
+++ b/pkgs/by-name/ku/kubevirt/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubevirt";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "kubevirt";
     repo = "kubevirt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EBF2Pkw4Yl8D5ghE/SA/NOwC2lUQwpk1JZkujWPce6E=";
+    hash = "sha256-YSrMJz0L0Ybw5G6p42YAMMa1D1xc9G8sBLdxjxz3axg=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix
index 9d599d216bf3..1283696cb5ba 100644
--- a/pkgs/by-name/ky/kyverno/package.nix
+++ b/pkgs/by-name/ky/kyverno/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kyverno";
-  version = "1.17.1";
+  version = "1.17.2";
 
   src = fetchFromGitHub {
     owner = "kyverno";
     repo = "kyverno";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/5ax23jkD+DlR9566ok09kXX0E0fZTH4x5/AyopKnr4=";
+    hash = "sha256-RB+X1+eZ7v6YWzVhy/73JamxGCWbHmBQavvAPh2fDCA=";
   };
 
   ldflags = [
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
   ];
 
-  vendorHash = "sha256-GTleFbdf7LYmtPaCYYpQ5NUdsP1nstzXIFJe75HajBY=";
+  vendorHash = "sha256-vko/06bHxyGc33lFWlAAf+H06qibjyZaElcRv/jn0sc=";
 
   subPackages = [ "cmd/cli/kubectl-kyverno" ];
 
diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix
index f7201a681ffd..a3386c574a6c 100644
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labwc";
-  version = "0.9.3";
+  version = "0.9.7";
 
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc";
     tag = finalAttrs.version;
-    hash = "sha256-C/u11vxHmWWb8/kl0tZTOgosAvbSNb3tCvp2r0Bcb+Q=";
+    hash = "sha256-7lq/lcaYSc+mJOTkjtwF0LjOAg4Uck3BwAc+2RIntYo=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix
index cdeb661187f2..83831a62c835 100644
--- a/pkgs/by-name/la/lact/package.nix
+++ b/pkgs/by-name/la/lact/package.nix
@@ -9,6 +9,7 @@
   clinfo,
   gdk-pixbuf,
   gtk4,
+  libadwaita,
   libdrm,
   ocl-icd,
   vulkan-loader,
@@ -24,16 +25,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lact";
-  version = "0.8.4";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "ilya-zlobintsev";
     repo = "LACT";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5z4IAiApUjlsSL0EX1PQH6rceeQxAD8f3CKmYO2x8gQ=";
+    hash = "sha256-c5GJf8AYgaAN3O6AVSEbJybEYb6lSHf7R24/1PKYhyM=";
   };
 
-  cargoHash = "sha256-mCmAj9yLei0ZNtsBh+YeVlCmbHyT69LIHFnwbAk+Ido=";
+  cargoHash = "sha256-Y+XdCmaDXdP7x22bYm//Ov7+IzlCr8GpFOgCXGFCfbA=";
 
   nativeBuildInputs = [
     pkg-config
@@ -45,6 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildInputs = [
     gdk-pixbuf
     gtk4
+    libadwaita
     libdrm
     ocl-icd
     vulkan-loader
diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix
index e490d6167a82..fe6d4f6225ae 100644
--- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix
+++ b/pkgs/by-name/la/lasuite-meet-frontend/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "lasuite-meet-frontend";
-  version = "1.13.0";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-OCW/8JIysegeB0XKfOe6tbYi/TV0NHFvwybalg96maM=";
+    hash = "sha256-baQVCnkEv5aUy4mKdiscPiiEvwYPfezF03i1HPX64oA=";
   };
 
   sourceRoot = "source/src/frontend";
@@ -21,7 +21,7 @@ buildNpmPackage rec {
   npmDeps = fetchNpmDeps {
     inherit version src;
     sourceRoot = "source/src/frontend";
-    hash = "sha256-QL4D55uw80TUJbS+qD2RDgsLVU0kmxxvc+SUXryqno0=";
+    hash = "sha256-iXiadLaXFKmph6psIss0/5FjQkmjnDnQMxAmtrqJn+0=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix
index d81e3955403f..217e45eeb123 100644
--- a/pkgs/by-name/la/lasuite-meet/package.nix
+++ b/pkgs/by-name/la/lasuite-meet/package.nix
@@ -13,14 +13,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "lasuite-meet";
-  version = "1.13.0";
+  version = "1.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-OCW/8JIysegeB0XKfOe6tbYi/TV0NHFvwybalg96maM=";
+    hash = "sha256-baQVCnkEv5aUy4mKdiscPiiEvwYPfezF03i1HPX64oA=";
   };
 
   sourceRoot = "source/src/backend";
diff --git a/pkgs/by-name/la/lazyhetzner/package.nix b/pkgs/by-name/la/lazyhetzner/package.nix
index 03ab775dbc4d..d02b006cbf73 100644
--- a/pkgs/by-name/la/lazyhetzner/package.nix
+++ b/pkgs/by-name/la/lazyhetzner/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lazyhetzner";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "grammeaway";
     repo = "lazyhetzner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-G7IfB/tnhPKf/tG0b2HKUshc4x+AySiHlJZNSlOJr2I=";
+    hash = "sha256-yQgDegmwDD70mX38SInP2KhO3GdLpFY6Hr/JxP4RRoI=";
 
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/ld/ldns/package.nix b/pkgs/by-name/ld/ldns/package.nix
index c5887ea25771..4078cdfd5372 100644
--- a/pkgs/by-name/ld/ldns/package.nix
+++ b/pkgs/by-name/ld/ldns/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ldns";
-  version = "1.8.4";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "https://www.nlnetlabs.nl/downloads/ldns/ldns-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-g4uQdZS6r/HNdn6VRmp3RZmK5kvHS+A43Mxi4t4uQkc=";
+    sha256 = "sha256-q67tKFj76oSk65gz4Z59IzgMwPPZtlSLlivkInb/3LM=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix
index 17bd27de10e1..6ed596f47a88 100644
--- a/pkgs/by-name/le/lean4/package.nix
+++ b/pkgs/by-name/le/lean4/package.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     "-DUSE_GITHASH=OFF"
     "-DINSTALL_LICENSE=OFF"
+    "-DINSTALL_CADICAL=OFF"
     "-DUSE_MIMALLOC=${if enableMimalloc then "ON" else "OFF"}"
   ];
 
diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index 22db281973b8..f18b6425b766 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "4.0.0";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-aM6hHOJ3ZlBEoTDfHxb37WqqyCfHJRaeqg14w/jQLvg=";
+    hash = "sha256-gJ/5/bCNBkNmKgsIxoOvkbE1FLY9KX6TFVOQe/wAVGM=";
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix
index 7f16dc953abd..7cb1c674808d 100644
--- a/pkgs/by-name/le/legcord/package.nix
+++ b/pkgs/by-name/le/legcord/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "legcord";
-  version = "1.2.2";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "Legcord";
     repo = "Legcord";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i4Pw1jvkRYCQg1+9eZVi30Qblpttz9V+k//zehBZGDM=";
+    hash = "sha256-nai8lcimEts/E3bwUyQufLYIHhUK83IH431PUQFtQJI=";
   };
 
   nativeBuildInputs = [
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10_29_2;
     fetcherVersion = 3;
-    hash = "sha256-MgUOOr188t+t/4sTXVpbr+xYT/1qf7/B0ZG0w+QkVxc=";
+    hash = "sha256-ME74yxVwH4W9gE0XbtwDhR8g9QulN2eeOB1eekaHmG8=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/le/legitify/package.nix b/pkgs/by-name/le/legitify/package.nix
index b861fb50d964..6147fc470318 100644
--- a/pkgs/by-name/le/legitify/package.nix
+++ b/pkgs/by-name/le/legitify/package.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
   meta = {
     description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets";
     homepage = "https://github.com/Legit-Labs/legitify";
-    changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${src.tag}";
+    changelog = "https://github.com/Legit-Labs/legitify/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "legitify";
diff --git a/pkgs/by-name/le/leocad/package.nix b/pkgs/by-name/le/leocad/package.nix
index 1329142325e5..9f5fd988c3b9 100644
--- a/pkgs/by-name/le/leocad/package.nix
+++ b/pkgs/by-name/le/leocad/package.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  passthru = {
+  meta = {
     description = "CAD program for creating virtual LEGO models";
     mainProgram = "leocad";
     homepage = "https://www.leocad.org/";
diff --git a/pkgs/by-name/le/lerc/package.nix b/pkgs/by-name/le/lerc/package.nix
index e164c6e00761..9cf5725679dd 100644
--- a/pkgs/by-name/le/lerc/package.nix
+++ b/pkgs/by-name/le/lerc/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lerc";
-  version = "4.0.0";
+  version = "4.1.0";
 
   outputs = [
     "out"
@@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "esri";
     repo = "lerc";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-IHY9QtNYsxPz/ksxRMZGHleT+/bawfTYNVRSTAuYQ7Y=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+X30DQuq2oT/sTe8usUaNK1V+UTNvXJW7IAJVIr8m78=";
   };
 
   # Required to get the freebsd-ports patch to apply.
@@ -30,15 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     ${buildPackages.dos2unix}/bin/dos2unix src/LercLib/fpl_EsriHuffman.cpp src/LercLib/fpl_Lerc2Ext.cpp
   '';
 
-  patches = [
-    # https://github.com/Esri/lerc/pull/227
-    (fetchpatch {
-      name = "use-cmake-install-full-dir.patch";
-      url = "https://github.com/Esri/lerc/commit/5462ca7f7dfb38c65e16f5abfd96873af177a0f8.patch";
-      hash = "sha256-qaNR3QwLe0AB6vu1nXOh9KhlPdWM3DmgCJj4d0VdOUk=";
-    })
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+  patches = lib.optionals stdenv.hostPlatform.isFreeBSD [
     (fetchpatch {
       url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ee9e39ceb1af729ac33854b5f3de652cb5ce0eca/graphics/lerc/files/patch-_assert";
       hash = "sha256-agvGqgIsKS8v43UZdTVxDRDGbZdj2+AzKoQONvQumB4=";
@@ -55,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    changelog = "https://github.com/Esri/lerc/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "C++ library for Limited Error Raster Compression";
     homepage = "https://github.com/esri/lerc";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix
index ee4303e2a6a0..1a943a1e1d67 100644
--- a/pkgs/by-name/lg/lgogdownloader/package.nix
+++ b/pkgs/by-name/lg/lgogdownloader/package.nix
@@ -13,7 +13,7 @@
   tinyxml-2,
   help2man,
   html-tidy,
-  libsForQt5,
+  qt6,
   testers,
 
   enableGui ? false,
@@ -30,13 +30,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-dVEV2smZxB6+Utm9FApiFydAS3hLm4y9YZja1B/PiEk=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "set_property(TARGET \''${PROJECT_NAME} PROPERTY CXX_STANDARD 11)" "set_property(TARGET \''${PROJECT_NAME} PROPERTY CXX_STANDARD 17)"
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
     help2man
     html-tidy
   ]
-  ++ lib.optional enableGui libsForQt5.wrapQtAppsHook;
+  ++ lib.optional enableGui qt6.wrapQtAppsHook;
 
   buildInputs = [
     boost
@@ -48,11 +53,15 @@ stdenv.mkDerivation (finalAttrs: {
     tinyxml-2
   ]
   ++ lib.optionals enableGui [
-    libsForQt5.qtbase
-    libsForQt5.qtwebengine
+    qt6.qtbase
+    qt6.qtwebengine
   ];
 
-  cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON";
+  cmakeFlags = [
+    (lib.cmakeBool "USE_QT_GUI" enableGui)
+    (lib.cmakeFeature "CMAKE_CXX_STANDARD" "17")
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DJSONCPP_HAS_STRING_VIEW=1")
+  ];
 
   passthru.tests = {
     version = testers.testVersion { package = finalAttrs.finalPackage; };
diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix
index 3887f73d2329..0878ce66cec0 100644
--- a/pkgs/by-name/li/lib60870/package.nix
+++ b/pkgs/by-name/li/lib60870/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace src/CMakeLists.txt \
-      --replace-warn "-lrt" "" \
+      --replace-warn "-lrt" ""
   '';
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix
index 8f17183cb39a..395202911104 100644
--- a/pkgs/by-name/li/libadwaita/package.nix
+++ b/pkgs/by-name/li/libadwaita/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libadwaita";
-  version = "1.8.4";
+  version = "1.8.5.1";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "libadwaita";
     tag = finalAttrs.version;
-    hash = "sha256-Dj1QJatjnK7Rb+SZLiRO0eHERzqmoq01n8fUE7SVWMI=";
+    hash = "sha256-vR3x+6JCOVaW/d8dbOmPdVJcDZbpwFfuZ98rVY2XUvE=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/li/libaec/package.nix b/pkgs/by-name/li/libaec/package.nix
index c1e5e29c38e0..9c44a97c5540 100644
--- a/pkgs/by-name/li/libaec/package.nix
+++ b/pkgs/by-name/li/libaec/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libaec";
-  version = "1.1.5";
+  version = "1.1.6";
 
   src = fetchFromGitLab {
     domain = "gitlab.dkrz.de";
     owner = "k202009";
     repo = "libaec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ADydaLu8fV0mKp3wZx10VS2I1GFwuLTpbxmRKCmgF0c=";
+    hash = "sha256-cxDP+JNwokxgzH9hO2zw+rIcz8XG7E8ujbAbWpgUEW8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix
index b7f0df5cbed0..9290ebfa7044 100644
--- a/pkgs/by-name/li/libapparmor/package.nix
+++ b/pkgs/by-name/li/libapparmor/package.nix
@@ -32,13 +32,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libapparmor";
-  version = "4.1.3";
+  version = "4.1.7";
 
   src = fetchFromGitLab {
     owner = "apparmor";
     repo = "apparmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8L4skun873OMZISpGm25Ana4RzTzCmKhhK5tfyEmbd8=";
+    hash = "sha256-yjqdUwHkQ1uiPKPZQVf/o8tGixQeIKNMOIYo4aVK7N0=";
   };
   sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor";
 
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index 363a8ac3ab3c..5c1ae26fcf26 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -32,13 +32,13 @@
 assert xarSupport -> libxml2 != null;
 stdenv.mkDerivation (finalAttrs: {
   pname = "libarchive";
-  version = "3.8.4";
+  version = "3.8.6";
 
   src = fetchFromGitHub {
     owner = "libarchive";
     repo = "libarchive";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-qNz7BAvi3dTNg6Bz2cfqaYGKFJlM4C+y/GARsQRRYsY=";
+    hash = "sha256-XNFw0h++7B3ODnEi50zd7q/j1bYQzL1IKB2q3p4IzB4=";
   };
 
   outputs = [
@@ -112,6 +112,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = lib.optional (!xarSupport) "--without-xml2";
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # macOS iconv implementation is slightly broken since Sonoma
+    # https://github.com/Homebrew/homebrew-core/pull/199639
+    # https://savannah.gnu.org/bugs/index.php?66541
+    am_cv_func_iconv_works = "yes";
+  };
+
   # https://github.com/libarchive/libarchive/issues/1475
   doCheck = !stdenv.hostPlatform.isMusl;
 
diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix
index fe80bfc3a855..c27c87e73a06 100644
--- a/pkgs/by-name/li/libation/package.nix
+++ b/pkgs/by-name/li/libation/package.nix
@@ -16,13 +16,13 @@
 
 buildDotnetModule rec {
   pname = "libation";
-  version = "13.3.4";
+  version = "13.3.5";
 
   src = fetchFromGitHub {
     owner = "rmcrackan";
     repo = "Libation";
     tag = "v${version}";
-    hash = "sha256-GCPAUbi8VWV/EmhEoEgjf5QdNbuuVGBMnvFQ8G6+kmk=";
+    hash = "sha256-2n+1V4O1hyPUGogwCUz7aCo+sdZAUVAXqj1L9IPmUX4=";
   };
 
   sourceRoot = "${src.name}/Source";
diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix
index 9633dc319cbb..c778d78d66a7 100644
--- a/pkgs/by-name/li/libavif/package.nix
+++ b/pkgs/by-name/li/libavif/package.nix
@@ -31,7 +31,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libavif";
-  version = "1.3.0";
+  version = "1.4.1";
 
   outputs = [
     "out"
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "AOMediaCodec";
     repo = "libavif";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0J56wpXa2AVh9JUp5UY2kzWijNE3i253RKhpG5oDFJE=";
+    hash = "sha256-035SoxHfN121mp3LGwGykReCi1WJbl2/nZH8c/VwABU=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix
index d2d392071d73..08740597b3a3 100644
--- a/pkgs/by-name/li/libblake3/package.nix
+++ b/pkgs/by-name/li/libblake3/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libblake3";
-  version = "1.8.4";
+  version = "1.8.5";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "BLAKE3-team";
     repo = "BLAKE3";
     tag = finalAttrs.version;
-    hash = "sha256-Xz0LH0YpUjDishvXsW6VNK8msFlPXg08wFoSfbgws0g=";
+    hash = "sha256-4Oany3uk0759YIZgD1gsONSFU1Mn/GAMvsSeP33J9Ts=";
   };
 
   sourceRoot = finalAttrs.src.name + "/c";
diff --git a/pkgs/by-name/li/libbluray/package.nix b/pkgs/by-name/li/libbluray/package.nix
index 57183e0bf583..f32dc6936dea 100644
--- a/pkgs/by-name/li/libbluray/package.nix
+++ b/pkgs/by-name/li/libbluray/package.nix
@@ -7,7 +7,7 @@
   meson,
   ninja,
   withJava ? false,
-  jdk21_headless,
+  jdk21,
   jre21_minimal, # Newer JDK's depend on a release with a fix for https://code.videolan.org/videolan/libbluray/-/issues/46
   ant,
   stripJavaArchivesHook,
@@ -31,7 +31,7 @@ let
       "java.rmi"
       "java.xml"
     ];
-    jdk = jdk21_headless;
+    jdk = jdk21;
   };
 in
 stdenv.mkDerivation rec {
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     pkg-config
   ]
   ++ lib.optionals withJava [
-    jdk21_headless
+    jdk21
     ant
     stripJavaArchivesHook
   ];
diff --git a/pkgs/by-name/li/libcap_ng/package.nix b/pkgs/by-name/li/libcap_ng/package.nix
index 754b4d23c79e..eb0a5657ebfb 100644
--- a/pkgs/by-name/li/libcap_ng/package.nix
+++ b/pkgs/by-name/li/libcap_ng/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcap-ng";
-  version = "0.9";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "stevegrubb";
     repo = "libcap-ng";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KF4SaES6FYuoBoZB+hhWlFuQemWM4Vg8aybCOgXM+Uc=";
+    hash = "sha256-oQRSjAikfO3RZNa4MHXUVUQ6s4Dzt7iSCYUNB8Gs+sk=";
   };
 
   # NEWS needs to exist or else the build fails
diff --git a/pkgs/by-name/li/libcdio-paranoia/package.nix b/pkgs/by-name/li/libcdio-paranoia/package.nix
index 661e3d04e89a..b836352918c8 100644
--- a/pkgs/by-name/li/libcdio-paranoia/package.nix
+++ b/pkgs/by-name/li/libcdio-paranoia/package.nix
@@ -30,7 +30,9 @@ stdenv.mkDerivation (finalAttrs: {
     libiconv
   ];
 
-  configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-ld-version-script" ];
+  configureFlags = [
+    "CFLAGS=-std=gnu17"
+  ];
 
   meta = {
     description = "CD paranoia on top of libcdio";
diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix
index 216b6c889f15..7cfc813cc26b 100644
--- a/pkgs/by-name/li/libcdio/package.nix
+++ b/pkgs/by-name/li/libcdio/package.nix
@@ -49,8 +49,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     (lib.enableFeature withMan "maintainer-mode")
+    "CFLAGS=-std=gnu17"
   ];
 
+  # autoconf 2.73's AM_ICONV "working iconv" runtime probe reports "no" on
+  # Darwin's libiconv; skip it via the cache variable. Refs #511329.
+  preConfigure = ''
+    export am_cv_func_iconv_works=yes
+  '';
+
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
diff --git a/pkgs/by-name/li/libcpucycles/environment-variable-tools.patch b/pkgs/by-name/li/libcpucycles/environment-variable-tools.patch
index b194e68c06b7..a757cc125ced 100644
--- a/pkgs/by-name/li/libcpucycles/environment-variable-tools.patch
+++ b/pkgs/by-name/li/libcpucycles/environment-variable-tools.patch
@@ -2,31 +2,27 @@ diff --git a/configure b/configure
 index 87d5c14..5e2a1a4 100755
 --- a/configure
 +++ b/configure
-@@ -112,21 +112,26 @@ def compilerversion(c):
+@@ -120,21 +120,25 @@ def compilerversion(c):
    except:
      pass
  
 -firstcompiler = None
--
--with open('compilers/default') as f:
--  for c in f.readlines():
--    c = c.strip()
--    cv = compilerversion(c)
--    if cv == None:
--      print('skipping default compiler %s' % c)
--      continue
--    print('using default compiler %s' % c)
--    firstcompiler = c
--    break
--
--if firstcompiler is None:
--  raise ValueError('did not find a working compiler')
 +if c := os.getenv("CC"):
 +  firstcompiler = c
 +  print('using default compiler %s' % c)
 +else:
 +  firstcompiler = None
-+
+ 
+-with open('compilers/default') as f:
+-  for c in f.readlines():
+-    c = c.strip()
+-    cv = compilerversion(c)
+-    if cv == None:
+-      log('skipping default compiler %s' % c)
+-      continue
+-    log('using default compiler %s' % c)
+-    firstcompiler = c
+-    break
 +  with open('compilers/default') as f:
 +    for c in f.readlines():
 +      c = c.strip()
@@ -37,10 +33,11 @@ index 87d5c14..5e2a1a4 100755
 +      print('using default compiler %s' % c)
 +      firstcompiler = c
 +      break
-+
+ 
+-if firstcompiler is None:
+-  raise ValueError('did not find a working compiler')
 +  if firstcompiler is None:
 +    raise ValueError('did not find a working compiler')
-+
  
  with open('build/%s/scripts/compiledefault' % host,'w') as f:
    f.write('#!/bin/sh\n')
diff --git a/pkgs/by-name/li/libcpucycles/package.nix b/pkgs/by-name/li/libcpucycles/package.nix
index fc1a46d76d8d..ae3dd8327edb 100644
--- a/pkgs/by-name/li/libcpucycles/package.nix
+++ b/pkgs/by-name/li/libcpucycles/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcpucycles";
-  version = "20250925";
+  version = "20260105";
 
   src = fetchzip {
     url = "https://cpucycles.cr.yp.to/libcpucycles-${finalAttrs.version}.tar.gz";
-    hash = "sha256-hYHNTuohYztLJJonm9wAkx/wlINWfgX8eL2m31xBuwM=";
+    hash = "sha256-hWmMLBadM/E/kF8D/cTjU+G0f2HTkZQlKoIWsgzAFj0=";
   };
 
   patches = [ ./environment-variable-tools.patch ];
diff --git a/pkgs/by-name/li/libcpuid/package.nix b/pkgs/by-name/li/libcpuid/package.nix
index fc6be2e81b14..152ffeddfae7 100644
--- a/pkgs/by-name/li/libcpuid/package.nix
+++ b/pkgs/by-name/li/libcpuid/package.nix
@@ -25,12 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "https://libcpuid.sourceforge.net/";
-    description = "Small C library for x86 CPU detection and feature extraction";
+    description = "Small C library for CPU detection and feature extraction";
     mainProgram = "cpuid_tool";
     changelog = "https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog";
     license = lib.licenses.bsd2;
     maintainers = [
     ];
-    platforms = lib.platforms.x86;
+    platforms = lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64;
   };
 })
diff --git a/pkgs/by-name/li/libde265/package.nix b/pkgs/by-name/li/libde265/package.nix
index a9c4b5d9dacd..51e24c6ed5ac 100644
--- a/pkgs/by-name/li/libde265/package.nix
+++ b/pkgs/by-name/li/libde265/package.nix
@@ -15,14 +15,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.0.16";
+  version = "1.0.18";
   pname = "libde265";
 
   src = fetchFromGitHub {
     owner = "strukturag";
     repo = "libde265";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4Y7tuVeDLoONU6/R/47QhGtzBiM9mtl4O++CN+KCUn4=";
+    hash = "sha256-N6K82ElrzrMSNKfPTDsc5onrxucIJ8niwFgbaEPPd2I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libevdev/package.nix b/pkgs/by-name/li/libevdev/package.nix
index d8a1d276d6fa..d2d0e082eba3 100644
--- a/pkgs/by-name/li/libevdev/package.nix
+++ b/pkgs/by-name/li/libevdev/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libevdev";
-  version = "1.13.4";
+  version = "1.13.6";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libevdev/libevdev-${finalAttrs.version}.tar.xz";
-    hash = "sha256-8Aq41CrYuQUpb6tn4TuHHxpCSDkzFRZkIQD4KtiBJ80=";
+    hash = "sha256-c/IV7MvYIz9BRzesBryiaH5nxEuX0tdXYJGqlxhVERA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix
index 4e8f961f5934..354455984786 100644
--- a/pkgs/by-name/li/libfabric/package.nix
+++ b/pkgs/by-name/li/libfabric/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfabric";
-  version = "2.4.0";
+  version = "2.5.0";
 
   enableParallelBuilding = true;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ofiwg";
     repo = "libfabric";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-C8k1caArVPBTtSggvAM7S660HpP99y9vac7oyf+HW2c=";
+    sha256 = "sha256-VgVCsurXmeJdS6cUhSp6ILcL4b31FuycVB6lv7jf0JM=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libfontenc/package.nix b/pkgs/by-name/li/libfontenc/package.nix
index 17f4e032f4a3..3e3409ced6ae 100644
--- a/pkgs/by-name/li/libfontenc/package.nix
+++ b/pkgs/by-name/li/libfontenc/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfontenc";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchurl {
     url = "mirror://xorg/individual/lib/libfontenc-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ewLD1AUjbg2GgGsd6daGj+YMMTYos4NQsDKRSqT9FMY=";
+    hash = "sha256-nYOScFyxCAPV/h0n0jbLqz9mTiaEHOAZFru+Qwzyc+I=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/libfprint-tod/package.nix b/pkgs/by-name/li/libfprint-tod/package.nix
index 1f6c3515c3bb..9abebbb42b25 100644
--- a/pkgs/by-name/li/libfprint-tod/package.nix
+++ b/pkgs/by-name/li/libfprint-tod/package.nix
@@ -39,7 +39,7 @@ libfprint.overrideAttrs (
       patchShebangs \
         ./libfprint/tod/tests/*.sh \
         ./tests/*.py \
-        ./tests/*.sh \
+        ./tests/*.sh
     '';
 
     meta = {
diff --git a/pkgs/by-name/li/libfrida-core/package.nix b/pkgs/by-name/li/libfrida-core/package.nix
index 0d05bcb4a4b6..e99e2303a335 100644
--- a/pkgs/by-name/li/libfrida-core/package.nix
+++ b/pkgs/by-name/li/libfrida-core/package.nix
@@ -2,19 +2,28 @@
   lib,
   stdenvNoCC,
   fetchurl,
+  nix-update-script,
 }:
 let
   inherit (stdenvNoCC.hostPlatform) system;
-  version = "17.2.17";
+  version = "17.9.1";
   source =
     {
       x86_64-linux = {
         url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-linux-x86_64.tar.xz";
-        hash = "sha256-9elOokCY1bxzG2iL4iOODC/7qavwn77a0zOEBpAtT8Q=";
+        hash = "sha256-94Zk7onepdNVEeDb+Vn4h680UoXCZPeZW+eGpaUrnwI=";
       };
       aarch64-linux = {
         url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-linux-arm64.tar.xz";
-        hash = "sha256-jk8BKmp3VNvCYK6kgGouFOBECoDaGiWQ8EzZvBwL7cc=";
+        hash = "sha256-o9kJvxqHICzuFItPj6r76D8aEEF/8QsRwJvE4oxphfA=";
+      };
+      x86_64-darwin = {
+        url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-macos-x86_64.tar.xz";
+        hash = "sha256-9W6o5giLSR/5bWsgRTMHI3GS7565Nkdb2kZCIm5V/cQ=";
+      };
+      aarch64-darwin = {
+        url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-macos-arm64.tar.xz";
+        hash = "sha256-bTxBvz+wpdNGUDHTFB1nN1UroMC3Bi2H/bzTVSCeMno=";
       };
     }
     .${system} or (throw "Unsupported system: ${system}");
@@ -37,6 +46,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Frida core library intended for static linking into bindings";
     homepage = "https://frida.re/";
@@ -46,6 +57,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/li/libfyaml/package.nix b/pkgs/by-name/li/libfyaml/package.nix
index de39b6e90547..ebbaae3748d8 100644
--- a/pkgs/by-name/li/libfyaml/package.nix
+++ b/pkgs/by-name/li/libfyaml/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   autoreconfHook,
   testers,
@@ -9,15 +10,27 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfyaml";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "pantoniou";
     repo = "libfyaml";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2cbw67gDcp5ufsSp+QQg8vOQx0cFcM2rTkAQ/53XB8I=";
+    hash = "sha256-mRQQe+J5wtLt/bI/Wer9TVGdU3a1zp3zFCm4oNQON8M=";
   };
 
+  # backport 32-bit build fixes
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/pantoniou/libfyaml/commit/0982fcefc6a16d4c8cb5b06747d3fc8e630de3ae.diff";
+      hash = "sha256-aDubIn+et+1fWE7XU7a5AGZVacVFbAbC1PoSDrA6hXw=";
+    })
+    (fetchpatch {
+      url = "https://github.com/pantoniou/libfyaml/commit/9192deaac095f9881cc1e5756dede683f36b09d6.diff";
+      hash = "sha256-cNL9wQtxIRg/ShZLJP4qHYNFRrYo9kRG+/U+3FiUeaI=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
diff --git a/pkgs/by-name/li/libgda5/0002-c23-md5c.patch b/pkgs/by-name/li/libgda5/0002-c23-md5c.patch
new file mode 100644
index 000000000000..78120aa6238f
--- /dev/null
+++ b/pkgs/by-name/li/libgda5/0002-c23-md5c.patch
@@ -0,0 +1,54 @@
+--- a/libgda/md5c.c
++++ b/libgda/md5c.c
+@@ -99,2 +99,2 @@
+-void MD5Init (context)
+-MD5_CTX *context;                                        /* context */
++void
++MD5Init (MD5_CTX *context)
+@@ -116,4 +116,2 @@
+-void MD5Update (context, input, inputLen)
+-MD5_CTX *context;                                        /* context */
+-unsigned char *input;                                /* input block */
+-unsigned int inputLen;                     /* length of input block */
++void
++MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen)
+@@ -158,3 +156,2 @@
+-void MD5Final (digest, context)
+-unsigned char digest[16];                         /* message digest */
+-MD5_CTX *context;                                       /* context */
++void
++MD5Final (unsigned char digest[16], MD5_CTX *context)
+@@ -187,3 +184,2 @@
+-static void MD5Transform (state, block)
+-UINT4 state[4];
+-unsigned char block[64];
++static void
++MD5Transform (UINT4 state[4], unsigned char block[64])
+@@ -280,4 +276,2 @@
+-static void Encode (output, input, len)
+-unsigned char *output;
+-UINT4 *input;
+-unsigned int len;
++static void
++Encode (unsigned char *output, UINT4 *input, unsigned int len)
+@@ -298,4 +292,2 @@
+-static void Decode (output, input, len)
+-UINT4 *output;
+-unsigned char *input;
+-unsigned int len;
++static void
++Decode (UINT4 *output, unsigned char *input, unsigned int len)
+@@ -312,4 +304,2 @@
+-static void MD5_memcpy (output, input, len)
+-POINTER output;
+-POINTER input;
+-unsigned int len;
++static void
++MD5_memcpy (POINTER output, POINTER input, unsigned int len)
+@@ -325,4 +315,2 @@
+-static void MD5_memset (output, value, len)
+-POINTER output;
+-int value;
+-unsigned int len;
++static void
++MD5_memset (POINTER output, int value, unsigned int len)
diff --git a/pkgs/by-name/li/libgda5/package.nix b/pkgs/by-name/li/libgda5/package.nix
index 9fa9e43d8acd..15c307a94cbb 100644
--- a/pkgs/by-name/li/libgda5/package.nix
+++ b/pkgs/by-name/li/libgda5/package.nix
@@ -48,6 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
     # Fix configure detection of features with c99.
     ./0001-gcc14-fix.patch
 
+    # Fix K&R-style MD5 definitions that fail under C23.
+    ./0002-c23-md5c.patch
+
     # Fix build with gettext 0.25
     (fetchpatch {
       url = "https://src.fedoraproject.org/rpms/libgda5/raw/945495e5c6cdd98a5360eff77245421876a97a57/f/gettext.patch";
diff --git a/pkgs/by-name/li/libglibutil/package.nix b/pkgs/by-name/li/libglibutil/package.nix
index d05ea175750b..855776e6eca6 100644
--- a/pkgs/by-name/li/libglibutil/package.nix
+++ b/pkgs/by-name/li/libglibutil/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libglibutil";
-  version = "1.0.80";
+  version = "1.0.81";
 
   src = fetchFromGitHub {
     owner = "sailfishos";
     repo = "libglibutil";
     rev = finalAttrs.version;
-    sha256 = "sha256-wp87cStOuQILSKFPFlFDL2vGvTQ4Cg5kuSlwnM4kc64=";
+    sha256 = "sha256-sDSdcsCkmsdD6yPEOi8rdURJRJ6LN69ZeiBfLZL2I68=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libgpg-error/package.nix b/pkgs/by-name/li/libgpg-error/package.nix
index b84ebccb0109..0b933048fc0e 100644
--- a/pkgs/by-name/li/libgpg-error/package.nix
+++ b/pkgs/by-name/li/libgpg-error/package.nix
@@ -25,11 +25,11 @@ in
 stdenv.mkDerivation (
   rec {
     pname = "libgpg-error";
-    version = "1.58";
+    version = "1.59";
 
     src = fetchurl {
       url = "mirror://gnupg/libgpg-error/libgpg-error-${version}.tar.bz2";
-      hash = "sha256-+UOuqagwqL2TjlEktXnvrs4koyJf9MPSdhGoDOEmDCc=";
+      hash = "sha256-oZvFCH/ZcCbZPLS0XVFjjRolICpeH7w5BXmfQkz6YTQ=";
     };
 
     postPatch = ''
diff --git a/pkgs/by-name/li/libgudev/package.nix b/pkgs/by-name/li/libgudev/package.nix
index 1db56931abc0..90c29d39fb0e 100644
--- a/pkgs/by-name/li/libgudev/package.nix
+++ b/pkgs/by-name/li/libgudev/package.nix
@@ -74,6 +74,11 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
   ];
 
+  # https://gitlab.gnome.org/GNOME/libgudev/-/issues/10
+  preCheck = ''
+    mesonCheckFlagsArray=( $(meson test --list | grep -v libgudev:test-gudevdevice) )
+  '';
+
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "libgudev";
diff --git a/pkgs/by-name/li/libhighscore/package.nix b/pkgs/by-name/li/libhighscore/package.nix
index 202c0dd199c4..89e0e2aa6fa8 100644
--- a/pkgs/by-name/li/libhighscore/package.nix
+++ b/pkgs/by-name/li/libhighscore/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation {
   pname = "libhighscore";
-  version = "0-unstable-2026-01-30";
+  version = "0-unstable-2026-04-01";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "alicem";
     repo = "libhighscore";
-    rev = "81366c670b777a6943dbdd955b9e867c8da247e7";
-    hash = "sha256-z+gMU9IA0F9alrhXNf5e+0/J87ChwVyCn26iA+ythBE=";
+    rev = "a2fcebc004be977f45ecbe40e94a85d0c1690f43";
+    hash = "sha256-npJDapediUTpDgevwfsEskEWSObPD/0ERFL0JWzAvM0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libid3tag/package.nix b/pkgs/by-name/li/libid3tag/package.nix
index 97e9f1a76e70..51cae4dba3e0 100644
--- a/pkgs/by-name/li/libid3tag/package.nix
+++ b/pkgs/by-name/li/libid3tag/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromCodeberg,
-  fetchpatch,
   cmake,
   gperf,
   zlib,
@@ -10,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libid3tag";
-  version = "0.16.3";
+  version = "0.16.4";
 
   outputs = [
     "out"
@@ -21,18 +20,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "tenacityteam";
     repo = "libid3tag";
     rev = finalAttrs.version;
-    hash = "sha256-6/49rk7pmIpJRj32WmxC171NtdIOaMNhX8RD7o6Jbzs=";
+    hash = "sha256-v3tvZmQE6G8Xsk+eluVtlou0Nyhyaisv0UclivQBi28=";
   };
 
-  patches = [
-    # Fix the build with CMake 4.
-    (fetchpatch {
-      name = "libid3tag-fix-cmake-4.patch";
-      url = "https://codeberg.org/tenacityteam/libid3tag/commit/eee94b22508a066f7b9bc1ae05d2d85982e73959.patch";
-      hash = "sha256-OAdMapNr8qpvXZqNOZ3LUHQ1H79zD1rvzrVksqmz6dU=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace packaging/id3tag.pc.in \
       --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@"
diff --git a/pkgs/by-name/li/libipt/package.nix b/pkgs/by-name/li/libipt/package.nix
index 4e14d1e306e2..aa7b8266e89a 100644
--- a/pkgs/by-name/li/libipt/package.nix
+++ b/pkgs/by-name/li/libipt/package.nix
@@ -2,30 +2,21 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   freebsd,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libipt";
-  version = "2.1.2";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "libipt";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-rO2Mf2/BfKlPh1wHe0qTuyQAyqpSB/j3Q+JWpNDyNm0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hSC00GbVllJStgt9iA9WT54U8NQRtgJHuyZyb5ougc8=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "libipt-fix-cmake-4.patch";
-      url = "https://github.com/intel/libipt/commit/fa7d42de25be526da532284cc8b771fdeb384f81.patch";
-      hash = "sha256-/jTyoGyKw29Nu27bAXmStpjOdTeGdQYpEX2rb29vSSQ=";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
   buildInputs = lib.optional stdenv.hostPlatform.isFreeBSD freebsd.libstdthreads;
 
@@ -34,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    changelog = "https://github.com/intel/libipt/releases/tag/v${finalAttrs.version}";
     description = "Intel Processor Trace decoder library";
     homepage = "https://github.com/intel/libipt";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/libirc/default.nix b/pkgs/by-name/li/libirc/package.nix
similarity index 69%
rename from pkgs/development/libraries/libirc/default.nix
rename to pkgs/by-name/li/libirc/package.nix
index 1ef0b14efa48..291ec2bedf1d 100644
--- a/pkgs/development/libraries/libirc/default.nix
+++ b/pkgs/by-name/li/libirc/package.nix
@@ -3,30 +3,35 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
+  qt6,
 }:
 
 stdenv.mkDerivation {
   pname = "libirc";
-  version = "unstable-2022-10-15";
+  version = "0-unstable-2025-11-09";
 
   src = fetchFromGitHub {
     owner = "grumpy-irc";
     repo = "libirc";
-    rev = "734082ffffb6d6744070c75587159d927342edea";
-    sha256 = "Qi/YKLlau0rdQ9XCMyreQdv4ctQWHFIoE3YlW6QnbSI=";
+    rev = "59c6d81242910d8205b94acadf54cec0d2313884";
+    hash = "sha256-C7bO2Dwa6p7/bUh73JJCup2biIm9UShOUSxL9uCShqg=";
   };
 
   nativeBuildInputs = [ cmake ];
 
+  buildInputs = [
+    qt6.qtbase
+  ];
+
+  dontWrapQtApps = true; # library only
+
   postPatch = ''
     substituteInPlace CMakeLists.txt --replace-fail 'cmake_minimum_required(VERSION 3.0)' 'cmake_minimum_required(VERSION 3.10)'
   '';
 
   cmakeFlags = [
-    "-DQT5_BUILD=1"
-    "-DQt5Core_DIR=${qtbase.dev}/lib/cmake/Qt5Core"
-    "-DQt5Network_DIR=${qtbase.dev}/lib/cmake/Qt5Network"
+    (lib.cmakeBool "QT6_BUILD" true)
+    (lib.cmakeFeature "CMAKE_CXX_STANDARD" "17") # supposedly required for Qt
   ];
 
   preFixup = ''
diff --git a/pkgs/by-name/li/libisofs/package.nix b/pkgs/by-name/li/libisofs/package.nix
index dcb64802ad31..ddad7063463e 100644
--- a/pkgs/by-name/li/libisofs/package.nix
+++ b/pkgs/by-name/li/libisofs/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libisofs";
-  version = "1.5.6.pl01";
+  version = "1.5.8";
 
   src = fetchFromGitea {
     domain = "dev.lovelyhq.com";
     owner = "libburnia";
     repo = "libisofs";
     rev = "release-${finalAttrs.version}";
-    hash = "sha256-U5We19f/X1UKYFacCRl+XRXn67W8cYOBORb2uEjanT4=";
+    hash = "sha256-tOkJfS/utUPn38rn0u5zAo1N4IIkvpejg89Oxw6Xqv4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix
index deeed0c7d87d..5156d1f87d5c 100644
--- a/pkgs/by-name/li/libjpeg_turbo/package.nix
+++ b/pkgs/by-name/li/libjpeg_turbo/package.nix
@@ -32,13 +32,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libjpeg-turbo";
-  version = "3.1.3";
+  version = "3.1.4";
 
   src = fetchFromGitHub {
     owner = "libjpeg-turbo";
     repo = "libjpeg-turbo";
     tag = finalAttrs.version;
-    hash = "sha256-jcdoCJlsDEr87i5MN4I6zARZVUxQfzdM0Ltg3IyrNRg=";
+    hash = "sha256-mxmJejgUqS6OC0U0gHsHHe74X0MTVBY5OCbqxIyWa3Q=";
   };
 
   patches =
diff --git a/pkgs/by-name/li/libkqueue/package.nix b/pkgs/by-name/li/libkqueue/package.nix
index f0ca9be4f270..b27042b57dbe 100644
--- a/pkgs/by-name/li/libkqueue/package.nix
+++ b/pkgs/by-name/li/libkqueue/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libkqueue";
-  version = "2.6.3";
+  version = "2.6.4";
 
   src = fetchFromGitHub {
     owner = "mheily";
     repo = "libkqueue";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-q9ycYeo8BriD9bZEozjkdHUg2xntQUZwbYX7d1IZPzk=";
+    sha256 = "sha256-Lex/EmVMESScungJ6r/Br7TaoC4fcDHvDBJpryoe84E=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/li/libldac-dec/package.nix b/pkgs/by-name/li/libldac-dec/package.nix
index 7a8eaf208718..89fa401ea258 100644
--- a/pkgs/by-name/li/libldac-dec/package.nix
+++ b/pkgs/by-name/li/libldac-dec/package.nix
@@ -2,41 +2,84 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  cmake,
-  nix-update-script,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libldac-dec";
-  version = "0.0.2-unstable-2024-11-12";
+  version = "2.0.72";
 
   src = fetchFromGitHub {
-    owner = "O2C14";
-    repo = "libldac-dec";
-    rev = "8c15f53b97c8322c18cff3fddf6d7129dbd3d349";
-    hash = "sha256-pdeEtQXxL2pd9qTfLOEmPDn3POgo5qxRqbK807WN98s=";
+    owner = "open-vela";
+    repo = "external_libldac";
+    rev = "5b4bf66096ba0d69615efb2422ba3d023c34c2fd";
+    hash = "sha256-5jeqTyhSBtYky15Xw1lIbUxeGZMQQQdM/EQUFicyi3Y=";
   };
 
-  nativeBuildInputs = [ cmake ];
-
-  # Upstream CMakeLists.txt doesn't have install rules
-  postPatch = ''
-    cat >> CMakeLists.txt <<'EOF'
-    install(TARGETS ldacBT_dec LIBRARY DESTINATION ''${CMAKE_INSTALL_LIBDIR})
-    EOF
-  '';
-
-  cmakeFlags = [
-    "-DCMAKE_INSTALL_LIBDIR=lib"
+  outputs = [
+    "out"
+    "dev"
   ];
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+  env.NIX_CFLAGS_COMPILE = "-O2 -fPIC -Wall -D_DECODE_ONLY -Iinc -Isrc";
+
+  # Verify finalAttrs.version matches LDACBT_LIB_VER_* in upstream source.
+  # Guards against silent version drift when the pinned commit changes.
+  preBuild = ''
+    awk -v want=${finalAttrs.version} '
+      /^#define LDACBT_LIB_VER_/ { v = v sep ($3+0); sep = "." }
+      END {
+        if (v != want) { print "version mismatch: package says " want ", source reports " v > "/dev/stderr"; exit 1 }
+      }
+    ' src/ldacBT_api.c
+  '';
+
+  # Upstream ships AOSP build files and a gcc/ makefile that only knows
+  # about the in-tree layout. Compile and link directly; the entire
+  # library is two umbrella translation units.
+  buildPhase = ''
+    runHook preBuild
+
+    soname=libldacBT_dec.so.${lib.versions.major finalAttrs.version}
+    sofile=libldacBT_dec.so.${finalAttrs.version}
+
+    $CC -shared -Wl,-soname,$soname src/ldaclib.c src/ldacBT.c -lm -o $sofile
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 -t $out/lib $sofile
+    ln -s $sofile $out/lib/$soname
+    ln -s $sofile $out/lib/libldacBT_dec.so
+
+    install -Dm644 inc/ldacBT.h $dev/include/ldac/ldacBT.h
+
+    mkdir -p $dev/lib/pkgconfig
+    cat > $dev/lib/pkgconfig/ldacBT-dec.pc <<EOF
+    prefix=$out
+    exec_prefix=\''${prefix}
+    libdir=$out/lib
+    includedir=$dev/include/ldac
+
+    Name: ldacBT-dec
+    Description: LDAC Bluetooth decoder
+    Version: ${finalAttrs.version}
+    Libs: -L\''${libdir} -lldacBT_dec
+    Libs.private: -lm
+    Cflags: -I\''${includedir}
+    EOF
+
+    runHook postInstall
+  '';
 
   meta = {
-    description = "LDAC decoding library implemented in another way";
-    homepage = "https://github.com/O2C14/libldac-dec";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.unix;
+    description = "Sony LDAC Bluetooth decoder library (from AOSP via open-vela)";
+    homepage = "https://github.com/open-vela/external_libldac";
+    license = lib.licenses.asl20;
+    # LDAC bitstream format assumes LE; source has endian checks
+    platforms = lib.platforms.littleEndian;
     maintainers = with lib.maintainers; [ qweered ];
   };
-}
+})
diff --git a/pkgs/by-name/li/libmaxminddb/package.nix b/pkgs/by-name/li/libmaxminddb/package.nix
index 5d876e375df9..950502c06d38 100644
--- a/pkgs/by-name/li/libmaxminddb/package.nix
+++ b/pkgs/by-name/li/libmaxminddb/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmaxminddb";
-  version = "1.12.2";
+  version = "1.13.3";
 
   src = fetchurl {
     url = meta.homepage + "/releases/download/${version}/libmaxminddb-${version}.tar.gz";
-    sha256 = "sha256-G/v477o+1kYuBOIlkGrVzl/pWKo9YmoSNbKiJT1gB0M=";
+    sha256 = "sha256-pmUC6nbq2+F/LNb9cIlGd3JTly0q6BV97hsjovtSgXE=";
   };
 
   meta = {
diff --git a/pkgs/by-name/li/libmpc/package.nix b/pkgs/by-name/li/libmpc/package.nix
index cbfc47befa40..35328cc0023c 100644
--- a/pkgs/by-name/li/libmpc/package.nix
+++ b/pkgs/by-name/li/libmpc/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmpc";
-  version = "1.3.1"; # to avoid clash with the MPD client
+  version = "1.4.0"; # to avoid clash with the MPD client
 
   src = fetchurl {
-    url = "mirror://gnu/mpc/mpc-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg=";
+    url = "mirror://gnu/mpc/mpc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-MhCzpUaxywDClso2CJHXdA7m/wbesCono1sgzTwLsaU=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/libnetfilter_conntrack/package.nix b/pkgs/by-name/li/libnetfilter_conntrack/package.nix
index 9512b19d00b3..dae5a93f664f 100644
--- a/pkgs/by-name/li/libnetfilter_conntrack/package.nix
+++ b/pkgs/by-name/li/libnetfilter_conntrack/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libnetfilter_conntrack";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Z+3LTrgmwvjcmK8I2r/2jzs9D+b7fZ0Kwe5+zOD+aU4=";
+    hash = "sha256-dp0+r1f6T72wXdEoc7bLmlvnhE2JN+Iitkc4HUQoSCA=";
   };
 
   hardeningDisable = [ "trivialautovarinit" ];
diff --git a/pkgs/by-name/li/libnl/package.nix b/pkgs/by-name/li/libnl/package.nix
index 8931b841a88e..4e7ec50f0d16 100644
--- a/pkgs/by-name/li/libnl/package.nix
+++ b/pkgs/by-name/li/libnl/package.nix
@@ -7,14 +7,16 @@
   bison,
   flex,
   pkg-config,
+  pythonSupport ? false,
+  swig ? null,
+  python ? null,
+  enableDocs ? false,
   doxygen,
   graphviz,
   mscgen,
   asciidoc,
   sourceHighlight,
-  pythonSupport ? false,
-  swig ? null,
-  python ? null,
+  python3Packages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -34,23 +36,31 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
     "man"
   ]
-  ++ lib.optional pythonSupport "py";
+  ++ lib.optional pythonSupport "py"
+  ++ lib.optional enableDocs "doc";
 
   enableParallelBuilding = true;
 
+  configureFlags = [ (lib.enableFeature enableDocs "doc") ];
+
   nativeBuildInputs = [
     autoreconfHook
     bison
     flex
     pkg-config
     file
+  ]
+  ++ lib.optionals pythonSupport [
+    swig
+  ]
+  ++ lib.optionals enableDocs [
     doxygen
     graphviz
     mscgen
     asciidoc
     sourceHighlight
-  ]
-  ++ lib.optional pythonSupport swig;
+    python3Packages.pygments
+  ];
 
   postBuild = lib.optionalString pythonSupport ''
     cd python
@@ -58,6 +68,16 @@ stdenv.mkDerivation (finalAttrs: {
     cd -
   '';
 
+  postInstall = lib.optionalString enableDocs ''
+    patchShebangs doc
+    # See tools/build_release.sh
+    make -C doc
+    make -C doc gendoc
+    make -C doc dist
+    mkdir -p $doc/share/doc/libnl
+    cp doc/libnl-doc-${finalAttrs.version}.tar.gz $doc/share/doc/libnl
+  '';
+
   postFixup = lib.optionalString pythonSupport ''
     mv "pythonlib/" "$py"
   '';
diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix
index 44d3055d8969..aef01c5c4696 100644
--- a/pkgs/by-name/li/libnvidia-container/package.nix
+++ b/pkgs/by-name/li/libnvidia-container/package.nix
@@ -175,7 +175,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       cpcloud
       msanft
-      katexochen
     ];
   };
 })
diff --git a/pkgs/by-name/li/libopenmpt/package.nix b/pkgs/by-name/li/libopenmpt/package.nix
index 5187644b1710..0e7f01d0fe84 100644
--- a/pkgs/by-name/li/libopenmpt/package.nix
+++ b/pkgs/by-name/li/libopenmpt/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libopenmpt";
-  version = "0.8.4";
+  version = "0.8.6";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${finalAttrs.version}+release.autotools.tar.gz";
-    hash = "sha256-Yn+b8RqsrmFaHyyYLH6IyyHxGy1vAmeUb3yCxerklDs=";
+    hash = "sha256-yqL6lZ44n0N02eLfOvXGM0UsEt2ARCy6LonLf/K5PFs=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/by-name/li/libopenshot-audio/package.nix
similarity index 91%
rename from pkgs/development/libraries/libopenshot-audio/default.nix
rename to pkgs/by-name/li/libopenshot-audio/package.nix
index 9d2cae53e425..7288bf804841 100644
--- a/pkgs/development/libraries/libopenshot-audio/default.nix
+++ b/pkgs/by-name/li/libopenshot-audio/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libopenshot-audio";
-  version = "0.4.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot-audio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-FTSITx6GoH1cGWeWNWtz1Ih+zozK8aA+u54Y4s0DylQ=";
+    hash = "sha256-NfwjyX+9OiS4NoB4ubscNF52kF4i3GAVjb4Z/RwkaCI=";
   };
 
   nativeBuildInputs = [
@@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     );
 
   strictDeps = true;
+  __structuredAttrs = true;
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/libopenshot/0001-link-magickcore.diff b/pkgs/by-name/li/libopenshot/0001-link-magickcore.diff
similarity index 100%
rename from pkgs/development/libraries/libopenshot/0001-link-magickcore.diff
rename to pkgs/by-name/li/libopenshot/0001-link-magickcore.diff
diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/by-name/li/libopenshot/package.nix
similarity index 78%
rename from pkgs/development/libraries/libopenshot/default.nix
rename to pkgs/by-name/li/libopenshot/package.nix
index 841190c1fc90..4d9bdabc6166 100644
--- a/pkgs/development/libraries/libopenshot/default.nix
+++ b/pkgs/by-name/li/libopenshot/package.nix
@@ -13,21 +13,21 @@
   llvmPackages,
   pkg-config,
   python3,
-  qtbase,
-  qtmultimedia,
+  qt6,
   swig,
   zeromq,
+  resvg,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libopenshot";
-  version = "0.4.0";
+  version = "0.7.0-unstable-2026-04-21";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-zroTnJRYIIglhha6jQvaVNTgnIV6kUWcu7s5zEvgH6Q=";
+    rev = "a58565292cb84438b1c6a039c343b4c65003bd82";
+    hash = "sha256-zUzyi/VydrxDLCY7E/LBr7+btthOjal3c7md6PTXQWA=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -35,13 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./0001-link-magickcore.diff
   ];
 
-  postPatch = ''
-    # Fix FFmpeg 8.0 API compatibility (FF_PROFILE_* -> AV_PROFILE_*)
-    substituteInPlace src/FFmpegWriter.cpp \
-      --replace-fail "FF_PROFILE_H264_BASELINE" "AV_PROFILE_H264_BASELINE" \
-      --replace-fail "FF_PROFILE_H264_CONSTRAINED" "AV_PROFILE_H264_CONSTRAINED"
-  '';
-
   nativeBuildInputs = [
     cmake
     doxygen
@@ -56,9 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
     jsoncpp
     libopenshot-audio
     python3
-    qtbase
-    qtmultimedia
+    qt6.qtbase
+    qt6.qtmultimedia
     zeromq
+    resvg
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
@@ -68,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   strictDeps = true;
+  __structuredAttrs = true;
 
   dontWrapQtApps = true;
 
@@ -78,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "ENABLE_PYTHON" true)
     (lib.cmakeOptionType "filepath" "PYTHON_EXECUTABLE" (lib.getExe python3))
     (lib.cmakeOptionType "filepath" "PYTHON_MODULE_PATH" python3.sitePackages)
+    "-DUSE_QT6=ON"
   ];
 
   passthru = {
diff --git a/pkgs/by-name/li/libpciaccess/package.nix b/pkgs/by-name/li/libpciaccess/package.nix
index 2815baac2da5..a9b96e07c577 100644
--- a/pkgs/by-name/li/libpciaccess/package.nix
+++ b/pkgs/by-name/li/libpciaccess/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpciaccess";
-  version = "0.18.1";
+  version = "0.19";
 
   src = fetchurl {
     url = "mirror://xorg/individual/lib/libpciaccess-${finalAttrs.version}.tar.xz";
-    hash = "sha256-SvQ0RLOK21VF0O0cLORtlgjMR7McI4f8UYFlZ2Wm+nY=";
+    hash = "sha256-PFWqhsguVKTjEJeG8EY1MNU7NrbRz9FGFkVPmF3SqkM=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/libpg_query/package.nix b/pkgs/by-name/li/libpg_query/package.nix
index 94ac3a3d48b8..3f78829abccd 100644
--- a/pkgs/by-name/li/libpg_query/package.nix
+++ b/pkgs/by-name/li/libpg_query/package.nix
@@ -5,7 +5,7 @@
   which,
   squawk,
   protobufc,
-  xxHash,
+  xxhash,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpg_query";
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r protobuf $out/include/protobuf
     ln -s ${protobufc.dev}/include/protobuf-c $out/include/protobuf-c
     cp -r ${protobufc.dev}/include/protobuf-c/* $out/include
-    ln -s ${xxHash}/include $out/include/xxhash
+    ln -s ${xxhash}/include $out/include/xxhash
     install -Dm644 pg_query.h -t $out/include
 
     runHook postInstall
diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix
index cdf64d4b29c6..c7960f0d4822 100644
--- a/pkgs/by-name/li/libphonenumber/package.nix
+++ b/pkgs/by-name/li/libphonenumber/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libphonenumber";
-  version = "9.0.28";
+  version = "9.0.29";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "libphonenumber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Mi+FpM8viPUWgzT8tp3zc9e5fsI9xhlsdsYYlaVRTNk=";
+    hash = "sha256-VhVPLDD7KHRxD7adOyYGxVxfI3n77QCk5pLPtN8YfPQ=";
   };
 
   patches = [
diff --git a/pkgs/by-name/li/libplacebo/package.nix b/pkgs/by-name/li/libplacebo/package.nix
index fb3fbdf3b7a2..4cc43e9c310f 100644
--- a/pkgs/by-name/li/libplacebo/package.nix
+++ b/pkgs/by-name/li/libplacebo/package.nix
@@ -15,7 +15,7 @@
   libx11,
   libunwind,
   libdovi,
-  xxHash,
+  xxhash,
   fast-float,
   vulkanSupport ? true,
 }:
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     libx11
     libunwind
     libdovi
-    xxHash
+    xxhash
     vulkan-headers
   ]
   ++ lib.optionals vulkanSupport [
diff --git a/pkgs/by-name/li/libpng/package.nix b/pkgs/by-name/li/libpng/package.nix
index 10b430c4a9d0..d533f3ed56bb 100644
--- a/pkgs/by-name/li/libpng/package.nix
+++ b/pkgs/by-name/li/libpng/package.nix
@@ -11,10 +11,10 @@
 assert zlib != null;
 
 let
-  patchVersion = "1.6.54";
+  patchVersion = "1.6.56";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
-    hash = "sha256-Vjj8RQDq9IRXtNfJ5VP9gqsB13MEpwB32DNoQp1E8bQ=";
+    hash = "sha256-nOMtSidjoqxfJYcmui9J6QETJ8HujDCGKjLQ8wiJ++g=";
   };
   whenPatched = lib.optionalString apngSupport;
 
@@ -24,11 +24,11 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "libpng" + whenPatched "-apng";
-  version = "1.6.55";
+  version = "1.6.56";
 
   src = fetchurl {
     url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz";
-    hash = "sha256-2SVyKGSDetWuKoIHDUsuBgPccq9EvUV8OWIpgli46C0=";
+    hash = "sha256-99i/FgG3gE9YOiVKs0OmVJymzyfSVcMCxHry2dNqbxg=";
   };
   postPatch =
     whenPatched "gunzip < ${patch_src} | patch -Np1"
diff --git a/pkgs/by-name/li/libqmi/package.nix b/pkgs/by-name/li/libqmi/package.nix
index 2b98864120d4..9496dfd36be8 100644
--- a/pkgs/by-name/li/libqmi/package.nix
+++ b/pkgs/by-name/li/libqmi/package.nix
@@ -5,8 +5,8 @@
   meson,
   ninja,
   pkg-config,
+  gi-docgen,
   gobject-introspection,
-  gtk-doc,
   docbook-xsl-nons,
   docbook_xml_dtd_43,
   help2man,
@@ -26,20 +26,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqmi";
-  version = "1.36.0";
+  version = "1.38.0";
 
   outputs = [
     "out"
     "dev"
-  ]
-  ++ lib.optional withIntrospection "devdoc";
+  ];
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mobile-broadband";
     repo = "libqmi";
     rev = finalAttrs.version;
-    hash = "sha256-cGNnw0vO/Hr9o/eIf6lLTsoGiEkTvZiArgO7tAc208U=";
+    hash = "sha256-bJbNfnKVJuhy/6EJgu5b7t6vxNTex/5heTzMzTzVREw=";
   };
 
   nativeBuildInputs = [
@@ -52,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     help2man
   ]
   ++ lib.optionals withIntrospection [
+    gi-docgen
     gobject-introspection
-    gtk-doc
     docbook-xsl-nons
     docbook_xml_dtd_43
   ]
diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix
index 90a9d1181674..7e51b324f817 100644
--- a/pkgs/by-name/li/libraw/package.nix
+++ b/pkgs/by-name/li/libraw/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libraw";
-  version = "0.21.5b";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "LibRaw";
     repo = "LibRaw";
     tag = finalAttrs.version;
-    hash = "sha256-CE7XB61bnjRhy0Ww2Q3pvvSJMobHHta5jn4F/i/oOEE=";
+    hash = "sha256-B2+LcdC6FqKryiu8t0wBifrESTAyz/+wDQhcGj7myhE=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/librechat/package.nix b/pkgs/by-name/li/librechat/package.nix
index 68129fb5e535..67797f39474a 100644
--- a/pkgs/by-name/li/librechat/package.nix
+++ b/pkgs/by-name/li/librechat/package.nix
@@ -12,13 +12,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "librechat";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "danny-avila";
     repo = "LibreChat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XiPnTKiSOMezUZuhkaGJ0xHiT7jrz8OYbZrvq5gb/V8=";
+    hash = "sha256-iU5UoH1rbt+cVEzZAmiSjRKMJdQrKtqtHTT6vf5bGrg=";
   };
 
   patches = [
@@ -35,7 +35,7 @@ buildNpmPackage (finalAttrs: {
   ];
 
   npmDepsFetcherVersion = 2;
-  npmDepsHash = "sha256-h15rNYl2QYnh7/cJvA7lrRqmXw8Ri2QKTfTr7w7+mMo=";
+  npmDepsHash = "sha256-mtGqMl+u/BfcrXKiOjtgOcgDFFgBzKt56TvpbrXPG5E=";
 
   # npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
   nodejs = nodejs_22;
diff --git a/pkgs/by-name/li/librepods/package.nix b/pkgs/by-name/li/librepods/package.nix
index 421b5b4abd80..4ac898aff051 100644
--- a/pkgs/by-name/li/librepods/package.nix
+++ b/pkgs/by-name/li/librepods/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "librepods";
-  version = "0.2.0-alpha.2";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "kavishdevar";
     repo = "librepods";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-37dLiXC+eO4f5waLKgMMpHXH1m6W54O/l2axJsnyU5M=";
+    hash = "sha256-nLRbVnm+4jr7yH6e/BsygkC4kOx1PJNy6jU5ioe2c54=";
   };
 
   sourceRoot = "source/linux";
diff --git a/pkgs/by-name/li/librespeed-cli/package.nix b/pkgs/by-name/li/librespeed-cli/package.nix
index 051704a891fa..583745e475ac 100644
--- a/pkgs/by-name/li/librespeed-cli/package.nix
+++ b/pkgs/by-name/li/librespeed-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "librespeed-cli";
-  version = "1.0.12";
+  version = "1.0.13";
 
   src = fetchFromGitHub {
     owner = "librespeed";
     repo = "speedtest-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-njaQ/Be5rDCqkZJkij0nRi8aIO5uZYo8t3BjIcdKoCM=";
+    hash = "sha256-Q6JdkXl6EaM/Uh2u2xH4Afa+aFvssZh98J7uUtJv/H0=";
   };
 
-  vendorHash = "sha256-dmaq9+0FjqYh2ZLg8bu8cPJZ9QClcvwid1nmsftmrf0=";
+  vendorHash = "sha256-LXSCOAX3EwDBJ37mkS/BZCllgEai8tC7WFy6pebNAyo=";
 
   # Tests have additional requirements
   doCheck = false;
diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 1de11e79ce75..7c5c47d9e3cd 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2026-04-10";
+  version = "0-unstable-2026-04-26";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "3e8578d3341c08647470542010b2daf8e7218fa9";
-    hash = "sha256-n9R9lff3AaIEE397kOZxG5fE+/jvCYqkBeUL7MKGkZU=";
+    rev = "cc71b5eff24a962bd055a92d2032f806635fdf97";
+    hash = "sha256-PeG6H5XArKdptbSicMgXPFtnrkglmkwZieGKSr0aPaQ=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
index 096f566910d1..87ef1fab2d52 100644
--- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
@@ -36,7 +36,7 @@ let
 
   pname = "librewolf-bin-unwrapped";
 
-  version = "149.0.2-2";
+  version = "150.0.1-1";
 in
 
 stdenv.mkDerivation {
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
     url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
     hash =
       {
-        x86_64-linux = "sha256-BzgSMeAHE3t3P5L/Xj0xjJcfsFk3UIYlrJvQGoahpM0=";
-        aarch64-linux = "sha256-49ODecTb/NeTa8iwB8f4XzGqPfFTJPvEgRJz8gsoGNs=";
+        x86_64-linux = "sha256-yIZGbTTelMerlFZ2oISCHtK/C62KjGnWd6agO4H+pbo=";
+        aarch64-linux = "sha256-hEAH1/I40f/fjUtODJc6kMuUhr4Xj+TyEvn0TOPSYMc=";
       }
       .${stdenv.hostPlatform.system} or throwSystem;
   };
diff --git a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix
index a1cd00a257d5..91e767db281e 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix
+++ b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix
@@ -32,6 +32,10 @@ rec {
 
     sed -i '/# This must remain last./i gkrust_features += ["glean_disable_upload"]\'$'\n' toolkit/library/rust/gkrust-features.mozbuild
 
+    # Temporary fix used with patches/rust-build.patch
+    sed -i 's/9456ca46168ef86c98399a2536f577ef7be3cdde90c0c51392d8ac48519d3fae/b9432f9ed39742015f4bb4c3e75c89a2b9a9eef943dd0fd7cd889fddd1e6d39c/g' third_party/rust/encoding_rs/.cargo-checksum.json
+
+
     cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences
     cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences
     cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences
diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json
index ce93d8944f06..813b8a65ef5d 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/src.json
+++ b/pkgs/by-name/li/librewolf-unwrapped/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "149.0.2-2",
+  "packageVersion": "150.0-1",
   "source": {
-    "rev": "149.0.2-2",
-    "hash": "sha256-rnDL98f3vwpcRmWfNuTcp2SDk6CKiOPEZFYnNsVDUa0="
+    "rev": "150.0-1",
+    "hash": "sha256-udoXrll3sQnG8Jp6AZtd9V2vela4Uej9SKy7wP7YiUc="
   },
   "firefox": {
-    "version": "149.0.2",
-    "hash": "sha512-hEpG7gaOzcZrcifQiaBXrT9JRRFP6iyygNXio4PQoCL8ZiitV8Bo6jTPFZRy9jxQ6n7RKLwRoLJ/Frt7Z9fzzw=="
+    "version": "150.0",
+    "hash": "sha512-d+jq6G57F8M5M/3qbTtfvnPmYTlJ5iwT2e0+WT57oLUHAfqX/H1WoniWHS4c2ykCJEwwoQIHkAkbCuLwyxtOcQ=="
   }
 }
diff --git a/pkgs/by-name/li/librime-lua/package.nix b/pkgs/by-name/li/librime-lua/package.nix
index 0c988e2b8b62..533bd91c8217 100644
--- a/pkgs/by-name/li/librime-lua/package.nix
+++ b/pkgs/by-name/li/librime-lua/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "librime-lua";
-  version = "0-unstable-2025-07-07";
+  version = "0-unstable-2026-04-26";
 
   src = fetchFromGitHub {
     owner = "hchunhui";
     repo = "librime-lua";
-    rev = "68f9c364a2d25a04c7d4794981d7c796b05ab627";
-    hash = "sha256-m7/qXdIlMMHscDDcFmusNuOR0cuzPpDQdprqRci8qZw=";
+    rev = "ef17b1f5e0c3f430d6039309d8ebd27bb26bc671";
+    hash = "sha256-kuNvJUiAlt+78U5ZqRbets2M/mrsVaECYxVFZRW/R40=";
   };
 
   propagatedBuildInputs = [ lua ];
diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix
index f21357f2091e..72db421bee7e 100644
--- a/pkgs/by-name/li/libsignal-ffi/package.nix
+++ b/pkgs/by-name/li/libsignal-ffi/package.nix
@@ -6,21 +6,34 @@
   xcodebuild,
   protobuf,
   boringssl,
+
+  withShared ? !stdenv.hostPlatform.isStatic,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-ffi";
   # must match the version used in mautrix-signal
   # see https://github.com/mautrix/signal/issues/401
-  version = "0.87.5";
+  version = "0.92.1";
 
   src = fetchFromGitHub {
     fetchSubmodules = true;
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xffBXvq1ikesIjw6cXfphnTIiyuMiUcY8h0pzSgfD8U=";
+    hash = "sha256-gAXLt0e2k5PA6PgFRQa22oGuNLM7TGkOKQnYtFhn8I8=";
   };
 
+  postPatch =
+    lib.optionalString withShared ''
+      substituteInPlace rust/bridge/ffi/Cargo.toml \
+        --replace-fail 'crate-type = ["staticlib"]' 'crate-type = ["cdylib"]'
+    ''
+    + lib.optionalString boringssl.passthru.isShared ''
+      substituteInPlace $cargoDepsCopy/*/boring-sys-*/build/main.rs \
+        --replace-fail "cargo:rustc-link-lib=static=crypto" "cargo:rustc-link-lib=dylib=crypto" \
+        --replace-fail "cargo:rustc-link-lib=static=ssl" "cargo:rustc-link-lib=dylib=ssl"
+    '';
+
   nativeBuildInputs = [
     protobuf
     rustPlatform.bindgenHook
@@ -33,13 +46,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
     NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
   };
 
-  cargoHash = "sha256-MwAtUrLoSi/pjsBWOAd9JoepAueq17hkZCH21q72O3w=";
+  cargoHash = "sha256-TqYxkkzlbgrc7jkAubz3TsXhcU8Do5IFaLRqSPiZVR0=";
 
   cargoBuildFlags = [
     "-p"
     "libsignal-ffi"
   ];
 
+  postFixup = lib.optionalString (withShared && stdenv.hostPlatform.isDarwin) ''
+    dylib="$out/lib/libsignal_ffi.dylib"
+    install_name_tool -id "$dylib" "$dylib"
+  '';
+
   meta = {
     description = "C ABI library which exposes Signal protocol logic";
     homepage = "https://github.com/signalapp/libsignal";
diff --git a/pkgs/by-name/li/libsodium/package.nix b/pkgs/by-name/li/libsodium/package.nix
index 13406c36fd14..ca3294286cfb 100644
--- a/pkgs/by-name/li/libsodium/package.nix
+++ b/pkgs/by-name/li/libsodium/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsodium";
-  version = "1.0.21-unstable-2026-02-11";
+  version = "1.0.21-unstable-2026-03-29";
 
   src = fetchFromGitHub {
     owner = "jedisct1";
     repo = "libsodium";
-    rev = "e18eee6532f5dc4b0f7ee99024e24bf4c8e12fc2";
-    hash = "sha256-S/uQtt4m5OyGo9yBb4UARV0Xcwtd/I6tCRJilcx8XBM=";
+    rev = "d1d0bedbac5b415711a92bb4b881cea73f318c93";
+    hash = "sha256-AL41r5N80rUJYu852qdisTwMbaOQ1vAdB/2j82kGqT0=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libspectrum/package.nix b/pkgs/by-name/li/libspectrum/package.nix
index 28f71cdee4c7..88a645c17ccc 100644
--- a/pkgs/by-name/li/libspectrum/package.nix
+++ b/pkgs/by-name/li/libspectrum/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libspectrum";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/fuse-emulator/libspectrum-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-o1PLRumxooEGHYFjU+oBDQpv545qF6oLe3QnHKXkrPw=";
+    sha256 = "sha256-rH7jqYEQjk85hikTe4Cd6L4w5qbglFNryNLhQxPMwKo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libssh/package.nix b/pkgs/by-name/li/libssh/package.nix
index cafa225067c8..93876d1b72d8 100644
--- a/pkgs/by-name/li/libssh/package.nix
+++ b/pkgs/by-name/li/libssh/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libssh";
-  version = "0.11.3";
+  version = "0.12.0";
 
   src = fetchurl {
     url = "https://www.libssh.org/files/${lib.versions.majorMinor finalAttrs.version}/libssh-${finalAttrs.version}.tar.xz";
-    hash = "sha256-fYoTYbsJTsP1EZZOeKWk26aJtZhuESr6vk9NDWxhJcM=";
+    hash = "sha256-Gmr0JNgyfl7t705f5/W5JCJt1hesnz3oDyF9gqNqcSE=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libtar/package.nix b/pkgs/by-name/li/libtar/package.nix
index 3611ddf6ae6e..bf7792bbd9e9 100644
--- a/pkgs/by-name/li/libtar/package.nix
+++ b/pkgs/by-name/li/libtar/package.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
+
   # libtar/Makefile.in hardcodes `INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s`,
   # which runs bare `strip` during `make install`. This fails in cross builds
   # where only the prefixed strip (e.g. aarch64-unknown-linux-gnu-strip) is
diff --git a/pkgs/by-name/li/libtrace/package.nix b/pkgs/by-name/li/libtrace/package.nix
index 587daf602726..64786e976743 100644
--- a/pkgs/by-name/li/libtrace/package.nix
+++ b/pkgs/by-name/li/libtrace/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libtrace";
-  version = "4.0.30-1";
+  version = "4.0.31-1";
 
   src = fetchFromGitHub {
     owner = "LibtraceTeam";
     repo = "libtrace";
     tag = finalAttrs.version;
-    hash = "sha256-zUSc/ZrXo1EV+XB2KYtNPZqd8GzmunO9rCjSKppMMcw=";
+    hash = "sha256-QsqJquBnhRf7OBOs6eWFo9WFF9J2Bw4zbX1/ooN43Xw=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/libtsm/package.nix b/pkgs/by-name/li/libtsm/package.nix
index f83c1082fba5..5cca1ae05a7b 100644
--- a/pkgs/by-name/li/libtsm/package.nix
+++ b/pkgs/by-name/li/libtsm/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libtsm";
-  version = "4.4.3";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "kmscon";
     repo = "libtsm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AKwS088lP3dByKh3dQRW76+L6ouD8EmVms2qWIC5IiE=";
+    hash = "sha256-5Lv/Hb0FGWARk3Wv3IuAbtCDII7qOMmcZSmKTkgTEsc=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/libunicode/package.nix b/pkgs/by-name/li/libunicode/package.nix
index 4d3713ef1d4f..255c97a81dbc 100644
--- a/pkgs/by-name/li/libunicode/package.nix
+++ b/pkgs/by-name/li/libunicode/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libunicode";
-  version = "0.7.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "contour-terminal";
     repo = "libunicode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J8qawT1oiUO9xTVEMQvsY0K2NtIfkUq9PoCbFt6wqek=";
+    hash = "sha256-EBu8zn5XritudZmBvQmjOmU08XLjhyKI6hVCrnWoR6k=";
   };
 
   # Fix: set_target_properties Can not find target to add properties to: Catch2, et al.
diff --git a/pkgs/by-name/li/libunicode/remove-target-properties.diff b/pkgs/by-name/li/libunicode/remove-target-properties.diff
index bd5ae9f46481..b9da1ef8ab3f 100644
--- a/pkgs/by-name/li/libunicode/remove-target-properties.diff
+++ b/pkgs/by-name/li/libunicode/remove-target-properties.diff
@@ -1,17 +1,17 @@
 diff --git a/src/libunicode/CMakeLists.txt b/src/libunicode/CMakeLists.txt
-index bb1a824..166834c 100644
+index 25abbd1..99f8b8d 100644
 --- a/src/libunicode/CMakeLists.txt
 +++ b/src/libunicode/CMakeLists.txt
-@@ -235,10 +235,10 @@ if(LIBUNICODE_TESTING)
-         # supress conversion warnings for Catch2
+@@ -317,10 +317,10 @@ if(LIBUNICODE_TESTING)
+     if(NOT Catch2_FOUND)
+         # Suppress all warnings for embedded third-party Catch2.
          # https://github.com/catchorg/Catch2/issues/2583
-         # https://github.com/SFML/SFML/blob/e45628e2ebc5843baa3739781276fa85a54d4653/test/CMakeLists.txt#L18-L22
--        set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF)
--        set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
+-        suppress_thirdparty_warnings(Catch2)
+-        suppress_thirdparty_warnings(Catch2WithMain)
 -        get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES)
 -        target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS})
-+        # set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF)
-+        # set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
++        # suppress_thirdparty_warnings(Catch2)
++        # suppress_thirdparty_warnings(Catch2WithMain)
 +        # get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES)
 +        # target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS})
      endif()
diff --git a/pkgs/by-name/li/libuv/package.nix b/pkgs/by-name/li/libuv/package.nix
index 8f840f9b4a79..804cb5b89134 100644
--- a/pkgs/by-name/li/libuv/package.nix
+++ b/pkgs/by-name/li/libuv/package.nix
@@ -24,14 +24,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.52.0";
+  version = "1.52.1";
   pname = "libuv";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-WyIBJjxsGo1sSjmbM1zRBF2cR97n6iSBK12FGbg73n0=";
+    hash = "sha256-Y9Nph2LkT1qnOYTW3WCumWWwORnI4P7HxzBjUlGaL7M=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libvmaf/package.nix b/pkgs/by-name/li/libvmaf/package.nix
index 7b841808b423..b3fc10510f58 100644
--- a/pkgs/by-name/li/libvmaf/package.nix
+++ b/pkgs/by-name/li/libvmaf/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  buildPackages,
   stdenv,
   fetchFromGitHub,
   ffmpeg-full,
@@ -8,7 +9,6 @@
   nasm,
   ninja,
   testers,
-  xxd,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     nasm
-    xxd
+    (buildPackages.callPackage ./xxd.nix { })
   ];
 
   postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD ''
diff --git a/pkgs/by-name/li/libvmaf/xxd.nix b/pkgs/by-name/li/libvmaf/xxd.nix
new file mode 100644
index 000000000000..d33517f3a042
--- /dev/null
+++ b/pkgs/by-name/li/libvmaf/xxd.nix
@@ -0,0 +1,20 @@
+# Minimal `xxd --include` replacement for embedding binary files as C arrays.
+# Used instead of tinyxxd to avoid ~22k rebuilds via libaom -> ffmpeg -> everything.
+{ writeShellScriptBin }:
+
+writeShellScriptBin "xxd" ''
+  if [ "$1" != "--include" ]; then
+    echo "xxd: only --include mode is supported" >&2
+    exit 1
+  fi
+  input="$2"
+  output="$3"
+  # Match real xxd behavior: derive variable name from the full path
+  varname=$(echo "$input" | sed 's/[^a-zA-Z0-9_]/_/g')
+  {
+    printf 'unsigned char %s[] = {\n' "$varname"
+    od -An -tx1 -v "$input" | sed 's/  */ /g; s/^ //; s/ $//; s/ /, 0x/g; s/^/  0x/; s/$/,/'
+    printf '};\n'
+    printf 'unsigned int %s_len = %d;\n' "$varname" "$(wc -c < "$input")"
+  } > "$output"
+''
diff --git a/pkgs/by-name/li/libxklavier/package.nix b/pkgs/by-name/li/libxklavier/package.nix
index 2c0dff5adffb..f506e8beb53b 100644
--- a/pkgs/by-name/li/libxklavier/package.nix
+++ b/pkgs/by-name/li/libxklavier/package.nix
@@ -20,14 +20,14 @@
   withDoc ? (stdenv.buildPlatform == stdenv.hostPlatform),
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libxklavier";
   version = "5.4";
 
   src = fetchgit {
     url = "https://gitlab.freedesktop.org/archived-projects/libxklavier.git";
-    rev = "${pname}-${version}";
-    sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a";
+    tag = "libxklavier-${finalAttrs.version}";
+    hash = "sha256-6uzfuVaQlnMMURIke+ZLqL0PhPEmCzx4bFR4+nItPfA=";
   };
 
   patches = [
@@ -58,6 +58,10 @@ stdenv.mkDerivation rec {
     isocodes
   ];
 
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
@@ -66,6 +70,8 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
+  strictDeps = true;
+
   preAutoreconf = ''
     export NOCONFIGURE=1
     gtkdocize
@@ -84,4 +90,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix
index 7e31c1aac735..85ef0f7499e1 100644
--- a/pkgs/by-name/li/libyang/package.nix
+++ b/pkgs/by-name/li/libyang/package.nix
@@ -9,7 +9,7 @@
 
   # dependencies
   pcre2,
-  xxHash,
+  xxhash,
 
   # update script
   gitUpdater,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    xxHash
+    xxhash
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/li/license-cli/package.nix b/pkgs/by-name/li/license-cli/package.nix
index b73874bb0efb..d82cc25f6e5a 100644
--- a/pkgs/by-name/li/license-cli/package.nix
+++ b/pkgs/by-name/li/license-cli/package.nix
@@ -5,6 +5,7 @@
   installShellFiles,
   scdoc,
   makeWrapper,
+  nix-update-script,
 
   # Script dependencies.
   fzf,
@@ -14,16 +15,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "license-cli";
-  version = "3.1.0";
+  version = "3.2.1";
 
   src = fetchFromSourcehut {
     owner = "~zethra";
     repo = "license";
     rev = finalAttrs.version;
-    hash = "sha256-OGS26mE5rjxlZOaBWhYc7C8aM3Lq2xX0f31LgckjJF8=";
+    hash = "sha256-eS4KuoUJA6e+Y6WNFCJTXgjV5t3Eh7wc2KvWi/+jCeI=";
   };
 
-  cargoHash = "sha256-Jvg3XndPyQ9TYejJaO7GAI9RwLAOWB0uapA+6WIKAkI=";
+  cargoHash = "sha256-7C/KAMBXbkxsjnkIJsGBOasOGGIXV8QhVEkkP+vseos=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -55,6 +56,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       }
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     homepage = "https://git.sr.ht/~zethra/license";
     description = "Command-line tool to easily add license to your project";
diff --git a/pkgs/by-name/li/lichess-bot/package.nix b/pkgs/by-name/li/lichess-bot/package.nix
index 89682bb3a99e..e6d069625ef4 100644
--- a/pkgs/by-name/li/lichess-bot/package.nix
+++ b/pkgs/by-name/li/lichess-bot/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "lichess-bot";
-  version = "2026.4.15.1";
+  version = "2026.4.20.1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "lichess-bot-devs";
     repo = "lichess-bot";
-    rev = "55200ddb52746b87cff3756526c96c8d4f05feb6";
-    hash = "sha256-HaVDUYEnS1ZC26AXr4CmKY4+1nr59w40+eGDgpOEsKA=";
+    rev = "98c2147b02af1482feb83174a623942f2c333e30";
+    hash = "sha256-ebHW96J6qAtgsVKtqmCNYP1XelYgIkBbl+GlU7ItZcY=";
   };
 
   propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/li/liferea/package.nix b/pkgs/by-name/li/liferea/package.nix
index 904c0af98d6e..beeee532908e 100644
--- a/pkgs/by-name/li/liferea/package.nix
+++ b/pkgs/by-name/li/liferea/package.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation rec {
   pname = "liferea";
-  version = "1.16.7";
+  version = "1.16.8";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-571mxEqnPVvuJ/r8hU4brtJhiVPxbBOPXhWL3XWmUTI=";
+    hash = "sha256-DCLWutoUp7tjPfDw1T/6l2tzk1ntDOBpyJxtD/Clhns=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/lightway/package.nix b/pkgs/by-name/li/lightway/package.nix
index 26d0ba9082dd..bd48ef60bcff 100644
--- a/pkgs/by-name/li/lightway/package.nix
+++ b/pkgs/by-name/li/lightway/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "lightway";
-  version = "0-unstable-2026-04-10";
+  version = "0-unstable-2026-04-24";
 
   src = fetchFromGitHub {
     owner = "expressvpn";
     repo = "lightway";
-    rev = "72a924935df9db641e7f4fe28cbeafaead59014f";
-    hash = "sha256-tygK2CQmbbynJiwGkMvYzt2dHoE17DCJeqD+jlai/m8=";
+    rev = "8e0940f047ee72db5daa1fb7c3bb82bc89e0f1d9";
+    hash = "sha256-OFMAEw613aIGG7N5LBAGbVrpkqMUBi7lUy7jm5tZowc=";
   };
 
-  cargoHash = "sha256-NdVOphyBW5sflv5jZPV/ShfAJXb3ZOyDRctmn/2JY38=";
+  cargoHash = "sha256-gY8KokOtdBT7Vq+lGn2sk4/o3A0TypEqv09TVJqaZjc=";
 
   cargoBuildFlags = lib.cli.toCommandLineGNU { } {
     package = [
diff --git a/pkgs/by-name/li/lilo/package.nix b/pkgs/by-name/li/lilo/package.nix
index ad0d366b5cda..9e7c74519222 100644
--- a/pkgs/by-name/li/lilo/package.nix
+++ b/pkgs/by-name/li/lilo/package.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation (finalAttrs: {
   # Workaround build failure on -fno-common toolchains:
   #   ld: identify.o:(.bss+0x0): multiple definition of `identify';
   #     common.o:(.bss+0x160): first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
+  # Without -std=gnu17, compilation fails with an error on incompatible pointer types
+  env.NIX_CFLAGS_COMPILE = "-fcommon -std=gnu17";
 
   makeFlags = [
     "DESTDIR=${placeholder "out"}"
diff --git a/pkgs/by-name/li/lilv/package.nix b/pkgs/by-name/li/lilv/package.nix
index 9431da915ed6..acc3ff565858 100644
--- a/pkgs/by-name/li/lilv/package.nix
+++ b/pkgs/by-name/li/lilv/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "lilv";
-  version = "0.26.2";
+  version = "0.26.4";
 
   outputs = [
     "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.drobilla.net/lilv-${version}.tar.xz";
-    hash = "sha256-nHEvfES6ix/b+buqeTu/doRL5As2HEMivapcTtNsa4k=";
+    hash = "sha256-HItfy3hxgXPmfXblGtQj9RE6n/aEY/JWYZWuRjlgieM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/lilypond-unstable/package.nix b/pkgs/by-name/li/lilypond-unstable/package.nix
index d0f46eca1787..d9900c23348a 100644
--- a/pkgs/by-name/li/lilypond-unstable/package.nix
+++ b/pkgs/by-name/li/lilypond-unstable/package.nix
@@ -7,11 +7,11 @@
 
 lilypond.overrideAttrs (
   finalAttrs: prevAttrs: {
-    version = "2.25.34";
+    version = "2.27.0";
 
     src = fetchzip {
       url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz";
-      hash = "sha256-UFuL8TZ7uLZhXgFoMGxAye04dNcvrw1gqQMOnE4P2fc=";
+      hash = "sha256-uZKpHmuYFkmj1kI+D09rPNLov83EO1QdXyUSSscBRPE=";
     };
 
     patches = [ ];
diff --git a/pkgs/by-name/li/lilypond/package.nix b/pkgs/by-name/li/lilypond/package.nix
index 0fad1654d612..7e1265019c13 100644
--- a/pkgs/by-name/li/lilypond/package.nix
+++ b/pkgs/by-name/li/lilypond/package.nix
@@ -41,12 +41,11 @@
     ]
   ),
   writeScript,
-  fetchpatch2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lilypond";
-  version = "2.24.4";
+  version = "2.26.0";
   outputs = [
     "out"
     "man"
@@ -54,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchzip {
     url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz";
-    hash = "sha256-UYdORvodrVchxslOxpMiXrAh7DtB9sWp9yqZU/jeB9Y=";
+    hash = "sha256-HUkPhaWNZ4UKbmlEyLXepHCFcgrdoRSDtjZMriO68RM=";
   };
 
   postInstall = ''
@@ -79,18 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "mem=mf2pt1" "mem=$PWD/mf/mf2pt1"
   '';
 
-  patches = [
-    # fixes #475503
-    # distilled version of https://gitweb.git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commit;h=f2192eb294e
-    # so, remove once that commit reaches a stable release
-    (fetchpatch2 {
-      name = "fix-clang-21-build.patch";
-      url = "https://cgit.freebsd.org/ports/plain/print/lilypond/files/patch-lily_include_smobs.hh?id=58bab68c706086774b17dcacc61c8fd37ecc8a15";
-      extraPrefix = ""; # adds old/new prefixes to process properly in patchPhase
-      hash = "sha256-nT8+nYU+m6lLTvHEvSIpG/yAwy1Omb6+4Z+NGwEVE4Q=";
-    })
-  ];
-
   strictDeps = true;
 
   depsBuildBuild = [
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/by-name/li/limesuite/package.nix
similarity index 100%
rename from pkgs/applications/radio/limesuite/default.nix
rename to pkgs/by-name/li/limesuite/package.nix
diff --git a/pkgs/by-name/li/limesuiteWithGui/package.nix b/pkgs/by-name/li/limesuiteWithGui/package.nix
new file mode 100644
index 000000000000..3c6de9daaaad
--- /dev/null
+++ b/pkgs/by-name/li/limesuiteWithGui/package.nix
@@ -0,0 +1,7 @@
+{
+  limesuite,
+}:
+
+limesuite.override {
+  withGui = true;
+}
diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index b24e31ee9e4a..184e64700b66 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -47,14 +47,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "11.4.0";
+  version = "12.0.2";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-2ZEZgQPznh7BvE5OLxno/4aH49tzME3ffuOENKQ8IaA=";
+    hash = "sha256-bHHBqQrQLY0J+8RkfS9qsyRGk4fw21xsb0nB2HVkKwg=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/li/linden-hill/package.nix b/pkgs/by-name/li/linden-hill/package.nix
index 07d41919b2c2..658d755dedbd 100644
--- a/pkgs/by-name/li/linden-hill/package.nix
+++ b/pkgs/by-name/li/linden-hill/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   stdenvNoCC,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation {
@@ -15,13 +16,7 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-EjXcLjzVQeOJgLxGua8t0oMc+APOsONGGpG6VJVCgFw=";
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    install -D -m444 -t $out/share/fonts/opentype $src/*.otf
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Digital version of Frederic Goudy’s Deepdene";
diff --git a/pkgs/by-name/li/linkding/package.nix b/pkgs/by-name/li/linkding/package.nix
new file mode 100644
index 000000000000..920942e394b6
--- /dev/null
+++ b/pkgs/by-name/li/linkding/package.nix
@@ -0,0 +1,301 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  fetchurl,
+  gcc,
+  icu,
+  nix-update-script,
+  nixosTests,
+  pkg-config,
+  python3,
+  sqlite,
+  stdenv,
+  uwsgi,
+}:
+let
+  version = "1.45.0";
+
+  python = python3.override {
+    self = python;
+    packageOverrides = final: prev: {
+      django = prev.django_6;
+    };
+  };
+
+  uwsgiWithPython = uwsgi.override {
+    plugins = [ "python3" ];
+    python3 = python;
+  };
+
+  # Compile the SQLite ICU extension for case-insensitive search and ordering.
+  # This mirrors the compile-icu stage in the upstream Dockerfile.
+  icuExtension = stdenv.mkDerivation {
+    pname = "linkding-sqlite-icu";
+    inherit version;
+
+    src = fetchurl {
+      url = "https://www.sqlite.org/src/raw/ext/icu/icu.c?name=91c021c7e3e8bbba286960810fa303295c622e323567b2e6def4ce58e4466e60";
+      name = "icu.c";
+      hash = "sha256-DkELE5p82yZVz0GVFdWWAEU8eo10ob0fqx66Q7rxv+U=";
+    };
+
+    nativeBuildInputs = [
+      gcc
+      pkg-config
+    ];
+
+    buildInputs = [
+      icu.dev
+      sqlite.dev
+    ];
+
+    dontUnpack = true;
+
+    buildPhase = ''
+      runHook preBuild
+      gcc -fPIC -shared $src \
+        -I${sqlite.dev}/include \
+        $(pkg-config --libs --cflags icu-uc icu-io) \
+        -o libicu.so
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm755 libicu.so $out/lib/libicu.so
+      runHook postInstall
+    '';
+  };
+in
+python.pkgs.buildPythonApplication (finalAttrs: {
+  pname = "linkding";
+  inherit version;
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sissbruecker";
+    repo = "linkding";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-iGvUKmOPL0akfR52hzSGH6wu06/WP9ygiQ/HxsmrYWg=";
+  };
+
+  __structuredAttrs = true;
+
+  build-system = with python.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python.pkgs; [
+    beautifulsoup4
+    bleach
+    bleach-allowlist
+    django
+    djangorestframework
+    huey
+    markdown
+    mozilla-django-oidc
+    requests
+    waybackpy
+  ];
+
+  optional-dependencies = {
+    postgres = with python.pkgs; [ psycopg ];
+  };
+
+  dontCheckRuntimeDeps = true;
+  # Django's runserver re-executes sys.argv[0] via the Python interpreter,
+  # so manage.py must remain a valid Python script and cannot be wrapped in bash.
+  dontWrapPythonPrograms = true;
+
+  pyprojectAppendix = ''
+    [tool.setuptools.packages.find]
+    include = ["bookmarks*"]
+    [tool.setuptools.package-data]
+    bookmarks = ["static/**/*", "styles/**/*", "templates/**/*", "version.txt"]
+  '';
+
+  ui = buildNpmPackage {
+    inherit (finalAttrs) version;
+
+    pname = "${finalAttrs.pname}-ui";
+    src = finalAttrs.src;
+
+    npmDepsHash = "sha256-zUMgl+h0BPm9QzGi1WZG8f0tDoYk8p+Al3q6uEKXqLk=";
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/bookmarks
+      mv bookmarks/static $out/bookmarks
+      runHook postInstall
+    '';
+  };
+
+  postPatch = ''
+    echo "$pyprojectAppendix" >> pyproject.toml
+
+    # Point the SQLite ICU extension to its store path so it is found
+    # regardless of the working directory at runtime.
+    substituteInPlace bookmarks/settings/base.py \
+      --replace-fail \
+        'SQLITE_ICU_EXTENSION_PATH = "./libicu.so"' \
+        'SQLITE_ICU_EXTENSION_PATH = "${icuExtension}/lib/libicu.so"'
+
+    # Allow overriding the data directory via an internal environment variable
+    # so that the NixOS module can point it at the mutable state directory
+    # (/var/lib/linkding). The variable name is intentionally NixOS-specific
+    # and not a real linkding option to avoid confusing users.
+    substituteInPlace bookmarks/settings/base.py \
+      --replace-fail \
+        'BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))' \
+            'BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))''\nDATA_DIR = os.getenv("_NIXOS_LINKDING_DATA_DIR", os.path.join(os.getcwd(), "data"))'
+
+    substituteInPlace bookmarks/settings/base.py \
+      --replace-fail \
+        '"filename": os.path.join(BASE_DIR, "data", "tasks.sqlite3"),' \
+        '"filename": os.path.join(DATA_DIR, "tasks.sqlite3"),'
+
+    substituteInPlace bookmarks/settings/base.py \
+      --replace-fail \
+        '"NAME": os.path.join(BASE_DIR, "data", "db.sqlite3"),' \
+        '"NAME": os.path.join(DATA_DIR, "db.sqlite3"),'
+
+    substituteInPlace bookmarks/settings/base.py \
+      --replace-fail \
+        'LD_FAVICON_FOLDER = os.path.join(BASE_DIR, "data", "favicons")' \
+        'LD_FAVICON_FOLDER = os.path.join(DATA_DIR, "favicons")'
+
+    substituteInPlace bookmarks/settings/base.py \
+      --replace-fail \
+        'LD_PREVIEW_FOLDER = os.path.join(BASE_DIR, "data", "previews")' \
+        'LD_PREVIEW_FOLDER = os.path.join(DATA_DIR, "previews")'
+
+    substituteInPlace bookmarks/settings/base.py \
+      --replace-fail \
+        'LD_ASSET_FOLDER = os.path.join(BASE_DIR, "data", "assets")' \
+        'LD_ASSET_FOLDER = os.path.join(DATA_DIR, "assets")'
+
+    substituteInPlace bookmarks/utils.py \
+      --replace-fail \
+        'import datetime' \
+        'import datetime''\nimport os'
+
+    substituteInPlace bookmarks/utils.py \
+      --replace-fail \
+        'with open("version.txt") as f:' \
+        'with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "version.txt")) as f:'
+
+    substituteInPlace bookmarks/settings/prod.py \
+      --replace-fail \
+        'with open(os.path.join(BASE_DIR, "data", "secretkey.txt")) as f:' \
+        'with open(os.path.join(DATA_DIR, "secretkey.txt")) as f:'
+
+    substituteInPlace bookmarks/settings/dev.py \
+      --replace-fail \
+        'os.path.join(BASE_DIR, "data", "favicons"),' \
+        'os.path.join(DATA_DIR, "favicons"),'
+
+    substituteInPlace bookmarks/settings/dev.py \
+      --replace-fail \
+        'os.path.join(BASE_DIR, "data", "previews"),' \
+        'os.path.join(DATA_DIR, "previews"),'
+
+    # Patch management commands that bypass Django settings and use hardcoded
+    # relative "data/" paths. Replace them with paths derived from DATA_DIR
+    # via django.conf.settings so the data directory is always correct.
+    substituteInPlace bookmarks/management/commands/generate_secret_key.py \
+      --replace-fail \
+        'from django.core.management.utils import get_random_secret_key' \
+        'from django.conf import settings''\nfrom django.core.management.utils import get_random_secret_key'
+    substituteInPlace bookmarks/management/commands/generate_secret_key.py \
+      --replace-fail \
+        'secret_key_file = os.path.join("data", "secretkey.txt")' \
+        'secret_key_file = os.path.join(settings.DATA_DIR, "secretkey.txt")'
+    substituteInPlace bookmarks/management/commands/migrate_tasks.py \
+      --replace-fail \
+        'import sqlite3' \
+        'import sqlite3''\nfrom django.conf import settings'
+    substituteInPlace bookmarks/management/commands/migrate_tasks.py \
+      --replace-fail \
+        'db = sqlite3.connect(os.path.join("data", "db.sqlite3"))' \
+        'db = sqlite3.connect(os.path.join(settings.DATA_DIR, "db.sqlite3"))'
+
+    # Place the version.txt file inside of the bookmarks package
+    # so that it can be installed by setuptools alongside the package
+    # in the Nix store.
+    mv version.txt bookmarks/version.txt
+  '';
+
+  preBuild = ''
+    cp -r ${finalAttrs.ui}/bookmarks/static/* bookmarks/static
+  '';
+
+  # Collect static files at build time so the result is a pure store path
+  # that can be served directly by the NixOS module without any runtime step.
+  # STATIC_ROOT in base.py defaults to $PWD/static, so the collected files
+  # land there and are picked up by postInstall.
+  postBuild = ''
+    mkdir data
+    ${python.interpreter} manage.py collectstatic --no-input
+  '';
+
+  postInstall =
+    let
+      pythonPath = python.pkgs.makePythonPath finalAttrs.passthru.dependencies;
+    in
+    ''
+      mkdir $out/bin
+
+      cp -r static/* $out/${python.sitePackages}/bookmarks/static
+
+      cp ./manage.py $out/bin/.manage.py
+      chmod +x $out/bin/.manage.py
+
+      makeWrapper $out/bin/.manage.py $out/bin/linkding \
+        --prefix PYTHONPATH : "${pythonPath}:$out/${python.sitePackages}"
+
+      # Bootstrap script mirroring the upstream bootstrap.sh: creates data
+      # directories and runs Django management commands to initialize a fresh
+      # linkding installation. The linkding binary is referenced by its
+      # absolute store path so the script works without PATH manipulation.
+      cat > $out/bin/linkding-bootstrap << EOF
+      #!/bin/sh
+      DATA_DIR="\''${_NIXOS_LINKDING_DATA_DIR:-data}"
+      mkdir -p "\$DATA_DIR"/favicons "\$DATA_DIR"/previews "\$DATA_DIR"/assets
+      $out/bin/linkding generate_secret_key
+      $out/bin/linkding migrate
+      $out/bin/linkding enable_wal
+      $out/bin/linkding create_initial_superuser
+      $out/bin/linkding migrate_tasks
+      EOF
+      chmod +x $out/bin/linkding-bootstrap
+    '';
+
+  passthru = {
+    inherit
+      python
+      icuExtension
+      uwsgiWithPython
+      ;
+    tests = {
+      inherit (nixosTests) linkding linkding-postgres;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "ui"
+      ];
+    };
+  };
+
+  meta = {
+    description = "Self-hosted bookmark manager designed to be minimal, fast, and easy to set up";
+    homepage = "https://linkding.link/";
+    changelog = "https://github.com/sissbruecker/linkding/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      squat
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix
index e6ddec6fea02..6b1d1f5afbb2 100644
--- a/pkgs/by-name/li/lintspec/package.nix
+++ b/pkgs/by-name/li/lintspec/package.nix
@@ -9,6 +9,7 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lintspec";
   version = "0.16.0";
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "beeb";
@@ -23,6 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "lintspec"
   ];
 
+  strictDeps = true;
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd lintspec \
diff --git a/pkgs/by-name/li/linux-libertine-g/package.nix b/pkgs/by-name/li/linux-libertine-g/package.nix
index 8dd8252d10ae..2e060c39263c 100644
--- a/pkgs/by-name/li/linux-libertine-g/package.nix
+++ b/pkgs/by-name/li/linux-libertine-g/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchzip,
+  installFonts,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -13,10 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-UGTB7jsI6peivCtEt96RCSi5XHCrnjCSs0Ud5bF7uxk=";
   };
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp -r *.ttf $out/share/fonts/truetype
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Graphite versions of Linux Libertine and Linux Biolinum font families for LibreOffice and OpenOffice.org";
diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix
index 18659810314c..b8ebb0bcf60e 100644
--- a/pkgs/by-name/li/linyaps/package.nix
+++ b/pkgs/by-name/li/linyaps/package.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "linyaps";
-  version = "1.12.1";
+  version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "OpenAtom-Linyaps";
     repo = finalAttrs.pname;
     tag = finalAttrs.version;
-    hash = "sha256-hNXpJCz7px8uw2mbBhou3+Gb5InlMXJT2PjWmUycX5A=";
+    hash = "sha256-Pm0ijMAwDiQpotxuAgrCXiA3Z0FCejsqYIJ89/GKR9o=";
   };
 
   patches = [
diff --git a/pkgs/by-name/li/liquidsoap/package.nix b/pkgs/by-name/li/liquidsoap/package.nix
index 5eec38b5de54..79efc4495c76 100644
--- a/pkgs/by-name/li/liquidsoap/package.nix
+++ b/pkgs/by-name/li/liquidsoap/package.nix
@@ -11,13 +11,13 @@
   bubblewrap,
   curl,
   dune,
-  ffmpeg_6-full,
+  ffmpeg_8-full,
   yt-dlp,
   runtimePackages ? [
     awscli2
     bubblewrap
     curl
-    ffmpeg_6-full
+    ffmpeg_8-full
     yt-dlp
   ],
 }:
@@ -26,13 +26,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "liquidsoap";
-  version = "2.4.2";
+  version = "2.4.4";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "liquidsoap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ViJlG+AUncL37mltlFFXVho98Up11qZI3wwSnrd9C8g=";
+    hash = "sha256-uRqYyxLF6PuSDvbL77qn2PvttqqM9S00BjcaKUFxlQw=";
   };
 
   postPatch = ''
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    dune build
+    dune build --release @install
 
     runHook postBuild
   '';
@@ -87,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
 
     # Mandatory dependencies
+    ocamlPackages.domain_shims
     ocamlPackages.dtools
     ocamlPackages.duppy
     ocamlPackages.mm
diff --git a/pkgs/by-name/li/lisette/package.nix b/pkgs/by-name/li/lisette/package.nix
index f1831e26b189..6de83752508d 100644
--- a/pkgs/by-name/li/lisette/package.nix
+++ b/pkgs/by-name/li/lisette/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lisette";
-  version = "0.1.9";
+  version = "0.1.23";
 
   src = fetchFromGitHub {
     owner = "ivov";
     repo = "lisette";
     tag = "lisette-v${finalAttrs.version}";
-    hash = "sha256-9fjnYYoW3wwoJ+YV89dThSlWljNG6Jaa51PMc5DqtFI=";
+    hash = "sha256-sSNQKVfclSXXt1hp1AVBUKAjLhG9RSKxpoC8zWvOSz4=";
   };
 
-  cargoHash = "sha256-XOMr8oDV82BgXfLc8oHqm8WAvmEHJjFGVmprxvso1cE=";
+  cargoHash = "sha256-MlRx0lXuGyz7P8DT2tCsxVQ/W5P+W5+8YBt43wTz2IE=";
 
   preCheck = ''
     export NO_COLOR=true
diff --git a/pkgs/by-name/li/litecli/package.nix b/pkgs/by-name/li/litecli/package.nix
index d34e2c998601..f865ba5927ee 100644
--- a/pkgs/by-name/li/litecli/package.nix
+++ b/pkgs/by-name/li/litecli/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "litecli";
-  version = "1.12.3";
+  version = "1.17.1";
 
   pyproject = true;
 
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "dbcli";
     repo = "litecli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-TPwzXfb4n6wTe6raQ5IowKdhGkKrf2pmSS2+Q03NKYk=";
+    hash = "sha256-YSPNtDL5rNgRh5lJBKfL1jjWemlmf3eesBMSLyJVRLY=";
   };
 
   dependencies =
@@ -31,6 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   build-system = with python3Packages; [
     setuptools
+    setuptools-scm
   ];
 
   nativeCheckInputs = with python3Packages; [
diff --git a/pkgs/by-name/li/liteparse/package.nix b/pkgs/by-name/li/liteparse/package.nix
index 66033f300268..cb46908b048e 100644
--- a/pkgs/by-name/li/liteparse/package.nix
+++ b/pkgs/by-name/li/liteparse/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "liteparse";
-  version = "1.4.6";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "run-llama";
     repo = "liteparse";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GUtqJsmAOrbxLc/aAIre95QD6aaFsj5ClqZfo7jdwB4=";
+    hash = "sha256-e3c8ak4kww8vQDfYT8S9m7Tv7vnBiox2qaI73yUb23U=";
   };
 
-  npmDepsHash = "sha256-Wz46n7BbubC3Cq1CHOHM2q/dVOvOVNQTloHZfkAwzpg=";
+  npmDepsHash = "sha256-KhtwPl1J9ZZMT9xT5bQJjPa3fYTvi9oRnxijCm0o+2c=";
   npmBuildScript = "build";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
diff --git a/pkgs/by-name/li/literata/package.nix b/pkgs/by-name/li/literata/package.nix
index 260bef3f40eb..456ef1c3d8ae 100644
--- a/pkgs/by-name/li/literata/package.nix
+++ b/pkgs/by-name/li/literata/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "literata";
@@ -13,14 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     stripRoot = false;
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/fonts/truetype
-    find . -name "*.ttf" -exec cp {} "$out/share/fonts/truetype/" \;
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     description = "Serif typeface designed for ebooks and optimized for reading";
diff --git a/pkgs/by-name/li/littlegptracker/package.nix b/pkgs/by-name/li/littlegptracker/package.nix
index 885772e4d402..a021d05fa800 100644
--- a/pkgs/by-name/li/littlegptracker/package.nix
+++ b/pkgs/by-name/li/littlegptracker/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "djdiskmachine";
     repo = "littlegptracker";
     tag = finalAttrs.version;
-    hash = "sha256-SidrFsqAn0JQqthEoYA9H0RdF6jeCeP2Pe+UpAbbL48=";
+    hash = "sha256-j6r2iFJ3YJ3XOHwn/ENQmpZyIdMAdrWXd+EO3EWIBCw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/livegrep/livegrep-Use-patched-rules_js-and-nodejs-from-nixpkgs.patch b/pkgs/by-name/li/livegrep/livegrep-Use-patched-rules_js-and-nodejs-from-nixpkgs.patch
new file mode 100644
index 000000000000..e7b79f2523de
--- /dev/null
+++ b/pkgs/by-name/li/livegrep/livegrep-Use-patched-rules_js-and-nodejs-from-nixpkgs.patch
@@ -0,0 +1,53 @@
+Subject: [PATCH] Use patched rules_js and Nix-provided nodejs
+
+By default aspect_rules_js brings a precompiled nodejs which uses a 
+non-nixpkgs dynamic linker. Instead use nodejs from nixpkgs. This
+requires a patched rules_js as specifying npm_path fails otherwise
+(see the rules_js patch).
+
+We also require a patched rules_js because it otherwise generates and
+immediately executes scripts with `#!/usr/bin/env bash`.
+
+---
+ MODULE.bazel                   |  4 ++++
+ nixpkgs-toolchains/BUILD.bazel | 13 +++++++++++++
+ 2 files changed, 17 insertions(+)
+ create mode 100644 nixpkgs-toolchains/BUILD.bazel
+
+diff --git a/MODULE.bazel b/MODULE.bazel
+index 4df2a500..b7525996 100644
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -35,6 +35,10 @@ use_repo(
+ )
+ 
+ bazel_dep(name = "aspect_rules_js", version = "2.4.0")
++local_path_override(module_name = "aspect_rules_js", path = "@rules_js@")
++
++bazel_dep(name = "rules_nodejs", version = "6.3.0")
++register_toolchains("//nixpkgs-toolchains:nixpkgs_nodejs_toolchain")
+ 
+ npm = use_extension(
+     "@aspect_rules_js//npm:extensions.bzl",
+diff --git a/nixpkgs-toolchains/BUILD.bazel b/nixpkgs-toolchains/BUILD.bazel
+new file mode 100644
+index 00000000..3b8a7940
+--- /dev/null
++++ b/nixpkgs-toolchains/BUILD.bazel
+@@ -0,0 +1,13 @@
++load("@rules_nodejs//nodejs:toolchain.bzl", "nodejs_toolchain")
++
++nodejs_toolchain(
++    name = "node_toolchain",
++    node_path = "@nodejs@/bin/node",
++    npm_path = "@nodejs@/bin/npm",
++)
++
++toolchain(
++    name = "nixpkgs_nodejs_toolchain",
++    toolchain = ":node_toolchain",
++    toolchain_type = "@rules_nodejs//nodejs:toolchain_type",
++)
+-- 
+2.53.0
+
diff --git a/pkgs/by-name/li/livegrep/package.nix b/pkgs/by-name/li/livegrep/package.nix
new file mode 100644
index 000000000000..f2b8d4a47463
--- /dev/null
+++ b/pkgs/by-name/li/livegrep/package.nix
@@ -0,0 +1,157 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildBazelPackage,
+  bazel_7,
+  nix-update-script,
+  applyPatches,
+  nodejs,
+  cctools,
+}:
+let
+  cc_tools = [
+    "codesearch"
+    "analyze-re"
+    "dump-file"
+    "inspect-index"
+  ];
+
+  go_tools = [
+    "livegrep"
+    "lg"
+    "livegrep-fetch-reindex"
+    "livegrep-github-reindex"
+    "livegrep-reload"
+  ];
+
+  registry = fetchFromGitHub {
+    owner = "bazelbuild";
+    repo = "bazel-central-registry";
+    rev = "0f256a72067e42d62bb568cc2619f98deed139e2";
+    hash = "sha256-OcMLg0KiAQOJZLH8r+QkeQ9bxcEc4L0dCgyUv5PkLQk=";
+  };
+
+  rules_js = applyPatches {
+    src = fetchFromGitHub {
+      owner = "aspect-build";
+      repo = "rules_js";
+      rev = "v2.4.0";
+      hash = "sha256-Z0Oq5FQ26KS+tLwawXs2Jgox0Cau4E76IwzNKyTK0Tk=";
+    };
+
+    patches = [
+      ./rule-js-Fix-toolchain-with-npm_path.patch
+    ];
+
+    postPatch = ''
+      patchShebangs --build \
+        npm/private/lifecycle/bundle.sh \
+        npm/private/lifecycle/min/node-gyp-bin/node-gyp \
+        npm/private/noop.sh \
+        npm/private/versions_mirror.sh \
+        js/private/node_wrapper.sh \
+        js/private/npm_wrapper.sh
+
+      substituteInPlace \
+        npm/private/utils.bzl \
+        npm/private/lifecycle/lifecycle-hooks.js \
+        npm/private/lifecycle/min/index.min.js \
+        js/private/js_binary.sh.tpl \
+        --replace-fail '#!/usr/bin/env bash' "#!$(type -p bash)"
+    '';
+  };
+
+  bazelDepsHashByBuildAndHost = {
+    x86_64-linux.x86_64-linux = "sha256-PastkoOioWqlmGFHZiZ2S1ahWZu1UBhqHIfD2M/ff6A=";
+    aarch64-linux.aarch64-linux = "sha256-mNWnpmk/dNQYKnP3YbfK5ott0+41I+49aH6RhWEMOGM=";
+  };
+  bazelDepsHashByHost = bazelDepsHashByBuildAndHost.${stdenv.buildPlatform.system} or { };
+  bazelDepsHash = bazelDepsHashByHost.${stdenv.hostPlatform.system} or "";
+in
+buildBazelPackage {
+  pname = "livegrep";
+  version = "2026-02-10";
+
+  src = fetchFromGitHub {
+    owner = "livegrep";
+    repo = "livegrep";
+    rev = "923d5ad71dfe60900e6c2017b2fa4a5ff902ad71";
+    hash = "sha256-SYbJJuUX13otaGRsYLTp6XWU3BBNmtNIpUxyu11U+b0=";
+  };
+
+  patches = [
+    ./livegrep-Use-patched-rules_js-and-nodejs-from-nixpkgs.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace nixpkgs-toolchains/BUILD.bazel --subst-var-by nodejs "${nodejs}"
+    substituteInPlace MODULE.bazel --subst-var-by rules_js "${rules_js}"
+  '';
+
+  bazelFlags = [
+    "--registry"
+    "file://${registry}"
+  ];
+
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    LIBTOOL = "${cctools}/bin/libtool";
+  };
+
+  fetchAttrs = {
+    preInstall = ''
+      # Avoid bash and $out store paths leaking into the fixed-output derivation
+      rm $bazelOut/external/aspect_rules_js~~npm~npm/_exists.sh
+      rm -r $bazelOut/external/rules_shell~~sh_configure~local_config_shell
+
+      # Remove some non-reproducible and unused files
+      rm -r $bazelOut/external/gazelle~~non_module_deps~bazel_gazelle_go_repository_cache
+      rm -r $bazelOut/external/gazelle~~non_module_deps~bazel_gazelle_go_repository_tools
+    '';
+
+    hash = bazelDepsHash;
+  };
+
+  bazel = bazel_7;
+
+  bazelBuildFlags = [ "-c opt" ];
+  bazelTargets =
+    (builtins.map (tool: "//src/tools:${tool}") cc_tools)
+    ++ (builtins.map (tool: "//cmd/${tool}") go_tools);
+
+  buildAttrs = {
+    installPhase = ''
+      pushd "bazel-bin/src/tools"
+      install -Dt "$out/bin" ${builtins.toString cc_tools}
+      popd
+
+      for go_tool in ${builtins.toString go_tools}; do
+        install -D -t "$out/bin" "bazel-bin/cmd/$go_tool/''${go_tool}_/$go_tool"
+      done
+
+      mkdir -p "$out/bin/livegrep.runfiles/com_github_livegrep_livegrep"
+      cp -Lr "bazel-bin/cmd/livegrep/livegrep_/livegrep.runfiles/_main/web" "$out/bin/livegrep.runfiles/com_github_livegrep_livegrep"
+    '';
+  };
+
+  passthru = {
+    inherit rules_js;
+    updateScript = nix-update-script { };
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Livegrep is a tool, partially inspired by Google Code Search, for interactive regex search of ~gigabyte-scale source repositories.";
+    homepage = "http://livegrep.com/";
+    downloadPage = "https://github.com/livegrep/livegrep";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ nicolas-guichard ];
+    mainProgram = "livegrep";
+    badPlatforms = [
+      # Error in fail: Unable to find a CC toolchain using toolchain resolution
+      lib.systems.inspect.patterns.isDarwin
+    ];
+  };
+}
diff --git a/pkgs/by-name/li/livegrep/rule-js-Fix-toolchain-with-npm_path.patch b/pkgs/by-name/li/livegrep/rule-js-Fix-toolchain-with-npm_path.patch
new file mode 100644
index 000000000000..5ffa80f103ac
--- /dev/null
+++ b/pkgs/by-name/li/livegrep/rule-js-Fix-toolchain-with-npm_path.patch
@@ -0,0 +1,26 @@
+Subject: [PATCH] Fix for toolchain with npm_path
+
+When specifying a toolchain with a npm_path, transitive_launcher_files
+is None which leads to an error here.
+
+Instead, don't set transitive_files at all.
+
+---
+ js/private/js_binary.bzl | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/js/private/js_binary.bzl b/js/private/js_binary.bzl
+index 37627809..29e3bf62 100644
+--- a/js/private/js_binary.bzl
++++ b/js/private/js_binary.bzl
+@@ -555,7 +555,6 @@ def _create_launcher(ctx, log_prefix_rule_set, log_prefix_rule, fixed_args = [],
+         include_npm_sources = ctx.attr.include_npm_sources,
+     ).merge(ctx.runfiles(
+         files = launcher_files,
+-        transitive_files = transitive_launcher_files,
+     ))
+ 
+     return struct(
+-- 
+2.53.0
+
diff --git a/pkgs/by-name/li/livekit-ingress/package.nix b/pkgs/by-name/li/livekit-ingress/package.nix
index 72efa9ad229f..8d25c88b6d37 100644
--- a/pkgs/by-name/li/livekit-ingress/package.nix
+++ b/pkgs/by-name/li/livekit-ingress/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "livekit-ingress";
-  version = "1.4.3";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "ingress";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gt1oIAKEBwQWqDCLSsRgoe7oIk5jDNReN+dFYUNnRUc=";
+    hash = "sha256-Xg69NfsEWJEJcRcLBkMgBmCEIVhSe1wjxWxBbO1k1e0=";
   };
 
-  vendorHash = "sha256-fttI+xNzHiDWKGkl20oGJOcWffElmmqNd7gbb5FiQZc=";
+  vendorHash = "sha256-n8QT+wRCxFq9vcclsOnLjc0NG2NJTgo2ouqXedSdKvQ=";
 
   subPackages = [ "cmd/server" ];
 
diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix
index 44c019d9b691..94bb93e10664 100644
--- a/pkgs/by-name/lk/lk-jwt-service/package.nix
+++ b/pkgs/by-name/lk/lk-jwt-service/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "lk-jwt-service";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "lk-jwt-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ThmQeXSzjpfPbgjvBITtracM4Hdx3gJbqhwk2OC7Y54=";
+    hash = "sha256-BwFcknSXC3uZfSlS0a420/WpUn/ji2m9x65zKi3bumE=";
   };
 
   vendorHash = "sha256-1D04GhXhGrOcRn8G+xY+3XEdgUBSWHis4DiKQ4gGNDw=";
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 1d55ec4165a8..57dc752361c1 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -78,7 +78,7 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "8770";
+  version = "8983";
 
   outputs = [
     "out"
@@ -89,7 +89,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-f2LQzQkv5UymRzqtdbgmVTlA8gdpwXu7H7pRyKGzlzk=";
+    hash = "sha256-v73SfPbzzLBNWyan1dsAnDc2dfSem36zyeGLen5t4KI=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -121,7 +121,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     ++ [ openssl ];
 
   npmRoot = "tools/server/webui";
-  npmDepsHash = "sha256-RAFtsbBGBjteCt5yXhrmHL39rIDJMCFBETgzId2eRRk=";
+  npmDepsHash = "sha256-iYJB0z2YHG8OzEA9EwHUZrDa5obr5m2sbnIH+of28o0=";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src patches;
diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix
index cb045d149a1e..c44993bd10a8 100644
--- a/pkgs/by-name/ll/llama-swap/package.nix
+++ b/pkgs/by-name/ll/llama-swap/package.nix
@@ -17,7 +17,7 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "llama-swap";
-  version = "199";
+  version = "204";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     owner = "mostlygeek";
     repo = "llama-swap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tAWXhfOWPLBuEgd+32CbuIkn1hN+4VI4xkyx7E2a81I=";
+    hash = "sha256-vgtPqgPWU3LWokGvbisbajyXkB5Sg5khncG0D20f6lY=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-XiDYlw/byu8CWvg4KSPC7m8PGCZXtp08Y1velx4BR8U=";
+  vendorHash = "sha256-bgDrXNuudKhdwOCBLodG1cTLSRKban+69wA9hWEKkoI=";
 
   passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; };
 
diff --git a/pkgs/by-name/ll/llama-swap/ui.nix b/pkgs/by-name/ll/llama-swap/ui.nix
index 93b20921877d..7edfd06d42f4 100644
--- a/pkgs/by-name/ll/llama-swap/ui.nix
+++ b/pkgs/by-name/ll/llama-swap/ui.nix
@@ -7,7 +7,7 @@
 buildNpmPackage (finalAttrs: {
   pname = "${llama-swap.pname}-ui";
   inherit (llama-swap) version src;
-  npmDepsHash = "sha256-gTDsuWPLCWsPltioziygFmSQFdLqjkZpmmVWIWoZwoc=";
+  npmDepsHash = "sha256-6D4F58sSBkr7FKKO34gDhnZ9uN/SfsyYn1xJjYsMeq4=";
 
   postPatch = ''
     substituteInPlace vite.config.ts \
diff --git a/pkgs/by-name/ll/llhttp/package.nix b/pkgs/by-name/ll/llhttp/package.nix
index 8c6b30e0230b..eab40942b392 100644
--- a/pkgs/by-name/ll/llhttp/package.nix
+++ b/pkgs/by-name/ll/llhttp/package.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
-    (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
+    (lib.cmakeBool "LLHTTP_BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "LLHTTP_BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
   ];
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/by-name/ll/llmfit/package.nix b/pkgs/by-name/ll/llmfit/package.nix
index 6fbb2aa97281..32aac6b8f44c 100644
--- a/pkgs/by-name/ll/llmfit/package.nix
+++ b/pkgs/by-name/ll/llmfit/package.nix
@@ -6,21 +6,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "llmfit";
-  version = "0.9.8";
+  version = "0.9.18";
 
   src = fetchFromGitHub {
     owner = "AlexsJones";
     repo = "llmfit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hD/9Q/VChQZBVYH4c7rMdIoTsM11TgYO+OSDs2W7aKM=";
+    hash = "sha256-0NswrJNA6IPqL5RaZyVyMc4p6UI7ZiWnjlnyTC4nW6o=";
   };
 
-  cargoHash = "sha256-BrydHdtiMklC8OZ+FzDg88v+i2/plPyX9eTYprtqNnM=";
+  cargoHash = "sha256-pI3n53GSyM/HDyZ4frFzDENthupmCMC2aQOERVBMUJ4=";
 
   meta = {
-    description = "Find what runs on your hardware";
+    description = "TUI to find LLM models right sized for the system's RAM, CPU, and GPU";
     homepage = "https://github.com/AlexsJones/llmfit";
-    changelog = "https://github.com/AlexsJones/llmfit/releases/tag/v${finalAttrs.src.rev}";
+    changelog = "https://github.com/AlexsJones/llmfit/blob/v${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       matthiasbeyer
diff --git a/pkgs/by-name/ll/llmserve/package.nix b/pkgs/by-name/ll/llmserve/package.nix
new file mode 100644
index 000000000000..e9f04e89a190
--- /dev/null
+++ b/pkgs/by-name/ll/llmserve/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "llmserve";
+  version = "0.0.8";
+
+  src = fetchFromGitHub {
+    owner = "AlexsJones";
+    repo = "llmserve";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-j4ko8AkrIOWlM1Tkl/pGMI1PzQc6yImCAZXEmO/NBko=";
+  };
+
+  cargoHash = "sha256-jwCQSm4k1YofCn2r5IX+knXbTo70bsAVHIxojeLpkqI=";
+
+  __structuredAttrs = true;
+  __darwinAllowLocalNetworking = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "TUI for serving local LLM models";
+    homepage = "https://github.com/AlexsJones/llmserve";
+    changelog = "https://github.com/AlexsJones/llmserve/blob/v${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ afh ];
+    mainProgram = "llmserve";
+  };
+})
diff --git a/pkgs/by-name/lm/lmms-full/package.nix b/pkgs/by-name/lm/lmms-full/package.nix
new file mode 100644
index 000000000000..20ba81e4a1ac
--- /dev/null
+++ b/pkgs/by-name/lm/lmms-full/package.nix
@@ -0,0 +1,8 @@
+{ lmms }:
+
+lmms.override {
+  withSoundio = true;
+  withPortAudio = true;
+  withSndio = true;
+  withWine = true;
+}
diff --git a/pkgs/by-name/lm/lmms/0001-fix-add-unique-string-to-FindWine-for-replacement-in.patch b/pkgs/by-name/lm/lmms/0001-fix-add-unique-string-to-FindWine-for-replacement-in.patch
new file mode 100644
index 000000000000..50683962ef4b
--- /dev/null
+++ b/pkgs/by-name/lm/lmms/0001-fix-add-unique-string-to-FindWine-for-replacement-in.patch
@@ -0,0 +1,38 @@
+From 9d05021c4e9370f7e1b8c7595a18ae2b98895a60 Mon Sep 17 00:00:00 2001
+From: "Alexandre Cavalheiro S. Tiago da Silva" <contact@thewizard.link>
+Date: Tue, 28 Jan 2025 18:36:47 -0300
+Subject: [PATCH] fix!: add unique string to FindWine for replacement in nixos
+
+---
+ cmake/modules/FindWine.cmake | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cmake/modules/FindWine.cmake b/cmake/modules/FindWine.cmake
+index eeef8d9c2..c04ee4a35 100644
+--- a/cmake/modules/FindWine.cmake
++++ b/cmake/modules/FindWine.cmake
+@@ -13,6 +13,13 @@
+ #  WINE_64_FLAGS - 64-bit linker flags
+ #
+ 
++set(WINE_INCLUDE_DIR @WINE_LOCATION@/include)
++set(WINE_BUILD @WINE_LOCATION@/bin/winebuild)
++set(WINE_CXX @WINE_LOCATION@/bin/wineg++)
++set(WINE_GCC @WINE_LOCATION@/bin/winegcc)
++set(WINE_32_LIBRARY_DIRS @WINE_LOCATION@/lib/wine/i386-unix)
++set(WINE_64_LIBRARY_DIRS @WINE_LOCATION@/lib/wine/x86_64-unix)
++
+ MACRO(_findwine_find_flags output expression result)
+ 	STRING(REPLACE " " ";" WINEBUILD_FLAGS "${output}")
+ 	FOREACH(FLAG ${WINEBUILD_FLAGS})
+@@ -32,6 +39,7 @@ ENDMACRO()
+ 
+ # Prefer newest wine first
+ list(APPEND WINE_LOCATIONS
++	@WINE_LOCATION@
+ 	/opt/wine-staging
+ 	/opt/wine-devel
+ 	/opt/wine-stable
+-- 
+2.47.1
+
diff --git a/pkgs/by-name/lm/lmms/0002-fix-gigplayer-linking.patch b/pkgs/by-name/lm/lmms/0002-fix-gigplayer-linking.patch
new file mode 100644
index 000000000000..6276f0d3b4db
--- /dev/null
+++ b/pkgs/by-name/lm/lmms/0002-fix-gigplayer-linking.patch
@@ -0,0 +1,49 @@
+Use modern CMake imported target for libgig to ensure proper RPATH propagation.
+
+The old-style link_directories()/link_libraries() pattern does not propagate
+library paths to the install RPATH, causing libgig.so to not be found at
+runtime when it is installed in a non-standard directory (e.g. lib/libgig/).
+
+Using IMPORTED_TARGET with pkg_check_modules creates a PkgConfig::GIG target
+that carries include dirs, library paths, and link flags, and CMake correctly
+propagates these to the install RPATH via target_link_libraries().
+
+Also set CMAKE_INSTALL_RPATH_USE_LINK_PATH in the GigPlayer scope, since the
+upstream code only sets it in src/CMakeLists.txt which does not apply to the
+sibling plugins/ directory.
+
+diff -ruN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -550,7 +550,7 @@
+ 
+ # check for libgig
+ If(WANT_GIG)
+-	PKG_CHECK_MODULES(GIG gig)
++	PKG_CHECK_MODULES(GIG IMPORTED_TARGET gig)
+ 	IF(GIG_FOUND)
+ 		SET(LMMS_HAVE_GIG TRUE)
+ 		SET(STATUS_GIG "OK")
+diff -ruN a/plugins/GigPlayer/CMakeLists.txt b/plugins/GigPlayer/CMakeLists.txt
+--- a/plugins/GigPlayer/CMakeLists.txt
++++ b/plugins/GigPlayer/CMakeLists.txt
+@@ -1,17 +1,16 @@
+ if(LMMS_HAVE_GIG)
+ 	INCLUDE(BuildPlugin)
+-	include_directories(SYSTEM ${GIG_INCLUDE_DIRS})
+ 	SET(CMAKE_AUTOUIC ON)
++	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+ 	# Required for not crashing loading files with libgig
+ 	add_compile_options("-fexceptions")
+ 
+-	link_directories(${GIG_LIBRARY_DIRS})
+-	link_libraries(${GIG_LIBRARIES})
+ 	build_plugin(gigplayer
+ 		GigPlayer.cpp GigPlayer.h PatchesDialog.cpp PatchesDialog.h PatchesDialog.ui
+ 		MOCFILES GigPlayer.h PatchesDialog.h
+ 		EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png"
+ 	)
++	target_link_libraries(gigplayer PkgConfig::GIG)
+ 	target_link_libraries(gigplayer SampleRate::samplerate)
+ endif(LMMS_HAVE_GIG)
diff --git a/pkgs/by-name/lm/lmms/package.nix b/pkgs/by-name/lm/lmms/package.nix
new file mode 100644
index 000000000000..ecc8e43fadf1
--- /dev/null
+++ b/pkgs/by-name/lm/lmms/package.nix
@@ -0,0 +1,190 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  replaceVars,
+  unstableGitUpdater,
+  cmake,
+  pkg-config,
+  alsa-lib,
+  carla,
+  fftwFloat,
+  fltk,
+  fluidsynth,
+  glibc_multi,
+  lame,
+  libgig,
+  libjack2,
+  libogg,
+  libpulseaudio,
+  libsForQt5,
+  libsamplerate,
+  libsoundio,
+  libsndfile,
+  libvorbis,
+  lilv,
+  lv2,
+  perl5,
+  perl5Packages,
+  portaudio,
+  qt5,
+  sndio,
+  SDL2,
+  suil,
+  wineWow64Packages,
+  withALSA ? true,
+  withPulseAudio ? true,
+  withSoundio ? false,
+  withPortAudio ? false,
+  withSndio ? false,
+  withJACK ? true,
+  withSDL ? true,
+  withOggVorbis ? true,
+  withMP3Lame ? true,
+  withSoundFont ? true,
+  withZyn ? true,
+  withSWH ? true,
+  withSID ? true,
+  withGIG ? true,
+  withLV2 ? true,
+  withVST ? true,
+  withCarla ? true,
+  withWine ? false,
+}:
+
+let
+  winePackages =
+    if lib.isDerivation wineWow64Packages then wineWow64Packages else wineWow64Packages.minimal;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "lmms";
+  version = "1.2.2-unstable-2026-04-21";
+
+  src = fetchFromGitHub {
+    owner = "LMMS";
+    repo = "lmms";
+    rev = "fc3dfda961a7923326d2b0d5747e5d8fd941af98";
+    hash = "sha256-q8w1CgM2QnkCIOUJlv8r+2zMKl+brbNKoAkhDJEhaN0=";
+    fetchSubmodules = true;
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.qt5.qttools
+    pkg-config
+    qt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    fftwFloat
+    libsForQt5.qt5.qtbase
+    libsForQt5.qt5.qtsvg
+    libsForQt5.qt5.qtx11extras
+    libsamplerate
+    libsndfile
+  ]
+  ++ lib.optionals withALSA [
+    alsa-lib
+  ]
+  ++ lib.optionals withPulseAudio [
+    libpulseaudio
+  ]
+  ++ lib.optionals withSoundio [
+    libsoundio
+  ]
+  ++ lib.optionals withPortAudio [
+    portaudio
+  ]
+  ++ lib.optionals withSndio [
+    sndio
+  ]
+  ++ lib.optionals withJACK [
+    libjack2
+  ]
+  ++ lib.optionals withSDL [
+    SDL2
+  ]
+  ++ lib.optionals withOggVorbis [
+    libogg
+    libvorbis
+  ]
+  ++ lib.optionals withMP3Lame [
+    lame
+  ]
+  ++ lib.optionals withSoundFont [
+    fluidsynth
+  ]
+  ++ lib.optionals withZyn [
+    fltk
+  ]
+  ++ lib.optionals (withSWH || withSID) [
+    perl5
+    perl5Packages.ListMoreUtils
+    perl5Packages.XMLParser
+  ]
+  ++ lib.optionals withGIG [
+    libgig
+  ]
+  ++ lib.optionals withLV2 [
+    lilv
+    lv2
+    suil
+  ]
+  ++ lib.optionals withCarla [
+    carla
+  ]
+  ++ lib.optionals withWine [
+    glibc_multi
+    winePackages
+  ];
+
+  patches = [
+    # Use modern CMake imported target for libgig so that its non-standard
+    # library path (lib/libgig/) is properly propagated to the install RPATH.
+    ./0002-fix-gigplayer-linking.patch
+  ]
+  ++ lib.optionals withWine [
+    (replaceVars ./0001-fix-add-unique-string-to-FindWine-for-replacement-in.patch {
+      WINE_LOCATION = winePackages;
+    })
+  ];
+
+  cmakeFlags = [
+    # Fix the build with CMake 4.
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+    (lib.cmakeBool "WANT_ALSA" withALSA)
+    (lib.cmakeBool "WANT_PULSEAUDIO" withPulseAudio)
+    (lib.cmakeBool "WANT_SOUNDIO" withSoundio)
+    (lib.cmakeBool "WANT_PORTAUDIO" withPortAudio)
+    (lib.cmakeBool "WANT_SNDIO" withSndio)
+    (lib.cmakeBool "WANT_JACK" withJACK)
+    (lib.cmakeBool "WANT_WEAKJACK" withJACK)
+    (lib.cmakeBool "WANT_SDL" withSDL)
+    (lib.cmakeBool "WANT_OGGVORBIS" withOggVorbis)
+    (lib.cmakeBool "WANT_MP3LAME" withMP3Lame)
+    (lib.cmakeBool "WANT_SF2" withSoundFont)
+    (lib.cmakeBool "WANT_GIG" withGIG)
+    (lib.cmakeBool "WANT_SID" withSID)
+    (lib.cmakeBool "WANT_SWH" withSWH)
+    (lib.cmakeBool "WANT_LV2" withLV2)
+    (lib.cmakeBool "WANT_VST" withVST)
+    (lib.cmakeBool "WANT_CARLA" withCarla)
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "DAW similar to FL Studio (music production software)";
+    mainProgram = "lmms";
+    homepage = "https://lmms.io";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      wizardlink
+      jaredmontoya
+    ];
+  };
+})
diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix
index 6320250049e2..bbd0c8e45af3 100644
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -17,7 +17,7 @@
   libice,
   stb,
   openssl,
-  xxHash,
+  xxhash,
   pugixml,
 }:
 
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     libice
     stb
     openssl
-    xxHash
+    xxhash
     pugixml
   ];
 
diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix
index d441f1708c7f..25042aba5cc5 100644
--- a/pkgs/by-name/lo/loupe/package.nix
+++ b/pkgs/by-name/lo/loupe/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace src/meson.build --replace-fail \
       "'src' / rust_target / meson.project_name()," \
-      "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()," \
+      "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name(),"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch b/pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch
index 5dd5ef2bc9c0..10c5eac626b3 100644
--- a/pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch
+++ b/pkgs/by-name/lp/lp_solve/0001-fix-cross-compilation.patch
@@ -2,14 +2,6 @@ diff --git a/lp_solve/ccc b/lp_solve/ccc
 index bd5a938..7fe0427 100644
 --- a/lp_solve/ccc
 +++ b/lp_solve/ccc
-@@ -1,6 +1,6 @@
- :
- src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c lp_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
--c=cc
-+c=$CC
- 
- MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX`
- 
 @@ -10,7 +10,7 @@ echo '#include <stdlib.h>'>>"$MYTMP"/platform.c
  echo '#include <stdio.h>'>>"$MYTMP"/platform.c
  echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c
@@ -23,14 +15,6 @@ diff --git a/lpsolve55/ccc b/lpsolve55/ccc
 index 999f5f6..ff69b17 100644
 --- a/lpsolve55/ccc
 +++ b/lpsolve55/ccc
-@@ -1,6 +1,6 @@
- :
- src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
--c=cc
-+c=$CC
- 
- MYTMP=`mktemp -d "${TMPDIR:-/tmp}"/lp_solve_XXXXXX`
- 
 @@ -10,7 +10,7 @@ echo '#include <stdlib.h>'>>"$MYTMP"/platform.c
  echo '#include <stdio.h>'>>"$MYTMP"/platform.c
  echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"$MYTMP"/platform.c
diff --git a/pkgs/by-name/lp/lp_solve/package.nix b/pkgs/by-name/lp/lp_solve/package.nix
index cadd82feb7f0..4274eb570642 100644
--- a/pkgs/by-name/lp/lp_solve/package.nix
+++ b/pkgs/by-name/lp/lp_solve/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   cctools,
   fixDarwinDylibNames,
   darwin,
@@ -12,11 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lp_solve";
-  version = "5.5.2.11";
+  version = "5.5.2.14";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/lpsolve/lpsolve/${finalAttrs.version}/lp_solve_${finalAttrs.version}_source.tar.gz";
-    hash = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8=";
+  src = fetchFromGitHub {
+    owner = "lp-solve";
+    repo = "lp_solve";
+    tag = finalAttrs.version;
+    hash = "sha256-mCYstt0vEGZk7rjcXmxqZjYTviF8xfg1mvA4jqKCYgE=";
   };
 
   nativeBuildInputs =
@@ -76,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Mixed Integer Linear Programming (MILP) solver";
     mainProgram = "lp_solve";
-    homepage = "https://lpsolve.sourceforge.net";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    homepage = "https://github.com/lp-solve/lp_solve";
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ tbutter ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/lp/lpac/package.nix b/pkgs/by-name/lp/lpac/package.nix
index dec353ca3f32..db7098155ea7 100644
--- a/pkgs/by-name/lp/lpac/package.nix
+++ b/pkgs/by-name/lp/lpac/package.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   lib,
   cmake,
   pkg-config,
@@ -10,8 +11,8 @@
   libqmi,
   withDrivers ? true,
   withLibeuicc ? true,
-  withMbim ? true,
-  withQmi ? true,
+  withMbim ? stdenv.hostPlatform.isLinux,
+  withQmi ? stdenv.hostPlatform.isLinux,
   nix-update-script,
 }:
 
@@ -32,13 +33,25 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.LPAC_VERSION = finalAttrs.version;
 
-  patches = [ ./lpac-version.patch ];
+  patches = [
+    ./lpac-version.patch
+
+    # CMAKE_OSX_ARCHITECTURES is set to "arm64;x86_64", and not overridable without this fix.
+    # https://github.com/estkme-group/lpac/pull/346
+    (fetchpatch {
+      url = "https://github.com/estkme-group/lpac/commit/be86645e596ee34f6d85cd0f3e039d5b31f35856.patch";
+      hash = "sha256-Y3tL9A1uKjX0x1O2WrQQ9k88Zu+Lpc+MNV9DRYePwgs=";
+    })
+  ];
 
   cmakeFlags = [
     (lib.cmakeBool "LPAC_DYNAMIC_DRIVERS" withDrivers)
     (lib.cmakeBool "LPAC_DYNAMIC_LIBEUICC" withLibeuicc)
     (lib.cmakeBool "LPAC_WITH_APDU_MBIM" withMbim)
     (lib.cmakeBool "LPAC_WITH_APDU_QMI" withQmi)
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (lib.cmakeFeature "CMAKE_OSX_ARCHITECTURES" stdenv.hostPlatform.darwinArch)
   ];
 
   nativeBuildInputs = [
@@ -48,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     curl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
     pcsclite
   ]
   ++ optional withMbim libmbim
diff --git a/pkgs/by-name/lr/lrcget/fix-tauri-version-mismatch.patch b/pkgs/by-name/lr/lrcget/fix-tauri-version-mismatch.patch
deleted file mode 100644
index 875eea6a0854..000000000000
--- a/pkgs/by-name/lr/lrcget/fix-tauri-version-mismatch.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-diff --git a/package-lock.json b/package-lock.json
-index 5ddd914..8d4a12a 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -9,11 +9,11 @@
-       "version": "0.0.0",
-       "dependencies": {
-         "@tanstack/vue-virtual": "^3.1.2",
--        "@tauri-apps/api": "^2.1.1",
--        "@tauri-apps/plugin-dialog": "^2.2.0",
--        "@tauri-apps/plugin-global-shortcut": "^2.2.0",
--        "@tauri-apps/plugin-os": "^2.2.0",
--        "@tauri-apps/plugin-shell": "^2.2.0",
-+        "@tauri-apps/api": "2.8.0",
-+        "@tauri-apps/plugin-dialog": "2.4.0",
-+        "@tauri-apps/plugin-global-shortcut": "^2.3.0",
-+        "@tauri-apps/plugin-os": "^2.3.0",
-+        "@tauri-apps/plugin-shell": "^2.3.0",
-         "codemirror": "^6.0.1",
-         "floating-vue": "^5.2.2",
-         "lodash": "^4.17.21",
-@@ -381,9 +381,9 @@
-       }
-     },
-     "node_modules/@tauri-apps/api": {
--      "version": "2.1.1",
--      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
--      "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A==",
-+      "version": "2.8.0",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.8.0.tgz",
-+      "integrity": "sha512-ga7zdhbS2GXOMTIZRT0mYjKJtR9fivsXzsyq5U3vjDL0s6DTMwYRm0UHNjzTY5dh4+LSC68Sm/7WEiimbQNYlw==",
-       "license": "Apache-2.0 OR MIT",
-       "funding": {
-         "type": "opencollective",
-@@ -590,39 +590,39 @@
-       }
-     },
-     "node_modules/@tauri-apps/plugin-dialog": {
--      "version": "2.2.0",
--      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.2.0.tgz",
--      "integrity": "sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==",
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.4.0.tgz",
-+      "integrity": "sha512-OvXkrEBfWwtd8tzVCEXIvRfNEX87qs2jv6SqmVPiHcJjBhSF/GUvjqUNIDmKByb5N8nvDqVUM7+g1sXwdC/S9w==",
-       "license": "MIT OR Apache-2.0",
-       "dependencies": {
--        "@tauri-apps/api": "^2.0.0"
-+        "@tauri-apps/api": "^2.8.0"
-       }
-     },
-     "node_modules/@tauri-apps/plugin-global-shortcut": {
--      "version": "2.2.0",
--      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.2.0.tgz",
--      "integrity": "sha512-clI9Bg/BcxWXNDK+ij601o1qC2WxMEy8ovhGgEW5Ai17oPy0KK8uwzmc59KiVnOYKpBWHCUPqBxG+KBNUFXgzw==",
-+      "version": "2.3.1",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.3.1.tgz",
-+      "integrity": "sha512-vr40W2N6G63dmBPaha1TsBQLLURXG538RQbH5vAm0G/ovVZyXJrmZR1HF1W+WneNloQvwn4dm8xzwpEXRW560g==",
-       "license": "MIT OR Apache-2.0",
-       "dependencies": {
--        "@tauri-apps/api": "^2.0.0"
-+        "@tauri-apps/api": "^2.8.0"
-       }
-     },
-     "node_modules/@tauri-apps/plugin-os": {
--      "version": "2.2.0",
--      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.2.0.tgz",
--      "integrity": "sha512-HszbCdbisMlu5QhCNAN8YIWyz2v33abAWha6+uvV2CKX8P5VSct/y+kEe22JeyqrxCnWlQ3DRx7s49Byg7/0EA==",
-+      "version": "2.3.2",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.3.2.tgz",
-+      "integrity": "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A==",
-       "license": "MIT OR Apache-2.0",
-       "dependencies": {
--        "@tauri-apps/api": "^2.0.0"
-+        "@tauri-apps/api": "^2.8.0"
-       }
-     },
-     "node_modules/@tauri-apps/plugin-shell": {
--      "version": "2.2.0",
--      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.0.tgz",
--      "integrity": "sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==",
-+      "version": "2.3.4",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.4.tgz",
-+      "integrity": "sha512-ktsRWf8wHLD17aZEyqE8c5x98eNAuTizR1FSX475zQ4TxaiJnhwksLygQz+AGwckJL5bfEP13nWrlTNQJUpKpA==",
-       "license": "MIT OR Apache-2.0",
-       "dependencies": {
--        "@tauri-apps/api": "^2.0.0"
-+        "@tauri-apps/api": "^2.8.0"
-       }
-     },
-     "node_modules/@types/web-bluetooth": {
-@@ -1043,6 +1043,7 @@
-           "url": "https://tidelift.com/funding/github/npm/browserslist"
-         }
-       ],
-+      "peer": true,
-       "dependencies": {
-         "caniuse-lite": "^1.0.30001400",
-         "electron-to-chromium": "^1.4.251",
-@@ -1124,6 +1125,7 @@
-       "version": "6.0.1",
-       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
-       "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
-+      "peer": true,
-       "dependencies": {
-         "@codemirror/autocomplete": "^6.0.0",
-         "@codemirror/commands": "^6.0.0",
-@@ -1681,6 +1683,7 @@
-       "version": "7.6.2",
-       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz",
-       "integrity": "sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==",
-+      "peer": true,
-       "dependencies": {
-         "tabbable": "^6.2.0"
-       }
-@@ -2147,6 +2150,7 @@
-           "url": "https://github.com/sponsors/ai"
-         }
-       ],
-+      "peer": true,
-       "dependencies": {
-         "nanoid": "^3.3.7",
-         "picocolors": "^1.1.0",
-@@ -2721,6 +2725,7 @@
-       "resolved": "https://registry.npmjs.org/vite/-/vite-3.1.8.tgz",
-       "integrity": "sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==",
-       "dev": true,
-+      "peer": true,
-       "dependencies": {
-         "esbuild": "^0.15.9",
-         "postcss": "^8.4.16",
-@@ -2761,6 +2766,7 @@
-       "version": "3.5.10",
-       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
-       "integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
-+      "peer": true,
-       "dependencies": {
-         "@vue/compiler-dom": "3.5.10",
-         "@vue/compiler-sfc": "3.5.10",
-@@ -3221,9 +3227,9 @@
-       }
-     },
-     "@tauri-apps/api": {
--      "version": "2.1.1",
--      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
--      "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A=="
-+      "version": "2.8.0",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.8.0.tgz",
-+      "integrity": "sha512-ga7zdhbS2GXOMTIZRT0mYjKJtR9fivsXzsyq5U3vjDL0s6DTMwYRm0UHNjzTY5dh4+LSC68Sm/7WEiimbQNYlw=="
-     },
-     "@tauri-apps/cli": {
-       "version": "2.1.0",
-@@ -3314,35 +3320,35 @@
-       "optional": true
-     },
-     "@tauri-apps/plugin-dialog": {
--      "version": "2.2.0",
--      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.2.0.tgz",
--      "integrity": "sha512-6bLkYK68zyK31418AK5fNccCdVuRnNpbxquCl8IqgFByOgWFivbiIlvb79wpSXi0O+8k8RCSsIpOquebusRVSg==",
-+      "version": "2.4.0",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.4.0.tgz",
-+      "integrity": "sha512-OvXkrEBfWwtd8tzVCEXIvRfNEX87qs2jv6SqmVPiHcJjBhSF/GUvjqUNIDmKByb5N8nvDqVUM7+g1sXwdC/S9w==",
-       "requires": {
--        "@tauri-apps/api": "^2.0.0"
-+        "@tauri-apps/api": "^2.8.0"
-       }
-     },
-     "@tauri-apps/plugin-global-shortcut": {
--      "version": "2.2.0",
--      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.2.0.tgz",
--      "integrity": "sha512-clI9Bg/BcxWXNDK+ij601o1qC2WxMEy8ovhGgEW5Ai17oPy0KK8uwzmc59KiVnOYKpBWHCUPqBxG+KBNUFXgzw==",
-+      "version": "2.3.1",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-global-shortcut/-/plugin-global-shortcut-2.3.1.tgz",
-+      "integrity": "sha512-vr40W2N6G63dmBPaha1TsBQLLURXG538RQbH5vAm0G/ovVZyXJrmZR1HF1W+WneNloQvwn4dm8xzwpEXRW560g==",
-       "requires": {
--        "@tauri-apps/api": "^2.0.0"
-+        "@tauri-apps/api": "^2.8.0"
-       }
-     },
-     "@tauri-apps/plugin-os": {
--      "version": "2.2.0",
--      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.2.0.tgz",
--      "integrity": "sha512-HszbCdbisMlu5QhCNAN8YIWyz2v33abAWha6+uvV2CKX8P5VSct/y+kEe22JeyqrxCnWlQ3DRx7s49Byg7/0EA==",
-+      "version": "2.3.2",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.3.2.tgz",
-+      "integrity": "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A==",
-       "requires": {
--        "@tauri-apps/api": "^2.0.0"
-+        "@tauri-apps/api": "^2.8.0"
-       }
-     },
-     "@tauri-apps/plugin-shell": {
--      "version": "2.2.0",
--      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.0.tgz",
--      "integrity": "sha512-iC3Ic1hLmasoboG7BO+7p+AriSoqAwKrIk+Hpk+S/bjTQdXqbl2GbdclghI4gM32X0bls7xHzIFqhRdrlvJeaA==",
-+      "version": "2.3.4",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.4.tgz",
-+      "integrity": "sha512-ktsRWf8wHLD17aZEyqE8c5x98eNAuTizR1FSX475zQ4TxaiJnhwksLygQz+AGwckJL5bfEP13nWrlTNQJUpKpA==",
-       "requires": {
--        "@tauri-apps/api": "^2.0.0"
-+        "@tauri-apps/api": "^2.8.0"
-       }
-     },
-     "@types/web-bluetooth": {
-@@ -3586,6 +3592,7 @@
-       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-       "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-       "dev": true,
-+      "peer": true,
-       "requires": {
-         "caniuse-lite": "^1.0.30001400",
-         "electron-to-chromium": "^1.4.251",
-@@ -3636,6 +3643,7 @@
-       "version": "6.0.1",
-       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
-       "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
-+      "peer": true,
-       "requires": {
-         "@codemirror/autocomplete": "^6.0.0",
-         "@codemirror/commands": "^6.0.0",
-@@ -3965,6 +3973,7 @@
-       "version": "7.6.2",
-       "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz",
-       "integrity": "sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==",
-+      "peer": true,
-       "requires": {
-         "tabbable": "^6.2.0"
-       }
-@@ -4285,6 +4294,7 @@
-       "version": "8.4.47",
-       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-       "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
-+      "peer": true,
-       "requires": {
-         "nanoid": "^3.3.7",
-         "picocolors": "^1.1.0",
-@@ -4638,6 +4648,7 @@
-       "resolved": "https://registry.npmjs.org/vite/-/vite-3.1.8.tgz",
-       "integrity": "sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==",
-       "dev": true,
-+      "peer": true,
-       "requires": {
-         "esbuild": "^0.15.9",
-         "fsevents": "~2.3.2",
-@@ -4650,6 +4661,7 @@
-       "version": "3.5.10",
-       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
-       "integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
-+      "peer": true,
-       "requires": {
-         "@vue/compiler-dom": "3.5.10",
-         "@vue/compiler-sfc": "3.5.10",
--- 
-2.51.2
-
diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index 05809e139915..c0a18cde9735 100644
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@@ -22,27 +22,24 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lrcget";
-  version = "1.0.2";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "tranxuanthang";
     repo = "lrcget";
     tag = version;
-    hash = "sha256-4XeOIOV8QyJheVN98u/jo8H+n9AIzvVJITCk9d+kpFA=";
+    hash = "sha256-cxQpCuyFsJeujcL2TPMH7n+Q6l4h+P1HvsrMoFmbWMI=";
   };
 
   patches = [
     # needed to not attempt codesigning on darwin
     ./remove-signing-identity.patch
-
-    # Update NPM package versions to fix https://github.com/tranxuanthang/lrcget/issues/309
-    ./fix-tauri-version-mismatch.patch
   ];
 
   cargoRoot = "src-tauri";
   buildAndTestSubdir = "src-tauri";
 
-  cargoHash = "sha256-EjciD794MqUnp3CVloOPugbSfcxgfy7TdCUOlK6P+sk=";
+  cargoHash = "sha256-9vyvRJsR4o7kWSLJyGIoiM/13ABWWTrRXVdyU2HfJ+E=";
 
   # FIXME: This is a workaround, because we have a git dependency node_modules/lrc-kit contains install scripts
   # but has no lockfile, which is something that will probably break.
@@ -51,7 +48,7 @@ rustPlatform.buildRustPackage rec {
   npmDeps = fetchNpmDeps {
     name = "lrcget-${version}-npm-deps";
     inherit src forceGitDeps patches;
-    hash = "sha256-iaxNrZLcb9qM5EPRtzoXw6izZBeS/rqgGaZpA2A2oho=";
+    hash = "sha256-yXRbQ6xM23VrVaS8Hb5sxPPic1yawKtFi2rCGkplgw4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix
index bd91034f697a..a24c9bbe8b7c 100644
--- a/pkgs/by-name/ls/lsh/package.nix
+++ b/pkgs/by-name/ls/lsh/package.nix
@@ -5,14 +5,14 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lsh";
-  version = "1.5.7";
+  version = "1.5.8";
   src = fetchFromGitHub {
     owner = "latitudesh";
     repo = "lsh";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-OG1JjQ33BtsALG1CVO+N4N1Q7+6SW99U43lh1+cekDA=";
+    sha256 = "sha256-BFhVCrl2LS5s38WBtkTjZ+IYCO9VQgIVmel3xwzaBI8=";
   };
-  vendorHash = "sha256-SvbrrunOkJhIB5AlsCY7WrtE+Na/ExEJmVWqfjHNvx4=";
+  vendorHash = "sha256-vAZYd4fbXsZRqDvSQ1Y+lk3RVY06PqxdJF9DofTa6sQ=";
   subPackages = [ "." ];
   meta = {
     changelog = "https://github.com/latitudesh/lsh/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/ls/lsof/package.nix b/pkgs/by-name/ls/lsof/package.nix
index 5b9b5f0af6d4..e471fa9ae830 100644
--- a/pkgs/by-name/ls/lsof/package.nix
+++ b/pkgs/by-name/ls/lsof/package.nix
@@ -17,13 +17,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "lsof";
-  version = "4.99.5";
+  version = "4.99.6";
 
   src = fetchFromGitHub {
     owner = "lsof-org";
     repo = "lsof";
     rev = version;
-    hash = "sha256-zn09cwFFz5ZNJu8GwGGSSGNx5jvXbKLT6/+Lcmn1wK8=";
+    hash = "sha256-M/2xcii8ibGAI/6f34AE7aEb9fmn+iSWqWqnyDhg4CI=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ls/lstk/package.nix b/pkgs/by-name/ls/lstk/package.nix
index 9b5a4c84e820..119965a2c322 100644
--- a/pkgs/by-name/ls/lstk/package.nix
+++ b/pkgs/by-name/ls/lstk/package.nix
@@ -6,7 +6,7 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "lstk";
-  version = "0.5.7";
+  version = "0.5.8";
 
   __structuredAttrs = true;
 
@@ -14,10 +14,10 @@ buildGoModule (finalAttrs: {
     owner = "localstack";
     repo = "lstk";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-HWkCDnbg/D2zX3rdvmFTdKrx03SO6FaiA/Pzj0f4hlA=";
+    sha256 = "sha256-sZd3hZaS6rJoAUkCfgQh/zQj4ng8nevsQFsZaxOccHs=";
   };
 
-  vendorHash = "sha256-rEcVtSFnBQ+3bbU5pjbCXEJZo89+lL/1HJG9bCn8OSE=";
+  vendorHash = "sha256-MzvWeJa9fXqek/MenT4B28XKB0srjGpqwUxAuT1zgI4=";
 
   excludedPackages = "test/integration";
 
diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index 2dbfbd176d52..a871f30cac5d 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau-lsp";
-  version = "1.66.0";
+  version = "1.66.1";
 
   src = fetchFromGitHub {
     owner = "JohnnyMorganz";
     repo = "luau-lsp";
     tag = finalAttrs.version;
-    hash = "sha256-llirkKL/2X4srwZzTcf0a7yX7AhOgdlsu1jr6yacWV0=";
+    hash = "sha256-Lz6tnCfkjQc7YhfCETaFLAvW6fTrRwmELxBNURavNeY=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index 9a22f71312ed..e94f1b447b26 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau";
-  version = "0.714";
+  version = "0.718";
 
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
     tag = finalAttrs.version;
-    hash = "sha256-TSkiVG0ORRU4+4TsAoLBYfMbB1Ki/ctn3cZDAEsRn/Q=";
+    hash = "sha256-PB+sUCRmvz5ijdtPyDNxpP7asQAhe9GczEHx962GLKA=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/lu/lucida-downloader/package.nix b/pkgs/by-name/lu/lucida-downloader/package.nix
index a109c88b458e..d14bfe592209 100644
--- a/pkgs/by-name/lu/lucida-downloader/package.nix
+++ b/pkgs/by-name/lu/lucida-downloader/package.nix
@@ -7,25 +7,26 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lucida-downloader";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "jelni";
     repo = "lucida-downloader";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-f5cegAucJSiRekTAZBkrdn0HoEELvINN6Rd5Ehb7InA=";
+    hash = "sha256-284f3+yKkE37wZzmyW7qupvYwEkmLvco8lc5dFSiLAQ=";
   };
 
   passthru.updateScript = nix-update-script { };
 
-  cargoHash = "sha256-ADo0AuMsvd86ytlVStBXPJ9vFG/JeSm2kDMGM5VCqzA=";
+  cargoHash = "sha256-PT8E9AqvhChKk76AA2qsAf2ICy5maQ9SK96V/vkmwy8=";
 
   meta = {
     description = "Multithreaded client for downloading music for free with lucida";
     homepage = "https://github.com/jelni/lucida-downloader";
-    license = lib.licenses.gpl3Plus;
+    license = lib.licenses.agpl3Plus;
     mainProgram = "lucida";
     maintainers = with lib.maintainers; [
+      jelni
       surfaceflinger
     ];
   };
diff --git a/pkgs/by-name/lu/lucky-commit/package.nix b/pkgs/by-name/lu/lucky-commit/package.nix
index ab5adb72164d..e18b7ed7de1e 100644
--- a/pkgs/by-name/lu/lucky-commit/package.nix
+++ b/pkgs/by-name/lu/lucky-commit/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   # LLVM Apple assembler rejects `:lo12:` combined with `@PAGEOFF`.
   postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-    substituteInPlace "$cargoDepsCopy"/sha1-asm-*/src/aarch64_apple.S \
+    substituteInPlace "$cargoDepsCopy"/*/sha1-asm-*/src/aarch64_apple.S \
       --replace-fail "#:lo12:.K0@PAGEOFF" ".K0@PAGEOFF" \
       --replace-fail "#:lo12:.K1@PAGEOFF" ".K1@PAGEOFF" \
       --replace-fail "#:lo12:.K2@PAGEOFF" ".K2@PAGEOFF" \
diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 17e8a4561ac1..cf3f778f1477 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.6.6";
+  version = "3.6.7";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
-    hash = "sha512-9vIR6nNpy2cCtZHQipDJHTIC7qPpxRFmH9LrtwxHyTOJW4BGW6LlEWh+ZEe9FRZyU4iv66iTPlHw53RE9QF+cA==";
+    hash = "sha512-/RCRbD+OSaxvWDaJL1WqKidz6/N2R5dxb/SE30YIYrBZVHEOC2MaXSk8Oldm7yr7pqC+oXyuJbRRq2G0YAOcgA==";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -26,7 +26,7 @@ appimageTools.wrapType2 rec {
       install -Dm444 ${contents}/lunarclient.desktop -t $out/share/applications/
       install -Dm444 ${contents}/lunarclient.png -t $out/share/pixmaps/
       substituteInPlace $out/share/applications/lunarclient.desktop \
-        --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lunarclient' \
+        --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lunarclient'
     '';
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix
index 079087d9bf4a..b8396f564a54 100644
--- a/pkgs/by-name/lu/lurk/package.nix
+++ b/pkgs/by-name/lu/lurk/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lurk";
-  version = "0.3.12";
+  version = "0.3.14";
 
   src = fetchFromGitHub {
     owner = "jakwai01";
     repo = "lurk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gVxul9LeNbsP2eP0j5T6AL7pQh8Ls2lht3ki5JQ9kZM=";
+    hash = "sha256-Q7lxPjEfzbGPes11fP7qJY4cYetem7tKQasQcy67oRU=";
   };
 
-  cargoHash = "sha256-NNwcc4rUol9M59XzoQBNw/MfHw3LP6pUtNjw6OY6bMc=";
+  cargoHash = "sha256-QOdqA3gHfhBUWL5CHA5p4ueKwZusE5NBlGezBG//3FA=";
 
   postPatch = ''
     substituteInPlace src/lib.rs \
diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix
index 8f61c9b45a7d..6577b065872a 100644
--- a/pkgs/by-name/lx/lxc/package.nix
+++ b/pkgs/by-name/lx/lxc/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxc";
-  version = "6.0.6";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DaKyaBfxO67L7zzOAYWSiYTAIILtdF4Ij7EXr+SAXVs=";
+    hash = "sha256-eB68l7SmVxJViGmVlVtEXVD+cRtr4WqOrA8b9ImQ89g=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix
index 59ea2ea6da7d..5f7a2236c9eb 100644
--- a/pkgs/by-name/lx/lxcfs/package.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxcfs";
-  version = "6.0.6";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lEXXbYDxnOi4Xa/fO1Uy/aVLjVfzYeZm6qzR4XBMBsY=";
+    hash = "sha256-xONV9Ss71id2Bwb2BFNqaaP+8vK6540sThs1MCw4gok=";
   };
 
   patches = [
@@ -32,9 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     # skip installing systemd files
     ./skip-init.patch
-
-    # fix pidfd checks and include
-    ./pidfd.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/lx/lxcfs/pidfd.patch b/pkgs/by-name/lx/lxcfs/pidfd.patch
deleted file mode 100644
index 3d9b6faa57f9..000000000000
--- a/pkgs/by-name/lx/lxcfs/pidfd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a0289ad..211b01b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -134,11 +134,13 @@ foreach ident: [
-      '''#include <stdlib.h>
-         #include <unistd.h>
-         #include <signal.h>
-+        #include <sys/pidfd.h>
-         #include <sys/wait.h>'''],
-     ['pidfd_open',
-      '''#include <stdlib.h>
-         #include <unistd.h>
-         #include <signal.h>
-+        #include <sys/pidfd.h>
-         #include <sys/wait.h>'''],
- ]
-     have = cc.has_function(ident[0], prefix: ident[1], args: '-D_GNU_SOURCE')
-diff --git a/src/bindings.c b/src/bindings.c
-index 13259c1..e760330 100644
---- a/src/bindings.c
-+++ b/src/bindings.c
-@@ -1,5 +1,6 @@
- /* SPDX-License-Identifier: LGPL-2.1+ */
- 
-+#include <sys/pidfd.h>
- #include "config.h"
- 
- #include <dirent.h>
diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix
index daf66812a337..799013c2c26d 100644
--- a/pkgs/by-name/ly/ly/package.nix
+++ b/pkgs/by-name/ly/ly/package.nix
@@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
     "-Denable_x11_support=${lib.boolToString x11Support}"
   ];
 
+  postInstall = ''
+    install -Dm0644 res/config.ini "$out/etc/config.ini"
+    install -Dm0755 res/setup.sh "$out/etc/setup.sh"
+  '';
+
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
diff --git a/pkgs/by-name/lz/lzip/package.nix b/pkgs/by-name/lz/lzip/package.nix
index a35a37e786c3..dcdd2addb2d5 100644
--- a/pkgs/by-name/lz/lzip/package.nix
+++ b/pkgs/by-name/lz/lzip/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lzip";
-  version = "1.25";
+  version = "1.26";
   outputs = [
     "out"
     "man"
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://savannah/lzip/lzip-${finalAttrs.version}.tar.gz";
-    hash = "sha256-CUGKbY+4P1ET9b2FbglwPfXTe64DCMZo0PNG49PwpW8=";
+    hash = "sha256-ZBzzCWFSXL47NAzIg0NsiFTp9QMvRZ9ETeR4K2IeZXI=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isMinGW [
diff --git a/pkgs/by-name/lz/lzlib/package.nix b/pkgs/by-name/lz/lzlib/package.nix
index 3285e843b7b6..bedcd3ac1049 100644
--- a/pkgs/by-name/lz/lzlib/package.nix
+++ b/pkgs/by-name/lz/lzlib/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lzlib";
-  version = "1.15";
+  version = "1.16";
   outputs = [
     "out"
     "info"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://savannah/lzip/lzlib/lzlib-${finalAttrs.version}.tar.lz";
-    hash = "sha256-nUVIDnyBccZPodW+7iy9guaf6+kQ8M5ii4dqj+IUFTQ=";
+    hash = "sha256-zSqW+8aF9+PcMrnw5eNARqd+PBD8/r5i+ZUeMX0KjPQ=";
     # hash from release email
   };
 
diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix
index f8282f79ae86..32d046e79f4d 100644
--- a/pkgs/by-name/ma/mackup/package.nix
+++ b/pkgs/by-name/ma/mackup/package.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src/mackup/utils.py \
-      --replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"' \
+      --replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"'
   '';
 
   build-system = with python3Packages; [ hatchling ];
diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix
index 849ae8502a7c..6ed1c53b5007 100644
--- a/pkgs/by-name/ma/mactracker/package.nix
+++ b/pkgs/by-name/ma/mactracker/package.nix
@@ -11,16 +11,16 @@
   common-updater-scripts,
   versionCheckHook,
   writeShellScript,
-  xcbuild,
+  re-plistbuddy,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mactracker";
-  version = "7.13.5";
+  version = "8.2.1";
 
   src = fetchurl {
     url = "https://mactracker.ca/downloads/Mactracker_${finalAttrs.version}.zip";
-    hash = "sha256-VCcpEgMWo5U3BJpDSc0mQUIlmPuTKD7JBcmmKmYNf1Y=";
+    hash = "sha256-c78Bj63nJ+/qejUiD7hBEJlxubmIc+wElazwHGRRyfI=";
   };
 
   dontPatch = true;
@@ -58,7 +58,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = writeShellScript "version-check" ''
-    ${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1"
+    ${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleVersion" "$1"
   '';
   versionCheckProgramArg = [ "${placeholder "out"}/Applications/Mactracker.app/Contents/Info.plist" ];
   doInstallCheck = true;
diff --git a/pkgs/by-name/ma/maelstrom-clj/package.nix b/pkgs/by-name/ma/maelstrom-clj/package.nix
index 605e8566e8ed..d9dbce638242 100644
--- a/pkgs/by-name/ma/maelstrom-clj/package.nix
+++ b/pkgs/by-name/ma/maelstrom-clj/package.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Workbench for writing toy implementations of distributed systems";
     homepage = "https://github.com/jepsen-io/maelstrom";
-    changelog = "https://github.com/jepsen-io/maelstrom/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/jepsen-io/maelstrom/releases/tag/v${finalAttrs.version}";
     mainProgram = "maelstrom";
     sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
     license = lib.licenses.epl10;
diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix
index d6a0630a9671..a5c91c4b5f87 100644
--- a/pkgs/by-name/ma/maestro/package.nix
+++ b/pkgs/by-name/ma/maestro/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maestro";
-  version = "2.4.0";
+  version = "2.5.1";
 
   src = fetchurl {
     url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
-    hash = "sha256-rqIs5nq2cYmX7JkMWGUu3gwr6PEKxHmQOco9zjOQ1jQ=";
+    hash = "sha256-LZJL/TfMyrykOKcnITZIy/5Pi7cRVZ7I6dGZ3AmlzlI=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/ma/mage/package.nix b/pkgs/by-name/ma/mage/package.nix
index 193fb03ffea6..11a406e19142 100644
--- a/pkgs/by-name/ma/mage/package.nix
+++ b/pkgs/by-name/ma/mage/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mage";
-  version = "1.17.1";
+  version = "1.17.2";
 
   src = fetchFromGitHub {
     owner = "magefile";
     repo = "mage";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-PoZqVUT+sKr9UY8OaWjYxaqTSYItOkOdi1FnmGJ1K78=";
+    sha256 = "sha256-QYvgKq7I+YGoDbECFGtQHPPP/z8oo5n3BT4LoShrEPc=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ma/maigret/package.nix b/pkgs/by-name/ma/maigret/package.nix
index 6c698831fd91..282880e139f4 100644
--- a/pkgs/by-name/ma/maigret/package.nix
+++ b/pkgs/by-name/ma/maigret/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "maigret";
-  version = "0.5.0";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "soxoj";
     repo = "maigret";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-y5b7t4ji72o1PXoqEQ0vNHqE1vwdkB/3gtsCj5GZ4Xg=";
+    hash = "sha256-3X8mRgsI0y1F/gUTWeYw83mQJKglJporpw7l9jI1Hvw=";
   };
 
   pythonRelaxDeps = true;
@@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   pythonRemoveDeps = [
     "future-annotations"
     "future"
+    "PyPDF2"
     "six"
   ];
 
@@ -43,6 +44,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       chardet
       cloudscraper
       colorama
+      curl-cffi
       flask
       html5lib
       idna
@@ -54,7 +56,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       networkx
       platformdirs
       pycountry
-      pypdf2
+      pypdf
       pysocks
       python-bidi
       pyvis
@@ -86,18 +88,20 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   disabledTests = [
     # Tests require network access
+    "test_check_features_manually_cloudflare"
+    "test_check_features_manually_success"
+    "test_detect_known_engine"
+    "test_dialog_adds_site_negative"
+    "test_dialog_adds_site_positive"
+    "test_dialog_replace_site"
     "test_extract_ids_from_page"
     "test_import_aiohttp_cookies"
     "test_maigret_results"
     "test_pdf_report"
     "test_self_check_db_negative_enabled"
     "test_self_check_db_positive_enable"
-    "test_detect_known_engine"
-    "test_check_features_manually_success"
-    "test_dialog_adds_site_positive"
-    "test_dialog_replace_site"
-    "test_dialog_adds_site_negative"
-    #
+    "test_twitter_graphql_probe_claimed_vs_unclaimed"
+    # Sandbox issue
     "test_self_check_db"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/ma/maiko/package.nix b/pkgs/by-name/ma/maiko/package.nix
index 3114dafc8c87..254e484e7cc8 100644
--- a/pkgs/by-name/ma/maiko/package.nix
+++ b/pkgs/by-name/ma/maiko/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maiko";
-  version = "250616-de1fafba";
+  version = "260319-9259716e";
 
   src = fetchFromGitHub {
     owner = "Interlisp";
     repo = "maiko";
     tag = "maiko-${finalAttrs.version}";
-    hash = "sha256-RYBV3gqcDPxRteCvUyqm8lKUpW4r0L7kJLlED8M72DI=";
+    hash = "sha256-IqXDw5JuABs1IEKpvq3xjjl4NgZVojdxQYRV6TLhqOk=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ma/mailpit/source.nix b/pkgs/by-name/ma/mailpit/source.nix
index 47e513398a1f..5b19c38381bf 100644
--- a/pkgs/by-name/ma/mailpit/source.nix
+++ b/pkgs/by-name/ma/mailpit/source.nix
@@ -1,6 +1,6 @@
 {
-  version = "1.29.6";
-  hash = "sha256-jkWrh2pQ4LBQMTb3r1kgbSmYRBCWPXIVC8ywM5yYnQg=";
-  npmDepsHash = "sha256-vt28b02zDkrNWR4nTD2IH87gqGlhxxaF7L0N5jSS76k=";
-  vendorHash = "sha256-k07JTSQ67ZVOiCUkRRW9u6V+E75gtfKpZ6zNa4eHH/Y=";
+  version = "1.29.7";
+  hash = "sha256-nd52Kf7wRJXSrLPgrYQ5VjUWFARObRRAJe3nIW19wZU=";
+  npmDepsHash = "sha256-s71BVJpim593GknE1XyBCb4sQwY8fKpAH7q/e/0Nmg0=";
+  vendorHash = "sha256-mGlzb4Q6nWew13Io8fAtR+3u4w1vjj4ssUaBJ9sjz6A=";
 }
diff --git a/pkgs/by-name/ma/man-pages/package.nix b/pkgs/by-name/ma/man-pages/package.nix
index be1ac104d5af..88566c5cc3f7 100644
--- a/pkgs/by-name/ma/man-pages/package.nix
+++ b/pkgs/by-name/ma/man-pages/package.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "man-pages";
-  version = "6.17";
+  version = "6.18";
 
   # `man` is first: most people installing `man-pages` want man pages.
   # The binaries could be split to a seperate package (as upstream suggests),
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/man-pages-${finalAttrs.version}.tar.xz";
-    hash = "sha256-0Y8hpgKwl3ilqQlr8b6EQbdzPpmBUEdKzPcD0WX06/Q=";
+    hash = "sha256-yTT63ItZdIxoIno09lgdLd+Cgrc83NUlRsjNiLdLJNE=";
   };
 
   # See https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/tree/man/man7/man.7,
diff --git a/pkgs/by-name/ma/mangowc/package.nix b/pkgs/by-name/ma/mangowc/package.nix
index ef551bd661e0..73d105379d7a 100644
--- a/pkgs/by-name/ma/mangowc/package.nix
+++ b/pkgs/by-name/ma/mangowc/package.nix
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mangowc";
-  version = "0.12.3";
+  version = "0.12.8";
 
   src = fetchFromGitHub {
-    owner = "DreamMaoMao";
-    repo = "mangowc";
+    owner = "mangowm";
+    repo = "mango";
     tag = finalAttrs.version;
-    hash = "sha256-cuOOgfufbGv0QIrRD6bAzaHiYXt32wxwt2Tzi+jAmwg=";
+    hash = "sha256-k9qFn9I+eeAq1kBfw6QRLRMDb6sIV+pgd5zpKNoc1ck=";
   };
 
   nativeBuildInputs = [
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     mainProgram = "mango";
     description = "Lightweight and feature-rich Wayland compositor based on dwl";
-    homepage = "https://github.com/DreamMaoMao/mangowc";
+    homepage = "https://mangowm.github.io";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ hustlerone ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ma/markitdown-mcp/package.nix b/pkgs/by-name/ma/markitdown-mcp/package.nix
index 460815412b07..d49ba08bed84 100644
--- a/pkgs/by-name/ma/markitdown-mcp/package.nix
+++ b/pkgs/by-name/ma/markitdown-mcp/package.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "markitdown_mcp"
   ];
 
-  passthru.updateScripts = gitUpdater { };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     description = "MCP server for the markitdown library";
diff --git a/pkgs/by-name/ma/marmite/package.nix b/pkgs/by-name/ma/marmite/package.nix
index 1863ae4d247d..4cbdb2463861 100644
--- a/pkgs/by-name/ma/marmite/package.nix
+++ b/pkgs/by-name/ma/marmite/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "marmite";
-  version = "0.2.7";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "rochacbruno";
     repo = "marmite";
     tag = version;
-    hash = "sha256-EPoBNfKkefOe82jXE3c6Y59iP2N6lLIbRvu65fcIcLg=";
+    hash = "sha256-Q07xA/TYI2O+8C0/3cTpZx0bt47lS+ilhxck18hzzCw=";
   };
 
-  cargoHash = "sha256-ec9X4cR3sI1LW9680LB2dPeXQ6fmO/2fmsJmc7s/nxI=";
+  cargoHash = "sha256-yWl8AWond03tT1CsyCrX72AX5ysow6jPgEtFonpLSyc=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix
index ffc186e8356c..c9dc8bb1c3af 100644
--- a/pkgs/by-name/ma/marp-cli/package.nix
+++ b/pkgs/by-name/ma/marp-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "marp-cli";
-  version = "4.2.3";
+  version = "4.3.1";
 
   src = fetchFromGitHub {
     owner = "marp-team";
     repo = "marp-cli";
     rev = "v${version}";
-    hash = "sha256-CvQq9qndD9S/9t8UBpewQsW83CfV3BXftfFgFZ5Lttk=";
+    hash = "sha256-Dj3DkHgoez4S2TtQQ9KlOWUFZkKDy5lUoNUhPkgUu64=";
   };
 
-  npmDepsHash = "sha256-VbpseSPH8uncCWiHtXBvCBARflXCCVTltmLO4uB8qmc=";
+  npmDepsHash = "sha256-tPFc7b5OtjRJiD8yGLOYiAMQ7NroJvGlpIvRlrq2TxQ=";
   npmPackFlags = [ "--ignore-scripts" ];
   makeCacheWritable = true;
 
diff --git a/pkgs/by-name/ma/massren/package.nix b/pkgs/by-name/ma/massren/package.nix
index a7085004b57f..d14b57039135 100644
--- a/pkgs/by-name/ma/massren/package.nix
+++ b/pkgs/by-name/ma/massren/package.nix
@@ -2,30 +2,21 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  fetchpatch,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "massren";
-  version = "1.5.6";
+  version = "1.5.7";
 
   src = fetchFromGitHub {
     owner = "laurent22";
     repo = "massren";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64=";
+    hash = "sha256-PjF7ani4NdM0Avz0/4D04CZLdvkQHg91E/eFoDXD6ks=";
   };
 
   vendorHash = null;
 
-  patches = [
-    # Add Go Modules support
-    (fetchpatch {
-      url = "https://github.com/laurent22/massren/commit/83df215b6e112d1ec375b08d8c44dadc5107155d.patch";
-      hash = "sha256-FMTmUrv6zGq11vexUirAuK3H6r78RtoipqyWoh+pzrs=";
-    })
-  ];
-
   ldflags = [
     "-s"
     "-w"
diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
index 1b4541236405..1d440d736dc5 100644
--- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "matrix-alertmanager-receiver";
-  version = "2026.4.1";
+  version = "2026.4.29";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-2ULM0hjKWbFaZvVgkAST4+EvGF4U/xUbJf03NwFs34s=";
+    hash = "sha256-QcxPWVA6l5AB42K/4nHszB1kz399+Cjkuu98Zpqq4oE=";
   };
 
-  vendorHash = "sha256-Cw6zU+jwHNPpDenP/KxEdMuLYempyc6mUJ5nmV728DU=";
+  vendorHash = "sha256-ajJ+jSjq7+7QyxAU72bfKMf0KJQzxraQfiRrxQ63rEY=";
 
   env.CGO_ENABLED = "0";
 
diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix
index 0808db452bdb..daca0e92df47 100644
--- a/pkgs/by-name/ma/matrix-continuwuity/package.nix
+++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix
@@ -23,66 +23,32 @@ let
     }).overrideAttrs
       (
         final: old: {
-          version = "10.5.1";
+          version = "10.10.1";
           src = fetchFromGitea {
             domain = "forgejo.ellis.link";
             owner = "continuwuation";
             repo = "rocksdb";
-            rev = "10.5.fb";
-            hash = "sha256-X4ApGLkHF9ceBtBg77dimEpu720I79ffLoyPa8JMHaU=";
+            rev = "10.10.fb";
+            hash = "sha256-1ef75IDMs5Hba4VWEyXPJb02JyShy5k4gJfzGDhopRk=";
           };
 
           patches = [ ];
-
-          cmakeFlags =
-            lib.subtractLists [
-              # no real reason to have snappy or zlib, no one uses this
-              (lib.cmakeBool "WITH_SNAPPY" true)
-              (lib.cmakeBool "ZLIB" true)
-              (lib.cmakeBool "WITH_ZLIB" true)
-              # we dont need to use ldb or sst_dump (core_tools)
-              (lib.cmakeBool "WITH_CORE_TOOLS" true)
-              # we dont need to build rocksdb tests
-              (lib.cmakeBool "WITH_TESTS" true)
-              # we use rust-rocksdb via C interface and dont need C++ RTTI
-              (lib.cmakeBool "USE_RTTI" true)
-              # this doesn't exist in RocksDB
-              (lib.cmakeBool "FORCE_SSE43" true)
-            ] old.cmakeFlags
-            ++ [
-              # no real reason to have snappy, no one uses this
-              (lib.cmakeBool "WITH_SNAPPY" false)
-              (lib.cmakeBool "ZLIB" false)
-              (lib.cmakeBool "WITH_ZLIB" false)
-              # we dont need to use ldb or sst_dump (core_tools)
-              (lib.cmakeBool "WITH_CORE_TOOLS" false)
-              # we dont need to build rocksdb tests
-              (lib.cmakeBool "WITH_TESTS" false)
-              # we use rust-rocksdb via C interface and dont need C++ RTTI
-              (lib.cmakeBool "USE_RTTI" false)
-              (lib.cmakeBool "WITH_TRACE_TOOLS" false)
-            ];
-          outputs = [ "out" ];
-
-          # We aren't building tools, the original package uses this to make sure rocksdb
-          # tools work as expected. Hence we override this and make it empty.
-          preInstall = "";
         }
       );
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-continuwuity";
-  version = "0.5.6";
+  version = "0.5.8";
 
   src = fetchFromGitea {
     domain = "forgejo.ellis.link";
     owner = "continuwuation";
     repo = "continuwuity";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p6dL1wL9n+1ivUItdlZuLxTneDBjCHEdNr0ukau2rHI=";
+    hash = "sha256-o7bZMSsdSt6VOrsuSMrS7fU9u/LrdD/579IMvsZH+ss=";
   };
 
-  cargoHash = "sha256-lLbnFA2WS96er84G2e9bGrYhhqe2zL3Npn1SXB3De2w=";
+  cargoHash = "sha256-QM4K5TmWWRTcrovAvvEbXEraI4C0vMSJ68Z/6kHhOr8=";
 
   nativeBuildInputs = [
     pkg-config
@@ -122,6 +88,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://forgejo.ellis.link/continuwuation/continuwuity/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
+      bartoostveen
       nyabinary
       snaki
     ];
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 5874e298015a..cfb4e84f85b7 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -14,19 +14,19 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.151.0";
+  version = "1.152.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-Ha0GXVdOyAqBwC0iRX41kZSW9onutdsfkhn7z/fNai8=";
+    hash = "sha256-cjc9vC3sfsFaxcxEpXAAAza9/p3fk/2oCa4oB1fWAdA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-bEAXUoyerS7KjP1f15Z+5nktX1H7Mx4wATJBRfbJW+4=";
+    hash = "sha256-RwUsiS6JM5dmqquKVtyaBp67DYZys6Uecy0V6AabTk4=";
   };
 
   build-system =
diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix
index 6d595e4a1754..ee783f10d5fb 100644
--- a/pkgs/by-name/ma/matrix-tuwunel/package.nix
+++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix
@@ -89,16 +89,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-tuwunel";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "matrix-construct";
     repo = "tuwunel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VdG8tSbRPTG915l0Y7eYsGprPSerYF2dpo64D4er5io=";
+    hash = "sha256-7w2+hltPj0mP3xcmHfjFvIqxwFkcf71bzm4TFiz745g=";
   };
 
-  cargoHash = "sha256-97DM+khPcwze3iH4DJODyI8WEjqcl3ftg26odcRdrKc=";
+  cargoHash = "sha256-DuHV4/a3B/Khq9/RgxFg5RfQ2svdKPv+QyuUqKGAveo=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ma/matterircd/package.nix b/pkgs/by-name/ma/matterircd/package.nix
index 4e0d748d6e8f..644de7bca07d 100644
--- a/pkgs/by-name/ma/matterircd/package.nix
+++ b/pkgs/by-name/ma/matterircd/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "matterircd";
-  version = "0.28.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "42wim";
     repo = "matterircd";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-qA07i31fGLLIfWoCBW1f5nvf4AWEIkSXZh22F6rRnpM=";
+    sha256 = "sha256-7pOhUeUT95nk6kk03xAaIYHgXwr09m6LSbib2YSi1Ck=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix
index 7dc24b53521e..89dde4b56f85 100644
--- a/pkgs/by-name/ma/mattermost-desktop/package.nix
+++ b/pkgs/by-name/ma/mattermost-desktop/package.nix
@@ -15,16 +15,16 @@ in
 
 buildNpmPackage rec {
   pname = "mattermost-desktop";
-  version = "6.1.1";
+  version = "6.1.2";
 
   src = fetchFromGitHub {
     owner = "mattermost";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-NSTOmrHq1igcO9Wm6PYKHXpVfidLitUaCFou0d6+E2g=";
+    hash = "sha256-EI1bDSiWdLCXlhUk1CmbUyYU7giey366cZLuhs0qtqY=";
   };
 
-  npmDepsHash = "sha256-Er3D7wQMhdEXwR7ISk/OUa7Zu9TkAZj1xCQ5jWcRXgc=";
+  npmDepsHash = "sha256-7XUZ2rt2fZiQNpW8iHnNDbCSuK4/srWqIEKOKM6xty8=";
   npmBuildScript = "build-prod";
   makeCacheWritable = true;
 
@@ -37,6 +37,8 @@ buildNpmPackage rec {
       --replace-fail \
         "const VERSION = childProcess.execSync('git rev-parse --short HEAD', {cwd: __dirname}).toString();" \
         "const VERSION = process.env.version;"
+    substituteInPlace src/common/config/buildConfig.ts \
+      --replace-fail 'enableUpdateNotifications: true,' 'enableUpdateNotifications: false,'
   '';
 
   postBuild = ''
@@ -101,6 +103,7 @@ buildNpmPackage rec {
     maintainers = with lib.maintainers; [
       joko
       liff
+      yayayayaka
     ];
   };
 }
diff --git a/pkgs/by-name/ma/mattermost/build-plugin.nix b/pkgs/by-name/ma/mattermost/build-plugin.nix
index 730ded413609..10ef34d65bc6 100644
--- a/pkgs/by-name/ma/mattermost/build-plugin.nix
+++ b/pkgs/by-name/ma/mattermost/build-plugin.nix
@@ -30,7 +30,7 @@
   # True to build the webapp.
   buildWebapp ? true,
 
-  # The NPM dependency hash.
+  # The npm dependency hash.
   npmDepsHash ? lib.fakeHash,
 
   # Any extra attributes to pass to buildGoModule.
@@ -91,7 +91,7 @@ buildGoModule (
         go mod tidy
       '';
 
-      # Adding the NPM config hook here breaks things, and isn't even needed.
+      # Adding the npm config hook here breaks things, and isn't even needed.
       nativeBuildInputs = lib.lists.remove npmHooks.npmConfigHook final.nativeBuildInputs;
     };
 
diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 11cfca7f6a8c..51e25ec144dc 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -5,7 +5,7 @@
   buildGoModule,
   fetchFromGitHub,
   buildNpmPackage,
-  nodejs_22,
+  nodejs,
   nix-update-script,
   npm-lockfile-fix,
   fetchNpmDeps,
@@ -13,20 +13,21 @@
   nixosTests,
 
   versionInfo ? {
-    # ESR releases only.
-    # See https://docs.mattermost.com/upgrade/extended-support-release.html
+    # ESR releases only. Note: if NixOS would release with an ESR that goes out
+    # of support during the lifetime of the NixOS release, it is acceptable
+    # to put the latest non-ESR release here if we change it to an ESR shortly after
+    # the NixOS release.
+    #
+    # See <https://docs.mattermost.com/upgrade/extended-support-release.html>.
     # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update
     # the version regex here as well.
     #
     # Ensure you also check ../mattermostLatest/package.nix.
-    regex = "^v(10\\.11\\.[0-9]+)$";
-    version = "10.11.14";
-    srcHash = "sha256-rcKsfCJSot9mz8ds4LoIurF0NsgGQuuqhb9PRPjyxqU=";
-    vendorHash = "sha256-hKAKM2qFn5Zvr/Sc33XmFl7l59agMaEvlvVD5aOyaxI=";
-    npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A=";
-    lockfileOverlay = ''
-      unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
-    '';
+    regex = "^v(11\\.[67]\\.[0-9]+)$";
+    version = "11.6.1";
+    srcHash = "sha256-0TUh5qKi64jt3YhgCTceoizOGzqyt70Rh8VH+bSfS5o=";
+    vendorHash = "sha256-bWl1rdVRTOJzS2HKKsSRhzVcH1sPgEAlRLjrc+/o0lo=";
+    npmDepsHash = "sha256-30xwoizNh6fAWS0YdEheXtcO6I9MjoFdCekvLnnoBMc=";
   },
   ...
 }:
@@ -223,9 +224,7 @@ buildMattermost rec {
           --replace-fail 'options: {}' 'options: { disable: true }'
       '';
 
-      # https://github.com/NixOS/nixpkgs/issues/474535
-      nodejs = nodejs_22;
-
+      inherit nodejs;
       npmDepsHash = npmDeps.hash;
       makeCacheWritable = true;
       forceGitDeps = true;
@@ -235,10 +234,9 @@ buildMattermost rec {
       buildPhase = ''
         runHook preBuild
 
-        npm run build --workspace=platform/types
-        npm run build --workspace=platform/client
-        npm run build --workspace=platform/components
-        npm run build --workspace=channels
+        for ws in platform/{types,client,components,shared} channels; do
+          npm run build --workspace="$ws"
+        done
 
         runHook postBuild
       '';
diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix
index 53ccc82ab558..4283d6971b87 100644
--- a/pkgs/by-name/ma/mattermost/tests.nix
+++ b/pkgs/by-name/ma/mattermost/tests.nix
@@ -4,7 +4,6 @@
   gotestsum,
   which,
   postgresql,
-  mariadb,
   redis,
   curl,
   net-tools,
@@ -20,7 +19,6 @@ mattermost.overrideAttrs (
     nativeCheckInputs = [
       which
       postgresql
-      mariadb
       redis
       curl
       net-tools
@@ -113,11 +111,6 @@ mattermost.overrideAttrs (
         fi
       }
 
-      # Waits for MySQL to come up or down.
-      wait_mysql() {
-        wait_cmd mysql "$1" mysqladmin ping
-      }
-
       # Waits for Postgres to come up or down.
       wait_postgres() {
         wait_cmd postgres "$1" pg_isready -h localhost
@@ -128,33 +121,6 @@ mattermost.overrideAttrs (
         wait_cmd redis "$1" redis-cli ping
       }
 
-      # Starts MySQL.
-      start_mysql() {
-        echo "Starting MySQL at $MYSQL_HOME" >&2
-        mysqld &
-        mysql_pid=$!
-        echo "... PID $mysql_pid" >&2
-        wait_mysql up
-      }
-
-      # Stops MySQL.
-      stop_mysql() {
-        if [ "$mysql_pid" -gt 0 ]; then
-          echo "Terminating MySQL at $MYSQL_HOME (PID $mysql_pid)" >&2
-          mysqladmin --host=127.0.0.1 --user=root --password=mostest --wait-for-all-slaves --shutdown-timeout=30 shutdown
-          wait_mysql down
-          wait_cmd 'mysql pid' down kill -0 "$mysql_pid"
-
-          # Make sure the worker PID went down too (but it may be already gone).
-          local worker_pid="$(<"$MYSQL_HOME"/mysqld.pid || echo 0)"
-          if [ -n "$worker_pid" ] && [ $worker_pid -gt 0 ]; then
-            wait_cmd 'mysql workers' down kill -0 "$worker_pid"
-          fi
-
-          mysql_pid=0
-        fi
-      }
-
       # Starts Postgres.
       start_postgres() {
         echo "Starting Postgres at $PGDATA" >&2
@@ -186,52 +152,6 @@ mattermost.overrideAttrs (
         redis_pid=0
       }
 
-      # Configure MySQL.
-      export MYSQL_HOME="$NIX_BUILD_TOP/.mysql"
-      mkdir -p "$MYSQL_HOME"
-      cat <<EOF >"$MYSQL_HOME/my.cnf"
-      [client]
-      port = 3306
-      default-character-set = utf8mb4
-      socket = $MYSQL_HOME/mysqld.sock
-
-      [mysqld]
-      skip-host-cache
-      skip-name-resolve
-      basedir = ${mariadb}
-      datadir = $MYSQL_HOME/
-      pid-file = $MYSQL_HOME/mysqld.pid
-      socket = $MYSQL_HOME/mysqld.sock
-      port = 3306
-      explicit_defaults_for_timestamp
-      collation-server = utf8mb4_general_ci
-      init-connect = 'SET NAMES utf8mb4'
-      character-set-server = utf8mb4
-      EOF
-
-      # Start MySQL.
-      mysql_install_db --skip-name-resolve --auth-root-authentication-method=normal
-      start_mysql
-
-      # Init MySQL.
-      cat <<EOF | mysql --defaults-file="$MYSQL_HOME/my.cnf" -u root -v
-      -- This is the admin password for tests; see the docker-compose:
-      -- https://github.com/mattermost/mattermost/blob/v${final.version}/server/docker-compose.yaml
-      create user if not exists 'mmuser' identified by 'mostest';
-      create database if not exists mattermost_test;
-      grant all privileges on *.* to 'mmuser' with grant option;
-
-      -- Also need to set up root (tests seem to override the user to root)
-      alter user 'root'@'127.0.0.1' identified by 'mostest';
-
-      flush privileges;
-      show grants for 'root'@'127.0.0.1';
-      show grants for 'mmuser';
-      EOF
-
-      # Need to change this so we use 127.0.0.1 in tests.
-      export TEST_DATABASE_MYSQL_DSN='root:mostest@tcp(127.0.0.1:3306)/mattermost_test?charset=utf8mb4&readTimeout=30s&writeTimeout=30s'
-
       # Start Postgres.
       export PGDATA="$NIX_BUILD_TOP/.postgres"
       initdb -E UTF8 -U postgres
@@ -284,12 +204,6 @@ mattermost.overrideAttrs (
     '';
 
     postCheck = ''
-      # Clean up MySQL.
-      if [ -d "$MYSQL_HOME" ]; then
-        stop_mysql
-        rm -rf "$MYSQL_HOME"
-      fi
-
       # Clean up Postgres.
       if [ -d "$PGDATA" ]; then
         stop_postgres
diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index 7f5ef6c0490b..c601200a51c2 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -3,25 +3,4 @@
   ...
 }@args:
 
-mattermost.override (
-  {
-    versionInfo = {
-      # Latest, non-RC releases only.
-      # If the latest is an ESR (Extended Support Release),
-      # duplicate it here to facilitate the update script.
-      # See https://docs.mattermost.com/about/mattermost-server-releases.html
-      # and make sure the version regex is up to date here.
-      # Ensure you also check ../mattermost/package.nix for ESR releases.
-      regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
-      version = "11.5.3";
-      srcHash = "sha256-r7rfiQ4C0E511QWdpQihydsuoRZCzboodmh1iT4a8r4=";
-      vendorHash = "sha256-/ts6j86tvbYFjVACkJwcSnXDd+8BXzpaFVdV9DRHkqY=";
-      npmDepsHash = "sha256-r7iq1pCAJjFyspZBdeNWe00W7A3l73PGC6rrsZ7O6Uw=";
-      lockfileOverlay = ''
-        unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
-      '';
-      autoUpdate = ./package.nix;
-    };
-  }
-  // args
-)
+mattermost.override args
diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index e40797f08d13..8c08f6a0643f 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -10,18 +10,18 @@
   python3,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "maturin";
-  version = "1.11.5";
+  version = "1.12.6";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
-    rev = "v${version}";
-    hash = "sha256-OTL6Poz6FIR+zpKiaCDGsUGkm2/jMVAuOS0bV/o4F3M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-NQ94RdQTQlRR5+2dC95cFNhwYliHmkD11JWyGt6BV6g=";
   };
 
-  cargoHash = "sha256-pBhKuVfq9x4kHYmE2p5ly1EXG2Sr8hHQ7pHCaERqsw0=";
+  cargoHash = "sha256-9VqS9wvQAsSYNhH7B9WlD6SZjXR4S2sYzYoNy6vbYBM=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
@@ -59,12 +59,15 @@ rustPlatform.buildRustPackage rec {
       Python and can upload them to PyPI.
     '';
     homepage = "https://github.com/PyO3/maturin";
-    changelog = "https://github.com/PyO3/maturin/blob/v${version}/Changelog.md";
+    changelog = "https://github.com/PyO3/maturin/blob/v${finalAttrs.version}/Changelog.md";
     license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ getchoo ];
+    maintainers = with lib.maintainers; [
+      getchoo
+      miniharinn
+    ];
     mainProgram = "maturin";
   };
-}
+})
diff --git a/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock b/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock
index 49ae79ecbca4..1fb0bcec71ae 100644
--- a/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock
+++ b/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock
@@ -2,12 +2,6 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.6"
@@ -45,41 +39,23 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "indoc"
-version = "2.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.180"
+version = "0.2.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "portable-atomic"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "proc-macro2"
@@ -92,29 +68,26 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.27.2"
+version = "0.28.2"
 dependencies = [
- "indoc",
  "libc",
- "memoffset",
  "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
- "unindent",
 ]
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.27.2"
+version = "0.28.2"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.27.2"
+version = "0.28.2"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -122,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.27.2"
+version = "0.28.2"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -132,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.27.2"
+version = "0.28.2"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -143,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.44"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
@@ -170,17 +143,11 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "rustversion"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
-
 [[package]]
 name = "syn"
-version = "2.0.114"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -189,21 +156,15 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.13.4"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1dd07eb858a2067e2f3c7155d54e929265c264e6f37efe3ee7a8d1b5a1dd0ba"
+checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
-
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "word-count"
diff --git a/pkgs/by-name/ma/maturin/pyo3-test/default.nix b/pkgs/by-name/ma/maturin/pyo3-test/default.nix
index d5083caf0b06..d0ea229176d8 100644
--- a/pkgs/by-name/ma/maturin/pyo3-test/default.nix
+++ b/pkgs/by-name/ma/maturin/pyo3-test/default.nix
@@ -11,15 +11,15 @@
   preConfigure,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "word-count";
-  version = "0.27.2";
+  version = "0.28.2";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "pyo3";
-    rev = "v${version}";
-    hash = "sha256-xuC/7rynufWCHBnMiJny4m1Y1aaogdv/5UsafpmZLAw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Jg+eni7I0jVUFViWbgj5F094ksvyuvF4mdgGzh0PMaQ=";
   };
 
   cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
@@ -43,4 +43,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix
index 3131ff5c9522..2c70b6cc1dee 100644
--- a/pkgs/by-name/ma/mautrix-signal/package.nix
+++ b/pkgs/by-name/ma/mautrix-signal/package.nix
@@ -20,14 +20,14 @@ let
 in
 buildGoModule rec {
   pname = "mautrix-signal";
-  version = "26.03";
-  tag = "v0.2603.0";
+  version = "26.04";
+  tag = "v0.2604.0";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "signal";
     inherit tag;
-    hash = "sha256-6CTgzhAojDBn7mArysuSh9GUGaleUHb4HFNq+shpKy4=";
+    hash = "sha256-DKJ8BiBu3lhBqeqjCsNNSwF+iSFd8QnJ4wDS7EGU/UM=";
   };
 
   buildInputs =
@@ -46,7 +46,7 @@ buildGoModule rec {
     CGO_LDFLAGS = toString [ cppStdLib ];
   };
 
-  vendorHash = "sha256-RDr8EUqix8XXMTUGCwCCkQyuvYQeZ8wpYM/dU2dw0m0=";
+  vendorHash = "sha256-rTDEB8OS0RbXNlKHrdtBPkti2PzjbuxaoAKa3uri5CM=";
 
   ldflags = [
     "-X"
diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix
index 65b8bd2f7fc6..96a871d64b4d 100644
--- a/pkgs/by-name/ma/maven/build-maven-package.nix
+++ b/pkgs/by-name/ma/maven/build-maven-package.nix
@@ -6,149 +6,159 @@
   maven,
   writers,
 }:
-
-{
-  src,
-  sourceRoot ? null,
-  buildOffline ? false,
-  doCheck ? true,
-  prePatch ? null,
-  patches ? [ ],
-  postPatch ? null,
-  pname,
-  version,
-  mvnJdk ? jdk,
-  mvnHash ? "",
-  mvnFetchExtraArgs ? { },
-  mvnDepsParameters ? "",
-  manualMvnArtifacts ? [ ],
-  manualMvnSources ? [ ],
-  mvnParameters ? "",
-  ...
-}@args:
-
-# originally extracted from dbeaver
-# created to allow using maven packages in the same style as rust
-
 let
-  mvnSkipTests = lib.optionalString (!doCheck) "-DskipTests";
-
-  writeProxySettings = writers.writePython3 "write-proxy-settings" { } ./maven-proxy.py;
-
-  fetchedMavenDeps = stdenv.mkDerivation (
+  buildMavenPackage =
     {
-      pname = "maven-deps-${pname}";
-      inherit
-        src
-        sourceRoot
-        prePatch
-        patches
-        postPatch
-        version
-        ;
+      src,
+      sourceRoot ? null,
+      buildOffline ? false,
+      doCheck ? true,
+      prePatch ? null,
+      patches ? [ ],
+      postPatch ? null,
+      pname,
+      version,
+      mvnJdk ? jdk,
+      mvnHash ? "",
+      mvnFetchExtraArgs ? { },
+      mvnDepsParameters ? "",
+      manualMvnArtifacts ? [ ],
+      manualMvnSources ? [ ],
+      mvnParameters ? "",
+      ...
+    }@args:
 
-      nativeBuildInputs = [
-        maven
-      ]
-      ++ args.nativeBuildInputs or [ ];
+    # originally extracted from dbeaver
+    # created to allow using maven packages in the same style as rust
 
-      env = mvnFetchExtraArgs.env or { } // {
-        JAVA_HOME = mvnJdk;
-      };
+    let
+      mvnSkipTests = lib.optionalString (!doCheck) "-DskipTests";
 
-      impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+      writeProxySettings = writers.writePython3 "write-proxy-settings" { } ./maven-proxy.py;
 
-      buildPhase = ''
-        runHook preBuild
+      fetchedMavenDeps = stdenv.mkDerivation (
+        {
+          pname = "maven-deps-${pname}";
+          inherit
+            src
+            sourceRoot
+            prePatch
+            patches
+            postPatch
+            version
+            ;
 
-        MAVEN_EXTRA_ARGS="-B"
+          nativeBuildInputs = [
+            maven
+          ]
+          ++ args.nativeBuildInputs or [ ];
 
-        # handle proxy
-        if [[ -n "''${HTTP_PROXY-}" ]] || [[ -n "''${HTTPS_PROXY-}" ]] || [[ -n "''${NO_PROXY-}" ]];then
-          mvnSettingsFile="$(mktemp -d)/settings.xml"
-          ${writeProxySettings} $mvnSettingsFile
-          MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -s=$mvnSettingsFile"
-        fi
+          env = mvnFetchExtraArgs.env or { } // {
+            JAVA_HOME = mvnJdk;
+          };
 
-        # handle cacert by populating a trust store on the fly
-        if [[ -n "''${NIX_SSL_CERT_FILE-}" ]] && [[ "''${NIX_SSL_CERT_FILE-}" != "/no-cert-file.crt" ]];then
-          echo "using ''${NIX_SSL_CERT_FILE-} as trust store"
-          ${jre-generate-cacerts} ${lib.getBin jdk}/bin/keytool $NIX_SSL_CERT_FILE
+          impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 
-          MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -Djavax.net.ssl.trustStore=cacerts -Djavax.net.ssl.trustStorePassword=changeit"
-        fi
-      ''
-      + lib.optionalString buildOffline ''
-        mvn $MAVEN_EXTRA_ARGS de.qaware.maven:go-offline-maven-plugin:1.2.8:resolve-dependencies -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters}
+          buildPhase = ''
+            runHook preBuild
 
-        for artifactId in ${toString manualMvnArtifacts}
-        do
-          echo "downloading manual $artifactId"
-          mvn $MAVEN_EXTRA_ARGS dependency:get -Dartifact="$artifactId" -Dmaven.repo.local=$out/.m2
-        done
+            MAVEN_EXTRA_ARGS="-B"
 
-        for artifactId in ${toString manualMvnSources}
-        do
-          group=$(echo $artifactId | cut -d':' -f1)
-          artifact=$(echo $artifactId | cut -d':' -f2)
-          echo "downloading manual sources $artifactId"
-          mvn $MAVEN_EXTRA_ARGS dependency:sources -DincludeGroupIds="$group" -DincludeArtifactIds="$artifact" -Dmaven.repo.local=$out/.m2
-        done
-      ''
-      + lib.optionalString (!buildOffline) ''
-        mvn $MAVEN_EXTRA_ARGS package -Dmaven.repo.local=$out/.m2 ${mvnSkipTests} ${mvnParameters}
-      ''
-      + ''
-        runHook postBuild
-      '';
+            # handle proxy
+            if [[ -n "''${HTTP_PROXY-}" ]] || [[ -n "''${HTTPS_PROXY-}" ]] || [[ -n "''${NO_PROXY-}" ]];then
+              mvnSettingsFile="$(mktemp -d)/settings.xml"
+              ${writeProxySettings} $mvnSettingsFile
+              MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -s=$mvnSettingsFile"
+            fi
 
-      # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
-      installPhase = ''
-        runHook preInstall
+            # handle cacert by populating a trust store on the fly
+            if [[ -n "''${NIX_SSL_CERT_FILE-}" ]] && [[ "''${NIX_SSL_CERT_FILE-}" != "/no-cert-file.crt" ]];then
+              echo "using ''${NIX_SSL_CERT_FILE-} as trust store"
+              ${jre-generate-cacerts} ${lib.getBin jdk}/bin/keytool $NIX_SSL_CERT_FILE
 
-        find $out -type f \( \
-          -name \*.lastUpdated \
-          -o -name resolver-status.properties \
-          -o -name _remote.repositories \) \
-          -delete
+              MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -Djavax.net.ssl.trustStore=cacerts -Djavax.net.ssl.trustStorePassword=changeit"
+            fi
+          ''
+          + lib.optionalString buildOffline ''
+            mvn $MAVEN_EXTRA_ARGS de.qaware.maven:go-offline-maven-plugin:1.2.8:resolve-dependencies -Dmaven.repo.local=$out/.m2 ${mvnDepsParameters}
 
-        runHook postInstall
-      '';
+            for artifactId in ${toString manualMvnArtifacts}
+            do
+              echo "downloading manual $artifactId"
+              mvn $MAVEN_EXTRA_ARGS dependency:get -Dartifact="$artifactId" -Dmaven.repo.local=$out/.m2
+            done
 
-      # don't do any fixup
-      dontFixup = true;
-      outputHashAlgo = if mvnHash != "" then null else "sha256";
-      outputHashMode = "recursive";
-      outputHash = mvnHash;
-    }
-    // (removeAttrs mvnFetchExtraArgs [ "env" ])
-  );
+            for artifactId in ${toString manualMvnSources}
+            do
+              group=$(echo $artifactId | cut -d':' -f1)
+              artifact=$(echo $artifactId | cut -d':' -f2)
+              echo "downloading manual sources $artifactId"
+              mvn $MAVEN_EXTRA_ARGS dependency:sources -DincludeGroupIds="$group" -DincludeArtifactIds="$artifact" -Dmaven.repo.local=$out/.m2
+            done
+          ''
+          + lib.optionalString (!buildOffline) ''
+            mvn $MAVEN_EXTRA_ARGS package -Dmaven.repo.local=$out/.m2 ${mvnSkipTests} ${mvnParameters}
+          ''
+          + ''
+            runHook postBuild
+          '';
+
+          # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
+          installPhase = ''
+            runHook preInstall
+
+            find $out -type f \( \
+              -name \*.lastUpdated \
+              -o -name resolver-status.properties \
+              -o -name _remote.repositories \) \
+              -delete
+
+            runHook postInstall
+          '';
+
+          # don't do any fixup
+          dontFixup = true;
+          outputHashAlgo = if mvnHash != "" then null else "sha256";
+          outputHashMode = "recursive";
+          outputHash = mvnHash;
+        }
+        // (removeAttrs mvnFetchExtraArgs [ "env" ])
+      );
+    in
+    stdenv.mkDerivation (
+      removeAttrs args [ "mvnFetchExtraArgs" ]
+      // {
+        inherit fetchedMavenDeps;
+
+        nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
+          maven
+        ];
+
+        env = args.env or { } // {
+          JAVA_HOME = mvnJdk;
+        };
+
+        buildPhase = ''
+          runHook preBuild
+
+          mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)
+          runHook afterDepsSetup
+          mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters}
+
+          runHook postBuild
+        '';
+
+        meta = args.meta or { } // {
+          platforms = args.meta.platforms or maven.meta.platforms;
+        };
+      }
+    );
 in
-stdenv.mkDerivation (
-  removeAttrs args [ "mvnFetchExtraArgs" ]
-  // {
-    inherit fetchedMavenDeps;
-
-    nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
-      maven
-    ];
-
-    env = args.env or { } // {
-      JAVA_HOME = mvnJdk;
-    };
-
-    buildPhase = ''
-      runHook preBuild
-
-      mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)
-      runHook afterDepsSetup
-      mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters}
-
-      runHook postBuild
-    '';
-
-    meta = args.meta or { } // {
-      platforms = args.meta.platforms or maven.meta.platforms;
-    };
-  }
-)
+fnOrAttrs:
+if !lib.isFunction fnOrAttrs then
+  buildMavenPackage fnOrAttrs
+else
+  let
+    finalAttrs = fnOrAttrs finalAttrs;
+  in
+  buildMavenPackage finalAttrs
diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix
index a5a3030fe81e..a8379d4f5a97 100644
--- a/pkgs/by-name/ma/maven/package.nix
+++ b/pkgs/by-name/ma/maven/package.nix
@@ -85,7 +85,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     ];
     license = lib.licenses.asl20;
     mainProgram = "mvn";
-    maintainers = with lib.maintainers; [ tricktron ];
+    maintainers = with lib.maintainers; [
+      tricktron
+      britter
+    ];
     teams = [ lib.teams.java ];
     inherit (jdk_headless.meta) platforms;
   };
diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix
index 246785e68cf1..db5832f5ed50 100644
--- a/pkgs/by-name/mc/mcp-grafana/package.nix
+++ b/pkgs/by-name/mc/mcp-grafana/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "mcp-grafana";
-  version = "0.11.6";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "mcp-grafana";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cJjapd2phI4NgMAPzsKrs74+sEK7ykfKHQx24FVpHoQ=";
+    hash = "sha256-JlTyTUm1gvOKsRu2dGAPWv0IyU2fVjrsO+6wHxMGFDg=";
   };
 
-  vendorHash = "sha256-a9VgfzJmbTudYSLqhBBnkpq37xghtxWTzpcd7rMlZmA=";
+  vendorHash = "sha256-dTCOD6/+o3ZHI2qAb97ZJaMyAg0dqIisrHhUkgXzw7w=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/mc/mcp-nixos/package.nix b/pkgs/by-name/mc/mcp-nixos/package.nix
index ef1053c62ccb..bdf961f8c97b 100644
--- a/pkgs/by-name/mc/mcp-nixos/package.nix
+++ b/pkgs/by-name/mc/mcp-nixos/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mcp-nixos";
-  version = "2.3.1";
+  version = "2.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "utensils";
     repo = "mcp-nixos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A7KhRVOqLmtta507DPZoKbO8D1AlMMDWLMfHEBhEAxY=";
+    hash = "sha256-mWq9nnL4IGhUFkXJr8+t6BresOTDFS1caG8NuFqjrJg=";
   };
 
   build-system = [ python3Packages.hatchling ];
diff --git a/pkgs/by-name/mc/mcuboot-imgtool/package.nix b/pkgs/by-name/mc/mcuboot-imgtool/package.nix
index def6f6e3792d..8c0d680f4ab4 100644
--- a/pkgs/by-name/mc/mcuboot-imgtool/package.nix
+++ b/pkgs/by-name/mc/mcuboot-imgtool/package.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mcuboot-imgtool";
-  version = "2.3.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) version;
     pname = "imgtool";
-    hash = "sha256-//cuTnk6wOwCpJPBlUhxXMwKI1ivruqhC0nMwuC9EpU=";
+    hash = "sha256-7y2x2eP2K5vJQlqOhsTqchLBZPChbpI9VSUPDYdDNC4=";
   };
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix
index 01e0da8b6407..182e160c5919 100644
--- a/pkgs/by-name/md/md-tui/package.nix
+++ b/pkgs/by-name/md/md-tui/package.nix
@@ -8,16 +8,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "md-tui";
-  version = "0.9.5";
+  version = "0.10.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "henriklovhaug";
     repo = "md-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y6AkkZc9d+I4vVeyGnkShHBAAM70shKCWaZpJxn0a0k=";
+    hash = "sha256-ZyCPaeY1fcUEx5LNHlp84BJ525BTeqiwLGxvGElWIVA=";
   };
 
-  cargoHash = "sha256-3iD5xp+v9xz5Ru/OGR8SBMmuAioS7usjtfbCgWaizzs=";
+  cargoHash = "sha256-E/WW3LnD5qVJciyOYmAZSVBhXKRuTgEHbV0UHC18+Vw=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
index 7865a124bf3e..9b3640fedcb4 100644
--- a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
+++ b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Helpers for a mdbook i18n workflow based on Gettext";
     homepage = "https://github.com/google/mdbook-i18n-helpers";
-    changelog = "https://github.com/google/mdbook-i18n-helpers/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/google/mdbook-i18n-helpers/releases/tag/mdbook-i18n-helpers-${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       teutat3s
diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix
index 82fa79d82e87..13532b495f3f 100644
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -15,16 +15,16 @@ in
 buildGo126Module (finalAttrs: {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.17.1";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = "mediamtx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KI6JSyhbraynwwuNp6rBH/VN9/oIJYGC8rTqyTvfDOU=";
+    hash = "sha256-DScZKan8PnEF0znAxJVx8fgbEskw73tv35v38d2jJtM=";
   };
 
-  vendorHash = "sha256-4UFSiPDslVHp6olB3c1AEm1ZxgCdeUKTp3KwqEo152I=";
+  vendorHash = "sha256-FJqERr/rC4y8nBFKh8luwm9pOeVEiKPHorZ5z57wD1E=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js
diff --git a/pkgs/by-name/me/mellowplayer/package.nix b/pkgs/by-name/me/mellowplayer/package.nix
deleted file mode 100644
index 89429be73733..000000000000
--- a/pkgs/by-name/me/mellowplayer/package.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  stdenv,
-  cmake,
-  fetchFromGitLab,
-  lib,
-  libnotify,
-  pkg-config,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "MellowPlayer";
-  version = "3.6.8";
-
-  src = fetchFromGitLab {
-    owner = "ColinDuquesnoy";
-    repo = "MellowPlayer";
-    tag = finalAttrs.version;
-    hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    libnotify
-    libsForQt5.qtbase
-    libsForQt5.qtdeclarative
-    libsForQt5.qtgraphicaleffects
-    libsForQt5.qtquickcontrols2
-    libsForQt5.qttools
-    libsForQt5.qtwebengine
-  ];
-
-  doCheck = true;
-
-  cmakeFlags = [ "-DBUILD_TESTS=ON" ];
-
-  preCheck = ''
-    # Running the tests requires a location at the home directory for logging.
-    export HOME="$NIX_BUILD_TOP/home"
-    mkdir -p "$HOME/.local/share/MellowPlayer.Tests/MellowPlayer.Tests/Logs"
-
-    # Without this, the tests fail because they cannot create the QT Window
-    export QT_QPA_PLATFORM=offscreen
-  ''
-  # TODO: The tests are failing because it can't locate QT plugins. Is there a better way to do this?
-  + (builtins.concatStringsSep "\n" (
-    lib.lists.flatten (
-      map (pkg: [
-        (lib.optionalString (pkg ? qtPluginPrefix) ''
-          export QT_PLUGIN_PATH="${pkg}/${pkg.qtPluginPrefix}"''${QT_PLUGIN_PATH:+':'}$QT_PLUGIN_PATH
-        '')
-
-        (lib.optionalString (pkg ? qtQmlPrefix) ''
-          export QML2_IMPORT_PATH="${pkg}/${pkg.qtQmlPrefix}"''${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
-        '')
-      ]) finalAttrs.buildInputs
-    )
-  ));
-
-  meta = {
-    inherit (libsForQt5.qtbase.meta) platforms;
-    broken = stdenv.hostPlatform.isDarwin; # test build fails, but the project is not maintained anymore
-
-    description = "Cloud music integration for your desktop";
-    mainProgram = "MellowPlayer";
-    homepage = "https://gitlab.com/ColinDuquesnoy/MellowPlayer";
-    license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ kalbasit ];
-  };
-})
diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix
index cb9cecb0f238..2f6c5eaf39f8 100644
--- a/pkgs/by-name/me/melonds/package.nix
+++ b/pkgs/by-name/me/melonds/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonds";
-  version = "1.1-unstable-2026-02-02";
+  version = "1.1-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "8104a20be1d8370499667da32a5196939e5af584";
-    hash = "sha256-8taczrHnez2lW++grMF/nfONZcGmq1Qg/QiuhXYHbms=";
+    rev = "42e09ba54980b64c59991e446b5384484f5619a3";
+    hash = "sha256-sHRVDrPsBOrAsQhuLzocKzAwbaloo4YSQjIZF22O+Ww=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix
index 5abaf3faecf7..79e939c7b742 100644
--- a/pkgs/by-name/me/memcached/package.nix
+++ b/pkgs/by-name/me/memcached/package.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.6.40";
+  version = "1.6.41";
   pname = "memcached";
 
   src = fetchurl {
     url = "https://memcached.org/files/memcached-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-o9Ng6doiIaSb+ark5ogPLUTaayovrjmxkRucp2SI+/0=";
+    sha256 = "sha256-4JcHPBVu7/nhJlWwVPRG1XN0z7pcEy3Nvn+sZOcoKGo=";
   };
 
   configureFlags = [
diff --git a/pkgs/by-name/me/memogram/package.nix b/pkgs/by-name/me/memogram/package.nix
index 8d0354fd090a..9dc9c1f8e5e1 100644
--- a/pkgs/by-name/me/memogram/package.nix
+++ b/pkgs/by-name/me/memogram/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "memogram";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "usememos";
     repo = "telegram-integration";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OkNx5qAF7Gxk50S9a31NUWRoC9uHPUwUHG3jA8gy7AQ=";
+    hash = "sha256-kXn3m7o+WqxONUUiy6PVfdJfKuo9hJfpaAaXQx0LsnU=";
   };
 
-  vendorHash = "sha256-iSJU/FyyEbZlpTT3isJlsEvDzNpg3ylE5367KPBeUxM=";
+  vendorHash = "sha256-aSq+wjWZUK4Rh7bw9NqqxnD9H3X+EgMF6F4w+SUtm70=";
 
   subPackages = [ "bin/memogram" ];
 
diff --git a/pkgs/by-name/me/meshcentral/optionalDependencies.patch b/pkgs/by-name/me/meshcentral/optionalDependencies.patch
new file mode 100644
index 000000000000..09ad09fdfdb3
--- /dev/null
+++ b/pkgs/by-name/me/meshcentral/optionalDependencies.patch
@@ -0,0 +1,19129 @@
+From 2036fde7f3e47d3268acdbe4f9c9bc7453d100da Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Sat, 25 Apr 2026 15:29:21 +0200
+Subject: [PATCH] Add optional deps
+
+---
+ package-lock.json | 18249 +++++++++++++++++++++++++++++++++++++++-----
+ package.json      |    59 +
+ 2 files changed, 16601 insertions(+), 1707 deletions(-)
+
+diff --git a/package-lock.json b/package-lock.json
+index 2af3a0d1..5c5f4b73 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -1,12 +1,12 @@
+ {
+   "name": "meshcentral",
+-  "version": "1.1.58",
++  "version": "1.1.59",
+   "lockfileVersion": 3,
+   "requires": true,
+   "packages": {
+     "": {
+       "name": "meshcentral",
+-      "version": "1.1.58",
++      "version": "1.1.59",
+       "license": "Apache-2.0",
+       "dependencies": {
+         "@seald-io/nedb": "4.1.2",
+@@ -33,2433 +33,16574 @@
+       },
+       "engines": {
+         "node": ">=16.0.0"
++      },
++      "optionalDependencies": {
++        "@crowdsec/express-bouncer": "^0.1.0",
++        "@duosecurity/duo_universal": "^2.1.0",
++        "@mongodb-js/saslprep": "^1.3.1",
++        "@mysql/xdevapi": "^8.0.33",
++        "@sendgrid/mail": "^8.1.6",
++        "@xmpp/client": "^0.13.6",
++        "acebase": "^1.29.5",
++        "acme-client": "^4.2.5",
++        "aedes": "^0.51.3",
++        "archiver-zip-encrypted": "^2.0.0",
++        "connect-flash": "^0.1.1",
++        "discord.js": "^14.6.0",
++        "esprima": "^4.0.1",
++        "firebase-admin": "^12.7.0",
++        "googleapis": "^128.0.0",
++        "heapdump": "^0.3.15",
++        "html-minifier-terser": "^7.2.0",
++        "https-proxy-agent": "^7.0.6",
++        "image-size": "^2.0.2",
++        "input": "^1.0.1",
++        "jsdom": "^22.1.0",
++        "jwt-simple": "^0.5.6",
++        "ldapauth-fork": "^5.0.5",
++        "loadavg-windows": "^1.1.1",
++        "mariadb": "^3.4.5",
++        "minio": "^8.0.6",
++        "modern-syslog": "^1.2.0",
++        "mongodb": "^4.17.2",
++        "mongojs": "^3.1.0",
++        "mysql2": "^3.15.1",
++        "node-pushover": "^1.0.0",
++        "node-sspi": "^0.2.10",
++        "node-vault": "^0.10.5",
++        "node-windows": "^0.1.14",
++        "nodemailer": "^6.10.1",
++        "openid-client": "^5.7.1",
++        "passport": "^0.7.0",
++        "passport-azure-oauth2": "^0.1.0",
++        "passport-github2": "^0.1.12",
++        "passport-google-oauth20": "^2.0.0",
++        "passport-saml": "^3.2.4",
++        "passport-twitter": "^1.0.4",
++        "pg": "8.16.3",
++        "plivo": "^4.75.1",
++        "prom-client": "^15.1.3",
++        "sqlite3": "^5.1.7",
++        "ssh2": "^1.17.0",
++        "svg-captcha": "^1.4.0",
++        "syslog": "^0.1.1-1",
++        "telegram": "^2.26.22",
++        "telnyx": "^1.25.5",
++        "twilio": "^4.23.0",
++        "web-push": "^3.6.7",
++        "webdav": "^5.9.0",
++        "wildleek": "^2.0.0",
++        "yub": "^0.11.1",
++        "zulip": "^0.1.0"
+       }
+     },
+-    "node_modules/@isaacs/cliui": {
+-      "version": "8.0.2",
+-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+-      "license": "ISC",
++    "node_modules/@aws-crypto/sha256-browser": {
++      "version": "5.2.0",
++      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
++      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "string-width": "^5.1.2",
+-        "string-width-cjs": "npm:string-width@^4.2.0",
+-        "strip-ansi": "^7.0.1",
+-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+-        "wrap-ansi": "^8.1.0",
+-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
++        "@aws-crypto/sha256-js": "^5.2.0",
++        "@aws-crypto/supports-web-crypto": "^5.2.0",
++        "@aws-crypto/util": "^5.2.0",
++        "@aws-sdk/types": "^3.222.0",
++        "@aws-sdk/util-locate-window": "^3.0.0",
++        "@smithy/util-utf8": "^2.0.0",
++        "tslib": "^2.6.2"
++      }
++    },
++    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
++      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">=12"
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/@otplib/core": {
+-      "version": "12.0.1",
+-      "resolved": "https://registry.npmjs.org/@otplib/core/-/core-12.0.1.tgz",
+-      "integrity": "sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==",
+-      "license": "MIT"
+-    },
+-    "node_modules/@otplib/plugin-crypto": {
+-      "version": "12.0.1",
+-      "resolved": "https://registry.npmjs.org/@otplib/plugin-crypto/-/plugin-crypto-12.0.1.tgz",
+-      "integrity": "sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==",
+-      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
+-      "license": "MIT",
++    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
++      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "@otplib/core": "^12.0.1"
++        "@smithy/is-array-buffer": "^2.2.0",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/@otplib/plugin-thirty-two": {
+-      "version": "12.0.1",
+-      "resolved": "https://registry.npmjs.org/@otplib/plugin-thirty-two/-/plugin-thirty-two-12.0.1.tgz",
+-      "integrity": "sha512-MtT+uqRso909UkbrrYpJ6XFjj9D+x2Py7KjTO9JDPhL0bJUYVu5kFP4TFZW4NFAywrAtFRxOVY261u0qwb93gA==",
+-      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
+-      "license": "MIT",
++    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
++      "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
++      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "@otplib/core": "^12.0.1",
+-        "thirty-two": "^1.0.2"
++        "@smithy/util-buffer-from": "^2.2.0",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/@otplib/preset-default": {
+-      "version": "12.0.1",
+-      "resolved": "https://registry.npmjs.org/@otplib/preset-default/-/preset-default-12.0.1.tgz",
+-      "integrity": "sha512-xf1v9oOJRyXfluBhMdpOkr+bsE+Irt+0D5uHtvg6x1eosfmHCsCC6ej/m7FXiWqdo0+ZUI6xSKDhJwc8yfiOPQ==",
+-      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
+-      "license": "MIT",
++    "node_modules/@aws-crypto/sha256-js": {
++      "version": "5.2.0",
++      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
++      "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "@otplib/core": "^12.0.1",
+-        "@otplib/plugin-crypto": "^12.0.1",
+-        "@otplib/plugin-thirty-two": "^12.0.1"
++        "@aws-crypto/util": "^5.2.0",
++        "@aws-sdk/types": "^3.222.0",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=16.0.0"
+       }
+     },
+-    "node_modules/@otplib/preset-v11": {
+-      "version": "12.0.1",
+-      "resolved": "https://registry.npmjs.org/@otplib/preset-v11/-/preset-v11-12.0.1.tgz",
+-      "integrity": "sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==",
+-      "license": "MIT",
++    "node_modules/@aws-crypto/supports-web-crypto": {
++      "version": "5.2.0",
++      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
++      "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "@otplib/core": "^12.0.1",
+-        "@otplib/plugin-crypto": "^12.0.1",
+-        "@otplib/plugin-thirty-two": "^12.0.1"
++        "tslib": "^2.6.2"
+       }
+     },
+-    "node_modules/@pkgjs/parseargs": {
+-      "version": "0.11.0",
+-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+-      "license": "MIT",
++    "node_modules/@aws-crypto/util": {
++      "version": "5.2.0",
++      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
++      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
++      "license": "Apache-2.0",
+       "optional": true,
+-      "engines": {
+-        "node": ">=14"
++      "dependencies": {
++        "@aws-sdk/types": "^3.222.0",
++        "@smithy/util-utf8": "^2.0.0",
++        "tslib": "^2.6.2"
+       }
+     },
+-    "node_modules/@seald-io/binary-search-tree": {
+-      "version": "1.0.3",
+-      "resolved": "https://registry.npmjs.org/@seald-io/binary-search-tree/-/binary-search-tree-1.0.3.tgz",
+-      "integrity": "sha512-qv3jnwoakeax2razYaMsGI/luWdliBLHTdC6jU55hQt1hcFqzauH/HsBollQ7IR4ySTtYhT+xyHoijpA16C+tA=="
+-    },
+-    "node_modules/@seald-io/nedb": {
+-      "version": "4.1.2",
+-      "resolved": "https://registry.npmjs.org/@seald-io/nedb/-/nedb-4.1.2.tgz",
+-      "integrity": "sha512-bDr6TqjBVS2rDyYM9CPxAnotj5FuNL9NF8o7h7YyFXM7yruqT4ddr+PkSb2mJvvw991bqdftazkEo38gykvaww==",
+-      "license": "MIT",
++    "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
++      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "@seald-io/binary-search-tree": "^1.0.3",
+-        "localforage": "^1.10.0",
+-        "util": "^0.12.5"
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/abort-controller": {
+-      "version": "3.0.0",
+-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+-      "license": "MIT",
++    "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
++      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "event-target-shim": "^5.0.0"
++        "@smithy/is-array-buffer": "^2.2.0",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">=6.5"
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/accepts": {
+-      "version": "1.3.8",
+-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+-      "license": "MIT",
++    "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
++      "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
++      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "mime-types": "~2.1.34",
+-        "negotiator": "0.6.3"
++        "@smithy/util-buffer-from": "^2.2.0",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/accepts/node_modules/negotiator": {
+-      "version": "0.6.3",
+-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/client-cognito-identity": {
++      "version": "3.1037.0",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.1037.0.tgz",
++      "integrity": "sha512-/BQAyz98JRQFg3E8de3fGGydIYnsFRd6Cla4+zkviOe641fLCG0ZkPIk9D22HSi8qy9XKx+zk6ed2PcLO8uuPw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@aws-crypto/sha256-browser": "5.2.0",
++        "@aws-crypto/sha256-js": "5.2.0",
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/credential-provider-node": "^3.972.36",
++        "@aws-sdk/middleware-host-header": "^3.972.10",
++        "@aws-sdk/middleware-logger": "^3.972.10",
++        "@aws-sdk/middleware-recursion-detection": "^3.972.11",
++        "@aws-sdk/middleware-user-agent": "^3.972.35",
++        "@aws-sdk/region-config-resolver": "^3.972.13",
++        "@aws-sdk/types": "^3.973.8",
++        "@aws-sdk/util-endpoints": "^3.996.8",
++        "@aws-sdk/util-user-agent-browser": "^3.972.10",
++        "@aws-sdk/util-user-agent-node": "^3.973.21",
++        "@smithy/config-resolver": "^4.4.17",
++        "@smithy/core": "^3.23.17",
++        "@smithy/fetch-http-handler": "^5.3.17",
++        "@smithy/hash-node": "^4.2.14",
++        "@smithy/invalid-dependency": "^4.2.14",
++        "@smithy/middleware-content-length": "^4.2.14",
++        "@smithy/middleware-endpoint": "^4.4.32",
++        "@smithy/middleware-retry": "^4.5.5",
++        "@smithy/middleware-serde": "^4.2.20",
++        "@smithy/middleware-stack": "^4.2.14",
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/node-http-handler": "^4.6.1",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/smithy-client": "^4.12.13",
++        "@smithy/types": "^4.14.1",
++        "@smithy/url-parser": "^4.2.14",
++        "@smithy/util-base64": "^4.3.2",
++        "@smithy/util-body-length-browser": "^4.2.2",
++        "@smithy/util-body-length-node": "^4.2.3",
++        "@smithy/util-defaults-mode-browser": "^4.3.49",
++        "@smithy/util-defaults-mode-node": "^4.2.54",
++        "@smithy/util-endpoints": "^3.4.2",
++        "@smithy/util-middleware": "^4.2.14",
++        "@smithy/util-retry": "^4.3.4",
++        "@smithy/util-utf8": "^4.2.2",
++        "tslib": "^2.6.2"
++      },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/ansi-regex": {
+-      "version": "6.2.2",
+-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": ">=12"
++    "node_modules/@aws-sdk/core": {
++      "version": "3.974.5",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.974.5.tgz",
++      "integrity": "sha512-lMPlYlYfQdNZhlkJgnkmESwrY+hNh3PljmZ+37oAqLNdJ6rnILAwFSyc6B3bJeDOtMORNnMQIej0aTRuOlDyhQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@aws-sdk/types": "^3.973.8",
++        "@aws-sdk/xml-builder": "^3.972.19",
++        "@smithy/core": "^3.23.17",
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/signature-v4": "^5.3.14",
++        "@smithy/smithy-client": "^4.12.13",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-base64": "^4.3.2",
++        "@smithy/util-middleware": "^4.2.14",
++        "@smithy/util-retry": "^4.3.4",
++        "@smithy/util-utf8": "^4.2.2",
++        "tslib": "^2.6.2"
+       },
+-      "funding": {
+-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
++      "engines": {
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/ansi-styles": {
+-      "version": "6.2.3",
+-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": ">=12"
++    "node_modules/@aws-sdk/credential-provider-cognito-identity": {
++      "version": "3.972.28",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.972.28.tgz",
++      "integrity": "sha512-UXhc4FfxbfNaIqycDnIZ+W8CMAoCtcJJfZkq+cWSUwQRN0V0d0uAoN2qCFyKZip8inlHeKJmNQsPliKKcElP8Q==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@aws-sdk/nested-clients": "^3.997.3",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+-      "funding": {
+-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
++      "engines": {
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/archiver": {
+-      "version": "7.0.1",
+-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
+-      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/credential-provider-env": {
++      "version": "3.972.31",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.31.tgz",
++      "integrity": "sha512-X/yGB73LmDW/6MdDJGCDzZBUXnM3ys4vs9l+5ZTJmiEswDdP1OjeoAFlFjVGS9o4KB2wZWQ9KOfdVNSSK6Ep3w==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "archiver-utils": "^5.0.2",
+-        "async": "^3.2.4",
+-        "buffer-crc32": "^1.0.0",
+-        "readable-stream": "^4.0.0",
+-        "readdir-glob": "^1.1.2",
+-        "tar-stream": "^3.0.0",
+-        "zip-stream": "^6.0.1"
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 14"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/archiver-utils": {
+-      "version": "5.0.2",
+-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
+-      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/credential-provider-http": {
++      "version": "3.972.33",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.33.tgz",
++      "integrity": "sha512-c0ZF+lwoWVvX5iCaGKL5T/4DnIw88CGqxA0BcBs3U86mIp5EZYPVg+KSPkMXOyokmADvNewiMUfSG2uFwjRp0g==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "glob": "^10.0.0",
+-        "graceful-fs": "^4.2.0",
+-        "is-stream": "^2.0.1",
+-        "lazystream": "^1.0.0",
+-        "lodash": "^4.17.15",
+-        "normalize-path": "^3.0.0",
+-        "readable-stream": "^4.0.0"
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/fetch-http-handler": "^5.3.17",
++        "@smithy/node-http-handler": "^4.6.1",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/smithy-client": "^4.12.13",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-stream": "^4.5.25",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 14"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/array-flatten": {
+-      "version": "1.1.1",
+-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+-      "license": "MIT"
+-    },
+-    "node_modules/async": {
+-      "version": "3.2.6",
+-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+-      "license": "MIT"
+-    },
+-    "node_modules/available-typed-arrays": {
+-      "version": "1.0.7",
+-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+-      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/credential-provider-ini": {
++      "version": "3.972.35",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.35.tgz",
++      "integrity": "sha512-jsU4u/cRkKFLKQS0k918FQ27fzXLG5ENiLWQMYE6581zLeI2hWh04ptlrvZMB3wJT/5d+vSzJk74X1CMFr4y8Q==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "possible-typed-array-names": "^1.0.0"
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/credential-provider-env": "^3.972.31",
++        "@aws-sdk/credential-provider-http": "^3.972.33",
++        "@aws-sdk/credential-provider-login": "^3.972.35",
++        "@aws-sdk/credential-provider-process": "^3.972.31",
++        "@aws-sdk/credential-provider-sso": "^3.972.35",
++        "@aws-sdk/credential-provider-web-identity": "^3.972.35",
++        "@aws-sdk/nested-clients": "^3.997.3",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/credential-provider-imds": "^4.2.14",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/shared-ini-file-loader": "^4.4.9",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/b4a": {
+-      "version": "1.8.0",
+-      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz",
+-      "integrity": "sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==",
++    "node_modules/@aws-sdk/credential-provider-login": {
++      "version": "3.972.35",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.35.tgz",
++      "integrity": "sha512-5oa3j0cA50jPqgNhZ9XdJVopuzUf1klRb28/2MfLYWWiPi9DRVvbrBWT+DidbHTT36520VuXZJahQwR+YgSjrg==",
+       "license": "Apache-2.0",
+-      "peerDependencies": {
+-        "react-native-b4a": "*"
++      "optional": true,
++      "dependencies": {
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/nested-clients": "^3.997.3",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/shared-ini-file-loader": "^4.4.9",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+-      "peerDependenciesMeta": {
+-        "react-native-b4a": {
+-          "optional": true
+-        }
++      "engines": {
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/balanced-match": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+-      "license": "MIT"
+-    },
+-    "node_modules/bare-events": {
+-      "version": "2.8.2",
+-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
+-      "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
++    "node_modules/@aws-sdk/credential-provider-node": {
++      "version": "3.972.36",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.36.tgz",
++      "integrity": "sha512-4nT2T8Z7vH8KE9EdjEsuIlHpZSlcaK2PrKbQBjuUGU46BCCzF3WvP0u0Uiosni3Ykmmn4rWLVawoOCLotUtCbg==",
+       "license": "Apache-2.0",
+-      "peerDependencies": {
+-        "bare-abort-controller": "*"
++      "optional": true,
++      "dependencies": {
++        "@aws-sdk/credential-provider-env": "^3.972.31",
++        "@aws-sdk/credential-provider-http": "^3.972.33",
++        "@aws-sdk/credential-provider-ini": "^3.972.35",
++        "@aws-sdk/credential-provider-process": "^3.972.31",
++        "@aws-sdk/credential-provider-sso": "^3.972.35",
++        "@aws-sdk/credential-provider-web-identity": "^3.972.35",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/credential-provider-imds": "^4.2.14",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/shared-ini-file-loader": "^4.4.9",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+-      "peerDependenciesMeta": {
+-        "bare-abort-controller": {
+-          "optional": true
+-        }
++      "engines": {
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/bare-fs": {
+-      "version": "4.5.5",
+-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.5.5.tgz",
+-      "integrity": "sha512-XvwYM6VZqKoqDll8BmSww5luA5eflDzY0uEFfBJtFKe4PAAtxBjU3YIxzIBzhyaEQBy1VXEQBto4cpN5RZJw+w==",
++    "node_modules/@aws-sdk/credential-provider-process": {
++      "version": "3.972.31",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.31.tgz",
++      "integrity": "sha512-eKeT4MXumpBJsrDLCYcSzIkFPVTFn/es7It2oogp2OhU/ic7P/+xzFpQx9ZhwtXS57Mc5S42BPWi7lHmvs/nYg==",
+       "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "bare-events": "^2.5.4",
+-        "bare-path": "^3.0.0",
+-        "bare-stream": "^2.6.4",
+-        "bare-url": "^2.2.2",
+-        "fast-fifo": "^1.3.2"
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/shared-ini-file-loader": "^4.4.9",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "bare": ">=1.16.0"
+-      },
+-      "peerDependencies": {
+-        "bare-buffer": "*"
+-      },
+-      "peerDependenciesMeta": {
+-        "bare-buffer": {
+-          "optional": true
+-        }
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/bare-os": {
+-      "version": "3.7.1",
+-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.7.1.tgz",
+-      "integrity": "sha512-ebvMaS5BgZKmJlvuWh14dg9rbUI84QeV3WlWn6Ph6lFI8jJoh7ADtVTyD2c93euwbe+zgi0DVrl4YmqXeM9aIA==",
++    "node_modules/@aws-sdk/credential-provider-sso": {
++      "version": "3.972.35",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.35.tgz",
++      "integrity": "sha512-bCuBdfnj0KGDMdLp6utMTLiJcFN2ek9EgZinxQZZSc3FxjJ/HSqeqab2cjbnoNfy8RM6suDCsRkmVY1izp9I+A==",
+       "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/nested-clients": "^3.997.3",
++        "@aws-sdk/token-providers": "3.1036.0",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/shared-ini-file-loader": "^4.4.9",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
+       "engines": {
+-        "bare": ">=1.14.0"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/bare-path": {
+-      "version": "3.0.0",
+-      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
+-      "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
++    "node_modules/@aws-sdk/credential-provider-web-identity": {
++      "version": "3.972.35",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.35.tgz",
++      "integrity": "sha512-swW6Bwvl8lanyEMtZOWE/oR6yqcRQH4HTQZUVsnDVgoXvRjRywpYpLv2BWwjUFyjPrqsdX6FeTkf4tMSe/qFTQ==",
+       "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "bare-os": "^3.0.1"
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/nested-clients": "^3.997.3",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/shared-ini-file-loader": "^4.4.9",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/bare-stream": {
+-      "version": "2.8.0",
+-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.8.0.tgz",
+-      "integrity": "sha512-reUN0M2sHRqCdG4lUK3Fw8w98eeUIZHL5c3H7Mbhk2yVBL+oofgaIp0ieLfD5QXwPCypBpmEEKU2WZKzbAk8GA==",
++    "node_modules/@aws-sdk/credential-providers": {
++      "version": "3.1037.0",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.1037.0.tgz",
++      "integrity": "sha512-TPPoQzfNkWltNgjJn3RRY1S8VXffDvv49xGGs9K0DrYS9LZCLLsoHmSmShx9HQusPc/4Oz23rfRWTolCU19PdQ==",
+       "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "streamx": "^2.21.0",
+-        "teex": "^1.0.1"
+-      },
+-      "peerDependencies": {
+-        "bare-buffer": "*",
+-        "bare-events": "*"
++        "@aws-sdk/client-cognito-identity": "3.1037.0",
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/credential-provider-cognito-identity": "^3.972.28",
++        "@aws-sdk/credential-provider-env": "^3.972.31",
++        "@aws-sdk/credential-provider-http": "^3.972.33",
++        "@aws-sdk/credential-provider-ini": "^3.972.35",
++        "@aws-sdk/credential-provider-login": "^3.972.35",
++        "@aws-sdk/credential-provider-node": "^3.972.36",
++        "@aws-sdk/credential-provider-process": "^3.972.31",
++        "@aws-sdk/credential-provider-sso": "^3.972.35",
++        "@aws-sdk/credential-provider-web-identity": "^3.972.35",
++        "@aws-sdk/nested-clients": "^3.997.3",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/config-resolver": "^4.4.17",
++        "@smithy/core": "^3.23.17",
++        "@smithy/credential-provider-imds": "^4.2.14",
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+-      "peerDependenciesMeta": {
+-        "bare-buffer": {
+-          "optional": true
+-        },
+-        "bare-events": {
+-          "optional": true
+-        }
++      "engines": {
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/bare-url": {
+-      "version": "2.3.2",
+-      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.3.2.tgz",
+-      "integrity": "sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==",
++    "node_modules/@aws-sdk/middleware-host-header": {
++      "version": "3.972.10",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.10.tgz",
++      "integrity": "sha512-IJSsIMeVQ8MMCPbuh1AbltkFhLBLXn7aejzfX5YKT/VLDHn++Dcz8886tXckE+wQssyPUhaXrJhdakO2VilRhg==",
+       "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "bare-path": "^3.0.0"
+-      }
+-    },
+-    "node_modules/base64-js": {
+-      "version": "1.5.1",
+-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+-      "funding": [
+-        {
+-          "type": "github",
+-          "url": "https://github.com/sponsors/feross"
+-        },
+-        {
+-          "type": "patreon",
+-          "url": "https://www.patreon.com/feross"
+-        },
+-        {
+-          "type": "consulting",
+-          "url": "https://feross.org/support"
+-        }
+-      ],
+-      "license": "MIT"
+-    },
+-    "node_modules/bignumber.js": {
+-      "version": "9.3.1",
+-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz",
+-      "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==",
+-      "license": "MIT",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
+       "engines": {
+-        "node": "*"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/body-parser": {
+-      "version": "1.20.4",
+-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz",
+-      "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/middleware-logger": {
++      "version": "3.972.10",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.10.tgz",
++      "integrity": "sha512-OOuGvvz1Dm20SjZo5oEBePFqxt5nf8AwkNDSyUHvD9/bfNASmstcYxFAHUowy4n6Io7mWUZ04JURZwSBvyQanQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "bytes": "~3.1.2",
+-        "content-type": "~1.0.5",
+-        "debug": "2.6.9",
+-        "depd": "2.0.0",
+-        "destroy": "~1.2.0",
+-        "http-errors": "~2.0.1",
+-        "iconv-lite": "~0.4.24",
+-        "on-finished": "~2.4.1",
+-        "qs": "~6.14.0",
+-        "raw-body": "~2.5.3",
+-        "type-is": "~1.6.18",
+-        "unpipe": "~1.0.0"
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 0.8",
+-        "npm": "1.2.8000 || >= 1.4.16"
+-      }
+-    },
+-    "node_modules/brace-expansion": {
+-      "version": "2.0.2",
+-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+-      "license": "MIT",
+-      "dependencies": {
+-        "balanced-match": "^1.0.0"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/buffer": {
+-      "version": "6.0.3",
+-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+-      "funding": [
+-        {
+-          "type": "github",
+-          "url": "https://github.com/sponsors/feross"
+-        },
+-        {
+-          "type": "patreon",
+-          "url": "https://www.patreon.com/feross"
+-        },
+-        {
+-          "type": "consulting",
+-          "url": "https://feross.org/support"
+-        }
+-      ],
+-      "license": "MIT",
++    "node_modules/@aws-sdk/middleware-recursion-detection": {
++      "version": "3.972.11",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.11.tgz",
++      "integrity": "sha512-+zz6f79Kj9V5qFK2P+D8Ehjnw4AhphAlCAsPjUqEcInA9umtSSKMrHbSagEeOIsDNuvVrH98bjRHcyQukTrhaQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "base64-js": "^1.3.1",
+-        "ieee754": "^1.2.1"
+-      }
+-    },
+-    "node_modules/buffer-crc32": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+-      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+-      "license": "MIT",
++        "@aws-sdk/types": "^3.973.8",
++        "@aws/lambda-invoke-store": "^0.2.2",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
+       "engines": {
+-        "node": ">=8.0.0"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/bytes": {
+-      "version": "3.1.2",
+-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/middleware-sdk-s3": {
++      "version": "3.972.34",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.34.tgz",
++      "integrity": "sha512-/UL96JKjsjdodcRRMKl99tLQvK6Oi9ptLC9iU1yiTF/ruaDX0mtBBtnLNZDxIZRJOCVOtB49ed1YaTadqygk8Q==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/types": "^3.973.8",
++        "@aws-sdk/util-arn-parser": "^3.972.3",
++        "@smithy/core": "^3.23.17",
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/signature-v4": "^5.3.14",
++        "@smithy/smithy-client": "^4.12.13",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-config-provider": "^4.2.2",
++        "@smithy/util-middleware": "^4.2.14",
++        "@smithy/util-stream": "^4.5.25",
++        "@smithy/util-utf8": "^4.2.2",
++        "tslib": "^2.6.2"
++      },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/call-bind": {
+-      "version": "1.0.8",
+-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/middleware-user-agent": {
++      "version": "3.972.35",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.35.tgz",
++      "integrity": "sha512-hOFWNOjVmOocpRlrU04nYxjMOeoe0Obu5AXEuhB8zblMCPl3cG1hdluQCZERRKFyhMQjwZnDbhSHjoMUjetFGw==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "call-bind-apply-helpers": "^1.0.0",
+-        "es-define-property": "^1.0.0",
+-        "get-intrinsic": "^1.2.4",
+-        "set-function-length": "^1.2.2"
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/types": "^3.973.8",
++        "@aws-sdk/util-endpoints": "^3.996.8",
++        "@smithy/core": "^3.23.17",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-retry": "^4.3.4",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/call-bind-apply-helpers": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/nested-clients": {
++      "version": "3.997.3",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.997.3.tgz",
++      "integrity": "sha512-SivE6GP228IVgfsrr2c/vqTg95X0Qj39Yw4uIrcddpkUzIltNMoNOR62leHOLhODfjv9K8X2mPTwS69A5kT0nQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "es-errors": "^1.3.0",
+-        "function-bind": "^1.1.2"
++        "@aws-crypto/sha256-browser": "5.2.0",
++        "@aws-crypto/sha256-js": "5.2.0",
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/middleware-host-header": "^3.972.10",
++        "@aws-sdk/middleware-logger": "^3.972.10",
++        "@aws-sdk/middleware-recursion-detection": "^3.972.11",
++        "@aws-sdk/middleware-user-agent": "^3.972.35",
++        "@aws-sdk/region-config-resolver": "^3.972.13",
++        "@aws-sdk/signature-v4-multi-region": "^3.996.22",
++        "@aws-sdk/types": "^3.973.8",
++        "@aws-sdk/util-endpoints": "^3.996.8",
++        "@aws-sdk/util-user-agent-browser": "^3.972.10",
++        "@aws-sdk/util-user-agent-node": "^3.973.21",
++        "@smithy/config-resolver": "^4.4.17",
++        "@smithy/core": "^3.23.17",
++        "@smithy/fetch-http-handler": "^5.3.17",
++        "@smithy/hash-node": "^4.2.14",
++        "@smithy/invalid-dependency": "^4.2.14",
++        "@smithy/middleware-content-length": "^4.2.14",
++        "@smithy/middleware-endpoint": "^4.4.32",
++        "@smithy/middleware-retry": "^4.5.5",
++        "@smithy/middleware-serde": "^4.2.20",
++        "@smithy/middleware-stack": "^4.2.14",
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/node-http-handler": "^4.6.1",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/smithy-client": "^4.12.13",
++        "@smithy/types": "^4.14.1",
++        "@smithy/url-parser": "^4.2.14",
++        "@smithy/util-base64": "^4.3.2",
++        "@smithy/util-body-length-browser": "^4.2.2",
++        "@smithy/util-body-length-node": "^4.2.3",
++        "@smithy/util-defaults-mode-browser": "^4.3.49",
++        "@smithy/util-defaults-mode-node": "^4.2.54",
++        "@smithy/util-endpoints": "^3.4.2",
++        "@smithy/util-middleware": "^4.2.14",
++        "@smithy/util-retry": "^4.3.4",
++        "@smithy/util-utf8": "^4.2.2",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/call-bound": {
+-      "version": "1.0.4",
+-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+-      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/region-config-resolver": {
++      "version": "3.972.13",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.13.tgz",
++      "integrity": "sha512-CvJ2ZIjK/jVD/lbOpowBVElJyC1YxLTIJ13yM0AEo0t2v7swOzGjSA6lJGH+DwZXQhcjUjoYwc8bVYCX5MDr1A==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "call-bind-apply-helpers": "^1.0.2",
+-        "get-intrinsic": "^1.3.0"
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/config-resolver": "^4.4.17",
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/cbor": {
+-      "version": "5.2.0",
+-      "resolved": "https://registry.npmjs.org/cbor/-/cbor-5.2.0.tgz",
+-      "integrity": "sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/signature-v4-multi-region": {
++      "version": "3.996.22",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.996.22.tgz",
++      "integrity": "sha512-/rXhMXteD+BqhFd0nYprAgcZ/KtU+963uftPqd3tiFcFfooHZINXUGtOmo2SQjRVauCTNqIEzkwuSETdZFqTTA==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "bignumber.js": "^9.0.1",
+-        "nofilter": "^1.0.4"
++        "@aws-sdk/middleware-sdk-s3": "^3.972.34",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/signature-v4": "^5.3.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">=6.0.0"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/color-convert": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/token-providers": {
++      "version": "3.1036.0",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.1036.0.tgz",
++      "integrity": "sha512-aNSJ6jjDYayxN9ZA1JpycVScX93Lx03kKZ1EXt3DGOTahcWVLJj3oLAlop0xKP+vP2Ga2t49p1tEaMkTbCCaZA==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "color-name": "~1.1.4"
++        "@aws-sdk/core": "^3.974.5",
++        "@aws-sdk/nested-clients": "^3.997.3",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/shared-ini-file-loader": "^4.4.9",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">=7.0.0"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/color-name": {
+-      "version": "1.1.4",
+-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+-      "license": "MIT"
+-    },
+-    "node_modules/compress-commons": {
+-      "version": "6.0.2",
+-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
+-      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/types": {
++      "version": "3.973.8",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
++      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "crc-32": "^1.2.0",
+-        "crc32-stream": "^6.0.0",
+-        "is-stream": "^2.0.1",
+-        "normalize-path": "^3.0.0",
+-        "readable-stream": "^4.0.0"
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 14"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/compressible": {
+-      "version": "2.0.18",
+-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/util-arn-parser": {
++      "version": "3.972.3",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.972.3.tgz",
++      "integrity": "sha512-HzSD8PMFrvgi2Kserxuff5VitNq2sgf3w9qxmskKDiDTThWfVteJxuCS9JXiPIPtmCrp+7N9asfIaVhBFORllA==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "mime-db": ">= 1.43.0 < 2"
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/compression": {
+-      "version": "1.8.1",
+-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
+-      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/util-endpoints": {
++      "version": "3.996.8",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.996.8.tgz",
++      "integrity": "sha512-oOZHcRDihk5iEe5V25NVWg45b3qEA8OpHWVdU/XQh8Zj4heVPAJqWvMphQnU7LkufmUo10EpvFPZuQMiFLJK3g==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "bytes": "3.1.2",
+-        "compressible": "~2.0.18",
+-        "debug": "2.6.9",
+-        "negotiator": "~0.6.4",
+-        "on-headers": "~1.1.0",
+-        "safe-buffer": "5.2.1",
+-        "vary": "~1.1.2"
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/types": "^4.14.1",
++        "@smithy/url-parser": "^4.2.14",
++        "@smithy/util-endpoints": "^3.4.2",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 0.8.0"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/content-disposition": {
+-      "version": "0.5.4",
+-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/util-locate-window": {
++      "version": "3.965.5",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.965.5.tgz",
++      "integrity": "sha512-WhlJNNINQB+9qtLtZJcpQdgZw3SCDCpXdUJP7cToGwHbCWCnRckGlc6Bx/OhWwIYFNAn+FIydY8SZ0QmVu3xTQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "safe-buffer": "5.2.1"
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/content-type": {
+-      "version": "1.0.5",
+-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
++    "node_modules/@aws-sdk/util-user-agent-browser": {
++      "version": "3.972.10",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.10.tgz",
++      "integrity": "sha512-FAzqXvfEssGdSIz8ejatan0bOdx1qefBWKF/gWmVBXIP1HkS7v/wjjaqrAGGKvyihrXTXW00/2/1nTJtxpXz7g==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/types": "^4.14.1",
++        "bowser": "^2.11.0",
++        "tslib": "^2.6.2"
+       }
+     },
+-    "node_modules/cookie": {
+-      "version": "0.7.2",
+-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/util-user-agent-node": {
++      "version": "3.973.21",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.21.tgz",
++      "integrity": "sha512-Av4UHTcAWgdvbN0IP9pbtf4Qa1+6LtJqQdZWj5pLn5J67w0pnJJAZZ+7JPPcj2KN3378zD2JDM9DwJKEyvyMTQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@aws-sdk/middleware-user-agent": "^3.972.35",
++        "@aws-sdk/types": "^3.973.8",
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-config-provider": "^4.2.2",
++        "tslib": "^2.6.2"
++      },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=20.0.0"
++      },
++      "peerDependencies": {
++        "aws-crt": ">=1.0.0"
++      },
++      "peerDependenciesMeta": {
++        "aws-crt": {
++          "optional": true
++        }
+       }
+     },
+-    "node_modules/cookie-session": {
+-      "version": "2.1.1",
+-      "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.1.1.tgz",
+-      "integrity": "sha512-ji3kym/XZaFVew1+tIZk5ZLp9Z/fLv9rK1aZmpug0FsgE7Cu3ZDrUdRo7FT9vFjMYfNimrrUHJzywDwT7XEFlg==",
+-      "license": "MIT",
++    "node_modules/@aws-sdk/xml-builder": {
++      "version": "3.972.19",
++      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.19.tgz",
++      "integrity": "sha512-Cw8IOMdBUEIl8ZlhRC3Dc/E64D5B5/8JhV6vhPLiPfJwcRC84S6F8aBOIi/N4vR9ZyA4I5Cc0Ateb/9EHaJXeQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "cookies": "0.9.1",
+-        "debug": "3.2.7",
+-        "on-headers": "~1.1.0",
+-        "safe-buffer": "5.2.1"
++        "@smithy/types": "^4.14.1",
++        "fast-xml-parser": "5.7.1",
++        "tslib": "^2.6.2"
+       },
+       "engines": {
+-        "node": ">= 0.10"
++        "node": ">=20.0.0"
+       }
+     },
+-    "node_modules/cookie-session/node_modules/debug": {
+-      "version": "3.2.7",
+-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
++    "node_modules/@aws-sdk/xml-builder/node_modules/fast-xml-parser": {
++      "version": "5.7.1",
++      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.1.tgz",
++      "integrity": "sha512-8Cc3f8GUGUULg34pBch/KGyPLglS+OFs05deyOlY7fL2MTagYPKrVQNmR1fLF/yJ9PH5ZSTd3YDF6pnmeZU+zA==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/NaturalIntelligence"
++        }
++      ],
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "ms": "^2.1.1"
++        "@nodable/entities": "^2.1.0",
++        "fast-xml-builder": "^1.1.5",
++        "path-expression-matcher": "^1.5.0",
++        "strnum": "^2.2.3"
++      },
++      "bin": {
++        "fxparser": "src/cli/cli.js"
+       }
+     },
+-    "node_modules/cookie-session/node_modules/ms": {
+-      "version": "2.1.3",
+-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+-      "license": "MIT"
+-    },
+-    "node_modules/cookie-signature": {
+-      "version": "1.0.7",
+-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+-      "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
+-      "license": "MIT"
++    "node_modules/@aws/lambda-invoke-store": {
++      "version": "0.2.4",
++      "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.4.tgz",
++      "integrity": "sha512-iY8yvjE0y651BixKNPgmv1WrQc+GZ142sb0z4gYnChDDY2YqI4P/jsSopBWrKfAt7LOJAkOXt7rC/hms+WclQQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=18.0.0"
++      }
+     },
+-    "node_modules/cookies": {
+-      "version": "0.9.1",
+-      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
+-      "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
++    "node_modules/@babel/cli": {
++      "version": "7.28.6",
++      "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.28.6.tgz",
++      "integrity": "sha512-6EUNcuBbNkj08Oj4gAZ+BUU8yLCgKzgVX4gaTh09Ya2C8ICM4P+G30g4m3akRxSYAp3A/gnWchrNst7px4/nUQ==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "depd": "~2.0.0",
+-        "keygrip": "~1.1.0"
++        "@jridgewell/trace-mapping": "^0.3.28",
++        "commander": "^6.2.0",
++        "convert-source-map": "^2.0.0",
++        "fs-readdir-recursive": "^1.1.0",
++        "glob": "^7.2.0",
++        "make-dir": "^2.1.0",
++        "slash": "^2.0.0"
++      },
++      "bin": {
++        "babel": "bin/babel.js",
++        "babel-external-helpers": "bin/babel-external-helpers.js"
+       },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=6.9.0"
++      },
++      "optionalDependencies": {
++        "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents.3",
++        "chokidar": "^3.6.0"
++      },
++      "peerDependencies": {
++        "@babel/core": "^7.0.0-0"
+       }
+     },
+-    "node_modules/core-util-is": {
+-      "version": "1.0.3",
+-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+-      "license": "MIT"
++    "node_modules/@babel/cli/node_modules/brace-expansion": {
++      "version": "1.1.14",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "balanced-match": "^1.0.0",
++        "concat-map": "0.0.1"
++      }
+     },
+-    "node_modules/crc-32": {
+-      "version": "1.2.2",
+-      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+-      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+-      "license": "Apache-2.0",
+-      "bin": {
+-        "crc32": "bin/crc32.njs"
++    "node_modules/@babel/cli/node_modules/glob": {
++      "version": "7.2.3",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "fs.realpath": "^1.0.0",
++        "inflight": "^1.0.4",
++        "inherits": "2",
++        "minimatch": "^3.1.1",
++        "once": "^1.3.0",
++        "path-is-absolute": "^1.0.0"
+       },
+       "engines": {
+-        "node": ">=0.8"
++        "node": "*"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
+       }
+     },
+-    "node_modules/crc32-stream": {
+-      "version": "6.0.0",
+-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
+-      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
+-      "license": "MIT",
++    "node_modules/@babel/cli/node_modules/minimatch": {
++      "version": "3.1.5",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++      "license": "ISC",
++      "optional": true,
+       "dependencies": {
+-        "crc-32": "^1.2.0",
+-        "readable-stream": "^4.0.0"
++        "brace-expansion": "^1.1.7"
+       },
+       "engines": {
+-        "node": ">= 14"
++        "node": "*"
+       }
+     },
+-    "node_modules/cross-spawn": {
+-      "version": "7.0.6",
+-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
++    "node_modules/@babel/code-frame": {
++      "version": "7.29.0",
++      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
++      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "path-key": "^3.1.0",
+-        "shebang-command": "^2.0.0",
+-        "which": "^2.0.1"
++        "@babel/helper-validator-identifier": "^7.28.5",
++        "js-tokens": "^4.0.0",
++        "picocolors": "^1.1.1"
+       },
+       "engines": {
+-        "node": ">= 8"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/debug": {
+-      "version": "2.6.9",
+-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
++    "node_modules/@babel/compat-data": {
++      "version": "7.29.0",
++      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
++      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
+       "license": "MIT",
+-      "dependencies": {
+-        "ms": "2.0.0"
++      "optional": true,
++      "engines": {
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/define-data-property": {
+-      "version": "1.1.4",
+-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
++    "node_modules/@babel/core": {
++      "version": "7.29.0",
++      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
++      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "es-define-property": "^1.0.0",
+-        "es-errors": "^1.3.0",
+-        "gopd": "^1.0.1"
++        "@babel/code-frame": "^7.29.0",
++        "@babel/generator": "^7.29.0",
++        "@babel/helper-compilation-targets": "^7.28.6",
++        "@babel/helper-module-transforms": "^7.28.6",
++        "@babel/helpers": "^7.28.6",
++        "@babel/parser": "^7.29.0",
++        "@babel/template": "^7.28.6",
++        "@babel/traverse": "^7.29.0",
++        "@babel/types": "^7.29.0",
++        "@jridgewell/remapping": "^2.3.5",
++        "convert-source-map": "^2.0.0",
++        "debug": "^4.1.0",
++        "gensync": "^1.0.0-beta.2",
++        "json5": "^2.2.3",
++        "semver": "^6.3.1"
+       },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=6.9.0"
+       },
+       "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "type": "opencollective",
++        "url": "https://opencollective.com/babel"
+       }
+     },
+-    "node_modules/depd": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
++    "node_modules/@babel/core/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
+       }
+     },
+-    "node_modules/destroy": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
++    "node_modules/@babel/core/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@babel/generator": {
++      "version": "7.29.1",
++      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
++      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@babel/parser": "^7.29.0",
++        "@babel/types": "^7.29.0",
++        "@jridgewell/gen-mapping": "^0.3.12",
++        "@jridgewell/trace-mapping": "^0.3.28",
++        "jsesc": "^3.0.2"
++      },
+       "engines": {
+-        "node": ">= 0.8",
+-        "npm": "1.2.8000 || >= 1.4.16"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/dunder-proto": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
++    "node_modules/@babel/helper-annotate-as-pure": {
++      "version": "7.27.3",
++      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
++      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "call-bind-apply-helpers": "^1.0.1",
+-        "es-errors": "^1.3.0",
+-        "gopd": "^1.2.0"
++        "@babel/types": "^7.27.3"
+       },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/eastasianwidth": {
+-      "version": "0.2.0",
+-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+-      "license": "MIT"
+-    },
+-    "node_modules/ee-first": {
+-      "version": "1.1.1",
+-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+-      "license": "MIT"
+-    },
+-    "node_modules/emoji-regex": {
+-      "version": "9.2.2",
+-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+-      "license": "MIT"
+-    },
+-    "node_modules/encodeurl": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
++    "node_modules/@babel/helper-compilation-targets": {
++      "version": "7.28.6",
++      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
++      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@babel/compat-data": "^7.28.6",
++        "@babel/helper-validator-option": "^7.27.1",
++        "browserslist": "^4.24.0",
++        "lru-cache": "^5.1.1",
++        "semver": "^6.3.1"
++      },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/es-define-property": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
++    "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
++      "version": "5.1.1",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
++      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^3.0.2"
++      }
++    },
++    "node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
++      "version": "3.1.1",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
++      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/@babel/helper-globals": {
++      "version": "7.28.0",
++      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
++      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/es-errors": {
+-      "version": "1.3.0",
+-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
++    "node_modules/@babel/helper-module-imports": {
++      "version": "7.28.6",
++      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
++      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@babel/traverse": "^7.28.6",
++        "@babel/types": "^7.28.6"
++      },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/es-object-atoms": {
+-      "version": "1.1.1",
+-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
++    "node_modules/@babel/helper-module-transforms": {
++      "version": "7.28.6",
++      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
++      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "es-errors": "^1.3.0"
++        "@babel/helper-module-imports": "^7.28.6",
++        "@babel/helper-validator-identifier": "^7.28.5",
++        "@babel/traverse": "^7.28.6"
+       },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=6.9.0"
++      },
++      "peerDependencies": {
++        "@babel/core": "^7.0.0"
+       }
+     },
+-    "node_modules/escape-html": {
+-      "version": "1.0.3",
+-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+-      "license": "MIT"
+-    },
+-    "node_modules/etag": {
+-      "version": "1.8.1",
+-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
++    "node_modules/@babel/helper-plugin-utils": {
++      "version": "7.28.6",
++      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
++      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/event-target-shim": {
+-      "version": "5.0.1",
+-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
++    "node_modules/@babel/helper-string-parser": {
++      "version": "7.27.1",
++      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
++      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">=6"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/events": {
+-      "version": "3.3.0",
+-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
++    "node_modules/@babel/helper-validator-identifier": {
++      "version": "7.28.5",
++      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
++      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">=0.8.x"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/events-universal": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",
+-      "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",
+-      "license": "Apache-2.0",
++    "node_modules/@babel/helper-validator-option": {
++      "version": "7.27.1",
++      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
++      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6.9.0"
++      }
++    },
++    "node_modules/@babel/helpers": {
++      "version": "7.29.2",
++      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz",
++      "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==",
++      "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "bare-events": "^2.7.0"
++        "@babel/template": "^7.28.6",
++        "@babel/types": "^7.29.0"
++      },
++      "engines": {
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/express": {
+-      "version": "4.22.1",
+-      "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
+-      "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==",
++    "node_modules/@babel/node": {
++      "version": "7.29.0",
++      "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.29.0.tgz",
++      "integrity": "sha512-9UeU8F3rx2lOZXneEW2HTnTYdA8+fXP0kr54tk7d0fPomWNlZ6WJ2H9lunr5dSvr8FNY0CDnop3Km6jZ5NAUsQ==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "accepts": "~1.3.8",
+-        "array-flatten": "1.1.1",
+-        "body-parser": "~1.20.3",
+-        "content-disposition": "~0.5.4",
+-        "content-type": "~1.0.4",
+-        "cookie": "~0.7.1",
+-        "cookie-signature": "~1.0.6",
+-        "debug": "2.6.9",
+-        "depd": "2.0.0",
+-        "encodeurl": "~2.0.0",
+-        "escape-html": "~1.0.3",
+-        "etag": "~1.8.1",
+-        "finalhandler": "~1.3.1",
+-        "fresh": "~0.5.2",
+-        "http-errors": "~2.0.0",
+-        "merge-descriptors": "1.0.3",
+-        "methods": "~1.1.2",
+-        "on-finished": "~2.4.1",
+-        "parseurl": "~1.3.3",
+-        "path-to-regexp": "~0.1.12",
+-        "proxy-addr": "~2.0.7",
+-        "qs": "~6.14.0",
+-        "range-parser": "~1.2.1",
+-        "safe-buffer": "5.2.1",
+-        "send": "~0.19.0",
+-        "serve-static": "~1.16.2",
+-        "setprototypeof": "1.2.0",
+-        "statuses": "~2.0.1",
+-        "type-is": "~1.6.18",
+-        "utils-merge": "1.0.1",
+-        "vary": "~1.1.2"
++        "@babel/register": "^7.28.6",
++        "commander": "^6.2.0",
++        "core-js": "^3.48.0",
++        "node-environment-flags": "^1.0.5",
++        "regenerator-runtime": "^0.14.0",
++        "v8flags": "^3.1.1"
++      },
++      "bin": {
++        "babel-node": "bin/babel-node.js"
+       },
+       "engines": {
+-        "node": ">= 0.10.0"
++        "node": ">=6.9.0"
+       },
+-      "funding": {
+-        "type": "opencollective",
+-        "url": "https://opencollective.com/express"
++      "peerDependencies": {
++        "@babel/core": "^7.0.0-0"
+       }
+     },
+-    "node_modules/express-handlebars": {
+-      "version": "7.1.3",
+-      "resolved": "https://registry.npmjs.org/express-handlebars/-/express-handlebars-7.1.3.tgz",
+-      "integrity": "sha512-O0W4n14iQ8+iFIDdiMh9HRI2nbVQJ/h1qndlD1TXWxxcfbKjKoqJh+ti2tROkyx4C4VQrt0y3bANBQ5auQAiew==",
+-      "license": "BSD-3-Clause",
++    "node_modules/@babel/parser": {
++      "version": "7.29.2",
++      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
++      "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
++      "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "glob": "^10.4.2",
+-        "graceful-fs": "^4.2.11",
+-        "handlebars": "^4.7.8"
++        "@babel/types": "^7.29.0"
++      },
++      "bin": {
++        "parser": "bin/babel-parser.js"
+       },
+       "engines": {
+-        "node": ">=v16"
++        "node": ">=6.0.0"
+       }
+     },
+-    "node_modules/express-ws": {
+-      "version": "5.0.2",
+-      "resolved": "https://registry.npmjs.org/express-ws/-/express-ws-5.0.2.tgz",
+-      "integrity": "sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ==",
+-      "license": "BSD-2-Clause",
++    "node_modules/@babel/plugin-syntax-jsx": {
++      "version": "7.28.6",
++      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz",
++      "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==",
++      "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "ws": "^7.4.6"
++        "@babel/helper-plugin-utils": "^7.28.6"
+       },
+       "engines": {
+-        "node": ">=4.5.0"
++        "node": ">=6.9.0"
+       },
+       "peerDependencies": {
+-        "express": "^4.0.0 || ^5.0.0-alpha.1"
++        "@babel/core": "^7.0.0-0"
+       }
+     },
+-    "node_modules/express-ws/node_modules/ws": {
+-      "version": "7.5.10",
+-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
++    "node_modules/@babel/plugin-transform-react-jsx": {
++      "version": "7.28.6",
++      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.28.6.tgz",
++      "integrity": "sha512-61bxqhiRfAACulXSLd/GxqmAedUSrRZIu/cbaT18T1CetkTmtDN15it7i80ru4DVqRK1WMxQhXs+Lf9kajm5Ow==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@babel/helper-annotate-as-pure": "^7.27.3",
++        "@babel/helper-module-imports": "^7.28.6",
++        "@babel/helper-plugin-utils": "^7.28.6",
++        "@babel/plugin-syntax-jsx": "^7.28.6",
++        "@babel/types": "^7.28.6"
++      },
+       "engines": {
+-        "node": ">=8.3.0"
++        "node": ">=6.9.0"
+       },
+       "peerDependencies": {
+-        "bufferutil": "^4.0.1",
+-        "utf-8-validate": "^5.0.2"
++        "@babel/core": "^7.0.0-0"
++      }
++    },
++    "node_modules/@babel/register": {
++      "version": "7.28.6",
++      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.28.6.tgz",
++      "integrity": "sha512-pgcbbEl/dWQYb6L6Yew6F94rdwygfuv+vJ/tXfwIOYAfPB6TNWpXUMEtEq3YuTeHRdvMIhvz13bkT9CNaS+wqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "clone-deep": "^4.0.1",
++        "find-cache-dir": "^2.0.0",
++        "make-dir": "^2.1.0",
++        "pirates": "^4.0.6",
++        "source-map-support": "^0.5.16"
+       },
+-      "peerDependenciesMeta": {
+-        "bufferutil": {
+-          "optional": true
+-        },
+-        "utf-8-validate": {
+-          "optional": true
+-        }
++      "engines": {
++        "node": ">=6.9.0"
++      },
++      "peerDependencies": {
++        "@babel/core": "^7.0.0-0"
+       }
+     },
+-    "node_modules/fast-fifo": {
+-      "version": "1.3.2",
+-      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+-      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+-      "license": "MIT"
++    "node_modules/@babel/runtime": {
++      "version": "7.29.2",
++      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz",
++      "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6.9.0"
++      }
+     },
+-    "node_modules/fd-slicer": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
++    "node_modules/@babel/template": {
++      "version": "7.28.6",
++      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
++      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "pend": "~1.2.0"
++        "@babel/code-frame": "^7.28.6",
++        "@babel/parser": "^7.28.6",
++        "@babel/types": "^7.28.6"
++      },
++      "engines": {
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/finalhandler": {
+-      "version": "1.3.2",
+-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
+-      "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==",
++    "node_modules/@babel/traverse": {
++      "version": "7.29.0",
++      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
++      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "debug": "2.6.9",
+-        "encodeurl": "~2.0.0",
+-        "escape-html": "~1.0.3",
+-        "on-finished": "~2.4.1",
+-        "parseurl": "~1.3.3",
+-        "statuses": "~2.0.2",
+-        "unpipe": "~1.0.0"
++        "@babel/code-frame": "^7.29.0",
++        "@babel/generator": "^7.29.0",
++        "@babel/helper-globals": "^7.28.0",
++        "@babel/parser": "^7.29.0",
++        "@babel/template": "^7.28.6",
++        "@babel/types": "^7.29.0",
++        "debug": "^4.3.1"
+       },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/for-each": {
+-      "version": "0.3.5",
+-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+-      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
++    "node_modules/@babel/traverse/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "is-callable": "^1.2.7"
++        "ms": "^2.1.3"
+       },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=6.0"
+       },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
+       }
+     },
+-    "node_modules/foreground-child": {
+-      "version": "3.3.1",
+-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+-      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+-      "license": "ISC",
++    "node_modules/@babel/traverse/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@babel/types": {
++      "version": "7.29.0",
++      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
++      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
++      "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "cross-spawn": "^7.0.6",
+-        "signal-exit": "^4.0.1"
++        "@babel/helper-string-parser": "^7.27.1",
++        "@babel/helper-validator-identifier": "^7.28.5"
+       },
+       "engines": {
+-        "node": ">=14"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/isaacs"
++        "node": ">=6.9.0"
+       }
+     },
+-    "node_modules/forwarded": {
+-      "version": "0.2.0",
+-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
++    "node_modules/@buttercup/fetch": {
++      "version": "0.2.1",
++      "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz",
++      "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
++      "optional": true,
++      "optionalDependencies": {
++        "node-fetch": "^3.3.0"
+       }
+     },
+-    "node_modules/fresh": {
+-      "version": "0.5.2",
+-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
++    "node_modules/@colors/colors": {
++      "version": "1.6.0",
++      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
++      "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=0.1.90"
+       }
+     },
+-    "node_modules/function-bind": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
++    "node_modules/@crowdsec/express-bouncer": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/@crowdsec/express-bouncer/-/express-bouncer-0.1.0.tgz",
++      "integrity": "sha512-cS5ATNInb914yOubWznMB02lheDLImtIZ8A7n99sn7q2YI+P3Zt6G/Mttp+d1NL1PDUkFBMFlBreOslkcWwLFQ==",
+       "license": "MIT",
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++      "optional": true,
++      "dependencies": {
++        "ip-address": "^7.1.0",
++        "isomorphic-fetch": "^3.0.0",
++        "lodash": "^4.17.21",
++        "svg-captcha": "^1.4.0",
++        "winston": "^3.3.3"
+       }
+     },
+-    "node_modules/generator-function": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
+-      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
++    "node_modules/@cryptography/aes": {
++      "version": "0.1.1",
++      "resolved": "https://registry.npmjs.org/@cryptography/aes/-/aes-0.1.1.tgz",
++      "integrity": "sha512-PcYz4FDGblO6tM2kSC+VzhhK62vml6k6/YAkiWtyPvrgJVfnDRoHGDtKn5UiaRRUrvUTTocBpvc2rRgTCqxjsg==",
++      "license": "GPL-3.0-or-later",
++      "optional": true
++    },
++    "node_modules/@dabh/diagnostics": {
++      "version": "2.0.8",
++      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz",
++      "integrity": "sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.4"
++      "optional": true,
++      "dependencies": {
++        "@so-ric/colorspace": "^1.1.6",
++        "enabled": "2.0.x",
++        "kuler": "^2.0.0"
+       }
+     },
+-    "node_modules/get-intrinsic": {
+-      "version": "1.3.0",
+-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+-      "license": "MIT",
++    "node_modules/@discordjs/builders": {
++      "version": "1.14.1",
++      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.14.1.tgz",
++      "integrity": "sha512-gSKkhXLqs96TCzk66VZuHHl8z2bQMJFGwrXC0f33ngK+FLNau4hU1PYny3DNJfNdSH+gVMzE85/d5FQ2BpcNwQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "call-bind-apply-helpers": "^1.0.2",
+-        "es-define-property": "^1.0.1",
+-        "es-errors": "^1.3.0",
+-        "es-object-atoms": "^1.1.1",
+-        "function-bind": "^1.1.2",
+-        "get-proto": "^1.0.1",
+-        "gopd": "^1.2.0",
+-        "has-symbols": "^1.1.0",
+-        "hasown": "^2.0.2",
+-        "math-intrinsics": "^1.1.0"
++        "@discordjs/formatters": "^0.6.2",
++        "@discordjs/util": "^1.2.0",
++        "@sapphire/shapeshift": "^4.0.0",
++        "discord-api-types": "^0.38.40",
++        "fast-deep-equal": "^3.1.3",
++        "ts-mixer": "^6.0.4",
++        "tslib": "^2.6.3"
+       },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=16.11.0"
+       },
+       "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "url": "https://github.com/discordjs/discord.js?sponsor"
+       }
+     },
+-    "node_modules/get-proto": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+-      "license": "MIT",
+-      "dependencies": {
+-        "dunder-proto": "^1.0.1",
+-        "es-object-atoms": "^1.0.0"
+-      },
++    "node_modules/@discordjs/collection": {
++      "version": "1.5.3",
++      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.5.3.tgz",
++      "integrity": "sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=16.11.0"
+       }
+     },
+-    "node_modules/glob": {
+-      "version": "10.5.0",
+-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+-      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+-      "license": "ISC",
++    "node_modules/@discordjs/formatters": {
++      "version": "0.6.2",
++      "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.6.2.tgz",
++      "integrity": "sha512-y4UPwWhH6vChKRkGdMB4odasUbHOUwy7KL+OVwF86PvT6QVOwElx+TiI1/6kcmcEe+g5YRXJFiXSXUdabqZOvQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "foreground-child": "^3.1.0",
+-        "jackspeak": "^3.1.2",
+-        "minimatch": "^9.0.4",
+-        "minipass": "^7.1.2",
+-        "package-json-from-dist": "^1.0.0",
+-        "path-scurry": "^1.11.1"
++        "discord-api-types": "^0.38.33"
+       },
+-      "bin": {
+-        "glob": "dist/esm/bin.mjs"
++      "engines": {
++        "node": ">=16.11.0"
+       },
+       "funding": {
+-        "url": "https://github.com/sponsors/isaacs"
++        "url": "https://github.com/discordjs/discord.js?sponsor"
+       }
+     },
+-    "node_modules/gopd": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+-      "license": "MIT",
++    "node_modules/@discordjs/rest": {
++      "version": "2.6.1",
++      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.6.1.tgz",
++      "integrity": "sha512-wwQdgjeaoYFiaG+atbqx6aJDpqW7JHAo0HrQkBTbYzM3/PJ3GweQIpgElNcGZ26DCUOXMyawYd0YF7vtr+fZXg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@discordjs/collection": "^2.1.1",
++        "@discordjs/util": "^1.2.0",
++        "@sapphire/async-queue": "^1.5.3",
++        "@sapphire/snowflake": "^3.5.5",
++        "@vladfrangu/async_event_emitter": "^2.4.6",
++        "discord-api-types": "^0.38.40",
++        "magic-bytes.js": "^1.13.0",
++        "tslib": "^2.6.3",
++        "undici": "6.24.1"
++      },
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=18"
+       },
+       "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "url": "https://github.com/discordjs/discord.js?sponsor"
+       }
+     },
+-    "node_modules/graceful-fs": {
+-      "version": "4.2.11",
+-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+-      "license": "ISC"
++    "node_modules/@discordjs/rest/node_modules/@discordjs/collection": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.1.tgz",
++      "integrity": "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=18"
++      },
++      "funding": {
++        "url": "https://github.com/discordjs/discord.js?sponsor"
++      }
+     },
+-    "node_modules/handlebars": {
+-      "version": "4.7.8",
+-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
+-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
++    "node_modules/@discordjs/rest/node_modules/@sapphire/snowflake": {
++      "version": "3.5.5",
++      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.5.tgz",
++      "integrity": "sha512-xzvBr1Q1c4lCe7i6sRnrofxeO1QTP/LKQ6A6qy0iB4x5yfiSfARMEQEghojzTNALDTcv8En04qYNIco9/K9eZQ==",
+       "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=v14.0.0",
++        "npm": ">=7.0.0"
++      }
++    },
++    "node_modules/@discordjs/util": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.2.0.tgz",
++      "integrity": "sha512-3LKP7F2+atl9vJFhaBjn4nOaSWahZ/yWjOvA4e5pnXkt2qyXRCHLxoBQy81GFtLGCq7K9lPm9R517M1U+/90Qg==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "minimist": "^1.2.5",
+-        "neo-async": "^2.6.2",
+-        "source-map": "^0.6.1",
+-        "wordwrap": "^1.0.0"
+-      },
+-      "bin": {
+-        "handlebars": "bin/handlebars"
++        "discord-api-types": "^0.38.33"
+       },
+       "engines": {
+-        "node": ">=0.4.7"
++        "node": ">=18"
+       },
+-      "optionalDependencies": {
+-        "uglify-js": "^3.1.4"
++      "funding": {
++        "url": "https://github.com/discordjs/discord.js?sponsor"
+       }
+     },
+-    "node_modules/has-property-descriptors": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+-      "license": "MIT",
++    "node_modules/@discordjs/ws": {
++      "version": "1.2.3",
++      "resolved": "https://registry.npmjs.org/@discordjs/ws/-/ws-1.2.3.tgz",
++      "integrity": "sha512-wPlQDxEmlDg5IxhJPuxXr3Vy9AjYq5xCvFWGJyD7w7Np8ZGu+Mc+97LCoEc/+AYCo2IDpKioiH0/c/mj5ZR9Uw==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "es-define-property": "^1.0.0"
++        "@discordjs/collection": "^2.1.0",
++        "@discordjs/rest": "^2.5.1",
++        "@discordjs/util": "^1.1.0",
++        "@sapphire/async-queue": "^1.5.2",
++        "@types/ws": "^8.5.10",
++        "@vladfrangu/async_event_emitter": "^2.2.4",
++        "discord-api-types": "^0.38.1",
++        "tslib": "^2.6.2",
++        "ws": "^8.17.0"
++      },
++      "engines": {
++        "node": ">=16.11.0"
+       },
+       "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "url": "https://github.com/discordjs/discord.js?sponsor"
+       }
+     },
+-    "node_modules/has-symbols": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+-      "license": "MIT",
++    "node_modules/@discordjs/ws/node_modules/@discordjs/collection": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.1.tgz",
++      "integrity": "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=18"
+       },
+       "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "url": "https://github.com/discordjs/discord.js?sponsor"
+       }
+     },
+-    "node_modules/has-tostringtag": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
++    "node_modules/@duosecurity/duo_universal": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/@duosecurity/duo_universal/-/duo_universal-2.1.0.tgz",
++      "integrity": "sha512-6i+oSezndETL5nwaZbe8OVXA8GTalI0KmY4hc060iTaGpkj5/WY1OWC1W9lWDg0dWpYohsTwZy1dBQOs+vUc7g==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "has-symbols": "^1.0.3"
++        "axios": "^1.2.2",
++        "jsonwebtoken": "^9.0.0"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+       }
+     },
+-    "node_modules/hasown": {
+-      "version": "2.0.2",
+-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
++    "node_modules/@fastify/busboy": {
++      "version": "3.2.0",
++      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-3.2.0.tgz",
++      "integrity": "sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==",
+       "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@firebase/app-check-interop-types": {
++      "version": "0.3.2",
++      "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.2.tgz",
++      "integrity": "sha512-LMs47Vinv2HBMZi49C09dJxp0QT5LwDzFaVGf/+ITHe3BlIhUiLNttkATSXplc89A2lAaeTqjgqVkiRfUGyQiQ==",
++      "license": "Apache-2.0",
++      "optional": true
++    },
++    "node_modules/@firebase/app-types": {
++      "version": "0.9.2",
++      "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.9.2.tgz",
++      "integrity": "sha512-oMEZ1TDlBz479lmABwWsWjzHwheQKiAgnuKxE0pz0IXCVx7/rtlkx1fQ6GfgK24WCrxDKMplZrT50Kh04iMbXQ==",
++      "license": "Apache-2.0",
++      "optional": true
++    },
++    "node_modules/@firebase/auth-interop-types": {
++      "version": "0.2.3",
++      "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.2.3.tgz",
++      "integrity": "sha512-Fc9wuJGgxoxQeavybiuwgyi+0rssr76b+nHpj+eGhXFYAdudMWyfBHvFL/I5fEHniUM/UQdFzi9VXJK2iZF7FQ==",
++      "license": "Apache-2.0",
++      "optional": true
++    },
++    "node_modules/@firebase/component": {
++      "version": "0.6.9",
++      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.9.tgz",
++      "integrity": "sha512-gm8EUEJE/fEac86AvHn8Z/QW8BvR56TBw3hMW0O838J/1mThYQXAIQBgUv75EqlCZfdawpWLrKt1uXvp9ciK3Q==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "function-bind": "^1.1.2"
+-      },
+-      "engines": {
+-        "node": ">= 0.4"
++        "@firebase/util": "1.10.0",
++        "tslib": "^2.1.0"
+       }
+     },
+-    "node_modules/http-errors": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
+-      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
+-      "license": "MIT",
++    "node_modules/@firebase/database": {
++      "version": "1.0.8",
++      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.8.tgz",
++      "integrity": "sha512-dzXALZeBI1U5TXt6619cv0+tgEhJiwlUtQ55WNZY7vGAjv7Q1QioV969iYwt1AQQ0ovHnEW0YW9TiBfefLvErg==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "depd": "~2.0.0",
+-        "inherits": "~2.0.4",
+-        "setprototypeof": "~1.2.0",
+-        "statuses": "~2.0.2",
+-        "toidentifier": "~1.0.1"
+-      },
+-      "engines": {
+-        "node": ">= 0.8"
+-      },
+-      "funding": {
+-        "type": "opencollective",
+-        "url": "https://opencollective.com/express"
++        "@firebase/app-check-interop-types": "0.3.2",
++        "@firebase/auth-interop-types": "0.2.3",
++        "@firebase/component": "0.6.9",
++        "@firebase/logger": "0.4.2",
++        "@firebase/util": "1.10.0",
++        "faye-websocket": "0.11.4",
++        "tslib": "^2.1.0"
+       }
+     },
+-    "node_modules/iconv-lite": {
+-      "version": "0.4.24",
+-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+-      "license": "MIT",
++    "node_modules/@firebase/database-compat": {
++      "version": "1.0.8",
++      "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-1.0.8.tgz",
++      "integrity": "sha512-OpeWZoPE3sGIRPBKYnW9wLad25RaWbGyk7fFQe4xnJQKRzlynWeFBSRRAoLE2Old01WXwskUiucNqUUVlFsceg==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "safer-buffer": ">= 2.1.2 < 3"
+-      },
+-      "engines": {
+-        "node": ">=0.10.0"
++        "@firebase/component": "0.6.9",
++        "@firebase/database": "1.0.8",
++        "@firebase/database-types": "1.0.5",
++        "@firebase/logger": "0.4.2",
++        "@firebase/util": "1.10.0",
++        "tslib": "^2.1.0"
+       }
+     },
+-    "node_modules/ieee754": {
+-      "version": "1.2.1",
+-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+-      "funding": [
+-        {
+-          "type": "github",
+-          "url": "https://github.com/sponsors/feross"
+-        },
+-        {
+-          "type": "patreon",
+-          "url": "https://www.patreon.com/feross"
+-        },
+-        {
+-          "type": "consulting",
+-          "url": "https://feross.org/support"
+-        }
+-      ],
+-      "license": "BSD-3-Clause"
++    "node_modules/@firebase/database-types": {
++      "version": "1.0.5",
++      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.5.tgz",
++      "integrity": "sha512-fTlqCNwFYyq/C6W7AJ5OCuq5CeZuBEsEwptnVxlNPkWCo5cTTyukzAHRSO/jaQcItz33FfYrrFk1SJofcu2AaQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@firebase/app-types": "0.9.2",
++        "@firebase/util": "1.10.0"
++      }
+     },
+-    "node_modules/immediate": {
+-      "version": "3.0.6",
+-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+-      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+-      "license": "MIT"
++    "node_modules/@firebase/logger": {
++      "version": "0.4.2",
++      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz",
++      "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.1.0"
++      }
+     },
+-    "node_modules/inherits": {
+-      "version": "2.0.4",
+-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+-      "license": "ISC"
++    "node_modules/@firebase/util": {
++      "version": "1.10.0",
++      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.0.tgz",
++      "integrity": "sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.1.0"
++      }
+     },
+-    "node_modules/ipaddr.js": {
+-      "version": "1.9.1",
+-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
++    "node_modules/@gar/promisify": {
++      "version": "1.1.3",
++      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
++      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+       "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@google-cloud/firestore": {
++      "version": "7.11.6",
++      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.11.6.tgz",
++      "integrity": "sha512-EW/O8ktzwLfyWBOsNuhRoMi8lrC3clHM5LVFhGvO1HCsLozCOOXRAlHrYBoE6HL42Sc8yYMuCb2XqcnJ4OOEpw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@opentelemetry/api": "^1.3.0",
++        "fast-deep-equal": "^3.1.1",
++        "functional-red-black-tree": "^1.0.1",
++        "google-gax": "^4.3.3",
++        "protobufjs": "^7.2.6"
++      },
+       "engines": {
+-        "node": ">= 0.10"
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/ipcheck": {
+-      "version": "0.1.0",
+-      "resolved": "https://registry.npmjs.org/ipcheck/-/ipcheck-0.1.0.tgz",
+-      "integrity": "sha512-NwhrmROU0iXKa+U1quGuQ+ag+K/1Bb5V/yh5Q4SylSu/LGymPZcWB7p4u7JgJH0qOR6cTLDO5VZlRbhoeekNzQ==",
+-      "license": "MIT"
+-    },
+-    "node_modules/is-arguments": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
+-      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
+-      "license": "MIT",
++    "node_modules/@google-cloud/paginator": {
++      "version": "5.0.2",
++      "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.2.tgz",
++      "integrity": "sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "call-bound": "^1.0.2",
+-        "has-tostringtag": "^1.0.2"
++        "arrify": "^2.0.0",
++        "extend": "^3.0.2"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/is-callable": {
+-      "version": "1.2.7",
+-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+-      "license": "MIT",
++    "node_modules/@google-cloud/projectify": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-4.0.0.tgz",
++      "integrity": "sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/is-fullwidth-code-point": {
+-      "version": "3.0.0",
+-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+-      "license": "MIT",
++    "node_modules/@google-cloud/promisify": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.0.0.tgz",
++      "integrity": "sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "engines": {
+-        "node": ">=8"
++        "node": ">=14"
+       }
+     },
+-    "node_modules/is-generator-function": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
+-      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
+-      "license": "MIT",
++    "node_modules/@google-cloud/storage": {
++      "version": "7.19.0",
++      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.19.0.tgz",
++      "integrity": "sha512-n2FjE7NAOYyshogdc7KQOl/VZb4sneqPjWouSyia9CMDdMhRX5+RIbqalNmC7LOLzuLAN89VlF2HvG8na9G+zQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "call-bound": "^1.0.4",
+-        "generator-function": "^2.0.0",
+-        "get-proto": "^1.0.1",
+-        "has-tostringtag": "^1.0.2",
+-        "safe-regex-test": "^1.1.0"
++        "@google-cloud/paginator": "^5.0.0",
++        "@google-cloud/projectify": "^4.0.0",
++        "@google-cloud/promisify": "<4.1.0",
++        "abort-controller": "^3.0.0",
++        "async-retry": "^1.3.3",
++        "duplexify": "^4.1.3",
++        "fast-xml-parser": "^5.3.4",
++        "gaxios": "^6.0.2",
++        "google-auth-library": "^9.6.3",
++        "html-entities": "^2.5.2",
++        "mime": "^3.0.0",
++        "p-limit": "^3.0.1",
++        "retry-request": "^7.0.0",
++        "teeny-request": "^9.0.0",
++        "uuid": "^8.0.0"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=14"
+       }
+     },
+-    "node_modules/is-regex": {
+-      "version": "1.2.1",
+-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+-      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
++    "node_modules/@google-cloud/storage/node_modules/mime": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
++      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+       "license": "MIT",
+-      "dependencies": {
+-        "call-bound": "^1.0.2",
+-        "gopd": "^1.2.0",
+-        "has-tostringtag": "^1.0.2",
+-        "hasown": "^2.0.2"
++      "optional": true,
++      "bin": {
++        "mime": "cli.js"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=10.0.0"
+       }
+     },
+-    "node_modules/is-stream": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
++    "node_modules/@google-cloud/storage/node_modules/uuid": {
++      "version": "8.3.2",
++      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
++      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">=8"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/sindresorhus"
++      "optional": true,
++      "bin": {
++        "uuid": "dist/bin/uuid"
+       }
+     },
+-    "node_modules/is-typed-array": {
+-      "version": "1.1.15",
+-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+-      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+-      "license": "MIT",
++    "node_modules/@grpc/grpc-js": {
++      "version": "1.14.3",
++      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.3.tgz",
++      "integrity": "sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "which-typed-array": "^1.1.16"
++        "@grpc/proto-loader": "^0.8.0",
++        "@js-sdsl/ordered-map": "^4.4.2"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=12.10.0"
+       }
+     },
+-    "node_modules/isarray": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+-      "license": "MIT"
+-    },
+-    "node_modules/isexe": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+-      "license": "ISC"
+-    },
+-    "node_modules/jackspeak": {
+-      "version": "3.4.3",
+-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+-      "license": "BlueOak-1.0.0",
++    "node_modules/@grpc/grpc-js/node_modules/@grpc/proto-loader": {
++      "version": "0.8.0",
++      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.0.tgz",
++      "integrity": "sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "@isaacs/cliui": "^8.0.2"
++        "lodash.camelcase": "^4.3.0",
++        "long": "^5.0.0",
++        "protobufjs": "^7.5.3",
++        "yargs": "^17.7.2"
+       },
+-      "funding": {
+-        "url": "https://github.com/sponsors/isaacs"
++      "bin": {
++        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
+       },
+-      "optionalDependencies": {
+-        "@pkgjs/parseargs": "^0.11.0"
++      "engines": {
++        "node": ">=6"
+       }
+     },
+-    "node_modules/keygrip": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
+-      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
+-      "license": "MIT",
++    "node_modules/@grpc/proto-loader": {
++      "version": "0.7.15",
++      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.15.tgz",
++      "integrity": "sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "tsscmp": "1.0.6"
++        "lodash.camelcase": "^4.3.0",
++        "long": "^5.0.0",
++        "protobufjs": "^7.2.5",
++        "yargs": "^17.7.2"
++      },
++      "bin": {
++        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
+       },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=6"
+       }
+     },
+-    "node_modules/lazystream": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
+-      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+-      "license": "MIT",
++    "node_modules/@hapi/hoek": {
++      "version": "9.3.0",
++      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
++      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@hapi/topo": {
++      "version": "5.1.0",
++      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
++      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
++      "license": "BSD-3-Clause",
++      "optional": true,
+       "dependencies": {
+-        "readable-stream": "^2.0.5"
++        "@hapi/hoek": "^9.0.0"
++      }
++    },
++    "node_modules/@isaacs/cliui": {
++      "version": "8.0.2",
++      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
++      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
++      "license": "ISC",
++      "dependencies": {
++        "string-width": "^5.1.2",
++        "string-width-cjs": "npm:string-width@^4.2.0",
++        "strip-ansi": "^7.0.1",
++        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
++        "wrap-ansi": "^8.1.0",
++        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+       },
+       "engines": {
+-        "node": ">= 0.6.3"
++        "node": ">=12"
+       }
+     },
+-    "node_modules/lazystream/node_modules/readable-stream": {
+-      "version": "2.3.8",
+-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
++    "node_modules/@jridgewell/gen-mapping": {
++      "version": "0.3.13",
++      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
++      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "core-util-is": "~1.0.0",
+-        "inherits": "~2.0.3",
+-        "isarray": "~1.0.0",
+-        "process-nextick-args": "~2.0.0",
+-        "safe-buffer": "~5.1.1",
+-        "string_decoder": "~1.1.1",
+-        "util-deprecate": "~1.0.1"
++        "@jridgewell/sourcemap-codec": "^1.5.0",
++        "@jridgewell/trace-mapping": "^0.3.24"
+       }
+     },
+-    "node_modules/lazystream/node_modules/safe-buffer": {
+-      "version": "5.1.2",
+-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+-      "license": "MIT"
+-    },
+-    "node_modules/lazystream/node_modules/string_decoder": {
+-      "version": "1.1.1",
+-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
++    "node_modules/@jridgewell/remapping": {
++      "version": "2.3.5",
++      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
++      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "safe-buffer": "~5.1.0"
++        "@jridgewell/gen-mapping": "^0.3.5",
++        "@jridgewell/trace-mapping": "^0.3.24"
+       }
+     },
+-    "node_modules/lie": {
+-      "version": "3.1.1",
+-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+-      "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
++    "node_modules/@jridgewell/resolve-uri": {
++      "version": "3.1.2",
++      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
++      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+       "license": "MIT",
+-      "dependencies": {
+-        "immediate": "~3.0.5"
++      "optional": true,
++      "engines": {
++        "node": ">=6.0.0"
+       }
+     },
+-    "node_modules/localforage": {
+-      "version": "1.10.0",
+-      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
+-      "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
+-      "license": "Apache-2.0",
++    "node_modules/@jridgewell/source-map": {
++      "version": "0.3.11",
++      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
++      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
++      "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "lie": "3.1.1"
++        "@jridgewell/gen-mapping": "^0.3.5",
++        "@jridgewell/trace-mapping": "^0.3.25"
+       }
+     },
+-    "node_modules/lodash": {
+-      "version": "4.17.23",
+-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+-      "license": "MIT"
+-    },
+-    "node_modules/lru-cache": {
+-      "version": "10.4.3",
+-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+-      "license": "ISC"
+-    },
+-    "node_modules/math-intrinsics": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
++    "node_modules/@jridgewell/sourcemap-codec": {
++      "version": "1.5.5",
++      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
++      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.4"
+-      }
++      "optional": true
+     },
+-    "node_modules/media-typer": {
+-      "version": "0.3.0",
+-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
++    "node_modules/@jridgewell/trace-mapping": {
++      "version": "0.3.31",
++      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
++      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
++      "optional": true,
++      "dependencies": {
++        "@jridgewell/resolve-uri": "^3.1.0",
++        "@jridgewell/sourcemap-codec": "^1.4.14"
+       }
+     },
+-    "node_modules/merge-descriptors": {
+-      "version": "1.0.3",
+-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
++    "node_modules/@js-sdsl/ordered-map": {
++      "version": "4.4.2",
++      "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
++      "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==",
+       "license": "MIT",
++      "optional": true,
+       "funding": {
+-        "url": "https://github.com/sponsors/sindresorhus"
++        "type": "opencollective",
++        "url": "https://opencollective.com/js-sdsl"
+       }
+     },
+-    "node_modules/methods": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
++    "node_modules/@mongodb-js/saslprep": {
++      "version": "1.4.9",
++      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.4.9.tgz",
++      "integrity": "sha512-RXSxsokhAF/4nWys8An8npsqOI33Ex1Hlzqjw2pZOO+GKtMAR2noGnUdsFiGwsaO/xXI+56mtjTmDA3JXJsvmA==",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
++      "optional": true,
++      "dependencies": {
++        "sparse-bitfield": "^3.0.3"
+       }
+     },
+-    "node_modules/mime": {
+-      "version": "1.6.0",
+-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+-      "license": "MIT",
+-      "bin": {
+-        "mime": "cli.js"
++    "node_modules/@mysql/xdevapi": {
++      "version": "8.0.35",
++      "resolved": "https://registry.npmjs.org/@mysql/xdevapi/-/xdevapi-8.0.35.tgz",
++      "integrity": "sha512-l7HoBt1l0GwdCBXBrqri4kPBbJrqsyvaa4eqXvq50aWWArOTc5XGV06FWF1epxT+RORBy7scZTWFANxpr4Sfuw==",
++      "license": "GPL-2.0",
++      "optional": true,
++      "dependencies": {
++        "google-protobuf": "3.19.4",
++        "lossless-json": "2.0.1",
++        "parsimmon": "1.18.1"
+       },
+       "engines": {
+-        "node": ">=4"
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/mime-db": {
+-      "version": "1.54.0",
+-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+-      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
++    "node_modules/@nicolo-ribaudo/chokidar-2": {
++      "version": "2.1.8-no-fsevents.3",
++      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
++      "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@nodable/entities": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.1.0.tgz",
++      "integrity": "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/nodable"
++        }
++      ],
+       "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@npmcli/fs": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
++      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@gar/promisify": "^1.0.1",
++        "semver": "^7.3.5"
++      }
++    },
++    "node_modules/@npmcli/fs/node_modules/semver": {
++      "version": "7.7.4",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
++      "license": "ISC",
++      "optional": true,
++      "bin": {
++        "semver": "bin/semver.js"
++      },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=10"
+       }
+     },
+-    "node_modules/mime-types": {
+-      "version": "2.1.35",
+-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
++    "node_modules/@npmcli/move-file": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
++      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
++      "deprecated": "This functionality has been moved to @npmcli/fs",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "mime-db": "1.52.0"
++        "mkdirp": "^1.0.4",
++        "rimraf": "^3.0.2"
+       },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=10"
+       }
+     },
+-    "node_modules/mime-types/node_modules/mime-db": {
+-      "version": "1.52.0",
+-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
++    "node_modules/@npmcli/move-file/node_modules/brace-expansion": {
++      "version": "1.1.14",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
++      "optional": true,
++      "dependencies": {
++        "balanced-match": "^1.0.0",
++        "concat-map": "0.0.1"
+       }
+     },
+-    "node_modules/minimatch": {
+-      "version": "9.0.9",
+-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
++    "node_modules/@npmcli/move-file/node_modules/glob": {
++      "version": "7.2.3",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+       "license": "ISC",
++      "optional": true,
+       "dependencies": {
+-        "brace-expansion": "^2.0.2"
++        "fs.realpath": "^1.0.0",
++        "inflight": "^1.0.4",
++        "inherits": "2",
++        "minimatch": "^3.1.1",
++        "once": "^1.3.0",
++        "path-is-absolute": "^1.0.0"
+       },
+       "engines": {
+-        "node": ">=16 || 14 >=14.17"
++        "node": "*"
+       },
+       "funding": {
+         "url": "https://github.com/sponsors/isaacs"
+       }
+     },
+-    "node_modules/minimist": {
+-      "version": "1.2.8",
+-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+-      "license": "MIT",
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++    "node_modules/@npmcli/move-file/node_modules/minimatch": {
++      "version": "3.1.5",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "brace-expansion": "^1.1.7"
++      },
++      "engines": {
++        "node": "*"
+       }
+     },
+-    "node_modules/minipass": {
+-      "version": "7.1.3",
+-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+-      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+-      "license": "BlueOak-1.0.0",
++    "node_modules/@npmcli/move-file/node_modules/mkdirp": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
++      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "mkdirp": "bin/cmd.js"
++      },
+       "engines": {
+-        "node": ">=16 || 14 >=14.17"
++        "node": ">=10"
+       }
+     },
+-    "node_modules/ms": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
++    "node_modules/@npmcli/move-file/node_modules/rimraf": {
++      "version": "3.0.2",
++      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
++      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
++      "deprecated": "Rimraf versions prior to v4 are no longer supported",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "glob": "^7.1.3"
++      },
++      "bin": {
++        "rimraf": "bin.js"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/@opentelemetry/api": {
++      "version": "1.9.1",
++      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.1.tgz",
++      "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=8.0.0"
++      }
++    },
++    "node_modules/@otplib/core": {
++      "version": "12.0.1",
++      "resolved": "https://registry.npmjs.org/@otplib/core/-/core-12.0.1.tgz",
++      "integrity": "sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==",
+       "license": "MIT"
+     },
+-    "node_modules/multiparty": {
+-      "version": "4.2.3",
+-      "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-4.2.3.tgz",
+-      "integrity": "sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==",
++    "node_modules/@otplib/plugin-crypto": {
++      "version": "12.0.1",
++      "resolved": "https://registry.npmjs.org/@otplib/plugin-crypto/-/plugin-crypto-12.0.1.tgz",
++      "integrity": "sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==",
++      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
+       "license": "MIT",
+       "dependencies": {
+-        "http-errors": "~1.8.1",
+-        "safe-buffer": "5.2.1",
+-        "uid-safe": "2.1.5"
++        "@otplib/core": "^12.0.1"
++      }
++    },
++    "node_modules/@otplib/plugin-thirty-two": {
++      "version": "12.0.1",
++      "resolved": "https://registry.npmjs.org/@otplib/plugin-thirty-two/-/plugin-thirty-two-12.0.1.tgz",
++      "integrity": "sha512-MtT+uqRso909UkbrrYpJ6XFjj9D+x2Py7KjTO9JDPhL0bJUYVu5kFP4TFZW4NFAywrAtFRxOVY261u0qwb93gA==",
++      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
++      "license": "MIT",
++      "dependencies": {
++        "@otplib/core": "^12.0.1",
++        "thirty-two": "^1.0.2"
++      }
++    },
++    "node_modules/@otplib/preset-default": {
++      "version": "12.0.1",
++      "resolved": "https://registry.npmjs.org/@otplib/preset-default/-/preset-default-12.0.1.tgz",
++      "integrity": "sha512-xf1v9oOJRyXfluBhMdpOkr+bsE+Irt+0D5uHtvg6x1eosfmHCsCC6ej/m7FXiWqdo0+ZUI6xSKDhJwc8yfiOPQ==",
++      "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths",
++      "license": "MIT",
++      "dependencies": {
++        "@otplib/core": "^12.0.1",
++        "@otplib/plugin-crypto": "^12.0.1",
++        "@otplib/plugin-thirty-two": "^12.0.1"
++      }
++    },
++    "node_modules/@otplib/preset-v11": {
++      "version": "12.0.1",
++      "resolved": "https://registry.npmjs.org/@otplib/preset-v11/-/preset-v11-12.0.1.tgz",
++      "integrity": "sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==",
++      "license": "MIT",
++      "dependencies": {
++        "@otplib/core": "^12.0.1",
++        "@otplib/plugin-crypto": "^12.0.1",
++        "@otplib/plugin-thirty-two": "^12.0.1"
++      }
++    },
++    "node_modules/@pkgjs/parseargs": {
++      "version": "0.11.0",
++      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
++      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/@protobufjs/aspromise": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
++      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@protobufjs/base64": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
++      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@protobufjs/codegen": {
++      "version": "2.0.4",
++      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
++      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@protobufjs/eventemitter": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
++      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@protobufjs/fetch": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
++      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "@protobufjs/aspromise": "^1.1.1",
++        "@protobufjs/inquire": "^1.1.0"
++      }
++    },
++    "node_modules/@protobufjs/float": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
++      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@protobufjs/inquire": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
++      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@protobufjs/path": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
++      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@protobufjs/pool": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
++      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@protobufjs/utf8": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
++      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@sapphire/async-queue": {
++      "version": "1.5.5",
++      "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.5.tgz",
++      "integrity": "sha512-cvGzxbba6sav2zZkH8GPf2oGk9yYoD5qrNWdu9fRehifgnFZJMV+nuy2nON2roRO4yQQ+v7MK/Pktl/HgfsUXg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=v14.0.0",
++        "npm": ">=7.0.0"
++      }
++    },
++    "node_modules/@sapphire/shapeshift": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-4.0.0.tgz",
++      "integrity": "sha512-d9dUmWVA7MMiKobL3VpLF8P2aeanRTu6ypG2OIaEv/ZHH/SUQ2iHOVyi5wAPjQ+HmnMuL0whK9ez8I/raWbtIg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "fast-deep-equal": "^3.1.3",
++        "lodash": "^4.17.21"
++      },
++      "engines": {
++        "node": ">=v16"
++      }
++    },
++    "node_modules/@sapphire/snowflake": {
++      "version": "3.5.3",
++      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.3.tgz",
++      "integrity": "sha512-jjmJywLAFoWeBi1W7994zZyiNWPIiqRRNAmSERxyg93xRGzNYvGjlZ0gR6x0F4gPRi2+0O6S71kOZYyr3cxaIQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=v14.0.0",
++        "npm": ">=7.0.0"
++      }
++    },
++    "node_modules/@seald-io/binary-search-tree": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/@seald-io/binary-search-tree/-/binary-search-tree-1.0.3.tgz",
++      "integrity": "sha512-qv3jnwoakeax2razYaMsGI/luWdliBLHTdC6jU55hQt1hcFqzauH/HsBollQ7IR4ySTtYhT+xyHoijpA16C+tA=="
++    },
++    "node_modules/@seald-io/nedb": {
++      "version": "4.1.2",
++      "resolved": "https://registry.npmjs.org/@seald-io/nedb/-/nedb-4.1.2.tgz",
++      "integrity": "sha512-bDr6TqjBVS2rDyYM9CPxAnotj5FuNL9NF8o7h7YyFXM7yruqT4ddr+PkSb2mJvvw991bqdftazkEo38gykvaww==",
++      "license": "MIT",
++      "dependencies": {
++        "@seald-io/binary-search-tree": "^1.0.3",
++        "localforage": "^1.10.0",
++        "util": "^0.12.5"
++      }
++    },
++    "node_modules/@sendgrid/client": {
++      "version": "8.1.6",
++      "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-8.1.6.tgz",
++      "integrity": "sha512-/BHu0hqwXNHr2aLhcXU7RmmlVqrdfrbY9KpaNj00KZHlVOVoRxRVrpOCabIB+91ISXJ6+mLM9vpaVUhK6TwBWA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@sendgrid/helpers": "^8.0.0",
++        "axios": "^1.12.0"
++      },
++      "engines": {
++        "node": ">=12.*"
++      }
++    },
++    "node_modules/@sendgrid/helpers": {
++      "version": "8.0.0",
++      "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-8.0.0.tgz",
++      "integrity": "sha512-Ze7WuW2Xzy5GT5WRx+yEv89fsg/pgy3T1E3FS0QEx0/VvRmigMZ5qyVGhJz4SxomegDkzXv/i0aFPpHKN8qdAA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "deepmerge": "^4.2.2"
++      },
++      "engines": {
++        "node": ">= 12.0.0"
++      }
++    },
++    "node_modules/@sendgrid/mail": {
++      "version": "8.1.6",
++      "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-8.1.6.tgz",
++      "integrity": "sha512-/ZqxUvKeEztU9drOoPC/8opEPOk+jLlB2q4+xpx6HVLq6aFu3pMpalkTpAQz8XfRfpLp8O25bh6pGPcHDCYpqg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@sendgrid/client": "^8.1.5",
++        "@sendgrid/helpers": "^8.0.0"
++      },
++      "engines": {
++        "node": ">=12.*"
++      }
++    },
++    "node_modules/@sideway/address": {
++      "version": "4.1.5",
++      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
++      "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "@hapi/hoek": "^9.0.0"
++      }
++    },
++    "node_modules/@sideway/formula": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
++      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@sideway/pinpoint": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
++      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/@smithy/config-resolver": {
++      "version": "4.4.17",
++      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.4.17.tgz",
++      "integrity": "sha512-TzDZcAnhTyAHbXVxWZo7/tEcrIeFq20IBk8So3OLOetWpR8EwY/yEqBMBFaJMeyEiREDq4NfEl+qO3OAUD+vbQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-config-provider": "^4.2.2",
++        "@smithy/util-endpoints": "^3.4.2",
++        "@smithy/util-middleware": "^4.2.14",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/core": {
++      "version": "3.23.17",
++      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.23.17.tgz",
++      "integrity": "sha512-x7BlLbUFL8NWCGjMF9C+1N5cVCxcPa7g6Tv9B4A2luWx3be3oU8hQ96wIwxe/s7OhIzvoJH73HAUSg5JXVlEtQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/types": "^4.14.1",
++        "@smithy/url-parser": "^4.2.14",
++        "@smithy/util-base64": "^4.3.2",
++        "@smithy/util-body-length-browser": "^4.2.2",
++        "@smithy/util-middleware": "^4.2.14",
++        "@smithy/util-stream": "^4.5.25",
++        "@smithy/util-utf8": "^4.2.2",
++        "@smithy/uuid": "^1.1.2",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/credential-provider-imds": {
++      "version": "4.2.14",
++      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.14.tgz",
++      "integrity": "sha512-Au28zBN48ZAoXdooGUHemuVBrkE+Ie6RPmGNIAJsFqj33Vhb6xAgRifUydZ2aY+M+KaMAETAlKk5NC5h1G7wpg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/types": "^4.14.1",
++        "@smithy/url-parser": "^4.2.14",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/fetch-http-handler": {
++      "version": "5.3.17",
++      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.17.tgz",
++      "integrity": "sha512-bXOvQzaSm6MnmLaWA1elgfQcAtN4UP3vXqV97bHuoOrHQOJiLT3ds6o9eo5bqd0TJfRFpzdGnDQdW3FACiAVdw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/querystring-builder": "^4.2.14",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-base64": "^4.3.2",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/hash-node": {
++      "version": "4.2.14",
++      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.2.14.tgz",
++      "integrity": "sha512-8ZBDY2DD4wr+GGjTpPtiglEsqr0lUP+KHqgZcWczFf6qeZ/YRjMIOoQWVQlmwu7EtxKTd8YXD8lblmYcpBIA1g==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-buffer-from": "^4.2.2",
++        "@smithy/util-utf8": "^4.2.2",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/invalid-dependency": {
++      "version": "4.2.14",
++      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.2.14.tgz",
++      "integrity": "sha512-c21qJiTSb25xvvOp+H2TNZzPCngrvl5vIPqPB8zQ/DmJF4QWXO19x1dWfMJZ6wZuuWUPPm0gV8C0cU3+ifcWuw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/is-array-buffer": {
++      "version": "4.2.2",
++      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.2.2.tgz",
++      "integrity": "sha512-n6rQ4N8Jj4YTQO3YFrlgZuwKodf4zUFs7EJIWH86pSCWBaAtAGBFfCM7Wx6D2bBJ2xqFNxGBSrUWswT3M0VJow==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/middleware-content-length": {
++      "version": "4.2.14",
++      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.2.14.tgz",
++      "integrity": "sha512-xhHq7fX4/3lv5NHxLUk3OeEvl0xZ+Ek3qIbWaCL4f9JwgDZEclPBElljaZCAItdGPQl/kSM4LPMOpy1MYgprpw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/middleware-endpoint": {
++      "version": "4.4.32",
++      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.32.tgz",
++      "integrity": "sha512-ZZkgyjnJppiZbIm6Qbx92pbXYi1uzenIvGhBSCDlc7NwuAkiqSgS75j1czAD25ZLs2FjMjYy1q7gyRVWG6JA0Q==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/core": "^3.23.17",
++        "@smithy/middleware-serde": "^4.2.20",
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/shared-ini-file-loader": "^4.4.9",
++        "@smithy/types": "^4.14.1",
++        "@smithy/url-parser": "^4.2.14",
++        "@smithy/util-middleware": "^4.2.14",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/middleware-retry": {
++      "version": "4.5.5",
++      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.5.5.tgz",
++      "integrity": "sha512-wnYOpB5vATFKWrY2Z9Alb0KhjZI6AbzU6Fbz3Hq2GnURdRYWB4q+qWivQtSTwXcmWUA3MZ6krfwL6Cq5MAbxsA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/core": "^3.23.17",
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/service-error-classification": "^4.3.0",
++        "@smithy/smithy-client": "^4.12.13",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-middleware": "^4.2.14",
++        "@smithy/util-retry": "^4.3.4",
++        "@smithy/uuid": "^1.1.2",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/middleware-serde": {
++      "version": "4.2.20",
++      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.20.tgz",
++      "integrity": "sha512-Lx9JMO9vArPtiChE3wbEZ5akMIDQpWQtlu90lhACQmNOXcGXRbaDywMHDzuDZ2OkZzP+9wQfZi3YJT9F67zTQQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/core": "^3.23.17",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/middleware-stack": {
++      "version": "4.2.14",
++      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.2.14.tgz",
++      "integrity": "sha512-2dvkUKLuFdKsCRmOE4Mn63co0Djtsm+JMh0bYZQupN1pJwMeE8FmQmRLLzzEMN0dnNi7CDCYYH8F0EVwWiPBeA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/node-config-provider": {
++      "version": "4.3.14",
++      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.3.14.tgz",
++      "integrity": "sha512-S+gFjyo/weSVL0P1b9Ts8C/CwIfNCgUPikk3sl6QVsfE/uUuO+QsF+NsE/JkpvWqqyz1wg7HFdiaZuj5CoBMRg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/shared-ini-file-loader": "^4.4.9",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/node-http-handler": {
++      "version": "4.6.1",
++      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.6.1.tgz",
++      "integrity": "sha512-iB+orM4x3xrr57X3YaXazfKnntl0LHlZB1kcXSGzMV1Tt0+YwEjGlbjk/44qEGtBzXAz6yFDzkYTKSV6Pj2HUg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/querystring-builder": "^4.2.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/property-provider": {
++      "version": "4.2.14",
++      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.2.14.tgz",
++      "integrity": "sha512-WuM31CgfsnQ/10i7NYr0PyxqknD72Y5uMfUMVSniPjbEPceiTErb4eIqJQ+pdxNEAUEWrewrGjIRjVbVHsxZiQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/protocol-http": {
++      "version": "5.3.14",
++      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.3.14.tgz",
++      "integrity": "sha512-dN5F8kHx8RNU0r+pCwNmFZyz6ChjMkzShy/zup6MtkRmmix4vZzJdW+di7x//b1LiynIev88FM18ie+wwPcQtQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/querystring-builder": {
++      "version": "4.2.14",
++      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.2.14.tgz",
++      "integrity": "sha512-XYA5Z0IqTeF+5XDdh4BBmSA0HvbgVZIyv4cmOoUheDNR57K1HgBp9ukUMx3Cr3XpDHHpLBnexPE3LAtDsZkj2A==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-uri-escape": "^4.2.2",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/querystring-parser": {
++      "version": "4.2.14",
++      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.2.14.tgz",
++      "integrity": "sha512-hr+YyqBD23GVvRxGGrcc/oOeNlK3PzT5Fu4dzrDXxzS1LpFiuL2PQQqKPs87M79aW7ziMs+nvB3qdw77SqE7Lw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/service-error-classification": {
++      "version": "4.3.0",
++      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.3.0.tgz",
++      "integrity": "sha512-9jKsBYQRPR0xBLgc2415RsA5PIcP2sis4oBdN9s0D13cg1B1284mNTjx9Yc+BEERXzuPm5ObktI96OxsKh8E9A==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/types": "^4.14.1"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/shared-ini-file-loader": {
++      "version": "4.4.9",
++      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.9.tgz",
++      "integrity": "sha512-495/V2I15SHgedSJoDPD23JuSfKAp726ZI1V0wtjB07Wh7q/0tri/0e0DLefZCHgxZonrGKt/OCTpAtP1wE1kQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/signature-v4": {
++      "version": "5.3.14",
++      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.3.14.tgz",
++      "integrity": "sha512-1D9Y/nmlVjCeSivCbhZ7hgEpmHyY1h0GvpSZt3l0xcD9JjmjVC1CHOozS6+Gh+/ldMH8JuJ6cujObQqfayAVFA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/is-array-buffer": "^4.2.2",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-hex-encoding": "^4.2.2",
++        "@smithy/util-middleware": "^4.2.14",
++        "@smithy/util-uri-escape": "^4.2.2",
++        "@smithy/util-utf8": "^4.2.2",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/smithy-client": {
++      "version": "4.12.13",
++      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.12.13.tgz",
++      "integrity": "sha512-y/Pcj1V9+qG98gyu1gvftHB7rDpdh+7kIBIggs55yGm3JdtBV8GT8IFF3a1qxZ79QnaJHX9GXzvBG6tAd+czJA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/core": "^3.23.17",
++        "@smithy/middleware-endpoint": "^4.4.32",
++        "@smithy/middleware-stack": "^4.2.14",
++        "@smithy/protocol-http": "^5.3.14",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-stream": "^4.5.25",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/types": {
++      "version": "4.14.1",
++      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.14.1.tgz",
++      "integrity": "sha512-59b5HtSVrVR/eYNei3BUj3DCPKD/G7EtDDe7OEJE7i7FtQFugYo6MxbotS8mVJkLNVf8gYaAlEBwwtJ9HzhWSg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/url-parser": {
++      "version": "4.2.14",
++      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.2.14.tgz",
++      "integrity": "sha512-p06BiBigJ8bTA3MgnOfCtDUWnAMY0YfedO/GRpmc7p+wg3KW8vbXy1xwSu5ASy0wV7rRYtlfZOIKH4XqfhjSQQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/querystring-parser": "^4.2.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-base64": {
++      "version": "4.3.2",
++      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.3.2.tgz",
++      "integrity": "sha512-XRH6b0H/5A3SgblmMa5ErXQ2XKhfbQB+Fm/oyLZ2O2kCUrwgg55bU0RekmzAhuwOjA9qdN5VU2BprOvGGUkOOQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/util-buffer-from": "^4.2.2",
++        "@smithy/util-utf8": "^4.2.2",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-body-length-browser": {
++      "version": "4.2.2",
++      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.2.tgz",
++      "integrity": "sha512-JKCrLNOup3OOgmzeaKQwi4ZCTWlYR5H4Gm1r2uTMVBXoemo1UEghk5vtMi1xSu2ymgKVGW631e2fp9/R610ZjQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-body-length-node": {
++      "version": "4.2.3",
++      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.2.3.tgz",
++      "integrity": "sha512-ZkJGvqBzMHVHE7r/hcuCxlTY8pQr1kMtdsVPs7ex4mMU+EAbcXppfo5NmyxMYi2XU49eqaz56j2gsk4dHHPG/g==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-buffer-from": {
++      "version": "4.2.2",
++      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.2.2.tgz",
++      "integrity": "sha512-FDXD7cvUoFWwN6vtQfEta540Y/YBe5JneK3SoZg9bThSoOAC/eGeYEua6RkBgKjGa/sz6Y+DuBZj3+YEY21y4Q==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/is-array-buffer": "^4.2.2",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-config-provider": {
++      "version": "4.2.2",
++      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.2.2.tgz",
++      "integrity": "sha512-dWU03V3XUprJwaUIFVv4iOnS1FC9HnMHDfUrlNDSh4315v0cWyaIErP8KiqGVbf5z+JupoVpNM7ZB3jFiTejvQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-defaults-mode-browser": {
++      "version": "4.3.49",
++      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.49.tgz",
++      "integrity": "sha512-a5bNrdiONYB/qE2BuKegvUMd/+ZDwdg4vsNuuSzYE8qs2EYAdK9CynL+Rzn29PbPiUqoz/cbpRbcLzD5lEevHw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/smithy-client": "^4.12.13",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-defaults-mode-node": {
++      "version": "4.2.54",
++      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.54.tgz",
++      "integrity": "sha512-g1cvrJvOnzeJgEdf7AE4luI7gp6L8weE0y9a9wQUSGtjb8QRHDbCJYuE4Sy0SD9N8RrnNPFsPltAz/OSoBR9Zw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/config-resolver": "^4.4.17",
++        "@smithy/credential-provider-imds": "^4.2.14",
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/property-provider": "^4.2.14",
++        "@smithy/smithy-client": "^4.12.13",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-endpoints": {
++      "version": "3.4.2",
++      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.4.2.tgz",
++      "integrity": "sha512-a55Tr+3OKld4TTtnT+RhKOQHyPxm3j/xL4OR83WBUhLJaKDS9dnJ7arRMOp3t31dcLhApwG9bgvrRXBHlLdIkg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/node-config-provider": "^4.3.14",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-hex-encoding": {
++      "version": "4.2.2",
++      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.2.tgz",
++      "integrity": "sha512-Qcz3W5vuHK4sLQdyT93k/rfrUwdJ8/HZ+nMUOyGdpeGA1Wxt65zYwi3oEl9kOM+RswvYq90fzkNDahPS8K0OIg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-middleware": {
++      "version": "4.2.14",
++      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.2.14.tgz",
++      "integrity": "sha512-1Su2vj9RYNDEv/V+2E+jXkkwGsgR7dc4sfHn9Z7ruzQHJIEni9zzw5CauvRXlFJfmgcqYP8fWa0dkh2Q2YaQyw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-retry": {
++      "version": "4.3.4",
++      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.3.4.tgz",
++      "integrity": "sha512-FY1UQQ1VFmMwiYp1GVS4MeaGD5O0blLNYK0xCRHU+mJgeoH/hSY8Ld8sJWKQ6uznkh14HveRGQJncgPyNl9J+A==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/service-error-classification": "^4.3.0",
++        "@smithy/types": "^4.14.1",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-stream": {
++      "version": "4.5.25",
++      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.25.tgz",
++      "integrity": "sha512-/PFpG4k8Ze8Ei+mMKj3oiPICYekthuzePZMgZbCqMiXIHHf4n2aZ4Ps0aSRShycFTGuj/J6XldmC0x0DwednIA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/fetch-http-handler": "^5.3.17",
++        "@smithy/node-http-handler": "^4.6.1",
++        "@smithy/types": "^4.14.1",
++        "@smithy/util-base64": "^4.3.2",
++        "@smithy/util-buffer-from": "^4.2.2",
++        "@smithy/util-hex-encoding": "^4.2.2",
++        "@smithy/util-utf8": "^4.2.2",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-uri-escape": {
++      "version": "4.2.2",
++      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.2.2.tgz",
++      "integrity": "sha512-2kAStBlvq+lTXHyAZYfJRb/DfS3rsinLiwb+69SstC9Vb0s9vNWkRwpnj918Pfi85mzi42sOqdV72OLxWAISnw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/util-utf8": {
++      "version": "4.2.2",
++      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.2.2.tgz",
++      "integrity": "sha512-75MeYpjdWRe8M5E3AW0O4Cx3UadweS+cwdXjwYGBW5h/gxxnbeZ877sLPX/ZJA9GVTlL/qG0dXP29JWFCD1Ayw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@smithy/util-buffer-from": "^4.2.2",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@smithy/uuid": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/@smithy/uuid/-/uuid-1.1.2.tgz",
++      "integrity": "sha512-O/IEdcCUKkubz60tFbGA7ceITTAJsty+lBjNoorP4Z6XRqaFb/OjQjZODophEcuq68nKm6/0r+6/lLQ+XVpk8g==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/@so-ric/colorspace": {
++      "version": "1.1.6",
++      "resolved": "https://registry.npmjs.org/@so-ric/colorspace/-/colorspace-1.1.6.tgz",
++      "integrity": "sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "color": "^5.0.2",
++        "text-hex": "1.0.x"
++      }
++    },
++    "node_modules/@tootallnate/once": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
++      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 10"
++      }
++    },
++    "node_modules/@types/caseless": {
++      "version": "0.12.5",
++      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz",
++      "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@types/geojson": {
++      "version": "7946.0.16",
++      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
++      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@types/jsonwebtoken": {
++      "version": "9.0.10",
++      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.10.tgz",
++      "integrity": "sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/ms": "*",
++        "@types/node": "*"
++      }
++    },
++    "node_modules/@types/ldapjs": {
++      "version": "2.2.5",
++      "resolved": "https://registry.npmjs.org/@types/ldapjs/-/ldapjs-2.2.5.tgz",
++      "integrity": "sha512-Lv/nD6QDCmcT+V1vaTRnEKE8UgOilVv5pHcQuzkU1LcRe4mbHHuUo/KHi0LKrpdHhQY8FJzryF38fcVdeUIrzg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/node": "*"
++      }
++    },
++    "node_modules/@types/long": {
++      "version": "4.0.2",
++      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
++      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@types/ms": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
++      "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@types/node": {
++      "version": "25.6.0",
++      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz",
++      "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "undici-types": "~7.19.0"
++      }
++    },
++    "node_modules/@types/readable-stream": {
++      "version": "4.0.23",
++      "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.23.tgz",
++      "integrity": "sha512-wwXrtQvbMHxCbBgjHaMGEmImFTQxxpfMOR/ZoQnXxB1woqkUbdLGFDgauo00Py9IudiaqSeiBiulSV9i6XIPig==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/node": "*"
++      }
++    },
++    "node_modules/@types/request": {
++      "version": "2.48.13",
++      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.13.tgz",
++      "integrity": "sha512-FGJ6udDNUCjd19pp0Q3iTiDkwhYup7J8hpMW9c4k53NrccQFFWKRho6hvtPPEhnXWKvukfwAlB6DbDz4yhH5Gg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/caseless": "*",
++        "@types/node": "*",
++        "@types/tough-cookie": "*",
++        "form-data": "^2.5.5"
++      }
++    },
++    "node_modules/@types/request/node_modules/form-data": {
++      "version": "2.5.5",
++      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.5.tgz",
++      "integrity": "sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "asynckit": "^0.4.0",
++        "combined-stream": "^1.0.8",
++        "es-set-tostringtag": "^2.1.0",
++        "hasown": "^2.0.2",
++        "mime-types": "^2.1.35",
++        "safe-buffer": "^5.2.1"
++      },
++      "engines": {
++        "node": ">= 0.12"
++      }
++    },
++    "node_modules/@types/tough-cookie": {
++      "version": "4.0.5",
++      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
++      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@types/triple-beam": {
++      "version": "1.3.5",
++      "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz",
++      "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@types/webidl-conversions": {
++      "version": "7.0.3",
++      "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz",
++      "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/@types/whatwg-url": {
++      "version": "8.2.2",
++      "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz",
++      "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/node": "*",
++        "@types/webidl-conversions": "*"
++      }
++    },
++    "node_modules/@types/ws": {
++      "version": "8.18.1",
++      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
++      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/node": "*"
++      }
++    },
++    "node_modules/@vladfrangu/async_event_emitter": {
++      "version": "2.4.7",
++      "resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.4.7.tgz",
++      "integrity": "sha512-Xfe6rpCTxSxfbswi/W/Pz7zp1WWSNn4A0eW4mLkQUewCrXXtMj31lCg+iQyTkh/CkusZSq9eDflu7tjEDXUY6g==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=v14.0.0",
++        "npm": ">=7.0.0"
++      }
++    },
++    "node_modules/@xmldom/xmldom": {
++      "version": "0.7.13",
++      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz",
++      "integrity": "sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==",
++      "deprecated": "this version has critical issues, please update to the latest version",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=10.0.0"
++      }
++    },
++    "node_modules/@xmpp/base64": {
++      "version": "0.13.2",
++      "resolved": "https://registry.npmjs.org/@xmpp/base64/-/base64-0.13.2.tgz",
++      "integrity": "sha512-RDEq66sW/jqj2HZKoRvnIvlRJMRLEGa0EGyJ0yPCF1+KijmTqrWr1PxZAol850QizXlqpvo8MS8OCFWMryX7RQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "base-64": "^1.0.0"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/client": {
++      "version": "0.13.6",
++      "resolved": "https://registry.npmjs.org/@xmpp/client/-/client-0.13.6.tgz",
++      "integrity": "sha512-e4JTcJQ20HEE1VfO2Wrq/y8ujlNZ8L4jmctX/9uhsZ/46GrNFh8uQJUSRMvaf4LV+T9xV55yu1yGDxjZYjwLsg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@babel/cli": "^7.26.4",
++        "@babel/core": "^7.26.0",
++        "@babel/node": "^7.26.0",
++        "@babel/plugin-transform-react-jsx": "^7.25.9",
++        "@xmpp/client-core": "^0.13.3",
++        "@xmpp/iq": "^0.13.3",
++        "@xmpp/middleware": "^0.13.3",
++        "@xmpp/reconnect": "^0.13.2",
++        "@xmpp/resolve": "^0.13.3",
++        "@xmpp/resource-binding": "^0.13.3",
++        "@xmpp/sasl": "^0.13.6",
++        "@xmpp/sasl-anonymous": "^0.13.2",
++        "@xmpp/sasl-plain": "^0.13.2",
++        "@xmpp/sasl-scram-sha-1": "^0.13.2",
++        "@xmpp/session-establishment": "^0.13.3",
++        "@xmpp/starttls": "^0.13.3",
++        "@xmpp/stream-features": "^0.13.2",
++        "@xmpp/stream-management": "^0.13.3",
++        "@xmpp/tcp": "^0.13.3",
++        "@xmpp/tls": "^0.13.3",
++        "@xmpp/websocket": "^0.13.3",
++        "babel-plugin-jsx-pragmatic": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/client-core": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/client-core/-/client-core-0.13.3.tgz",
++      "integrity": "sha512-pOtCozET4BxJZU7aWykT+PFBGaxT/Sl8mC0E3X6QgL7/2Vo39lz2KIhkcvtSwMC8myuaB+klOBrifuKLo3IajA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/connection": "^0.13.3",
++        "@xmpp/jid": "^0.13.2",
++        "@xmpp/xml": "^0.13.3"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/connection": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/connection/-/connection-0.13.3.tgz",
++      "integrity": "sha512-EM6/wLUJ6MFJl7Kb+qwQut1gLDp7G107KTOB1W/GljGMd7ydD2Bn0BJt2AAx8EGPve9G2jjhV3+jJmu7KwK4rQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/error": "^0.13.2",
++        "@xmpp/events": "^0.13.2",
++        "@xmpp/jid": "^0.13.2",
++        "@xmpp/xml": "^0.13.3"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/connection-tcp": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/connection-tcp/-/connection-tcp-0.13.3.tgz",
++      "integrity": "sha512-6MMUSM265eBtHeLOYIe5UP1ld3oZaQMso6Cq7KJ0Xe7qC6zDy3YYaRHAe3Z+bdoJxpgmfiN8jvDM+QfypcTpKg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/connection": "^0.13.3",
++        "@xmpp/xml": "^0.13.3"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/error": {
++      "version": "0.13.2",
++      "resolved": "https://registry.npmjs.org/@xmpp/error/-/error-0.13.2.tgz",
++      "integrity": "sha512-bjbxwF8s6jfQNI+ZHV9Jwcb7K2kBeTlD60QHjMJlxIUrjTH1ZsJoDQh9tMdq1mBu/h/bm2SX7yZUqUb1wY6gMw==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/events": {
++      "version": "0.13.2",
++      "resolved": "https://registry.npmjs.org/@xmpp/events/-/events-0.13.2.tgz",
++      "integrity": "sha512-fXaAMChvLnP9vEQIatFKWoAm/F9U122hShfRfVw4xS6pympThygWVPIuRuAznMt5tOyTVFWBuPge6hgGousT0g==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "events": "^3.3.0"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/id": {
++      "version": "0.13.2",
++      "resolved": "https://registry.npmjs.org/@xmpp/id/-/id-0.13.2.tgz",
++      "integrity": "sha512-LhSzcaPvjddvL+u/xNAuu6tNtxWR7HZPTyMUck8tyYnbwsXaJQ6sDoS8AEQE8o7iW5E31xJUTOktYd/s6HMo3w==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/iq": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/iq/-/iq-0.13.3.tgz",
++      "integrity": "sha512-sGeyGF4OnYGTZw3PhQaYLYlE8+LRZfYijT/ESGqhY2ed9gm0U4TCR8C8s5oT7Puu6S6smdHehcvYCrcFEeQyBw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/events": "^0.13.2",
++        "@xmpp/id": "^0.13.2",
++        "@xmpp/middleware": "^0.13.3",
++        "@xmpp/xml": "^0.13.3"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/jid": {
++      "version": "0.13.2",
++      "resolved": "https://registry.npmjs.org/@xmpp/jid/-/jid-0.13.2.tgz",
++      "integrity": "sha512-OuYrxiNdlmXgMFPJqnbZSKe/bdn1wxtc1ASEadrizI9h6T1y7tAEl5YpXFWYb+fdAL9vRD+bGCxrDUrm1er/LQ==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/middleware": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/middleware/-/middleware-0.13.3.tgz",
++      "integrity": "sha512-zZTsqLaHnfTqMBDyZh01HLYUgcHLmbalVfC32CsEcjPG5/bIete9sOUVPaiGH1cicMgi3O7WZK512RvQFcBbwA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/error": "^0.13.2",
++        "@xmpp/jid": "^0.13.2",
++        "@xmpp/xml": "^0.13.3",
++        "koa-compose": "^4.1.0"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/reconnect": {
++      "version": "0.13.2",
++      "resolved": "https://registry.npmjs.org/@xmpp/reconnect/-/reconnect-0.13.2.tgz",
++      "integrity": "sha512-FWCC+dzi23N7H99PYPqWZa7oRPNp9G7yYzMZwOpeiVporbNy+op3yUbCszo3YA3XVEsuLRQ1aQJ8evLo+GD5ow==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/events": "^0.13.2"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/resolve": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/resolve/-/resolve-0.13.3.tgz",
++      "integrity": "sha512-HL86p0a2CI0ILFYUR8vPR77ZXwxQ0xXLLRnyb88TjQ/eNbYsc1gmdXjELE0xRCfQblXZsETvUwWv5RofTYAgrQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/events": "^0.13.2",
++        "@xmpp/xml": "^0.13.3",
++        "node-fetch": "^3.3.2"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/resource-binding": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/resource-binding/-/resource-binding-0.13.3.tgz",
++      "integrity": "sha512-cph/8vJ5sRHVg7Njx8rR27xAVmKWACSx95jlOw7LmUSTRSxZDw2wHsqie76HxUD5fPszOsTh/Ph7Fw1532aRUQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/xml": "^0.13.3"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/sasl": {
++      "version": "0.13.6",
++      "resolved": "https://registry.npmjs.org/@xmpp/sasl/-/sasl-0.13.6.tgz",
++      "integrity": "sha512-0WueO7QlHK1F0K7iaC/zW60Y6NIjOccHZlb1WRS1jdHmHqwTLWM8AQTAZMvtxWLDz8oUDiVUKEOJTdIvy9bXow==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/base64": "^0.13.2",
++        "@xmpp/error": "^0.13.2",
++        "@xmpp/xml": "^0.13.3",
++        "saslmechanisms": "^0.1.1"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/sasl-anonymous": {
++      "version": "0.13.2",
++      "resolved": "https://registry.npmjs.org/@xmpp/sasl-anonymous/-/sasl-anonymous-0.13.2.tgz",
++      "integrity": "sha512-0fI9+A+Vptcyv8+o8J2veRnodtnKahJDy5fappIZbmXLrv4JcrVBChQDWULyta0Hez9M3XWoIyuhp4pyz0IU/Q==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "sasl-anonymous": "^0.1.0"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/sasl-plain": {
++      "version": "0.13.2",
++      "resolved": "https://registry.npmjs.org/@xmpp/sasl-plain/-/sasl-plain-0.13.2.tgz",
++      "integrity": "sha512-zwS/q+Vd4YsLdnZjmCuS1JCacWWg2Vd3ecqpBmIV3S394s1Mgiwdnd2bVRen5S0kl/de+VzHg/DRLuYvC94SUg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "sasl-plain": "^0.1.0"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/sasl-scram-sha-1": {
++      "version": "0.13.2",
++      "resolved": "https://registry.npmjs.org/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.13.2.tgz",
++      "integrity": "sha512-qHwooR3m8/BsuG17tK50ZKO97HITG+k6Chjk/pSjRfKG5Fm3mWh2U8K98QWNpJYbgVm9amkIQ0tbTaw+/kMjvQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "sasl-scram-sha-1": "^1.3.0"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/session-establishment": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/session-establishment/-/session-establishment-0.13.3.tgz",
++      "integrity": "sha512-dQhH7aIzsqyMRsjMIuER4UBCxQgvDUHjkmNoeIbUZX5bYJuGeET90tZ4eNAq6yXnpSGJiKoXVfVBxNoiXovfgA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/xml": "^0.13.3"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/starttls": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/starttls/-/starttls-0.13.3.tgz",
++      "integrity": "sha512-FjKrpahL/yBiRlMUL4d88I5N5PxQN2Mirx39Q0kyo479Nj1OY4dTA78Iy5+tsbsBYO3j5aE2tRoLhUQaMPGvBQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/events": "^0.13.2",
++        "@xmpp/tls": "^0.13.3",
++        "@xmpp/xml": "^0.13.3"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/stream-features": {
++      "version": "0.13.2",
++      "resolved": "https://registry.npmjs.org/@xmpp/stream-features/-/stream-features-0.13.2.tgz",
++      "integrity": "sha512-eyxFEEDSfNvG4ybvAYTYkjaUcaytu8sAqT8DfWwrWzCkPgfRzpexsxb9yhe8hAVrvPLavOyr+zh4raUQf4Ogkg==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/stream-management": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/stream-management/-/stream-management-0.13.3.tgz",
++      "integrity": "sha512-hdQAyp6FldEkBktou/mbb7MPOe/EzBxP3sIjWvNQXwRMV8AJxAXyi+DhnW5sigRQoeTJJB0FGTxOlFDeXWGhPg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/xml": "^0.13.3"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/tcp": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/tcp/-/tcp-0.13.3.tgz",
++      "integrity": "sha512-WUjAsPVQAr/DTNJGxXOqXEviFvI5Gzp/18TuCJEssAjyHv1Pr7Qn6PjAersIPidEKqVfapNyHOmgyLePh1kAqQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/connection-tcp": "^0.13.3"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/tls": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/tls/-/tls-0.13.3.tgz",
++      "integrity": "sha512-oeXbkzu2i2LkpvPQ4B3RourYnktoUpkWeUS7jRB4wHvdy6ecEli593R+DYVCWr3Hvj+3l40MkyRQSmZp4S7tVg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/connection": "^0.13.3",
++        "@xmpp/connection-tcp": "^0.13.3"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/websocket": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/websocket/-/websocket-0.13.3.tgz",
++      "integrity": "sha512-RXZJFecaAlotqhAdNohO0SoP8Rx3eJrl18c78gxybAhNaCexFbuMJIvSj91L/b8bOErJtFMTwreWeMfzP6Ijiw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@xmpp/connection": "^0.13.3",
++        "@xmpp/xml": "^0.13.3",
++        "ws": "^8.18.0"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/@xmpp/xml": {
++      "version": "0.13.3",
++      "resolved": "https://registry.npmjs.org/@xmpp/xml/-/xml-0.13.3.tgz",
++      "integrity": "sha512-lYXBg/VlpUeavGgQE8LADfZUzMFUnWFVYgvKUcx97AqjiEJUuo40ijdRcGmkAVtTg0RBkml5WB+Mo+JqynMk7Q==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "ltx": "^3.1.1"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/abab": {
++      "version": "2.0.6",
++      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
++      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
++      "deprecated": "Use your platform's native atob() and btoa() methods instead",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/abbrev": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
++      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/abort-controller": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
++      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
++      "license": "MIT",
++      "dependencies": {
++        "event-target-shim": "^5.0.0"
++      },
++      "engines": {
++        "node": ">=6.5"
++      }
++    },
++    "node_modules/abstract-logging": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz",
++      "integrity": "sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/accepts": {
++      "version": "1.3.8",
++      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
++      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
++      "license": "MIT",
++      "dependencies": {
++        "mime-types": "~2.1.34",
++        "negotiator": "0.6.3"
++      },
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/accepts/node_modules/negotiator": {
++      "version": "0.6.3",
++      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
++      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/acebase": {
++      "version": "1.29.10",
++      "resolved": "https://registry.npmjs.org/acebase/-/acebase-1.29.10.tgz",
++      "integrity": "sha512-IiwxMtuGq5xkRxIgsnvlUzFTr50F81DCILW8/rqIiP2I9Wj4YW4bJ3O4dSNeUyh+kpWJkYuFBGl6EOwij/rNUw==",
++      "funding": [
++        {
++          "type": "GitHub sponsoring",
++          "url": "https://github.com/sponsors/appy-one"
++        },
++        {
++          "type": "Buy me coffee",
++          "url": "https://www.buymeacoffee.com/appyone"
++        },
++        {
++          "type": "PayPal",
++          "url": "https://paypal.me/theappyone"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "acebase-core": "^1.28.1",
++        "unidecode": "^0.1.8"
++      }
++    },
++    "node_modules/acebase-core": {
++      "version": "1.28.1",
++      "resolved": "https://registry.npmjs.org/acebase-core/-/acebase-core-1.28.1.tgz",
++      "integrity": "sha512-WfYdG3aeZag+p+wXgKpVNfu9FubuZenW5VDPtUP/qIlac1io+AWuctI5JNuG/plNkpNaTJjujoeTE9z6+Y3HnQ==",
++      "license": "MIT",
++      "optional": true,
++      "optionalDependencies": {
++        "rxjs": ">= 5.x <= 7.x"
++      }
++    },
++    "node_modules/acme-client": {
++      "version": "4.2.5",
++      "resolved": "https://registry.npmjs.org/acme-client/-/acme-client-4.2.5.tgz",
++      "integrity": "sha512-dtnck4sdZ2owFLTC73Ewjx0kmvsRjTRgaOc8UztCNODT+lr1DXj0tiuUXjeY4LAzZryXCtCib/E+KD8NYeP1aw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "axios": "0.26.1",
++        "backo2": "^1.0.0",
++        "bluebird": "^3.5.0",
++        "debug": "^4.1.1",
++        "node-forge": "^1.3.0"
++      },
++      "engines": {
++        "node": ">= 10"
++      }
++    },
++    "node_modules/acme-client/node_modules/axios": {
++      "version": "0.26.1",
++      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
++      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "follow-redirects": "^1.14.8"
++      }
++    },
++    "node_modules/acme-client/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/acme-client/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/acorn": {
++      "version": "8.16.0",
++      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
++      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "acorn": "bin/acorn"
++      },
++      "engines": {
++        "node": ">=0.4.0"
++      }
++    },
++    "node_modules/aedes": {
++      "version": "0.51.3",
++      "resolved": "https://registry.npmjs.org/aedes/-/aedes-0.51.3.tgz",
++      "integrity": "sha512-aQfiI9w3RbqnowNCdcGMmCtxBFXN9bhJFcuZm24U5/NU06V3MCl42jWK2GUnu8rOypR2Ahi/aEcgq3w7CMcycg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "aedes-packet": "^3.0.0",
++        "aedes-persistence": "^9.1.2",
++        "end-of-stream": "^1.4.4",
++        "fastfall": "^1.5.1",
++        "fastparallel": "^2.4.1",
++        "fastseries": "^2.0.0",
++        "hyperid": "^3.2.0",
++        "mqemitter": "^6.0.0",
++        "mqtt-packet": "^9.0.0",
++        "retimer": "^4.0.0",
++        "reusify": "^1.0.4",
++        "uuid": "^10.0.0"
++      },
++      "engines": {
++        "node": ">=16"
++      },
++      "funding": {
++        "type": "opencollective",
++        "url": "https://opencollective.com/aedes"
++      }
++    },
++    "node_modules/aedes-packet": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/aedes-packet/-/aedes-packet-3.0.0.tgz",
++      "integrity": "sha512-swASey0BxGs4/npZGWoiVDmnEyPvVFIRY6l2LVKL4rbiW8IhcIGDLfnb20Qo8U20itXlitAKPQ3MVTEbOGG5ZA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "mqtt-packet": "^7.0.0"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/aedes-packet/node_modules/bl": {
++      "version": "4.1.0",
++      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
++      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "buffer": "^5.5.0",
++        "inherits": "^2.0.4",
++        "readable-stream": "^3.4.0"
++      }
++    },
++    "node_modules/aedes-packet/node_modules/buffer": {
++      "version": "5.7.1",
++      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
++      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/feross"
++        },
++        {
++          "type": "patreon",
++          "url": "https://www.patreon.com/feross"
++        },
++        {
++          "type": "consulting",
++          "url": "https://feross.org/support"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "base64-js": "^1.3.1",
++        "ieee754": "^1.1.13"
++      }
++    },
++    "node_modules/aedes-packet/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/aedes-packet/node_modules/mqtt-packet": {
++      "version": "7.1.2",
++      "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-7.1.2.tgz",
++      "integrity": "sha512-FFZbcZ2omsf4c5TxEQfcX9hI+JzDpDKPT46OmeIBpVA7+t32ey25UNqlqNXTmeZOr5BLsSIERpQQLsFWJS94SQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "bl": "^4.0.2",
++        "debug": "^4.1.1",
++        "process-nextick-args": "^2.0.1"
++      }
++    },
++    "node_modules/aedes-packet/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/aedes-packet/node_modules/readable-stream": {
++      "version": "3.6.2",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
++      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "inherits": "^2.0.3",
++        "string_decoder": "^1.1.1",
++        "util-deprecate": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/aedes-persistence": {
++      "version": "9.1.2",
++      "resolved": "https://registry.npmjs.org/aedes-persistence/-/aedes-persistence-9.1.2.tgz",
++      "integrity": "sha512-2Wlr5pwIK0eQOkiTwb8ZF6C20s8UPUlnsJ4kXYePZ3JlQl0NbBA176mzM8wY294BJ5wybpNc9P5XEQxqadRNcQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "aedes-packet": "^3.0.0",
++        "qlobber": "^7.0.0"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/aes-js": {
++      "version": "3.1.2",
++      "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.1.2.tgz",
++      "integrity": "sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/agent-base": {
++      "version": "7.1.4",
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
++      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/agentkeepalive": {
++      "version": "4.6.0",
++      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz",
++      "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "humanize-ms": "^1.2.1"
++      },
++      "engines": {
++        "node": ">= 8.0.0"
++      }
++    },
++    "node_modules/aggregate-error": {
++      "version": "3.1.0",
++      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
++      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "clean-stack": "^2.0.0",
++        "indent-string": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/ajv": {
++      "version": "6.15.0",
++      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz",
++      "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "fast-deep-equal": "^3.1.1",
++        "fast-json-stable-stringify": "^2.0.0",
++        "json-schema-traverse": "^0.4.1",
++        "uri-js": "^4.2.2"
++      },
++      "funding": {
++        "type": "github",
++        "url": "https://github.com/sponsors/epoberezkin"
++      }
++    },
++    "node_modules/ansi-escapes": {
++      "version": "1.4.0",
++      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
++      "integrity": "sha512-wiXutNjDUlNEDWHcYH3jtZUhd3c4/VojassD8zHdHCY13xbZy2XbW+NKQwA0tWGBVzDA9qEzYwfoSsWmviidhw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/ansi-regex": {
++      "version": "6.2.2",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
++      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=12"
++      },
++      "funding": {
++        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
++      }
++    },
++    "node_modules/ansi-styles": {
++      "version": "6.2.3",
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
++      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=12"
++      },
++      "funding": {
++        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
++      }
++    },
++    "node_modules/anymatch": {
++      "version": "3.1.3",
++      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
++      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "normalize-path": "^3.0.0",
++        "picomatch": "^2.0.4"
++      },
++      "engines": {
++        "node": ">= 8"
++      }
++    },
++    "node_modules/append-transform": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
++      "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "default-require-extensions": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/aproba": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz",
++      "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/archiver": {
++      "version": "7.0.1",
++      "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz",
++      "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==",
++      "license": "MIT",
++      "dependencies": {
++        "archiver-utils": "^5.0.2",
++        "async": "^3.2.4",
++        "buffer-crc32": "^1.0.0",
++        "readable-stream": "^4.0.0",
++        "readdir-glob": "^1.1.2",
++        "tar-stream": "^3.0.0",
++        "zip-stream": "^6.0.1"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/archiver-utils": {
++      "version": "5.0.2",
++      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz",
++      "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==",
++      "license": "MIT",
++      "dependencies": {
++        "glob": "^10.0.0",
++        "graceful-fs": "^4.2.0",
++        "is-stream": "^2.0.1",
++        "lazystream": "^1.0.0",
++        "lodash": "^4.17.15",
++        "normalize-path": "^3.0.0",
++        "readable-stream": "^4.0.0"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/archiver-zip-encrypted": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/archiver-zip-encrypted/-/archiver-zip-encrypted-2.0.0.tgz",
++      "integrity": "sha512-QJPkMPb3fHwUnXpZlzbwvvzgzr4bKK84Kc+O8+oRtsEzLqK+iwJXygJ+mHouE0LWEtR0BNs6Oys/48hyRB5xOw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "aes-js": "^3.1.2",
++        "archiver": "^7.0.0",
++        "archiver-utils": "^5.0.1",
++        "buffer-crc32": "^1.0.0",
++        "compress-commons": "^6.0.0",
++        "crc32-stream": "^6.0.0",
++        "zip-stream": "^6.0.0"
++      },
++      "engines": {
++        "node": ">=16"
++      }
++    },
++    "node_modules/archy": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
++      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/are-we-there-yet": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
++      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
++      "deprecated": "This package is no longer supported.",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "delegates": "^1.0.0",
++        "readable-stream": "^3.6.0"
++      },
++      "engines": {
++        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
++      }
++    },
++    "node_modules/are-we-there-yet/node_modules/readable-stream": {
++      "version": "3.6.2",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
++      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "inherits": "^2.0.3",
++        "string_decoder": "^1.1.1",
++        "util-deprecate": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/argparse": {
++      "version": "1.0.10",
++      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
++      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "sprintf-js": "~1.0.2"
++      }
++    },
++    "node_modules/argparse/node_modules/sprintf-js": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
++      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/array-buffer-byte-length": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
++      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3",
++        "is-array-buffer": "^3.0.5"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/array-flatten": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
++      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
++      "license": "MIT"
++    },
++    "node_modules/array.prototype.reduce": {
++      "version": "1.0.8",
++      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.8.tgz",
++      "integrity": "sha512-DwuEqgXFBwbmZSRqt3BpQigWNUoqw9Ml2dTWdF3B2zQlQX4OeUE0zyuzX0fX0IbTvjdkZbcBTU3idgpO78qkTw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bind": "^1.0.8",
++        "call-bound": "^1.0.4",
++        "define-properties": "^1.2.1",
++        "es-abstract": "^1.23.9",
++        "es-array-method-boxes-properly": "^1.0.0",
++        "es-errors": "^1.3.0",
++        "es-object-atoms": "^1.1.1",
++        "is-string": "^1.1.1"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/arraybuffer.prototype.slice": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
++      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "array-buffer-byte-length": "^1.0.1",
++        "call-bind": "^1.0.8",
++        "define-properties": "^1.2.1",
++        "es-abstract": "^1.23.5",
++        "es-errors": "^1.3.0",
++        "get-intrinsic": "^1.2.6",
++        "is-array-buffer": "^3.0.4"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/arrify": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
++      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/asn1": {
++      "version": "0.2.6",
++      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
++      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "safer-buffer": "~2.1.0"
++      }
++    },
++    "node_modules/asn1.js": {
++      "version": "5.4.1",
++      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
++      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "bn.js": "^4.0.0",
++        "inherits": "^2.0.1",
++        "minimalistic-assert": "^1.0.0",
++        "safer-buffer": "^2.1.0"
++      }
++    },
++    "node_modules/assert-plus": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
++      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.8"
++      }
++    },
++    "node_modules/async": {
++      "version": "3.2.6",
++      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
++      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
++      "license": "MIT"
++    },
++    "node_modules/async-function": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
++      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/async-mutex": {
++      "version": "0.3.2",
++      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.2.tgz",
++      "integrity": "sha512-HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.3.1"
++      }
++    },
++    "node_modules/async-retry": {
++      "version": "1.3.3",
++      "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz",
++      "integrity": "sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "retry": "0.13.1"
++      }
++    },
++    "node_modules/asynckit": {
++      "version": "0.4.0",
++      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
++      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/available-typed-arrays": {
++      "version": "1.0.7",
++      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
++      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
++      "license": "MIT",
++      "dependencies": {
++        "possible-typed-array-names": "^1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/aws-sign": {
++      "version": "0.3.0",
++      "resolved": "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz",
++      "integrity": "sha512-pEMJAknifcXqXqYVXzGPIu8mJvxtJxIdpVpAs8HNS+paT+9srRUDMQn+3hULS7WbLmttcmvgMvnDcFujqXJyPw==",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/aws-sign2": {
++      "version": "0.7.0",
++      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
++      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/aws-ssl-profiles": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz",
++      "integrity": "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 6.0.0"
++      }
++    },
++    "node_modules/aws4": {
++      "version": "1.13.2",
++      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
++      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/axios": {
++      "version": "1.15.2",
++      "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz",
++      "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "follow-redirects": "^1.15.11",
++        "form-data": "^4.0.5",
++        "proxy-from-env": "^2.1.0"
++      }
++    },
++    "node_modules/b4a": {
++      "version": "1.8.0",
++      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz",
++      "integrity": "sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==",
++      "license": "Apache-2.0",
++      "peerDependencies": {
++        "react-native-b4a": "*"
++      },
++      "peerDependenciesMeta": {
++        "react-native-b4a": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/babel-plugin-jsx-pragmatic": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/babel-plugin-jsx-pragmatic/-/babel-plugin-jsx-pragmatic-1.0.2.tgz",
++      "integrity": "sha512-+qeGXSbHZwinZzO6R3wP+6XDKup83Pgg2B3TQt2zwfDdgC7NqT9Kd3ws7iqk53zAO/8iOIRU6VUyUzt2LDE3Eg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "babel-plugin-syntax-jsx": "^6.0.0"
++      }
++    },
++    "node_modules/babel-plugin-syntax-jsx": {
++      "version": "6.18.0",
++      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
++      "integrity": "sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/babel-runtime": {
++      "version": "6.26.0",
++      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
++      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "core-js": "^2.4.0",
++        "regenerator-runtime": "^0.11.0"
++      }
++    },
++    "node_modules/babel-runtime/node_modules/core-js": {
++      "version": "2.6.12",
++      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
++      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
++      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
++      "hasInstallScript": true,
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
++      "version": "0.11.1",
++      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
++      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/backo2": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
++      "integrity": "sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/backoff": {
++      "version": "2.5.0",
++      "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz",
++      "integrity": "sha512-wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "precond": "0.2"
++      },
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/balanced-match": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
++      "license": "MIT"
++    },
++    "node_modules/bare-events": {
++      "version": "2.8.2",
++      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
++      "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
++      "license": "Apache-2.0",
++      "peerDependencies": {
++        "bare-abort-controller": "*"
++      },
++      "peerDependenciesMeta": {
++        "bare-abort-controller": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/bare-fs": {
++      "version": "4.5.5",
++      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.5.5.tgz",
++      "integrity": "sha512-XvwYM6VZqKoqDll8BmSww5luA5eflDzY0uEFfBJtFKe4PAAtxBjU3YIxzIBzhyaEQBy1VXEQBto4cpN5RZJw+w==",
++      "license": "Apache-2.0",
++      "dependencies": {
++        "bare-events": "^2.5.4",
++        "bare-path": "^3.0.0",
++        "bare-stream": "^2.6.4",
++        "bare-url": "^2.2.2",
++        "fast-fifo": "^1.3.2"
++      },
++      "engines": {
++        "bare": ">=1.16.0"
++      },
++      "peerDependencies": {
++        "bare-buffer": "*"
++      },
++      "peerDependenciesMeta": {
++        "bare-buffer": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/bare-os": {
++      "version": "3.7.1",
++      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.7.1.tgz",
++      "integrity": "sha512-ebvMaS5BgZKmJlvuWh14dg9rbUI84QeV3WlWn6Ph6lFI8jJoh7ADtVTyD2c93euwbe+zgi0DVrl4YmqXeM9aIA==",
++      "license": "Apache-2.0",
++      "engines": {
++        "bare": ">=1.14.0"
++      }
++    },
++    "node_modules/bare-path": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
++      "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
++      "license": "Apache-2.0",
++      "dependencies": {
++        "bare-os": "^3.0.1"
++      }
++    },
++    "node_modules/bare-stream": {
++      "version": "2.8.0",
++      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.8.0.tgz",
++      "integrity": "sha512-reUN0M2sHRqCdG4lUK3Fw8w98eeUIZHL5c3H7Mbhk2yVBL+oofgaIp0ieLfD5QXwPCypBpmEEKU2WZKzbAk8GA==",
++      "license": "Apache-2.0",
++      "dependencies": {
++        "streamx": "^2.21.0",
++        "teex": "^1.0.1"
++      },
++      "peerDependencies": {
++        "bare-buffer": "*",
++        "bare-events": "*"
++      },
++      "peerDependenciesMeta": {
++        "bare-buffer": {
++          "optional": true
++        },
++        "bare-events": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/bare-url": {
++      "version": "2.3.2",
++      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.3.2.tgz",
++      "integrity": "sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==",
++      "license": "Apache-2.0",
++      "dependencies": {
++        "bare-path": "^3.0.0"
++      }
++    },
++    "node_modules/base-64": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
++      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/base64-js": {
++      "version": "1.5.1",
++      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
++      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/feross"
++        },
++        {
++          "type": "patreon",
++          "url": "https://www.patreon.com/feross"
++        },
++        {
++          "type": "consulting",
++          "url": "https://feross.org/support"
++        }
++      ],
++      "license": "MIT"
++    },
++    "node_modules/base64url": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
++      "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6.0.0"
++      }
++    },
++    "node_modules/baseline-browser-mapping": {
++      "version": "2.10.21",
++      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.21.tgz",
++      "integrity": "sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "bin": {
++        "baseline-browser-mapping": "dist/cli.cjs"
++      },
++      "engines": {
++        "node": ">=6.0.0"
++      }
++    },
++    "node_modules/bcrypt-pbkdf": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
++      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "tweetnacl": "^0.14.3"
++      }
++    },
++    "node_modules/bcryptjs": {
++      "version": "2.4.3",
++      "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
++      "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/big-integer": {
++      "version": "1.6.52",
++      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
++      "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==",
++      "license": "Unlicense",
++      "optional": true,
++      "engines": {
++        "node": ">=0.6"
++      }
++    },
++    "node_modules/bignumber.js": {
++      "version": "9.3.1",
++      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz",
++      "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==",
++      "license": "MIT",
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/binary-extensions": {
++      "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
++      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=8"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/binary-search": {
++      "version": "1.3.6",
++      "resolved": "https://registry.npmjs.org/binary-search/-/binary-search-1.3.6.tgz",
++      "integrity": "sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==",
++      "license": "CC0-1.0",
++      "optional": true
++    },
++    "node_modules/bindings": {
++      "version": "1.5.0",
++      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
++      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "file-uri-to-path": "1.0.0"
++      }
++    },
++    "node_modules/bintrees": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz",
++      "integrity": "sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/bl": {
++      "version": "6.1.6",
++      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.6.tgz",
++      "integrity": "sha512-jLsPgN/YSvPUg9UX0Kd73CXpm2Psg9FxMeCSXnk3WBO3CMT10JMwijubhGfHCnFu6TPn1ei3b975dxv7K2pWVg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/readable-stream": "^4.0.0",
++        "buffer": "^6.0.3",
++        "inherits": "^2.0.4",
++        "readable-stream": "^4.2.0"
++      }
++    },
++    "node_modules/block-stream2": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/block-stream2/-/block-stream2-2.1.0.tgz",
++      "integrity": "sha512-suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "readable-stream": "^3.4.0"
++      }
++    },
++    "node_modules/block-stream2/node_modules/readable-stream": {
++      "version": "3.6.2",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
++      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "inherits": "^2.0.3",
++        "string_decoder": "^1.1.1",
++        "util-deprecate": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/bluebird": {
++      "version": "3.7.2",
++      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
++      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/bn.js": {
++      "version": "4.12.3",
++      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz",
++      "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/body-parser": {
++      "version": "1.20.4",
++      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz",
++      "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==",
++      "license": "MIT",
++      "dependencies": {
++        "bytes": "~3.1.2",
++        "content-type": "~1.0.5",
++        "debug": "2.6.9",
++        "depd": "2.0.0",
++        "destroy": "~1.2.0",
++        "http-errors": "~2.0.1",
++        "iconv-lite": "~0.4.24",
++        "on-finished": "~2.4.1",
++        "qs": "~6.14.0",
++        "raw-body": "~2.5.3",
++        "type-is": "~1.6.18",
++        "unpipe": "~1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.8",
++        "npm": "1.2.8000 || >= 1.4.16"
++      }
++    },
++    "node_modules/boom": {
++      "version": "0.4.2",
++      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
++      "integrity": "sha512-OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g==",
++      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
++      "optional": true,
++      "dependencies": {
++        "hoek": "0.9.x"
++      },
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
++    "node_modules/bowser": {
++      "version": "2.14.1",
++      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.14.1.tgz",
++      "integrity": "sha512-tzPjzCxygAKWFOJP011oxFHs57HzIhOEracIgAePE4pqB3LikALKnSzUyU4MGs9/iCEUuHlAJTjTc5M+u7YEGg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/brace-expansion": {
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
++      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
++      "license": "MIT",
++      "dependencies": {
++        "balanced-match": "^1.0.0"
++      }
++    },
++    "node_modules/braces": {
++      "version": "3.0.3",
++      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
++      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "fill-range": "^7.1.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/browser-or-node": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-2.1.1.tgz",
++      "integrity": "sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/browserslist": {
++      "version": "4.28.2",
++      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
++      "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
++      "funding": [
++        {
++          "type": "opencollective",
++          "url": "https://opencollective.com/browserslist"
++        },
++        {
++          "type": "tidelift",
++          "url": "https://tidelift.com/funding/github/npm/browserslist"
++        },
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/ai"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "baseline-browser-mapping": "^2.10.12",
++        "caniuse-lite": "^1.0.30001782",
++        "electron-to-chromium": "^1.5.328",
++        "node-releases": "^2.0.36",
++        "update-browserslist-db": "^1.2.3"
++      },
++      "bin": {
++        "browserslist": "cli.js"
++      },
++      "engines": {
++        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
++      }
++    },
++    "node_modules/bson": {
++      "version": "4.7.2",
++      "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz",
++      "integrity": "sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "buffer": "^5.6.0"
++      },
++      "engines": {
++        "node": ">=6.9.0"
++      }
++    },
++    "node_modules/bson/node_modules/buffer": {
++      "version": "5.7.1",
++      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
++      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/feross"
++        },
++        {
++          "type": "patreon",
++          "url": "https://www.patreon.com/feross"
++        },
++        {
++          "type": "consulting",
++          "url": "https://feross.org/support"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "base64-js": "^1.3.1",
++        "ieee754": "^1.1.13"
++      }
++    },
++    "node_modules/buffer": {
++      "version": "6.0.3",
++      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
++      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/feross"
++        },
++        {
++          "type": "patreon",
++          "url": "https://www.patreon.com/feross"
++        },
++        {
++          "type": "consulting",
++          "url": "https://feross.org/support"
++        }
++      ],
++      "license": "MIT",
++      "dependencies": {
++        "base64-js": "^1.3.1",
++        "ieee754": "^1.2.1"
++      }
++    },
++    "node_modules/buffer-crc32": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
++      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=8.0.0"
++      }
++    },
++    "node_modules/buffer-equal-constant-time": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
++      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/buffer-from": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
++      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/bufferutil": {
++      "version": "4.1.0",
++      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.1.0.tgz",
++      "integrity": "sha512-ZMANVnAixE6AWWnPzlW2KpUrxhm9woycYvPOo67jWHyFowASTEd9s+QN1EIMsSDtwhIxN4sWE1jotpuDUIgyIw==",
++      "hasInstallScript": true,
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "node-gyp-build": "^4.3.0"
++      },
++      "engines": {
++        "node": ">=6.14.2"
++      }
++    },
++    "node_modules/build-url": {
++      "version": "1.3.3",
++      "resolved": "https://registry.npmjs.org/build-url/-/build-url-1.3.3.tgz",
++      "integrity": "sha512-uSC8d+d4SlbXTu/9nBhwEKi33CE0KQgCvfy8QwyrrO5vCuXr9hN021ZBh8ip5vxPbMOrZiPwgqcupuhezxiP3g==",
++      "deprecated": "This package is no longer maintained",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/buildcheck": {
++      "version": "0.0.7",
++      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.7.tgz",
++      "integrity": "sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==",
++      "optional": true,
++      "engines": {
++        "node": ">=10.0.0"
++      }
++    },
++    "node_modules/byte-length": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/byte-length/-/byte-length-1.0.2.tgz",
++      "integrity": "sha512-ovBpjmsgd/teRmgcPh23d4gJvxDoXtAzEL9xTfMU8Yc2kqCDb7L9jAG0XHl1nzuGl+h3ebCIF1i62UFyA9V/2Q==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/bytes": {
++      "version": "3.1.2",
++      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
++      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/cacache": {
++      "version": "15.3.0",
++      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
++      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "@npmcli/fs": "^1.0.0",
++        "@npmcli/move-file": "^1.0.1",
++        "chownr": "^2.0.0",
++        "fs-minipass": "^2.0.0",
++        "glob": "^7.1.4",
++        "infer-owner": "^1.0.4",
++        "lru-cache": "^6.0.0",
++        "minipass": "^3.1.1",
++        "minipass-collect": "^1.0.2",
++        "minipass-flush": "^1.0.5",
++        "minipass-pipeline": "^1.2.2",
++        "mkdirp": "^1.0.3",
++        "p-map": "^4.0.0",
++        "promise-inflight": "^1.0.1",
++        "rimraf": "^3.0.2",
++        "ssri": "^8.0.1",
++        "tar": "^6.0.2",
++        "unique-filename": "^1.1.1"
++      },
++      "engines": {
++        "node": ">= 10"
++      }
++    },
++    "node_modules/cacache/node_modules/brace-expansion": {
++      "version": "1.1.14",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "balanced-match": "^1.0.0",
++        "concat-map": "0.0.1"
++      }
++    },
++    "node_modules/cacache/node_modules/glob": {
++      "version": "7.2.3",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "fs.realpath": "^1.0.0",
++        "inflight": "^1.0.4",
++        "inherits": "2",
++        "minimatch": "^3.1.1",
++        "once": "^1.3.0",
++        "path-is-absolute": "^1.0.0"
++      },
++      "engines": {
++        "node": "*"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/cacache/node_modules/lru-cache": {
++      "version": "6.0.0",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
++      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/cacache/node_modules/minimatch": {
++      "version": "3.1.5",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "brace-expansion": "^1.1.7"
++      },
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/cacache/node_modules/minipass": {
++      "version": "3.3.6",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/cacache/node_modules/mkdirp": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
++      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "mkdirp": "bin/cmd.js"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/cacache/node_modules/rimraf": {
++      "version": "3.0.2",
++      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
++      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
++      "deprecated": "Rimraf versions prior to v4 are no longer supported",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "glob": "^7.1.3"
++      },
++      "bin": {
++        "rimraf": "bin.js"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/caching-transform": {
++      "version": "3.0.2",
++      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.2.tgz",
++      "integrity": "sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "hasha": "^3.0.0",
++        "make-dir": "^2.0.0",
++        "package-hash": "^3.0.0",
++        "write-file-atomic": "^2.4.2"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/call-bind": {
++      "version": "1.0.9",
++      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.9.tgz",
++      "integrity": "sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==",
++      "license": "MIT",
++      "dependencies": {
++        "call-bind-apply-helpers": "^1.0.2",
++        "es-define-property": "^1.0.1",
++        "get-intrinsic": "^1.3.0",
++        "set-function-length": "^1.2.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/call-bind-apply-helpers": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
++      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
++      "license": "MIT",
++      "dependencies": {
++        "es-errors": "^1.3.0",
++        "function-bind": "^1.1.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/call-bound": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
++      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
++      "license": "MIT",
++      "dependencies": {
++        "call-bind-apply-helpers": "^1.0.2",
++        "get-intrinsic": "^1.3.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/camel-case": {
++      "version": "4.1.2",
++      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
++      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "pascal-case": "^3.1.2",
++        "tslib": "^2.0.3"
++      }
++    },
++    "node_modules/camelcase": {
++      "version": "5.3.1",
++      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
++      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/caniuse-lite": {
++      "version": "1.0.30001790",
++      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz",
++      "integrity": "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==",
++      "funding": [
++        {
++          "type": "opencollective",
++          "url": "https://opencollective.com/browserslist"
++        },
++        {
++          "type": "tidelift",
++          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
++        },
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/ai"
++        }
++      ],
++      "license": "CC-BY-4.0",
++      "optional": true
++    },
++    "node_modules/caseless": {
++      "version": "0.12.0",
++      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
++      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
++      "license": "Apache-2.0",
++      "optional": true
++    },
++    "node_modules/cbor": {
++      "version": "5.2.0",
++      "resolved": "https://registry.npmjs.org/cbor/-/cbor-5.2.0.tgz",
++      "integrity": "sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A==",
++      "license": "MIT",
++      "dependencies": {
++        "bignumber.js": "^9.0.1",
++        "nofilter": "^1.0.4"
++      },
++      "engines": {
++        "node": ">=6.0.0"
++      }
++    },
++    "node_modules/chalk": {
++      "version": "1.1.3",
++      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
++      "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-styles": "^2.2.1",
++        "escape-string-regexp": "^1.0.2",
++        "has-ansi": "^2.0.0",
++        "strip-ansi": "^3.0.0",
++        "supports-color": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/chalk/node_modules/ansi-regex": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
++      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/chalk/node_modules/ansi-styles": {
++      "version": "2.2.1",
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
++      "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/chalk/node_modules/strip-ansi": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
++      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-regex": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/charenc": {
++      "version": "0.0.2",
++      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
++      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/chokidar": {
++      "version": "3.6.0",
++      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
++      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "anymatch": "~3.1.2",
++        "braces": "~3.0.2",
++        "glob-parent": "~5.1.2",
++        "is-binary-path": "~2.1.0",
++        "is-glob": "~4.0.1",
++        "normalize-path": "~3.0.0",
++        "readdirp": "~3.6.0"
++      },
++      "engines": {
++        "node": ">= 8.10.0"
++      },
++      "funding": {
++        "url": "https://paulmillr.com/funding/"
++      },
++      "optionalDependencies": {
++        "fsevents": "~2.3.2"
++      }
++    },
++    "node_modules/chownr": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
++      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/clean-css": {
++      "version": "5.3.3",
++      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
++      "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "source-map": "~0.6.0"
++      },
++      "engines": {
++        "node": ">= 10.0"
++      }
++    },
++    "node_modules/clean-stack": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
++      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/cli-cursor": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
++      "integrity": "sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "restore-cursor": "^1.0.1"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/cli-width": {
++      "version": "2.2.1",
++      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
++      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/cliui": {
++      "version": "8.0.1",
++      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
++      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "string-width": "^4.2.0",
++        "strip-ansi": "^6.0.1",
++        "wrap-ansi": "^7.0.0"
++      },
++      "engines": {
++        "node": ">=12"
++      }
++    },
++    "node_modules/cliui/node_modules/ansi-regex": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
++      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/cliui/node_modules/ansi-styles": {
++      "version": "4.3.0",
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
++      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "color-convert": "^2.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      },
++      "funding": {
++        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
++      }
++    },
++    "node_modules/cliui/node_modules/emoji-regex": {
++      "version": "8.0.0",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
++      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/cliui/node_modules/string-width": {
++      "version": "4.2.3",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
++      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "emoji-regex": "^8.0.0",
++        "is-fullwidth-code-point": "^3.0.0",
++        "strip-ansi": "^6.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/cliui/node_modules/strip-ansi": {
++      "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
++      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-regex": "^5.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/cliui/node_modules/wrap-ansi": {
++      "version": "7.0.0",
++      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
++      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-styles": "^4.0.0",
++        "string-width": "^4.1.0",
++        "strip-ansi": "^6.0.0"
++      },
++      "engines": {
++        "node": ">=10"
++      },
++      "funding": {
++        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
++      }
++    },
++    "node_modules/clone-deep": {
++      "version": "4.0.1",
++      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
++      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "is-plain-object": "^2.0.4",
++        "kind-of": "^6.0.2",
++        "shallow-clone": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/code-point-at": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
++      "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/color": {
++      "version": "5.0.3",
++      "resolved": "https://registry.npmjs.org/color/-/color-5.0.3.tgz",
++      "integrity": "sha512-ezmVcLR3xAVp8kYOm4GS45ZLLgIE6SPAFoduLr6hTDajwb3KZ2F46gulK3XpcwRFb5KKGCSezCBAY4Dw4HsyXA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "color-convert": "^3.1.3",
++        "color-string": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=18"
++      }
++    },
++    "node_modules/color-convert": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
++      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
++      "license": "MIT",
++      "dependencies": {
++        "color-name": "~1.1.4"
++      },
++      "engines": {
++        "node": ">=7.0.0"
++      }
++    },
++    "node_modules/color-name": {
++      "version": "1.1.4",
++      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
++      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
++      "license": "MIT"
++    },
++    "node_modules/color-string": {
++      "version": "2.1.4",
++      "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.4.tgz",
++      "integrity": "sha512-Bb6Cq8oq0IjDOe8wJmi4JeNn763Xs9cfrBcaylK1tPypWzyoy2G3l90v9k64kjphl/ZJjPIShFztenRomi8WTg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "color-name": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=18"
++      }
++    },
++    "node_modules/color-string/node_modules/color-name": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.1.0.tgz",
++      "integrity": "sha512-1bPaDNFm0axzE4MEAzKPuqKWeRaT43U/hyxKPBdqTfmPF+d6n7FSoTFxLVULUJOmiLp01KjhIPPH+HrXZJN4Rg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=12.20"
++      }
++    },
++    "node_modules/color-support": {
++      "version": "1.1.3",
++      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
++      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
++      "license": "ISC",
++      "optional": true,
++      "bin": {
++        "color-support": "bin.js"
++      }
++    },
++    "node_modules/color/node_modules/color-convert": {
++      "version": "3.1.3",
++      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.3.tgz",
++      "integrity": "sha512-fasDH2ont2GqF5HpyO4w0+BcewlhHEZOFn9c1ckZdHpJ56Qb7MHhH/IcJZbBGgvdtwdwNbLvxiBEdg336iA9Sg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "color-name": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=14.6"
++      }
++    },
++    "node_modules/color/node_modules/color-name": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.1.0.tgz",
++      "integrity": "sha512-1bPaDNFm0axzE4MEAzKPuqKWeRaT43U/hyxKPBdqTfmPF+d6n7FSoTFxLVULUJOmiLp01KjhIPPH+HrXZJN4Rg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=12.20"
++      }
++    },
++    "node_modules/combined-stream": {
++      "version": "1.0.8",
++      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
++      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "delayed-stream": "~1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/commander": {
++      "version": "6.2.1",
++      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
++      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/commondir": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
++      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/compress-commons": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz",
++      "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==",
++      "license": "MIT",
++      "dependencies": {
++        "crc-32": "^1.2.0",
++        "crc32-stream": "^6.0.0",
++        "is-stream": "^2.0.1",
++        "normalize-path": "^3.0.0",
++        "readable-stream": "^4.0.0"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/compressible": {
++      "version": "2.0.18",
++      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
++      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
++      "license": "MIT",
++      "dependencies": {
++        "mime-db": ">= 1.43.0 < 2"
++      },
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/compression": {
++      "version": "1.8.1",
++      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
++      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
++      "license": "MIT",
++      "dependencies": {
++        "bytes": "3.1.2",
++        "compressible": "~2.0.18",
++        "debug": "2.6.9",
++        "negotiator": "~0.6.4",
++        "on-headers": "~1.1.0",
++        "safe-buffer": "5.2.1",
++        "vary": "~1.1.2"
++      },
++      "engines": {
++        "node": ">= 0.8.0"
++      }
++    },
++    "node_modules/concat-map": {
++      "version": "0.0.1",
++      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
++      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/connect-flash": {
++      "version": "0.1.1",
++      "resolved": "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz",
++      "integrity": "sha512-2rcfELQt/ZMP+SM/pG8PyhJRaLKp+6Hk2IUBNkEit09X+vwn3QsAL3ZbYtxUn7NVPzbMTSLRDhqe0B/eh30RYA==",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4.0"
++      }
++    },
++    "node_modules/console-control-strings": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
++      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/content-disposition": {
++      "version": "0.5.4",
++      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
++      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
++      "license": "MIT",
++      "dependencies": {
++        "safe-buffer": "5.2.1"
++      },
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/content-type": {
++      "version": "1.0.5",
++      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
++      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/convert-source-map": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
++      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/cookie": {
++      "version": "0.7.2",
++      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
++      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/cookie-jar": {
++      "version": "0.3.0",
++      "resolved": "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz",
++      "integrity": "sha512-dX1400pzPULr+ZovkIsDEqe7XH8xCAYGT5Dege4Eot44Qs2mS2iJmnh45TxTO5MIsCfrV/JGZVloLhm46AHxNw==",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/cookie-session": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.1.1.tgz",
++      "integrity": "sha512-ji3kym/XZaFVew1+tIZk5ZLp9Z/fLv9rK1aZmpug0FsgE7Cu3ZDrUdRo7FT9vFjMYfNimrrUHJzywDwT7XEFlg==",
++      "license": "MIT",
++      "dependencies": {
++        "cookies": "0.9.1",
++        "debug": "3.2.7",
++        "on-headers": "~1.1.0",
++        "safe-buffer": "5.2.1"
++      },
++      "engines": {
++        "node": ">= 0.10"
++      }
++    },
++    "node_modules/cookie-session/node_modules/debug": {
++      "version": "3.2.7",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
++      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
++      "license": "MIT",
++      "dependencies": {
++        "ms": "^2.1.1"
++      }
++    },
++    "node_modules/cookie-session/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT"
++    },
++    "node_modules/cookie-signature": {
++      "version": "1.0.7",
++      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
++      "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
++      "license": "MIT"
++    },
++    "node_modules/cookies": {
++      "version": "0.9.1",
++      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
++      "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
++      "license": "MIT",
++      "dependencies": {
++        "depd": "~2.0.0",
++        "keygrip": "~1.1.0"
++      },
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/core-js": {
++      "version": "3.49.0",
++      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz",
++      "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==",
++      "hasInstallScript": true,
++      "license": "MIT",
++      "optional": true,
++      "funding": {
++        "type": "opencollective",
++        "url": "https://opencollective.com/core-js"
++      }
++    },
++    "node_modules/core-util-is": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
++      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
++      "license": "MIT"
++    },
++    "node_modules/cp-file": {
++      "version": "6.2.0",
++      "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz",
++      "integrity": "sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "graceful-fs": "^4.1.2",
++        "make-dir": "^2.0.0",
++        "nested-error-stacks": "^2.0.0",
++        "pify": "^4.0.1",
++        "safe-buffer": "^5.0.1"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/cpu-features": {
++      "version": "0.0.10",
++      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz",
++      "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==",
++      "hasInstallScript": true,
++      "optional": true,
++      "dependencies": {
++        "buildcheck": "~0.0.6",
++        "nan": "^2.19.0"
++      },
++      "engines": {
++        "node": ">=10.0.0"
++      }
++    },
++    "node_modules/crc-32": {
++      "version": "1.2.2",
++      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
++      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
++      "license": "Apache-2.0",
++      "bin": {
++        "crc32": "bin/crc32.njs"
++      },
++      "engines": {
++        "node": ">=0.8"
++      }
++    },
++    "node_modules/crc32-stream": {
++      "version": "6.0.0",
++      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz",
++      "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==",
++      "license": "MIT",
++      "dependencies": {
++        "crc-32": "^1.2.0",
++        "readable-stream": "^4.0.0"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/cross-spawn": {
++      "version": "7.0.6",
++      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
++      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
++      "license": "MIT",
++      "dependencies": {
++        "path-key": "^3.1.0",
++        "shebang-command": "^2.0.0",
++        "which": "^2.0.1"
++      },
++      "engines": {
++        "node": ">= 8"
++      }
++    },
++    "node_modules/crypt": {
++      "version": "0.0.2",
++      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
++      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/cryptiles": {
++      "version": "0.2.2",
++      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
++      "integrity": "sha512-gvWSbgqP+569DdslUiCelxIv3IYK5Lgmq1UrRnk+s1WxQOQ16j3GPDcjdtgL5Au65DU/xQi6q3xPtf5Kta+3IQ==",
++      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
++      "optional": true,
++      "dependencies": {
++        "boom": "0.4.x"
++      },
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
++    "node_modules/cssstyle": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
++      "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "rrweb-cssom": "^0.6.0"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/ctype": {
++      "version": "0.5.3",
++      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
++      "integrity": "sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg==",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/d": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
++      "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "es5-ext": "^0.10.64",
++        "type": "^2.7.2"
++      },
++      "engines": {
++        "node": ">=0.12"
++      }
++    },
++    "node_modules/dashdash": {
++      "version": "1.14.1",
++      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
++      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "assert-plus": "^1.0.0"
++      },
++      "engines": {
++        "node": ">=0.10"
++      }
++    },
++    "node_modules/data-uri-to-buffer": {
++      "version": "4.0.1",
++      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
++      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 12"
++      }
++    },
++    "node_modules/data-urls": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
++      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "abab": "^2.0.6",
++        "whatwg-mimetype": "^3.0.0",
++        "whatwg-url": "^12.0.0"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/data-view-buffer": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
++      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3",
++        "es-errors": "^1.3.0",
++        "is-data-view": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/data-view-byte-length": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
++      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3",
++        "es-errors": "^1.3.0",
++        "is-data-view": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/inspect-js"
++      }
++    },
++    "node_modules/data-view-byte-offset": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
++      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.2",
++        "es-errors": "^1.3.0",
++        "is-data-view": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/dayjs": {
++      "version": "1.11.20",
++      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz",
++      "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/debug": {
++      "version": "2.6.9",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
++      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
++      "license": "MIT",
++      "dependencies": {
++        "ms": "2.0.0"
++      }
++    },
++    "node_modules/decamelize": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
++      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/decimal.js": {
++      "version": "10.6.0",
++      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
++      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/decode-uri-component": {
++      "version": "0.2.2",
++      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
++      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10"
++      }
++    },
++    "node_modules/decompress-response": {
++      "version": "6.0.0",
++      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
++      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "mimic-response": "^3.1.0"
++      },
++      "engines": {
++        "node": ">=10"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/deep-extend": {
++      "version": "0.6.0",
++      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
++      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4.0.0"
++      }
++    },
++    "node_modules/deepmerge": {
++      "version": "4.3.1",
++      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
++      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/default-require-extensions": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
++      "integrity": "sha512-B0n2zDIXpzLzKeoEozorDSa1cHc1t0NjmxP0zuAxbizNU2MBqYJJKYXrrFdKuQliojXynrxgd7l4ahfg/+aA5g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "strip-bom": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/define-data-property": {
++      "version": "1.1.4",
++      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
++      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
++      "license": "MIT",
++      "dependencies": {
++        "es-define-property": "^1.0.0",
++        "es-errors": "^1.3.0",
++        "gopd": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/define-properties": {
++      "version": "1.2.1",
++      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
++      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "define-data-property": "^1.0.1",
++        "has-property-descriptors": "^1.0.0",
++        "object-keys": "^1.1.1"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/delayed-stream": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
++      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.4.0"
++      }
++    },
++    "node_modules/delegates": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
++      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/denque": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
++      "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10"
++      }
++    },
++    "node_modules/depd": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
++      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/destroy": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
++      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.8",
++        "npm": "1.2.8000 || >= 1.4.16"
++      }
++    },
++    "node_modules/detect-libc": {
++      "version": "2.1.2",
++      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
++      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/discord-api-types": {
++      "version": "0.38.47",
++      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.47.tgz",
++      "integrity": "sha512-XgXQodHQBAE6kfD7kMvVo30863iHX1LHSqNq6MGUTDwIFCCvHva13+rwxyxVXDqudyApMNAd32PGjgVETi5rjA==",
++      "license": "MIT",
++      "optional": true,
++      "workspaces": [
++        "scripts/actions/documentation"
++      ]
++    },
++    "node_modules/discord.js": {
++      "version": "14.26.3",
++      "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.26.3.tgz",
++      "integrity": "sha512-XEKtYn28YFsiJ5l4fLRyikdbo6RD5oFyqfVHQlvXz2104JhH/E8slN28dbky05w3DCrJcNVWvhVvcJCTSl/KIg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@discordjs/builders": "^1.14.1",
++        "@discordjs/collection": "1.5.3",
++        "@discordjs/formatters": "^0.6.2",
++        "@discordjs/rest": "^2.6.1",
++        "@discordjs/util": "^1.2.0",
++        "@discordjs/ws": "^1.2.3",
++        "@sapphire/snowflake": "3.5.3",
++        "discord-api-types": "^0.38.40",
++        "fast-deep-equal": "3.1.3",
++        "lodash.snakecase": "4.1.1",
++        "magic-bytes.js": "^1.13.0",
++        "tslib": "^2.6.3",
++        "undici": "6.24.1"
++      },
++      "engines": {
++        "node": ">=18"
++      },
++      "funding": {
++        "url": "https://github.com/discordjs/discord.js?sponsor"
++      }
++    },
++    "node_modules/dom-serializer": {
++      "version": "1.4.1",
++      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
++      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "domelementtype": "^2.0.1",
++        "domhandler": "^4.2.0",
++        "entities": "^2.0.0"
++      },
++      "funding": {
++        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
++      }
++    },
++    "node_modules/dom-serializer/node_modules/entities": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
++      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "funding": {
++        "url": "https://github.com/fb55/entities?sponsor=1"
++      }
++    },
++    "node_modules/domelementtype": {
++      "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
++      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/fb55"
++        }
++      ],
++      "license": "BSD-2-Clause",
++      "optional": true
++    },
++    "node_modules/domexception": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
++      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
++      "deprecated": "Use your platform's native DOMException instead",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "webidl-conversions": "^7.0.0"
++      },
++      "engines": {
++        "node": ">=12"
++      }
++    },
++    "node_modules/domhandler": {
++      "version": "4.3.1",
++      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
++      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "dependencies": {
++        "domelementtype": "^2.2.0"
++      },
++      "engines": {
++        "node": ">= 4"
++      },
++      "funding": {
++        "url": "https://github.com/fb55/domhandler?sponsor=1"
++      }
++    },
++    "node_modules/domutils": {
++      "version": "2.8.0",
++      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
++      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "dependencies": {
++        "dom-serializer": "^1.0.1",
++        "domelementtype": "^2.2.0",
++        "domhandler": "^4.2.0"
++      },
++      "funding": {
++        "url": "https://github.com/fb55/domutils?sponsor=1"
++      }
++    },
++    "node_modules/dot-case": {
++      "version": "3.0.4",
++      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
++      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "no-case": "^3.0.4",
++        "tslib": "^2.0.3"
++      }
++    },
++    "node_modules/dunder-proto": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
++      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
++      "license": "MIT",
++      "dependencies": {
++        "call-bind-apply-helpers": "^1.0.1",
++        "es-errors": "^1.3.0",
++        "gopd": "^1.2.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/duplexify": {
++      "version": "4.1.3",
++      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz",
++      "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "end-of-stream": "^1.4.1",
++        "inherits": "^2.0.3",
++        "readable-stream": "^3.1.1",
++        "stream-shift": "^1.0.2"
++      }
++    },
++    "node_modules/duplexify/node_modules/readable-stream": {
++      "version": "3.6.2",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
++      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "inherits": "^2.0.3",
++        "string_decoder": "^1.1.1",
++        "util-deprecate": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/each-series": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/each-series/-/each-series-1.0.0.tgz",
++      "integrity": "sha512-4MQloCGGCmT5GJZK5ibgJSvTK1c1QSrNlDvLk6fEyRxjZnXjl+NNFfzhfXpmnWh33Owc9D9klrdzCUi7yc9r4Q==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/eastasianwidth": {
++      "version": "0.2.0",
++      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
++      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
++      "license": "MIT"
++    },
++    "node_modules/ecc-jsbn": {
++      "version": "0.1.2",
++      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
++      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "jsbn": "~0.1.0",
++        "safer-buffer": "^2.1.0"
++      }
++    },
++    "node_modules/ecc-jsbn/node_modules/jsbn": {
++      "version": "0.1.1",
++      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
++      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/ecdsa-sig-formatter": {
++      "version": "1.0.11",
++      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
++      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "safe-buffer": "^5.0.1"
++      }
++    },
++    "node_modules/ee-first": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
++      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
++      "license": "MIT"
++    },
++    "node_modules/electron-to-chromium": {
++      "version": "1.5.344",
++      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.344.tgz",
++      "integrity": "sha512-4MxfbmNDm+KPh066EZy+eUnkcDPcZ35wNmOWzFuh/ijvHsve6kbLTLURy88uCNK5FbpN+yk2nQY6BYh1GEt+wg==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/emoji-regex": {
++      "version": "9.2.2",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
++      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
++      "license": "MIT"
++    },
++    "node_modules/enabled": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
++      "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/encodeurl": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
++      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/encoding": {
++      "version": "0.1.13",
++      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
++      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "iconv-lite": "^0.6.2"
++      }
++    },
++    "node_modules/encoding/node_modules/iconv-lite": {
++      "version": "0.6.3",
++      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
++      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "safer-buffer": ">= 2.1.2 < 3.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/end-of-stream": {
++      "version": "1.4.5",
++      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
++      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "once": "^1.4.0"
++      }
++    },
++    "node_modules/entities": {
++      "version": "4.5.0",
++      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
++      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "engines": {
++        "node": ">=0.12"
++      },
++      "funding": {
++        "url": "https://github.com/fb55/entities?sponsor=1"
++      }
++    },
++    "node_modules/env-paths": {
++      "version": "2.2.1",
++      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
++      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/err-code": {
++      "version": "2.0.3",
++      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
++      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/error-ex": {
++      "version": "1.3.4",
++      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
++      "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "is-arrayish": "^0.2.1"
++      }
++    },
++    "node_modules/es-abstract": {
++      "version": "1.24.2",
++      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.2.tgz",
++      "integrity": "sha512-2FpH9Q5i2RRwyEP1AylXe6nYLR5OhaJTZwmlcP0dL/+JCbgg7yyEo/sEK6HeGZRf3dFpWwThaRHVApXSkW3xeg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "array-buffer-byte-length": "^1.0.2",
++        "arraybuffer.prototype.slice": "^1.0.4",
++        "available-typed-arrays": "^1.0.7",
++        "call-bind": "^1.0.8",
++        "call-bound": "^1.0.4",
++        "data-view-buffer": "^1.0.2",
++        "data-view-byte-length": "^1.0.2",
++        "data-view-byte-offset": "^1.0.1",
++        "es-define-property": "^1.0.1",
++        "es-errors": "^1.3.0",
++        "es-object-atoms": "^1.1.1",
++        "es-set-tostringtag": "^2.1.0",
++        "es-to-primitive": "^1.3.0",
++        "function.prototype.name": "^1.1.8",
++        "get-intrinsic": "^1.3.0",
++        "get-proto": "^1.0.1",
++        "get-symbol-description": "^1.1.0",
++        "globalthis": "^1.0.4",
++        "gopd": "^1.2.0",
++        "has-property-descriptors": "^1.0.2",
++        "has-proto": "^1.2.0",
++        "has-symbols": "^1.1.0",
++        "hasown": "^2.0.2",
++        "internal-slot": "^1.1.0",
++        "is-array-buffer": "^3.0.5",
++        "is-callable": "^1.2.7",
++        "is-data-view": "^1.0.2",
++        "is-negative-zero": "^2.0.3",
++        "is-regex": "^1.2.1",
++        "is-set": "^2.0.3",
++        "is-shared-array-buffer": "^1.0.4",
++        "is-string": "^1.1.1",
++        "is-typed-array": "^1.1.15",
++        "is-weakref": "^1.1.1",
++        "math-intrinsics": "^1.1.0",
++        "object-inspect": "^1.13.4",
++        "object-keys": "^1.1.1",
++        "object.assign": "^4.1.7",
++        "own-keys": "^1.0.1",
++        "regexp.prototype.flags": "^1.5.4",
++        "safe-array-concat": "^1.1.3",
++        "safe-push-apply": "^1.0.0",
++        "safe-regex-test": "^1.1.0",
++        "set-proto": "^1.0.0",
++        "stop-iteration-iterator": "^1.1.0",
++        "string.prototype.trim": "^1.2.10",
++        "string.prototype.trimend": "^1.0.9",
++        "string.prototype.trimstart": "^1.0.8",
++        "typed-array-buffer": "^1.0.3",
++        "typed-array-byte-length": "^1.0.3",
++        "typed-array-byte-offset": "^1.0.4",
++        "typed-array-length": "^1.0.7",
++        "unbox-primitive": "^1.1.0",
++        "which-typed-array": "^1.1.19"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/es-array-method-boxes-properly": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
++      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/es-define-property": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
++      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/es-errors": {
++      "version": "1.3.0",
++      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
++      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/es-object-atoms": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
++      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
++      "license": "MIT",
++      "dependencies": {
++        "es-errors": "^1.3.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/es-set-tostringtag": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
++      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "es-errors": "^1.3.0",
++        "get-intrinsic": "^1.2.6",
++        "has-tostringtag": "^1.0.2",
++        "hasown": "^2.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/es-to-primitive": {
++      "version": "1.3.0",
++      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
++      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "is-callable": "^1.2.7",
++        "is-date-object": "^1.0.5",
++        "is-symbol": "^1.0.4"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/es5-ext": {
++      "version": "0.10.64",
++      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
++      "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==",
++      "hasInstallScript": true,
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "es6-iterator": "^2.0.3",
++        "es6-symbol": "^3.1.3",
++        "esniff": "^2.0.1",
++        "next-tick": "^1.1.0"
++      },
++      "engines": {
++        "node": ">=0.10"
++      }
++    },
++    "node_modules/es6-error": {
++      "version": "4.1.1",
++      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
++      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/es6-iterator": {
++      "version": "2.0.3",
++      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
++      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "d": "1",
++        "es5-ext": "^0.10.35",
++        "es6-symbol": "^3.1.1"
++      }
++    },
++    "node_modules/es6-symbol": {
++      "version": "3.1.4",
++      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz",
++      "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "d": "^1.0.2",
++        "ext": "^1.7.0"
++      },
++      "engines": {
++        "node": ">=0.12"
++      }
++    },
++    "node_modules/escalade": {
++      "version": "3.2.0",
++      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
++      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/escape-html": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
++      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
++      "license": "MIT"
++    },
++    "node_modules/escape-string-regexp": {
++      "version": "1.0.5",
++      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
++      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
++    "node_modules/esniff": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
++      "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "d": "^1.0.1",
++        "es5-ext": "^0.10.62",
++        "event-emitter": "^0.3.5",
++        "type": "^2.7.2"
++      },
++      "engines": {
++        "node": ">=0.10"
++      }
++    },
++    "node_modules/esprima": {
++      "version": "4.0.1",
++      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
++      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "bin": {
++        "esparse": "bin/esparse.js",
++        "esvalidate": "bin/esvalidate.js"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/etag": {
++      "version": "1.8.1",
++      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
++      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/event-emitter": {
++      "version": "0.3.5",
++      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
++      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "d": "1",
++        "es5-ext": "~0.10.14"
++      }
++    },
++    "node_modules/event-target-shim": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
++      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/eventemitter3": {
++      "version": "5.0.4",
++      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
++      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/events": {
++      "version": "3.3.0",
++      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
++      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=0.8.x"
++      }
++    },
++    "node_modules/events-universal": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",
++      "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",
++      "license": "Apache-2.0",
++      "dependencies": {
++        "bare-events": "^2.7.0"
++      }
++    },
++    "node_modules/exit-hook": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
++      "integrity": "sha512-MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/expand-template": {
++      "version": "2.0.3",
++      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
++      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
++      "license": "(MIT OR WTFPL)",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/express": {
++      "version": "4.22.1",
++      "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
++      "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==",
++      "license": "MIT",
++      "dependencies": {
++        "accepts": "~1.3.8",
++        "array-flatten": "1.1.1",
++        "body-parser": "~1.20.3",
++        "content-disposition": "~0.5.4",
++        "content-type": "~1.0.4",
++        "cookie": "~0.7.1",
++        "cookie-signature": "~1.0.6",
++        "debug": "2.6.9",
++        "depd": "2.0.0",
++        "encodeurl": "~2.0.0",
++        "escape-html": "~1.0.3",
++        "etag": "~1.8.1",
++        "finalhandler": "~1.3.1",
++        "fresh": "~0.5.2",
++        "http-errors": "~2.0.0",
++        "merge-descriptors": "1.0.3",
++        "methods": "~1.1.2",
++        "on-finished": "~2.4.1",
++        "parseurl": "~1.3.3",
++        "path-to-regexp": "~0.1.12",
++        "proxy-addr": "~2.0.7",
++        "qs": "~6.14.0",
++        "range-parser": "~1.2.1",
++        "safe-buffer": "5.2.1",
++        "send": "~0.19.0",
++        "serve-static": "~1.16.2",
++        "setprototypeof": "1.2.0",
++        "statuses": "~2.0.1",
++        "type-is": "~1.6.18",
++        "utils-merge": "1.0.1",
++        "vary": "~1.1.2"
++      },
++      "engines": {
++        "node": ">= 0.10.0"
++      },
++      "funding": {
++        "type": "opencollective",
++        "url": "https://opencollective.com/express"
++      }
++    },
++    "node_modules/express-handlebars": {
++      "version": "7.1.3",
++      "resolved": "https://registry.npmjs.org/express-handlebars/-/express-handlebars-7.1.3.tgz",
++      "integrity": "sha512-O0W4n14iQ8+iFIDdiMh9HRI2nbVQJ/h1qndlD1TXWxxcfbKjKoqJh+ti2tROkyx4C4VQrt0y3bANBQ5auQAiew==",
++      "license": "BSD-3-Clause",
++      "dependencies": {
++        "glob": "^10.4.2",
++        "graceful-fs": "^4.2.11",
++        "handlebars": "^4.7.8"
++      },
++      "engines": {
++        "node": ">=v16"
++      }
++    },
++    "node_modules/express-ws": {
++      "version": "5.0.2",
++      "resolved": "https://registry.npmjs.org/express-ws/-/express-ws-5.0.2.tgz",
++      "integrity": "sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ==",
++      "license": "BSD-2-Clause",
++      "dependencies": {
++        "ws": "^7.4.6"
++      },
++      "engines": {
++        "node": ">=4.5.0"
++      },
++      "peerDependencies": {
++        "express": "^4.0.0 || ^5.0.0-alpha.1"
++      }
++    },
++    "node_modules/express-ws/node_modules/ws": {
++      "version": "7.5.10",
++      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
++      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=8.3.0"
++      },
++      "peerDependencies": {
++        "bufferutil": "^4.0.1",
++        "utf-8-validate": "^5.0.2"
++      },
++      "peerDependenciesMeta": {
++        "bufferutil": {
++          "optional": true
++        },
++        "utf-8-validate": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/ext": {
++      "version": "1.7.0",
++      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
++      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "type": "^2.7.2"
++      }
++    },
++    "node_modules/extend": {
++      "version": "3.0.2",
++      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
++      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/extsprintf": {
++      "version": "1.3.0",
++      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
++      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
++      "engines": [
++        "node >=0.6.0"
++      ],
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/farmhash-modern": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/farmhash-modern/-/farmhash-modern-1.1.0.tgz",
++      "integrity": "sha512-6ypT4XfgqJk/F3Yuv4SX26I3doUjt0GTG4a+JgWxXQpxXzTBq8fPUeGHfcYMMDPHJHm3yPOSjaeBwBGAHWXCdA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=18.0.0"
++      }
++    },
++    "node_modules/fast-deep-equal": {
++      "version": "3.1.3",
++      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
++      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/fast-fifo": {
++      "version": "1.3.2",
++      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
++      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
++      "license": "MIT"
++    },
++    "node_modules/fast-json-stable-stringify": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
++      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/fast-unique-numbers": {
++      "version": "8.0.13",
++      "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz",
++      "integrity": "sha512-7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@babel/runtime": "^7.23.8",
++        "tslib": "^2.6.2"
++      },
++      "engines": {
++        "node": ">=16.1.0"
++      }
++    },
++    "node_modules/fast-xml-builder": {
++      "version": "1.1.5",
++      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.5.tgz",
++      "integrity": "sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/NaturalIntelligence"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "path-expression-matcher": "^1.1.3"
++      }
++    },
++    "node_modules/fast-xml-parser": {
++      "version": "5.7.2",
++      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.2.tgz",
++      "integrity": "sha512-P7oW7tLbYnhOLQk/Gv7cZgzgMPP/XN03K02/Jy6Y/NHzyIAIpxuZIM/YqAkfiXFPxA2CTm7NtCijK9EDu09u2w==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/NaturalIntelligence"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@nodable/entities": "^2.1.0",
++        "fast-xml-builder": "^1.1.5",
++        "path-expression-matcher": "^1.5.0",
++        "strnum": "^2.2.3"
++      },
++      "bin": {
++        "fxparser": "src/cli/cli.js"
++      }
++    },
++    "node_modules/fastfall": {
++      "version": "1.5.1",
++      "resolved": "https://registry.npmjs.org/fastfall/-/fastfall-1.5.1.tgz",
++      "integrity": "sha512-KH6p+Z8AKPXnmA7+Iz2Lh8ARCMr+8WNPVludm1LGkZoD2MjY6LVnRMtTKhkdzI+jr0RzQWXKzKyBJm1zoHEL4Q==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "reusify": "^1.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/fastparallel": {
++      "version": "2.4.1",
++      "resolved": "https://registry.npmjs.org/fastparallel/-/fastparallel-2.4.1.tgz",
++      "integrity": "sha512-qUmhxPgNHmvRjZKBFUNI0oZuuH9OlSIOXmJ98lhKPxMZZ7zS/Fi0wRHOihDSz0R1YiIOjxzOY4bq65YTcdBi2Q==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "reusify": "^1.0.4",
++        "xtend": "^4.0.2"
++      }
++    },
++    "node_modules/fastseries": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/fastseries/-/fastseries-2.0.0.tgz",
++      "integrity": "sha512-XBU9RXeoYc2/VnvMhplAxEmZLfIk7cvTBu+xwoBuTI8pL19E03cmca17QQycKIdxgwCeFA/a4u27gv1h3ya5LQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/faye-websocket": {
++      "version": "0.11.4",
++      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
++      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "websocket-driver": ">=0.5.1"
++      },
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
++    "node_modules/fd-slicer": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
++      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
++      "license": "MIT",
++      "dependencies": {
++        "pend": "~1.2.0"
++      }
++    },
++    "node_modules/fecha": {
++      "version": "4.2.3",
++      "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
++      "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/fetch-blob": {
++      "version": "3.2.0",
++      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
++      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/jimmywarting"
++        },
++        {
++          "type": "paypal",
++          "url": "https://paypal.me/jimmywarting"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "node-domexception": "^1.0.0",
++        "web-streams-polyfill": "^3.0.3"
++      },
++      "engines": {
++        "node": "^12.20 || >= 14.13"
++      }
++    },
++    "node_modules/figures": {
++      "version": "1.7.0",
++      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
++      "integrity": "sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "escape-string-regexp": "^1.0.5",
++        "object-assign": "^4.1.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/file-uri-to-path": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
++      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/fill-range": {
++      "version": "7.1.1",
++      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
++      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "to-regex-range": "^5.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/filter-obj": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
++      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/finalhandler": {
++      "version": "1.3.2",
++      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
++      "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==",
++      "license": "MIT",
++      "dependencies": {
++        "debug": "2.6.9",
++        "encodeurl": "~2.0.0",
++        "escape-html": "~1.0.3",
++        "on-finished": "~2.4.1",
++        "parseurl": "~1.3.3",
++        "statuses": "~2.0.2",
++        "unpipe": "~1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/find-cache-dir": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
++      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "commondir": "^1.0.1",
++        "make-dir": "^2.0.0",
++        "pkg-dir": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/find-up": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
++      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "locate-path": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/firebase-admin": {
++      "version": "12.7.0",
++      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-12.7.0.tgz",
++      "integrity": "sha512-raFIrOyTqREbyXsNkSHyciQLfv8AUZazehPaQS1lZBSCDYW74FYXU0nQZa3qHI4K+hawohlDbywZ4+qce9YNxA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@fastify/busboy": "^3.0.0",
++        "@firebase/database-compat": "1.0.8",
++        "@firebase/database-types": "1.0.5",
++        "@types/node": "^22.0.1",
++        "farmhash-modern": "^1.1.0",
++        "jsonwebtoken": "^9.0.0",
++        "jwks-rsa": "^3.1.0",
++        "node-forge": "^1.3.1",
++        "uuid": "^10.0.0"
++      },
++      "engines": {
++        "node": ">=14"
++      },
++      "optionalDependencies": {
++        "@google-cloud/firestore": "^7.7.0",
++        "@google-cloud/storage": "^7.7.0"
++      }
++    },
++    "node_modules/firebase-admin/node_modules/@types/node": {
++      "version": "22.19.17",
++      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.17.tgz",
++      "integrity": "sha512-wGdMcf+vPYM6jikpS/qhg6WiqSV/OhG+jeeHT/KlVqxYfD40iYJf9/AE1uQxVWFvU7MipKRkRv8NSHiCGgPr8Q==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "undici-types": "~6.21.0"
++      }
++    },
++    "node_modules/firebase-admin/node_modules/undici-types": {
++      "version": "6.21.0",
++      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
++      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/fn.name": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
++      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/follow-redirects": {
++      "version": "1.16.0",
++      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
++      "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
++      "funding": [
++        {
++          "type": "individual",
++          "url": "https://github.com/sponsors/RubenVerborgh"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4.0"
++      },
++      "peerDependenciesMeta": {
++        "debug": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/for-each": {
++      "version": "0.3.5",
++      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
++      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
++      "license": "MIT",
++      "dependencies": {
++        "is-callable": "^1.2.7"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/foreground-child": {
++      "version": "3.3.1",
++      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
++      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
++      "license": "ISC",
++      "dependencies": {
++        "cross-spawn": "^7.0.6",
++        "signal-exit": "^4.0.1"
++      },
++      "engines": {
++        "node": ">=14"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/forever-agent": {
++      "version": "0.6.1",
++      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
++      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/form-data": {
++      "version": "4.0.5",
++      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
++      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "asynckit": "^0.4.0",
++        "combined-stream": "^1.0.8",
++        "es-set-tostringtag": "^2.1.0",
++        "hasown": "^2.0.2",
++        "mime-types": "^2.1.12"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/formdata-polyfill": {
++      "version": "4.0.10",
++      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
++      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "fetch-blob": "^3.1.2"
++      },
++      "engines": {
++        "node": ">=12.20.0"
++      }
++    },
++    "node_modules/forwarded": {
++      "version": "0.2.0",
++      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
++      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/fresh": {
++      "version": "0.5.2",
++      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
++      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/fs-constants": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
++      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/fs-minipass": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
++      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "minipass": "^3.0.0"
++      },
++      "engines": {
++        "node": ">= 8"
++      }
++    },
++    "node_modules/fs-minipass/node_modules/minipass": {
++      "version": "3.3.6",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/fs-readdir-recursive": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
++      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/fs.realpath": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
++      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/fsevents": {
++      "version": "2.3.3",
++      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
++      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
++      "hasInstallScript": true,
++      "license": "MIT",
++      "optional": true,
++      "os": [
++        "darwin"
++      ],
++      "engines": {
++        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
++      }
++    },
++    "node_modules/function-bind": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
++      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
++      "license": "MIT",
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/function.prototype.name": {
++      "version": "1.1.8",
++      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
++      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bind": "^1.0.8",
++        "call-bound": "^1.0.3",
++        "define-properties": "^1.2.1",
++        "functions-have-names": "^1.2.3",
++        "hasown": "^2.0.2",
++        "is-callable": "^1.2.7"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/functional-red-black-tree": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
++      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/functions-have-names": {
++      "version": "1.2.3",
++      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
++      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
++      "license": "MIT",
++      "optional": true,
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/gauge": {
++      "version": "4.0.4",
++      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
++      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
++      "deprecated": "This package is no longer supported.",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "aproba": "^1.0.3 || ^2.0.0",
++        "color-support": "^1.1.3",
++        "console-control-strings": "^1.1.0",
++        "has-unicode": "^2.0.1",
++        "signal-exit": "^3.0.7",
++        "string-width": "^4.2.3",
++        "strip-ansi": "^6.0.1",
++        "wide-align": "^1.1.5"
++      },
++      "engines": {
++        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
++      }
++    },
++    "node_modules/gauge/node_modules/ansi-regex": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
++      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/gauge/node_modules/emoji-regex": {
++      "version": "8.0.0",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
++      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/gauge/node_modules/signal-exit": {
++      "version": "3.0.7",
++      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
++      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/gauge/node_modules/string-width": {
++      "version": "4.2.3",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
++      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "emoji-regex": "^8.0.0",
++        "is-fullwidth-code-point": "^3.0.0",
++        "strip-ansi": "^6.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/gauge/node_modules/strip-ansi": {
++      "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
++      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-regex": "^5.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/gaxios": {
++      "version": "6.7.1",
++      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
++      "integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "extend": "^3.0.2",
++        "https-proxy-agent": "^7.0.1",
++        "is-stream": "^2.0.0",
++        "node-fetch": "^2.6.9",
++        "uuid": "^9.0.1"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/gaxios/node_modules/node-fetch": {
++      "version": "2.7.0",
++      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
++      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "whatwg-url": "^5.0.0"
++      },
++      "engines": {
++        "node": "4.x || >=6.0.0"
++      },
++      "peerDependencies": {
++        "encoding": "^0.1.0"
++      },
++      "peerDependenciesMeta": {
++        "encoding": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/gaxios/node_modules/tr46": {
++      "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
++      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/gaxios/node_modules/uuid": {
++      "version": "9.0.1",
++      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
++      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
++      "funding": [
++        "https://github.com/sponsors/broofa",
++        "https://github.com/sponsors/ctavan"
++      ],
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "uuid": "dist/bin/uuid"
++      }
++    },
++    "node_modules/gaxios/node_modules/webidl-conversions": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
++      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
++      "license": "BSD-2-Clause",
++      "optional": true
++    },
++    "node_modules/gaxios/node_modules/whatwg-url": {
++      "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
++      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "tr46": "~0.0.3",
++        "webidl-conversions": "^3.0.0"
++      }
++    },
++    "node_modules/gcp-metadata": {
++      "version": "6.1.1",
++      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
++      "integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "gaxios": "^6.1.1",
++        "google-logging-utils": "^0.0.2",
++        "json-bigint": "^1.0.0"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/generate-function": {
++      "version": "2.3.1",
++      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
++      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "is-property": "^1.0.2"
++      }
++    },
++    "node_modules/generator-function": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
++      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/gensync": {
++      "version": "1.0.0-beta.2",
++      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
++      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6.9.0"
++      }
++    },
++    "node_modules/get-caller-file": {
++      "version": "2.0.5",
++      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
++      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": "6.* || 8.* || >= 10.*"
++      }
++    },
++    "node_modules/get-intrinsic": {
++      "version": "1.3.0",
++      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
++      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
++      "license": "MIT",
++      "dependencies": {
++        "call-bind-apply-helpers": "^1.0.2",
++        "es-define-property": "^1.0.1",
++        "es-errors": "^1.3.0",
++        "es-object-atoms": "^1.1.1",
++        "function-bind": "^1.1.2",
++        "get-proto": "^1.0.1",
++        "gopd": "^1.2.0",
++        "has-symbols": "^1.1.0",
++        "hasown": "^2.0.2",
++        "math-intrinsics": "^1.1.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/get-proto": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
++      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
++      "license": "MIT",
++      "dependencies": {
++        "dunder-proto": "^1.0.1",
++        "es-object-atoms": "^1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/get-symbol-description": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
++      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3",
++        "es-errors": "^1.3.0",
++        "get-intrinsic": "^1.2.6"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/getpass": {
++      "version": "0.1.7",
++      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
++      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "assert-plus": "^1.0.0"
++      }
++    },
++    "node_modules/github-from-package": {
++      "version": "0.0.0",
++      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
++      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/glob": {
++      "version": "10.5.0",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
++      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
++      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++      "license": "ISC",
++      "dependencies": {
++        "foreground-child": "^3.1.0",
++        "jackspeak": "^3.1.2",
++        "minimatch": "^9.0.4",
++        "minipass": "^7.1.2",
++        "package-json-from-dist": "^1.0.0",
++        "path-scurry": "^1.11.1"
++      },
++      "bin": {
++        "glob": "dist/esm/bin.mjs"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/glob-parent": {
++      "version": "5.1.2",
++      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
++      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "is-glob": "^4.0.1"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/globalthis": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
++      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "define-properties": "^1.2.1",
++        "gopd": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/google-auth-library": {
++      "version": "9.15.1",
++      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
++      "integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "base64-js": "^1.3.0",
++        "ecdsa-sig-formatter": "^1.0.11",
++        "gaxios": "^6.1.1",
++        "gcp-metadata": "^6.1.0",
++        "gtoken": "^7.0.0",
++        "jws": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/google-gax": {
++      "version": "4.6.1",
++      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-4.6.1.tgz",
++      "integrity": "sha512-V6eky/xz2mcKfAd1Ioxyd6nmA61gao3n01C+YeuIwu3vzM9EDR6wcVzMSIbLMDXWeoi9SHYctXuKYC5uJUT3eQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@grpc/grpc-js": "^1.10.9",
++        "@grpc/proto-loader": "^0.7.13",
++        "@types/long": "^4.0.0",
++        "abort-controller": "^3.0.0",
++        "duplexify": "^4.0.0",
++        "google-auth-library": "^9.3.0",
++        "node-fetch": "^2.7.0",
++        "object-hash": "^3.0.0",
++        "proto3-json-serializer": "^2.0.2",
++        "protobufjs": "^7.3.2",
++        "retry-request": "^7.0.0",
++        "uuid": "^9.0.1"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/google-gax/node_modules/node-fetch": {
++      "version": "2.7.0",
++      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
++      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "whatwg-url": "^5.0.0"
++      },
++      "engines": {
++        "node": "4.x || >=6.0.0"
++      },
++      "peerDependencies": {
++        "encoding": "^0.1.0"
++      },
++      "peerDependenciesMeta": {
++        "encoding": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/google-gax/node_modules/tr46": {
++      "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
++      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/google-gax/node_modules/uuid": {
++      "version": "9.0.1",
++      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
++      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
++      "funding": [
++        "https://github.com/sponsors/broofa",
++        "https://github.com/sponsors/ctavan"
++      ],
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "uuid": "dist/bin/uuid"
++      }
++    },
++    "node_modules/google-gax/node_modules/webidl-conversions": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
++      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
++      "license": "BSD-2-Clause",
++      "optional": true
++    },
++    "node_modules/google-gax/node_modules/whatwg-url": {
++      "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
++      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "tr46": "~0.0.3",
++        "webidl-conversions": "^3.0.0"
++      }
++    },
++    "node_modules/google-logging-utils": {
++      "version": "0.0.2",
++      "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz",
++      "integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/google-protobuf": {
++      "version": "3.19.4",
++      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.19.4.tgz",
++      "integrity": "sha512-OIPNCxsG2lkIvf+P5FNfJ/Km95CsXOBecS9ZcAU6m2Rq3svc0Apl9nB3GMDNKfQ9asNv4KjyAqGwPQFrVle3Yg==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/googleapis": {
++      "version": "128.0.0",
++      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-128.0.0.tgz",
++      "integrity": "sha512-+sLtVYNazcxaSD84N6rihVX4QiGoqRdnlz2SwmQQkadF31XonDfy4ufk3maMg27+FiySrH0rd7V8p+YJG6cknA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "google-auth-library": "^9.0.0",
++        "googleapis-common": "^7.0.0"
++      },
++      "engines": {
++        "node": ">=14.0.0"
++      }
++    },
++    "node_modules/googleapis-common": {
++      "version": "7.2.0",
++      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-7.2.0.tgz",
++      "integrity": "sha512-/fhDZEJZvOV3X5jmD+fKxMqma5q2Q9nZNSF3kn1F18tpxmA86BcTxAGBQdM0N89Z3bEaIs+HVznSmFJEAmMTjA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "extend": "^3.0.2",
++        "gaxios": "^6.0.3",
++        "google-auth-library": "^9.7.0",
++        "qs": "^6.7.0",
++        "url-template": "^2.0.8",
++        "uuid": "^9.0.0"
++      },
++      "engines": {
++        "node": ">=14.0.0"
++      }
++    },
++    "node_modules/googleapis-common/node_modules/uuid": {
++      "version": "9.0.1",
++      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
++      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
++      "funding": [
++        "https://github.com/sponsors/broofa",
++        "https://github.com/sponsors/ctavan"
++      ],
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "uuid": "dist/bin/uuid"
++      }
++    },
++    "node_modules/gopd": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
++      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/graceful-fs": {
++      "version": "4.2.11",
++      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
++      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
++      "license": "ISC"
++    },
++    "node_modules/gtoken": {
++      "version": "7.1.0",
++      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
++      "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "gaxios": "^6.0.0",
++        "jws": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=14.0.0"
++      }
++    },
++    "node_modules/handlebars": {
++      "version": "4.7.8",
++      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
++      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
++      "license": "MIT",
++      "dependencies": {
++        "minimist": "^1.2.5",
++        "neo-async": "^2.6.2",
++        "source-map": "^0.6.1",
++        "wordwrap": "^1.0.0"
++      },
++      "bin": {
++        "handlebars": "bin/handlebars"
++      },
++      "engines": {
++        "node": ">=0.4.7"
++      },
++      "optionalDependencies": {
++        "uglify-js": "^3.1.4"
++      }
++    },
++    "node_modules/har-schema": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
++      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/har-validator": {
++      "version": "5.1.5",
++      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
++      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
++      "deprecated": "this library is no longer supported",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ajv": "^6.12.3",
++        "har-schema": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/has-ansi": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
++      "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-regex": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/has-ansi/node_modules/ansi-regex": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
++      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/has-bigints": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
++      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/has-flag": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
++      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/has-property-descriptors": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
++      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
++      "license": "MIT",
++      "dependencies": {
++        "es-define-property": "^1.0.0"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/has-proto": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
++      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "dunder-proto": "^1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/has-symbols": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
++      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/has-tostringtag": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
++      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
++      "license": "MIT",
++      "dependencies": {
++        "has-symbols": "^1.0.3"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/has-unicode": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
++      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/hasha": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/hasha/-/hasha-3.0.0.tgz",
++      "integrity": "sha512-w0Kz8lJFBoyaurBiNrIvxPqr/gJ6fOfSkpAPOepN3oECqGJag37xPbOv57izi/KP8auHgNYxn5fXtAb+1LsJ6w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "is-stream": "^1.0.1"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/hasha/node_modules/is-stream": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
++      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/hasown": {
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
++      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
++      "license": "MIT",
++      "dependencies": {
++        "function-bind": "^1.1.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/hawk": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
++      "integrity": "sha512-Sg+VzrI7TjUomO0rjD6UXawsj50ykn5sB/xKNW/IenxzRVyw/wt9A2FLzYpGL/r0QG5hyXY8nLx/2m8UutoDcg==",
++      "deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
++      "optional": true,
++      "dependencies": {
++        "boom": "0.4.x",
++        "cryptiles": "0.2.x",
++        "hoek": "0.9.x",
++        "sntp": "0.2.x"
++      },
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
++    "node_modules/heapdump": {
++      "version": "0.3.15",
++      "resolved": "https://registry.npmjs.org/heapdump/-/heapdump-0.3.15.tgz",
++      "integrity": "sha512-n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==",
++      "hasInstallScript": true,
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "nan": "^2.13.2"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/hoek": {
++      "version": "0.9.1",
++      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
++      "integrity": "sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA==",
++      "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
++      "optional": true,
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
++    "node_modules/homedir-polyfill": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
++      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "parse-passwd": "^1.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/hosted-git-info": {
++      "version": "2.8.9",
++      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
++      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/hot-patcher": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/hot-patcher/-/hot-patcher-2.0.1.tgz",
++      "integrity": "sha512-ECg1JFG0YzehicQaogenlcs2qg6WsXQsxtnbr1i696u5tLUjtJdQAh0u2g0Q5YV45f263Ta1GnUJsc8WIfJf4Q==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/html-encoding-sniffer": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
++      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "whatwg-encoding": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=12"
++      }
++    },
++    "node_modules/html-entities": {
++      "version": "2.6.0",
++      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz",
++      "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/mdevils"
++        },
++        {
++          "type": "patreon",
++          "url": "https://patreon.com/mdevils"
++        }
++      ],
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/html-escaper": {
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
++      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/html-minifier-terser": {
++      "version": "7.2.0",
++      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
++      "integrity": "sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "camel-case": "^4.1.2",
++        "clean-css": "~5.3.2",
++        "commander": "^10.0.0",
++        "entities": "^4.4.0",
++        "param-case": "^3.0.4",
++        "relateurl": "^0.2.7",
++        "terser": "^5.15.1"
++      },
++      "bin": {
++        "html-minifier-terser": "cli.js"
++      },
++      "engines": {
++        "node": "^14.13.1 || >=16.0.0"
++      }
++    },
++    "node_modules/html-minifier-terser/node_modules/commander": {
++      "version": "10.0.1",
++      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
++      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/htmlparser2": {
++      "version": "6.1.0",
++      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
++      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
++      "funding": [
++        "https://github.com/fb55/htmlparser2?sponsor=1",
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/fb55"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "domelementtype": "^2.0.1",
++        "domhandler": "^4.0.0",
++        "domutils": "^2.5.2",
++        "entities": "^2.0.0"
++      }
++    },
++    "node_modules/htmlparser2/node_modules/entities": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
++      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "funding": {
++        "url": "https://github.com/fb55/entities?sponsor=1"
++      }
++    },
++    "node_modules/http_ece": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.2.0.tgz",
++      "integrity": "sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=16"
++      }
++    },
++    "node_modules/http-cache-semantics": {
++      "version": "4.2.0",
++      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
++      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
++      "license": "BSD-2-Clause",
++      "optional": true
++    },
++    "node_modules/http-errors": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
++      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
++      "license": "MIT",
++      "dependencies": {
++        "depd": "~2.0.0",
++        "inherits": "~2.0.4",
++        "setprototypeof": "~1.2.0",
++        "statuses": "~2.0.2",
++        "toidentifier": "~1.0.1"
++      },
++      "engines": {
++        "node": ">= 0.8"
++      },
++      "funding": {
++        "type": "opencollective",
++        "url": "https://opencollective.com/express"
++      }
++    },
++    "node_modules/http-parser-js": {
++      "version": "0.5.10",
++      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
++      "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/http-proxy-agent": {
++      "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
++      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@tootallnate/once": "2",
++        "agent-base": "6",
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/http-proxy-agent/node_modules/agent-base": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
++      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6.0.0"
++      }
++    },
++    "node_modules/http-proxy-agent/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/http-proxy-agent/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/http-signature": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
++      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "assert-plus": "^1.0.0",
++        "jsprim": "^1.2.2",
++        "sshpk": "^1.7.0"
++      },
++      "engines": {
++        "node": ">=0.8",
++        "npm": ">=1.3.7"
++      }
++    },
++    "node_modules/httpreq": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-1.1.1.tgz",
++      "integrity": "sha512-uhSZLPPD2VXXOSN8Cni3kIsoFHaU2pT/nySEU/fHr/ePbqHYr0jeiQRmUKLEirC09SFPsdMoA7LU7UXMd/w0Kw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 6.15.1"
++      }
++    },
++    "node_modules/https-proxy-agent": {
++      "version": "7.0.6",
++      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
++      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "agent-base": "^7.1.2",
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/https-proxy-agent/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/https-proxy-agent/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/humanize-ms": {
++      "version": "1.2.1",
++      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
++      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.0.0"
++      }
++    },
++    "node_modules/hyperid": {
++      "version": "3.3.0",
++      "resolved": "https://registry.npmjs.org/hyperid/-/hyperid-3.3.0.tgz",
++      "integrity": "sha512-7qhCVT4MJIoEsNcbhglhdmBKb09QtcmJNiIQGq7js/Khf5FtQQ9bzcAuloeqBeee7XD7JqDeve9KNlQya5tSGQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "buffer": "^5.2.1",
++        "uuid": "^8.3.2",
++        "uuid-parse": "^1.1.0"
++      }
++    },
++    "node_modules/hyperid/node_modules/buffer": {
++      "version": "5.7.1",
++      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
++      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/feross"
++        },
++        {
++          "type": "patreon",
++          "url": "https://www.patreon.com/feross"
++        },
++        {
++          "type": "consulting",
++          "url": "https://feross.org/support"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "base64-js": "^1.3.1",
++        "ieee754": "^1.1.13"
++      }
++    },
++    "node_modules/hyperid/node_modules/uuid": {
++      "version": "8.3.2",
++      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
++      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "uuid": "dist/bin/uuid"
++      }
++    },
++    "node_modules/iconv-lite": {
++      "version": "0.4.24",
++      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
++      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
++      "license": "MIT",
++      "dependencies": {
++        "safer-buffer": ">= 2.1.2 < 3"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/ieee754": {
++      "version": "1.2.1",
++      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
++      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/feross"
++        },
++        {
++          "type": "patreon",
++          "url": "https://www.patreon.com/feross"
++        },
++        {
++          "type": "consulting",
++          "url": "https://feross.org/support"
++        }
++      ],
++      "license": "BSD-3-Clause"
++    },
++    "node_modules/image-size": {
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/image-size/-/image-size-2.0.2.tgz",
++      "integrity": "sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "image-size": "bin/image-size.js"
++      },
++      "engines": {
++        "node": ">=16.x"
++      }
++    },
++    "node_modules/immediate": {
++      "version": "3.0.6",
++      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
++      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
++      "license": "MIT"
++    },
++    "node_modules/imurmurhash": {
++      "version": "0.1.4",
++      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
++      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.8.19"
++      }
++    },
++    "node_modules/indent-string": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
++      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/infer-owner": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
++      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/inflight": {
++      "version": "1.0.6",
++      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
++      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
++      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "once": "^1.3.0",
++        "wrappy": "1"
++      }
++    },
++    "node_modules/inherits": {
++      "version": "2.0.4",
++      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
++      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
++      "license": "ISC"
++    },
++    "node_modules/ini": {
++      "version": "1.3.8",
++      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
++      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/input": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/input/-/input-1.0.1.tgz",
++      "integrity": "sha512-5DKQKQ7Nm/CaPGYKF74uUvk5ftC3S04fLYWcDrNG2rOVhhRgB4E2J8JNb7AAh+RlQ/954ukas4bEbrRQ3/kPGA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "babel-runtime": "^6.6.1",
++        "chalk": "^1.1.1",
++        "inquirer": "^0.12.0",
++        "lodash": "^4.6.1"
++      },
++      "engines": {
++        "node": ">=0.12"
++      }
++    },
++    "node_modules/inquirer": {
++      "version": "0.12.0",
++      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
++      "integrity": "sha512-bOetEz5+/WpgaW4D1NYOk1aD+JCqRjqu/FwRFgnIfiP7FC/zinsrfyO1vlS3nyH/R7S0IH3BIHBu4DBIDSqiGQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-escapes": "^1.1.0",
++        "ansi-regex": "^2.0.0",
++        "chalk": "^1.0.0",
++        "cli-cursor": "^1.0.1",
++        "cli-width": "^2.0.0",
++        "figures": "^1.3.5",
++        "lodash": "^4.3.0",
++        "readline2": "^1.0.1",
++        "run-async": "^0.1.0",
++        "rx-lite": "^3.1.2",
++        "string-width": "^1.0.1",
++        "strip-ansi": "^3.0.0",
++        "through": "^2.3.6"
++      }
++    },
++    "node_modules/inquirer/node_modules/ansi-regex": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
++      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/inquirer/node_modules/is-fullwidth-code-point": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
++      "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "number-is-nan": "^1.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/inquirer/node_modules/string-width": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
++      "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "code-point-at": "^1.0.0",
++        "is-fullwidth-code-point": "^1.0.0",
++        "strip-ansi": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/inquirer/node_modules/strip-ansi": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
++      "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-regex": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/internal-slot": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
++      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "es-errors": "^1.3.0",
++        "hasown": "^2.0.2",
++        "side-channel": "^1.1.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/ip-address": {
++      "version": "7.1.0",
++      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-7.1.0.tgz",
++      "integrity": "sha512-V9pWC/VJf2lsXqP7IWJ+pe3P1/HCYGBMZrrnT62niLGjAfCbeiwXMUxaeHvnVlz19O27pvXP4azs+Pj/A0x+SQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "jsbn": "1.1.0",
++        "sprintf-js": "1.1.2"
++      },
++      "engines": {
++        "node": ">= 10"
++      }
++    },
++    "node_modules/ipaddr.js": {
++      "version": "1.9.1",
++      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
++      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.10"
++      }
++    },
++    "node_modules/ipcheck": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/ipcheck/-/ipcheck-0.1.0.tgz",
++      "integrity": "sha512-NwhrmROU0iXKa+U1quGuQ+ag+K/1Bb5V/yh5Q4SylSu/LGymPZcWB7p4u7JgJH0qOR6cTLDO5VZlRbhoeekNzQ==",
++      "license": "MIT"
++    },
++    "node_modules/is-arguments": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
++      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
++      "license": "MIT",
++      "dependencies": {
++        "call-bound": "^1.0.2",
++        "has-tostringtag": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-array-buffer": {
++      "version": "3.0.5",
++      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
++      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bind": "^1.0.8",
++        "call-bound": "^1.0.3",
++        "get-intrinsic": "^1.2.6"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-arrayish": {
++      "version": "0.2.1",
++      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
++      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/is-async-function": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
++      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "async-function": "^1.0.0",
++        "call-bound": "^1.0.3",
++        "get-proto": "^1.0.1",
++        "has-tostringtag": "^1.0.2",
++        "safe-regex-test": "^1.1.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-bigint": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
++      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "has-bigints": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-binary-path": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
++      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "binary-extensions": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/is-boolean-object": {
++      "version": "1.2.2",
++      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
++      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3",
++        "has-tostringtag": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-buffer": {
++      "version": "1.1.6",
++      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
++      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/is-callable": {
++      "version": "1.2.7",
++      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
++      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-core-module": {
++      "version": "2.16.1",
++      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
++      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "hasown": "^2.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-data-view": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
++      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.2",
++        "get-intrinsic": "^1.2.6",
++        "is-typed-array": "^1.1.13"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-date-object": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
++      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.2",
++        "has-tostringtag": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-extglob": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
++      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/is-finalizationregistry": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
++      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-fullwidth-code-point": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
++      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/is-generator-function": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
++      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
++      "license": "MIT",
++      "dependencies": {
++        "call-bound": "^1.0.4",
++        "generator-function": "^2.0.0",
++        "get-proto": "^1.0.1",
++        "has-tostringtag": "^1.0.2",
++        "safe-regex-test": "^1.1.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-glob": {
++      "version": "4.0.3",
++      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
++      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "is-extglob": "^2.1.1"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/is-lambda": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
++      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/is-map": {
++      "version": "2.0.3",
++      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
++      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-negative-zero": {
++      "version": "2.0.3",
++      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
++      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-number": {
++      "version": "7.0.0",
++      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
++      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.12.0"
++      }
++    },
++    "node_modules/is-number-object": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
++      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3",
++        "has-tostringtag": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-plain-object": {
++      "version": "2.0.4",
++      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
++      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "isobject": "^3.0.1"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/is-potential-custom-element-name": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
++      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/is-property": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
++      "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/is-regex": {
++      "version": "1.2.1",
++      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
++      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
++      "license": "MIT",
++      "dependencies": {
++        "call-bound": "^1.0.2",
++        "gopd": "^1.2.0",
++        "has-tostringtag": "^1.0.2",
++        "hasown": "^2.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-set": {
++      "version": "2.0.3",
++      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
++      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-shared-array-buffer": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
++      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-stream": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
++      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=8"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/is-string": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
++      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3",
++        "has-tostringtag": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-symbol": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
++      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.2",
++        "has-symbols": "^1.1.0",
++        "safe-regex-test": "^1.1.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-typed-array": {
++      "version": "1.1.15",
++      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
++      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
++      "license": "MIT",
++      "dependencies": {
++        "which-typed-array": "^1.1.16"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-typedarray": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
++      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/is-weakmap": {
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
++      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-weakref": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
++      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/is-weakset": {
++      "version": "2.0.4",
++      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
++      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.3",
++        "get-intrinsic": "^1.2.6"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/isarray": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
++      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
++      "license": "MIT"
++    },
++    "node_modules/isexe": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
++      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
++      "license": "ISC"
++    },
++    "node_modules/isobject": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
++      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/isomorphic-fetch": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
++      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "node-fetch": "^2.6.1",
++        "whatwg-fetch": "^3.4.1"
++      }
++    },
++    "node_modules/isomorphic-fetch/node_modules/node-fetch": {
++      "version": "2.7.0",
++      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
++      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "whatwg-url": "^5.0.0"
++      },
++      "engines": {
++        "node": "4.x || >=6.0.0"
++      },
++      "peerDependencies": {
++        "encoding": "^0.1.0"
++      },
++      "peerDependenciesMeta": {
++        "encoding": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/isomorphic-fetch/node_modules/tr46": {
++      "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
++      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/isomorphic-fetch/node_modules/webidl-conversions": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
++      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
++      "license": "BSD-2-Clause",
++      "optional": true
++    },
++    "node_modules/isomorphic-fetch/node_modules/whatwg-url": {
++      "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
++      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "tr46": "~0.0.3",
++        "webidl-conversions": "^3.0.0"
++      }
++    },
++    "node_modules/isstream": {
++      "version": "0.1.2",
++      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
++      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/istanbul-lib-coverage": {
++      "version": "2.0.5",
++      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
++      "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/istanbul-lib-hook": {
++      "version": "2.0.7",
++      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz",
++      "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "append-transform": "^1.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/istanbul-lib-instrument": {
++      "version": "3.3.0",
++      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
++      "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "@babel/generator": "^7.4.0",
++        "@babel/parser": "^7.4.3",
++        "@babel/template": "^7.4.0",
++        "@babel/traverse": "^7.4.3",
++        "@babel/types": "^7.4.0",
++        "istanbul-lib-coverage": "^2.0.5",
++        "semver": "^6.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/istanbul-lib-report": {
++      "version": "2.0.8",
++      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
++      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "istanbul-lib-coverage": "^2.0.5",
++        "make-dir": "^2.1.0",
++        "supports-color": "^6.1.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/istanbul-lib-report/node_modules/supports-color": {
++      "version": "6.1.0",
++      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
++      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "has-flag": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/istanbul-lib-source-maps": {
++      "version": "3.0.6",
++      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
++      "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "debug": "^4.1.1",
++        "istanbul-lib-coverage": "^2.0.5",
++        "make-dir": "^2.1.0",
++        "rimraf": "^2.6.3",
++        "source-map": "^0.6.1"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/istanbul-lib-source-maps/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/istanbul-reports": {
++      "version": "2.2.7",
++      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz",
++      "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "html-escaper": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/jackspeak": {
++      "version": "3.4.3",
++      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
++      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
++      "license": "BlueOak-1.0.0",
++      "dependencies": {
++        "@isaacs/cliui": "^8.0.2"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      },
++      "optionalDependencies": {
++        "@pkgjs/parseargs": "^0.11.0"
++      }
++    },
++    "node_modules/joi": {
++      "version": "17.13.3",
++      "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz",
++      "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "@hapi/hoek": "^9.3.0",
++        "@hapi/topo": "^5.1.0",
++        "@sideway/address": "^4.1.5",
++        "@sideway/formula": "^3.0.1",
++        "@sideway/pinpoint": "^2.0.0"
++      }
++    },
++    "node_modules/jose": {
++      "version": "4.15.9",
++      "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.9.tgz",
++      "integrity": "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==",
++      "license": "MIT",
++      "optional": true,
++      "funding": {
++        "url": "https://github.com/sponsors/panva"
++      }
++    },
++    "node_modules/js-tokens": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
++      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/js-yaml": {
++      "version": "3.14.2",
++      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
++      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "argparse": "^1.0.7",
++        "esprima": "^4.0.0"
++      },
++      "bin": {
++        "js-yaml": "bin/js-yaml.js"
++      }
++    },
++    "node_modules/jsbn": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
++      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/jsdom": {
++      "version": "22.1.0",
++      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
++      "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "abab": "^2.0.6",
++        "cssstyle": "^3.0.0",
++        "data-urls": "^4.0.0",
++        "decimal.js": "^10.4.3",
++        "domexception": "^4.0.0",
++        "form-data": "^4.0.0",
++        "html-encoding-sniffer": "^3.0.0",
++        "http-proxy-agent": "^5.0.0",
++        "https-proxy-agent": "^5.0.1",
++        "is-potential-custom-element-name": "^1.0.1",
++        "nwsapi": "^2.2.4",
++        "parse5": "^7.1.2",
++        "rrweb-cssom": "^0.6.0",
++        "saxes": "^6.0.0",
++        "symbol-tree": "^3.2.4",
++        "tough-cookie": "^4.1.2",
++        "w3c-xmlserializer": "^4.0.0",
++        "webidl-conversions": "^7.0.0",
++        "whatwg-encoding": "^2.0.0",
++        "whatwg-mimetype": "^3.0.0",
++        "whatwg-url": "^12.0.1",
++        "ws": "^8.13.0",
++        "xml-name-validator": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=16"
++      },
++      "peerDependencies": {
++        "canvas": "^2.5.0"
++      },
++      "peerDependenciesMeta": {
++        "canvas": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/jsdom/node_modules/agent-base": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
++      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6.0.0"
++      }
++    },
++    "node_modules/jsdom/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/jsdom/node_modules/https-proxy-agent": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
++      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "agent-base": "6",
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/jsdom/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/jsesc": {
++      "version": "3.1.0",
++      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
++      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "jsesc": "bin/jsesc"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/json-bigint": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
++      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "bignumber.js": "^9.0.0"
++      }
++    },
++    "node_modules/json-parse-better-errors": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
++      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/json-schema": {
++      "version": "0.4.0",
++      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
++      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
++      "license": "(AFL-2.1 OR BSD-3-Clause)",
++      "optional": true
++    },
++    "node_modules/json-schema-traverse": {
++      "version": "0.4.1",
++      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
++      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/json-stringify-safe": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
++      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/json5": {
++      "version": "2.2.3",
++      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
++      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "json5": "lib/cli.js"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/jsonwebtoken": {
++      "version": "9.0.3",
++      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz",
++      "integrity": "sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "jws": "^4.0.1",
++        "lodash.includes": "^4.3.0",
++        "lodash.isboolean": "^3.0.3",
++        "lodash.isinteger": "^4.0.4",
++        "lodash.isnumber": "^3.0.3",
++        "lodash.isplainobject": "^4.0.6",
++        "lodash.isstring": "^4.0.1",
++        "lodash.once": "^4.0.0",
++        "ms": "^2.1.1",
++        "semver": "^7.5.4"
++      },
++      "engines": {
++        "node": ">=12",
++        "npm": ">=6"
++      }
++    },
++    "node_modules/jsonwebtoken/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/jsonwebtoken/node_modules/semver": {
++      "version": "7.7.4",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
++      "license": "ISC",
++      "optional": true,
++      "bin": {
++        "semver": "bin/semver.js"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/jsprim": {
++      "version": "1.4.2",
++      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
++      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "assert-plus": "1.0.0",
++        "extsprintf": "1.3.0",
++        "json-schema": "0.4.0",
++        "verror": "1.10.0"
++      },
++      "engines": {
++        "node": ">=0.6.0"
++      }
++    },
++    "node_modules/jsprim/node_modules/core-util-is": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
++      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/jsprim/node_modules/verror": {
++      "version": "1.10.0",
++      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
++      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
++      "engines": [
++        "node >=0.6.0"
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "assert-plus": "^1.0.0",
++        "core-util-is": "1.0.2",
++        "extsprintf": "^1.2.0"
++      }
++    },
++    "node_modules/jwa": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
++      "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "buffer-equal-constant-time": "^1.0.1",
++        "ecdsa-sig-formatter": "1.0.11",
++        "safe-buffer": "^5.0.1"
++      }
++    },
++    "node_modules/jwks-rsa": {
++      "version": "3.2.2",
++      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.2.2.tgz",
++      "integrity": "sha512-BqTyEDV+lS8F2trk3A+qJnxV5Q9EqKCBJOPti3W97r7qTympCZjb7h2X6f2kc+0K3rsSTY1/6YG2eaXKoj497w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/jsonwebtoken": "^9.0.4",
++        "debug": "^4.3.4",
++        "jose": "^4.15.4",
++        "limiter": "^1.1.5",
++        "lru-memoizer": "^2.2.0"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/jwks-rsa/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/jwks-rsa/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/jws": {
++      "version": "4.0.1",
++      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
++      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "jwa": "^2.0.1",
++        "safe-buffer": "^5.0.1"
++      }
++    },
++    "node_modules/jwt-simple": {
++      "version": "0.5.6",
++      "resolved": "https://registry.npmjs.org/jwt-simple/-/jwt-simple-0.5.6.tgz",
++      "integrity": "sha512-40aUybvhH9t2h71ncA1/1SbtTNCVZHgsTsTgqPUxGWDmUDrXyDf2wMNQKEbdBjbf4AI+fQhbECNTV6lWxQKUzg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4.0"
++      }
++    },
++    "node_modules/keygrip": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
++      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
++      "license": "MIT",
++      "dependencies": {
++        "tsscmp": "1.0.6"
++      },
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/kind-of": {
++      "version": "6.0.3",
++      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
++      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/koa-compose": {
++      "version": "4.1.0",
++      "resolved": "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz",
++      "integrity": "sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/kuler": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
++      "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/layerr": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/layerr/-/layerr-3.0.0.tgz",
++      "integrity": "sha512-tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lazystream": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz",
++      "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
++      "license": "MIT",
++      "dependencies": {
++        "readable-stream": "^2.0.5"
++      },
++      "engines": {
++        "node": ">= 0.6.3"
++      }
++    },
++    "node_modules/lazystream/node_modules/readable-stream": {
++      "version": "2.3.8",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
++      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
++      "license": "MIT",
++      "dependencies": {
++        "core-util-is": "~1.0.0",
++        "inherits": "~2.0.3",
++        "isarray": "~1.0.0",
++        "process-nextick-args": "~2.0.0",
++        "safe-buffer": "~5.1.1",
++        "string_decoder": "~1.1.1",
++        "util-deprecate": "~1.0.1"
++      }
++    },
++    "node_modules/lazystream/node_modules/safe-buffer": {
++      "version": "5.1.2",
++      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
++      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
++      "license": "MIT"
++    },
++    "node_modules/lazystream/node_modules/string_decoder": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
++      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
++      "license": "MIT",
++      "dependencies": {
++        "safe-buffer": "~5.1.0"
++      }
++    },
++    "node_modules/ldap-filter": {
++      "version": "0.3.3",
++      "resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.3.3.tgz",
++      "integrity": "sha512-/tFkx5WIn4HuO+6w9lsfxq4FN3O+fDZeO9Mek8dCD8rTUpqzRa766BOBO7BcGkn3X86m5+cBm1/2S/Shzz7gMg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "assert-plus": "^1.0.0"
++      },
++      "engines": {
++        "node": ">=0.8"
++      }
++    },
++    "node_modules/ldapauth-fork": {
++      "version": "5.0.5",
++      "resolved": "https://registry.npmjs.org/ldapauth-fork/-/ldapauth-fork-5.0.5.tgz",
++      "integrity": "sha512-LWUk76+V4AOZbny/3HIPQtGPWZyA3SW2tRhsWIBi9imP22WJktKLHV1ofd8Jo/wY7Ve6vAT7FCI5mEn3blZTjw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/ldapjs": "^2.2.2",
++        "bcryptjs": "^2.4.0",
++        "ldapjs": "^2.2.1",
++        "lru-cache": "^7.10.1"
++      },
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
++    "node_modules/ldapauth-fork/node_modules/lru-cache": {
++      "version": "7.18.3",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
++      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">=12"
++      }
++    },
++    "node_modules/ldapjs": {
++      "version": "2.3.3",
++      "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-2.3.3.tgz",
++      "integrity": "sha512-75QiiLJV/PQqtpH+HGls44dXweviFwQ6SiIK27EqzKQ5jU/7UFrl2E5nLdQ3IYRBzJ/AVFJI66u0MZ0uofKYwg==",
++      "deprecated": "This package has been decomissioned. See https://github.com/ldapjs/node-ldapjs/blob/8ffd0bc9c149088a10ec4c1ec6a18450f76ad05d/README.md",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "abstract-logging": "^2.0.0",
++        "asn1": "^0.2.4",
++        "assert-plus": "^1.0.0",
++        "backoff": "^2.5.0",
++        "ldap-filter": "^0.3.3",
++        "once": "^1.4.0",
++        "vasync": "^2.2.0",
++        "verror": "^1.8.1"
++      },
++      "engines": {
++        "node": ">=10.13.0"
++      }
++    },
++    "node_modules/lie": {
++      "version": "3.1.1",
++      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
++      "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
++      "license": "MIT",
++      "dependencies": {
++        "immediate": "~3.0.5"
++      }
++    },
++    "node_modules/limiter": {
++      "version": "1.1.5",
++      "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
++      "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==",
++      "optional": true
++    },
++    "node_modules/load-json-file": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
++      "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "graceful-fs": "^4.1.2",
++        "parse-json": "^4.0.0",
++        "pify": "^3.0.0",
++        "strip-bom": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/load-json-file/node_modules/pify": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
++      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/loadavg-windows": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/loadavg-windows/-/loadavg-windows-1.1.1.tgz",
++      "integrity": "sha512-ncSyH121LuN6OENPSohTAS2W85J3NYVIfjsVcK4spViQbHlQUXhGKd8VYhrqWyjtwwSTw4g3rrDraNoSJWRLgw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "weak-daemon": "1.0.3"
++      }
++    },
++    "node_modules/localforage": {
++      "version": "1.10.0",
++      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
++      "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
++      "license": "Apache-2.0",
++      "dependencies": {
++        "lie": "3.1.1"
++      }
++    },
++    "node_modules/locate-path": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
++      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "p-locate": "^3.0.0",
++        "path-exists": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/lodash": {
++      "version": "4.17.23",
++      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
++      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
++      "license": "MIT"
++    },
++    "node_modules/lodash.camelcase": {
++      "version": "4.3.0",
++      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
++      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lodash.clonedeep": {
++      "version": "4.5.0",
++      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
++      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lodash.flattendeep": {
++      "version": "4.4.0",
++      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
++      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lodash.includes": {
++      "version": "4.3.0",
++      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
++      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lodash.isboolean": {
++      "version": "3.0.3",
++      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
++      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lodash.isinteger": {
++      "version": "4.0.4",
++      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
++      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lodash.isnumber": {
++      "version": "3.0.3",
++      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
++      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lodash.isplainobject": {
++      "version": "4.0.6",
++      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
++      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lodash.isstring": {
++      "version": "4.0.1",
++      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
++      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lodash.once": {
++      "version": "4.1.1",
++      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
++      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lodash.snakecase": {
++      "version": "4.1.1",
++      "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz",
++      "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/logform": {
++      "version": "2.7.0",
++      "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz",
++      "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@colors/colors": "1.6.0",
++        "@types/triple-beam": "^1.3.2",
++        "fecha": "^4.2.0",
++        "ms": "^2.1.1",
++        "safe-stable-stringify": "^2.3.1",
++        "triple-beam": "^1.3.0"
++      },
++      "engines": {
++        "node": ">= 12.0.0"
++      }
++    },
++    "node_modules/logform/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/long": {
++      "version": "5.3.2",
++      "resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz",
++      "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
++      "license": "Apache-2.0",
++      "optional": true
++    },
++    "node_modules/lossless-json": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/lossless-json/-/lossless-json-2.0.1.tgz",
++      "integrity": "sha512-KW/FSL426qblKVvf4ImeMVGr0Je6J9aXvAMUOIU8AzelDj06q47mn6QJ+56lBBd+A8kjrncrxdKQs6ZssAXTmw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/lower-case": {
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
++      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.0.3"
++      }
++    },
++    "node_modules/lru-cache": {
++      "version": "10.4.3",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
++      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
++      "license": "ISC"
++    },
++    "node_modules/lru-memoizer": {
++      "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.3.0.tgz",
++      "integrity": "sha512-GXn7gyHAMhO13WSKrIiNfztwxodVsP8IoZ3XfrJV4yH2x0/OeTO/FIaAHTY5YekdGgW94njfuKmyyt1E0mR6Ug==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "lodash.clonedeep": "^4.5.0",
++        "lru-cache": "6.0.0"
++      }
++    },
++    "node_modules/lru-memoizer/node_modules/lru-cache": {
++      "version": "6.0.0",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
++      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/lru.min": {
++      "version": "1.1.4",
++      "resolved": "https://registry.npmjs.org/lru.min/-/lru.min-1.1.4.tgz",
++      "integrity": "sha512-DqC6n3QQ77zdFpCMASA1a3Jlb64Hv2N2DciFGkO/4L9+q/IpIAuRlKOvCXabtRW6cQf8usbmM6BE/TOPysCdIA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "bun": ">=1.0.0",
++        "deno": ">=1.30.0",
++        "node": ">=8.0.0"
++      },
++      "funding": {
++        "type": "github",
++        "url": "https://github.com/sponsors/wellwelwel"
++      }
++    },
++    "node_modules/ltx": {
++      "version": "3.1.2",
++      "resolved": "https://registry.npmjs.org/ltx/-/ltx-3.1.2.tgz",
++      "integrity": "sha512-tFSKojN92FqNK6eRTmKK/ROUTUYVWKAxgohz523TPhF1G3nR3DXQS/I7/705rEPrDSloKDgMdRlh0qgMFQoVYw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 12.4.0"
++      }
++    },
++    "node_modules/magic-bytes.js": {
++      "version": "1.13.0",
++      "resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.13.0.tgz",
++      "integrity": "sha512-afO2mnxW7GDTXMm5/AoN1WuOcdoKhtgXjIvHmobqTD1grNplhGdv3PFOyjCVmrnOZBIT/gD/koDKpYG+0mvHcg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/make-dir": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
++      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "pify": "^4.0.1",
++        "semver": "^5.6.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/make-dir/node_modules/semver": {
++      "version": "5.7.2",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
++      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
++      "license": "ISC",
++      "optional": true,
++      "bin": {
++        "semver": "bin/semver"
++      }
++    },
++    "node_modules/make-fetch-happen": {
++      "version": "9.1.0",
++      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
++      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "agentkeepalive": "^4.1.3",
++        "cacache": "^15.2.0",
++        "http-cache-semantics": "^4.1.0",
++        "http-proxy-agent": "^4.0.1",
++        "https-proxy-agent": "^5.0.0",
++        "is-lambda": "^1.0.1",
++        "lru-cache": "^6.0.0",
++        "minipass": "^3.1.3",
++        "minipass-collect": "^1.0.2",
++        "minipass-fetch": "^1.3.2",
++        "minipass-flush": "^1.0.5",
++        "minipass-pipeline": "^1.2.4",
++        "negotiator": "^0.6.2",
++        "promise-retry": "^2.0.1",
++        "socks-proxy-agent": "^6.0.0",
++        "ssri": "^8.0.0"
++      },
++      "engines": {
++        "node": ">= 10"
++      }
++    },
++    "node_modules/make-fetch-happen/node_modules/@tootallnate/once": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
++      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/make-fetch-happen/node_modules/agent-base": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
++      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6.0.0"
++      }
++    },
++    "node_modules/make-fetch-happen/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/make-fetch-happen/node_modules/http-proxy-agent": {
++      "version": "4.0.1",
++      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
++      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@tootallnate/once": "1",
++        "agent-base": "6",
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/make-fetch-happen/node_modules/https-proxy-agent": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
++      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "agent-base": "6",
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/make-fetch-happen/node_modules/lru-cache": {
++      "version": "6.0.0",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
++      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/make-fetch-happen/node_modules/minipass": {
++      "version": "3.3.6",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/make-fetch-happen/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/mariadb": {
++      "version": "3.5.2",
++      "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.5.2.tgz",
++      "integrity": "sha512-9rztrI4nouxAY/82a+RlzzZ5ie2vxu2eYclkBvTy1ATXH1B9cnvZ0O71Pzsy/mlfDb5P3HhOg0JzQKkDRhctyA==",
++      "license": "LGPL-2.1-or-later",
++      "optional": true,
++      "dependencies": {
++        "@types/geojson": "^7946.0.16",
++        "@types/node": ">=18",
++        "denque": "^2.1.0",
++        "iconv-lite": "^0.7.2",
++        "lru-cache": "^10.4.3"
++      },
++      "engines": {
++        "node": ">= 18"
++      }
++    },
++    "node_modules/mariadb/node_modules/iconv-lite": {
++      "version": "0.7.2",
++      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
++      "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "safer-buffer": ">= 2.1.2 < 3.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      },
++      "funding": {
++        "type": "opencollective",
++        "url": "https://opencollective.com/express"
++      }
++    },
++    "node_modules/math-intrinsics": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
++      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/md5": {
++      "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
++      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "charenc": "0.0.2",
++        "crypt": "0.0.2",
++        "is-buffer": "~1.1.6"
++      }
++    },
++    "node_modules/media-typer": {
++      "version": "0.3.0",
++      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
++      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/memory-pager": {
++      "version": "1.5.0",
++      "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
++      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/merge-descriptors": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
++      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
++      "license": "MIT",
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/merge-source-map": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
++      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "source-map": "^0.6.1"
++      }
++    },
++    "node_modules/methods": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
++      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/mime": {
++      "version": "1.6.0",
++      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
++      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
++      "license": "MIT",
++      "bin": {
++        "mime": "cli.js"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/mime-db": {
++      "version": "1.54.0",
++      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
++      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/mime-types": {
++      "version": "2.1.35",
++      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
++      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
++      "license": "MIT",
++      "dependencies": {
++        "mime-db": "1.52.0"
++      },
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/mime-types/node_modules/mime-db": {
++      "version": "1.52.0",
++      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
++      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/mimic-response": {
++      "version": "3.1.0",
++      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
++      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=10"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/minimalistic-assert": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
++      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/minimatch": {
++      "version": "9.0.9",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
++      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
++      "license": "ISC",
++      "dependencies": {
++        "brace-expansion": "^2.0.2"
++      },
++      "engines": {
++        "node": ">=16 || 14 >=14.17"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/minimist": {
++      "version": "1.2.8",
++      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
++      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
++      "license": "MIT",
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/minio": {
++      "version": "8.0.7",
++      "resolved": "https://registry.npmjs.org/minio/-/minio-8.0.7.tgz",
++      "integrity": "sha512-E737MgufW8CeQAsTAtnEMrxZ9scMSf29kkhZoXzDTKj/Jszzo2SfeZUH9wbDQH2Rsq6TCtl/yQL0+XdVKZansQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "async": "^3.2.4",
++        "block-stream2": "^2.1.0",
++        "browser-or-node": "^2.1.1",
++        "buffer-crc32": "^1.0.0",
++        "eventemitter3": "^5.0.1",
++        "fast-xml-parser": "^5.3.4",
++        "ipaddr.js": "^2.0.1",
++        "lodash": "^4.17.21",
++        "mime-types": "^2.1.35",
++        "query-string": "^7.1.3",
++        "stream-json": "^1.8.0",
++        "through2": "^4.0.2",
++        "xml2js": "^0.5.0 || ^0.6.2"
++      },
++      "engines": {
++        "node": "^16 || ^18 || >=20"
++      }
++    },
++    "node_modules/minio/node_modules/ipaddr.js": {
++      "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.3.0.tgz",
++      "integrity": "sha512-Zv/pA+ciVFbCSBBjGfaKUya/CcGmUHzTydLMaTwrUUEM2DIEO3iZvueGxmacvmN50fGpGVKeTXpb2LcYQxeVdg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 10"
++      }
++    },
++    "node_modules/minipass": {
++      "version": "7.1.3",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
++      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
++      "license": "BlueOak-1.0.0",
++      "engines": {
++        "node": ">=16 || 14 >=14.17"
++      }
++    },
++    "node_modules/minipass-collect": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
++      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "minipass": "^3.0.0"
++      },
++      "engines": {
++        "node": ">= 8"
++      }
++    },
++    "node_modules/minipass-collect/node_modules/minipass": {
++      "version": "3.3.6",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/minipass-fetch": {
++      "version": "1.4.1",
++      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
++      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "minipass": "^3.1.0",
++        "minipass-sized": "^1.0.3",
++        "minizlib": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      },
++      "optionalDependencies": {
++        "encoding": "^0.1.12"
++      }
++    },
++    "node_modules/minipass-fetch/node_modules/minipass": {
++      "version": "3.3.6",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/minipass-flush": {
++      "version": "1.0.7",
++      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.7.tgz",
++      "integrity": "sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==",
++      "license": "BlueOak-1.0.0",
++      "optional": true,
++      "dependencies": {
++        "minipass": "^3.0.0"
++      },
++      "engines": {
++        "node": ">= 8"
++      }
++    },
++    "node_modules/minipass-flush/node_modules/minipass": {
++      "version": "3.3.6",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/minipass-pipeline": {
++      "version": "1.2.4",
++      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
++      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "minipass": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/minipass-pipeline/node_modules/minipass": {
++      "version": "3.3.6",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/minipass-sized": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
++      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "minipass": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/minipass-sized/node_modules/minipass": {
++      "version": "3.3.6",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/minizlib": {
++      "version": "2.1.2",
++      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
++      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "minipass": "^3.0.0",
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">= 8"
++      }
++    },
++    "node_modules/minizlib/node_modules/minipass": {
++      "version": "3.3.6",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/mkdirp": {
++      "version": "0.5.6",
++      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
++      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "minimist": "^1.2.6"
++      },
++      "bin": {
++        "mkdirp": "bin/cmd.js"
++      }
++    },
++    "node_modules/mkdirp-classic": {
++      "version": "0.5.3",
++      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
++      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/modern-syslog": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.2.0.tgz",
++      "integrity": "sha512-dmFE23qpyZJf8MOdzuNKliW4j1PCqxaRtSzyNnv6QDUWjf1z8T4ZoQ7Qf0t6It2ewNv9/XJZSJoUgwpq3D0X7A==",
++      "hasInstallScript": true,
++      "license": "MIT",
++      "optional": true,
++      "os": [
++        "!win32"
++      ],
++      "dependencies": {
++        "nan": "^2.13.2"
++      }
++    },
++    "node_modules/mongodb": {
++      "version": "4.17.2",
++      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.17.2.tgz",
++      "integrity": "sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "bson": "^4.7.2",
++        "mongodb-connection-string-url": "^2.6.0",
++        "socks": "^2.7.1"
++      },
++      "engines": {
++        "node": ">=12.9.0"
++      },
++      "optionalDependencies": {
++        "@aws-sdk/credential-providers": "^3.186.0",
++        "@mongodb-js/saslprep": "^1.1.0"
++      }
++    },
++    "node_modules/mongodb-connection-string-url": {
++      "version": "2.6.0",
++      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz",
++      "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@types/whatwg-url": "^8.2.1",
++        "whatwg-url": "^11.0.0"
++      }
++    },
++    "node_modules/mongodb-connection-string-url/node_modules/tr46": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
++      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "punycode": "^2.1.1"
++      },
++      "engines": {
++        "node": ">=12"
++      }
++    },
++    "node_modules/mongodb-connection-string-url/node_modules/whatwg-url": {
++      "version": "11.0.0",
++      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
++      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "tr46": "^3.0.0",
++        "webidl-conversions": "^7.0.0"
++      },
++      "engines": {
++        "node": ">=12"
++      }
++    },
++    "node_modules/mongojs": {
++      "version": "3.1.0",
++      "resolved": "https://registry.npmjs.org/mongojs/-/mongojs-3.1.0.tgz",
++      "integrity": "sha512-aXJ4xfXwx9s1cqtKTZ24PypXiWhIgvgENObQzCGbV4QBxEVedy3yuErhx6znk959cF2dOzL2ClgXJvIhfgkpIQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "each-series": "^1.0.0",
++        "mongodb": "^3.3.2",
++        "nyc": "^14.1.1",
++        "once": "^1.4.0",
++        "parse-mongo-url": "^1.1.1",
++        "readable-stream": "^3.4.0",
++        "thunky": "^1.1.0",
++        "to-mongodb-core": "^2.0.0"
++      }
++    },
++    "node_modules/mongojs/node_modules/bl": {
++      "version": "2.2.1",
++      "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
++      "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "readable-stream": "^2.3.5",
++        "safe-buffer": "^5.1.1"
++      }
++    },
++    "node_modules/mongojs/node_modules/bl/node_modules/readable-stream": {
++      "version": "2.3.8",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
++      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "core-util-is": "~1.0.0",
++        "inherits": "~2.0.3",
++        "isarray": "~1.0.0",
++        "process-nextick-args": "~2.0.0",
++        "safe-buffer": "~5.1.1",
++        "string_decoder": "~1.1.1",
++        "util-deprecate": "~1.0.1"
++      }
++    },
++    "node_modules/mongojs/node_modules/bson": {
++      "version": "1.1.6",
++      "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz",
++      "integrity": "sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=0.6.19"
++      }
++    },
++    "node_modules/mongojs/node_modules/denque": {
++      "version": "1.5.1",
++      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
++      "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10"
++      }
++    },
++    "node_modules/mongojs/node_modules/mongodb": {
++      "version": "3.7.4",
++      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.4.tgz",
++      "integrity": "sha512-K5q8aBqEXMwWdVNh94UQTwZ6BejVbFhh1uB6c5FKtPE9eUMZPUO3sRZdgIEcHSrAWmxzpG/FeODDKL388sqRmw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "bl": "^2.2.1",
++        "bson": "^1.1.4",
++        "denque": "^1.4.1",
++        "optional-require": "^1.1.8",
++        "safe-buffer": "^5.1.2"
++      },
++      "engines": {
++        "node": ">=4"
++      },
++      "optionalDependencies": {
++        "saslprep": "^1.0.0"
++      },
++      "peerDependenciesMeta": {
++        "aws4": {
++          "optional": true
++        },
++        "bson-ext": {
++          "optional": true
++        },
++        "kerberos": {
++          "optional": true
++        },
++        "mongodb-client-encryption": {
++          "optional": true
++        },
++        "mongodb-extjson": {
++          "optional": true
++        },
++        "snappy": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/mongojs/node_modules/readable-stream": {
++      "version": "3.6.2",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
++      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "inherits": "^2.0.3",
++        "string_decoder": "^1.1.1",
++        "util-deprecate": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/mongojs/node_modules/safe-buffer": {
++      "version": "5.1.2",
++      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
++      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/mongojs/node_modules/string_decoder": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
++      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "safe-buffer": "~5.1.0"
++      }
++    },
++    "node_modules/mqemitter": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/mqemitter/-/mqemitter-6.0.2.tgz",
++      "integrity": "sha512-8RGlznQx/Nb1xC3xKUFXHWov7pn7JdH++YVwlr6SLT6k3ft1h+ImGqZdVudbdKruFckIq9wheq9s4hgCivJDow==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "fastparallel": "^2.4.1",
++        "qlobber": "^8.0.1"
++      },
++      "engines": {
++        "node": ">=16"
++      }
++    },
++    "node_modules/mqemitter/node_modules/qlobber": {
++      "version": "8.0.1",
++      "resolved": "https://registry.npmjs.org/qlobber/-/qlobber-8.0.1.tgz",
++      "integrity": "sha512-O+Wd1chXj5YE1DwmD+ae0bXiSLehmnS3czlC1R9FL/Nt/3q8uMS1bIHmg2lJfCoiimCxClWM8AAuJrF0EvNiog==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 16"
++      }
++    },
++    "node_modules/mqtt-packet": {
++      "version": "9.0.2",
++      "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.2.tgz",
++      "integrity": "sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "bl": "^6.0.8",
++        "debug": "^4.3.4",
++        "process-nextick-args": "^2.0.1"
++      }
++    },
++    "node_modules/mqtt-packet/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/mqtt-packet/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/ms": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
++      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
++      "license": "MIT"
++    },
++    "node_modules/multiparty": {
++      "version": "4.2.3",
++      "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-4.2.3.tgz",
++      "integrity": "sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==",
++      "license": "MIT",
++      "dependencies": {
++        "http-errors": "~1.8.1",
++        "safe-buffer": "5.2.1",
++        "uid-safe": "2.1.5"
++      },
++      "engines": {
++        "node": ">= 0.10"
++      }
++    },
++    "node_modules/multiparty/node_modules/depd": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
++      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/multiparty/node_modules/http-errors": {
++      "version": "1.8.1",
++      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
++      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
++      "license": "MIT",
++      "dependencies": {
++        "depd": "~1.1.2",
++        "inherits": "2.0.4",
++        "setprototypeof": "1.2.0",
++        "statuses": ">= 1.5.0 < 2",
++        "toidentifier": "1.0.1"
++      },
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/multiparty/node_modules/statuses": {
++      "version": "1.5.0",
++      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
++      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/mustache": {
++      "version": "4.2.0",
++      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
++      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "mustache": "bin/mustache"
++      }
++    },
++    "node_modules/mute-stream": {
++      "version": "0.0.5",
++      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
++      "integrity": "sha512-EbrziT4s8cWPmzr47eYVW3wimS4HsvlnV5ri1xw1aR6JQo/OrJX5rkl32K/QQHdxeabJETtfeaROGhd8W7uBgg==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/mysql2": {
++      "version": "3.22.2",
++      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.22.2.tgz",
++      "integrity": "sha512-snC/L6YoCJPFpozZo3p3hiOlt9ItQ7sCnLSziFLlIttEzsPhrdcPT8g21BiQ7Oqif25W4Xq1IFuBzBvoFYDf0Q==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "aws-ssl-profiles": "^1.1.2",
++        "denque": "^2.1.0",
++        "generate-function": "^2.3.1",
++        "iconv-lite": "^0.7.2",
++        "long": "^5.3.2",
++        "lru.min": "^1.1.4",
++        "named-placeholders": "^1.1.6",
++        "sql-escaper": "^1.3.3"
++      },
++      "engines": {
++        "node": ">= 8.0"
++      },
++      "peerDependencies": {
++        "@types/node": ">= 8"
++      }
++    },
++    "node_modules/mysql2/node_modules/iconv-lite": {
++      "version": "0.7.2",
++      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
++      "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "safer-buffer": ">= 2.1.2 < 3.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      },
++      "funding": {
++        "type": "opencollective",
++        "url": "https://opencollective.com/express"
++      }
++    },
++    "node_modules/named-placeholders": {
++      "version": "1.1.6",
++      "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.6.tgz",
++      "integrity": "sha512-Tz09sEL2EEuv5fFowm419c1+a/jSMiBjI9gHxVLrVdbUkkNUUfjsVYs9pVZu5oCon/kmRh9TfLEObFtkVxmY0w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "lru.min": "^1.1.0"
++      },
++      "engines": {
++        "node": ">=8.0.0"
++      }
++    },
++    "node_modules/nan": {
++      "version": "2.26.2",
++      "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz",
++      "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/napi-build-utils": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",
++      "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/negotiator": {
++      "version": "0.6.4",
++      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
++      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/neo-async": {
++      "version": "2.6.2",
++      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
++      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
++      "license": "MIT"
++    },
++    "node_modules/nested-error-stacks": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz",
++      "integrity": "sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/nested-property": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/nested-property/-/nested-property-4.0.0.tgz",
++      "integrity": "sha512-yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/next-tick": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
++      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/no-case": {
++      "version": "3.0.4",
++      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
++      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "lower-case": "^2.0.2",
++        "tslib": "^2.0.3"
++      }
++    },
++    "node_modules/node-abi": {
++      "version": "3.89.0",
++      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.89.0.tgz",
++      "integrity": "sha512-6u9UwL0HlAl21+agMN3YAMXcKByMqwGx+pq+P76vii5f7hTPtKDp08/H9py6DY+cfDw7kQNTGEj/rly3IgbNQA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "semver": "^7.3.5"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/node-abi/node_modules/semver": {
++      "version": "7.7.4",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
++      "license": "ISC",
++      "optional": true,
++      "bin": {
++        "semver": "bin/semver.js"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/node-addon-api": {
++      "version": "1.7.2",
++      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
++      "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/node-domexception": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
++      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
++      "deprecated": "Use your platform's native DOMException instead",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/jimmywarting"
++        },
++        {
++          "type": "github",
++          "url": "https://paypal.me/jimmywarting"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=10.5.0"
++      }
++    },
++    "node_modules/node-environment-flags": {
++      "version": "1.0.6",
++      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
++      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "object.getownpropertydescriptors": "^2.0.3",
++        "semver": "^5.7.0"
++      }
++    },
++    "node_modules/node-environment-flags/node_modules/semver": {
++      "version": "5.7.2",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
++      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
++      "license": "ISC",
++      "optional": true,
++      "bin": {
++        "semver": "bin/semver"
++      }
++    },
++    "node_modules/node-fetch": {
++      "version": "3.3.2",
++      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
++      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "data-uri-to-buffer": "^4.0.0",
++        "fetch-blob": "^3.1.4",
++        "formdata-polyfill": "^4.0.10"
++      },
++      "engines": {
++        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
++      },
++      "funding": {
++        "type": "opencollective",
++        "url": "https://opencollective.com/node-fetch"
++      }
++    },
++    "node_modules/node-forge": {
++      "version": "1.4.0",
++      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz",
++      "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==",
++      "license": "(BSD-3-Clause OR GPL-2.0)",
++      "engines": {
++        "node": ">= 6.13.0"
++      }
++    },
++    "node_modules/node-gyp": {
++      "version": "8.4.1",
++      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz",
++      "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "env-paths": "^2.2.0",
++        "glob": "^7.1.4",
++        "graceful-fs": "^4.2.6",
++        "make-fetch-happen": "^9.1.0",
++        "nopt": "^5.0.0",
++        "npmlog": "^6.0.0",
++        "rimraf": "^3.0.2",
++        "semver": "^7.3.5",
++        "tar": "^6.1.2",
++        "which": "^2.0.2"
++      },
++      "bin": {
++        "node-gyp": "bin/node-gyp.js"
++      },
++      "engines": {
++        "node": ">= 10.12.0"
++      }
++    },
++    "node_modules/node-gyp-build": {
++      "version": "4.8.4",
++      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
++      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "node-gyp-build": "bin.js",
++        "node-gyp-build-optional": "optional.js",
++        "node-gyp-build-test": "build-test.js"
++      }
++    },
++    "node_modules/node-gyp/node_modules/brace-expansion": {
++      "version": "1.1.14",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "balanced-match": "^1.0.0",
++        "concat-map": "0.0.1"
++      }
++    },
++    "node_modules/node-gyp/node_modules/glob": {
++      "version": "7.2.3",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "fs.realpath": "^1.0.0",
++        "inflight": "^1.0.4",
++        "inherits": "2",
++        "minimatch": "^3.1.1",
++        "once": "^1.3.0",
++        "path-is-absolute": "^1.0.0"
++      },
++      "engines": {
++        "node": "*"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/node-gyp/node_modules/minimatch": {
++      "version": "3.1.5",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "brace-expansion": "^1.1.7"
++      },
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/node-gyp/node_modules/rimraf": {
++      "version": "3.0.2",
++      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
++      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
++      "deprecated": "Rimraf versions prior to v4 are no longer supported",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "glob": "^7.1.3"
++      },
++      "bin": {
++        "rimraf": "bin.js"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/node-gyp/node_modules/semver": {
++      "version": "7.7.4",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
++      "license": "ISC",
++      "optional": true,
++      "bin": {
++        "semver": "bin/semver.js"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/node-localstorage": {
++      "version": "2.2.1",
++      "resolved": "https://registry.npmjs.org/node-localstorage/-/node-localstorage-2.2.1.tgz",
++      "integrity": "sha512-vv8fJuOUCCvSPjDjBLlMqYMHob4aGjkmrkaE42/mZr0VT+ZAU10jRF8oTnX9+pgU9/vYJ8P7YT3Vd6ajkmzSCw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "write-file-atomic": "^1.1.4"
++      },
++      "engines": {
++        "node": ">=0.12"
++      }
++    },
++    "node_modules/node-localstorage/node_modules/write-file-atomic": {
++      "version": "1.3.4",
++      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
++      "integrity": "sha512-SdrHoC/yVBPpV0Xq/mUZQIpW2sWXAShb/V4pomcJXh92RuaO+f3UTWItiR3Px+pLnV2PvC2/bfn5cwr5X6Vfxw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "graceful-fs": "^4.1.11",
++        "imurmurhash": "^0.1.4",
++        "slide": "^1.1.5"
++      }
++    },
++    "node_modules/node-pushover": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/node-pushover/-/node-pushover-1.0.0.tgz",
++      "integrity": "sha512-yIIt6a60obTco2/Yr0/9iR4+4sDbDzlM3qpaJ99xnAwFlDeg29V5ur19D2L+S9i5LaBao5yAQKAdpvQ+7kVIng==",
++      "optional": true,
++      "dependencies": {
++        "httpreq": "*"
++      }
++    },
++    "node_modules/node-releases": {
++      "version": "2.0.38",
++      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz",
++      "integrity": "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/node-sspi": {
++      "version": "0.2.11",
++      "resolved": "https://registry.npmjs.org/node-sspi/-/node-sspi-0.2.11.tgz",
++      "integrity": "sha512-IRBX1RNe8w3/I9hvBKCKam8R4pl++NO7jh35K4NyZaJ8WaJ1AtGLVY+UXsPMSk9Wk8eeXN0PA4UDHjO0NkugKw==",
++      "hasInstallScript": true,
++      "license": "MIT",
++      "optional": true,
++      "os": [
++        "win32"
++      ],
++      "dependencies": {
++        "bindings": "^1.1.1",
++        "node-addon-api": "^1.7.1"
++      },
++      "engines": {
++        "node": ">=4.0.0"
++      }
++    },
++    "node_modules/node-uuid": {
++      "version": "1.4.8",
++      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
++      "integrity": "sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==",
++      "deprecated": "Use uuid module instead",
++      "optional": true,
++      "bin": {
++        "uuid": "bin/uuid"
++      }
++    },
++    "node_modules/node-vault": {
++      "version": "0.10.10",
++      "resolved": "https://registry.npmjs.org/node-vault/-/node-vault-0.10.10.tgz",
++      "integrity": "sha512-gag25B9pi4RpPHvadnoySfh80BkFzYo1zHFVv+wrahnLvmrnIUUevM0A+pVcAgCheJr/H1RSrxrBIwPfG3nImQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "axios": "^1.13.6",
++        "debug": "^4.3.4",
++        "mustache": "^4.2.0",
++        "tv4": "^1.3.0"
++      },
++      "engines": {
++        "node": ">= 18.0.0"
++      }
++    },
++    "node_modules/node-vault/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/node-vault/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/node-windows": {
++      "version": "0.1.14",
++      "resolved": "https://registry.npmjs.org/node-windows/-/node-windows-0.1.14.tgz",
++      "integrity": "sha512-2sz0i+ckeX/+22Z4KcDVis1ukyGOYZWx2WG9nQYauUwzIxEye5QcMrExkH7OaRSHkwM5bN/jesxsiQqkUb1O/w==",
++      "license": "MIT",
++      "optional": true,
++      "os": [
++        "win32"
++      ],
++      "dependencies": {
++        "optimist": "~0.6.0",
++        "xml": "0.0.12"
++      }
++    },
++    "node_modules/nodemailer": {
++      "version": "6.10.1",
++      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz",
++      "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==",
++      "license": "MIT-0",
++      "optional": true,
++      "engines": {
++        "node": ">=6.0.0"
++      }
++    },
++    "node_modules/nofilter": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-1.0.4.tgz",
++      "integrity": "sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/nopt": {
++      "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
++      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "abbrev": "1"
++      },
++      "bin": {
++        "nopt": "bin/nopt.js"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/normalize-package-data": {
++      "version": "2.5.0",
++      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
++      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "dependencies": {
++        "hosted-git-info": "^2.1.4",
++        "resolve": "^1.10.0",
++        "semver": "2 || 3 || 4 || 5",
++        "validate-npm-package-license": "^3.0.1"
++      }
++    },
++    "node_modules/normalize-package-data/node_modules/semver": {
++      "version": "5.7.2",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
++      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
++      "license": "ISC",
++      "optional": true,
++      "bin": {
++        "semver": "bin/semver"
++      }
++    },
++    "node_modules/normalize-path": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
++      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/npmlog": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
++      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
++      "deprecated": "This package is no longer supported.",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "are-we-there-yet": "^3.0.0",
++        "console-control-strings": "^1.1.0",
++        "gauge": "^4.0.3",
++        "set-blocking": "^2.0.0"
++      },
++      "engines": {
++        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
++      }
++    },
++    "node_modules/number-is-nan": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
++      "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/nwsapi": {
++      "version": "2.2.23",
++      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.23.tgz",
++      "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/nyc": {
++      "version": "14.1.1",
++      "resolved": "https://registry.npmjs.org/nyc/-/nyc-14.1.1.tgz",
++      "integrity": "sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "archy": "^1.0.0",
++        "caching-transform": "^3.0.2",
++        "convert-source-map": "^1.6.0",
++        "cp-file": "^6.2.0",
++        "find-cache-dir": "^2.1.0",
++        "find-up": "^3.0.0",
++        "foreground-child": "^1.5.6",
++        "glob": "^7.1.3",
++        "istanbul-lib-coverage": "^2.0.5",
++        "istanbul-lib-hook": "^2.0.7",
++        "istanbul-lib-instrument": "^3.3.0",
++        "istanbul-lib-report": "^2.0.8",
++        "istanbul-lib-source-maps": "^3.0.6",
++        "istanbul-reports": "^2.2.4",
++        "js-yaml": "^3.13.1",
++        "make-dir": "^2.1.0",
++        "merge-source-map": "^1.1.0",
++        "resolve-from": "^4.0.0",
++        "rimraf": "^2.6.3",
++        "signal-exit": "^3.0.2",
++        "spawn-wrap": "^1.4.2",
++        "test-exclude": "^5.2.3",
++        "uuid": "^3.3.2",
++        "yargs": "^13.2.2",
++        "yargs-parser": "^13.0.0"
++      },
++      "bin": {
++        "nyc": "bin/nyc.js"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/nyc/node_modules/ansi-regex": {
++      "version": "4.1.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
++      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/nyc/node_modules/ansi-styles": {
++      "version": "3.2.1",
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
++      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "color-convert": "^1.9.0"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/nyc/node_modules/brace-expansion": {
++      "version": "1.1.14",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "balanced-match": "^1.0.0",
++        "concat-map": "0.0.1"
++      }
++    },
++    "node_modules/nyc/node_modules/cliui": {
++      "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
++      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "string-width": "^3.1.0",
++        "strip-ansi": "^5.2.0",
++        "wrap-ansi": "^5.1.0"
++      }
++    },
++    "node_modules/nyc/node_modules/color-convert": {
++      "version": "1.9.3",
++      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
++      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "color-name": "1.1.3"
++      }
++    },
++    "node_modules/nyc/node_modules/color-name": {
++      "version": "1.1.3",
++      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
++      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/nyc/node_modules/convert-source-map": {
++      "version": "1.9.0",
++      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
++      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/nyc/node_modules/cross-spawn": {
++      "version": "4.0.2",
++      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
++      "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "lru-cache": "^4.0.1",
++        "which": "^1.2.9"
++      }
++    },
++    "node_modules/nyc/node_modules/emoji-regex": {
++      "version": "7.0.3",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
++      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/nyc/node_modules/foreground-child": {
++      "version": "1.5.6",
++      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz",
++      "integrity": "sha512-3TOY+4TKV0Ml83PXJQY+JFQaHNV38lzQDIzzXYg1kWdBLenGgoZhAs0CKgzI31vi2pWEpQMq/Yi4bpKwCPkw7g==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "cross-spawn": "^4",
++        "signal-exit": "^3.0.0"
++      }
++    },
++    "node_modules/nyc/node_modules/glob": {
++      "version": "7.2.3",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "fs.realpath": "^1.0.0",
++        "inflight": "^1.0.4",
++        "inherits": "2",
++        "minimatch": "^3.1.1",
++        "once": "^1.3.0",
++        "path-is-absolute": "^1.0.0"
++      },
++      "engines": {
++        "node": "*"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/nyc/node_modules/is-fullwidth-code-point": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
++      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/nyc/node_modules/lru-cache": {
++      "version": "4.1.5",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
++      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "pseudomap": "^1.0.2",
++        "yallist": "^2.1.2"
++      }
++    },
++    "node_modules/nyc/node_modules/minimatch": {
++      "version": "3.1.5",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "brace-expansion": "^1.1.7"
++      },
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/nyc/node_modules/signal-exit": {
++      "version": "3.0.7",
++      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
++      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/nyc/node_modules/string-width": {
++      "version": "3.1.0",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
++      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "emoji-regex": "^7.0.1",
++        "is-fullwidth-code-point": "^2.0.0",
++        "strip-ansi": "^5.1.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/nyc/node_modules/strip-ansi": {
++      "version": "5.2.0",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
++      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-regex": "^4.1.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/nyc/node_modules/uuid": {
++      "version": "3.4.0",
++      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
++      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
++      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "uuid": "bin/uuid"
++      }
++    },
++    "node_modules/nyc/node_modules/which": {
++      "version": "1.3.1",
++      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
++      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "isexe": "^2.0.0"
++      },
++      "bin": {
++        "which": "bin/which"
++      }
++    },
++    "node_modules/nyc/node_modules/wrap-ansi": {
++      "version": "5.1.0",
++      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
++      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-styles": "^3.2.0",
++        "string-width": "^3.0.0",
++        "strip-ansi": "^5.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/nyc/node_modules/y18n": {
++      "version": "4.0.3",
++      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
++      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/nyc/node_modules/yallist": {
++      "version": "2.1.2",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
++      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/nyc/node_modules/yargs": {
++      "version": "13.3.2",
++      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
++      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "cliui": "^5.0.0",
++        "find-up": "^3.0.0",
++        "get-caller-file": "^2.0.1",
++        "require-directory": "^2.1.1",
++        "require-main-filename": "^2.0.0",
++        "set-blocking": "^2.0.0",
++        "string-width": "^3.0.0",
++        "which-module": "^2.0.0",
++        "y18n": "^4.0.0",
++        "yargs-parser": "^13.1.2"
++      }
++    },
++    "node_modules/oauth": {
++      "version": "0.9.15",
++      "resolved": "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz",
++      "integrity": "sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/oauth-sign": {
++      "version": "0.9.0",
++      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
++      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/object-assign": {
++      "version": "4.1.1",
++      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
++      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/object-hash": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
++      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/object-inspect": {
++      "version": "1.13.4",
++      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
++      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/object-keys": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
++      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/object.assign": {
++      "version": "4.1.7",
++      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
++      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bind": "^1.0.8",
++        "call-bound": "^1.0.3",
++        "define-properties": "^1.2.1",
++        "es-object-atoms": "^1.0.0",
++        "has-symbols": "^1.1.0",
++        "object-keys": "^1.1.1"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/object.getownpropertydescriptors": {
++      "version": "2.1.9",
++      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.9.tgz",
++      "integrity": "sha512-mt8YM6XwsTTovI+kdZdHSxoyF2DI59up034orlC9NfweclcWOt7CVascNNLp6U+bjFVCVCIh9PwS76tDM/rH8g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "array.prototype.reduce": "^1.0.8",
++        "call-bind": "^1.0.8",
++        "define-properties": "^1.2.1",
++        "es-abstract": "^1.24.0",
++        "es-object-atoms": "^1.1.1",
++        "gopd": "^1.2.0",
++        "safe-array-concat": "^1.1.3"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/oidc-token-hash": {
++      "version": "5.2.0",
++      "resolved": "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.2.0.tgz",
++      "integrity": "sha512-6gj2m8cJZ+iSW8bm0FXdGF0YhIQbKrfP4yWTNzxc31U6MOjfEmB1rHvlYvxI1B7t7BCi1F2vYTT6YhtQRG4hxw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": "^10.13.0 || >=12.0.0"
++      }
++    },
++    "node_modules/on-finished": {
++      "version": "2.4.1",
++      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
++      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
++      "license": "MIT",
++      "dependencies": {
++        "ee-first": "1.1.1"
++      },
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/on-headers": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
++      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/once": {
++      "version": "1.4.0",
++      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
++      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "wrappy": "1"
++      }
++    },
++    "node_modules/one-time": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
++      "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "fn.name": "1.x.x"
++      }
++    },
++    "node_modules/onetime": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
++      "integrity": "sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/openid-client": {
++      "version": "5.7.1",
++      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.7.1.tgz",
++      "integrity": "sha512-jDBPgSVfTnkIh71Hg9pRvtJc6wTwqjRkN88+gCFtYWrlP4Yx2Dsrow8uPi3qLr/aeymPF3o2+dS+wOpglK04ew==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "jose": "^4.15.9",
++        "lru-cache": "^6.0.0",
++        "object-hash": "^2.2.0",
++        "oidc-token-hash": "^5.0.3"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/panva"
++      }
++    },
++    "node_modules/openid-client/node_modules/lru-cache": {
++      "version": "6.0.0",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
++      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/openid-client/node_modules/object-hash": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
++      "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/opentype.js": {
++      "version": "0.7.3",
++      "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-0.7.3.tgz",
++      "integrity": "sha512-Veui5vl2bLonFJ/SjX/WRWJT3SncgiZNnKUyahmXCc2sa1xXW15u3R/3TN5+JFiP7RsjK5ER4HA5eWaEmV9deA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "tiny-inflate": "^1.0.2"
++      },
++      "bin": {
++        "ot": "bin/ot"
++      }
++    },
++    "node_modules/optimist": {
++      "version": "0.6.1",
++      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
++      "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
++      "license": "MIT/X11",
++      "optional": true,
++      "dependencies": {
++        "minimist": "~0.0.1",
++        "wordwrap": "~0.0.2"
++      }
++    },
++    "node_modules/optimist/node_modules/minimist": {
++      "version": "0.0.10",
++      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
++      "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/optimist/node_modules/wordwrap": {
++      "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
++      "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.4.0"
++      }
++    },
++    "node_modules/optional-require": {
++      "version": "1.1.10",
++      "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.1.10.tgz",
++      "integrity": "sha512-0r3OB9EIQsP+a5HVATHq2ExIy2q/Vaffoo4IAikW1spCYswhLxqWQS0i3GwS3AdY/OIP4SWZHLGz8CMU558PGw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "require-at": "^1.0.6"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/os-homedir": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
++      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/otplib": {
++      "version": "12.0.1",
++      "resolved": "https://registry.npmjs.org/otplib/-/otplib-12.0.1.tgz",
++      "integrity": "sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==",
++      "license": "MIT",
++      "dependencies": {
++        "@otplib/core": "^12.0.1",
++        "@otplib/preset-default": "^12.0.1",
++        "@otplib/preset-v11": "^12.0.1"
++      }
++    },
++    "node_modules/own-keys": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
++      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "get-intrinsic": "^1.2.6",
++        "object-keys": "^1.1.1",
++        "safe-push-apply": "^1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/p-limit": {
++      "version": "3.1.0",
++      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
++      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "yocto-queue": "^0.1.0"
++      },
++      "engines": {
++        "node": ">=10"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/p-locate": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
++      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "p-limit": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/p-locate/node_modules/p-limit": {
++      "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
++      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "p-try": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/p-map": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
++      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "aggregate-error": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=10"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/p-try": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
++      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/package-hash": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-3.0.0.tgz",
++      "integrity": "sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "graceful-fs": "^4.1.15",
++        "hasha": "^3.0.0",
++        "lodash.flattendeep": "^4.4.0",
++        "release-zalgo": "^1.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/package-json-from-dist": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
++      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
++      "license": "BlueOak-1.0.0"
++    },
++    "node_modules/pako": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
++      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
++      "license": "(MIT AND Zlib)",
++      "optional": true
++    },
++    "node_modules/param-case": {
++      "version": "3.0.4",
++      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
++      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "dot-case": "^3.0.4",
++        "tslib": "^2.0.3"
++      }
++    },
++    "node_modules/parse-json": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
++      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "error-ex": "^1.3.1",
++        "json-parse-better-errors": "^1.0.1"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/parse-mongo-url": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/parse-mongo-url/-/parse-mongo-url-1.1.1.tgz",
++      "integrity": "sha512-7bZUusQIrFLwvsLHBnCz2WKYQ5LKO/LwKPnvQxbMIh9gDx8H5ZsknRmLjZdn6GVdrgVOwqDrZKsY0qDLNmRgcw==",
++      "license": "Apache 2.0",
++      "optional": true
++    },
++    "node_modules/parse-passwd": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
++      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/parse5": {
++      "version": "7.3.0",
++      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
++      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "entities": "^6.0.0"
++      },
++      "funding": {
++        "url": "https://github.com/inikulin/parse5?sponsor=1"
++      }
++    },
++    "node_modules/parse5/node_modules/entities": {
++      "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
++      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "engines": {
++        "node": ">=0.12"
++      },
++      "funding": {
++        "url": "https://github.com/fb55/entities?sponsor=1"
++      }
++    },
++    "node_modules/parseurl": {
++      "version": "1.3.3",
++      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
++      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/parsimmon": {
++      "version": "1.18.1",
++      "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-1.18.1.tgz",
++      "integrity": "sha512-u7p959wLfGAhJpSDJVYXoyMCXWYwHia78HhRBWqk7AIbxdmlrfdp5wX0l3xv/iTSH5HvhN9K7o26hwwpgS5Nmw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/pascal-case": {
++      "version": "3.1.2",
++      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
++      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "no-case": "^3.0.4",
++        "tslib": "^2.0.3"
++      }
++    },
++    "node_modules/passport": {
++      "version": "0.7.0",
++      "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
++      "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "passport-strategy": "1.x.x",
++        "pause": "0.0.1",
++        "utils-merge": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 0.4.0"
++      },
++      "funding": {
++        "type": "github",
++        "url": "https://github.com/sponsors/jaredhanson"
++      }
++    },
++    "node_modules/passport-azure-oauth2": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/passport-azure-oauth2/-/passport-azure-oauth2-0.1.0.tgz",
++      "integrity": "sha512-AoDCiGv3EDXRTArN9ZpnG+ZGnwx6shO8lU1S9x8YVQtZ3OLlbrmSWQTPOutb/Mm+MNNX6SSYKctXTX7U4nRW4g==",
++      "optional": true,
++      "dependencies": {
++        "passport-oauth": "^1.0.0"
++      }
++    },
++    "node_modules/passport-github2": {
++      "version": "0.1.12",
++      "resolved": "https://registry.npmjs.org/passport-github2/-/passport-github2-0.1.12.tgz",
++      "integrity": "sha512-3nPUCc7ttF/3HSP/k9sAXjz3SkGv5Nki84I05kSQPo01Jqq1NzJACgMblCK0fGcv9pKCG/KXU3AJRDGLqHLoIw==",
++      "optional": true,
++      "dependencies": {
++        "passport-oauth2": "1.x.x"
++      },
++      "engines": {
++        "node": ">= 0.8.0"
++      }
++    },
++    "node_modules/passport-google-oauth20": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz",
++      "integrity": "sha512-KSk6IJ15RoxuGq7D1UKK/8qKhNfzbLeLrG3gkLZ7p4A6DBCcv7xpyQwuXtWdpyR0+E0mwkpjY1VfPOhxQrKzdQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "passport-oauth2": "1.x.x"
++      },
++      "engines": {
++        "node": ">= 0.4.0"
++      }
++    },
++    "node_modules/passport-oauth": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/passport-oauth/-/passport-oauth-1.0.0.tgz",
++      "integrity": "sha512-4IZNVsZbN1dkBzmEbBqUxDG8oFOIK81jqdksE3HEb/vI3ib3FMjbiZZ6MTtooyYZzmKu0BfovjvT1pdGgIq+4Q==",
++      "optional": true,
++      "dependencies": {
++        "passport-oauth1": "1.x.x",
++        "passport-oauth2": "1.x.x"
++      },
++      "engines": {
++        "node": ">= 0.4.0"
++      }
++    },
++    "node_modules/passport-oauth1": {
++      "version": "1.3.0",
++      "resolved": "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.3.0.tgz",
++      "integrity": "sha512-8T/nX4gwKTw0PjxP1xfD0QhrydQNakzeOpZ6M5Uqdgz9/a/Ag62RmJxnZQ4LkbdXGrRehQHIAHNAu11rCP46Sw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "oauth": "0.9.x",
++        "passport-strategy": "1.x.x",
++        "utils-merge": "1.x.x"
++      },
++      "engines": {
++        "node": ">= 0.4.0"
++      },
++      "funding": {
++        "type": "github",
++        "url": "https://github.com/sponsors/jaredhanson"
++      }
++    },
++    "node_modules/passport-oauth2": {
++      "version": "1.8.0",
++      "resolved": "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.8.0.tgz",
++      "integrity": "sha512-cjsQbOrXIDE4P8nNb3FQRCCmJJ/utnFKEz2NX209f7KOHPoX18gF7gBzBbLLsj2/je4KrgiwLLGjf0lm9rtTBA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "base64url": "3.x.x",
++        "oauth": "0.10.x",
++        "passport-strategy": "1.x.x",
++        "uid2": "0.0.x",
++        "utils-merge": "1.x.x"
++      },
++      "engines": {
++        "node": ">= 0.4.0"
++      },
++      "funding": {
++        "type": "github",
++        "url": "https://github.com/sponsors/jaredhanson"
++      }
++    },
++    "node_modules/passport-oauth2/node_modules/oauth": {
++      "version": "0.10.2",
++      "resolved": "https://registry.npmjs.org/oauth/-/oauth-0.10.2.tgz",
++      "integrity": "sha512-JtFnB+8nxDEXgNyniwz573xxbKSOu3R8D40xQKqcjwJ2CDkYqUDI53o6IuzDJBx60Z8VKCm271+t8iFjakrl8Q==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/passport-saml": {
++      "version": "3.2.4",
++      "resolved": "https://registry.npmjs.org/passport-saml/-/passport-saml-3.2.4.tgz",
++      "integrity": "sha512-JSgkFXeaexLNQh1RrOvJAgjLnZzH/S3HbX/mWAk+i7aulnjqUe7WKnPl1NPnJWqP7Dqsv0I2Xm6KIFHkftk0HA==",
++      "deprecated": "For versions >= 4, please use scopped package @node-saml/passport-saml",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@xmldom/xmldom": "^0.7.6",
++        "debug": "^4.3.2",
++        "passport-strategy": "^1.0.0",
++        "xml-crypto": "^2.1.3",
++        "xml-encryption": "^2.0.0",
++        "xml2js": "^0.4.23",
++        "xmlbuilder": "^15.1.1"
++      },
++      "engines": {
++        "node": ">= 12"
++      }
++    },
++    "node_modules/passport-saml/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/passport-saml/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/passport-saml/node_modules/xml2js": {
++      "version": "0.4.23",
++      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
++      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "sax": ">=0.6.0",
++        "xmlbuilder": "~11.0.0"
++      },
++      "engines": {
++        "node": ">=4.0.0"
++      }
++    },
++    "node_modules/passport-saml/node_modules/xml2js/node_modules/xmlbuilder": {
++      "version": "11.0.1",
++      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
++      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4.0"
++      }
++    },
++    "node_modules/passport-strategy": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
++      "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4.0"
++      }
++    },
++    "node_modules/passport-twitter": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.4.tgz",
++      "integrity": "sha512-qvdauqCqCJJci82mJ9hZZQ6nAv7aSHV31svL8+9H7mRlDdXCdfU6AARQrmmJu3DRmv9fvIebM7zzxR7mVufN3A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "passport-oauth1": "1.x.x",
++        "xtraverse": "0.1.x"
++      },
++      "engines": {
++        "node": ">= 0.4.0"
++      }
++    },
++    "node_modules/path-browserify": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
++      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/path-exists": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
++      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/path-expression-matcher": {
++      "version": "1.5.0",
++      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz",
++      "integrity": "sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/NaturalIntelligence"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=14.0.0"
++      }
++    },
++    "node_modules/path-is-absolute": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
++      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/path-key": {
++      "version": "3.1.1",
++      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
++      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/path-parse": {
++      "version": "1.0.7",
++      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
++      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/path-posix": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz",
++      "integrity": "sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/path-scurry": {
++      "version": "1.11.1",
++      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
++      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
++      "license": "BlueOak-1.0.0",
++      "dependencies": {
++        "lru-cache": "^10.2.0",
++        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
++      },
++      "engines": {
++        "node": ">=16 || 14 >=14.18"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/path-to-regexp": {
++      "version": "0.1.12",
++      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
++      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
++      "license": "MIT"
++    },
++    "node_modules/path-type": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
++      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "pify": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/path-type/node_modules/pify": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
++      "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/pause": {
++      "version": "0.0.1",
++      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
++      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==",
++      "optional": true
++    },
++    "node_modules/pend": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
++      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
++      "license": "MIT"
++    },
++    "node_modules/performance-now": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
++      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/pg": {
++      "version": "8.16.3",
++      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
++      "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "pg-connection-string": "^2.9.1",
++        "pg-pool": "^3.10.1",
++        "pg-protocol": "^1.10.3",
++        "pg-types": "2.2.0",
++        "pgpass": "1.0.5"
++      },
++      "engines": {
++        "node": ">= 16.0.0"
++      },
++      "optionalDependencies": {
++        "pg-cloudflare": "^1.2.7"
++      },
++      "peerDependencies": {
++        "pg-native": ">=3.0.1"
++      },
++      "peerDependenciesMeta": {
++        "pg-native": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/pg-cloudflare": {
++      "version": "1.3.0",
++      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.3.0.tgz",
++      "integrity": "sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/pg-connection-string": {
++      "version": "2.12.0",
++      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.12.0.tgz",
++      "integrity": "sha512-U7qg+bpswf3Cs5xLzRqbXbQl85ng0mfSV/J0nnA31MCLgvEaAo7CIhmeyrmJpOr7o+zm0rXK+hNnT5l9RHkCkQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/pg-int8": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
++      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">=4.0.0"
++      }
++    },
++    "node_modules/pg-pool": {
++      "version": "3.13.0",
++      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.13.0.tgz",
++      "integrity": "sha512-gB+R+Xud1gLFuRD/QgOIgGOBE2KCQPaPwkzBBGC9oG69pHTkhQeIuejVIk3/cnDyX39av2AxomQiyPT13WKHQA==",
++      "license": "MIT",
++      "optional": true,
++      "peerDependencies": {
++        "pg": ">=8.0"
++      }
++    },
++    "node_modules/pg-protocol": {
++      "version": "1.13.0",
++      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.13.0.tgz",
++      "integrity": "sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/pg-types": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
++      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "pg-int8": "1.0.1",
++        "postgres-array": "~2.0.0",
++        "postgres-bytea": "~1.0.0",
++        "postgres-date": "~1.0.4",
++        "postgres-interval": "^1.1.0"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/pgpass": {
++      "version": "1.0.5",
++      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
++      "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "split2": "^4.1.0"
++      }
++    },
++    "node_modules/picocolors": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
++      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/picomatch": {
++      "version": "2.3.2",
++      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
++      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=8.6"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/jonschlinkert"
++      }
++    },
++    "node_modules/pify": {
++      "version": "4.0.1",
++      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
++      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/pirates": {
++      "version": "4.0.7",
++      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
++      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/pkg-dir": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
++      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "find-up": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/plivo": {
++      "version": "4.76.2",
++      "resolved": "https://registry.npmjs.org/plivo/-/plivo-4.76.2.tgz",
++      "integrity": "sha512-W8bfvPKng/krEUYi7Gh2Pib7soYZm6TkiHcbKm2hRQVRkvek/FYRek+7Nb2FJ/vT6p/S8F3BKbrHjnkeT5XEJg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/node": "^14.14.14",
++        "axios": "^1.8.3",
++        "base-64": "^0.1.0",
++        "build-url": "^1.0.10",
++        "form-data": "^4.0.0",
++        "https-proxy-agent": "^5.0.0",
++        "joi": "^17.9.2",
++        "jsonwebtoken": "^9.0.0",
++        "lodash": "^4.17.4",
++        "querystring": "^0.2.0",
++        "request": "^2.88.2",
++        "uri-parser": "^1.0.0",
++        "utf8": "^2.1.2",
++        "xml2js": "^0.5.0",
++        "xmlbuilder": "^9.0.1"
++      }
++    },
++    "node_modules/plivo/node_modules/@types/node": {
++      "version": "14.18.63",
++      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
++      "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/plivo/node_modules/agent-base": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
++      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6.0.0"
++      }
++    },
++    "node_modules/plivo/node_modules/base-64": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
++      "integrity": "sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==",
++      "optional": true
++    },
++    "node_modules/plivo/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/plivo/node_modules/https-proxy-agent": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
++      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "agent-base": "6",
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/plivo/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/plivo/node_modules/xml2js": {
++      "version": "0.5.0",
++      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
++      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "sax": ">=0.6.0",
++        "xmlbuilder": "~11.0.0"
++      },
++      "engines": {
++        "node": ">=4.0.0"
++      }
++    },
++    "node_modules/plivo/node_modules/xml2js/node_modules/xmlbuilder": {
++      "version": "11.0.1",
++      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
++      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4.0"
++      }
++    },
++    "node_modules/plivo/node_modules/xmlbuilder": {
++      "version": "9.0.7",
++      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
++      "integrity": "sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4.0"
++      }
++    },
++    "node_modules/possible-typed-array-names": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
++      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/postgres-array": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
++      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/postgres-bytea": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.1.tgz",
++      "integrity": "sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/postgres-date": {
++      "version": "1.0.7",
++      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
++      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/postgres-interval": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
++      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "xtend": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/prebuild-install": {
++      "version": "7.1.3",
++      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
++      "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
++      "deprecated": "No longer maintained. Please contact the author of the relevant native addon; alternatives are available.",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "detect-libc": "^2.0.0",
++        "expand-template": "^2.0.3",
++        "github-from-package": "0.0.0",
++        "minimist": "^1.2.3",
++        "mkdirp-classic": "^0.5.3",
++        "napi-build-utils": "^2.0.0",
++        "node-abi": "^3.3.0",
++        "pump": "^3.0.0",
++        "rc": "^1.2.7",
++        "simple-get": "^4.0.0",
++        "tar-fs": "^2.0.0",
++        "tunnel-agent": "^0.6.0"
++      },
++      "bin": {
++        "prebuild-install": "bin.js"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/precond": {
++      "version": "0.2.3",
++      "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz",
++      "integrity": "sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ==",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/process": {
++      "version": "0.11.10",
++      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
++      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6.0"
++      }
++    },
++    "node_modules/process-nextick-args": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
++      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
++      "license": "MIT"
++    },
++    "node_modules/prom-client": {
++      "version": "15.1.3",
++      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-15.1.3.tgz",
++      "integrity": "sha512-6ZiOBfCywsD4k1BN9IX0uZhF+tJkV8q8llP64G5Hajs4JOeVLPCwpPVcpXy3BwYiUGgyJzsJJQeOIv7+hDSq8g==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "@opentelemetry/api": "^1.4.0",
++        "tdigest": "^0.1.1"
++      },
++      "engines": {
++        "node": "^16 || ^18 || >=20"
++      }
++    },
++    "node_modules/promise-inflight": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
++      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/promise-retry": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
++      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "err-code": "^2.0.2",
++        "retry": "^0.12.0"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/promise-retry/node_modules/retry": {
++      "version": "0.12.0",
++      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
++      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 4"
++      }
++    },
++    "node_modules/proto3-json-serializer": {
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-2.0.2.tgz",
++      "integrity": "sha512-SAzp/O4Yh02jGdRc+uIrGoe87dkN/XtwxfZ4ZyafJHymd79ozp5VG5nyZ7ygqPM5+cpLDjjGnYFUkngonyDPOQ==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "protobufjs": "^7.2.5"
++      },
++      "engines": {
++        "node": ">=14.0.0"
++      }
++    },
++    "node_modules/protobufjs": {
++      "version": "7.5.5",
++      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.5.tgz",
++      "integrity": "sha512-3wY1AxV+VBNW8Yypfd1yQY9pXnqTAN+KwQxL8iYm3/BjKYMNg4i0owhEe26PWDOMaIrzeeF98Lqd5NGz4omiIg==",
++      "hasInstallScript": true,
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "@protobufjs/aspromise": "^1.1.2",
++        "@protobufjs/base64": "^1.1.2",
++        "@protobufjs/codegen": "^2.0.4",
++        "@protobufjs/eventemitter": "^1.1.0",
++        "@protobufjs/fetch": "^1.1.0",
++        "@protobufjs/float": "^1.0.2",
++        "@protobufjs/inquire": "^1.1.0",
++        "@protobufjs/path": "^1.1.2",
++        "@protobufjs/pool": "^1.1.0",
++        "@protobufjs/utf8": "^1.1.0",
++        "@types/node": ">=13.7.0",
++        "long": "^5.0.0"
++      },
++      "engines": {
++        "node": ">=12.0.0"
++      }
++    },
++    "node_modules/proxy-addr": {
++      "version": "2.0.7",
++      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
++      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
++      "license": "MIT",
++      "dependencies": {
++        "forwarded": "0.2.0",
++        "ipaddr.js": "1.9.1"
++      },
++      "engines": {
++        "node": ">= 0.10"
++      }
++    },
++    "node_modules/proxy-from-env": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
++      "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/pseudomap": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
++      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/psl": {
++      "version": "1.15.0",
++      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
++      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "punycode": "^2.3.1"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/lupomontero"
++      }
++    },
++    "node_modules/pump": {
++      "version": "3.0.4",
++      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
++      "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "end-of-stream": "^1.1.0",
++        "once": "^1.3.1"
++      }
++    },
++    "node_modules/punycode": {
++      "version": "2.3.1",
++      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
++      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/qlobber": {
++      "version": "7.0.1",
++      "resolved": "https://registry.npmjs.org/qlobber/-/qlobber-7.0.1.tgz",
++      "integrity": "sha512-FsFg9lMuMEFNKmTO9nV7tlyPhx8BmskPPjH2akWycuYVTtWaVwhW5yCHLJQ6Q+3mvw5cFX2vMfW2l9z2SiYAbg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 14"
++      }
++    },
++    "node_modules/qs": {
++      "version": "6.14.2",
++      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
++      "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
++      "license": "BSD-3-Clause",
++      "dependencies": {
++        "side-channel": "^1.1.0"
++      },
++      "engines": {
++        "node": ">=0.6"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/query-string": {
++      "version": "7.1.3",
++      "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz",
++      "integrity": "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "decode-uri-component": "^0.2.2",
++        "filter-obj": "^1.1.0",
++        "split-on-first": "^1.0.0",
++        "strict-uri-encode": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/querystring": {
++      "version": "0.2.1",
++      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
++      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
++      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.4.x"
++      }
++    },
++    "node_modules/querystringify": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
++      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/random-bytes": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
++      "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/range-parser": {
++      "version": "1.2.1",
++      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
++      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.6"
++      }
++    },
++    "node_modules/raw-body": {
++      "version": "2.5.3",
++      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz",
++      "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==",
++      "license": "MIT",
++      "dependencies": {
++        "bytes": "~3.1.2",
++        "http-errors": "~2.0.1",
++        "iconv-lite": "~0.4.24",
++        "unpipe": "~1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/rc": {
++      "version": "1.2.8",
++      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
++      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
++      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
++      "optional": true,
++      "dependencies": {
++        "deep-extend": "^0.6.0",
++        "ini": "~1.3.0",
++        "minimist": "^1.2.0",
++        "strip-json-comments": "~2.0.1"
++      },
++      "bin": {
++        "rc": "cli.js"
++      }
++    },
++    "node_modules/read-pkg": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
++      "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "load-json-file": "^4.0.0",
++        "normalize-package-data": "^2.3.2",
++        "path-type": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/read-pkg-up": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
++      "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "find-up": "^3.0.0",
++        "read-pkg": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/readable-stream": {
++      "version": "4.7.0",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
++      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
++      "license": "MIT",
++      "dependencies": {
++        "abort-controller": "^3.0.0",
++        "buffer": "^6.0.3",
++        "events": "^3.3.0",
++        "process": "^0.11.10",
++        "string_decoder": "^1.3.0"
++      },
++      "engines": {
++        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
++      }
++    },
++    "node_modules/readdir-glob": {
++      "version": "1.1.3",
++      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
++      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
++      "license": "Apache-2.0",
++      "dependencies": {
++        "minimatch": "^5.1.0"
++      }
++    },
++    "node_modules/readdir-glob/node_modules/minimatch": {
++      "version": "5.1.9",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
++      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
++      "license": "ISC",
++      "dependencies": {
++        "brace-expansion": "^2.0.1"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/readdirp": {
++      "version": "3.6.0",
++      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
++      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "picomatch": "^2.2.1"
++      },
++      "engines": {
++        "node": ">=8.10.0"
++      }
++    },
++    "node_modules/readline2": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
++      "integrity": "sha512-8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "code-point-at": "^1.0.0",
++        "is-fullwidth-code-point": "^1.0.0",
++        "mute-stream": "0.0.5"
++      }
++    },
++    "node_modules/readline2/node_modules/is-fullwidth-code-point": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
++      "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "number-is-nan": "^1.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/real-cancellable-promise": {
++      "version": "1.2.3",
++      "resolved": "https://registry.npmjs.org/real-cancellable-promise/-/real-cancellable-promise-1.2.3.tgz",
++      "integrity": "sha512-hBI5Gy/55VEeeMtImMgEirD7eq5UmqJf1J8dFZtbJZA/3rB0pYFZ7PayMGueb6v4UtUtpKpP+05L0VwyE1hI9Q==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/reflect.getprototypeof": {
++      "version": "1.0.10",
++      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
++      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bind": "^1.0.8",
++        "define-properties": "^1.2.1",
++        "es-abstract": "^1.23.9",
++        "es-errors": "^1.3.0",
++        "es-object-atoms": "^1.0.0",
++        "get-intrinsic": "^1.2.7",
++        "get-proto": "^1.0.1",
++        "which-builtin-type": "^1.2.1"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/regenerator-runtime": {
++      "version": "0.14.1",
++      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
++      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/regexp.prototype.flags": {
++      "version": "1.5.4",
++      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
++      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bind": "^1.0.8",
++        "define-properties": "^1.2.1",
++        "es-errors": "^1.3.0",
++        "get-proto": "^1.0.1",
++        "gopd": "^1.2.0",
++        "set-function-name": "^2.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/relateurl": {
++      "version": "0.2.7",
++      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
++      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.10"
++      }
++    },
++    "node_modules/release-zalgo": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
++      "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "es6-error": "^4.0.1"
++      },
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/request": {
++      "version": "2.88.2",
++      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
++      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
++      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "aws-sign2": "~0.7.0",
++        "aws4": "^1.8.0",
++        "caseless": "~0.12.0",
++        "combined-stream": "~1.0.6",
++        "extend": "~3.0.2",
++        "forever-agent": "~0.6.1",
++        "form-data": "~2.3.2",
++        "har-validator": "~5.1.3",
++        "http-signature": "~1.2.0",
++        "is-typedarray": "~1.0.0",
++        "isstream": "~0.1.2",
++        "json-stringify-safe": "~5.0.1",
++        "mime-types": "~2.1.19",
++        "oauth-sign": "~0.9.0",
++        "performance-now": "^2.1.0",
++        "qs": "~6.5.2",
++        "safe-buffer": "^5.1.2",
++        "tough-cookie": "~2.5.0",
++        "tunnel-agent": "^0.6.0",
++        "uuid": "^3.3.2"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/request/node_modules/form-data": {
++      "version": "2.3.3",
++      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
++      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "asynckit": "^0.4.0",
++        "combined-stream": "^1.0.6",
++        "mime-types": "^2.1.12"
++      },
++      "engines": {
++        "node": ">= 0.12"
++      }
++    },
++    "node_modules/request/node_modules/qs": {
++      "version": "6.5.5",
++      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.5.tgz",
++      "integrity": "sha512-mzR4sElr1bfCaPJe7m8ilJ6ZXdDaGoObcYR0ZHSsktM/Lt21MVHj5De30GQH2eiZ1qGRTO7LCAzQsUeXTNexWQ==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "engines": {
++        "node": ">=0.6"
++      }
++    },
++    "node_modules/request/node_modules/tough-cookie": {
++      "version": "2.5.0",
++      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
++      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "psl": "^1.1.28",
++        "punycode": "^2.1.1"
++      },
++      "engines": {
++        "node": ">=0.8"
++      }
++    },
++    "node_modules/request/node_modules/uuid": {
++      "version": "3.4.0",
++      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
++      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
++      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "uuid": "bin/uuid"
++      }
++    },
++    "node_modules/require-at": {
++      "version": "1.0.6",
++      "resolved": "https://registry.npmjs.org/require-at/-/require-at-1.0.6.tgz",
++      "integrity": "sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/require-directory": {
++      "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
++      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/require-main-filename": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
++      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/requires-port": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
++      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/resolve": {
++      "version": "1.22.12",
++      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
++      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "es-errors": "^1.3.0",
++        "is-core-module": "^2.16.1",
++        "path-parse": "^1.0.7",
++        "supports-preserve-symlinks-flag": "^1.0.0"
++      },
++      "bin": {
++        "resolve": "bin/resolve"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/resolve-from": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
++      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/restore-cursor": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
++      "integrity": "sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "exit-hook": "^1.0.0",
++        "onetime": "^1.0.0"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/retimer": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/retimer/-/retimer-4.0.0.tgz",
++      "integrity": "sha512-fZIVtvbOsQsxNSDhpdPOX4lx5Ss2ni+S72AUBitARpFhtA3UzrAjQ6gDtypB2/+l7L+1VQgAgpvAKY66mElH0w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "worker-timers": "^7.0.75"
++      }
++    },
++    "node_modules/retry": {
++      "version": "0.13.1",
++      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
++      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 4"
++      }
++    },
++    "node_modules/retry-request": {
++      "version": "7.0.2",
++      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz",
++      "integrity": "sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@types/request": "^2.48.8",
++        "extend": "^3.0.2",
++        "teeny-request": "^9.0.0"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/reusify": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
++      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "iojs": ">=1.0.0",
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/rimraf": {
++      "version": "2.7.1",
++      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
++      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
++      "deprecated": "Rimraf versions prior to v4 are no longer supported",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "glob": "^7.1.3"
++      },
++      "bin": {
++        "rimraf": "bin.js"
++      }
++    },
++    "node_modules/rimraf/node_modules/brace-expansion": {
++      "version": "1.1.14",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "balanced-match": "^1.0.0",
++        "concat-map": "0.0.1"
++      }
++    },
++    "node_modules/rimraf/node_modules/glob": {
++      "version": "7.2.3",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "fs.realpath": "^1.0.0",
++        "inflight": "^1.0.4",
++        "inherits": "2",
++        "minimatch": "^3.1.1",
++        "once": "^1.3.0",
++        "path-is-absolute": "^1.0.0"
++      },
++      "engines": {
++        "node": "*"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/rimraf/node_modules/minimatch": {
++      "version": "3.1.5",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "brace-expansion": "^1.1.7"
++      },
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/rrweb-cssom": {
++      "version": "0.6.0",
++      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
++      "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/run-async": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
++      "integrity": "sha512-qOX+w+IxFgpUpJfkv2oGN0+ExPs68F4sZHfaRRx4dDexAQkG83atugKVEylyT5ARees3HBbfmuvnjbrd8j9Wjw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "once": "^1.3.0"
++      }
++    },
++    "node_modules/rx-lite": {
++      "version": "3.1.2",
++      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
++      "integrity": "sha512-1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ==",
++      "optional": true
++    },
++    "node_modules/rxjs": {
++      "version": "7.8.2",
++      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
++      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "tslib": "^2.1.0"
++      }
++    },
++    "node_modules/safe-array-concat": {
++      "version": "1.1.4",
++      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.4.tgz",
++      "integrity": "sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bind": "^1.0.9",
++        "call-bound": "^1.0.4",
++        "get-intrinsic": "^1.3.0",
++        "has-symbols": "^1.1.0",
++        "isarray": "^2.0.5"
++      },
++      "engines": {
++        "node": ">=0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/safe-array-concat/node_modules/isarray": {
++      "version": "2.0.5",
++      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
++      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/safe-buffer": {
++      "version": "5.2.1",
++      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
++      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/feross"
++        },
++        {
++          "type": "patreon",
++          "url": "https://www.patreon.com/feross"
++        },
++        {
++          "type": "consulting",
++          "url": "https://feross.org/support"
++        }
++      ],
++      "license": "MIT"
++    },
++    "node_modules/safe-push-apply": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
++      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "es-errors": "^1.3.0",
++        "isarray": "^2.0.5"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/safe-push-apply/node_modules/isarray": {
++      "version": "2.0.5",
++      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
++      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/safe-regex-test": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
++      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
++      "license": "MIT",
++      "dependencies": {
++        "call-bound": "^1.0.2",
++        "es-errors": "^1.3.0",
++        "is-regex": "^1.2.1"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/safe-stable-stringify": {
++      "version": "2.5.0",
++      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
++      "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/safer-buffer": {
++      "version": "2.1.2",
++      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
++      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
++      "license": "MIT"
++    },
++    "node_modules/sasl-anonymous": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/sasl-anonymous/-/sasl-anonymous-0.1.0.tgz",
++      "integrity": "sha512-x+0sdsV0Gie2EexxAUsx6ZoB+X6OCthlNBvAQncQxreEWQJByAPntj0EAgTlJc2kZicoc+yFzeR6cl8VfsQGfA==",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4.0"
++      }
++    },
++    "node_modules/sasl-plain": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/sasl-plain/-/sasl-plain-0.1.0.tgz",
++      "integrity": "sha512-X8mCSfR8y0NryTu0tuVyr4IS2jBunBgyG+3a0gEEkd0nlHGiyqJhlc4EIkzmSwaa7F8S4yo+LS6Cu5qxRkJrmg==",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4.0"
++      }
++    },
++    "node_modules/sasl-scram-sha-1": {
++      "version": "1.4.0",
++      "resolved": "https://registry.npmjs.org/sasl-scram-sha-1/-/sasl-scram-sha-1-1.4.0.tgz",
++      "integrity": "sha512-kdP8uAFkak8flnmKTldWnQ98IuC15ASdKxNHWwbqexRj7szHs7y+JEtigLkPoq9gnp/SAxxU4O2huL8OLqSr9w==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/saslmechanisms": {
++      "version": "0.1.1",
++      "resolved": "https://registry.npmjs.org/saslmechanisms/-/saslmechanisms-0.1.1.tgz",
++      "integrity": "sha512-pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg==",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4.0"
++      }
++    },
++    "node_modules/saslprep": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz",
++      "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "sparse-bitfield": "^3.0.3"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/sax": {
++      "version": "1.6.0",
++      "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
++      "integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
++      "license": "BlueOak-1.0.0",
++      "optional": true,
++      "engines": {
++        "node": ">=11.0.0"
++      }
++    },
++    "node_modules/saxes": {
++      "version": "6.0.0",
++      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
++      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "xmlchars": "^2.2.0"
++      },
++      "engines": {
++        "node": ">=v12.22.7"
++      }
++    },
++    "node_modules/scmp": {
++      "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/scmp/-/scmp-2.1.0.tgz",
++      "integrity": "sha512-o/mRQGk9Rcer/jEEw/yw4mwo3EU/NvYvp577/Btqrym9Qy5/MdWGBqipbALgd2lrdWTJ5/gqDusxfnQBxOxT2Q==",
++      "deprecated": "Just use Node.js's crypto.timingSafeEqual()",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/semver": {
++      "version": "6.3.1",
++      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
++      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
++      "license": "ISC",
++      "optional": true,
++      "bin": {
++        "semver": "bin/semver.js"
++      }
++    },
++    "node_modules/send": {
++      "version": "0.19.2",
++      "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz",
++      "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==",
++      "license": "MIT",
++      "dependencies": {
++        "debug": "2.6.9",
++        "depd": "2.0.0",
++        "destroy": "1.2.0",
++        "encodeurl": "~2.0.0",
++        "escape-html": "~1.0.3",
++        "etag": "~1.8.1",
++        "fresh": "~0.5.2",
++        "http-errors": "~2.0.1",
++        "mime": "1.6.0",
++        "ms": "2.1.3",
++        "on-finished": "~2.4.1",
++        "range-parser": "~1.2.1",
++        "statuses": "~2.0.2"
++      },
++      "engines": {
++        "node": ">= 0.8.0"
++      }
++    },
++    "node_modules/send/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT"
++    },
++    "node_modules/serve-static": {
++      "version": "1.16.3",
++      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz",
++      "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==",
++      "license": "MIT",
++      "dependencies": {
++        "encodeurl": "~2.0.0",
++        "escape-html": "~1.0.3",
++        "parseurl": "~1.3.3",
++        "send": "~0.19.1"
++      },
++      "engines": {
++        "node": ">= 0.8.0"
++      }
++    },
++    "node_modules/set-blocking": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
++      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/set-function-length": {
++      "version": "1.2.2",
++      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
++      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
++      "license": "MIT",
++      "dependencies": {
++        "define-data-property": "^1.1.4",
++        "es-errors": "^1.3.0",
++        "function-bind": "^1.1.2",
++        "get-intrinsic": "^1.2.4",
++        "gopd": "^1.0.1",
++        "has-property-descriptors": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/set-function-name": {
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
++      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "define-data-property": "^1.1.4",
++        "es-errors": "^1.3.0",
++        "functions-have-names": "^1.2.3",
++        "has-property-descriptors": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/set-proto": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
++      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "dunder-proto": "^1.0.1",
++        "es-errors": "^1.3.0",
++        "es-object-atoms": "^1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/setprototypeof": {
++      "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
++      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
++      "license": "ISC"
++    },
++    "node_modules/shallow-clone": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
++      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "kind-of": "^6.0.2"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/shebang-command": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
++      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
++      "license": "MIT",
++      "dependencies": {
++        "shebang-regex": "^3.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/shebang-regex": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
++      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/side-channel": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
++      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
++      "license": "MIT",
++      "dependencies": {
++        "es-errors": "^1.3.0",
++        "object-inspect": "^1.13.3",
++        "side-channel-list": "^1.0.0",
++        "side-channel-map": "^1.0.1",
++        "side-channel-weakmap": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/side-channel-list": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
++      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
++      "license": "MIT",
++      "dependencies": {
++        "es-errors": "^1.3.0",
++        "object-inspect": "^1.13.3"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/side-channel-map": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
++      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
++      "license": "MIT",
++      "dependencies": {
++        "call-bound": "^1.0.2",
++        "es-errors": "^1.3.0",
++        "get-intrinsic": "^1.2.5",
++        "object-inspect": "^1.13.3"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/side-channel-weakmap": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
++      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
++      "license": "MIT",
++      "dependencies": {
++        "call-bound": "^1.0.2",
++        "es-errors": "^1.3.0",
++        "get-intrinsic": "^1.2.5",
++        "object-inspect": "^1.13.3",
++        "side-channel-map": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/signal-exit": {
++      "version": "4.1.0",
++      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
++      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
++      "license": "ISC",
++      "engines": {
++        "node": ">=14"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/simple-concat": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
++      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/feross"
++        },
++        {
++          "type": "patreon",
++          "url": "https://www.patreon.com/feross"
++        },
++        {
++          "type": "consulting",
++          "url": "https://feross.org/support"
++        }
++      ],
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/simple-get": {
++      "version": "4.0.1",
++      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
++      "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/feross"
++        },
++        {
++          "type": "patreon",
++          "url": "https://www.patreon.com/feross"
++        },
++        {
++          "type": "consulting",
++          "url": "https://feross.org/support"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "decompress-response": "^6.0.0",
++        "once": "^1.3.1",
++        "simple-concat": "^1.0.0"
++      }
++    },
++    "node_modules/slash": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
++      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/slide": {
++      "version": "1.1.6",
++      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
++      "integrity": "sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/smart-buffer": {
++      "version": "4.2.0",
++      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
++      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 6.0.0",
++        "npm": ">= 3.0.0"
++      }
++    },
++    "node_modules/sntp": {
++      "version": "0.2.4",
++      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
++      "integrity": "sha512-bDLrKa/ywz65gCl+LmOiIhteP1bhEsAAzhfMedPoiHP3dyYnAevlaJshdqb9Yu0sRifyP/fRqSt8t+5qGIWlGQ==",
++      "deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
++      "optional": true,
++      "dependencies": {
++        "hoek": "0.9.x"
++      },
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
++    "node_modules/socks": {
++      "version": "2.8.7",
++      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
++      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ip-address": "^10.0.1",
++        "smart-buffer": "^4.2.0"
++      },
++      "engines": {
++        "node": ">= 10.0.0",
++        "npm": ">= 3.0.0"
++      }
++    },
++    "node_modules/socks-proxy-agent": {
++      "version": "6.2.1",
++      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
++      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "agent-base": "^6.0.2",
++        "debug": "^4.3.3",
++        "socks": "^2.6.2"
++      },
++      "engines": {
++        "node": ">= 10"
++      }
++    },
++    "node_modules/socks-proxy-agent/node_modules/agent-base": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
++      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6.0.0"
++      }
++    },
++    "node_modules/socks-proxy-agent/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/socks-proxy-agent/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/socks/node_modules/ip-address": {
++      "version": "10.1.0",
++      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
++      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 12"
++      }
++    },
++    "node_modules/source-map": {
++      "version": "0.6.1",
++      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
++      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
++      "license": "BSD-3-Clause",
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/source-map-support": {
++      "version": "0.5.21",
++      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
++      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "buffer-from": "^1.0.0",
++        "source-map": "^0.6.0"
++      }
++    },
++    "node_modules/sparse-bitfield": {
++      "version": "3.0.3",
++      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
++      "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "memory-pager": "^1.0.2"
++      }
++    },
++    "node_modules/spawn-wrap": {
++      "version": "1.4.3",
++      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.3.tgz",
++      "integrity": "sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "foreground-child": "^1.5.6",
++        "mkdirp": "^0.5.0",
++        "os-homedir": "^1.0.1",
++        "rimraf": "^2.6.2",
++        "signal-exit": "^3.0.2",
++        "which": "^1.3.0"
++      }
++    },
++    "node_modules/spawn-wrap/node_modules/cross-spawn": {
++      "version": "4.0.2",
++      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
++      "integrity": "sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "lru-cache": "^4.0.1",
++        "which": "^1.2.9"
++      }
++    },
++    "node_modules/spawn-wrap/node_modules/foreground-child": {
++      "version": "1.5.6",
++      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz",
++      "integrity": "sha512-3TOY+4TKV0Ml83PXJQY+JFQaHNV38lzQDIzzXYg1kWdBLenGgoZhAs0CKgzI31vi2pWEpQMq/Yi4bpKwCPkw7g==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "cross-spawn": "^4",
++        "signal-exit": "^3.0.0"
++      }
++    },
++    "node_modules/spawn-wrap/node_modules/lru-cache": {
++      "version": "4.1.5",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
++      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "pseudomap": "^1.0.2",
++        "yallist": "^2.1.2"
++      }
++    },
++    "node_modules/spawn-wrap/node_modules/signal-exit": {
++      "version": "3.0.7",
++      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
++      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/spawn-wrap/node_modules/which": {
++      "version": "1.3.1",
++      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
++      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "isexe": "^2.0.0"
++      },
++      "bin": {
++        "which": "bin/which"
++      }
++    },
++    "node_modules/spawn-wrap/node_modules/yallist": {
++      "version": "2.1.2",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
++      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/spdx-correct": {
++      "version": "3.2.0",
++      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
++      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "spdx-expression-parse": "^3.0.0",
++        "spdx-license-ids": "^3.0.0"
++      }
++    },
++    "node_modules/spdx-exceptions": {
++      "version": "2.5.0",
++      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
++      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
++      "license": "CC-BY-3.0",
++      "optional": true
++    },
++    "node_modules/spdx-expression-parse": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
++      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "spdx-exceptions": "^2.1.0",
++        "spdx-license-ids": "^3.0.0"
++      }
++    },
++    "node_modules/spdx-license-ids": {
++      "version": "3.0.23",
++      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz",
++      "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==",
++      "license": "CC0-1.0",
++      "optional": true
++    },
++    "node_modules/split-on-first": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
++      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/split2": {
++      "version": "4.2.0",
++      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
++      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">= 10.x"
++      }
++    },
++    "node_modules/sprintf-js": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
++      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/sql-escaper": {
++      "version": "1.3.3",
++      "resolved": "https://registry.npmjs.org/sql-escaper/-/sql-escaper-1.3.3.tgz",
++      "integrity": "sha512-BsTCV265VpTp8tm1wyIm1xqQCS+Q9NHx2Sr+WcnUrgLrQ6yiDIvHYJV5gHxsj1lMBy2zm5twLaZao8Jd+S8JJw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "bun": ">=1.0.0",
++        "deno": ">=2.0.0",
++        "node": ">=12.0.0"
++      },
++      "funding": {
++        "type": "github",
++        "url": "https://github.com/mysqljs/sql-escaper?sponsor=1"
++      }
++    },
++    "node_modules/sqlite3": {
++      "version": "5.1.7",
++      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.7.tgz",
++      "integrity": "sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==",
++      "hasInstallScript": true,
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "bindings": "^1.5.0",
++        "node-addon-api": "^7.0.0",
++        "prebuild-install": "^7.1.1",
++        "tar": "^6.1.11"
++      },
++      "optionalDependencies": {
++        "node-gyp": "8.x"
++      },
++      "peerDependencies": {
++        "node-gyp": "8.x"
++      },
++      "peerDependenciesMeta": {
++        "node-gyp": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/sqlite3/node_modules/node-addon-api": {
++      "version": "7.1.1",
++      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
++      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/ssh2": {
++      "version": "1.17.0",
++      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.17.0.tgz",
++      "integrity": "sha512-wPldCk3asibAjQ/kziWQQt1Wh3PgDFpC0XpwclzKcdT1vql6KeYxf5LIt4nlFkUeR8WuphYMKqUA56X4rjbfgQ==",
++      "hasInstallScript": true,
++      "optional": true,
++      "dependencies": {
++        "asn1": "^0.2.6",
++        "bcrypt-pbkdf": "^1.0.2"
++      },
++      "engines": {
++        "node": ">=10.16.0"
++      },
++      "optionalDependencies": {
++        "cpu-features": "~0.0.10",
++        "nan": "^2.23.0"
++      }
++    },
++    "node_modules/sshpk": {
++      "version": "1.18.0",
++      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
++      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "asn1": "~0.2.3",
++        "assert-plus": "^1.0.0",
++        "bcrypt-pbkdf": "^1.0.0",
++        "dashdash": "^1.12.0",
++        "ecc-jsbn": "~0.1.1",
++        "getpass": "^0.1.1",
++        "jsbn": "~0.1.0",
++        "safer-buffer": "^2.0.2",
++        "tweetnacl": "~0.14.0"
++      },
++      "bin": {
++        "sshpk-conv": "bin/sshpk-conv",
++        "sshpk-sign": "bin/sshpk-sign",
++        "sshpk-verify": "bin/sshpk-verify"
++      },
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/sshpk/node_modules/jsbn": {
++      "version": "0.1.1",
++      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
++      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/ssri": {
++      "version": "8.0.1",
++      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
++      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "minipass": "^3.1.1"
++      },
++      "engines": {
++        "node": ">= 8"
++      }
++    },
++    "node_modules/ssri/node_modules/minipass": {
++      "version": "3.3.6",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/stack-trace": {
++      "version": "0.0.10",
++      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
++      "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/statuses": {
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
++      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
++      "license": "MIT",
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/stop-iteration-iterator": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
++      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "es-errors": "^1.3.0",
++        "internal-slot": "^1.1.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      }
++    },
++    "node_modules/store2": {
++      "version": "2.14.4",
++      "resolved": "https://registry.npmjs.org/store2/-/store2-2.14.4.tgz",
++      "integrity": "sha512-srTItn1GOvyvOycgxjAnPA63FZNwy0PTyUBFMHRM+hVFltAeoh0LmNBz9SZqUS9mMqGk8rfyWyXn3GH5ReJ8Zw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/stream-chain": {
++      "version": "2.2.5",
++      "resolved": "https://registry.npmjs.org/stream-chain/-/stream-chain-2.2.5.tgz",
++      "integrity": "sha512-1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA==",
++      "license": "BSD-3-Clause",
++      "optional": true
++    },
++    "node_modules/stream-events": {
++      "version": "1.0.5",
++      "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
++      "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "stubs": "^3.0.0"
++      }
++    },
++    "node_modules/stream-json": {
++      "version": "1.9.1",
++      "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-1.9.1.tgz",
++      "integrity": "sha512-uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "stream-chain": "^2.2.5"
++      }
++    },
++    "node_modules/stream-shift": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
++      "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/streamx": {
++      "version": "2.23.0",
++      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz",
++      "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==",
++      "license": "MIT",
++      "dependencies": {
++        "events-universal": "^1.0.0",
++        "fast-fifo": "^1.3.2",
++        "text-decoder": "^1.1.0"
++      }
++    },
++    "node_modules/strict-uri-encode": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
++      "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/string_decoder": {
++      "version": "1.3.0",
++      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
++      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
++      "license": "MIT",
++      "dependencies": {
++        "safe-buffer": "~5.2.0"
++      }
++    },
++    "node_modules/string-width": {
++      "version": "5.1.2",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
++      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
++      "license": "MIT",
++      "dependencies": {
++        "eastasianwidth": "^0.2.0",
++        "emoji-regex": "^9.2.2",
++        "strip-ansi": "^7.0.1"
++      },
++      "engines": {
++        "node": ">=12"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/string-width-cjs": {
++      "name": "string-width",
++      "version": "4.2.3",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
++      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
++      "license": "MIT",
++      "dependencies": {
++        "emoji-regex": "^8.0.0",
++        "is-fullwidth-code-point": "^3.0.0",
++        "strip-ansi": "^6.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/string-width-cjs/node_modules/ansi-regex": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
++      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/string-width-cjs/node_modules/emoji-regex": {
++      "version": "8.0.0",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
++      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
++      "license": "MIT"
++    },
++    "node_modules/string-width-cjs/node_modules/strip-ansi": {
++      "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
++      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
++      "license": "MIT",
++      "dependencies": {
++        "ansi-regex": "^5.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/string.prototype.trim": {
++      "version": "1.2.10",
++      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
++      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bind": "^1.0.8",
++        "call-bound": "^1.0.2",
++        "define-data-property": "^1.1.4",
++        "define-properties": "^1.2.1",
++        "es-abstract": "^1.23.5",
++        "es-object-atoms": "^1.0.0",
++        "has-property-descriptors": "^1.0.2"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/string.prototype.trimend": {
++      "version": "1.0.9",
++      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
++      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bind": "^1.0.8",
++        "call-bound": "^1.0.2",
++        "define-properties": "^1.2.1",
++        "es-object-atoms": "^1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/string.prototype.trimstart": {
++      "version": "1.0.8",
++      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
++      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bind": "^1.0.7",
++        "define-properties": "^1.2.1",
++        "es-object-atoms": "^1.0.0"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/strip-ansi": {
++      "version": "7.2.0",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
++      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
++      "license": "MIT",
++      "dependencies": {
++        "ansi-regex": "^6.2.2"
++      },
++      "engines": {
++        "node": ">=12"
++      },
++      "funding": {
++        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
++      }
++    },
++    "node_modules/strip-ansi-cjs": {
++      "name": "strip-ansi",
++      "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
++      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
++      "license": "MIT",
++      "dependencies": {
++        "ansi-regex": "^5.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
++      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
++      "license": "MIT",
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/strip-bom": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
++      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4"
++      }
++    },
++    "node_modules/strip-json-comments": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
++      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.0"
++      }
++    },
++    "node_modules/strnum": {
++      "version": "2.2.3",
++      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz",
++      "integrity": "sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/NaturalIntelligence"
++        }
++      ],
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/stubs": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
++      "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/supports-color": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
++      "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.8.0"
++      }
++    },
++    "node_modules/supports-preserve-symlinks-flag": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
++      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/svg-captcha": {
++      "version": "1.4.0",
++      "resolved": "https://registry.npmjs.org/svg-captcha/-/svg-captcha-1.4.0.tgz",
++      "integrity": "sha512-/fkkhavXPE57zRRCjNqAP3txRCSncpMx3NnNZL7iEoyAtYwUjPhJxW6FQTQPG5UPEmCrbFoXS10C3YdJlW7PDg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "opentype.js": "^0.7.3"
++      },
++      "engines": {
++        "node": ">=4.x"
++      }
++    },
++    "node_modules/symbol-tree": {
++      "version": "3.2.4",
++      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
++      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/syslog": {
++      "version": "0.1.1-1",
++      "resolved": "https://registry.npmjs.org/syslog/-/syslog-0.1.1-1.tgz",
++      "integrity": "sha512-7fn4sikkTRrc4kZk/i/ItCktnPD2qG+nKmgTVcuLr2VrY2V9adNhw9fN02HL6rTthwu2Og9Icr1GxZlaLp39Lg==",
++      "optional": true,
++      "engines": {
++        "node": ">=0.4.2"
++      }
++    },
++    "node_modules/tar": {
++      "version": "6.2.1",
++      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
++      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
++      "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "chownr": "^2.0.0",
++        "fs-minipass": "^2.0.0",
++        "minipass": "^5.0.0",
++        "minizlib": "^2.1.1",
++        "mkdirp": "^1.0.3",
++        "yallist": "^4.0.0"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/tar-fs": {
++      "version": "2.1.4",
++      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
++      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "chownr": "^1.1.1",
++        "mkdirp-classic": "^0.5.2",
++        "pump": "^3.0.0",
++        "tar-stream": "^2.1.4"
++      }
++    },
++    "node_modules/tar-fs/node_modules/bl": {
++      "version": "4.1.0",
++      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
++      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "buffer": "^5.5.0",
++        "inherits": "^2.0.4",
++        "readable-stream": "^3.4.0"
++      }
++    },
++    "node_modules/tar-fs/node_modules/buffer": {
++      "version": "5.7.1",
++      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
++      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
++      "funding": [
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/feross"
++        },
++        {
++          "type": "patreon",
++          "url": "https://www.patreon.com/feross"
++        },
++        {
++          "type": "consulting",
++          "url": "https://feross.org/support"
++        }
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "base64-js": "^1.3.1",
++        "ieee754": "^1.1.13"
++      }
++    },
++    "node_modules/tar-fs/node_modules/chownr": {
++      "version": "1.1.4",
++      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
++      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/tar-fs/node_modules/readable-stream": {
++      "version": "3.6.2",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
++      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "inherits": "^2.0.3",
++        "string_decoder": "^1.1.1",
++        "util-deprecate": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/tar-fs/node_modules/tar-stream": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
++      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "bl": "^4.0.3",
++        "end-of-stream": "^1.4.1",
++        "fs-constants": "^1.0.0",
++        "inherits": "^2.0.3",
++        "readable-stream": "^3.1.1"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/tar-stream": {
++      "version": "3.1.8",
++      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz",
++      "integrity": "sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==",
++      "license": "MIT",
++      "dependencies": {
++        "b4a": "^1.6.4",
++        "bare-fs": "^4.5.5",
++        "fast-fifo": "^1.2.0",
++        "streamx": "^2.15.0"
++      }
++    },
++    "node_modules/tar/node_modules/minipass": {
++      "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
++      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/tar/node_modules/mkdirp": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
++      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "mkdirp": "bin/cmd.js"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/tdigest": {
++      "version": "0.1.2",
++      "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz",
++      "integrity": "sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "bintrees": "1.0.2"
++      }
++    },
++    "node_modules/teeny-request": {
++      "version": "9.0.0",
++      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz",
++      "integrity": "sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "http-proxy-agent": "^5.0.0",
++        "https-proxy-agent": "^5.0.0",
++        "node-fetch": "^2.6.9",
++        "stream-events": "^1.0.5",
++        "uuid": "^9.0.0"
++      },
++      "engines": {
++        "node": ">=14"
++      }
++    },
++    "node_modules/teeny-request/node_modules/agent-base": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
++      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6.0.0"
++      }
++    },
++    "node_modules/teeny-request/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
++      "engines": {
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/teeny-request/node_modules/https-proxy-agent": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
++      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "agent-base": "6",
++        "debug": "4"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/teeny-request/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/teeny-request/node_modules/node-fetch": {
++      "version": "2.7.0",
++      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
++      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "whatwg-url": "^5.0.0"
++      },
++      "engines": {
++        "node": "4.x || >=6.0.0"
++      },
++      "peerDependencies": {
++        "encoding": "^0.1.0"
++      },
++      "peerDependenciesMeta": {
++        "encoding": {
++          "optional": true
++        }
++      }
++    },
++    "node_modules/teeny-request/node_modules/tr46": {
++      "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
++      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/teeny-request/node_modules/uuid": {
++      "version": "9.0.1",
++      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
++      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
++      "funding": [
++        "https://github.com/sponsors/broofa",
++        "https://github.com/sponsors/ctavan"
++      ],
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "uuid": "dist/bin/uuid"
++      }
++    },
++    "node_modules/teeny-request/node_modules/webidl-conversions": {
++      "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
++      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
++      "license": "BSD-2-Clause",
++      "optional": true
++    },
++    "node_modules/teeny-request/node_modules/whatwg-url": {
++      "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
++      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "tr46": "~0.0.3",
++        "webidl-conversions": "^3.0.0"
++      }
++    },
++    "node_modules/teex": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
++      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
++      "license": "MIT",
++      "dependencies": {
++        "streamx": "^2.12.5"
++      }
++    },
++    "node_modules/telegram": {
++      "version": "2.26.22",
++      "resolved": "https://registry.npmjs.org/telegram/-/telegram-2.26.22.tgz",
++      "integrity": "sha512-EIj7Yrjiu0Yosa3FZ/7EyPg9s6UiTi/zDQrFmR/2Mg7pIUU+XjAit1n1u9OU9h2oRnRM5M+67/fxzQluZpaJJg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@cryptography/aes": "^0.1.1",
++        "async-mutex": "^0.3.0",
++        "big-integer": "^1.6.48",
++        "buffer": "^6.0.3",
++        "htmlparser2": "^6.1.0",
++        "mime": "^3.0.0",
++        "node-localstorage": "^2.2.1",
++        "pako": "^2.0.3",
++        "path-browserify": "^1.0.1",
++        "real-cancellable-promise": "^1.1.1",
++        "socks": "^2.6.2",
++        "store2": "^2.13.0",
++        "ts-custom-error": "^3.2.0",
++        "websocket": "^1.0.34"
++      },
++      "optionalDependencies": {
++        "bufferutil": "^4.0.3",
++        "utf-8-validate": "^5.0.5"
++      }
++    },
++    "node_modules/telegram/node_modules/mime": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
++      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "mime": "cli.js"
++      },
++      "engines": {
++        "node": ">=10.0.0"
++      }
++    },
++    "node_modules/telnyx": {
++      "version": "1.27.0",
++      "resolved": "https://registry.npmjs.org/telnyx/-/telnyx-1.27.0.tgz",
++      "integrity": "sha512-cVbP3jEW4TbmNL5U0UbZc3OkLg+6dHRnMYByYfJnrGw5ZRn0XKb17Hx3fLMWmGgRFow7eqVP4hlCogbIB6T3+w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "lodash.isplainobject": "^4.0.6",
++        "qs": "^6.11.2",
++        "safe-buffer": "^5.2.1",
++        "telnyx": "^1.26.2",
++        "tweetnacl": "^1.0.3",
++        "uuid": "^9.0.1"
++      },
++      "engines": {
++        "node": "^6 || >=8"
++      }
++    },
++    "node_modules/telnyx/node_modules/tweetnacl": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
++      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
++      "license": "Unlicense",
++      "optional": true
++    },
++    "node_modules/telnyx/node_modules/uuid": {
++      "version": "9.0.1",
++      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
++      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
++      "funding": [
++        "https://github.com/sponsors/broofa",
++        "https://github.com/sponsors/ctavan"
++      ],
++      "license": "MIT",
++      "optional": true,
++      "bin": {
++        "uuid": "dist/bin/uuid"
++      }
++    },
++    "node_modules/terser": {
++      "version": "5.46.2",
++      "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz",
++      "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "dependencies": {
++        "@jridgewell/source-map": "^0.3.3",
++        "acorn": "^8.15.0",
++        "commander": "^2.20.0",
++        "source-map-support": "~0.5.20"
++      },
++      "bin": {
++        "terser": "bin/terser"
++      },
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/terser/node_modules/commander": {
++      "version": "2.20.3",
++      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
++      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/test-exclude": {
++      "version": "5.2.3",
++      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
++      "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "glob": "^7.1.3",
++        "minimatch": "^3.0.4",
++        "read-pkg-up": "^4.0.0",
++        "require-main-filename": "^2.0.0"
++      },
++      "engines": {
++        "node": ">=6"
++      }
++    },
++    "node_modules/test-exclude/node_modules/brace-expansion": {
++      "version": "1.1.14",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "balanced-match": "^1.0.0",
++        "concat-map": "0.0.1"
++      }
++    },
++    "node_modules/test-exclude/node_modules/glob": {
++      "version": "7.2.3",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "fs.realpath": "^1.0.0",
++        "inflight": "^1.0.4",
++        "inherits": "2",
++        "minimatch": "^3.1.1",
++        "once": "^1.3.0",
++        "path-is-absolute": "^1.0.0"
++      },
++      "engines": {
++        "node": "*"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/isaacs"
++      }
++    },
++    "node_modules/test-exclude/node_modules/minimatch": {
++      "version": "3.1.5",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "brace-expansion": "^1.1.7"
++      },
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/text-decoder": {
++      "version": "1.2.7",
++      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz",
++      "integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==",
++      "license": "Apache-2.0",
++      "dependencies": {
++        "b4a": "^1.6.4"
++      }
++    },
++    "node_modules/text-hex": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
++      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/thirty-two": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz",
++      "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==",
++      "engines": {
++        "node": ">=0.2.6"
++      }
++    },
++    "node_modules/through": {
++      "version": "2.3.8",
++      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
++      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/through2": {
++      "version": "4.0.2",
++      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
++      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "readable-stream": "3"
++      }
++    },
++    "node_modules/through2/node_modules/readable-stream": {
++      "version": "3.6.2",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
++      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "inherits": "^2.0.3",
++        "string_decoder": "^1.1.1",
++        "util-deprecate": "^1.0.1"
+       },
+       "engines": {
+-        "node": ">= 0.10"
++        "node": ">= 6"
+       }
+     },
+-    "node_modules/multiparty/node_modules/depd": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
++    "node_modules/thunky": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
++      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+       "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
+-      }
++      "optional": true
+     },
+-    "node_modules/multiparty/node_modules/http-errors": {
+-      "version": "1.8.1",
+-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
++    "node_modules/tiny-inflate": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
++      "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/to-mongodb-core": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/to-mongodb-core/-/to-mongodb-core-2.0.0.tgz",
++      "integrity": "sha512-vfXXcGYFP8+0L5IPOtUzzVIvPE/G3GN0TKa/PRBlzPqYyhm+UxhPmvv634EQgO4Ot8dHbBFihOslMJQclY8Z9A==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/to-regex-range": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
++      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "depd": "~1.1.2",
+-        "inherits": "2.0.4",
+-        "setprototypeof": "1.2.0",
+-        "statuses": ">= 1.5.0 < 2",
+-        "toidentifier": "1.0.1"
++        "is-number": "^7.0.0"
+       },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=8.0"
+       }
+     },
+-    "node_modules/multiparty/node_modules/statuses": {
+-      "version": "1.5.0",
+-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
++    "node_modules/toidentifier": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
++      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+       "license": "MIT",
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=0.6"
+       }
+     },
+-    "node_modules/negotiator": {
+-      "version": "0.6.4",
+-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+-      "license": "MIT",
++    "node_modules/tough-cookie": {
++      "version": "4.1.4",
++      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
++      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
++      "license": "BSD-3-Clause",
++      "optional": true,
++      "dependencies": {
++        "psl": "^1.1.33",
++        "punycode": "^2.1.1",
++        "universalify": "^0.2.0",
++        "url-parse": "^1.5.3"
++      },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=6"
+       }
+     },
+-    "node_modules/neo-async": {
+-      "version": "2.6.2",
+-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+-      "license": "MIT"
+-    },
+-    "node_modules/node-forge": {
+-      "version": "1.4.0",
+-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz",
+-      "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==",
+-      "license": "(BSD-3-Clause OR GPL-2.0)",
++    "node_modules/tr46": {
++      "version": "4.1.1",
++      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
++      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "punycode": "^2.3.0"
++      },
+       "engines": {
+-        "node": ">= 6.13.0"
++        "node": ">=14"
+       }
+     },
+-    "node_modules/nofilter": {
+-      "version": "1.0.4",
+-      "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-1.0.4.tgz",
+-      "integrity": "sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA==",
++    "node_modules/triple-beam": {
++      "version": "1.4.1",
++      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz",
++      "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">=8"
++        "node": ">= 14.0.0"
+       }
+     },
+-    "node_modules/normalize-path": {
+-      "version": "3.0.0",
+-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
++    "node_modules/ts-custom-error": {
++      "version": "3.3.1",
++      "resolved": "https://registry.npmjs.org/ts-custom-error/-/ts-custom-error-3.3.1.tgz",
++      "integrity": "sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">=0.10.0"
++        "node": ">=14.0.0"
+       }
+     },
+-    "node_modules/object-inspect": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+-      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
++    "node_modules/ts-mixer": {
++      "version": "6.0.4",
++      "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.4.tgz",
++      "integrity": "sha512-ufKpbmrugz5Aou4wcr5Wc1UUFWOLhq+Fm6qa6P0w0K5Qw2yhaUoiWszhCVuNQyNwrlGiscHOmqYoAox1PtvgjA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/tslib": {
++      "version": "2.8.1",
++      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
++      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
++      "license": "0BSD",
++      "optional": true
++    },
++    "node_modules/tsscmp": {
++      "version": "1.0.6",
++      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
++      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
+       "license": "MIT",
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=0.6.x"
+       }
+     },
+-    "node_modules/on-finished": {
+-      "version": "2.4.1",
+-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+-      "license": "MIT",
++    "node_modules/tunnel-agent": {
++      "version": "0.6.0",
++      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
++      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "ee-first": "1.1.1"
++        "safe-buffer": "^5.0.1"
+       },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": "*"
+       }
+     },
+-    "node_modules/on-headers": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+-      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
+-      "license": "MIT",
++    "node_modules/tv4": {
++      "version": "1.3.0",
++      "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz",
++      "integrity": "sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==",
++      "license": [
++        {
++          "type": "Public Domain",
++          "url": "http://geraintluff.github.io/tv4/LICENSE.txt"
++        },
++        {
++          "type": "MIT",
++          "url": "http://jsonary.com/LICENSE.txt"
++        }
++      ],
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">= 0.8.0"
+       }
+     },
+-    "node_modules/otplib": {
+-      "version": "12.0.1",
+-      "resolved": "https://registry.npmjs.org/otplib/-/otplib-12.0.1.tgz",
+-      "integrity": "sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==",
++    "node_modules/tweetnacl": {
++      "version": "0.14.5",
++      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
++      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
++      "license": "Unlicense",
++      "optional": true
++    },
++    "node_modules/twilio": {
++      "version": "4.23.0",
++      "resolved": "https://registry.npmjs.org/twilio/-/twilio-4.23.0.tgz",
++      "integrity": "sha512-LdNBQfOe0dY2oJH2sAsrxazpgfFQo5yXGxe96QA8UWB5uu+433PrUbkv8gQ5RmrRCqUTPQ0aOrIyAdBr1aB03Q==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "@otplib/core": "^12.0.1",
+-        "@otplib/preset-default": "^12.0.1",
+-        "@otplib/preset-v11": "^12.0.1"
++        "axios": "^1.6.0",
++        "dayjs": "^1.11.9",
++        "https-proxy-agent": "^5.0.0",
++        "jsonwebtoken": "^9.0.0",
++        "qs": "^6.9.4",
++        "scmp": "^2.1.0",
++        "url-parse": "^1.5.9",
++        "xmlbuilder": "^13.0.2"
++      },
++      "engines": {
++        "node": ">=14.0"
+       }
+     },
+-    "node_modules/package-json-from-dist": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+-      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+-      "license": "BlueOak-1.0.0"
+-    },
+-    "node_modules/parseurl": {
+-      "version": "1.3.3",
+-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
++    "node_modules/twilio/node_modules/agent-base": {
++      "version": "6.0.2",
++      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
++      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "debug": "4"
++      },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">= 6.0.0"
+       }
+     },
+-    "node_modules/path-key": {
+-      "version": "3.1.1",
+-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
++    "node_modules/twilio/node_modules/debug": {
++      "version": "4.4.3",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ms": "^2.1.3"
++      },
+       "engines": {
+-        "node": ">=8"
++        "node": ">=6.0"
++      },
++      "peerDependenciesMeta": {
++        "supports-color": {
++          "optional": true
++        }
+       }
+     },
+-    "node_modules/path-scurry": {
+-      "version": "1.11.1",
+-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+-      "license": "BlueOak-1.0.0",
++    "node_modules/twilio/node_modules/https-proxy-agent": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
++      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
++      "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "lru-cache": "^10.2.0",
+-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
++        "agent-base": "6",
++        "debug": "4"
+       },
+       "engines": {
+-        "node": ">=16 || 14 >=14.18"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/isaacs"
++        "node": ">= 6"
+       }
+     },
+-    "node_modules/path-to-regexp": {
+-      "version": "0.1.12",
+-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
+-      "license": "MIT"
+-    },
+-    "node_modules/pend": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+-      "license": "MIT"
++    "node_modules/twilio/node_modules/ms": {
++      "version": "2.1.3",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
++      "license": "MIT",
++      "optional": true
+     },
+-    "node_modules/possible-typed-array-names": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+-      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
++    "node_modules/twilio/node_modules/xmlbuilder": {
++      "version": "13.0.2",
++      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
++      "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.4"
++        "node": ">=6.0"
+       }
+     },
+-    "node_modules/process": {
+-      "version": "0.11.10",
+-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
++    "node_modules/type": {
++      "version": "2.7.3",
++      "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz",
++      "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/type-is": {
++      "version": "1.6.18",
++      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
++      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+       "license": "MIT",
++      "dependencies": {
++        "media-typer": "0.3.0",
++        "mime-types": "~2.1.24"
++      },
+       "engines": {
+-        "node": ">= 0.6.0"
++        "node": ">= 0.6"
+       }
+     },
+-    "node_modules/process-nextick-args": {
+-      "version": "2.0.1",
+-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+-      "license": "MIT"
+-    },
+-    "node_modules/proxy-addr": {
+-      "version": "2.0.7",
+-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
++    "node_modules/typed-array-buffer": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
++      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "forwarded": "0.2.0",
+-        "ipaddr.js": "1.9.1"
++        "call-bound": "^1.0.3",
++        "es-errors": "^1.3.0",
++        "is-typed-array": "^1.1.14"
+       },
+       "engines": {
+-        "node": ">= 0.10"
++        "node": ">= 0.4"
+       }
+     },
+-    "node_modules/qs": {
+-      "version": "6.14.2",
+-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
+-      "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
+-      "license": "BSD-3-Clause",
++    "node_modules/typed-array-byte-length": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
++      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
++      "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "side-channel": "^1.1.0"
++        "call-bind": "^1.0.8",
++        "for-each": "^0.3.3",
++        "gopd": "^1.2.0",
++        "has-proto": "^1.2.0",
++        "is-typed-array": "^1.1.14"
+       },
+       "engines": {
+-        "node": ">=0.6"
++        "node": ">= 0.4"
+       },
+       "funding": {
+         "url": "https://github.com/sponsors/ljharb"
+       }
+     },
+-    "node_modules/random-bytes": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
+-      "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.8"
+-      }
+-    },
+-    "node_modules/range-parser": {
+-      "version": "1.2.1",
+-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": ">= 0.6"
+-      }
+-    },
+-    "node_modules/raw-body": {
+-      "version": "2.5.3",
+-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz",
+-      "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==",
++    "node_modules/typed-array-byte-offset": {
++      "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
++      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "bytes": "~3.1.2",
+-        "http-errors": "~2.0.1",
+-        "iconv-lite": "~0.4.24",
+-        "unpipe": "~1.0.0"
++        "available-typed-arrays": "^1.0.7",
++        "call-bind": "^1.0.8",
++        "for-each": "^0.3.3",
++        "gopd": "^1.2.0",
++        "has-proto": "^1.2.0",
++        "is-typed-array": "^1.1.15",
++        "reflect.getprototypeof": "^1.0.9"
+       },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
+       }
+     },
+-    "node_modules/readable-stream": {
+-      "version": "4.7.0",
+-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+-      "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
++    "node_modules/typed-array-length": {
++      "version": "1.0.7",
++      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
++      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "abort-controller": "^3.0.0",
+-        "buffer": "^6.0.3",
+-        "events": "^3.3.0",
+-        "process": "^0.11.10",
+-        "string_decoder": "^1.3.0"
++        "call-bind": "^1.0.7",
++        "for-each": "^0.3.3",
++        "gopd": "^1.0.1",
++        "is-typed-array": "^1.1.13",
++        "possible-typed-array-names": "^1.0.0",
++        "reflect.getprototypeof": "^1.0.6"
+       },
+       "engines": {
+-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+-      }
+-    },
+-    "node_modules/readdir-glob": {
+-      "version": "1.1.3",
+-      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz",
+-      "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
+-      "license": "Apache-2.0",
+-      "dependencies": {
+-        "minimatch": "^5.1.0"
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
+       }
+     },
+-    "node_modules/readdir-glob/node_modules/minimatch": {
+-      "version": "5.1.9",
+-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
+-      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
+-      "license": "ISC",
++    "node_modules/typedarray-to-buffer": {
++      "version": "3.1.5",
++      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
++      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
++      "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "brace-expansion": "^2.0.1"
+-      },
+-      "engines": {
+-        "node": ">=10"
++        "is-typedarray": "^1.0.0"
+       }
+     },
+-    "node_modules/safe-buffer": {
+-      "version": "5.2.1",
+-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
++    "node_modules/ua-client-hints-js": {
++      "version": "0.1.2",
++      "resolved": "https://registry.npmjs.org/ua-client-hints-js/-/ua-client-hints-js-0.1.2.tgz",
++      "integrity": "sha512-cYqD5p9PPCsNYpBJRYcU7s5QuZS3pdWpskOJl+QE7elbOrFzctLs5H9ppH10v7Tk0Kholzo9VIyjoTlh0B8XXg==",
+       "funding": [
+         {
+           "type": "github",
+-          "url": "https://github.com/sponsors/feross"
++          "url": "https://github.com/sponsors/faisalman"
+         },
+         {
+-          "type": "patreon",
+-          "url": "https://www.patreon.com/feross"
++          "type": "opencollective",
++          "url": "https://opencollective.com/ua-parser-js"
+         },
+         {
+-          "type": "consulting",
+-          "url": "https://feross.org/support"
++          "type": "paypal",
++          "url": "https://paypal.me/faisalman"
+         }
+       ],
+       "license": "MIT"
+     },
+-    "node_modules/safe-regex-test": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+-      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
++    "node_modules/ua-parser-js": {
++      "version": "1.0.40",
++      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.40.tgz",
++      "integrity": "sha512-z6PJ8Lml+v3ichVojCiB8toQJBuwR42ySM4ezjXIqXK3M0HczmKQ3LF4rhU55PfD99KEEXQG6yb7iOMyvYuHew==",
++      "funding": [
++        {
++          "type": "opencollective",
++          "url": "https://opencollective.com/ua-parser-js"
++        },
++        {
++          "type": "paypal",
++          "url": "https://paypal.me/faisalman"
++        },
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/faisalman"
++        }
++      ],
+       "license": "MIT",
+-      "dependencies": {
+-        "call-bound": "^1.0.2",
+-        "es-errors": "^1.3.0",
+-        "is-regex": "^1.2.1"
++      "bin": {
++        "ua-parser-js": "script/cli.js"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": "*"
+       }
+     },
+-    "node_modules/safer-buffer": {
+-      "version": "2.1.2",
+-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+-      "license": "MIT"
+-    },
+-    "node_modules/send": {
+-      "version": "0.19.2",
+-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz",
+-      "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==",
+-      "license": "MIT",
+-      "dependencies": {
+-        "debug": "2.6.9",
+-        "depd": "2.0.0",
+-        "destroy": "1.2.0",
+-        "encodeurl": "~2.0.0",
+-        "escape-html": "~1.0.3",
+-        "etag": "~1.8.1",
+-        "fresh": "~0.5.2",
+-        "http-errors": "~2.0.1",
+-        "mime": "1.6.0",
+-        "ms": "2.1.3",
+-        "on-finished": "~2.4.1",
+-        "range-parser": "~1.2.1",
+-        "statuses": "~2.0.2"
++    "node_modules/uglify-js": {
++      "version": "3.19.3",
++      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
++      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "bin": {
++        "uglifyjs": "bin/uglifyjs"
+       },
+       "engines": {
+-        "node": ">= 0.8.0"
++        "node": ">=0.8.0"
+       }
+     },
+-    "node_modules/send/node_modules/ms": {
+-      "version": "2.1.3",
+-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+-      "license": "MIT"
+-    },
+-    "node_modules/serve-static": {
+-      "version": "1.16.3",
+-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz",
+-      "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==",
++    "node_modules/uid-safe": {
++      "version": "2.1.5",
++      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
++      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
+       "license": "MIT",
+       "dependencies": {
+-        "encodeurl": "~2.0.0",
+-        "escape-html": "~1.0.3",
+-        "parseurl": "~1.3.3",
+-        "send": "~0.19.1"
++        "random-bytes": "~1.0.0"
+       },
+       "engines": {
+-        "node": ">= 0.8.0"
++        "node": ">= 0.8"
+       }
+     },
+-    "node_modules/set-function-length": {
+-      "version": "1.2.2",
+-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
++    "node_modules/uid2": {
++      "version": "0.0.4",
++      "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.4.tgz",
++      "integrity": "sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/unbox-primitive": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
++      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "define-data-property": "^1.1.4",
+-        "es-errors": "^1.3.0",
+-        "function-bind": "^1.1.2",
+-        "get-intrinsic": "^1.2.4",
+-        "gopd": "^1.0.1",
+-        "has-property-descriptors": "^1.0.2"
++        "call-bound": "^1.0.3",
++        "has-bigints": "^1.0.2",
++        "has-symbols": "^1.1.0",
++        "which-boxed-primitive": "^1.1.1"
+       },
+       "engines": {
+         "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
+       }
+     },
+-    "node_modules/setprototypeof": {
+-      "version": "1.2.0",
+-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+-      "license": "ISC"
++    "node_modules/undici": {
++      "version": "6.24.1",
++      "resolved": "https://registry.npmjs.org/undici/-/undici-6.24.1.tgz",
++      "integrity": "sha512-sC+b0tB1whOCzbtlx20fx3WgCXwkW627p4EA9uM+/tNNPkSS+eSEld6pAs9nDv7WbY1UUljBMYPtu9BCOrCWKA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=18.17"
++      }
+     },
+-    "node_modules/shebang-command": {
+-      "version": "2.0.0",
+-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
++    "node_modules/undici-types": {
++      "version": "7.19.2",
++      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz",
++      "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==",
+       "license": "MIT",
++      "optional": true
++    },
++    "node_modules/unidecode": {
++      "version": "0.1.8",
++      "resolved": "https://registry.npmjs.org/unidecode/-/unidecode-0.1.8.tgz",
++      "integrity": "sha512-SdoZNxCWpN2tXTCrGkPF/0rL2HEq+i2gwRG1ReBvx8/0yTzC3enHfugOf8A9JBShVwwrRIkLX0YcDUGbzjbVCA==",
++      "optional": true,
++      "engines": {
++        "node": ">= 0.4.12"
++      }
++    },
++    "node_modules/unique-filename": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
++      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
++      "license": "ISC",
++      "optional": true,
+       "dependencies": {
+-        "shebang-regex": "^3.0.0"
+-      },
++        "unique-slug": "^2.0.0"
++      }
++    },
++    "node_modules/unique-slug": {
++      "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
++      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "imurmurhash": "^0.1.4"
++      }
++    },
++    "node_modules/universalify": {
++      "version": "0.2.0",
++      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
++      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
++      "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">=8"
++        "node": ">= 4.0.0"
+       }
+     },
+-    "node_modules/shebang-regex": {
+-      "version": "3.0.0",
+-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
++    "node_modules/unpipe": {
++      "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
++      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+       "license": "MIT",
+       "engines": {
+-        "node": ">=8"
++        "node": ">= 0.8"
+       }
+     },
+-    "node_modules/side-channel": {
+-      "version": "1.1.0",
+-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
++    "node_modules/update-browserslist-db": {
++      "version": "1.2.3",
++      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
++      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
++      "funding": [
++        {
++          "type": "opencollective",
++          "url": "https://opencollective.com/browserslist"
++        },
++        {
++          "type": "tidelift",
++          "url": "https://tidelift.com/funding/github/npm/browserslist"
++        },
++        {
++          "type": "github",
++          "url": "https://github.com/sponsors/ai"
++        }
++      ],
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "es-errors": "^1.3.0",
+-        "object-inspect": "^1.13.3",
+-        "side-channel-list": "^1.0.0",
+-        "side-channel-map": "^1.0.1",
+-        "side-channel-weakmap": "^1.0.2"
++        "escalade": "^3.2.0",
++        "picocolors": "^1.1.1"
++      },
++      "bin": {
++        "update-browserslist-db": "cli.js"
+       },
++      "peerDependencies": {
++        "browserslist": ">= 4.21.0"
++      }
++    },
++    "node_modules/uri-js": {
++      "version": "4.4.1",
++      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
++      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
++      "license": "BSD-2-Clause",
++      "optional": true,
++      "dependencies": {
++        "punycode": "^2.1.0"
++      }
++    },
++    "node_modules/uri-parser": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/uri-parser/-/uri-parser-1.0.1.tgz",
++      "integrity": "sha512-TRjjM2M83RD9jIIYttNj7ghUQTKSov+WXZbQIMM8DxY1R1QdJEGWNKKMYCxyeOw1p9re2nQ85usM6dPTVtox1g==",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": "*"
+       }
+     },
+-    "node_modules/side-channel-list": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
++    "node_modules/url-join": {
++      "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz",
++      "integrity": "sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==",
+       "license": "MIT",
+-      "dependencies": {
+-        "es-errors": "^1.3.0",
+-        "object-inspect": "^1.13.3"
+-      },
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+       }
+     },
+-    "node_modules/side-channel-map": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+-      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
++    "node_modules/url-parse": {
++      "version": "1.5.10",
++      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
++      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "call-bound": "^1.0.2",
+-        "es-errors": "^1.3.0",
+-        "get-intrinsic": "^1.2.5",
+-        "object-inspect": "^1.13.3"
+-      },
+-      "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "querystringify": "^2.1.1",
++        "requires-port": "^1.0.0"
+       }
+     },
+-    "node_modules/side-channel-weakmap": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+-      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
++    "node_modules/url-template": {
++      "version": "2.0.8",
++      "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
++      "integrity": "sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==",
++      "license": "BSD",
++      "optional": true
++    },
++    "node_modules/utf-8-validate": {
++      "version": "5.0.10",
++      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
++      "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
++      "hasInstallScript": true,
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "call-bound": "^1.0.2",
+-        "es-errors": "^1.3.0",
+-        "get-intrinsic": "^1.2.5",
+-        "object-inspect": "^1.13.3",
+-        "side-channel-map": "^1.0.1"
++        "node-gyp-build": "^4.3.0"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">=6.14.2"
+       }
+     },
+-    "node_modules/signal-exit": {
+-      "version": "4.1.0",
+-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+-      "license": "ISC",
+-      "engines": {
+-        "node": ">=14"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/isaacs"
+-      }
++    "node_modules/utf8": {
++      "version": "2.1.2",
++      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz",
++      "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==",
++      "license": "MIT",
++      "optional": true
+     },
+-    "node_modules/source-map": {
+-      "version": "0.6.1",
+-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+-      "license": "BSD-3-Clause",
+-      "engines": {
+-        "node": ">=0.10.0"
++    "node_modules/util": {
++      "version": "0.12.5",
++      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
++      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
++      "license": "MIT",
++      "dependencies": {
++        "inherits": "^2.0.3",
++        "is-arguments": "^1.0.4",
++        "is-generator-function": "^1.0.7",
++        "is-typed-array": "^1.1.3",
++        "which-typed-array": "^1.1.2"
+       }
+     },
+-    "node_modules/statuses": {
+-      "version": "2.0.2",
+-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+-      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
++    "node_modules/util-deprecate": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
++      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
++      "license": "MIT"
++    },
++    "node_modules/utils-merge": {
++      "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
++      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+       "license": "MIT",
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">= 0.4.0"
+       }
+     },
+-    "node_modules/streamx": {
+-      "version": "2.23.0",
+-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz",
+-      "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==",
++    "node_modules/uuid": {
++      "version": "10.0.0",
++      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
++      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
++      "funding": [
++        "https://github.com/sponsors/broofa",
++        "https://github.com/sponsors/ctavan"
++      ],
+       "license": "MIT",
+-      "dependencies": {
+-        "events-universal": "^1.0.0",
+-        "fast-fifo": "^1.3.2",
+-        "text-decoder": "^1.1.0"
++      "optional": true,
++      "bin": {
++        "uuid": "dist/bin/uuid"
+       }
+     },
+-    "node_modules/string_decoder": {
+-      "version": "1.3.0",
+-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
++    "node_modules/uuid-parse": {
++      "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/uuid-parse/-/uuid-parse-1.1.0.tgz",
++      "integrity": "sha512-OdmXxA8rDsQ7YpNVbKSJkNzTw2I+S5WsbMDnCtIWSQaosNAcWtFuI/YK1TjzUI6nbkgiqEyh8gWngfcv8Asd9A==",
+       "license": "MIT",
+-      "dependencies": {
+-        "safe-buffer": "~5.2.0"
+-      }
++      "optional": true
+     },
+-    "node_modules/string-width": {
+-      "version": "5.1.2",
+-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
++    "node_modules/v8flags": {
++      "version": "3.2.0",
++      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
++      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "eastasianwidth": "^0.2.0",
+-        "emoji-regex": "^9.2.2",
+-        "strip-ansi": "^7.0.1"
++        "homedir-polyfill": "^1.0.1"
+       },
+       "engines": {
+-        "node": ">=12"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/sindresorhus"
++        "node": ">= 0.10"
+       }
+     },
+-    "node_modules/string-width-cjs": {
+-      "name": "string-width",
+-      "version": "4.2.3",
+-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+-      "license": "MIT",
++    "node_modules/validate-npm-package-license": {
++      "version": "3.0.4",
++      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
++      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "emoji-regex": "^8.0.0",
+-        "is-fullwidth-code-point": "^3.0.0",
+-        "strip-ansi": "^6.0.1"
+-      },
+-      "engines": {
+-        "node": ">=8"
++        "spdx-correct": "^3.0.0",
++        "spdx-expression-parse": "^3.0.0"
+       }
+     },
+-    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+-      "version": "5.0.1",
+-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
++    "node_modules/vary": {
++      "version": "1.1.2",
++      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
++      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+       "license": "MIT",
+       "engines": {
+-        "node": ">=8"
++        "node": ">= 0.8"
+       }
+     },
+-    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+-      "version": "8.0.0",
+-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+-      "license": "MIT"
++    "node_modules/vasync": {
++      "version": "2.2.1",
++      "resolved": "https://registry.npmjs.org/vasync/-/vasync-2.2.1.tgz",
++      "integrity": "sha512-Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ==",
++      "engines": [
++        "node >=0.6.0"
++      ],
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "verror": "1.10.0"
++      }
+     },
+-    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+-      "version": "6.0.1",
+-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
++    "node_modules/vasync/node_modules/core-util-is": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
++      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+       "license": "MIT",
++      "optional": true
++    },
++    "node_modules/vasync/node_modules/verror": {
++      "version": "1.10.0",
++      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
++      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
++      "engines": [
++        "node >=0.6.0"
++      ],
++      "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "ansi-regex": "^5.0.1"
+-      },
+-      "engines": {
+-        "node": ">=8"
++        "assert-plus": "^1.0.0",
++        "core-util-is": "1.0.2",
++        "extsprintf": "^1.2.0"
+       }
+     },
+-    "node_modules/strip-ansi": {
+-      "version": "7.2.0",
+-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+-      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
++    "node_modules/verror": {
++      "version": "1.10.1",
++      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
++      "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "ansi-regex": "^6.2.2"
++        "assert-plus": "^1.0.0",
++        "core-util-is": "1.0.2",
++        "extsprintf": "^1.2.0"
+       },
+       "engines": {
+-        "node": ">=12"
+-      },
+-      "funding": {
+-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
++        "node": ">=0.6.0"
+       }
+     },
+-    "node_modules/strip-ansi-cjs": {
+-      "name": "strip-ansi",
+-      "version": "6.0.1",
+-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
++    "node_modules/verror/node_modules/core-util-is": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
++      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/w3c-xmlserializer": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
++      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "ansi-regex": "^5.0.1"
++        "xml-name-validator": "^4.0.0"
+       },
+       "engines": {
+-        "node": ">=8"
++        "node": ">=14"
+       }
+     },
+-    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+-      "version": "5.0.1",
+-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
++    "node_modules/weak-daemon": {
++      "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/weak-daemon/-/weak-daemon-1.0.3.tgz",
++      "integrity": "sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">=8"
++        "node": ">=4.8.7"
+       }
+     },
+-    "node_modules/tar-stream": {
+-      "version": "3.1.8",
+-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz",
+-      "integrity": "sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==",
+-      "license": "MIT",
++    "node_modules/web-push": {
++      "version": "3.6.7",
++      "resolved": "https://registry.npmjs.org/web-push/-/web-push-3.6.7.tgz",
++      "integrity": "sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==",
++      "license": "MPL-2.0",
++      "optional": true,
+       "dependencies": {
+-        "b4a": "^1.6.4",
+-        "bare-fs": "^4.5.5",
+-        "fast-fifo": "^1.2.0",
+-        "streamx": "^2.15.0"
++        "asn1.js": "^5.3.0",
++        "http_ece": "1.2.0",
++        "https-proxy-agent": "^7.0.0",
++        "jws": "^4.0.0",
++        "minimist": "^1.2.5"
++      },
++      "bin": {
++        "web-push": "src/cli.js"
++      },
++      "engines": {
++        "node": ">= 16"
+       }
+     },
+-    "node_modules/teex": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
+-      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
++    "node_modules/web-streams-polyfill": {
++      "version": "3.3.3",
++      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
++      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+       "license": "MIT",
+-      "dependencies": {
+-        "streamx": "^2.12.5"
++      "optional": true,
++      "engines": {
++        "node": ">= 8"
+       }
+     },
+-    "node_modules/text-decoder": {
+-      "version": "1.2.7",
+-      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz",
+-      "integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==",
+-      "license": "Apache-2.0",
++    "node_modules/webdav": {
++      "version": "5.9.0",
++      "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.9.0.tgz",
++      "integrity": "sha512-OMJ6wtK1WvCO++aOLoQgE96S8KT4e5aaClWHmHXfFU369r4eyELN569B7EqT4OOUb99mmO58GkyuiCv/Ag6J0Q==",
++      "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "b4a": "^1.6.4"
+-      }
+-    },
+-    "node_modules/thirty-two": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz",
+-      "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==",
++        "@buttercup/fetch": "^0.2.1",
++        "base-64": "^1.0.0",
++        "byte-length": "^1.0.2",
++        "entities": "^6.0.1",
++        "fast-xml-parser": "^5.3.4",
++        "hot-patcher": "^2.0.1",
++        "layerr": "^3.0.0",
++        "md5": "^2.3.0",
++        "minimatch": "^9.0.5",
++        "nested-property": "^4.0.0",
++        "node-fetch": "^3.3.2",
++        "path-posix": "^1.0.0",
++        "url-join": "^5.0.0",
++        "url-parse": "^1.5.10"
++      },
+       "engines": {
+-        "node": ">=0.2.6"
++        "node": ">=14"
+       }
+     },
+-    "node_modules/toidentifier": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+-      "license": "MIT",
++    "node_modules/webdav/node_modules/entities": {
++      "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
++      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
++      "license": "BSD-2-Clause",
++      "optional": true,
+       "engines": {
+-        "node": ">=0.6"
++        "node": ">=0.12"
++      },
++      "funding": {
++        "url": "https://github.com/fb55/entities?sponsor=1"
+       }
+     },
+-    "node_modules/tsscmp": {
+-      "version": "1.0.6",
+-      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+-      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
+-      "license": "MIT",
++    "node_modules/webidl-conversions": {
++      "version": "7.0.0",
++      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
++      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
++      "license": "BSD-2-Clause",
++      "optional": true,
+       "engines": {
+-        "node": ">=0.6.x"
++        "node": ">=12"
+       }
+     },
+-    "node_modules/type-is": {
+-      "version": "1.6.18",
+-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+-      "license": "MIT",
++    "node_modules/websocket": {
++      "version": "1.0.35",
++      "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.35.tgz",
++      "integrity": "sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==",
++      "license": "Apache-2.0",
++      "optional": true,
+       "dependencies": {
+-        "media-typer": "0.3.0",
+-        "mime-types": "~2.1.24"
++        "bufferutil": "^4.0.1",
++        "debug": "^2.2.0",
++        "es5-ext": "^0.10.63",
++        "typedarray-to-buffer": "^3.1.5",
++        "utf-8-validate": "^5.0.2",
++        "yaeti": "^0.0.6"
+       },
+       "engines": {
+-        "node": ">= 0.6"
++        "node": ">=4.0.0"
+       }
+     },
+-    "node_modules/ua-client-hints-js": {
+-      "version": "0.1.2",
+-      "resolved": "https://registry.npmjs.org/ua-client-hints-js/-/ua-client-hints-js-0.1.2.tgz",
+-      "integrity": "sha512-cYqD5p9PPCsNYpBJRYcU7s5QuZS3pdWpskOJl+QE7elbOrFzctLs5H9ppH10v7Tk0Kholzo9VIyjoTlh0B8XXg==",
+-      "funding": [
+-        {
+-          "type": "github",
+-          "url": "https://github.com/sponsors/faisalman"
+-        },
+-        {
+-          "type": "opencollective",
+-          "url": "https://opencollective.com/ua-parser-js"
+-        },
+-        {
+-          "type": "paypal",
+-          "url": "https://paypal.me/faisalman"
+-        }
+-      ],
+-      "license": "MIT"
+-    },
+-    "node_modules/ua-parser-js": {
+-      "version": "1.0.40",
+-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.40.tgz",
+-      "integrity": "sha512-z6PJ8Lml+v3ichVojCiB8toQJBuwR42ySM4ezjXIqXK3M0HczmKQ3LF4rhU55PfD99KEEXQG6yb7iOMyvYuHew==",
+-      "funding": [
+-        {
+-          "type": "opencollective",
+-          "url": "https://opencollective.com/ua-parser-js"
+-        },
+-        {
+-          "type": "paypal",
+-          "url": "https://paypal.me/faisalman"
+-        },
+-        {
+-          "type": "github",
+-          "url": "https://github.com/sponsors/faisalman"
+-        }
+-      ],
+-      "license": "MIT",
+-      "bin": {
+-        "ua-parser-js": "script/cli.js"
++    "node_modules/websocket-driver": {
++      "version": "0.7.4",
++      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
++      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "dependencies": {
++        "http-parser-js": ">=0.5.1",
++        "safe-buffer": ">=5.1.0",
++        "websocket-extensions": ">=0.1.1"
+       },
+       "engines": {
+-        "node": "*"
++        "node": ">=0.8.0"
+       }
+     },
+-    "node_modules/uglify-js": {
+-      "version": "3.19.3",
+-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+-      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
+-      "license": "BSD-2-Clause",
++    "node_modules/websocket-extensions": {
++      "version": "0.1.4",
++      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
++      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
++      "license": "Apache-2.0",
+       "optional": true,
+-      "bin": {
+-        "uglifyjs": "bin/uglifyjs"
+-      },
+       "engines": {
+         "node": ">=0.8.0"
+       }
+     },
+-    "node_modules/uid-safe": {
+-      "version": "2.1.5",
+-      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
+-      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
++    "node_modules/whatwg-encoding": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
++      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
++      "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+-        "random-bytes": "~1.0.0"
++        "iconv-lite": "0.6.3"
+       },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=12"
+       }
+     },
+-    "node_modules/unpipe": {
+-      "version": "1.0.0",
+-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
++    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
++      "version": "0.6.3",
++      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
++      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "safer-buffer": ">= 2.1.2 < 3.0.0"
++      },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=0.10.0"
+       }
+     },
+-    "node_modules/util": {
+-      "version": "0.12.5",
+-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
++    "node_modules/whatwg-fetch": {
++      "version": "3.6.20",
++      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",
++      "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==",
+       "license": "MIT",
+-      "dependencies": {
+-        "inherits": "^2.0.3",
+-        "is-arguments": "^1.0.4",
+-        "is-generator-function": "^1.0.7",
+-        "is-typed-array": "^1.1.3",
+-        "which-typed-array": "^1.1.2"
+-      }
+-    },
+-    "node_modules/util-deprecate": {
+-      "version": "1.0.2",
+-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+-      "license": "MIT"
++      "optional": true
+     },
+-    "node_modules/utils-merge": {
+-      "version": "1.0.1",
+-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
++    "node_modules/whatwg-mimetype": {
++      "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
++      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+       "license": "MIT",
++      "optional": true,
+       "engines": {
+-        "node": ">= 0.4.0"
++        "node": ">=12"
+       }
+     },
+-    "node_modules/vary": {
+-      "version": "1.1.2",
+-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
++    "node_modules/whatwg-url": {
++      "version": "12.0.1",
++      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
++      "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
+       "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "tr46": "^4.1.1",
++        "webidl-conversions": "^7.0.0"
++      },
+       "engines": {
+-        "node": ">= 0.8"
++        "node": ">=14"
+       }
+     },
+     "node_modules/which": {
+@@ -2477,6 +16618,87 @@
+         "node": ">= 8"
+       }
+     },
++    "node_modules/which-boxed-primitive": {
++      "version": "1.1.1",
++      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
++      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "is-bigint": "^1.1.0",
++        "is-boolean-object": "^1.2.1",
++        "is-number-object": "^1.1.1",
++        "is-string": "^1.1.1",
++        "is-symbol": "^1.1.1"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/which-builtin-type": {
++      "version": "1.2.1",
++      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
++      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "call-bound": "^1.0.2",
++        "function.prototype.name": "^1.1.6",
++        "has-tostringtag": "^1.0.2",
++        "is-async-function": "^2.0.0",
++        "is-date-object": "^1.1.0",
++        "is-finalizationregistry": "^1.1.0",
++        "is-generator-function": "^1.0.10",
++        "is-regex": "^1.2.1",
++        "is-weakref": "^1.0.2",
++        "isarray": "^2.0.5",
++        "which-boxed-primitive": "^1.1.0",
++        "which-collection": "^1.0.2",
++        "which-typed-array": "^1.1.16"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/which-builtin-type/node_modules/isarray": {
++      "version": "2.0.5",
++      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
++      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/which-collection": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
++      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "is-map": "^2.0.3",
++        "is-set": "^2.0.3",
++        "is-weakmap": "^2.0.2",
++        "is-weakset": "^2.0.3"
++      },
++      "engines": {
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/which-module": {
++      "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
++      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
++      "license": "ISC",
++      "optional": true
++    },
+     "node_modules/which-typed-array": {
+       "version": "1.1.20",
+       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
+@@ -2492,10 +16714,143 @@
+         "has-tostringtag": "^1.0.2"
+       },
+       "engines": {
+-        "node": ">= 0.4"
+-      },
+-      "funding": {
+-        "url": "https://github.com/sponsors/ljharb"
++        "node": ">= 0.4"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/ljharb"
++      }
++    },
++    "node_modules/wide-align": {
++      "version": "1.1.5",
++      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
++      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "string-width": "^1.0.2 || 2 || 3 || 4"
++      }
++    },
++    "node_modules/wide-align/node_modules/ansi-regex": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
++      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/wide-align/node_modules/emoji-regex": {
++      "version": "8.0.0",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
++      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/wide-align/node_modules/string-width": {
++      "version": "4.2.3",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
++      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "emoji-regex": "^8.0.0",
++        "is-fullwidth-code-point": "^3.0.0",
++        "strip-ansi": "^6.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/wide-align/node_modules/strip-ansi": {
++      "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
++      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-regex": "^5.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/wildleek": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/wildleek/-/wildleek-2.0.0.tgz",
++      "integrity": "sha512-wtHhfuGeWH9diQsQoprX5tr2+y5lyqyzMpiTFu4gJVQIK+L4jE8Phmr50sFmk7ewhZzbbQj2pCwbUcceq+IEIg==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "binary-search": "1.3.6"
++      }
++    },
++    "node_modules/winston": {
++      "version": "3.19.0",
++      "resolved": "https://registry.npmjs.org/winston/-/winston-3.19.0.tgz",
++      "integrity": "sha512-LZNJgPzfKR+/J3cHkxcpHKpKKvGfDZVPS4hfJCc4cCG0CgYzvlD6yE/S3CIL/Yt91ak327YCpiF/0MyeZHEHKA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@colors/colors": "^1.6.0",
++        "@dabh/diagnostics": "^2.0.8",
++        "async": "^3.2.3",
++        "is-stream": "^2.0.0",
++        "logform": "^2.7.0",
++        "one-time": "^1.0.0",
++        "readable-stream": "^3.4.0",
++        "safe-stable-stringify": "^2.3.1",
++        "stack-trace": "0.0.x",
++        "triple-beam": "^1.3.0",
++        "winston-transport": "^4.9.0"
++      },
++      "engines": {
++        "node": ">= 12.0.0"
++      }
++    },
++    "node_modules/winston-transport": {
++      "version": "4.9.0",
++      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz",
++      "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "logform": "^2.7.0",
++        "readable-stream": "^3.6.2",
++        "triple-beam": "^1.3.0"
++      },
++      "engines": {
++        "node": ">= 12.0.0"
++      }
++    },
++    "node_modules/winston-transport/node_modules/readable-stream": {
++      "version": "3.6.2",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
++      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "inherits": "^2.0.3",
++        "string_decoder": "^1.1.1",
++        "util-deprecate": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 6"
++      }
++    },
++    "node_modules/winston/node_modules/readable-stream": {
++      "version": "3.6.2",
++      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
++      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "inherits": "^2.0.3",
++        "string_decoder": "^1.1.1",
++        "util-deprecate": "^1.0.1"
++      },
++      "engines": {
++        "node": ">= 6"
+       }
+     },
+     "node_modules/wordwrap": {
+@@ -2504,6 +16859,43 @@
+       "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+       "license": "MIT"
+     },
++    "node_modules/worker-timers": {
++      "version": "7.1.8",
++      "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.1.8.tgz",
++      "integrity": "sha512-R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@babel/runtime": "^7.24.5",
++        "tslib": "^2.6.2",
++        "worker-timers-broker": "^6.1.8",
++        "worker-timers-worker": "^7.0.71"
++      }
++    },
++    "node_modules/worker-timers-broker": {
++      "version": "6.1.8",
++      "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz",
++      "integrity": "sha512-FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@babel/runtime": "^7.24.5",
++        "fast-unique-numbers": "^8.0.13",
++        "tslib": "^2.6.2",
++        "worker-timers-worker": "^7.0.71"
++      }
++    },
++    "node_modules/worker-timers-worker": {
++      "version": "7.0.71",
++      "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz",
++      "integrity": "sha512-ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@babel/runtime": "^7.24.5",
++        "tslib": "^2.6.2"
++      }
++    },
+     "node_modules/wrap-ansi": {
+       "version": "8.1.0",
+       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+@@ -2595,6 +16987,32 @@
+         "node": ">=8"
+       }
+     },
++    "node_modules/wrappy": {
++      "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
++      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/write-file-atomic": {
++      "version": "2.4.3",
++      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
++      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "graceful-fs": "^4.1.11",
++        "imurmurhash": "^0.1.4",
++        "signal-exit": "^3.0.2"
++      }
++    },
++    "node_modules/write-file-atomic/node_modules/signal-exit": {
++      "version": "3.0.7",
++      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
++      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
++      "license": "ISC",
++      "optional": true
++    },
+     "node_modules/ws": {
+       "version": "8.18.3",
+       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+@@ -2616,6 +17034,251 @@
+         }
+       }
+     },
++    "node_modules/xml": {
++      "version": "0.0.12",
++      "resolved": "https://registry.npmjs.org/xml/-/xml-0.0.12.tgz",
++      "integrity": "sha512-vXz2nTtS+bQYemYFzbTxjlmdMOmIhmP+frdnJi3M2Ul/ezrwcW9IYwiwqvecY3PtHNXGKBDrA+DNAEky0zY7Xg==",
++      "optional": true,
++      "engines": {
++        "node": ">=0.4.0"
++      }
++    },
++    "node_modules/xml-crypto": {
++      "version": "2.1.6",
++      "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.1.6.tgz",
++      "integrity": "sha512-jjvpO8vHNV8QFhW5bMypP+k4BjBqHe/HrpIwpPcdUnUTIJakSIuN96o3Sdah4tKu2z64kM/JHEH8iEHGCc6Gyw==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@xmldom/xmldom": "^0.7.9",
++        "xpath": "0.0.32"
++      },
++      "engines": {
++        "node": ">=0.4.0"
++      }
++    },
++    "node_modules/xml-encryption": {
++      "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-2.0.0.tgz",
++      "integrity": "sha512-4Av83DdvAgUQQMfi/w8G01aJshbEZP9ewjmZMpS9t3H+OCZBDvyK4GJPnHGfWiXlArnPbYvR58JB9qF2x9Ds+Q==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "@xmldom/xmldom": "^0.7.0",
++        "escape-html": "^1.0.3",
++        "xpath": "0.0.32"
++      },
++      "engines": {
++        "node": ">=12"
++      }
++    },
++    "node_modules/xml-name-validator": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
++      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
++      "license": "Apache-2.0",
++      "optional": true,
++      "engines": {
++        "node": ">=12"
++      }
++    },
++    "node_modules/xml2js": {
++      "version": "0.6.2",
++      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
++      "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "sax": ">=0.6.0",
++        "xmlbuilder": "~11.0.0"
++      },
++      "engines": {
++        "node": ">=4.0.0"
++      }
++    },
++    "node_modules/xml2js/node_modules/xmlbuilder": {
++      "version": "11.0.1",
++      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
++      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=4.0"
++      }
++    },
++    "node_modules/xmlbuilder": {
++      "version": "15.1.1",
++      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
++      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=8.0"
++      }
++    },
++    "node_modules/xmlchars": {
++      "version": "2.2.0",
++      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
++      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/xmldom": {
++      "version": "0.1.31",
++      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
++      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
++      "deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
++      "license": "(LGPL-2.0 or MIT)",
++      "optional": true,
++      "engines": {
++        "node": ">=0.1"
++      }
++    },
++    "node_modules/xpath": {
++      "version": "0.0.32",
++      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz",
++      "integrity": "sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.6.0"
++      }
++    },
++    "node_modules/xtend": {
++      "version": "4.0.2",
++      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
++      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.4"
++      }
++    },
++    "node_modules/xtraverse": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/xtraverse/-/xtraverse-0.1.0.tgz",
++      "integrity": "sha512-MANQdlG2hl1nQobxz1Rv8hsS1RuBS0C1N6qTOupv+9vmfrReePdxhmB2ecYjvsp4stJ80HD7erjkoF1Hd/FK9A==",
++      "optional": true,
++      "dependencies": {
++        "xmldom": "0.1.x"
++      },
++      "engines": {
++        "node": ">= 0.4.0"
++      }
++    },
++    "node_modules/y18n": {
++      "version": "5.0.8",
++      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
++      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">=10"
++      }
++    },
++    "node_modules/yaeti": {
++      "version": "0.0.6",
++      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
++      "integrity": "sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==",
++      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=0.10.32"
++      }
++    },
++    "node_modules/yallist": {
++      "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
++      "license": "ISC",
++      "optional": true
++    },
++    "node_modules/yargs": {
++      "version": "17.7.2",
++      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
++      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "cliui": "^8.0.1",
++        "escalade": "^3.1.1",
++        "get-caller-file": "^2.0.5",
++        "require-directory": "^2.1.1",
++        "string-width": "^4.2.3",
++        "y18n": "^5.0.5",
++        "yargs-parser": "^21.1.1"
++      },
++      "engines": {
++        "node": ">=12"
++      }
++    },
++    "node_modules/yargs-parser": {
++      "version": "13.1.2",
++      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
++      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
++      "license": "ISC",
++      "optional": true,
++      "dependencies": {
++        "camelcase": "^5.0.0",
++        "decamelize": "^1.2.0"
++      }
++    },
++    "node_modules/yargs/node_modules/ansi-regex": {
++      "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
++      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/yargs/node_modules/emoji-regex": {
++      "version": "8.0.0",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
++      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/yargs/node_modules/string-width": {
++      "version": "4.2.3",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
++      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "emoji-regex": "^8.0.0",
++        "is-fullwidth-code-point": "^3.0.0",
++        "strip-ansi": "^6.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/yargs/node_modules/strip-ansi": {
++      "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
++      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "ansi-regex": "^5.0.1"
++      },
++      "engines": {
++        "node": ">=8"
++      }
++    },
++    "node_modules/yargs/node_modules/yargs-parser": {
++      "version": "21.1.1",
++      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
++      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
++      "license": "ISC",
++      "optional": true,
++      "engines": {
++        "node": ">=12"
++      }
++    },
+     "node_modules/yauzl": {
+       "version": "2.10.0",
+       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+@@ -2635,6 +17298,26 @@
+         "node": "*"
+       }
+     },
++    "node_modules/yocto-queue": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
++      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
++      "license": "MIT",
++      "optional": true,
++      "engines": {
++        "node": ">=10"
++      },
++      "funding": {
++        "url": "https://github.com/sponsors/sindresorhus"
++      }
++    },
++    "node_modules/yub": {
++      "version": "0.11.1",
++      "resolved": "https://registry.npmjs.org/yub/-/yub-0.11.1.tgz",
++      "integrity": "sha512-kAq/VtEc9Avsosb9O7IYuTgQAaKFf6ekOXlUtzv8tie1Froq35wtPOrk6VI+43SLXGmBszC1D0A3gR/jW81neg==",
++      "license": "Apache-2.0",
++      "optional": true
++    },
+     "node_modules/zip-stream": {
+       "version": "6.0.1",
+       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
+@@ -2648,6 +17331,158 @@
+       "engines": {
+         "node": ">= 14"
+       }
++    },
++    "node_modules/zulip": {
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/zulip/-/zulip-0.1.0.tgz",
++      "integrity": "sha512-zsnsxRN0tcR3Qc6GEPg3t2ZrCoLtERE5VqdjHWxTH7Uq+A2hPSfxWEPKbsntpXHgsmywfDMo+P+IdeOcVdX6HA==",
++      "deprecated": "zulip was replaced with zulip-js",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "request": "~2.27.0"
++      }
++    },
++    "node_modules/zulip/node_modules/asn1": {
++      "version": "0.1.11",
++      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
++      "integrity": "sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==",
++      "optional": true,
++      "engines": {
++        "node": ">=0.4.9"
++      }
++    },
++    "node_modules/zulip/node_modules/assert-plus": {
++      "version": "0.1.5",
++      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
++      "integrity": "sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==",
++      "optional": true,
++      "engines": {
++        "node": ">=0.8"
++      }
++    },
++    "node_modules/zulip/node_modules/async": {
++      "version": "0.9.2",
++      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
++      "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==",
++      "license": "MIT",
++      "optional": true
++    },
++    "node_modules/zulip/node_modules/combined-stream": {
++      "version": "0.0.7",
++      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
++      "integrity": "sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==",
++      "optional": true,
++      "dependencies": {
++        "delayed-stream": "0.0.5"
++      },
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/zulip/node_modules/delayed-stream": {
++      "version": "0.0.5",
++      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
++      "integrity": "sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==",
++      "optional": true,
++      "engines": {
++        "node": ">=0.4.0"
++      }
++    },
++    "node_modules/zulip/node_modules/forever-agent": {
++      "version": "0.5.2",
++      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
++      "integrity": "sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A==",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/zulip/node_modules/form-data": {
++      "version": "0.1.4",
++      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
++      "integrity": "sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==",
++      "optional": true,
++      "dependencies": {
++        "async": "~0.9.0",
++        "combined-stream": "~0.0.4",
++        "mime": "~1.2.11"
++      },
++      "engines": {
++        "node": ">= 0.8"
++      }
++    },
++    "node_modules/zulip/node_modules/http-signature": {
++      "version": "0.10.1",
++      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
++      "integrity": "sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==",
++      "license": "MIT",
++      "optional": true,
++      "dependencies": {
++        "asn1": "0.1.11",
++        "assert-plus": "^0.1.5",
++        "ctype": "0.5.3"
++      },
++      "engines": {
++        "node": ">=0.8"
++      }
++    },
++    "node_modules/zulip/node_modules/mime": {
++      "version": "1.2.11",
++      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
++      "integrity": "sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==",
++      "optional": true
++    },
++    "node_modules/zulip/node_modules/oauth-sign": {
++      "version": "0.3.0",
++      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
++      "integrity": "sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/zulip/node_modules/qs": {
++      "version": "0.6.6",
++      "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz",
++      "integrity": "sha512-kN+yNdAf29Jgp+AYHUmC7X4QdJPR8czuMWLNLc0aRxkQ7tB3vJQEONKKT9ou/rW7EbqVec11srC9q9BiVbcnHA==",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
++    },
++    "node_modules/zulip/node_modules/request": {
++      "version": "2.27.0",
++      "resolved": "https://registry.npmjs.org/request/-/request-2.27.0.tgz",
++      "integrity": "sha512-V4AYOEmdUrf0X+CVF2hndyMzIeQ8G7LB45HER/rXZYEwNVI3QFGgLPLafQLHjqtG/ggzHEMb66Ng5IemksixsQ==",
++      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
++      "engines": [
++        "node >= 0.8.0"
++      ],
++      "optional": true,
++      "dependencies": {
++        "aws-sign": "~0.3.0",
++        "cookie-jar": "~0.3.0",
++        "forever-agent": "~0.5.0",
++        "form-data": "~0.1.0",
++        "hawk": "~1.0.0",
++        "http-signature": "~0.10.0",
++        "json-stringify-safe": "~5.0.0",
++        "mime": "~1.2.9",
++        "node-uuid": "~1.4.0",
++        "oauth-sign": "~0.3.0",
++        "qs": "~0.6.0",
++        "tunnel-agent": "~0.3.0"
++      }
++    },
++    "node_modules/zulip/node_modules/tunnel-agent": {
++      "version": "0.3.0",
++      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz",
++      "integrity": "sha512-jlGqHGoKzyyjhwv/c9omAgohntThMcGtw8RV/RDLlkbbc08kni/akVxO62N8HaXMVbVsK1NCnpSK3N2xCt22ww==",
++      "optional": true,
++      "engines": {
++        "node": "*"
++      }
+     }
+   }
+ }
+diff --git a/package.json b/package.json
+index df713ddb..4a0d3fae 100644
+--- a/package.json
++++ b/package.json
+@@ -56,6 +56,65 @@
+     "ws": "8.18.3",
+     "yauzl": "2.10.0"
+   },
++  "optionalDependencies": {
++    "@crowdsec/express-bouncer": "^0.1.0",
++    "@duosecurity/duo_universal": "^2.1.0",
++    "@mongodb-js/saslprep": "^1.3.1",
++    "@mysql/xdevapi": "^8.0.33",
++    "@sendgrid/mail": "^8.1.6",
++    "@xmpp/client": "^0.13.6",
++    "acebase": "^1.29.5",
++    "acme-client": "^4.2.5",
++    "aedes": "^0.51.3",
++    "archiver-zip-encrypted": "^2.0.0",
++    "connect-flash": "^0.1.1",
++    "discord.js": "^14.6.0",
++    "esprima": "^4.0.1",
++    "firebase-admin": "^12.7.0",
++    "googleapis": "^128.0.0",
++    "heapdump": "^0.3.15",
++    "html-minifier-terser": "^7.2.0",
++    "https-proxy-agent": "^7.0.6",
++    "image-size": "^2.0.2",
++    "input": "^1.0.1",
++    "jsdom": "^22.1.0",
++    "jwt-simple": "^0.5.6",
++    "ldapauth-fork": "^5.0.5",
++    "loadavg-windows": "^1.1.1",
++    "mariadb": "^3.4.5",
++    "minio": "^8.0.6",
++    "modern-syslog": "^1.2.0",
++    "mongodb": "^4.17.2",
++    "mongojs": "^3.1.0",
++    "mysql2": "^3.15.1",
++    "node-pushover": "^1.0.0",
++    "node-sspi": "^0.2.10",
++    "node-vault": "^0.10.5",
++    "node-windows": "^0.1.14",
++    "nodemailer": "^6.10.1",
++    "openid-client": "^5.7.1",
++    "passport": "^0.7.0",
++    "passport-azure-oauth2": "^0.1.0",
++    "passport-github2": "^0.1.12",
++    "passport-google-oauth20": "^2.0.0",
++    "passport-saml": "^3.2.4",
++    "passport-twitter": "^1.0.4",
++    "pg": "8.16.3",
++    "plivo": "^4.75.1",
++    "prom-client": "^15.1.3",
++    "sqlite3": "^5.1.7",
++    "ssh2": "^1.17.0",
++    "svg-captcha": "^1.4.0",
++    "syslog": "^0.1.1-1",
++    "telegram": "^2.26.22",
++    "telnyx": "^1.25.5",
++    "twilio": "^4.23.0",
++    "web-push": "^3.6.7",
++    "webdav": "^5.9.0",
++    "wildleek": "^2.0.0",
++    "yub": "^0.11.1",
++    "zulip": "^0.1.0"
++  },
+   "engines": {
+     "node": ">=16.0.0"
+   },
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/me/meshcentral/package.json b/pkgs/by-name/me/meshcentral/package.json
deleted file mode 100644
index 2c91a8c923ac..000000000000
--- a/pkgs/by-name/me/meshcentral/package.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-  "name": "meshcentral",
-  "version": "1.1.56",
-  "keywords": [
-    "Remote Device Management",
-    "Remote Device Monitoring",
-    "Remote Desktop",
-    "Remote Terminal",
-    "Remote File Access",
-    "KVM",
-    "2FA",
-    "Two-Factor Authentication",
-    "Intel Active Management Technology",
-    "Intel AMT"
-  ],
-  "homepage": "https://meshcentral.com",
-  "description": "Web based remote computer management server",
-  "author": "Ylian Saint-Hilaire <ylianst@gmail.com>",
-  "main": "meshcentral.js",
-  "bin": {
-    "meshcentral": "bin/meshcentral"
-  },
-  "license": "Apache-2.0",
-  "files": [
-    "*.js",
-    "amt",
-    "bin",
-    "rdp",
-    "views",
-    "emails",
-    "agents",
-    "public",
-    "translate",
-    "readme.txt",
-    "license.txt",
-    "sample-config.json",
-    "sample-config-advanced.json"
-  ],
-  "dependencies": {
-    "@seald-io/nedb": "4.1.2",
-    "archiver": "7.0.1",
-    "body-parser": "1.20.4",
-    "cbor": "5.2.0",
-    "compression": "1.8.1",
-    "cookie-session": "2.1.1",
-    "express": "4.22.1",
-    "express-handlebars": "7.1.3",
-    "express-ws": "5.0.2",
-    "ipcheck": "0.1.0",
-    "minimist": "1.2.8",
-    "multiparty": "4.2.3",
-    "node-forge": "1.3.2",
-    "otplib": "12.0.1",
-    "ua-client-hints-js": "0.1.2",
-    "ua-parser-js": "1.0.40",
-    "ws": "8.18.3",
-    "yauzl": "2.10.0"
-  },
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Ylianst/MeshCentral.git"
-  },
-  "readme": "readme.md",
-  "optionalDependencies": {
-    "passport": "0.7.0",
-    "connect-flash": "0.1.1",
-    "passport-twitter": "1.0.4",
-    "passport-google-oauth20": "2.0.0",
-    "passport-github2": "0.1.12",
-    "passport-azure-oauth2": "0.1.0",
-    "jwt-simple": "0.5.6",
-    "openid-client": "5.7.1",
-    "passport-saml": "*",
-    "@duosecurity/duo_universal": "2.1.0",
-    "archiver": "7.0.1",
-    "body-parser": "1.20.4",
-    "cbor": "5.2.0",
-    "compression": "1.8.1",
-    "cookie-session": "2.1.1",
-    "express": "4.22.1",
-    "express-handlebars": "7.1.3",
-    "express-ws": "5.0.2",
-    "ipcheck": "0.1.0",
-    "minimist": "1.2.8",
-    "multiparty": "4.2.3",
-    "@seald-io/nedb": "4.1.2",
-    "node-forge": "1.3.2",
-    "ua-parser-js": "1.0.40",
-    "ua-client-hints-js": "0.1.2",
-    "ws": "8.18.3",
-    "yauzl": "2.10.0",
-    "node-windows": "0.1.14",
-    "loadavg-windows": "1.1.1",
-    "node-sspi": "0.2.10",
-    "ldapauth-fork": "5.0.5",
-    "ssh2": "1.17.0",
-    "svg-captcha": "1.4.0",
-    "image-size": "2.0.2",
-    "acme-client": "4.2.5",
-    "aedes": "0.51.3",
-    "mysql2": "3.15.1",
-    "@mysql/xdevapi": "8.0.33",
-    "mongodb": "4.17.2",
-    "@mongodb-js/saslprep": "1.3.1",
-    "pg": "8.16.3",
-    "mariadb": "3.4.5",
-    "acebase": "1.29.5",
-    "sqlite3": "5.1.7",
-    "node-vault": "0.10.5",
-    "https-proxy-agent": "7.0.6",
-    "mongojs": "3.1.0",
-    "nodemailer": "6.10.1",
-    "@sendgrid/mail": "8.1.6",
-    "jsdom": "22.1.0",
-    "esprima": "4.0.1",
-    "html-minifier-terser": "7.2.0",
-    "@crowdsec/express-bouncer": "0.1.0",
-    "prom-client": "15.1.3",
-    "archiver-zip-encrypted": "2.0.0",
-    "googleapis": "128.0.0",
-    "webdav": "5.8.0",
-    "minio": "8.0.6",
-    "wildleek": "2.0.0",
-    "yub": "0.11.1",
-    "otplib": "12.0.1",
-    "twilio": "4.23.0",
-    "plivo": "4.75.1",
-    "telnyx": "1.25.5",
-    "telegram": "2.26.22",
-    "input": "1.0.1",
-    "discord.js": "14.6.0",
-    "@xmpp/client": "0.13.6",
-    "node-pushover": "1.0.0",
-    "zulip": "0.1.0",
-    "web-push": "3.6.7",
-    "firebase-admin": "12.7.0",
-    "modern-syslog": "1.2.0",
-    "syslog": "0.1.1-1",
-    "heapdump": "0.3.15"
-  }
-}
diff --git a/pkgs/by-name/me/meshcentral/package.nix b/pkgs/by-name/me/meshcentral/package.nix
index 282d368c77a6..b42126860b79 100644
--- a/pkgs/by-name/me/meshcentral/package.nix
+++ b/pkgs/by-name/me/meshcentral/package.nix
@@ -1,51 +1,47 @@
 {
   lib,
-  fetchzip,
-  fetchYarnDeps,
-  yarn2nix-moretea,
-  nodejs-slim_20,
-  dos2unix,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nodejs_22,
 }:
 
-yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.56";
+buildNpmPackage (finalAttrs: {
+  pname = "meshcentral";
+  version = "1.1.59";
 
-  src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.56.tgz";
-    sha256 = "1n6kzbgmsn083sdwgwnn6cwch1ay20n1218bgzyv604hyvzrm0i2";
+  src = fetchFromGitHub {
+    owner = "Ylianst";
+    repo = "MeshCentral";
+    tag = finalAttrs.version;
+    hash = "sha256-qfiIofwFOXHzxnqyJyXCgwMqBhONjBiU/5YLOE7u4n8=";
   };
 
+  npmDepsHash = "sha256-UYPx3OIeT1HUgyjY743F/DTwsfIRTlsQLJxK99LbA/k=";
+  # Using the npmDeps with a newer nodejs causes `npm ci` errors, also upstream
+  # states they stick to the LTS version of nodejs:
+  # https://meshcentral.com/docs/MeshCentral2InstallGuide.pdf
+  nodejs = nodejs_22;
+
   patches = [
     ./fix-js-include-paths.patch
+    # from some reason the way the package is installed causes the `require`
+    # line in `$out/lib/node_modules/meshcentral/bin/meshcentral` to import the
+    # main file as a module, and thus nothing happens when it runs. We remove
+    # this conditional since we never use this as a module.
+    ./run.patch
+    # Add `optionalDependencies` that are used during runtime, to
+    # `package{,-lock}.json`. During a video meeting with upstream, they sort
+    # of agreed to track these optionalDependencies from now on, but they are
+    # still not sure about a few details regarding this. See:
+    #
+    # https://github.com/Ylianst/MeshCentral/pull/7672
+    #
+    # The above doesn't apply cleanly on 1.1.57, but hopefully it shouldn't be
+    # too hard to regenerate it for the next version.
+    ./optionalDependencies.patch
   ];
 
-  packageJSON = ./package.json;
-  yarnLock = ./yarn.lock;
-
-  offlineCache = fetchYarnDeps {
-    yarnLock = ./yarn.lock;
-    hash = "sha256-M5TZhY995VFFbY3cjM3jiEceiVm54N6CKxQRVACOL9w=";
-  };
-
-  # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
-  nativeBuildInputs = [ dos2unix ];
-  prePatch = ''
-    find . -name '*.js' -exec dos2unix {} +
-    ln -snf meshcentral.js bin/meshcentral
-  '';
-
-  preFixup = ''
-    mkdir -p $out/bin
-    chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
-    sed -i '1i#!${lib.getExe nodejs-slim_20}' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
-    ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral
-  '';
-
-  doDist = false;
-
-  publishBinsFor = [ ];
-
-  passthru.updateScript = ./update.sh;
+  dontNpmBuild = true;
 
   meta = {
     description = "Computer management web app";
@@ -54,4 +50,4 @@ yarn2nix-moretea.mkYarnPackage {
     license = lib.licenses.asl20;
     mainProgram = "meshcentral";
   };
-}
+})
diff --git a/pkgs/by-name/me/meshcentral/run.patch b/pkgs/by-name/me/meshcentral/run.patch
new file mode 100644
index 000000000000..3bcae0b06de3
--- /dev/null
+++ b/pkgs/by-name/me/meshcentral/run.patch
@@ -0,0 +1,14 @@
+diff --git c/meshcentral.js w/meshcentral.js
+index ea784b4c..62dfd645 100644
+--- c/meshcentral.js
++++ w/meshcentral.js
+@@ -4461,8 +4461,4 @@ function mainStart() {
+     });
+ }
+ 
+-if (require.main === module) {
+-    mainStart(); // Called directly, launch normally.
+-} else {
+-    module.exports.mainStart = mainStart; // Required as a module, useful for winservice.js
+-}
++mainStart(); // Called directly, launch normally.
diff --git a/pkgs/by-name/me/meshcentral/update.sh b/pkgs/by-name/me/meshcentral/update.sh
deleted file mode 100755
index c8a5898e29c7..000000000000
--- a/pkgs/by-name/me/meshcentral/update.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodejs yarn prefetch-yarn-deps jq rsync common-updater-scripts moreutils
-
-set -exuo pipefail
-
-expr_dir=$(cd "$(dirname "$0")"; pwd)
-tmp=$(mktemp -dt update-meshcentral.XXXXXX)
-
-npm show --json meshcentral > "$tmp/npm.json"
-version=$(<"$tmp/npm.json" jq -r .version)
-tarball=$(<"$tmp/npm.json" jq -r .dist.tarball)
-
-prefetch=$(nix-prefetch-url --unpack --print-path "$tarball" | tr '\n' ' ')
-read -r hash storePath <<<"$prefetch"
-cd "$tmp"
-rsync -r --chmod=u=rwX "$storePath/" package/
-cd package
-
-# Very crude way of discovering optional dependencies. These are
-# fetched at runtime by stock upstream, but we don't allow that kind
-# of thing in nix :)
-awk <meshcentral.js "
-  BEGIN { RS=\"[\n;]\" }
-  match(\$0, /(modules|passport) = (\[.*\])$/, a) { print a[2] }
-  match(\$0, /(modules|passport).push\(('[^)]+')\)/, a) { print \"[\" a[2] \"]\" }
-" |
-    tr \' \" |
-    jq --slurp '[if type == "array" then .[] else . end] | flatten' |
-    # And an equally crude way of adding them to package.json. We
-    # can't use yarn add here, because that will blow up on
-    # dependencies which don't support the current platform. Even with
-    # --optional.
-    jq --slurpfile package package.json \
-       '(. | map(. | capture("(?<name>@?[^@]+)(@(?<version>.+))?") | { key: .name, value: (.version // "*")}) | from_entries) as $optionalDependencies | $package | .[] | .optionalDependencies |= . + $optionalDependencies' |
-    sponge package.json
-
-# Fetch all the optional dependencies, so we have them available in
-# yarn.lock/yarn.nix
-yarn install --ignore-scripts
-
-cp package.json "$expr_dir"
-cp yarn.lock "$expr_dir/yarn.lock"
-
-cd "$expr_dir/../../../.."
-update-source-version meshcentral "$version" "$hash" "$tarball"
-
-new_yarn_hash=$(prefetch-yarn-deps "$expr_dir/yarn.lock")
-new_yarn_hash=$(nix-hash --type sha256 --to-sri "$new_yarn_hash")
-old_yarn_hash=$(nix-instantiate --eval -A meshcentral.offlineCache.outputHash | tr -d '"')
-sed -i "$expr_dir/default.nix" -e "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|"
-
-# Only clean up if everything worked
-cd /
-rm -rf "$tmp"
diff --git a/pkgs/by-name/me/meshcentral/yarn.lock b/pkgs/by-name/me/meshcentral/yarn.lock
deleted file mode 100644
index d1d5bdfb67e1..000000000000
--- a/pkgs/by-name/me/meshcentral/yarn.lock
+++ /dev/null
@@ -1,9251 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@aws-crypto/sha256-browser@5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz#153895ef1dba6f9fce38af550e0ef58988eb649e"
-  integrity sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==
-  dependencies:
-    "@aws-crypto/sha256-js" "^5.2.0"
-    "@aws-crypto/supports-web-crypto" "^5.2.0"
-    "@aws-crypto/util" "^5.2.0"
-    "@aws-sdk/types" "^3.222.0"
-    "@aws-sdk/util-locate-window" "^3.0.0"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.6.2"
-
-"@aws-crypto/sha256-js@5.2.0", "@aws-crypto/sha256-js@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz#c4fdb773fdbed9a664fc1a95724e206cf3860042"
-  integrity sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==
-  dependencies:
-    "@aws-crypto/util" "^5.2.0"
-    "@aws-sdk/types" "^3.222.0"
-    tslib "^2.6.2"
-
-"@aws-crypto/supports-web-crypto@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz#a1e399af29269be08e695109aa15da0a07b5b5fb"
-  integrity sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==
-  dependencies:
-    tslib "^2.6.2"
-
-"@aws-crypto/util@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-5.2.0.tgz#71284c9cffe7927ddadac793c14f14886d3876da"
-  integrity sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==
-  dependencies:
-    "@aws-sdk/types" "^3.222.0"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/client-cognito-identity@3.974.0":
-  version "3.974.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.974.0.tgz#1eeee3dc1daaf97f7f66bddd32dd282fb9563509"
-  integrity sha512-V3anrX+U5XgEaLVwZOJIDSXMY0Tk/i/KpjEENB70ovIiTYb0uNnSHWUMlepxVxAIhcvN8egGTEq6vgULIYBJFA==
-  dependencies:
-    "@aws-crypto/sha256-browser" "5.2.0"
-    "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "^3.973.0"
-    "@aws-sdk/credential-provider-node" "^3.972.1"
-    "@aws-sdk/middleware-host-header" "^3.972.1"
-    "@aws-sdk/middleware-logger" "^3.972.1"
-    "@aws-sdk/middleware-recursion-detection" "^3.972.1"
-    "@aws-sdk/middleware-user-agent" "^3.972.1"
-    "@aws-sdk/region-config-resolver" "^3.972.1"
-    "@aws-sdk/types" "^3.973.0"
-    "@aws-sdk/util-endpoints" "3.972.0"
-    "@aws-sdk/util-user-agent-browser" "^3.972.1"
-    "@aws-sdk/util-user-agent-node" "^3.972.1"
-    "@smithy/config-resolver" "^4.4.6"
-    "@smithy/core" "^3.21.0"
-    "@smithy/fetch-http-handler" "^5.3.9"
-    "@smithy/hash-node" "^4.2.8"
-    "@smithy/invalid-dependency" "^4.2.8"
-    "@smithy/middleware-content-length" "^4.2.8"
-    "@smithy/middleware-endpoint" "^4.4.10"
-    "@smithy/middleware-retry" "^4.4.26"
-    "@smithy/middleware-serde" "^4.2.9"
-    "@smithy/middleware-stack" "^4.2.8"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/node-http-handler" "^4.4.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/smithy-client" "^4.10.11"
-    "@smithy/types" "^4.12.0"
-    "@smithy/url-parser" "^4.2.8"
-    "@smithy/util-base64" "^4.3.0"
-    "@smithy/util-body-length-browser" "^4.2.0"
-    "@smithy/util-body-length-node" "^4.2.1"
-    "@smithy/util-defaults-mode-browser" "^4.3.25"
-    "@smithy/util-defaults-mode-node" "^4.2.28"
-    "@smithy/util-endpoints" "^3.2.8"
-    "@smithy/util-middleware" "^4.2.8"
-    "@smithy/util-retry" "^4.2.8"
-    "@smithy/util-utf8" "^4.2.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/client-cognito-identity@3.975.0":
-  version "3.975.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.975.0.tgz#f6494616cb1f298f8ed195db8d55c6aa62cad0e9"
-  integrity sha512-HjPnxHB74FaeLSce+/B2n3H7FJ23lC5D4M2FnHhHdiuvGa8etFrsF12mxC8i635huARHJkqLLbLF2U39xX6AJA==
-  dependencies:
-    "@aws-crypto/sha256-browser" "5.2.0"
-    "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "^3.973.1"
-    "@aws-sdk/credential-provider-node" "^3.972.1"
-    "@aws-sdk/middleware-host-header" "^3.972.1"
-    "@aws-sdk/middleware-logger" "^3.972.1"
-    "@aws-sdk/middleware-recursion-detection" "^3.972.1"
-    "@aws-sdk/middleware-user-agent" "^3.972.2"
-    "@aws-sdk/region-config-resolver" "^3.972.1"
-    "@aws-sdk/types" "^3.973.0"
-    "@aws-sdk/util-endpoints" "3.972.0"
-    "@aws-sdk/util-user-agent-browser" "^3.972.1"
-    "@aws-sdk/util-user-agent-node" "^3.972.1"
-    "@smithy/config-resolver" "^4.4.6"
-    "@smithy/core" "^3.21.1"
-    "@smithy/fetch-http-handler" "^5.3.9"
-    "@smithy/hash-node" "^4.2.8"
-    "@smithy/invalid-dependency" "^4.2.8"
-    "@smithy/middleware-content-length" "^4.2.8"
-    "@smithy/middleware-endpoint" "^4.4.11"
-    "@smithy/middleware-retry" "^4.4.27"
-    "@smithy/middleware-serde" "^4.2.9"
-    "@smithy/middleware-stack" "^4.2.8"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/node-http-handler" "^4.4.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/smithy-client" "^4.10.12"
-    "@smithy/types" "^4.12.0"
-    "@smithy/url-parser" "^4.2.8"
-    "@smithy/util-base64" "^4.3.0"
-    "@smithy/util-body-length-browser" "^4.2.0"
-    "@smithy/util-body-length-node" "^4.2.1"
-    "@smithy/util-defaults-mode-browser" "^4.3.26"
-    "@smithy/util-defaults-mode-node" "^4.2.29"
-    "@smithy/util-endpoints" "^3.2.8"
-    "@smithy/util-middleware" "^4.2.8"
-    "@smithy/util-retry" "^4.2.8"
-    "@smithy/util-utf8" "^4.2.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/client-sso@3.974.0":
-  version "3.974.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.974.0.tgz#48b748556c14117106a858730aa9bddc638a78c7"
-  integrity sha512-ci+GiM0c4ULo4D79UMcY06LcOLcfvUfiyt8PzNY0vbt5O8BfCPYf4QomwVgkNcLLCYmroO4ge2Yy1EsLUlcD6g==
-  dependencies:
-    "@aws-crypto/sha256-browser" "5.2.0"
-    "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "^3.973.0"
-    "@aws-sdk/middleware-host-header" "^3.972.1"
-    "@aws-sdk/middleware-logger" "^3.972.1"
-    "@aws-sdk/middleware-recursion-detection" "^3.972.1"
-    "@aws-sdk/middleware-user-agent" "^3.972.1"
-    "@aws-sdk/region-config-resolver" "^3.972.1"
-    "@aws-sdk/types" "^3.973.0"
-    "@aws-sdk/util-endpoints" "3.972.0"
-    "@aws-sdk/util-user-agent-browser" "^3.972.1"
-    "@aws-sdk/util-user-agent-node" "^3.972.1"
-    "@smithy/config-resolver" "^4.4.6"
-    "@smithy/core" "^3.21.0"
-    "@smithy/fetch-http-handler" "^5.3.9"
-    "@smithy/hash-node" "^4.2.8"
-    "@smithy/invalid-dependency" "^4.2.8"
-    "@smithy/middleware-content-length" "^4.2.8"
-    "@smithy/middleware-endpoint" "^4.4.10"
-    "@smithy/middleware-retry" "^4.4.26"
-    "@smithy/middleware-serde" "^4.2.9"
-    "@smithy/middleware-stack" "^4.2.8"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/node-http-handler" "^4.4.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/smithy-client" "^4.10.11"
-    "@smithy/types" "^4.12.0"
-    "@smithy/url-parser" "^4.2.8"
-    "@smithy/util-base64" "^4.3.0"
-    "@smithy/util-body-length-browser" "^4.2.0"
-    "@smithy/util-body-length-node" "^4.2.1"
-    "@smithy/util-defaults-mode-browser" "^4.3.25"
-    "@smithy/util-defaults-mode-node" "^4.2.28"
-    "@smithy/util-endpoints" "^3.2.8"
-    "@smithy/util-middleware" "^4.2.8"
-    "@smithy/util-retry" "^4.2.8"
-    "@smithy/util-utf8" "^4.2.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/core@^3.973.0", "@aws-sdk/core@^3.973.1":
-  version "3.973.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.973.1.tgz#adcfb29776db599e03b6111d8228b3d1e6400358"
-  integrity sha512-Ocubx42QsMyVs9ANSmFpRm0S+hubWljpPLjOi9UFrtcnVJjrVJTzQ51sN0e5g4e8i8QZ7uY73zosLmgYL7kZTQ==
-  dependencies:
-    "@aws-sdk/types" "^3.973.0"
-    "@aws-sdk/xml-builder" "^3.972.1"
-    "@smithy/core" "^3.21.1"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/signature-v4" "^5.3.8"
-    "@smithy/smithy-client" "^4.10.12"
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-base64" "^4.3.0"
-    "@smithy/util-middleware" "^4.2.8"
-    "@smithy/util-utf8" "^4.2.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-cognito-identity@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.972.1.tgz#42554afa25ba1bb518f7364eef7a560f04954408"
-  integrity sha512-/qAxlqkzW7UX9SUN+kFX1ZMHy0pFgwrfCjQYbVSmTOQvSprmzpNNj5RvVY/2WX78s5GMc6VQH/pwrOAxXbTiiA==
-  dependencies:
-    "@aws-sdk/client-cognito-identity" "3.974.0"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-env@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.1.tgz#203a02b4a9d31418a1db5dff369a2d65aa67c872"
-  integrity sha512-/etNHqnx96phy/SjI0HRC588o4vKH5F0xfkZ13yAATV7aNrb+5gYGNE6ePWafP+FuZ3HkULSSlJFj0AxgrAqYw==
-  dependencies:
-    "@aws-sdk/core" "^3.973.0"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-http@^3.972.1", "@aws-sdk/credential-provider-http@^3.972.2":
-  version "3.972.2"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.2.tgz#40c00a344b4cf0d9a4e20a4d18c62bc6e611dde9"
-  integrity sha512-mXgdaUfe5oM+tWKyeZ7Vh/iQ94FrkMky1uuzwTOmFADiRcSk5uHy/e3boEFedXiT/PRGzgBmqvJVK4F6lUISCg==
-  dependencies:
-    "@aws-sdk/core" "^3.973.1"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/fetch-http-handler" "^5.3.9"
-    "@smithy/node-http-handler" "^4.4.8"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/smithy-client" "^4.10.12"
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-stream" "^4.5.10"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-ini@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.1.tgz#63a242d11fe0ae0c159d97ed2ab9a8d7a3db6d4c"
-  integrity sha512-OdbJA3v+XlNDsrYzNPRUwr8l7gw1r/nR8l4r96MDzSBDU8WEo8T6C06SvwaXR8SpzsjO3sq5KMP86wXWg7Rj4g==
-  dependencies:
-    "@aws-sdk/core" "^3.973.0"
-    "@aws-sdk/credential-provider-env" "^3.972.1"
-    "@aws-sdk/credential-provider-http" "^3.972.1"
-    "@aws-sdk/credential-provider-login" "^3.972.1"
-    "@aws-sdk/credential-provider-process" "^3.972.1"
-    "@aws-sdk/credential-provider-sso" "^3.972.1"
-    "@aws-sdk/credential-provider-web-identity" "^3.972.1"
-    "@aws-sdk/nested-clients" "3.974.0"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/credential-provider-imds" "^4.2.8"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/shared-ini-file-loader" "^4.4.3"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-login@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.1.tgz#ea0bba6fd40696dd0e065f3817b41627abd894a8"
-  integrity sha512-CccqDGL6ZrF3/EFWZefvKW7QwwRdxlHUO8NVBKNVcNq6womrPDvqB6xc9icACtE0XB0a7PLoSTkAg8bQVkTO2w==
-  dependencies:
-    "@aws-sdk/core" "^3.973.0"
-    "@aws-sdk/nested-clients" "3.974.0"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/shared-ini-file-loader" "^4.4.3"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-node@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.1.tgz#6cdb367e2828d9b9ce34b69f97fd4eef4a514232"
-  integrity sha512-DwXPk9GfuU/xG9tmCyXFVkCr6X3W8ZCoL5Ptb0pbltEx1/LCcg7T+PBqDlPiiinNCD6ilIoMJDWsnJ8ikzZA7Q==
-  dependencies:
-    "@aws-sdk/credential-provider-env" "^3.972.1"
-    "@aws-sdk/credential-provider-http" "^3.972.1"
-    "@aws-sdk/credential-provider-ini" "^3.972.1"
-    "@aws-sdk/credential-provider-process" "^3.972.1"
-    "@aws-sdk/credential-provider-sso" "^3.972.1"
-    "@aws-sdk/credential-provider-web-identity" "^3.972.1"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/credential-provider-imds" "^4.2.8"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/shared-ini-file-loader" "^4.4.3"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-process@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.1.tgz#9eb226dea12a1a9e4a14534946961c82c49cecdf"
-  integrity sha512-bi47Zigu3692SJwdBvo8y1dEwE6B61stCwCFnuRWJVTfiM84B+VTSCV661CSWJmIZzmcy7J5J3kWyxL02iHj0w==
-  dependencies:
-    "@aws-sdk/core" "^3.973.0"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/shared-ini-file-loader" "^4.4.3"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-sso@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.1.tgz#c5a461fb714668b9e1ce268ff4da174bf1e1b45e"
-  integrity sha512-dLZVNhM7wSgVUFsgVYgI5hb5Z/9PUkT46pk/SHrSmUqfx6YDvoV4YcPtaiRqviPpEGGiRtdQMEadyOKIRqulUQ==
-  dependencies:
-    "@aws-sdk/client-sso" "3.974.0"
-    "@aws-sdk/core" "^3.973.0"
-    "@aws-sdk/token-providers" "3.974.0"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/shared-ini-file-loader" "^4.4.3"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-provider-web-identity@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.1.tgz#e85aba05a81a1998acc1c24c49baa8b733ac392a"
-  integrity sha512-YMDeYgi0u687Ay0dAq/pFPKuijrlKTgsaB/UATbxCs/FzZfMiG4If5ksywHmmW7MiYUF8VVv+uou3TczvLrN4w==
-  dependencies:
-    "@aws-sdk/core" "^3.973.0"
-    "@aws-sdk/nested-clients" "3.974.0"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/shared-ini-file-loader" "^4.4.3"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/credential-providers@^3.186.0":
-  version "3.975.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.975.0.tgz#4f2822cc28739ed68f28fecf97f7b77b9da42117"
-  integrity sha512-3aisLw0I1yrmUpPuhqXZg8eLWOMQhwD/kRaP57WpTJzb2dGz3VouIgkyiUQALMx4KrA2SCy74zq52HnbFxtwRg==
-  dependencies:
-    "@aws-sdk/client-cognito-identity" "3.975.0"
-    "@aws-sdk/core" "^3.973.1"
-    "@aws-sdk/credential-provider-cognito-identity" "^3.972.1"
-    "@aws-sdk/credential-provider-env" "^3.972.1"
-    "@aws-sdk/credential-provider-http" "^3.972.2"
-    "@aws-sdk/credential-provider-ini" "^3.972.1"
-    "@aws-sdk/credential-provider-login" "^3.972.1"
-    "@aws-sdk/credential-provider-node" "^3.972.1"
-    "@aws-sdk/credential-provider-process" "^3.972.1"
-    "@aws-sdk/credential-provider-sso" "^3.972.1"
-    "@aws-sdk/credential-provider-web-identity" "^3.972.1"
-    "@aws-sdk/nested-clients" "3.975.0"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/config-resolver" "^4.4.6"
-    "@smithy/core" "^3.21.1"
-    "@smithy/credential-provider-imds" "^4.2.8"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/middleware-host-header@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.1.tgz#83afa4340bd9294688426f9a0eca992a392faf6e"
-  integrity sha512-/R82lXLPmZ9JaUGSUdKtBp2k/5xQxvBT3zZWyKiBOhyulFotlfvdlrO8TnqstBimsl4lYEYySDL+W6ldFh6ALg==
-  dependencies:
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/middleware-logger@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.972.1.tgz#aa0f53cc90c4fc46cf96c4d9197366ba006b71eb"
-  integrity sha512-JGgFl6cHg9G2FHu4lyFIzmFN8KESBiRr84gLC3Aeni0Gt1nKm+KxWLBuha/RPcXxJygGXCcMM4AykkIwxor8RA==
-  dependencies:
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/middleware-recursion-detection@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.1.tgz#0a10c64960a45378ee586a1f3532ed5f608b27f8"
-  integrity sha512-taGzNRe8vPHjnliqXIHp9kBgIemLE/xCaRTMH1NH0cncHeaPcjxtnCroAAM9aOlPuKvBe2CpZESyvM1+D8oI7Q==
-  dependencies:
-    "@aws-sdk/types" "^3.973.0"
-    "@aws/lambda-invoke-store" "^0.2.2"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/middleware-user-agent@^3.972.1", "@aws-sdk/middleware-user-agent@^3.972.2":
-  version "3.972.2"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.2.tgz#569648066796ace1545b3ae2896c2e9a3c58f577"
-  integrity sha512-d+Exq074wy0X6wvShg/kmZVtkah+28vMuqCtuY3cydg8LUZOJBtbAolCpEJizSyb8mJJZF9BjWaTANXL4OYnkg==
-  dependencies:
-    "@aws-sdk/core" "^3.973.1"
-    "@aws-sdk/types" "^3.973.0"
-    "@aws-sdk/util-endpoints" "3.972.0"
-    "@smithy/core" "^3.21.1"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/nested-clients@3.974.0":
-  version "3.974.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.974.0.tgz#61f31582e743e15f9088cfbfad1f5bcc62c36cef"
-  integrity sha512-k3dwdo/vOiHMJc9gMnkPl1BA5aQfTrZbz+8fiDkWrPagqAioZgmo5oiaOaeX0grObfJQKDtcpPFR4iWf8cgl8Q==
-  dependencies:
-    "@aws-crypto/sha256-browser" "5.2.0"
-    "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "^3.973.0"
-    "@aws-sdk/middleware-host-header" "^3.972.1"
-    "@aws-sdk/middleware-logger" "^3.972.1"
-    "@aws-sdk/middleware-recursion-detection" "^3.972.1"
-    "@aws-sdk/middleware-user-agent" "^3.972.1"
-    "@aws-sdk/region-config-resolver" "^3.972.1"
-    "@aws-sdk/types" "^3.973.0"
-    "@aws-sdk/util-endpoints" "3.972.0"
-    "@aws-sdk/util-user-agent-browser" "^3.972.1"
-    "@aws-sdk/util-user-agent-node" "^3.972.1"
-    "@smithy/config-resolver" "^4.4.6"
-    "@smithy/core" "^3.21.0"
-    "@smithy/fetch-http-handler" "^5.3.9"
-    "@smithy/hash-node" "^4.2.8"
-    "@smithy/invalid-dependency" "^4.2.8"
-    "@smithy/middleware-content-length" "^4.2.8"
-    "@smithy/middleware-endpoint" "^4.4.10"
-    "@smithy/middleware-retry" "^4.4.26"
-    "@smithy/middleware-serde" "^4.2.9"
-    "@smithy/middleware-stack" "^4.2.8"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/node-http-handler" "^4.4.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/smithy-client" "^4.10.11"
-    "@smithy/types" "^4.12.0"
-    "@smithy/url-parser" "^4.2.8"
-    "@smithy/util-base64" "^4.3.0"
-    "@smithy/util-body-length-browser" "^4.2.0"
-    "@smithy/util-body-length-node" "^4.2.1"
-    "@smithy/util-defaults-mode-browser" "^4.3.25"
-    "@smithy/util-defaults-mode-node" "^4.2.28"
-    "@smithy/util-endpoints" "^3.2.8"
-    "@smithy/util-middleware" "^4.2.8"
-    "@smithy/util-retry" "^4.2.8"
-    "@smithy/util-utf8" "^4.2.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/nested-clients@3.975.0":
-  version "3.975.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.975.0.tgz#566d4508dfd2b83e86a829670d9219d307f6f1a5"
-  integrity sha512-OkeFHPlQj2c/Y5bQGkX14pxhDWUGUFt3LRHhjcDKsSCw6lrxKcxN3WFZN0qbJwKNydP+knL5nxvfgKiCLpTLRA==
-  dependencies:
-    "@aws-crypto/sha256-browser" "5.2.0"
-    "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "^3.973.1"
-    "@aws-sdk/middleware-host-header" "^3.972.1"
-    "@aws-sdk/middleware-logger" "^3.972.1"
-    "@aws-sdk/middleware-recursion-detection" "^3.972.1"
-    "@aws-sdk/middleware-user-agent" "^3.972.2"
-    "@aws-sdk/region-config-resolver" "^3.972.1"
-    "@aws-sdk/types" "^3.973.0"
-    "@aws-sdk/util-endpoints" "3.972.0"
-    "@aws-sdk/util-user-agent-browser" "^3.972.1"
-    "@aws-sdk/util-user-agent-node" "^3.972.1"
-    "@smithy/config-resolver" "^4.4.6"
-    "@smithy/core" "^3.21.1"
-    "@smithy/fetch-http-handler" "^5.3.9"
-    "@smithy/hash-node" "^4.2.8"
-    "@smithy/invalid-dependency" "^4.2.8"
-    "@smithy/middleware-content-length" "^4.2.8"
-    "@smithy/middleware-endpoint" "^4.4.11"
-    "@smithy/middleware-retry" "^4.4.27"
-    "@smithy/middleware-serde" "^4.2.9"
-    "@smithy/middleware-stack" "^4.2.8"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/node-http-handler" "^4.4.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/smithy-client" "^4.10.12"
-    "@smithy/types" "^4.12.0"
-    "@smithy/url-parser" "^4.2.8"
-    "@smithy/util-base64" "^4.3.0"
-    "@smithy/util-body-length-browser" "^4.2.0"
-    "@smithy/util-body-length-node" "^4.2.1"
-    "@smithy/util-defaults-mode-browser" "^4.3.26"
-    "@smithy/util-defaults-mode-node" "^4.2.29"
-    "@smithy/util-endpoints" "^3.2.8"
-    "@smithy/util-middleware" "^4.2.8"
-    "@smithy/util-retry" "^4.2.8"
-    "@smithy/util-utf8" "^4.2.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/region-config-resolver@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.1.tgz#650ac559f159aa9ca4ffd82514536a4bef897058"
-  integrity sha512-voIY8RORpxLAEgEkYaTFnkaIuRwVBEc+RjVZYcSSllPV+ZEKAacai6kNhJeE3D70Le+JCfvRb52tng/AVHY+jQ==
-  dependencies:
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/config-resolver" "^4.4.6"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/token-providers@3.974.0":
-  version "3.974.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.974.0.tgz#e396b236fde11a738b66c8af94f5957124afc4f5"
-  integrity sha512-cBykL0LiccKIgNhGWvQRTPvsBLPZxnmJU3pYxG538jpFX8lQtrCy1L7mmIHNEdxIdIGEPgAEHF8/JQxgBToqUQ==
-  dependencies:
-    "@aws-sdk/core" "^3.973.0"
-    "@aws-sdk/nested-clients" "3.974.0"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/shared-ini-file-loader" "^4.4.3"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/types@3.972.0":
-  version "3.972.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.972.0.tgz#2c8ddf7fa63038da2e27d888c1bd5817b62e30fa"
-  integrity sha512-U7xBIbLSetONxb2bNzHyDgND3oKGoIfmknrEVnoEU4GUSs+0augUOIn9DIWGUO2ETcRFdsRUnmx9KhPT9Ojbug==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/types@^3.222.0", "@aws-sdk/types@^3.973.0":
-  version "3.973.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.973.0.tgz#4e7428dbaac37797a81339f646f40f41cc22a1fe"
-  integrity sha512-jYIdB7a7jhRTvyb378nsjyvJh1Si+zVduJ6urMNGpz8RjkmHZ+9vM2H07XaIB2Cfq0GhJRZYOfUCH8uqQhqBkQ==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/util-endpoints@3.972.0":
-  version "3.972.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.972.0.tgz#0c483aa4853ea3858024bc502454ba395e533cb0"
-  integrity sha512-6JHsl1V/a1ZW8D8AFfd4R52fwZPnZ5H4U6DS8m/bWT8qad72NvbOFAC7U2cDtFs2TShqUO3TEiX/EJibtY3ijg==
-  dependencies:
-    "@aws-sdk/types" "3.972.0"
-    "@smithy/types" "^4.12.0"
-    "@smithy/url-parser" "^4.2.8"
-    "@smithy/util-endpoints" "^3.2.8"
-    tslib "^2.6.2"
-
-"@aws-sdk/util-locate-window@^3.0.0":
-  version "3.965.3"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.965.3.tgz#07f98caac26b51442e4ee4e7d66b87a07be267ea"
-  integrity sha512-FNUqAjlKAGA7GM05kywE99q8wiPHPZqrzhq3wXRga6PRD6A0kzT85Pb0AzYBVTBRpSrKyyr6M92Y6bnSBVp2BA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@aws-sdk/util-user-agent-browser@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.1.tgz#56ead0d350fc7790dd0e29f01f140672a04c4dc9"
-  integrity sha512-IgF55NFmJX8d9Wql9M0nEpk2eYbuD8G4781FN4/fFgwTXBn86DvlZJuRWDCMcMqZymnBVX7HW9r+3r9ylqfW0w==
-  dependencies:
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/types" "^4.12.0"
-    bowser "^2.11.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/util-user-agent-node@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.972.1.tgz#4d7e57a43a9c0965d0623133b8fa53e527309f2e"
-  integrity sha512-oIs4JFcADzoZ0c915R83XvK2HltWupxNsXUIuZse2rgk7b97zTpkxaqXiH0h9ylh31qtgo/t8hp4tIqcsMrEbQ==
-  dependencies:
-    "@aws-sdk/middleware-user-agent" "^3.972.1"
-    "@aws-sdk/types" "^3.973.0"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@aws-sdk/xml-builder@^3.972.1":
-  version "3.972.1"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.972.1.tgz#5fa96ab8cf7b975ff3f0a0d3c0a46aeb88c7ce46"
-  integrity sha512-6zZGlPOqn7Xb+25MAXGb1JhgvaC5HjZj6GzszuVrnEgbhvzBRFGKYemuHBV4bho+dtqeYKPgaZUv7/e80hIGNg==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    fast-xml-parser "5.2.5"
-    tslib "^2.6.2"
-
-"@aws/lambda-invoke-store@^0.2.2":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.3.tgz#f1137f56209ccc69c15f826242cbf37f828617dd"
-  integrity sha512-oLvsaPMTBejkkmHhjf09xTgk71mOqyr/409NKhRIL08If7AhVfUsJhVsx386uJaqNd42v9kWamQ9lFbkoC2dYw==
-
-"@babel/cli@^7.26.4":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.28.6.tgz#1da8eb79f92cbe75542b853b3b1db683c5ea406a"
-  integrity sha512-6EUNcuBbNkj08Oj4gAZ+BUU8yLCgKzgVX4gaTh09Ya2C8ICM4P+G30g4m3akRxSYAp3A/gnWchrNst7px4/nUQ==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.28"
-    commander "^6.2.0"
-    convert-source-map "^2.0.0"
-    fs-readdir-recursive "^1.1.0"
-    glob "^7.2.0"
-    make-dir "^2.1.0"
-    slash "^2.0.0"
-  optionalDependencies:
-    "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
-    chokidar "^3.6.0"
-
-"@babel/code-frame@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.28.6.tgz#72499312ec58b1e2245ba4a4f550c132be4982f7"
-  integrity sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.28.5"
-    js-tokens "^4.0.0"
-    picocolors "^1.1.1"
-
-"@babel/compat-data@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.6.tgz#103f466803fa0f059e82ccac271475470570d74c"
-  integrity sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==
-
-"@babel/core@^7.26.0":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.6.tgz#531bf883a1126e53501ba46eb3bb414047af507f"
-  integrity sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==
-  dependencies:
-    "@babel/code-frame" "^7.28.6"
-    "@babel/generator" "^7.28.6"
-    "@babel/helper-compilation-targets" "^7.28.6"
-    "@babel/helper-module-transforms" "^7.28.6"
-    "@babel/helpers" "^7.28.6"
-    "@babel/parser" "^7.28.6"
-    "@babel/template" "^7.28.6"
-    "@babel/traverse" "^7.28.6"
-    "@babel/types" "^7.28.6"
-    "@jridgewell/remapping" "^2.3.5"
-    convert-source-map "^2.0.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.3"
-    semver "^6.3.1"
-
-"@babel/generator@^7.28.6", "@babel/generator@^7.4.0":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.6.tgz#48dcc65d98fcc8626a48f72b62e263d25fc3c3f1"
-  integrity sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==
-  dependencies:
-    "@babel/parser" "^7.28.6"
-    "@babel/types" "^7.28.6"
-    "@jridgewell/gen-mapping" "^0.3.12"
-    "@jridgewell/trace-mapping" "^0.3.28"
-    jsesc "^3.0.2"
-
-"@babel/helper-annotate-as-pure@^7.27.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz#f31fd86b915fc4daf1f3ac6976c59be7084ed9c5"
-  integrity sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==
-  dependencies:
-    "@babel/types" "^7.27.3"
-
-"@babel/helper-compilation-targets@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz#32c4a3f41f12ed1532179b108a4d746e105c2b25"
-  integrity sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==
-  dependencies:
-    "@babel/compat-data" "^7.28.6"
-    "@babel/helper-validator-option" "^7.27.1"
-    browserslist "^4.24.0"
-    lru-cache "^5.1.1"
-    semver "^6.3.1"
-
-"@babel/helper-globals@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
-  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
-
-"@babel/helper-module-imports@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz#60632cbd6ffb70b22823187201116762a03e2d5c"
-  integrity sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==
-  dependencies:
-    "@babel/traverse" "^7.28.6"
-    "@babel/types" "^7.28.6"
-
-"@babel/helper-module-transforms@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz#9312d9d9e56edc35aeb6e95c25d4106b50b9eb1e"
-  integrity sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.28.6"
-    "@babel/helper-validator-identifier" "^7.28.5"
-    "@babel/traverse" "^7.28.6"
-
-"@babel/helper-plugin-utils@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz#6f13ea251b68c8532e985fd532f28741a8af9ac8"
-  integrity sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==
-
-"@babel/helper-string-parser@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
-  integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
-
-"@babel/helper-validator-identifier@^7.28.5":
-  version "7.28.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
-  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
-
-"@babel/helper-validator-option@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
-  integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
-
-"@babel/helpers@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.6.tgz#fca903a313ae675617936e8998b814c415cbf5d7"
-  integrity sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==
-  dependencies:
-    "@babel/template" "^7.28.6"
-    "@babel/types" "^7.28.6"
-
-"@babel/node@^7.26.0":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.28.6.tgz#ee8091de3e87b9f0ff6726f3b682bc633b34654d"
-  integrity sha512-X3i8Zq/3Au5of74DzuYfgKS2oKRrYGcd5O5QlrB7AqspYKWy0XRTG69HDYnower3HRH/lL38IYAZVPh3OQMXVg==
-  dependencies:
-    "@babel/register" "^7.28.6"
-    commander "^6.2.0"
-    core-js "^3.30.2"
-    node-environment-flags "^1.0.5"
-    regenerator-runtime "^0.14.0"
-    v8flags "^3.1.1"
-
-"@babel/parser@^7.28.6", "@babel/parser@^7.4.3":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.6.tgz#f01a8885b7fa1e56dd8a155130226cd698ef13fd"
-  integrity sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==
-  dependencies:
-    "@babel/types" "^7.28.6"
-
-"@babel/plugin-syntax-jsx@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz#f8ca28bbd84883b5fea0e447c635b81ba73997ee"
-  integrity sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.28.6"
-
-"@babel/plugin-transform-react-jsx@^7.25.9":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.28.6.tgz#f51cb70a90b9529fbb71ee1f75ea27b7078eed62"
-  integrity sha512-61bxqhiRfAACulXSLd/GxqmAedUSrRZIu/cbaT18T1CetkTmtDN15it7i80ru4DVqRK1WMxQhXs+Lf9kajm5Ow==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.27.3"
-    "@babel/helper-module-imports" "^7.28.6"
-    "@babel/helper-plugin-utils" "^7.28.6"
-    "@babel/plugin-syntax-jsx" "^7.28.6"
-    "@babel/types" "^7.28.6"
-
-"@babel/register@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.28.6.tgz#f54461dd32f6a418c1eb1f583c95ed0b7266ea4c"
-  integrity sha512-pgcbbEl/dWQYb6L6Yew6F94rdwygfuv+vJ/tXfwIOYAfPB6TNWpXUMEtEq3YuTeHRdvMIhvz13bkT9CNaS+wqA==
-  dependencies:
-    clone-deep "^4.0.1"
-    find-cache-dir "^2.0.0"
-    make-dir "^2.1.0"
-    pirates "^4.0.6"
-    source-map-support "^0.5.16"
-
-"@babel/runtime@^7.23.8", "@babel/runtime@^7.24.5":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.6.tgz#d267a43cb1836dc4d182cce93ae75ba954ef6d2b"
-  integrity sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==
-
-"@babel/template@^7.28.6", "@babel/template@^7.4.0":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.28.6.tgz#0e7e56ecedb78aeef66ce7972b082fce76a23e57"
-  integrity sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==
-  dependencies:
-    "@babel/code-frame" "^7.28.6"
-    "@babel/parser" "^7.28.6"
-    "@babel/types" "^7.28.6"
-
-"@babel/traverse@^7.28.6", "@babel/traverse@^7.4.3":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.6.tgz#871ddc79a80599a5030c53b1cc48cbe3a5583c2e"
-  integrity sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==
-  dependencies:
-    "@babel/code-frame" "^7.28.6"
-    "@babel/generator" "^7.28.6"
-    "@babel/helper-globals" "^7.28.0"
-    "@babel/parser" "^7.28.6"
-    "@babel/template" "^7.28.6"
-    "@babel/types" "^7.28.6"
-    debug "^4.3.1"
-
-"@babel/types@^7.27.3", "@babel/types@^7.28.6", "@babel/types@^7.4.0":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.6.tgz#c3e9377f1b155005bcc4c46020e7e394e13089df"
-  integrity sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.28.5"
-
-"@buttercup/fetch@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@buttercup/fetch/-/fetch-0.2.1.tgz#f38bed5f879231920ed4477bd202695d6e70a867"
-  integrity sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==
-  optionalDependencies:
-    node-fetch "^3.3.0"
-
-"@colors/colors@1.6.0", "@colors/colors@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0"
-  integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==
-
-"@crowdsec/express-bouncer@0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@crowdsec/express-bouncer/-/express-bouncer-0.1.0.tgz#458a604d7fad3ce2acf382bcb17e344fb74e9932"
-  integrity sha512-cS5ATNInb914yOubWznMB02lheDLImtIZ8A7n99sn7q2YI+P3Zt6G/Mttp+d1NL1PDUkFBMFlBreOslkcWwLFQ==
-  dependencies:
-    ip-address "^7.1.0"
-    isomorphic-fetch "^3.0.0"
-    lodash "^4.17.21"
-    svg-captcha "^1.4.0"
-    winston "^3.3.3"
-
-"@cryptography/aes@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@cryptography/aes/-/aes-0.1.1.tgz#0096726a6a2a2cfc2e8bddf3997e98e49f1a224d"
-  integrity sha512-PcYz4FDGblO6tM2kSC+VzhhK62vml6k6/YAkiWtyPvrgJVfnDRoHGDtKn5UiaRRUrvUTTocBpvc2rRgTCqxjsg==
-
-"@dabh/diagnostics@^2.0.8":
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.8.tgz#ead97e72ca312cf0e6dd7af0d300b58993a31a5e"
-  integrity sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==
-  dependencies:
-    "@so-ric/colorspace" "^1.1.6"
-    enabled "2.0.x"
-    kuler "^2.0.0"
-
-"@discordjs/builders@^1.3.0":
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.13.1.tgz#f76e2b806049d4f9ac99f1a06cdc02736599093e"
-  integrity sha512-cOU0UDHc3lp/5nKByDxkmRiNZBpdp0kx55aarbiAfakfKJHlxv/yFW1zmIqCAmwH5CRlrH9iMFKJMpvW4DPB+w==
-  dependencies:
-    "@discordjs/formatters" "^0.6.2"
-    "@discordjs/util" "^1.2.0"
-    "@sapphire/shapeshift" "^4.0.0"
-    discord-api-types "^0.38.33"
-    fast-deep-equal "^3.1.3"
-    ts-mixer "^6.0.4"
-    tslib "^2.6.3"
-
-"@discordjs/collection@^1.2.0", "@discordjs/collection@^1.5.1":
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-1.5.3.tgz#5a1250159ebfff9efa4f963cfa7e97f1b291be18"
-  integrity sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ==
-
-"@discordjs/formatters@^0.6.2":
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/@discordjs/formatters/-/formatters-0.6.2.tgz#93c4a213ceb49c9a28e8adb65d50a027579b8c30"
-  integrity sha512-y4UPwWhH6vChKRkGdMB4odasUbHOUwy7KL+OVwF86PvT6QVOwElx+TiI1/6kcmcEe+g5YRXJFiXSXUdabqZOvQ==
-  dependencies:
-    discord-api-types "^0.38.33"
-
-"@discordjs/rest@^1.3.0":
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/@discordjs/rest/-/rest-1.7.1.tgz#eeef0e71a37c95fa27962129729b2aa9de8e3752"
-  integrity sha512-Ofa9UqT0U45G/eX86cURQnX7gzOJLG2oC28VhIk/G6IliYgQF7jFByBJEykPSHE4MxPhqCleYvmsrtfKh1nYmQ==
-  dependencies:
-    "@discordjs/collection" "^1.5.1"
-    "@discordjs/util" "^0.3.0"
-    "@sapphire/async-queue" "^1.5.0"
-    "@sapphire/snowflake" "^3.4.2"
-    discord-api-types "^0.37.41"
-    file-type "^18.3.0"
-    tslib "^2.5.0"
-    undici "^5.22.0"
-
-"@discordjs/util@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@discordjs/util/-/util-0.1.0.tgz#e42ca1bf407bc6d9adf252877d1b206e32ba369a"
-  integrity sha512-e7d+PaTLVQav6rOc2tojh2y6FE8S7REkqLldq1XF4soCx74XB/DIjbVbVLtBemf0nLW77ntz0v+o5DytKwFNLQ==
-
-"@discordjs/util@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@discordjs/util/-/util-0.3.1.tgz#4e8737e1dcff7e9f5eccc3116fb44755b65b1e97"
-  integrity sha512-HxXKYKg7vohx2/OupUN/4Sd02Ev3PBJ5q0gtjdcvXb0ErCva8jNHWfe/v5sU3UKjIB/uxOhc+TDOnhqffj9pRA==
-
-"@discordjs/util@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@discordjs/util/-/util-1.2.0.tgz#a45a2b643423094eb6378060c623f4d3e6d593d4"
-  integrity sha512-3LKP7F2+atl9vJFhaBjn4nOaSWahZ/yWjOvA4e5pnXkt2qyXRCHLxoBQy81GFtLGCq7K9lPm9R517M1U+/90Qg==
-  dependencies:
-    discord-api-types "^0.38.33"
-
-"@duosecurity/duo_universal@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@duosecurity/duo_universal/-/duo_universal-2.1.0.tgz#05312e7bf7557625145e7e243a7ece2385853dcf"
-  integrity sha512-6i+oSezndETL5nwaZbe8OVXA8GTalI0KmY4hc060iTaGpkj5/WY1OWC1W9lWDg0dWpYohsTwZy1dBQOs+vUc7g==
-  dependencies:
-    axios "^1.2.2"
-    jsonwebtoken "^9.0.0"
-
-"@fastify/busboy@^2.0.0":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
-  integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
-
-"@fastify/busboy@^3.0.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-3.2.0.tgz#13ed8212f3b9ba697611529d15347f8528058cea"
-  integrity sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==
-
-"@firebase/app-check-interop-types@0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.2.tgz#455b6562c7a3de3ef75ea51f72dfec5829ad6997"
-  integrity sha512-LMs47Vinv2HBMZi49C09dJxp0QT5LwDzFaVGf/+ITHe3BlIhUiLNttkATSXplc89A2lAaeTqjgqVkiRfUGyQiQ==
-
-"@firebase/app-types@0.9.2":
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.9.2.tgz#8cbcceba784753a7c0066a4809bc22f93adee080"
-  integrity sha512-oMEZ1TDlBz479lmABwWsWjzHwheQKiAgnuKxE0pz0IXCVx7/rtlkx1fQ6GfgK24WCrxDKMplZrT50Kh04iMbXQ==
-
-"@firebase/auth-interop-types@0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.2.3.tgz#927f1f2139a680b55fef0bddbff2c982b08587e8"
-  integrity sha512-Fc9wuJGgxoxQeavybiuwgyi+0rssr76b+nHpj+eGhXFYAdudMWyfBHvFL/I5fEHniUM/UQdFzi9VXJK2iZF7FQ==
-
-"@firebase/component@0.6.9":
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.6.9.tgz#4248cfeab222245ada0d7f78ece95a87574532b4"
-  integrity sha512-gm8EUEJE/fEac86AvHn8Z/QW8BvR56TBw3hMW0O838J/1mThYQXAIQBgUv75EqlCZfdawpWLrKt1uXvp9ciK3Q==
-  dependencies:
-    "@firebase/util" "1.10.0"
-    tslib "^2.1.0"
-
-"@firebase/database-compat@1.0.8":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-1.0.8.tgz#69ab03d00e27a89f65486896ea219094aa38c27f"
-  integrity sha512-OpeWZoPE3sGIRPBKYnW9wLad25RaWbGyk7fFQe4xnJQKRzlynWeFBSRRAoLE2Old01WXwskUiucNqUUVlFsceg==
-  dependencies:
-    "@firebase/component" "0.6.9"
-    "@firebase/database" "1.0.8"
-    "@firebase/database-types" "1.0.5"
-    "@firebase/logger" "0.4.2"
-    "@firebase/util" "1.10.0"
-    tslib "^2.1.0"
-
-"@firebase/database-types@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-1.0.5.tgz#2d923f42e3d9911b9eec537ed8b5ecaa0ce95c37"
-  integrity sha512-fTlqCNwFYyq/C6W7AJ5OCuq5CeZuBEsEwptnVxlNPkWCo5cTTyukzAHRSO/jaQcItz33FfYrrFk1SJofcu2AaQ==
-  dependencies:
-    "@firebase/app-types" "0.9.2"
-    "@firebase/util" "1.10.0"
-
-"@firebase/database@1.0.8":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-1.0.8.tgz#01bb0d0cb5653ae6a6641523f6f085b4c1be9c2f"
-  integrity sha512-dzXALZeBI1U5TXt6619cv0+tgEhJiwlUtQ55WNZY7vGAjv7Q1QioV969iYwt1AQQ0ovHnEW0YW9TiBfefLvErg==
-  dependencies:
-    "@firebase/app-check-interop-types" "0.3.2"
-    "@firebase/auth-interop-types" "0.2.3"
-    "@firebase/component" "0.6.9"
-    "@firebase/logger" "0.4.2"
-    "@firebase/util" "1.10.0"
-    faye-websocket "0.11.4"
-    tslib "^2.1.0"
-
-"@firebase/logger@0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.4.2.tgz#74dfcfeedee810deb8a7080d5b7eba56aa16ffa2"
-  integrity sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==
-  dependencies:
-    tslib "^2.1.0"
-
-"@firebase/util@1.10.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.10.0.tgz#9ec8ab54da82bfc31baff0c43cb281998cbeddab"
-  integrity sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==
-  dependencies:
-    tslib "^2.1.0"
-
-"@gar/promisify@^1.0.1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
-"@google-cloud/firestore@^7.7.0":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.6.tgz#0a2b26e215aa4f903267f82370450753b84db16a"
-  integrity sha512-EW/O8ktzwLfyWBOsNuhRoMi8lrC3clHM5LVFhGvO1HCsLozCOOXRAlHrYBoE6HL42Sc8yYMuCb2XqcnJ4OOEpw==
-  dependencies:
-    "@opentelemetry/api" "^1.3.0"
-    fast-deep-equal "^3.1.1"
-    functional-red-black-tree "^1.0.1"
-    google-gax "^4.3.3"
-    protobufjs "^7.2.6"
-
-"@google-cloud/paginator@^5.0.0":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-5.0.2.tgz#86ad773266ce9f3b82955a8f75e22cd012ccc889"
-  integrity sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==
-  dependencies:
-    arrify "^2.0.0"
-    extend "^3.0.2"
-
-"@google-cloud/projectify@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-4.0.0.tgz#d600e0433daf51b88c1fa95ac7f02e38e80a07be"
-  integrity sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==
-
-"@google-cloud/promisify@<4.1.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-4.0.0.tgz#a906e533ebdd0f754dca2509933334ce58b8c8b1"
-  integrity sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==
-
-"@google-cloud/storage@^7.7.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.18.0.tgz#1b0e7415633e97b8ce0364c3e3aac033a52cb318"
-  integrity sha512-r3ZwDMiz4nwW6R922Z1pwpePxyRwE5GdevYX63hRmAQUkUQJcBH/79EnQPDv5cOv1mFBgevdNWQfi3tie3dHrQ==
-  dependencies:
-    "@google-cloud/paginator" "^5.0.0"
-    "@google-cloud/projectify" "^4.0.0"
-    "@google-cloud/promisify" "<4.1.0"
-    abort-controller "^3.0.0"
-    async-retry "^1.3.3"
-    duplexify "^4.1.3"
-    fast-xml-parser "^4.4.1"
-    gaxios "^6.0.2"
-    google-auth-library "^9.6.3"
-    html-entities "^2.5.2"
-    mime "^3.0.0"
-    p-limit "^3.0.1"
-    retry-request "^7.0.0"
-    teeny-request "^9.0.0"
-    uuid "^8.0.0"
-
-"@grpc/grpc-js@^1.10.9":
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.14.3.tgz#4c9b817a900ae4020ddc28515ae4b52c78cfb8da"
-  integrity sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==
-  dependencies:
-    "@grpc/proto-loader" "^0.8.0"
-    "@js-sdsl/ordered-map" "^4.4.2"
-
-"@grpc/proto-loader@^0.7.13":
-  version "0.7.15"
-  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.15.tgz#4cdfbf35a35461fc843abe8b9e2c0770b5095e60"
-  integrity sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==
-  dependencies:
-    lodash.camelcase "^4.3.0"
-    long "^5.0.0"
-    protobufjs "^7.2.5"
-    yargs "^17.7.2"
-
-"@grpc/proto-loader@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.8.0.tgz#b6c324dd909c458a0e4aa9bfd3d69cf78a4b9bd8"
-  integrity sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==
-  dependencies:
-    lodash.camelcase "^4.3.0"
-    long "^5.0.0"
-    protobufjs "^7.5.3"
-    yargs "^17.7.2"
-
-"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
-  integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
-
-"@hapi/topo@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
-  integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-
-"@isaacs/cliui@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
-  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
-  dependencies:
-    string-width "^5.1.2"
-    string-width-cjs "npm:string-width@^4.2.0"
-    strip-ansi "^7.0.1"
-    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
-    wrap-ansi "^8.1.0"
-    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
-"@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
-  version "0.3.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
-  integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==
-  dependencies:
-    "@jridgewell/sourcemap-codec" "^1.5.0"
-    "@jridgewell/trace-mapping" "^0.3.24"
-
-"@jridgewell/remapping@^2.3.5":
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/remapping/-/remapping-2.3.5.tgz#375c476d1972947851ba1e15ae8f123047445aa1"
-  integrity sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.24"
-
-"@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
-  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
-
-"@jridgewell/source-map@^0.3.3":
-  version "0.3.11"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.11.tgz#b21835cbd36db656b857c2ad02ebd413cc13a9ba"
-  integrity sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
-
-"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
-  integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
-
-"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
-  version "0.3.31"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
-  integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
-"@js-sdsl/ordered-map@^4.4.2":
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c"
-  integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==
-
-"@mongodb-js/saslprep@1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.3.1.tgz#a7d6cfc085f801e51ba5cbec6aa84cad858e1d2d"
-  integrity sha512-6nZrq5kfAz0POWyhljnbWQQJQ5uT8oE2ddX303q1uY0tWsivWKgBDXBBvuFPwOqRRalXJuVO9EjOdVtuhLX0zg==
-  dependencies:
-    sparse-bitfield "^3.0.3"
-
-"@mongodb-js/saslprep@^1.1.0":
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.4.5.tgz#0f53a6c5a350fbe4bfa12cc80b69e8d358f1bbc0"
-  integrity sha512-k64Lbyb7ycCSXHSLzxVdb2xsKGPMvYZfCICXvDsI8Z65CeWQzTEKS4YmGbnqw+U9RBvLPTsB6UCmwkgsDTGWIw==
-  dependencies:
-    sparse-bitfield "^3.0.3"
-
-"@mysql/xdevapi@8.0.33":
-  version "8.0.33"
-  resolved "https://registry.yarnpkg.com/@mysql/xdevapi/-/xdevapi-8.0.33.tgz#966f71563a2e2a27cb5279fdf72fa9ee41538ec2"
-  integrity sha512-SXy+1CMtTb6qyKo/vzj/krWU4Ui6PnEtkkUjwdLpVdxkt0noZdDMmoGUxtMsm+Y2l15tme1MVuYvxMK7RJVfEA==
-  dependencies:
-    google-protobuf "3.19.4"
-    lossless-json "2.0.1"
-    parsimmon "1.18.1"
-
-"@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3":
-  version "2.1.8-no-fsevents.3"
-  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz#323d72dd25103d0c4fbdce89dadf574a787b1f9b"
-  integrity sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==
-
-"@npmcli/fs@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
-  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
-  dependencies:
-    "@gar/promisify" "^1.0.1"
-    semver "^7.3.5"
-
-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
-"@opentelemetry/api@^1.3.0", "@opentelemetry/api@^1.4.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
-  integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
-
-"@otplib/core@^12.0.1":
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/@otplib/core/-/core-12.0.1.tgz#73720a8cedce211fe5b3f683cd5a9c098eaf0f8d"
-  integrity sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==
-
-"@otplib/plugin-crypto@^12.0.1":
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/@otplib/plugin-crypto/-/plugin-crypto-12.0.1.tgz#2b42c624227f4f9303c1c041fca399eddcbae25e"
-  integrity sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==
-  dependencies:
-    "@otplib/core" "^12.0.1"
-
-"@otplib/plugin-thirty-two@^12.0.1":
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/@otplib/plugin-thirty-two/-/plugin-thirty-two-12.0.1.tgz#5cc9b56e6e89f2a1fe4a2b38900ca4e11c87aa9e"
-  integrity sha512-MtT+uqRso909UkbrrYpJ6XFjj9D+x2Py7KjTO9JDPhL0bJUYVu5kFP4TFZW4NFAywrAtFRxOVY261u0qwb93gA==
-  dependencies:
-    "@otplib/core" "^12.0.1"
-    thirty-two "^1.0.2"
-
-"@otplib/preset-default@^12.0.1":
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/@otplib/preset-default/-/preset-default-12.0.1.tgz#cb596553c08251e71b187ada4a2246ad2a3165ba"
-  integrity sha512-xf1v9oOJRyXfluBhMdpOkr+bsE+Irt+0D5uHtvg6x1eosfmHCsCC6ej/m7FXiWqdo0+ZUI6xSKDhJwc8yfiOPQ==
-  dependencies:
-    "@otplib/core" "^12.0.1"
-    "@otplib/plugin-crypto" "^12.0.1"
-    "@otplib/plugin-thirty-two" "^12.0.1"
-
-"@otplib/preset-v11@^12.0.1":
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/@otplib/preset-v11/-/preset-v11-12.0.1.tgz#4c7266712e7230500b421ba89252963c838fc96d"
-  integrity sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==
-  dependencies:
-    "@otplib/core" "^12.0.1"
-    "@otplib/plugin-crypto" "^12.0.1"
-    "@otplib/plugin-thirty-two" "^12.0.1"
-
-"@pkgjs/parseargs@^0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
-  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
-
-"@postman/form-data@~3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@postman/form-data/-/form-data-3.1.1.tgz#d0446d0d3639a291f5e800e89fa1d0d3723f9414"
-  integrity sha512-vjh8Q2a8S6UCm/KKs31XFJqEEgmbjBmpPNVV2eVav6905wyFAwaUOBGA1NPBI4ERH9MMZc6w0umFgM6WbEPMdg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
-"@postman/tough-cookie@~4.1.3-postman.1":
-  version "4.1.3-postman.1"
-  resolved "https://registry.yarnpkg.com/@postman/tough-cookie/-/tough-cookie-4.1.3-postman.1.tgz#9b2aa98f0b42f7e8381ee7e66277cd0253a91f11"
-  integrity sha512-txpgUqZOnWYnUHZpHjkfb0IwVH4qJmyq77pPnJLlfhMtdCLMFTEeQHlzQiK906aaNCe4NEB5fGJHo9uzGbFMeA==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
-
-"@postman/tunnel-agent@^0.6.8":
-  version "0.6.8"
-  resolved "https://registry.yarnpkg.com/@postman/tunnel-agent/-/tunnel-agent-0.6.8.tgz#f0a9d83b16980445116bc71053e877dbd9aec2a9"
-  integrity sha512-2U42SmZW5G+suEcS++zB94sBWNO4qD4bvETGFRFDTqSpYl5ksfjcPqzYpgQgXgUmb6dfz+fAGbkcRamounGm0w==
-  dependencies:
-    safe-buffer "^5.0.1"
-
-"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
-  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
-
-"@protobufjs/base64@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
-  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
-
-"@protobufjs/codegen@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
-  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
-
-"@protobufjs/eventemitter@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
-  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
-
-"@protobufjs/fetch@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
-  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.1"
-    "@protobufjs/inquire" "^1.1.0"
-
-"@protobufjs/float@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
-  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
-
-"@protobufjs/inquire@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
-  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
-
-"@protobufjs/path@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
-  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
-
-"@protobufjs/pool@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
-  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
-
-"@protobufjs/utf8@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
-  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
-
-"@sapphire/async-queue@^1.5.0":
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.5.5.tgz#2b18d402bb920b65b13ad4ed8dfb6c386300dd84"
-  integrity sha512-cvGzxbba6sav2zZkH8GPf2oGk9yYoD5qrNWdu9fRehifgnFZJMV+nuy2nON2roRO4yQQ+v7MK/Pktl/HgfsUXg==
-
-"@sapphire/shapeshift@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-4.0.0.tgz#86c1b41002ff5d0b2ad21cbc3418b06834b89040"
-  integrity sha512-d9dUmWVA7MMiKobL3VpLF8P2aeanRTu6ypG2OIaEv/ZHH/SUQ2iHOVyi5wAPjQ+HmnMuL0whK9ez8I/raWbtIg==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-    lodash "^4.17.21"
-
-"@sapphire/snowflake@^3.2.2", "@sapphire/snowflake@^3.4.2":
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.5.5.tgz#33a60ab4231e3cab29e8a0077f342125f2c8d1bd"
-  integrity sha512-xzvBr1Q1c4lCe7i6sRnrofxeO1QTP/LKQ6A6qy0iB4x5yfiSfARMEQEghojzTNALDTcv8En04qYNIco9/K9eZQ==
-
-"@seald-io/binary-search-tree@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@seald-io/binary-search-tree/-/binary-search-tree-1.0.3.tgz#165a9a456eaa30d15885b25db83861bcce2c6a74"
-  integrity sha512-qv3jnwoakeax2razYaMsGI/luWdliBLHTdC6jU55hQt1hcFqzauH/HsBollQ7IR4ySTtYhT+xyHoijpA16C+tA==
-
-"@seald-io/nedb@4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@seald-io/nedb/-/nedb-4.1.2.tgz#cacd7253d9826b51495d024ca768dea3fe63e853"
-  integrity sha512-bDr6TqjBVS2rDyYM9CPxAnotj5FuNL9NF8o7h7YyFXM7yruqT4ddr+PkSb2mJvvw991bqdftazkEo38gykvaww==
-  dependencies:
-    "@seald-io/binary-search-tree" "^1.0.3"
-    localforage "^1.10.0"
-    util "^0.12.5"
-
-"@sendgrid/client@^8.1.5":
-  version "8.1.6"
-  resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-8.1.6.tgz#b8e1a30e6e3d4b6e425d68e6c373047046a809ca"
-  integrity sha512-/BHu0hqwXNHr2aLhcXU7RmmlVqrdfrbY9KpaNj00KZHlVOVoRxRVrpOCabIB+91ISXJ6+mLM9vpaVUhK6TwBWA==
-  dependencies:
-    "@sendgrid/helpers" "^8.0.0"
-    axios "^1.12.0"
-
-"@sendgrid/helpers@^8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@sendgrid/helpers/-/helpers-8.0.0.tgz#f74bf9743bacafe4c8573be46166130c604c0fc1"
-  integrity sha512-Ze7WuW2Xzy5GT5WRx+yEv89fsg/pgy3T1E3FS0QEx0/VvRmigMZ5qyVGhJz4SxomegDkzXv/i0aFPpHKN8qdAA==
-  dependencies:
-    deepmerge "^4.2.2"
-
-"@sendgrid/mail@8.1.6":
-  version "8.1.6"
-  resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.6.tgz#9c253c13d49867fdb6f7df1360643825236eef22"
-  integrity sha512-/ZqxUvKeEztU9drOoPC/8opEPOk+jLlB2q4+xpx6HVLq6aFu3pMpalkTpAQz8XfRfpLp8O25bh6pGPcHDCYpqg==
-  dependencies:
-    "@sendgrid/client" "^8.1.5"
-    "@sendgrid/helpers" "^8.0.0"
-
-"@sideway/address@^4.1.5":
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
-  integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==
-  dependencies:
-    "@hapi/hoek" "^9.0.0"
-
-"@sideway/formula@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
-  integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
-
-"@sideway/pinpoint@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
-  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
-
-"@smithy/abort-controller@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.2.8.tgz#3bfd7a51acce88eaec9a65c3382542be9f3a053a"
-  integrity sha512-peuVfkYHAmS5ybKxWcfraK7WBBP0J+rkfUcbHJJKQ4ir3UAUNQI+Y4Vt/PqSzGqgloJ5O1dk7+WzNL8wcCSXbw==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/config-resolver@^4.4.6":
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.4.6.tgz#bd7f65b3da93f37f1c97a399ade0124635c02297"
-  integrity sha512-qJpzYC64kaj3S0fueiu3kXm8xPrR3PcXDPEgnaNMRn0EjNSZFoFjvbUp0YUDsRhN1CB90EnHJtbxWKevnH99UQ==
-  dependencies:
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-config-provider" "^4.2.0"
-    "@smithy/util-endpoints" "^3.2.8"
-    "@smithy/util-middleware" "^4.2.8"
-    tslib "^2.6.2"
-
-"@smithy/core@^3.21.0", "@smithy/core@^3.21.1":
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.21.1.tgz#37e851fa28dbc0a16748507f579d6463049d9127"
-  integrity sha512-NUH8R4O6FkN8HKMojzbGg/5pNjsfTjlMmeFclyPfPaXXUrbr5TzhWgbf7t92wfrpCHRgpjyz7ffASIS3wX28aA==
-  dependencies:
-    "@smithy/middleware-serde" "^4.2.9"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-base64" "^4.3.0"
-    "@smithy/util-body-length-browser" "^4.2.0"
-    "@smithy/util-middleware" "^4.2.8"
-    "@smithy/util-stream" "^4.5.10"
-    "@smithy/util-utf8" "^4.2.0"
-    "@smithy/uuid" "^1.1.0"
-    tslib "^2.6.2"
-
-"@smithy/credential-provider-imds@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.8.tgz#b2f4bf759ab1c35c0dd00fa3470263c749ebf60f"
-  integrity sha512-FNT0xHS1c/CPN8upqbMFP83+ul5YgdisfCfkZ86Jh2NSmnqw/AJ6x5pEogVCTVvSm7j9MopRU89bmDelxuDMYw==
-  dependencies:
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/types" "^4.12.0"
-    "@smithy/url-parser" "^4.2.8"
-    tslib "^2.6.2"
-
-"@smithy/fetch-http-handler@^5.3.9":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.9.tgz#edfc9e90e0c7538c81e22e748d62c0066cc91d58"
-  integrity sha512-I4UhmcTYXBrct03rwzQX1Y/iqQlzVQaPxWjCjula++5EmWq9YGBrx6bbGqluGc1f0XEfhSkiY4jhLgbsJUMKRA==
-  dependencies:
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/querystring-builder" "^4.2.8"
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-base64" "^4.3.0"
-    tslib "^2.6.2"
-
-"@smithy/hash-node@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.2.8.tgz#c21eb055041716cd492dda3a109852a94b6d47bb"
-  integrity sha512-7ZIlPbmaDGxVoxErDZnuFG18WekhbA/g2/i97wGj+wUBeS6pcUeAym8u4BXh/75RXWhgIJhyC11hBzig6MljwA==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-buffer-from" "^4.2.0"
-    "@smithy/util-utf8" "^4.2.0"
-    tslib "^2.6.2"
-
-"@smithy/invalid-dependency@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.8.tgz#c578bc6d5540c877aaed5034b986b5f6bd896451"
-  integrity sha512-N9iozRybwAQ2dn9Fot9kI6/w9vos2oTXLhtK7ovGqwZjlOcxu6XhPlpLpC+INsxktqHinn5gS2DXDjDF2kG5sQ==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/is-array-buffer@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111"
-  integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/is-array-buffer@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-4.2.0.tgz#b0f874c43887d3ad44f472a0f3f961bcce0550c2"
-  integrity sha512-DZZZBvC7sjcYh4MazJSGiWMI2L7E0oCiRHREDzIxi/M2LY79/21iXt6aPLHge82wi5LsuRF5A06Ds3+0mlh6CQ==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/middleware-content-length@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.8.tgz#82c1df578fa70fe5800cf305b8788b9d2836a3e4"
-  integrity sha512-RO0jeoaYAB1qBRhfVyq0pMgBoUK34YEJxVxyjOWYZiOKOq2yMZ4MnVXMZCUDenpozHue207+9P5ilTV1zeda0A==
-  dependencies:
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-endpoint@^4.4.10", "@smithy/middleware-endpoint@^4.4.11":
-  version "4.4.11"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.11.tgz#943731f77d9afdba52fd629d9b01996a8b3e31b3"
-  integrity sha512-/WqsrycweGGfb9sSzME4CrsuayjJF6BueBmkKlcbeU5q18OhxRrvvKlmfw3tpDsK5ilx2XUJvoukwxHB0nHs/Q==
-  dependencies:
-    "@smithy/core" "^3.21.1"
-    "@smithy/middleware-serde" "^4.2.9"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/shared-ini-file-loader" "^4.4.3"
-    "@smithy/types" "^4.12.0"
-    "@smithy/url-parser" "^4.2.8"
-    "@smithy/util-middleware" "^4.2.8"
-    tslib "^2.6.2"
-
-"@smithy/middleware-retry@^4.4.26", "@smithy/middleware-retry@^4.4.27":
-  version "4.4.27"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.4.27.tgz#15cb596969a7d6a0881daac4bd5a8feb07992643"
-  integrity sha512-xFUYCGRVsfgiN5EjsJJSzih9+yjStgMTCLANPlf0LVQkPDYCe0hz97qbdTZosFOiYlGBlHYityGRxrQ/hxhfVQ==
-  dependencies:
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/service-error-classification" "^4.2.8"
-    "@smithy/smithy-client" "^4.10.12"
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-middleware" "^4.2.8"
-    "@smithy/util-retry" "^4.2.8"
-    "@smithy/uuid" "^1.1.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-serde@^4.2.9":
-  version "4.2.9"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.2.9.tgz#fd9d9b02b265aef67c9a30f55c2a5038fc9ca791"
-  integrity sha512-eMNiej0u/snzDvlqRGSN3Vl0ESn3838+nKyVfF2FKNXFbi4SERYT6PR392D39iczngbqqGG0Jl1DlCnp7tBbXQ==
-  dependencies:
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-stack@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.2.8.tgz#4fa9cfaaa05f664c9bb15d45608f3cb4f6da2b76"
-  integrity sha512-w6LCfOviTYQjBctOKSwy6A8FIkQy7ICvglrZFl6Bw4FmcQ1Z420fUtIhxaUZZshRe0VCq4kvDiPiXrPZAe8oRA==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/node-config-provider@^4.3.8":
-  version "4.3.8"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.3.8.tgz#85a0683448262b2eb822f64c14278d4887526377"
-  integrity sha512-aFP1ai4lrbVlWjfpAfRSL8KFcnJQYfTl5QxLJXY32vghJrDuFyPZ6LtUL+JEGYiFRG1PfPLHLoxj107ulncLIg==
-  dependencies:
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/shared-ini-file-loader" "^4.4.3"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/node-http-handler@^4.4.8":
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.4.8.tgz#298cc148c812b9a79f0ebd75e82bdab9e6d0bbcd"
-  integrity sha512-q9u+MSbJVIJ1QmJ4+1u+cERXkrhuILCBDsJUBAW1MPE6sFonbCNaegFuwW9ll8kh5UdyY3jOkoOGlc7BesoLpg==
-  dependencies:
-    "@smithy/abort-controller" "^4.2.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/querystring-builder" "^4.2.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/property-provider@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.2.8.tgz#6e37b30923d2d31370c50ce303a4339020031472"
-  integrity sha512-EtCTbyIveCKeOXDSWSdze3k612yCPq1YbXsbqX3UHhkOSW8zKsM9NOJG5gTIya0vbY2DIaieG8pKo1rITHYL0w==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/protocol-http@^5.3.8":
-  version "5.3.8"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.8.tgz#0938f69a3c3673694c2f489a640fce468ce75006"
-  integrity sha512-QNINVDhxpZ5QnP3aviNHQFlRogQZDfYlCkQT+7tJnErPQbDhysondEjhikuANxgMsZrkGeiAxXy4jguEGsDrWQ==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-builder@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.2.8.tgz#2fa72d29eb1844a6a9933038bbbb14d6fe385e93"
-  integrity sha512-Xr83r31+DrE8CP3MqPgMJl+pQlLLmOfiEUnoyAlGzzJIrEsbKsPy1hqH0qySaQm4oWrCBlUqRt+idEgunKB+iw==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-uri-escape" "^4.2.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-parser@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.2.8.tgz#aa3f2456180ce70242e89018d0b1ebd4782a6347"
-  integrity sha512-vUurovluVy50CUlazOiXkPq40KGvGWSdmusa3130MwrR1UNnNgKAlj58wlOe61XSHRpUfIIh6cE0zZ8mzKaDPA==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/service-error-classification@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.2.8.tgz#6d89dbad4f4978d7b75a44af8c18c22455a16cdc"
-  integrity sha512-mZ5xddodpJhEt3RkCjbmUQuXUOaPNTkbMGR0bcS8FE0bJDLMZlhmpgrvPNCYglVw5rsYTpSnv19womw9WWXKQQ==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-
-"@smithy/shared-ini-file-loader@^4.4.3":
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.3.tgz#6054215ecb3a6532b13aa49a9fbda640b63be50e"
-  integrity sha512-DfQjxXQnzC5UbCUPeC3Ie8u+rIWZTvuDPAGU/BxzrOGhRvgUanaP68kDZA+jaT3ZI+djOf+4dERGlm9mWfFDrg==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/signature-v4@^5.3.8":
-  version "5.3.8"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.8.tgz#796619b10b7cc9467d0625b0ebd263ae04fdfb76"
-  integrity sha512-6A4vdGj7qKNRF16UIcO8HhHjKW27thsxYci+5r/uVRkdcBEkOEiY8OMPuydLX4QHSrJqGHPJzPRwwVTqbLZJhg==
-  dependencies:
-    "@smithy/is-array-buffer" "^4.2.0"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-hex-encoding" "^4.2.0"
-    "@smithy/util-middleware" "^4.2.8"
-    "@smithy/util-uri-escape" "^4.2.0"
-    "@smithy/util-utf8" "^4.2.0"
-    tslib "^2.6.2"
-
-"@smithy/smithy-client@^4.10.11", "@smithy/smithy-client@^4.10.12":
-  version "4.10.12"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.10.12.tgz#6632bf67284b9224c268eae7447720146255aaab"
-  integrity sha512-VKO/HKoQ5OrSHW6AJUmEnUKeXI1/5LfCwO9cwyao7CmLvGnZeM1i36Lyful3LK1XU7HwTVieTqO1y2C/6t3qtA==
-  dependencies:
-    "@smithy/core" "^3.21.1"
-    "@smithy/middleware-endpoint" "^4.4.11"
-    "@smithy/middleware-stack" "^4.2.8"
-    "@smithy/protocol-http" "^5.3.8"
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-stream" "^4.5.10"
-    tslib "^2.6.2"
-
-"@smithy/types@^4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.12.0.tgz#55d2479080922bda516092dbf31916991d9c6fee"
-  integrity sha512-9YcuJVTOBDjg9LWo23Qp0lTQ3D7fQsQtwle0jVfpbUHy9qBwCEgKuVH4FqFB3VYu0nwdHKiEMA+oXz7oV8X1kw==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/url-parser@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.2.8.tgz#b44267cd704abe114abcd00580acdd9e4acc1177"
-  integrity sha512-NQho9U68TGMEU639YkXnVMV3GEFFULmmaWdlu1E9qzyIePOHsoSnagTGSDv1Zi8DCNN6btxOSdgmy5E/hsZwhA==
-  dependencies:
-    "@smithy/querystring-parser" "^4.2.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/util-base64@^4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-4.3.0.tgz#5e287b528793aa7363877c1a02cd880d2e76241d"
-  integrity sha512-GkXZ59JfyxsIwNTWFnjmFEI8kZpRNIBfxKjv09+nkAWPt/4aGaEWMM04m4sxgNVWkbt2MdSvE3KF/PfX4nFedQ==
-  dependencies:
-    "@smithy/util-buffer-from" "^4.2.0"
-    "@smithy/util-utf8" "^4.2.0"
-    tslib "^2.6.2"
-
-"@smithy/util-body-length-browser@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.0.tgz#04e9fc51ee7a3e7f648a4b4bcdf96c350cfa4d61"
-  integrity sha512-Fkoh/I76szMKJnBXWPdFkQJl2r9SjPt3cMzLdOB6eJ4Pnpas8hVoWPYemX/peO0yrrvldgCUVJqOAjUrOLjbxg==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/util-body-length-node@^4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-4.2.1.tgz#79c8a5d18e010cce6c42d5cbaf6c1958523e6fec"
-  integrity sha512-h53dz/pISVrVrfxV1iqXlx5pRg3V2YWFcSQyPyXZRrZoZj4R4DeWRDo1a7dd3CPTcFi3kE+98tuNyD2axyZReA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/util-buffer-from@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b"
-  integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==
-  dependencies:
-    "@smithy/is-array-buffer" "^2.2.0"
-    tslib "^2.6.2"
-
-"@smithy/util-buffer-from@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-4.2.0.tgz#7abd12c4991b546e7cee24d1e8b4bfaa35c68a9d"
-  integrity sha512-kAY9hTKulTNevM2nlRtxAG2FQ3B2OR6QIrPY3zE5LqJy1oxzmgBGsHLWTcNhWXKchgA0WHW+mZkQrng/pgcCew==
-  dependencies:
-    "@smithy/is-array-buffer" "^4.2.0"
-    tslib "^2.6.2"
-
-"@smithy/util-config-provider@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-4.2.0.tgz#2e4722937f8feda4dcb09672c59925a4e6286cfc"
-  integrity sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/util-defaults-mode-browser@^4.3.25", "@smithy/util-defaults-mode-browser@^4.3.26":
-  version "4.3.26"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.26.tgz#f7fa31e4a02bbea020ea37d6b45a60f0f5c489c5"
-  integrity sha512-vva0dzYUTgn7DdE0uaha10uEdAgmdLnNFowKFjpMm6p2R0XDk5FHPX3CBJLzWQkQXuEprsb0hGz9YwbicNWhjw==
-  dependencies:
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/smithy-client" "^4.10.12"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/util-defaults-mode-node@^4.2.28", "@smithy/util-defaults-mode-node@^4.2.29":
-  version "4.2.29"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.29.tgz#2f52f19e51df19c9044ddb3c4864c96dde7e93f4"
-  integrity sha512-c6D7IUBsZt/aNnTBHMTf+OVh+h/JcxUUgfTcIJaWRe6zhOum1X+pNKSZtZ+7fbOn5I99XVFtmrnXKv8yHHErTQ==
-  dependencies:
-    "@smithy/config-resolver" "^4.4.6"
-    "@smithy/credential-provider-imds" "^4.2.8"
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/property-provider" "^4.2.8"
-    "@smithy/smithy-client" "^4.10.12"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/util-endpoints@^3.2.8":
-  version "3.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.2.8.tgz#5650bda2adac989ff2e562606088c5de3dcb1b36"
-  integrity sha512-8JaVTn3pBDkhZgHQ8R0epwWt+BqPSLCjdjXXusK1onwJlRuN69fbvSK66aIKKO7SwVFM6x2J2ox5X8pOaWcUEw==
-  dependencies:
-    "@smithy/node-config-provider" "^4.3.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/util-hex-encoding@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.0.tgz#1c22ea3d1e2c3a81ff81c0a4f9c056a175068a7b"
-  integrity sha512-CCQBwJIvXMLKxVbO88IukazJD9a4kQ9ZN7/UMGBjBcJYvatpWk+9g870El4cB8/EJxfe+k+y0GmR9CAzkF+Nbw==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/util-middleware@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.8.tgz#1da33f29a74c7ebd9e584813cb7e12881600a80a"
-  integrity sha512-PMqfeJxLcNPMDgvPbbLl/2Vpin+luxqTGPpW3NAQVLbRrFRzTa4rNAASYeIGjRV9Ytuhzny39SpyU04EQreF+A==
-  dependencies:
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/util-retry@^4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.2.8.tgz#23f3f47baf0681233fd0c37b259e60e268c73b11"
-  integrity sha512-CfJqwvoRY0kTGe5AkQokpURNCT1u/MkRzMTASWMPPo2hNSnKtF1D45dQl3DE2LKLr4m+PW9mCeBMJr5mCAVThg==
-  dependencies:
-    "@smithy/service-error-classification" "^4.2.8"
-    "@smithy/types" "^4.12.0"
-    tslib "^2.6.2"
-
-"@smithy/util-stream@^4.5.10":
-  version "4.5.10"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.5.10.tgz#3a7b56f0bdc3833205f80fea67d8e76756ea055b"
-  integrity sha512-jbqemy51UFSZSp2y0ZmRfckmrzuKww95zT9BYMmuJ8v3altGcqjwoV1tzpOwuHaKrwQrCjIzOib499ymr2f98g==
-  dependencies:
-    "@smithy/fetch-http-handler" "^5.3.9"
-    "@smithy/node-http-handler" "^4.4.8"
-    "@smithy/types" "^4.12.0"
-    "@smithy/util-base64" "^4.3.0"
-    "@smithy/util-buffer-from" "^4.2.0"
-    "@smithy/util-hex-encoding" "^4.2.0"
-    "@smithy/util-utf8" "^4.2.0"
-    tslib "^2.6.2"
-
-"@smithy/util-uri-escape@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-4.2.0.tgz#096a4cec537d108ac24a68a9c60bee73fc7e3a9e"
-  integrity sha512-igZpCKV9+E/Mzrpq6YacdTQ0qTiLm85gD6N/IrmyDvQFA4UnU3d5g3m8tMT/6zG/vVkWSU+VxeUyGonL62DuxA==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/util-utf8@^2.0.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5"
-  integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==
-  dependencies:
-    "@smithy/util-buffer-from" "^2.2.0"
-    tslib "^2.6.2"
-
-"@smithy/util-utf8@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-4.2.0.tgz#8b19d1514f621c44a3a68151f3d43e51087fed9d"
-  integrity sha512-zBPfuzoI8xyBtR2P6WQj63Rz8i3AmfAaJLuNG8dWsfvPe8lO4aCPYLn879mEgHndZH1zQ2oXmG8O1GGzzaoZiw==
-  dependencies:
-    "@smithy/util-buffer-from" "^4.2.0"
-    tslib "^2.6.2"
-
-"@smithy/uuid@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/uuid/-/uuid-1.1.0.tgz#9fd09d3f91375eab94f478858123387df1cda987"
-  integrity sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw==
-  dependencies:
-    tslib "^2.6.2"
-
-"@so-ric/colorspace@^1.1.6":
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/@so-ric/colorspace/-/colorspace-1.1.6.tgz#62515d8b9f27746b76950a83bde1af812d91923b"
-  integrity sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw==
-  dependencies:
-    color "^5.0.2"
-    text-hex "1.0.x"
-
-"@tokenizer/token@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276"
-  integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==
-
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
-"@types/caseless@*":
-  version "0.12.5"
-  resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.5.tgz#db9468cb1b1b5a925b8f34822f1669df0c5472f5"
-  integrity sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==
-
-"@types/geojson@^7946.0.16":
-  version "7946.0.16"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.16.tgz#8ebe53d69efada7044454e3305c19017d97ced2a"
-  integrity sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==
-
-"@types/jsonwebtoken@^9.0.4":
-  version "9.0.10"
-  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.10.tgz#a7932a47177dcd4283b6146f3bd5c26d82647f09"
-  integrity sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA==
-  dependencies:
-    "@types/ms" "*"
-    "@types/node" "*"
-
-"@types/ldapjs@^2.2.2":
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-2.2.5.tgz#b6623bc5ad4fab85ef3cfa586db691d016a3598c"
-  integrity sha512-Lv/nD6QDCmcT+V1vaTRnEKE8UgOilVv5pHcQuzkU1LcRe4mbHHuUo/KHi0LKrpdHhQY8FJzryF38fcVdeUIrzg==
-  dependencies:
-    "@types/node" "*"
-
-"@types/long@^4.0.0":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
-  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
-
-"@types/ms@*":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78"
-  integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
-
-"@types/node@*", "@types/node@>=13.7.0":
-  version "25.0.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.0.10.tgz#4864459c3c9459376b8b75fd051315071c8213e7"
-  integrity sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==
-  dependencies:
-    undici-types "~7.16.0"
-
-"@types/node@^14.14.14":
-  version "14.18.63"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
-  integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
-
-"@types/node@^22.0.1":
-  version "22.19.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.7.tgz#434094ee1731ae76c16083008590a5835a8c39c1"
-  integrity sha512-MciR4AKGHWl7xwxkBa6xUGxQJ4VBOmPTF7sL+iGzuahOFaO0jHCsuEfS80pan1ef4gWId1oWOweIhrDEYLuaOw==
-  dependencies:
-    undici-types "~6.21.0"
-
-"@types/node@^24.0.13":
-  version "24.10.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.10.9.tgz#1aeb5142e4a92957489cac12b07f9c7fe26057d0"
-  integrity sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==
-  dependencies:
-    undici-types "~7.16.0"
-
-"@types/readable-stream@^4.0.0":
-  version "4.0.23"
-  resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-4.0.23.tgz#fcd0f7472f45ceb43154f08f0083ccd1c76e53ce"
-  integrity sha512-wwXrtQvbMHxCbBgjHaMGEmImFTQxxpfMOR/ZoQnXxB1woqkUbdLGFDgauo00Py9IudiaqSeiBiulSV9i6XIPig==
-  dependencies:
-    "@types/node" "*"
-
-"@types/request@^2.48.8":
-  version "2.48.13"
-  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.13.tgz#abdf4256524e801ea8fdda54320f083edb5a6b80"
-  integrity sha512-FGJ6udDNUCjd19pp0Q3iTiDkwhYup7J8hpMW9c4k53NrccQFFWKRho6hvtPPEhnXWKvukfwAlB6DbDz4yhH5Gg==
-  dependencies:
-    "@types/caseless" "*"
-    "@types/node" "*"
-    "@types/tough-cookie" "*"
-    form-data "^2.5.5"
-
-"@types/tough-cookie@*":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304"
-  integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==
-
-"@types/triple-beam@^1.3.2":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c"
-  integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==
-
-"@types/webidl-conversions@*":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz#1306dbfa53768bcbcfc95a1c8cde367975581859"
-  integrity sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==
-
-"@types/whatwg-url@^8.2.1":
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63"
-  integrity sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==
-  dependencies:
-    "@types/node" "*"
-    "@types/webidl-conversions" "*"
-
-"@types/ws@^8.5.3":
-  version "8.18.1"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.18.1.tgz#48464e4bf2ddfd17db13d845467f6070ffea4aa9"
-  integrity sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==
-  dependencies:
-    "@types/node" "*"
-
-"@xmldom/xmldom@^0.7.0", "@xmldom/xmldom@^0.7.6", "@xmldom/xmldom@^0.7.9":
-  version "0.7.13"
-  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.13.tgz#ff34942667a4e19a9f4a0996a76814daac364cf3"
-  integrity sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==
-
-"@xmpp/base64@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@xmpp/base64/-/base64-0.13.2.tgz#ca3e936de6c50e8db067a35162fc8c72cb17d19f"
-  integrity sha512-RDEq66sW/jqj2HZKoRvnIvlRJMRLEGa0EGyJ0yPCF1+KijmTqrWr1PxZAol850QizXlqpvo8MS8OCFWMryX7RQ==
-  dependencies:
-    base-64 "^1.0.0"
-
-"@xmpp/client-core@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/client-core/-/client-core-0.13.3.tgz#88f4eaac9cf10a218d7891212c9b031c4946101f"
-  integrity sha512-pOtCozET4BxJZU7aWykT+PFBGaxT/Sl8mC0E3X6QgL7/2Vo39lz2KIhkcvtSwMC8myuaB+klOBrifuKLo3IajA==
-  dependencies:
-    "@xmpp/connection" "^0.13.3"
-    "@xmpp/jid" "^0.13.2"
-    "@xmpp/xml" "^0.13.3"
-
-"@xmpp/client@0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@xmpp/client/-/client-0.13.6.tgz#852b9c2b4d255831e031cb3f4e9d480867349990"
-  integrity sha512-e4JTcJQ20HEE1VfO2Wrq/y8ujlNZ8L4jmctX/9uhsZ/46GrNFh8uQJUSRMvaf4LV+T9xV55yu1yGDxjZYjwLsg==
-  dependencies:
-    "@babel/cli" "^7.26.4"
-    "@babel/core" "^7.26.0"
-    "@babel/node" "^7.26.0"
-    "@babel/plugin-transform-react-jsx" "^7.25.9"
-    "@xmpp/client-core" "^0.13.3"
-    "@xmpp/iq" "^0.13.3"
-    "@xmpp/middleware" "^0.13.3"
-    "@xmpp/reconnect" "^0.13.2"
-    "@xmpp/resolve" "^0.13.3"
-    "@xmpp/resource-binding" "^0.13.3"
-    "@xmpp/sasl" "^0.13.6"
-    "@xmpp/sasl-anonymous" "^0.13.2"
-    "@xmpp/sasl-plain" "^0.13.2"
-    "@xmpp/sasl-scram-sha-1" "^0.13.2"
-    "@xmpp/session-establishment" "^0.13.3"
-    "@xmpp/starttls" "^0.13.3"
-    "@xmpp/stream-features" "^0.13.2"
-    "@xmpp/stream-management" "^0.13.3"
-    "@xmpp/tcp" "^0.13.3"
-    "@xmpp/tls" "^0.13.3"
-    "@xmpp/websocket" "^0.13.3"
-    babel-plugin-jsx-pragmatic "^1.0.2"
-
-"@xmpp/connection-tcp@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/connection-tcp/-/connection-tcp-0.13.3.tgz#f61c15286b8aa30b848ab0cfb3f71e3fa7117fe0"
-  integrity sha512-6MMUSM265eBtHeLOYIe5UP1ld3oZaQMso6Cq7KJ0Xe7qC6zDy3YYaRHAe3Z+bdoJxpgmfiN8jvDM+QfypcTpKg==
-  dependencies:
-    "@xmpp/connection" "^0.13.3"
-    "@xmpp/xml" "^0.13.3"
-
-"@xmpp/connection@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/connection/-/connection-0.13.3.tgz#2cb563df0e67cc061dc5421ecb784bf5ab4ecbdc"
-  integrity sha512-EM6/wLUJ6MFJl7Kb+qwQut1gLDp7G107KTOB1W/GljGMd7ydD2Bn0BJt2AAx8EGPve9G2jjhV3+jJmu7KwK4rQ==
-  dependencies:
-    "@xmpp/error" "^0.13.2"
-    "@xmpp/events" "^0.13.2"
-    "@xmpp/jid" "^0.13.2"
-    "@xmpp/xml" "^0.13.3"
-
-"@xmpp/error@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@xmpp/error/-/error-0.13.2.tgz#1a4081558c68a3bcae9ddf0767d8cbd905ecbd4b"
-  integrity sha512-bjbxwF8s6jfQNI+ZHV9Jwcb7K2kBeTlD60QHjMJlxIUrjTH1ZsJoDQh9tMdq1mBu/h/bm2SX7yZUqUb1wY6gMw==
-
-"@xmpp/events@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@xmpp/events/-/events-0.13.2.tgz#90627810800ae95fcf435d0f0c65926d8f77829b"
-  integrity sha512-fXaAMChvLnP9vEQIatFKWoAm/F9U122hShfRfVw4xS6pympThygWVPIuRuAznMt5tOyTVFWBuPge6hgGousT0g==
-  dependencies:
-    events "^3.3.0"
-
-"@xmpp/id@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@xmpp/id/-/id-0.13.2.tgz#f10e014374300b465c0263346d909d8301b54519"
-  integrity sha512-LhSzcaPvjddvL+u/xNAuu6tNtxWR7HZPTyMUck8tyYnbwsXaJQ6sDoS8AEQE8o7iW5E31xJUTOktYd/s6HMo3w==
-
-"@xmpp/iq@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/iq/-/iq-0.13.3.tgz#c9761fb754cc119b2f7b08e996d9fea266db6336"
-  integrity sha512-sGeyGF4OnYGTZw3PhQaYLYlE8+LRZfYijT/ESGqhY2ed9gm0U4TCR8C8s5oT7Puu6S6smdHehcvYCrcFEeQyBw==
-  dependencies:
-    "@xmpp/events" "^0.13.2"
-    "@xmpp/id" "^0.13.2"
-    "@xmpp/middleware" "^0.13.3"
-    "@xmpp/xml" "^0.13.3"
-
-"@xmpp/jid@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@xmpp/jid/-/jid-0.13.2.tgz#117d69b455f607735ad569e23ff40529a6681f16"
-  integrity sha512-OuYrxiNdlmXgMFPJqnbZSKe/bdn1wxtc1ASEadrizI9h6T1y7tAEl5YpXFWYb+fdAL9vRD+bGCxrDUrm1er/LQ==
-
-"@xmpp/middleware@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/middleware/-/middleware-0.13.3.tgz#aec98c9afd80b74a3c8f1d91defc3a9f5da4a6d1"
-  integrity sha512-zZTsqLaHnfTqMBDyZh01HLYUgcHLmbalVfC32CsEcjPG5/bIete9sOUVPaiGH1cicMgi3O7WZK512RvQFcBbwA==
-  dependencies:
-    "@xmpp/error" "^0.13.2"
-    "@xmpp/jid" "^0.13.2"
-    "@xmpp/xml" "^0.13.3"
-    koa-compose "^4.1.0"
-
-"@xmpp/reconnect@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@xmpp/reconnect/-/reconnect-0.13.2.tgz#0ba0230807d5ea4f147e0eaf7b4562225a7306aa"
-  integrity sha512-FWCC+dzi23N7H99PYPqWZa7oRPNp9G7yYzMZwOpeiVporbNy+op3yUbCszo3YA3XVEsuLRQ1aQJ8evLo+GD5ow==
-  dependencies:
-    "@xmpp/events" "^0.13.2"
-
-"@xmpp/resolve@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/resolve/-/resolve-0.13.3.tgz#0e965032e00631ed9c78e9861fdac51e536ab19a"
-  integrity sha512-HL86p0a2CI0ILFYUR8vPR77ZXwxQ0xXLLRnyb88TjQ/eNbYsc1gmdXjELE0xRCfQblXZsETvUwWv5RofTYAgrQ==
-  dependencies:
-    "@xmpp/events" "^0.13.2"
-    "@xmpp/xml" "^0.13.3"
-    node-fetch "^3.3.2"
-
-"@xmpp/resource-binding@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/resource-binding/-/resource-binding-0.13.3.tgz#15e67c76acf39c902364408691d057c8f1ef4064"
-  integrity sha512-cph/8vJ5sRHVg7Njx8rR27xAVmKWACSx95jlOw7LmUSTRSxZDw2wHsqie76HxUD5fPszOsTh/Ph7Fw1532aRUQ==
-  dependencies:
-    "@xmpp/xml" "^0.13.3"
-
-"@xmpp/sasl-anonymous@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@xmpp/sasl-anonymous/-/sasl-anonymous-0.13.2.tgz#d6ea4eb6febe8a8c1a7c0578d5798f930b4778ef"
-  integrity sha512-0fI9+A+Vptcyv8+o8J2veRnodtnKahJDy5fappIZbmXLrv4JcrVBChQDWULyta0Hez9M3XWoIyuhp4pyz0IU/Q==
-  dependencies:
-    sasl-anonymous "^0.1.0"
-
-"@xmpp/sasl-plain@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@xmpp/sasl-plain/-/sasl-plain-0.13.2.tgz#e4ce2dba38d1960a4dbe70ffea8cada2e69eadef"
-  integrity sha512-zwS/q+Vd4YsLdnZjmCuS1JCacWWg2Vd3ecqpBmIV3S394s1Mgiwdnd2bVRen5S0kl/de+VzHg/DRLuYvC94SUg==
-  dependencies:
-    sasl-plain "^0.1.0"
-
-"@xmpp/sasl-scram-sha-1@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.13.2.tgz#47f240ce25a200004696f76dde5e376db86f04b7"
-  integrity sha512-qHwooR3m8/BsuG17tK50ZKO97HITG+k6Chjk/pSjRfKG5Fm3mWh2U8K98QWNpJYbgVm9amkIQ0tbTaw+/kMjvQ==
-  dependencies:
-    sasl-scram-sha-1 "^1.3.0"
-
-"@xmpp/sasl@^0.13.6":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@xmpp/sasl/-/sasl-0.13.6.tgz#b6a1948ae56db5cea6aee362c6ddd63d5d6ea6e1"
-  integrity sha512-0WueO7QlHK1F0K7iaC/zW60Y6NIjOccHZlb1WRS1jdHmHqwTLWM8AQTAZMvtxWLDz8oUDiVUKEOJTdIvy9bXow==
-  dependencies:
-    "@xmpp/base64" "^0.13.2"
-    "@xmpp/error" "^0.13.2"
-    "@xmpp/xml" "^0.13.3"
-    saslmechanisms "^0.1.1"
-
-"@xmpp/session-establishment@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/session-establishment/-/session-establishment-0.13.3.tgz#2ab32981292b4c747ce54753d22925d1678c6415"
-  integrity sha512-dQhH7aIzsqyMRsjMIuER4UBCxQgvDUHjkmNoeIbUZX5bYJuGeET90tZ4eNAq6yXnpSGJiKoXVfVBxNoiXovfgA==
-  dependencies:
-    "@xmpp/xml" "^0.13.3"
-
-"@xmpp/starttls@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/starttls/-/starttls-0.13.3.tgz#2e5202e2877e7b277597c79f186987a0c3b7689e"
-  integrity sha512-FjKrpahL/yBiRlMUL4d88I5N5PxQN2Mirx39Q0kyo479Nj1OY4dTA78Iy5+tsbsBYO3j5aE2tRoLhUQaMPGvBQ==
-  dependencies:
-    "@xmpp/events" "^0.13.2"
-    "@xmpp/tls" "^0.13.3"
-    "@xmpp/xml" "^0.13.3"
-
-"@xmpp/stream-features@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@xmpp/stream-features/-/stream-features-0.13.2.tgz#3554050b38b708289c85254b4fe4fcb52086e26b"
-  integrity sha512-eyxFEEDSfNvG4ybvAYTYkjaUcaytu8sAqT8DfWwrWzCkPgfRzpexsxb9yhe8hAVrvPLavOyr+zh4raUQf4Ogkg==
-
-"@xmpp/stream-management@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/stream-management/-/stream-management-0.13.3.tgz#e6119c3711e2c6f5ffb348471cddc640b6ff266f"
-  integrity sha512-hdQAyp6FldEkBktou/mbb7MPOe/EzBxP3sIjWvNQXwRMV8AJxAXyi+DhnW5sigRQoeTJJB0FGTxOlFDeXWGhPg==
-  dependencies:
-    "@xmpp/xml" "^0.13.3"
-
-"@xmpp/tcp@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/tcp/-/tcp-0.13.3.tgz#7dad798e71e875fffb5794816b11eba1f6379196"
-  integrity sha512-WUjAsPVQAr/DTNJGxXOqXEviFvI5Gzp/18TuCJEssAjyHv1Pr7Qn6PjAersIPidEKqVfapNyHOmgyLePh1kAqQ==
-  dependencies:
-    "@xmpp/connection-tcp" "^0.13.3"
-
-"@xmpp/tls@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/tls/-/tls-0.13.3.tgz#e978a3de0bbb717655cda0563ebab5bef8ca5148"
-  integrity sha512-oeXbkzu2i2LkpvPQ4B3RourYnktoUpkWeUS7jRB4wHvdy6ecEli593R+DYVCWr3Hvj+3l40MkyRQSmZp4S7tVg==
-  dependencies:
-    "@xmpp/connection" "^0.13.3"
-    "@xmpp/connection-tcp" "^0.13.3"
-
-"@xmpp/websocket@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/websocket/-/websocket-0.13.3.tgz#0418d1ab276b73a198876a8fcbdf773f3bad5b26"
-  integrity sha512-RXZJFecaAlotqhAdNohO0SoP8Rx3eJrl18c78gxybAhNaCexFbuMJIvSj91L/b8bOErJtFMTwreWeMfzP6Ijiw==
-  dependencies:
-    "@xmpp/connection" "^0.13.3"
-    "@xmpp/xml" "^0.13.3"
-    ws "^8.18.0"
-
-"@xmpp/xml@^0.13.3":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@xmpp/xml/-/xml-0.13.3.tgz#0f8ed17f85a3b9131d38ab6c3bf61a6fcd7652c5"
-  integrity sha512-lYXBg/VlpUeavGgQE8LADfZUzMFUnWFVYgvKUcx97AqjiEJUuo40ijdRcGmkAVtTg0RBkml5WB+Mo+JqynMk7Q==
-  dependencies:
-    ltx "^3.1.1"
-
-"@zxing/text-encoding@0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b"
-  integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==
-
-abab@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
-  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
-abort-controller@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
-  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
-  dependencies:
-    event-target-shim "^5.0.0"
-
-abstract-logging@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839"
-  integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==
-
-accepts@~1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
-  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
-  dependencies:
-    mime-types "~2.1.34"
-    negotiator "0.6.3"
-
-acebase-core@^1.27.5:
-  version "1.28.1"
-  resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.28.1.tgz#a99ee78a5a142d8aee59d06d4faa093999cb8cba"
-  integrity sha512-WfYdG3aeZag+p+wXgKpVNfu9FubuZenW5VDPtUP/qIlac1io+AWuctI5JNuG/plNkpNaTJjujoeTE9z6+Y3HnQ==
-  optionalDependencies:
-    rxjs ">= 5.x <= 7.x"
-
-acebase@1.29.5:
-  version "1.29.5"
-  resolved "https://registry.yarnpkg.com/acebase/-/acebase-1.29.5.tgz#0b1303931528e11fe9274f9ef348c71f11fcb439"
-  integrity sha512-NLA+0nLm2+Rg10M4IKfCpIYQN1Fp3bb8meil+8ttDOUqydvr2OnmpxA5F9COzb3R+OH652IKEelUBTDQlsoAnw==
-  dependencies:
-    acebase-core "^1.27.5"
-    unidecode "^0.1.8"
-
-acme-client@4.2.5:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/acme-client/-/acme-client-4.2.5.tgz#d18e29aadb38fbc8c6d4ce289f26392b51b5a698"
-  integrity sha512-dtnck4sdZ2owFLTC73Ewjx0kmvsRjTRgaOc8UztCNODT+lr1DXj0tiuUXjeY4LAzZryXCtCib/E+KD8NYeP1aw==
-  dependencies:
-    axios "0.26.1"
-    backo2 "^1.0.0"
-    bluebird "^3.5.0"
-    debug "^4.1.1"
-    node-forge "^1.3.0"
-
-acorn@^8.15.0:
-  version "8.15.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
-  integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
-
-aedes-packet@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/aedes-packet/-/aedes-packet-3.0.0.tgz#402868a6768dfaf1221a743a0a521244fbc7416b"
-  integrity sha512-swASey0BxGs4/npZGWoiVDmnEyPvVFIRY6l2LVKL4rbiW8IhcIGDLfnb20Qo8U20itXlitAKPQ3MVTEbOGG5ZA==
-  dependencies:
-    mqtt-packet "^7.0.0"
-
-aedes-persistence@^9.1.2:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/aedes-persistence/-/aedes-persistence-9.1.2.tgz#9fb4ab373a96ed17bce62414721b1b3843dc5685"
-  integrity sha512-2Wlr5pwIK0eQOkiTwb8ZF6C20s8UPUlnsJ4kXYePZ3JlQl0NbBA176mzM8wY294BJ5wybpNc9P5XEQxqadRNcQ==
-  dependencies:
-    aedes-packet "^3.0.0"
-    qlobber "^7.0.0"
-
-aedes@0.51.3:
-  version "0.51.3"
-  resolved "https://registry.yarnpkg.com/aedes/-/aedes-0.51.3.tgz#cd393d6e427ada6f6ae2fcd2df53a2744c86cad8"
-  integrity sha512-aQfiI9w3RbqnowNCdcGMmCtxBFXN9bhJFcuZm24U5/NU06V3MCl42jWK2GUnu8rOypR2Ahi/aEcgq3w7CMcycg==
-  dependencies:
-    aedes-packet "^3.0.0"
-    aedes-persistence "^9.1.2"
-    end-of-stream "^1.4.4"
-    fastfall "^1.5.1"
-    fastparallel "^2.4.1"
-    fastseries "^2.0.0"
-    hyperid "^3.2.0"
-    mqemitter "^6.0.0"
-    mqtt-packet "^9.0.0"
-    retimer "^4.0.0"
-    reusify "^1.0.4"
-    uuid "^10.0.0"
-
-aes-js@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a"
-  integrity sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==
-
-agent-base@6, agent-base@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
-agent-base@^7.1.2:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
-  integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
-
-agentkeepalive@^4.1.3:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.6.0.tgz#35f73e94b3f40bf65f105219c623ad19c136ea6a"
-  integrity sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==
-  dependencies:
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ansi-escapes@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-  integrity sha512-wiXutNjDUlNEDWHcYH3jtZUhd3c4/VojassD8zHdHCY13xbZy2XbW+NKQwA0tWGBVzDA9qEzYwfoSsWmviidhw==
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
-
-ansi-regex@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
-  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-regex@^6.0.1:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
-  integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
-
-ansi-styles@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-ansi-styles@^6.1.0:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
-  integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
-
-anymatch@~3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
-  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-append-transform@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
-  dependencies:
-    default-require-extensions "^2.0.0"
-
-"aproba@^1.0.3 || ^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.1.0.tgz#75500a190313d95c64e871e7e4284c6ac219f0b1"
-  integrity sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==
-
-archiver-utils@^5.0.0, archiver-utils@^5.0.1, archiver-utils@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-5.0.2.tgz#63bc719d951803efc72cf961a56ef810760dd14d"
-  integrity sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==
-  dependencies:
-    glob "^10.0.0"
-    graceful-fs "^4.2.0"
-    is-stream "^2.0.1"
-    lazystream "^1.0.0"
-    lodash "^4.17.15"
-    normalize-path "^3.0.0"
-    readable-stream "^4.0.0"
-
-archiver-zip-encrypted@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/archiver-zip-encrypted/-/archiver-zip-encrypted-2.0.0.tgz#1f13604005419fc288e0b49cbf4996be08c7f551"
-  integrity sha512-QJPkMPb3fHwUnXpZlzbwvvzgzr4bKK84Kc+O8+oRtsEzLqK+iwJXygJ+mHouE0LWEtR0BNs6Oys/48hyRB5xOw==
-  dependencies:
-    aes-js "^3.1.2"
-    archiver "^7.0.0"
-    archiver-utils "^5.0.1"
-    buffer-crc32 "^1.0.0"
-    compress-commons "^6.0.0"
-    crc32-stream "^6.0.0"
-    zip-stream "^6.0.0"
-
-archiver@7.0.1, archiver@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/archiver/-/archiver-7.0.1.tgz#c9d91c350362040b8927379c7aa69c0655122f61"
-  integrity sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==
-  dependencies:
-    archiver-utils "^5.0.2"
-    async "^3.2.4"
-    buffer-crc32 "^1.0.0"
-    readable-stream "^4.0.0"
-    readdir-glob "^1.1.2"
-    tar-stream "^3.0.0"
-    zip-stream "^6.0.1"
-
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-  integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
-
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^3.6.0"
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b"
-  integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==
-  dependencies:
-    call-bound "^1.0.3"
-    is-array-buffer "^3.0.5"
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
-
-array.prototype.reduce@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.8.tgz#42f97f5078daedca687d4463fd3c05cbfd83da57"
-  integrity sha512-DwuEqgXFBwbmZSRqt3BpQigWNUoqw9Ml2dTWdF3B2zQlQX4OeUE0zyuzX0fX0IbTvjdkZbcBTU3idgpO78qkTw==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.9"
-    es-array-method-boxes-properly "^1.0.0"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
-    is-string "^1.1.1"
-
-arraybuffer.prototype.slice@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c"
-  integrity sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==
-  dependencies:
-    array-buffer-byte-length "^1.0.1"
-    call-bind "^1.0.8"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.5"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.6"
-    is-array-buffer "^3.0.4"
-
-arrify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
-  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
-
-asn1.js@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
-  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    safer-buffer "^2.1.0"
-
-asn1@0.1.11:
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
-  integrity sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA==
-
-asn1@^0.2.4, asn1@^0.2.6, asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
-
-assert-plus@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
-  integrity sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw==
-
-async-function@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
-  integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
-
-async-mutex@^0.3.0:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.3.2.tgz#1485eda5bda1b0ec7c8df1ac2e815757ad1831df"
-  integrity sha512-HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA==
-  dependencies:
-    tslib "^2.3.1"
-
-async-retry@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
-  integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==
-  dependencies:
-    retry "0.13.1"
-
-async@^3.2.3, async@^3.2.4:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
-  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
-
-async@~0.9.0:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-  integrity sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw==
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
-available-typed-arrays@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
-  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
-  dependencies:
-    possible-typed-array-names "^1.0.0"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
-
-aws-sign@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/aws-sign/-/aws-sign-0.3.0.tgz#3d81ca69b474b1e16518728b51c24ff0bbedc6e9"
-  integrity sha512-pEMJAknifcXqXqYVXzGPIu8mJvxtJxIdpVpAs8HNS+paT+9srRUDMQn+3hULS7WbLmttcmvgMvnDcFujqXJyPw==
-
-aws-ssl-profiles@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
-  integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==
-
-aws4@^1.12.0:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
-  integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
-
-axios@0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
-  integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
-  dependencies:
-    follow-redirects "^1.14.8"
-
-axios@^1.12.0, axios@^1.2.2, axios@^1.6.0, axios@^1.8.3:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.2.tgz#9ada120b7b5ab24509553ec3e40123521117f687"
-  integrity sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==
-  dependencies:
-    follow-redirects "^1.15.6"
-    form-data "^4.0.4"
-    proxy-from-env "^1.1.0"
-
-b4a@^1.6.4:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.7.3.tgz#24cf7ccda28f5465b66aec2bac69e32809bf112f"
-  integrity sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==
-
-babel-plugin-jsx-pragmatic@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jsx-pragmatic/-/babel-plugin-jsx-pragmatic-1.0.2.tgz#41e2beb8642235f34b2a7ab12ca39e07201b8e59"
-  integrity sha512-+qeGXSbHZwinZzO6R3wP+6XDKup83Pgg2B3TQt2zwfDdgC7NqT9Kd3ws7iqk53zAO/8iOIRU6VUyUzt2LDE3Eg==
-  dependencies:
-    babel-plugin-syntax-jsx "^6.0.0"
-
-babel-plugin-syntax-jsx@^6.0.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
-  integrity sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==
-
-babel-runtime@^6.6.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
-backo2@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==
-
-backoff@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"
-  integrity sha512-wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA==
-  dependencies:
-    precond "0.2"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-bare-events@^2.7.0:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.8.2.tgz#7b3e10bd8e1fc80daf38bb516921678f566ab89f"
-  integrity sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==
-
-base-64@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb"
-  integrity sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==
-
-base-64@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/base-64/-/base-64-1.0.0.tgz#09d0f2084e32a3fd08c2475b973788eee6ae8f4a"
-  integrity sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==
-
-base64-js@^1.3.0, base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-base64url@3.x.x:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d"
-  integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==
-
-baseline-browser-mapping@^2.9.0:
-  version "2.9.17"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.17.tgz#9d6019766cd7eba738cb5f32c84b9f937cc87780"
-  integrity sha512-agD0MgJFUP/4nvjqzIB29zRPUuCF7Ge6mEv9s8dHrtYD7QWXRcx75rOADE/d5ah1NI+0vkDl0yorDd5U852IQQ==
-
-bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
-  dependencies:
-    tweetnacl "^0.14.3"
-
-bcryptjs@^2.4.0:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
-  integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==
-
-big-integer@^1.6.48:
-  version "1.6.52"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.52.tgz#60a887f3047614a8e1bffe5d7173490a97dc8c85"
-  integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==
-
-bignumber.js@^9.0.0, bignumber.js@^9.0.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.3.1.tgz#759c5aaddf2ffdc4f154f7b493e1c8770f88c4d7"
-  integrity sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==
-
-binary-extensions@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
-  integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
-
-binary-search@1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/binary-search/-/binary-search-1.3.6.tgz#e32426016a0c5092f0f3598836a1c7da3560565c"
-  integrity sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==
-
-bindings@^1.1.1, bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-bintrees@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.2.tgz#49f896d6e858a4a499df85c38fb399b9aff840f8"
-  integrity sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==
-
-bl@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5"
-  integrity sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==
-  dependencies:
-    readable-stream "^2.3.5"
-    safe-buffer "^5.1.1"
-
-bl@^4.0.2, bl@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
-bl@^6.0.8:
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-6.1.6.tgz#b40f3aea6963c6742616a957efb742c4fb87ecbb"
-  integrity sha512-jLsPgN/YSvPUg9UX0Kd73CXpm2Psg9FxMeCSXnk3WBO3CMT10JMwijubhGfHCnFu6TPn1ei3b975dxv7K2pWVg==
-  dependencies:
-    "@types/readable-stream" "^4.0.0"
-    buffer "^6.0.3"
-    inherits "^2.0.4"
-    readable-stream "^4.2.0"
-
-block-stream2@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-2.1.0.tgz#ac0c5ef4298b3857796e05be8ebed72196fa054b"
-  integrity sha512-suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg==
-  dependencies:
-    readable-stream "^3.4.0"
-
-bluebird@^2.6.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
-  integrity sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ==
-
-bluebird@^3.5.0:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
-bn.js@^4.0.0:
-  version "4.12.2"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.2.tgz#3d8fed6796c24e177737f7cc5172ee04ef39ec99"
-  integrity sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==
-
-body-parser@1.20.4, body-parser@~1.20.3:
-  version "1.20.4"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.4.tgz#f8e20f4d06ca8a50a71ed329c15dccad1cdc547f"
-  integrity sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==
-  dependencies:
-    bytes "~3.1.2"
-    content-type "~1.0.5"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "~1.2.0"
-    http-errors "~2.0.1"
-    iconv-lite "~0.4.24"
-    on-finished "~2.4.1"
-    qs "~6.14.0"
-    raw-body "~2.5.3"
-    type-is "~1.6.18"
-    unpipe "~1.0.0"
-
-boom@0.4.x:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-0.4.2.tgz#7a636e9ded4efcefb19cef4947a3c67dfaee911b"
-  integrity sha512-OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g==
-  dependencies:
-    hoek "0.9.x"
-
-bowser@^2.11.0:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.13.1.tgz#5a4c652de1d002f847dd011819f5fc729f308a7e"
-  integrity sha512-OHawaAbjwx6rqICCKgSG0SAnT05bzd7ppyKLVUITZpANBaaMFBAsaNkto3LoQ31tyFP5kNujE8Cdx85G9VzOkw==
-
-brace-expansion@^1.1.7:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
-  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace-expansion@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
-  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
-  dependencies:
-    balanced-match "^1.0.0"
-
-braces@~3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
-  dependencies:
-    fill-range "^7.1.1"
-
-browser-or-node@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/browser-or-node/-/browser-or-node-2.1.1.tgz#738790b3a86a8fc020193fa581273fbe65eaea0f"
-  integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==
-
-browserslist@^4.24.0:
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.1.tgz#7f534594628c53c63101079e27e40de490456a95"
-  integrity sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==
-  dependencies:
-    baseline-browser-mapping "^2.9.0"
-    caniuse-lite "^1.0.30001759"
-    electron-to-chromium "^1.5.263"
-    node-releases "^2.0.27"
-    update-browserslist-db "^1.2.0"
-
-bson@^1.1.4:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a"
-  integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==
-
-bson@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-4.7.2.tgz#320f4ad0eaf5312dd9b45dc369cc48945e2a5f2e"
-  integrity sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==
-  dependencies:
-    buffer "^5.6.0"
-
-buffer-crc32@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-1.0.0.tgz#a10993b9055081d55304bd9feb4a072de179f405"
-  integrity sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
-
-buffer-equal-constant-time@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-  integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
-
-buffer-from@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
-  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
-
-buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-buffer@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
-  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.2.1"
-
-bufferutil@^4.0.1, bufferutil@^4.0.3:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.1.0.tgz#a4623541dd23867626bb08a051ec0d2ec0b70294"
-  integrity sha512-ZMANVnAixE6AWWnPzlW2KpUrxhm9woycYvPOo67jWHyFowASTEd9s+QN1EIMsSDtwhIxN4sWE1jotpuDUIgyIw==
-  dependencies:
-    node-gyp-build "^4.3.0"
-
-build-url@^1.0.10:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/build-url/-/build-url-1.3.3.tgz#fad1ef30d8861931f85bc1f41fca0a537be31e5f"
-  integrity sha512-uSC8d+d4SlbXTu/9nBhwEKi33CE0KQgCvfy8QwyrrO5vCuXr9hN021ZBh8ip5vxPbMOrZiPwgqcupuhezxiP3g==
-
-buildcheck@~0.0.6:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.7.tgz#07a5e76c10ead8fa67d9e4c587b68f49e8f29d61"
-  integrity sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==
-
-byte-length@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/byte-length/-/byte-length-1.0.2.tgz#ba5a5909240b0121c079b7f7b15248d6f08223cc"
-  integrity sha512-ovBpjmsgd/teRmgcPh23d4gJvxDoXtAzEL9xTfMU8Yc2kqCDb7L9jAG0XHl1nzuGl+h3ebCIF1i62UFyA9V/2Q==
-
-bytes@3.1.2, bytes@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
-  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
-
-cacache@^15.2.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
-  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
-  dependencies:
-    "@npmcli/fs" "^1.0.0"
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
-caching-transform@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-3.0.2.tgz#601d46b91eca87687a281e71cef99791b0efca70"
-  integrity sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==
-  dependencies:
-    hasha "^3.0.0"
-    make-dir "^2.0.0"
-    package-hash "^3.0.0"
-    write-file-atomic "^2.4.2"
-
-call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
-  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
-  dependencies:
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-
-call-bind@^1.0.7, call-bind@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
-  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
-  dependencies:
-    call-bind-apply-helpers "^1.0.0"
-    es-define-property "^1.0.0"
-    get-intrinsic "^1.2.4"
-    set-function-length "^1.2.2"
-
-call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
-  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
-  dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    get-intrinsic "^1.3.0"
-
-camel-case@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
-  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
-  dependencies:
-    pascal-case "^3.1.2"
-    tslib "^2.0.3"
-
-camelcase@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-caniuse-lite@^1.0.30001759:
-  version "1.0.30001766"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz#b6f6b55cb25a2d888d9393104d14751c6a7d6f7a"
-  integrity sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
-
-cbor@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.2.0.tgz#4cca67783ccd6de7b50ab4ed62636712f287a67c"
-  integrity sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A==
-  dependencies:
-    bignumber.js "^9.0.1"
-    nofilter "^1.0.4"
-
-chalk@^1.0.0, chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-charenc@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
-
-chokidar@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
-  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.7.tgz#bd094bfef42634ccfd9e13b9fc73274997111e39"
-  integrity sha512-Mz9QMT5fJe7bKI7MH31UilT5cEK5EHHRCccw/YRFsRY47AuNgaV6HY3rscp0/I4Q+tTW/5zoqpSeRRI54TkDWA==
-  dependencies:
-    inherits "^2.0.4"
-    safe-buffer "^5.2.1"
-    to-buffer "^1.2.2"
-
-clean-css@~5.3.2:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd"
-  integrity sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==
-  dependencies:
-    source-map "~0.6.0"
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cli-cursor@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  integrity sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-width@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
-  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-cliui@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
-  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^7.0.0"
-
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-convert@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-3.1.3.tgz#db6627b97181cb8facdfce755ae26f97ab0711f1"
-  integrity sha512-fasDH2ont2GqF5HpyO4w0+BcewlhHEZOFn9c1ckZdHpJ56Qb7MHhH/IcJZbBGgvdtwdwNbLvxiBEdg336iA9Sg==
-  dependencies:
-    color-name "^2.0.0"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
-color-name@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-2.1.0.tgz#0b677385c1c4b4edfdeaf77e38fa338e3a40b693"
-  integrity sha512-1bPaDNFm0axzE4MEAzKPuqKWeRaT43U/hyxKPBdqTfmPF+d6n7FSoTFxLVULUJOmiLp01KjhIPPH+HrXZJN4Rg==
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-color-string@^2.1.3:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-2.1.4.tgz#9dcf566ff976e23368c8bd673f5c35103ab41058"
-  integrity sha512-Bb6Cq8oq0IjDOe8wJmi4JeNn763Xs9cfrBcaylK1tPypWzyoy2G3l90v9k64kjphl/ZJjPIShFztenRomi8WTg==
-  dependencies:
-    color-name "^2.0.0"
-
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-color@^5.0.2:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-5.0.3.tgz#f79390b1b778e222ffbb54304d3dbeaef633f97f"
-  integrity sha512-ezmVcLR3xAVp8kYOm4GS45ZLLgIE6SPAFoduLr6hTDajwb3KZ2F46gulK3XpcwRFb5KKGCSezCBAY4Dw4HsyXA==
-  dependencies:
-    color-convert "^3.1.3"
-    color-string "^2.1.3"
-
-combined-stream@^1.0.8, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@~0.0.4:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-0.0.7.tgz#0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"
-  integrity sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig==
-  dependencies:
-    delayed-stream "0.0.5"
-
-commander@^10.0.0:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
-  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
-
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
-  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
-
-compress-commons@^6.0.0, compress-commons@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-6.0.2.tgz#26d31251a66b9d6ba23a84064ecd3a6a71d2609e"
-  integrity sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==
-  dependencies:
-    crc-32 "^1.2.0"
-    crc32-stream "^6.0.0"
-    is-stream "^2.0.1"
-    normalize-path "^3.0.0"
-    readable-stream "^4.0.0"
-
-compressible@~2.0.18:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
-  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
-  dependencies:
-    mime-db ">= 1.43.0 < 2"
-
-compression@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.8.1.tgz#4a45d909ac16509195a9a28bd91094889c180d79"
-  integrity sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==
-  dependencies:
-    bytes "3.1.2"
-    compressible "~2.0.18"
-    debug "2.6.9"
-    negotiator "~0.6.4"
-    on-headers "~1.1.0"
-    safe-buffer "5.2.1"
-    vary "~1.1.2"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-connect-flash@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/connect-flash/-/connect-flash-0.1.1.tgz#d8630f26d95a7f851f9956b1e8cc6732f3b6aa30"
-  integrity sha512-2rcfELQt/ZMP+SM/pG8PyhJRaLKp+6Hk2IUBNkEit09X+vwn3QsAL3ZbYtxUn7NVPzbMTSLRDhqe0B/eh30RYA==
-
-console-control-strings@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
-
-content-disposition@~0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
-  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
-  dependencies:
-    safe-buffer "5.2.1"
-
-content-type@~1.0.4, content-type@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
-  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
-
-convert-source-map@^1.6.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
-
-convert-source-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
-  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
-
-cookie-jar@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/cookie-jar/-/cookie-jar-0.3.0.tgz#bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc"
-  integrity sha512-dX1400pzPULr+ZovkIsDEqe7XH8xCAYGT5Dege4Eot44Qs2mS2iJmnh45TxTO5MIsCfrV/JGZVloLhm46AHxNw==
-
-cookie-session@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.1.1.tgz#3e0bdd4a8386467a1d7cca5249690a0ebfb27842"
-  integrity sha512-ji3kym/XZaFVew1+tIZk5ZLp9Z/fLv9rK1aZmpug0FsgE7Cu3ZDrUdRo7FT9vFjMYfNimrrUHJzywDwT7XEFlg==
-  dependencies:
-    cookies "0.9.1"
-    debug "3.2.7"
-    on-headers "~1.1.0"
-    safe-buffer "5.2.1"
-
-cookie-signature@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.7.tgz#ab5dd7ab757c54e60f37ef6550f481c426d10454"
-  integrity sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==
-
-cookie@~0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
-  integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
-
-cookies@0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.9.1.tgz#3ffed6f60bb4fb5f146feeedba50acc418af67e3"
-  integrity sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==
-  dependencies:
-    depd "~2.0.0"
-    keygrip "~1.1.0"
-
-core-js@^2.4.0:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
-core-js@^3.30.2:
-  version "3.48.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.48.0.tgz#1f813220a47bbf0e667e3885c36cd6f0593bf14d"
-  integrity sha512-zpEHTy1fjTMZCKLHUZoVeylt9XrzaIN2rbPXEt0k+q7JE5CkCZdo6bNq55bn24a69CH7ErAVLKijxJja4fw+UQ==
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
-
-core-util-is@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
-  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
-
-cp-file@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d"
-  integrity sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==
-  dependencies:
-    graceful-fs "^4.1.2"
-    make-dir "^2.0.0"
-    nested-error-stacks "^2.0.0"
-    pify "^4.0.1"
-    safe-buffer "^5.0.1"
-
-cpu-features@~0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.10.tgz#9aae536db2710c7254d7ed67cb3cbc7d29ad79c5"
-  integrity sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==
-  dependencies:
-    buildcheck "~0.0.6"
-    nan "^2.19.0"
-
-crc-32@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
-  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
-
-crc32-stream@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-6.0.0.tgz#8529a3868f8b27abb915f6c3617c0fadedbf9430"
-  integrity sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==
-  dependencies:
-    crc-32 "^1.2.0"
-    readable-stream "^4.0.0"
-
-create-hash@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-cross-spawn@^4:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
-  integrity sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
-cross-spawn@^7.0.6:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
-  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-crypt@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==
-
-cryptiles@0.2.x:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-0.2.2.tgz#ed91ff1f17ad13d3748288594f8a48a0d26f325c"
-  integrity sha512-gvWSbgqP+569DdslUiCelxIv3IYK5Lgmq1UrRnk+s1WxQOQ16j3GPDcjdtgL5Au65DU/xQi6q3xPtf5Kta+3IQ==
-  dependencies:
-    boom "0.4.x"
-
-cssstyle@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a"
-  integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==
-  dependencies:
-    rrweb-cssom "^0.6.0"
-
-ctype@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
-  integrity sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg==
-
-d@1, d@^1.0.1, d@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de"
-  integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==
-  dependencies:
-    es5-ext "^0.10.64"
-    type "^2.7.2"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
-  dependencies:
-    assert-plus "^1.0.0"
-
-data-uri-to-buffer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
-  integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==
-
-data-urls@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4"
-  integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==
-  dependencies:
-    abab "^2.0.6"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^12.0.0"
-
-data-view-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570"
-  integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==
-  dependencies:
-    call-bound "^1.0.3"
-    es-errors "^1.3.0"
-    is-data-view "^1.0.2"
-
-data-view-byte-length@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735"
-  integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==
-  dependencies:
-    call-bound "^1.0.3"
-    es-errors "^1.3.0"
-    is-data-view "^1.0.2"
-
-data-view-byte-offset@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191"
-  integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    is-data-view "^1.0.1"
-
-dayjs@^1.11.9:
-  version "1.11.19"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.19.tgz#15dc98e854bb43917f12021806af897c58ae2938"
-  integrity sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==
-
-debug@2.6.9, debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
-  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
-  dependencies:
-    ms "^2.1.3"
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
-
-decimal.js@^10.4.3:
-  version "10.6.0"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.6.0.tgz#e649a43e3ab953a72192ff5983865e509f37ed9a"
-  integrity sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==
-
-decode-uri-component@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
-  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
-
-decompress-response@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
-  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
-  dependencies:
-    mimic-response "^3.1.0"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-deepmerge@^4.2.2:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
-  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
-
-default-require-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  integrity sha512-B0n2zDIXpzLzKeoEozorDSa1cHc1t0NjmxP0zuAxbizNU2MBqYJJKYXrrFdKuQliojXynrxgd7l4ahfg/+aA5g==
-  dependencies:
-    strip-bom "^3.0.0"
-
-define-data-property@^1.0.1, define-data-property@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
-  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    gopd "^1.0.1"
-
-define-properties@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
-  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
-  dependencies:
-    define-data-property "^1.0.1"
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
-
-delayed-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f"
-  integrity sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA==
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
-
-denque@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
-  integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
-
-denque@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
-  integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
-
-depd@2.0.0, depd@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
-
-destroy@1.2.0, destroy@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
-  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
-
-detect-libc@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
-  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
-
-discord-api-types@^0.37.12, discord-api-types@^0.37.41:
-  version "0.37.120"
-  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.120.tgz#ad7209930509c4cee3efddbacc77a1b18cf66d34"
-  integrity sha512-7xpNK0EiWjjDFp2nAhHXezE4OUWm7s1zhc/UXXN6hnFFU8dfoPHgV0Hx0RPiCa3ILRpdeh152icc68DGCyXYIw==
-
-discord-api-types@^0.38.33:
-  version "0.38.37"
-  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.37.tgz#0e9fa948e8483b0ff3b63a1902ea9a9c9b748921"
-  integrity sha512-Cv47jzY1jkGkh5sv0bfHYqGgKOWO1peOrGMkDFM4UmaGMOTgOW8QSexhvixa9sVOiz8MnVOBryWYyw/CEVhj7w==
-
-discord.js@14.6.0:
-  version "14.6.0"
-  resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-14.6.0.tgz#896f7540d4c6f190dffe91d2f3e9a9f7cbc8bd26"
-  integrity sha512-On1K7xpJZRe0KsziIaDih2ksYPhgxym/ZqV45i1f3yig4vUotikqs7qp5oXiTzQ/UTiNRCixUWFTh7vA1YBCqw==
-  dependencies:
-    "@discordjs/builders" "^1.3.0"
-    "@discordjs/collection" "^1.2.0"
-    "@discordjs/rest" "^1.3.0"
-    "@discordjs/util" "^0.1.0"
-    "@sapphire/snowflake" "^3.2.2"
-    "@types/ws" "^8.5.3"
-    discord-api-types "^0.37.12"
-    fast-deep-equal "^3.1.3"
-    lodash.snakecase "^4.1.1"
-    tslib "^2.4.0"
-    undici "^5.11.0"
-    ws "^8.9.0"
-
-dom-serializer@^1.0.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
-  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.0"
-    entities "^2.0.0"
-
-domelementtype@^2.0.1, domelementtype@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
-domexception@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
-  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
-  dependencies:
-    webidl-conversions "^7.0.0"
-
-domhandler@^4.0.0, domhandler@^4.2.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
-  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
-  dependencies:
-    domelementtype "^2.2.0"
-
-domutils@^2.5.2:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
-  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
-  dependencies:
-    dom-serializer "^1.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.2.0"
-
-dot-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
-  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-dunder-proto@^1.0.0, dunder-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
-  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
-  dependencies:
-    call-bind-apply-helpers "^1.0.1"
-    es-errors "^1.3.0"
-    gopd "^1.2.0"
-
-duplexify@^4.0.0, duplexify@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.3.tgz#a07e1c0d0a2c001158563d32592ba58bddb0236f"
-  integrity sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==
-  dependencies:
-    end-of-stream "^1.4.1"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-    stream-shift "^1.0.2"
-
-each-series@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/each-series/-/each-series-1.0.0.tgz#f886e6c66dfdb25ef1fe73564146ee5cb478afcb"
-  integrity sha512-4MQloCGGCmT5GJZK5ibgJSvTK1c1QSrNlDvLk6fEyRxjZnXjl+NNFfzhfXpmnWh33Owc9D9klrdzCUi7yc9r4Q==
-
-eastasianwidth@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
-  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
-  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
-  dependencies:
-    safe-buffer "^5.0.1"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
-
-electron-to-chromium@^1.5.263:
-  version "1.5.278"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.278.tgz#807a5e321f012a41bfd64e653f35993c9af95493"
-  integrity sha512-dQ0tM1svDRQOwxnXxm+twlGTjr9Upvt8UFWAgmLsxEzFQxhbti4VwxmMjsDxVC51Zo84swW7FVCXEV+VAkhuPw==
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-emoji-regex@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
-  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
-enabled@2.0.x:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
-  integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
-
-encodeurl@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
-  integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
-
-encoding@^0.1.12:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
-end-of-stream@^1.1.0, end-of-stream@^1.4.1, end-of-stream@^1.4.4:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
-  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
-  dependencies:
-    once "^1.4.0"
-
-entities@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
-  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
-
-entities@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
-  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
-
-entities@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694"
-  integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==
-
-env-paths@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
-  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-
-err-code@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
-  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
-
-error-ex@^1.3.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.4.tgz#b3a8d8bb6f92eecc1629e3e27d3c8607a8a32414"
-  integrity sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es-abstract@^1.23.5, es-abstract@^1.23.9, es-abstract@^1.24.0:
-  version "1.24.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.1.tgz#f0c131ed5ea1bb2411134a8dd94def09c46c7899"
-  integrity sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==
-  dependencies:
-    array-buffer-byte-length "^1.0.2"
-    arraybuffer.prototype.slice "^1.0.4"
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    data-view-buffer "^1.0.2"
-    data-view-byte-length "^1.0.2"
-    data-view-byte-offset "^1.0.1"
-    es-define-property "^1.0.1"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
-    es-set-tostringtag "^2.1.0"
-    es-to-primitive "^1.3.0"
-    function.prototype.name "^1.1.8"
-    get-intrinsic "^1.3.0"
-    get-proto "^1.0.1"
-    get-symbol-description "^1.1.0"
-    globalthis "^1.0.4"
-    gopd "^1.2.0"
-    has-property-descriptors "^1.0.2"
-    has-proto "^1.2.0"
-    has-symbols "^1.1.0"
-    hasown "^2.0.2"
-    internal-slot "^1.1.0"
-    is-array-buffer "^3.0.5"
-    is-callable "^1.2.7"
-    is-data-view "^1.0.2"
-    is-negative-zero "^2.0.3"
-    is-regex "^1.2.1"
-    is-set "^2.0.3"
-    is-shared-array-buffer "^1.0.4"
-    is-string "^1.1.1"
-    is-typed-array "^1.1.15"
-    is-weakref "^1.1.1"
-    math-intrinsics "^1.1.0"
-    object-inspect "^1.13.4"
-    object-keys "^1.1.1"
-    object.assign "^4.1.7"
-    own-keys "^1.0.1"
-    regexp.prototype.flags "^1.5.4"
-    safe-array-concat "^1.1.3"
-    safe-push-apply "^1.0.0"
-    safe-regex-test "^1.1.0"
-    set-proto "^1.0.0"
-    stop-iteration-iterator "^1.1.0"
-    string.prototype.trim "^1.2.10"
-    string.prototype.trimend "^1.0.9"
-    string.prototype.trimstart "^1.0.8"
-    typed-array-buffer "^1.0.3"
-    typed-array-byte-length "^1.0.3"
-    typed-array-byte-offset "^1.0.4"
-    typed-array-length "^1.0.7"
-    unbox-primitive "^1.1.0"
-    which-typed-array "^1.1.19"
-
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
-
-es-define-property@^1.0.0, es-define-property@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
-  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
-
-es-errors@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
-
-es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
-  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
-  dependencies:
-    es-errors "^1.3.0"
-
-es-set-tostringtag@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
-  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
-  dependencies:
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.6"
-    has-tostringtag "^1.0.2"
-    hasown "^2.0.2"
-
-es-to-primitive@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18"
-  integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==
-  dependencies:
-    is-callable "^1.2.7"
-    is-date-object "^1.0.5"
-    is-symbol "^1.0.4"
-
-es5-ext@^0.10.35, es5-ext@^0.10.62, es5-ext@^0.10.63, es5-ext@^0.10.64, es5-ext@~0.10.14:
-  version "0.10.64"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
-  integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
-  dependencies:
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.3"
-    esniff "^2.0.1"
-    next-tick "^1.1.0"
-
-es6-error@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
-  integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
-
-es6-iterator@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
-es6-symbol@^3.1.1, es6-symbol@^3.1.3:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c"
-  integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==
-  dependencies:
-    d "^1.0.2"
-    ext "^1.7.0"
-
-escalade@^3.1.1, escalade@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
-  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
-
-escape-html@^1.0.3, escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-esniff@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
-  integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
-  dependencies:
-    d "^1.0.1"
-    es5-ext "^0.10.62"
-    event-emitter "^0.3.5"
-    type "^2.7.2"
-
-esprima@4.0.1, esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
-
-event-emitter@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-event-target-shim@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
-  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-
-eventemitter3@^5.0.1:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.4.tgz#a86d66170433712dde814707ac52b5271ceb1feb"
-  integrity sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==
-
-events-universal@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/events-universal/-/events-universal-1.0.1.tgz#b56a84fd611b6610e0a2d0f09f80fdf931e2dfe6"
-  integrity sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==
-  dependencies:
-    bare-events "^2.7.0"
-
-events@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-  integrity sha512-MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==
-
-expand-template@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
-
-express-handlebars@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/express-handlebars/-/express-handlebars-7.1.3.tgz#48de4fff6617af9574a6d63031f34fe95e255dd2"
-  integrity sha512-O0W4n14iQ8+iFIDdiMh9HRI2nbVQJ/h1qndlD1TXWxxcfbKjKoqJh+ti2tROkyx4C4VQrt0y3bANBQ5auQAiew==
-  dependencies:
-    glob "^10.4.2"
-    graceful-fs "^4.2.11"
-    handlebars "^4.7.8"
-
-express-ws@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/express-ws/-/express-ws-5.0.2.tgz#5b02d41b937d05199c6c266d7cc931c823bda8eb"
-  integrity sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ==
-  dependencies:
-    ws "^7.4.6"
-
-express@4.22.1:
-  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.22.1.tgz#1de23a09745a4fffdb39247b344bb5eaff382069"
-  integrity sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==
-  dependencies:
-    accepts "~1.3.8"
-    array-flatten "1.1.1"
-    body-parser "~1.20.3"
-    content-disposition "~0.5.4"
-    content-type "~1.0.4"
-    cookie "~0.7.1"
-    cookie-signature "~1.0.6"
-    debug "2.6.9"
-    depd "2.0.0"
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "~1.3.1"
-    fresh "~0.5.2"
-    http-errors "~2.0.0"
-    merge-descriptors "1.0.3"
-    methods "~1.1.2"
-    on-finished "~2.4.1"
-    parseurl "~1.3.3"
-    path-to-regexp "~0.1.12"
-    proxy-addr "~2.0.7"
-    qs "~6.14.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.2.1"
-    send "~0.19.0"
-    serve-static "~1.16.2"
-    setprototypeof "1.2.0"
-    statuses "~2.0.1"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-ext@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
-  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
-  dependencies:
-    type "^2.7.2"
-
-extend@^3.0.2, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
-farmhash-modern@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/farmhash-modern/-/farmhash-modern-1.1.0.tgz#c36b34ad196290d57b0b482dc89e637d0b59835f"
-  integrity sha512-6ypT4XfgqJk/F3Yuv4SX26I3doUjt0GTG4a+JgWxXQpxXzTBq8fPUeGHfcYMMDPHJHm3yPOSjaeBwBGAHWXCdA==
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-fifo@^1.2.0, fast-fifo@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
-  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
-
-fast-unique-numbers@^8.0.13:
-  version "8.0.13"
-  resolved "https://registry.yarnpkg.com/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz#3c87232061ff5f408a216e1f0121232f76f695d7"
-  integrity sha512-7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==
-  dependencies:
-    "@babel/runtime" "^7.23.8"
-    tslib "^2.6.2"
-
-fast-xml-parser@5.2.5:
-  version "5.2.5"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz#4809fdfb1310494e341098c25cb1341a01a9144a"
-  integrity sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==
-  dependencies:
-    strnum "^2.1.0"
-
-fast-xml-parser@^4.4.1, fast-xml-parser@^4.5.1:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz#c54d6b35aa0f23dc1ea60b6c884340c006dc6efb"
-  integrity sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==
-  dependencies:
-    strnum "^1.1.1"
-
-fastfall@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/fastfall/-/fastfall-1.5.1.tgz#3fee03331a49d1d39b3cdf7a5e9cd66f475e7b94"
-  integrity sha512-KH6p+Z8AKPXnmA7+Iz2Lh8ARCMr+8WNPVludm1LGkZoD2MjY6LVnRMtTKhkdzI+jr0RzQWXKzKyBJm1zoHEL4Q==
-  dependencies:
-    reusify "^1.0.0"
-
-fastparallel@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/fastparallel/-/fastparallel-2.4.1.tgz#0d984a5813ffa67f30b4a5cb4cb8cbe61c7ee5a5"
-  integrity sha512-qUmhxPgNHmvRjZKBFUNI0oZuuH9OlSIOXmJ98lhKPxMZZ7zS/Fi0wRHOihDSz0R1YiIOjxzOY4bq65YTcdBi2Q==
-  dependencies:
-    reusify "^1.0.4"
-    xtend "^4.0.2"
-
-fastseries@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fastseries/-/fastseries-2.0.0.tgz#d43eb975f6175dd83457d1d68fbd30f936ec7f2b"
-  integrity sha512-XBU9RXeoYc2/VnvMhplAxEmZLfIk7cvTBu+xwoBuTI8pL19E03cmca17QQycKIdxgwCeFA/a4u27gv1h3ya5LQ==
-
-faye-websocket@0.11.4:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
-  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
-  dependencies:
-    pend "~1.2.0"
-
-fecha@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
-  integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==
-
-fetch-blob@^3.1.2, fetch-blob@^3.1.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9"
-  integrity sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==
-  dependencies:
-    node-domexception "^1.0.0"
-    web-streams-polyfill "^3.0.3"
-
-figures@^1.3.5:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-file-type@^18.3.0:
-  version "18.7.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-18.7.0.tgz#cddb16f184d6b94106cfc4bb56978726b25cb2a2"
-  integrity sha512-ihHtXRzXEziMrQ56VSgU7wkxh55iNchFkosu7Y9/S+tXHdKyrGjVK0ujbqNnsxzea+78MaLhN6PGmfYSAv1ACw==
-  dependencies:
-    readable-web-to-node-stream "^3.0.2"
-    strtok3 "^7.0.0"
-    token-types "^5.0.1"
-
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-filter-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
-  integrity sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==
-
-finalhandler@~1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.2.tgz#1ebc2228fc7673aac4a472c310cc05b77d852b88"
-  integrity sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    on-finished "~2.4.1"
-    parseurl "~1.3.3"
-    statuses "~2.0.2"
-    unpipe "~1.0.0"
-
-find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
-  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^2.0.0"
-    pkg-dir "^3.0.0"
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-firebase-admin@12.7.0:
-  version "12.7.0"
-  resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-12.7.0.tgz#586c9ed852c4bb2d4d72f0d52c1c48a2b6dee793"
-  integrity sha512-raFIrOyTqREbyXsNkSHyciQLfv8AUZazehPaQS1lZBSCDYW74FYXU0nQZa3qHI4K+hawohlDbywZ4+qce9YNxA==
-  dependencies:
-    "@fastify/busboy" "^3.0.0"
-    "@firebase/database-compat" "1.0.8"
-    "@firebase/database-types" "1.0.5"
-    "@types/node" "^22.0.1"
-    farmhash-modern "^1.1.0"
-    jsonwebtoken "^9.0.0"
-    jwks-rsa "^3.1.0"
-    node-forge "^1.3.1"
-    uuid "^10.0.0"
-  optionalDependencies:
-    "@google-cloud/firestore" "^7.7.0"
-    "@google-cloud/storage" "^7.7.0"
-
-fn.name@1.x.x:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
-  integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
-
-follow-redirects@^1.14.8, follow-redirects@^1.15.6:
-  version "1.15.11"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
-  integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
-
-for-each@^0.3.3, for-each@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
-  integrity sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==
-  dependencies:
-    is-callable "^1.2.7"
-
-foreground-child@^1.5.6:
-  version "1.5.6"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
-  integrity sha512-3TOY+4TKV0Ml83PXJQY+JFQaHNV38lzQDIzzXYg1kWdBLenGgoZhAs0CKgzI31vi2pWEpQMq/Yi4bpKwCPkw7g==
-  dependencies:
-    cross-spawn "^4"
-    signal-exit "^3.0.0"
-
-foreground-child@^3.1.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
-  integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
-  dependencies:
-    cross-spawn "^7.0.6"
-    signal-exit "^4.0.1"
-
-forever-agent@~0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.5.2.tgz#6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"
-  integrity sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A==
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
-
-form-data@^2.5.5:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.5.tgz#a5f6364ad7e4e67e95b4a07e2d8c6f711c74f624"
-  integrity sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    es-set-tostringtag "^2.1.0"
-    hasown "^2.0.2"
-    mime-types "^2.1.35"
-    safe-buffer "^5.2.1"
-
-form-data@^4.0.0, form-data@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"
-  integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    es-set-tostringtag "^2.1.0"
-    hasown "^2.0.2"
-    mime-types "^2.1.12"
-
-form-data@~0.1.0:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-0.1.4.tgz#91abd788aba9702b1aabfa8bc01031a2ac9e3b12"
-  integrity sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w==
-  dependencies:
-    async "~0.9.0"
-    combined-stream "~0.0.4"
-    mime "~1.2.11"
-
-formdata-polyfill@^4.0.10:
-  version "4.0.10"
-  resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
-  integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
-  dependencies:
-    fetch-blob "^3.1.2"
-
-forwarded@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
-  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
-
-fresh@~0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
-
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
-fs-readdir-recursive@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
-  integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
-function-bind@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
-
-function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"
-  integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    define-properties "^1.2.1"
-    functions-have-names "^1.2.3"
-    hasown "^2.0.2"
-    is-callable "^1.2.7"
-
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
-functions-have-names@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
-
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
-  dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
-    has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
-
-gaxios@^6.0.0, gaxios@^6.0.2, gaxios@^6.0.3, gaxios@^6.1.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.1.tgz#ebd9f7093ede3ba502685e73390248bb5b7f71fb"
-  integrity sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==
-  dependencies:
-    extend "^3.0.2"
-    https-proxy-agent "^7.0.1"
-    is-stream "^2.0.0"
-    node-fetch "^2.6.9"
-    uuid "^9.0.1"
-
-gcp-metadata@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-6.1.1.tgz#f65aa69f546bc56e116061d137d3f5f90bdec494"
-  integrity sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==
-  dependencies:
-    gaxios "^6.1.1"
-    google-logging-utils "^0.0.2"
-    json-bigint "^1.0.0"
-
-generate-function@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
-  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
-  dependencies:
-    is-property "^1.0.2"
-
-generator-function@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2"
-  integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==
-
-gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7, get-intrinsic@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
-  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
-  dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    es-define-property "^1.0.1"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
-    function-bind "^1.1.2"
-    get-proto "^1.0.1"
-    gopd "^1.2.0"
-    has-symbols "^1.1.0"
-    hasown "^2.0.2"
-    math-intrinsics "^1.1.0"
-
-get-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
-  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
-  dependencies:
-    dunder-proto "^1.0.1"
-    es-object-atoms "^1.0.0"
-
-get-symbol-description@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
-  integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==
-  dependencies:
-    call-bound "^1.0.3"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.6"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
-  dependencies:
-    assert-plus "^1.0.0"
-
-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-  integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
-
-glob-parent@~5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@^10.0.0, glob@^10.4.2:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
-  integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
-  dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^3.1.2"
-    minimatch "^9.0.4"
-    minipass "^7.1.2"
-    package-json-from-dist "^1.0.0"
-    path-scurry "^1.11.1"
-
-glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globalthis@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
-  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
-  dependencies:
-    define-properties "^1.2.1"
-    gopd "^1.0.1"
-
-google-auth-library@^9.0.0, google-auth-library@^9.3.0, google-auth-library@^9.6.3, google-auth-library@^9.7.0:
-  version "9.15.1"
-  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.15.1.tgz#0c5d84ed1890b2375f1cd74f03ac7b806b392928"
-  integrity sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==
-  dependencies:
-    base64-js "^1.3.0"
-    ecdsa-sig-formatter "^1.0.11"
-    gaxios "^6.1.1"
-    gcp-metadata "^6.1.0"
-    gtoken "^7.0.0"
-    jws "^4.0.0"
-
-google-gax@^4.3.3:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.6.1.tgz#57f8e3d893d4c708a71167cdcf47eb3afab95929"
-  integrity sha512-V6eky/xz2mcKfAd1Ioxyd6nmA61gao3n01C+YeuIwu3vzM9EDR6wcVzMSIbLMDXWeoi9SHYctXuKYC5uJUT3eQ==
-  dependencies:
-    "@grpc/grpc-js" "^1.10.9"
-    "@grpc/proto-loader" "^0.7.13"
-    "@types/long" "^4.0.0"
-    abort-controller "^3.0.0"
-    duplexify "^4.0.0"
-    google-auth-library "^9.3.0"
-    node-fetch "^2.7.0"
-    object-hash "^3.0.0"
-    proto3-json-serializer "^2.0.2"
-    protobufjs "^7.3.2"
-    retry-request "^7.0.0"
-    uuid "^9.0.1"
-
-google-logging-utils@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/google-logging-utils/-/google-logging-utils-0.0.2.tgz#5fd837e06fa334da450433b9e3e1870c1594466a"
-  integrity sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==
-
-google-protobuf@3.19.4:
-  version "3.19.4"
-  resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.19.4.tgz#8d32c3e34be9250956f28c0fb90955d13f311888"
-  integrity sha512-OIPNCxsG2lkIvf+P5FNfJ/Km95CsXOBecS9ZcAU6m2Rq3svc0Apl9nB3GMDNKfQ9asNv4KjyAqGwPQFrVle3Yg==
-
-googleapis-common@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-7.2.0.tgz#5c19102c9af1e5d27560be5e69ee2ccf68755d42"
-  integrity sha512-/fhDZEJZvOV3X5jmD+fKxMqma5q2Q9nZNSF3kn1F18tpxmA86BcTxAGBQdM0N89Z3bEaIs+HVznSmFJEAmMTjA==
-  dependencies:
-    extend "^3.0.2"
-    gaxios "^6.0.3"
-    google-auth-library "^9.7.0"
-    qs "^6.7.0"
-    url-template "^2.0.8"
-    uuid "^9.0.0"
-
-googleapis@128.0.0:
-  version "128.0.0"
-  resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-128.0.0.tgz#0005272f7f8730435d60ae0698d98910e16d0937"
-  integrity sha512-+sLtVYNazcxaSD84N6rihVX4QiGoqRdnlz2SwmQQkadF31XonDfy4ufk3maMg27+FiySrH0rd7V8p+YJG6cknA==
-  dependencies:
-    google-auth-library "^9.0.0"
-    googleapis-common "^7.0.0"
-
-gopd@^1.0.1, gopd@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
-  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.6:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
-gtoken@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-7.1.0.tgz#d61b4ebd10132222817f7222b1e6064bd463fc26"
-  integrity sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==
-  dependencies:
-    gaxios "^6.0.0"
-    jws "^4.0.0"
-
-handlebars@^4.7.8:
-  version "4.7.8"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.8.tgz#41c42c18b1be2365439188c77c6afae71c0cd9e9"
-  integrity sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==
-  dependencies:
-    minimist "^1.2.5"
-    neo-async "^2.6.2"
-    source-map "^0.6.1"
-    wordwrap "^1.0.0"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-bigints@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe"
-  integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
-
-has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
-  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
-  dependencies:
-    es-define-property "^1.0.0"
-
-has-proto@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5"
-  integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==
-  dependencies:
-    dunder-proto "^1.0.0"
-
-has-symbols@^1.0.3, has-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
-  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
-
-has-tostringtag@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
-  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
-  dependencies:
-    has-symbols "^1.0.3"
-
-has-unicode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
-
-hash-base@^3.0.0, hash-base@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.2.tgz#79d72def7611c3f6e3c3b5730652638001b10a74"
-  integrity sha512-Bb33KbowVTIj5s7Ked1OsqHUeCpz//tPwR+E2zJgJKo9Z5XolZ9b6bdUgjmYlwnWhoOQKoTd1TYToZGn5mAYOg==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "^2.3.8"
-    safe-buffer "^5.2.1"
-    to-buffer "^1.2.1"
-
-hasha@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/hasha/-/hasha-3.0.0.tgz#52a32fab8569d41ca69a61ff1a214f8eb7c8bd39"
-  integrity sha512-w0Kz8lJFBoyaurBiNrIvxPqr/gJ6fOfSkpAPOepN3oECqGJag37xPbOv57izi/KP8auHgNYxn5fXtAb+1LsJ6w==
-  dependencies:
-    is-stream "^1.0.1"
-
-hasown@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
-  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
-  dependencies:
-    function-bind "^1.1.2"
-
-hawk@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-1.0.0.tgz#b90bb169807285411da7ffcb8dd2598502d3b52d"
-  integrity sha512-Sg+VzrI7TjUomO0rjD6UXawsj50ykn5sB/xKNW/IenxzRVyw/wt9A2FLzYpGL/r0QG5hyXY8nLx/2m8UutoDcg==
-  dependencies:
-    boom "0.4.x"
-    cryptiles "0.2.x"
-    hoek "0.9.x"
-    sntp "0.2.x"
-
-heapdump@0.3.15:
-  version "0.3.15"
-  resolved "https://registry.yarnpkg.com/heapdump/-/heapdump-0.3.15.tgz#631a8a2585588ea64778d8ec80a64c6c025f6a08"
-  integrity sha512-n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==
-  dependencies:
-    nan "^2.13.2"
-
-hoek@0.9.x:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-0.9.1.tgz#3d322462badf07716ea7eb85baf88079cddce505"
-  integrity sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA==
-
-homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-  dependencies:
-    parse-passwd "^1.0.0"
-
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-hot-patcher@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/hot-patcher/-/hot-patcher-2.0.1.tgz#1473b799a3b756460ef226e10cf2cea4d79b435e"
-  integrity sha512-ECg1JFG0YzehicQaogenlcs2qg6WsXQsxtnbr1i696u5tLUjtJdQAh0u2g0Q5YV45f263Ta1GnUJsc8WIfJf4Q==
-
-html-encoding-sniffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
-  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
-  dependencies:
-    whatwg-encoding "^2.0.0"
-
-html-entities@^2.5.2:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.6.0.tgz#7c64f1ea3b36818ccae3d3fb48b6974208e984f8"
-  integrity sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==
-
-html-escaper@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
-  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-
-html-minifier-terser@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz#18752e23a2f0ed4b0f550f217bb41693e975b942"
-  integrity sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==
-  dependencies:
-    camel-case "^4.1.2"
-    clean-css "~5.3.2"
-    commander "^10.0.0"
-    entities "^4.4.0"
-    param-case "^3.0.4"
-    relateurl "^0.2.7"
-    terser "^5.15.1"
-
-htmlparser2@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
-  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.0.0"
-    domutils "^2.5.2"
-    entities "^2.0.0"
-
-http-cache-semantics@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5"
-  integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==
-
-http-errors@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
-  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.1"
-
-http-errors@~2.0.0, http-errors@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.1.tgz#36d2f65bc909c8790018dd36fb4d93da6caae06b"
-  integrity sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==
-  dependencies:
-    depd "~2.0.0"
-    inherits "~2.0.4"
-    setprototypeof "~1.2.0"
-    statuses "~2.0.2"
-    toidentifier "~1.0.1"
-
-http-parser-js@>=0.5.1:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.10.tgz#b3277bd6d7ed5588e20ea73bf724fcbe44609075"
-  integrity sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==
-
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
-  dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
-
-http-signature@~0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-0.10.1.tgz#4fbdac132559aa8323121e540779c0a012b27e66"
-  integrity sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA==
-  dependencies:
-    asn1 "0.1.11"
-    assert-plus "^0.1.5"
-    ctype "0.5.3"
-
-http-signature@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f"
-  integrity sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^2.0.2"
-    sshpk "^1.18.0"
-
-http_ece@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http_ece/-/http_ece-1.2.0.tgz#84d5885f052eae8c9b075eee4d2eb5105f114479"
-  integrity sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==
-
-httpreq@*:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-1.1.1.tgz#b8818316cdfd6b1bfb0f68b822fa1306cd24be68"
-  integrity sha512-uhSZLPPD2VXXOSN8Cni3kIsoFHaU2pT/nySEU/fHr/ePbqHYr0jeiQRmUKLEirC09SFPsdMoA7LU7UXMd/w0Kw==
-
-https-proxy-agent@7.0.6, https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
-  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
-  dependencies:
-    agent-base "^7.1.2"
-    debug "4"
-
-https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
-  dependencies:
-    ms "^2.0.0"
-
-hyperid@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/hyperid/-/hyperid-3.3.0.tgz#2042bb296b7f1d5ba0797a5705469af0899c8556"
-  integrity sha512-7qhCVT4MJIoEsNcbhglhdmBKb09QtcmJNiIQGq7js/Khf5FtQQ9bzcAuloeqBeee7XD7JqDeve9KNlQya5tSGQ==
-  dependencies:
-    buffer "^5.2.1"
-    uuid "^8.3.2"
-    uuid-parse "^1.1.0"
-
-iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
-  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
-iconv-lite@^0.7.0:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.2.tgz#d0bdeac3f12b4835b7359c2ad89c422a4d1cc72e"
-  integrity sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
-iconv-lite@~0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-ieee754@^1.1.13, ieee754@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-image-size@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-2.0.2.tgz#84a7b43704db5736f364bf0d1b029821299b4bdc"
-  integrity sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==
-
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ini@~1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-input@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/input/-/input-1.0.1.tgz#26bfb5315959c403e9317175cf8f9894e97e5742"
-  integrity sha512-5DKQKQ7Nm/CaPGYKF74uUvk5ftC3S04fLYWcDrNG2rOVhhRgB4E2J8JNb7AAh+RlQ/954ukas4bEbrRQ3/kPGA==
-  dependencies:
-    babel-runtime "^6.6.1"
-    chalk "^1.1.1"
-    inquirer "^0.12.0"
-    lodash "^4.6.1"
-
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  integrity sha512-bOetEz5+/WpgaW4D1NYOk1aD+JCqRjqu/FwRFgnIfiP7FC/zinsrfyO1vlS3nyH/R7S0IH3BIHBu4DBIDSqiGQ==
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    lodash "^4.3.0"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-internal-slot@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"
-  integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==
-  dependencies:
-    es-errors "^1.3.0"
-    hasown "^2.0.2"
-    side-channel "^1.1.0"
-
-ip-address@^10.0.1:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.1.0.tgz#d8dcffb34d0e02eb241427444a6e23f5b0595aa4"
-  integrity sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==
-
-ip-address@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-7.1.0.tgz#4a9c699e75b51cbeb18b38de8ed216efa1a490c5"
-  integrity sha512-V9pWC/VJf2lsXqP7IWJ+pe3P1/HCYGBMZrrnT62niLGjAfCbeiwXMUxaeHvnVlz19O27pvXP4azs+Pj/A0x+SQ==
-  dependencies:
-    jsbn "1.1.0"
-    sprintf-js "1.1.2"
-
-ipaddr.js@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
-  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-
-ipaddr.js@^2.0.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.3.0.tgz#71dce70e1398122208996d1c22f2ba46a24b1abc"
-  integrity sha512-Zv/pA+ciVFbCSBBjGfaKUya/CcGmUHzTydLMaTwrUUEM2DIEO3iZvueGxmacvmN50fGpGVKeTXpb2LcYQxeVdg==
-
-ipcheck@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ipcheck/-/ipcheck-0.1.0.tgz#a6f942228910010f1688117b7a774b39c5222f81"
-  integrity sha512-NwhrmROU0iXKa+U1quGuQ+ag+K/1Bb5V/yh5Q4SylSu/LGymPZcWB7p4u7JgJH0qOR6cTLDO5VZlRbhoeekNzQ==
-
-is-arguments@^1.0.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.2.0.tgz#ad58c6aecf563b78ef2bf04df540da8f5d7d8e1b"
-  integrity sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==
-  dependencies:
-    call-bound "^1.0.2"
-    has-tostringtag "^1.0.2"
-
-is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280"
-  integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    get-intrinsic "^1.2.6"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
-
-is-async-function@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.1.tgz#3e69018c8e04e73b738793d020bfe884b9fd3523"
-  integrity sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==
-  dependencies:
-    async-function "^1.0.0"
-    call-bound "^1.0.3"
-    get-proto "^1.0.1"
-    has-tostringtag "^1.0.2"
-    safe-regex-test "^1.1.0"
-
-is-bigint@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.1.0.tgz#dda7a3445df57a42583db4228682eba7c4170672"
-  integrity sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==
-  dependencies:
-    has-bigints "^1.0.2"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-boolean-object@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz#7067f47709809a393c71ff5bb3e135d8a9215d9e"
-  integrity sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==
-  dependencies:
-    call-bound "^1.0.3"
-    has-tostringtag "^1.0.2"
-
-is-buffer@~1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-callable@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-
-is-core-module@^2.16.1:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
-  integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
-  dependencies:
-    hasown "^2.0.2"
-
-is-data-view@^1.0.1, is-data-view@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e"
-  integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==
-  dependencies:
-    call-bound "^1.0.2"
-    get-intrinsic "^1.2.6"
-    is-typed-array "^1.1.13"
-
-is-date-object@^1.0.5, is-date-object@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7"
-  integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==
-  dependencies:
-    call-bound "^1.0.2"
-    has-tostringtag "^1.0.2"
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-finalizationregistry@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz#eefdcdc6c94ddd0674d9c85887bf93f944a97c90"
-  integrity sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==
-  dependencies:
-    call-bound "^1.0.3"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-generator-function@^1.0.10, is-generator-function@^1.0.7:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5"
-  integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==
-  dependencies:
-    call-bound "^1.0.4"
-    generator-function "^2.0.0"
-    get-proto "^1.0.1"
-    has-tostringtag "^1.0.2"
-    safe-regex-test "^1.1.0"
-
-is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-lambda@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
-
-is-map@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
-  integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
-
-is-negative-zero@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
-  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
-
-is-number-object@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
-  integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==
-  dependencies:
-    call-bound "^1.0.3"
-    has-tostringtag "^1.0.2"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-potential-custom-element-name@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
-  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-
-is-property@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==
-
-is-regex@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
-  integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==
-  dependencies:
-    call-bound "^1.0.2"
-    gopd "^1.2.0"
-    has-tostringtag "^1.0.2"
-    hasown "^2.0.2"
-
-is-set@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
-  integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
-
-is-shared-array-buffer@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f"
-  integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==
-  dependencies:
-    call-bound "^1.0.3"
-
-is-stream@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
-
-is-stream@^2.0.0, is-stream@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
-is-string@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
-  integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==
-  dependencies:
-    call-bound "^1.0.3"
-    has-tostringtag "^1.0.2"
-
-is-symbol@^1.0.4, is-symbol@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634"
-  integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==
-  dependencies:
-    call-bound "^1.0.2"
-    has-symbols "^1.1.0"
-    safe-regex-test "^1.1.0"
-
-is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15, is-typed-array@^1.1.3:
-  version "1.1.15"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
-  integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
-  dependencies:
-    which-typed-array "^1.1.16"
-
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
-
-is-weakmap@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
-  integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
-
-is-weakref@^1.0.2, is-weakref@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz#eea430182be8d64174bd96bffbc46f21bf3f9293"
-  integrity sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==
-  dependencies:
-    call-bound "^1.0.3"
-
-is-weakset@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.4.tgz#c9f5deb0bc1906c6d6f1027f284ddf459249daca"
-  integrity sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==
-  dependencies:
-    call-bound "^1.0.3"
-    get-intrinsic "^1.2.6"
-
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
-
-isomorphic-fetch@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz#0267b005049046d2421207215d45d6a262b8b8b4"
-  integrity sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==
-  dependencies:
-    node-fetch "^2.6.1"
-    whatwg-fetch "^3.4.1"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
-
-istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
-
-istanbul-lib-hook@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133"
-  integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==
-  dependencies:
-    append-transform "^1.0.0"
-
-istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
-
-istanbul-lib-report@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
-  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
-  dependencies:
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    supports-color "^6.1.0"
-
-istanbul-lib-source-maps@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
-  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    rimraf "^2.6.3"
-    source-map "^0.6.1"
-
-istanbul-reports@^2.2.4:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931"
-  integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==
-  dependencies:
-    html-escaper "^2.0.0"
-
-jackspeak@^3.1.2:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
-  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
-  dependencies:
-    "@isaacs/cliui" "^8.0.2"
-  optionalDependencies:
-    "@pkgjs/parseargs" "^0.11.0"
-
-joi@^17.9.2:
-  version "17.13.3"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
-  integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
-  dependencies:
-    "@hapi/hoek" "^9.3.0"
-    "@hapi/topo" "^5.1.0"
-    "@sideway/address" "^4.1.5"
-    "@sideway/formula" "^3.0.1"
-    "@sideway/pinpoint" "^2.0.0"
-
-jose@^4.15.4, jose@^4.15.9:
-  version "4.15.9"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.9.tgz#9b68eda29e9a0614c042fa29387196c7dd800100"
-  integrity sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==
-
-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.14.2"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.2.tgz#77485ce1dd7f33c061fd1b16ecea23b55fcb04b0"
-  integrity sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsbn@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
-  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
-
-jsdom@22.1.0:
-  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8"
-  integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==
-  dependencies:
-    abab "^2.0.6"
-    cssstyle "^3.0.0"
-    data-urls "^4.0.0"
-    decimal.js "^10.4.3"
-    domexception "^4.0.0"
-    form-data "^4.0.0"
-    html-encoding-sniffer "^3.0.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.1"
-    is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.4"
-    parse5 "^7.1.2"
-    rrweb-cssom "^0.6.0"
-    saxes "^6.0.0"
-    symbol-tree "^3.2.4"
-    tough-cookie "^4.1.2"
-    w3c-xmlserializer "^4.0.0"
-    webidl-conversions "^7.0.0"
-    whatwg-encoding "^2.0.0"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^12.0.1"
-    ws "^8.13.0"
-    xml-name-validator "^4.0.0"
-
-jsesc@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
-  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
-
-json-bigint@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
-  integrity sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==
-  dependencies:
-    bignumber.js "^9.0.0"
-
-json-parse-better-errors@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-schema@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
-json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
-
-json5@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
-jsonwebtoken@^9.0.0:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz#6cd57ab01e9b0ac07cb847d53d3c9b6ee31f7ae2"
-  integrity sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==
-  dependencies:
-    jws "^4.0.1"
-    lodash.includes "^4.3.0"
-    lodash.isboolean "^3.0.3"
-    lodash.isinteger "^4.0.4"
-    lodash.isnumber "^3.0.3"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.once "^4.0.0"
-    ms "^2.1.1"
-    semver "^7.5.4"
-
-jsprim@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
-  integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
-jwa@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.1.tgz#bf8176d1ad0cd72e0f3f58338595a13e110bc804"
-  integrity sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==
-  dependencies:
-    buffer-equal-constant-time "^1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
-jwks-rsa@^3.1.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-3.2.2.tgz#f6d528306befacdbc62c8c0272761faac55ffbb3"
-  integrity sha512-BqTyEDV+lS8F2trk3A+qJnxV5Q9EqKCBJOPti3W97r7qTympCZjb7h2X6f2kc+0K3rsSTY1/6YG2eaXKoj497w==
-  dependencies:
-    "@types/jsonwebtoken" "^9.0.4"
-    debug "^4.3.4"
-    jose "^4.15.4"
-    limiter "^1.1.5"
-    lru-memoizer "^2.2.0"
-
-jws@^4.0.0, jws@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.1.tgz#07edc1be8fac20e677b283ece261498bd38f0690"
-  integrity sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==
-  dependencies:
-    jwa "^2.0.1"
-    safe-buffer "^5.0.1"
-
-jwt-simple@0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/jwt-simple/-/jwt-simple-0.5.6.tgz#3357adec55b26547114157be66748995b75b333a"
-  integrity sha512-40aUybvhH9t2h71ncA1/1SbtTNCVZHgsTsTgqPUxGWDmUDrXyDf2wMNQKEbdBjbf4AI+fQhbECNTV6lWxQKUzg==
-
-keygrip@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226"
-  integrity sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==
-  dependencies:
-    tsscmp "1.0.6"
-
-kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-koa-compose@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
-  integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==
-
-kuler@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
-  integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
-
-layerr@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/layerr/-/layerr-3.0.0.tgz#bc4e0e5986ffd3ab8c3c88b458f53be8dceea29e"
-  integrity sha512-tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA==
-
-lazystream@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
-  integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
-  dependencies:
-    readable-stream "^2.0.5"
-
-ldap-filter@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/ldap-filter/-/ldap-filter-0.3.3.tgz#2b14c68a2a9d4104dbdbc910a1ca85fd189e9797"
-  integrity sha512-/tFkx5WIn4HuO+6w9lsfxq4FN3O+fDZeO9Mek8dCD8rTUpqzRa766BOBO7BcGkn3X86m5+cBm1/2S/Shzz7gMg==
-  dependencies:
-    assert-plus "^1.0.0"
-
-ldapauth-fork@5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.5.tgz#984f98ffda8622a4dcf150533e2d3282372c2cb1"
-  integrity sha512-LWUk76+V4AOZbny/3HIPQtGPWZyA3SW2tRhsWIBi9imP22WJktKLHV1ofd8Jo/wY7Ve6vAT7FCI5mEn3blZTjw==
-  dependencies:
-    "@types/ldapjs" "^2.2.2"
-    bcryptjs "^2.4.0"
-    ldapjs "^2.2.1"
-    lru-cache "^7.10.1"
-
-ldapjs@^2.2.1:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.3.tgz#06c317d3cbb5ac42fbba741e1a8b130ffcf997ab"
-  integrity sha512-75QiiLJV/PQqtpH+HGls44dXweviFwQ6SiIK27EqzKQ5jU/7UFrl2E5nLdQ3IYRBzJ/AVFJI66u0MZ0uofKYwg==
-  dependencies:
-    abstract-logging "^2.0.0"
-    asn1 "^0.2.4"
-    assert-plus "^1.0.0"
-    backoff "^2.5.0"
-    ldap-filter "^0.3.3"
-    once "^1.4.0"
-    vasync "^2.2.0"
-    verror "^1.8.1"
-
-lie@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==
-  dependencies:
-    immediate "~3.0.5"
-
-limiter@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
-  integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
-
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
-loadavg-windows@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/loadavg-windows/-/loadavg-windows-1.1.1.tgz#e384aa8107b4ebf851bec267dd4a0789c4c54bc4"
-  integrity sha512-ncSyH121LuN6OENPSohTAS2W85J3NYVIfjsVcK4spViQbHlQUXhGKd8VYhrqWyjtwwSTw4g3rrDraNoSJWRLgw==
-  dependencies:
-    weak-daemon "1.0.3"
-
-localforage@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
-  integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
-  dependencies:
-    lie "3.1.1"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
-
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==
-
-lodash.flattendeep@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-  integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==
-
-lodash.includes@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
-  integrity sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==
-
-lodash.isboolean@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
-  integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==
-
-lodash.isinteger@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
-  integrity sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==
-
-lodash.isnumber@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
-  integrity sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==
-
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==
-
-lodash.once@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
-
-lodash.snakecase@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
-  integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==
-
-lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.6.1:
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
-  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
-
-logform@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/logform/-/logform-2.7.0.tgz#cfca97528ef290f2e125a08396805002b2d060d1"
-  integrity sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==
-  dependencies:
-    "@colors/colors" "1.6.0"
-    "@types/triple-beam" "^1.3.2"
-    fecha "^4.2.0"
-    ms "^2.1.1"
-    safe-stable-stringify "^2.3.1"
-    triple-beam "^1.3.0"
-
-long@^5.0.0, long@^5.2.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/long/-/long-5.3.2.tgz#1d84463095999262d7d7b7f8bfd4a8cc55167f83"
-  integrity sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==
-
-lossless-json@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/lossless-json/-/lossless-json-2.0.1.tgz#03f2deb5c1a828feac19d88c16e93d6388971d52"
-  integrity sha512-KW/FSL426qblKVvf4ImeMVGr0Je6J9aXvAMUOIU8AzelDj06q47mn6QJ+56lBBd+A8kjrncrxdKQs6ZssAXTmw==
-
-lower-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
-  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
-  dependencies:
-    tslib "^2.0.3"
-
-lru-cache@6.0.0, lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-lru-cache@^10.2.0, lru-cache@^10.4.3:
-  version "10.4.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
-  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
-
-lru-cache@^4.0.1:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-lru-cache@^7.10.1:
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
-  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
-
-lru-memoizer@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/lru-memoizer/-/lru-memoizer-2.3.0.tgz#ef0fbc021bceb666794b145eefac6be49dc47f31"
-  integrity sha512-GXn7gyHAMhO13WSKrIiNfztwxodVsP8IoZ3XfrJV4yH2x0/OeTO/FIaAHTY5YekdGgW94njfuKmyyt1E0mR6Ug==
-  dependencies:
-    lodash.clonedeep "^4.5.0"
-    lru-cache "6.0.0"
-
-lru.min@^1.0.0, lru.min@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/lru.min/-/lru.min-1.1.3.tgz#c8c3d001dfb4cbe5b8d1f4bea207d4a320e5d76f"
-  integrity sha512-Lkk/vx6ak3rYkRR0Nhu4lFUT2VDnQSxBe8Hbl7f36358p6ow8Bnvr8lrLt98H8J1aGxfhbX4Fs5tYg2+FTwr5Q==
-
-ltx@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/ltx/-/ltx-3.1.2.tgz#cdbb693aab421f2524ddf0e7abf42a8b21b2ca47"
-  integrity sha512-tFSKojN92FqNK6eRTmKK/ROUTUYVWKAxgohz523TPhF1G3nR3DXQS/I7/705rEPrDSloKDgMdRlh0qgMFQoVYw==
-
-make-dir@^2.0.0, make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
-
-make-fetch-happen@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
-  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
-  dependencies:
-    agentkeepalive "^4.1.3"
-    cacache "^15.2.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^6.0.0"
-    minipass "^3.1.3"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.2"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^6.0.0"
-    ssri "^8.0.0"
-
-mariadb@3.4.5:
-  version "3.4.5"
-  resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.4.5.tgz#27ccfcb4fab3d7805ec4e365ff61f76fe7bd8c70"
-  integrity sha512-gThTYkhIS5rRqkVr+Y0cIdzr+GRqJ9sA2Q34e0yzmyhMCwyApf3OKAC1jnF23aSlIOqJuyaUFUcj7O1qZslmmQ==
-  dependencies:
-    "@types/geojson" "^7946.0.16"
-    "@types/node" "^24.0.13"
-    denque "^2.1.0"
-    iconv-lite "^0.6.3"
-    lru-cache "^10.4.3"
-
-math-intrinsics@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
-  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
-
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-md5@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
-  integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
-  dependencies:
-    charenc "0.0.2"
-    crypt "0.0.2"
-    is-buffer "~1.1.6"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
-
-memory-pager@^1.0.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
-  integrity sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==
-
-merge-descriptors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
-  integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
-
-merge-source-map@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
-  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
-  dependencies:
-    source-map "^0.6.1"
-
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
-
-mime-db@1.52.0:
-  version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
-  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
-
-"mime-db@>= 1.43.0 < 2":
-  version "1.54.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5"
-  integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==
-
-mime-types@^2.1.12, mime-types@^2.1.35, mime-types@~2.1.24, mime-types@~2.1.34:
-  version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
-  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
-  dependencies:
-    mime-db "1.52.0"
-
-mime@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mime@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
-  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
-
-mime@~1.2.11, mime@~1.2.9:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
-  integrity sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw==
-
-mimic-response@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
-  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
-
-minimalistic-assert@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimatch@^3.0.4, minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^5.1.0:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
-  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^9.0.4, minimatch@^9.0.5:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
-  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimist@1.2.8, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==
-
-minio@8.0.6:
-  version "8.0.6"
-  resolved "https://registry.yarnpkg.com/minio/-/minio-8.0.6.tgz#ec736e3e3ead1f450af5b9b28256c28e52a83dd0"
-  integrity sha512-sOeh2/b/XprRmEtYsnNRFtOqNRTPDvYtMWh+spWlfsuCV/+IdxNeKVUMKLqI7b5Dr07ZqCPuaRGU/rB9pZYVdQ==
-  dependencies:
-    async "^3.2.4"
-    block-stream2 "^2.1.0"
-    browser-or-node "^2.1.1"
-    buffer-crc32 "^1.0.0"
-    eventemitter3 "^5.0.1"
-    fast-xml-parser "^4.4.1"
-    ipaddr.js "^2.0.1"
-    lodash "^4.17.21"
-    mime-types "^2.1.35"
-    query-string "^7.1.3"
-    stream-json "^1.8.0"
-    through2 "^4.0.2"
-    web-encoding "^1.1.5"
-    xml2js "^0.5.0 || ^0.6.2"
-
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-fetch@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
-  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
-  dependencies:
-    minipass "^3.1.0"
-    minipass-sized "^1.0.3"
-    minizlib "^2.0.0"
-  optionalDependencies:
-    encoding "^0.1.12"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-sized@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
-  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
-  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
-  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
-  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
-
-minizlib@^2.0.0, minizlib@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
-mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
-mkdirp@^0.5.0:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
-
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-modern-syslog@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/modern-syslog/-/modern-syslog-1.2.0.tgz#6e419f640efe877f73ffea1c3e987132a69cd2a2"
-  integrity sha512-dmFE23qpyZJf8MOdzuNKliW4j1PCqxaRtSzyNnv6QDUWjf1z8T4ZoQ7Qf0t6It2ewNv9/XJZSJoUgwpq3D0X7A==
-  dependencies:
-    nan "^2.13.2"
-
-mongodb-connection-string-url@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf"
-  integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==
-  dependencies:
-    "@types/whatwg-url" "^8.2.1"
-    whatwg-url "^11.0.0"
-
-mongodb@4.17.2:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.17.2.tgz#237c0534e36a3449bd74c6bf6d32f87a1ca7200c"
-  integrity sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg==
-  dependencies:
-    bson "^4.7.2"
-    mongodb-connection-string-url "^2.6.0"
-    socks "^2.7.1"
-  optionalDependencies:
-    "@aws-sdk/credential-providers" "^3.186.0"
-    "@mongodb-js/saslprep" "^1.1.0"
-
-mongodb@^3.3.2:
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.7.4.tgz#119530d826361c3e12ac409b769796d6977037a4"
-  integrity sha512-K5q8aBqEXMwWdVNh94UQTwZ6BejVbFhh1uB6c5FKtPE9eUMZPUO3sRZdgIEcHSrAWmxzpG/FeODDKL388sqRmw==
-  dependencies:
-    bl "^2.2.1"
-    bson "^1.1.4"
-    denque "^1.4.1"
-    optional-require "^1.1.8"
-    safe-buffer "^5.1.2"
-  optionalDependencies:
-    saslprep "^1.0.0"
-
-mongojs@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mongojs/-/mongojs-3.1.0.tgz#4242e6f5218a7301c35393b64ba9130d1d9488ef"
-  integrity sha512-aXJ4xfXwx9s1cqtKTZ24PypXiWhIgvgENObQzCGbV4QBxEVedy3yuErhx6znk959cF2dOzL2ClgXJvIhfgkpIQ==
-  dependencies:
-    each-series "^1.0.0"
-    mongodb "^3.3.2"
-    nyc "^14.1.1"
-    once "^1.4.0"
-    parse-mongo-url "^1.1.1"
-    readable-stream "^3.4.0"
-    thunky "^1.1.0"
-    to-mongodb-core "^2.0.0"
-
-mqemitter@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/mqemitter/-/mqemitter-6.0.2.tgz#f99ab435de886082e005e1577d1070cecc63f695"
-  integrity sha512-8RGlznQx/Nb1xC3xKUFXHWov7pn7JdH++YVwlr6SLT6k3ft1h+ImGqZdVudbdKruFckIq9wheq9s4hgCivJDow==
-  dependencies:
-    fastparallel "^2.4.1"
-    qlobber "^8.0.1"
-
-mqtt-packet@^7.0.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-7.1.2.tgz#80364910a99de5d127d0b0c9a915cfb6111790bf"
-  integrity sha512-FFZbcZ2omsf4c5TxEQfcX9hI+JzDpDKPT46OmeIBpVA7+t32ey25UNqlqNXTmeZOr5BLsSIERpQQLsFWJS94SQ==
-  dependencies:
-    bl "^4.0.2"
-    debug "^4.1.1"
-    process-nextick-args "^2.0.1"
-
-mqtt-packet@^9.0.0:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-9.0.2.tgz#fe6ae2c36fe3f269d11b3fe663b53648f3b3700a"
-  integrity sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==
-  dependencies:
-    bl "^6.0.8"
-    debug "^4.3.4"
-    process-nextick-args "^2.0.1"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
-
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-multiparty@4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/multiparty/-/multiparty-4.2.3.tgz#6b14981badb5ad3f0929622868751810368d4633"
-  integrity sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==
-  dependencies:
-    http-errors "~1.8.1"
-    safe-buffer "5.2.1"
-    uid-safe "2.1.5"
-
-mustache@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64"
-  integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==
-
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
-  integrity sha512-EbrziT4s8cWPmzr47eYVW3wimS4HsvlnV5ri1xw1aR6JQo/OrJX5rkl32K/QQHdxeabJETtfeaROGhd8W7uBgg==
-
-mysql2@3.15.1:
-  version "3.15.1"
-  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.15.1.tgz#c04e3b944768132618bded85b7cf2fa8397033e0"
-  integrity sha512-WZMIRZstT2MFfouEaDz/AGFnGi1A2GwaDe7XvKTdRJEYiAHbOrh4S3d8KFmQeh11U85G+BFjIvS1Di5alusZsw==
-  dependencies:
-    aws-ssl-profiles "^1.1.1"
-    denque "^2.1.0"
-    generate-function "^2.3.1"
-    iconv-lite "^0.7.0"
-    long "^5.2.1"
-    lru.min "^1.0.0"
-    named-placeholders "^1.1.3"
-    seq-queue "^0.0.5"
-    sqlstring "^2.3.2"
-
-named-placeholders@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.6.tgz#c50c6920b43f258f59c16add1e56654f5cc02bb5"
-  integrity sha512-Tz09sEL2EEuv5fFowm419c1+a/jSMiBjI9gHxVLrVdbUkkNUUfjsVYs9pVZu5oCon/kmRh9TfLEObFtkVxmY0w==
-  dependencies:
-    lru.min "^1.1.0"
-
-nan@^2.13.2, nan@^2.19.0, nan@^2.23.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.24.0.tgz#a8919b36e692aa5b260831910e4f81419fc0a283"
-  integrity sha512-Vpf9qnVW1RaDkoNKFUvfxqAbtI8ncb8OJlqZ9wwpXzWPEsvsB1nvdUi6oYrHIkQ1Y/tMDnr1h4nczS0VB9Xykg==
-
-napi-build-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-2.0.0.tgz#13c22c0187fcfccce1461844136372a47ddc027e"
-  integrity sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==
-
-negotiator@0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
-negotiator@^0.6.2, negotiator@~0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
-  integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==
-
-neo-async@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-nested-error-stacks@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz#26c8a3cee6cc05fbcf1e333cd2fc3e003326c0b5"
-  integrity sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==
-
-nested-property@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/nested-property/-/nested-property-4.0.0.tgz#a67b5a31991e701e03cdbaa6453bc5b1011bb88d"
-  integrity sha512-yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA==
-
-next-tick@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
-  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
-
-no-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
-  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
-  dependencies:
-    lower-case "^2.0.2"
-    tslib "^2.0.3"
-
-node-abi@^3.3.0:
-  version "3.87.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.87.0.tgz#423e28fea5c2f195fddd98acded9938c001ae6dd"
-  integrity sha512-+CGM1L1CgmtheLcBuleyYOn7NWPVu0s0EJH2C4puxgEZb9h8QpR9G2dBfZJOAUhi7VQxuBPMd0hiISWcTyiYyQ==
-  dependencies:
-    semver "^7.3.5"
-
-node-addon-api@^1.7.1:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
-  integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
-
-node-addon-api@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
-  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
-
-node-domexception@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
-  integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
-
-node-environment-flags@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
-  integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-    semver "^5.7.0"
-
-node-fetch@^2.6.1, node-fetch@^2.6.9, node-fetch@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
-  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
-  dependencies:
-    whatwg-url "^5.0.0"
-
-node-fetch@^3.3.0, node-fetch@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b"
-  integrity sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==
-  dependencies:
-    data-uri-to-buffer "^4.0.0"
-    fetch-blob "^3.1.4"
-    formdata-polyfill "^4.0.10"
-
-node-forge@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.2.tgz#d0d2659a26eef778bf84d73e7f55c08144ee7750"
-  integrity sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==
-
-node-forge@^1.3.0, node-forge@^1.3.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.3.tgz#0ad80f6333b3a0045e827ac20b7f735f93716751"
-  integrity sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==
-
-node-gyp-build@^4.3.0:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz#8a70ee85464ae52327772a90d66c6077a900cfc8"
-  integrity sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==
-
-node-gyp@8.x:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
-  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^9.1.0"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
-node-localstorage@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/node-localstorage/-/node-localstorage-2.2.1.tgz#869723550a4883e426cb391d2df0b563a51c7c1c"
-  integrity sha512-vv8fJuOUCCvSPjDjBLlMqYMHob4aGjkmrkaE42/mZr0VT+ZAU10jRF8oTnX9+pgU9/vYJ8P7YT3Vd6ajkmzSCw==
-  dependencies:
-    write-file-atomic "^1.1.4"
-
-node-pushover@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-pushover/-/node-pushover-1.0.0.tgz#d723fda9d9396f9714b30dcc380ac6bc44c64e96"
-  integrity sha512-yIIt6a60obTco2/Yr0/9iR4+4sDbDzlM3qpaJ99xnAwFlDeg29V5ur19D2L+S9i5LaBao5yAQKAdpvQ+7kVIng==
-  dependencies:
-    httpreq "*"
-
-node-releases@^2.0.27:
-  version "2.0.27"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.27.tgz#eedca519205cf20f650f61d56b070db111231e4e"
-  integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==
-
-node-sspi@0.2.10:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/node-sspi/-/node-sspi-0.2.10.tgz#9e1f5ff2f0af24324023cef8471c06fcb24a5591"
-  integrity sha512-IEm0OaTklsCCO9rzxvchkJvuU85yA7ouD723uRr3IabTXv/aOIZRwA3CVrZxU+sZ7/kOttIyrOsi7HqeHTH8eg==
-  dependencies:
-    bindings "^1.1.1"
-    node-addon-api "^1.7.1"
-
-node-uuid@~1.4.0:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-  integrity sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==
-
-node-vault@0.10.5:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/node-vault/-/node-vault-0.10.5.tgz#f86818435387ddb4508875120c06096ec09cdaa3"
-  integrity sha512-sIyB/5296U2tMT7hH1nrkoYUXkRxuLsG40fgUHaBhzM+G/uyBKBo+QNsvKqE5FNq24QJM+tr97N+knLQiEEcSg==
-  dependencies:
-    debug "^4.3.4"
-    mustache "^4.2.0"
-    postman-request "^2.88.1-postman.42"
-    tv4 "^1.3.0"
-
-node-windows@0.1.14:
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/node-windows/-/node-windows-0.1.14.tgz#31bb0503da3bc637f2bfaa8b266640a2e92d891f"
-  integrity sha512-2sz0i+ckeX/+22Z4KcDVis1ukyGOYZWx2WG9nQYauUwzIxEye5QcMrExkH7OaRSHkwM5bN/jesxsiQqkUb1O/w==
-  dependencies:
-    optimist "~0.6.0"
-    xml "0.0.12"
-
-nodemailer@6.10.1:
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.10.1.tgz#cbc434c54238f83a51c07eabd04e2b3e832da623"
-  integrity sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==
-
-nofilter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz#78d6f4b6a613e7ced8b015cec534625f7667006e"
-  integrity sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA==
-
-nopt@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
-  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
-  dependencies:
-    abbrev "1"
-
-normalize-package-data@^2.3.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
-  dependencies:
-    are-we-there-yet "^3.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^4.0.3"
-    set-blocking "^2.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
-
-nwsapi@^2.2.4:
-  version "2.2.23"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.23.tgz#59712c3a88e6de2bb0b6ccc1070397267019cf6c"
-  integrity sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==
-
-nyc@^14.1.1:
-  version "14.1.1"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-14.1.1.tgz#151d64a6a9f9f5908a1b73233931e4a0a3075eeb"
-  integrity sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw==
-  dependencies:
-    archy "^1.0.0"
-    caching-transform "^3.0.2"
-    convert-source-map "^1.6.0"
-    cp-file "^6.2.0"
-    find-cache-dir "^2.1.0"
-    find-up "^3.0.0"
-    foreground-child "^1.5.6"
-    glob "^7.1.3"
-    istanbul-lib-coverage "^2.0.5"
-    istanbul-lib-hook "^2.0.7"
-    istanbul-lib-instrument "^3.3.0"
-    istanbul-lib-report "^2.0.8"
-    istanbul-lib-source-maps "^3.0.6"
-    istanbul-reports "^2.2.4"
-    js-yaml "^3.13.1"
-    make-dir "^2.1.0"
-    merge-source-map "^1.1.0"
-    resolve-from "^4.0.0"
-    rimraf "^2.6.3"
-    signal-exit "^3.0.2"
-    spawn-wrap "^1.4.2"
-    test-exclude "^5.2.3"
-    uuid "^3.3.2"
-    yargs "^13.2.2"
-    yargs-parser "^13.0.0"
-
-oauth-sign@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.3.0.tgz#cb540f93bb2b22a7d5941691a288d60e8ea9386e"
-  integrity sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ==
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-oauth@0.10.x:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.10.2.tgz#fd7139b0ce1a1037bd11fa4e236afc588132418c"
-  integrity sha512-JtFnB+8nxDEXgNyniwz573xxbKSOu3R8D40xQKqcjwJ2CDkYqUDI53o6IuzDJBx60Z8VKCm271+t8iFjakrl8Q==
-
-oauth@0.9.x:
-  version "0.9.15"
-  resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1"
-  integrity sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==
-
-object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
-object-hash@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
-  integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
-
-object-hash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
-  integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
-
-object-inspect@^1.13.3, object-inspect@^1.13.4:
-  version "1.13.4"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
-  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
-
-object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.7:
-  version "4.1.7"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
-  integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-    has-symbols "^1.1.0"
-    object-keys "^1.1.1"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.9.tgz#bf9e7520f14d50de88dee2b9c9eca841166322dc"
-  integrity sha512-mt8YM6XwsTTovI+kdZdHSxoyF2DI59up034orlC9NfweclcWOt7CVascNNLp6U+bjFVCVCIh9PwS76tDM/rH8g==
-  dependencies:
-    array.prototype.reduce "^1.0.8"
-    call-bind "^1.0.8"
-    define-properties "^1.2.1"
-    es-abstract "^1.24.0"
-    es-object-atoms "^1.1.1"
-    gopd "^1.2.0"
-    safe-array-concat "^1.1.3"
-
-oidc-token-hash@^5.0.3:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.2.0.tgz#be8a8885c7e2478d21a674e15afa31f1bcc4a61f"
-  integrity sha512-6gj2m8cJZ+iSW8bm0FXdGF0YhIQbKrfP4yWTNzxc31U6MOjfEmB1rHvlYvxI1B7t7BCi1F2vYTT6YhtQRG4hxw==
-
-on-finished@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
-  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.1.0.tgz#59da4f91c45f5f989c6e4bcedc5a3b0aed70ff65"
-  integrity sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-one-time@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45"
-  integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==
-  dependencies:
-    fn.name "1.x.x"
-
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==
-
-openid-client@5.7.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-5.7.1.tgz#34cace862a3e6472ed7d0a8616ef73b7fb85a9c3"
-  integrity sha512-jDBPgSVfTnkIh71Hg9pRvtJc6wTwqjRkN88+gCFtYWrlP4Yx2Dsrow8uPi3qLr/aeymPF3o2+dS+wOpglK04ew==
-  dependencies:
-    jose "^4.15.9"
-    lru-cache "^6.0.0"
-    object-hash "^2.2.0"
-    oidc-token-hash "^5.0.3"
-
-opentype.js@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/opentype.js/-/opentype.js-0.7.3.tgz#40fb8ce18bfd60e74448efdfe442834098397aab"
-  integrity sha512-Veui5vl2bLonFJ/SjX/WRWJT3SncgiZNnKUyahmXCc2sa1xXW15u3R/3TN5+JFiP7RsjK5ER4HA5eWaEmV9deA==
-  dependencies:
-    tiny-inflate "^1.0.2"
-
-optimist@~0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
-optional-require@^1.1.8:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.1.10.tgz#35ea423c5442df157c084f8d5a9d5250bba1de47"
-  integrity sha512-0r3OB9EIQsP+a5HVATHq2ExIy2q/Vaffoo4IAikW1spCYswhLxqWQS0i3GwS3AdY/OIP4SWZHLGz8CMU558PGw==
-  dependencies:
-    require-at "^1.0.6"
-
-os-homedir@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
-
-otplib@12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/otplib/-/otplib-12.0.1.tgz#c1d3060ab7aadf041ed2960302f27095777d1f73"
-  integrity sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==
-  dependencies:
-    "@otplib/core" "^12.0.1"
-    "@otplib/preset-default" "^12.0.1"
-    "@otplib/preset-v11" "^12.0.1"
-
-own-keys@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358"
-  integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==
-  dependencies:
-    get-intrinsic "^1.2.6"
-    object-keys "^1.1.1"
-    safe-push-apply "^1.0.0"
-
-p-limit@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-package-hash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-3.0.0.tgz#50183f2d36c9e3e528ea0a8605dff57ce976f88e"
-  integrity sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA==
-  dependencies:
-    graceful-fs "^4.1.15"
-    hasha "^3.0.0"
-    lodash.flattendeep "^4.4.0"
-    release-zalgo "^1.0.0"
-
-package-json-from-dist@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
-  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
-
-pako@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86"
-  integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==
-
-param-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
-  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
-  dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
-
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-parse-mongo-url@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/parse-mongo-url/-/parse-mongo-url-1.1.1.tgz#66238df5f8e7c0c8ca4cd970d4ab6a1373eb75b5"
-  integrity sha512-7bZUusQIrFLwvsLHBnCz2WKYQ5LKO/LwKPnvQxbMIh9gDx8H5ZsknRmLjZdn6GVdrgVOwqDrZKsY0qDLNmRgcw==
-
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
-
-parse5@^7.1.2:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05"
-  integrity sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==
-  dependencies:
-    entities "^6.0.0"
-
-parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
-parsimmon@1.18.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.18.1.tgz#d8dd9c28745647d02fc6566f217690897eed7709"
-  integrity sha512-u7p959wLfGAhJpSDJVYXoyMCXWYwHia78HhRBWqk7AIbxdmlrfdp5wX0l3xv/iTSH5HvhN9K7o26hwwpgS5Nmw==
-
-pascal-case@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
-  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-passport-azure-oauth2@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/passport-azure-oauth2/-/passport-azure-oauth2-0.1.0.tgz#b391ebdf3aabb9529aa2b6c461d5a1677dd4c362"
-  integrity sha512-AoDCiGv3EDXRTArN9ZpnG+ZGnwx6shO8lU1S9x8YVQtZ3OLlbrmSWQTPOutb/Mm+MNNX6SSYKctXTX7U4nRW4g==
-  dependencies:
-    passport-oauth "^1.0.0"
-
-passport-github2@0.1.12:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/passport-github2/-/passport-github2-0.1.12.tgz#a72ebff4fa52a35bc2c71122dcf470d1116f772c"
-  integrity sha512-3nPUCc7ttF/3HSP/k9sAXjz3SkGv5Nki84I05kSQPo01Jqq1NzJACgMblCK0fGcv9pKCG/KXU3AJRDGLqHLoIw==
-  dependencies:
-    passport-oauth2 "1.x.x"
-
-passport-google-oauth20@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz#0d241b2d21ebd3dc7f2b60669ec4d587e3a674ef"
-  integrity sha512-KSk6IJ15RoxuGq7D1UKK/8qKhNfzbLeLrG3gkLZ7p4A6DBCcv7xpyQwuXtWdpyR0+E0mwkpjY1VfPOhxQrKzdQ==
-  dependencies:
-    passport-oauth2 "1.x.x"
-
-passport-oauth1@1.x.x:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.3.0.tgz#5d57f1415c8e28e46b461a12ec1b492934f7c354"
-  integrity sha512-8T/nX4gwKTw0PjxP1xfD0QhrydQNakzeOpZ6M5Uqdgz9/a/Ag62RmJxnZQ4LkbdXGrRehQHIAHNAu11rCP46Sw==
-  dependencies:
-    oauth "0.9.x"
-    passport-strategy "1.x.x"
-    utils-merge "1.x.x"
-
-passport-oauth2@1.x.x:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.8.0.tgz#55725771d160f09bbb191828d5e3d559eee079c8"
-  integrity sha512-cjsQbOrXIDE4P8nNb3FQRCCmJJ/utnFKEz2NX209f7KOHPoX18gF7gBzBbLLsj2/je4KrgiwLLGjf0lm9rtTBA==
-  dependencies:
-    base64url "3.x.x"
-    oauth "0.10.x"
-    passport-strategy "1.x.x"
-    uid2 "0.0.x"
-    utils-merge "1.x.x"
-
-passport-oauth@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/passport-oauth/-/passport-oauth-1.0.0.tgz#90aff63387540f02089af28cdad39ea7f80d77df"
-  integrity sha512-4IZNVsZbN1dkBzmEbBqUxDG8oFOIK81jqdksE3HEb/vI3ib3FMjbiZZ6MTtooyYZzmKu0BfovjvT1pdGgIq+4Q==
-  dependencies:
-    passport-oauth1 "1.x.x"
-    passport-oauth2 "1.x.x"
-
-passport-saml@*:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.2.4.tgz#e8e9523f954988a3a47d12e425d7fa0f20a74dc9"
-  integrity sha512-JSgkFXeaexLNQh1RrOvJAgjLnZzH/S3HbX/mWAk+i7aulnjqUe7WKnPl1NPnJWqP7Dqsv0I2Xm6KIFHkftk0HA==
-  dependencies:
-    "@xmldom/xmldom" "^0.7.6"
-    debug "^4.3.2"
-    passport-strategy "^1.0.0"
-    xml-crypto "^2.1.3"
-    xml-encryption "^2.0.0"
-    xml2js "^0.4.23"
-    xmlbuilder "^15.1.1"
-
-passport-strategy@1.x.x, passport-strategy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
-  integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==
-
-passport-twitter@1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/passport-twitter/-/passport-twitter-1.0.4.tgz#01a799e1f760bf2de49f2ba5fba32282f18932d7"
-  integrity sha512-qvdauqCqCJJci82mJ9hZZQ6nAv7aSHV31svL8+9H7mRlDdXCdfU6AARQrmmJu3DRmv9fvIebM7zzxR7mVufN3A==
-  dependencies:
-    passport-oauth1 "1.x.x"
-    xtraverse "0.1.x"
-
-passport@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/passport/-/passport-0.7.0.tgz#3688415a59a48cf8068417a8a8092d4492ca3a05"
-  integrity sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==
-  dependencies:
-    passport-strategy "1.x.x"
-    pause "0.0.1"
-    utils-merge "^1.0.1"
-
-path-browserify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
-  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-posix@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f"
-  integrity sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA==
-
-path-scurry@^1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
-  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
-  dependencies:
-    lru-cache "^10.2.0"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-
-path-to-regexp@~0.1.12:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
-  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
-
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
-pause@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
-  integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==
-
-peek-readable@^5.1.3:
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.4.2.tgz#aff1e1ba27a7d6911ddb103f35252ffc1787af49"
-  integrity sha512-peBp3qZyuS6cNIJ2akRNG1uo1WJ1d0wTxg/fxMdZ0BqCVhx242bSFHM9eNqflfJVS9SsgkzgT/1UgnsurBOTMg==
-
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
-
-pg-cloudflare@^1.2.7:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.3.0.tgz#386035d4bfcf1a7045b026f8b21acf5353f14d65"
-  integrity sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==
-
-pg-connection-string@^2.9.1:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.10.1.tgz#34e0bf60333551ae1e76caf47cce633a5b2e4b70"
-  integrity sha512-iNzslsoeSH2/gmDDKiyMqF64DATUCWj3YJ0wP14kqcsf2TUklwimd+66yYojKwZCA7h2yRNLGug71hCBA2a4sw==
-
-pg-int8@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
-  integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
-
-pg-pool@^3.10.1:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.11.0.tgz#adf9a6651a30c839f565a3cc400110949c473d69"
-  integrity sha512-MJYfvHwtGp870aeusDh+hg9apvOe2zmpZJpyt+BMtzUWlVqbhFmMK6bOBXLBUPd7iRtIF9fZplDc7KrPN3PN7w==
-
-pg-protocol@^1.10.3:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.11.0.tgz#2502908893edaa1e8c0feeba262dd7b40b317b53"
-  integrity sha512-pfsxk2M9M3BuGgDOfuy37VNRRX3jmKgMjcvAcWqNDpZSf4cUmv8HSOl5ViRQFsfARFn0KuUQTgLxVMbNq5NW3g==
-
-pg-types@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
-  integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
-  dependencies:
-    pg-int8 "1.0.1"
-    postgres-array "~2.0.0"
-    postgres-bytea "~1.0.0"
-    postgres-date "~1.0.4"
-    postgres-interval "^1.1.0"
-
-pg@8.16.3:
-  version "8.16.3"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.16.3.tgz#160741d0b44fdf64680e45374b06d632e86c99fd"
-  integrity sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==
-  dependencies:
-    pg-connection-string "^2.9.1"
-    pg-pool "^3.10.1"
-    pg-protocol "^1.10.3"
-    pg-types "2.2.0"
-    pgpass "1.0.5"
-  optionalDependencies:
-    pg-cloudflare "^1.2.7"
-
-pgpass@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d"
-  integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==
-  dependencies:
-    split2 "^4.1.0"
-
-picocolors@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
-  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
-
-picomatch@^2.0.4, picomatch@^2.2.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pirates@^4.0.6:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22"
-  integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==
-
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
-plivo@4.75.1:
-  version "4.75.1"
-  resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.75.1.tgz#c9d0e8fdb47f4072edc989e139140e687bac5fd8"
-  integrity sha512-u6SOF1s3ccdp5v7yl8RYmZUHmnUfsNHsE5DRe4XLozaJlObsKG45kEYliMNTHTHZ6GEdc6Wm8hsD0ZcfIhkn7g==
-  dependencies:
-    "@types/node" "^14.14.14"
-    axios "^1.8.3"
-    base-64 "^0.1.0"
-    build-url "^1.0.10"
-    form-data "^4.0.0"
-    https-proxy-agent "^5.0.0"
-    joi "^17.9.2"
-    jsonwebtoken "^9.0.0"
-    lodash "^4.17.4"
-    querystring "^0.2.0"
-    uri-parser "^1.0.0"
-    utf8 "^2.1.2"
-    xml2js "^0.5.0"
-    xmlbuilder "^9.0.1"
-
-possible-typed-array-names@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
-  integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==
-
-postgres-array@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
-  integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==
-
-postgres-bytea@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.1.tgz#c40b3da0222c500ff1e51c5d7014b60b79697c7a"
-  integrity sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==
-
-postgres-date@~1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8"
-  integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==
-
-postgres-interval@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695"
-  integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==
-  dependencies:
-    xtend "^4.0.0"
-
-postman-request@^2.88.1-postman.42:
-  version "2.88.1-postman.48"
-  resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.48.tgz#8727ec3fa432c2608bdd31ea184fa408033dba8e"
-  integrity sha512-E32FGh8ig2KDvzo4Byi7Ibr+wK2gNKPSqXoNsvjdCHgDBxSK4sCUwv+aa3zOBUwfiibPImHMy0WdlDSSCTqTuw==
-  dependencies:
-    "@postman/form-data" "~3.1.1"
-    "@postman/tough-cookie" "~4.1.3-postman.1"
-    "@postman/tunnel-agent" "^0.6.8"
-    aws-sign2 "~0.7.0"
-    aws4 "^1.12.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    http-signature "~1.4.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "^2.1.35"
-    oauth-sign "~0.9.0"
-    qs "~6.14.1"
-    safe-buffer "^5.1.2"
-    socks-proxy-agent "^8.0.5"
-    stream-length "^1.0.2"
-    uuid "^8.3.2"
-
-prebuild-install@^7.1.1:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.3.tgz#d630abad2b147443f20a212917beae68b8092eec"
-  integrity sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==
-  dependencies:
-    detect-libc "^2.0.0"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.3"
-    mkdirp-classic "^0.5.3"
-    napi-build-utils "^2.0.0"
-    node-abi "^3.3.0"
-    pump "^3.0.0"
-    rc "^1.2.7"
-    simple-get "^4.0.0"
-    tar-fs "^2.0.0"
-    tunnel-agent "^0.6.0"
-
-precond@0.2:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac"
-  integrity sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ==
-
-process-nextick-args@^2.0.1, process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
-
-prom-client@15.1.3:
-  version "15.1.3"
-  resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.3.tgz#69fa8de93a88bc9783173db5f758dc1c69fa8fc2"
-  integrity sha512-6ZiOBfCywsD4k1BN9IX0uZhF+tJkV8q8llP64G5Hajs4JOeVLPCwpPVcpXy3BwYiUGgyJzsJJQeOIv7+hDSq8g==
-  dependencies:
-    "@opentelemetry/api" "^1.4.0"
-    tdigest "^0.1.1"
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
-
-promise-retry@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
-  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
-  dependencies:
-    err-code "^2.0.2"
-    retry "^0.12.0"
-
-proto3-json-serializer@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-2.0.2.tgz#5b705203b4d58f3880596c95fad64902617529dd"
-  integrity sha512-SAzp/O4Yh02jGdRc+uIrGoe87dkN/XtwxfZ4ZyafJHymd79ozp5VG5nyZ7ygqPM5+cpLDjjGnYFUkngonyDPOQ==
-  dependencies:
-    protobufjs "^7.2.5"
-
-protobufjs@^7.2.5, protobufjs@^7.2.6, protobufjs@^7.3.2, protobufjs@^7.5.3:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.4.tgz#885d31fe9c4b37f25d1bb600da30b1c5b37d286a"
-  integrity sha512-CvexbZtbov6jW2eXAvLukXjXUW1TzFaivC46BpWc/3BpcCysb5Vffu+B3XHMm8lVEuy2Mm4XGex8hBSg1yapPg==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.2"
-    "@protobufjs/base64" "^1.1.2"
-    "@protobufjs/codegen" "^2.0.4"
-    "@protobufjs/eventemitter" "^1.1.0"
-    "@protobufjs/fetch" "^1.1.0"
-    "@protobufjs/float" "^1.0.2"
-    "@protobufjs/inquire" "^1.1.0"
-    "@protobufjs/path" "^1.1.2"
-    "@protobufjs/pool" "^1.1.0"
-    "@protobufjs/utf8" "^1.1.0"
-    "@types/node" ">=13.7.0"
-    long "^5.0.0"
-
-proxy-addr@~2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
-  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
-  dependencies:
-    forwarded "0.2.0"
-    ipaddr.js "1.9.1"
-
-proxy-from-env@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
-  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
-
-psl@^1.1.33:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.15.0.tgz#bdace31896f1d97cec6a79e8224898ce93d974c6"
-  integrity sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==
-  dependencies:
-    punycode "^2.3.1"
-
-pump@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.3.tgz#151d979f1a29668dc0025ec589a455b53282268d"
-  integrity sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-punycode@^2.1.1, punycode@^2.3.0, punycode@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
-  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
-
-qlobber@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-7.0.1.tgz#2346664844d35cb99b8d80c8dc8a74264c078c69"
-  integrity sha512-FsFg9lMuMEFNKmTO9nV7tlyPhx8BmskPPjH2akWycuYVTtWaVwhW5yCHLJQ6Q+3mvw5cFX2vMfW2l9z2SiYAbg==
-
-qlobber@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-8.0.1.tgz#8a8ef18401ca451c9ebc2afe58a1b04c38f476ca"
-  integrity sha512-O+Wd1chXj5YE1DwmD+ae0bXiSLehmnS3czlC1R9FL/Nt/3q8uMS1bIHmg2lJfCoiimCxClWM8AAuJrF0EvNiog==
-
-qs@^6.6.0, qs@^6.7.0, qs@^6.9.4, qs@~6.14.0, qs@~6.14.1:
-  version "6.14.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.1.tgz#a41d85b9d3902f31d27861790506294881871159"
-  integrity sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==
-  dependencies:
-    side-channel "^1.1.0"
-
-qs@~0.6.0:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-0.6.6.tgz#6e015098ff51968b8a3c819001d5f2c89bc4b107"
-  integrity sha512-kN+yNdAf29Jgp+AYHUmC7X4QdJPR8czuMWLNLc0aRxkQ7tB3vJQEONKKT9ou/rW7EbqVec11srC9q9BiVbcnHA==
-
-query-string@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.3.tgz#a1cf90e994abb113a325804a972d98276fe02328"
-  integrity sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==
-  dependencies:
-    decode-uri-component "^0.2.2"
-    filter-obj "^1.1.0"
-    split-on-first "^1.0.0"
-    strict-uri-encode "^2.0.0"
-
-querystring@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
-  integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
-
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
-random-bytes@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
-  integrity sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==
-
-randombytes@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-range-parser@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-raw-body@~2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.3.tgz#11c6650ee770a7de1b494f197927de0c923822e2"
-  integrity sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==
-  dependencies:
-    bytes "~3.1.2"
-    http-errors "~2.0.1"
-    iconv-lite "~0.4.24"
-    unpipe "~1.0.0"
-
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
-  dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
-
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
-readable-stream@3, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@^3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@^2.0.5, readable-stream@^2.3.5, readable-stream@^2.3.8:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
-  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^4.0.0, readable-stream@^4.2.0, readable-stream@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.7.0.tgz#cedbd8a1146c13dfff8dab14068028d58c15ac91"
-  integrity sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==
-  dependencies:
-    abort-controller "^3.0.0"
-    buffer "^6.0.3"
-    events "^3.3.0"
-    process "^0.11.10"
-    string_decoder "^1.3.0"
-
-readable-web-to-node-stream@^3.0.2:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.4.tgz#392ba37707af5bf62d725c36c1b5d6ef4119eefc"
-  integrity sha512-9nX56alTf5bwXQ3ZDipHJhusu9NTQJ/CVPtb/XHAJCXihZeitfJvIRS4GqQ/mfIoOE3IelHMrpayVrosdHBuLw==
-  dependencies:
-    readable-stream "^4.7.0"
-
-readdir-glob@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.3.tgz#c3d831f51f5e7bfa62fa2ffbe4b508c640f09584"
-  integrity sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==
-  dependencies:
-    minimatch "^5.1.0"
-
-readdirp@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
-  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
-  dependencies:
-    picomatch "^2.2.1"
-
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  integrity sha512-8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g==
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
-
-real-cancellable-promise@^1.1.1:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/real-cancellable-promise/-/real-cancellable-promise-1.2.3.tgz#6df13b7db40cbff9969975d6194c11e2356c4a13"
-  integrity sha512-hBI5Gy/55VEeeMtImMgEirD7eq5UmqJf1J8dFZtbJZA/3rB0pYFZ7PayMGueb6v4UtUtpKpP+05L0VwyE1hI9Q==
-
-reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9"
-  integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==
-  dependencies:
-    call-bind "^1.0.8"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.9"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    get-intrinsic "^1.2.7"
-    get-proto "^1.0.1"
-    which-builtin-type "^1.2.1"
-
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-
-regenerator-runtime@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
-  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
-
-regexp.prototype.flags@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
-  integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==
-  dependencies:
-    call-bind "^1.0.8"
-    define-properties "^1.2.1"
-    es-errors "^1.3.0"
-    get-proto "^1.0.1"
-    gopd "^1.2.0"
-    set-function-name "^2.0.2"
-
-relateurl@^0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-  integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
-
-release-zalgo@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730"
-  integrity sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==
-  dependencies:
-    es6-error "^4.0.1"
-
-request@~2.27.0:
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.27.0.tgz#dfb1a224dd3a5a9bade4337012503d710e538668"
-  integrity sha512-V4AYOEmdUrf0X+CVF2hndyMzIeQ8G7LB45HER/rXZYEwNVI3QFGgLPLafQLHjqtG/ggzHEMb66Ng5IemksixsQ==
-  dependencies:
-    aws-sign "~0.3.0"
-    cookie-jar "~0.3.0"
-    forever-agent "~0.5.0"
-    form-data "~0.1.0"
-    hawk "~1.0.0"
-    http-signature "~0.10.0"
-    json-stringify-safe "~5.0.0"
-    mime "~1.2.9"
-    node-uuid "~1.4.0"
-    oauth-sign "~0.3.0"
-    qs "~0.6.0"
-    tunnel-agent "~0.3.0"
-
-require-at@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/require-at/-/require-at-1.0.6.tgz#9eb7e3c5e00727f5a4744070a7f560d4de4f6e6a"
-  integrity sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g==
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve@^1.10.0:
-  version "1.22.11"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
-  integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
-  dependencies:
-    is-core-module "^2.16.1"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  integrity sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
-retimer@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/retimer/-/retimer-4.0.0.tgz#41a8c09710281013ee83ef3a5f8279c02b5a4a8e"
-  integrity sha512-fZIVtvbOsQsxNSDhpdPOX4lx5Ss2ni+S72AUBitARpFhtA3UzrAjQ6gDtypB2/+l7L+1VQgAgpvAKY66mElH0w==
-  dependencies:
-    worker-timers "^7.0.75"
-
-retry-request@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-7.0.2.tgz#60bf48cfb424ec01b03fca6665dee91d06dd95f3"
-  integrity sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==
-  dependencies:
-    "@types/request" "^2.48.8"
-    extend "^3.0.2"
-    teeny-request "^9.0.0"
-
-retry@0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
-  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
-
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
-
-reusify@^1.0.0, reusify@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f"
-  integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==
-
-rimraf@^2.6.2, rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.3.tgz#9be54e4ba5e3559c8eee06a25cd7648bbccdf5a8"
-  integrity sha512-5Di9UC0+8h1L6ZD2d7awM7E/T4uA1fJRlx6zk/NvdCCVEoAnFqvHmCuNeIKoCeIixBX/q8uM+6ycDvF8woqosA==
-  dependencies:
-    hash-base "^3.1.2"
-    inherits "^2.0.4"
-
-rrweb-cssom@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
-  integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
-
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
-  integrity sha512-qOX+w+IxFgpUpJfkv2oGN0+ExPs68F4sZHfaRRx4dDexAQkG83atugKVEylyT5ARees3HBbfmuvnjbrd8j9Wjw==
-  dependencies:
-    once "^1.3.0"
-
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-  integrity sha512-1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ==
-
-"rxjs@>= 5.x <= 7.x":
-  version "7.8.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
-  integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
-  dependencies:
-    tslib "^2.1.0"
-
-safe-array-concat@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
-  integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.2"
-    get-intrinsic "^1.2.6"
-    has-symbols "^1.1.0"
-    isarray "^2.0.5"
-
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-push-apply@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5"
-  integrity sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==
-  dependencies:
-    es-errors "^1.3.0"
-    isarray "^2.0.5"
-
-safe-regex-test@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
-  integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    is-regex "^1.2.1"
-
-safe-stable-stringify@^2.3.1:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd"
-  integrity sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==
-
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sasl-anonymous@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/sasl-anonymous/-/sasl-anonymous-0.1.0.tgz#f544c7e824df2a40d9ad4733829572cc8d9ed5a5"
-  integrity sha512-x+0sdsV0Gie2EexxAUsx6ZoB+X6OCthlNBvAQncQxreEWQJByAPntj0EAgTlJc2kZicoc+yFzeR6cl8VfsQGfA==
-
-sasl-plain@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/sasl-plain/-/sasl-plain-0.1.0.tgz#cf145e7c02222b64d60c0806d9cd2ae5380426cc"
-  integrity sha512-X8mCSfR8y0NryTu0tuVyr4IS2jBunBgyG+3a0gEEkd0nlHGiyqJhlc4EIkzmSwaa7F8S4yo+LS6Cu5qxRkJrmg==
-
-sasl-scram-sha-1@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/sasl-scram-sha-1/-/sasl-scram-sha-1-1.3.0.tgz#7d249d6d9da0030f0070746126ad6d96529858ab"
-  integrity sha512-hJE3eUCEx0aK+9jwHu6VVrQwb9qxv8RMc3ZciGF/ZzXgxptCX9QbfJT45nloJGxrR9AfBU6GiVNYKA5mrqu2KQ==
-  dependencies:
-    create-hash "^1.1.0"
-    create-hmac "^1.1.3"
-    randombytes "^2.0.1"
-
-saslmechanisms@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/saslmechanisms/-/saslmechanisms-0.1.1.tgz#478be1429500fcfaa780be88b3343ced7d2a9182"
-  integrity sha512-pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg==
-
-saslprep@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226"
-  integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==
-  dependencies:
-    sparse-bitfield "^3.0.3"
-
-sax@>=0.6.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.4.tgz#f29c2bba80ce5b86f4343b4c2be9f2b96627cf8b"
-  integrity sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==
-
-saxes@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
-  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
-  dependencies:
-    xmlchars "^2.2.0"
-
-scmp@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/scmp/-/scmp-2.1.0.tgz#37b8e197c425bdeb570ab91cc356b311a11f9c9a"
-  integrity sha512-o/mRQGk9Rcer/jEEw/yw4mwo3EU/NvYvp577/Btqrym9Qy5/MdWGBqipbALgd2lrdWTJ5/gqDusxfnQBxOxT2Q==
-
-"semver@2 || 3 || 4 || 5", semver@^5.6.0, semver@^5.7.0:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
-semver@^6.0.0, semver@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^7.3.5, semver@^7.5.4:
-  version "7.7.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
-  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
-
-send@~0.19.0, send@~0.19.1:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.19.2.tgz#59bc0da1b4ea7ad42736fd642b1c4294e114ff29"
-  integrity sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "~0.5.2"
-    http-errors "~2.0.1"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "~2.4.1"
-    range-parser "~1.2.1"
-    statuses "~2.0.2"
-
-seq-queue@^0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
-  integrity sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==
-
-serve-static@~1.16.2:
-  version "1.16.3"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.3.tgz#a97b74d955778583f3862a4f0b841eb4d5d78cf9"
-  integrity sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==
-  dependencies:
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "~0.19.1"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
-
-set-function-length@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
-  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
-
-set-function-name@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
-  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    functions-have-names "^1.2.3"
-    has-property-descriptors "^1.0.2"
-
-set-proto@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e"
-  integrity sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==
-  dependencies:
-    dunder-proto "^1.0.1"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-
-setprototypeof@1.2.0, setprototypeof@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
-  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
-
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.12"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f"
-  integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==
-  dependencies:
-    inherits "^2.0.4"
-    safe-buffer "^5.2.1"
-    to-buffer "^1.2.0"
-
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-side-channel-list@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
-  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
-  dependencies:
-    es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-
-side-channel-map@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
-  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.5"
-    object-inspect "^1.13.3"
-
-side-channel-weakmap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
-  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.5"
-    object-inspect "^1.13.3"
-    side-channel-map "^1.0.1"
-
-side-channel@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
-  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
-  dependencies:
-    es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-    side-channel-list "^1.0.0"
-    side-channel-map "^1.0.1"
-    side-channel-weakmap "^1.0.2"
-
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-signal-exit@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
-  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
-
-simple-concat@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
-  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
-
-simple-get@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
-  integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
-  dependencies:
-    decompress-response "^6.0.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
-slide@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-  integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==
-
-smart-buffer@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
-  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
-sntp@0.2.x:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-0.2.4.tgz#fb885f18b0f3aad189f824862536bceeec750900"
-  integrity sha512-bDLrKa/ywz65gCl+LmOiIhteP1bhEsAAzhfMedPoiHP3dyYnAevlaJshdqb9Yu0sRifyP/fRqSt8t+5qGIWlGQ==
-  dependencies:
-    hoek "0.9.x"
-
-socks-proxy-agent@^6.0.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
-  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
-socks-proxy-agent@^8.0.5:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz#b9cdb4e7e998509d7659d689ce7697ac21645bee"
-  integrity sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==
-  dependencies:
-    agent-base "^7.1.2"
-    debug "^4.3.4"
-    socks "^2.8.3"
-
-socks@^2.6.2, socks@^2.7.1, socks@^2.8.3:
-  version "2.8.7"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.7.tgz#e2fb1d9a603add75050a2067db8c381a0b5669ea"
-  integrity sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==
-  dependencies:
-    ip-address "^10.0.1"
-    smart-buffer "^4.2.0"
-
-source-map-support@^0.5.16, source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-sparse-bitfield@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11"
-  integrity sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==
-  dependencies:
-    memory-pager "^1.0.2"
-
-spawn-wrap@^1.4.2:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.3.tgz#81b7670e170cca247d80bf5faf0cfb713bdcf848"
-  integrity sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw==
-  dependencies:
-    foreground-child "^1.5.6"
-    mkdirp "^0.5.0"
-    os-homedir "^1.0.1"
-    rimraf "^2.6.2"
-    signal-exit "^3.0.2"
-    which "^1.3.0"
-
-spdx-correct@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
-  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
-  integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.22"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz#abf5a08a6f5d7279559b669f47f0a43e8f3464ef"
-  integrity sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==
-
-split-on-first@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
-  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
-
-split2@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4"
-  integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
-
-sprintf-js@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
-  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
-sqlite3@5.1.7:
-  version "5.1.7"
-  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.7.tgz#59ca1053c1ab38647396586edad019b1551041b7"
-  integrity sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==
-  dependencies:
-    bindings "^1.5.0"
-    node-addon-api "^7.0.0"
-    prebuild-install "^7.1.1"
-    tar "^6.1.11"
-  optionalDependencies:
-    node-gyp "8.x"
-
-sqlstring@^2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c"
-  integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==
-
-ssh2@1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.17.0.tgz#dc686e8e3abdbd4ad95d46fa139615903c12258c"
-  integrity sha512-wPldCk3asibAjQ/kziWQQt1Wh3PgDFpC0XpwclzKcdT1vql6KeYxf5LIt4nlFkUeR8WuphYMKqUA56X4rjbfgQ==
-  dependencies:
-    asn1 "^0.2.6"
-    bcrypt-pbkdf "^1.0.2"
-  optionalDependencies:
-    cpu-features "~0.0.10"
-    nan "^2.23.0"
-
-sshpk@^1.18.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
-  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-ssri@^8.0.0, ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
-  dependencies:
-    minipass "^3.1.1"
-
-stack-trace@0.0.x:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-  integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==
-
-"statuses@>= 1.5.0 < 2":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
-
-statuses@~2.0.1, statuses@~2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.2.tgz#8f75eecef765b5e1cfcdc080da59409ed424e382"
-  integrity sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==
-
-stop-iteration-iterator@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
-  integrity sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==
-  dependencies:
-    es-errors "^1.3.0"
-    internal-slot "^1.1.0"
-
-store2@^2.13.0:
-  version "2.14.4"
-  resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.4.tgz#81b313abaddade4dcd7570c5cc0e3264a8f7a242"
-  integrity sha512-srTItn1GOvyvOycgxjAnPA63FZNwy0PTyUBFMHRM+hVFltAeoh0LmNBz9SZqUS9mMqGk8rfyWyXn3GH5ReJ8Zw==
-
-stream-chain@^2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/stream-chain/-/stream-chain-2.2.5.tgz#b30967e8f14ee033c5b9a19bbe8a2cba90ba0d09"
-  integrity sha512-1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA==
-
-stream-events@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5"
-  integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==
-  dependencies:
-    stubs "^3.0.0"
-
-stream-json@^1.8.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-1.9.1.tgz#e3fec03e984a503718946c170db7d74556c2a187"
-  integrity sha512-uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw==
-  dependencies:
-    stream-chain "^2.2.5"
-
-stream-length@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stream-length/-/stream-length-1.0.2.tgz#8277f3cbee49a4daabcfdb4e2f4a9b5e9f2c9f00"
-  integrity sha512-aI+qKFiwoDV4rsXiS7WRoCt+v2RX1nUj17+KJC5r2gfh5xoSJIfP6Y3Do/HtvesFcTSWthIuJ3l1cvKQY/+nZg==
-  dependencies:
-    bluebird "^2.6.2"
-
-stream-shift@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b"
-  integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==
-
-streamx@^2.15.0:
-  version "2.23.0"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.23.0.tgz#7d0f3d00d4a6c5de5728aecd6422b4008d66fd0b"
-  integrity sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==
-  dependencies:
-    events-universal "^1.0.0"
-    fast-fifo "^1.3.2"
-    text-decoder "^1.1.0"
-
-strict-uri-encode@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
-  integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
-
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string-width@^5.0.1, string-width@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
-  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
-  dependencies:
-    eastasianwidth "^0.2.0"
-    emoji-regex "^9.2.2"
-    strip-ansi "^7.0.1"
-
-string.prototype.trim@^1.2.10:
-  version "1.2.10"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81"
-  integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.2"
-    define-data-property "^1.1.4"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.5"
-    es-object-atoms "^1.0.0"
-    has-property-descriptors "^1.0.2"
-
-string.prototype.trimend@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942"
-  integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.2"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-
-string.prototype.trimstart@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
-  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-
-string_decoder@^1.1.1, string_decoder@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^7.0.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
-  integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
-  dependencies:
-    ansi-regex "^6.0.1"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
-
-strnum@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.1.2.tgz#57bca4fbaa6f271081715dbc9ed7cee5493e28e4"
-  integrity sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==
-
-strnum@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/strnum/-/strnum-2.1.2.tgz#a5e00ba66ab25f9cafa3726b567ce7a49170937a"
-  integrity sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==
-
-strtok3@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-7.1.1.tgz#f548fd9dc59d0a76d5567ff8c16be31221f29dfc"
-  integrity sha512-mKX8HA/cdBqMKUr0MMZAFssCkIGoZeSCMXgnt79yKxNFguMLVFgRe6wB+fsL0NmoHDbeyZXczy7vEPSoo3rkzg==
-  dependencies:
-    "@tokenizer/token" "^0.3.0"
-    peek-readable "^5.1.3"
-
-stubs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
-  integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
-
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-svg-captcha@1.4.0, svg-captcha@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/svg-captcha/-/svg-captcha-1.4.0.tgz#32ead3c6463936c218bb3bc9ed04fea4eeffe492"
-  integrity sha512-/fkkhavXPE57zRRCjNqAP3txRCSncpMx3NnNZL7iEoyAtYwUjPhJxW6FQTQPG5UPEmCrbFoXS10C3YdJlW7PDg==
-  dependencies:
-    opentype.js "^0.7.3"
-
-symbol-tree@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
-  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
-
-syslog@0.1.1-1:
-  version "0.1.1-1"
-  resolved "https://registry.yarnpkg.com/syslog/-/syslog-0.1.1-1.tgz#f69f74b0baf8a25c725af97977a18eb11927a5e1"
-  integrity sha512-7fn4sikkTRrc4kZk/i/ItCktnPD2qG+nKmgTVcuLr2VrY2V9adNhw9fN02HL6rTthwu2Og9Icr1GxZlaLp39Lg==
-
-tar-fs@^2.0.0:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.4.tgz#800824dbf4ef06ded9afea4acafe71c67c76b930"
-  integrity sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^2.1.4"
-
-tar-stream@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
-  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
-  dependencies:
-    bl "^4.0.3"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
-tar-stream@^3.0.0:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.7.tgz#24b3fb5eabada19fe7338ed6d26e5f7c482e792b"
-  integrity sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==
-  dependencies:
-    b4a "^1.6.4"
-    fast-fifo "^1.2.0"
-    streamx "^2.15.0"
-
-tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
-  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^5.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-tdigest@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.2.tgz#96c64bac4ff10746b910b0e23b515794e12faced"
-  integrity sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==
-  dependencies:
-    bintrees "1.0.2"
-
-teeny-request@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-9.0.0.tgz#18140de2eb6595771b1b02203312dfad79a4716d"
-  integrity sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==
-  dependencies:
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    node-fetch "^2.6.9"
-    stream-events "^1.0.5"
-    uuid "^9.0.0"
-
-telegram@2.26.22:
-  version "2.26.22"
-  resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.26.22.tgz#16beb73e52403b5d5bcc4602226e39dc24217333"
-  integrity sha512-EIj7Yrjiu0Yosa3FZ/7EyPg9s6UiTi/zDQrFmR/2Mg7pIUU+XjAit1n1u9OU9h2oRnRM5M+67/fxzQluZpaJJg==
-  dependencies:
-    "@cryptography/aes" "^0.1.1"
-    async-mutex "^0.3.0"
-    big-integer "^1.6.48"
-    buffer "^6.0.3"
-    htmlparser2 "^6.1.0"
-    mime "^3.0.0"
-    node-localstorage "^2.2.1"
-    pako "^2.0.3"
-    path-browserify "^1.0.1"
-    real-cancellable-promise "^1.1.1"
-    socks "^2.6.2"
-    store2 "^2.13.0"
-    ts-custom-error "^3.2.0"
-    websocket "^1.0.34"
-  optionalDependencies:
-    bufferutil "^4.0.3"
-    utf-8-validate "^5.0.5"
-
-telnyx@1.25.5:
-  version "1.25.5"
-  resolved "https://registry.yarnpkg.com/telnyx/-/telnyx-1.25.5.tgz#f4140459fa296c32dfa1847b0c0e70c5e02ff3c3"
-  integrity sha512-Kcb1eq/Fm9T45j1JMdcoQP1GgJqVKbQldv0C26DhCrZX5e3+17OXyQbmgtSI6EYFQ4I3HSbCfXudwDRpGDOC7Q==
-  dependencies:
-    lodash.isplainobject "^4.0.6"
-    qs "^6.6.0"
-    safe-buffer "^5.1.1"
-    tweetnacl "^1.0.1"
-    uuid "^3.3.2"
-
-terser@^5.15.1:
-  version "5.46.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.46.0.tgz#1b81e560d584bbdd74a8ede87b4d9477b0ff9695"
-  integrity sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.15.0"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
-test-exclude@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
-  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
-  dependencies:
-    glob "^7.1.3"
-    minimatch "^3.0.4"
-    read-pkg-up "^4.0.0"
-    require-main-filename "^2.0.0"
-
-text-decoder@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.3.tgz#b19da364d981b2326d5f43099c310cc80d770c65"
-  integrity sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==
-  dependencies:
-    b4a "^1.6.4"
-
-text-hex@1.0.x:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
-  integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
-
-thirty-two@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/thirty-two/-/thirty-two-1.0.2.tgz#4ca2fffc02a51290d2744b9e3f557693ca6b627a"
-  integrity sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==
-
-through2@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
-  integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
-  dependencies:
-    readable-stream "3"
-
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
-
-thunky@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
-  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
-
-tiny-inflate@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4"
-  integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==
-
-to-buffer@^1.2.0, to-buffer@^1.2.1, to-buffer@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.2.tgz#ffe59ef7522ada0a2d1cb5dfe03bb8abc3cdc133"
-  integrity sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==
-  dependencies:
-    isarray "^2.0.5"
-    safe-buffer "^5.2.1"
-    typed-array-buffer "^1.0.3"
-
-to-mongodb-core@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-mongodb-core/-/to-mongodb-core-2.0.0.tgz#3596ec7613ac9ad3b98a89dcb9aefba569cd27eb"
-  integrity sha512-vfXXcGYFP8+0L5IPOtUzzVIvPE/G3GN0TKa/PRBlzPqYyhm+UxhPmvv634EQgO4Ot8dHbBFihOslMJQclY8Z9A==
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-toidentifier@1.0.1, toidentifier@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
-  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
-
-token-types@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/token-types/-/token-types-5.0.1.tgz#aa9d9e6b23c420a675e55413b180635b86a093b4"
-  integrity sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==
-  dependencies:
-    "@tokenizer/token" "^0.3.0"
-    ieee754 "^1.2.1"
-
-tough-cookie@^4.1.2:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
-  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
-  dependencies:
-    psl "^1.1.33"
-    punycode "^2.1.1"
-    universalify "^0.2.0"
-    url-parse "^1.5.3"
-
-tr46@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
-  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
-  dependencies:
-    punycode "^2.1.1"
-
-tr46@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469"
-  integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==
-  dependencies:
-    punycode "^2.3.0"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
-triple-beam@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984"
-  integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==
-
-ts-custom-error@^3.2.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/ts-custom-error/-/ts-custom-error-3.3.1.tgz#8bd3c8fc6b8dc8e1cb329267c45200f1e17a65d1"
-  integrity sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A==
-
-ts-mixer@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.4.tgz#1da39ceabc09d947a82140d9f09db0f84919ca28"
-  integrity sha512-ufKpbmrugz5Aou4wcr5Wc1UUFWOLhq+Fm6qa6P0w0K5Qw2yhaUoiWszhCVuNQyNwrlGiscHOmqYoAox1PtvgjA==
-
-tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.2, tslib@^2.6.3:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
-  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
-
-tsscmp@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
-  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tunnel-agent@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.3.0.tgz#ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"
-  integrity sha512-jlGqHGoKzyyjhwv/c9omAgohntThMcGtw8RV/RDLlkbbc08kni/akVxO62N8HaXMVbVsK1NCnpSK3N2xCt22ww==
-
-tv4@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/tv4/-/tv4-1.3.0.tgz#d020c846fadd50c855abb25ebaecc68fc10f7963"
-  integrity sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
-
-tweetnacl@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
-  integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
-
-twilio@4.23.0:
-  version "4.23.0"
-  resolved "https://registry.yarnpkg.com/twilio/-/twilio-4.23.0.tgz#46b69c231fc7aa9488a7bde09b8659da8c459a56"
-  integrity sha512-LdNBQfOe0dY2oJH2sAsrxazpgfFQo5yXGxe96QA8UWB5uu+433PrUbkv8gQ5RmrRCqUTPQ0aOrIyAdBr1aB03Q==
-  dependencies:
-    axios "^1.6.0"
-    dayjs "^1.11.9"
-    https-proxy-agent "^5.0.0"
-    jsonwebtoken "^9.0.0"
-    qs "^6.9.4"
-    scmp "^2.1.0"
-    url-parse "^1.5.9"
-    xmlbuilder "^13.0.2"
-
-type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
-type@^2.7.2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486"
-  integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==
-
-typed-array-buffer@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
-  integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
-  dependencies:
-    call-bound "^1.0.3"
-    es-errors "^1.3.0"
-    is-typed-array "^1.1.14"
-
-typed-array-byte-length@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce"
-  integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==
-  dependencies:
-    call-bind "^1.0.8"
-    for-each "^0.3.3"
-    gopd "^1.2.0"
-    has-proto "^1.2.0"
-    is-typed-array "^1.1.14"
-
-typed-array-byte-offset@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355"
-  integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==
-  dependencies:
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.8"
-    for-each "^0.3.3"
-    gopd "^1.2.0"
-    has-proto "^1.2.0"
-    is-typed-array "^1.1.15"
-    reflect.getprototypeof "^1.0.9"
-
-typed-array-length@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d"
-  integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==
-  dependencies:
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    is-typed-array "^1.1.13"
-    possible-typed-array-names "^1.0.0"
-    reflect.getprototypeof "^1.0.6"
-
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
-ua-client-hints-js@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ua-client-hints-js/-/ua-client-hints-js-0.1.2.tgz#941ba7aa65e0c154e6092a3ce9f93e8445719b15"
-  integrity sha512-cYqD5p9PPCsNYpBJRYcU7s5QuZS3pdWpskOJl+QE7elbOrFzctLs5H9ppH10v7Tk0Kholzo9VIyjoTlh0B8XXg==
-
-ua-parser-js@1.0.40:
-  version "1.0.40"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.40.tgz#ac6aff4fd8ea3e794a6aa743ec9c2fc29e75b675"
-  integrity sha512-z6PJ8Lml+v3ichVojCiB8toQJBuwR42ySM4ezjXIqXK3M0HczmKQ3LF4rhU55PfD99KEEXQG6yb7iOMyvYuHew==
-
-uglify-js@^3.1.4:
-  version "3.19.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.3.tgz#82315e9bbc6f2b25888858acd1fff8441035b77f"
-  integrity sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==
-
-uid-safe@2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
-  integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==
-  dependencies:
-    random-bytes "~1.0.0"
-
-uid2@0.0.x:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44"
-  integrity sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA==
-
-unbox-primitive@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2"
-  integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==
-  dependencies:
-    call-bound "^1.0.3"
-    has-bigints "^1.0.2"
-    has-symbols "^1.1.0"
-    which-boxed-primitive "^1.1.1"
-
-undici-types@~6.21.0:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
-  integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
-
-undici-types@~7.16.0:
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
-  integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
-
-undici@^5.11.0, undici@^5.22.0:
-  version "5.29.0"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.29.0.tgz#419595449ae3f2cdcba3580a2e8903399bd1f5a3"
-  integrity sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==
-  dependencies:
-    "@fastify/busboy" "^2.0.0"
-
-unidecode@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/unidecode/-/unidecode-0.1.8.tgz#efbb301538bc45246a9ac8c559d72f015305053e"
-  integrity sha512-SdoZNxCWpN2tXTCrGkPF/0rL2HEq+i2gwRG1ReBvx8/0yTzC3enHfugOf8A9JBShVwwrRIkLX0YcDUGbzjbVCA==
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-universalify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
-  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
-
-unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
-
-update-browserslist-db@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz#64d76db58713136acbeb4c49114366cc6cc2e80d"
-  integrity sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==
-  dependencies:
-    escalade "^3.2.0"
-    picocolors "^1.1.1"
-
-uri-parser@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uri-parser/-/uri-parser-1.0.1.tgz#3307ebb50f279c11198ad09214bdaf24e29735b2"
-  integrity sha512-TRjjM2M83RD9jIIYttNj7ghUQTKSov+WXZbQIMM8DxY1R1QdJEGWNKKMYCxyeOw1p9re2nQ85usM6dPTVtox1g==
-
-url-join@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-5.0.0.tgz#c2f1e5cbd95fa91082a93b58a1f42fecb4bdbcf1"
-  integrity sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==
-
-url-parse@^1.5.10, url-parse@^1.5.3, url-parse@^1.5.9:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
-  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
-url-template@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
-  integrity sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==
-
-utf-8-validate@^5.0.2, utf-8-validate@^5.0.5:
-  version "5.0.10"
-  resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2"
-  integrity sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==
-  dependencies:
-    node-gyp-build "^4.3.0"
-
-utf8@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96"
-  integrity sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
-
-util@^0.12.3, util@^0.12.5:
-  version "0.12.5"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
-  integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
-  dependencies:
-    inherits "^2.0.3"
-    is-arguments "^1.0.4"
-    is-generator-function "^1.0.7"
-    is-typed-array "^1.1.3"
-    which-typed-array "^1.1.2"
-
-utils-merge@1.0.1, utils-merge@1.x.x, utils-merge@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
-
-uuid-parse@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/uuid-parse/-/uuid-parse-1.1.0.tgz#7061c5a1384ae0e1f943c538094597e1b5f3a65b"
-  integrity sha512-OdmXxA8rDsQ7YpNVbKSJkNzTw2I+S5WsbMDnCtIWSQaosNAcWtFuI/YK1TjzUI6nbkgiqEyh8gWngfcv8Asd9A==
-
-uuid@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294"
-  integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==
-
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-uuid@^8.0.0, uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-uuid@^9.0.0, uuid@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
-  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
-
-v8flags@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
-  integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
-
-vasync@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/vasync/-/vasync-2.2.1.tgz#d881379ff3685e4affa8e775cf0fd369262a201b"
-  integrity sha512-Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ==
-  dependencies:
-    verror "1.10.0"
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-verror@^1.8.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb"
-  integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-w3c-xmlserializer@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
-  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
-  dependencies:
-    xml-name-validator "^4.0.0"
-
-weak-daemon@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/weak-daemon/-/weak-daemon-1.0.3.tgz#d922b7c0dfb8f6bf027c463ea875584d2b085f19"
-  integrity sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ==
-
-web-encoding@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.1.5.tgz#fc810cf7667364a6335c939913f5051d3e0c4864"
-  integrity sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA==
-  dependencies:
-    util "^0.12.3"
-  optionalDependencies:
-    "@zxing/text-encoding" "0.9.0"
-
-web-push@3.6.7:
-  version "3.6.7"
-  resolved "https://registry.yarnpkg.com/web-push/-/web-push-3.6.7.tgz#5f5e645951153e37ef90a6ddea5c150ea0f709e1"
-  integrity sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==
-  dependencies:
-    asn1.js "^5.3.0"
-    http_ece "1.2.0"
-    https-proxy-agent "^7.0.0"
-    jws "^4.0.0"
-    minimist "^1.2.5"
-
-web-streams-polyfill@^3.0.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz#2073b91a2fdb1fbfbd401e7de0ac9f8214cecb4b"
-  integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==
-
-webdav@5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webdav/-/webdav-5.8.0.tgz#2a3cb39f5d49883ce98e0e2994b8dbedc53d56e8"
-  integrity sha512-iuFG7NamJ41Oshg4930iQgfIpRrUiatPWIekeznYgEf2EOraTRcDPTjy7gIOMtkdpKTaqPk1E68NO5PAGtJahA==
-  dependencies:
-    "@buttercup/fetch" "^0.2.1"
-    base-64 "^1.0.0"
-    byte-length "^1.0.2"
-    entities "^6.0.0"
-    fast-xml-parser "^4.5.1"
-    hot-patcher "^2.0.1"
-    layerr "^3.0.0"
-    md5 "^2.3.0"
-    minimatch "^9.0.5"
-    nested-property "^4.0.0"
-    node-fetch "^3.3.2"
-    path-posix "^1.0.0"
-    url-join "^5.0.0"
-    url-parse "^1.5.10"
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
-webidl-conversions@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
-  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
-
-websocket-driver@>=0.5.1:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
-  dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
-
-websocket@^1.0.34:
-  version "1.0.35"
-  resolved "https://registry.yarnpkg.com/websocket/-/websocket-1.0.35.tgz#374197207d7d4cc4c36cbf8a1bb886ee52a07885"
-  integrity sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==
-  dependencies:
-    bufferutil "^4.0.1"
-    debug "^2.2.0"
-    es5-ext "^0.10.63"
-    typedarray-to-buffer "^3.1.5"
-    utf-8-validate "^5.0.2"
-    yaeti "^0.0.6"
-
-whatwg-encoding@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
-  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
-  dependencies:
-    iconv-lite "0.6.3"
-
-whatwg-fetch@^3.4.1:
-  version "3.6.20"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz#580ce6d791facec91d37c72890995a0b48d31c70"
-  integrity sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==
-
-whatwg-mimetype@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
-  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
-
-whatwg-url@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
-  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
-  dependencies:
-    tr46 "^3.0.0"
-    webidl-conversions "^7.0.0"
-
-whatwg-url@^12.0.0, whatwg-url@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c"
-  integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==
-  dependencies:
-    tr46 "^4.1.1"
-    webidl-conversions "^7.0.0"
-
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e"
-  integrity sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==
-  dependencies:
-    is-bigint "^1.1.0"
-    is-boolean-object "^1.2.1"
-    is-number-object "^1.1.1"
-    is-string "^1.1.1"
-    is-symbol "^1.1.1"
-
-which-builtin-type@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e"
-  integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==
-  dependencies:
-    call-bound "^1.0.2"
-    function.prototype.name "^1.1.6"
-    has-tostringtag "^1.0.2"
-    is-async-function "^2.0.0"
-    is-date-object "^1.1.0"
-    is-finalizationregistry "^1.1.0"
-    is-generator-function "^1.0.10"
-    is-regex "^1.2.1"
-    is-weakref "^1.0.2"
-    isarray "^2.0.5"
-    which-boxed-primitive "^1.1.0"
-    which-collection "^1.0.2"
-    which-typed-array "^1.1.16"
-
-which-collection@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
-  integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
-  dependencies:
-    is-map "^2.0.3"
-    is-set "^2.0.3"
-    is-weakmap "^2.0.2"
-    is-weakset "^2.0.3"
-
-which-module@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
-  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
-
-which-typed-array@^1.1.16, which-typed-array@^1.1.19, which-typed-array@^1.1.2:
-  version "1.1.20"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.20.tgz#3fdb7adfafe0ea69157b1509f3a1cd892bd1d122"
-  integrity sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==
-  dependencies:
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    for-each "^0.3.5"
-    get-proto "^1.0.1"
-    gopd "^1.2.0"
-    has-tostringtag "^1.0.2"
-
-which@^1.2.9, which@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
-  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
-  dependencies:
-    string-width "^1.0.2 || 2 || 3 || 4"
-
-wildleek@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/wildleek/-/wildleek-2.0.0.tgz#85eb93c9c1822da963bc3c3c8d09ae9d12b48a47"
-  integrity sha512-wtHhfuGeWH9diQsQoprX5tr2+y5lyqyzMpiTFu4gJVQIK+L4jE8Phmr50sFmk7ewhZzbbQj2pCwbUcceq+IEIg==
-  dependencies:
-    binary-search "1.3.6"
-
-winston-transport@^4.9.0:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.9.0.tgz#3bba345de10297654ea6f33519424560003b3bf9"
-  integrity sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==
-  dependencies:
-    logform "^2.7.0"
-    readable-stream "^3.6.2"
-    triple-beam "^1.3.0"
-
-winston@^3.3.3:
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-3.19.0.tgz#cc1d1262f5f45946904085cfffe73efb4b7a581d"
-  integrity sha512-LZNJgPzfKR+/J3cHkxcpHKpKKvGfDZVPS4hfJCc4cCG0CgYzvlD6yE/S3CIL/Yt91ak327YCpiF/0MyeZHEHKA==
-  dependencies:
-    "@colors/colors" "^1.6.0"
-    "@dabh/diagnostics" "^2.0.8"
-    async "^3.2.3"
-    is-stream "^2.0.0"
-    logform "^2.7.0"
-    one-time "^1.0.0"
-    readable-stream "^3.4.0"
-    safe-stable-stringify "^2.3.1"
-    stack-trace "0.0.x"
-    triple-beam "^1.3.0"
-    winston-transport "^4.9.0"
-
-wordwrap@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
-
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==
-
-worker-timers-broker@^6.1.8:
-  version "6.1.8"
-  resolved "https://registry.yarnpkg.com/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz#08f64e5931b77fadc55f0c7388c077a7dd17e4c7"
-  integrity sha512-FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ==
-  dependencies:
-    "@babel/runtime" "^7.24.5"
-    fast-unique-numbers "^8.0.13"
-    tslib "^2.6.2"
-    worker-timers-worker "^7.0.71"
-
-worker-timers-worker@^7.0.71:
-  version "7.0.71"
-  resolved "https://registry.yarnpkg.com/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz#f96138bafbcfaabea116603ce23956e05e76db6a"
-  integrity sha512-ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ==
-  dependencies:
-    "@babel/runtime" "^7.24.5"
-    tslib "^2.6.2"
-
-worker-timers@^7.0.75:
-  version "7.1.8"
-  resolved "https://registry.yarnpkg.com/worker-timers/-/worker-timers-7.1.8.tgz#f53072c396ac4264fd3027914f4ab793c92d90be"
-  integrity sha512-R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw==
-  dependencies:
-    "@babel/runtime" "^7.24.5"
-    tslib "^2.6.2"
-    worker-timers-broker "^6.1.8"
-    worker-timers-worker "^7.0.71"
-
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
-  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
-  dependencies:
-    ansi-styles "^6.1.0"
-    string-width "^5.0.1"
-    strip-ansi "^7.0.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-write-file-atomic@^1.1.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
-  integrity sha512-SdrHoC/yVBPpV0Xq/mUZQIpW2sWXAShb/V4pomcJXh92RuaO+f3UTWItiR3Px+pLnV2PvC2/bfn5cwr5X6Vfxw==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    slide "^1.1.5"
-
-write-file-atomic@^2.4.2:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
-  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
-
-ws@8.18.3:
-  version "8.18.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
-  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
-
-ws@^7.4.6:
-  version "7.5.10"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
-  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
-
-ws@^8.13.0, ws@^8.18.0, ws@^8.9.0:
-  version "8.19.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.19.0.tgz#ddc2bdfa5b9ad860204f5a72a4863a8895fd8c8b"
-  integrity sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==
-
-xml-crypto@^2.1.3:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.6.tgz#c51a016cc8391fc1d9ebd9abc589e4c08b62d652"
-  integrity sha512-jjvpO8vHNV8QFhW5bMypP+k4BjBqHe/HrpIwpPcdUnUTIJakSIuN96o3Sdah4tKu2z64kM/JHEH8iEHGCc6Gyw==
-  dependencies:
-    "@xmldom/xmldom" "^0.7.9"
-    xpath "0.0.32"
-
-xml-encryption@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-2.0.0.tgz#d4e1eb3ec1f2c5d2a2a0a6e23d199237e8b4bf83"
-  integrity sha512-4Av83DdvAgUQQMfi/w8G01aJshbEZP9ewjmZMpS9t3H+OCZBDvyK4GJPnHGfWiXlArnPbYvR58JB9qF2x9Ds+Q==
-  dependencies:
-    "@xmldom/xmldom" "^0.7.0"
-    escape-html "^1.0.3"
-    xpath "0.0.32"
-
-xml-name-validator@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
-  integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
-
-xml2js@^0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xml2js@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7"
-  integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-"xml2js@^0.5.0 || ^0.6.2":
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499"
-  integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xml@0.0.12:
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-0.0.12.tgz#f08b347109912be00285785f46f15ad8e50a5f67"
-  integrity sha512-vXz2nTtS+bQYemYFzbTxjlmdMOmIhmP+frdnJi3M2Ul/ezrwcW9IYwiwqvecY3PtHNXGKBDrA+DNAEky0zY7Xg==
-
-xmlbuilder@^13.0.2:
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-13.0.2.tgz#02ae33614b6a047d1c32b5389c1fdacb2bce47a7"
-  integrity sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==
-
-xmlbuilder@^15.1.1:
-  version "15.1.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
-  integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
-
-xmlbuilder@^9.0.1:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==
-
-xmlbuilder@~11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
-xmlchars@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
-  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
-
-xmldom@0.1.x:
-  version "0.1.31"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
-  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
-
-xpath@0.0.32:
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af"
-  integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==
-
-xtend@^4.0.0, xtend@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-xtraverse@0.1.x:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/xtraverse/-/xtraverse-0.1.0.tgz#b741bad018ef78d8a9d2e83ade007b3f7959c732"
-  integrity sha512-MANQdlG2hl1nQobxz1Rv8hsS1RuBS0C1N6qTOupv+9vmfrReePdxhmB2ecYjvsp4stJ80HD7erjkoF1Hd/FK9A==
-  dependencies:
-    xmldom "0.1.x"
-
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
-yaeti@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577"
-  integrity sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
-
-yallist@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yargs-parser@^13.0.0, yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
-yargs@^13.2.2:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
-yargs@^17.7.2:
-  version "17.7.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
-  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yauzl@2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-
-yub@0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/yub/-/yub-0.11.1.tgz#ac6d0ea65c146b7b097e7367ba7ea8ef4844562f"
-  integrity sha512-kAq/VtEc9Avsosb9O7IYuTgQAaKFf6ekOXlUtzv8tie1Froq35wtPOrk6VI+43SLXGmBszC1D0A3gR/jW81neg==
-
-zip-stream@^6.0.0, zip-stream@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-6.0.1.tgz#e141b930ed60ccaf5d7fa9c8260e0d1748a2bbfb"
-  integrity sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==
-  dependencies:
-    archiver-utils "^5.0.0"
-    compress-commons "^6.0.2"
-    readable-stream "^4.0.0"
-
-zulip@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/zulip/-/zulip-0.1.0.tgz#62f52b245f4749bac59258592db4bae978b44720"
-  integrity sha512-zsnsxRN0tcR3Qc6GEPg3t2ZrCoLtERE5VqdjHWxTH7Uq+A2hPSfxWEPKbsntpXHgsmywfDMo+P+IdeOcVdX6HA==
-  dependencies:
-    request "~2.27.0"
diff --git a/pkgs/by-name/me/meshoptimizer/package.nix b/pkgs/by-name/me/meshoptimizer/package.nix
index 3a9e85d1ebe5..15f6638d90ca 100644
--- a/pkgs/by-name/me/meshoptimizer/package.nix
+++ b/pkgs/by-name/me/meshoptimizer/package.nix
@@ -17,12 +17,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "meshoptimizer";
-  version = "1.1";
+  version = "1.1.1";
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "meshoptimizer";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-tvVMg3RO1T1/Ub/uue1UQwYeSwqq9OQ1F3PKlF3YOrk=";
+    hash = "sha256-h5lO3HHPtGYuzAZlRwXugvCsjtSMj9j2Z7xCRHQU8xY=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 44662e9b51b9..4f48831753c4 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -16,14 +16,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "1.10.1";
+  version = "1.10.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
     tag = version;
-    hash = "sha256-UeSD3lIZ5hz3UsxZ1sCPzUhiekr3WIEiGxu+inyV8vo=";
+    hash = "sha256-3Zeavn6aW6920gM7yE73Ms1RPCP2GjX9IUL9YGmISfY=";
   };
 
   patches = [
diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix
index e83ac6189ffd..b4aba2cc0975 100644
--- a/pkgs/by-name/me/metacubexd/package.nix
+++ b/pkgs/by-name/me/metacubexd/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "metacubexd";
-  version = "1.244.2";
+  version = "1.245.1";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "metacubexd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IDbAxFplMh1mDVobiHgIghjjgy4WyOLxRbJdMR6gcTQ=";
+    hash = "sha256-h+WaeDAdJ2ucIrtiQ3Sef7UjhG6LLwa/CUCnNJgo6lE=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-BXyKwwhktRAQ/Eol48iKzD5h4iHYB/p2jJHCuXbZ8Js=";
+    hash = "sha256-FRTjHQvy4zoeh4BBhpUv6wEnlYL1bRqGKbbT6IlK5Gg=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix
index 1811fa6cea05..f33fd0036989 100644
--- a/pkgs/by-name/me/metals/package.nix
+++ b/pkgs/by-name/me/metals/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "metals";
-  version = "1.6.6";
+  version = "1.6.7";
 
   deps = stdenv.mkDerivation {
     name = "metals-deps-${finalAttrs.version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-Gc5fQCXLWvDLzxfj+NfOcelVV51UoydNfGdDx1T4cbk=";
+    outputHash = "sha256-2ly1vO+06EalQjEekRwm/g2wfdbq26IcEQscfM14Gvc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mi/miller/package.nix b/pkgs/by-name/mi/miller/package.nix
index 256ed560c8e2..9a4633b889f9 100644
--- a/pkgs/by-name/mi/miller/package.nix
+++ b/pkgs/by-name/mi/miller/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "miller";
-  version = "6.17.0";
+  version = "6.18.1";
 
   src = fetchFromGitHub {
     owner = "johnkerl";
     repo = "miller";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-a147/0w+e+y4zCDs9/NGmtVK8rp//5I+QAsDBzj/sRg=";
+    sha256 = "sha256-pXxXUw956M5EUhL1TFtQp1JTXQwQK9qxp2vjBkozi/0=";
   };
 
   outputs = [
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
     "man"
   ];
 
-  vendorHash = "sha256-6BStDF95QXk55m2QujCqxoE0nciP7blyN/fFCHaTy6I=";
+  vendorHash = "sha256-ZnNEOVChF3kizfjti6Cgexvt/5UPIRQsyfUz8c03EKc=";
 
   postInstall = ''
     mkdir -p $man/share/man/man1
diff --git a/pkgs/by-name/mi/mim-solvers/fix-croco-310.patch b/pkgs/by-name/mi/mim-solvers/fix-croco-310.patch
deleted file mode 100644
index d6e39d068b7d..000000000000
--- a/pkgs/by-name/mi/mim-solvers/fix-croco-310.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 1cb7fe38e3ec43117c646cae521eb8347145965a Mon Sep 17 00:00:00 2001
-From: Guilhem Saurel <guilhem.saurel@laas.fr>
-Date: Tue, 14 Oct 2025 19:37:16 +0200
-Subject: [PATCH] fix for crocoddyl v3.1.0 explicit template instanciation
-
-ref. https://github.com/loco-3d/crocoddyl/pull/1367
-
-Yes, that was a breaking change
----
- tests/factory/point-mass.hpp | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/tests/factory/point-mass.hpp b/tests/factory/point-mass.hpp
-index e82c977..c2e93af 100644
---- a/tests/factory/point-mass.hpp
-+++ b/tests/factory/point-mass.hpp
-@@ -60,6 +60,17 @@ class DAMPointMass1D : public crocoddyl::DifferentialActionModelAbstract {
-   // Destructor
-   virtual ~DAMPointMass1D();
- 
-+  // Explicit template instanciation
-+  std::shared_ptr<crocoddyl::DifferentialActionModelBase> cloneAsDouble()
-+      const override {
-+    return std::make_shared<DAMPointMass1D>(*this);
-+  }
-+
-+  std::shared_ptr<crocoddyl::DifferentialActionModelBase> cloneAsFloat()
-+      const override {
-+    return std::make_shared<DAMPointMass1D>(*this);
-+  }
-+
-   // Cost & dynamics
-   void calc(const std::shared_ptr<DifferentialActionDataAbstract>& data,
-             const Eigen::Ref<const VectorXd>& x,
-@@ -135,6 +146,17 @@ class DAMPointMass2D : public crocoddyl::DifferentialActionModelAbstract {
-   // Destructor
-   virtual ~DAMPointMass2D();
- 
-+  // Explicit template instanciation
-+  std::shared_ptr<crocoddyl::DifferentialActionModelBase> cloneAsDouble()
-+      const override {
-+    return std::make_shared<DAMPointMass2D>(*this);
-+  }
-+
-+  std::shared_ptr<crocoddyl::DifferentialActionModelBase> cloneAsFloat()
-+      const override {
-+    return std::make_shared<DAMPointMass2D>(*this);
-+  }
-+
-   // Cost & dynamics
-   void calc(const std::shared_ptr<DifferentialActionDataAbstract>& data,
-             const Eigen::Ref<const VectorXd>& x,
diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix
index 44483056d44a..28bd2bf43e02 100644
--- a/pkgs/by-name/mi/mim-solvers/package.nix
+++ b/pkgs/by-name/mi/mim-solvers/package.nix
@@ -14,27 +14,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mim-solvers";
-  version = "0.1.1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "machines-in-motion";
     repo = "mim_solvers";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-1Mqu9Hfy65HUIOVG/gJBpSMlOwDWVcH+LrR8CaWz0BE=";
+    hash = "sha256-t21zzUo+Oiqvr3lYN9v1lCeoki3I1FWPqo3gWzM6Kdw=";
   };
 
-  patches = [
-    # ref. https://github.com/machines-in-motion/mim_solvers/pull/71 merged upstream
-    (fetchpatch {
-      name = "build-standalone-python-interface.patch";
-      url = "https://github.com/machines-in-motion/mim_solvers/commit/796eecf05dd9165dd0795aa562ead17de4f19633.patch";
-      hash = "sha256-/OiMzyDVEbpC/Dr/HcguwAdhmbQNxnIRsHAVkX68xqA=";
-    })
-    # Fix for crocoddyl 3.1.0
-    # ref. https://github.com/machines-in-motion/mim_solvers/pull/72
-    ./fix-croco-310.patch
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index 2b1fe31974d0..ba5e0d5907ff 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "mimir";
-  version = "3.0.5";
+  version = "3.0.6";
 
   src = fetchFromGitHub {
     rev = "mimir-${finalAttrs.version}";
     owner = "grafana";
     repo = "mimir";
-    hash = "sha256-C7vfJrcFin4zv/wO9IWIzUPtjiOAoOEWcniCTNm1eRs=";
+    hash = "sha256-rz1Wzsnxt8eGf0rkI8pvhpft+EhTUsdFK4s+9QVn7dg=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix
index c0d4a0fa7002..885506296113 100644
--- a/pkgs/by-name/mi/minify/package.nix
+++ b/pkgs/by-name/mi/minify/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "minify";
-  version = "2.24.12";
+  version = "2.24.13";
 
   src = fetchFromGitHub {
     owner = "tdewolff";
     repo = "minify";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZOe3CcYn3DSa4skgXe63F9gwX8qrX3RBSkqvuzJtN+o=";
+    hash = "sha256-wmK+4ryM4pONuDuq5V+Y5/qd0II0QiTJ0pq/3PYQSWQ=";
   };
 
-  vendorHash = "sha256-gH9HiNYAARImEdA4TESg8BXuedhs3Priv7dgZwcnrHU=";
+  vendorHash = "sha256-1a3DrkBj2R22933blXpI2UzMZSc/SN3zn89bBihxWFk=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/mi/minilibx/package.nix b/pkgs/by-name/mi/minilibx/package.nix
index 2014f4b70b59..00e3e21eaad8 100644
--- a/pkgs/by-name/mi/minilibx/package.nix
+++ b/pkgs/by-name/mi/minilibx/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation {
   pname = "minilibx";
-  version = "0-unstable-2021-10-30";
+  version = "0-unstable-2026-04-16";
 
   src = fetchFromGitHub {
     owner = "42Paris";
     repo = "minilibx-linux";
-    rev = "7dc53a411a7d4ae286c60c6229bd1e395b0efb82";
-    hash = "sha256-aRYMpaPC7dC6EHmmXugvwcQnaizRCQZKFcQX0K2MLM4=";
+    rev = "a0ce07ba22460ee66e62b6c56d60b33946aeb13d";
+    hash = "sha256-LyFCmuGXAAv7O9jrmfeIVeYoi7d1Mdw6e8u2Z0/yO4s=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/mi/minio/package.nix b/pkgs/by-name/mi/minio/package.nix
index 199e68f5ff9e..cb1b38d4b7fd 100644
--- a/pkgs/by-name/mi/minio/package.nix
+++ b/pkgs/by-name/mi/minio/package.nix
@@ -74,5 +74,14 @@ buildGoModule (finalAttrs: {
     ];
     license = lib.licenses.agpl3Plus;
     mainProgram = "minio";
+    knownVulnerabilities = [
+      "CVE-2026-40344: MinIO has an Unauthenticated Object Write via Missing Signature Verification in Unsigned-Trailer Uploads"
+      "CVE-2026-41145: Unauthenticated Object Write via Query-String Credential Signature Bypass in Unsigned-Trailer Uploads"
+      "CVE-2026-33322: JWT Algorithm Confusion in OIDC Authentication"
+      "CVE-2026-33419: LDAP login brute-force via user enumeration and missing rate limit"
+      "CVE-2026-34204: SSE Metadata Injection via Replication Headers"
+      "CVE-2026-39414: DoS via Unbounded Memory Allocation in S3 Select CSV Parsing"
+      "minio has been abandoned by upstream and security issues won't be fixed. Users should migrate to alternatives such as Garage, SeaweedFS, or Ceph. S3-compatible clients such as rclone can be used to move data."
+    ];
   };
 })
diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 58ce253f0c5f..d5f7d69c6140 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.203.1",
+  "version": "3.206.1",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_linux_x86_64",
-      "hash": "sha256-R4ub6Lh33YNzCa1t6aBTzGf/9EaK2wfTWBk4oal4CuI="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.206.1/mirrord_linux_x86_64",
+      "hash": "sha256-RWhqtP8gVAz2H6OU/ZSiL9kBD0rMs/NfsaNnDzjfriw="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_linux_aarch64",
-      "hash": "sha256-2H8O3xL50c31fyVMI5wi6eC3RsZCKV1o4rL4C6e3SoY="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.206.1/mirrord_linux_aarch64",
+      "hash": "sha256-3uzh324H6c43Xcx49ynh6S540G3cxBXQL+Jv3SXaY2Q="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_mac_universal",
-      "hash": "sha256-uI3Zgc42d4shPKiy0lVcS7NmYE6W10zMrRuG08JaSAw="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.206.1/mirrord_mac_universal",
+      "hash": "sha256-jcTlTcCD3hi74e9a87WmiqpnKyLifxWWDu5Pbw9qQOY="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_mac_universal",
-      "hash": "sha256-uI3Zgc42d4shPKiy0lVcS7NmYE6W10zMrRuG08JaSAw="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.206.1/mirrord_mac_universal",
+      "hash": "sha256-jcTlTcCD3hi74e9a87WmiqpnKyLifxWWDu5Pbw9qQOY="
     }
   }
 }
diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix
index 1e33ebbcfc93..0e5ba9973406 100644
--- a/pkgs/by-name/mi/misconfig-mapper/package.nix
+++ b/pkgs/by-name/mi/misconfig-mapper/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "misconfig-mapper";
-  version = "1.15.4";
+  version = "1.15.5";
 
   src = fetchFromGitHub {
     owner = "intigriti";
     repo = "misconfig-mapper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-U4zr+5TD8/rjCv1Ldmie52FZulfohfud72Gyivj2Zko=";
+    hash = "sha256-FZN/FGp2hQWaO0OnRzSmHx10Wb2rvhC6MpX/q97N/uQ=";
   };
 
   vendorHash = "sha256-eQetkCrVlYtiXezFzj35TnYAt6tntzUuJHqRvWEkuC4=";
diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index 05025fed802c..05c0129dd694 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -22,16 +22,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mise";
-  version = "2026.4.6";
+  version = "2026.4.20";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tdHjJjLwnf0/0ZxVb9+tgCD8cD8/3TEE3hw6dM3fKtY=";
+    hash = "sha256-6WGYjXx1AuUDbYIAHh0PdSUC+zDXq4mC5LY+r1vLiKc=";
   };
 
-  cargoHash = "sha256-8JLwlEqxt8Ixg/b67ZICBBoOjGw8PFIYzNIBRiBJ8OA=";
+  cargoHash = "sha256-8JAxt9m8StOSNbUKZBNwQWoXwX+gXLGdNZYlRSH0SLM=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix
index 106771c98c97..adbeb158d070 100644
--- a/pkgs/by-name/mi/mistral-vibe/package.nix
+++ b/pkgs/by-name/mi/mistral-vibe/package.nix
@@ -28,14 +28,15 @@ let
 in
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mistral-vibe";
-  version = "2.7.3";
+  version = "2.9.3";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "mistralai";
     repo = "mistral-vibe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XRBrBd7X8HewrUJ7K8wQMcVJz3ITPKzyKpyCi7detsE=";
+    hash = "sha256-3kMilvBmBhP57jPlDLc+S6kDuJjcOjMHEwh8W4hzEVw=";
   };
 
   build-system = with python3Packages; [
@@ -59,11 +60,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
     agent-client-protocol
     anyio
     cachetools
+    charset-normalizer
     cryptography
     gitpython
     giturlparse
     google-auth
     httpx
+    jsonpatch
     keyring
     markdownify
     mcp
@@ -160,6 +163,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
   ];
 
   disabledTestPaths = [
+    # This tests the install_script and fails. This is not relevant for nixpkgs.
+    "tests/test_install_script.py"
+
     # All snapshot tests fail with AssertionError
     "tests/snapshots/"
 
diff --git a/pkgs/by-name/mk/mklittlefs/package.nix b/pkgs/by-name/mk/mklittlefs/package.nix
index a1f40f0981b5..721d4d997de9 100644
--- a/pkgs/by-name/mk/mklittlefs/package.nix
+++ b/pkgs/by-name/mk/mklittlefs/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Tool to build and unpack littlefs images";
     homepage = "https://github.com/earlephilhower/mklittlefs";
-    changelog = "https://github.com/earlephilhower/mklittlefs/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/earlephilhower/mklittlefs/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ liberodark ];
     mainProgram = "mklittlefs";
diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 79204daba827..aba7a2d56717 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -41,13 +41,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mlt";
-  version = "7.36.1";
+  version = "7.38.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3WZirFMrU8T8UClkUQRBjqBqycpI7pAjcVzeGpYMwhY=";
+    hash = "sha256-tZWkgDffNZwJgfrFQNKfS+QzpcjaM0SEBbyxrVBqubc=";
     # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate.
     # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on
     # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545
diff --git a/pkgs/by-name/mn/mnemosyne/package.nix b/pkgs/by-name/mn/mnemosyne/package.nix
index 29b7309a5289..150c42dd3eb9 100644
--- a/pkgs/by-name/mn/mnemosyne/package.nix
+++ b/pkgs/by-name/mn/mnemosyne/package.nix
@@ -2,6 +2,7 @@
   python3Packages,
   fetchurl,
   anki,
+  qt6,
 }:
 
 python3Packages.buildPythonApplication (finalAttrs: {
@@ -11,12 +12,15 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${finalAttrs.version}/Mnemosyne-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-zI79iuRXb5S0Y87KfdG+HKc0XVNQOAcBR7Zt/OdaBP4=";
+    hash = "sha256-zI79iuRXb5S0Y87KfdG+HKc0XVNQOAcBR7Zt/OdaBP4=";
   };
 
-  nativeBuildInputs = with python3Packages; [ pyqtwebengine.wrapQtAppsHook ];
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
 
-  buildInputs = [ anki ];
+  buildInputs = [
+    anki
+    qt6.qtbase
+  ];
 
   propagatedBuildInputs = with python3Packages; [
     cheroot
@@ -31,11 +35,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     webob
   ];
 
-  prePatch = ''
-    substituteInPlace setup.py \
-      --replace '("", ["/usr/local/bin/mplayer"])' ""
-  '';
-
   # No tests/ directory in tarball
   doCheck = false;
 
diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index b8d5451e1ae7..7e4fdf0e66e1 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -2,19 +2,18 @@
   lib,
   stdenvNoCC,
   bun,
-  fetchgit,
   fetchFromGitHub,
   nix-update-script,
   writableTmpDirAsHomeHook,
 }:
 let
   pname = "models-dev";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-04-29";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "models.dev";
-    rev = "2ccecb60118eb569f15da8421944c92b01eae361";
-    hash = "sha256-zQ384Ik3xVtCDpRoFh8WQXQiXo5a3Mlq80gYzD2iMOg=";
+    rev = "e8b5a27723f124e195d60ff18dfe42735dd76aff";
+    hash = "sha256-lGryqSZf/baGL8HP1aKK8zQ5hr5UuyIaATmjcgGkCMI=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -58,7 +57,7 @@ let
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-O2e9O2qu3QS/8MBdZtUNlE8fm4BumFtHMjUt7AYzzks=";
+    outputHash = "sha256-eXgzhb/yhgw0B1WDrpaEmH5Tyya+/rye6kJVKdiV56w=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json
index a36c1f6b3e9f..63ca31d57eb6 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json
@@ -126,10 +126,10 @@
    "jar": "sha256-hSTqyQ9+jg8TZog/LGyCDJO/ph3z12hXyNPoA89nMV0=",
    "pom": "sha256-e2qAtqLSZ2oEIvaWg4EyMVQlUfYbMgxochz7nh9ZCdA="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
-   "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=",
-   "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
-   "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o="
+  "org/jetbrains/kotlin#kotlin-stdlib/2.3.0": {
+   "jar": "sha256-iHWHyRcTJQrVL+FK2RZtBCwzg1BJiQ6UN/NV/8WhlbE=",
+   "module": "sha256-CRCoo7aWD8eSxFxWqR18Oj8mKG8DKVVUtRnP83h1baI=",
+   "pom": "sha256-TVJW0+SETmVrDKQF9jUNbyF5XCQ3WzRSUmxUZ92ZtaI="
   },
   "org/junit#junit-bom/5.11.4": {
    "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index e34f51d94071..5e87b5f24f3b 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -5,7 +5,7 @@
   cargo-tauri,
   desktop-file-utils,
   fetchFromGitHub,
-  gradle_8,
+  gradle_9,
   jdk17,
   makeBinaryWrapper,
   makeShellWrapper,
@@ -25,19 +25,19 @@
 }:
 
 let
-  gradle = gradle_8.override { java = jdk; };
+  gradle = gradle_9.override { java = jdk; };
   jdk = jdk17;
 in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "modrinth-app-unwrapped";
-  version = "0.13.3";
+  version = "0.13.6";
 
   src = fetchFromGitHub {
     owner = "modrinth";
     repo = "code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vBBa2T5+JYvfO9eibJtcpq9y/GMh2PbO0ZBdkah9gms=";
+    hash = "sha256-47uokwYsEg5D0lyHdpqfvKlsuXZK0sm5YIWwNjVGsKQ=";
   };
 
   patches = [
@@ -61,13 +61,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./remove-spotless.patch
   ];
 
+  cargoPatches = [
+    # Cidre 0.11.3 currently fails to build on darwin. Updating it to the latest version
+    # resolves this issue.
+    # Upstream PR is https://github.com/modrinth/code/pull/5862
+    ./update-cidre.patch
+  ];
+
   # Let the app know about our actual version number
   postPatch = ''
     substituteInPlace {apps/app,packages/app-lib}/Cargo.toml apps/app-frontend/package.json \
       --replace-fail '1.0.0-local' '${finalAttrs.version}'
   '';
 
-  cargoHash = "sha256-dbndaNIZzGX4QjGTJbDsKOReB5OeiBmQr8XNzfWPe/o=";
+  cargoHash = "sha256-GwangszzKTEYvflibPgkIyUkHlpfMgenD/mq3my5LIY=";
+
   mitmCache = gradle.fetchDeps {
     inherit (finalAttrs) pname;
     data = ./deps.json;
@@ -77,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
     fetcherVersion = 3;
-    hash = "sha256-yF8sHG2+08JmtrKVLT0/gUPFJGgGWFMvHbi+uen2uwU=";
+    hash = "sha256-Hk32LBD20F2LRgqNs8f1j3VdUxKoTPWs3yJvOghsEbI=";
   };
 
   nativeBuildInputs = [
@@ -116,6 +124,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env = {
     TURBO_BINARY_PATH = lib.getExe turbo;
+    # Cidre requires a target version of at least 10.15
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.15";
   };
 
   preGradleUpdate = ''
@@ -170,7 +180,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # This builds on architectures like aarch64, but the launcher itself does not support them yet.
     # Darwin is the only exception
     # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678
-    broken = !stdenv.hostPlatform.isx86_64 || !stdenv.hostPlatform.isLinux;
+    broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin;
     sourceProvenance = with lib.sourceTypes; [
       fromSource
       binaryBytecode # mitm cache
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/update-cidre.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/update-cidre.patch
new file mode 100644
index 000000000000..ec85dc1a0a52
--- /dev/null
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/update-cidre.patch
@@ -0,0 +1,41 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index ee2157d44..db41b81a3 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1572,18 +1572,19 @@ dependencies = [
+ 
+ [[package]]
+ name = "cidre"
+-version = "0.11.3"
++version = "0.15.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0cc0eb4d7faf9f94493eaf7e7c0534dee2dfa9642353382039572abb4e0e56e9"
++checksum = "0c903ff1729987d29e07295d2c5841993db25ff86cca43bee04505878d3ec1a7"
+ dependencies = [
++ "cc",
+  "cidre-macros",
+ ]
+ 
+ [[package]]
+ name = "cidre-macros"
+-version = "0.3.0"
++version = "0.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "82bc2f84c0baaa09299da3a03864491549685912c1e338a54211e00589dc1e4c"
++checksum = "6facfeffa8b9792dc014bb4e65e364d13518b74e06783d56249810a3e48cfad7"
+ 
+ [[package]]
+ name = "cityhash-rs"
+diff --git a/Cargo.toml b/Cargo.toml
+index 54865d6d3..a09ad3089 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -51,7 +51,7 @@ bytes = "1.10.1"
+ censor = "0.3.0"
+ chardetng = "0.1.17"
+ chrono = "0.4.42"
+-cidre = { version = "0.11.3", default-features = false, features = [
++cidre = { version = "0.15.0", default-features = false, features = [
+   "macos_15_0"
+ ] }
+ clap = "4.5.48"
diff --git a/pkgs/by-name/mo/mojoshader/package.nix b/pkgs/by-name/mo/mojoshader/package.nix
index 3c5e42cad066..44d4c461d6e0 100644
--- a/pkgs/by-name/mo/mojoshader/package.nix
+++ b/pkgs/by-name/mo/mojoshader/package.nix
@@ -23,14 +23,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mojoshader";
-  version = "0-unstable-2026-02-10";
+  version = "0-unstable-2026-04-28";
 
   src = fetchFromGitHub {
     owner = "icculus";
     repo = "mojoshader";
-    rev = "abdc80360c1d4560ab8f356035dcd53ae6e9b87f";
+    rev = "6333f74dbd5644789a63e903816441b16c1e8b60";
     postCheckout = "git -C $out rev-parse HEAD > $out/.gitrev";
-    hash = "sha256-NWXJfi12zLDDg8jvC+G/Dxf2CZPWtSjYFSo/6EV6qxY=";
+    hash = "sha256-32gRoYFGzQksOccpM9qvhd4Q6PyyH3EpQ2rcOI7qfp4=";
   };
 
   buildInputs = [ SDL2 ];
diff --git a/pkgs/by-name/mo/mona-sans/package.nix b/pkgs/by-name/mo/mona-sans/package.nix
index 83c1d310224b..98ad86ae9169 100644
--- a/pkgs/by-name/mo/mona-sans/package.nix
+++ b/pkgs/by-name/mo/mona-sans/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mona-sans";
-  version = "2.0.8";
+  version = "2.0.23";
 
   src = fetchFromGitHub {
     rev = finalAttrs.version;
     owner = "github";
     repo = "mona-sans";
-    sha256 = "sha256-L1KlduItf1jBrw08NwbJvZFemLY8JHRXq2UDl9Wlq70=";
+    sha256 = "sha256-VBbn59v1EqP2cEDqna5vSz/uSgFHmF97bsAHyOBbRt0=";
   };
 
   nativeBuildInputs = [ installFonts ];
diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
index 3cb2b84a2bdb..976fec8efdee 100644
--- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
+++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "mongodb-atlas-cli";
-  version = "1.53.3";
+  version = "1.54.0";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongodb-atlas-cli";
     tag = "atlascli/v${finalAttrs.version}";
-    hash = "sha256-+/B2lr8R+6UKObm4e0jqIZ+yJEtLvxuN+21cHKNBq3E=";
+    hash = "sha256-OZiumnbWNOaH++1u7ZFkpi2xPQ8PG0TI63dXZxX4GOM=";
   };
 
-  vendorHash = "sha256-OsEGK0KqucRIDH6tmz8y1vpU2GjOR1mWpsyeb/6IN84=";
+  vendorHash = "sha256-k7hLJ4bk3IAI/m//MIqp+YVMa3bbADnDiLsuEmz1suI=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index 8fbe6ae691ba..ee6f8d238a0e 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -52,7 +52,7 @@
 
 let
   pname = "mongodb-compass";
-  version = "1.49.4";
+  version = "1.49.5";
 
   selectSystem =
     attrs:
@@ -67,9 +67,9 @@ let
       }
     }";
     hash = selectSystem {
-      x86_64-linux = "sha256-TsALgtCUIHjv6auOIOJjng/B23gcSJMG7x1wBOfOZn4=";
-      x86_64-darwin = "sha256-AaZOxMIG8QL5ee8A5pDXtt7w0LWTA1Y6oItCdZyN9Us=";
-      aarch64-darwin = "sha256-J4yxRvZr9xcIRYmIIE+InB8cH51if+bpUbt/hniGovU=";
+      x86_64-linux = "sha256-CuNY+hzTF2jxZEMSOZkiexGw+1QSGmZ8HDPbD4CGnqU=";
+      x86_64-darwin = "sha256-qbNnu6HK7ajKaXak3raOj1xAlE2bUqN9SsGcs+YbjE8=";
+      aarch64-darwin = "sha256-+ECujuOErLrwJ3j/7SbjgCHTh9QxmDFj8G52IhWOR3E=";
     };
   };
 
diff --git a/pkgs/by-name/mo/mongodb-tools/package.nix b/pkgs/by-name/mo/mongodb-tools/package.nix
index 8f46ce6e6f91..20c42939f918 100644
--- a/pkgs/by-name/mo/mongodb-tools/package.nix
+++ b/pkgs/by-name/mo/mongodb-tools/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mongo-tools";
-  version = "100.16.0";
+  version = "100.16.1";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-tools";
     tag = finalAttrs.version;
-    hash = "sha256-r5oqgHs5aFeuKTGPy/+DPdJbc70S53frBh0ffMBiEFs=";
+    hash = "sha256-oxMc0+Il6pY0L8KF0h5+DYpBuqQvPzaOcZ8cjQDig0c=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/mo/monkeys-audio/package.nix b/pkgs/by-name/mo/monkeys-audio/package.nix
index 7876de1b7ad9..cd254c40c895 100644
--- a/pkgs/by-name/mo/monkeys-audio/package.nix
+++ b/pkgs/by-name/mo/monkeys-audio/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "12.67";
+  version = "12.75";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-36iH2iIvR8CVA8uvldIGiPxL5HkNUK94PpCzvffWx6o=";
+    hash = "sha256-IH72Sjgh4ERkufo1rEHucbpOeMuNeEhfrQBpXvvAvhg=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/mo/mono_repo/package.nix b/pkgs/by-name/mo/mono_repo/package.nix
new file mode 100644
index 000000000000..922db42dc289
--- /dev/null
+++ b/pkgs/by-name/mo/mono_repo/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildDartApplication,
+  fetchFromGitHub,
+  versionCheckHook,
+  callPackage,
+}:
+buildDartApplication (finalAttrs: {
+  pname = "mono_repo";
+  version = "6.6.3";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # Fetch the whole monorepo
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "mono_repo";
+    tag = "mono_repo-v${finalAttrs.version}";
+    hash = "sha256-2/YJ2S3I9K5Xzje787HdJ/KxfbiBEGKU8feuHnOizn8=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/mono_repo";
+
+  dartEntryPoints = {
+    "bin/mono_repo" = "bin/mono_repo.dart";
+  };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  doInstallCheck = true;
+
+  passthru.updateScript = lib.getExe (callPackage ./update.nix { });
+
+  meta = {
+    mainProgram = "mono_repo";
+    homepage = "https://dart.dev/tools/mono_repo";
+    description = "CLI tools to make it easier to manage a single source repository containing multiple Dart packages";
+    changelog = "https://pub.dev/packages/mono_repo/changelog#${
+      lib.replaceString "." "" finalAttrs.version
+    }";
+    license = lib.licenses.bsd3;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "google" finalAttrs.version;
+    maintainers = with lib.maintainers; [ KristijanZic ];
+  };
+})
diff --git a/pkgs/by-name/mo/mono_repo/pubspec.lock.json b/pkgs/by-name/mo/mono_repo/pubspec.lock.json
new file mode 100644
index 000000000000..40ed01d3369b
--- /dev/null
+++ b/pkgs/by-name/mo/mono_repo/pubspec.lock.json
@@ -0,0 +1,767 @@
+{
+  "packages": {
+    "_fe_analyzer_shared": {
+      "dependency": "transitive",
+      "description": {
+        "name": "_fe_analyzer_shared",
+        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "85.0.0"
+    },
+    "analyzer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer",
+        "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.7.1"
+    },
+    "args": {
+      "dependency": "direct main",
+      "description": {
+        "name": "args",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.7.0"
+    },
+    "async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "async",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.13.0"
+    },
+    "boolean_selector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "boolean_selector",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "build": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build",
+        "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.4"
+    },
+    "build_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_config",
+        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.2"
+    },
+    "build_daemon": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_daemon",
+        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.1"
+    },
+    "build_resolvers": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_resolvers",
+        "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.4"
+    },
+    "build_runner": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "build_runner",
+        "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.4"
+    },
+    "build_runner_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_runner_core",
+        "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "9.1.2"
+    },
+    "build_test": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "build_test",
+        "sha256": "a580c76c28440d0006b75c6746bbbb3c1648959ba9e1afae2c2b0f2c26acdf3d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.3"
+    },
+    "build_verify": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "build_verify",
+        "sha256": "3b17b59b6d66f9d3e6014996f089902d56cec5760e051c353cc387b9da577652",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.1"
+    },
+    "build_version": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "build_version",
+        "sha256": "4e8eafbf722eac3bd60c8d38f108c04bd69b80100f8792b32be3407725c7fa6a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "built_collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_collection",
+        "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.1.1"
+    },
+    "built_value": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_value",
+        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.12.4"
+    },
+    "checked_yaml": {
+      "dependency": "direct main",
+      "description": {
+        "name": "checked_yaml",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.4"
+    },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "code_builder": {
+      "dependency": "transitive",
+      "description": {
+        "name": "code_builder",
+        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.11.1"
+    },
+    "collection": {
+      "dependency": "direct main",
+      "description": {
+        "name": "collection",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.19.1"
+    },
+    "convert": {
+      "dependency": "transitive",
+      "description": {
+        "name": "convert",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "coverage": {
+      "dependency": "transitive",
+      "description": {
+        "name": "coverage",
+        "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.15.0"
+    },
+    "crypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "crypto",
+        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.7"
+    },
+    "csslib": {
+      "dependency": "transitive",
+      "description": {
+        "name": "csslib",
+        "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.2"
+    },
+    "dart_style": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dart_style",
+        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.1"
+    },
+    "file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.1"
+    },
+    "fixnum": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fixnum",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "frontend_server_client": {
+      "dependency": "transitive",
+      "description": {
+        "name": "frontend_server_client",
+        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "glob": {
+      "dependency": "transitive",
+      "description": {
+        "name": "glob",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
+    "graphs": {
+      "dependency": "direct main",
+      "description": {
+        "name": "graphs",
+        "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "html": {
+      "dependency": "transitive",
+      "description": {
+        "name": "html",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.15.6"
+    },
+    "http": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http",
+        "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.6.0"
+    },
+    "http_multi_server": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_multi_server",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.2"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.2"
+    },
+    "io": {
+      "dependency": "direct main",
+      "description": {
+        "name": "io",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.5"
+    },
+    "js": {
+      "dependency": "transitive",
+      "description": {
+        "name": "js",
+        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.2"
+    },
+    "json_annotation": {
+      "dependency": "direct main",
+      "description": {
+        "name": "json_annotation",
+        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.9.0"
+    },
+    "json_serializable": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "json_serializable",
+        "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.9.5"
+    },
+    "logging": {
+      "dependency": "transitive",
+      "description": {
+        "name": "logging",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "matcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "matcher",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.12.17"
+    },
+    "meta": {
+      "dependency": "direct main",
+      "description": {
+        "name": "meta",
+        "sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.18.1"
+    },
+    "mime": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mime",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
+    },
+    "node_preamble": {
+      "dependency": "transitive",
+      "description": {
+        "name": "node_preamble",
+        "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
+    "package_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_config",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "path": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.1"
+    },
+    "pool": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pool",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.2"
+    },
+    "pub_semver": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "pubspec_parse": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pubspec_parse",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.0"
+    },
+    "shelf": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.2"
+    },
+    "shelf_packages_handler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_packages_handler",
+        "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "shelf_static": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_static",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
+    "shelf_web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_web_socket",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "source_gen": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_gen",
+        "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
+    },
+    "source_helper": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_helper",
+        "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.7"
+    },
+    "source_map_stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_map_stack_trace",
+        "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "source_maps": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_maps",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.10.13"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.10.2"
+    },
+    "stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.12.1"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "stream_transform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_transform",
+        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
+    },
+    "term_glyph": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.2"
+    },
+    "test": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "test",
+        "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.26.3"
+    },
+    "test_api": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_api",
+        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.7"
+    },
+    "test_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_core",
+        "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.12"
+    },
+    "test_descriptor": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "test_descriptor",
+        "sha256": "9ce468c97ae396e8440d26bb43763f84e2a2a5331813ee5a397cb4da481aaf9a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
+    "test_process": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "test_process",
+        "sha256": "ea79c090deffc87d8276a5d28bb498d080a9873be6b1074d9dcfb82eb87e138e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "timing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "timing",
+        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.2"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
+    "vm_service": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vm_service",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "15.0.2"
+    },
+    "watcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "watcher",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
+    "web_socket_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket_channel",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.3"
+    },
+    "webkit_inspection_protocol": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webkit_inspection_protocol",
+        "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "yaml": {
+      "dependency": "direct main",
+      "description": {
+        "name": "yaml",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.3"
+    }
+  },
+  "sdks": {
+    "dart": ">=3.8.0 <4.0.0"
+  }
+}
diff --git a/pkgs/by-name/mo/mono_repo/update.nix b/pkgs/by-name/mo/mono_repo/update.nix
new file mode 100644
index 000000000000..ff669289e84d
--- /dev/null
+++ b/pkgs/by-name/mo/mono_repo/update.nix
@@ -0,0 +1,61 @@
+{
+  writeShellApplication,
+  common-updater-scripts,
+  nix-update,
+  yq-go,
+  dart,
+  nix,
+}:
+let
+  name = "update-mono_repo";
+  packageName = "mono_repo";
+  packageDir = toString ./.;
+in
+writeShellApplication {
+  inherit name;
+  runtimeInputs = [
+    common-updater-scripts
+    nix-update
+    yq-go
+    dart
+    nix
+  ];
+  text = ''
+    pname="''${UPDATE_NIX_PNAME:-${packageName}}"
+
+    main() {
+      old_version="''${UPDATE_NIX_OLD_VERSION:-$(get_version)}"
+      nix-update "$pname" --version stable --version-regex "$pname-v([0-9.]+(:?\\+[0-9]+)?)"
+      new_version=$(get_version)
+      if [[ "$new_version" == "$old_version" ]]; then
+        exit 0
+      fi
+      generate_lockfile
+    }
+
+    get_version() {
+      nix-instantiate --raw --eval --strict -A "$pname.version"
+    }
+
+    generate_lockfile() {
+      tmp_dir=$(mktemp -d)
+      trap 'rm -rf "$tmp_dir"' EXIT
+
+      src=$(nix-build --no-link . -A "$pname.src")
+
+      cp -r "$src/$pname/." "$tmp_dir/"
+      chmod -R +w "$tmp_dir"
+      cd "$tmp_dir"
+
+      # Generate lockfile because it's not included in the source
+      if ! test -f pubspec.lock; then
+        dart pub get
+      fi
+
+      # Convert to JSON
+      yq -o=json . pubspec.lock > "${packageDir}/pubspec.lock.json"
+    }
+
+    main
+  '';
+}
diff --git a/pkgs/by-name/mo/monosat/package.nix b/pkgs/by-name/mo/monosat/package.nix
index 7744afd0eb1c..7d5bea0a95d9 100644
--- a/pkgs/by-name/mo/monosat/package.nix
+++ b/pkgs/by-name/mo/monosat/package.nix
@@ -40,12 +40,22 @@ let
       --replace-fail 'defined(__linux__)' '0'
   '';
 
+  meta = {
+    description = "SMT solver for Monotonic Theories";
+    mainProgram = "monosat";
+    platforms = lib.platforms.unix;
+    license = if includeGplCode then lib.licenses.gpl2 else lib.licenses.mit;
+    homepage = "https://github.com/sambayless/monosat";
+    maintainers = [ lib.maintainers.acairncross ];
+  };
+
   core = stdenv.mkDerivation {
     inherit
       pname
       version
       src
       patches
+      meta
       ;
     postPatch = commonPostPatch + ''
       substituteInPlace CMakeLists.txt \
@@ -72,15 +82,6 @@ let
     '';
 
     passthru = { inherit python; };
-
-    meta = {
-      description = "SMT solver for Monotonic Theories";
-      mainProgram = "monosat";
-      platforms = lib.platforms.unix;
-      license = if includeGplCode then lib.licenses.gpl2 else lib.licenses.mit;
-      homepage = "https://github.com/sambayless/monosat";
-      maintainers = [ lib.maintainers.acairncross ];
-    };
   };
 
   python =
@@ -98,6 +99,7 @@ let
         version
         src
         patches
+        meta
         ;
 
       build-system = [
diff --git a/pkgs/by-name/mo/moon-child-fe/package.nix b/pkgs/by-name/mo/moon-child-fe/package.nix
new file mode 100644
index 000000000000..a7ee0853f7ff
--- /dev/null
+++ b/pkgs/by-name/mo/moon-child-fe/package.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  sdl3,
+  zlib,
+  pkg-config,
+  sdl_gamecontrollerdb,
+  copyDesktopItems,
+  makeDesktopItem,
+  iconConvTools,
+}:
+let
+  plMpegSrc = fetchFromGitHub {
+    owner = "phoboslab";
+    repo = "pl_mpeg";
+    rev = "c871f2be022ece7ef4f64230b4fb8e1fb9eb6023";
+    hash = "sha256-Mr+hid5RRQ2Yh6UcNDFFbbHMrGGVju0o20KIAEvzEg8=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "moon-child-fe";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "MorsGames";
+    repo = "MoonChildFE";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SqoCSAFkQKcEbwDwHqicYXnQ8/HC523c+ePQFB+6rus=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  cmakeFlags = [
+    (lib.cmakeFeature "MOONCHILD_RENDERER_BACKEND" "SDL3")
+    (lib.cmakeBool "MOONCHILD_VENDORED_SDL3" false)
+    (lib.cmakeBool "MOONCHILD_VENDORED_ZLIB" false)
+    (lib.cmakeBool "MOONCHILD_VENDORED_GAMECONTROLLERDB" false)
+    (lib.cmakeBool "MOONCHILD_VENDORED_PL_MPEG" false)
+  ];
+
+  env = {
+    MOONCHILD_PL_MPEG_PATH = plMpegSrc;
+    MOONCHILD_GAMECONTROLLERDB_PATH = "${sdl_gamecontrollerdb}/share/gamecontrollerdb.txt";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    copyDesktopItems
+    iconConvTools
+  ];
+
+  buildInputs = [
+    sdl3
+    zlib
+    sdl_gamecontrollerdb
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/icons/hicolor/256x256/apps/
+
+    cd /build/source
+    mv ./Bin/Release $out/share/MoonChildFE
+    icoFileToHiColorTheme game.ico MoonChildFE $out
+
+    ln -s $out/share/MoonChildFE/MoonChildFE $out/bin/MoonChildFE
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "MoonChildFE";
+      desktopName = "Moon Child - Friend Edition";
+      exec = "MoonChildFE";
+      icon = "MoonChildFE";
+      comment = finalAttrs.meta.description;
+      startupWMClass = "MoonChildFE";
+      categories = [
+        "Game"
+      ];
+    })
+  ];
+
+  meta = {
+    changelog = "https://github.com/MorsGames/MoonChildFE/releases/tag/v${finalAttrs.version}";
+    description = "Modern source port of the 1997 Windows 95 classic, Moon Child";
+    homepage = "https://github.com/MorsGames/MoonChildFE";
+    license = with lib.licenses; [
+      # Code
+      mit
+      # Assets
+      cc-by-nc-40
+    ];
+    mainProgram = "MoonChildFE";
+    maintainers = [ lib.maintainers.pyrox0 ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/mo/moon-child-fe/unvendor-deps.patch b/pkgs/by-name/mo/moon-child-fe/unvendor-deps.patch
new file mode 100644
index 000000000000..1f0df35383f1
--- /dev/null
+++ b/pkgs/by-name/mo/moon-child-fe/unvendor-deps.patch
@@ -0,0 +1,132 @@
+diff --git c/CMakeLists.txt w/CMakeLists.txt
+index 63803d8..49982bc 100644
+--- c/CMakeLists.txt
++++ w/CMakeLists.txt
+@@ -25,6 +25,12 @@ option(MOONCHILD_INPUT_SDL3 "Use SDL3 input backend" ON)
+ 
+ option(MOONCHILD_AUDIO_SDL3 "Use SDL3 audio backend" ON)
+ 
++# Vendoring options
++option(MOONCHILD_VENDORED_SDL3 "Use vendored SDL3 library" ON)
++option(MOONCHILD_VENDORED_ZLIB "Use vendored zlib library" ON)
++option(MOONCHILD_VENDORED_GAMECONTROLLERDB "Use vendored SDL_GameControllerDB" ON)
++option(MOONCHILD_VENDORED_PL_MPEG "Use vendored pl_mpeg library" ON)
++
+ # Aggregate flags
+ if(MOONCHILD_WINDOW_SDL3 OR MOONCHILD_RENDERER_SDL3 OR MOONCHILD_INPUT_SDL3 OR MOONCHILD_AUDIO_SDL3)
+     set(MOONCHILD_USE_SDL3 ON)
+@@ -57,6 +63,7 @@ endif()
+ 
+ # SDL3 stuff
+ if(MOONCHILD_USE_SDL3)
++  if(MOONCHILD_VENDORED_SDL3)
+     set(SDL_SHARED       OFF CACHE BOOL "" FORCE)
+     set(SDL_STATIC       ON  CACHE BOOL "" FORCE)
+     set(SDL_TEST_LIBRARY OFF CACHE BOOL "" FORCE)
+@@ -74,13 +81,28 @@ if(MOONCHILD_USE_SDL3)
+     else()
+         message(FATAL_ERROR "Could not find an SDL3 target to link!")
+     endif()
++  else()
++    find_package(SDL3)
++  endif()
+ endif()
+ 
+ # zlib stuff
+-set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+-set(ZLIB_BUILD_SHARED   OFF CACHE BOOL "" FORCE)
+-set(ZLIB_BUILD_STATIC   ON  CACHE BOOL "" FORCE)
+-add_subdirectory("${LIBRARY_DIR}/zlib" "${CMAKE_BINARY_DIR}/zlib" EXCLUDE_FROM_ALL)
++if(MOONCHILD_VENDORED_ZLIB)
++  set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
++  set(ZLIB_BUILD_SHARED   OFF CACHE BOOL "" FORCE)
++  set(ZLIB_BUILD_STATIC   ON  CACHE BOOL "" FORCE)
++  add_subdirectory("${LIBRARY_DIR}/zlib" "${CMAKE_BINARY_DIR}/zlib" EXCLUDE_FROM_ALL)
++else()
++  find_package(ZLIB)
++endif()
++
++# SDL_gamecontrollerdb path
++if(MOONCHILD_VENDORED_GAMECONTROLLERDB)
++  set(MOONCHILD_GAMECONTROLLERDB_PATH "gamecontrollerdb.txt")
++else()
++  set(MOONCHILD_GAMECONTROLLERDB_PATH "$ENV{MOONCHILD_GAMECONTROLLERDB_PATH}")
++  file(TO_CMAKE_PATH "${MOONCHILD_GAMECONTROLLERDB_PATH}" MOONCHILD_GAMECONTROLLERDB_PATH)
++endif()
+ 
+ # Game + framework
+ # TODO: Unglobify this
+@@ -171,6 +193,15 @@ target_include_directories(${EXECUTABLE_NAME} PRIVATE
+     ${LIBRARY_DIR}/pl_mpeg
+     ${BACKEND_INCLUDES}
+ )
++if(MOONCHILD_VENDORED_PL_MPEG)
++  target_include_directories(${EXECUTABLE_NAME} PRIVATE
++    ${LIBRARY_DIR}/pl_mpeg
++  )
++else()
++  target_include_directories(${EXECUTABLE_NAME} PRIVATE
++    $ENV{MOONCHILD_PL_MPEG_PATH}
++  )
++endif()
+ 
+ # Backend selection macros
+ if(MOONCHILD_WINDOW_SDL3)
+@@ -185,6 +216,11 @@ if(MOONCHILD_RENDERER_SDL3)
+ endif()
+ if(MOONCHILD_INPUT_SDL3)
+     target_compile_definitions(${EXECUTABLE_NAME} PRIVATE MOONCHILD_INPUT_SDL3)
++    if(NOT MOONCHILD_GAMECONTROLLERDB_PATH STREQUAL "")
++        target_compile_definitions(${EXECUTABLE_NAME} PRIVATE
++            MOONCHILD_GAMECONTROLLERDB_PATH=\"${MOONCHILD_GAMECONTROLLERDB_PATH}\"
++        )
++    endif()
+ endif()
+ if(MOONCHILD_AUDIO_SDL3)
+     target_compile_definitions(${EXECUTABLE_NAME} PRIVATE MOONCHILD_AUDIO_SDL3)
+@@ -201,10 +237,16 @@ if(MSVC)
+     target_compile_definitions(${EXECUTABLE_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS)
+ endif()
+ 
+-target_link_libraries(${EXECUTABLE_NAME} PRIVATE zlibstatic)
++if(MOONCHILD_VENDORED_ZLIB)
++  target_link_libraries(${EXECUTABLE_NAME} PRIVATE zlibstatic)
++else()
++  target_link_libraries(${EXECUTABLE_NAME} PRIVATE ZLIB::ZLIB)
++endif()
+ 
+-if(MOONCHILD_USE_SDL3)
++if(MOONCHILD_USE_SDL3 AND MOONCHILD_VENDORED_SDL3)
+     target_link_libraries(${EXECUTABLE_NAME} PRIVATE ${MOONCHILD_SDL_TARGET})
++elseif(MOONCHILD_USE_SDL3 AND NOT MOONCHILD_VENDORED_SDL3)
++    target_link_libraries(${EXECUTABLE_NAME} PRIVATE SDL3::SDL3)
+ endif()
+ 
+ # Platform specific configuration
+@@ -239,7 +281,7 @@ set_target_properties(${EXECUTABLE_NAME} PROPERTIES
+     RUNTIME_OUTPUT_DIRECTORY_RELEASE        ${MOONCHILD_BIN_DIR}/Release
+ )
+ 
+-if(MOONCHILD_INPUT_SDL3 AND NOT EMSCRIPTEN)
++if(MOONCHILD_INPUT_SDL3 AND NOT EMSCRIPTEN AND MOONCHILD_VENDORED_GAMECONTROLLERDB)
+     add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD
+         COMMAND ${CMAKE_COMMAND} -E copy_if_different
+             "${LIBRARY_DIR}/SDL_GameControllerDB/gamecontrollerdb.txt"
+diff --git c/Platform/Backends/Input/SDL3Input.cpp w/Platform/Backends/Input/SDL3Input.cpp
+index d214516..1412c00 100644
+--- c/Platform/Backends/Input/SDL3Input.cpp
++++ w/Platform/Backends/Input/SDL3Input.cpp
+@@ -19,10 +19,12 @@ bool SDL3Input::Init()
+         return false;
+     }
+ 
+-    if (SDL_AddGamepadMappingsFromFile("gamecontrollerdb.txt") < 0)
++#ifdef MOONCHILD_GAMECONTROLLERDB_PATH
++    if (SDL_AddGamepadMappingsFromFile(MOONCHILD_GAMECONTROLLERDB_PATH) < 0)
+     {
+         printf("SDL gamepad mapping load failed! %s\n", SDL_GetError());
+     }
++#endif
+ 
+     int count = 0;
+     if (SDL_JoystickID* ids = SDL_GetGamepads(&count))
diff --git a/pkgs/by-name/mo/moonlight/disable_updates.patch b/pkgs/by-name/mo/moonlight/disable_updates.patch
index 2d2429ac0cd8..64bc4b2ea36d 100644
--- a/pkgs/by-name/mo/moonlight/disable_updates.patch
+++ b/pkgs/by-name/mo/moonlight/disable_updates.patch
@@ -1,5 +1,5 @@
 diff --git i/packages/core-extensions/src/moonbase/host.ts w/packages/core-extensions/src/moonbase/host.ts
-index 6bb7b62..71b57b9 100644
+index ca78483..25716c9 100644
 --- i/packages/core-extensions/src/moonbase/host.ts
 +++ w/packages/core-extensions/src/moonbase/host.ts
 @@ -79,22 +79,9 @@ electron.app.whenReady().then(() => {
@@ -26,7 +26,7 @@ index 6bb7b62..71b57b9 100644
  
        entries.splice(i + 1, 0, {
 diff --git i/packages/core-extensions/src/moonbase/native.ts w/packages/core-extensions/src/moonbase/native.ts
-index 51e347c..a6bdc58 100644
+index 9cccb0c..58e3e06 100644
 --- i/packages/core-extensions/src/moonbase/native.ts
 +++ w/packages/core-extensions/src/moonbase/native.ts
 @@ -39,24 +39,7 @@ export default function getNatives(): MoonbaseNatives {
@@ -56,15 +56,14 @@ index 51e347c..a6bdc58 100644
  
      async updateMoonlight(overrideBranch?: MoonlightBranch) {
 diff --git i/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx w/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx
-index 49d7fcb..a65b57c 100644
+index a4aee57..ce564bb 100644
 --- i/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx
 +++ w/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx
-@@ -107,16 +107,6 @@ function ArrayFormItem({ config }: { config: "repositories" | "devSearchPaths" }
- export default function ConfigPage() {
+@@ -80,14 +80,6 @@ export default function ConfigPage() {
    return (
      <ErrorBoundary>
--      <div className={Margins.marginTop20}>
--        <FormSwitch
+       <Stack direction="vertical" gap={16}>
+-        <Switch
 -          checked={MoonbaseSettingsStore.getExtensionConfigRaw<boolean>("moonbase", "updateChecking", true) ?? true}
 -          onChange={(value: boolean) => {
 -            MoonbaseSettingsStore.setExtensionConfig("moonbase", "updateChecking", value);
@@ -72,7 +71,6 @@ index 49d7fcb..a65b57c 100644
 -          label="Automatic update checking"
 -          description="Checks for updates to moonlight"
 -        />
--      </div>
-       <FormItem title="Repositories">
-         <FormText className={Margins.marginBottom4}>A list of remote repositories to display extensions from</FormText>
-         <ArrayFormItem config="repositories" />
+         <ArrayFormItem
+           label="Repositories"
+           description="A list of remote repositories to display extensions from"
diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index 7e317a0915cb..fc5d45400dc7 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "2026.3.3";
+  version = "2026.4.0";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hGyUoAR0Pv6mkImRDlrnfYAucgJwg2phj6moxewf3aY=";
+    hash = "sha256-jbIdFHPomN0zD2I6UoClofvSNVdOqpf0nM1s5pbn7ew=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 3;
-    hash = "sha256-1jGEzTPPlwAFDKPbH92HvYg4rzFrUJLqhZRMNS+H6GI=";
+    hash = "sha256-veZx/b+cvpcRh1xXO8Y34dJtY2cgncqVSYYywb85Geo=";
   };
 
   env = {
diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix
index 4a3e968d132e..78df49597cff 100644
--- a/pkgs/by-name/mo/moor/package.nix
+++ b/pkgs/by-name/mo/moor/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "moor";
-  version = "2.12.0";
+  version = "2.12.1";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "moor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qDUIgAGO4jUtyBeHSZ59+7bpLkNWIG8nH84nOGe5bUw=";
+    hash = "sha256-Z2N8zEeP3wSrq3PPBXQgEEGz6EZnuzdLAu/Ce5c9JvA=";
   };
 
   vendorHash = "sha256-fHOatNwedbDNGp7V8ynW1NiTkqSJmo8vrv6S64gUQqM=";
diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix
index 36eeafd5ae8d..6231d05b48bb 100644
--- a/pkgs/by-name/mo/moosefs/package.nix
+++ b/pkgs/by-name/mo/moosefs/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "moosefs";
-  version = "4.58.4";
+  version = "4.59.0";
 
   src = fetchFromGitHub {
     owner = "moosefs";
     repo = "moosefs";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-AvY1TOoxxpiqrMqngZe3BTgMuxwltQk1unr/IEfOLt4=";
+    sha256 = "sha256-l4KtrGyV4qy9QFj1SL73n0tRKEATfgDfjTxES9ws+Zw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/mosh/package.nix b/pkgs/by-name/mo/mosh/package.nix
index 5e5fae1fee2a..11c6b1c66e62 100644
--- a/pkgs/by-name/mo/mosh/package.nix
+++ b/pkgs/by-name/mo/mosh/package.nix
@@ -13,7 +13,7 @@
   openssh,
   bash-completion,
   fetchpatch,
-  withUtempter ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl,
+  withUtempter ? stdenv.hostPlatform.isLinux,
   libutempter,
   # build server binary only when set to false (useful for perlless systems)
   withClient ? true,
diff --git a/pkgs/by-name/mo/mosquitto/package.nix b/pkgs/by-name/mo/mosquitto/package.nix
index 967eade3b7dd..b295de57ed23 100644
--- a/pkgs/by-name/mo/mosquitto/package.nix
+++ b/pkgs/by-name/mo/mosquitto/package.nix
@@ -7,11 +7,13 @@
   libxslt,
   c-ares,
   cjson,
+  libargon2,
   libuuid,
   libuv,
   libwebsockets,
   openssl,
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
+  sqlite,
   systemd,
   uthash,
   nixosTests,
@@ -32,13 +34,17 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mosquitto";
-  version = "2.0.22";
+  version = "2.1.2";
+  # Tests disabled: upstream test suite requires additional Python deps,
+  # uses chown() to fixed UIDs, and relies on signal handling that breaks
+  # in sandboxed builds. Re-enable once upstream tests are sandbox-friendly.
+  doCheck = false;
 
   src = fetchFromGitHub {
-    owner = "eclipse";
+    owner = "eclipse-mosquitto";
     repo = "mosquitto";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-PCiNxRG2AqVlS2t/u7Cqn8NbTrrYGO1OXl8zvPQRrJM=";
+    hash = "sha256-Zl55yjuzQY2fyaKs/zLaJ7a3OONKTDQPaT+DpPURdZI=";
   };
 
   postPatch = ''
@@ -63,22 +69,27 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     c-ares
     cjson
+    libargon2
     libuuid
     libuv
     libwebsockets'
     openssl
+    sqlite
     uthash
   ]
   ++ lib.optional withSystemd systemd;
 
+  propagatedBuildInputs = [ cjson ];
+
   cmakeFlags = [
     (lib.cmakeBool "WITH_BUNDLED_DEPS" false)
     (lib.cmakeBool "WITH_WEBSOCKETS" true)
     (lib.cmakeBool "WITH_SYSTEMD" withSystemd)
+    (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck)
   ];
 
   postFixup = ''
-    sed -i "s|^prefix=.*|prefix=$lib|g" $dev/lib/pkgconfig/*.pc
+    sed -i "s|^libdir=.*|libdir=$lib/lib|g" $dev/lib/pkgconfig/*.pc
   '';
 
   passthru.tests = {
@@ -88,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Open source MQTT v3.1/3.1.1/5.0 broker";
     homepage = "https://mosquitto.org/";
-    changelog = "https://github.com/eclipse/mosquitto/blob/v${finalAttrs.version}/ChangeLog.txt";
+    changelog = "https://github.com/eclipse-mosquitto/mosquitto/blob/v2.0.22/ChangeLog.txt";
     license = lib.licenses.epl10;
     maintainers = with lib.maintainers; [
       peterhoeg
diff --git a/pkgs/by-name/mo/motrix-next/package.nix b/pkgs/by-name/mo/motrix-next/package.nix
index a8df486edd5f..e32dbe4c0778 100644
--- a/pkgs/by-name/mo/motrix-next/package.nix
+++ b/pkgs/by-name/mo/motrix-next/package.nix
@@ -25,16 +25,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "motrix-next";
-  version = "3.6.8";
+  version = "3.8.5";
 
   src = fetchFromGitHub {
     owner = "AnInsomniacy";
     repo = "motrix-next";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nn1YivQ7UCRpWnWa2w0F06n6bQrMJ1d8Gb84hY6K5WE=";
+    hash = "sha256-Y5i+0bAIb2YorO+PolBWlv0dFt/P6INPBfVEe3zG5Uc=";
   };
 
-  cargoHash = "sha256-mrzyIvHlfs3epOm3ZKPetmJOCKpZdHlfosOP7iLlu1k=";
+  cargoHash = "sha256-p5Z9196lh7+4K2MzROZGbPcLyUjGU7VufXCZnh3WQfY=";
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs)
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       src
       ;
     inherit pnpm;
-    hash = "sha256-WvcN4LLRKiOxYEjImZ7VerwHFj33ELJvDKyP3F2UYG8=";
+    hash = "sha256-s/xKVhY6NRIGbVkaXOei9z9n0CQkoK5eGhc5/WcEGFI=";
     fetcherVersion = 3;
   };
 
@@ -73,7 +73,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
-  checkFlags = lib.optional stdenv.hostPlatform.isDarwin "--skip=commands::protocol::tests::macos_tests::get_default_handler_bundle_id_returns_some_for_https";
+  # Some tests on macOS attempt to retrieve system settings, such as the default browser and system proxy.
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   # Deactivate the upstream update mechanism
   postPatch = ''
@@ -98,7 +99,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         ]
       }
       # Tricky way to make the protocol handler desktop file point to the wrapper
-      --set-default APPIMAGE $out/bin/motrix-next
+      --set-default APPIMAGE motrix-next
     )
     wrapGApp $out/bin/motrix-next
   '';
diff --git a/pkgs/by-name/mp/mpv/scripts/convert.nix b/pkgs/by-name/mp/mpv/scripts/convert.nix
index dc2139cb33bb..b4a544dd114e 100644
--- a/pkgs/by-name/mp/mpv/scripts/convert.nix
+++ b/pkgs/by-name/mp/mpv/scripts/convert.nix
@@ -30,7 +30,7 @@ buildLua {
       --replace-fail 'yad_exe = "yad"' \
                 'yad_exe = "${lib.getExe yad}"' \
       --replace-fail 'notify_send_exe = "notify-send"' \
-                'notify_send_exe = "${lib.getExe libnotify}"' \
+                'notify_send_exe = "${lib.getExe libnotify}"'
   '';
 
   scriptPath = "convert_script.lua";
diff --git a/pkgs/by-name/mp/mpv/scripts/modernz.nix b/pkgs/by-name/mp/mpv/scripts/modernz.nix
index 89ddee312500..95b3791556c2 100644
--- a/pkgs/by-name/mp/mpv/scripts/modernz.nix
+++ b/pkgs/by-name/mp/mpv/scripts/modernz.nix
@@ -8,14 +8,14 @@
 }:
 buildLua (finalAttrs: {
   pname = "modernz";
-  version = "0.3.1";
+  version = "0.3.2";
 
   scriptPath = "modernz.lua";
   src = fetchFromGitHub {
     owner = "Samillion";
     repo = "ModernZ";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xHiKE84qBYa8wnLMhrTnOZPLwdY7ddW7ayIfFz1dIRw=";
+    hash = "sha256-HUbS5L0kuYYm9HZ0BEzsqFQii3PQlZtzPiVRF/rDbcY=";
   };
 
   nativeBuildInputs = [ installFonts ];
diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix
index f529f3a7e043..e5a0d9c9dbfa 100644
--- a/pkgs/by-name/mq/mqtt-explorer/package.nix
+++ b/pkgs/by-name/mq/mqtt-explorer/package.nix
@@ -13,7 +13,7 @@
   copyDesktopItems,
 }:
 # NOTE mqtt-explorer has 3 yarn subpackages and uses relative links
-# between them, which makes it hard to package them via 3 `mkYarnPackage`
+# between them, which makes it hard to package them via 3 `fetchYarnDeps`
 # since the resulting `node_modules` directories don't have the same structure
 # as if they were installed directly. Hence why we opted to use a
 # `stdenv.mkDerivation` instead.
diff --git a/pkgs/by-name/mq/mqtt-randompub/package.nix b/pkgs/by-name/mq/mqtt-randompub/package.nix
index 1e97d6bda362..8fd8d9e47a3f 100644
--- a/pkgs/by-name/mq/mqtt-randompub/package.nix
+++ b/pkgs/by-name/mq/mqtt-randompub/package.nix
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Tool that sends random MQTT messages to random topics";
     homepage = "https://github.com/fabaff/mqtt-randompub";
-    changelog = "https://github.com/fabaff/mqtt-randompub/blob/${finalAttrs.src.rev}/ChangeLog";
+    changelog = "https://github.com/fabaff/mqtt-randompub/blob/${finalAttrs.src.tag}/ChangeLog";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "mqtt-randompub";
diff --git a/pkgs/by-name/ms/mstflint/package.nix b/pkgs/by-name/ms/mstflint/package.nix
index 50dbc53f75b3..bcf9509948c3 100644
--- a/pkgs/by-name/ms/mstflint/package.nix
+++ b/pkgs/by-name/ms/mstflint/package.nix
@@ -7,6 +7,7 @@
   zlib,
   xz,
   expat,
+  bashNonInteractive,
   boost,
   curl,
   pkg-config,
@@ -51,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
   ]
   ++ lib.optionals (!onlyFirmwareUpdater) [
+    bashNonInteractive
     boost
     curl
     expat
diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix
index 4cbf36fd756d..0c8cec3317a2 100644
--- a/pkgs/by-name/mu/muffet/package.nix
+++ b/pkgs/by-name/mu/muffet/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "muffet";
-  version = "2.11.2";
+  version = "2.11.3";
 
   src = fetchFromGitHub {
     owner = "raviqqe";
     repo = "muffet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0ehNG9zTzr9csykimuI/VZezjBgvNnSPHgStWNiXji8=";
+    hash = "sha256-c/ionFvWOPZ/MFNos/Q0KdlFH9qlOeAXldQZljaEF8k=";
   };
 
-  vendorHash = "sha256-3Tz3pGwhNchZk/cHgXWREzu/yajBC84jY3sMGYYydKo=";
+  vendorHash = "sha256-ZTPaNeozhbl6FReJowzVHDcSGLCXdt8e3UEW69lFx88=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix
index 172132cc7d66..c36b37a520a5 100644
--- a/pkgs/by-name/mu/mujoco/package.nix
+++ b/pkgs/by-name/mu/mujoco/package.nix
@@ -82,7 +82,10 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mujoco";
-  version = "3.7.0";
+  version = "3.8.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   # Bumping version? Make sure to look though the MuJoCo's commit
   # history for bumped dependency pins!
@@ -90,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "google-deepmind";
     repo = "mujoco";
     tag = finalAttrs.version;
-    hash = "sha256-Ti5Pdr25fck5IdgumiuLIcrI403XawbTePMJY1Fg6/A=";
+    hash = "sha256-X/Aqab5CZX+HbGLZBgtGB08XaNno5883c2yLuRRSkAM=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index b786d8433798..612db76033b0 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -97,7 +97,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg_7 ]
   );
 
-  version = "15.0.9";
+  version = "15.0.11";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
         "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-GkLCztflyfRFZiZg+bZjUFvK9i+jbagyzB7SgbjKlpQ=";
+      hash = "sha256-+skGid5BYrptv3aHLPogxew28DNFArV6kEDhCTxD2Ic=";
     };
   };
 
@@ -291,7 +291,7 @@ stdenv.mkDerivation rec {
     inherit sources;
     updateScript = callPackage ./update.nix {
       inherit pname version meta;
-      baseUrl = "https://cdn.mullvad.net/browser/";
+      baseUrl = "https://dist.torproject.org/mullvadbrowser/";
       name = "mullvad-browser";
     };
   };
@@ -305,6 +305,7 @@ stdenv.mkDerivation rec {
       felschr
       panicgh
       sigmasquadron
+      whispersofthedawn
     ];
     # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
     # the compound is "libre" in a strict sense (some components place certain
diff --git a/pkgs/by-name/mu/multica-cli/package.nix b/pkgs/by-name/mu/multica-cli/package.nix
new file mode 100644
index 000000000000..b3637d909a37
--- /dev/null
+++ b/pkgs/by-name/mu/multica-cli/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+}:
+
+buildGoModule rec {
+  __structuredAttrs = true;
+
+  pname = "multica-cli";
+  version = "0.2.23";
+
+  src = fetchFromGitHub {
+    owner = "multica-ai";
+    repo = "multica";
+    rev = "v${version}";
+    hash = "sha256-2W2OjiKsjaLmKJTr1Rr31eqL/yt+o4XsLFeLwbyv7MY=";
+  };
+
+  sourceRoot = "${src.name}/server";
+
+  vendorHash = "sha256-1rifzInFK8od9XAYWEuHU16ni2+gaDhlDIHc7WeuLU4=";
+
+  subPackages = [ "cmd/multica" ];
+
+  env.CGO_ENABLED = 0;
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${version}"
+    "-X main.commit=nixpkg"
+    "-X main.date=1970-01-01T00:00:00Z"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --cmd multica \
+      --bash <($out/bin/multica completion bash) \
+      --zsh <($out/bin/multica completion zsh) \
+      --fish <($out/bin/multica completion fish)
+  '';
+
+  meta = {
+    description = "CLI for the Multica managed agents platform";
+    homepage = "https://github.com/multica-ai/multica";
+    changelog = "https://github.com/multica-ai/multica/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ akosseres ];
+    mainProgram = "multica";
+  };
+}
diff --git a/pkgs/by-name/mu/munge/package.nix b/pkgs/by-name/mu/munge/package.nix
index f955a5668e56..f7893063482b 100644
--- a/pkgs/by-name/mu/munge/package.nix
+++ b/pkgs/by-name/mu/munge/package.nix
@@ -20,6 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-Hoaldm55E0HC3qqqBS5uZvlgcWepnVLyJNQMB2P/t9Q=";
   };
 
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     libgcrypt # provides libgcrypt.m4
diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 1a411f35f5f6..341a839549ca 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -50,20 +50,10 @@ let
     src = fetchFromGitHub {
       owner = "ArtifexSoftware";
       repo = "thirdparty-freeglut";
-      rev = "13ae6aa2c2f9a7b4266fc2e6116c876237f40477";
-      hash = "sha256-0fuE0lm9rlAaok2Qe0V1uUrgP4AjMWgp3eTbw8G6PMM=";
+      rev = "d5e2256d571b3ef66fb60716c99e35e9d3e570a2";
+      hash = "sha256-yVnVFh2KMpkRB0Emr1iiUwg8ZcPn/k4fnBtBsnv6jX0=";
     };
 
-    patches = [
-      # Fix build with gcc15
-      # https://github.com/freeglut/freeglut/pull/187
-      (fetchpatch {
-        name = "freeglut-fix-fgPlatformDestroyContext-prototype-for-C23.patch";
-        url = "https://github.com/freeglut/freeglut/commit/800772e993a3ceffa01ccf3fca449d3279cde338.patch";
-        hash = "sha256-agXw3JHq81tx5514kkorvuU5mX4E3AV930hy1OJl4L0=";
-      })
-    ];
-
     # cmake 4 compatibility, upstream is dead
     postPatch = ''
       substituteInPlace CMakeLists.txt \
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index f98fb76bfcce..3e08a4e8f0c7 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -38,14 +38,14 @@ assert
 
 python.pkgs.buildPythonApplication rec {
   pname = "music-assistant";
-  version = "2.8.4";
+  version = "2.8.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "server";
     tag = version;
-    hash = "sha256-/yKnUklNQMsumzj68KIfMN/h7Xsr3Brmwpicam9xuAY=";
+    hash = "sha256-//SR7UhaDgT6zNBZ6/B0tBQ88fWkHtrr9Ds0KwH6xzs=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
index 85b96a55d5de..c5051d6d857c 100644
--- a/pkgs/by-name/mu/music-assistant/providers.nix
+++ b/pkgs/by-name/mu/music-assistant/providers.nix
@@ -1,7 +1,7 @@
 # Do not edit manually, run ./update-providers.py
 
 {
-  version = "2.8.4";
+  version = "2.8.6";
   providers = {
     airplay =
       ps: with ps; [
diff --git a/pkgs/by-name/mu/mutt/package.nix b/pkgs/by-name/mu/mutt/package.nix
index 352787135a33..29ef1c0cd5ad 100644
--- a/pkgs/by-name/mu/mutt/package.nix
+++ b/pkgs/by-name/mu/mutt/package.nix
@@ -31,7 +31,7 @@ assert gpgmeSupport -> sslSupport;
 
 stdenv.mkDerivation rec {
   pname = "mutt";
-  version = "2.3.1";
+  version = "2.3.2";
   outputs = [
     "out"
     "doc"
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
-    hash = "sha256-Rw17Dj0TSgX7gGTe3XR3Gwa81jnID8zXdz3DIqr7t7Y=";
+    hash = "sha256-m096RC5BwFd3S6fDb6Qaui7dLnoSqGAx5uuxE7qyx54=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mx/mx-takeover/package.nix b/pkgs/by-name/mx/mx-takeover/package.nix
index 1ce106b016ea..42aeba59f09e 100644
--- a/pkgs/by-name/mx/mx-takeover/package.nix
+++ b/pkgs/by-name/mx/mx-takeover/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Tool to work with DNS MX records";
     homepage = "https://github.com/musana/mx-takeover";
-    changelog = "https://github.com/musana/mx-takeover/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/musana/mx-takeover/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "mx-takeover";
diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix
index 93bbe79bedb9..7c0438c778c5 100644
--- a/pkgs/by-name/my/mycelium/package.nix
+++ b/pkgs/by-name/my/mycelium/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mycelium";
-  version = "0.7.5";
+  version = "0.7.6";
 
   sourceRoot = "${finalAttrs.src.name}/myceliumd";
 
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "threefoldtech";
     repo = "mycelium";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9PjYvzCHSOPlULbElJPVMnLFGTEy/FX56ZaRHUozqvE=";
+    hash = "sha256-6A93ySGmnkqu+TrPsIZJNl4iw26yrUW89TkkfouArn0=";
   };
 
-  cargoHash = "sha256-LSCa8euuOX4BgEDkNQlOdgiL0QzRRMlCoA9opSnPQbI=";
+  cargoHash = "sha256-Firp6R8JZXTzJhV2Psve0kmxP6bT74xHjNq8/q0/pOc=";
 
   nativeBuildInputs = [ versionCheckHook ];
 
diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix
index 841338014853..3a956e647590 100644
--- a/pkgs/by-name/my/mystmd/package.nix
+++ b/pkgs/by-name/my/mystmd/package.nix
@@ -12,7 +12,7 @@ buildNpmPackage rec {
   version = "1.3.18";
 
   src = fetchFromGitHub {
-    owner = "executablebooks";
+    owner = "jupyter-book";
     repo = "mystmd";
     rev = "mystmd@${version}";
     hash = "sha256-20Cxs4ib7xRn4UC9ShiQ+KnyrTCmW/vII7QN9BObY78=";
@@ -40,8 +40,8 @@ buildNpmPackage rec {
 
   meta = {
     description = "Command line tools for working with MyST Markdown";
-    homepage = "https://github.com/executablebooks/mystmd";
-    changelog = "https://github.com/executablebooks/mystmd/blob/${src.rev}/packages/myst-cli/CHANGELOG.md";
+    homepage = "https://github.com/jupyter-book/mystmd";
+    changelog = "https://github.com/jupyter-book/mystmd/blob/${src.rev}/packages/myst-cli/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "myst";
diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index 95a6d017c147..c1dc4de8b421 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "namespace-cli";
-  version = "0.0.499";
+  version = "0.0.501";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-LxN4QqgvmpHa7aJPFJU01BrULpiIVFQDilJXClVecOo=";
+    hash = "sha256-c4erbFjSZUVaekiI1/nQVe+Rg8k4CSneontLb3zZtLQ=";
   };
 
   vendorHash = "sha256-TG0Y0hX/v7rgm1yo19zUt3aNrU65X4B7PVySaLeIk+o=";
diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix
index 6d043d70ea06..e4a2d0b1ea96 100644
--- a/pkgs/by-name/na/nano/package.nix
+++ b/pkgs/by-name/na/nano/package.nix
@@ -31,11 +31,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nano";
-  version = "8.7.1";
+  version = "9.0";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    hash = "sha256-dvDcskjy4vElHU7NIP0w+0AKNgo6N8bDQOClLC0c3t8=";
+    hash = "sha256-nzhDdLSWEQoltzrVpf67OEeDxuMYizcGP2d6yQgBP94=";
   };
 
   nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext;
diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix
index f2d5a61eb804..00dc61f6adab 100644
--- a/pkgs/by-name/na/natscli/package.nix
+++ b/pkgs/by-name/na/natscli/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "natscli";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "natscli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RvAmILkVPGZ5NS50uXN2dUfelwIelSpgPpOaZJMpjWs=";
+    hash = "sha256-NF2A4bkGczaH+TYwQnLSvt21uQIk5FZomQuVl22CP30=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-YjSURSY0oLdQWyBWoMe8V0sOrB2TXwmis/QUdB7T8E4=";
+  vendorHash = "sha256-yHLJWpdCUISdehE9nGiodHRrlnIR9j17ua1gBa3JGYA=";
 
   subPackages = [ "nats" ];
 
diff --git a/pkgs/by-name/nb/nb-cli/package.nix b/pkgs/by-name/nb/nb-cli/package.nix
index 83c146cc12f8..557251ed3f30 100644
--- a/pkgs/by-name/nb/nb-cli/package.nix
+++ b/pkgs/by-name/nb/nb-cli/package.nix
@@ -8,14 +8,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "nb-cli";
-  version = "1.7.3";
+  version = "1.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nonebot";
     repo = "nb-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/OZHDMfwaajePiQ7Nb6BsQcpUPybP5SDWHWG/tVUxCo=";
+    hash = "sha256-Vo+MmbaC+i/FZfrZywb2vgNQotafLyXpdBo6pDlZeaE=";
   };
 
   pythonRemoveDeps = [ "pip" ];
diff --git a/pkgs/by-name/nc/ncbi-vdb/package.nix b/pkgs/by-name/nc/ncbi-vdb/package.nix
index ea80fcd216ff..61eed772f061 100644
--- a/pkgs/by-name/nc/ncbi-vdb/package.nix
+++ b/pkgs/by-name/nc/ncbi-vdb/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ncbi-vdb";
-  version = "3.3.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "ncbi";
     repo = "ncbi-vdb";
     tag = finalAttrs.version;
-    hash = "sha256-bYVwgNYnFg2OPaPWSbXIW+VXprxg/PxwHIRCnDfQRls=";
+    hash = "sha256-A6Pjy1dEkCHy1B6LrWwVs8Et41POvdK4Upsyp4JUnaU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix
index 57651137c8ac..4acbb12b429a 100644
--- a/pkgs/by-name/ne/neatvnc/package.nix
+++ b/pkgs/by-name/ne/neatvnc/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neatvnc";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "any1";
     repo = "neatvnc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wAIifLw2rlu44jXMu/k31B7qePdJt6pT6TOhNxcyfLw=";
+    hash = "sha256-VStlTsfXbFxTnRGdK1y7MLtCzxbHzraw5GGph3sS/kI=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ne/neon/package.nix b/pkgs/by-name/ne/neon/package.nix
index ff8d50a0ddd3..c5d287f27097 100644
--- a/pkgs/by-name/ne/neon/package.nix
+++ b/pkgs/by-name/ne/neon/package.nix
@@ -22,12 +22,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.36.0";
+  version = "0.37.1";
   pname = "neon";
 
   src = fetchurl {
     url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-cMx/Ku694mOQbhhbJm4E4N6Ss45fTszL9h6LeRd8Lwc=";
+    sha256 = "sha256-qZtyYlJaRU0QZc923RckD9gI38TvFWNpkP+DpdDZ50A=";
   };
 
   patches = optionals stdenv.hostPlatform.isDarwin [ ./darwin-fix-configure.patch ];
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 693d34d9d909..83941c29a9d7 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation (
   in
   {
     pname = "neovim-unwrapped";
-    version = "0.12.1";
+    version = "0.12.2";
 
     __structuredAttrs = true;
 
@@ -113,7 +113,7 @@ stdenv.mkDerivation (
       owner = "neovim";
       repo = "neovim";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-cbFM5TKGmhEDsdhMvGzMyn0Js0MJwdMwXDkzQcdw/TM=";
+      hash = "sha256-V+jZiNv0SvG/GOOUPzmBkOQGrnrN3UW2BY2n9NxP2Eg=";
     };
 
     strictDeps = true;
diff --git a/pkgs/by-name/ne/netassert/package.nix b/pkgs/by-name/ne/netassert/package.nix
index a8eec81a81f7..64818b130880 100644
--- a/pkgs/by-name/ne/netassert/package.nix
+++ b/pkgs/by-name/ne/netassert/package.nix
@@ -6,15 +6,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "netassert";
-  version = "2.1.0";
+  version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = "controlplaneio";
     repo = "netassert";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9uzidE/b+7UWNMAknxTdeWYKLEjWbV0V9hab18w+E10=";
+    hash = "sha256-swnTJwsWsTROO6E9LFNP9L9SbdT99yZpfNWPb8CVcBk=";
   };
-  vendorHash = "sha256-JuyE1pYlTIeG3IGOsvYgQN1lTAb7NWytkp/Ibh91QgA=";
+  vendorHash = "sha256-AmYhpc80jlJBhQbN+DUE9U8Oj550Vg+QS4Rci8KLMCk=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 745eba0bbeca..ecaa121b404a 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -67,16 +67,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.69.0";
+  version = "0.70.4";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qNWzyL0J7mYQcWYQOIjmlh+KH2WBb6LkYhTNiR6tDpw=";
+    hash = "sha256-tfScscRllUlV1V6D66rfT6JEsReDQfVGryVzNebm0vg=";
   };
 
-  vendorHash = "sha256-od8m149sJyfdUC0bJ1riHbgXlcX5Yc9K28LCcfWh6DE=";
+  vendorHash = "sha256-IRV1GxdUKgan0GwmBg9acpl7plW01CtEO2FrKrlDdeE=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
 
diff --git a/pkgs/by-name/ne/netfoil/package.nix b/pkgs/by-name/ne/netfoil/package.nix
new file mode 100644
index 000000000000..d841981a0296
--- /dev/null
+++ b/pkgs/by-name/ne/netfoil/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "netfoil";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "tinfoil-factory";
+    repo = "netfoil";
+    tag = "v${version}";
+    hash = "sha256-1JpnVaU17uxQu0O8R0kfl7lCE3YMd/XFmbq9KUMAKqY=";
+  };
+
+  __structuredAttrs = true;
+
+  env.CGO_ENABLED = 0;
+
+  proxyVendor = true;
+
+  vendorHash = "sha256-xtc1zCSLuez9POx/jEjre0uVmvWvCW0TpXPFVi2p+CY=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Minimal, filtering, DNS proxy";
+    homepage = "https://github.com/tinfoil-factory/netfoil";
+    license = licenses.asl20;
+    maintainers = with maintainers; [
+      sgo
+      marcusramberg
+    ];
+    mainProgram = "netfoil";
+  };
+}
diff --git a/pkgs/by-name/ne/netgen-vlsi/package.nix b/pkgs/by-name/ne/netgen-vlsi/package.nix
index 11c224e7bf3a..e0907cc57363 100644
--- a/pkgs/by-name/ne/netgen-vlsi/package.nix
+++ b/pkgs/by-name/ne/netgen-vlsi/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "netgen";
-  version = "1.5.318";
+  version = "1.5.319";
 
   src = fetchFromGitHub {
     owner = "RTimothyEdwards";
     repo = "netgen";
     tag = finalAttrs.version;
-    hash = "sha256-JefKDDzavI/fFJ0nsL6n3z4NHTAVWpOEyMxffYVHLac=";
+    hash = "sha256-n6UoxoPfUlWrl/3HFEXsZTl+nSTjUzK9WSt4q1kXrZs=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix
index 3ff44134cf53..f7841cfe54bf 100644
--- a/pkgs/by-name/ne/netpbm/package.nix
+++ b/pkgs/by-name/ne/netpbm/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Determine version and revision from:
   # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
   pname = "netpbm";
-  version = "11.13.2";
+  version = "11.13.3";
 
   outputs = [
     "bin"
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/netpbm/code/advanced";
-    rev = "5156";
-    sha256 = "sha256-obA/bjWGLmZ5i4SYfLsHwLbmq7BG16hEWoB7ZSCFpxw=";
+    rev = "5164";
+    sha256 = "sha256-3teRW9oucwv0+V+eyLVvh8Y2NtrFoyIt1JWoC2gyVgM=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ne/netpeek/package.nix b/pkgs/by-name/ne/netpeek/package.nix
index de30c0f7d2d3..b76c35cc08fe 100644
--- a/pkgs/by-name/ne/netpeek/package.nix
+++ b/pkgs/by-name/ne/netpeek/package.nix
@@ -10,6 +10,7 @@
   wrapGAppsHook4,
   libadwaita,
   libportal-gtk4,
+  nix-update-script,
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "netpeek";
@@ -49,6 +50,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Modern network scanner for GNOME";
     homepage = "https://github.com/ZingyTomato/NetPeek";
diff --git a/pkgs/by-name/ne/newelle/package.nix b/pkgs/by-name/ne/newelle/package.nix
index bce92233d3df..027551626794 100644
--- a/pkgs/by-name/ne/newelle/package.nix
+++ b/pkgs/by-name/ne/newelle/package.nix
@@ -20,7 +20,7 @@
 }:
 
 let
-  version = "1.1.0";
+  version = "1.3.7";
 in
 python3Packages.buildPythonApplication {
   pname = "newelle";
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication {
     owner = "qwersyk";
     repo = "Newelle";
     tag = version;
-    hash = "sha256-gI4HNzbIM/1ZTPWondi8tCMZOlNt/SzrTIeppY7uLDM=";
+    hash = "sha256-Qa1f6lNfKt1hh1gWJ45n9rwjO5lSO2d0tMII27glU/E=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ne/nextdns/package.nix b/pkgs/by-name/ne/nextdns/package.nix
index b42210699e3f..c49685fb5378 100644
--- a/pkgs/by-name/ne/nextdns/package.nix
+++ b/pkgs/by-name/ne/nextdns/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nextdns";
-  version = "1.46.0";
+  version = "1.47.2";
 
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Vutd7sTVAcz7ueJYSDAOe8CUAS5agwHEG1hH8mp8its=";
+    sha256 = "sha256-AlKuC5UXQ2fRgnFnIYoa0/D7ydZTaZFfenGxiZbA3io=";
   };
 
-  vendorHash = "sha256-GOj07+OVvtp+/FiwBZJb/E9P/4wiHJrh0Cx2uO3NbCg=";
+  vendorHash = "sha256-ZGptjQg/LfvfAEKo1rqitNh2jME06JuryPIFuWdleZk=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ne/nextflow/package.nix b/pkgs/by-name/ne/nextflow/package.nix
index 948c0dd2f5e7..0567008ed940 100644
--- a/pkgs/by-name/ne/nextflow/package.nix
+++ b/pkgs/by-name/ne/nextflow/package.nix
@@ -84,6 +84,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  # --run is used instead of --set to avoid makeWrapper's single-quote escaping,
+  # which prevents $USER from expanding at runtime. See #192396
   postFixup = ''
     wrapProgram $out/bin/nextflow \
       --prefix PATH : ${
@@ -96,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
         ]
       } \
       --set JAVA_HOME ${openjdk.home} \
-      --set NXF_OPTS "-Duser.name=\''${USER}"
+      --run 'export NXF_OPTS="-Duser.name=''$USER''${NXF_OPTS:+ ''$NXF_OPTS}"'
   '';
 
   passthru.tests.default = nixosTests.nextflow;
diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix
index 185db073aabe..31becd409076 100644
--- a/pkgs/by-name/ne/nexttrace/package.nix
+++ b/pkgs/by-name/ne/nexttrace/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "nexttrace";
-  version = "1.6.2";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "nxtrace";
     repo = "NTrace-core";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-SJjWDnbHXuokNFErMdnwxzBRgIyfuxmZ5j3IisgG93I=";
+    sha256 = "sha256-atouv41R49HVJui60ivh1OPIDFwtILdu4BU+x0cLVQ4=";
   };
-  vendorHash = "sha256-4MunvXclgbjnd4ZHLey79GFOH9gDbzqXx1UViUEGL9k=";
+  vendorHash = "sha256-U0OXsZ9eME2paV8+DuPGYuNdaPnfmc4AdaT6cri3Nlw=";
 
   buildInputs = [ libpcap ];
 
diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix
index fe5a418ee95d..65647d437442 100644
--- a/pkgs/by-name/nf/nfpm/package.nix
+++ b/pkgs/by-name/nf/nfpm/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nfpm";
-  version = "2.46.1";
+  version = "2.46.3";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "nfpm";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-lwIPwX/2rAOFbzEnEJT8KDzhPOa4I2eirWf8LtQXy7w=";
+    hash = "sha256-BdiBEYCO8+YDFI4jKjRBaXtR/XutgBIzJA1xERRtE0U=";
   };
 
-  vendorHash = "sha256-1rtkkIMlaeFih0ZR8YEZMgbAnvoBQgY00p3QML8qVAc=";
+  vendorHash = "sha256-cDl/vdnklQJQpSrDHDrC2+K7YiBqPOY3Mv5ApOc63Cw=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix
index 1019c211f3c9..50fe1d124c05 100644
--- a/pkgs/by-name/nf/nfs-ganesha/package.nix
+++ b/pkgs/by-name/nf/nfs-ganesha/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nfs-ganesha";
-  version = "9.11";
+  version = "9.13";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "nfs-ganesha";
     repo = "nfs-ganesha";
     tag = "V${finalAttrs.version}";
-    hash = "sha256-5nDYJXOaceghkaTqRjy6DPsbmnyOOiANo3EMrnOgKsY=";
+    hash = "sha256-e6BDxb4Dt8xp9KdOcjxZKzRiKYPe+GP1UPvK/DAdX6M=";
   };
 
   patches = lib.optional useDbus ./allow-bypassing-dbus-pkg-config-test.patch;
diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix
index afd69a26dccb..0199728db924 100644
--- a/pkgs/by-name/ng/nghttp2/package.nix
+++ b/pkgs/by-name/ng/nghttp2/package.nix
@@ -22,7 +22,6 @@
   jemalloc,
   enablePython ? false,
   python3,
-  ncurses,
 
   # Unit tests ; we have to set TZDIR, which is a GNUism.
   enableTests ? stdenv.hostPlatform.isGnu,
@@ -45,11 +44,11 @@ assert enableJemalloc -> enableApp;
 
 stdenv.mkDerivation rec {
   pname = "nghttp2";
-  version = "1.67.1";
+  version = "1.68.1";
 
   src = fetchurl {
     url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
-    hash = "sha256-37cg1CQ6eVBYn6JjI3i+te6a1ELpS3lLO44soowdfio=";
+    hash = "sha256-t2G1PLZJFmV+qEQ3lz1Qj9Z16Wuy/rlZOh5D0ZWavpU=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix
index 0b2e763b567d..720cf47f0dd8 100644
--- a/pkgs/by-name/ng/nghttp3/package.nix
+++ b/pkgs/by-name/ng/nghttp3/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nghttp3";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchurl {
     url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-JUi0zz3Bl6hB30/rBv1jfRlx4dahu+ES3KLsYYqz6UU=";
+    hash = "sha256-xsSRpSgEgUCY5EZjDm78RZr8DT2nlS/+bL3As/mbK2I=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/nh/nh-unwrapped/package.nix b/pkgs/by-name/nh/nh-unwrapped/package.nix
index 79db3398f6d6..16210de364d4 100644
--- a/pkgs/by-name/nh/nh-unwrapped/package.nix
+++ b/pkgs/by-name/nh/nh-unwrapped/package.nix
@@ -11,12 +11,12 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nh-unwrapped";
-  version = "4.3.1";
+  version = "4.3.2";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8W7devMLhnnQcb2C8TDA6FoXlPR2RRN/zpB6C4ZIa3E=";
+    hash = "sha256-TSXa6nL2TpOfDCsZIGCFAMbkQy2Z40gam7JrxBy5FGY=";
   };
 
   strictDeps = true;
@@ -100,7 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       rm $out/bin/xtask
     '';
 
-  cargoHash = "sha256-TpfxtTVZJhbJtPTPaTrUTTZmB+ZMdcB67kqid87vlOY=";
+  cargoHash = "sha256-ZR8vvG2mXrGg6GeyP7C0uWhPW6cp2QPYj2cOJUSyeAs=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix
index b523718f290b..1b76f0ff1f84 100644
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "ni";
-  version = "30.0.0";
+  version = "30.1.0";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "ni";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CCegG/ClJV4SsuCztUbUy6fw0nFod8FLpIXvftPA9cg=";
+    hash = "sha256-mBKSnnmvlZOwU+6MQrg8S8iCea2PGAsHa+A4lseLYyw=";
   };
 
   pnpmDeps = fetchPnpmDeps {
diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix
index 8eeb37cf6d74..ba654f95e6c8 100644
--- a/pkgs/by-name/ni/nickel/package.nix
+++ b/pkgs/by-name/ni/nickel/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "1.16.0";
 
   src = fetchFromGitHub {
-    owner = "tweag";
+    owner = "nickel-lang";
     repo = "nickel";
     tag = finalAttrs.version;
     hash = "sha256-G+ik4tMr+WsDpiEFYv80ruBR/SpeEg9agUWqgXrq7UI=";
@@ -93,7 +93,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       that are then fed to another system. It is designed to have a simple,
       well-understood core: it is in essence JSON with functions.
     '';
-    changelog = "https://github.com/tweag/nickel/blob/${finalAttrs.version}/RELEASES.md";
+    changelog = "https://github.com/nickel-lang/nickel/blob/${finalAttrs.version}/RELEASES.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       felschr
diff --git a/pkgs/by-name/ni/nile/package.nix b/pkgs/by-name/ni/nile/package.nix
index 7b4d5854b25c..d7c22df3f02f 100644
--- a/pkgs/by-name/ni/nile/package.nix
+++ b/pkgs/by-name/ni/nile/package.nix
@@ -47,7 +47,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Unofficial Amazon Games client";
     homepage = "https://github.com/imLinguin/nile";
-    changelog = "https://github.com/imLinguin/nile/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/imLinguin/nile/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
     mainProgram = "nile";
     maintainers = [ ];
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 0013bfceb1de..7d0b43ea2fff 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -27,13 +27,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "niri";
-  version = "25.11";
+  version = "26.04";
 
   src = fetchFromGitHub {
     owner = "niri-wm";
     repo = "niri";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw=";
+    hash = "sha256-ehSMsSpE+0k8r+2Vseu8kangsYxToZv3vinynsDp9zs=";
   };
 
   outputs = [
@@ -44,10 +44,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   postPatch = ''
     patchShebangs resources/niri-session
     substituteInPlace resources/niri.service \
-      --replace-fail '/usr/bin' "$out/bin"
+      --replace-fail 'niri' "$out/bin/niri"
   '';
 
-  cargoHash = "sha256-X28M0jyhUtVtMQAYdxIPQF9mJ5a77v8jw1LKaXSjy7E=";
+  cargoHash = "sha256-gfnalA3qI3a9h3PvsxgQLCrzapfjLLkxhTMJpwRh+ro=";
 
   strictDeps = true;
 
@@ -139,6 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       sodiboo
       getchoo
+      zimward
     ];
     mainProgram = "niri";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ni/nix-du/package.nix b/pkgs/by-name/ni/nix-du/package.nix
index 94efdb5506d6..6032dbd53055 100644
--- a/pkgs/by-name/ni/nix-du/package.nix
+++ b/pkgs/by-name/ni/nix-du/package.nix
@@ -3,36 +3,34 @@
   fetchFromGitHub,
   rustPlatform,
   nixVersions,
-  nlohmann_json,
-  boost,
+  nix ? nixVersions.nix_2_34,
   graphviz,
   pkg-config,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nix-du";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nix-du";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/Afp0InA/0xXdombAzylYJF9wcv5WwYizVsP+fHTDrM=";
+    hash = "sha256-pqsBWdCdLEdkubcVMuZzF425oU2zgsMSPeDElM+zYBE=";
   };
 
-  cargoHash = "sha256-Q/woxGh1I6FpgJ5D0x7KovSwuRXfZzqjzwljaoKj0/Y=";
+  cargoHash = "sha256-xotbDCuWUeahVsRoOiBdZDC3JpK2a9osbSyVtUyaBrg=";
 
   doCheck = true;
   nativeCheckInputs = [
-    nixVersions.nix_2_28
+    nix
     graphviz
   ];
 
   buildInputs = [
-    boost
-    nixVersions.nix_2_28
-    nlohmann_json
-  ];
+    nix
+  ]
+  ++ nix.buildInputs;
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix
index 6afeb825ff3a..0ee05b20949e 100644
--- a/pkgs/by-name/ni/nix-fast-build/package.nix
+++ b/pkgs/by-name/ni/nix-fast-build/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "nix-fast-build";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-fast-build";
     tag = finalAttrs.version;
-    hash = "sha256-6X4BW+3C2nfkorMfe+tuoeYrdddxPtLqOJ1rZxuxPrc=";
+    hash = "sha256-sH/KWX8NO8iurnnkI7w8eWMkbnRBbvEIK9IW4LnR0qQ=";
   };
 
   build-system = [ python3Packages.setuptools ];
diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
index 3c952f49dc2f..7ae10d730c82 100644
--- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix
+++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nix-index";
-  version = "0.1.9-unstable-2026-02-05";
+  version = "0.1.9-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-index";
-    rev = "8c84f67a33c4c26ec12f166cb5f63a77fafebe21";
-    hash = "sha256-8ZMKtBbsBPbccEWH1XHCYsxXX4hckHXwQNr5OzGrU0Q=";
+    rev = "0f68b51886bde4014629e43d9be4b66cff450990";
+    hash = "sha256-polUDx4tWFmyxsn83XRrw9YQlDq/ggNY1hq6xw9NOoQ=";
   };
 
-  cargoHash = "sha256-0yrTPrxN/4TOALqpQ5GW7LXKisc8msx3DvEpg8uO+IQ=";
+  cargoHash = "sha256-2Ar7mj9r5eKdbXDC4+jSWG7HvGFTeowEPt2SBM6a6e4=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
diff --git a/pkgs/by-name/ni/nix-unit/package.nix b/pkgs/by-name/ni/nix-unit/package.nix
index 0ca2f0644bf1..5d6e811ac2a1 100644
--- a/pkgs/by-name/ni/nix-unit/package.nix
+++ b/pkgs/by-name/ni/nix-unit/package.nix
@@ -17,17 +17,17 @@ let
   # We pin the nix version to a known working one here as upgrades can likely break the build.
   # Since the nix language is rather stable we don't always need to have the latest and greatest for unit tests
   # On each update of nix unit we should re-evaluate what version we need.
-  nixComponents = nixVersions.nixComponents_2_30;
+  nixComponents = nixVersions.nixComponents_2_34;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nix-unit";
-  version = "2.30.0";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-unit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-yQ7HqzfrG7B6Sq1iGBI7QJsbkI/07Ccz42bqWJW4NJA=";
+    hash = "sha256-vZfRXBDC9FTO2Vpz8TroVMqOYqp+hcVk6Nwx6+kRN1Q=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix
index 5d24ca971e50..8a48256d8237 100644
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@@ -49,7 +49,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Swiss-knife for updating nix packages";
     homepage = "https://github.com/Mic92/nix-update/";
-    changelog = "https://github.com/Mic92/nix-update/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/Mic92/nix-update/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       figsoda
diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix
index ba6f519e66dc..d3a8517f7c2b 100644
--- a/pkgs/by-name/ni/nixbit/package.nix
+++ b/pkgs/by-name/ni/nixbit/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nixbit";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "pbek";
     repo = "nixbit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jSvYqTBsFWZqk/v7Y+ONfPDJekxRFi1tIt1UIGdRcEs=";
+    hash = "sha256-7SM6GvNqg7vdoYjE7bpWrIQwyBrpOaez8IQeDDGw/qA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/nixl/package.nix b/pkgs/by-name/ni/nixl/package.nix
new file mode 100644
index 000000000000..9df2e2b9990c
--- /dev/null
+++ b/pkgs/by-name/ni/nixl/package.nix
@@ -0,0 +1,155 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
+  cmake,
+  gitMinimal,
+  meson,
+  ninja,
+  pkg-config,
+  python3Packages,
+
+  # buildInputs
+  abseil-cpp,
+  asio,
+  aws-sdk-cpp,
+  hwloc,
+  libaio,
+  libfabric,
+  liburing,
+  numactl,
+  taskflow,
+  ucx,
+
+  # passthru
+  nix-update-script,
+
+  config,
+  cudaPackages,
+  cudaSupport ? config.cudaSupport,
+}:
+let
+  effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv;
+in
+effectiveStdenv.mkDerivation (finalAttrs: {
+  pname = "nixl";
+  version = "1.0.1";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "ai-dynamo";
+    repo = "nixl";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-mDpDqwUwI0baIDDpt9/wgIP3saBWY8yWKgwzHgrzJiU=";
+  };
+
+  postPatch =
+    # Fix deprecated abseil-cpp Mutex API (Lock/Unlock/ReaderLock/ReaderUnlock
+    # replaced by lock/unlock/lock_shared/unlock_shared in abseil 20260107)
+    ''
+      substituteInPlace src/core/sync.h \
+        --replace-fail 'm.Lock()' 'm.lock()' \
+        --replace-fail 'm.Unlock()' 'm.unlock()' \
+        --replace-fail 'm.ReaderLock()' 'm.lock_shared()' \
+        --replace-fail 'm.ReaderUnlock()' 'm.unlock_shared()'
+    ''
+    # Fix asio::io_context::post() removed in asio 1.36+
+    # Use the free function asio::post(io_context, handler) instead
+    + ''
+      substituteInPlace src/plugins/ucx/ucx_backend.cpp \
+        --replace-fail 'io_->post(' 'asio::post(*io_, '
+    ''
+    # Fix UB: explicit destructor call on lock_guard (GCC 15 -Werror=maybe-uninitialized)
+    # Replace lock_guard + manual destructor with unique_lock + unlock()
+    + ''
+      substituteInPlace src/plugins/libfabric/libfabric_backend.cpp \
+        --replace-fail \
+          'std::lock_guard<std::mutex> lock(connection_state_mutex_);' \
+          'std::unique_lock<std::mutex> lock(connection_state_mutex_);' \
+        --replace-fail \
+          'lock.~lock_guard();' \
+          'lock.unlock();'
+    ''
+    # Fix GDS plugin: Nix uses lib/ not lib64/
+    + ''
+      substituteInPlace src/plugins/cuda_gds/meson.build src/plugins/gds_mt/meson.build \
+        --replace-fail "'/lib64'" "'/lib'"
+    '';
+
+  nativeBuildInputs = [
+    cmake
+    gitMinimal
+    meson
+    ninja
+    pkg-config
+    python3Packages.python
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
+  dontUseCmakeConfigure = true;
+
+  buildInputs = [
+    abseil-cpp
+    asio
+    aws-sdk-cpp
+    hwloc
+    libaio
+    libfabric
+    liburing
+    numactl
+    taskflow
+    ucx
+
+    python3Packages.python
+    # Using C++ header files, not Python import
+    python3Packages.pybind11
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
+    [
+      cuda_cudart
+      cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too
+      libcufile # cufile.h
+    ]
+    # libcuobjclient is only available on cuda>=13.1
+    ++ lib.optionals (libcuobjclient.meta.available or false) [
+      libcuobjclient
+    ]
+  );
+
+  mesonFlags = [
+    (lib.mesonOption "cudapath_lib" "${lib.getLib cudaPackages.cuda_cudart}/lib")
+    (lib.mesonOption "gds_path" (lib.getInclude cudaPackages.cuda_cudart).outPath)
+
+    # Override C++17 -> C++20: taskflow 4.0 headers require C++20 features
+    # (std::bit_ceil, std::atomic::wait/notify, std::atomic_flag::test, etc.)
+    (lib.mesonOption "cpp_std" "c++20")
+
+    # Disable -Werror to prevent false positives from stricter GCC 15 -Wmaybe-uninitialized
+    (lib.mesonOption "werror" "false")
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+
+    # propagate the stdenv so that the python API can consume it directly
+    stdenv = effectiveStdenv;
+
+    pythonPackage = python3Packages.nixl;
+  };
+
+  meta = {
+    description = "NVIDIA Inference Xfer Library";
+    homepage = "https://github.com/ai-dynamo/nixl";
+    changelog = "https://github.com/ai-dynamo/nixl/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    platforms = lib.platforms.all;
+    broken = !cudaSupport;
+  };
+})
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index c825320eae74..c6b5b4d63c45 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -726,7 +726,11 @@ def switch_to_configuration(
     )
 
 
-def upgrade_channels(all_channels: bool = False, sudo: bool = False) -> None:
+def upgrade_channels(
+    all_channels: bool = False,
+    sudo: bool = False,
+    channels_dir: Path = Path("/nix/var/nix/profiles/per-user/root/channels/"),
+) -> None:
     """Upgrade channels for classic Nix.
 
     It will either upgrade just the `nixos` channel (including any channel
@@ -739,7 +743,7 @@ def upgrade_channels(all_channels: bool = False, sudo: bool = False) -> None:
         )
 
     channel_updated = False
-    for channel_path in Path("/nix/var/nix/profiles/per-user/root/channels/").glob("*"):
+    for channel_path in channels_dir.glob("*"):
         if channel_path.is_dir() and (
             all_channels
             or channel_path.name == "nixos"
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index f8c6d75c5290..9b225eca4e84 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -882,44 +882,63 @@ def test_switch_to_configuration_with_systemd_run(
     )
 
 
-@patch(
-    "pathlib.Path.glob",
-    autospec=True,
-    return_value=[
-        Path("/nix/var/nix/profiles/per-user/root/channels/nixos"),
-        Path("/nix/var/nix/profiles/per-user/root/channels/nixos-hardware"),
-        Path("/nix/var/nix/profiles/per-user/root/channels/home-manager"),
-    ],
-)
-@patch("pathlib.Path.is_dir", autospec=True, return_value=True)
 @patch("os.geteuid", autospec=True, return_value=1000)
 @patch(get_qualified_name(n.run_wrapper, n), autospec=True)
-def test_upgrade_channels(
-    mock_run: Mock,
-    mock_geteuid: Mock,
-    mock_is_dir: Mock,
-    mock_glob: Mock,
-) -> None:
+def test_upgrade_channels(mock_run: Mock, mock_geteuid: Mock, tmpdir: Path) -> None:
+    tmp_path = Path(tmpdir)
+
     with pytest.raises(m.NixOSRebuildError) as e:
-        n.upgrade_channels(all_channels=False, sudo=False)
+        n.upgrade_channels(all_channels=False, sudo=False, channels_dir=tmp_path)
     assert str(e.value) == (
         "error: if you pass the '--upgrade' or '--upgrade-all' flag, you must "
         "also pass '--sudo' or run the command as root (e.g., with sudo)"
     )
 
-    n.upgrade_channels(all_channels=False, sudo=True)
-    mock_run.assert_called_once_with(
-        ["nix-channel", "--update", "nixos"], check=False, sudo=True
-    )
+    (tmp_path / "nixos").mkdir()
+    (tmp_path / "nixos-hardware").mkdir()
+    (tmp_path / "nixos-hardware" / ".update-on-nixos-rebuild").touch()
+    (tmp_path / "home-manager").mkdir()
 
-    mock_geteuid.return_value = 0
-    n.upgrade_channels(all_channels=True, sudo=False)
+    # should work because we are passing sudo=True even with os.geteuid == 1000
+    n.upgrade_channels(all_channels=False, sudo=True, channels_dir=tmp_path)
     mock_run.assert_has_calls(
         [
-            call(["nix-channel", "--update", "nixos"], check=False, sudo=False),
             call(
-                ["nix-channel", "--update", "nixos-hardware"], check=False, sudo=False
+                ["nix-channel", "--update", "nixos-hardware"],
+                check=False,
+                sudo=True,
             ),
-            call(["nix-channel", "--update", "home-manager"], check=False, sudo=False),
-        ]
+            call(
+                ["nix-channel", "--update", "nixos"],
+                check=False,
+                sudo=True,
+            ),
+        ],
+        any_order=True,
+    )
+    mock_run.reset_mock()
+
+    # root check
+    mock_geteuid.return_value = 0
+
+    n.upgrade_channels(all_channels=True, sudo=False, channels_dir=tmp_path)
+    mock_run.assert_has_calls(
+        [
+            call(
+                ["nix-channel", "--update", "home-manager"],
+                check=False,
+                sudo=False,
+            ),
+            call(
+                ["nix-channel", "--update", "nixos-hardware"],
+                check=False,
+                sudo=False,
+            ),
+            call(
+                ["nix-channel", "--update", "nixos"],
+                check=False,
+                sudo=False,
+            ),
+        ],
+        any_order=True,
     )
diff --git a/pkgs/by-name/nm/nmapsi4/package.nix b/pkgs/by-name/nm/nmapsi4/package.nix
deleted file mode 100644
index 37287dcef021..000000000000
--- a/pkgs/by-name/nm/nmapsi4/package.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  dnsutils,
-  nmap,
-  libsForQt5,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "nmapsi4";
-  version = "0.5-alpha2";
-
-  src = fetchFromGitHub {
-    owner = "nmapsi4";
-    repo = "nmapsi4";
-    rev = "v${version}";
-    hash = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = with libsForQt5; [
-    qtbase
-    qtscript
-    qtwebengine
-  ];
-
-  postPatch = ''
-    substituteInPlace src/platform/digmanager.cpp \
-      --replace '"dig"' '"${dnsutils}/bin/dig"'
-    substituteInPlace src/platform/discover.cpp \
-        --replace '"nping"' '"${nmap}/bin/nping"'
-    for f in \
-      src/platform/monitor/monitor.cpp \
-      src/platform/nsemanager.cpp ; do
-
-      substituteInPlace $f \
-        --replace '"nmap"'  '"${nmap}/bin/nmap"'
-    done
-  '';
-
-  postInstall = ''
-    mv $out/share/applications/kde4/*.desktop $out/share/applications
-    rmdir $out/share/applications/kde4
-
-    for f in $out/share/applications/* ; do
-      substituteInPlace $f \
-        --replace Qt4                   Qt5
-    done
-  '';
-
-  meta = {
-    description = "Qt frontend for nmap";
-    mainProgram = "nmapsi4";
-    changelog = "https://github.com/nmapsi4/nmapsi4/releases/tag/${src.rev}";
-    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ peterhoeg ];
-    inherit (src.meta) homepage;
-  };
-}
diff --git a/pkgs/by-name/nm/nmtrust/package.nix b/pkgs/by-name/nm/nmtrust/package.nix
new file mode 100644
index 000000000000..a36a40c8c6f0
--- /dev/null
+++ b/pkgs/by-name/nm/nmtrust/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeWrapper,
+  nixosTests,
+  shellcheck,
+  bash,
+  systemd,
+  coreutils,
+  gawk,
+  util-linux,
+}:
+
+stdenv.mkDerivation {
+  pname = "nmtrust";
+  version = "0.1.1";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "brett";
+    repo = "nmtrust-nix";
+    rev = "v0.1.1";
+    hash = "sha256-niCbYxeunNxfkM/HEUiMAvwiholR0nmEPqssOOl9Qvo=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  nativeCheckInputs = [ shellcheck ];
+
+  doCheck = true;
+  checkPhase = ''
+    runHook preCheck
+    shellcheck nmtrust.sh
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 nmtrust.sh $out/bin/nmtrust
+    wrapProgram $out/bin/nmtrust \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          bash
+          systemd
+          coreutils
+          gawk
+          util-linux
+        ]
+      }
+    runHook postInstall
+  '';
+
+  passthru.tests = { inherit (nixosTests) nmtrust; };
+
+  meta = {
+    description = "Declarative network trust management for NixOS";
+    longDescription = ''
+      nmtrust evaluates the trust state of active NetworkManager connections
+      and activates corresponding systemd targets. Services bound to these
+      targets start and stop automatically as you move between trusted,
+      untrusted, and offline networks.
+
+      A NixOS-native reimplementation of nmtrust by Peter Hogg (pigmonkey).
+    '';
+    homepage = "https://github.com/brett/nmtrust-nix";
+    license = lib.licenses.unlicense;
+    maintainers = [ lib.maintainers.brett ];
+    mainProgram = "nmtrust";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix
index 50e10ed2f85b..84800b876035 100644
--- a/pkgs/by-name/nn/nnd/package.nix
+++ b/pkgs/by-name/nn/nnd/package.nix
@@ -8,16 +8,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nnd";
-  version = "0.71";
+  version = "0.72";
 
   src = fetchFromGitHub {
     owner = "al13n321";
     repo = "nnd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J4RoBAQpzBWQNX3bsFlm9IhyKx4l3aZ3pv1ZW+EjCB0=";
+    hash = "sha256-Uwe/GZ9fox9ovazYBZZjedzGEpm5cmWreBdgpBv61uY=";
   };
 
-  cargoHash = "sha256-MiqoFd4Zgho5bJNWXQexGPl/8pqRDHMynQmkYnR11EM=";
+  cargoHash = "sha256-QPjvCIl3CNAq+rBV8mQWY+wCmRONs2VICTMBWdNZ8pQ=";
 
   meta = {
     description = "Debugger for Linux";
diff --git a/pkgs/by-name/no/node-core-utils/package.nix b/pkgs/by-name/no/node-core-utils/package.nix
index 6d505c220ddf..e2026de8f56e 100644
--- a/pkgs/by-name/no/node-core-utils/package.nix
+++ b/pkgs/by-name/no/node-core-utils/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "node-core-utils";
-  version = "6.3.1";
+  version = "6.3.3";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "node-core-utils";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-n3mAq51b0nAY1q9Mp1tmYwOZ3IVXHTc1grKbPwr0Rfc=";
+    hash = "sha256-NjtvCsmXWDy8Z0syi/KlZN9YtMlfuUQLjF1PmIj6Vv8=";
   };
 
-  npmDepsHash = "sha256-4gmxwZHzi4S1ky3fmFy0XzcJKzjPpl891OYtPsKcaPc=";
+  npmDepsHash = "sha256-xSV5goCw5GmfgZ+GgsAbfH+Hds2jrdpIZoh/nZIUrwo=";
 
   dontNpmBuild = true;
   dontNpmPrune = true;
diff --git a/pkgs/by-name/no/node-gyp/package-lock.json b/pkgs/by-name/no/node-gyp/package-lock.json
index 8dee8031b32e..7e534093e5ff 100644
--- a/pkgs/by-name/no/node-gyp/package-lock.json
+++ b/pkgs/by-name/no/node-gyp/package-lock.json
@@ -1,23 +1,23 @@
 {
   "name": "node-gyp",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "node-gyp",
-      "version": "12.2.0",
+      "version": "12.3.0",
       "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
         "exponential-backoff": "^3.1.1",
         "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^15.0.0",
         "nopt": "^9.0.0",
         "proc-log": "^6.0.0",
         "semver": "^7.3.5",
         "tar": "^7.5.4",
         "tinyglobby": "^0.2.12",
+        "undici": "^6.25.0",
         "which": "^6.0.0"
       },
       "bin": {
@@ -29,47 +29,13 @@
         "eslint": "^9.39.1",
         "mocha": "^11.7.5",
         "nan": "^2.23.1",
-        "neostandard": "^0.12.2",
+        "neostandard": "^0.13.0",
         "require-inject": "^1.4.4"
       },
       "engines": {
         "node": "^20.17.0 || >=22.9.0"
       }
     },
-    "node_modules/@emnapi/core": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz",
-      "integrity": "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.1.0",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/runtime": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz",
-      "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/wasi-threads": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz",
-      "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@epic-web/invariant": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz",
@@ -120,15 +86,15 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
-      "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
+      "version": "0.21.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.2.tgz",
+      "integrity": "sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@eslint/object-schema": "^2.1.7",
         "debug": "^4.3.1",
-        "minimatch": "^3.1.2"
+        "minimatch": "^3.1.5"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -161,20 +127,20 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz",
-      "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz",
+      "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ajv": "^6.12.4",
+        "ajv": "^6.14.0",
         "debug": "^4.3.2",
         "espree": "^10.0.1",
         "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.1",
-        "minimatch": "^3.1.2",
+        "minimatch": "^3.1.5",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
@@ -185,9 +151,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.39.2",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz",
-      "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==",
+      "version": "9.39.4",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz",
+      "integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -222,29 +188,43 @@
       }
     },
     "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",
+      "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/types": "^0.15.0"
+      },
       "engines": {
         "node": ">=18.18.0"
       }
     },
     "node_modules/@humanfs/node": {
-      "version": "0.16.7",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
-      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz",
+      "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanfs/core": "^0.19.1",
+        "@humanfs/core": "^0.19.2",
+        "@humanfs/types": "^0.15.0",
         "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
         "node": ">=18.18.0"
       }
     },
+    "node_modules/@humanfs/types": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz",
+      "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
     "node_modules/@humanwhocodes/gitignore-to-minimatch": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
@@ -284,27 +264,6 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@isaacs/balanced-match": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
-      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
-      "license": "MIT",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/@isaacs/brace-expansion": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
-      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
-      "license": "MIT",
-      "dependencies": {
-        "@isaacs/balanced-match": "^4.0.1"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -323,91 +282,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
     "node_modules/@isaacs/fs-minipass": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
@@ -420,57 +294,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.12",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
-      "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/core": "^1.4.3",
-        "@emnapi/runtime": "^1.4.3",
-        "@tybys/wasm-util": "^0.10.0"
-      }
-    },
-    "node_modules/@nolyfill/is-core-module": {
-      "version": "1.0.39",
-      "resolved": "https://registry.npmjs.org/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz",
-      "integrity": "sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.4.0"
-      }
-    },
-    "node_modules/@npmcli/agent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz",
-      "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==",
-      "license": "ISC",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.1",
-        "lru-cache": "^11.2.1",
-        "socks-proxy-agent": "^8.0.3"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
-    "node_modules/@npmcli/fs": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-5.0.0.tgz",
-      "integrity": "sha512-7OsC1gNORBEawOa5+j2pXN9vsicaIOH5cPXxoR6fJOmH6/EXpJB2CajXOu1fPRFun2m1lktEFX11+P89hqO/og==",
-      "license": "ISC",
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -502,17 +325,6 @@
         "eslint": ">=8.40.0"
       }
     },
-    "node_modules/@tybys/wasm-util": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
-      "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
@@ -528,20 +340,20 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.54.0.tgz",
-      "integrity": "sha512-hAAP5io/7csFStuOmR782YmTthKBJ9ND3WVL60hcOjvtGFb+HJxH4O5huAcmcZ9v9G8P+JETiZ/G1B8MALnWZQ==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.0.tgz",
+      "integrity": "sha512-HyAZtpdkgZwpq8Sz3FSUvCR4c+ScbuWa9AksK2Jweub7w4M3yTz4O11AqVJzLYjy/B9ZWPyc81I+mOdJU/bDQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.54.0",
-        "@typescript-eslint/type-utils": "8.54.0",
-        "@typescript-eslint/utils": "8.54.0",
-        "@typescript-eslint/visitor-keys": "8.54.0",
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/type-utils": "8.59.0",
+        "@typescript-eslint/utils": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.4.0"
+        "ts-api-utils": "^2.5.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -551,9 +363,9 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.54.0",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "@typescript-eslint/parser": "^8.59.0",
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
@@ -567,17 +379,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.54.0.tgz",
-      "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.0.tgz",
+      "integrity": "sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.54.0",
-        "@typescript-eslint/types": "8.54.0",
-        "@typescript-eslint/typescript-estree": "8.54.0",
-        "@typescript-eslint/visitor-keys": "8.54.0",
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -588,19 +399,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.54.0.tgz",
-      "integrity": "sha512-YPf+rvJ1s7MyiWM4uTRhE4DvBXrEV+d8oC3P9Y2eT7S+HBS0clybdMIPnhiATi9vZOYDc7OQ1L/i6ga6NFYK/g==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.0.tgz",
+      "integrity": "sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.54.0",
-        "@typescript-eslint/types": "^8.54.0",
+        "@typescript-eslint/tsconfig-utils": "^8.59.0",
+        "@typescript-eslint/types": "^8.59.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -611,18 +422,18 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.54.0.tgz",
-      "integrity": "sha512-27rYVQku26j/PbHYcVfRPonmOlVI6gihHtXFbTdB5sb6qA0wdAQAbyXFVarQ5t4HRojIz64IV90YtsjQSSGlQg==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.0.tgz",
+      "integrity": "sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.54.0",
-        "@typescript-eslint/visitor-keys": "8.54.0"
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -633,9 +444,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.54.0.tgz",
-      "integrity": "sha512-dRgOyT2hPk/JwxNMZDsIXDgyl9axdJI3ogZ2XWhBPsnZUv+hPesa5iuhdYt2gzwA9t8RE5ytOJ6xB0moV0Ujvw==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.0.tgz",
+      "integrity": "sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -646,21 +457,21 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.54.0.tgz",
-      "integrity": "sha512-hiLguxJWHjjwL6xMBwD903ciAwd7DmK30Y9Axs/etOkftC3ZNN9K44IuRD/EB08amu+Zw6W37x9RecLkOo3pMA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.59.0.tgz",
+      "integrity": "sha512-3TRiZaQSltGqGeNrJzzr1+8YcEobKH9rHnqIp/1psfKFmhRQDNMGP5hBufanYTGznwShzVLs3Mz+gDN7HkWfXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.54.0",
-        "@typescript-eslint/typescript-estree": "8.54.0",
-        "@typescript-eslint/utils": "8.54.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0",
+        "@typescript-eslint/utils": "8.59.0",
         "debug": "^4.4.3",
-        "ts-api-utils": "^2.4.0"
+        "ts-api-utils": "^2.5.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -670,14 +481,14 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.54.0.tgz",
-      "integrity": "sha512-PDUI9R1BVjqu7AUDsRBbKMtwmjWcn4J3le+5LpcFgWULN3LvHC5rkc9gCVxbrsrGmO1jfPybN5s6h4Jy+OnkAA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.0.tgz",
+      "integrity": "sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -689,21 +500,21 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.54.0.tgz",
-      "integrity": "sha512-BUwcskRaPvTk6fzVWgDPdUndLjB87KYDrN5EYGetnktoeAvPtO4ONHlAZDnj5VFnUANg0Sjm7j4usBlnoVMHwA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.0.tgz",
+      "integrity": "sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.54.0",
-        "@typescript-eslint/tsconfig-utils": "8.54.0",
-        "@typescript-eslint/types": "8.54.0",
-        "@typescript-eslint/visitor-keys": "8.54.0",
+        "@typescript-eslint/project-service": "8.59.0",
+        "@typescript-eslint/tsconfig-utils": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/visitor-keys": "8.59.0",
         "debug": "^4.4.3",
-        "minimatch": "^9.0.5",
+        "minimatch": "^10.2.2",
         "semver": "^7.7.3",
         "tinyglobby": "^0.2.15",
-        "ts-api-utils": "^2.4.0"
+        "ts-api-utils": "^2.5.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -713,46 +524,59 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <6.0.0"
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^5.0.5"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.54.0.tgz",
-      "integrity": "sha512-9Cnda8GS57AQakvRyG0PTejJNlA2xhvyNtEVIMlDWOOeEyBkYWhGPnfrIAnqxLMTSTo6q8g12XVjjev5l1NvMA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.0.tgz",
+      "integrity": "sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.54.0",
-        "@typescript-eslint/types": "8.54.0",
-        "@typescript-eslint/typescript-estree": "8.54.0"
+        "@typescript-eslint/scope-manager": "8.59.0",
+        "@typescript-eslint/types": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -762,19 +586,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.54.0.tgz",
-      "integrity": "sha512-VFlhGSl4opC0bprJiItPQ1RfUhGDIBokcPwaFH4yiBCaNPeld/9VeXbiPO1cLyorQi1G1vL+ecBk1x8o1axORA==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.0.tgz",
+      "integrity": "sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.54.0",
-        "eslint-visitor-keys": "^4.2.1"
+        "@typescript-eslint/types": "8.59.0",
+        "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -784,275 +608,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@unrs/resolver-binding-android-arm-eabi": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
-      "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-android-arm64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
-      "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-darwin-arm64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
-      "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-darwin-x64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
-      "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-freebsd-x64": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
-      "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
-      "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
-      "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
-      "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
-      "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
-      "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
-      "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
-      "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
-      "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
-      "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-linux-x64-musl": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
-      "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-wasm32-wasi": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
-      "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
-      "cpu": [
-        "wasm32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@napi-rs/wasm-runtime": "^0.2.11"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=14.0.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
-      "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
-      "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
-      "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/abbrev": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-4.0.0.tgz",
@@ -1063,12 +631,11 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1086,19 +653,10 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/agent-base": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
-      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1113,13 +671,16 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/ansi-styles": {
@@ -1327,9 +888,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+      "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1344,38 +905,16 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/cacache": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-20.0.3.tgz",
-      "integrity": "sha512-3pUp4e8hv07k1QlijZu6Kn7c9+ZpWWk4j3F8N3xPuCExULobqJydKYOTj1FTq58srkJsXvO7LbGAH4C0ZU3WGw==",
-      "license": "ISC",
-      "dependencies": {
-        "@npmcli/fs": "^5.0.0",
-        "fs-minipass": "^3.0.0",
-        "glob": "^13.0.0",
-        "lru-cache": "^11.1.0",
-        "minipass": "^7.0.3",
-        "minipass-collect": "^2.0.1",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "p-map": "^7.0.2",
-        "ssri": "^13.0.0",
-        "unique-filename": "^5.0.0"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
     "node_modules/call-bind": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.9.tgz",
+      "integrity": "sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "get-intrinsic": "^1.3.0",
         "set-function-length": "^1.2.2"
       },
       "engines": {
@@ -1503,6 +1042,69 @@
         "node": ">=12"
       }
     },
+    "node_modules/cliui/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1523,16 +1125,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/comment-parser": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.5.tgz",
-      "integrity": "sha512-aRDkn3uyIlCFfk5NUA+VdwMmMsh8JGhc4hapfV4yxymHGQ3BVskMQfoXGpCo5IoBuQ9tS5iiVKhCpTcB4pW4qw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12.0.0"
-      }
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1654,6 +1246,7 @@
       "version": "4.4.3",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
       "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -1769,31 +1362,21 @@
       "license": "MIT"
     },
     "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "iconv-lite": "^0.6.2"
-      }
-    },
     "node_modules/enhanced-resolve": {
-      "version": "5.18.4",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.4.tgz",
-      "integrity": "sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==",
+      "version": "5.20.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.20.1.tgz",
+      "integrity": "sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "tapable": "^2.3.0"
       },
       "engines": {
         "node": ">=10.13.0"
@@ -1808,16 +1391,10 @@
         "node": ">=6"
       }
     },
-    "node_modules/err-code": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
-      "license": "MIT"
-    },
     "node_modules/es-abstract": {
-      "version": "1.24.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.1.tgz",
-      "integrity": "sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==",
+      "version": "1.24.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.2.tgz",
+      "integrity": "sha512-2FpH9Q5i2RRwyEP1AylXe6nYLR5OhaJTZwmlcP0dL/+JCbgg7yyEo/sEK6HeGZRf3dFpWwThaRHVApXSkW3xeg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1904,16 +1481,16 @@
       }
     },
     "node_modules/es-iterator-helpers": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.2.tgz",
-      "integrity": "sha512-BrUQ0cPTB/IwXj23HtwHjS9n7O4h9FX94b4xc5zlTHxeLgTAdzYUDyy6KdExAl9lbN5rtfe44xpjpmj9grxs5w==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.3.2.tgz",
+      "integrity": "sha512-HVLACW1TppGYjJ8H6/jqH/pqOtKRw6wMlrB23xfExmFWxFquAIWCmwoLsOyN96K4a5KbmOf5At9ZUO3GZbetAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
+        "call-bind": "^1.0.9",
         "call-bound": "^1.0.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.24.1",
+        "es-abstract": "^1.24.2",
         "es-errors": "^1.3.0",
         "es-set-tostringtag": "^2.1.0",
         "function-bind": "^1.1.2",
@@ -1925,7 +1502,7 @@
         "has-symbols": "^1.1.0",
         "internal-slot": "^1.1.0",
         "iterator.prototype": "^1.1.5",
-        "safe-array-concat": "^1.1.3"
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2015,25 +1592,25 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.39.2",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz",
-      "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
+      "version": "9.39.4",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz",
+      "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.21.1",
+        "@eslint/config-array": "^0.21.2",
         "@eslint/config-helpers": "^0.4.2",
         "@eslint/core": "^0.17.0",
-        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.39.2",
+        "@eslint/eslintrc": "^3.3.5",
+        "@eslint/js": "9.39.4",
         "@eslint/plugin-kit": "^0.4.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
         "@types/estree": "^1.0.6",
-        "ajv": "^6.12.4",
+        "ajv": "^6.14.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
@@ -2052,7 +1629,7 @@
         "is-glob": "^4.0.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
+        "minimatch": "^3.1.5",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3"
       },
@@ -2090,66 +1667,6 @@
         "eslint": ">=6.0.0"
       }
     },
-    "node_modules/eslint-import-context": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/eslint-import-context/-/eslint-import-context-0.1.9.tgz",
-      "integrity": "sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "get-tsconfig": "^4.10.1",
-        "stable-hash-x": "^0.2.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint-import-context"
-      },
-      "peerDependencies": {
-        "unrs-resolver": "^1.0.0"
-      },
-      "peerDependenciesMeta": {
-        "unrs-resolver": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-import-resolver-typescript": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.10.1.tgz",
-      "integrity": "sha512-A1rHYb06zjMGAxdLSkN2fXPBwuSaQ0iO5M/hdyS0Ajj1VBaRp0sPD3dn1FhME3c/JluGFbwSxyCfqdSbtQLAHQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@nolyfill/is-core-module": "1.0.39",
-        "debug": "^4.4.0",
-        "get-tsconfig": "^4.10.0",
-        "is-bun-module": "^2.0.0",
-        "stable-hash": "^0.0.5",
-        "tinyglobby": "^0.2.13",
-        "unrs-resolver": "^1.6.2"
-      },
-      "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint-import-resolver-typescript"
-      },
-      "peerDependencies": {
-        "eslint": "*",
-        "eslint-plugin-import": "*",
-        "eslint-plugin-import-x": "*"
-      },
-      "peerDependenciesMeta": {
-        "eslint-plugin-import": {
-          "optional": true
-        },
-        "eslint-plugin-import-x": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/eslint-plugin-es-x": {
       "version": "7.8.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.8.0.tgz",
@@ -2172,64 +1689,10 @@
         "eslint": ">=8"
       }
     },
-    "node_modules/eslint-plugin-import-x": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.16.1.tgz",
-      "integrity": "sha512-vPZZsiOKaBAIATpFE2uMI4w5IRwdv/FpQ+qZZMR4E+PeOcM4OeoEbqxRMnywdxP19TyB/3h6QBB0EWon7letSQ==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@typescript-eslint/types": "^8.35.0",
-        "comment-parser": "^1.4.1",
-        "debug": "^4.4.1",
-        "eslint-import-context": "^0.1.9",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.3 || ^10.0.1",
-        "semver": "^7.7.2",
-        "stable-hash-x": "^0.2.0",
-        "unrs-resolver": "^1.9.2"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint-plugin-import-x"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/utils": "^8.0.0",
-        "eslint": "^8.57.0 || ^9.0.0",
-        "eslint-import-resolver-node": "*"
-      },
-      "peerDependenciesMeta": {
-        "@typescript-eslint/utils": {
-          "optional": true
-        },
-        "eslint-import-resolver-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-import-x/node_modules/minimatch": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
-      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/brace-expansion": "^5.0.0"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/eslint-plugin-n": {
-      "version": "17.23.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.23.2.tgz",
-      "integrity": "sha512-RhWBeb7YVPmNa2eggvJooiuehdL76/bbfj/OJewyoGT80qn5PXdz8zMOTO6YHOsI7byPt7+Ighh/i/4a5/v7hw==",
+      "version": "17.24.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.24.0.tgz",
+      "integrity": "sha512-/gC7/KAYmfNnPNOb3eu8vw+TdVnV0zhdQwexsw6FLXbhzroVj20vRn2qL8lDWDGnAQ2J8DhdfvXxX9EoxvERvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2528,9 +1991,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true,
       "license": "ISC"
     },
@@ -2567,18 +2030,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -2698,9 +2149,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.13.1",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.1.tgz",
-      "integrity": "sha512-EoY1N2xCn44xU6750Sx7OjOIT59FkmstNc3X6y5xpz7D5cBtZRe/3pSlTkDJgqsOk3WwZPkWfonhhUJfttQo3w==",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.0.tgz",
+      "integrity": "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2711,17 +2162,22 @@
       }
     },
     "node_modules/glob": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
-      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
-      "license": "BlueOak-1.0.0",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "minimatch": "^10.1.1",
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
         "minipass": "^7.1.2",
-        "path-scurry": "^2.0.0"
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
-      "engines": {
-        "node": "20 || >=22"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -2740,16 +2196,27 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
-      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
-      "license": "BlueOak-1.0.0",
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@isaacs/brace-expansion": "^5.0.0"
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.2"
       },
       "engines": {
-        "node": "20 || >=22"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -2893,9 +2360,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz",
+      "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2915,51 +2382,6 @@
         "he": "bin/he"
       }
     },
-    "node_modules/http-cache-semantics": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
-      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -2991,6 +2413,7 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
@@ -3011,15 +2434,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/ip-address": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
-      "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/is-array-buffer": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
@@ -3091,16 +2505,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-bun-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-2.0.0.tgz",
-      "integrity": "sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.7.1"
-      }
-    },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -3463,12 +2867,12 @@
       "license": "MIT"
     },
     "node_modules/isexe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
-      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-      "license": "ISC",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz",
+      "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==",
+      "license": "BlueOak-1.0.0",
       "engines": {
-        "node": ">=16"
+        "node": ">=20"
       }
     },
     "node_modules/iterator.prototype": {
@@ -3640,35 +3044,11 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "11.2.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.5.tgz",
-      "integrity": "sha512-vFrFJkWtJvJnD5hg+hJvVE8Lh/TcMzKnTgCWmtBipwI5yLX/iX+5UB2tfuyODF5E7k9xEzMdYgGqaSb1c0c5Yw==",
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/make-fetch-happen": {
-      "version": "15.0.3",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.3.tgz",
-      "integrity": "sha512-iyyEpDty1mwW3dGlYXAJqC/azFn5PPvgKVwXayOGBSmKLxhKZ9fg4qIan2ePpp1vJIwfFiO34LAPZgq9SZW9Aw==",
-      "license": "ISC",
-      "dependencies": {
-        "@npmcli/agent": "^4.0.0",
-        "cacache": "^20.0.1",
-        "http-cache-semantics": "^4.1.1",
-        "minipass": "^7.0.2",
-        "minipass-fetch": "^5.0.0",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^1.0.0",
-        "proc-log": "^6.0.0",
-        "promise-retry": "^2.0.1",
-        "ssri": "^13.0.0"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
@@ -3681,9 +3061,9 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -3694,133 +3074,14 @@
       }
     },
     "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "license": "ISC",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "license": "BlueOak-1.0.0",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/minipass-collect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
-      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/minipass-fetch": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-5.0.0.tgz",
-      "integrity": "sha512-fiCdUALipqgPWrOVTz9fw0XhcazULXOSU6ie40DDbX1F49p1dBrSRBuswndTx1x3vEb/g0FT7vC4c4C2u/mh3A==",
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^7.0.3",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^3.0.1"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      },
-      "optionalDependencies": {
-        "encoding": "^0.1.13"
-      }
-    },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minipass-flush/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-flush/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "license": "ISC"
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-pipeline/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-pipeline/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "license": "ISC"
-    },
-    "node_modules/minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-sized/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minipass-sized/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "license": "ISC"
-    },
     "node_modules/minizlib": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
@@ -3871,51 +3132,23 @@
       }
     },
     "node_modules/mocha/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/mocha/node_modules/glob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/mocha/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/mocha/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^2.0.2"
       },
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -3924,23 +3157,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/mocha/node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/mocha/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -3961,31 +3177,16 @@
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/nan": {
-      "version": "2.25.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.25.0.tgz",
-      "integrity": "sha512-0M90Ag7Xn5KMLLZ7zliPWP3rT90P6PN+IzVFS0VqmnPktBk3700xUVv8Ikm9EUaUE5SDWdp/BIxdENzVznpm1g==",
+      "version": "2.26.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz",
+      "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/napi-postinstall": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.4.tgz",
-      "integrity": "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "napi-postinstall": "lib/cli.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/napi-postinstall"
-      }
-    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -3993,48 +3194,54 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/negotiator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
-      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/neostandard": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/neostandard/-/neostandard-0.12.2.tgz",
-      "integrity": "sha512-VZU8EZpSaNadp3rKEwBhVD1Kw8jE3AftQLkCyOaM7bWemL1LwsYRsBnAmXy2LjG9zO8t66qJdqB7ccwwORyrAg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/neostandard/-/neostandard-0.13.0.tgz",
+      "integrity": "sha512-R3iglFr+Dla/8qFBqsMxBvcYBOgP6rAGw7uRHKMpM3bUP0wLDRzUstxtEI9RfEwn7xszE/UUnh8H090Ru4Z52A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
         "@stylistic/eslint-plugin": "2.11.0",
-        "eslint-import-resolver-typescript": "^3.10.1",
-        "eslint-plugin-import-x": "^4.16.1",
-        "eslint-plugin-n": "^17.20.0",
+        "eslint-plugin-n": "^17.23.2",
         "eslint-plugin-promise": "^7.2.1",
         "eslint-plugin-react": "^7.37.5",
-        "find-up": "^5.0.0",
-        "globals": "^15.15.0",
-        "peowly": "^1.3.2",
-        "typescript-eslint": "^8.35.1"
+        "find-up": "^8.0.0",
+        "globals": "^17.3.0",
+        "peowly": "^1.3.3",
+        "typescript-eslint": "^8.56.0"
       },
       "bin": {
         "neostandard": "cli.mjs"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "peerDependencies": {
         "eslint": "^9.0.0"
       }
     },
+    "node_modules/neostandard/node_modules/find-up": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-8.0.0.tgz",
+      "integrity": "sha512-JGG8pvDi2C+JxidYdIwQDyS/CgcrIdh18cvgxcBge3wSHRQOrooMD3GlFBcmMJAN9M42SAZjDp5zv1dglJjwww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^8.0.0",
+        "unicorn-magic": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/neostandard/node_modules/globals": {
-      "version": "15.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
-      "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
+      "version": "17.5.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.5.0.tgz",
+      "integrity": "sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4044,6 +3251,96 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/neostandard/node_modules/locate-path": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-8.0.0.tgz",
+      "integrity": "sha512-XT9ewWAC43tiAV7xDAPflMkG0qOPn2QjHqlgX8FOqmWa/rxnyYDulF9T0F7tRy1u+TVTmK/M//6VIOye+2zDXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/neostandard/node_modules/p-limit": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/neostandard/node_modules/p-locate": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/neostandard/node_modules/yocto-queue": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz",
+      "integrity": "sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/node-exports-info": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/node-exports-info/-/node-exports-info-1.6.0.tgz",
+      "integrity": "sha512-pyFS63ptit/P5WqUkt+UUfe+4oevH+bFeIiPPdfb0pFeYEu/1ELnJu5l+5EcTKYL5M7zaAa7S8ddywgXypqKCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array.prototype.flatmap": "^1.3.3",
+        "es-errors": "^1.3.0",
+        "object.entries": "^1.1.9",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/node-exports-info/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/nopt": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz",
@@ -4235,18 +3532,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-map": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
-      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/package-json-from-dist": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
@@ -4295,29 +3580,31 @@
       "license": "MIT"
     },
     "node_modules/path-scurry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
-      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "lru-cache": "^11.0.0",
-        "minipass": "^7.1.2"
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
-        "node": "20 || >=22"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/peowly": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/peowly/-/peowly-1.3.2.tgz",
-      "integrity": "sha512-BYIrwr8JCXY49jUZscgw311w9oGEKo7ux/s+BxrhKTQbiQ0iYNdZNJ5LgagaeercQdFHwnR7Z5IxxFWVQ+BasQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/peowly/-/peowly-1.3.3.tgz",
+      "integrity": "sha512-5UmUtvuCv3KzBX2NuQw2uF28o0t8Eq4KkPRZfUCzJs+DiNVKw7OaYn29vNDgrt/Pggs23CPlSTqgzlhHJfpT0A==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=18.6.0"
+        "node": ">=18.6.0",
+        "typescript": ">=5.8"
       }
     },
     "node_modules/picocolors": {
@@ -4328,9 +3615,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -4368,19 +3655,6 @@
         "node": "^20.17.0 || >=22.9.0"
       }
     },
-    "node_modules/promise-retry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-      "license": "MIT",
-      "dependencies": {
-        "err-code": "^2.0.2",
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/prop-types": {
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
@@ -4499,19 +3773,25 @@
       }
     },
     "node_modules/resolve": {
-      "version": "2.0.0-next.5",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
-      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+      "version": "2.0.0-next.6",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.6.tgz",
+      "integrity": "sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "es-errors": "^1.3.0",
+        "is-core-module": "^2.16.1",
+        "node-exports-info": "^1.6.0",
+        "object-keys": "^1.1.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -4536,25 +3816,16 @@
         "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
       }
     },
-    "node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/safe-array-concat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
-      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.4.tgz",
+      "integrity": "sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
+        "call-bind": "^1.0.9",
+        "call-bound": "^1.0.4",
+        "get-intrinsic": "^1.3.0",
         "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
@@ -4621,17 +3892,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -4743,14 +4007,14 @@
       }
     },
     "node_modules/side-channel-list": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz",
+      "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
+        "object-inspect": "^1.13.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4811,73 +4075,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks": {
-      "version": "2.8.7",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
-      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
-      "license": "MIT",
-      "dependencies": {
-        "ip-address": "^10.0.1",
-        "smart-buffer": "^4.2.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
-      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "^4.3.4",
-        "socks": "^2.8.3"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/ssri": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-13.0.0.tgz",
-      "integrity": "sha512-yizwGBpbCn4YomB2lzhZqrHLJoqFGXihNbib3ozhqF/cIp5ue+xSmOQrjNasEE62hFxsCcg/V/z23t4n8jMEng==",
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
-    "node_modules/stable-hash": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.5.tgz",
-      "integrity": "sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/stable-hash-x": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/stable-hash-x/-/stable-hash-x-0.2.0.tgz",
-      "integrity": "sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
     "node_modules/stop-iteration-iterator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
@@ -4893,6 +4090,25 @@
       }
     },
     "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
@@ -4907,17 +4123,31 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-width-cjs": {
-      "name": "string-width",
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
         "node": ">=8"
@@ -5022,16 +4252,19 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "ansi-regex": "^6.2.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/strip-ansi-cjs": {
@@ -5048,6 +4281,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -5088,9 +4331,9 @@
       }
     },
     "node_modules/tapable": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
-      "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz",
+      "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5102,9 +4345,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.7.tgz",
-      "integrity": "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==",
+      "version": "7.5.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.13.tgz",
+      "integrity": "sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",
@@ -5118,13 +4361,13 @@
       }
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "version": "0.2.16",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
+      "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
+        "picomatch": "^4.0.4"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -5134,9 +4377,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
-      "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
+      "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5169,14 +4412,6 @@
         "typescript": ">=4.0.0"
       }
     },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true,
-      "license": "0BSD",
-      "optional": true
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -5269,11 +4504,12 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -5283,16 +4519,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.54.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.54.0.tgz",
-      "integrity": "sha512-CKsJ+g53QpsNPqbzUsfKVgd3Lny4yKZ1pP4qN3jdMOg/sisIDLGyDMezycquXLE5JsEU0wp3dGNdzig0/fmSVQ==",
+      "version": "8.59.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.59.0.tgz",
+      "integrity": "sha512-BU3ONW9X+v90EcCH9ZS6LMackcVtxRLlI3XrYyqZIwVSHIk7Qf7bFw1z0M9Q0IUxhTMZCf8piY9hTYaNEIASrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.54.0",
-        "@typescript-eslint/parser": "8.54.0",
-        "@typescript-eslint/typescript-estree": "8.54.0",
-        "@typescript-eslint/utils": "8.54.0"
+        "@typescript-eslint/eslint-plugin": "8.59.0",
+        "@typescript-eslint/parser": "8.59.0",
+        "@typescript-eslint/typescript-estree": "8.59.0",
+        "@typescript-eslint/utils": "8.59.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5302,8 +4538,8 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <6.0.0"
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/unbox-primitive": {
@@ -5325,63 +4561,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/unique-filename": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-5.0.0.tgz",
-      "integrity": "sha512-2RaJTAvAb4owyjllTfXzFClJ7WsGxlykkPvCr9pA//LD9goVq+m4PPAeBgNodGZ7nSrntT/auWpJ6Y5IFXcfjg==",
-      "license": "ISC",
-      "dependencies": {
-        "unique-slug": "^6.0.0"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
-    "node_modules/unique-slug": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-6.0.0.tgz",
-      "integrity": "sha512-4Lup7Ezn8W3d52/xBhZBVdx323ckxa7DEvd9kPQHppTkLoJXw6ltrBCyj5pnrxj0qKDxYMJ56CoxNuFCscdTiw==",
-      "license": "ISC",
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      },
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
-    "node_modules/unrs-resolver": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
-      "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
-      "dev": true,
-      "hasInstallScript": true,
+    "node_modules/undici": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-6.25.0.tgz",
+      "integrity": "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg==",
       "license": "MIT",
-      "dependencies": {
-        "napi-postinstall": "^0.3.0"
+      "engines": {
+        "node": ">=18.17"
+      }
+    },
+    "node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://opencollective.com/unrs-resolver"
-      },
-      "optionalDependencies": {
-        "@unrs/resolver-binding-android-arm-eabi": "1.11.1",
-        "@unrs/resolver-binding-android-arm64": "1.11.1",
-        "@unrs/resolver-binding-darwin-arm64": "1.11.1",
-        "@unrs/resolver-binding-darwin-x64": "1.11.1",
-        "@unrs/resolver-binding-freebsd-x64": "1.11.1",
-        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
-        "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
-        "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
-        "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
-        "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
-        "@unrs/resolver-binding-linux-x64-musl": "1.11.1",
-        "@unrs/resolver-binding-wasm32-wasi": "1.11.1",
-        "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
-        "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
-        "@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/uri-js": {
@@ -5395,12 +4594,12 @@
       }
     },
     "node_modules/which": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-6.0.0.tgz",
-      "integrity": "sha512-f+gEpIKMR9faW/JgAgPK1D7mekkFoqbmiwvNzuhsHetni20QSgzg9Vhn0g2JSJkkfehQnqdUAx7/e15qS1lPxg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz",
+      "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==",
       "license": "ISC",
       "dependencies": {
-        "isexe": "^3.1.1"
+        "isexe": "^4.0.0"
       },
       "bin": {
         "node-which": "bin/which.js"
@@ -5516,18 +4715,18 @@
       "license": "Apache-2.0"
     },
     "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -5552,6 +4751,64 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
@@ -5616,6 +4873,51 @@
         "node": ">=10"
       }
     },
+    "node_modules/yargs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/pkgs/by-name/no/node-gyp/package.nix b/pkgs/by-name/no/node-gyp/package.nix
index 0255156bccaf..71bb7778ddd4 100644
--- a/pkgs/by-name/no/node-gyp/package.nix
+++ b/pkgs/by-name/no/node-gyp/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "node-gyp";
-  version = "12.2.0";
+  version = "12.3.0";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "node-gyp";
     tag = "v${version}";
-    hash = "sha256-0XTv7kDc5Mt7e4VuVQeuJusIxwQzePm4PaE9ms6oRoM=";
+    hash = "sha256-+QPQxWrO2n5QsyAmM5UfL/posEyQQGHmDG7EL0jBNeE=";
   };
 
-  npmDepsHash = "sha256-MflhEEUuzhXb6HTdnz2pvfZJN5w4/dAQ6Cw/C5jSbLs=";
+  npmDepsHash = "sha256-43YHmebfSYNb7glSjycQqjnLY13Bp9syXRAWNDjBIXY=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/no/node-red/package.nix b/pkgs/by-name/no/node-red/package.nix
index 8d34b98d578a..d85af08c4590 100644
--- a/pkgs/by-name/no/node-red/package.nix
+++ b/pkgs/by-name/no/node-red/package.nix
@@ -27,7 +27,7 @@ buildNpmPackage rec {
       packageDir = "packages/node_modules/node-red";
     in
     ''
-      ${lib.getExe jq} '. += {"bin": {"node-red": "${packageDir}/red.js", "node-red-pi": "${packageDir}/bin/node-red-pi"}}' package.json > package.json.tmp
+      jq '. += {"bin": {"node-red": "${packageDir}/red.js", "node-red-pi": "${packageDir}/bin/node-red-pi"}}' package.json > package.json.tmp
       mv package.json.tmp package.json
     '';
 
diff --git a/pkgs/by-name/no/nodezator/package.nix b/pkgs/by-name/no/nodezator/package.nix
index c105468a7bda..c92e472d007c 100644
--- a/pkgs/by-name/no/nodezator/package.nix
+++ b/pkgs/by-name/no/nodezator/package.nix
@@ -28,8 +28,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Generalist Python node editor";
     homepage = "https://nodezator.com";
-    downloadPage = "https://github.com/IndiePython/nodezator";
-    changelog = "https://github.com/IndiePython/nodezator/releases/tag/v${finalAttrs.version}";
+    downloadPage = "https://github.com/IndieSmiths/nodezator";
+    changelog = "https://github.com/IndieSmiths/nodezator/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ theobori ];
     mainProgram = "nodezator";
diff --git a/pkgs/by-name/no/nominatim/nominatim-api.nix b/pkgs/by-name/no/nominatim/nominatim-api.nix
index 762257db1d96..76f481f49c73 100644
--- a/pkgs/by-name/no/nominatim/nominatim-api.nix
+++ b/pkgs/by-name/no/nominatim/nominatim-api.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nominatim";
-  version = "5.3.1";
+  version = "5.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "Nominatim";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3WU8n121JbFFZTntcKG6t0x2mC1AzI97q/fMe/UTGTs=";
+    hash = "sha256-jP/OkEuFdVdvA8Uztv/49FXm9dsExVDjw2l2gyMOSsg=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/no/nono/package.nix b/pkgs/by-name/no/nono/package.nix
index 047da60943cc..7bfc52646cc8 100644
--- a/pkgs/by-name/no/nono/package.nix
+++ b/pkgs/by-name/no/nono/package.nix
@@ -13,15 +13,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nono";
-  version = "0.35.0";
+  version = "0.43.1";
+
+  __darwinAllowLocalNetworking = true; # required for tests
 
   src = fetchFromGitHub {
     owner = "always-further";
     repo = "nono";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/bKquUbVMM1e/YPcuSb0vW4tX/3yNDUxmaBWHKFw+Qs=";
+    hash = "sha256-a9RwEbe0x49EyBSGX0mBk2GNeWmc6NhanExqbDyTM40=";
   };
-  cargoHash = "sha256-ibGIpH6Ls9nxtF6rRl+dZBbbmVRXDQA6vpPI/jzpDqI=";
+  cargoHash = "sha256-/+CfiWbg3anUbzgGigFxWs0+KavGEa2odo5kBF9c7Wg=";
 
   nativeBuildInputs = [
     pkg-config
@@ -35,7 +37,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+  checkFlags = [
+    # fails to initialize the sandbox under '/build'
+    "--skip=test_all_profiles_signal_mode_resolves"
+    # panic
+    "--skip=build_run_profile_patch_adds_override_deny_for_sensitive_file"
+    "--skip=build_run_profile_patch_merges_read_and_write_to_allow_file"
+    "--skip=prepare_profile_save_from_patch_updates_existing_user_profile"
+    "--skip=would_shadow_builtin_allows_update_of_existing_user_override"
+    "--skip=would_shadow_builtin_flags_known_builtin_names"
+    "--skip=create_audit_state_creates_session_when_enabled"
+
+    # audit_attestation
+    # needs /bin/pwd
+    "--skip=audit_verify_reports_signed_attestation_with_pinned_public_key"
+    "--skip=rollback_signed_session_verifies_from_audit_dir_bundle"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # panics with "Deny-within-allow overlap on Linux ... Landlock cannot enforce this. ..."
     # landlock is linux only
     "--skip=policy::tests::test_all_groups_no_deny_within_allow_overlap"
@@ -56,6 +74,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=env_nono_upstream_bypass_comma_separated"
     "--skip=env_nono_upstream_proxy"
     "--skip=legacy_env_nono_net_block_still_works"
+    "--skip=environment_allow_vars_bare_star"
+    "--skip=environment_allow_vars_default_allows_all"
+    "--skip=environment_allow_vars_prefix_patterns"
+    "--skip=environment_allow_vars_with_profile"
   ];
 
   meta = {
diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix
index e4d419d43f50..e6a3da9b82b4 100644
--- a/pkgs/by-name/no/normcap/package.nix
+++ b/pkgs/by-name/no/normcap/package.nix
@@ -70,7 +70,6 @@ ps.buildPythonApplication (finalAttrs: {
   preFixup = ''
     makeWrapperArgs+=(
       "''${qtWrapperArgs[@]}"
-      --set QT_QPA_PLATFORM xcb
       --prefix PATH : ${lib.makeBinPath wrapperDeps}
     )
   ''
diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix
index 2c1973f7c623..df3f9b4b74c4 100644
--- a/pkgs/by-name/no/notesnook/package.nix
+++ b/pkgs/by-name/no/notesnook/package.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "notesnook";
-  version = "3.3.14";
+  version = "3.3.15";
 
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "Unsupported system: ${system}";
@@ -27,10 +27,10 @@ let
     url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}";
     hash =
       {
-        x86_64-linux = "sha256-fI9EI+XltHztwqVLLzHW49NqXNrxw4xZ1nxjEoz3D2o=";
-        aarch64-linux = "sha256-efg+g2ROR7rlWrcmeqL4y+YgbrOP/9Ylr5RqiLtMCNY=";
-        x86_64-darwin = "sha256-+cbrTM1w2nOROJvJOr4NBYyXw583aa3xOwYZVf10BCs=";
-        aarch64-darwin = "sha256-70EB93WXp8ds3izCvaAetmZgIq1PMNCTXXAgBcH1DSM=";
+        x86_64-linux = "sha256-CGFLiDxhr9VC9U1fppjJX/x0ZWgDWKPymLY4LJAnGxY=";
+        aarch64-linux = "sha256-dqpYjvxjSb/rSJ4wLJsPGPzdPPOxzpa8LUsdqlPzT/M=";
+        x86_64-darwin = "sha256-hLKA3z1HDhPzMCBVxDl05DsDexG73rcKHhR5ERQCgJo=";
+        aarch64-darwin = "sha256-j1SQ/hn/IZ7aZQiIx6UgkOSxs6vqPGS0y4AXkXWcFGM=";
       }
       .${system} or throwSystem;
   };
diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix
index 60993705765a..46142ce9937b 100644
--- a/pkgs/by-name/no/notion/package.nix
+++ b/pkgs/by-name/no/notion/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
           xmessage
           xterm
         ]
-      }" \
+      }"
   '';
 
   meta = {
diff --git a/pkgs/by-name/no/nova/package.nix b/pkgs/by-name/no/nova/package.nix
index 68a0051ce97e..5aeac180d200 100644
--- a/pkgs/by-name/no/nova/package.nix
+++ b/pkgs/by-name/no/nova/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nova";
-  version = "3.11.14";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "nova";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-leMDcw17rD08zIcJ9mkcD0VJE0o8pS6F31nFjDLT67Q=";
+    hash = "sha256-eIsysSJw090BdGNG/5rPqwCE7Ci2HiKWEw+Gx9UXHYQ=";
   };
 
-  vendorHash = "sha256-OICuGfnMkx25GL5aoaozselXgJxOZt3vANCSan2ZGs8=";
+  vendorHash = "sha256-nXzJkcUbIGVxnuyx51NeXOI9Y/D/Fg/TkmrH7MLYzfQ=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"
diff --git a/pkgs/by-name/no/noxdir/package.nix b/pkgs/by-name/no/noxdir/package.nix
index a0aee71d00aa..57f8daa9de4e 100644
--- a/pkgs/by-name/no/noxdir/package.nix
+++ b/pkgs/by-name/no/noxdir/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "noxdir";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "crumbyte";
     repo = "noxdir";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Dq8u2h5l95ZQ7DEi60G8IAeF9kwYQY0KUxq3lq9e3Tk=";
+    hash = "sha256-xq0oXMsJlhstiLK0VIYqwg7fK1ERwzOGtV8McqCX9G8=";
   };
 
-  vendorHash = "sha256-Wg1v2oAbaj7gWgj2AgDPZHdsDebgDs8Xcyvo3QYZ1dU=";
+  vendorHash = "sha256-citZvLDKdhkWma3XKSfMvPOTo1xEpZhovkWTsMTyO+k=";
 
   checkPhase = ''
     runHook preCheck
diff --git a/pkgs/by-name/nt/ntfs3g/package.nix b/pkgs/by-name/nt/ntfs3g/package.nix
index df33a3abac77..7bda93b3c434 100644
--- a/pkgs/by-name/nt/ntfs3g/package.nix
+++ b/pkgs/by-name/nt/ntfs3g/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ntfs3g";
-  version = "2022.10.3";
+  version = "2026.2.25";
 
   outputs = [
     "out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "tuxera";
     repo = "ntfs-3g";
     rev = version;
-    sha256 = "sha256-nuFTsGkm3zmSzpwmhyY7Ke0VZfZU0jHOzEWaLBbglQk=";
+    sha256 = "sha256-uiVh87ExLXq94NVqR8MEg7Lrvamm6MrH+qP3Nosii5c=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/nt/ntfy-sh/package.nix b/pkgs/by-name/nt/ntfy-sh/package.nix
index 91da75ffc29b..6f90ad89499c 100644
--- a/pkgs/by-name/nt/ntfy-sh/package.nix
+++ b/pkgs/by-name/nt/ntfy-sh/package.nix
@@ -17,7 +17,7 @@ buildGoModule (
     ui = buildNpmPackage {
       inherit (finalAttrs) src version;
       pname = "ntfy-sh-ui";
-      npmDepsHash = "sha256-p6zuQ8UE121OPLRBK8rUlZ64aBVWp/9Hgx9dx2Mzya8=";
+      npmDepsHash = "sha256-sIlEGN6zpbwQdW5HBI6F42nV6k7xapzsNfFujhohyYk=";
 
       prePatch = ''
         cd web/
@@ -37,16 +37,16 @@ buildGoModule (
   in
   {
     pname = "ntfy-sh";
-    version = "2.21.0";
+    version = "2.22.0";
 
     src = fetchFromGitHub {
       owner = "binwiederhier";
       repo = "ntfy";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-x05z9CU4mzZ8FGe4++EoUWeUWv+wBNN8hyYz6u3SoU8=";
+      hash = "sha256-TcxXlAAihVbvdeTHMU4Z2f1ySiNIjX5Gogcq8JlWUa0=";
     };
 
-    vendorHash = "sha256-jLMZnah0vI/VlRuMSVzSTGdPVJgM6VM0y8kmQKvbRAs=";
+    vendorHash = "sha256-d96NzjYDG7EyriTYgHHvxC7LRXawud0cgj1Rqr1DXus=";
 
     doCheck = false;
 
diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index 4dc9ff7a40bc..f397f6026a72 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "nu_scripts";
-  version = "0-unstable-2026-04-18";
+  version = "0-unstable-2026-04-27";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nu_scripts";
-    rev = "c5387bd60ca63d26885ee73ceb8a84160bc6ca6b";
-    hash = "sha256-QPKgVj5tWwgwspCQYwjPBJZLTHm2e3AuneOK+hI6qUg=";
+    rev = "32cd1d53649bc024edd65326a5b988cd7bcf4810";
+    hash = "sha256-t8OCSDI7MqA9Q9Tv4mjd/yRac2SZvhX2x8rfcbIUT9o=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/nu/nuget-to-json/nuget-to-json.sh b/pkgs/by-name/nu/nuget-to-json/nuget-to-json.sh
index c4c5a8d9456b..111899dac47f 100755
--- a/pkgs/by-name/nu/nuget-to-json/nuget-to-json.sh
+++ b/pkgs/by-name/nu/nuget-to-json/nuget-to-json.sh
@@ -61,9 +61,9 @@ done
                 continue
             fi
 
-            # packages in the nix store should have an empty metadata file
+            # packages in the nix store should have a metadata file without 'version' (see createNupkgMetadata)
             # packages installed with 'dotnet tool' may be missing 'source'
-            used_source="$(jq -r 'if has("source") then .source elif has("contentHash") then "__unknown" else "" end' "$version"/.nupkg.metadata)"
+            used_source="$(jq -r 'if has("source") then .source elif has("version") then "__unknown" else "" end' "$version"/.nupkg.metadata)"
             found=false
 
             if [[ -z "$used_source" || -d "$used_source" ]]; then
diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix
index da8157b807dc..f0b3bd6e859f 100644
--- a/pkgs/by-name/nv/nvc/package.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nvc";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchFromGitHub {
     owner = "nickg";
     repo = "nvc";
     tag = "r${finalAttrs.version}";
-    hash = "sha256-DtJyGzrs6G1eZ9xFgBp/2PLlzMiRp/ePTINv0lLZauw=";
+    hash = "sha256-IFuJvNOHE5qOjWgTbi5Ba5fUgEbM4FzNJRoZApnoaKw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/nv/nvidia-modprobe/package.nix b/pkgs/by-name/nv/nvidia-modprobe/package.nix
index 09e2752e1576..b1c9c7f9c0d9 100644
--- a/pkgs/by-name/nv/nvidia-modprobe/package.nix
+++ b/pkgs/by-name/nv/nvidia-modprobe/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "nvidia-modprobe";
-  version = "590.48.01";
+  version = "595.71.05";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nvidia-modprobe";
     rev = finalAttrs.version;
-    hash = "sha256-Vtp5FDDmzbwtDe11O0w/S8Mptpp8Li21/gBfJzfE0/g=";
+    hash = "sha256-XVWvnUZkEqEh3UjPIU6DaZuYU9DvjfIMsWbLJ78jJWs=";
   };
 
   nativeBuildInputs = [ gnum4 ];
diff --git a/pkgs/by-name/nx/nxv/package.nix b/pkgs/by-name/nx/nxv/package.nix
index a3988b8835f1..13b420dc4059 100644
--- a/pkgs/by-name/nx/nxv/package.nix
+++ b/pkgs/by-name/nx/nxv/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.1.4";
 
   src = fetchFromGitHub {
-    owner = "jamesbrink";
+    owner = "utensils";
     repo = "nxv";
     tag = "v${finalAttrs.version}";
     hash = "sha256-714babrR7inR+zkFSk8eqho4GIvUn6ITj7S54i5UcBI=";
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       commit to use with `nix shell nixpkgs/<commit>#package`.
     '';
     homepage = "https://nxv.urandom.io";
-    changelog = "https://github.com/jamesbrink/nxv/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/utensils/nxv/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ yiyu ];
     mainProgram = "nxv";
diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix
index fa52d77f1d05..0826cf12af56 100644
--- a/pkgs/by-name/nz/nzbhydra2/package.nix
+++ b/pkgs/by-name/nz/nzbhydra2/package.nix
@@ -35,16 +35,16 @@ let
 in
 maven.buildMavenPackage rec {
   pname = "nzbhydra2";
-  version = "8.5.4";
+  version = "8.8.0";
 
   src = fetchFromGitHub {
     owner = "theotherp";
     repo = "nzbhydra2";
     tag = "v${version}";
-    hash = "sha256-chP++0ve734wOO7qNy4f+4KyYgBWlkzjaMJiueW4LkM=";
+    hash = "sha256-BndOpHEcesrfequErt193F3Bapm8E4jwZ9gPxuvWDi0=";
   };
 
-  mvnHash = "sha256-dodZT40zNqfaPd8VxfNYY10VrFNlL4xESDdTrgcFaaY=";
+  mvnHash = "sha256-mZ/mOF9k5URheNNxmrKkCiklP26zeTGKhDGxqRiDBuk=";
 
   mvnFetchExtraArgs.preBuild = ''
     mvn -nsu "${timestampParameter}" --projects org.nzbhydra:github-release-plugin "-Dmaven.repo.local=$out/.m2" clean install
diff --git a/pkgs/by-name/oa/oapi-codegen/package.nix b/pkgs/by-name/oa/oapi-codegen/package.nix
index ce99048914e9..8cf386b198fe 100644
--- a/pkgs/by-name/oa/oapi-codegen/package.nix
+++ b/pkgs/by-name/oa/oapi-codegen/package.nix
@@ -26,8 +26,8 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Go client and server OpenAPI 3 generator";
-    homepage = "https://github.com/deepmap/oapi-codegen";
-    changelog = "https://github.com/deepmap/oapi-codegen/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/oapi-codegen/oapi-codegen";
+    changelog = "https://github.com/oapi-codegen/oapi-codegen/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ j4m3s ];
     mainProgram = "oapi-codegen";
diff --git a/pkgs/by-name/oa/oauth2c/package.nix b/pkgs/by-name/oa/oauth2c/package.nix
index 666b24ea1828..7482bd8751e8 100644
--- a/pkgs/by-name/oa/oauth2c/package.nix
+++ b/pkgs/by-name/oa/oauth2c/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "oauth2c";
-  version = "1.19.0";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "cloudentity";
     repo = "oauth2c";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Bh4gWskmY2nWTckUT1FX7vRDz/gg670A77CQTZhz3mg=";
+    hash = "sha256-l/fXorXE4+6n7qQM2c2pJssNq3DKaxOjapdfNlXuAWg=";
   };
 
-  vendorHash = "sha256-I2pOyjKghvHHGEuVqODhysD++f2hD+BF7WJxWbrLcWA=";
+  vendorHash = "sha256-+Y8AStkbaecVdosfWlEmO53Y5aC13zfzlDOeMO91Lw0=";
 
   doCheck = false; # tests want to talk to oauth2c.us.authz.cloudentity.io
 
diff --git a/pkgs/by-name/ob/obconf/package.nix b/pkgs/by-name/ob/obconf/package.nix
index 48e02703fbc6..c98bc820b7d0 100644
--- a/pkgs/by-name/ob/obconf/package.nix
+++ b/pkgs/by-name/ob/obconf/package.nix
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "GUI configuration tool for openbox";
-    homepage = "http://openbox.org/wiki/ObConf";
-    changelog = "http://openbox.org/wiki/ObConf:Changelog";
+    homepage = "https://openbox.org/obconf";
+    changelog = "https://openbox.org/obconf_changelog";
     license = lib.licenses.gpl2Plus;
     maintainers = [ lib.maintainers.sfrijters ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ob/obliteratus/package.nix b/pkgs/by-name/ob/obliteratus/package.nix
new file mode 100644
index 000000000000..71e950eb9c22
--- /dev/null
+++ b/pkgs/by-name/ob/obliteratus/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication (finalAttrs: {
+  pname = "obliteratus";
+  version = "0.1.2-unstable-2026-03-05";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "elder-plinius";
+    repo = "OBLITERATUS";
+    rev = "984ce140592a9385347934f9ca647413ba9fac76";
+    hash = "sha256-U5DcRC1/IEQRlBGLIfsCX48ZCxPkpzEhg8qIw3ytJps=";
+  };
+
+  __structuredAttrs = true;
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    accelerate
+    bitsandbytes
+    datasets
+    matplotlib
+    numpy
+    pandas
+    pyyaml
+    rich
+    safetensors
+    scikit-learn
+    seaborn
+    torch
+    tqdm
+    transformers
+  ];
+
+  optional-dependencies = with python3.pkgs; {
+    spaces = [ gradio ];
+  };
+
+  nativeCheckInputs = with python3.pkgs; [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+  # This increases the build time significantly
+  # ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
+
+  pythonImportsCheck = [ "obliteratus" ];
+
+  meta = {
+    description = "Ablation Suite for HuggingFace transformers";
+    homepage = "https://github.com/elder-plinius/OBLITERATUS";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "obliteratus";
+  };
+})
diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index 0e8ae3f64604..a393bb78e132 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -26,14 +26,14 @@ in
 
 py.pkgs.buildPythonApplication (finalAttrs: {
   pname = "oci-cli";
-  version = "3.79.0";
+  version = "3.80.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VEGfIIUZj8Ee6XZMzKxltPczFBoC6bg1U+06vMhkGpg=";
+    hash = "sha256-ss7nKT4dIyJxJNBK8HgAPXG0lS5MMZw7sw8hPjLqYUQ=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/oc/ocis/package.nix b/pkgs/by-name/oc/ocis/package.nix
index 2746044094ea..3ac64c834ce4 100644
--- a/pkgs/by-name/oc/ocis/package.nix
+++ b/pkgs/by-name/oc/ocis/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  applyPatches,
   buildGoModule,
   callPackage,
   gnumake,
@@ -36,11 +37,20 @@ buildGoModule rec {
 
   vendorHash = null;
 
-  src = fetchFromGitHub {
-    owner = "owncloud";
-    repo = "ocis";
-    tag = "v${version}";
-    hash = "sha256-TsMrQx+P1F2t66e0tGG0VvRi4W7+pCpDHd0aNsacOsI=";
+  src = applyPatches {
+    src = fetchFromGitHub {
+      owner = "owncloud";
+      repo = "ocis";
+      tag = "v${version}";
+      hash = "sha256-TsMrQx+P1F2t66e0tGG0VvRi4W7+pCpDHd0aNsacOsI=";
+    };
+    patches = [
+      # Remove the kpop dependency, whose upstream tarball
+      # (https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz) is no longer
+      # available. Adapted from the upstream fix in v8.0.1
+      # (https://github.com/owncloud/ocis/pull/12043).
+      ./remove-kpop.patch
+    ];
   };
 
   nativeBuildInputs = [
@@ -58,8 +68,8 @@ buildGoModule rec {
       ;
     pnpm = pnpm_9;
     sourceRoot = "${src.name}/services/idp";
-    fetcherVersion = 1;
-    hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs=";
+    fetcherVersion = 3;
+    hash = "sha256-5iRnRxFJAWePyx83464guOqBqmao2pybaC4sFVPCOqk=";
   };
   pnpmRoot = "services/idp";
 
diff --git a/pkgs/by-name/oc/ocis/remove-kpop.patch b/pkgs/by-name/oc/ocis/remove-kpop.patch
new file mode 100644
index 000000000000..1db2be43546a
--- /dev/null
+++ b/pkgs/by-name/oc/ocis/remove-kpop.patch
@@ -0,0 +1,107 @@
+--- a/services/idp/package.json	2026-04-24 21:57:00.890593062 +0300
++++ b/services/idp/package.json	2026-04-24 21:57:25.907633711 +0300
+@@ -7,7 +7,7 @@
+     "analyze": "source-map-explorer 'build/static/js/*.js'",
+     "build": "node --openssl-legacy-provider scripts/build.js && rm -f build/service-worker.js",
+     "licenses": "NODE_PATH=./node_modules node ../scripts/js-license-ranger.js",
+-    "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL;ODC-By-1.0;BlueOak-1.0.0'  --excludePackages 'identifier;kpop;unicoderegexp' --clarificationsFile license-checker-clarifications.json",
++    "licenses:check": "license-checker-rseidelsohn --summary --relativeLicensePath --onlyAllow 'Python-2.0;Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL;ODC-By-1.0;BlueOak-1.0.0'  --excludePackages 'identifier;unicoderegexp' --clarificationsFile license-checker-clarifications.json",
+     "licenses:csv": "license-checker-rseidelsohn --relativeLicensePath --csv --out ../../third-party-licenses/node/idp/third-party-licenses.csv",
+     "licenses:save": "license-checker-rseidelsohn --relativeLicensePath --out /dev/null --files ../../third-party-licenses/node/idp/third-party-licenses",
+     "lint": "eslint ./**/*.{tsx,ts,jsx,js}",
+@@ -89,7 +89,6 @@
+     "i18next-browser-languagedetector": "^7.1.0",
+     "i18next-http-backend": "^2.2.2",
+     "i18next-resources-to-backend": "^1.1.4",
+-    "kpop": "https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz",
+     "query-string": "^8.1.0",
+     "react": "^17.0.2",
+     "react-app-polyfill": "^2.0.0",
+@@ -153,10 +152,5 @@
+     "webpack": "4.47.0",
+     "webpack-manifest-plugin": "4.1.1",
+     "workbox-webpack-plugin": "7.0.0"
+-  },
+-  "pnpm": {
+-    "overrides": {
+-      "kpop>cldr": ""
+-    }
+   }
+ }
+--- a/services/idp/pnpm-lock.yaml	2026-04-24 21:57:00.893597991 +0300
++++ b/services/idp/pnpm-lock.yaml	2026-04-24 21:59:04.272001217 +0300
+@@ -4,9 +4,6 @@
+   autoInstallPeers: true
+   excludeLinksFromLockfile: false
+ 
+-overrides:
+-  kpop>cldr: ''
+-
+ dependencies:
+   '@fontsource/roboto':
+     specifier: ^5.0.8
+@@ -62,9 +59,6 @@
+   i18next-resources-to-backend:
+     specifier: ^1.1.4
+     version: 1.1.4
+-  kpop:
+-    specifier: https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz
+-    version: '@download.kopano.io/community/kapp+/kpop-2.2.0.tgz(@gluejs/glue@0.3.0)(@material-ui/core@4.12.4)(@material-ui/icons@4.11.3)(notistack@0.8.9)(oidc-client@1.11.5)(react-dom@17.0.2)(react-intl@2.9.0)(react@17.0.2)(render-if@0.1.1)'
+   query-string:
+     specifier: ^8.1.0
+     version: 8.1.0
+@@ -12515,34 +12509,3 @@
+     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+     engines: {node: '>=10'}
+ 
+-  '@download.kopano.io/community/kapp+/kpop-2.2.0.tgz(@gluejs/glue@0.3.0)(@material-ui/core@4.12.4)(@material-ui/icons@4.11.3)(notistack@0.8.9)(oidc-client@1.11.5)(react-dom@17.0.2)(react-intl@2.9.0)(react@17.0.2)(render-if@0.1.1)':
+-    resolution: {registry: https://registry.npmjs.org/, tarball: https://download.kopano.io/community/kapp:/kpop-2.2.0.tgz}
+-    id: '@download.kopano.io/community/kapp+/kpop-2.2.0.tgz'
+-    name: kpop
+-    version: 2.2.0
+-    engines: {node: '>=6.11.0'}
+-    peerDependencies:
+-      '@gluejs/glue': ^0.3.0
+-      '@material-ui/core': ^4.8.0
+-      '@material-ui/icons': ^4.5.1
+-      notistack: ^0.8.8
+-      oidc-client: ^1.9.1
+-      react: ^16.8.0
+-      react-dom: ^16.8.0
+-      react-intl: ^2.6.0
+-      render-if: ^0.1.1
+-    dependencies:
+-      '@gluejs/glue': 0.3.0
+-      '@material-ui/core': 4.12.4(@types/react@17.0.65)(react-dom@17.0.2)(react@17.0.2)
+-      '@material-ui/icons': 4.11.3(@material-ui/core@4.12.4)(@types/react@17.0.65)(react-dom@17.0.2)(react@17.0.2)
+-      cldr: 7.5.0
+-      crc32: 0.2.2
+-      hsv-rgb: 1.0.0
+-      iso-639-1: 2.1.15
+-      notistack: 0.8.9(@material-ui/core@4.12.4)(react-dom@17.0.2)(react@17.0.2)
+-      oidc-client: 1.11.5
+-      react: 17.0.2
+-      react-dom: 17.0.2(react@17.0.2)
+-      react-intl: 2.9.0(prop-types@15.8.1)(react@17.0.2)
+-      render-if: 0.1.1
+-    dev: false
+--- a/services/idp/src/App.jsx	2026-04-24 21:57:00.894599634 +0300
++++ b/services/idp/src/App.jsx	2026-04-24 22:24:12.978001165 +0300
+@@ -1,14 +1,12 @@
+ import React, { ReactElement, Suspense, lazy } from 'react';
+ import PropTypes from 'prop-types';
+ 
+-import { MuiThemeProvider } from '@material-ui/core/styles';
+-import { defaultTheme as theme } from 'kpop/es/theme';
++import { MuiThemeProvider, createTheme } from '@material-ui/core/styles';
+ 
+-import 'kpop/static/css/base.css';
+-import 'kpop/static/css/scrollbar.css';
+-
+ import Spinner from './components/Spinner';
+ import * as version from './version';
++
++const theme = createTheme();
+ 
+ const LazyMain = lazy(() => import(/* webpackChunkName: "identifier-main" */ './Main'));
+ 
diff --git a/pkgs/by-name/oc/ocis/web.nix b/pkgs/by-name/oc/ocis/web.nix
index 9568c5c30b02..8aa78a3d340c 100644
--- a/pkgs/by-name/oc/ocis/web.nix
+++ b/pkgs/by-name/oc/ocis/web.nix
@@ -44,8 +44,8 @@ stdenvNoCC.mkDerivation rec {
       src
       ;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M=";
+    fetcherVersion = 3;
+    hash = "sha256-EsoGio2D8HZmbe+uuzsOhhwaLMSbJcfV4iUJUaqtA0M=";
   };
 
   meta = {
diff --git a/pkgs/by-name/oc/ocm/package.nix b/pkgs/by-name/oc/ocm/package.nix
index 23040994bb0b..c71b6006666d 100644
--- a/pkgs/by-name/oc/ocm/package.nix
+++ b/pkgs/by-name/oc/ocm/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ocm";
-  version = "1.0.13";
+  version = "1.0.14";
 
   src = fetchFromGitHub {
     owner = "openshift-online";
     repo = "ocm-cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-5dMq7fH3d9ThTAD3wo3IvkMoqwvnIjao3S4I1kaCdPQ=";
+    sha256 = "sha256-Y3iaGIZHGaIB0vlN7qs0WQ6biCMX5YF4HHrBaA6+Amo=";
   };
 
-  vendorHash = "sha256-jk9w5ZOqotyVWtTanG0gUHZAGnxYT4vBk7IJLpgB8GE=";
+  vendorHash = "sha256-nR/TRJPhbpmFTzRu1uByqzzh7d1TB/zRoW0BuAbrIeA=";
 
   # Strip the final binary.
   ldflags = [
diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix
index dba19a8c688e..e28f1d15e98b 100644
--- a/pkgs/by-name/oi/oidc-agent/package.nix
+++ b/pkgs/by-name/oi/oidc-agent/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "oidc-agent";
-  version = "5.3.5";
+  version = "5.3.6";
 
   src = fetchFromGitHub {
     owner = "indigo-dc";
     repo = "oidc-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BGslxBQWXS65wNs6HEbH7yqxt0+3isAiP51wrGhqKLk=";
+    hash = "sha256-GY0YsZJUUDBx1+ivE+h7tRG32qTeAcI7mmh6+zK+1KA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 1a90cdcd1b46..e6bd8d35ebe9 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -95,7 +95,7 @@ let
 
   cudaToolkit = buildEnv {
     # ollama hardcodes the major version in the Makefile to support different variants.
-    # - https://github.com/ollama/ollama/blob/v0.21.0/CMakePresets.json#L21-L47
+    # - https://github.com/ollama/ollama/blob/v0.21.1/CMakePresets.json#L21-L47
     name = "cuda-merged-${cudaMajorVersion}";
     paths = map lib.getLib cudaLibs ++ [
       (lib.getOutput "static" cudaPackages.cuda_cudart)
@@ -141,13 +141,13 @@ let
 in
 goBuild (finalAttrs: {
   pname = "ollama";
-  version = "0.21.0";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DtrYopNtndQXq9Xjriw5Bqell9A8RHPOvgDF8BlKtdU=";
+    hash = "sha256-t/c2oba/y1IUh460+P3MQHGLnExrKcOcQpiMg0mFLBs=";
   };
 
   vendorHash = "sha256-Lc1Ktdqtv2VhJQssk8K1UOimeEjVNvDWePE9WkamCos=";
@@ -199,6 +199,10 @@ goBuild (finalAttrs: {
       --replace-fail '/bin/mkdir' '${coreutils}/bin/mkdir' \
       --replace-fail '/bin/cat' '${coreutils}/bin/cat' \
       --replace-fail '/bin/chmod' '${coreutils}/bin/chmod'
+    substituteInPlace cmd/launch/kimi_test.go \
+       --replace-fail '/bin/mkdir' '${coreutils}/bin/mkdir' \
+       --replace-fail '/bin/cat' '${coreutils}/bin/cat' \
+       --replace-fail '/bin/chmod' '${coreutils}/bin/chmod'
     rm -r app
   ''
   # disable tests that fail in sandbox due to Metal init failure
@@ -241,7 +245,7 @@ goBuild (finalAttrs: {
     '';
 
   # ollama looks for acceleration libs in ../lib/ollama/ (now also for CPU-only with arch specific optimizations)
-  # https://github.com/ollama/ollama/blob/v0.21.0/docs/development.md#library-detection
+  # https://github.com/ollama/ollama/blob/v0.21.1/docs/development.md#library-detection
   postInstall = ''
     mkdir -p $out/lib
     cp -r build/lib/ollama $out/lib/
diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix
index 737914263b88..e6da39951b5f 100644
--- a/pkgs/by-name/ol/olympus-unwrapped/package.nix
+++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix
@@ -22,9 +22,9 @@ let
 
   phome = "$out/lib/olympus";
   # The following variables are to be updated by the update script.
-  version = "26.04.16.02";
-  buildId = "5566"; # IMPORTANT: This line is matched with regex in update.sh.
-  rev = "047950f997ecf24c3ec5cc01244ffbe2fdc601d9";
+  version = "26.04.22.01";
+  buildId = "5580"; # IMPORTANT: This line is matched with regex in update.sh.
+  rev = "78728dcc08e5aba23100527da864ec3c93948a44";
 in
 buildDotnetModule {
   pname = "olympus-unwrapped";
@@ -37,7 +37,7 @@ buildDotnetModule {
     owner = "EverestAPI";
     repo = "Olympus";
     fetchSubmodules = true; # Required. See upstream's README.
-    hash = "sha256-lj2cBwtalTK5wJrIzKcZKirviodUehqIagL9j61iTyM=";
+    hash = "sha256-qB41sG3KATUXj/k0WePwM0z0w6UOyfAYEo2Y7YWoKeo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/on/oneanime/git-hashes.json b/pkgs/by-name/on/oneanime/git-hashes.json
index 7dd1da1a3983..d430ad897d56 100644
--- a/pkgs/by-name/on/oneanime/git-hashes.json
+++ b/pkgs/by-name/on/oneanime/git-hashes.json
@@ -1,10 +1,11 @@
 {
-  "media_kit": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
-  "media_kit_libs_android_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
-  "media_kit_libs_ios_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
-  "media_kit_libs_linux": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
-  "media_kit_libs_macos_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
-  "media_kit_libs_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
-  "media_kit_libs_windows_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=",
-  "media_kit_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s="
+  "media_kit": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
+  "media_kit_libs_android_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
+  "media_kit_libs_ios_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
+  "media_kit_libs_linux": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
+  "media_kit_libs_macos_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
+  "media_kit_libs_ohos": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
+  "media_kit_libs_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
+  "media_kit_libs_windows_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc=",
+  "media_kit_video": "sha256-3eAIaq8VFGreb2DUK5WDIiesX2+sr9NpDP/WH8Ztzrc="
 }
diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix
index abe59d250a28..61272b6d5234 100644
--- a/pkgs/by-name/on/oneanime/package.nix
+++ b/pkgs/by-name/on/oneanime/package.nix
@@ -57,13 +57,13 @@ let
     };
   });
 
-  version = "1.4.4";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "oneAnime";
     tag = version;
-    hash = "sha256-4EieR+Wys7vK+0/pWF5MkA71EeChThVGJ8J5x/8k8nA=";
+    hash = "sha256-kVg6lqJF8kT2TgwiK8aKUWW6yEdQUrJKzw2h4DHN+iw=";
   };
 in
 flutter338.buildFlutterApplication {
diff --git a/pkgs/by-name/on/oneanime/pubspec.lock.json b/pkgs/by-name/on/oneanime/pubspec.lock.json
index 0a0a3fdeb1e6..54b327380e32 100644
--- a/pkgs/by-name/on/oneanime/pubspec.lock.json
+++ b/pkgs/by-name/on/oneanime/pubspec.lock.json
@@ -174,11 +174,11 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
+        "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.4.1"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -758,28 +758,28 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.17"
+      "version": "0.12.19"
     },
     "material_color_utilities": {
       "dependency": "transitive",
       "description": {
         "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+        "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.1"
+      "version": "0.13.0"
     },
     "media_kit": {
       "dependency": "direct main",
       "description": {
         "path": "media_kit",
-        "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
-        "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
+        "ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
+        "resolved-ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -789,8 +789,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
-        "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
-        "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
+        "ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
+        "resolved-ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -800,8 +800,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/ios/media_kit_libs_ios_video",
-        "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
-        "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
+        "ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
+        "resolved-ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -811,8 +811,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/linux/media_kit_libs_linux",
-        "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
-        "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
+        "ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
+        "resolved-ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -822,19 +822,30 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/macos/media_kit_libs_macos_video",
-        "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
-        "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
+        "ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
+        "resolved-ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
       "version": "1.1.4"
     },
+    "media_kit_libs_ohos": {
+      "dependency": "transitive",
+      "description": {
+        "path": "libs/ohos/media_kit_libs_ohos",
+        "ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
+        "resolved-ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
+        "url": "https://github.com/Predidit/media-kit.git"
+      },
+      "source": "git",
+      "version": "1.0.0"
+    },
     "media_kit_libs_video": {
       "dependency": "direct main",
       "description": {
         "path": "libs/universal/media_kit_libs_video",
-        "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
-        "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
+        "ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
+        "resolved-ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -844,8 +855,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/windows/media_kit_libs_windows_video",
-        "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
-        "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
+        "ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
+        "resolved-ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -855,8 +866,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit_video",
-        "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
-        "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6",
+        "ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
+        "resolved-ref": "4cd7c29566da395229c398d2ec4d0ef96b5e8970",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1422,11 +1433,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
+        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.7"
+      "version": "0.7.10"
     },
     "timing": {
       "dependency": "transitive",
@@ -1598,6 +1609,16 @@
       "source": "hosted",
       "version": "1.3.3"
     },
+    "wakelock_plus_ohos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "wakelock_plus_ohos",
+        "sha256": "b22af297411555b5ec0fe43ec2960cd5f019dd23b83853214ebe6dcc97b337bd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.0.3"
+    },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
@@ -1720,7 +1741,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.8.0-0 <4.0.0",
-    "flutter": ">=3.38.3"
+    "dart": ">=3.9.0-0 <4.0.0",
+    "flutter": ">=3.41.4"
   }
 }
diff --git a/pkgs/by-name/on/onednn/package.nix b/pkgs/by-name/on/onednn/package.nix
index 0ccea32f16d8..2e75c5727ce4 100644
--- a/pkgs/by-name/on/onednn/package.nix
+++ b/pkgs/by-name/on/onednn/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "3.11.2";
 
   src = fetchFromGitHub {
-    owner = "oneapi-src";
+    owner = "uxlfoundation";
     repo = "oneDNN";
     rev = "v${finalAttrs.version}";
     hash = "sha256-xJTllrKs6mPNM85ZqyHTHWKpVOtOghmg4ZRFAvQZ4WU=";
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/uxlfoundation/oneDNN/releases/tag/v${finalAttrs.version}";
     description = "oneAPI Deep Neural Network Library (oneDNN)";
     homepage = "http://uxlfoundation.github.io/oneDNN";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/on/onednn_2/package.nix b/pkgs/by-name/on/onednn_2/package.nix
index 51a6fa36e2ee..ef96862c2d59 100644
--- a/pkgs/by-name/on/onednn_2/package.nix
+++ b/pkgs/by-name/on/onednn_2/package.nix
@@ -7,7 +7,7 @@
 
 # This was originally called mkl-dnn, then it was renamed to dnnl, and it has
 # just recently been renamed again to oneDNN. See here for details:
-# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
+# https://github.com/uxlfoundation/oneDNN#oneapi-deep-neural-network-library-onednn
 # onednn_2 is currently only consumed by rocmPackages.migraphx and likely
 # to be dropped once migraphx can migrate to 3
 stdenv.mkDerivation (finalAttrs: {
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.7.5";
 
   src = fetchFromGitHub {
-    owner = "oneapi-src";
+    owner = "uxlfoundation";
     repo = "oneDNN";
     rev = "v${finalAttrs.version}";
     sha256 = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs=";
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/uxlfoundation/oneDNN/releases/tag/v${finalAttrs.version}";
     description = "oneAPI Deep Neural Network Library (oneDNN)";
     homepage = "http://uxlfoundation.github.io/oneDNN";
     license = lib.licenses.asl20;
diff --git a/pkgs/by-name/on/onedpl/package.nix b/pkgs/by-name/on/onedpl/package.nix
new file mode 100644
index 000000000000..fb0e606ab890
--- /dev/null
+++ b/pkgs/by-name/on/onedpl/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  intelLlvmStdenv,
+  fetchFromGitHub,
+  cmake,
+  onetbb,
+  nix-update-script,
+}:
+intelLlvmStdenv.mkDerivation (finalAttrs: {
+  pname = "onedpl";
+  version = "2022.11.1";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "uxlfoundation";
+    repo = "oneDPL";
+    tag = "oneDPL-${finalAttrs.version}-release";
+    hash = "sha256-NfyV34mdKfCxlU+l6ETKWcC9MwvVEgwcBedtLe6WCV4=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    onetbb
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "ONEDPL_BACKEND" "dpcpp")
+  ];
+
+  # Build times for the tests are excessive
+  # and to be truly meaningful, they'd require a GPU
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "'oneDPL-(.*)-release'"
+    ];
+  };
+
+  meta = {
+    description = "oneAPI DPC++ Library (oneDPL)";
+    homepage = "http://uxlfoundation.github.io/oneDPL";
+    changelog = "https://github.com/uxlfoundation/oneDPL/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ arunoruto ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index b01633221af1..08514fbd6c7c 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -21,7 +21,7 @@
   protobuf,
   microsoft-gsl,
   darwinMinVersionHook,
-  pythonSupport ? true,
+  pythonSupport ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform),
   cudaSupport ? config.cudaSupport,
   ncclSupport ? cudaSupport && cudaPackages.nccl.meta.available,
   rocmSupport ? config.rocmSupport,
@@ -165,6 +165,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     libpng
     nlohmann_json
     microsoft-gsl
+    protobuf
     zlib
   ]
   ++ lib.optionals (lib.meta.availableOn effectiveStdenv.hostPlatform cpuinfo) [
@@ -313,6 +314,8 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     !(
       cudaSupport
       || rocmSupport
+      # cross-compiled test binaries can't execute on the build platform
+      || (effectiveStdenv.hostPlatform != effectiveStdenv.buildPlatform)
       || builtins.elem effectiveStdenv.buildPlatform.system [
         # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox
         "aarch64-linux"
diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix
index 1241f2e33865..9daaf936f685 100644
--- a/pkgs/by-name/op/opa-envoy-plugin/package.nix
+++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix
@@ -14,16 +14,16 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "opa-envoy-plugin";
-  version = "1.13.2-envoy-2";
+  version = "1.15.2-envoy";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa-envoy-plugin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2NztAdUcslKzr+OIMWWLJx76Fw0CNP1nw6056Xs6SVo=";
+    hash = "sha256-PUtiM72ENAJtCQeX0YnDuWCrQT/y7s4683AxvX/VsIs=";
   };
 
-  vendorHash = "sha256-3NV5YNwfZgcL+VYXBDWwtb+/0bwCgLRxE3XmLGA2Nkw=";
+  vendorHash = "sha256-zkEgvAD8HaObrbq8OZgx/HLLdv+r4b1Za+R4fYl4h3A=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/op/open-isns/package.nix b/pkgs/by-name/op/open-isns/package.nix
index 8904c48d0729..0aafe0d6ee35 100644
--- a/pkgs/by-name/op/open-isns/package.nix
+++ b/pkgs/by-name/op/open-isns/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
   # The location of /var/lib is not made configurable in the meson.build file
   postPatch = ''
     substituteInPlace meson.build \
-        --replace-fail "/var/lib" "$out/var/lib" \
+        --replace-fail "/var/lib" "$out/var/lib"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index b7280feec43c..5182077189b4 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -14,16 +14,16 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "open-policy-agent";
-  version = "1.15.2";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QgAMnVnTsHA1BcKgAhCgvOXDwkYqSFy7EVDqV/wCbhw=";
+    hash = "sha256-mZpD0hkrm74HzIVM+xcp55nADi/+oOiJ9/WPIyWsmAg=";
   };
 
-  vendorHash = "sha256-l2HrTap6qZeKOvvCY6d+issQT2pL6TPU0pIdDN8vfVc=";
+  vendorHash = "sha256-m+Mb2Llny7O9cfn8Js7MEaeYM9zC/CwWBAuliWE7G1E=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index a991041d96ed..d959271bcbfc 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -9,13 +9,13 @@
 }:
 let
   pname = "open-webui";
-  version = "0.8.12";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-ynWv/X4IBKO09+ira+NUwbzw51MK9aEvGkeaHzCngd0=";
+    hash = "sha256-NiB8V7B5H57t4NjKlAcQdK1E1dfS3nc/+8tWbSE3MBQ=";
   };
 
   frontend = buildNpmPackage rec {
@@ -32,7 +32,7 @@ let
       url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
     };
 
-    npmDepsHash = "sha256-UeoU7UGQ+0ViEIjK/Ze7KazB/JCyFYljHyTmxuza4v8=";
+    npmDepsHash = "sha256-8bsC6LM+v7RTbhAjGYHKClKoiC/rLhzt+UGVp3CVDB0=";
 
     # See https://github.com/open-webui/open-webui/issues/15880
     npmFlags = [
@@ -92,6 +92,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       aiocache
       aiofiles
       aiohttp
+      aiosqlite
       alembic
       anthropic
       apscheduler
@@ -107,9 +108,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
       black
       boto3
       brotli
+      brotlicffi
       chardet
       chromadb
       cryptography
+      datasets_3
       ddgs
       docx2txt
       einops
@@ -155,9 +158,9 @@ python3Packages.buildPythonApplication (finalAttrs: {
       pandas
       peewee
       peewee-migrate
-      pgvector
       pillow
       psutil
+      psycopg
       pyarrow
       pycrdt
       pydub
@@ -183,17 +186,19 @@ python3Packages.buildPythonApplication (finalAttrs: {
       sentence-transformers
       sentencepiece
       soundfile
+      sqlalchemy
       starlette-compress
       starsessions
       tiktoken
       transformers
-      unstructured
       uvicorn
       validators
       xlrd
       youtube-transcript-api
     ]
+    ++ psycopg.optional-dependencies.c
     ++ pyjwt.optional-dependencies.crypto
+    ++ sqlalchemy.optional-dependencies.asyncio
     ++ starsessions.optional-dependencies.redis;
 
   optional-dependencies = with python3Packages; {
@@ -206,11 +211,14 @@ python3Packages.buildPythonApplication (finalAttrs: {
       mariadb
     ];
 
+    unstructured = [
+      unstructured
+    ];
+
     all = [
       azure-search-documents
       colbert-ai
       elasticsearch
-      firecrawl-py
       gcp-storage-emulator
       moto
       oracledb
@@ -223,6 +231,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     ]
     ++ finalAttrs.passthru.optional-dependencies.mariadb
     ++ finalAttrs.passthru.optional-dependencies.postgres
+    ++ finalAttrs.passthru.optional-dependencies.unstructured
     ++ moto.optional-dependencies.s3;
   };
 
diff --git a/pkgs/by-name/op/openapv/package.nix b/pkgs/by-name/op/openapv/package.nix
index 10e582e51f25..b153552d6f17 100644
--- a/pkgs/by-name/op/openapv/package.nix
+++ b/pkgs/by-name/op/openapv/package.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openapv";
-  version = "0.2.1.1";
+  version = "0.2.1.2";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openapv";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-L5rlv1RHV67UO5p3qSIjORSXSwnDV9KeG0Nmw0eQw0Y=";
+    hash = "sha256-wxncN7j5p0GXpWhOx4Ix0oTgGK2sIrfJgQ45fFwmQBI=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index 1d004376fe40..224c4117a7ea 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fqsCQf9wFlzMWC4XV1BclWlYG649VhhZBKlGrdsbqKc=";
+    hash = "sha256-VpW27vWKtqabJiNxuyx3PGDThHF6MOlxxfzD1UksX6I=";
   };
 
-  vendorHash = "sha256-0L+0U4tM7/ObNjXcSZcvIw7Y/RwYs2iRsLA2zSYmexU=";
+  vendorHash = "sha256-imP8GJjm8udJ1RXfGhVJX7YZ9J47p/vdKjKjMfMgTXA=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/op/openbgpd/package.nix b/pkgs/by-name/op/openbgpd/package.nix
index 79d8f6b8b73c..069bfa8b5cc9 100644
--- a/pkgs/by-name/op/openbgpd/package.nix
+++ b/pkgs/by-name/op/openbgpd/package.nix
@@ -1,61 +1,25 @@
 {
   lib,
-  stdenv,
-  fetchFromGitHub,
-  autoconf,
-  automake,
-  libtool,
-  m4,
-  bison,
+  clangStdenv,
+  fetchurl,
+  libevent,
 }:
+# Use clang instead of gcc because that issues way less warnings.
+# Besides, OpenBSD devs generally prefer clang over gcc, so it is more likely
+# that the entire compilation is more tested using clang from an upstream POV.
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "openbgpd";
+  version = "9.1";
 
-let
-  openbsd_version = "OPENBSD_6_8"; # This has to be equal to ${src}/OPENBSD_BRANCH
-  openbsd = fetchFromGitHub {
-    name = "portable";
-    owner = "openbgpd-portable";
-    repo = "openbgpd-openbsd";
-    rev = openbsd_version;
-    sha256 = "sha256-vCVK5k4g6aW2z2fg7Kv0uvkX7f34aRc8K2myb3jjl6w=";
-  };
-in
-stdenv.mkDerivation rec {
-  pname = "opengpd";
-  version = "6.8p0";
-
-  src = fetchFromGitHub {
-    owner = "openbgpd-portable";
-    repo = "openbgpd-portable";
-    rev = version;
-    sha256 = "sha256-TKs6tt/SCWes6kYAGIrSShZgOLf7xKh26xG3Zk7wCCw=";
+  src = fetchurl {
+    url = "https://cdn.openbsd.org/pub/OpenBSD/OpenBGPD/openbgpd-${finalAttrs.version}.tar.gz";
+    hash = "sha256-GUUYWBGdRplN/4zyfQYzMpzULyi6Oou1pfz0Zexem8M=";
   };
 
-  nativeBuildInputs = [
-    autoconf
-    automake
-    libtool
-    m4
-    bison
+  buildInputs = [
+    libevent
   ];
 
-  preConfigure = ''
-    mkdir ./openbsd
-    cp -r ${openbsd}/* ./openbsd/
-    chmod -R +w ./openbsd
-    openbsd_version=$(cat ./OPENBSD_BRANCH)
-    if [ "$openbsd_version" != "${openbsd_version}" ]; then
-      echo "OPENBSD VERSION does not match"
-      exit 1
-    fi
-    ./autogen.sh
-  '';
-
-  # Workaround build failure on -fno-common toolchains like upstream
-  # gcc-10. Otherwise build fails as:
-  #   ld: bgpd-rde_peer.o:/build/source/src/bgpd/bgpd.h:133: multiple definition of `bgpd_process';
-  #     bgpd-bgpd.o:/build/source/src/bgpd/bgpd.h:133: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
   meta = {
     description = "Free implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol";
     license = lib.licenses.isc;
@@ -63,4 +27,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ cvengler ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/op/openbox/package.nix b/pkgs/by-name/op/openbox/package.nix
index 53d55665ae0f..eb82b79eaa8f 100644
--- a/pkgs/by-name/op/openbox/package.nix
+++ b/pkgs/by-name/op/openbox/package.nix
@@ -15,8 +15,10 @@
   libsm,
   imlib2,
   pango,
+  bashNonInteractive,
   libstartup_notification,
   makeWrapper,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,10 +29,12 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     pkg-config
     makeWrapper
+    python3
     python3.pkgs.wrapPython
   ];
 
   buildInputs = [
+    bashNonInteractive
     libxml2
     libxinerama
     libxcursor
@@ -47,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     imlib2
   ];
 
+  strictDeps = true;
+
   pythonPath = with python3.pkgs; [
     pyxdg
   ];
@@ -89,6 +95,9 @@ stdenv.mkDerivation (finalAttrs: {
     wrapPythonProgramsIn "$out/libexec" "$out ''${pythonPath[*]}"
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   meta = {
     description = "X window manager for non-desktop embedded systems";
     homepage = "http://openbox.org/";
diff --git a/pkgs/by-name/op/opencc/package.nix b/pkgs/by-name/op/opencc/package.nix
index 464d23507bff..741ce8fd9838 100644
--- a/pkgs/by-name/op/opencc/package.nix
+++ b/pkgs/by-name/op/opencc/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opencc";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "BYVoid";
     repo = "OpenCC";
     tag = "ver.${finalAttrs.version}";
-    hash = "sha256-T2bl4JVE04/64bLdBj5BB+2G09kDFyLnI+hx23h5q68=";
+    hash = "sha256-88u9bMJgycaR3MWKIUxiOuKmeVvbp4eWwCX7LgguwIU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openclaw/package.nix b/pkgs/by-name/op/openclaw/package.nix
index 5ec51c738910..6804b61651ac 100644
--- a/pkgs/by-name/op/openclaw/package.nix
+++ b/pkgs/by-name/op/openclaw/package.nix
@@ -11,7 +11,7 @@
   versionCheckHook,
   rolldown,
   installShellFiles,
-  version ? "2026.4.12",
+  version ? "2026.4.21",
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openclaw";
@@ -21,10 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "openclaw";
     repo = "openclaw";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-d0/Y3s+MQFaG1lZr9nk00KU7bJhglApFZFLRCLJ4Hc4=";
+    hash = "sha256-K1Pl9lXzGKfoq/fXWxYX5PoY3IBzJr0PPstUDGET/gs=";
   };
 
-  pnpmDepsHash = "sha256-Tkraoxlux/lUS1ilpAIvSl5VUT0ZA9DWptNXRNl8B8o=";
+  pnpmDepsHash = "sha256-FDajXHs4s0+QDRPq4ZxQWWW9rqeSJVYACAl/5Mw2Agc=";
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
@@ -70,15 +70,31 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           continue;
         }' \
       --replace-fail \
-        'stageInstalledRootRuntimeDeps({ fingerprint, packageJson, pluginDir, repoRoot })
-      ) {
-        return;
-      }' \
-        'stageInstalledRootRuntimeDeps({ fingerprint, packageJson, pluginDir, repoRoot })
-      ) {
-        return;
-      }
-      return; // nix: sandbox has no npm'
+        '    if (
+          stageInstalledRootRuntimeDeps({
+            directDependencyPackageRoot,
+            fingerprint,
+            packageJson,
+            pluginDir,
+            pruneConfig,
+            repoRoot,
+          })
+        ) {
+          continue;
+        }' \
+        '    if (
+          stageInstalledRootRuntimeDeps({
+            directDependencyPackageRoot,
+            fingerprint,
+            packageJson,
+            pluginDir,
+            pruneConfig,
+            repoRoot,
+          })
+        ) {
+          continue;
+        }
+        continue; // nix: sandbox has no npm'
     pnpm build
     pnpm ui:build
 
diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix
index 45dcc40332d5..f89a00b0dc39 100644
--- a/pkgs/by-name/op/opencloud/idp-web.nix
+++ b/pkgs/by-name/op/opencloud/idp-web.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     pnpm = pnpm_9;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}";
     fetcherVersion = 3;
-    hash = "sha256-b7GGb9+7gpaTAjUmnvBoVFNgE6a1EhpEdNBHOfMMJa4=";
+    hash = "sha256-p1hsRGSp/IwfxqwniqJc4c5pz5khYPW1g9WpfysEFnA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix
index 2c2a275f56ac..578b19f31d3f 100644
--- a/pkgs/by-name/op/opencloud/package.nix
+++ b/pkgs/by-name/op/opencloud/package.nix
@@ -28,13 +28,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "opencloud";
-  version = "6.0.0";
+  version = "6.1.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "opencloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PWXO4lrNWHr9Yqexv4lTzAvLwnabRv4oP/CAjpdTezg=";
+    hash = "sha256-vQ7p+2AbLTcHvHn2RSYAMmCa9RxPfRXn2eRVp+QLWFI=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix
index d533f9e68fec..e774fe7c19f9 100644
--- a/pkgs/by-name/op/opencloud/web.nix
+++ b/pkgs/by-name/op/opencloud/web.nix
@@ -10,20 +10,20 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencloud-web";
-  version = "6.1.0";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vUDkE1rF30r6guuQIb2XLnaq+1NsyjS5L319AfCzJvA=";
+    hash = "sha256-vou5J3n94Zn6WJIkLzZSMb4c1pnNn0YM4zC5qpIkfBA=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-uaQTWytTHsQP19IHUIXccGkx8StIjMZ3MgepRydeims=";
+    hash = "sha256-NFlADq48pA/k9X0OeswbkQNieVaiDE7GqXEs6LgsraA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 669490b0af88..19306ec32400 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.14.19";
+  version = "1.14.30";
 
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kKFqMf+l+V1kaf6bZtKfUSRYYjKc3VNgxlxic2fM2fo=";
+    hash = "sha256-pRMPa0ba71wLo4ZumbV18+y80GbcoU7NN6+P3e8LUTM=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-RYyYp7LXMZP8RWZps1Esu8tW/rBM30QbH9Qrwi00adI=";
+    outputHash = "sha256-0dBgIXkGplKmq/sbXwhLoKUGwTIZU+TeC74YkByNOYk=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix
index aea86578aded..d91004e90f34 100644
--- a/pkgs/by-name/op/openfga-cli/package.nix
+++ b/pkgs/by-name/op/openfga-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openfga-cli";
-  version = "0.7.12";
+  version = "0.7.13";
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ImCWMEDIgw6YWdlehMVASRbUMOJp4nqhle8jwPLZVgU=";
+    hash = "sha256-nV0Y0oCPH0zRWdhjGhXqX7dkMwhlEjwucr3K6dN0vDg=";
   };
 
-  vendorHash = "sha256-3Gtnti9H6DXdLWdoUV1qkGGFPqTLAC3ngvPZCQp+7Wo=";
+  vendorHash = "sha256-kzxuFP1D3oD2P2goU48nj40/4KyY9bDhf9gTtpuoz1I=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 0826a2c58aa3..4ec3cacd1cec 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openfga";
-  version = "1.13.1";
+  version = "1.14.2";
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "openfga";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fmTb5mRAbJGDfE4lLSFtfHuQv2pQn4fQnX7fTjq7KKs=";
+    hash = "sha256-nY5HRkZCKgjr1a5XxxRcUwCms9PCQs3IZiFgAEaD7To=";
   };
 
-  vendorHash = "sha256-sd1kDRicWb5ShEFDCJIjv4kk2dA5XwABH3Ii/P3uVvI=";
+  vendorHash = "sha256-q5NZLPtdwFeHzLi+ZmRzGScxkl0OOxTVo/W6yUL1lO8=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/op/openfreebuds/package.nix b/pkgs/by-name/op/openfreebuds/package.nix
index b0f5c07e8b77..29fd14b2a4e0 100644
--- a/pkgs/by-name/op/openfreebuds/package.nix
+++ b/pkgs/by-name/op/openfreebuds/package.nix
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [
+  enabledTestPaths = [
     "openfreebuds/driver/huawei/test/"
     "openfreebuds/test/test_event_bus.py"
   ];
diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix
index c50d7b3bda3c..e40648724340 100644
--- a/pkgs/by-name/op/openldap/package.nix
+++ b/pkgs/by-name/op/openldap/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openldap";
-  version = "2.6.9";
+  version = "2.6.13";
 
   src = fetchurl {
     url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${finalAttrs.version}.tgz";
-    hash = "sha256-LLfcc+nINA3/DZk1f7qleKvzDMZhnwUhlyxVVoHmsv8=";
+    hash = "sha256-1pO0lRekLvuFoaNkoxCu0WpT1CjRtGwNMe8/unj8tlY=";
   };
 
   patches = [
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     libtool
     openssl
   ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
     libxcrypt # causes linking issues on *-darwin
   ]
   ++ lib.optionals withModules [
@@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   configureFlags = [
     "--enable-crypt"
     "--enable-overlays"
+    "--enable-spasswd"
     (lib.enableFeature withModules "argon2")
     (lib.enableFeature withModules "modules")
   ]
diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix
index 85eeb706d3fa..b1705127ab80 100644
--- a/pkgs/by-name/op/openlist/frontend.nix
+++ b/pkgs/by-name/op/openlist/frontend.nix
@@ -1,52 +1,54 @@
 {
   lib,
-  stdenvNoCC,
+  buildNpmPackage,
   fetchFromGitHub,
+  fetchPnpmDeps,
   fetchzip,
 
   nodejs,
-  pnpm_9,
-  fetchPnpmDeps,
+  openlistPnpm ? pnpm_10,
   pnpmConfigHook,
+  pnpm_10,
 }:
-stdenvNoCC.mkDerivation (finalAttrs: {
+buildNpmPackage (finalAttrs: {
   pname = "openlist-frontend";
-  version = "4.1.10";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "OpenListTeam";
     repo = "OpenList-Frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V8nfQsGLhd7eERF0/ly3sRdGmffYa9r6GhtjciOXxMU=";
+    hash = "sha256-4WSL6j0dANUNlHFkMBb8j/KyNHWDQmLnC1y2FFJiBEI=";
   };
 
   i18n = fetchzip {
     url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz";
-    hash = "sha256-VdNqXdLXs2n/ikUDm1YQRNAXqYqFjMWRGLPRpmJVoaI=";
+    hash = "sha256-VzHNZh0ZA2FncAkyozHeBilN4KKsPqbpMESx4QCppW0=";
     stripRoot = false;
   };
 
+  postPatch = ''
+    cp -r ${finalAttrs.i18n}/* src/lang/
+  '';
+
   nativeBuildInputs = [
     nodejs
-    pnpmConfigHook
-    pnpm_9
+    openlistPnpm
   ];
 
+  npmDeps = null;
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
-    fetcherVersion = 2;
-    hash = "sha256-xylF+Z7Fkx/bFYPlzqfGrl051ZLKzPgdlF7U8vKtQq8=";
+    pnpm = openlistPnpm;
+    fetcherVersion = 3;
+    hash = "sha256-rTDk1p568AKim+ZD00uq1q4XNNMeUFL1rGDBWx2C6DQ=";
   };
 
-  buildPhase = ''
-    runHook preBuild
+  npmConfigHook = pnpmConfigHook;
 
-    cp -r ${finalAttrs.i18n}/* src/lang/
-    pnpm build
-
-    runHook postBuild
-  '';
+  # [plugin vite:legacy-generate-polyfill-chunk]
+  # Error: getaddrinfo ENOTFOUND localhost
+  __darwinAllowLocalNetworking = true;
 
   installPhase = ''
     runHook preInstall
@@ -62,5 +64,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/OpenListTeam/OpenList-Frontend";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ moraxyc ];
+    inherit (nodejs.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix
index c58851312b57..f49df3ded44f 100644
--- a/pkgs/by-name/op/openlist/package.nix
+++ b/pkgs/by-name/op/openlist/package.nix
@@ -2,22 +2,24 @@
   lib,
   stdenv,
   buildGoModule,
-  fetchFromGitHub,
   callPackage,
+  fetchFromGitHub,
+  iana-etc,
   installShellFiles,
+  libredirect,
   versionCheckHook,
   fuse,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "openlist";
-  version = "4.1.10";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "OpenListTeam";
     repo = "OpenList";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+B3ea0LvzpRll9HpfEU6RkSgnQtVprSlrO+Tq07T0eQ=";
+    hash = "sha256-9MDcAQh06W6mOhYpFR49bxvTTrIoJnKY9P3WRVWsujI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -33,7 +35,12 @@ buildGoModule (finalAttrs: {
   frontend = callPackage ./frontend.nix { };
 
   proxyVendor = true;
-  vendorHash = "sha256-xUTTVejCDDMfzWdmtXiWcc0/hzhniZJcNzPFFFiNnJk=";
+  vendorHash = "sha256-Ho9zVKdzpGKZ/ftJmidUkMBsN4qfvLa96Fg3ayTfYac=";
+
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libredirect.hook;
 
   buildInputs = [ fuse ];
 
@@ -56,6 +63,10 @@ buildGoModule (finalAttrs: {
     ldflags+=" -X github.com/OpenListTeam/OpenList/v4/internal/conf.GitCommit=$(<COMMIT)"
   '';
 
+  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services
+  '';
+
   checkFlags =
     let
       # Skip tests that require network access
@@ -74,8 +85,6 @@ buildGoModule (finalAttrs: {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  nativeBuildInputs = [ installShellFiles ];
-
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd OpenList \
       --bash <($out/bin/OpenList completion bash) \
@@ -86,9 +95,9 @@ buildGoModule (finalAttrs: {
     $out/bin/OpenList completion powershell > $out/share/powershell/OpenList.Completion.ps1
   '';
 
-  doInstallCheck = true;
+  # panic: open /etc/protocols: operation not permitted
+  doInstallCheck = !stdenv.hostPlatform.isDarwin;
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgram = "${placeholder "out"}/bin/OpenList";
   versionCheckProgramArg = "version";
 
   passthru.updateScript = lib.getExe (callPackage ./update.nix { });
diff --git a/pkgs/by-name/op/openshadinglanguage/package.nix b/pkgs/by-name/op/openshadinglanguage/package.nix
index 1cb8e244badf..589df0d95b7d 100644
--- a/pkgs/by-name/op/openshadinglanguage/package.nix
+++ b/pkgs/by-name/op/openshadinglanguage/package.nix
@@ -24,13 +24,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openshadinglanguage";
-  version = "1.15.1.0";
+  version = "1.15.3.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenShadingLanguage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+PNh4xFdH8onxK0OTnQHbdupTaB2hTgDumY0krJiWUE=";
+    hash = "sha256-xNu973TbPIIOLpZDe2E9sRmX7GpidQeQrKkpz7zkuBY=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/by-name/op/openshell/package.nix b/pkgs/by-name/op/openshell/package.nix
index 5d9c6d2aee2a..e0f73669d7f1 100644
--- a/pkgs/by-name/op/openshell/package.nix
+++ b/pkgs/by-name/op/openshell/package.nix
@@ -6,20 +6,29 @@
   versionCheckHook,
   cacert,
   gitMinimal,
+  pkg-config,
+  z3,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "openshell";
-  version = "0.0.22";
+  version = "0.0.34";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "OpenShell";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-98wmBhj1Bqkod9DWh4qhkT3287c56ZKRDf/Z3QCYf4Q=";
+    hash = "sha256-wchygUeSYbHXVgq5mR3nObPiEygREgvIk579gnPVMvM=";
   };
 
-  cargoHash = "sha256-lzS8V8e+wMX8KUfgrftNLdbyivoj0wtRWOThBRS1IdM=";
+  cargoHash = "sha256-ovg7IZL022wsj5EUjySCWsf0KrUCZLwQrjvvWld8Owo=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [ z3 ];
 
   nativeCheckInputs = [
     cacert
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/by-name/op/openshot-qt/package.nix
similarity index 60%
rename from pkgs/applications/video/openshot-qt/default.nix
rename to pkgs/by-name/op/openshot-qt/package.nix
index d65bde5d4c85..7e84ad63bed9 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/by-name/op/openshot-qt/package.nix
@@ -1,33 +1,23 @@
 {
   lib,
-  stdenv,
-  mkDerivationWith,
   fetchFromGitHub,
   doxygen,
   gtk3,
   libopenshot,
-  python3,
-  qtbase,
-  qtsvg,
-  qtwayland,
-  wayland,
-  waylandSupport ? stdenv.hostPlatform.isLinux,
   wrapGAppsHook3,
+  python3Packages,
 }:
 
-let
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "openshot-qt";
-  version = "3.3.0";
+  version = "3.5.1-unstable-2026-04-22";
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "openshot-qt";
-    tag = "v${version}";
-    hash = "sha256-+QI1772ys1Czd+KSVBAdAUjLg9mUcMZs+UhkNljY7nQ=";
+    rev = "930ff919762570eaf35a879574da8f8da9f196be";
+    hash = "sha256-o0BPEzkEAyoZkPkiR9G8i2nANgDFI4wjD5b9hGOqB0c=";
   };
-in
-mkDerivationWith python3.pkgs.buildPythonApplication {
   format = "setuptools";
-  inherit pname version src;
 
   outputs = [ "out" ]; # "lib" can't be split
 
@@ -38,43 +28,29 @@ mkDerivationWith python3.pkgs.buildPythonApplication {
 
   buildInputs = [
     gtk3
-  ]
-  ++ lib.optionals waylandSupport [
-    qtwayland
-    wayland
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = with python3Packages; [
     httplib2
     libopenshot
-    pyqtwebengine
     pyzmq
     requests
     sip
+    pyside6
   ];
 
   strictDeps = true;
 
-  preConfigure = ''
-    # the builder tries to create caching directories during install
-    export HOME=$(mktemp -d)
-  '';
-
   doCheck = false;
 
   dontWrapGApps = true;
   dontWrapQtApps = true;
 
+  # https://github.com/OpenShot/openshot-qt/blob/930ff919762570eaf35a879574da8f8da9f196be/src/launch.py#L86
+  # imports qt_api.py from its own site-packages directory
   postFixup = ''
     wrapProgram $out/bin/openshot-qt \
-  ''
-  # Fix toolbar icons on Darwin
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \
-  ''
-  + ''
-    "''${gappsWrapperArgs[@]}" \
-    "''${qtWrapperArgs[@]}"
+      --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}/openshot_qt"
   '';
 
   passthru = {
@@ -97,4 +73,4 @@ mkDerivationWith python3.pkgs.buildPythonApplication {
     maintainers = [ ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/op/opensp/package.nix b/pkgs/by-name/op/opensp/package.nix
index d012bfa04f33..4fba52c803f1 100644
--- a/pkgs/by-name/op/opensp/package.nix
+++ b/pkgs/by-name/op/opensp/package.nix
@@ -7,6 +7,7 @@
   docbook_xml_dtd_412,
   docbook_xsl,
   autoconf,
+  autoconf269,
   automake,
   libtool,
   autoreconfHook,
@@ -61,7 +62,11 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   # Clang 16 fails to build due to inappropriate definitions in the `config.h` generated by the
   # existing configure scripts. Regenerate them to make sure they detect its features correctly.
-  ++ lib.optional stdenv.cc.isClang autoreconfHook
+  # autoconf269: as autoconf 2.73 is trying to force C23 (-std=gnu23) which will fail, we use 2.69.
+  ++ lib.optionals stdenv.cc.isClang [
+    autoconf269
+    autoreconfHook
+  ]
   ++ lib.optionals stdenv.hostPlatform.isCygwin [
     autoconf
     automake
diff --git a/pkgs/by-name/op/openspec/package.nix b/pkgs/by-name/op/openspec/package.nix
index 0e787d2d3c4b..749e4f05f146 100644
--- a/pkgs/by-name/op/openspec/package.nix
+++ b/pkgs/by-name/op/openspec/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openspec";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "Fission-AI";
     repo = "OpenSpec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yLzndbXdPoIv7xWHd23FOtMlPmWWz3+H7WODWQYylJc=";
+    hash = "sha256-L4LBHVVtgMhSJm+IzZSYOR0UXPbvIRg4xiEV5urYxdI=";
   };
 
   pnpmDeps = fetchPnpmDeps {
diff --git a/pkgs/by-name/op/opentabletdriver/deps.json b/pkgs/by-name/op/opentabletdriver/deps.json
index 3a9322d5d7fb..020f45bd4305 100644
--- a/pkgs/by-name/op/opentabletdriver/deps.json
+++ b/pkgs/by-name/op/opentabletdriver/deps.json
@@ -11,18 +11,18 @@
   },
   {
     "pname": "Castle.Core",
-    "version": "4.4.0",
-    "hash": "sha256-7hLBAHnB+drr2yU4w3o05eMX2ADy/rXN3XRPBn1d7GY="
+    "version": "5.1.1",
+    "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="
   },
   {
     "pname": "coverlet.collector",
-    "version": "3.0.2",
-    "hash": "sha256-b8LCEIZCLJdYcJXQqI3TGDmkLrmLhz84eoTq+qP5xvU="
+    "version": "6.0.4",
+    "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0="
   },
   {
     "pname": "DiffPlex",
-    "version": "1.7.2",
-    "hash": "sha256-Vsn81duAmPIPkR40h5bEz7hgtF5Kt5nAAGhQZrQbqxE="
+    "version": "1.9.0",
+    "hash": "sha256-ozj2ME8fTj3AXMUguIqI45ecLS41WnOETCxCG6bDeo4="
   },
   {
     "pname": "Eto.Forms",
@@ -61,138 +61,73 @@
   },
   {
     "pname": "HidSharpCore",
-    "version": "1.2.1.1",
-    "hash": "sha256-lM4o3FYBon8eQIMt4uiJAs8M0t4MW+joykiDX+lrdv4="
+    "version": "1.3.0",
+    "hash": "sha256-MhNwqDoAM2o7OkAV/MtJJKW++xI4q+uLheJdYIAk5Ls="
+  },
+  {
+    "pname": "JetBrains.Annotations",
+    "version": "2025.2.4",
+    "hash": "sha256-YJpS77UH9tTETCKHr5M+bQOax1BLPFqIr/i+KLN9tEI="
   },
   {
     "pname": "MessagePack",
-    "version": "2.1.194",
-    "hash": "sha256-QKq/zQKI3P9TBhhnnktaaeRr4f/12U+huxeaplPzT+w="
+    "version": "2.5.192",
+    "hash": "sha256-M9QUEAIeSoSgO3whVkOou0F8kbKCNJ7HHAvTZgytkPU="
   },
   {
     "pname": "MessagePack.Annotations",
-    "version": "2.1.194",
-    "hash": "sha256-YCHelFO/hXW7Q3rkV/fQ32aZliSXUO7133kRH+HAcMo="
-  },
-  {
-    "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "1.1.1",
-    "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="
+    "version": "2.5.192",
+    "hash": "sha256-DLtncnaQ9Sp5YmWm89+2w3InhdU1ZQxnJgbonAq/1aM="
   },
   {
     "pname": "Microsoft.CodeCoverage",
-    "version": "16.9.4",
-    "hash": "sha256-90oZu7wror4PMfy9VL4O7WzxNHt0+KqS0mG+6Yf3kYc="
-  },
-  {
-    "pname": "Microsoft.CSharp",
-    "version": "4.0.1",
-    "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="
+    "version": "18.0.1",
+    "hash": "sha256-G6y5iyHZ3R2shlLCW/uTusio/UqcnWT79X+UAbxvDQY="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "6.0.0-rc.1.21451.13",
-    "hash": "sha256-zJQsAVTfA46hUV5q67BslsVn9yehYBclD06wg2UhyWQ="
+    "version": "10.0.1",
+    "hash": "sha256-RKOB+zPrtQNUbJY/1jR54rKOM8KHPgynPExxugku3I8="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "6.0.0-rc.1.21451.13",
-    "hash": "sha256-oTYhI+lMwaQ7l9CfDHeNMBAdfofv4kHC0vqBZ7oJr4U="
+    "version": "10.0.1",
+    "hash": "sha256-zNUpau51ds7iQTaSUTFtyTHIUoinYc129W50CnufMdQ="
+  },
+  {
+    "pname": "Microsoft.NET.StringTools",
+    "version": "17.6.3",
+    "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw="
   },
   {
     "pname": "Microsoft.NET.Test.Sdk",
-    "version": "16.9.4",
-    "hash": "sha256-ROXDqgp87j/In0UyGWygrCwMgn982Of60UHiXH8Bvck="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.0.1",
-    "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.1.0",
-    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.1.1",
-    "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "3.0.0",
-    "hash": "sha256-ocB+U+mMvi/xVwII7bGsIfAqSXiKVSnEMLHCODLJaK4="
-  },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.0.1",
-    "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="
-  },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.1.0",
-    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+    "version": "18.0.1",
+    "hash": "sha256-0c3/rp9di0w7E5UmfRh6Prrm3Aeyi8NOj5bm2i6jAh0="
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "16.9.4",
-    "hash": "sha256-JvLvmGmaT9I5Sz2QMCEv8lQk34kzCcg+MPuSavOaP8o="
+    "version": "18.0.1",
+    "hash": "sha256-oJbS7SZ46RzyOQ+gCysW7qJRy7V8RlQVa5d8uajb91M="
   },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "16.9.4",
-    "hash": "sha256-3VRVjK5XrR5+SNuMQnLbD1ji6sHXjr65FydfXz8GIZA="
+    "version": "18.0.1",
+    "hash": "sha256-OXYf5vg4piDr10ve0bZ2ZSb+nb3yOiHayJV3cu5sMV4="
   },
   {
-    "pname": "Microsoft.VisualStudio.Threading",
-    "version": "16.7.56",
-    "hash": "sha256-V2HB/0j+I/3iUT7mEVyeF11P/61cSpYcZQa1LnXuoI8="
-  },
-  {
-    "pname": "Microsoft.VisualStudio.Threading.Analyzers",
-    "version": "16.7.56",
-    "hash": "sha256-4lsL6hg1mposZ62buQWBud1B4raV8Pl+BkyvM4FraRM="
+    "pname": "Microsoft.VisualStudio.Threading.Only",
+    "version": "17.13.61",
+    "hash": "sha256-OhXEAuF9PZAkZuHqHwdVODLjA/rIMqmD7nXJfVAQWA8="
   },
   {
     "pname": "Microsoft.VisualStudio.Validation",
-    "version": "15.5.31",
-    "hash": "sha256-/NWbGyad7wejY8QyxK8YWTgiRiUGjimaBgoLkWxOCao="
-  },
-  {
-    "pname": "Microsoft.Win32.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
-  },
-  {
-    "pname": "Microsoft.Win32.Registry",
-    "version": "4.6.0",
-    "hash": "sha256-Wrj0Sc9srH5+ma0lCbgRYYP6gKgnlXcL6h7j7AU6nkQ="
-  },
-  {
-    "pname": "Moq",
-    "version": "4.16.1",
-    "hash": "sha256-9CCEY6246RbB4zaF5xwCDf2XuGoPDpZoJsjrB/riT9Q="
+    "version": "17.8.8",
+    "hash": "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="
   },
   {
     "pname": "Nerdbank.Streams",
-    "version": "2.6.77",
-    "hash": "sha256-rOBiYpZQ0rrM9wbWOjzCYIbxcWa3tCrdPt1rpDp3to0="
-  },
-  {
-    "pname": "NETStandard.Library",
-    "version": "1.6.1",
-    "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
-  },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "12.0.2",
-    "hash": "sha256-BW7sXT2LKpP3ylsCbTTZ1f6Mg1sR4yL68aJVHaJcTnA="
-  },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "13.0.1",
-    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
+    "version": "2.12.87",
+    "hash": "sha256-BglFZT1nSyJO8mB235sP5yyu51iaGXwRHSOV8aeeY2A="
   },
   {
     "pname": "Newtonsoft.Json",
@@ -201,348 +136,53 @@
   },
   {
     "pname": "Newtonsoft.Json",
-    "version": "9.0.1",
-    "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="
+    "version": "13.0.4",
+    "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
   },
   {
     "pname": "Newtonsoft.Json.Schema",
-    "version": "3.0.15",
-    "hash": "sha256-l2r1pkQ9d+SbuMXkEbbsunDKpd2G9+uFG857dvtPrNo="
+    "version": "4.0.1",
+    "hash": "sha256-EHBcN4hM9fg34BbHrY8o+mqYh9FYPDb5K6CnEkpUflo="
   },
   {
-    "pname": "NuGet.Frameworks",
-    "version": "5.0.0",
-    "hash": "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="
+    "pname": "NSubstitute",
+    "version": "5.3.0",
+    "hash": "sha256-fa6Hn9Qmpia2labWOs1Xp2LnJBOHfrWIwxvqKRRccs0="
+  },
+  {
+    "pname": "NSubstitute.Analyzers.CSharp",
+    "version": "1.0.17",
+    "hash": "sha256-HyMhNJMze3ALJbl71pprjuLCqS+KLA/bOeX4Sng/eb4="
   },
   {
     "pname": "Octokit",
-    "version": "0.50.0",
-    "hash": "sha256-GJ+9HkF8FNOB7O2d32fPvMrmUqYcAJ4xToEFZWKR9sU="
+    "version": "14.0.0",
+    "hash": "sha256-pTSI7Tz5VFd4Ydx1laE+VkZfhsl7Rbgw42PBqhyVvyI="
   },
   {
     "pname": "PangoSharp",
     "version": "3.24.24.34",
     "hash": "sha256-/KdH3SA/11bkwPe/AXRph4v4a2cjbUjDvo4+OhkJEOQ="
   },
-  {
-    "pname": "runtime.any.System.Collections",
-    "version": "4.3.0",
-    "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
-  },
-  {
-    "pname": "runtime.any.System.Diagnostics.Tools",
-    "version": "4.3.0",
-    "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
-  },
-  {
-    "pname": "runtime.any.System.Diagnostics.Tracing",
-    "version": "4.3.0",
-    "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
-  },
-  {
-    "pname": "runtime.any.System.Globalization",
-    "version": "4.3.0",
-    "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
-  },
-  {
-    "pname": "runtime.any.System.Globalization.Calendars",
-    "version": "4.3.0",
-    "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="
-  },
-  {
-    "pname": "runtime.any.System.IO",
-    "version": "4.3.0",
-    "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
-  },
-  {
-    "pname": "runtime.any.System.Reflection",
-    "version": "4.3.0",
-    "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
-  },
-  {
-    "pname": "runtime.any.System.Reflection.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
-  },
-  {
-    "pname": "runtime.any.System.Reflection.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
-  },
-  {
-    "pname": "runtime.any.System.Resources.ResourceManager",
-    "version": "4.3.0",
-    "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
-  },
-  {
-    "pname": "runtime.any.System.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
-  },
-  {
-    "pname": "runtime.any.System.Runtime.Handles",
-    "version": "4.3.0",
-    "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
-  },
-  {
-    "pname": "runtime.any.System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
-  },
-  {
-    "pname": "runtime.any.System.Text.Encoding",
-    "version": "4.3.0",
-    "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
-  },
-  {
-    "pname": "runtime.any.System.Text.Encoding.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="
-  },
-  {
-    "pname": "runtime.any.System.Threading.Tasks",
-    "version": "4.3.0",
-    "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
-  },
-  {
-    "pname": "runtime.any.System.Threading.Timer",
-    "version": "4.3.0",
-    "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
-  },
-  {
-    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
-  },
-  {
-    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="
-  },
-  {
-    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
-  },
-  {
-    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="
-  },
-  {
-    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
-  },
-  {
-    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="
-  },
-  {
-    "pname": "runtime.native.System",
-    "version": "4.3.0",
-    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
-  },
-  {
-    "pname": "runtime.native.System.IO.Compression",
-    "version": "4.3.0",
-    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
-  },
-  {
-    "pname": "runtime.native.System.Net.Http",
-    "version": "4.3.0",
-    "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.Apple",
-    "version": "4.3.0",
-    "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="
-  },
-  {
-    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
-  },
-  {
-    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="
-  },
-  {
-    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
-  },
-  {
-    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="
-  },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
-    "version": "4.3.0",
-    "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
-  },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
-  },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="
-  },
-  {
-    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
-  },
-  {
-    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="
-  },
-  {
-    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
-  },
-  {
-    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="
-  },
-  {
-    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
-  },
-  {
-    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="
-  },
-  {
-    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
-  },
-  {
-    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.2",
-    "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="
-  },
-  {
-    "pname": "runtime.unix.Microsoft.Win32.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
-  },
-  {
-    "pname": "runtime.unix.System.Console",
-    "version": "4.3.0",
-    "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
-  },
-  {
-    "pname": "runtime.unix.System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
-  },
-  {
-    "pname": "runtime.unix.System.IO.FileSystem",
-    "version": "4.3.0",
-    "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="
-  },
-  {
-    "pname": "runtime.unix.System.Net.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
-  },
-  {
-    "pname": "runtime.unix.System.Net.Sockets",
-    "version": "4.3.0",
-    "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
-  },
-  {
-    "pname": "runtime.unix.System.Private.Uri",
-    "version": "4.3.0",
-    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
-  },
-  {
-    "pname": "runtime.unix.System.Runtime.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
-  },
   {
     "pname": "SharpZipLib",
-    "version": "1.3.3",
-    "hash": "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4="
+    "version": "1.4.2",
+    "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="
   },
   {
     "pname": "StreamJsonRpc",
-    "version": "2.6.121",
-    "hash": "sha256-5tSk90kVoj0YRbuS1YIohu+c5zvykNd+s1MLfsK8+3c="
-  },
-  {
-    "pname": "System.AppContext",
-    "version": "4.3.0",
-    "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
-  },
-  {
-    "pname": "System.Buffers",
-    "version": "4.3.0",
-    "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
-  },
-  {
-    "pname": "System.Collections",
-    "version": "4.0.11",
-    "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="
-  },
-  {
-    "pname": "System.Collections",
-    "version": "4.3.0",
-    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
-  },
-  {
-    "pname": "System.Collections.Concurrent",
-    "version": "4.3.0",
-    "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
+    "version": "2.22.23",
+    "hash": "sha256-SRk+00fzJk/jA2dbQbYE/udmcZgqVkscgZT8yi+D2NY="
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "1.7.1",
-    "hash": "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="
-  },
-  {
-    "pname": "System.Collections.NonGeneric",
-    "version": "4.3.0",
-    "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="
-  },
-  {
-    "pname": "System.Collections.Specialized",
-    "version": "4.3.0",
-    "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
   },
   {
     "pname": "System.CommandLine",
-    "version": "2.0.0-beta4.22272.1",
-    "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="
-  },
-  {
-    "pname": "System.ComponentModel",
-    "version": "4.3.0",
-    "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="
+    "version": "2.0.1",
+    "hash": "sha256-NDBiPUt/ZZIMBcLHpF/6IMX/UpfsC/XnH3p4i4MHCFw="
   },
   {
     "pname": "System.ComponentModel.Annotations",
@@ -555,529 +195,24 @@
     "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
   },
   {
-    "pname": "System.ComponentModel.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="
-  },
-  {
-    "pname": "System.ComponentModel.TypeConverter",
-    "version": "4.3.0",
-    "hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="
-  },
-  {
-    "pname": "System.Console",
-    "version": "4.3.0",
-    "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
-  },
-  {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.0.11",
-    "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="
-  },
-  {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
-  },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "4.3.0",
-    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
-  },
-  {
-    "pname": "System.Diagnostics.Tools",
-    "version": "4.0.1",
-    "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="
-  },
-  {
-    "pname": "System.Diagnostics.Tools",
-    "version": "4.3.0",
-    "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
-  },
-  {
-    "pname": "System.Diagnostics.TraceSource",
-    "version": "4.3.0",
-    "hash": "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8="
-  },
-  {
-    "pname": "System.Diagnostics.Tracing",
-    "version": "4.3.0",
-    "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
-  },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.0.11",
-    "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="
-  },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="
-  },
-  {
-    "pname": "System.Globalization",
-    "version": "4.0.11",
-    "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="
-  },
-  {
-    "pname": "System.Globalization",
-    "version": "4.3.0",
-    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
-  },
-  {
-    "pname": "System.Globalization.Calendars",
-    "version": "4.3.0",
-    "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
-  },
-  {
-    "pname": "System.Globalization.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.1.0",
-    "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.3.0",
-    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
-  },
-  {
-    "pname": "System.IO.Compression",
-    "version": "4.3.0",
-    "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
-  },
-  {
-    "pname": "System.IO.Compression.ZipFile",
-    "version": "4.3.0",
-    "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
-  },
-  {
-    "pname": "System.IO.FileSystem",
-    "version": "4.0.1",
-    "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="
-  },
-  {
-    "pname": "System.IO.FileSystem",
-    "version": "4.3.0",
-    "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
-  },
-  {
-    "pname": "System.IO.FileSystem.Primitives",
-    "version": "4.0.1",
-    "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="
-  },
-  {
-    "pname": "System.IO.FileSystem.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
+    "pname": "System.Diagnostics.EventLog",
+    "version": "6.0.0",
+    "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "4.7.2",
-    "hash": "sha256-yWlQwmzMX+4kVQbOd9WowP6bvZnjo4yddkycer3CZJs="
-  },
-  {
-    "pname": "System.Linq",
-    "version": "4.1.0",
-    "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="
-  },
-  {
-    "pname": "System.Linq",
-    "version": "4.3.0",
-    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
-  },
-  {
-    "pname": "System.Linq.Expressions",
-    "version": "4.1.0",
-    "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="
-  },
-  {
-    "pname": "System.Linq.Expressions",
-    "version": "4.3.0",
-    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
-  },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.4",
-    "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
-  },
-  {
-    "pname": "System.Net.Http",
-    "version": "4.3.0",
-    "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
-  },
-  {
-    "pname": "System.Net.Http",
-    "version": "4.3.4",
-    "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="
-  },
-  {
-    "pname": "System.Net.NameResolution",
-    "version": "4.3.0",
-    "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
-  },
-  {
-    "pname": "System.Net.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
-  },
-  {
-    "pname": "System.Net.Sockets",
-    "version": "4.3.0",
-    "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
-  },
-  {
-    "pname": "System.Net.WebSockets",
-    "version": "4.3.0",
-    "hash": "sha256-l3h3cF1cCC9zMhWLKSDnZBZvFADUd0Afe2+iAwBA0r0="
-  },
-  {
-    "pname": "System.ObjectModel",
-    "version": "4.0.12",
-    "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="
-  },
-  {
-    "pname": "System.ObjectModel",
-    "version": "4.3.0",
-    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
-  },
-  {
-    "pname": "System.Private.Uri",
-    "version": "4.3.0",
-    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
-  },
-  {
-    "pname": "System.Reflection",
-    "version": "4.1.0",
-    "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="
-  },
-  {
-    "pname": "System.Reflection",
-    "version": "4.3.0",
-    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
-  },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.0.1",
-    "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="
-  },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.3.0",
-    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
-  },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.7.0",
-    "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
-  },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.0.1",
-    "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="
-  },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.3.0",
-    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
-  },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.0.1",
-    "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="
-  },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.3.0",
-    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
-  },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.6.0",
-    "hash": "sha256-913OIkt3v3N12Yke328IRxTtgYUQYNs/eSzOs8wUPkM="
-  },
-  {
-    "pname": "System.Reflection.Extensions",
-    "version": "4.0.1",
-    "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="
-  },
-  {
-    "pname": "System.Reflection.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
   },
   {
     "pname": "System.Reflection.Metadata",
-    "version": "1.6.0",
-    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
+    "version": "8.0.0",
+    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
   },
   {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.0.1",
-    "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="
-  },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
-  },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.1.0",
-    "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="
-  },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.3.0",
-    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
-  },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.0.1",
-    "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="
-  },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.3.0",
-    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
-  },
-  {
-    "pname": "System.Runtime",
-    "version": "4.1.0",
-    "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="
-  },
-  {
-    "pname": "System.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.2",
-    "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.7.1",
-    "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "6.0.0-rc.1.21451.13",
-    "hash": "sha256-BgiqR6Y555tJEBEqDT5+yHCyQy5Wv9bLKlKWcQFiq2w="
-  },
-  {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.1.0",
-    "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="
-  },
-  {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
-  },
-  {
-    "pname": "System.Runtime.Handles",
-    "version": "4.0.1",
-    "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="
-  },
-  {
-    "pname": "System.Runtime.Handles",
-    "version": "4.3.0",
-    "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
-  },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.1.0",
-    "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="
-  },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
-  },
-  {
-    "pname": "System.Runtime.InteropServices.RuntimeInformation",
-    "version": "4.3.0",
-    "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
-  },
-  {
-    "pname": "System.Runtime.Numerics",
-    "version": "4.3.0",
-    "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
-  },
-  {
-    "pname": "System.Runtime.Serialization.Primitives",
-    "version": "4.1.1",
-    "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="
-  },
-  {
-    "pname": "System.Security.AccessControl",
-    "version": "4.6.0",
-    "hash": "sha256-rspJ63MbjNVDve0owXby0Pu2vHjQvR2uuhCDCJ9vgfI="
-  },
-  {
-    "pname": "System.Security.Claims",
-    "version": "4.3.0",
-    "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="
-  },
-  {
-    "pname": "System.Security.Cryptography.Algorithms",
-    "version": "4.3.0",
-    "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
-  },
-  {
-    "pname": "System.Security.Cryptography.Cng",
-    "version": "4.3.0",
-    "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
-  },
-  {
-    "pname": "System.Security.Cryptography.Csp",
-    "version": "4.3.0",
-    "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
-  },
-  {
-    "pname": "System.Security.Cryptography.Encoding",
-    "version": "4.3.0",
-    "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
-  },
-  {
-    "pname": "System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
-  },
-  {
-    "pname": "System.Security.Cryptography.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
-  },
-  {
-    "pname": "System.Security.Cryptography.X509Certificates",
-    "version": "4.3.0",
-    "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
-  },
-  {
-    "pname": "System.Security.Principal",
-    "version": "4.3.0",
-    "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="
-  },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "4.3.0",
-    "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
-  },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "4.6.0",
-    "hash": "sha256-lZeXm45RboVgqnPQVJ65y8b5b+9FSVr0MBciG777rso="
-  },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.0.11",
-    "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="
-  },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.3.0",
-    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
-  },
-  {
-    "pname": "System.Text.Encoding.Extensions",
-    "version": "4.0.11",
-    "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="
-  },
-  {
-    "pname": "System.Text.Encoding.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
-  },
-  {
-    "pname": "System.Text.RegularExpressions",
-    "version": "4.1.0",
-    "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="
-  },
-  {
-    "pname": "System.Text.RegularExpressions",
-    "version": "4.3.0",
-    "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
-  },
-  {
-    "pname": "System.Threading",
-    "version": "4.0.11",
-    "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="
-  },
-  {
-    "pname": "System.Threading",
-    "version": "4.3.0",
-    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
-  },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.0.11",
-    "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="
-  },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.3.0",
-    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
-  },
-  {
-    "pname": "System.Threading.Tasks.Dataflow",
-    "version": "4.11.1",
-    "hash": "sha256-fIt5XouNaswWOvZWpIHbTItVzUJDCmz3XawHr6J2yyU="
-  },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.0.0",
-    "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="
-  },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
-  },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.5.4",
-    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
-  },
-  {
-    "pname": "System.Threading.ThreadPool",
-    "version": "4.3.0",
-    "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
-  },
-  {
-    "pname": "System.Threading.Timer",
-    "version": "4.3.0",
-    "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
-  },
-  {
-    "pname": "System.Xml.ReaderWriter",
-    "version": "4.0.11",
-    "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="
-  },
-  {
-    "pname": "System.Xml.ReaderWriter",
-    "version": "4.3.0",
-    "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
-  },
-  {
-    "pname": "System.Xml.XDocument",
-    "version": "4.0.11",
-    "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="
-  },
-  {
-    "pname": "System.Xml.XDocument",
-    "version": "4.3.0",
-    "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
-  },
-  {
-    "pname": "System.Xml.XmlDocument",
-    "version": "4.3.0",
-    "hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="
+    "pname": "Validation",
+    "version": "2.5.51",
+    "hash": "sha256-yMZ6znWbsLKHcx+VwhyoPdSjGlAJsAAx9kP6xnE9YE4="
   },
   {
     "pname": "WaylandNET",
@@ -1086,8 +221,13 @@
   },
   {
     "pname": "xunit",
-    "version": "2.4.1",
-    "hash": "sha256-QGDuE0ZnsxyEJONP8GcJ80PmPeb+OawwdSW8y72aw3U="
+    "version": "2.9.3",
+    "hash": "sha256-BPrpSbjlIB7PoH+ocCusqMDrMZgRQZSzeTeJzHK/I9c="
+  },
+  {
+    "pname": "xunit.abstractions",
+    "version": "2.0.2",
+    "hash": "sha256-w5APCW7suBdoDOmQqm/8Gq6+Sk88JcTR09zjmj9s17E="
   },
   {
     "pname": "xunit.abstractions",
@@ -1096,32 +236,47 @@
   },
   {
     "pname": "xunit.analyzers",
-    "version": "0.10.0",
-    "hash": "sha256-8lRZhogXHYksa9ChnkFXpBnTMlLlYIvu3Av7qQYWwJY="
+    "version": "1.18.0",
+    "hash": "sha256-DOgamLnfi9Ua5IDm3JVm9MaOFbSSbmq5l8j2NPO3qd0="
   },
   {
     "pname": "xunit.assert",
-    "version": "2.4.1",
-    "hash": "sha256-hl1cMSakAlwkpFEchxCNMdvQie6PMJ1uFrhzgOC3vsY="
+    "version": "2.9.3",
+    "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA="
   },
   {
     "pname": "xunit.core",
-    "version": "2.4.1",
-    "hash": "sha256-KgUgAIJIPHQ5VQ4FiB+i5u2JXSYxmvMCV8zXP4kcy9o="
+    "version": "2.9.3",
+    "hash": "sha256-qkVQ8Jw/LZWmxirkPOwiry7bvZn3IuaRzu/sp2H8anw="
   },
   {
     "pname": "xunit.extensibility.core",
-    "version": "2.4.1",
-    "hash": "sha256-oACVOrvF4XmKFr+8ZqPVpjbopZgeRwaXveJGW2XUeIA="
+    "version": "2.4.0",
+    "hash": "sha256-LbuXEcEJjGn3L6FCbC119+MY/QLvfLlGkCeAsCsZqGE="
+  },
+  {
+    "pname": "xunit.extensibility.core",
+    "version": "2.9.3",
+    "hash": "sha256-mcpVX+m0R7F0ev9CaBnbai9gtu4GVcqijEuRqe89D0g="
   },
   {
     "pname": "xunit.extensibility.execution",
-    "version": "2.4.1",
-    "hash": "sha256-KmKEdgsUq4zuQJ2saJA0YT1CIZ2AuhZL5V7cF2Cncd0="
+    "version": "2.4.0",
+    "hash": "sha256-chRJEazwq93yhVONlbtTI1znqYy0gdAoQajPRnhM/i4="
+  },
+  {
+    "pname": "xunit.extensibility.execution",
+    "version": "2.9.3",
+    "hash": "sha256-2rxMs2Dt4cAcmOFMwP5Yd3RpP0BnmiL8cXlKysXY0jw="
   },
   {
     "pname": "xunit.runner.visualstudio",
-    "version": "2.4.3",
-    "hash": "sha256-42axn0yDDiJWKV8UEYzYWgiKbpc6mHh9M/eeylYGLUg="
+    "version": "3.1.5",
+    "hash": "sha256-O5657884QGldszsEWQFCDRTXViFBmZ4GGC+4iU+usSQ="
+  },
+  {
+    "pname": "Xunit.SkippableFact",
+    "version": "1.5.23",
+    "hash": "sha256-/notgaEOs+nYVwukKJOXhjlnHhOoKAFnRT3fQne+chc="
   }
 ]
diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix
index d435bdc16f36..1bc4e1f7b0b2 100644
--- a/pkgs/by-name/op/opentabletdriver/package.nix
+++ b/pkgs/by-name/op/opentabletdriver/package.nix
@@ -23,13 +23,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "OpenTabletDriver";
-  version = "0.6.6.2";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "OpenTabletDriver";
     repo = "OpenTabletDriver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OeioFdevYPiLl9w7FXVmpbcp1cIMoMYnSLgoBisOOOU=";
+    hash = "sha256-jL3d1DjY9n85BrO6ajZVvJMHmPYfxng4YE25s/9hfGA=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
@@ -91,6 +91,8 @@ buildDotnetModule (finalAttrs: {
       --replace-fail '/usr/bin/env rm' '${lib.getExe' coreutils "rm"}'
   '';
 
+  dontWrapGApps = true;
+
   postFixup = ''
     # Give a more "*nix" name to the binaries
     mv $out/bin/OpenTabletDriver.Console $out/bin/otd
@@ -102,6 +104,10 @@ buildDotnetModule (finalAttrs: {
     # Generate udev rules from source
     mkdir -p $out/lib/udev/rules.d
     ./generate-rules.sh > $out/lib/udev/rules.d/70-opentabletdriver.rules
+
+    wrapProgram $out/bin/otd-gui \
+      "''${gappsWrapperArgs[@]}" \
+      --add-flags --skipupdate
   '';
 
   desktopItems = [
diff --git a/pkgs/by-name/op/opentxl-unwrapped/factorial-test.nix b/pkgs/by-name/op/opentxl-unwrapped/factorial-test.nix
index 38978a720bf2..e07093db1a09 100644
--- a/pkgs/by-name/op/opentxl-unwrapped/factorial-test.nix
+++ b/pkgs/by-name/op/opentxl-unwrapped/factorial-test.nix
@@ -1,9 +1,9 @@
 {
   lib,
-  runCommandNoCC,
+  runCommand,
   opentxl,
 }:
-runCommandNoCC "opentxl-test"
+runCommand "opentxl-test"
   {
     nativeBuildInputs = [ opentxl ];
     src = lib.sources.sourceByRegex ./. [
diff --git a/pkgs/by-name/op/openvr/package.nix b/pkgs/by-name/op/openvr/package.nix
index 65afa533f5b0..77f2baeaca4c 100644
--- a/pkgs/by-name/op/openvr/package.nix
+++ b/pkgs/by-name/op/openvr/package.nix
@@ -20,6 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xtCqro73fWQ6i0PiVmWYCK30DUSq1WeALoUolUjuWlE=";
   };
 
+  postUnpack = ''
+    # Move in-tree jsoncpp out to complement the patch above
+    # fetchpatch2 is not able to handle these renames
+    mkdir source/thirdparty
+    mv source/src/json source/thirdparty/jsoncpp
+  '';
+
   patches = [
     # https://github.com/ValveSoftware/openvr/pull/594
     (fetchpatch2 {
@@ -35,11 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  postUnpack = ''
-    # Move in-tree jsoncpp out to complement the patch above
-    # fetchpatch2 is not able to handle these renames
-    mkdir source/thirdparty
-    mv source/src/json source/thirdparty/jsoncpp
+  postPatch = ''
+    # Fix jsoncpp ABI for downstream packages
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "-std=c++11" "-std=c++17"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/optiland/package.nix b/pkgs/by-name/op/optiland/package.nix
new file mode 100644
index 000000000000..e8ca54081124
--- /dev/null
+++ b/pkgs/by-name/op/optiland/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenvNoCC,
+  python3Packages,
+  qt6,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "optiland-python-env";
+  # Inheriting src too, to hint nix-update
+  inherit (python3Packages.optiland) version src;
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    qt6.wrapQtAppsHook
+  ];
+  buildInputs = [
+    qt6.qtbase
+  ];
+
+  dontUnpack = true;
+  dontConfigure = true;
+
+  passthru = {
+    pythonPaths = python3Packages.requiredPythonModules (
+      [
+        python3Packages.optiland
+        python3Packages.python
+      ]
+      ++ python3Packages.optiland.passthru.optional-dependencies.gui
+      ++ python3Packages.optiland.passthru.optional-dependencies.torch
+    );
+    pythonPath =
+      lib.makeSearchPathOutput "out" python3Packages.python.sitePackages
+        finalAttrs.finalPackage.passthru.pythonPaths;
+    makeWrapperArgs = [
+      # leaving here room for potential additional arguments
+    ];
+  };
+
+  # Modelded after `python.buildEnv`'s postBuild, but we don't link paths at
+  # all, only create $out/bin/optiland (and potentially more) executable(s).
+  buildPhase = ''
+    mkdir -p $out/bin
+    cd ${python3Packages.optiland}/bin
+    for prg in *; do
+      if [ -f "$prg" ] && [ -x "$prg" ]; then
+        makeWrapper "${python3Packages.optiland}/bin/$prg" "$out/bin/$prg" \
+          --set NIX_PYTHONPREFIX "$out" \
+          --set NIX_PYTHONEXECUTABLE "${placeholder "out"}/bin/${python3Packages.python.executable}" \
+          --set NIX_PYTHONPATH ${finalAttrs.finalPackage.passthru.pythonPath} \
+          --set PYTHONNOUSERSITE "true" \
+          ${lib.concatStringsSep " " finalAttrs.finalPackage.passthru.makeWrapperArgs}
+      fi
+    done
+  '';
+
+  dontInstall = true;
+
+  meta = python3Packages.optiland.meta // {
+    description = python3Packages.optiland.meta.description + "; The GUI";
+    mainProgram = "optiland";
+  };
+})
diff --git a/pkgs/by-name/op/optnix/package.nix b/pkgs/by-name/op/optnix/package.nix
index 42c7c24a4a7a..a14c41e2c6de 100644
--- a/pkgs/by-name/op/optnix/package.nix
+++ b/pkgs/by-name/op/optnix/package.nix
@@ -9,12 +9,12 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "optnix";
-  version = "0.3.1";
+  version = "0.3.2";
   src = fetchFromSourcehut {
     owner = "~watersucks";
     repo = "optnix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fjEtC0GlTsxS6cMNJgaXkI5ik8fZPoPFy43XLIEUUPI=";
+    hash = "sha256-FLp+/X0r6NANPYzlj2si8JNmwd5iJPcOdQIJ9f5LLUg=";
   };
 
   vendorHash = "sha256-g/H91PiHWSRRQOkaobw2wAYX/07DFxWTCTlKzf7BT1Y=";
diff --git a/pkgs/by-name/op/opus-tools/package.nix b/pkgs/by-name/op/opus-tools/package.nix
index 398b6cf67942..eea7db950cc0 100644
--- a/pkgs/by-name/op/opus-tools/package.nix
+++ b/pkgs/by-name/op/opus-tools/package.nix
@@ -1,25 +1,36 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   libogg,
   libao,
+  autoreconfHook,
   pkg-config,
   flac,
   opusfile,
   libopusenc,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opus-tools";
   version = "0.2";
 
-  src = fetchurl {
-    url = "https://downloads.xiph.org/releases/opus/opus-tools-${finalAttrs.version}.tar.gz";
-    sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl";
+  src = fetchFromGitLab {
+    domain = "gitlab.xiph.org";
+    owner = "xiph";
+    repo = "opus-tools";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Tr+xvZKu1nuachgN7GXwqFyJYPQ/sWqaVJQHWhLAt+k=";
   };
+  postPatch = ''
+    echo 'PACKAGE_VERSION="${finalAttrs.version}"' > package_version
+  '';
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
   buildInputs = [
     libogg
     libao
@@ -28,6 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
     libopusenc
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/opusenc";
+
   meta = {
     description = "Tools to work with opus encoded audio streams";
     homepage = "https://www.opus-codec.org/";
diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix
index eb888578f63a..eb4049caceec 100644
--- a/pkgs/by-name/or/orbstack/package.nix
+++ b/pkgs/by-name/or/orbstack/package.nix
@@ -6,15 +6,15 @@
 }:
 let
   inherit (stdenvNoCC.hostPlatform) system;
-  version = "2.0.5-19905";
+  version = "2.1.1-20026";
   sourceData = {
     aarch64-darwin = {
       arch = "arm64";
-      hash = "sha256-YBiJVRzf3H/u4Ui3/bBID6C6XA2wvo8cBH/IQIhqdXE=";
+      hash = "sha256-GKQfdZlY4foJUWlrggtUeNPtc1P4ykhv6dAmoafZcgc=";
     };
     x86_64-darwin = {
       arch = "amd64";
-      hash = "sha256-qFj6Lc0m9/dc1/mcJO0aafRZs5vyCQyCb5l+zJwdF+s=";
+      hash = "sha256-x+748PKaqsnQqeqWIgihNipjztCSZkWluomDXlJgUTw=";
     };
   };
   sources = lib.mapAttrs (
diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index bff4abbdf27e..c1880e18077a 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -28,7 +28,9 @@
   hicolor-icon-theme,
   libsecret,
   libpng,
+  makeFontsConf,
   mpfr,
+  nanum,
   nlopt,
   opencascade-occt_7_6,
   openvdb,
@@ -59,13 +61,19 @@ let
           "--enable-secretstore"
         ];
       });
+
+  # Workaround for crash due to missing font
+  # https://github.com/OrcaSlicer/OrcaSlicer/issues/11641
+  fontsConf = makeFontsConf {
+    fontDirectories = [ nanum ];
+  };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "orca-slicer";
   version = "2.3.2";
 
   src = fetchFromGitHub {
-    owner = "SoftFever";
+    owner = "OrcaSlicer";
     repo = "OrcaSlicer";
     tag = "v${finalAttrs.version}";
     hash = "sha256-c1WTODLrXGtyJWkEueOz5jHhPbA/JFcMeAwhpvoKnKo=";
@@ -132,11 +140,11 @@ stdenv.mkDerivation (finalAttrs: {
     ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
     # Link opencv_core and opencv_imgproc instead of opencv_world
     ./patches/dont-link-opencv-world-orca.patch
-    # The changeset from https://github.com/SoftFever/OrcaSlicer/pull/7650, can be removed when that PR gets merged
+    # The changeset from https://github.com/OrcaSlicer/OrcaSlicer/pull/7650, can be removed when that PR gets merged
     # Allows disabling the update nag screen
     (fetchpatch {
       name = "pr-7650-configurable-update-check.patch";
-      url = "https://github.com/SoftFever/OrcaSlicer/commit/d10a06ae11089cd1f63705e87f558e9392f7a167.patch";
+      url = "https://github.com/OrcaSlicer/OrcaSlicer/commit/d10a06ae11089cd1f63705e87f558e9392f7a167.patch";
       hash = "sha256-t4own5AwPsLYBsGA15id5IH1ngM0NSuWdFsrxMRXmTk=";
     })
 
@@ -219,6 +227,7 @@ stdenv.mkDerivation (finalAttrs: {
         ]
       }"
       --set WEBKIT_DISABLE_COMPOSITING_MODE 1
+      --set FONTCONFIG_FILE "${fontsConf}"
       ${lib.optionalString withNvidiaGLWorkaround ''
         --set __GLX_VENDOR_LIBRARY_NAME mesa
         --set __EGL_VENDOR_LIBRARY_FILENAMES /run/opengl-driver/share/glvnd/egl_vendor.d/50_mesa.json
@@ -235,8 +244,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)";
-    homepage = "https://github.com/SoftFever/OrcaSlicer";
-    changelog = "https://github.com/SoftFever/OrcaSlicer/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/OrcaSlicer/OrcaSlicer";
+    changelog = "https://github.com/OrcaSlicer/OrcaSlicer/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       zhaofengli
diff --git a/pkgs/by-name/os/osm-gps-map/package.nix b/pkgs/by-name/os/osm-gps-map/package.nix
index 9a7755a399f0..02569cbc83f5 100644
--- a/pkgs/by-name/os/osm-gps-map/package.nix
+++ b/pkgs/by-name/os/osm-gps-map/package.nix
@@ -51,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
+  configureFlags = [
+    "CFLAGS=-std=gnu17"
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     gtk-doc
diff --git a/pkgs/by-name/os/osmium/package.nix b/pkgs/by-name/os/osmium/package.nix
index 717ce1d49f33..7eb3de6fd611 100644
--- a/pkgs/by-name/os/osmium/package.nix
+++ b/pkgs/by-name/os/osmium/package.nix
@@ -22,6 +22,8 @@
   nss,
   nspr,
   gtk3,
+  libnotify,
+  libpulseaudio,
 }:
 
 stdenv.mkDerivation rec {
@@ -55,6 +57,8 @@ stdenv.mkDerivation rec {
     nss
     nspr
     gtk3
+    libnotify
+    libpulseaudio
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 8f0abc373c93..b49b5ed29794 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2026.418.0";
+  version = "2026.425.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
-        hash = "sha256-zJRKgFbaXdXD8INiaDDemlNfVilTAyUEjkPNVF5H85Q=";
+        hash = "sha256-ZXivLSEpC6A6LOclb2PF12YbTwDNcL9E3fW+oHTAoVQ=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
-        hash = "sha256-vUXvmfZd/dh4rzwcNgrVDnlrZxoJsBrjYt35hNz/WYw=";
+        hash = "sha256-FAxkNOmRu32z0cx1AMrLl00npGIRK9+jUwE3Efi8ENI=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
-        hash = "sha256-51zjZ7OxftIKl21d2xCjUhaQMtwyQK6vEGRPTXnqjXU=";
+        hash = "sha256-JpuHeZdXHx5n93y87cUiuBFFXexIMx0gO2HMezXWy0A=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index 49c949ab609b..358463161316 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -631,8 +631,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2026.411.0",
-    "hash": "sha256-cc4GkPDnw22X2fPKSyULCflgvxS4cLqzx45j+KrZuiI="
+    "version": "2026.423.0",
+    "hash": "sha256-fzw3TLXkLkBpy2JKJ1cz2yyc6ncJQGAjFEXlw4n/jH0="
   },
   {
     "pname": "ppy.osuTK.NS20",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 023bab7499a8..0a4735ba30a9 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2026.418.0";
+  version = "2026.425.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = "${version}-lazer";
-    hash = "sha256-0l0MlfCyO81X/Rpjhjc9WyxdhEhTLZcqRSOgYSaK6wk=";
+    hash = "sha256-gYxsoMrdHQzy8Ny2pLUbJ/UMEHIZfvLnFjX4cKHa3ck=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";
@@ -70,9 +70,14 @@ buildDotnetModule rec {
   fixupPhase = ''
     runHook preFixup
 
+    # Disabling error reporting.
+    # https://github.com/ppy/osu/commit/48434dd683d095c42c01def8ff7cb95ce0a85ce4
+    # Unhandled exception. System.ArgumentException: Invalid DSN: No public key provided.
+
     wrapProgram $out/bin/osu! \
       ${lib.optionalString nativeWayland "--set SDL_VIDEODRIVER wayland"} \
-      --set OSU_EXTERNAL_UPDATE_PROVIDER 1
+      --set OSU_EXTERNAL_UPDATE_PROVIDER 1 \
+      --set OSU_DISABLE_ERROR_REPORTING 1
 
     for i in 16 32 48 64 96 128 256 512 1024; do
       install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu.png
diff --git a/pkgs/by-name/ot/otus-lisp/package.nix b/pkgs/by-name/ot/otus-lisp/package.nix
index 1de3f09f8f05..bf5d62c0f378 100644
--- a/pkgs/by-name/ot/otus-lisp/package.nix
+++ b/pkgs/by-name/ot/otus-lisp/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "otus-lisp";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "yuriy-chumak";
     repo = "ol";
     rev = finalAttrs.version;
-    hash = "sha256-5ixpTTXwJbLM2mJ/nwzjz0aKG/QGVLPScY8EaG7swGU=";
+    hash = "sha256-7QUyfA9aEZ0VJO4Un2jCyXIxl98tsW4/KjW7LWDnMtU=";
   };
 
   nativeBuildInputs = [ xxd ];
diff --git a/pkgs/by-name/ou/outline/package.nix b/pkgs/by-name/ou/outline/package.nix
index 1e1f4f06797c..ec6bc3802090 100644
--- a/pkgs/by-name/ou/outline/package.nix
+++ b/pkgs/by-name/ou/outline/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "outline";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-T9oMnDYbkT50IOCflL7tay0iUXui7sW+gxddGKOvzbk=";
+    hash = "sha256-QFzLHWmU2DrmKAR5ZKAtnHXZdBfgUfGpTJ6c1zi7//k=";
   };
 
   missingHashes = ./missing-hashes.json;
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-4JmXn8/R0IssZrVyk6OMo5ZsSdo+Wmcr6cvuviMi4GA=";
+    hash = "sha256-07/cWCIAsT+zZR6BKEirGfRFw3UaImMMJPSYvmN4g7E=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/ov/oversteer/package.nix b/pkgs/by-name/ov/oversteer/package.nix
index 0b00fbb43108..f2ba9d480d4d 100644
--- a/pkgs/by-name/ov/oversteer/package.nix
+++ b/pkgs/by-name/ov/oversteer/package.nix
@@ -34,18 +34,17 @@ let
     ]
   );
 
-  version = "0.8.3";
 in
-stdenv.mkDerivation {
-  inherit version;
+stdenv.mkDerivation (finalAttrs: {
+  version = "0.8.3";
 
   pname = "oversteer";
 
   src = fetchFromGitHub {
     owner = "berarma";
     repo = "oversteer";
-    rev = "v${version}";
-    sha256 = "sha256-X58U7lFH53nCaXnE7uXgV7aea6qntNfH5TIt68xSefY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-X58U7lFH53nCaXnE7uXgV7aea6qntNfH5TIt68xSefY=";
   };
 
   buildInputs = [
@@ -101,11 +100,11 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "https://github.com/berarma/oversteer";
-    changelog = "https://github.com/berarma/oversteer/releases/tag/${version}";
+    changelog = "https://github.com/berarma/oversteer/releases/tag/${finalAttrs.src.tag}";
     description = "Steering Wheel Manager for Linux";
     mainProgram = "oversteer";
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.srounce ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/ov/ovhcloud-cli/package.nix b/pkgs/by-name/ov/ovhcloud-cli/package.nix
index 6f3cf5b51390..754d83b55bc1 100644
--- a/pkgs/by-name/ov/ovhcloud-cli/package.nix
+++ b/pkgs/by-name/ov/ovhcloud-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGo126Module (finalAttrs: {
   pname = "ovhcloud-cli";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "ovh";
     repo = "ovhcloud-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NBfMxXu5sZpv+OnoMCq4xc4AVQU+mbPrapVdq2Hffb8=";
+    hash = "sha256-MiDX819XWBdtaeVwTRDMuuvmfWRQ0qhi3gQABHVQR3k=";
   };
 
-  vendorHash = "sha256-JNnIpRr4zdGtlOOKGf1bQVViMgjnwGBAmYbFcCpzStY=";
+  vendorHash = "sha256-fDn6MUD2jr06T66xSxUtNFsL+upF1M2tD6IVdzhgfVI=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix
index 6dc27221e7ed..8ff18df03655 100644
--- a/pkgs/by-name/ov/ovn/package.nix
+++ b/pkgs/by-name/ov/ovn/package.nix
@@ -30,13 +30,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ovn";
-  version = "26.03.0";
+  version = "26.03.1";
 
   src = fetchFromGitHub {
     owner = "ovn-org";
     repo = "ovn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jw9SRDu2QqgMqApwTYcZUwNAq60LISb7OJJLDS46bJE=";
+    hash = "sha256-m2YEFyIBrXUo4mxdDJ9bgVeWUxefi9muJ9iGtnq3bgs=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix
index abc86ccf0112..483ff4f0e428 100644
--- a/pkgs/by-name/ow/owi/package.nix
+++ b/pkgs/by-name/ow/owi/package.nix
@@ -15,14 +15,14 @@ let
 in
 ocamlPackages.buildDunePackage {
   pname = "owi";
-  version = "0.2-unstable-2026-04-12";
+  version = "0.2-unstable-2026-04-27";
 
   src = fetchFromGitHub {
     owner = "ocamlpro";
     repo = "owi";
-    rev = "cd54ee715561dc40c9338a16d37eabaa65cbbeaf";
+    rev = "1a26145d95835096b3e86e8b2376c5650159b6c6";
     fetchSubmodules = true;
-    hash = "sha256-ET/UHwQ0wwXtP1CzAksPi7BRJXyefE4qvi+2r1vl3OI=";
+    hash = "sha256-xVNz9B3a6khlA7omv1+vJDreLrVNAFpcLBxPPx36/5E=";
   };
 
   nativeBuildInputs = with ocamlPackages; [
diff --git a/pkgs/by-name/ow/owncast/fix-go.sum.diff b/pkgs/by-name/ow/owncast/fix-go.sum.diff
deleted file mode 100644
index 46cd99d2d32d..000000000000
--- a/pkgs/by-name/ow/owncast/fix-go.sum.diff
+++ /dev/null
@@ -1,128 +0,0 @@
-diff --git a/go.mod b/go.mod
-index 7c512f8f22..4b702c6048 100644
---- a/go.mod
-+++ b/go.mod
-@@ -45,6 +45,7 @@ require (
- 	4d63.com/gochecknoglobals v0.2.2 // indirect
- 	cel.dev/expr v0.24.0 // indirect
- 	codeberg.org/chavacava/garif v0.2.0 // indirect
-+	codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
- 	dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
- 	dev.gaijin.team/go/golib v0.6.0 // indirect
- 	filippo.io/edwards25519 v1.1.0 // indirect
-@@ -194,6 +195,7 @@ require (
- 	github.com/ldez/exptostd v0.4.5 // indirect
- 	github.com/ldez/gomoddirectives v0.8.0 // indirect
- 	github.com/ldez/grignotin v0.10.1 // indirect
-+	github.com/ldez/structtags v0.6.1 // indirect
- 	github.com/ldez/tagliatelle v0.7.2 // indirect
- 	github.com/ldez/usetesting v0.5.0 // indirect
- 	github.com/leonklingele/grouper v1.1.2 // indirect
-diff --git a/go.sum b/go.sum
-index 61f1d39577..8818677916 100644
---- a/go.sum
-+++ b/go.sum
-@@ -6,6 +6,8 @@ cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
- cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
- codeberg.org/chavacava/garif v0.2.0 h1:F0tVjhYbuOCnvNcU3YSpO6b3Waw6Bimy4K0mM8y6MfY=
- codeberg.org/chavacava/garif v0.2.0/go.mod h1:P2BPbVbT4QcvLZrORc2T29szK3xEOlnl0GiPTJmEqBQ=
-+codeberg.org/polyfloyd/go-errorlint v1.9.0 h1:VkdEEmA1VBpH6ecQoMR4LdphVI3fA4RrCh2an7YmodI=
-+codeberg.org/polyfloyd/go-errorlint v1.9.0/go.mod h1:GPRRu2LzVijNn4YkrZYJfatQIdS+TrcK8rL5Xs24qw8=
- dev.gaijin.team/go/exhaustruct/v4 v4.0.0 h1:873r7aNneqoBB3IaFIzhvt2RFYTuHgmMjoKfwODoI1Y=
- dev.gaijin.team/go/exhaustruct/v4 v4.0.0/go.mod h1:aZ/k2o4Y05aMJtiux15x8iXaumE88YdiB0Ai4fXOzPI=
- dev.gaijin.team/go/golib v0.6.0 h1:v6nnznFTs4bppib/NyU1PQxobwDHwCXXl15P7DV5Zgo=
-@@ -29,6 +31,7 @@ github.com/Antonboom/testifylint v1.6.4/go.mod h1:YO33FROXX2OoUfwjz8g+gUxQXio5i9
- github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
- github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
- github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-+github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
- github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
- github.com/CAFxX/httpcompression v0.0.9 h1:0ue2X8dOLEpxTm8tt+OdHcgA+gbDge0OqFQWGKSqgrg=
- github.com/CAFxX/httpcompression v0.0.9/go.mod h1:XX8oPZA+4IDcfZ0A71Hz0mZsv/YJOgYygkFhizVPilM=
-@@ -40,6 +43,7 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1
- github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
- github.com/MirrexOne/unqueryvet v1.3.0 h1:5slWSomgqpYU4zFuZ3NNOfOUxVPlXFDBPAVasZOGlAY=
- github.com/MirrexOne/unqueryvet v1.3.0/go.mod h1:IWwCwMQlSWjAIteW0t+28Q5vouyktfujzYznSIWiuOg=
-+github.com/MirrexOne/unqueryvet v1.4.0 h1:6KAkqqW2KUnkl9Z0VuTphC3IXRPoFqEkJEtyxxHj5eQ=
- github.com/MirrexOne/unqueryvet v1.4.0/go.mod h1:IWwCwMQlSWjAIteW0t+28Q5vouyktfujzYznSIWiuOg=
- github.com/OpenPeeDeeP/depguard/v2 v2.2.1 h1:vckeWVESWp6Qog7UZSARNqfu/cZqvki8zsuj3piCMx4=
- github.com/OpenPeeDeeP/depguard/v2 v2.2.1/go.mod h1:q4DKzC4UcVaAvcfd41CZh0PWpGgzrVxUYBlgKNGquUo=
-@@ -52,6 +56,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8v
- github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
- github.com/alecthomas/chroma/v2 v2.20.0 h1:sfIHpxPyR07/Oylvmcai3X/exDlE8+FA820NTz+9sGw=
- github.com/alecthomas/chroma/v2 v2.20.0/go.mod h1:e7tViK0xh/Nf4BYHl00ycY6rV7b8iXBksI9E359yNmA=
-+github.com/alecthomas/chroma/v2 v2.21.1 h1:FaSDrp6N+3pphkNKU6HPCiYLgm8dbe5UXIXcoBhZSWA=
- github.com/alecthomas/chroma/v2 v2.21.1/go.mod h1:NqVhfBR0lte5Ouh3DcthuUCTUpDC9cxBOfyMbMQPs3o=
- github.com/alecthomas/go-check-sumtype v0.3.1 h1:u9aUvbGINJxLVXiFvHUlPEaD7VDULsrxJb4Aq31NLkU=
- github.com/alecthomas/go-check-sumtype v0.3.1/go.mod h1:A8TSiN3UPRw3laIgWEUOHHLPa6/r9MtoigdlP5h3K/E=
-@@ -63,6 +68,7 @@ github.com/alexkohler/nakedret/v2 v2.0.6 h1:ME3Qef1/KIKr3kWX3nti3hhgNxw6aqN5pZmQ
- github.com/alexkohler/nakedret/v2 v2.0.6/go.mod h1:l3RKju/IzOMQHmsEvXwkqMDzHHvurNQfAgE1eVmT40Q=
- github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw=
- github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
-+github.com/alexkohler/prealloc v1.0.1 h1:A9P1haqowqUxWvU9nk6tQ7YktXIHf+LQM9wPRhuteEE=
- github.com/alexkohler/prealloc v1.0.1/go.mod h1:fT39Jge3bQrfA7nPMDngUfvUbQGQeJyGQnR+913SCig=
- github.com/alfatraining/structtag v1.0.0 h1:2qmcUqNcCoyVJ0up879K614L9PazjBSFruTB0GOFjCc=
- github.com/alfatraining/structtag v1.0.0/go.mod h1:p3Xi5SwzTi+Ryj64DqjLWz7XurHxbGsq6y3ubePJPus=
-@@ -188,11 +194,13 @@ github.com/getkin/kin-openapi v0.133.0 h1:pJdmNohVIJ97r4AUFtEXRXwESr8b0bD721u/Tz
- github.com/getkin/kin-openapi v0.133.0/go.mod h1:boAciF6cXk5FhPqe/NQeBTeenbjqU4LhWBf09ILVvWE=
- github.com/ghostiam/protogetter v0.3.17 h1:sjGPErP9o7i2Ym+z3LsQzBdLCNaqbYy2iJQPxGXg04Q=
- github.com/ghostiam/protogetter v0.3.17/go.mod h1:AivIX1eKA/TcUmzZdzbl+Tb8tjIe8FcyG6JFyemQAH4=
-+github.com/ghostiam/protogetter v0.3.18 h1:yEpghRGtP9PjKvVXtEzGpYfQj1Wl/ZehAfU6fr62Lfo=
- github.com/ghostiam/protogetter v0.3.18/go.mod h1:FjIu5Yfs6FT391m+Fjp3fbAYJ6rkL/J6ySpZBfnODuI=
- github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
- github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
- github.com/go-critic/go-critic v0.14.2 h1:PMvP5f+LdR8p6B29npvChUXbD1vrNlKDf60NJtgMBOo=
- github.com/go-critic/go-critic v0.14.2/go.mod h1:xwntfW6SYAd7h1OqDzmN6hBX/JxsEKl5up/Y2bsxgVQ=
-+github.com/go-critic/go-critic v0.14.3 h1:5R1qH2iFeo4I/RJU8vTezdqs08Egi4u5p6vOESA0pog=
- github.com/go-critic/go-critic v0.14.3/go.mod h1:xwntfW6SYAd7h1OqDzmN6hBX/JxsEKl5up/Y2bsxgVQ=
- github.com/go-fed/httpsig v0.1.1-0.20190914113940-c2de3672e5b5/go.mod h1:T56HUNYZUQ1AGUzhAYPugZfp36sKApVnGBgKlIY+aIE=
- github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI=
-@@ -251,6 +259,7 @@ github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
- github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
- github.com/godoc-lint/godoc-lint v0.10.2 h1:dksNgK+zebnVlj4Fx83CRnCmPO0qRat/9xfFsir1nfg=
- github.com/godoc-lint/godoc-lint v0.10.2/go.mod h1:KleLcHu/CGSvkjUH2RvZyoK1MBC7pDQg4NxMYLcBBsw=
-+github.com/godoc-lint/godoc-lint v0.11.1 h1:z9as8Qjiy6miRIa3VRymTa+Gt2RLnGICVikcvlUVOaA=
- github.com/godoc-lint/godoc-lint v0.11.1/go.mod h1:BAqayheFSuZrEAqCRxgw9MyvsM+S/hZwJbU1s/ejRj8=
- github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw=
- github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0=
-@@ -279,9 +288,11 @@ github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d h1:viFft9sS/dxoYY0a
- github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d/go.mod h1:ivJ9QDg0XucIkmwhzCDsqcnxxlDStoTl89jDMIoNxKY=
- github.com/golangci/golangci-lint/v2 v2.7.2 h1:AhBC+YeEueec4AGlIbvPym5C70Thx0JykIqXbdIXWx0=
- github.com/golangci/golangci-lint/v2 v2.7.2/go.mod h1:pDijleoBu7e8sejMqyZ3L5n6geqe+cVvOAz2QImqqVc=
-+github.com/golangci/golangci-lint/v2 v2.8.0 h1:wJnr3hJWY3eVzOUcfwbDc2qbi2RDEpvLmQeNFaPSNYA=
- github.com/golangci/golangci-lint/v2 v2.8.0/go.mod h1:xl+HafQ9xoP8rzw0z5AwnO5kynxtb80e8u02Ej/47RI=
- github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 h1:AkK+w9FZBXlU/xUmBtSJN1+tAI4FIvy5WtnUnY8e4p8=
- github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95/go.mod h1:k9mmcyWKSTMcPPvQUCfRWWQ9VHJ1U9Dc0R7kaXAgtnQ=
-+github.com/golangci/golines v0.14.0 h1:xt9d3RKBjhasA3qpoXs99J2xN2t6eBlpLHt0TrgyyXc=
- github.com/golangci/golines v0.14.0/go.mod h1:gf555vPG2Ia7mmy2mzmhVQbVjuK8Orw0maR1G4vVAAQ=
- github.com/golangci/misspell v0.7.0 h1:4GOHr/T1lTW0hhR4tgaaV1WS/lJ+ncvYCoFKmqJsj0c=
- github.com/golangci/misspell v0.7.0/go.mod h1:WZyyI2P3hxPY2UVHs3cS8YcllAeyfquQcKfdeE9AFVg=
-@@ -424,9 +435,12 @@ github.com/ldez/exptostd v0.4.5 h1:kv2ZGUVI6VwRfp/+bcQ6Nbx0ghFWcGIKInkG/oFn1aQ=
- github.com/ldez/exptostd v0.4.5/go.mod h1:QRjHRMXJrCTIm9WxVNH6VW7oN7KrGSht69bIRwvdFsM=
- github.com/ldez/gomoddirectives v0.7.1 h1:FaULkvUIG36hj6chpwa+FdCNGZBsD7/fO+p7CCsM6pE=
- github.com/ldez/gomoddirectives v0.7.1/go.mod h1:auDNtakWJR1rC+YX7ar+HmveqXATBAyEK1KYpsIRW/8=
-+github.com/ldez/gomoddirectives v0.8.0 h1:JqIuTtgvFC2RdH1s357vrE23WJF2cpDCPFgA/TWDGpk=
- github.com/ldez/gomoddirectives v0.8.0/go.mod h1:jutzamvZR4XYJLr0d5Honycp4Gy6GEg2mS9+2YX3F1Q=
- github.com/ldez/grignotin v0.10.1 h1:keYi9rYsgbvqAZGI1liek5c+jv9UUjbvdj3Tbn5fn4o=
- github.com/ldez/grignotin v0.10.1/go.mod h1:UlDbXFCARrXbWGNGP3S5vsysNXAPhnSuBufpTEbwOas=
-+github.com/ldez/structtags v0.6.1 h1:bUooFLbXx41tW8SvkfwfFkkjPYvFFs59AAMgVg6DUBk=
-+github.com/ldez/structtags v0.6.1/go.mod h1:YDxVSgDy/MON6ariaxLF2X09bh19qL7MtGBN5MrvbdY=
- github.com/ldez/tagliatelle v0.7.2 h1:KuOlL70/fu9paxuxbeqlicJnCspCRjH0x8FW+NfgYUk=
- github.com/ldez/tagliatelle v0.7.2/go.mod h1:PtGgm163ZplJfZMZ2sf5nhUT170rSuPgBimoyYtdaSI=
- github.com/ldez/usetesting v0.5.0 h1:3/QtzZObBKLy1F4F8jLuKJiKBjjVFi1IavpoWbmqLwc=
-@@ -630,6 +644,7 @@ github.com/schollz/sqlite3dump v1.3.1 h1:QXizJ7XEJ7hggjqjZ3YRtF3+javm8zKtzNByYtE
- github.com/schollz/sqlite3dump v1.3.1/go.mod h1:mzSTjZpJH4zAb1FN3iNlhWPbbdyeBpOaTW0hukyMHyI=
- github.com/securego/gosec/v2 v2.22.11-0.20251204091113-daccba6b93d7 h1:rZg6IGn0ySYZwCX8LHwZoYm03JhG/cVAJJ3O+u3Vclo=
- github.com/securego/gosec/v2 v2.22.11-0.20251204091113-daccba6b93d7/go.mod h1:9sr22NZO5Kfh7unW/xZxkGYTmj2484/fCiE54gw7UTY=
-+github.com/securego/gosec/v2 v2.22.11 h1:tW+weM/hCM/GX3iaCV91d5I6hqaRT2TPsFM1+USPXwg=
- github.com/securego/gosec/v2 v2.22.11/go.mod h1:KE4MW/eH0GLWztkbt4/7XpyH0zJBBnu7sYB4l6Wn7Mw=
- github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
- github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
-@@ -964,6 +979,7 @@ golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg
- golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
- golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
- golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
-+golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
- golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
- golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM=
- golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
diff --git a/pkgs/by-name/ow/owncast/package.nix b/pkgs/by-name/ow/owncast/package.nix
index db5c523b0900..4d9cdde6e826 100644
--- a/pkgs/by-name/ow/owncast/package.nix
+++ b/pkgs/by-name/ow/owncast/package.nix
@@ -9,7 +9,7 @@
   makeBinaryWrapper,
 }:
 let
-  version = "0.2.4";
+  version = "0.2.5";
 in
 buildGoModule {
   pname = "owncast";
@@ -19,14 +19,12 @@ buildGoModule {
     owner = "owncast";
     repo = "owncast";
     tag = "v${version}";
-    hash = "sha256-euqmAsGLh7enMbRKeGS7pB3L+12uAHFM2mqahst/bww=";
+    hash = "sha256-REgo9RC1izb9vJ6ae66Wti9yfP8DrCGetf6O4rX3DPY=";
   };
 
-  patches = [
-    ./fix-go.sum.diff
-  ];
+  vendorHash = "sha256-T4nr4lNUEq6grZ21qumaOjIDIDoJK7Ql8j8WbCy2u3g=n";
 
-  vendorHash = "sha256-XQXv1XeedHQozB56+boi32jsXQoCtD2XIg3deDvXIfw=";
+  subPackages = [ "." ];
 
   propagatedBuildInputs = [ ffmpeg ];
 
diff --git a/pkgs/by-name/ox/oxfmt/package.nix b/pkgs/by-name/ox/oxfmt/package.nix
index fdbacb66033c..236ffc6b17cf 100644
--- a/pkgs/by-name/ox/oxfmt/package.nix
+++ b/pkgs/by-name/ox/oxfmt/package.nix
@@ -21,25 +21,25 @@
 # A pure Rust build would lack the Prettier plugin functionality.
 stdenv.mkDerivation (finalAttrs: {
   pname = "oxfmt";
-  version = "0.40.0";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "oxc-project";
     repo = "oxc";
     tag = "oxfmt_v${finalAttrs.version}";
-    hash = "sha256-A2cq1WgZg8csNGB3yFNo21450f46n4ZVblke1yqlBCc=";
+    hash = "sha256-RMADw7oEf407J7/KDmIma0k3JKALMBkLqp9pyE+uRkA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Oz9u2+5lq+z9A81BEn2T4jvVMqf1uNXip+OH4AxiTG0=";
+    hash = "sha256-Xla3mPOkBIfA4BMd+3/lO3mXy4V96DgyT+CzuhTTAd0=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 2;
-    hash = "sha256-iO1MRUTO8Ce1YGH/qDWQmdfvTfvsmgwGBaybWw3wiu0=";
+    hash = "sha256-vcTdeNh5+hzqzB9PXpRBeY+aG9LjbtaEfRkDWxIsIIc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ox/oxicloud/package.nix b/pkgs/by-name/ox/oxicloud/package.nix
index 7c575920b2c0..fe82bef6610e 100644
--- a/pkgs/by-name/ox/oxicloud/package.nix
+++ b/pkgs/by-name/ox/oxicloud/package.nix
@@ -8,18 +8,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oxicloud";
-  version = "0.5.5";
+  version = "0.5.6";
 
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
-    owner = "DioCrafts";
+    owner = "AtalayaLabs";
     repo = "OxiCloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Nn8qgLdiw7w4PZIMCiI+UHZGNW64fjWZ5mErTJifRZU=";
+    hash = "sha256-+jtFA6SWHcTTEjc+am2oFqJ1cC2bmKb5oppchpAN0SE=";
   };
 
-  cargoHash = "sha256-4KfrKL2AKkTt3cOXdl9Xr2qed+qy8WSWuqYfN8WJ0bQ=";
+  cargoHash = "sha256-PxygWzlOhpAKGnP2dT4tDtAJ6AJ2duRcwWZTjHks1lg=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
@@ -41,8 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Ultra-fast, secure & lightweight self-hosted cloud storage";
-    homepage = "https://github.com/DioCrafts/OxiCloud";
-    changelog = "https://github.com/DioCrafts/OxiCloud/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/AtalayaLabs/OxiCloud";
+    changelog = "https://github.com/AtalayaLabs/OxiCloud/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     mainProgram = "oxicloud";
     maintainers = with lib.maintainers; [ flashonfire ];
diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix
index 47cce6215b2a..8465b485d793 100644
--- a/pkgs/by-name/ox/oxipng/package.nix
+++ b/pkgs/by-name/ox/oxipng/package.nix
@@ -5,7 +5,7 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  version = "10.1.0";
+  version = "10.1.1";
   pname = "oxipng";
 
   # do not use fetchCrate (only repository includes tests)
@@ -13,10 +13,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "shssoichiro";
     repo = "oxipng";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fPzdko8qcg9zcr79SrEakLqTFj9hDCakl6hTVpW9al8=";
+    hash = "sha256-G06GAlxEVOqt2xHq+JOLSYbsa++aArbu+sb0ypQn9u4=";
   };
 
-  cargoHash = "sha256-P8PT75TwdYeS9xJ7EEdIhlgHfd0VlIPUaLkM0SfRPq0=";
+  cargoHash = "sha256-gRWDpxZGy01lWgCIse4Tf7gjwxzosozONB3LD5pX5KQ=";
 
   # don't require qemu for aarch64-linux tests
   # error: linker `aarch64-linux-gnu-gcc` not found
diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
index 59acd68893fb..c89a8f2caba1 100644
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -23,25 +23,25 @@
 # runs without an external linter, which leaves `jsPlugins` configs inert.
 stdenv.mkDerivation (finalAttrs: {
   pname = "oxlint";
-  version = "1.59.0";
+  version = "1.62.0";
 
   src = fetchFromGitHub {
     owner = "oxc-project";
     repo = "oxc";
     tag = "oxlint_v${finalAttrs.version}";
-    hash = "sha256-o4vacOuKNUdLdkd6v94jQcevA8dCXG32fYmO2ZEj330=";
+    hash = "sha256-BsfLVHGSyje1GAEaRfe4qmv6lcOiJjTmnd0L8/xIp24=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-lppnmePEmbguoDDGyIM3gWbEX0ShgymoCjvrx1tK2Lw=";
+    hash = "sha256-9DBME09qjjfypmj09Zuc8NdVTWC5/kAU83YAb+TeCPY=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-5T3lrAjMH03Rngc7u7oCLzp9E1sz7jOvG2XmPhouAz0=";
+    hash = "sha256-rgrwA8xZcEkxoFofHBz+AbGXLLCcihPb3435HAaphHs=";
   };
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix
index 254fceef1677..b381001bf6d5 100644
--- a/pkgs/by-name/p1/p11-kit/package.nix
+++ b/pkgs/by-name/p1/p11-kit/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "p11-kit";
-  version = "0.26.1";
+  version = "0.26.2";
 
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = "p11-kit";
     tag = version;
-    hash = "sha256-RQgPSHnpkDYUL8qAZCljy/+IF0nnaH13M+MnXBZLDeY=";
+    hash = "sha256-qFanbp0KPc6+CN4s5mMQNduzcxt/SrMcYWvIMZ0XnGY=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix
index 556ea1dec537..c7ef7c664a5a 100644
--- a/pkgs/by-name/pa/packer/package.nix
+++ b/pkgs/by-name/pa/packer/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "packer";
-  version = "1.15.1";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "packer";
     rev = "v${version}";
-    hash = "sha256-16nHjD2begkWnqy4g2pN8IX//BxRd9DA/TJ6sgKJi5M=";
+    hash = "sha256-rTmAc/wWy+soFSGYKjySvcip7L2Gw6oKqYUBgyH12xs=";
   };
 
-  vendorHash = "sha256-GOEdKMu41QjSl5iR07rXetq4YIdJ/Bf0zD32D5yayxc=";
+  vendorHash = "sha256-9aba6LnTjVmY3UgF9YyI9GoleCglTCU83QmHNPI3T2U=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/pa/packwiz/package.nix b/pkgs/by-name/pa/packwiz/package.nix
index d2fbccbdc3e7..70f2444ee8c2 100644
--- a/pkgs/by-name/pa/packwiz/package.nix
+++ b/pkgs/by-name/pa/packwiz/package.nix
@@ -9,17 +9,17 @@
 
 buildGoModule {
   pname = "packwiz";
-  version = "0-unstable-2025-01-19";
+  version = "0-unstable-2026-02-18";
 
   src = fetchFromGitHub {
     owner = "packwiz";
     repo = "packwiz";
-    rev = "241f24b550f6fe838913a56bdd58bac2fc53254a";
-    sha256 = "sha256-VmNsWzsFVNRciNIPUXUVos4cBdpawgN1/nPwMjNpx+0=";
+    rev = "dfd8b68a4796c763e25bad50265ea1f1233e24f1";
+    sha256 = "sha256-QK8sY7e6QHhg+GH8NiiePGFlsQBI0jjUlsgBuq1Yopc=";
   };
   passthru.updateScript = unstableGitUpdater { };
 
-  vendorHash = "sha256-krdrLQHM///dtdlfEhvSUDV2QljvxFc2ouMVQVhN7A0=";
+  vendorHash = "sha256-ChUE4hWl+UyPpbzK0GbJTD0AoBCogI7qGstga4+WujI=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -36,7 +36,10 @@ buildGoModule {
     description = "Command line tool for editing and distributing Minecraft modpacks, using a git-friendly TOML format";
     homepage = "https://packwiz.infra.link/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ infinidoge ];
+    maintainers = with lib.maintainers; [
+      infinidoge
+      bddvlpr
+    ];
     mainProgram = "packwiz";
   };
 }
diff --git a/pkgs/by-name/pa/pagefind/cargo-lock.patch b/pkgs/by-name/pa/pagefind/cargo-lock.patch
deleted file mode 100644
index d547116b4ba7..000000000000
--- a/pkgs/by-name/pa/pagefind/cargo-lock.patch
+++ /dev/null
@@ -1,367 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -8,7 +8,7 @@
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
- dependencies = [
-- "bitflags 2.9.3",
-+ "bitflags 2.9.4",
-  "bytes",
-  "futures-core",
-  "futures-sink",
-@@ -29,7 +29,7 @@
-  "actix-service",
-  "actix-utils",
-  "actix-web",
-- "bitflags 2.9.3",
-+ "bitflags 2.9.4",
-  "bytes",
-  "derive_more 2.0.1",
-  "futures-core",
-@@ -53,7 +53,7 @@
-  "actix-service",
-  "actix-utils",
-  "base64 0.22.1",
-- "bitflags 2.9.3",
-+ "bitflags 2.9.4",
-  "brotli",
-  "bytes",
-  "bytestring",
-@@ -335,15 +335,13 @@
- 
- [[package]]
- name = "async-compression"
--version = "0.4.29"
-+version = "0.4.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5bee399cc3a623ec5a2db2c5b90ee0190a2260241fbe0c023ac8f7bab426aaf8"
-+checksum = "977eb15ea9efd848bb8a4a1a2500347ed7f0bf794edf0dc3ddcf439f43d36b23"
- dependencies = [
-  "compression-codecs",
-  "compression-core",
-- "flate2",
-  "futures-core",
-- "memchr",
-  "pin-project-lite",
-  "tokio",
- ]
-@@ -430,9 +428,9 @@
- 
- [[package]]
- name = "bitflags"
--version = "2.9.3"
-+version = "2.9.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
-+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
- 
- [[package]]
- name = "block-buffer"
-@@ -513,10 +511,11 @@
- 
- [[package]]
- name = "cc"
--version = "1.2.34"
-+version = "1.2.35"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"
-+checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3"
- dependencies = [
-+ "find-msvc-tools",
-  "jobserver",
-  "libc",
-  "shlex",
-@@ -566,9 +565,9 @@
- 
- [[package]]
- name = "clap"
--version = "4.5.46"
-+version = "4.5.47"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2c5e4fcf9c21d2e544ca1ee9d8552de13019a42aa7dbf32747fa7aaf1df76e57"
-+checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
- dependencies = [
-  "clap_builder",
-  "clap_derive",
-@@ -576,9 +575,9 @@
- 
- [[package]]
- name = "clap_builder"
--version = "4.5.46"
-+version = "4.5.47"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fecb53a0e6fcfb055f686001bc2e2592fa527efaf38dbe81a6a9563562e57d41"
-+checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
- dependencies = [
-  "anstream",
-  "anstyle",
-@@ -588,9 +587,9 @@
- 
- [[package]]
- name = "clap_derive"
--version = "4.5.45"
-+version = "4.5.47"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
-+checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
- dependencies = [
-  "heck 0.5.0",
-  "proc-macro2",
-@@ -612,15 +611,13 @@
- 
- [[package]]
- name = "compression-codecs"
--version = "0.4.29"
-+version = "0.4.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c7eea68f0e02c2b0aa8856e9a9478444206d4b6828728e7b0697c0f8cca265cb"
-+checksum = "485abf41ac0c8047c07c87c72c8fb3eb5197f6e9d7ded615dfd1a00ae00a0f64"
- dependencies = [
-  "compression-core",
-  "flate2",
-- "futures-core",
-  "memchr",
-- "pin-project-lite",
- ]
- 
- [[package]]
-@@ -828,9 +825,9 @@
- 
- [[package]]
- name = "deranged"
--version = "0.4.0"
-+version = "0.5.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
-+checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
- dependencies = [
-  "powerfmt",
- ]
-@@ -1077,6 +1074,12 @@
- ]
- 
- [[package]]
-+name = "find-msvc-tools"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650"
-+
-+[[package]]
- name = "flate2"
- version = "1.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -1675,7 +1678,7 @@
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
- dependencies = [
-- "bitflags 2.9.3",
-+ "bitflags 2.9.4",
-  "cfg-if",
-  "libc",
- ]
-@@ -1813,9 +1816,9 @@
- 
- [[package]]
- name = "lexical-core"
--version = "1.0.0"
-+version = "1.0.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c26c7da389462e0173a0e9580b3cf7b6a10074e93df78b2768d3ee9fa6d54fc4"
-+checksum = "b765c31809609075565a70b4b71402281283aeda7ecaf4818ac14a7b2ade8958"
- dependencies = [
-  "lexical-parse-float",
-  "lexical-parse-integer",
-@@ -1911,7 +1914,7 @@
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
- dependencies = [
-- "bitflags 2.9.3",
-+ "bitflags 2.9.4",
-  "libc",
-  "redox_syscall",
- ]
-@@ -2096,7 +2099,7 @@
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "1610d7994d67a05bb35861cd733b069b1171de8693bc8452849c59361a1bb87b"
- dependencies = [
-- "bitflags 2.9.3",
-+ "bitflags 2.9.4",
-  "cfg-if",
-  "cssparser",
-  "encoding_rs",
-@@ -2152,22 +2155,22 @@
- 
- [[package]]
- name = "minicbor"
--version = "0.19.1"
-+version = "2.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d7005aaf257a59ff4de471a9d5538ec868a21586534fff7f85dd97d4043a6139"
-+checksum = "4f182275033b808ede9427884caa8e05fa7db930801759524ca7925bd8aa7a82"
- dependencies = [
-  "minicbor-derive",
- ]
- 
- [[package]]
- name = "minicbor-derive"
--version = "0.13.0"
-+version = "0.18.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1154809406efdb7982841adb6311b3d095b46f78342dd646736122fe6b19e267"
-+checksum = "b17290c95158a760027059fe3f511970d6857e47ff5008f9e09bffe3d3e1c6af"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 1.0.109",
-+ "syn 2.0.106",
- ]
- 
- [[package]]
-@@ -2728,7 +2731,7 @@
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
- dependencies = [
-- "bitflags 2.9.3",
-+ "bitflags 2.9.4",
- ]
- 
- [[package]]
-@@ -2878,7 +2881,7 @@
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
- dependencies = [
-- "bitflags 2.9.3",
-+ "bitflags 2.9.4",
-  "errno",
-  "libc",
-  "linux-raw-sys",
-@@ -3291,12 +3294,11 @@
- 
- [[package]]
- name = "time"
--version = "0.3.41"
-+version = "0.3.43"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
-+checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
- dependencies = [
-  "deranged",
-- "itoa 1.0.15",
-  "num-conv",
-  "powerfmt",
-  "serde",
-@@ -3306,15 +3308,15 @@
- 
- [[package]]
- name = "time-core"
--version = "0.1.4"
-+version = "0.1.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
-+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
- 
- [[package]]
- name = "time-macros"
--version = "0.2.22"
-+version = "0.2.24"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
-+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
- dependencies = [
-  "num-conv",
-  "time-core",
-@@ -3429,7 +3431,7 @@
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
- dependencies = [
-- "bitflags 2.9.3",
-+ "bitflags 2.9.4",
-  "bytes",
-  "futures-util",
-  "http 1.3.1",
-
---- a/pagefind_web/Cargo.lock
-+++ b/pagefind_web/Cargo.lock
-@@ -89,6 +89,12 @@ dependencies = [
-  "proc-macro2",
- ]
- 
-+[[package]]
-+name = "rustversion"
-+version = "1.0.22"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
-+
- [[package]]
- name = "syn"
- version = "2.0.55"
-@@ -108,23 +114,25 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
- 
- [[package]]
- name = "wasm-bindgen"
--version = "0.2.92"
-+version = "0.2.104"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
- dependencies = [
-  "cfg-if",
-+ "once_cell",
-+ "rustversion",
-  "wasm-bindgen-macro",
-+ "wasm-bindgen-shared",
- ]
- 
- [[package]]
- name = "wasm-bindgen-backend"
--version = "0.2.92"
-+version = "0.2.104"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
- dependencies = [
-  "bumpalo",
-  "log",
-- "once_cell",
-  "proc-macro2",
-  "quote",
-  "syn",
-@@ -133,9 +141,9 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro"
--version = "0.2.92"
-+version = "0.2.104"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
- dependencies = [
-  "quote",
-  "wasm-bindgen-macro-support",
-@@ -143,9 +151,9 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro-support"
--version = "0.2.92"
-+version = "0.2.104"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -156,9 +164,12 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-shared"
--version = "0.2.92"
-+version = "0.2.104"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
-+dependencies = [
-+ "unicode-ident",
-+]
- 
- [[package]]
- name = "write-json" "http 1.3.1",
diff --git a/pkgs/by-name/pa/pagefind/package.nix b/pkgs/by-name/pa/pagefind/package.nix
index e42925e68631..e5f2dd68ee9b 100644
--- a/pkgs/by-name/pa/pagefind/package.nix
+++ b/pkgs/by-name/pa/pagefind/package.nix
@@ -12,8 +12,9 @@
   python3,
   rustc,
   versionCheckHook,
-  wasm-bindgen-cli_0_2_104,
+  wasm-bindgen-cli_0_2_117,
   wasm-pack,
+  enableExtended ? true,
 }:
 
 # TODO: package python bindings
@@ -24,7 +25,7 @@ let
   # [1] https://github.com/lindera/lindera/blob/v0.32.2/lindera-unidic/build.rs#L5-L11
   # [2] https://github.com/lindera/unidic-mecab
   # To find these urls:
-  #   rg -A5 download_urls $(nix-build . -A pagefind.cargoDeps --no-out-link)/lindera-*/build.rs
+  #   rg -A5 download_urls $(nix-build . -A pagefind.cargoDeps --no-out-link)/*/lindera-*/build.rs
   lindera-srcs = {
     unidic-mecab = fetchurl {
       passthru.vendorDir = "lindera-unidic-*";
@@ -56,49 +57,55 @@ let
 in
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "pagefind";
-  version = "1.4.0";
+  inherit enableExtended;
+
+  pname = "pagefind" + lib.optionalString (finalAttrs.enableExtended) "-extended";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "Pagefind";
     repo = "pagefind";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+jArZueDqpJQKg3fKdJjeQQL+egyR6Zi6wqPMZoFgyk=";
+    hash = "sha256-/4nHUEcNQ66M5+x85xiIUUA/Nt+YQCrwn7HIo3olCMM=";
   };
 
-  cargoPatches = [ ./cargo-lock.patch ];
-  cargoHash = "sha256-zbo8NkB9umpNDvkhKXpOdt8hJn+d+nrTXMaUghmIPrg=";
+  cargoHash = "sha256-RdU6ZF32kyRC9C0J7NfscNhrs+NjfE5jppIt6u47fcw=";
 
   env.cargoDeps_web = rustPlatform.fetchCargoVendor {
     name = "cargo-deps-web-${finalAttrs.version}";
     inherit (finalAttrs) src;
-    patches = [ ./web-cargo-lock.patch ];
     sourceRoot = "${finalAttrs.src.name}/pagefind_web";
-    hash = "sha256-TdbNvDF4WQ2xgkKGVmmZ8R2Wga21OUaGmey/2HVWVcQ=";
+    hash = "sha256-8DqD5QVoHOBtV11UKrunlzR7i+8PTeJGulzN6d2vqks=";
   };
   env.npmDeps_web_js = fetchNpmDeps {
     name = "pagefind-npm-deps-web-js-${finalAttrs.version}";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/pagefind_web_js";
-    hash = "sha256-whpmjNKdiMxNfg7fRIWUPdyRWqsEphhqvQfiM65GYDs=";
+    hash = "sha256-vrPdlvd6doaIKiawsvJLnhIPhC35/qzdgUhkfMZrcP8=";
   };
   env.npmDeps_ui_default = fetchNpmDeps {
     name = "pagefind-npm-deps-ui-default-${finalAttrs.version}";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/pagefind_ui/default";
-    hash = "sha256-voCs49JneWYE1W9U7aB6G13ypH6JqathVDeF58V57U8=";
+    hash = "sha256-78Qyk18IzekdP6l8pkWxhGeKEST2Ju/AUBASycbggRQ=";
   };
   env.npmDeps_ui_modular = fetchNpmDeps {
     name = "pagefind-npm-deps-ui-modular-${finalAttrs.version}";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/pagefind_ui/modular";
-    hash = "sha256-4d85V2X1doq3G8okgYSXOMuQDoAXCgtAtegFEPr+Wno=";
+    hash = "sha256-Ja9s9EX2b9TviLA/NxwQ3Z7RMjL8LIUJAuE63EyBbN4=";
+  };
+  env.npmDeps_ui_component = fetchNpmDeps {
+    name = "pagefind-npm-deps-ui-component-${finalAttrs.version}";
+    inherit (finalAttrs) src;
+    sourceRoot = "${finalAttrs.src.name}/pagefind_ui/component";
+    hash = "sha256-ZSsXn+A8VVGSCjP2J7ql4rIoOto7a/vzRcVhxuo5Ngk=";
   };
   env.npmDeps_playground = fetchNpmDeps {
     name = "pagefind-npm-deps-playground-${finalAttrs.version}";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/pagefind_playground";
-    hash = "sha256-npo8MV6AAuQ/mGC9iu3bR7pjGoI7NgxuIeh+H3oz7Y8=";
+    hash = "sha256-JO2VRDxsKxYIMZKZ8UilJp76jihRHrD1IeTRfoff/+s=";
   };
 
   env.GIT_VERSION = finalAttrs.version;
@@ -118,10 +125,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     (
       local postPatchHooks=() # written to by npmConfigHook
       source ${npmHooks.npmConfigHook}/nix-support/setup-hook
-      npmRoot=pagefind_web_js     npmDeps=$npmDeps_web_js     npmConfigHook
-      npmRoot=pagefind_ui/default npmDeps=$npmDeps_ui_default npmConfigHook
-      npmRoot=pagefind_ui/modular npmDeps=$npmDeps_ui_modular npmConfigHook
-      npmRoot=pagefind_playground npmDeps=$npmDeps_playground npmConfigHook
+      npmRoot=pagefind_web_js       npmDeps=$npmDeps_web_js       npmConfigHook
+      npmRoot=pagefind_ui/default   npmDeps=$npmDeps_ui_default   npmConfigHook
+      npmRoot=pagefind_ui/modular   npmDeps=$npmDeps_ui_modular   npmConfigHook
+      npmRoot=pagefind_ui/component npmDeps=$npmDeps_ui_component npmConfigHook
+      npmRoot=pagefind_playground   npmDeps=$npmDeps_playground   npmConfigHook
     )
 
     # patch build-time dependency downloads
@@ -152,8 +160,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
       ]}
     )
 
-    # nightly-only feature
+    # nightly-only features
     substituteInPlace pagefind_web/local_build.sh \
+      --replace-fail 'RUSTFLAGS="-Z unstable-options -C panic=immediate-abort"' 'RUSTFLAGS=""' \
+      --replace-fail ' -Z build-std=panic_abort,std' ""
+    substituteInPlace pagefind_web/local_fast_build.sh \
       --replace-fail ' -Z build-std=panic_abort,std' "" \
       --replace-fail ' -Z build-std-features=panic_immediate_abort' ""
   '';
@@ -166,7 +177,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     nodejs
     rustc
     rustc.llvmPackages.lld
-    wasm-bindgen-cli_0_2_104
+    wasm-bindgen-cli_0_2_117
     wasm-pack
   ]
   ++ lib.optionals stdenv.buildPlatform.isDarwin [
@@ -202,6 +213,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
       npm run build
     )
 
+    echo Entering ./pagefind_ui/component
+    (
+      cd pagefind_ui/component
+      npm run build
+    )
+
     echo Entering ./pagefind_playground
     (
       cd pagefind_playground
@@ -209,8 +226,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     )
   '';
 
-  # always build extended
-  buildFeatures = [ "extended" ];
+  buildFeatures = lib.optionals finalAttrs.enableExtended [ "extended" ];
 
   doInstallCheck = true;
 
@@ -220,8 +236,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru = {
     inherit lindera-srcs;
+    tests.extended = finalAttrs.finalPackage.overrideAttrs {
+      enableExtended = true;
+    };
     tests.non-extended = finalAttrs.finalPackage.overrideAttrs {
-      buildFeatures = [ ];
+      enableExtended = false;
     };
   };
 
diff --git a/pkgs/by-name/pa/pagefind/web-cargo-lock.patch b/pkgs/by-name/pa/pagefind/web-cargo-lock.patch
deleted file mode 100644
index ee94206800f9..000000000000
--- a/pkgs/by-name/pa/pagefind/web-cargo-lock.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -89,6 +89,12 @@ dependencies = [
-  "proc-macro2",
- ]
- 
-+[[package]]
-+name = "rustversion"
-+version = "1.0.22"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
-+
- [[package]]
- name = "syn"
- version = "2.0.55"
-@@ -108,23 +114,25 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
- 
- [[package]]
- name = "wasm-bindgen"
--version = "0.2.92"
-+version = "0.2.104"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
- dependencies = [
-  "cfg-if",
-+ "once_cell",
-+ "rustversion",
-  "wasm-bindgen-macro",
-+ "wasm-bindgen-shared",
- ]
- 
- [[package]]
- name = "wasm-bindgen-backend"
--version = "0.2.92"
-+version = "0.2.104"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
- dependencies = [
-  "bumpalo",
-  "log",
-- "once_cell",
-  "proc-macro2",
-  "quote",
-  "syn",
-@@ -133,9 +141,9 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro"
--version = "0.2.92"
-+version = "0.2.104"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
- dependencies = [
-  "quote",
-  "wasm-bindgen-macro-support",
-@@ -143,9 +151,9 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro-support"
--version = "0.2.92"
-+version = "0.2.104"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -156,9 +164,12 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-shared"
--version = "0.2.92"
-+version = "0.2.104"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
-+dependencies = [
-+ "unicode-ident",
-+]
- 
- [[package]]
- name = "write-json" "http 1.3.1",
diff --git a/pkgs/by-name/pa/pandoc/package.nix b/pkgs/by-name/pa/pandoc/package.nix
index 3fd7ed8e9150..72faf5ec68f0 100644
--- a/pkgs/by-name/pa/pandoc/package.nix
+++ b/pkgs/by-name/pa/pandoc/package.nix
@@ -15,8 +15,6 @@ let
 
 in
 (haskell.lib.compose.overrideCabal (drv: {
-  configureFlags = drv.configureFlags or [ ] ++ [ "-fembed_data_files" ];
-  buildDepends = drv.buildDepends or [ ] ++ [ pandoc-cli.scope.file-embed ];
   buildTools = (drv.buildTools or [ ]) ++ [
     removeReferencesTo
     installShellFiles
diff --git a/pkgs/by-name/pa/pangolin-cli/package.nix b/pkgs/by-name/pa/pangolin-cli/package.nix
index 3671e2371131..087da6b185ee 100644
--- a/pkgs/by-name/pa/pangolin-cli/package.nix
+++ b/pkgs/by-name/pa/pangolin-cli/package.nix
@@ -10,20 +10,20 @@
 
 buildGoModule (finalAttrs: {
   pname = "pangolin-cli";
-  version = "0.6.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "cli";
     tag = finalAttrs.version;
-    hash = "sha256-9uQLCSH7LLl8I/LgsgTo6w808iwmH1FF0GYNn5xyVuc=";
+    hash = "sha256-0G5HsAa9I0ilPQ92qQIuYssfGvoZhLrF3kyO1+0JqEQ=";
   };
 
   ldflags = [
     "-X github.com/fosrl/cli/internal/version.Version=${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-eBrglhyqKy6pG9eF0yfJdCOLxeWys4atKAp9Jgtzdj8=";
+  vendorHash = "sha256-FCIp0VLmRO6TUPRDNd3Zl/CULwy00D8F4YTo/oQge+s=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -51,6 +51,7 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [
       water-sucks
+      jackr
     ];
     mainProgram = "pangolin";
   };
diff --git a/pkgs/by-name/pa/papeer/package.nix b/pkgs/by-name/pa/papeer/package.nix
index 03154dfd36dc..33a9b4c51bc4 100644
--- a/pkgs/by-name/pa/papeer/package.nix
+++ b/pkgs/by-name/pa/papeer/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "papeer";
-  version = "0.8.7";
+  version = "0.8.8";
 
   src = fetchFromGitHub {
     owner = "lapwat";
     repo = "papeer";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Qe+3rHEV+Env5sr9acdDqEzAi3PeN8/7fLoDz/B6GWo=";
+    hash = "sha256-ZfJ8ABdp5G4j/FQCJwDz0O+CCbV2rn8e7Rhwj699h+I=";
   };
 
-  vendorHash = "sha256-yGoRvPwlXA6FN67nQH/b0QpGQ2xXTCmXWNLInlcVk7k=";
+  vendorHash = "sha256-PlpulU0nlZA3Vmiqn/rqAS73yJniTECje7uc7kjE6aw=";
 
   doCheck = false; # uses network
 
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 6c93b31ca4c6..2ff6ad636a4a 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -29,13 +29,13 @@
   lndir,
 }:
 let
-  version = "2.20.14";
+  version = "2.20.15";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-xCpVABOf3rOm/PRZ5Doq8hoZVwRsII+8vFtb28eaBQ8=";
+    hash = "sha256-Czh4Knel0IIHsTc3kEnp1153Kv+3721GRCbTYTkeCDg=";
   };
 
   python = python3.override {
diff --git a/pkgs/by-name/pa/parallel/package.nix b/pkgs/by-name/pa/parallel/package.nix
index 2ca95585973c..4c59752a8f8b 100644
--- a/pkgs/by-name/pa/parallel/package.nix
+++ b/pkgs/by-name/pa/parallel/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "parallel";
-  version = "20260322";
+  version = "20260422";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-dkaA6TL00NIc8DKb2fnu1lmJXeFoNgAfZJFTO4Ir7+A=";
+    hash = "sha256-ZkzxZdZuohey9JzZanhl7PkMnQYWWZzCq6jK1IHZB7s=";
   };
 
   outputs = [
@@ -56,6 +56,13 @@ stdenv.mkDerivation (finalAttrs: {
       }"
   '';
 
+  # Force run `check` instead of the `tests` target, because the `test` target depends on a private testsuite.
+  # The reason `check` isn't used by default is due to it failing when selecting the target to run. (due to stdenv not overriding the Makefiles SHELL variable from `/bin/bash`).
+  #
+  # See:
+  #   https://github.com/NixOS/nixpkgs/blob/ef4f672aa2be8b268a4280e8e2a68cd97a4cf67b/pkgs/stdenv/generic/setup.sh#L1541
+  #   https://github.com/NixOS/nixpkgs/blob/ef4f672aa2be8b268a4280e8e2a68cd97a4cf67b/pkgs/stdenv/generic/setup.sh#L1555
+  checkTarget = "check";
   doCheck = true;
 
   meta = {
diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix
index bf4ec227d0eb..8ea5cbcba8a8 100644
--- a/pkgs/by-name/pa/parca-agent/package.nix
+++ b/pkgs/by-name/pa/parca-agent/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "parca-agent";
-  version = "0.47.0";
+  version = "0.47.1";
 
   src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jnlynhwvjQRatx+0MO9EDA0q1TqmuDeeTdD7L6HzVi0=";
+    hash = "sha256-wIM5LZ6GwvGc0WobMtMe7nc8VyAH4XA056JBovwhSqo=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-W6m8L3dsqaHycSrvqY6mmpCHW4cSM+uGKei2JtjRc/Y=";
+  vendorHash = "sha256-j35dXQ7SG+nT6UGFZE8NafmqlwKP8D5QOLG+PT4qxyo=";
 
   buildInputs = [
     stdenv.cc.libc.static
diff --git a/pkgs/by-name/pa/passff-host/package.nix b/pkgs/by-name/pa/passff-host/package.nix
index dc25db3b6aa2..2e61d58efe72 100644
--- a/pkgs/by-name/pa/passff-host/package.nix
+++ b/pkgs/by-name/pa/passff-host/package.nix
@@ -1,26 +1,27 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  fetchFromCodeberg,
+  nix-update-script,
   python3,
   pass,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "passff-host";
-  version = "1.2.4";
+  version = "1.2.5";
 
-  src = fetchFromGitHub {
-    owner = "passff";
+  src = fetchFromCodeberg {
+    owner = "PassFF";
     repo = "passff-host";
-    rev = finalAttrs.version;
-    sha256 = "sha256-P5h0B5ilwp3OVyDHIOQ23Zv4eLjN4jFkdZF293FQnNE=";
+    tag = finalAttrs.version;
+    hash = "sha256-8EThigW6uD5I4YmZYB2uNqdRzqqAHbULNY1UGA0vfAY=";
   };
 
   buildInputs = [ python3 ];
   makeFlags = [ "VERSION=${finalAttrs.version}" ];
 
-  patchPhase = ''
+  postPatch = ''
     sed -i 's#COMMAND = "pass"#COMMAND = "${pass}/bin/pass"#' src/passff.py
   '';
 
@@ -45,9 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Host app for the WebExtension PassFF";
-    homepage = "https://github.com/passff/passff-host";
+    homepage = "https://codeberg.org/PassFF/passff-host";
     license = lib.licenses.gpl2Only;
     maintainers = [ ];
   };
diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix
index ee8306caba0a..c84a3e501cbc 100644
--- a/pkgs/by-name/pa/patch2pr/package.nix
+++ b/pkgs/by-name/pa/patch2pr/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "patch2pr";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "bluekeyes";
     repo = "patch2pr";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Jv2tGdziPLKy5vNUgwnB8ern3IYS+D+N5LMrsGIqTMI=";
+    hash = "sha256-VevSvxGjASwEib8Kx91dYIMI2QC+Zl/igSnHy2w/1y4=";
   };
 
-  vendorHash = "sha256-tM4Y/dPn5ZCP5NJl+nOPulY3hKWzI/l8c+Ku+dxtWwI=";
+  vendorHash = "sha256-mv3otcLQiUfrnNcrSe29kA2xpcuRgMMnD9VQ/84DQeM=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"
diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix
index 23911d710b74..1a71561808c3 100644
--- a/pkgs/by-name/pa/patroni/package.nix
+++ b/pkgs/by-name/pa/patroni/package.nix
@@ -23,14 +23,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "patroni";
-  version = "4.1.0";
+  version = "4.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zalando";
     repo = "patroni";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iY5QLbJXfQtfkzpQxvqSOzYQwgfFsBh8HPYujqxU44k=";
+    hash = "sha256-P64smYmLJyuqMpqYY2lRbZwupfYBsg03FrzUZ6CBGpI=";
   };
 
   build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/by-name/pb/pbgopy/package.nix b/pkgs/by-name/pb/pbgopy/package.nix
index 9b35da9d18ae..034fa2d63e57 100644
--- a/pkgs/by-name/pb/pbgopy/package.nix
+++ b/pkgs/by-name/pb/pbgopy/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pbgopy";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "nakabonne";
     repo = "pbgopy";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-P/MFDFMsqSTVErTM9izJJSMIbiOcbQ9Ya10/w6NRcYw=";
+    sha256 = "sha256-rm4fopreiYBwcFbtuo0B6FalveFft8hrNVf7JpvyNKE=";
   };
 
-  vendorHash = "sha256-S2X74My6wyDZOsEYTDilCFaYgV2vQzU0jOAY9cEkJ6A=";
+  vendorHash = "sha256-qxdylBQiUlHOkzaxV+P9m3tnkFqUdZTdF31LD0IWyuI=";
 
   meta = {
     description = "Copy and paste between devices";
diff --git a/pkgs/by-name/pd/pdf-oxide/package.nix b/pkgs/by-name/pd/pdf-oxide/package.nix
index 040ddbb1a181..de648b91deb4 100644
--- a/pkgs/by-name/pd/pdf-oxide/package.nix
+++ b/pkgs/by-name/pd/pdf-oxide/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pdf-oxide";
-  version = "0.3.32";
+  version = "0.3.38";
 
   src = fetchFromGitHub {
     owner = "yfedoseev";
     repo = "pdf_oxide";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z6dc+GWOovF31yhZIJsg/0FWmSHizk+BpipdrJmoxwI=";
+    hash = "sha256-kvV8SzW+2vQ86o/c9vV71O9quqQ2LVvBBvTdTwAG5wY=";
   };
 
-  cargoHash = "sha256-0GCBraW4m7/3xUbt8wLrEle/9vn1nOtyNqIwfn19vN8=";
+  cargoHash = "sha256-Z5nNxCrf2QEUA5XCXp5aG59UnznvdS9jjQb57R8gxHs=";
   __structuredAttrs = true;
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix
index 818a0295951c..38f4f4b51726 100644
--- a/pkgs/by-name/pd/pdfcpu/package.nix
+++ b/pkgs/by-name/pd/pdfcpu/package.nix
@@ -4,17 +4,18 @@
   stdenv,
   fetchFromGitHub,
   writableTmpDirAsHomeHook,
+  installShellFiles,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "pdfcpu";
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = "pdfcpu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0xsa7/WlqjRMP961FTonfty40+C1knI3szCmCDfZJ/0=";
+    hash = "sha256-qCSfcxeMM7HzJIaeZJxjUVc834NmigpDKaxFQ0oSdkg=";
     # Apparently upstream requires that the compiled executable will know the
     # commit hash and the date of the commit. This information is also presented
     # in the output of `pdfcpu version` which we use as a sanity check in the
@@ -37,7 +38,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-wZYYIcPhyDlmIhuJs91EqPB8AjLIDHz39lXh35LHUwQ=";
+  vendorHash = "sha256-5+zHlHp/8Jp9TE87IUgJqQHDINNe7ah34jPW/n5ORz8=";
 
   ldflags = [
     "-s"
@@ -51,6 +52,17 @@ buildGoModule (finalAttrs: {
     ldflags+=" -X main.date=$(cat SOURCE_DATE)"
   '';
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  postInstall = ''
+    installShellCompletion --cmd pdfcpu \
+      --zsh <($out/bin/pdfcpu completion zsh) \
+      --fish <($out/bin/pdfcpu completion fish) \
+      --bash <($out/bin/pdfcpu completion bash)
+  '';
+
   # No tests
   doCheck = false;
   doInstallCheck = true;
diff --git a/pkgs/by-name/pd/pdk-ciel/package.nix b/pkgs/by-name/pd/pdk-ciel/package.nix
index 092483f395cc..e8e4f5cea931 100644
--- a/pkgs/by-name/pd/pdk-ciel/package.nix
+++ b/pkgs/by-name/pd/pdk-ciel/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "ciel";
-  version = "2.4.0";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fossi-foundation";
     repo = "ciel";
     tag = finalAttrs.version;
-    hash = "sha256-AWbkHL0zO3tD0mE3dZIcj8mVND7o3imTxOpEfOtlRDI=";
+    hash = "sha256-p35R0wfoGR8CmI++ae7iKLJs00RHHMdaSckgC18EIyM=";
   };
 
   build-system = [ python3Packages.poetry-core ];
diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix
index daf35691373b..1fc443fc526b 100644
--- a/pkgs/by-name/pd/pdns-recursor/package.nix
+++ b/pkgs/by-name/pd/pdns-recursor/package.nix
@@ -21,17 +21,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns-recursor";
-  version = "5.4.0";
+  version = "5.4.1";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-L2nvdYatyAW8T1A+FaNPDG3Pu/2rfZWf8TLY4s2/JQo=";
+    hash = "sha256-k/I+6T+w06n9SIFyZWMezkdYuAAa9ybDWO46+2ZFtjo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     sourceRoot = "pdns-recursor-${finalAttrs.version}/rec-rust-lib/rust";
-    hash = "sha256-OBC6x1yL+kVpiBittZVvwMSCAsSyS0U9853x3TBGGkc=";
+    hash = "sha256-PxnLv1VbZgyQl83Bcvxyf7REsbTKI1MBV4RllHcyJyc=";
   };
 
   cargoRoot = "rec-rust-lib/rust";
diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix
index 211e9eb5ae8c..b48d4b388bfa 100644
--- a/pkgs/by-name/pd/pdns/package.nix
+++ b/pkgs/by-name/pd/pdns/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns";
-  version = "5.0.3";
+  version = "5.0.4";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-7DEgUBlQp3LHhcYA9Zno9NcR9wOgLL0b7ELtwaBfgcw=";
+    hash = "sha256-NultkpmZ78iLy3NPlNxF+OKS0QQM7QiR5mS9Co7fnQ4=";
   };
   # redact configure flags from version output to reduce closure size
   patches = [ ./version.patch ];
diff --git a/pkgs/by-name/pd/pdnsgrep/package.nix b/pkgs/by-name/pd/pdnsgrep/package.nix
index 9ad83f89312b..6c75e9ee0fd5 100644
--- a/pkgs/by-name/pd/pdnsgrep/package.nix
+++ b/pkgs/by-name/pd/pdnsgrep/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "pdnsgrep";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "akquinet";
     repo = "pdnsgrep";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bkCd5fIXj3qdbXmHCsnA9yi1LMYbIFdei72kaj2Uxzs=";
+    hash = "sha256-V5Im75vYQYZmAedx4TKGkuoXI0noOfH7wMDoJRWA1hs=";
   };
 
   vendorHash = "sha256-hTlweJAWWrcaYhTH8IuCxDmqNd1qWTYK5F8NQhBbKt0=";
diff --git a/pkgs/by-name/pd/pdudaemon/package.nix b/pkgs/by-name/pd/pdudaemon/package.nix
new file mode 100644
index 000000000000..b39539ab89a9
--- /dev/null
+++ b/pkgs/by-name/pd/pdudaemon/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  nixosTests,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "pdudaemon";
+  version = "1.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pdudaemon";
+    repo = "pdudaemon";
+    tag = finalAttrs.version;
+    hash = "sha256-YjM1RmsdRfNyxCzK+PmSH8n7ZJ3qeIskTPxu2+EaupQ=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = with python3Packages; [
+    aiohttp
+    requests
+    pexpect
+    systemd-python
+    paramiko
+    pyserial
+    hidapi
+    pysnmp
+    pyasn1
+    pyusb
+    pymodbus
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytest-asyncio
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  __structuredAttrs = true;
+
+  passthru.tests = {
+    inherit (nixosTests) pdudaemon;
+  };
+
+  meta = {
+    changelog = "https://github.com/pdudaemon/pdudaemon/releases/tag/${finalAttrs.src.tag}";
+    description = "Python Daemon for controlling/sequentially executing commands to PDUs (Power Distribution Units)";
+    homepage = "https://github.com/pdudaemon/pdudaemon";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
+      aiyion
+      emantor
+    ];
+    mainProgram = "pdudaemon";
+  };
+})
diff --git a/pkgs/by-name/pe/pentobi/package.nix b/pkgs/by-name/pe/pentobi/package.nix
deleted file mode 100644
index c7d84eb6d0aa..000000000000
--- a/pkgs/by-name/pe/pentobi/package.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  stdenv,
-  qt5,
-  appstream,
-  fetchFromGitHub,
-  cmake,
-  librsvg,
-  itstool,
-  docbook_xsl,
-}:
-
-stdenv.mkDerivation rec {
-  version = "20.0";
-  pname = "pentobi";
-
-  src = fetchFromGitHub {
-    owner = "enz";
-    repo = "pentobi";
-    rev = "v${version}";
-    sha256 = "sha256-DQM3IJ0pRkX4OsrjZGROg50LfKb621UnpvtqSjxchz8=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    docbook_xsl
-    qt5.qttools
-    qt5.wrapQtAppsHook
-  ];
-  buildInputs = [
-    appstream
-    qt5.qtbase
-    qt5.qtsvg
-    qt5.qtquickcontrols2
-    qt5.qtwebview
-    itstool
-    librsvg
-  ];
-
-  patchPhase = ''
-    substituteInPlace pentobi_thumbnailer/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
-    substituteInPlace pentobi/unix/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
-    substituteInPlace pentobi/docbook/CMakeLists.txt --replace "/html" "/share/xml/docbook-xsl/html"
-  '';
-
-  cmakeFlags = [
-    "-DCMAKE_VERBOSE_MAKEFILE=1"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}"
-    "-DMETAINFO_ITS=${appstream}/share/gettext/its/metainfo.its"
-  ];
-
-  meta = {
-    description = "Computer opponent for the board game Blokus";
-    homepage = "https://pentobi.sourceforge.io";
-    license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/pe/perfect_dark/package.nix b/pkgs/by-name/pe/perfect_dark/package.nix
index 4b96e6acf096..158d3bbaa722 100644
--- a/pkgs/by-name/pe/perfect_dark/package.nix
+++ b/pkgs/by-name/pe/perfect_dark/package.nix
@@ -22,13 +22,13 @@ assert lib.assertOneOf "romID" romID roms;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "perfect_dark";
-  version = "0-unstable-2026-03-23";
+  version = "0-unstable-2026-04-25";
 
   src = fetchFromGitHub {
     owner = "fgsfdsfgs";
     repo = "perfect_dark";
-    rev = "7c949ed9d7909547f4ccd98733fcc816b5493d5a";
-    hash = "sha256-1bJiiq3qr+l7bH24wP52Pz8enIy0oltiMWjjqP8glpw=";
+    rev = "bed3bf52d0d5095d112940b1327ed6c256e54ea8";
+    hash = "sha256-ZROpZ7sYmZi9Ptag2m5OOijJcGCldxBQl0fgxK5ve5c=";
 
     postFetch = ''
       pushd $out
diff --git a/pkgs/by-name/pf/pferd/package.nix b/pkgs/by-name/pf/pferd/package.nix
index 79ca5ba77f5c..64ca2bea4dae 100644
--- a/pkgs/by-name/pf/pferd/package.nix
+++ b/pkgs/by-name/pf/pferd/package.nix
@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pferd";
-  version = "3.8.3";
+  version = "3.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Garmelon";
     repo = "PFERD";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-ea/9+9zRlRfblPYfI40IPjHWPneXaAqtRp0Cb/FT+lg=";
+    sha256 = "sha256-bJU7LytxWTb/CRODniDySXRrVyli9FI/yxQqEs/Ar2k=";
   };
 
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/pg/pgagroal/package.nix b/pkgs/by-name/pg/pgagroal/package.nix
index 18745cb45021..66d8529929a8 100644
--- a/pkgs/by-name/pg/pgagroal/package.nix
+++ b/pkgs/by-name/pg/pgagroal/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.6.0";
 
   src = fetchFromGitHub {
-    owner = "agroal";
+    owner = "pgagroal";
     repo = "pgagroal";
     rev = finalAttrs.version;
     hash = "sha256-bgJvGJ35RdFopW88o+H1DLpG70anP197y6xrpRRrxUA=";
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "High-performance connection pool for PostgreSQL";
     homepage = "https://agroal.github.io/pgagroal/";
-    changelog = "https://github.com/agroal/pgagroal/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/pgagroal/pgagroal/releases/tag/${finalAttrs.version}";
     license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pg/pgbackrest/package.nix b/pkgs/by-name/pg/pgbackrest/package.nix
index 8fb4765760dc..e36b26b43d58 100644
--- a/pkgs/by-name/pg/pgbackrest/package.nix
+++ b/pkgs/by-name/pg/pgbackrest/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pgbackrest";
-  version = "2.57.0";
+  version = "2.58.0";
 
   src = fetchFromGitHub {
     owner = "pgbackrest";
     repo = "pgbackrest";
     tag = "release/${finalAttrs.version}";
-    hash = "sha256-TwyMWE9/aCWBIn+AKGaR0UC5qScWPEaDyOG723/2NHA=";
+    hash = "sha256-RxvVqThfGnTCWTaM54Job+2HgJ7baf6ciFYTz496aKQ=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix
index 144c470270ff..96ca1210b570 100644
--- a/pkgs/by-name/pg/pgdog/package.nix
+++ b/pkgs/by-name/pg/pgdog/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
   pname = "pgdog";
-  version = "0.1.37";
+  version = "0.1.38";
 
   src = fetchFromGitHub {
     owner = "pgdogdev";
     repo = "pgdog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wJUJI5ogK8JLMqyEqU2dyySy5o0mA/xy4pYRntszdB0=";
+    hash = "sha256-dSZzzgGyegr5NPRrCIe8ZS2StR4PXsTLbZ//Y3TpMrM=";
   };
 
-  cargoHash = "sha256-wE8YFekvNPmwaoPm2DSa0gAGh5TqkDn3CSvLHdPwXW0=";
+  cargoHash = "sha256-td/zsfK77Wd/8FhJenJE3SEK55vZPIsW/nztR/XbCKs=";
 
   # Hardcoded paths for C compiler and linker
   postPatch = ''
diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix
index 2aef876939cc..1166bef016b3 100644
--- a/pkgs/by-name/pg/pgroll/package.nix
+++ b/pkgs/by-name/pg/pgroll/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   lib,
   libpg_query,
-  xxHash,
+  xxhash,
   testers,
 }:
 
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
 
   buildInputs = [
     libpg_query
-    xxHash
+    xxhash
   ];
 
   ldflags = [
diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 55cfb27604ff..456460f1c94d 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phel";
-  version = "0.32.0";
+  version = "0.34.1";
 
   src = fetchFromGitHub {
     owner = "phel-lang";
     repo = "phel-lang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h+YNS9CWSAlP2K2RV9BVMko6iYC/aJUiD6YexCrRHNI=";
+    hash = "sha256-xopkED6wnbLm3O/ZpuewwHEHWzugO5eght3o/w3vQVE=";
   };
 
-  vendorHash = "sha256-efobguWNFK6cC17WYtmXyTu3MGFQnT0Y69E8CZ3++fA=";
+  vendorHash = "sha256-WrevFD9DErVPw6RyKMyTJMCG9j9BNnuAYEYPji0JjZU=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix
index 069b10d4f281..a2b75c128f72 100644
--- a/pkgs/by-name/ph/phoc/package.nix
+++ b/pkgs/by-name/ph/phoc/package.nix
@@ -36,11 +36,13 @@ let
     repo = "gvdb";
     rev = "4758f6fb7f889e074e13df3f914328f3eecb1fd3";
     hash = "sha256-4mqoHPlrMPenoGPwDqbtv4/rJ/uq9Skcm82pRvOxNIk=";
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
+    forceFetchGit = true;
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoc";
-  version = "0.53.0";
+  version = "0.54.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -48,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Phosh";
     repo = "phoc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qBeOsHxdcJjAx/KGJEQKuqkexp1lGWeEaJPBjAy1Yxw=";
+    hash = "sha256-P81D3gCC4Q1JQPUlAtLbMZdlVOPpJJ1/rLX7zijFcc0=";
     # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
     forceFetchGit = true;
   };
diff --git a/pkgs/by-name/ph/phpstan/package.nix b/pkgs/by-name/ph/phpstan/package.nix
index 1e658c1c71d6..1131c873a1da 100644
--- a/pkgs/by-name/ph/phpstan/package.nix
+++ b/pkgs/by-name/ph/phpstan/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phpstan";
-  version = "2.1.47";
+  version = "2.1.54";
 
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan";
     tag = finalAttrs.version;
-    hash = "sha256-xRDNpz01LvhY44Bwvb9MO6YvRpY5kgWIDxED1Yklvxw=";
+    hash = "sha256-N13KtgGnJKQoutu4X0mTYsma9c0WUpNH+xaUOBwRRPM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index 53c11960ccd8..2e0c2e99c83c 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -8,16 +8,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "13.1.5";
+  version = "13.1.7";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     tag = finalAttrs.version;
-    hash = "sha256-ulOpOQUU6uSqQr1F8BHpb0ad+4c4JrN0cK8H9n4y0Lw=";
+    hash = "sha256-MIHBxs4mRZp74fxEB0pMN/c/wIM3hFD6s1X2Tg2OalY=";
   };
 
-  vendorHash = "sha256-5Va/2Px2jwieeY44BlsscOWmGozcj/jGqAhIm81BCCY=";
+  vendorHash = "sha256-nHO+wjK+AXvxHLp0CNHzpa3By8J5pn+HoZQ5UUHGwYk=";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index 4b4c211250ff..b438ee9e49bb 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "phrase-cli";
-  version = "2.60.0";
+  version = "2.61.0";
 
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
     rev = finalAttrs.version;
-    sha256 = "sha256-9bwGtc6vQoxElrUm9Uf52Chy/fDUOSduIfbV5UjA09M=";
+    sha256 = "sha256-VSkogD90hLgKw/3xXzfs4TktmoLf/RtfaJxEjk/uFsQ=";
   };
 
   vendorHash = "sha256-w3XJUE1iM+yi4cMqMTUDhiafV5v42v4zBJzckv3Fd70=";
diff --git a/pkgs/by-name/ph/phylophlan/package.nix b/pkgs/by-name/ph/phylophlan/package.nix
index e5670ec6ef85..78b307e46972 100644
--- a/pkgs/by-name/ph/phylophlan/package.nix
+++ b/pkgs/by-name/ph/phylophlan/package.nix
@@ -11,14 +11,14 @@
 let
   finalAttrs = {
     pname = "phylophlan";
-    version = "3.1.1";
+    version = "3.2.1";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "biobakery";
       repo = "phylophlan";
       tag = finalAttrs.version;
-      hash = "sha256-KlWKt2tH2lQBh/eQ2Hbcu2gXHEFfmFEc6LrybluxINc=";
+      hash = "sha256-rPTEdu0W3LD27tDIWCOQ3K+RJuj97I9aEeYFdM77jOs=";
     };
 
     build-system = with python3Packages; [ setuptools ];
@@ -35,6 +35,8 @@ let
       seaborn
       distutils
       requests
+      scipy
+      tqdm
     ];
 
     # Minimum needed external tools
diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix
index 7be07adbf169..396540029231 100644
--- a/pkgs/by-name/pi/pi-coding-agent/package.nix
+++ b/pkgs/by-name/pi/pi-coding-agent/package.nix
@@ -10,16 +10,16 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "pi-coding-agent";
-  version = "0.67.68";
+  version = "0.70.5";
 
   src = fetchFromGitHub {
     owner = "badlogic";
     repo = "pi-mono";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1k9tHb5Dle37a5qHm8xT14vI5cQZOb8ASGQ1KxzPCr4=";
+    hash = "sha256-Jn+hvS/DIwbwAff+UovdIVnmrb4o8gsC4IR24MnwF1I=";
   };
 
-  npmDepsHash = "sha256-xQQZECkDuiCdu0FlKbAKgk6EatLf2jMIXKDfRRwN/gA=";
+  npmDepsHash = "sha256-MZgcHJdGFGSNgQ26/24iA12FdmO7S5vWv4crSNFhHi0=";
 
   npmWorkspace = "packages/coding-agent";
 
diff --git a/pkgs/by-name/pi/picoc/gcc15-fixes.patch b/pkgs/by-name/pi/picoc/gcc15-fixes.patch
new file mode 100644
index 000000000000..0e8fcabbd1d7
--- /dev/null
+++ b/pkgs/by-name/pi/picoc/gcc15-fixes.patch
@@ -0,0 +1,45 @@
+--- a/interpreter.h
++++ b/interpreter.h
+@@ -173,6 +173,7 @@ struct ValueType
+ };
+ 
+ /* function definition */
++typedef struct Value Value;         /* Needed to allow reference before definition */
+ struct FuncDef
+ {
+     struct ValueType *ReturnType;   /* the return value type */
+@@ -180,7 +181,12 @@ struct FuncDef
+     int VarArgs;                    /* has a variable number of arguments after the explicitly specified ones */
+     struct ValueType **ParamType;   /* array of parameter types */
+     char **ParamName;               /* array of parameter names */
+-    void (*Intrinsic)();            /* intrinsic call address or NULL */
++    void (*Intrinsic)(              /* intrinsic call address or NULL */
++        struct ParseState *Parser,
++        Value *ReturnValue,
++        Value **ParamArray,
++        int ArgCount
++    );
+     struct ParseState Body;         /* lexical tokens of the function body if not intrinsic */
+ };
+ 
+@@ -610,8 +616,8 @@ void IncludeFile(Picoc *pc, char *Filename);
+  * void PicocIncludeAllSystemHeaders(); */
+  
+ /* debug.c */
+-void DebugInit();
+-void DebugCleanup();
++void DebugInit(Picoc *pc);
++void DebugCleanup(Picoc *pc);
+ void DebugCheckStatement(struct ParseState *Parser);
+ 
+ 
+--- a/platform/library_unix.c
++++ b/platform/library_unix.c
+@@ -1,6 +1,6 @@
+ #include "../interpreter.h"
+ 
+-void UnixSetupFunc()
++void UnixSetupFunc(Picoc *pc)
+ {    
+ }
+ 
diff --git a/pkgs/by-name/pi/picoc/package.nix b/pkgs/by-name/pi/picoc/package.nix
index 2ba10f48bc8b..f26b679b49b6 100644
--- a/pkgs/by-name/pi/picoc/package.nix
+++ b/pkgs/by-name/pi/picoc/package.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ readline ];
 
+  patches = [ ./gcc15-fixes.patch ];
+
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
   env.NIX_CFLAGS_COMPILE = toString (
diff --git a/pkgs/by-name/pi/pid-fan-controller/package.nix b/pkgs/by-name/pi/pid-fan-controller/package.nix
index 12cfdc626b57..4c1b85750e3b 100644
--- a/pkgs/by-name/pi/pid-fan-controller/package.nix
+++ b/pkgs/by-name/pi/pid-fan-controller/package.nix
@@ -4,7 +4,7 @@
   lib,
 }:
 let
-  version = "0.1.1";
+  version = "0.1.3";
 in
 rustPlatform.buildRustPackage {
   pname = "pid-fan-controller";
@@ -13,10 +13,19 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "zimward";
     repo = "pid-fan-controller";
-    rev = version;
-    hash = "sha256-ALR9Qa0AhcGyc3+7x5CEG/72+bJzhaEoIvQNL+QjldY=";
+    tag = version;
+    hash = "sha256-BgBFX4x1gMSMla7lhkFk1n5fBC1TFK0Z5Z3mFH2oBF0=";
   };
-  cargoHash = "sha256-Y57VSheI94b43SwNCDdFvcNxzkA16KObBvzZ6ywYAyU=";
+  cargoHash = "sha256-AN7EbjKZBxb8UP0MEbJUw5Y8E/rE35MByKVmxX2ctko=";
+
+  postPatch = ''
+    substituteInPlace resources/pid-fan-controller.service \
+      --replace-fail '/usr/bin' "$out/bin"
+  '';
+  postInstall = ''
+    install -Dm0644 resources/pid-fan-controller.service $out/lib/systemd/system/pid-fan-controller.service
+    install -Dm0644 resources/pid-fan-controller-sleep.service $out/lib/systemd/system/pid-fan-controller-sleep.service
+  '';
 
   meta = {
     description = "Service to provide closed-loop PID fan control";
diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix
index 389aba2be7d0..7252cb7eec97 100644
--- a/pkgs/by-name/pi/pijul/package.nix
+++ b/pkgs/by-name/pi/pijul/package.nix
@@ -8,7 +8,7 @@
   dbus,
   libsodium,
   openssl,
-  xxHash,
+  xxhash,
   gitImportSupport ? true,
   libgit2 ? null,
 }:
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     dbus
     openssl
     libsodium
-    xxHash
+    xxhash
   ]
   ++ (lib.optionals gitImportSupport [ libgit2 ]);
 
diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix
index 305ccfb7f947..021a00c7fe4f 100644
--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pik";
-  version = "0.30.2";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "jacek-kurlit";
     repo = "pik";
     rev = finalAttrs.version;
-    hash = "sha256-OFlt1JMuIX1oe6KE/prQJie+DaB+QFjnfYHJEdbIqcI=";
+    hash = "sha256-YachIoJeMDJPBvmucALRvyhIwFpMqatesKn3mdrGguE=";
   };
 
-  cargoHash = "sha256-Vg5pXpRSuO4PnN6uJbTrNBvKrmNz4Z8u9AgWtWb9ZYo=";
+  cargoHash = "sha256-gHx6G3MUbv/JCbFGdAUm2ep11d0ksVLlEbSBCtXm7ls=";
 
   passthru.tests.version = testers.testVersion { package = pik; };
 
diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index 0b7ed9e18bcf..a8970748c5fa 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -13,16 +13,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "pinact";
-  version = "3.8.0";
+  version = "3.9.2";
 
   src = fetchFromGitHub {
     owner = "suzuki-shunsuke";
     repo = "pinact";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eZHJ1JK0EwjO6zSH2vKCkwQV3NUVqe2I0+QFMO7VHN0=";
+    hash = "sha256-wbonAugeAgN4drlndazoypQKH5vQNqmZj0Pbkmiygr0=";
   };
 
-  vendorHash = "sha256-EqfhHy9OUiaoCI/VFjUJlm917un3Lf4/cUmeHG7w9Bg=";
+  vendorHash = "sha256-FEZ0F/6gmWMKE5iNfBONbeEIGVwTrBgDFa7q7knrfK8=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/pi/pinniped/package.nix b/pkgs/by-name/pi/pinniped/package.nix
index e2f28e4ba480..ebc07cfc9fbf 100644
--- a/pkgs/by-name/pi/pinniped/package.nix
+++ b/pkgs/by-name/pi/pinniped/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "pinniped";
-  version = "0.44.0";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "pinniped";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-eReGKJRfn2MPJQjSSYf32WeElNw52egJxJF4aCkdHlg=";
+    sha256 = "sha256-KYhMJjUu+6suT9o4RbGRyBl5ItiYt/5JQPg4fUzqs0M=";
   };
 
   subPackages = "cmd/pinniped";
 
-  vendorHash = "sha256-zRc5kNsduZqMvBexwKfXppXxADE0egFh6KQ0qqByKZc=";
+  vendorHash = "sha256-PAq+Oc8+Iib3/hBGrC0xQl+kBtWtsU7XS0alJePkO7k=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix
index 5144a6af2501..ab927d9dd044 100644
--- a/pkgs/by-name/pi/pinocchio/package.nix
+++ b/pkgs/by-name/pi/pinocchio/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pinocchio";
-  version = "3.9.0";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "pinocchio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-k2lT1I0wb3N/o95ol2oO6HSYHf4wKJ0SFEg8JNxZmpI=";
+    hash = "sha256-9UnMGrs4mvBYfjmwOprhqStRW/liPrsKFabRFE2xmjo=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/pi/pioasm/package.nix b/pkgs/by-name/pi/pioasm/package.nix
index c37ca3dba5a9..6e65a52d9d97 100644
--- a/pkgs/by-name/pi/pioasm/package.nix
+++ b/pkgs/by-name/pi/pioasm/package.nix
@@ -2,33 +2,22 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   ninja,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pioasm";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "pico-sdk";
-    rev = finalAttrs.version;
-    hash = "sha256-epO7yw6/21/ess3vMCkXvXEqAn6/4613zmH/hbaBbUw=";
+    tag = finalAttrs.version;
+    hash = "sha256-hQdEZD84/cnLSzP5Xr9vbOGROQz4BjeVOnvbyhe6rfM=";
   };
 
-  patches = [
-    # Pull upstream fix for gcc-15:
-    #   https://github.com/raspberrypi/pico-sdk/pull/2468
-    (fetchpatch {
-      name = "gcc-15.patch";
-      url = "https://github.com/raspberrypi/pico-sdk/commit/66540fe88e86a9f324422b7451a3b5dff4c0449f.patch";
-      hash = "sha256-KwTED7/IWorgRTw1XMU2ILJhf6DAioGuVIunlC1QdNE=";
-      stripLen = 2;
-    })
-  ];
-
   sourceRoot = "${finalAttrs.src.name}/tools/pioasm";
 
   nativeBuildInputs = [
@@ -36,17 +25,16 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  installPhase = ''
-    runHook preInstall
+  cmakeFlags = [
+    (lib.cmakeFeature "PIOASM_VERSION_STRING" finalAttrs.version)
+  ];
 
-    install -D pioasm $out/bin/pioasm
-
-    runHook postInstall
-  '';
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Assemble PIO programs for Raspberry Pi Pico";
     homepage = "https://github.com/raspberrypi/pico-sdk";
+    changelog = "https://github.com/raspberrypi/pico-sdk/releases/tag/${finalAttrs.version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ emilytrau ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pi/pipenv/package.nix b/pkgs/by-name/pi/pipenv/package.nix
index 3d6cde91c87d..f634948ad3fc 100644
--- a/pkgs/by-name/pi/pipenv/package.nix
+++ b/pkgs/by-name/pi/pipenv/package.nix
@@ -33,14 +33,14 @@ let
 in
 buildPythonApplication rec {
   pname = "pipenv";
-  version = "2026.0.3";
+  version = "2026.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "pipenv";
     tag = "v${version}";
-    hash = "sha256-hfkVIYQj6hJ+AB1rUaw2f+M+tAVEAQCXZ4e4ytw07gE=";
+    hash = "sha256-+8xUbpGIEuFboeK+JVVAt46gNcw1tfkmnTYt/IrISik=";
   };
 
   env.LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/by-name/pi/pipewire/0060-libjack-path.patch b/pkgs/by-name/pi/pipewire/0060-libjack-path.patch
index 7fde3dbb8faa..1b28d6e340f9 100644
--- a/pkgs/by-name/pi/pipewire/0060-libjack-path.patch
+++ b/pkgs/by-name/pi/pipewire/0060-libjack-path.patch
@@ -1,8 +1,8 @@
 diff --git a/src/modules/meson.build b/src/modules/meson.build
-index 5d2dc9984..35f5773aa 100644
+index 59f46ae13..3fa3d9f89 100644
 --- a/src/modules/meson.build
 +++ b/src/modules/meson.build
-@@ -169,6 +169,7 @@ if build_module_jack_tunnel
+@@ -110,6 +110,7 @@ if build_module_jack_tunnel
      install_dir : modules_install_dir,
      install_rpath: modules_install_dir,
      dependencies : [mathlib, dl_lib, pipewire_dep],
@@ -11,16 +11,16 @@ index 5d2dc9984..35f5773aa 100644
    build_module_jackdbus_detect = dbus_dep.found()
    if build_module_jackdbus_detect
 diff --git a/src/modules/module-jack-tunnel/weakjack.h b/src/modules/module-jack-tunnel/weakjack.h
-index 42580f798..e7aadd3cc 100644
+index 472adb253..cffca1dde 100644
 --- a/src/modules/module-jack-tunnel/weakjack.h
 +++ b/src/modules/module-jack-tunnel/weakjack.h
-@@ -164,8 +164,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib)
+@@ -167,8 +167,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib)
  
- 		search_dirs = getenv("LIBJACK_PATH");
- 		if (!search_dirs)
--			search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:"
--				"/usr/lib64/:/usr/lib/:" LIBDIR;
-+			search_dirs = NIXPKGS_LIBJACK_PATH;
+ 	search_dirs = getenv("LIBJACK_PATH");
+ 	if (!search_dirs)
+-		search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:"
+-			"/usr/lib64/:/usr/lib/:" LIBDIR;
++		search_dirs = NIXPKGS_LIBJACK_PATH;
+ 
+ 	res = -ENAMETOOLONG;
  
- 		while ((p = pw_split_walk(search_dirs, ":", &len, &state))) {
- 			int pathlen;
diff --git a/pkgs/by-name/pi/pipewire/package.nix b/pkgs/by-name/pi/pipewire/package.nix
index d1a749dd607f..0bfd934ecb21 100644
--- a/pkgs/by-name/pi/pipewire/package.nix
+++ b/pkgs/by-name/pi/pipewire/package.nix
@@ -73,6 +73,7 @@
     x11Support
     && lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform
     && lib.meta.availableOn stdenv.hostPlatform ffado,
+  ldacBtDecodeSupport ? false,
   ffado,
   libselinux,
   libebur128,
@@ -88,7 +89,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipewire";
-  version = "1.6.2";
+  version = "1.6.3";
 
   outputs = [
     "out"
@@ -104,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     tag = finalAttrs.version;
-    hash = "sha256-PG1S70wnyGz9H3TP3gJ2/O+3XnaAyyB4XRM2NFnCWwY=";
+    hash = "sha256-zD0PYtZsiU+tZUpVBKofjGVQyO/68eIZP7DqBQHUGJk=";
   };
 
   patches = [
@@ -166,10 +167,8 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional webrtcAudioProcessingSupport webrtc-audio-processing
   ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib
-  ++ lib.optionals ldacbtSupport [
-    ldacbt
-    libldac-dec
-  ]
+  ++ lib.optional ldacbtSupport ldacbt
+  ++ lib.optional (ldacBtDecodeSupport && ldacbtSupport) libldac-dec
   ++ lib.optional libcameraSupport libcamera
   ++ lib.optional zeroconfSupport avahi
   ++ lib.optional raopSupport openssl
@@ -238,6 +237,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "bluez5-codec-lc3plus" false)
     (lib.mesonEnable "bluez5-codec-lc3" bluezSupport)
     (lib.mesonEnable "bluez5-codec-ldac" (bluezSupport && ldacbtSupport))
+    (lib.mesonEnable "bluez5-codec-ldac-dec" (bluezSupport && ldacbtSupport && ldacBtDecodeSupport))
     (lib.mesonEnable "opus" true)
     (lib.mesonOption "sysconfdir" "/etc")
     (lib.mesonEnable "raop" raopSupport)
diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index aaeac90585dc..69ac3e942d5a 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi";
-  version = "0.67.0";
+  version = "0.67.2";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GGQsFyVWZe/rA7DAqLoTWNOAM0ntTXFHZ92rvyRBr7c=";
+    hash = "sha256-sUSdrNerXaWRmK/MlpHqiYP8dkFbquJeYrV//A3FQFg=";
   };
 
-  cargoHash = "sha256-2lfV+ZRsqpu4AXeDFp/PuJRBPUZxR44rvBa7u94t0kE=";
+  cargoHash = "sha256-ntl+3MCx6ncYJOo6s+IYARrQcqXXdePWdZf3+5/NxxM=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index 3dea9563709f..49da7b57e417 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2026-04-10";
+  version = "0-unstable-2026-04-29";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "70e5087371296e2632232f4a3a795f124c73baf3";
-    hash = "sha256-URPLE5ZHXpMuB3yLObMCOD5PR14KAbOBsc+aGQKubaA=";
+    rev = "6c973a1b2cc4702635ceccabe0c4b9e87d564a24";
+    hash = "sha256-OquWb+1a5Bo1T6q9URiTXMvvZagkhL5dCelPlcyRbjw=";
   };
 
   vendorHash = "sha256-BbCCOgx6Tis2e07nSftdIi7cv8cHIXlsZl5Qk4fsWh8=";
diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix
index 8d4cd13755aa..d3a8c7e16d93 100644
--- a/pkgs/by-name/pl/plakar/package.nix
+++ b/pkgs/by-name/pl/plakar/package.nix
@@ -1,11 +1,12 @@
 {
   stdenv,
   lib,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
+  installShellFiles,
   fuse,
 }:
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
   pname = "plakar";
   version = "1.0.6";
 
@@ -22,6 +23,10 @@ buildGoModule (finalAttrs: {
     fuse
   ];
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   checkFlags =
     let
       skippedTests = [
@@ -31,10 +36,15 @@ buildGoModule (finalAttrs: {
       ++ lib.optionals stdenv.isDarwin [
         "TestBTreeScanMemory"
         "TestBTreeScanPebble"
+        "TestExecuteCmdServerDefault"
       ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
+  postInstall = ''
+    installManPage $(find $src -regex '.*\.[0-9]$')
+  '';
+
   meta = {
     mainProgram = "plakar";
     description = "Encrypted, queryable backups for engineers based on an immutable data store and portable archives";
diff --git a/pkgs/by-name/pl/playwright-mcp/package.nix b/pkgs/by-name/pl/playwright-mcp/package.nix
index 78120415c44a..2f045c3588bd 100644
--- a/pkgs/by-name/pl/playwright-mcp/package.nix
+++ b/pkgs/by-name/pl/playwright-mcp/package.nix
@@ -7,29 +7,38 @@
 }:
 buildNpmPackage rec {
   pname = "playwright-mcp";
-  version = "0.0.56";
+  version = "0.0.69";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "playwright-mcp";
     tag = "v${version}";
-    hash = "sha256-kfn9vIxmx+dSYKzR5ayGX8RIWd5d8quTAyx4/dC6hIY=";
+    hash = "sha256-zX9RsHVInRib69N4LkG3R4TB5qjlBirpu9BBftcr92I=";
   };
 
-  npmDepsHash = "sha256-Qsln4llNpfXYXhSEfHnvdsFIF7adHKEyC1eGHtVY2Qk=";
+  npmDepsHash = "sha256-hc5AkUTGoXxXlDW9vPpiO23QOgANJp1lX4xoaySHoK4=";
 
-  # Codex MCP smoke test (after `codex mcp add playwright-nix --env DISPLAY=:0 -- $out/bin/mcp-server-playwright --headless --isolated`):
+  npmWorkspace = "packages/playwright-mcp";
+
+  # Codex MCP smoke test (after `codex mcp add playwright-nix --env DISPLAY=:0 -- $out/bin/playwright-mcp --headless --isolated`):
   # timeout 45s codex exec --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check "Use only playwright-nix MCP tools. Navigate to https://example.com and return only the page title."
   postInstall = ''
-    rm -rf "$out/lib/node_modules/@playwright/mcp/node_modules/playwright"
-    rm -rf "$out/lib/node_modules/@playwright/mcp/node_modules/playwright-core"
-    ln -s ${playwright-test}/lib/node_modules/playwright "$out/lib/node_modules/@playwright/mcp/node_modules/playwright"
-    ln -s ${playwright-test}/lib/node_modules/playwright-core "$out/lib/node_modules/@playwright/mcp/node_modules/playwright-core"
+    pkg_dir="$out/lib/node_modules/playwright-mcp-internal"
+    rm -rf "$pkg_dir/node_modules/playwright"
+    rm -rf "$pkg_dir/node_modules/playwright-core"
+    ln -s ${playwright-test}/lib/node_modules/playwright "$pkg_dir/node_modules/playwright"
+    ln -s ${playwright-test}/lib/node_modules/playwright-core "$pkg_dir/node_modules/playwright-core"
 
-    wrapProgram $out/bin/mcp-server-playwright \
+    # Workspace symlinks point to a packages/ tree that npmInstallHook does not
+    # ship; npm hoisted the workspace contents directly into playwright-mcp-internal.
+    rm "$pkg_dir/node_modules/@playwright/mcp"
+    rm "$pkg_dir/node_modules/@playwright/mcp-extension"
+    rm "$pkg_dir/node_modules/playwright-cli"
+    rm "$pkg_dir/node_modules/.bin/playwright-mcp"
+
+    wrapProgram $out/bin/playwright-mcp \
       --set PLAYWRIGHT_BROWSERS_PATH ${playwright-driver.browsers} \
-      --set-default PLAYWRIGHT_MCP_BROWSER chromium \
-      --run 'if [ -z "$PLAYWRIGHT_MCP_USER_DATA_DIR" ]; then PLAYWRIGHT_MCP_USER_DATA_DIR="$(mktemp -d -t mcp-pw-XXXXXX)"; export PLAYWRIGHT_MCP_USER_DATA_DIR; trap "rm -rf \"$PLAYWRIGHT_MCP_USER_DATA_DIR\"" EXIT; fi'
+      --set-default PLAYWRIGHT_MCP_BROWSER chromium
   '';
 
   dontNpmBuild = true;
@@ -44,7 +53,7 @@ buildNpmPackage rec {
     description = "Playwright MCP server";
     homepage = "https://github.com/Microsoft/playwright-mcp";
     license = lib.licenses.asl20;
-    mainProgram = "mcp-server-playwright";
+    mainProgram = "playwright-mcp";
     maintainers = [ lib.maintainers.kalekseev ];
   };
 }
diff --git a/pkgs/by-name/pl/plover/package.nix b/pkgs/by-name/pl/plover/package.nix
new file mode 100644
index 000000000000..8753ebb0316c
--- /dev/null
+++ b/pkgs/by-name/pl/plover/package.nix
@@ -0,0 +1,17 @@
+{
+  lib,
+  config,
+  python3Packages,
+  # For aliases
+  plover,
+}:
+python3Packages.toPythonApplication python3Packages.plover
+# Aliases to now-dropped plover.stable and plover.dev
+# Added 2026-04-22
+# TODO(@ShamrockLee): remove after Nixpkgs 25.11 EOL
+// lib.optionalAttrs (config.allowAliases && !(lib.oldestSupportedReleaseIsAtLeast 2605)) {
+  dev =
+    lib.throwIf (lib.oldestSupportedReleaseIsAtLeast 2511) "plover.dev was renamed. Use plover instead."
+      plover; # Added 2026-04-26
+  stable = throw "plover.stable was renamed. Use plover instead."; # Added 2022-06-05; updated 2026-04-26
+}
diff --git a/pkgs/by-name/pl/plover_4/package.nix b/pkgs/by-name/pl/plover_4/package.nix
new file mode 100644
index 000000000000..eed2b2361775
--- /dev/null
+++ b/pkgs/by-name/pl/plover_4/package.nix
@@ -0,0 +1,3 @@
+{ python3Packages }:
+
+python3Packages.toPythonApplication python3Packages.plover_4
diff --git a/pkgs/by-name/pl/plover_5/package.nix b/pkgs/by-name/pl/plover_5/package.nix
new file mode 100644
index 000000000000..20ecfa171780
--- /dev/null
+++ b/pkgs/by-name/pl/plover_5/package.nix
@@ -0,0 +1,3 @@
+{ python3Packages }:
+
+python3Packages.toPythonApplication python3Packages.plover_5
diff --git a/pkgs/by-name/pl/plow/package.nix b/pkgs/by-name/pl/plow/package.nix
index 58f21b72a80d..ad43fefcc63e 100644
--- a/pkgs/by-name/pl/plow/package.nix
+++ b/pkgs/by-name/pl/plow/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "plow";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "six-ddc";
     repo = "plow";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q9k5GzhYPOP8p8VKrqpoHc3B9Qak+4DtZAZZuFlkED0=";
+    hash = "sha256-0/nMF9fqRMzN4bfK6EsTi5MW+OUG/dv4UKr5j/AhRoM=";
   };
 
-  vendorHash = "sha256-KfnDJI6M6tzfoI7krKId5FXUw27eV6cEoz3UaNrlXWk=";
+  vendorHash = "sha256-nGAPuyS95bHPkQMdHdtbdVWQ+MBOOHnHPh7bkSHji4E=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pl/plus42/package.nix b/pkgs/by-name/pl/plus42/package.nix
index b931c0c1bff0..c299b072a91c 100644
--- a/pkgs/by-name/pl/plus42/package.nix
+++ b/pkgs/by-name/pl/plus42/package.nix
@@ -11,11 +11,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "plus42";
-  version = "1.3.13";
+  version = "1.3.14";
 
   src = fetchurl {
     url = "https://thomasokken.com/plus42/upstream/plus42-upstream-${finalAttrs.version}.tgz";
-    hash = "sha256-I5SAR6vEufzT2Cgs4RQk8AWDZWm+QOLtHRqaED2DQtA=";
+    hash = "sha256-ndw4wI+o5eGfqOceSBGnpdQoel89MYxuv8G3CQRZ+6c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index 4e8bdcb1473d..bba13ebf3793 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pluto";
-  version = "5.23.6";
+  version = "5.24.0";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-P/N36LCoXLRDD4ASN4YQovgQFrW2WgS+tKRUlWTNZIs=";
+    hash = "sha256-s46O/lSrF7kNaUWOrWnxQpLxWh/jbvI9k+t2jZqOAjU=";
   };
 
-  vendorHash = "sha256-EAgfzwGt/kHMP5mJ9D+WW6KMV7P0r/gUf6EYTppLWIA=";
+  vendorHash = "sha256-mNY1BmugJ7OauR3nSoiD7EpJ8dlk5PKPL/4urvPtOIY=";
 
   ldflags = [
     "-w"
diff --git a/pkgs/by-name/pm/pmix/package.nix b/pkgs/by-name/pm/pmix/package.nix
index 476ff708edc0..20949e93ddbd 100644
--- a/pkgs/by-name/pm/pmix/package.nix
+++ b/pkgs/by-name/pm/pmix/package.nix
@@ -37,6 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs --build ./config
     patchShebangs --build ./contrib
     patchShebangs --build ./src/util/convert-help.py
+
+  ''
+  # 1. Remove the build information (options to configure and the CC path)
+  # These are hardcoded in the library and create an unwanted dependency
+  # on *.dev inputs.
+  # 2. Remove the reference to the pmix include directories, which are
+  # also hardcoded into the library (would be a cyclic reference).
+  + ''
+    substituteInPlace ./src/runtime/pmix_info_support.c \
+      --replace-fail 'PMIX_CONFIGURE_CLI' '""' \
+      --replace-fail 'PMIX_CC_ABSOLUTE' '""'
+
+    substituteInPlace ./src/mca/pinstalldirs/config/pinstall_dirs.h.in \
+      --replace-fail '@includedir@' ""
   '';
 
   nativeBuildInputs = [
@@ -61,7 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
   configureFlags = [
     "--with-libevent=${lib.getDev libevent}"
     "--with-libevent-libdir=${lib.getLib libevent}/lib"
-    "--with-munge=${munge}"
+    "--with-munge=${lib.getDev munge}"
+    "--with-munge-libdir=${lib.getLib munge}/lib"
     "--with-hwloc=${lib.getDev hwloc}"
     "--with-hwloc-libdir=${lib.getLib hwloc}/lib"
   ];
@@ -90,10 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postFixup = lib.optionalString (lib.elem "dev" finalAttrs.outputs) ''
-    # The build info (parameters to ./configure) are hardcoded
-    # into the library. This clears all references to $dev/include.
-    remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libpmix.so)
-
     # The path to the pmixcc-wrapper-data.txt is hard coded and
     # points to $out instead of dev. Use wrapper to fix paths.
     wrapProgram "''${!outputDev}"/bin/pmixcc \
diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index 66ad9039cf0d..5016480e3303 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -13,18 +13,18 @@
 }:
 buildGo126Module (finalAttrs: {
   pname = "pocket-id";
-  version = "2.5.0";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5y4XIwBnag+vWoNH3RBYn5QbmpM2S08mkY7GiLFchag=";
+    hash = "sha256-xuAG1vpeUEvh0VPOPYNAIWWzmX2AMurLLiQ26Qn1VmM=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";
 
-  vendorHash = "sha256-ZrwnM3X8PbR89xQrM2VeYUTRR2/HupoAb5k9sH26vb8=";
+  vendorHash = "sha256-4AJA34zj+i412b0N0btb9LZ32ip9KaQtPIBEvLjmvHs=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
@@ -65,7 +65,7 @@ buildGo126Module (finalAttrs: {
       inherit (finalAttrs) pname version src;
       pnpm = pnpm_10;
       fetcherVersion = 3;
-      hash = "sha256-4rMVdZnPMAIX/F3CGNJQJtH9OcJ663UlF+arvuwgS80=";
+      hash = "sha256-aciRc302PGUmiLptVlnuLnPc9h+IB0GlPSN7YWTNCEQ=";
     };
 
     env.BUILD_OUTPUT_PATH = "dist";
diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index 7626cbee3146..887b680d3612 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pocketbase";
-  version = "0.36.9";
+  version = "0.37.4";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OClsHslrnQMzHib+C6HKDjlO5sM2j00k4/LuJjh4Uk8=";
+    hash = "sha256-d4JqA1iPPVA+wDS5Q3tJMUVnGvMFhK3JvuVLI7ZXvE0=";
   };
 
-  vendorHash = "sha256-5gbGLq6icXT8cVA1f1zjuV35scPozDjjhHMrgunD0hw=";
+  vendorHash = "sha256-PB95KUhHzkTDJZPXI0dU7SsupTprVufxukQN2OSy7mQ=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];
diff --git a/pkgs/by-name/po/pocketsphinx/package.nix b/pkgs/by-name/po/pocketsphinx/package.nix
index 1fbb27762623..2f5e7f162956 100644
--- a/pkgs/by-name/po/pocketsphinx/package.nix
+++ b/pkgs/by-name/po/pocketsphinx/package.nix
@@ -66,11 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Small speech recognizer";
     homepage = "https://github.com/cmusphinx/pocketsphinx";
     changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${finalAttrs.version}/NEWS";
-    license = with lib.licenses; [
-      bsd2
-      bsd3
-      mit
-    ];
+    license =
+      with lib.licenses;
+      AND [
+        bsd2
+        bsd3
+        mit
+      ];
     pkgConfigModules = [ "pocketsphinx" ];
     mainProgram = "pocketsphinx";
     maintainers = with lib.maintainers; [ jopejoe1 ];
diff --git a/pkgs/by-name/po/poco/package.nix b/pkgs/by-name/po/poco/package.nix
index 22a783f84e61..f97b83bc51dd 100644
--- a/pkgs/by-name/po/poco/package.nix
+++ b/pkgs/by-name/po/poco/package.nix
@@ -20,12 +20,12 @@
 stdenv.mkDerivation rec {
   pname = "poco";
 
-  version = "1.15.1";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "pocoproject";
     repo = "poco";
-    hash = "sha256-JyjEs5aecKSdrNEaSs4Dzs3mAu2rhhBNAG93VLHdU3E=";
+    hash = "sha256-Vx3aXKnka32dw0/6kA3000kmze2CMzCWBW8zDl1xqSA=";
     tag = "poco-${version}-release";
   };
 
diff --git a/pkgs/by-name/po/podman-bootc/package.nix b/pkgs/by-name/po/podman-bootc/package.nix
index 7c61bca20a66..59c7fa4388c0 100644
--- a/pkgs/by-name/po/podman-bootc/package.nix
+++ b/pkgs/by-name/po/podman-bootc/package.nix
@@ -15,7 +15,7 @@ buildGoModule (finalAttrs: {
   version = "0.1.2";
 
   src = fetchFromGitHub {
-    owner = "containers";
+    owner = "bootc-dev";
     repo = "podman-bootc";
     tag = "v${finalAttrs.version}";
     hash = "sha256-Hxg2QSedPAWYZpuesUEFol9bpTppjB0/MpCcB+txMDc=";
@@ -62,8 +62,8 @@ buildGoModule (finalAttrs: {
 
   meta = {
     description = "Streamlining podman+bootc interactions";
-    homepage = "https://github.com/containers/podman-bootc";
-    changelog = "https://github.com/containers/podman-bootc/releases/tag/${finalAttrs.src.tag}";
+    homepage = "https://github.com/bootc-dev/podman-bootc";
+    changelog = "https://github.com/bootc-dev/podman-bootc/releases/tag/${finalAttrs.src.tag}";
     maintainers = with lib.maintainers; [ evan-goode ];
     license = lib.licenses.asl20;
     # x86_64-darwin does not seem to be supported at this time:
diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 139c66fe2583..2d2f2bbe6cec 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   src = fetchFromGitHub {
-    owner = "containers";
+    owner = "podman-desktop";
     repo = "podman-desktop";
     tag = "v${finalAttrs.version}";
     hash = "sha256-VVyKC1z7YECZlbTaFaq2OwGg0k22qBbn/HEOYiJ8fcw=";
@@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
       ''
     );
 
-  # see: https://github.com/containers/podman-desktop/blob/main/.flatpak.desktop
+  # see: https://github.com/podman-desktop/podman-desktop/blob/main/.flatpak.desktop
   desktopItems = [
     (makeDesktopItem {
       name = "podman-desktop";
@@ -175,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Graphical tool for developing on containers and Kubernetes";
     homepage = "https://podman-desktop.io";
-    changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/podman-desktop/podman-desktop/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       booxter
diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 14ba7e5b85b0..09457c55c8a7 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -42,13 +42,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "podman";
-  version = "5.8.1";
+  version = "5.8.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Drji3FLi7peKauA0WnFToKmD4lawlWQr2qESaQFruvE=";
+    hash = "sha256-WUcM594sUerb7/SsAu0PkpOyYuIMjaosr8Bp6d36dYk=";
   };
 
   patches = [
diff --git a/pkgs/by-name/po/poedit/package.nix b/pkgs/by-name/po/poedit/package.nix
index f7522b1e1495..c105a1fb63b5 100644
--- a/pkgs/by-name/po/poedit/package.nix
+++ b/pkgs/by-name/po/poedit/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
   autoconf,
   automake,
   libtool,
@@ -24,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "poedit";
-  version = "3.6.2";
+  version = "3.9";
 
   src = fetchFromGitHub {
     owner = "vslavik";
     repo = "poedit";
     rev = "v${finalAttrs.version}-oss";
-    hash = "sha256-Lb1R7GMB0GeS2xZASR7w4ee33mMEKP9gPabRHkHlIJI=";
+    hash = "sha256-N/o57n624b+StXrT6jBxEFSGElcHdV6wrf/Y2JbA55k=";
   };
 
   nativeBuildInputs = [
@@ -77,6 +78,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "(.*)-oss"
+    ];
+  };
+
   meta = {
     description = "Cross-platform gettext catalogs (.po files) editor";
     mainProgram = "poedit";
diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix
index f40c9f6dcf56..b8ef0e1c4d86 100644
--- a/pkgs/by-name/po/poetry/unwrapped.nix
+++ b/pkgs/by-name/po/poetry/unwrapped.nix
@@ -82,11 +82,13 @@ buildPythonPackage rec {
   ++ pbs-installer.optional-dependencies.download
   ++ pbs-installer.optional-dependencies.install;
 
+  pythonRelaxDeps = [ "installer" ];
+
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd poetry \
       --bash <($out/bin/poetry completions bash) \
       --fish <($out/bin/poetry completions fish) \
-      --zsh <($out/bin/poetry completions zsh) \
+      --zsh <($out/bin/poetry completions zsh)
   '';
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index b8eb6e18c1dd..813a847c9ece 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "polarity";
-  version = "latest-unstable-2026-03-27";
+  version = "latest-unstable-2026-04-28";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "5d253a2701288573a32b58fbf592c66254b825ee";
-    hash = "sha256-jOIuBqJd5dKxEwHoaMMV4Jh9tOhQLkrIuuKsszPkpnE=";
+    rev = "dbcece0e8b572193a5605296392ef1f0d85bba74";
+    hash = "sha256-8wVsiLSTbjIZOObdiawvQy5rw+sf93cp6+wbY+XaByI=";
   };
 
-  cargoHash = "sha256-eat5XK8GZlbdPdkcrvOF99ln0a2SHZexAnqH55i8Vec=";
+  cargoHash = "sha256-9PMQQHydqgeKeB0eM49dJpL+8cstK8yUkc728ATXroQ=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix
index d1375d9d8e20..1890481c389c 100644
--- a/pkgs/by-name/po/polybar/package.nix
+++ b/pkgs/by-name/po/polybar/package.nix
@@ -102,8 +102,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Replace hardcoded /etc when copying and reading the default config.
   postPatch = ''
-    substituteInPlace CMakeLists.txt --replace "/etc" $out
+    substituteInPlace CMakeLists.txt --replace-fail "/etc" $out
     substituteAllInPlace src/utils/file.cpp
+    # Fix gcc15 build: i3ipcpp forces -std=c++11 but the jsoncpp library was
+    # compiled with C++17 (JSONCPP_HAS_STRING_VIEW=1), causing ABI mismatch.
+    # The i3ipcpp code resolves operator[](const char*) but the library only
+    # exports operator[](std::string_view). Bump i3ipcpp to C++17 to match.
+    substituteInPlace lib/i3ipcpp/CMakeLists.txt --replace-fail \
+      "-std=c++11" \
+      "-std=c++17"
   '';
 
   postInstall = ''
diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix
index b20af9ce8526..dc67aa519332 100644
--- a/pkgs/by-name/po/pomerium/package.nix
+++ b/pkgs/by-name/po/pomerium/package.nix
@@ -18,15 +18,15 @@ let
 in
 buildGoModule rec {
   pname = "pomerium";
-  version = "0.32.4";
+  version = "0.32.6";
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "pomerium";
     rev = "v${version}";
-    hash = "sha256-XTj0ZLPRe8I3a5be0oRTxRUuT2wHnbsms7wIvLUg9ms=";
+    hash = "sha256-VwmjuXlYsh2dGKf7ux8DyLZec7xMISuQ7SSb9+LwzfU=";
   };
 
-  vendorHash = "sha256-EYXmeS4jtueI9FwVQdMlsYX3CSRGH9Dft0Syf88nf7o=";
+  vendorHash = "sha256-b4H7gAMG7DXEbvkZFsoEZrKpuvPW0vkfv1qqBPBaGAM=";
 
   ui = buildNpmPackage {
     pname = "pomerium-ui";
diff --git a/pkgs/by-name/po/pop/package.nix b/pkgs/by-name/po/pop/package.nix
index f0445d40328c..d2c52670504d 100644
--- a/pkgs/by-name/po/pop/package.nix
+++ b/pkgs/by-name/po/pop/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pop";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "pop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZGJkpa1EIw3tt1Ww2HFFoYsnnmnSAiv86XEB5TPf4/k=";
+    hash = "sha256-e1xkUXFC1C18nj/eTo2PmHGORKZ1cmz+s0I47SOcTiM=";
   };
 
-  vendorHash = "sha256-8YcJXvR0cdL9PlP74Qh6uN2XZoN16sz/yeeZlBsk5N8=";
+  vendorHash = "sha256-r2kKHwjUqls1nEOF0HwBMOZksSYp2UcjN+B0c1i8MmQ=";
 
   env.GOWORK = "off";
 
diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix
index 812b6fa2f9f9..2e795d12a94e 100644
--- a/pkgs/by-name/po/portablemc/package.nix
+++ b/pkgs/by-name/po/portablemc/package.nix
@@ -51,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "mindstorm38";
+    owner = "theorzr";
     repo = "portablemc";
     tag = "v${finalAttrs.version}";
     hash = "sha256-KE1qf6aIcDjwKzrdKDUmriWfAt+vuriew6ixHKm0xs8=";
@@ -84,14 +84,14 @@ python3Packages.buildPythonApplication (finalAttrs: {
   '';
 
   meta = {
-    homepage = "https://github.com/mindstorm38/portablemc";
+    homepage = "https://github.com/theorzr/portablemc";
     description = "Fast, reliable and cross-platform command-line Minecraft launcher and API for developers";
     longDescription = ''
       A fast, reliable and cross-platform command-line Minecraft launcher and API for developers.
       Including fast and easy installation of common mod loaders such as Fabric, Forge, NeoForge and Quilt.
       This launcher is compatible with the standard Minecraft directories.
     '';
-    changelog = "https://github.com/mindstorm38/portablemc/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/theorzr/portablemc/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
     mainProgram = "portablemc";
     maintainers = with lib.maintainers; [ tomasajt ];
diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix
index cb81c9804723..e02b20928998 100644
--- a/pkgs/by-name/po/portfolio/package.nix
+++ b/pkgs/by-name/po/portfolio/package.nix
@@ -35,11 +35,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "PortfolioPerformance";
-  version = "0.83.1";
+  version = "0.83.2";
 
   src = fetchurl {
     url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-MQ3GA5MV8eWDnu7SWZm9hXbRxWTMO04uNKOQV2x6Yvc=";
+    hash = "sha256-WJqkas9zSnSVvJmuOqdRuNYOu9RLTkvJBLITNrKz7Pk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/po/porxie/package.nix b/pkgs/by-name/po/porxie/package.nix
index 9920eaf7e84b..1a0eaede80f4 100644
--- a/pkgs/by-name/po/porxie/package.nix
+++ b/pkgs/by-name/po/porxie/package.nix
@@ -5,20 +5,28 @@
   nixosTests,
   stdenvNoCC,
   nix-update-script,
+  rust-jemalloc-sys,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "porxie";
-  version = "0.1.0";
+  version = "0.1.2";
 
   src = fetchFromCodeberg {
     owner = "Blooym";
     repo = "porxie";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-TxN9BA/o9BI9yF7k3wpJae78hIcCAhB/ggXVQlt4oP0=";
+    hash = "sha256-dnBHgNSk0i6bokBXQlZMOwePusiplAN2hIna08Y68fA=";
   };
-  cargoHash = "sha256-a0Ps8SvheQoX+Ai8EYgEpyTFwNvB7E3J6MfGiyEvMzM=";
+  cargoHash = "sha256-fl6mv8qHdVQtXc6B6cVu9vG9gJQruAJU2tklChziOBo=";
+
+  buildInputs = [ rust-jemalloc-sys ];
+
+  checkFlags = [
+    # Requires network access.
+    "--skip=identity_service::tests::resolve_and_cache"
+  ];
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index a7add39ead54..1bebfcd69880 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "postfix-tlspol";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oS1U987pS365EQcf96w8RNGWGImFA/uRmv/Oh2HLyuo=";
+    hash = "sha256-JwggXJM8FDMG4oGRcVjVw1J/toTzc/kxrjdENFT9oGs=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/po/postgresqlTestHook/test.nix b/pkgs/by-name/po/postgresqlTestHook/test.nix
index 44650bc60eca..eb2799d7ea98 100644
--- a/pkgs/by-name/po/postgresqlTestHook/test.nix
+++ b/pkgs/by-name/po/postgresqlTestHook/test.nix
@@ -10,7 +10,6 @@ stdenv.mkDerivation {
   nativeCheckInputs = [ postgresql ];
   dontUnpack = true;
   doCheck = true;
-  passAsFile = [ "sql" ];
   sql = ''
     CREATE TABLE hello (
       message text
@@ -23,6 +22,8 @@ stdenv.mkDerivation {
   '';
   checkPhase = ''
     runHook preCheck
+    sqlPath=$TMPDIR/test.sql
+    printf "%s" "$sql" > $sqlPath
     psql <$sqlPath | grep 'it worked'
     TEST_RAN=1
     runHook postCheck
@@ -31,4 +32,5 @@ stdenv.mkDerivation {
     [[ $TEST_RAN == 1 && $TEST_POST_HOOK_RAN == 1 ]]
     touch $out
   '';
+  __structuredAttrs = true;
 }
diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix
index 9eb88dbafa28..7a4d0162dd2f 100644
--- a/pkgs/by-name/po/postman/package.nix
+++ b/pkgs/by-name/po/postman/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "postman";
-  version = "11.93.0";
+  version = "11.94.0";
 
   src =
     let
@@ -27,10 +27,10 @@ let
       name = "postman-${version}.${if stdenvNoCC.hostPlatform.isLinux then "tar.gz" else "zip"}";
       url = "https://dl.pstmn.io/download/version/${version}/${system}";
       hash = selectSystem {
-        aarch64-darwin = "sha256-P7MF0Hg1n/0Wsdg9YEJTHRy8NGjDkDrCCFMbu3uovho=";
-        aarch64-linux = "sha256-OOJAdywyGZaFMpi/IKub53NfJ2IEu3E+bkmYeDT/xjc=";
-        x86_64-darwin = "sha256-xBY8Nqtax8e/5k/pAOCRSdHiOETR1RS1A/anVwhWipw=";
-        x86_64-linux = "sha256-hsW/2Fs1uY+iUl9hzzr5lcVxoydSZn3p/B0AsqXwlww=";
+        aarch64-darwin = "sha256-rZLqbcX5ZRNeDUyEWcsLWMr3KXsnXRKBRmLZKMH9gIs=";
+        aarch64-linux = "sha256-sMJohqgY8DrC7DLgU9AQofLWMhebznAJSLFe5D65c4M=";
+        x86_64-darwin = "sha256-Bit/M3Z+3bJsGSWdCDp9xK9RnxH6bptI0eMqt28dwHQ=";
+        x86_64-linux = "sha256-PsTFM5UwX104G8YIwAy1OY4EgNhspupkPJ53y3qwGUc=";
       };
     };
 
diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix
index 8d002b98f0ad..85227f7c7669 100644
--- a/pkgs/by-name/po/postmoogle/package.nix
+++ b/pkgs/by-name/po/postmoogle/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "postmoogle";
-  version = "0.9.29";
+  version = "0.9.30";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "postmoogle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VBRlsPfNqDehR07vbLvh0nGUgE6H8izW4jqWfMeHmTE=";
+    hash = "sha256-eNXc2PK3yfetyEvTyoiuoFXjEpO4ZYbDFyFaLbzwqeY=";
   };
 
   tags = [
diff --git a/pkgs/applications/radio/pothos/cstring.patch b/pkgs/by-name/po/pothos/cstring.patch
similarity index 100%
rename from pkgs/applications/radio/pothos/cstring.patch
rename to pkgs/by-name/po/pothos/cstring.patch
diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/by-name/po/pothos/package.nix
similarity index 94%
rename from pkgs/applications/radio/pothos/default.nix
rename to pkgs/by-name/po/pothos/package.nix
index 005f44c14a6a..f4a275e28d32 100644
--- a/pkgs/applications/radio/pothos/default.nix
+++ b/pkgs/by-name/po/pothos/package.nix
@@ -6,12 +6,9 @@
   cmake,
   pkg-config,
   doxygen,
-  wrapQtAppsHook,
   pcre,
   poco,
-  qtbase,
-  qtsvg,
-  qwt6_1,
+  libsForQt5,
   nlohmann_json,
   soapysdr-with-plugins,
   portaudio,
@@ -20,14 +17,14 @@
   python3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pothos";
   version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "pothosware";
     repo = "PothosCore";
-    rev = "pothos-${version}";
+    rev = "pothos-${finalAttrs.version}";
     sha256 = "038c3ipvf4sgj0zhm3vcj07ymsva4ds6v89y43f5d3p4n8zc2rsg";
     fetchSubmodules = true;
   };
@@ -67,15 +64,15 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     doxygen
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     pcre
     poco
-    qtbase
-    qtsvg
-    qwt6_1
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+    libsForQt5.qwt6_1
     nlohmann_json
     soapysdr-with-plugins
     portaudio
@@ -113,4 +110,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/applications/radio/pothos/spuce.patch b/pkgs/by-name/po/pothos/spuce.patch
similarity index 100%
rename from pkgs/applications/radio/pothos/spuce.patch
rename to pkgs/by-name/po/pothos/spuce.patch
diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix
index 3132b5cbed28..001d068edc6d 100644
--- a/pkgs/by-name/po/poutine/package.nix
+++ b/pkgs/by-name/po/poutine/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "poutine";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "boostsecurityio";
     repo = "poutine";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kQGq6AzU/M/8mxZMS/ExwN8356sVWCyPmfnRnfpqFAk=";
+    hash = "sha256-8lA9LK5KUblwh9wUDdsbtKQHOINlo6AZi8zkmmhnvwI=";
   };
 
   vendorHash = "sha256-Ktsk01YqBHVZDOu+Xp1p3sVDwqozl35iLYbVavpiWq0=";
diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix
index a34c8e700166..50e4f5356b38 100644
--- a/pkgs/by-name/po/powershell/package.nix
+++ b/pkgs/by-name/po/powershell/package.nix
@@ -31,7 +31,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "powershell";
-  version = "7.6.0";
+  version = "7.6.1";
 
   src =
     passthru.sources.${stdenv.hostPlatform.system}
@@ -74,11 +74,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{bin,share/powershell}
     cp -R * $out/share/powershell
     chmod +x $out/share/powershell/pwsh
-    makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \
+    wrapProgram $out/share/powershell/pwsh \
       --prefix ${platformLdLibraryPath} : "${lib.makeLibraryPath buildInputs}" \
-      --set TERM xterm \
       --set POWERSHELL_TELEMETRY_OPTOUT 1 \
       --set DOTNET_CLI_TELEMETRY_OPTOUT 1
+    cp $out/share/powershell/pwsh $out/bin/pwsh
 
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -96,19 +96,19 @@ stdenv.mkDerivation rec {
     sources = {
       aarch64-darwin = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz";
-        hash = "sha256-u1LbkOlk7guR6T9VmzUIeMayfBL9UYMNjsoXk3Erljk=";
+        hash = "sha256-nhB49wsRxA4Q9LrRNU2xzcrzjNZ3X89A4HOOP1rGgH4=";
       };
       aarch64-linux = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
-        hash = "sha256-3d91ZPs7UtwmvlWA/FtOCOs/plsJRIiq5tSzytX+pGA=";
+        hash = "sha256-c0mIExlOoNhJ1ZQjMu5uUWV+pm2gghaqEFB4jVxSt0E=";
       };
       x86_64-darwin = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
-        hash = "sha256-fGJ5z+rQYyRFGhD/dBiDCGyaAPAkuuqSS7nTwQb+DII=";
+        hash = "sha256-tfh0qDK+wrp4zT5E/bywTBthRNnqtCuYgcuLlAC8xQQ=";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
-        hash = "sha256-BFF0cs9X1/nL2TiX2pvtRnxzymBjwp12VevCCqHWAj8=";
+        hash = "sha256-38lCKXZ5IWA/fD4csaxaqTFEivdJbM9ldyO2J4BXxBU=";
       };
     };
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/pp/pphack/package.nix b/pkgs/by-name/pp/pphack/package.nix
index 33b54eb555d7..956e1fb0d21e 100644
--- a/pkgs/by-name/pp/pphack/package.nix
+++ b/pkgs/by-name/pp/pphack/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pphack";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "edoardottt";
     repo = "pphack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SVoIFrdiuFQDrqfqo+edXGXSMXEbmdecoHn8LzPuMUE=";
+    hash = "sha256-1v4XanhFNjE/t8DTe/YUXKnv61K6FT1nZn2+q0ZreTE=";
   };
 
-  vendorHash = "sha256-zrC+QNv6Tat7rMsPbVAkbqT6WEImgGg5XSgIN3xSd2w=";
+  vendorHash = "sha256-RZJXl2GC9vJq5Ui9hlyKEkiq9HeMQeJIvsH6tOUp4Sg=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index 88b346343492..24ad02ae18e8 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -18,13 +18,13 @@ assert petsc.mpiSupport;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "precice";
-  version = "3.3.1";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = "precice";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3Cg9e1n/O1kG806X3PT7IBd6QuBM38qj9BTlzYZqfSs=";
+    hash = "sha256-/pMJd2ONEFi1Eo4RAL7viXGJf1i1b0Ccb/1y8m/ir0M=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix
index 40e728c575dc..a9343a1cb203 100644
--- a/pkgs/by-name/pr/prek/package.nix
+++ b/pkgs/by-name/pr/prek/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "prek";
-  version = "0.3.9";
+  version = "0.3.10";
 
   src = fetchFromGitHub {
     owner = "j178";
     repo = "prek";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gfWaJxcT44+yEkZtDSQwKP1oILMUsF4apYeety+XESM=";
+    hash = "sha256-boyeL8JIEahDh7veCb/h0YZj7IwVrraXjQZul459sMM=";
   };
 
-  cargoHash = "sha256-dKSsH4IUWLdlthvAmS+MmuAVicCCKefy1D4YleRO0fI=";
+  cargoHash = "sha256-hmaZP6tZpBH1MsgO/WIt75/98E4cHfdpLTfhEgP8Rvw=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index 39fd066fcc0e..372d86d44415 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -16,13 +16,13 @@ let
     };
   };
 
-  version = "2026.1.1";
+  version = "2026.1.2";
 
   src = fetchFromGitHub {
     owner = "pretalx";
     repo = "pretalx";
     tag = "v${version}";
-    hash = "sha256-qkItCF7MOtJQ8NKdB9ImIRKP8g+dzjddElUC4RvLW+s=";
+    hash = "sha256-/hs2sPeHyv06aXfUn7UdaGJo9UQ2hah/nufSxG+wO5Q=";
   };
 
   meta = {
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index b0f6df0356e4..b15cd1805a86 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -51,13 +51,13 @@ let
   };
 
   pname = "pretix";
-  version = "2026.3.1";
+  version = "2026.4.0";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     tag = "v${version}";
-    hash = "sha256-E/WJRuugcfy/r6USS37G73PiHg8DuYRFSq0e19XIRJg=";
+    hash = "sha256-M5ty2kcIyVAFzGiieLx1FHIRXnl4jCR/O2IU7kztV3U=";
   };
 
   npmDeps = buildNpmPackage {
@@ -65,7 +65,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-+84WFNs0iPhMb4YIKfHYByYeFQHITyWeF5yIM8pvQSs=";
+    npmDepsHash = "sha256-U4oXGir53h7R3z4p371PJGm2EU+arsqe/abn6GvSGXs=";
 
     dontBuild = true;
 
@@ -94,6 +94,7 @@ python.pkgs.buildPythonApplication rec {
     "bleach"
     "celery"
     "css-inline"
+    "cryptography"
     "django-bootstrap3"
     "django-compressor"
     "django-filter"
diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
index e48900a713c8..df4813bbde40 100644
--- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-mollie";
-  version = "2.5.3";
+  version = "2.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-mollie";
     tag = "v${version}";
-    hash = "sha256-fWfevPhwpdHkpvuedf16b/f2QfHLy1/FAS3nVV4utwM=";
+    hash = "sha256-lDICcpO8Qod++eM2okq4CJirIBM18zYnbM6Bbwb9e34=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/pr/prisma-engines_6/package.nix b/pkgs/by-name/pr/prisma-engines_6/package.nix
index 8e215b86dee9..e6fe7957a221 100644
--- a/pkgs/by-name/pr/prisma-engines_6/package.nix
+++ b/pkgs/by-name/pr/prisma-engines_6/package.nix
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 # Read the example's README: https://github.com/pimeys/nix-prisma-example/blob/main/README.md
 # Prisma requires 2 packages, `prisma-engines` and `prisma`, to be at *exact* same versions.
 # Certify at `package.json` that dependencies "@prisma/client" and "prisma" are equal, meaning no caret (`^`) in version.
-# Configure NPM to use exact version: `npm config set save-exact=true`
+# Configure npm to use exact version: `npm config set save-exact=true`
 # Delete `package-lock.json`, delete `node_modules` directory and run `npm install`.
 # Run prisma client from `node_modules/.bin/prisma`.
 # Run `./node_modules/.bin/prisma --version` and check if both prisma packages versions are equal, current platform is `linux-nixos`, and other keys equal to the prisma environment variables you defined for prisma.
diff --git a/pkgs/by-name/pr/prisma-engines_7/package.nix b/pkgs/by-name/pr/prisma-engines_7/package.nix
index f6c7a67bf6fc..080ac1480b77 100644
--- a/pkgs/by-name/pr/prisma-engines_7/package.nix
+++ b/pkgs/by-name/pr/prisma-engines_7/package.nix
@@ -11,13 +11,13 @@
 # function correctly.
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "prisma-engines_7";
-  version = "7.7.0";
+  version = "7.8.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
     tag = finalAttrs.version;
-    hash = "sha256-NMoAaiTa68i51lR6iMCyHyCAsFuuhPx2+tHFSSoqWqA=";
+    hash = "sha256-nquIcOmFz+ikD0x/YEPZ5NVKCFPCdR5MSCHldn+b9jI=";
   };
 
   cargoHash = "sha256-uiFvzxwVJXCW9LUDFRC6ZkzSa7LQk+9ZJcaJw8mrBX4=";
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 # Read the example's README: https://github.com/pimeys/nix-prisma-example/blob/main/README.md
 # Prisma requires 2 packages, `prisma-engines` and `prisma`, to be at *exact* same versions.
 # Certify at `package.json` that dependencies "@prisma/client" and "prisma" are equal, meaning no caret (`^`) in version.
-# Configure NPM to use exact version: `npm config set save-exact=true`
+# Configure npm to use exact version: `npm config set save-exact=true`
 # Delete `package-lock.json`, delete `node_modules` directory and run `npm install`.
 # Run prisma client from `node_modules/.bin/prisma`.
 # Run `./node_modules/.bin/prisma --version` and check if both prisma packages versions are equal, current platform is `linux-nixos`, and other keys equal to the prisma environment variables you defined for prisma.
diff --git a/pkgs/by-name/pr/prisma_7/package.nix b/pkgs/by-name/pr/prisma_7/package.nix
index 1b67704d8a0c..8f75e4535c17 100644
--- a/pkgs/by-name/pr/prisma_7/package.nix
+++ b/pkgs/by-name/pr/prisma_7/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "prisma_7";
-  version = "7.7.0";
+  version = "7.8.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma";
     tag = finalAttrs.version;
-    hash = "sha256-GdS70TdHOlI0OatLvu/laBJzBraS/KWuWwpwQGTIEEU=";
+    hash = "sha256-89q5433z54h3oGX+lEYDQykN2mNltGz4+LWlYSE75/E=";
   };
 
   nativeBuildInputs = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 3;
-    hash = "sha256-lfvRw+F0X1BPw3Njiri602HCiyDJOpyXQ5Dgh9f1hfc=";
+    hash = "sha256-mrFU5SAF4QuTBJj5TP8tUkYDG4zchttjcQMLtx6OBnI=";
   };
 
   patchPhase = ''
diff --git a/pkgs/by-name/pr/prl-tools/package.nix b/pkgs/by-name/pr/prl-tools/package.nix
index 75f7e3548a9e..4661b53fa4d0 100644
--- a/pkgs/by-name/pr/prl-tools/package.nix
+++ b/pkgs/by-name/pr/prl-tools/package.nix
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prl-tools";
-  version = "26.3.0-57392";
+  version = "26.3.2-57398";
 
   # We download the full distribution to extract prl-tools-lin.iso from
   # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
   src = fetchurl {
     url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
-    hash = "sha256-pVTlGXZVb/Q/6/i7B07KWb3Kg+5Lm06+v4ERxUjoW7o=";
+    hash = "sha256-JjbXQEtPKfCsgOpuffmGjmaypVT/JK3qx92HWUFJ7VI=";
   };
 
   hardeningDisable = [
diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix
index 129e36f4ba0b..2f6c07932d32 100644
--- a/pkgs/by-name/pr/process-compose/package.nix
+++ b/pkgs/by-name/pr/process-compose/package.nix
@@ -10,13 +10,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "process-compose";
-  version = "1.103.0";
+  version = "1.110.0";
 
   src = fetchFromGitHub {
     owner = "F1bonacc1";
     repo = "process-compose";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DLMMUMI/1ntsa5EydjOR+eTcscVsppX1jdRAhijTBLE=";
+    hash = "sha256-kKb7CFjjvgmRTVgYKXM/EP/ti8OFhlFGcATqZcYHxOI=";
 
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
     installShellFiles
   ];
 
-  vendorHash = "sha256-+1dFQYVHSux4WIjUifaUzkFVDzeelY18UA+0bPrXE+E=";
+  vendorHash = "sha256-dNSf2CJQRJAZiIimriYqlqwcaD1NQg7a1qFPMzEsrgw=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/pr/proftpd/package.nix b/pkgs/by-name/pr/proftpd/package.nix
index 6e3bd70b8704..8d664a8e0699 100644
--- a/pkgs/by-name/pr/proftpd/package.nix
+++ b/pkgs/by-name/pr/proftpd/package.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "proftpd";
-  version = "1.3.9";
+  version = "1.3.9a";
 
   src = fetchFromGitHub {
     owner = "proftpd";
     repo = "proftpd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4Iyzk0OctTvDDkYXPDSrvaWQOjkbBXHY7ELyhkUx/X0=";
+    hash = "sha256-SNLzIwMF6XU2SAc5B9LIW2Jeh1Fa4CVumQYd2O0XxRY=";
   };
 
   patches = [ ./no-install-user.patch ];
diff --git a/pkgs/by-name/pr/prometheus-cpp-lite/package.nix b/pkgs/by-name/pr/prometheus-cpp-lite/package.nix
index 9a9cda17c9bb..17a5679823d2 100644
--- a/pkgs/by-name/pr/prometheus-cpp-lite/package.nix
+++ b/pkgs/by-name/pr/prometheus-cpp-lite/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     substituteInPlace 3rdpatry/http-client-lite/CMakeLists.txt --replace-fail \
       'cmake_minimum_required(VERSION 3.3 FATAL_ERROR)' \
-      'cmake_minimum_required(VERSION 3.10)' \
+      'cmake_minimum_required(VERSION 3.10)'
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/prometheus-mongodb-exporter/package.nix b/pkgs/by-name/pr/prometheus-mongodb-exporter/package.nix
index 15d7ba062927..27f4e872db87 100644
--- a/pkgs/by-name/pr/prometheus-mongodb-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-mongodb-exporter/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "mongodb_exporter";
-  version = "0.50.0";
+  version = "0.51.0";
 
   src = fetchFromGitHub {
     owner = "percona";
     repo = "mongodb_exporter";
     rev = "v${version}";
-    hash = "sha256-vUvm9YvcO3XgQR4GcY1SgP05KGnVZ5c7Z5fZtLvSiFo=";
+    hash = "sha256-FpB1xijoKoKTCteHhuPakej4PkYXcuPMD9Vmc7B6/vs=";
   };
 
-  vendorHash = "sha256-FS6g2VupTk5oa40gjqFJGA/6Ek1ItCpHHyrnG43tSrw=";
+  vendorHash = "sha256-xNfwbUPJjLDLMXzEYH+xsywRc9dRLf/8/V9Zn/sYato=";
 
   buildInputs = lib.optionals withGssapi [ krb5 ];
 
diff --git a/pkgs/by-name/pr/prometheus-pve-exporter/package.nix b/pkgs/by-name/pr/prometheus-pve-exporter/package.nix
index 1c375b5337dc..181cd906eb1a 100644
--- a/pkgs/by-name/pr/prometheus-pve-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-pve-exporter/package.nix
@@ -7,12 +7,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "prometheus_pve_exporter";
-  version = "3.8.2";
+  version = "3.8.3";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fHXWX4gaoP/DRkBw4HEAveUSdRCd4BJCElvGbaSf1TU=";
+    hash = "sha256-dVawZB5oewu7sNj0lZ4koVia6gorjtxpSu66Lvl6XuE=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/by-name/pr/prometheus-redis-exporter/package.nix b/pkgs/by-name/pr/prometheus-redis-exporter/package.nix
index 2a54c9f1d272..c29d0cdc82c3 100644
--- a/pkgs/by-name/pr/prometheus-redis-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-redis-exporter/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "redis_exporter";
-  version = "1.82.0";
+  version = "1.83.0";
 
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
     rev = "v${version}";
-    sha256 = "sha256-zmJe3AQTYGDR2/reof0MRkN+JRx6jPKN98M4iGdAjUw=";
+    sha256 = "sha256-3KT5GsUxHG2t7C7aATo8MpAP5az663dBH5vHesDuBpQ=";
   };
 
-  vendorHash = "sha256-ZiYyFEzG8Si5+sCYrqU0Ka1qogvbchsuDXQwsLo2c14=";
+  vendorHash = "sha256-hISPhsMn2NFmbD7Dg6ervAg5/YfcjLcUneimf9AOxb4=";
 
   ldflags = [
     "-X main.BuildVersion=${version}"
diff --git a/pkgs/by-name/pr/prometheus-tailscale-exporter/package.nix b/pkgs/by-name/pr/prometheus-tailscale-exporter/package.nix
index 23684a49b1c4..3ba9da1a1e97 100644
--- a/pkgs/by-name/pr/prometheus-tailscale-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-tailscale-exporter/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tailscale-exporter";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "adinhodovic";
     repo = "tailscale-exporter";
     tag = finalAttrs.version;
-    hash = "sha256-1q4csOORVFc1tYoPv6Ll11+xgkPhzUQ/UAJrfLpD87k=";
+    hash = "sha256-kz5Z5BjojZQKpq3TzCW/1z7BwRjQLG7K5GAtQW561Do=";
   };
 
-  vendorHash = "sha256-GMaMNEJbSA39DTAXPh5jEy3LC0VzH3UInjnkZIFxT7I=";
+  vendorHash = "sha256-WtA94Ds52nee3ZfZWESC2o1Pz1rPQSTTTe7gOmOqk9g=";
 
   subPackages = [
     "cmd/tailscale-exporter"
diff --git a/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix b/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix
index e52f456a1fc2..174abda37cd2 100644
--- a/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-tibber-exporter/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "prometheus-tibber-exporter";
-  version = "3.10.0";
+  version = "3.10.2";
 
   src = fetchFromGitHub {
     owner = "terjesannum";
     repo = "tibber-exporter";
     tag = "tibber-exporter-${finalAttrs.version}";
-    hash = "sha256-Ndg2BxWdL5DKa2eHjY0rIdrfJ+SJlzvOUZDtWUBSR6g=";
+    hash = "sha256-by7/c2a/8jM4ShoeQnYC+L+EVLk2NwQoRTAMiZZcMn0=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -37,9 +37,14 @@ buildGoModule (finalAttrs: {
     "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
   ];
 
-  vendorHash = "sha256-JTJTapsqBj0FO2Gcx8O1eWJf9hMbeWzjtO0HYcDdzQo=";
+  vendorHash = "sha256-rjM2M9auiyFvGcq/D8N5YPoFOPeC9r1Y1JPssT7nvew=";
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "tibber-exporter-(.*)"
+    ];
+  };
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/pr/prometheus-unbound-exporter/package.nix b/pkgs/by-name/pr/prometheus-unbound-exporter/package.nix
index ac0a4e2e934c..34c88ffec3ad 100644
--- a/pkgs/by-name/pr/prometheus-unbound-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-unbound-exporter/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.5.0";
+  version = "0.6.0";
 in
 buildGoModule {
   pname = "unbound_exporter";
@@ -16,10 +16,10 @@ buildGoModule {
     owner = "letsencrypt";
     repo = "unbound_exporter";
     tag = "v${version}";
-    hash = "sha256-xVc6xES3YdKIaP6rwAzI0/RLoer7bcq7VAmfjYii8VI=";
+    hash = "sha256-XsiQGVYBEXM8DQtQWEA2wk/19TGGZaIBt7Vc4HHfIBY=";
   };
 
-  vendorHash = "sha256-6ZiBXQRsmlUU7h9Dvlb5WHnYAjrrhbw0rypP5ChoKPs=";
+  vendorHash = "sha256-2M7s9YPAFxCQcIgF+HDKu6kztHBvbl/S2BmaBngeBFI=";
 
   passthru.tests = {
     inherit (nixosTests.prometheus-exporters) unbound;
diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix
index fae4e2500a89..40cfe2fec8f0 100644
--- a/pkgs/by-name/pr/prometheus/package.nix
+++ b/pkgs/by-name/pr/prometheus/package.nix
@@ -63,6 +63,8 @@ let
 
     env.CI = true;
 
+    __darwinAllowLocalNetworking = true;
+
     doCheck = true;
     checkPhase = ''
       runHook preCheck
@@ -92,6 +94,10 @@ buildGoModule (finalAttrs: {
 
   proxyVendor = true;
 
+  patches = [
+    ./prometheus-pr18519-fix-TestFsType.patch
+  ];
+
   outputs = [
     "out"
     "doc"
diff --git a/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch b/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch
new file mode 100644
index 000000000000..a7ad2c20b32c
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch
@@ -0,0 +1,25 @@
+--- a/util/runtime/statfs_unix_test.go
++++ b/util/runtime/statfs_unix_test.go
+@@ -19,20 +19,18 @@ import (
+ 	"os"
+ 	"testing"
+
+-	"github.com/grafana/regexp"
+ 	"github.com/stretchr/testify/require"
+ )
+
+-var regexpFsType = regexp.MustCompile("^[A-Z][A-Z0-9_]*_MAGIC$")
+-
+ func TestFsType(t *testing.T) {
+ 	var fsType string
+
+ 	path, err := os.Getwd()
+ 	require.NoError(t, err)
+
++	// A real path must yield a non-zero filesystem type.
+ 	fsType = FsType(path)
+-	require.Regexp(t, regexpFsType, fsType)
++	require.NotEqual(t, "0", fsType)
+
+ 	fsType = FsType("/no/where/to/be/found")
+ 	require.Equal(t, "0", fsType)
diff --git a/pkgs/by-name/pr/prometheus/source.nix b/pkgs/by-name/pr/prometheus/source.nix
index 1090548f6e35..7a582275a2f2 100644
--- a/pkgs/by-name/pr/prometheus/source.nix
+++ b/pkgs/by-name/pr/prometheus/source.nix
@@ -1,6 +1,6 @@
 {
-  version = "3.11.2";
-  hash = "sha256-pSps9LKOOgWUA27lkgFOYliI8Skejx895EKwD88ysn8=";
-  npmDepsHash = "sha256-ZYbyWtqv7SL/SVAOuQmgb7atkrBQDumYB6Wpa39MThw=";
+  version = "3.11.3";
+  hash = "sha256-JmnVTVW6LsrdiQspKznksyhAYkmCXQcqCLK8q5nZI48=";
+  npmDepsHash = "sha256-6uE8d3+v5wobSyCl8oYlbNQZjRj/WtvVrpzo/PR2hQA=";
   vendorHash = "sha256-wR1b5jV/2B50OeKokv8Ss+tpSXNjJBsLIZrK7gOb168=";
 }
diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix
index e59916cc03e5..d8e0ef7e37fa 100644
--- a/pkgs/by-name/pr/promptfoo/package.nix
+++ b/pkgs/by-name/pr/promptfoo/package.nix
@@ -1,6 +1,5 @@
 {
   buildNpmPackage,
-  nodejs_22,
   fetchFromGitHub,
   lib,
 }:
@@ -18,9 +17,6 @@ buildNpmPackage (finalAttrs: {
 
   npmDepsHash = "sha256-mpe00J5iRwaH7hJIDP3fDuJSUOKk01COpOOvF1YJMyg=";
 
-  # https://github.com/NixOS/nixpkgs/issues/474535
-  nodejs = nodejs_22;
-
   # don't fetch playwright binary
   env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
 
diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix
index 0a59eeadf9c4..dcc6446e4bc9 100644
--- a/pkgs/by-name/pr/proto/package.nix
+++ b/pkgs/by-name/pr/proto/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "proto";
-  version = "0.56.3";
+  version = "0.56.4";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "proto";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-WMc1UpxP32gTRjxemAnFVQ4YxSNirEJJnUUWRDoU9os=";
+    hash = "sha256-fX9kPkhJ2AgmTR/7fINBpHnZfdB+W7QNx3CGX7O9Lh4=";
   };
 
-  cargoHash = "sha256-umbwQVUClF5pW3MzVyqDANmyQoCAqlRl5OwwEkg4UaQ=";
+  cargoHash = "sha256-b0inmhRT5lm9zQHl9jFYFWVI80sWHtr7OggMntUNK/o=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix
index e95f16194fcd..425cc765bae0 100644
--- a/pkgs/by-name/pr/proton-pass-cli/package.nix
+++ b/pkgs/by-name/pr/proton-pass-cli/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proton-pass-cli";
-  version = "1.10.0";
+  version = "2.0.2";
 
   src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
 
@@ -46,19 +46,19 @@ stdenv.mkDerivation (finalAttrs: {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64";
-        hash = "sha256-tOHXJl4R27rtuXlsqAQ8XFpOJ7Pc1IEcnla85Myn7N0=";
+        hash = "sha256-C/2ZxNgnDOLCkTyTqCPGIKiXXjwvHOJNI05BcGy1z0c=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64";
-        hash = "sha256-zJQfWhiNk/noQbrhnxgEqGHZwccsyV2FX3sEOpUGTYQ=";
+        hash = "sha256-wSxTGtuCPU6uT25pBlxudnsQ7XEyihs/piWkiXrjs4w=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64";
-        hash = "sha256-usmOErL5BeZ2s4VrShr4fYcO5ibBBaBJuk3oPtjf884=";
+        hash = "sha256-qXXKavGRd6LSdLeoIiwlENhOE9JS/ZxQv432flS0KBg=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64";
-        hash = "sha256-lkB4I5Srj+r+pLvd2HEch/NPFfHvhVfgu6RC7yh/njY=";
+        hash = "sha256-/WClBB5kKnsRNe9oeMPXzjUjsIMhDqgQDu5cNwEBftk=";
       };
     };
     updateScript = writeShellScript "update-proton-pass-cli" ''
diff --git a/pkgs/by-name/pr/proton-vpn-cli/package.nix b/pkgs/by-name/pr/proton-vpn-cli/package.nix
index f937c1a2f31c..c8a05a6faba6 100644
--- a/pkgs/by-name/pr/proton-vpn-cli/package.nix
+++ b/pkgs/by-name/pr/proton-vpn-cli/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "proton-vpn-cli";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "proton-vpn-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TIS1vhiOaX0ADKD1WRiPv+WYj0LwHmUuqyctygpaBho=";
+    hash = "sha256-CkkytFC3Zr/l2EV5W70kssN1v11F23oZpDvf7JWqmvQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/proton-vpn/linux.nix b/pkgs/by-name/pr/proton-vpn/linux.nix
index d14ed210c869..a593f473279f 100644
--- a/pkgs/by-name/pr/proton-vpn/linux.nix
+++ b/pkgs/by-name/pr/proton-vpn/linux.nix
@@ -14,14 +14,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "proton-vpn";
-  version = "4.15.2";
+  version = "4.15.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "proton-vpn-gtk-app";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-spxlYITDo2TZp4Qv47/HmiIaGU07THZXLG5cFIFZrow=";
+    hash = "sha256-2v8BckNmm7Ecw+uAgOyfofHDPWgXkJJ8DmhMszb0tg0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/protonmail-bridge/package.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix
index 95b47a2869c8..0273a8cef572 100644
--- a/pkgs/by-name/pr/protonmail-bridge/package.nix
+++ b/pkgs/by-name/pr/protonmail-bridge/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "protonmail-bridge";
-  version = "3.23.1";
+  version = "3.24.2";
 
   src = fetchFromGitHub {
     owner = "ProtonMail";
     repo = "proton-bridge";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-QSK+MiHE8JFtUM4r+4xswOcNrcUd0flxuSf5uG2kZnI=";
+    hash = "sha256-BNNlxtq6MLDPTgWltmllpSbWbe02QdaH4kRWzIOuFvg=";
   };
 
-  vendorHash = "sha256-Ww42BbdMHVUUc074vWNYTEMr1myqDPLgkMsaTarziag=";
+  vendorHash = "sha256-jGFefDKPrYZ7QB3R/fRiEC6FPp6U77mJ2E/RXeylsvI=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix
index 24624b16f18e..2fbefc55652a 100644
--- a/pkgs/by-name/pr/protonmail-desktop/package.nix
+++ b/pkgs/by-name/pr/protonmail-desktop/package.nix
@@ -10,9 +10,9 @@
 }:
 let
   mainProgram = "proton-mail";
-  version = "1.12.1";
-  linuxHash = "sha256-CNrL/O2PMXaUVgvXbmrLFZphz7yV4BlRlr388nbMsoE=";
-  darwinHash = "sha256-y8KgHm8pIbLQAb1/pIApNBbsaEi5ldInY4VXNBiTQlI=";
+  version = "1.13.0";
+  linuxHash = "sha256-ehvDkemVmKQuNm9FgKtUM/M/z4YMjXA8qtLt94SN73U=";
+  darwinHash = "sha256-YtLlW+fSRd3hJMjHOA3kXKKq2j71Edc8NW/55zTLywY=";
 in
 stdenv.mkDerivation {
   pname = "protonmail-desktop";
diff --git a/pkgs/by-name/pr/proxelar/package.nix b/pkgs/by-name/pr/proxelar/package.nix
new file mode 100644
index 000000000000..96548c6c3c08
--- /dev/null
+++ b/pkgs/by-name/pr/proxelar/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  fetchFromGitHub,
+  openssl,
+  pkg-config,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "proxelar";
+  version = "0.4.4";
+
+  src = fetchFromGitHub {
+    owner = "emanuele-em";
+    repo = "proxelar";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dUz20mk9ghUyCRuxkEpjjibhDMk7kAezZxGPadQhhM0=";
+  };
+
+  cargoHash = "sha256-Jc6NExi2BUs1Hoia4MyDouj/LUO9tCRN0Pu2/32uG7c=";
+
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  env = {
+    OPENSSL_NO_VENDOR = true;
+  };
+
+  meta = {
+    description = "Programmable MITM proxy that intercepts HTTP/HTTPS traffic";
+    homepage = "https://github.com/emanuele-em/proxelar";
+    changelog = "https://github.com/emanuele-em/proxelar/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "proxelar";
+  };
+})
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
index 9b7f15604ab7..e9fd5ed78a05 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
+++ b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch
@@ -1,4 +1,4 @@
-From 71ff7368f729289f2eb3fe5a01365411fa006751 Mon Sep 17 00:00:00 2001
+From 84bfd76cc75904cb722f53058b6da67f494c4bd4 Mon Sep 17 00:00:00 2001
 From: Christoph Heiss <christoph@c8h4.io>
 Date: Mon, 23 Feb 2026 10:58:20 +0100
 Subject: [PATCH proxmox-backup 1/2] cargo: re-route dependencies not available
@@ -6,14 +6,14 @@ Subject: [PATCH proxmox-backup 1/2] cargo: re-route dependencies not available
 
 Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 ---
- Cargo.toml | 100 ++++++++++++++++++++++++++---------------------------
- 1 file changed, 50 insertions(+), 50 deletions(-)
+ Cargo.toml | 104 ++++++++++++++++++++++++++---------------------------
+ 1 file changed, 52 insertions(+), 52 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 9bf7b79a..ced3b793 100644
+index 3e036f54e..2d97df9fd 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -271,57 +271,57 @@ proxmox-rrd-api-types.workspace = true
+@@ -277,59 +277,59 @@ proxmox-rrd-api-types.workspace = true
  # Local path overrides
  # NOTE: You must run `cargo update` after changing this for it to take effect!
  [patch.crates-io]
@@ -30,6 +30,7 @@ index 9bf7b79a..ced3b793 100644
 -#proxmox-compression = { path = "../proxmox/proxmox-compression" }
 -#proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
 -#proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
+-#proxmox-docgen = { path = "../proxmox/proxmox-docgen" }
 -#proxmox-http = { path = "../proxmox/proxmox-http" }
 -#proxmox-http-error = { path = "../proxmox/proxmox-http-error" }
 -#proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
@@ -42,6 +43,7 @@ index 9bf7b79a..ced3b793 100644
 -#proxmox-network-types = { path = "../proxmox/proxmox-network-types" }
 -#proxmox-notify = { path = "../proxmox/proxmox-notify" }
 -#proxmox-openid = { path = "../proxmox/proxmox-openid" }
+-#proxmox-parallel-handler = { path = "../proxmox/proxmox-parallel-handler" }
 -#proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
 -#proxmox-rate-limiter = { path = "../proxmox/proxmox-rate-limiter" }
 -#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
@@ -77,6 +79,7 @@ index 9bf7b79a..ced3b793 100644
 +proxmox-compression = { path = "../proxmox/proxmox-compression" }
 +proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
 +proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
++proxmox-docgen = { path = "../proxmox/proxmox-docgen" }
 +proxmox-http = { path = "../proxmox/proxmox-http" }
 +proxmox-http-error = { path = "../proxmox/proxmox-http-error" }
 +proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
@@ -89,6 +92,7 @@ index 9bf7b79a..ced3b793 100644
 +proxmox-network-types = { path = "../proxmox/proxmox-network-types" }
 +proxmox-notify = { path = "../proxmox/proxmox-notify" }
 +proxmox-openid = { path = "../proxmox/proxmox-openid" }
++proxmox-parallel-handler = { path = "../proxmox/proxmox-parallel-handler" }
 +proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
 +proxmox-rate-limiter = { path = "../proxmox/proxmox-rate-limiter" }
 +proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
@@ -122,5 +126,5 @@ index 9bf7b79a..ced3b793 100644
  [features]
  default = []
 -- 
-2.52.0
+2.53.0
 
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-drop-all-but-client-man-pages.patch b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-drop-all-but-client-man-pages.patch
index e744ce3c030c..d7deaff49770 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-drop-all-but-client-man-pages.patch
+++ b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-drop-all-but-client-man-pages.patch
@@ -1,4 +1,4 @@
-From 732dc6b91299bda441f52c6d7decddfbfd6e5517 Mon Sep 17 00:00:00 2001
+From ae84be4e56a1100583d80db03834f439833ee1f2 Mon Sep 17 00:00:00 2001
 From: Thomas Lamprecht <thomas@lamprecht.org>
 Date: Tue, 29 Nov 2022 17:20:28 +0100
 Subject: [PATCH proxmox-backup 2/2] docs: drop all but client man pages
@@ -11,7 +11,7 @@ Signed-off-by: Christoph Heiss <christoph@c8h4.io>
  2 files changed, 43 deletions(-)
 
 diff --git a/docs/Makefile b/docs/Makefile
-index 5cf5fc17..85ff3b91 100644
+index 5cf5fc179..85ff3b91e 100644
 --- a/docs/Makefile
 +++ b/docs/Makefile
 @@ -1,27 +1,8 @@
@@ -43,7 +43,7 @@ index 5cf5fc17..85ff3b91 100644
  
  MAN1_PAGES := 				\
 diff --git a/docs/conf.py b/docs/conf.py
-index 64c4f9d4..345a0170 100644
+index 64c4f9d47..345a0170d 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
 @@ -93,31 +93,7 @@ rst_epilog += f"\n..  |pbs-copyright| replace:: Copyright (C) {copyright}"
@@ -79,5 +79,5 @@ index 64c4f9d4..345a0170 100644
  
  
 -- 
-2.50.1
+2.53.0
 
diff --git a/pkgs/by-name/pr/proxmox-backup-client/0003-decoder-fix-autoref-error-in-pointer-to-reference-co.patch b/pkgs/by-name/pr/proxmox-backup-client/0003-decoder-fix-autoref-error-in-pointer-to-reference-co.patch
deleted file mode 100644
index 9b51d0c49dae..000000000000
--- a/pkgs/by-name/pr/proxmox-backup-client/0003-decoder-fix-autoref-error-in-pointer-to-reference-co.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d9c0d413ec38ae11cdd61bdc6b4b76d1f05a7794 Mon Sep 17 00:00:00 2001
-From: Christoph Heiss <christoph@c8h4.io>
-Date: Thu, 4 Sep 2025 10:24:39 +0200
-Subject: [PATCH] decoder: fix autoref error in pointer to reference conversion
-
-Signed-off-by: Christoph Heiss <christoph@c8h4.io>
----
- src/decoder/mod.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs
-index eca51b6..b034d38 100644
---- a/src/decoder/mod.rs
-+++ b/src/decoder/mod.rs
-@@ -35,7 +35,7 @@ fn scratch_buffer() -> &'static mut [u8] {
-     unsafe {
-         let ptr: *mut MaybeUninit<[u8; 4096]> = &raw mut SCRATCH_BUFFER;
-         let ptr: &mut MaybeUninit<[u8; 4096]> = &mut *ptr;
--        &mut (*ptr.as_mut_ptr())[..]
-+        &mut *ptr.as_mut_ptr()
-     }
- }
- 
--- 
-2.50.1
-
diff --git a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
index d14a6201e352..6a7f53b62433 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
+++ b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
@@ -8,18 +8,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
-[[package]]
-name = "ahash"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.4"
@@ -29,12 +17,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -46,9 +28,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.21"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -61,15 +43,15 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 dependencies = [
  "utf8parse",
 ]
@@ -112,12 +94,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "ar_archive_writer"
-version = "0.5.1"
+name = "argon2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb93bbb63b9c227414f6eb3a0adfddca591a8ce1e9b60661bb08969b87e340b"
+checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
 dependencies = [
- "object",
+ "base64ct",
+ "blake2",
+ "cpufeatures",
+ "password-hash",
+]
+
+[[package]]
+name = "ascii-canvas"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef1e3e699d84ab1b0911a1010c5c106aa34ae89aeac103be5ce0c3859db1e891"
+dependencies = [
+ "term",
 ]
 
 [[package]]
@@ -143,7 +137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
  "synstructure",
 ]
@@ -155,7 +149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -166,7 +160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -224,10 +218,52 @@ dependencies = [
 ]
 
 [[package]]
-name = "bitflags"
-version = "2.11.0"
+name = "bindgen"
+version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.13.0",
+ "proc-macro2 1.0.106",
+ "quote 1.0.45",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
+[[package]]
+name = "bitflags"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest",
+]
 
 [[package]]
 name = "block-buffer"
@@ -235,7 +271,18 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.9",
+]
+
+[[package]]
+name = "buffered-reader"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db26bf1f092fd5e05b5ab3be2f290915aeb6f3f20c4e9f86ce0f07f336c2412f"
+dependencies = [
+ "bzip2 0.5.2",
+ "flate2",
+ "libc",
 ]
 
 [[package]]
@@ -251,10 +298,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 
 [[package]]
-name = "cc"
-version = "1.2.56"
+name = "bzip2"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
+checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47"
+dependencies = [
+ "bzip2-sys",
+]
+
+[[package]]
+name = "bzip2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a53fac24f34a81bc9954b5d6cfce0c21e18ec6959f44f56e8e90e4bb7c346c"
+dependencies = [
+ "libbz2-rs-sys",
+]
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.13+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -262,6 +337,15 @@ dependencies = [
  "shlex",
 ]
 
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom 7.1.3",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -282,9 +366,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.43"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -294,22 +378,23 @@ dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "chumsky"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
-dependencies = [
- "hashbrown 0.14.5",
- "stacker",
-]
-
 [[package]]
 name = "cidr"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "579504560394e388085d0c080ea587dfa5c15f7e251b4d5247d1e1a61d1d6928"
 
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
 [[package]]
 name = "clipboard-win"
 version = "5.4.1"
@@ -321,9 +406,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
 [[package]]
 name = "const-oid"
@@ -333,11 +418,12 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "const_format"
-version = "0.2.35"
+version = "0.2.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad"
+checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e"
 dependencies = [
  "const_format_proc_macros",
+ "konst",
 ]
 
 [[package]]
@@ -347,7 +433,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "unicode-xid 0.2.6",
 ]
 
@@ -412,7 +498,7 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.9",
  "rand_core 0.6.4",
  "subtle",
  "zeroize",
@@ -424,7 +510,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "generic-array",
+ "generic-array 0.14.9",
  "typenum",
 ]
 
@@ -451,15 +537,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
 [[package]]
 name = "darling"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -467,34 +553,33 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
 dependencies = [
- "fnv",
  "ident_case",
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "strsim",
  "syn 2.0.117",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.21.3"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
+checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
 
 [[package]]
 name = "der"
@@ -503,7 +588,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
 dependencies = [
  "const-oid",
- "pem-rfc7468",
+ "pem-rfc7468 0.7.0",
+ "zeroize",
+]
+
+[[package]]
+name = "der"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71fd89660b2dc699704064e59e9dba0147b903e85319429e131620d022be411b"
+dependencies = [
+ "pem-rfc7468 1.0.0",
  "zeroize",
 ]
 
@@ -550,7 +645,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -566,7 +661,7 @@ version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "der",
+ "der 0.7.10",
  "digest",
  "elliptic-curve",
  "rfc6979",
@@ -614,10 +709,10 @@ dependencies = [
  "crypto-bigint",
  "digest",
  "ff",
- "generic-array",
+ "generic-array 0.14.9",
  "group",
  "hkdf",
- "pem-rfc7468",
+ "pem-rfc7468 0.7.0",
  "pkcs8",
  "rand_core 0.6.4",
  "sec1",
@@ -641,6 +736,15 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
 
+[[package]]
+name = "ena"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabffdaee24bd1bf95c5ef7cec31260444317e72ea56c4c91750e8b7ee58d5f1"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "endian-type"
 version = "0.1.2"
@@ -674,15 +778,15 @@ checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
 dependencies = [
  "heck",
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
 [[package]]
 name = "env_filter"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a1c3cc8e57274ec99de65301228b537f1e4eedc1b8e0f9411c6caac8ae7308f"
+checksum = "32e90c2accc4b07a8456ea0debdc2e7587bdd890680d71173a15d4ae604f6eef"
 dependencies = [
  "log",
  "regex",
@@ -690,9 +794,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.9"
+version = "0.11.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2daee4ea451f429a58296525ddf28b45a3b64f1acf6587e2067437bb11e218d"
+checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a"
 dependencies = [
  "anstream",
  "anstyle",
@@ -734,9 +838,9 @@ checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "fd-lock"
@@ -782,6 +886,12 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
 [[package]]
 name = "flate2"
 version = "1.1.9"
@@ -889,7 +999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -933,6 +1043,16 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "generic-array"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dab9e9188e97a93276e1fe7b56401b851e2b45a46d045ca658100c1303ada649"
+dependencies = [
+ "rustversion",
+ "typenum",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -954,23 +1074,29 @@ checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
- "r-efi",
+ "r-efi 5.3.0",
  "wasip2",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 dependencies = [
  "cfg-if",
  "libc",
- "r-efi",
+ "r-efi 6.0.0",
  "wasip2",
  "wasip3",
 ]
 
+[[package]]
+name = "glob"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -994,7 +1120,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1038,16 +1164,6 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.15.5"
@@ -1059,9 +1175,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
 
 [[package]]
 name = "heck"
@@ -1100,7 +1216,7 @@ dependencies = [
  "idna",
  "ipnet",
  "once_cell",
- "rand 0.8.5",
+ "rand 0.8.6",
  "thiserror 1.0.69",
  "tinyvec",
  "tokio",
@@ -1121,7 +1237,7 @@ dependencies = [
  "lru-cache",
  "once_cell",
  "parking_lot",
- "rand 0.8.5",
+ "rand 0.8.6",
  "resolv-conf",
  "smallvec",
  "thiserror 1.0.69",
@@ -1225,9 +1341,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
+checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1240,7 +1356,6 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -1260,7 +1375,7 @@ dependencies = [
  "hyper",
  "libc",
  "pin-project-lite",
- "socket2 0.6.2",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -1292,12 +1407,13 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
 dependencies = [
  "displaydoc",
  "potential_utf",
+ "utf8_iter",
  "yoke",
  "zerofrom",
  "zerovec",
@@ -1305,9 +1421,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1318,9 +1434,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
 dependencies = [
  "icu_collections",
  "icu_normalizer_data",
@@ -1332,15 +1448,15 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
 
 [[package]]
 name = "icu_properties"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
 dependencies = [
  "icu_collections",
  "icu_locale_core",
@@ -1352,15 +1468,15 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
 
 [[package]]
 name = "icu_provider"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
@@ -1396,9 +1512,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -1417,12 +1533,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
  "serde",
  "serde_core",
 ]
@@ -1440,21 +1556,22 @@ dependencies = [
 
 [[package]]
 name = "ipconfig"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222"
 dependencies = [
- "socket2 0.5.10",
+ "socket2",
  "widestring",
- "windows-sys 0.48.0",
- "winreg",
+ "windows-registry",
+ "windows-result",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.11.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 
 [[package]]
 name = "is_terminal_polyfill"
@@ -1481,16 +1598,34 @@ dependencies = [
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.17"
+name = "itertools"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jiff"
-version = "0.2.21"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e3d65f018c6ae946ab16e80944b97096ed73c35b221d1c478a6c81d8f57940"
+checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d"
 dependencies = [
  "jiff-static",
  "log",
@@ -1501,12 +1636,12 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.21"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17c2b211d863c7fde02cbea8a3c1a439b98e109286554f2860bdded7ff83818"
+checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -1522,14 +1657,71 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.88"
+version = "0.3.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7e709f3e3d22866f9c25b3aff01af289b18422cc8b4262fb19103ee80fe513d"
+checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf"
 dependencies = [
+ "cfg-if",
+ "futures-util",
  "once_cell",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "keccak"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "konst"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb"
+dependencies = [
+ "konst_macro_rules",
+]
+
+[[package]]
+name = "konst_macro_rules"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37"
+
+[[package]]
+name = "lalrpop"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4ebbd48ce411c1d10fb35185f5a51a7bfa3d8b24b4e330d30c9e3a34129501"
+dependencies = [
+ "ascii-canvas",
+ "bit-set",
+ "ena",
+ "itertools 0.14.0",
+ "lalrpop-util",
+ "petgraph",
+ "regex",
+ "regex-syntax",
+ "sha3",
+ "string_cache",
+ "term",
+ "unicode-xid 0.2.6",
+ "walkdir",
+]
+
+[[package]]
+name = "lalrpop-util"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5baa5e9ff84f1aefd264e6869907646538a52147a755d494517a8007fb48733"
+dependencies = [
+ "regex-automata",
+ "rustversion",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1581,12 +1773,11 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "lettre"
-version = "0.11.19"
+version = "0.11.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e13e10e8818f8b2a60f52cb127041d388b89f3a96a62be9ceaffa22262fef7f"
+checksum = "dabda5859ee7c06b995b9d1165aa52c39110e079ef609db97178d86aeb051fa7"
 dependencies = [
  "base64 0.22.1",
- "chumsky",
  "email-encoding",
  "email_address",
  "fastrand",
@@ -1599,16 +1790,32 @@ dependencies = [
  "nom 8.0.0",
  "percent-encoding",
  "quoted_printable",
- "socket2 0.6.2",
+ "socket2",
  "tokio",
  "url",
 ]
 
 [[package]]
-name = "libc"
-version = "0.2.182"
+name = "libbz2-rs-sys"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
+checksum = "b3a6a8c165077efc8f3a971534c50ea6a1a18b329ef4a66e897a7e3a1494565f"
+
+[[package]]
+name = "libc"
+version = "0.2.186"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "libloading"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+dependencies = [
+ "cfg-if",
+ "windows-link",
+]
 
 [[package]]
 name = "libm"
@@ -1618,13 +1825,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.12"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
+checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
 dependencies = [
  "bitflags",
  "libc",
- "redox_syscall 0.7.1",
+ "plain",
+ "redox_syscall 0.7.4",
 ]
 
 [[package]]
@@ -1651,9 +1859,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
 
 [[package]]
 name = "lock_api"
@@ -1706,6 +1914,12 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "memsec"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c797b9d6bb23aab2fc369c65f871be49214f5c759af65bde26ffaaa2b646b492"
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -1730,9 +1944,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
 dependencies = [
  "libc",
  "wasi",
@@ -1756,6 +1970,39 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "nettle"
+version = "7.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2578a3627c28fefb60f1680e20e85f38bd8c8bf98c288b370489a573b0640907"
+dependencies = [
+ "getrandom 0.4.2",
+ "libc",
+ "nettle-sys",
+ "thiserror 2.0.18",
+ "typenum",
+]
+
+[[package]]
+name = "nettle-sys"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f35502358aa77e598570bbf9a79ad19c4985a1bcd157b5d70197688dafca9b48"
+dependencies = [
+ "bindgen",
+ "cc",
+ "libc",
+ "pkg-config",
+ "tempfile",
+ "vcpkg",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
 [[package]]
 name = "nibble_vec"
 version = "0.1.0"
@@ -1839,16 +2086,16 @@ dependencies = [
  "num-integer",
  "num-iter",
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.6",
  "smallvec",
  "zeroize",
 ]
 
 [[package]]
 name = "num-conv"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
+checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967"
 
 [[package]]
 name = "num-integer"
@@ -1899,7 +2146,7 @@ dependencies = [
  "chrono",
  "getrandom 0.2.17",
  "http",
- "rand 0.8.5",
+ "rand 0.8.6",
  "serde",
  "serde_json",
  "serde_path_to_error",
@@ -1908,15 +2155,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "object"
-version = "0.37.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "oid-registry"
 version = "0.7.1"
@@ -1928,9 +2166,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "once_cell_polyfill"
@@ -1950,12 +2188,12 @@ dependencies = [
  "ed25519-dalek",
  "hmac",
  "http",
- "itertools",
+ "itertools 0.10.5",
  "log",
  "oauth2",
  "p256",
  "p384",
- "rand 0.8.5",
+ "rand 0.8.6",
  "rsa",
  "serde",
  "serde-value",
@@ -1971,9 +2209,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.75"
+version = "0.10.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
+checksum = "f38c4372413cdaaf3cc79dd92d29d7d9f5ab09b51b10dded508fb90bb70b9222"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1991,7 +2229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -2003,9 +2241,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.111"
+version = "0.9.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
+checksum = "13ce1245cd07fcc4cfdb438f7507b0c7e4f3849a69fd84d52374c66d83741bb6"
 dependencies = [
  "cc",
  "libc",
@@ -2078,6 +2316,17 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "password-hash"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "pastey"
 version = "0.1.1"
@@ -2094,15 +2343,17 @@ dependencies = [
 
 [[package]]
 name = "pbs-api-types"
-version = "1.0.9"
+version = "1.0.15"
 dependencies = [
  "anyhow",
  "const_format",
  "hex",
  "percent-encoding",
+ "proxmox-acme-api",
  "proxmox-apt-api-types",
  "proxmox-auth-api",
  "proxmox-fixed-string",
+ "proxmox-http",
  "proxmox-human-byte",
  "proxmox-lang",
  "proxmox-s3-client",
@@ -2112,12 +2363,13 @@ dependencies = [
  "proxmox-uuid",
  "regex",
  "serde",
+ "serde_json",
  "serde_plain",
 ]
 
 [[package]]
 name = "pbs-buildcfg"
-version = "4.1.4"
+version = "4.2.0"
 
 [[package]]
 name = "pbs-client"
@@ -2172,12 +2424,17 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "const_format",
+ "hex",
  "libc",
  "nix 0.29.0",
  "once_cell",
  "openssl",
+ "parking_lot",
  "pbs-api-types",
  "pbs-buildcfg",
+ "pbs-key-config",
+ "proxmox-http",
+ "proxmox-lang",
  "proxmox-notify",
  "proxmox-router",
  "proxmox-s3-client",
@@ -2234,6 +2491,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
+ "tempfile",
  "tokio",
  "tracing",
  "walkdir",
@@ -2334,10 +2592,12 @@ dependencies = [
  "proxmox-async",
  "proxmox-human-byte",
  "proxmox-io",
+ "proxmox-log",
  "proxmox-sys",
  "proxmox-time",
  "serde_json",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -2349,6 +2609,15 @@ dependencies = [
  "base64ct",
 ]
 
+[[package]]
+name = "pem-rfc7468"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6305423e0e7738146434843d1694d621cce767262b2a86910beab705e4493d9"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -2384,7 +2653,7 @@ dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -2399,10 +2668,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "pin-project-lite"
-version = "0.2.16"
+name = "petgraph"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.14.0",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pin-utils"
@@ -2416,7 +2704,7 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
 dependencies = [
- "der",
+ "der 0.7.10",
  "pkcs8",
  "spki",
 ]
@@ -2427,15 +2715,21 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
- "der",
+ "der 0.7.10",
  "spki",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "portable-atomic"
@@ -2445,18 +2739,18 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "portable-atomic-util"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
 dependencies = [
  "portable-atomic",
 ]
 
 [[package]]
 name = "potential_utf"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
 dependencies = [
  "zerovec",
 ]
@@ -2476,6 +2770,12 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
 [[package]]
 name = "prettyplease"
 version = "0.2.37"
@@ -2567,7 +2867,7 @@ version = "1.4.4"
 dependencies = [
  "anyhow",
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -2583,6 +2883,8 @@ dependencies = [
  "openssl",
  "proxmox-apt-api-types",
  "proxmox-config-digest",
+ "proxmox-fixed-string",
+ "proxmox-pgp",
  "proxmox-schema",
  "proxmox-sys",
  "regex",
@@ -2596,6 +2898,7 @@ name = "proxmox-apt-api-types"
 version = "2.0.5"
 dependencies = [
  "proxmox-config-digest",
+ "proxmox-fixed-string",
  "proxmox-schema",
  "proxmox-serde",
  "regex",
@@ -2643,7 +2946,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-backup"
-version = "4.1.4"
+version = "4.2.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2685,6 +2988,7 @@ dependencies = [
  "proxmox-compression",
  "proxmox-config-digest",
  "proxmox-daemon",
+ "proxmox-docgen",
  "proxmox-http",
  "proxmox-human-byte",
  "proxmox-io",
@@ -2696,6 +3000,7 @@ dependencies = [
  "proxmox-network-types",
  "proxmox-notify",
  "proxmox-openid",
+ "proxmox-parallel-handler",
  "proxmox-product-config",
  "proxmox-rate-limiter",
  "proxmox-rest-server",
@@ -2844,6 +3149,15 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "proxmox-docgen"
+version = "1.0.1"
+dependencies = [
+ "proxmox-router",
+ "proxmox-schema",
+ "serde_json",
+]
+
 [[package]]
 name = "proxmox-file-restore"
 version = "0.1.0"
@@ -2887,7 +3201,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-fuse"
-version = "2.0.0"
+version = "3.0.0"
 dependencies = [
  "anyhow",
  "cc",
@@ -2899,7 +3213,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-http"
-version = "1.0.5"
+version = "1.0.6"
 dependencies = [
  "anyhow",
  "bytes",
@@ -2917,6 +3231,7 @@ dependencies = [
  "proxmox-io",
  "proxmox-lang",
  "proxmox-rate-limiter",
+ "proxmox-schema",
  "proxmox-sys",
  "serde_json",
  "sync_wrapper",
@@ -3020,7 +3335,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-network-types"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "serde",
  "serde_with",
@@ -3072,6 +3387,26 @@ dependencies = [
  "ureq",
 ]
 
+[[package]]
+name = "proxmox-parallel-handler"
+version = "1.0.0"
+dependencies = [
+ "anyhow",
+ "crossbeam-channel",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "proxmox-pgp"
+version = "1.0.0"
+dependencies = [
+ "anyhow",
+ "proxmox-api-macro",
+ "proxmox-schema",
+ "sequoia-openpgp",
+ "serde",
+]
+
 [[package]]
 name = "proxmox-product-config"
 version = "1.0.0"
@@ -3094,7 +3429,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-rest-server"
-version = "1.0.5"
+version = "1.0.6"
 dependencies = [
  "anyhow",
  "futures",
@@ -3169,7 +3504,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-router"
-version = "3.2.4"
+version = "3.2.6"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3220,7 +3555,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-s3-client"
-version = "1.2.5"
+version = "1.4.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3234,12 +3569,15 @@ dependencies = [
  "md5",
  "nix 0.29.0",
  "openssl",
+ "proxmox-async",
  "proxmox-base64",
  "proxmox-http",
  "proxmox-human-byte",
  "proxmox-rate-limiter",
  "proxmox-schema",
  "proxmox-serde",
+ "proxmox-shared-memory",
+ "proxmox-sys",
  "proxmox-time",
  "quick-xml",
  "regex",
@@ -3254,7 +3592,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-schema"
-version = "5.0.1"
+version = "5.1.1"
 dependencies = [
  "anyhow",
  "const_format",
@@ -3281,7 +3619,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-sendmail"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "anyhow",
  "percent-encoding",
@@ -3291,7 +3629,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-serde"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "anyhow",
  "proxmox-base64",
@@ -3313,7 +3651,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-shared-memory"
-version = "1.0.0"
+version = "1.0.2"
 dependencies = [
  "anyhow",
  "libc",
@@ -3326,7 +3664,7 @@ name = "proxmox-sortable-macro"
 version = "1.0.0"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -3350,7 +3688,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-sys"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "anyhow",
  "libc",
@@ -3367,14 +3705,14 @@ dependencies = [
 
 [[package]]
 name = "proxmox-systemd"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "proxmox-tfa"
-version = "6.0.4"
+version = "6.0.5"
 dependencies = [
  "anyhow",
  "base32",
@@ -3397,7 +3735,7 @@ dependencies = [
 
 [[package]]
 name = "proxmox-time"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "bitflags",
@@ -3433,19 +3771,9 @@ dependencies = [
  "anyhow",
 ]
 
-[[package]]
-name = "psm"
-version = "0.1.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3852766467df634d74f0b2d7819bf8dc483a0eb2e3b0f50f756f9cfe8b0d18d8"
-dependencies = [
- "ar_archive_writer",
- "cc",
-]
-
 [[package]]
 name = "pxar"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "endian_trait",
  "libc",
@@ -3496,18 +3824,18 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.44"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2 1.0.106",
 ]
 
 [[package]]
 name = "quoted_printable"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73"
+checksum = "478e0585659a122aa407eb7e3c0e1fa51b1d8a870038bd29f0cf4a8551eea972"
 
 [[package]]
 name = "r-efi"
@@ -3515,6 +3843,12 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
 [[package]]
 name = "radix_trie"
 version = "0.2.1"
@@ -3527,9 +3861,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -3538,9 +3872,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.5",
@@ -3595,9 +3929,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35985aa610addc02e24fc232012c86fd11f14111180f902b67e2d5331f8ebf2b"
+checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a"
 dependencies = [
  "bitflags",
 ]
@@ -3618,7 +3952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -3647,9 +3981,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.9"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "resolv-conf"
@@ -3699,6 +4033,12 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustc-hash"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
@@ -3732,9 +4072,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.14.0"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
+checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
 dependencies = [
  "zeroize",
 ]
@@ -3778,9 +4118,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
 dependencies = [
  "windows-sys 0.61.2",
 ]
@@ -3822,8 +4162,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
  "base16ct",
- "der",
- "generic-array",
+ "der 0.7.10",
+ "generic-array 0.14.9",
  "pkcs8",
  "subtle",
  "zeroize",
@@ -3854,9 +4194,37 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
+[[package]]
+name = "sequoia-openpgp"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0620e44a7d514adf7df87b44db235f13b81fed7ddc265adb26f014d42626ac47"
+dependencies = [
+ "anyhow",
+ "argon2",
+ "base64 0.22.1",
+ "buffered-reader",
+ "bzip2 0.6.1",
+ "chrono",
+ "dyn-clone",
+ "flate2",
+ "getrandom 0.2.17",
+ "idna",
+ "lalrpop",
+ "lalrpop-util",
+ "libc",
+ "memsec",
+ "nettle",
+ "regex",
+ "regex-syntax",
+ "sha1collisiondetection",
+ "thiserror 2.0.18",
+ "xxhash-rust",
+]
 
 [[package]]
 name = "serde"
@@ -3926,7 +4294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -3965,15 +4333,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.16.1"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7"
+checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "schemars 0.9.0",
  "schemars 1.2.1",
  "serde_core",
@@ -3984,16 +4352,26 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.16.1"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c"
+checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65"
 dependencies = [
  "darling",
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "sha1collisiondetection"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f606421e4a6012877e893c399822a4ed4b089164c5969424e1b9d1e66e6964b"
+dependencies = [
+ "digest",
+ "generic-array 1.4.1",
+]
+
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -4005,6 +4383,16 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sha3"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874"
+dependencies = [
+ "digest",
+ "keccak",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -4042,9 +4430,9 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
 
 [[package]]
 name = "siphasher"
@@ -4072,22 +4460,12 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
 [[package]]
 name = "socket2"
-version = "0.5.10"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "socket2"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
-dependencies = [
- "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4103,7 +4481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
- "der",
+ "der 0.7.10",
 ]
 
 [[package]]
@@ -4113,16 +4491,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
-name = "stacker"
-version = "0.1.23"
+name = "string_cache"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d74a23609d509411d10e2176dc2a4346e3b4aea2e7b1869f19fdedbc71c013"
+checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
 dependencies = [
- "cc",
- "cfg-if",
- "libc",
- "psm",
- "windows-sys 0.59.0",
+ "new_debug_unreachable",
+ "parking_lot",
+ "phf_shared",
+ "precomputed-hash",
 ]
 
 [[package]]
@@ -4155,7 +4532,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "unicode-ident",
 ]
 
@@ -4175,7 +4552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -4194,9 +4571,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.44"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
+checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973"
 dependencies = [
  "filetime",
  "libc",
@@ -4205,17 +4582,26 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.25.0"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.4.1",
+ "getrandom 0.4.2",
  "once_cell",
  "rustix",
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "term"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8c27177b12a6399ffc08b98f76f7c9a1f4fe9fc967c784c5a071fa8d93cf7e1"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.4.1"
@@ -4261,7 +4647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -4272,7 +4658,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -4320,9 +4706,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -4330,9 +4716,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -4345,9 +4731,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.49.0"
+version = "1.52.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
+checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6"
 dependencies = [
  "bytes",
  "libc",
@@ -4355,19 +4741,19 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.6.2",
+ "socket2",
  "tokio-macros",
  "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -4441,7 +4827,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -4479,9 +4865,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "nu-ansi-term",
  "sharded-slab",
@@ -4499,9 +4885,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typenum"
-version = "1.19.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
 
 [[package]]
 name = "ucd-trie"
@@ -4535,9 +4921,9 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
 
 [[package]]
 name = "unicode-width"
@@ -4565,27 +4951,27 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "ureq"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc97a28575b85cfedf2a7e7d3cc64b3e11bd8ac766666318003abbacc7a21fc"
+checksum = "dea7109cdcd5864d4eeb1b58a1648dc9bf520360d7af16ec26d0a9354bafcfc0"
 dependencies = [
  "base64 0.22.1",
- "der",
+ "der 0.8.0",
  "flate2",
  "log",
  "native-tls",
  "percent-encoding",
  "rustls-pki-types",
  "ureq-proto",
- "utf-8",
+ "utf8-zero",
  "webpki-root-certs",
 ]
 
 [[package]]
 name = "ureq-proto"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d81f9efa9df032be5934a46a068815a10a042b494b6a58cb0a1a97bb5467ed6f"
+checksum = "e994ba84b0bd1b1b0cf92878b7ef898a5c1760108fe7b6010327e274917a808c"
 dependencies = [
  "base64 0.22.1",
  "http",
@@ -4607,10 +4993,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "utf-8"
-version = "0.7.6"
+name = "utf8-zero"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e"
 
 [[package]]
 name = "utf8_iter"
@@ -4626,11 +5012,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.21.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b672338555252d43fd2240c714dc444b8c6fb0a5c5335e65a07bba7742735ddb"
+checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
 dependencies = [
- "getrandom 0.4.1",
+ "getrandom 0.4.2",
  "js-sys",
  "serde_core",
  "wasm-bindgen",
@@ -4681,11 +5067,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.57.1",
 ]
 
 [[package]]
@@ -4694,14 +5080,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.51.0",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.111"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec1adf1535672f5b7824f817792b1afd731d7e843d2d04ec8f27e8cb51edd8ac"
+checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4712,32 +5098,32 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.111"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e638317c08b21663aed4d2b9a2091450548954695ff4efa75bff5fa546b3b1"
+checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103"
 dependencies = [
- "quote 1.0.44",
+ "quote 1.0.45",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.111"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c64760850114d03d5f65457e96fc988f11f01d38fbaa51b254e4ab5809102af"
+checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41"
 dependencies = [
  "bumpalo",
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.111"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60eecd4fe26177cfa3339eb00b4a36445889ba3ad37080c2429879718e20ca41"
+checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea"
 dependencies = [
  "unicode-ident",
 ]
@@ -4759,7 +5145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
  "anyhow",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "wasm-encoder",
  "wasmparser",
 ]
@@ -4772,7 +5158,7 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
  "bitflags",
  "hashbrown 0.15.5",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "semver",
 ]
 
@@ -4817,7 +5203,7 @@ dependencies = [
  "nom 7.1.3",
  "openssl",
  "openssl-sys",
- "rand 0.9.2",
+ "rand 0.9.4",
  "rand_chacha 0.9.0",
  "serde",
  "serde_cbor_2",
@@ -4846,9 +5232,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-root-certs"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca"
+checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -4910,7 +5296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -4921,7 +5307,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
@@ -4931,6 +5317,17 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
+[[package]]
+name = "windows-registry"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
+dependencies = [
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.4.1"
@@ -4976,15 +5373,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -5018,30 +5406,13 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
+ "windows_i686_gnullvm",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
-dependencies = [
- "windows-link",
- "windows_aarch64_gnullvm 0.53.1",
- "windows_aarch64_msvc 0.53.1",
- "windows_i686_gnu 0.53.1",
- "windows_i686_gnullvm 0.53.1",
- "windows_i686_msvc 0.53.1",
- "windows_x86_64_gnu 0.53.1",
- "windows_x86_64_gnullvm 0.53.1",
- "windows_x86_64_msvc 0.53.1",
-]
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -5054,12 +5425,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -5072,12 +5437,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -5090,24 +5449,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -5120,12 +5467,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -5138,12 +5479,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -5156,12 +5491,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -5174,22 +5503,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "wit-bindgen"
 version = "0.51.0"
@@ -5199,6 +5512,12 @@ dependencies = [
  "wit-bindgen-rust-macro",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
 [[package]]
 name = "wit-bindgen-core"
 version = "0.51.0"
@@ -5218,7 +5537,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
  "anyhow",
  "heck",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "prettyplease",
  "syn 2.0.117",
  "wasm-metadata",
@@ -5235,7 +5554,7 @@ dependencies = [
  "anyhow",
  "prettyplease",
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
  "wit-bindgen-core",
  "wit-bindgen-rust",
@@ -5249,7 +5568,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
  "bitflags",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "log",
  "serde",
  "serde_derive",
@@ -5268,7 +5587,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "log",
  "semver",
  "serde",
@@ -5280,9 +5599,9 @@ dependencies = [
 
 [[package]]
 name = "writeable"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "x509-parser"
@@ -5324,10 +5643,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
 
 [[package]]
-name = "yoke"
-version = "0.8.1"
+name = "xxhash-rust"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
+
+[[package]]
+name = "yoke"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
@@ -5336,53 +5661,53 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
  "synstructure",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.39"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.39"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
  "synstructure",
 ]
@@ -5395,9 +5720,9 @@ checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -5406,9 +5731,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -5417,12 +5742,12 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2 1.0.106",
- "quote 1.0.44",
+ "quote 1.0.45",
  "syn 2.0.117",
 ]
 
diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix
index 0a6051478010..e8196454fbc7 100644
--- a/pkgs/by-name/pr/proxmox-backup-client/package.nix
+++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix
@@ -14,34 +14,34 @@
 
 let
   pname = "proxmox-backup-client";
-  version = "4.1.4";
+  version = "4.2.0";
 
   proxmox-backup_src = fetchgit {
     url = "git://git.proxmox.com/git/proxmox-backup.git";
-    rev = "0de679b244377f9193993698b875636bab58d678";
+    rev = "035c449897fafc228c8bbf3a5b5ba38564478ac7";
     name = "proxmox-backup";
-    hash = "sha256-7OGmKNcg7rq0oxPMk5XFuOvueABUC6334lpH8uG4tSQ=";
+    hash = "sha256-tfZXmMWQrP0MiBC1uuSenGaghqHi4ljky6T2KtLcjhk=";
   };
 
   proxmox_src = fetchgit {
     url = "git://git.proxmox.com/git/proxmox.git";
-    rev = "407d1e05197bf0e5bec47bf8a56f69ce2a63c1ec";
+    rev = "22c4d5ecbfce6eb2fd566181e0b7d23ac2df4f0c";
     name = "proxmox";
-    hash = "sha256-E7y4au5x8HcFcABiRV1ESb9SvpjyhSBzlxIn94CMbeI=";
+    hash = "sha256-rYaLx6Lorry+NkEmc6/xARMY6ZgdnIaCLJqRA0Mnf8o=";
   };
 
   proxmox-fuse_src = fetchgit {
     url = "git://git.proxmox.com/git/proxmox-fuse.git";
-    rev = "506314563706b0bcd95f99ebedc9b2d1c5532cc4"; # 2.0.0
+    rev = "258788a3d66f7a77040a480170fff9890d4939aa"; # 3.0.0
     name = "proxmox-fuse";
-    hash = "sha256-QVr6ylGaGOpkmidq8TtEB4b/oInGIcufHMBB0XwzbPw=";
+    hash = "sha256-deEPxhg2uyswBYjgYrXcAEBByJ/4ptX7I9y0R3AAFA0=";
   };
 
   proxmox-pxar_src = fetchgit {
     url = "git://git.proxmox.com/git/pxar.git";
-    rev = "993c66fcb8819770f279cb9fb4d13f58f367606c"; # 1.0.0
+    rev = "091a8a382d0d6fc71025351fb35c51b1f3b0074d"; # 1.0.1
     name = "pxar";
-    hash = "sha256-V5DkTIyPuopSILQoJt04E5G9ZEylQF1x5oXgWQJuDq8=";
+    hash = "sha256-9SFlrz6nuVby6iQ2ELVaioZu2pcs90tSuyzLCWJlcrA=";
   };
 
   proxmox-pathpatterns_src = fetchgit {
@@ -81,8 +81,6 @@ rustPlatform.buildRustPackage {
     cp ${./Cargo.lock} Cargo.lock
     rm .cargo/config.toml
 
-    (cd ../pxar && chmod -R u+w . && patch -p1 <${./0003-decoder-fix-autoref-error-in-pointer-to-reference-co.patch})
-
     # avoid some unnecessary dependencies, stemming from greedy linkage by rustc
     # see also upstream Makefile for similar workaround
     mkdir -p .dep-stubs
diff --git a/pkgs/by-name/pr/proxypin/package.nix b/pkgs/by-name/pr/proxypin/package.nix
index 4095eeb09092..01c677e11f73 100644
--- a/pkgs/by-name/pr/proxypin/package.nix
+++ b/pkgs/by-name/pr/proxypin/package.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "1.2.4";
+  version = "1.2.6";
 in
 flutter338.buildFlutterApplication {
   pname = "proxypin";
@@ -19,7 +19,7 @@ flutter338.buildFlutterApplication {
     owner = "wanghongenpin";
     repo = "proxypin";
     tag = "v${version}";
-    hash = "sha256-Dhs2b+tjXTPFZOGoi7YUliWkdJ5s1jIJkJsXTQ6w7QY=";
+    hash = "sha256-QZn2o6J1w0d/Ro3IC3cls5JD+b7RpoT6mOf34rbImFc=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/pr/proxypin/pubspec.lock.json b/pkgs/by-name/pr/proxypin/pubspec.lock.json
index 7d2c99040abc..46417ffefc8e 100644
--- a/pkgs/by-name/pr/proxypin/pubspec.lock.json
+++ b/pkgs/by-name/pr/proxypin/pubspec.lock.json
@@ -154,11 +154,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dbus",
-        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
+        "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.11"
+      "version": "0.7.12"
     },
     "desktop_multi_window": {
       "dependency": "direct main",
@@ -215,11 +215,11 @@
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c",
+        "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
     },
     "file": {
       "dependency": "transitive",
@@ -400,11 +400,11 @@
       "dependency": "transitive",
       "description": {
         "name": "hooks",
-        "sha256": "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7",
+        "sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.0.2"
     },
     "http": {
       "dependency": "transitive",
@@ -460,11 +460,11 @@
       "dependency": "transitive",
       "description": {
         "name": "json_annotation",
-        "sha256": "805fa86df56383000f640384b282ce0cb8431f1a7a2396de92fb66186d8c57df",
+        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.0"
+      "version": "4.11.0"
     },
     "leak_tracker": {
       "dependency": "transitive",
@@ -590,21 +590,21 @@
       "dependency": "transitive",
       "description": {
         "name": "native_toolchain_c",
-        "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac",
+        "sha256": "92b2ca62c8bd2b8d2f267cdfccf9bfbdb7322f778f8f91b3ce5b5cda23a3899f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.17.4"
+      "version": "0.17.5"
     },
     "objective_c": {
       "dependency": "transitive",
       "description": {
         "name": "objective_c",
-        "sha256": "983c7fa1501f6dcc0cb7af4e42072e9993cb28d73604d25ebf4dab08165d997e",
+        "sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.5"
+      "version": "9.3.0"
     },
     "path": {
       "dependency": "transitive",
@@ -750,11 +750,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
+        "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.1"
+      "version": "7.0.2"
     },
     "platform": {
       "dependency": "transitive",
@@ -930,11 +930,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f",
+        "sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.20"
+      "version": "2.4.21"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -996,11 +996,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.1"
+      "version": "1.10.2"
     },
     "stack_trace": {
       "dependency": "transitive",
@@ -1116,11 +1116,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad",
+        "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.6"
+      "version": "6.4.1"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -1176,11 +1176,11 @@
       "dependency": "transitive",
       "description": {
         "name": "uuid",
-        "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8",
+        "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.2"
+      "version": "4.5.3"
     },
     "vclibs": {
       "dependency": "direct main",
diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix
index 29b9da36951f..23367cc65a96 100644
--- a/pkgs/by-name/ps/pscale/package.nix
+++ b/pkgs/by-name/ps/pscale/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "pscale";
-  version = "0.281.0";
+  version = "0.282.0";
 
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-bs5WSFBSG1fV62vutqiy0uoKKOsvIQlyMAehO95AwQ8=";
+    sha256 = "sha256-qCbdsSu4XTMbinW87AUO6y125nHhsD+dQ0JioMXIqVM=";
   };
 
   vendorHash = "sha256-+XZRC6Q2Qc1Oc4fn6SsLNqDvZTvgK6HDFESrmvxKzGo=";
diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/by-name/ps/psi-plus/package.nix
similarity index 73%
rename from pkgs/applications/networking/instant-messengers/psi-plus/default.nix
rename to pkgs/by-name/ps/psi-plus/package.nix
index 8c36016dbd47..e3bd2832f90e 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/by-name/ps/psi-plus/package.nix
@@ -3,25 +3,15 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtmultimedia,
-  qtimageformats,
-  qtx11extras,
-  qttools,
-  libidn,
-  qca-qt5,
+  qt6,
+  kdePackages,
   libxscrnsaver,
   hunspell,
-  libsecret,
   libgcrypt,
   libgpg-error,
   usrsctp,
-  qtkeychain,
 
   chatType ? "basic", # See the assertion below for available options
-  qtwebkit,
-  qtwebengine,
 
   enablePlugins ? true,
   html-tidy,
@@ -34,12 +24,17 @@
   gst_all_1,
   enablePsiMedia ? false,
   pkg-config,
+
+  # For tests
+  psi-plus,
 }:
 
+assert lib.assertMsg (lib.toLower chatType != "webkit")
+  "psi-plus: chatType = \"webkit\" was removed because qtwebkit had known vulns and has no Qt6 equivalent. Use chatType = \"webengine\" instead.";
+
 assert builtins.elem (lib.toLower chatType) [
   "basic" # Basic implementation, no web stuff involved
-  "webkit" # Legacy one, based on WebKit (see https://wiki.qt.io/Qt_WebKit)
-  "webengine" # QtWebEngine (see https://wiki.qt.io/QtWebEngine)
+  "webengine"
 ];
 
 assert enablePsiMedia -> enablePlugins;
@@ -47,43 +42,40 @@ assert enablePsiMedia -> enablePlugins;
 stdenv.mkDerivation rec {
   pname = "psi-plus";
 
-  version = "1.5.2115";
+  version = "1.5.2139";
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
-    rev = version;
-    sha256 = "sha256-4is3ksl6IsYP1L0WhTT/56QUtR+EC1X6Lftre2BO6pM=";
+    tag = version;
+    hash = "sha256-wgR809rOtcKvim2gPm9MeiB67pU+EiRktpW5BCJqWs8=";
   };
 
   cmakeFlags = [
     "-DCHAT_TYPE=${chatType}"
     "-DENABLE_PLUGINS=${if enablePlugins then "ON" else "OFF"}"
     "-DBUILD_PSIMEDIA=${if enablePsiMedia then "ON" else "OFF"}"
+    "-DUSE_QT6=ON"
   ];
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ]
   ++ lib.optionals enablePsiMedia [
     pkg-config
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
-    qtimageformats
-    qtx11extras
-    libidn
-    qca-qt5
+    qt6.qtbase
+    qt6.qtmultimedia
+    kdePackages.qca
     libxscrnsaver
     hunspell
-    libsecret
     libgcrypt
     libgpg-error
     usrsctp
-    qtkeychain
+    kdePackages.qtkeychain
   ]
   ++ lib.optionals voiceMessagesSupport [
     gst_all_1.gst-plugins-base
@@ -95,11 +87,8 @@ stdenv.mkDerivation rec {
     libotr
     libomemo-c
   ]
-  ++ lib.optionals (chatType == "webkit") [
-    qtwebkit
-  ]
   ++ lib.optionals (chatType == "webengine") [
-    qtwebengine
+    qt6.qtwebengine
   ];
 
   preFixup = lib.optionalString voiceMessagesSupport ''
@@ -108,6 +97,10 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  passthru.tests = {
+    webengine = psi-plus.override { chatType = "webengine"; };
+  };
+
   meta = {
     homepage = "https://psi-plus.com";
     description = "XMPP (Jabber) client based on Qt5";
diff --git a/pkgs/by-name/ps/pspp/package.nix b/pkgs/by-name/ps/pspp/package.nix
index bb720dc07489..7585269dc3d5 100644
--- a/pkgs/by-name/ps/pspp/package.nix
+++ b/pkgs/by-name/ps/pspp/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pspp";
-  version = "2.0.1";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/pspp/pspp-${version}.tar.gz";
-    sha256 = "sha256-jtuw8J6M+AEMrZ4FWeAjDX/FquRyHHVsNQVU3zMCTAA=";
+    sha256 = "sha256-teVQk3vfpmoebKcpGVJy6OXmaz4EaGstg/suZtTvFMM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix
index 64b1bd712211..ffd367f6159e 100644
--- a/pkgs/by-name/ps/psqlodbc/package.nix
+++ b/pkgs/by-name/ps/psqlodbc/package.nix
@@ -18,13 +18,13 @@ assert lib.xor withLibiodbc withUnixODBC;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "psqlodbc";
-  version = "17.00.0007";
+  version = "17.00.0008";
 
   src = fetchFromGitHub {
     owner = "postgresql-interfaces";
     repo = "psqlodbc";
     tag = "REL-${lib.replaceString "." "_" finalAttrs.version}";
-    hash = "sha256-KlAGA+oNV/jJpcDJNGzsq/n55QKhUwTwhfNJ6QL6Pas=";
+    hash = "sha256-eYt4RwnYfSHz2nGBW94Gkdt3E+j6eS1Ky2KPol3cLkI=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/pt/pt2-clone/package.nix b/pkgs/by-name/pt/pt2-clone/package.nix
index ca74bd04a5ba..2f5a6facf8c3 100644
--- a/pkgs/by-name/pt/pt2-clone/package.nix
+++ b/pkgs/by-name/pt/pt2-clone/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pt2-clone";
-  version = "1.87";
+  version = "1.88";
 
   src = fetchFromGitHub {
     owner = "8bitbubsy";
     repo = "pt2-clone";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Kur9gQEEeGYHKQz6hNIEzohF1mJ9EDKAGycgiKehXhM=";
+    sha256 = "sha256-PdoncYnl7jD9iM0PDi0O92t9uAlhbrQciIr/+xk3igE=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix
index daac120ca5eb..72c500777df2 100644
--- a/pkgs/by-name/pu/publicsuffix-list/package.nix
+++ b/pkgs/by-name/pu/publicsuffix-list/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "publicsuffix-list";
-  version = "0-unstable-2026-03-02";
+  version = "0-unstable-2026-03-26";
 
   src = fetchFromGitHub {
     owner = "publicsuffix";
     repo = "list";
-    rev = "7ef6384612e1b48bb8b6023716cc9a493ac25d8a";
-    hash = "sha256-AVVRW373eC2YpsoeuefSv8y+MMp7UfHrd0aXLEiLpsY=";
+    rev = "d333b72b39575da1ce6932b01d7c421a4107c620";
+    hash = "sha256-LWnvQrIyj+iq96T1u9WEq+HGOZ5sJYN5nCintEr6sBk=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix
index 095fa838a695..1c9e0b1a942b 100644
--- a/pkgs/by-name/pu/pulumi-bin/data.nix
+++ b/pkgs/by-name/pu/pulumi-bin/data.nix
@@ -1,36 +1,36 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.230.0";
+  version = "3.232.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.230.0-linux-x64.tar.gz";
-        sha256 = "1v78xqs66aqgw02dqxnnrjksh2jcypvdr738k2jnyqw5vc974csj";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.232.0-linux-x64.tar.gz";
+        sha256 = "08s4fbf7hvi2yyi3m7n5832cmjizpg8df1v9bkg0wlv6iffwcwlb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-linux-amd64.tar.gz";
-        sha256 = "1f5pvflvcd9xr86ys1n46ywyakl30l2xrrwqhbhkb117gp17a9lx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-linux-amd64.tar.gz";
+        sha256 = "08s30ng4bgk8p3rlazpclg36anjir2c2qvyyyfwpila7bf6h6f9b";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.1.0-linux-amd64.tar.gz";
         sha256 = "139h210ixh4s46sa90p9ga9nl1bqb1m36hbr1ylcr80nx5hjh42p";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.99.0-linux-amd64.tar.gz";
-        sha256 = "113vdmi9y47c85rjps8p79g8knbpskq24raiwikiqr0y4qb94ml7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.100.0-linux-amd64.tar.gz";
+        sha256 = "0znqp5vd9kd02zdsqr6avvrdvvcc3fh370llyxwgif8x1kh8ri19";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.4-linux-amd64.tar.gz";
         sha256 = "1j80sayzic63ahyv2x9k7kpisi7rvjml7cid1xzzcac8z7s2nhxq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.39.0-linux-amd64.tar.gz";
-        sha256 = "1hfxg058jcbxfigl8a5sbapfm09hcyjrm2h63ksaw0gn7ny26y46";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.40.0-linux-amd64.tar.gz";
+        sha256 = "00xz7zb8z64fy9fwbl6797ndj8q9xb3xnxpi6f5s4sbg3lzicp7j";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.25.0-linux-amd64.tar.gz";
-        sha256 = "0p694pdhhklcjx8dx7jl7n7a7x9j0yria137irrs3hqxijrgvjzq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.27.0-linux-amd64.tar.gz";
+        sha256 = "1gzxca78x7k9r9z54hgqpg93sybcpkw6vcizjdvkiw55g621a8k6";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-linux-amd64.tar.gz";
@@ -41,8 +41,8 @@
         sha256 = "14i18v6z68szdf1y1bg3m51kqn4i1fdv6jbi282f7rxr0fbzzmpl";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.34.0-linux-amd64.tar.gz";
-        sha256 = "0sv0d2srgzn2psaip3zgfnqr9d209vivqrnaxd06xjrjqg2ivfh5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.35.0-linux-amd64.tar.gz";
+        sha256 = "1wlfds1g2wx08dwi2vbzz79wlwyk78brxxirlq8xblp4hi8wv72d";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.14.0-linux-amd64.tar.gz";
@@ -57,44 +57,44 @@
         sha256 = "1af9y48rchnpryyy3j228d94iyvfrhphjw6m94r92y6carkpggg5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.63.0-linux-amd64.tar.gz";
-        sha256 = "0ysmly93yls8cq6y9kb5ksavfhlpddqdgx187a1mjl61j8iq80r0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.64.1-linux-amd64.tar.gz";
+        sha256 = "1jaf26rrhwf4b2bakvf5sidbvq8flqp5jgs8r7x5zgidr27p06b1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.2-linux-amd64.tar.gz";
-        sha256 = "187qg3cdbd194qs1nqv51zxddvg0hvac3kkgqjd6hcfrg0wy70bs";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.0.0-linux-amd64.tar.gz";
+        sha256 = "177c2jh44fsr3m40g00qg7czlnmjl50z5dw7grf74jw7qdqj5ihl";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz";
         sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.5.0-linux-amd64.tar.gz";
-        sha256 = "08mwfxjmmdka6ka1qx9p09zigkj6lw4vjb4b3zm6599rgzzxgcs1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.0.1-linux-amd64.tar.gz";
+        sha256 = "03w4kfws4zksmri961fs3lsvwg15mpj6nhc0a1zplqpw6rsjgcmr";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.19.0-linux-amd64.tar.gz";
-        sha256 = "0bbac1gmrg4gprzwginwqqh7jz7n8xf4gikdbmg8wh1lwx6pnfjx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.21.0-linux-amd64.tar.gz";
+        sha256 = "0c9fgan0c1chx452lm05vfnvkzzrwwmzgxabv0cwc0b2sr9sv199";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.2-linux-amd64.tar.gz";
-        sha256 = "000fpr8w20z3nq1mxjvlpi34xvc0klg69zivrxfhv9y9qmbnn5dq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.13.0-linux-amd64.tar.gz";
+        sha256 = "173gm48bs91f23zg3yds04zk70bwybr23cw3ljd28g5p3lzmxl33";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.10.0-linux-amd64.tar.gz";
-        sha256 = "16hgmcwchdamx825hav5qd37zli8bpa977qqkhxhhzmf54v29bkc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.11.0-linux-amd64.tar.gz";
+        sha256 = "1hjdkyrn9wszykxi2mr4ncpbibggd4vz1fyba4jhnyl1j8xm5642";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz";
         sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-linux-amd64.tar.gz";
-        sha256 = "19k79m8dhkiy4x4rs6dq4zkfczjsnmc0mvbh57b5l52imsv7ks7m";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.33.0-linux-amd64.tar.gz";
+        sha256 = "179hhd656hyl7nvcxzsrj98gbs2rw2l700a2kz6252yr0gq07482";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-linux-amd64.tar.gz";
-        sha256 = "0saa0i1id3lgdlw8wi2wbwymd1vnxdzmrqqr876gk9hcs9fj7bar";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.30.0-linux-amd64.tar.gz";
+        sha256 = "0yqbn1niyy2a4gq87r4wk75v3p114xf099gxqgyq39c079bdwlns";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.10.0-linux-amd64.tar.gz";
@@ -125,16 +125,16 @@
         sha256 = "1ind8360irxnnang0jw6dwm5m6bmn4f162yj7w4l6vi91k5d1s20";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.130.0-linux-amd64.tar.gz";
-        sha256 = "1c5wi6f94x86qvjjhlrnvicghp1nr5phil7mxn4kjj983fsi50qg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.131.0-linux-amd64.tar.gz";
+        sha256 = "1l8wc8xhppjfbm9v60raqhgrimbbx2wqy0jj7r1nd7kw1b0x4kkh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz";
         sha256 = "0pppwgwl726rfy92fnya9afj3cciw13vzs9r60w2477i3250slqj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.0-linux-amd64.tar.gz";
-        sha256 = "1xjmxigqak7f31g7hi9ljjw047ymgrkaap4nvi5lzkk37fmj8lk1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.1-linux-amd64.tar.gz";
+        sha256 = "0n6j1s4xk5f9nmhldk2fbmp5h9p1vcr4733hhk45by3ffbd1fbrz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.3.1-linux-amd64.tar.gz";
@@ -163,32 +163,32 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.230.0-darwin-x64.tar.gz";
-        sha256 = "0yh8jz8fawch5zr0k0wg2k4nkkdkjp4hmabs8m7kzb87b6f0i75j";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.232.0-darwin-x64.tar.gz";
+        sha256 = "0ah734rb7g9s7211yx2xfg4jykj52l4amrxhvpsnxlblj42kmy6v";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-darwin-amd64.tar.gz";
-        sha256 = "19q09p7kqygdm1j2rvxbzzivyf983pi4frkfak3n63ybkbnxsp43";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-darwin-amd64.tar.gz";
+        sha256 = "0ak7sxvgy9ribxcszs3wx36h0bqzlrqfa3acqhy3m769rgi7fk3f";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.1.0-darwin-amd64.tar.gz";
         sha256 = "1r1j115bii4hv22z5pwp1yvcbi41j4mdcvwbn04xjridvrpsp63b";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.99.0-darwin-amd64.tar.gz";
-        sha256 = "184v0cw24dwqs116ql8jbskbp9ckljwq5967dxc6rxj7z5cnsnrx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.100.0-darwin-amd64.tar.gz";
+        sha256 = "08fh378b7nv6cpdppiw9knnkr5nz7zvw4yikrbc607pinkby33qf";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.4-darwin-amd64.tar.gz";
         sha256 = "142ydaywi8xw3k8w2c2py0x88sxf55v9z26yjkjhn2izcr9yv3fg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.39.0-darwin-amd64.tar.gz";
-        sha256 = "0f2z8iwma6xlnwdi126sixbf0cd4fni3c0r18x6jczbpxhci8j9m";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.40.0-darwin-amd64.tar.gz";
+        sha256 = "020sgrldrfj13y19n0vvblrc0jb7mssa1rx0izar0b93xdvywy0g";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.25.0-darwin-amd64.tar.gz";
-        sha256 = "1rfliksj9x1qaigd16xdi5xycwwxsnd4v037zpjygi562c6dpxhq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.27.0-darwin-amd64.tar.gz";
+        sha256 = "0a0vwb9vndi7s0arll0ppyp9w46n730rf2jd74qck05j2f3cmlbs";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-darwin-amd64.tar.gz";
@@ -199,8 +199,8 @@
         sha256 = "1pvliacpzv58kfi3sq1xa8b16aa14gs23wh1gm12kb8lyrh9cvwf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.34.0-darwin-amd64.tar.gz";
-        sha256 = "1siccb0vis674gkjgv55rnww5z4xvcfrhl96gcv9bazbcb5w4ik0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.35.0-darwin-amd64.tar.gz";
+        sha256 = "0c381vy7j2flvlcri2yadw3i983dgmi28y6xxz2x8psgy48ic7zd";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.14.0-darwin-amd64.tar.gz";
@@ -215,44 +215,44 @@
         sha256 = "1rc9pj5p4w9fszxdh8vs8lbajbmjljx08j8nlblm5dxiypm5w5bs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.63.0-darwin-amd64.tar.gz";
-        sha256 = "0b1in0w946irmml5n1zm2c5yhjwwbpbrcrpqpk6i6iam1yiwh1l1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.64.1-darwin-amd64.tar.gz";
+        sha256 = "1cn36p8qs1chnbwf78s56r1rbr1dvk15ahad3p5gr3q7kpxwa4cf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.2-darwin-amd64.tar.gz";
-        sha256 = "14q83v6nr61gjap1044kglqw99f8injvdqk1b0367jbzcqkgni3g";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.0.0-darwin-amd64.tar.gz";
+        sha256 = "1rj9iiphaqbsrd9g5a6ci47qpp7vdv60h186lzv3aqnl104g4ka6";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz";
         sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.5.0-darwin-amd64.tar.gz";
-        sha256 = "0ydbgr1p0bxh19qjvayzcw46sw21s7nj0g3r2bh7jgcanbf599vi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.0.1-darwin-amd64.tar.gz";
+        sha256 = "1h8s1pc8bdpbhr2v8cfzn59mczpnwdi26x9dplkf95ck6r4s96gh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.19.0-darwin-amd64.tar.gz";
-        sha256 = "0dnz2s6g8hc0750l2wd1nsdi7wsyyw352d3acm9af6vqclg986vm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.21.0-darwin-amd64.tar.gz";
+        sha256 = "17wlk03and5hw07cydlzpd5c8pxnfjd7drfgr41rjyq5gcrn1z6r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.2-darwin-amd64.tar.gz";
-        sha256 = "109czcvbzv17l5wdbiksknn554d3p6jc18d8gqp8qx24ha01nl3z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.13.0-darwin-amd64.tar.gz";
+        sha256 = "08lwfgna0xh3fmrgmzzsbm9wy2z36kvgqm0pqnh82cvhgrbrikpk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.10.0-darwin-amd64.tar.gz";
-        sha256 = "0xmm1y2fj5nnhkxsmnzlfqr4v6ymlldn1kdv584bv08ycb3vgc7i";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.11.0-darwin-amd64.tar.gz";
+        sha256 = "0bwb4a1s2543s754bzs5i1vm3z9axp45bv5b5311add9x6bb3d1n";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz";
         sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-darwin-amd64.tar.gz";
-        sha256 = "04rmlydspvgbcgn7qd9sk0bd70axz2rmpiydfw383352bxrinlvs";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.33.0-darwin-amd64.tar.gz";
+        sha256 = "1l0n97dx3fdrjk5qrwfh72ib42c1kd5mj5zbsly8rc2l92bw63cq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-darwin-amd64.tar.gz";
-        sha256 = "1vzdp5nqz6c24qz1l2m8hgr1xa8jn4v4x29i4gkd688bvf6266dz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.30.0-darwin-amd64.tar.gz";
+        sha256 = "0f313ir5kjv8fqyyrp4k12d3nd5cy4jibjym2p5v88drjn3w1g19";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.10.0-darwin-amd64.tar.gz";
@@ -283,16 +283,16 @@
         sha256 = "16347ib8lq81v9vmc6953g293zqvqpfg6g6ggw7q5chbjlfkvzhr";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.130.0-darwin-amd64.tar.gz";
-        sha256 = "1l5r5bggkkkbn9j1i1p7hplyllskwrm2zxdl34pywc3g23hqil5y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.131.0-darwin-amd64.tar.gz";
+        sha256 = "14diyvn5cr0fihmbf8093gdwwgyrrx2xlj24wpqffn84jsmskgai";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz";
         sha256 = "1jpcyp3lqiz4aab331x7shhqxzp4m6nz68vhkyqksvdplzr9rj44";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.0-darwin-amd64.tar.gz";
-        sha256 = "1ia6nvcgcwm2263yyyka65f0ja741z1bw6xvf6a0f6fkwkavkbk5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.1-darwin-amd64.tar.gz";
+        sha256 = "06kgqzqadzdjmq7sach2wwq6j125pc5pibis7b7gyx3x9mjvnccl";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.3.1-darwin-amd64.tar.gz";
@@ -321,32 +321,32 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.230.0-linux-arm64.tar.gz";
-        sha256 = "09938ryq8figzy53g67hksh8za06sri6w03wcnaysnik15llys79";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.232.0-linux-arm64.tar.gz";
+        sha256 = "1l87s3g3yz75xwp0l43psa5ngb9cwv8kmimlybn87drnj6klkih2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-linux-arm64.tar.gz";
-        sha256 = "0vnnvb6lyv0xpc3rzc3wr658l3d8w596mpfr5jlbbqpk0hw1dslx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-linux-arm64.tar.gz";
+        sha256 = "16x8b648cin42nj25sjhf6z6mp34m3v9jmfwav6lh65x8halxa6j";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.1.0-linux-arm64.tar.gz";
         sha256 = "0v84z83y56lnvrgsmla4qnig8cs57ynilib4ah29wb0dwkxvzamf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.99.0-linux-arm64.tar.gz";
-        sha256 = "107pwj3774fqr2gkz2r3aawsm0fklh9f3lgr721f7l1hnd7wjjb9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.100.0-linux-arm64.tar.gz";
+        sha256 = "0n455bfxf6r4ffrg773rhr57m230ldap58dpxm1dnrx640vc7wdd";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.4-linux-arm64.tar.gz";
         sha256 = "0xfa9p3dhnmlq5vpdwgsb73mcp8ckkw17pkgjmlsb54nfayj687d";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.39.0-linux-arm64.tar.gz";
-        sha256 = "1gaa61y3wflz5g2i0k0iv8k0rvxc22zm6c4w2pj4139yj174ysll";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.40.0-linux-arm64.tar.gz";
+        sha256 = "0cn81fmbgkx1c8cdlsmkxncfq7xfxb08lpkw9419p0kzrvqkgd3l";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.25.0-linux-arm64.tar.gz";
-        sha256 = "1kkmdyg41l18ffchz66hk24ql9s8bsrgv9zy2l5730kkg6g5j9d7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.27.0-linux-arm64.tar.gz";
+        sha256 = "1vbi2yap9z5rr9b5yybyfr9y6h8a2910gs8kwh8yxp6ipn94dwa3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-linux-arm64.tar.gz";
@@ -357,8 +357,8 @@
         sha256 = "027nbrks3n634nsmlwis1qwklj615ixknr6k5jg0q4wd1mwxhsjm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.34.0-linux-arm64.tar.gz";
-        sha256 = "1p59zhn0yjxrl0cw9bh2pym4jg7q3f05jd5bqcsmy17d9vrhj5m0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.35.0-linux-arm64.tar.gz";
+        sha256 = "0hrn1bw7hr15j29ghw7c18nkpkwmfkqjh62vxmnrs26r9qawzyl5";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.14.0-linux-arm64.tar.gz";
@@ -373,44 +373,44 @@
         sha256 = "0fah19z4iiq76pyam7m0gzfhlpd6cl4sbb6gz2gn51vnklgs5blz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.63.0-linux-arm64.tar.gz";
-        sha256 = "0k3hcwgshfbfg0jh6qrp0v3nv4w9473sf03dj1llcqmyvrbs9p45";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.64.1-linux-arm64.tar.gz";
+        sha256 = "0kliiasvaxxhbgaw00686rmb1sx9ml4njm6vxxs90bz77vq4y6kh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.2-linux-arm64.tar.gz";
-        sha256 = "1cpz86gqsi6azjj4xc3z16ggyrim0ww5x0w5hl98b9qvn4agxgar";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.0.0-linux-arm64.tar.gz";
+        sha256 = "10z2d328rqls7zbmbh167s9dqv446aiwwivafm9lxv76zyp8mk7j";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz";
         sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.5.0-linux-arm64.tar.gz";
-        sha256 = "0lqr69v6wvqbsmy2xgr4nz6dqcpirwzqasdz831hg5xdg37mbhjh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.0.1-linux-arm64.tar.gz";
+        sha256 = "1zagad13q8xgpicqz2d0qgrj4qxg9iqvmmw6di8n2nqhy4hczv8f";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.19.0-linux-arm64.tar.gz";
-        sha256 = "1j4znsk8cdmfa53l80jbbrc8gbm4282sw489kal23j36va3alnzg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.21.0-linux-arm64.tar.gz";
+        sha256 = "0ab5m34s7cbyf7gsb6gb1kgsyb09l33wb4bn62x9l21pk11ra9w7";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.2-linux-arm64.tar.gz";
-        sha256 = "1wnj70pj5s4fdyxcljr6ryrdp0z47l9n5792s70fj2535l60mfz7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.13.0-linux-arm64.tar.gz";
+        sha256 = "1p5r5mgyknvsxpcr0blplj654s0wdzpaap22ia21k34krzjf41ii";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.10.0-linux-arm64.tar.gz";
-        sha256 = "1y9vsix2agv2yw99p180qnbxd48ppzhx0gd60gng4abfqxy6ly3f";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.11.0-linux-arm64.tar.gz";
+        sha256 = "1lk2f3rbr5p2z5zyqn05yldw238rc23avldgrf2fizda9wr8qmj6";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz";
         sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-linux-arm64.tar.gz";
-        sha256 = "094pmichc66fnd38vfn4hb2dl3v88vqfx00smk0b19fdbrafcp5j";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.33.0-linux-arm64.tar.gz";
+        sha256 = "04spc869y5pl9fdrs75sand1345hx25r21fv2xvglmifgjk2b93j";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-linux-arm64.tar.gz";
-        sha256 = "0k32hifaim24rz0ir5nljy58pdk3v9h8qb7vz97k15gq1blyq4l7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.30.0-linux-arm64.tar.gz";
+        sha256 = "1ax41ricywlhy1nxjl1gybv9xkfw6ifz1xwlzcps7xdw8bcnrcj0";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.10.0-linux-arm64.tar.gz";
@@ -441,16 +441,16 @@
         sha256 = "16jl5fbzb7w93bksfnk32h2hqfdnr6qb9722jfbpzv5ksdw8f7g9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.130.0-linux-arm64.tar.gz";
-        sha256 = "135kfkyg8kki6rsc097i8ssj6vl4nxkn5rk3id7b0nw734c4k0hm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.131.0-linux-arm64.tar.gz";
+        sha256 = "0pzlnw3x10ad9h948g5fxz0a0vxl0k63ll8r8ysdckwnrm4a9b1a";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz";
         sha256 = "0glljz03v764n53n5l33ji64vj86ipdv5bkr03ijl8wrc22j5syy";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.0-linux-arm64.tar.gz";
-        sha256 = "0y9jwwwr28j28da1lxq7p39csnab7g2b97vpfzgaxi327xbgs2zz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.1-linux-arm64.tar.gz";
+        sha256 = "1vh5cqyj3kifvk59s8hhfpi7fvy3av1ss78mpim4gyjqjf82rf0b";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.3.1-linux-arm64.tar.gz";
@@ -479,32 +479,32 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.230.0-darwin-arm64.tar.gz";
-        sha256 = "0dfmfq7h2hmk8w00yak3y1rlq53w6af6b48cvj9aalwh36l9y9wf";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.232.0-darwin-arm64.tar.gz";
+        sha256 = "1v2h6a6qb2i94nx43rxilxc04nmzcpmh75bm4ha0nyg1x6q9g6mj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.51.0-darwin-arm64.tar.gz";
-        sha256 = "0icxa3m8fm5fprwi24clnq2112r4cjaz5yg898qws71vivx77720";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-darwin-arm64.tar.gz";
+        sha256 = "09iz2jkcmj5hg5p56d1lj6xii32q2fhsqjm5xfinhzlg7ryjv6bk";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.1.0-darwin-arm64.tar.gz";
         sha256 = "0zsa46x3fqmbicfm6lg10k9ghj40pjq0v889ksqpws2d4jlhbwp7";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.99.0-darwin-arm64.tar.gz";
-        sha256 = "1840mp4vq1ag50jgnhwld68dcfai6xgcvbbbgjybp97s12fhy2k8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.100.0-darwin-arm64.tar.gz";
+        sha256 = "1v73xq38hnr8lh6z2ma7sks6a7z2awb388pfcifa2wna13i36dy1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.4-darwin-arm64.tar.gz";
         sha256 = "14dwhd8d6683babl6399yqn6dwihxmjs7fa2p40d071ibmpsx307";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.39.0-darwin-arm64.tar.gz";
-        sha256 = "0l7ipd0fha3qdi4454hizs91s7cwwhk6irq0rg0xhfvnsg4mkyd8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.40.0-darwin-arm64.tar.gz";
+        sha256 = "13cmpgxyg8qcpdrv6qf5ik401khf76h04qrphy8avggzzsqb2vfs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.25.0-darwin-arm64.tar.gz";
-        sha256 = "0n1favn4px0librir24gnwkz8g32471ybc5vkm3h3vzyy5x5dlgx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.27.0-darwin-arm64.tar.gz";
+        sha256 = "0l1msjdcibyg7h33zfsbgrc0cz4alzy914dh2ck8l2amd1x1r1s4";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-darwin-arm64.tar.gz";
@@ -515,8 +515,8 @@
         sha256 = "0bgv7zbszr2x175x6qm124giplb6a182kabd34kxlp3rddikcyl1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.34.0-darwin-arm64.tar.gz";
-        sha256 = "0kq8zvhsni19rari53rl24ixds7hi1mn0wcams8wxavff43x1xjz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.35.0-darwin-arm64.tar.gz";
+        sha256 = "1g076zzz792s9ywc81xwm7y6r6nfwglwxapcyl0jnlc873mdf842";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.14.0-darwin-arm64.tar.gz";
@@ -531,44 +531,44 @@
         sha256 = "1rnp6l80fbgc1dzc643y4xrgcgj6niaq0hrnb4zq257ksjcm6wmx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.63.0-darwin-arm64.tar.gz";
-        sha256 = "1a5y2lq6bn4qaqkdbbjjjl8vb3w0nmwrmrxx9rkyyhh1dmf1nd8s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.64.1-darwin-arm64.tar.gz";
+        sha256 = "1y9sl873la0k3fkkl8y7rfzzq5sl9qayks7zvpasacpykpr5fi7x";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.11.2-darwin-arm64.tar.gz";
-        sha256 = "0sz3nvjjwy9ryjhbj7c02dz1qlqybcj3kwd8w2a2jlg0ajbkvwmk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.0.0-darwin-arm64.tar.gz";
+        sha256 = "0a6xryj1ksn10cf6lmnvq1yyydvxr2vys4mwmdn0h2xp3s4z5qc8";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz";
         sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.5.0-darwin-arm64.tar.gz";
-        sha256 = "03ps0dfznmw918mi89v8zflq5fzwv716sax8wka32j4b9nwlmg5v";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.0.1-darwin-arm64.tar.gz";
+        sha256 = "13lgi9zy9cxs6zwc1whw3qhq6hk1kgi72p4yvhdavdc3j4nf241p";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.19.0-darwin-arm64.tar.gz";
-        sha256 = "042a2y6sr1z7v9ky6dkjkqgzqawdlvl1wrd34n3vbhhwxvjl1zjl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.21.0-darwin-arm64.tar.gz";
+        sha256 = "1h9fnc878f3r1nyd0a6rbzmanxsv5ymc1k63kqvc0lcny4k8w6m9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.12.2-darwin-arm64.tar.gz";
-        sha256 = "0gzzzfs65pq3j05k39j3n4vxlpqi3v5v3jxvcj273gvh369cq1sq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.13.0-darwin-arm64.tar.gz";
+        sha256 = "1kmapqwa3vdi7caf1ir9r2ypx7g062lgn8xqdda5rq5yclkv3jqi";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.10.0-darwin-arm64.tar.gz";
-        sha256 = "1m5aywahwc6q1ig196013rfca3c8n1yzksj9b4kq9ld1snb804i7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.11.0-darwin-arm64.tar.gz";
+        sha256 = "1b80p3wjvs740rih0afjiw2scwc0m3ykhla5fg7kqhf6xlmrliqj";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz";
         sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.32.1-darwin-arm64.tar.gz";
-        sha256 = "150kg8brpsazpdd6laywwvbrjmzl4n3w7saf9vidiwsv01zpl90m";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.33.0-darwin-arm64.tar.gz";
+        sha256 = "17507yg6izmnwaw029wvg5r0xnnsh4fcjczd61ajbhs7vqysrvx2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.28.0-darwin-arm64.tar.gz";
-        sha256 = "0w7j7br44f4fdfcpqj2jairf9z65ga5i88yqkxrwliqf605i0b0a";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.30.0-darwin-arm64.tar.gz";
+        sha256 = "0n8my65zbia3kyhcfrzi7119kggkzldmcljhw3i3zh9839a52p7a";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.10.0-darwin-arm64.tar.gz";
@@ -599,16 +599,16 @@
         sha256 = "0bdvm3lgihf4nn8l1r9cla23ww9vxqb2km8z02argsms14ry0dg6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.130.0-darwin-arm64.tar.gz";
-        sha256 = "0v8l25zsm5zfwyfl90p9cxbawi1ym2kl27djlfmd19srgad01jhw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.131.0-darwin-arm64.tar.gz";
+        sha256 = "1ixsmykdi9q3xd3v3i95alhfmdylak44wmxisinfw09c23l3fx1f";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz";
         sha256 = "1c4pn5nr8d97n9bqd7vz9gzlbi50hnfjylwwch445ylqp5l8gvqf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.0-darwin-arm64.tar.gz";
-        sha256 = "0wmpsw8lm83vlkxk2wyg0dj895yn9zi52qzjam0svcnz5xdhd31x";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.1-darwin-arm64.tar.gz";
+        sha256 = "08aapfbkaqn7q1ngqg4sv070js1zkz1wd6v1hsigi217cgn7l4zc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.3.1-darwin-arm64.tar.gz";
diff --git a/pkgs/by-name/pu/pur/package.nix b/pkgs/by-name/pu/pur/package.nix
index 08e81672c2a9..ccef7e0df538 100644
--- a/pkgs/by-name/pu/pur/package.nix
+++ b/pkgs/by-name/pu/pur/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "pur";
-  version = "7.3.3";
+  version = "7.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alanhamlett";
     repo = "pip-update-requirements";
     tag = finalAttrs.version;
-    hash = "sha256-zSEzYYpDmu3fennTZNvQjAoMekzxoMDUEqvSjN6hNUk=";
+    hash = "sha256-BxUR4yyT6ipvBozWgat709rNPHELE/PNPVJ4LtfOdfQ=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/by-name/pu/pure-ftpd/package.nix b/pkgs/by-name/pu/pure-ftpd/package.nix
index fab0c8d2cab7..43cf599949e9 100644
--- a/pkgs/by-name/pu/pure-ftpd/package.nix
+++ b/pkgs/by-name/pu/pure-ftpd/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pure-ftpd";
-  version = "1.0.53";
+  version = "1.0.54";
 
   src = fetchurl {
     url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${finalAttrs.version}.tar.gz";
-    hash = "sha256-s/KwGUIjseiL+LDfnpH/tdG5gSNW6d1GXy+XtyshJl8=";
+    hash = "sha256-3JFAQg7ET3gpV5WR/zeKpjlrRgS5xq6uhHNo4PNb17I=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/pu/pureref/package.nix b/pkgs/by-name/pu/pureref/package.nix
index 5ff951531899..406afda60a73 100644
--- a/pkgs/by-name/pu/pureref/package.nix
+++ b/pkgs/by-name/pu/pureref/package.nix
@@ -9,7 +9,7 @@
   dpkg,
 }:
 let
-  version = "2.1.1";
+  version = "2.1.2";
   deb =
     runCommand "PureRef-${version}_x64"
       {
@@ -19,7 +19,7 @@ let
           cacert
           dpkg
         ];
-        outputHash = "sha256-Dyozn6WJ93AvXavlW3xmY5p5TsQxU+dJkogEBE8e+zs=";
+        outputHash = "sha256-aGHhesJ6JJQpuRbDgASjpY4e28WHaVSFNEgGZmG7U3g=";
         outputHashMode = "recursive";
       }
       ''
diff --git a/pkgs/by-name/pv/pv-migrate/package.nix b/pkgs/by-name/pv/pv-migrate/package.nix
index 8747c7d7e7f2..931214bd64f3 100644
--- a/pkgs/by-name/pv/pv-migrate/package.nix
+++ b/pkgs/by-name/pv/pv-migrate/package.nix
@@ -24,8 +24,8 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=v${finalAttrs.version}"
-    "-X main.commit=v${finalAttrs.version}"
+    "-X main.version=${finalAttrs.version}"
+    "-X main.commit=${finalAttrs.version}"
     "-X main.date=1970-01-01-00:00:01"
   ];
 
diff --git a/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix b/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
index 1b889af2b0f5..574d0119e319 100644
--- a/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
+++ b/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pvz-portable-unwrapped";
-  version = "0.1.21";
+  version = "0.1.22";
 
   src = fetchFromGitHub {
     owner = "wszqkzqk";
     repo = "PvZ-Portable";
     tag = finalAttrs.version;
-    hash = "sha256-4CtO62cwNzQ32DE70F8kKFHy7tOsRLpDsgyrBS00C/g=";
+    hash = "sha256-H+YY2jTnsbnPzRhiOBqzzkVNJsFzoT6hMZpOTnB5mtA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pv/pvzge/package.nix b/pkgs/by-name/pv/pvzge/package.nix
index 8fd5d34e0ea5..61bdf577cdcb 100644
--- a/pkgs/by-name/pv/pvzge/package.nix
+++ b/pkgs/by-name/pv/pvzge/package.nix
@@ -14,13 +14,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "pvzge";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "Gzh0821";
     repo = "pvzge_web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-juo+kM7IK+e3qPHH+V+/1D0NqQiZfXYEtvX940dLarQ=";
+    hash = "sha256-lCYkkFIis6roWicsU7SN1YzHFQbAdLkkRl6JHasQa8E=";
   };
 
   iconSrc = fetchurl {
diff --git a/pkgs/by-name/pw/pwgen/package.nix b/pkgs/by-name/pw/pwgen/package.nix
index ae8d6c42187c..3477eaf3f229 100644
--- a/pkgs/by-name/pw/pwgen/package.nix
+++ b/pkgs/by-name/pw/pwgen/package.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
   ];
 
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
+
   meta = {
     description = "Password generator which creates passwords which can be easily memorized by a human";
     homepage = "https://github.com/tytso/pwgen";
diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix
index 7f317886c59b..a74729bebef3 100644
--- a/pkgs/by-name/py/pyenv/package.nix
+++ b/pkgs/by-name/py/pyenv/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pyenv";
-  version = "2.6.27";
+  version = "2.6.28";
 
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EWpVkVTYI8Rvt7OZ3mdm/EEIcGHkD4LfHdAmhwgesLw=";
+    hash = "sha256-1jbpelEVcm+HqjsT8yaQPTaoOhEBCSq64LzTzr0X93I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/py/pyhanko-cli/package.nix b/pkgs/by-name/py/pyhanko-cli/package.nix
index f8c4f0c37c45..6ba20c41c0fb 100644
--- a/pkgs/by-name/py/pyhanko-cli/package.nix
+++ b/pkgs/by-name/py/pyhanko-cli/package.nix
@@ -68,7 +68,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     description = "Sign and stamp PDF files";
     mainProgram = "pyhanko";
     homepage = "https://github.com/MatthiasValvekens/pyHanko/tree/master/pkgs/pyhanko-cli";
-    changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/pyhanko-cli/${finalAttrs.src.tag}/docs/changelog.rst#pyhanko-cli";
+    changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/${finalAttrs.src.tag}/docs/changelog.rst#pyhanko-cli";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.antonmosich ];
   };
diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix
index d856bf2e141c..c50a251d5a4c 100644
--- a/pkgs/by-name/py/pyradio/package.nix
+++ b/pkgs/by-name/py/pyradio/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyradio";
-  version = "0.9.3.11.29";
+  version = "0.9.3.11.30";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "coderholic";
     repo = "pyradio";
     tag = finalAttrs.version;
-    hash = "sha256-WvvNgo5ajhKqArFYM5+IwEPX4yzoali9iZdGoxEKbFM=";
+    hash = "sha256-b4Euo9rD/A7PjROOaigx2ITel1uA7fa6S6bNi76FeUw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix
index 24f89b5ea9e0..896d4a94bce0 100644
--- a/pkgs/by-name/py/pyrefly/package.nix
+++ b/pkgs/by-name/py/pyrefly/package.nix
@@ -10,17 +10,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pyrefly";
-  version = "0.60.0";
+  version = "0.62.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "pyrefly";
     tag = finalAttrs.version;
-    hash = "sha256-3dvuhVyvVueXmQvxM9md8EK7u9TaiL+h4EBaKHnvcRc=";
+    hash = "sha256-5KGHm4dtpqeabv+Qw2FK4GvE5K6saUfyVInTrd3+MWI=";
   };
 
   buildAndTestSubdir = "pyrefly";
-  cargoHash = "sha256-lxtd9f1o/9sWBIv5f7FfZhM5SyUz/om5fswc+/vIhSk=";
+  cargoHash = "sha256-MWnz6KGrKduC2CmLcojd7I6C3M8PR9k3FgCWU+X+KCo=";
 
   buildInputs = [ rust-jemalloc-sys ];
 
diff --git a/pkgs/by-name/py/pyright/package-lock.json b/pkgs/by-name/py/pyright/package-lock.json
index 4505415580bf..5e1988a9e2e0 100644
--- a/pkgs/by-name/py/pyright/package-lock.json
+++ b/pkgs/by-name/py/pyright/package-lock.json
@@ -7,7 +7,7 @@
       "name": "pyright-root",
       "devDependencies": {
         "glob": "^8.1.0",
-        "jsonc-parser": "^3.3.1"
+        "jsonc-parser": "^3.2.0"
       }
     },
     "node_modules/balanced-match": {
@@ -18,9 +18,9 @@
       "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -38,7 +38,7 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
       "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -82,9 +82,9 @@
       "license": "MIT"
     },
     "node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
+      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix
index 96d0b5d8aedb..0d4ccccbedb9 100644
--- a/pkgs/by-name/py/pyright/package.nix
+++ b/pkgs/by-name/py/pyright/package.nix
@@ -7,13 +7,13 @@
 }:
 
 let
-  version = "1.1.408";
+  version = "1.1.409";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "pyright";
     tag = version;
-    hash = "sha256-+tU4BiAqKsX+4dX1k3JvygrzCoHaoXcCXKJgecvfN60=";
+    hash = "sha256-h0sXYwRCIQlrnNIp/a7ow55McA9fdHP2FcvrRCqWROg=";
   };
 
   patchedPackageJSON =
@@ -32,7 +32,7 @@ let
     pname = "pyright-root";
     inherit version src;
     sourceRoot = "${src.name}"; # required for update.sh script
-    npmDepsHash = "sha256-4DVWWoLnNXoJ6eWeQuOzAVjcvo75Y2nM/HwQvAEN4ME=";
+    npmDepsHash = "sha256-OpXxcALwMyBJEcZz5WTnjAysufbgWkW/VKAg1zIJgDE=";
     dontNpmBuild = true;
     postPatch = ''
       cp ${patchedPackageJSON} ./package.json
@@ -49,7 +49,7 @@ let
     pname = "pyright-internal";
     inherit version src;
     sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-/Y+DhyWC34Rco6qSQTZBm3Kqh2fKrk+kaHH9x+C6wP8=";
+    npmDepsHash = "sha256-HG2714eCHWD6aQAKGpGClMg+XDPQ08Q0ofXf3wMafg0=";
     dontNpmBuild = true;
     installPhase = ''
       runHook preInstall
@@ -63,7 +63,7 @@ buildNpmPackage rec {
   inherit version src;
 
   sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-3w2XEURdfriVaQ2ruSbxVfwcZEEXKt0/51TFR3rR8tc=";
+  npmDepsHash = "sha256-wyswu6pTtZmksj1hZUhaZLWuJnf8WKofo1htLtgKm9w=";
 
   postPatch = ''
     chmod +w ../../
diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix
index b1fb839f95df..ab6706468ad8 100644
--- a/pkgs/by-name/py/pyspread/package.nix
+++ b/pkgs/by-name/py/pyspread/package.nix
@@ -9,12 +9,12 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pyspread";
-  version = "2.4";
+  version = "2.4.5";
 
   src = fetchPypi {
     pname = "pyspread";
     inherit (finalAttrs) version;
-    hash = "sha256-MZlR2Rap5oMRfCmswg9W//FYFkSEki7eyMNhLoGZgJM=";
+    hash = "sha256-7Nurn9OmK6LEz5TT543JUYKc/LjpkwfN/7r0ebS1PfY=";
   };
 
   pyproject = true;
diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix
index cbbe1ae1cfd8..06bb06c1ae64 100644
--- a/pkgs/by-name/qa/qalculate-gtk/package.nix
+++ b/pkgs/by-name/qa/qalculate-gtk/package.nix
@@ -2,10 +2,12 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
   pkg-config,
   libqalculate,
   gtk3,
+  gtk-mac-integration-gtk3,
   curl,
   wrapGAppsHook3,
   desktopToDarwinBundle,
@@ -22,6 +24,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-JZfolSRLRLtv529f25lEPYOlz+y+EdRqKA0Y5d1dK3s=";
   };
 
+  patches = [
+    # Is meaningfull only for Darwin but is better applying unconditionally.
+    # Can be removed in 5.11 probably, see:
+    # https://github.com/Qalculate/qalculate-gtk/pull/705
+    (fetchpatch {
+      url = "https://github.com/Qalculate/qalculate-gtk/commit/2f1b6a32d98f122d44d158c20f79a5b9aaf9669f.patch";
+      hash = "sha256-v9T8wWvqlI9l6BUszf/575qmoFvh88Cdj/m2XqV8Q4k=";
+    })
+  ];
+
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [
@@ -30,11 +42,16 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
+
   buildInputs = [
     libqalculate
     gtk3
     curl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    gtk-mac-integration-gtk3
   ];
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/by-name/qb/qbz/package.nix b/pkgs/by-name/qb/qbz/package.nix
index cc3d071a2a1e..0673a979afe8 100644
--- a/pkgs/by-name/qb/qbz/package.nix
+++ b/pkgs/by-name/qb/qbz/package.nix
@@ -22,16 +22,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qbz";
-  version = "1.2.7";
+  version = "1.2.10";
 
   src = fetchFromGitHub {
     owner = "vicrodh";
     repo = "qbz";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/7gYjCfMJ1TmjogGQWkRDgDaUZ8o03hVNxZ21w4xniU=";
+    hash = "sha256-cPe7J0KtcTQFfjhNL9giRPLx2VwHsUYRDV/ZM/2dFas=";
   };
 
-  cargoHash = "sha256-Xk1v5QosIgzowLpo5L0qaSNFKqoL+kfQeA6KCIImK8M=";
+  cargoHash = "sha256-tmXcLNu8ejYTP13b+Ir1ExtRrsEXsUcULUgIX9gzltU=";
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   npmDeps = fetchNpmDeps {
     name = "qbz-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-xBad4Ms5dlE0jHZ5iKLS2dEujgIZahfNfcknJH9qoXM=";
+    hash = "sha256-MYBxnLGSz4MyrpdNKUIBtnA6HFimPwrcEOYOGSbS5AY=";
   };
 
   env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
diff --git a/pkgs/by-name/qg/qgit/package.nix b/pkgs/by-name/qg/qgit/package.nix
index e01cf9c46780..9cb602fe6834 100644
--- a/pkgs/by-name/qg/qgit/package.nix
+++ b/pkgs/by-name/qg/qgit/package.nix
@@ -33,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Graphical front-end to Git";
     maintainers = with lib.maintainers; [
       peterhoeg
-      markuskowa
     ];
     inherit (qt6.qtbase.meta) platforms;
     mainProgram = "qgit";
diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix
index f226de0c703c..8f067a131009 100644
--- a/pkgs/by-name/qg/qgroundcontrol/package.nix
+++ b/pkgs/by-name/qg/qgroundcontrol/package.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
     homepage = "https://qgroundcontrol.com/";
-    changelog = "https://github.com/mavlink/qgroundcontrol/blob/master/ChangeLog.md";
+    changelog = "https://github.com/mavlink/qgroundcontrol/blob/master/CHANGELOG.md";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/qi/qidi-studio/package.nix b/pkgs/by-name/qi/qidi-studio/package.nix
index e69d73ca2e75..876a62adc3af 100644
--- a/pkgs/by-name/qi/qidi-studio/package.nix
+++ b/pkgs/by-name/qi/qidi-studio/package.nix
@@ -7,11 +7,11 @@
 }:
 let
   pname = "qidi-studio";
-  version = "2.05.01.53";
+  version = "2.05.02.50";
 
   src = fetchurl {
     url = "https://github.com/QIDITECH/QIDIStudio/releases/download/v${version}/QIDIStudio_v0${version}_Ubuntu24.AppImage";
-    hash = "sha256-d43u7tUEX8QB3vHQZzMylW4t4/TrFkQJB+Kapsew/CU=";
+    hash = "sha256-dHefxOelz8B40HFxqDdG0+whPMYLlbLDbx3AM7+R/TA=";
   };
 
   appimageContents = appimageTools.extract {
diff --git a/pkgs/by-name/qj/qjackctl/package.nix b/pkgs/by-name/qj/qjackctl/package.nix
index 3ab1abdc4678..6f709a412022 100644
--- a/pkgs/by-name/qj/qjackctl/package.nix
+++ b/pkgs/by-name/qj/qjackctl/package.nix
@@ -13,14 +13,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.0.5";
+  version = "1.0.6";
   pname = "qjackctl";
 
   src = fetchFromGitHub {
     owner = "rncbc";
     repo = "qjackctl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A4zoKqEO84kOfPwrkngv3EEXegCOs4QqFaS9KmgcKf4=";
+    hash = "sha256-EZR6E6swVRcD8uKZm8zCtps/P/marCfhdUaaOvArayo=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/ql/qlever-control/package.nix b/pkgs/by-name/ql/qlever-control/package.nix
new file mode 100644
index 000000000000..8477626654ac
--- /dev/null
+++ b/pkgs/by-name/ql/qlever-control/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "qlever-control";
+  version = "0.5.46";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "qlever-dev";
+    repo = "qlever-control";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vXSVrNfz4gRBCrTi0D+sXtfsAZwv7HO67zs7wh98cOY=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+    wheel
+  ];
+
+  dependencies = with python3Packages; [
+    argcomplete
+    psutil
+    pyyaml
+    rdflib
+    requests-sse
+    termcolor
+    tqdm
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "qlever"
+  ];
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Command-line tool for controlling the QLever graph database";
+    homepage = "https://github.com/qlever-dev/qlever-control";
+    mainProgram = "qlever";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
+  };
+})
diff --git a/pkgs/by-name/ql/qlever/package.nix b/pkgs/by-name/ql/qlever/package.nix
new file mode 100644
index 000000000000..0eac6aa36ba3
--- /dev/null
+++ b/pkgs/by-name/ql/qlever/package.nix
@@ -0,0 +1,170 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  pkg-config,
+  cmake,
+
+  boost,
+  bzip2,
+  icu,
+  openssl,
+  zlib,
+  zstd,
+  jemalloc,
+
+  nixosTests,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qlever";
+  version = "0.5.46";
+
+  src = fetchFromGitHub {
+    owner = "ad-freiburg";
+    repo = "qlever";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UUfSWy1mImmyL7Ha2xCbxm9srdY/rTJS4oUJbJiDtwQ=";
+    fetchSubmodules = true;
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    bzip2
+    icu
+    jemalloc
+    openssl
+    zlib
+    zstd
+  ];
+
+  env.NIX_CFLAGS_COMPILE = toString [
+    # fixes error: inlining failed in call to 'always_inline' ... :
+    # function body can be overwritten at link time
+    "-fno-semantic-interposition"
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
+    (lib.cmakeFeature "LOGLEVEL" "INFO")
+    (lib.cmakeBool "USE_PARALLEL" true)
+    (lib.cmakeBool "_NO_TIMING_TESTS" true)
+    (lib.cmakeBool "JEMALLOC_MANUALLY_INSTALLED" true)
+
+    # disable fetching external dependencies
+    (lib.cmakeBool "USE_CONAN" false)
+    (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
+  ]
+  ++ (with finalAttrs.passthru.deps; [
+    # map external dependencies to FetchContent names
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FSST" "${fsst}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_RE2" "${re2}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${googletest}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_NLOHMANN-JSON" "${nlohmann-json}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ANTLR" "${antlr}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_RANGE-V3" "${range-v3}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SPATIALJOIN" "${spatialjoin}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CTRE" "${ctre}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL" "${abseil}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_S2" "${s2}")
+  ]);
+
+  passthru = {
+    deps = {
+      fsst = fetchFromGitHub {
+        owner = "cwida";
+        repo = "fsst";
+        rev = "b228af6356196095eaf9f8f5654b0635f969661e";
+        hash = "sha256-XuE/nalt2HEYaII9NytUs0rCLGHOUFEclO+0h7pu4V0=";
+      };
+
+      re2 = fetchFromGitHub {
+        owner = "google";
+        repo = "re2";
+        rev = "bc0faab533e2b27b85b8ad312abf061e33ed6b5d";
+        hash = "sha256-cKXe8r5MUag/z+seem4Zg/gmqIQjaCY7DBxiKlrnXPs=";
+      };
+
+      googletest = fetchFromGitHub {
+        owner = "google";
+        repo = "googletest";
+        rev = "7917641ff965959afae189afb5f052524395525c";
+        hash = "sha256-Pfkx/hgtqryPz3wI0jpZwlRRco0s2FLcvUX1EgTGFIw=";
+      };
+
+      nlohmann-json = fetchFromGitHub {
+        owner = "nlohmann";
+        repo = "json";
+        tag = "v3.12.0";
+        hash = "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY=";
+      };
+
+      antlr = fetchFromGitHub {
+        owner = "antlr";
+        repo = "antlr4";
+        rev = "cc82115a4e7f53d71d9d905caa2c2dfa4da58899";
+        hash = "sha256-DxxRL+FQFA+x0RudIXtLhewseU50aScHKSCDX7DE9bY=";
+      };
+
+      range-v3 = fetchFromGitHub {
+        owner = "joka921";
+        repo = "range-v3";
+        rev = "42340ef354f7b4e4660268b788e37008d9cc85aa";
+        hash = "sha256-/17XLLLuEkcqeklVtqlgtu19tNTT3bLRHrU1aOPLhTw=";
+      };
+
+      spatialjoin = fetchFromGitHub {
+        owner = "ad-freiburg";
+        repo = "spatialjoin";
+        rev = "c358e479ebb5f40df99522e69a0b52d73416020b";
+        hash = "sha256-/BQzyCx1KxnOeLLZkvqno2KN/VHAEu228zrsJaqYu/c=";
+        fetchSubmodules = true;
+      };
+
+      ctre = fetchFromGitHub {
+        owner = "hanickadot";
+        repo = "compile-time-regular-expressions";
+        rev = "e34c26ba149b9fd9c34aa0f678e39739641a0d1e";
+        hash = "sha256-/44oZi6j8+a1D6ZGZpoy82GHjPtqzOvuS7d3SPbH7fs=";
+      };
+
+      abseil = fetchFromGitHub {
+        owner = "abseil";
+        repo = "abseil-cpp";
+        rev = "93ac3a4f9ee7792af399cebd873ee99ce15aed08";
+        hash = "sha256-a18+Yj9fvDigza4b2g38L96hge5feMwU6fgPmL/KVQU=";
+      };
+
+      s2 = fetchFromGitHub {
+        owner = "google";
+        repo = "s2geometry";
+        rev = "5b5eccd54a08ae03b4467e79ffbb076d0b5f221e";
+        hash = "sha256-VjgGcGgQlKmjUq+JU0JpyhOZ9pqwPcBUFEPGV9XoHc0=";
+      };
+    };
+
+    tests = nixosTests.qlever;
+
+    updateScript = ./update.sh;
+  };
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Graph database implementing the RDF and SPARQL standards";
+    homepage = "https://github.com/ad-freiburg/qlever";
+    mainProgram = "qlever";
+    platforms = lib.platforms.all;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
+  };
+})
diff --git a/pkgs/by-name/ql/qlever/update.sh b/pkgs/by-name/ql/qlever/update.sh
new file mode 100755
index 000000000000..90e86cfee76c
--- /dev/null
+++ b/pkgs/by-name/ql/qlever/update.sh
@@ -0,0 +1,168 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p bash nix curl jq gawk gnused nixfmt
+
+set -euo pipefail
+
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+FILE_PATH="$SCRIPT_DIR/package.nix"
+
+LATEST_TAG=$(curl -s https://api.github.com/repos/ad-freiburg/qlever/releases/latest | jq -r '.tag_name')
+
+VERSION_OLD="${UPDATE_NIX_OLD_VERSION:-$(grep -oP '(?<=version = ")[^"]+' "$FILE_PATH")}"
+VERSION_NEW="${LATEST_TAG#v}"
+
+if [[ "$VERSION_NEW" == "$VERSION_OLD" ]]; then
+    echo "QLever already up to date: $VERSION_NEW"
+    exit 0
+fi
+
+CMAKE_URL="https://raw.githubusercontent.com/ad-freiburg/qlever/$LATEST_TAG/CMakeLists.txt"
+CMAKE_FILE=$(curl -s "$CMAKE_URL")
+
+prefetch_github_hash() {
+    local owner=$1
+    local repo=$2
+    local rev=$3
+    local fetch_submodules=${4:-false}
+
+    local expr="with import <nixpkgs> {}; fetchFromGitHub { \
+        owner = \"$owner\"; \
+        repo = \"$repo\"; \
+        rev = \"$rev\"; \
+        fetchSubmodules = $fetch_submodules; \
+        hash = \"\"; \
+    }"
+
+    output=$(nix-build --no-out-link -E "$expr" 2>&1)
+
+    echo "$output" | awk '/got:/ {print $NF}'
+}
+
+# Extract the pinned revision/tag for a FetchContent_Declare block.
+extract_git_tag() {
+    local dep_name=$1
+    local result
+
+    result=$(echo "$CMAKE_FILE" | awk -v dep="$dep_name" '
+        /FetchContent_Declare\(/ { expect_name=1; next }
+        expect_name {
+            gsub(/^[[:space:]]+|[[:space:]]+$/, "", $0)
+            in_block = ($0 == dep)
+            expect_name = 0
+            next
+        }
+        in_block && /GIT_TAG/ {
+            for (i=1; i<=NF; i++)
+                if ($i == "GIT_TAG") { print $(i+1); exit }
+        }
+        in_block && /[[:space:]]URL[[:space:]]/ && !/URL_HASH/ {
+            for (i=1; i<=NF; i++)
+                if ($i == "URL") { print "URL:" $(i+1); exit }
+        }
+        in_block && /^[[:space:]]*\)/ { in_block=0 }
+    ')
+
+    if [[ "$result" == URL:* ]]; then
+        # e.g. .../download/v3.12.0/json.tar.xz -> v3.12.0
+        echo "${result#URL:}" | grep -Po '(?<=/download/)[^/]+'
+    else
+        echo "$result"
+    fi
+}
+
+# Get the current revision/tag for a fetchFromGitHub block.
+get_current_git_tag() {
+    local attr_name=$1
+    local type=$2
+
+    awk "/$attr_name = fetchFromGitHub/,/};/" "$FILE_PATH" |
+        sed -n "s/.*$type = \"\([^\"]*\)\".*/\1/p"
+}
+
+FAILED=()
+
+update_dep() {
+    local cmake_dep=$1
+    local owner=$2
+    local repo=$3
+    local type=${4:-rev}
+    local submodules=${5:-false}
+
+    echo "- $cmake_dep:"
+
+    rev=$(extract_git_tag "$cmake_dep")
+    if [ -z "$rev" ]; then
+        echo "    Error: could not find GIT_TAG for '$cmake_dep' in CMakeLists.txt"
+        FAILED+=("$cmake_dep")
+        return 0
+    fi
+
+    current_rev=$(get_current_git_tag "$cmake_dep" "$type")
+    if [ "$current_rev" = "$rev" ]; then
+        echo "    Skipping: $type already up to date ($rev)"
+        return 0
+    fi
+
+    echo "    $type: $current_rev -> $rev. Prefetching hash..."
+
+    hash=$(prefetch_github_hash "$owner" "$repo" "$rev" "$submodules")
+    if [ -z "$hash" ]; then
+        echo "    Error: Failed to prefetch hash for $owner/$repo@$rev (Is the repository/rev valid?)"
+        FAILED+=("$cmake_dep")
+        return 0
+    fi
+
+    sed -i "/$cmake_dep = fetchFromGitHub {/,/};/ s|$type = \".*\";|$type = \"$rev\";|" "$FILE_PATH"
+    sed -i "/$cmake_dep = fetchFromGitHub {/,/};/ s|hash = \".*\";|hash = \"$hash\";|" "$FILE_PATH"
+    echo "    Done."
+}
+
+echo "Updating QLever to $VERSION_NEW"
+
+sed -i "s|version = \"$VERSION_OLD\"|version = \"$VERSION_NEW\"|" "$FILE_PATH"
+
+HASH=$(prefetch_github_hash "ad-freiburg" "qlever" "$LATEST_TAG" true)
+sed -i "/src = fetchFromGitHub {/,/};/ s|hash = \".*\";|hash = \"$HASH\";|" "$FILE_PATH"
+
+echo ""
+echo "Updating dependencies:"
+
+# NOTE: cmake_dep must match the identifier on the line after FetchContent_Declare(
+
+# Read configuration line-by-line. Skip empty lines and comments.
+while read -r cmake_dep owner repo type submodules; do
+    [[ -z "$cmake_dep" || "$cmake_dep" == \#* ]] && continue
+
+    # use "-" as a placeholder for visual alignment
+    [[ "$type" == "-" ]] && type=""
+    [[ "$submodules" == "-" ]] && submodules=""
+
+    update_dep "$cmake_dep" "$owner" "$repo" "${type:-rev}" "${submodules:-false}"
+done <<'EOF'
+# CMAKE_DEP        OWNER         REPO                                TYPE  SUBMODULES
+fsst               cwida         fsst                                -     -
+re2                google        re2                                 -     -
+googletest         google        googletest                          -     -
+nlohmann-json      nlohmann      json                                tag   -
+antlr              antlr         antlr4                              -     -
+range-v3           joka921       range-v3                            -     -
+spatialjoin        ad-freiburg   spatialjoin                         -     true
+ctre               hanickadot    compile-time-regular-expressions    -     -
+abseil             abseil        abseil-cpp                          -     -
+s2                 google        s2geometry                          -     -
+EOF
+
+echo ""
+echo "Formatting $FILE_PATH"
+
+nixfmt "$FILE_PATH"
+
+if [ ${#FAILED[@]} -gt 0 ]; then
+    echo ""
+    echo "Warning: the following deps could not be updated:"
+    printf '  - %s\n' "${FAILED[@]}"
+    exit 1
+fi
+
+echo ""
+echo "All dependencies updated for QLever $LATEST_TAG"
diff --git a/pkgs/by-name/qm/qmapshack/package.nix b/pkgs/by-name/qm/qmapshack/package.nix
index fffb03b4044f..21c2213a1e9a 100644
--- a/pkgs/by-name/qm/qmapshack/package.nix
+++ b/pkgs/by-name/qm/qmapshack/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qmapshack";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchFromGitHub {
     owner = "Maproom";
     repo = "qmapshack";
     tag = "V_${finalAttrs.version}";
-    hash = "sha256-NqyouJGagVvyJGGetF8csA1byATaigBtGJIt5U3in+0=";
+    hash = "sha256-WLuD1qm1KoM5LtvanUrhV4ZsdvnXkanQVLT0p/fzRXg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qo/qoi/package.nix b/pkgs/by-name/qo/qoi/package.nix
index a0714cfdbb91..feceac3d0311 100644
--- a/pkgs/by-name/qo/qoi/package.nix
+++ b/pkgs/by-name/qo/qoi/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qoi";
-  version = "0-unstable-2026-02-14"; # no upstream version yet.
+  version = "0-unstable-2026-04-21"; # no upstream version yet.
 
   src = fetchFromGitHub {
     owner = "phoboslab";
     repo = "qoi";
-    rev = "6fff9b70dd79b12f808b0acc5cb44fde9998725e";
-    hash = "sha256-pw/lflPXLVdM/Qg685/nAlGt5bQC5WU6t496z6xWHx0=";
+    rev = "e084ec009b38c755acc40fe31d3f83ee17935b9d";
+    hash = "sha256-sPwmpkMo++Eo33fsiLHY6QYScXQNCucQyNPJdDysgFw=";
   };
 
   patches = [
diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix
index d45a2917a2a7..70896bacfbf8 100644
--- a/pkgs/by-name/qo/qovery-cli/package.nix
+++ b/pkgs/by-name/qo/qovery-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "qovery-cli";
-  version = "1.157.6";
+  version = "1.158.0";
 
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = "qovery-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zkTiGo8QtcE4TrmYpuXBzq/b9IJQ4e3T3h11NbuFRM0=";
+    hash = "sha256-b6nvJPLMvqXM+hYJzOG65G15N+ErJnWySQrjJQmsMe8=";
   };
 
   vendorHash = "sha256-kENqEnk5RxN8kJ/dnXtG6ypnb8CPcOsHKid1z6uuKAc=";
diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 60041ce1d130..7b6f3e34fba4 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "26.4.17";
+  version = "26.4.25";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-lXl9lKdj17XREv07DiIzg3S2jtYrezWtHaBCHVFQdzI=";
+    hash = "sha256-wge2r4R++ao8z4mBwwM93gJhGcp1ZIcXOqj3pzQr8LI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qp/qpwgraph/package.nix b/pkgs/by-name/qp/qpwgraph/package.nix
index 15701335606b..e04ced767cfa 100644
--- a/pkgs/by-name/qp/qpwgraph/package.nix
+++ b/pkgs/by-name/qp/qpwgraph/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qpwgraph";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-cBypvVr/DwnzeKX32PCHKg3vR/7fReRiJB5Pfh11blA=";
+    sha256 = "sha256-RU6FD8/H4Z/IxaP+eTHNqkcP63nJ1Tos4PXpZE+i9d4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qr/qrcodegen/package.nix b/pkgs/by-name/qr/qrcodegen/package.nix
index 09c176cb98e8..67cd166ca256 100644
--- a/pkgs/by-name/qr/qrcodegen/package.nix
+++ b/pkgs/by-name/qr/qrcodegen/package.nix
@@ -38,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dt $out/lib/ libqrcodegen.a
     install -Dt $out/include/qrcodegen/ qrcodegen.h
 
+    mkdir -p $out/lib/pkgconfig
+    substitute ${./qrcodegen.pc} $out/lib/pkgconfig/qrcodegen.pc \
+      --subst-var out \
+      --subst-var pname \
+      --subst-var version
+
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/qr/qrcodegen/qrcodegen.pc b/pkgs/by-name/qr/qrcodegen/qrcodegen.pc
new file mode 100644
index 000000000000..d59dd0945b2d
--- /dev/null
+++ b/pkgs/by-name/qr/qrcodegen/qrcodegen.pc
@@ -0,0 +1,9 @@
+prefix=@out@
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: @pname@
+Description: High-quality QR Code generator library in many languages
+Version: @version@
+Cflags: -I${includedir}/qrcodegen
+Libs: -L${libdir} -lqrcodegen
diff --git a/pkgs/by-name/qr/qrq/package.nix b/pkgs/by-name/qr/qrq/package.nix
index 192e815a136d..81de69a8cc3a 100644
--- a/pkgs/by-name/qr/qrq/package.nix
+++ b/pkgs/by-name/qr/qrq/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   ncurses,
   pulseaudio,
 }:
@@ -19,6 +20,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
+  patches = [
+    # gcc15, remove after next release
+    (fetchpatch {
+      url = "https://github.com/dj1yfk/qrq/commit/f17363df923cd9d4607478a7406e0c4d3e044aae.patch";
+      hash = "sha256-EzGP6ExqiK30Vb4f8Q06zIP5Bebnw/jWvaAOb3juZMU=";
+      stripLen = 2;
+      extraPrefix = "";
+    })
+  ];
+
   buildInputs = [
     ncurses
     pulseaudio
@@ -33,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace qrq.c \
       --replace-fail '[80]' '[4000]' \
       --replace-fail '80,' '4000,'
+    substituteInPlace Makefile \
+      --replace-fail 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}cc'
   '';
 
   meta = {
diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/by-name/qs/qsstv/package.nix
similarity index 92%
rename from pkgs/applications/radio/qsstv/default.nix
rename to pkgs/by-name/qs/qsstv/package.nix
index 4cee9ac0820f..0b93a79a08c8 100644
--- a/pkgs/applications/radio/qsstv/default.nix
+++ b/pkgs/by-name/qs/qsstv/package.nix
@@ -2,11 +2,9 @@
   lib,
   stdenv,
   fetchurl,
-  qtbase,
-  qmake,
   openjpeg,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   fftw,
   libpulseaudio,
   alsa-lib,
@@ -26,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     imagemagick
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     openjpeg
     fftw
     libpulseaudio
diff --git a/pkgs/by-name/qt/qtcreator/package.nix b/pkgs/by-name/qt/qtcreator/package.nix
index c74f7f13fbc2..1eb30a7702cc 100644
--- a/pkgs/by-name/qt/qtcreator/package.nix
+++ b/pkgs/by-name/qt/qtcreator/package.nix
@@ -21,10 +21,10 @@
 }:
 let
   pname = "qtcreator";
-  version = "19.0.0";
+  version = "19.0.1";
   src = fetchurl {
     url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";
-    hash = "sha256-9/ab0AdGKkYGeHwTDoNYPbRBbfYnv3d9M5RPI8rqz20=";
+    hash = "sha256-IAVmOmlQOyQETf7QdwajTETKvBn0dqwcEUTe8cSr+r4=";
   };
   goModules =
     (buildGoModule {
diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix
index da919ca9a73b..76508f722544 100644
--- a/pkgs/by-name/qt/qtractor/package.nix
+++ b/pkgs/by-name/qt/qtractor/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtractor";
-  version = "1.5.11";
+  version = "1.5.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/qtractor-${finalAttrs.version}.tar.gz";
-    hash = "sha256-wXEsMuScYl+X5bNddnfwdlJpWUtenvNyQfAj9xZDXNg=";
+    hash = "sha256-9UO7LsKa+w/q33Of9F/e5Y9z67fzWPlvLygqSK7mp4M=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qu/QuadProgpp/package.nix b/pkgs/by-name/qu/quadprogpp/package.nix
similarity index 94%
rename from pkgs/by-name/qu/QuadProgpp/package.nix
rename to pkgs/by-name/qu/quadprogpp/package.nix
index 50861e076df6..037c6665d163 100644
--- a/pkgs/by-name/qu/QuadProgpp/package.nix
+++ b/pkgs/by-name/qu/quadprogpp/package.nix
@@ -8,6 +8,8 @@
 stdenv.mkDerivation {
   pname = "quadprogpp";
   version = "1.2.2-unstable-2025-12-03";
+  __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchFromGitHub {
     owner = "liuq";
diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix
index 7b36c381be05..ea6872b643f9 100644
--- a/pkgs/by-name/qu/quantlib/package.nix
+++ b/pkgs/by-name/qu/quantlib/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quantlib";
-  version = "1.42";
+  version = "1.42.1";
 
   outputs = [
     "out"
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "lballabio";
     repo = "QuantLib";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-we+8+Te7ii0z1z9PkHkMwFuAZ6t+AYm5oc5sbme3knY=";
+    hash = "sha256-sc+CZzDNITOBSUG0ZkJEmrSLv/cr5LvLRdqD0LAfe8I=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix
index e1e2ca5491d0..6ee0f8055619 100644
--- a/pkgs/by-name/qu/questdb/package.nix
+++ b/pkgs/by-name/qu/questdb/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "questdb";
-  version = "9.3.2";
+  version = "9.3.5";
 
   src = fetchurl {
     url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
-    hash = "sha256-64ffNDBbaPoKGOeidCnqXT8NkWIq+UAOrfRkh8sSQp4=";
+    hash = "sha256-TvymN030Q9k9qPbBvrtHcOjT9KILw0tzCle1pdI7Bj8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qu/quill-qr/package.nix b/pkgs/by-name/qu/quill-qr/package.nix
index 023a7fd97404..79b0c16cb4c0 100644
--- a/pkgs/by-name/qu/quill-qr/package.nix
+++ b/pkgs/by-name/qu/quill-qr/package.nix
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   version = "0.1.0";
 
   src = fetchFromGitHub {
-    owner = "IvanMalison";
+    owner = "colonelpanic8";
     repo = "quill-qr";
     rev = "v${version}";
     sha256 = "1kdsq6csmxfvs2wy31bc9r92l5pkmzlzkyqrangvrf4pbk3sk0r6";
@@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec {
   meta = {
     description = "Print QR codes for use with https://p5deo-6aaaa-aaaab-aaaxq-cai.raw.ic0.app";
     mainProgram = "quill-qr.sh";
-    homepage = "https://github.com/IvanMalison/quill-qr";
+    homepage = "https://github.com/colonelpanic8/quill-qr";
     maintainers = with lib.maintainers; [ imalison ];
     platforms = with lib.platforms; linux;
   };
diff --git a/pkgs/by-name/qu/quint/package.nix b/pkgs/by-name/qu/quint/package.nix
index 6ecf1714b05d..d05bf63132ad 100644
--- a/pkgs/by-name/qu/quint/package.nix
+++ b/pkgs/by-name/qu/quint/package.nix
@@ -18,9 +18,9 @@
 }:
 
 let
-  version = "0.31.0";
-  apalacheVersion = "0.51.1";
-  evaluatorVersion = "0.5.0";
+  version = "0.32.0";
+  apalacheVersion = "0.56.1";
+  evaluatorVersion = "0.6.0";
 
   metaCommon = {
     description = "Formal specification language with TLA+ semantics";
@@ -34,7 +34,7 @@ let
     owner = "informalsystems";
     repo = "quint";
     tag = "v${version}";
-    hash = "sha256-d1iCkpUh5z+Gr2AbjpyfwiR4XZ6vYk96UHCeippC6iw=";
+    hash = "sha256-GTbphBmALx/gDc/iV/wtE1ovpK43VtCQoneN5AqUmvg=";
   };
 
   # Build the Quint CLI from source
@@ -44,7 +44,7 @@ let
 
     sourceRoot = "${src.name}/quint";
 
-    npmDepsHash = "sha256-UZbATCXqyAulEX+oxLEsT5VPm7y4NiCgnAwyugbzc9g=";
+    npmDepsHash = "sha256-6vKu9OTw68A92uhk1vHYDld5ixUln2tZav8pi55/l4c=";
 
     npmBuildScript = "compile";
 
@@ -90,7 +90,7 @@ let
   # Download Apalache. It runs on the JVM, so no need to build it from source.
   apalacheDist = fetchzip {
     url = "https://github.com/apalache-mc/apalache/releases/download/v${apalacheVersion}/apalache.tgz";
-    hash = "sha256-xYQQH9XxPwf3+YmjiRs7XlW49LdHrEnMeuvd16Ir0B4=";
+    hash = "sha256-2Gy+wQOUyuauiGedDNPPHatwcphll3BuL3SD4D12XMI=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix
index 6829270cafb1..37e3baeaa9f9 100644
--- a/pkgs/by-name/qw/qwen-code/package.nix
+++ b/pkgs/by-name/qw/qwen-code/package.nix
@@ -115,7 +115,6 @@ buildNpmPackage (finalAttrs: {
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
       lonerOrz
-      taranarmo
     ];
   };
 })
diff --git a/pkgs/by-name/ra/radcli/package.nix b/pkgs/by-name/ra/radcli/package.nix
index 42ec2653ec4a..67ca68c615f8 100644
--- a/pkgs/by-name/ra/radcli/package.nix
+++ b/pkgs/by-name/ra/radcli/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "radcli";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "radcli";
     repo = "radcli";
     tag = finalAttrs.version;
-    hash = "sha256-Q+rcNhYmQpEE5LYC/zvbh4RIxx2g9djuWmrSUdh00+c=";
+    hash = "sha256-bp6qwnedyutS2d97AUDCBEVyu8hAKq72zdCLvpRFuJM=";
   };
 
   postUnpack = ''
diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index 66eaea43c56c..302b6bc15c89 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "radicale";
-  version = "3.7.1";
+  version = "3.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Zwu0xRXSeHmAS9c4TCArBPcE/lMdxn/OxxnmcDvtU/Q=";
+    hash = "sha256-eZnm3mlG+HoqOXlKxv4UIdN99z04ty0qiwaJeNo3zEM=";
   };
 
   build-system = with python3.pkgs; [
@@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       defusedxml
       libpass
       vobject
-      packaging
       pika
       requests
       ldap3
diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix
index 54a86ae40314..f678e5af7ffb 100644
--- a/pkgs/by-name/ra/radicle-ci-broker/package.nix
+++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.27.0";
 
   src = fetchFromRadicle {
-    seed = "seed.radicle.xyz";
+    seed = "seed.radicle.dev";
     repo = "zwTxygwuz5LDGBq255RA2CbNGrz8";
     node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV";
     tag = "v${finalAttrs.version}";
@@ -66,8 +66,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Radicle CI broker";
-    homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8";
-    changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:zwTxygwuz5LDGBq255RA2CbNGrz8/tree/NEWS.md";
+    homepage = "https://radicle.network/nodes/seed.radicle.dev/rad:zwTxygwuz5LDGBq255RA2CbNGrz8";
+    changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:zwTxygwuz5LDGBq255RA2CbNGrz8/tree/NEWS.md";
     license = with lib.licenses; [
       mit
       asl20
diff --git a/pkgs/by-name/ra/radicle-desktop/package.nix b/pkgs/by-name/ra/radicle-desktop/package.nix
index 74f145b4b6e8..e3a861ec3a8d 100644
--- a/pkgs/by-name/ra/radicle-desktop/package.nix
+++ b/pkgs/by-name/ra/radicle-desktop/package.nix
@@ -25,13 +25,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-desktop";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromRadicle {
-    seed = "seed.radicle.xyz";
+    seed = "seed.radicle.dev";
     repo = "z4D5UCArafTzTQpDZNQRuqswh3ury";
     tag = "releases/${finalAttrs.version}";
-    hash = "sha256-ruBHhJ0JvbtXd0GonL5rNp733mulVSQJsVzkikQKCK0=";
+    hash = "sha256-Tlb2RVhFUcfJZy5/FyJuSpkRZ0ZxhLe5ynAK2y7+f1Q=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-x0u75on1Kc+u1u1R1SLLOfmTG5kFVvn2PsaWdH/RB3w=";
   };
 
-  cargoHash = "sha256-z5fnwc7EjSvkyu4zTUyAvVfs6quwH2p9VFDK/TdzZJE=";
+  cargoHash = "sha256-ojb1gT2dOhdvUHxKR51t0EKjZdgCXYxzhC0lmh87Uq0=";
 
   twemojiAssets = fetchFromGitHub {
     owner = "twitter";
@@ -125,8 +125,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Radicle desktop app";
-    homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury";
-    changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md";
+    homepage = "https://radicle.network/nodes/seed.radicle.dev/rad:z4D5UCArafTzTQpDZNQRuqswh3ury";
+    changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.radicle ];
diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix
index f11e26d9af52..b09f047dadb6 100644
--- a/pkgs/by-name/ra/radicle-explorer/package.nix
+++ b/pkgs/by-name/ra/radicle-explorer/package.nix
@@ -62,7 +62,7 @@ lib.fix (
   self:
   lib.makeOverridable (
     {
-      npmDepsHash ? "sha256-nVfFeJXSPO1GVkBkWflARZl2Geyt5ARTn0HVglnPlc0=",
+      npmDepsHash ? "sha256-8vmAs788PjdUTaQ5E8YLX0KiIPymJbH51oNaGZACe6I=",
       patches ? [ ],
     }@args:
     buildNpmPackage {
@@ -75,7 +75,7 @@ lib.fix (
       # radicle-httpd using a more limited sparse checkout we need to carry a
       # separate hash.
       src = radicle-httpd.src.override {
-        hash = "sha256-8lMUPt2eVlspMlRxUjOvjtCsd/EXg0IDSVjXxMVzbe4=";
+        hash = "sha256-cnQsPWkRChC8yPrICRoUpGW2GGLB2TK9+3v8ZRGe3x0=";
         sparseCheckout = [ ];
       };
 
@@ -108,7 +108,7 @@ lib.fix (
           server.
         '';
 
-        homepage = "https://radicle.xyz";
+        homepage = "https://radicle.dev";
         license = lib.licenses.gpl3;
 
         teams = [ lib.teams.radicle ];
diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index 852e76731b55..8bc190ee6378 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -15,22 +15,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-httpd";
-  version = "0.24.0";
+  version = "0.25.0";
 
   env.RADICLE_VERSION = finalAttrs.version;
 
   # You must update the radicle-explorer source hash when changing this.
   src = fetchFromRadicle {
-    seed = "seed.radicle.xyz";
+    seed = "seed.radicle.dev";
     repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5";
     tag = "releases/${finalAttrs.version}";
     sparseCheckout = [ "radicle-httpd" ];
-    hash = "sha256-749hFe7GJz/YUmocW5MO7uKWLTo3W4wJYSXdIURcRtg=";
+    hash = "sha256-gejNiCQ511OGGItmqXoyB+TmsUw+ozoEmOWooBXBkQ8=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/radicle-httpd";
 
-  cargoHash = "sha256-6uHukSsNnnk11tudFnNvNd+ZXmwGxMSYArsiaCaabWk=";
+  cargoHash = "sha256-Oawin/2R5dZ46pf3SarwNgILF9dXSkw02Z4gYQ4HtzE=";
 
   nativeBuildInputs = [
     asciidoctor
@@ -77,8 +77,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       A Radicle HTTP daemon exposing a JSON HTTP API that allows someone to browse local
       repositories on a Radicle node via their web browser.
     '';
-    homepage = "https://radicle.xyz";
-    changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5/tree/radicle-httpd/CHANGELOG.md";
+    homepage = "https://radicle.dev";
+    changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5/tree/radicle-httpd/CHANGELOG.md";
     # cargo.toml says MIT and asl20, LICENSE file says GPL3
     license = with lib.licenses; [
       gpl3Only
diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix
index b84a56428ee5..7df15a219455 100644
--- a/pkgs/by-name/ra/radicle-job/package.nix
+++ b/pkgs/by-name/ra/radicle-job/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.5.2";
 
   src = fetchFromRadicle {
-    seed = "seed.radicle.xyz";
+    seed = "seed.radicle.dev";
     repo = "z2UcCU1LgMshWvXj6hXSDDrwB8q8M";
     tag = "releases/v${finalAttrs.version}";
     hash = "sha256-kFlSig0eiUdw6GHwacNHtuGkuW14CkHkc3okN2ZeTns=";
@@ -32,8 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Create, update, and query Radicle Job Collaborative Objects";
-    homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M";
-    changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M/tree/CHANGELOG.md";
+    homepage = "https://radicle.network/nodes/seed.radicle.dev/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M";
+    changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M/tree/CHANGELOG.md";
     license = with lib.licenses; [
       mit
       asl20
diff --git a/pkgs/by-name/ra/radicle-native-ci/package.nix b/pkgs/by-name/ra/radicle-native-ci/package.nix
index 21d2f3b76f4f..70e6a05d22a9 100644
--- a/pkgs/by-name/ra/radicle-native-ci/package.nix
+++ b/pkgs/by-name/ra/radicle-native-ci/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.14.0";
 
   src = fetchFromRadicle {
-    seed = "seed.radicle.xyz";
+    seed = "seed.radicle.dev";
     repo = "z3qg5TKmN83afz2fj9z3fQjU8vaYE";
     node = "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV";
     tag = "v${finalAttrs.version}";
@@ -40,8 +40,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Radicle CI adapter for native CI";
-    homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE";
-    changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE/tree/NEWS.md";
+    homepage = "https://radicle.network/nodes/seed.radicle.dev/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE";
+    changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z3qg5TKmN83afz2fj9z3fQjU8vaYE/tree/NEWS.md";
     license = with lib.licenses; [
       mit
       asl20
diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 023e7fbea83e..0a149e8c4023 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-node";
 
   src = fetchFromRadicle {
-    seed = "seed.radicle.xyz";
+    seed = "seed.radicle.dev";
     repo = "z3gqcJUoA1n9HaHKufZs5FCSGazv5";
     tag = "releases/${finalAttrs.version}";
     hash = srcHash;
@@ -164,8 +164,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       Unlike centralized code hosting platforms, there is no single entity controlling the network.
       Repositories are replicated across peers in a decentralized manner, and users are in full control of their data and workflow.
     '';
-    homepage = "https://radicle.xyz";
-    changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/CHANGELOG.md";
+    homepage = "https://radicle.dev";
+    changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/CHANGELOG.md";
     license = with lib.licenses; [
       asl20
       mit
diff --git a/pkgs/by-name/ra/radicle-node/unstable.nix b/pkgs/by-name/ra/radicle-node/unstable.nix
index 29015eac64ca..6364a3a9fc5b 100644
--- a/pkgs/by-name/ra/radicle-node/unstable.nix
+++ b/pkgs/by-name/ra/radicle-node/unstable.nix
@@ -1,8 +1,8 @@
 { radicle-node }:
 
 radicle-node.override {
-  version = "1.8.0";
-  srcHash = "sha256-QjAdZO5PwJ6FuThzQYnkF+hAeArltXxhEnzIcAePwzA=";
-  cargoHash = "sha256-m8CqRTJD/1bOqTB2SoUjglZsOWGfv/nBNTOQftNvIqE=";
+  version = "1.9.0-rc.1";
+  srcHash = "sha256-CM1BdpdnAyAelrPAJjvsD7qOfHkV3EEmF4pTNOFvQik=";
+  cargoHash = "sha256-N28PQpuTcDAszWF0TPY/H5uzWfQZSuxn0XVYLeKNmn0=";
   updateScript = ./update-unstable.sh;
 }
diff --git a/pkgs/by-name/ra/radicle-tui/package.nix b/pkgs/by-name/ra/radicle-tui/package.nix
index 1e2d3564d3e1..ba24f457a295 100644
--- a/pkgs/by-name/ra/radicle-tui/package.nix
+++ b/pkgs/by-name/ra/radicle-tui/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   version = "0.7.0";
 
   src = fetchFromRadicle {
-    seed = "seed.radicle.xyz";
+    seed = "seed.radicle.dev";
     repo = "z39mP9rQAaGmERfUMPULfPUi473tY";
     tag = "releases/${finalAttrs.version}";
     hash = "sha256-2/pLlhilJyrZl9eLFWIh4YxlJwBbzjmb1Cg1xFSSl5k=";
@@ -66,8 +66,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Radicle terminal user interface";
-    homepage = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z39mP9rQAaGmERfUMPULfPUi473tY";
-    changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z39mP9rQAaGmERfUMPULfPUi473tY/tree/CHANGELOG.md";
+    homepage = "https://radicle.network/nodes/seed.radicle.dev/rad:z39mP9rQAaGmERfUMPULfPUi473tY";
+    changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z39mP9rQAaGmERfUMPULfPUi473tY/tree/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit
diff --git a/pkgs/by-name/ra/radioboat/package.nix b/pkgs/by-name/ra/radioboat/package.nix
index c66b150129e5..69b42d18d40b 100644
--- a/pkgs/by-name/ra/radioboat/package.nix
+++ b/pkgs/by-name/ra/radioboat/package.nix
@@ -2,39 +2,41 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  buildGoModule,
-  mpv,
-  makeWrapper,
   installShellFiles,
+  makeWrapper,
+  mpv,
   nix-update-script,
-  testers,
-  radioboat,
+  rustPlatform,
+  versionCheckHook,
 }:
 
-buildGoModule (finalAttrs: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radioboat";
-  version = "0.3.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "slashformotion";
     repo = "radioboat";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-4k+WK2Cxu1yBWgvEW9LMD2RGfiY7XDAe0qqph82zvlI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1fTXXT0HxGOoy+oNK1ixzgFgjapreQEOoVlQlJwqbrA=";
   };
 
-  vendorHash = "sha256-H2vo5gngXUcrem25tqz/1MhOgpNZcN+IcaQHZrGyjW8=";
+  postPatch = ''
+    substituteInPlace Cargo.toml \
+      --replace-fail 'version = "0.4.0"' 'version = "${finalAttrs.version}"'
+  '';
 
-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/slashformotion/radioboat/internal/buildinfo.Version=${finalAttrs.version}"
-  ];
+  __structuredAttrs = true;
+
+  cargoHash = "sha256-ibDOUgprr5VziIvTpvDFISGVpVH5ZyQ1ZZ5tIQirPP8=";
 
   nativeBuildInputs = [
     makeWrapper
     installShellFiles
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   preFixup = ''
     wrapProgram $out/bin/radioboat --prefix PATH ":" "${lib.makeBinPath [ mpv ]}";
   '';
@@ -46,20 +48,17 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/radioboat completion zsh)
   '';
 
-  passthru = {
-    updateScript = nix-update-script { };
-    tests.version = testers.testVersion {
-      package = radioboat;
-      command = "radioboat version";
-    };
-  };
+  passthru.updateScript = nix-update-script { };
+
+  doInstallCheck = true;
 
   meta = {
     description = "Terminal web radio client";
-    mainProgram = "radioboat";
     homepage = "https://github.com/slashformotion/radioboat";
+    changelog = "https://github.com/slashformotion/radioboat/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ zendo ];
+    mainProgram = "radioboat";
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix
index ad21c731f2c4..824ca153be96 100644
--- a/pkgs/by-name/ra/raffi/package.nix
+++ b/pkgs/by-name/ra/raffi/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "raffi";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "raffi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WAYSHQIQRd37xTpOs4EhK0V4wcBLWIRP7KvA7XjIZ0g=";
+    hash = "sha256-Vi+NbRRknyzbHVAeGrVyYrwCS+orY7A3Ya6/rrexhCE=";
   };
 
-  cargoHash = "sha256-VPgMavPK6HGKICmGgPIM1YDvsRJrdndfbetAOqMAQ0M=";
+  cargoHash = "sha256-ApyblqfR+hmIYKoSaxhL56V7ulfnTm27rOAmhu4qXug=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix
index da17b435013c..4dd1e7472c63 100644
--- a/pkgs/by-name/ra/rage/package.nix
+++ b/pkgs/by-name/ra/rage/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rage";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "str4d";
     repo = "rage";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-aZs1iqfpsiMuhxXNqRatpKD99eDBCsWHk4OPpnnaB70=";
+    hash = "sha256-uBRXdDdfKTlw006LfCrIvbng7b/fhJDHrmHDLLxdmAU=";
   };
 
-  cargoHash = "sha256-GdvqkB/jHAGUbzhOLPkIX664JJH3WrZZtv+/E/PhTR8=";
+  cargoHash = "sha256-b5x6ESGsF0Mn5dNVagBSopuawbrNcJuMK1//Ns+xuJs=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ra/rain/package.nix b/pkgs/by-name/ra/rain/package.nix
index 6dd12706f084..57b4931bd2c8 100644
--- a/pkgs/by-name/ra/rain/package.nix
+++ b/pkgs/by-name/ra/rain/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rain";
-  version = "1.24.3";
+  version = "1.24.4";
 
   src = fetchFromGitHub {
     owner = "aws-cloudformation";
     repo = "rain";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-bLFElIc4bptxnKfboBU9r1jf1K9EV8f4iPQ7+7gEj4U=";
+    sha256 = "sha256-akckpNDlv9TuDVkFLEhsx61GYNMrjBE2cM/mXmVtrCA=";
   };
 
-  vendorHash = "sha256-uFDgNoQxEQHENWj+zks0KNjb4inBx3KunJOqe78pGR8=";
+  vendorHash = "sha256-bREmqt9QDuPqhfTIIY1FBfOcNqGS8JXjlMqM99tBI9g=";
 
   subPackages = [ "cmd/rain" ];
 
diff --git a/pkgs/by-name/ra/rapidapi/package.nix b/pkgs/by-name/ra/rapidapi/package.nix
index 48f041a3d4e2..9b5bdc7c5348 100644
--- a/pkgs/by-name/ra/rapidapi/package.nix
+++ b/pkgs/by-name/ra/rapidapi/package.nix
@@ -10,17 +10,16 @@
   common-updater-scripts,
   versionCheckHook,
   writeShellScript,
-  xcbuild,
-  coreutils,
+  re-plistbuddy,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rapidapi";
-  version = "4.4.3-4004003001";
+  version = "4.5.5-4005005001";
 
   src = fetchurl {
     url = "https://cdn-builds.paw.cloud/paw/RapidAPI-${finalAttrs.version}.zip";
-    hash = "sha256-eckLVX/NnyYa2Ad1+D6RUxR6nGrRcG5HFkudhFWhII0=";
+    hash = "sha256-1UR7Lj/4fdhwYIvlWjso8tGDO+0sH8XkiysXN2i6/78=";
   };
 
   dontPatch = true;
@@ -59,8 +58,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = writeShellScript "version-check" ''
-    marketing_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1" | ${coreutils}/bin/tr -d '"')
-    build_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1")
+    marketing_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1")
+    build_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleVersion" "$1")
     echo $marketing_version-$build_version
   '';
   versionCheckProgramArg = [ "${placeholder "out"}/Applications/RapidAPI.app/Contents/Info.plist" ];
diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix
index 50018378b463..28369cea433c 100644
--- a/pkgs/by-name/ra/rapidraw/package.nix
+++ b/pkgs/by-name/ra/rapidraw/package.nix
@@ -42,20 +42,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rapidraw";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "CyberTimon";
     repo = "RapidRAW";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NYns/hpa8E4oko3qxyrJaTpgH5b+dwr0dTFw+K3IBDo=";
+    hash = "sha256-T7qBa0CEVfvc6qWxdJe0pbJAN3VNrpP9EKaX2R+PtUw=";
   };
 
-  cargoHash = "sha256-wuTbUPkPJTg6WZYrffrfPm+Asr0PuL5UAsZL+qWM4Oo=";
+  cargoHash = "sha256-kyJIHfrb3Tlm3IYQxU6N9mB9JxZWmMcBsPXHQmTwxAg=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-CBCj1R6ClnRh5Y4liKNiewRPb2lIb17TSB9eumVcKkY=";
+    hash = "sha256-1A6b63FjNvkAbu62dRXfMjTL1y2wr2gEsZkLqYvTk0w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix
index 471685c83020..b3546a9f79a4 100644
--- a/pkgs/by-name/ra/rapidyaml/package.nix
+++ b/pkgs/by-name/ra/rapidyaml/package.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rapidyaml";
-  version = "0.10.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "biojppm";
     repo = "rapidyaml";
     fetchSubmodules = true;
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r19PBS35mvAK2RoZGXaw6UU9EuEXVoUK6BV6cJnPyUs=";
+    hash = "sha256-NjpEpjBFB2Ydfo81VzOYoMPqMdJbIYcQWBRcxCbJlY4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/rar/package.nix b/pkgs/by-name/ra/rar/package.nix
index 47dd1f76aba5..26358d8c11f5 100644
--- a/pkgs/by-name/ra/rar/package.nix
+++ b/pkgs/by-name/ra/rar/package.nix
@@ -8,21 +8,21 @@
 }:
 
 let
-  version = "7.20";
+  version = "7.21";
   downloadVersion = lib.replaceStrings [ "." ] [ "" ] version;
   # Use `./update.sh` to generate the entries below
   srcs = {
     x86_64-linux = {
       url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz";
-      hash = "sha256-0+f7oycjhbHQJV7jMqHowaZ3m7Wl/51NisK+hG5JykY=";
+      hash = "sha256-wrY7+1E3SNpBu4PsNGX+yoWjlR0Clr5e40xgLZmbEkc=";
     };
     aarch64-darwin = {
       url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz";
-      hash = "sha256-4ONjyPe0jw2tVN6r0dxGKjAKt0Aibp6ywJHtvS4FvUo=";
+      hash = "sha256-jYw6ihHRvmnM0/T2L7AbuNRc3YVkReGoMJH1ebPIWec=";
     };
     x86_64-darwin = {
       url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz";
-      hash = "sha256-LhLY9kuTswcC443a5L+wY7nHOIhZn6CqyKWqmfjXZt4=";
+      hash = "sha256-gUeNcFyXjEIkcN0NqLd3ByNyoB/hW/4HrvWmYs+Bpy8=";
     };
   };
 in
diff --git a/pkgs/by-name/ra/rascal/package.nix b/pkgs/by-name/ra/rascal/package.nix
index dd16fe1e5e73..1e7ecf028f6d 100644
--- a/pkgs/by-name/ra/rascal/package.nix
+++ b/pkgs/by-name/ra/rascal/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     mkdir -p $out/bin
     makeWrapper ${jdk}/bin/java $out/bin/rascal \
-      --add-flags "-jar ${finalAttrs.src}" \
+      --add-flags "-jar ${finalAttrs.src}"
   '';
 
   meta = {
diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix
index ddee6bf15594..be212b258c60 100644
--- a/pkgs/by-name/ra/rattler-build/package.nix
+++ b/pkgs/by-name/ra/rattler-build/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rattler-build";
-  version = "0.62.2";
+  version = "0.63.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "rattler-build";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nFXtbY2gVrS7zLTcCMOJLyL79Xi7Zw463OtoGL4zUYI=";
+    hash = "sha256-/BcVqquY0ggorzY0EJx9lwAWvx1W1I/ynn8GUx32h4o=";
   };
 
-  cargoHash = "sha256-dOXCwbasxqbcInm3YeYxDOckEDrQte9NESKUjf9zslk=";
+  cargoHash = "sha256-KiHZwGigwj1ORn5TBxYWn+FUjaZBWPauknA9ewibxdQ=";
 
   doCheck = false; # test requires network access
 
diff --git a/pkgs/by-name/ra/rauthy/0001-build-svelte-files-inside-the-current-directory.patch b/pkgs/by-name/ra/rauthy/0001-build-svelte-files-inside-the-current-directory.patch
deleted file mode 100644
index d733e58a7613..000000000000
--- a/pkgs/by-name/ra/rauthy/0001-build-svelte-files-inside-the-current-directory.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js
-index 397fe4d4..3a08f7a2 100644
---- a/frontend/svelte.config.js
-+++ b/frontend/svelte.config.js
-@@ -12,8 +12,8 @@ const config = {
-         },
-         adapter: adapter({
-             fallback: null,
--            pages: '../templates/html',
--            assets: '../static/v1',
-+            pages: 'dist/templates/html',
-+            assets: 'dist/static/v1',
-             precompress: true,
-             strict: true,
-         }),
diff --git a/pkgs/by-name/ra/rauthy/package.nix b/pkgs/by-name/ra/rauthy/package.nix
index 0d154575efe4..3c21b49cad23 100644
--- a/pkgs/by-name/ra/rauthy/package.nix
+++ b/pkgs/by-name/ra/rauthy/package.nix
@@ -1,122 +1,65 @@
 {
   lib,
   fetchFromGitHub,
+  fetchNpmDeps,
   rustPlatform,
-  buildNpmPackage,
+  npmHooks,
+  nodejs,
   nix-update-script,
-  writableTmpDirAsHomeHook,
-  pkg-config,
   perl,
   wasm-pack,
-  wasm-bindgen-cli_0_2_108,
+  wasm-bindgen-cli_0_2_118,
   binaryen,
   lld,
   rust-jemalloc-sys-unprefixed,
 }:
-let
-  version = "0.34.3";
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rauthy";
+  version = "0.35.1";
 
   src = fetchFromGitHub {
     owner = "sebadob";
     repo = "rauthy";
-    tag = "v${version}";
-    hash = "sha256-ey6y/EGmz/80s0nbxsk6li9KCJV5IAtBp5QqAj7a6R0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-m9MRKBoRbHSXgK1nsxoI1laY2pDybnSaTeihKy6+1AU=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src pname version;
-    hash = "sha256-mkIHup/6aA9QDPlekhdZiXWryhetsJMxl3HAXsabACQ=";
-  };
-
-  # Wasm modules are needed to build the frontend and are part of the main Rust repo.
-  #
-  # We use rustPlatform.buildRustPackage to get the correct environment for wasm-pack.
-  # Since the "wasm-modules" crate has no binary output, cargoInstallPostBuildHook fails,
-  # so we disable the cargo install phase.
-  wasmModules = rustPlatform.buildRustPackage {
-    inherit version src cargoDeps;
-    pname = "${pname}-wasm-modules";
-
-    nativeBuildInputs = [
-      writableTmpDirAsHomeHook
-      wasm-pack
-      wasm-bindgen-cli_0_2_108
-      binaryen
-      lld
-    ];
-
-    buildPhase = ''
-      runHook preBuild
-
-      mkdir -p $out/wasm
-      cd src/wasm-modules
-
-      wasm-pack -v build --out-dir $out/wasm/spow --no-pack --out-name spow --features spow
-      wasm-pack -v build --out-dir $out/wasm/md --no-pack --out-name md --features md
-
-      runHook postBuild
-    '';
-
-    dontCargoInstall = true;
-
-    # Skip checks here; they will run in the main package.
-    doCheck = false;
-  };
-
-  frontend = buildNpmPackage {
-    inherit version src;
-    pname = "${pname}-frontend";
-
-    sourceRoot = "${src.name}/frontend";
-
-    patches = [
-      ./0001-build-svelte-files-inside-the-current-directory.patch
-    ];
-
-    patchFlags = [
-      "-p2"
-    ];
-
-    npmDepsHash = "sha256-N/tFwQNWMudFtetIKfirXDvWH3CfRwjdpBcxkXZsVig=";
-
-    preBuild = ''
-      mkdir -p ./src/wasm/
-      cp -r ${wasmModules}/wasm/* ./src/wasm/
-    '';
-  };
-in
-rustPlatform.buildRustPackage (finalAttrs: {
-  inherit
-    pname
-    version
-    src
-    cargoDeps
-    ;
-
   nativeBuildInputs = [
-    pkg-config
+    binaryen
+    lld
+    nodejs
+    npmHooks.npmConfigHook
     perl
+    wasm-bindgen-cli_0_2_118
+    wasm-pack
   ];
 
   buildInputs = [ rust-jemalloc-sys-unprefixed ];
 
+  npmRoot = "frontend";
+
+  npmDeps = fetchNpmDeps {
+    src = "${finalAttrs.src}/frontend";
+    hash = "sha256-MVfon/jKtXfgm6YBkeNx3CGloR7bzqgExUckoLMW8B4=";
+  };
+
+  cargoHash = "sha256-GHU1vCSAf3SUaqTpymQzQqX3FSVNvJtYD3Av4Dsm+Rc=";
+
   preBuild = ''
-    cp -r ${frontend}/lib/node_modules/frontend/dist/templates/html/ templates/html
-    cp -r ${frontend}/lib/node_modules/frontend/dist/static/ static
+    pushd src/wasm-modules
+    wasm-pack build -d ../../frontend/src/wasm/spow --no-pack --out-name spow --features spow
+    wasm-pack build -d ../../frontend/src/wasm/md --no-pack --out-name md --features md
+    popd
+    pushd "$npmRoot"
+    npm run build
+    popd
   '';
 
   # Tests fail and appear unmaintained upstream.
   doCheck = false;
 
   passthru = {
-    inherit frontend;
-
-    updateScript = nix-update-script {
-      extraArgs = [
-        "--subpackage=frontend"
-      ];
-    };
+    updateScript = nix-update-script { };
   };
 
   meta = {
@@ -125,7 +68,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/sebadob/rauthy";
     changelog = "https://github.com/sebadob/rauthy/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ angelodlfrtr ];
+    maintainers = with lib.maintainers; [
+      angelodlfrtr
+      ungeskriptet
+    ];
   };
 })
diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix
index ef79f2c60b6d..cc238e1e181b 100644
--- a/pkgs/by-name/rb/rbspy/package.nix
+++ b/pkgs/by-name/rb/rbspy/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rbspy";
-  version = "0.45.0";
+  version = "0.46.0";
 
   src = fetchFromGitHub {
     owner = "rbspy";
     repo = "rbspy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o4YSvPOVi+Q6Nf3PfT0ZqKnC+VQadiCkmVtb8q/os54=";
+    hash = "sha256-TC/0Y/+4rUO+cvZttgJCmDym47bRWW3TvZhJ6MFU+7U=";
   };
 
-  cargoHash = "sha256-s5MeEEGuz+kCJJ7XAKNbJHfJlqsh/oUCcXw1590CHrc=";
+  cargoHash = "sha256-dxloiguD1u/6khqeorBaozxdLnJiE7KL4/oU4uxJmIU=";
 
   doCheck = true;
 
@@ -34,14 +34,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "/usr/bin/ruby" "${lib.getExe ruby}"
   '';
 
-  checkFlags = [
-    "--skip=test_get_trace"
-    "--skip=test_get_trace_when_process_has_exited"
-    "--skip=test_sample_single_process"
-    "--skip=test_sample_single_process_with_time_limit"
-    "--skip=test_sample_subprocesses"
-  ];
-
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook;
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix b/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix
new file mode 100644
index 000000000000..b0aeb3aa66d8
--- /dev/null
+++ b/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  fetchFromCodeberg,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "re-appintentsmetadataprocessor";
+  version = "1.0.0";
+  __structuredAttrs = true;
+
+  src = fetchFromCodeberg {
+    owner = "viraptor";
+    repo = "re-appintentsmetadataprocessor";
+    tag = finalAttrs.version;
+    hash = "sha256-yZZd1j1V9hNFg1zZmXoNwDi9aueoEIqnptS+NityGlg=";
+  };
+
+  cargoHash = "sha256-mkev7O6eO2ddFoP3Gm6r+2kllnz2c9HiYADjFZXQIHo=";
+
+  meta = {
+    mainProgram = "appintentsmetadataprocessor";
+    description = "Open reimplementation of Apple's appintentsmetadataprocessor";
+    homepage = "https://codeberg.org/viraptor/re-appintentsmetadataprocessor";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ viraptor ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/re/re-derq/package.nix b/pkgs/by-name/re/re-derq/package.nix
new file mode 100644
index 000000000000..a242fd29ab18
--- /dev/null
+++ b/pkgs/by-name/re/re-derq/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  fetchFromCodeberg,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "re-derq";
+  version = "1.0.1";
+  __structuredAttrs = true;
+
+  src = fetchFromCodeberg {
+    owner = "viraptor";
+    repo = "re-derq";
+    tag = finalAttrs.version;
+    hash = "sha256-dnkxHEuFCn/QVMdTNhWtv5fh54Gald0YQCO0/LoQtCI=";
+  };
+
+  cargoHash = "sha256-KnH8jJb2rLn2LAgno+QbBg5K5NQErlvGDbhxEthwryM=";
+
+  meta = {
+    mainProgram = "derq";
+    description = "Open reimplementation of Apple's derq";
+    homepage = "https://codeberg.org/viraptor/re-derq";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ viraptor ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/re/re-intentbuilderc/package.nix b/pkgs/by-name/re/re-intentbuilderc/package.nix
new file mode 100644
index 000000000000..d6391c8f04ef
--- /dev/null
+++ b/pkgs/by-name/re/re-intentbuilderc/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  fetchFromCodeberg,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "re-intentbuilderc";
+  version = "1.0.2";
+  __structuredAttrs = true;
+
+  src = fetchFromCodeberg {
+    owner = "viraptor";
+    repo = "re-intentbuilderc";
+    tag = finalAttrs.version;
+    hash = "sha256-MucaZ+5MfwMj2nxMcKONxlVXaeHJnN1KVvP2961dQIY=";
+  };
+
+  cargoHash = "sha256-9PmIoXngNuWUXYa1f4CS5JS1yh+/9E8GBfjndIFEqTk=";
+
+  meta = {
+    mainProgram = "intentbuilderc";
+    description = "Open reimplementation of Apple's intentbuilderc";
+    homepage = "https://codeberg.com/viraptor/re-intentbuilderc";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ viraptor ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix
index f29c7db1f6ab..0fade82de49f 100644
--- a/pkgs/by-name/re/re2c/package.nix
+++ b/pkgs/by-name/re/re2c/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "re2c";
-  version = "4.4";
+  version = "4.5.1";
 
   src = fetchFromGitHub {
     owner = "skvadrik";
     repo = "re2c";
     rev = finalAttrs.version;
-    hash = "sha256-/uQOcbK63le1FsGM7RF8NDRGMk4fs2g+u3hBGX2rBv4=";
+    hash = "sha256-POdE8aKvQqfIPEIkUppZPV8t9ApT4R1AyfHXxrKvq88=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/readeck/package.nix b/pkgs/by-name/re/readeck/package.nix
index 80d53127f561..260afef3f314 100644
--- a/pkgs/by-name/re/readeck/package.nix
+++ b/pkgs/by-name/re/readeck/package.nix
@@ -6,17 +6,18 @@
   nodejs_22,
   npmHooks,
   python3,
+  nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "readeck";
-  version = "0.21.5";
+  version = "0.22.2";
 
   src = fetchFromCodeberg {
     owner = "readeck";
     repo = "readeck";
     tag = finalAttrs.version;
-    hash = "sha256-9M9Bgl1CJ35x/Onlk5xUNCFkZKW40efF6qMOM+2/HR0=";
+    hash = "sha256-0arC5t7FlW5+AyGF9FuIPc+aeF+CMKIzO1vLJ7aisQE=";
   };
 
   nativeBuildInputs = [
@@ -61,10 +62,12 @@ buildGoModule (finalAttrs: {
 
   npmDeps = fetchNpmDeps {
     src = "${finalAttrs.src}/web";
-    hash = "sha256-znUKRaUdx6GXD2YL6hs0iveaAAHQ8H9n4NHZFi331+g=";
+    hash = "sha256-80mh7fATUKf9G/JGsfHYHOLjr/je7g0uRdRGqBWapnY=";
   };
 
-  vendorHash = "sha256-2MB7v5oG/LcEKtgbFNxPXSI8TljpbqYUrI7pvu7m+e8=";
+  vendorHash = "sha256-4cLv7eYNzj+YzrinbEg7tT+JkEen+C5ypg3NTQOB6FM=";
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Web application that lets you save the readable content of web pages you want to keep forever";
diff --git a/pkgs/by-name/re/ready-check/package.nix b/pkgs/by-name/re/ready-check/package.nix
index e13907cd6364..6976c41fd93e 100644
--- a/pkgs/by-name/re/ready-check/package.nix
+++ b/pkgs/by-name/re/ready-check/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "ready-check";
-  version = "1.2.6";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sesh";
     repo = "ready";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j0UY2Q1jYGRtjvaWMwgMJrNaQZQnEJ5ST4o4PAVYWVc=";
+    hash = "sha256-QdYg2kemfZCY5RkEiry1U5eLStd10HdRpQHn7+hOL/g=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
 
   propagatedBuildInputs = with python3.pkgs; [
     beautifulsoup4
+    cryptography
     thttp
     tld
   ];
diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index 0944c3eff3e8..fc89f717fe57 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -7,12 +7,12 @@
   stdenv,
 }:
 let
-  version = "26.1.2";
+  version = "26.1.6";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-dY6orYo5t+l0xKEqnCrXiaQ/57rqJnn9RAP67EgDi98=";
+    sha256 = "sha256-XIYhSv30tNe/vS4x5lRax2n+sxy3EnuJfdg3IJHP+Ck=";
   };
 in
 buildGoModule rec {
@@ -20,7 +20,7 @@ buildGoModule rec {
   inherit doCheck src version;
   modRoot = "./src/go/rpk";
   runVend = false;
-  vendorHash = "sha256-0lxwIemmAdsnGjyF6dNc9YVPrc4VENxSYpcWRiF4KpI=";
+  vendorHash = "sha256-SiMh5Fi3uNOoKzPGEJ+sBkR/uIpci9mKONJiBG7wjtA=";
 
   ldflags = [
     ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
diff --git a/pkgs/by-name/re/refind/package.nix b/pkgs/by-name/re/refind/package.nix
index eced9eb6dcad..023bf239d5c5 100644
--- a/pkgs/by-name/re/refind/package.nix
+++ b/pkgs/by-name/re/refind/package.nix
@@ -2,7 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  gnu-efi_3,
+  fetchpatch,
+  gnu-efi,
   nixosTests,
   efibootmgr,
   openssl,
@@ -57,6 +58,16 @@ stdenv.mkDerivation (finalAttrs: {
     # Avoid leaking the build timestamp
     # https://sourceforge.net/p/refind/code/merge-requests/53/
     ./0002-preserve-dates.patch
+
+    # gnu-efi 4 compatibility
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/refind/-/raw/0.14.2-2/fix-target-option.patch";
+      hash = "sha256-8JxTlgbbgZnXxRrqbPMIBcuT5KEbwXQ8eURKZXeVLU0=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/refind/-/raw/0.14.2-2/gnu-efi-4-compat.patch";
+      hash = "sha256-F37fCfVhLJBQB8HnNYMN4lSA/+wfuRKUgkT8PBSdkOs=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -64,16 +75,16 @@ stdenv.mkDerivation (finalAttrs: {
     installShellFiles
   ];
 
-  buildInputs = [ gnu-efi_3 ];
+  buildInputs = [ gnu-efi ];
 
   hardeningDisable = [ "stackprotector" ];
 
   makeFlags = [
     "prefix="
-    "EFIINC=${gnu-efi_3}/include/efi"
-    "EFILIB=${gnu-efi_3}/lib"
-    "GNUEFILIB=${gnu-efi_3}/lib"
-    "EFICRT0=${gnu-efi_3}/lib"
+    "EFIINC=${gnu-efi}/include/efi"
+    "EFILIB=${gnu-efi}/lib"
+    "GNUEFILIB=${gnu-efi}/lib"
+    "EFICRT0=${gnu-efi}/lib"
     "HOSTARCH=${hostarch}"
     "ARCH=${hostarch}"
   ]
diff --git a/pkgs/by-name/re/reframe/package.nix b/pkgs/by-name/re/reframe/package.nix
new file mode 100644
index 000000000000..04c49bd6953d
--- /dev/null
+++ b/pkgs/by-name/re/reframe/package.nix
@@ -0,0 +1,93 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  meson,
+  ninja,
+  cmake,
+  systemd,
+  glib,
+  gtk4,
+  libdrm,
+  libepoxy,
+  libxkbcommon,
+  libvncserver,
+  neatvnc,
+  aml,
+  pixman,
+  zlib,
+  ffmpeg,
+  nix-update-script,
+
+  withNeatVNC ? true,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "reframe";
+  version = "1.15.1";
+
+  src = fetchFromGitHub {
+    owner = "AlynxZhou";
+    repo = "reframe";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3ZCLnmu5Idn4RsypJr+JNqIhT13/pq1Xi4wTidUgCqQ=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    systemd
+    glib
+    gtk4
+    libdrm
+    libepoxy
+    libxkbcommon
+    libvncserver
+  ]
+  ++ lib.optionals withNeatVNC [
+    neatvnc
+    aml
+    pixman
+    zlib
+    ffmpeg
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  mesonFlags = [
+    (lib.mesonOption "systemunitdir" "${placeholder "out"}/lib/systemd/system")
+    (lib.mesonOption "sysusersdir" "${placeholder "out"}/lib/sysusers.d")
+    (lib.mesonOption "tmpfilesdir" "${placeholder "out"}/lib/tmpfiles.d")
+  ]
+  ++ lib.optionals withNeatVNC [ (lib.mesonOption "neatvnc" "true") ];
+
+  postPatch = ''
+    chmod +x meson_post_install.sh
+    patchShebangs meson_post_install.sh
+
+    # Comment out all commands, all systemd reloading
+    sed -i '1,2! s/^/# /' meson_post_install.sh
+  '';
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  meta = {
+    homepage = "https://reframe.alynx.one/";
+    description = "DRM/KMS based remote desktop for Linux that supports Wayland/NVIDIA/headless/login…";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      bitbloxhub
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix
index c41fe92dd7c9..5099b31f616c 100644
--- a/pkgs/by-name/re/regal/package.nix
+++ b/pkgs/by-name/re/regal/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "regal";
-  version = "0.39.0";
+  version = "0.40.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "regal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AqEeHtGO51snFDZU6L4iKBy+kfs/KZRXJSmH/IO9/g0=";
+    hash = "sha256-iPbAlX/Mug4BT/Yn2h2XSpdOkkr8Mu2Th+8V005jzKs=";
   };
 
-  vendorHash = "sha256-PBDxK26GjjpeqTj4ZmHxVotEB4JCRU2Qbfo8XsisLBc=";
+  vendorHash = "sha256-I+PmSyBe/j16yH1WaPFY/Ko6YRrwzpYeNKFesTp5t+Y=";
 
   # Only build the main binary, exclude build/lsp/main.go
   subPackages = [ "." ];
diff --git a/pkgs/by-name/re/regexploit/package.nix b/pkgs/by-name/re/regexploit/package.nix
index 00afe1b51696..bed39f091464 100644
--- a/pkgs/by-name/re/regexploit/package.nix
+++ b/pkgs/by-name/re/regexploit/package.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Tool to find regular expressions which are vulnerable to ReDoS";
     homepage = "https://github.com/doyensec/regexploit";
-    changelog = "https://github.com/doyensec/regexploit/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/doyensec/regexploit/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index 3a6c7ebe1ef0..46890cf5bd07 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.25.7";
+  version = "1.26.0";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-ckigM+kXV8W5iI42SGSyFd1//e5ghqiV/b6Ja5at7Do=";
+    hash = "sha256-9SLFc2giE0AjD88OJz0z7mn9j/pN7Fd8/xWub6FDs/U=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix
index f8bf769d22a8..5d3a6ad533e9 100644
--- a/pkgs/by-name/re/renode-unstable/package.nix
+++ b/pkgs/by-name/re/renode-unstable/package.nix
@@ -14,13 +14,13 @@ let
 in
 renode.overrideAttrs (old: rec {
   pname = "renode-unstable";
-  version = "1.16.1-unstable-2026-04-20";
+  version = "1.16.1-unstable-2026-04-29";
 
   src = fetchFromGitHub {
     owner = "renode";
     repo = "renode";
-    rev = "8fd79472e778216a6bbf5e40bf79ce54a76f7a7b";
-    hash = "sha256-e05IaXImpDWxxwmmI2o6YCnZ9Tp7wtP2Y7786AeoW40=";
+    rev = "67b2b9ce5e6162e60b4b46a21e0e5b696a3cdb45";
+    hash = "sha256-MPcSEijyfC49l96G7y220eljpEdz03uv9LrDm/LXHA0=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix
index 8bf600a1dfd4..746ec655cfbc 100644
--- a/pkgs/by-name/re/renode/package.nix
+++ b/pkgs/by-name/re/renode/package.nix
@@ -170,7 +170,7 @@ buildDotnetModule rec {
       --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
       --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
       --prefix PYTHONPATH : "${pythonLibs}" \
-      --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
+      --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
   '';
 
   postFixup = ''
diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index 243247907113..c71030bc00a7 100644
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "renovate";
-  version = "43.132.1";
+  version = "43.150.1";
 
   src = fetchFromGitHub {
     owner = "renovatebot";
     repo = "renovate";
     tag = finalAttrs.version;
-    hash = "sha256-vb7MIDxc1ZnjU/sBZqe0BwFzS8jlDjmW2HYkEPOQzIM=";
+    hash = "sha256-yCkwlPf6jLM906U7BdY1h5IcaOSe6aureYIKXQk+re0=";
   };
 
   postPatch = ''
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_10;
     fetcherVersion = 2;
-    hash = "sha256-F7yity4PK3WYgq/DguJ4uz9QnOW9VRZuCgfUi2BryqQ=";
+    hash = "sha256-gDffEtUWqSWbwr4S0HZIPTvSrXDvl/q2Y5QuA+U6Ndk=";
   };
 
   env.COREPACK_ENABLE_STRICT = 0;
diff --git a/pkgs/by-name/re/renpy/distribute.patch b/pkgs/by-name/re/renpy/distribute.patch
new file mode 100644
index 000000000000..c0bceb135919
--- /dev/null
+++ b/pkgs/by-name/re/renpy/distribute.patch
@@ -0,0 +1,13 @@
+diff --git a/launcher/game/distribute.rpy b/launcher/game/distribute.rpy
+index bece65c63..831c405f8 100644
+--- a/launcher/game/distribute.rpy
++++ b/launcher/game/distribute.rpy
+@@ -863,7 +863,7 @@ fix_dlc("renios", "renios")
+                             )
+ 
+             for fn in os.listdir(directory):
+-                walk(fn, os.path.join(directory, fn))
++                walk(fn, os.path.join(directory, "renpy-dist" if fn == "renpy" else fn))
+ 
+         def merge_file_lists(self):
+             """
diff --git a/pkgs/by-name/re/renpy/dont-compile-system.patch b/pkgs/by-name/re/renpy/dont-compile-system.patch
new file mode 100644
index 000000000000..81d45adacf95
--- /dev/null
+++ b/pkgs/by-name/re/renpy/dont-compile-system.patch
@@ -0,0 +1,31 @@
+diff --git a/renpy/script.py b/renpy/script.py
+index 62e424415..7c3ae5922 100644
+--- a/renpy/script.py
++++ b/renpy/script.py
+@@ -969,6 +969,13 @@ class Script(object):
+                 f.seek(-hashlib.md5().digest_size, 2)
+                 digest = f.read(hashlib.md5().digest_size)
+ 
++        elif dir.startswith("@systemRenpy@"):
++            data, stmts = self.load_file(dir, fn + compiled)
++            lastfn = dir + "/" + fn + compiled
++            with open(lastfn, "rb") as f:
++                f.seek(-hashlib.md5().digest_size, 2)
++                digest = f.read(hashlib.md5().digest_size)
++
+         else:
+             # Otherwise, we're loading from disk. So we need to decide if
+             # we want to load the rpy or the rpyc file.
+diff --git a/launcher/game/distribute.rpy b/launcher/game/distribute.rpy
+index bece65c63..c2590bcf7 100644
+--- a/launcher/game/distribute.rpy
++++ b/launcher/game/distribute.rpy
+@@ -606,7 +606,7 @@ fix_dlc("renios", "renios")
+                 self.log.close()
+                 return
+ 
+-            if project.data['force_recompile']:
++            if project.data['force_recompile'] and False:
+                 import compileall
+ 
+                 compileall.compile_dir(
diff --git a/pkgs/by-name/re/renpy/new-project-prefix.patch b/pkgs/by-name/re/renpy/new-project-prefix.patch
new file mode 100644
index 000000000000..86d14fdf2d44
--- /dev/null
+++ b/pkgs/by-name/re/renpy/new-project-prefix.patch
@@ -0,0 +1,30 @@
+diff --git a/launcher/game/gui7/code.py b/launcher/game/gui7/code.py
+index 5c1b89f23c..c8ad04b6dd 100644
+--- a/launcher/game/gui7/code.py
++++ b/launcher/game/gui7/code.py
+@@ -243,9 +243,7 @@ def quote(s):
+ 
+         self.update_defines(replacements)
+ 
+-    def write_target(self, filename):
+-
+-        target = os.path.join(self.p.prefix, filename)
++    def write_target(self, target):
+ 
+         if os.path.exists(target):
+ 
+@@ -421,7 +419,7 @@ def generate_gui(self, fn, defines=False):
+             self.translate_comments()
+             self.add_code(fn)
+ 
+-        self.write_target(fn)
++        self.write_target(os.path.join(self.p.prefix, fn))
+ 
+     def generate_code(self, fn):
+ 
+@@ -439,4 +437,4 @@ def generate_code(self, fn):
+ 
+         self.add_code(fn)
+ 
+-        self.write_target(fn)
++        self.write_target(target)
diff --git a/pkgs/by-name/re/renpy/noSteam.patch b/pkgs/by-name/re/renpy/noSteam.patch
deleted file mode 100644
index 6322bcff3248..000000000000
--- a/pkgs/by-name/re/renpy/noSteam.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/renpy/common/00steam.rpy b/renpy/common/00steam.rpy
-index 9a5f9c405..68c8c26e0 100644
---- a/renpy/common/00steam.rpy
-+++ b/renpy/common/00steam.rpy
-@@ -1029,11 +1029,6 @@ init -1499 python in achievement:
-             steam = None
-             steamapi = None
- 
--    if renpy.windows or renpy.macintosh or renpy.linux:
--        steam_preinit()
--        steam_init()
--
--
- init 1500 python in achievement:
- 
-     # Steam position.
diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix
index b99aa9d32ce1..0d462441f26f 100644
--- a/pkgs/by-name/re/renpy/package.nix
+++ b/pkgs/by-name/re/renpy/package.nix
@@ -1,45 +1,110 @@
 {
+  lib,
+  stdenv,
   assimp,
+  copyDesktopItems,
+  desktopToDarwinBundle,
   fetchFromGitHub,
+  fetchurl,
+  fetchzip,
   ffmpeg,
   freetype,
   fribidi,
   glew,
   harfbuzz,
-  lib,
   libGL,
   libGLU,
+  libjpeg,
   libpng,
-  makeWrapper,
+  makeBinaryWrapper,
+  makeDesktopItem,
+  openssl,
   pkg-config,
   python312,
   SDL2,
-  stdenv,
+  SDL2_image,
   versionCheckHook,
-  withoutSteam ? true,
+  zenity,
   zlib,
+
+  # the minimal package contains only compiled python and cython files, and the example projects and the launcher are removed
+  # one should use the minimal package in favor of the full package when packaging games, in which case only the game runtime is needed
+  minimal ? false,
+  # with this, you can click "Documentation" in the launcher to open local doc (otherwise it opens web doc)
+  withDoc ? !minimal,
+  # set this to true if you want to use this package to distribute games
+  # (to windows, linux, and macos, outside of nix; android, ios, and web are not supported)
+  withDistributedLibs ? !minimal,
+  # set this to true if you additionally want to distribute games for aarch64-linux
+  # this implies withDistributedLibs = true because it also includes the libraries for other platforms
+  withAarch64LinuxDistributedLibs ?
+    withDistributedLibs && stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isLinux,
 }:
 
+# technically we can support cross-compilation by first compiling a renpy for the build platform besides a renpy for the host platform
+# and we can use the former to compile the rpy{,m} files but install the latter to $out
+# but let's not bother
+assert lib.assertMsg (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
+  "Ren'Py cannot be cross-compiled because it needs to run itself during the build phase.";
+
+assert lib.assertMsg (!minimal || !withDistributedLibs && !withAarch64LinuxDistributedLibs)
+  "The distributed libraries are only useful when used with the Ren'Py launcher, which is not installed for the minimal Ren'Py package.";
+
 let
-  python = python312;
+  pythonBuildTime = python312.withPackages (
+    ps:
+    with ps;
+    [
+      cython
+      setuptools
+      pkgconfig
+
+      # the runtime dependencies are also added to compile bundled rpy{,m} files in renpy source tree
+      future
+      pefile
+      requests
+      rsa
+      six
+    ]
+    ++ lib.optionals withDoc [
+      sphinx
+      sphinx-rtd-theme
+      sphinx-rtd-dark-mode
+    ]
+  );
+  pythonRunTime = python312.withPackages (
+    ps: with ps; [
+      future
+      pefile
+      requests
+      rsa
+      six
+    ]
+  );
+
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "renpy";
-  version = "8.4.1.25072401";
+  # unstable version drops dependency on insecure package ecdsa
+  version = "8.5.2.26010301-unstable-2026-03-27";
 
   src = fetchFromGitHub {
     owner = "renpy";
     repo = "renpy";
-    tag = finalAttrs.version;
-    hash = "sha256-wJnMqUrRGWcsuZWdqbiUI/BD2sSRjJKEzsCOzSngoZM=";
+    rev = "09eb6986ea9e5dbe64c9096ed48a638e593ea0ef";
+    hash = "sha256-w7tQbZCH7F0Npu8rD2UADxe/KzsTUdtIhJY6GH4YFAs=";
   };
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   nativeBuildInputs = [
-    makeWrapper
+    makeBinaryWrapper
     pkg-config
-    python.pkgs.cython
-    python.pkgs.setuptools
-  ];
+    pythonBuildTime
+  ]
+  ++ lib.optional (!minimal) copyDesktopItems
+  ++ lib.optional (stdenv.hostPlatform.isDarwin && !minimal) desktopToDarwinBundle;
 
   buildInputs = [
     assimp
@@ -50,86 +115,170 @@ stdenv.mkDerivation (finalAttrs: {
     harfbuzz
     libGL
     libGLU
-    libpng
+    libjpeg
+    openssl
     SDL2
-    zlib
-  ]
-  ++ (with python.pkgs; [
-    ecdsa
-    future
-    pefile
-    pygame-sdl2
-    python
-    requests
-    six
-    tkinter
-  ]);
-
-  env = {
-    NIX_CFLAGS_COMPILE = "-I${python.pkgs.pygame-sdl2}/include";
-
-    RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (
-      [
-        ffmpeg.lib
-        freetype
-        fribidi
-        glew.dev
-        harfbuzz.dev
-        libpng
-        SDL2
-        (lib.getDev SDL2)
-        zlib
-      ]
-      ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-        libGL
-        libGLU
-      ]
-    );
-  };
+    SDL2_image
+    pythonRunTime
+  ];
 
   enableParallelBuilding = true;
 
   patches = [
-    ./shutup-erofs-errors.patch
-  ]
-  ++ lib.optional withoutSteam ./noSteam.patch;
+    # do not try to compile renpy files installed in nix store because we already compiled them at build phase
+    ./dont-compile-system.patch
+
+    # catch error instead of crashing when trying to write steam_appid.txt to nix store
+    # https://github.com/renpy/renpy/pull/6976
+    ./steam-preinit-catch.patch
+
+    # fix write_target looking for wrong file locations when launcher creates new project
+    # https://github.com/renpy/renpy/pull/6978
+    ./new-project-prefix.patch
+
+    # the distributed libs are not compatible with renpy built from source,
+    # so patch the launcher to look for renpy files in renpy-dist (where bin distribution from upstream is copied to) instead of renpy
+    ./distribute.patch
+  ];
 
   postPatch = ''
+    # use nix out path instead of `renpy.config.renpy_base` because otherwise we cannot compile them in the build phase
+    substituteInPlace renpy/script.py --replace-fail "@systemRenpy@" "$out/share/renpy"
+
+    patchShebangs --build setup.py
+
+    # https://github.com/renpy/renpy/blob/8.5.2.26010301/tutorial/game/01director_support.rpy
     cp tutorial/game/tutorial_director.rpy{m,}
 
     cat > renpy/vc_version.py << EOF
-    version = '${finalAttrs.version}'
+    branch = 'master'
+    version = '${finalAttrs.passthru.appver}'
     official = False
     nightly = False
     # Look at https://renpy.org/latest.html for what to put.
-    version_name = "Tomorrowland"
+    version_name = "In Good Health"
     EOF
   '';
 
+  env.PYTHONDONTWRITEBYTECODE = "1";
+
   buildPhase = ''
     runHook preBuild
-    ${python.pythonOnBuildForHost.interpreter} setup.py build --parallel=$NIX_BUILD_CORES
+
+    ./setup.py build_ext --inplace -j $NIX_BUILD_CORES
+
+    # so that these files won't need to be compiled on the host platform
+    python -m compileall renpy -q -d renpy -f${lib.optionalString minimal " -b"};
+
+    ${lib.optionalString (!minimal) ''
+      # compile bundled rpy{,m} files so that they don't have to be compiled when used on the host platform
+      python renpy.py gui compile
+      python renpy.py tutorial compile
+      python renpy.py the_question compile
+    ''}
+
+    # there is no single command to compile all rpym files, so apply a temporary patch for doing that
+    patch -p1 -i ${./temp-compile-modules.patch}
+    python renpy.py . compile
+    patch -p1 -R -i ${./temp-compile-modules.patch}
+
+    ${lib.optionalString (!minimal) "rm -r {tutorial,the_question}/game/saves"}
+
+    ${lib.optionalString withDoc ''
+      # https://github.com/renpy/renpy/blob/8.5.2.26010301/sphinx/build.sh
+      pushd sphinx
+      mkdir -p source/inc
+      python ../renpy.py .
+      RENPY_NO_FIGURES=1 sphinx-build -E -a source ../doc
+      popd
+    ''}
+
     runHook postBuild
   '';
 
   installPhase = ''
     runHook preInstall
 
-    ${python.pythonOnBuildForHost.interpreter} setup.py install_lib -d $out/${python.sitePackages}
-    mkdir -p $out/share/renpy
-    cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy
+    ./setup.py install_lib -d $out/share/renpy
+    cp -ar renpy renpy.py $out/share/renpy
 
-    makeWrapper ${python.interpreter} $out/bin/renpy \
-      --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \
-      --add-flags "$out/share/renpy/renpy.py"
+    makeWrapper ${lib.getExe pythonRunTime} $out/bin/renpy --add-flags "$out/share/renpy/renpy.py" ${
+      # add zenity for file dialogs (https://github.com/renpy/renpy/blob/8.5.2.26010301/src/tinyfiledialogs/tinyfiledialogs.c#L188)
+      lib.optionalString (!minimal) "--prefix PATH : ${lib.makeBinPath [ zenity ]}"
+    }
+
+    ${lib.optionalString minimal ''
+      # delete files not necessary at runtime
+      find $out/share/renpy/renpy -type f -regextype posix-egrep -regex '.*\.(py|pyx|pyd|pxd|pyi|pxi|rpy|rpym)$' -delete
+    ''}
+
+    ${lib.optionalString (!minimal) ''
+      cp -ar sdk-fonts gui launcher the_question tutorial $out/share/renpy
+
+      # most commands (such as `distribute`) are commands of the launcher but not renpy itself
+      makeWrapper $out/bin/renpy $out/bin/renpy-launcher --add-flags "$out/share/renpy/launcher"
+
+      mkdir -p $out/share/icons/hicolor/{256x256,32x32}/apps
+      ln -s $out/share/renpy/launcher/game/images/window-icon.png $out/share/icons/hicolor/256x256/apps/renpy.png
+      ln -s $out/share/renpy/launcher/game/images/logo32.png $out/share/icons/hicolor/32x32/apps/renpy.png
+    ''}
+
+    ${lib.optionalString withDoc "cp -ar doc $out/share/renpy"}
+
+    ${lib.optionalString (finalAttrs.passthru.distributedRenpy != null) ''
+      # have to use cp instead of symlinkJoin because renpy resolves symlinks to find its base dir
+      cp -ar ${finalAttrs.passthru.distributedRenpy}/{update,lib,renpy.sh} $out/share/renpy
+      # renpy packaged from source in this nix package is not compatible with the distributed libs
+      cp -ar ${finalAttrs.passthru.distributedRenpy}/renpy $out/share/renpy/renpy-dist
+    ''}
 
     runHook postInstall
   '';
 
-  nativeInstallCheckInputs = [ versionCheckHook ];
-  doInstallCheck = true;
+  desktopItems = lib.optional (!minimal) (makeDesktopItem {
+    name = "renpy";
+    desktopName = "Ren'Py";
+    comment = finalAttrs.meta.description;
+    exec = "renpy-launcher %U";
+    icon = "renpy";
+    categories = [ "Development" ];
+  });
 
-  passthru.updateScript = ./update.sh;
+  # keep the files in $out/share/renpy/{renpy-dist,lib,renpy.sh} redistributable
+  dontStrip = true;
+  dontPatchShebangs = true;
+  dontPatchELF = true;
+  postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+    patchELF $out/share/renpy/renpy
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = false; # set to true when the version is not unstable
+
+  passthru = {
+    appver = lib.head (builtins.match "([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+).*" finalAttrs.version);
+    semver = lib.head (builtins.match "([0-9]+\\.[0-9]+\\.[0-9]+).*" finalAttrs.version);
+
+    binSrc = fetchzip {
+      url = "https://www.renpy.org/dl/${finalAttrs.passthru.semver}/renpy-${finalAttrs.passthru.semver}-sdk.tar.bz2";
+      hash = "sha256-wF6Z/lA8CyaCEZg1IqpZ4mG8CF8JgNHBf5KjKIOoKVI=";
+    };
+
+    binSrcArm = fetchzip {
+      url = "https://www.renpy.org/dl/${finalAttrs.passthru.semver}/renpy-${finalAttrs.passthru.semver}-sdkarm.tar.bz2";
+      hash = "sha256-DKXghs1XIRrtAGTifMx+7XAbxiqH7qYQiaKhBaO7PBA=";
+    };
+
+    distributedRenpy =
+      if withAarch64LinuxDistributedLibs then
+        finalAttrs.passthru.binSrcArm
+      else if withDistributedLibs then
+        finalAttrs.passthru.binSrc
+      else
+        null;
+
+    updateScript = ./update.sh;
+  };
 
   meta = {
     description = "Visual Novel Engine";
@@ -138,6 +287,16 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://renpy.org/doc/html/changelog.html";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ shadowrz ];
+    maintainers = with lib.maintainers; [
+      shadowrz
+      ulysseszhan
+    ];
+    sourceProvenance =
+      with lib.sourceTypes;
+      [ fromSource ]
+      ++ lib.optionals (finalAttrs.passthru.distributedRenpy != null) [
+        binaryNativeCode # bundled python for windows, linux, and macos in the bin distribution from upstream
+        binaryBytecode # __pycache__ in the bin distribution from upstream
+      ];
   };
 })
diff --git a/pkgs/by-name/re/renpy/shutup-erofs-errors.patch b/pkgs/by-name/re/renpy/shutup-erofs-errors.patch
deleted file mode 100644
index 9889c9f8ef85..000000000000
--- a/pkgs/by-name/re/renpy/shutup-erofs-errors.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 09e598ddf1f6af72ccb6c7c9301abff689e64f88 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
- <23130178+ShadowRZ@users.noreply.github.com>
-Date: Wed, 17 May 2023 14:32:03 +0800
-Subject: [PATCH] Don't print a backtrace on EROFS
-
-This can shut up EROFS errors caused by writing to read-only /nix/store.
----
- renpy/script.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/renpy/script.py b/renpy/script.py
-index de35457ba..b7d511560 100644
---- a/renpy/script.py
-+++ b/renpy/script.py
-@@ -705,6 +705,10 @@ class Script(object):
-                                 rpydigest = hashlib.md5(fullf.read()).digest()
- 
-                             self.write_rpyc_md5(f, rpydigest)
-+                    except OSError as e:
-+                        if e.errno != 30:
-+                            import traceback
-+                            traceback.print_exc()
-                     except Exception:
-                         import traceback
-                         traceback.print_exc()
--- 
-2.40.1
-
diff --git a/pkgs/by-name/re/renpy/steam-preinit-catch.patch b/pkgs/by-name/re/renpy/steam-preinit-catch.patch
new file mode 100644
index 000000000000..5b9b13bd761a
--- /dev/null
+++ b/pkgs/by-name/re/renpy/steam-preinit-catch.patch
@@ -0,0 +1,18 @@
+diff --git a/renpy/common/00steam.rpy b/renpy/common/00steam.rpy
+index 00581d850..ef00deee7 100644
+--- a/renpy/common/00steam.rpy
++++ b/renpy/common/00steam.rpy
+@@ -972,8 +972,11 @@ init -1499 python in achievement:
+         steam_appid_fn = os.path.join(os.path.dirname(sys.executable), "steam_appid.txt")
+ 
+         if config.steam_appid is not None:
+-            with open(steam_appid_fn, "w") as f:
+-                f.write(str(config.steam_appid) + "\n")
++            try:
++                with open(steam_appid_fn, "w") as f:
++                    f.write(str(config.steam_appid) + "\n")
++            except Exception as e:
++                renpy.write_log("Failed to write steam_appid.txt: %r", e)
+         else:
+             try:
+                 os.unlink(steam_appid_fn)
diff --git a/pkgs/by-name/re/renpy/temp-compile-modules.patch b/pkgs/by-name/re/renpy/temp-compile-modules.patch
new file mode 100644
index 000000000000..428db4ab1f44
--- /dev/null
+++ b/pkgs/by-name/re/renpy/temp-compile-modules.patch
@@ -0,0 +1,36 @@
+diff --git a/renpy/exports/__init__.py b/renpy/exports/__init__.py
+index 7265f1b32..dc0d0acc1 100644
+--- a/renpy/exports/__init__.py
++++ b/renpy/exports/__init__.py
+@@ -573,6 +573,7 @@ from renpy.exports.scriptexports import (
+     load_language,
+     load_module,
+     load_string,
++    loaded_modules,
+     munged_filename,
+ )
+ 
+diff --git a/renpy/main.py b/renpy/main.py
+index 60940a595..ed53e3072 100644
+--- a/renpy/main.py
++++ b/renpy/main.py
+@@ -423,6 +423,19 @@ def main():
+         print(time.time() - start)
+         sys.exit(0)
+ 
++    import re
++    pattern = re.compile(r"^(.*)\.rpym$")
++    for fn in renpy.exports.list_files(common=True):
++        m = pattern.match(fn)
++        if m:
++            name = m.group(1)
++            if name in renpy.exports.loaded_modules:
++                print("Module {} already loaded".format(name))
++            else:
++                print("Compiling module {}".format(name))
++                renpy.game.script.load_module(name)
++    sys.exit(0)
++
+     renpy.game.exception_info = "After loading the script."
+ 
+     # Find the save directory.
diff --git a/pkgs/by-name/re/renpy/update.sh b/pkgs/by-name/re/renpy/update.sh
index b09d1fdad4b4..7e71ac65ea80 100755
--- a/pkgs/by-name/re/renpy/update.sh
+++ b/pkgs/by-name/re/renpy/update.sh
@@ -1,11 +1,28 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash nix-update html-xml-utils
+#!nix-shell -i bash -p bash nix-update html-xml-utils curl
 
-set -ex
+set -euo pipefail
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-
-codename=`curl -L https://renpy.org/latest.html | hxclean | hxselect -c h1 small`
-sed -E -i "s/(version_name = ).*/\1$codename/" $SCRIPT_DIR/package.nix
+attr() {
+  nix-instantiate --eval -A renpy.$1 | tr -d '"'
+}
 
+old_version="$(attr version)"
 nix-update renpy
+new_version="$(attr version)"
+if [[ "$old_version" == "$new_version" ]]; then
+  exit 0
+fi
+
+nix_file="$(attr meta.position | cut -d: -f1)"
+
+codename="$(curl -L https://renpy.org/latest.html | hxclean | hxselect -c h1 small)"
+sed -E -i "s/(version_name = ).*/\1$codename/" "$nix_file"
+
+old_bin_src_hash="$(attr binSrc.hash)"
+new_bin_src_hash="$(nix-hash --type sha256 --to-sri "$(nix-prefetch-url --unpack "$(attr binSrc.url)")")"
+sed -i "s|$old_bin_src_hash|$new_bin_src_hash|" "$nix_file"
+
+old_bin_src_arm_hash="$(attr binSrcArm.hash)"
+new_bin_src_arm_hash="$(nix-hash --type sha256 --to-sri "$(nix-prefetch-url --unpack "$(attr binSrcArm.url)")")"
+sed -i "s|$old_bin_src_arm_hash|$new_bin_src_arm_hash|" "$nix_file"
diff --git a/pkgs/by-name/re/renpyMinimal/package.nix b/pkgs/by-name/re/renpyMinimal/package.nix
new file mode 100644
index 000000000000..d68b270b52f2
--- /dev/null
+++ b/pkgs/by-name/re/renpyMinimal/package.nix
@@ -0,0 +1,5 @@
+{
+  renpy,
+}:
+
+renpy.override { minimal = true; }
diff --git a/pkgs/by-name/re/repath-studio/package.nix b/pkgs/by-name/re/repath-studio/package.nix
index e0ad43c16654..a9e19ab77b1d 100644
--- a/pkgs/by-name/re/repath-studio/package.nix
+++ b/pkgs/by-name/re/repath-studio/package.nix
@@ -195,7 +195,7 @@ buildNpmPackage (finalAttrs: {
   };
 
   meta = {
-    changelog = "https://github.com/repath-studio/repath-studio/blob/v${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/repath-studio/repath-studio/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     description = "Cross-platform vector graphics editor, that combines procedural tooling with traditional design workflows";
     homepage = "https://repath.studio";
     downloadPage = "https://github.com/repath-studio/repath-studio";
diff --git a/pkgs/by-name/re/repro-env/package.nix b/pkgs/by-name/re/repro-env/package.nix
index 1790ecffc6e0..7780dcabfd1a 100644
--- a/pkgs/by-name/re/repro-env/package.nix
+++ b/pkgs/by-name/re/repro-env/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "repro-env";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = "repro-env";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ViOUS7prwLl2C2BOlwqshFks+q+xeiAD4ONdKUcDgWU=";
+    hash = "sha256-d1PGEKEUSzCnXNhu/qkzl4uHnhRFULUP7aRbIsRFWn8=";
   };
 
-  cargoHash = "sha256-0ljIt84CqcdC01YXU6J7RlvkN/nlU6Thige8TricFus=";
+  cargoHash = "sha256-HaI5oE8WVnM1h6rVaVl2qGvTndhD5cKg+Dwf707I9DA=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 15ac6bfe4504..3dd835194f7a 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -35,7 +35,10 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
-  version = "0.31.3";
+  version = "0.31.4";
+
+  __structuredAttrs = true;
+  strictDeps = true;
 
   outputs = [
     "out"
@@ -46,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "rerun-io";
     repo = "rerun";
     tag = finalAttrs.version;
-    hash = "sha256-ApGrW3E7r5lulBNB89HCP/WKBtwV7OABueQxqElF6rs=";
+    hash = "sha256-gbN9aplPw+U4liGDU7Z0x+ySfxr+RlyriEkDsIA8gHA=";
   };
 
   # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -55,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
   '';
 
-  cargoHash = "sha256-JpYKJ8LRAMTy8TPQ2tk5o9b6Z2sgTkSVwULoCO3fYSk=";
+  cargoHash = "sha256-N5JeZMbGy9FSiluE1MAtvg97dUq3ZoUZdABwORUlWlA=";
 
   cargoBuildFlags = [
     "--package"
@@ -83,19 +86,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Note that cargoBuildFeatures reference what buildFeatures is set to in stdenv.mkDerivation,
   # so that user can easily create an overlay to set cargoBuildFeatures to what he needs
   preBuild = ''
-    if [[ " $cargoBuildFeatures " == *" web_viewer "* ]]; then
-      # transform the environment variable that is a space separated list into a comma separated list
-      buildWebViewerFeatures=$(echo $buildWebViewerFeatures | tr ' ' ',')
+    if [[ " ''${cargoBuildFeatures[*]} " == *" web_viewer "* ]]; then
+      # join the bash array into a comma-separated list for cargo's --features flag
+      buildWebViewerFeaturesJoined=$(IFS=,; echo "''${buildWebViewerFeatures[*]}")
       # Create the features option only if there are features to pass
-      buildWebViewerFeaturesCargoOption=""
-      if [[ ! -z "$buildWebViewerFeatures" ]]; then
-        buildWebViewerFeaturesCargoOption="--features $buildWebViewerFeatures"
-        echo "Features passed to the web viewer build: $buildWebViewerFeatures"
+      buildWebViewerFeaturesCargoOption=()
+      if [[ -n "$buildWebViewerFeaturesJoined" ]]; then
+        buildWebViewerFeaturesCargoOption=("--features" "$buildWebViewerFeaturesJoined")
+        echo "Features passed to the web viewer build: $buildWebViewerFeaturesJoined"
       else
         echo "No features will be passed to the web viewer build"
       fi
       echo "Building the wasm web viewer for rerun's web_viewer feature"
-      cargo run -p re_dev_tools -- build-web-viewer --no-default-features $buildWebViewerFeaturesCargoOption --release -g
+      cargo run -p re_dev_tools -- build-web-viewer --no-default-features "''${buildWebViewerFeaturesCargoOption[@]}" --release -g
     else
       echo "web_viewer feature not enabled, skipping web viewer build."
     fi
@@ -159,7 +162,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     while IFS= read -r -d $'\0' path ; do
       elfHasDynamicSection "$path" || continue
-      for dep in $addDlopenRunpaths ; do
+      for dep in "''${addDlopenRunpaths[@]}" ; do
         patchelf "$path" --add-rpath "$dep"
       done
     done < <(
diff --git a/pkgs/by-name/rg/rgx/package.nix b/pkgs/by-name/rg/rgx/package.nix
index 2a4fbab3b418..9b3732a8f1f8 100644
--- a/pkgs/by-name/rg/rgx/package.nix
+++ b/pkgs/by-name/rg/rgx/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rgx";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "brevity1swos";
     repo = "rgx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JLFJGMwKQqkrVwck6gd79AzSVL0fRHJ8jo73+EEdYlA=";
+    hash = "sha256-05WEJ3gefPjBHuMXWhr135VtYnbteZapiAtNKwm4wxU=";
   };
 
-  cargoHash = "sha256-D609cDiJ+L/iGtC9dKwU5dgz4+X3//6qiFjWixBBqhg=";
+  cargoHash = "sha256-CSGuf2jOjyLBfD0Fv3G01FioiyiXX8Bx/IiCkIBWbsQ=";
 
   buildInputs = [ pcre2 ];
 
diff --git a/pkgs/by-name/rh/rhash/do-link-so.patch b/pkgs/by-name/rh/rhash/do-link-so.patch
deleted file mode 100644
index d75df2d048cd..000000000000
--- a/pkgs/by-name/rh/rhash/do-link-so.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b8c91ea6551e99e10352386cd46ea26973bb4a4d Mon Sep 17 00:00:00 2001
-From: Aleksey Kravchenko <rhash.admin@gmail.com>
-Date: Mon, 11 Sep 2023 03:49:20 +0300
-Subject: [PATCH] Fix #238: Build on Unix
-
----
- librhash/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/librhash/Makefile b/librhash/Makefile
-index e8ee862..34f1263 100644
---- a/librhash/Makefile
-+++ b/librhash/Makefile
-@@ -27,7 +27,7 @@ install-lib-static: $(LIBRHASH_STATIC)
- install-lib-shared: $(LIBRHASH_SHARED) $(EXTRA_INSTALL_LIBSHARED)
- 	$(INSTALL) -d $(SO_DIR)
- 	$(INSTALL_SHARED) $(LIBRHASH_SHARED) $(SO_DIR)/
--	test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" || ( \
-+	test "x$(LIBRHASH_SO_MAJ)" = "x$(LIBRHASH_SHARED)" || ( \
- 	  rm -f $(LIBDIR)/$(LIBRHASH_SO_MAJ) && \
- 	  ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ) )
- 
diff --git a/pkgs/by-name/rh/rhash/dont-fail-ln.patch b/pkgs/by-name/rh/rhash/dont-fail-ln.patch
deleted file mode 100644
index 7703db5feb24..000000000000
--- a/pkgs/by-name/rh/rhash/dont-fail-ln.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9ef90b958b7ae50aeeb5c269468034d73d6e2efe Mon Sep 17 00:00:00 2001
-From: Aleksey Kravchenko <rhash.admin@gmail.com>
-Date: Mon, 31 Jul 2023 02:48:15 +0300
-Subject: [PATCH] Fix #238: Build on *BSD
-
----
- configure         | 3 ++-
- librhash/Makefile | 8 ++++----
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/configure b/configure
-index dae76d5..39ef8c1 100755
---- a/configure
-+++ b/configure
-@@ -567,6 +567,7 @@ qnx()       { test "$OS_LC" = "qnx"; }
- sunos()     { test "$OS_LC" = "sunos"; }
- wine()      { test "$OS_LC" = "wine"; }
- win32()     { cygwin || mingw32 || mingw64 || msys || wine; }
-+bsd()       { dragonfly || freebsd || netbsd || openbsd ; }
- posix_make() { aix || bsdos || hpux || irix || qnx || sunos; }
- 
- #####################################################################
-@@ -713,7 +714,7 @@ if win32; then
- elif darwin; then
-   SHARED_EXT=".${RHASH_VERSION_MAJOR}.dylib"
-   SOLINK_EXT=".dylib"
--elif linux; then
-+elif linux || bsd; then
-   # use the full library version for the library file extension
-   SHARED_EXT=".so.${RHASH_VERSION}"
- fi
-diff --git a/librhash/Makefile b/librhash/Makefile
-index d48e06e..e8ee862 100644
---- a/librhash/Makefile
-+++ b/librhash/Makefile
-@@ -27,9 +27,9 @@ install-lib-static: $(LIBRHASH_STATIC)
- install-lib-shared: $(LIBRHASH_SHARED) $(EXTRA_INSTALL_LIBSHARED)
- 	$(INSTALL) -d $(SO_DIR)
- 	$(INSTALL_SHARED) $(LIBRHASH_SHARED) $(SO_DIR)/
--	test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" && \
-+	test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" || ( \
- 	  rm -f $(LIBDIR)/$(LIBRHASH_SO_MAJ) && \
--	  ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ)
-+	  ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ) )
- 
- install-implib:
- 	$(INSTALL) -d $(LIBDIR)
-@@ -175,9 +175,9 @@ $(EXPORTS_FILE): $(LIB_HEADERS)
- 	  $(LIB_HEADERS) | grep -v "$(EXPORTS_SKIP)" > $@
- 
- $(LIBRHASH_SOLINK):
--	test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" && \
-+	test "x$(LIBRHASH_SO_MAJ)" = "x$(LIBRHASH_SHARED)" || ( \
- 	  rm -f $(LIBRHASH_SO_MAJ) && \
--	  ln -s $(LIBRHASH_SHARED) $(LIBRHASH_SO_MAJ)
-+	  ln -s $(LIBRHASH_SHARED) $(LIBRHASH_SO_MAJ) )
- 	rm -f $(LIBRHASH_SOLINK)
- 	ln -s $(LIBRHASH_SO_MAJ) $(LIBRHASH_SOLINK)
- 
diff --git a/pkgs/by-name/rh/rhash/package.nix b/pkgs/by-name/rh/rhash/package.nix
index f517f6eda7c1..adb2c682ce6d 100644
--- a/pkgs/by-name/rh/rhash/package.nix
+++ b/pkgs/by-name/rh/rhash/package.nix
@@ -8,21 +8,16 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.4.4";
+  version = "1.4.6";
   pname = "rhash";
 
   src = fetchFromGitHub {
     owner = "rhash";
     repo = "RHash";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-3CW41ULdXoID4cOgrcG2j85tgIJ/sz5hU7A83qpuxf4=";
+    sha256 = "sha256-9/kFI38PG3AKsdDqEV/wEzSel9IlQQ/pvOyhU/N/aV0=";
   };
 
-  patches = [
-    ./dont-fail-ln.patch
-    ./do-link-so.patch
-  ];
-
   nativeBuildInputs = [ which ];
   buildInputs = lib.optionals stdenv.hostPlatform.isFreeBSD [ gettext ];
 
diff --git a/pkgs/by-name/ri/riemann_c_client/package.nix b/pkgs/by-name/ri/riemann_c_client/package.nix
index ec82a124948f..abc0b7308119 100644
--- a/pkgs/by-name/ri/riemann_c_client/package.nix
+++ b/pkgs/by-name/ri/riemann_c_client/package.nix
@@ -7,8 +7,6 @@
   pkg-config,
   file,
   protobufc,
-  withWolfSSL ? false,
-  wolfssl,
   withGnuTLS ? false,
   gnutls,
   withJSON ? true,
@@ -45,12 +43,10 @@ stdenv.mkDerivation (finalAttrs: {
     file
     protobufc
   ]
-  ++ lib.optional withWolfSSL wolfssl
   ++ lib.optional withGnuTLS gnutls
   ++ lib.optional withJSON json_c;
 
-  configureFlags =
-    [ ] ++ lib.optional withWolfSSL "--with-tls=wolfssl" ++ lib.optional withGnuTLS "--with-tls=gnutls";
+  configureFlags = [ ] ++ lib.optional withGnuTLS "--with-tls=gnutls";
 
   doCheck = true;
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ri/river-classic/build.zig.zon.nix b/pkgs/by-name/ri/river-classic/build.zig.zon.nix
index ea192810be72..c5738b8cc3c5 100644
--- a/pkgs/by-name/ri/river-classic/build.zig.zon.nix
+++ b/pkgs/by-name/ri/river-classic/build.zig.zon.nix
@@ -7,6 +7,14 @@
 }:
 
 linkFarm "zig-packages" [
+  {
+    name = "aro-0.0.0-JSD1Qi7QNgDnfcrdEJf82v3o6MhZySjYVrtdfEf3E4Se";
+    path = fetchgit {
+      url = "https://github.com/Vexu/arocc";
+      rev = "5f5a050569a95ecc40a426f0c3666ae7ef987ede";
+      hash = "sha256-f8Z0SXWx5Uia2TCMB5SUpcO8+xUnaWk32Oknva7xcxw=";
+    };
+  }
   {
     name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX";
     path = fetchzip {
@@ -15,17 +23,25 @@ linkFarm "zig-packages" [
     };
   }
   {
-    name = "wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27";
-    path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz";
-      hash = "sha256-ulIII5iJpM/W/VJB0HcdktEO2eb9T9J0ln2A1Z94dU4=";
+    name = "translate_c-0.0.0-Q_BUWvP1BgCjAk6PWv5286tOlvzD9-X-NkuTzh0KxY0Q";
+    path = fetchgit {
+      url = "https://codeberg.org/ziglang/translate-c/";
+      rev = "7a1a9fdc4ab00835748a6657ecbb835e3d5d45f7";
+      hash = "sha256-zdZ/it+/yNGfszHLqpXpi20Gkwm8fduMMs1/l9oaje8=";
     };
   }
   {
-    name = "wlroots-0.20.0-jmOlcmtCBADS6eoJ6mkeiSNZkibrhD-c5Qwn-LiM86r1";
+    name = "wayland-0.6.0-lQa1kqz8AQADQmdNJsNhLoNHcnEGEUjrOaPV-dtEnEmX";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.20.0.tar.gz";
-      hash = "sha256-QblQBVsDV2kSj31jqmVVi4hQUXuv8bsRgRMaCqlNxNM=";
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.6.0.tar.gz";
+      hash = "sha256-3m/ITNhZUJ/5uD/Tqm+0uZSktGoYgWF5oldOqOCUkIE=";
+    };
+  }
+  {
+    name = "wlroots-0.20.1-jmOlcqNVBAB3uB5oqBTzpRlwu-FmMyyZMVAWCe5kmcSt";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.20.1.tar.gz";
+      hash = "sha256-cfzHJ2ziiCkMyNlIo6I9o/NjaZGrsv22hq41WYwCnpk=";
     };
   }
   {
diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix
index c6fd94300ef4..74e6f2d6b834 100644
--- a/pkgs/by-name/ri/river-classic/package.nix
+++ b/pkgs/by-name/ri/river-classic/package.nix
@@ -20,23 +20,22 @@
   wlroots_0_20,
   xwayland,
   xwaylandSupport ? true,
-  zig_0_15,
+  zig_0_16,
 }:
-
 let
   wlroots = wlroots_0_20;
-  zig = zig_0_15;
+  zig = zig_0_16;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "river-classic";
-  version = "0.3.15";
+  version = "0.3.17";
 
   outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
 
   src = fetchFromCodeberg {
     owner = "river";
     repo = "river-classic";
-    hash = "sha256-zVUbLojSyCOOz3+DR9J9nQpNNuboG5/moCGjQx2ZI8w=";
+    hash = "sha256-+Geq3AetoiHB8xkMGf9nsYq8Mse2fZ5Edg1iOZ30f1A=";
     tag = "v${finalAttrs.version}";
   };
 
diff --git a/pkgs/by-name/ri/river/build.zig.zon.nix b/pkgs/by-name/ri/river/build.zig.zon.nix
index 9ba533294dc2..b032b0550ee9 100644
--- a/pkgs/by-name/ri/river/build.zig.zon.nix
+++ b/pkgs/by-name/ri/river/build.zig.zon.nix
@@ -7,6 +7,14 @@
 }:
 
 linkFarm "zig-packages" [
+  {
+    name = "aro-0.0.0-JSD1Qi7QNgDnfcrdEJf82v3o6MhZySjYVrtdfEf3E4Se";
+    path = fetchgit {
+      url = "https://github.com/Vexu/arocc";
+      rev = "5f5a050569a95ecc40a426f0c3666ae7ef987ede";
+      hash = "sha256-f8Z0SXWx5Uia2TCMB5SUpcO8+xUnaWk32Oknva7xcxw=";
+    };
+  }
   {
     name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX";
     path = fetchzip {
@@ -15,24 +23,25 @@ linkFarm "zig-packages" [
     };
   }
   {
-    name = "wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27";
-    path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz";
-      hash = "sha256-ulIII5iJpM/W/VJB0HcdktEO2eb9T9J0ln2A1Z94dU4=";
+    name = "translate_c-0.0.0-Q_BUWlX1BgCD1wo6uo97prlp9VJ4gxAjwN_vZ7nsSjGN";
+    path = fetchgit {
+      url = "https://codeberg.org/ziglang/translate-c/";
+      rev = "57c559cf581b1fcad90494eda219f98abeb155ce";
+      hash = "sha256-7OlW2f5tRc1UZySDcEQERsLGChSxIcJAiVWdvuFUvvY=";
     };
   }
   {
-    name = "wayland-0.5.0-lQa1knz8AQCh08NA8BeQrwJB9U3CfqcVAdHZYGRKIGuu";
+    name = "wayland-0.6.0-lQa1kqz8AQADQmdNJsNhLoNHcnEGEUjrOaPV-dtEnEmX";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.5.0.tar.gz";
-      hash = "sha256-mhqOtC26iACIvQUq74AbLSXSPsnWMi3AvDV7G2uElpo=";
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.6.0.tar.gz";
+      hash = "sha256-3m/ITNhZUJ/5uD/Tqm+0uZSktGoYgWF5oldOqOCUkIE=";
     };
   }
   {
-    name = "wlroots-0.20.0-jmOlcmtCBADS6eoJ6mkeiSNZkibrhD-c5Qwn-LiM86r1";
+    name = "wlroots-0.20.1-jmOlcqNVBAB3uB5oqBTzpRlwu-FmMyyZMVAWCe5kmcSt";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.20.0.tar.gz";
-      hash = "sha256-QblQBVsDV2kSj31jqmVVi4hQUXuv8bsRgRMaCqlNxNM=";
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.20.1.tar.gz";
+      hash = "sha256-cfzHJ2ziiCkMyNlIo6I9o/NjaZGrsv22hq41WYwCnpk=";
     };
   }
   {
diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix
index 66439a4bff31..7e317651dba9 100644
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@@ -18,14 +18,16 @@
   wayland-scanner,
   wlroots_0_20,
   xwayland,
-  zig_0_15,
+  zig_0_16,
   withManpages ? true,
   xwaylandSupport ? true,
 }:
-
+let
+  zig = zig_0_16;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "river";
-  version = "0.4.2";
+  version = "0.4.5";
 
   outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
 
@@ -33,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "river";
     repo = "river";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Nufonz39XphxPW1lERq2acVgE5mGmW+x1yimyS6O4tc=";
+    hash = "sha256-q4JAlr9/ex+BEgktBmFwOvZzQEAGvxXPD1QyKqyha4g=";
   };
 
   strictDeps = true;
@@ -44,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     wayland-scanner
     xwayland
-    zig_0_15
+    zig
   ]
   ++ lib.optional withManpages scdoc;
 
diff --git a/pkgs/by-name/ro/roc/package.nix b/pkgs/by-name/ro/roc/package.nix
index db7bd4492e71..7c4455e58447 100644
--- a/pkgs/by-name/ro/roc/package.nix
+++ b/pkgs/by-name/ro/roc/package.nix
@@ -99,7 +99,7 @@ rustPlatform.buildRustPackage {
     description = "Fast, friendly, functional programming language";
     mainProgram = "roc";
     homepage = "https://www.roc-lang.org/";
-    changelog = "https://github.com/roc-lang/roc/releases/tag/${rocVersion}";
+    changelog = "https://github.com/roc-lang/roc/releases/tag/alpha4-rolling";
     license = lib.licenses.upl;
     maintainers = [
       lib.maintainers.anton-4
diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix
index 9ae93a6ad5f4..8615f6cbffbd 100644
--- a/pkgs/by-name/ro/roon-server/package.nix
+++ b/pkgs/by-name/ro/roon-server/package.nix
@@ -16,7 +16,7 @@
   stdenv,
 }:
 let
-  version = "2.64.1646";
+  version = "2.65.1653";
   urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version;
 in
 stdenv.mkDerivation {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
-    hash = "sha256-tvNjz31xIo7UAB0t0seOfjiS7Qx6DPVu8VTBLK5ZjEo=";
+    hash = "sha256-t+i2s73D+N/CStIGKNZgGGRisEACxM5ug//YBBXVfpo=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix
index c110d1941458..944b8bed060a 100644
--- a/pkgs/by-name/ro/root/package.nix
+++ b/pkgs/by-name/ro/root/package.nix
@@ -38,7 +38,7 @@
   procps,
   python3,
   which,
-  xxHash,
+  xxhash,
   zlib,
   zstd,
   giflib,
@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     onetbb
     xrootd
-    xxHash
+    xxhash
     xz
     zlib
     zstd
diff --git a/pkgs/by-name/ro/route159/package.nix b/pkgs/by-name/ro/route159/package.nix
index c042aa846ef4..d9cfe49a31cc 100644
--- a/pkgs/by-name/ro/route159/package.nix
+++ b/pkgs/by-name/ro/route159/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  installFonts,
 }:
 
 let
@@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation {
     stripRoot = false;
   };
 
-  installPhase = ''
-    runHook preInstall
-
-    install -D -m444 -t $out/share/fonts/opentype $src/*.otf
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];
 
   meta = {
     homepage = "https://dotcolon.net/font/route159/";
diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix
index ec746108ffa5..947bb558fa88 100644
--- a/pkgs/by-name/ro/routedns/package.nix
+++ b/pkgs/by-name/ro/routedns/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "routedns";
-  version = "0.1.154";
+  version = "0.1.159";
 
   src = fetchFromGitHub {
     owner = "folbricht";
     repo = "routedns";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-qTI9x3Axql6BmM0D1dU1bMspB+N+4MHIeQX6WZAcs/Q=";
+    hash = "sha256-GIDB491bk/FaH/VBjPsWqZDWVA6EtJq6rx09SOdhfW0=";
   };
 
   vendorHash = "sha256-a4KcKb75yWv7+1vIYCypS9nnrFJ3zogXIPzUVVA7AXs=";
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 567ceffe0f1e..b5d5c085f865 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -18,7 +18,6 @@
   libusb1,
   zlib,
   curl,
-  wolfssl,
   python3,
   pugixml,
   protobuf_33,
@@ -50,19 +49,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rpcs3";
-  version = "0.0.39-unstable-2026-02-20";
+  version = "0.0.40-unstable-2026-04-25";
 
   src = fetchFromGitHub {
     owner = "RPCS3";
     repo = "rpcs3";
-    rev = "6bfb33279f6989f3ff9ea2dc40ef45d6aeb57ef8";
+    rev = "96f73f4497fd6fdafd40dc50f24c95c90cd4acc9";
     postCheckout = ''
       cd $out/3rdparty
       git submodule update --init \
         fusion/fusion asmjit/asmjit yaml-cpp/yaml-cpp SoundTouch/soundtouch stblib/stb \
-        feralinteractive/feralinteractive
+        feralinteractive/feralinteractive wolfssl/wolfssl
     '';
-    hash = "sha256-Cu4Zaze0FZ00sRvPtUzUkOiX5ZAHWTtmWa536gNOTNY=";
+    hash = "sha256-KTF2Oj1p+EplRgWQ/We8mqu60h161/1gniKWjVAvAso=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
@@ -82,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_SYSTEM_LIBPNG" true)
     (lib.cmakeBool "USE_SYSTEM_FFMPEG" true)
     (lib.cmakeBool "USE_SYSTEM_CURL" true)
-    (lib.cmakeBool "USE_SYSTEM_WOLFSSL" true)
     (lib.cmakeBool "USE_SYSTEM_FAUDIO" true)
     (lib.cmakeBool "USE_SYSTEM_OPENAL" true)
     (lib.cmakeBool "USE_SYSTEM_PUGIXML" true)
@@ -127,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     libusb1
     curl
-    wolfssl
     python3
     pugixml
     sdl3
@@ -168,7 +165,25 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       ilian
     ];
-    license = lib.licenses.gpl2Only;
+    license = [
+      lib.licenses.gpl2Only
+      # Vendors wolfSSL, which changed its licence from
+      # `GPL-2.0-or-later` to `GPL-3.0-or-later`, which is incompatible
+      # with RPCS3’s `GPL-2.0-only`. They have a “GPLv2 exception list”
+      # (<https://github.com/wolfSSL/wolfssl/blob/v5.9.1-stable/LICENSING>),
+      # but this is dubious; either the exception likely negates the
+      # licence change by letting you take wolfSSL out of a
+      # `GPL-2.0-only` combination and redistribute it under those
+      # terms, negating the licence change entirely, or else it doesn’t
+      # allow distribution of the combination under the `GPL-2.0-only`
+      # at all and therefore would still constitute a licence
+      # violation to redistribute.
+      #
+      # We use `lib.licenses.unfree` to represent this awkward
+      # situation and keep Hydra from building the package.
+      lib.licenses.gpl3Plus
+      lib.licenses.unfree
+    ];
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix
index 1f9b80ff2364..7817d71c6003 100644
--- a/pkgs/by-name/rq/rquickshare/package.nix
+++ b/pkgs/by-name/rq/rquickshare/package.nix
@@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec {
 
   env.OPENSSL_NO_VENDOR = 1;
 
-  passthru.updateScript = nix-update-script;
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Rust implementation of NearbyShare/QuickShare from Android for Linux and macOS";
diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix
index bbd967855152..01d3d16524f0 100644
--- a/pkgs/by-name/rs/rs-tftpd/package.nix
+++ b/pkgs/by-name/rs/rs-tftpd/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rs-tftpd";
-  version = "0.5.3";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "altugbakan";
     repo = "rs-tftpd";
     tag = finalAttrs.version;
-    hash = "sha256-Q4WeRX0rGlsyp5riy16X5WXMWmWRZABEhCPz+HAiPuo=";
+    hash = "sha256-zdchV2WKkOyHPN4N0pFFavPXv8fcGgjoRKLAUbj5Rto=";
   };
 
-  cargoHash = "sha256-VloKNrje6nmiHZmyO5IGRGIHRc/VfldgYsG5kpmrvyw=";
+  cargoHash = "sha256-I49jiMcC9ndk8GuCKJE3+qS7F6V38meUdbtrxKJNhsg=";
 
   buildFeatures = [ "client" ];
 
diff --git a/pkgs/by-name/rs/rsbkb/package.nix b/pkgs/by-name/rs/rsbkb/package.nix
index e39ee555655e..24beb2ccb9f7 100644
--- a/pkgs/by-name/rs/rsbkb/package.nix
+++ b/pkgs/by-name/rs/rsbkb/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.4";
+  version = "1.9";
 in
 rustPlatform.buildRustPackage {
   pname = "rsbkb";
@@ -16,14 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "trou";
     repo = "rsbkb";
     rev = "release-${version}";
-    hash = "sha256-c5+Q/y2tZfhXQIAs1W67/xfB+qz1Xn33tKXRGDAi3qs=";
+    hash = "sha256-zY8pvpz1Sg/dOb65MR/Z+rIFStwHsZ53OtybKGbjM+o=";
   };
 
-  cargoPatches = [
-    ./time.patch
-  ];
-
-  cargoHash = "sha256-fg8LQXqmw5GXiQe7ZVciORWI/yhKAhywolpapNpHXZY=";
+  cargoHash = "sha256-loHsF4fCefT6I0WAbUuP2wmFAdXHNuZokoBQG65ZyoA=";
 
   # Setup symlinks for all the utilities,
   # busybox style
diff --git a/pkgs/by-name/rs/rsbkb/time.patch b/pkgs/by-name/rs/rsbkb/time.patch
deleted file mode 100644
index 0ff4f3aa6a2e..000000000000
--- a/pkgs/by-name/rs/rsbkb/time.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index a23d825..183db77 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -564,9 +564,9 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
-
- [[package]]
- name = "time"
--version = "0.3.34"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
-  "deranged",
-  "itoa",
-@@ -587,9 +587,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
- [[package]]
- name = "time-macros"
--version = "0.2.17"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
-  "num-conv",
-  "time-core",
diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
index e002e13c9d62..b1a8f727b71f 100644
--- a/pkgs/by-name/rs/rspamd/package.nix
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -2,55 +2,59 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  nixosTests,
+
+  # build
   cmake,
-  doctest,
-  fmt,
-  perl,
   glib,
+  perl,
+  pkg-config,
+
+  # runtime
+  blas,
+  fmt,
+  icu,
+  jemalloc,
+  lapack,
+  libarchive,
+  libsodium,
+  lua,
   luajit,
   openssl,
   pcre,
-  pkg-config,
-  sqlite,
   ragel,
-  fasttext,
-  icu,
-  hyperscan,
+  sqlite,
   vectorscan,
-  jemalloc,
-  blas,
-  lapack,
-  lua,
-  libsodium,
-  xxHash,
+  xxhash,
   zstd,
-  libarchive,
-  # Enabling blas support breaks bayes filter training from dovecot in nixos-mailserver tests
+
+  # flags
   # https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/321
+  # Enabling blas support breaks Bayes filter training from within Sieve pipe in Dovecot
   withBlas ? false,
-  withHyperscan ? false,
-  withLuaJIT ? stdenv.hostPlatform.isx86_64,
-  withVectorscan ? true,
-  nixosTests,
+  withLuaJIT ? true,
 }:
 
-assert withHyperscan -> stdenv.hostPlatform.isx86_64;
-assert (!withHyperscan) || (!withVectorscan);
+let
+  inherit (lib)
+    cmakeFeature
+    ;
+
+  # rspamd doesn't consistently accept bools
+  cmakeBool' = feature: condition: cmakeFeature feature (if condition then "ON" else "OFF");
+in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rspamd";
-  version = "3.14.3";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
     tag = finalAttrs.version;
-    hash = "sha256-ntWBcwcPZwRRSTUO4a0JUNd6kc49fm+0/x+fqcZIA/o=";
+    hash = "sha256-8hpplpo57DnOUT1T8jcfGRyIoWySfqrOFrMgH1tept8=";
   };
 
-  patches = [
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -59,52 +63,49 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    doctest
     fmt
     glib
-    openssl
-    pcre
-    sqlite
-    ragel
-    fasttext
     icu
     jemalloc
-    libsodium
-    xxHash
-    zstd
     libarchive
+    libsodium
+    (if withLuaJIT then luajit else lua)
+    openssl
+    pcre
+    ragel
+    sqlite
+    vectorscan
+    xxhash
+    zstd
   ]
   ++ lib.optionals withBlas [
     blas
     lapack
-  ]
-  ++ lib.optional withHyperscan hyperscan
-  ++ lib.optional withLuaJIT luajit
-  ++ lib.optional (!withLuaJIT) lua
-  ++ lib.optional withVectorscan vectorscan;
+  ];
 
   cmakeFlags = [
+    (cmakeFeature "RUNDIR" "/run/rspamd")
+    (cmakeFeature "DBDIR" "/var/lib/rspamd")
+    (cmakeFeature "LOGDIR" "/var/log/rspamd")
+    (cmakeFeature "LOCAL_CONFDIR" "/etc/rspamd")
+    (cmakeBool' "ENABLE_BLAS" withBlas)
+    (cmakeBool' "ENABLE_HYPERSCAN" true)
+    (cmakeBool' "ENABLE_JEMALLOC" true)
+    (cmakeBool' "ENABLE_LUAJIT" withLuaJIT)
     # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908
-    "-DENABLE_PCRE2=OFF"
-    "-DDEBIAN_BUILD=ON"
-    "-DRUNDIR=/run/rspamd"
-    "-DDBDIR=/var/lib/rspamd"
-    "-DLOGDIR=/var/log/rspamd"
-    "-DLOCAL_CONFDIR=/etc/rspamd"
-    "-DENABLE_BLAS=${if withBlas then "ON" else "OFF"}"
-    "-DENABLE_FASTTEXT=ON"
-    "-DENABLE_JEMALLOC=ON"
-    "-DSYSTEM_DOCTEST=ON"
-    "-DSYSTEM_FMT=ON"
-    "-DSYSTEM_XXHASH=ON"
-    "-DSYSTEM_ZSTD=ON"
-    "-DENABLE_HYPERSCAN=ON"
-  ]
-  ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";
+    (cmakeBool' "ENABLE_PCRE2" false)
+    # doctest 2.5.0 compat problems https://github.com/rspamd/rspamd/issues/5994
+    (cmakeBool' "SYSTEM_DOCTEST" false)
+    (cmakeBool' "SYSTEM_XXHASH" true)
+    (cmakeBool' "SYSTEM_ZSTD" true)
+  ];
 
-  passthru.tests.rspamd = nixosTests.rspamd;
+  __structuredAttrs = true;
+
+  passthru.tests = nixosTests.rspamd;
 
   meta = {
+    changelog = "https://github.com/rspamd/rspamd/releases/tag/${finalAttrs.src.tag}";
     homepage = "https://rspamd.com";
     license = lib.licenses.asl20;
     description = "Advanced spam filtering system";
diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix
index 7d4899da7664..b14f2559691d 100644
--- a/pkgs/by-name/rs/rsshub/package.nix
+++ b/pkgs/by-name/rs/rsshub/package.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "rsshub";
-  version = "0-unstable-2026-04-03";
+  version = "0-unstable-2026-04-27";
 
   src = fetchFromGitHub {
     owner = "DIYgod";
     repo = "RSSHub";
-    rev = "de181a6cdcac0c534ecf7db5c51a5b5c2b0157e9";
-    hash = "sha256-xw80Fh2MdMrSfIKq/k44Bn67JxjubSXeM2idnX7B288=";
+    rev = "add0734e0f8c88af8e81e80f0d4ab70ad9ed920e";
+    hash = "sha256-IVVCOSXXCSsSVM1cczX3oTpd07uaJ2LAWMJxMylkRt0=";
   };
 
   patches = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 3;
-    hash = "sha256-0800u6UHIG2qc9Of74HXKo1g9GzdR1Gu/N/TRq+z/W8=";
+    hash = "sha256-zGchfq2Slr5GzeQrp+0JG+BlI/NPObJ7SJSn1I2MHQ0=";
     pnpm = pnpm_10;
   };
 
diff --git a/pkgs/by-name/rs/rstudio/dont-npm-ci.patch b/pkgs/by-name/rs/rstudio/dont-npm-ci.patch
index b0552fb4ee67..d31e05c1862c 100644
--- a/pkgs/by-name/rs/rstudio/dont-npm-ci.patch
+++ b/pkgs/by-name/rs/rstudio/dont-npm-ci.patch
@@ -1,8 +1,8 @@
 diff --git a/src/node/desktop/CMakeLists.txt b/src/node/desktop/CMakeLists.txt
-index bccf5b3..71e10a7 100644
+index 7917f0b59e..38d0023922 100644
 --- a/src/node/desktop/CMakeLists.txt
 +++ b/src/node/desktop/CMakeLists.txt
-@@ -117,11 +117,7 @@ file(MAKE_DIRECTORY "${ELECTRON_BINARY_DIR}")
+@@ -201,11 +201,7 @@ file(MAKE_DIRECTORY "${ELECTRON_BINARY_DIR}")
  file(
     COPY "${CMAKE_CURRENT_SOURCE_DIR}/"
     DESTINATION "${ELECTRON_BINARY_DIR}/"
@@ -16,13 +16,13 @@ index bccf5b3..71e10a7 100644
  configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/src/main/build-info.ts.in
 diff --git a/src/node/desktop/package.json b/src/node/desktop/package.json
-index df92166..47ca4b4 100644
+index 613361fb8a..0b186c9a76 100644
 --- a/src/node/desktop/package.json
 +++ b/src/node/desktop/package.json
-@@ -10,7 +10,7 @@
-   "scripts": {
+@@ -11,7 +11,7 @@
      "clean": "ts-node scripts/clean.ts",
      "lint": "eslint ./src ./test",
+     "typecheck": "tsc --noEmit",
 -    "package": "npm ci && electron-forge package",
 +    "package": "electron-forge package",
      "start": "electron-forge start -- --no-sandbox",
diff --git a/pkgs/by-name/rs/rstudio/dont-yarn-install.patch b/pkgs/by-name/rs/rstudio/dont-yarn-install.patch
index 72a5e1c9050b..bbb98b414e40 100644
--- a/pkgs/by-name/rs/rstudio/dont-yarn-install.patch
+++ b/pkgs/by-name/rs/rstudio/dont-yarn-install.patch
@@ -1,16 +1,18 @@
 diff --git a/src/gwt/build.xml b/src/gwt/build.xml
-index 27ffe33..4218678 100644
+index abf850ee3d..3e3d5fea57 100644
 --- a/src/gwt/build.xml
 +++ b/src/gwt/build.xml
-@@ -139,11 +139,6 @@
+@@ -267,13 +267,6 @@
        <echo message="panmirror minify: ${panmirror.minify}"/>
  
        <mkdir dir="${panmirror.build.dir}"/>
--      <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
--         <arg value="install"/>
--         <arg value="--network-timeout"/>
--         <arg value="240000"/>
--      </exec>
+-      <retry retrycount="3">
+-         <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
+-            <arg value="install"/>
+-            <arg value="--network-timeout"/>
+-            <arg value="240000"/>
+-         </exec>
+-      </retry>
        <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
           <arg value="build"/>
           <arg value="--minify"/>
diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix
index 77838da0eec0..58d2d4ebbeda 100644
--- a/pkgs/by-name/rs/rstudio/package.nix
+++ b/pkgs/by-name/rs/rstudio/package.nix
@@ -17,15 +17,16 @@
   git,
   jdk,
   makeWrapper,
-  nodejs-slim,
+  nodejs,
   npmHooks,
+  python3,
   xcbuild,
   yarn,
   yarnConfigHook,
   zip,
 
-  boost187,
-  electron_38,
+  boost190,
+  electron_39,
   fontconfig,
   gnumake,
   hunspellDicts,
@@ -44,7 +45,8 @@
 }:
 
 let
-  electron = electron_38;
+  electron = electron_39;
+  boost = boost190;
 
   mathJaxSrc = fetchzip {
     url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip";
@@ -62,8 +64,8 @@ let
     owner = "quarto-dev";
     repo = "quarto";
     # Note: rev should ideally be the last commit of the release/rstudio-[codename] branch
-    rev = "591b3520eafbb4da7b26b9f31aac6948801f19d8";
-    hash = "sha256-scdm66Ekfjp5wdNDXcVZA5ZhNgFvuf/kIBF56HrE8uM=";
+    rev = "8c1669f3095c5afee6bcd98a659d51a43300bda9";
+    hash = "sha256-01urKiFz5iDtW8r+w7zwUDXUOKZIOhi/ip329RsuQ+Q=";
   };
 
   hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts));
@@ -85,13 +87,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rstudio";
-  version = "2026.01.1+403";
+  version = "2026.04.0+526";
 
   src = fetchFromGitHub {
     owner = "rstudio";
     repo = "rstudio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s+t48LLvxdit6US6MB4DvpEZtUY6SSK5Qha1k4VW0Qk=";
+    hash = "sha256-6oHH3C3/MGFSOuI+FvyrLyOKRyy455Wkr75ZL8ZeiWg=";
   };
 
   # sources fetched into _deps via cmake's FetchContent
@@ -123,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
     dontBuild = true;
     dontFixup = true;
 
-    outputHash = "sha256-t2kWnviFMw7TdxaJpiGDXe0M5HSIGD7o5hqWiPKUdOc=";
+    outputHash = "sha256-XzSDU4GVY6OrIFG4qCWUF94nV6fcz9zyFSlSvttVrYw=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
@@ -135,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: {
     ant
     jdk
 
-    nodejs-slim
+    nodejs
     yarn
     yarnConfigHook
     zip
@@ -145,12 +147,12 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!server) [
     makeWrapper
-    (nodejs-slim.python.withPackages (ps: [ ps.setuptools ]))
+    (python3.withPackages (ps: [ ps.setuptools ]))
     npmHooks.npmConfigHook
   ];
 
   buildInputs = [
-    boost187
+    boost
     libuuid
     openssl
     R
@@ -249,7 +251,7 @@ stdenv.mkDerivation (finalAttrs: {
     name = "rstudio-${finalAttrs.version}-npm-deps";
     inherit (finalAttrs) src;
     postPatch = "cd ${finalAttrs.npmRoot}";
-    hash = "sha256-7gXLCFhan/TCTlc2okMWuWzfRYXmuwcqhmGKAqJOEM0=";
+    hash = "sha256-lO+wJk0HWYrKO1Rqz8laVpZK5RUfA9ijYvtPEtVf1r4=";
   };
 
   preConfigure = ''
@@ -285,12 +287,12 @@ stdenv.mkDerivation (finalAttrs: {
 
     # node used by cmake and node used for distribution
     # version in cmake/globals.cmake
-    RSTUDIO_NODE_VERSION="22.13.1"
-    RSTUDIO_INSTALLED_NODE_VERSION="22.21.1"
+    RSTUDIO_NODE_VERSION="22.22.2"
+    RSTUDIO_INSTALLED_NODE_VERSION="22.22.2"
 
     mkdir -p dependencies/common/node
-    ln -s ${nodejs-slim} dependencies/common/node/$RSTUDIO_NODE_VERSION
-    ln -s ${nodejs-slim} dependencies/common/node/$RSTUDIO_INSTALLED_NODE_VERSION-installed
+    ln -s ${nodejs} dependencies/common/node/$RSTUDIO_NODE_VERSION
+    ln -s ${nodejs} dependencies/common/node/$RSTUDIO_INSTALLED_NODE_VERSION-installed
 
   ''
   + lib.optionalString (!server) ''
@@ -314,7 +316,9 @@ stdenv.mkDerivation (finalAttrs: {
     rm -r electron-dist
 
     # force @electron/packager to use our electron instead of downloading it
-    substituteInPlace node_modules/@electron/packager/dist/packager.js \
+    substituteInPlace \
+      node_modules/@electron/packager/dist/packager.js \
+      node_modules/@electron-forge/core/node_modules/@electron/packager/dist/packager.js \
       --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'"
 
     # now that we patched everything, we still have to run the scripts we ignored with --ignore-scripts
diff --git a/pkgs/by-name/rt/rtk/package.nix b/pkgs/by-name/rt/rtk/package.nix
index 1c79051414da..7cbb7c0a123a 100644
--- a/pkgs/by-name/rt/rtk/package.nix
+++ b/pkgs/by-name/rt/rtk/package.nix
@@ -12,19 +12,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rtk";
-  version = "0.37.1";
+  version = "0.37.2";
 
   src = fetchFromGitHub {
     owner = "rtk-ai";
     repo = "rtk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uKf3GLabsZ094VviTXF90FohLiyXFqTV/hHlm/l+ICQ=";
+    hash = "sha256-rNuu8B5TnKZHrbVSV8HkcTeTdcol26259GGJEPEMPZY=";
   };
 
   strictDeps = true;
   __structuredAttrs = true;
 
-  cargoHash = "sha256-Vr1WKy+poeJnqjV7LvekC/jV1jolJDgxwNUp229EEWk=";
+  cargoHash = "sha256-61+PNuVF8H5+9PHc3MBt8V80ieBBi8HzSC9Gc/WUSzM=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/ru/rubberband/0001-Fix-an-error-with-libcxx-21.patch b/pkgs/by-name/ru/rubberband/0001-Fix-an-error-with-libcxx-21.patch
new file mode 100644
index 000000000000..e70f5e98ae7d
--- /dev/null
+++ b/pkgs/by-name/ru/rubberband/0001-Fix-an-error-with-libcxx-21.patch
@@ -0,0 +1,29 @@
+From 9cb3e66870ae22d87222ee7636e5b6c85c776673 Mon Sep 17 00:00:00 2001
+From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+Date: Sun, 27 Jul 2025 15:53:17 +0200
+Subject: [PATCH] missing include cstdlib
+
+Fix an error with libcxx-21
+
+>In file included from ../rubberband-4.0.0/src/common/mathmisc.cpp:24:
+>../rubberband-4.0.0/src/common/mathmisc.h:58:1:
+>error: unknown type name 'size_t'; did you mean 'std::size_t'?
+
+Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+---
+ src/common/mathmisc.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/mathmisc.h b/src/common/mathmisc.h
+index d8bcc14d..66f3378c 100644
+--- a/src/common/mathmisc.h
++++ b/src/common/mathmisc.h
+@@ -26,6 +26,8 @@
+ 
+ #include "sysutils.h"
+ 
++#include <cstdlib>
++
+ #ifndef M_PI
+ #define M_PI 3.14159265358979323846
+ #endif // M_PI
diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix
index a36259479998..eaae08daf40c 100644
--- a/pkgs/by-name/ru/rubberband/package.nix
+++ b/pkgs/by-name/ru/rubberband/package.nix
@@ -23,6 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-rwUDE+5jvBizWy4GTl3OBbJ2qvbRqiuKgs7R/i+AKOk=";
   };
 
+  patches = [
+    # Fix missing size_t definition when building with libc++ 21.
+    # Source: https://github.com/breakfastquay/rubberband/pull/126
+    ./0001-Fix-an-error-with-libcxx-21.patch
+  ];
+
   nativeBuildInputs = [
     pkg-config
     meson
diff --git a/pkgs/by-name/ru/rubik/package.nix b/pkgs/by-name/ru/rubik/package.nix
index 71b933042a9f..67ac23964f55 100644
--- a/pkgs/by-name/ru/rubik/package.nix
+++ b/pkgs/by-name/ru/rubik/package.nix
@@ -1,86 +1,29 @@
 {
-  stdenv,
+  stdenvNoCC,
   lib,
-  fetchurl,
+  fetchFromGitHub,
+  installFonts,
 }:
-let
-  # Latest commit touching the rubik tree
-  commit = "054aa9d546cd6308f8ff7139b332490e0967aebe";
-in
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "rubik";
   version = "2.200";
 
-  srcs = [
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Black.ttf";
-      sha256 = "0h4mxqz0b5as7g964bv98aanaghp4wgs2g5wnf7apxnd2fng14dn";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-BlackItalic.ttf";
-      sha256 = "0x8j3fwavkf1jf7s97ncvs0jk463v1fyajcxqxvv7lpk55sjnbpy";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Bold.ttf";
-      sha256 = "0prjqdbdpnhwr66gjw9mc1590gmjl7fir8wnanzch6arvngmxaj9";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-BoldItalic.ttf";
-      sha256 = "1zyl55fkjr61k6yfvgi0cr2iz4s0kkv3mkjpdmpla9jnk10rd8lm";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-ExtraBold.ttf";
-      sha256 = "0vi01lc2dadgmw5z26nkfzn7vl3lsd0flhqqfp40nn8jvpdkb2mq";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-ExtraBoldItalic.ttf";
-      sha256 = "0ldcszzzrc44gldflman7kcfk38x77grjb3zjvxjvgn875ggwabk";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Italic.ttf";
-      sha256 = "09x7fh6ad4w6027410vhkvisgy8vqm2mzdsc19z3szlrxi0gl0rx";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Light.ttf";
-      sha256 = "19a6k0pprcra6nxk3l0k6wkg9g0qn5h1v71rw2m8im64kyjx4qpf";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-LightItalic.ttf";
-      sha256 = "0r9hbh9xnbp0584vjiiq72583j1ai3dw93gfy823c736y6bk0j2m";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Medium.ttf";
-      sha256 = "01nky9la4qjd80dy200j8l7zl0r2h9zw90k7aghzlb5abk4i3zvf";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-MediumItalic.ttf";
-      sha256 = "1i81x9h2cr65bj85z5b2mki59532nvlbh92wb84zfhfdz97s30cq";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Regular.ttf";
-      sha256 = "1vk4n6yc4x1vlwfrp26jhagyl5l86jwa4lalccc320crrwqfc521";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-SemiBold.ttf";
-      sha256 = "0blmy1ywsf9hr1a66cl12bjn32i072w6ncvsir0s5smm2c0gksvb";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-SemiBoldItalic.ttf";
-      sha256 = "1sj22d3jrlxl6ka0naf5nby3k0i7pzadk5b8xgdhcslwijwiib3y";
-    })
+  outputs = [
+    "out"
+    "webfont"
   ];
 
-  sourceRoot = ".";
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "rubik";
+    # Latest commit touching the rubik tree
+    rev = "054aa9d546cd6308f8ff7139b332490e0967aebe";
+    hash = "sha256-AkWMLbDIect48KLEYIIx/WNQ57P1Ivp5VrJP8mdj1oE=";
+  };
 
-  unpackCmd = ''
-    ttfName=$(basename $(stripHash $curSrc))
-    cp $curSrc ./$ttfName
-  '';
+  nativeBuildInputs = [ installFonts ];
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp -a *.ttf $out/share/fonts/truetype/
-  '';
+  preInstall = "rm -r old/";
 
   meta = {
     homepage = "https://fonts.google.com/specimen/Rubik";
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 260a11e50f7f..678055dd8c80 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,7 +16,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.15.11";
+  version = "0.15.12";
 
   __structuredAttrs = true;
 
@@ -24,12 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-hFKUbgYrwiSPTqNZD7HlDaoHueZrJxbrL1g/v1WD6GA=";
+    hash = "sha256-BbWOmr1/QsexDZzXPvkAstRBBcFmO0ZRrpkpXJpEXWk=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-gj0Ks9uyRE1Z8LELHmnpElHLCdP6lf/bE5ji+7qD9aA=";
+  cargoHash = "sha256-vv1D3bu0zLuLLxNiRESScs7fQKvx1CNfMKrseRzzxtw=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 4217f00b0a57..35d9bcf850af 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -27,13 +27,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0.2.0-nightly-2026-03-29";
+  version = "0.2.0-nightly-2026-04-23";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
     tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version;
-    hash = "sha256-QJorW1H0pmaa546L0Qk0EayjegA9ObhLwbBgPOccUOM=";
+    hash = "sha256-v8o5HbwL/nMcrKcJSFfO9EHeaIeCakHgmSpQSwEOO3I=";
   };
 
   postPatch =
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
                        "OpenH264Version(${major}, ${minor}, ${patch})"
     '';
 
-  cargoHash = "sha256-WsygyqL8o+cRiHhrVj51F2hOws9wLDr/g0werSXv/i4=";
+  cargoHash = "sha256-wQ2rM0O9X7xLZsIwdMrIApdDd5nSaDFj+e1TZkSPptU=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
   env =
diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix
index 979ef2b8a274..0c8c863888b4 100644
--- a/pkgs/by-name/ru/rumdl/package.nix
+++ b/pkgs/by-name/ru/rumdl/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rumdl";
-  version = "0.1.72";
+  version = "0.1.80";
 
   src = fetchFromGitHub {
     owner = "rvben";
     repo = "rumdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/dMGfXNh/294fA4q/zn2fOAou3HC+BoTOYvQ18oYvI0=";
+    hash = "sha256-Xa5mk62VUdsZVipD1gwTK9kR5GSXEyxu02t6zcMff0E=";
   };
 
-  cargoHash = "sha256-ZfvH4KS2UXvhkfkY6pReXBPiZ3enRqLu32ScG6VZZfM=";
+  cargoHash = "sha256-zxj60PE3CpNnF/h3nTHX4yKh2QfR8TLZkl1Purc058k=";
 
   cargoBuildFlags = [
     "--bin=rumdl"
diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix
index dcaec79cc982..27e7dbd86679 100644
--- a/pkgs/by-name/ru/rune/package.nix
+++ b/pkgs/by-name/ru/rune/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchCrate,
+  versionCheckHook,
   nix-update-script,
 }:
 
@@ -21,6 +22,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     RUNE_VERSION = finalAttrs.version;
   };
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
@@ -31,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
       mit
     ];
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.progrm_jarvis ];
     mainProgram = "rune";
   };
 })
diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix
index bb8a7a76669f..8c2d06b7a4c1 100644
--- a/pkgs/by-name/ru/runme/package.nix
+++ b/pkgs/by-name/ru/runme/package.nix
@@ -13,16 +13,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "runme";
-  version = "3.16.10";
+  version = "3.16.11";
 
   src = fetchFromGitHub {
     owner = "runmedev";
     repo = "runme";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ExgzuX3g8JHWKGmUbaIOR7H1eSI97GRtSREtyqU0riU=";
+    hash = "sha256-c01mVr8JW+qghj7q5W3B1NsuH9hQUEq3hVHLT+9VM20=";
   };
 
-  vendorHash = "sha256-yS87r9zYQpJ7G/opqBNJ6EgqO7/R1jL+mxPVX71rQhc=";
+  vendorHash = "sha256-7F33MmGWIY1z2aw2mJ83XhcOrhT+olGwNmvdgGdxyME=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ru/runn/package.nix b/pkgs/by-name/ru/runn/package.nix
index 1814c1067d67..99c9ce1a04f9 100644
--- a/pkgs/by-name/ru/runn/package.nix
+++ b/pkgs/by-name/ru/runn/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "runn";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "runn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zq8clHp0j+lCAIRL5aOKp2k7Z1S52fYhf3Nsgd1h16s=";
+    hash = "sha256-/xSREjj9joTIEQ8L0FbaMOO8Auj/KaBmavRothcjx5c=";
   };
 
-  vendorHash = "sha256-XR9FulUi9V86Ic140A2pK953+Udm0btBvSIRshsqdAQ=";
+  vendorHash = "sha256-bRWESZe/9Cz+I0IX6TlZP6v6/XJ+q0c61r9RWq41tfQ=";
 
   subPackages = [ "cmd/runn" ];
 
diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix
index 477ee1e593e4..3d673c3081ec 100644
--- a/pkgs/by-name/ru/runpodctl/package.nix
+++ b/pkgs/by-name/ru/runpodctl/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "runpodctl";
-  version = "2.1.9";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "runpod";
     repo = "runpodctl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cZ8B3o0oX69qrsQpUI9qwDnRFA90cmWHpSZsvElbkMU=";
+    hash = "sha256-kv77st3dihVbIXBTjhmBl04h5HneMPo9+zMwAgnldak=";
   };
 
   vendorHash = "sha256-8Cdj5ZXmfooEh+MlaROjxVsAW6rZfPW7HNy86qnvAJA=";
diff --git a/pkgs/by-name/ru/runzip/package.nix b/pkgs/by-name/ru/runzip/package.nix
index 1beae9283ca6..5ad60868bcf0 100644
--- a/pkgs/by-name/ru/runzip/package.nix
+++ b/pkgs/by-name/ru/runzip/package.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs tests/check-runzip.sh
   '';
 
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
+
   env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error=implicit-int"
     "-Wno-error=incompatible-pointer-types"
@@ -39,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tool to convert filename encoding inside a ZIP archive";
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.raskin ];
+    # runzip vendors libzip 0.7.1.
+    knownVulnerabilities = [
+      "CVE-2015-2331"
+      "CVE-2017-14107"
+    ];
     platforms = lib.platforms.unix;
     mainProgram = "runzip";
   };
diff --git a/pkgs/by-name/ru/ruqola/package.nix b/pkgs/by-name/ru/ruqola/package.nix
index 542108baacc5..247989343f6e 100644
--- a/pkgs/by-name/ru/ruqola/package.nix
+++ b/pkgs/by-name/ru/ruqola/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ruqola";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "network";
     repo = "ruqola";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ndb20iKNaWwK5yR3mlDoBYEPj2QLHOlQVBejGKs/FMw=";
+    hash = "sha256-qw69To9NuT4pnp3OfQHcny1FSEmLXTZpeo21h5dWdSo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index bd56e6f2b8fd..dbf0e89c1f3e 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -13,15 +13,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rust-analyzer-unwrapped";
-  version = "2026-04-13";
+  version = "2026-04-27";
 
-  cargoHash = "sha256-qpe40NUQ9ux8fQmjcC63VP8g2NKoLkdqQIVfFFRTq5I=";
+  cargoHash = "sha256-QXEJhBzKof1UONW2FwQUeO6UAo1Xfm2nPpOo1uNiRM8=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = finalAttrs.version;
-    hash = "sha256-LryjOOjPsZ6Hs3RlVHla6MV8uxO2GoZolF0I/eB5zFM=";
+    hash = "sha256-f8YJfwAOsLFpIoqZuX3yF69UvMLrkx7iVzMH1pJU7cM=";
   };
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix
index 4255847c1324..4d13a8ae531c 100644
--- a/pkgs/by-name/ru/rustls-ffi/package.nix
+++ b/pkgs/by-name/ru/rustls-ffi/package.nix
@@ -15,18 +15,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rustls-ffi";
-  version = "0.15.2";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "rustls";
     repo = "rustls-ffi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OrseS6PxAGhO+mdlRrjQAZ5L5GbNekeVg+IW5VyL928=";
+    hash = "sha256-ayD9A9ZiQX3pkRJ4T+EyDsNroGuTdR2xEXcfz6D3MY8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-eNY6mpEFFJEdaJyHY8RHOerg/cDa3QbPjsNj3iZNqJ0=";
+    hash = "sha256-5FJb6cuQMT2NWQvbxip+medxcEUtSnZaKu8QR2YFKzc=";
   };
 
   propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix
index 1c0287852260..d6838f59b3c8 100644
--- a/pkgs/by-name/ru/rusty-path-of-building/package.nix
+++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix
@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rusty-path-of-building";
-  version = "0.2.15";
+  version = "0.2.16";
 
   src = fetchFromGitHub {
     owner = "meehl";
     repo = "rusty-path-of-building";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YhCJkyzWVZ1BEux85qyTHlyLS/LaotMoe+tGwwd9EOI=";
+    hash = "sha256-2pXT9Wyn49sGHDqjlmlCRUyIIAEERAKNK6cDTUwwjGM=";
   };
 
-  cargoHash = "sha256-B04Jf3G7UVwhzVY1mO6IUqb1AXpvJQs+aWggMhYPHRw=";
+  cargoHash = "sha256-VZfwk6Yf4JPkjC9XY93t1jXTJCrwwfkRFFgqNYWx8HE=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix
index 1596cf56a0aa..5684f57ac98d 100644
--- a/pkgs/by-name/ry/ryubing/package.nix
+++ b/pkgs/by-name/ry/ryubing/package.nix
@@ -135,7 +135,8 @@ buildDotnetModule rec {
 
   meta = {
     homepage = "https://ryujinx.app";
-    changelog = "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/changelog";
+    # historical changelog https://git.ryujinx.app/projects/Ryubing/wiki/Changelog
+    changelog = "https://git.ryujinx.app/projects/Ryubing/releases/tag/${src.tag}";
     description = "Experimental Nintendo Switch Emulator written in C# (community fork of Ryujinx)";
     longDescription = ''
       Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan,
diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
index f0b7e03873bd..8f55fddaa3bc 100644
--- a/pkgs/by-name/s2/s2n-tls/package.nix
+++ b/pkgs/by-name/s2/s2n-tls/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s2n-tls";
-  version = "1.6.4";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "s2n-tls";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Hnjf+NaxfXFxUvPPIBcK2larrzyQHKh/8FkBYdTexr4=";
+    hash = "sha256-oqWTcUGutEn5cOggiY1yPUlVWiHYKjnwBCCrEeWYn0A=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/s5/s5cmd/package.nix b/pkgs/by-name/s5/s5cmd/package.nix
index 28614a5a4ded..fbd0fa11d0f8 100644
--- a/pkgs/by-name/s5/s5cmd/package.nix
+++ b/pkgs/by-name/s5/s5cmd/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -17,9 +18,18 @@ buildGoModule (finalAttrs: {
 
   vendorHash = null;
 
+  ldflags = [ "-X github.com/peak/s5cmd/v2/version.Version=v${finalAttrs.version}" ];
+
   # Skip e2e tests requiring network access
   excludedPackages = [ "./e2e" ];
 
+  # Fix tests creating network sockets on macOS
+  __darwinAllowLocalNetworking = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "version" ];
+
   meta = {
     homepage = "https://github.com/peak/s5cmd";
     description = "Parallel S3 and local filesystem execution tool";
diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index 151cadf6d03c..7ddb8e312751 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.8-unstable-2026-04-17";
+  version = "11.8-unstable-2026-04-27";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "57121b5633e0b276c8f13f5abb3cde0db1229d69";
-    hash = "sha256-dbc2H5HML4q3UI9QixykvXlg7SGudMC4Grf9ASsCcG0=";
+    rev = "31e2c56a47f0616a6336acd408aeef4b7894b1ae";
+    hash = "sha256-Qcy7QfdIbwZOQIw+ZxRIQ3W4uk+fAKmiJIBI2aLIIzc=";
   };
 
   buildInputs =
diff --git a/pkgs/by-name/sa/sail/package.nix b/pkgs/by-name/sa/sail/package.nix
index c6ea659cfde6..55d521c23026 100644
--- a/pkgs/by-name/sa/sail/package.nix
+++ b/pkgs/by-name/sa/sail/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sail";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "lakehq";
     repo = "sail";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ISTZwWDQ5DjNa5TC77Xea3zuhp2sSnp/NwD3ytYbjLc=";
+    hash = "sha256-QHlfK9gTTRObFJSPQFe8tQZRa8mRIA87TFZIwJV0nWs=";
   };
 
-  cargoHash = "sha256-njc4c/xN9uWvNgOvswx1fwwynFrM9eHw4LUOFVYJ4ls=";
+  cargoHash = "sha256-XMEyfLB/O7MA1dNY40UDv4OOyMKiJwgUm93XhxDyz4k=";
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix
index b51a4872b23e..53f2ba21e419 100644
--- a/pkgs/by-name/sa/saleae-logic-2/package.nix
+++ b/pkgs/by-name/sa/saleae-logic-2/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "saleae-logic-2";
-  version = "2.4.40";
+  version = "2.4.44";
   src = fetchurl {
     url = "https://downloads2.saleae.com/logic2/Logic-${version}-linux-x64.AppImage";
-    hash = "sha256-TG7fH8b0L/O8RjlMB3QJM3/8my49uBX2RwufrVWDgpI=";
+    hash = "sha256-lJp0al4tRqXwb6I8iziCav481XNAuEjASo1ZfUWdYLU=";
   };
   desktopItem = makeDesktopItem {
     name = "saleae-logic-2";
diff --git a/pkgs/by-name/sa/samira/package.nix b/pkgs/by-name/sa/samira/package.nix
index 36fa1e194556..0585ede64ad3 100644
--- a/pkgs/by-name/sa/samira/package.nix
+++ b/pkgs/by-name/sa/samira/package.nix
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     )
   '';
 
-  passthru.updateScript = nix-update-script;
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Steam Achievement Manager for Linux";
diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix
index 6f2cb164dc1b..020242d73383 100644
--- a/pkgs/by-name/sa/saunafs/package.nix
+++ b/pkgs/by-name/sa/saunafs/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "saunafs";
-  version = "5.8.0";
+  version = "5.9.0";
 
   src = fetchFromGitHub {
     owner = "leil-io";
     repo = "saunafs";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XXv+gCjRoMrufpRKDGmwuZUTAVioZXb7mTEKlZ2SuAk=";
+    hash = "sha256-OMUW5JJziW3C9R5gsnFTGnxwmVoXRTtu4aIlXfnVdME=";
   };
 
   patches = [
diff --git a/pkgs/by-name/sa/sawfish/package.nix b/pkgs/by-name/sa/sawfish/package.nix
index 8aea5efda288..7f74e248d2f4 100644
--- a/pkgs/by-name/sa/sawfish/package.nix
+++ b/pkgs/by-name/sa/sawfish/package.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = lib.platforms.unix;
+    platforms = lib.platforms.linux;
     mainProgram = "sawfish";
   };
 })
diff --git a/pkgs/by-name/sb/sbb-tui/package.nix b/pkgs/by-name/sb/sbb-tui/package.nix
new file mode 100644
index 000000000000..b9fd6d80943d
--- /dev/null
+++ b/pkgs/by-name/sb/sbb-tui/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "sbb-tui";
+  version = "1.13.4";
+  __structuredAttrs = true;
+  src = fetchFromGitHub {
+    owner = "Necrom4";
+    repo = "sbb-tui";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JLjAhs5UbqgNYqpA3cDucrAS6ell+0JiDJNf7G33Nhs=";
+  };
+
+  vendorHash = "sha256-K4DOu3rfSlKAa5JNKCzWWpnWZlXXxtN5Po7p1Spqe1w=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${finalAttrs.version}"
+  ];
+
+  doCheck = true;
+
+  nativeCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "TUI client for Switzerland's public transport timetables, inspired by SBB/CFF/FFS app";
+    homepage = "https://github.com/Necrom4/sbb-tui";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ tomasrivera ];
+    mainProgram = "sbb-tui";
+  };
+})
diff --git a/pkgs/by-name/sb/sbom-tool/deps.json b/pkgs/by-name/sb/sbom-tool/deps.json
index 57257e248a7a..1f79ebda2204 100644
--- a/pkgs/by-name/sb/sbom-tool/deps.json
+++ b/pkgs/by-name/sb/sbom-tool/deps.json
@@ -1,43 +1,38 @@
 [
-  {
-    "pname": "CommandLineParser",
-    "version": "2.9.1",
-    "hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="
-  },
   {
     "pname": "Docker.DotNet",
     "version": "3.125.15",
     "hash": "sha256-cjSYLFkOj0BNB2ebfIl+DLQbKS9e8l1kc9heG2xiLlk="
   },
   {
-    "pname": "DotNet.Glob",
-    "version": "2.1.1",
-    "hash": "sha256-j6AbGSipxLcKSAMibc0uyUJHTa8odrgONaA4DXL4/Bo="
+    "pname": "Microsoft.Build.Framework",
+    "version": "17.5.0",
+    "hash": "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw="
   },
   {
-    "pname": "Microsoft.Bcl.Cryptography",
-    "version": "9.0.6",
-    "hash": "sha256-lfxx9rXXD8PxlUkl9109r1B+bPv/zsyzcp0Yf/iBMY0="
+    "pname": "Microsoft.Build.Utilities.Core",
+    "version": "17.5.0",
+    "hash": "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI="
   },
   {
     "pname": "Microsoft.ComponentDetection.Common",
-    "version": "6.3.0",
-    "hash": "sha256-P6AYdDTSWT7X16XSzH9YxbFESg0R8BndWMfsfLPhZ9I="
+    "version": "7.1.1",
+    "hash": "sha256-oDFZcXA7P9LT3Rum/vauBzVFEz5xecGPm3OSDF4s9d0="
   },
   {
     "pname": "Microsoft.ComponentDetection.Contracts",
-    "version": "6.3.0",
-    "hash": "sha256-30RcpyFQ0LW/TlwTux8k+O+suuf9HPemyZ2LeCy+Nrw="
+    "version": "7.1.1",
+    "hash": "sha256-9vo75rOMedYsybf6G043cK87k4q031+KUwqAMAY/Gfs="
   },
   {
     "pname": "Microsoft.ComponentDetection.Detectors",
-    "version": "6.3.0",
-    "hash": "sha256-Ztg8wQHOnJjAKYRDJfXOmrndeDjplMRGMH4hdmZZehY="
+    "version": "7.1.1",
+    "hash": "sha256-iYmgxqOVs8Ulz/mbURqyYxRrXIx8/sqv2v0Rh5lcoJc="
   },
   {
     "pname": "Microsoft.ComponentDetection.Orchestrator",
-    "version": "6.3.0",
-    "hash": "sha256-vlB4uWMIVMgaPYYkHvDRR77DCxLQbNl6M0TQiDV6ZoE="
+    "version": "7.1.1",
+    "hash": "sha256-eE/ugkbirzqfIiKGyjxHz1UdfZcQOwd7oCzvMeAOtI4="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
@@ -234,6 +229,11 @@
     "version": "8.0.0",
     "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
   },
+  {
+    "pname": "Microsoft.NET.StringTools",
+    "version": "17.5.0",
+    "hash": "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ="
+  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.0",
@@ -269,6 +269,11 @@
     "version": "4.3.0",
     "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
   },
+  {
+    "pname": "Microsoft.Win32.SystemEvents",
+    "version": "6.0.0",
+    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
+  },
   {
     "pname": "MinVer",
     "version": "6.0.0",
@@ -280,9 +285,9 @@
     "hash": "sha256-6ITnfYABvcfk7uwLxDLgcsXspI4nKuBlrFNdMATGoUI="
   },
   {
-    "pname": "NETStandard.Library",
-    "version": "1.6.1",
-    "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
+    "pname": "MSBuild.StructuredLogger",
+    "version": "2.3.113",
+    "hash": "sha256-JwOSsLlZ6+JF0hjSXoLN0FaOn5o+zux0eCxNDNX5GQo="
   },
   {
     "pname": "Newtonsoft.Json",
@@ -291,63 +296,63 @@
   },
   {
     "pname": "NuGet.Common",
-    "version": "7.0.1",
-    "hash": "sha256-7nxlUHxM99xKGZwoen5P7uoXvvG3uK5TGMD2k6/xkP0="
+    "version": "7.3.0",
+    "hash": "sha256-OFXuxz7Wp2j5H16KSEIFbD4qGmXM2FpgbAVIiMn1X3Y="
   },
   {
     "pname": "NuGet.Configuration",
-    "version": "7.0.1",
-    "hash": "sha256-dhXJNWDR43YzJntM4Xoysnq4+hHWzaiUx/MgM21wOhU="
+    "version": "7.3.0",
+    "hash": "sha256-PG6HnsHFwWPN7EhcjEHGvVz5Hyl6oIfjKucOHvo9ydA="
   },
   {
     "pname": "NuGet.DependencyResolver.Core",
-    "version": "7.0.1",
-    "hash": "sha256-C0hwFrVf1KD/edUDZxlMoCPxOF9h50ICaUUuI0z6fQg="
+    "version": "7.3.0",
+    "hash": "sha256-v6u12ndS30TbVV/t+kSZiGnb6Rn6hgli1jdggdbxAMo="
   },
   {
     "pname": "NuGet.Frameworks",
-    "version": "7.0.1",
-    "hash": "sha256-ko+dIa2uwaVTBqPsE3VYXmbW+W2rqzYssVYsA99Gogc="
+    "version": "7.3.0",
+    "hash": "sha256-soqhY2ri12BYrLanW9CmHIthptCJCeBgypj0ixUrTw8="
   },
   {
     "pname": "NuGet.LibraryModel",
-    "version": "7.0.1",
-    "hash": "sha256-x7/Va8o9dPsSV3CyGoj+JXBa30YO3E8Ico7ZCU4UYrM="
+    "version": "7.3.0",
+    "hash": "sha256-1qW00pJ9cw2KIMtfW7lyA6DTbM0bHsYzggN2RJyhQTE="
   },
   {
     "pname": "NuGet.Packaging",
-    "version": "7.0.1",
-    "hash": "sha256-nOpGQ5ZP0PLKBGAGHkagjIX4ivCdcfeTjQDcBASYRSQ="
+    "version": "7.3.0",
+    "hash": "sha256-qEdB0mh7ahPlqNY2OJvp1Tppomu+je30Hi7jXZeqFPQ="
   },
   {
     "pname": "NuGet.ProjectModel",
-    "version": "7.0.1",
-    "hash": "sha256-Yo0QJmer/Tw/PwPx6ZAjuCBzswNcUSG+PovAv/SqDe4="
+    "version": "7.3.0",
+    "hash": "sha256-pwZJ5TAFURdnZp5MHHfx+aCbGe6GrTbT49IGKqOryU8="
   },
   {
     "pname": "NuGet.Protocol",
-    "version": "7.0.1",
-    "hash": "sha256-KtTVt/d3apuUJcBS/Saz74yjh4v0BOeClkaJtx1aQnA="
+    "version": "7.3.0",
+    "hash": "sha256-E7qZI14QQdjdhjThgxNdeZV4iV37q+0/kORNRe1e9Mk="
   },
   {
     "pname": "NuGet.Versioning",
-    "version": "7.0.1",
-    "hash": "sha256-A3d7xyPaDS3tps9TkeCqJVxsPVE0Qvkz44KWSmxL9fI="
+    "version": "7.3.0",
+    "hash": "sha256-WdneR8YEcXilAhT8hA7fjJ2Eskin5KBi2MW93WdoG3c="
   },
   {
     "pname": "packageurl-dotnet",
-    "version": "1.1.0",
-    "hash": "sha256-YHHoBejZ0jjs1jofHn9uV6BGxOq16osgFVEBh5H4VA8="
+    "version": "2.0.0",
+    "hash": "sha256-W8wvDWJm6qTl39KjLKzP28vJE+zmaQTwUK9VGrM2sxc="
   },
   {
     "pname": "Polly",
-    "version": "8.6.5",
-    "hash": "sha256-2YRacrP3b3C6EBCb5Pjg6fQdGj+SgbTeaWHN/oZ1d8s="
+    "version": "8.6.6",
+    "hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps="
   },
   {
     "pname": "Polly.Core",
-    "version": "8.6.5",
-    "hash": "sha256-m12obNfMZdWQWJoCaF03H5qEbFDdp9FSdHTHcIIsACQ="
+    "version": "8.6.6",
+    "hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU="
   },
   {
     "pname": "PowerArgs",
@@ -359,11 +364,6 @@
     "version": "4.3.0",
     "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
   },
-  {
-    "pname": "runtime.any.System.Diagnostics.Tools",
-    "version": "4.3.0",
-    "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
-  },
   {
     "pname": "runtime.any.System.Diagnostics.Tracing",
     "version": "4.3.0",
@@ -389,11 +389,6 @@
     "version": "4.3.0",
     "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
   },
-  {
-    "pname": "runtime.any.System.Reflection.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
-  },
   {
     "pname": "runtime.any.System.Reflection.Primitives",
     "version": "4.3.0",
@@ -434,11 +429,6 @@
     "version": "4.3.0",
     "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
   },
-  {
-    "pname": "runtime.any.System.Threading.Timer",
-    "version": "4.3.0",
-    "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
-  },
   {
     "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.0",
@@ -474,11 +464,6 @@
     "version": "4.3.0",
     "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
   },
-  {
-    "pname": "runtime.native.System.IO.Compression",
-    "version": "4.3.0",
-    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
-  },
   {
     "pname": "runtime.native.System.Net.Http",
     "version": "4.3.0",
@@ -579,11 +564,6 @@
     "version": "4.3.0",
     "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
   },
-  {
-    "pname": "runtime.unix.System.Console",
-    "version": "4.3.1",
-    "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY="
-  },
   {
     "pname": "runtime.unix.System.Diagnostics.Debug",
     "version": "4.3.0",
@@ -599,11 +579,6 @@
     "version": "4.3.0",
     "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
   },
-  {
-    "pname": "runtime.unix.System.Net.Sockets",
-    "version": "4.3.0",
-    "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
-  },
   {
     "pname": "runtime.unix.System.Private.Uri",
     "version": "4.3.0",
@@ -626,8 +601,8 @@
   },
   {
     "pname": "Serilog",
-    "version": "4.3.0",
-    "hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw="
+    "version": "4.3.1",
+    "hash": "sha256-TY+GaQYnyDfOGl0gi67xDyUMOuV/mjz8BU66/UsmStI="
   },
   {
     "pname": "Serilog.Extensions.Hosting",
@@ -676,8 +651,8 @@
   },
   {
     "pname": "Spectre.Console.Cli.Extensions.DependencyInjection",
-    "version": "0.17.0",
-    "hash": "sha256-0y5mJ3CGW2AFqbOFs0TFkbl4mKsYi8c65HO/SkcZeLI="
+    "version": "0.23.0",
+    "hash": "sha256-L1Mju6y365I1iC66lKX7usSQWrRMiz2UnYxo9HDW5Nw="
   },
   {
     "pname": "Sprache",
@@ -694,11 +669,6 @@
     "version": "1.2.0.556",
     "hash": "sha256-aVop7a9r+X2RsZETgngBm3qQPEIiPBWgHzicGSTEymc="
   },
-  {
-    "pname": "System.AppContext",
-    "version": "4.3.0",
-    "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
-  },
   {
     "pname": "System.Buffers",
     "version": "4.3.0",
@@ -720,9 +690,14 @@
     "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
   },
   {
-    "pname": "System.Console",
-    "version": "4.3.0",
-    "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
+    "pname": "System.Collections.Immutable",
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
+  },
+  {
+    "pname": "System.Configuration.ConfigurationManager",
+    "version": "6.0.0",
+    "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="
   },
   {
     "pname": "System.Diagnostics.Debug",
@@ -744,20 +719,20 @@
     "version": "8.0.1",
     "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA="
   },
-  {
-    "pname": "System.Diagnostics.Tools",
-    "version": "4.3.0",
-    "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
-  },
   {
     "pname": "System.Diagnostics.Tracing",
     "version": "4.3.0",
     "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
   },
+  {
+    "pname": "System.Drawing.Common",
+    "version": "6.0.0",
+    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
+  },
   {
     "pname": "System.Formats.Asn1",
-    "version": "9.0.10",
-    "hash": "sha256-hPvY9hKsDEbNyyzaaMImebYTQWLWD/AOjtru+a4NsIc="
+    "version": "9.0.13",
+    "hash": "sha256-W3wM2gpIlO9+a8baWfXCd7WCLFVDT8HfeD6llOnzcGg="
   },
   {
     "pname": "System.Globalization",
@@ -779,16 +754,6 @@
     "version": "4.3.0",
     "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
   },
-  {
-    "pname": "System.IO.Compression",
-    "version": "4.3.0",
-    "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
-  },
-  {
-    "pname": "System.IO.Compression.ZipFile",
-    "version": "4.3.0",
-    "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
-  },
   {
     "pname": "System.IO.FileSystem",
     "version": "4.3.0",
@@ -806,19 +771,14 @@
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "9.0.10",
-    "hash": "sha256-Hu4g9QfEzNW71/zX0vP+Knqu6WizhSzWASy1cxANOr0="
+    "version": "9.0.13",
+    "hash": "sha256-H+gSDkfpmtJ/Ckltlw5DGoPvaYR5vL/R+rHMlQ7Qod0="
   },
   {
     "pname": "System.Linq",
     "version": "4.3.0",
     "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
   },
-  {
-    "pname": "System.Linq.Expressions",
-    "version": "4.3.0",
-    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
-  },
   {
     "pname": "System.Memory",
     "version": "4.6.3",
@@ -829,26 +789,11 @@
     "version": "4.3.4",
     "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="
   },
-  {
-    "pname": "System.Net.NameResolution",
-    "version": "4.3.0",
-    "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
-  },
   {
     "pname": "System.Net.Primitives",
     "version": "4.3.0",
     "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
   },
-  {
-    "pname": "System.Net.Sockets",
-    "version": "4.3.0",
-    "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
-  },
-  {
-    "pname": "System.ObjectModel",
-    "version": "4.3.0",
-    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
-  },
   {
     "pname": "System.Private.Uri",
     "version": "4.3.2",
@@ -864,36 +809,11 @@
     "version": "4.3.0",
     "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
   },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.3.0",
-    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
-  },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.3.0",
-    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
-  },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.3.0",
-    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
-  },
-  {
-    "pname": "System.Reflection.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
-  },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.3.0",
     "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
   },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.3.0",
-    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
-  },
   {
     "pname": "System.Resources.ResourceManager",
     "version": "4.3.0",
@@ -924,16 +844,6 @@
     "version": "4.3.0",
     "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
   },
-  {
-    "pname": "System.Runtime.InteropServices.RuntimeInformation",
-    "version": "4.3.0",
-    "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
-  },
-  {
-    "pname": "System.Runtime.Loader",
-    "version": "4.3.0",
-    "hash": "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="
-  },
   {
     "pname": "System.Runtime.Numerics",
     "version": "4.3.0",
@@ -945,9 +855,9 @@
     "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
   },
   {
-    "pname": "System.Security.Claims",
-    "version": "4.3.0",
-    "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="
+    "pname": "System.Security.AccessControl",
+    "version": "6.0.0",
+    "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
   },
   {
     "pname": "System.Security.Cryptography.Algorithms",
@@ -976,8 +886,8 @@
   },
   {
     "pname": "System.Security.Cryptography.Pkcs",
-    "version": "9.0.6",
-    "hash": "sha256-+Q7vAp+uOf/aqldFvsZuXw/0UHXtfFdNRMpqCZ1/Hwo="
+    "version": "8.0.1",
+    "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU="
   },
   {
     "pname": "System.Security.Cryptography.Primitives",
@@ -986,8 +896,13 @@
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "9.0.6",
-    "hash": "sha256-WMa3KDeFuOLyIZduYd+9PCyx7usJMRu/q2x3eOw9MAQ="
+    "version": "6.0.0",
+    "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
+  },
+  {
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "8.0.0",
+    "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="
   },
   {
     "pname": "System.Security.Cryptography.X509Certificates",
@@ -995,14 +910,9 @@
     "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
   },
   {
-    "pname": "System.Security.Principal",
-    "version": "4.3.0",
-    "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="
-  },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "4.3.0",
-    "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
+    "pname": "System.Security.Permissions",
+    "version": "6.0.0",
+    "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
   },
   {
     "pname": "System.Security.Principal.Windows",
@@ -1021,18 +931,13 @@
   },
   {
     "pname": "System.Text.Encodings.Web",
-    "version": "9.0.10",
-    "hash": "sha256-rTef4Wzfcjzx+ZToxTN6VfalIjnpU74TOCmOsIx08hY="
+    "version": "9.0.13",
+    "hash": "sha256-3WxKubF0qScHiHHr1ZKzBRNH178hELgCZKgcXlk95pM="
   },
   {
     "pname": "System.Text.Json",
-    "version": "9.0.10",
-    "hash": "sha256-wqeobpRw3PqOw21q8oGvauj5BkX1pS02Cm78E6c742w="
-  },
-  {
-    "pname": "System.Text.RegularExpressions",
-    "version": "4.3.0",
-    "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
+    "version": "9.0.13",
+    "hash": "sha256-73jwodov8axUsbDpO1XQOPHYp5M5/aU0/5oN5pjk3IQ="
   },
   {
     "pname": "System.Text.RegularExpressions",
@@ -1046,8 +951,8 @@
   },
   {
     "pname": "System.Threading.Channels",
-    "version": "9.0.10",
-    "hash": "sha256-1SSATu8rInAryjFE98mInmAfrPQ48KixeqqAjn4xp64="
+    "version": "9.0.13",
+    "hash": "sha256-TQtd01UYFG2VtsidaIKrmEyDqFwbsQ5YzMmBBSCa5k4="
   },
   {
     "pname": "System.Threading.Tasks",
@@ -1065,29 +970,14 @@
     "hash": "sha256-GrySx1F6Ah6tfnnQt/PHC+dbzg+sfP47OOFX0yJF/xo="
   },
   {
-    "pname": "System.Threading.ThreadPool",
-    "version": "4.3.0",
-    "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
-  },
-  {
-    "pname": "System.Threading.Timer",
-    "version": "4.3.0",
-    "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
-  },
-  {
-    "pname": "System.Xml.ReaderWriter",
-    "version": "4.3.0",
-    "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
-  },
-  {
-    "pname": "System.Xml.XDocument",
-    "version": "4.3.0",
-    "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
+    "pname": "System.Windows.Extensions",
+    "version": "6.0.0",
+    "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
   },
   {
     "pname": "Tomlyn.Signed",
-    "version": "0.19.0",
-    "hash": "sha256-nOlE1a3wj0LN0IlCgxrdtyx9z/TUYJZEgiLm38N7iZU="
+    "version": "0.20.0",
+    "hash": "sha256-DauHKKONVXrDCgrC/Gq9uFMBJerrZqubB/JxWcOBR8g="
   },
   {
     "pname": "Validation",
@@ -1101,7 +991,7 @@
   },
   {
     "pname": "YamlDotNet",
-    "version": "15.3.0",
-    "hash": "sha256-2rdemzEc4cGKfmYRTRfT0HXjllRs22qXac+UE400klU="
+    "version": "16.3.0",
+    "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q="
   }
 ]
diff --git a/pkgs/by-name/sb/sbom-tool/package.nix b/pkgs/by-name/sb/sbom-tool/package.nix
index 0cd0a358361c..dba457f280e5 100644
--- a/pkgs/by-name/sb/sbom-tool/package.nix
+++ b/pkgs/by-name/sb/sbom-tool/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule rec {
   pname = "sbom-tool";
-  version = "4.1.9";
+  version = "4.1.11";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "sbom-tool";
     tag = "v${version}";
-    hash = "sha256-Jm/gWHlEr+Sowh657jLAp50uvR60dMbONJQSKEDe9Ow=";
+    hash = "sha256-1bjlw7sJB/1LdMD0R3h/8l1UK3cGMEz5WqVD0CMnTYY=";
   };
 
   projectFile = "src/Microsoft.Sbom.Tool/Microsoft.Sbom.Tool.csproj";
diff --git a/pkgs/by-name/sb/sbomnix/package.nix b/pkgs/by-name/sb/sbomnix/package.nix
index 74b432f452cf..84b15485d4b6 100644
--- a/pkgs/by-name/sb/sbomnix/package.nix
+++ b/pkgs/by-name/sb/sbomnix/package.nix
@@ -4,20 +4,21 @@
   git,
   grype,
   nix,
+  nixVersions,
   nix-visualize,
   python3,
   vulnix,
 }:
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "sbomnix";
-  version = "1.7.4";
+  version = "1.7.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiiuae";
     repo = "sbomnix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s7mmtbELRcl/7ab5A3fU7f8m4rIm+mBLmXMeYHa7/n4=";
+    hash = "sha256-LApJvPeyViGJiJPLu7dFBU79SbMKieLVFKbDtFHo7f4=";
 
     # Remove documentation as it contains references to nix store
     postFetch = ''
@@ -30,7 +31,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     "--prefix PATH : ${
       lib.makeBinPath [
         git
-        nix
+        # nix
+        # TODO: remove once sbomnix support new JSON format: https://github.com/tiiuae/sbomnix/issues/267
+        nixVersions.nix_2_31
         python3.pkgs.graphviz
         nix-visualize
         vulnix
diff --git a/pkgs/by-name/sc/sc/package.nix b/pkgs/by-name/sc/sc/package.nix
index 2e1542072404..4358fa4b2e25 100644
--- a/pkgs/by-name/sc/sc/package.nix
+++ b/pkgs/by-name/sc/sc/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "sc";
-  version = "7.16_1.1.4";
+  version = "7.16_1.2.0";
 
   src = fetchFromGitHub {
     repo = "sc";
     owner = "n-t-roff";
     tag = finalAttrs.version;
-    hash = "sha256-qC7UQQqprT0Td7TCCe7iB9qJIBp47GW3aBAon27Katg=";
+    hash = "sha256-4Ma3JWrK2udMLEAUboBGzfLTQjX+TdXG7ygvhS14BiM=";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/by-name/sc/sc68/package.nix b/pkgs/by-name/sc/sc68/package.nix
index ace1c3e81a2e..8f8da22a1f08 100644
--- a/pkgs/by-name/sc/sc68/package.nix
+++ b/pkgs/by-name/sc/sc68/package.nix
@@ -15,15 +15,22 @@
 
 stdenv.mkDerivation {
   pname = "sc68";
-  version = "unstable-2022-11-24";
+  version = "2.2.1-unstable-2024-09-09";
 
   src = fetchsvn {
     url = "svn://svn.code.sf.net/p/sc68/code/";
-    rev = "695";
-    sha256 = "sha256-RO3Yhjalu49BUM0fYOZtI2l6KbuUuw03whRxlKneabo=";
+    rev = "713";
+    sha256 = "sha256-kiOHUixsf/2mFMzi6P7oC7ujyydLO7K3w7Vwr/GMOvY=";
   };
 
-  preConfigure = "tools/svn-bootstrap.sh";
+  postPatch = ''
+    substituteInPlace vcversion.sh \
+      --replace-fail 'date -u "+%Y%m%d"' 'date -u --date=@$SOURCE_DATE_EPOCH "+%Y%m%d"'
+  '';
+
+  preConfigure = ''
+    tools/svn-bootstrap.sh
+  '';
 
   enableParallelBuilding = true;
 
@@ -42,6 +49,9 @@ stdenv.mkDerivation {
     zlib
   ];
 
+  # Doesn't specify any standard target, but it's >20yo code
+  env.CFLAGS = "-std=c99";
+
   meta = {
     description = "Atari ST and Amiga music player";
     homepage = "http://sc68.atari.org/project.html";
diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix
index beb8c46044c2..9c9de873ec41 100644
--- a/pkgs/by-name/sc/scalingo/package.nix
+++ b/pkgs/by-name/sc/scalingo/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "scalingo";
-  version = "1.44.0";
+  version = "1.44.1";
 
   src = fetchFromGitHub {
     owner = "scalingo";
     repo = "cli";
     rev = version;
-    hash = "sha256-2E7tHdj74G+vZbkWL0e0E2Deayg5WANVUVIuYBPEBvo=";
+    hash = "sha256-fLP7t1cgLOgU+xHLPFqDH+KbNuVxupuit5FBZ5iuQBE=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix
index 8d2a07f4817f..23c47655f8d2 100644
--- a/pkgs/by-name/sc/sccache/package.nix
+++ b/pkgs/by-name/sc/sccache/package.nix
@@ -8,17 +8,17 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  version = "0.14.0";
+  version = "0.15.0";
   pname = "sccache";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "sccache";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-vpfkWoKu1oksHmgq86QYN7fzIcptormN9ffzXbrJJLs=";
+    sha256 = "sha256-cisDCEevpF8tzdEQzgIN+OifdTDk2YXvuSLKyBQu+IE=";
   };
 
-  cargoHash = "sha256-oiB/KKxNyKu1sxlu/Ep2cgilyJPWzRkohjKL7/azVP0=";
+  cargoHash = "sha256-p08KXAnGyAbn4JzacphucV+OjZt0iKjnZEFtONkkDRs=";
 
   buildFeatures = lib.optionals distributed [
     "dist-client"
diff --git a/pkgs/by-name/sc/scip-go/package.nix b/pkgs/by-name/sc/scip-go/package.nix
index 4e4f5e924b32..5d8b576adb99 100644
--- a/pkgs/by-name/sc/scip-go/package.nix
+++ b/pkgs/by-name/sc/scip-go/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "scip-go";
-  version = "0.1.26";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip-go";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4Xm/o4hl94vCAEpFbaKDMDhv6ZyANCg2HDC6EIwyzsI=";
+    hash = "sha256-c2yCe1dtTVA6rWhphN7LGUY0lz9Xn/AVTSAB6uRMHs0=";
   };
 
-  vendorHash = "sha256-J/97J/VXmQAYHu1qr9KiTUrB6/SVFcahihRatCKgaD8=";
+  vendorHash = "sha256-TPd0CvNoAlskbGtKi7exxy+u9HabFJdprJ595ybRRQ8=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix
index f21d8ffeb949..6b155c42ae4f 100644
--- a/pkgs/by-name/sc/scooter/package.nix
+++ b/pkgs/by-name/sc/scooter/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "scooter";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "thomasschafer";
     repo = "scooter";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-AcHPJu8aDvrQVEXvvwj7f4v1vQ0dinA6da940zTOsYg=";
+    hash = "sha256-4pekZhk8g4BzyhNqWLocP24bLKpr0kLepRzp+NYfX1I=";
   };
 
-  cargoHash = "sha256-DNsQGbZSlNK7O4KcCtHAabe/XotlHykvSP6FI2+KFqQ=";
+  cargoHash = "sha256-Ac+iCZ2WoRq7yP9YlT9hp0grsMPny/JdYBrdWiSj/L8=";
 
   # Ensure that only the `scooter` package is built (excluding `xtask`)
   cargoBuildFlags = [
diff --git a/pkgs/by-name/sc/scrutiny-collector/package.nix b/pkgs/by-name/sc/scrutiny-collector/package.nix
index ea38815a0d3d..697f554f5684 100644
--- a/pkgs/by-name/sc/scrutiny-collector/package.nix
+++ b/pkgs/by-name/sc/scrutiny-collector/package.nix
@@ -7,23 +7,21 @@
   lib,
   nix-update-script,
 }:
-let
-  version = "0.8.6";
-in
-buildGoModule rec {
-  inherit version;
+
+buildGoModule (finalAttrs: {
+  version = "0.9.2";
   pname = "scrutiny-collector";
 
   src = fetchFromGitHub {
     owner = "AnalogJ";
     repo = "scrutiny";
-    tag = "v${version}";
-    hash = "sha256-0NgAdgtlsAetXfFqJdYpvzEXL4Ibh4yzAjOaOFoMvrs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZQHTwJZBOYJ2De0CmyxXc4Fb2Vt+jKg+YpDDZhSt+cg=";
   };
 
   subPackages = "collector/cmd/collector-metrics";
 
-  vendorHash = "sha256-4qjKGjCvB0ggf6Cda7LfMeqbbBbhGcxB2ZfymUhajq8=";
+  vendorHash = "sha256-Em8k2AFoZv4TD4HFkkNIdyPj7IBOFiUIKffkifWfZFY=";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -48,6 +46,7 @@ buildGoModule rec {
   meta = {
     description = "Hard disk metrics collector for Scrutiny";
     homepage = "https://github.com/AnalogJ/scrutiny";
+    changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       samasaur
@@ -55,4 +54,4 @@ buildGoModule rec {
     ];
     mainProgram = "scrutiny-collector-metrics";
   };
-}
+})
diff --git a/pkgs/by-name/sc/scrutiny/package.nix b/pkgs/by-name/sc/scrutiny/package.nix
index 559dcc0284d1..d0e3a4d9c2bc 100644
--- a/pkgs/by-name/sc/scrutiny/package.nix
+++ b/pkgs/by-name/sc/scrutiny/package.nix
@@ -7,46 +7,46 @@
   nix-update-script,
 }:
 let
+  frontend =
+    finalAttrs:
+    buildNpmPackage {
+      inherit (finalAttrs) version;
+      pname = "${finalAttrs.pname}-webapp";
+      src = "${finalAttrs.src}/webapp/frontend";
+
+      npmDepsHash = "sha256-1lOskHEU/3CmhQkUkQExryK6eMOSWvMI+Y+cX4Dlj98=";
+
+      buildPhase = ''
+        runHook preBuild
+        mkdir dist
+        npm run build:prod --offline -- --output-path=dist
+        runHook postBuild
+      '';
+
+      installPhase = ''
+        runHook preInstall
+        mkdir $out
+        cp -r dist/* $out
+        runHook postInstall
+      '';
+
+      passthru.updateScript = nix-update-script { };
+    };
+in
+buildGoModule (finalAttrs: {
   pname = "scrutiny";
-  version = "0.8.6";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "AnalogJ";
     repo = "scrutiny";
-    tag = "v${version}";
-    hash = "sha256-0NgAdgtlsAetXfFqJdYpvzEXL4Ibh4yzAjOaOFoMvrs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZQHTwJZBOYJ2De0CmyxXc4Fb2Vt+jKg+YpDDZhSt+cg=";
   };
 
-  frontend = buildNpmPackage {
-    inherit version;
-    pname = "${pname}-webapp";
-    src = "${src}/webapp/frontend";
-
-    npmDepsHash = "sha256-EgIM3iu/dGQhzanWjjBFmLHU3EOy2riScXCDSwAvAZc=";
-
-    buildPhase = ''
-      runHook preBuild
-      mkdir dist
-      npm run build:prod --offline -- --output-path=dist
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      mkdir $out
-      cp -r dist/* $out
-      runHook postInstall
-    '';
-
-    passthru.updateScript = nix-update-script { };
-  };
-in
-buildGoModule rec {
-  inherit pname src version;
-
   subPackages = "webapp/backend/cmd/scrutiny";
 
-  vendorHash = "sha256-4qjKGjCvB0ggf6Cda7LfMeqbbBbhGcxB2ZfymUhajq8=";
+  vendorHash = "sha256-Em8k2AFoZv4TD4HFkkNIdyPj7IBOFiUIKffkifWfZFY=";
 
   env.CGO_ENABLED = 0;
 
@@ -56,7 +56,7 @@ buildGoModule rec {
 
   postInstall = ''
     mkdir -p $out/share/scrutiny
-    cp -r ${frontend}/* $out/share/scrutiny
+    cp -r ${frontend finalAttrs}/* $out/share/scrutiny
   '';
 
   passthru.tests.scrutiny = nixosTests.scrutiny;
@@ -65,7 +65,7 @@ buildGoModule rec {
   meta = {
     description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds";
     homepage = "https://github.com/AnalogJ/scrutiny";
-    changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${version}";
+    changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       samasaur
@@ -74,4 +74,4 @@ buildGoModule rec {
     mainProgram = "scrutiny";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix
index a40b4b9f392e..62ed2a1ecd73 100644
--- a/pkgs/by-name/sd/SDL_image/package.nix
+++ b/pkgs/by-name/sd/SDL_image/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_image";
-  version = "1.2.12-unstable-2026-04-03";
+  version = "1.2.12-unstable-2026-04-29";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "SDL_image";
-    rev = "678ac6a4c6021853485050926f45db08ba6aec48";
-    hash = "sha256-kK8EPDW8jkdOiDrOxK9MmrtA5varUzbj1/arLwjkUIs=";
+    rev = "5e690c3ff429025386837c4ff38e1761cd5e1d72";
+    hash = "sha256-BZz35PPW3UXfSyQEbYzpLD2HIZ+hCmDNVvvRypmecQY=";
   };
 
   configureFlags = [
diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index 5e26709db68a..f68091696bc5 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -30,13 +30,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl2-compat";
-  version = "2.32.64";
+  version = "2.32.66";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl2-compat";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-1K+KW5cK3YgcZtrMqJ7VxKGsYnZR/fJmQtRZbWk2TGM=";
+    hash = "sha256-ZK5VXTHGo42ORWsgarNr44kv2c3B/cYuj/BYLTAdWtE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix
index 795e5faad0c9..b915e67b3418 100644
--- a/pkgs/by-name/sd/sdl3-image/package.nix
+++ b/pkgs/by-name/sd/sdl3-image/package.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3-image";
-  version = "3.4.2";
+  version = "3.4.4";
 
   outputs = [
     "lib"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libsdl-org";
     repo = "SDL_image";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-LNEbXhUDB6OKk3HxwV+jANnskS82ewhQe8pDy+P6L40=";
+    hash = "sha256-ttnoe9bTtA8+eUMOs55v58xb+cWpNEiiTDEeX9GBxaw=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/sd/sdl3-shadercross/package.nix b/pkgs/by-name/sd/sdl3-shadercross/package.nix
index 72f8134ca376..878bb8af0cb3 100644
--- a/pkgs/by-name/sd/sdl3-shadercross/package.nix
+++ b/pkgs/by-name/sd/sdl3-shadercross/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3-shadercross";
-  version = "0-unstable-2026-03-01";
+  version = "0-unstable-2026-04-24";
 
   outputs = [
     "out"
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "SDL_shadercross";
-    rev = "3a314481ede01f5d966f0e834019942e34c02b82";
-    hash = "sha256-ngJymfBU9YzVEHmNpAlkHQ3Q3UDN6OCq/2kuZIHQjcw=";
+    rev = "6b06e55c7c5d7e7a09a8a14f76e866dcfad5ab99";
+    hash = "sha256-DvgMnE0QedInYRdcZQuVOlasri79kVl0ACGvNC1cq8o=";
   };
 
   strictDeps = true;
@@ -42,7 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "SDLSHADERCROSS_SHARED" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "SDLSHADERCROSS_STATIC" stdenv.hostPlatform.isStatic)
     (lib.cmakeBool "SDLSHADERCROSS_INSTALL" true)
     (lib.cmakeBool "SDLSHADERCROSS_TESTS" finalAttrs.finalPackage.doCheck)
   ];
diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
index cc5e205c9176..f6a415d0a41b 100644
--- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
+++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sdl_gamecontrollerdb";
-  version = "0-unstable-2026-04-15";
+  version = "0-unstable-2026-04-23";
 
   src = fetchFromGitHub {
     owner = "mdqinc";
     repo = "SDL_GameControllerDB";
-    rev = "c6062ec4b92254aced84843d94d379410774d907";
-    hash = "sha256-81HGyyPjMBgBpPk3Ws2r6KR/On7fmSlNtPleN6jKNf0=";
+    rev = "39f43614db065f8f12965a54400e6e97c61fbb7f";
+    hash = "sha256-9O2bdfrBEf899P1DPDOt4NFarBsoGQB17yOlVRJyRS4=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/se/seanime/package.nix b/pkgs/by-name/se/seanime/package.nix
index 7f64469fe647..3996031f72aa 100644
--- a/pkgs/by-name/se/seanime/package.nix
+++ b/pkgs/by-name/se/seanime/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "seanime";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchFromGitHub {
     owner = "5rahim";
     repo = "seanime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-R6WKRuU2kBvw9XD3iAZky1YNKWDv+W7YZAwpprYeWkw=";
+    hash = "sha256-utKOewhtuivkp0mtns2ysp+q0nwou7tojZ6VjrPhEMw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/searchix/package.nix b/pkgs/by-name/se/searchix/package.nix
index adeeebcf2281..65189c897c82 100644
--- a/pkgs/by-name/se/searchix/package.nix
+++ b/pkgs/by-name/se/searchix/package.nix
@@ -18,14 +18,14 @@ in
 
 buildGoModule (finalAttrs: {
   pname = "searchix";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "alinnow";
     repo = "searchix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-anmPuZ2En0KNhbnf4MiwiR/YP8QabOrjHHcQoZJ5Dho=";
+    hash = "sha256-+mvE68j+rozEePbAqIuit+zFZ/nQkiR6VlesD4/ilo8=";
   };
 
   vendorHash = "sha256-BG6v4HsXtSCmEmzdawH1YfEfDMbXNH8XGMF+jJgy+3w=";
diff --git a/pkgs/by-name/se/selfci/package.nix b/pkgs/by-name/se/selfci/package.nix
index a5c4f3d33b83..05a17777fded 100644
--- a/pkgs/by-name/se/selfci/package.nix
+++ b/pkgs/by-name/se/selfci/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Minimalistic local-first Unix-philosophy-abiding CI";
-    homepage = "https://app.radicle.xyz/nodes/radicle.dpc.pw/rad%3Az2tDzYbAXxTQEKTGFVwiJPajkbeDU";
+    homepage = "https://radicle.network/nodes/radicle.dpc.pw/rad%3Az2tDzYbAXxTQEKTGFVwiJPajkbeDU";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
       dvn0
diff --git a/pkgs/by-name/se/sem/package.nix b/pkgs/by-name/se/sem/package.nix
index 313402ea4955..52039b84500a 100644
--- a/pkgs/by-name/se/sem/package.nix
+++ b/pkgs/by-name/se/sem/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "sem";
-  version = "0.33.1";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = "semaphoreci";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-+MNl+JOpC3FgzWBVybTDqV6VE4cdBafQ77IYcXO4j48=";
+    sha256 = "sha256-FJn1oTtECPZpBi2LsoAxA2kyS3RY1/5oJGOTZiwitsA=";
   };
 
   vendorHash = "sha256-XEr/vXamJ7GTRpXNdcVQ9PcUVvQ8EW3pmq/tEZMHSDo=";
diff --git a/pkgs/by-name/se/sendspin-go/package.nix b/pkgs/by-name/se/sendspin-go/package.nix
index 03574853b331..6b4a94974662 100644
--- a/pkgs/by-name/se/sendspin-go/package.nix
+++ b/pkgs/by-name/se/sendspin-go/package.nix
@@ -12,18 +12,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "sendspin-go";
-  version = "1.2.0";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "Sendspin";
     repo = "sendspin-go";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hhUUtqtQZ48b/1nRcoUoY7H3cmzTfXdF239u7mKIopY=";
+    hash = "sha256-ME4LZp5NNLSAtdkIUZJWWWQTUr5Lt3y+HscJAR/AS7c=";
   };
 
   __structuredAttrs = true;
 
-  vendorHash = "sha256-OfomzW2kbkSdkDhie529IbRUNXWM3lqmq/bCGzaWXG4=";
+  vendorHash = "sha256-g2u3kkP6FUtHoCnY4PxqTp/d1wYQuz0uFZkeuobtl7U=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index 369c685d668f..750b2a2237b9 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sentry-native";
-  version = "0.13.6";
+  version = "0.13.7";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
     tag = finalAttrs.version;
-    hash = "sha256-4ZHA/sUHAhYwduLPbFQ3Ju8Pjdz14oiIcSvpFMrbkgE=";
+    hash = "sha256-TrczlrPn9b0i5uJmt0bd0XOuH+R8WXIV2WQxLRnFYgA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/sequoia-chameleon-gnupg/gpgconf.el b/pkgs/by-name/se/sequoia-chameleon-gnupg/gpgconf.el
new file mode 100755
index 000000000000..ee4d4e4365e8
--- /dev/null
+++ b/pkgs/by-name/se/sequoia-chameleon-gnupg/gpgconf.el
@@ -0,0 +1,3 @@
+#!@execlineb@ -s0
+pipeline -w { @sed@ -e "s|^gpg:OpenPGP:.*/bin/gpg$|gpg:OpenPGP:@out@/bin/gpg|" }
+@gpgconf@ $@
diff --git a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
index 25ea9c1591a8..f2bda78b6122 100644
--- a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
+++ b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
@@ -1,12 +1,15 @@
 {
   lib,
-  stdenv,
   rustPlatform,
   fetchFromGitLab,
   pkg-config,
+  makeWrapper,
   nettle,
   openssl,
   sqlite,
+  gnupg,
+  execline,
+  gnused,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -25,6 +28,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     rustPlatform.bindgenHook
     pkg-config
+    makeWrapper
   ];
 
   buildInputs = [
@@ -33,6 +37,26 @@ rustPlatform.buildRustPackage rec {
     sqlite
   ];
 
+  postInstall = ''
+    # Wrap to find gpg-agent from GnuPG.
+    makeWrapper $out/bin/gpg-sq $out/bin/gpg \
+      --suffix PATH : ${lib.makeBinPath [ gnupg ]}
+    makeWrapper $out/bin/gpgv-sq $out/bin/gpgv \
+      --suffix PATH : ${lib.makeBinPath [ gnupg ]}
+
+    # Modify the output of gpgconf to resolve gpg to this package.
+    substitute ${./gpgconf.el} $out/bin/gpgconf \
+      --subst-var-by execlineb ${lib.getExe' execline "execlineb"} \
+      --subst-var-by gpgconf ${lib.getExe' gnupg "gpgconf"} \
+      --subst-var-by sed ${lib.getExe' gnused "sed"} \
+      --subst-var out
+
+    # Additional wrappers.
+    chmod +x $out/bin/gpgconf
+    ln -s gpg $out/bin/gpg2
+    ln -s ${lib.getExe' gnupg "gpg"} $out/bin/gpg-g10code
+  '';
+
   # gpgconf: error creating socket directory
   doCheck = false;
 
diff --git a/pkgs/by-name/se/sequoia-git/package.nix b/pkgs/by-name/se/sequoia-git/package.nix
index 47ef3dcee3a9..926be6c54991 100644
--- a/pkgs/by-name/se/sequoia-git/package.nix
+++ b/pkgs/by-name/se/sequoia-git/package.nix
@@ -12,18 +12,18 @@
   libfaketime,
   ...
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (final: {
   pname = "sequoia-git";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-git";
-    rev = "v${version}";
-    hash = "sha256-7ynaz48j/ebQAZ2QxeWwkf7kFP70HKtHCv4/wGxxaVY=";
+    rev = "v${final.version}";
+    hash = "sha256-1nSFzpz0Rl9uoE59teP3o7PduSmA20QEhe+fvTM6JGA=";
   };
 
-  cargoHash = "sha256-+sIH4zFLewNNkpd42co2B0rLrIsde5gsBDsqSSc0HZQ=";
+  cargoHash = "sha256-/9/nTqCRi74TMToWQjtnnzQ8en+nqKT8gUipNcHTxvs=";
 
   buildInputs = [
     openssl.dev
@@ -46,16 +46,18 @@ rustPlatform.buildRustPackage rec {
   env.ASSET_OUT_DIR = "target";
 
   postInstall = ''
-    installManPage ${env.ASSET_OUT_DIR}/man-pages/*.1
-    installShellCompletion --bash ${env.ASSET_OUT_DIR}/shell-completions/${meta.mainProgram}.bash
-    installShellCompletion --zsh ${env.ASSET_OUT_DIR}/shell-completions/_${meta.mainProgram}
-    installShellCompletion --fish ${env.ASSET_OUT_DIR}/shell-completions/${meta.mainProgram}.fish
+    installManPage ${final.env.ASSET_OUT_DIR}/man-pages/*.1
+    installShellCompletion --bash ${final.env.ASSET_OUT_DIR}/shell-completions/${final.meta.mainProgram}.bash
+    installShellCompletion --zsh ${final.env.ASSET_OUT_DIR}/shell-completions/_${final.meta.mainProgram}
+    installShellCompletion --fish ${final.env.ASSET_OUT_DIR}/shell-completions/${final.meta.mainProgram}.fish
   '';
 
+  __structuredAttrs = true;
+
   meta = {
     homepage = "https://sequoia-pgp.gitlab.io/sequoia-git";
     license = lib.licenses.lgpl2Plus;
     maintainers = [ lib.maintainers.matthiasbeyer ];
     mainProgram = "sq-git";
   };
-}
+})
diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix
index 976c2334d062..ec64a9a8a39d 100644
--- a/pkgs/by-name/se/sequoia-sop/package.nix
+++ b/pkgs/by-name/se/sequoia-sop/package.nix
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Implementation of the Stateless OpenPGP Command Line Interface using Sequoia";
     homepage = "https://gitlab.com/sequoia-pgp/sequoia-sop";
-    changelog = "https://gitlab.com/sequoia-pgp/sequoia-sop/-/blob/v${finalAttrs.src.tag}/NEWS";
+    changelog = "https://gitlab.com/sequoia-pgp/sequoia-sop/-/blob/${finalAttrs.src.tag}/NEWS";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ doronbehar ];
     mainProgram = "sqop";
diff --git a/pkgs/by-name/se/serd/package.nix b/pkgs/by-name/se/serd/package.nix
index 8f55f417ee4b..3ba0fafb9096 100644
--- a/pkgs/by-name/se/serd/package.nix
+++ b/pkgs/by-name/se/serd/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "serd";
-  version = "0.32.6";
+  version = "0.32.8";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://download.drobilla.net/serd-${finalAttrs.version}.tar.xz";
-    hash = "sha256-D74JSVL+F2uk2k8vdn3ftfYOZ+ZNF2G0ODoLhyz9Bxo=";
+    hash = "sha256-9HJZvDi6VTsN64ttq2tbc9NjBGmnyUOczcqA4G18Hs4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix
index 7212be05a57c..036e3d53891d 100644
--- a/pkgs/by-name/se/server-box/package.nix
+++ b/pkgs/by-name/se/server-box/package.nix
@@ -13,14 +13,14 @@
 }:
 
 let
-  version = "1.0.1365";
+  version = "1.0.1390";
 
   src = fetchFromGitHub {
     owner = "lollipopkit";
     repo = "flutter_server_box";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-rZTQ3ZDWfVWHKLg/+uEDWE5KzLK01S/JCj1KhOGzZsA=";
+    hash = "sha256-LVGqvCVlPh1F3Lcdfp1BrTtgrAXRMfPeeCRZOpGeskA=";
   };
 in
 flutter341.buildFlutterApplication {
diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json
index 8e14d94dc821..9625fab4493c 100644
--- a/pkgs/by-name/se/server-box/pubspec.lock.json
+++ b/pkgs/by-name/se/server-box/pubspec.lock.json
@@ -184,11 +184,11 @@
       "dependency": "transitive",
       "description": {
         "name": "camera_platform_interface",
-        "sha256": "98cfc9357e04bad617671b4c1f78a597f25f08003089dd94050709ae54effc63",
+        "sha256": "7ac852d77699acee79f0d438b793feee26721841e50973576419ff5c6d95e9b7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
     },
     "camera_web": {
       "dependency": "transitive",
@@ -377,7 +377,7 @@
         "relative": true
       },
       "source": "path",
-      "version": "2.17.0"
+      "version": "2.17.1"
     },
     "dbus": {
       "dependency": "transitive",
@@ -710,7 +710,7 @@
       "version": "4.1.0"
     },
     "flutter_svg": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
         "sha256": "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9",
@@ -1075,11 +1075,11 @@
       "dependency": "transitive",
       "description": {
         "name": "local_auth_android",
-        "sha256": "b41970749c2d43791790724b76917eeee1e90de76e6b0eec3edca03a329bf44c",
+        "sha256": "b201c006fa769c23386f89aa6837ec0eb8179fcfb212eadcf87b422b3f9a6a78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.7"
+      "version": "2.0.8"
     },
     "local_auth_darwin": {
       "dependency": "transitive",
@@ -1305,11 +1305,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "914a07484c4380e572998d30486e77e0d9cd2faec72fee268086d07bf7f302c9",
+        "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.0"
+      "version": "2.3.1"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -2070,11 +2070,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "046d3928e16fa4dc46e8350415661755ab759d9fc97fc21b5ab295f71e4f0499",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.1.0"
     },
     "wake_on_lan": {
       "dependency": "direct main",
@@ -2090,21 +2090,21 @@
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "8b12256f616346910c519a35606fb69b1fe0737c06b6a447c6df43888b097f39",
+        "sha256": "ddf3db70eaa10c37558ff817519b85d527dbd21034fd5d8e1c2e85f31588f1c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "24b84143787220a403491c2e5de0877fbbb87baf3f0b18a2a988973863db4b03",
+        "sha256": "14b2e5b9e35c2631e656913c47adecdd71633ae92896a27a64c8f1fcfabc21cc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "watch_connectivity": {
       "dependency": "direct main",
diff --git a/pkgs/by-name/sf/sftpgo-plugin-auth/package.nix b/pkgs/by-name/sf/sftpgo-plugin-auth/package.nix
new file mode 100644
index 000000000000..27eed8123550
--- /dev/null
+++ b/pkgs/by-name/sf/sftpgo-plugin-auth/package.nix
@@ -0,0 +1,40 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "sftpgo-plugin-auth";
+  version = "1.0.14";
+
+  src = fetchFromGitHub {
+    owner = "sftpgo";
+    repo = "sftpgo-plugin-auth";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Aw9n4CBmsWEqhNol5Ge/Ae5uaZn4zp6sIc8N6L724H4=";
+  };
+
+  vendorHash = "sha256-ZCkKr0hpHx37T9DfaYev9jxkpNcDPF9R0YsCkw2/pA8=";
+
+  env.CGO_ENABLED = "0";
+
+  ldflags = [
+    "-s"
+    "-X github.com/sftpgo/sftpgo-plugin-auth/cmd.commitHash=${finalAttrs.src.rev}"
+  ];
+
+  subPackages = [ "." ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/sftpgo/sftpgo-plugin-auth";
+    changelog = "https://github.com/sftpgo/sftpgo-plugin-auth/releases/tag/${finalAttrs.src.tag}";
+    description = "LDAP/Active Directory authentication for SFTPGo";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ connor-grady ];
+    mainProgram = "sftpgo-plugin-auth";
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix
index 87b323bf5a9a..3ff4dd9e4d3e 100644
--- a/pkgs/by-name/sh/shadps4/package.nix
+++ b/pkgs/by-name/sh/shadps4/package.nix
@@ -48,7 +48,7 @@
   vulkan-loader,
   vulkan-memory-allocator,
   xbyak,
-  xxHash,
+  xxhash,
   zlib-ng,
   zydis,
   nix-update-script,
@@ -127,7 +127,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
     vulkan-loader
     vulkan-memory-allocator
     xbyak
-    xxHash
+    xxhash
     zlib-ng
     zydis
   ];
diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix
index be279d8affd2..d760a0208aec 100644
--- a/pkgs/by-name/sh/shairport-sync/package.nix
+++ b/pkgs/by-name/sh/shairport-sync/package.nix
@@ -23,6 +23,7 @@
   libao,
   libsoundio,
   mosquitto,
+  nix-update-script,
   pipewire,
   soxr,
   alac,
@@ -43,7 +44,7 @@
   enableMqttClient ? true,
   enableDbus ? stdenv.hostPlatform.isLinux,
   enableSoxr ? true,
-  enableAlac ? true,
+  enableAlac ? !enableAirplay2, # airplay2 build uses ffmpeg for alac
   enableConvolution ? true,
   enableLibdaemon ? false,
   enableTinySVCmDNS ? true,
@@ -55,13 +56,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shairport-sync";
-  version = "5.0.2";
+  version = "5.0.4";
 
   src = fetchFromGitHub {
     repo = "shairport-sync";
     owner = "mikebrady";
     tag = finalAttrs.version;
-    hash = "sha256-tmnAVO9XpVNOwS8ze/23v4TV5Gq+goaVNnA9INf17wk=";
+    hash = "sha256-7/QB0lvpjZnGXo4vjKSYogjhi66S/QRRpypsqEMLGj0=";
   };
 
   nativeBuildInputs = [
@@ -141,6 +142,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
+  passthru.updateScript = nix-update-script {
+    # ignore -dev tagged releases
+    extraArgs = [ "--version-regex=^([0-9\\.]+)$" ];
+  };
+
   meta = {
     homepage = "https://github.com/mikebrady/shairport-sync";
     description = "Airtunes server and emulator with multi-room capabilities";
diff --git a/pkgs/by-name/sh/sharedown/package.nix b/pkgs/by-name/sh/sharedown/package.nix
index b5d89d06fe97..fedaa6db4cef 100644
--- a/pkgs/by-name/sh/sharedown/package.nix
+++ b/pkgs/by-name/sh/sharedown/package.nix
@@ -59,7 +59,7 @@ buildNpmPackage (finalAttrs: {
       --add-flags $out/lib/node_modules/sharedown/app.js \
       --set PUPPETEER_EXECUTABLE_PATH ${chromium}/bin/chromium \
       --prefix PATH : ${lib.makeBinPath finalAttrs.finalPackage.passthru.wrapperPaths} \
-      --add-flags "--no-sandbox" \
+      --add-flags "--no-sandbox"
   '';
 
   desktopItems = [
diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index 0bb83d0d563c..8939beaf54b3 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -12,18 +12,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "shellhub-agent";
-  version = "0.24.1";
+  version = "0.21.7";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3WzB7a8RJlsiKDSpuXgXenfa1q5XG5baI57qrFS0kw8=";
+    hash = "sha256-+dU5NYEeGHU9n8PTmcU9S2XvaygMRIaN3ai7caWdE+I=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-idfUmP2LFcnjmGpA/17phpYtGBiTC/cXjlDd/dkZ1i0=";
+  vendorHash = "sha256-zBT3kQhn6RhgcP/5FBEhKo1oPl9GgFQqWGsBUgrDwW4=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix
index 95b51148c39e..f931d5437d53 100644
--- a/pkgs/by-name/sh/sherpa/package.nix
+++ b/pkgs/by-name/sh/sherpa/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sherpa";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchFromGitLab {
     owner = "sherpa-team";
     repo = "sherpa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bh5C0BYbuAkbPrp27P0oD0yoxd53ViRtmpUKfN7kZ90=";
+    hash = "sha256-iXVP0XwgEpBWZ3vHq+7F9RGx6akShSizBIGkPIOw/r0=";
   };
 
   postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index 354e05f6beae..6315867c2555 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "harbourmasters";
     repo = "shipwright";
     tag = finalAttrs.version;
-    hash = "sha256-hQxYKZi6YJPittwes3sUZySChPBdGTz0GADbqgfjP5M=";
+    hash = "sha256-jTKhvyFaP59+T85CI7IteMABggOt6WVvQJ1vbSz1ops=";
     fetchSubmodules = true;
     deepClone = true;
     postFetch = ''
diff --git a/pkgs/by-name/sh/shisho/package.nix b/pkgs/by-name/sh/shisho/package.nix
deleted file mode 100644
index 80a54a90f3d1..000000000000
--- a/pkgs/by-name/sh/shisho/package.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  installShellFiles,
-  rustfmt,
-  stdenv,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "shisho";
-  version = "0.5.2";
-
-  src = fetchFromGitHub {
-    owner = "flatt-security";
-    repo = "shisho";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY=";
-    fetchSubmodules = true;
-  };
-
-  cargoHash = "sha256-gv3qvDzqwuuAVpbaOpMI7DuapSALMr/qzyhor3avYQI=";
-
-  nativeBuildInputs = [
-    installShellFiles
-    # required to build serde-sarif dependency
-    rustfmt
-  ];
-
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd shisho \
-      --bash <($out/bin/shisho completion bash) \
-      --fish <($out/bin/shisho completion fish) \
-      --zsh <($out/bin/shisho completion zsh)
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    $out/bin/shisho --help
-    $out/bin/shisho --version | grep "${finalAttrs.version}"
-
-    runHook postInstallCheck
-  '';
-
-  meta = {
-    homepage = "https://docs.shisho.dev/shisho/";
-    changelog = "https://docs.shisho.dev/changelog/";
-    description = "Lightweight static analyzer for several programming languages";
-    mainProgram = "shisho";
-    longDescription = ''
-      Shisho is a lightweight static code analyzer designed for developers and
-      is the core engine for Shisho products. It is, so to speak, like a
-      pluggable and configurable linter; it gives developers a way to codify
-      your domain knowledge over your code as rules. With powerful automation
-      and integration capabilities, the rules will help you find and fix issues
-      semiautomatically.
-    '';
-    license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ jk ];
-  };
-})
diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index 1e5cb1add837..0bc7c9ed2ed8 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -22,16 +22,16 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "shogihome";
-  version = "1.27.0";
+  version = "1.27.1";
 
   src = fetchFromGitHub {
     owner = "sunfish-shogi";
     repo = "shogihome";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T1MgcqCi9rwN86vgCAshokznMXh+masFLcO43sz2bo0=";
+    hash = "sha256-Uns66oj5TGlIgOTayRqFa8wGntbgm9Molerzn5yJWDE=";
   };
 
-  npmDepsHash = "sha256-5tZQCxql6jZAEU+e/hkQYnaHy1l5dWaH/p2rbGDAX14=";
+  npmDepsHash = "sha256-xl4B77luiMTT1L7E4FXP3q2lZT2WhUhH9zDu1HYAjQ0=";
 
   postPatch = ''
     substituteInPlace package.json \
@@ -158,10 +158,12 @@ buildNpmPackage (finalAttrs: {
   meta = {
     description = "Shogi frontend supporting USI engines";
     homepage = "https://sunfish-shogi.github.io/shogihome/";
-    license = with lib.licenses; [
-      mit
-      asl20 # for icons
-    ];
+    license =
+      with lib.licenses;
+      AND [
+        mit
+        asl20 # for icons
+      ];
     maintainers = with lib.maintainers; [
       kachick
     ];
diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix
index e3ac18cbba29..81ee1d8d4850 100644
--- a/pkgs/by-name/sh/shpool/package.nix
+++ b/pkgs/by-name/sh/shpool/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "shpool";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "shell-pool";
     repo = "shpool";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4+4R0RnynU8AF6FL+zmokRux7SzDANwLAhbg35okUBQ=";
+    hash = "sha256-Q2sIHOiFP/xj6wO3GNDc53eRwGygAz6nijsUqa3n9v0=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '/usr/bin/shpool' "$out/bin/shpool"
   '';
 
-  cargoHash = "sha256-RHObvJs8hgM3jMLh7sG0EzQcWTRR2vy9e2rS5dUKEeg=";
+  cargoHash = "sha256-SkMPP3FwVMmHnsTIYqZjrjdliWk3YbPHsaRe1rx8sIg=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ];
 
diff --git a/pkgs/applications/radio/sigdigger/default.nix b/pkgs/by-name/si/sigdigger/package.nix
similarity index 85%
rename from pkgs/applications/radio/sigdigger/default.nix
rename to pkgs/by-name/si/sigdigger/package.nix
index 36c8c2f82a75..17f8c2f2bfa3 100644
--- a/pkgs/applications/radio/sigdigger/default.nix
+++ b/pkgs/by-name/si/sigdigger/package.nix
@@ -2,13 +2,11 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
+  libsForQt5,
   pkg-config,
   sigutils,
   fftwSinglePrec,
   suwidgets,
-  wrapQtAppsHook,
   suscan,
   libsndfile,
   soapysdr-with-plugins,
@@ -16,25 +14,25 @@
   volk,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sigdigger";
   version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "BatchDrake";
     repo = "SigDigger";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE=";
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     sigutils
     fftwSinglePrec
     suwidgets
@@ -61,4 +59,4 @@ stdenv.mkDerivation rec {
       oxapentane
     ];
   };
-}
+})
diff --git a/pkgs/by-name/si/sigma-cli/package.nix b/pkgs/by-name/si/sigma-cli/package.nix
index 2020e082cb7d..1cdb5ff94d00 100644
--- a/pkgs/by-name/si/sigma-cli/package.nix
+++ b/pkgs/by-name/si/sigma-cli/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sigma-cli";
-  version = "3.0.1";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "sigma-cli";
     tag = "v${version}";
-    hash = "sha256-BBuiLQXGUc3hDF/Dnbs6dNHBMqz43ZtrtnPXTz8r3kQ=";
+    hash = "sha256-46M/WD2BIPMpABai4WZBmxjgI+skwcaRJwPFGXje5y4=";
   };
 
   pythonRelaxDeps = [ "click" ];
diff --git a/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch b/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch
index 0f87e258dada..130da2bcac59 100644
--- a/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch
+++ b/pkgs/by-name/si/signal-desktop/force-90-days-expiration.patch
@@ -1,12 +1,12 @@
-diff --git a/ts/scripts/get-expire-time.node.ts b/ts/scripts/get-expire-time.node.ts
-index deebfcee6..50f6df652 100644
---- a/ts/scripts/get-expire-time.node.ts
-+++ b/ts/scripts/get-expire-time.node.ts
-@@ -18,7 +18,7 @@ const buildCreation = unixTimestamp * 1000;
+diff --git a/scripts/get-expire-time.mjs b/scripts/get-expire-time.mjs
+index 8c520ba5b..f23c32e35 100644
+--- a/scripts/get-expire-time.mjs
++++ b/scripts/get-expire-time.mjs
+@@ -19,7 +19,7 @@ const isNotUpdatable = !parseVersion(packageJson.version).isUpdatable;
  
  // NB: Build expirations are also determined via users' auto-update settings; see
  // getExpirationTimestamp
--const validDuration = isNotUpdatable(packageJson.version) ? DAY * 30 : DAY * 90;
+-const validDuration = isNotUpdatable ? DAY * 30 : DAY * 90;
 +const validDuration = DAY * 90;
  const buildExpiration = buildCreation + validDuration;
  
@@ -25,4 +25,4 @@ index c2ac24c6d..65260f8bd 100644
 +  const safeExpirationMs = NINETY_ONE_DAYS;
  
    const buildExpirationDuration = buildExpirationTimestamp - now;
-   const tooFarIntoFuture = buildExpirationDuration > safeExpirationMs;
\ No newline at end of file
+   const tooFarIntoFuture = buildExpirationDuration > safeExpirationMs;
diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 1009f28ac4b3..8737a68f7642 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   stdenv,
   rustPlatform,
   fetchNpmDeps,
@@ -14,23 +15,23 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.91.0";
+  version = "0.92.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-icmmQWWVCWg8dpNkQtLi3YWSxBrUwaGP4ezTDqC/0kc=";
+    hash = "sha256-gAXLt0e2k5PA6PgFRQa22oGuNLM7TGkOKQnYtFhn8I8=";
   };
 
-  cargoHash = "sha256-NaFl9r4e08I3+/asek7VMA0yikxPR0MtBX9TnHaebSU=";
+  cargoHash = "sha256-TqYxkkzlbgrc7jkAubz3TsXhcU8Do5IFaLRqSPiZVR0=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-TTU7cfoS0h2fqHanSOCsF+dtkhBfaWApfOC3O4DGClo=";
+    hash = "sha256-c6Alk2tyloaPAP2Qfgurle0ziVs8vbxb2klKJZaGlaQ=";
   };
 
   nativeBuildInputs = [
@@ -60,6 +61,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "'prebuilds'" "'$out/lib'" \
       --replace-fail "objcopy = shutil.which('%s-linux-gnu-objcopy' % cargo_target.split('-')[0]) or 'objcopy'" \
                      "objcopy = os.getenv('OBJCOPY', 'objcopy')"
+  ''
+  + lib.optionalString boringssl.passthru.isShared ''
+    substituteInPlace $cargoDepsCopy/*/boring-sys-*/build/main.rs \
+      --replace-fail "cargo:rustc-link-lib=static=crypto" "cargo:rustc-link-lib=dylib=crypto" \
+      --replace-fail "cargo:rustc-link-lib=static=ssl" "cargo:rustc-link-lib=dylib=ssl"
   '';
 
   buildPhase = ''
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 48454e6de50a..17de2fb08510 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -3,9 +3,10 @@
   lib,
   nodejs_24,
   pnpm_10_29_2,
+  node-gyp,
   fetchPnpmDeps,
   pnpmConfigHook,
-  electron_40,
+  electron_41,
   python3,
   makeWrapper,
   callPackage,
@@ -29,7 +30,7 @@ assert lib.warnIf (commandLineArgs != "")
 let
   nodejs = nodejs_24;
   pnpm = pnpm_10_29_2;
-  electron = electron_40;
+  electron = electron_41;
 
   libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };
   signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; };
@@ -58,13 +59,13 @@ let
     '';
   });
 
-  version = "8.6.1";
+  version = "8.8.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-UeCjj3txcBQxfvEJOuCKka3VVfd4OY/4wXoQ4lq4NiE=";
+    hash = "sha256-moWEqKWZgqIfhK01RUROF4Waxbn5kcmxZQ94PGai4ww=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -76,7 +77,7 @@ let
       inherit (finalAttrs) pname src version;
       inherit pnpm;
       fetcherVersion = 3;
-      hash = "sha256-WbdYcI5y01gdS9AIzy4VZZ6eFaTHaVPscTawLSsHzlc=";
+      hash = "sha256-CPZkybD/rCBMBK9qUSweBdLr9hXu0Ztn8fekqrRzUR4=";
     };
 
     strictDeps = true;
@@ -105,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
   nativeBuildInputs = [
+    node-gyp
     nodejs
     pnpmConfigHook
     pnpm
@@ -159,11 +161,11 @@ stdenv.mkDerivation (finalAttrs: {
     # language-pack postprocessing), and they expect a different macOS
     # app layout than nixpkgs' Electron provides.
     substituteInPlace package.json \
-      --replace-fail '"artifactBuildCompleted": "ts/scripts/artifact-build-completed.node.ts",' "" \
-      --replace-fail '"afterSign": "ts/scripts/after-sign.node.ts",' "" \
-      --replace-fail '"afterPack": "ts/scripts/after-pack.node.ts",' "" \
-      --replace-fail '"sign": "./ts/scripts/sign-macos.node.ts",' "" \
-      --replace-fail '"afterAllArtifactBuild": "ts/scripts/after-all-artifact-build.node.ts",' ""
+      --replace-fail '"artifactBuildCompleted": "scripts/artifact-build-completed.mjs",' "" \
+      --replace-fail '"afterSign": "scripts/after-sign.mjs",' "" \
+      --replace-fail '"afterPack": "scripts/after-pack.mjs",' "" \
+      --replace-fail '"sign": "scripts/sign-macos.mjs",' "" \
+      --replace-fail '"afterAllArtifactBuild": "scripts/after-all-artifact-build.mjs",' ""
   '';
 
   pnpmDeps = fetchPnpmDeps {
@@ -177,15 +179,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 3;
     hash =
       if withAppleEmojis then
-        "sha256-d6ul6MTJhnM4PyxMlMaVovnvSPfYh3DmMjHjmOideB4="
+        "sha256-Ib+NQbnCawbGgx45u27ubf1a6lHkrGde+m1DUT23w5Y="
       else
-        "sha256-JymcPdFMi0wfceOJnPrwEBG4PnosIFnrxiIrTlcGf/g=";
+        "sha256-0HzY/4XHjc8uAIMy6OzgGcuDNGfqQVW2RHOtyeYPJaw=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1776101010;
+    SOURCE_DATE_EPOCH = 1777225303;
   }
   // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
     # Disable code signing during local macOS builds.
@@ -240,7 +242,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Build it explicitly against Electron headers ahead of packaging.
     export npm_config_nodedir=${electron.headers}
     pushd node_modules/fs-xattr
-    pnpm exec node-gyp rebuild
+    node-gyp rebuild
     popd
     test -f node_modules/fs-xattr/build/Release/xattr.node
   '';
@@ -277,8 +279,9 @@ stdenv.mkDerivation (finalAttrs: {
       --add-flags ${lib.escapeShellArg commandLineArgs}
   ''
   + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    mkdir -p $out/share
+    mkdir -p $out/share/polkit-1/actions
     cp -r dist/*-unpacked/resources $out/share/signal-desktop
+    mv $out/share/signal-desktop/*.policy $out/share/polkit-1/actions/
 
     for icon in build/icons/png/*
     do
diff --git a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
index 8cf90b611334..f744782f87f4 100644
--- a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
+++ b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
@@ -46,32 +46,32 @@ index 483d1c4e4..66609d9e9 100644
      getBadgesPath(userDataPath),
      getDraftPath(userDataPath),
 diff --git a/package.json b/package.json
-index 8585e6bdc..4d900ebfe 100644
+index dd87037e7..f16dd8d1f 100644
 --- a/package.json
 +++ b/package.json
-@@ -122,7 +122,6 @@
-     "@signalapp/sqlcipher": "3.2.1",
-     "@signalapp/windows-ucv": "1.0.1",
-     "emoji-datasource": "16.0.0",
+@@ -240,7 +240,6 @@
+     "electron": "41.2.2",
+     "electron-builder": "26.0.14",
+     "electron-mocha": "13.1.0",
 -    "emoji-datasource-apple": "16.0.0",
-     "google-libphonenumber": "3.2.39"
-   },
-   "devDependencies": {
+     "emoji-regex": "10.6.0",
+     "enhanced-resolve": "5.20.1",
+     "enquirer": "2.4.1",
 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-index 756130661..4872be4cf 100644
+index d659475fc..2f1e3cfdb 100644
 --- a/pnpm-lock.yaml
 +++ b/pnpm-lock.yaml
-@@ -97,9 +97,6 @@ importers:
-       emoji-datasource:
-         specifier: 16.0.0
-         version: 16.0.0
+@@ -430,9 +430,6 @@ importers:
+       electron-mocha:
+         specifier: 13.1.0
+         version: 13.1.0
 -      emoji-datasource-apple:
 -        specifier: 16.0.0
 -        version: 16.0.0
-       google-libphonenumber:
-         specifier: 3.2.39
-         version: 3.2.39
-@@ -6068,9 +6065,6 @@ packages:
+       emoji-regex:
+         specifier: 10.6.0
+         version: 10.6.0
+@@ -6154,9 +6151,6 @@ packages:
      resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
      engines: {node: '>=12'}
  
@@ -81,7 +81,7 @@ index 756130661..4872be4cf 100644
    emoji-datasource@16.0.0:
      resolution: {integrity: sha512-/qHKqK5Nr3+8zhgO6kHmF43Fm5C8HNn0AaFRIpgw8HF3+uF0Vfc8jgLI1ZQS5ba1vBzksS8NBCjHejwLb2D/Sg==}
  
-@@ -16954,8 +16948,6 @@ snapshots:
+@@ -16387,8 +16381,6 @@ snapshots:
  
    emittery@0.13.1: {}
  
@@ -89,7 +89,7 @@ index 756130661..4872be4cf 100644
 -
    emoji-datasource@16.0.0: {}
  
-   emoji-regex@10.4.0: {}
+   emoji-regex@10.6.0: {}
 diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss
 index 1cc4bb43c..a6444101a 100644
 --- a/stylesheets/components/fun/FunEmoji.scss
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index ec2818006a2b..4db6b8355f7e 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "signalbackup-tools";
-  version = "20260413";
+  version = "20260420";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = finalAttrs.version;
-    hash = "sha256-O6hi1L0oMXCJ0MiNZNObcwpszpGdv9gp0gKCjEXZtHw=";
+    hash = "sha256-k7nEV0lx8tecor4qcNEJndlLqSiQHv/8WRuX6IwVZWk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/siketyan-ghr/package.nix b/pkgs/by-name/si/siketyan-ghr/package.nix
index 2c8765348bec..0d5c4097906b 100644
--- a/pkgs/by-name/si/siketyan-ghr/package.nix
+++ b/pkgs/by-name/si/siketyan-ghr/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ghr";
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "siketyan";
     repo = "ghr";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-L9+rcdt+MGZSCOJyCE4t/TT6Fjtxvfr9LBJYyRrx208=";
+    hash = "sha256-8DnujtAtJiSnrC3k5vGRQuk6RfC5Vn+z4HAVsEnXN7c=";
   };
 
-  cargoHash = "sha256-xRa/brOYJ19J25wGdtNR2g+ouMyvz9YFXnzepeipWNQ=";
+  cargoHash = "sha256-8b9kAl9KoeWG+LEFkRQd6zbiWqyIybbcXpImz+akS7M=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/si/sillytavern/package.nix b/pkgs/by-name/si/sillytavern/package.nix
index 37d9e809db22..b2ddfa6af0ff 100644
--- a/pkgs/by-name/si/sillytavern/package.nix
+++ b/pkgs/by-name/si/sillytavern/package.nix
@@ -1,7 +1,6 @@
 {
   buildNpmPackage,
   fetchFromGitHub,
-  nodejs_22,
   lib,
 }:
 buildNpmPackage (finalAttrs: {
@@ -18,9 +17,6 @@ buildNpmPackage (finalAttrs: {
 
   dontNpmBuild = true;
 
-  # https://github.com/NixOS/nixpkgs/issues/474535
-  nodejs = nodejs_22;
-
   # These dirs are not installed automatically.
   # And if they were not in place, the app would try to create them at runtime, which is of course impossible to achieve.
   postInstall = ''
diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix
index 78f94baca2eb..e1cc6c566ebb 100644
--- a/pkgs/by-name/si/simdjson/package.nix
+++ b/pkgs/by-name/si/simdjson/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdjson";
-  version = "4.3.1";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "simdjson";
     repo = "simdjson";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SSNbVBGul8NogDfFHR2gZ80d1CNRrBjZBC+7kxItnFo=";
+    hash = "sha256-VGErBWAHk63XMv8yC+Na+gXHByhYhtIEMSBySwIDlXk=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index 0ebf29c8a97c..32af118891ac 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "8.0.0";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-v9t/2EgxEOVostS/BY+DkDZbpq/coBhk2LaVpI2/y9c=";
+    hash = "sha256-8a1J30guKz3ztZf5DGOaL7ZGVB0GpT5gtR1ZaAC4ucE=";
   };
 
   # Fix build on darwin
diff --git a/pkgs/by-name/si/similarity/package.nix b/pkgs/by-name/si/similarity/package.nix
index 95d384534cb8..a88d61544a85 100644
--- a/pkgs/by-name/si/similarity/package.nix
+++ b/pkgs/by-name/si/similarity/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "similarity";
-  version = "0.3.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "mizchi";
     repo = "similarity";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eZQ0FTmysFYwqg3sjasZW3S0lps2XbFWUbWuZzkFWkA=";
+    hash = "sha256-xYA1o4nmZLo0TY56KOtm2eTR9xL4/uEVTKmFaQT+kCQ=";
   };
 
-  cargoHash = "sha256-7qLC1RvjBXd9JFrJdDTIngZhMvyQV1ko3MXRr/2y7hA=";
+  cargoHash = "sha256-r/9Yq1h8i7OWMicK9z36TzUTQRDOk6cND+5RvL045yA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/similarity-ts";
diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 3c8132773e1b..ae9080620dd8 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.13.5";
+  version = "1.13.11";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vHc3j96e5KGGMcTJFaUKSC4dQWlNThRZKirZ/waIYUM=";
+    hash = "sha256-kyte9o+w240o6Q+X97m4QQ6nQjuLthoh6O9ksUtgmZU=";
   };
 
-  vendorHash = "sha256-LgwU4l4JvgLcdj8FBazzaJcKIa3X/Poe1+GjE+GTrHw=";
+  vendorHash = "sha256-b7RUr787qEdZAb31VWlpN7t8Yauxa32KDJmvTTf9//g=";
 
   tags = [
     "with_gvisor"
diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/by-name/si/sinit/package.nix
similarity index 83%
rename from pkgs/os-specific/linux/sinit/default.nix
rename to pkgs/by-name/si/sinit/package.nix
index 2272c3a43ef5..9494698c5e9c 100644
--- a/pkgs/os-specific/linux/sinit/default.nix
+++ b/pkgs/by-name/si/sinit/package.nix
@@ -2,19 +2,19 @@
   lib,
   stdenv,
   fetchgit,
-  rcinit ? null,
-  rcshutdown ? null,
+  rcinit ? "/etc/rc.d/rc.init",
+  rcshutdown ? "/etc/rc.d/rc.shutdown",
   rcreboot ? null,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sinit";
   version = "1.1";
 
   src = fetchgit {
     url = "https://git.suckless.org/sinit/";
-    sha256 = "sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";
-    tag = "v${version}";
+    hash = "sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";
+    tag = "v${finalAttrs.version}";
   };
   buildInputs = [
     (lib.getOutput "static" stdenv.cc.libc)
@@ -41,4 +41,4 @@ stdenv.mkDerivation rec {
     homepage = "https://tools.suckless.org/sinit";
     downloadPage = "https://git.suckless.org/sinit";
   };
-}
+})
diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix
index bdc4644b7b46..c04779c5a500 100644
--- a/pkgs/by-name/si/sioyek/package.nix
+++ b/pkgs/by-name/si/sioyek/package.nix
@@ -82,7 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://sioyek.info/";
     description = "PDF viewer designed for research papers and technical books";
     mainProgram = "sioyek";
-    changelog = "https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}";
+    # no changelog for unstable version, change back to
+    # https://github.com/ahrm/sioyek/releases/tag/v${finalAttrs.version}
+    # once stable again
+    changelog = "https://github.com/ahrm/sioyek/releases";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       podocarp
diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 8ed473dbd84b..ac6ef81608f2 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -36,20 +36,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.6.4";
+  version = "3.6.5";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dfM8mlZrfq8tqxwVL+TLGT26wLOzVJmw561eicFx2VY=";
+    hash = "sha256-3Rz8g03JHQ+52lOd92413ArE4LixioCFNSG7ytduxsA=";
   };
 
   kernel = buildGoModule {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-TixhAJwIHQwCrA2kdpAN2vK6UeSzLMGfX85j2KtlPfQ=";
+    vendorHash = "sha256-WXlzUtiaphaSngWd6aXQuOHiBb3a3bCNgIHypMP4YXo=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_9;
     fetcherVersion = 3;
-    hash = "sha256-jvTDT0Uze+E3hQ9wU3RqKQ7RI9+OLQlewGd+kSHuZ34=";
+    hash = "sha256-GAbP9H+c+JXymH0/vpeYOJrkkFJGVyKcpJYFeyRLSKc=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";
diff --git a/pkgs/by-name/sj/sjasmplus/package.nix b/pkgs/by-name/sj/sjasmplus/package.nix
index 7fee75f5899d..d64999eb57bd 100644
--- a/pkgs/by-name/sj/sjasmplus/package.nix
+++ b/pkgs/by-name/sj/sjasmplus/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sjasmplus";
-  version = "1.21.1";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner = "z00m128";
     repo = "sjasmplus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wD31GT88hOKhsaXTKEiVIkmZO5sYYv7xb7CjiS2G1W0=";
+    hash = "sha256-k3rEpHvasqEQP16EZVwtA4jwf0wZ1zUlQpkAzN7JCDI=";
   };
 
   buildInputs = [ luabridge ];
diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix
index a0a6c5205a03..7fbaff73ff6e 100644
--- a/pkgs/by-name/sk/skills/package.nix
+++ b/pkgs/by-name/sk/skills/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "skills";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "vercel-labs";
     repo = "skills";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cdundZSbWn8wXByYeXI4lQ3gWtBj3DkPQ37Py0bL3IY=";
+    hash = "sha256-JVJeottMyjxdiGPS7O4QsshKdbwbYcKMvwe/PB7I/Zw=";
   };
 
   pnpmDeps = fetchPnpmDeps {
diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix
index fc841e2aea68..8dffb3edc9f0 100644
--- a/pkgs/by-name/sl/slackdump/package.nix
+++ b/pkgs/by-name/sl/slackdump/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "slackdump";
-  version = "4.1.2";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "rusq";
     repo = "slackdump";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Kt9FGQiGaWDOpJMeg/UFDcNO16skQ8qblYwl26Fr5Bk=";
+    hash = "sha256-Ds3nggx1f389goOWelYXNviFRZ/h4XX54LgtU9oqklc=";
   };
 
   nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
       "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
     ];
 
-  vendorHash = "sha256-3pZCGE8MLNIdU4zVDwkHJwPr7xHHDhnUlzidej6c4E0=";
+  vendorHash = "sha256-fRvtdl0+uVhN6cQJxRsOw1vQsrcsPvcn/Tb7US7MKmM=";
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix
index ab92351ab10e..52d75af7c003 100644
--- a/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -18,14 +18,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slint-lsp";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-2VO0gVqPPJjPlLxEtYL27YcC2YaStNbI3osU8k3ZYT4=";
+    hash = "sha256-+REZRGPgdbBUDZaZ+3R2AKF56MouPIsjx8IVv1LUl50=";
   };
 
-  cargoHash = "sha256-H58mVzgWh2KW+v1h8tyFQYYZVM2iE0MBlPr6CzDc5aU=";
+  cargoHash = "sha256-BP50c1GCAFTpRGqZDw3I5WtXabdN/2CcVhX2d1eXtck=";
 
   rpathLibs = [
     fontconfig
diff --git a/pkgs/by-name/sl/slint-tr-extractor/package.nix b/pkgs/by-name/sl/slint-tr-extractor/package.nix
index 473c0ea6ad38..12d6b6ad168c 100644
--- a/pkgs/by-name/sl/slint-tr-extractor/package.nix
+++ b/pkgs/by-name/sl/slint-tr-extractor/package.nix
@@ -7,13 +7,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slint-tr-extractor";
-  version = "1.15.1";
+  version = "1.16.1";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-xpsoW/GgjlG0Jitj7aXv1dUxLm8f4OuPWWlOqxNIvQo=";
+    hash = "sha256-y3hsZ4a3tf2CDa6pkO928xZxeWAwsxK+H2LTa7MhcFs=";
   };
-  cargoHash = "sha256-XPUbSzdttHuV4s0UufrUbCjnGv/pESF+2/Qb5dvHYyM=";
+  cargoHash = "sha256-qmLELQ/PNMUW+XMsJGPK2CnqnLAhc3W4KqtizdxFGMM=";
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix
index 88bab1a42643..400d7d6c2ab1 100644
--- a/pkgs/by-name/sl/slint-viewer/package.nix
+++ b/pkgs/by-name/sl/slint-viewer/package.nix
@@ -13,14 +13,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slint-viewer";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-POkfEU4m54dEgaSSEHLqKozMXqMxqkUoLCevm6SY2IU=";
+    hash = "sha256-/hv/5qd0JhV2H91VWjzUh4cOPOLj6/fsXHSwdDSnfCc=";
   };
 
-  cargoHash = "sha256-zjiII898Zpzdr19UHua3yuhRRHCn5yg/PHYpYODh7Pc=";
+  cargoHash = "sha256-9x33UuQGFfHFEsTdSjNnfBlgER4fBIfAmemeWSes304=";
 
   buildInputs = [
     qt6.qtbase
diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix
index 73c6b5999cb9..ddfc28a916c1 100644
--- a/pkgs/by-name/sl/slskd/package.nix
+++ b/pkgs/by-name/sl/slskd/package.nix
@@ -6,14 +6,14 @@
   fetchFromGitHub,
   fetchNpmDeps,
   mono,
-  nodejs_20,
+  nodejs_24,
   slskd,
   testers,
   nix-update-script,
 }:
 
 let
-  nodejs = nodejs_20;
+  nodejs = nodejs_24;
   # https://github.com/NixOS/nixpkgs/blob/d88947e91716390bdbefccdf16f7bebcc41436eb/pkgs/build-support/node/build-npm-package/default.nix#L62
   npmHooks = buildPackages.npmHooks.override { inherit nodejs; };
 in
diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index 84236504a063..235a05912194 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-json=${lib.getDev json_c}"
     "--with-jwt=${libjwt}"
     "--with-lz4=${lib.getDev lz4}"
-    "--with-munge=${munge}"
+    "--with-munge=${lib.getDev munge}"
     "--with-yaml=${lib.getDev libyaml}"
     "--with-ofed=${lib.getDev rdma-core}"
     "--sysconfdir=/etc/slurm"
diff --git a/pkgs/by-name/sm/smfh/package.nix b/pkgs/by-name/sm/smfh/package.nix
index 7d94e7379e24..0df11ace409b 100644
--- a/pkgs/by-name/sm/smfh/package.nix
+++ b/pkgs/by-name/sm/smfh/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "smfh";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "feel-co";
     repo = "smfh";
     tag = finalAttrs.version;
-    hash = "sha256-6zMgOPzBbTSm8jzPqmGcotjvkN3HzxcnMM8pW64JpZQ=";
+    hash = "sha256-RgszLC/p9uov6aXnPGbFRkPzT5xleX17wBCdoMT1wcA=";
   };
 
-  cargoHash = "sha256-FVTpH+scBCjgm3sf9sowRCI/X2jCS1wHtLLiOyKAD8U=";
+  cargoHash = "sha256-7IcoDgRvpye2lm+bdPlVKj0GO6QBABiQKVwSxL4Mh5k=";
 
   meta = {
     description = "Sleek Manifest File Handler";
diff --git a/pkgs/by-name/sm/smile/package.nix b/pkgs/by-name/sm/smile/package.nix
index 07b2b68daf84..eaa7c6278867 100644
--- a/pkgs/by-name/sm/smile/package.nix
+++ b/pkgs/by-name/sm/smile/package.nix
@@ -15,14 +15,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "smile";
-  version = "2.12.2";
+  version = "2.12.3";
   pyproject = false; # Builds with meson
 
   src = fetchFromGitHub {
     owner = "mijorus";
     repo = "smile";
     tag = finalAttrs.version;
-    hash = "sha256-qAeAntJXitypbSu9dVvnMenXs9UwatcdIkdqmbjxFgk=";
+    hash = "sha256-/VRo31FUDKGE5xZHNLTJ++1fYodWPhTxPUPf9Ya6fMU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sm/smithy-cli/deps.json b/pkgs/by-name/sm/smithy-cli/deps.json
new file mode 100644
index 000000000000..ba986164ba22
--- /dev/null
+++ b/pkgs/by-name/sm/smithy-cli/deps.json
@@ -0,0 +1,2181 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+  "com/github/spotbugs/snom#spotbugs-gradle-plugin/6.2.4": {
+   "jar": "sha256-bTdGUTUt7vQQsB8ClIyUCg36cXzD9nm8FHtkwBsfK5E=",
+   "module": "sha256-5QqQzU+Px5+zvLc5Ep4QDbYVm+uLL34W1kqtV3kl8mk=",
+   "pom": "sha256-qYanHRSsQJymLwvcKYGnn/uGRDbbn7I0CPX+C+M+G9k="
+  },
+  "com/google/code/gson#gson-parent/2.8.9": {
+   "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s="
+  },
+  "com/google/code/gson#gson/2.8.9": {
+   "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=",
+   "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
+  },
+  "gradle/plugin/org/gradle/crypto#checksum/1.4.0": {
+   "jar": "sha256-GZuCZMulLIpIqibHExIveIFOPB6AGmrwsgoaUdXFsJQ=",
+   "pom": "sha256-9JIlgzqyRZYjC9qx+OQyOJFVNx9h7MBLiRUbL/AydBk="
+  },
+  "me/champeau/jmh#jmh-gradle-plugin/0.7.2": {
+   "jar": "sha256-2Wcgmf+Pw/m/PU0BWGThWG8H7L0qihd6ZhhO8LaKumU=",
+   "module": "sha256-bYSa50VKs5Fxjl/HDicWQY7z7SZEcjRb2Axt5k4AtsQ=",
+   "pom": "sha256-FdkdAH98O7wCJseQSM3cRf/BJPoegAgu//jhAwxoSg8="
+  },
+  "org/beryx#badass-runtime-plugin/2.0.1": {
+   "jar": "sha256-qc8YDAVtxs/vU2XOjloPJml5eJr7CUdlERPRyqm2UhQ=",
+   "module": "sha256-Y1r26XwZhilpzegxJvdwltB8i536+fk+x2sQYCukbcY=",
+   "pom": "sha256-l6xBsi4rPVcN9UXfSjFHmkVqH5O0bMl27Jo/WdHw/Ak="
+  },
+  "org/beryx/runtime#org.beryx.runtime.gradle.plugin/2.0.1": {
+   "pom": "sha256-Jm5jyHX+OFPIobK4qpMSMU2uK+ceihR2Z/mSnRwc1tQ="
+  },
+  "org/gradle/crypto/checksum#org.gradle.crypto.checksum.gradle.plugin/1.4.0": {
+   "pom": "sha256-HzWQYt4QGbCRu7QhGghr4U0xCMX2mXisy9AbZRUFN0w="
+  },
+  "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": {
+   "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=",
+   "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=",
+   "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8="
+  },
+  "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": {
+   "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc="
+  },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
+   "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
+   "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k="
+  },
+  "org/jetbrains/kotlin#kotlin-assignment/2.0.21": {
+   "module": "sha256-8638yrZURNtqqzwNfSVoZG7AyS8kWCh/KLKu5POXNtw=",
+   "pom": "sha256-QBfCQqfb3Oca6ApXB7S/OyOoIr8jpodahFp7UTYhzQ8="
+  },
+  "org/jetbrains/kotlin#kotlin-assignment/2.0.21/gradle85": {
+   "jar": "sha256-USUeNCELiNTJCAXKZS6Xe93IR4OkVAY5ydIQkJhbrOY="
+  },
+  "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": {
+   "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=",
+   "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0="
+  },
+  "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": {
+   "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=",
+   "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ="
+  },
+  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": {
+   "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=",
+   "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY="
+  },
+  "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": {
+   "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=",
+   "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0="
+  },
+  "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": {
+   "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=",
+   "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA="
+  },
+  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": {
+   "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=",
+   "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": {
+   "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=",
+   "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": {
+   "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=",
+   "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=",
+   "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": {
+   "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": {
+   "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=",
+   "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": {
+   "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=",
+   "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=",
+   "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": {
+   "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=",
+   "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=",
+   "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": {
+   "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=",
+   "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": {
+   "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": {
+   "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=",
+   "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg="
+  },
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": {
+   "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=",
+   "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ="
+  },
+  "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": {
+   "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=",
+   "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0="
+  },
+  "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": {
+   "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=",
+   "pom": "sha256-7lYZBmzLB5zDMy4kcnQ1n9dQXeLVQPuRtyd5ICW2Siw="
+  },
+  "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": {
+   "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
+   "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=",
+   "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
+   "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o="
+  },
+  "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": {
+   "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=",
+   "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo="
+  },
+  "org/jetbrains/kotlin#kotlin-util-io/2.0.21": {
+   "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=",
+   "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA="
+  },
+  "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": {
+   "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=",
+   "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
+   "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": {
+   "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=",
+   "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=",
+   "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ="
+  },
+  "org/jreleaser#jreleaser-gradle-plugin/1.21.0": {
+   "jar": "sha256-UgsWRXWBf65Tj80g9BL7p9U6/QyFmCYH86crUI6YsZs=",
+   "pom": "sha256-4DNhH4JlBwTzz28iJR+EI4XnCOI6MAhD5qoVb8kwVfw="
+  },
+  "org/jreleaser#org.jreleaser.gradle.plugin/1.21.0": {
+   "pom": "sha256-EPpRfDlIbeib9xu04kmcOuDwD2AQ7QgFYMg2bJiEK/E="
+  },
+  "org/kordamp/gradle#base-gradle-plugin/0.46.10": {
+   "jar": "sha256-0gS9FVYp4/yn9lmLSfAtwzHmi/YPwx5qkYzV9R8hcf4=",
+   "pom": "sha256-7PILFk47meL67i812Qh38yWN0b9hd0uwKVyYUlVsLRI="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "software/amazon/smithy#smithy-build/1.68.0": {
+   "module": "sha256-VzpAHq3jkCGPnyJXpj2xNWwofVU2fEBRAVYU5oXRi+c=",
+   "pom": "sha256-MUkGPovYz//yUVTrvpeGQoQSXPKmp17izZdEprK+8ms="
+  },
+  "software/amazon/smithy#smithy-cli/1.68.0": {
+   "module": "sha256-WRnNwas+dJaByDDnUHTqMx9aM/e09GsN8ucfbBCM5f8=",
+   "pom": "sha256-eECCCMk3qPhV42hfNpJQEBONjUX7XPoYhbwXGN/Pho8="
+  },
+  "software/amazon/smithy#smithy-model/1.68.0": {
+   "module": "sha256-YZtOyRMRyfO+eT4Xc2c367DzWZjDRi/oua/djBqgjFo=",
+   "pom": "sha256-lSrWT20uMqPENRX9dZCU9TAesi/MapQ7bOXbfIgh9k8="
+  },
+  "software/amazon/smithy/smithy-build/maven-metadata": {
+   "xml": {
+    "groupId": "software.amazon.smithy",
+    "lastUpdated": "20260226193940",
+    "release": "1.68.0"
+   }
+  },
+  "software/amazon/smithy/smithy-cli/maven-metadata": {
+   "xml": {
+    "groupId": "software.amazon.smithy",
+    "lastUpdated": "20260226193944",
+    "release": "1.68.0"
+   }
+  },
+  "software/amazon/smithy/smithy-model/maven-metadata": {
+   "xml": {
+    "groupId": "software.amazon.smithy",
+    "lastUpdated": "20260226193957",
+    "release": "1.68.0"
+   }
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/diffplug/durian#durian-collect/1.2.0": {
+   "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=",
+   "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M="
+  },
+  "com/diffplug/durian#durian-core/1.2.0": {
+   "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=",
+   "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI="
+  },
+  "com/diffplug/durian#durian-io/1.2.0": {
+   "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=",
+   "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4="
+  },
+  "com/diffplug/durian#durian-swt.os/4.3.0": {
+   "jar": "sha256-geK2Oafkvm3JtyRXE88G9cq1HynbLha5tXZFyW/eKIQ=",
+   "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=",
+   "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs="
+  },
+  "com/diffplug/spotless#spotless-lib-extra/4.3.0": {
+   "jar": "sha256-dU+ATAnfouuNU5YzEdK+aPG0pWIQEdy1UNcC6tKGUdk=",
+   "module": "sha256-yImJBeaSp+CHATV8PK0NT+JqogjNerDe2NcNOSnLoRI=",
+   "pom": "sha256-C5N93//pxrgmIDYU755aLQs8INjMa3kitIgdl9MbaJ0="
+  },
+  "com/diffplug/spotless#spotless-lib/4.3.0": {
+   "jar": "sha256-Zp+ETsCpdJQcbaBLZwdI9DF4I5ttmf3bWwYs6dBtCTk=",
+   "module": "sha256-I1HAgP4kVTNGAv/QqCHYit9ipT5uoYTEOV9PVQXeNyM=",
+   "pom": "sha256-dPwsK8oRHUP/q/jWPYuegjpEOIWHevxxWInI6ckUaNM="
+  },
+  "com/diffplug/spotless#spotless-plugin-gradle/8.2.1": {
+   "jar": "sha256-2/RPjfGDKAAkHU8TUSn8khuoL7ItckMMxC1NPVu/nTw=",
+   "module": "sha256-OPb28k3QWmJskcwWOvTThnq9UPCGdnqmTaJfMg+ik5s=",
+   "pom": "sha256-s578nCtRfx6eiNa+IvYyYZ3oOqDi49F1RaAXUDtxNPg="
+  },
+  "com/ethlo/time#itu/1.7.0": {
+   "jar": "sha256-Vc60GMnoE4xPz2LiE8TIFNieioTIJ9OVQHy+y6XXkec=",
+   "pom": "sha256-gIZwS+Wqp8UulyZmz0nHr+6bOZu6O6nNJraAXE/N6Bg="
+  },
+  "com/fasterxml#classmate/1.7.0": {
+   "jar": "sha256-y4aPIxxczrideV6gDm4bepO49Kwc4di+dt3jIt/0oEY=",
+   "pom": "sha256-ZHEa3vDskvH2zap7LqwGsuVmekppkez7i/rEZoHVuTE="
+  },
+  "com/fasterxml#oss-parent/48": {
+   "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8="
+  },
+  "com/fasterxml#oss-parent/49": {
+   "pom": "sha256-bfHMCoZSQhAIiUNBLJcbQqumidGwaNuf05Htmhk4cjU="
+  },
+  "com/fasterxml#oss-parent/55": {
+   "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0="
+  },
+  "com/fasterxml#oss-parent/56": {
+   "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA="
+  },
+  "com/fasterxml#oss-parent/58": {
+   "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
+  },
+  "com/fasterxml#oss-parent/61": {
+   "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
+  },
+  "com/fasterxml#oss-parent/68": {
+   "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc="
+  },
+  "com/fasterxml#oss-parent/70": {
+   "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk="
+  },
+  "com/fasterxml/jackson#jackson-base/2.14.1": {
+   "pom": "sha256-GAFdG6y6mhRiWovxlBH1v62C0AYN83snvQLngTLEZ24="
+  },
+  "com/fasterxml/jackson#jackson-base/2.20.0": {
+   "pom": "sha256-/IgCjRnuqjftpZbmuY03SfIs/IrdGeoZdFq+g2iDzmY="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.14.1": {
+   "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.17.0": {
+   "pom": "sha256-SWSsYtWw5Ne/Vuz4sscC+pkUGCpfwtLnZvTPdoZP0qU="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.17.2": {
+   "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.19.1": {
+   "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.20.0": {
+   "pom": "sha256-9ig2R+cB/aHNMS3MIcsTKkD3mPGejkL6/D/jR8WlG7s="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.14": {
+   "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.17": {
+   "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.19.2": {
+   "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.20": {
+   "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.14.1": {
+   "jar": "sha256-0lW0uGP/jscUqPlvpVw0Yh1D27grgtP1dHZJakwJ4ec=",
+   "module": "sha256-JnpoC7csvXUsdreeuQiuDAq+sRT8scIKlnjwN4iYues=",
+   "pom": "sha256-id8WI4ax7eg6iATpCDlw0aYr310caenpkUdhtGf4CIM="
+  },
+  "com/fasterxml/jackson/core#jackson-annotations/2.20": {
+   "jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=",
+   "module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=",
+   "pom": "sha256-TXQMRHjdCNCJ7NxtBjIopVoRp+jkl9pDOPhy+BFXlKQ="
+  },
+  "com/fasterxml/jackson/core#jackson-core/2.14.1": {
+   "jar": "sha256-ARQYfilrNMkxwb+eWoQVK2K/q30YL1Yj85gtwto15SY=",
+   "module": "sha256-fIuANfkA8/HL2wa4x53CsYsR9q+hOwt0cZzuNJ/0wyk=",
+   "pom": "sha256-dHse68uLbe8o+u7cCSN0jxwVP8aksNjjsLyo3l/aY38="
+  },
+  "com/fasterxml/jackson/core#jackson-core/2.20.0": {
+   "jar": "sha256-vAz0YHWHcgH4QG7n3idBrn32wGb18EV72AYypxjAbnI=",
+   "module": "sha256-2oWNOW9/pritA4zVzLkDj7ORq3o2rmKWI+N6UyR537w=",
+   "pom": "sha256-XxZVisIjBzpvJHRA8wX1nwXv9QqvHurguq1BKAABb2g="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.14.1": {
+   "jar": "sha256-QjoMgG3ks/petKKGmDBeOjd3xzHhvPobLzo3YMe253M=",
+   "module": "sha256-2BeXfIprCq7aUZ+yp7jcugKzjDwnICT62jLFzOfj08s=",
+   "pom": "sha256-etsj1tdG7c+UbRwGKxmP+aAmwOIrMHuNXXnB4IU4xjU="
+  },
+  "com/fasterxml/jackson/core#jackson-databind/2.20.0": {
+   "jar": "sha256-pw4Uamvyy6T5zTZxaXh/UK3Pu1cSK8LpyDkM0LOXrDA=",
+   "module": "sha256-oSgvNhZKyQG66p7bULqYE3L/7hjCz7F75CW5s/dYeuI=",
+   "pom": "sha256-zv7+0B3SwNlqiOEBuz4GX8FQBjtJjjAak4xpCwK8884="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-toml/2.20.0": {
+   "jar": "sha256-jdTuR1ct08hFSmLsEzfibFAV2gqP2S0GCXCgrvAs7Ag=",
+   "module": "sha256-+aeeUJ922AgX0OkpSFhQyWnbM9E8G4vFkHVjcqESwxs=",
+   "pom": "sha256-0VLUbJmXxVERl6+h7ICb2VJzdd5mnvRcVdSgy+Kprgk="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.20.0": {
+   "jar": "sha256-DU67TVg92pGAHTfHVl1GKiX+kp8NdsNHZ+xLgEExEMA=",
+   "module": "sha256-+Vo/xxi+i/IaLVkpokZpblRMLigfA9yPrPaQhiusUCI=",
+   "pom": "sha256-SSZxpqcwB8Xq7YZ9luLJfKVtGzfSpYx0Zx99V4Aav6w="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.14.1": {
+   "jar": "sha256-nhV+JiXthVq3OveRXiVvaCOZOjCYL0kjycqCu3UqAwM=",
+   "module": "sha256-VanyBdnMgeilSjgYNbspbniFWR0Dx0BGd6EuEvJJeoo=",
+   "pom": "sha256-MLlX5y4J2kuXIn4AFluOTmupgXTK3JcJHDRlLihi4cI="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.0": {
+   "jar": "sha256-zD3sn7i1ZXR5e/72JkEyVQjw5byWi9JoVoQCgY1Vuq4=",
+   "module": "sha256-ZA8QhiTO8o1t6jJ+KC6eyC9lEhVY5gkcqPuJlfkUpac=",
+   "pom": "sha256-rpwz0EFZBkwZsuq0FIiU+jHxVjW7/lMYzjIp+OFHCcU="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": {
+   "pom": "sha256-+jI/nD8sJtfMzU4hNgkQRRVNRdwcFmHU+HakcfVix1k="
+  },
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.0": {
+   "pom": "sha256-RH4cfT+o2Skn3L2DjSRGOAXohi9yPM7VENUNrrhPgLQ="
+  },
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.14.1": {
+   "jar": "sha256-C2U2E/UdbhU5bStlzP7JU5sqtHHFhC9bEaxId8vVH3I=",
+   "module": "sha256-/Tb5c/sUISE7KMjOFXtoj0oKO+9gll/wzohQDtbJIh4=",
+   "pom": "sha256-yRM4B2Gdzeb1Jc1UNJZSk/0BcUccj4R+D6GVu6GttNc="
+  },
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.20.0": {
+   "jar": "sha256-jDIVWXWpNbH3v9Z3ZHvVyM3uErFEuE5EkqRHteoulNU=",
+   "module": "sha256-GLsOOniabs0DmHNhBUEU3jf6hrB98wzeKuEO2L3LFgw=",
+   "pom": "sha256-DPgn58+QwbLF/C2PIXWgKO5ylG1rWN4YL7/ZDlTO1Zk="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.14.1": {
+   "pom": "sha256-CyfB7lgSDFHyo4cXwseUr/qa91wSNNcpe5zkLof8Il4="
+  },
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.20.0": {
+   "pom": "sha256-jhXY4aWgLsdHIj8j4OSkmv5vZVUERDysO47pkvqWxSU="
+  },
+  "com/fasterxml/uuid#java-uuid-generator/4.1.0": {
+   "jar": "sha256-u0s3BtLxXF5eYCPu0lG87hOPoVK+NUdJ9W/sAccmhnk=",
+   "pom": "sha256-5TZK+P0X73rgJVElx+Qy1w0YW/Uy6cLzOSWZSeendSQ="
+  },
+  "com/fasterxml/woodstox#woodstox-core/7.1.0": {
+   "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=",
+   "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU="
+  },
+  "com/fasterxml/woodstox#woodstox-core/7.1.1": {
+   "jar": "sha256-ArnQIunUdwT/inqFmg2/07KIKoMR63/x4YD3YMzaJxI=",
+   "pom": "sha256-r7XLRdQcH542dZCd5P7yQr3BzqRHagY0riD016VEM/8="
+  },
+  "com/github/cliftonlabs#json-simple/3.0.2": {
+   "jar": "sha256-/aZamtDhrAyImHEG6Jqk2LKiSV5+BCNx76g4E/ZbcpU=",
+   "pom": "sha256-sNrLFHnNTb4IENGqM1vw+5vDxP9VNpyHWXumj1h5/k8="
+  },
+  "com/github/java-json-tools#btf/1.3": {
+   "jar": "sha256-Z8PkYutQgH9OCl9N7jBLvxfNmGpC7l6wsvTJv2TRMNk=",
+   "pom": "sha256-qb8bOVbm1Gy99zeRKOsXMs3hrGVAl5RNxlobbcQlcPA="
+  },
+  "com/github/java-json-tools#jackson-coreutils-equivalence/1.0": {
+   "jar": "sha256-60qa19gD+whL/895PIqB9R10W21DjChHDvnVql+4oYI=",
+   "pom": "sha256-0Vd8uaSY6Et0+ADXdRiQb/ErXT4vKJ2SqTauCU6sxeE="
+  },
+  "com/github/java-json-tools#jackson-coreutils/2.0": {
+   "jar": "sha256-FrOqvTqeslZV3aQz41+b2cfBqnmRQncC9fEfAAgT27A=",
+   "pom": "sha256-jZ7pOk/dXSvYDrqUonoTDWBo8/heSI61vxSUOHEc6eo="
+  },
+  "com/github/java-json-tools#json-patch/1.13": {
+   "jar": "sha256-H3lNJWlltT7zfnC1VQXi7QDdwBhNROLo4f3OWjysx94=",
+   "pom": "sha256-59lec35Uwo1EuFv2Qw8VNvZEZU1pQr2ogzM4r5aWSw8="
+  },
+  "com/github/java-json-tools#json-schema-core/1.2.14": {
+   "jar": "sha256-yFmUL92inCbMsr6DqEU6Ew3jX95viK4Yl4VRa10U+Bw=",
+   "pom": "sha256-pR/BAI6VN7vFJbpywl4Lz4LzXxscwwfC53jS7fO9V18="
+  },
+  "com/github/java-json-tools#json-schema-validator/2.2.14": {
+   "jar": "sha256-zZ48WZuzIpZRf9OsOL7qxwnwpquBstQolJXQNhulmJk=",
+   "pom": "sha256-W8HTDGddkv+DV3ldOvN172JqvffrMjS2TahmKqEeqZs="
+  },
+  "com/github/java-json-tools#msg-simple/1.2": {
+   "jar": "sha256-vvQRG5k6Wz5hSNj1hWIczqwqGInNvDREixFjLg2Kmo8=",
+   "pom": "sha256-bvPzUgcukUz6FzkzRoXyotAAJRL8Ul+kEtSQ1FCUMKM="
+  },
+  "com/github/java-json-tools#uri-template/0.10": {
+   "jar": "sha256-OTb2fY59+j7t7+RQ/1iHF0kwiYLGuLcGU1qIQ5HfT7A=",
+   "pom": "sha256-MXithX0gGmwpZy4rFGrAuj7MUlNquZaUpGuxJfoBxrk="
+  },
+  "com/github/luben#zstd-jni/1.5.7-6": {
+   "jar": "sha256-jW/rHaM186sTxYTGE+I8ezxhs5LjeVaHIFe6+PDKHW8=",
+   "pom": "sha256-eU2bmV7VkWXFQkPcxz/pSD1/4a9/uA/NiaWuW2k/Prc="
+  },
+  "com/github/sbaudoin#yamllint/1.6.1": {
+   "jar": "sha256-YccXmoNkEmHOiqN5S+SlSktSwxI5MT7AAJMi173S18A=",
+   "pom": "sha256-daHGB6n65mSN+/eACWColxeQYxf7p7L2aBZp4m/2c4U="
+  },
+  "com/github/spullara/mustache/java#compiler/0.9.14": {
+   "jar": "sha256-mafnhVYJE1AG8Hjm3n7mnarZxC+Y5nnVb4BlPLF1Jrk=",
+   "pom": "sha256-M0TNSA2Mz1asiNPt1XcczObz9r65e4jK85/048qwibs="
+  },
+  "com/github/spullara/mustache/java#mustache.java/0.9.14": {
+   "pom": "sha256-iZF4w5Q7MF//GOIlc04lIPaSdGOFsoHt44s177GY28A="
+  },
+  "com/github/stephenc/jcip#jcip-annotations/1.0-1": {
+   "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=",
+   "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs="
+  },
+  "com/github/victools#jsonschema-generator-bom/4.38.0": {
+   "pom": "sha256-qI4O3H4wtJ3pKPvDTZZ6ctBZhhgFVJ0TZgTi18F4Vis="
+  },
+  "com/github/victools#jsonschema-generator-parent/4.38.0": {
+   "pom": "sha256-7zGmAYp3p7rUEvJmr0wr4mkYyOrNeTqsHsKchXetnJU="
+  },
+  "com/github/victools#jsonschema-generator/4.38.0": {
+   "jar": "sha256-reSuswHbQCisa8ugFsMUBWd+N6rm7rrxPJneP9s1MbQ=",
+   "pom": "sha256-fGShOTefv7ech/bQeeOHJAlIDJuBDFUUdq+eS1sU0Os="
+  },
+  "com/github/victools#jsonschema-module-jackson/4.38.0": {
+   "jar": "sha256-NvvT8cJzecO6hCCsLLC0JBH3vDs9+L3RHY1+AkocKMo=",
+   "pom": "sha256-3xNRAY7s8q4QI4m0IVkgmGS6fkOsWrnxkqK96rkKj7U="
+  },
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/code/gson#gson-parent/2.13.2": {
+   "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0="
+  },
+  "com/google/code/gson#gson/2.13.2": {
+   "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=",
+   "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y="
+  },
+  "com/google/errorprone#error_prone_annotations/2.41.0": {
+   "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=",
+   "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
+  },
+  "com/google/errorprone#error_prone_annotations/2.7.1": {
+   "jar": "sha256-zVJXwIokbPhiiBeuccuCK+GS75H2iByko/z/Tx3hz/M=",
+   "pom": "sha256-Mahy4RScXzqLwF+03kVeXqYI7PrRryIst2N8psdi7iU="
+  },
+  "com/google/errorprone#error_prone_parent/2.41.0": {
+   "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
+  },
+  "com/google/errorprone#error_prone_parent/2.7.1": {
+   "pom": "sha256-Cm4kLigQToCTQFrjeWlmCkOLccTBtz/E/3FtuJ2ojeY="
+  },
+  "com/google/guava#failureaccess/1.0.1": {
+   "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
+   "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
+  },
+  "com/google/guava#guava-parent/26.0-android": {
+   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+  },
+  "com/google/guava#guava-parent/31.0.1-jre": {
+   "pom": "sha256-s7a2qnCZwRgXrO6FsyL9kffuMq6mn+CD7jbIc17AZ4g="
+  },
+  "com/google/guava#guava-parent/31.1-jre": {
+   "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw="
+  },
+  "com/google/guava#guava/31.0.1-jre": {
+   "jar": "sha256-1b6U1l6HvSGfsxk60VF7qlWjuI/JHSHPc1gmq1rwh7k=",
+   "pom": "sha256-K+VmkgwhxgxcyvKCeGfK/3ZmRuIRO3/MPunCSkCy85Y="
+  },
+  "com/google/guava#guava/31.1-jre": {
+   "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=",
+   "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI="
+  },
+  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+   "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+  },
+  "com/google/j2objc#j2objc-annotations/1.3": {
+   "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=",
+   "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU="
+  },
+  "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": {
+   "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=",
+   "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE="
+  },
+  "com/googlecode/javaewah#JavaEWAH/1.1.13": {
+   "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=",
+   "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q="
+  },
+  "com/googlecode/javaewah#JavaEWAH/1.2.3": {
+   "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=",
+   "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM="
+  },
+  "com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": {
+   "pom": "sha256-X12sUXT4TGCi6Z56g8eCb3NJgfvCDqHUN/em/Piq2hY="
+  },
+  "com/googlecode/libphonenumber#libphonenumber/8.11.1": {
+   "jar": "sha256-9DDJI5TCBT8WhxWFPaltmZlulONOWikbl8XIalrWKpg=",
+   "pom": "sha256-irUVuq10qC2rsC6+nm8XLUj0r+0KyAxn7aKIRqbN7dA="
+  },
+  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.3.1": {
+   "pom": "sha256-UTTWOg2SWbKU+BUhoZoEAhUkhUVGiq7E9MBGfIKVx1o="
+  },
+  "com/gradleup/shadow#shadow-gradle-plugin/9.3.1": {
+   "jar": "sha256-lGB42YbsVs6P+NAWN9kPcJ8zPVg6tSCq3Y5EnTcE2Gc=",
+   "module": "sha256-IuNwRjPPGSGbTVGUqNKJDPfPTbctRA5g6BIlcS+na2w=",
+   "pom": "sha256-nLrNpEyjh3wt54LMo5iIGUYCimh4H/kOypnamAgO/JE="
+  },
+  "com/hierynomus#asn-one/0.6.0": {
+   "jar": "sha256-5PcP2ShJtSJABIuOus4MmhfTu3uciCs8d3jOw0WElfU=",
+   "module": "sha256-kTF65Trklkji5iC7kCU8wz8Y+aKpbzxUHmY8XyIYDC4=",
+   "pom": "sha256-wuf3bSKfKjXjkpIqI6U6DjEQ6emHfafnFWbTuqM9B9I="
+  },
+  "com/hierynomus#sshj/0.40.0": {
+   "jar": "sha256-pqVTP2WA4EGN/Ky7U5ZoAYZphYXDJfqVDHiOdJ8k0eI=",
+   "module": "sha256-c8KVG3RMaiLnrjN0TeB7YUuKRe8GhXrFyf8SvICa/h4=",
+   "pom": "sha256-c71nWzNCNjkZXXI7h9tIGuSlKSw+izWqT+wipKiUvi4="
+  },
+  "com/jayway/jsonpath#json-path/2.7.0": {
+   "jar": "sha256-3oLw5GAu6gGH3zZ3mujPwWU7bZIBJWdK9NNl0LyllQg=",
+   "pom": "sha256-F5akBRkEB7LqzgQlhmlKmy/w2XuCAJ016VyeIVDN0Mc="
+  },
+  "com/jcraft#jzlib/1.1.3": {
+   "jar": "sha256-ibE2D0Bzgb9h/eQRAZ2MvQCeuxDP9xXzZpAXoDECdWA=",
+   "pom": "sha256-7bZyUWCFVq2VhNAORrXvOOzxJG1XHA+A8k9QsoWp9oI="
+  },
+  "com/lmax#disruptor/3.4.4": {
+   "jar": "sha256-FSTtMfE7yr7hthRuZ74wxjF8uU/NDHwvfHofPoIIfFE=",
+   "pom": "sha256-34QNrLNYveyOnBZAlyHksOsFJGF9QkJt9yg3b8WHQi8="
+  },
+  "com/networknt#json-schema-validator/1.0.76": {
+   "jar": "sha256-CbdNrjzp+L4eeUm979MWQt3aWD4us1ZDnSn5QRMB6uA=",
+   "pom": "sha256-+gTgetjg62RK7LCU6USfD7GSxne3ywqurvL1ndq6UHc="
+  },
+  "com/nimbusds#nimbus-jose-jwt/9.28": {
+   "jar": "sha256-7bukLZl+N6zws2zk1anErIjv2ILOVwfzXnUZaul2LkU=",
+   "pom": "sha256-5rSewLgGmFClCxkWO1b8eoiyU6D2R7Su5uH7mAGnsnU="
+  },
+  "com/opencastsoftware#prettier4j/0.3.0": {
+   "jar": "sha256-kcRe7xf1zAF9i34MS17RaXvPsE7diA1GPBI1ifiUZKU=",
+   "module": "sha256-jZnl1eYVYFTaC+5bnASCqTpqn8zYNmkG87z3/Do4C4c=",
+   "pom": "sha256-AJn0HeKWFX1HHUiEwacTWHV4zYVYqwWqQrevp1LMhNc="
+  },
+  "com/samskivert#jmustache/1.15": {
+   "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=",
+   "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k="
+  },
+  "com/squareup/okhttp3#okhttp-bom/4.12.0": {
+   "module": "sha256-fg4vNHsbY22SsEMZnlFAPhXwn7SsRujBY1UaWCt7Brw=",
+   "pom": "sha256-eAg47mfyoe5YCIfeinSOWyWfnoFULhxCRNUEJlmSLhQ="
+  },
+  "com/squareup/okhttp3#okhttp/4.12.0": {
+   "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=",
+   "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=",
+   "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg="
+  },
+  "com/squareup/okio#okio-jvm/3.6.0": {
+   "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=",
+   "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=",
+   "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8="
+  },
+  "com/squareup/okio#okio/3.6.0": {
+   "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
+   "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
+  },
+  "com/sun/activation#all/2.0.1": {
+   "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw="
+  },
+  "com/sun/activation#jakarta.activation/2.0.1": {
+   "jar": "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=",
+   "pom": "sha256-igaFktsI5oUyBP8LYlowFDjjw26l8a5lur/tIIUCeBo="
+  },
+  "com/sun/mail#all/1.6.2": {
+   "pom": "sha256-S36Dqpt31l4AfpfLUPm4nNt1T6rxZBHl/ZTR49q3brM="
+  },
+  "com/sun/mail#mailapi/1.6.2": {
+   "jar": "sha256-03wPiO+llzzLQQD0zEmu41EM0BqyUBLR8IWxt5iuLrs=",
+   "pom": "sha256-PPiVwnXN1NlmmFtwGYwVAaTl/UqfbYGDiGJKm24oCMA="
+  },
+  "com/sun/xml/bind#jaxb-bom-ext/4.0.1": {
+   "pom": "sha256-q7S3Gd3TFWhM1/W/iebXU2XC4I8wCVmsbF9SyjioLxk="
+  },
+  "com/sun/xml/bind#jaxb-core/4.0.1": {
+   "jar": "sha256-EIaQnLEwQzA52OKGW/Mxr2KNmSvO8QqV9y3BIasCB3U=",
+   "pom": "sha256-GmaseJTWVDkAz/EMuxD0hZ68DoQHbYPpP1ybc8wx3lY="
+  },
+  "com/sun/xml/bind#jaxb-impl/4.0.1": {
+   "jar": "sha256-2XplOnj4z5pt6azznU7ZHaOQe/7XSOhzCmLDD58+ycE=",
+   "pom": "sha256-rywz0zS9LjOZLR+fQqSItix5SdweJqpEJ5kMUn4vbZ0="
+  },
+  "com/sun/xml/bind/mvn#jaxb-bundles/4.0.1": {
+   "pom": "sha256-sBFLQhIwN6zURDEpu2pdhvCVtdzSLt7wGrGpNvxRcIk="
+  },
+  "com/sun/xml/bind/mvn#jaxb-parent/4.0.1": {
+   "pom": "sha256-URxR71bIkbZ15LYenyNqUDCVLBBy/5RgQBgXoQRT+K4="
+  },
+  "commons-beanutils#commons-beanutils/1.9.4": {
+   "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=",
+   "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA="
+  },
+  "commons-codec#commons-codec/1.15": {
+   "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
+   "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
+  },
+  "commons-codec#commons-codec/1.19.0": {
+   "jar": "sha256-XDiB5PVWhV6cUykn7gyd/elMxmdg1YBcAxpZiHBwr18=",
+   "pom": "sha256-4PMmn6I94MgxMMVln1+VFMxUIsC830Xy6uAEp4ufyjQ="
+  },
+  "commons-codec#commons-codec/1.20.0": {
+   "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=",
+   "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys="
+  },
+  "commons-codec#commons-codec/1.21.0": {
+   "jar": "sha256-TahRy2q/uYv+nrd8Xl/Ef1QU+ii5TiG3/ZpkZwXcFn8=",
+   "pom": "sha256-sjBBa6b1v534/Lbn9KbCa4+w/oXONx0T1YRu03aDCbc="
+  },
+  "commons-collections#commons-collections/3.2.2": {
+   "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=",
+   "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws="
+  },
+  "commons-io#commons-io/2.11.0": {
+   "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=",
+   "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k="
+  },
+  "commons-io#commons-io/2.20.0": {
+   "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=",
+   "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio="
+  },
+  "commons-io#commons-io/2.21.0": {
+   "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=",
+   "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas="
+  },
+  "commons-logging#commons-logging/1.2": {
+   "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
+   "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
+  },
+  "commons-net#commons-net/3.12.0": {
+   "jar": "sha256-j2pUHEesFpdhwQBOAKgqtNPrsXRlU91D1GJfINooj68=",
+   "pom": "sha256-6Lbc3P9e766sV5fEjqAM3L06Kftba7KgFzBcWwNC0f4="
+  },
+  "dev/equo/ide#solstice/1.8.1": {
+   "jar": "sha256-bluizOgTvh1xzNwuzz5JJxsU5pG/u7GhFM86MOdzsQ0=",
+   "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=",
+   "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY="
+  },
+  "dev/failsafe#failsafe-parent/3.3.2": {
+   "pom": "sha256-52onlGrLqFePJthfAjPMDzlGiw58KYXcbXxs4BBVLYQ="
+  },
+  "dev/failsafe#failsafe/3.3.2": {
+   "jar": "sha256-LF3Ieabax+o6eynXleJ71JuOeQiwXC8+VgU8GdeYUPU=",
+   "pom": "sha256-elPaR8MAdPlyXIyfzWg8a/gTZ9QnO9+653PzPDR8aCs="
+  },
+  "io/github/classgraph#classgraph/4.8.154": {
+   "jar": "sha256-8LBLXXexjtow8h+NHDXNbiuMsv8PmsRuc71yekdW39E=",
+   "pom": "sha256-Irh7X4jt0O1kE2d4w9XluyqenqONrkg8+pOoAn3Qgd0="
+  },
+  "io/github/openfeign#feign-core/13.6": {
+   "jar": "sha256-a5ExfdLx4LEl5xhTvZ29dLZ2gWGdMEN/+BlBd731Ha4=",
+   "pom": "sha256-1uf9yKPCu0DoGIsfc0zf3yYS8deOlb2OZMfHb5jTVRM="
+  },
+  "io/github/openfeign#feign-httpclient/13.6": {
+   "jar": "sha256-WoRZZLfm/uE11i0baM4we9gmuSvgCFyB+RklxfhNhno=",
+   "pom": "sha256-Se4SislVzUMEj0qRF4j7lkAGYEDD6pI/sjdB1j4mP+E="
+  },
+  "io/github/openfeign#feign-jackson/13.6": {
+   "jar": "sha256-KpfbJvmD8yqyJ5hanpTSjqEg7ECldws2PRn7D+YMKKg=",
+   "pom": "sha256-Bj16hDR8oBcEV+NgRB6h6hRtaKKnVdWNDhRV1i5Z+zg="
+  },
+  "io/github/openfeign#parent/13.6": {
+   "pom": "sha256-FMdh8Vri8lwSiEc2ZBx0tNjk/4wlEN5g1RgpKxPK4Bg="
+  },
+  "io/github/openfeign/form#feign-form/3.8.0": {
+   "jar": "sha256-sh03Mhs5CZXJC127T/DDPwnRzHdoIHzA2pEK0gv1iWE=",
+   "pom": "sha256-D4CkZ0u1MYDM5oTWpxeVbUDCIcrrVh21WzOLYJO5v6s="
+  },
+  "io/github/openfeign/form#parent/3.8.0": {
+   "pom": "sha256-ZKg9FHuJxYsWwdCuce7WDT+G9UUXNMVhw/wouG4Fzc8="
+  },
+  "io/netty#netty-bom/4.1.108.Final": {
+   "pom": "sha256-td6R8Ml3wFv7QtkZtQvV6WPxfWxDRu1qM9Xdod3fEHQ="
+  },
+  "io/netty#netty-buffer/4.1.86.Final": {
+   "jar": "sha256-5C4V9HyGUmax+qbgOOv9fdrc+fSunmYX7dSIHb1Kvog=",
+   "pom": "sha256-AuVYTl+waYU7QYqRQ15Xdxp2efcf8Ex6K+UXzdOGZF0="
+  },
+  "io/netty#netty-codec-http/4.1.86.Final": {
+   "jar": "sha256-P2zrMRLPz3twVF61ERIgzlfbVNWT8j9kw4MzuyLEC4Q=",
+   "pom": "sha256-Gk2fY66Da5YHWhrQ/QBLUOAerjgqx6BnqPGhtnn/v14="
+  },
+  "io/netty#netty-codec-http2/4.1.86.Final": {
+   "jar": "sha256-6Ojijmq2u5ia7ZBHeJIgRfOIz7QgvB6zer9N+IAdsWc=",
+   "pom": "sha256-E79xRBBCtPvWvrk+VMLnVy11UUJy6JCerJxYxFM4RNE="
+  },
+  "io/netty#netty-codec-socks/4.1.86.Final": {
+   "jar": "sha256-g4ovRmeOhKu37XZiR9A4y4Xfr8SA/4wsXkLZHZnF/00=",
+   "pom": "sha256-qmEWU5aTLf+2bzyVEX8jx+jGUjx9G6uBH9k0SVhJij8="
+  },
+  "io/netty#netty-codec/4.1.86.Final": {
+   "jar": "sha256-BFaEC1yFHa1sq4gc0amtXZFttl2BBIFF3x2abQMyW+o=",
+   "pom": "sha256-6PLkDv2+igJXYhulUNlS53RK1wlXf+ITQXsvya8zJUI="
+  },
+  "io/netty#netty-common/4.1.86.Final": {
+   "jar": "sha256-o1o/FufNRcXYUpqj53AtTvOzYhPqMy21l0TqNI/Crpk=",
+   "pom": "sha256-PhYyrWMX3D24rTt3V9I/l3lXHXKNvGrUAyoZqItQ64k="
+  },
+  "io/netty#netty-handler-proxy/4.1.86.Final": {
+   "jar": "sha256-uBL+fXLIT7yE5TtPJnZNgvdrBqZfMx8PvZVDqnPhj5E=",
+   "pom": "sha256-6KOsTrx3EaCm5UZS2DK1uUiCdlFtPpGyaGKGxxEwafc="
+  },
+  "io/netty#netty-handler/4.1.86.Final": {
+   "jar": "sha256-5ptCKSkpsnjcUi4lF33ffFQCVIS1WHn4InNJrfvhwE0=",
+   "pom": "sha256-MtNruk2l9kv9vau0PHGVXnzQ6dZ5BTHU0/6XiCp+YKs="
+  },
+  "io/netty#netty-parent/4.1.86.Final": {
+   "pom": "sha256-HZIrfai+sQMcrCpfr89xnOZyyyy2nuzJw4PzCswWUBM="
+  },
+  "io/netty#netty-resolver/4.1.86.Final": {
+   "jar": "sha256-diihMJ1/JEPcQdiSOn8mnimBuWFvgKmZ63JkrmvL/bo=",
+   "pom": "sha256-q/IkL64IwCALGC91P6pvP0g+wdpt2waO5xfwTOBCB/k="
+  },
+  "io/netty#netty-tcnative-boringssl-static/2.0.56.Final": {
+   "jar": "sha256-eS2vMLQmGm6uvmUsFxqq4Qr/GBoomT7GWUJtiefzafg=",
+   "pom": "sha256-jiXf4zBSV9HHQ1tgk6oqvu8yXN3rAjgxYaRqHF+QcOc="
+  },
+  "io/netty#netty-tcnative-classes/2.0.56.Final": {
+   "jar": "sha256-7t6Afw3V6xrXTqGuEJRDBjHaY/zeANTcIOsM0Ei7CsM=",
+   "pom": "sha256-XvARmSCV3II/sBw7MUKMSmypKnvem7jyetY4DqolYjY="
+  },
+  "io/netty#netty-tcnative-parent/2.0.56.Final": {
+   "pom": "sha256-PuDTYrA0q7bTmnEE8G7g0fruIz9MrTVQwwuFKFeaPWE="
+  },
+  "io/netty#netty-transport-native-unix-common/4.1.86.Final": {
+   "jar": "sha256-7CbQOgZWV5HVfpl/eTZ37k0/xHspC3lRiYwuzQIy8RU=",
+   "pom": "sha256-HLTiJ560F+3OKE9xvflhQYMmTyLwUNxTcm9W3w9SC5U="
+  },
+  "io/netty#netty-transport/4.1.86.Final": {
+   "jar": "sha256-9nJtzVTkkitGs7T0RntEOnCjDrCKYmIMj+UC2MuALJ8=",
+   "pom": "sha256-hc9ax3wb90xRqFFVexdXE560zS0KW2HK4oSfRvy1ldo="
+  },
+  "io/prometheus#parent/0.16.0": {
+   "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY="
+  },
+  "io/prometheus#simpleclient/0.16.0": {
+   "jar": "sha256-IsN08jf3vE/bHw7C2jecC6AOaa0v/otq3lQ9cwYtN38=",
+   "pom": "sha256-/sCA0HqxWHXZccSugflR2mG1z/mZHPUOUwuo/KR3CXM="
+  },
+  "io/prometheus#simpleclient_common/0.16.0": {
+   "jar": "sha256-66bsJs5+QMu4cl4F+4Mkep9PRJRbnnUi4zdd3me58Fk=",
+   "pom": "sha256-d/ARCc4VB710Q+InJzdnSydST6rLDcuW47jt4LarnrY="
+  },
+  "io/prometheus#simpleclient_httpserver/0.16.0": {
+   "jar": "sha256-yrh94QtqR0FRzO68O2NDKalz/7YCzm7+8sD9l6kDZcg=",
+   "pom": "sha256-PGR/1vVhohsZ7ZcdBBn9Ri2fg/k0e8ChBaHCie6qqsQ="
+  },
+  "io/prometheus#simpleclient_tracer/0.16.0": {
+   "pom": "sha256-OBK7IrlfgbTDRg6eTnXDunL6ReRDqfzlMghCqr0OmcI="
+  },
+  "io/prometheus#simpleclient_tracer_common/0.16.0": {
+   "jar": "sha256-6Ep4SsjiTxgu5i2oC2tcgUB3S3W/pL+cw9O4OQ22JfY=",
+   "pom": "sha256-X5AHXOz80RKB3pzLSJaNEhKyRnDWhP/IQEQaUq6HXv8="
+  },
+  "io/prometheus#simpleclient_tracer_otel/0.16.0": {
+   "jar": "sha256-oqhMWb7zeWu3+cbyrot96LkFMT7ygYCsPef/Yd1o3z8=",
+   "pom": "sha256-frl58dwz6L5OWtFDDlQJcYpBeDwmd5qzEFJg9rQ20EY="
+  },
+  "io/prometheus#simpleclient_tracer_otel_agent/0.16.0": {
+   "jar": "sha256-etK7QN90p3LZ9URaPQNXm0nWs3pH1ekPbPP1ns9BrQY=",
+   "pom": "sha256-VSj4WIQ1SulNm8BnR+f1iS0JLAtVBVrnBWZo6gyhznw="
+  },
+  "io/swagger#swagger-annotations/1.6.9": {
+   "jar": "sha256-fvhZdOXYL8q9DavSxFXNgDeLNtd03gF86shCo6T6ZPg=",
+   "pom": "sha256-6BtJB3W1C6snD7sLb7wKoda0wHS6GFuwUrjsMTFIPmk="
+  },
+  "io/swagger#swagger-compat-spec-parser/1.0.64": {
+   "jar": "sha256-zkFPC8rqxSFq7q/Wivre+J/TPc4m+Zba3uDGO5UWPAM=",
+   "pom": "sha256-DK2rKrdbuIf3HmIl5RiL9KxTiWKHQ+JQrCsUwwOaCfo="
+  },
+  "io/swagger#swagger-core/1.6.9": {
+   "jar": "sha256-QPtMcZBJR65H+f/P6+3v3mMNiUfhwbtmdDu8QPB7ngE=",
+   "pom": "sha256-3y2nBUrbCjZR1NQ87aKblNXd0Fhz0tgU1OSXe6cPSek="
+  },
+  "io/swagger#swagger-models/1.6.9": {
+   "jar": "sha256-zwtTERHMwCqAE3nXQ8jjPwL7x5BpiqIOYsYvR22oyVo=",
+   "pom": "sha256-YNg3lgDJP0qyFYkWJ6cednc+KiSitd1n/DkkWSjxv2s="
+  },
+  "io/swagger#swagger-parser-project/1.0.64": {
+   "pom": "sha256-tMVYXqpLuz2i3XNVaP4YdG+8DwhTzXRjF9tQoRRN6eQ="
+  },
+  "io/swagger#swagger-parser/1.0.64": {
+   "jar": "sha256-IgYs5/fEO7UodTpc8I/3tZ6A0e4hHxP92+rn3aaQsyg=",
+   "pom": "sha256-Y7RH9HoMcUh8xP5tcIuXilfa32WaxvjnwjUPbmD5ryM="
+  },
+  "io/swagger#swagger-project/1.6.9": {
+   "pom": "sha256-bSqxGVAq0G+Apf8NdBzwshPFYXC1F2H8WRGuzY9RJEE="
+  },
+  "io/swagger/core/v3#swagger-annotations/2.2.8": {
+   "jar": "sha256-Cvzf5Kd3X8zlHRBbj3yMpRRnbBa+pXFCNQPYOHd/Ed0=",
+   "pom": "sha256-VhgFAUOpHf/pVfAn7PDg75Z310EbGyXBRsoZUXgQ2Zo="
+  },
+  "io/swagger/core/v3#swagger-core/2.2.8": {
+   "jar": "sha256-c4Japfb0d8Y340xwIQspV7jpBL8PXA0yuqoqN9LDOiM=",
+   "pom": "sha256-cwB0DaF4EVy0TpD+lk91x5UNgEm0n7br4tsXxwFDzE0="
+  },
+  "io/swagger/core/v3#swagger-models/2.2.8": {
+   "jar": "sha256-s3I3ROAu1TADsWLViUqeF8QQxTOrKmlwtDCSHln032Y=",
+   "pom": "sha256-p20h2UwizuLWBXr7py8sdDxwA7x1e3IXhY+E84CTXdE="
+  },
+  "io/swagger/core/v3#swagger-project/2.2.8": {
+   "pom": "sha256-a17siOJKC8vQFj9ZEErvDwBtJ+S7CGG9ypgCW2f9lFc="
+  },
+  "io/swagger/parser/v3#swagger-parser-core/2.1.10": {
+   "jar": "sha256-dWGrUJ6XLPu1LNmROSwuOQvBPQ/1+/ykJWDTBaG2UJM=",
+   "pom": "sha256-lZbs9gLG/YGLNEOz68v0pN4cijVATcgL73aWsog0CW8="
+  },
+  "io/swagger/parser/v3#swagger-parser-project/2.1.10": {
+   "pom": "sha256-R8bWO70ZDgOdpigmdcSWWTfnr7Tg8EHU9gPS0PIH5hM="
+  },
+  "io/swagger/parser/v3#swagger-parser-v2-converter/2.1.10": {
+   "jar": "sha256-mAr5/FK/ftv8QMlUZViP3Nz1Bt2nqQYn/qnhBvBcI+s=",
+   "pom": "sha256-9Oqs2CxPfKPy3+D+CT6EQs4vsC3TRSKIW2wr40KFm4o="
+  },
+  "io/swagger/parser/v3#swagger-parser-v3/2.1.10": {
+   "jar": "sha256-sa24NH67Y8+SsHt5v8sHWAzsCDQID13MNTz+8UHFr/c=",
+   "pom": "sha256-ultheoFp1/obMPnRwt3q3Cd25b9vSp3Ycshwj9n67rk="
+  },
+  "io/swagger/parser/v3#swagger-parser/2.1.10": {
+   "jar": "sha256-AyreTvUvSxReAlKLhog9Ftf6siz0iHkXKPxk0/mvxKM=",
+   "pom": "sha256-4KEdmSQXRe3uUvmuOfVVLICg29b5+wah1q5nF+KDxyY="
+  },
+  "jakarta/activation#jakarta.activation-api/2.1.0": {
+   "jar": "sha256-VujZlAlf5JwoE4xgKRSC9m8Y0SrCtyDpOGl9zmoxNcc=",
+   "pom": "sha256-hw0qdcyS4K7Dfo0WNxBVLTVDGJ6B6cqQCaMl33YMKwY="
+  },
+  "jakarta/activation#jakarta.activation-api/2.1.3": {
+   "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg="
+  },
+  "jakarta/activation#jakarta.activation-api/2.1.4": {
+   "jar": "sha256-ydtSEAzmyKrJXMOQdflXINLlYbEfgFG4HBIa1O/9cAQ=",
+   "pom": "sha256-dXeXDcCfETGkpCdp4Xce0GLwjSL0DaMEH/PhbVsv3qg="
+  },
+  "jakarta/mail#jakarta.mail-api/2.1.5": {
+   "jar": "sha256-qkk3U6y3qMRbqPTJzxIwp04gI3BW3Vtci8hsWD6M+g4=",
+   "pom": "sha256-8DvLWbt34aAJnIkGPZ0JprtNUNVpl6TV7hv1jjhk70M="
+  },
+  "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
+   "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
+  },
+  "jakarta/platform#jakartaee-api-parent/9.1.0": {
+   "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
+  },
+  "jakarta/validation#jakarta.validation-api/2.0.2": {
+   "jar": "sha256-tC1CQo89kiyJKpCfoEMofVd8DFsWWtm31WjOv4f8nqQ=",
+   "pom": "sha256-Oy5Oh3+3C6+h2tdcDemZxFYTEoLUcbpR3z25bDt02pI="
+  },
+  "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": {
+   "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY="
+  },
+  "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.0": {
+   "pom": "sha256-4lW43VYeity88NHHus2uynK5Cr9BPy5//TSBd4rhCZA="
+  },
+  "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": {
+   "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=",
+   "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o="
+  },
+  "jakarta/xml/bind#jakarta.xml.bind-api/4.0.0": {
+   "jar": "sha256-V+N5atV1NkAIj1+dPFPBg/LCULfa2QUp6j4ZpVFaoSI=",
+   "pom": "sha256-a9atlG7ZyKRKJrYKX8zM/M9fyMy/v/SQS1kXs8aUACs="
+  },
+  "javax/inject#javax.inject/1": {
+   "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=",
+   "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o="
+  },
+  "javax/servlet#javax.servlet-api/4.0.1": {
+   "jar": "sha256-g6A92HfTZ0V28Np7kHVchSSvCZzPBgf8YaqXFTWtfGA=",
+   "pom": "sha256-FAVeYVW4oqYype7GoeW+DAoLo4D36T+ctMuPfk+Vm/E="
+  },
+  "joda-time#joda-time/2.10.5": {
+   "jar": "sha256-Tuc+f/ji3w1ONAjPGhUnpZ8mXdn7Q/ubLrgY2H+TdZ4=",
+   "pom": "sha256-e68nY7sOgdUYq6BpP2KTddt0ltAhBuTYCMUeD4wxTT0="
+  },
+  "net/java#jvnet-parent/1": {
+   "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
+  },
+  "net/java#jvnet-parent/3": {
+   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
+  },
+  "net/javacrumbs/json-unit#json-unit-core/2.36.0": {
+   "jar": "sha256-a1j8/G2tlI6YMwzlmDUrOjnEndyPbZ9aCYPpL8h1hwU=",
+   "pom": "sha256-k2b/YXpssLQW3sOJQ13+q5AIsgj2lIvSVj8uAgQ5dTM="
+  },
+  "net/javacrumbs/json-unit#json-unit-parent/2.36.0": {
+   "pom": "sha256-xZA74bIcEdkTIEXwxbQKQqEdX0iub0+ORtLExeVscnw="
+  },
+  "net/minidev#accessors-smart/2.4.7": {
+   "jar": "sha256-71EDQp8QH34/9i86GCNCcgQ56upD0u7TEZu6dwuyAqk=",
+   "pom": "sha256-WNvy07GUT0rbSSvQXSWM0OVW6r/5oU3qnUEBo04FguA="
+  },
+  "net/minidev#json-smart/2.4.7": {
+   "jar": "sha256-KMF+0WrCLmhFdD/R6EMh7fXXc1/CFuRO4mnRBr89gUY=",
+   "pom": "sha256-6QFccydoKXJRxB74wMnD1HGslQl2iAmKlUx18eIwPrI="
+  },
+  "net/sf/jopt-simple#jopt-simple/5.0.4": {
+   "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
+   "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
+  },
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+  },
+  "org/apache#apache/16": {
+   "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
+  },
+  "org/apache#apache/19": {
+   "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
+  },
+  "org/apache#apache/21": {
+   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+  },
+  "org/apache#apache/23": {
+   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+  },
+  "org/apache#apache/27": {
+   "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
+  },
+  "org/apache#apache/30": {
+   "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg="
+  },
+  "org/apache#apache/31": {
+   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
+  },
+  "org/apache#apache/33": {
+   "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
+  },
+  "org/apache#apache/35": {
+   "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg="
+  },
+  "org/apache#apache/37": {
+   "pom": "sha256-Uk7EeHr/c69rOp+voVTH8YgbZIKZtmP9v8rdoShvI1M="
+  },
+  "org/apache#apache/9": {
+   "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0="
+  },
+  "org/apache/ant#ant-launcher/1.10.15": {
+   "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=",
+   "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU="
+  },
+  "org/apache/ant#ant-parent/1.10.15": {
+   "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA="
+  },
+  "org/apache/ant#ant/1.10.15": {
+   "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
+   "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
+  },
+  "org/apache/commons#commons-compress/1.28.0": {
+   "jar": "sha256-4VIpRSGEVvNkmjm8Sv1wzkvUZiIVGdun03jyFBpGQso=",
+   "pom": "sha256-Az9MeNYy2ojQ646tl0/BSiZDks6/EqtsaNbOp63wxko="
+  },
+  "org/apache/commons#commons-digester3/3.2": {
+   "jar": "sha256-HBUOPS30tCN7R+KP6iB5+w2jJFeNXMpqX+0uN6Ygguw=",
+   "pom": "sha256-W7ihmK21l8MCBLTxwzb9s9KBZTZAPprTNJqyAAMuVEU="
+  },
+  "org/apache/commons#commons-jexl3/3.5.0": {
+   "jar": "sha256-HH0K4vrGH0hV77NPqMW7Fb7SsNlOQRjfaNJ9X0PllIE=",
+   "pom": "sha256-I7fmnFnO15CGBjTJ9Zhpm7t6idKQRajCogGrpGFbRMk="
+  },
+  "org/apache/commons#commons-lang3/3.12.0": {
+   "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=",
+   "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo="
+  },
+  "org/apache/commons#commons-lang3/3.19.0": {
+   "jar": "sha256-MnM6tLyQtFtj63JnfYhpYQA/1O0RPgexAo+Yd8sqxzU=",
+   "pom": "sha256-10Y5Bqswgf9CzzUx63k7JA+wyj8cJv1Y/IT7IwMqcrc="
+  },
+  "org/apache/commons#commons-math3/3.6.1": {
+   "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=",
+   "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA="
+  },
+  "org/apache/commons#commons-parent/22": {
+   "pom": "sha256-+4xeVeMKet20/yEIWKDo0klO1nV7vhkBLamdUVhsPLs="
+  },
+  "org/apache/commons#commons-parent/34": {
+   "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
+  },
+  "org/apache/commons#commons-parent/39": {
+   "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
+  },
+  "org/apache/commons#commons-parent/47": {
+   "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
+  },
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/commons#commons-parent/54": {
+   "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M="
+  },
+  "org/apache/commons#commons-parent/81": {
+   "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ="
+  },
+  "org/apache/commons#commons-parent/85": {
+   "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U="
+  },
+  "org/apache/commons#commons-parent/88": {
+   "pom": "sha256-i/cmFQ0dakO6CqkgYOVSkzyvKHOqGTlS2dSWRw+p+9g="
+  },
+  "org/apache/commons#commons-parent/91": {
+   "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI="
+  },
+  "org/apache/commons#commons-parent/96": {
+   "pom": "sha256-LNMom0TvpTBS2c2vPwVUSDOlIKaC+cf/1AOgC7sVf5o="
+  },
+  "org/apache/commons#commons-text/1.10.0": {
+   "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=",
+   "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc="
+  },
+  "org/apache/commons#commons-text/1.14.0": {
+   "jar": "sha256-Eh/OIoKRDI8MO6eTpUNrMb63EEI8vi1XSj+3pzxQjpI=",
+   "pom": "sha256-XIDoFE8iu0fay2QvZEYEGOslPwsboD6xQTwvNvChiAU="
+  },
+  "org/apache/cxf#cxf-bom/3.5.8": {
+   "pom": "sha256-/loqqlX6GQatY7as136BwljZfgGTCQ4+AWhv17dSpSU="
+  },
+  "org/apache/cxf#cxf/3.5.8": {
+   "pom": "sha256-rwbbLVsQIhq7RVRtHRWJDjlmq6aTMZxoP6iWTaRckdM="
+  },
+  "org/apache/groovy#groovy-bom/4.0.27": {
+   "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=",
+   "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs="
+  },
+  "org/apache/httpcomponents#httpclient/4.5.14": {
+   "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=",
+   "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c="
+  },
+  "org/apache/httpcomponents#httpcomponents-client/4.5.14": {
+   "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE="
+  },
+  "org/apache/httpcomponents#httpcomponents-core/4.4.16": {
+   "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c="
+  },
+  "org/apache/httpcomponents#httpcomponents-parent/11": {
+   "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
+  },
+  "org/apache/httpcomponents#httpcore/4.4.16": {
+   "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=",
+   "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o="
+  },
+  "org/apache/logging#logging-parent/10.6.0": {
+   "pom": "sha256-+CdHWECmQIO1heyNu/cJO2/QJiQpPOw31W7fn8NUEJ4="
+  },
+  "org/apache/logging/log4j#log4j-api/2.25.3": {
+   "jar": "sha256-6IZoKSD6D7nW62OV3LTeCIRD+GRsicXlhG4WjjJ/QG8=",
+   "module": "sha256-W+T3N0jWz53pXLci63n8rVvCQnk6l4p+cmbyNZGBHAw=",
+   "pom": "sha256-MoS+ZXOuuDNGz/a3RvoyXSPq3Z0JyOKG7R11kEoS3W4="
+  },
+  "org/apache/logging/log4j#log4j-bom/2.23.1": {
+   "pom": "sha256-NyOW4EWNTNMsCWytq+DMkzDsEPT1f6O+LnT3m14XijU="
+  },
+  "org/apache/logging/log4j#log4j-bom/2.25.3": {
+   "pom": "sha256-ZleICHEo/mw6+dAlJEhTKvl4cRdmSB20k5a/AyWibK0="
+  },
+  "org/apache/logging/log4j#log4j-core/2.25.3": {
+   "jar": "sha256-Nit/y2W3OqRsxLxTq/TrIW9ESoO10aA3y2/f/wrp8Pk=",
+   "module": "sha256-ChRnoKtPxLJSc7VVHGCL15UguZ/SgRGgM9M4jwJVYwA=",
+   "pom": "sha256-ysGDRqDJErAmrVF/SE78POgyZ/LPambKhGmRL/GYaw0="
+  },
+  "org/apache/logging/log4j#log4j/2.25.3": {
+   "pom": "sha256-pbdIJFris5b1vKlHpJbtwI29vfeWmuLMsattS0lznn8="
+  },
+  "org/apache/maven#maven-api-annotations/4.0.0-rc-3": {
+   "jar": "sha256-XTSQ9yrTp+gr6IsnYp83xZ/SUxuuURw7E4ZkINXYYr0=",
+   "pom": "sha256-83HUqkRgxMwP4x0W20WC2+eGHvzS5nqvGEPimR8Xx0I="
+  },
+  "org/apache/maven#maven-api-xml/4.0.0-rc-3": {
+   "jar": "sha256-8+OzZCNzxp1MdEHUDroHZeHXROmStiGURS9epUUd/bo=",
+   "pom": "sha256-XxSOOelo08K3a4426hN3mJ8KeetDpqWa5yPZElzLXGE="
+  },
+  "org/apache/maven#maven-artifact/3.6.3": {
+   "jar": "sha256-YbINpOHj24N2MNCBCmp6Wsn7fqMbClVjgGKq1uR5wJw=",
+   "pom": "sha256-R6YV+RqIhQOheFnK3L5uhkGXb4wIv5t7KsUIkQ8adHE="
+  },
+  "org/apache/maven#maven-artifact/3.9.12": {
+   "jar": "sha256-Q2HOzX6GPAmSpskBICr7ttsqBrT5peSyJIHU05vPE3w=",
+   "pom": "sha256-vftCPoANMcHQXPbu1gKsSFNa/jI2AHoHYIPOtvrolWM="
+  },
+  "org/apache/maven#maven-builder-support/3.6.3": {
+   "jar": "sha256-MoUwjqJDqZZ3hUF69eIa4MCUCZsg37C34cPSEah6Xlk=",
+   "pom": "sha256-lM+XCoYtZgEpT0g3tGeR2l65GA+ys6F9aCaq//x6dCk="
+  },
+  "org/apache/maven#maven-builder-support/3.9.12": {
+   "jar": "sha256-IqA0XHqQ2+d1ggnVITWWfaqKrmVDxwFstjWJGw7O7tQ=",
+   "pom": "sha256-Har1E6ONNjmh5vTq4aHX3EK7HZORwFSlPN8fFFAmxhk="
+  },
+  "org/apache/maven#maven-model-builder/3.6.3": {
+   "jar": "sha256-fZpQjtrogQVP22rVMKXgU6BomrExi/egmQFudYuDI7o=",
+   "pom": "sha256-T44sox5l1Wvp2FhUSboLPsCqNdrfgNzLmmQ+eJREW6c="
+  },
+  "org/apache/maven#maven-model-builder/3.9.12": {
+   "jar": "sha256-HLErnlG5hVWZ3R0C538I/4h3Lp1LSnxO4eXXpPK5ueo=",
+   "pom": "sha256-zHTkxUmFhY9HA+mPLVz+nF/5BPRaid1Bwx2PoJPIjjs="
+  },
+  "org/apache/maven#maven-model/3.6.3": {
+   "jar": "sha256-F87x9Y4UbvDX2elrO5LZih1v19KzKIulOOj/Hg2RYM8=",
+   "pom": "sha256-fHIOjLA9KFxxzW4zTZyeWWBivdMQ7grRX1xHmpkxVPA="
+  },
+  "org/apache/maven#maven-model/3.9.12": {
+   "jar": "sha256-1EOiDLgBp/EW4QqA3R6/eqrnGCiA0Ql+BoHUmMReFos=",
+   "pom": "sha256-LYDN/cTWhXgP6cO5osi0Q3nIqoOZSdkuzs6dLsDS7tc="
+  },
+  "org/apache/maven#maven-parent/33": {
+   "pom": "sha256-OFbj/NFpUC1fEv4kUmBOv2x8Al8VZWv6VY6pntKdc+o="
+  },
+  "org/apache/maven#maven-parent/45": {
+   "pom": "sha256-lP6Gnrm0zp/OOZXQXqhrFoyF2Sf50XvrgUoZYMdtfm8="
+  },
+  "org/apache/maven#maven-parent/47": {
+   "pom": "sha256-gtARK6GQf/X9E6JIWCnJffZsaoHgdTWaVhpCL30VgtM="
+  },
+  "org/apache/maven#maven-repository-metadata/3.9.12": {
+   "jar": "sha256-s2iGRt3nRCni4Euk1+FIL3IL1oq1OCSZAInQ2Mgh8do=",
+   "pom": "sha256-upeA3kmgpVJSGs95Hq+aJhDLi6uIlX+Yl0DyboAo/wY="
+  },
+  "org/apache/maven#maven-resolver-provider/3.9.12": {
+   "jar": "sha256-eb4H9ZFwm0HTXj7eBiRKNEczD61GlJn9Xey3YGvgEAU=",
+   "pom": "sha256-vQ2tmeTdELdMeqtXiWMqsekvaerPqZX9MBWlAFOZcwo="
+  },
+  "org/apache/maven#maven-xml/4.0.0-rc-3": {
+   "jar": "sha256-BjxCTLR/dRZBJdXuolFnuTHdaU40Jo1QJHN050IR3Rk=",
+   "pom": "sha256-nZZekiyqwDYkl9J7v6UaRI+UydcTYjZnnGhSNwb3KYI="
+  },
+  "org/apache/maven#maven/3.6.3": {
+   "pom": "sha256-0thiRepmFJvBTS3XK7uWH5ZN1li4CaBXMlLAZTHu7BY="
+  },
+  "org/apache/maven#maven/3.9.12": {
+   "pom": "sha256-IENuXKMcmUVmraXHPGuaLa69qte4+t1VGEczjvzoZ0A="
+  },
+  "org/apache/maven/resolver#maven-resolver-api/1.9.27": {
+   "jar": "sha256-qJXSIig2ZqcyDdx2YV4uk6Qfq9k86aa/nd7jknK7h7Q=",
+   "pom": "sha256-mNwDH3Xyybfv7vNE4cdLs9AJxYTjboKg7D0mPSv+83M="
+  },
+  "org/apache/maven/resolver#maven-resolver-connector-basic/1.9.27": {
+   "jar": "sha256-O9mOOkJvmtyuOeN4bbIp4r534Ip0Ps2b4Vxe13vjpiU=",
+   "pom": "sha256-SU/XtbSLndZf9iTvOMkA58qrTYFVZ9yhum+52AJ4oZ8="
+  },
+  "org/apache/maven/resolver#maven-resolver-impl/1.9.27": {
+   "jar": "sha256-KV1I6iqLs671GIiWfxBftiUZl9ER8Twy0okZ/ZsclR4=",
+   "pom": "sha256-zptH6K61jkbf0F64/Q/j6/4VKgb/DyO7QhJ9FXbNaRQ="
+  },
+  "org/apache/maven/resolver#maven-resolver-named-locks/1.9.27": {
+   "jar": "sha256-s57NTamP2sUGjm9dFpEKcfTk1I6V4X0Qf2YD4Y8rP98=",
+   "pom": "sha256-Qe8scXDrBnLLe8l8qnZbrVOG1J2Tu+iuQwiHI4yOZpo="
+  },
+  "org/apache/maven/resolver#maven-resolver-spi/1.9.27": {
+   "jar": "sha256-HKsC9FvFjV9NjghOrwMvE+oaX8kCHYvXT4Ng67ZZPlo=",
+   "pom": "sha256-xjEONgu1tUOqDHpokrGOlkrdb+rzkXrIjIUmTtN3xnY="
+  },
+  "org/apache/maven/resolver#maven-resolver-transport-file/1.9.27": {
+   "jar": "sha256-OYgmG9MeLnntqAKzlxmS/ORHVrAClVegXHuHHTw93vc=",
+   "pom": "sha256-SDIJnrOlNbGZA6iYuwP0zGVIht6wdmG9OPjLPwAuvlQ="
+  },
+  "org/apache/maven/resolver#maven-resolver-transport-http/1.9.27": {
+   "jar": "sha256-cj89nXF6aT0KrFieJmuZX3bpxj7dSOzIoM+ehqd+RZw=",
+   "pom": "sha256-p+rm1UpJDu3yhhk9fygPfpfYlYjafVrfEX8BMwmNvi4="
+  },
+  "org/apache/maven/resolver#maven-resolver-util/1.9.27": {
+   "jar": "sha256-dKElSPDWqtE8coZmKIwegSAcJL0Fu05OyMFVhRezeac=",
+   "pom": "sha256-srPHd0zcYYh9qBS0IzjJQhururmx6Hw+ZJOIX/2lMjE="
+  },
+  "org/apache/maven/resolver#maven-resolver/1.9.27": {
+   "pom": "sha256-iSS0FxHM4Fj4PEbXmtg9bgTtzxPtVjHsERNWVuC4f1Y="
+  },
+  "org/apache/tika#tika-core/2.9.2": {
+   "jar": "sha256-jEP0irinhPLNqKOG1fQlBg1X4yMtxrSfmRUCmsHwt4M=",
+   "pom": "sha256-TxIXOh/Vd0LvjiscibTz/w7ahlziwt61dO0rAgeFqRg="
+  },
+  "org/apache/tika#tika-parent/2.9.2": {
+   "pom": "sha256-LxxDihtWRIkbnevCqgaZZzFkuVX8ErFdSO7HU2rnnQs="
+  },
+  "org/apache/velocity#velocity-engine-core/2.3": {
+   "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=",
+   "pom": "sha256-1CQqYXQkPx5oBDRXG6TmoduuGZwLw1Cph9X7nDzh4NM="
+  },
+  "org/apache/velocity#velocity-engine-parent/2.3": {
+   "pom": "sha256-TA5KkvaHDzmblG1bt4nRd+SkeUEUfD/dwubwY+nLlts="
+  },
+  "org/apache/velocity#velocity-engine-scripting/2.3": {
+   "jar": "sha256-PspyQVbBrSBlVfBSx4POm2Cc567wLYW5AvdHxcdNUKU=",
+   "pom": "sha256-pURg2E/7W60V6jOgR47ZzOWGvxqpN0P3YHM96MBkaTE="
+  },
+  "org/apache/velocity#velocity-master/4": {
+   "pom": "sha256-eirHPJDdEEtaB+bizQPpXsKNKfO4ME891//87LBJcS4="
+  },
+  "org/apache/velocity/tools#velocity-tools-generic/3.1": {
+   "jar": "sha256-gljP3KoWEn81/+YQo/pPdrfr5RuIkixzxO45zo83jOU=",
+   "pom": "sha256-pvUMs/QTh1wDllImnSqJ+IeNDZ/IzGYvwTWRyiDYR1g="
+  },
+  "org/apache/velocity/tools#velocity-tools-parent/3.1": {
+   "pom": "sha256-Wll7iNunlQkOdwFbzfU0YbQdRdotfRdk5Ozoswoib80="
+  },
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "org/bouncycastle#bcpg-jdk18on/1.82": {
+   "jar": "sha256-N26FYv4FbKDr6VROtArD5KqIeeFD8Af+ZHQhBge2ZH4=",
+   "pom": "sha256-CiCE9BuMQtaxtRo3eIdoOioh3SYfmfs79RDkUrvZMBU="
+  },
+  "org/bouncycastle#bcpkix-jdk18on/1.72": {
+   "jar": "sha256-VqBUyxcNQfsfi6CylWiAYli3/+/cXpi3fvltR0Dz1rw=",
+   "pom": "sha256-KFuL5ZWHD2HXXniBsPtO3C0ao30KecT8j/Lczx2caf0="
+  },
+  "org/bouncycastle#bcpkix-jdk18on/1.82": {
+   "jar": "sha256-vccj4gg0gyrGrxNstbX/BeQ7cdT6FRzGUQ2SEu4IbmM=",
+   "pom": "sha256-9ZxFA6pO73U+GBOvaX5XtEbzNZMCXlUOuudLDz3+kK8="
+  },
+  "org/bouncycastle#bcprov-jdk18on/1.72": {
+   "jar": "sha256-OSh/IginU9tBn1ylKdbIDwlGFKp015AzESazyca4X9o=",
+   "pom": "sha256-47ttnhNGz8Iw4JAPF35goSttviEqkuHNLPseSNTASDk="
+  },
+  "org/bouncycastle#bcprov-jdk18on/1.82": {
+   "jar": "sha256-FM3i/fqoiQSAqOW2es7vDJD5ZoLB4jwTO6/cngsyVc4=",
+   "pom": "sha256-IIFtWAs+mNGQCnGsqBnsns7HimpKN+ejwMbCeTkDlD8="
+  },
+  "org/bouncycastle#bcutil-jdk18on/1.72": {
+   "jar": "sha256-RTd/22VgqXHupyX1B9kf1rj70Hl9Yb/Ibyy2U8WBhqQ=",
+   "pom": "sha256-VwEEzKwN+inkb7ZAL35qchcCwlXe9DvjAcassYwl520="
+  },
+  "org/bouncycastle#bcutil-jdk18on/1.82": {
+   "jar": "sha256-RCBpGVitHAuidabW2KYxetvb3JJ3BVtqcqqJyIzajH0=",
+   "pom": "sha256-pel6j6ALh5IPPwsFA7ri1GGx4mEsVviGirV554QqHEI="
+  },
+  "org/checkerframework#checker-qual/3.12.0": {
+   "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=",
+   "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=",
+   "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk="
+  },
+  "org/codehaus/plexus#plexus-interpolation/1.25": {
+   "jar": "sha256-4AOAJQFXRjf3q9xOg+bVCaMen/gl0S2m0eQZrPlohwU=",
+   "pom": "sha256-nrVRwMo+wTVPELvFoDeomAnU4yusn1WkQx5L4OuPDY8="
+  },
+  "org/codehaus/plexus#plexus-interpolation/1.29": {
+   "jar": "sha256-CI1ETbzt+zhGMNhoZpfs48QB1vM8j4s6pyWeocaZaHg=",
+   "pom": "sha256-zg1WNCl7seBl3d/ciipWdXF8COj0eD7c9YFUNxFRaTg="
+  },
+  "org/codehaus/plexus#plexus-utils/3.2.1": {
+   "jar": "sha256-jQe0l7uN6xZ+5TKcrofvIEODO/UuTxWlqTec7ER6Wys=",
+   "pom": "sha256-elABq4gQW083xPqzti2XcxYpChP4sUxmhPJfKjLv3vE="
+  },
+  "org/codehaus/plexus#plexus-utils/3.6.0": {
+   "jar": "sha256-J+8TDjLCNgkOQI+1SY2Uy56ibRQHD7HImF1ge2LQmNE=",
+   "pom": "sha256-YTgwBIFHHH/mrrEV+RKWH4huGkbunCvShBtlGEgk2ig="
+  },
+  "org/codehaus/plexus#plexus-utils/4.0.2": {
+   "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=",
+   "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8="
+  },
+  "org/codehaus/plexus#plexus-xml/4.1.0": {
+   "jar": "sha256-huan8HSE6LH3r2bZfTujyz1pKlRhtLHQordnDPV0jok=",
+   "pom": "sha256-uKO6h7WsMXVJUEngIXiIDKJczJ6rGkR9OKGbU3xXgk4="
+  },
+  "org/codehaus/plexus#plexus/19": {
+   "pom": "sha256-jT5Rw5Av11luVI6rEh6/aw1KpzhXB38mok/Ib5uEVbQ="
+  },
+  "org/codehaus/plexus#plexus/20": {
+   "pom": "sha256-p7WUsAL8eRczyOlEcNCQRfT9aak61cN1dS8gV/hGM7Q="
+  },
+  "org/codehaus/plexus#plexus/24": {
+   "pom": "sha256-iaG8eeRsNasQi34hW7LFwhX/jzrxrjz++C2aKzOwbFE="
+  },
+  "org/codehaus/plexus#plexus/5.1": {
+   "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k="
+  },
+  "org/codehaus/woodstox#stax2-api/4.2.2": {
+   "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=",
+   "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI="
+  },
+  "org/commonmark#commonmark-ext-autolink/0.21.0": {
+   "jar": "sha256-PNV9XR295yTmcAxTpZBTS7JPPiaV/zUF66MtxMd4G6k=",
+   "pom": "sha256-1OMcYi/1xtxZ/hpD4QiajBEETj33kLNAGh+IkrT5HhY="
+  },
+  "org/commonmark#commonmark-parent/0.21.0": {
+   "pom": "sha256-qeGddPQOEj3jbHAaUlIg2r5eMjVDZUfbek/TwJi31Qs="
+  },
+  "org/commonmark#commonmark/0.21.0": {
+   "jar": "sha256-gQhKcDUEb+MG8NvxbvV6aNCO5clwBOqGfmK120bpivs=",
+   "pom": "sha256-RhGg7TfAGTzGANRRrUxFfT0NVBxaxlbI2ANL0s0NB1g="
+  },
+  "org/eclipse/angus#angus-activation-project/1.0.0": {
+   "pom": "sha256-xbpJl8zRYQNHMGsM23caRKv9qhhzIkogdZVQ4Q8inNU="
+  },
+  "org/eclipse/angus#angus-activation/1.0.0": {
+   "jar": "sha256-43r/FH4Y7UjFCqn7eMyF50eMv9ASV7AtU9OhhtGDIkU=",
+   "pom": "sha256-L8eRQlvvS53yjp80ZAXMCeDqN369YQJjiNqEDGGhsPw="
+  },
+  "org/eclipse/ee4j#project/1.0.5": {
+   "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY="
+  },
+  "org/eclipse/ee4j#project/1.0.6": {
+   "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
+  },
+  "org/eclipse/ee4j#project/1.0.7": {
+   "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
+  },
+  "org/eclipse/ee4j#project/1.0.9": {
+   "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc="
+  },
+  "org/eclipse/jetty#jetty-bom/9.4.54.v20240208": {
+   "pom": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg="
+  },
+  "org/eclipse/jgit#org.eclipse.jgit-parent/5.13.3.202401111512-r": {
+   "pom": "sha256-h/d52RwFAmJDm6CAf856MyW22N1+hlZdC8WnEGpLnMk="
+  },
+  "org/eclipse/jgit#org.eclipse.jgit-parent/7.5.0.202512021534-r": {
+   "pom": "sha256-fjiAaoU2kaSdsW6sg2/mtiYnaUOxCLZ3VKPVx0D7vA4="
+  },
+  "org/eclipse/jgit#org.eclipse.jgit/5.13.3.202401111512-r": {
+   "jar": "sha256-2st0wosIm8N4+MKh3NpREMIPUhJPWgIK7yaE1w738bs=",
+   "pom": "sha256-inan72s3SAx8/Uq8iDiX91KCUWeS/wt6qJnbJ/hXlt8="
+  },
+  "org/eclipse/jgit#org.eclipse.jgit/7.5.0.202512021534-r": {
+   "jar": "sha256-FZe8eKjYwBFpdtRqlIcqLMKGVnDrpNsLn1GBGzSTbXI=",
+   "pom": "sha256-bJVN/BDxwwG9uiXT1jCfd0eYBDY891VuUei7NxRVXGQ="
+  },
+  "org/eclipse/platform#org.eclipse.osgi/3.24.0": {
+   "jar": "sha256-eJRUAUwVDyrfaBzYD47PSYF9k+15DzZZs2LcoHreh7g=",
+   "pom": "sha256-ok2dkGpHjhJrIZqdJFGLgztm2ksQP5Y+ILkFC+virhU="
+  },
+  "org/eclipse/sisu#org.eclipse.sisu.inject/0.3.4": {
+   "jar": "sha256-jA5qp/NVkwFvLF54tgS1fwI82so1Yf4v428rXbuuHRY=",
+   "pom": "sha256-Saxifhz6hg4RT2WHMX+Jl6dwBqnnpJhpoZX+4yuyiRM="
+  },
+  "org/eclipse/sisu#org.eclipse.sisu.inject/0.9.0.M4": {
+   "jar": "sha256-HL16llpeKp6oI7qzEZYqTlqlwkBwW9utWlK0D/36EAQ=",
+   "pom": "sha256-M5ZrOr0SkIABtwdojft8CZCLHoZVbcP6wehRIqaG8Fk="
+  },
+  "org/eclipse/sisu#sisu-inject/0.3.4": {
+   "pom": "sha256-ErEHZrVDwsNqCFMQPlobyTANGqOUBnyJ2Oa+XfIUykw="
+  },
+  "org/eclipse/sisu#sisu-inject/0.9.0.M4": {
+   "pom": "sha256-DIKclkHMrIcNfX/wEsu62ER+kS65om0NcoPwnLpEwNk="
+  },
+  "org/glassfish/jaxb#jaxb-bom/4.0.1": {
+   "pom": "sha256-lSK+rNDHwC3Mi7VDMA6Eolu8wPfREPEwr3Z9yX1eP5Q="
+  },
+  "org/hamcrest#hamcrest-core/2.2": {
+   "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=",
+   "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590="
+  },
+  "org/hamcrest#hamcrest/3.0": {
+   "jar": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw=",
+   "module": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4=",
+   "pom": "sha256-SgSmgTO/MkYfR7ilPI7p30zi9JoNrZeUvOhxe+5brDE="
+  },
+  "org/jacoco#org.jacoco.agent/0.8.13": {
+   "jar": "sha256-nbPJ1ddPqHCyYbZKMIJBLhvW4i6fqY9HN7G/+K+cxk0=",
+   "pom": "sha256-auuUf988z1Qlydq41oPWu+MPCSjEWnAuYlWMblXmRLc="
+  },
+  "org/jacoco#org.jacoco.ant/0.8.13": {
+   "jar": "sha256-ZDS4VS/z0OSi+70Tpu+xJODJykU4F8YsA96DkNh//RE=",
+   "pom": "sha256-I4tCPVxuZQ9LQPF1T42iYQDHpzYz5d1RKIxzgHRj744="
+  },
+  "org/jacoco#org.jacoco.build/0.8.13": {
+   "pom": "sha256-mUw64c/KZ2WWj+Pt5PN5mGrrLn61GiAUyqSgnXGo9KM="
+  },
+  "org/jacoco#org.jacoco.core/0.8.13": {
+   "jar": "sha256-UUwj32z9AV19g8EKeS41q2int+gvPWo6RIF2LBMuM6k=",
+   "pom": "sha256-73/2F3zZcB1QXv6C9N1P6l5fcssEesK088qitBbaD08="
+  },
+  "org/jacoco#org.jacoco.report/0.8.13": {
+   "jar": "sha256-gTMoCgqkQ1i+nRNrUjcDQvRVzLlEquB0OCIKd2YleKI=",
+   "pom": "sha256-EBBlOpAAx+qoVqJx+E0HH/Rt6nojdbhKitmiOz5lPOg="
+  },
+  "org/jdom#jdom2/2.0.6.1": {
+   "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
+   "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
+  },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
+   "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
+   "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k="
+  },
+  "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": {
+   "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=",
+   "pom": "sha256-rIU9chaJ+vEV8RiBCjU2/CcvE1to0CdFOqpW6eY79wc="
+  },
+  "org/jetbrains/kotlin#kotlin-build-common/2.0.21": {
+   "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=",
+   "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0="
+  },
+  "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": {
+   "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=",
+   "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ="
+  },
+  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": {
+   "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=",
+   "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE="
+  },
+  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": {
+   "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=",
+   "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY="
+  },
+  "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": {
+   "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=",
+   "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0="
+  },
+  "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": {
+   "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=",
+   "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA="
+  },
+  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": {
+   "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=",
+   "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A="
+  },
+  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.3.0": {
+   "jar": "sha256-DGQgOZHQIy2YnNXjZtYCjSexsIckCBgXi9UMJo7qtW8=",
+   "pom": "sha256-N51JdplIjLxv11nTN2QrRWLD2lI4g8NMH201PgZZvJc="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/1.6.10": {
+   "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
+   "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/2.0.21": {
+   "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=",
+   "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk="
+  },
+  "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": {
+   "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=",
+   "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE="
+  },
+  "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": {
+   "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=",
+   "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": {
+   "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=",
+   "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": {
+   "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=",
+   "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": {
+   "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=",
+   "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": {
+   "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=",
+   "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": {
+   "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=",
+   "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.0": {
+   "pom": "sha256-36lkSmrluJjuR1ux9X6DC6H3cK7mycFfgRKqOBGAGEo="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": {
+   "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": {
+   "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=",
+   "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
+   "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": {
+   "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=",
+   "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
+   "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=",
+   "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
+   "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
+   "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
+  },
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": {
+   "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=",
+   "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=",
+   "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ="
+  },
+  "org/jreleaser#jreleaser-artifactory-java-sdk/1.21.0": {
+   "jar": "sha256-cRhlNuCz/7g71ay5WaEz/DI+zda1gurqfaakBws0S9c=",
+   "pom": "sha256-zJmZ8wxmDqHwiIqnMektqZw1Aqv4M49r4S/qlKowm68="
+  },
+  "org/jreleaser#jreleaser-azure-java-sdk/1.21.0": {
+   "jar": "sha256-UbX741sXvRVPKkG1+MP6kdQASAWuRJiUW4u0reOnW0M=",
+   "pom": "sha256-FJ8ndfrOsVfer8L4jBCb+AyTC840UpnWnVC3aqSfAnA="
+  },
+  "org/jreleaser#jreleaser-bluesky-java-sdk/1.21.0": {
+   "jar": "sha256-2+TSy+L98PoqBw67zY9IVjX1j2OEhWUZuNJB0UKmwsA=",
+   "pom": "sha256-G45G0x+yhrYGiOlufwKah0TfJX4V5hgGS3K3f0OSLSE="
+  },
+  "org/jreleaser#jreleaser-codeberg-java-sdk/1.21.0": {
+   "jar": "sha256-JZM94ZtHyBtVUQlxxVerk1syxo0G6KDD84Jex4uEqLk=",
+   "pom": "sha256-9skW9t26wBo57UHkeQhABTfVIty/qZQaSADZnz06sKo="
+  },
+  "org/jreleaser#jreleaser-command-java-sdk/1.21.0": {
+   "jar": "sha256-s/RjG5ROXAFfkZ4R7dY0xvJzoAfs5gVN58pKJWhAtJc=",
+   "pom": "sha256-1dlOKFGIRL6k+0YNikvcGYKrwrbAs+Fx/+QOWXpzJwk="
+  },
+  "org/jreleaser#jreleaser-config-json/1.21.0": {
+   "jar": "sha256-DyJznDeQVI0SKHgPn3WG0LEYxCtskjgJlU1dI5CDIJk=",
+   "pom": "sha256-996l34e/q1rshQvSFNjtVzC2kGFaJYDAU2WWC+/jmnc="
+  },
+  "org/jreleaser#jreleaser-config-toml/1.21.0": {
+   "jar": "sha256-ziXxpl5UUHg6aRcAU3C/CFm19rAjF43dl1DUB5VLtgw=",
+   "pom": "sha256-rOqnTX3ZF3t11KUoAmQi8LrAzg0tmUltiPvgGHqUz9E="
+  },
+  "org/jreleaser#jreleaser-config-yaml/1.21.0": {
+   "jar": "sha256-VMHCenLkqW7rLy5U2ftCwUKiBLg28sPFKKHgKB8cw5s=",
+   "pom": "sha256-sNF+GjMImbAbiCO5p5JuZl6b/qf7n1K6F1R7EHqYlGI="
+  },
+  "org/jreleaser#jreleaser-discord-java-sdk/1.21.0": {
+   "jar": "sha256-a30zXiyEHVIFZWrpl5C8KzYdynKD+BBJSwE4qvplvRs=",
+   "pom": "sha256-LfzSxCKVsg3GVsQZapYnZdHxWt8/l6cDqomECgSmHSc="
+  },
+  "org/jreleaser#jreleaser-discourse-java-sdk/1.21.0": {
+   "jar": "sha256-BUTbHIqgjwrOehtaeEzEH0td79dKcx+ALXbPfRt2K3A=",
+   "pom": "sha256-DuZorWVVAlnD7CTln0ojHVg+mM4IQHv+DoNQUzhUpGg="
+  },
+  "org/jreleaser#jreleaser-engine/1.21.0": {
+   "jar": "sha256-TiUbKw+Oo8vzuTn3EDH/BYRW+bgAUrijXNz27uViBvU=",
+   "pom": "sha256-DZsTqSyixsvIi1eQTpWipuve+sZEAowiFLWnKgYGYgc="
+  },
+  "org/jreleaser#jreleaser-forgejo-java-sdk/1.21.0": {
+   "jar": "sha256-bXSmfdegJllmZpn8IF5hukMMf60JwMZuPxGN5DCED6s=",
+   "pom": "sha256-aDQacMIXZtob7RBWM6CiWq1LQCgLMFJ8kZcgX2apaz4="
+  },
+  "org/jreleaser#jreleaser-ftp-java-sdk/1.21.0": {
+   "jar": "sha256-2IKCEO5PGjKEI2HIYBEhtH2l4cInhmwfrKZqz/1Tktw=",
+   "pom": "sha256-DMyCLJndMwGOZNn8Xy6ESif9BVH9PKF0U9uGCM8brMw="
+  },
+  "org/jreleaser#jreleaser-genericgit-java-sdk/1.21.0": {
+   "jar": "sha256-YWO4BOVW49tCDptipNHmd9d81SMOIxBpV9jAkKfcfec=",
+   "pom": "sha256-HNzP2XvWVHLSXj4qAF1ueMJxtiZ/xjZuDCEF+GH+Vs4="
+  },
+  "org/jreleaser#jreleaser-git-java-sdk/1.21.0": {
+   "jar": "sha256-tTjhBhyd7DqFeu9zjws1hoc/3eD0QjsXKgGkDyrIrvc=",
+   "pom": "sha256-3wqRNqD7vZVGQdFKPRkAh0ZdaWy0TRpFhjAEFZdC2yI="
+  },
+  "org/jreleaser#jreleaser-gitea-java-sdk/1.21.0": {
+   "jar": "sha256-2sxv3ON/sLvBF/0rTpvY23YfgEhuFSHe482gRjTM/40=",
+   "pom": "sha256-xGPR0ZRe6j/Gmh2PVFIT2VT5rCcw9dxcv+x0ypDcsd0="
+  },
+  "org/jreleaser#jreleaser-github-java-sdk/1.21.0": {
+   "jar": "sha256-/lVIW7cFbyP2Eki0rS6nj3srtxgKWkroTtDS98j/fvo=",
+   "pom": "sha256-4+pv+OkmicTM4P/QrWWtMX+smQEPmRwx1MvWCMxYLeo="
+  },
+  "org/jreleaser#jreleaser-gitlab-java-sdk/1.21.0": {
+   "jar": "sha256-k3OsFqAU5mLDMtHO+xSf+93CdeJ6l8Kn2vMVd1xb4Mo=",
+   "pom": "sha256-hfnKgA1f/5FhuG1PMjGluHM2P+OJ7Lt1MLPe5A6H0dY="
+  },
+  "org/jreleaser#jreleaser-gitter-java-sdk/1.21.0": {
+   "jar": "sha256-uGCO5axGGt/0b/D6/VsDIU2RoASMiegzKREv6y+No6A=",
+   "pom": "sha256-bqTNWC7waNJ8h2/Fe4uHLtq3w7orYJVBO9KOSZU1pZo="
+  },
+  "org/jreleaser#jreleaser-google-chat-java-sdk/1.21.0": {
+   "jar": "sha256-VSBSpyCnEJvNVH/VsuK20DiX8f+HrFl3eEdcznsx2xk=",
+   "pom": "sha256-a+JKY/PaFyrIZ+8g9KAFYC7Bvkge1cgrvIdQfSck7lU="
+  },
+  "org/jreleaser#jreleaser-http-java-sdk/1.21.0": {
+   "jar": "sha256-ZHkt0HTo+n/+fdX9EVycZjbwA8umy1a1vKfpQ2PBZ2Q=",
+   "pom": "sha256-NG1PWXF5W635Ie+wvbq4g2TtzMuLm0d59CwNXRBPTno="
+  },
+  "org/jreleaser#jreleaser-java-sdk-commons/1.21.0": {
+   "jar": "sha256-1r9CtKX2BBA9mowsBiqvkaKyBrgmM4Mv7+famWNsBe0=",
+   "pom": "sha256-2jmbK4beCDPAMVeJUdYka0B5KIqyDJD76GAE+XXm6C4="
+  },
+  "org/jreleaser#jreleaser-linkedin-java-sdk/1.21.0": {
+   "jar": "sha256-iRhZYd6vSk1TfaUoWgxCY1ecUSBFP8X9oxb7sjyizdk=",
+   "pom": "sha256-X7/iHFaqYqugCSB4JpWZ4nZo0ie/VFf3G3g2Ro/WNYg="
+  },
+  "org/jreleaser#jreleaser-logger-api/1.21.0": {
+   "jar": "sha256-BQNKGSYD4X+sSKRkmBxGoKT69N1IIiutkCq+nZWeFYM=",
+   "pom": "sha256-M7fJW1mqHyoTimcIu7n0JVOPhjVpwmZHaUgc1U1qeJU="
+  },
+  "org/jreleaser#jreleaser-mastodon-java-sdk/1.21.0": {
+   "jar": "sha256-wyC7UlXk/vV186/T+rPqGwkDgaR9rDQk4769zyFKU9c=",
+   "pom": "sha256-vOOVMFz0NTYMGfXTeHGIOP8tXakeBCOxSI8/StTKCvM="
+  },
+  "org/jreleaser#jreleaser-mattermost-java-sdk/1.21.0": {
+   "jar": "sha256-53PeaF+E8JhjDbp46VkYwYLm/gkkeZy6mSW0Qz8UiIk=",
+   "pom": "sha256-lLR7D3FuORGizS344WS02kL5ypMQiI2IdMD/+9j+GqM="
+  },
+  "org/jreleaser#jreleaser-mavencentral-java-sdk/1.21.0": {
+   "jar": "sha256-/kANVjaNJ6WvUMcXU2JkRRRuH48yhckGtYIaG7EREPU=",
+   "pom": "sha256-Ix2NohfU88sXD5iU0Oh2QblbwFQk/o1v2sGvbPnrh4Y="
+  },
+  "org/jreleaser#jreleaser-model-api/1.21.0": {
+   "jar": "sha256-ARzZDyOSbqsFeJj1zjRCPIlrgRKbPce4PK33r82GmFU=",
+   "pom": "sha256-FBR6QVJfEBN835tCButaBpIcsiTtILVo6CoskDaMNoU="
+  },
+  "org/jreleaser#jreleaser-model-impl/1.21.0": {
+   "jar": "sha256-Oa3LPDtII+JiIVYRarCQBQ0X1dmyaMCl7voCbxMWby4=",
+   "pom": "sha256-mmFRY/unbMb9WyN0V/Jlki3u4xwMFH0TOqYntLfB5fc="
+  },
+  "org/jreleaser#jreleaser-nexus2-java-sdk/1.21.0": {
+   "jar": "sha256-7WryoI61DiuEoE8NC5WBAAOX92AL3YA1udvxHe0FNqw=",
+   "pom": "sha256-GcSQn+/AKntpnz/PyZDahlhC3gBrqNZV3FzJiq4bbbA="
+  },
+  "org/jreleaser#jreleaser-nexus3-java-sdk/1.21.0": {
+   "jar": "sha256-+9RPO9r7Rzm3LEJhHVDw4VMUwX4EgeCREjC17rjFkOs=",
+   "pom": "sha256-QKlUENnWr414DQ2Ae4c+YhnQyQxX8alZPmXfXzlLhV0="
+  },
+  "org/jreleaser#jreleaser-opencollective-java-sdk/1.21.0": {
+   "jar": "sha256-QVNENKAn5Ph1nd852ActB8RBkVtSYjDlA0b5Oo2H8x8=",
+   "pom": "sha256-DiPG4uXuM2Y/zUZTGMSAA6RodHEq9RQL4MNS+5pVpVg="
+  },
+  "org/jreleaser#jreleaser-reddit-java-sdk/1.21.0": {
+   "jar": "sha256-lVzRgKL6gC4qZqZQy5oJlfrBuVkL84wSnLGHB3+SbkA=",
+   "pom": "sha256-M4ALYB/xiE/kV/0ZKHp7aZ/tBZD7L7uwlR0dQZhUjiA="
+  },
+  "org/jreleaser#jreleaser-resource-bundle/1.21.0": {
+   "jar": "sha256-EOs5XdpZH1BaqKyUszRA62ZOmfsWdOjQZkUYBKmfXew=",
+   "pom": "sha256-eeE7Qwa87ennmB4XhY/3Rnk58erjQDLQGo9Y8gMUAUY="
+  },
+  "org/jreleaser#jreleaser-s3-java-sdk/1.21.0": {
+   "jar": "sha256-bml4GHfXkEHEfyM945FGcUBpe0WrsjQQMiB2bKyLWRQ=",
+   "pom": "sha256-/ftymU7XLWapNL4Y0fcR6NPywl8X8a+Hl97zx5SY9bo="
+  },
+  "org/jreleaser#jreleaser-sdkman-java-sdk/1.21.0": {
+   "jar": "sha256-I8FrpuWfzGYf2mqLWw/yj4s0MeZ8iBfvGyYmAlcv5kk=",
+   "pom": "sha256-jm/J8oNqyGiyFtioVwnnWgfuSJLMLaOknNYZfVwmQ7Y="
+  },
+  "org/jreleaser#jreleaser-signing-java-sdk/1.21.0": {
+   "jar": "sha256-cF7HM+PFYtEG6IBqBOh4o9nXebJynJS9m7OaLSPOcg4=",
+   "pom": "sha256-+hjHVPLEpvFJWaEP1Q//qYLnqpXz8rDipSQHkb3HHfw="
+  },
+  "org/jreleaser#jreleaser-slack-java-sdk/1.21.0": {
+   "jar": "sha256-0/g564AH16d/tlnGpH38mfA0uJwz3JJonc/NFbvwo1A=",
+   "pom": "sha256-NZ+MtVo0VflNfpy8jHzgEHR5ndwvwSitoZC2E1LEXPE="
+  },
+  "org/jreleaser#jreleaser-smtp-java-sdk/1.21.0": {
+   "jar": "sha256-s2kbgRGoqKARuOL0SsxHGK6WerZhcYs9CZGzisE9Ztk=",
+   "pom": "sha256-o0OyWsJHUaZ5rv5r9AdNb3pv41dRIGYH9G/I0VkOK+M="
+  },
+  "org/jreleaser#jreleaser-ssh-java-sdk/1.21.0": {
+   "jar": "sha256-8ki9Jzh6SRnPAEpdy5a2zVWtcMq/CD6fXoTi16Rbt2k=",
+   "pom": "sha256-D7/QVr2iBlChGJtMBvFVquoUq37VrrdvZ9TlgitJdOc="
+  },
+  "org/jreleaser#jreleaser-teams-java-sdk/1.21.0": {
+   "jar": "sha256-VdTV1Uo9BIW0LJVmVHvE0RR3LM+3Fdf3NFlIg/ChO2M=",
+   "pom": "sha256-nSqXYYeK4hUkuFOHeVaiREtMZA0KQSiLmeWvDShgB9U="
+  },
+  "org/jreleaser#jreleaser-telegram-java-sdk/1.21.0": {
+   "jar": "sha256-pZ0wlAtq2isaViY6TJ60obR10ynEb+cluP56GYjN4qw=",
+   "pom": "sha256-pfA2Jtfhj7s8y5Zqzx7A9/met/bgF2NTNuk5XMCuTvw="
+  },
+  "org/jreleaser#jreleaser-templates/1.21.0": {
+   "jar": "sha256-qXcTT8s3s9+INl39J+3krCP6TBKqc8FnnwfSoXeJsV8=",
+   "pom": "sha256-iBlw2i5BHynrakuRfABcI+KoBmes9OmPgKKoPWBJhfE="
+  },
+  "org/jreleaser#jreleaser-tool-java-sdk/1.21.0": {
+   "jar": "sha256-SHFethdnEvAj402B8gTb1K4OxEc39B+hnpcy8po/NZY=",
+   "pom": "sha256-ES/YPgv0kel+H9LRqnRr7qEF4t3HbBLdwgsNTtaPB0g="
+  },
+  "org/jreleaser#jreleaser-twitter-java-sdk/1.21.0": {
+   "jar": "sha256-ZLAnRRo89Qf4goT1D7Q9UYkbIXmb+q5FJ812BecAXlo=",
+   "pom": "sha256-sFOGHVYtREgJCNULlQoX/dih1kNDrgEgx9cf4UMXruo="
+  },
+  "org/jreleaser#jreleaser-utils/1.21.0": {
+   "jar": "sha256-EywegJjD9iwL9WoiGBrT/BrpsOZMkCm9w9ehuMq8xPU=",
+   "pom": "sha256-Y+4iwVAt8eeIew5UInAgdlqytJqbpq7Lv0KV/oWN/6o="
+  },
+  "org/jreleaser#jreleaser-webhooks-java-sdk/1.21.0": {
+   "jar": "sha256-3XIBAFh706zB/YFHkQt4oeVNhc830mjm8/X0Y4pHsiM=",
+   "pom": "sha256-E0URQDnLR7PPNa8kSxOSq4dL2gZwYU3D8OQGDqasuNY="
+  },
+  "org/jreleaser#jreleaser-zulip-java-sdk/1.21.0": {
+   "jar": "sha256-kqxPuPuEfxo3irJa5bCIA5/+sT2MxULHkKGUJTDlbx0=",
+   "pom": "sha256-QbA9rXmJY4gJyt48B6IyWaEQpyFdQ5y/fLd4RDVMi2U="
+  },
+  "org/jspecify#jspecify/1.0.0": {
+   "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
+   "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
+   "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
+  },
+  "org/junit#junit-bom/5.10.0": {
+   "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
+   "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
+  },
+  "org/junit#junit-bom/5.10.1": {
+   "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=",
+   "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I="
+  },
+  "org/junit#junit-bom/5.10.2": {
+   "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+   "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
+  },
+  "org/junit#junit-bom/5.11.1": {
+   "module": "sha256-42L7gWcgLW8NSlsWcHxTJFEP0pA9U2SYiMRJasgcM34=",
+   "pom": "sha256-xyEkqcmnmRDBhYdmtyw1Dho5JEy/tLB2NI+/4HgoGWU="
+  },
+  "org/junit#junit-bom/5.11.4": {
+   "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
+   "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
+  },
+  "org/junit#junit-bom/5.12.2": {
+   "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
+   "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
+  },
+  "org/junit#junit-bom/5.13.1": {
+   "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=",
+   "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM="
+  },
+  "org/junit#junit-bom/5.13.2": {
+   "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=",
+   "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k="
+  },
+  "org/junit#junit-bom/5.13.4": {
+   "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
+   "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
+  },
+  "org/junit#junit-bom/5.14.2": {
+   "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=",
+   "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8="
+  },
+  "org/junit#junit-bom/5.7.1": {
+   "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=",
+   "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q="
+  },
+  "org/junit#junit-bom/5.7.2": {
+   "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=",
+   "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs="
+  },
+  "org/junit#junit-bom/5.9.0": {
+   "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=",
+   "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU="
+  },
+  "org/junit#junit-bom/5.9.1": {
+   "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
+   "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
+  },
+  "org/junit#junit-bom/6.0.3": {
+   "module": "sha256-KA48NIVfKhPeJBIZN+TPl+S565IG5g+JHk8KHPDnq6E=",
+   "pom": "sha256-plW2pdwA0b68kfsrFcDH6K6snWvc+HlZVQU3DidTAoc="
+  },
+  "org/junit/jupiter#junit-jupiter-api/6.0.3": {
+   "jar": "sha256-1lXX5vDHrgfxCi87uq67bTDpsmIEoGitnps5UKooeSw=",
+   "module": "sha256-6k1/evmsFrsuF34miQeJb6PG+a5QcmBNRoLXrv/inKg=",
+   "pom": "sha256-dmyA+zGOFgDr9smpId6AGIexVIqigtataRiLdgjVbUc="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/6.0.3": {
+   "jar": "sha256-Hi+rYa0n6gj8fHDdlnfPjG0a5UNNQtz91jOxLH58BNA=",
+   "module": "sha256-03TlhvHApdyh+00ZNJ4KgEqRc7lh+EHijPxYgeLmUV0=",
+   "pom": "sha256-uvvAmTJsGIPw7hywVtMbQiLiYWX5+aqbiW89P3ijFTg="
+  },
+  "org/junit/jupiter#junit-jupiter-params/6.0.3": {
+   "jar": "sha256-zylH4jArn4yKBZJZoneIHBytro+8JRTBapJc/re+suU=",
+   "module": "sha256-1LBksP8UD1Vd0GdEscxr//wQ9SSbLdWqRprl9NTv7Cg=",
+   "pom": "sha256-mVtk7KoiJ8S1Xz6453c19URDSi7Cz+7QYF6LrxCCY94="
+  },
+  "org/junit/platform#junit-platform-commons/6.0.3": {
+   "jar": "sha256-OfJi0Jw9UnGf4Ld/CA6Qo2leKF13mkGyMuF5Y65dogA=",
+   "module": "sha256-nfLma22VBAClGKmt00M9CjBxzhwzpvgPnPIlYtUpRbc=",
+   "pom": "sha256-vbjiS+l+Dll2nyFktTYfVSJ5WN9BA9aGgvh3mtLKjX0="
+  },
+  "org/junit/platform#junit-platform-engine/6.0.3": {
+   "jar": "sha256-SR6eT3RfFhuKjkGGoafGpFDqEscJMMmu2uQnIVMB2Uc=",
+   "module": "sha256-U1qGeP2rxB2/DEHMW3Vh7xINdWUMPcOTAqfWCTdmE5M=",
+   "pom": "sha256-eofYxqCn2wJgsAzjAxgPb0HQQFYoldaARhnV227iMr4="
+  },
+  "org/junit/platform#junit-platform-launcher/6.0.3": {
+   "jar": "sha256-MVYINy5NxEvKDMs66KB+zCBrM2cDP6BXSKA8zVY/EwE=",
+   "module": "sha256-glZnrWqEsMW6dTdSvpqZ4wFL/lKRQ7xmtGdNkbA/pbg=",
+   "pom": "sha256-TTngPyCTd29BkwccjN8ZgTa5YWbHtDteN+fWFWudmO0="
+  },
+  "org/mock-server#mockserver-client-java/5.15.0": {
+   "jar": "sha256-LMqrNKNYdlkALhh/PISJAtd8g55OrmxZRp4YUUnvGyY=",
+   "pom": "sha256-nVRRAJ9Q2bMQCStLyAFPz3+di/HYUbOfOzNPm4rmkfQ="
+  },
+  "org/mock-server#mockserver-core/5.15.0": {
+   "jar": "sha256-dpZGoStLzGwK8eZiFsRYH4b5UkY4zvxn3vVJjNKeL7o=",
+   "pom": "sha256-DSwI3ATUdSuev1sSROKtV6+kSBJ/YZnqeeUYRAbpUYM="
+  },
+  "org/mock-server#mockserver-netty/5.15.0": {
+   "jar": "sha256-EKBXpHdbami8aXQtEgBmt/cBOH7X5l9RioGYTqRaw6s=",
+   "pom": "sha256-1aN22L2gDxkgNt4fm6g89tTXvlFar4+GaN6u1pagCVU="
+  },
+  "org/mock-server#mockserver/5.15.0": {
+   "pom": "sha256-tlNuOpSx7xwjGfX1Zwc1JL1YtvIh4vK1rLh57Bu5DJA="
+  },
+  "org/mockito#mockito-bom/4.11.0": {
+   "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
+  },
+  "org/mozilla#rhino/1.7.7.2": {
+   "jar": "sha256-XG2uBQzrcXdKX8gs5uPwOS2vD/qew1lvcNTQfuULiXA=",
+   "pom": "sha256-B2kGiYfBiVPlHUGeBi9AlW8egvOioUD+qITXxeb6lH8="
+  },
+  "org/nibor/autolink#autolink/0.10.0": {
+   "jar": "sha256-MCswFgloQV7mzRkHmHE4x1daYxX5tu8Tuf46vIc2eFc=",
+   "pom": "sha256-sEv9glJXPUuoEX/BU/QDWXgIa6r1+HCaD+Qzl0g7M48="
+  },
+  "org/openjdk/jmh#jmh-core/1.37": {
+   "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=",
+   "pom": "sha256-BEU74Abwb4bXxD88SS97TrM2JoDK5PHugLpl2yM3P1o="
+  },
+  "org/openjdk/jmh#jmh-parent/1.37": {
+   "pom": "sha256-DCTyFvNjfd52ORFPcCc6aX+FRvekxtWs1Mxtrum+9Mk="
+  },
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm-bom/9.8": {
+   "pom": "sha256-DaHcsibmzf2ttNrFkZFruRe1c3RnTZG9LxMAMTe0FSA="
+  },
+  "org/ow2/asm#asm-commons/9.8": {
+   "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=",
+   "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI="
+  },
+  "org/ow2/asm#asm-tree/9.8": {
+   "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=",
+   "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c="
+  },
+  "org/ow2/asm#asm/9.8": {
+   "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=",
+   "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o="
+  },
+  "org/ow2/asm#asm/9.9": {
+   "jar": "sha256-A9madK0e5ccTNO9nQ39O9P40iMqnyW2GRavHPI4gF9Q=",
+   "pom": "sha256-z4Ye8edF1XFUr3muFN80DtU0Hl3NAVfO/NLrfxqgXFc="
+  },
+  "org/reactivestreams#reactive-streams/1.0.4": {
+   "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=",
+   "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag="
+  },
+  "org/slf4j#jcl-over-slf4j/1.7.36": {
+   "jar": "sha256-q1fKj9IjdywXNl0SH1npTsvwrlnQjAOjy1uBBxwBkZU=",
+   "pom": "sha256-vZYkPX1CGM18x9RcDjD6E0gKGk+R01bt19/pPx/7aOY="
+  },
+  "org/slf4j#jcl-over-slf4j/2.0.17": {
+   "jar": "sha256-r/0GdxWJ6/5FS7ETFaT0ZuyqE1uV8+eTlTTPHS/XBkw=",
+   "pom": "sha256-YaRGiqPB8zyfeSURHybiM5LZ9atx7gy8KHGD/BtSr8U="
+  },
+  "org/slf4j#slf4j-api/1.7.32": {
+   "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=",
+   "pom": "sha256-ABzeWzxrqRBwQlz+ny5pXkrri8KQotTNllMRJ6skT+U="
+  },
+  "org/slf4j#slf4j-api/1.7.36": {
+   "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
+   "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
+  },
+  "org/slf4j#slf4j-api/2.0.16": {
+   "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
+  },
+  "org/slf4j#slf4j-api/2.0.17": {
+   "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
+   "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
+  },
+  "org/slf4j#slf4j-api/2.0.6": {
+   "jar": "sha256-LyqS1BCyaBOdfWO3XtJeIZlc/kEAwZvyNXfP28gHe9o=",
+   "pom": "sha256-i06GxT0ng2CPGuohPZBsW6xcBDPgCxkjm7FnZLn6NzY="
+  },
+  "org/slf4j#slf4j-bom/2.0.16": {
+   "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
+  },
+  "org/slf4j#slf4j-bom/2.0.17": {
+   "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
+  },
+  "org/slf4j#slf4j-jdk14/1.7.36": {
+   "jar": "sha256-W/ZGkK9OWYdriQK7DbPdOcaGpAq/7ZfTg37u7HopIqw=",
+   "pom": "sha256-S4sBladg0D9bwvfEJC/RQi55O/FGwFpPVFMe+L9u+0E="
+  },
+  "org/slf4j#slf4j-parent/1.7.32": {
+   "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA="
+  },
+  "org/slf4j#slf4j-parent/1.7.36": {
+   "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
+  },
+  "org/slf4j#slf4j-parent/2.0.16": {
+   "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
+  },
+  "org/slf4j#slf4j-parent/2.0.17": {
+   "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
+  },
+  "org/slf4j#slf4j-parent/2.0.6": {
+   "pom": "sha256-FIJlDL4x5AjB3IkCHLrh0wRK1KAb+PYro2C2qBOhMSQ="
+  },
+  "org/sonatype/oss#oss-parent/5": {
+   "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
+  },
+  "org/sonatype/oss#oss-parent/6": {
+   "pom": "sha256-tDBtE+j1OSRYobMIZvHP8WGz0uaZmojQWe6jkyyKhJk="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  },
+  "org/springframework#spring-framework-bom/5.3.39": {
+   "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
+   "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
+  },
+  "org/testcontainers#testcontainers-bom/1.19.7": {
+   "pom": "sha256-bDMp72KWE8iKyQI7fa4oHOHdh6AO+hg5ah2pErDJRPQ="
+  },
+  "org/tukaani#xz/1.10": {
+   "jar": "sha256-lcY8GlWyLdZFOJCkGcwaZA95C799iugtseMK7++wiIg=",
+   "pom": "sha256-72CLg8O7bI4+azvqo4hCuhWWO0ZJXkr5GwdGyLdQ87k="
+  },
+  "org/tukaani#xz/1.9": {
+   "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
+   "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo="
+  },
+  "org/twitter4j#twitter4j-core/4.1.2": {
+   "jar": "sha256-cmAigcBtl+ksY86EvZPQB2QvoL/4UvY98S/RI7mQsfI=",
+   "module": "sha256-AQDT1GTl6gAdKXq4e4JQsslz2b9a2VFnltfHvnVrOCY=",
+   "pom": "sha256-VhhBMpQ6873BFPIRc7ieacjMqlj2GBo/vR1g9xJro0Y="
+  },
+  "org/vafer#jdependency/2.14": {
+   "jar": "sha256-HT3hIYOiqJada8b/Wtdx3l1W0ISXxdk+FopctxDiy/E=",
+   "pom": "sha256-yGRf/88P5qu8IVS8i/0Jysbgd2M4Kz6cGLXbmR7IFjk="
+  },
+  "org/xmlunit#xmlunit-core/2.9.1": {
+   "jar": "sha256-fnDyPU914F8O558Pa54Tts9R0082xfw6a4OUKd3h7+8=",
+   "pom": "sha256-0n5OKjEqIVR+82BcgS5+YMiuyWTn+WDlDU3Dy2azkBI="
+  },
+  "org/xmlunit#xmlunit-parent/2.9.1": {
+   "pom": "sha256-1+RY+9XGRFBIeOX7zglLHTB402mn/uF93ezj0Zn9qsA="
+  },
+  "org/xmlunit#xmlunit-placeholders/2.9.1": {
+   "jar": "sha256-H+OrnCfYNVl+031hZ8m7zLksLT0Buhr+7Cqta0Ny0+g=",
+   "pom": "sha256-8lixEzrsF0x2T84Rf12TjVBxfEFzVSIYKJUXmKF8qH8="
+  },
+  "org/yaml#snakeyaml/1.33": {
+   "jar": "sha256-Ef9Fl4jwoteB9WpKhtfmkgLOus0Cc9UmnErp8C8/2PA=",
+   "pom": "sha256-6n1I/UUyGmAz2XzSiBhtSOXpLMDHBm5ziNfEzrSvWVc="
+  },
+  "org/yaml#snakeyaml/2.4": {
+   "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=",
+   "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY="
+  },
+  "software/amazon/awssdk#annotations/2.36.3": {
+   "jar": "sha256-InJaDDSebNLRkBS48RW++FE2pyVgkSjkO2b9X1RVNYI=",
+   "pom": "sha256-8gR/AnWze8FZ4+Mmq+7s1P7xX6zsU/c9cL1XfaontKU="
+  },
+  "software/amazon/awssdk#apache-client/2.36.3": {
+   "jar": "sha256-1HA1V8YJ15IG6Yph6G7Cy0g6yhuvpNFmnGk36KdTwGs=",
+   "pom": "sha256-7IGOgJAAzNutd0rKwFgyiwNl660HExqtIVVWItSkah4="
+  },
+  "software/amazon/awssdk#arns/2.36.3": {
+   "jar": "sha256-lje1dGwjZ9GjLjpWGJhyPVy7//0DpdJlwA+QcTqhHkg=",
+   "pom": "sha256-wgFsPs+nGhls0jj0+YChrelGLbNVzH79CXjVqCIjCEQ="
+  },
+  "software/amazon/awssdk#auth/2.36.3": {
+   "jar": "sha256-KjhVfZg8KIM6RDb+nzFlp/FhrZ8lXAua6Ciaum5sTM8=",
+   "pom": "sha256-Jewv8UaNOemBwf4VNppzcpRKdPXQZ2IKzJsAbz8m24I="
+  },
+  "software/amazon/awssdk#aws-core/2.36.3": {
+   "jar": "sha256-V9mJ3UFRRKgjOqSuzyxxVY4AtTmgRlUVUMCkE84CIvs=",
+   "pom": "sha256-w2lw8xhvK1DkY5qoyMIWfjXeLAPIEWOsRX4D+ZdEwmo="
+  },
+  "software/amazon/awssdk#aws-query-protocol/2.36.3": {
+   "jar": "sha256-UL/9K1PabWSeykhD/bOqcSHSYCP82izoOMj8vh8vyJ0=",
+   "pom": "sha256-0doxvJMqmOvKM7EdHksZxJC+xgR/kUZVKaOhODVy4fM="
+  },
+  "software/amazon/awssdk#aws-sdk-java-pom/2.36.3": {
+   "pom": "sha256-CGLFyy/B/DB8xFRlBC/N9z1/PFrODyadfmT5CATgxXs="
+  },
+  "software/amazon/awssdk#aws-xml-protocol/2.36.3": {
+   "jar": "sha256-oPhCON+pHNzE+6XEf/jcQsAg13UylAp5GQizmjtUAcE=",
+   "pom": "sha256-ZXIlEMpQjrpX1NWbAqxMa98MygIsaO3P8LMvaYFpKc0="
+  },
+  "software/amazon/awssdk#bom-internal/2.36.3": {
+   "pom": "sha256-WNkZDORigocOHL7j+uuIfnT8zS05RPN6ur+13XTHol0="
+  },
+  "software/amazon/awssdk#checksums-spi/2.36.3": {
+   "jar": "sha256-/L98wktjRYlxLq6zz7bqSfAtnT//dflXV3cSfdwpCKY=",
+   "pom": "sha256-IHPkQddGu13KKoh+0/nXB9BnSpGA5D88bJwsJu8AqO0="
+  },
+  "software/amazon/awssdk#checksums/2.36.3": {
+   "jar": "sha256-zNhmr7GbJ/3r+/bhYhCB8haV2ZQv16VeykgwOvv+mNI=",
+   "pom": "sha256-c4f9IPsR+LJ8MtH1Hl2OF/pfMJdVB5uTEuAWvLEv8SQ="
+  },
+  "software/amazon/awssdk#core/2.36.3": {
+   "pom": "sha256-yI+xYp+d5klNcusm2hqgugpm1ES8TBtXqCbY5/oYL4c="
+  },
+  "software/amazon/awssdk#crt-core/2.36.3": {
+   "jar": "sha256-VWI2ngGV7mUBuSDL6rWs3BRzdGfxiVdEitAtIEhUHqc=",
+   "pom": "sha256-+qGsIGz/aMVHFHhxYtwirtQickPvw1D+bed2cxXHHXM="
+  },
+  "software/amazon/awssdk#endpoints-spi/2.36.3": {
+   "jar": "sha256-jSEAXMtCCT1/zz1z6koZafoWy7MEVlIZjSKlbUXQahI=",
+   "pom": "sha256-7DaN5C7LlmgmX6gTi5394reHacEaXMTIR4DGA0OGPFM="
+  },
+  "software/amazon/awssdk#http-auth-aws-eventstream/2.36.3": {
+   "jar": "sha256-SucWbvVG8MUpWmJ/1h9fWoQ+QGB1wKAFNy3LXyinC0A=",
+   "pom": "sha256-PPqPsIc1Mg+Wxyby8ryDndMudETtrOSjM4RGUA3VjRI="
+  },
+  "software/amazon/awssdk#http-auth-aws/2.36.3": {
+   "jar": "sha256-CTZY2qjrP61vvtW413Uzjet0Zz2k+o4cIzQtTgfvLd4=",
+   "pom": "sha256-j4buwpmWr3g+J8+VAKov13M+AciGCG0abWVO3hmD6f8="
+  },
+  "software/amazon/awssdk#http-auth-spi/2.36.3": {
+   "jar": "sha256-jr+CO/jGk0DuFoBKdTWCHVTHkW849pvbZ7ZNQ2GKUlg=",
+   "pom": "sha256-jbfkATXbD4pCsLEbrVDYwqJfn5kTNfiJy6iq7M/dIhc="
+  },
+  "software/amazon/awssdk#http-auth/2.36.3": {
+   "jar": "sha256-7L69R4IJ1vbmsKBjjaEDc+FQz4ZV1kiolMLZtTbcJzY=",
+   "pom": "sha256-eGiL0TchYMekD44bRidLgzLtTNpMyhmLgMbVOCEzDVk="
+  },
+  "software/amazon/awssdk#http-client-spi/2.36.3": {
+   "jar": "sha256-tcoNLYso27NRLHsJ8M6MU5ruaZ4myWgvPbl0OBWwZzI=",
+   "pom": "sha256-J9Iu81bTW3MnyfXDLofA5AXsYtplLotZs/xzl7wxy70="
+  },
+  "software/amazon/awssdk#http-clients/2.36.3": {
+   "pom": "sha256-xbiG5AabXhe2WzblILZ08XgY2IAFMO905oX5KCk+2Hw="
+  },
+  "software/amazon/awssdk#identity-spi/2.36.3": {
+   "jar": "sha256-JuxpBwyryXMyu9GxdCAFDUDVZGyTudb6x/fxIkhTY5s=",
+   "pom": "sha256-eEWZfY134/lV2Cs5YdE3t+UKeOPTmShZbFlya9GkICk="
+  },
+  "software/amazon/awssdk#json-utils/2.36.3": {
+   "jar": "sha256-Map3CQfML+U1wBgnrZ4uzCL7fclYk6hmla8roka0njc=",
+   "pom": "sha256-bl/xmXcRn3lDuqnYip8iEHTnZp2zG/e7y4TP5P1NObg="
+  },
+  "software/amazon/awssdk#metrics-spi/2.36.3": {
+   "jar": "sha256-xYErjqvIaW0/6fIimbfHdE3m4eeAi7d6XOzJ9GrjMjQ=",
+   "pom": "sha256-44cUQM9O0dBVQxrW4jqETRJ/8FnIFTJ4XAO8rfz78gc="
+  },
+  "software/amazon/awssdk#profiles/2.36.3": {
+   "jar": "sha256-IT79mths0DHxPcInQ5xx1b2lGNMIG8vK7FQP18+EC+4=",
+   "pom": "sha256-IzJhzFDWtA+CP3AaVFuLL/gY+ts+jGof7lTqPsYyXyE="
+  },
+  "software/amazon/awssdk#protocol-core/2.36.3": {
+   "jar": "sha256-dVabHuH7KhAeeCBAGgfg6CJr+89x0GeEQoGzYDJgsr8=",
+   "pom": "sha256-J6iVLqDDjAJgeSWG8fwM8nzCt7QTSBIWOfnE1cDNmFo="
+  },
+  "software/amazon/awssdk#protocols/2.36.3": {
+   "pom": "sha256-9d6883mPopuKiqbVki/Qa6jxUWOxqTl4TAR467YNdXA="
+  },
+  "software/amazon/awssdk#regions/2.36.3": {
+   "jar": "sha256-Fp/3RwSitZ/XzJyuQwTnHJxdfA45yEeYsznOFShOJRI=",
+   "pom": "sha256-7/hMnbFqIRal/xqYu/Ej4x5S+M/f6T2MfMrcLEK3IAg="
+  },
+  "software/amazon/awssdk#retries-spi/2.36.3": {
+   "jar": "sha256-lsrnht2ihS1/j7d6xxV58UDNKiInmPvPUY1pUrI2rsU=",
+   "pom": "sha256-jBvQBs7YBq4c34i3XMuLruLgKs+UN4xVT0Kdawj4Cds="
+  },
+  "software/amazon/awssdk#retries/2.36.3": {
+   "jar": "sha256-KqFXQyZZq2PQ9AEbg3L3xovYzVIbYQjHoo+s769SU+k=",
+   "pom": "sha256-8SMwf4t7QRYXDUgC/nRbuzIw/MkFR0gOiUY6bPS/q3w="
+  },
+  "software/amazon/awssdk#s3/2.36.3": {
+   "jar": "sha256-3Fuvu5jIv+DDRO7Jq1oVVmy8BZuqTgpYKtTL+6Y0pJA=",
+   "pom": "sha256-TzUCg8+usDzkSgd9JLgJY+uIsWGRTtIjZxjtDsK+63s="
+  },
+  "software/amazon/awssdk#sdk-core/2.36.3": {
+   "jar": "sha256-cERGQ7ezznQu5OMPcM7+YI6Oh+UWcj869xx9Mg5X5V0=",
+   "pom": "sha256-zZBbbvsNasEVgWqnwu0RZYWWubXfiJiMoRKhNFEL+Tk="
+  },
+  "software/amazon/awssdk#services/2.36.3": {
+   "pom": "sha256-vhXMPNnX34ZNFDU3qmvK9fRENeg/KmG9DoI2ZJPHvAE="
+  },
+  "software/amazon/awssdk#third-party-jackson-core/2.36.3": {
+   "jar": "sha256-LMs1cFPhJLlHG/BbqwteO01kcYeGujCOmkcKWPhLQak=",
+   "pom": "sha256-QRSaCKLgHc/g0PTPeuS9E6KnZceWQ/ynEc8/sGwebc8="
+  },
+  "software/amazon/awssdk#third-party/2.36.3": {
+   "pom": "sha256-DUnhbtP9DsRbs0FcNMHtld6IczvubzSFu/HqzfRg7uU="
+  },
+  "software/amazon/awssdk#utils-lite/2.36.3": {
+   "jar": "sha256-nu4rF8fDaxW7tZOY0R+LO8rhZ2uuPwDA8AbnJxJRCls=",
+   "pom": "sha256-JBKGNAQsqONFfA0/KRAFQCwkJQHyPgNDRoO188JjK88="
+  },
+  "software/amazon/awssdk#utils/2.36.3": {
+   "jar": "sha256-s9JUJyEtL5xBTdHzcyJWqgKwsybbQq2blsm0z+zHUNM=",
+   "pom": "sha256-8vLiat5RYvA33iTQEwnzKKO6sDgFhvBDjCQVa2N+uo8="
+  },
+  "software/amazon/eventstream#eventstream/1.0.1": {
+   "jar": "sha256-DDfY5pYRfwLDAhkbgRCw0Osg+kEvzjTDomnsc8Fs6CI=",
+   "pom": "sha256-+UYMt5Sgp69oJ377V2lWno5mUVJQJ2w35ip+i9SyV8w="
+  },
+  "software/amazon/smithy#smithy-build/1.68.0": {
+   "jar": "sha256-jjO2SlDpvNqFNvT720eQZ7gW0lQcI0l2KnIjCZhTzEM=",
+   "module": "sha256-VzpAHq3jkCGPnyJXpj2xNWwofVU2fEBRAVYU5oXRi+c=",
+   "pom": "sha256-MUkGPovYz//yUVTrvpeGQoQSXPKmp17izZdEprK+8ms="
+  },
+  "software/amazon/smithy#smithy-cli/1.68.0": {
+   "jar": "sha256-IabwZiV89U5AQkZv0cQnyXTNZCpI2XcJ9OlAYj1o1XY=",
+   "module": "sha256-WRnNwas+dJaByDDnUHTqMx9aM/e09GsN8ucfbBCM5f8=",
+   "pom": "sha256-eECCCMk3qPhV42hfNpJQEBONjUX7XPoYhbwXGN/Pho8="
+  },
+  "software/amazon/smithy#smithy-diff/1.68.0": {
+   "jar": "sha256-eZ3fy+OZn6QxSDn/LELbgMY2pnjK+FhOoaS+fjEEbfI=",
+   "module": "sha256-hiMKkjSKXp8CFVvw1ZwVrTjzi+IVQHFvR5YbJ0NWf7A=",
+   "pom": "sha256-9+mncxZTPiaF6T6j+oKPG170U9gY8CXtUczE/brWyms="
+  },
+  "software/amazon/smithy#smithy-model/1.68.0": {
+   "jar": "sha256-4HXHc0szmymYEdeXf+OWY/TaP38hBrKYdnbwBh4ANC8=",
+   "module": "sha256-YZtOyRMRyfO+eT4Xc2c367DzWZjDRi/oua/djBqgjFo=",
+   "pom": "sha256-lSrWT20uMqPENRX9dZCU9TAesi/MapQ7bOXbfIgh9k8="
+  },
+  "software/amazon/smithy#smithy-syntax/1.68.0": {
+   "jar": "sha256-kl5nzmvjPPR1qXe6NL0rByouA70Fuv9fxTSbgyDhEkQ=",
+   "module": "sha256-qTLQEP+XKzJ3meU5wJ/9A4+TyJNbiPqXcoIgakpdK6M=",
+   "pom": "sha256-lqyN69hyHR6pG1jXGJzljpIiseFh2dpbc0lURUGmB1A="
+  },
+  "software/amazon/smithy#smithy-utils/1.68.0": {
+   "jar": "sha256-tQ91hFZPUn6fJai+2IDZIa4JsR6LXEpMr7L06pXuMJI=",
+   "module": "sha256-OMQujPzPChZcTk9CfI0az+sfZ7hijaO9XTfTRdSbFK8=",
+   "pom": "sha256-xnCmwTT3U7+sHcu5jORI/iQJhsYa6NTEi8cbAtBa3MY="
+  },
+  "software/amazon/smithy/gradle#smithy-base/1.4.0": {
+   "jar": "sha256-GmLXu3t0KaNKoQayYhIAJjDETHfsCW1xrg6u92IF6sQ=",
+   "module": "sha256-dgzHrOLif2TtGqcQmUTxZPMygc0YINxA/THy/s2VOPQ=",
+   "pom": "sha256-iQZac2iU43AsVrep/ejihsmWEjtBZqXrwEyohMLNf48="
+  },
+  "software/amazon/smithy/gradle#smithy-jar/1.4.0": {
+   "jar": "sha256-TyLYibMkDM7ecKZEcJUXxkWEDj1FqaigcMIs9p1iW84=",
+   "module": "sha256-ejVxzGFZFGIMzkWmSM5Mt3axV8zP+6iOqXBhWF2vYik=",
+   "pom": "sha256-JEKbF5fa4TmNU9VquFFfRiSoKPLo9XyDYWQhUMqDHf4="
+  },
+  "software/amazon/smithy/gradle/smithy-jar#software.amazon.smithy.gradle.smithy-jar.gradle.plugin/1.4.0": {
+   "pom": "sha256-/AkHcAM/axEJ98ttGK+cHZGSDX1NB4U83Dh+iTkMQxg="
+  },
+  "software/amazon/smithy/smithy-build/maven-metadata": {
+   "xml": {
+    "groupId": "software.amazon.smithy",
+    "lastUpdated": "20260226193940",
+    "release": "1.68.0"
+   }
+  },
+  "software/amazon/smithy/smithy-cli/maven-metadata": {
+   "xml": {
+    "groupId": "software.amazon.smithy",
+    "lastUpdated": "20260226193944",
+    "release": "1.68.0"
+   }
+  },
+  "software/amazon/smithy/smithy-model/maven-metadata": {
+   "xml": {
+    "groupId": "software.amazon.smithy",
+    "lastUpdated": "20260226193957",
+    "release": "1.68.0"
+   }
+  }
+ }
+}
diff --git a/pkgs/by-name/sm/smithy-cli/package.nix b/pkgs/by-name/sm/smithy-cli/package.nix
new file mode 100644
index 000000000000..5bfc3620acb3
--- /dev/null
+++ b/pkgs/by-name/sm/smithy-cli/package.nix
@@ -0,0 +1,115 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  jdk,
+  jre,
+  makeWrapper,
+  testers,
+  runCommand,
+  writeText,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "smithy-cli";
+  version = "1.68.0";
+
+  src = fetchFromGitHub {
+    owner = "smithy-lang";
+    repo = "smithy";
+    tag = finalAttrs.version;
+    hash = "sha256-jME/yF6i+hQFMr8lseRKS8uSv0s6HNWqBfsRuSSzonI=";
+  };
+
+  nativeBuildInputs = [
+    gradle
+    jdk
+    makeWrapper
+  ];
+
+  # Required on Darwin to avoid SocketException during Gradle operations
+  __darwinAllowLocalNetworking = true;
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+
+  # Only build the shadowJar for smithy-cli, skip native image tasks that
+  # would try to download Amazon Corretto
+  gradleBuildTask = ":smithy-cli:shadowJar";
+
+  # Fetch both compile and test dependencies during update
+  gradleUpdateTask = ":smithy-cli:shadowJar :smithy-cli:test";
+
+  doCheck = true;
+  gradleCheckTask = ":smithy-cli:test";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/smithy-cli/lib $out/bin
+
+    # Install the shadow JAR and the Smithy dependency JARs that it
+    # deliberately excludes (they are expected on the classpath separately)
+    cp smithy-cli/build/libs/smithy-cli-${finalAttrs.version}.jar $out/share/smithy-cli/lib/
+    for proj in smithy-utils smithy-model smithy-build smithy-diff; do
+      cp $proj/build/libs/$proj-${finalAttrs.version}.jar $out/share/smithy-cli/lib/
+    done
+    # smithy-syntax uses the shadow plugin too, so its JAR has no classifier
+    cp smithy-syntax/build/libs/smithy-syntax-${finalAttrs.version}.jar $out/share/smithy-cli/lib/
+
+    # Create wrapper that puts all JARs on the classpath.
+    # Java's -cp wildcard syntax requires a literal '*' (not shell-expanded),
+    # so we construct the classpath explicitly.
+    classpath=$(find $out/share/smithy-cli/lib -name '*.jar' | tr '\n' ':' | sed 's/:$//')
+    makeWrapper ${lib.getExe jre} $out/bin/smithy \
+      --add-flags "-cp $classpath software.amazon.smithy.cli.SmithyCli"
+
+    runHook postInstall
+  '';
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+    };
+    validate = runCommand "smithy-cli-validate-test" { } ''
+      ${lib.getExe finalAttrs.finalPackage} validate ${writeText "example.smithy" ''
+        $version: "2.0"
+        namespace example
+        service ExampleService {
+            version: "2023-01-01"
+            operations: [GetUser]
+        }
+        operation GetUser {
+            input: GetUserInput
+            output: GetUserOutput
+        }
+        structure GetUserInput {
+            @required
+            userId: String
+        }
+        structure GetUserOutput {
+            @required
+            name: String
+        }
+      ''}
+      touch $out
+    '';
+  };
+
+  meta = {
+    description = "CLI for the Smithy interface definition language (IDL)";
+    homepage = "https://smithy.io/";
+    changelog = "https://github.com/smithy-lang/smithy/releases/tag/${finalAttrs.version}";
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode # deps
+    ];
+    license = lib.licenses.asl20;
+    mainProgram = "smithy";
+    maintainers = [ lib.maintainers.joshgodsiff ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix
index 1c679abca826..f229e3325e99 100644
--- a/pkgs/by-name/sm/smpmgr/package.nix
+++ b/pkgs/by-name/sm/smpmgr/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "smpmgr";
-  version = "0.17.0";
+  version = "0.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "intercreate";
     repo = "smpmgr";
     tag = finalAttrs.version;
-    hash = "sha256-EWvTt0bfkHA+E9nkoI8u17j6zevbDofGUxHpFXoUGyo=";
+    hash = "sha256-wH9WdZXN1sR+uEOo/LupaIqYVzuHHyOX1EimD7MVNFw=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix
index 8e9fa4eca7bd..99b8152bcb2a 100644
--- a/pkgs/by-name/sn/snakefmt/package.nix
+++ b/pkgs/by-name/sn/snakefmt/package.nix
@@ -8,12 +8,12 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "snakefmt";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-S6evESaS1IJ3YFn3jjhccNhzkBTFOL9Xt37DuLcDKeI=";
+    hash = "sha256-cvdAXFVEegcuWoNWv/D3Etije73dt50O2EPOlFOnXQg=";
   };
 
   build-system = with python3.pkgs; [ hatchling ];
diff --git a/pkgs/by-name/sn/snapper/package.nix b/pkgs/by-name/sn/snapper/package.nix
index 6ba1469b2ca1..e101e4724349 100644
--- a/pkgs/by-name/sn/snapper/package.nix
+++ b/pkgs/by-name/sn/snapper/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snapper";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "snapper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8rIjfulMuh4HzZv08bX7gveJAo2X2GvswmBD3Ziu0NM=";
+    hash = "sha256-oPIIEReHWkWSj4K/mi1VD3Ukaltquzqh8UVBPc4q+vw=";
   };
 
   strictDeps = true;
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://snapper.io";
     license = lib.licenses.gpl2Only;
     mainProgram = "snapper";
-    maintainers = with lib.maintainers; [ markuskowa ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/sn/snapraid/package.nix b/pkgs/by-name/sn/snapraid/package.nix
index a6b2720d4088..f47a04578e50 100644
--- a/pkgs/by-name/sn/snapraid/package.nix
+++ b/pkgs/by-name/sn/snapraid/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snapraid";
-  version = "14.2";
+  version = "14.4";
 
   src = fetchFromGitHub {
     owner = "amadvance";
     repo = "snapraid";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-IX1vvARLCJf/iK0TpE2d5cCdRWP2ou/n2gST/tp+fqs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zkKdJwRcOmrSWX7CHHTAlL2GYbVjLkNVFficBum86F8=";
   };
 
   env.VERSION = finalAttrs.version;
@@ -35,8 +35,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "http://www.snapraid.it/";
+    downloadPage = "https://github.com/amadvance/snapraid/releases";
+    changelog = "https://github.com/amadvance/snapraid/blob/v${finalAttrs.version}/HISTORY";
     description = "Backup program for disk arrays";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.makefu ];
     platforms = lib.platforms.unix;
     mainProgram = "snapraid";
diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix
index 006c68c41e53..a6ee70daff6d 100644
--- a/pkgs/by-name/sn/snd/package.nix
+++ b/pkgs/by-name/sn/snd/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snd";
-  version = "26.0";
+  version = "26.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/snd-${finalAttrs.version}.tar.gz";
-    hash = "sha256-8b1jyf/6Jo/0NVy+Zvwb4gJ48j5Z94JFtVMgYB03CYc=";
+    hash = "sha256-niNk7SrAt069dzaMsbWxnxd5hNlN9xV2lgc1WgCRmcc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sn/snobol4/package.nix b/pkgs/by-name/sn/snobol4/package.nix
index fae8a6652efe..479170403287 100644
--- a/pkgs/by-name/sn/snobol4/package.nix
+++ b/pkgs/by-name/sn/snobol4/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snobol4";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchurl {
     urls = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
       # fallback for when the current version is moved to the old folder
       "https://ftp.regressive.org/snobol4/old/snobol4-${finalAttrs.version}.tar.gz"
     ];
-    hash = "sha256-v9UwcdaSg3dvWydk94ZdNUuJ03JWmFShiHjln1c4jtI=";
+    hash = "sha256-cC9ztBB0OL0lHrwlPTNZlPN7tAN5JCNg2Hbi3m3AP3g=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/sn/snowsql/package.nix b/pkgs/by-name/sn/snowsql/package.nix
index ebcb08dd514a..73924baaaa4e 100644
--- a/pkgs/by-name/sn/snowsql/package.nix
+++ b/pkgs/by-name/sn/snowsql/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
         lib64/snowflake/snowsql/snowsql
 
     makeWrapper $out/lib64/snowflake/snowsql/snowsql $out/bin/snowsql \
-      --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql \
+      --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql
   '';
 
   meta = {
diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index 9bb55ab6e833..226c4187612c 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -15,13 +15,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "snx-rs";
-  version = "5.3.0";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "ancwrd1";
     repo = "snx-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+LgVWZzPfn/OJ+m3kV8N+alo5rU8OZwxB2R3iA0O6ds=";
+    hash = "sha256-aXpMrf1gRhbMU8la8mMo/hAYRNVY5VN7DKj/b/KU+GQ=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     versionCheckHook
   ];
 
-  cargoHash = "sha256-82Hz0+9YgrImBokP2pMh21iH9jCqVTj7HljCFEWXw4E=";
+  cargoHash = "sha256-j9m4L9zNjfOthYAQporI5atn0nuNjh50VvHp4w0NK2w=";
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
diff --git a/pkgs/by-name/so/soapysdr-with-plugins/package.nix b/pkgs/by-name/so/soapysdr-with-plugins/package.nix
new file mode 100644
index 000000000000..7a15466cf6b8
--- /dev/null
+++ b/pkgs/by-name/so/soapysdr-with-plugins/package.nix
@@ -0,0 +1,34 @@
+{
+  stdenvNoCC,
+  lib,
+  soapysdr,
+  limesuite,
+  soapyairspy,
+  soapyaudio,
+  soapybladerf,
+  soapyhackrf,
+  soapyplutosdr,
+  soapyremote,
+  soapyrtlsdr,
+  soapyuhd,
+  python ? null,
+  usePython ? false,
+}:
+
+soapysdr.override {
+  extraPackages = [
+    limesuite
+    soapyairspy
+    soapyaudio
+    soapybladerf
+    soapyhackrf
+    soapyplutosdr
+    soapyremote
+    soapyrtlsdr
+  ]
+  ++ (lib.optionals stdenvNoCC.hostPlatform.isLinux [
+    soapyuhd
+  ]);
+
+  inherit python usePython;
+}
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/by-name/so/soapysdr/package.nix
similarity index 100%
rename from pkgs/applications/radio/soapysdr/default.nix
rename to pkgs/by-name/so/soapysdr/package.nix
diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix
index 32f48513a0d5..99a98f909532 100644
--- a/pkgs/by-name/so/solanum/package.nix
+++ b/pkgs/by-name/so/solanum/package.nix
@@ -12,7 +12,7 @@
 
   # runtime
   lksctp-tools,
-  hyperscan,
+  vectorscan,
   libxcrypt,
   openssl,
   pkg-config,
@@ -62,10 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    hyperscan
     libxcrypt
     openssl
     sqlite
+    vectorscan
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     lksctp-tools
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/solanum-ircd/solanum";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ hexa ];
+    mainProgram = "solanum";
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/so/solidtime-desktop/missing-hashes.patch b/pkgs/by-name/so/solidtime-desktop/missing-hashes.patch
new file mode 100644
index 000000000000..6aa383723ea4
--- /dev/null
+++ b/pkgs/by-name/so/solidtime-desktop/missing-hashes.patch
@@ -0,0 +1,11157 @@
+diff --git a/package-lock.json b/package-lock.json
+index d1675b8..8c32fea 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -84,6 +84,8 @@
+         },
+         "node_modules/@alloc/quick-lru": {
+             "version": "5.2.0",
++            "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
++            "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=10"
+@@ -94,6 +96,8 @@
+         },
+         "node_modules/@babel/code-frame": {
+             "version": "7.29.0",
++            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
++            "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/helper-validator-identifier": "^7.28.5",
+@@ -106,6 +110,8 @@
+         },
+         "node_modules/@babel/compat-data": {
+             "version": "7.29.0",
++            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
++            "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6.9.0"
+@@ -113,6 +119,8 @@
+         },
+         "node_modules/@babel/core": {
+             "version": "7.29.0",
++            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
++            "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/code-frame": "^7.29.0",
+@@ -141,6 +149,8 @@
+         },
+         "node_modules/@babel/generator": {
+             "version": "7.29.1",
++            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
++            "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/parser": "^7.29.0",
+@@ -155,6 +165,8 @@
+         },
+         "node_modules/@babel/helper-compilation-targets": {
+             "version": "7.28.6",
++            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
++            "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/compat-data": "^7.28.6",
+@@ -169,6 +181,8 @@
+         },
+         "node_modules/@babel/helper-globals": {
+             "version": "7.28.0",
++            "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
++            "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6.9.0"
+@@ -176,6 +190,8 @@
+         },
+         "node_modules/@babel/helper-module-imports": {
+             "version": "7.28.6",
++            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
++            "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/traverse": "^7.28.6",
+@@ -187,6 +203,8 @@
+         },
+         "node_modules/@babel/helper-module-transforms": {
+             "version": "7.28.6",
++            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
++            "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/helper-module-imports": "^7.28.6",
+@@ -202,6 +220,8 @@
+         },
+         "node_modules/@babel/helper-plugin-utils": {
+             "version": "7.28.6",
++            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
++            "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -210,6 +230,8 @@
+         },
+         "node_modules/@babel/helper-string-parser": {
+             "version": "7.27.1",
++            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
++            "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6.9.0"
+@@ -217,6 +239,8 @@
+         },
+         "node_modules/@babel/helper-validator-identifier": {
+             "version": "7.28.5",
++            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
++            "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6.9.0"
+@@ -224,6 +248,8 @@
+         },
+         "node_modules/@babel/helper-validator-option": {
+             "version": "7.27.1",
++            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
++            "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6.9.0"
+@@ -231,6 +257,8 @@
+         },
+         "node_modules/@babel/helpers": {
+             "version": "7.29.2",
++            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz",
++            "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/template": "^7.28.6",
+@@ -242,6 +270,8 @@
+         },
+         "node_modules/@babel/parser": {
+             "version": "7.29.2",
++            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz",
++            "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/types": "^7.29.0"
+@@ -255,6 +285,8 @@
+         },
+         "node_modules/@babel/plugin-transform-arrow-functions": {
+             "version": "7.27.1",
++            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
++            "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -269,6 +301,8 @@
+         },
+         "node_modules/@babel/template": {
+             "version": "7.28.6",
++            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
++            "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/code-frame": "^7.28.6",
+@@ -281,6 +315,8 @@
+         },
+         "node_modules/@babel/traverse": {
+             "version": "7.29.0",
++            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
++            "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/code-frame": "^7.29.0",
+@@ -297,6 +333,8 @@
+         },
+         "node_modules/@babel/types": {
+             "version": "7.29.0",
++            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
++            "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/helper-string-parser": "^7.27.1",
+@@ -308,6 +346,8 @@
+         },
+         "node_modules/@develar/schema-utils": {
+             "version": "2.6.5",
++            "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz",
++            "integrity": "sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -324,11 +364,15 @@
+         },
+         "node_modules/@drizzle-team/brocli": {
+             "version": "0.10.2",
++            "resolved": "https://registry.npmjs.org/@drizzle-team/brocli/-/brocli-0.10.2.tgz",
++            "integrity": "sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w==",
+             "dev": true,
+             "license": "Apache-2.0"
+         },
+         "node_modules/@electron-toolkit/eslint-config": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/@electron-toolkit/eslint-config/-/eslint-config-1.0.2.tgz",
++            "integrity": "sha512-GJVuMsxBHfVARfmUoSTCHT0e/QfWlVbXcGk3tgoku0ad6tLjydbv2LpvKi02+Sy2WiEz9L9SkGSw090ukT/F0A==",
+             "dev": true,
+             "license": "MIT",
+             "peerDependencies": {
+@@ -337,6 +381,8 @@
+         },
+         "node_modules/@electron-toolkit/eslint-config-ts": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/@electron-toolkit/eslint-config-ts/-/eslint-config-ts-2.0.0.tgz",
++            "integrity": "sha512-NGXadMyWH9+ZsgYe/u5E0mqK2qTDq01kKKnyo7oiq/7v/dWoMoPhqSkn69NZvt7WmnFNOm57l71fv6128mAx3Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -355,6 +401,8 @@
+         },
+         "node_modules/@electron-toolkit/preload": {
+             "version": "3.0.2",
++            "resolved": "https://registry.npmjs.org/@electron-toolkit/preload/-/preload-3.0.2.tgz",
++            "integrity": "sha512-TWWPToXd8qPRfSXwzf5KVhpXMfONaUuRAZJHsKthKgZR/+LqX1dZVSSClQ8OTAEduvLGdecljCsoT2jSshfoUg==",
+             "license": "MIT",
+             "peerDependencies": {
+                 "electron": ">=13.0.0"
+@@ -362,6 +410,8 @@
+         },
+         "node_modules/@electron-toolkit/tsconfig": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/@electron-toolkit/tsconfig/-/tsconfig-2.0.0.tgz",
++            "integrity": "sha512-AdPsP770WhW7b260h13SHMdmjEEHJL6xFtgi3jwgdsSQbJOkJLeNnnpZW9qxTPCvmRI6vmdzWz5K3gibFS6SNg==",
+             "dev": true,
+             "license": "MIT",
+             "peerDependencies": {
+@@ -370,6 +420,8 @@
+         },
+         "node_modules/@electron-toolkit/utils": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/@electron-toolkit/utils/-/utils-4.0.0.tgz",
++            "integrity": "sha512-qXSntwEzluSzKl4z5yFNBknmPGjPa3zFhE4mp9+h0cgokY5ornAeP+CJQDBhKsL1S58aOQfcwkD3NwLZCl+64g==",
+             "license": "MIT",
+             "peerDependencies": {
+                 "electron": ">=13.0.0"
+@@ -377,6 +429,8 @@
+         },
+         "node_modules/@electron/asar": {
+             "version": "3.4.1",
++            "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz",
++            "integrity": "sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -393,11 +447,15 @@
+         },
+         "node_modules/@electron/asar/node_modules/balanced-match": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/@electron/asar/node_modules/brace-expansion": {
+             "version": "1.1.14",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -407,6 +465,9 @@
+         },
+         "node_modules/@electron/asar/node_modules/glob": {
+             "version": "7.2.3",
++            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -426,6 +487,8 @@
+         },
+         "node_modules/@electron/asar/node_modules/minimatch": {
+             "version": "3.1.5",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -437,6 +500,8 @@
+         },
+         "node_modules/@electron/fuses": {
+             "version": "1.8.0",
++            "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-1.8.0.tgz",
++            "integrity": "sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -450,6 +515,8 @@
+         },
+         "node_modules/@electron/fuses/node_modules/fs-extra": {
+             "version": "9.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
++            "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -463,7 +530,9 @@
+             }
+         },
+         "node_modules/@electron/fuses/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -475,6 +544,8 @@
+         },
+         "node_modules/@electron/fuses/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -483,6 +554,8 @@
+         },
+         "node_modules/@electron/get": {
+             "version": "2.0.3",
++            "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
++            "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "debug": "^4.1.1",
+@@ -502,6 +575,8 @@
+         },
+         "node_modules/@electron/notarize": {
+             "version": "2.5.0",
++            "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz",
++            "integrity": "sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -515,6 +590,8 @@
+         },
+         "node_modules/@electron/notarize/node_modules/fs-extra": {
+             "version": "9.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
++            "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -528,7 +605,9 @@
+             }
+         },
+         "node_modules/@electron/notarize/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -540,6 +619,8 @@
+         },
+         "node_modules/@electron/notarize/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -548,6 +629,8 @@
+         },
+         "node_modules/@electron/osx-sign": {
+             "version": "1.3.3",
++            "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.3.tgz",
++            "integrity": "sha512-KZ8mhXvWv2rIEgMbWZ4y33bDHyUKMXnx4M0sTyPNK/vcB81ImdeY9Ggdqy0SWbMDgmbqyQ+phgejh6V3R2QuSg==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "dependencies": {
+@@ -568,6 +651,8 @@
+         },
+         "node_modules/@electron/osx-sign/node_modules/fs-extra": {
+             "version": "10.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
++            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -581,6 +666,8 @@
+         },
+         "node_modules/@electron/osx-sign/node_modules/isbinaryfile": {
+             "version": "4.0.10",
++            "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
++            "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -591,7 +678,9 @@
+             }
+         },
+         "node_modules/@electron/osx-sign/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -603,6 +692,8 @@
+         },
+         "node_modules/@electron/osx-sign/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -610,23 +701,18 @@
+             }
+         },
+         "node_modules/@electron/rebuild": {
+-            "version": "4.0.3",
++            "version": "4.0.4",
++            "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-4.0.4.tgz",
++            "integrity": "sha512-Rzc39XPdk/+/wBG8MfwAHohXflep0ITUfulb6Rgz3R0NeSB1noE+E9/M/cb8ftCAiyDD9PPhLuuWgE1GaInbKg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+                 "@malept/cross-spawn-promise": "^2.0.0",
+                 "debug": "^4.1.1",
+-                "detect-libc": "^2.0.1",
+-                "got": "^11.7.0",
+-                "graceful-fs": "^4.2.11",
+                 "node-abi": "^4.2.0",
+                 "node-api-version": "^0.2.1",
+-                "node-gyp": "^11.2.0",
+-                "ora": "^5.1.0",
+-                "read-binary-file-arch": "^1.0.6",
+-                "semver": "^7.3.5",
+-                "tar": "^7.5.6",
+-                "yargs": "^17.0.1"
++                "node-gyp": "^12.2.0",
++                "read-binary-file-arch": "^1.0.6"
+             },
+             "bin": {
+                 "electron-rebuild": "lib/cli.js"
+@@ -635,19 +721,10 @@
+                 "node": ">=22.12.0"
+             }
+         },
+-        "node_modules/@electron/rebuild/node_modules/semver": {
+-            "version": "7.7.4",
+-            "dev": true,
+-            "license": "ISC",
+-            "bin": {
+-                "semver": "bin/semver.js"
+-            },
+-            "engines": {
+-                "node": ">=10"
+-            }
+-        },
+         "node_modules/@electron/universal": {
+             "version": "2.0.3",
++            "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.3.tgz",
++            "integrity": "sha512-Wn9sPYIVFRFl5HmwMJkARCCf7rqK/EurkfQ/rJZ14mHP3iYTjZSIOSVonEAnhWeAXwtw7zOekGRlc6yTtZ0t+g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -665,11 +742,15 @@
+         },
+         "node_modules/@electron/universal/node_modules/balanced-match": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/@electron/universal/node_modules/brace-expansion": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
++            "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -678,6 +759,8 @@
+         },
+         "node_modules/@electron/universal/node_modules/fs-extra": {
+             "version": "11.3.4",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
++            "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -690,7 +773,9 @@
+             }
+         },
+         "node_modules/@electron/universal/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -702,6 +787,8 @@
+         },
+         "node_modules/@electron/universal/node_modules/minimatch": {
+             "version": "9.0.9",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
++            "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -716,6 +803,8 @@
+         },
+         "node_modules/@electron/universal/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -724,6 +813,8 @@
+         },
+         "node_modules/@electron/windows-sign": {
+             "version": "1.2.2",
++            "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz",
++            "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "optional": true,
+@@ -744,6 +835,8 @@
+         },
+         "node_modules/@electron/windows-sign/node_modules/fs-extra": {
+             "version": "11.3.4",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
++            "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -758,7 +851,9 @@
+             }
+         },
+         "node_modules/@electron/windows-sign/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -772,6 +867,8 @@
+         },
+         "node_modules/@electron/windows-sign/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -804,384 +901,751 @@
+                 "get-tsconfig": "^4.7.0"
+             }
+         },
+-        "node_modules/@esbuild/darwin-arm64": {
++        "node_modules/@esbuild/aix-ppc64": {
+             "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
++            "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
+             "cpu": [
+-                "arm64"
++                "ppc64"
+             ],
+             "license": "MIT",
+             "optional": true,
+             "os": [
+-                "darwin"
++                "aix"
+             ],
+             "engines": {
+                 "node": ">=18"
+             }
+         },
+-        "node_modules/@eslint-community/eslint-utils": {
+-            "version": "4.9.1",
+-            "dev": true,
++        "node_modules/@esbuild/android-arm": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
++            "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
++            "cpu": [
++                "arm"
++            ],
+             "license": "MIT",
+-            "dependencies": {
+-                "eslint-visitor-keys": "^3.4.3"
+-            },
++            "optional": true,
++            "os": [
++                "android"
++            ],
+             "engines": {
+-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+-            },
+-            "funding": {
+-                "url": "https://opencollective.com/eslint"
+-            },
+-            "peerDependencies": {
+-                "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@eslint-community/regexpp": {
+-            "version": "4.12.2",
+-            "dev": true,
++        "node_modules/@esbuild/android-arm64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
++            "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
++            "cpu": [
++                "arm64"
++            ],
+             "license": "MIT",
++            "optional": true,
++            "os": [
++                "android"
++            ],
+             "engines": {
+-                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@eslint/eslintrc": {
+-            "version": "2.1.4",
+-            "dev": true,
++        "node_modules/@esbuild/android-x64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
++            "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
++            "cpu": [
++                "x64"
++            ],
+             "license": "MIT",
+-            "dependencies": {
+-                "ajv": "^6.12.4",
+-                "debug": "^4.3.2",
+-                "espree": "^9.6.0",
+-                "globals": "^13.19.0",
+-                "ignore": "^5.2.0",
+-                "import-fresh": "^3.2.1",
+-                "js-yaml": "^4.1.0",
+-                "minimatch": "^3.1.2",
+-                "strip-json-comments": "^3.1.1"
+-            },
++            "optional": true,
++            "os": [
++                "android"
++            ],
+             "engines": {
+-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+-            },
+-            "funding": {
+-                "url": "https://opencollective.com/eslint"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@eslint/eslintrc/node_modules/balanced-match": {
+-            "version": "1.0.2",
+-            "dev": true,
+-            "license": "MIT"
+-        },
+-        "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+-            "version": "1.1.14",
+-            "dev": true,
++        "node_modules/@esbuild/darwin-arm64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
++            "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
++            "cpu": [
++                "arm64"
++            ],
+             "license": "MIT",
+-            "dependencies": {
+-                "balanced-match": "^1.0.0",
+-                "concat-map": "0.0.1"
+-            }
+-        },
+-        "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+-            "version": "3.1.5",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "brace-expansion": "^1.1.7"
+-            },
++            "optional": true,
++            "os": [
++                "darwin"
++            ],
+             "engines": {
+-                "node": "*"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@eslint/js": {
+-            "version": "8.57.1",
+-            "dev": true,
++        "node_modules/@esbuild/darwin-x64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
++            "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
++            "cpu": [
++                "x64"
++            ],
+             "license": "MIT",
++            "optional": true,
++            "os": [
++                "darwin"
++            ],
+             "engines": {
+-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@fastify/otel": {
+-            "version": "0.18.0",
+-            "funding": [
+-                {
+-                    "type": "github",
+-                    "url": "https://github.com/sponsors/fastify"
+-                },
+-                {
+-                    "type": "opencollective",
+-                    "url": "https://opencollective.com/fastify"
+-                }
++        "node_modules/@esbuild/freebsd-arm64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
++            "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
++            "cpu": [
++                "arm64"
+             ],
+             "license": "MIT",
+-            "dependencies": {
+-                "@opentelemetry/core": "^2.0.0",
+-                "@opentelemetry/instrumentation": "^0.212.0",
+-                "@opentelemetry/semantic-conventions": "^1.28.0",
+-                "minimatch": "^10.2.4"
+-            },
+-            "peerDependencies": {
+-                "@opentelemetry/api": "^1.9.0"
++            "optional": true,
++            "os": [
++                "freebsd"
++            ],
++            "engines": {
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@fastify/otel/node_modules/@opentelemetry/api-logs": {
+-            "version": "0.212.0",
+-            "license": "Apache-2.0",
+-            "dependencies": {
+-                "@opentelemetry/api": "^1.3.0"
+-            },
++        "node_modules/@esbuild/freebsd-x64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
++            "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "freebsd"
++            ],
+             "engines": {
+-                "node": ">=8.0.0"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@fastify/otel/node_modules/@opentelemetry/instrumentation": {
+-            "version": "0.212.0",
+-            "license": "Apache-2.0",
+-            "dependencies": {
+-                "@opentelemetry/api-logs": "0.212.0",
+-                "import-in-the-middle": "^2.0.6",
+-                "require-in-the-middle": "^8.0.0"
+-            },
++        "node_modules/@esbuild/linux-arm": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
++            "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
++            "cpu": [
++                "arm"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
+             "engines": {
+-                "node": "^18.19.0 || >=20.6.0"
+-            },
+-            "peerDependencies": {
+-                "@opentelemetry/api": "^1.3.0"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@fastify/otel/node_modules/import-in-the-middle": {
+-            "version": "2.0.6",
+-            "license": "Apache-2.0",
+-            "dependencies": {
+-                "acorn": "^8.15.0",
+-                "acorn-import-attributes": "^1.9.5",
+-                "cjs-module-lexer": "^2.2.0",
+-                "module-details-from-path": "^1.0.4"
++        "node_modules/@esbuild/linux-arm64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
++            "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@floating-ui/core": {
+-            "version": "1.7.5",
++        "node_modules/@esbuild/linux-ia32": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
++            "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
++            "cpu": [
++                "ia32"
++            ],
+             "license": "MIT",
+-            "peer": true,
+-            "dependencies": {
+-                "@floating-ui/utils": "^0.2.11"
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@floating-ui/dom": {
+-            "version": "1.7.6",
++        "node_modules/@esbuild/linux-loong64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
++            "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
++            "cpu": [
++                "loong64"
++            ],
+             "license": "MIT",
+-            "peer": true,
+-            "dependencies": {
+-                "@floating-ui/core": "^1.7.5",
+-                "@floating-ui/utils": "^0.2.11"
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@floating-ui/utils": {
+-            "version": "0.2.11",
++        "node_modules/@esbuild/linux-mips64el": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
++            "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
++            "cpu": [
++                "mips64el"
++            ],
+             "license": "MIT",
+-            "peer": true
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
+         },
+-        "node_modules/@floating-ui/vue": {
+-            "version": "1.1.11",
++        "node_modules/@esbuild/linux-ppc64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
++            "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
++            "cpu": [
++                "ppc64"
++            ],
+             "license": "MIT",
+-            "peer": true,
+-            "dependencies": {
+-                "@floating-ui/dom": "^1.7.6",
+-                "@floating-ui/utils": "^0.2.11",
+-                "vue-demi": ">=0.13.0"
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@floating-ui/vue/node_modules/vue-demi": {
+-            "version": "0.14.10",
+-            "hasInstallScript": true,
++        "node_modules/@esbuild/linux-riscv64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
++            "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
++            "cpu": [
++                "riscv64"
++            ],
+             "license": "MIT",
+-            "peer": true,
+-            "bin": {
+-                "vue-demi-fix": "bin/vue-demi-fix.js",
+-                "vue-demi-switch": "bin/vue-demi-switch.js"
+-            },
++            "optional": true,
++            "os": [
++                "linux"
++            ],
+             "engines": {
+-                "node": ">=12"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/antfu"
+-            },
+-            "peerDependencies": {
+-                "@vue/composition-api": "^1.0.0-rc.1",
+-                "vue": "^3.0.0-0 || ^2.6.0"
+-            },
+-            "peerDependenciesMeta": {
+-                "@vue/composition-api": {
+-                    "optional": true
+-                }
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@heroicons/vue": {
+-            "version": "2.2.0",
++        "node_modules/@esbuild/linux-s390x": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
++            "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
++            "cpu": [
++                "s390x"
++            ],
+             "license": "MIT",
+-            "peerDependencies": {
+-                "vue": ">= 3"
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@humanwhocodes/config-array": {
+-            "version": "0.13.0",
+-            "dev": true,
+-            "license": "Apache-2.0",
+-            "dependencies": {
+-                "@humanwhocodes/object-schema": "^2.0.3",
+-                "debug": "^4.3.1",
+-                "minimatch": "^3.0.5"
+-            },
++        "node_modules/@esbuild/linux-x64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz",
++            "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
+             "engines": {
+-                "node": ">=10.10.0"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@humanwhocodes/config-array/node_modules/balanced-match": {
+-            "version": "1.0.2",
+-            "dev": true,
+-            "license": "MIT"
+-        },
+-        "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
+-            "version": "1.1.14",
+-            "dev": true,
++        "node_modules/@esbuild/netbsd-arm64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
++            "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
++            "cpu": [
++                "arm64"
++            ],
+             "license": "MIT",
+-            "dependencies": {
+-                "balanced-match": "^1.0.0",
+-                "concat-map": "0.0.1"
++            "optional": true,
++            "os": [
++                "netbsd"
++            ],
++            "engines": {
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+-            "version": "3.1.5",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "brace-expansion": "^1.1.7"
+-            },
++        "node_modules/@esbuild/netbsd-x64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
++            "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "netbsd"
++            ],
+             "engines": {
+-                "node": "*"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@humanwhocodes/module-importer": {
+-            "version": "1.0.1",
+-            "dev": true,
+-            "license": "Apache-2.0",
++        "node_modules/@esbuild/openbsd-arm64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
++            "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "openbsd"
++            ],
+             "engines": {
+-                "node": ">=12.22"
+-            },
+-            "funding": {
+-                "type": "github",
+-                "url": "https://github.com/sponsors/nzakas"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@humanwhocodes/object-schema": {
+-            "version": "2.0.3",
+-            "dev": true,
+-            "license": "BSD-3-Clause"
+-        },
+-        "node_modules/@internationalized/date": {
+-            "version": "3.12.0",
+-            "license": "Apache-2.0",
+-            "peer": true,
+-            "dependencies": {
+-                "@swc/helpers": "^0.5.0"
++        "node_modules/@esbuild/openbsd-x64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
++            "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "openbsd"
++            ],
++            "engines": {
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@internationalized/number": {
+-            "version": "3.6.5",
+-            "license": "Apache-2.0",
+-            "peer": true,
+-            "dependencies": {
+-                "@swc/helpers": "^0.5.0"
++        "node_modules/@esbuild/openharmony-arm64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
++            "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "openharmony"
++            ],
++            "engines": {
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@isaacs/cliui": {
+-            "version": "8.0.2",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "string-width": "^5.1.2",
+-                "string-width-cjs": "npm:string-width@^4.2.0",
+-                "strip-ansi": "^7.0.1",
+-                "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+-                "wrap-ansi": "^8.1.0",
+-                "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+-            },
++        "node_modules/@esbuild/sunos-x64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
++            "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "sunos"
++            ],
+             "engines": {
+-                "node": ">=12"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+-            "version": "6.2.2",
+-            "dev": true,
++        "node_modules/@esbuild/win32-arm64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
++            "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
++            "cpu": [
++                "arm64"
++            ],
+             "license": "MIT",
++            "optional": true,
++            "os": [
++                "win32"
++            ],
+             "engines": {
+-                "node": ">=12"
+-            },
+-            "funding": {
+-                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+-            "version": "6.2.3",
+-            "dev": true,
++        "node_modules/@esbuild/win32-ia32": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
++            "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
++            "cpu": [
++                "ia32"
++            ],
+             "license": "MIT",
++            "optional": true,
++            "os": [
++                "win32"
++            ],
+             "engines": {
+-                "node": ">=12"
+-            },
+-            "funding": {
+-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+-            "version": "9.2.2",
+-            "dev": true,
+-            "license": "MIT"
++        "node_modules/@esbuild/win32-x64": {
++            "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
++            "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "win32"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
+         },
+-        "node_modules/@isaacs/cliui/node_modules/string-width": {
+-            "version": "5.1.2",
++        "node_modules/@eslint-community/eslint-utils": {
++            "version": "4.9.1",
++            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
++            "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+-                "eastasianwidth": "^0.2.0",
+-                "emoji-regex": "^9.2.2",
+-                "strip-ansi": "^7.0.1"
++                "eslint-visitor-keys": "^3.4.3"
+             },
+             "engines": {
+-                "node": ">=12"
++                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+             },
+             "funding": {
+-                "url": "https://github.com/sponsors/sindresorhus"
++                "url": "https://opencollective.com/eslint"
++            },
++            "peerDependencies": {
++                "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+             }
+         },
+-        "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+-            "version": "7.2.0",
++        "node_modules/@eslint-community/regexpp": {
++            "version": "4.12.2",
++            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
++            "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
+             "dev": true,
+             "license": "MIT",
+-            "dependencies": {
+-                "ansi-regex": "^6.2.2"
+-            },
+             "engines": {
+-                "node": ">=12"
+-            },
+-            "funding": {
+-                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
++                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+             }
+         },
+-        "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+-            "version": "8.1.0",
++        "node_modules/@eslint/eslintrc": {
++            "version": "2.1.4",
++            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
++            "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+-                "ansi-styles": "^6.1.0",
+-                "string-width": "^5.0.1",
+-                "strip-ansi": "^7.0.1"
++                "ajv": "^6.12.4",
++                "debug": "^4.3.2",
++                "espree": "^9.6.0",
++                "globals": "^13.19.0",
++                "ignore": "^5.2.0",
++                "import-fresh": "^3.2.1",
++                "js-yaml": "^4.1.0",
++                "minimatch": "^3.1.2",
++                "strip-json-comments": "^3.1.1"
+             },
+             "engines": {
+-                "node": ">=12"
++                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+             },
+             "funding": {
+-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
++                "url": "https://opencollective.com/eslint"
+             }
+         },
+-        "node_modules/@isaacs/fs-minipass": {
+-            "version": "4.0.1",
++        "node_modules/@eslint/eslintrc/node_modules/balanced-match": {
++            "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
++            "dev": true,
++            "license": "MIT"
++        },
++        "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
++            "version": "1.1.14",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++            "dev": true,
++            "license": "MIT",
++            "dependencies": {
++                "balanced-match": "^1.0.0",
++                "concat-map": "0.0.1"
++            }
++        },
++        "node_modules/@eslint/eslintrc/node_modules/minimatch": {
++            "version": "3.1.5",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++            "dev": true,
++            "license": "ISC",
++            "dependencies": {
++                "brace-expansion": "^1.1.7"
++            },
++            "engines": {
++                "node": "*"
++            }
++        },
++        "node_modules/@eslint/js": {
++            "version": "8.57.1",
++            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
++            "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
++            "dev": true,
++            "license": "MIT",
++            "engines": {
++                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
++            }
++        },
++        "node_modules/@fastify/otel": {
++            "version": "0.18.0",
++            "resolved": "https://registry.npmjs.org/@fastify/otel/-/otel-0.18.0.tgz",
++            "integrity": "sha512-3TASCATfw+ctICSb4ymrv7iCm0qJ0N9CarB+CZ7zIJ7KqNbwI5JjyDL1/sxoC0ccTO1Zyd1iQ+oqncPg5FJXaA==",
++            "funding": [
++                {
++                    "type": "github",
++                    "url": "https://github.com/sponsors/fastify"
++                },
++                {
++                    "type": "opencollective",
++                    "url": "https://opencollective.com/fastify"
++                }
++            ],
++            "license": "MIT",
++            "dependencies": {
++                "@opentelemetry/core": "^2.0.0",
++                "@opentelemetry/instrumentation": "^0.212.0",
++                "@opentelemetry/semantic-conventions": "^1.28.0",
++                "minimatch": "^10.2.4"
++            },
++            "peerDependencies": {
++                "@opentelemetry/api": "^1.9.0"
++            }
++        },
++        "node_modules/@fastify/otel/node_modules/@opentelemetry/api-logs": {
++            "version": "0.212.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.212.0.tgz",
++            "integrity": "sha512-TEEVrLbNROUkYY51sBJGk7lO/OLjuepch8+hmpM6ffMJQ2z/KVCjdHuCFX6fJj8OkJP2zckPjrJzQtXU3IAsFg==",
++            "license": "Apache-2.0",
++            "dependencies": {
++                "@opentelemetry/api": "^1.3.0"
++            },
++            "engines": {
++                "node": ">=8.0.0"
++            }
++        },
++        "node_modules/@fastify/otel/node_modules/@opentelemetry/instrumentation": {
++            "version": "0.212.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.212.0.tgz",
++            "integrity": "sha512-IyXmpNnifNouMOe0I/gX7ENfv2ZCNdYTF0FpCsoBcpbIHzk81Ww9rQTYTnvghszCg7qGrIhNvWC8dhEifgX9Jg==",
++            "license": "Apache-2.0",
++            "dependencies": {
++                "@opentelemetry/api-logs": "0.212.0",
++                "import-in-the-middle": "^2.0.6",
++                "require-in-the-middle": "^8.0.0"
++            },
++            "engines": {
++                "node": "^18.19.0 || >=20.6.0"
++            },
++            "peerDependencies": {
++                "@opentelemetry/api": "^1.3.0"
++            }
++        },
++        "node_modules/@fastify/otel/node_modules/import-in-the-middle": {
++            "version": "2.0.6",
++            "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-2.0.6.tgz",
++            "integrity": "sha512-3vZV3jX0XRFW3EJDTwzWoZa+RH1b8eTTx6YOCjglrLyPuepwoBti1k3L2dKwdCUrnVEfc5CuRuGstaC/uQJJaw==",
++            "license": "Apache-2.0",
++            "dependencies": {
++                "acorn": "^8.15.0",
++                "acorn-import-attributes": "^1.9.5",
++                "cjs-module-lexer": "^2.2.0",
++                "module-details-from-path": "^1.0.4"
++            }
++        },
++        "node_modules/@floating-ui/core": {
++            "version": "1.7.5",
++            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
++            "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==",
++            "license": "MIT",
++            "peer": true,
++            "dependencies": {
++                "@floating-ui/utils": "^0.2.11"
++            }
++        },
++        "node_modules/@floating-ui/dom": {
++            "version": "1.7.6",
++            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
++            "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
++            "license": "MIT",
++            "peer": true,
++            "dependencies": {
++                "@floating-ui/core": "^1.7.5",
++                "@floating-ui/utils": "^0.2.11"
++            }
++        },
++        "node_modules/@floating-ui/utils": {
++            "version": "0.2.11",
++            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
++            "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
++            "license": "MIT",
++            "peer": true
++        },
++        "node_modules/@floating-ui/vue": {
++            "version": "1.1.11",
++            "resolved": "https://registry.npmjs.org/@floating-ui/vue/-/vue-1.1.11.tgz",
++            "integrity": "sha512-HzHKCNVxnGS35r9fCHBc3+uCnjw9IWIlCPL683cGgM9Kgj2BiAl8x1mS7vtvP6F9S/e/q4O6MApwSHj8hNLGfw==",
++            "license": "MIT",
++            "peer": true,
++            "dependencies": {
++                "@floating-ui/dom": "^1.7.6",
++                "@floating-ui/utils": "^0.2.11",
++                "vue-demi": ">=0.13.0"
++            }
++        },
++        "node_modules/@floating-ui/vue/node_modules/vue-demi": {
++            "version": "0.14.10",
++            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
++            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
++            "hasInstallScript": true,
++            "license": "MIT",
++            "peer": true,
++            "bin": {
++                "vue-demi-fix": "bin/vue-demi-fix.js",
++                "vue-demi-switch": "bin/vue-demi-switch.js"
++            },
++            "engines": {
++                "node": ">=12"
++            },
++            "funding": {
++                "url": "https://github.com/sponsors/antfu"
++            },
++            "peerDependencies": {
++                "@vue/composition-api": "^1.0.0-rc.1",
++                "vue": "^3.0.0-0 || ^2.6.0"
++            },
++            "peerDependenciesMeta": {
++                "@vue/composition-api": {
++                    "optional": true
++                }
++            }
++        },
++        "node_modules/@heroicons/vue": {
++            "version": "2.2.0",
++            "resolved": "https://registry.npmjs.org/@heroicons/vue/-/vue-2.2.0.tgz",
++            "integrity": "sha512-G3dbSxoeEKqbi/DFalhRxJU4mTXJn7GwZ7ae8NuEQzd1bqdd0jAbdaBZlHPcvPD2xI1iGzNVB4k20Un2AguYPw==",
++            "license": "MIT",
++            "peerDependencies": {
++                "vue": ">= 3"
++            }
++        },
++        "node_modules/@humanwhocodes/config-array": {
++            "version": "0.13.0",
++            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
++            "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
++            "deprecated": "Use @eslint/config-array instead",
++            "dev": true,
++            "license": "Apache-2.0",
++            "dependencies": {
++                "@humanwhocodes/object-schema": "^2.0.3",
++                "debug": "^4.3.1",
++                "minimatch": "^3.0.5"
++            },
++            "engines": {
++                "node": ">=10.10.0"
++            }
++        },
++        "node_modules/@humanwhocodes/config-array/node_modules/balanced-match": {
++            "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
++            "dev": true,
++            "license": "MIT"
++        },
++        "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
++            "version": "1.1.14",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++            "dev": true,
++            "license": "MIT",
++            "dependencies": {
++                "balanced-match": "^1.0.0",
++                "concat-map": "0.0.1"
++            }
++        },
++        "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
++            "version": "3.1.5",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++            "dev": true,
++            "license": "ISC",
++            "dependencies": {
++                "brace-expansion": "^1.1.7"
++            },
++            "engines": {
++                "node": "*"
++            }
++        },
++        "node_modules/@humanwhocodes/module-importer": {
++            "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
++            "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
++            "dev": true,
++            "license": "Apache-2.0",
++            "engines": {
++                "node": ">=12.22"
++            },
++            "funding": {
++                "type": "github",
++                "url": "https://github.com/sponsors/nzakas"
++            }
++        },
++        "node_modules/@humanwhocodes/object-schema": {
++            "version": "2.0.3",
++            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
++            "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
++            "deprecated": "Use @eslint/object-schema instead",
++            "dev": true,
++            "license": "BSD-3-Clause"
++        },
++        "node_modules/@internationalized/date": {
++            "version": "3.12.1",
++            "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.12.1.tgz",
++            "integrity": "sha512-6IedsVWXyq4P9Tj+TxuU8WGWM70hYLl12nbYU8jkikVpa6WXapFazPUcHUMDMoWftIDE2ILDkFFte6W2nFCkRQ==",
++            "license": "Apache-2.0",
++            "peer": true,
++            "dependencies": {
++                "@swc/helpers": "^0.5.0"
++            }
++        },
++        "node_modules/@internationalized/number": {
++            "version": "3.6.6",
++            "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.6.6.tgz",
++            "integrity": "sha512-iFgmQaXHE0vytNfpLZWOC2mEJCBRzcUxt53Xf/yCXG93lRvqas237i3r7X4RKMwO3txiyZD4mQjKAByFv6UGSQ==",
++            "license": "Apache-2.0",
++            "peer": true,
++            "dependencies": {
++                "@swc/helpers": "^0.5.0"
++            }
++        },
++        "node_modules/@isaacs/fs-minipass": {
++            "version": "4.0.1",
++            "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
++            "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -1193,6 +1657,8 @@
+         },
+         "node_modules/@jridgewell/gen-mapping": {
+             "version": "0.3.13",
++            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
++            "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+             "license": "MIT",
+             "dependencies": {
+                 "@jridgewell/sourcemap-codec": "^1.5.0",
+@@ -1201,6 +1667,8 @@
+         },
+         "node_modules/@jridgewell/remapping": {
+             "version": "2.3.5",
++            "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
++            "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@jridgewell/gen-mapping": "^0.3.5",
+@@ -1209,6 +1677,8 @@
+         },
+         "node_modules/@jridgewell/resolve-uri": {
+             "version": "3.1.2",
++            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
++            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6.0.0"
+@@ -1216,10 +1686,14 @@
+         },
+         "node_modules/@jridgewell/sourcemap-codec": {
+             "version": "1.5.5",
++            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
++            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+             "license": "MIT"
+         },
+         "node_modules/@jridgewell/trace-mapping": {
+             "version": "0.3.31",
++            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
++            "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@jridgewell/resolve-uri": "^3.1.0",
+@@ -1228,6 +1702,8 @@
+         },
+         "node_modules/@malept/cross-spawn-promise": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz",
++            "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==",
+             "dev": true,
+             "funding": [
+                 {
+@@ -1249,6 +1725,8 @@
+         },
+         "node_modules/@malept/flatpak-bundler": {
+             "version": "0.4.0",
++            "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz",
++            "integrity": "sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -1263,6 +1741,8 @@
+         },
+         "node_modules/@malept/flatpak-bundler/node_modules/fs-extra": {
+             "version": "9.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
++            "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -1276,7 +1756,9 @@
+             }
+         },
+         "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -1288,6 +1770,8 @@
+         },
+         "node_modules/@malept/flatpak-bundler/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -1296,6 +1780,8 @@
+         },
+         "node_modules/@miniben90/x-win": {
+             "version": "3.5.0",
++            "resolved": "https://registry.npmjs.org/@miniben90/x-win/-/x-win-3.5.0.tgz",
++            "integrity": "sha512-uqjNuqn4VyYrTOEDi2PbEkXC1JwEsAn4RuD90/dSmLkco/jL/SUc4VuUh8/8KHGL30mNH535WBIwAQ9y4mkLkQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 10.16.0 < 11 || >= 11.8.0 < 12 || >= 12.0.0"
+@@ -1313,6 +1799,8 @@
+         },
+         "node_modules/@miniben90/x-win-darwin-arm64": {
+             "version": "3.5.0",
++            "resolved": "https://registry.npmjs.org/@miniben90/x-win-darwin-arm64/-/x-win-darwin-arm64-3.5.0.tgz",
++            "integrity": "sha512-Xssv8Issa61pupaFElUbaMtpBoWEsdzJFDN4HiDXD6BuaRb5OGY/qh6Aq/poAXZC/itS5I7/T5N5CUzYXepnJA==",
+             "cpu": [
+                 "arm64"
+             ],
+@@ -1327,6 +1815,8 @@
+         },
+         "node_modules/@miniben90/x-win-darwin-universal": {
+             "version": "3.5.0",
++            "resolved": "https://registry.npmjs.org/@miniben90/x-win-darwin-universal/-/x-win-darwin-universal-3.5.0.tgz",
++            "integrity": "sha512-0QSe8qKjnw+vzGCVRbS/AZvT7ThemSaxop5EmBiN8MEnIGFQC2mWB7vM9voLaGxD8yiEL00y9lX4evpnB/TZWQ==",
+             "license": "MIT",
+             "optional": true,
+             "os": [
+@@ -1434,6 +1924,8 @@
+         },
+         "node_modules/@nodelib/fs.scandir": {
+             "version": "2.1.5",
++            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
++            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+             "license": "MIT",
+             "dependencies": {
+                 "@nodelib/fs.stat": "2.0.5",
+@@ -1445,6 +1937,8 @@
+         },
+         "node_modules/@nodelib/fs.stat": {
+             "version": "2.0.5",
++            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
++            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 8"
+@@ -1452,6 +1946,8 @@
+         },
+         "node_modules/@nodelib/fs.walk": {
+             "version": "1.2.8",
++            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
++            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+             "license": "MIT",
+             "dependencies": {
+                 "@nodelib/fs.scandir": "2.1.5",
+@@ -1463,84 +1959,38 @@
+         },
+         "node_modules/@nornagon/put": {
+             "version": "0.0.8",
++            "resolved": "https://registry.npmjs.org/@nornagon/put/-/put-0.0.8.tgz",
++            "integrity": "sha512-ugvXJjwF5ldtUpa7D95kruNJ41yFQDEKyF5CW4TgKJnh+W/zmlBzXXeKTyqIgwMFrkePN2JqOBqcF0M0oOunow==",
+             "license": "MIT/X11",
+             "engines": {
+                 "node": ">=0.3.0"
+             }
+         },
+-        "node_modules/@npmcli/agent": {
+-            "version": "3.0.0",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "agent-base": "^7.1.0",
+-                "http-proxy-agent": "^7.0.0",
+-                "https-proxy-agent": "^7.0.1",
+-                "lru-cache": "^10.0.1",
+-                "socks-proxy-agent": "^8.0.3"
+-            },
++        "node_modules/@opentelemetry/api": {
++            "version": "1.9.1",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.1.tgz",
++            "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==",
++            "license": "Apache-2.0",
+             "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
++                "node": ">=8.0.0"
+             }
+         },
+-        "node_modules/@npmcli/agent/node_modules/https-proxy-agent": {
+-            "version": "7.0.6",
+-            "dev": true,
+-            "license": "MIT",
++        "node_modules/@opentelemetry/api-logs": {
++            "version": "0.214.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.214.0.tgz",
++            "integrity": "sha512-40lSJeqYO8Uz2Yj7u94/SJWE/wONa7rmMKjI1ZcIjgf3MHNHv1OZUCrCETGuaRF62d5pQD1wKIW+L4lmSMTzZA==",
++            "license": "Apache-2.0",
+             "dependencies": {
+-                "agent-base": "^7.1.2",
+-                "debug": "4"
++                "@opentelemetry/api": "^1.3.0"
+             },
+             "engines": {
+-                "node": ">= 14"
+-            }
+-        },
+-        "node_modules/@npmcli/agent/node_modules/lru-cache": {
+-            "version": "10.4.3",
+-            "dev": true,
+-            "license": "ISC"
+-        },
+-        "node_modules/@npmcli/fs": {
+-            "version": "4.0.0",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "semver": "^7.3.5"
+-            },
+-            "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
+-            }
+-        },
+-        "node_modules/@npmcli/fs/node_modules/semver": {
+-            "version": "7.7.4",
+-            "dev": true,
+-            "license": "ISC",
+-            "bin": {
+-                "semver": "bin/semver.js"
+-            },
+-            "engines": {
+-                "node": ">=10"
+-            }
+-        },
+-        "node_modules/@opentelemetry/api": {
+-            "version": "1.9.1",
+-            "license": "Apache-2.0",
+-            "engines": {
+-                "node": ">=8.0.0"
+-            }
+-        },
+-        "node_modules/@opentelemetry/api-logs": {
+-            "version": "0.214.0",
+-            "license": "Apache-2.0",
+-            "dependencies": {
+-                "@opentelemetry/api": "^1.3.0"
+-            },
+-            "engines": {
+-                "node": ">=8.0.0"
++                "node": ">=8.0.0"
+             }
+         },
+         "node_modules/@opentelemetry/context-async-hooks": {
+-            "version": "2.6.1",
++            "version": "2.7.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-2.7.0.tgz",
++            "integrity": "sha512-MWXggArM+Y11mPS8VOrqxOj+YMGQSRuvhM91eSBX4xFpJa05mpkeVvM8pPux5ElkEjV5RMgrkisrlP/R83SpBQ==",
+             "license": "Apache-2.0",
+             "engines": {
+                 "node": "^18.19.0 || >=20.6.0"
+@@ -1550,7 +2000,9 @@
+             }
+         },
+         "node_modules/@opentelemetry/core": {
+-            "version": "2.6.1",
++            "version": "2.7.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.7.0.tgz",
++            "integrity": "sha512-DT12SXVwV2eoJrGf4nnsvZojxxeQo+LlNAsoYGRRObPWTeN6APiqZ2+nqDCQDvQX40eLi1AePONS0onoASp3yQ==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/semantic-conventions": "^1.29.0"
+@@ -1564,6 +2016,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation": {
+             "version": "0.214.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.214.0.tgz",
++            "integrity": "sha512-MHqEX5Dk59cqVah5LiARMACku7jXSVk9iVDWOea4x3cr7VfdByeDCURK6o1lntT1JS/Tsovw01UJrBhN3/uC5w==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/api-logs": "0.214.0",
+@@ -1579,6 +2033,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-amqplib": {
+             "version": "0.61.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.61.0.tgz",
++            "integrity": "sha512-mCKoyTGfRNisge4br0NpOFSy2Z1NnEW8hbCJdUDdJFHrPqVzc4IIBPA/vX0U+LUcQqrQvJX+HMIU0dbDRe0i0Q==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "^2.0.0",
+@@ -1594,6 +2050,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-connect": {
+             "version": "0.57.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.57.0.tgz",
++            "integrity": "sha512-FMEBChnI4FLN5TE9DHwfH7QpNir1JzXno1uz/TAucVdLCyrG0jTrKIcNHt/i30A0M2AunNBCkcd8Ei26dIPKdg==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "^2.0.0",
+@@ -1610,6 +2068,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-dataloader": {
+             "version": "0.31.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.31.0.tgz",
++            "integrity": "sha512-f654tZFQXS5YeLDNb9KySrwtg7SnqZN119FauD7acBoTzuLduaiGTNz88ixcVSOOMGZ+EjJu/RFtx5klObC95g==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0"
+@@ -1623,6 +2083,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-express": {
+             "version": "0.62.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.62.0.tgz",
++            "integrity": "sha512-Tvx+vgAZKEQxU3Rx+xWLiR0mLxHwmk69/8ya04+VsV9WYh8w6Lhx5hm5yAMvo1wy0KqWgFKBLwSeo3sHCwdOww==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "^2.0.0",
+@@ -1638,6 +2100,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-fs": {
+             "version": "0.33.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.33.0.tgz",
++            "integrity": "sha512-sCZWXGalQ01wr3tAhSR9ucqFJ0phidpAle6/17HVjD6gN8FLmZMK/8sKxdXYHy3PbnlV1P4zeiSVFNKpbFMNLA==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "^2.0.0",
+@@ -1652,6 +2116,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-generic-pool": {
+             "version": "0.57.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.57.0.tgz",
++            "integrity": "sha512-orhmlaK+ZIW9hKU+nHTbXrCSXZcH83AescTqmpamHRobRmYSQwRbD0a1odc0yAzuzOtxYiHiXAnpnIpaSSY7Ow==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0"
+@@ -1665,6 +2131,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-graphql": {
+             "version": "0.62.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.62.0.tgz",
++            "integrity": "sha512-3YNuLVPUxafXkH1jBAbGsKNsP3XVzcFDhCDCE3OqBwCwShlqQbLMRMFh1T/d5jaVZiGVmSsfof+ICKD2iOV8xg==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0"
+@@ -1678,6 +2146,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-hapi": {
+             "version": "0.60.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.60.0.tgz",
++            "integrity": "sha512-aNljZKYrEa7obLAxd1bCEDxF7kzCLGXTuTJZ8lMR9rIVEjmuKBXN1gfqpm/OB//Zc2zP4iIve1jBp7sr3mQV6w==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "^2.0.0",
+@@ -1693,6 +2163,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-http": {
+             "version": "0.214.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.214.0.tgz",
++            "integrity": "sha512-FlkDhZDRjDJDcO2LcSCtjRpkal1NJ8y0fBqBhTvfAR3JSYY2jAIj1kSS5IjmEBt4c3aWv+u/lqLuoCDrrKCSKg==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "2.6.1",
+@@ -1707,8 +2179,25 @@
+                 "@opentelemetry/api": "^1.3.0"
+             }
+         },
++        "node_modules/@opentelemetry/instrumentation-http/node_modules/@opentelemetry/core": {
++            "version": "2.6.1",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.6.1.tgz",
++            "integrity": "sha512-8xHSGWpJP9wBxgBpnqGL0R3PbdWQndL1Qp50qrg71+B28zK5OQmUgcDKLJgzyAAV38t4tOyLMGDD60LneR5W8g==",
++            "license": "Apache-2.0",
++            "dependencies": {
++                "@opentelemetry/semantic-conventions": "^1.29.0"
++            },
++            "engines": {
++                "node": "^18.19.0 || >=20.6.0"
++            },
++            "peerDependencies": {
++                "@opentelemetry/api": ">=1.0.0 <1.10.0"
++            }
++        },
+         "node_modules/@opentelemetry/instrumentation-ioredis": {
+             "version": "0.62.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.62.0.tgz",
++            "integrity": "sha512-ZYt//zcPve8qklaZX+5Z4MkU7UpEkFRrxsf2cnaKYBitqDnsCN69CPAuuMOX6NYdW2rG9sFy7V/QWtBlP5XiNQ==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0",
+@@ -1724,6 +2213,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-kafkajs": {
+             "version": "0.23.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.23.0.tgz",
++            "integrity": "sha512-4K+nVo+zI+aDz0Z85SObwbdixIbzS9moIuKJaYsdlzcHYnKOPtB7ya8r8Ezivy/GVIBHiKJVq4tv+BEkgOMLaQ==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0",
+@@ -1738,6 +2229,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-knex": {
+             "version": "0.58.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.58.0.tgz",
++            "integrity": "sha512-Hc/o8fSsaWxZ8r1Yw4rNDLwTpUopTf4X32y4W6UhlHmW8Wizz8wfhgOKIelSeqFVTKBBPIDUOsQWuIMxBmu8Bw==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0",
+@@ -1752,6 +2245,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-koa": {
+             "version": "0.62.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.62.0.tgz",
++            "integrity": "sha512-uVip0VuGUQXZ+vFxkKxAUNq8qNl+VFlyHDh/U6IQ8COOEDfbEchdaHnpFrMYF3psZRUuoSIgb7xOeXj00RdwDA==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "^2.0.0",
+@@ -1767,6 +2262,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-lru-memoizer": {
+             "version": "0.58.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.58.0.tgz",
++            "integrity": "sha512-6grM3TdMyHzlGY1cUA+mwoPueB1F3dYKgKtZIH6jOFXqfHAByyLTc+6PFjGM9tKh52CFBJaDwodNlL/Td39z7Q==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0"
+@@ -1780,6 +2277,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-mongodb": {
+             "version": "0.67.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.67.0.tgz",
++            "integrity": "sha512-1WJp5N1lYfHq2IhECOTewFs5Tf2NfUOwQRqs/rZdXKTezArMlucxgzAaqcgp3A3YREXopXTpXHsxZTGHjNhMdQ==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0",
+@@ -1794,6 +2293,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-mongoose": {
+             "version": "0.60.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.60.0.tgz",
++            "integrity": "sha512-8BahAZpKsOoc+lrZGb7Ofn4g3z8qtp5IxDfvAVpKXsEheQN7ONMH5djT5ihy6yf8yyeQJGS0gXFfpEAEeEHqQg==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "^2.0.0",
+@@ -1809,6 +2310,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-mysql": {
+             "version": "0.60.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.60.0.tgz",
++            "integrity": "sha512-08pO8GFPEIz2zquKDGteBZDNmwketdgH8hTe9rVYgW9kCJXq1Psj3wPQGx+VaX4ZJKCfPeoLMYup9+cxHvZyVQ==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0",
+@@ -1824,6 +2327,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-mysql2": {
+             "version": "0.60.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.60.0.tgz",
++            "integrity": "sha512-m/5d3bxQALllCzezYDk/6vajh0tj5OijMMvOZGr+qN1NMXm1dzMNwyJ0gNZW7Fo3YFRyj/jJMxIw+W7d525dlw==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0",
+@@ -1839,6 +2344,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-pg": {
+             "version": "0.66.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.66.0.tgz",
++            "integrity": "sha512-KxfLGXBb7k2ueaPJfq2GXBDXBly8P+SpR/4Mj410hhNgmQF3sCqwXvUBQxZQkDAmsdBAoenM+yV1LhtsMRamcA==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "^2.0.0",
+@@ -1857,6 +2364,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-redis": {
+             "version": "0.62.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis/-/instrumentation-redis-0.62.0.tgz",
++            "integrity": "sha512-y3pPpot7WzR/8JtHcYlTYsyY8g+pbFhAqbwAuG5bLPnR6v6pt1rQc0DpH0OlGP/9CZbWBP+Zhwp9yFoygf/ZXQ==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0",
+@@ -1872,6 +2381,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-tedious": {
+             "version": "0.33.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.33.0.tgz",
++            "integrity": "sha512-Q6WQwAD01MMTub31GlejoiFACYNw26J426wyjvU7by7fDIr2nZXNW4vhTGs7i7F0TnXBO3xN688g1tdUgYwJ5w==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.214.0",
+@@ -1887,6 +2398,8 @@
+         },
+         "node_modules/@opentelemetry/instrumentation-undici": {
+             "version": "0.24.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.24.0.tgz",
++            "integrity": "sha512-oKzZ3uvqP17sV0EsoQcJgjEfIp0kiZRbYu/eD8p13Cbahumf8lb/xpYeNr/hfAJ4owzEtIDcGIjprfLcYbIKBQ==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "^2.0.0",
+@@ -1901,17 +2414,21 @@
+             }
+         },
+         "node_modules/@opentelemetry/redis-common": {
+-            "version": "0.38.2",
++            "version": "0.38.3",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/redis-common/-/redis-common-0.38.3.tgz",
++            "integrity": "sha512-VCghU1JYs/4gP6Gqf/xro9MEsZ7LrMv2uONVsaESKL38ZOB9BqnI98FfS23wjMnHlpuE+TTaWSoAVNpTwYXzjw==",
+             "license": "Apache-2.0",
+             "engines": {
+                 "node": "^18.19.0 || >=20.6.0"
+             }
+         },
+         "node_modules/@opentelemetry/resources": {
+-            "version": "2.6.1",
++            "version": "2.7.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.7.0.tgz",
++            "integrity": "sha512-K+oi0hNMv94EpZbnW3eyu2X6SGVpD3O5DhG2NIp65Hc7lhAj9brRXTAVzh3wB82+q3ThakEf7Zd7RsFUqcTc7A==",
+             "license": "Apache-2.0",
+             "dependencies": {
+-                "@opentelemetry/core": "2.6.1",
++                "@opentelemetry/core": "2.7.0",
+                 "@opentelemetry/semantic-conventions": "^1.29.0"
+             },
+             "engines": {
+@@ -1922,11 +2439,13 @@
+             }
+         },
+         "node_modules/@opentelemetry/sdk-trace-base": {
+-            "version": "2.6.1",
++            "version": "2.7.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.7.0.tgz",
++            "integrity": "sha512-Yg9zEXJB50DLVLpsKPk7NmNqlPlS+OvqhJGh0A8oawIOTPOwlm4eXs9BMJV7L79lvEwI+dWtAj+YjTyddV336A==",
+             "license": "Apache-2.0",
+             "dependencies": {
+-                "@opentelemetry/core": "2.6.1",
+-                "@opentelemetry/resources": "2.6.1",
++                "@opentelemetry/core": "2.7.0",
++                "@opentelemetry/resources": "2.7.0",
+                 "@opentelemetry/semantic-conventions": "^1.29.0"
+             },
+             "engines": {
+@@ -1938,6 +2457,8 @@
+         },
+         "node_modules/@opentelemetry/semantic-conventions": {
+             "version": "1.40.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.40.0.tgz",
++            "integrity": "sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw==",
+             "license": "Apache-2.0",
+             "engines": {
+                 "node": ">=14"
+@@ -1945,6 +2466,8 @@
+         },
+         "node_modules/@opentelemetry/sql-common": {
+             "version": "0.41.2",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/sql-common/-/sql-common-0.41.2.tgz",
++            "integrity": "sha512-4mhWm3Z8z+i508zQJ7r6Xi7y4mmoJpdvH0fZPFRkWrdp5fq7hhZ2HhYokEOLkfqSMgPR4Z9EyB3DBkbKGOqZiQ==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/core": "^2.0.0"
+@@ -1956,17 +2479,10 @@
+                 "@opentelemetry/api": "^1.1.0"
+             }
+         },
+-        "node_modules/@pkgjs/parseargs": {
+-            "version": "0.11.0",
+-            "dev": true,
+-            "license": "MIT",
+-            "optional": true,
+-            "engines": {
+-                "node": ">=14"
+-            }
+-        },
+         "node_modules/@pkgr/core": {
+             "version": "0.2.9",
++            "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
++            "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -1978,6 +2494,8 @@
+         },
+         "node_modules/@playwright/test": {
+             "version": "1.59.1",
++            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.59.1.tgz",
++            "integrity": "sha512-PG6q63nQg5c9rIi4/Z5lR5IVF7yU5MqmKaPOe0HSc0O2cX1fPi96sUQu5j7eo4gKCkB2AnNGoWt7y4/Xx3Kcqg==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "dependencies": {
+@@ -1992,6 +2510,8 @@
+         },
+         "node_modules/@prisma/instrumentation": {
+             "version": "7.6.0",
++            "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-7.6.0.tgz",
++            "integrity": "sha512-ZPW2gRiwpPzEfgeZgaekhqXrbW+Y2RJKHVqUmlhZhKzRNCcvR6DykzylDrynpArKKRQtLxoZy36fK7U0p3pdgQ==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/instrumentation": "^0.207.0"
+@@ -2002,6 +2522,8 @@
+         },
+         "node_modules/@prisma/instrumentation/node_modules/@opentelemetry/api-logs": {
+             "version": "0.207.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.207.0.tgz",
++            "integrity": "sha512-lAb0jQRVyleQQGiuuvCOTDVspc14nx6XJjP4FspJ1sNARo3Regq4ZZbrc3rN4b1TYSuUCvgH+UXUPug4SLOqEQ==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/api": "^1.3.0"
+@@ -2012,6 +2534,8 @@
+         },
+         "node_modules/@prisma/instrumentation/node_modules/@opentelemetry/instrumentation": {
+             "version": "0.207.0",
++            "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.207.0.tgz",
++            "integrity": "sha512-y6eeli9+TLKnznrR8AZlQMSJT7wILpXH+6EYq5Vf/4Ao+huI7EedxQHwRgVUOMLFbe7VFDvHJrX9/f4lcwnJsA==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "@opentelemetry/api-logs": "0.207.0",
+@@ -2027,6 +2551,8 @@
+         },
+         "node_modules/@prisma/instrumentation/node_modules/import-in-the-middle": {
+             "version": "2.0.6",
++            "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-2.0.6.tgz",
++            "integrity": "sha512-3vZV3jX0XRFW3EJDTwzWoZa+RH1b8eTTx6YOCjglrLyPuepwoBti1k3L2dKwdCUrnVEfc5CuRuGstaC/uQJJaw==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "acorn": "^8.15.0",
+@@ -2037,10 +2563,40 @@
+         },
+         "node_modules/@rolldown/pluginutils": {
+             "version": "1.0.0-rc.13",
++            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.13.tgz",
++            "integrity": "sha512-3ngTAv6F/Py35BsYbeeLeecvhMKdsKm4AoOETVhAA+Qc8nrA2I0kF7oa93mE9qnIurngOSpMnQ0x2nQY2FPviA==",
+             "license": "MIT"
+         },
++        "node_modules/@rollup/rollup-android-arm-eabi": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.2.tgz",
++            "integrity": "sha512-dnlp69efPPg6Uaw2dVqzWRfAWRnYVb1XJ8CyyhIbZeaq4CA5/mLeZ1IEt9QqQxmbdvagjLIm2ZL8BxXv5lH4Yw==",
++            "cpu": [
++                "arm"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "android"
++            ]
++        },
++        "node_modules/@rollup/rollup-android-arm64": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.2.tgz",
++            "integrity": "sha512-OqZTwDRDchGRHHm/hwLOL7uVPB9aUvI0am/eQuWMNyFHf5PSEQmyEeYYheA0EPPKUO/l0uigCp+iaTjoLjVoHg==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "android"
++            ]
++        },
+         "node_modules/@rollup/rollup-darwin-arm64": {
+-            "version": "4.60.1",
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.2.tgz",
++            "integrity": "sha512-UwRE7CGpvSVEQS8gUMBe1uADWjNnVgP3Iusyda1nSRwNDCsRjnGc7w6El6WLQsXmZTbLZx9cecegumcitNfpmA==",
+             "cpu": [
+                 "arm64"
+             ],
+@@ -2051,9 +2607,9 @@
+             ]
+         },
+         "node_modules/@rollup/rollup-darwin-x64": {
+-            "version": "4.60.1",
+-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.1.tgz",
+-            "integrity": "sha512-haZ7hJ1JT4e9hqkoT9R/19XW2QKqjfJVv+i5AGg57S+nLk9lQnJ1F/eZloRO3o9Scy9CM3wQ9l+dkXtcBgN5Ew==",
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.2.tgz",
++            "integrity": "sha512-gjEtURKLCC5VXm1I+2i1u9OhxFsKAQJKTVB8WvDAHF+oZlq0GTVFOlTlO1q3AlCTE/DF32c16ESvfgqR7343/g==",
+             "cpu": [
+                 "x64"
+             ],
+@@ -2063,10 +2619,75 @@
+                 "darwin"
+             ]
+         },
++        "node_modules/@rollup/rollup-freebsd-arm64": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.2.tgz",
++            "integrity": "sha512-Bcl6CYDeAgE70cqZaMojOi/eK63h5Me97ZqAQoh77VPjMysA/4ORQBRGo3rRy45x4MzVlU9uZxs8Uwy7ZaKnBw==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "freebsd"
++            ]
++        },
++        "node_modules/@rollup/rollup-freebsd-x64": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.2.tgz",
++            "integrity": "sha512-LU+TPda3mAE2QB0/Hp5VyeKJivpC6+tlOXd1VMoXV/YFMvk/MNk5iXeBfB4MQGRWyOYVJ01625vjkr0Az98OJQ==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "freebsd"
++            ]
++        },
++        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.2.tgz",
++            "integrity": "sha512-2QxQrM+KQ7DAW4o22j+XZ6RKdxjLD7BOWTP0Bv0tmjdyhXSsr2Ul1oJDQqh9Zf5qOwTuTc7Ek83mOFaKnodPjg==",
++            "cpu": [
++                "arm"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
++        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.2.tgz",
++            "integrity": "sha512-TbziEu2DVsTEOPif2mKWkMeDMLoYjx95oESa9fkQQK7r/Orta0gnkcDpzwufEcAO2BLBsD7mZkXGFqEdMRRwfw==",
++            "cpu": [
++                "arm"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
+         "node_modules/@rollup/rollup-linux-arm64-gnu": {
+-            "version": "4.60.1",
+-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.1.tgz",
+-            "integrity": "sha512-Nql7sTeAzhTAja3QXeAI48+/+GjBJ+QmAH13snn0AJSNL50JsDqotyudHyMbO2RbJkskbMbFJfIJKWA6R1LCJQ==",
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.2.tgz",
++            "integrity": "sha512-bO/rVDiDUuM2YfuCUwZ1t1cP+/yqjqz+Xf2VtkdppefuOFS2OSeAfgafaHNkFn0t02hEyXngZkxtGqXcXwO8Rg==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
++        "node_modules/@rollup/rollup-linux-arm64-musl": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.2.tgz",
++            "integrity": "sha512-hr26p7e93Rl0Za+JwW7EAnwAvKkehh12BU1Llm9Ykiibg4uIr2rbpxG9WCf56GuvidlTG9KiiQT/TXT1yAWxTA==",
+             "cpu": [
+                 "arm64"
+             ],
+@@ -2076,10 +2697,114 @@
+                 "linux"
+             ]
+         },
++        "node_modules/@rollup/rollup-linux-loong64-gnu": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.2.tgz",
++            "integrity": "sha512-pOjB/uSIyDt+ow3k/RcLvUAOGpysT2phDn7TTUB3n75SlIgZzM6NKAqlErPhoFU+npgY3/n+2HYIQVbF70P9/A==",
++            "cpu": [
++                "loong64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
++        "node_modules/@rollup/rollup-linux-loong64-musl": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.2.tgz",
++            "integrity": "sha512-2/w+q8jszv9Ww1c+6uJT3OwqhdmGP2/4T17cu8WuwyUuuaCDDJ2ojdyYwZzCxx0GcsZBhzi3HmH+J5pZNXnd+Q==",
++            "cpu": [
++                "loong64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
++        "node_modules/@rollup/rollup-linux-ppc64-gnu": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.2.tgz",
++            "integrity": "sha512-11+aL5vKheYgczxtPVVRhdptAM2H7fcDR5Gw4/bTcteuZBlH4oP9f5s9zYO9aGZvoGeBpqXI/9TZZihZ609wKw==",
++            "cpu": [
++                "ppc64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
++        "node_modules/@rollup/rollup-linux-ppc64-musl": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.2.tgz",
++            "integrity": "sha512-i16fokAGK46IVZuV8LIIwMdtqhin9hfYkCh8pf8iC3QU3LpwL+1FSFGej+O7l3E/AoknL6Dclh2oTdnRMpTzFQ==",
++            "cpu": [
++                "ppc64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
++        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.2.tgz",
++            "integrity": "sha512-49FkKS6RGQoriDSK/6E2GkAsAuU5kETFCh7pG4yD/ylj9rKhTmO3elsnmBvRD4PgJPds5W2PkhC82aVwmUcJ7A==",
++            "cpu": [
++                "riscv64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
++        "node_modules/@rollup/rollup-linux-riscv64-musl": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.2.tgz",
++            "integrity": "sha512-mjYNkHPfGpUR00DuM1ZZIgs64Hpf4bWcz9Z41+4Q+pgDx73UwWdAYyf6EG/lRFldmdHHzgrYyge5akFUW0D3mQ==",
++            "cpu": [
++                "riscv64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
++        "node_modules/@rollup/rollup-linux-s390x-gnu": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.2.tgz",
++            "integrity": "sha512-ALyvJz965BQk8E9Al/JDKKDLH2kfKFLTGMlgkAbbYtZuJt9LU8DW3ZoDMCtQpXAltZxwBHevXz5u+gf0yA0YoA==",
++            "cpu": [
++                "s390x"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
+         "node_modules/@rollup/rollup-linux-x64-gnu": {
+-            "version": "4.60.1",
+-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.1.tgz",
+-            "integrity": "sha512-77PpsFQUCOiZR9+LQEFg9GClyfkNXj1MP6wRnzYs0EeWbPcHs02AXu4xuUbM1zhwn3wqaizle3AEYg5aeoohhg==",
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.2.tgz",
++            "integrity": "sha512-UQjrkIdWrKI626Du8lCQ6MJp/6V1LAo2bOK9OTu4mSn8GGXIkPXk/Vsp4bLHCd9Z9Iz2OTEaokUE90VweJgIYQ==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ]
++        },
++        "node_modules/@rollup/rollup-linux-x64-musl": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.2.tgz",
++            "integrity": "sha512-bTsRGj6VlSdn/XD4CGyzMnzaBs9bsRxy79eTqTCBsA8TMIEky7qg48aPkvJvFe1HyzQ5oMZdg7AnVlWQSKLTnw==",
+             "cpu": [
+                 "x64"
+             ],
+@@ -2089,10 +2814,36 @@
+                 "linux"
+             ]
+         },
++        "node_modules/@rollup/rollup-openbsd-x64": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.2.tgz",
++            "integrity": "sha512-6d4Z3534xitaA1FcMWP7mQPq5zGwBmGbhphh2DwaA1aNIXUu3KTOfwrWpbwI4/Gr0uANo7NTtaykFyO2hPuFLg==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "openbsd"
++            ]
++        },
++        "node_modules/@rollup/rollup-openharmony-arm64": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.2.tgz",
++            "integrity": "sha512-NetAg5iO2uN7eB8zE5qrZ3CSil+7IJt4WDFLcC75Ymywq1VZVD6qJ6EvNLjZ3rEm6gB7XW5JdT60c6MN35Z85Q==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "openharmony"
++            ]
++        },
+         "node_modules/@rollup/rollup-win32-arm64-msvc": {
+-            "version": "4.60.1",
+-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.1.tgz",
+-            "integrity": "sha512-i1okWYkA4FJICtr7KpYzFpRTHgy5jdDbZiWfvny21iIKky5YExiDXP+zbXzm3dUcFpkEeYNHgQ5fuG236JPq0g==",
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.2.tgz",
++            "integrity": "sha512-NCYhOotpgWZ5kdxCZsv6Iudx0wX8980Q/oW4pNFNihpBKsDbEA1zpkfxJGC0yugsUuyDZ7gL37dbzwhR0VI7pQ==",
+             "cpu": [
+                 "arm64"
+             ],
+@@ -2102,10 +2853,36 @@
+                 "win32"
+             ]
+         },
++        "node_modules/@rollup/rollup-win32-ia32-msvc": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.2.tgz",
++            "integrity": "sha512-RXsaOqXxfoUBQoOgvmmijVxJnW2IGB0eoMO7F8FAjaj0UTywUO/luSqimWBJn04WNgUkeNhh7fs7pESXajWmkg==",
++            "cpu": [
++                "ia32"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "win32"
++            ]
++        },
++        "node_modules/@rollup/rollup-win32-x64-gnu": {
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.2.tgz",
++            "integrity": "sha512-qdAzEULD+/hzObedtmV6iBpdL5TIbKVztGiK7O3/KYSf+HIzU257+MX1EXJcyIiDbMAqmbwaufcYPvyRryeZtA==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "win32"
++            ]
++        },
+         "node_modules/@rollup/rollup-win32-x64-msvc": {
+-            "version": "4.60.1",
+-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.1.tgz",
+-            "integrity": "sha512-lWMnixq/QzxyhTV6NjQJ4SFo1J6PvOX8vUx5Wb4bBPsEb+8xZ89Bz6kOXpfXj9ak9AHTQVQzlgzBEc1SyM27xQ==",
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.2.tgz",
++            "integrity": "sha512-Nd/SgG27WoA9e+/TdK74KnHz852TLa94ovOYySo/yMPuTmpckK/jIF2jSwS3g7ELSKXK13/cVdmg1Z/DaCWKxA==",
+             "cpu": [
+                 "x64"
+             ],
+@@ -2117,11 +2894,15 @@
+         },
+         "node_modules/@rushstack/eslint-patch": {
+             "version": "1.16.1",
++            "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.16.1.tgz",
++            "integrity": "sha512-TvZbIpeKqGQQ7X0zSCvPH9riMSFQFSggnfBjFZ1mEoILW+UuXCKwOoPcgjMwiUtRqFZ8jWhPJc4um14vC6I4ag==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/@sentry-internal/browser-utils": {
+             "version": "10.47.0",
++            "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.47.0.tgz",
++            "integrity": "sha512-bVFRAeJWMBcBCvJKIFCMJ1/yQToL4vPGqfmlnDZeypcxkqUDKQ/Y3ziLHXoDL2sx0lagcgU2vH1QhCQ67Aujjw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@sentry/core": "10.47.0"
+@@ -2132,6 +2913,8 @@
+         },
+         "node_modules/@sentry-internal/feedback": {
+             "version": "10.47.0",
++            "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.47.0.tgz",
++            "integrity": "sha512-pdvMmi4dQpX5S/vAAzrhHPIw3T3HjUgDNgUiCBrlp7N9/6zGO2gNPhUnNekP+CjgI/z0rvf49RLqlDenpNrMOg==",
+             "license": "MIT",
+             "dependencies": {
+                 "@sentry/core": "10.47.0"
+@@ -2142,6 +2925,8 @@
+         },
+         "node_modules/@sentry-internal/replay": {
+             "version": "10.47.0",
++            "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.47.0.tgz",
++            "integrity": "sha512-ScdovxP7hJxgMt70+7hFvwT02GIaIUAxdEM/YPsayZBeCoAukPW8WiwztJfoKtsfPyKJ5A6f0H3PIxTPcA9Row==",
+             "license": "MIT",
+             "dependencies": {
+                 "@sentry-internal/browser-utils": "10.47.0",
+@@ -2153,6 +2938,8 @@
+         },
+         "node_modules/@sentry-internal/replay-canvas": {
+             "version": "10.47.0",
++            "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.47.0.tgz",
++            "integrity": "sha512-A5OY8friSe6g8WAK4L8IeOPiEd9D3Ps40DzRH5j2f6SUja0t90mKMvHRcRf8zq0d4BkdB+JM7tjOkwxpuv8heA==",
+             "license": "MIT",
+             "dependencies": {
+                 "@sentry-internal/replay": "10.47.0",
+@@ -2164,6 +2951,8 @@
+         },
+         "node_modules/@sentry/babel-plugin-component-annotate": {
+             "version": "5.2.0",
++            "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-5.2.0.tgz",
++            "integrity": "sha512-8LbOI5Kzb5F0+7LVQPi2+zGz1iPiRRFhM+7uZ/ZQ33L9BmDOYNIy3xWxCfMw2JCuMXXaxF47XCjGmR22/B0WPg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 18"
+@@ -2171,6 +2960,8 @@
+         },
+         "node_modules/@sentry/browser": {
+             "version": "10.47.0",
++            "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.47.0.tgz",
++            "integrity": "sha512-rC0agZdxKA5XWfL4VwPOr/rJMogXDqZgnVzr93YWpFn9DMZT/7LzxSJVPIJwRUjx3bFEby3PcTa3YaX7pxm1AA==",
+             "license": "MIT",
+             "dependencies": {
+                 "@sentry-internal/browser-utils": "10.47.0",
+@@ -2185,6 +2976,8 @@
+         },
+         "node_modules/@sentry/bundler-plugin-core": {
+             "version": "5.2.0",
++            "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-5.2.0.tgz",
++            "integrity": "sha512-+C0x4gEIJRgoMwyRFGx+TFiJ1Po2BZlT1v61+PnouiaprKL5qtZG8n5PXx/5LPLDsVjSIcXjnDrTz9aSm8SJ3w==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/core": "^7.18.5",
+@@ -2201,6 +2994,8 @@
+         },
+         "node_modules/@sentry/cli": {
+             "version": "2.58.5",
++            "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.58.5.tgz",
++            "integrity": "sha512-tavJ7yGUZV+z3Ct2/ZB6mg339i08sAk6HDkgqmSRuQEu2iLS5sl9HIvuXfM6xjv8fwlgFOSy++WNABNAcGHUbg==",
+             "hasInstallScript": true,
+             "license": "FSL-1.1-MIT",
+             "dependencies": {
+@@ -2229,6 +3024,8 @@
+         },
+         "node_modules/@sentry/cli-darwin": {
+             "version": "2.58.5",
++            "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.58.5.tgz",
++            "integrity": "sha512-lYrNzenZFJftfwSya7gwrHGxtE+Kob/e1sr9lmHMFOd4utDlmq0XFDllmdZAMf21fxcPRI1GL28ejZ3bId01fQ==",
+             "license": "FSL-1.1-MIT",
+             "optional": true,
+             "os": [
+@@ -2238,33 +3035,161 @@
+                 "node": ">=10"
+             }
+         },
+-        "node_modules/@sentry/core": {
+-            "version": "10.47.0",
+-            "license": "MIT",
++        "node_modules/@sentry/cli-linux-arm": {
++            "version": "2.58.5",
++            "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.58.5.tgz",
++            "integrity": "sha512-KtHweSIomYL4WVDrBrYSYJricKAAzxUgX86kc6OnlikbyOhoK6Fy8Vs6vwd52P6dvWPjgrMpUYjW2M5pYXQDUw==",
++            "cpu": [
++                "arm"
++            ],
++            "license": "FSL-1.1-MIT",
++            "optional": true,
++            "os": [
++                "linux",
++                "freebsd",
++                "android"
++            ],
+             "engines": {
+-                "node": ">=18"
++                "node": ">=10"
+             }
+         },
+-        "node_modules/@sentry/electron": {
+-            "version": "7.11.0",
+-            "license": "MIT",
+-            "dependencies": {
+-                "@sentry/browser": "10.47.0",
+-                "@sentry/core": "10.47.0",
+-                "@sentry/node": "10.47.0"
+-            },
+-            "peerDependencies": {
+-                "@sentry/node-native": "10.47.0"
+-            },
+-            "peerDependenciesMeta": {
+-                "@sentry/node-native": {
+-                    "optional": true
+-                }
++        "node_modules/@sentry/cli-linux-arm64": {
++            "version": "2.58.5",
++            "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.58.5.tgz",
++            "integrity": "sha512-/4gywFeBqRB6tR/iGMRAJ3HRqY6Z7Yp4l8ZCbl0TDLAfHNxu7schEw4tSnm2/Hh9eNMiOVy4z58uzAWlZXAYBQ==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "FSL-1.1-MIT",
++            "optional": true,
++            "os": [
++                "linux",
++                "freebsd",
++                "android"
++            ],
++            "engines": {
++                "node": ">=10"
+             }
+         },
+-        "node_modules/@sentry/node": {
+-            "version": "10.47.0",
+-            "license": "MIT",
++        "node_modules/@sentry/cli-linux-i686": {
++            "version": "2.58.5",
++            "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.58.5.tgz",
++            "integrity": "sha512-G7261dkmyxqlMdyvyP06b+RTIVzp1gZNgglj5UksxSouSUqRd/46W/2pQeOMPhloDYo9yLtCN2YFb3Mw4aUsWw==",
++            "cpu": [
++                "x86",
++                "ia32"
++            ],
++            "license": "FSL-1.1-MIT",
++            "optional": true,
++            "os": [
++                "linux",
++                "freebsd",
++                "android"
++            ],
++            "engines": {
++                "node": ">=10"
++            }
++        },
++        "node_modules/@sentry/cli-linux-x64": {
++            "version": "2.58.5",
++            "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.58.5.tgz",
++            "integrity": "sha512-rP04494RSmt86xChkQ+ecBNRYSPbyXc4u0IA7R7N1pSLCyO74e5w5Al+LnAq35cMfVbZgz5Sm0iGLjyiUu4I1g==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "FSL-1.1-MIT",
++            "optional": true,
++            "os": [
++                "linux",
++                "freebsd",
++                "android"
++            ],
++            "engines": {
++                "node": ">=10"
++            }
++        },
++        "node_modules/@sentry/cli-win32-arm64": {
++            "version": "2.58.5",
++            "resolved": "https://registry.npmjs.org/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.58.5.tgz",
++            "integrity": "sha512-AOJ2nCXlQL1KBaCzv38m3i2VmSHNurUpm7xVKd6yAHX+ZoVBI8VT0EgvwmtJR2TY2N2hNCC7UrgRmdUsQ152bA==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "FSL-1.1-MIT",
++            "optional": true,
++            "os": [
++                "win32"
++            ],
++            "engines": {
++                "node": ">=10"
++            }
++        },
++        "node_modules/@sentry/cli-win32-i686": {
++            "version": "2.58.5",
++            "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.58.5.tgz",
++            "integrity": "sha512-EsuboLSOnlrN7MMPJ1eFvfMDm+BnzOaSWl8eYhNo8W/BIrmNgpRUdBwnWn9Q2UOjJj5ZopukmsiMYtU/D7ml9g==",
++            "cpu": [
++                "x86",
++                "ia32"
++            ],
++            "license": "FSL-1.1-MIT",
++            "optional": true,
++            "os": [
++                "win32"
++            ],
++            "engines": {
++                "node": ">=10"
++            }
++        },
++        "node_modules/@sentry/cli-win32-x64": {
++            "version": "2.58.5",
++            "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.58.5.tgz",
++            "integrity": "sha512-IZf+XIMiQwj+5NzqbOQfywlOitmCV424Vtf9c+ep61AaVScUFD1TSrQbOcJJv5xGxhlxNOMNgMeZhdexdzrKZg==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "FSL-1.1-MIT",
++            "optional": true,
++            "os": [
++                "win32"
++            ],
++            "engines": {
++                "node": ">=10"
++            }
++        },
++        "node_modules/@sentry/core": {
++            "version": "10.47.0",
++            "resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.47.0.tgz",
++            "integrity": "sha512-nsYRAx3EWezDut+Zl+UwwP07thh9uY7CfSAi2whTdcJl5hu1nSp2z8bba7Vq/MGbNLnazkd3A+GITBEML924JA==",
++            "license": "MIT",
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/@sentry/electron": {
++            "version": "7.11.0",
++            "resolved": "https://registry.npmjs.org/@sentry/electron/-/electron-7.11.0.tgz",
++            "integrity": "sha512-AKz66R/o/tULOg23zJyQZU2RK2uyV7PRYEWxDeyGDIfJeg+tXN1Zwjf/WuPcpoVE3xsXcCGBReboqMLgff587Q==",
++            "license": "MIT",
++            "dependencies": {
++                "@sentry/browser": "10.47.0",
++                "@sentry/core": "10.47.0",
++                "@sentry/node": "10.47.0"
++            },
++            "peerDependencies": {
++                "@sentry/node-native": "10.47.0"
++            },
++            "peerDependenciesMeta": {
++                "@sentry/node-native": {
++                    "optional": true
++                }
++            }
++        },
++        "node_modules/@sentry/node": {
++            "version": "10.47.0",
++            "resolved": "https://registry.npmjs.org/@sentry/node/-/node-10.47.0.tgz",
++            "integrity": "sha512-R+btqPepv88o635G6HtVewLjqCLUedBg5HBs7Nq1qbbKvyti01uArUF2f+3DsLenk5B9LUNiRlE+frZA44Ahmw==",
++            "license": "MIT",
+             "dependencies": {
+                 "@fastify/otel": "0.18.0",
+                 "@opentelemetry/api": "^1.9.1",
+@@ -2308,6 +3233,8 @@
+         },
+         "node_modules/@sentry/node-core": {
+             "version": "10.47.0",
++            "resolved": "https://registry.npmjs.org/@sentry/node-core/-/node-core-10.47.0.tgz",
++            "integrity": "sha512-qv6LsqHbkQmd0aQEUox/svRSz26J+l4gGjFOUNEay2armZu9XLD+Ct89jpFgZD5oIPNAj2jraodTRqydXiwS5w==",
+             "license": "MIT",
+             "dependencies": {
+                 "@sentry/core": "10.47.0",
+@@ -2356,6 +3283,8 @@
+         },
+         "node_modules/@sentry/opentelemetry": {
+             "version": "10.47.0",
++            "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-10.47.0.tgz",
++            "integrity": "sha512-f6Hw2lrpCjlOksiosP0Z2jK/+l+21SIdoNglVeG/sttMyx8C8ywONKh0Ha50sFsvB1VaB8n94RKzzf3hkh9V3g==",
+             "license": "MIT",
+             "dependencies": {
+                 "@sentry/core": "10.47.0"
+@@ -2373,6 +3302,8 @@
+         },
+         "node_modules/@sentry/rollup-plugin": {
+             "version": "5.2.0",
++            "resolved": "https://registry.npmjs.org/@sentry/rollup-plugin/-/rollup-plugin-5.2.0.tgz",
++            "integrity": "sha512-a8LfpvcYMFtFSroro5MpCcOoS528LeLfUHzxWURnpofOnY+Aso9Si4y4dFlna+RKqxCXjmFbn6CLnfI+YrHysQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@sentry/bundler-plugin-core": "5.2.0",
+@@ -2392,6 +3323,8 @@
+         },
+         "node_modules/@sentry/vite-plugin": {
+             "version": "5.2.0",
++            "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-5.2.0.tgz",
++            "integrity": "sha512-4Jo3ixBspso5HY81PDvZdRXkH9wYGVmcw/0a2IX9ejbyKBdHqkYg4IhAtNqGUAyGuHwwRS9Y1S+sCMvrXv6htw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@sentry/bundler-plugin-core": "5.2.0",
+@@ -2403,6 +3336,8 @@
+         },
+         "node_modules/@sindresorhus/is": {
+             "version": "4.6.0",
++            "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
++            "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=10"
+@@ -2413,6 +3348,8 @@
+         },
+         "node_modules/@solidtime/api": {
+             "version": "0.0.6",
++            "resolved": "https://registry.npmjs.org/@solidtime/api/-/api-0.0.6.tgz",
++            "integrity": "sha512-032Dsb9P0SSf1kF5r1VIs1sWVoO8u5EIvt5HDcT8WT3fT/pmwWDVT507UM6sMc6IFN5NOoqCfLdyVQFugD2KXg==",
+             "license": "AGPL-3.0",
+             "dependencies": {
+                 "@zodios/core": "^10.9.6",
+@@ -2452,6 +3389,8 @@
+         },
+         "node_modules/@swc/helpers": {
+             "version": "0.5.21",
++            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.21.tgz",
++            "integrity": "sha512-jI/VAmtdjB/RnI8GTnokyX7Ug8c+g+ffD6QRLa6XQewtnGyukKkKSk3wLTM3b5cjt1jNh9x0jfVlagdN2gDKQg==",
+             "license": "Apache-2.0",
+             "peer": true,
+             "dependencies": {
+@@ -2460,6 +3399,8 @@
+         },
+         "node_modules/@szmarczak/http-timer": {
+             "version": "4.0.6",
++            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
++            "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+             "license": "MIT",
+             "dependencies": {
+                 "defer-to-connect": "^2.0.0"
+@@ -2470,6 +3411,8 @@
+         },
+         "node_modules/@tailwindcss/container-queries": {
+             "version": "0.1.1",
++            "resolved": "https://registry.npmjs.org/@tailwindcss/container-queries/-/container-queries-0.1.1.tgz",
++            "integrity": "sha512-p18dswChx6WnTSaJCSGx6lTmrGzNNvm2FtXmiO6AuA1V4U5REyoqwmT6kgAsIMdjo07QdAfYXHJ4hnMtfHzWgA==",
+             "dev": true,
+             "license": "MIT",
+             "peerDependencies": {
+@@ -2478,6 +3421,8 @@
+         },
+         "node_modules/@tailwindcss/forms": {
+             "version": "0.5.11",
++            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.11.tgz",
++            "integrity": "sha512-h9wegbZDPurxG22xZSoWtdzc41/OlNEUQERNqI/0fOwa2aVlWGu7C35E/x6LDyD3lgtztFSSjKZyuVM0hxhbgA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2489,6 +3434,8 @@
+         },
+         "node_modules/@tailwindcss/typography": {
+             "version": "0.5.19",
++            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.19.tgz",
++            "integrity": "sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2500,6 +3447,8 @@
+         },
+         "node_modules/@tanstack/match-sorter-utils": {
+             "version": "8.19.4",
++            "resolved": "https://registry.npmjs.org/@tanstack/match-sorter-utils/-/match-sorter-utils-8.19.4.tgz",
++            "integrity": "sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2514,7 +3463,9 @@
+             }
+         },
+         "node_modules/@tanstack/query-core": {
+-            "version": "5.99.0",
++            "version": "5.99.2",
++            "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.99.2.tgz",
++            "integrity": "sha512-1HunU0bXVsR1ZJMZbcOPE6VtaBJxsW809RE9xPe4Gz7MlB0GWwQvuTPhMoEmQ/hIzFKJ/DWAuttIe7BOaWx0tA==",
+             "dev": true,
+             "license": "MIT",
+             "funding": {
+@@ -2523,7 +3474,9 @@
+             }
+         },
+         "node_modules/@tanstack/query-devtools": {
+-            "version": "5.99.0",
++            "version": "5.99.2",
++            "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.99.2.tgz",
++            "integrity": "sha512-TEF1d+RYO9l8oeCwgzmOHIgKwAzXQmw2s/ny2bW8qeg2OMkkLjALfVEivgCMR3OL/jVdMmeTPX56WrV+uvYJFg==",
+             "dev": true,
+             "license": "MIT",
+             "funding": {
+@@ -2532,11 +3485,13 @@
+             }
+         },
+         "node_modules/@tanstack/query-persist-client-core": {
+-            "version": "5.99.0",
++            "version": "5.99.2",
++            "resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-5.99.2.tgz",
++            "integrity": "sha512-YYuLGBDGCsUbfN2LuYrfkRCpg1vOUZnK2bn4j7zAZv+m1B4CnLAv58Z3A43d5Cruxvld5udYFeYXw9F6g/pZcQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+-                "@tanstack/query-core": "5.99.0"
++                "@tanstack/query-core": "5.99.2"
+             },
+             "funding": {
+                 "type": "github",
+@@ -2544,7 +3499,9 @@
+             }
+         },
+         "node_modules/@tanstack/virtual-core": {
+-            "version": "3.13.23",
++            "version": "3.14.0",
++            "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.14.0.tgz",
++            "integrity": "sha512-JLANqGy/D6k4Ujmh8Tr25lGimuOXNiaVyXaCAZS0W+1390sADdGnyUdSWNIfd49gebtIxGMij4IktRVzrdr12Q==",
+             "license": "MIT",
+             "peer": true,
+             "funding": {
+@@ -2553,12 +3510,14 @@
+             }
+         },
+         "node_modules/@tanstack/vue-query": {
+-            "version": "5.99.0",
++            "version": "5.99.2",
++            "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.99.2.tgz",
++            "integrity": "sha512-ll7dzgeM/3/ckNsp+J0ZrUuvJEZan3RlOrb1T4M47CJPM0rS0WNanSYQWPgK0A+Eu/ihwm/kEBmAZOA7toHP8g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+                 "@tanstack/match-sorter-utils": "^8.19.4",
+-                "@tanstack/query-core": "5.99.0",
++                "@tanstack/query-core": "5.99.2",
+                 "@vue/devtools-api": "^6.6.3",
+                 "vue-demi": "^0.14.10"
+             },
+@@ -2577,23 +3536,27 @@
+             }
+         },
+         "node_modules/@tanstack/vue-query-devtools": {
+-            "version": "6.1.16",
++            "version": "6.1.18",
++            "resolved": "https://registry.npmjs.org/@tanstack/vue-query-devtools/-/vue-query-devtools-6.1.18.tgz",
++            "integrity": "sha512-CgLHb4OpWJoI5UVVbNf2xSwUSEGqzr1qPuQFo80mcnhK13CR6p/m3OFlp39r4tz+edPV92+WuDYWAy3CHObPWw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+-                "@tanstack/query-devtools": "5.99.0"
++                "@tanstack/query-devtools": "5.99.2"
+             },
+             "funding": {
+                 "type": "github",
+                 "url": "https://github.com/sponsors/tannerlinsley"
+             },
+             "peerDependencies": {
+-                "@tanstack/vue-query": "^5.99.0",
++                "@tanstack/vue-query": "^5.99.2",
+                 "vue": "^3.3.0"
+             }
+         },
+         "node_modules/@tanstack/vue-query/node_modules/vue-demi": {
+             "version": "0.14.10",
++            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
++            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+             "dev": true,
+             "hasInstallScript": true,
+             "license": "MIT",
+@@ -2618,11 +3581,13 @@
+             }
+         },
+         "node_modules/@tanstack/vue-virtual": {
+-            "version": "3.13.23",
++            "version": "3.13.24",
++            "resolved": "https://registry.npmjs.org/@tanstack/vue-virtual/-/vue-virtual-3.13.24.tgz",
++            "integrity": "sha512-A0k2qF0zFSUStXSZkGXABouXr2Tw2Ztl/cVIYG9qy84uR8W7UNjAcX3DvzBS3YnDcwvLxab8v7dbmYBZ39itDA==",
+             "license": "MIT",
+             "peer": true,
+             "dependencies": {
+-                "@tanstack/virtual-core": "3.13.23"
++                "@tanstack/virtual-core": "3.14.0"
+             },
+             "funding": {
+                 "type": "github",
+@@ -2634,6 +3599,8 @@
+         },
+         "node_modules/@types/cacheable-request": {
+             "version": "6.0.3",
++            "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
++            "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@types/http-cache-semantics": "*",
+@@ -2644,6 +3611,8 @@
+         },
+         "node_modules/@types/chai": {
+             "version": "5.2.3",
++            "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
++            "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2653,6 +3622,8 @@
+         },
+         "node_modules/@types/connect": {
+             "version": "3.4.38",
++            "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
++            "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+             "license": "MIT",
+             "dependencies": {
+                 "@types/node": "*"
+@@ -2660,6 +3631,8 @@
+         },
+         "node_modules/@types/debug": {
+             "version": "4.1.13",
++            "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz",
++            "integrity": "sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2668,15 +3641,21 @@
+         },
+         "node_modules/@types/deep-eql": {
+             "version": "4.0.2",
++            "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
++            "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/@types/estree": {
+             "version": "1.0.8",
++            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
++            "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+             "license": "MIT"
+         },
+         "node_modules/@types/fs-extra": {
+             "version": "9.0.13",
++            "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
++            "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2685,10 +3664,14 @@
+         },
+         "node_modules/@types/http-cache-semantics": {
+             "version": "4.2.0",
++            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
++            "integrity": "sha512-L3LgimLHXtGkWikKnsPg0/VFx9OGZaC+eN1u4r+OB1XRqH3meBIAVC2zr1WdMH+RHmnRkqliQAOHNJ/E0j/e0Q==",
+             "license": "MIT"
+         },
+         "node_modules/@types/keyv": {
+             "version": "3.1.4",
++            "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
++            "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
+             "license": "MIT",
+             "dependencies": {
+                 "@types/node": "*"
+@@ -2696,11 +3679,15 @@
+         },
+         "node_modules/@types/ms": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
++            "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/@types/mysql": {
+             "version": "2.15.27",
++            "resolved": "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.27.tgz",
++            "integrity": "sha512-YfWiV16IY0OeBfBCk8+hXKmdTKrKlwKN1MNKAPBu5JYxLwBEZl7QzeEpGnlZb3VMGJrrGmB84gXiH+ofs/TezA==",
+             "license": "MIT",
+             "dependencies": {
+                 "@types/node": "*"
+@@ -2708,6 +3695,8 @@
+         },
+         "node_modules/@types/node": {
+             "version": "20.19.39",
++            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.39.tgz",
++            "integrity": "sha512-orrrD74MBUyK8jOAD/r0+lfa1I2MO6I+vAkmAWzMYbCcgrN4lCrmK52gRFQq/JRxfYPfonkr4b0jcY7Olqdqbw==",
+             "license": "MIT",
+             "dependencies": {
+                 "undici-types": "~6.21.0"
+@@ -2715,11 +3704,15 @@
+         },
+         "node_modules/@types/normalize-package-data": {
+             "version": "2.4.4",
++            "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
++            "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/@types/pg": {
+             "version": "8.15.6",
++            "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.15.6.tgz",
++            "integrity": "sha512-NoaMtzhxOrubeL/7UZuNTrejB4MPAJ0RpxZqXQf2qXuVlTPuG6Y8p4u9dKRaue4yjmC7ZhzVO2/Yyyn25znrPQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@types/node": "*",
+@@ -2729,6 +3722,8 @@
+         },
+         "node_modules/@types/pg-pool": {
+             "version": "2.0.7",
++            "resolved": "https://registry.npmjs.org/@types/pg-pool/-/pg-pool-2.0.7.tgz",
++            "integrity": "sha512-U4CwmGVQcbEuqpyju8/ptOKg6gEC+Tqsvj2xS9o1g71bUh8twxnC6ZL5rZKCsGN0iyH0CwgUyc9VR5owNQF9Ng==",
+             "license": "MIT",
+             "dependencies": {
+                 "@types/pg": "*"
+@@ -2736,6 +3731,8 @@
+         },
+         "node_modules/@types/plist": {
+             "version": "3.0.5",
++            "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz",
++            "integrity": "sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -2746,6 +3743,8 @@
+         },
+         "node_modules/@types/responselike": {
+             "version": "1.0.3",
++            "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
++            "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@types/node": "*"
+@@ -2753,6 +3752,8 @@
+         },
+         "node_modules/@types/tedious": {
+             "version": "4.0.14",
++            "resolved": "https://registry.npmjs.org/@types/tedious/-/tedious-4.0.14.tgz",
++            "integrity": "sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@types/node": "*"
+@@ -2760,16 +3761,22 @@
+         },
+         "node_modules/@types/verror": {
+             "version": "1.10.11",
++            "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.11.tgz",
++            "integrity": "sha512-RlDm9K7+o5stv0Co8i8ZRGxDbrTxhJtgjqjFyVh/tXQyl/rYtTKlnTvZ88oSTeYREWurwx20Js4kTuKCsFkUtg==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true
+         },
+         "node_modules/@types/web-bluetooth": {
+             "version": "0.0.21",
++            "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
++            "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
+             "license": "MIT"
+         },
+         "node_modules/@types/yauzl": {
+             "version": "2.10.3",
++            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
++            "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
+             "license": "MIT",
+             "optional": true,
+             "dependencies": {
+@@ -2778,6 +3785,8 @@
+         },
+         "node_modules/@typescript-eslint/eslint-plugin": {
+             "version": "7.18.0",
++            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
++            "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2810,6 +3819,8 @@
+         },
+         "node_modules/@typescript-eslint/parser": {
+             "version": "7.18.0",
++            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
++            "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "dependencies": {
+@@ -2837,6 +3848,8 @@
+         },
+         "node_modules/@typescript-eslint/scope-manager": {
+             "version": "7.18.0",
++            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
++            "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2853,6 +3866,8 @@
+         },
+         "node_modules/@typescript-eslint/type-utils": {
+             "version": "7.18.0",
++            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
++            "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2879,6 +3894,8 @@
+         },
+         "node_modules/@typescript-eslint/types": {
+             "version": "7.18.0",
++            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
++            "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -2891,6 +3908,8 @@
+         },
+         "node_modules/@typescript-eslint/typescript-estree": {
+             "version": "7.18.0",
++            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
++            "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "dependencies": {
+@@ -2918,11 +3937,15 @@
+         },
+         "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
++            "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2931,6 +3954,8 @@
+         },
+         "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+             "version": "9.0.9",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
++            "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -2945,6 +3970,8 @@
+         },
+         "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -2956,6 +3983,8 @@
+         },
+         "node_modules/@typescript-eslint/utils": {
+             "version": "7.18.0",
++            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
++            "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2977,6 +4006,8 @@
+         },
+         "node_modules/@typescript-eslint/visitor-keys": {
+             "version": "7.18.0",
++            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
++            "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -2993,11 +4024,15 @@
+         },
+         "node_modules/@ungap/structured-clone": {
+             "version": "1.3.0",
++            "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
++            "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+             "dev": true,
+             "license": "ISC"
+         },
+         "node_modules/@vitejs/plugin-vue": {
+             "version": "6.0.6",
++            "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.6.tgz",
++            "integrity": "sha512-u9HHgfrq3AjXlysn0eINFnWQOJQLO9WN6VprZ8FXl7A2bYisv3Hui9Ij+7QZ41F/WYWarHjwBbXtD7dKg3uxbg==",
+             "license": "MIT",
+             "dependencies": {
+                 "@rolldown/pluginutils": "1.0.0-rc.13"
+@@ -3012,6 +4047,8 @@
+         },
+         "node_modules/@vitest/expect": {
+             "version": "3.2.4",
++            "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
++            "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3027,6 +4064,8 @@
+         },
+         "node_modules/@vitest/mocker": {
+             "version": "3.2.4",
++            "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
++            "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3052,6 +4091,8 @@
+         },
+         "node_modules/@vitest/pretty-format": {
+             "version": "3.2.4",
++            "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
++            "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3063,6 +4104,8 @@
+         },
+         "node_modules/@vitest/runner": {
+             "version": "3.2.4",
++            "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
++            "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3076,6 +4119,8 @@
+         },
+         "node_modules/@vitest/snapshot": {
+             "version": "3.2.4",
++            "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
++            "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3089,6 +4134,8 @@
+         },
+         "node_modules/@vitest/spy": {
+             "version": "3.2.4",
++            "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
++            "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3100,6 +4147,8 @@
+         },
+         "node_modules/@vitest/utils": {
+             "version": "3.2.4",
++            "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
++            "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3113,6 +4162,8 @@
+         },
+         "node_modules/@volar/language-core": {
+             "version": "2.4.28",
++            "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.28.tgz",
++            "integrity": "sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@volar/source-map": "2.4.28"
+@@ -3120,10 +4171,14 @@
+         },
+         "node_modules/@volar/source-map": {
+             "version": "2.4.28",
++            "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.28.tgz",
++            "integrity": "sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==",
+             "license": "MIT"
+         },
+         "node_modules/@volar/typescript": {
+             "version": "2.4.28",
++            "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.28.tgz",
++            "integrity": "sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@volar/language-core": "2.4.28",
+@@ -3133,6 +4188,8 @@
+         },
+         "node_modules/@vue-macros/common": {
+             "version": "3.1.2",
++            "resolved": "https://registry.npmjs.org/@vue-macros/common/-/common-3.1.2.tgz",
++            "integrity": "sha512-h9t4ArDdniO9ekYHAD95t9AZcAbb19lEGK+26iAjUODOIJKmObDNBSe4+6ELQAA3vtYiFPPBtHh7+cQCKi3Dng==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/compiler-sfc": "^3.5.22",
+@@ -3158,6 +4215,8 @@
+         },
+         "node_modules/@vue/compiler-core": {
+             "version": "3.5.32",
++            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.32.tgz",
++            "integrity": "sha512-4x74Tbtqnda8s/NSD6e1Dr5p1c8HdMU5RWSjMSUzb8RTcUQqevDCxVAitcLBKT+ie3o0Dl9crc/S/opJM7qBGQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/parser": "^7.29.2",
+@@ -3169,10 +4228,14 @@
+         },
+         "node_modules/@vue/compiler-core/node_modules/estree-walker": {
+             "version": "2.0.2",
++            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
++            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+             "license": "MIT"
+         },
+         "node_modules/@vue/compiler-dom": {
+             "version": "3.5.32",
++            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.32.tgz",
++            "integrity": "sha512-ybHAu70NtiEI1fvAUz3oXZqkUYEe5J98GjMDpTGl5iHb0T15wQYLR4wE3h9xfuTNA+Cm2f4czfe8B4s+CCH57Q==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/compiler-core": "3.5.32",
+@@ -3181,6 +4244,8 @@
+         },
+         "node_modules/@vue/compiler-sfc": {
+             "version": "3.5.32",
++            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.32.tgz",
++            "integrity": "sha512-8UYUYo71cP/0YHMO814TRZlPuUUw3oifHuMR7Wp9SNoRSrxRQnhMLNlCeaODNn6kNTJsjFoQ/kqIj4qGvya4Xg==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/parser": "^7.29.2",
+@@ -3196,10 +4261,14 @@
+         },
+         "node_modules/@vue/compiler-sfc/node_modules/estree-walker": {
+             "version": "2.0.2",
++            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
++            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+             "license": "MIT"
+         },
+         "node_modules/@vue/compiler-ssr": {
+             "version": "3.5.32",
++            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.32.tgz",
++            "integrity": "sha512-Gp4gTs22T3DgRotZ8aA/6m2jMR+GMztvBXUBEUOYOcST+giyGWJ4WvFd7QLHBkzTxkfOt8IELKNdpzITLbA2rw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/compiler-dom": "3.5.32",
+@@ -3208,11 +4277,15 @@
+         },
+         "node_modules/@vue/devtools-api": {
+             "version": "6.6.4",
++            "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
++            "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/@vue/devtools-kit": {
+             "version": "7.7.9",
++            "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz",
++            "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/devtools-shared": "^7.7.9",
+@@ -3226,6 +4299,8 @@
+         },
+         "node_modules/@vue/devtools-shared": {
+             "version": "7.7.9",
++            "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz",
++            "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==",
+             "license": "MIT",
+             "dependencies": {
+                 "rfdc": "^1.4.1"
+@@ -3233,6 +4308,8 @@
+         },
+         "node_modules/@vue/eslint-config-prettier": {
+             "version": "9.0.0",
++            "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz",
++            "integrity": "sha512-z1ZIAAUS9pKzo/ANEfd2sO+v2IUalz7cM/cTLOZ7vRFOPk5/xuRKQteOu1DErFLAh/lYGXMVZ0IfYKlyInuDVg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3246,6 +4323,8 @@
+         },
+         "node_modules/@vue/eslint-config-typescript": {
+             "version": "13.0.0",
++            "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-13.0.0.tgz",
++            "integrity": "sha512-MHh9SncG/sfqjVqjcuFLOLD6Ed4dRAis4HNt0dXASeAuLqIAx4YMB1/m2o4pUKK1vCt8fUvYG8KKX2Ot3BVZTg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3268,20 +4347,24 @@
+             }
+         },
+         "node_modules/@vue/language-core": {
+-            "version": "3.2.6",
++            "version": "3.2.7",
++            "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.2.7.tgz",
++            "integrity": "sha512-Gn4q/tRxbpVGLEuARQ43p3YELlNAFgRUVCgW9U5Cr+5q4vfD2bWDWpl3ABbJMXUt5xlE1dF8dkigg2aUq7JYYw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@volar/language-core": "2.4.28",
+                 "@vue/compiler-dom": "^3.5.0",
+                 "@vue/shared": "^3.5.0",
+-                "alien-signals": "^3.0.0",
++                "alien-signals": "^3.1.2",
+                 "muggle-string": "^0.4.1",
+                 "path-browserify": "^1.0.1",
+-                "picomatch": "^4.0.2"
++                "picomatch": "^4.0.4"
+             }
+         },
+         "node_modules/@vue/language-core/node_modules/picomatch": {
+             "version": "4.0.4",
++            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
++            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=12"
+@@ -3292,6 +4375,8 @@
+         },
+         "node_modules/@vue/reactivity": {
+             "version": "3.5.32",
++            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.32.tgz",
++            "integrity": "sha512-/ORasxSGvZ6MN5gc+uE364SxFdJ0+WqVG0CENXaGW58TOCdrAW76WWaplDtECeS1qphvtBZtR+3/o1g1zL4xPQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/shared": "3.5.32"
+@@ -3299,6 +4384,8 @@
+         },
+         "node_modules/@vue/runtime-core": {
+             "version": "3.5.32",
++            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.32.tgz",
++            "integrity": "sha512-pDrXCejn4UpFDFmMd27AcJEbHaLemaE5o4pbb7sLk79SRIhc6/t34BQA7SGNgYtbMnvbF/HHOftYBgFJtUoJUQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/reactivity": "3.5.32",
+@@ -3307,6 +4394,8 @@
+         },
+         "node_modules/@vue/runtime-dom": {
+             "version": "3.5.32",
++            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.32.tgz",
++            "integrity": "sha512-1CDVv7tv/IV13V8Nip1k/aaObVbWqRlVCVezTwx3K07p7Vxossp5JU1dcPNhJk3w347gonIUT9jQOGutyJrSVQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/reactivity": "3.5.32",
+@@ -3317,6 +4406,8 @@
+         },
+         "node_modules/@vue/server-renderer": {
+             "version": "3.5.32",
++            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.32.tgz",
++            "integrity": "sha512-IOjm2+JQwRFS7W28HNuJeXQle9KdZbODFY7hFGVtnnghF51ta20EWAZJHX+zLGtsHhaU6uC9BGPV52KVpYryMQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/compiler-ssr": "3.5.32",
+@@ -3328,15 +4419,21 @@
+         },
+         "node_modules/@vue/shared": {
+             "version": "3.5.32",
++            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz",
++            "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==",
+             "license": "MIT"
+         },
+         "node_modules/@vue/tsconfig": {
+             "version": "0.5.1",
++            "resolved": "https://registry.npmjs.org/@vue/tsconfig/-/tsconfig-0.5.1.tgz",
++            "integrity": "sha512-VcZK7MvpjuTPx2w6blwnwZAu5/LgBUtejFOi3pPGQFXQN5Ela03FUtd2Qtg4yWGGissVL0dr6Ro1LfOFh+PCuQ==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/@vueuse/core": {
+             "version": "14.2.1",
++            "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.2.1.tgz",
++            "integrity": "sha512-3vwDzV+GDUNpdegRY6kzpLm4Igptq+GA0QkJ3W61Iv27YWwW/ufSlOfgQIpN6FZRMG0mkaz4gglJRtq5SeJyIQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@types/web-bluetooth": "^0.0.21",
+@@ -3352,6 +4449,8 @@
+         },
+         "node_modules/@vueuse/integrations": {
+             "version": "14.2.1",
++            "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-14.2.1.tgz",
++            "integrity": "sha512-2LIUpBi/67PoXJGqSDQUF0pgQWpNHh7beiA+KG2AbybcNm+pTGWT6oPGlBgUoDWmYwfeQqM/uzOHqcILpKL7nA==",
+             "license": "MIT",
+             "peer": true,
+             "dependencies": {
+@@ -3417,6 +4516,8 @@
+         },
+         "node_modules/@vueuse/metadata": {
+             "version": "14.2.1",
++            "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-14.2.1.tgz",
++            "integrity": "sha512-1ButlVtj5Sb/HDtIy1HFr1VqCP4G6Ypqt5MAo0lCgjokrk2mvQKsK2uuy0vqu/Ks+sHfuHo0B9Y9jn9xKdjZsw==",
+             "license": "MIT",
+             "funding": {
+                 "url": "https://github.com/sponsors/antfu"
+@@ -3424,6 +4525,8 @@
+         },
+         "node_modules/@vueuse/shared": {
+             "version": "14.2.1",
++            "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.2.1.tgz",
++            "integrity": "sha512-shTJncjV9JTI4oVNyF1FQonetYAiTBd+Qj7cY89SWbXSkx7gyhrgtEdF2ZAVWS1S3SHlaROO6F2IesJxQEkZBw==",
+             "license": "MIT",
+             "funding": {
+                 "url": "https://github.com/sponsors/antfu"
+@@ -3433,7 +4536,9 @@
+             }
+         },
+         "node_modules/@xmldom/xmldom": {
+-            "version": "0.8.12",
++            "version": "0.8.13",
++            "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.13.tgz",
++            "integrity": "sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -3442,6 +4547,8 @@
+         },
+         "node_modules/@zodios/core": {
+             "version": "10.9.6",
++            "resolved": "https://registry.npmjs.org/@zodios/core/-/core-10.9.6.tgz",
++            "integrity": "sha512-aH4rOdb3AcezN7ws8vDgBfGboZMk2JGGzEq/DtW65MhnRxyTGRuLJRWVQ/2KxDgWvV2F5oTkAS+5pnjKbl0n+A==",
+             "license": "MIT",
+             "peerDependencies": {
+                 "axios": "^0.x || ^1.0.0",
+@@ -3450,19 +4557,25 @@
+         },
+         "node_modules/7zip-bin": {
+             "version": "5.2.0",
++            "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz",
++            "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/abbrev": {
+-            "version": "3.0.1",
++            "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-4.0.0.tgz",
++            "integrity": "sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==",
+             "dev": true,
+             "license": "ISC",
+             "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
++                "node": "^20.17.0 || >=22.9.0"
+             }
+         },
+         "node_modules/acorn": {
+             "version": "8.16.0",
++            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
++            "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+             "license": "MIT",
+             "bin": {
+                 "acorn": "bin/acorn"
+@@ -3473,6 +4586,8 @@
+         },
+         "node_modules/acorn-import-attributes": {
+             "version": "1.9.5",
++            "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
++            "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+             "license": "MIT",
+             "peerDependencies": {
+                 "acorn": "^8"
+@@ -3480,6 +4595,8 @@
+         },
+         "node_modules/acorn-jsx": {
+             "version": "5.3.2",
++            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
++            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+             "dev": true,
+             "license": "MIT",
+             "peerDependencies": {
+@@ -3488,6 +4605,8 @@
+         },
+         "node_modules/agent-base": {
+             "version": "7.1.4",
++            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
++            "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -3496,7 +4615,9 @@
+         },
+         "node_modules/ajv": {
+             "version": "6.14.0",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
++            "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
++            "devOptional": true,
+             "license": "MIT",
+             "dependencies": {
+                 "fast-deep-equal": "^3.1.1",
+@@ -3511,6 +4632,8 @@
+         },
+         "node_modules/ajv-keywords": {
+             "version": "3.5.2",
++            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
++            "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+             "dev": true,
+             "license": "MIT",
+             "peerDependencies": {
+@@ -3519,11 +4642,15 @@
+         },
+         "node_modules/alien-signals": {
+             "version": "3.1.2",
++            "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-3.1.2.tgz",
++            "integrity": "sha512-d9dYqZTS90WLiU0I5c6DHj/HcKkF8ZyGN3G5x8wSbslulz70KOxaqCT0hQCo9KOyhVqzqGojvNdJXoTumZOtcw==",
+             "license": "MIT"
+         },
+         "node_modules/ansi-regex": {
+             "version": "5.0.1",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
++            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
++            "devOptional": true,
+             "license": "MIT",
+             "engines": {
+                 "node": ">=8"
+@@ -3531,6 +4658,8 @@
+         },
+         "node_modules/ansi-styles": {
+             "version": "4.3.0",
++            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
++            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3545,10 +4674,14 @@
+         },
+         "node_modules/any-promise": {
+             "version": "1.3.0",
++            "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
++            "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+             "license": "MIT"
+         },
+         "node_modules/anymatch": {
+             "version": "3.1.3",
++            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
++            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+             "license": "ISC",
+             "dependencies": {
+                 "normalize-path": "^3.0.0",
+@@ -3560,11 +4693,15 @@
+         },
+         "node_modules/app-builder-bin": {
+             "version": "5.0.0-alpha.12",
++            "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz",
++            "integrity": "sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/app-builder-lib": {
+             "version": "26.8.1",
++            "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.8.1.tgz",
++            "integrity": "sha512-p0Im/Dx5C4tmz8QEE1Yn4MkuPC8PrnlRneMhWJj7BBXQfNTJUshM/bp3lusdEsDbvvfJZpXWnYesgSLvwtM2Zw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3615,6 +4752,8 @@
+         },
+         "node_modules/app-builder-lib/node_modules/@electron/get": {
+             "version": "3.1.0",
++            "resolved": "https://registry.npmjs.org/@electron/get/-/get-3.1.0.tgz",
++            "integrity": "sha512-F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3635,6 +4774,8 @@
+         },
+         "node_modules/app-builder-lib/node_modules/@electron/get/node_modules/fs-extra": {
+             "version": "8.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
++            "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3648,6 +4789,8 @@
+         },
+         "node_modules/app-builder-lib/node_modules/@electron/get/node_modules/semver": {
+             "version": "6.3.1",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
++            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -3656,6 +4799,8 @@
+         },
+         "node_modules/app-builder-lib/node_modules/ci-info": {
+             "version": "4.3.1",
++            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz",
++            "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==",
+             "dev": true,
+             "funding": [
+                 {
+@@ -3670,6 +4815,8 @@
+         },
+         "node_modules/app-builder-lib/node_modules/fs-extra": {
+             "version": "10.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
++            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3682,7 +4829,9 @@
+             }
+         },
+         "node_modules/app-builder-lib/node_modules/fs-extra/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3694,6 +4843,8 @@
+         },
+         "node_modules/app-builder-lib/node_modules/fs-extra/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -3702,6 +4853,8 @@
+         },
+         "node_modules/app-builder-lib/node_modules/isexe": {
+             "version": "3.1.5",
++            "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz",
++            "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==",
+             "dev": true,
+             "license": "BlueOak-1.0.0",
+             "engines": {
+@@ -3710,6 +4863,8 @@
+         },
+         "node_modules/app-builder-lib/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -3721,6 +4876,8 @@
+         },
+         "node_modules/app-builder-lib/node_modules/which": {
+             "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
++            "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -3733,16 +4890,74 @@
+                 "node": "^18.17.0 || >=20.5.0"
+             }
+         },
++        "node_modules/aproba": {
++            "version": "1.2.0",
++            "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
++            "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
++            "license": "ISC",
++            "optional": true
++        },
++        "node_modules/are-we-there-yet": {
++            "version": "1.1.7",
++            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
++            "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
++            "deprecated": "This package is no longer supported.",
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "delegates": "^1.0.0",
++                "readable-stream": "^2.0.6"
++            }
++        },
++        "node_modules/are-we-there-yet/node_modules/readable-stream": {
++            "version": "2.3.8",
++            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
++            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "core-util-is": "~1.0.0",
++                "inherits": "~2.0.3",
++                "isarray": "~1.0.0",
++                "process-nextick-args": "~2.0.0",
++                "safe-buffer": "~5.1.1",
++                "string_decoder": "~1.1.1",
++                "util-deprecate": "~1.0.1"
++            }
++        },
++        "node_modules/are-we-there-yet/node_modules/safe-buffer": {
++            "version": "5.1.2",
++            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
++            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
++            "license": "MIT",
++            "optional": true
++        },
++        "node_modules/are-we-there-yet/node_modules/string_decoder": {
++            "version": "1.1.1",
++            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
++            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "safe-buffer": "~5.1.0"
++            }
++        },
+         "node_modules/arg": {
+             "version": "5.0.2",
++            "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
++            "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
+             "license": "MIT"
+         },
+         "node_modules/argparse": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
++            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+             "license": "Python-2.0"
+         },
+         "node_modules/aria-hidden": {
+             "version": "1.2.6",
++            "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
++            "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==",
+             "license": "MIT",
+             "peer": true,
+             "dependencies": {
+@@ -3754,15 +4969,28 @@
+         },
+         "node_modules/array-union": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
++            "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+                 "node": ">=8"
+             }
+         },
++        "node_modules/asn1": {
++            "version": "0.2.6",
++            "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
++            "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "safer-buffer": "~2.1.0"
++            }
++        },
+         "node_modules/assert-plus": {
+             "version": "1.0.0",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
++            "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+             "license": "MIT",
+             "optional": true,
+             "engines": {
+@@ -3771,6 +4999,8 @@
+         },
+         "node_modules/assertion-error": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
++            "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -3779,6 +5009,8 @@
+         },
+         "node_modules/ast-kit": {
+             "version": "2.2.0",
++            "resolved": "https://registry.npmjs.org/ast-kit/-/ast-kit-2.2.0.tgz",
++            "integrity": "sha512-m1Q/RaVOnTp9JxPX+F+Zn7IcLYMzM8kZofDImfsKZd8MbR+ikdOzTeztStWqfrqIxZnYWryyI9ePm3NGjnZgGw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/parser": "^7.28.5",
+@@ -3793,6 +5025,8 @@
+         },
+         "node_modules/ast-walker-scope": {
+             "version": "0.8.3",
++            "resolved": "https://registry.npmjs.org/ast-walker-scope/-/ast-walker-scope-0.8.3.tgz",
++            "integrity": "sha512-cbdCP0PGOBq0ASG+sjnKIoYkWMKhhz+F/h9pRexUdX2Hd38+WOlBkRKlqkGOSm0YQpcFMQBJeK4WspUAkwsEdg==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/parser": "^7.28.4",
+@@ -3807,6 +5041,8 @@
+         },
+         "node_modules/astral-regex": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
++            "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -3816,11 +5052,15 @@
+         },
+         "node_modules/async": {
+             "version": "3.2.6",
++            "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
++            "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/async-exit-hook": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz",
++            "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -3829,10 +5069,14 @@
+         },
+         "node_modules/asynckit": {
+             "version": "0.4.0",
++            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
++            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+             "license": "MIT"
+         },
+         "node_modules/at-least-node": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
++            "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+             "dev": true,
+             "license": "ISC",
+             "engines": {
+@@ -3841,6 +5085,8 @@
+         },
+         "node_modules/autoprefixer": {
+             "version": "10.5.0",
++            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.0.tgz",
++            "integrity": "sha512-FMhOoZV4+qR6aTUALKX2rEqGG+oyATvwBt9IIzVR5rMa2HRWPkxf+P+PAJLD1I/H5/II+HuZcBJYEFBpq39ong==",
+             "dev": true,
+             "funding": [
+                 {
+@@ -3874,8 +5120,27 @@
+                 "postcss": "^8.1.0"
+             }
+         },
++        "node_modules/aws-sign2": {
++            "version": "0.7.0",
++            "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
++            "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
++            "license": "Apache-2.0",
++            "optional": true,
++            "engines": {
++                "node": "*"
++            }
++        },
++        "node_modules/aws4": {
++            "version": "1.13.2",
++            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
++            "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
++            "license": "MIT",
++            "optional": true
++        },
+         "node_modules/axios": {
+-            "version": "1.15.0",
++            "version": "1.15.2",
++            "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz",
++            "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==",
+             "license": "MIT",
+             "dependencies": {
+                 "follow-redirects": "^1.15.11",
+@@ -3885,6 +5150,8 @@
+         },
+         "node_modules/axios/node_modules/proxy-from-env": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
++            "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=10"
+@@ -3892,6 +5159,8 @@
+         },
+         "node_modules/balanced-match": {
+             "version": "4.0.4",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
++            "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+             "license": "MIT",
+             "engines": {
+                 "node": "18 || 20 || >=22"
+@@ -3899,6 +5168,8 @@
+         },
+         "node_modules/base64-js": {
+             "version": "1.5.1",
++            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
++            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+             "funding": [
+                 {
+                     "type": "github",
+@@ -3916,7 +5187,9 @@
+             "license": "MIT"
+         },
+         "node_modules/baseline-browser-mapping": {
+-            "version": "2.10.18",
++            "version": "2.10.20",
++            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.20.tgz",
++            "integrity": "sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ==",
+             "license": "Apache-2.0",
+             "bin": {
+                 "baseline-browser-mapping": "dist/cli.cjs"
+@@ -3925,8 +5198,20 @@
+                 "node": ">=6.0.0"
+             }
+         },
++        "node_modules/bcrypt-pbkdf": {
++            "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
++            "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
++            "license": "BSD-3-Clause",
++            "optional": true,
++            "dependencies": {
++                "tweetnacl": "^0.14.3"
++            }
++        },
+         "node_modules/better-sqlite3": {
+             "version": "12.9.0",
++            "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.9.0.tgz",
++            "integrity": "sha512-wqUv4Gm3toFpHDQmaKD4QhZm3g1DjUBI0yzS4UBl6lElUmXFYdTQmmEDpAFa5o8FiFiymURypEnfVHzILKaxqQ==",
+             "hasInstallScript": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -3939,6 +5224,8 @@
+         },
+         "node_modules/binary-extensions": {
+             "version": "2.3.0",
++            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
++            "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=8"
+@@ -3949,6 +5236,8 @@
+         },
+         "node_modules/bindings": {
+             "version": "1.5.0",
++            "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
++            "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "file-uri-to-path": "1.0.0"
+@@ -3956,6 +5245,8 @@
+         },
+         "node_modules/birpc": {
+             "version": "2.9.0",
++            "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.9.0.tgz",
++            "integrity": "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw==",
+             "license": "MIT",
+             "funding": {
+                 "url": "https://github.com/sponsors/antfu"
+@@ -3963,6 +5254,8 @@
+         },
+         "node_modules/bl": {
+             "version": "4.1.0",
++            "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
++            "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+             "license": "MIT",
+             "dependencies": {
+                 "buffer": "^5.5.0",
+@@ -3972,16 +5265,23 @@
+         },
+         "node_modules/boolbase": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
++            "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+             "dev": true,
+             "license": "ISC"
+         },
+         "node_modules/boolean": {
+             "version": "3.2.0",
++            "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
++            "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
++            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+             "license": "MIT",
+             "optional": true
+         },
+         "node_modules/brace-expansion": {
+             "version": "5.0.5",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
++            "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "balanced-match": "^4.0.2"
+@@ -3992,6 +5292,8 @@
+         },
+         "node_modules/braces": {
+             "version": "3.0.3",
++            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
++            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+             "license": "MIT",
+             "dependencies": {
+                 "fill-range": "^7.1.1"
+@@ -4002,6 +5304,8 @@
+         },
+         "node_modules/browserslist": {
+             "version": "4.28.2",
++            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
++            "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
+             "funding": [
+                 {
+                     "type": "opencollective",
+@@ -4033,6 +5337,8 @@
+         },
+         "node_modules/buffer": {
+             "version": "5.7.1",
++            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
++            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+             "funding": [
+                 {
+                     "type": "github",
+@@ -4055,6 +5361,8 @@
+         },
+         "node_modules/buffer-crc32": {
+             "version": "0.2.13",
++            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
++            "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": "*"
+@@ -4062,11 +5370,15 @@
+         },
+         "node_modules/buffer-from": {
+             "version": "1.1.2",
++            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
++            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/builder-util": {
+             "version": "26.8.1",
++            "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.8.1.tgz",
++            "integrity": "sha512-pm1lTYbGyc90DHgCDO7eo8Rl4EqKLciayNbZqGziqnH9jrlKe8ZANGdityLZU+pJh16dfzjAx2xQq9McuIPEtw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4090,6 +5402,8 @@
+         },
+         "node_modules/builder-util-runtime": {
+             "version": "9.5.1",
++            "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.5.1.tgz",
++            "integrity": "sha512-qt41tMfgHTllhResqM5DcnHyDIWNgzHvuY2jDcYP9iaGpkWxTUzV6GQjDeLnlR1/DtdlcsWQbA7sByMpmJFTLQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "debug": "^4.3.4",
+@@ -4101,6 +5415,8 @@
+         },
+         "node_modules/builder-util/node_modules/fs-extra": {
+             "version": "10.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
++            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4114,6 +5430,8 @@
+         },
+         "node_modules/builder-util/node_modules/https-proxy-agent": {
+             "version": "7.0.6",
++            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
++            "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4125,7 +5443,9 @@
+             }
+         },
+         "node_modules/builder-util/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4137,6 +5457,8 @@
+         },
+         "node_modules/builder-util/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -4145,102 +5467,18 @@
+         },
+         "node_modules/cac": {
+             "version": "6.7.14",
++            "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
++            "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+                 "node": ">=8"
+             }
+         },
+-        "node_modules/cacache": {
+-            "version": "19.0.1",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "@npmcli/fs": "^4.0.0",
+-                "fs-minipass": "^3.0.0",
+-                "glob": "^10.2.2",
+-                "lru-cache": "^10.0.1",
+-                "minipass": "^7.0.3",
+-                "minipass-collect": "^2.0.1",
+-                "minipass-flush": "^1.0.5",
+-                "minipass-pipeline": "^1.2.4",
+-                "p-map": "^7.0.2",
+-                "ssri": "^12.0.0",
+-                "tar": "^7.4.3",
+-                "unique-filename": "^4.0.0"
+-            },
+-            "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
+-            }
+-        },
+-        "node_modules/cacache/node_modules/balanced-match": {
+-            "version": "1.0.2",
+-            "dev": true,
+-            "license": "MIT"
+-        },
+-        "node_modules/cacache/node_modules/brace-expansion": {
+-            "version": "2.1.0",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "balanced-match": "^1.0.0"
+-            }
+-        },
+-        "node_modules/cacache/node_modules/glob": {
+-            "version": "10.5.0",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "foreground-child": "^3.1.0",
+-                "jackspeak": "^3.1.2",
+-                "minimatch": "^9.0.4",
+-                "minipass": "^7.1.2",
+-                "package-json-from-dist": "^1.0.0",
+-                "path-scurry": "^1.11.1"
+-            },
+-            "bin": {
+-                "glob": "dist/esm/bin.mjs"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/isaacs"
+-            }
+-        },
+-        "node_modules/cacache/node_modules/lru-cache": {
+-            "version": "10.4.3",
+-            "dev": true,
+-            "license": "ISC"
+-        },
+-        "node_modules/cacache/node_modules/minimatch": {
+-            "version": "9.0.9",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "brace-expansion": "^2.0.2"
+-            },
+-            "engines": {
+-                "node": ">=16 || 14 >=14.17"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/isaacs"
+-            }
+-        },
+-        "node_modules/cacache/node_modules/path-scurry": {
+-            "version": "1.11.1",
+-            "dev": true,
+-            "license": "BlueOak-1.0.0",
+-            "dependencies": {
+-                "lru-cache": "^10.2.0",
+-                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+-            },
+-            "engines": {
+-                "node": ">=16 || 14 >=14.18"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/isaacs"
+-            }
+-        },
+         "node_modules/cacheable-lookup": {
+             "version": "5.0.4",
++            "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
++            "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=10.6.0"
+@@ -4248,6 +5486,8 @@
+         },
+         "node_modules/cacheable-request": {
+             "version": "7.0.4",
++            "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
++            "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
+             "license": "MIT",
+             "dependencies": {
+                 "clone-response": "^1.0.2",
+@@ -4264,6 +5504,8 @@
+         },
+         "node_modules/call-bind-apply-helpers": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
++            "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "es-errors": "^1.3.0",
+@@ -4275,6 +5517,8 @@
+         },
+         "node_modules/callsites": {
+             "version": "3.1.0",
++            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
++            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -4283,13 +5527,17 @@
+         },
+         "node_modules/camelcase-css": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
++            "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 6"
+             }
+         },
+         "node_modules/caniuse-lite": {
+-            "version": "1.0.30001788",
++            "version": "1.0.30001790",
++            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz",
++            "integrity": "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==",
+             "funding": [
+                 {
+                     "type": "opencollective",
+@@ -4306,8 +5554,17 @@
+             ],
+             "license": "CC-BY-4.0"
+         },
++        "node_modules/caseless": {
++            "version": "0.12.0",
++            "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
++            "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
++            "license": "Apache-2.0",
++            "optional": true
++        },
+         "node_modules/chai": {
+             "version": "5.3.3",
++            "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",
++            "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4323,6 +5580,8 @@
+         },
+         "node_modules/chalk": {
+             "version": "4.1.2",
++            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
++            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4338,6 +5597,8 @@
+         },
+         "node_modules/check-error": {
+             "version": "2.1.3",
++            "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz",
++            "integrity": "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -4346,6 +5607,8 @@
+         },
+         "node_modules/chokidar": {
+             "version": "3.6.0",
++            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
++            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+             "license": "MIT",
+             "dependencies": {
+                 "anymatch": "~3.1.2",
+@@ -4368,6 +5631,8 @@
+         },
+         "node_modules/chokidar/node_modules/glob-parent": {
+             "version": "5.1.2",
++            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
++            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+             "license": "ISC",
+             "dependencies": {
+                 "is-glob": "^4.0.1"
+@@ -4378,6 +5643,8 @@
+         },
+         "node_modules/chownr": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
++            "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+             "dev": true,
+             "license": "BlueOak-1.0.0",
+             "engines": {
+@@ -4386,16 +5653,22 @@
+         },
+         "node_modules/chroma-js": {
+             "version": "3.2.0",
++            "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-3.2.0.tgz",
++            "integrity": "sha512-os/OippSlX1RlWWr+QDPcGUZs0uoqr32urfxESG9U93lhUfbnlyckte84Q8P1UQY/qth983AS1JONKmLS4T0nw==",
+             "license": "(BSD-3-Clause AND Apache-2.0)",
+             "peer": true
+         },
+         "node_modules/chromium-pickle-js": {
+             "version": "0.2.0",
++            "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
++            "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/ci-info": {
+             "version": "4.4.0",
++            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
++            "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==",
+             "dev": true,
+             "funding": [
+                 {
+@@ -4410,10 +5683,14 @@
+         },
+         "node_modules/cjs-module-lexer": {
+             "version": "2.2.0",
++            "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz",
++            "integrity": "sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==",
+             "license": "MIT"
+         },
+         "node_modules/class-variance-authority": {
+             "version": "0.7.1",
++            "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz",
++            "integrity": "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==",
+             "license": "Apache-2.0",
+             "peer": true,
+             "dependencies": {
+@@ -4423,30 +5700,10 @@
+                 "url": "https://polar.sh/cva"
+             }
+         },
+-        "node_modules/cli-cursor": {
+-            "version": "3.1.0",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "restore-cursor": "^3.1.0"
+-            },
+-            "engines": {
+-                "node": ">=8"
+-            }
+-        },
+-        "node_modules/cli-spinners": {
+-            "version": "2.9.2",
+-            "dev": true,
+-            "license": "MIT",
+-            "engines": {
+-                "node": ">=6"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/sindresorhus"
+-            }
+-        },
+         "node_modules/cli-truncate": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
++            "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -4463,6 +5720,8 @@
+         },
+         "node_modules/cliui": {
+             "version": "8.0.1",
++            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
++            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -4474,16 +5733,10 @@
+                 "node": ">=12"
+             }
+         },
+-        "node_modules/clone": {
+-            "version": "1.0.4",
+-            "dev": true,
+-            "license": "MIT",
+-            "engines": {
+-                "node": ">=0.8"
+-            }
+-        },
+         "node_modules/clone-response": {
+             "version": "1.0.3",
++            "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
++            "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+             "license": "MIT",
+             "dependencies": {
+                 "mimic-response": "^1.0.0"
+@@ -4494,14 +5747,28 @@
+         },
+         "node_modules/clsx": {
+             "version": "2.1.1",
++            "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
++            "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+             "license": "MIT",
+             "peer": true,
+             "engines": {
+                 "node": ">=6"
+             }
+         },
++        "node_modules/code-point-at": {
++            "version": "1.1.0",
++            "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
++            "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
++            "license": "MIT",
++            "optional": true,
++            "engines": {
++                "node": ">=0.10.0"
++            }
++        },
+         "node_modules/color-convert": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
++            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4513,11 +5780,15 @@
+         },
+         "node_modules/color-name": {
+             "version": "1.1.4",
++            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
++            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/combined-stream": {
+             "version": "1.0.8",
++            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
++            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+             "license": "MIT",
+             "dependencies": {
+                 "delayed-stream": "~1.0.0"
+@@ -4528,6 +5799,8 @@
+         },
+         "node_modules/commander": {
+             "version": "5.1.0",
++            "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
++            "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -4536,6 +5809,8 @@
+         },
+         "node_modules/compare-version": {
+             "version": "0.1.2",
++            "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
++            "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -4544,19 +5819,34 @@
+         },
+         "node_modules/concat-map": {
+             "version": "0.0.1",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
++            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
++            "devOptional": true,
+             "license": "MIT"
+         },
+         "node_modules/confbox": {
+             "version": "0.2.4",
++            "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.4.tgz",
++            "integrity": "sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==",
+             "license": "MIT"
+         },
+-        "node_modules/convert-source-map": {
+-            "version": "2.0.0",
+-            "license": "MIT"
++        "node_modules/console-control-strings": {
++            "version": "1.1.0",
++            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
++            "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
++            "license": "ISC",
++            "optional": true
++        },
++        "node_modules/convert-source-map": {
++            "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
++            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
++            "license": "MIT"
+         },
+         "node_modules/copy-anything": {
+             "version": "4.0.5",
++            "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz",
++            "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
+             "license": "MIT",
+             "dependencies": {
+                 "is-what": "^5.2.0"
+@@ -4570,11 +5860,15 @@
+         },
+         "node_modules/core-util-is": {
+             "version": "1.0.2",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
++            "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
++            "devOptional": true,
+             "license": "MIT"
+         },
+         "node_modules/crc": {
+             "version": "3.8.0",
++            "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
++            "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -4584,6 +5878,8 @@
+         },
+         "node_modules/cross-dirname": {
+             "version": "0.1.0",
++            "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz",
++            "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -4591,6 +5887,8 @@
+         },
+         "node_modules/cross-spawn": {
+             "version": "7.0.6",
++            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
++            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4604,6 +5902,8 @@
+         },
+         "node_modules/cssesc": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
++            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+             "license": "MIT",
+             "bin": {
+                 "cssesc": "bin/cssesc"
+@@ -4614,14 +5914,33 @@
+         },
+         "node_modules/csstype": {
+             "version": "3.2.3",
++            "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
++            "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+             "license": "MIT"
+         },
++        "node_modules/dashdash": {
++            "version": "1.14.1",
++            "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
++            "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "assert-plus": "^1.0.0"
++            },
++            "engines": {
++                "node": ">=0.10"
++            }
++        },
+         "node_modules/dayjs": {
+             "version": "1.11.20",
++            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz",
++            "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==",
+             "license": "MIT"
+         },
+         "node_modules/dbus-next": {
+             "version": "0.10.2",
++            "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.10.2.tgz",
++            "integrity": "sha512-kLNQoadPstLgKKGIXKrnRsMgtAK/o+ix3ZmcfTfvBHzghiO9yHXpoKImGnB50EXwnfSFaSAullW/7UrSkAISSQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@nornagon/put": "0.0.8",
+@@ -4638,6 +5957,8 @@
+         },
+         "node_modules/debug": {
+             "version": "4.4.3",
++            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
++            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+             "license": "MIT",
+             "dependencies": {
+                 "ms": "^2.1.3"
+@@ -4653,6 +5974,8 @@
+         },
+         "node_modules/decompress-response": {
+             "version": "6.0.0",
++            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
++            "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "mimic-response": "^3.1.0"
+@@ -4666,6 +5989,8 @@
+         },
+         "node_modules/decompress-response/node_modules/mimic-response": {
+             "version": "3.1.0",
++            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
++            "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=10"
+@@ -4676,6 +6001,8 @@
+         },
+         "node_modules/deep-eql": {
+             "version": "5.0.2",
++            "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
++            "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -4684,6 +6011,8 @@
+         },
+         "node_modules/deep-extend": {
+             "version": "0.6.0",
++            "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
++            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=4.0.0"
+@@ -4691,22 +6020,15 @@
+         },
+         "node_modules/deep-is": {
+             "version": "0.1.4",
++            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
++            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+             "dev": true,
+             "license": "MIT"
+         },
+-        "node_modules/defaults": {
+-            "version": "1.0.4",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "clone": "^1.0.2"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/sindresorhus"
+-            }
+-        },
+         "node_modules/defer-to-connect": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
++            "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=10"
+@@ -4714,6 +6036,8 @@
+         },
+         "node_modules/define-data-property": {
+             "version": "1.1.4",
++            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
++            "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+             "license": "MIT",
+             "optional": true,
+             "dependencies": {
+@@ -4730,6 +6054,8 @@
+         },
+         "node_modules/define-properties": {
+             "version": "1.2.1",
++            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
++            "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+             "license": "MIT",
+             "optional": true,
+             "dependencies": {
+@@ -4746,18 +6072,31 @@
+         },
+         "node_modules/defu": {
+             "version": "6.1.7",
++            "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.7.tgz",
++            "integrity": "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==",
+             "license": "MIT",
+             "peer": true
+         },
+         "node_modules/delayed-stream": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
++            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.4.0"
+             }
+         },
++        "node_modules/delegates": {
++            "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
++            "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
++            "license": "MIT",
++            "optional": true
++        },
+         "node_modules/detect-libc": {
+             "version": "2.1.2",
++            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
++            "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+             "license": "Apache-2.0",
+             "engines": {
+                 "node": ">=8"
+@@ -4765,15 +6104,21 @@
+         },
+         "node_modules/detect-node": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
++            "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+             "license": "MIT",
+             "optional": true
+         },
+         "node_modules/didyoumean": {
+             "version": "1.2.2",
++            "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
++            "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
+             "license": "Apache-2.0"
+         },
+         "node_modules/dir-compare": {
+             "version": "4.2.0",
++            "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz",
++            "integrity": "sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4783,11 +6128,15 @@
+         },
+         "node_modules/dir-compare/node_modules/balanced-match": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/dir-compare/node_modules/brace-expansion": {
+             "version": "1.1.14",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4797,6 +6146,8 @@
+         },
+         "node_modules/dir-compare/node_modules/minimatch": {
+             "version": "3.1.5",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -4808,6 +6159,8 @@
+         },
+         "node_modules/dir-glob": {
+             "version": "3.0.1",
++            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
++            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4819,10 +6172,14 @@
+         },
+         "node_modules/dlv": {
+             "version": "1.1.3",
++            "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
++            "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+             "license": "MIT"
+         },
+         "node_modules/dmg-builder": {
+             "version": "26.8.1",
++            "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.8.1.tgz",
++            "integrity": "sha512-glMJgnTreo8CFINujtAhCgN96QAqApDMZ8Vl1r8f0QT8QprvC1UCltV4CcWj20YoIyLZx6IUskaJZ0NV8fokcg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4838,6 +6195,8 @@
+         },
+         "node_modules/dmg-builder/node_modules/fs-extra": {
+             "version": "10.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
++            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4850,7 +6209,9 @@
+             }
+         },
+         "node_modules/dmg-builder/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4862,6 +6223,8 @@
+         },
+         "node_modules/dmg-builder/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -4870,6 +6233,8 @@
+         },
+         "node_modules/dmg-license": {
+             "version": "1.0.11",
++            "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz",
++            "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -4895,6 +6260,8 @@
+         },
+         "node_modules/doctrine": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
++            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "dependencies": {
+@@ -4906,6 +6273,8 @@
+         },
+         "node_modules/dotenv": {
+             "version": "16.6.1",
++            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
++            "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+             "license": "BSD-2-Clause",
+             "engines": {
+                 "node": ">=12"
+@@ -4916,6 +6285,8 @@
+         },
+         "node_modules/dotenv-expand": {
+             "version": "11.0.7",
++            "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
++            "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "dependencies": {
+@@ -4930,6 +6301,8 @@
+         },
+         "node_modules/drizzle-kit": {
+             "version": "0.31.10",
++            "resolved": "https://registry.npmjs.org/drizzle-kit/-/drizzle-kit-0.31.10.tgz",
++            "integrity": "sha512-7OZcmQUrdGI+DUNNsKBn1aW8qSoKuTH7d0mYgSP8bAzdFzKoovxEFnoGQp2dVs82EOJeYycqRtciopszwUf8bw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -4944,6 +6317,8 @@
+         },
+         "node_modules/drizzle-orm": {
+             "version": "0.45.2",
++            "resolved": "https://registry.npmjs.org/drizzle-orm/-/drizzle-orm-0.45.2.tgz",
++            "integrity": "sha512-kY0BSaTNYWnoDMVoyY8uxmyHjpJW1geOmBMdSSicKo9CIIWkSxMIj2rkeSR51b8KAPB7m+qysjuHme5nKP+E5Q==",
+             "license": "Apache-2.0",
+             "peerDependencies": {
+                 "@aws-sdk/client-rds-data": ">=3",
+@@ -5067,6 +6442,8 @@
+         },
+         "node_modules/dunder-proto": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
++            "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+             "license": "MIT",
+             "dependencies": {
+                 "call-bind-apply-helpers": "^1.0.1",
+@@ -5079,15 +6456,25 @@
+         },
+         "node_modules/duplexer": {
+             "version": "0.1.2",
++            "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
++            "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+             "license": "MIT"
+         },
+-        "node_modules/eastasianwidth": {
+-            "version": "0.2.0",
+-            "dev": true,
+-            "license": "MIT"
++        "node_modules/ecc-jsbn": {
++            "version": "0.1.2",
++            "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
++            "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "jsbn": "~0.1.0",
++                "safer-buffer": "^2.1.0"
++            }
+         },
+         "node_modules/ejs": {
+             "version": "3.1.10",
++            "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
++            "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "dependencies": {
+@@ -5101,7 +6488,9 @@
+             }
+         },
+         "node_modules/electron": {
+-            "version": "41.2.0",
++            "version": "41.2.2",
++            "resolved": "https://registry.npmjs.org/electron/-/electron-41.2.2.tgz",
++            "integrity": "sha512-3rzz/hVIpF726W9g7nleQzyF2IOEZbzZnUTUYGhMaEfsoab8fDyOYAWbdBdo4+DczS1Ifz11rdYo8IAAGcRx/g==",
+             "hasInstallScript": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5118,6 +6507,8 @@
+         },
+         "node_modules/electron-builder": {
+             "version": "26.8.1",
++            "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.8.1.tgz",
++            "integrity": "sha512-uWhx1r74NGpCagG0ULs/P9Nqv2nsoo+7eo4fLUOB8L8MdWltq9odW/uuLXMFCDGnPafknYLZgjNX0ZIFRzOQAw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5142,6 +6533,8 @@
+         },
+         "node_modules/electron-builder-notarize": {
+             "version": "1.5.2",
++            "resolved": "https://registry.npmjs.org/electron-builder-notarize/-/electron-builder-notarize-1.5.2.tgz",
++            "integrity": "sha512-vo6RGgIFYxMk2yp59N4NsvmAYfB7ncYi6gV9Fcq2TVKxEn2tPXrSjIKB2e/pu+5iXIY6BHNZNXa75F3DHgOOLA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5159,6 +6552,8 @@
+         },
+         "node_modules/electron-builder-notarize/node_modules/argparse": {
+             "version": "1.0.10",
++            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
++            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5167,6 +6562,8 @@
+         },
+         "node_modules/electron-builder-notarize/node_modules/dotenv": {
+             "version": "8.6.0",
++            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
++            "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "engines": {
+@@ -5175,6 +6572,8 @@
+         },
+         "node_modules/electron-builder-notarize/node_modules/js-yaml": {
+             "version": "3.14.2",
++            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
++            "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5187,11 +6586,15 @@
+         },
+         "node_modules/electron-builder-notarize/node_modules/sprintf-js": {
+             "version": "1.0.3",
++            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
++            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+             "dev": true,
+             "license": "BSD-3-Clause"
+         },
+         "node_modules/electron-builder-squirrel-windows": {
+             "version": "26.8.1",
++            "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.8.1.tgz",
++            "integrity": "sha512-o288fIdgPLHA76eDrFADHPoo7VyGkDCYbLV1GzndaMSAVBoZrGvM9m2IehdcVMzdAZJ2eV9bgyissQXHv5tGzA==",
+             "dev": true,
+             "license": "MIT",
+             "peer": true,
+@@ -5203,6 +6606,8 @@
+         },
+         "node_modules/electron-builder/node_modules/fs-extra": {
+             "version": "10.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
++            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5215,7 +6620,9 @@
+             }
+         },
+         "node_modules/electron-builder/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5227,6 +6634,8 @@
+         },
+         "node_modules/electron-builder/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -5235,6 +6644,8 @@
+         },
+         "node_modules/electron-devtools-installer": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/electron-devtools-installer/-/electron-devtools-installer-4.0.0.tgz",
++            "integrity": "sha512-9Tntu/jtfSn0n6N/ZI6IdvRqXpDyLQiDuuIbsBI+dL+1Ef7C8J2JwByw58P3TJiNeuqyV3ZkphpNWuZK5iSY2w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5243,6 +6654,8 @@
+         },
+         "node_modules/electron-log": {
+             "version": "5.4.3",
++            "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.4.3.tgz",
++            "integrity": "sha512-sOUsM3LjZdugatazSQ/XTyNcw8dfvH1SYhXWiJyfYodAAKOZdHs0txPiLDXFzOZbhXgAgshQkshH2ccq0feyLQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -5251,6 +6664,9 @@
+         },
+         "node_modules/electron-notarize": {
+             "version": "1.2.2",
++            "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.2.2.tgz",
++            "integrity": "sha512-ZStVWYcWI7g87/PgjPJSIIhwQXOaw4/XeXU+pWqMMktSLHaGMLHdyPPN7Cmao7+Cr7fYufA16npdtMndYciHNw==",
++            "deprecated": "Please use @electron/notarize moving forward.  There is no API change, just a package name change",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5263,6 +6679,8 @@
+         },
+         "node_modules/electron-notarize/node_modules/fs-extra": {
+             "version": "9.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
++            "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5276,7 +6694,9 @@
+             }
+         },
+         "node_modules/electron-notarize/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5288,6 +6708,8 @@
+         },
+         "node_modules/electron-notarize/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -5296,6 +6718,8 @@
+         },
+         "node_modules/electron-publish": {
+             "version": "26.8.1",
++            "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.8.1.tgz",
++            "integrity": "sha512-q+jrSTIh/Cv4eGZa7oVR+grEJo/FoLMYBAnSL5GCtqwUpr1T+VgKB/dn1pnzxIxqD8S/jP1yilT9VrwCqINR4w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5311,6 +6735,8 @@
+         },
+         "node_modules/electron-publish/node_modules/fs-extra": {
+             "version": "10.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
++            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5323,7 +6749,9 @@
+             }
+         },
+         "node_modules/electron-publish/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5335,6 +6763,8 @@
+         },
+         "node_modules/electron-publish/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -5342,11 +6772,15 @@
+             }
+         },
+         "node_modules/electron-to-chromium": {
+-            "version": "1.5.336",
++            "version": "1.5.343",
++            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.343.tgz",
++            "integrity": "sha512-YHnQ3MXI08icvL9ZKnEBy05F2EQ8ob01UaMOuMbM8l+4UcAq6MPPbBTJBbsBUg3H8JeZNt+O4fjsoWth3p6IFg==",
+             "license": "ISC"
+         },
+         "node_modules/electron-updater": {
+             "version": "6.8.3",
++            "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.8.3.tgz",
++            "integrity": "sha512-Z6sgw3jgbikWKXei1ENdqFOxBP0WlXg3TtKfz0rgw2vIZFJUyI4pD7ZN7jrkm7EoMK+tcm/qTnPUdqfZukBlBQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "builder-util-runtime": "9.5.1",
+@@ -5361,6 +6795,8 @@
+         },
+         "node_modules/electron-updater/node_modules/fs-extra": {
+             "version": "10.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
++            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "graceful-fs": "^4.2.0",
+@@ -5372,7 +6808,9 @@
+             }
+         },
+         "node_modules/electron-updater/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "license": "MIT",
+             "dependencies": {
+                 "universalify": "^2.0.0"
+@@ -5383,6 +6821,8 @@
+         },
+         "node_modules/electron-updater/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "license": "ISC",
+             "bin": {
+                 "semver": "bin/semver.js"
+@@ -5393,6 +6833,8 @@
+         },
+         "node_modules/electron-updater/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 10.0.0"
+@@ -5400,6 +6842,8 @@
+         },
+         "node_modules/electron-vite": {
+             "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/electron-vite/-/electron-vite-5.0.0.tgz",
++            "integrity": "sha512-OHp/vjdlubNlhNkPkL/+3JD34ii5ov7M0GpuXEVdQeqdQ3ulvVR7Dg/rNBLfS5XPIFwgoBLDf9sjjrL+CuDyRQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5428,6 +6872,8 @@
+         },
+         "node_modules/electron-winstaller": {
+             "version": "5.4.0",
++            "resolved": "https://registry.npmjs.org/electron-winstaller/-/electron-winstaller-5.4.0.tgz",
++            "integrity": "sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==",
+             "dev": true,
+             "hasInstallScript": true,
+             "license": "MIT",
+@@ -5448,6 +6894,8 @@
+         },
+         "node_modules/electron-winstaller/node_modules/fs-extra": {
+             "version": "7.0.1",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
++            "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+             "dev": true,
+             "license": "MIT",
+             "peer": true,
+@@ -5462,6 +6910,8 @@
+         },
+         "node_modules/electron/node_modules/@types/node": {
+             "version": "24.12.2",
++            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.2.tgz",
++            "integrity": "sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g==",
+             "license": "MIT",
+             "dependencies": {
+                 "undici-types": "~7.16.0"
+@@ -5469,23 +6919,21 @@
+         },
+         "node_modules/electron/node_modules/undici-types": {
+             "version": "7.16.0",
++            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
++            "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+             "license": "MIT"
+         },
+         "node_modules/emoji-regex": {
+             "version": "8.0.0",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
++            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
++            "devOptional": true,
+             "license": "MIT"
+         },
+-        "node_modules/encoding": {
+-            "version": "0.1.13",
+-            "license": "MIT",
+-            "optional": true,
+-            "dependencies": {
+-                "iconv-lite": "^0.6.2"
+-            }
+-        },
+         "node_modules/end-of-stream": {
+             "version": "1.4.5",
++            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
++            "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+             "license": "MIT",
+             "dependencies": {
+                 "once": "^1.4.0"
+@@ -5493,6 +6941,8 @@
+         },
+         "node_modules/entities": {
+             "version": "7.0.1",
++            "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
++            "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
+             "license": "BSD-2-Clause",
+             "engines": {
+                 "node": ">=0.12"
+@@ -5503,6 +6953,8 @@
+         },
+         "node_modules/env-paths": {
+             "version": "2.2.1",
++            "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
++            "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6"
+@@ -5510,11 +6962,15 @@
+         },
+         "node_modules/err-code": {
+             "version": "2.0.3",
++            "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
++            "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/error-ex": {
+             "version": "1.3.4",
++            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
++            "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5523,6 +6979,8 @@
+         },
+         "node_modules/es-define-property": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
++            "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 0.4"
+@@ -5530,6 +6988,8 @@
+         },
+         "node_modules/es-errors": {
+             "version": "1.3.0",
++            "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
++            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 0.4"
+@@ -5537,11 +6997,15 @@
+         },
+         "node_modules/es-module-lexer": {
+             "version": "1.7.0",
++            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
++            "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/es-object-atoms": {
+             "version": "1.1.1",
++            "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
++            "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+             "license": "MIT",
+             "dependencies": {
+                 "es-errors": "^1.3.0"
+@@ -5552,6 +7016,8 @@
+         },
+         "node_modules/es-set-tostringtag": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
++            "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+             "license": "MIT",
+             "dependencies": {
+                 "es-errors": "^1.3.0",
+@@ -5565,11 +7031,15 @@
+         },
+         "node_modules/es6-error": {
+             "version": "4.1.1",
++            "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
++            "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+             "license": "MIT",
+             "optional": true
+         },
+         "node_modules/esbuild": {
+             "version": "0.25.12",
++            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz",
++            "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
+             "hasInstallScript": true,
+             "license": "MIT",
+             "bin": {
+@@ -5609,6 +7079,8 @@
+         },
+         "node_modules/escalade": {
+             "version": "3.2.0",
++            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
++            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6"
+@@ -5616,6 +7088,8 @@
+         },
+         "node_modules/escape-string-regexp": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
++            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+             "devOptional": true,
+             "license": "MIT",
+             "engines": {
+@@ -5627,6 +7101,9 @@
+         },
+         "node_modules/eslint": {
+             "version": "8.57.1",
++            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
++            "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
++            "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5681,6 +7158,8 @@
+         },
+         "node_modules/eslint-config-prettier": {
+             "version": "9.1.2",
++            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.2.tgz",
++            "integrity": "sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ==",
+             "dev": true,
+             "license": "MIT",
+             "bin": {
+@@ -5692,6 +7171,8 @@
+         },
+         "node_modules/eslint-plugin-prettier": {
+             "version": "5.5.5",
++            "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.5.tgz",
++            "integrity": "sha512-hscXkbqUZ2sPithAuLm5MXL+Wph+U7wHngPBv9OMWwlP8iaflyxpjTYZkmdgB4/vPIhemRlBEoLrH7UC1n7aUw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5721,6 +7202,8 @@
+         },
+         "node_modules/eslint-plugin-vue": {
+             "version": "9.33.0",
++            "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.33.0.tgz",
++            "integrity": "sha512-174lJKuNsuDIlLpjeXc5E2Tss8P44uIimAfGD0b90k0NoirJqpG7stLuU9Vp/9ioTOrQdWVREc4mRd1BD+CvGw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5742,6 +7225,8 @@
+         },
+         "node_modules/eslint-plugin-vue/node_modules/postcss-selector-parser": {
+             "version": "6.1.2",
++            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
++            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5754,6 +7239,8 @@
+         },
+         "node_modules/eslint-plugin-vue/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -5765,6 +7252,8 @@
+         },
+         "node_modules/eslint-scope": {
+             "version": "7.2.2",
++            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
++            "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "dependencies": {
+@@ -5780,6 +7269,8 @@
+         },
+         "node_modules/eslint-visitor-keys": {
+             "version": "3.4.3",
++            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
++            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "engines": {
+@@ -5791,11 +7282,15 @@
+         },
+         "node_modules/eslint/node_modules/balanced-match": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/eslint/node_modules/brace-expansion": {
+             "version": "1.1.14",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5805,6 +7300,8 @@
+         },
+         "node_modules/eslint/node_modules/minimatch": {
+             "version": "3.1.5",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -5816,6 +7313,8 @@
+         },
+         "node_modules/espree": {
+             "version": "9.6.1",
++            "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
++            "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "dependencies": {
+@@ -5832,6 +7331,8 @@
+         },
+         "node_modules/esprima": {
+             "version": "4.0.1",
++            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
++            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "bin": {
+@@ -5844,6 +7345,8 @@
+         },
+         "node_modules/esquery": {
+             "version": "1.7.0",
++            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
++            "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==",
+             "dev": true,
+             "license": "BSD-3-Clause",
+             "dependencies": {
+@@ -5855,6 +7358,8 @@
+         },
+         "node_modules/esrecurse": {
+             "version": "4.3.0",
++            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
++            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "dependencies": {
+@@ -5866,6 +7371,8 @@
+         },
+         "node_modules/estraverse": {
+             "version": "5.3.0",
++            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
++            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "engines": {
+@@ -5874,6 +7381,8 @@
+         },
+         "node_modules/estree-walker": {
+             "version": "3.0.3",
++            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
++            "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -5882,6 +7391,8 @@
+         },
+         "node_modules/esutils": {
+             "version": "2.0.3",
++            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
++            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "engines": {
+@@ -5890,6 +7401,8 @@
+         },
+         "node_modules/event-stream": {
+             "version": "3.3.4",
++            "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
++            "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
+             "license": "MIT",
+             "dependencies": {
+                 "duplexer": "~0.1.1",
+@@ -5903,6 +7416,8 @@
+         },
+         "node_modules/expand-template": {
+             "version": "2.0.3",
++            "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
++            "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+             "license": "(MIT OR WTFPL)",
+             "engines": {
+                 "node": ">=6"
+@@ -5910,6 +7425,8 @@
+         },
+         "node_modules/expect-type": {
+             "version": "1.3.0",
++            "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
++            "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "engines": {
+@@ -5918,15 +7435,28 @@
+         },
+         "node_modules/exponential-backoff": {
+             "version": "3.1.3",
++            "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz",
++            "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==",
+             "dev": true,
+             "license": "Apache-2.0"
+         },
+         "node_modules/exsolve": {
+             "version": "1.0.8",
++            "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.8.tgz",
++            "integrity": "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==",
+             "license": "MIT"
+         },
++        "node_modules/extend": {
++            "version": "3.0.2",
++            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
++            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
++            "license": "MIT",
++            "optional": true
++        },
+         "node_modules/extract-zip": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
++            "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+             "license": "BSD-2-Clause",
+             "dependencies": {
+                 "debug": "^4.1.1",
+@@ -5945,6 +7475,8 @@
+         },
+         "node_modules/extsprintf": {
+             "version": "1.4.1",
++            "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
++            "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
+             "dev": true,
+             "engines": [
+                 "node >=0.6.0"
+@@ -5954,15 +7486,21 @@
+         },
+         "node_modules/fast-deep-equal": {
+             "version": "3.1.3",
++            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
++            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+             "license": "MIT"
+         },
+         "node_modules/fast-diff": {
+             "version": "1.3.0",
++            "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
++            "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+             "dev": true,
+             "license": "Apache-2.0"
+         },
+         "node_modules/fast-glob": {
+             "version": "3.3.3",
++            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
++            "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+             "license": "MIT",
+             "dependencies": {
+                 "@nodelib/fs.stat": "^2.0.2",
+@@ -5977,6 +7515,8 @@
+         },
+         "node_modules/fast-glob/node_modules/glob-parent": {
+             "version": "5.1.2",
++            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
++            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+             "license": "ISC",
+             "dependencies": {
+                 "is-glob": "^4.0.1"
+@@ -5987,16 +7527,22 @@
+         },
+         "node_modules/fast-json-stable-stringify": {
+             "version": "2.1.0",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
++            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
++            "devOptional": true,
+             "license": "MIT"
+         },
+         "node_modules/fast-levenshtein": {
+             "version": "2.0.6",
++            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
++            "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/fastq": {
+             "version": "1.20.1",
++            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
++            "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
+             "license": "ISC",
+             "dependencies": {
+                 "reusify": "^1.0.4"
+@@ -6004,6 +7550,8 @@
+         },
+         "node_modules/fd-slicer": {
+             "version": "1.1.0",
++            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
++            "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+             "license": "MIT",
+             "dependencies": {
+                 "pend": "~1.2.0"
+@@ -6011,6 +7559,8 @@
+         },
+         "node_modules/file-entry-cache": {
+             "version": "6.0.1",
++            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
++            "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -6022,10 +7572,14 @@
+         },
+         "node_modules/file-uri-to-path": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
++            "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+             "license": "MIT"
+         },
+         "node_modules/filelist": {
+             "version": "1.0.6",
++            "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.6.tgz",
++            "integrity": "sha512-5giy2PkLYY1cP39p17Ech+2xlpTRL9HLspOfEgm0L6CwBXBTgsK5ou0JtzYuepxkaQ/tvhCFIJ5uXo0OrM2DxA==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "dependencies": {
+@@ -6034,11 +7588,15 @@
+         },
+         "node_modules/filelist/node_modules/balanced-match": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/filelist/node_modules/brace-expansion": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
++            "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -6047,6 +7605,8 @@
+         },
+         "node_modules/filelist/node_modules/minimatch": {
+             "version": "5.1.9",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
++            "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -6058,6 +7618,8 @@
+         },
+         "node_modules/fill-range": {
+             "version": "7.1.1",
++            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
++            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+             "license": "MIT",
+             "dependencies": {
+                 "to-regex-range": "^5.0.1"
+@@ -6068,6 +7630,8 @@
+         },
+         "node_modules/find-up": {
+             "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
++            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+             "license": "MIT",
+             "dependencies": {
+                 "locate-path": "^6.0.0",
+@@ -6082,6 +7646,8 @@
+         },
+         "node_modules/flat-cache": {
+             "version": "3.2.0",
++            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
++            "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -6095,11 +7661,15 @@
+         },
+         "node_modules/flatted": {
+             "version": "3.4.2",
++            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
++            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+             "dev": true,
+             "license": "ISC"
+         },
+         "node_modules/focus-trap": {
+             "version": "8.0.1",
++            "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-8.0.1.tgz",
++            "integrity": "sha512-9ptSG6z51YQOstI/oN4XuVGP/03u2nh0g//qz7L6zX0i6PZiPnkcf3GenXq7N2hZnASXaMxTPpbKwdI+PFvxlw==",
+             "license": "MIT",
+             "peer": true,
+             "dependencies": {
+@@ -6108,6 +7678,8 @@
+         },
+         "node_modules/follow-redirects": {
+             "version": "1.16.0",
++            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
++            "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
+             "funding": [
+                 {
+                     "type": "individual",
+@@ -6124,34 +7696,20 @@
+                 }
+             }
+         },
+-        "node_modules/foreground-child": {
+-            "version": "3.3.1",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "cross-spawn": "^7.0.6",
+-                "signal-exit": "^4.0.1"
+-            },
+-            "engines": {
+-                "node": ">=14"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/isaacs"
+-            }
+-        },
+-        "node_modules/foreground-child/node_modules/signal-exit": {
+-            "version": "4.1.0",
+-            "dev": true,
+-            "license": "ISC",
++        "node_modules/forever-agent": {
++            "version": "0.6.1",
++            "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
++            "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
++            "license": "Apache-2.0",
++            "optional": true,
+             "engines": {
+-                "node": ">=14"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/isaacs"
++                "node": "*"
+             }
+         },
+         "node_modules/form-data": {
+             "version": "4.0.5",
++            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
++            "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+             "license": "MIT",
+             "dependencies": {
+                 "asynckit": "^0.4.0",
+@@ -6166,10 +7724,14 @@
+         },
+         "node_modules/forwarded-parse": {
+             "version": "2.1.2",
++            "resolved": "https://registry.npmjs.org/forwarded-parse/-/forwarded-parse-2.1.2.tgz",
++            "integrity": "sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==",
+             "license": "MIT"
+         },
+         "node_modules/fraction.js": {
+             "version": "5.3.4",
++            "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
++            "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -6182,14 +7744,20 @@
+         },
+         "node_modules/from": {
+             "version": "0.1.7",
++            "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
++            "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
+             "license": "MIT"
+         },
+         "node_modules/fs-constants": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
++            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+             "license": "MIT"
+         },
+         "node_modules/fs-extra": {
+             "version": "8.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
++            "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+             "license": "MIT",
+             "dependencies": {
+                 "graceful-fs": "^4.2.0",
+@@ -6201,23 +7769,50 @@
+             }
+         },
+         "node_modules/fs-minipass": {
+-            "version": "3.0.3",
+-            "dev": true,
++            "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
++            "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "minipass": "^3.0.0"
++            },
++            "engines": {
++                "node": ">= 8"
++            }
++        },
++        "node_modules/fs-minipass/node_modules/minipass": {
++            "version": "3.3.6",
++            "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++            "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+             "license": "ISC",
++            "optional": true,
+             "dependencies": {
+-                "minipass": "^7.0.3"
++                "yallist": "^4.0.0"
+             },
+             "engines": {
+-                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
++                "node": ">=8"
+             }
+         },
++        "node_modules/fs-minipass/node_modules/yallist": {
++            "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
++            "license": "ISC",
++            "optional": true
++        },
+         "node_modules/fs.realpath": {
+             "version": "1.0.0",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
++            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
++            "devOptional": true,
+             "license": "ISC"
+         },
+         "node_modules/fsevents": {
+             "version": "2.3.2",
++            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
++            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
++            "hasInstallScript": true,
+             "license": "MIT",
+             "optional": true,
+             "os": [
+@@ -6229,13 +7824,86 @@
+         },
+         "node_modules/function-bind": {
+             "version": "1.1.2",
++            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
++            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+             "license": "MIT",
+             "funding": {
+                 "url": "https://github.com/sponsors/ljharb"
+             }
+         },
++        "node_modules/gauge": {
++            "version": "2.7.4",
++            "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
++            "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
++            "deprecated": "This package is no longer supported.",
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "aproba": "^1.0.3",
++                "console-control-strings": "^1.0.0",
++                "has-unicode": "^2.0.0",
++                "object-assign": "^4.1.0",
++                "signal-exit": "^3.0.0",
++                "string-width": "^1.0.1",
++                "strip-ansi": "^3.0.1",
++                "wide-align": "^1.1.0"
++            }
++        },
++        "node_modules/gauge/node_modules/ansi-regex": {
++            "version": "2.1.1",
++            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
++            "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
++            "license": "MIT",
++            "optional": true,
++            "engines": {
++                "node": ">=0.10.0"
++            }
++        },
++        "node_modules/gauge/node_modules/is-fullwidth-code-point": {
++            "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
++            "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "number-is-nan": "^1.0.0"
++            },
++            "engines": {
++                "node": ">=0.10.0"
++            }
++        },
++        "node_modules/gauge/node_modules/string-width": {
++            "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
++            "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "code-point-at": "^1.0.0",
++                "is-fullwidth-code-point": "^1.0.0",
++                "strip-ansi": "^3.0.0"
++            },
++            "engines": {
++                "node": ">=0.10.0"
++            }
++        },
++        "node_modules/gauge/node_modules/strip-ansi": {
++            "version": "3.0.1",
++            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
++            "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "ansi-regex": "^2.0.0"
++            },
++            "engines": {
++                "node": ">=0.10.0"
++            }
++        },
+         "node_modules/gensync": {
+             "version": "1.0.0-beta.2",
++            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
++            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6.9.0"
+@@ -6243,6 +7911,8 @@
+         },
+         "node_modules/get-caller-file": {
+             "version": "2.0.5",
++            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
++            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+             "dev": true,
+             "license": "ISC",
+             "engines": {
+@@ -6251,6 +7921,8 @@
+         },
+         "node_modules/get-intrinsic": {
+             "version": "1.3.0",
++            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
++            "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "call-bind-apply-helpers": "^1.0.2",
+@@ -6273,6 +7945,8 @@
+         },
+         "node_modules/get-proto": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
++            "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+             "license": "MIT",
+             "dependencies": {
+                 "dunder-proto": "^1.0.1",
+@@ -6284,6 +7958,8 @@
+         },
+         "node_modules/get-stream": {
+             "version": "5.2.0",
++            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
++            "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+             "license": "MIT",
+             "dependencies": {
+                 "pump": "^3.0.0"
+@@ -6296,7 +7972,9 @@
+             }
+         },
+         "node_modules/get-tsconfig": {
+-            "version": "4.13.7",
++            "version": "4.14.0",
++            "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.0.tgz",
++            "integrity": "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==",
+             "devOptional": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -6306,12 +7984,26 @@
+                 "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+             }
+         },
++        "node_modules/getpass": {
++            "version": "0.1.7",
++            "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
++            "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "assert-plus": "^1.0.0"
++            }
++        },
+         "node_modules/github-from-package": {
+             "version": "0.0.0",
++            "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
++            "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
+             "license": "MIT"
+         },
+         "node_modules/glob": {
+             "version": "13.0.6",
++            "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
++            "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
+             "license": "BlueOak-1.0.0",
+             "dependencies": {
+                 "minimatch": "^10.2.2",
+@@ -6327,6 +8019,8 @@
+         },
+         "node_modules/glob-parent": {
+             "version": "6.0.2",
++            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
++            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+             "license": "ISC",
+             "dependencies": {
+                 "is-glob": "^4.0.3"
+@@ -6337,6 +8031,8 @@
+         },
+         "node_modules/global-agent": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
++            "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
+             "license": "BSD-3-Clause",
+             "optional": true,
+             "dependencies": {
+@@ -6353,6 +8049,8 @@
+         },
+         "node_modules/global-agent/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "license": "ISC",
+             "optional": true,
+             "bin": {
+@@ -6364,6 +8062,8 @@
+         },
+         "node_modules/globals": {
+             "version": "13.24.0",
++            "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
++            "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -6378,6 +8078,8 @@
+         },
+         "node_modules/globalthis": {
+             "version": "1.0.4",
++            "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
++            "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+             "license": "MIT",
+             "optional": true,
+             "dependencies": {
+@@ -6393,6 +8095,8 @@
+         },
+         "node_modules/globby": {
+             "version": "11.1.0",
++            "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
++            "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -6412,6 +8116,8 @@
+         },
+         "node_modules/gopd": {
+             "version": "1.2.0",
++            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
++            "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 0.4"
+@@ -6422,6 +8128,8 @@
+         },
+         "node_modules/got": {
+             "version": "11.8.6",
++            "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
++            "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+             "license": "MIT",
+             "dependencies": {
+                 "@sindresorhus/is": "^4.0.0",
+@@ -6445,15 +8153,46 @@
+         },
+         "node_modules/graceful-fs": {
+             "version": "4.2.11",
++            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
++            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+             "license": "ISC"
+         },
+         "node_modules/graphemer": {
+             "version": "1.4.0",
++            "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
++            "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+             "dev": true,
+             "license": "MIT"
+         },
++        "node_modules/har-schema": {
++            "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
++            "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
++            "license": "ISC",
++            "optional": true,
++            "engines": {
++                "node": ">=4"
++            }
++        },
++        "node_modules/har-validator": {
++            "version": "5.1.5",
++            "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
++            "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
++            "deprecated": "this library is no longer supported",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "ajv": "^6.12.3",
++                "har-schema": "^2.0.0"
++            },
++            "engines": {
++                "node": ">=6"
++            }
++        },
+         "node_modules/has-flag": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
++            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -6462,6 +8201,8 @@
+         },
+         "node_modules/has-property-descriptors": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
++            "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+             "license": "MIT",
+             "optional": true,
+             "dependencies": {
+@@ -6473,6 +8214,8 @@
+         },
+         "node_modules/has-symbols": {
+             "version": "1.1.0",
++            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
++            "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 0.4"
+@@ -6483,6 +8226,8 @@
+         },
+         "node_modules/has-tostringtag": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
++            "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+             "license": "MIT",
+             "dependencies": {
+                 "has-symbols": "^1.0.3"
+@@ -6494,8 +8239,17 @@
+                 "url": "https://github.com/sponsors/ljharb"
+             }
+         },
++        "node_modules/has-unicode": {
++            "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
++            "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
++            "license": "ISC",
++            "optional": true
++        },
+         "node_modules/hasown": {
+-            "version": "2.0.2",
++            "version": "2.0.3",
++            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz",
++            "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==",
+             "license": "MIT",
+             "dependencies": {
+                 "function-bind": "^1.1.2"
+@@ -6506,6 +8260,8 @@
+         },
+         "node_modules/hexy": {
+             "version": "0.2.11",
++            "resolved": "https://registry.npmjs.org/hexy/-/hexy-0.2.11.tgz",
++            "integrity": "sha512-ciq6hFsSG/Bpt2DmrZJtv+56zpPdnq+NQ4ijEFrveKN0ZG1mhl/LdT1NQZ9se6ty1fACcI4d4vYqC9v8EYpH2A==",
+             "license": "MIT",
+             "bin": {
+                 "hexy": "bin/hexy_cmd.js"
+@@ -6513,10 +8269,14 @@
+         },
+         "node_modules/hookable": {
+             "version": "5.5.3",
++            "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
++            "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
+             "license": "MIT"
+         },
+         "node_modules/hosted-git-info": {
+             "version": "4.1.0",
++            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
++            "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -6528,6 +8288,8 @@
+         },
+         "node_modules/hosted-git-info/node_modules/lru-cache": {
+             "version": "6.0.0",
++            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
++            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+@@ -6539,15 +8301,21 @@
+         },
+         "node_modules/hosted-git-info/node_modules/yallist": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+             "dev": true,
+             "license": "ISC"
+         },
+         "node_modules/http-cache-semantics": {
+             "version": "4.2.0",
++            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
++            "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
+             "license": "BSD-2-Clause"
+         },
+         "node_modules/http-proxy-agent": {
+             "version": "7.0.2",
++            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
++            "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -6558,8 +8326,26 @@
+                 "node": ">= 14"
+             }
+         },
++        "node_modules/http-signature": {
++            "version": "1.2.0",
++            "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
++            "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "assert-plus": "^1.0.0",
++                "jsprim": "^1.2.2",
++                "sshpk": "^1.7.0"
++            },
++            "engines": {
++                "node": ">=0.8",
++                "npm": ">=1.3.7"
++            }
++        },
+         "node_modules/http2-wrapper": {
+             "version": "1.0.3",
++            "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
++            "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+             "license": "MIT",
+             "dependencies": {
+                 "quick-lru": "^5.1.1",
+@@ -6571,6 +8357,8 @@
+         },
+         "node_modules/https-proxy-agent": {
+             "version": "5.0.1",
++            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
++            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+             "license": "MIT",
+             "dependencies": {
+                 "agent-base": "6",
+@@ -6582,6 +8370,8 @@
+         },
+         "node_modules/https-proxy-agent/node_modules/agent-base": {
+             "version": "6.0.2",
++            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
++            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "debug": "4"
+@@ -6592,6 +8382,8 @@
+         },
+         "node_modules/iconv-corefoundation": {
+             "version": "1.1.7",
++            "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz",
++            "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -6608,7 +8400,9 @@
+         },
+         "node_modules/iconv-lite": {
+             "version": "0.6.3",
+-            "devOptional": true,
++            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
++            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
++            "dev": true,
+             "license": "MIT",
+             "dependencies": {
+                 "safer-buffer": ">= 2.1.2 < 3.0.0"
+@@ -6619,6 +8413,8 @@
+         },
+         "node_modules/ieee754": {
+             "version": "1.2.1",
++            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
++            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+             "funding": [
+                 {
+                     "type": "github",
+@@ -6637,6 +8433,8 @@
+         },
+         "node_modules/ignore": {
+             "version": "5.3.2",
++            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
++            "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -6645,11 +8443,15 @@
+         },
+         "node_modules/immediate": {
+             "version": "3.0.6",
++            "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
++            "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/import-fresh": {
+             "version": "3.3.1",
++            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
++            "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -6665,6 +8467,8 @@
+         },
+         "node_modules/import-in-the-middle": {
+             "version": "3.0.1",
++            "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-3.0.1.tgz",
++            "integrity": "sha512-pYkiyXVL2Mf3pozdlDGV6NAObxQx13Ae8knZk1UJRJ6uRW/ZRmTGHlQYtrsSl7ubuE5F8CD1z+s1n4RHNuTtuA==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "acorn": "^8.15.0",
+@@ -6678,6 +8482,8 @@
+         },
+         "node_modules/imurmurhash": {
+             "version": "0.1.4",
++            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
++            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -6686,7 +8492,10 @@
+         },
+         "node_modules/inflight": {
+             "version": "1.0.6",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
++            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
++            "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
++            "devOptional": true,
+             "license": "ISC",
+             "dependencies": {
+                 "once": "^1.3.0",
+@@ -6695,27 +8504,27 @@
+         },
+         "node_modules/inherits": {
+             "version": "2.0.4",
++            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
++            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+             "license": "ISC"
+         },
+         "node_modules/ini": {
+             "version": "1.3.8",
++            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
++            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+             "license": "ISC"
+         },
+-        "node_modules/ip-address": {
+-            "version": "10.1.0",
+-            "dev": true,
+-            "license": "MIT",
+-            "engines": {
+-                "node": ">= 12"
+-            }
+-        },
+         "node_modules/is-arrayish": {
+             "version": "0.2.1",
++            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
++            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/is-binary-path": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
++            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+             "license": "MIT",
+             "dependencies": {
+                 "binary-extensions": "^2.0.0"
+@@ -6726,6 +8535,8 @@
+         },
+         "node_modules/is-core-module": {
+             "version": "2.16.1",
++            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
++            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+             "license": "MIT",
+             "dependencies": {
+                 "hasown": "^2.0.2"
+@@ -6739,6 +8550,8 @@
+         },
+         "node_modules/is-extglob": {
+             "version": "2.1.1",
++            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
++            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.10.0"
+@@ -6746,7 +8559,9 @@
+         },
+         "node_modules/is-fullwidth-code-point": {
+             "version": "3.0.0",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
++            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
++            "devOptional": true,
+             "license": "MIT",
+             "engines": {
+                 "node": ">=8"
+@@ -6754,6 +8569,8 @@
+         },
+         "node_modules/is-glob": {
+             "version": "4.0.3",
++            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
++            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+             "license": "MIT",
+             "dependencies": {
+                 "is-extglob": "^2.1.1"
+@@ -6762,16 +8579,10 @@
+                 "node": ">=0.10.0"
+             }
+         },
+-        "node_modules/is-interactive": {
+-            "version": "1.0.0",
+-            "dev": true,
+-            "license": "MIT",
+-            "engines": {
+-                "node": ">=8"
+-            }
+-        },
+         "node_modules/is-number": {
+             "version": "7.0.0",
++            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
++            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.12.0"
+@@ -6779,25 +8590,25 @@
+         },
+         "node_modules/is-path-inside": {
+             "version": "3.0.3",
++            "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
++            "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+                 "node": ">=8"
+             }
+         },
+-        "node_modules/is-unicode-supported": {
+-            "version": "0.1.0",
+-            "dev": true,
++        "node_modules/is-typedarray": {
++            "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
++            "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+             "license": "MIT",
+-            "engines": {
+-                "node": ">=10"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/sindresorhus"
+-            }
++            "optional": true
+         },
+         "node_modules/is-what": {
+             "version": "5.5.0",
++            "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",
++            "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=18"
+@@ -6808,11 +8619,15 @@
+         },
+         "node_modules/isarray": {
+             "version": "1.0.0",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
++            "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
++            "devOptional": true,
+             "license": "MIT"
+         },
+         "node_modules/isbinaryfile": {
+             "version": "5.0.7",
++            "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.7.tgz",
++            "integrity": "sha512-gnWD14Jh3FzS3CPhF0AxNOJ8CxqeblPTADzI38r0wt8ZyQl5edpy75myt08EG2oKvpyiqSqsx+Wkz9vtkbTqYQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -6824,24 +8639,21 @@
+         },
+         "node_modules/isexe": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
++            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+             "license": "ISC"
+         },
+-        "node_modules/jackspeak": {
+-            "version": "3.4.3",
+-            "dev": true,
+-            "license": "BlueOak-1.0.0",
+-            "dependencies": {
+-                "@isaacs/cliui": "^8.0.2"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/isaacs"
+-            },
+-            "optionalDependencies": {
+-                "@pkgjs/parseargs": "^0.11.0"
+-            }
++        "node_modules/isstream": {
++            "version": "0.1.2",
++            "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
++            "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
++            "license": "MIT",
++            "optional": true
+         },
+         "node_modules/jake": {
+             "version": "10.9.4",
++            "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
++            "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "dependencies": {
+@@ -6858,6 +8670,8 @@
+         },
+         "node_modules/jiti": {
+             "version": "2.6.1",
++            "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
++            "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
+             "devOptional": true,
+             "license": "MIT",
+             "bin": {
+@@ -6866,10 +8680,14 @@
+         },
+         "node_modules/js-tokens": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
++            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+             "license": "MIT"
+         },
+         "node_modules/js-yaml": {
+             "version": "4.1.1",
++            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
++            "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+             "license": "MIT",
+             "dependencies": {
+                 "argparse": "^2.0.1"
+@@ -6879,10 +8697,21 @@
+             }
+         },
+         "node_modules/jsbi": {
+-            "version": "2.0.5"
++            "version": "2.0.5",
++            "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-2.0.5.tgz",
++            "integrity": "sha512-TzO/62Hxeb26QMb4IGlI/5X+QLr9Uqp1FPkwp2+KOICW+Q+vSuFj61c8pkT6wAns4WcK56X7CmSHhJeDGWOqxQ=="
++        },
++        "node_modules/jsbn": {
++            "version": "0.1.1",
++            "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
++            "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
++            "license": "MIT",
++            "optional": true
+         },
+         "node_modules/jsesc": {
+             "version": "3.1.0",
++            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
++            "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+             "license": "MIT",
+             "bin": {
+                 "jsesc": "bin/jsesc"
+@@ -6893,30 +8722,49 @@
+         },
+         "node_modules/json-buffer": {
+             "version": "3.0.1",
++            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
++            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+             "license": "MIT"
+         },
+         "node_modules/json-parse-even-better-errors": {
+             "version": "2.3.1",
++            "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
++            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+             "dev": true,
+             "license": "MIT"
+         },
++        "node_modules/json-schema": {
++            "version": "0.4.0",
++            "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
++            "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
++            "license": "(AFL-2.1 OR BSD-3-Clause)",
++            "optional": true
++        },
+         "node_modules/json-schema-traverse": {
+             "version": "0.4.1",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
++            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
++            "devOptional": true,
+             "license": "MIT"
+         },
+         "node_modules/json-stable-stringify-without-jsonify": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
++            "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/json-stringify-safe": {
+             "version": "5.0.1",
++            "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
++            "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+             "license": "ISC",
+             "optional": true
+         },
+         "node_modules/json5": {
+             "version": "2.2.3",
++            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
++            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+             "license": "MIT",
+             "bin": {
+                 "json5": "lib/cli.js"
+@@ -6927,29 +8775,76 @@
+         },
+         "node_modules/jsonfile": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
++            "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+             "license": "MIT",
+             "optionalDependencies": {
+                 "graceful-fs": "^4.1.6"
+             }
+         },
+-        "node_modules/jszip": {
+-            "version": "3.10.1",
+-            "dev": true,
+-            "license": "(MIT OR GPL-3.0-or-later)",
++        "node_modules/jsprim": {
++            "version": "1.4.2",
++            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
++            "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
++            "license": "MIT",
++            "optional": true,
+             "dependencies": {
+-                "lie": "~3.3.0",
+-                "pako": "~1.0.2",
+-                "readable-stream": "~2.3.6",
+-                "setimmediate": "^1.0.5"
++                "assert-plus": "1.0.0",
++                "extsprintf": "1.3.0",
++                "json-schema": "0.4.0",
++                "verror": "1.10.0"
++            },
++            "engines": {
++                "node": ">=0.6.0"
+             }
+         },
+-        "node_modules/jszip/node_modules/readable-stream": {
+-            "version": "2.3.8",
+-            "dev": true,
++        "node_modules/jsprim/node_modules/extsprintf": {
++            "version": "1.3.0",
++            "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
++            "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
++            "engines": [
++                "node >=0.6.0"
++            ],
+             "license": "MIT",
+-            "dependencies": {
+-                "core-util-is": "~1.0.0",
+-                "inherits": "~2.0.3",
++            "optional": true
++        },
++        "node_modules/jsprim/node_modules/verror": {
++            "version": "1.10.0",
++            "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
++            "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
++            "engines": [
++                "node >=0.6.0"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "assert-plus": "^1.0.0",
++                "core-util-is": "1.0.2",
++                "extsprintf": "^1.2.0"
++            }
++        },
++        "node_modules/jszip": {
++            "version": "3.10.1",
++            "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
++            "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
++            "dev": true,
++            "license": "(MIT OR GPL-3.0-or-later)",
++            "dependencies": {
++                "lie": "~3.3.0",
++                "pako": "~1.0.2",
++                "readable-stream": "~2.3.6",
++                "setimmediate": "^1.0.5"
++            }
++        },
++        "node_modules/jszip/node_modules/readable-stream": {
++            "version": "2.3.8",
++            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
++            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
++            "dev": true,
++            "license": "MIT",
++            "dependencies": {
++                "core-util-is": "~1.0.0",
++                "inherits": "~2.0.3",
+                 "isarray": "~1.0.0",
+                 "process-nextick-args": "~2.0.0",
+                 "safe-buffer": "~5.1.1",
+@@ -6959,11 +8854,15 @@
+         },
+         "node_modules/jszip/node_modules/safe-buffer": {
+             "version": "5.1.2",
++            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
++            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/jszip/node_modules/string_decoder": {
+             "version": "1.1.1",
++            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
++            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -6972,6 +8871,8 @@
+         },
+         "node_modules/keyv": {
+             "version": "4.5.4",
++            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
++            "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+             "license": "MIT",
+             "dependencies": {
+                 "json-buffer": "3.0.1"
+@@ -6979,10 +8880,14 @@
+         },
+         "node_modules/lazy-val": {
+             "version": "1.0.5",
++            "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
++            "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==",
+             "license": "MIT"
+         },
+         "node_modules/levn": {
+             "version": "0.4.1",
++            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
++            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -6995,6 +8900,8 @@
+         },
+         "node_modules/lie": {
+             "version": "3.3.0",
++            "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
++            "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -7003,6 +8910,8 @@
+         },
+         "node_modules/lilconfig": {
+             "version": "3.1.3",
++            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
++            "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=14"
+@@ -7013,10 +8922,14 @@
+         },
+         "node_modules/lines-and-columns": {
+             "version": "1.2.4",
++            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
++            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+             "license": "MIT"
+         },
+         "node_modules/local-pkg": {
+             "version": "1.1.2",
++            "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.1.2.tgz",
++            "integrity": "sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==",
+             "license": "MIT",
+             "dependencies": {
+                 "mlly": "^1.7.4",
+@@ -7032,6 +8945,8 @@
+         },
+         "node_modules/locate-path": {
+             "version": "6.0.0",
++            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
++            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+             "license": "MIT",
+             "dependencies": {
+                 "p-locate": "^5.0.0"
+@@ -7045,48 +8960,48 @@
+         },
+         "node_modules/lodash": {
+             "version": "4.18.1",
++            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
++            "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/lodash.escaperegexp": {
+             "version": "4.1.2",
++            "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
++            "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==",
+             "license": "MIT"
+         },
+         "node_modules/lodash.isequal": {
+             "version": "4.5.0",
++            "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
++            "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
++            "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.",
+             "license": "MIT"
+         },
+         "node_modules/lodash.merge": {
+             "version": "4.6.2",
++            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
++            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+             "dev": true,
+             "license": "MIT"
+         },
+-        "node_modules/log-symbols": {
+-            "version": "4.1.0",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "chalk": "^4.1.0",
+-                "is-unicode-supported": "^0.1.0"
+-            },
+-            "engines": {
+-                "node": ">=10"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/sindresorhus"
+-            }
+-        },
+         "node_modules/long": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
++            "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==",
+             "license": "Apache-2.0"
+         },
+         "node_modules/loupe": {
+             "version": "3.2.1",
++            "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz",
++            "integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/lowercase-keys": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
++            "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=8"
+@@ -7094,6 +9009,8 @@
+         },
+         "node_modules/lru-cache": {
+             "version": "5.1.1",
++            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
++            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+             "license": "ISC",
+             "dependencies": {
+                 "yallist": "^3.0.2"
+@@ -7101,6 +9018,8 @@
+         },
+         "node_modules/lucide-vue-next": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/lucide-vue-next/-/lucide-vue-next-1.0.0.tgz",
++            "integrity": "sha512-V6SPvx1IHTj/UY+FrIYWV5faISsPSb8BnWSFDxAtezWKvWc9ZZ40PDrdu1/Qb5vg4lHWr1hs1BAMGVGm6V1Xdg==",
+             "license": "ISC",
+             "peer": true,
+             "peerDependencies": {
+@@ -7109,6 +9028,8 @@
+         },
+         "node_modules/magic-string": {
+             "version": "0.30.21",
++            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
++            "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@jridgewell/sourcemap-codec": "^1.5.5"
+@@ -7116,6 +9037,8 @@
+         },
+         "node_modules/magic-string-ast": {
+             "version": "1.0.3",
++            "resolved": "https://registry.npmjs.org/magic-string-ast/-/magic-string-ast-1.0.3.tgz",
++            "integrity": "sha512-CvkkH1i81zl7mmb94DsRiFeG9V2fR2JeuK8yDgS8oiZSFa++wWLEgZ5ufEOyLHbvSbD1gTRKv9NdX69Rnvr9JA==",
+             "license": "MIT",
+             "dependencies": {
+                 "magic-string": "^0.30.19"
+@@ -7127,32 +9050,15 @@
+                 "url": "https://github.com/sponsors/sxzz"
+             }
+         },
+-        "node_modules/make-fetch-happen": {
+-            "version": "14.0.3",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "@npmcli/agent": "^3.0.0",
+-                "cacache": "^19.0.1",
+-                "http-cache-semantics": "^4.1.1",
+-                "minipass": "^7.0.2",
+-                "minipass-fetch": "^4.0.0",
+-                "minipass-flush": "^1.0.5",
+-                "minipass-pipeline": "^1.2.4",
+-                "negotiator": "^1.0.0",
+-                "proc-log": "^5.0.0",
+-                "promise-retry": "^2.0.1",
+-                "ssri": "^12.0.0"
+-            },
+-            "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
+-            }
+-        },
+         "node_modules/map-stream": {
+-            "version": "0.1.0"
++            "version": "0.1.0",
++            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
++            "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="
+         },
+         "node_modules/matcher": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
++            "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
+             "license": "MIT",
+             "optional": true,
+             "dependencies": {
+@@ -7164,6 +9070,8 @@
+         },
+         "node_modules/math-intrinsics": {
+             "version": "1.1.0",
++            "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
++            "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 0.4"
+@@ -7171,6 +9079,8 @@
+         },
+         "node_modules/merge2": {
+             "version": "1.4.1",
++            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
++            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 8"
+@@ -7178,6 +9088,8 @@
+         },
+         "node_modules/micromatch": {
+             "version": "4.0.8",
++            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
++            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+             "license": "MIT",
+             "dependencies": {
+                 "braces": "^3.0.3",
+@@ -7189,6 +9101,8 @@
+         },
+         "node_modules/mime": {
+             "version": "2.6.0",
++            "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
++            "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+             "dev": true,
+             "license": "MIT",
+             "bin": {
+@@ -7200,6 +9114,8 @@
+         },
+         "node_modules/mime-db": {
+             "version": "1.52.0",
++            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
++            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 0.6"
+@@ -7207,6 +9123,8 @@
+         },
+         "node_modules/mime-types": {
+             "version": "2.1.35",
++            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
++            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+             "license": "MIT",
+             "dependencies": {
+                 "mime-db": "1.52.0"
+@@ -7215,16 +9133,10 @@
+                 "node": ">= 0.6"
+             }
+         },
+-        "node_modules/mimic-fn": {
+-            "version": "2.1.0",
+-            "dev": true,
+-            "license": "MIT",
+-            "engines": {
+-                "node": ">=6"
+-            }
+-        },
+         "node_modules/mimic-response": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
++            "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=4"
+@@ -7232,6 +9144,8 @@
+         },
+         "node_modules/mini-svg-data-uri": {
+             "version": "1.4.4",
++            "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz",
++            "integrity": "sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==",
+             "dev": true,
+             "license": "MIT",
+             "bin": {
+@@ -7240,6 +9154,8 @@
+         },
+         "node_modules/minimatch": {
+             "version": "10.2.5",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
++            "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+             "license": "BlueOak-1.0.0",
+             "dependencies": {
+                 "brace-expansion": "^5.0.5"
+@@ -7253,6 +9169,8 @@
+         },
+         "node_modules/minimist": {
+             "version": "1.2.8",
++            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
++            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+             "license": "MIT",
+             "funding": {
+                 "url": "https://github.com/sponsors/ljharb"
+@@ -7260,121 +9178,17 @@
+         },
+         "node_modules/minipass": {
+             "version": "7.1.3",
++            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
++            "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+             "license": "BlueOak-1.0.0",
+             "engines": {
+                 "node": ">=16 || 14 >=14.17"
+             }
+         },
+-        "node_modules/minipass-collect": {
+-            "version": "2.0.1",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "minipass": "^7.0.3"
+-            },
+-            "engines": {
+-                "node": ">=16 || 14 >=14.17"
+-            }
+-        },
+-        "node_modules/minipass-fetch": {
+-            "version": "4.0.1",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "minipass": "^7.0.3",
+-                "minipass-sized": "^1.0.3",
+-                "minizlib": "^3.0.1"
+-            },
+-            "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
+-            },
+-            "optionalDependencies": {
+-                "encoding": "^0.1.13"
+-            }
+-        },
+-        "node_modules/minipass-flush": {
+-            "version": "1.0.7",
+-            "dev": true,
+-            "license": "BlueOak-1.0.0",
+-            "dependencies": {
+-                "minipass": "^3.0.0"
+-            },
+-            "engines": {
+-                "node": ">= 8"
+-            }
+-        },
+-        "node_modules/minipass-flush/node_modules/minipass": {
+-            "version": "3.3.6",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "yallist": "^4.0.0"
+-            },
+-            "engines": {
+-                "node": ">=8"
+-            }
+-        },
+-        "node_modules/minipass-flush/node_modules/yallist": {
+-            "version": "4.0.0",
+-            "dev": true,
+-            "license": "ISC"
+-        },
+-        "node_modules/minipass-pipeline": {
+-            "version": "1.2.4",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "minipass": "^3.0.0"
+-            },
+-            "engines": {
+-                "node": ">=8"
+-            }
+-        },
+-        "node_modules/minipass-pipeline/node_modules/minipass": {
+-            "version": "3.3.6",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "yallist": "^4.0.0"
+-            },
+-            "engines": {
+-                "node": ">=8"
+-            }
+-        },
+-        "node_modules/minipass-pipeline/node_modules/yallist": {
+-            "version": "4.0.0",
+-            "dev": true,
+-            "license": "ISC"
+-        },
+-        "node_modules/minipass-sized": {
+-            "version": "1.0.3",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "minipass": "^3.0.0"
+-            },
+-            "engines": {
+-                "node": ">=8"
+-            }
+-        },
+-        "node_modules/minipass-sized/node_modules/minipass": {
+-            "version": "3.3.6",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "yallist": "^4.0.0"
+-            },
+-            "engines": {
+-                "node": ">=8"
+-            }
+-        },
+-        "node_modules/minipass-sized/node_modules/yallist": {
+-            "version": "4.0.0",
+-            "dev": true,
+-            "license": "ISC"
+-        },
+         "node_modules/minizlib": {
+             "version": "3.1.0",
++            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
++            "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -7386,10 +9200,14 @@
+         },
+         "node_modules/mitt": {
+             "version": "3.0.1",
++            "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
++            "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+             "license": "MIT"
+         },
+         "node_modules/mkdirp": {
+             "version": "0.5.6",
++            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
++            "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -7401,10 +9219,14 @@
+         },
+         "node_modules/mkdirp-classic": {
+             "version": "0.5.3",
++            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
++            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+             "license": "MIT"
+         },
+         "node_modules/mlly": {
+             "version": "1.8.2",
++            "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.2.tgz",
++            "integrity": "sha512-d+ObxMQFmbt10sretNDytwt85VrbkhhUA/JBGm1MPaWJ65Cl4wOgLaB1NYvJSZ0Ef03MMEU/0xpPMXUIQ29UfA==",
+             "license": "MIT",
+             "dependencies": {
+                 "acorn": "^8.16.0",
+@@ -7415,10 +9237,14 @@
+         },
+         "node_modules/mlly/node_modules/confbox": {
+             "version": "0.1.8",
++            "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
++            "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
+             "license": "MIT"
+         },
+         "node_modules/mlly/node_modules/pkg-types": {
+             "version": "1.3.1",
++            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
++            "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "confbox": "^0.1.8",
+@@ -7428,18 +9254,26 @@
+         },
+         "node_modules/module-details-from-path": {
+             "version": "1.0.4",
++            "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.4.tgz",
++            "integrity": "sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==",
+             "license": "MIT"
+         },
+         "node_modules/ms": {
+             "version": "2.1.3",
++            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
++            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+             "license": "MIT"
+         },
+         "node_modules/muggle-string": {
+             "version": "0.4.1",
++            "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
++            "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
+             "license": "MIT"
+         },
+         "node_modules/mz": {
+             "version": "2.7.0",
++            "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
++            "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+             "license": "MIT",
+             "dependencies": {
+                 "any-promise": "^1.0.0",
+@@ -7447,8 +9281,17 @@
+                 "thenify-all": "^1.0.0"
+             }
+         },
++        "node_modules/nan": {
++            "version": "2.26.2",
++            "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz",
++            "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==",
++            "license": "MIT",
++            "optional": true
++        },
+         "node_modules/nanoid": {
+             "version": "3.3.11",
++            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
++            "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+             "funding": [
+                 {
+                     "type": "github",
+@@ -7465,23 +9308,21 @@
+         },
+         "node_modules/napi-build-utils": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",
++            "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
+             "license": "MIT"
+         },
+         "node_modules/natural-compare": {
+             "version": "1.4.0",
++            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
++            "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+             "dev": true,
+             "license": "MIT"
+         },
+-        "node_modules/negotiator": {
+-            "version": "1.0.0",
+-            "dev": true,
+-            "license": "MIT",
+-            "engines": {
+-                "node": ">= 0.6"
+-            }
+-        },
+         "node_modules/node-abi": {
+             "version": "4.28.0",
++            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.28.0.tgz",
++            "integrity": "sha512-Qfp5XZL1cJDOabOT8H5gnqMTmM4NjvYzHp4I/Kt/Sl76OVkOBBHRFlPspGV0hYvMoqQsypFjT/Yp7Km0beXW9g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -7493,6 +9334,8 @@
+         },
+         "node_modules/node-abi/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -7504,12 +9347,16 @@
+         },
+         "node_modules/node-addon-api": {
+             "version": "1.7.2",
++            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
++            "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true
+         },
+         "node_modules/node-api-version": {
+             "version": "0.2.1",
++            "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.1.tgz",
++            "integrity": "sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -7518,6 +9365,8 @@
+         },
+         "node_modules/node-api-version/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -7529,6 +9378,8 @@
+         },
+         "node_modules/node-fetch": {
+             "version": "2.7.0",
++            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
++            "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+             "license": "MIT",
+             "dependencies": {
+                 "whatwg-url": "^5.0.0"
+@@ -7546,38 +9397,44 @@
+             }
+         },
+         "node_modules/node-gyp": {
+-            "version": "11.5.0",
++            "version": "12.3.0",
++            "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.3.0.tgz",
++            "integrity": "sha512-QNcUWM+HgJplcPzBvFBZ9VXacyGZ4+VTOb80PwWR+TlVzoHbRKULNEzpRsnaoxG3Wzr7Qh7BYxGDU3CbKib2Yg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+                 "env-paths": "^2.2.0",
+                 "exponential-backoff": "^3.1.1",
+                 "graceful-fs": "^4.2.6",
+-                "make-fetch-happen": "^14.0.3",
+-                "nopt": "^8.0.0",
+-                "proc-log": "^5.0.0",
++                "nopt": "^9.0.0",
++                "proc-log": "^6.0.0",
+                 "semver": "^7.3.5",
+-                "tar": "^7.4.3",
++                "tar": "^7.5.4",
+                 "tinyglobby": "^0.2.12",
+-                "which": "^5.0.0"
++                "undici": "^6.25.0",
++                "which": "^6.0.0"
+             },
+             "bin": {
+                 "node-gyp": "bin/node-gyp.js"
+             },
+             "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
++                "node": "^20.17.0 || >=22.9.0"
+             }
+         },
+         "node_modules/node-gyp/node_modules/isexe": {
+-            "version": "3.1.5",
++            "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz",
++            "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==",
+             "dev": true,
+             "license": "BlueOak-1.0.0",
+             "engines": {
+-                "node": ">=18"
++                "node": ">=20"
+             }
+         },
+         "node_modules/node-gyp/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -7588,39 +9445,47 @@
+             }
+         },
+         "node_modules/node-gyp/node_modules/which": {
+-            "version": "5.0.0",
++            "version": "6.0.1",
++            "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz",
++            "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+-                "isexe": "^3.1.1"
++                "isexe": "^4.0.0"
+             },
+             "bin": {
+                 "node-which": "bin/which.js"
+             },
+             "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
++                "node": "^20.17.0 || >=22.9.0"
+             }
+         },
+         "node_modules/node-releases": {
+-            "version": "2.0.37",
++            "version": "2.0.38",
++            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz",
++            "integrity": "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==",
+             "license": "MIT"
+         },
+         "node_modules/nopt": {
+-            "version": "8.1.0",
++            "version": "9.0.0",
++            "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz",
++            "integrity": "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==",
+             "dev": true,
+             "license": "ISC",
+             "dependencies": {
+-                "abbrev": "^3.0.0"
++                "abbrev": "^4.0.0"
+             },
+             "bin": {
+                 "nopt": "bin/nopt.js"
+             },
+             "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
++                "node": "^20.17.0 || >=22.9.0"
+             }
+         },
+         "node_modules/normalize-package-data": {
+             "version": "2.5.0",
++            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
++            "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "dependencies": {
+@@ -7632,11 +9497,15 @@
+         },
+         "node_modules/normalize-package-data/node_modules/hosted-git-info": {
+             "version": "2.8.9",
++            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
++            "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+             "dev": true,
+             "license": "ISC"
+         },
+         "node_modules/normalize-package-data/node_modules/semver": {
+             "version": "5.7.2",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
++            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -7645,6 +9514,8 @@
+         },
+         "node_modules/normalize-path": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
++            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.10.0"
+@@ -7652,6 +9523,8 @@
+         },
+         "node_modules/normalize-url": {
+             "version": "6.1.0",
++            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
++            "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=10"
+@@ -7660,8 +9533,24 @@
+                 "url": "https://github.com/sponsors/sindresorhus"
+             }
+         },
++        "node_modules/npmlog": {
++            "version": "4.1.2",
++            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
++            "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
++            "deprecated": "This package is no longer supported.",
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "are-we-there-yet": "~1.1.2",
++                "console-control-strings": "~1.1.0",
++                "gauge": "~2.7.3",
++                "set-blocking": "~2.0.0"
++            }
++        },
+         "node_modules/nth-check": {
+             "version": "2.1.1",
++            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
++            "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+             "dev": true,
+             "license": "BSD-2-Clause",
+             "dependencies": {
+@@ -7671,8 +9560,30 @@
+                 "url": "https://github.com/fb55/nth-check?sponsor=1"
+             }
+         },
++        "node_modules/number-is-nan": {
++            "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
++            "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
++            "license": "MIT",
++            "optional": true,
++            "engines": {
++                "node": ">=0.10.0"
++            }
++        },
++        "node_modules/oauth-sign": {
++            "version": "0.9.0",
++            "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
++            "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
++            "license": "Apache-2.0",
++            "optional": true,
++            "engines": {
++                "node": "*"
++            }
++        },
+         "node_modules/object-assign": {
+             "version": "4.1.1",
++            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
++            "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.10.0"
+@@ -7680,6 +9591,8 @@
+         },
+         "node_modules/object-hash": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
++            "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 6"
+@@ -7687,6 +9600,8 @@
+         },
+         "node_modules/object-keys": {
+             "version": "1.1.1",
++            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
++            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+             "license": "MIT",
+             "optional": true,
+             "engines": {
+@@ -7695,32 +9610,24 @@
+         },
+         "node_modules/ohash": {
+             "version": "2.0.11",
++            "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz",
++            "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==",
+             "license": "MIT",
+             "peer": true
+         },
+         "node_modules/once": {
+             "version": "1.4.0",
++            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
++            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+             "license": "ISC",
+             "dependencies": {
+                 "wrappy": "1"
+             }
+         },
+-        "node_modules/onetime": {
+-            "version": "5.1.2",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "mimic-fn": "^2.1.0"
+-            },
+-            "engines": {
+-                "node": ">=6"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/sindresorhus"
+-            }
+-        },
+         "node_modules/optionator": {
+             "version": "0.9.4",
++            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
++            "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -7735,30 +9642,10 @@
+                 "node": ">= 0.8.0"
+             }
+         },
+-        "node_modules/ora": {
+-            "version": "5.4.1",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "bl": "^4.1.0",
+-                "chalk": "^4.1.0",
+-                "cli-cursor": "^3.1.0",
+-                "cli-spinners": "^2.5.0",
+-                "is-interactive": "^1.0.0",
+-                "is-unicode-supported": "^0.1.0",
+-                "log-symbols": "^4.1.0",
+-                "strip-ansi": "^6.0.0",
+-                "wcwidth": "^1.0.1"
+-            },
+-            "engines": {
+-                "node": ">=10"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/sindresorhus"
+-            }
+-        },
+         "node_modules/p-cancelable": {
+             "version": "2.1.1",
++            "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
++            "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=8"
+@@ -7766,6 +9653,8 @@
+         },
+         "node_modules/p-limit": {
+             "version": "3.1.0",
++            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
++            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "yocto-queue": "^0.1.0"
+@@ -7779,6 +9668,8 @@
+         },
+         "node_modules/p-locate": {
+             "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
++            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+             "license": "MIT",
+             "dependencies": {
+                 "p-limit": "^3.0.2"
+@@ -7790,37 +9681,27 @@
+                 "url": "https://github.com/sponsors/sindresorhus"
+             }
+         },
+-        "node_modules/p-map": {
+-            "version": "7.0.4",
+-            "dev": true,
+-            "license": "MIT",
+-            "engines": {
+-                "node": ">=18"
+-            },
+-            "funding": {
+-                "url": "https://github.com/sponsors/sindresorhus"
+-            }
+-        },
+         "node_modules/p-try": {
+             "version": "2.2.0",
++            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
++            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6"
+             }
+         },
+-        "node_modules/package-json-from-dist": {
+-            "version": "1.0.1",
+-            "dev": true,
+-            "license": "BlueOak-1.0.0"
+-        },
+         "node_modules/pako": {
+             "version": "1.0.11",
++            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
++            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+             "dev": true,
+             "license": "(MIT AND Zlib)"
+         },
+         "node_modules/parent-module": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
++            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -7832,11 +9713,15 @@
+         },
+         "node_modules/parse-duration": {
+             "version": "2.1.6",
++            "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-2.1.6.tgz",
++            "integrity": "sha512-1/A2Exg3NcJGcYdgV/dn4frR7vO2hOW/ohQ4KIgbT4W3raVcpYSszPWiL6I6cKufi4jQM5NbGRXLBj8AoLM4iQ==",
+             "license": "MIT",
+             "peer": true
+         },
+         "node_modules/parse-json": {
+             "version": "5.2.0",
++            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
++            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -7854,10 +9739,14 @@
+         },
+         "node_modules/path-browserify": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
++            "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+             "license": "MIT"
+         },
+         "node_modules/path-exists": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
++            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=8"
+@@ -7865,7 +9754,9 @@
+         },
+         "node_modules/path-is-absolute": {
+             "version": "1.0.1",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
++            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
++            "devOptional": true,
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.10.0"
+@@ -7873,6 +9764,8 @@
+         },
+         "node_modules/path-key": {
+             "version": "3.1.1",
++            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
++            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -7881,10 +9774,14 @@
+         },
+         "node_modules/path-parse": {
+             "version": "1.0.7",
++            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
++            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+             "license": "MIT"
+         },
+         "node_modules/path-scurry": {
+             "version": "2.0.2",
++            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
++            "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+             "license": "BlueOak-1.0.0",
+             "dependencies": {
+                 "lru-cache": "^11.0.0",
+@@ -7899,6 +9796,8 @@
+         },
+         "node_modules/path-scurry/node_modules/lru-cache": {
+             "version": "11.3.5",
++            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.3.5.tgz",
++            "integrity": "sha512-NxVFwLAnrd9i7KUBxC4DrUhmgjzOs+1Qm50D3oF1/oL+r1NpZ4gA7xvG0/zJ8evR7zIKn4vLf7qTNduWFtCrRw==",
+             "license": "BlueOak-1.0.0",
+             "engines": {
+                 "node": "20 || >=22"
+@@ -7906,6 +9805,8 @@
+         },
+         "node_modules/path-type": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
++            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -7914,10 +9815,14 @@
+         },
+         "node_modules/pathe": {
+             "version": "2.0.3",
++            "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
++            "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+             "license": "MIT"
+         },
+         "node_modules/pathval": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
++            "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -7926,6 +9831,8 @@
+         },
+         "node_modules/pause-stream": {
+             "version": "0.0.11",
++            "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
++            "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
+             "license": [
+                 "MIT",
+                 "Apache2"
+@@ -7936,6 +9843,8 @@
+         },
+         "node_modules/pe-library": {
+             "version": "0.4.1",
++            "resolved": "https://registry.npmjs.org/pe-library/-/pe-library-0.4.1.tgz",
++            "integrity": "sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -7949,14 +9858,27 @@
+         },
+         "node_modules/pend": {
+             "version": "1.2.0",
++            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
++            "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+             "license": "MIT"
+         },
+         "node_modules/perfect-debounce": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
++            "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+             "license": "MIT"
+         },
++        "node_modules/performance-now": {
++            "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
++            "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
++            "license": "MIT",
++            "optional": true
++        },
+         "node_modules/pg-int8": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
++            "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+             "license": "ISC",
+             "engines": {
+                 "node": ">=4.0.0"
+@@ -7964,10 +9886,14 @@
+         },
+         "node_modules/pg-protocol": {
+             "version": "1.13.0",
++            "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.13.0.tgz",
++            "integrity": "sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==",
+             "license": "MIT"
+         },
+         "node_modules/pg-types": {
+             "version": "2.2.0",
++            "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
++            "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+             "license": "MIT",
+             "dependencies": {
+                 "pg-int8": "1.0.1",
+@@ -7982,10 +9908,14 @@
+         },
+         "node_modules/picocolors": {
+             "version": "1.1.1",
++            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
++            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+             "license": "ISC"
+         },
+         "node_modules/picomatch": {
+             "version": "2.3.2",
++            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
++            "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=8.6"
+@@ -7996,6 +9926,8 @@
+         },
+         "node_modules/pify": {
+             "version": "2.3.0",
++            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
++            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.10.0"
+@@ -8003,6 +9935,8 @@
+         },
+         "node_modules/pinia": {
+             "version": "3.0.4",
++            "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.4.tgz",
++            "integrity": "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/devtools-api": "^7.7.7"
+@@ -8022,6 +9956,8 @@
+         },
+         "node_modules/pinia/node_modules/@vue/devtools-api": {
+             "version": "7.7.9",
++            "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz",
++            "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/devtools-kit": "^7.7.9"
+@@ -8029,6 +9965,8 @@
+         },
+         "node_modules/pirates": {
+             "version": "4.0.7",
++            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
++            "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 6"
+@@ -8036,6 +9974,8 @@
+         },
+         "node_modules/pkg-types": {
+             "version": "2.3.0",
++            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
++            "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
+             "license": "MIT",
+             "dependencies": {
+                 "confbox": "^0.2.2",
+@@ -8045,6 +9985,8 @@
+         },
+         "node_modules/playwright": {
+             "version": "1.59.1",
++            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.59.1.tgz",
++            "integrity": "sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "dependencies": {
+@@ -8062,6 +10004,8 @@
+         },
+         "node_modules/playwright-core": {
+             "version": "1.59.1",
++            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.59.1.tgz",
++            "integrity": "sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "bin": {
+@@ -8073,6 +10017,8 @@
+         },
+         "node_modules/plist": {
+             "version": "3.1.0",
++            "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
++            "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8085,7 +10031,9 @@
+             }
+         },
+         "node_modules/postcss": {
+-            "version": "8.5.9",
++            "version": "8.5.10",
++            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.10.tgz",
++            "integrity": "sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==",
+             "funding": [
+                 {
+                     "type": "opencollective",
+@@ -8112,6 +10060,8 @@
+         },
+         "node_modules/postcss-import": {
+             "version": "15.1.0",
++            "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
++            "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+             "license": "MIT",
+             "dependencies": {
+                 "postcss-value-parser": "^4.0.0",
+@@ -8127,6 +10077,8 @@
+         },
+         "node_modules/postcss-js": {
+             "version": "4.1.0",
++            "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz",
++            "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==",
+             "funding": [
+                 {
+                     "type": "opencollective",
+@@ -8150,6 +10102,8 @@
+         },
+         "node_modules/postcss-load-config": {
+             "version": "6.0.1",
++            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz",
++            "integrity": "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==",
+             "funding": [
+                 {
+                     "type": "opencollective",
+@@ -8190,6 +10144,8 @@
+         },
+         "node_modules/postcss-nested": {
+             "version": "6.2.0",
++            "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
++            "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
+             "funding": [
+                 {
+                     "type": "opencollective",
+@@ -8213,6 +10169,8 @@
+         },
+         "node_modules/postcss-nested/node_modules/postcss-selector-parser": {
+             "version": "6.1.2",
++            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
++            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+             "license": "MIT",
+             "dependencies": {
+                 "cssesc": "^3.0.0",
+@@ -8224,6 +10182,8 @@
+         },
+         "node_modules/postcss-selector-parser": {
+             "version": "6.0.10",
++            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
++            "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8236,10 +10196,14 @@
+         },
+         "node_modules/postcss-value-parser": {
+             "version": "4.2.0",
++            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
++            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+             "license": "MIT"
+         },
+         "node_modules/postgres-array": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
++            "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=4"
+@@ -8247,6 +10211,8 @@
+         },
+         "node_modules/postgres-bytea": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.1.tgz",
++            "integrity": "sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.10.0"
+@@ -8254,6 +10220,8 @@
+         },
+         "node_modules/postgres-date": {
+             "version": "1.0.7",
++            "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
++            "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.10.0"
+@@ -8261,6 +10229,8 @@
+         },
+         "node_modules/postgres-interval": {
+             "version": "1.2.0",
++            "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
++            "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "xtend": "^4.0.0"
+@@ -8271,6 +10241,8 @@
+         },
+         "node_modules/postject": {
+             "version": "1.0.0-alpha.6",
++            "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz",
++            "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -8287,6 +10259,8 @@
+         },
+         "node_modules/postject/node_modules/commander": {
+             "version": "9.5.0",
++            "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
++            "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -8297,6 +10271,9 @@
+         },
+         "node_modules/prebuild-install": {
+             "version": "7.1.3",
++            "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
++            "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
++            "deprecated": "No longer maintained. Please contact the author of the relevant native addon; alternatives are available.",
+             "license": "MIT",
+             "dependencies": {
+                 "detect-libc": "^2.0.0",
+@@ -8321,6 +10298,8 @@
+         },
+         "node_modules/prebuild-install/node_modules/node-abi": {
+             "version": "3.89.0",
++            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.89.0.tgz",
++            "integrity": "sha512-6u9UwL0HlAl21+agMN3YAMXcKByMqwGx+pq+P76vii5f7hTPtKDp08/H9py6DY+cfDw7kQNTGEj/rly3IgbNQA==",
+             "license": "MIT",
+             "dependencies": {
+                 "semver": "^7.3.5"
+@@ -8331,6 +10310,8 @@
+         },
+         "node_modules/prebuild-install/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "license": "ISC",
+             "bin": {
+                 "semver": "bin/semver.js"
+@@ -8341,6 +10322,8 @@
+         },
+         "node_modules/prelude-ls": {
+             "version": "1.2.1",
++            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
++            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -8348,7 +10331,9 @@
+             }
+         },
+         "node_modules/prettier": {
+-            "version": "3.8.2",
++            "version": "3.8.3",
++            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
++            "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
+             "dev": true,
+             "license": "MIT",
+             "bin": {
+@@ -8363,6 +10348,8 @@
+         },
+         "node_modules/prettier-linter-helpers": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz",
++            "integrity": "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8373,20 +10360,26 @@
+             }
+         },
+         "node_modules/proc-log": {
+-            "version": "5.0.0",
++            "version": "6.1.0",
++            "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz",
++            "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==",
+             "dev": true,
+             "license": "ISC",
+             "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
++                "node": "^20.17.0 || >=22.9.0"
+             }
+         },
+         "node_modules/process-nextick-args": {
+             "version": "2.0.1",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
++            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
++            "devOptional": true,
+             "license": "MIT"
+         },
+         "node_modules/progress": {
+             "version": "2.0.3",
++            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
++            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.4.0"
+@@ -8394,6 +10387,8 @@
+         },
+         "node_modules/promise-retry": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
++            "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8406,6 +10401,8 @@
+         },
+         "node_modules/proper-lockfile": {
+             "version": "4.1.2",
++            "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz",
++            "integrity": "sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8416,10 +10413,27 @@
+         },
+         "node_modules/proxy-from-env": {
+             "version": "1.1.0",
++            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
++            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+             "license": "MIT"
+         },
++        "node_modules/psl": {
++            "version": "1.15.0",
++            "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
++            "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "punycode": "^2.3.1"
++            },
++            "funding": {
++                "url": "https://github.com/sponsors/lupomontero"
++            }
++        },
+         "node_modules/pump": {
+             "version": "3.0.4",
++            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
++            "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==",
+             "license": "MIT",
+             "dependencies": {
+                 "end-of-stream": "^1.1.0",
+@@ -8428,14 +10442,28 @@
+         },
+         "node_modules/punycode": {
+             "version": "2.3.1",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
++            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
++            "devOptional": true,
+             "license": "MIT",
+             "engines": {
+                 "node": ">=6"
+             }
+         },
++        "node_modules/qs": {
++            "version": "6.5.5",
++            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.5.tgz",
++            "integrity": "sha512-mzR4sElr1bfCaPJe7m8ilJ6ZXdDaGoObcYR0ZHSsktM/Lt21MVHj5De30GQH2eiZ1qGRTO7LCAzQsUeXTNexWQ==",
++            "license": "BSD-3-Clause",
++            "optional": true,
++            "engines": {
++                "node": ">=0.6"
++            }
++        },
+         "node_modules/quansync": {
+             "version": "0.2.11",
++            "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz",
++            "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==",
+             "funding": [
+                 {
+                     "type": "individual",
+@@ -8450,6 +10478,8 @@
+         },
+         "node_modules/queue-microtask": {
+             "version": "1.2.3",
++            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
++            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+             "funding": [
+                 {
+                     "type": "github",
+@@ -8468,6 +10498,8 @@
+         },
+         "node_modules/quick-lru": {
+             "version": "5.1.1",
++            "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
++            "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=10"
+@@ -8478,6 +10510,8 @@
+         },
+         "node_modules/radix-vue": {
+             "version": "1.9.17",
++            "resolved": "https://registry.npmjs.org/radix-vue/-/radix-vue-1.9.17.tgz",
++            "integrity": "sha512-mVCu7I2vXt1L2IUYHTt0sZMz7s1K2ZtqKeTIxG3yC5mMFfLBG4FtE1FDeRMpDd+Hhg/ybi9+iXmAP1ISREndoQ==",
+             "license": "MIT",
+             "peer": true,
+             "dependencies": {
+@@ -8499,11 +10533,15 @@
+         },
+         "node_modules/radix-vue/node_modules/@types/web-bluetooth": {
+             "version": "0.0.20",
++            "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
++            "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==",
+             "license": "MIT",
+             "peer": true
+         },
+         "node_modules/radix-vue/node_modules/@vueuse/core": {
+             "version": "10.11.1",
++            "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.11.1.tgz",
++            "integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==",
+             "license": "MIT",
+             "peer": true,
+             "dependencies": {
+@@ -8518,6 +10556,8 @@
+         },
+         "node_modules/radix-vue/node_modules/@vueuse/core/node_modules/vue-demi": {
+             "version": "0.14.10",
++            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
++            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+             "hasInstallScript": true,
+             "license": "MIT",
+             "peer": true,
+@@ -8543,6 +10583,8 @@
+         },
+         "node_modules/radix-vue/node_modules/@vueuse/metadata": {
+             "version": "10.11.1",
++            "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz",
++            "integrity": "sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==",
+             "license": "MIT",
+             "peer": true,
+             "funding": {
+@@ -8551,6 +10593,8 @@
+         },
+         "node_modules/radix-vue/node_modules/@vueuse/shared": {
+             "version": "10.11.1",
++            "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.11.1.tgz",
++            "integrity": "sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==",
+             "license": "MIT",
+             "peer": true,
+             "dependencies": {
+@@ -8562,6 +10606,8 @@
+         },
+         "node_modules/radix-vue/node_modules/@vueuse/shared/node_modules/vue-demi": {
+             "version": "0.14.10",
++            "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
++            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+             "hasInstallScript": true,
+             "license": "MIT",
+             "peer": true,
+@@ -8586,7 +10632,9 @@
+             }
+         },
+         "node_modules/radix-vue/node_modules/nanoid": {
+-            "version": "5.1.7",
++            "version": "5.1.9",
++            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.9.tgz",
++            "integrity": "sha512-ZUvP7KeBLe3OZ1ypw6dI/TzYJuvHP77IM4Ry73waSQTLn8/g8rpdjfyVAh7t1/+FjBtG4lCP42MEbDxOsRpBMw==",
+             "funding": [
+                 {
+                     "type": "github",
+@@ -8604,6 +10652,8 @@
+         },
+         "node_modules/rc": {
+             "version": "1.2.8",
++            "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
++            "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+             "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+             "dependencies": {
+                 "deep-extend": "^0.6.0",
+@@ -8617,6 +10667,8 @@
+         },
+         "node_modules/rc/node_modules/strip-json-comments": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
++            "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.10.0"
+@@ -8624,6 +10676,8 @@
+         },
+         "node_modules/read-binary-file-arch": {
+             "version": "1.0.6",
++            "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz",
++            "integrity": "sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8635,6 +10689,8 @@
+         },
+         "node_modules/read-cache": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
++            "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+             "license": "MIT",
+             "dependencies": {
+                 "pify": "^2.3.0"
+@@ -8642,6 +10698,8 @@
+         },
+         "node_modules/read-pkg": {
+             "version": "5.2.0",
++            "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
++            "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8656,6 +10714,8 @@
+         },
+         "node_modules/read-pkg-up": {
+             "version": "7.0.1",
++            "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
++            "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8672,6 +10732,8 @@
+         },
+         "node_modules/read-pkg-up/node_modules/find-up": {
+             "version": "4.1.0",
++            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
++            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8684,6 +10746,8 @@
+         },
+         "node_modules/read-pkg-up/node_modules/locate-path": {
+             "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
++            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8695,6 +10759,8 @@
+         },
+         "node_modules/read-pkg-up/node_modules/p-limit": {
+             "version": "2.3.0",
++            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
++            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8709,6 +10775,8 @@
+         },
+         "node_modules/read-pkg-up/node_modules/p-locate": {
+             "version": "4.1.0",
++            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
++            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8720,6 +10788,8 @@
+         },
+         "node_modules/read-pkg-up/node_modules/type-fest": {
+             "version": "0.8.1",
++            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
++            "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+             "dev": true,
+             "license": "(MIT OR CC0-1.0)",
+             "engines": {
+@@ -8728,6 +10798,8 @@
+         },
+         "node_modules/read-pkg/node_modules/type-fest": {
+             "version": "0.6.0",
++            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
++            "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+             "dev": true,
+             "license": "(MIT OR CC0-1.0)",
+             "engines": {
+@@ -8736,6 +10808,8 @@
+         },
+         "node_modules/readable-stream": {
+             "version": "3.6.2",
++            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
++            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+             "license": "MIT",
+             "dependencies": {
+                 "inherits": "^2.0.3",
+@@ -8748,6 +10822,8 @@
+         },
+         "node_modules/readdirp": {
+             "version": "3.6.0",
++            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
++            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+             "license": "MIT",
+             "dependencies": {
+                 "picomatch": "^2.2.1"
+@@ -8758,6 +10834,8 @@
+         },
+         "node_modules/reka-ui": {
+             "version": "2.9.6",
++            "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.9.6.tgz",
++            "integrity": "sha512-K6bL457owpvWONc7hsjFxo3HDC9s6IzhRqShW0w9JSKelPGfRbkHD558UQTn/NH1cvrXVHygKyC7fExFmRketg==",
+             "license": "MIT",
+             "peer": true,
+             "dependencies": {
+@@ -8782,11 +10860,63 @@
+         },
+         "node_modules/remove-accents": {
+             "version": "0.5.0",
++            "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
++            "integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==",
+             "dev": true,
+             "license": "MIT"
+         },
+-        "node_modules/require-directory": {
++        "node_modules/request": {
++            "version": "2.88.2",
++            "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
++            "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
++            "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
++            "license": "Apache-2.0",
++            "optional": true,
++            "dependencies": {
++                "aws-sign2": "~0.7.0",
++                "aws4": "^1.8.0",
++                "caseless": "~0.12.0",
++                "combined-stream": "~1.0.6",
++                "extend": "~3.0.2",
++                "forever-agent": "~0.6.1",
++                "form-data": "~2.3.2",
++                "har-validator": "~5.1.3",
++                "http-signature": "~1.2.0",
++                "is-typedarray": "~1.0.0",
++                "isstream": "~0.1.2",
++                "json-stringify-safe": "~5.0.1",
++                "mime-types": "~2.1.19",
++                "oauth-sign": "~0.9.0",
++                "performance-now": "^2.1.0",
++                "qs": "~6.5.2",
++                "safe-buffer": "^5.1.2",
++                "tough-cookie": "~2.5.0",
++                "tunnel-agent": "^0.6.0",
++                "uuid": "^3.3.2"
++            },
++            "engines": {
++                "node": ">= 6"
++            }
++        },
++        "node_modules/request/node_modules/form-data": {
++            "version": "2.3.3",
++            "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
++            "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "asynckit": "^0.4.0",
++                "combined-stream": "^1.0.6",
++                "mime-types": "^2.1.12"
++            },
++            "engines": {
++                "node": ">= 0.12"
++            }
++        },
++        "node_modules/require-directory": {
+             "version": "2.1.1",
++            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
++            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -8795,6 +10925,8 @@
+         },
+         "node_modules/require-in-the-middle": {
+             "version": "8.0.1",
++            "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-8.0.1.tgz",
++            "integrity": "sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "debug": "^4.3.5",
+@@ -8806,6 +10938,8 @@
+         },
+         "node_modules/resedit": {
+             "version": "1.7.2",
++            "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz",
++            "integrity": "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -8822,6 +10956,8 @@
+         },
+         "node_modules/resolve": {
+             "version": "1.22.12",
++            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
++            "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
+             "license": "MIT",
+             "dependencies": {
+                 "es-errors": "^1.3.0",
+@@ -8841,10 +10977,14 @@
+         },
+         "node_modules/resolve-alpn": {
+             "version": "1.2.1",
++            "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
++            "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
+             "license": "MIT"
+         },
+         "node_modules/resolve-from": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
++            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -8853,6 +10993,8 @@
+         },
+         "node_modules/resolve-pkg-maps": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
++            "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+             "devOptional": true,
+             "license": "MIT",
+             "funding": {
+@@ -8861,6 +11003,8 @@
+         },
+         "node_modules/responselike": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
++            "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+             "license": "MIT",
+             "dependencies": {
+                 "lowercase-keys": "^2.0.0"
+@@ -8869,20 +11013,10 @@
+                 "url": "https://github.com/sponsors/sindresorhus"
+             }
+         },
+-        "node_modules/restore-cursor": {
+-            "version": "3.1.0",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "onetime": "^5.1.0",
+-                "signal-exit": "^3.0.2"
+-            },
+-            "engines": {
+-                "node": ">=8"
+-            }
+-        },
+         "node_modules/retry": {
+             "version": "0.12.0",
++            "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
++            "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -8891,6 +11025,8 @@
+         },
+         "node_modules/reusify": {
+             "version": "1.1.0",
++            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
++            "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+             "license": "MIT",
+             "engines": {
+                 "iojs": ">=1.0.0",
+@@ -8899,11 +11035,16 @@
+         },
+         "node_modules/rfdc": {
+             "version": "1.4.1",
++            "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
++            "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+             "license": "MIT"
+         },
+         "node_modules/rimraf": {
+             "version": "3.0.2",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
++            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
++            "deprecated": "Rimraf versions prior to v4 are no longer supported",
++            "devOptional": true,
+             "license": "ISC",
+             "dependencies": {
+                 "glob": "^7.1.3"
+@@ -8917,12 +11058,16 @@
+         },
+         "node_modules/rimraf/node_modules/balanced-match": {
+             "version": "1.0.2",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
++            "devOptional": true,
+             "license": "MIT"
+         },
+         "node_modules/rimraf/node_modules/brace-expansion": {
+             "version": "1.1.14",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++            "devOptional": true,
+             "license": "MIT",
+             "dependencies": {
+                 "balanced-match": "^1.0.0",
+@@ -8931,7 +11076,10 @@
+         },
+         "node_modules/rimraf/node_modules/glob": {
+             "version": "7.2.3",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++            "devOptional": true,
+             "license": "ISC",
+             "dependencies": {
+                 "fs.realpath": "^1.0.0",
+@@ -8950,7 +11098,9 @@
+         },
+         "node_modules/rimraf/node_modules/minimatch": {
+             "version": "3.1.5",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++            "devOptional": true,
+             "license": "ISC",
+             "dependencies": {
+                 "brace-expansion": "^1.1.7"
+@@ -8961,6 +11111,8 @@
+         },
+         "node_modules/roarr": {
+             "version": "2.15.4",
++            "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
++            "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
+             "license": "BSD-3-Clause",
+             "optional": true,
+             "dependencies": {
+@@ -8976,7 +11128,9 @@
+             }
+         },
+         "node_modules/rollup": {
+-            "version": "4.60.1",
++            "version": "4.60.2",
++            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.2.tgz",
++            "integrity": "sha512-J9qZyW++QK/09NyN/zeO0dG/1GdGfyp9lV8ajHnRVLfo/uFsbji5mHnDgn/qYdUHyCkM2N+8VyspgZclfAh0eQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@types/estree": "1.0.8"
+@@ -8989,36 +11143,38 @@
+                 "npm": ">=8.0.0"
+             },
+             "optionalDependencies": {
+-                "@rollup/rollup-android-arm-eabi": "4.60.1",
+-                "@rollup/rollup-android-arm64": "4.60.1",
+-                "@rollup/rollup-darwin-arm64": "4.60.1",
+-                "@rollup/rollup-darwin-x64": "4.60.1",
+-                "@rollup/rollup-freebsd-arm64": "4.60.1",
+-                "@rollup/rollup-freebsd-x64": "4.60.1",
+-                "@rollup/rollup-linux-arm-gnueabihf": "4.60.1",
+-                "@rollup/rollup-linux-arm-musleabihf": "4.60.1",
+-                "@rollup/rollup-linux-arm64-gnu": "4.60.1",
+-                "@rollup/rollup-linux-arm64-musl": "4.60.1",
+-                "@rollup/rollup-linux-loong64-gnu": "4.60.1",
+-                "@rollup/rollup-linux-loong64-musl": "4.60.1",
+-                "@rollup/rollup-linux-ppc64-gnu": "4.60.1",
+-                "@rollup/rollup-linux-ppc64-musl": "4.60.1",
+-                "@rollup/rollup-linux-riscv64-gnu": "4.60.1",
+-                "@rollup/rollup-linux-riscv64-musl": "4.60.1",
+-                "@rollup/rollup-linux-s390x-gnu": "4.60.1",
+-                "@rollup/rollup-linux-x64-gnu": "4.60.1",
+-                "@rollup/rollup-linux-x64-musl": "4.60.1",
+-                "@rollup/rollup-openbsd-x64": "4.60.1",
+-                "@rollup/rollup-openharmony-arm64": "4.60.1",
+-                "@rollup/rollup-win32-arm64-msvc": "4.60.1",
+-                "@rollup/rollup-win32-ia32-msvc": "4.60.1",
+-                "@rollup/rollup-win32-x64-gnu": "4.60.1",
+-                "@rollup/rollup-win32-x64-msvc": "4.60.1",
++                "@rollup/rollup-android-arm-eabi": "4.60.2",
++                "@rollup/rollup-android-arm64": "4.60.2",
++                "@rollup/rollup-darwin-arm64": "4.60.2",
++                "@rollup/rollup-darwin-x64": "4.60.2",
++                "@rollup/rollup-freebsd-arm64": "4.60.2",
++                "@rollup/rollup-freebsd-x64": "4.60.2",
++                "@rollup/rollup-linux-arm-gnueabihf": "4.60.2",
++                "@rollup/rollup-linux-arm-musleabihf": "4.60.2",
++                "@rollup/rollup-linux-arm64-gnu": "4.60.2",
++                "@rollup/rollup-linux-arm64-musl": "4.60.2",
++                "@rollup/rollup-linux-loong64-gnu": "4.60.2",
++                "@rollup/rollup-linux-loong64-musl": "4.60.2",
++                "@rollup/rollup-linux-ppc64-gnu": "4.60.2",
++                "@rollup/rollup-linux-ppc64-musl": "4.60.2",
++                "@rollup/rollup-linux-riscv64-gnu": "4.60.2",
++                "@rollup/rollup-linux-riscv64-musl": "4.60.2",
++                "@rollup/rollup-linux-s390x-gnu": "4.60.2",
++                "@rollup/rollup-linux-x64-gnu": "4.60.2",
++                "@rollup/rollup-linux-x64-musl": "4.60.2",
++                "@rollup/rollup-openbsd-x64": "4.60.2",
++                "@rollup/rollup-openharmony-arm64": "4.60.2",
++                "@rollup/rollup-win32-arm64-msvc": "4.60.2",
++                "@rollup/rollup-win32-ia32-msvc": "4.60.2",
++                "@rollup/rollup-win32-x64-gnu": "4.60.2",
++                "@rollup/rollup-win32-x64-msvc": "4.60.2",
+                 "fsevents": "~2.3.2"
+             }
+         },
+         "node_modules/run-parallel": {
+             "version": "1.2.0",
++            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
++            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+             "funding": [
+                 {
+                     "type": "github",
+@@ -9040,6 +11196,8 @@
+         },
+         "node_modules/safe-buffer": {
+             "version": "5.2.1",
++            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
++            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+             "funding": [
+                 {
+                     "type": "github",
+@@ -9058,11 +11216,15 @@
+         },
+         "node_modules/safer-buffer": {
+             "version": "2.1.2",
++            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
++            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+             "devOptional": true,
+             "license": "MIT"
+         },
+         "node_modules/sanitize-filename": {
+             "version": "1.6.4",
++            "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.4.tgz",
++            "integrity": "sha512-9ZyI08PsvdQl2r/bBIGubpVdR3RR9sY6RDiWFPreA21C/EFlQhmgo20UZlNjZMMZNubusLhAQozkA0Od5J21Eg==",
+             "dev": true,
+             "license": "WTFPL OR ISC",
+             "dependencies": {
+@@ -9071,6 +11233,8 @@
+         },
+         "node_modules/sax": {
+             "version": "1.6.0",
++            "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
++            "integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
+             "license": "BlueOak-1.0.0",
+             "engines": {
+                 "node": ">=11.0.0"
+@@ -9078,10 +11242,14 @@
+         },
+         "node_modules/scule": {
+             "version": "1.3.0",
++            "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz",
++            "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
+             "license": "MIT"
+         },
+         "node_modules/semver": {
+             "version": "6.3.1",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
++            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+             "license": "ISC",
+             "bin": {
+                 "semver": "bin/semver.js"
+@@ -9089,11 +11257,15 @@
+         },
+         "node_modules/semver-compare": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
++            "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+             "license": "MIT",
+             "optional": true
+         },
+         "node_modules/serialize-error": {
+             "version": "7.0.1",
++            "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
++            "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+             "license": "MIT",
+             "optional": true,
+             "dependencies": {
+@@ -9108,6 +11280,8 @@
+         },
+         "node_modules/serialize-error/node_modules/type-fest": {
+             "version": "0.13.1",
++            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
++            "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+             "license": "(MIT OR CC0-1.0)",
+             "optional": true,
+             "engines": {
+@@ -9117,13 +11291,24 @@
+                 "url": "https://github.com/sponsors/sindresorhus"
+             }
+         },
++        "node_modules/set-blocking": {
++            "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
++            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
++            "license": "ISC",
++            "optional": true
++        },
+         "node_modules/setimmediate": {
+             "version": "1.0.5",
++            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
++            "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/shebang-command": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
++            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9135,6 +11320,8 @@
+         },
+         "node_modules/shebang-regex": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
++            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -9143,16 +11330,22 @@
+         },
+         "node_modules/siginfo": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
++            "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+             "dev": true,
+             "license": "ISC"
+         },
+         "node_modules/signal-exit": {
+             "version": "3.0.7",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
++            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
++            "devOptional": true,
+             "license": "ISC"
+         },
+         "node_modules/simple-concat": {
+             "version": "1.0.1",
++            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
++            "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+             "funding": [
+                 {
+                     "type": "github",
+@@ -9171,6 +11364,8 @@
+         },
+         "node_modules/simple-get": {
+             "version": "4.0.1",
++            "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
++            "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+             "funding": [
+                 {
+                     "type": "github",
+@@ -9194,6 +11389,8 @@
+         },
+         "node_modules/simple-update-notifier": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
++            "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9205,6 +11402,8 @@
+         },
+         "node_modules/simple-update-notifier/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -9216,6 +11415,8 @@
+         },
+         "node_modules/slash": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
++            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -9224,6 +11425,8 @@
+         },
+         "node_modules/slice-ansi": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
++            "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -9238,41 +11441,20 @@
+         },
+         "node_modules/smart-buffer": {
+             "version": "4.2.0",
++            "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
++            "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+             "dev": true,
+             "license": "MIT",
++            "optional": true,
+             "engines": {
+                 "node": ">= 6.0.0",
+                 "npm": ">= 3.0.0"
+             }
+         },
+-        "node_modules/socks": {
+-            "version": "2.8.7",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "ip-address": "^10.0.1",
+-                "smart-buffer": "^4.2.0"
+-            },
+-            "engines": {
+-                "node": ">= 10.0.0",
+-                "npm": ">= 3.0.0"
+-            }
+-        },
+-        "node_modules/socks-proxy-agent": {
+-            "version": "8.0.5",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "agent-base": "^7.1.2",
+-                "debug": "^4.3.4",
+-                "socks": "^2.8.3"
+-            },
+-            "engines": {
+-                "node": ">= 14"
+-            }
+-        },
+         "node_modules/source-map": {
+             "version": "0.6.1",
++            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
++            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+             "dev": true,
+             "license": "BSD-3-Clause",
+             "engines": {
+@@ -9281,6 +11463,8 @@
+         },
+         "node_modules/source-map-js": {
+             "version": "1.2.1",
++            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
++            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+             "license": "BSD-3-Clause",
+             "engines": {
+                 "node": ">=0.10.0"
+@@ -9288,6 +11472,8 @@
+         },
+         "node_modules/source-map-support": {
+             "version": "0.5.21",
++            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
++            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9297,6 +11483,8 @@
+         },
+         "node_modules/spdx-correct": {
+             "version": "3.2.0",
++            "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
++            "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "dependencies": {
+@@ -9306,11 +11494,15 @@
+         },
+         "node_modules/spdx-exceptions": {
+             "version": "2.5.0",
++            "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
++            "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+             "dev": true,
+             "license": "CC-BY-3.0"
+         },
+         "node_modules/spdx-expression-parse": {
+             "version": "3.0.1",
++            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
++            "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9320,11 +11512,15 @@
+         },
+         "node_modules/spdx-license-ids": {
+             "version": "3.0.23",
++            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz",
++            "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==",
+             "dev": true,
+             "license": "CC0-1.0"
+         },
+         "node_modules/speakingurl": {
+             "version": "14.0.1",
++            "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
++            "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
+             "license": "BSD-3-Clause",
+             "engines": {
+                 "node": ">=0.10.0"
+@@ -9332,6 +11528,8 @@
+         },
+         "node_modules/split": {
+             "version": "0.3.3",
++            "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
++            "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
+             "license": "MIT",
+             "dependencies": {
+                 "through": "2"
+@@ -9342,27 +11540,48 @@
+         },
+         "node_modules/sprintf-js": {
+             "version": "1.1.3",
++            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
++            "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+             "license": "BSD-3-Clause",
+             "optional": true
+         },
+-        "node_modules/ssri": {
+-            "version": "12.0.0",
+-            "dev": true,
+-            "license": "ISC",
++        "node_modules/sshpk": {
++            "version": "1.18.0",
++            "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
++            "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
++            "license": "MIT",
++            "optional": true,
+             "dependencies": {
+-                "minipass": "^7.0.3"
++                "asn1": "~0.2.3",
++                "assert-plus": "^1.0.0",
++                "bcrypt-pbkdf": "^1.0.0",
++                "dashdash": "^1.12.0",
++                "ecc-jsbn": "~0.1.1",
++                "getpass": "^0.1.1",
++                "jsbn": "~0.1.0",
++                "safer-buffer": "^2.0.2",
++                "tweetnacl": "~0.14.0"
++            },
++            "bin": {
++                "sshpk-conv": "bin/sshpk-conv",
++                "sshpk-sign": "bin/sshpk-sign",
++                "sshpk-verify": "bin/sshpk-verify"
+             },
+             "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
++                "node": ">=0.10.0"
+             }
+         },
+         "node_modules/stackback": {
+             "version": "0.0.2",
++            "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
++            "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/stat-mode": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz",
++            "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -9371,11 +11590,15 @@
+         },
+         "node_modules/std-env": {
+             "version": "3.10.0",
++            "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz",
++            "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/stream-combiner": {
+             "version": "0.0.4",
++            "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
++            "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
+             "license": "MIT",
+             "dependencies": {
+                 "duplexer": "~0.1.1"
+@@ -9383,6 +11606,8 @@
+         },
+         "node_modules/string_decoder": {
+             "version": "1.3.0",
++            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
++            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+             "license": "MIT",
+             "dependencies": {
+                 "safe-buffer": "~5.2.0"
+@@ -9390,21 +11615,9 @@
+         },
+         "node_modules/string-width": {
+             "version": "4.2.3",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "emoji-regex": "^8.0.0",
+-                "is-fullwidth-code-point": "^3.0.0",
+-                "strip-ansi": "^6.0.1"
+-            },
+-            "engines": {
+-                "node": ">=8"
+-            }
+-        },
+-        "node_modules/string-width-cjs": {
+-            "name": "string-width",
+-            "version": "4.2.3",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
++            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
++            "devOptional": true,
+             "license": "MIT",
+             "dependencies": {
+                 "emoji-regex": "^8.0.0",
+@@ -9417,19 +11630,9 @@
+         },
+         "node_modules/strip-ansi": {
+             "version": "6.0.1",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "ansi-regex": "^5.0.1"
+-            },
+-            "engines": {
+-                "node": ">=8"
+-            }
+-        },
+-        "node_modules/strip-ansi-cjs": {
+-            "name": "strip-ansi",
+-            "version": "6.0.1",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
++            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
++            "devOptional": true,
+             "license": "MIT",
+             "dependencies": {
+                 "ansi-regex": "^5.0.1"
+@@ -9440,6 +11643,8 @@
+         },
+         "node_modules/strip-json-comments": {
+             "version": "3.1.1",
++            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
++            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -9451,6 +11656,8 @@
+         },
+         "node_modules/strip-literal": {
+             "version": "3.1.0",
++            "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.1.0.tgz",
++            "integrity": "sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9462,11 +11669,15 @@
+         },
+         "node_modules/strip-literal/node_modules/js-tokens": {
+             "version": "9.0.1",
++            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
++            "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/sucrase": {
+             "version": "3.35.1",
++            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.1.tgz",
++            "integrity": "sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@jridgewell/gen-mapping": "^0.3.2",
+@@ -9487,6 +11698,8 @@
+         },
+         "node_modules/sucrase/node_modules/commander": {
+             "version": "4.1.1",
++            "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
++            "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 6"
+@@ -9494,6 +11707,8 @@
+         },
+         "node_modules/sumchecker": {
+             "version": "3.0.1",
++            "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
++            "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "debug": "^4.1.0"
+@@ -9504,6 +11719,8 @@
+         },
+         "node_modules/superjson": {
+             "version": "2.2.6",
++            "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.6.tgz",
++            "integrity": "sha512-H+ue8Zo4vJmV2nRjpx86P35lzwDT3nItnIsocgumgr0hHMQ+ZGq5vrERg9kJBo5AWGmxZDhzDo+WVIJqkB0cGA==",
+             "license": "MIT",
+             "dependencies": {
+                 "copy-anything": "^4"
+@@ -9514,6 +11731,8 @@
+         },
+         "node_modules/supports-color": {
+             "version": "7.2.0",
++            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
++            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9525,6 +11744,8 @@
+         },
+         "node_modules/supports-preserve-symlinks-flag": {
+             "version": "1.0.0",
++            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
++            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 0.4"
+@@ -9535,6 +11756,8 @@
+         },
+         "node_modules/synckit": {
+             "version": "0.11.12",
++            "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
++            "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9549,11 +11772,15 @@
+         },
+         "node_modules/tabbable": {
+             "version": "6.4.0",
++            "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz",
++            "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==",
+             "license": "MIT",
+             "peer": true
+         },
+         "node_modules/tailwind-merge": {
+             "version": "2.6.1",
++            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz",
++            "integrity": "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==",
+             "license": "MIT",
+             "peer": true,
+             "funding": {
+@@ -9563,6 +11790,8 @@
+         },
+         "node_modules/tailwindcss": {
+             "version": "3.4.19",
++            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.19.tgz",
++            "integrity": "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@alloc/quick-lru": "^5.2.0",
+@@ -9598,6 +11827,8 @@
+         },
+         "node_modules/tailwindcss-animate": {
+             "version": "1.0.7",
++            "resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz",
++            "integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==",
+             "dev": true,
+             "license": "MIT",
+             "peerDependencies": {
+@@ -9606,6 +11837,8 @@
+         },
+         "node_modules/tailwindcss/node_modules/jiti": {
+             "version": "1.21.7",
++            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
++            "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+             "license": "MIT",
+             "bin": {
+                 "jiti": "bin/jiti.js"
+@@ -9613,6 +11846,8 @@
+         },
+         "node_modules/tailwindcss/node_modules/postcss-selector-parser": {
+             "version": "6.1.2",
++            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
++            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+             "license": "MIT",
+             "dependencies": {
+                 "cssesc": "^3.0.0",
+@@ -9624,6 +11859,8 @@
+         },
+         "node_modules/tar": {
+             "version": "7.5.13",
++            "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.13.tgz",
++            "integrity": "sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==",
+             "dev": true,
+             "license": "BlueOak-1.0.0",
+             "dependencies": {
+@@ -9639,6 +11876,8 @@
+         },
+         "node_modules/tar-fs": {
+             "version": "2.1.4",
++            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
++            "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "chownr": "^1.1.1",
+@@ -9649,10 +11888,14 @@
+         },
+         "node_modules/tar-fs/node_modules/chownr": {
+             "version": "1.1.4",
++            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
++            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+             "license": "ISC"
+         },
+         "node_modules/tar-stream": {
+             "version": "2.2.0",
++            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
++            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "bl": "^4.0.3",
+@@ -9667,6 +11910,8 @@
+         },
+         "node_modules/tar/node_modules/yallist": {
+             "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
++            "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+             "dev": true,
+             "license": "BlueOak-1.0.0",
+             "engines": {
+@@ -9675,6 +11920,8 @@
+         },
+         "node_modules/temp": {
+             "version": "0.9.4",
++            "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz",
++            "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
+             "dev": true,
+             "license": "MIT",
+             "peer": true,
+@@ -9688,6 +11935,8 @@
+         },
+         "node_modules/temp-file": {
+             "version": "3.4.0",
++            "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz",
++            "integrity": "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9697,6 +11946,8 @@
+         },
+         "node_modules/temp-file/node_modules/fs-extra": {
+             "version": "10.1.0",
++            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
++            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9709,7 +11960,9 @@
+             }
+         },
+         "node_modules/temp-file/node_modules/jsonfile": {
+-            "version": "6.2.0",
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
++            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9721,6 +11974,8 @@
+         },
+         "node_modules/temp-file/node_modules/universalify": {
+             "version": "2.0.1",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
++            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -9729,12 +11984,16 @@
+         },
+         "node_modules/temp/node_modules/balanced-match": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+             "dev": true,
+             "license": "MIT",
+             "peer": true
+         },
+         "node_modules/temp/node_modules/brace-expansion": {
+             "version": "1.1.14",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+             "dev": true,
+             "license": "MIT",
+             "peer": true,
+@@ -9745,6 +12004,9 @@
+         },
+         "node_modules/temp/node_modules/glob": {
+             "version": "7.2.3",
++            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+             "dev": true,
+             "license": "ISC",
+             "peer": true,
+@@ -9765,6 +12027,8 @@
+         },
+         "node_modules/temp/node_modules/minimatch": {
+             "version": "3.1.5",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+             "dev": true,
+             "license": "ISC",
+             "peer": true,
+@@ -9777,6 +12041,9 @@
+         },
+         "node_modules/temp/node_modules/rimraf": {
+             "version": "2.6.3",
++            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
++            "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
++            "deprecated": "Rimraf versions prior to v4 are no longer supported",
+             "dev": true,
+             "license": "ISC",
+             "peer": true,
+@@ -9789,11 +12056,15 @@
+         },
+         "node_modules/text-table": {
+             "version": "0.2.0",
++            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
++            "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/thenify": {
+             "version": "3.3.1",
++            "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
++            "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+             "license": "MIT",
+             "dependencies": {
+                 "any-promise": "^1.0.0"
+@@ -9801,6 +12072,8 @@
+         },
+         "node_modules/thenify-all": {
+             "version": "1.6.0",
++            "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
++            "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+             "license": "MIT",
+             "dependencies": {
+                 "thenify": ">= 3.1.0 < 4"
+@@ -9811,10 +12084,14 @@
+         },
+         "node_modules/through": {
+             "version": "2.3.8",
++            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
++            "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+             "license": "MIT"
+         },
+         "node_modules/tiny-async-pool": {
+             "version": "1.3.0",
++            "resolved": "https://registry.npmjs.org/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz",
++            "integrity": "sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9823,6 +12100,8 @@
+         },
+         "node_modules/tiny-async-pool/node_modules/semver": {
+             "version": "5.7.2",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
++            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -9831,20 +12110,28 @@
+         },
+         "node_modules/tiny-typed-emitter": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
++            "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==",
+             "license": "MIT"
+         },
+         "node_modules/tinybench": {
+             "version": "2.9.0",
++            "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
++            "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/tinyexec": {
+             "version": "0.3.2",
++            "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
++            "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/tinyglobby": {
+             "version": "0.2.16",
++            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
++            "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
+             "license": "MIT",
+             "dependencies": {
+                 "fdir": "^6.5.0",
+@@ -9859,6 +12146,8 @@
+         },
+         "node_modules/tinyglobby/node_modules/fdir": {
+             "version": "6.5.0",
++            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
++            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=12.0.0"
+@@ -9874,6 +12163,8 @@
+         },
+         "node_modules/tinyglobby/node_modules/picomatch": {
+             "version": "4.0.4",
++            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
++            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=12"
+@@ -9884,6 +12175,8 @@
+         },
+         "node_modules/tinypool": {
+             "version": "1.1.1",
++            "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
++            "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -9892,6 +12185,8 @@
+         },
+         "node_modules/tinyrainbow": {
+             "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
++            "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -9900,6 +12195,8 @@
+         },
+         "node_modules/tinyspy": {
+             "version": "4.0.4",
++            "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.4.tgz",
++            "integrity": "sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -9908,6 +12205,8 @@
+         },
+         "node_modules/tmp": {
+             "version": "0.2.5",
++            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
++            "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -9916,6 +12215,8 @@
+         },
+         "node_modules/tmp-promise": {
+             "version": "3.0.3",
++            "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz",
++            "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -9924,6 +12225,8 @@
+         },
+         "node_modules/to-regex-range": {
+             "version": "5.0.1",
++            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
++            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "is-number": "^7.0.0"
+@@ -9932,65 +12235,493 @@
+                 "node": ">=8.0"
+             }
+         },
++        "node_modules/tough-cookie": {
++            "version": "2.5.0",
++            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
++            "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
++            "license": "BSD-3-Clause",
++            "optional": true,
++            "dependencies": {
++                "psl": "^1.1.28",
++                "punycode": "^2.1.1"
++            },
++            "engines": {
++                "node": ">=0.8"
++            }
++        },
+         "node_modules/tr46": {
+             "version": "0.0.3",
++            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
++            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+             "license": "MIT"
+         },
+         "node_modules/truncate-utf8-bytes": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
++            "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==",
+             "dev": true,
+             "license": "WTFPL",
+             "dependencies": {
+                 "utf8-byte-length": "^1.0.1"
+             }
+         },
+-        "node_modules/ts-api-utils": {
+-            "version": "1.4.3",
+-            "dev": true,
++        "node_modules/ts-api-utils": {
++            "version": "1.4.3",
++            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
++            "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
++            "dev": true,
++            "license": "MIT",
++            "engines": {
++                "node": ">=16"
++            },
++            "peerDependencies": {
++                "typescript": ">=4.2.0"
++            }
++        },
++        "node_modules/ts-interface-checker": {
++            "version": "0.1.13",
++            "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
++            "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
++            "license": "Apache-2.0"
++        },
++        "node_modules/tslib": {
++            "version": "2.8.1",
++            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
++            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
++            "license": "0BSD",
++            "peer": true
++        },
++        "node_modules/tsx": {
++            "version": "4.21.0",
++            "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.21.0.tgz",
++            "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
++            "devOptional": true,
++            "license": "MIT",
++            "dependencies": {
++                "esbuild": "~0.27.0",
++                "get-tsconfig": "^4.7.5"
++            },
++            "bin": {
++                "tsx": "dist/cli.mjs"
++            },
++            "engines": {
++                "node": ">=18.0.0"
++            },
++            "optionalDependencies": {
++                "fsevents": "~2.3.3"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/aix-ppc64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz",
++            "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==",
++            "cpu": [
++                "ppc64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "aix"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/android-arm": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz",
++            "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==",
++            "cpu": [
++                "arm"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "android"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/android-arm64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz",
++            "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "android"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/android-x64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz",
++            "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "android"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz",
++            "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "darwin"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/darwin-x64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz",
++            "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "darwin"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz",
++            "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "freebsd"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz",
++            "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "freebsd"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/linux-arm": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz",
++            "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==",
++            "cpu": [
++                "arm"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/linux-arm64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz",
++            "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/linux-ia32": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz",
++            "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==",
++            "cpu": [
++                "ia32"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/linux-loong64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz",
++            "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==",
++            "cpu": [
++                "loong64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz",
++            "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==",
++            "cpu": [
++                "mips64el"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz",
++            "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==",
++            "cpu": [
++                "ppc64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz",
++            "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==",
++            "cpu": [
++                "riscv64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/linux-s390x": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz",
++            "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==",
++            "cpu": [
++                "s390x"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/linux-x64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz",
++            "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "linux"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/netbsd-arm64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz",
++            "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "netbsd"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz",
++            "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "netbsd"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/openbsd-arm64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz",
++            "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "openbsd"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz",
++            "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "openbsd"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/openharmony-arm64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz",
++            "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==",
++            "cpu": [
++                "arm64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "openharmony"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/sunos-x64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz",
++            "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==",
++            "cpu": [
++                "x64"
++            ],
++            "license": "MIT",
++            "optional": true,
++            "os": [
++                "sunos"
++            ],
++            "engines": {
++                "node": ">=18"
++            }
++        },
++        "node_modules/tsx/node_modules/@esbuild/win32-arm64": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz",
++            "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==",
++            "cpu": [
++                "arm64"
++            ],
+             "license": "MIT",
++            "optional": true,
++            "os": [
++                "win32"
++            ],
+             "engines": {
+-                "node": ">=16"
+-            },
+-            "peerDependencies": {
+-                "typescript": ">=4.2.0"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/ts-interface-checker": {
+-            "version": "0.1.13",
+-            "license": "Apache-2.0"
+-        },
+-        "node_modules/tslib": {
+-            "version": "2.8.1",
+-            "license": "0BSD",
+-            "peer": true
+-        },
+-        "node_modules/tsx": {
+-            "version": "4.21.0",
+-            "devOptional": true,
++        "node_modules/tsx/node_modules/@esbuild/win32-ia32": {
++            "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz",
++            "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==",
++            "cpu": [
++                "ia32"
++            ],
+             "license": "MIT",
+-            "dependencies": {
+-                "esbuild": "~0.27.0",
+-                "get-tsconfig": "^4.7.5"
+-            },
+-            "bin": {
+-                "tsx": "dist/cli.mjs"
+-            },
++            "optional": true,
++            "os": [
++                "win32"
++            ],
+             "engines": {
+-                "node": ">=18.0.0"
+-            },
+-            "optionalDependencies": {
+-                "fsevents": "~2.3.3"
++                "node": ">=18"
+             }
+         },
+-        "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {
++        "node_modules/tsx/node_modules/@esbuild/win32-x64": {
+             "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz",
++            "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==",
+             "cpu": [
+-                "arm64"
++                "x64"
+             ],
+             "license": "MIT",
+             "optional": true,
+             "os": [
+-                "darwin"
++                "win32"
+             ],
+             "engines": {
+                 "node": ">=18"
+@@ -9998,6 +12729,8 @@
+         },
+         "node_modules/tsx/node_modules/esbuild": {
+             "version": "0.27.7",
++            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz",
++            "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==",
+             "devOptional": true,
+             "hasInstallScript": true,
+             "license": "MIT",
+@@ -10038,6 +12771,9 @@
+         },
+         "node_modules/tsx/node_modules/fsevents": {
+             "version": "2.3.3",
++            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
++            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
++            "hasInstallScript": true,
+             "license": "MIT",
+             "optional": true,
+             "os": [
+@@ -10049,6 +12785,8 @@
+         },
+         "node_modules/tunnel-agent": {
+             "version": "0.6.0",
++            "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
++            "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+             "license": "Apache-2.0",
+             "dependencies": {
+                 "safe-buffer": "^5.0.1"
+@@ -10057,8 +12795,17 @@
+                 "node": "*"
+             }
+         },
++        "node_modules/tweetnacl": {
++            "version": "0.14.5",
++            "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
++            "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
++            "license": "Unlicense",
++            "optional": true
++        },
+         "node_modules/type-check": {
+             "version": "0.4.0",
++            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
++            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -10070,6 +12817,8 @@
+         },
+         "node_modules/type-fest": {
+             "version": "0.20.2",
++            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
++            "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+             "dev": true,
+             "license": "(MIT OR CC0-1.0)",
+             "engines": {
+@@ -10081,6 +12830,8 @@
+         },
+         "node_modules/typescript": {
+             "version": "5.8.3",
++            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
++            "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+             "license": "Apache-2.0",
+             "bin": {
+                 "tsc": "bin/tsc",
+@@ -10092,36 +12843,30 @@
+         },
+         "node_modules/ufo": {
+             "version": "1.6.3",
++            "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.3.tgz",
++            "integrity": "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==",
+             "license": "MIT"
+         },
+-        "node_modules/undici-types": {
+-            "version": "6.21.0",
+-            "license": "MIT"
+-        },
+-        "node_modules/unique-filename": {
+-            "version": "4.0.0",
++        "node_modules/undici": {
++            "version": "6.25.0",
++            "resolved": "https://registry.npmjs.org/undici/-/undici-6.25.0.tgz",
++            "integrity": "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg==",
+             "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "unique-slug": "^5.0.0"
+-            },
++            "license": "MIT",
+             "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
++                "node": ">=18.17"
+             }
+         },
+-        "node_modules/unique-slug": {
+-            "version": "5.0.0",
+-            "dev": true,
+-            "license": "ISC",
+-            "dependencies": {
+-                "imurmurhash": "^0.1.4"
+-            },
+-            "engines": {
+-                "node": "^18.17.0 || >=20.5.0"
+-            }
++        "node_modules/undici-types": {
++            "version": "6.21.0",
++            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
++            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
++            "license": "MIT"
+         },
+         "node_modules/universalify": {
+             "version": "0.1.2",
++            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
++            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 4.0.0"
+@@ -10129,6 +12874,8 @@
+         },
+         "node_modules/unplugin": {
+             "version": "3.0.0",
++            "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-3.0.0.tgz",
++            "integrity": "sha512-0Mqk3AT2TZCXWKdcoaufeXNukv2mTrEZExeXlHIOZXdqYoHHr4n51pymnwV8x2BOVxwXbK2HLlI7usrqMpycdg==",
+             "license": "MIT",
+             "dependencies": {
+                 "@jridgewell/remapping": "^2.3.5",
+@@ -10141,6 +12888,8 @@
+         },
+         "node_modules/unplugin-utils": {
+             "version": "0.3.1",
++            "resolved": "https://registry.npmjs.org/unplugin-utils/-/unplugin-utils-0.3.1.tgz",
++            "integrity": "sha512-5lWVjgi6vuHhJ526bI4nlCOmkCIF3nnfXkCMDeMJrtdvxTs6ZFCM8oNufGTsDbKv/tJ/xj8RpvXjRuPBZJuJog==",
+             "license": "MIT",
+             "dependencies": {
+                 "pathe": "^2.0.3",
+@@ -10155,6 +12904,8 @@
+         },
+         "node_modules/unplugin-utils/node_modules/picomatch": {
+             "version": "4.0.4",
++            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
++            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=12"
+@@ -10165,6 +12916,8 @@
+         },
+         "node_modules/unplugin/node_modules/picomatch": {
+             "version": "4.0.4",
++            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
++            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=12"
+@@ -10175,6 +12928,8 @@
+         },
+         "node_modules/unzip-crx-3": {
+             "version": "0.2.0",
++            "resolved": "https://registry.npmjs.org/unzip-crx-3/-/unzip-crx-3-0.2.0.tgz",
++            "integrity": "sha512-0+JiUq/z7faJ6oifVB5nSwt589v1KCduqIJupNVDoWSXZtWDmjDGO3RAEOvwJ07w90aoXoP4enKsR7ecMrJtWQ==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -10185,6 +12940,8 @@
+         },
+         "node_modules/update-browserslist-db": {
+             "version": "1.2.3",
++            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
++            "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
+             "funding": [
+                 {
+                     "type": "opencollective",
+@@ -10213,23 +12970,255 @@
+         },
+         "node_modules/uri-js": {
+             "version": "4.4.1",
+-            "dev": true,
++            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
++            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
++            "devOptional": true,
+             "license": "BSD-2-Clause",
+             "dependencies": {
+                 "punycode": "^2.1.0"
+             }
+         },
++        "node_modules/usocket": {
++            "version": "0.3.0",
++            "resolved": "https://registry.npmjs.org/usocket/-/usocket-0.3.0.tgz",
++            "integrity": "sha512-V/H02RNiaOCJZuPoKont/y12VJaImC6C5xW7OzPFjYu9qnig0yv9hyp9E7Wqjm6d8yZuZouH3NAfDATVMgh2SQ==",
++            "hasInstallScript": true,
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "bindings": "^1.5.0",
++                "nan": "^2.14.2",
++                "node-gyp": "^7.1.2"
++            }
++        },
++        "node_modules/usocket/node_modules/abbrev": {
++            "version": "1.1.1",
++            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
++            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
++            "license": "ISC",
++            "optional": true
++        },
++        "node_modules/usocket/node_modules/balanced-match": {
++            "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
++            "license": "MIT",
++            "optional": true
++        },
++        "node_modules/usocket/node_modules/brace-expansion": {
++            "version": "1.1.14",
++            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
++            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "balanced-match": "^1.0.0",
++                "concat-map": "0.0.1"
++            }
++        },
++        "node_modules/usocket/node_modules/chownr": {
++            "version": "2.0.0",
++            "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
++            "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
++            "license": "ISC",
++            "optional": true,
++            "engines": {
++                "node": ">=10"
++            }
++        },
++        "node_modules/usocket/node_modules/glob": {
++            "version": "7.2.3",
++            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
++            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
++            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "fs.realpath": "^1.0.0",
++                "inflight": "^1.0.4",
++                "inherits": "2",
++                "minimatch": "^3.1.1",
++                "once": "^1.3.0",
++                "path-is-absolute": "^1.0.0"
++            },
++            "engines": {
++                "node": "*"
++            },
++            "funding": {
++                "url": "https://github.com/sponsors/isaacs"
++            }
++        },
++        "node_modules/usocket/node_modules/minimatch": {
++            "version": "3.1.5",
++            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
++            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "brace-expansion": "^1.1.7"
++            },
++            "engines": {
++                "node": "*"
++            }
++        },
++        "node_modules/usocket/node_modules/minipass": {
++            "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
++            "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
++            "license": "ISC",
++            "optional": true,
++            "engines": {
++                "node": ">=8"
++            }
++        },
++        "node_modules/usocket/node_modules/minizlib": {
++            "version": "2.1.2",
++            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
++            "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "minipass": "^3.0.0",
++                "yallist": "^4.0.0"
++            },
++            "engines": {
++                "node": ">= 8"
++            }
++        },
++        "node_modules/usocket/node_modules/minizlib/node_modules/minipass": {
++            "version": "3.3.6",
++            "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
++            "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "yallist": "^4.0.0"
++            },
++            "engines": {
++                "node": ">=8"
++            }
++        },
++        "node_modules/usocket/node_modules/mkdirp": {
++            "version": "1.0.4",
++            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
++            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
++            "license": "MIT",
++            "optional": true,
++            "bin": {
++                "mkdirp": "bin/cmd.js"
++            },
++            "engines": {
++                "node": ">=10"
++            }
++        },
++        "node_modules/usocket/node_modules/node-gyp": {
++            "version": "7.1.2",
++            "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
++            "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
++            "license": "MIT",
++            "optional": true,
++            "dependencies": {
++                "env-paths": "^2.2.0",
++                "glob": "^7.1.4",
++                "graceful-fs": "^4.2.3",
++                "nopt": "^5.0.0",
++                "npmlog": "^4.1.2",
++                "request": "^2.88.2",
++                "rimraf": "^3.0.2",
++                "semver": "^7.3.2",
++                "tar": "^6.0.2",
++                "which": "^2.0.2"
++            },
++            "bin": {
++                "node-gyp": "bin/node-gyp.js"
++            },
++            "engines": {
++                "node": ">= 10.12.0"
++            }
++        },
++        "node_modules/usocket/node_modules/nopt": {
++            "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
++            "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "abbrev": "1"
++            },
++            "bin": {
++                "nopt": "bin/nopt.js"
++            },
++            "engines": {
++                "node": ">=6"
++            }
++        },
++        "node_modules/usocket/node_modules/semver": {
++            "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
++            "license": "ISC",
++            "optional": true,
++            "bin": {
++                "semver": "bin/semver.js"
++            },
++            "engines": {
++                "node": ">=10"
++            }
++        },
++        "node_modules/usocket/node_modules/tar": {
++            "version": "6.2.1",
++            "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
++            "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
++            "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "chownr": "^2.0.0",
++                "fs-minipass": "^2.0.0",
++                "minipass": "^5.0.0",
++                "minizlib": "^2.1.1",
++                "mkdirp": "^1.0.3",
++                "yallist": "^4.0.0"
++            },
++            "engines": {
++                "node": ">=10"
++            }
++        },
++        "node_modules/usocket/node_modules/yallist": {
++            "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
++            "license": "ISC",
++            "optional": true
++        },
+         "node_modules/utf8-byte-length": {
+             "version": "1.0.5",
++            "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz",
++            "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==",
+             "dev": true,
+             "license": "(WTFPL OR MIT)"
+         },
+         "node_modules/util-deprecate": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
++            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+             "license": "MIT"
+         },
++        "node_modules/uuid": {
++            "version": "3.4.0",
++            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
++            "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
++            "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
++            "license": "MIT",
++            "optional": true,
++            "bin": {
++                "uuid": "bin/uuid"
++            }
++        },
+         "node_modules/validate-npm-package-license": {
+             "version": "3.0.4",
++            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
++            "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "dependencies": {
+@@ -10239,6 +13228,8 @@
+         },
+         "node_modules/verror": {
+             "version": "1.10.1",
++            "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
++            "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
+             "dev": true,
+             "license": "MIT",
+             "optional": true,
+@@ -10253,6 +13244,8 @@
+         },
+         "node_modules/vite": {
+             "version": "6.4.2",
++            "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.2.tgz",
++            "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "esbuild": "^0.25.0",
+@@ -10325,6 +13318,8 @@
+         },
+         "node_modules/vite-node": {
+             "version": "3.2.4",
++            "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
++            "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -10346,6 +13341,8 @@
+         },
+         "node_modules/vite/node_modules/fdir": {
+             "version": "6.5.0",
++            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
++            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=12.0.0"
+@@ -10361,6 +13358,9 @@
+         },
+         "node_modules/vite/node_modules/fsevents": {
+             "version": "2.3.3",
++            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
++            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
++            "hasInstallScript": true,
+             "license": "MIT",
+             "optional": true,
+             "os": [
+@@ -10372,6 +13372,8 @@
+         },
+         "node_modules/vite/node_modules/picomatch": {
+             "version": "4.0.4",
++            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
++            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=12"
+@@ -10382,6 +13384,8 @@
+         },
+         "node_modules/vitest": {
+             "version": "3.2.4",
++            "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
++            "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -10453,6 +13457,8 @@
+         },
+         "node_modules/vitest/node_modules/picomatch": {
+             "version": "4.0.4",
++            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
++            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -10464,10 +13470,14 @@
+         },
+         "node_modules/vscode-uri": {
+             "version": "3.1.0",
++            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
++            "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
+             "license": "MIT"
+         },
+         "node_modules/vue": {
+             "version": "3.5.32",
++            "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.32.tgz",
++            "integrity": "sha512-vM4z4Q9tTafVfMAK7IVzmxg34rSzTFMyIe0UUEijUCkn9+23lj0WRfA83dg7eQZIUlgOSGrkViIaCfqSAUXsMw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/compiler-dom": "3.5.32",
+@@ -10487,6 +13497,8 @@
+         },
+         "node_modules/vue-eslint-parser": {
+             "version": "9.4.3",
++            "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz",
++            "integrity": "sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -10510,6 +13522,8 @@
+         },
+         "node_modules/vue-eslint-parser/node_modules/semver": {
+             "version": "7.7.4",
++            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
++            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+             "dev": true,
+             "license": "ISC",
+             "bin": {
+@@ -10521,6 +13535,8 @@
+         },
+         "node_modules/vue-router": {
+             "version": "5.0.4",
++            "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-5.0.4.tgz",
++            "integrity": "sha512-lCqDLCI2+fKVRl2OzXuzdSWmxXFLQRxQbmHugnRpTMyYiT+hNaycV0faqG5FBHDXoYrZ6MQcX87BvbY8mQ20Bg==",
+             "license": "MIT",
+             "dependencies": {
+                 "@babel/generator": "^7.28.6",
+@@ -10564,6 +13580,8 @@
+         },
+         "node_modules/vue-router/node_modules/@vue/devtools-api": {
+             "version": "8.1.1",
++            "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-8.1.1.tgz",
++            "integrity": "sha512-bsDMJ07b3GN1puVwJb/fyFnj/U2imyswK5UQVLZwVl7O05jDrt6BHxeG5XffmOOdasOj/bOmIjxJvGPxU7pcqw==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/devtools-kit": "^8.1.1"
+@@ -10571,6 +13589,8 @@
+         },
+         "node_modules/vue-router/node_modules/@vue/devtools-kit": {
+             "version": "8.1.1",
++            "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.1.1.tgz",
++            "integrity": "sha512-gVBaBv++i+adg4JpH71k9ppl4soyR7Y2McEqO5YNgv0BI1kMZ7BDX5gnwkZ5COYgiCyhejZG+yGNrBAjj6Coqg==",
+             "license": "MIT",
+             "dependencies": {
+                 "@vue/devtools-shared": "^8.1.1",
+@@ -10581,10 +13601,14 @@
+         },
+         "node_modules/vue-router/node_modules/@vue/devtools-shared": {
+             "version": "8.1.1",
++            "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.1.1.tgz",
++            "integrity": "sha512-+h4ttmJYl/txpxHKaoZcaKpC+pvckgLzIDiSQlaQ7kKthKh8KuwoLW2D8hPJEnqKzXOvu15UHEoGyngAXCz0EQ==",
+             "license": "MIT"
+         },
+         "node_modules/vue-router/node_modules/chokidar": {
+             "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
++            "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
+             "license": "MIT",
+             "dependencies": {
+                 "readdirp": "^5.0.0"
+@@ -10598,10 +13622,14 @@
+         },
+         "node_modules/vue-router/node_modules/perfect-debounce": {
+             "version": "2.1.0",
++            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-2.1.0.tgz",
++            "integrity": "sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==",
+             "license": "MIT"
+         },
+         "node_modules/vue-router/node_modules/picomatch": {
+             "version": "4.0.4",
++            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
++            "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=12"
+@@ -10612,6 +13640,8 @@
+         },
+         "node_modules/vue-router/node_modules/readdirp": {
+             "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
++            "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">= 20.19.0"
+@@ -10622,11 +13652,13 @@
+             }
+         },
+         "node_modules/vue-tsc": {
+-            "version": "3.2.6",
++            "version": "3.2.7",
++            "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.2.7.tgz",
++            "integrity": "sha512-zc1tL3HoQni1zGTGrwBVRQb7rGP5SWdu/m4rGB6JcnAC5MT5LFZIxF7Y+EJEnt4hGF23d60rXH7gRjHGb5KQQQ==",
+             "license": "MIT",
+             "dependencies": {
+                 "@volar/typescript": "2.4.28",
+-                "@vue/language-core": "3.2.6"
++                "@vue/language-core": "3.2.7"
+             },
+             "bin": {
+                 "vue-tsc": "bin/vue-tsc.js"
+@@ -10635,24 +13667,22 @@
+                 "typescript": ">=5.0.0"
+             }
+         },
+-        "node_modules/wcwidth": {
+-            "version": "1.0.1",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "defaults": "^1.0.3"
+-            }
+-        },
+         "node_modules/webidl-conversions": {
+             "version": "3.0.1",
++            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
++            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+             "license": "BSD-2-Clause"
+         },
+         "node_modules/webpack-virtual-modules": {
+             "version": "0.6.2",
++            "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
++            "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
+             "license": "MIT"
+         },
+         "node_modules/whatwg-url": {
+             "version": "5.0.0",
++            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
++            "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+             "license": "MIT",
+             "dependencies": {
+                 "tr46": "~0.0.3",
+@@ -10661,6 +13691,8 @@
+         },
+         "node_modules/which": {
+             "version": "2.0.2",
++            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
++            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+             "license": "ISC",
+             "dependencies": {
+                 "isexe": "^2.0.0"
+@@ -10674,6 +13706,8 @@
+         },
+         "node_modules/why-is-node-running": {
+             "version": "2.3.0",
++            "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
++            "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -10687,8 +13721,20 @@
+                 "node": ">=8"
+             }
+         },
++        "node_modules/wide-align": {
++            "version": "1.1.5",
++            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
++            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
++            "license": "ISC",
++            "optional": true,
++            "dependencies": {
++                "string-width": "^1.0.2 || 2 || 3 || 4"
++            }
++        },
+         "node_modules/word-wrap": {
+             "version": "1.2.5",
++            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
++            "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -10697,23 +13743,8 @@
+         },
+         "node_modules/wrap-ansi": {
+             "version": "7.0.0",
+-            "dev": true,
+-            "license": "MIT",
+-            "dependencies": {
+-                "ansi-styles": "^4.0.0",
+-                "string-width": "^4.1.0",
+-                "strip-ansi": "^6.0.0"
+-            },
+-            "engines": {
+-                "node": ">=10"
+-            },
+-            "funding": {
+-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+-            }
+-        },
+-        "node_modules/wrap-ansi-cjs": {
+-            "name": "wrap-ansi",
+-            "version": "7.0.0",
++            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
++            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -10730,10 +13761,14 @@
+         },
+         "node_modules/wrappy": {
+             "version": "1.0.2",
++            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
++            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+             "license": "ISC"
+         },
+         "node_modules/xml-name-validator": {
+             "version": "4.0.0",
++            "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
++            "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+             "dev": true,
+             "license": "Apache-2.0",
+             "engines": {
+@@ -10742,6 +13777,8 @@
+         },
+         "node_modules/xml2js": {
+             "version": "0.4.23",
++            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
++            "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+             "license": "MIT",
+             "dependencies": {
+                 "sax": ">=0.6.0",
+@@ -10753,6 +13790,8 @@
+         },
+         "node_modules/xml2js/node_modules/xmlbuilder": {
+             "version": "11.0.1",
++            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
++            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=4.0"
+@@ -10760,6 +13799,8 @@
+         },
+         "node_modules/xmlbuilder": {
+             "version": "15.1.1",
++            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
++            "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
+@@ -10768,6 +13809,8 @@
+         },
+         "node_modules/xtend": {
+             "version": "4.0.2",
++            "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
++            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=0.4"
+@@ -10775,6 +13818,8 @@
+         },
+         "node_modules/y18n": {
+             "version": "5.0.8",
++            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
++            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+             "dev": true,
+             "license": "ISC",
+             "engines": {
+@@ -10783,15 +13828,21 @@
+         },
+         "node_modules/yaku": {
+             "version": "0.16.7",
++            "resolved": "https://registry.npmjs.org/yaku/-/yaku-0.16.7.tgz",
++            "integrity": "sha512-Syu3IB3rZvKvYk7yTiyl1bo/jiEFaaStrgv1V2TIJTqYPStSMQVO8EQjg/z+DRzLq/4LIIharNT3iH1hylEIRw==",
+             "dev": true,
+             "license": "MIT"
+         },
+         "node_modules/yallist": {
+             "version": "3.1.1",
++            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
++            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+             "license": "ISC"
+         },
+         "node_modules/yaml": {
+             "version": "2.8.3",
++            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
++            "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
+             "license": "ISC",
+             "bin": {
+                 "yaml": "bin.mjs"
+@@ -10805,6 +13856,8 @@
+         },
+         "node_modules/yargs": {
+             "version": "17.7.2",
++            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
++            "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+             "dev": true,
+             "license": "MIT",
+             "dependencies": {
+@@ -10822,6 +13875,8 @@
+         },
+         "node_modules/yargs-parser": {
+             "version": "21.1.1",
++            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
++            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+             "dev": true,
+             "license": "ISC",
+             "engines": {
+@@ -10830,6 +13885,8 @@
+         },
+         "node_modules/yauzl": {
+             "version": "2.10.0",
++            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
++            "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+             "license": "MIT",
+             "dependencies": {
+                 "buffer-crc32": "~0.2.3",
+@@ -10838,6 +13895,8 @@
+         },
+         "node_modules/yocto-queue": {
+             "version": "0.1.0",
++            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
++            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+             "license": "MIT",
+             "engines": {
+                 "node": ">=10"
+@@ -10848,6 +13907,8 @@
+         },
+         "node_modules/zod": {
+             "version": "3.25.76",
++            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
++            "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+             "license": "MIT",
+             "funding": {
+                 "url": "https://github.com/sponsors/colinhacks"
+@@ -10855,6 +13916,8 @@
+         },
+         "node_modules/zod-validation-error": {
+             "version": "3.5.4",
++            "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.5.4.tgz",
++            "integrity": "sha512-+hEiRIiPobgyuFlEojnqjJnhFvg4r/i3cqgcm67eehZf/WBaK3g6cD02YU9mtdVxZjv8CzCA9n/Rhrs3yAAvAw==",
+             "dev": true,
+             "license": "MIT",
+             "engines": {
diff --git a/pkgs/by-name/so/solidtime-desktop/package.nix b/pkgs/by-name/so/solidtime-desktop/package.nix
index 60a9964b93c2..4ffd10268282 100644
--- a/pkgs/by-name/so/solidtime-desktop/package.nix
+++ b/pkgs/by-name/so/solidtime-desktop/package.nix
@@ -5,41 +5,56 @@
   fetchFromGitHub,
   copyDesktopItems,
   makeDesktopItem,
-  makeWrapper,
   electron,
+  xcodebuild,
+  desktopToDarwinBundle,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "solidtime-desktop";
-  version = "0.0.42";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "solidtime-io";
     repo = "solidtime-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ve8hT+Gja2HawJ9G6aELxserOfTK7dRNnfdHpY3WUDU=";
+    hash = "sha256-92w8vmzyQbIbRaQdXKKpeaLdxhLVpxyCE3RJjtJf0Jk=";
   };
 
   nativeBuildInputs = [
-    makeWrapper
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
     copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcodebuild
+    desktopToDarwinBundle
   ];
 
-  npmDepsHash = "sha256-y4bO2Rcr+JXkS+q1EbSjg3nNd3GCrB8A+t9ePJsE2L4=";
+  npmDepsHash = "sha256-EwtCA94ezhq36ooVvQWd4ThtxqWSOe7cr28V1thet2o=";
 
-  makeCacheWritable = true;
+  # fixes missing npm dependency errors
+  patches = [ ./missing-hashes.patch ];
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 
+  # rebuild better-sqlite3 for nixpkgs electron
+  preBuild = ''
+    export npm_config_nodedir="${electron.headers}"
+    export npm_config_target="${electron.version}"
+
+    npm rebuild --verbose --no-progress --offline
+
+    # reduce better-sqlite3 size
+    pushd node_modules/better-sqlite3
+    rm -rf src deps build/{deps,Release/{.deps,obj,obj.target,test_extension.node}}
+    popd
+  '';
+
   postInstall = ''
-    mkdir -p $out/share/icons
-    cp -a build/icon.png $out/share/icons/solidtime-desktop.png
-    cp -a . $out/share/solidtime-desktop
+    install -Dm644 build/icon.png $out/share/icons/hicolor/1024x1024/apps/solidtime-desktop.png
+    cp -r out $out/lib/node_modules/solidtime
 
     makeWrapper ${lib.getExe electron} $out/bin/solidtime-desktop \
-      --add-flags $out/share/solidtime-desktop
+      --add-flags $out/lib/node_modules/solidtime
   '';
 
   desktopItems = [
@@ -62,6 +77,6 @@ buildNpmPackage (finalAttrs: {
     license = lib.licenses.agpl3Only;
     mainProgram = "solidtime-desktop";
     maintainers = with lib.maintainers; [ hensoko ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix
index 653a91393e6d..84f640006638 100644
--- a/pkgs/by-name/so/sonarr/package.nix
+++ b/pkgs/by-name/so/sonarr/package.nix
@@ -62,6 +62,8 @@ buildDotnetModule {
   pname = "sonarr";
   inherit version src;
 
+  # Upstream expects to be ran from a "bin" directory
+  installPath = "${placeholder "out"}/lib/sonarr/bin";
   strictDeps = true;
   nativeBuildInputs = [
     nodejs
@@ -87,12 +89,18 @@ buildDotnetModule {
     yarn --offline run build --env production
   '';
   postInstall =
+    let
+      packageInfo = writers.writeText "package_info" ''
+        PackageVersion=${version}
+        PackageAuthor=[NixOS](https://nixos.org)
+      '';
+    in
     lib.optionalString withFFmpeg ''
-      rm -- "$out/lib/sonarr/ffprobe"
-      ln -s -- "$ffprobe" "$out/lib/sonarr/ffprobe"
+      ln -sf -- "$ffprobe" "$out/lib/sonarr/bin/ffprobe"
     ''
     + ''
-      cp -a -- _output/UI "$out/lib/sonarr/UI"
+      cp -a -- _output/UI "$out/lib/sonarr/bin/UI"
+      ln -s ${packageInfo} $out/lib/sonarr/package_info
     '';
   # Add an alias for compatibility with Sonarr v3 package.
   postFixup = ''
diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix
index 98824e29040d..06f8c9fd1134 100644
--- a/pkgs/by-name/so/sope/package.nix
+++ b/pkgs/by-name/so/sope/package.nix
@@ -2,7 +2,6 @@
   lib,
   clangStdenv,
   fetchFromGitHub,
-  fetchpatch,
   libxml2,
   openssl,
   openldap,
@@ -15,23 +14,15 @@
 
 clangStdenv.mkDerivation rec {
   pname = "sope";
-  version = "5.12.3";
+  version = "5.12.7";
 
   src = fetchFromGitHub {
     owner = "Alinto";
     repo = "sope";
     rev = "SOPE-${version}";
-    hash = "sha256-GeJ1o8Juw7jm3/pkfuMqVpfMxKewU6hQmBoPmb0HgTc=";
+    hash = "sha256-0G28qDXygDe/TJ2znNE+NVQry3bkqUO59jqtJm/t2S4=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2025-53603.patch";
-      url = "https://github.com/Alinto/sope/commit/e954ab0cd254dc1837af690329b04504410cbe63.patch";
-      hash = "sha256-F/dexphHH8S90njmTDvm+NZChbKekv78tUgB+VFOsSY=";
-    })
-  ];
-
   nativeBuildInputs = lib.optional (libpq != null) [ libpq.pg_config ];
   buildInputs = [
     gnustep-base
diff --git a/pkgs/by-name/so/soundtouch/package.nix b/pkgs/by-name/so/soundtouch/package.nix
index 911006b124db..5042f9087517 100644
--- a/pkgs/by-name/so/soundtouch/package.nix
+++ b/pkgs/by-name/so/soundtouch/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "soundtouch";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromCodeberg {
     owner = "soundtouch";
     repo = "soundtouch";
     rev = finalAttrs.version;
-    hash = "sha256-7JUBAFURKtPCZrcKqL1rOLdsYMd7kGe7wY0JUl2XPvw=";
+    hash = "sha256-srSeFykj6jxAO2OaFCgA8J7SbD2REOKtRp3V17bCFQI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix
index 67dbfd29f629..5e45df5959d4 100644
--- a/pkgs/by-name/so/soupault/package.nix
+++ b/pkgs/by-name/so/soupault/package.nix
@@ -12,7 +12,7 @@
 
 ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "soupault";
-  version = "5.2.1";
+  version = "5.3.0";
 
   minimalOCamlVersion = "5.3";
 
@@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
       "https://github.com/PataphysicalSociety/soupault/archive/${finalAttrs.version}.tar.gz"
       "https://codeberg.org/PataphysicalSociety/soupault/archive/${finalAttrs.version}.tar.gz"
     ];
-    hash = "sha256-jwVos7KeQ6fBuBWUslFyvrwDuJ3Wgb7pieERm9+b3Zg=";
+    hash = "sha256-HrvLQQdjTISMO+9KPhRuEGyajFaOLGEevnaGUYzgz6M=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix b/pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix
index 65387e276699..f2dff52adc3d 100644
--- a/pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix
+++ b/pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace Makefile \
-      --replace "-march=native" ""
+      --replace-fail "-march=native" "" \
+      --replace-fail "-std=c++11" "-std=c++17"
   '';
 
   sourceRoot = "${finalAttrs.src.name}/cpp";
@@ -53,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     license = lib.licenses.nistSoftware;
     maintainers = with lib.maintainers; [
-      orichter
       thillux
     ];
   };
diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix
index ac63cfddcdf1..a12a42888ddc 100644
--- a/pkgs/by-name/sp/spacectl/package.nix
+++ b/pkgs/by-name/sp/spacectl/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "spacectl";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchFromGitHub {
     owner = "spacelift-io";
     repo = "spacectl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-GW8jeET8MBvyFbGZWblU2mj9kWSK9cfhdYj+UXxbt5s=";
+    hash = "sha256-YXPiB/RZsilteKzoOAsQ2aJ1qIlKIicToSVpS8pUWd4=";
   };
 
   vendorHash = "sha256-wc6pRnCdIL7Se98eDfyU5OMOghJ2VrR1POM7lHo3Af8=";
@@ -30,7 +30,7 @@ buildGoModule (finalAttrs: {
       installShellCompletion --cmd spacectl \
         --bash <(${emulator} $out/bin/spacectl completion bash) \
         --fish <(${emulator} $out/bin/spacectl completion fish) \
-        --zsh <(${emulator} $out/bin/spacectl completion zsh) \
+        --zsh <(${emulator} $out/bin/spacectl completion zsh)
     '';
 
   meta = {
diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix
index b813676aea24..17bb24a7275d 100644
--- a/pkgs/by-name/sp/sparkle/package.nix
+++ b/pkgs/by-name/sp/sparkle/package.nix
@@ -43,20 +43,20 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sparkle";
-  version = "1.26.3";
+  version = "1.26.4";
 
   src = fetchFromGitHub {
     owner = "xishang0128";
     repo = "sparkle";
     tag = finalAttrs.version;
-    hash = "sha256-36eqSgXDl3ASDO4wn8cCptSE4qf3FwFyl+TEhCzhGwA=";
+    hash = "sha256-+3MHCy1N1/kOVFYDNvNiP/jkL0HHi2RwfeIqe2Z40O8=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-uiUp2YtPMvG0d9GIedxNzkY0TR/bdbWQv4IFiVZew5s=";
+    hash = "sha256-Us4qsCJdRZKYJQAgcqeStX7MfEqBWr4rKXBqU2K+KZI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix
index 11589629b129..c25ad11767cd 100644
--- a/pkgs/by-name/sp/spdlog/package.nix
+++ b/pkgs/by-name/sp/spdlog/package.nix
@@ -25,6 +25,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-bL3hQmERXNwGmDoi7+wLv/TkppGhG6cO47k1iZvJGzY=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Remove when updating past 1.17.0. Fixes `pkgsMusl.spdlog` build.
+      url = "https://github.com/gabime/spdlog/commit/0f7562a0f9273cfc71fddc6ae52ebff7a490fa04.patch";
+      name = "tests-timezone-Provide-DST-rules-when-setting-TZ-on-POSIX-systems";
+      hash = "sha256-jsw3AgTXeRdU2ncuzAkYp6SPrBKntz2I3NLOjAPkW78=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
   # Required to build tests, even if they aren't executed
   buildInputs = [ catch2_3 ];
diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix
index 68a108e8b2ff..43412ece7307 100644
--- a/pkgs/by-name/sp/speakersafetyd/package.nix
+++ b/pkgs/by-name/sp/speakersafetyd/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "speakersafetyd";
-  version = "1.1.2-unstable-2026-03-28";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "AsahiLinux";
     repo = "speakersafetyd";
-    rev = "a97c341e39e3f89e99f65d2a35d4e060b3b0168a";
-    hash = "sha256-FWpO2cp8licwevpAP25fmiIUEehkQp61E4A7RmsKJH0=";
+    tag = finalAttrs.version;
+    hash = "sha256-tHHoVJqWcip5u/e7M9l74opdzfe0Y9Q6ItIT7w7XfA8=";
   };
 
-  cargoHash = "sha256-xcCnzDN/U3sp12UwznaYjalzcKxo8Eo4vHnO/Sf++Zk=";
+  cargoHash = "sha256-v0w/eA/qd9xBivgq7BgdaGRGDdX2NA1gbRgv84cB6d4=";
 
   nativeBuildInputs = [
     pkg-config
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     substituteInPlace Makefile \
       --replace-fail "target/release" \
-                     "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType" \
+                     "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType"
   '';
 
   installFlags = [
diff --git a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
index 2511fea120e1..7eaabdcf90e1 100644
--- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
+++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spectre-meltdown-checker";
-  version = "26.21.0401891";
+  version = "26.33.0420460";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "spectre-meltdown-checker";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cIPM4SFP5NS2eE37fQNb+l6W7mTcmsE1viUEUF+E8SM=";
+    hash = "sha256-lydZqvX20QmulwTrsGnInTF1j6CmJw8DUFfAaq0R5l4=";
   };
 
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/by-name/sp/speedscope/package.nix b/pkgs/by-name/sp/speedscope/package.nix
index cfa8807566e7..3c59e76b7a5b 100644
--- a/pkgs/by-name/sp/speedscope/package.nix
+++ b/pkgs/by-name/sp/speedscope/package.nix
@@ -5,15 +5,15 @@
   versionCheckHook,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "speedscope";
-  version = "1.24.0";
+  version = "1.25.0";
 
   src = fetchFromGitHub {
     owner = "jlfwong";
     repo = "speedscope";
-    tag = "v${version}";
-    hash = "sha256-QL+Hm3ujfZeKHMoNgQdxYStgWOIbxjDmXMHKnWddTfs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2kBgOMWSr3XEkcfzetA4njIE2co+mHoPPUFmKn0tMVk=";
 
     # scripts/prepack.sh wants to extract the git commit from .git
     # We don't want to keep .git for reproducibility reasons, so save the commit
@@ -25,7 +25,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-MgCIiVeq9w5XRPIsZ/9AbZpVwRQdzZgK7VC5Gl7cn78=";
+  npmDepsHash = "sha256-hgvO5iU9lerTa9FJRHq9lm67lgrFSM5AR02GShsM3P8=";
 
   patches = [
     ./fix-shebang.patch
@@ -37,11 +37,6 @@ buildNpmPackage rec {
 
   dontNpmBuild = true;
 
-  postFixup = ''
-    # Remove some dangling symlinks
-    rm $out/lib/node_modules/speedscope/node_modules/.bin/sshpk*
-  '';
-
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
@@ -55,4 +50,4 @@ buildNpmPackage rec {
     mainProgram = "speedscope";
     maintainers = with lib.maintainers; [ thomasjm ];
   };
-}
+})
diff --git a/pkgs/by-name/sp/spicedb-zed/package.nix b/pkgs/by-name/sp/spicedb-zed/package.nix
index 105954ba85aa..74541fb64c27 100644
--- a/pkgs/by-name/sp/spicedb-zed/package.nix
+++ b/pkgs/by-name/sp/spicedb-zed/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "zed";
-  version = "0.36.1";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-42c2utcrUOhLwFS7AdsR2/6vtBLo7Vitx3i9k7pFs7o=";
+    hash = "sha256-kF16ZmIOw80esknKJvHYFWrx4FG/kn+Il5xnC1JmAn4=";
   };
 
-  vendorHash = "sha256-WgTOwXdH1jgK7Un8UA/PX9iYt0VyAGMdpxYVXM6KyWE=";
+  vendorHash = "sha256-e/VrFEKVVAAtClAzFw2XV3cWVmto90qzMKVLpZjKZ8o=";
 
   ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'" ];
 
diff --git a/pkgs/by-name/sp/spicedb/package.nix b/pkgs/by-name/sp/spicedb/package.nix
index 520d9874fc52..b85e0aaa8e82 100644
--- a/pkgs/by-name/sp/spicedb/package.nix
+++ b/pkgs/by-name/sp/spicedb/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "spicedb";
-  version = "1.51.1";
+  version = "1.52.0";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I5srDvkGDe0QQirDtMzTGdz8TS625E8wHYJDdRADhhc=";
+    hash = "sha256-W9NYkZ+t2W0t7QsixCYxS8+Qke+RYj6IcdeyJBgEZsw=";
   };
 
-  vendorHash = "sha256-vVkqu2YR/puTAdsPZFWrPDo57Npke4+vngJBcQeQr8Q=";
+  vendorHash = "sha256-Y3cQykB/GqIunWKHFQrUOuC26CduVHLAEfmKVqvvJMY=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'"
diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix
index 1aeb7495b531..3bdaaee15a92 100644
--- a/pkgs/by-name/sp/spicetify-cli/package.nix
+++ b/pkgs/by-name/sp/spicetify-cli/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "spicetify-cli";
-  version = "2.43.1";
+  version = "2.43.2";
 
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yAoIHKPN1o0Ls6klPvDodu+uWCYRmbh437KNbNv3F0k=";
+    hash = "sha256-77OZVDtybkYI5R3tZ7q2cLJ+Ixn8WB4CP4qP6Yp535g=";
   };
 
   vendorHash = "sha256-uuvlu5yocqnDh6OO5a4Ngp5SahqURc/14fcg1Kr9sec=";
diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
index 10f0b32693cb..fd8ff7249dc8 100644
--- a/pkgs/by-name/sp/spire/package.nix
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "spire";
-  version = "1.14.4";
+  version = "1.14.5";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     owner = "spiffe";
     repo = "spire";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-Ga4fV1a3vlOez12a6lMHoh2CUF9Rkclvjz2FScu6krc=";
+    sha256 = "sha256-g8XAD/a6PKrhJn0BKR8V+x25cJG9q2SuXA1mNXq6Reo=";
   };
 
   # Needed for github.co/google/go-tpm-tools/simulator  which contains non-go files that `go mod vendor` strips
diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix
index c97272ca8d3a..81ba6c313fa8 100644
--- a/pkgs/by-name/sp/spirv-cross/package.nix
+++ b/pkgs/by-name/sp/spirv-cross/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Tool designed for parsing and converting SPIR-V to other shader languages";
     homepage = "https://github.com/KhronosGroup/SPIRV-Cross";
-    changelog = "https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/vulkan-sdk-${finalAttrs.version}";
     platforms = lib.platforms.all;
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ Flakebi ];
diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix
index f38577f328ea..7508ecf07a87 100644
--- a/pkgs/by-name/sp/splayer/package.nix
+++ b/pkgs/by-name/sp/splayer/package.nix
@@ -91,7 +91,6 @@ stdenv.mkDerivation (finalAttrs: {
     # of better-sqlite3. It has a native part that it wants to build using a
     # script which is disallowed.
     # What's more, we need to use headers from electron to avoid ABI mismatches.
-    # Adapted from mkYarnModules.
     for f in $(find . -path '*/node_modules/better-sqlite3' -type d); do
       (cd "$f" && (
       npm run build-release --offline --nodedir="${electron.headers}"
diff --git a/pkgs/by-name/sp/splix/package.nix b/pkgs/by-name/sp/splix/package.nix
index a002f6a39889..8336703d3b28 100644
--- a/pkgs/by-name/sp/splix/package.nix
+++ b/pkgs/by-name/sp/splix/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     mv -v *.ppd ppd/
     substituteInPlace src/pstoqpdl.cpp \
       --replace "RASTERDIR \"/\" RASTERTOQPDL" "\"$out/lib/cups/filter/rastertoqpdl\"" \
-      --replace "RASTERDIR" "\"${cups-filters}/lib/cups/filter\"" \
+      --replace "RASTERDIR" "\"${cups-filters}/lib/cups/filter\""
   '';
 
   makeFlags = [
diff --git a/pkgs/by-name/sp/spotatui/package.nix b/pkgs/by-name/sp/spotatui/package.nix
index 66aa257025cb..017f7e286be4 100644
--- a/pkgs/by-name/sp/spotatui/package.nix
+++ b/pkgs/by-name/sp/spotatui/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "spotatui";
-  version = "0.38.0";
+  version = "0.38.1";
 
   src = fetchFromGitHub {
     owner = "LargeModGames";
     repo = "spotatui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6XsKlM4KLwRZk+uJY60a0rKHIEv1ieZPZoBZpRG1sQ0=";
+    hash = "sha256-cHuqSnNLnR8LLYjjlrgJTEb/MJe4lBJP7GY3D7/AUqE=";
   };
 
-  cargoHash = "sha256-5aj35NGRFb1DiEPU1RGKkvz/wMOIjO1HzkX45GEFbPs=";
+  cargoHash = "sha256-dlEsghdnNVbi086WgNImUcM+OO7vuBaNit3Wcaw5/mA=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional withPipewireVisualizer rustPlatform.bindgenHook;
 
diff --git a/pkgs/by-name/sp/spruce/package.nix b/pkgs/by-name/sp/spruce/package.nix
index bbbf2625b3c9..178e5edea914 100644
--- a/pkgs/by-name/sp/spruce/package.nix
+++ b/pkgs/by-name/sp/spruce/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "spruce";
-  version = "1.31.1";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "geofffranks";
     repo = "spruce";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wLxPHaCU0fciSIdK26dV4XOnJsp5EKKEXzgspWC1GvA=";
+    hash = "sha256-+vWevbRp6SyyCxj/EzzyLkqNsF/E4Zyk7qwI5oCDvdk=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/sq/sq/package.nix b/pkgs/by-name/sq/sq/package.nix
index 009e2625ca49..fd94b6d559bf 100644
--- a/pkgs/by-name/sq/sq/package.nix
+++ b/pkgs/by-name/sq/sq/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sq";
-  version = "0.48.12";
+  version = "0.50.0";
 
   src = fetchFromGitHub {
     owner = "neilotoole";
     repo = "sq";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-TAQiTZx13rYlJlT41/RE03Ro4CRjECBdQz42YSI1j74=";
+    hash = "sha256-K9bqV9iJADP3yHSay6ZUv+ohakbD5sIEDJusTGSoqec=";
   };
 
-  vendorHash = "sha256-jfUUVbvrdFX/++xRAgz7Tzqgu5AK2ZDmubWnWBIQeKE=";
+  vendorHash = "sha256-w08vGn2AxdZVQU/E/RPBipqFOuujnAjpvSluw/a8zjY=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/sq/sqlc/package.nix b/pkgs/by-name/sq/sqlc/package.nix
index 33f43cbebdaa..eca36eae22f0 100644
--- a/pkgs/by-name/sq/sqlc/package.nix
+++ b/pkgs/by-name/sq/sqlc/package.nix
@@ -9,17 +9,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "sqlc";
-  version = "1.31.0";
+  version = "1.31.1";
 
   src = fetchFromGitHub {
     owner = "sqlc-dev";
     repo = "sqlc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1HQXj3rmfPyOw3Cex3jRByEwzXhcYpWpj8w4Z2Cylp8=";
+    hash = "sha256-/skb7p3s9TaQE699UCprk1D6S+G/T8Ek9/ADOtS/n44=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-SVc7XZERh47hhfTr9bExjZcZrNz0FO/OVEQYbPVqSWM=";
+  vendorHash = "sha256-+kSAupLQwTzJdgnhlqulEtRcDj9gqSq8uTnWNyDLZew=";
 
   subPackages = [ "cmd/sqlc" ];
 
diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix
index a40c0c5c690e..4a217b0a182d 100644
--- a/pkgs/by-name/sq/squeezelite/package.nix
+++ b/pkgs/by-name/sq/squeezelite/package.nix
@@ -39,13 +39,13 @@ stdenv.mkDerivation {
   pname = binName;
   # versions are specified in `squeezelite.h`
   # see https://github.com/ralph-irving/squeezelite/issues/29
-  version = "2.0.0.1561";
+  version = "2.0.0.1563";
 
   src = fetchFromGitHub {
     owner = "ralph-irving";
     repo = "squeezelite";
-    rev = "e977d1045f5f4c1a51ba0d66387f26fd19a2f42a";
-    hash = "sha256-VY9iMGUgI+VCoadYYnfB8GUItjl/U/hh1pV2yu41miE=";
+    rev = "39fe3c8b1dd4e852fd8410bc480d7d709056859d";
+    hash = "sha256-0zBppeMSK/1m4Nxla6wdWeVPDFOUfVCaMKFHZGLqbrE=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/sr/sratom/package.nix b/pkgs/by-name/sr/sratom/package.nix
index 72e707f5ce34..3e499145752c 100644
--- a/pkgs/by-name/sr/sratom/package.nix
+++ b/pkgs/by-name/sr/sratom/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "sratom";
-  version = "0.6.20";
+  version = "0.6.22";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.drobilla.net/${pname}-${version}.tar.xz";
-    hash = "sha256-OCbpGGyrxDyl41n8w9gjgGAjL1+KIJC+XcmrOQ5bZHc=";
+    hash = "sha256-Agm30PIslqu0FnIu1zWwkzvkeTHs/0qksm3td2C08lI=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/sr/sratoolkit/attribute_unused.patch b/pkgs/by-name/sr/sratoolkit/attribute_unused.patch
deleted file mode 100644
index 203a9921fac6..000000000000
--- a/pkgs/by-name/sr/sratoolkit/attribute_unused.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/libs/kxml/xml.c b/libs/kxml/xml.c
-index ce445424..41e21612 100644
---- a/libs/kxml/xml.c
-+++ b/libs/kxml/xml.c
-@@ -46,6 +46,9 @@ struct s_KNodeNamelist;
- #include <assert.h>
- #include <string.h>
- 
-+#ifndef ATTRIBUTE_UNUSED
-+#define ATTRIBUTE_UNUSED
-+#endif
- 
- #define XML_DEBUG(msg) DBGMSG (DBG_XML, DBG_FLAG(DBG_XML_XML), msg)
- 
diff --git a/pkgs/by-name/sr/sratoolkit/package.nix b/pkgs/by-name/sr/sratoolkit/package.nix
index 52c8e69dd727..8f4f4e9853d0 100644
--- a/pkgs/by-name/sr/sratoolkit/package.nix
+++ b/pkgs/by-name/sr/sratoolkit/package.nix
@@ -16,17 +16,15 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "sratoolkit";
 
   # NOTE: When updating make sure to update ncbi-vdb as well for versions to match
-  version = "3.3.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "ncbi";
     repo = "sra-tools";
     tag = finalAttrs.version;
-    hash = "sha256-Lv4EWAKJ6F5uvsXgo2Bx3JyY9lYaL1El9Jbi2LidmHo=";
+    hash = "sha256-JMdJ8F4n9WgdP2oj8MN1+QlxCSmqFzsjAovx/+RyVjk=";
   };
 
-  patches = [ ./attribute_unused.patch ];
-
   cmakeFlags = [
     "-DVDB_INCDIR=${ncbi-vdb}/include"
     "-DVDB_LIBDIR=${ncbi-vdb}/lib"
diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix
index 3b82e71737fa..b8e105bd4360 100644
--- a/pkgs/by-name/sr/src-cli/package.nix
+++ b/pkgs/by-name/sr/src-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "src-cli";
-  version = "7.1.0";
+  version = "7.2.0";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "src-cli";
     rev = version;
-    hash = "sha256-OC2ElMud6UBDAzCHILb2fd2pO5yy8JsDziTNvSZybIU=";
+    hash = "sha256-s8KkOjyYoQY2+XBUi5kVc1w9QKuBXhzl5Z0/9/LOYto=";
   };
 
-  vendorHash = "sha256-oPHDdWDbVuqWeutzHCv7rL9/FrbGkbLQezpZDUFVNfY=";
+  vendorHash = "sha256-bwCHcPo2cqa6xP+SVXOKq2bqP3AODMS+5rKz18kxdNw=";
 
   subPackages = [
     "cmd/src"
diff --git a/pkgs/by-name/sr/srm/package.nix b/pkgs/by-name/sr/srm/package.nix
index 55c7863e739b..3ed2d296751e 100644
--- a/pkgs/by-name/sr/srm/package.nix
+++ b/pkgs/by-name/sr/srm/package.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation {
 
   patches = [ ./fix-output-in-verbose-mode.patch ];
   nativeBuildInputs = [ autoreconfHook ];
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
 
   meta = {
     description = "Delete files securely";
diff --git a/pkgs/by-name/sr/srtp/package.nix b/pkgs/by-name/sr/srtp/package.nix
index d402242e5200..84ec31998fad 100644
--- a/pkgs/by-name/sr/srtp/package.nix
+++ b/pkgs/by-name/sr/srtp/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libsrtp";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "cisco";
     repo = "libsrtp";
     rev = "v${version}";
-    sha256 = "sha256-5AFsigie3YUrfvZYEIopjBJSNdoKoFlMBP9lv68+f6Q=";
+    sha256 = "sha256-QHDcPFzDhlvgLPnXfFU6247OirscU41SzKStiTPU0oQ=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ss/ssh-agent-switcher/package.nix b/pkgs/by-name/ss/ssh-agent-switcher/package.nix
index 24507ef5306b..62b720db454c 100644
--- a/pkgs/by-name/ss/ssh-agent-switcher/package.nix
+++ b/pkgs/by-name/ss/ssh-agent-switcher/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ssh-agent-switcher";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "jmmv";
     repo = "ssh-agent-switcher";
     tag = "ssh-agent-switcher-${finalAttrs.version}";
-    hash = "sha256-p9W0H25pWDB+GCrwLwuVruX9p8b8kICpp+6I11ym1aw=";
+    hash = "sha256-XAIupGVU8D4tmZXZ3/5lKiHbvBlxgNQXL0T9Htp7Zmo=";
   };
 
-  cargoHash = "sha256-WioA/RjXOAHM9QWl/lxnb7gqzcp76rus7Rv+IfCYceg=";
+  cargoHash = "sha256-dbeUye20E2nQcJPyUCpZT68T95dopgoIlBm8rOoaZ6Y=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ss/ssh-vault/package.nix b/pkgs/by-name/ss/ssh-vault/package.nix
index 13efd74cdb4e..cb9d521feffa 100644
--- a/pkgs/by-name/ss/ssh-vault/package.nix
+++ b/pkgs/by-name/ss/ssh-vault/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ssh-vault";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchFromGitHub {
     owner = "ssh-vault";
     repo = "ssh-vault";
     tag = finalAttrs.version;
-    hash = "sha256-+ZKLv4DL1JS4kfD825eZsAOZqL2sM9hJ7XnlPuEi8lE=";
+    hash = "sha256-BC10Nir/MUxhD6QSF8p7cDdlrscC72Eoot/u8RAwM8g=";
   };
 
-  cargoHash = "sha256-IFifwaQY2Zwey1WaCKGSEaLa+B0FoJt3WiwDHP9O72k=";
+  cargoHash = "sha256-NRFmCeL8ZhJ1Y29VPWK3Yqg6losB/9+QE/8GqpUeJTs=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ss/sshuttle/package.nix b/pkgs/by-name/ss/sshuttle/package.nix
index dbdf4dbfc968..e30011d6803f 100644
--- a/pkgs/by-name/ss/sshuttle/package.nix
+++ b/pkgs/by-name/ss/sshuttle/package.nix
@@ -58,7 +58,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
             net-tools
           ]
         )
-      }" \
+      }"
   '';
 
   meta = {
diff --git a/pkgs/by-name/ss/ssimulacra2/package.nix b/pkgs/by-name/ss/ssimulacra2/package.nix
index 7c40ee7d485e..9c7fb5839bdb 100644
--- a/pkgs/by-name/ss/ssimulacra2/package.nix
+++ b/pkgs/by-name/ss/ssimulacra2/package.nix
@@ -28,7 +28,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libpng
-    libhwy
+    (libhwy.overrideAttrs rec {
+      version = "0.15.0";
+      src = fetchFromGitHub {
+        owner = "google";
+        repo = "highway";
+        rev = version;
+        hash = "sha256-v2HyyHtBydr7QiI83DW1yRv2kWjUOGxFT6mmdrN9XPo=";
+      };
+      patches = [ ];
+    })
     lcms2
     giflib
   ];
diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index 592e2578a215..beee09671db1 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "stackit-cli";
-  version = "0.60.0";
+  version = "0.61.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-PS5FJUA3+3gBJ7tY/Dl8HUz78GQEl3wS9BYe7MRIxoE=";
+    hash = "sha256-kuo0Fj/LgkbTLp+F6xvPUOS5vabjigwX4fVWLQVwO2I=";
   };
 
-  vendorHash = "sha256-HZ5k1AIuSsAdVIHMzo3awguw+AlctLMicLRzzGgM7xA=";
+  vendorHash = "sha256-NYvqQVDqSV5wyQGEkoAHnT0i+iNF6DKIYIwyiYY5G6M=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix
index 3bf963480ca9..68d0d8fbc3e3 100644
--- a/pkgs/by-name/st/stackql/package.nix
+++ b/pkgs/by-name/st/stackql/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "stackql";
-  version = "0.10.421";
+  version = "0.10.426";
 
   src = fetchFromGitHub {
     owner = "stackql";
     repo = "stackql";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-POHOGkjnf9zwg4mUpd0dyQXQvSitjwB+6wieVvI8DaE=";
+    hash = "sha256-P/TvqCN2nM8j+41bc1bYCN4sYwkhPlNmsoNuYYNI2Mw=";
   };
 
   vendorHash = "sha256-go1i5xFt3AE+K37+uZz9sjjsgD521fZ7/nPu26531Q8=";
diff --git a/pkgs/by-name/st/stacktile/package.nix b/pkgs/by-name/st/stacktile/package.nix
index d51cfcb08b1e..7796617df9cb 100644
--- a/pkgs/by-name/st/stacktile/package.nix
+++ b/pkgs/by-name/st/stacktile/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromSourcehut,
+  fetchpatch,
   wayland,
   wayland-scanner,
 }:
@@ -17,6 +18,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-IOFxgYMjh92jx2CPfBRZDL/1ucgfHtUyAL5rS2EG+Gc=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compilation.patch?h=stacktile&id=388a522b69e34c01cc5d57341d8578470a7dccfb";
+      hash = "sha256-y5ArQyjIqT2ICmm8ZYDHZ04DwGgw2d7wsgoH5XJPZf0=";
+    })
+  ];
+
   outputs = [
     "out"
     "man"
diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix
index 8f3cddc8d775..91e61255afde 100644
--- a/pkgs/by-name/st/starboard/package.nix
+++ b/pkgs/by-name/st/starboard/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "starboard";
-  version = "0.15.32";
+  version = "0.15.33";
 
   __darwinAllowLocalNetworking = true; # for tests
 
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {
     owner = "aquasecurity";
     repo = "starboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rFElikd/R5i7Itp+3XFgPRCoWd61X0IYszbcOMhcKRc=";
+    hash = "sha256-wVjwDb7VKjZSPHROTpjpR8rJvgqXJmXKJbJJXHYYxzY=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-6SqghCM2dwNyosZo0wfMMHlgrgY+Ts+7lIN7+qSp0GI=";
+  vendorHash = "sha256-UpPhTP+JObPJJMpMKPDriRgA5DETkMUlsobPACOfeho=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix
index 354a0603aa1e..18710639abd4 100644
--- a/pkgs/by-name/st/starship/package.nix
+++ b/pkgs/by-name/st/starship/package.nix
@@ -12,13 +12,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "starship";
-  version = "1.24.2";
+  version = "1.25.1";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QE0zsQa7JRSXbCBe9yGGGW2ZNo0kp+JD0/5jIyN0OIQ=";
+    hash = "sha256-eIiBKsk27h42Lr1ecXeyQXfBbB73vgQRpD99fOuPGlE=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ''
   );
 
-  cargoHash = "sha256-CYRm8wvKK7HIPI1yxTWLV/wpK++mHVT9BvDVX96VFr0=";
+  cargoHash = "sha256-mHRlGMYSeLpPR50Gr/AJY/PN7hA4znL9URaz+sbBYAs=";
 
   nativeCheckInputs = [
     gitMinimal
diff --git a/pkgs/by-name/st/statping-ng/package.nix b/pkgs/by-name/st/statping-ng/package.nix
index 589ed1c9f6d1..c132dcf640d8 100644
--- a/pkgs/by-name/st/statping-ng/package.nix
+++ b/pkgs/by-name/st/statping-ng/package.nix
@@ -93,7 +93,7 @@ buildGoModule rec {
   meta = {
     description = "Status Page for monitoring your websites and applications with beautiful graphs, analytics, and plugins";
     homepage = "https://github.com/statping-ng/statping-ng";
-    changelog = "https://github.com/statping-ng/statping-ng/releases/tag/v${src.tag}";
+    changelog = "https://github.com/statping-ng/statping-ng/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       FKouhai
diff --git a/pkgs/by-name/st/stc-cli/package.nix b/pkgs/by-name/st/stc-cli/package.nix
index b2b6a8d58ef8..d26f9b00ff9d 100644
--- a/pkgs/by-name/st/stc-cli/package.nix
+++ b/pkgs/by-name/st/stc-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "stc";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "tenox7";
     repo = "stc";
     rev = finalAttrs.version;
-    sha256 = "sha256-ftlq7vrnTb4N2bqwiF9gtRj7hZlo6PTUMb/bk2hn/cU=";
+    sha256 = "sha256-/h5T7xzUvguHhrE1DyIep/z7Xt1jNdDFtWeQdpwq6iE=";
   };
 
-  vendorHash = "sha256-qLpWXikTr+vB2bIw2EqnoJ0uOxUc/qc6SdGEJQXwmTQ=";
+  vendorHash = "sha256-M86CoiTN03a7cXtUobsO8CYmfcRsVrHaekIPiYIeV50=";
 
   ldflags = [ "-X main.GitTag=${finalAttrs.version}" ];
 
diff --git a/pkgs/by-name/st/steam-devices-udev-rules/package.nix b/pkgs/by-name/st/steam-devices-udev-rules/package.nix
index 2e5f99e8ec92..b84491ff06d7 100644
--- a/pkgs/by-name/st/steam-devices-udev-rules/package.nix
+++ b/pkgs/by-name/st/steam-devices-udev-rules/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "steam-devices-udev-rules";
-  version = "1.0.0.61-unstable-2026-04-14";
+  version = "1.0.0.61-unstable-2026-04-16";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "steam-devices";
-    rev = "7dde9ecb3c386363ecd9bd0a3b77e4756d200704";
-    hash = "sha256-44ZO2etUxnldRCuNp6KpLArPrfAOuVPoXW1fl+KbHXA=";
+    rev = "39e7bd00f7a322e5165fd8f416b31d23daf6d385";
+    hash = "sha256-QjFyzSwqwzPz06Wcj7in91tlhaxgw0DydLgsjC+i6Lo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix
index 68631bd00038..8e0c0fa2b301 100644
--- a/pkgs/by-name/st/steamguard-cli/package.nix
+++ b/pkgs/by-name/st/steamguard-cli/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellCompletion --cmd steamguard \
       --bash <($out/bin/steamguard completion --shell bash) \
       --fish <($out/bin/steamguard completion --shell fish) \
-      --zsh <($out/bin/steamguard completion --shell zsh) \
+      --zsh <($out/bin/steamguard completion --shell zsh)
   '';
 
   meta = {
diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 7e7fbd13a09f..4cac3c6b29cc 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.16.75";
+  version = "3.16.76";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-U1EDwPWYmG8F/EpNA0hOz//SC1o8spbTqRc/xl8hB5Y=";
+    hash = "sha256-mGti2nilpiN5Sc0qZ9w4e/NBi3dfuHvLRjsr/kUMZc0=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/st/stevia/package.nix b/pkgs/by-name/st/stevia/package.nix
index 04cc43d48785..7b06e656e1ff 100644
--- a/pkgs/by-name/st/stevia/package.nix
+++ b/pkgs/by-name/st/stevia/package.nix
@@ -22,17 +22,20 @@
   libxkbcommon,
   systemd,
   nix-update-script,
+  dconf,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "stevia";
-  version = "0.52.1";
+  version = "0.54.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World/Phosh";
     repo = "stevia";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GdAKy7F8SRGtfmN6as6AAg6p/WJrcDPp338OHUXoORM=";
+    hash = "sha256-eCM2PSn0sDnL7iDbgt6phQsGmdeBfkVjOkxt42WxyXo=";
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/485701
+    forceFetchGit = true;
   };
 
   mesonFlags = [
@@ -67,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     libhandy
     libxkbcommon
     systemd
+    dconf
   ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/st/sticky-notes/package.nix b/pkgs/by-name/st/sticky-notes/package.nix
index e47fc67490cb..abf20614b878 100644
--- a/pkgs/by-name/st/sticky-notes/package.nix
+++ b/pkgs/by-name/st/sticky-notes/package.nix
@@ -3,7 +3,7 @@
   desktop-file-utils,
   fetchFromGitHub,
   fetchYarnDeps,
-  fixup_yarn_lock,
+  fixup-yarn-lock,
   gjs,
   glib-networking,
   gobject-introspection,
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     wrapGAppsHook4
     yarn
-    fixup_yarn_lock
+    fixup-yarn-lock
   ];
 
   buildInputs = [
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   preConfigure = ''
     export HOME="$PWD"
     yarn config --offline set yarn-offline-mirror $yarnOfflineCache
-    fixup_yarn_lock yarn.lock
+    fixup-yarn-lock yarn.lock
   '';
 
   mesonFlags = [
diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix
index 9820ae631ab2..86f8b0fa4c42 100644
--- a/pkgs/by-name/st/strace/package.nix
+++ b/pkgs/by-name/st/strace/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "strace";
-  version = "6.19";
+  version = "7.0";
 
   src = fetchurl {
     url = "https://strace.io/files/${finalAttrs.version}/strace-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4HbIUe7AlySG7IQhZP3FRUf50Xq9PRRJ3osSD10pkUM=";
+    hash = "sha256-bJJBm+Py7FYLMXKKRlIhfFmGTIZCunsbN3GxsBOtB0s=";
   };
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/st/streamdeck-ui/package.nix b/pkgs/by-name/st/streamdeck-ui/package.nix
index cab7575080b0..e7f5de41a2b3 100644
--- a/pkgs/by-name/st/streamdeck-ui/package.nix
+++ b/pkgs/by-name/st/streamdeck-ui/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "streamdeck-ui";
-  version = "4.1.3";
+  version = "4.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     repo = "streamdeck-linux-gui";
     owner = "streamdeck-linux-gui";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KpsW3EycYRYU5YOg7NNGv5eeZbS9MAikj0Ke2ybPzAU=";
+    hash = "sha256-XRtIkDyLick9Pq55Br7lQb6FoygMs4DZEJoAD2/o+pQ=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/st/stress-ng/package.nix b/pkgs/by-name/st/stress-ng/package.nix
index 5c729a6ed242..17acae34113b 100644
--- a/pkgs/by-name/st/stress-ng/package.nix
+++ b/pkgs/by-name/st/stress-ng/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "stress-ng";
-  version = "0.21.00";
+  version = "0.21.01";
 
   src = fetchFromGitHub {
     owner = "ColinIanKing";
     repo = "stress-ng";
     tag = "V${finalAttrs.version}";
-    hash = "sha256-kFIrbt/jJuQnuWmQUBuiFGuAfBb2pUtujhj6bwpDF4k=";
+    hash = "sha256-GC9FN8nHhBLS9E+7kN0aNAIo8VbUIPG26/bRUarsiIc=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/st/string-view-lite/package.nix b/pkgs/by-name/st/string-view-lite/package.nix
index 2d50c921411b..947805fc48f6 100644
--- a/pkgs/by-name/st/string-view-lite/package.nix
+++ b/pkgs/by-name/st/string-view-lite/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "C++17-like string_view for C++98, C++11 and later in a single-file header-only library";
     homepage = "https://github.com/martinmoene/string-view-lite";
-    changelog = "https://github.com/martinmoene/string-view-lite/blob/v${finalAttrs.version}/CHANGES.txt";
+    changelog = "https://github.com/martinmoene/string-view-lite/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.boost;
     maintainers = with lib.maintainers; [ titaniumtown ];
   };
diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index efd9a32418ce..511b79a82398 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "stripe-cli";
-  version = "1.37.1";
+  version = "1.37.2";
 
   # required for tests
   __darwinAllowLocalNetworking = true;
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     owner = "stripe";
     repo = "stripe-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ItaJ+REOgOeJdeqJ3amZqNK38TssILOOp3ddxiEHS9c=";
+    hash = "sha256-Hsp90qmwy8D6SpDrgElB0Om6lumtkFjp2e///GEwkuE=";
   };
   vendorHash = "sha256-EDdRgApJ7gv/4ma/IfaHi+jjpTPegsUfqHbvoFMn048=";
 
diff --git a/pkgs/by-name/st/strongswan/package.nix b/pkgs/by-name/st/strongswan/package.nix
index 93c13de36207..fd285dc213f3 100644
--- a/pkgs/by-name/st/strongswan/package.nix
+++ b/pkgs/by-name/st/strongswan/package.nix
@@ -122,13 +122,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "strongswan";
-  version = "6.0.5"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
+  version = "6.0.6"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
 
   src = fetchFromGitHub {
     owner = "strongswan";
     repo = "strongswan";
     tag = finalAttrs.version;
-    hash = "sha256-AB0PNy5UIPb5Pwois9APhyQxDPd55mnwYdhpkKpV+uM=";
+    hash = "sha256-Ojb+aAb9Ame4E9qzKcP9HZ+1AmP4XuxZO89nKca9Vl8=";
   };
 
   patches = [
diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix
index a4e932c99f06..36120c3a0a75 100644
--- a/pkgs/by-name/st/stylance-cli/package.nix
+++ b/pkgs/by-name/st/stylance-cli/package.nix
@@ -1,20 +1,22 @@
 {
   lib,
   rustPlatform,
-  fetchCrate,
+  fetchFromGitHub,
   versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stylance-cli";
-  version = "0.7.4";
+  version = "0.8.0";
 
-  src = fetchCrate {
-    inherit (finalAttrs) pname version;
-    hash = "sha256-lGgKmNqZ0nflVAM3GMDwGgxnXyLCqVz1bTUsvabXmj8=";
+  src = fetchFromGitHub {
+    owner = "basro";
+    repo = "stylance-rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YMC7pldkabU669CKeXX5QQOcN974/cZ42nTPphZPq5U=";
   };
 
-  cargoHash = "sha256-HWZQNEKTyNnmA1twN5cfo5RY2tOeCnL6zEp+M4F+Tqg=";
+  cargoHash = "sha256-hn1nEnihgWtj1JaRcUZTm6lrThnugUMs6mAs0lsWpbU=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix
index 25100d0ea7dc..d181d61e6f9a 100644
--- a/pkgs/by-name/su/sub-store-frontend/package.nix
+++ b/pkgs/by-name/su/sub-store-frontend/package.nix
@@ -13,13 +13,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "sub-store-frontend";
-  version = "2.16.55";
+  version = "2.16.59";
 
   src = fetchFromGitHub {
     owner = "sub-store-org";
     repo = "Sub-Store-Front-End";
     tag = finalAttrs.version;
-    hash = "sha256-9QBgy+5sIvFcbZpxFc9mOowH4dw4rewqLYZfUKwPOjU=";
+    hash = "sha256-dTjKRkYtt7BA2Q95skXdn2TZNEt1NnXlVzRGUlRdly4=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ buildNpmPackage (finalAttrs: {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-HEeNYLKvzO/RQWYnm5gqRjTrXiiCxKUxf3bcRvz+O4k=";
+    hash = "sha256-gQe5AMRZgjp1G95bFgCBMlhVql+ZHgPfJ2DOklFyk2k=";
   };
 
   npmConfigHook = pnpmConfigHook;
diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix
index b6314d4dce56..effe58a1a440 100644
--- a/pkgs/by-name/su/sub-store/package.nix
+++ b/pkgs/by-name/su/sub-store/package.nix
@@ -15,13 +15,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "sub-store";
-  version = "2.21.98";
+  version = "2.22.6";
 
   src = fetchFromGitHub {
     owner = "sub-store-org";
     repo = "Sub-Store";
     tag = finalAttrs.version;
-    hash = "sha256-r2zlOZQ6pPxm/zjtaJkMMaG3vM/05xvS+hTDg4bydo8=";
+    hash = "sha256-bK9N1/HodME8XEHA07h8IEMXDtnBKzBf8waMBQsEYbA=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";
diff --git a/pkgs/by-name/su/subunit/package.nix b/pkgs/by-name/su/subunit/package.nix
index 488e50ba2dd1..4d5a762858e1 100644
--- a/pkgs/by-name/su/subunit/package.nix
+++ b/pkgs/by-name/su/subunit/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  passthru.updateScript = nix-update-script;
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Streaming protocol for test results";
diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index 12e133a58c9b..c4cf14284411 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "supabase-cli";
-  version = "2.90.0";
+  version = "2.95.4";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JaI5I+1rAdyHoct+ac6hayptfC5CK0otI1bIfr9s3CA=";
+    hash = "sha256-qg2b3fzmsGhVyqGQVA0Iffnna72TgH+2j0CHljG2BWg=";
   };
 
-  vendorHash = "sha256-cVnhOmkhbhMh+1faFDJz/yGfYsqubHXglVUJXVZKfAQ=";
+  vendorHash = "sha256-SAqxD60UeP0jxigMQfddJlZs7EWkdws2v47smidAisk=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index 6c9841634d46..2f2e7b4892e6 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -1,7 +1,7 @@
 {
   buildNpmPackage,
   copyDesktopItems,
-  electron_39,
+  electron_41,
   fetchFromGitHub,
   lib,
   makeDesktopItem,
@@ -13,12 +13,12 @@
   nodejs_24,
 }:
 let
-  electron = electron_39;
+  electron = electron_41;
   nodejs = nodejs_24;
 in
 buildNpmPackage rec {
   pname = "super-productivity";
-  version = "18.1.3";
+  version = "18.3.0";
 
   inherit nodejs;
 
@@ -26,7 +26,7 @@ buildNpmPackage rec {
     owner = "johannesjo";
     repo = "super-productivity";
     tag = "v${version}";
-    hash = "sha256-2NEhLYC13OYZqaLLLLyQHn5uDIDh40DVtUSuUAjCxgQ=";
+    hash = "sha256-3HzvVfbcNaXmjtqPxgWuR/yTD2vLa1+5cghk1MIPbMQ=";
 
     postFetch = ''
       find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
@@ -69,7 +69,7 @@ buildNpmPackage rec {
       dontInstall = true;
 
       outputHashMode = "recursive";
-      hash = "sha256-AnAiPjxl5MbQchCPPHmtRFEojClseHFul+w5FEEUdwY=";
+      hash = "sha256-HAS7Nn2DLYLG8JeidWBVZAbP2fb0GwzQan7WOvJ5iLs=";
     }
   );
 
diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix
index 221077f0aea8..1776735f3e91 100644
--- a/pkgs/by-name/su/supercronic/package.nix
+++ b/pkgs/by-name/su/supercronic/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "supercronic";
-  version = "0.2.44";
+  version = "0.2.45";
 
   src = fetchFromGitHub {
     owner = "aptible";
     repo = "supercronic";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xtTQ5T+/kVnh4sjIN/N9HN9MeEd2ekAzSkvYdei0dKA=";
+    hash = "sha256-QOWNC9RZb5FmCChcs8DvgbrW8F66IG9nteR997n0B7k=";
   };
 
-  vendorHash = "sha256-azjkMzmAhAKyHx/43cP0kpgo0mKM8Yh+LWHiR7audQw=";
+  vendorHash = "sha256-x/OSHI5HIG8Bo0FV+TzJ1o7d6+1gXida23dSxi5QiQQ=";
 
   excludedPackages = [ "cronexpr/cronexpr" ];
 
diff --git a/pkgs/by-name/su/supertuxkart/package.nix b/pkgs/by-name/su/supertuxkart/package.nix
index b6fae7be863e..5b17db4bec81 100644
--- a/pkgs/by-name/su/supertuxkart/package.nix
+++ b/pkgs/by-name/su/supertuxkart/package.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     wrapProgram $out/bin/supertuxkart \
       --set-default SUPERTUXKART_ASSETS_DIR "${assets}" \
-      --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart" \
+      --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart"
   '';
 
   meta = {
diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix
index 0c32b51c09ad..5d06f57f0bf7 100644
--- a/pkgs/by-name/su/surfer/package.nix
+++ b/pkgs/by-name/su/surfer/package.nix
@@ -17,13 +17,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "surfer";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitLab {
     owner = "surfer-project";
     repo = "surfer";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-83UKSD9Z4pT0OXLqIgquuJ8W6+U29ZzWG1SOrAOK9ic=";
+    hash = "sha256-WO0TWmUaKqUh+Cr75Hrxa2x4V9xZhzHY5PzlIRNUzZA=";
     fetchSubmodules = true;
   };
 
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libxi
   ];
 
-  cargoHash = "sha256-UuZpgW8di79mTNpDJ7K12IC5Xa3YX9ex2BYd62pUh1o=";
+  cargoHash = "sha256-WK3+YlBfHTo48+JBEBrgR23PTmyCZo98wg35VZmBdWA=";
 
   # Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318
   doCheck = false;
diff --git a/pkgs/by-name/su/surfpool/package.nix b/pkgs/by-name/su/surfpool/package.nix
new file mode 100644
index 000000000000..131375083577
--- /dev/null
+++ b/pkgs/by-name/su/surfpool/package.nix
@@ -0,0 +1,86 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchzip,
+  pkg-config,
+  versionCheckHook,
+  openssl,
+}:
+
+let
+  studioUiVersion = "v0.1.0";
+  studioUi = fetchzip {
+    url = "https://github.com/solana-foundation/surfpool-web-ui/releases/download/${studioUiVersion}/studio-dist.zip";
+    hash = "sha256-uZZpaAIg7f+ji5yonwNbAxbxi+4x7g5V4xKWUXNn1UI=";
+    stripRoot = false;
+  };
+in
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "surfpool-cli";
+  version = "1.2.0";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "solana-foundation";
+    repo = "surfpool";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-PGCzlnu7YxueQ16uae2818I9vXWdMRFRGaFzg2DIIgo=";
+    fetchSubmodules = true;
+  };
+
+  cargoHash = "sha256-ephKNAJ9PtTz/EN9dGFn6LnIySU0g/GNz8Jg9JDKTSI=";
+
+  postPatch = ''
+    # instead of downloading the surfpool-web-ui at build time, we fetch it beforehand and use it
+    # https://github.com/solana-foundation/surfpool/pull/628
+    substituteInPlace crates/studio/build.rs \
+      --replace-fail \
+        'let url = match env::var("STUDIO_UI_VERSION") {' \
+        'if let Ok(dist_path) = env::var("STUDIO_UI_DIST") {
+            let src = std::path::Path::new(&dist_path);
+            fn copy_dir(s: &std::path::Path, d: &std::path::Path) {
+                std::fs::create_dir_all(d).unwrap();
+                for e in std::fs::read_dir(s).unwrap() {
+                    let e = e.unwrap();
+                    if e.file_type().unwrap().is_dir() { copy_dir(&e.path(), &d.join(e.file_name())); }
+                    else { std::fs::copy(e.path(), d.join(e.file_name())).unwrap(); }
+                }
+            }
+            copy_dir(src, &asset_dir);
+            return;
+        }
+        let url = match env::var("STUDIO_UI_VERSION") {'
+  '';
+
+  env = {
+    RUSTFLAGS = "-Aunused";
+    OPENSSL_NO_VENDOR = 1;
+    STUDIO_UI_DIST = "${studioUi}";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
+    description = "Surfpool is where developers start their Solana journey";
+    homepage = "https://www.surfpool.run/";
+    longDescription = ''
+      Surfpool is a drop-in replacement for solana-test-validator that lets
+      developers spin up local Solana networks mirroring mainnet state without
+      downloading the entire chain. It includes a built-in web UI (Surfpool Studio)
+      served directly from the binary, Infrastructure as Code for declarative
+      program deployment, transaction inspection, time travel, cheatcodes, and
+      an MCP server for agentic workflows
+    '';
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ _0xgsvs ];
+    mainProgram = "surfpool";
+  };
+})
diff --git a/pkgs/applications/radio/suwidgets/default.nix b/pkgs/by-name/su/suwidgets/package.nix
similarity index 94%
rename from pkgs/applications/radio/suwidgets/default.nix
rename to pkgs/by-name/su/suwidgets/package.nix
index f32e5d7cef25..9bf543090671 100644
--- a/pkgs/applications/radio/suwidgets/default.nix
+++ b/pkgs/by-name/su/suwidgets/package.nix
@@ -2,8 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
+  libsForQt5,
   pkg-config,
   sigutils,
   fftwSinglePrec,
@@ -28,12 +27,12 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     sigutils
     fftwSinglePrec
   ];
diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix
index 416f05b9b1b3..5a872714c66a 100644
--- a/pkgs/by-name/sv/svelte-language-server/package.nix
+++ b/pkgs/by-name/sv/svelte-language-server/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "svelte-language-server";
-  version = "0.17.25";
+  version = "0.17.30";
 
   src = fetchFromGitHub {
     owner = "sveltejs";
     repo = "language-tools";
     tag = "svelte-language-server@${finalAttrs.version}";
-    hash = "sha256-N20OAIepguiPZ3EqAB/AUgx7VGrmywbLTXv/M6URbJk=";
+    hash = "sha256-BuDWp+eC6IIKkZCzvGk62E1Kgecns4fciu3BquJ58zo=";
   };
 
   pnpmWorkspaces = [ "svelte-language-server..." ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       ;
     fetcherVersion = 2;
-    hash = "sha256-J279yrHRyG6QyUedXmYwv6Kcuz/9pGwvu6dUELIFeu8=";
+    hash = "sha256-v2X2WOEdrDwGO2q9IEjONpHeDFqVp3jGFYYjZ5uFLSE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix
index 5462acd76b5d..f9ae52dea816 100644
--- a/pkgs/by-name/sv/svix-server/package.nix
+++ b/pkgs/by-name/sv/svix-server/package.nix
@@ -10,18 +10,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "svix-server";
-  version = "1.90.0";
+  version = "1.92.2";
 
   src = fetchFromGitHub {
     owner = "svix";
     repo = "svix-webhooks";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KghNfnss1+OK5GLJww1/TH7ogmnyOrjqmHlnQG8R9cE=";
+    hash = "sha256-6PFD/b2Jc9VQIO+9LTkNldc+eq/6eG/2ZyixkSUh11U=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/server";
 
-  cargoHash = "sha256-sQUSFK6kITFkxnlp3m0kvhh24/TNTuGdLA6IOH2iSwU=";
+  cargoHash = "sha256-n+VY0C8ekJu3JRhUCMiiBS/PeMJoqM054CkrD+LEq2o=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/sw/sway/package.nix b/pkgs/by-name/sw/sway/package.nix
index 747c838efe03..a4494d9483cb 100644
--- a/pkgs/by-name/sw/sway/package.nix
+++ b/pkgs/by-name/sw/sway/package.nix
@@ -41,6 +41,11 @@ let
     if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
       export DBUS_SESSION_BUS_ADDRESS
       exec ${getExe sway} "$@"
+    elif [ -n "$XDG_RUNTIME_DIR" ] && [ -S "$XDG_RUNTIME_DIR/bus" ]; then
+      # Prefer the systemd --user bus (dbus-daemon or dbus-broker) over
+      # spawning a redundant session bus via dbus-run-session.
+      export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
+      exec ${getExe sway} "$@"
     else
       exec ${optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${getExe sway} "$@"
     fi
diff --git a/pkgs/by-name/sw/swig/package.nix b/pkgs/by-name/sw/swig/package.nix
index 9c40aaa08606..7b7b7e01a8f3 100644
--- a/pkgs/by-name/sw/swig/package.nix
+++ b/pkgs/by-name/sw/swig/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "swig";
-  version = "4.3.1";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "swig";
     repo = "swig";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-wEqbKDgXVU8kQxdh7uC+EZ0u5leeoYh2d/61qB4guOg=";
+    hash = "sha256-jsi83v9sg0n5kUfDACqdNAS2VuLSyxv+pe2LRcO4Khc=";
   };
 
   strictDeps = true;
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://swig.org/";
     # Different types of licenses available: https://www.swig.org/Release/LICENSE .
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ hythera ];
     mainProgram = "swig";
     platforms = with lib.platforms; linux ++ darwin;
   };
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
index ff7b8874a4c2..f084f27b9ae2 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs
@@ -10,7 +10,7 @@ use std::{
     path::{Path, PathBuf},
     rc::Rc,
     str::FromStr,
-    sync::OnceLock,
+    sync::{LazyLock, OnceLock},
     time::Duration,
 };
 
@@ -93,6 +93,19 @@ const DAEMON_RELOAD_TIMEOUT: Duration = Duration::from_secs(180);
 // Used during times of waiting for D-Bus to process messages.
 const DBUS_PROCESS_TIME: Duration = Duration::from_millis(500);
 
+// Matches a templated unit instance (e.g. `foo@bar.service`), capturing the
+// template name and the unit-type suffix.
+// FIXME: instance names may contain `.`; this regex predates this file and is
+// kept as-is to avoid behaviour changes here. Revisit separately.
+static TEMPLATE_UNIT_RE: LazyLock<Regex> = LazyLock::new(|| {
+    Regex::new(r"^(.*)@[^\.]*\.(.*)$").expect("systemd template-unit regex is valid")
+});
+
+// Matches a unit name, capturing everything up to the type suffix.
+static UNIT_NAME_RE: LazyLock<Regex> = LazyLock::new(|| {
+    Regex::new(r"^(.*)\.[[:lower:]]*$").expect("systemd unit-name regex is valid")
+});
+
 #[derive(Debug, Clone, PartialEq)]
 enum Action {
     Switch,
@@ -129,6 +142,62 @@ impl From<&Action> for &'static str {
     }
 }
 
+/// Scope of systemd unit management. System units live in /etc/systemd/system and
+/// are managed via the system bus; user units live in /etc/systemd/user and are
+/// managed via each logged-in user's session bus.
+#[derive(Debug, Clone, Copy, PartialEq)]
+enum UnitScope {
+    System,
+    User,
+}
+
+impl UnitScope {
+    /// Path relative to a toplevel (or to /) where this scope's NixOS-managed
+    /// unit files live.
+    fn etc_dir(&self) -> &'static str {
+        match self {
+            UnitScope::System => "etc/systemd/system",
+            UnitScope::User => "etc/systemd/user",
+        }
+    }
+
+    /// Absolute path to the currently-active unit directory for this scope.
+    fn current_dir(&self) -> &'static Path {
+        Path::new(match self {
+            UnitScope::System => "/etc/systemd/system",
+            UnitScope::User => "/etc/systemd/user",
+        })
+    }
+
+    /// Directory where unit action lists are persisted for
+    /// resume-after-interrupt. The user scope uses XDG_RUNTIME_DIR so the
+    /// unprivileged child can write to it.
+    fn list_dir(&self) -> PathBuf {
+        match self {
+            UnitScope::System => PathBuf::from("/run/nixos"),
+            UnitScope::User => {
+                // The parent always sets XDG_RUNTIME_DIR when spawning the
+                // user-scope child.
+                let runtime_dir = std::env::var("XDG_RUNTIME_DIR")
+                    .ok()
+                    .filter(|d| !d.is_empty())
+                    .expect("XDG_RUNTIME_DIR must be set and non-empty for the user scope");
+                PathBuf::from(runtime_dir).join("nixos")
+            }
+        }
+    }
+
+    fn start_list_file(&self) -> PathBuf {
+        self.list_dir().join("start-list")
+    }
+    fn restart_list_file(&self) -> PathBuf {
+        self.list_dir().join("restart-list")
+    }
+    fn reload_list_file(&self) -> PathBuf {
+        self.list_dir().join("reload-list")
+    }
+}
+
 // Allow for this switch-to-configuration to remain consistent with the perl implementation.
 // Perl's "die" uses errno to set the exit code: https://perldoc.perl.org/perlvar#%24%21
 fn die() -> ! {
@@ -420,9 +489,10 @@ enum UnitComparison {
 
 // Compare the contents of two unit files and return whether the unit needs to be restarted or
 // reloaded. If the units differ, the service is restarted unless the only difference is
-// `X-Reload-Triggers` in the `Unit` section. If this is the only modification, the unit is
-// reloaded instead of restarted. If the only difference is `Options` in the `[Mount]` section, the
-// unit is reloaded rather than restarted.
+// `X-Reload-Triggers` in the `[Unit]` section, `Options` in the `[Mount]` section, or `ExecReload`
+// in the `[Service]` section, in which case the unit is reloaded rather than restarted. Removing
+// `ExecReload` is treated as a no-op since the running process is unaffected and the new unit can
+// no longer be reloaded.
 fn compare_units(current_unit: &UnitInfo, new_unit: &UnitInfo) -> UnitComparison {
     let mut ret = UnitComparison::Equal;
 
@@ -463,6 +533,13 @@ fn compare_units(current_unit: &UnitInfo, new_unit: &UnitInfo) -> UnitComparison
                     }
                 }
                 continue; // check the next section
+            } else if section_name == "Service"
+                && section_val.len() == 1
+                && section_val.contains_key("ExecReload")
+            {
+                // Dropping ExecReload does not affect the running process and the
+                // new unit can no longer be reloaded, so there is nothing to do.
+                continue;
             } else {
                 return UnitComparison::UnequalNeedsRestart;
             }
@@ -493,6 +570,11 @@ fn compare_units(current_unit: &UnitInfo, new_unit: &UnitInfo) -> UnitComparison
                 if section_name == "Unit" && unit_section_ignores.contains_key(ini_key.as_str()) {
                     continue;
                 }
+                // Dropping ExecReload does not affect the running process and the
+                // new unit can no longer be reloaded, so there is nothing to do.
+                if section_name == "Service" && ini_key == "ExecReload" {
+                    continue;
+                }
                 return UnitComparison::UnequalNeedsRestart;
             };
 
@@ -507,6 +589,12 @@ fn compare_units(current_unit: &UnitInfo, new_unit: &UnitInfo) -> UnitComparison
                     }
                 }
 
+                // If this is a service unit, check if it was only `ExecReload`
+                if section_name == "Service" && ini_key == "ExecReload" {
+                    ret = UnitComparison::UnequalNeedsReload;
+                    continue;
+                }
+
                 // If this is a mount unit, check if it was only `Options`
                 if section_name == "Mount" && ini_key == "Options" {
                     ret = UnitComparison::UnequalNeedsReload;
@@ -529,6 +617,12 @@ fn compare_units(current_unit: &UnitInfo, new_unit: &UnitInfo) -> UnitComparison
                         return UnitComparison::UnequalNeedsRestart;
                     }
                 }
+            } else if section_name == "Service"
+                && ini_cmp.len() == 1
+                && ini_cmp.contains_key("ExecReload")
+            {
+                ret = UnitComparison::UnequalNeedsReload;
+                continue;
             } else {
                 return UnitComparison::UnequalNeedsRestart;
             }
@@ -537,15 +631,28 @@ fn compare_units(current_unit: &UnitInfo, new_unit: &UnitInfo) -> UnitComparison
 
     // A section was introduced that was missing in the previous unit
     if !section_cmp.is_empty() {
-        if section_cmp.keys().len() == 1 && section_cmp.contains_key("Unit") {
-            if let Some(new_unit_unit) = new_unit.get("Unit") {
-                for ini_key in new_unit_unit.keys() {
-                    if !unit_section_ignores.contains_key(ini_key.as_str()) {
-                        return UnitComparison::UnequalNeedsRestart;
-                    } else if ini_key == "X-Reload-Triggers" {
-                        ret = UnitComparison::UnequalNeedsReload;
+        if section_cmp.keys().len() == 1 {
+            // Dispatch on which section is actually new.
+            if section_cmp.contains_key("Unit") {
+                if let Some(new_unit_unit) = new_unit.get("Unit") {
+                    for ini_key in new_unit_unit.keys() {
+                        if !unit_section_ignores.contains_key(ini_key.as_str()) {
+                            return UnitComparison::UnequalNeedsRestart;
+                        } else if ini_key == "X-Reload-Triggers" {
+                            ret = UnitComparison::UnequalNeedsReload;
+                        }
                     }
                 }
+            } else if section_cmp.contains_key("Service") {
+                if let Some(new_unit_service) = new_unit.get("Service") {
+                    if new_unit_service.len() == 1 && new_unit_service.contains_key("ExecReload") {
+                        ret = UnitComparison::UnequalNeedsReload;
+                    } else {
+                        return UnitComparison::UnequalNeedsRestart;
+                    }
+                }
+            } else {
+                return UnitComparison::UnequalNeedsRestart;
             }
         } else {
             return UnitComparison::UnequalNeedsRestart;
@@ -559,6 +666,7 @@ fn compare_units(current_unit: &UnitInfo, new_unit: &UnitInfo) -> UnitComparison
 // figures out of what units are to be stopped, restarted, reloaded, started, and skipped.
 fn handle_modified_unit(
     toplevel: &Path,
+    scope: UnitScope,
     unit: &str,
     base_name: &str,
     new_unit_file: &Path,
@@ -571,6 +679,9 @@ fn handle_modified_unit(
     units_to_restart: &mut HashMap<String, ()>,
     units_to_skip: &mut HashMap<String, ()>,
 ) -> Result<()> {
+    let start_list = scope.start_list_file();
+    let restart_list = scope.restart_list_file();
+    let reload_list = scope.reload_list_file();
     let use_restart_as_stop_and_start = new_unit_info.is_none();
 
     if matches!(
@@ -591,10 +702,10 @@ fn handle_modified_unit(
         // crashing it.
         if unit == "-.mount" || unit == "nix.mount" {
             units_to_reload.insert(unit.to_string(), ());
-            record_unit(RELOAD_LIST_FILE, unit);
+            record_unit(&reload_list, unit);
         } else {
             units_to_restart.insert(unit.to_string(), ());
-            record_unit(RESTART_LIST_FILE, unit);
+            record_unit(&restart_list, unit);
         }
     } else if unit.ends_with(".socket") {
         // FIXME: do something?
@@ -618,7 +729,7 @@ fn handle_modified_unit(
             })
         {
             units_to_reload.insert(unit.to_string(), ());
-            record_unit(RELOAD_LIST_FILE, unit);
+            record_unit(&reload_list, unit);
         } else if !parse_systemd_bool(new_unit_info, "Service", "X-RestartIfChanged", true)
             || parse_systemd_bool(new_unit_info, "Unit", "RefuseManualStop", false)
             || parse_systemd_bool(new_unit_info, "Unit", "X-OnlyManualStart", false)
@@ -632,11 +743,11 @@ fn handle_modified_unit(
             {
                 // This unit should be restarted instead of stopped and started.
                 units_to_restart.insert(unit.to_string(), ());
-                record_unit(RESTART_LIST_FILE, unit);
+                record_unit(&restart_list, unit);
                 // Remove from units to reload so we don't restart and reload
                 if units_to_reload.contains_key(unit) {
                     units_to_reload.remove(unit);
-                    unrecord_unit(RELOAD_LIST_FILE, unit);
+                    unrecord_unit(&reload_list, unit);
                 }
             } else {
                 // If this unit is socket-activated, then stop the socket unit(s) as well, and
@@ -673,13 +784,13 @@ fn handle_modified_unit(
                             }
 
                             // Only restart sockets that actually exist in new configuration:
-                            if toplevel.join("etc/systemd/system").join(socket).exists() {
+                            if toplevel.join(scope.etc_dir()).join(socket).exists() {
                                 if use_restart_as_stop_and_start {
                                     units_to_restart.insert(socket.to_string(), ());
-                                    record_unit(RESTART_LIST_FILE, socket);
+                                    record_unit(&restart_list, socket);
                                 } else {
                                     units_to_start.insert(socket.to_string(), ());
-                                    record_unit(START_LIST_FILE, socket);
+                                    record_unit(&start_list, socket);
                                 }
 
                                 socket_activated = true;
@@ -688,7 +799,7 @@ fn handle_modified_unit(
                             // Remove from units to reload so we don't restart and reload
                             if units_to_reload.contains_key(unit) {
                                 units_to_reload.remove(unit);
-                                unrecord_unit(RELOAD_LIST_FILE, unit);
+                                unrecord_unit(&reload_list, unit);
                             }
                         }
                     }
@@ -706,10 +817,10 @@ fn handle_modified_unit(
                 if !socket_activated {
                     if use_restart_as_stop_and_start {
                         units_to_restart.insert(unit.to_string(), ());
-                        record_unit(RESTART_LIST_FILE, unit);
+                        record_unit(&restart_list, unit);
                     } else {
                         units_to_start.insert(unit.to_string(), ());
-                        record_unit(START_LIST_FILE, unit);
+                        record_unit(&start_list, unit);
                     }
                 }
 
@@ -721,7 +832,7 @@ fn handle_modified_unit(
                 // Remove from units to reload so we don't restart and reload
                 if units_to_reload.contains_key(unit) {
                     units_to_reload.remove(unit);
-                    unrecord_unit(RELOAD_LIST_FILE, unit);
+                    unrecord_unit(&reload_list, unit);
                 }
             }
         }
@@ -925,6 +1036,174 @@ fn remove_file_if_exists(p: impl AsRef<Path>) -> std::io::Result<()> {
     }
 }
 
+/// Iterate over currently active units in the given scope, compare the unit
+/// file in `old_unit_dir` against the one in `new_unit_dir`, and populate the
+/// action maps accordingly.
+///
+/// Units whose FragmentPath does not live under the scope's NixOS-managed
+/// directory (`scope.current_dir()`) are skipped; this avoids touching
+/// generated units and, for the user scope, units that are shadowed by files
+/// in the user's home directory (e.g. those managed by home-manager).
+///
+/// `old_unit_dir` and `new_unit_dir` are taken explicitly rather than derived
+/// from the scope because by the time the user-scope child runs, /etc has
+/// already been switched to the new configuration, so the caller must supply
+/// a captured reference to the pre-switch unit directory.
+fn collect_unit_changes(
+    toplevel: &Path,
+    scope: UnitScope,
+    old_unit_dir: &Path,
+    new_unit_dir: &Path,
+    current_active_units: &HashMap<String, UnitState>,
+    units_to_stop: &mut HashMap<String, ()>,
+    units_to_start: &mut HashMap<String, ()>,
+    units_to_reload: &mut HashMap<String, ()>,
+    units_to_restart: &mut HashMap<String, ()>,
+    units_to_skip: &mut HashMap<String, ()>,
+    units_to_filter: &mut HashMap<String, ()>,
+) -> Result<()> {
+    let fragment_prefix = scope
+        .current_dir()
+        .to_str()
+        .expect("scope dir is valid UTF-8");
+    let start_list = scope.start_list_file();
+    let reload_list = scope.reload_list_file();
+
+    for (unit, unit_state) in current_active_units {
+        // Don't touch units that are not loaded from the NixOS-managed
+        // directory. For system scope this skips generator output; for user
+        // scope it additionally skips units shadowed by ~/.config/systemd/user.
+        if !unit_state
+            .proxy
+            .get("org.freedesktop.systemd1.Unit", "FragmentPath")
+            .map(|fragment_path: String| fragment_path.starts_with(fragment_prefix))
+            .unwrap_or_default()
+        {
+            continue;
+        }
+
+        let current_unit_file = old_unit_dir.join(unit);
+        let new_unit_file = new_unit_dir.join(unit);
+
+        let mut base_unit = unit.clone();
+        let mut current_base_unit_file = current_unit_file.clone();
+        let mut new_base_unit_file = new_unit_file.clone();
+
+        // Detect template instances
+        if let Some((Some(template_name), Some(template_instance))) =
+            TEMPLATE_UNIT_RE.captures(unit).map(|captures| {
+                (
+                    captures.get(1).map(|c| c.as_str()),
+                    captures.get(2).map(|c| c.as_str()),
+                )
+            })
+        {
+            if !current_unit_file.exists() && !new_unit_file.exists() {
+                base_unit = format!("{template_name}@.{template_instance}");
+                current_base_unit_file = old_unit_dir.join(&base_unit);
+                new_base_unit_file = new_unit_dir.join(&base_unit);
+            }
+        }
+
+        let mut base_name = base_unit.as_str();
+        if let Some(Some(new_base_name)) = UNIT_NAME_RE
+            .captures(&base_unit)
+            .map(|capture| capture.get(1).map(|first| first.as_str()))
+        {
+            base_name = new_base_name;
+        }
+
+        if current_base_unit_file.exists()
+            && (unit_state.state == "active" || unit_state.state == "activating")
+        {
+            if new_base_unit_file
+                .canonicalize()
+                .map(|full_path| full_path == Path::new("/dev/null"))
+                .unwrap_or(true)
+            {
+                let current_unit_info = parse_unit(&current_unit_file, &current_base_unit_file)?;
+                if parse_systemd_bool(Some(&current_unit_info), "Unit", "X-StopOnRemoval", true) {
+                    _ = units_to_stop.insert(unit.to_string(), ());
+                }
+            } else if unit.ends_with(".target") {
+                let new_unit_info = parse_unit(&new_unit_file, &new_base_unit_file)?;
+
+                // Cause all active target units to be restarted below. This should start most
+                // changed units we stop here as well as any new dependencies (including new mounts
+                // and swap devices).  FIXME: the suspend target is sometimes active after the
+                // system has resumed, which probably should not be the case.  Just ignore it.
+                if !(matches!(
+                    unit.as_str(),
+                    "suspend.target" | "hibernate.target" | "hybrid-sleep.target"
+                ) || parse_systemd_bool(
+                    Some(&new_unit_info),
+                    "Unit",
+                    "RefuseManualStart",
+                    false,
+                ) || parse_systemd_bool(
+                    Some(&new_unit_info),
+                    "Unit",
+                    "X-OnlyManualStart",
+                    false,
+                )) {
+                    units_to_start.insert(unit.to_string(), ());
+                    record_unit(&start_list, unit);
+                    // Don't spam the user with target units that always get started.
+                    if std::env::var("STC_DISPLAY_ALL_UNITS").as_deref() != Ok("1") {
+                        units_to_filter.insert(unit.to_string(), ());
+                    }
+                }
+
+                // Stop targets that have X-StopOnReconfiguration set. This is necessary to respect
+                // dependency orderings involving targets: if unit X starts after target Y and
+                // target Y starts after unit Z, then if X and Z have both changed, then X should
+                // be restarted after Z.  However, if target Y is in the "active" state, X and Z
+                // will be restarted at the same time because X's dependency on Y is already
+                // satisfied.  Thus, we need to stop Y first. Stopping a target generally has no
+                // effect on other units (unless there is a PartOf dependency), so this is just a
+                // bookkeeping thing to get systemd to do the right thing.
+                if parse_systemd_bool(
+                    Some(&new_unit_info),
+                    "Unit",
+                    "X-StopOnReconfiguration",
+                    false,
+                ) {
+                    units_to_stop.insert(unit.to_string(), ());
+                }
+            } else {
+                let current_unit_info = parse_unit(&current_unit_file, &current_base_unit_file)?;
+                let new_unit_info = parse_unit(&new_unit_file, &new_base_unit_file)?;
+                match compare_units(&current_unit_info, &new_unit_info) {
+                    UnitComparison::UnequalNeedsRestart => {
+                        handle_modified_unit(
+                            toplevel,
+                            scope,
+                            unit,
+                            base_name,
+                            &new_unit_file,
+                            &new_base_unit_file,
+                            Some(&new_unit_info),
+                            current_active_units,
+                            units_to_stop,
+                            units_to_start,
+                            units_to_reload,
+                            units_to_restart,
+                            units_to_skip,
+                        )?;
+                    }
+                    UnitComparison::UnequalNeedsReload if !units_to_restart.contains_key(unit) => {
+                        units_to_reload.insert(unit.clone(), ());
+                        record_unit(&reload_list, unit);
+                    }
+                    _ => {}
+                }
+            }
+        }
+    }
+
+    Ok(())
+}
+
 /// Performs switch-to-configuration functionality for a single non-root user
 fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
     if Path::new(&parent_exe)
@@ -939,10 +1218,37 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
         die();
     }
 
+    let toplevel = PathBuf::from(required_env("TOPLEVEL")?);
+    let old_toplevel = PathBuf::from(required_env("OLD_TOPLEVEL")?);
+    let action = Action::from_str(&required_env("NIXOS_ACTION")?)?;
+    let action = ACTION.get_or_init(|| action);
+    let dry_run = *action == Action::DryActivate;
+
+    let scope = UnitScope::User;
+    let list_dir = scope.list_dir();
+    std::fs::create_dir_all(&list_dir)
+        .with_context(|| format!("Failed to create {}", list_dir.display()))?;
+    let perms = std::fs::Permissions::from_mode(0o700);
+    std::fs::set_permissions(&list_dir, perms)
+        .with_context(|| format!("Failed to set permissions on {}", list_dir.display()))?;
+    let start_list = scope.start_list_file();
+    let restart_list = scope.restart_list_file();
+    let reload_list = scope.reload_list_file();
+
     let dbus_conn = LocalConnection::new_session().context("Failed to open dbus connection")?;
     let systemd = systemd1_proxy(&dbus_conn);
 
+    systemd
+        .subscribe()
+        .context("Failed to subscribe to systemd dbus messages")?;
+
+    let submitted_jobs = Rc::new(RefCell::new(HashMap::new()));
+    let finished_jobs: Rc<RefCell<HashMap<dbus::Path, (String, Job, String)>>> =
+        Rc::new(RefCell::new(HashMap::new()));
     let nixos_activation_done = Rc::new(RefCell::new(false));
+
+    let _submitted_jobs = submitted_jobs.clone();
+    let _finished_jobs = finished_jobs.clone();
     let _nixos_activation_done = nixos_activation_done.clone();
     let jobs_token = systemd
         .match_signal(
@@ -952,32 +1258,284 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
                 if signal.unit.as_str() == "nixos-activation.service" {
                     *_nixos_activation_done.borrow_mut() = true;
                 }
-
+                if let Some(old) = _submitted_jobs.borrow_mut().remove(&signal.job) {
+                    _finished_jobs
+                        .borrow_mut()
+                        .insert(signal.job, (signal.unit, old, signal.result));
+                }
                 true
             },
         )
         .context("Failed to add signal match for systemd removed jobs")?;
 
+    // Plan the user unit changes before touching anything. By the time this
+    // child runs, /etc (and /run/current-system) have already been switched to
+    // the new configuration. The parent captured the old toplevel path before
+    // activation and passed it to us so we can still compare old vs new.
+    let mut units_to_stop = HashMap::new();
+    let mut units_to_skip = HashMap::new();
+    let mut units_to_filter = HashMap::new();
+
+    // Seed from any previous interrupted run so that we continue where we left
+    // off, like the system scope does.
+    let mut units_to_start = map_from_list_file(&start_list);
+    let mut units_to_restart = map_from_list_file(&restart_list);
+    let mut units_to_reload = map_from_list_file(&reload_list);
+
+    let current_active_units = get_active_units(&systemd)?;
+
+    let new_unit_dir = toplevel.join(scope.etc_dir());
+    let fragment_prefix = scope
+        .current_dir()
+        .to_str()
+        .expect("scope dir is valid UTF-8");
+
+    // Units that are currently running from a non-/etc location (typically
+    // ~/.config/systemd/user, i.e. home-manager) but that the new NixOS
+    // configuration also defines. Pass 1 will skip these because of the
+    // FragmentPath filter; if the per-user activation (sd-switch) later drops
+    // its copy, we need a second pass to bring the NixOS-owned definition up.
+    let migration_candidates: Vec<String> = current_active_units
+        .iter()
+        .filter(|(unit, _)| new_unit_dir.join(unit).exists())
+        .filter(|(_, unit_state)| {
+            !unit_state
+                .proxy
+                .get("org.freedesktop.systemd1.Unit", "FragmentPath")
+                .map(|p: String| p.starts_with(fragment_prefix))
+                .unwrap_or(false)
+        })
+        .map(|(unit, _)| unit.clone())
+        .collect();
+
+    collect_unit_changes(
+        &toplevel,
+        scope,
+        &old_toplevel.join(scope.etc_dir()),
+        &new_unit_dir,
+        &current_active_units,
+        &mut units_to_stop,
+        &mut units_to_start,
+        &mut units_to_reload,
+        &mut units_to_restart,
+        &mut units_to_skip,
+        &mut units_to_filter,
+    )?;
+
+    let print_units = |verb: &str, units: &HashMap<String, ()>| {
+        if units.is_empty() {
+            return;
+        }
+        let mut names: Vec<&str> = units.keys().map(String::as_str).collect();
+        names.sort_by_key(|n| n.to_lowercase());
+        eprintln!("{verb} the following user units: {}", names.join(", "));
+    };
+
+    if dry_run {
+        print_units("would stop", &units_to_stop);
+        if !units_to_skip.is_empty() {
+            print_units("would NOT restart", &units_to_skip);
+        }
+        print_units("would reload", &units_to_reload);
+        print_units("would restart", &units_to_restart);
+        print_units(
+            "would start",
+            &filter_units(&units_to_filter, &units_to_start),
+        );
+        return Ok(());
+    }
+
+    let mut exit_code = 0;
+
+    // Stop units before reexec so that ExecStop runs with the old definition.
+    print_units("stopping", &units_to_stop);
+    for unit in units_to_stop.keys() {
+        if let Ok(job_path) = systemd.stop_unit(unit, "replace") {
+            submitted_jobs.borrow_mut().insert(job_path, Job::Stop);
+        }
+    }
+    block_on_jobs(&dbus_conn, &submitted_jobs);
+
+    if !units_to_skip.is_empty() {
+        print_units("NOT restarting", &units_to_skip);
+    }
+
     // The systemd user session seems to not send a Reloaded signal, so we don't have anything to
     // wait on here.
     _ = systemd.reexecute();
 
-    systemd
-        .restart_unit("nixos-activation.service", "replace")
-        .context("Failed to restart nixos-activation.service")?;
+    // Reset failed and reload so that subsequent starts use the new unit files.
+    _ = systemd.reset_failed();
+    _ = systemd.reload();
 
-    log::debug!("waiting for nixos activation to finish");
-    while !*nixos_activation_done.borrow() {
-        _ = dbus_conn
-            .process(DBUS_PROCESS_TIME)
-            .context("Failed to process dbus messages")?;
+    print_units("reloading", &units_to_reload);
+    for unit in units_to_reload.keys() {
+        match systemd.reload_unit(unit, "replace") {
+            Ok(job_path) => {
+                submitted_jobs.borrow_mut().insert(job_path, Job::Reload);
+            }
+            Err(err) => {
+                eprintln!("Failed to reload user unit {unit}: {err}");
+                exit_code = 4;
+            }
+        }
+    }
+    block_on_jobs(&dbus_conn, &submitted_jobs);
+    remove_file_if_exists(&reload_list)
+        .with_context(|| format!("Failed to remove {}", reload_list.display()))?;
+
+    print_units("restarting", &units_to_restart);
+    for unit in units_to_restart.keys() {
+        match systemd.restart_unit(unit, "replace") {
+            Ok(job_path) => {
+                submitted_jobs.borrow_mut().insert(job_path, Job::Restart);
+            }
+            Err(err) => {
+                eprintln!("Failed to restart user unit {unit}: {err}");
+                exit_code = 4;
+            }
+        }
+    }
+    block_on_jobs(&dbus_conn, &submitted_jobs);
+    remove_file_if_exists(&restart_list)
+        .with_context(|| format!("Failed to remove {}", restart_list.display()))?;
+
+    let start_filtered = filter_units(&units_to_filter, &units_to_start);
+    print_units("starting", &start_filtered);
+    for unit in units_to_start.keys() {
+        match systemd.start_unit(unit, "replace") {
+            Ok(job_path) => {
+                submitted_jobs.borrow_mut().insert(job_path, Job::Start);
+            }
+            Err(err) => {
+                eprintln!("Failed to start user unit {unit}: {err}");
+                exit_code = 4;
+            }
+        }
+    }
+    block_on_jobs(&dbus_conn, &submitted_jobs);
+    remove_file_if_exists(&start_list)
+        .with_context(|| format!("Failed to remove {}", start_list.display()))?;
+
+    // Run per-user activation (home-manager etc.) after NixOS-level user units
+    // have been brought up to date. This matches the system → user layering.
+    // Toplevels with system.activatable = false do not ship this unit; mirror
+    // the system scope's tolerance for a missing activate script.
+    if new_unit_dir.join("nixos-activation.service").exists() {
+        match systemd.restart_unit("nixos-activation.service", "replace") {
+            Ok(_) => {
+                log::debug!("waiting for nixos activation to finish");
+                while !*nixos_activation_done.borrow() {
+                    _ = dbus_conn
+                        .process(DBUS_PROCESS_TIME)
+                        .context("Failed to process dbus messages")?;
+                }
+            }
+            Err(err) => {
+                eprintln!("Failed to restart nixos-activation.service: {err}");
+                exit_code = 4;
+            }
+        }
+    }
+
+    // Second pass: handle units that migrated from another manager to NixOS.
+    // The per-user activation may have removed ~/.config/systemd/user/<unit>
+    // and stopped it (sd-switch); now that the /etc copy is no longer
+    // shadowed, take ownership.
+    if !migration_candidates.is_empty() {
+        // Ensure systemd's view reflects any unit-file removals done by the
+        // per-user activation, in case it did not daemon-reload itself.
+        _ = systemd.reload();
+
+        let active_after = get_active_units(&systemd)?;
+
+        let mut to_restart = HashMap::new();
+        let mut to_start = HashMap::new();
+
+        for unit in &migration_candidates {
+            match active_after.get(unit) {
+                Some(unit_state) => {
+                    let now_etc = unit_state
+                        .proxy
+                        .get("org.freedesktop.systemd1.Unit", "FragmentPath")
+                        .map(|p: String| p.starts_with(fragment_prefix))
+                        .unwrap_or(false);
+                    if now_etc {
+                        // Still running with the previous manager's binary;
+                        // restart so the /etc definition takes effect.
+                        to_restart.insert(unit.clone(), ());
+                    }
+                    // else: still shadowed by ~/.config, leave it alone.
+                }
+                None => {
+                    // Stopped by the previous manager; start the /etc copy.
+                    to_start.insert(unit.clone(), ());
+                }
+            }
+        }
+
+        // Re-start active targets so any other newly-unmasked dependencies are
+        // pulled in as well.
+        for unit in units_to_start.keys() {
+            if unit.ends_with(".target") {
+                to_start.insert(unit.clone(), ());
+            }
+        }
+
+        print_units("restarting (post-activation)", &to_restart);
+        for unit in to_restart.keys() {
+            match systemd.restart_unit(unit, "replace") {
+                Ok(job_path) => {
+                    submitted_jobs.borrow_mut().insert(job_path, Job::Restart);
+                }
+                Err(err) => {
+                    eprintln!("Failed to restart user unit {unit}: {err}");
+                    exit_code = 4;
+                }
+            }
+        }
+        block_on_jobs(&dbus_conn, &submitted_jobs);
+
+        let to_start_filtered = filter_units(&units_to_filter, &to_start);
+        print_units("starting (post-activation)", &to_start_filtered);
+        for unit in to_start.keys() {
+            match systemd.start_unit(unit, "replace") {
+                Ok(job_path) => {
+                    submitted_jobs.borrow_mut().insert(job_path, Job::Start);
+                }
+                Err(err) => {
+                    eprintln!("Failed to start user unit {unit}: {err}");
+                    exit_code = 4;
+                }
+            }
+        }
+        block_on_jobs(&dbus_conn, &submitted_jobs);
+    }
+
+    let finished = finished_jobs.borrow();
+    let mut failed_units = Vec::new();
+    for (unit, job, result) in finished.values() {
+        if matches!(result.as_str(), "timeout" | "failed" | "dependency") {
+            eprintln!("Failed to {job} user unit {unit}");
+            failed_units.push(unit.as_str());
+            exit_code = 4;
+        }
+    }
+    if !failed_units.is_empty() {
+        failed_units.sort_by_key(|name| name.to_lowercase());
+        eprintln!(
+            "warning: the following user units failed: {}\n\
+             See `systemctl --user status {}` for details.",
+            failed_units.join(", "),
+            failed_units.join(" "),
+        );
     }
 
     dbus_conn
         .remove_match(jobs_token)
         .context("Failed to remove jobs token")?;
 
-    Ok(())
+    std::process::exit(exit_code);
 }
 
 fn usage(argv0: &str) -> ! {
@@ -999,6 +1557,12 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> {
 
     let out = PathBuf::from(required_env("OUT")?);
     let toplevel = PathBuf::from(required_env("TOPLEVEL")?);
+    // Capture the old toplevel before the activation script updates
+    // /run/current-system. We pass this to the per-user switch child so it can
+    // compare old vs new user unit files after /etc has already been switched.
+    let old_toplevel = Path::new("/run/current-system")
+        .canonicalize()
+        .unwrap_or_else(|_| PathBuf::from("/run/current-system"));
     let distro_id = required_env("DISTRO_ID")?;
     let pre_switch_check = required_env("PRE_SWITCH_CHECK")?;
     let install_bootloader = required_env("INSTALL_BOOTLOADER")?;
@@ -1173,140 +1737,19 @@ won't take effect until you reboot the system.
 
     let current_active_units = get_active_units(&systemd)?;
 
-    let template_unit_re = Regex::new(r"^(.*)@[^\.]*\.(.*)$")
-        .context("Invalid regex for matching systemd template units")?;
-    let unit_name_re = Regex::new(r"^(.*)\.[[:lower:]]*$")
-        .context("Invalid regex for matching systemd unit names")?;
-
-    for (unit, unit_state) in &current_active_units {
-        // Don't touch units not explicitly written by NixOS (e.g. units created by generators in
-        // /run/systemd/generator*)
-        if !unit_state
-            .proxy
-            .get("org.freedesktop.systemd1.Unit", "FragmentPath")
-            .map(|fragment_path: String| fragment_path.starts_with("/etc/systemd/system"))
-            .unwrap_or_default()
-        {
-            continue;
-        }
-
-        let current_unit_file = Path::new("/etc/systemd/system").join(unit);
-        let new_unit_file = toplevel.join("etc/systemd/system").join(unit);
-
-        let mut base_unit = unit.clone();
-        let mut current_base_unit_file = current_unit_file.clone();
-        let mut new_base_unit_file = new_unit_file.clone();
-
-        // Detect template instances
-        if let Some((Some(template_name), Some(template_instance))) =
-            template_unit_re.captures(unit).map(|captures| {
-                (
-                    captures.get(1).map(|c| c.as_str()),
-                    captures.get(2).map(|c| c.as_str()),
-                )
-            })
-        {
-            if !current_unit_file.exists() && !new_unit_file.exists() {
-                base_unit = format!("{template_name}@.{template_instance}");
-                current_base_unit_file = Path::new("/etc/systemd/system").join(&base_unit);
-                new_base_unit_file = toplevel.join("etc/systemd/system").join(&base_unit);
-            }
-        }
-
-        let mut base_name = base_unit.as_str();
-        if let Some(Some(new_base_name)) = unit_name_re
-            .captures(&base_unit)
-            .map(|capture| capture.get(1).map(|first| first.as_str()))
-        {
-            base_name = new_base_name;
-        }
-
-        if current_base_unit_file.exists()
-            && (unit_state.state == "active" || unit_state.state == "activating")
-        {
-            if new_base_unit_file
-                .canonicalize()
-                .map(|full_path| full_path == Path::new("/dev/null"))
-                .unwrap_or(true)
-            {
-                let current_unit_info = parse_unit(&current_unit_file, &current_base_unit_file)?;
-                if parse_systemd_bool(Some(&current_unit_info), "Unit", "X-StopOnRemoval", true) {
-                    _ = units_to_stop.insert(unit.to_string(), ());
-                }
-            } else if unit.ends_with(".target") {
-                let new_unit_info = parse_unit(&new_unit_file, &new_base_unit_file)?;
-
-                // Cause all active target units to be restarted below. This should start most
-                // changed units we stop here as well as any new dependencies (including new mounts
-                // and swap devices).  FIXME: the suspend target is sometimes active after the
-                // system has resumed, which probably should not be the case.  Just ignore it.
-                if !(matches!(
-                    unit.as_str(),
-                    "suspend.target" | "hibernate.target" | "hybrid-sleep.target"
-                ) || parse_systemd_bool(
-                    Some(&new_unit_info),
-                    "Unit",
-                    "RefuseManualStart",
-                    false,
-                ) || parse_systemd_bool(
-                    Some(&new_unit_info),
-                    "Unit",
-                    "X-OnlyManualStart",
-                    false,
-                )) {
-                    units_to_start.insert(unit.to_string(), ());
-                    record_unit(START_LIST_FILE, unit);
-                    // Don't spam the user with target units that always get started.
-                    if std::env::var("STC_DISPLAY_ALL_UNITS").as_deref() != Ok("1") {
-                        units_to_filter.insert(unit.to_string(), ());
-                    }
-                }
-
-                // Stop targets that have X-StopOnReconfiguration set. This is necessary to respect
-                // dependency orderings involving targets: if unit X starts after target Y and
-                // target Y starts after unit Z, then if X and Z have both changed, then X should
-                // be restarted after Z.  However, if target Y is in the "active" state, X and Z
-                // will be restarted at the same time because X's dependency on Y is already
-                // satisfied.  Thus, we need to stop Y first. Stopping a target generally has no
-                // effect on other units (unless there is a PartOf dependency), so this is just a
-                // bookkeeping thing to get systemd to do the right thing.
-                if parse_systemd_bool(
-                    Some(&new_unit_info),
-                    "Unit",
-                    "X-StopOnReconfiguration",
-                    false,
-                ) {
-                    units_to_stop.insert(unit.to_string(), ());
-                }
-            } else {
-                let current_unit_info = parse_unit(&current_unit_file, &current_base_unit_file)?;
-                let new_unit_info = parse_unit(&new_unit_file, &new_base_unit_file)?;
-                match compare_units(&current_unit_info, &new_unit_info) {
-                    UnitComparison::UnequalNeedsRestart => {
-                        handle_modified_unit(
-                            &toplevel,
-                            unit,
-                            base_name,
-                            &new_unit_file,
-                            &new_base_unit_file,
-                            Some(&new_unit_info),
-                            &current_active_units,
-                            &mut units_to_stop,
-                            &mut units_to_start,
-                            &mut units_to_reload,
-                            &mut units_to_restart,
-                            &mut units_to_skip,
-                        )?;
-                    }
-                    UnitComparison::UnequalNeedsReload if !units_to_restart.contains_key(unit) => {
-                        units_to_reload.insert(unit.clone(), ());
-                        record_unit(RELOAD_LIST_FILE, unit);
-                    }
-                    _ => {}
-                }
-            }
-        }
-    }
+    collect_unit_changes(
+        &toplevel,
+        UnitScope::System,
+        UnitScope::System.current_dir(),
+        &toplevel.join(UnitScope::System.etc_dir()),
+        &current_active_units,
+        &mut units_to_stop,
+        &mut units_to_start,
+        &mut units_to_reload,
+        &mut units_to_restart,
+        &mut units_to_skip,
+        &mut units_to_filter,
+    )?;
 
     // Compare the previous and new fstab to figure out which filesystems need a remount or need to
     // be unmounted. New filesystems are mounted automatically by starting local-fs.target.
@@ -1447,7 +1890,7 @@ won't take effect until you reboot the system.
 
             // Detect template instances.
             if let Some((Some(template_name), Some(template_instance))) =
-                template_unit_re.captures(unit).map(|captures| {
+                TEMPLATE_UNIT_RE.captures(unit).map(|captures| {
                     (
                         captures.get(1).map(|c| c.as_str()),
                         captures.get(2).map(|c| c.as_str()),
@@ -1461,7 +1904,7 @@ won't take effect until you reboot the system.
             }
 
             let mut base_name = base_unit.as_str();
-            if let Some(Some(new_base_name)) = unit_name_re
+            if let Some(Some(new_base_name)) = UNIT_NAME_RE
                 .captures(&base_unit)
                 .map(|capture| capture.get(1).map(|first| first.as_str()))
             {
@@ -1476,6 +1919,7 @@ won't take effect until you reboot the system.
 
             handle_modified_unit(
                 &toplevel,
+                UnitScope::System,
                 unit,
                 base_name,
                 &new_unit_file,
@@ -1617,7 +2061,7 @@ won't take effect until you reboot the system.
 
         // Detect template instances.
         if let Some((Some(template_name), Some(template_instance))) =
-            template_unit_re.captures(unit).map(|captures| {
+            TEMPLATE_UNIT_RE.captures(unit).map(|captures| {
                 (
                     captures.get(1).map(|c| c.as_str()),
                     captures.get(2).map(|c| c.as_str()),
@@ -1631,7 +2075,7 @@ won't take effect until you reboot the system.
         }
 
         let mut base_name = base_unit.as_str();
-        if let Some(Some(new_base_name)) = unit_name_re
+        if let Some(Some(new_base_name)) = UNIT_NAME_RE
             .captures(&base_unit)
             .map(|capture| capture.get(1).map(|first| first.as_str()))
         {
@@ -1647,6 +2091,7 @@ won't take effect until you reboot the system.
 
         handle_modified_unit(
             &toplevel,
+            UnitScope::System,
             unit,
             base_name,
             &new_unit_file,
@@ -1761,16 +2206,23 @@ won't take effect until you reboot the system.
                     .context("Failed to get full path to /proc/self/exe")?;
 
                 log::debug!("Performing user switch for {name}");
-                std::process::Command::new(&myself)
+                let status = std::process::Command::new(&myself)
                     .uid(uid)
                     .gid(gid)
                     .env_clear()
                     .env("XDG_RUNTIME_DIR", runtime_path)
                     .env("__NIXOS_SWITCH_TO_CONFIGURATION_PARENT_EXE", &myself)
+                    .env("TOPLEVEL", &toplevel)
+                    .env("OLD_TOPLEVEL", &old_toplevel)
+                    .env("NIXOS_ACTION", Into::<&'static str>::into(action))
                     .spawn()
                     .with_context(|| format!("Failed to spawn user activation for {name}"))?
                     .wait()
                     .with_context(|| format!("Failed to run user activation for {name}"))?;
+                if !status.success() {
+                    eprintln!("warning: user activation for {name} failed");
+                    exit_code = 4;
+                }
             }
         }
     }
@@ -2209,6 +2661,112 @@ invalid
                 ) == super::UnitComparison::UnequalNeedsReload
             );
 
+            assert!(
+                super::compare_units(
+                    &HashMap::from([]),
+                    &HashMap::from([(
+                        "Service".to_string(),
+                        HashMap::from([("ExecReload".to_string(), vec!["foobar".to_string()])])
+                    )])
+                ) == super::UnitComparison::UnequalNeedsReload
+            );
+
+            assert!(
+                super::compare_units(
+                    &HashMap::from([(
+                        "Service".to_string(),
+                        HashMap::from([("ExecReload".to_string(), vec!["foobar".to_string()])])
+                    )]),
+                    &HashMap::from([(
+                        "Service".to_string(),
+                        HashMap::from([("ExecReload".to_string(), vec!["barfoo".to_string()])])
+                    )])
+                ) == super::UnitComparison::UnequalNeedsReload
+            );
+
+            // New [Service] section while [Unit] already existed: must inspect
+            // the [Service] section, not the (unchanged) [Unit] one.
+            assert!(
+                super::compare_units(
+                    &HashMap::from([(
+                        "Unit".to_string(),
+                        HashMap::from([("Description".to_string(), vec!["x".to_string()])])
+                    )]),
+                    &HashMap::from([
+                        (
+                            "Unit".to_string(),
+                            HashMap::from([("Description".to_string(), vec!["x".to_string()])])
+                        ),
+                        (
+                            "Service".to_string(),
+                            HashMap::from([("ExecStart".to_string(), vec!["y".to_string()])])
+                        ),
+                    ]),
+                ) == super::UnitComparison::UnequalNeedsRestart
+            );
+            assert!(
+                super::compare_units(
+                    &HashMap::from([(
+                        "Unit".to_string(),
+                        HashMap::from([("Description".to_string(), vec!["x".to_string()])])
+                    )]),
+                    &HashMap::from([
+                        (
+                            "Unit".to_string(),
+                            HashMap::from([("Description".to_string(), vec!["x".to_string()])])
+                        ),
+                        (
+                            "Service".to_string(),
+                            HashMap::from([("ExecReload".to_string(), vec!["y".to_string()])])
+                        ),
+                    ]),
+                ) == super::UnitComparison::UnequalNeedsReload
+            );
+
+            // ExecReload removed: running process is unaffected and the new
+            // unit cannot be reloaded, so no action is needed.
+            assert!(
+                super::compare_units(
+                    &HashMap::from([(
+                        "Service".to_string(),
+                        HashMap::from([
+                            ("ExecStart".to_string(), vec!["x".to_string()]),
+                            ("ExecReload".to_string(), vec!["y".to_string()]),
+                        ])
+                    )]),
+                    &HashMap::from([(
+                        "Service".to_string(),
+                        HashMap::from([("ExecStart".to_string(), vec!["x".to_string()])])
+                    )]),
+                ) == super::UnitComparison::Equal
+            );
+            assert!(
+                super::compare_units(
+                    &HashMap::from([(
+                        "Service".to_string(),
+                        HashMap::from([("ExecReload".to_string(), vec!["y".to_string()])])
+                    )]),
+                    &HashMap::from([]),
+                ) == super::UnitComparison::Equal
+            );
+
+            // ExecReload added to an existing [Service] section
+            assert!(
+                super::compare_units(
+                    &HashMap::from([(
+                        "Service".to_string(),
+                        HashMap::from([("ExecStart".to_string(), vec!["x".to_string()])])
+                    )]),
+                    &HashMap::from([(
+                        "Service".to_string(),
+                        HashMap::from([
+                            ("ExecStart".to_string(), vec!["x".to_string()]),
+                            ("ExecReload".to_string(), vec!["y".to_string()]),
+                        ])
+                    )]),
+                ) == super::UnitComparison::UnequalNeedsReload
+            );
+
             assert!(
                 super::compare_units(
                     &HashMap::from([(
diff --git a/pkgs/by-name/sw/switchres/package.nix b/pkgs/by-name/sw/switchres/package.nix
index 464fad23eb10..b94b4c353754 100644
--- a/pkgs/by-name/sw/switchres/package.nix
+++ b/pkgs/by-name/sw/switchres/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "antonioginer";
     repo = "switchres";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s4OTnq46lvYoxB5Q2CkYNcMbsNdy7kg4rbovbVXJUMs=";
+    hash = "sha256-jHMZuROSmRhCKb0AV3t1WUJZMOnB4ahx+ZcrWRFmTrM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 9fd8a307bcac..fe2808eac32b 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sydbox";
-  version = "3.49.1";
+  version = "3.51.2";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TFPN0KvzO+tNlt9EWEx7MC3DNC3+CzHJn2MfMWpwOp4=";
+    hash = "sha256-tOHd+E68LXK5AZzcNcf2p/ONyO4EXjF+xYDWftLG/pU=";
   };
 
-  cargoHash = "sha256-yrsJrZ4rDBYlapz/O+1l4h6MIAgZ0PpYm68OFfeHb8A=";
+  cargoHash = "sha256-wkrbj553N5icVndoXwCvFGCWYnU+qg3gcADgoFHLeZc=";
 
   nativeBuildInputs = [
     mandoc
diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix
index e13abcab8684..4bc0780f4b42 100644
--- a/pkgs/by-name/sy/syft/package.nix
+++ b/pkgs/by-name/sy/syft/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "syft";
-  version = "1.42.4";
+  version = "1.43.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "syft";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RIPdH3XT4jruT2a3cU0GsR2PeExVuVAHeN2Za1E7Gyg=";
+    hash = "sha256-JWcJn8NU9GfTJDKFedop5UuLq/SqFFdM26F7yhkcQyM=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
   # hash mismatch with darwin
   proxyVendor = true;
 
-  vendorHash = "sha256-4S9U4nZxCckp+kbRRsSLCIbLJ9E98X1ELtkAYCMAG0k=";
+  vendorHash = "sha256-k3+fbwMJnz6bsI9pHbExgww4QYQlYslF8iZjM+Ik/4o=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/sy/sylpheed/package.nix b/pkgs/by-name/sy/sylpheed/package.nix
deleted file mode 100644
index 218de628020e..000000000000
--- a/pkgs/by-name/sy/sylpheed/package.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  gtk2,
-  openssl ? null,
-  gpgme ? null,
-  gpgSupport ? true,
-  sslSupport ? true,
-  fetchpatch,
-}:
-
-assert gpgSupport -> gpgme != null;
-assert sslSupport -> openssl != null;
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "sylpheed";
-  version = "3.7.0";
-
-  src = fetchurl {
-    url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/sylpheed-${finalAttrs.version}.tar.xz";
-    sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd";
-  };
-
-  patches = [
-    (fetchpatch {
-      # patch upstream bug https://sylpheed.sraoss.jp/redmine/issues/306
-      name = "patch-libsylph_ssl_c.patch";
-      extraPrefix = "";
-      url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/mail/sylpheed/patches/patch-libsylph_ssl_c?rev=1.4&content-type=text/plain";
-      sha256 = "sha256-+FetU5vrfvE78nYAjKK/QFZnFw+Zr2PvoUGRWCuZczs=";
-    })
-    (fetchpatch {
-      name = "CVE-2021-37746.patch";
-      url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=ac286a71ed78429e16c612161251b9ea90ccd431";
-      sha256 = "sha256-oLmUShtvO6io3jibKT67eO0O58vEDZEeaB51QTd3UkU=";
-    })
-    (fetchurl {
-      name = "0013-fix-FTBFS-GCC-14.patch";
-      url = "https://salsa.debian.org/sylpheed-team/sylpheed/-/raw/22984c6d2bf76b0667256a9e8b660447497e1220/debian/patches/0013-fix-FTBFS-GCC-14.patch?inline=false";
-      sha256 = "sha256-ZfQKiOK8pMrN87hrP0/2LxYZZdnaciBoa0khG1Djelo=";
-    })
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    gtk2
-  ]
-  ++ lib.optionals gpgSupport [ gpgme ]
-  ++ lib.optionals sslSupport [ openssl ];
-
-  configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl";
-
-  # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool"
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_LDFLAGS = "-framework Foundation";
-  };
-
-  meta = {
-    homepage = "https://sylpheed.sraoss.jp/en/";
-    description = "Lightweight and user-friendly e-mail client";
-    mainProgram = "sylpheed";
-    maintainers = [ ];
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    license = lib.licenses.gpl2;
-  };
-})
diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix
index 804d55370801..25f11c3d655b 100644
--- a/pkgs/by-name/sy/symbolicator/package.nix
+++ b/pkgs/by-name/sy/symbolicator/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "symbolicator";
-  version = "26.2.1";
+  version = "26.3.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "symbolicator";
     rev = finalAttrs.version;
-    hash = "sha256-CuG/rfwuJeKibsYWo1lNDcJkuKXMrXSv8hk+hIjYy74=";
+    hash = "sha256-up23SMS/TWmgPm+VsWCEX/G8A8MgG9Vzay76tsHzo2M=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-YddQ3E6YlcFkoQEglTNJ1lK6ivxJYtwhouFT32kV1hI=";
+  cargoHash = "sha256-GUWAG9mPPHUevA1IfFRpL9f93vUWb+/gaH0v+Dw9Rko=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/sy/sysbench/package.nix b/pkgs/by-name/sy/sysbench/package.nix
index 05384c0b00c0..e3fdfa2de652 100644
--- a/pkgs/by-name/sy/sysbench/package.nix
+++ b/pkgs/by-name/sy/sysbench/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  autoconf269,
   autoreconfHook,
   pkg-config,
   libmysqlclient,
@@ -16,7 +17,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "sysbench";
   version = "1.0.20";
 
+  # Build fails with autoconf 2.73
   nativeBuildInputs = [
+    autoconf269
     autoreconfHook
     pkg-config
   ];
diff --git a/pkgs/by-name/t3/t3code/package.nix b/pkgs/by-name/t3/t3code/package.nix
new file mode 100644
index 000000000000..5a5bb91918f1
--- /dev/null
+++ b/pkgs/by-name/t3/t3code/package.nix
@@ -0,0 +1,237 @@
+{
+  bun,
+  cctools,
+  copyDesktopItems,
+  electron_40,
+  fetchFromGitHub,
+  installShellFiles,
+  lib,
+  libicns,
+  makeBinaryWrapper,
+  makeDesktopItem,
+  nix-update-script,
+  node-gyp,
+  nodejs,
+  python3,
+  stdenv,
+  stdenvNoCC,
+  writableTmpDirAsHomeHook,
+  writeDarwinBundle,
+  xcbuild,
+}:
+
+stdenv.mkDerivation (
+  finalAttrs:
+  let
+    appName = "T3 Code (Alpha)";
+    electron = electron_40;
+    desktopIcon =
+      if stdenv.hostPlatform.isDarwin then
+        "assets/prod/black-macos-1024.png"
+      else
+        "assets/prod/black-universal-1024.png";
+    nodeModules = stdenvNoCC.mkDerivation {
+      pname = "${finalAttrs.pname}-node_modules";
+      inherit (finalAttrs) src version strictDeps;
+
+      nativeBuildInputs = [
+        bun
+        nodejs
+        writableTmpDirAsHomeHook
+      ];
+
+      dontConfigure = true;
+      dontFixup = true;
+
+      postPatch = ''
+        for packageJson in \
+          packages/{contracts,shared}/package.json
+        do
+          substituteInPlace "$packageJson" \
+            --replace-fail '"prepare": "effect-language-service patch",' '"prepare": "true",'
+        done
+      '';
+
+      buildPhase = ''
+        runHook preBuild
+
+        bun install \
+          --cpu="*" \
+          --ignore-scripts \
+          --no-progress \
+          --frozen-lockfile \
+          --os="*"
+
+        runHook postBuild
+      '';
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir --parents $out
+        cp --recursive node_modules $out
+        find apps packages -type d -name node_modules -exec cp --recursive --parents {} $out \;
+
+        runHook postInstall
+      '';
+
+      outputHash = "sha256-MuP+L8PwV9gKbeiJXYtUpgyIAYPmq4G1FolP7uB9J3w=";
+      outputHashMode = "recursive";
+    };
+  in
+  {
+    pname = "t3code";
+    version = "0.0.21";
+    strictDeps = true;
+    __structuredAttrs = true;
+
+    src = fetchFromGitHub {
+      owner = "pingdotgg";
+      repo = "t3code";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-e0U9DkEh20w1xq4P9Fri3bx2ifCiDK4G/vVPHDP+lXs=";
+    };
+
+    postPatch = ''
+      substituteInPlace apps/web/vite.config.ts \
+        --replace-fail 'const host = process.env.HOST?.trim() || "localhost";' \
+                       'const host = process.env.HOST?.trim() || "127.0.0.1";'
+    '';
+
+    nativeBuildInputs = [
+      bun
+      installShellFiles
+      makeBinaryWrapper
+      node-gyp
+      nodejs
+      python3
+      writableTmpDirAsHomeHook
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      cctools.libtool
+      libicns
+      writeDarwinBundle
+      xcbuild
+    ];
+
+    configurePhase = ''
+      runHook preConfigure
+
+      cp --recursive ${nodeModules}/. .
+
+      chmod --recursive u+rwX node_modules
+      patchShebangs node_modules
+
+      # Compile node-pty's native addon from the vendored bun store.
+      export npm_config_nodedir=${nodejs}
+      cd node_modules/.bun/node-pty@*/node_modules/node-pty
+      node-gyp rebuild
+      node scripts/post-install.js
+      cd -
+
+      runHook postConfigure
+    '';
+
+    buildPhase = ''
+      runHook preBuild
+
+      for app in web server desktop; do
+        bun run --cwd apps/"$app" build
+      done
+
+      runHook postBuild
+    '';
+
+    # Bun vendors many prebuilt native artifacts for non-host platforms, and
+    # some of those binaries are statically linked. Let fixup handle wrappers,
+    # shebangs, and stripping, but skip patchelf on the vendored tree.
+    dontPatchELF = true;
+    # The tmpdir audit hook also shells out to patchelf while scanning every
+    # vendored ELF for leaked build paths. That produces spurious warnings on
+    # Bun's static foreign-platform binaries.
+    noAuditTmpdir = true;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir --parents "$out"/libexec/t3code/apps/desktop "$out"/libexec/t3code/apps/server
+      cp --recursive --no-preserve=mode node_modules "$out"/libexec/t3code
+      cp --recursive --no-preserve=mode apps/server/{node_modules,dist} "$out"/libexec/t3code/apps/server
+      cp --recursive --no-preserve=mode apps/desktop/{node_modules,dist-electron} "$out"/libexec/t3code/apps/desktop
+
+      mkdir --parents "$out"/libexec/t3code/apps/desktop/prod-resources
+      install --mode=444 ${desktopIcon} \
+        "$out"/libexec/t3code/apps/desktop/prod-resources/icon.png
+
+      find "$out"/libexec/t3code -xtype l -delete
+
+      makeWrapper ${lib.getExe nodejs} "$out"/bin/t3code \
+        --add-flags "$out"/libexec/t3code/apps/server/dist/bin.mjs
+
+      makeWrapper ${lib.getExe electron} "$out"/bin/t3code-desktop \
+        --add-flags "$out"/libexec/t3code/apps/desktop/dist-electron/main.cjs \
+        --inherit-argv0
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir --parents "$out/Applications/${appName}.app/Contents/"{MacOS,Resources}
+      png2icns \
+        "$out/Applications/${appName}.app/Contents/Resources/t3code.icns" \
+        ${desktopIcon}
+      write-darwin-bundle "$out" "${appName}" t3code-desktop t3code
+    ''
+    + ''
+      mkdir --parents \
+        "$out"/share/icons/hicolor/scalable/apps
+      install --mode=444 ${desktopIcon} \
+        "$out"/share/icons/t3code.png
+      install --mode=444 assets/prod/logo.svg \
+        "$out"/share/icons/hicolor/scalable/apps/t3code.svg
+
+      runHook postInstall
+    '';
+
+    postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      for shell in bash fish zsh; do
+        installShellCompletion --cmd t3code --"$shell" <("$out/bin/t3code" --completions "$shell")
+      done
+    '';
+
+    desktopItems = [
+      (makeDesktopItem {
+        name = "t3code";
+        desktopName = appName;
+        comment = "Minimal web GUI for coding agents";
+        exec = "t3code-desktop %U";
+        terminal = false;
+        icon = "t3code";
+        startupWMClass = "t3code";
+        categories = [ "Development" ];
+      })
+    ];
+
+    passthru = {
+      inherit nodeModules;
+      updateScript = nix-update-script {
+        extraArgs = [
+          "--subpackage"
+          "nodeModules"
+        ];
+      };
+    };
+
+    meta = {
+      description = "Minimal web GUI for coding agents";
+      homepage = "https://t3.codes";
+      downloadPage = "https://t3.codes/download";
+      changelog = "https://github.com/pingdotgg/t3code/releases/tag/${finalAttrs.src.tag}";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [
+        iamanaws
+        qweered
+      ];
+      mainProgram = "t3code-desktop";
+      inherit (nodejs.meta) platforms;
+    };
+  }
+)
diff --git a/pkgs/by-name/ta/taglib/package.nix b/pkgs/by-name/ta/taglib/package.nix
index 8b23abdf2c27..4d1e30b71e26 100644
--- a/pkgs/by-name/ta/taglib/package.nix
+++ b/pkgs/by-name/ta/taglib/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "taglib";
-  version = "2.1.1";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "taglib";
     repo = "taglib";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-pzsjZgtr9icfXWxsZoA5GXf9k3gh92DzJRcp87T0PVQ=";
+    hash = "sha256-xup/c1giZadq8jYQgsZW+NJkjw9ofpdivnBVKTVkRjU=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
index 22201196087c..0a4b336074c2 100644
--- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix
+++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       ;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-1F4DeqJWJs3L1hDzNn7PJr9sSBv2TcN8QfV8/pwAKuU=";
+    fetcherVersion = 3;
+    hash = "sha256-3pHEmYMgQuHFFMyGeFzo9BWRFt6yvWzFFMJEdRhwS2w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index 3a87fd981d7d..765b3ab7dae0 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.2.2";
+  version = "4.2.4";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-LOZrfIEB7xJFoH0eertL6zW/US/Tvuy6HN+zJ1gNElI=";
-      aarch64-linux = "sha256-rWJ+d7SWzMraSm4m6v/2mO8IKQgeV1pLrzr4UkuwB0c=";
-      x86_64-darwin = "sha256-mONMar0Ap1p06i0grPnihCQdEwIxMwdtIgxvPKQZ2SA=";
-      x86_64-linux = "sha256-SrhPK0lsQC0+xP0l4OVVn+EYTYhtra6PtEODROwETCI=";
+      aarch64-darwin = "sha256-ky9wRSBSg/Syb5pMPwJ5WFJr9bzIV3p+LxgALh61FF4=";
+      aarch64-linux = "sha256-MPpa2NJuj1qut+UA2mAVVDxbu/t9fXdbg/vD+5zV73w=";
+      x86_64-darwin = "sha256-T8u/TmgORiNlpB/qr0QU+Swl9bzAp3KaYkMsBegXNzM=";
+      x86_64-linux = "sha256-yr7vBJzeq2Gl+mtl6iij6OU7ioXliIOUeGjHMPxIvew=";
     }
     .${system} or throwSystem;
 in
diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix
index e490ee3477c2..6572819dde8a 100644
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@@ -61,8 +61,8 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm';
-    fetcherVersion = 1;
-    hash = "sha256-jwoSvqE0hqRxu76vDtUOpZxvi4SsmKukfpmp5G6ZV/I=";
+    fetcherVersion = 3;
+    hash = "sha256-a1ym/UpUufUPTGL3dozZ9Jb0eX1XVB7Hahek25eLvc4=";
   };
 
   buildInputs = [ nodejs_20 ];
@@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
   # After the pnpm configure, we need to build the binaries of all instances
   # of better-sqlite3. It has a native part that it wants to build using a
   # script which is disallowed.
-  # Adapted from mkYarnModules.
   preBuild = ''
     for f in $(find -path '*/node_modules/better-sqlite3' -type d); do
       (cd "$f" && (
diff --git a/pkgs/by-name/ta/talhelper/package.nix b/pkgs/by-name/ta/talhelper/package.nix
index c4f4b1674ab3..5fb5442ffa44 100644
--- a/pkgs/by-name/ta/talhelper/package.nix
+++ b/pkgs/by-name/ta/talhelper/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "talhelper";
-  version = "3.1.5";
+  version = "3.1.9";
 
   src = fetchFromGitHub {
     owner = "budimanjojo";
     repo = "talhelper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TNKYe5zhcXASlHfd0F4QwEWPjLRY9iiUnOdayXWpogM=";
+    hash = "sha256-ocZjtinqZylLjUOovazcCkshg71jjmAIe5a4cKLZ9eo=";
   };
 
-  vendorHash = "sha256-hY85ZlkUG/B0aRtJ4SIJ2zV3zN/5FeUVYEgGETBAHZ0=";
+  vendorHash = "sha256-PzZxQsX4ynjYJUgEkWm2ceMt8mAFIioNVG9hLejq6ns=";
 
   ldflags = [
     "-s"
@@ -54,7 +54,10 @@ buildGoModule (finalAttrs: {
     '';
     homepage = "https://github.com/budimanjojo/talhelper";
     mainProgram = "talhelper";
-    maintainers = with lib.maintainers; [ madeddie ];
+    maintainers = with lib.maintainers; [
+      madeddie
+      nevivurn
+    ];
     license = lib.licenses.bsd3;
   };
 })
diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix
index 75b1b51e332c..a3837eb86aad 100644
--- a/pkgs/by-name/ta/talosctl/package.nix
+++ b/pkgs/by-name/ta/talosctl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "talosctl";
-  version = "1.12.6";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "talos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eVA2ZRCC3Lw4EvSHi0ohEoRHudpAi+Ps4zcIfXQWlGE=";
+    hash = "sha256-dO4GBDhxsiuNn0lJl8RgFwUVxn34+Uks69Cm5J9zJsg";
   };
 
-  vendorHash = "sha256-gul+sTsi0kVt8BGjuEAaqAnreDP9wql0dBOfMYuxRWY=";
+  vendorHash = "sha256-489ZbRoB7KhvrKfnfGEAw406zdMrkT/3fcw6LcAtFyo";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ta/tandoor-recipes/frontend.nix b/pkgs/by-name/ta/tandoor-recipes/frontend.nix
index 7b529ec5be6f..a01c4189e8fb 100644
--- a/pkgs/by-name/ta/tandoor-recipes/frontend.nix
+++ b/pkgs/by-name/ta/tandoor-recipes/frontend.nix
@@ -3,7 +3,7 @@
   fetchYarnDeps,
   fixup-yarn-lock,
   callPackage,
-  nodejs_20,
+  nodejs_22,
   yarn,
 }:
 let
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     fixup-yarn-lock
-    nodejs_20
-    (yarn.override { nodejs = nodejs_20; })
+    nodejs_22
+    (yarn.override { nodejs = nodejs_22; })
   ];
 
   configurePhase = ''
diff --git a/pkgs/by-name/ta/taskflow/add-pkg-config-support.patch b/pkgs/by-name/ta/taskflow/add-pkg-config-support.patch
new file mode 100644
index 000000000000..3eb447d6d3bb
--- /dev/null
+++ b/pkgs/by-name/ta/taskflow/add-pkg-config-support.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 063fd793..99998a6b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -377,3 +377,13 @@ install(
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ )
+ 
++
++# -----------------------------------------------------------------------------
++# pkg-config
++# -----------------------------------------------------------------------------
++
++configure_file(taskflow.pc.in taskflow.pc @ONLY)
++install(
++  FILES ${CMAKE_CURRENT_BINARY_DIR}/taskflow.pc
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
++)
+diff --git a/taskflow.pc.in b/taskflow.pc.in
+new file mode 100644
+index 00000000..fc649288
+--- /dev/null
++++ b/taskflow.pc.in
+@@ -0,0 +1,7 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++
++Name: Taskflow
++Description: A General-purpose Task-parallel Programming System
++Version: @PROJECT_VERSION@
++Cflags: -I${includedir}
diff --git a/pkgs/by-name/ta/taskflow/package.nix b/pkgs/by-name/ta/taskflow/package.nix
index 14e3cb8176e2..65471bef8a46 100644
--- a/pkgs/by-name/ta/taskflow/package.nix
+++ b/pkgs/by-name/ta/taskflow/package.nix
@@ -2,6 +2,7 @@
   cmake,
   doctest,
   fetchFromGitHub,
+  fetchpatch,
   lib,
   replaceVars,
   stdenv,
@@ -22,6 +23,19 @@ stdenv.mkDerivation (finalAttrs: {
     (replaceVars ./unvendor-doctest.patch {
       inherit doctest;
     })
+
+    # https://github.com/taskflow/taskflow/pull/785
+    # TODO: remove when updating to the next release
+    (fetchpatch {
+      name = "fix-brace-init-with-explicit-constructor-for-GCC-15";
+      url = "https://github.com/taskflow/taskflow/commit/de7dfe30594cd1f98398095b970a8320734a2382.patch";
+      hash = "sha256-Ecl7dFvf2HDslv/5IHR5J2PYcRCN3EA4GahxOzcUS4g=";
+    })
+
+    # Vendored from #786 as it does not apply cleanly on top of v0.4.0
+    # https://github.com/taskflow/taskflow/pull/786
+    # TODO: remove when updating to the next release
+    ./add-pkg-config-support.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix
index 63b3d9eee392..ac3e0bed7c5f 100644
--- a/pkgs/by-name/ta/tauon/package.nix
+++ b/pkgs/by-name/ta/tauon/package.nix
@@ -48,14 +48,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "tauon";
-  version = "8.2.2";
+  version = "9.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Taiko2k";
     repo = "Tauon";
     tag = "v${version}";
-    hash = "sha256-d7bEC68ZJthJE/AlcUqBSNM4L4YAjwHXTiWDCtKf598=";
+    hash = "sha256-Z/+8UCtwvY9000b1Y+HaTIehK8axzyR+eeeBPhllS4U=";
   };
 
   postUnpack = ''
@@ -74,6 +74,8 @@ python3Packages.buildPythonApplication rec {
   pythonRemoveDeps = [
     "opencc"
     "tekore"
+    # Whether or not it is enabled (withDiscordRPC), it isn't present during build.
+    "pypresence"
   ];
 
   nativeBuildInputs = [
@@ -101,6 +103,7 @@ python3Packages.buildPythonApplication rec {
     opusfile
     pango
     pipewire
+    python3Packages.pyopengl
     wavpack
   ];
 
@@ -121,6 +124,7 @@ python3Packages.buildPythonApplication rec {
       pychromecast
       pylast
       pygobject3
+      pyopengl
       pysdl3
       requests
       send2trash
diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index 344d52586270..f72cb837498a 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-cLh9iiDLW3CDg8R+I3TSEMdnyv1KaHelubvF31oGrWk=";
+    fetcherVersion = 3;
+    hash = "sha256-x9XPnvyrAmFqIMhjBFQYQE1qKDG6uxzd0NnxIjdOXio=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix
index dbf0a023f9d0..aca9b40ddde0 100644
--- a/pkgs/by-name/tb/tbls/package.nix
+++ b/pkgs/by-name/tb/tbls/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "tbls";
-  version = "1.94.4";
+  version = "1.94.5";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "tbls";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IcJVEVyO8cq9UHWq+b+1YuMgkwJRI430UekiLKeKjYo=";
+    hash = "sha256-edwTHkweia5FAn4UGm4FFV/mtDc+L7KA6hlrjSxYNws=";
   };
 
   vendorHash = "sha256-NhssCwXaeBUS+LLU/CTG/+Y5hOih9aOVCMYIXrxbU4M=";
diff --git a/pkgs/by-name/tc/tcld/compgen.patch b/pkgs/by-name/tc/tcld/compgen.patch
index 5c9c615dac12..5f7bd678282e 100644
--- a/pkgs/by-name/tc/tcld/compgen.patch
+++ b/pkgs/by-name/tc/tcld/compgen.patch
@@ -1,15 +1,12 @@
 diff --git a/app/app.go b/app/app.go
-index 57a9b36fdb..96acf94dc1 100644
+index a9c2dae..23d1527 100644
 --- a/app/app.go
 +++ b/app/app.go
-@@ -28,6 +28,7 @@
+@@ -38,6 +38,7 @@ func NewApp(params AppParams) (*cli.App, error) {
  			EnableDebugLogsFlag,
  		},
- 		Commands: params.Commands,
+ 		Commands: enabledCommands,
 +		EnableBashCompletion: true,
  	}
  
- 	return app, nil
-diff --git a/compgen.patch b/compgen.patch
-new file mode 100644
-index 0000000000..e69de29bb2
+ 	return app, nil
\ No newline at end of file
diff --git a/pkgs/by-name/tc/tcld/package.nix b/pkgs/by-name/tc/tcld/package.nix
index 3a7158460014..79591cfc452d 100644
--- a/pkgs/by-name/tc/tcld/package.nix
+++ b/pkgs/by-name/tc/tcld/package.nix
@@ -10,12 +10,12 @@
 
 buildGoModule (finalAttrs: {
   pname = "tcld";
-  version = "0.41.0";
+  version = "0.55.0";
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "tcld";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Jnm6l9Jj1mi9esDS6teKTEMhq7V1QD/dTl3qFhKsW4o=";
+    hash = "sha256-VbhjfcGSXMJr/oaSDA7s8EuJhmyCdFfyix4T0bTfNE0=";
     # Populate values from the git repository; by doing this in 'postFetch' we
     # can delete '.git' afterwards and the 'src' should stay reproducible.
     leaveDotGit = true;
diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index e9e2ac9dfcd5..b01f5392b4a0 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.8.0";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-ybxJCCdam5g43Ycf+Ro3ptOr+4+49Fw+y0rqG4fEzBc=";
+    hash = "sha256-kD04SMErq92k+F4/3v6bpoJf2lfaGM6bAn+bCa9ACbA=";
   };
 
-  npmDepsHash = "sha256-+VwOlzR+80m+qQS4L0IPmFTn4xuPM7aX7EtSd50D9KM=";
+  npmDepsHash = "sha256-497bL7l3OIAgkbXP3FkeFFpPz2VtRENrw6sQmJsnXBY=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/te/teamspeak3/package.nix b/pkgs/by-name/te/teamspeak3/package.nix
deleted file mode 100644
index f717bc297e86..000000000000
--- a/pkgs/by-name/te/teamspeak3/package.nix
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchzip,
-  makeDesktopItem,
-  glib,
-  qt5,
-  libsForQt5,
-  perl,
-  libcxx,
-  autoPatchelfHook,
-  copyDesktopItems,
-}:
-
-let
-  pluginsdk = fetchzip {
-    url = "https://files.teamspeak-services.com/releases/sdk/3.3.1/ts_sdk_3.3.1.zip";
-    hash = "sha256-wx4pBZHpFPoNvEe4xYE80KnXGVda9XcX35ho4R8QxrQ=";
-  };
-in
-
-stdenv.mkDerivation rec {
-  pname = "teamspeak3";
-
-  version = "3.6.2";
-
-  src = fetchurl {
-    url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_amd64-${version}.run";
-    hash = "sha256-WfEQQ4lxoj+QSnAOfdCoEc+Z1Oa5dbo6pFli1DsAZCI=";
-  };
-
-  nativeBuildInputs = [
-    perl # Installer script needs `shasum`
-    qt5.wrapQtAppsHook
-    autoPatchelfHook
-    copyDesktopItems
-  ];
-
-  buildInputs = [
-    libsForQt5.quazip
-    glib
-    libcxx
-  ]
-  ++ (with qt5; [
-    qtbase
-    qtwebengine
-    qtwebchannel
-    qtwebsockets
-    qtsvg
-  ]);
-
-  # This runs the installer script. If it gets stuck, run it with -x.
-  # If it then gets stuck at something like:
-  #
-  # ++ exec
-  # + PAGER_PATH=
-  #
-  # it's looking for a dependency and didn't find it. Check the script and make
-  # sure the dep is in nativeBuildInputs.
-  unpackPhase = ''
-    runHook preUnpack
-
-    # Run the installer script non-interactively
-    echo -e '\ny' | PAGER=cat sh -e $src
-
-    cd TeamSpeak3-Client-linux_amd64
-
-    runHook postUnpack
-  '';
-
-  patchPhase = ''
-    runHook prePatch
-
-    # Delete unecessary libraries - these are provided by nixos.
-    find . -\( -name '*.so' -or -name '*.so.*' -\) -print0 | xargs -0 rm # I hate find.
-
-    rm QtWebEngineProcess
-    rm qt.conf
-
-    mv ts3client_linux_amd64 ts3client
-
-    # Our libquazip's so name has this suffix and there is no symlink
-    patchelf --replace-needed libquazip.so libquazip1-qt5.so ts3client error_report
-
-    runHook postPatch
-  '';
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "teamspeak";
-      exec = "ts3client";
-      icon = "teamspeak";
-      comment = "The TeamSpeak voice communication tool";
-      desktopName = "TeamSpeak";
-      genericName = "TeamSpeak";
-      categories = [ "Network" ];
-    })
-  ];
-
-  qtWrapperArgs = [
-    # wayland is currently broken, remove when TS3 fixes that
-    "--set QT_QPA_PLATFORM xcb"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/opt/teamspeak
-    mv * $out/opt/teamspeak/
-
-    # Grab the desktop icon from the plugin sdk
-    install ${pluginsdk}/doc/_static/logo.png -D $out/share/icons/hicolor/64x64/apps/teamspeak.png
-
-    mkdir -p $out/bin/
-    ln -s $out/opt/teamspeak/ts3client $out/bin/ts3client
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "TeamSpeak voice communication tool";
-    homepage = "https://teamspeak.com/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.teamspeak;
-    maintainers = with lib.maintainers; [
-      lhvwb
-      lukegb
-      atemu
-    ];
-    mainProgram = "ts3client";
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/by-name/te/teapot/package.nix b/pkgs/by-name/te/teapot/package.nix
index 31a2fefaec79..0df896b0e7b0 100644
--- a/pkgs/by-name/te/teapot/package.nix
+++ b/pkgs/by-name/te/teapot/package.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   env = {
     # By no known reason libtirpc is not detected
-    NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
-    NIX_LDFLAGS = [ "-ltirpc" ];
+    NIX_CFLAGS_COMPILE = "-I${lib.getDev libtirpc}/include/tirpc";
+    NIX_LDFLAGS = "-ltirpc";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix
index a6b39783ca59..c413827e33f6 100644
--- a/pkgs/by-name/te/teip/package.nix
+++ b/pkgs/by-name/te/teip/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "teip";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "greymd";
     repo = "teip";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Lr4nlAM2mEKwF3HXso/6FQEKoQK43xxLMgOU7j7orYg=";
+    hash = "sha256-isdp0EbHsge5vn4h1rKH2LCLFGp33BXew4SU48QKz7g=";
   };
 
-  cargoHash = "sha256-FFv/Msx6fXRJuRH8hjhBgc7XCg5EKWantNKQHwXpa4o=";
+  cargoHash = "sha256-YEgLNfES9ffxwz+mR+fjDONa2M0JxvKtmoYBORDaY8w=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/te/telemt/package.nix b/pkgs/by-name/te/telemt/package.nix
index a778949635aa..aa34b47931bc 100644
--- a/pkgs/by-name/te/telemt/package.nix
+++ b/pkgs/by-name/te/telemt/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "telemt";
-  version = "3.3.28";
+  version = "3.4.5";
 
   src = fetchFromGitHub {
     owner = "telemt";
     repo = "telemt";
     tag = version;
-    hash = "sha256-u5/HiFIinKvpTItUsBnLhsGhAXN3V2qeeUGmvcFlJI8=";
+    hash = "sha256-zOdVnW7RTPAbR6fpzDqPpwhOWjxknmg8TzGXmBCbWjg=";
   };
 
-  cargoHash = "sha256-FGXdWhjqlb0urBtSbU1afebgy3a/CLGB+aHv3ccIiy8=";
+  cargoHash = "sha256-/7Xd/6NEu6QqFdVUz4M+iz9+7K5lEDguyaprAKh86wo=";
 
   meta = {
     mainProgram = "telemt";
diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index 30337639cff0..6c166deafdc4 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -7,11 +7,11 @@
 }:
 
 buildTeleport {
-  version = "17.7.20";
-  hash = "sha256-zxP7vhDyxypotG58wzwlCx8JMoRSYC0adMe+zKfrOek=";
-  vendorHash = "sha256-uwSCPu3z9LCvN/vKJg/Q9rgk6wnjh4P4tq4a5suPNrg=";
-  cargoHash = "sha256-opLo7UmZzxrVxYZOwn4v4G5lhHFp5GrdOZe7uIb97q0=";
-  pnpmHash = "sha256-quHu43JccCpguSeHkGnpqL81oDN4p5WtAt/sOgMCCec=";
+  version = "17.7.23";
+  hash = "sha256-o1aYmNN4yytgJFQ7V1sPjq6r2pDzf4mG/juyYK5IF3A=";
+  vendorHash = "sha256-cL2U1GOV6PtxSl8N8gjKOHCpj5jhun5D+DbeWBixnxI=";
+  cargoHash = "sha256-cDcDfptq8z0pwjImuAovv/5XwoaPb/ostyxkyNEbkRM=";
+  pnpmHash = "sha256-NTH5YnqeZg/jEkjguSXGS3/MI/r8us11By/fZ1m1caQ=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
   inherit buildGoModule withRdpClient extPatches;
diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix
index 7dfa795d9410..d93d3874fe32 100644
--- a/pkgs/by-name/te/teleport_18/package.nix
+++ b/pkgs/by-name/te/teleport_18/package.nix
@@ -7,11 +7,11 @@
 }:
 
 buildTeleport {
-  version = "18.7.2";
-  hash = "sha256-1ANYBYNhTzSA3zhgUgKks73piHdw+4iXGFmGUWHTYpE=";
-  vendorHash = "sha256-0HxDrsWWRjuaVGtbX7xwCMsj2dYRJr3wmpf8qInlyBE=";
-  pnpmHash = "sha256-XJ2SLCMoFFeoBQ3YKIlq4APNOhSS8ipTNQufQ1nkYqs=";
-  cargoHash = "sha256-SfVoh4HnHSOz1haPPV7a/RyA6LFjLRe78Mn2fVdVyEA=";
+  version = "18.7.6";
+  hash = "sha256-p7qwsUr6n6OAl/b20SgropAubfPfwBiVTvbReb2HpO8=";
+  vendorHash = "sha256-/ZY0J0yB/8qMG6vEIta7Nf2Uv3xTZ/WPoMz+Dj5hwZA=";
+  pnpmHash = "sha256-uRsS5m0Q4fAFvJ3Qp6xcEAB8QFriLXbeGtD0o0n46RE=";
+  cargoHash = "sha256-KkFwMSBXsRmDuaPU1n6FPq2P5UQiQnb7+HEDOhhmjd0=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;
   buildGoModule = buildGo125Module;
diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index 8c521dc1283f..79e01553cf1c 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -20,16 +20,16 @@ let
   television = rustPlatform.buildRustPackage (finalAttrs: {
     pname = "television";
 
-    version = "0.15.5";
+    version = "0.15.6";
 
     src = fetchFromGitHub {
       owner = "alexpasmantier";
       repo = "television";
       tag = finalAttrs.version;
-      hash = "sha256-p0FRLc55Ly6pkQfse1kNGpJhoXjMZIYVbNzDfjWW85Q=";
+      hash = "sha256-0oWgVfybsSLHDeAqTQP2ijJ/84XdcdqD0eqxIv6jk9o=";
     };
 
-    cargoHash = "sha256-4MK1GVA2aRrNW47KRZoDEhjvyMIp3Yvbuim8rzivh0Q=";
+    cargoHash = "sha256-GoFDGNZYVD3/qGKs1LpkhMLDApAqQUds64+ibWy6juQ=";
 
     strictDeps = true;
     nativeBuildInputs = [
diff --git a/pkgs/by-name/te/tempo/package.nix b/pkgs/by-name/te/tempo/package.nix
index 25cf8cc431e8..4f8005cb77eb 100644
--- a/pkgs/by-name/te/tempo/package.nix
+++ b/pkgs/by-name/te/tempo/package.nix
@@ -7,14 +7,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "tempo";
-  version = "2.10.4";
+  version = "2.10.5";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "tempo";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-0RW77pa6e8+kg7T5z2VLTd0bnJKpf+io7FaHWWQDpcQ=";
+    hash = "sha256-1eacaqyKyHF/uS0Ja7oq+YKn/3K2QpDmd6jysGVBOjg=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix
index 83e94f625c6d..bebf509a1f60 100644
--- a/pkgs/by-name/te/tenv/package.nix
+++ b/pkgs/by-name/te/tenv/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tenv";
-  version = "4.10.1";
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Z28ZPRLFV14/4BWwCp7AU70T226nE4z2dUC29jyZYMo=";
+    hash = "sha256-Ph44Iy/yUdtSi3zkCeDZyWeSa+0l6nr34Co1JupD2eY=";
   };
 
-  vendorHash = "sha256-hodj4wBHjIGOJJlEClRIb1RavkNniEqFDvyS3Z7Abf0=";
+  vendorHash = "sha256-CBAjiUMnyA7yq08Z1fOSOAeSy/8uSCra6l63C8fn6tU=";
 
   excludedPackages = [ "tools" ];
 
@@ -53,7 +53,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://tofuutils.github.io/tenv";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
-      rmgpinto
       nmishin
       kvendingoldo
     ];
diff --git a/pkgs/by-name/te/terminalmap/package.nix b/pkgs/by-name/te/terminalmap/package.nix
new file mode 100644
index 000000000000..e1b8ed3591eb
--- /dev/null
+++ b/pkgs/by-name/te/terminalmap/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  fetchFromGitHub,
+  openssl,
+  pkg-config,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "terminalmap";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "psmux";
+    repo = "TerminalMap";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6L3K5meR5pR8/U7QbW+qMaO2m+GNVB5Gny5gFCGE+hE=";
+  };
+
+  cargoHash = "sha256-VNvSjxCRO93beSY5DD1Vi/Wz87uYlkyyNeYVf8q860U=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Tool to render real world maps in your terminal";
+    homepage = "https://github.com/psmux/TerminalMap";
+    changelog = "https://github.com/psmux/TerminalMap/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "terminalmap";
+  };
+})
diff --git a/pkgs/by-name/te/termshark/package.nix b/pkgs/by-name/te/termshark/package.nix
index 5e0d01c89590..13cf3777a886 100644
--- a/pkgs/by-name/te/termshark/package.nix
+++ b/pkgs/by-name/te/termshark/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
   doCheck = false;
 
   postFixup = ''
-    wrapProgram $out/bin/termshark --prefix PATH : ${lib.makeBinPath [ wireshark-cli ]}
+    wrapProgram $out/bin/termshark --suffix PATH : ${lib.makeBinPath [ wireshark-cli ]}
   '';
 
   ldflags = [
diff --git a/pkgs/by-name/te/terraform-docs/package.nix b/pkgs/by-name/te/terraform-docs/package.nix
index 3981c50250bb..678e9b4ae1bf 100644
--- a/pkgs/by-name/te/terraform-docs/package.nix
+++ b/pkgs/by-name/te/terraform-docs/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "terraform-docs";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "terraform-docs";
     repo = "terraform-docs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vucMB0S8fYVTCqX+H29XdJTG9uQOMJii8aLAhiIGilg=";
+    hash = "sha256-yroGYLZX1MnCTVmDiTbWDNnwLcmTOT/jYECmFy/ZmRk=";
   };
 
-  vendorHash = "sha256-jk5NjGxFK8iSOK1RoqeIqFC52BLRDi2vhmYJwm94IUY=";
+  vendorHash = "sha256-k4xypyNk80EXH823oItjc45kkupjTSXHybnMrKEgFvs=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix
index f83843677771..bc23b234e95f 100644
--- a/pkgs/by-name/te/terraform-mcp-server/package.nix
+++ b/pkgs/by-name/te/terraform-mcp-server/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "terraform-mcp-server";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "terraform-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pYco93oARCqgUk99X3oxBcuNKStw0JeyVQOoEt6PYn8=";
+    hash = "sha256-4NUSMNLWn5Pmwq//M0yHn7qw9oUI4Q3MDXeQ8xBLLSI=";
   };
 
-  vendorHash = "sha256-fJ3G/kqJlnoBdBVgnl1MzYLrNhucNocWT3rHgrTpfQU=";
+  vendorHash = "sha256-FuAt2epg4wH7oNa0nvQMWZZwOL1YtpSVdEBxkeY2Heg=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"
diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix
index 697ef200fefd..00da0911e7c0 100644
--- a/pkgs/by-name/te/terraform-plugin-docs/package.nix
+++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "terraform-plugin-docs";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "terraform-plugin-docs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wN85uTZgHasP4EsG/tNkt28tnLRFfosN6N89iwcAX80=";
+    hash = "sha256-QgN2gcGu9Laq4gQkYBvbE7gadiwzAyERLaKVLI+XiHQ=";
   };
 
-  vendorHash = "sha256-ZL61b2LAE+GFRtfUBIAoF7O65s7FeQw7cX4Aw2Cfd+k=";
+  vendorHash = "sha256-+D3JwUpLJ6gZAkTFO0fQAFpl0OCp36HMbWES/+lK+9g=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index 4ecab22c5a35..fb9e36267f19 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "terragrunt";
-  version = "1.0.1";
+  version = "1.0.3";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "terragrunt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+IAf5g7jMfY6IAyQvOeALOOL4DuxdvxsZR+UAcxiXA4=";
+    hash = "sha256-lq1SDXcmZsAxpFq7mAZo2dx72/qZS2PFx+NV1MsgyIk=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     make generate-mocks
   '';
 
-  vendorHash = "sha256-VpFJexddHfPm0UY2xFOGdPmkEALZD4FwpbnII+QBHs8=";
+  vendorHash = "sha256-xeTeCPBUooWdGoRhAz2GOdTWnLvpbUM5UwzNRr56FcA=";
 
   excludedPackages = [ "test/flake" ];
 
diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix
index 9479653c736f..6f2218c1e56a 100644
--- a/pkgs/by-name/te/tev/package.nix
+++ b/pkgs/by-name/te/tev/package.nix
@@ -24,14 +24,14 @@
 
 stdenv.mkDerivation rec {
   pname = "tev";
-  version = "2.10.0";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "Tom94";
     repo = "tev";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-o8ejMsaiplnTLiWtjaJnV9z2ZNkiOWy3DLU+x49MJrg=";
+    hash = "sha256-o5Yrlt39RGKjtfqMfq3w/JTPORuKbxTIX5uuF4zmGXk=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux (
diff --git a/pkgs/by-name/te/texmaker/package.nix b/pkgs/by-name/te/texmaker/package.nix
index 48dcf789d60e..4df5ba4a9a23 100644
--- a/pkgs/by-name/te/texmaker/package.nix
+++ b/pkgs/by-name/te/texmaker/package.nix
@@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       cfouche
-      markuskowa
     ];
     mainProgram = "texmaker";
   };
diff --git a/pkgs/by-name/te/textcompare/package.nix b/pkgs/by-name/te/textcompare/package.nix
index d34d1547bd1a..1aeb7b1fcd5c 100644
--- a/pkgs/by-name/te/textcompare/package.nix
+++ b/pkgs/by-name/te/textcompare/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "textcompare";
-  version = "0.1.10";
+  version = "0.1.11";
 
   src = fetchFromGitHub {
     owner = "josephmawa";
     repo = "TextCompare";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xcrw2bDRZbphYQUnCbjicYyg+9RfDlIQx8Jr+KRLAh0=";
+    hash = "sha256-aTRhe2tgP9IIlduaaAffXqRpDgSG08XosHnTxtpmSvU=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/te/textlint-rule-stop-words/package.nix b/pkgs/by-name/te/textlint-rule-stop-words/package.nix
index 1b61f6c97ef4..8e2d3e8b3090 100644
--- a/pkgs/by-name/te/textlint-rule-stop-words/package.nix
+++ b/pkgs/by-name/te/textlint-rule-stop-words/package.nix
@@ -6,20 +6,18 @@
   textlint-rule-stop-words,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "textlint-rule-stop-words";
-  version = "5.0.0";
+  version = "5.2.0";
 
   src = fetchFromGitHub {
     owner = "sapegin";
     repo = "textlint-rule-stop-words";
-    tag = "v${version}";
-    hash = "sha256-e9jTbDULOs0DwtT9UZp7k5+RR5Ab/x/sizIvs1MrmZs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-QN3IptBxX/GTaySWQt43k6UDCKiG4Lp8MowHZ9EPRVQ=";
   };
 
-  npmDepsHash = "sha256-t9PPHFIiY4vw0ocw6nMuaeYuYWxbc1Pzo0R6bqIsHeI=";
-
-  dontNpmBuild = true;
+  npmDepsHash = "sha256-UEiSMHZ8tvq/CoRA/wuV7bEZ6Njj3+cjoz139JH46Ks=";
 
   passthru.tests = textlint.testPackages {
     rule = textlint-rule-stop-words;
@@ -29,8 +27,8 @@ buildNpmPackage rec {
   meta = {
     description = "Textlint rule to find filler words, buzzwords and clichés";
     homepage = "https://github.com/sapegin/textlint-rule-stop-words";
-    changelog = "https://github.com/sapegin/textlint-rule-stop-words/releases/tag/v${version}";
+    changelog = "https://github.com/sapegin/textlint-rule-stop-words/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
   };
-}
+})
diff --git a/pkgs/by-name/te/textlint-rule-terminology/package.nix b/pkgs/by-name/te/textlint-rule-terminology/package.nix
index 824f7b962e4e..f2aa89bdd3bc 100644
--- a/pkgs/by-name/te/textlint-rule-terminology/package.nix
+++ b/pkgs/by-name/te/textlint-rule-terminology/package.nix
@@ -6,20 +6,18 @@
   textlint-rule-terminology,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "textlint-rule-terminology";
-  version = "5.0.0";
+  version = "5.2.16";
 
   src = fetchFromGitHub {
     owner = "sapegin";
     repo = "textlint-rule-terminology";
-    tag = "v${version}";
-    hash = "sha256-/NuKZSugizP4b2LFNqPrTvoXNE4D1sytU2B7T40ZASQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XtyPOK2nrtlUQO6cx+ozVj27jvezCAKQ/+E0UDriCQw=";
   };
 
-  npmDepsHash = "sha256-FQr7E6ZSJxj/ide+3JJwc27x15L1bAIAlPnMl8hdQ8w=";
-
-  dontNpmBuild = true;
+  npmDepsHash = "sha256-ZUM+zNl9kgEu0KHIVmnLDZ+1PJPE2e2wP6Hofe/9zPQ=";
 
   passthru.tests = textlint.testPackages {
     rule = textlint-rule-terminology;
@@ -29,8 +27,8 @@ buildNpmPackage rec {
   meta = {
     description = "Textlint rule to check correct terms spelling";
     homepage = "https://github.com/sapegin/textlint-rule-terminology";
-    changelog = "https://github.com/sapegin/textlint-rule-terminology/releases/tag/v${version}";
+    changelog = "https://github.com/sapegin/textlint-rule-terminology/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
   };
-}
+})
diff --git a/pkgs/by-name/te/textlint/package.nix b/pkgs/by-name/te/textlint/package.nix
index 279c11080103..ddb43b9e6b20 100644
--- a/pkgs/by-name/te/textlint/package.nix
+++ b/pkgs/by-name/te/textlint/package.nix
@@ -58,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-TyKtH4HjCDTydVd/poG05Yh5nRSfcrSPzFLEE3Oq2uo=";
+    fetcherVersion = 3;
+    hash = "sha256-TYMhAcmfWHbj/0yLNYiJXWd1GiYb+zqBLj2/83cGbzg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tf/tf-summarize/package.nix b/pkgs/by-name/tf/tf-summarize/package.nix
index f286ee7c2f31..66ba7c11c794 100644
--- a/pkgs/by-name/tf/tf-summarize/package.nix
+++ b/pkgs/by-name/tf/tf-summarize/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "tf-summarize";
-  version = "0.3.15";
+  version = "0.3.20";
 
   src = fetchFromGitHub {
     owner = "dineshba";
     repo = "tf-summarize";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-m0XQkxcNW0QTYd3tPz9v13dsiI/jUV0eJW0Oo2vKKtk=";
+    hash = "sha256-+u1akn3cEWoRza8IyJLh5GFJAxd2VVnusVKUFtcr0MY=";
   };
 
   vendorHash = "sha256-ncXJCOmpf6cuZd7JouAlyae/+pbjmlByrT3Z32EZEhc=";
diff --git a/pkgs/by-name/tf/tf/package.nix b/pkgs/by-name/tf/tf/package.nix
index 9f8aaca38af6..d028675ecd6d 100644
--- a/pkgs/by-name/tf/tf/package.nix
+++ b/pkgs/by-name/tf/tf/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tf";
-  version = "2.11.2";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "dex4er";
     repo = "tf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JuGAUMOzAaiVjJf0R8I9PMc+g2m3SppQ+mdow7Qrvjc=";
+    hash = "sha256-a/IWfiBZkRLgJWiEGzyWOpyZfI1EQkIsYaiNuRwH6hE=";
   };
 
-  vendorHash = "sha256-tI/Fk3jDaEdCnDc4VTLpJnVlsaSW4i00KfftEMIiWog=";
+  vendorHash = "sha256-h1ApWUK62l4O9Xr6TyXM++uzYqWkxlzvgZOwkWMYke0=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/tf/tfenv/package.nix b/pkgs/by-name/tf/tfenv/package.nix
index fee5db080b1a..00600179edd9 100644
--- a/pkgs/by-name/tf/tfenv/package.nix
+++ b/pkgs/by-name/tf/tfenv/package.nix
@@ -16,13 +16,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "tfenv";
-  version = "3.0.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "tfutils";
     repo = "tfenv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2Fpaj/UQDE7PNFX9GNr4tygvKmm/X0yWVVerJ+Y6eks=";
+    hash = "sha256-bwY5QEXugogNrStT859lNOkPoQ+n3BQZGexErxl5nco=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -33,22 +33,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin $out/lib $out/libexec $out/share
+    mkdir -p $out/bin $out/share/tfenv $out/share/doc/tfenv
 
-    cp -r lib/* $out/lib/
-    cp -r libexec/* $out/libexec/
-    cp -r share/* $out/share/
+    cp -r bin lib libexec share CHANGELOG.md $out/share/tfenv/
 
-    install -m0644 CHANGELOG.md $out/CHANGELOG.md
-
-    install -m0755 bin/tfenv $out/bin/tfenv
-    install -m0755 bin/terraform $out/bin/terraform
+    ln -s $out/share/tfenv/CHANGELOG.md $out/share/doc/tfenv/CHANGELOG.md
 
     runHook postInstall
   '';
 
   postFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
+    for f in $out/share/tfenv/bin/* $out/share/tfenv/libexec/*; do
       [ -f "$f" ] || continue
       wrapProgram "$f" \
         --prefix PATH : "${
@@ -62,6 +57,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           ]
         }"
     done
+
+    ln -s $out/share/tfenv/bin/tfenv $out/bin/tfenv
+    ln -s $out/share/tfenv/bin/terraform $out/bin/terraform
   '';
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index 082925827e24..453b062ee7e4 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "tfswitch";
-  version = "1.16.0";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "terraform-switcher";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-TpE0HX/2fGv17o1mwkyuWndclbydUBC6EKy6uFC5VdM=";
+    sha256 = "sha256-mwseK++lsiN2oPkLnXJm4M5sHybzPI3fCPtn1Ft+dkE=";
   };
 
-  vendorHash = "sha256-NxPqXpXCSHqgUJSC4/2R/ImqwNX9e+qNUU6g9n2SWBo=";
+  vendorHash = "sha256-jR8zutVetlZ3WBSPxAg2ZdppqDf9+E/yuvsTeHHHtfs=";
 
   # Disable tests since it requires network access and relies on the
   # presence of release.hashicorp.com
diff --git a/pkgs/by-name/tg/tgeraser/package.nix b/pkgs/by-name/tg/tgeraser/package.nix
index a44f8806dd07..b73610efb6ba 100644
--- a/pkgs/by-name/tg/tgeraser/package.nix
+++ b/pkgs/by-name/tg/tgeraser/package.nix
@@ -6,14 +6,14 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "tgeraser";
-  version = "1.5.3";
+  version = "1.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "en9inerd";
     repo = "tgeraser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PpqkjXI4bH7paLIRQihAEXByZJPqbkTm52280GLCF/Y=";
+    hash = "sha256-NvRS+No4RSnKh8RQfn+vGUVHnh7lqnSB8x8zFF4UrHY=";
   };
 
   build-system = [ python3Packages.setuptools ];
diff --git a/pkgs/by-name/th/thedesk/package.nix b/pkgs/by-name/th/thedesk/package.nix
index 8700ea4ed286..0a0a25024fe0 100644
--- a/pkgs/by-name/th/thedesk/package.nix
+++ b/pkgs/by-name/th/thedesk/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "thedesk";
-  version = "25.2.2";
+  version = "25.3.1";
 
   src = fetchurl {
     url = "https://github.com/cutls/thedesk-next/releases/download/v${finalAttrs.version}/thedesk-next_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-9Xd0YHkFHPVY6BHy0V1X7p27m2iJFVHmSickzMJeOXs=";
+    hash = "sha256-DNZVHSd9dG4h6lv0PoUUaBaA/ijJJtX8d9Qy5iPdLoc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/th/thin-provisioning-tools/package.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
index 629bf3f4eeb9..101d7bbb6b86 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/package.nix
+++ b/pkgs/by-name/th/thin-provisioning-tools/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "thin-provisioning-tools";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "jthornber";
     repo = "thin-provisioning-tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hOwW2zda/KdA22A+94A5r2LIezQTZ71eewhkc72u5kI=";
+    hash = "sha256-hRGelBHFbyWHwV3fRecGXIEhoDzVQ+Rdj/VHGxcDH1k=";
   };
 
   strictDeps = true;
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     udev
   ];
 
-  cargoHash = "sha256-f417GApMA1R7nX75Zkfv28aZskbpTkUHWePX30X22FU=";
+  cargoHash = "sha256-y3uvPwLps8edzO9GtJ1CpB55kieclk06PjOYsYs64go=";
 
   passthru.tests = {
     inherit (nixosTests.lvm2) lvm-thinpool-linux-latest;
diff --git a/pkgs/by-name/th/thunderbird-mcp/package.nix b/pkgs/by-name/th/thunderbird-mcp/package.nix
index 538f806dc5d2..0a041783ea39 100644
--- a/pkgs/by-name/th/thunderbird-mcp/package.nix
+++ b/pkgs/by-name/th/thunderbird-mcp/package.nix
@@ -2,17 +2,18 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "thunderbird-mcp";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "TKasperczyk";
     repo = "thunderbird-mcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+m54jF39SoViHxDI18ewtVjeVUdRximJ6Ozcv1HVdiU=";
+    hash = "sha256-3o1NskuMc4vQzjaUYgoFL7JZ46Enr6qdPcnePjtul2s=";
   };
 
   postPatch = ''
@@ -25,6 +26,8 @@ buildNpmPackage (finalAttrs: {
 
   npmDepsHash = "sha256-LbEnmABmAoTCTPNNbocl+n2TtFC3FOFwwTnyATxvM3k=";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "MCP server for Thunderbird - enables AI assistants to access email, contacts, and calendars";
     homepage = "https://github.com/TKasperczyk/thunderbird-mcp";
diff --git a/pkgs/by-name/th/thunderkittens/package.nix b/pkgs/by-name/th/thunderkittens/package.nix
index 2edaaf04dd30..621bcce953c4 100644
--- a/pkgs/by-name/th/thunderkittens/package.nix
+++ b/pkgs/by-name/th/thunderkittens/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation {
   pname = "thunderkittens";
-  version = "0-unstable-2026-04-07";
+  version = "0-unstable-2026-04-25";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "HazyResearch";
     repo = "ThunderKittens";
-    rev = "0a3ce9a949fb520ba10cda09cb5ffad7f6a1cc0a";
-    hash = "sha256-Wk3oafjEkTddn/880dHAg8S7EUDuEbXYnW0dmPTC54g=";
+    rev = "0b55588d2769dde0c7a9a606ffc015b0ca7a9551";
+    hash = "sha256-dapEzAxkMK6nO3/1LLgYg1yP3T/Xan+C6A5ZzIOQ0+0=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/ti/ticker/package.nix b/pkgs/by-name/ti/ticker/package.nix
index 6842aef12b43..3cd184d25c83 100644
--- a/pkgs/by-name/ti/ticker/package.nix
+++ b/pkgs/by-name/ti/ticker/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ticker";
-  version = "5.2.0";
+  version = "5.2.1";
 
   src = fetchFromGitHub {
     owner = "achannarasappa";
     repo = "ticker";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GH+2as3aK462cTguGekbB4HchVzC1HdBsXwJHwAh47Q=";
+    hash = "sha256-1q+TMCYPp9AicWJZzWrrr5ukj6AcckNkp2yP4NyOm5g=";
   };
 
-  vendorHash = "sha256-EKc9QRDSOD4WetCXORjMUlaFqh0+B3Aa3m5SR1WiKN4=";
+  vendorHash = "sha256-kEyZMFW1ex45yC4G9qZUOeXVdQKjcExG7hKvN8lxrDI=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ti/tidb/package.nix b/pkgs/by-name/ti/tidb/package.nix
index 04e4d1756a2f..db4bd01300e2 100644
--- a/pkgs/by-name/ti/tidb/package.nix
+++ b/pkgs/by-name/ti/tidb/package.nix
@@ -6,16 +6,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "tidb";
-  version = "8.5.5";
+  version = "8.5.6";
 
   src = fetchFromGitHub {
     owner = "pingcap";
     repo = "tidb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wrCdclS9qpc0mq5QZ6u5/APZyOTWvCJNCPCzM385MBM=";
+    hash = "sha256-sQ5hialileLC/ZpXoy5zfSnLZAL1I4aiiQf+y5LPIK8=";
   };
 
-  vendorHash = "sha256-7g8U0gbG46AC4h1SyOTKKuNc5eVRqJsimzshj4O5FYw=";
+  vendorHash = "sha256-YJ47tC1pp+hDMIiKyzROypk+zX76r+c5O9qD2OkVmgw=";
 
   ldflags = [
     "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${finalAttrs.version}"
diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index d47bb774b67e..c31b85b5a6b2 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-PzlZt+Fou0I4360thQJ3gihGQkH40DrlLZh+i7Uds0o=";
-    "x86_64-linux" = "sha256-7bjM+3sN/D9reEhZ2iwWMghyjp0/8rXVauzY2OdW9rI=";
-    "aarch64-linux" = "sha256-P+7zui/lpc7ilrpNsyB9v+K/WaeuG8jUsbQEH6xEmpk=";
+    "universal-macos" = "sha256-1BmWy1AJ0ZA+eu458LuiimT4jsl9YAyvefmDHR5D7o4=";
+    "x86_64-linux" = "sha256-GJmsca+mTIRe1borkK8sozVgRK56aDEpp7tu/3fWjmM=";
+    "aarch64-linux" = "sha256-SM8tApCGyBoOZ6CTCnmc6aeAjuIj8yA6Mm94dNAfp4Y=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
diff --git a/pkgs/by-name/ti/tilem/gcc15-fix.patch b/pkgs/by-name/ti/tilem/gcc15-fix.patch
new file mode 100644
index 000000000000..6a76170739cf
--- /dev/null
+++ b/pkgs/by-name/ti/tilem/gcc15-fix.patch
@@ -0,0 +1,12 @@
+Fix call to zero-argument tilem_macro_new(), which GCC 15 rejects because the declaration takes no parameters.
+--- a/gui/macro.c
++++ b/gui/macro.c
+@@ -70,7 +70,7 @@
+ 	tilem_macro_finalize(emu->macro);
+ 
+ 	/* Then allocate a new one */	
+-	emu->macro = tilem_macro_new(emu);
++	emu->macro = tilem_macro_new();
+ }
+ 
+ /* Add an action to the macro. The action could be :
diff --git a/pkgs/by-name/ti/tilem/package.nix b/pkgs/by-name/ti/tilem/package.nix
index eed7018514df..5bc6a6468d19 100644
--- a/pkgs/by-name/ti/tilem/package.nix
+++ b/pkgs/by-name/ti/tilem/package.nix
@@ -27,7 +27,10 @@ stdenv.mkDerivation (finalAttrs: {
     libticables2
     libticalcs2
   ];
-  patches = [ ./gcc14-fix.patch ];
+  patches = [
+    ./gcc14-fix.patch
+    ./gcc15-fix.patch
+  ];
   env.NIX_CFLAGS_COMPILE = toString [ "-lm" ];
   meta = {
     homepage = "http://lpg.ticalc.org/prj_tilem/";
diff --git a/pkgs/by-name/ti/timr-tui/package.nix b/pkgs/by-name/ti/timr-tui/package.nix
index ecfaee84837a..de7e88f5bee3 100644
--- a/pkgs/by-name/ti/timr-tui/package.nix
+++ b/pkgs/by-name/ti/timr-tui/package.nix
@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "timr-tui";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "sectore";
     repo = "timr-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kxXAH8IUe1LOoS8ch9OL6sS0oeviSN6H7hBJ6ZY+oQw=";
+    hash = "sha256-9HaKBrW0MkNzDErEIINztLyGpN4mkGF5RpmXohgbK6A=";
   };
 
-  cargoHash = "sha256-zNbXxT0Z1TtqitD4P7m8TgEvg8C0AOslrVNKD/Nd9cQ=";
+  cargoHash = "sha256-J6Zi8oEAsbxMQe+oCk9T6Ic1hPdNXI9iFmn4Z0d0lFE=";
 
   # Enable upstream "sound" feature when requested
   buildFeatures = lib.optionals enableSound [ "sound" ];
diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix
index 1da98e685f21..b117887c87ea 100644
--- a/pkgs/by-name/ti/tinfoil-cli/package.nix
+++ b/pkgs/by-name/ti/tinfoil-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tinfoil-cli";
-  version = "0.12.3";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "tinfoilsh";
     repo = "tinfoil-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ykaJRuMpcXKBBDFC5jft7BIcSREz3xYxxmNgVHWcacI=";
+    hash = "sha256-HfKcuonVpUzE2aTR1GX4jrlhrNPBotbZuEjRvJs0Xkc=";
   };
 
-  vendorHash = "sha256-+CZ4Jjl+Ynn0J0cNol9djSs1AkjD8YzVgg8qoRF2tDQ=";
+  vendorHash = "sha256-b6UmayV913SVyV5+1BMZiRM7SV/Asau6xkx87DWTf9k=";
 
   # The attestation test requires internet access
   checkFlags = [ "-skip=TestAttestationVerifySEV" ];
diff --git a/pkgs/by-name/ti/tiny-rdm/package.nix b/pkgs/by-name/ti/tiny-rdm/package.nix
index 8079762886d8..f7068059afb8 100644
--- a/pkgs/by-name/ti/tiny-rdm/package.nix
+++ b/pkgs/by-name/ti/tiny-rdm/package.nix
@@ -17,13 +17,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "tiny-rdm";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchFromGitHub {
     owner = "tiny-craft";
     repo = "tiny-rdm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t/dAhcMUT7p7MTlrEm/TRdHLRA5IvK9eeSB2+cWtCoY=";
+    hash = "sha256-MyIMGgKzP6SnRzlOd4OQvMNiih7lsjfVFFckkPS2J+w=";
   };
 
   postPatch = ''
@@ -31,13 +31,13 @@ buildGoModule (finalAttrs: {
       --replace-fail "prefStore.autoCheckUpdate" "false"
   '';
 
-  vendorHash = "sha256-G1pnEMTxGM3YjHDtSosj5GB6Zhc9PZcbcrjGB1omQvg=";
+  vendorHash = "sha256-DaD/NM1ZNVt0X/CJuaGfHqeS9ySTWFd0y5bzog6Yn+E=";
 
   env = {
     CGO_ENABLED = 1;
     npmDeps = fetchNpmDeps {
       src = "${finalAttrs.src}/frontend";
-      hash = "sha256-DaRuxIRNXkafqzIJaJuttVeGXDrjjjpF2FtB1yFWPZw=";
+      hash = "sha256-DUYUk4OK5UWDanSR5hSVDYloYX4fYD41omYThzi/700=";
     };
     npmRoot = "frontend";
   };
diff --git a/pkgs/by-name/ti/tinyxxd/package.nix b/pkgs/by-name/ti/tinyxxd/package.nix
index 9035ae112dcf..c149c0f7c3b6 100644
--- a/pkgs/by-name/ti/tinyxxd/package.nix
+++ b/pkgs/by-name/ti/tinyxxd/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tinyxxd";
-  version = "1.3.11";
+  version = "1.3.15";
 
   src = fetchFromGitHub {
     repo = "tinyxxd";
     owner = "xyproto";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zM0KRQggDc45eeeZZ6nAI/5sm7NtF1XGucIJV4O1AJs=";
+    hash = "sha256-JLu3x54/kpKhvfTeWovxmV+/bEB4MqaNlFPrHnM/+ko=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/tl/tldr/package.nix b/pkgs/by-name/tl/tldr/package.nix
index 353142bc67e0..ccf9e7dcb1c7 100644
--- a/pkgs/by-name/tl/tldr/package.nix
+++ b/pkgs/by-name/tl/tldr/package.nix
@@ -41,7 +41,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd tldr \
       --bash <($out/bin/tldr --print-completion bash | sed -E "s#\"/nix/store/[^\"]+/bin/python[^\"]*\" -m tldr#\"$out/bin/tldr\"#g") \
-      --zsh <($out/bin/tldr --print-completion zsh | sed -E "s#\"/nix/store/[^\"]+/bin/python[^\"]*\" -m tldr#\"$out/bin/tldr\"#g") \
+      --zsh <($out/bin/tldr --print-completion zsh | sed -E "s#\"/nix/store/[^\"]+/bin/python[^\"]*\" -m tldr#\"$out/bin/tldr\"#g")
   '';
 
   meta = {
diff --git a/pkgs/by-name/tl/tlsclient/package.nix b/pkgs/by-name/tl/tlsclient/package.nix
index b3e57569868d..65b51608f6ee 100644
--- a/pkgs/by-name/tl/tlsclient/package.nix
+++ b/pkgs/by-name/tl/tlsclient/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tlsclient";
-  version = "1.6.6";
+  version = "1.7";
 
   src = fetchFromSourcehut {
     owner = "~moody";
     repo = "tlsclient";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nUvOmEwdMKuPM9KaMGxmW0Lvo3968wjDc95pLB17YnM=";
+    hash = "sha256-oClIbswConBrmU0hpIVcS2L0DVF2/xdnbAv3X0RvNZ0=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix
index d3907e4b164e..b5efd8d2c9b0 100644
--- a/pkgs/by-name/tm/tmux/package.nix
+++ b/pkgs/by-name/tm/tmux/package.nix
@@ -13,7 +13,7 @@
   # broken on i686-linux https://github.com/tmux/tmux/issues/4597
   withUtf8proc ? !(stdenv.hostPlatform.is32bit),
   utf8proc, # gets Unicode updates faster than glibc
-  withUtempter ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isMusl,
+  withUtempter ? stdenv.hostPlatform.isLinux,
   libutempter,
   withSixel ? true,
   versionCheckHook,
diff --git a/pkgs/by-name/to/todds/package.nix b/pkgs/by-name/to/todds/package.nix
index edf79a484893..daff83ce6dcb 100644
--- a/pkgs/by-name/to/todds/package.nix
+++ b/pkgs/by-name/to/todds/package.nix
@@ -14,9 +14,9 @@
   # buildInputs
   boost,
   fmt,
-  hyperscan,
   onetbb,
   opencv,
+  vectorscan,
 
   # tests
   versionCheckHook,
@@ -53,9 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     boost
     fmt
-    hyperscan
     onetbb
     opencv
+    vectorscan
   ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_cudart
diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix
index 3abcd2678439..0685938e884d 100644
--- a/pkgs/by-name/to/todoman/package.nix
+++ b/pkgs/by-name/to/todoman/package.nix
@@ -10,14 +10,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "todoman";
-  version = "4.6.0";
+  version = "4.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pimutils";
     repo = "todoman";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WMIXPPtW1227iDXLqG/JIYdNp5bxHxTlqpFtcIvZ8Aw=";
+    hash = "sha256-dlTV9x8ofxffM55fIJxxavagaTWx+UseK8ECBExxf78=";
   };
 
   nativeBuildInputs = [
@@ -74,9 +74,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   '';
 
   postInstall = ''
-    installShellCompletion --bash contrib/completion/bash/_todo
-    substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${lib.getExe jq} "
-    installShellCompletion --zsh contrib/completion/zsh/_todo
+    substituteInPlace contrib/completion/zsh/_todo --replace-fail "jq " "${lib.getExe jq} "
+    installShellCompletion --bash contrib/completion/bash/_todo \
+                           --zsh contrib/completion/zsh/_todo \
+                           --fish contrib/completion/fish/todo.fish
   '';
 
   disabledTests = [
diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index d93ba13fc77b..3d205e921ce3 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -9,19 +9,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tombi";
-  version = "0.9.16";
+  version = "0.9.24";
 
   src = fetchFromGitHub {
     owner = "tombi-toml";
     repo = "tombi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cnhxvzX456kQdywpl2VCWIAvqnZGz1WwNxPJQEMyouo=";
+    hash = "sha256-ucyBIq/47CoAZRRX9KmPfS6fTW1fdCLkC/M5mT2pNeA=";
   };
 
   # Tests relies on the presence of network
   doCheck = false;
   cargoBuildFlags = [ "--package tombi-cli" ];
-  cargoHash = "sha256-lXN/tXYUJgQhSKyEgHswf91cUR9eH4T3/92gjI3yR1Y=";
+  cargoHash = "sha256-kQB0vRj07lcX/Rzt+KTenD4NoK0BI0yc6D3V/ewT3Bk=";
 
   postPatch = ''
     substituteInPlace Cargo.toml \
diff --git a/pkgs/by-name/to/tomlc17/package.nix b/pkgs/by-name/to/tomlc17/package.nix
index 28243065b5a6..58ab13df420c 100644
--- a/pkgs/by-name/to/tomlc17/package.nix
+++ b/pkgs/by-name/to/tomlc17/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tomlc17";
-  version = "260323";
+  version = "260414";
 
   src = fetchFromGitHub {
     owner = "cktan";
     repo = "tomlc17";
     tag = "R${finalAttrs.version}";
-    hash = "sha256-pwUJkZRiVqTZqbjTcB/Uw5xY8vuvprWuiQVC/kzFsNM=";
+    hash = "sha256-NtytkrRdIGMIYMSfnNkWHdeu78+ac7EL361OZoTK9BI=";
   };
 
   doCheck = false; # tries to download toml-test suite
diff --git a/pkgs/by-name/to/toot/package.nix b/pkgs/by-name/to/toot/package.nix
index 344f3032cbd8..ff28fab52d3b 100644
--- a/pkgs/by-name/to/toot/package.nix
+++ b/pkgs/by-name/to/toot/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "toot";
-  version = "0.51.1";
+  version = "0.52.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ihabunek";
     repo = "toot";
     tag = finalAttrs.version;
-    hash = "sha256-PZMh11MeJaKipt3E1reZQdL8+qz7gY/8bKleRPjshzI=";
+    hash = "sha256-lsX/34bdnAFWn/MNrQjrPIgkbgFusLvuK54Wc6N8bJU=";
   };
 
   nativeCheckInputs = with python3Packages; [ pytest ];
@@ -34,6 +34,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     click
     pillow
     term-image
+    pysocks
   ];
 
   checkPhase = ''
diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index db1378941d7c..14e68c0b26a1 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "topgrade";
-  version = "17.3.0";
+  version = "17.4.0";
 
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iMIXmGim/wolgUspVwnIy3hqv3RsxB3zL2t83SOe6uw=";
+    hash = "sha256-3nCt3Kmnd+ogzIkvb9pSwm99hBj/Ab0AMvg+6lUx7mc=";
   };
 
-  cargoHash = "sha256-sgLbYuLNiAGMIBGrciKxYvvNepGIb0/z9/rRSJkYUdU=";
+  cargoHash = "sha256-VkAzAi3Ok2GZlpF4AVMzuYYU86WQeB9k/KaI1YvSgWw=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 0767c46f578c..2541b229cae6 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -102,7 +102,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg_7 ]
   );
 
-  version = "15.0.9";
+  version = "15.0.11";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -112,7 +112,7 @@ let
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-s7Ubr0OjXpBg7nRuBPhnFwHY86bnZRPUnlsNBI/2Ng0=";
+      hash = "sha256-+1ZpJcVkqqP2WE3kyAJ7Ip3CmM2JIpUos1wgvLjND24=";
     };
 
     i686-linux = fetchurl {
@@ -122,7 +122,7 @@ let
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
       ];
-      hash = "sha256-FebSPdfJjxoW0iUBspt5AMugM5SWK7Wm7pP5zGU+icU=";
+      hash = "sha256-dZeTAkmvI5+mu7u9DrUj/JTvLHE4hiNVqd5AyVbZptg=";
     };
   };
 
@@ -347,13 +347,14 @@ stdenv.mkDerivation rec {
     description = "Privacy-focused browser routing traffic through the Tor network";
     mainProgram = "tor-browser";
     homepage = "https://www.torproject.org/";
-    changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
+    changelog = "https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/maint-${lib.versions.majorMinor version}/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt";
     platforms = lib.attrNames sources;
     maintainers = with lib.maintainers; [
       c4patino
       felschr
       hax404
       panicgh
+      whispersofthedawn
     ];
     # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
     # the compound is "libre" in a strict sense (some components place certain
diff --git a/pkgs/by-name/to/touchosc/package.nix b/pkgs/by-name/to/touchosc/package.nix
index 1388e616bf40..af969a0f247a 100644
--- a/pkgs/by-name/to/touchosc/package.nix
+++ b/pkgs/by-name/to/touchosc/package.nix
@@ -46,7 +46,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "touchosc";
-  version = "1.4.7.243";
+  version = "1.4.9.248";
 
   suffix =
     {
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
     url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-WHjtjxSLphODnYynKX5oYRirBWnv0wTh5mxCrw5DL3c=";
-        armv7l-linux = "sha256-g426dUSJ5UC4k2s/a8sFLNG0q0xyvPh824jXDHN+2SM=";
-        x86_64-linux = "sha256-MD3wxGM04x7gBoHS2J1I0hGGbgDZeEUTFCaEUsM/R6E=";
+        aarch64-linux = "sha256-IKk688XFTx1rHEF03uHZ3cN60GwwIlf/FK4mJ0c/PqM=";
+        armv7l-linux = "sha256-li1BLZ6/6OJzsCIN2T3V4vEVXfa9GH6PiFkm6lUl4Ec=";
+        x86_64-linux = "sha256-NM9v+wyLNnwNw4qY6jDPB9ig/GZfzzrDshMSmi/yvCM=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/tp/tpm-trust/package.nix b/pkgs/by-name/tp/tpm-trust/package.nix
new file mode 100644
index 000000000000..eec81092994c
--- /dev/null
+++ b/pkgs/by-name/tp/tpm-trust/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  buildGo125Module,
+  fetchFromGitHub,
+  installShellFiles,
+}:
+
+buildGo125Module (finalAttrs: {
+  pname = "tpm-trust";
+  version = "0.4.1";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "loicsikidi";
+    repo = "tpm-trust";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hhcIO+Od5Hhzm9evRlBHIicj+rivFn1H647mCKMq048=";
+  };
+
+  vendorHash = "sha256-MKUZ87Ketw29cyCa/7fVcQmlsJa8shwz4gHT3mhRaco=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${finalAttrs.version}"
+    "-X main.builtBy=nix"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd tpm-trust \
+      --bash <($out/bin/tpm-trust completion bash) \
+      --zsh <($out/bin/tpm-trust completion zsh) \
+      --fish <($out/bin/tpm-trust completion fish)
+  '';
+
+  meta = {
+    description = "Validate TPM authenticity by checking its Endorsement Key certificate against manufacturer root certificates";
+    homepage = "https://github.com/loicsikidi/tpm-trust";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ thillux ];
+    mainProgram = "tpm-trust";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/by-name/tr/trace-cmd/package.nix
similarity index 96%
rename from pkgs/os-specific/linux/trace-cmd/default.nix
rename to pkgs/by-name/tr/trace-cmd/package.nix
index b197b90e5aa4..feef55ea236a 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/by-name/tr/trace-cmd/package.nix
@@ -14,12 +14,12 @@
   sourceHighlight,
   gitUpdater,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "trace-cmd";
   version = "3.4";
 
   src = fetchzip {
-    url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz";
+    url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${finalAttrs.version}.tar.gz";
     hash = "sha256-7IMInvVLIjGcHZvnSzhcne+4ieFa85ep7KMn2Oy9pF8=";
   };
 
@@ -107,4 +107,4 @@ stdenv.mkDerivation rec {
       wentasah
     ];
   };
-}
+})
diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix
index 4be7fe47c73c..fd43b88df36b 100644
--- a/pkgs/by-name/tr/trayscale/package.nix
+++ b/pkgs/by-name/tr/trayscale/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "trayscale";
-  version = "0.18.7";
+  version = "0.18.8";
 
   src = fetchFromGitHub {
     owner = "DeedleFake";
     repo = "trayscale";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t284DpU4kmfrAgOmBZTwHYsxpl6vt7FPytv8/nsNfPM=";
+    hash = "sha256-eOKTzIZ/040R6qIRBTtNXz8Me9I/PYuX9+ne4gxGKSw=";
   };
 
-  vendorHash = "sha256-+2NoNIbB4lXcZhj2pifQpdiKZXslAhv6lxiKUThqTVc=";
+  vendorHash = "sha256-NdXXnSaNhp1CikrkycvGbjFS3Ow0SOQcBiWIVYwEODU=";
 
   subPackages = [ "cmd/trayscale" ];
 
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/README.md b/pkgs/by-name/tr/tree-sitter/grammars/README.md
similarity index 96%
rename from pkgs/development/tools/parsing/tree-sitter/grammars/README.md
rename to pkgs/by-name/tr/tree-sitter/grammars/README.md
index e2b0e8750d39..c52ebea5d442 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/README.md
+++ b/pkgs/by-name/tr/tree-sitter/grammars/README.md
@@ -40,7 +40,7 @@ This will expand to an element in `pkgs.tree-sitter.grammars` at build time:
 }
 ```
 
-Each entry is passed to [buildGrammar](../build-grammar.nix), which in turn populates `pkgs.tree-sitter-grammars`.
+Each entry is passed to [buildGrammar](build-grammar.nix), which in turn populates `pkgs.tree-sitter-grammars`.
 
 Attempt to build the new grammar: `nix-build -A tree-sitter-grammars.tree-sitter-latex`.
 This will fail due to the invalid hash.
@@ -123,4 +123,3 @@ Or, to update all grammars:
 ```shell
 nix-shell maintainers/scripts/update.nix --argstr path tree-sitter-grammars --argstr keep-going true
 ```
-
diff --git a/pkgs/development/tools/parsing/tree-sitter/build-grammar.nix b/pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix
similarity index 100%
rename from pkgs/development/tools/parsing/tree-sitter/build-grammar.nix
rename to pkgs/by-name/tr/tree-sitter/grammars/build-grammar.nix
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/by-name/tr/tree-sitter/grammars/default.nix
similarity index 96%
rename from pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
rename to pkgs/by-name/tr/tree-sitter/grammars/default.nix
index 77d154c0d95a..da1c049d0d7e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/default.nix
@@ -53,7 +53,7 @@ lib.mapAttrs' (
       passthru.updateScript = nix-update-script {
         extraArgs = [
           "--override-filename"
-          "pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix"
+          "pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix"
         ]
         ++ (
           if (isUnstable attrs.version) then
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
similarity index 95%
rename from pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
rename to pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 905c0625cd70..e58fe78ffd87 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -161,10 +161,10 @@
   };
 
   blueprint = {
-    version = "0-unstable-2025-06-17";
+    version = "0-unstable-2026-04-18";
     url = "github:smrtrfszm/tree-sitter-blueprint";
-    rev = "de66f283c6c9b7c270d766c2e4cf95535650ec48";
-    hash = "sha256-zmMJZAxyKO42gIK3cWP/LuoPIo2+xr6fEDeHXknqa7M=";
+    rev = "f2b043912ffbfcf4e9e8d09709b86ab39a4b78ea";
+    hash = "sha256-tcy4FIQ/59PeSHIXX8YmbBX5lK0acKahePT2/xKzYyM=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -198,10 +198,10 @@
   };
 
   caddyfile = {
-    version = "0-unstable-2025-12-16";
+    version = "0-unstable-2026-04-06";
     url = "github:caddyserver/tree-sitter-caddyfile";
-    rev = "2b816940b5bf4f86c650aded24500cb5b682f1a1";
-    hash = "sha256-C/dTDm4X+VxtNZaqb2AHgcDZyGeBN9VMwZjSzJVEHGo=";
+    rev = "6e62b4e297c955f050a6542a8d24df2f223a90e8";
+    hash = "sha256-a/ioYTQBFueZTtzoDre7UD6h5NluZ8gQc+8yTrj2Goc=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -237,10 +237,10 @@
   };
 
   cel = {
-    version = "0-unstable-2024-02-13";
+    version = "0-unstable-2026-03-04";
     url = "github:bufbuild/tree-sitter-cel";
-    rev = "df0585025e6f50cdb07347f5009ae3f47c652890";
-    hash = "sha256-Fyq56kzu1bL44QhrF3ZnKWgsoPRh3tjTRi2CynNQGfw=";
+    rev = "fd2e8efaa07e71e46dcc1d5c4c85556a742d8c36";
+    hash = "sha256-f/Gpsp+Se3lSguz89vWDf3gGaefnwpHCp4Bzfz6y29I=";
     meta = {
       license = lib.licenses.asl20;
       maintainers = with lib.maintainers; [
@@ -410,20 +410,13 @@
   };
 
   dart = {
-    version = "0-unstable-2025-10-04";
+    version = "0-unstable-2026-03-14";
     url = "github:usernobody14/tree-sitter-dart";
-    rev = "d4d8f3e337d8be23be27ffc35a0aef972343cd54";
-    hash = "sha256-1ftYqCor1A0PsQ0AJLVqtxVRZxaXqE/NZ5yy7SizZCY=";
+    rev = "0fc19c3a57b1109802af41d2b8f60d8835c5da3a";
+    hash = "sha256-yK4XfjVPABFHf8MjoDge6bmapcybhdIF+49rlXFP+pw=";
     meta = {
       license = lib.licenses.mit;
     };
-    patches = [
-      (fetchpatch {
-        name = "Fix invalid `tree-sitter.json`";
-        url = "https://github.com/UserNobody14/tree-sitter-dart/commit/81638dbbdb76a0e88ea8c31b95ec76b9625ddb84.diff";
-        hash = "sha256-oaxuKQPN/gprO4OFWYItkj5dqd2xlq3SV6qr4YkSFjM=";
-      })
-    ];
   };
 
   dbml = {
@@ -487,7 +480,7 @@
 
   djot = {
     version = "0-unstable-2025-09-15";
-    url = "github:treeman/tree-sitter-djot";
+    url = "codeberg:treeman/tree-sitter-djot";
     rev = "74fac1f53c6d52aeac104b6874e5506be6d0cfe6";
     hash = "sha256-HfEZHNhxEbH07gDzLPdl6n2Pf//o8tbJvwE+tesJDC8=";
     meta = {
@@ -667,10 +660,10 @@
   };
 
   fga = {
-    version = "0-unstable-2025-12-17";
+    version = "0-unstable-2026-03-19";
     url = "github:matoous/tree-sitter-fga";
-    rev = "e763d12cfd8569494215f304bc2b0074c84709e9";
-    hash = "sha256-d1gvEoJosBcEiq4fxb+1LFcdSkuOWGXyG1cC44Lo19o=";
+    rev = "ce72d1c484ba133a18e966d67be66bce85695451";
+    hash = "sha256-8op8IFKh3dZY02Yiehvqz1XyeOw9qSoe0f31M4yzw1U=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -724,10 +717,10 @@
   };
 
   fsharp = {
-    version = "0.2.2-unstable-2026-03-29";
+    version = "0.3.0-unstable-2026-04-16";
     url = "github:ionide/tree-sitter-fsharp";
-    rev = "594c500ecace8618db32dd1144307897277db067";
-    hash = "sha256-e66aAsmNJWMcElqFIxSiHZgyQsq8NT7zU9y/fpbqJF4=";
+    rev = "5247c1197cb290fcaea0e0a793d32829c1396831";
+    hash = "sha256-ntcLDSt6BPF9PtASx221hwZhKl3yKKrzbEYQD/ghYxw=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -794,10 +787,10 @@
   };
 
   ghostty = {
-    version = "1.2-unstable-2026-01-02";
+    version = "1.3.0-unstable-2026-04-24";
     url = "github:bezhermoso/tree-sitter-ghostty";
-    rev = "c14d6cb4dd36ff9dd569978491aa52e4726cbe86";
-    hash = "sha256-sVPr8jR6z0G68z3ZTdlMOXWguNGbZ/5apffNefm9apU=";
+    rev = "753055073a26100e51bdf1a92f4234cd6789c1f9";
+    hash = "sha256-+zy5dqyHUOC6Li31U6/GOAfqPSLZRKfpnyjKgtFSFeM=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -820,10 +813,14 @@
   };
 
   git-rebase = {
-    version = "0-unstable-2024-07-22";
+    version = "1.0.0";
     url = "github:the-mikedavis/tree-sitter-git-rebase";
-    rev = "bff4b66b44b020d918d67e2828eada1974a966aa";
-    hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc=";
+    hash = "sha256-EV/Ecfzu3jZ5BQynRxn8NJ+lfi9i5ixs+u1e72uZBJA=";
+    postPatch = ''
+      # The funding url is empty, which will result in failing tests for the python package
+      # tree-sitter-grammars.tree-sitter.git-rebase.
+      jq 'del(.metadata.links.funding)' tree-sitter.json > tree-sitter.json.tmp && mv tree-sitter.json.tmp tree-sitter.json
+    '';
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -1028,10 +1025,10 @@
   };
 
   groovy = {
-    version = "0-unstable-2025-01-22";
+    version = "0-unstable-2026-04-11";
     url = "github:murtaza64/tree-sitter-groovy";
-    rev = "86911590a8e46d71301c66468e5620d9faa5b6af";
-    hash = "sha256-652wluH2C3pYmhthaj4eWDVLtEvvVIuu70bJNnt5em0=";
+    rev = "deb0dcf8c4544f07564060f6e9b9f6e4b0bfc27d";
+    hash = "sha256-x7PawYYtgsduh60KNnS4LgB7SvoBV9aOJ9cHNsLBBhc=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -1465,20 +1462,20 @@
   };
 
   ledger = {
-    version = "0-unstable-2025-05-04";
+    version = "0-unstable-2026-03-20";
     url = "github:cbarrete/tree-sitter-ledger";
-    rev = "96c92d4908a836bf8f661166721c98439f8afb80";
-    hash = "sha256-L2xUTItnQ/bcieasItrozjAEJLm/fsUUyMex2juCnjw=";
+    rev = "22a1ab8195c1f6e808679f803007756fe7638c6f";
+    hash = "sha256-62xgcEavI5RKi77sbEnx9f3hA4faFeUCw0/uec8Nx3k=";
     meta = {
       license = lib.licenses.mit;
     };
   };
 
   llvm = {
-    version = "0-unstable-2024-10-07";
+    version = "0-unstable-2025-08-22";
     url = "github:benwilliamgraham/tree-sitter-llvm";
-    rev = "c14cb839003348692158b845db9edda201374548";
-    hash = "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo=";
+    rev = "2914786ae6774d4c4e25a230f4afe16aa68fe1c1";
+    hash = "sha256-jBSotMFsBUcgQrWH5p8EiywG00+v9QqePcUTI6ZqAkw=";
     meta = {
       license = lib.licenses.mit;
     };
@@ -1547,10 +1544,10 @@
   };
 
   mail = {
-    version = "0-unstable-2025-04-09";
+    version = "0-unstable-2026-03-08";
     url = "github:ficcdaf/tree-sitter-mail";
-    rev = "c84126474aee00ce67c32229710a4e1e09827a08";
-    hash = "sha256-qqy7jsqsWVUlRuk+Cv+n3sEiH/SlO5/4Q+mrcftFKP4=";
+    rev = "5eddbfdbec4c893182c79047499901c196332e78";
+    hash = "sha256-ax9MlBuat3SmYJE5lkuTSula0A/RKoHljSqi9UZ2wO8=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -1643,10 +1640,10 @@
   };
 
   mojo = {
-    version = "0-unstable-2024-12-07";
+    version = "0-unstable-2025-12-25";
     url = "github:lsh/tree-sitter-mojo";
-    rev = "564d5a8489e20e5f723020ae40308888699055c0";
-    hash = "sha256-UY4gTG9HI/agpD+2syb7lUqfZpw6I6UnKzs9zE9JFwA=";
+    rev = "03966fb3f209bea86844aab3bd0f2158a5a8bb8d";
+    hash = "sha256-Ofc8Z1q0Rxb3q4iYMtnKanUdnpGetE8A8sl+Sr1t3PA=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -1753,10 +1750,10 @@
   };
 
   nu = {
-    version = "0-unstable-2025-12-13";
+    version = "0-unstable-2026-04-22";
     url = "github:nushell/tree-sitter-nu";
-    rev = "4c149627cc592560f77ead1c384e27ec85926407";
-    hash = "sha256-h02kb3VxSK/fxQENtj2yaRmAQ5I8rt5s5R8VrWOQWeo=";
+    rev = "348b787d8b0409091d85fe9d4eb007fe9f3406bb";
+    hash = "sha256-OL3fqHjimJ9VrR2UoeIdLxKKcsA1J80A9T8GSBO9KwE=";
     meta = {
       license = lib.licenses.mit;
     };
@@ -2202,10 +2199,10 @@
   };
 
   razor = {
-    version = "0-unstable-2025-02-17";
+    version = "0-unstable-2026-04-20";
     url = "github:tris203/tree-sitter-razor";
-    rev = "fe46ce5ea7d844e53d59bc96f2175d33691c61c5";
-    hash = "sha256-E4fgy588g6IP258TS2DvoILc1Aikvpfbtq20VIhBE4U=";
+    rev = "a3399c26610817c6d32c7643793caf3729cfb6d2";
+    hash = "sha256-hH3qIp5IKwOyxiQXlS2NnuTbt/ssNMEV8PaL1xDMi+g=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -2236,20 +2233,20 @@
   };
 
   rego = {
-    version = "0-unstable-2024-06-12";
+    version = "0-unstable-2026-01-14";
     url = "github:FallenAngel97/tree-sitter-rego";
-    rev = "20b5a5958c837bc9f74b231022a68a594a313f6d";
-    hash = "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI=";
+    rev = "ddd39af81fe8b0288102a7cb97959dfce723e0f3";
+    hash = "sha256-I6jZ5jsJUAdjQti/lj4d11+GRSHjbN/hoGYO7ezGKv8=";
     meta = {
       license = lib.licenses.mit;
     };
   };
 
   rescript = {
-    version = "5.0.0-unstable-2025-03-03";
+    version = "6.0.0-unstable-2026-04-26";
     url = "github:rescript-lang/tree-sitter-rescript";
-    rev = "d2df8a285fff95de56a91d2f8152aeceb66f40ef";
-    hash = "sha256-yNZrihl4BNvLu0Zqr4lSqvdZCeXU3KnCY7ZYC1U42R0=";
+    rev = "5b90cd4e4138b1231a67977303bda47eb608480a";
+    hash = "sha256-f5/z566/Ez8+jzQSXoWkEK3LJGYjWupQw+BFPDyOxsE=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -2375,10 +2372,10 @@
   };
 
   slint = {
-    version = "0-unstable-2025-12-09";
+    version = "0-unstable-2026-04-17";
     url = "github:slint-ui/tree-sitter-slint";
-    rev = "10fb0f188d7950400773c06ba6c31075866e14bf";
-    hash = "sha256-60DfIx7aQqe0/ocxbpr00eU3IPs23E8TUILcVGrBYVs=";
+    rev = "68b25244cec6eb9d7f8f790ef781c29c822d8f84";
+    hash = "sha256-ugdB7gN3zTAGLm9Jk2hjuuZWxIYxEWYXW72qLpXM+1Q=";
     meta = {
       license = lib.licenses.mit;
     };
@@ -2496,9 +2493,9 @@
   };
 
   sshclientconfig = rec {
-    version = "2026.4.16";
+    version = "2026.4.23";
     url = "github:metio/tree-sitter-ssh-client-config?ref=${version}";
-    hash = "sha256-bWZsxfLr8e2Kv96EGOwTyycLBH8DhXsLrzUIABN5um8=";
+    hash = "sha256-2tAoK0X52cA+BkBus3aW3rlu+q3himH0WpgmU07aCcM=";
     meta = {
       license = lib.licenses.cc0;
       maintainers = with lib.maintainers; [
@@ -2796,10 +2793,10 @@
   };
 
   typespec = {
-    version = "0-unstable-2025-06-21";
+    version = "0-unstable-2026-01-01";
     url = "github:happenslol/tree-sitter-typespec";
-    rev = "814c98283fd92a248ba9d49ebfe61bc672a35875";
-    hash = "sha256-3/zNoawx1DsKmG0KFvJD+o80IMBsJd2VV2ng+fSrV1c=";
+    rev = "395bef1e1eb4dd18365401642beb534e8a244056";
+    hash = "sha256-N+clb40CgGzjyvC9b/qMhbSUZ6VsLJzK7N1k5iq2seY=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
@@ -2892,10 +2889,10 @@
   };
 
   vento = {
-    version = "0-unstable-2024-12-30";
+    version = "0-unstable-2026-02-23";
     url = "github:ventojs/tree-sitter-vento";
-    rev = "3b32474bc29584ea214e4e84b47102408263fe0e";
-    hash = "sha256-h8yC+MJIAH7DM69UQ8moJBmcmrSZkxvWrMb+NqtYB2Y=";
+    rev = "4569bc1fb81f050ca4ef3ceefdd31cfeb35c4f0a";
+    hash = "sha256-qD+O3gV/PGCdhv0nAlAi1ZeUmGSEfcKcbnipfZyex4g=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/by-name/tr/tree-sitter/package.nix
similarity index 96%
rename from pkgs/development/tools/parsing/tree-sitter/default.nix
rename to pkgs/by-name/tr/tree-sitter/package.nix
index b54f3967ead2..1ae410255fc0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/by-name/tr/tree-sitter/package.nix
@@ -37,7 +37,7 @@ let
     };
     ```
   */
-  buildGrammar = callPackage ./build-grammar.nix { };
+  buildGrammar = callPackage ./grammars/build-grammar.nix { };
 
   /**
     Attrset of grammar sources.
@@ -112,17 +112,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tree-sitter";
-  version = "0.25.10";
+  version = "0.26.8";
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
     repo = "tree-sitter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aHszbvLCLqCwAS4F4UmM3wbSb81QuG9FM7BDHTu1ZvM=";
+    hash = "sha256-fcFEfoALrbpBD6rWogxJ7FNVlvDQgswoX9ylRgko+8Q=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-4R5Y9yancbg/w3PhACtsWq0+gieUd2j8YnmEj/5eqkg=";
+  cargoHash = "sha256-9FeWnWWPUWmMF15Psmul8GxGv2JceHWc2WZPmOr81gw=";
 
   buildInputs = [
     installShellFiles
@@ -131,6 +131,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     openssl
   ];
   nativeBuildInputs = [
+    rustPlatform.bindgenHook
     which
   ]
   ++ lib.optionals webUISupport [
diff --git a/pkgs/by-name/tr/tree-sitter/remove-web-interface.patch b/pkgs/by-name/tr/tree-sitter/remove-web-interface.patch
new file mode 100644
index 000000000000..7a3880a42806
--- /dev/null
+++ b/pkgs/by-name/tr/tree-sitter/remove-web-interface.patch
@@ -0,0 +1,43 @@
+diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
+index c6d845fc..d1aa1b1c 100644
+--- a/crates/cli/src/main.rs
++++ b/crates/cli/src/main.rs
+@@ -24,7 +24,6 @@ use tree_sitter_cli::{
+     input::{get_input, get_tmp_source_file, CliInput},
+     logger,
+     parse::{self, ParseDebugType, ParseFileOptions, ParseOutput, ParseTheme},
+-    playground,
+     query::{self, QueryFileOptions},
+     tags::{self, TagsOptions},
+     test::{self, TestOptions, TestStats, TestSummary},
+@@ -1933,16 +1932,8 @@ impl Tags {
+ 
+ impl Playground {
+     fn run(self, current_dir: &Path) -> Result<()> {
+-        let grammar_path = self.grammar_path.as_deref().map_or(current_dir, Path::new);
+-
+-        if let Some(export_path) = self.export {
+-            playground::export(grammar_path, &export_path)?;
+-        } else {
+-            let open_in_browser = !self.quiet;
+-            playground::serve(grammar_path, open_in_browser)?;
+-        }
+-
+-        Ok(())
++        println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport");
++        std::process::exit(1);
+     }
+ }
+ 
+diff --git a/crates/cli/src/tree_sitter_cli.rs b/crates/cli/src/tree_sitter_cli.rs
+index 3960d961..55f8e2e4 100644
+--- a/crates/cli/src/tree_sitter_cli.rs
++++ b/crates/cli/src/tree_sitter_cli.rs
+@@ -6,7 +6,6 @@ pub mod init;
+ pub mod input;
+ pub mod logger;
+ pub mod parse;
+-pub mod playground;
+ pub mod query;
+ pub mod query_testing;
+ pub mod tags;
diff --git a/pkgs/by-name/tr/tree/package.nix b/pkgs/by-name/tr/tree/package.nix
index da67f9a37411..51838f624080 100644
--- a/pkgs/by-name/tr/tree/package.nix
+++ b/pkgs/by-name/tr/tree/package.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "tree";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitLab {
     owner = "OldManProgrammer";
     repo = "unix-tree";
     rev = finalAttrs.version;
-    hash = "sha256-ks3bj916tDdizywQnZKNSAfA2AzWh3np2F6QN5eOzIc=";
+    hash = "sha256-hmnBG96qQXvTulPnUYyliqidfKC+Wvky+d7xzYrCdTw=";
   };
 
   preConfigure = ''
diff --git a/pkgs/by-name/tr/treefmt/tests.nix b/pkgs/by-name/tr/treefmt/tests.nix
index c13b26b67b0f..57bcfda45cd3 100644
--- a/pkgs/by-name/tr/treefmt/tests.nix
+++ b/pkgs/by-name/tr/treefmt/tests.nix
@@ -72,10 +72,6 @@ in
     runCommand "run-nixfmt-example"
       {
         nativeBuildInputs = [ nixfmtExamplePackage ];
-        passAsFile = [
-          "input"
-          "expected"
-        ];
         input = ''
           {
             foo="bar";
@@ -90,18 +86,19 @@ in
             list = [ ];
           }
         '';
+        __structuredAttrs = true;
       }
       ''
         export XDG_CACHE_HOME=$(mktemp -d)
         # The example config assumes the tree root has a .git/index file
         mkdir .git && touch .git/index
 
-        # Copy the input file, then format it using the wrapped treefmt
-        cp $inputPath input.nix
+        # Create the input file, then format it using the wrapped treefmt
+        printf "%s" "$input" > input.nix
         treefmt
 
         # Assert that input.nix now matches expected
-        if diff -u $expectedPath input.nix; then
+        if diff -u <(printf "%s" "$expected") input.nix; then
           touch $out
         else
           echo
diff --git a/pkgs/by-name/tr/treemd/package.nix b/pkgs/by-name/tr/treemd/package.nix
index 4a9368f2f993..0107e3a55e9a 100644
--- a/pkgs/by-name/tr/treemd/package.nix
+++ b/pkgs/by-name/tr/treemd/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "treemd";
-  version = "0.5.9";
+  version = "0.5.10";
 
   src = fetchFromGitHub {
     owner = "Epistates";
     repo = "treemd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ImzHTdL1bKMV4mfl5tiTSQ89f3iUZZeFWmR74xMvP24=";
+    hash = "sha256-lt1dZW8na89wAcYkkoiNigGz8sh5dcuqoRmdV4M6fCk=";
   };
 
-  cargoHash = "sha256-KxIsZNDKgYWEdrDiwTHjORg44T3gc2hJSJe05H/Qavw=";
+  cargoHash = "sha256-mRHB/hJmpjMNrPeqz2ec78AIDvCQ1mbmfAkI+VoSqd0=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index 61d0e3e10990..94c5c5bb9981 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "trezor-suite";
-  version = "26.3.3";
+  version = "26.4.2";
 
   suffix =
     {
@@ -24,8 +24,8 @@ let
     hash =
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-DwB/SXwD7ZWmDTZ488NclP4/atS1/fLYcLRVle2QXnUt0BiV+tiF0OBAEA/h9tCduKi0x4E9D2SDGSGBrejF2A==";
-        x86_64-linux = "sha512-BD0UzrPrzFuwbbADH2rMMSz4ollviOQYwaqsX7AYpvFwkhieEtS2kGbR3G16H7VceTeGedZ65iM7SNQNYi1jUQ==";
+        aarch64-linux = "sha512-mE+mzMKAD0NrP2QI5Zc9yEH9vjC6e2cQjzK/CW5Q5FXUg6bGC+uy5fJhxM7Q00YPcNwnoD/vP/qltIa+Y5F8wg==";
+        x86_64-linux = "sha512-DBitrg6RwUUaj3tFv2wVJ2ssuU/QedYILCGkCZQmTHVT1Y/kVs/SCXEm/fX2Ni/aPbMmB6JecslbxGgU5Tftjg==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix
index 381c800c2b27..51d633c04f1b 100644
--- a/pkgs/by-name/tr/troubadix/package.nix
+++ b/pkgs/by-name/tr/troubadix/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "troubadix";
-  version = "26.4.4";
+  version = "26.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "troubadix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OByl6SYPgM6pFp2OQyHMZHGr3JJ4kTJTZByWjdEnF7c=";
+    hash = "sha256-wZpxwgIGvl4cVpPNrsYa5eGbAUgdf4lOxP2f537FYQI=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/tr/truehdd/package.nix b/pkgs/by-name/tr/truehdd/package.nix
new file mode 100644
index 000000000000..2497cb17ad87
--- /dev/null
+++ b/pkgs/by-name/tr/truehdd/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "truehdd";
+  version = "0.4.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "truehdd";
+    repo = "truehdd";
+    tag = finalAttrs.version;
+    hash = "sha256-PhJWtiYtELNkpnhI9e6tv3zFsSJnIYhu2eSy7RyReUE=";
+  };
+
+  cargoHash = "sha256-UvHdFtdkQPySEpCZ31n25jfvCsf7ETA7SVSR+/WfEM8=";
+
+  env.VERGEN_GIT_DESCRIBE = finalAttrs.version;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tools for inspecting and decoding Dolby TrueHD bitstreams";
+    homepage = "https://github.com/truehdd/truehdd";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      Renna42
+    ];
+    mainProgram = "truehdd";
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix
index ba2a09598c05..1c3523c96949 100644
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "trufflehog";
-  version = "3.94.3";
+  version = "3.95.2";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dNQjBBHtu0MFlAr/FluHAxR75q621HqHttpT2tBZKsg=";
+    hash = "sha256-7hHeJ+RBUUBznl9gm6IwemFsHLiKHh6B7T96jpEsAC0=";
   };
 
-  vendorHash = "sha256-BzZflc9NbqmvZ+RmGvkcknotvn10V/XrgfW8mG8GgiA=";
+  vendorHash = "sha256-2WBdBsOXjj4/9hLA+yk5PQAqOgi5vn1cH4NnkHg8umI=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/ts/tsgolint/package.nix b/pkgs/by-name/ts/tsgolint/package.nix
index 24f9b5878923..47ad1919995a 100644
--- a/pkgs/by-name/ts/tsgolint/package.nix
+++ b/pkgs/by-name/ts/tsgolint/package.nix
@@ -8,13 +8,13 @@
 
 buildGo126Module (finalAttrs: {
   pname = "tsgolint";
-  version = "0.21.1";
+  version = "0.22.1";
 
   src = fetchFromGitHub {
     owner = "oxc-project";
     repo = "tsgolint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tNLmJnV6ztk6IJpJERow4kf4Xx+cbFadLptbt4JpiRs=";
+    hash = "sha256-v6gSUeBcjSx/3/hjBST3ba6N366GQvryVTeAjV5+zEc=";
     fetchSubmodules = true;
   };
 
@@ -41,7 +41,7 @@ buildGo126Module (finalAttrs: {
     '';
 
   proxyVendor = true;
-  vendorHash = "sha256-iu2yQ4ZTSae49VgO/BYG3cEHhTtE4Q0g8L8KCAYARSw=";
+  vendorHash = "sha256-sdGpBrDie+VSOX4jhobipEN9BY6JjdM7fdmdYKXkb44=";
 
   subPackages = [ "cmd/tsgolint" ];
 
diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix
index ac2e8a6ccd28..38379fd7ee34 100644
--- a/pkgs/by-name/ts/tsx/package.nix
+++ b/pkgs/by-name/ts/tsx/package.nix
@@ -30,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
       src
       ;
     pnpm = pnpm';
-    fetcherVersion = 1;
-    hash = "sha256-6ZizQtZC43yXrz634VXksRCKGkDKryICvT3Q+JCuIEw=";
+    fetcherVersion = 3;
+    hash = "sha256-7JdL2qz663+y3tzeK0LLn57vSsQ0P0d+FofRimWVjrM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index 016e5485a24d..475d7bb7906c 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "turso-cli";
-  version = "1.0.20";
+  version = "1.0.21";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Vby81LYVEqysUmPU1P5d+VEME/SVYch14m1Mj7YvOXc=";
+    hash = "sha256-EO8j5XMwezSpTYVPpgoonTlNph7fCINXQoByUhlljDc=";
   };
 
   vendorHash = "sha256-Cb4/KA9jfI/pNHbJqLWtm9oEXfMHGBS46J9o3lL4/Tk=";
diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index 94fca3d54348..051fe263bb78 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -8,11 +8,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "340.260326.1";
+  version = "345.260424.1";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-9QtiB4VyktUgItJkOIdeGYthFxGt8RsNlAFf9ERoAEg=";
+    hash = "sha256-B0YXpJ75b6N2UNJSOwDd0bgsM4qzJGfYX/ELQk+IQO4=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];
diff --git a/pkgs/by-name/tu/tuxbox/package.nix b/pkgs/by-name/tu/tuxbox/package.nix
index c889f6b2659c..c15d3c620fd4 100644
--- a/pkgs/by-name/tu/tuxbox/package.nix
+++ b/pkgs/by-name/tu/tuxbox/package.nix
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   '';
 
   meta = {
-    changelog = "https://github.com/AndyCappDev/tuxbox/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/AndyCappDev/tuxbox/releases/tag/v${finalAttrs.version}";
     description = "Linux driver for all TourBox models - Native feel with USB, Bluetooth, haptics and graphical configuration GUI";
     homepage = "https://github.com/AndyCappDev/tuxbox";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/tw/twolame/package.nix b/pkgs/by-name/tw/twolame/package.nix
index 3f4b9dc077c2..d452f8cb3e53 100644
--- a/pkgs/by-name/tw/twolame/package.nix
+++ b/pkgs/by-name/tw/twolame/package.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
   ];
   buildInputs = [ libsndfile ];
 
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
+
   doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found"
 
   meta = {
diff --git a/pkgs/by-name/tx/txtpbfmt/package.nix b/pkgs/by-name/tx/txtpbfmt/package.nix
index 066be2f86b60..d3cf3e94eb40 100644
--- a/pkgs/by-name/tx/txtpbfmt/package.nix
+++ b/pkgs/by-name/tx/txtpbfmt/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "txtpbfmt";
-  version = "0-unstable-2026-02-17";
+  version = "0-unstable-2026-04-20";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "txtpbfmt";
-    rev = "a481f6a22f9426d6c2cc3d4be185b28d156886e4";
-    hash = "sha256-5dX1hEq1VzzZdXaoxkyy/gCbB8u/wlwy8g9kScVmJZs=";
+    rev = "c39628bde8b5d6b6e8f67f46580b5c1dd491b1fd";
+    hash = "sha256-D3yONCvyynXKVyeRypllKNMgPgo1w1ObPcra3r7aSF0=";
   };
 
   vendorHash = "sha256-aeYa7a/oKH2dxXHRkkqyh7f04citRDGQxAaKQTJst4o=";
diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 471069fe1b54..a8653f65abb9 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.31";
+  version = "0.0.33";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-TJGEI22hp+YZCxIvZgNc8BF2Dd+z/TzpnRW2pO1f3X0=";
+    hash = "sha256-cc/1piasUlv3wwYsXdJaKc8Ck9KF1/FjAjHv6XL6E7o=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-JTE/zRf+VqBoLaoMaQ4ioVsr3Njm3OGkpMMnsPg3lsA=";
+  cargoHash = "sha256-8DaJWHFBoVzpbkd9QmJ72a5NeKuX99lfDq3uUp+wd5I=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index ac12012274ec..bb12b794d01b 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -15,17 +15,17 @@ let
 in
 buildGoModule {
   pname = "typescript-go";
-  version = "0-unstable-2026-04-16";
+  version = "0-unstable-2026-04-24";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typescript-go";
-    rev = "83b8d2aa23b2d385087dabe5a5a8afd5e296013d";
-    hash = "sha256-d7Kld2ehO+EWkCl2/Pb+xP6p/RuEZFR24JItGDLpHJY=";
+    rev = "515d036f927aba8b468011098e2721335f0e2d00";
+    hash = "sha256-agEuOB7dnYZB6I5qA+/IdrGVSewg/8b74gRntwtaeaE=";
     fetchSubmodules = false;
   };
 
-  vendorHash = "sha256-YmKVn9fc7dKMBiXnutI15mg/BFCyvyXntr7QaxJ7qU8=";
+  vendorHash = "sha256-n2wBDcMSKQGUJlTgCuJbKPTYOCiwkMpbvavqIrRvzS8=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ty/typical/lifetime.patch b/pkgs/by-name/ty/typical/lifetime.patch
deleted file mode 100644
index 24f7353ae1f4..000000000000
--- a/pkgs/by-name/ty/typical/lifetime.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/error.rs b/src/error.rs
-index 4563e1e..050610d 100644
---- a/src/error.rs
-+++ b/src/error.rs
-@@ -34,7 +34,7 @@ impl fmt::Display for Error {
- }
- 
- impl error::Error for Error {
--    fn source<'a>(&'a self) -> Option<&(dyn error::Error + 'static)> {
-+    fn source(&self) -> Option<&(dyn error::Error + 'static)> {
-         self.reason.as_deref()
-     }
- }
diff --git a/pkgs/by-name/ty/typical/package.nix b/pkgs/by-name/ty/typical/package.nix
index 624f00a9985f..450b53ef0b87 100644
--- a/pkgs/by-name/ty/typical/package.nix
+++ b/pkgs/by-name/ty/typical/package.nix
@@ -4,20 +4,21 @@
   fetchFromGitHub,
   installShellFiles,
   stdenv,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typical";
-  version = "0.12.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = "typical";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-y7PWTzD9+rkC4wZYhecmDTa3AoWl4Tgh7QXbSK4Qq5Q=";
+    hash = "sha256-gcaOQhEyCiU2kXWZRymGca0Mq+TOBGDR4v/5sFOaDz0=";
   };
 
-  cargoHash = "sha256-+SnwxmNQDj6acr2nEKJkNmR5PqnTIvyMApyZOmCld2U=";
+  cargoHash = "sha256-cRlxyh8a+lJLc/YkOYYXkCEi8D3KJHlm5a01rhWk3VQ=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -27,12 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     export NO_COLOR=true
   '';
 
-  patches = [
-    # Related to https://github.com/stepchowfun/typical/pull/501
-    # Committing a slightly different patch because the upstream one doesn't apply cleanly
-    ./lifetime.patch
-  ];
-
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd typical \
       --bash <($out/bin/typical shell-completion bash) \
@@ -40,6 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --zsh <($out/bin/typical shell-completion zsh)
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
   meta = {
     description = "Data interchange with algebraic data types";
     mainProgram = "typical";
diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix
index b86c2fc588ea..6a3138e95270 100644
--- a/pkgs/by-name/ty/typora/package.nix
+++ b/pkgs/by-name/ty/typora/package.nix
@@ -133,6 +133,7 @@ else
       sed -i '/Change Log/d' "$out/share/applications/typora.desktop"
 
       makeShellWrapper $out/opt/typora/Typora $out/bin/typora \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}"
 
       runHook postInstall
diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index 629b7bda2e2e..729552c62856 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typos";
-  version = "1.45.1";
+  version = "1.45.2";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "typos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v051wBxAgTlsFOAlysRlUOz/VoSSxbm3rqRJBxLOPuI=";
+    hash = "sha256-bribbiFYA8YYT6ZJNVyZ2l6FrAlfSuQ/WldqmHHG5lI=";
   };
 
-  cargoHash = "sha256-S7koGmH6C8wigRD+/ldDltTziHQ3uadHGfeI+Vk/Wak=";
+  cargoHash = "sha256-cdAjIRWaMWPDJuJg9mw/8Ky8ePYCIFzmn0Ir00UO5HM=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ty/typst/typst-packages-from-universe.toml b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml
index 1245d925bc9a..9b3c869859c7 100644
--- a/pkgs/by-name/ty/typst/typst-packages-from-universe.toml
+++ b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml
@@ -18,6 +18,16 @@ license = [
 ]
 homepage = "https://github.com/chillcicada/typst-aasvg"
 
+[ab-annotate."0.1.0"]
+url = "https://packages.typst.org/preview/ab-annotate-0.1.0.tar.gz"
+hash = "sha256-ntSGkeBQcrKhh0MVIo7a308Y4DytylY/I+whY0kYi2Y="
+typstDeps = []
+description = "Annotated bibliographies that render abstracts and user annotations beneath each citation entry"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/cwimpy/ab-annotate"
+
 [abbr."0.3.0"]
 url = "https://packages.typst.org/preview/abbr-0.3.0.tar.gz"
 hash = "sha256-O8LntWQhCu6yWAJu9Gp/rz3Q/e6cOqesmYkICut/G38="
@@ -114,6 +124,18 @@ license = [
 ]
 homepage = "https://github.com/avonmoll/ifacconf-typst"
 
+[abntyp."0.1.3"]
+url = "https://packages.typst.org/preview/abntyp-0.1.3.tar.gz"
+hash = "sha256-clYt7+R3tHVbmprFD7So0DgSuX9eLO/w0r/YVw7FPUo="
+typstDeps = [
+    "touying_0_7_2",
+]
+description = "Format academic documents following Brazilian ABNT standards"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/3sdras/abntyp"
+
 [abntyp."0.1.2"]
 url = "https://packages.typst.org/preview/abntyp-0.1.2.tar.gz"
 hash = "sha256-XYE32895uZmhaW14I5b3wAQRUE/oQiZpaOAbE69wUt8="
@@ -594,6 +616,16 @@ license = [
 ]
 homepage = "https://github.com/tristanduncombe/aero-navigator"
 
+[agregyst."1.2.0"]
+url = "https://packages.typst.org/preview/agregyst-1.2.0.tar.gz"
+hash = "sha256-WeHsrB+c/vufHDFgPbGT8POLpNRetTTxIwiEybj6WxM="
+typstDeps = []
+description = "Two-column agrégation lesson with summary at the end"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/pauladam94/agregyst"
+
 [agregyst."1.1.1"]
 url = "https://packages.typst.org/preview/agregyst-1.1.1.tar.gz"
 hash = "sha256-BfKu1Oqep1JOZ3sRScABE+CMP8dihdHQ8DhlD0hHnFM="
@@ -928,6 +960,16 @@ license = [
 ]
 homepage = "https://github.com/platformer/typst-algorithms"
 
+[algo."0.3.4"]
+url = "https://packages.typst.org/preview/algo-0.3.4.tar.gz"
+hash = "sha256-FAUfCdgE7wORCS+V7IvsUfsIzvhJxqqed4SrIyLK0uY="
+typstDeps = []
+description = "Beautifully typeset algorithms"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/platformer/typst-algorithms"
+
 [algo."0.3.3"]
 url = "https://packages.typst.org/preview/algo-0.3.3.tar.gz"
 hash = "sha256-3VUCgUg/a9iMQn+Qf8lUYgAQzeTr1kUka419hoGk4sQ="
@@ -1325,6 +1367,18 @@ license = [
 ]
 homepage = "https://github.com/8LWXpg/typst-ansi_render"
 
+[answerly."0.1.0"]
+url = "https://packages.typst.org/preview/answerly-0.1.0.tar.gz"
+hash = "sha256-f+LLfE6EhOuG5CFjb7cJ41xcJjZS3dNHmK5DdfS8ggA="
+typstDeps = [
+    "itemize_0_2_0",
+]
+description = "Record and format answers to questions in worksheets or textbooks"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/alasdair-casperd/answerly"
+
 [anti-matter."0.1.1"]
 url = "https://packages.typst.org/preview/anti-matter-0.1.1.tar.gz"
 hash = "sha256-VtBqori+QENdbj3irQP7nhA7dUHJDS0v6k04z0hNH3w="
@@ -1660,6 +1714,16 @@ license = [
 ]
 homepage = "https://github.com/amitsinghg1/arch-plotter"
 
+[arkheion."0.1.2"]
+url = "https://packages.typst.org/preview/arkheion-0.1.2.tar.gz"
+hash = "sha256-vrbrU9n/31T1a3YgjTH0MYvNdIBCWmFrRNeCDxWyX38="
+typstDeps = []
+description = "A simple template reproducing popular arXiv templates"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/mgoulao/arkheion"
+
 [arkheion."0.1.1"]
 url = "https://packages.typst.org/preview/arkheion-0.1.1.tar.gz"
 hash = "sha256-lPz7n7UtbC18rG6UJfXrt925IFrZg+KbcMcVEsxIGng="
@@ -2159,6 +2223,18 @@ license = [
 ]
 homepage = "https://github.com/dogezen/badgery"
 
+[bamdone-aiaa."0.2.0"]
+url = "https://packages.typst.org/preview/bamdone-aiaa-0.2.0.tar.gz"
+hash = "sha256-j93yBs23/EhKRpPwwNCn3By3ham0C7diQnv6jjlhcHg="
+typstDeps = [
+    "droplet_0_3_1",
+]
+description = "An American Institute of Aeronautics and Astronautics (AIAA) template for conferences"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/isaacew/aiaa-typst"
+
 [bamdone-aiaa."0.1.2"]
 url = "https://packages.typst.org/preview/bamdone-aiaa-0.1.2.tar.gz"
 hash = "sha256-xamtt+nwE9up9i9I2R3ObIgdSq/HiCPfCYVM19rmq4Q="
@@ -3107,6 +3183,16 @@ license = [
 ]
 homepage = "https://github.com/daskol/typst-templates"
 
+[blockcell."0.1.0"]
+url = "https://packages.typst.org/preview/blockcell-0.1.0.tar.gz"
+hash = "sha256-OYQwaCCYx6/XmR1ntV80qRpEwXlIBik0IcS26w7W1O4="
+typstDeps = []
+description = "Composable block-and-cell diagrams for visualizing structured data layouts, memory maps, register fields, protocol formats, and more"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/daleione/blockcell"
+
 [blockst."0.1.0"]
 url = "https://packages.typst.org/preview/blockst-0.1.0.tar.gz"
 hash = "sha256-32T2QAleiOZZ1tFREdvsv3wos8oP01GpM8P0KJuXFV0="
@@ -3314,6 +3400,96 @@ license = [
     "Apache-2.0",
 ]
 
+[bookly."3.1.0"]
+url = "https://packages.typst.org/preview/bookly-3.1.0.tar.gz"
+hash = "sha256-naxtI0cJfWQ6GiZO5MDuItfGqzAo4pPnkOXWogEBYjQ="
+typstDeps = [
+    "equate_0_3_2",
+    "hydra_0_6_2",
+    "itemize_0_2_0",
+    "marginalia_0_3_1",
+    "showybox_2_0_4",
+    "suboutline_0_3_0",
+    "subpar_0_2_2",
+]
+description = "Book template for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/maucejo/bookly"
+
+[bookly."3.0.0"]
+url = "https://packages.typst.org/preview/bookly-3.0.0.tar.gz"
+hash = "sha256-tXCaLm93KThGctIqtogrJDhx4COUZokWpxJfxqQsT5o="
+typstDeps = [
+    "equate_0_3_2",
+    "hydra_0_6_2",
+    "itemize_0_2_0",
+    "marginalia_0_3_1",
+    "showybox_2_0_4",
+    "suboutline_0_3_0",
+    "subpar_0_2_2",
+]
+description = "Book template for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/maucejo/bookly"
+
+[bookly."2.1.2"]
+url = "https://packages.typst.org/preview/bookly-2.1.2.tar.gz"
+hash = "sha256-0IJPVIuwDwwvUGr2zoiLBjI2a6cVPsfIwqm3CXZWOaY="
+typstDeps = [
+    "drafting_0_2_2",
+    "equate_0_3_2",
+    "hydra_0_6_2",
+    "itemize_0_2_0",
+    "showybox_2_0_4",
+    "suboutline_0_3_0",
+    "subpar_0_2_2",
+]
+description = "Book template for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/maucejo/bookly"
+
+[bookly."2.1.1"]
+url = "https://packages.typst.org/preview/bookly-2.1.1.tar.gz"
+hash = "sha256-fH///aJiodYguOyQ2RHk5+n9bgPmy1TKefewDBDl/Io="
+typstDeps = [
+    "drafting_0_2_2",
+    "equate_0_3_2",
+    "hydra_0_6_2",
+    "itemize_0_2_0",
+    "showybox_2_0_4",
+    "suboutline_0_3_0",
+    "subpar_0_2_2",
+]
+description = "Book template for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/maucejo/bookly"
+
+[bookly."2.1.0"]
+url = "https://packages.typst.org/preview/bookly-2.1.0.tar.gz"
+hash = "sha256-VhCwpqXThEkObVVAJhsjZt/VQ3v5wGKDBHK4DxtlxAE="
+typstDeps = [
+    "drafting_0_2_2",
+    "equate_0_3_2",
+    "hydra_0_6_2",
+    "itemize_0_2_0",
+    "showybox_2_0_4",
+    "suboutline_0_3_0",
+    "subpar_0_2_2",
+]
+description = "Book template for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/maucejo/bookly"
+
 [bookly."2.0.0"]
 url = "https://packages.typst.org/preview/bookly-2.0.0.tar.gz"
 hash = "sha256-mGyCIuTYZLXm1xdnPu2pYM/Gbn6T0FQLoTF5oghV6ho="
@@ -3800,6 +3976,15 @@ license = [
 ]
 homepage = "https://github.com/inuEbisu/bubble-zju"
 
+[bulb."0.1.0"]
+url = "https://packages.typst.org/preview/bulb-0.1.0.tar.gz"
+hash = "sha256-ceMswzauGRrkhprhNQvixgNbplfskvNFMbWIKqdxmJg="
+typstDeps = []
+description = "Image dithering plugin, powered by WASM"
+license = [
+    "MIT",
+]
+
 [bullseye."0.1.0"]
 url = "https://packages.typst.org/preview/bullseye-0.1.0.tar.gz"
 hash = "sha256-L9eFegLTTCE/Vf38KzirwHqSRk1vHRHqnv+wOrQolV4="
@@ -3821,6 +4006,16 @@ license = [
     "MIT",
 ]
 
+[butterick-resume."0.1.1"]
+url = "https://packages.typst.org/preview/butterick-resume-0.1.1.tar.gz"
+hash = "sha256-tennMMOpG1DJUJKr6InbeFNmb0HAhp+RfjqDioa+XrM="
+typstDeps = []
+description = "Résumé template based on Matthew Butterick's guide"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/jassielof/typst-templates"
+
 [butterick-resume."0.1.0"]
 url = "https://packages.typst.org/preview/butterick-resume-0.1.0.tar.gz"
 hash = "sha256-kVkA/v1r92saq8j7PRktybi0fzfMSzC2s3ATtdcrOSc="
@@ -3861,6 +4056,19 @@ license = [
 ]
 homepage = "https://github.com/DJDuque/bye-ubc"
 
+[bypst."0.2.0"]
+url = "https://packages.typst.org/preview/bypst-0.2.0.tar.gz"
+hash = "sha256-gIIAxWTrfEBV12RY6YMtqH1+dybMk8jqwPMP71ZTjPY="
+typstDeps = [
+    "codetastic_0_2_2",
+    "touying_0_7_1",
+]
+description = "Create BIPS-branded academic presentations with Touying"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/bips-hb/bips-typst"
+
 [bytefield."0.0.8"]
 url = "https://packages.typst.org/preview/bytefield-0.0.8.tar.gz"
 hash = "sha256-fV2+Mv9DoMpYBKwljBCvlWhNiyWMwDeJCHPaa+y9aeA="
@@ -4016,6 +4224,21 @@ license = [
 ]
 homepage = "https://github.com/rice8y/caletz"
 
+[calligraphics."1.0.0"]
+url = "https://packages.typst.org/preview/calligraphics-1.0.0.tar.gz"
+hash = "sha256-1hBcr4BnjiESZAfQ0A5uMwcSVtiFLx4gUM2GPmNFJbw="
+typstDeps = [
+    "fontawesome_0_6_0",
+    "linguify_0_5_0",
+    "metalogo_1_2_0",
+    "voronay_0_1_0",
+]
+description = "A typst resume template fill with colorfull triangles"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Lieunoir/calligraphics"
+
 [callisto."0.2.5"]
 url = "https://packages.typst.org/preview/callisto-0.2.5.tar.gz"
 hash = "sha256-xM9AJa+Lk7lUlrHC/VSJCBMSK+LlMKJc+bAPAsAf+tU="
@@ -4086,6 +4309,26 @@ license = [
 ]
 homepage = "https://github.com/knuesel/callisto"
 
+[calloutly."1.0.0"]
+url = "https://packages.typst.org/preview/calloutly-1.0.0.tar.gz"
+hash = "sha256-DlcM6IksbBoXbyT2Dn2nmLJWhWQ8B34dzzxO0xFkQgQ="
+typstDeps = []
+description = "Create customizable Markdown-style Callouts"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Alpha9463/typst-callout"
+
+[calloutly."0.1.0"]
+url = "https://packages.typst.org/preview/calloutly-0.1.0.tar.gz"
+hash = "sha256-aPGwa81+kAGWY34kWYd9tQymIAMJWLW0bI19R7D56XQ="
+typstDeps = []
+description = "Create customizable Markdown-style Callouts"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Alpha9463/typst-callout"
+
 [calmly-touying."0.2.0"]
 url = "https://packages.typst.org/preview/calmly-touying-0.2.0.tar.gz"
 hash = "sha256-qmY8m+NpTTgywcwnLiyeTfTlmW0ATKMozEhwjRo1Fiw="
@@ -4140,6 +4383,18 @@ license = [
 ]
 homepage = "https://github.com/VincentTam/pycantonese-parser"
 
+[cap-able."0.0.1"]
+url = "https://packages.typst.org/preview/cap-able-0.0.1.tar.gz"
+hash = "sha256-4kAQOkYi5T6Ch8R8lPFPoSpJ7GITGu3dwUBNZ7u5Ro8="
+typstDeps = [
+    "tablem_0_3_0",
+]
+description = "Professional three-line tables and figures with bilingual captions, continued tables/figures, subfigures, and 25+ language support for academic documents"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/SchrodingerBlume/typst-cap-able"
+
 [cartao."0.2.0"]
 url = "https://packages.typst.org/preview/cartao-0.2.0.tar.gz"
 hash = "sha256-EN47shdewOszij89m1kqWciX9C27PGTIfpJsV29zA+s="
@@ -4302,6 +4557,18 @@ license = [
 ]
 homepage = "https://github.com/andreasKroepelin/cetramed-polylux"
 
+[cetz."0.5.0"]
+url = "https://packages.typst.org/preview/cetz-0.5.0.tar.gz"
+hash = "sha256-PYN6oSrgLX6S1WKAI8AiSnrkIzMom7POFNFKMcdcJaY="
+typstDeps = [
+    "oxifmt_1_0_0",
+]
+description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/cetz-package/cetz"
+
 [cetz."0.4.2"]
 url = "https://packages.typst.org/preview/cetz-0.4.2.tar.gz"
 hash = "sha256-fbYS5HNKNKF7JYAdG0xFMLryFoLAv4Kd3kV3rqiKWVo="
@@ -4644,6 +4911,15 @@ license = [
 ]
 homepage = "https://github.com/typst/templates"
 
+[charged-pace."0.1.0"]
+url = "https://packages.typst.org/preview/charged-pace-0.1.0.tar.gz"
+hash = "sha256-NQSfVELl2sAaekaolwyVfDs4a1p7DbEJI5g7ee/Fi+s="
+typstDeps = []
+description = "Dissertation or thesis in the format required by Pace University"
+license = [
+    "MIT-0",
+]
+
 [charged-vde."1.0.0"]
 url = "https://packages.typst.org/preview/charged-vde-1.0.0.tar.gz"
 hash = "sha256-2ybxBUcgdltcmFZSZHNWsbDXjaK0UsYxWfyLaVVWFqg="
@@ -5002,6 +5278,18 @@ license = [
 ]
 homepage = "https://github.com/JeppeKlitgaard/chomp"
 
+[chordish."0.2.2"]
+url = "https://packages.typst.org/preview/chordish-0.2.2.tar.gz"
+hash = "sha256-oajeuplN1X9jATQKp/VJYDlDQU+j9AbDwEzw3KhaM9c="
+typstDeps = [
+    "conchord_0_4_0",
+]
+description = "A simple template for creating guitar and ukulele chord sheets"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/soxfox42/chordish"
+
 [chordish."0.2.1"]
 url = "https://packages.typst.org/preview/chordish-0.2.1.tar.gz"
 hash = "sha256-gUljxfaxVvGg2SqIR52StsgjjHM1K0q+P9JpIWShS6Y="
@@ -5502,6 +5790,15 @@ license = [
 ]
 homepage = "https://github.com/neruthes/typstpkg-cjk-unshrink"
 
+[clari-docs."0.1.0"]
+url = "https://packages.typst.org/preview/clari-docs-0.1.0.tar.gz"
+hash = "sha256-IN9hC9VhHgKwzx+5fSMkiW+e1NfOAwqgsS6LkI4ih4M="
+typstDeps = []
+description = "Comprehensive and highly-customizable presentations"
+license = [
+    "MIT-0",
+]
+
 [classic-aau-report."0.3.1"]
 url = "https://packages.typst.org/preview/classic-aau-report-0.3.1.tar.gz"
 hash = "sha256-kDy0Z0f2ifKOdKa/PaPP608qXzmw1E6NTL40dIUY0iQ="
@@ -5745,6 +6042,21 @@ license = [
 ]
 homepage = "https://github.com/NicolaiSchmid/clean-ats-cv"
 
+[clean-barm."1.0.0"]
+url = "https://packages.typst.org/preview/clean-barm-1.0.0.tar.gz"
+hash = "sha256-ojy672eEkugGw9Clq8GUNlNpKbokI6GOzoO8RohLmgE="
+typstDeps = [
+    "codelst_2_0_2",
+    "decasify_0_11_3",
+    "prequery_0_2_0",
+    "transl_0_2_0",
+]
+description = "Various documents for the Berufsakademie Rhein-Main"
+license = [
+    "MIT",
+]
+homepage = "https://git.thebread.dev/thebreadcompany/clean-barm"
+
 [clean-cnam-template."1.6.4"]
 url = "https://packages.typst.org/preview/clean-cnam-template-1.6.4.tar.gz"
 hash = "sha256-34CKrY9mkuYN3ewmWW75W//OV/AHIPpV38m36Vb+ASw="
@@ -6101,6 +6413,20 @@ license = [
 ]
 homepage = "https://github.com/testspieler09/clean-hwr-template"
 
+[clean-math-paper."0.2.6"]
+url = "https://packages.typst.org/preview/clean-math-paper-0.2.6.tar.gz"
+hash = "sha256-dIf5FE7Rqt564CI+YqUT94zeEX3oDei58YqKM5u9gdE="
+typstDeps = [
+    "great-theorems_0_1_2",
+    "i-figured_0_2_4",
+    "rich-counters_0_2_2",
+]
+description = "A simple and good looking template for mathematical papers"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/JoshuaLampert/clean-math-paper"
+
 [clean-math-paper."0.2.5"]
 url = "https://packages.typst.org/preview/clean-math-paper-0.2.5.tar.gz"
 hash = "sha256-PsQGRUPo52lju3ARmY2C9oKWCc4merfRkDEgON3YgPQ="
@@ -6347,6 +6673,18 @@ license = [
 ]
 homepage = "https://codeberg.org/ruebe5w/clean-othaw"
 
+[clean-uoft-thesis."0.1.1"]
+url = "https://packages.typst.org/preview/clean-uoft-thesis-0.1.1.tar.gz"
+hash = "sha256-huXwGuCGWGowQ0pu2T5vgKMLVMOmuylsuA0/LIxj+6w="
+typstDeps = [
+    "wordometer_0_1_5",
+]
+description = "Unofficial formatting-compliant masters and doctoral thesese for the School of Graduate Studies at the University of Toronto"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/pvelayudhan/clean-uoft-thesis"
+
 [clean-uoft-thesis."0.1.0"]
 url = "https://packages.typst.org/preview/clean-uoft-thesis-0.1.0.tar.gz"
 hash = "sha256-r+ojrTHkXSjQJD0nyQXbu8YgybLcP8Zr4LZPU/Zcwsg="
@@ -6405,6 +6743,16 @@ license = [
 ]
 homepage = "https://gitlab.hpi.de/robert.richter/typst-research-proposal-template/"
 
+[cleanified-hpi-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/cleanified-hpi-thesis-0.1.0.tar.gz"
+hash = "sha256-i9PVHwzDggQOO3gJV3Ai702hftGqFve7248bcrxz37c="
+typstDeps = []
+description = "A clean thesis template for Bachelor's and Master's theses at HPI, University of Potsdam"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/felixhoffmnn/hpi-thesis-template"
+
 [cleanified-hpi-thesis."0.0.1"]
 url = "https://packages.typst.org/preview/cleanified-hpi-thesis-0.0.1.tar.gz"
 hash = "sha256-g4gquvnBSVczNbu5dg7xcO9QcVHfDWQ28e231INWAN8="
@@ -6709,6 +7057,16 @@ license = [
 ]
 homepage = "https://github.com/AlexanderBrevig/typst-forth"
 
+[codegds."0.1.0"]
+url = "https://packages.typst.org/preview/codegds-0.1.0.tar.gz"
+hash = "sha256-px4lZ7P9dcAvf3o7cJngGPIVGh46tbQmYV/EBZCjSec="
+typstDeps = []
+description = "Syntax highlighting support for the GDScript programming language"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Kioraga/typst-gdscript"
+
 [codelst."2.0.2"]
 url = "https://packages.typst.org/preview/codelst-2.0.2.tar.gz"
 hash = "sha256-nroAmdKRY2YqxCC+/E+Ql/FxxFugPjjbOW3BwPBZLVU="
@@ -7252,6 +7610,15 @@ license = [
 ]
 homepage = "https://gitlab.com/giacomogallina/commute"
 
+[conch."0.1.0"]
+url = "https://packages.typst.org/preview/conch-0.1.0.tar.gz"
+hash = "sha256-51loloarpJygA/JPssSXygGpzxQDgBx7MRmkJDv+yE4="
+typstDeps = []
+description = "Simulate a shell and render terminal sessions in documents"
+license = [
+    "MIT",
+]
+
 [conchord."0.4.0"]
 url = "https://packages.typst.org/preview/conchord-0.4.0.tar.gz"
 hash = "sha256-4q/sHHFsy5zWHEumQRr8chYaONCmAhVZbznOQxrr7TE="
@@ -7389,6 +7756,15 @@ license = [
 ]
 homepage = "https://github.com/E-Paroxysme/Typst_Visual"
 
+[corkscrew."0.1.0"]
+url = "https://packages.typst.org/preview/corkscrew-0.1.0.tar.gz"
+hash = "sha256-hE+2q9yspm23+4cyJRxFu7nSd11KU+VEPArP98MIBcA="
+typstDeps = []
+description = "Generate color scales based on Dave Green’s cubehelix color scheme"
+license = [
+    "MIT",
+]
+
 [covered-cs-thesis."0.1.5"]
 url = "https://packages.typst.org/preview/covered-cs-thesis-0.1.5.tar.gz"
 hash = "sha256-mNP3IN8ygS4lXfjUAArC40zztzaZQyHGfj4KcQkrBD8="
@@ -7557,6 +7933,26 @@ license = [
 ]
 homepage = "https://github.com/DVDTSB/ctheorems"
 
+[ctxjs."0.4.1"]
+url = "https://packages.typst.org/preview/ctxjs-0.4.1.tar.gz"
+hash = "sha256-MmaQTbEWLDaJQyrKxHa7Hc37kAwUn+WlY4JpXRu+NEg="
+typstDeps = []
+description = "Run javascript in contexts"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/lublak/typst-ctxjs-package"
+
+[ctxjs."0.4.0"]
+url = "https://packages.typst.org/preview/ctxjs-0.4.0.tar.gz"
+hash = "sha256-wrQp1mMykchnc5Qzh5FQdR7Il5vuZ3YirQFRrLZO134="
+typstDeps = []
+description = "Run javascript in contexts"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/lublak/typst-ctxjs-package"
+
 [ctxjs."0.3.2"]
 url = "https://packages.typst.org/preview/ctxjs-0.3.2.tar.gz"
 hash = "sha256-vkyxCsaEGn8Myhfzk4YGqZxQ9JbBbXxb1S2WaElIW/E="
@@ -7617,6 +8013,23 @@ license = [
 ]
 homepage = "https://github.com/lublak/typst-ctxjs-package"
 
+[ctyp."0.3.1"]
+url = "https://packages.typst.org/preview/ctyp-0.3.1.tar.gz"
+hash = "sha256-8p3YLwQUxChyDDkZvW34hgt8OJjn3Jd7Yv4hSzSBNbw="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_10",
+    "elembic_1_1_1",
+    "marge_0_1_0",
+    "theorion_0_5_0",
+    "tidy_0_4_3",
+]
+description = "A Typst package for Chinese typography"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/hpdell/ctyp"
+
 [ctyp."0.3.0"]
 url = "https://packages.typst.org/preview/ctyp-0.3.0.tar.gz"
 hash = "sha256-sC9FbU5NTC+E9tGsEs4hKq7HW8IrT4gGOTl+hNaAnL0="
@@ -8072,6 +8485,19 @@ license = [
 ]
 homepage = "https://github.com/ErrorTeaPot/Cyberschool_template"
 
+[cyberschool-errorteaplate."0.1.4"]
+url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.4.tar.gz"
+hash = "sha256-BHJNjdvj53BHDhvqjkSRk0bLBUzlbYazd+ZXzgj0FSo="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+]
+description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ErrorTeaPot/Cyberschool_template"
+
 [cyberschool-errorteaplate."0.1.3"]
 url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.3.tar.gz"
 hash = "sha256-k/zpxcsIv47M6YPy5eNl2YVh/RicIVJH595xbzSicqY="
@@ -8682,6 +9108,16 @@ license = [
 ]
 homepage = "https://github.com/0rphee/derive-it"
 
+[diagraph."0.3.7"]
+url = "https://packages.typst.org/preview/diagraph-0.3.7.tar.gz"
+hash = "sha256-6TnXXx0zQzZryH6L7Dh5EICe39sZM9la7OQc+wbWK6M="
+typstDeps = []
+description = "Draw graphs with Graphviz. Use mathematical formulas as labels"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Robotechnic/diagraph.git"
+
 [diagraph."0.3.6"]
 url = "https://packages.typst.org/preview/diagraph-0.3.6.tar.gz"
 hash = "sha256-LBplb807NgR0oovh7fxRWpqhOBfxm7uyETgj3Q7otTw="
@@ -8995,6 +9431,25 @@ license = [
 ]
 homepage = "https://github.com/ParaN3xus/digestify"
 
+[digidraw."0.9.2"]
+url = "https://packages.typst.org/preview/digidraw-0.9.2.tar.gz"
+hash = "sha256-5zjaQF5VludfGiYTOH/u1iphWIcMtNzd1jgaoSwWzB0="
+typstDeps = [
+    "cetz_0_4_2",
+    "chribel_1_2_0",
+    "cmarker_0_1_8",
+    "codly_1_3_0",
+    "codly-languages_0_1_10",
+    "fletcher_0_5_8",
+    "tableau-icons_0_340_0",
+    "tidy_0_4_3",
+]
+description = "Drawing digital timing diagrams with style and (almost all of) the WaveDrom syntax"
+license = [
+    "EUPL-1.2",
+]
+homepage = "https://codeberg.org/joelvonrotz/typst-digidraw"
+
 [digidraw."0.9.1"]
 url = "https://packages.typst.org/preview/digidraw-0.9.1.tar.gz"
 hash = "sha256-GPJn18nDvucaeK23u1S/5MdtBbeuQZmJc4++6tCxdiM="
@@ -9232,6 +9687,16 @@ license = [
 ]
 homepage = "https://github.com/EpicEricEE/typst-droplet"
 
+[dtree."0.1.1"]
+url = "https://packages.typst.org/preview/dtree-0.1.1.tar.gz"
+hash = "sha256-KTJ+Us6XVsZqcf8y2dKrDvtfwHKskg1Pxsd61UlbRBU="
+typstDeps = []
+description = "A flexible package for visualizing directory trees and file structures using indented text"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/rice8y/dtree"
+
 [dtree."0.1.0"]
 url = "https://packages.typst.org/preview/dtree-0.1.0.tar.gz"
 hash = "sha256-aUpZD4PwQSht7X4SZTvbRn1DOqd68/ykxMDBmKO7qGQ="
@@ -9311,6 +9776,19 @@ license = [
 ]
 homepage = "https://github.com/swaits/typst-collection"
 
+[easy-wi-hwr."0.1.1"]
+url = "https://packages.typst.org/preview/easy-wi-hwr-0.1.1.tar.gz"
+hash = "sha256-gWUB+bImYiPNxsURDAA9sbaqBqsJ/0KCEv6D4HFi61A="
+typstDeps = [
+    "glossarium_0_5_10",
+    "linguify_0_5_0",
+]
+description = "Paper template for HWR Berlin (Wirtschaftsinformatik"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/lultoni/hwr-typst-template"
+
 [easy-wi-hwr."0.1.0"]
 url = "https://packages.typst.org/preview/easy-wi-hwr-0.1.0.tar.gz"
 hash = "sha256-FFtF1KQEU67+h2+PILzZOQ/cZ5djeTAMZzDoUBzs3Vw="
@@ -9672,6 +10150,16 @@ license = [
 ]
 homepage = "https://github.com/retroflexivity/typst-eggs"
 
+[electify."0.2.0"]
+url = "https://packages.typst.org/preview/electify-0.2.0.tar.gz"
+hash = "sha256-0Ofx2kQLVPBhUsCl1273UgykQaZRwsgUBE/OOzK2gDw="
+typstDeps = []
+description = "A German & Austrian Election Ballot Paper helping visualize the dual-voting system (Erststimme & Zweitstimme"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/G0STG0D/electify"
+
 [electify."0.1.1"]
 url = "https://packages.typst.org/preview/electify-0.1.1.tar.gz"
 hash = "sha256-THxg8Rvy08WCwrOBAjAgyZXsxWtwr1QNgx5mZ3HZob0="
@@ -9803,6 +10291,19 @@ license = [
 ]
 homepage = "https://github.com/PgBiel/elembic"
 
+[elsearticle."2.1.0"]
+url = "https://packages.typst.org/preview/elsearticle-2.1.0.tar.gz"
+hash = "sha256-PCJKHstprcidlbqhoy4QVB4ZOK1APhAtW0IkeLybkwI="
+typstDeps = [
+    "equate_0_3_2",
+    "subpar_0_2_2",
+]
+description = "Conversion of the LaTeX elsearticle.cls"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/maucejo/elsearticle"
+
 [elsearticle."2.0.3"]
 url = "https://packages.typst.org/preview/elsearticle-2.0.3.tar.gz"
 hash = "sha256-67KLevLgwjjRMaZWSyBQktuSYRY9d0LVsCfdTKAf/tA="
@@ -10065,6 +10566,16 @@ license = [
     "GPL-3.0-or-later",
 ]
 
+[endfield-doc."0.1.0"]
+url = "https://packages.typst.org/preview/endfield-doc-0.1.0.tar.gz"
+hash = "sha256-jXypE1mpEr7pP92ebnh3dHzm8l3SAXx8bkWdsEYft6Q="
+typstDeps = []
+description = "A4 document theme styled after the Arknights: Endfield aesthetic"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Ives-Natsume/typst-endfield-doc-theme.git"
+
 [energy-dia."0.1.0"]
 url = "https://packages.typst.org/preview/energy-dia-0.1.0.tar.gz"
 hash = "sha256-LlYK9L8tNKPrpBIe8l0Pmzgmc9wm+IWTsPIqdWgkrXM="
@@ -10389,6 +10900,16 @@ license = [
 ]
 homepage = "https://github.com/SillyFreak/typst-etykett"
 
+[examify."0.1.1"]
+url = "https://packages.typst.org/preview/examify-0.1.1.tar.gz"
+hash = "sha256-1dgSCLdqpxvX9/eVDAG83hkwlMpJfyrWEk2SqNFHjYQ="
+typstDeps = []
+description = "A simple typst template to create question papers for exams"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tarunjana/examify"
+
 [examify."0.1.0"]
 url = "https://packages.typst.org/preview/examify-0.1.0.tar.gz"
 hash = "sha256-RpvIZMnN1Nq0dnyHwf79aAs/4BNZsJFYkgTjRWVJOok="
@@ -10635,6 +11156,18 @@ license = [
 ]
 homepage = "https://github.com/CarloSchafflik12/typst-ez-today"
 
+[ezchem."0.1.1"]
+url = "https://packages.typst.org/preview/ezchem-0.1.1.tar.gz"
+hash = "sha256-s5rV+zNCZoiLoSGE+8afS/pIx7MxpFe0urgZevcmCiw="
+typstDeps = [
+    "cetz_0_4_2",
+]
+description = "Draw atomic or ionic structures powered by ctez and single or double line bridge"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezchem.git"
+
 [ezchem."0.1.0"]
 url = "https://packages.typst.org/preview/ezchem-0.1.0.tar.gz"
 hash = "sha256-hz1jR4YM86sqCpaSeVe0bpEo1WRhQ/3N2axGJ5hPxMk="
@@ -10647,6 +11180,16 @@ license = [
 ]
 homepage = "https://github.com/gbchu/ezchem.git"
 
+[ezexam."0.3.1"]
+url = "https://packages.typst.org/preview/ezexam-0.3.1.tar.gz"
+hash = "sha256-ytc3KolZuS0spj007QdZCzchglV/sZ3ehCe2GsydaYI="
+typstDeps = []
+description = "An exam template inspired by the LaTeX package exam-zh"
+license = [
+    "AGPL-3.0-or-later",
+]
+homepage = "https://github.com/gbchu/ezexam.git"
+
 [ezexam."0.3.0"]
 url = "https://packages.typst.org/preview/ezexam-0.3.0.tar.gz"
 hash = "sha256-2AMPyJGWf8JUG7PsZ5/xFPUJpMg3LDwuMMIQp+FFeps="
@@ -10877,6 +11420,18 @@ license = [
 ]
 homepage = "https://github.com/han190/fancy-affil"
 
+[fancy-cookbook."2.0.0"]
+url = "https://packages.typst.org/preview/fancy-cookbook-2.0.0.tar.gz"
+hash = "sha256-rsNVo/c1kVyqZryIuFS5PG+FWORvdopfNs5xJvi99TE="
+typstDeps = [
+    "datify_1_0_1",
+]
+description = "Create simple recipe collections and cookbooks in color and your language"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Ajrarn/fancy-cookbook"
+
 [fancy-cookbook."1.0.0"]
 url = "https://packages.typst.org/preview/fancy-cookbook-1.0.0.tar.gz"
 hash = "sha256-x4+P/zivHaVgvol7BQGjIxK0hfjTPFIcMv7OV6ZGla4="
@@ -10973,6 +11528,16 @@ license = [
 ]
 homepage = "https://github.com/3sdras/ferrmat"
 
+[fervojo."0.1.1"]
+url = "https://packages.typst.org/preview/fervojo-0.1.1.tar.gz"
+hash = "sha256-qVvYEN6cyzPJOSNQuHFjjwGUgHbj8WLlEV5wvSayHJg="
+typstDeps = []
+description = "railroad for typst, powered by wasm"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/leiserfg/fervojo"
+
 [fervojo."0.1.0"]
 url = "https://packages.typst.org/preview/fervojo-0.1.0.tar.gz"
 hash = "sha256-icOqJl4Gc0H88UBPbS5XWTzhA3XqtTdtYykJjEIDSaA="
@@ -12718,6 +13283,30 @@ license = [
 ]
 homepage = "https://codeberg.org/drloiseau/genealogy"
 
+[genotypst."0.9.0"]
+url = "https://packages.typst.org/preview/genotypst-0.9.0.tar.gz"
+hash = "sha256-2xolKSP1CDCv1qdRL00cWAVtBJgS1U6nYyt9cl+ypHM="
+typstDeps = [
+    "tiptoe_0_4_0",
+]
+description = "genotypst: A package for bioinformatics data analysis and visualization"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/apcamargo/genotypst"
+
+[genotypst."0.8.0"]
+url = "https://packages.typst.org/preview/genotypst-0.8.0.tar.gz"
+hash = "sha256-P1nLNKIJjwLFgJCXQfYw+2JxLThj+ZeFAHoHzTbpitE="
+typstDeps = [
+    "tiptoe_0_4_0",
+]
+description = "genotypst: A package for bioinformatics data analysis and visualization"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/apcamargo/genotypst"
+
 [genotypst."0.7.0"]
 url = "https://packages.typst.org/preview/genotypst-0.7.0.tar.gz"
 hash = "sha256-JqcxZc4ylxpZeRmL5UkuIInmnIQlH7MCV5j1LetQWKg="
@@ -13284,6 +13873,18 @@ license = [
 ]
 homepage = "https://github.com/slashformotion/glossarium"
 
+[glossy."0.9.1"]
+url = "https://packages.typst.org/preview/glossy-0.9.1.tar.gz"
+hash = "sha256-dIg4SYfnblRtwgRVDZLZj1eNApQPFZQ8/X9ls7UfsIY="
+typstDeps = [
+    "valkyrie_0_2_2",
+]
+description = "A very simple glossary system with easily customizable output"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/swaits-typst-packages/glossy/"
+
 [glossy."0.9.0"]
 url = "https://packages.typst.org/preview/glossy-0.9.0.tar.gz"
 hash = "sha256-D77rwxgS1egHMYbqXUgSTkryvQyKzHtQ/Dahyeb6KiE="
@@ -13578,6 +14179,16 @@ license = [
     "MIT",
 ]
 
+[grape-suite."4.0.0"]
+url = "https://packages.typst.org/preview/grape-suite-4.0.0.tar.gz"
+hash = "sha256-I2h1XDadkO3YpjSUbfADzw4Bp6mNbK37NRyvURQxtwc="
+typstDeps = []
+description = "Library of templates for exams, seminar papers, homeworks, etc"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/piepert/grape-suite"
+
 [grape-suite."3.1.0"]
 url = "https://packages.typst.org/preview/grape-suite-3.1.0.tar.gz"
 hash = "sha256-lIeuFWj6l5wbDTucXEHBk+3vdalMIVbBcjD7Sys1ovA="
@@ -14552,6 +15163,19 @@ license = [
 ]
 homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
 
+[haw-hamburg-bachelor-thesis."0.5.0"]
+url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.5.0.tar.gz"
+hash = "sha256-y3RuWHrhvO7IH0cPRM9s3k0dK628Kho4uvYE7jBVJeA="
+typstDeps = [
+    "glossarium_0_5_3",
+    "haw-hamburg_0_5_0",
+]
+description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
+
 [haw-hamburg-bachelor-thesis."0.4.0"]
 url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.4.0.tar.gz"
 hash = "sha256-97iY2zDg42J8dm6PWqbGimZ/VJbB6B8JoCguJ60JSKs="
@@ -15028,6 +15652,26 @@ license = [
 ]
 homepage = "https://github.com/hei-templates/hei-synd-thesis"
 
+[hei-synd-thesis."0.3.1"]
+url = "https://packages.typst.org/preview/hei-synd-thesis-0.3.1.tar.gz"
+hash = "sha256-p65Dk3iZr9sBGhyN9rixA6GhTLCIj5hUmi8Ifx8XO+c="
+typstDeps = [
+    "cheq_0_3_0",
+    "codelst_2_0_2",
+    "codly_1_3_0",
+    "codly-languages_0_1_10",
+    "fractusist_0_3_2",
+    "glossarium_0_5_10",
+    "icu-datetime_0_2_1",
+    "mmdr_0_2_1",
+    "wordometer_0_1_5",
+]
+description = "A thesis template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/hei-templates/hei-synd-thesis"
+
 [hei-synd-thesis."0.2.3"]
 url = "https://packages.typst.org/preview/hei-synd-thesis-0.2.3.tar.gz"
 hash = "sha256-KoYYcw2W3RZreVymiDFMM71GvpUmtZle/lZWbG8q+t8="
@@ -15235,6 +15879,17 @@ license = [
 ]
 homepage = "https://github.com/jneug/typst-heroic"
 
+[hetvid."0.2.1"]
+url = "https://packages.typst.org/preview/hetvid-0.2.1.tar.gz"
+hash = "sha256-LoEFGE9I+RvuqNMh1dgIGIncMKpttWAAZr2JoUqHhAc="
+typstDeps = [
+    "zebraw_0_6_1",
+]
+description = "A template for light notes"
+license = [
+    "MIT-0",
+]
+
 [hetvid."0.2.0"]
 url = "https://packages.typst.org/preview/hetvid-0.2.0.tar.gz"
 hash = "sha256-WJUvjKgAIaxV9KSM9+nCuylTF00GNaGeO585vnokj9E="
@@ -15493,6 +16148,16 @@ license = [
 ]
 homepage = "https://github.com/mkpoli/hundouk"
 
+[husky-uw-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/husky-uw-thesis-0.1.0.tar.gz"
+hash = "sha256-6qvOQWECvn8OUVomxv8y8br5vT7Kd2/0ByWsD2nbSXs="
+typstDeps = []
+description = "Doctoral dissertation and master's thesis template for the University of Washington, Seattle"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/Yuan-Ru-Lin/husky-uw-thesis"
+
 [hy-dro-gen."0.1.2"]
 url = "https://packages.typst.org/preview/hy-dro-gen-0.1.2.tar.gz"
 hash = "sha256-Ri8wskUHxxhJ0gdbXoAz+jvEmBboPNwMWVS54N64efI="
@@ -15607,6 +16272,18 @@ license = [
 ]
 homepage = "https://github.com/tingerrr/hydra"
 
+[hydra."0.3.0"]
+url = "https://packages.typst.org/preview/hydra-0.3.0.tar.gz"
+hash = "sha256-znoyYAgFo/Gh6f0KVtVp8tsN2EQ+ANPFlXiLYQR2PXY="
+typstDeps = [
+    "oxifmt_0_2_0",
+]
+description = "Query and display headings of the currently active section"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tingerrr/hydra"
+
 [hydra."0.2.0"]
 url = "https://packages.typst.org/preview/hydra-0.2.0.tar.gz"
 hash = "sha256-lMSAwhFknlTsdnJF5tEGpBntQOVYfn0jTenncswx9I8="
@@ -15871,6 +16548,16 @@ license = [
 ]
 homepage = "https://github.com/ecstrema/iconify-typst"
 
+[icu-datetime."0.2.2"]
+url = "https://packages.typst.org/preview/icu-datetime-0.2.2.tar.gz"
+hash = "sha256-BCVK1SRYtAU+t7CJTpsYa/DZex4kG3wjtDiRPExLHoU="
+typstDeps = []
+description = "Date and time formatting using ICU4X via WASM"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Nerixyz/icu-typ"
+
 [icu-datetime."0.2.1"]
 url = "https://packages.typst.org/preview/icu-datetime-0.2.1.tar.gz"
 hash = "sha256-tPYkNbw69hil04Rz+iePcr1IabbWKpx/TXXukspvfqw="
@@ -16660,6 +17347,18 @@ license = [
 ]
 homepage = "https://github.com/euwbah/intextual"
 
+[intsketcher."0.5.0"]
+url = "https://packages.typst.org/preview/intsketcher-0.5.0.tar.gz"
+hash = "sha256-4pWeSY/zHRWzSVZ7JZiD7CW2i3Z2XLK1QqrzIWcAHKo="
+typstDeps = [
+    "cetz-plot_0_1_2",
+]
+description = "A package to draw Riemann sums and Darboux sums of functions"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/VincentTam/intsketcher"
+
 [invicta-thesis."1.1.0"]
 url = "https://packages.typst.org/preview/invicta-thesis-1.1.0.tar.gz"
 hash = "sha256-VJAA89Y1si6Tt0r/QygREJTDYQglXzpEBYSqe3AxDb0="
@@ -16690,6 +17389,21 @@ license = [
 ]
 homepage = "https://github.com/ad-si/invoice-maker"
 
+[invoice-pro."0.2.0"]
+url = "https://packages.typst.org/preview/invoice-pro-0.2.0.tar.gz"
+hash = "sha256-bV/9IGp/8gpOwOKmwDmpzNFMguvJbH1/UIgINtJQnHQ="
+typstDeps = [
+    "ibanator_0_1_0",
+    "letter-pro_3_0_0",
+    "loom_0_1_0",
+    "sepay_0_1_1",
+]
+description = "A professional, DIN 5008 compliant invoice template with automatic calculations and EPC-QR-Code (GiroCode) support"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/leonieziechmann/invoice-pro"
+
 [invoice-pro."0.1.1"]
 url = "https://packages.typst.org/preview/invoice-pro-0.1.1.tar.gz"
 hash = "sha256-KCj89MzlCmpdnKj4/62RgZzFLYKN6n9CnsCOvISWItU="
@@ -17825,6 +18539,16 @@ license = [
 ]
 homepage = "https://github.com/derekchai/typst-karnaugh-map"
 
+[k-mapper."1.1.0"]
+url = "https://packages.typst.org/preview/k-mapper-1.1.0.tar.gz"
+hash = "sha256-2sqjAMkjCwcgI4OOLfrzwyUc4Rx28EoPHxFeFfYB80E="
+typstDeps = []
+description = "A package to add Karnaugh maps into Typst projects"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/derekchai/typst-karnaugh-map"
+
 [k-mapper."1.0.0"]
 url = "https://packages.typst.org/preview/k-mapper-1.0.0.tar.gz"
 hash = "sha256-w8GanT6MurAkT3T6nKCWxLMIWwRxbsLSbGSCtcrOqAo="
@@ -18375,6 +19099,18 @@ license = [
 ]
 homepage = "https://github.com/HellOwhatAs/larnt/tree/master/examples/larnt_typst"
 
+[larrow."1.1.0"]
+url = "https://packages.typst.org/preview/larrow-1.1.0.tar.gz"
+hash = "sha256-i+Jly3WmG5cPyg4wym4FJH+fyEs0ZXvgfhlO0rYH+O0="
+typstDeps = [
+    "cetz_0_4_2",
+]
+description = "Draw and style arrows between labels"
+license = [
+    "MPL-2.0",
+]
+homepage = "https://github.com/Mambouna/larrow"
+
 [larrow."1.0.1"]
 url = "https://packages.typst.org/preview/larrow-1.0.1.tar.gz"
 hash = "sha256-zPQKqYvJ2RB8FL/FR0c2o2LsRxXAX+uTszpXZkR8DAY="
@@ -18758,6 +19494,18 @@ license = [
 ]
 homepage = "https://github.com/Marmare314/lemmify"
 
+[lemming."0.2.0"]
+url = "https://packages.typst.org/preview/lemming-0.2.0.tar.gz"
+hash = "sha256-g9mEhXhOtxu4ETuJ/kNylsegauyDnD67NL33DONA3jU="
+typstDeps = [
+    "elembic_1_1_1",
+]
+description = "Math environments working similar to native elements"
+license = [
+    "LGPL-3.0-only",
+]
+homepage = "https://codeberg.org/fgolke/typst-lemming"
+
 [lemming."0.1.0"]
 url = "https://packages.typst.org/preview/lemming-0.1.0.tar.gz"
 hash = "sha256-Ye59p77y96LgJ7w5nBHF0cLSlDjmTc6bpwibKQFY4YQ="
@@ -19504,6 +20252,16 @@ license = [
 ]
 homepage = "https://github.com/NanamiNakano/typst-mahou-cv"
 
+[malos-presets."1.2.0"]
+url = "https://packages.typst.org/preview/malos-presets-1.2.0.tar.gz"
+hash = "sha256-PziN2OFY6MAi5z73YaXJ8QBD+mAHm+6rX518lZhBQrc="
+typstDeps = []
+description = "A set of bare-bones presets"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/MDLC01/malos-presets"
+
 [malos-presets."1.1.0"]
 url = "https://packages.typst.org/preview/malos-presets-1.1.0.tar.gz"
 hash = "sha256-40CTWToCEvA6DocLLqfInPIaKE5fXRqMmLlmWenj0Yk="
@@ -19605,6 +20363,20 @@ license = [
 ]
 homepage = "https://github.com/ryuryu-ymj/mannot"
 
+[mannot."0.2.3"]
+url = "https://packages.typst.org/preview/mannot-0.2.3.tar.gz"
+hash = "sha256-FByqhbapg8hXEr2F+LsIz9chdNXLHoiOaotB6JxT+jE="
+typstDeps = [
+    "codly_1_2_0",
+    "tidy_0_4_0",
+    "tidy_0_4_2",
+]
+description = "A package for marking and annotating in math blocks"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ryuryu-ymj/mannot"
+
 [mannot."0.2.2"]
 url = "https://packages.typst.org/preview/mannot-0.2.2.tar.gz"
 hash = "sha256-RyfrlOhE3KfyWYAp2PaGVRKKk/k+phT356aXP5/Tpvk="
@@ -20222,6 +20994,16 @@ license = [
 ]
 homepage = "https://github.com/Vanille-N/meander.typ"
 
+[meander."0.3.1"]
+url = "https://packages.typst.org/preview/meander-0.3.1.tar.gz"
+hash = "sha256-qB+oxzZQycI08iUt2/H8QeZSScP9MUAwPj/xhwZKuIg="
+typstDeps = []
+description = "Page layout engine with image wrap-around and text threading"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Vanille-N/meander.typ"
+
 [meander."0.3.0"]
 url = "https://packages.typst.org/preview/meander-0.3.0.tar.gz"
 hash = "sha256-hK9ev0epq1+A88eU42uBLb4a5ZrjkT6k0lnoqUbSyiA="
@@ -21177,6 +21959,16 @@ license = [
     "MIT-0",
 ]
 
+[minimalyst-academic-report."0.1.0"]
+url = "https://packages.typst.org/preview/minimalyst-academic-report-0.1.0.tar.gz"
+hash = "sha256-qS6PDzA2nUxXkI5aPQkvXve5I/tbbxWjPwwN6tUZGZ0="
+typstDeps = []
+description = "A minimalyst report template for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/casemiromjm/report-template"
+
 [minitoc."0.1.0"]
 url = "https://packages.typst.org/preview/minitoc-0.1.0.tar.gz"
 hash = "sha256-4VtBpY3MKbWtGZIkKnbPVm17ChcV53/MgIj+AkZ/X6I="
@@ -21235,6 +22027,26 @@ license = [
 ]
 homepage = "https://github.com/Enter-tainer/mino"
 
+[mitex."0.2.7"]
+url = "https://packages.typst.org/preview/mitex-0.2.7.tar.gz"
+hash = "sha256-BG4csWQ2NjjXFIg+mHpTcdXURkR29x8eNugpiTwZpJ0="
+typstDeps = []
+description = "LaTeX support for Typst, powered by Rust and WASM"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/mitex-rs/mitex"
+
+[mitex."0.2.6"]
+url = "https://packages.typst.org/preview/mitex-0.2.6.tar.gz"
+hash = "sha256-u9wWAsK76NjJTDDxNtlp+vucB9Yiop0Sw2+kJyejRZM="
+typstDeps = []
+description = "LaTeX support for Typst, powered by Rust and WASM"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/mitex-rs/mitex"
+
 [mitex."0.2.5"]
 url = "https://packages.typst.org/preview/mitex-0.2.5.tar.gz"
 hash = "sha256-kvVQT22lWFLxlfXwWC9wWgZXVJMJEf63Uuzri0/NnqY="
@@ -21720,6 +22532,19 @@ license = [
 ]
 homepage = "https://github.com/Rsweater/cug-thesis-typst"
 
+[modern-cv."0.10.0"]
+url = "https://packages.typst.org/preview/modern-cv-0.10.0.tar.gz"
+hash = "sha256-6fDzsQyQvG/QZwVd2Kj6rXZ5BU9Go8rpOSEmEv1YmeA="
+typstDeps = [
+    "fontawesome_0_6_0",
+    "linguify_0_5_0",
+]
+description = "A modern resume template based on the Awesome-CV Latex template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ptsouchlos/modern-cv"
+
 [modern-cv."0.9.0"]
 url = "https://packages.typst.org/preview/modern-cv-0.9.0.tar.gz"
 hash = "sha256-WDxVubQ1UYDUnjMgpYTwbQQ+0QoP7Ya9ZfyKPBfkWtI="
@@ -22439,6 +23264,19 @@ license = [
 ]
 homepage = "https://github.com/nju-lug/modern-nju-thesis"
 
+[modern-npu-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/modern-npu-thesis-0.1.0.tar.gz"
+hash = "sha256-5vuE3wEkiGYCAGTO8ne5Ee8T1nEpdvFqAfc7fbrguW8="
+typstDeps = [
+    "cuti_0_4_0",
+    "i-figured_0_2_4",
+]
+description = "西北工业大学学位论文模板。Modern Northwestern Polytechnical University Thesis"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/1195343015/modern-npu-thesis"
+
 [modern-ovgu-fma-polylux."1.0.0"]
 url = "https://packages.typst.org/preview/modern-ovgu-fma-polylux-1.0.0.tar.gz"
 hash = "sha256-fUXLgeIVGYWXFntGeblVh3TuUw10qZ7Sa3DsG25e9rw="
@@ -22476,6 +23314,22 @@ license = [
     "MIT",
 ]
 
+[modern-pku-thesis."0.2.3"]
+url = "https://packages.typst.org/preview/modern-pku-thesis-0.2.3.tar.gz"
+hash = "sha256-OWW6ODad/WyhM7aU/pg5jpNWJBpqlMDsIob7YAA1V9g="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_10",
+    "cuti_0_4_0",
+    "gb7714-bilingual_0_2_3",
+    "itemize_0_2_0",
+]
+description = "Dissertation template for Peking University (PKU"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/pku-typst/pkuthss-typst"
+
 [modern-pku-thesis."0.2.2"]
 url = "https://packages.typst.org/preview/modern-pku-thesis-0.2.2.tar.gz"
 hash = "sha256-1DmuRw0jMKHJCZ87r/xFDZioOUthqzdEWDlLYadS/UE="
@@ -23815,6 +24669,42 @@ license = [
 ]
 homepage = "https://github.com/Woodman3/modern-ysu-thesis"
 
+[modern-zhaw-thesis."0.3.0"]
+url = "https://packages.typst.org/preview/modern-zhaw-thesis-0.3.0.tar.gz"
+hash = "sha256-/o1pv0ckiFgzB6MDW6ZI57lAV9BmXWEs+BChKyIDwUg="
+typstDeps = [
+    "biceps_0_0_1",
+    "codly_1_3_0",
+    "codly-languages_0_1_10",
+    "colorful-boxes_1_4_3",
+    "datify_1_0_1",
+    "tieflang_0_1_0",
+    "valkyrie_0_2_2",
+]
+description = "An unofficial template for ZHAW academic works, adapted from the official branding and guidelines"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/stanlrt/typst-zhaw-thesis"
+
+[modern-zhaw-thesis."0.2.0"]
+url = "https://packages.typst.org/preview/modern-zhaw-thesis-0.2.0.tar.gz"
+hash = "sha256-3dRaet0dVpcTG3jyKfrTOCia+QNh6/Wd6CeB1wZPk2c="
+typstDeps = [
+    "biceps_0_0_1",
+    "codly_1_3_0",
+    "codly-languages_0_1_10",
+    "colorful-boxes_1_4_3",
+    "datify_1_0_1",
+    "tieflang_0_1_0",
+    "valkyrie_0_2_2",
+]
+description = "An unofficial template for ZHAW academic works, adapted from the official branding and guidelines"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/stanlrt/typst-zhaw-thesis"
+
 [modern-zhaw-thesis."0.1.1"]
 url = "https://packages.typst.org/preview/modern-zhaw-thesis-0.1.1.tar.gz"
 hash = "sha256-daXByrs0DUSRmJNjtmyNUqeZZ7qJguoU9zeOSYA4g8Y="
@@ -24071,6 +24961,18 @@ license = [
 ]
 homepage = "https://github.com/jxpeng98/Typst-CV-Resume"
 
+[modiagram."0.1.0"]
+url = "https://packages.typst.org/preview/modiagram-0.1.0.tar.gz"
+hash = "sha256-MT7isp213FNeTFKHaUwrMB3IA5sbmTqUFscWl5dxDXE="
+typstDeps = [
+    "cetz_0_4_2",
+]
+description = "Draw molecular orbital and energy pathway diagrams"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/jonathandip/modiagram"
+
 [modpattern."0.1.0"]
 url = "https://packages.typst.org/preview/modpattern-0.1.0.tar.gz"
 hash = "sha256-v6B3MyZ2A15rjM/vQVrcViYNIduoW08KzrYyq9tkTRw="
@@ -24117,6 +25019,18 @@ license = [
 ]
 homepage = "https://github.com/rice8y/molchemist"
 
+[monet-touying-cdu."1.0.0"]
+url = "https://packages.typst.org/preview/monet-touying-cdu-1.0.0.tar.gz"
+hash = "sha256-a6iTNOes9nMw5x9JeHZfUt9qPy7C7AoPteVaHsVHxrI="
+typstDeps = [
+    "touying_0_7_0",
+]
+description = "Monet touying slide theme for CDU, unofficial"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/TPPPP72/monet-touying-cdu"
+
 [moodular."0.1.0"]
 url = "https://packages.typst.org/preview/moodular-0.1.0.tar.gz"
 hash = "sha256-DdYByRv7l7idU6PCXSjmfwr/yVlZYn/U8yvLIE1Q470="
@@ -24208,6 +25122,16 @@ license = [
 ]
 homepage = "https://github.com/frozolotl/muchpdf"
 
+[muddy-mit-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/muddy-mit-thesis-0.1.0.tar.gz"
+hash = "sha256-DrNLpbj4gGaMH8/NqHQQIE78wMJbE5hMpqSjKwIHvms="
+typstDeps = []
+description = "Typst port of the MIT mitthesis LaTeX template (v1.22). Produces a thesis document conforming to MIT Libraries dissertation formatting requirements"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/joshpoll/muddy-mit-thesis"
+
 [muw-community-templates."0.1.2"]
 url = "https://packages.typst.org/preview/muw-community-templates-0.1.2.tar.gz"
 hash = "sha256-GXzJq4ZXr4EZ66SOuLmFoImckiLMxHrfWIbB6aZMNW4="
@@ -24717,6 +25641,17 @@ license = [
 ]
 homepage = "https://github.com/edgaremy/neural-netz"
 
+[neural-viz."0.1.0"]
+url = "https://packages.typst.org/preview/neural-viz-0.1.0.tar.gz"
+hash = "sha256-GH+QcojXjViTr5v0qyCmu9px0b+/YZTk37tShRYKjW4="
+typstDeps = [
+    "cetz_0_4_2",
+]
+description = "Draw neural network architecture graphs with CeTZ"
+license = [
+    "MIT",
+]
+
 [nexus-tools."0.1.0"]
 url = "https://packages.typst.org/preview/nexus-tools-0.1.0.tar.gz"
 hash = "sha256-cmvim5LfDkcl1PoTRJLSOTnfQ5O0L49/3q7gPtk36o0="
@@ -25708,6 +26643,22 @@ license = [
 ]
 homepage = "https://github.com/jassielof/typst-packages"
 
+[ori."0.2.5"]
+url = "https://packages.typst.org/preview/ori-0.2.5.tar.gz"
+hash = "sha256-hpmpS9iYb4ApUCgF4SnGo9hJ4I7sIbdNbcaZvlVE6Bw="
+typstDeps = [
+    "cmarker_0_1_8",
+    "mitex_0_2_7",
+    "numbly_0_1_0",
+    "tablem_0_3_0",
+    "theorion_0_6_0",
+]
+description = "Simple enough but expressive template for notes, reports, and documents in Chinese and English"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/OrangeX4/typst-ori"
+
 [ori."0.2.4"]
 url = "https://packages.typst.org/preview/ori-0.2.4.tar.gz"
 hash = "sha256-Pz01wNoh7K6OXjlGyMKWs3hOjm5SGi7AM0tN51JBMz8="
@@ -26372,6 +27323,18 @@ license = [
 ]
 homepage = "https://github.com/ZaninDavide/patatrac"
 
+[patstdlib."0.3.1"]
+url = "https://packages.typst.org/preview/patstdlib-0.3.1.tar.gz"
+hash = "sha256-e7a8BoD5y8xbbcaCEmThUc1XCp907TPz8kRAXkJAJTg="
+typstDeps = [
+    "algorithmic_1_0_7",
+]
+description = "Some standard pieces I find useful: fonts, subfigures, algorithms, labeled enums, etc"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/patrick-kidger/patstdlib"
+
 [patstdlib."0.3.0"]
 url = "https://packages.typst.org/preview/patstdlib-0.3.0.tar.gz"
 hash = "sha256-/aNpCPP1nPQZ6qzlQG3whWpgki7wlCHrtzJuqEssqFY="
@@ -26561,6 +27524,16 @@ license = [
 ]
 homepage = "https://github.com/hackyardo/pdf-decorating"
 
+[peace-of-posters."0.6.0"]
+url = "https://packages.typst.org/preview/peace-of-posters-0.6.0.tar.gz"
+hash = "sha256-4KDZZC1KpHGEyV2AYpjKyBbSfQwS9EO5+cSpnS5/B3E="
+typstDeps = []
+description = "Create scientific posters in Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/jonaspleyer/peace-of-posters"
+
 [peace-of-posters."0.5.6"]
 url = "https://packages.typst.org/preview/peace-of-posters-0.5.6.tar.gz"
 hash = "sha256-oFZwuAptnhscrFLeJ3cjaZsIs1gbAMrxjkxKwwoMGmg="
@@ -26925,6 +27898,18 @@ license = [
 ]
 homepage = "https://github.com/alexanderkoller/pergamon"
 
+[perlit."0.0.2"]
+url = "https://packages.typst.org/preview/perlit-0.0.2.tar.gz"
+hash = "sha256-niI7WPCT9Zb5G+FuPupcGs52xG2fBHEM1bwp6cxuU+Y="
+typstDeps = [
+    "cetz_0_4_2",
+]
+description = "Render Obsidian graphs using CeTZ"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/lucaengelhard/perlit"
+
 [perlit."0.0.1"]
 url = "https://packages.typst.org/preview/perlit-0.0.1.tar.gz"
 hash = "sha256-VHDbrqe9OfHh8WzlwiuGrlMefoKDgyRnzWXgkPWVPPg="
@@ -27007,6 +27992,58 @@ license = [
 ]
 homepage = "https://gitlab.com/Jed_Hed/pf2e-typst"
 
+[phonokit."0.5.8"]
+url = "https://packages.typst.org/preview/phonokit-0.5.8.tar.gz"
+hash = "sha256-2jLw9i5b9S0un7T1p9ehm87i8DUTzL5u1TXIDXtXm5k="
+typstDeps = [
+    "cetz_0_5_0",
+    "lilaq_0_6_0",
+]
+description = "A toolkit to create phonological representations"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/guilhermegarcia/phonokit"
+
+[phonokit."0.5.7"]
+url = "https://packages.typst.org/preview/phonokit-0.5.7.tar.gz"
+hash = "sha256-MqvwnTfejS/BYWJaI7uG9Wej/hO9VqLTSrHcTooyOj0="
+typstDeps = [
+    "cetz_0_4_2",
+    "lilaq_0_6_0",
+]
+description = "A toolkit to create phonological representations"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/guilhermegarcia/phonokit"
+
+[phonokit."0.5.6"]
+url = "https://packages.typst.org/preview/phonokit-0.5.6.tar.gz"
+hash = "sha256-HHkoYVeV0WDYUK7ouAHXeTvNi7J2l7DfQnowaOOMXho="
+typstDeps = [
+    "cetz_0_4_2",
+    "lilaq_0_6_0",
+]
+description = "A toolkit to create phonological representations"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/guilhermegarcia/phonokit"
+
+[phonokit."0.5.5"]
+url = "https://packages.typst.org/preview/phonokit-0.5.5.tar.gz"
+hash = "sha256-bQjgAQah2b2ro08dk9eOd9oYZKhzTBWl51vhmwS61as="
+typstDeps = [
+    "cetz_0_4_2",
+    "lilaq_0_6_0",
+]
+description = "A toolkit to create phonological representations"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/guilhermegarcia/phonokit"
+
 [phonokit."0.5.4"]
 url = "https://packages.typst.org/preview/phonokit-0.5.4.tar.gz"
 hash = "sha256-ipAWdTe4nWzu3auXzXT6O4+QtmQ2V+fTFV3RZDED8z0="
@@ -27614,6 +28651,16 @@ license = [
 ]
 homepage = "https://github.com/daskol/typst-templates"
 
+[pixel-family."0.2.1"]
+url = "https://packages.typst.org/preview/pixel-family-0.2.1.tar.gz"
+hash = "sha256-Tr7b0u7ZcuUH5Qt+xPi9xo7jXnZLLL3ibQYeNXeM7bQ="
+typstDeps = []
+description = "Inline pixel art characters for Typst — drop them into text like emoji"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/GiggleLiu/pixel-family"
+
 [pixel-family."0.2.0"]
 url = "https://packages.typst.org/preview/pixel-family-0.2.0.tar.gz"
 hash = "sha256-hoVpbacTqtiYUyIs0gD5iIfza6hxny7Mh5W7TLTbz2I="
@@ -28273,6 +29320,22 @@ license = [
 ]
 homepage = "https://github.com/david-davies/typst-prooftree"
 
+[proteograph."0.2.2"]
+url = "https://packages.typst.org/preview/proteograph-0.2.2.tar.gz"
+hash = "sha256-J64mp+6p7wLsg5/E6at/kO7XqWXVbS7Xv50R0qb6n2c="
+typstDeps = [
+    "codly_1_3_0",
+    "fletcher_0_5_8",
+    "lilaq_0_6_0",
+    "tidy_0_4_3",
+    "tiptoe_0_4_0",
+]
+description = "A package to visualise proteomics data"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://codeberg.org/olangella/proteograph"
+
 [proteograph."0.2.1"]
 url = "https://packages.typst.org/preview/proteograph-0.2.1.tar.gz"
 hash = "sha256-Z5k5NVH6k4ZAApF2Ir6IhgVRRltKEhB52omrovdFqqE="
@@ -28726,6 +29789,20 @@ license = [
 ]
 homepage = "https://github.com/ivaquero/qooklet.git"
 
+[quati-abnt."0.0.2"]
+url = "https://packages.typst.org/preview/quati-abnt-0.0.2.tar.gz"
+hash = "sha256-1yccweNN/A+WEOnS9Il0pd5IlNahfrFwphuLHkWYEjU="
+typstDeps = [
+    "equate_0_3_2",
+    "glossarium_0_5_10",
+    "subpar_0_2_2",
+]
+description = "Documents according to the Associação Brasileira de Normas Técnicas (ABNT"
+license = [
+    "AGPL-3.0-or-later",
+]
+homepage = "https://github.com/gabdumal/quati_abnt"
+
 [quest."0.2.0"]
 url = "https://packages.typst.org/preview/quest-0.2.0.tar.gz"
 hash = "sha256-TMJqLaCC6mwmRtySX2ca0otiD38K5QGAMyz+XQTa2TU="
@@ -28824,6 +29901,16 @@ license = [
 ]
 homepage = "https://github.com/EpicEricEE/typst-quick-maths"
 
+[quick-minutes."1.2.5"]
+url = "https://packages.typst.org/preview/quick-minutes-1.2.5.tar.gz"
+hash = "sha256-HCoFX4vJfyBw/JFisxxlptnDqHgLQiEeB6UjqxqQQvI="
+typstDeps = []
+description = "A typst template for the keeping of minutes"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Lypsilonx/quick-minutes"
+
 [quick-minutes."1.2.4"]
 url = "https://packages.typst.org/preview/quick-minutes-1.2.4.tar.gz"
 hash = "sha256-KW6jq9N7KFY3rXXuhHgvuiqMXdwdiK/+ey9NUZ358Mg="
@@ -29106,6 +30193,18 @@ license = [
 ]
 homepage = "https://github.com/An-314/ratchet"
 
+[ratsch-bmim."0.2.0"]
+url = "https://packages.typst.org/preview/ratsch-bmim-0.2.0.tar.gz"
+hash = "sha256-aG9XVWA5pgf/bUz7Ujg0doWQriEravlzh38K4z6OcAA="
+typstDeps = [
+    "touying_0_7_1",
+]
+description = "Template for exams/labs/poster/lectures/reports/workbooks/exercises by IACE/BMIM at UMIT TIROL"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/umit-iace/typst-umit-tirol-bmim"
+
 [ready-acm-dtu-ux."0.1.0"]
 url = "https://packages.typst.org/preview/ready-acm-dtu-ux-0.1.0.tar.gz"
 hash = "sha256-iBPQniPBZ3CAbBU8z8atUeLkTWuMyeYh68Fz7L6InT4="
@@ -30009,6 +31108,16 @@ license = [
 ]
 homepage = "https://github.com/sudanchapagain/sano-presentation-template"
 
+[sanor."0.1.0"]
+url = "https://packages.typst.org/preview/sanor-0.1.0.tar.gz"
+hash = "sha256-YlQHwY84Cks/xV2bD/Bqn8uq3VZaKubqV/D1A+5uP9A="
+typstDeps = []
+description = "Fast, small, presentation animation utility"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/pacaunt/sanor"
+
 [scaffolder."0.2.1"]
 url = "https://packages.typst.org/preview/scaffolder-0.2.1.tar.gz"
 hash = "sha256-C1/wct+NAtulHWopZsztNcAUpX/0+opIknzehNLSKRs="
@@ -30402,6 +31511,18 @@ license = [
 ]
 homepage = "https://github.com/curvenote/scienceicons"
 
+[scorify."0.2.0"]
+url = "https://packages.typst.org/preview/scorify-0.2.0.tar.gz"
+hash = "sha256-FwdPe6a4s4ujOveN+j8B+LfG7z4t8q4XIAf28zF5C5g="
+typstDeps = [
+    "cetz_0_4_2",
+]
+description = "Render professional sheet music directly in Typst documents"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/justinbornais/typst-sheet-music"
+
 [scorify."0.1.1"]
 url = "https://packages.typst.org/preview/scorify-0.1.1.tar.gz"
 hash = "sha256-9US9SJ29B1Hf2JHONuV9qhXajkRvV0O2cXxlNnQHomQ="
@@ -30414,6 +31535,26 @@ license = [
 ]
 homepage = "https://github.com/justinbornais/typst-sheet-music"
 
+[scoryst."0.1.1"]
+url = "https://packages.typst.org/preview/scoryst-0.1.1.tar.gz"
+hash = "sha256-ZVrgcpFE7Q0/p903r08EUCbi/SY6PIYnfThkyRbF4nU="
+typstDeps = []
+description = "🎼 Music engraving for Typst via Verovio — render ABC, MusicXML, MEI, Humdrum, Volpiano, and CMME notation"
+license = [
+    "LGPL-3.0-only",
+]
+homepage = "https://github.com/bernsteining/scoryst"
+
+[scoryst."0.1.0"]
+url = "https://packages.typst.org/preview/scoryst-0.1.0.tar.gz"
+hash = "sha256-cwm4VB8UEvTz3C6drXjj7HpmV1xaHCrsXhVQJyDE5Wo="
+typstDeps = []
+description = "🎼 Music engraving for Typst via Verovio — render ABC, MusicXML, MEI, Humdrum, Volpiano, and CMME notation"
+license = [
+    "LGPL-3.0-only",
+]
+homepage = "https://github.com/bernsteining/scoryst"
+
 [scribbling-hm."0.1.9"]
 url = "https://packages.typst.org/preview/scribbling-hm-0.1.9.tar.gz"
 hash = "sha256-sp6RZGCZZ8i/qZJgLl/j+Q069yZPZ9UD60jfyJ75/cQ="
@@ -30597,6 +31738,16 @@ license = [
 ]
 homepage = "https://github.com/An-314/typst-templates"
 
+[scriptie."0.2.0"]
+url = "https://packages.typst.org/preview/scriptie-0.2.0.tar.gz"
+hash = "sha256-2rrcQsFIP9blfNMtBpQKrJS5BKhhaSyhXNf19W9p9Rs="
+typstDeps = []
+description = "A template for movie scripts"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/KauriP/scriptie"
+
 [scriptie."0.1.0"]
 url = "https://packages.typst.org/preview/scriptie-0.1.0.tar.gz"
 hash = "sha256-sEhEcrk54x8mZX6qp02MPrBDBs3+pawtKCAoNm+Gpws="
@@ -31066,6 +32217,16 @@ license = [
 ]
 homepage = "https://github.com/shaneworld/HHU-Thesis-Template"
 
+[sheetstorm."0.5.1"]
+url = "https://packages.typst.org/preview/sheetstorm-0.5.1.tar.gz"
+hash = "sha256-3d1qePFO6T7eyg7AoFzx5epb7qFo8VS5J8+VqX1cXsI="
+typstDeps = []
+description = "A template for assignment sheets"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/rabuu/sheetstorm"
+
 [sheetstorm."0.5.0"]
 url = "https://packages.typst.org/preview/sheetstorm-0.5.0.tar.gz"
 hash = "sha256-EyZ/QsoLeie4iMe9ADajr7CdiZjWtgMODPUq3N6EmuM="
@@ -31258,6 +32419,16 @@ license = [
 ]
 homepage = "https://github.com/Myriad-Dreamin/shiroa"
 
+[shit-journal."0.1.0"]
+url = "https://packages.typst.org/preview/shit-journal-0.1.0.tar.gz"
+hash = "sha256-vKTVkwQe/79VwU3NbS8YD2ZM18TTA8EjmMp0DRMdkKE="
+typstDeps = []
+description = "Write your articles for the SHIT journal"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/QzxTaqtaq/shit-typst-template"
+
 [showman."0.1.2"]
 url = "https://packages.typst.org/preview/showman-0.1.2.tar.gz"
 hash = "sha256-3Ueq4axPi/YUoqI9yUUfiz7MXBQhxr1Vm+h6s7v0UoM="
@@ -31878,6 +33049,16 @@ license = [
 ]
 homepage = "https://github.com/zhao-leo/BUPT-Report-Typst"
 
+[simple-cvut-report."0.2.0"]
+url = "https://packages.typst.org/preview/simple-cvut-report-0.2.0.tar.gz"
+hash = "sha256-kmtCoNO2j8pEXAk1wNaCwZzyNlh/aQbqZLVaugw5zDo="
+typstDeps = []
+description = "A simple report template for ČVUT (CTU in Prague) students and their for term projects"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/firu11/cvut-report-template"
+
 [simple-handout."0.2.0"]
 url = "https://packages.typst.org/preview/simple-handout-0.2.0.tar.gz"
 hash = "sha256-+l3MCh76AsRrmA6SF+EgfZWxRMkrflmSRVaao7n1L9o="
@@ -33002,6 +34183,39 @@ license = [
 ]
 homepage = "https://github.com/SillyFreak/typst-stack-pointer"
 
+[stagehand."0.1.0"]
+url = "https://packages.typst.org/preview/stagehand-0.1.0.tar.gz"
+hash = "sha256-gKT0JP+yAYFaBmt8b5wfAjQ0gyQB0NbCmXAcz3Yn+UQ="
+typstDeps = []
+description = "Easily create beautiful stageplays"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/aarquelle/stagehand"
+
+[starchy-junia."0.1.8"]
+url = "https://packages.typst.org/preview/starchy-junia-0.1.8.tar.gz"
+hash = "sha256-0ZJLmkdzn1KR63jChZmESVWHm+ldevEvW34731jkiKs="
+typstDeps = [
+    "cetz_0_5_0",
+    "codly_1_3_0",
+    "codly-languages_0_1_10",
+    "drafting_0_2_2",
+    "echarm_0_3_1",
+    "fletcher_0_5_8",
+    "glossarium_0_5_10",
+    "hydra_0_6_2",
+    "lilaq_0_6_0",
+    "meander_0_4_2",
+    "timeliney_0_4_0",
+    "zap_0_5_0",
+]
+description = "Report template based on JUNIA engineering school's writing charter V2 (2024"
+license = [
+    "MIT",
+]
+homepage = "https://codeberg.org/MathYeiv/starchy-junia"
+
 [starry-ulfg."0.2.0"]
 url = "https://packages.typst.org/preview/starry-ulfg-0.2.0.tar.gz"
 hash = "sha256-8526Y+PnNM2eRYEpkO/0w+TfxuZOgMUEoa4H4AATH+4="
@@ -33361,6 +34575,16 @@ license = [
 ]
 homepage = "https://github.com/bratorange/stundenzettel.typ"
 
+[stux-assignment."0.1.0"]
+url = "https://packages.typst.org/preview/stux-assignment-0.1.0.tar.gz"
+hash = "sha256-7qkb7vKlmuuey9x9kbYwJ7iCRNu3qjEUY4Lxpqi1Bq4="
+typstDeps = []
+description = "Themed assignment sheets with problem boxes and multi-author support"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/StuxnetH4X/stux-assignment"
+
 [stv-vub-huisstijl."0.1.1"]
 url = "https://packages.typst.org/preview/stv-vub-huisstijl-0.1.1.tar.gz"
 hash = "sha256-7D5VZAk+sdzSk98TmLmDPmNOMsN6t/r7AqaReoTIbPk="
@@ -34002,6 +35226,18 @@ license = [
 ]
 homepage = "https://github.com/sardorml/swe-cv"
 
+[swec-slides."0.1.0"]
+url = "https://packages.typst.org/preview/swec-slides-0.1.0.tar.gz"
+hash = "sha256-/OF/nW/zuyjSWpEyp7ZVYL4QW70sPDRhIB39R54HhP8="
+typstDeps = [
+    "polylux_0_4_0",
+]
+description = "A typst template for SoftWare Engineering Camp (SWEC) presentations"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Gronner/swec-slide-template"
+
 [sweet-graduate-resume."0.1.0"]
 url = "https://packages.typst.org/preview/sweet-graduate-resume-0.1.0.tar.gz"
 hash = "sha256-i13rCZCzw+/HLyV3nDRVSG0ZlYbY4HvxNuNrtms6BwY="
@@ -34042,6 +35278,30 @@ license = [
 ]
 homepage = "https://codeberg.org/T0mstone/typst-symbolx"
 
+[synkit."0.0.2"]
+url = "https://packages.typst.org/preview/synkit-0.0.2.tar.gz"
+hash = "sha256-tmz3Xh8nTb0Ru/QKYoGzNVCdelk0OSl14VCT9D1JBNI="
+typstDeps = [
+    "cetz_0_5_0",
+]
+description = "A toolkit to create syntactic representations in Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/guilhermegarcia/synkit"
+
+[synkit."0.0.1"]
+url = "https://packages.typst.org/preview/synkit-0.0.1.tar.gz"
+hash = "sha256-QbzuYxK9Vj+xqMfJVX1LAoE0MrPd+EKPol/qH9Tmm8A="
+typstDeps = [
+    "cetz_0_4_2",
+]
+description = "A toolkit to create syntactic representations in Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/guilhermegarcia/synkit"
+
 [syntree."0.2.1"]
 url = "https://packages.typst.org/preview/syntree-0.2.1.tar.gz"
 hash = "sha256-rKNxgn7PtqeDPBnDH3hD9HQrB85JeO9uiM5g0m2LDPs="
@@ -34739,6 +35999,18 @@ license = [
 ]
 homepage = "https://github.com/YDX-2147483647/best-of-typst"
 
+[tdtr."0.5.5"]
+url = "https://packages.typst.org/preview/tdtr-0.5.5.tar.gz"
+hash = "sha256-SM3QlgwakNDDa8jZhhqaKjlREgmTOqIT3ON/4geQ8fo="
+typstDeps = [
+    "fletcher_0_5_8",
+]
+description = "A package for drawing beautiful tidy tree easily"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Vertsineu/typst-tdtr"
+
 [tdtr."0.5.4"]
 url = "https://packages.typst.org/preview/tdtr-0.5.4.tar.gz"
 hash = "sha256-Lh0oxPOAiYZfCmvpwjY2F3Qm0ogXW0lTPblN2WBNFSI="
@@ -34992,6 +36264,19 @@ license = [
 ]
 homepage = "https://codeberg.org/Andrew15-5/text-dirr"
 
+[tfgei."0.1.2"]
+url = "https://packages.typst.org/preview/tfgei-0.1.2.tar.gz"
+hash = "sha256-eW0AZ40L9IcQTsj6hSqNuSqukouI5Mb4FrjY8ctxPrQ="
+typstDeps = [
+    "physica_0_9_8",
+    "unify_0_7_1",
+]
+description = "Template for making final degree projects in the Computer Science degree at ESEI (University of Vigo"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Kioraga/TFGEI"
+
 [tfgei."0.1.1"]
 url = "https://packages.typst.org/preview/tfgei-0.1.1.tar.gz"
 hash = "sha256-Nk6JvmcFqpEMUGjyVOr6S6Pw4H0mT/YTWl3mpK+wG+s="
@@ -35317,6 +36602,19 @@ license = [
 ]
 homepage = "https://github.com/nleanba/typst-theoretic"
 
+[theorion."0.6.0"]
+url = "https://packages.typst.org/preview/theorion-0.6.0.tar.gz"
+hash = "sha256-lss2hve/k1X6OTZHLSMS+WiZVy4EIhl77hfeYFj9UwY="
+typstDeps = [
+    "octique_0_1_1",
+    "showybox_2_0_4",
+]
+description = "Out-of-the-box, customizable and multilingual theorem environment package"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/OrangeX4/typst-theorion"
+
 [theorion."0.5.0"]
 url = "https://packages.typst.org/preview/theorion-0.5.0.tar.gz"
 hash = "sha256-noK5xvxOL7KSAVUA6TPjdb+gOlxdys2Hac4UTKviLEM="
@@ -36399,6 +37697,36 @@ license = [
 ]
 homepage = "https://codeberg.org/a5s/toot"
 
+[touying."0.7.2"]
+url = "https://packages.typst.org/preview/touying-0.7.2.tar.gz"
+hash = "sha256-Msyfdep3OLVhM1IeTtIdLDRTDrY+KiM1zxFGuH9cbv0="
+typstDeps = [
+    "cetz_0_5_0",
+    "fletcher_0_5_8",
+    "numbly_0_1_0",
+    "theorion_0_6_0",
+]
+description = "A powerful package for creating presentation slides in Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/touying-typ/touying"
+
+[touying."0.7.1"]
+url = "https://packages.typst.org/preview/touying-0.7.1.tar.gz"
+hash = "sha256-rzJvQX4mOWzOemEnSYd8KVipD6owYErL8BIQaw4RToE="
+typstDeps = [
+    "cetz_0_4_2",
+    "fletcher_0_5_8",
+    "numbly_0_1_0",
+    "theorion_0_5_0",
+]
+description = "A powerful package for creating presentation slides in Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/touying-typ/touying"
+
 [touying."0.7.0"]
 url = "https://packages.typst.org/preview/touying-0.7.0.tar.gz"
 hash = "sha256-t4LnzU+reUaYCwMDS1iQdk3JhORomGRe9ByOxTHupHY="
@@ -36691,6 +38019,30 @@ license = [
 ]
 homepage = "https://github.com/touying-typ/touying"
 
+[touying-aqua."0.7.2"]
+url = "https://packages.typst.org/preview/touying-aqua-0.7.2.tar.gz"
+hash = "sha256-up7pTwMd3Dslp2vYAp9ks8orHG/v8i+xwl9QmIW6OWU="
+typstDeps = [
+    "touying_0_7_2",
+]
+description = "Aqua theme in Touying - a powerful package for creating presentation slides in Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/touying-typ/touying"
+
+[touying-aqua."0.7.1"]
+url = "https://packages.typst.org/preview/touying-aqua-0.7.1.tar.gz"
+hash = "sha256-lkbOs64v/jIOT8yyr/H3cAY/aCS6m99mcGPK/9doq6M="
+typstDeps = [
+    "touying_0_7_1",
+]
+description = "Aqua theme in Touying - a powerful package for creating presentation slides in Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/touying-typ/touying"
+
 [touying-aqua."0.7.0"]
 url = "https://packages.typst.org/preview/touying-aqua-0.7.0.tar.gz"
 hash = "sha256-fBF3H0ozQSmUKXQj8QXOiwVumWXia29cNNV0PURoaas="
@@ -37201,6 +38553,20 @@ license = [
 ]
 homepage = "https://github.com/kazuyanagimoto/quarto-clean-typst"
 
+[touying-quick."0.4.2"]
+url = "https://packages.typst.org/preview/touying-quick-0.4.2.tar.gz"
+hash = "sha256-OJtyk4nIMIFZD5YR4g47FxJ5eq9VJudhDcfS+wQWkBI="
+typstDeps = [
+    "codly_1_3_0",
+    "theorion_0_6_0",
+    "touying_0_7_1",
+]
+description = "A quick-start template based on touying for academic reports"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ivaquero/touying-quick.git"
+
 [touying-quick."0.4.1"]
 url = "https://packages.typst.org/preview/touying-quick-0.4.1.tar.gz"
 hash = "sha256-NcGth1yAhjdpyBaFZb89QQAdweCVPL2z7GCgMRGiSbE="
@@ -37811,6 +39177,30 @@ license = [
 ]
 homepage = "https://github.com/8LWXpg/typst-treet"
 
+[tressym-dnd."0.2.4"]
+url = "https://packages.typst.org/preview/tressym-dnd-0.2.4.tar.gz"
+hash = "sha256-XfjJyCADU1mj05EC6zgggVeeSOP7EDH4YX+z/mWek50="
+typstDeps = [
+    "one-liner_0_3_0",
+]
+description = "Render Character Sheets for DnD 5e, with auto-calculated stats. (Unofficial"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/b3sser/typst-tressym"
+
+[tressym-dnd."0.2.3"]
+url = "https://packages.typst.org/preview/tressym-dnd-0.2.3.tar.gz"
+hash = "sha256-u3SDdez69FrDZtt96vEGCPfZ7ZIgBc7tbXxXtq8UX2c="
+typstDeps = [
+    "one-liner_0_3_0",
+]
+description = "Render Character Sheets for DnD 5e, with auto-calculated stats. (Unofficial"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/b3sser/typst-tressym"
+
 [tricorder."0.1.0"]
 url = "https://packages.typst.org/preview/tricorder-0.1.0.tar.gz"
 hash = "sha256-1yVjrzof0APO5F+C3ManqTSJOVzHasnrVeeTHmmXgag="
@@ -37831,6 +39221,19 @@ license = [
 ]
 homepage = "https://github.com/mkorje/typst-trivial"
 
+[trompet."0.1.0"]
+url = "https://packages.typst.org/preview/trompet-0.1.0.tar.gz"
+hash = "sha256-+k8BaciQPep4Djb/vzCkGmrCSwVNMtbMZWEjhMPjtKs="
+typstDeps = [
+    "lambdabus_0_1_0",
+    "tidy_0_4_3",
+]
+description = "Draw Tromp lambda diagrams"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/CrowdingFaun624/trompet"
+
 [truthfy."0.6.0"]
 url = "https://packages.typst.org/preview/truthfy-0.6.0.tar.gz"
 hash = "sha256-pKDdJvrAIekPB+x6GWXrQDC6n20kqH5ayGriaIsHPUw="
@@ -38429,6 +39832,16 @@ license = [
 ]
 homepage = "https://github.com/sgomezsal/typ2anki"
 
+[typarium."0.1.0"]
+url = "https://packages.typst.org/preview/typarium-0.1.0.tar.gz"
+hash = "sha256-rRKWJF/Bat+iZd32vu8Gl523R4BwNpM+o8lTy4u17Yk="
+typstDeps = []
+description = "Build expressive font specimen cards with custom themes, custom renderers, and local font metadata extraction"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/rice8y/typarium"
+
 [typcas."0.2.1"]
 url = "https://packages.typst.org/preview/typcas-0.2.1.tar.gz"
 hash = "sha256-LETXer/gauB+dgLWHeKMJcwsUcFrBaromCaVl6t/4gY="
@@ -38529,6 +39942,16 @@ license = [
 ]
 homepage = "https://github.com/tsnobip/typst-typographic-resume"
 
+[typographix-polytechnique-reports."0.2.1"]
+url = "https://packages.typst.org/preview/typographix-polytechnique-reports-0.2.1.tar.gz"
+hash = "sha256-ZG/Jcp/PJvnggPEbOmTYJv2H/LhzwvbHwRRldgZrQIM="
+typstDeps = []
+description = "A report template for Polytechnique students (from TypographiX"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/remigerme/typst-polytechnique"
+
 [typographix-polytechnique-reports."0.1.6"]
 url = "https://packages.typst.org/preview/typographix-polytechnique-reports-0.1.6.tar.gz"
 hash = "sha256-5CqgNPzNFxwfuEFT4HVc7uG/vN3r/S2mueo5pR8o9Ak="
@@ -38778,6 +40201,16 @@ license = [
 ]
 homepage = "https://github.com/Typsium/typsium-iso-7010"
 
+[typslides."1.3.3"]
+url = "https://packages.typst.org/preview/typslides-1.3.3.tar.gz"
+hash = "sha256-SQjEYkgh5HcmPkVbp04IWdTmM6VsiHhFTMN0wTp2S1g="
+typstDeps = []
+description = "Minimalistic Typst slides"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/manjavacas/typslides"
+
 [typslides."1.3.2"]
 url = "https://packages.typst.org/preview/typslides-1.3.2.tar.gz"
 hash = "sha256-fYS5iHfwuxhyPopdCcwTa/XNA62Ll1us0ga8nO1YpEY="
@@ -39140,6 +40573,16 @@ license = [
 ]
 homepage = "https://github.com/jorgenhost/ucph-nielsine-touying"
 
+[uepg-tcc-unofficial."0.1.0"]
+url = "https://packages.typst.org/preview/uepg-tcc-unofficial-0.1.0.tar.gz"
+hash = "sha256-HxXV10cdRPEU05qhfnYVyOV3aBY6j80KmUTk9PXYzRs="
+typstDeps = []
+description = "Unofficial ABNT-compliant monograph template for UEPG undergraduate theses"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ekspy/uepg-tcc-unofficial"
+
 [ufpr-unofficial."2022.1.0"]
 url = "https://packages.typst.org/preview/ufpr-unofficial-2022.1.0.tar.gz"
 hash = "sha256-2KX4g+17pfzxEg9DJiQKnpmn+C8fzYvjvg4vv+UWbf0="
@@ -39230,6 +40673,17 @@ license = [
 ]
 homepage = "https://github.com/typst/templates"
 
+[unichar."0.4.0"]
+url = "https://packages.typst.org/preview/unichar-0.4.0.tar.gz"
+hash = "sha256-lxUhgjs+n64yqG15Ao2NXnTaBZ1IFeuJKLaBP4eSCIw="
+typstDeps = []
+description = "A partial port of the Unicode Character Database"
+license = [
+    "MIT",
+    "Unicode-3.0",
+]
+homepage = "https://github.com/MDLC01/unichar"
+
 [unichar."0.3.2"]
 url = "https://packages.typst.org/preview/unichar-0.3.2.tar.gz"
 hash = "sha256-YzL7rS0YtuMSMntb+akWpEqaLlP3zWZtKmnGyfhjaT4="
@@ -39285,6 +40739,30 @@ license = [
 ]
 homepage = "https://github.com/MDLC01/unichar"
 
+[unidep."0.1.3"]
+url = "https://packages.typst.org/preview/unidep-0.1.3.tar.gz"
+hash = "sha256-5bKKv7Z+t+5GyzA/ZlT9jBKOQO/Z6H6VOpgENS7eNpo="
+typstDeps = [
+    "cetz_0_5_0",
+]
+description = "Render beautiful, customizable Universal Dependencies (CoNLL-U) dependency trees"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/rice8y/unidep"
+
+[unidep."0.1.2"]
+url = "https://packages.typst.org/preview/unidep-0.1.2.tar.gz"
+hash = "sha256-RH0z+cJ1RREPjVxIxj53YvOxyJFBo9Q3fuAHpDdJ3bs="
+typstDeps = [
+    "cetz_0_4_2",
+]
+description = "Render beautiful, customizable Universal Dependencies (CoNLL-U) dependency trees"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/rice8y/unidep"
+
 [unidep."0.1.1"]
 url = "https://packages.typst.org/preview/unidep-0.1.1.tar.gz"
 hash = "sha256-CiVBJNspKQ0JoQaiP6CmLKxT8uD1rAXXpykq1+LKkqA="
@@ -39519,6 +40997,26 @@ license = [
 ]
 homepage = "https://github.com/islatri/universal-jlu-thesis"
 
+[uniwarn."0.1.1"]
+url = "https://packages.typst.org/preview/uniwarn-0.1.1.tar.gz"
+hash = "sha256-sTGerNf9eBuuvl20yytfvQulfWiU5gtPZOB6GK0M0ho="
+typstDeps = []
+description = "A miniscule package for package authors to emit custom warnings"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/fornings-typ/font-warnings"
+
+[uniwarn."0.1.0"]
+url = "https://packages.typst.org/preview/uniwarn-0.1.0.tar.gz"
+hash = "sha256-M6DTbwFxi3WaWBqaZYKLDCUkQcMFPKd6MYYU+air1V4="
+typstDeps = []
+description = "A miniscule package for package authors to emit custom warnings"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/fornings-typ/font-warnings"
+
 [unofficial-cambridge-polylux-theme."0.0.1"]
 url = "https://packages.typst.org/preview/unofficial-cambridge-polylux-theme-0.0.1.tar.gz"
 hash = "sha256-A3AoCb4MmtXdk3+IzGuJ5bYqMbbQaPtLuZvUeuu9xr0="
@@ -39566,6 +41064,16 @@ license = [
 ]
 homepage = "https://github.com/bowentan/unofficial-cityuhk-thesis"
 
+[unofficial-eirb-report."0.1.0"]
+url = "https://packages.typst.org/preview/unofficial-eirb-report-0.1.0.tar.gz"
+hash = "sha256-OWXJnI5aupNPdgghp1udJvav66AUK8wvVE6NdgVep+c="
+typstDeps = []
+description = "An unofficial report template for Enseirb-Matmeca"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/floriandelage/report-eirb"
+
 [unofficial-fhict-document-template."1.2.1"]
 url = "https://packages.typst.org/preview/unofficial-fhict-document-template-1.2.1.tar.gz"
 hash = "sha256-DheR1h7nBjWV6AieSv4KBbgae8Qc7F9L4lrxwIeAyLE="
@@ -39810,6 +41318,16 @@ license = [
 ]
 homepage = "https://github.com/AnsgarLichter/unofficial-hka-thesis"
 
+[unofficial-icl-doc-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/unofficial-icl-doc-thesis-0.1.0.tar.gz"
+hash = "sha256-x7pTlMJhcegPQWeSYGYIhYY6GUkgxFRKcm9N8m4YZmw="
+typstDeps = []
+description = "Unofficial Typst port of the Imperial College London Department of Computing Individual Project LaTeX template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/bkmashiro/ic-individual-project-typst"
+
 [unofficial-kth-thesis-proposal."0.2.0"]
 url = "https://packages.typst.org/preview/unofficial-kth-thesis-proposal-0.2.0.tar.gz"
 hash = "sha256-vLgD9GuMEqlbXicFiXnognYOwEkOGq/iNJb+P35gSTk="
@@ -40499,6 +42017,16 @@ license = [
 ]
 homepage = "https://github.com/ertugruluyar-github/utype-neuies-reports"
 
+[uuidkit."0.1.0"]
+url = "https://packages.typst.org/preview/uuidkit-0.1.0.tar.gz"
+hash = "sha256-hsCX3HOSc5eThe80qhaAhb+oAILfRuI6kLYGmcC1Bck="
+typstDeps = []
+description = "UUID parsing and deterministic UUID generation for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/el-ev/uuidkit"
+
 [uwnibook-color."0.2.0"]
 url = "https://packages.typst.org/preview/uwnibook-color-0.2.0.tar.gz"
 hash = "sha256-6gp2NjsS7phGA0k3yY8WmH5/VF4Ejh1E5ZlaChs9lTo="
@@ -41675,6 +43203,16 @@ license = [
 ]
 homepage = "https://github.com/0warning0error/typst-yats"
 
+[yemianfengge."0.1.0"]
+url = "https://packages.typst.org/preview/yemianfengge-0.1.0.tar.gz"
+hash = "sha256-UwzwwaW0aoWdAX9NeiaieeBs1nfPn8dZoXMYAOeMwAY="
+typstDeps = []
+description = "Page style management"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/neruthes/typstpkg-pagestyle"
+
 [yi."0.1.0"]
 url = "https://packages.typst.org/preview/yi-0.1.0.tar.gz"
 hash = "sha256-aqMg2N5/v9EUnJPxnKmeop33n3F57r99ARWSwgADStk="
@@ -42046,6 +43584,16 @@ license = [
 ]
 homepage = "https://github.com/langonne/zen-utbm-report"
 
+[zen-zine."0.3.1"]
+url = "https://packages.typst.org/preview/zen-zine-0.3.1.tar.gz"
+hash = "sha256-7z+JjOuwq80dsFub3XY9NiEL+WUZ1jKudoAEVPyFsp4="
+typstDeps = []
+description = "Excellently type-set a fun little zine"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tomeichlersmith/zen-zine"
+
 [zen-zine."0.3.0"]
 url = "https://packages.typst.org/preview/zen-zine-0.3.0.tar.gz"
 hash = "sha256-dfYg9l75BqJZ75KXQ7sy7pTmU0bwsLyCfsDdCFjfs0Y="
diff --git a/pkgs/by-name/ty/tyrolienne/package.nix b/pkgs/by-name/ty/tyrolienne/package.nix
index 5755a66a995c..961eb5663bfa 100644
--- a/pkgs/by-name/ty/tyrolienne/package.nix
+++ b/pkgs/by-name/ty/tyrolienne/package.nix
@@ -15,17 +15,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tyrolienne";
-  version = "1.2.0";
+  version = "1.2.2";
 
   src = fetchFromGitea {
     domain = "git.uku3lig.net";
     owner = "uku";
     repo = "tyrolienne";
     tag = finalAttrs.version;
-    hash = "sha256-jl1h7L+Ae28A7YFoIsQqxbx2XmxxjUHebD5Xba0cB5o=";
+    hash = "sha256-JdXamx+pwUEJWSbPFvROrx/XJojZ5sC+MEH0QVpKD+Y=";
   };
 
-  cargoHash = "sha256-J/gS8tyy+5ZG1xl4NrYCU26lD0yvsVyRUoOXntCgVSE=";
+  cargoHash = "sha256-JM4Y0FyqVYqChpPh9p/QulfV8IesUJ0p/ooxAJLfo6I=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/uc/ucblogo/package.nix b/pkgs/by-name/uc/ucblogo/package.nix
index 53c2893ccfc9..dd64a4581d8b 100644
--- a/pkgs/by-name/uc/ucblogo/package.nix
+++ b/pkgs/by-name/uc/ucblogo/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ucblogo-code";
-  version = "6.2.4";
+  version = "6.2.5";
 
   src = fetchFromGitHub {
     owner = "jrincayc";
     repo = "ucblogo-code";
-    rev = "ca23b30a62eaaf03ea203ae71d00dc45a046514e";
-    hash = "sha256-BVNKkT0YUqI/z5W6Y/u3WbrHmaw7Z165vFt/mlzjd+8=";
+    tag = "version_${finalAttrs.version}";
+    hash = "sha256-QofC7G6IS5TNxwRm23uhuThLou05etGuG/S3Wm29yUI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/uc/ucc/package.nix b/pkgs/by-name/uc/ucc/package.nix
index d4470dbde4be..ae59eabb2cf3 100644
--- a/pkgs/by-name/uc/ucc/package.nix
+++ b/pkgs/by-name/uc/ucc/package.nix
@@ -40,13 +40,13 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   pname = "ucc";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "openucx";
     repo = "ucc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xt138R3lSArfkxi/qJgR2xMlhhtm0hAwIUZBLpwFwvc=";
+    hash = "sha256-YGvagagGcG6Jiy5VppnfdZ03Sb5+5dYU6NV+RS/KnHY=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ud/udunits/package.nix b/pkgs/by-name/ud/udunits/package.nix
index 1356976271fc..d87e75af72dc 100644
--- a/pkgs/by-name/ud/udunits/package.nix
+++ b/pkgs/by-name/ud/udunits/package.nix
@@ -32,6 +32,10 @@ stdenv.mkDerivation {
     expat
   ];
 
+  configureFlags = [
+    "CFLAGS=-std=gnu17"
+  ];
+
   meta = {
     homepage = "https://www.unidata.ucar.edu/software/udunits/";
     description = "C-based package for the programatic handling of units of physical quantities";
diff --git a/pkgs/by-name/uh/uhttpd/package.nix b/pkgs/by-name/uh/uhttpd/package.nix
index c5293b422df7..3c02e8ec259a 100644
--- a/pkgs/by-name/uh/uhttpd/package.nix
+++ b/pkgs/by-name/uh/uhttpd/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   lua5_1,
   json_c,
-  libubox-wolfssl,
+  libubox,
   ubus,
   libxcrypt,
   unstableGitUpdater,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     lua5_1
     json_c
-    libubox-wolfssl
+    libubox
     ubus
     libxcrypt
   ];
diff --git a/pkgs/by-name/un/undock/package.nix b/pkgs/by-name/un/undock/package.nix
index a85ed09323ce..16965a873d9b 100644
--- a/pkgs/by-name/un/undock/package.nix
+++ b/pkgs/by-name/un/undock/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "undock";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "crazy-max";
     repo = "undock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZjvF7BvjL/IZ25JDO4P9ELPdgCrGc9b+ldqFOx/i0ic=";
+    hash = "sha256-bddCRAphSn01kWHkE32/4I+EAMvcaEJ4VIbDG5ydE0Y=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/un/ungit/package.nix b/pkgs/by-name/un/ungit/package.nix
index c5eedfb02c73..cdfb62c6f878 100644
--- a/pkgs/by-name/un/ungit/package.nix
+++ b/pkgs/by-name/un/ungit/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "ungit";
-  version = "1.5.28";
+  version = "1.5.30";
 
   src = fetchFromGitHub {
     owner = "FredrikNoren";
     repo = "ungit";
     rev = "v${version}";
-    hash = "sha256-zLc+qzbbaQs6Y3NJFHupxyZ0QfuM/VW97dFESR+5dVQ=";
+    hash = "sha256-P1B+MuiqJ621My1teYMDUD7hID2BsHchb24DIsXB9gU=";
   };
 
-  npmDepsHash = "sha256-pYOBdCb6G24JBGWOhd4fyVEEUn19D9t/GxjjIi/2ya0=";
+  npmDepsHash = "sha256-cybFoGLZYmcVg1nQ4s8CqhVDpA4zR74B+qwM0fpuIsI=";
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = true;
diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix
index e05dd5ce4ecc..8009886e0a45 100644
--- a/pkgs/by-name/un/unifi/package.nix
+++ b/pkgs/by-name/un/unifi/package.nix
@@ -10,12 +10,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "unifi-controller";
-  version = "10.1.89";
+  version = "10.2.105";
 
   # see https://community.ui.com/releases / https://www.ui.com/download/unifi
   src = fetchurl {
     url = "https://dl.ui.com/unifi/${finalAttrs.version}/unifi_sysvinit_all.deb";
-    hash = "sha256-gtnDr+CBeoOKqIeDwKJixW5W20lje7nzR4DC/D+1S3o=";
+    hash = "sha256-MBTFxNwrIbx6UKZYCcZ+BjYjSlfdxL60Ogei/ba4O+U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix
index f0adccb9387a..f6ca8ae44f28 100644
--- a/pkgs/by-name/un/unison-ucm/package.nix
+++ b/pkgs/by-name/un/unison-ucm/package.nix
@@ -14,25 +14,25 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unison-code-manager";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src =
     {
       aarch64-darwin = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz";
-        hash = "sha256-8iHGuBaGaSkbQVaDEHcDUMix79O2vLQNaHNPzN9kt/8=";
+        hash = "sha256-Tb9j3GZxIYgHBWEHTIHKo+tpnilXj8cf4GlqnfXrJZ4=";
       };
       x86_64-darwin = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz";
-        hash = "sha256-f6vMtvg2B7Ui/fJmEAFRl4SxphbWXIup3dOiOncFYmY=";
+        hash = "sha256-NC9iN3sPTelWO8QcJB5cpJ8QUawtRXZR8oL33xXJCag=";
       };
       aarch64-linux = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-arm64.tar.gz";
-        hash = "sha256-kqqSFYKoP8c8oJaoVwLeFhMIuFY2a1ulUPpZeGV5FMY=";
+        hash = "sha256-B6bMT3Q8IMZAP8d8YQ/xddQci6VtGJrcrk8IBelKkB0=";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz";
-        hash = "sha256-8si1oemPDPHdWUGSUXEslih5K6z/cdLijwymN31N2Ng=";
+        hash = "sha256-X22BwfIz99GwEpJCWaFMLQQKng+BTPEgOrVK9Guz2KM=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
diff --git a/pkgs/by-name/un/unison/package.nix b/pkgs/by-name/un/unison/package.nix
index 67cdcf72c012..5b3b2bad6bed 100644
--- a/pkgs/by-name/un/unison/package.nix
+++ b/pkgs/by-name/un/unison/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unison";
-  version = "2.53.8";
+  version = "2.54.0";
 
   src = fetchFromGitHub {
     owner = "bcpierce00";
     repo = "unison";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ynsu9jLGFtjlzmHZtOdLEH5G6eXFAhZs9UayYrmKqp0=";
+    hash = "sha256-48d+HuFuhjztWz0aoi6DNlBPrV9J05/jjBofXY1PVBg=";
   };
 
   # Allow the build scripts to correctly call ocamlfind & detect dependencies
diff --git a/pkgs/by-name/un/unixodbc/package.nix b/pkgs/by-name/un/unixodbc/package.nix
index 9048b27d4ab8..0bd77295c661 100644
--- a/pkgs/by-name/un/unixodbc/package.nix
+++ b/pkgs/by-name/un/unixodbc/package.nix
@@ -1,31 +1,36 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  autoreconfHook,
+  fetchFromGitHub,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "unixobcd";
-  version = "2.3.12";
+  pname = "unixodbc";
+  version = "2.3.14";
 
-  # TODO: build from source https://github.com/lurcher/unixODBC
-  src = fetchurl {
-    urls = [
-      "ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-${finalAttrs.version}.tar.gz"
-      "https://www.unixodbc.org/unixODBC-${finalAttrs.version}.tar.gz"
-    ];
-    sha256 = "sha256-8hBQFEXOIb9ge6Ue+MEl4Q4i3/3/7Dd2RkYt9fAZFew=";
+  src = fetchFromGitHub {
+    owner = "lurcher";
+    repo = "unixODBC";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2WhUnpiNTtsoOJ4rvdxaadcW1ROWfdoSVA8Crj8rpo8=";
   };
 
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
   configureFlags = [
     "--disable-gui"
     "--sysconfdir=/etc"
   ];
 
   meta = {
+    changelog = "https://github.com/lurcher/unixODBC/releases/tag/v${finalAttrs.version}";
     description = "ODBC driver manager for Unix";
     homepage = "https://www.unixodbc.org/";
     license = lib.licenses.lgpl2;
+    maintainers = with lib.maintainers; [ hythera ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/un/unnix/package.nix b/pkgs/by-name/un/unnix/package.nix
new file mode 100644
index 000000000000..c088df964b67
--- /dev/null
+++ b/pkgs/by-name/un/unnix/package.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  installShellFiles,
+  pkg-config,
+  withBubblewrap ? stdenv.isLinux,
+  makeBinaryWrapper,
+  xz,
+  zstd,
+  writableTmpDirAsHomeHook,
+  bubblewrap,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "unnix";
+  version = "0.1.1";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "figsoda";
+    repo = "unnix";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZmCagknLEJlAtoVfHrQZeb3CbxpT37J6Mvyxn/qQRmQ=";
+  };
+
+  cargoHash = "sha256-NXyB1Ic2EnLJPpFDn1idb5WYfS8gXzgvIRbQoJ3bsS8=";
+
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ]
+  ++ lib.optionals withBubblewrap [
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    xz
+    zstd
+  ];
+
+  # tests try to access ~/.cache/unnix
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
+  env = {
+    GENERATE_ARTIFACTS = "artifacts";
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
+  postInstall = ''
+    installManPage artifacts/*.1
+    installShellCompletion artifacts/unnix.{bash,fish} --zsh artifacts/_unnix
+  ''
+  + lib.optionalString withBubblewrap ''
+    wrapProgram $out/bin/unnix \
+      --prefix PATH : ${lib.makeBinPath [ bubblewrap ]}
+  '';
+
+  meta = {
+    description = "Reproducible Nix environments without installing Nix";
+    homepage = "https://github.com/figsoda/unnix";
+    changelog = "https://github.com/figsoda/unnix/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ figsoda ];
+    mainProgram = "unnix";
+  };
+})
diff --git a/pkgs/by-name/un/unofficial-homestuck-collection/package.nix b/pkgs/by-name/un/unofficial-homestuck-collection/package.nix
index a791d7313f37..4fc7ebe39741 100644
--- a/pkgs/by-name/un/unofficial-homestuck-collection/package.nix
+++ b/pkgs/by-name/un/unofficial-homestuck-collection/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "unofficial-homestuck-collection";
-  version = "2.8.0";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "GiovanH";
     repo = "unofficial-homestuck-collection";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JHVyg0QIjxPGXf9HsrquV6z6iRCSnw4nHxd+zhNS8H4=";
+    hash = "sha256-xG7pFJnQLsJDsC8e7PJ2lDWsN4p1NtqIgfwnpHBA0Yk=";
   };
 
   patches = [
diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix
index f179066c1f0c..5d4eebee8bd4 100644
--- a/pkgs/by-name/un/unrar/package.nix
+++ b/pkgs/by-name/un/unrar/package.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unrar";
-  version = "7.2.5";
+  version = "7.2.6";
 
   src = fetchzip {
     url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
     stripRoot = false;
-    hash = "sha256-UVoxvF3U4TKZ0kQ9+fEMAoZJwAa+e/XDS7JqXoo3GeA=";
+    hash = "sha256-rYW8ytF/eyhlgmQugbPXSyaQOPu+UmP6A6xmKh80iuE=";
   };
 
   sourceRoot = finalAttrs.src.name;
diff --git a/pkgs/by-name/up/upbound/package.nix b/pkgs/by-name/up/upbound/package.nix
index caa377efe0f3..fac1636a88fc 100644
--- a/pkgs/by-name/up/upbound/package.nix
+++ b/pkgs/by-name/up/upbound/package.nix
@@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation {
 
   meta = {
     description = "CLI for interacting with Upbound Cloud, Upbound Enterprise, and Universal Crossplane (UXP)";
-    changelog = "https://docs.upbound.io/reference/cli/rel-notes/#whats-changed";
+    changelog = "https://docs.upbound.io/reference/release-notes/up-cli";
     homepage = "https://upbound.io";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix
index 06da056b38c0..ccba32226c20 100644
--- a/pkgs/by-name/up/updatecli/package.nix
+++ b/pkgs/by-name/up/updatecli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "updatecli";
-  version = "0.116.0";
+  version = "0.116.3";
 
   src = fetchFromGitHub {
     owner = "updatecli";
     repo = "updatecli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-34XXA8cBifuPC4Sls34D4kFkMOv9+1oYV3ZqPrWF1zY=";
+    hash = "sha256-5dJfbw0xoB34XuCym/TcqwdeUORZezfJNu7Plt82VPM=";
   };
 
-  vendorHash = "sha256-UK6KC/NsEy08mK2tikpAN+H4C61cyHGzqqeoz5kylEg=";
+  vendorHash = "sha256-cMXepPUJoJGRlQSRSByA2/pjsQXfyH8Va320CywxxDw=";
 
   # tests require network access
   doCheck = false;
diff --git a/pkgs/by-name/up/upnp-router-control/package.nix b/pkgs/by-name/up/upnp-router-control/package.nix
index 79cd8b8566f0..c6b06303f5e9 100644
--- a/pkgs/by-name/up/upnp-router-control/package.nix
+++ b/pkgs/by-name/up/upnp-router-control/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "upnp-router-control";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchzip {
     url = "https://launchpad.net/upnp-router-control/trunk/${finalAttrs.version}/+download/upnp-router-control-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+yJzULNdzBkUw2EbHXoAbR9B/P0d6n8T7ojlYIrKgto=";
+    hash = "sha256-2vm6Rnn+V3V54W2xYDlMh7iFKNWfxxnDexlZdwS+8RA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix
index 6b31a0f17ff0..8d3f30f7dc24 100644
--- a/pkgs/by-name/up/uptime-kuma/package.nix
+++ b/pkgs/by-name/up/uptime-kuma/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "uptime-kuma";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "louislam";
     repo = "uptime-kuma";
     tag = finalAttrs.version;
-    hash = "sha256-pofxivhITkYezxjZkCY5jgOkoyEnmbzTrGZRKF5jAqQ=";
+    hash = "sha256-L/+vadToq9CXz6SZnucIMg4Lf43aZ3OKLVhuFblY7zY=";
   };
 
-  npmDepsHash = "sha256-jg8NUnQlH/7Pw2at4beTbzA+WbGu21aWAHQ4cLJGXNc=";
+  npmDepsHash = "sha256-kD+nOU+FVdnlVphVJ3FGUjuHf1f5UbSbpq7Cjc1muh4=";
 
   patches = [
     # Fixes the permissions of the database being not set correctly
diff --git a/pkgs/by-name/up/upx/package.nix b/pkgs/by-name/up/upx/package.nix
index bea89b630dab..a77410b743e4 100644
--- a/pkgs/by-name/up/upx/package.nix
+++ b/pkgs/by-name/up/upx/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "upx";
-  version = "5.1.0";
+  version = "5.1.1";
   src = fetchFromGitHub {
     owner = "upx";
     repo = "upx";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-FQtDHsbZ/JrgRLwc2Wd2F5ZcBdqrU0YIT9hGQ0k0D+w=";
+    hash = "sha256-+ugYimeeBFAUGdBUtwasYSOZzBqQEC00N6R+GNSp9uI=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ur/uriparser/package.nix b/pkgs/by-name/ur/uriparser/package.nix
index 040a551f1b5f..edd664cd811b 100644
--- a/pkgs/by-name/ur/uriparser/package.nix
+++ b/pkgs/by-name/ur/uriparser/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uriparser";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "uriparser";
     repo = "uriparser";
     tag = "uriparser-${finalAttrs.version}";
-    hash = "sha256-k4hRy4kfsaxUNIITPNxzqVgl+AwiR1NpKcE9DtAbwxc=";
+    hash = "sha256-tXEcJ6NAKVoFg/GLkldRcrSlXDcGpvjp7cguM9Xqcps=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix
index 2993e0de0762..976db8ade309 100644
--- a/pkgs/by-name/ur/url-parser/package.nix
+++ b/pkgs/by-name/ur/url-parser/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "url-parser";
-  version = "2.1.15";
+  version = "2.1.16";
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "url-parser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lWEzzCR4EuiaFJ4kAfzV0qZlGWVLCclXjwPm5ZEHZrM=";
+    hash = "sha256-Y3tbEpAp3kTjkAuB0gjRPD+gWskTzOKdB4/rilHbyxU=";
   };
 
-  vendorHash = "sha256-Do+zP+dZQE0piuzAzbr0GN4Qw/JJQEhht6AOInFVi0A=";
+  vendorHash = "sha256-smSFWfuQ3wq/ZfDwUBIUdb4DBu9TPKtJ5Ttys5xFAsE=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/by-name/ur/urweb/package.nix
similarity index 80%
rename from pkgs/development/compilers/urweb/default.nix
rename to pkgs/by-name/ur/urweb/package.nix
index ac258d26eae7..9b7274bb326a 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/by-name/ur/urweb/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   file,
   openssl,
   mlton,
@@ -21,6 +22,13 @@ stdenv.mkDerivation rec {
     sha256 = "0qh6wcxfk5kf735i5gqwnkdirnnmqhnnpkfz96gz144dgz2i0c5c";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/urweb/urweb/commit/f7a38a95bee9d1aaf7ed83a651cfbce8da96ed44.patch";
+      sha256 = "TQFD9Y8OEOSFv6cqpHQ4WSNAPzl82MmVCAxLR4F4Uxc=";
+    })
+  ];
+
   buildInputs = [
     openssl
     mlton
@@ -47,6 +55,10 @@ stdenv.mkDerivation rec {
                    -L${libmysqlclient}/lib \
                    -L${libpq}/lib \
                    -L${sqlite.out}/lib";
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # unresolved reference when linking liburweb.1.dylib
+    export LDFLAGS="-Wl,-undefined,dynamic_lookup";
   '';
 
   env.NIX_CFLAGS_COMPILE = toString [
diff --git a/pkgs/by-name/ur/urx/package.nix b/pkgs/by-name/ur/urx/package.nix
new file mode 100644
index 000000000000..30bb239ca171
--- /dev/null
+++ b/pkgs/by-name/ur/urx/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  sqlite,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "urx";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "hahwul";
+    repo = "urx";
+    tag = finalAttrs.version;
+    hash = "sha256-NSPEAA+tD1CdCjRj3myQB8bPdMhT7H76qAIIWx2z++I=";
+  };
+
+  cargoHash = "sha256-nPm4ofmu03Rb12spjb+m36C6EauJIppgqTkX1oJF3uk=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ sqlite ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  __structuredAttrs = true;
+
+  checkFlags = [
+    # Tests require network access
+    "--skip=providers"
+    "--skip=network::client::tests"
+  ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
+    description = "Extracts URLs from OSINT Archives for Security Insights";
+    homepage = "https://github.com/hahwul/urx";
+    changelog = "https://github.com/hahwul/urx/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "urx";
+  };
+})
diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix
index 58e6a1183629..76c6eecaf0e5 100644
--- a/pkgs/by-name/us/usage/package.nix
+++ b/pkgs/by-name/us/usage/package.nix
@@ -12,20 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "usage";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "usage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0yonwl/2BIkGUs0uOBP+Pjo93NvLVK4QQQj/K4C4NNY=";
+    hash = "sha256-L8OQ6GdHoxJROA/lczichG4nNx5UGKxInihel5AaFIc=";
   };
 
-  cargoHash = "sha256-jxTN+La7Ye2okRZGAY6niIvvRf2E4vFFHd1nny7JJDo=";
-
-  patches = [
-    ./use-bin-exe-env.patch
-  ];
+  cargoHash = "sha256-JauKSCp5Fk1shzXE2dy/joYamv7XW2rnIsu4hjIkBUA=";
 
   postPatch = ''
     substituteInPlace ./examples/*.sh \
diff --git a/pkgs/by-name/us/usage/use-bin-exe-env.patch b/pkgs/by-name/us/usage/use-bin-exe-env.patch
deleted file mode 100644
index 832881faeb85..000000000000
--- a/pkgs/by-name/us/usage/use-bin-exe-env.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cli/tests/shell_completions_integration.rs b/cli/tests/shell_completions_integration.rs
-index 815c44c..51b5dd9 100644
---- a/cli/tests/shell_completions_integration.rs
-+++ b/cli/tests/shell_completions_integration.rs
-@@ -25,6 +25,13 @@ fn run_complete_word(usage_bin: &Path, shell: &str, spec_file: &Path, words: &[&
- 
- /// Build the usage binary and return its path
- fn build_usage_binary() -> PathBuf {
-+    if let Some(usage_path) = std::env::var("CARGO_BIN_EXE_usage")
-+        .ok()
-+        .filter(|s| !s.is_empty())
-+    {
-+        return PathBuf::from(usage_path);
-+    }
-+
-     let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-     let workspace_root = manifest_dir.parent().unwrap();
diff --git a/pkgs/by-name/us/usbvfiod/package.nix b/pkgs/by-name/us/usbvfiod/package.nix
index db6f8ffc2ecb..240990a780b0 100644
--- a/pkgs/by-name/us/usbvfiod/package.nix
+++ b/pkgs/by-name/us/usbvfiod/package.nix
@@ -29,9 +29,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   meta = {
-    homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
+    homepage = "https://github.com/cyberus-technology/usbvfiod";
     description = "A tool for USB device pass-through using the vfio-user protocol.";
-    changelog = "https://github.com/cyberus-technology/usb/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/cyberus-technology/usbvfiod/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       asl20
       mit
@@ -39,6 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "usbvfiod";
     maintainers = with lib.maintainers; [
       lbeierlieb
+      snu
     ];
     platforms = [
       "aarch64-linux"
diff --git a/pkgs/by-name/us/usque/package.nix b/pkgs/by-name/us/usque/package.nix
index ad80fab032f1..ec628309ca99 100644
--- a/pkgs/by-name/us/usque/package.nix
+++ b/pkgs/by-name/us/usque/package.nix
@@ -10,15 +10,15 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "usque";
-  version = "2.0.1";
+  version = "3.0.0";
   src = fetchFromGitHub {
     owner = "Diniboy1123";
     repo = "usque";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-veAUc2LeH2NoOs3AHj8GUr7zBPidHtr+JlUQjgo/WQQ=";
+    hash = "sha256-xgndE4kfR7LVLBvcxJ68Yq0NLN+8zyciMYaP9K+qS9M=";
   };
 
-  vendorHash = "sha256-pilBazQcrfCcgBCo9U9jGo/ZcuXLBR3kT8l+mad+umg=";
+  vendorHash = "sha256-29f/5PnmqaVS8PP1xVksgszFk3GyYZXXGDD1hjE/iSA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix
index 5f15f39bac8d..299cb39c263e 100644
--- a/pkgs/by-name/ut/ut1999/package.nix
+++ b/pkgs/by-name/ut/ut1999/package.nix
@@ -43,11 +43,11 @@ let
     # fat binary
     aarch64-darwin = x86_64-darwin;
   };
-  unpackIso =
-    runCommand "ut1999-iso"
+  baseGame =
+    runCommand "ut1999-iso1"
       {
         # This upload of the game is officially sanctioned by OldUnreal (who has received permission from Epic Games to link to archive.org) and the UT99.org community
-        # This is a copy of the original Unreal Tournament: Game of the Year Edition (also known as UT or UT99).
+        # This is a copy of the original Unreal Tournament: Game of the Year Edition (also known as UT or UT99). The first ISO contains the base game.
         src = fetchurl {
           url = "https://archive.org/download/ut-goty/UT_GOTY_CD1.iso";
           hash = "sha256-4YSYTKiPABxd3VIDXXbNZOJm4mx0l1Fhte1yNmx0cE8=";
@@ -59,6 +59,21 @@ let
         mkdir $out
         cp -r Music Sounds Textures Maps $out
       '';
+  bonusPacks =
+    runCommand "ut1999-iso2"
+      {
+        # The second ISO contains bonus maps and game modes
+        src = fetchurl {
+          url = "https://archive.org/download/ut-goty/UT_GOTY_CD2.iso";
+          hash = "sha256-2V2O4c+VVi7gI/1UA17IgT1CdfY9GEdCMiCYbtyNANg=";
+        };
+        nativeBuildInputs = [ libarchive ];
+      }
+      ''
+        bsdtar -xvf "$src"
+        mkdir $out
+        cp -r System Sounds Textures maps $out
+      '';
   systemDir =
     rec {
       x86_64-linux = "System64";
@@ -137,26 +152,33 @@ stdenv.mkDerivation (finalAttrs: {
       # NOTE: OldUnreal patch doesn't include these folders on linux but could in the future
       # on darwin it does, but they are empty
       rm -rf ./{Music,Sounds}
-      ln -s ${unpackIso}/{Music,Sounds} .
+      cp -r ${baseGame}/{Music,Sounds} .
+      chmod u+w ./Sounds
+      cp -n ${bonusPacks}/Sounds/* ./Sounds
+      cp -n ${bonusPacks}/System/*.{u,int} ./System
     ''
     + lib.optionalString (stdenv.hostPlatform.isLinux) ''
-      # maps need no post-processing on linux, therefore linking them is ok
+      # maps need no post-processing on linux
       rm -rf ./Maps
-      ln -s ${unpackIso}/Maps .
+      cp -r ${baseGame}/Maps .
+      chmod u+w ./Maps
+      cp -n ${bonusPacks}/maps/* ./Maps
     ''
     + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-      # Maps need post-processing on darwin, therefore need to be copied
-      cp -n ${unpackIso}/Maps/* ./Maps || true
+      # Maps need post-processing on darwin
+      cp -n ${baseGame}/Maps/* ./Maps || true
+      cp -n ${bonusPacks}/maps/* ./Maps || true
       # unpack compressed maps with ucc (needs absolute paths)
       for map in $PWD/Maps/*.uz; do ./UCC decompress $map; done
       mv ${systemDir}/*.unr ./Maps || true
       rm ./Maps/*.uz
     ''
     + ''
-      cp -n ${unpackIso}/Textures/* ./Textures || true
+      cp -n ${baseGame}/Textures/* ./Textures || true
+      cp -n ${bonusPacks}/Textures/* ./Textures || true
     ''
     + lib.optionalString (stdenv.hostPlatform.isLinux) ''
-      cp -n ${unpackIso}/System/*.{u,int} ./System || true
+      cp -n ${baseGame}/System/*.{u,int} ./System || true
       ln -s "$out/${systemDir}/ut-bin" "$out/bin/ut1999"
       ln -s "$out/${systemDir}/ucc-bin" "$out/bin/ut1999-ucc"
 
diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix
index f8e88753470f..a97a1043b555 100644
--- a/pkgs/by-name/ut/utf8cpp/package.nix
+++ b/pkgs/by-name/ut/utf8cpp/package.nix
@@ -13,18 +13,25 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "nemtrif";
     repo = "utfcpp";
     tag = "v${finalAttrs.version}";
-    fetchSubmodules = true;
     hash = "sha256-0FgMKHymFOA3BM7VS8US2is8TmQlL/wWj4nSRihqcDo=";
   };
 
   nativeBuildInputs = [ cmake ];
 
+  cmakeFlags = [
+    (lib.cmakeBool "UTF8CPP_ENABLE_TESTS" true)
+  ];
+  doCheck = true;
+
   meta = {
     homepage = "https://github.com/nemtrif/utfcpp";
     changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${finalAttrs.version}";
     description = "UTF-8 with C++ in a Portable Way";
     license = lib.licenses.boost;
-    maintainers = with lib.maintainers; [ jobojeha ];
+    maintainers = with lib.maintainers; [
+      jobojeha
+      doronbehar
+    ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ut/utfcpp/package.nix b/pkgs/by-name/ut/utfcpp/package.nix
deleted file mode 100644
index 311eef582cbb..000000000000
--- a/pkgs/by-name/ut/utfcpp/package.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "utfcpp";
-  version = "4.0.9";
-
-  src = fetchFromGitHub {
-    owner = "nemtrif";
-    repo = "utfcpp";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-0FgMKHymFOA3BM7VS8US2is8TmQlL/wWj4nSRihqcDo=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "UTF8CPP_ENABLE_TESTS" true)
-  ];
-  doCheck = true;
-
-  meta = {
-    description = "UTF-8 with C++ in a Portable Way";
-    homepage = "https://github.com/nemtrif/utfcpp";
-    license = lib.licenses.boost;
-    maintainers = with lib.maintainers; [ doronbehar ];
-    mainProgram = "utfcpp";
-    platforms = lib.platforms.all;
-  };
-})
diff --git a/pkgs/by-name/ut/util-linux/fix-musl-nsenter.patch b/pkgs/by-name/ut/util-linux/fix-musl-nsenter.patch
new file mode 100644
index 000000000000..73a201bd5b4c
--- /dev/null
+++ b/pkgs/by-name/ut/util-linux/fix-musl-nsenter.patch
@@ -0,0 +1,25 @@
+From 126c850f74cbafd3af55a6f829308d7f63de4c7b Mon Sep 17 00:00:00 2001
+From: Aleksi Hannula <ahannula4+nixgit@gmail.com>
+Date: Tue, 7 Apr 2026 14:52:16 +0300
+Subject: [PATCH] nsenter: Fix AT_HANDLE_FID on musl
+
+---
+ sys-utils/nsenter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
+index e10ba9c..340e6b1 100644
+--- a/sys-utils/nsenter.c
++++ b/sys-utils/nsenter.c
+@@ -220,7 +220,7 @@ static int fill_nsfs_file_handle(struct file_handle *fh, uint64_t ns_id)
+ 
+ 	fh->handle_bytes = sizeof(struct nsfs_file_handle);
+ 	if (name_to_handle_at(nsfs_fd, "", fh, &mount_id,
+-			      AT_EMPTY_PATH | AT_HANDLE_FID) == -1)
++			      AT_EMPTY_PATH | 0x200 /* AT_HANDLE_FID */) == -1)
+ 		return -errno;
+ 	assert(fh->handle_type);
+ 	nsfs_fh_tmpl = *fh;
+-- 
+2.51.2
+
diff --git a/pkgs/by-name/ut/util-linux/include-correct-struct-statfs-header.patch b/pkgs/by-name/ut/util-linux/include-correct-struct-statfs-header.patch
new file mode 100644
index 000000000000..6787ef311abf
--- /dev/null
+++ b/pkgs/by-name/ut/util-linux/include-correct-struct-statfs-header.patch
@@ -0,0 +1,61 @@
+From 145b6a66dcc725de3c3161db62db7047eb407214 Mon Sep 17 00:00:00 2001
+From: Morgan Jones <me@numin.it>
+Date: Sun, 5 Apr 2026 18:03:54 -0700
+Subject: [PATCH] pidfd-utils: include correct struct statfs header for darwin
+
+Fixes the build on Darwin since struct statfs is in sys/mount.h
+and sys/vfs.h doesn't even exist. Just conditionally include all the
+headers.
+---
+ include/statfs_magic.h | 16 ++++++++++++++++
+ lib/pidfd-utils.c      |  3 ---
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/include/statfs_magic.h b/include/statfs_magic.h
+index 6921abaa4..28977f392 100644
+--- a/include/statfs_magic.h
++++ b/include/statfs_magic.h
+@@ -5,10 +5,26 @@
+ #ifndef UTIL_LINUX_STATFS_MAGIC_H
+ #define UTIL_LINUX_STATFS_MAGIC_H
+ 
++#ifdef HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++
++#ifdef HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++
+ #ifdef HAVE_SYS_STATFS_H
+ # include <sys/statfs.h>
+ #endif
+ 
++#ifdef HAVE_SYS_VFS_H
++# include <sys/vfs.h>
++#endif
++
++#ifdef HAVE_SYS_MOUNT_H
++# include <sys/mount.h>
++#endif
++
+ /*
+  * If possible then don't depend on internal libc __SWORD_TYPE type.
+  */
+diff --git a/lib/pidfd-utils.c b/lib/pidfd-utils.c
+index a83735920..f7c649144 100644
+--- a/lib/pidfd-utils.c
++++ b/lib/pidfd-utils.c
+@@ -5,9 +5,6 @@
+  * Authors: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu> [2025]
+  */
+ #include <stdlib.h>
+-#include <sys/stat.h>
+-#include <sys/vfs.h>
+-#include <sys/types.h>
+ #include <errno.h>
+ #include <err.h>
+ 
+-- 
+2.50.1
+
diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index 95f68397d57c..c543091bf426 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -43,11 +43,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "util-linux" + lib.optionalString isMinimal "-minimal";
-  version = "2.41.3";
+  version = "2.42";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor finalAttrs.version}/util-linux-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MzDYc/D861VguJp9wU5PMoi72IDpaQPtm1DsK1eZ5Ys=";
+    hash = "sha256-NFKyYLuqd11udJrDuyIRF4UAP8H0RJcAJcjaJt+nWOk=";
   };
 
   patches = [
@@ -56,17 +56,14 @@ stdenv.mkDerivation (finalAttrs: {
     # distros anyway).
     ./rtcwake-search-PATH-for-shutdown.patch
 
-    # pam_lastlog2: link with libpam
-    # see https://github.com/NixOS/nixpkgs/issues/493934
-    ./pam_lastlog2-add-lpam-to-Makemodule.am.patch
-
-    # bits: only build when cpu_set_t is available
-    # Otherwise, the build fails on macOS
-    (fetchurl {
-      name = "bits-only-build-when-cpu_set_t-is-available.patch";
-      url = "https://lore.kernel.org/util-linux/20250501075806.88759-1-hi@alyssa.is/raw";
-      hash = "sha256-G7Cdv8636wJEjgt9am7PaDI8bpSF8sO9bFWEIiAL25A=";
-    })
+    # Fix compile of 2.42+ on Darwin.
+    # https://lore.kernel.org/util-linux/CAEUYr6ZjVX1bd-xcBGtFN_ZYwQnXDYsw7d1-7sTpF2BbgfrR+g@mail.gmail.com/T/#u
+    ./include-correct-struct-statfs-header.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    # Musl does not define AT_HANDLE_FID, hard-code it.
+    # https://github.com/util-linux/util-linux/pull/4203
+    ./fix-musl-nsenter.patch
   ];
 
   # We separate some of the utilities into their own outputs. This
@@ -221,13 +218,6 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = false; # "For development purpose only. Don't execute on production system!"
 
   passthru = {
-    updateScript = gitUpdater {
-      # No nicer place to find latest release.
-      url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git";
-      rev-prefix = "v";
-      ignoredVersions = "(-rc).*";
-    };
-
     # encode upstream assumption to be used in man-db
     # https://github.com/util-linux/util-linux/commit/8886d84e25a457702b45194d69a47313f76dc6bc
     hasCol = stdenv.hostPlatform.libc == "glibc";
@@ -235,6 +225,14 @@ stdenv.mkDerivation (finalAttrs: {
     tests = {
       inherit (nixosTests) pam-lastlog;
     };
+  }
+  // lib.optionalAttrs (!isMinimal) {
+    updateScript = gitUpdater {
+      # No nicer place to find latest release.
+      url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git";
+      rev-prefix = "v";
+      ignoredVersions = "(-rc|-start|-devel).*";
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/ut/util-linux/pam_lastlog2-add-lpam-to-Makemodule.am.patch b/pkgs/by-name/ut/util-linux/pam_lastlog2-add-lpam-to-Makemodule.am.patch
deleted file mode 100644
index 3ffb12387bb6..000000000000
--- a/pkgs/by-name/ut/util-linux/pam_lastlog2-add-lpam-to-Makemodule.am.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c8e620c6bcd044786c59f822810fc973090dbfa2 Mon Sep 17 00:00:00 2001
-From: Morgan Jones <me@numin.it>
-Date: Mon, 2 Mar 2026 11:03:39 -0800
-Subject: [PATCH] pam_lastlog2: add -lpam to Makemodule.am
-
-If we don't add this, we don't actually link with PAM; compare the
-before and after of `lib/security/pam_lastlog2.so`.
-
-```
-Dynamic section at offset 0x2ce8 contains 31 entries:
-  Tag        Type                         Name/Value
- 0x0000000000000001 (NEEDED)             Shared library: [liblastlog2.so.2]
- 0x0000000000000001 (NEEDED)             Shared library: [libsqlite3.so]
- 0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]
- 0x000000000000000e (SONAME)             Library soname: [pam_lastlog2.so]
-```
-
-```
-Dynamic section at offset 0x2cd8 contains 32 entries:
-  Tag        Type                         Name/Value
- 0x0000000000000001 (NEEDED)             Shared library: [libpam.so.0]
- 0x0000000000000001 (NEEDED)             Shared library: [liblastlog2.so.2]
- 0x0000000000000001 (NEEDED)             Shared library: [libsqlite3.so]
- 0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]
- 0x000000000000000e (SONAME)             Library soname: [pam_lastlog2.so]
-```
-
-This causes issues like https://github.com/NixOS/nixpkgs/issues/493934
-where the library has trouble linking with PAM symbols because it is not
-linked.
-
-Signed-off-by: Morgan Jones <me@numin.it>
----
- pam_lastlog2/src/Makemodule.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pam_lastlog2/src/Makemodule.am b/pam_lastlog2/src/Makemodule.am
-index 40d597c58..629930853 100644
---- a/pam_lastlog2/src/Makemodule.am
-+++ b/pam_lastlog2/src/Makemodule.am
-@@ -13,7 +13,7 @@ pam_lastlog2_la_CFLAGS = \
- 
- pam_lastlog2_la_LIBADD = liblastlog2.la
- 
--pam_lastlog2_la_LDFLAGS = $(SOLIB_LDFLAGS) -module -avoid-version -shared
-+pam_lastlog2_la_LDFLAGS = $(SOLIB_LDFLAGS) -lpam -module -avoid-version -shared
- if HAVE_VSCRIPT
- pam_lastlog2_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/pam_lastlog2/src/pam_lastlog2.sym
- endif
--- 
-2.50.1
-
diff --git a/pkgs/by-name/ut/util-macros/package.nix b/pkgs/by-name/ut/util-macros/package.nix
index f8572d979deb..f7c8c6d69ea9 100644
--- a/pkgs/by-name/ut/util-macros/package.nix
+++ b/pkgs/by-name/ut/util-macros/package.nix
@@ -34,10 +34,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "GNU autoconf macros shared across X.Org projects";
     homepage = "https://gitlab.freedesktop.org/xorg/util/macros";
-    license = with lib.licenses; [
-      hpndSellVariant
-      mit
-    ];
+    license =
+      with lib.licenses;
+      AND [
+        hpndSellVariant
+        mit
+      ];
     maintainers = with lib.maintainers; [
       raboof
       jopejoe1
diff --git a/pkgs/by-name/ut/utpm/package.nix b/pkgs/by-name/ut/utpm/package.nix
index 379164d74741..c8b1e6adf6fd 100644
--- a/pkgs/by-name/ut/utpm/package.nix
+++ b/pkgs/by-name/ut/utpm/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "utpm";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "Thumuss";
     repo = "utpm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NlH+fPkTNqaQc2BrjerktnKS2L731K9G3z+N2xdx3kg=";
+    hash = "sha256-MGvPj+qF05zc2rPf1LxWVIpkZGOoDj09UfCZbQ/lBOM=";
   };
 
-  cargoHash = "sha256-WR9LD5HjLgh9jirnjTc6BeNg8KjVZI+DuJRYEbN3tmE=";
+  cargoHash = "sha256-eWEriaKakEIORrQgcD5hrvSVfGRS2kU8GKNAOTIFCo0=";
 
   env.OPENSSL_NO_VENDOR = 1;
 
diff --git a/pkgs/by-name/uu/uutils-acl/package.nix b/pkgs/by-name/uu/uutils-acl/package.nix
index df422a169f39..adb7237a21da 100644
--- a/pkgs/by-name/uu/uutils-acl/package.nix
+++ b/pkgs/by-name/uu/uutils-acl/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-acl";
-  version = "0.0.1-unstable-2026-04-16";
+  version = "0.0.1-unstable-2026-04-24";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "acl";
-    rev = "a23cca6b74993aa522608b7ae4a70f2c88df2e6c";
-    hash = "sha256-54f5798l6CcpJgHV15gcMusOMKof1LOC4p0KQ65C/TU=";
+    rev = "68816cd43f14c85b3579417556b05be380a35128";
+    hash = "sha256-nBlGo0xNSQ1Ees/+vVYrIm6CDVtofFWhqW0QDHR+zok=";
   };
 
-  cargoHash = "sha256-tw7vecIyZYfd8jiLvU2fMVMo7KGOYFPObaW3LlRSJaY=";
+  cargoHash = "sha256-lswm5OxVHfo7eTlvkWVLqmno5AfiGggWORtzGmnLEm4=";
 
   cargoBuildFlags = [ "--workspace" ];
 
diff --git a/pkgs/by-name/uu/uutils-hostname/package.nix b/pkgs/by-name/uu/uutils-hostname/package.nix
index d8ce52077bd4..c645f00ae2d6 100644
--- a/pkgs/by-name/uu/uutils-hostname/package.nix
+++ b/pkgs/by-name/uu/uutils-hostname/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-hostname";
-  version = "0-unstable-2026-04-16";
+  version = "0-unstable-2026-04-23";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "hostname";
-    rev = "467ce0be515b08f7f34680056c80063bcef4648d";
-    hash = "sha256-+YAPk35CXBZUbIkgfRUhNLQCSrzovj/sWpQAMdBQUDU=";
+    rev = "85c60f53d980d6c4ff7c6b679a7b851cbf153703";
+    hash = "sha256-BbCgtnfk5qVYAy0hKWnkV+p2tRIn//S4dK17eLsLXhk=";
   };
 
-  cargoHash = "sha256-qcUXGPoc088kyoNjg4LdIAH88imnzq3v/RSeBwVFSv0=";
+  cargoHash = "sha256-7lEWWqEh500f85Rh1INoEush8eSVMwnLbcCBOembqcA=";
 
   cargoBuildFlags = [ "--package uu_hostname" ];
 
diff --git a/pkgs/by-name/uu/uutils-login/package.nix b/pkgs/by-name/uu/uutils-login/package.nix
index 1894898eabbf..2736ba70e553 100644
--- a/pkgs/by-name/uu/uutils-login/package.nix
+++ b/pkgs/by-name/uu/uutils-login/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-login";
-  version = "0-unstable-2026-04-16";
+  version = "0-unstable-2026-04-23";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "login";
-    rev = "0f5fc5f66a890b65381dfaa3f112e2879476ad38";
-    hash = "sha256-Vkivr/lBj+kNiJji/wFKvsfvmD+vv9CxkPio1ZWolOE=";
+    rev = "2ac4e1518bd743f45b89e8db146d77feb14da197";
+    hash = "sha256-eQXEl4qWkn0X3EVL0Tj5VI2R092k7BKSyCJWClw1jxc=";
   };
 
   cargoHash = "sha256-zgKNU24HJFT/DISWflKNN9R88cioLxBNdL8eexCRAOE=";
diff --git a/pkgs/by-name/uu/uutils-tar/package.nix b/pkgs/by-name/uu/uutils-tar/package.nix
index 392186fefeea..e1402c412c81 100644
--- a/pkgs/by-name/uu/uutils-tar/package.nix
+++ b/pkgs/by-name/uu/uutils-tar/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-tar";
-  version = "0-unstable-2026-04-16";
+  version = "0-unstable-2026-04-23";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "tar";
-    rev = "3236dd7b87413b10b9bcd650c731f0b0677671fb";
-    hash = "sha256-WGqZEAbcMykYlLdoMqdUVuc7EpA77nGqAKgzl2vDbws=";
+    rev = "f6b4dc4f2f8fba1f264889a3cb139a16e1d135b1";
+    hash = "sha256-LnNbfBoCwPpyPVNeE4s3gxHzMVJJ8konB6+KsD6dU8M=";
   };
 
-  cargoHash = "sha256-EavcBmhOhUUD0pla50tgNJw7z2jDgxTUvIZuZYa58KQ=";
+  cargoHash = "sha256-WVtJAH5JYwoiMekUSiG0uhHqlXPTFYCB0TNQOcMbGkE=";
 
   cargoBuildFlags = [ "--workspace" ];
 
diff --git a/pkgs/by-name/uu/uutils-util-linux/package.nix b/pkgs/by-name/uu/uutils-util-linux/package.nix
index 1ca72935ddcf..c4df8fd930d1 100644
--- a/pkgs/by-name/uu/uutils-util-linux/package.nix
+++ b/pkgs/by-name/uu/uutils-util-linux/package.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uutils-util-linux";
-  version = "0.0.1-unstable-2026-04-16";
+  version = "0.0.1-unstable-2026-04-24";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "util-linux";
-    rev = "0d9acbc3298cf7da42d4441b0d62f461c70faf75";
-    hash = "sha256-bhpHxhhl1W2IZbDiMf7BZCksoSo6T2N1JA/xUjwcCRY=";
+    rev = "23de6cc33cfcd3579a7d00ff5ca41ed557b94e1f";
+    hash = "sha256-X2ZALHdGt//mrge+069Sxp5GYKPUbZtxPsbUSzDIz5s=";
   };
 
   postPatch = ''
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"cut"' '"${lib.getExe' coreutils "cut"}"'
   '';
 
-  cargoHash = "sha256-DluiMOAuwgM2a/DXWOXXezk+QSJTty8VmlV7Mf8kRlk=";
+  cargoHash = "sha256-ZC71bM/h2v6HI+sN4cFsCR3VkOP+YGsgBjlfaSvoGUM=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index c328f2b5d2a4..38fd4da241b8 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.11.7";
+  version = "0.11.8";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-DTYZIsgqS/m7YC5fQKy3UL/56XTKY9H5oCJX4LDJRmY=";
+    hash = "sha256-wu9EA3z/qj29lfSj8wKE4p8XEAJQakQTg2AK8I/64us=";
   };
 
-  cargoHash = "sha256-wOE7kg0WAVgx8fhrt+N79GjHFviEdI0fuNTYMCn464A=";
+  cargoHash = "sha256-ygGRoZgD88Q2EkN0U4SDTwya96Ds3Pqy3Llj8cjGwnY=";
 
   buildInputs = [
     rust-jemalloc-sys
diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index ed526a6c7138..96df561da576 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20260418094517";
+    version = "20260424125239";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-6UmTW+Fc8Kp9nmov4t56haCYCZ2RZuuGvghXlePA8r4=";
+      hash = "sha256-iptsh0r9KHrCynHem6ma0050olxTDLQ7DCSy3aB6CJs=";
     };
     vendorHash = "sha256-9tXv+rDBowxDN9gH4zHCr4TRbic4kijco3Y6bojJKRk=";
     meta = {
diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 1c4ea9a3dc8d..86d0298d9ea1 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "vacuum-go";
-  version = "0.25.8";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q3IPA212G7Iu2x9l73Pqa7Y9QzvsMR4IWjpUsvjroP0=";
+    hash = "sha256-UUHOlZuMnL4fAcocmi6rdOQvxl3oNrZMgnad/0z2+oA=";
   };
 
-  vendorHash = "sha256-R5CuUIn/nHbGSvNQxPrAmVK3z4Nr7fMbss0MCidmYjQ=";
+  vendorHash = "sha256-zPlhjHfwFrhpYAKcgVi1II0hR3fOFItegt9SZoei1SQ=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix
index 815bb9b59683..cbda1f59409d 100644
--- a/pkgs/by-name/va/vals/package.nix
+++ b/pkgs/by-name/va/vals/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "vals";
-  version = "0.43.9";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     rev = "v${finalAttrs.version}";
     owner = "helmfile";
     repo = "vals";
-    sha256 = "sha256-NMsn5nTgR7t8vN0cAUJryGZatdeQzoBcXyPRe9GyYY4=";
+    sha256 = "sha256-t13qzIE1nl+AjxdFISD61ScahWuFJV7ROqtSr22Tscs=";
   };
 
-  vendorHash = "sha256-V/Yhok9OY/jLiWGWSPb3d69ituhQyYFS/xY335XyZgw=";
+  vendorHash = "sha256-xBOac8rDMsn+gX5QWdIoP9BdqBmdZ7tvtRG677uiCpM=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/va/vapoursynth-bestsource/package.nix b/pkgs/by-name/va/vapoursynth-bestsource/package.nix
index ef90fb7153d4..bff856f32a55 100644
--- a/pkgs/by-name/va/vapoursynth-bestsource/package.nix
+++ b/pkgs/by-name/va/vapoursynth-bestsource/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   vapoursynth,
   ffmpeg,
-  xxHash,
+  xxhash,
   gitUpdater,
 }:
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     vapoursynth
     (ffmpeg.override { withLcms2 = true; })
-    xxHash
+    xxhash
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/va/vapoursynth-nnedi3/package.nix b/pkgs/by-name/va/vapoursynth-nnedi3/package.nix
deleted file mode 100644
index 3bbe4056766c..000000000000
--- a/pkgs/by-name/va/vapoursynth-nnedi3/package.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  autoreconfHook,
-  pkg-config,
-  vapoursynth,
-  yasm,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "vapoursynth-nnedi3";
-  version = "12";
-
-  src = fetchFromGitHub {
-    owner = "dubhater";
-    repo = "vapoursynth-nnedi3";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-jd/PCXhbCZGMsoXjekbeqMSRVBJAy4INdpkTbZFjVO0=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "build-fixes-for-aarch64-apple-silicon.patch";
-      url = "https://github.com/dubhater/vapoursynth-nnedi3/commit/15c15080ed4406929aa0d2d6a3f83ca3e26bc979.patch";
-      hash = "sha256-8gNj4LixfrGq0MaIYdZuwSK/2iyh1E9s/uuSBJHZwx8=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs = [
-    vapoursynth
-    yasm
-  ];
-
-  configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ];
-
-  postInstall = ''
-    rm -f $out/lib/vapoursynth/*.la
-  '';
-
-  meta = {
-    description = "Filter for VapourSynth";
-    homepage = "https://github.com/dubhater/vapoursynth-nnedi3";
-    license = with lib.licenses; [ gpl2Plus ];
-    maintainers = with lib.maintainers; [ snaki ];
-    platforms = with lib.platforms; x86_64 ++ aarch64;
-  };
-})
diff --git a/pkgs/by-name/va/variant-lite/package.nix b/pkgs/by-name/va/variant-lite/package.nix
index e2d49cb469d0..1199cdb76fa4 100644
--- a/pkgs/by-name/va/variant-lite/package.nix
+++ b/pkgs/by-name/va/variant-lite/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library";
     homepage = "https://github.com/martinmoene/variant-lite";
-    changelog = "https://github.com/martinmoene/variant-lite/blob/v${finalAttrs.version}/CHANGES.txt";
+    changelog = "https://github.com/martinmoene/variant-lite/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.boost;
     maintainers = with lib.maintainers; [ titaniumtown ];
   };
diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix
index c2f7c17a0ac5..2e27f7c11164 100644
--- a/pkgs/by-name/va/vaultwarden/package.nix
+++ b/pkgs/by-name/va/vaultwarden/package.nix
@@ -19,16 +19,16 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vaultwarden";
-  version = "1.35.7";
+  version = "1.35.8";
 
   src = fetchFromGitHub {
     owner = "dani-garcia";
     repo = "vaultwarden";
     tag = finalAttrs.version;
-    hash = "sha256-HJDpGsKLsVbeUPqTAph5luROpz7ioJXs/PV5nwtmAz8=";
+    hash = "sha256-bEPwH0+b4cQTh1hNiiX2qvTNeRxxShm2JXNKNfn4xm8=";
   };
 
-  cargoHash = "sha256-LSmzR3X04i2dmPwj1ivPm/YeNtxGhfwsEXG93iVvhrI=";
+  cargoHash = "sha256-gcE3qfSVCk08haADyqOff4R0ekd9Q6RB59LUtow9Yi4=";
 
   # used for "Server Installed" version in admin panel
   env.VW_VERSION = finalAttrs.version;
diff --git a/pkgs/by-name/va/vaultwarden/webvault.nix b/pkgs/by-name/va/vaultwarden/webvault.nix
index c988cf8c78a4..208efdd0f7c1 100644
--- a/pkgs/by-name/va/vaultwarden/webvault.nix
+++ b/pkgs/by-name/va/vaultwarden/webvault.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "vaultwarden-webvault";
-  version = "2026.2.0+0";
+  version = "2026.3.1+0";
 
   src = fetchFromGitHub {
     owner = "vaultwarden";
     repo = "vw_web_builds";
     tag = "v${version}";
-    hash = "sha256-rXBDv8ecImA6qdM5JVYy5QJHRj0jP7zinj/8gWRREtQ=";
+    hash = "sha256-nUhSoqf655eOs+rKqAZB0XzPD6ePL6CIxVAnB5dmJAs=";
   };
 
-  npmDepsHash = "sha256-PATpmxIHYSgmuOj8dOoa7ynzkGw5l7z62DiulJmufJY=";
+  npmDepsHash = "sha256-dlYN2aiv6XbDXQVstfI6XIe+X5Q1lqs62eNalGTGx7k=";
 
   nativeBuildInputs = [
     python3
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index c4adecf71110..675de6c2e71c 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -16,6 +16,7 @@
   coreutils,
   tzdata,
   cmake,
+  cyrus_sasl,
   perl,
   git,
   nixosTests,
@@ -27,16 +28,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vector";
-  version = "0.54.0";
+  version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "vectordotdev";
     repo = "vector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XEQN6Dk72Yn3FZoqvQk4mj+ME68hJuN7zHpiSLY9iNo=";
+    hash = "sha256-1t0fHBYBBfG8oFbo1QPXb5y8+lyIPPve4bDtry+KF5Q=";
   };
 
-  cargoHash = "sha256-Jlw8mCPV5TU85VHN8UTXPsxvoSlxTfYzL7k/5Sb3U/M=";
+  cargoHash = "sha256-/a/KnZEXBeAtYS0yXCmI+07acol0/UBwauIKTi/QF1k=";
 
   nativeBuildInputs = [
     pkg-config
@@ -49,6 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # Provides the mig command used by the build scripts
   ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds;
   buildInputs = [
+    cyrus_sasl
     oniguruma
     openssl
     protobuf
diff --git a/pkgs/by-name/ve/vega-cli/package.nix b/pkgs/by-name/ve/vega-cli/package.nix
index d16fb6c64a87..00b952f147b1 100644
--- a/pkgs/by-name/ve/vega-cli/package.nix
+++ b/pkgs/by-name/ve/vega-cli/package.nix
@@ -27,8 +27,8 @@ buildNpmPackage (finalAttrs: {
       --replace-fail "npm run data" "true"
 
     # Patch lerna.json to not use nx
-    mv lerna.json lerna.old.json
-    jq '. + {useNx: false}' < lerna.old.json > lerna.json
+    ${jq}/bin/jq '. + {useNx: false}' lerna.json > lerna.json.tmp
+    mv lerna.json.tmp lerna.json
   '';
 
   npmDepsHash = "sha256-mBe1fHnhor7ZR8CuRNs1zD7JzaZXZI5VM7mdAieVKqE=";
@@ -72,6 +72,8 @@ buildNpmPackage (finalAttrs: {
     description = "Command line tools for the Vega visualization grammar";
     homepage = "https://vega.github.io/vega/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ pyrox0 ];
+    maintainers = with lib.maintainers; [
+      philocalyst
+    ];
   };
 })
diff --git a/pkgs/by-name/ve/vega-lite/package.nix b/pkgs/by-name/ve/vega-lite/package.nix
index 12ec1f1b0e63..f507b1cec9e0 100644
--- a/pkgs/by-name/ve/vega-lite/package.nix
+++ b/pkgs/by-name/ve/vega-lite/package.nix
@@ -11,16 +11,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "vega-lite";
-  version = "6.4.2";
+  version = "6.4.3";
 
   src = fetchFromGitHub {
     owner = "vega";
     repo = "vega-lite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UQEgZk9SZTSKiAfOvBxnpkyiih9QcSv08O8vt4ooeYQ=";
+    hash = "sha256-bsPnvUleHrihsoOL98O8KTbiONx3FNuQjH9vrZ/bLTw=";
   };
 
-  npmDepsHash = "sha256-EOJGMmIObN4XCC4ZbZQQ89X12+STKejt6vugyIb7v0A=";
+  npmDepsHash = "sha256-dni2tEYzE/AzgGldCAtBpmQK24kIRck0KQXvD2e5xfw=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index db653817c754..9268e0098951 100644
--- a/pkgs/by-name/ve/velocity/package.nix
+++ b/pkgs/by-name/ve/velocity/package.nix
@@ -34,13 +34,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "velocity";
-  version = "3.5.0-unstable-2026-04-13";
+  version = "3.5.0-unstable-2026-04-17";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "a6d97e28adb1b0cd6464bab78ed4e2c14835868f";
-    hash = "sha256-CfYZgiYqH+M8t3CmPx3B3CIkudxPKHbtuysewqhE/B0=";
+    rev = "f712997dd7f243cb3a0e55ec3f6277a10b6b1d69";
+    hash = "sha256-gGS05w92lNKVJRwz30SQDSC/HHxZJGaxFggK1MaN3vE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 724b6369d488..5467002ebef5 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -19,13 +19,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.14.7";
+  version = "1.14.10";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-uLuWTquRwguWYu3eolrHa5rguSI8ydwzHY6CrOcP7qM=";
+    # For some reason 1.14.10 is not tagged
+    rev = "cacd0efd87a8aba95ad2a3be8ae569a295b9eaae";
+    hash = "sha256-RnxhUGI0eji7gQf+FJnG+BoHphJmjxT9EF5FYUWYCbs=";
   };
 
   patches = [ ./fix-deps.patch ];
@@ -44,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_10;
     fetcherVersion = 2;
-    hash = "sha256-b8Ko87Ddu3jcigbxluhsADJTsGVatiW5snXSXtrYho0=";
+    hash = "sha256-GiUV2x8i7ewzn66v5wBUq67oNvrxZzOsh5TuQUtpJNQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/ventoy/000-nixos-sanitization.patch b/pkgs/by-name/ve/ventoy/000-nixos-sanitization.patch
index 2ab973241cde..a7a9f99fa871 100644
--- a/pkgs/by-name/ve/ventoy/000-nixos-sanitization.patch
+++ b/pkgs/by-name/ve/ventoy/000-nixos-sanitization.patch
@@ -7,9 +7,9 @@ change has been made to the scripts meant to be patched.
 If you're updating the patch, ventoy-x.x.xx-old and new are based on the ventoy repo
 INSTALL directory.
 
-diff -Naur ventoy-1.1.10-old/CreatePersistentImg.sh ventoy-1.1.10-new/CreatePersistentImg.sh
---- ventoy-1.1.10-old/CreatePersistentImg.sh	2026-03-03 16:17:02.368587084 +0000
-+++ ventoy-1.1.10-new/CreatePersistentImg.sh	2026-03-03 16:21:52.272094662 +0000
+diff --color -Naur ventoy-1.1.12-old/CreatePersistentImg.sh ventoy-1.1.12-new/CreatePersistentImg.sh
+--- ventoy-1.1.12-old/CreatePersistentImg.sh	2026-04-24 18:49:51.361292687 +0100
++++ ventoy-1.1.12-new/CreatePersistentImg.sh	2026-04-24 19:04:58.496998056 +0100
 @@ -119,17 +119,13 @@
  sync
  
@@ -23,7 +23,7 @@ diff -Naur ventoy-1.1.10-old/CreatePersistentImg.sh ventoy-1.1.10-new/CreatePers
 -        echo '/ union' > ./persist_tmp_mnt/$config
 +    path_to_persist_mnt="`mktemp -d`"
 +    if mount $freeloop "$path_to_persist_mnt"; then
-+	echo '/ union' > "$path_to_persist_mnt"/$config
++        echo '/ union' > "$path_to_persist_mnt"/$config
          sync
 -        umount ./persist_tmp_mnt
 +        umount "$path_to_persist_mnt"
@@ -33,18 +33,18 @@ diff -Naur ventoy-1.1.10-old/CreatePersistentImg.sh ventoy-1.1.10-new/CreatePers
  fi
  
  if [ ! -z "$passphrase" ]; then
-diff -Naur ventoy-1.1.10-old/tool/ventoy_lib.sh ventoy-1.1.10-new/tool/ventoy_lib.sh
---- ventoy-1.1.10-old/tool/ventoy_lib.sh	2026-03-03 16:17:02.423110021 +0000
-+++ ventoy-1.1.10-new/tool/ventoy_lib.sh	2026-03-03 16:42:27.917098949 +0000
-@@ -6,6 +6,8 @@
+diff --color -Naur ventoy-1.1.12-old/tool/ventoy_lib.sh ventoy-1.1.12-new/tool/ventoy_lib.sh
+--- ventoy-1.1.12-old/tool/ventoy_lib.sh	2026-04-24 18:49:51.411033394 +0100
++++ ventoy-1.1.12-new/tool/ventoy_lib.sh	2026-04-24 18:58:48.286466989 +0100
+@@ -5,6 +5,8 @@
+ VENTOY_PART_SIZE_MB=32
  VENTOY_SECTOR_SIZE=512
  VENTOY_SECTOR_NUM=65536
- 
 +LOGFILE="/var/log/ventoy.log"
 +
+ 
  ventoy_false() {
      [ "1" = "2" ]
- }
 @@ -29,7 +31,7 @@
  }
  
@@ -54,7 +54,7 @@ diff -Naur ventoy-1.1.10-old/tool/ventoy_lib.sh ventoy-1.1.10-new/tool/ventoy_li
  }
  
  vtoy_gen_uuid() {
-@@ -51,31 +53,7 @@
+@@ -51,31 +53,6 @@
  }
  
  check_tool_work_ok() {
@@ -67,7 +67,7 @@ diff -Naur ventoy-1.1.10-old/tool/ventoy_lib.sh ventoy-1.1.10-new/tool/ventoy_li
 -        return
 -    fi
 -   
--    if mkexfatfs -V > /dev/null; then
+-    if mkexfatfs -V > /dev/null; then        
 -        vtdebug "mkexfatfs test ok ..."
 -    else
 -        vtdebug "mkexfatfs test fail ..."
@@ -83,11 +83,10 @@ diff -Naur ventoy-1.1.10-old/tool/ventoy_lib.sh ventoy-1.1.10-new/tool/ventoy_li
 -        return
 -    fi
 -    
-+
      vtdebug "tool check success ..."
      ventoy_true
  }
-@@ -315,7 +293,7 @@
+@@ -315,7 +292,7 @@
      else
      vtdebug "format disk by fdisk ..."
      
@@ -96,9 +95,9 @@ diff -Naur ventoy-1.1.10-old/tool/ventoy_lib.sh ventoy-1.1.10-new/tool/ventoy_li
  o
  n
  p
-diff -Naur ventoy-1.1.10-old/tool/VentoyWorker.sh ventoy-1.1.10-new/tool/VentoyWorker.sh
---- ventoy-1.1.10-old/tool/VentoyWorker.sh	2026-03-03 16:17:02.419287102 +0000
-+++ ventoy-1.1.10-new/tool/VentoyWorker.sh	2026-03-03 16:33:54.178992873 +0000
+diff --color -Naur ventoy-1.1.12-old/tool/VentoyWorker.sh ventoy-1.1.12-new/tool/VentoyWorker.sh
+--- ventoy-1.1.12-old/tool/VentoyWorker.sh	2026-04-24 18:49:51.407567635 +0100
++++ ventoy-1.1.12-new/tool/VentoyWorker.sh	2026-04-24 19:07:55.381417420 +0100
 @@ -106,7 +106,7 @@
  if check_tool_work_ok; then
      vtdebug "check tool work ok"
@@ -162,10 +161,10 @@ diff -Naur ventoy-1.1.10-old/tool/VentoyWorker.sh ventoy-1.1.10-new/tool/VentoyW
  
      check_umount_disk "$DISK"
      
-diff -Naur ventoy-1.1.10-old/Ventoy2Disk.sh ventoy-1.1.10-new/Ventoy2Disk.sh
---- ventoy-1.1.10-old/Ventoy2Disk.sh	2026-03-03 16:17:02.373290887 +0000
-+++ ventoy-1.1.10-new/Ventoy2Disk.sh	2026-03-03 16:35:41.510486932 +0000
-@@ -32,56 +32,4 @@
+diff --color -Naur ventoy-1.1.12-old/Ventoy2Disk.sh ventoy-1.1.12-new/Ventoy2Disk.sh
+--- ventoy-1.1.12-old/Ventoy2Disk.sh	2026-04-24 18:49:51.366082120 +0100
++++ ventoy-1.1.12-new/Ventoy2Disk.sh	2026-04-24 20:19:55.219025537 +0100
+@@ -32,66 +32,4 @@
  echo '**********************************************'
  echo ''
  
@@ -203,6 +202,16 @@ diff -Naur ventoy-1.1.10-old/Ventoy2Disk.sh ventoy-1.1.10-new/Ventoy2Disk.sh
 -    if ldd --version 2>&1 | grep -qi musl; then
 -        mv mkexfatfs mkexfatfs_shared
 -        mv mkexfatfs_static mkexfatfs
+-    else
+-        if ./mkexfatfs -V > /dev/null 2>&1; then
+-            echo "mkexfatfs can not run, check static version" >> ./log.txt
+-        else
+-            if ./mkexfatfs_static -V > /dev/null 2>&1; then
+-                echo "Use static version of mkexfatfs" >> ./log.txt
+-                mv mkexfatfs mkexfatfs_shared
+-                mv mkexfatfs_static mkexfatfs
+-            fi
+-        fi
 -    fi
 -fi
 -
@@ -223,9 +232,9 @@ diff -Naur ventoy-1.1.10-old/Ventoy2Disk.sh ventoy-1.1.10-new/Ventoy2Disk.sh
 -    fi
 -fi
 +./tool/VentoyWorker.sh $*
-diff -Naur ventoy-1.1.10-old/VentoyPlugson.sh ventoy-1.1.10-new/VentoyPlugson.sh
---- ventoy-1.1.10-old/VentoyPlugson.sh	2026-03-03 16:17:02.374195975 +0000
-+++ ventoy-1.1.10-new/VentoyPlugson.sh	2026-03-03 16:37:42.662416899 +0000
+diff --color -Naur ventoy-1.1.12-old/VentoyPlugson.sh ventoy-1.1.12-new/VentoyPlugson.sh
+--- ventoy-1.1.12-old/VentoyPlugson.sh	2026-04-24 18:49:51.367031295 +0100
++++ ventoy-1.1.12-new/VentoyPlugson.sh	2026-04-24 19:08:41.624869288 +0100
 @@ -43,39 +43,6 @@
      exit 1
  fi
@@ -278,9 +287,9 @@ diff -Naur ventoy-1.1.10-old/VentoyPlugson.sh ventoy-1.1.10-new/VentoyPlugson.sh
 -        cd "$OLDDIR"
 -    fi
 -fi
-diff -Naur ventoy-1.1.10-old/VentoyWeb.sh ventoy-1.1.10-new/VentoyWeb.sh
---- ventoy-1.1.10-old/VentoyWeb.sh	2026-03-03 16:17:02.374230398 +0000
-+++ ventoy-1.1.10-new/VentoyWeb.sh	2026-03-03 16:39:37.047028579 +0000
+diff --color -Naur ventoy-1.1.12-old/VentoyWeb.sh ventoy-1.1.12-new/VentoyWeb.sh
+--- ventoy-1.1.12-old/VentoyWeb.sh	2026-04-24 18:49:51.367070384 +0100
++++ ventoy-1.1.12-new/VentoyWeb.sh	2026-04-24 19:09:55.231705458 +0100
 @@ -15,12 +15,6 @@
      echo ""
  }
diff --git a/pkgs/by-name/ve/ventoy/package.nix b/pkgs/by-name/ve/ventoy/package.nix
index 3b49eb2b45d8..902530ecadc5 100644
--- a/pkgs/by-name/ve/ventoy/package.nix
+++ b/pkgs/by-name/ve/ventoy/package.nix
@@ -59,11 +59,11 @@ stdenv.mkDerivation (finalAttrs: {
     "ventoy"
     + optionalString (defaultGuiType == "gtk3") "-gtk3"
     + optionalString (defaultGuiType == "qt5") "-qt5";
-  version = "1.1.10";
+  version = "1.1.12";
 
   src = fetchurl {
     url = "https://github.com/ventoy/Ventoy/releases/download/v${finalAttrs.version}/ventoy-${finalAttrs.version}-linux.tar.gz";
-    hash = "sha256-EROr5uG7cSg0/ldKlmYhqRKFgAT0/v1wFmbsl8W+sgg=";
+    hash = "sha256-BGILVGvMXu61lxdnWVs3E+495xWAqCRJBTxTp8sy/Nk=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ve/veroroute/package.nix b/pkgs/by-name/ve/veroroute/package.nix
index 502cb79e1001..e0e7cd43024f 100644
--- a/pkgs/by-name/ve/veroroute/package.nix
+++ b/pkgs/by-name/ve/veroroute/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "veroroute";
-  version = "2.39";
+  version = "2.40";
 
   src = fetchurl {
     url = "mirror://sourceforge/veroroute/veroroute-${finalAttrs.version}.tar.gz";
-    hash = "sha256-+qX8NFkPkQGW29uQUEuetgW3muDP56lMJgrGCAo+5pc=";
+    hash = "sha256-4Wmvstjq0u8u5EFlvcGRb+UshZbtzAfRShQS2NFCllA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix
index ceef595bd676..f787ded6d86a 100644
--- a/pkgs/by-name/ve/veryl/package.nix
+++ b/pkgs/by-name/ve/veryl/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "veryl";
-  version = "0.19.1";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "veryl-lang";
     repo = "veryl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-X3DF1d2rYrdOc/M4Wwp0FnMK5GC33SlmHpjJ3hyeLso=";
+    hash = "sha256-ZHt62r/mxPRNG0nv9IqTtmR4V++K8e6ttJ1zDeVjv+Q=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-0t2809LWMDU+IKWdxjd4kc+qyI8f/rIbWQ1C3f5BBwY=";
+  cargoHash = "sha256-aouhM9rbMmlm78k6LTT5UGpFFpYRJXCo/2pnuiIxQag=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
index 83e1a5c23b1a..d3c0625f96a9 100644
--- a/pkgs/by-name/vi/vicinae/package.nix
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vicinae";
-  version = "0.20.13";
+  version = "0.20.14";
 
   src = fetchFromGitHub {
     owner = "vicinaehq";
     repo = "vicinae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zRoOKeQ4ne7o7mILwb+5PKE75FhoqkG/HizWs7bKrDo=";
+    hash = "sha256-HfYLb4RdervjyJSrCdHJqyBov4Huej2wd5G1NBulTdQ=";
   };
 
   apiDeps = fetchNpmDeps {
diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index ab3a8065824d..ed8eb68050e2 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
   nixosTests,
   withServer ? true, # the actual metrics server
   withVmAgent ? true, # Agent to collect metrics
@@ -13,13 +14,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.140.0";
+  version = "1.142.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-f/qcUSf/JMfe0rTUY5qT9k7MCVqsZCwRzsCv6puz6tw=";
+    hash = "sha256-PI4P0CGMcYbkrT8Rrgl5P56yTC+r3tnZudvFySzNJeY=";
   };
 
   vendorHash = null;
@@ -60,7 +61,7 @@ buildGoModule (finalAttrs: {
     substituteInPlace lib/storage/storage_test.go \
       --replace-fail "time.After(10 " "time.After(120 " \
       --replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \
-      --replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \
+      --replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)"
   '';
 
   ldflags = [
@@ -78,7 +79,7 @@ buildGoModule (finalAttrs: {
 
   passthru = {
     tests = lib.recurseIntoAttrs nixosTests.victoriametrics;
-    updateScript = ./update.sh;
+    updateScript = nix-update-script { };
   };
 
   meta = {
diff --git a/pkgs/by-name/vi/victoriametrics/update.sh b/pkgs/by-name/vi/victoriametrics/update.sh
deleted file mode 100755
index 84f2f275740e..000000000000
--- a/pkgs/by-name/vi/victoriametrics/update.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p curl jq nix-update
-
-set -ex
-
-curl_github() {
-    curl -L ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@"
-}
-
-latestRelease=$(curl_github https://api.github.com/repos/VictoriaMetrics/VictoriaMetrics/releases/latest | jq -r ".tag_name")
-latestVersion="$(expr "$latestRelease" : 'v\(.*\)')"
-
-nix-update --version "$latestVersion" victoriametrics
diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix
index 463c671f3c5e..1fb310cf12f5 100644
--- a/pkgs/by-name/vi/vimcats/package.nix
+++ b/pkgs/by-name/vi/vimcats/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       It is a fork of lemmy-help that aims to support more recent LuaCATS features.
     '';
     homepage = "https://github.com/mrcjkb/vimcats";
-    changelog = "https://github.com/mrcjkb/vimcats/CHANGELOG.md";
+    changelog = "https://github.com/mrcjkb/vimcats/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = with lib.licenses; [ gpl2Plus ];
     maintainers = with lib.maintainers; [ mrcjkb ];
     mainProgram = "vimcats";
diff --git a/pkgs/by-name/vi/virter/package.nix b/pkgs/by-name/vi/virter/package.nix
index 9fd2bc60b5ed..a6abd7a701f4 100644
--- a/pkgs/by-name/vi/virter/package.nix
+++ b/pkgs/by-name/vi/virter/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "virter";
-  version = "0.30.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "LINBIT";
     repo = "virter";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ql+53p0XL93TbiA40EiOLYixKKOKrZ98+YYvRGw5jYM=";
+    hash = "sha256-EL6yBIeZx2WN6Svo8j1tL4VID5eQJcj8OtDrlHhUTbw=";
   };
 
   vendorHash = "sha256-fOs+PKSIyCYzjvHOjqL5r3C4IXNsnOAJy2y3crqchHg=";
diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 7ac2b8481fe5..dd18a2d425b8 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -67,7 +67,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "7.9.3970.50";
+  version = "7.9.3970.60";
 
   suffix =
     {
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-DIaBjUPs9bgpzwxT20cwdOJzo8kCO1chmudo4wqWSeU=";
-        x86_64-linux = "sha256-9fX0xnIZeu7hTYyKvSQrJj3mQkTPGg8S3IjEjh/84g0=";
+        aarch64-linux = "sha256-2ZI1M1G/l5wRd+vfcc189NWURyVQp05mTCtwk+cEYpU=";
+        x86_64-linux = "sha256-nZn51rotZ8s/tu86OXbBb7LMwqcZPhEvLtfqIOJM1qg=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/vi/vivify/package.nix b/pkgs/by-name/vi/vivify/package.nix
index 08ebe3c821b0..ecb079677dc5 100644
--- a/pkgs/by-name/vi/vivify/package.nix
+++ b/pkgs/by-name/vi/vivify/package.nix
@@ -13,18 +13,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vivify";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "jannis-baum";
     repo = "Vivify";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LjVxSf2rddg9DyAY6MAVFzuoxIT4d1a/8Wv8DukxeYM=";
+    hash = "sha256-CszMG+c0bNHfXWqcI3b4iGpeFJ+FmzHDzxflPS+wEe0=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-61NXUEpXIFJXRuIZgLAkDqsk6WvV7WU2Qm24ID0oDtw=";
+    hash = "sha256-svgEanFiBSQn0TdTuB0CnLR71lkANABEaDiKB+Vc0Rc=";
   };
 
   installPhase = ''
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
       serve as a directory browser and let you view code files with syntax highlighting.
     '';
     homepage = "https://github.com/jannis-baum/Vivify";
-    changelog = "https://github.com/jannis-baum/Vivify/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/jannis-baum/Vivify/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ skohtv ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/vk/vkmark/fix-build-with-newer-vulkan-headers.patch b/pkgs/by-name/vk/vkmark/fix-build-with-newer-vulkan-headers.patch
deleted file mode 100644
index 58a38b39cca1..000000000000
--- a/pkgs/by-name/vk/vkmark/fix-build-with-newer-vulkan-headers.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From abc5fc8495692df968636c29f44719e0999a73b5 Mon Sep 17 00:00:00 2001
-From: Philipp Zabel <p.zabel@pengutronix.de>
-Date: Wed, 10 Dec 2025 10:59:49 +0100
-Subject: [PATCH 1/2] core: Register custom dispatcher with isDispatchLoader
-
-Since Vulkan 1.4.333, custom dispatch loaders must be registered
-with isDispatchLoader to be recognized.
----
- src/vulkan_state.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/vulkan_state.cpp b/src/vulkan_state.cpp
-index a36b2994dbba3e74cb1fb378e4dbb054157ae516..847095147bf5e050e558065623921ac3f06eb7e7 100644
---- a/src/vulkan_state.cpp
-+++ b/src/vulkan_state.cpp
-@@ -65,6 +65,18 @@ class DebugUtilsDispatcher
- 
- }
- 
-+#if VK_HEADER_VERSION >= 333
-+namespace vk::detail {
-+
-+template <>
-+struct isDispatchLoader<::DebugUtilsDispatcher>
-+{
-+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-+};
-+
-+}
-+#endif
-+
- VulkanState::VulkanState(VulkanWSI& vulkan_wsi, ChoosePhysicalDeviceStrategy const& pd_strategy, bool debug)
-     : debug_enabled(debug)
- {
-
-From ab3f3d709e2f93859b528b1ace56423675940290 Mon Sep 17 00:00:00 2001
-From: Philipp Zabel <p.zabel@pengutronix.de>
-Date: Wed, 10 Dec 2025 10:59:49 +0100
-Subject: [PATCH 2/2] kms: Register custom dispatcher with isDispatchLoader
-
-Since Vulkan 1.4.333, custom dispatch loaders must be registered
-with isDispatchLoader to be recognized.
----
- src/ws/kms_window_system.cpp | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/ws/kms_window_system.cpp b/src/ws/kms_window_system.cpp
-index 4bf7838cee0512925ef084b641de3c2a11389c6d..1bc04581eee233f33ad3ea7a719ec4c3894b1104 100644
---- a/src/ws/kms_window_system.cpp
-+++ b/src/ws/kms_window_system.cpp
-@@ -474,6 +474,22 @@ class GetFormatProperties2Dispatcher
-     PFN_vkGetPhysicalDeviceFormatProperties2KHR vkGetPhysicalDeviceFormatProperties2KHR;
- };
- 
-+}
-+
-+#if VK_HEADER_VERSION >= 333
-+namespace vk::detail {
-+
-+template <>
-+struct isDispatchLoader<::GetFormatProperties2Dispatcher>
-+{
-+    static VULKAN_HPP_CONST_OR_CONSTEXPR bool value = true;
-+};
-+
-+}
-+#endif
-+
-+namespace {
-+
- std::vector<uint64_t> vk_get_supported_mods_for_format(VulkanState& vulkan,
-                                                        vk::Format format)
- {
diff --git a/pkgs/by-name/vk/vkmark/package.nix b/pkgs/by-name/vk/vkmark/package.nix
index 3c35f06203ac..bba04b3ba4ad 100644
--- a/pkgs/by-name/vk/vkmark/package.nix
+++ b/pkgs/by-name/vk/vkmark/package.nix
@@ -28,12 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-Rjpjqe7htwlhDdwELm74MvSzHzXLhRD/P8IES7nz/VY=";
   };
 
-  patches = [
-    # Fix build with vulkan-headers >= 1.4.333
-    # Remove once https://github.com/vkmark/vkmark/pull/80 is included in a release
-    ./fix-build-with-newer-vulkan-headers.patch
-  ];
-
   postPatch = ''
     substituteInPlace src/meson.build \
       --replace-fail "vulkan_dep.get_pkgconfig_variable('prefix')" "'${vulkan-headers}'"
diff --git a/pkgs/by-name/vo/volanta/package.nix b/pkgs/by-name/vo/volanta/package.nix
index 7a8fcd3f64bb..1123a0a551d2 100644
--- a/pkgs/by-name/vo/volanta/package.nix
+++ b/pkgs/by-name/vo/volanta/package.nix
@@ -9,11 +9,11 @@
 }:
 let
   pname = "volanta";
-  version = "1.16.4";
-  build = "af311390";
+  version = "1.17.5";
+  build = "e5b83597";
   src = fetchurl {
     url = "https://cdn.volanta.app/software/volanta-app/${version}-${build}/volanta-${version}.AppImage";
-    hash = "sha256-KLbScB7yaFbSdoR1piQppK33Lsvlfamb+MVvESrFqAA=";
+    hash = "sha256-hCHPpY/zU7gPHbCq8peOaaTzH93K14ZRIvGSihP0k3w=";
   };
   appImageContents = appimageTools.extract { inherit pname version src; };
 in
diff --git a/pkgs/by-name/vo/vopono/package.nix b/pkgs/by-name/vo/vopono/package.nix
index 0c3e627aa545..1c548667f9c4 100644
--- a/pkgs/by-name/vo/vopono/package.nix
+++ b/pkgs/by-name/vo/vopono/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vopono";
-  version = "0.10.15";
+  version = "0.10.16";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-78G0Dm0WAEjjud+vrl7n3Uh6NnMQhs3uY4DIeSTKTJs=";
+    hash = "sha256-mZ2PHN1dBW++MZ3APV6sbPgrltcjzTyZvxbvvrsveo4=";
   };
 
-  cargoHash = "sha256-2CeaDoDl8QyDXN8FHfHm6WRsJOfRiq6yRCKHsXXUV0w=";
+  cargoHash = "sha256-jC3iANsDXdit9gAPs5k+rbUUL/J+lH9H4JGiEigMKiw=";
 
   meta = {
     description = "Run applications through VPN connections in network namespaces";
diff --git a/pkgs/by-name/vo/vorbis-tools/package.nix b/pkgs/by-name/vo/vorbis-tools/package.nix
index d31b0425cce1..bcb52282beae 100644
--- a/pkgs/by-name/vo/vorbis-tools/package.nix
+++ b/pkgs/by-name/vo/vorbis-tools/package.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
+  configureFlags = [ "CFLAGS=-std=gnu17" ];
+
   meta = {
     description = "Extra tools for Ogg-Vorbis audio codec";
     longDescription = ''
diff --git a/pkgs/by-name/vo/voxtype/package.nix b/pkgs/by-name/vo/voxtype/package.nix
index 130f8e5bb89c..62084d779d78 100644
--- a/pkgs/by-name/vo/voxtype/package.nix
+++ b/pkgs/by-name/vo/voxtype/package.nix
@@ -51,16 +51,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "voxtype";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "peteonrails";
     repo = "voxtype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gY5gP+F3SbCZsG/jaOHnEu291q6akg1M5c4BebRSpvI=";
+    hash = "sha256-D0CgT0Avb7il6/GU8CtxWUGlMHhYZIPbHX952L4orDM=";
   };
 
-  cargoHash = "sha256-X6TYlmHjLvsUYlxz4WbzHptKyQZHIBt8u1lLqrS/nz0=";
+  cargoHash = "sha256-h0b3H+79v8G28XNBDdCOZ+Vo+6wpfzckPCsDbRzp1m4=";
 
   buildFeatures =
     [ ]
diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
index 1ba0a20c6592..83bb7cac0df3 100644
--- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix
+++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vpl-gpu-rt";
-  version = "26.1.4";
+  version = "26.1.6";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "intel";
     repo = "vpl-gpu-rt";
     rev = "intel-onevpl-${finalAttrs.version}";
-    hash = "sha256-DqEg7GClyWdy9Clop7nIJSllN5gLTSZujgBwN2WmBds=";
+    hash = "sha256-E8CQC2jHSo2ZHp8drXXTgcOOHru3kDJtoLNKwm++YG8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vr/vrcvideocacher/package.nix b/pkgs/by-name/vr/vrcvideocacher/package.nix
index 2eb3e99e5806..4a306b135636 100644
--- a/pkgs/by-name/vr/vrcvideocacher/package.nix
+++ b/pkgs/by-name/vr/vrcvideocacher/package.nix
@@ -14,13 +14,13 @@
 }:
 buildDotnetModule (finalAttrs: {
   pname = "vrcvideocacher";
-  version = "2026.4.4";
+  version = "2026.4.6";
 
   src = fetchFromGitHub {
     owner = "EllyVR";
     repo = "VRCVideoCacher";
     tag = finalAttrs.version;
-    hash = "sha256-VollU7um18HYeIyXC8PzqcNbBYM3gd2JzxSql4VSFWw=";
+    hash = "sha256-0jQK/VFbiMlX9txA/FuyCLe5AADH3IzvvIffZNU5Hes=";
   };
 
   __structuredAttrs = true;
diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix
index 5c6713883364..c09db62db93a 100644
--- a/pkgs/by-name/vs/vsce/package.nix
+++ b/pkgs/by-name/vs/vsce/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "vsce";
-  version = "3.7.1";
+  version = "3.9.1";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vscode-vsce";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7Urn3MlcvJragFvbPYOurUCIOyqYQsEqg5IKbFwcHBo=";
+    hash = "sha256-MYsJOQSrpsEMDw5WbfcfNfrTvu6R5JmKVMeq8WpaFqs=";
   };
 
-  npmDepsHash = "sha256-lJDCeOqSYZCI9o9RsFSviQKkxgcv8XGps3ecy55r7E4=";
+  npmDepsHash = "sha256-QN3twFFcLPqHH4wdC3+G34ze/G/m1RlaPwrHVa0NoFI=";
 
   postPatch = ''
     substituteInPlace package.json --replace-fail '"version": "0.0.0"' '"version": "${finalAttrs.version}"'
diff --git a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix
index 6ac2a3f67935..b85ec94a6ac3 100644
--- a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix
+++ b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix
@@ -8,6 +8,7 @@
   pcsclite,
   qrencode,
   python3,
+  python3Packages,
   help2man,
 }:
 
@@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     autoreconfHook
     libtool
     pkg-config
+    python3Packages.wrapPython
     help2man
   ];
 
@@ -47,6 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--enable-infoplist";
 
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
   meta = {
     description = "Emulates a smart card and makes it accessible through PC/SC";
     homepage = "http://frankmorgner.github.io/vsmartcard/virtualsmartcard/README.html";
diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix
index c1999351dc10..c4c71278a15d 100644
--- a/pkgs/by-name/vt/vtsls/package.nix
+++ b/pkgs/by-name/vt/vtsls/package.nix
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
       version
       ;
     pnpm = pnpm';
-    fetcherVersion = 1;
-    hash = "sha256-SdqeTYRH60CyU522+nBo0uCDnzxDP48eWBAtGTL/pqg=";
+    fetcherVersion = 3;
+    hash = "sha256-1P2ph8ZX6/KptkLP4wk0dZzuvnYCLOWorM1b9+otKsE=";
   };
 
   # Patches to get submodule sha from file instead of 'git submodule status'
diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index 02e95b048124..06c129532f6c 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-unlZBLcDGP6laU2smtOP+hVrvp8HDPBqEk3MmmhO8sE=";
+    fetcherVersion = 3;
+    hash = "sha256-koRJkT/JloptmtQKLprqms53TL/Q4XHaktIl/6PIasw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 6b0c0bb2f16d..005e4df3d1aa 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "vunnel";
-  version = "0.55.3";
+  version = "0.56.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "vunnel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gjkrANO97sdSeW2U+Ah5eo/bbwn32xqmZDrUi5cjD60=";
+    hash = "sha256-2Z+TDEQNUlRVC8lPffK7XphI2qa9xfVZ3JMMBrC7HjE=";
     leaveDotGit = true;
   };
 
diff --git a/pkgs/by-name/wa/wabt/package.nix b/pkgs/by-name/wa/wabt/package.nix
index 0276013f4f50..87324064f225 100644
--- a/pkgs/by-name/wa/wabt/package.nix
+++ b/pkgs/by-name/wa/wabt/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wabt";
-  version = "1.0.39";
+  version = "1.0.40";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "wabt";
     tag = finalAttrs.version;
-    hash = "sha256-Hwfk0wQ8Oz1XI/hIzVy0G+/FyWl+iiGYoFrgLbm27Tk=";
+    hash = "sha256-Lrdmx/JOiWJdzZeyP6HdZH1SEHJ0N5VfSCYxtMBCF74=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/wa/wac-cli/package.nix b/pkgs/by-name/wa/wac-cli/package.nix
index 531e4a0b91b3..d46d65e91e35 100644
--- a/pkgs/by-name/wa/wac-cli/package.nix
+++ b/pkgs/by-name/wa/wac-cli/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wac-cli";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wac";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X3v6MiIqtuQxVjkAG0kXzKL/Mekb32ydEeRvXsdG04I=";
+    hash = "sha256-HWN0CQuijV7f/WHoI7/+u+wL7Mm8sBefb5Ee7nsct6s=";
   };
 
-  cargoHash = "sha256-MC5rP+mTo2CQHi70h3l1bXDWToN6o8NAkjzsuydWzGI=";
+  cargoHash = "sha256-clvC10mMM91jVtEKhGfk2yhU9G4iXAJ+ngcVGieZS3g=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix
index 6fcf339cdba2..337a8d4aec9b 100644
--- a/pkgs/by-name/wa/wakatime-cli/package.nix
+++ b/pkgs/by-name/wa/wakatime-cli/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "wakatime-cli";
-  version = "2.3.1";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZOCOhLeDzdlePETOaBlaGmcxXxEtlKhmWlkXQRhlVBE=";
+    hash = "sha256-N0CYz0G3J7gdCE0Q9QJeukfzVb3E5gCKDEu22vOUO9k=";
   };
 
   vendorHash = "sha256-HngszNLX2b2EVvh8ovouIEvjBOJL1jA5AhA6Y11ke9Y=";
diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix
index 17409408b212..d5caa33bc29b 100644
--- a/pkgs/by-name/wa/walker/package.nix
+++ b/pkgs/by-name/wa/walker/package.nix
@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "walker";
-  version = "2.16.0";
+  version = "2.16.1";
 
   src = fetchFromGitHub {
     owner = "abenz1267";
     repo = "walker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ugacgbPxYM68pAcQRceuSlCWtUEuddltMUzAWrnWlHA=";
+    hash = "sha256-ZoLkqwPVw8SdW+f9Raf15/ttyKqmC6vtKd5R+orNN/g=";
   };
 
-  cargoHash = "sha256-MPjMB5TsrJd28QuEoIDRJjM+SE0cTNCO5PRW+I+/CHE=";
+  cargoHash = "sha256-LoQiovL1DsM63VBFiIPoizaEbH3yFjN9DLUh4wXsRvQ=";
 
   nativeBuildInputs = [
     gobject-introspection
diff --git a/pkgs/by-name/wa/wappalyzergo/package.nix b/pkgs/by-name/wa/wappalyzergo/package.nix
index 3d7bbf2da7ff..23b15b996926 100644
--- a/pkgs/by-name/wa/wappalyzergo/package.nix
+++ b/pkgs/by-name/wa/wappalyzergo/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Implementation of the Wappalyzer Technology Detection Library";
     homepage = "https://github.com/projectdiscovery/wappalyzergo";
-    changelog = "https://github.com/projectdiscovery/wappalyzergo/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/projectdiscovery/wappalyzergo/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "wappalyzergo";
diff --git a/pkgs/by-name/wa/warmup-s3-archives/package.nix b/pkgs/by-name/wa/warmup-s3-archives/package.nix
index 0f81dac52b8a..4371ab758bfe 100644
--- a/pkgs/by-name/wa/warmup-s3-archives/package.nix
+++ b/pkgs/by-name/wa/warmup-s3-archives/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "warmup-s3-archives";
-  version = "1.1.0";
+  version = "1.1.4";
 
   src = fetchFromGitLab {
     owner = "philipmw";
     repo = "warmup-s3-archives";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0moqSc87B3LFL7P5qoSqvdkf+RwLbiWkzGhjR2jgTR4=";
+    hash = "sha256-O2gLnCQ7Y7PKFeXlQqzL6FAoj7m7UI5NpKcYTexaKo4=";
   };
 
-  cargoHash = "sha256-sWSsxGj8+tSNs2JlhDZt+ulo89rPqZM8FjHpbUdeC5w=";
+  cargoHash = "sha256-cOUIbeGAhAiAPbXU8OxCuaczJcUGkjPaTKRvMceeM+Y=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 4b7a689c42ad..c9b66f380fbc 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-gkXz9pkv/0T9TR+wGj8PU7JOC4qEbCHoKSei6xdL8Qs=",
-    "version": "0.2026.04.08.08.36.stable_05"
+    "hash": "sha256-Mff9jfrWQJ2YovS+yW7/NhwGDGASIvUFEAaH04YF6rw=",
+    "version": "0.2026.04.15.08.45.stable_04"
   },
   "linux_x86_64": {
-    "hash": "sha256-Vt6NPu5u7LMnP8sxpl8p3JZSk3ymFf4PZmNdmiVMCO0=",
-    "version": "0.2026.04.08.08.36.stable_05"
+    "hash": "sha256-tGhC+pjPQTTd5XTKwQJ/ctnLcQY6lvvI6zRjXByon5g=",
+    "version": "0.2026.04.15.08.45.stable_04"
   },
   "linux_aarch64": {
-    "hash": "sha256-ZaZoRRUAxuemXS+vkIlP5skr1BpT5nWOI2jjVjCK+gw=",
-    "version": "0.2026.04.08.08.36.stable_05"
+    "hash": "sha256-U7gctUpWhJP2hfF62I7wh/cdE9ixVEVnKd6B1dOoLfc=",
+    "version": "0.2026.04.15.08.45.stable_04"
   }
 }
diff --git a/pkgs/by-name/wa/wasistlos/package.nix b/pkgs/by-name/wa/wasistlos/package.nix
deleted file mode 100644
index f8ad1c8468b8..000000000000
--- a/pkgs/by-name/wa/wasistlos/package.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  fetchFromGitHub,
-  lib,
-  stdenv,
-  cmake,
-  glib-networking,
-  gst_all_1,
-  gtkmm3,
-  libayatana-appindicator,
-  libcanberra,
-  libepoxy,
-  libpsl,
-  libdatrie,
-  libdeflate,
-  libselinux,
-  libsepol,
-  libsysprof-capture,
-  libthai,
-  libxkbcommon,
-  sqlite,
-  pcre,
-  pcre2,
-  pkg-config,
-  webkitgtk_4_1,
-  wrapGAppsHook3,
-  libxtst,
-  libxdmcp,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "wasistlos";
-  version = "1.7.0";
-
-  src = fetchFromGitHub {
-    owner = "xeco23";
-    repo = "WasIstLos";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-h07Qf34unwtyc1VDtCCkukgBDJIvYNgESwAylbsjVsQ=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    glib-networking
-    gst_all_1.gst-libav
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gtkmm3
-    libayatana-appindicator
-    libcanberra
-    libdatrie
-    libdeflate
-    libepoxy
-    libpsl
-    libselinux
-    libsepol
-    libsysprof-capture
-    libthai
-    libxkbcommon
-    pcre
-    pcre2
-    sqlite
-    webkitgtk_4_1
-    libxdmcp
-    libxtst
-  ];
-
-  meta = {
-    homepage = "https://github.com/xeco23/WasIstLos";
-    description = "Unofficial WhatsApp desktop application";
-    mainProgram = "wasistlos";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ bartuka ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-  };
-})
diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix
index 661527e1b9f1..7c5aef4d7e72 100644
--- a/pkgs/by-name/wa/wasm-pack/package.nix
+++ b/pkgs/by-name/wa/wasm-pack/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasm-pack";
-  version = "0.13.1";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
-    owner = "rustwasm";
+    owner = "wasm-bindgen";
     repo = "wasm-pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CN1LcLX7ag+in9sosT2NYVKfhDLGv2m3zHOk2T4MFYc=";
+    hash = "sha256-ik6AJUKuT3GCDTZbHWcplcB7cS0CIcZwFNa6SvGzsIQ=";
   };
 
-  cargoHash = "sha256-nYWvk2v+4IAk/y7fg+Z/nMH+Ml+J5k5ER8uudCQOMB8=";
+  cargoHash = "sha256-n9xuwlj8+3fDTHMS2XobqWFc6mNHQcmmvebRDc82oSo=";
 
   nativeBuildInputs = [
     cmake
@@ -32,13 +32,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doCheck = false;
 
   meta = {
+    changelog = "https://github.com/wasm-bindgen/wasm-pack/blob/v${finalAttrs.version}/CHANGELOG.md";
     description = "Utility that builds rust-generated WebAssembly package";
     mainProgram = "wasm-pack";
-    homepage = "https://github.com/rustwasm/wasm-pack";
+    homepage = "https://github.com/wasm-bindgen/wasm-pack";
     license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = [ lib.maintainers.dhkl ];
+    maintainers = with lib.maintainers; [
+      dhkl
+      hythera
+    ];
   };
 })
diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index bedaaf4a11b1..c292251f1bdd 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasm-tools";
-  version = "1.247.0";
+  version = "1.248.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-whUI6nUD/ibuaqt3hEGG4tLU4U84nFWHYMZ/3HxPM7U=";
+    hash = "sha256-B0G+k5RI7j1J0G4l2lcpA6iTTNUmjQOOwi3zij0Ww+c=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-mERF+ls0lrBasVFdjcFJS3v7KH6B/Zm2uW0N1EHTHew=";
+  cargoHash = "sha256-yMp8AWcWfxTXq4eIekuPhgOdMbuoscck+r0O01cC+AA=";
   cargoBuildFlags = [
     "--package"
     "wasm-tools"
diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix
index 73ca5330e8f2..05d4a99d0756 100644
--- a/pkgs/by-name/wa/wasmtime/package.nix
+++ b/pkgs/by-name/wa/wasmtime/package.nix
@@ -13,20 +13,20 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasmtime";
-  version = "43.0.1";
+  version = "44.0.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasmtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KnsnR9SJoAfKsEIwKRy+AKEdDFQMBfIwISJpEef8kFo=";
+    hash = "sha256-RdEKYfBvtXxy6l4PLL+ii95qkghQfUkFHjG3XfEuM1c=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-nfO16qAYL2NXaV9S1HTPIH+pyYLjWCo2I1EONJf7W74=";
+  cargoHash = "sha256-OS5ZeCNks4NuN8KVuUEjuB2ZHZjfB0U0n77p3PmDC4g=";
   cargoBuildFlags = [
     "--package"
     "wasmtime-cli"
diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix
index de4cfdc1dc1a..05b45dbd18d3 100644
--- a/pkgs/by-name/wa/wastebin/package.nix
+++ b/pkgs/by-name/wa/wastebin/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wastebin";
-  version = "3.5.0";
+  version = "3.6.1";
 
   src = fetchFromGitHub {
     owner = "matze";
     repo = "wastebin";
     rev = finalAttrs.version;
-    hash = "sha256-3CXxRYPI0C2E0QvDETbJLW/2K/MG8UZgXcdOXYEgJeY=";
+    hash = "sha256-yRiODf3lmr3uStU1PlDtRvkD/wewnJt0aOUrQrVzcl0=";
   };
 
-  cargoHash = "sha256-lXHKYoPWzD3Icb2iPuqGJHACKGCjAVYkmgoGOBQ4V0U=";
+  cargoHash = "sha256-hanuUZgwDhkwtu/K7ZunZcw5K7AtBglkdb2c2UnROHc=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/wa/waybar-lyric/package.nix b/pkgs/by-name/wa/waybar-lyric/package.nix
index 777715da4497..94f9bc36a9fe 100644
--- a/pkgs/by-name/wa/waybar-lyric/package.nix
+++ b/pkgs/by-name/wa/waybar-lyric/package.nix
@@ -9,16 +9,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "waybar-lyric";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "Nadim147c";
     repo = "waybar-lyric";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2zK0dQtqjbZJYqTOnDtTxnoXeW+zOhWK7RcinhZ5ob4=";
+    hash = "sha256-1kUAOR7p27pLMH7zlbj+tTlIh0f8JQuWhzQVWvOyKoo=";
   };
 
-  vendorHash = "sha256-TeAZDSiww9/v3uQl8THJZdN/Ffp+FsZ3TsRStE3ndKA=";
+  vendorHash = "sha256-pzHNa/55n84VSFaWmgOtwWmmDLoNE6o8mgpFCz7r8FQ=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/wa/wayle/package.nix b/pkgs/by-name/wa/wayle/package.nix
index 010c72970919..4d550e035c24 100644
--- a/pkgs/by-name/wa/wayle/package.nix
+++ b/pkgs/by-name/wa/wayle/package.nix
@@ -21,7 +21,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wayle";
-  version = "0.2.1";
+  version = "0.2.3";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "wayle-rs";
     repo = "wayle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YzDrvCTPuCOCkq0A79IHP+LYZ7ev3IpmWkk6sHuwDts=";
+    hash = "sha256-K4ItGV7kTZrm3uqHeN/hSZjKzkQpSn+nan3509FYUQw=";
   };
 
-  cargoHash = "sha256-KYYuB2TsHmHqYDXggWbj6HI0iZ0bepdMVDSQcocfXj4=";
+  cargoHash = "sha256-omCcKXYouS9qPdhVINJC2mAjI7uG0M9MH14BN/4Zegs=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/wa/waylock/build.zig.zon.nix b/pkgs/by-name/wa/waylock/build.zig.zon.nix
index 9199191c3ccd..4ea8e40154ec 100644
--- a/pkgs/by-name/wa/waylock/build.zig.zon.nix
+++ b/pkgs/by-name/wa/waylock/build.zig.zon.nix
@@ -8,10 +8,10 @@
 
 linkFarm "zig-packages" [
   {
-    name = "wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27";
+    name = "wayland-0.6.0-lQa1kqz8AQADQmdNJsNhLoNHcnEGEUjrOaPV-dtEnEmX";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz";
-      hash = "sha256-ulIII5iJpM/W/VJB0HcdktEO2eb9T9J0ln2A1Z94dU4=";
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.6.0.tar.gz";
+      hash = "sha256-3m/ITNhZUJ/5uD/Tqm+0uZSktGoYgWF5oldOqOCUkIE=";
     };
   }
   {
diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix
index 465014f33b40..0f7f7ca4f6e9 100644
--- a/pkgs/by-name/wa/waylock/package.nix
+++ b/pkgs/by-name/wa/waylock/package.nix
@@ -10,18 +10,20 @@
   wayland,
   wayland-scanner,
   wayland-protocols,
-  zig_0_15,
+  zig_0_16,
 }:
-
+let
+  zig = zig_0_16;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "waylock";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromCodeberg {
     owner = "ifreund";
     repo = "waylock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TSCE6HSGUkXh76epNuJ+AuG/ZCgR0O8EWRDxz9YDuq8=";
+    hash = "sha256-A/XPgoon1J+fmEVUGuqvqbimRRDfLPkzkMYipPaKrfo=";
   };
 
   postPatch = ''
@@ -34,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     scdoc
     wayland-scanner
-    zig_0_15
+    zig
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/wc/wcc/package.nix b/pkgs/by-name/wc/wcc/package.nix
index a4a49c179ba8..7f81b18f57a0 100644
--- a/pkgs/by-name/wc/wcc/package.nix
+++ b/pkgs/by-name/wc/wcc/package.nix
@@ -46,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/endrazine/wcc/commit/4bea2dac8b49d82e4f72e42027d74fc654380f7b.patch?full_index=1";
       hash = "sha256-RK0ue8hdK/G+njwGmWpaewclRHprO8aBdZ9vBGQIQOc=";
     })
+    # Fix build with gcc 15: function pointer requires explicit arguments
+    (fetchpatch2 {
+      url = "https://github.com/endrazine/wcc/commit/3dfd28cb53b4766032e1113cf508bf2f5dce87d5.patch?full_index=1";
+      hash = "sha256-7RsU3XJvJ2gvNsB1O/pvOrmd+3/wNfoOZj0JVlgJA8o=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/wd/wdfs/package.nix b/pkgs/by-name/wd/wdfs/package.nix
index 5afcb7de209e..073acd4ac0b2 100644
--- a/pkgs/by-name/wd/wdfs/package.nix
+++ b/pkgs/by-name/wd/wdfs/package.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
     neon
   ];
 
+  # autoconf 2.72 sets the C standard to C23 but not all compilers are ready for that
+  configureFlags = [
+    "CFLAGS=-std=gnu17"
+  ];
+
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # Fix the build on macOS with macFUSE installed. Needs autoreconfHook to
     # take effect.
diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
index c7ad96f655ff..4a3fe94ce668 100644
--- a/pkgs/by-name/we/wealthfolio/package.nix
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -19,20 +19,20 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wealthfolio";
-  version = "3.2.1";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "afadil";
     repo = "wealthfolio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-flXuskAzrDFBMcAtOe++QpFRIXvbbx5eqXxrymC4MMM=";
+    hash = "sha256-33gThDw8crrgW5zn9+N8bx6zyuXC2oXu6Slu0WtYrDE=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) src pname version;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-feM1jQsUDKVX4+x4Otdwx6AEM+FO7fiaJjmMbU6GDf8=";
+    fetcherVersion = 3;
+    hash = "sha256-PnKQthd36HiomYIsjB+TQqVNUX5Wocgnrz0SeHfhEyY=";
   };
 
   cargoRoot = ".";
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
       src
       cargoRoot
       ;
-    hash = "sha256-Zo3EVWxuJ//EtqUZ1l2/B1MGlmpoBcWQksY/IpCb5N4";
+    hash = "sha256-ZsUHCNiOoCYUDXs6zdtkI+xYPNJbThGhUhgA4erBy4Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix
index b8da03e924a4..aa5bbbc8fed7 100644
--- a/pkgs/by-name/we/webdav/package.nix
+++ b/pkgs/by-name/we/webdav/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "webdav";
-  version = "5.11.6";
+  version = "5.11.7";
 
   src = fetchFromGitHub {
     owner = "hacdias";
     repo = "webdav";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iTBh6cH7is7UnbbXhn+z/Tnvq5//Jdt1OlPHNfICVUw=";
+    hash = "sha256-xvkkOesOFcgT1OTm0X87eKFdKjEZpMu8Pw+YRTGjJlI=";
   };
 
-  vendorHash = "sha256-L98EShwiysMYXhI6aQut5bfMr76CwY1U06iOgG+jtCY=";
+  vendorHash = "sha256-fSFVqZZXkhFeJPompd6mg+zNV40k5C3pJSjrXiiaPJ8=";
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/we/webdev/package.nix b/pkgs/by-name/we/webdev/package.nix
new file mode 100644
index 000000000000..cec9d4ca6edb
--- /dev/null
+++ b/pkgs/by-name/we/webdev/package.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  buildDartApplication,
+  fetchFromGitHub,
+  versionCheckHook,
+  callPackage,
+  testers,
+  yq-go,
+}:
+buildDartApplication (finalAttrs: {
+  pname = "webdev";
+  version = "3.8.1";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "dart-lang";
+    repo = "webdev";
+    tag = "webdev-v${finalAttrs.version}";
+    hash = "sha256-IwH0+J0iCSPxP/FbKPtmhpWjE16SGyYK88xa8ioBC2w=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/webdev";
+
+  dartEntryPoints = {
+    "bin/webdev" = "bin/webdev.dart";
+  };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  nativeBuildInputs = [ yq-go ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  doInstallCheck = true;
+
+  # Remove the dev_dependencies section.
+  # Relative path overrides in the monorepo break the Nix build which expects
+  # all dependencies to be resolved via the lockfile.
+  preBuild = ''
+    yq -i 'del(.dev_dependencies)' pubspec.yaml
+  '';
+
+  passthru = {
+    updateScript = lib.getExe (callPackage ./update.nix { });
+
+    tests = {
+      # Basic usage check
+      usage = testers.runCommand {
+        name = "webdev-usage-test";
+        # Reference the package itself via finalPackage
+        buildInputs = [ finalAttrs.finalPackage ];
+        script = ''
+          export HOME=$TMPDIR
+          webdev --help > output.txt
+          if grep -q "Usage: webdev" output.txt; then
+            echo "Usage check passed ✅"
+            touch $out
+          else
+            echo "Usage check failed ❌"
+            exit 1
+          fi
+        '';
+      };
+    };
+  };
+
+  meta = {
+    mainProgram = "webdev";
+    homepage = "https://dart.dev/tools/webdev";
+    description = "Command-line tool for developing and deploying web applications with Dart";
+    longDescription = ''
+      A CLI for Dart web development. Provides an easy and consistent set of features for users and tools to build and deploy web applications with Dart.
+    '';
+    changelog = "https://pub.dev/packages/webdev/changelog#${
+      lib.replaceString "." "" finalAttrs.version
+    }";
+    license = lib.licenses.bsd3;
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    identifiers.cpeParts =
+      let
+        versionSplit = lib.split "\\+" finalAttrs.version;
+        versionPart = lib.elemAt versionSplit 0;
+        updatePart =
+          if lib.count (x: lib.isList x) versionSplit > 0 then lib.elemAt versionSplit 2 else "*";
+      in
+      {
+        vendor = "dart-lang";
+        product = "webdev";
+        version = versionPart;
+        update = updatePart;
+      };
+    maintainers = with lib.maintainers; [ KristijanZic ];
+  };
+})
diff --git a/pkgs/by-name/we/webdev/pubspec.lock.json b/pkgs/by-name/we/webdev/pubspec.lock.json
new file mode 100644
index 000000000000..ab8f899b8f95
--- /dev/null
+++ b/pkgs/by-name/we/webdev/pubspec.lock.json
@@ -0,0 +1,597 @@
+{
+  "packages": {
+    "args": {
+      "dependency": "direct main",
+      "description": {
+        "name": "args",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.7.0"
+    },
+    "async": {
+      "dependency": "direct main",
+      "description": {
+        "name": "async",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.13.0"
+    },
+    "browser_launcher": {
+      "dependency": "direct main",
+      "description": {
+        "name": "browser_launcher",
+        "sha256": "ca2557663d3033845f2ef2b60f94fc249528324fd1affddccb7c63ac0ccd6c67",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
+    "build_daemon": {
+      "dependency": "direct main",
+      "description": {
+        "name": "build_daemon",
+        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.1"
+    },
+    "built_collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_collection",
+        "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.1.1"
+    },
+    "built_value": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_value",
+        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.12.4"
+    },
+    "checked_yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "checked_yaml",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.4"
+    },
+    "clock": {
+      "dependency": "transitive",
+      "description": {
+        "name": "clock",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.2"
+    },
+    "collection": {
+      "dependency": "direct main",
+      "description": {
+        "name": "collection",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.19.1"
+    },
+    "convert": {
+      "dependency": "transitive",
+      "description": {
+        "name": "convert",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "crypto": {
+      "dependency": "direct main",
+      "description": {
+        "name": "crypto",
+        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.7"
+    },
+    "dap": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dap",
+        "sha256": "42b0b083a09c59a118741769e218fc3738980ab591114f09d1026241d2b9c290",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
+    "dds": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dds",
+        "sha256": "c90723eb1f1402429c57f717550ce5af80288d74a27c45ccbe754a0e3e038f95",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.2.7"
+    },
+    "dds_service_extensions": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dds_service_extensions",
+        "sha256": "afe0fce921953ac0c5bb276bccd7e36fa5035d7769567d122523fdd09beb4d03",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "devtools_shared": {
+      "dependency": "transitive",
+      "description": {
+        "name": "devtools_shared",
+        "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.0.2"
+    },
+    "dtd": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dtd",
+        "sha256": "14a0360d898ded87c3d99591fc386b8a6ea5d432927bee709b22130cd25b993a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.1"
+    },
+    "dwds": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dwds",
+        "sha256": "4c522fc0d679168b95041c3f8811078e71150f3950a15b575e04decf9ca231db",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "27.0.0"
+    },
+    "extension_discovery": {
+      "dependency": "transitive",
+      "description": {
+        "name": "extension_discovery",
+        "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "file": {
+      "dependency": "direct main",
+      "description": {
+        "name": "file",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.1"
+    },
+    "fixnum": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fixnum",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "http": {
+      "dependency": "direct main",
+      "description": {
+        "name": "http",
+        "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.6.0"
+    },
+    "http_multi_server": {
+      "dependency": "direct main",
+      "description": {
+        "name": "http_multi_server",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.2"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.2"
+    },
+    "io": {
+      "dependency": "direct main",
+      "description": {
+        "name": "io",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.5"
+    },
+    "json_annotation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "json_annotation",
+        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.11.0"
+    },
+    "json_rpc_2": {
+      "dependency": "transitive",
+      "description": {
+        "name": "json_rpc_2",
+        "sha256": "246b321532f0e8e2ba474b4d757eaa558ae4fdd0688fdbc1e1ca9705f9b8ca0e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.3"
+    },
+    "logging": {
+      "dependency": "direct main",
+      "description": {
+        "name": "logging",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "meta": {
+      "dependency": "direct main",
+      "description": {
+        "name": "meta",
+        "sha256": "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.18.1"
+    },
+    "mime": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mime",
+        "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.6"
+    },
+    "package_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_config",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "path": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.1"
+    },
+    "pool": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pool",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.2"
+    },
+    "pub_semver": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "pubspec_parse": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pubspec_parse",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.5.0"
+    },
+    "shelf": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shelf",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.2"
+    },
+    "shelf_packages_handler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_packages_handler",
+        "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "shelf_proxy": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shelf_proxy",
+        "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.4"
+    },
+    "shelf_static": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shelf_static",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
+    "shelf_web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_web_socket",
+        "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
+    "source_maps": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_maps",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.10.13"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.10.2"
+    },
+    "sse": {
+      "dependency": "direct main",
+      "description": {
+        "name": "sse",
+        "sha256": "fcc97470240bb37377f298e2bd816f09fd7216c07928641c0560719f50603643",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.1.8"
+    },
+    "stack_trace": {
+      "dependency": "direct main",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.12.1"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "stream_transform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_transform",
+        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
+    },
+    "term_glyph": {
+      "dependency": "transitive",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.2"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
+    "unified_analytics": {
+      "dependency": "transitive",
+      "description": {
+        "name": "unified_analytics",
+        "sha256": "d86b82270d581c183df9930bf6c910f3fabf8b37a0b1817e34094ce40fad818d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.0.11"
+    },
+    "uuid": {
+      "dependency": "transitive",
+      "description": {
+        "name": "uuid",
+        "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.5.3"
+    },
+    "vm_service": {
+      "dependency": "direct main",
+      "description": {
+        "name": "vm_service",
+        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "14.3.1"
+    },
+    "vm_service_interface": {
+      "dependency": "direct main",
+      "description": {
+        "name": "vm_service_interface",
+        "sha256": "503c92c26cf9f77d688bf8fca27fa9ec40450adbf02ec1ec5f12828ded508ac0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
+    "watcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "watcher",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
+    "web_socket_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket_channel",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.3"
+    },
+    "webkit_inspection_protocol": {
+      "dependency": "direct main",
+      "description": {
+        "name": "webkit_inspection_protocol",
+        "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "yaml": {
+      "dependency": "direct main",
+      "description": {
+        "name": "yaml",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.3"
+    },
+    "yaml_edit": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml_edit",
+        "sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.4"
+    }
+  },
+  "sdks": {
+    "dart": ">=3.10.0-0.0.dev <4.0.0"
+  }
+}
diff --git a/pkgs/by-name/we/webdev/update.nix b/pkgs/by-name/we/webdev/update.nix
new file mode 100644
index 000000000000..c1a8824a46f5
--- /dev/null
+++ b/pkgs/by-name/we/webdev/update.nix
@@ -0,0 +1,64 @@
+{
+  writeShellApplication,
+  common-updater-scripts,
+  nix-update,
+  yq-go,
+  dart,
+  nix,
+}:
+let
+  name = "update-webdev";
+  packageName = "webdev";
+  packageDir = toString ./.;
+in
+writeShellApplication {
+  inherit name;
+  runtimeInputs = [
+    common-updater-scripts
+    nix-update
+    yq-go
+    dart
+    nix
+  ];
+  text = ''
+    pname="''${UPDATE_NIX_PNAME:-${packageName}}"
+
+    main() {
+      old_version="''${UPDATE_NIX_OLD_VERSION:-$(get_version)}"
+      nix-update "$pname" --version stable --version-regex "$pname-v([0-9.]+(:?\\+[0-9]+)?)"
+      new_version=$(get_version)
+      if [[ "$new_version" == "$old_version" ]]; then
+        exit 0
+      fi
+      generate_lockfile
+    }
+
+    get_version() {
+      nix-instantiate --raw --eval --strict -A "$pname.version"
+    }
+
+    generate_lockfile() {
+      tmp_dir=$(mktemp -d)
+      trap 'rm -rf "$tmp_dir"' EXIT
+
+      src=$(nix-build --no-link . -A "$pname.src")
+
+      cp -r "$src/$pname/." "$tmp_dir/"
+      chmod -R +w "$tmp_dir"
+      cd "$tmp_dir"
+
+      # Remove dev_dependencies as in the nix build
+      yq -i 'del(.dev_dependencies)' pubspec.yaml
+
+      # Generate lockfile because it's not included in the source
+      if ! test -f pubspec.lock; then
+        dart pub get
+      fi
+
+      # Convert to JSON
+      yq -o=json . pubspec.lock > "${packageDir}/pubspec.lock.json"
+    }
+
+    main
+  '';
+}
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index aa6bdf928fc4..29d824ab4f35 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -33,6 +33,7 @@
   nss,
   pango,
   zlib,
+  zstd,
   libx11,
   libxcomposite,
   libxcursor,
@@ -57,11 +58,11 @@
 
 stdenv.mkDerivation rec {
   pname = "webex";
-  version = "45.10.1.33646";
+  version = "46.4.0.34620";
 
   src = fetchurl {
-    url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20251205014600/Webex_ubuntu.7z";
-    sha256 = "59894d56ed2d55df1ca908d8b6993c208d685f6e77b8c315e370471e616cfd8d";
+    url = "https://binaries.webex.com/WebexDesktop-Ubuntu-2004-Gold/20260408162435/Webex_ubuntu.7z";
+    sha256 = "f23e8d23230ff33412d01df44a8c49075721e94f10507334c0806625a94114da";
   };
 
   nativeBuildInputs = [
@@ -89,6 +90,7 @@ stdenv.mkDerivation rec {
     nss
     pango
     zlib
+    zstd
     libdrm
     libgcrypt
     libglvnd
diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix
index 30afcecce649..7c471c622968 100644
--- a/pkgs/by-name/we/websurfx/package.nix
+++ b/pkgs/by-name/we/websurfx/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
 }:
 let
-  version = "1.28.0";
+  version = "1.29.0";
 in
 rustPlatform.buildRustPackage {
   pname = "websurfx";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
     owner = "neon-mmd";
     repo = "websurfx";
     tag = "v${version}";
-    hash = "sha256-FQkwRRa4QmkDZ7JIxFjumCDLgzREVQm3K4U1ACpiZX0=";
+    hash = "sha256-F9tXo+DjLR7v6z3BtV/sO/gGlV9aBXgcXRMHEFki98Q=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  cargoHash = "sha256-3wq9KN1n0XCXF9b2VldtlW6DeYt2euBoSIThLWeGCWk=";
+  cargoHash = "sha256-nSZ1sOVsIGdxXuR61R/seW7UX17Kx67f6Sm77GDtLQE=";
 
   postPatch = ''
     substituteInPlace src/handler.rs \
diff --git a/pkgs/by-name/we/webtunnel/package.nix b/pkgs/by-name/we/webtunnel/package.nix
index b4ddb56db5c7..9c3ea36bebd8 100644
--- a/pkgs/by-name/we/webtunnel/package.nix
+++ b/pkgs/by-name/we/webtunnel/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "webtunnel";
-  version = "0.0.3";
+  version = "0.0.4";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
@@ -14,7 +14,7 @@ buildGoModule (finalAttrs: {
     owner = "anti-censorship/pluggable-transports";
     repo = "webtunnel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HB95GCIJeO5fKUW23VHrtNZdc9x9fk2vnmI9JogDWSQ=";
+    hash = "sha256-00Wq2/xuDNftXG+r95/HyEcWQSX0GaQao28CG8yIiR4=";
   };
 
   vendorHash = "sha256-3AAPySLAoMimXUOiy8Ctl+ghG5q+3dWRNGXHpl9nfG0=";
diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
index 87041f4d3977..2b70a7d70336 100644
--- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
+++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
@@ -43,10 +43,11 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
       hash = "sha256-+R0PX84SL2qH8rZMfk3tqkhGWPR6DpY1LgX9bifNYCg=";
     };
 
+    dontWrapQtApps = true;
+
     propagatedBuildInputs =
-      [ ]
-      ++ lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ]
       # avoid .dev outputs propagation
+      lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects.out ]
       ++ lib.optionals (lib.elem "qt6" variants) [
         qt6.qt5compat.out
         qt6.qtsvg.out
diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix
index 6db44914276e..55cdb6698a9b 100644
--- a/pkgs/by-name/wh/whistle/package.nix
+++ b/pkgs/by-name/wh/whistle/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "whistle";
-  version = "2.10.0";
+  version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "avwo";
     repo = "whistle";
     rev = "v${version}";
-    hash = "sha256-hx6TGi8ZQ16FczqMWLa6qXbwsdJf8sVgJR8scmfgucQ=";
+    hash = "sha256-Rql8aSUVZiKbLOZFpIN8GCadloeNcab84mrRJzopV6k=";
   };
 
-  npmDepsHash = "sha256-+v60LaJqwbN0g9oBTCcI0ZuhKiS700QRHfgKf6Fuo8Y=";
+  npmDepsHash = "sha256-uY6a4suEPSwWtZTs4gutd38gwm+9Tef6LX+GPoqUQrA=";
 
   dontNpmBuild = true;
 
diff --git a/pkgs/by-name/wh/whoogle-search/package.nix b/pkgs/by-name/wh/whoogle-search/package.nix
index eb1ad763fb91..def30f89e255 100644
--- a/pkgs/by-name/wh/whoogle-search/package.nix
+++ b/pkgs/by-name/wh/whoogle-search/package.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "whoogle-search";
-  version = "1.2.3";
+  version = "1.2.4";
   pyproject = true;
 
   src = fetchPypi {
     pname = "whoogle_search";
     inherit (finalAttrs) version;
-    hash = "sha256-RP7/KMAJUUkzAVlHK0ln4Xn3zYQOOKkHlmQPYJSEsWM=";
+    hash = "sha256-Vq8CLElP1P/Lcq98IZHgug7a4+sSSyEL2ih4Y5McAfg=";
   };
 
   build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/by-name/wh/why3find/package.nix b/pkgs/by-name/wh/why3find/package.nix
index 8382d6c93395..e9761f556ee8 100644
--- a/pkgs/by-name/wh/why3find/package.nix
+++ b/pkgs/by-name/wh/why3find/package.nix
@@ -10,14 +10,14 @@
 
 ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "why3find";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitLab {
     domain = "git.frama-c.com";
     owner = "pub";
     repo = "why3find";
     tag = finalAttrs.version;
-    hash = "sha256-fqB6VrJ79E6KSAnq8TZGNFlvWbDaBNh+gbuRf0CFFy8=";
+    hash = "sha256-G1Cmmo83Le1WRBTeit2NvyXvWpw0yJtd2kRiGMKSPrs=";
   };
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/by-name/wi/wiiload/fix-gcc15.patch b/pkgs/by-name/wi/wiiload/fix-gcc15.patch
new file mode 100644
index 000000000000..547ecd500407
--- /dev/null
+++ b/pkgs/by-name/wi/wiiload/fix-gcc15.patch
@@ -0,0 +1,21 @@
+diff --git a/source/main.c b/source/main.c
+index 2d817e5..9dfeb3d 100644
+--- a/source/main.c
++++ b/source/main.c
+@@ -28,6 +28,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <libgen.h>
++#include <stdbool.h>
+ #ifndef _WIN32
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+@@ -62,8 +63,6 @@ typedef signed short s16;
+ typedef signed int s32;
+ typedef signed long long s64;
+
+-typedef enum { false, true } bool;
+-
+ #ifndef __WIN32__
+ static const char *desc_export = "export";
+ #ifndef __APPLE__
\ No newline at end of file
diff --git a/pkgs/by-name/wi/wiiload/package.nix b/pkgs/by-name/wi/wiiload/package.nix
index 24ff433b37f9..6eefa0b0af64 100644
--- a/pkgs/by-name/wi/wiiload/package.nix
+++ b/pkgs/by-name/wi/wiiload/package.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-pZdZzCAPfAVucuiV/q/ROY3cz/wxQWep6dCTGNn2fSo=";
   };
 
+  patches = [
+    # https://github.com/devkitPro/wiiload/pull/4
+    ./fix-gcc15.patch
+  ];
+
   preConfigure = "./autogen.sh";
 
   meta = {
diff --git a/pkgs/by-name/wi/wiki-go/package.nix b/pkgs/by-name/wi/wiki-go/package.nix
index 4278ed0d2b8b..6198d9c950de 100644
--- a/pkgs/by-name/wi/wiki-go/package.nix
+++ b/pkgs/by-name/wi/wiki-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "wiki-go";
-  version = "1.8.7";
+  version = "1.8.8";
 
   src = fetchFromGitHub {
     owner = "leomoon-studios";
     repo = "wiki-go";
     tag = "v${version}";
-    hash = "sha256-5Swnr/V/lfXxF1tGhmq2mo+ZDmob9nLOS5pAYY58G/E=";
+    hash = "sha256-zFmyDupVOgj/oOAq8f2iG2glovWjaRy32GCh7u+Rjg8=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/wi/wily/package.nix b/pkgs/by-name/wi/wily/package.nix
index fc4867590c7e..197f31c1baf4 100644
--- a/pkgs/by-name/wi/wily/package.nix
+++ b/pkgs/by-name/wi/wily/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchDebianPatch,
   libx11,
   libxt,
 }:
@@ -20,7 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
     libxt
   ];
 
-  patches = [ ./fix-gcc14-build.patch ];
+  patches = [
+    ./fix-gcc14-build.patch
+    (fetchDebianPatch {
+      pname = "wily";
+      version = "0.13.42";
+      debianRevision = "4";
+      patch = "gcc-15.patch";
+      hash = "sha256-PZZvn2G/1a4Hk0CMVdDK09vyIN9yQ3X4ToCENwYujFA=";
+    })
+  ];
 
   preInstall = ''
     mkdir -p $out/bin
diff --git a/pkgs/by-name/wi/wimboot/package.nix b/pkgs/by-name/wi/wimboot/package.nix
index 5929a4fcb94c..c11713aceda5 100644
--- a/pkgs/by-name/wi/wimboot/package.nix
+++ b/pkgs/by-name/wi/wimboot/package.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://ipxe.org/wimboot";
     description = "Windows Imaging Format bootloader";
+    changelog = "https://github.com/ipxe/wimboot/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       das_j
diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix
index c6a22a303e31..4c96bf397811 100644
--- a/pkgs/by-name/wi/winbox4/package.nix
+++ b/pkgs/by-name/wi/winbox4/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "winbox";
-  version = "4.0.1";
+  version = "4.1";
 
   metaCommon = {
     description = "Graphical configuration utility for RouterOS-based devices";
@@ -15,7 +15,6 @@ let
     license = lib.licenses.unfree;
     mainProgram = "WinBox";
     maintainers = with lib.maintainers; [
-      Scrumplex
       yrd
       savalet
     ];
@@ -23,13 +22,13 @@ let
   x86_64-zip = callPackage ./build-from-zip.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-jsLQiSn9Q0xLiIgfM1S99gsFfs0vtUlh3ZEt9X4yanA=";
+    hash = "sha256-KNNbZhwyH1thiTZUa37fZZMpJUntSpWEeI2t/zmlTY8=";
   };
 
   x86_64-dmg = callPackage ./build-from-dmg.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-ND/1kOsaBnTG8yx+YH48T3jw0KCkgtsf/MuseAVrw0Y=";
+    hash = "sha256-RXFZQqiSYdSxTPXtsTxz1lRYyFO9720d/J2lACWcrLI=";
   };
 in
 (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: {
diff --git a/pkgs/by-name/wi/windsend/package.nix b/pkgs/by-name/wi/windsend/package.nix
index 252f66d150b8..95572f0b0c43 100644
--- a/pkgs/by-name/wi/windsend/package.nix
+++ b/pkgs/by-name/wi/windsend/package.nix
@@ -17,13 +17,13 @@
 
 flutter341.buildFlutterApplication (finalAttrs: {
   pname = "windsend";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "doraemonkeys";
     repo = "WindSend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zpbCtiGPjGLkcZ98uN0y0modMnhucV4g4Sc9P6cRPIw=";
+    hash = "sha256-r3D6Uj8buMceqXov6An+OxgOTcNFrX5PwxhphtbeUv0=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/wi/windsend/pubspec.lock.json b/pkgs/by-name/wi/windsend/pubspec.lock.json
index 2a4d889a40c5..35b4afd3e100 100644
--- a/pkgs/by-name/wi/windsend/pubspec.lock.json
+++ b/pkgs/by-name/wi/windsend/pubspec.lock.json
@@ -54,11 +54,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
     },
     "basic_utils": {
       "dependency": "direct main",
@@ -84,11 +84,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
+        "sha256": "aadd943f4f8cc946882c954c187e6115a84c98c81ad1d9c6cbf0895a8c85da9c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.4"
+      "version": "4.0.5"
     },
     "build_config": {
       "dependency": "transitive",
@@ -114,11 +114,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "7981eb922842c77033026eb4341d5af651562008cdb116bdfa31fc46516b6462",
+        "sha256": "521daf8d189deb79ba474e43a696b41c49fb3987818dbacf3308f1e03673a75e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.2"
+      "version": "2.13.1"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -134,11 +134,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
+        "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.4"
+      "version": "8.12.5"
     },
     "characters": {
       "dependency": "transitive",
@@ -194,11 +194,11 @@
       "dependency": "direct main",
       "description": {
         "name": "clipshare_clipboard_listener",
-        "sha256": "0f4927b147846a19616e7c8289c1e86fd383ee78c52a0d15ddb4ff0971ea400b",
+        "sha256": "13a48db2ab67740f0f580a452777a1b7a576610930951796571425414871ba27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.10"
+      "version": "1.2.14"
     },
     "clock": {
       "dependency": "transitive",
@@ -314,11 +314,11 @@
       "dependency": "direct main",
       "description": {
         "name": "cupertino_icons",
-        "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6",
+        "sha256": "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.8"
+      "version": "1.0.9"
     },
     "custom_refresh_indicator": {
       "dependency": "direct main",
@@ -354,11 +354,11 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
+        "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.5.0"
+      "version": "12.3.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -404,21 +404,21 @@
       "dependency": "direct main",
       "description": {
         "name": "drift",
-        "sha256": "61f876c0291b194980bafd203f48e85d5fb04e4a7334367d1a89f44004dbcb83",
+        "sha256": "055c249d1f91be5a47fe447f88afc24c4ca6f4cd6c5ed66767b4797d48acc2e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.32.0"
+      "version": "2.32.1"
     },
     "drift_dev": {
       "dependency": "direct dev",
       "description": {
         "name": "drift_dev",
-        "sha256": "d687e955cc4b1706ad49b3860fcc1045c09bbf1d84c3c7383615f7f9c3320aa2",
+        "sha256": "88a9de3af8571518148a6d8a513b57779fd1e60a026d3ab8a481a878fba01d91",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.32.0"
+      "version": "2.32.1"
     },
     "fake_async": {
       "dependency": "transitive",
@@ -484,11 +484,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_android",
-        "sha256": "51e8fd0446de75e4b62c065b76db2210c704562d072339d333bd89c57a7f8a7c",
+        "sha256": "bf7ab65776d7e176280c853679e7742668586ba1663f7f1561e897fadad6c3ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.2+4"
+      "version": "0.5.2+5"
     },
     "file_selector_ios": {
       "dependency": "transitive",
@@ -656,11 +656,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
+        "sha256": "38d1c268de9097ff59cf0e844ac38759fc78f76836d37edad06fa21e182055a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.33"
+      "version": "2.0.34"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -898,11 +898,11 @@
       "dependency": "direct main",
       "description": {
         "name": "logger",
-        "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3",
+        "sha256": "25aee487596a6257655a1e091ec2ae66bc30e7af663592cc3a27e6591e05035c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.2"
+      "version": "2.7.0"
     },
     "logging": {
       "dependency": "transitive",
@@ -928,11 +928,11 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.18"
+      "version": "0.12.19"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -979,11 +979,11 @@
       "dependency": "transitive",
       "description": {
         "name": "native_toolchain_c",
-        "sha256": "92b2ca62c8bd2b8d2f267cdfccf9bfbdb7322f778f8f91b3ce5b5cda23a3899f",
+        "sha256": "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.17.5"
+      "version": "0.17.6"
     },
     "network_info_plus": {
       "dependency": "direct main",
@@ -1080,11 +1080,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
+        "sha256": "149441ca6e4f38193b2e004c0ca6376a3d11f51fa5a77552d8bd4d2b0c0912ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.22"
+      "version": "2.2.23"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1371,21 +1371,21 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
+        "sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.5"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41",
+        "sha256": "e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.21"
+      "version": "2.4.23"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1411,11 +1411,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "sha256": "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "shared_preferences_web": {
       "dependency": "transitive",
@@ -1487,11 +1487,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "adc962c96fffb2de1728ef396a995aaedcafbe635abdca13d2a987ce17e57751",
+        "sha256": "732792cfd197d2161a65bb029606a46e0a18ff30ef9e141a7a82172b05ea8ecd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.1"
+      "version": "4.2.2"
     },
     "source_map_stack_trace": {
       "dependency": "transitive",
@@ -1547,11 +1547,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sqlparser",
-        "sha256": "faebfaa581dde5b6b55c499f41532c4883943162ebc12d7138c70cfcead733dc",
+        "sha256": "ab2b467425f1d4f3acfa5fd11a08226f7d6c26ff102c06be1807e1dff34e050b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.44.2"
+      "version": "0.44.3"
     },
     "stack_trace": {
       "dependency": "transitive",
@@ -1627,31 +1627,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "test",
-        "sha256": "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a",
+        "sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.29.0"
+      "version": "1.30.0"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636",
+        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.9"
+      "version": "0.7.10"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943",
+        "sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.15"
+      "version": "0.6.16"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1673,6 +1673,16 @@
       "source": "hosted",
       "version": "2.3.1"
     },
+    "unorm_dart": {
+      "dependency": "direct main",
+      "description": {
+        "name": "unorm_dart",
+        "sha256": "0c69186b03ca6addab0774bcc0f4f17b88d4ce78d9d4d8f0619e30a99ead58e7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.3.2"
+    },
     "url_launcher": {
       "dependency": "direct main",
       "description": {
@@ -1687,11 +1697,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
+        "sha256": "3bb000251e55d4a209aa0e2e563309dc9bb2befea2295fd0cec1f51760aac572",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.28"
+      "version": "6.3.29"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json
index cfc9d0c7d9ed..f7fc93208281 100644
--- a/pkgs/by-name/wi/windsurf/info.json
+++ b/pkgs/by-name/wi/windsurf/info.json
@@ -1,20 +1,20 @@
 {
   "aarch64-darwin": {
-    "version": "1.9600.41",
+    "version": "2.1.32",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/f90ca8311d630b9b77e7537222ecfce0a0ac990b/Windsurf-darwin-arm64-1.9600.41.zip",
-    "sha256": "db935596cf4f27018eca94529c807f1d3e42fb040b75ee99726a0bd9089fcf0b"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/63e54ba26dd2a1b975c172966dff80bad8ae74c7/Windsurf-darwin-arm64-2.1.32.zip",
+    "sha256": "0d7ee912cc619678b5d68115f3dfa11a2581d134032410a887babbb595b613fd"
   },
   "x86_64-darwin": {
-    "version": "1.9600.41",
+    "version": "2.1.32",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/f90ca8311d630b9b77e7537222ecfce0a0ac990b/Windsurf-darwin-x64-1.9600.41.zip",
-    "sha256": "6b7403b6405b9961f5a5d004120da7991ca3b35f140437b6b4ee4ac8d3e72795"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/63e54ba26dd2a1b975c172966dff80bad8ae74c7/Windsurf-darwin-x64-2.1.32.zip",
+    "sha256": "b33d23e38ed15aa11570086c95d1fadddb47635b81571fa82612000c3d5f8d22"
   },
   "x86_64-linux": {
-    "version": "1.9600.41",
+    "version": "2.1.32",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/f90ca8311d630b9b77e7537222ecfce0a0ac990b/Windsurf-linux-x64-1.9600.41.tar.gz",
-    "sha256": "b8c9e9dad0bc51e40e393f5a16e8c20cedefcd91d0bd879c15200039f0933962"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/63e54ba26dd2a1b975c172966dff80bad8ae74c7/Windsurf-linux-x64-2.1.32.tar.gz",
+    "sha256": "b2b8d1644f8684feaa21326d93829f79319381c439fd88663ee570966954d626"
   }
 }
diff --git a/pkgs/by-name/wi/wire-desktop/build-linux.patch b/pkgs/by-name/wi/wire-desktop/build-linux.patch
new file mode 100644
index 000000000000..ccb29ec8610a
--- /dev/null
+++ b/pkgs/by-name/wi/wire-desktop/build-linux.patch
@@ -0,0 +1,10 @@
+--- a/bin/build-tools/lib/build-linux.ts	2026-03-14 16:55:05.607020706 +0300
++++ b/bin/build-tools/lib/build-linux.ts	2026-03-14 16:56:36.314018156 +0300
+@@ -115,6 +115,7 @@
+       ...platformSpecificConfig,
+       depends: rpmDepends,
+     },
++    electronDist: "node_modules/electron-dist",
+   };
+ 
+   return {builderConfig, linuxConfig};
diff --git a/pkgs/by-name/wi/wire-desktop/build-macos.patch b/pkgs/by-name/wi/wire-desktop/build-macos.patch
new file mode 100644
index 000000000000..de4f524bec09
--- /dev/null
+++ b/pkgs/by-name/wi/wire-desktop/build-macos.patch
@@ -0,0 +1,10 @@
+--- a/bin/build-tools/lib/build-macos.ts	2026-03-14 19:53:19.400997490 +0300
++++ b/bin/build-tools/lib/build-macos.ts	2026-03-14 19:53:21.919315580 +0300
+@@ -98,6 +98,7 @@
+     protocols: [{name: `${commonConfig.name} Core Protocol`, schemes: [commonConfig.customProtocolName]}],
+     prune: true,
+     quiet: false,
++    electronZipDir: "node_modules/electron-dist",
+   };
+ 
+   if (macOSConfig.electronMirror) {
diff --git a/pkgs/by-name/wi/wire-desktop/missing-hashes.json b/pkgs/by-name/wi/wire-desktop/missing-hashes.json
new file mode 100644
index 000000000000..8218613607db
--- /dev/null
+++ b/pkgs/by-name/wi/wire-desktop/missing-hashes.json
@@ -0,0 +1,23 @@
+{
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "61ec7f4f3602cda87a24701f7d9904b13eb7d0b579ef7033455541d5a7b13a7868557d3df962b0dc3b84db442e9b829c54355d7ead6d0bf078f2660f10779511",
+  "@unrs/resolver-binding-android-arm64@npm:1.11.1": "98af481a2ff7ef2a88dff7117085c4aa16f522d9a069cc1111c0c01a849fe1752de5a6d846fbd5d6b143b7962831edb929f4a2e71fa60ffa8354bc605a5361d9",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "cdd8a50fa3d09e19a3f28f02bd06735948aa2839806d9771f9be4531ee25aba5f673d561d33c9390aece4bdde9f81f6b79f51127f60df32513f35436e2ce227e",
+  "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "d89ca565eb69b5b9709f1978402a4ae1b83613764e946db35340c3c3ea229c7fb3754a3da169e79a8dc0e552765690ccb62209b17160d1f7d524dca47e36f2f3",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "0b8679c0d7136d7421cb13302311db2fc7e7770d605726814b257e6f03979004ad3e546947d8be159059946c91fa88eef4371e0ab1539453092b1a02491f63db",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "003aa1bd9c950d8b2547e21610cb40bf1cd81e5fd50d8e2bfdcebca9c1c14f902b2d83315cf27415d99a0c35921b9feb3be99ff9cf0e05342b66ec7f2e9cc7cb",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "0f9a66eaffbda26a53f1ad958e02e651cf2e35c3d9e4d8dca794dcdb57312b528dc5aef5419c6a8537bc97cc569e5d4d64673620523279c00648c90359befe1d",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "4e57baf96705e1a690e43a0a62da074a2245b5b17d60339230aa974a35d7c1e7160bde4ac700d7b9b8a5a535ec733675b6c50876310a2e66222b395ac3977305",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "772327066fdf6f457b27a71f1b58b348c829b29053154320980e63a67b8d53b18c342b699f6fffce9f0626cbe93a86e367e0b614581fb875c1897d281381c732",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "60f7876213b834ae92d03d0ab20e914f428d5e9167ef65571061e5921d9dd09e6cc90e02d9394d6e34f645605731f2d7cdc997239b4e33d1799352ce673451f9",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "a947ec594e963273c05352cf1b140da0202ec3f6c6b2bcbb51401b2032fde3298677ec985b3b76640ec21ae2a83ab186290e2e89cb559bffe6e23e069b83dc1a",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "46e462d52b0f064beecc6b3015a4e450e2227da971dab34cb02557756dc082253aec04da64a1e39fa72f4fc1b40779b4964594c702a2dc57728e83ac87ae632d",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "1f0fc98eb80152dc1d81a02eaccefdb4d613992a11d1d584298a4045390534a83ab07f3b25429f5e83ab97c9645491021950960961478da17d1275b071c335e1",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "bddb12a68a6ae78ff036c8403299b31a4a6b8cd87d04ae72197be13dcef9561cf2ae2e5f6727c19ad038c025a57229c8759a6a4ea3ac2c05cc950da62adbb7d1",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "1b00602cce9d99d8f35d1eb6447f14b6a38c0b4bc39807c738c7a0fd64763145d3079adbdcb5b6f0793e5056af636746ef53bbc5ae1f5d300fdf682deb43e887",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "f0b1d5ef2066690fa9987ee47d156b459cf597945e9f0f4b8ae46d0aa8d5ff9693aeb73b302f21b90fde29ed4cedfcbcb19376ad7f1e1f2baf56e9267b9bec67",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "6a00804da3a6388259b15e28ed276367767325ccd08e8f9c6ea0baf8c7cea8d709c4fea9005853fa0024577947d0819e8e41031505b4af6ddbfba4ad98a0ec47",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "68df9e7db0f0253a77d1ac09794e89f47db0878f329f5d079a2f5a73c4200c7b3e5b42c5a6d36eece4372aafb6d8c0f25c632c1c2beee75ef62fa6e204ea2232",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "0fd962a79572c3a47533acd2bba2274583a9d6905d62f4927177c48525b91a3ad67ea680cb9e89bd1802c71cd65a414fc8d11937dad33f6fbf83013eb435acd6",
+  "dmg-license@npm:1.0.11": "be760b0fc5bb36a31ad623597e8c883eee85a2a775107892354b1fb8fd11fba7bf6c2c0e96bb6c43a8f27a448bd4188d6073dbc4c0f53034f42f05660c4571ee",
+  "iconv-corefoundation@npm:1.1.7": "e9456c1ece923480330e2de94c214afa04ef28b72bc9e982ada8c2fdad270a0e6af99cccb303f87406dde84cbf82b807c73152252ecc90f54d89cdd1b0e7351e"
+}
diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix
index 3e98eef5298d..3d6091263bb9 100644
--- a/pkgs/by-name/wi/wire-desktop/package.nix
+++ b/pkgs/by-name/wi/wire-desktop/package.nix
@@ -1,48 +1,173 @@
 {
-  autoPatchelfHook,
-  dpkg,
-  fetchurl,
-  makeDesktopItem,
-  makeWrapper,
-  stdenv,
   lib,
-  udev,
-  buildPackages,
-  cpio,
-  xar,
-  libdbusmenu,
-  alsa-lib,
-  libgbm,
-  nss,
-  nspr,
-  systemd,
+  stdenv,
+  stdenvNoCC,
+  fetchFromGitHub,
+  electron,
+  nodejs,
+  yarn-berry_3,
+  makeWrapper,
+  makeDesktopItem,
+  darwin,
+  zip,
+  jq,
 }:
-
 let
-
-  inherit (stdenv.hostPlatform) system;
-
-  throwSystem = throw "Unsupported system: ${system}";
-
+  hostPlatform = stdenvNoCC.hostPlatform;
+  nodeArch = hostPlatform.node.arch;
+  yarn-berry = yarn-berry_3;
+  # same hash for this release but can change in the future
+  sources = rec {
+    x86_64-linux = rec {
+      version = "3.40.3882";
+      src = fetchFromGitHub {
+        owner = "wireapp";
+        repo = "wire-desktop";
+        tag = "linux/${version}";
+        hash = "sha256-pNu+/JKvaKSqHxNeDL8RcDy+FiY3aynQH06t05qgXrA=";
+      };
+    };
+    x86_64-darwin = rec {
+      version = "3.40.5442";
+      src = fetchFromGitHub {
+        owner = "wireapp";
+        repo = "wire-desktop";
+        tag = "macos/${version}";
+        hash = "sha256-pNu+/JKvaKSqHxNeDL8RcDy+FiY3aynQH06t05qgXrA=";
+      };
+    };
+    aarch64-linux = x86_64-linux;
+    aarch64-darwin = x86_64-darwin;
+  };
+  web-config = fetchFromGitHub {
+    owner = "wireapp";
+    repo = "wire-web-config-wire";
+    tag = "v0.34.9-0";
+    hash = "sha256-E9x/tRcMfXw/tjgNBUTefym9/m/Xu9/9CclwSmxpDzU=";
+  };
+  electron-dist-zip = stdenvNoCC.mkDerivation {
+    pname = "electron-dist-zip";
+    version = electron.version;
+    src = electron.dist;
+    nativeBuildInputs = [ zip ];
+    buildPhase = ''
+      zip --recurse-paths - . > $out
+    '';
+    dontInstall = true;
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "wire-desktop";
+  inherit (sources.${stdenv.system}) version src;
 
-  versions = builtins.fromJSON (builtins.readFile ./versions.json);
+  missingHashes = ./missing-hashes.json;
+  offlineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-md7B8NSqT9dmPxrp9zbWifNow+1j2tuTRMOljG1V8WE=";
+  };
 
-  version =
-    {
-      x86_64-darwin = versions.macos.version;
-      aarch64-darwin = versions.macos.version;
-      x86_64-linux = versions.linux.version;
-    }
-    .${system} or throwSystem;
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry.yarnBerryConfigHook
+    yarn-berry
+    makeWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    jq
+    darwin.autoSignDarwinBinariesHook
+  ];
 
-  hash =
-    {
-      x86_64-darwin = versions.macos.hash;
-      aarch64-darwin = versions.macos.hash;
-      x86_64-linux = versions.linux.hash;
-    }
-    .${system} or throwSystem;
+  patches = [
+    ./build-linux.patch
+    ./build-macos.patch
+  ];
+
+  # we provide web-config externally due to yarn trying to fetch from github on build phase
+  postPatch = ''
+    substituteInPlace .copyconfigrc.js \
+      --replace-fail 'repositoryUrl,' 'repositoryUrl, externalDir : "${web-config}",'
+  '';
+
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+  # we put the electrons for each platform under `node_modules/electron-dist` due to electron packager grabbing it otherwise
+  buildPhase = ''
+    runHook preBuild
+
+    export BUILD_NUMBER=$(echo ${finalAttrs.version} | awk -F. '{print $NF}')
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+
+    # this is needed due to macos builder using electron-packager directly
+    # we put the zipped electron into a custom path which is defined in the patch, see build-macos.patch
+    ELECTRON_VERSION_IN_LOCKFILE=$(yarn why electron --json | tail --lines 1 | jq --raw-output '.children | to_entries | first | .key ' | cut -d : -f 2)
+    mkdir node_modules/electron-dist
+    cp ${electron-dist-zip} node_modules/electron-dist/electron-v$ELECTRON_VERSION_IN_LOCKFILE-mas-${nodeArch}.zip
+
+    # these variables are needed to skip signing on darwin, we sign with autoSignDarwinBinariesHook later
+    export MACOS_CERTIFICATE_NAME_APPLICATION="" MACOS_CERTIFICATE_NAME_INSTALLER=""
+    yarn build:macos:${nodeArch}
+
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isLinux) ''
+
+    cp -R ${electron.dist} node_modules/electron-dist
+    # electron needs to have write access otherwire electron-fuses fails
+    chmod -R u+w node_modules/electron-dist
+
+    # we build only for the linux-unpacked output, not other targets
+    export LINUX_TARGET=dir
+    yarn build:linux
+
+  ''
+  + ''
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+
+    mkdir -p $out/{Applications,bin}
+    cp -r wrap/build/Wire-mas-${nodeArch}/Wire.app $out/Applications
+
+    makeWrapper $out/Applications/Wire.app/Contents/MacOS/Wire $out/bin/wire-desktop
+
+  ''
+  + lib.optionalString (stdenv.hostPlatform.isLinux) ''
+
+    mkdir -p $out/share/wire-desktop
+    cp -r wrap/dist/linux-unpacked/{locales,resources{,.pak}} $out/share/wire-desktop
+
+    makeWrapper ${lib.getExe electron} $out/bin/wire-desktop \
+      --add-flags $out/share/wire-desktop/resources/app.asar \
+      --inherit-argv0
+
+    for size in 32 256; do
+      install -Dm644 "resources/icons/"$size"x"$size".png" "$out/share/icons/hicolor/"$size"x"$size"/apps/wire-desktop.png"
+    done
+
+  ''
+  + ''
+    runHook postInstall
+  '';
+
+  desktopItem = makeDesktopItem {
+    categories = [
+      "Network"
+      "InstantMessaging"
+      "Chat"
+      "VideoConference"
+    ];
+    comment = "Secure messenger for everyone";
+    desktopName = "Wire";
+    exec = "wire-desktop %U";
+    genericName = "Secure messenger";
+    icon = "wire-desktop";
+    name = "wire-desktop";
+    startupWMClass = "Wire";
+  };
 
   meta = {
     description = "Modern, secure messenger for everyone";
@@ -59,153 +184,17 @@ let
     '';
     homepage = "https://wire.com/";
     downloadPage = "https://wire.com/download/";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       arianvp
-      toonn
+      ern775
+      korkutkardes7
     ];
-    platforms = lib.platforms.darwin ++ [
+    platforms = [
       "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
     ];
-    hydraPlatforms = [ ];
   };
-
-  passthru.updateScript = {
-    command = [
-      ./update.sh
-      ./.
-    ];
-    # R-ryantm does not respect the commit feature, leading to inaccurate
-    # commit messages because it only sees the Linux version numbers.
-    # nixpkgs-update: no auto update
-    supportedFeatures = [ "commit" ];
-  };
-
-  linux = stdenv.mkDerivation rec {
-    inherit
-      pname
-      version
-      meta
-      passthru
-      ;
-
-    src = fetchurl {
-      url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb";
-      inherit hash;
-    };
-
-    desktopItem = makeDesktopItem {
-      categories = [
-        "Network"
-        "InstantMessaging"
-        "Chat"
-        "VideoConference"
-      ];
-      comment = "Secure messenger for everyone";
-      desktopName = "Wire";
-      exec = "wire-desktop %U";
-      genericName = "Secure messenger";
-      icon = "wire-desktop";
-      name = "wire-desktop";
-      startupWMClass = "Wire";
-    };
-
-    dontBuild = true;
-    dontConfigure = true;
-    dontPatchELF = true;
-    dontWrapGApps = true;
-
-    # TODO: migrate off autoPatchelfHook and use nixpkgs' electron
-    nativeBuildInputs = [
-      autoPatchelfHook
-      dpkg
-      makeWrapper
-      (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
-    ];
-
-    buildInputs = [
-      alsa-lib
-      libgbm
-      nss
-      nspr
-      systemd
-    ];
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p "$out/bin"
-      cp -R "opt" "$out"
-      cp -R "usr/share" "$out/share"
-      chmod -R g-w "$out"
-
-      # Desktop file
-      mkdir -p "$out/share/applications"
-      cp "${desktopItem}/share/applications/"* "$out/share/applications"
-
-      runHook postInstall
-    '';
-
-    runtimeDependencies = [
-      (lib.getLib udev)
-      libdbusmenu
-    ];
-
-    preFixup = ''
-      gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}")
-    '';
-
-    postFixup = ''
-      makeWrapper $out/opt/Wire/wire-desktop $out/bin/wire-desktop \
-        "''${gappsWrapperArgs[@]}"
-    '';
-  };
-
-  darwin = stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      meta
-      passthru
-      ;
-
-    src = fetchurl {
-      url = "https://github.com/wireapp/wire-desktop/releases/download/macos%2F${version}/Wire.pkg";
-      inherit hash;
-    };
-
-    buildInputs = [
-      cpio
-      xar
-    ];
-
-    unpackPhase = ''
-      runHook preUnpack
-
-      xar -xf $src
-      cd com.wearezeta.zclient.mac.pkg
-
-      runHook postUnpack
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-
-      cat Payload | gunzip -dc | cpio -i
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/Applications
-      cp -r Wire.app $out/Applications
-
-      runHook postInstall
-    '';
-  };
-
-in
-if stdenv.hostPlatform.isDarwin then darwin else linux
+})
diff --git a/pkgs/by-name/wi/wire-desktop/update.sh b/pkgs/by-name/wi/wire-desktop/update.sh
deleted file mode 100755
index 65fb554d6aab..000000000000
--- a/pkgs/by-name/wi/wire-desktop/update.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq
-
-set -e
-
-cd $1
-
-releases=$(curl -L \
-  -H "Accept: application/vnd.github+json" \
-  -H "X-GitHub-Api-Version: 2022-11-28" \
-  "https://api.github.com/repos/wireapp/wire-desktop/releases" \
-)
-
-latest=$(jq --argjson suffix '{ "linux": ".deb", "macos": ".pkg" }' \
-  --slurpfile versions versions.json '
-  def platform_latest(platform):
-    map(select(.tag_name | startswith(platform)))
-    | max_by(.tag_name)
-    | { version: .tag_name | ltrimstr(platform + "/")
-      , url: .assets.[]
-             | .browser_download_url
-             | select(endswith($suffix.[platform]))
-      };
-
-  . as $releases
-  | $versions.[] as $old
-  | $old
-  | with_entries( .key as $key
-                  | { key: $key, value: $releases | platform_latest($key) }
-                  | select(.value.version != $old.[$key].version)
-                )
-' <<< "$releases"
-)
-
-urlHashes=$(
-  printf '{ '
-  function entries () {
-    local sep=''
-    for url in $(jq --raw-output '.[].url' <<< "$latest"); do
-      hash=$(nix-hash --to-sri --type sha256 $(nix-prefetch-url $url))
-      if [ -z "$hash" ]; then
-        printf 'Failed to retrieve hash for %s\n' "$url" 2>&1
-      fi
-      printf '%s"%s": "%s"\n' "$sep" "$url" "$hash"
-      sep=', '
-    done
-  }
-  entries
-  printf '}'
-)
-
-commit=$(jq --arg versionJSON "$(printf '%s/versions.json' "$1")" \
-  --slurpfile versions versions.json '
-  $versions.[] as $old
-  | to_entries
-  | map("\(.key) \($old.[.key].version) -> \(.value.version)")
-  | join(", ")
-  | [ if . == ""
-      then empty
-      else { attrPath: "wire-desktop"
-           , oldVersion: "A"
-           , newVersion: "B"
-           , files: [ $versionJSON ]
-           , commitMessage: "wire-desktop: \(.)"
-           }
-      end
-    ]
-' <<< "$latest"
-)
-
-tempfile=$(mktemp)
-
-updated=$(jq --argjson hashes "$urlHashes" --slurpfile versions versions.json '
-  $versions.[] as $old
-  | $old + map_values(with_entries(if .key == "url"
-                                   then { key: "hash"
-                                        , value: $hashes.[.value]
-                                        }
-                                   else .
-                                   end
-                                  )
-                     )
-' <<< "$latest" > $tempfile
-)
-
-mv $tempfile versions.json
-
-printf '%s' "$commit"
-exit 0
diff --git a/pkgs/by-name/wi/wire-desktop/versions.json b/pkgs/by-name/wi/wire-desktop/versions.json
deleted file mode 100644
index d1771695f066..000000000000
--- a/pkgs/by-name/wi/wire-desktop/versions.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "linux": {
-    "version": "3.40.3882",
-    "hash": "sha256-8cZGbOngQ0LcUdCcalexkF2nEDb+u3I0zqEbRf/sRiw="
-  },
-  "macos": {
-    "version": "3.40.5442",
-    "hash": "sha256-BxGkAbkl5kgeHq4dgITYsU1fXFY8XDWEOfwjHnk6XtQ="
-  }
-}
diff --git a/pkgs/by-name/wi/wireplumber/package.nix b/pkgs/by-name/wi/wireplumber/package.nix
index 9e2421cdb114..3eadcd1f53fc 100644
--- a/pkgs/by-name/wi/wireplumber/package.nix
+++ b/pkgs/by-name/wi/wireplumber/package.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
   __structuredAttrs = true;
+  separateDebugInfo = true;
 
   nativeBuildInputs = [
     meson
diff --git a/pkgs/by-name/wi/wireshark/package.nix b/pkgs/by-name/wi/wireshark/package.nix
index fe93c80535cd..8d9cd1a9e6b8 100644
--- a/pkgs/by-name/wi/wireshark/package.nix
+++ b/pkgs/by-name/wi/wireshark/package.nix
@@ -59,7 +59,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wireshark-${if withQt then "qt" else "cli"}";
-  version = "4.6.4";
+  version = "4.6.5";
 
   outputs = [
     "out"
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "wireshark";
     owner = "wireshark";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h254dXxloBC5xQYcpeaLlAj2Ip4eQWHYSPPJLkIwQZw=";
+    hash = "sha256-Zvrwxjp4LK2J3QnxmPxKKrU01YHQvPyp54UWzeGNCjA=";
   };
 
   patches = [
@@ -226,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: {
       experts. It runs on UNIX, macOS and Windows.
     '';
     homepage = "https://www.wireshark.org";
-    changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${finalAttrs.src.tag}.html";
+    changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${finalAttrs.version}.html";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix
index 7d218c133b93..020621f69297 100644
--- a/pkgs/by-name/wi/witness/package.nix
+++ b/pkgs/by-name/wi/witness/package.nix
@@ -75,8 +75,8 @@ buildGoModule (finalAttrs: {
       attack vectors and can be used as a framework for automated governance.
     '';
     mainProgram = "witness";
-    homepage = "https://github.com/testifysec/witness";
-    changelog = "https://github.com/testifysec/witness/releases/tag/${finalAttrs.src.tag}";
+    homepage = "https://github.com/in-toto/witness";
+    changelog = "https://github.com/in-toto/witness/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       fkautz
diff --git a/pkgs/by-name/hy/hyprfreeze/package.nix b/pkgs/by-name/wl/wl-freeze/package.nix
similarity index 50%
rename from pkgs/by-name/hy/hyprfreeze/package.nix
rename to pkgs/by-name/wl/wl-freeze/package.nix
index 004bfe792e41..e9dfdae1bb96 100644
--- a/pkgs/by-name/hy/hyprfreeze/package.nix
+++ b/pkgs/by-name/wl/wl-freeze/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   makeWrapper,
+  installShellFiles,
   jq,
   procps,
   psmisc,
@@ -10,33 +11,44 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "hyprfreeze";
-  version = "1.2.0";
+  pname = "wl-freeze";
+  version = "2.0.2";
+
+  strictDeps = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Zerodya";
-    repo = "hyprfreeze";
+    repo = "wl-freeze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-omwAWBEnb14ZBux7bvXSJyi7FI1LZ5GaZFn46/bWJA4=";
+    hash = "sha256-miyDiUN86Zy9RfVm1MefKrYihX4+bFv6Jr4Cl4GzGz8=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  dontConfigure = true;
+  dontBuild = true;
+
+  nativeBuildInputs = [
+    makeWrapper
+    installShellFiles
+  ];
 
   installPhase = ''
     runHook preInstall
 
-    install -Dm755 hyprfreeze $out/bin/hyprfreeze
+    install -Dm755 wl-freeze $out/bin/wl-freeze
 
     # Install shell completions
-    install -Dm444 completions/bash/hyprfreeze $out/share/bash-completion/completions/hyprfreeze
-    install -Dm444 completions/zsh/_hyprfreeze $out/share/zsh/site-functions/_hyprfreeze
-    install -Dm444 completions/fish/hyprfreeze.fish $out/share/fish/completions/hyprfreeze.fish
+    installShellCompletion \
+      --cmd wl-freeze \
+      --bash completions/bash/wl-freeze \
+      --zsh completions/zsh/_wl-freeze \
+      --fish completions/fish/wl-freeze.fish
 
     runHook postInstall
   '';
 
   postFixup = ''
-    wrapProgram $out/bin/hyprfreeze \
+    wrapProgram $out/bin/wl-freeze \
       --prefix PATH : ${
         lib.makeBinPath [
           jq
@@ -48,11 +60,11 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "Utility to suspend a game process (and other programs) in Hyprland";
-    homepage = "https://github.com/Zerodya/hyprfreeze";
+    description = "Utility to suspend a game process (and other programs) in Wayland compositors";
+    homepage = "https://github.com/Zerodya/wl-freeze";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ zerodya ];
     platforms = lib.platforms.linux;
-    mainProgram = "hyprfreeze";
+    mainProgram = "wl-freeze";
   };
 })
diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix
index 869ddd5e8957..774b715dc419 100644
--- a/pkgs/by-name/wo/wofi-power-menu/package.nix
+++ b/pkgs/by-name/wo/wofi-power-menu/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wofi-power-menu";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "szaffarano";
     repo = "wofi-power-menu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iz+iiJv5MEQ/Yh6h28uPgRrmnw7xM/X4nUW+VHCarpE=";
+    hash = "sha256-5dhwDfWL0pP28rgbS5eoOARrXDZVTF6EDNimcfcjH3Y=";
   };
 
-  cargoHash = "sha256-6CNoHxC1AMTbbx3s4eqYPfqJ3pePdN2DJw6INUQFbek=";
+  cargoHash = "sha256-Avful4JlhYrdHpzWfseCmmx5jxuOJxEA2Yl6dfkJpXs=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 
diff --git a/pkgs/by-name/wo/wolfssl/package.nix b/pkgs/by-name/wo/wolfssl/package.nix
deleted file mode 100644
index 6cde924b81f7..000000000000
--- a/pkgs/by-name/wo/wolfssl/package.nix
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  util-linux,
-  openssl,
-  cacert,
-  # The primary --enable-XXX variant. 'all' enables most features, but causes build-errors for some software,
-  # requiring to build a special variant for that software. Example: 'haproxy'
-  variant ? "all",
-  extraConfigureFlags ? [ ],
-  enableJni ? false,
-  enableARMCryptoExtensions ?
-    stdenv.hostPlatform.isAarch64
-    && ((builtins.match "^.*\\+crypto.*$" stdenv.hostPlatform.gcc.arch) != null),
-  enableLto ? !(stdenv.hostPlatform.isStatic || stdenv.cc.isClang),
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "wolfssl-${variant}";
-  version = "5.9.1";
-
-  src = fetchFromGitHub {
-    owner = "wolfSSL";
-    repo = "wolfssl";
-    tag = "v${finalAttrs.version}-stable";
-    hash = "sha256-FyEb94hsO2BaTEi1CJRfCsUiT1xyWCzu7Uys81g2CBE=";
-  };
-
-  postPatch = ''
-    patchShebangs ./scripts
-    # ensure test detects musl-based systems too
-    substituteInPlace scripts/ocsp-stapling2.test \
-      --replace '"linux-gnu"' '"linux-"'
-  ''
-  + lib.optionalString enableJni ''
-    # Some tests fail when JNI is enabled
-    sed -i '/TEST_DECL(test_wolfSSL_Tls13_ECH)/d;
-            /TEST_DECL(test_wolfSSL_Tls13_ECH_HRR)/d;
-            /TEST_DECL(test_TLSX_CA_NAMES_bad_extension)/d' tests/api.c
-    sed -i '/quic/d' tests/include.am
-    sed -i '/WOLFSSL_QUIC/,/#endif/d' tests/unit.c
-  '';
-
-  configureFlags = [
-    "--enable-${variant}"
-    "--enable-reproducible-build"
-  ]
-  ++ lib.optionals (variant == "all") [
-    # Extra feature flags to add while building the 'all' variant.
-    # Since they conflict while building other variants, only specify them for this one.
-    "--enable-pkcs11"
-    "--enable-writedup"
-    "--enable-base64encode"
-  ]
-  ++ [
-    # We're not on tiny embedded machines.
-    # Increase TLS session cache from 33 sessions to 20k.
-    "--enable-bigcache"
-
-    # Use WolfSSL's Single Precision Math with timing-resistant cryptography.
-    "--enable-sp=yes${
-      lib.optionalString (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch) ",asm"
-    }"
-    "--enable-sp-math-all"
-    "--enable-harden"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isx86_64) [
-    # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID.
-    "--enable-intelasm"
-    "--enable-aesni"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isAarch64) [
-    # No runtime detection under ARM and no platform function checks like for X86.
-    (if enableARMCryptoExtensions then "--enable-armasm=inline" else "--disable-armasm")
-  ]
-  ++ lib.optionals enableJni [
-    "--enable-jni"
-  ]
-  ++ extraConfigureFlags;
-
-  # Breaks tls13 tests on aarch64-darwin.
-  hardeningDisable = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-    "zerocallusedregs"
-  ];
-
-  # LTO should help with the C implementations.
-  env.NIX_CFLAGS_COMPILE = lib.optionalString enableLto "-flto";
-  env.NIX_LDFLAGS_COMPILE = lib.optionalString enableLto "-flto";
-
-  # Don't attempt connections to external services in the test suite.
-  env.WOLFSSL_EXTERNAL_TEST = "0";
-
-  outputs = [
-    "dev"
-    "doc"
-    "lib"
-    "out"
-  ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    util-linux
-  ];
-
-  # FAILURES:
-  #    497: test_wolfSSL_EVP_PBE_scrypt
-  doCheck = !stdenv.hostPlatform.isLoongArch64;
-
-  nativeCheckInputs = [
-    openssl
-    cacert
-  ];
-
-  postInstall = ''
-    # fix recursive cycle:
-    # wolfssl-config points to dev, dev propagates bin
-    moveToOutput bin/wolfssl-config "$dev"
-    # moveToOutput also removes "$out" so recreate it
-    mkdir -p "$out"
-  '';
-
-  meta = {
-    description = "Small, fast, portable implementation of TLS/SSL for embedded devices";
-    mainProgram = "wolfssl-config";
-    homepage = "https://www.wolfssl.com/";
-    changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${finalAttrs.version}-stable";
-    platforms = lib.platforms.all;
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [
-      fab
-      vifino
-    ];
-  };
-})
diff --git a/pkgs/by-name/wo/wolfstoneextract/package.nix b/pkgs/by-name/wo/wolfstoneextract/package.nix
index 4f779d08633d..4493b4b779c1 100644
--- a/pkgs/by-name/wo/wolfstoneextract/package.nix
+++ b/pkgs/by-name/wo/wolfstoneextract/package.nix
@@ -1,34 +1,44 @@
 {
   lib,
   stdenv,
-  fetchFromBitbucket,
+  fetchFromGitHub,
   cmake,
+  nix-update-script,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wolfstoneextract";
   version = "1.2";
 
-  src = fetchFromBitbucket {
-    owner = "ecwolf";
-    repo = "wolfstoneextract";
-    rev = finalAttrs.version;
+  src = fetchFromGitHub {
+    owner = "ECWolfEngine";
+    repo = "WolfstoneExtract";
+    tag = finalAttrs.version;
     hash = "sha256-yrYLP2ewOtiry+EgH1IEaxz2Q55mqQ6mRGSxzVUnJ8Q=";
   };
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = [ "--help" ];
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Utility to extract Wolfstone data from Wolfenstein II";
-    mainProgram = "wolfstoneextract";
-    homepage = "https://bitbucket.org/ecwolf/wolfstoneextract/src/master/";
-    platforms = [ "x86_64-linux" ];
-    license = with lib.licenses; [
-      gpl3Only
-      bsd3
-    ];
+    homepage = "https://github.com/ECWolfEngine/WolfstoneExtract";
+    changelog = "https://github.com/ECWolfEngine/WolfstoneExtract/blob/${finalAttrs.src.rev}/changelog";
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ keenanweaver ];
+    mainProgram = "wolfstoneextract";
+    sourceProvenance = with lib.sourceTypes; [ fromSource ];
+    platforms = [ "x86_64-linux" ];
   };
 })
diff --git a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
index 3334f4c7b0e8..1a3199253657 100644
--- a/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
+++ b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "woodpecker-plugin-git";
-  version = "2.8.1";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "woodpecker-ci";
     repo = "plugin-git";
     tag = finalAttrs.version;
-    hash = "sha256-MhtqRWmZCjtb2QOwlbnlZUPHDNunjgWlhHCtM9pvYMM=";
+    hash = "sha256-Ib4Jdo8KT1DUncWi2oCJRBeEwqCNi98D9eXHrhYVo64=";
   };
 
-  vendorHash = "sha256-hOktS+CQQ6TaHt96DaAcZXhqJGGleD/RdjdUfgv7oxw=";
+  vendorHash = "sha256-IPqtAwre3Fs6TvWdmuDkvD/abzZwtE5OKEGEkCtdCI8=";
 
   env.CGO_ENABLED = "0";
 
diff --git a/pkgs/by-name/wo/woomer/package.nix b/pkgs/by-name/wo/woomer/package.nix
index a2cd773dc4d5..dd86b5078b94 100644
--- a/pkgs/by-name/wo/woomer/package.nix
+++ b/pkgs/by-name/wo/woomer/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   cmake,
   fetchFromGitHub,
   glfw3,
@@ -22,7 +21,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-LcL43Wq+5d7HPsm2bEK0vZsjP/dixtNhMKywXMi4ODw=";
   };
 
-  cargoHash = "sha256-xll/A0synEsXy9kPThA3bR8LRuAOQH0T6CAfIEoYJ0w=";
+  cargoPatches = [
+    # fix compilation on aarch64
+    # remove when https://github.com/coffeeispower/woomer/pull/30 is merged
+    ./unbreak-aarch64-linux.patch
+  ];
+
+  cargoHash = "sha256-mSyTQU/PtibkepFrYh6nrRtnsd1jONaPXt9Y5SiE3/U=";
 
   strictDeps = true;
 
@@ -70,8 +75,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # https://github.com/waycrate/wayshot/blob/cb6bd68dbbe6ab70a5d8fe3bd04cc154f0631cd8/libwayshot/src/screencopy.rs#L11
     # https://github.com/nix-rust/nix/blob/0e4353a368abfcedea4ebe4345cf7604bb61d238/src/sys/mod.rs#L40-L44
     platforms = lib.platforms.linux ++ lib.platforms.freebsd;
-    # TODO: Remove after upstream is no longer affected by
-    # https://github.com/raylib-rs/raylib-rs/issues/74
-    broken = stdenv.hostPlatform.isAarch64;
   };
 })
diff --git a/pkgs/by-name/wo/woomer/unbreak-aarch64-linux.patch b/pkgs/by-name/wo/woomer/unbreak-aarch64-linux.patch
new file mode 100644
index 000000000000..de0a9d7df366
--- /dev/null
+++ b/pkgs/by-name/wo/woomer/unbreak-aarch64-linux.patch
@@ -0,0 +1,1657 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index fc7c39e..f8da508 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -4,24 +4,123 @@ version = 4
+ 
+ [[package]]
+ name = "adler2"
+-version = "2.0.0"
++version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
++checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+ 
+ [[package]]
+ name = "aho-corasick"
+-version = "1.1.3"
++version = "1.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
++checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+ dependencies = [
+  "memchr",
+ ]
+ 
+ [[package]]
+-name = "autocfg"
+-version = "1.4.0"
++name = "aligned"
++version = "0.4.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
++checksum = "ee4508988c62edf04abd8d92897fca0c2995d907ce1dfeaf369dac3716a40685"
++dependencies = [
++ "as-slice",
++]
++
++[[package]]
++name = "aligned-vec"
++version = "0.6.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b"
++dependencies = [
++ "equator",
++]
++
++[[package]]
++name = "anyhow"
++version = "1.0.100"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
++
++[[package]]
++name = "arbitrary"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
++
++[[package]]
++name = "arg_enum_proc_macro"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "arrayvec"
++version = "0.7.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
++
++[[package]]
++name = "as-slice"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516"
++dependencies = [
++ "stable_deref_trait",
++]
++
++[[package]]
++name = "autocfg"
++version = "1.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
++
++[[package]]
++name = "av-scenechange"
++version = "0.14.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0f321d77c20e19b92c39e7471cf986812cbb46659d2af674adc4331ef3f18394"
++dependencies = [
++ "aligned",
++ "anyhow",
++ "arg_enum_proc_macro",
++ "arrayvec",
++ "log",
++ "num-rational",
++ "num-traits",
++ "pastey",
++ "rayon",
++ "thiserror 2.0.17",
++ "v_frame",
++ "y4m",
++]
++
++[[package]]
++name = "av1-grain"
++version = "0.2.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8"
++dependencies = [
++ "anyhow",
++ "arrayvec",
++ "log",
++ "nom 8.0.0",
++ "num-rational",
++ "v_frame",
++]
++
++[[package]]
++name = "avif-serialize"
++version = "0.8.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "47c8fbc0f831f4519fe8b810b6a7a91410ec83031b8233f730a0480029f6a23f"
++dependencies = [
++ "arrayvec",
++]
+ 
+ [[package]]
+ name = "bindgen"
+@@ -29,10 +128,10 @@ version = "0.70.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
+ dependencies = [
+- "bitflags 2.9.1",
++ "bitflags",
+  "cexpr",
+  "clang-sys",
+- "itertools",
++ "itertools 0.13.0",
+  "log",
+  "prettyplease",
+  "proc-macro2",
+@@ -45,36 +144,51 @@ dependencies = [
+ 
+ [[package]]
+ name = "bit_field"
+-version = "0.10.2"
++version = "0.10.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
++checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6"
+ 
+ [[package]]
+ name = "bitflags"
+-version = "1.3.2"
++version = "2.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
++checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+ 
+ [[package]]
+-name = "bitflags"
+-version = "2.9.1"
++name = "bitstream-io"
++version = "4.9.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
++checksum = "60d4bd9d1db2c6bdf285e223a7fa369d5ce98ec767dec949c6ca62863ce61757"
++dependencies = [
++ "core2",
++]
++
++[[package]]
++name = "built"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64"
++
++[[package]]
++name = "bumpalo"
++version = "3.19.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
+ 
+ [[package]]
+ name = "bytemuck"
+-version = "1.23.0"
++version = "1.24.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
++checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
+ dependencies = [
+  "bytemuck_derive",
+ ]
+ 
+ [[package]]
+ name = "bytemuck_derive"
+-version = "1.9.3"
++version = "1.10.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1"
++checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -88,11 +202,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+ 
+ [[package]]
+-name = "cc"
+-version = "1.2.23"
++name = "byteorder-lite"
++version = "0.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
++checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
++
++[[package]]
++name = "cc"
++version = "1.2.51"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203"
+ dependencies = [
++ "find-msvc-tools",
++ "jobserver",
++ "libc",
+  "shlex",
+ ]
+ 
+@@ -102,14 +225,14 @@ version = "0.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+ dependencies = [
+- "nom",
++ "nom 7.1.3",
+ ]
+ 
+ [[package]]
+ name = "cfg-if"
+-version = "1.0.0"
++version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+ 
+ [[package]]
+ name = "clang-sys"
+@@ -124,9 +247,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "cmake"
+-version = "0.1.54"
++version = "0.1.57"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
++checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
+ dependencies = [
+  "cc",
+ ]
+@@ -138,10 +261,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+ 
+ [[package]]
+-name = "crc32fast"
+-version = "1.4.2"
++name = "core2"
++version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
++checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "crc32fast"
++version = "1.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+ dependencies = [
+  "cfg-if",
+ ]
+@@ -173,9 +305,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+ 
+ [[package]]
+ name = "crunchy"
+-version = "0.2.3"
++version = "0.2.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
++checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+ 
+ [[package]]
+ name = "dlib"
+@@ -198,11 +330,11 @@ version = "0.12.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1"
+ dependencies = [
+- "bitflags 2.9.1",
++ "bitflags",
+  "bytemuck",
+  "drm-ffi",
+  "drm-fourcc",
+- "rustix",
++ "rustix 0.38.44",
+ ]
+ 
+ [[package]]
+@@ -212,7 +344,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53"
+ dependencies = [
+  "drm-sys",
+- "rustix",
++ "rustix 0.38.44",
+ ]
+ 
+ [[package]]
+@@ -238,20 +370,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+ 
+ [[package]]
+-name = "errno"
+-version = "0.3.12"
++name = "equator"
++version = "0.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
++checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
++dependencies = [
++ "equator-macro",
++]
++
++[[package]]
++name = "equator-macro"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "errno"
++version = "0.3.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+ dependencies = [
+  "libc",
+- "windows-sys",
++ "windows-sys 0.61.2",
+ ]
+ 
+ [[package]]
+ name = "exr"
+-version = "1.73.0"
++version = "1.74.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
++checksum = "4300e043a56aa2cb633c01af81ca8f699a321879a7854d3896a0ba89056363be"
+ dependencies = [
+  "bit_field",
+  "half",
+@@ -262,6 +414,26 @@ dependencies = [
+  "zune-inflate",
+ ]
+ 
++[[package]]
++name = "fax"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab"
++dependencies = [
++ "fax_derive",
++]
++
++[[package]]
++name = "fax_derive"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
+ [[package]]
+ name = "fdeflate"
+ version = "0.3.7"
+@@ -272,10 +444,16 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "flate2"
+-version = "1.1.1"
++name = "find-msvc-tools"
++version = "0.1.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
++checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff"
++
++[[package]]
++name = "flate2"
++version = "1.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+ dependencies = [
+  "crc32fast",
+  "miniz_oxide",
+@@ -287,7 +465,7 @@ version = "0.15.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a"
+ dependencies = [
+- "bitflags 2.9.1",
++ "bitflags",
+  "drm",
+  "drm-fourcc",
+  "gbm-sys",
+@@ -306,10 +484,22 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "gif"
+-version = "0.13.1"
++name = "getrandom"
++version = "0.3.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
++checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "r-efi",
++ "wasip2",
++]
++
++[[package]]
++name = "gif"
++version = "0.14.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f5df2ba84018d80c213569363bdcd0c64e6933c67fe4c1d60ecf822971a3c35e"
+ dependencies = [
+  "color_quant",
+  "weezl",
+@@ -337,18 +527,19 @@ dependencies = [
+ 
+ [[package]]
+ name = "glob"
+-version = "0.3.2"
++version = "0.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
++checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+ 
+ [[package]]
+ name = "half"
+-version = "2.6.0"
++version = "2.7.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
++checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+ dependencies = [
+  "cfg-if",
+  "crunchy",
++ "zerocopy",
+ ]
+ 
+ [[package]]
+@@ -360,13 +551,58 @@ dependencies = [
+  "bytemuck",
+  "byteorder",
+  "color_quant",
++ "num-traits",
++]
++
++[[package]]
++name = "image"
++version = "0.25.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a"
++dependencies = [
++ "bytemuck",
++ "byteorder-lite",
++ "color_quant",
+  "exr",
+  "gif",
+- "jpeg-decoder",
++ "image-webp",
++ "moxcms",
+  "num-traits",
+  "png",
+  "qoi",
++ "ravif",
++ "rayon",
++ "rgb",
+  "tiff",
++ "zune-core 0.5.0",
++ "zune-jpeg 0.5.8",
++]
++
++[[package]]
++name = "image-webp"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3"
++dependencies = [
++ "byteorder-lite",
++ "quick-error",
++]
++
++[[package]]
++name = "imgref"
++version = "1.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8"
++
++[[package]]
++name = "interpolate_name"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
+ ]
+ 
+ [[package]]
+@@ -379,12 +615,22 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "jpeg-decoder"
+-version = "0.3.1"
++name = "itertools"
++version = "0.14.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
++checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+ dependencies = [
+- "rayon",
++ "either",
++]
++
++[[package]]
++name = "jobserver"
++version = "0.1.34"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
++dependencies = [
++ "getrandom",
++ "libc",
+ ]
+ 
+ [[package]]
+@@ -405,24 +651,34 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
+ 
+ [[package]]
+ name = "lebe"
+-version = "0.5.2"
++version = "0.5.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
++checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.172"
++version = "0.2.178"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
++checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
++
++[[package]]
++name = "libfuzzer-sys"
++version = "0.4.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
++dependencies = [
++ "arbitrary",
++ "cc",
++]
+ 
+ [[package]]
+ name = "libloading"
+-version = "0.8.7"
++version = "0.8.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
++checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+ dependencies = [
+  "cfg-if",
+- "windows-targets 0.53.0",
++ "windows-link",
+ ]
+ 
+ [[package]]
+@@ -433,11 +689,11 @@ dependencies = [
+  "drm",
+  "gbm",
+  "gl",
+- "image",
++ "image 0.24.9",
+  "khronos-egl",
+  "memmap2",
+- "rustix",
+- "thiserror",
++ "rustix 0.38.44",
++ "thiserror 1.0.69",
+  "tracing",
+  "wayland-backend",
+  "wayland-client",
+@@ -458,22 +714,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
+ 
+ [[package]]
+-name = "log"
+-version = "0.4.27"
++name = "linux-raw-sys"
++version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
++checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
++
++[[package]]
++name = "log"
++version = "0.4.29"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
++
++[[package]]
++name = "loop9"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
++dependencies = [
++ "imgref",
++]
++
++[[package]]
++name = "maybe-rayon"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
++dependencies = [
++ "cfg-if",
++ "rayon",
++]
+ 
+ [[package]]
+ name = "memchr"
+-version = "2.7.4"
++version = "2.7.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
++checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+ 
+ [[package]]
+ name = "memmap2"
+-version = "0.9.5"
++version = "0.9.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
++checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490"
+ dependencies = [
+  "libc",
+ ]
+@@ -495,14 +776,30 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+ 
+ [[package]]
+ name = "miniz_oxide"
+-version = "0.8.8"
++version = "0.8.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
++checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+ dependencies = [
+  "adler2",
+  "simd-adler32",
+ ]
+ 
++[[package]]
++name = "moxcms"
++version = "0.7.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
++dependencies = [
++ "num-traits",
++ "pxfm",
++]
++
++[[package]]
++name = "new_debug_unreachable"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
++
+ [[package]]
+ name = "nom"
+ version = "7.1.3"
+@@ -513,6 +810,62 @@ dependencies = [
+  "minimal-lexical",
+ ]
+ 
++[[package]]
++name = "nom"
++version = "8.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "noop_proc_macro"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
++
++[[package]]
++name = "num-bigint"
++version = "0.4.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
++dependencies = [
++ "num-integer",
++ "num-traits",
++]
++
++[[package]]
++name = "num-derive"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "num-integer"
++version = "0.1.46"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
++dependencies = [
++ "num-traits",
++]
++
++[[package]]
++name = "num-rational"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
++dependencies = [
++ "num-bigint",
++ "num-integer",
++ "num-traits",
++]
++
+ [[package]]
+ name = "num-traits"
+ version = "0.2.19"
+@@ -534,6 +887,12 @@ version = "1.0.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+ 
++[[package]]
++name = "pastey"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec"
++
+ [[package]]
+ name = "pin-project-lite"
+ version = "0.2.16"
+@@ -548,11 +907,11 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+ 
+ [[package]]
+ name = "png"
+-version = "0.17.16"
++version = "0.18.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
++checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
+ dependencies = [
+- "bitflags 1.3.2",
++ "bitflags",
+  "crc32fast",
+  "fdeflate",
+  "flate2",
+@@ -560,10 +919,19 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "prettyplease"
+-version = "0.2.32"
++name = "ppv-lite86"
++version = "0.2.21"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
++dependencies = [
++ "zerocopy",
++]
++
++[[package]]
++name = "prettyplease"
++version = "0.2.37"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+ dependencies = [
+  "proc-macro2",
+  "syn",
+@@ -571,13 +939,41 @@ dependencies = [
+ 
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.95"
++version = "1.0.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
++checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0"
+ dependencies = [
+  "unicode-ident",
+ ]
+ 
++[[package]]
++name = "profiling"
++version = "1.0.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
++dependencies = [
++ "profiling-procmacros",
++]
++
++[[package]]
++name = "profiling-procmacros"
++version = "1.0.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b"
++dependencies = [
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "pxfm"
++version = "0.1.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8"
++dependencies = [
++ "num-traits",
++]
++
+ [[package]]
+ name = "qoi"
+ version = "0.4.1"
+@@ -588,23 +984,114 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "quick-xml"
+-version = "0.37.5"
++name = "quick-error"
++version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
++checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
++
++[[package]]
++name = "quick-xml"
++version = "0.38.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
+ dependencies = [
+  "memchr",
+ ]
+ 
+ [[package]]
+ name = "quote"
+-version = "1.0.40"
++version = "1.0.42"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
++checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+ dependencies = [
+  "proc-macro2",
+ ]
+ 
++[[package]]
++name = "r-efi"
++version = "5.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
++
++[[package]]
++name = "rand"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
++dependencies = [
++ "rand_chacha",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
++dependencies = [
++ "ppv-lite86",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
++dependencies = [
++ "getrandom",
++]
++
++[[package]]
++name = "rav1e"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "43b6dd56e85d9483277cde964fd1bdb0428de4fec5ebba7540995639a21cb32b"
++dependencies = [
++ "aligned-vec",
++ "arbitrary",
++ "arg_enum_proc_macro",
++ "arrayvec",
++ "av-scenechange",
++ "av1-grain",
++ "bitstream-io",
++ "built",
++ "cfg-if",
++ "interpolate_name",
++ "itertools 0.14.0",
++ "libc",
++ "libfuzzer-sys",
++ "log",
++ "maybe-rayon",
++ "new_debug_unreachable",
++ "noop_proc_macro",
++ "num-derive",
++ "num-traits",
++ "paste",
++ "profiling",
++ "rand",
++ "rand_chacha",
++ "simd_helpers",
++ "thiserror 2.0.17",
++ "v_frame",
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "ravif"
++version = "0.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ef69c1990ceef18a116855938e74793a5f7496ee907562bd0857b6ac734ab285"
++dependencies = [
++ "avif-serialize",
++ "imgref",
++ "loop9",
++ "quick-error",
++ "rav1e",
++ "rayon",
++ "rgb",
++]
++
+ [[package]]
+ name = "raylib"
+ version = "5.5.1"
+@@ -615,7 +1102,7 @@ dependencies = [
+  "paste",
+  "raylib-sys",
+  "seq-macro",
+- "thiserror",
++ "thiserror 1.0.69",
+ ]
+ 
+ [[package]]
+@@ -631,9 +1118,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rayon"
+-version = "1.10.0"
++version = "1.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
++checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+ dependencies = [
+  "either",
+  "rayon-core",
+@@ -641,9 +1128,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rayon-core"
+-version = "1.12.1"
++version = "1.13.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
++checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+ dependencies = [
+  "crossbeam-deque",
+  "crossbeam-utils",
+@@ -651,9 +1138,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "regex"
+-version = "1.11.1"
++version = "1.12.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
++checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+ dependencies = [
+  "aho-corasick",
+  "memchr",
+@@ -663,9 +1150,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "regex-automata"
+-version = "0.4.9"
++version = "0.4.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
++checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+ dependencies = [
+  "aho-corasick",
+  "memchr",
+@@ -674,9 +1161,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "regex-syntax"
+-version = "0.8.5"
++version = "0.8.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
++checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
++
++[[package]]
++name = "rgb"
++version = "0.8.52"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
+ 
+ [[package]]
+ name = "rustc-hash"
+@@ -690,13 +1183,32 @@ version = "0.38.44"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+ dependencies = [
+- "bitflags 2.9.1",
++ "bitflags",
+  "errno",
+  "libc",
+  "linux-raw-sys 0.4.15",
+- "windows-sys",
++ "windows-sys 0.59.0",
+ ]
+ 
++[[package]]
++name = "rustix"
++version = "1.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
++dependencies = [
++ "bitflags",
++ "errno",
++ "libc",
++ "linux-raw-sys 0.11.0",
++ "windows-sys 0.61.2",
++]
++
++[[package]]
++name = "rustversion"
++version = "1.0.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
++
+ [[package]]
+ name = "scoped-tls"
+ version = "1.0.1"
+@@ -717,21 +1229,36 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+ 
+ [[package]]
+ name = "simd-adler32"
+-version = "0.3.7"
++version = "0.3.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
++checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
++
++[[package]]
++name = "simd_helpers"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
++dependencies = [
++ "quote",
++]
+ 
+ [[package]]
+ name = "smallvec"
+-version = "1.15.0"
++version = "1.15.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
++checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
++
++[[package]]
++name = "stable_deref_trait"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+ 
+ [[package]]
+ name = "syn"
+-version = "2.0.101"
++version = "2.0.112"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
++checksum = "21f182278bf2d2bcb3c88b1b08a37df029d71ce3d3ae26168e3c653b213b99d4"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -744,7 +1271,16 @@ version = "1.0.69"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+ dependencies = [
+- "thiserror-impl",
++ "thiserror-impl 1.0.69",
++]
++
++[[package]]
++name = "thiserror"
++version = "2.0.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
++dependencies = [
++ "thiserror-impl 2.0.17",
+ ]
+ 
+ [[package]]
+@@ -759,21 +1295,35 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "tiff"
+-version = "0.9.1"
++name = "thiserror-impl"
++version = "2.0.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
++checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+ dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "tiff"
++version = "0.10.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f"
++dependencies = [
++ "fax",
+  "flate2",
+- "jpeg-decoder",
++ "half",
++ "quick-error",
+  "weezl",
++ "zune-jpeg 0.4.21",
+ ]
+ 
+ [[package]]
+ name = "tracing"
+-version = "0.1.41"
++version = "0.1.44"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
++checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+ dependencies = [
+  "pin-project-lite",
+  "tracing-attributes",
+@@ -782,9 +1332,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "tracing-attributes"
+-version = "0.1.28"
++version = "0.1.31"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
++checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -793,28 +1343,93 @@ dependencies = [
+ 
+ [[package]]
+ name = "tracing-core"
+-version = "0.1.33"
++version = "0.1.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
++checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+ dependencies = [
+  "once_cell",
+ ]
+ 
+ [[package]]
+ name = "unicode-ident"
+-version = "1.0.18"
++version = "1.0.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
++checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
++
++[[package]]
++name = "v_frame"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2"
++dependencies = [
++ "aligned-vec",
++ "num-traits",
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "wasip2"
++version = "1.0.1+wasi-0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
++dependencies = [
++ "wit-bindgen",
++]
++
++[[package]]
++name = "wasm-bindgen"
++version = "0.2.106"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
++dependencies = [
++ "cfg-if",
++ "once_cell",
++ "rustversion",
++ "wasm-bindgen-macro",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-macro"
++version = "0.2.106"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
++dependencies = [
++ "quote",
++ "wasm-bindgen-macro-support",
++]
++
++[[package]]
++name = "wasm-bindgen-macro-support"
++version = "0.2.106"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
++dependencies = [
++ "bumpalo",
++ "proc-macro2",
++ "quote",
++ "syn",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-shared"
++version = "0.2.106"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
++dependencies = [
++ "unicode-ident",
++]
+ 
+ [[package]]
+ name = "wayland-backend"
+-version = "0.3.10"
++version = "0.3.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
++checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
+ dependencies = [
+  "cc",
+  "downcast-rs",
+- "rustix",
++ "rustix 1.1.3",
+  "scoped-tls",
+  "smallvec",
+  "wayland-sys",
+@@ -822,12 +1437,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-client"
+-version = "0.31.10"
++version = "0.31.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
++checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
+ dependencies = [
+- "bitflags 2.9.1",
+- "rustix",
++ "bitflags",
++ "rustix 1.1.3",
+  "wayland-backend",
+  "wayland-scanner",
+ ]
+@@ -838,7 +1453,7 @@ version = "0.31.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
+ dependencies = [
+- "bitflags 2.9.1",
++ "bitflags",
+  "wayland-backend",
+  "wayland-client",
+  "wayland-scanner",
+@@ -850,7 +1465,7 @@ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
+ dependencies = [
+- "bitflags 2.9.1",
++ "bitflags",
+  "wayland-backend",
+  "wayland-client",
+  "wayland-protocols",
+@@ -859,9 +1474,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-scanner"
+-version = "0.31.6"
++version = "0.31.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484"
++checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
+ dependencies = [
+  "proc-macro2",
+  "quick-xml",
+@@ -870,22 +1485,22 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-server"
+-version = "0.31.9"
++version = "0.31.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "485dfb8ccf0daa0d34625d34e6ac15f99e550a7999b6fd88a0835ccd37655785"
++checksum = "9297ab90f8d1f597711d36455c5b1b2290eca59b8134485e377a296b80b118c9"
+ dependencies = [
+- "bitflags 2.9.1",
++ "bitflags",
+  "downcast-rs",
+- "rustix",
++ "rustix 1.1.3",
+  "wayland-backend",
+  "wayland-scanner",
+ ]
+ 
+ [[package]]
+ name = "wayland-sys"
+-version = "0.31.6"
++version = "0.31.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615"
++checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
+ dependencies = [
+  "dlib",
+  "libc",
+@@ -896,9 +1511,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "weezl"
+-version = "0.1.8"
++version = "0.1.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
++checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
++
++[[package]]
++name = "windows-link"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+ 
+ [[package]]
+ name = "windows-sys"
+@@ -906,7 +1527,16 @@ version = "0.59.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+ dependencies = [
+- "windows-targets 0.52.6",
++ "windows-targets",
++]
++
++[[package]]
++name = "windows-sys"
++version = "0.61.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
++dependencies = [
++ "windows-link",
+ ]
+ 
+ [[package]]
+@@ -915,30 +1545,14 @@ version = "0.52.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+ dependencies = [
+- "windows_aarch64_gnullvm 0.52.6",
+- "windows_aarch64_msvc 0.52.6",
+- "windows_i686_gnu 0.52.6",
+- "windows_i686_gnullvm 0.52.6",
+- "windows_i686_msvc 0.52.6",
+- "windows_x86_64_gnu 0.52.6",
+- "windows_x86_64_gnullvm 0.52.6",
+- "windows_x86_64_msvc 0.52.6",
+-]
+-
+-[[package]]
+-name = "windows-targets"
+-version = "0.53.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+-dependencies = [
+- "windows_aarch64_gnullvm 0.53.0",
+- "windows_aarch64_msvc 0.53.0",
+- "windows_i686_gnu 0.53.0",
+- "windows_i686_gnullvm 0.53.0",
+- "windows_i686_msvc 0.53.0",
+- "windows_x86_64_gnu 0.53.0",
+- "windows_x86_64_gnullvm 0.53.0",
+- "windows_x86_64_msvc 0.53.0",
++ "windows_aarch64_gnullvm",
++ "windows_aarch64_msvc",
++ "windows_i686_gnu",
++ "windows_i686_gnullvm",
++ "windows_i686_msvc",
++ "windows_x86_64_gnu",
++ "windows_x86_64_gnullvm",
++ "windows_x86_64_msvc",
+ ]
+ 
+ [[package]]
+@@ -947,84 +1561,42 @@ version = "0.52.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+ 
+-[[package]]
+-name = "windows_aarch64_gnullvm"
+-version = "0.53.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+-
+ [[package]]
+ name = "windows_aarch64_msvc"
+ version = "0.52.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+ 
+-[[package]]
+-name = "windows_aarch64_msvc"
+-version = "0.53.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+-
+ [[package]]
+ name = "windows_i686_gnu"
+ version = "0.52.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+ 
+-[[package]]
+-name = "windows_i686_gnu"
+-version = "0.53.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+-
+ [[package]]
+ name = "windows_i686_gnullvm"
+ version = "0.52.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+ 
+-[[package]]
+-name = "windows_i686_gnullvm"
+-version = "0.53.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+-
+ [[package]]
+ name = "windows_i686_msvc"
+ version = "0.52.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+ 
+-[[package]]
+-name = "windows_i686_msvc"
+-version = "0.53.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+-
+ [[package]]
+ name = "windows_x86_64_gnu"
+ version = "0.52.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+ 
+-[[package]]
+-name = "windows_x86_64_gnu"
+-version = "0.53.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+-
+ [[package]]
+ name = "windows_x86_64_gnullvm"
+ version = "0.52.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+ 
+-[[package]]
+-name = "windows_x86_64_gnullvm"
+-version = "0.53.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+-
+ [[package]]
+ name = "windows_x86_64_msvc"
+ version = "0.52.6"
+@@ -1032,25 +1604,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+ 
+ [[package]]
+-name = "windows_x86_64_msvc"
+-version = "0.53.0"
++name = "wit-bindgen"
++version = "0.46.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
++checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+ 
+ [[package]]
+ name = "woomer"
+ version = "0.2.0"
+ dependencies = [
+- "image",
++ "image 0.25.9",
+  "libwayshot",
+  "raylib",
+ ]
+ 
+ [[package]]
+ name = "xml-rs"
+-version = "0.8.26"
++version = "0.8.28"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
++checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
++
++[[package]]
++name = "y4m"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448"
++
++[[package]]
++name = "zerocopy"
++version = "0.8.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
++dependencies = [
++ "zerocopy-derive",
++]
++
++[[package]]
++name = "zerocopy-derive"
++version = "0.8.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "zune-core"
++version = "0.4.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
++
++[[package]]
++name = "zune-core"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773"
+ 
+ [[package]]
+ name = "zune-inflate"
+@@ -1060,3 +1670,21 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+ dependencies = [
+  "simd-adler32",
+ ]
++
++[[package]]
++name = "zune-jpeg"
++version = "0.4.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
++dependencies = [
++ "zune-core 0.4.12",
++]
++
++[[package]]
++name = "zune-jpeg"
++version = "0.5.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5"
++dependencies = [
++ "zune-core 0.5.0",
++]
+diff --git a/Cargo.toml b/Cargo.toml
+index f322255..de0b5d4 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -6,8 +6,8 @@ edition = "2021"
+ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+ 
+ [dependencies]
+-image = "0.24.9"
++image = "0.25.9"
+ libwayshot = { git = "https://github.com/waycrate/wayshot", branch = "freeze-feat-andreas" }
+-raylib = { version = "5.0.1", features = ["wayland", "opengl_33"] }
++raylib = { version = "5.5.1", features = ["wayland", "opengl_33"] }
+ [features]
+-dev = []
+\ No newline at end of file
++dev = []
diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix
index 2cd24f49b32a..240cb2b76924 100644
--- a/pkgs/by-name/wo/wootility/package.nix
+++ b/pkgs/by-name/wo/wootility/package.nix
@@ -7,10 +7,10 @@
 
 let
   pname = "wootility";
-  version = "5.2.5";
+  version = "5.3.0";
   src = fetchurl {
     url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage";
-    sha256 = "sha256-bDhwlI+zi13xdMXqT5ztzR7RNOLgTBxNtjGkEFezZsw=";
+    sha256 = "sha256-37dABMNFqW4E2oQ5Zx4ZFdiq1uAMzvPD1vt7pb5PnZY=";
   };
 in
 
diff --git a/pkgs/by-name/wt/wtcat/package.nix b/pkgs/by-name/wt/wtcat/package.nix
index 75f045d43e55..68806b0b40f6 100644
--- a/pkgs/by-name/wt/wtcat/package.nix
+++ b/pkgs/by-name/wt/wtcat/package.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "WebTransport CLI";
     homepage = "https://github.com/pervrosen/wtcat";
-    changelog = "https://github.com/pervrosen/wtcat/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/pervrosen/wtcat/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "wtcat";
diff --git a/pkgs/by-name/x4/x42-avldrums/package.nix b/pkgs/by-name/x4/x42-avldrums/package.nix
index f92907155014..942d93b81a7e 100644
--- a/pkgs/by-name/x4/x42-avldrums/package.nix
+++ b/pkgs/by-name/x4/x42-avldrums/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "x42-avldrums";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "x42";
     repo = "avldrums.lv2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AZKHjzgw0TtLHh4TF+yOUSa+GlNVwyHCpJWAZikXTy4=";
+    hash = "sha256-4/orNlNTPSGdCBmb35i77i9L/rsuFDyWLKTG6h4zE0k=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/x4/x42-plugins/package.nix b/pkgs/by-name/x4/x42-plugins/package.nix
index 02851f2ebffa..56ef0a0bbcba 100644
--- a/pkgs/by-name/x4/x42-plugins/package.nix
+++ b/pkgs/by-name/x4/x42-plugins/package.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "x42-plugins";
-  version = "20260125";
+  version = "20260420";
 
   src = fetchurl {
     url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
-    hash = "sha256-wcIShcFc91BVZQ1rz55+AN+7R5b0fClOzT1thXSz1ug=";
+    hash = "sha256-wBl+lp2ZcVohlukjuOwhAaoYnEx/D9FktMW9kjmwflE=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/xc/xcodegen/package.nix b/pkgs/by-name/xc/xcodegen/package.nix
index dff37b0ff870..2cc6595d8361 100644
--- a/pkgs/by-name/xc/xcodegen/package.nix
+++ b/pkgs/by-name/xc/xcodegen/package.nix
@@ -64,7 +64,7 @@ swiftPackages.stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Swift command line tool for generating your Xcode project";
     homepage = "https://github.com/yonaskolb/XcodeGen";
-    changelog = "https://github.com/XcodeGen/blob/${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/yonaskolb/XcodeGen/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     platforms = lib.platforms.darwin;
     maintainers = [ lib.maintainers.samasaur ];
diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index 683db61bbf58..6c6e7f164b9b 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -30,7 +30,7 @@
   cacert,
   darwin,
   desktopToDarwinBundle,
-  xxHash,
+  xxhash,
   tomlplusplus,
 }:
 
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
     vulkan-headers
     vulkan-loader
-    xxHash
+    xxhash
     tomlplusplus
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/xf/xf86-input-joystick/package.nix b/pkgs/by-name/xf/xf86-input-joystick/package.nix
index 81df0d68b440..3af25a5bec91 100644
--- a/pkgs/by-name/xf/xf86-input-joystick/package.nix
+++ b/pkgs/by-name/xf/xf86-input-joystick/package.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ ];
     pkgConfigModules = [ "xorg-joystick" ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-input-joystick.x86_64-darwin
+    broken = stdenv.hostPlatform.isDarwin; # no darwin driver
   };
 })
diff --git a/pkgs/by-name/xf/xf86-input-void/package.nix b/pkgs/by-name/xf/xf86-input-void/package.nix
index 03749b3da67e..17a855f094a6 100644
--- a/pkgs/by-name/xf/xf86-input-void/package.nix
+++ b/pkgs/by-name/xf/xf86-input-void/package.nix
@@ -54,6 +54,5 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     maintainers = [ ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-input-void.x86_64-darwin
   };
 })
diff --git a/pkgs/by-name/xf/xf86-video-dummy/package.nix b/pkgs/by-name/xf/xf86-video-dummy/package.nix
index 6bf910666a12..681bf3c9361b 100644
--- a/pkgs/by-name/xf/xf86-video-dummy/package.nix
+++ b/pkgs/by-name/xf/xf86-video-dummy/package.nix
@@ -47,6 +47,5 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.x11;
     maintainers = [ ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/xf/xf86-video-suncg6/package.nix b/pkgs/by-name/xf/xf86-video-suncg6/package.nix
index 18dc2e1457e1..920e4e98813a 100644
--- a/pkgs/by-name/xf/xf86-video-suncg6/package.nix
+++ b/pkgs/by-name/xf/xf86-video-suncg6/package.nix
@@ -50,6 +50,5 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.hpndSellVariant;
     maintainers = [ ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-suncg6.x86_64-darwin
   };
 })
diff --git a/pkgs/by-name/xf/xf86-video-sunffb/package.nix b/pkgs/by-name/xf/xf86-video-sunffb/package.nix
index 823adb0d851f..e67f7a277c1e 100644
--- a/pkgs/by-name/xf/xf86-video-sunffb/package.nix
+++ b/pkgs/by-name/xf/xf86-video-sunffb/package.nix
@@ -50,6 +50,5 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-sunffb.x86_64-darwin
   };
 })
diff --git a/pkgs/by-name/xf/xf86-video-sunleo/package.nix b/pkgs/by-name/xf/xf86-video-sunleo/package.nix
index 3b2b97d04693..9be9f6662ed7 100644
--- a/pkgs/by-name/xf/xf86-video-sunleo/package.nix
+++ b/pkgs/by-name/xf/xf86-video-sunleo/package.nix
@@ -52,6 +52,5 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = [ ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-sunleo.x86_64-darwin
   };
 })
diff --git a/pkgs/by-name/xf/xfe/package.nix b/pkgs/by-name/xf/xfe/package.nix
index 70bcb4aea66d..00c7faf5d69e 100644
--- a/pkgs/by-name/xf/xfe/package.nix
+++ b/pkgs/by-name/xf/xfe/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xfe";
-  version = "2.1.2";
+  version = "2.1.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/xfe/xfe-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-jgDgd/DOB92v19SAGqBnTHIYQE+EohgDvvFCwTNDJlE=";
+    sha256 = "sha256-B7FxceC/S9mjhOQxZCzmFyYkUT2xRXxKkutw8DamCHA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xf/xfr/package.nix b/pkgs/by-name/xf/xfr/package.nix
index ba28136c9743..c0c6577b7be0 100644
--- a/pkgs/by-name/xf/xfr/package.nix
+++ b/pkgs/by-name/xf/xfr/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xfr";
-  version = "0.9.6";
+  version = "0.9.10";
 
   src = fetchFromGitHub {
     owner = "lance0";
     repo = "xfr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wYhwDSL9C4rtWgkhaXimk3u03c9UHj2O9eEe8pRlj6c=";
+    hash = "sha256-8vZ/29B7bdiWd+ckwMUPUMWHYtrgoIlzw3wM6khtrZo=";
   };
 
-  cargoHash = "sha256-f8m5vFNk62iXyK1Sh3Dda0pV6rUNErymS6QxiCuZ8DA=";
+  cargoHash = "sha256-Vkh1Rb1/MKN+8Rc00iVfrK4x3AcmyKVQ8FMQX2JhZX4=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Modern iperf3 alternative with a live TUI, multi-client server, and QUIC support.";
     mainProgram = "xfr";
-    homepage = "https://github.com/lance0/xfs";
+    homepage = "https://github.com/lance0/xfr";
     changelog = "https://github.com/lance0/xfr/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [
       _0x4A6F
diff --git a/pkgs/by-name/xi/xinit/package.nix b/pkgs/by-name/xi/xinit/package.nix
index cd1b7eb26009..af3c4a7ccdb3 100644
--- a/pkgs/by-name/xi/xinit/package.nix
+++ b/pkgs/by-name/xi/xinit/package.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-xserver=${xorg-server.out}/bin/X"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "--with-launchd=yes"
     "--with-bundle-id-prefix=org.nixos.xquartz"
     "--with-launchdaemons-dir=${placeholder "out"}/LaunchDaemons"
     "--with-launchagents-dir=${placeholder "out"}/LaunchAgents"
diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix
index be1aa4b5702c..6633c949e733 100644
--- a/pkgs/by-name/xl/xlights/package.nix
+++ b/pkgs/by-name/xl/xlights/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "xlights";
-  version = "2026.06";
+  version = "2026.07";
 
   src = fetchurl {
     url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-qRMICQVQEUOWMXrhbCHQSwKSur0WMZDLN4gz1fBhNQM=";
+    hash = "sha256-+uWNRYV1tSfb27iXY2rcGEyIUpZco4gp58n5Bj762Gs=";
   };
 
   meta = {
diff --git a/pkgs/by-name/xm/xmagnify/package.nix b/pkgs/by-name/xm/xmagnify/package.nix
index 8e08eb4f0cca..eb9abf8515dc 100644
--- a/pkgs/by-name/xm/xmagnify/package.nix
+++ b/pkgs/by-name/xm/xmagnify/package.nix
@@ -17,7 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh";
   };
 
-  prePatch = "substituteInPlace ./Makefile --replace /usr $out";
+  prePatch = ''
+    substituteInPlace Makefile --replace-fail /usr $out
+    # gcc15
+    substituteInPlace main.c --replace-fail 'handler ()' 'handler (int sig)'
+  '';
 
   buildInputs = [
     libx11
diff --git a/pkgs/by-name/xm/xmedcon/package.nix b/pkgs/by-name/xm/xmedcon/package.nix
index 8a06c87174da..2b849c5f2c47 100644
--- a/pkgs/by-name/xm/xmedcon/package.nix
+++ b/pkgs/by-name/xm/xmedcon/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xmedcon";
-  version = "0.26.1";
+  version = "0.26.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/xmedcon/xmedcon-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-mf424qgt1FqqnwDQU7b8XLQNJsesLQi07T0LdP1cdPg=";
+    sha256 = "sha256-r0oDA5wMS2bkKCgM7C+WxUahGvJm7NUA/iUNu2uZJPE=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/xn/xnldorker/package.nix b/pkgs/by-name/xn/xnldorker/package.nix
index 81a088bc5788..4c50caf38c94 100644
--- a/pkgs/by-name/xn/xnldorker/package.nix
+++ b/pkgs/by-name/xn/xnldorker/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "xnldorker";
-  version = "4.3";
+  version = "4.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xnl-h4ck3r";
     repo = "xnldorker";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YOYBEoYZBZfGtnJKku88XMj56JSN/EP9jLvqNXNqNJs=";
+    hash = "sha256-2Oh341KTxD47aZVTikDMFs6e4HGfQ77BPptksw+6w7s=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/by-name/xn/xnlinkfinder/package.nix b/pkgs/by-name/xn/xnlinkfinder/package.nix
index e2e2bcdc7d45..2ea04ee16a96 100644
--- a/pkgs/by-name/xn/xnlinkfinder/package.nix
+++ b/pkgs/by-name/xn/xnlinkfinder/package.nix
@@ -1,41 +1,43 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch,
   python3,
+  writableTmpDirAsHomeHook,
 }:
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "xnlinkfinder";
-  version = "6.0";
+  version = "8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xnl-h4ck3r";
     repo = "xnLinkFinder";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UMHMWHLJOhEeR+vO4YE3aNzdsvMAXPpQHQgdFf1QeMY=";
+    hash = "sha256-xym8ruHPAseqmWLUtCPTlpr3REDrpbWor66aNvfASjA=";
   };
 
-  patches = [
-    # Clean-up setup.py
-    (fetchpatch {
-      name = "clean-up.patch";
-      url = "https://github.com/xnl-h4ck3r/xnLinkFinder/commit/8ef5e2ecf4c627b389cb7bb526f10fffe84acc13.patch";
-      hash = "sha256-14j3dFgehhPdqAe4e9FsB8sD66hKnNaPmDJRV1mQTDo=";
-    })
+  pythonRemoveDeps = [
+    # python already provides urllib.parse
+    "urlparse3"
   ];
 
   build-system = with python3.pkgs; [ setuptools ];
 
+  nativeBuildInputs = [ writableTmpDirAsHomeHook ];
+
   dependencies = with python3.pkgs; [
     beautifulsoup4
     html5lib
+    inflect
     lxml
+    playwright
     psutil
+    pypdf
     pyyaml
     requests
     termcolor
+    tldextract
     urllib3
   ];
 
@@ -47,7 +49,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Tool to discover endpoints, potential parameters, and a target specific wordlist for a given target";
     homepage = "https://github.com/xnl-h4ck3r/xnLinkFinder";
-    changelog = "https://github.com/xnl-h4ck3r/xnLinkFinder/blob/${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/xnl-h4ck3r/xnLinkFinder/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "xnLinkFinder";
diff --git a/pkgs/by-name/xn/xnviewmp/package.nix b/pkgs/by-name/xn/xnviewmp/package.nix
index 8e6ce15df574..24842efada65 100644
--- a/pkgs/by-name/xn/xnviewmp/package.nix
+++ b/pkgs/by-name/xn/xnviewmp/package.nix
@@ -25,11 +25,11 @@ let
 in
 appimageTools.wrapType2 rec {
   pname = "xnviewmp";
-  version = "1.10.5";
+  version = "1.11.2";
 
   src = fetchurl {
     url = "https://download.xnview.com/old_versions/XnView_MP/XnView_MP-${version}.glibc2.17-x86_64.AppImage";
-    hash = "sha256-BGdjVwinH2P9vG3aiWeUpFTIftmbYjdJEmcrXXi7XFw=";
+    hash = "sha256-czgleryYMhRKxnv7Qb3E03iZ4mKXaz//jz7HmuQbjIc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix
index 60307957c04d..bfbc321b1579 100644
--- a/pkgs/by-name/xo/xonsh/unwrapped.nix
+++ b/pkgs/by-name/xo/xonsh/unwrapped.nix
@@ -16,9 +16,12 @@
   pip,
   pyte,
   pytest-mock,
+  pytest-rerunfailures,
   pytest-subprocess,
+  pytest-timeout,
   pytestCheckHook,
   requests,
+  virtualenv,
 
   man,
   util-linux,
@@ -32,7 +35,7 @@
 
 buildPythonPackage rec {
   pname = "xonsh";
-  version = "0.22.8";
+  version = "0.23.1";
   pyproject = true;
 
   # PyPI package ships incomplete tests
@@ -40,7 +43,7 @@ buildPythonPackage rec {
     owner = "xonsh";
     repo = "xonsh";
     tag = version;
-    hash = "sha256-NOQs21Ahp2oMx1Lw1ekvb2aqUWwIXw1WyC9ZE5V9wJI=";
+    hash = "sha256-/vxEJPPgDdrtSHSWhJY1HjtQv7B+4gNzPQmu/tbhX0k=";
   };
 
   build-system = [
@@ -61,9 +64,14 @@ buildPythonPackage rec {
     pip
     pyte
     pytest-mock
+    pytest-rerunfailures
     pytest-subprocess
+    pytest-timeout
     pytestCheckHook
     requests
+
+    # required by test_xonsh_activator
+    virtualenv
   ]
   ++ lib.optionals (!stdenv.isDarwin) [
     # required by test_man_completion
@@ -74,16 +82,16 @@ buildPythonPackage rec {
   disabledTests = [
     # fails on sandbox
     "test_colorize_file"
-    "test_xonsh_activator"
+    "test_repath_HOME_PATH_itself"
+    "test_repath_HOME_PATH_var"
+    "test_repath_HOME_PATH_var_brace"
 
     # flaky tests in test_integrations.py
     "test_script"
     "test_catching_system_exit"
     "test_catching_exit_signal"
-    "test_alias_stability"
     "test_captured_subproc_is_not_affected_next_command"
     "test_spec_decorator_alias"
-    "test_alias_stability_exception"
 
     # flaky tests in test_python.py
     "test_complete_import"
@@ -112,18 +120,22 @@ buildPythonPackage rec {
     "test_on_command_not_found_replacement"
     "test_skipper_command"
     "test_xonsh_lexer_no_win"
+    "test_on_command_not_found_dict_without_env"
+  ];
+
+  disabledTestPaths = [
+    # don't run stress tests when building package
+    "tests/xintegration/test_stress.py"
   ];
 
   # https://github.com/NixOS/nixpkgs/issues/248978
   dontWrapPythonPrograms = true;
 
-  env.LC_ALL = "en_US.UTF-8";
-
   postPatch = ''
     sed -i -e 's|/bin/ls|${lib.getExe' coreutils "ls"}|' tests/test_execer.py
-    sed -i -e 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/test_integrations.py
+    sed -i -e 's|SHELL=xonsh|SHELL=$out/bin/xonsh|' tests/xintegration/test_integrations.py
 
-    for script in tests/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do
+    for script in tests/xintegration/test_integrations.py scripts/xon.sh $(find -name "*.xsh"); do
       sed -i -e 's|/usr/bin/env|${lib.getExe' coreutils "env"}|' $script
     done
     patchShebangs .
@@ -139,7 +151,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://xon.sh/";
-    description = "Python-ish, BASHwards-compatible shell";
+    description = "Python-powered shell";
     changelog = "https://github.com/xonsh/xonsh/blob/${version}/CHANGELOG.md";
     license = with lib.licenses; [ bsd3 ];
     mainProgram = "xonsh";
diff --git a/pkgs/by-name/xo/xorgproto/meson.patch b/pkgs/by-name/xo/xorgproto/meson.patch
new file mode 100644
index 000000000000..802dd42abae4
--- /dev/null
+++ b/pkgs/by-name/xo/xorgproto/meson.patch
@@ -0,0 +1,14 @@
+--- xorgproto-2018.4.orig/include/X11/meson.build	2018-02-28 16:45:07.000000000 +0000
++++ xorgproto-2018.4/include/X11/meson.build	2019-01-26 02:34:52.763165148 +0000
+@@ -10,8 +10,10 @@
+     endif
+ endforeach
+ 
+ # generated headers. try not to make more of these, please.
+-if cc.has_member('fd_set', 'fds_bits', prefix: fd_set_headers)
++if cc.get_define('_WIN32') == '1' and cc.get_define('CYGWIN') != '1'
++    fds_bits = 'dummy'
++elif cc.has_member('fd_set', 'fds_bits', prefix: fd_set_headers)
+     fds_bits = 'fds_bits'
+ elif cc.has_member('fd_set', '__fds_bits', prefix: fd_set_headers)
+     fds_bits = '__fds_bits'
diff --git a/pkgs/by-name/xo/xorgproto/package.nix b/pkgs/by-name/xo/xorgproto/package.nix
index bd44d61263cc..e36e92a8de03 100644
--- a/pkgs/by-name/xo/xorgproto/package.nix
+++ b/pkgs/by-name/xo/xorgproto/package.nix
@@ -21,10 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     # small fix for mingw
-    (fetchpatch {
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/meson.patch?h=mingw-w64-xorgproto&id=7b817efc3144a50e6766817c4ca7242f8ce49307";
-      sha256 = "sha256-Izzz9In53W7CC++k1bLr78iSrmxpFm1cH8qcSpptoUQ=";
-    })
+    ./meson.patch
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/xp/xpar/package.nix b/pkgs/by-name/xp/xpar/package.nix
index 938c60d45278..ad9b8a5a4e91 100644
--- a/pkgs/by-name/xp/xpar/package.nix
+++ b/pkgs/by-name/xp/xpar/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpar";
-  version = "0.7";
+  version = "1.0";
 
   src = fetchFromGitHub {
-    owner = "kspalaiologos";
+    owner = "iczelia";
     repo = "xpar";
     rev = finalAttrs.version;
-    hash = "sha256-uZfOrhXEDBvALd+rCluzcMPDW/no9t8PqGBuoZm6MtA=";
+    hash = "sha256-FCYZl8tllGvgoIE/u9lpQJANOfB7phyOegXk82EOzzM=";
   };
 
   nativeBuildInputs = [
@@ -22,6 +22,13 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isx86_64 [ nasm ];
 
+  preConfigure = lib.optionalString stdenv.hostPlatform.isLinux ''
+    # for LTO
+    export AR="${stdenv.cc.targetPrefix}gcc-ar"
+    export NM="${stdenv.cc.targetPrefix}gcc-nm"
+    export RANLIB="${stdenv.cc.targetPrefix}gcc-ranlib"
+  '';
+
   configureFlags = [
     "--disable-arch-native"
     "--enable-lto"
@@ -31,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Error/erasure code system guarding data integrity";
-    homepage = "https://github.com/kspalaiologos/xpar";
-    changelog = "https://github.com/kspalaiologos/xpar/blob/${finalAttrs.version}/NEWS";
+    homepage = "https://github.com/iczelia/xpar";
+    changelog = "https://github.com/iczelia/xpar/blob/${finalAttrs.version}/NEWS";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ mrbenjadmin ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix
index 2018098377d3..94acc0b44e16 100644
--- a/pkgs/by-name/xp/xpipe/package.nix
+++ b/pkgs/by-name/xp/xpipe/package.nix
@@ -39,7 +39,7 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-dKYGepfjgqcYflVABXGp2heI8XY1rIyMJi04aTld4ss=";
+      x86_64-linux = "sha256-/f4+xVLsgwT4H25ZWX4Mxl+IE0vWKGrxPXMOfR5c4fU=";
     }
     .${system} or throwSystem;
 
@@ -48,7 +48,7 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "22.9";
+  version = "22.10";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";
diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index 07094de10ae1..2faaa600a575 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -55,7 +55,7 @@
   xorgproto,
   libxkbfile,
   xorg-server,
-  xxHash,
+  xxhash,
   clang,
   withHtml ? true,
   xpra-html5,
@@ -185,7 +185,7 @@ effectiveBuildPythonApplication rec {
     libavif
     openh264
     libyuv
-    xxHash
+    xxhash
     systemd
   ]
   ++ lib.optional withNvenc [
diff --git a/pkgs/by-name/xr/xrdp/package.nix b/pkgs/by-name/xr/xrdp/package.nix
index 6009ad304576..922867b7a7a4 100644
--- a/pkgs/by-name/xr/xrdp/package.nix
+++ b/pkgs/by-name/xr/xrdp/package.nix
@@ -33,13 +33,13 @@
 let
   xorgxrdp = stdenv.mkDerivation rec {
     pname = "xorgxrdp";
-    version = "0.10.4";
+    version = "0.10.5";
 
     src = fetchFromGitHub {
       owner = "neutrinolabs";
       repo = "xorgxrdp";
       rev = "v${version}";
-      hash = "sha256-TuzUerfOn8+3YfueG00IBP9sMpvy2deyL16mWQ8cRHg=";
+      hash = "sha256-P7mgdHIq7/Vkk5CR4mUYtQ0xBjh3J2QrYAobKbw1KXM=";
     };
 
     nativeBuildInputs = [
@@ -78,7 +78,7 @@ let
 
   xrdp = stdenv.mkDerivation rec {
     pname = "xrdp";
-    version = "0.10.4.1";
+    version = "0.10.6";
 
     src = applyPatches {
       inherit version;
@@ -89,7 +89,7 @@ let
         repo = "xrdp";
         rev = "v${version}";
         fetchSubmodules = true;
-        hash = "sha256-ula1B9/eriJ+0r6d9r2LAzh7J3s6/uvAiTKeRzLuVL0=";
+        hash = "sha256-BoIpWafUWznRHN8BaZmld8vVbZtywaGiooGPnDtDCjM=";
       };
     };
 
diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index f94197d0e164..3ee0e4d02b91 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -58,13 +58,13 @@ assert (
 );
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xremap${variant.suffix or ""}";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "xremap";
     repo = "xremap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PvhpPdgAnCT8HaPEQHdTSympmGqRAK9/t3T5KEHovMM=";
+    hash = "sha256-J07iDGltzJg/2r+bUlBaOpZxAhg020J1giqbTZNSDRY=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildNoDefaultFeatures = true;
   buildFeatures = variant.features;
 
-  cargoHash = "sha256-t32EVL8btJEeqWL5601+6pptT/Mt4KxMeVVlNo/nw5k=";
+  cargoHash = "sha256-iBlX0ikkzZu2VTKXF9UEe9qA+i9OjEOwWSpwvsqGPFQ=";
 
   passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
 
diff --git a/pkgs/by-name/xv/xva-img/package.nix b/pkgs/by-name/xv/xva-img/package.nix
index 3f5d910d722e..718c31ef0aa0 100644
--- a/pkgs/by-name/xv/xva-img/package.nix
+++ b/pkgs/by-name/xv/xva-img/package.nix
@@ -4,7 +4,7 @@
   cmake,
   fetchFromGitHub,
   openssl,
-  xxHash,
+  xxhash,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     openssl
-    xxHash
+    xxhash
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/xv/xvfb/package.nix b/pkgs/by-name/xv/xvfb/package.nix
index 5514f0e1415d..4f6afbc8f6b3 100644
--- a/pkgs/by-name/xv/xvfb/package.nix
+++ b/pkgs/by-name/xv/xvfb/package.nix
@@ -106,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "-Ddtrace=false"
+    "-Dxquartz=false"
   ];
 
   meta = {
diff --git a/pkgs/by-name/xw/xwayland/package.nix b/pkgs/by-name/xw/xwayland/package.nix
index 4a26bc6945f3..0a36d9525919 100644
--- a/pkgs/by-name/xw/xwayland/package.nix
+++ b/pkgs/by-name/xw/xwayland/package.nix
@@ -56,11 +56,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xwayland";
-  version = "24.1.10";
+  version = "24.1.11";
 
   src = fetchurl {
     url = "mirror://xorg/individual/xserver/xwayland-${finalAttrs.version}.tar.xz";
-    hash = "sha256-RZdivo6gRslDhmh9d6h63WBzhovuFPApE+r+u5RbeqA=";
+    hash = "sha256-JxFaGogZB4QJv2/s/rdyToE3vTZCbecAWls6rgohOP8=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/xx/xxHash/package.nix b/pkgs/by-name/xx/xxhash/package.nix
similarity index 98%
rename from pkgs/by-name/xx/xxHash/package.nix
rename to pkgs/by-name/xx/xxhash/package.nix
index bb6ef12918a2..678e9d1c1864 100644
--- a/pkgs/by-name/xx/xxHash/package.nix
+++ b/pkgs/by-name/xx/xxhash/package.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "xxHash";
+  pname = "xxhash";
   version = "0.8.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/xy/xyce/package.nix b/pkgs/by-name/xy/xyce/package.nix
index 811089e03034..b3008b48cdca 100644
--- a/pkgs/by-name/xy/xyce/package.nix
+++ b/pkgs/by-name/xy/xyce/package.nix
@@ -2,6 +2,8 @@
   stdenv,
   fetchFromGitHub,
   fetchgit,
+  fetchpatch,
+  applyPatches,
   lib,
   bison,
   blas,
@@ -41,12 +43,21 @@ let
     hash = "sha256-8cvglBCykZVQk3BD7VE3riXfJ0PAEBwsoloqUsrMlBc=";
   };
 
-  regression_src = fetchFromGitHub {
-    name = "Xyce_Regression";
-    owner = "Xyce";
-    repo = "Xyce_Regression";
-    rev = "Release-${version}";
-    hash = "sha256-aA/4UpzSb+EeJ1RVkVwSKiNh7BDcLHxNDnKXZmnCBmI=";
+  regression_src = applyPatches {
+    src = fetchFromGitHub {
+      name = "Xyce_Regression";
+      owner = "Xyce";
+      repo = "Xyce_Regression";
+      rev = "Release-${version}";
+      hash = "sha256-aA/4UpzSb+EeJ1RVkVwSKiNh7BDcLHxNDnKXZmnCBmI=";
+    };
+    patches = [
+      # remove after next release
+      (fetchpatch {
+        url = "https://github.com/Xyce/Xyce_Regression/commit/a77e39e409d3ab2ae05d6dcbf08d9e42e3fd0f15.patch";
+        hash = "sha256-BJJO2qSwQf+u2HUWhdyBUwP3j4HbMPfXrAhgdzeTZgc=";
+      })
+    ];
   };
 in
 
@@ -80,7 +91,6 @@ stdenv.mkDerivation rec {
         koma-script
         optional
         framed
-        enumitem
         multirow
         newtx
         preprint
@@ -164,11 +174,14 @@ stdenv.mkDerivation rec {
     local docFiles=("doc/Users_Guide/Xyce_UG"
       "doc/Reference_Guide/Xyce_RG"
       "doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}")
+    # hotfix for: https://github.com/Xyce/Xyce/issues/177
+    substituteInPlace doc/Reference_Guide/Xyce_RG_macros.tex \
+      --replace-fail "\\def\\device{\\goodbreak" "\\def\\device{\\item[]\\goodbreak"
 
     # SANDIA LaTeX class and some organization logos are not publicly available see
     # https://groups.google.com/g/xyce-users/c/MxeViRo8CT4/m/ppCY7ePLEAAJ
     for img in "snllineblubrd" "snllineblk" "DOEbwlogo" "NNSA_logo"; do
-      sed -i -E "s/\\includegraphics\[height=(0.[1-9]in)\]\{$img\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/" ''${docFiles[2]}.tex
+      sed -i -E "s/\\includegraphics\[height=(0.[1-9]in)\]\{$img\}/\\mbox\{\\\\rule\{0mm\}\{\1\}\}/" ''${docFiles[2]}.tex
     done
 
     install -d $doc/share/doc/${pname}-${version}/
diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix
index 3aab225ba089..b9c444846f51 100644
--- a/pkgs/by-name/ya/yabai/package.nix
+++ b/pkgs/by-name/ya/yabai/package.nix
@@ -14,7 +14,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "yabai";
-  version = "7.1.23";
+  version = "7.1.24";
 
   src =
     finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
@@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
       # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
       "aarch64-darwin" = fetchzip {
         url = "https://github.com/asmvik/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
-        hash = "sha256-p8LHuAhmkKNPkRNIw4NHpAA+/oQPMI34H21mlUiwK+M=";
+        hash = "sha256-2NTZUxptWhcF6sb1iUQwOuvG6omVAGVeb+j8XPBhRvs=";
       };
       "x86_64-darwin" = fetchFromGitHub {
         owner = "asmvik";
         repo = "yabai";
         rev = "v${finalAttrs.version}";
-        hash = "sha256-6fvjwn2MBJ8LKShR3evLyS3BfoJ4yYtnaCif7c9faxc=";
+        hash = "sha256-WyZbkIcqtVogvCfy/ee5Dk2+6OqXgMuVq6GzKKZ9F0A=";
       };
     };
 
diff --git a/pkgs/by-name/ya/yacas/package.nix b/pkgs/by-name/ya/yacas/package.nix
index 7f63de413cae..51914b99cceb 100644
--- a/pkgs/by-name/ya/yacas/package.nix
+++ b/pkgs/by-name/ya/yacas/package.nix
@@ -5,7 +5,6 @@
   fetchpatch,
   cmake,
   perl,
-  enableGui ? false,
   enableJupyter ? true,
   boost,
   jsoncpp,
@@ -14,7 +13,6 @@
   enableJava ? false,
   openjdk,
   gtest,
-  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [ "format" ];
 
   cmakeFlags = [
-    "-DENABLE_CYACAS_GUI=${if enableGui then "ON" else "OFF"}"
+    "-DENABLE_CYACAS_GUI=OFF"
     "-DENABLE_CYACAS_KERNEL=${if enableJupyter then "ON" else "OFF"}"
     "-DENABLE_JYACAS=${if enableJava then "ON" else "OFF"}"
     "-DENABLE_CYACAS_UNIT_TESTS=ON"
@@ -66,11 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
   ]
-  ++ lib.optionals enableGui [
-    libsForQt5.qtbase
-    libsForQt5.wrapQtAppsHook
-    libsForQt5.qtwebengine
-  ]
   ++ lib.optionals enableJupyter [
     boost
     jsoncpp
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index d2099636373b..222b29dd3b1b 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -12,13 +12,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "yafc-ce";
-  version = "2.16.0";
+  version = "2.18.1";
 
   src = fetchFromGitHub {
-    owner = "shpaass";
+    owner = "Yafc-CE";
     repo = "yafc-ce";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6+GGxEwn3tenmcukOZPTIZ7UZg/d9uudQP0qwU8mifY=";
+    hash = "sha256-MdaYAustOMFO2rim0o2FnEhFWINa9E1jEvIQS9SnEHY=";
   };
 
   projectFile = [
@@ -39,13 +39,6 @@ buildDotnetModule (finalAttrs: {
     SDL2_image
   ];
 
-  postPatch = ''
-    # Yafc finds the root by looking for a `.git` directory, but `.git` is
-    # removed by Nix to ensure reproducibility. `.github` is not.
-    substituteInPlace Yafc.I18n.Generator/SourceGenerator.cs \
-      --replace-fail 'rootDirectory, ".git"' 'rootDirectory, ".github"'
-  '';
-
   meta = {
     description = "Powerful Factorio calculator/analyser that works with mods, Community Edition";
     longDescription = ''
@@ -54,9 +47,9 @@ buildDotnetModule (finalAttrs: {
 
       YAFC Community Edition is an updated and actively-maintained version of the original YAFC.
     '';
-    homepage = "https://github.com/shpaass/yafc-ce";
-    downloadPage = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}";
-    changelog = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}";
+    homepage = "https://github.com/Yafc-CE/yafc-ce";
+    downloadPage = "https://github.com/Yafc-CE/yafc-ce/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/Yafc-CE/yafc-ce/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [
       diamond-deluxe
diff --git a/pkgs/by-name/ya/yaookctl/package.nix b/pkgs/by-name/ya/yaookctl/package.nix
index f5f7f07d7a99..4efeb67baa5a 100644
--- a/pkgs/by-name/ya/yaookctl/package.nix
+++ b/pkgs/by-name/ya/yaookctl/package.nix
@@ -6,13 +6,13 @@
 }:
 python3.pkgs.buildPythonApplication {
   pname = "yaookctl";
-  version = "0-unstable-2026-03-11";
+  version = "0-unstable-2026-04-24";
 
   src = fetchFromGitLab {
     owner = "yaook";
     repo = "yaookctl";
-    rev = "710b87f607a0ac9416367eed65f96965c9816cd5";
-    hash = "sha256-kDFnFl1/CuLcW080EbtpBd55QOj2qgcKkW4iiXS/2+U=";
+    rev = "2b66a5bf50b05c68897ab80a17d41d9611d16a1d";
+    hash = "sha256-cunSKWjOx+R0gTJic1DJRVHx0RG+vXCagbf8kmTrVKY=";
   };
 
   pyproject = true;
diff --git a/pkgs/by-name/ya/yarn-zpm/package.nix b/pkgs/by-name/ya/yarn-zpm/package.nix
index 1e11bc47e3cf..8f6ce06292b2 100644
--- a/pkgs/by-name/ya/yarn-zpm/package.nix
+++ b/pkgs/by-name/ya/yarn-zpm/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yarn-zpm";
-  version = "6.0.0-rc.16";
+  version = "6.0.0-rc.18";
 
   src = fetchFromGitHub {
     owner = "yarnpkg";
     repo = "zpm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-51KnGFT+6DwESpYii6dkYCGwT62ZrDCPDL1S4wANmWQ=";
+    hash = "sha256-eiI20hptKhQegh/BRKgDwd6ztQ7XsupV3vtGpdxTrdA=";
   };
 
-  cargoHash = "sha256-hwbOT5xpSSyQb3ChaXUJPNvJs38MI8Bd37h8T6GktgQ=";
+  cargoHash = "sha256-mcTlUwnr02pmiQhgkLHOUHoxBxWB8rwuOgjEEqdW0wE=";
 
   cargoBuildFlags = [ "--package=zpm" ];
   cargoTestFlags = [ "--package=zpm" ];
diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix
index ff84ace8d72a..e659fa62f305 100644
--- a/pkgs/by-name/ya/yarr/package.nix
+++ b/pkgs/by-name/ya/yarr/package.nix
@@ -45,7 +45,7 @@ buildGoModule (finalAttrs: {
     description = "Yet another rss reader";
     mainProgram = "yarr";
     homepage = "https://github.com/nkanaev/yarr";
-    changelog = "https://github.com/nkanaev/yarr/blob/v${finalAttrs.version}/doc/changelog.txt";
+    changelog = "https://github.com/nkanaev/yarr/blob/v${finalAttrs.version}/doc/changelog.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       sikmir
diff --git a/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix b/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix
index eb7b05160709..b3b3ead59157 100644
--- a/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "clipboard.yazi";
-  version = "0-unstable-2026-02-10";
+  version = "0-unstable-2026-04-24";
 
   src = fetchFromGitHub {
     owner = "XYenon";
     repo = "clipboard.yazi";
-    rev = "3b9681091b783d6bc5d07172afd6159060a7db63";
-    hash = "sha256-8p2RC8F8JH1K36HebJM58stHX+lFLD+KYQxfdJm06y0=";
+    rev = "d6fc53152a20aebad8dc6e2550940f7efe226838";
+    hash = "sha256-6jlMzVPgkbQRwVbfUCEtXVWLxBKdPymQeHVoh5z9mO8=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/close-and-restore-tab/default.nix b/pkgs/by-name/ya/yazi/plugins/close-and-restore-tab/default.nix
new file mode 100644
index 000000000000..5bb425b0d2cb
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/close-and-restore-tab/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "close-and-restore-tab.yazi";
+  version = "0-unstable-2026-04-22";
+
+  src = fetchFromGitHub {
+    owner = "MasouShizuka";
+    repo = "close-and-restore-tab.yazi";
+    rev = "5047217e59f9c2f4aa5ae15baa92df7b3f724e67";
+    hash = "sha256-bsx6HVdB2CcKXQG+tGxY2T8Ys8TluIe6xWHhOhv4L4I=";
+  };
+
+  meta = {
+    description = "A Yazi plugin that adds the functionality to close and restore tab";
+    homepage = "https://github.com/MasouShizuka/close-and-restore-tab.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nemeott ];
+  };
+}
diff --git a/pkgs/by-name/ya/yazi/plugins/convert/default.nix b/pkgs/by-name/ya/yazi/plugins/convert/default.nix
new file mode 100644
index 000000000000..c2413c30a459
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/convert/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "convert.yazi";
+  version = "0-unstable-2026-04-22";
+
+  src = fetchFromGitHub {
+    owner = "atareao";
+    repo = "convert.yazi";
+    rev = "ce060d9d17e4466d7956213d68a7a74d24ecfdc5";
+    hash = "sha256-kCXjwtcOQZbE+S9PgJrBmlzBcdprSGtfiS2Flxe2olw=";
+  };
+
+  meta = {
+    description = "Convert between image formats using ImageMagick";
+    homepage = "https://github.com/atareao/convert.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nemeott ];
+  };
+}
diff --git a/pkgs/by-name/ya/yazi/plugins/full-border/default.nix b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix
index ce1aface723a..8e8e858cba13 100644
--- a/pkgs/by-name/ya/yazi/plugins/full-border/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/full-border/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "full-border.yazi";
-  version = "25.2.26-unstable-2026-02-16";
+  version = "25.2.26-unstable-2026-04-22";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "25918dcde97f11ac37f80620cc264680aedc4df8";
-    hash = "sha256-TzHJNIFZjUOImZ4dRC0hnB4xsDZCOuEjfXRi2ZXr8QE=";
+    rev = "034efd687f689f1981ab0e5a7dd46c1e1b4a08c9";
+    hash = "sha256-JIb26wE0WBf9Ul0wYW1/XpQICVTsNLgWgkXvtC457zo=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/office/default.nix b/pkgs/by-name/ya/yazi/plugins/office/default.nix
new file mode 100644
index 000000000000..08d6f42d187d
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/office/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "office.yazi";
+  version = "0-unstable-2026-04-22";
+
+  src = fetchFromGitHub {
+    owner = "macydnah";
+    repo = "office.yazi";
+    rev = "41ebef8be9dded98b5179e8af65be71b30a1ac4d";
+    hash = "sha256-QFto48D+Z8qHl7LHoDDprvr5mIJY8E7j37cUpRjKdNk=";
+  };
+
+  meta = {
+    description = "A plugin to preview office documents in Yazi";
+    homepage = "https://github.com/macydnah/office.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nemeott ];
+  };
+}
diff --git a/pkgs/by-name/yb/yb/package.nix b/pkgs/by-name/yb/yb/package.nix
index ad9cbfe8cd81..b96acb2db702 100644
--- a/pkgs/by-name/yb/yb/package.nix
+++ b/pkgs/by-name/yb/yb/package.nix
@@ -66,7 +66,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   # Run subset of tests that don't require YubiKey hardware
   doCheck = true;
-  pytestFlagsArray = [
+  enabledTestPaths = [
     "tests"
   ];
 
diff --git a/pkgs/by-name/yg/yggdrasil-ng/package.nix b/pkgs/by-name/yg/yggdrasil-ng/package.nix
index 7af423a0b2de..e4a109846271 100644
--- a/pkgs/by-name/yg/yggdrasil-ng/package.nix
+++ b/pkgs/by-name/yg/yggdrasil-ng/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage (oldAttrs: {
   pname = "yggdrasil-ng";
-  version = "0.1.4";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Yggdrasil-ng";
     tag = "v${oldAttrs.version}";
-    hash = "sha256-AutOV1FXBeiG9CNoVSili3sF+QndZI2L7b72jdPOe5E=";
+    hash = "sha256-nJLK5O2kjFRGZ3JwqwLHtYqvJfrOxtZOjdM6q2NNrbk=";
   };
 
-  cargoHash = "sha256-9/whbfM5fMZT6COo2HvdCmeCFC93NI1GXhGNAAaTiLM=";
+  cargoHash = "sha256-mJr8IMTbB+mSrsxzq6ehnfBueulNqZtxU/1aHAyv954=";
 
   __structuredAttrs = true;
 
diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix
index ce576317e30f..f973d270d6c1 100644
--- a/pkgs/by-name/yo/yoshimi/package.nix
+++ b/pkgs/by-name/yo/yoshimi/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "yoshimi";
-  version = "2.3.5.3";
+  version = "2.3.6.2";
 
   src = fetchFromGitHub {
     owner = "Yoshimi";
     repo = "yoshimi";
     tag = finalAttrs.version;
-    hash = "sha256-3/iFZfqUX2q4+6rD6AX3E8vXt0HP82PDDTqpiZTvtLw=";
+    hash = "sha256-jSCOsSJdG1dt/i5iTaQngagYnokPNsNExF2fJxxUWSY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix
index 13cfc6f4c715..750880db9ae7 100644
--- a/pkgs/by-name/yo/youtrack/package.nix
+++ b/pkgs/by-name/yo/youtrack/package.nix
@@ -10,15 +10,15 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "youtrack";
-  version = "2025.3.121962";
+  version = "2026.1.12458";
 
   src = dockerTools.exportImage {
     diskSize = 8192;
     fromImage = dockerTools.pullImage {
       imageName = "jetbrains/youtrack";
       arch = "amd64";
-      imageDigest = "sha256:90b641d623cb30f4915bd4a0bdba088bab25cf14314231e0333b8564bc353161";
-      hash = "sha256-WkEKJKfG5lagfgn4hbpEqIUPXGJYcYbwMjb1c5BNvp8=";
+      imageDigest = "sha256:64b9c6c0e409e9cb7e62558bbb2ca0208a85d1c40331b41430e290404b300e40";
+      hash = "sha256-7rlilHogqwxPXZlhAHv5Kk2+i8rMyGP6eZR1DdbhRDM=";
     };
   };
   unpackPhase = ''
diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix
index 468788f036e4..2d79bfe85617 100644
--- a/pkgs/by-name/yq/yq-go/package.nix
+++ b/pkgs/by-name/yq/yq-go/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "yq-go";
-  version = "4.52.5";
+  version = "4.53.2";
 
   src = fetchFromGitHub {
     owner = "mikefarah";
     repo = "yq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZOgAPnONzRBTjNeOgQK4fXwUrypHH51XI/JWbE/momE=";
+    hash = "sha256-So0yUblAxLgbw1/BrOp6zj9wGMTtsspjk2UQaBIBIYE=";
   };
 
-  vendorHash = "sha256-QTcDE5qs46ryWhZlKHIC2G1jbEO12XGJa6QvEJC5oL8=";
+  vendorHash = "sha256-t+u3rJNbe8JcfWBb+jMaZuTcSWYmhMiCeKbI2noVaCo=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles
diff --git a/pkgs/by-name/yt/ytcast/package.nix b/pkgs/by-name/yt/ytcast/package.nix
index 73e48b1e6545..cecbe2053707 100644
--- a/pkgs/by-name/yt/ytcast/package.nix
+++ b/pkgs/by-name/yt/ytcast/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "ytcast";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "MarcoLucidi01";
     repo = "ytcast";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-iy9+MgXwP4ALz4NHJyn2ghC5boR53H3ioB2+7tcJunE=";
+    sha256 = "sha256-qFKqyBaG3+IltuJ/UDeWxlBy1NqXRZ0ENGiQoTOrWI0=";
   };
 
   vendorHash = null;
@@ -22,7 +22,10 @@ buildGoModule (finalAttrs: {
     description = "Tool to cast YouTube videos from the command-line";
     homepage = "https://github.com/MarcoLucidi01/ytcast";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ waelwindows ];
+    maintainers = with lib.maintainers; [
+      waelwindows
+      claes
+    ];
     mainProgram = "ytcast";
   };
 })
diff --git a/pkgs/by-name/yt/ytt/package.nix b/pkgs/by-name/yt/ytt/package.nix
index 6909669ce3ea..b40ee652d3a6 100644
--- a/pkgs/by-name/yt/ytt/package.nix
+++ b/pkgs/by-name/yt/ytt/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "ytt";
-  version = "0.53.2";
+  version = "0.54.0";
 
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "ytt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QGb3lTeMiYN4+uml1x0tIGRf7EF96gXIsXgkxyWxL1Q=";
+    hash = "sha256-xyWkKQps4ImsLUECNhysSkVuVpgj9uMgE4tpmzvcBJc=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/yu/yubiswitch/package.nix b/pkgs/by-name/yu/yubiswitch/package.nix
new file mode 100644
index 000000000000..2132f42e99d2
--- /dev/null
+++ b/pkgs/by-name/yu/yubiswitch/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  _7zz,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "yubiswitch";
+  version = "0.18";
+
+  src = fetchurl {
+    url = "https://github.com/pallotron/yubiswitch/releases/download/v${finalAttrs.version}/yubiswitch_${finalAttrs.version}.dmg";
+    hash = "sha256-ee7l8jj1pJdj+SjMNWcLfHV//G0FG9bdBkNcxUh8Zuk=";
+  };
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ _7zz ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    cp -R yubiswitch.app "$out/Applications"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "macOS status bar application to enable/disable a Yubikey Nano";
+    homepage = "https://github.com/pallotron/yubiswitch";
+    changelog = "https://github.com/pallotron/yubiswitch/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ sheeeng ];
+  };
+})
diff --git a/pkgs/by-name/yu/yudit/package.nix b/pkgs/by-name/yu/yudit/package.nix
index 4fb8cbd24ba9..51f34e80b4a9 100644
--- a/pkgs/by-name/yu/yudit/package.nix
+++ b/pkgs/by-name/yu/yudit/package.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Free Unicode plain-text editor for Unix-like systems";
     homepage = "https://www.yudit.org/";
-    changelog = "https://www.yudit.org/download/CHANGELOG.TXT";
     mainProgram = "yudit";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ doronbehar ];
diff --git a/pkgs/by-name/yu/yutto/package.nix b/pkgs/by-name/yu/yutto/package.nix
index 542cb2840281..d030bd35a467 100644
--- a/pkgs/by-name/yu/yutto/package.nix
+++ b/pkgs/by-name/yu/yutto/package.nix
@@ -7,7 +7,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "yutto";
-  version = "2.1.1";
+  version = "2.2.0";
   pyproject = true;
 
   pythonRelaxDeps = true;
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "yutto-dev";
     repo = "yutto";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zolH3mf9YQLZLK98hhbHqUdDLRDodS/fChyfZ/xzVew=";
+    hash = "sha256-5p0/a7cwmXqQVQP90cgwWHFpFaT+YDGDFbN+EGH89CA=";
   };
 
   build-system = with python3Packages; [ uv-build ];
@@ -31,6 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
       typing-extensions
       pydantic
       returns
+      segno
     ]
     ++ (with httpx.optional-dependencies; http2 ++ socks);
 
diff --git a/pkgs/by-name/za/zammad/update.nix b/pkgs/by-name/za/zammad/update.nix
index fbda85611b4b..df5f16e1997e 100644
--- a/pkgs/by-name/za/zammad/update.nix
+++ b/pkgs/by-name/za/zammad/update.nix
@@ -8,7 +8,6 @@
   jq,
   nix-prefetch-github,
   yarn,
-  yarn2nix,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -29,7 +28,6 @@ stdenvNoCC.mkDerivation rec {
     jq
     nix-prefetch-github
     yarn
-    yarn2nix
   ];
 
   meta = {
diff --git a/pkgs/by-name/za/zapper/package.nix b/pkgs/by-name/za/zapper/package.nix
index fe22cfa0cae6..3284106699e2 100644
--- a/pkgs/by-name/za/zapper/package.nix
+++ b/pkgs/by-name/za/zapper/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Zaps arguments and environment from the process list";
     homepage = "https://github.com/hackerschoice/zapper";
-    changelog = "https://github.com/hackerschoice/zapper/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/hackerschoice/zapper/releases/tag/${finalAttrs.src.tag}";
     # https://github.com/hackerschoice/zapper/issues/4
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ fab ];
diff --git a/pkgs/by-name/za/zapret2/package.nix b/pkgs/by-name/za/zapret2/package.nix
index d6c2729bd30e..08f96106c855 100644
--- a/pkgs/by-name/za/zapret2/package.nix
+++ b/pkgs/by-name/za/zapret2/package.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zapret2";
-  version = "0.9.5";
+  version = "0.9.5.1";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "bol-van";
     repo = "zapret2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KdkUCfxxe2ddcYebvKsslIUBkl5g7Rc/f+xY00hy5JM=";
+    hash = "sha256-uKLHzsi/AYQ8OLj2g8pszSCyD485Sg/s45Ko8gKN5z8=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index 9ab47d6579ae..e51531e8ab94 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "zashboard";
-  version = "3.4.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "Zephyruso";
     repo = "zashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-S5NrXjD34UwbsYQrHWMAgLc10/R1U2ZZ1gW0zkUXg6w=";
+    hash = "sha256-yTLkfNhfmhJ/2oopKQ+F6ycYYwUXpbyz4SSE3IIpTgc=";
   };
 
   npmDeps = null;
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 90b0d22ec7e5..ee17f813df39 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -97,7 +97,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.232.2";
+  version = "1.0.0";
 
   outputs = [
     "out"
@@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-S7N9R5VUcJP+yq0S6s4zeQQhSFSdDovtoL9FL1BEg2U=";
+    hash = "sha256-D5V0pvL3WCwhcC8dnNKTXRdnFq8LMZZ0/GDjw8xf95g=";
   };
 
   postPatch = ''
@@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-WpEPQw3GOemxjyfDH7VH3FURpkYVfVyXQiALJsccwQ4=";
+  cargoHash = "sha256-xtw7r7VluCEqXWKnxpVk8BPqr+mJV5rB3Eq/PvsKPBk=";
 
   __structuredAttrs = true;
 
@@ -150,7 +150,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     cargo-about
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ makeBinaryWrapper ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cargo-bundle
+    rustPlatform.bindgenHook
+  ];
 
   dontUseCmakeConfigure = true;
 
@@ -226,14 +229,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  # These two tests trigger GUI prompts that hang in the headless Nix build sandbox.
-  checkFlags = [
-    "--skip"
-    "zed::open_listener::tests::test_e2e_prompt_user_picks_existing_window"
-    "--skip"
-    "zed::open_listener::tests::test_e2e_prompt_user_picks_new_window"
-  ];
-
   useNextest = true;
 
   remoteServerExecutableName = "zed-remote-server-${channel}-${finalAttrs.version}+${channel}";
diff --git a/pkgs/by-name/ze/zeekscript/package.nix b/pkgs/by-name/ze/zeekscript/package.nix
index e981c76da634..661cda3bcba6 100644
--- a/pkgs/by-name/ze/zeekscript/package.nix
+++ b/pkgs/by-name/ze/zeekscript/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "zeekscript";
-  version = "1.3.2-75";
+  version = "1.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zeek";
     repo = "zeekscript";
-    rev = "74591d35d6e9fbb805d2af738032c05b31d3c93a";
-    hash = "sha256-VAcbrzRIKdPC3q7U+ze7d3lVwDessHVL9orNYKzLovs=";
+    rev = "065edacf0321dd9a0cdd64285b93dec954bf448e";
+    hash = "sha256-uNVmY+yJy/4H/zRGqg68Pop2TcwZgsrT46cdx3bhKIo=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix
index 756ad90cd0b6..b121ed663d6c 100644
--- a/pkgs/by-name/ze/zenity/package.nix
+++ b/pkgs/by-name/ze/zenity/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zenity";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Wp/Y2DFvkMsuGlqPDUEeufyvhZV6ginqPoA+gQBKHr0=";
+    hash = "sha256-AZGGqZYJbvT8NW4hV3tWc/W6o6KayOPWCLdTNxwYAY0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix
index f8e8cf443630..432303a01549 100644
--- a/pkgs/by-name/ze/zenn-cli/package.nix
+++ b/pkgs/by-name/ze/zenn-cli/package.nix
@@ -40,8 +40,8 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       ;
     pnpm = pnpm_10;
-    fetcherVersion = 1;
-    hash = "sha256-WXsS5/J08n/dWV5MbyX4vK7j1mfiUoLdzwmzyqoX3FA=";
+    fetcherVersion = 3;
+    hash = "sha256-uxeZnYZzwyNOZN1x1f6tzcYgPbJhSc3gTdsfaE+967w=";
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/ze/zettlr/package.nix b/pkgs/by-name/ze/zettlr/package.nix
index c01c2e053b10..1899d2d99ead 100644
--- a/pkgs/by-name/ze/zettlr/package.nix
+++ b/pkgs/by-name/ze/zettlr/package.nix
@@ -9,11 +9,11 @@
 # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
 let
   pname = "zettlr";
-  version = "4.3.1";
+  version = "4.4.0";
 
   src = fetchurl {
     url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
-    hash = "sha256-7fQ4XObfXBiSqnhJPkUKsXBazucCTHjwvkK70dP74bE=";
+    hash = "sha256-Swic0hKZowOQasv5VAhT/1Gc3I03Zpw4c1FIQE1qsCQ=";
   };
   appimageContents = appimageTools.extractType2 {
     inherit pname version src;
diff --git a/pkgs/by-name/zg/zgrab2/package.nix b/pkgs/by-name/zg/zgrab2/package.nix
index 51e0bcd47397..a7ec0bf632f2 100644
--- a/pkgs/by-name/zg/zgrab2/package.nix
+++ b/pkgs/by-name/zg/zgrab2/package.nix
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Fast Application Layer Scanner";
     homepage = "https://github.com/zmap/zgrab2";
-    changelog = "https://github.com/zmap/zgrab2/releases/tag/vv${finalAttrs.version}";
+    changelog = "https://github.com/zmap/zgrab2/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [
       asl20
       isc
diff --git a/pkgs/by-name/zi/zig-zlint/build.zig.zon.nix b/pkgs/by-name/zi/zig-zlint/build.zig.zon.nix
index dbdbc40b385e..ba20bc71c514 100644
--- a/pkgs/by-name/zi/zig-zlint/build.zig.zon.nix
+++ b/pkgs/by-name/zi/zig-zlint/build.zig.zon.nix
@@ -8,24 +8,25 @@
 
 linkFarm "zig-packages" [
   {
-    name = "chameleon-3.0.0-bqfnCfhtAAAAxXGw5t9odkb4ayCTTqOcPvL-TgSMUacF";
-    path = fetchzip {
-      url = "https://github.com/DonIsaac/chameleon/archive/7c7477fa76da53c2791f9e1f860481f64140ccbc.zip";
-      hash = "sha256-fbKhLQLE/6aHmpYr8+daxyUSWNpDq5zApHP4brRYvlo=";
+    name = "chameleon-2.0.1-ZOxajZ17AADmYCpHFqqoGfaXQiRkXM8B5lYJfir9tqsz";
+    path = fetchgit {
+      url = "https://github.com/tr1ckydev/chameleon";
+      rev = "414169dede742d9ac8261d31b9fca6e31a1d7246";
+      hash = "sha256-/TGzbVh+Z6dPEKtW0M0Tv1vXvc6jmb+kHf6Q0rHmEPE=";
     };
   }
   {
-    name = "recover-1.1.0-Zd97oqomAADqISI8KEhW_UUjiPSExhw9hzeoNpg1Nveo";
+    name = "recover-1.3.0-Zd97opwlAAB5ocfOuy8Fxp7_prPehOuEnh0R_8rBsNCk";
     path = fetchzip {
-      url = "https://github.com/dimdin/zig-recover/archive/36133afaa1b085db7063ffc97c08ae0bddc2de4e.zip";
-      hash = "sha256-0oPP6BLVEIR79Q8KcvOlSeDfNLT+8inmIU6ZkuJWrfU=";
+      url = "https://github.com/dimdin/zig-recover/archive/refs/tags/1.3.0.tar.gz";
+      hash = "sha256-3x7ptCcmGjCop703ftS/KWuTlAdcCw431C8Q4VAdLIs=";
     };
   }
   {
-    name = "smart_pointers-0.0.3-NPos2MOwAABoujUzLcVLofXqRAgYWLc5pG-TKDhyK0cq";
+    name = "smart_pointers-0.0.4-NPos2JOtAACuxKEoBGQgkmncI0APAPl-QwaI6klLObuP";
     path = fetchzip {
-      url = "https://github.com/DonIsaac/smart-pointers/archive/refs/tags/v0.0.3.tar.gz";
-      hash = "sha256-oSI76wyiAX7YDvKGhzRbZdEvl7+DPLtMb56w0QsYrkg=";
+      url = "https://github.com/DonIsaac/smart-pointers/archive/refs/tags/v0.0.4.tar.gz";
+      hash = "sha256-gSvAggi0qQgTd9avuqI9AspTGXr+w5ZkgNiI3kf0+dU=";
     };
   }
 ]
diff --git a/pkgs/by-name/zi/zig-zlint/package.nix b/pkgs/by-name/zi/zig-zlint/package.nix
index 55ced9c402e5..d883df68ca2a 100644
--- a/pkgs/by-name/zi/zig-zlint/package.nix
+++ b/pkgs/by-name/zi/zig-zlint/package.nix
@@ -3,24 +3,27 @@
   stdenv,
   fetchFromGitHub,
   callPackage,
-  zig_0_14,
+  zig_0_15,
   versionCheckHook,
 }:
 
+let
+  zig = zig_0_15;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zig-zlint";
-  version = "0.7.9";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     name = "zlint"; # tests expect this
     owner = "DonIsaac";
     repo = "zlint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qJPOFMBvkvF10ixE17pV9X5LX3EyCVzzhrMGx1omTzE=";
+    hash = "sha256-yjMgmO/kjLA9eBPXY+TgfVLyOLIpBtBigItJuon+t9k=";
   };
 
   nativeBuildInputs = [
-    zig_0_14
+    zig
   ];
 
   zigBuildFlags = [
@@ -50,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ christoph-heiss ];
     mainProgram = "zlint";
-    inherit (zig_0_14.meta) platforms;
+    inherit (zig.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/zi/zigbee2mqtt/package.nix b/pkgs/by-name/zi/zigbee2mqtt/package.nix
index 52365017d72a..55ee1d88c7bf 100644
--- a/pkgs/by-name/zi/zigbee2mqtt/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt/package.nix
@@ -14,20 +14,20 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "zigbee2mqtt";
-  version = "2.9.2";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
     tag = finalAttrs.version;
-    hash = "sha256-LdrsHOeRXeNccpf1UNg20y82M75PGt070zVbmQYYsVg=";
+    hash = "sha256-PwpRa6sbHyWmaIG8U0nkZqxzjKuw44Cnez8yVhuajZQ=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     pnpm = pnpm_9;
-    fetcherVersion = 1;
-    hash = "sha256-8ioe9/gSI9u9ehrnj3L1j+vPS9p+nJGs2d8TdZTEsk4=";
+    fetcherVersion = 3;
+    hash = "sha256-qhX7fEcxG5eFM3gM/OwMk5QSB4bnt9VS3ZxMh7VGdNw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/zi/zinit/package.nix b/pkgs/by-name/zi/zinit/package.nix
index 64e73f9cf6ba..a52156552a37 100644
--- a/pkgs/by-name/zi/zinit/package.nix
+++ b/pkgs/by-name/zi/zinit/package.nix
@@ -35,8 +35,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # Source files
     mkdir -p $out/share/zinit
     install -m0444 zinit{,-side,-install,-autoload,-additional}.zsh _zinit $out/share/zinit
-    install -m0555 share/git-process-output.zsh $out/share/zinit
-    install -m0444 share/rpm2cpio.zsh $out/share/zinit
+    mkdir $out/share/zinit/share
+    install -m0555 share/git-process-output.zsh $out/share/zinit/share
+    install -m0444 share/rpm2cpio.zsh $out/share/zinit/share
 
     # Autocompletion
     installShellCompletion --zsh _zinit
diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix
index bb757978c460..247fdcdfa5f4 100644
--- a/pkgs/by-name/zo/zon2nix/package.nix
+++ b/pkgs/by-name/zo/zon2nix/package.nix
@@ -2,23 +2,25 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  zig_0_14,
+  zig_0_16,
   nix,
 }:
-
+let
+  zig = zig_0_16;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zon2nix";
-  version = "0.1.3-unstable-2025-03-20";
+  version = "0.1.3-unstable-2026-04-13";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "zon2nix";
-    rev = "2360e358c2107860dadd340f88b25d260b538188";
-    hash = "sha256-89hYzrzQokQ+HUOd3g4epP9jdajaIoaMG81SrCNCqqU=";
+    rev = "d1e1762ce1e5d4df3b65a0d45421b6fb7b99cf92";
+    hash = "sha256-LzmPWG0cEhQS3+NDg/5KRgsUJHygllTK9lvDJJI/o+U=";
   };
 
   nativeBuildInputs = [
-    zig_0_14
+    zig
   ];
 
   zigBuildFlags = [
@@ -38,6 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       RossComputerGuy
     ];
-    inherit (zig_0_14.meta) platforms;
+    inherit (zig.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/zo/zookeeper/package.nix b/pkgs/by-name/zo/zookeeper/package.nix
index ad6c01e43717..e90cd30c6dde 100644
--- a/pkgs/by-name/zo/zookeeper/package.nix
+++ b/pkgs/by-name/zo/zookeeper/package.nix
@@ -15,7 +15,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zookeeper";
-  version = "3.9.5";
+  version = "3.9.5"; # Don't forget to update zookeeper_mt's hash!
 
   src = fetchurl {
     url = "mirror://apache/zookeeper/zookeeper-${finalAttrs.version}/apache-zookeeper-${finalAttrs.version}-bin.tar.gz";
diff --git a/pkgs/by-name/zo/zookeeper_mt/package.nix b/pkgs/by-name/zo/zookeeper_mt/package.nix
index e81724314499..44dc1fdf8cd8 100644
--- a/pkgs/by-name/zo/zookeeper_mt/package.nix
+++ b/pkgs/by-name/zo/zookeeper_mt/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
-    hash = "sha512-K8HvBwIdf0tHVotFoFuk0uYr2HFPsCKjPmK9xI/hHTxkpT1Tyx11Lxel9NlJppttillKMYAHvgrzinPDcQ7bdg==";
+    hash = "sha512-Zb6uvLbvf2m4RMLwpZ3E2S9ChFvcOpyp/TH+WSfTe6tOmecAnv/YM6gz4z5PyBulyg0j7jqc3BmQvotvyPt5tw==";
   };
 
   sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";
diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix
index 092cd26f55ca..95d6ef19dc1c 100644
--- a/pkgs/by-name/zo/zotero/package.nix
+++ b/pkgs/by-name/zo/zotero/package.nix
@@ -28,14 +28,14 @@ let
   nodejs = nodejs_22;
 
   pname = "zotero";
-  version = "9.0.0";
+  version = "9.0.1";
 
   src = fetchFromGitHub {
     owner = "zotero";
     repo = "zotero";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-70kVFnypdF3YDXfrA+BFSoGkBfQAjDVa2pWOmaoetBI=";
+    hash = "sha256-51JSDrvvrwnmuxn7YZd8e0by4CJODvflHi4M4GAt2Lw=";
   };
 
   pdf-js = buildNpmPackage {
diff --git a/pkgs/by-name/zp/zps/package.nix b/pkgs/by-name/zp/zps/package.nix
index c61b15706f9a..17660daf2ac0 100644
--- a/pkgs/by-name/zp/zps/package.nix
+++ b/pkgs/by-name/zp/zps/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     mkdir -p $out/share/applications
     substitute ../.application/zps.desktop $out/share/applications/zps.desktop \
-      --replace Exec=zps Exec=$out/zps \
+      --replace Exec=zps Exec=$out/zps
   '';
 
   meta = {
diff --git a/pkgs/by-name/zr/zrythm/package.nix b/pkgs/by-name/zr/zrythm/package.nix
index f34ea0b26ca4..3d0a58f5a122 100644
--- a/pkgs/by-name/zr/zrythm/package.nix
+++ b/pkgs/by-name/zr/zrythm/package.nix
@@ -57,7 +57,7 @@
   wrapGAppsHook4,
   writeScript,
   xdg-utils,
-  xxHash,
+  xxhash,
   yyjson,
   zix,
   zstd,
@@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
     soxr
     vamp-plugin-sdk
     xdg-utils
-    xxHash
+    xxhash
     yyjson
     zix
     zstd
diff --git a/pkgs/by-name/zs/zsh-forgit/package.nix b/pkgs/by-name/zs/zsh-forgit/package.nix
index 966ec325823b..7fb1ec8e44c1 100644
--- a/pkgs/by-name/zs/zsh-forgit/package.nix
+++ b/pkgs/by-name/zs/zsh-forgit/package.nix
@@ -16,13 +16,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zsh-forgit";
-  version = "26.04.2";
+  version = "26.05.0";
 
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
     tag = finalAttrs.version;
-    hash = "sha256-/zFws4/QkAuoV2edtxW3jK1HbftigYNZzTkSg5Y4Phg=";
+    hash = "sha256-EFbzrVgLfVO+dEEQ1vZUcZkIszZFCktYjQjwkBVrHQI=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/zs/zsh/fix-sigsuspend-probe-c23.patch b/pkgs/by-name/zs/zsh/fix-sigsuspend-probe-c23.patch
new file mode 100644
index 000000000000..46c060b235d2
--- /dev/null
+++ b/pkgs/by-name/zs/zsh/fix-sigsuspend-probe-c23.patch
@@ -0,0 +1,17 @@
+Prototype the K&R handler so the probe still compiles under -std=gnu23
+(selected by autoconf 2.73). Upstream removed the probe in 8dd271fdec52,
+which does not apply against 5.9 with the PCRE backports.
+
+https://github.com/NixOS/nixpkgs/issues/513543
+--- a/configure.ac
++++ b/configure.ac
+@@ -2334,8 +2334,7 @@ if test x$signals_style = xPOSIX_SIGNALS; then
+ #include <signal.h>
+ #include <unistd.h>
+ int child=0;
+-void handler(sig)
+-    int sig;
++void handler(int sig)
+ {if(sig==SIGCHLD) child=1;}
+ int main() {
+     struct sigaction act;
diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix
index fda96e5f40e5..1ec13496c599 100644
--- a/pkgs/by-name/zs/zsh/package.nix
+++ b/pkgs/by-name/zs/zsh/package.nix
@@ -63,6 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-bl1PG9Zk1wK+2mfbCBhD3OEpP8HQboqEO8sLFqX8DmA=";
       excludes = [ "ChangeLog" ];
     })
+    # autoconf 2.73 picks -std=gnu23, breaking the K&R sigsuspend probe and
+    # causing $(...) hangs. Drop with the next zsh release.
+    ./fix-sigsuspend-probe-c23.patch
   ]
   ++ lib.optionals stdenv.cc.isGNU [
     # Fixes compilation with gcc >= 14.
diff --git a/pkgs/by-name/zs/zsv/package.nix b/pkgs/by-name/zs/zsv/package.nix
index c94de9e19b53..cac500e03400 100644
--- a/pkgs/by-name/zs/zsv/package.nix
+++ b/pkgs/by-name/zs/zsv/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zsv";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "liquidaty";
     repo = "zsv";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ht6sg93bHrNTw1tEEkd9vRl5aIsc1q7nASakvECdyzI=";
+    hash = "sha256-CrZgf9ayAbkIFz7MC4WUwXba0heWDxxJpePg71CCw2A=";
   };
 
   buildInputs = [ jq ];
diff --git a/pkgs/by-name/zs/zsync/c23.patch b/pkgs/by-name/zs/zsync/c23.patch
new file mode 100644
index 000000000000..717a7f475c75
--- /dev/null
+++ b/pkgs/by-name/zs/zsync/c23.patch
@@ -0,0 +1,855 @@
+diff --git a/libzsync/zsync.c b/libzsync/zsync.c
+index bf3a77c..0697857 100644
+--- a/libzsync/zsync.c
++++ b/libzsync/zsync.c
+@@ -41,6 +41,8 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <ctype.h>
++
++#define _DARWIN_C_SOURCE
+ #include <time.h>
+ 
+ #include <arpa/inet.h>
+diff --git a/zlib/adler32.c b/zlib/adler32.c
+index 624a169..19a7012 100644
+--- a/zlib/adler32.c
++++ b/zlib/adler32.c
+@@ -44,10 +44,7 @@
+ #endif
+ 
+ /* ========================================================================= */
+-uLong ZEXPORT adler32(adler, buf, len)
+-    uLong adler;
+-    const Bytef *buf;
+-    uInt len;
++uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len)
+ {
+     unsigned long s1 = adler & 0xffff;
+     unsigned long s2 = (adler >> 16) & 0xffff;
+diff --git a/zlib/compress.c b/zlib/compress.c
+index 24ef029..232691b 100644
+--- a/zlib/compress.c
++++ b/zlib/compress.c
+@@ -19,12 +19,7 @@
+    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+    Z_STREAM_ERROR if the level parameter is invalid.
+ */
+-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+-    Bytef *dest;
+-    uLongf *destLen;
+-    const Bytef *source;
+-    uLong sourceLen;
+-    int level;
++int ZEXPORT compress2 (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen, int level)
+ {
+     z_stream stream;
+     int err;
+@@ -59,11 +54,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+ 
+ /* ===========================================================================
+  */
+-int ZEXPORT compress (dest, destLen, source, sourceLen)
+-    Bytef *dest;
+-    uLongf *destLen;
+-    const Bytef *source;
+-    uLong sourceLen;
++int ZEXPORT compress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)
+ {
+     return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+ }
+@@ -72,8 +63,7 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
+      If the default memLevel or windowBits for deflateInit() is changed, then
+    this function needs to be updated.
+  */
+-uLong ZEXPORT compressBound (sourceLen)
+-    uLong sourceLen;
++uLong ZEXPORT compressBound (uLong sourceLen)
+ {
+     return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
+ }
+diff --git a/zlib/crc32.c b/zlib/crc32.c
+index 689b288..b4dc0b3 100644
+--- a/zlib/crc32.c
++++ b/zlib/crc32.c
+@@ -155,9 +155,7 @@ local void make_crc_table()
+ }
+ 
+ #ifdef MAKECRCH
+-local void write_table(out, table)
+-    FILE *out;
+-    const unsigned long FAR *table;
++local void write_table(FILE *out, const unsigned long FAR *table)
+ {
+     int n;
+ 
+@@ -190,10 +188,7 @@ const unsigned long FAR * ZEXPORT get_crc_table()
+ #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+ 
+ /* ========================================================================= */
+-unsigned long ZEXPORT crc32(crc, buf, len)
+-    unsigned long crc;
+-    const unsigned char FAR *buf;
+-    unsigned len;
++unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR *buf, unsigned len)
+ {
+     if (buf == Z_NULL) return 0UL;
+ 
+@@ -233,10 +228,7 @@ unsigned long ZEXPORT crc32(crc, buf, len)
+ #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+ 
+ /* ========================================================================= */
+-local unsigned long crc32_little(crc, buf, len)
+-    unsigned long crc;
+-    const unsigned char FAR *buf;
+-    unsigned len;
++local unsigned long crc32_little(unsigned long crc, const unsigned char FAR *buf, unsigned len)
+ {
+     register u4 c;
+     register const u4 FAR *buf4;
+@@ -273,10 +265,7 @@ local unsigned long crc32_little(crc, buf, len)
+ #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+ 
+ /* ========================================================================= */
+-local unsigned long crc32_big(crc, buf, len)
+-    unsigned long crc;
+-    const unsigned char FAR *buf;
+-    unsigned len;
++local unsigned long crc32_big(unsigned long crc, const unsigned char FAR *buf, unsigned len)
+ {
+     register u4 c;
+     register const u4 FAR *buf4;
+diff --git a/zlib/deflate.c b/zlib/deflate.c
+index 19a8f27..58b2f01 100644
+--- a/zlib/deflate.c
++++ b/zlib/deflate.c
+@@ -201,11 +201,7 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+     zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateInit_(strm, level, version, stream_size)
+-    z_streamp strm;
+-    int level;
+-    const char *version;
+-    int stream_size;
++int ZEXPORT deflateInit_(z_streamp strm, int level, const char *version, int stream_size)
+ {
+     return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+                          Z_DEFAULT_STRATEGY, version, stream_size);
+@@ -213,16 +209,8 @@ int ZEXPORT deflateInit_(strm, level, version, stream_size)
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+-                  version, stream_size)
+-    z_streamp strm;
+-    int  level;
+-    int  method;
+-    int  windowBits;
+-    int  memLevel;
+-    int  strategy;
+-    const char *version;
+-    int stream_size;
++int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, int windowBits, int memLevel, int strategy,
++                  const char *version, int stream_size)
+ {
+     deflate_state *s;
+     int wrap = 1;
+@@ -311,10 +299,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+-    z_streamp strm;
+-    const Bytef *dictionary;
+-    uInt  dictLength;
++int ZEXPORT deflateSetDictionary (z_streamp strm, const Bytef *dictionary, uInt dictLength)
+ {
+     deflate_state *s;
+     uInt length = dictLength;
+@@ -355,8 +340,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateReset (strm)
+-    z_streamp strm;
++int ZEXPORT deflateReset (z_streamp strm)
+ {
+     deflate_state *s;
+ 
+@@ -391,10 +375,7 @@ int ZEXPORT deflateReset (strm)
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflatePrime (strm, bits, value)
+-    z_streamp strm;
+-    int bits;
+-    int value;
++int ZEXPORT deflatePrime (z_streamp strm, int bits, int value)
+ {
+     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+     strm->state->bi_valid = bits;
+@@ -403,10 +384,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateParams(strm, level, strategy)
+-    z_streamp strm;
+-    int level;
+-    int strategy;
++int ZEXPORT deflateParams(z_streamp strm, int level, int strategy)
+ {
+     deflate_state *s;
+     compress_func func;
+@@ -457,9 +435,7 @@ int ZEXPORT deflateParams(strm, level, strategy)
+  * But even the conservative upper bound of about 14% expansion does not
+  * seem onerous for output buffer allocation.
+  */
+-uLong ZEXPORT deflateBound(strm, sourceLen)
+-    z_streamp strm;
+-    uLong sourceLen;
++uLong ZEXPORT deflateBound(z_streamp strm, uLong sourceLen)
+ {
+     deflate_state *s;
+     uLong destLen;
+@@ -486,9 +462,7 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
+  * IN assertion: the stream state is correct and there is enough room in
+  * pending_buf.
+  */
+-local void putShortMSB (s, b)
+-    deflate_state *s;
+-    uInt b;
++local void putShortMSB (deflate_state *s, uInt b)
+ {
+     put_byte(s, (Byte)(b >> 8));
+     put_byte(s, (Byte)(b & 0xff));
+@@ -500,8 +474,7 @@ local void putShortMSB (s, b)
+  * to avoid allocating a large strm->next_out buffer and copying into it.
+  * (See also read_buf()).
+  */
+-local void flush_pending(strm)
+-    z_streamp strm;
++local void flush_pending(z_streamp strm)
+ {
+     unsigned len = strm->state->pending;
+ 
+@@ -520,9 +493,7 @@ local void flush_pending(strm)
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflate (strm, flush)
+-    z_streamp strm;
+-    int flush;
++int ZEXPORT deflate (z_streamp strm, int flush)
+ {
+     int old_flush; /* value of flush param for previous deflate call */
+     deflate_state *s;
+@@ -696,8 +667,7 @@ int ZEXPORT deflate (strm, flush)
+ }
+ 
+ /* ========================================================================= */
+-int ZEXPORT deflateEnd (strm)
+-    z_streamp strm;
++int ZEXPORT deflateEnd (z_streamp strm)
+ {
+     int status;
+ 
+@@ -726,9 +696,7 @@ int ZEXPORT deflateEnd (strm)
+  * To simplify the source, this is not supported for 16-bit MSDOS (which
+  * doesn't have enough memory anyway to duplicate compression states).
+  */
+-int ZEXPORT deflateCopy (dest, source)
+-    z_streamp dest;
+-    z_streamp source;
++int ZEXPORT deflateCopy (z_streamp dest, z_streamp source)
+ {
+ #ifdef MAXSEG_64K
+     return Z_STREAM_ERROR;
+@@ -788,10 +756,7 @@ int ZEXPORT deflateCopy (dest, source)
+  * allocating a large strm->next_in buffer and copying from it.
+  * (See also flush_pending()).
+  */
+-local int read_buf(strm, buf, size)
+-    z_streamp strm;
+-    Bytef *buf;
+-    unsigned size;
++local int read_buf(z_streamp strm, Bytef *buf, unsigned size)
+ {
+     unsigned len = strm->avail_in;
+ 
+@@ -818,8 +783,7 @@ local int read_buf(strm, buf, size)
+ /* ===========================================================================
+  * Initialize the "longest match" routines for a new zlib stream
+  */
+-local void lm_init (s)
+-    deflate_state *s;
++local void lm_init (deflate_state *s)
+ {
+     s->window_size = (ulg)2L*s->w_size;
+ 
+@@ -857,9 +821,7 @@ local void lm_init (s)
+ /* For 80x86 and 680x0, an optimized version will be provided in match.asm or
+  * match.S. The code will be functionally equivalent.
+  */
+-local uInt longest_match(s, cur_match)
+-    deflate_state *s;
+-    IPos cur_match;                             /* current match */
++local uInt longest_match(deflate_state *s, IPos cur_match /* current match */)
+ {
+     unsigned chain_length = s->max_chain_length;/* max hash chain length */
+     register Bytef *scan = s->window + s->strstart; /* current string */
+@@ -1000,9 +962,7 @@ local uInt longest_match(s, cur_match)
+ /* ---------------------------------------------------------------------------
+  * Optimized version for level == 1 or strategy == Z_RLE only
+  */
+-local uInt longest_match_fast(s, cur_match)
+-    deflate_state *s;
+-    IPos cur_match;                             /* current match */
++local uInt longest_match_fast(deflate_state *s, IPos cur_match /* current match */)
+ {
+     register Bytef *scan = s->window + s->strstart; /* current string */
+     register Bytef *match;                       /* matched string */
+@@ -1057,10 +1017,7 @@ local uInt longest_match_fast(s, cur_match)
+ /* ===========================================================================
+  * Check that the match at match_start is indeed a match.
+  */
+-local void check_match(s, start, match, length)
+-    deflate_state *s;
+-    IPos start, match;
+-    int length;
++local void check_match(deflate_state *s, IPos start, IPos match, int length)
+ {
+     /* check that the match is indeed a match */
+     if (zmemcmp(s->window + match,
+@@ -1091,8 +1048,7 @@ local void check_match(s, start, match, length)
+  *    performed for at least two bytes (required for the zip translate_eol
+  *    option -- not supported here).
+  */
+-local void fill_window(s)
+-    deflate_state *s;
++local void fill_window(deflate_state *s)
+ {
+     register unsigned n, m;
+     register Posf *p;
+@@ -1214,9 +1170,7 @@ local void fill_window(s)
+  * NOTE: this function should be optimized to avoid extra copying from
+  * window to pending_buf.
+  */
+-local block_state deflate_stored(s, flush)
+-    deflate_state *s;
+-    int flush;
++local block_state deflate_stored(deflate_state *s, int flush)
+ {
+     /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
+      * to pending_buf_size, and each stored block has a 5 byte header:
+@@ -1272,9 +1226,7 @@ local block_state deflate_stored(s, flush)
+  * new strings in the dictionary only for unmatched strings or for short
+  * matches. It is used only for the fast compression options.
+  */
+-local block_state deflate_fast(s, flush)
+-    deflate_state *s;
+-    int flush;
++local block_state deflate_fast(deflate_state *s, int flush)
+ {
+     IPos hash_head = NIL; /* head of the hash chain */
+     int bflush;           /* set if current block must be flushed */
+@@ -1378,9 +1330,7 @@ local block_state deflate_fast(s, flush)
+  * evaluation for matches: a match is finally adopted only if there is
+  * no better match at the next window position.
+  */
+-local block_state deflate_slow(s, flush)
+-    deflate_state *s;
+-    int flush;
++local block_state deflate_slow(deflate_state *s, int flush)
+ {
+     IPos hash_head = NIL;    /* head of hash chain */
+     int bflush;              /* set if current block must be flushed */
+diff --git a/zlib/inflate.c b/zlib/inflate.c
+index fdc3f05..03ceaa3 100644
+--- a/zlib/inflate.c
++++ b/zlib/inflate.c
+@@ -104,8 +104,7 @@ local void fixedtables OF((struct inflate_state FAR *state));
+ local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
+                               unsigned len));
+ 
+-int ZEXPORT inflateReset(strm)
+-z_streamp strm;
++int ZEXPORT inflateReset(z_streamp strm)
+ {
+     struct inflate_state FAR *state;
+ 
+@@ -125,11 +124,7 @@ z_streamp strm;
+     return Z_OK;
+ }
+ 
+-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+-z_streamp strm;
+-int windowBits;
+-const char *version;
+-int stream_size;
++int ZEXPORT inflateInit2_(z_streamp strm, int windowBits, const char *version, int stream_size)
+ {
+     struct inflate_state FAR *state;
+ 
+@@ -168,10 +163,7 @@ int stream_size;
+     return inflateReset(strm);
+ }
+ 
+-int ZEXPORT inflateInit_(strm, version, stream_size)
+-z_streamp strm;
+-const char *version;
+-int stream_size;
++int ZEXPORT inflateInit_(z_streamp strm, const char *version, int stream_size)
+ {
+     return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+ }
+@@ -186,8 +178,7 @@ int stream_size;
+    used for threaded applications, since the rewriting of the tables and virgin
+    may not be thread-safe.
+  */
+-local void fixedtables(state)
+-struct inflate_state FAR *state;
++local void fixedtables(struct inflate_state FAR *state)
+ {
+ #ifdef BUILDFIXED
+     static int virgin = 1;
+@@ -304,9 +295,7 @@ void makefixed()
+    output will fall in the output data, making match copies simpler and faster.
+    The advantage may be dependent on the size of the processor's data caches.
+  */
+-int updatewindow(strm, out)
+-z_streamp strm;
+-unsigned out;
++int updatewindow(z_streamp strm, unsigned out)
+ {
+     struct inflate_state FAR *state;
+     unsigned copy, dist;
+@@ -535,9 +524,7 @@ unsigned out;
+    will return Z_BUF_ERROR if it has not reached the end of the stream.
+  */
+ 
+-int ZEXPORT inflate(strm, flush)
+-z_streamp strm;
+-int flush;
++int ZEXPORT inflate(z_streamp strm, int flush)
+ {
+     struct inflate_state FAR *state;
+     unsigned char FAR *next;    /* next input */
+@@ -1086,8 +1073,7 @@ int flush;
+     return ret;
+ }
+ 
+-int ZEXPORT inflateEnd(strm)
+-z_streamp strm;
++int ZEXPORT inflateEnd(z_streamp strm)
+ {
+     struct inflate_state FAR *state;
+     if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+@@ -1100,10 +1086,7 @@ z_streamp strm;
+     return Z_OK;
+ }
+ 
+-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+-z_streamp strm;
+-const Bytef *dictionary;
+-uInt dictLength;
++int ZEXPORT inflateSetDictionary(z_streamp strm, const Bytef *dictionary, uInt dictLength)
+ {
+     struct inflate_state FAR *state;
+     unsigned long id;
+@@ -1149,10 +1132,7 @@ uInt dictLength;
+    called again with more data and the *have state.  *have is initialized to
+    zero for the first call.
+  */
+-local unsigned syncsearch(have, buf, len)
+-unsigned FAR *have;
+-unsigned char FAR *buf;
+-unsigned len;
++local unsigned syncsearch(unsigned FAR *have, unsigned char FAR *buf, unsigned len)
+ {
+     unsigned got;
+     unsigned next;
+@@ -1172,8 +1152,7 @@ unsigned len;
+     return next;
+ }
+ 
+-int ZEXPORT inflateSync(strm)
+-z_streamp strm;
++int ZEXPORT inflateSync(z_streamp strm)
+ {
+     unsigned len;               /* number of bytes to look at or looked at */
+     unsigned long in, out;      /* temporary to save total_in and total_out */
+@@ -1223,8 +1202,7 @@ z_streamp strm;
+    block. When decompressing, PPP checks that at the end of input packet,
+    inflate is waiting for these length bytes.
+  */
+-int ZEXPORT inflateSyncPoint(strm)
+-z_streamp strm;
++int ZEXPORT inflateSyncPoint(z_streamp strm)
+ {
+     struct inflate_state FAR *state;
+ 
+@@ -1233,9 +1211,7 @@ z_streamp strm;
+     return state->mode == STORED && state->bits == 0;
+ }
+ 
+-int ZEXPORT inflateCopy(dest, source)
+-z_streamp dest;
+-z_streamp source;
++int ZEXPORT inflateCopy(z_streamp dest, z_streamp source)
+ {
+     struct inflate_state FAR *state;
+     struct inflate_state FAR *copy;
+@@ -1278,11 +1254,7 @@ z_streamp source;
+  * Extra stuff I need to move around in gzip files
+  */
+ 
+-void inflate_advance(strm,zoffset,b,s)
+-     z_streamp strm;
+-     int zoffset;
+-     int b;
+-     int s;
++void inflate_advance(z_streamp strm, int zoffset, int b, int s)
+ {
+   struct inflate_state FAR* state = (struct inflate_state FAR *)strm->state;
+ 
+@@ -1308,8 +1280,7 @@ void inflate_advance(strm,zoffset,b,s)
+   }
+ }
+ 
+-int ZEXPORT inflateSafePoint(strm)
+-z_streamp strm;
++int ZEXPORT inflateSafePoint(z_streamp strm)
+ {
+     struct inflate_state FAR *state;
+ 
+diff --git a/zlib/inftrees.c b/zlib/inftrees.c
+index c767d75..9176d16 100644
+--- a/zlib/inftrees.c
++++ b/zlib/inftrees.c
+@@ -29,13 +29,7 @@ const char inflate_copyright[] =
+    table index bits.  It will differ if the request is greater than the
+    longest code or if it is less than the shortest code.
+  */
+-int inflate_table(type, lens, codes, table, bits, work)
+-codetype type;
+-unsigned short FAR *lens;
+-unsigned codes;
+-code FAR * FAR *table;
+-unsigned FAR *bits;
+-unsigned short FAR *work;
++int inflate_table(codetype type, unsigned short FAR *lens, unsigned codes, code FAR * FAR *table, unsigned FAR *bits, unsigned short FAR *work)
+ {
+     unsigned len;               /* a code's length in bits */
+     unsigned sym;               /* index of code symbols */
+diff --git a/zlib/trees.c b/zlib/trees.c
+index bb09554..8f837c9 100644
+--- a/zlib/trees.c
++++ b/zlib/trees.c
+@@ -379,8 +379,7 @@ void gen_trees_header()
+ /* ===========================================================================
+  * Initialize the tree data structures for a new zlib stream.
+  */
+-void _tr_init(s)
+-    deflate_state *s;
++void _tr_init(deflate_state *s)
+ {
+     tr_static_init();
+ 
+@@ -408,8 +407,7 @@ void _tr_init(s)
+ /* ===========================================================================
+  * Initialize a new block.
+  */
+-local void init_block(s)
+-    deflate_state *s;
++local void init_block(deflate_state *s)
+ {
+     int n; /* iterates over tree elements */
+ 
+@@ -452,10 +450,7 @@ local void init_block(s)
+  * when the heap property is re-established (each father smaller than its
+  * two sons).
+  */
+-local void pqdownheap(s, tree, k)
+-    deflate_state *s;
+-    ct_data *tree;  /* the tree to restore */
+-    int k;               /* node to move down */
++local void pqdownheap(deflate_state *s, ct_data *tree /* the tree to restore */, int k /* node to move down */)
+ {
+     int v = s->heap[k];
+     int j = k << 1;  /* left son of k */
+@@ -487,9 +482,7 @@ local void pqdownheap(s, tree, k)
+  *     The length opt_len is updated; static_len is also updated if stree is
+  *     not null.
+  */
+-local void gen_bitlen(s, desc)
+-    deflate_state *s;
+-    tree_desc *desc;    /* the tree descriptor */
++local void gen_bitlen(deflate_state *s, tree_desc *desc /* the tree descriptor */)
+ {
+     ct_data *tree        = desc->dyn_tree;
+     int max_code         = desc->max_code;
+@@ -574,10 +567,7 @@ local void gen_bitlen(s, desc)
+  * OUT assertion: the field code is set for all tree elements of non
+  *     zero code length.
+  */
+-local void gen_codes (tree, max_code, bl_count)
+-    ct_data *tree;             /* the tree to decorate */
+-    int max_code;              /* largest code with non zero frequency */
+-    ushf *bl_count;            /* number of codes at each bit length */
++local void gen_codes (ct_data *tree /* the tree to decorate */, int max_code/* largest code with non zero frequency */, ushf *bl_count /* number of codes at each bit length */)
+ {
+     ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+     ush code = 0;              /* running code value */
+@@ -616,9 +606,7 @@ local void gen_codes (tree, max_code, bl_count)
+  *     and corresponding code. The length opt_len is updated; static_len is
+  *     also updated if stree is not null. The field max_code is set.
+  */
+-local void build_tree(s, desc)
+-    deflate_state *s;
+-    tree_desc *desc; /* the tree descriptor */
++local void build_tree(deflate_state *s, tree_desc *desc)
+ {
+     ct_data *tree         = desc->dyn_tree;
+     const ct_data *stree  = desc->stat_desc->static_tree;
+@@ -704,10 +692,7 @@ local void build_tree(s, desc)
+  * Scan a literal or distance tree to determine the frequencies of the codes
+  * in the bit length tree.
+  */
+-local void scan_tree (s, tree, max_code)
+-    deflate_state *s;
+-    ct_data *tree;   /* the tree to be scanned */
+-    int max_code;    /* and its largest code of non zero frequency */
++local void scan_tree (deflate_state *s, ct_data *tree /* the tree to be scanned */, int max_code /* and its largest code of non zero frequency */)
+ {
+     int n;                     /* iterates over all tree elements */
+     int prevlen = -1;          /* last emitted length */
+@@ -749,10 +734,7 @@ local void scan_tree (s, tree, max_code)
+  * Send a literal or distance tree in compressed form, using the codes in
+  * bl_tree.
+  */
+-local void send_tree (s, tree, max_code)
+-    deflate_state *s;
+-    ct_data *tree; /* the tree to be scanned */
+-    int max_code;       /* and its largest code of non zero frequency */
++local void send_tree (deflate_state *s, ct_data *tree /* the tree to be scanned */, int max_code /* and its largest code of non zero frequency */)
+ {
+     int n;                     /* iterates over all tree elements */
+     int prevlen = -1;          /* last emitted length */
+@@ -800,8 +782,7 @@ local void send_tree (s, tree, max_code)
+  * Construct the Huffman tree for the bit lengths and return the index in
+  * bl_order of the last bit length code to send.
+  */
+-local int build_bl_tree(s)
+-    deflate_state *s;
++local int build_bl_tree(deflate_state *s)
+ {
+     int max_blindex;  /* index of last bit length code of non zero freq */
+ 
+@@ -835,9 +816,8 @@ local int build_bl_tree(s)
+  * lengths of the bit length codes, the literal tree and the distance tree.
+  * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+  */
+-local void send_all_trees(s, lcodes, dcodes, blcodes)
+-    deflate_state *s;
+-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
++local void send_all_trees(deflate_state *s,
++        int lcodes, int dcodes, int blcodes /* number of codes for each tree */)
+ {
+     int rank;                    /* index in bl_order */
+ 
+@@ -864,11 +844,7 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
+ /* ===========================================================================
+  * Send a stored block
+  */
+-void _tr_stored_block(s, buf, stored_len, eof)
+-    deflate_state *s;
+-    charf *buf;       /* input block */
+-    ulg stored_len;   /* length of input block */
+-    int eof;          /* true if this is the last block for a file */
++void _tr_stored_block(deflate_state *s, charf *buf, ulg stored_len, int eof)
+ {
+     send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
+ #ifdef DEBUG
+@@ -889,8 +865,7 @@ void _tr_stored_block(s, buf, stored_len, eof)
+  * To simplify the code, we assume the worst case of last real code encoded
+  * on one bit only.
+  */
+-void _tr_align(s)
+-    deflate_state *s;
++void _tr_align(deflate_state *s)
+ {
+     send_bits(s, STATIC_TREES<<1, 3);
+     send_code(s, END_BLOCK, static_ltree);
+@@ -918,11 +893,7 @@ void _tr_align(s)
+  * Determine the best encoding for the current block: dynamic trees, static
+  * trees or store, and output the encoded block to the zip file.
+  */
+-void _tr_flush_block(s, buf, stored_len, eof)
+-    deflate_state *s;
+-    charf *buf;       /* input block, or NULL if too old */
+-    ulg stored_len;   /* length of input block */
+-    int eof;          /* true if this is the last block for a file */
++void _tr_flush_block(deflate_state *s, charf *buf, ulg stored_len, int eof)
+ {
+     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+     int max_blindex = 0;  /* index of last bit length code of non zero freq */
+@@ -1018,10 +989,7 @@ void _tr_flush_block(s, buf, stored_len, eof)
+  * Save the match info and tally the frequency counts. Return true if
+  * the current block must be flushed.
+  */
+-int _tr_tally (s, dist, lc)
+-    deflate_state *s;
+-    unsigned dist;  /* distance of matched string */
+-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
++int _tr_tally (deflate_state *s, unsigned dist /* distance of matched string */, unsigned lc /* match length-MIN_MATCH or unmatched char (if dist==0) */)
+ {
+     s->d_buf[s->last_lit] = (ush)dist;
+     s->l_buf[s->last_lit++] = (uch)lc;
+@@ -1068,10 +1036,7 @@ int _tr_tally (s, dist, lc)
+ /* ===========================================================================
+  * Send the block data compressed using the given Huffman trees
+  */
+-local void compress_block(s, ltree, dtree)
+-    deflate_state *s;
+-    ct_data *ltree; /* literal tree */
+-    ct_data *dtree; /* distance tree */
++local void compress_block(deflate_state *s, ct_data *ltree /* literal tree */, ct_data *dtree /* distance tree */)
+ {
+     unsigned dist;      /* distance of matched string */
+     int lc;             /* match length or unmatched char (if dist == 0) */
+@@ -1122,8 +1087,7 @@ local void compress_block(s, ltree, dtree)
+  * IN assertion: the fields freq of dyn_ltree are set and the total of all
+  * frequencies does not exceed 64K (to fit in an int on 16 bit machines).
+  */
+-local void set_data_type(s)
+-    deflate_state *s;
++local void set_data_type(deflate_state *s)
+ {
+     int n = 0;
+     unsigned ascii_freq = 0;
+@@ -1139,9 +1103,7 @@ local void set_data_type(s)
+  * method would use a table)
+  * IN assertion: 1 <= len <= 15
+  */
+-local unsigned bi_reverse(code, len)
+-    unsigned code; /* the value to invert */
+-    int len;       /* its bit length */
++local unsigned bi_reverse(unsigned code /* the value to invert */, int len /* its bit length */)
+ {
+     register unsigned res = 0;
+     do {
+@@ -1154,8 +1116,7 @@ local unsigned bi_reverse(code, len)
+ /* ===========================================================================
+  * Flush the bit buffer, keeping at most 7 bits in it.
+  */
+-local void bi_flush(s)
+-    deflate_state *s;
++local void bi_flush(deflate_state *s)
+ {
+     if (s->bi_valid == 16) {
+         put_short(s, s->bi_buf);
+@@ -1171,8 +1132,7 @@ local void bi_flush(s)
+ /* ===========================================================================
+  * Flush the bit buffer and align the output on a byte boundary
+  */
+-local void bi_windup(s)
+-    deflate_state *s;
++local void bi_windup(deflate_state *s)
+ {
+     if (s->bi_valid > 8) {
+         put_short(s, s->bi_buf);
+@@ -1190,11 +1150,7 @@ local void bi_windup(s)
+  * Copy a stored block, storing first the length and its
+  * one's complement if requested.
+  */
+-local void copy_block(s, buf, len, header)
+-    deflate_state *s;
+-    charf    *buf;    /* the input data */
+-    unsigned len;     /* its length */
+-    int      header;  /* true if block header must be written */
++local void copy_block(deflate_state *s, charf *buf, unsigned len, int header)
+ {
+     bi_windup(s);        /* align on byte boundary */
+     s->last_eob_len = 8; /* enough lookahead for inflate */
+diff --git a/zlib/zutil.c b/zlib/zutil.c
+index 0ef4f99..45334cb 100644
+--- a/zlib/zutil.c
++++ b/zlib/zutil.c
+@@ -123,8 +123,7 @@ uLong ZEXPORT zlibCompileFlags()
+ #  endif
+ int z_verbose = verbose;
+ 
+-void z_error (m)
+-    char *m;
++void z_error (char *m)
+ {
+     fprintf(stderr, "%s\n", m);
+     exit(1);
+@@ -134,8 +133,7 @@ void z_error (m)
+ /* exported to allow conversion of error code to string for compress() and
+  * uncompress()
+  */
+-const char * ZEXPORT zError(err)
+-    int err;
++const char * ZEXPORT zError(int err)
+ {
+     return ERR_MSG(err);
+ }
+@@ -147,10 +145,7 @@ const char * ZEXPORT zError(err)
+ 
+ #ifndef HAVE_MEMCPY
+ 
+-void zmemcpy(dest, source, len)
+-    Bytef* dest;
+-    const Bytef* source;
+-    uInt  len;
++void zmemcpy(Bytef* dest, const Bytef* source, uInt len)
+ {
+     if (len == 0) return;
+     do {
+@@ -158,10 +153,7 @@ void zmemcpy(dest, source, len)
+     } while (--len != 0);
+ }
+ 
+-int zmemcmp(s1, s2, len)
+-    const Bytef* s1;
+-    const Bytef* s2;
+-    uInt  len;
++int zmemcmp(const Bytef* s1, const Bytef* s2, uInt len)
+ {
+     uInt j;
+ 
+@@ -171,9 +163,7 @@ int zmemcmp(s1, s2, len)
+     return 0;
+ }
+ 
+-void zmemzero(dest, len)
+-    Bytef* dest;
+-    uInt  len;
++void zmemzero(Bytef* dest, uInt len)
+ {
+     if (len == 0) return;
+     do {
+@@ -298,19 +288,14 @@ extern voidp  calloc OF((uInt items, uInt size));
+ extern void   free   OF((voidpf ptr));
+ #endif
+ 
+-voidpf zcalloc (opaque, items, size)
+-    voidpf opaque;
+-    unsigned items;
+-    unsigned size;
++voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+ {
+     if (opaque) items += size - size; /* make compiler happy */
+     return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+                               (voidpf)calloc(items, size);
+ }
+ 
+-void  zcfree (opaque, ptr)
+-    voidpf opaque;
+-    voidpf ptr;
++void  zcfree (voidpf opaque, voidpf ptr)
+ {
+     free(ptr);
+     if (opaque) return; /* make compiler happy */
diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix
index 934b54c8e36a..d7f0fa2a63f8 100644
--- a/pkgs/by-name/zs/zsync/package.nix
+++ b/pkgs/by-name/zs/zsync/package.nix
@@ -18,7 +18,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/c";
 
-  patches = [ ./remove-inexisting-rsumtest.patch ];
+  patches = [
+    ./remove-inexisting-rsumtest.patch
+    ./c23.patch
+  ];
 
   makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
 
diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix
index e3060670c43c..08174c0cb392 100644
--- a/pkgs/by-name/zu/zuban/package.nix
+++ b/pkgs/by-name/zu/zuban/package.nix
@@ -9,13 +9,13 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zuban";
 
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "zubanls";
     repo = "zuban";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PuD9go5aQJh3qOjWxRX1+43SfHfRcYEulvJ2Mc1lfus=";
+    hash = "sha256-s2u4or9qittXMt9layFEVrtYLhNgghZQd7VdupUpxqU=";
     fetchSubmodules = true;
   };
 
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildAndTestSubdir = "crates/zuban";
 
-  cargoHash = "sha256-96hcuvsrtFrQgP2CDLEdssvxXFg9Iy00v1DiJJxkdOU=";
+  cargoHash = "sha256-0CynAjkY1Q6IZ8yyZWL8p/MySriahql2fc3qqsNvPeI=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/zv/zvbi/package.nix b/pkgs/by-name/zv/zvbi/package.nix
index 8307fdba361d..50c58744efab 100644
--- a/pkgs/by-name/zv/zvbi/package.nix
+++ b/pkgs/by-name/zv/zvbi/package.nix
@@ -66,15 +66,20 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/zapping-vbi/zvbi";
     changelog = "https://github.com/zapping-vbi/zvbi/blob/${finalAttrs.src.rev}/ChangeLog";
     pkgConfigModules = [ "zvbi-0.2" ];
-    license = with lib.licenses; [
-      bsd2
-      bsd3
-      gpl2
-      gpl2Plus
-      lgpl21Plus
-      lgpl2Plus
-      mit
-    ];
+    license =
+      with lib.licenses;
+      AND [
+        bsd2
+        (OR [
+          bsd3
+          gpl2Plus
+        ])
+        gpl2Only
+        gpl2Plus
+        lgpl21Plus
+        lgpl2Plus
+        mit
+      ];
     maintainers = with lib.maintainers; [ jopejoe1 ];
   };
 })
diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index b3ee628cc86a..560fdd9569ed 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.16.0";
+  version = "11.16.1";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-6pPC500ZQmtCC3ATiWD79DTh5cagdqLoDwTHivHgfWg=";
+    hash = "sha256-GgKQN55WZxdOJxL11KxObzln+Z2KhYoueAld+nz7dl4=";
   };
-  npmDepsHash = "sha256-Qeh5sk2aLWrsmMShE26jz7nzWg6YWcPeUNhTg3u411I=";
+  npmDepsHash = "sha256-Cp3EYWiyPx5ATD2LyKPSXw4PZ+oqfKHycc9zhn89r5w=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 
diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix
index f8def2919da2..7ae29579bdb8 100644
--- a/pkgs/data/fonts/openmoji/default.nix
+++ b/pkgs/data/fonts/openmoji/default.nix
@@ -42,13 +42,13 @@ assert lib.asserts.assertOneOf "buildMaximumColorFonts" buildMaximumColorFonts [
 
 stdenvNoCC.mkDerivation rec {
   pname = "openmoji";
-  version = "16.0.0";
+  version = "17.0.0";
 
   src = fetchFromGitHub {
     owner = "hfg-gmuend";
     repo = "openmoji";
     rev = version;
-    hash = "sha256-4dYtLaABu88z25Ud/cuOECajxSJWR01qcTIZNWN7Fhw=";
+    hash = "sha256-mE34l94C/jc7Fd4v7opMeneFZAou5w9KhjLSVxw0s/0=";
   };
 
   patches = [
diff --git a/pkgs/data/json-schema/lib.nix b/pkgs/data/json-schema/lib.nix
index 7202de3ba70a..599c58c40fce 100644
--- a/pkgs/data/json-schema/lib.nix
+++ b/pkgs/data/json-schema/lib.nix
@@ -85,7 +85,6 @@ let
             }) group;
           }) groups;
         };
-        passAsFile = [ "catalogJson" ];
         passthru = {
           inherit groups;
         };
@@ -93,6 +92,7 @@ let
           jq
           json-schema-catalog-rs
         ];
+        __structuredAttrs = true;
       }
       // lib.optionalAttrs (version != null) {
         inherit version;
@@ -105,7 +105,7 @@ let
         mkdir -p "$out_dir"
 
         # Write the catalog JSON. `jq` formats it nicely.
-        jq . <"$catalogJsonPath" >"$out_file"
+        printf "%s" "$catalogJson" | jq . >"$out_file"
 
         json-schema-catalog check "$out_file"
       '';
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 556516f937a9..0606e5f812e1 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "2128173b41632a6cc5b2342152a28985650cc4ce",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2128173b41632a6cc5b2342152a28985650cc4ce.tar.gz",
-  "sha256": "19amns4ybljw2xf240anldqxaabymxad4izjclh5kxd13llk0jdb",
-  "msg": "Update from Hackage at 2026-01-30T20:25:58Z"
+  "commit": "18df06fa5c94e82240afb89aafe72572abf4b4ef",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/18df06fa5c94e82240afb89aafe72572abf4b4ef.tar.gz",
+  "sha256": "1iikxr7z5qswp65kw08zwilj0n7gwr875f455mnd7ppm96cfgiid",
+  "msg": "Update from Hackage at 2026-03-15T11:30:53Z"
 }
diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix
index 177616509659..2c9794730f99 100644
--- a/pkgs/desktops/enlightenment/evisum/default.nix
+++ b/pkgs/desktops/enlightenment/evisum/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evisum";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchurl {
     url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "3Icc41A+JyFZB0RS7F6kzTdJsEnZ4IDc+Ck40myGP20=";
+    sha256 = "McL4th987bozpaT3ESNCGBxSN+Fw5sW+MOFAiXYm1MI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/expidus/calculator/default.nix b/pkgs/desktops/expidus/calculator/default.nix
new file mode 100644
index 000000000000..f005dcf52969
--- /dev/null
+++ b/pkgs/desktops/expidus/calculator/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  flutter,
+  fetchFromGitHub,
+}:
+flutter.buildFlutterApplication rec {
+  pname = "expidus-calculator";
+  version = "0.1.1-alpha";
+
+  src = fetchFromGitHub {
+    owner = "ExpidusOS";
+    repo = "calculator";
+    rev = version;
+    hash = "sha256-O3LHp10Fo3PW3zoN7mFSQEKh+AAaR+IqkRtc6nQrIZE=";
+  };
+
+  flutterBuildFlags = [
+    "--dart-define=COMMIT_HASH=a5d8f54404b9994f83beb367a1cd11e04a6420cb"
+  ];
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  gitHashes = {
+    libtokyo = "sha256-T0+vyfSfijLv7MvM+zt3bkVpb3aVrlDnse2xyNMp9GU=";
+    libtokyo_flutter = "sha256-T0+vyfSfijLv7MvM+zt3bkVpb3aVrlDnse2xyNMp9GU=";
+  };
+
+  postInstall = ''
+    rm $out/bin/calculator
+    ln -s $out/app/$pname/calculator $out/bin/expidus-calculator
+
+    mkdir -p $out/share/applications
+    mv $out/app/$pname/data/com.expidusos.calculator.desktop $out/share/applications
+
+    mkdir -p $out/share/icons
+    mv $out/app/$pname/data/com.expidusos.calculator.png $out/share/icons
+
+    mkdir -p $out/share/metainfo
+    mv $out/app/$pname/data/com.expidusos.calculator.metainfo.xml $out/share/metainfo
+
+    substituteInPlace "$out/share/applications/com.expidusos.calculator.desktop" \
+      --replace "Exec=calculator" "Exec=$out/bin/expidus-calculator" \
+      --replace "Icon=com.expidusos.calculator" "Icon=$out/share/icons/com.expidusos.calculator.png"
+  '';
+
+  meta = {
+    broken = true;
+    description = "ExpidusOS Calculator";
+    homepage = "https://expidusos.com";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    mainProgram = "expidus-calculator";
+  };
+}
diff --git a/pkgs/desktops/expidus/calculator/pubspec.lock.json b/pkgs/desktops/expidus/calculator/pubspec.lock.json
new file mode 100644
index 000000000000..a2e6f2e46776
--- /dev/null
+++ b/pkgs/desktops/expidus/calculator/pubspec.lock.json
@@ -0,0 +1,790 @@
+{
+  "packages": {
+    "args": {
+      "dependency": "transitive",
+      "description": {
+        "name": "args",
+        "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.2"
+    },
+    "async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "async",
+        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.11.0"
+    },
+    "bitsdojo_window": {
+      "dependency": "direct main",
+      "description": {
+        "name": "bitsdojo_window",
+        "sha256": "1118bc1cd16e6f358431ca4473af57cc1b287d2ceab46dfab6d59a9463160622",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.5"
+    },
+    "bitsdojo_window_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "bitsdojo_window_linux",
+        "sha256": "d3804a30315fcbb43b28acc86d1180ce0be22c0c738ad2da9e5ade4d8dbd9655",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.3"
+    },
+    "bitsdojo_window_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "bitsdojo_window_macos",
+        "sha256": "d2a9886c74516c5b84c1dd65ab8ee5d1c52055b265ebf0e7d664dee28366b521",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.3"
+    },
+    "bitsdojo_window_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "bitsdojo_window_platform_interface",
+        "sha256": "65daa015a0c6dba749bdd35a0f092e7a8ba8b0766aa0480eb3ef808086f6e27c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2"
+    },
+    "bitsdojo_window_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "bitsdojo_window_windows",
+        "sha256": "8766a40aac84a6d7bdcaa716b24997e028fc9a9a1800495fc031721fd5a22ed0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.5"
+    },
+    "boolean_selector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "boolean_selector",
+        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "characters": {
+      "dependency": "transitive",
+      "description": {
+        "name": "characters",
+        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "clock": {
+      "dependency": "transitive",
+      "description": {
+        "name": "clock",
+        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "collection",
+        "sha256": "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.17.1"
+    },
+    "crypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "crypto",
+        "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.3"
+    },
+    "fake_async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fake_async",
+        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.1"
+    },
+    "ffi": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ffi",
+        "sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file",
+        "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.4"
+    },
+    "filesize": {
+      "dependency": "transitive",
+      "description": {
+        "name": "filesize",
+        "sha256": "f53df1f27ff60e466eefcd9df239e02d4722d5e2debee92a87dfd99ac66de2af",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
+    "flutter": {
+      "dependency": "direct main",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_adaptive_scaffold": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_adaptive_scaffold",
+        "sha256": "3e78be8b9c95b1c9832b2f8ec4a845adac205c4bb5e7bd3fb204b07990229167",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.7+1"
+    },
+    "flutter_lints": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_lints",
+        "sha256": "a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.3"
+    },
+    "flutter_localizations": {
+      "dependency": "direct main",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_markdown": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_markdown",
+        "sha256": "d4a1cb250c4e059586af0235f32e02882860a508e189b61f2b31b8810c1e1330",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.17+2"
+    },
+    "flutter_test": {
+      "dependency": "direct dev",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_web_plugins": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "http": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http",
+        "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.13.6"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.2"
+    },
+    "intl": {
+      "dependency": "transitive",
+      "description": {
+        "name": "intl",
+        "sha256": "a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.18.0"
+    },
+    "js": {
+      "dependency": "transitive",
+      "description": {
+        "name": "js",
+        "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.7"
+    },
+    "libtokyo": {
+      "dependency": "direct main",
+      "description": {
+        "path": "packages/libtokyo",
+        "ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
+        "resolved-ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
+        "url": "https://github.com/ExpidusOS/libtokyo.git"
+      },
+      "source": "git",
+      "version": "0.1.0"
+    },
+    "libtokyo_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "path": "packages/libtokyo_flutter",
+        "ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
+        "resolved-ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
+        "url": "https://github.com/ExpidusOS/libtokyo.git"
+      },
+      "source": "git",
+      "version": "0.1.0"
+    },
+    "lints": {
+      "dependency": "transitive",
+      "description": {
+        "name": "lints",
+        "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "markdown": {
+      "dependency": "direct main",
+      "description": {
+        "name": "markdown",
+        "sha256": "acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.1.1"
+    },
+    "matcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "matcher",
+        "sha256": "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.12.15"
+    },
+    "material_color_utilities": {
+      "dependency": "transitive",
+      "description": {
+        "name": "material_color_utilities",
+        "sha256": "d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "material_theme_builder": {
+      "dependency": "transitive",
+      "description": {
+        "name": "material_theme_builder",
+        "sha256": "380ab70835e01f4ee0c37904eebae9e36ed37b5cf8ed40d67412ea3244a2afd6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.4"
+    },
+    "math_expressions": {
+      "dependency": "direct main",
+      "description": {
+        "name": "math_expressions",
+        "sha256": "3576593617c3870d75728a751f6ec6e606706d44e363f088ac394b5a28a98064",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.0"
+    },
+    "meta": {
+      "dependency": "transitive",
+      "description": {
+        "name": "meta",
+        "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.1"
+    },
+    "nested": {
+      "dependency": "transitive",
+      "description": {
+        "name": "nested",
+        "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "package_info_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "package_info_plus",
+        "sha256": "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "package_info_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_info_plus_platform_interface",
+        "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
+    "path": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path",
+        "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.8.3"
+    },
+    "path_provider_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_linux",
+        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.1"
+    },
+    "path_provider_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_platform_interface",
+        "sha256": "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "path_provider_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_windows",
+        "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.1"
+    },
+    "platform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "platform",
+        "sha256": "ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "plugin_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "plugin_platform_interface",
+        "sha256": "da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.6"
+    },
+    "provider": {
+      "dependency": "direct main",
+      "description": {
+        "name": "provider",
+        "sha256": "cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.5"
+    },
+    "pub_semver": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "pubspec": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pubspec",
+        "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "quiver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "quiver",
+        "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.1"
+    },
+    "sentry": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sentry",
+        "sha256": "39c23342fc96105da449914f7774139a17a0ca8a4e70d9ad5200171f7e47d6ba",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.9.0"
+    },
+    "sentry_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "sentry_flutter",
+        "sha256": "ff68ab31918690da004a42e20204242a3ad9ad57da7e2712da8487060ac9767f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.9.0"
+    },
+    "shared_preferences": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shared_preferences",
+        "sha256": "b7f41bad7e521d205998772545de63ff4e6c97714775902c199353f8bf1511ac",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.1"
+    },
+    "shared_preferences_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_android",
+        "sha256": "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.1"
+    },
+    "shared_preferences_foundation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_foundation",
+        "sha256": "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.4"
+    },
+    "shared_preferences_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_linux",
+        "sha256": "c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.1"
+    },
+    "shared_preferences_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_platform_interface",
+        "sha256": "d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.1"
+    },
+    "shared_preferences_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_web",
+        "sha256": "d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.1"
+    },
+    "shared_preferences_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_windows",
+        "sha256": "f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.1"
+    },
+    "sky_engine": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.99"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.1"
+    },
+    "stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.11.0"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.0"
+    },
+    "term_glyph": {
+      "dependency": "transitive",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "test_api": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_api",
+        "sha256": "eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.1"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.2"
+    },
+    "uri": {
+      "dependency": "transitive",
+      "description": {
+        "name": "uri",
+        "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "url_launcher": {
+      "dependency": "direct main",
+      "description": {
+        "name": "url_launcher",
+        "sha256": "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.14"
+    },
+    "url_launcher_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_android",
+        "sha256": "b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.0"
+    },
+    "url_launcher_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_ios",
+        "sha256": "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.5"
+    },
+    "url_launcher_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_linux",
+        "sha256": "b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.6"
+    },
+    "url_launcher_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_macos",
+        "sha256": "b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.7"
+    },
+    "url_launcher_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_platform_interface",
+        "sha256": "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.5"
+    },
+    "url_launcher_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_web",
+        "sha256": "ba140138558fcc3eead51a1c42e92a9fb074a1b1149ed3c73e66035b2ccd94f2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.19"
+    },
+    "url_launcher_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_windows",
+        "sha256": "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.8"
+    },
+    "uuid": {
+      "dependency": "transitive",
+      "description": {
+        "name": "uuid",
+        "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.7"
+    },
+    "vector_math": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vector_math",
+        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "win32": {
+      "dependency": "transitive",
+      "description": {
+        "name": "win32",
+        "sha256": "a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.4"
+    },
+    "xdg_directories": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xdg_directories",
+        "sha256": "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.3"
+    },
+    "yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml",
+        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    }
+  },
+  "sdks": {
+    "dart": ">=3.0.5 <4.0.0",
+    "flutter": ">=3.10.0"
+  }
+}
diff --git a/pkgs/desktops/expidus/default.nix b/pkgs/desktops/expidus/default.nix
new file mode 100644
index 000000000000..3506e1e51699
--- /dev/null
+++ b/pkgs/desktops/expidus/default.nix
@@ -0,0 +1,10 @@
+{ callPackage, flutterPackages }:
+{
+  calculator = callPackage ./calculator {
+    flutter = flutterPackages.v3_35;
+  };
+
+  file-manager = callPackage ./file-manager {
+    flutter = flutterPackages.v3_35;
+  };
+}
diff --git a/pkgs/desktops/expidus/file-manager/default.nix b/pkgs/desktops/expidus/file-manager/default.nix
new file mode 100644
index 000000000000..ffd2c4dd838f
--- /dev/null
+++ b/pkgs/desktops/expidus/file-manager/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  flutter,
+  fetchFromGitHub,
+}:
+flutter.buildFlutterApplication rec {
+  pname = "expidus-file-manager";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "ExpidusOS";
+    repo = "file-manager";
+    rev = version;
+    hash = "sha256-R6eszy4Dz8tAPRTwZzRiZWIgVMiGv5zlhFB/HcD6gqg=";
+  };
+
+  flutterBuildFlags = [
+    "--dart-define=COMMIT_HASH=b4181b9cff18a07e958c81d8f41840d2d36a6705"
+  ];
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  gitHashes = {
+    libtokyo = "sha256-T0+vyfSfijLv7MvM+zt3bkVpb3aVrlDnse2xyNMp9GU=";
+    libtokyo_flutter = "sha256-T0+vyfSfijLv7MvM+zt3bkVpb3aVrlDnse2xyNMp9GU=";
+  };
+
+  postInstall = ''
+    rm $out/bin/file_manager
+    ln -s $out/app/$pname/file_manager $out/bin/expidus-file-manager
+
+    mkdir -p $out/share/applications
+    mv $out/app/$pname/data/com.expidusos.file_manager.desktop $out/share/applications
+
+    mkdir -p $out/share/icons
+    mv $out/app/$pname/data/com.expidusos.file_manager.png $out/share/icons
+
+    mkdir -p $out/share/metainfo
+    mv $out/app/$pname/data/com.expidusos.file_manager.metainfo.xml $out/share/metainfo
+
+    substituteInPlace "$out/share/applications/com.expidusos.file_manager.desktop" \
+      --replace "Exec=file_manager" "Exec=$out/bin/expidus-file-manager" \
+      --replace "Icon=com.expidusos.file_manager" "Icon=$out/share/icons/com.expidusos.file_manager.png"
+  '';
+
+  meta = {
+    broken = true;
+    description = "ExpidusOS File Manager";
+    homepage = "https://expidusos.com";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    mainProgram = "expidus-file-manager";
+  };
+}
diff --git a/pkgs/desktops/expidus/file-manager/pubspec.lock.json b/pkgs/desktops/expidus/file-manager/pubspec.lock.json
new file mode 100644
index 000000000000..048127e70dab
--- /dev/null
+++ b/pkgs/desktops/expidus/file-manager/pubspec.lock.json
@@ -0,0 +1,910 @@
+{
+  "packages": {
+    "args": {
+      "dependency": "transitive",
+      "description": {
+        "name": "args",
+        "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.2"
+    },
+    "async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "async",
+        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.11.0"
+    },
+    "bitsdojo_window": {
+      "dependency": "direct main",
+      "description": {
+        "name": "bitsdojo_window",
+        "sha256": "1118bc1cd16e6f358431ca4473af57cc1b287d2ceab46dfab6d59a9463160622",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.5"
+    },
+    "bitsdojo_window_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "bitsdojo_window_linux",
+        "sha256": "d3804a30315fcbb43b28acc86d1180ce0be22c0c738ad2da9e5ade4d8dbd9655",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.3"
+    },
+    "bitsdojo_window_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "bitsdojo_window_macos",
+        "sha256": "d2a9886c74516c5b84c1dd65ab8ee5d1c52055b265ebf0e7d664dee28366b521",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.3"
+    },
+    "bitsdojo_window_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "bitsdojo_window_platform_interface",
+        "sha256": "65daa015a0c6dba749bdd35a0f092e7a8ba8b0766aa0480eb3ef808086f6e27c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2"
+    },
+    "bitsdojo_window_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "bitsdojo_window_windows",
+        "sha256": "8766a40aac84a6d7bdcaa716b24997e028fc9a9a1800495fc031721fd5a22ed0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.5"
+    },
+    "boolean_selector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "boolean_selector",
+        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "characters": {
+      "dependency": "transitive",
+      "description": {
+        "name": "characters",
+        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "clock": {
+      "dependency": "transitive",
+      "description": {
+        "name": "clock",
+        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "collection": {
+      "dependency": "direct main",
+      "description": {
+        "name": "collection",
+        "sha256": "f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.17.2"
+    },
+    "crypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "crypto",
+        "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.3"
+    },
+    "dbus": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dbus",
+        "sha256": "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.8"
+    },
+    "fake_async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fake_async",
+        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.1"
+    },
+    "ffi": {
+      "dependency": "direct main",
+      "description": {
+        "name": "ffi",
+        "sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file",
+        "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.4"
+    },
+    "filesize": {
+      "dependency": "direct main",
+      "description": {
+        "name": "filesize",
+        "sha256": "f53df1f27ff60e466eefcd9df239e02d4722d5e2debee92a87dfd99ac66de2af",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
+    "flutter": {
+      "dependency": "direct main",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_adaptive_scaffold": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_adaptive_scaffold",
+        "sha256": "4f448902314bc9b6cf820c85d5bad4de6489c0eff75dcedf5098f3a53ec981ee",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.6"
+    },
+    "flutter_lints": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_lints",
+        "sha256": "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
+    "flutter_localizations": {
+      "dependency": "direct main",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_markdown": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_markdown",
+        "sha256": "2b206d397dd7836ea60035b2d43825c8a303a76a5098e66f42d55a753e18d431",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.17+1"
+    },
+    "flutter_test": {
+      "dependency": "direct dev",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_web_plugins": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "http": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http",
+        "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.13.6"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.2"
+    },
+    "intl": {
+      "dependency": "direct main",
+      "description": {
+        "name": "intl",
+        "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.18.1"
+    },
+    "libtokyo": {
+      "dependency": "direct main",
+      "description": {
+        "path": "packages/libtokyo",
+        "ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
+        "resolved-ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
+        "url": "https://github.com/ExpidusOS/libtokyo.git"
+      },
+      "source": "git",
+      "version": "0.1.0"
+    },
+    "libtokyo_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "path": "packages/libtokyo_flutter",
+        "ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
+        "resolved-ref": "f48d528ebfc22fe827fe9f2d1965be1d339ccfb7",
+        "url": "https://github.com/ExpidusOS/libtokyo.git"
+      },
+      "source": "git",
+      "version": "0.1.0"
+    },
+    "lints": {
+      "dependency": "transitive",
+      "description": {
+        "name": "lints",
+        "sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "markdown": {
+      "dependency": "transitive",
+      "description": {
+        "name": "markdown",
+        "sha256": "acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.1.1"
+    },
+    "matcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "matcher",
+        "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.12.16"
+    },
+    "material_color_utilities": {
+      "dependency": "transitive",
+      "description": {
+        "name": "material_color_utilities",
+        "sha256": "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.0"
+    },
+    "material_theme_builder": {
+      "dependency": "transitive",
+      "description": {
+        "name": "material_theme_builder",
+        "sha256": "380ab70835e01f4ee0c37904eebae9e36ed37b5cf8ed40d67412ea3244a2afd6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.4"
+    },
+    "meta": {
+      "dependency": "transitive",
+      "description": {
+        "name": "meta",
+        "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.9.1"
+    },
+    "nested": {
+      "dependency": "transitive",
+      "description": {
+        "name": "nested",
+        "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "open_file_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "open_file_plus",
+        "sha256": "f087e32722ffe4bac71925e7a1a9848a1008fd789e47c6628da3ed7845922227",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.4.1"
+    },
+    "package_info_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "package_info_plus",
+        "sha256": "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "package_info_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_info_plus_platform_interface",
+        "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
+    "path": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path",
+        "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.8.3"
+    },
+    "path_provider": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path_provider",
+        "sha256": "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "path_provider_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_android",
+        "sha256": "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "path_provider_foundation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_foundation",
+        "sha256": "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "path_provider_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_linux",
+        "sha256": "ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "path_provider_platform_interface": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path_provider_platform_interface",
+        "sha256": "bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "path_provider_windows": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path_provider_windows",
+        "sha256": "ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "permission_handler": {
+      "dependency": "direct main",
+      "description": {
+        "name": "permission_handler",
+        "sha256": "63e5216aae014a72fe9579ccd027323395ce7a98271d9defa9d57320d001af81",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.4.3"
+    },
+    "permission_handler_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "permission_handler_android",
+        "sha256": "2ffaf52a21f64ac9b35fe7369bb9533edbd4f698e5604db8645b1064ff4cf221",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.3.3"
+    },
+    "permission_handler_apple": {
+      "dependency": "transitive",
+      "description": {
+        "name": "permission_handler_apple",
+        "sha256": "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "9.1.4"
+    },
+    "permission_handler_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "permission_handler_platform_interface",
+        "sha256": "7c6b1500385dd1d2ca61bb89e2488ca178e274a69144d26bbd65e33eae7c02a9",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.11.3"
+    },
+    "permission_handler_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "permission_handler_windows",
+        "sha256": "cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.3"
+    },
+    "petitparser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "petitparser",
+        "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.4.0"
+    },
+    "platform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "platform",
+        "sha256": "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.0"
+    },
+    "plugin_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "plugin_platform_interface",
+        "sha256": "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.5"
+    },
+    "provider": {
+      "dependency": "direct main",
+      "description": {
+        "name": "provider",
+        "sha256": "cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.5"
+    },
+    "pub_semver": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "pubspec": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pubspec",
+        "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "quiver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "quiver",
+        "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.2.1"
+    },
+    "sentry": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sentry",
+        "sha256": "39c23342fc96105da449914f7774139a17a0ca8a4e70d9ad5200171f7e47d6ba",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.9.0"
+    },
+    "sentry_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "sentry_flutter",
+        "sha256": "ff68ab31918690da004a42e20204242a3ad9ad57da7e2712da8487060ac9767f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.9.0"
+    },
+    "shared_preferences": {
+      "dependency": "direct main",
+      "description": {
+        "name": "shared_preferences",
+        "sha256": "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "shared_preferences_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_android",
+        "sha256": "fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "shared_preferences_foundation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_foundation",
+        "sha256": "f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "shared_preferences_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_linux",
+        "sha256": "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "shared_preferences_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_platform_interface",
+        "sha256": "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "shared_preferences_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_web",
+        "sha256": "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
+    "shared_preferences_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shared_preferences_windows",
+        "sha256": "f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "sky_engine": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.99"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.10.0"
+    },
+    "stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.11.0"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.0"
+    },
+    "term_glyph": {
+      "dependency": "transitive",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "test_api": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_api",
+        "sha256": "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.3.2"
+    },
+    "udisks": {
+      "dependency": "direct main",
+      "description": {
+        "name": "udisks",
+        "sha256": "847144fb868b9e3602895e89f438f77c2a4fda9e4b02f7d368dc1d2c6a40b475",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.4.0"
+    },
+    "uri": {
+      "dependency": "transitive",
+      "description": {
+        "name": "uri",
+        "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "url_launcher": {
+      "dependency": "direct main",
+      "description": {
+        "name": "url_launcher",
+        "sha256": "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.12"
+    },
+    "url_launcher_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_android",
+        "sha256": "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.38"
+    },
+    "url_launcher_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_ios",
+        "sha256": "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.4"
+    },
+    "url_launcher_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_linux",
+        "sha256": "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.5"
+    },
+    "url_launcher_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_macos",
+        "sha256": "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.6"
+    },
+    "url_launcher_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_platform_interface",
+        "sha256": "bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
+    "url_launcher_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_web",
+        "sha256": "cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.18"
+    },
+    "url_launcher_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_windows",
+        "sha256": "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.7"
+    },
+    "uuid": {
+      "dependency": "transitive",
+      "description": {
+        "name": "uuid",
+        "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.7"
+    },
+    "vector_math": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vector_math",
+        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web",
+        "sha256": "dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.4-beta"
+    },
+    "win32": {
+      "dependency": "direct main",
+      "description": {
+        "name": "win32",
+        "sha256": "a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.4"
+    },
+    "xdg_directories": {
+      "dependency": "direct main",
+      "description": {
+        "name": "xdg_directories",
+        "sha256": "f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.2"
+    },
+    "xml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xml",
+        "sha256": "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.3.0"
+    },
+    "yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml",
+        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    }
+  },
+  "sdks": {
+    "dart": ">=3.1.0-185.0.dev <4.0.0",
+    "flutter": ">=3.10.0"
+  }
+}
diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
index 994a1702b95d..98a44515affe 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix
@@ -116,8 +116,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Media Player application for Ubuntu Touch devices";
-    homepage = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app";
-    changelog = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app/-/blob/${
+    homepage = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/blob/${
       if (!isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
     }/ChangeLog";
     license = with lib.licenses; [
diff --git a/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch b/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch
index 468612cb5c3a..f9ad57184238 100644
--- a/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch
+++ b/pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch
@@ -1,4 +1,4 @@
-From f9dfacc4b92faa7b60ae37489aa58520b4da95d7 Mon Sep 17 00:00:00 2001
+From cb4a928db740de48d84d47c21705786bb141af02 Mon Sep 17 00:00:00 2001
 From: OPNA2608 <opna2608@protonmail.com>
 Date: Sun, 5 Oct 2025 14:34:43 +0200
 Subject: [PATCH] app/CMakeLists.txt: Drop explicit dependency on rlottie
@@ -11,7 +11,7 @@ Subject: [PATCH] app/CMakeLists.txt: Drop explicit dependency on rlottie
  1 file changed, 1 deletion(-)
 
 diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
-index c1f0b85..7a59db5 100644
+index c1f0b852..7a59db59 100644
 --- a/app/CMakeLists.txt
 +++ b/app/CMakeLists.txt
 @@ -1,7 +1,6 @@
@@ -23,5 +23,5 @@ index c1f0b85..7a59db5 100644
  
  #"qtdclient.cpp" "qtdthread.cpp" "qml.qrc"
 -- 
-2.51.0
+2.51.2
 
diff --git a/pkgs/desktops/lomiri/applications/teleports/default.nix b/pkgs/desktops/lomiri/applications/teleports/default.nix
index 320f24c2e921..84effc86b26b 100644
--- a/pkgs/desktops/lomiri/applications/teleports/default.nix
+++ b/pkgs/desktops/lomiri/applications/teleports/default.nix
@@ -49,13 +49,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "teleports";
-  version = "1.21";
+  version = "1.22";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/teleports";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-V9yOQbVXtZGxdiieggPwHd17ilRZ0xMEI2yphgjx188=";
+    hash = "sha256-y0oXlhu2cvOGYZCEHfL6DcyStCQcIz7JtIpR4Tygm/4=";
   };
 
   patches = [
@@ -66,19 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-zxxFvoj6jluGPCA9GQsxuYYweaSOVrkD01hZwCtq52U=";
     })
 
-    # Fix CMake 4 compatibility
-    # Remove when version > 1.21
-    (fetchpatch {
-      name = "0002-teleports-CMakeLists.txt-Support-building-with-CMake-4.patch";
-      url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/ffb4e745889a473a208a86a29b7e439129930b01.patch";
-      hash = "sha256-EdcCHH/0Zq8wcF6UPyvy16wntDeSqTV9LWQat91LNRo=";
-    })
-    (fetchpatch {
-      name = "0003-teleports-libs-qtdlib-CMakeLists.txt-Support-building-with-CMake-4.patch";
-      url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/fe7f0cb304ddaefae9f97917d3edc89de5f21b1f.patch";
-      hash = "sha256-yIc/l6iHb5qWI0QZOx8Hhd0lgEYyPozL+AjrmF2L89k=";
-    })
-
     # Remove when https://gitlab.com/ubports/development/apps/teleports/-/merge_requests/586 merged & in release
     ./1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch
   ];
diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix
index 3fa57e8c820c..a63f84b68b5d 100644
--- a/pkgs/desktops/lomiri/development/lomiri-api/default.nix
+++ b/pkgs/desktops/lomiri/development/lomiri-api/default.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-api";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-api";
     tag = finalAttrs.version;
-    hash = "sha256-n9TlmmRRB618cXCOmo5CYqeMog7I7VxURN9mlDhljWw=";
+    hash = "sha256-2CVSKPZXZ74KUU5xVYSVIZLSPSyIudUcKR0CSfSpJyw=";
   };
 
   outputs = [
diff --git a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix
index 387f2e456b0c..8304dec0d522 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   cmake,
   dbus,
@@ -15,24 +14,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-notifications";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-notifications";
     tag = finalAttrs.version;
-    hash = "sha256-d3fJiYGAYF5e6XPuZ26Lrjj8tUiquunMLDLs9PdAYcA=";
+    hash = "sha256-rGs+MTt/Z+Gk3jSxU7tfNAUdypG/HJ4pDqvC+U722Eg=";
   };
 
-  patches = [
-    # Remove when version > 1.3.1
-    (fetchpatch {
-      name = "0001-lomiri-notifications-Properly-include-lomiri-shell-api-includedirs.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-notifications/-/commit/b68e51db6df1ed2637692dbff704374ab4c53fa7.patch";
-      hash = "sha256-GWGlKQgOEy7HgzgA6H2Dmp0tB5amVcb3lj4LDT9dJCE=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
diff --git a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix
index 25e59f222ec9..95f926bae663 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     # Queries QMake for QML install location, returns QtBase build path
     substituteInPlace src/*/PushNotifications/CMakeLists.txt \
-      --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}' \
+      --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}'
   '';
 
   strictDeps = true;
diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
index c4270d2fd800..80ba9a075320 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-ui-extras";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-ui-extras";
     tag = finalAttrs.version;
-    hash = "sha256-wNYAcWcihMFXWuVfrSzxDVE15MR2+cgnss018FextpU=";
+    hash = "sha256-0rP88+OVLzK3ZDXZHqYR+0uF4eNur/RUV8DY0ijZBVo=";
   };
 
   postPatch = ''
diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
index 59375bf5a143..8af344b2f534 100644
--- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
+++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   replaceVars,
   testers,
@@ -74,13 +75,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-ui-toolkit";
-  version = "1.3.5904";
+  version = "1.3.5905";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-ui-toolkit";
     rev = finalAttrs.version;
-    hash = "sha256-lrytLk7+RpD3V4g9m7JruqOfLggJO9sGLzt5UrGbs/Q=";
+    hash = "sha256-59Q7Atxt6CfR0LgNa6keGDY+HpV/eOdTngVHcUJEesg=";
   };
 
   outputs = [
@@ -92,6 +93,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
+    # Remove when version > 1.3.5905
+    (fetchpatch {
+      name = "0001-lomiri-ui-toolkit-Fix-compatibility-with-Qt-6.11.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/commit/57303d2b01549ef78b029ed05babbc9400e102f3.patch";
+      hash = "sha256-22QSOaYZ+hsctLt8+ffrzBIY3btp+rM6NBsu0gvQMeM=";
+    })
+
     ./2001-Mark-problematic-tests.patch
 
     (replaceVars ./2002-Nixpkgs-versioned-QML-path.patch.in {
@@ -101,51 +109,70 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs documentation/docs.sh tests/
-
-    # Reverse dependencies (and their reverse dependencies too) access the function patched here to register their gettext catalogues,
-    # so hardcoding any prefix here will make only catalogues in that prefix work. APP_DIR envvar will override this, but with domains from multiple derivations being
-    # used in a single application (lomiri-system-settings), that's of not much use either.
-    # https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/dcb3a523c56a400e5c3c163c2836cafca168767e/src/LomiriToolkit/i18n.cpp#L101-129
-    #
-    # This could be solved with a reference to the prefix of whoever requests the domain, but the call happens via some automatic Qt / QML callback magic,
-    # I'm not sure what the best way of injecting that there would be.
-    # https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/dcb3a523c56a400e5c3c163c2836cafca168767e/src/LomiriToolkit/i18n_p.h#L34
-    #
-    # Using /run/current-system/sw/share/locale instead of /usr/share/locale isn't a great
-    # solution, but at least it should get us working localisations
+  ''
+  # Reverse dependencies (and their reverse dependencies too) access the function patched here to register their gettext catalogues,
+  # so hardcoding any prefix here will make only catalogues in that prefix work. APP_DIR envvar will override this, but with domains from multiple derivations being
+  # used in a single application (lomiri-system-settings), that's of not much use either.
+  # https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/dcb3a523c56a400e5c3c163c2836cafca168767e/src/LomiriToolkit/i18n.cpp#L101-129
+  #
+  # This could be solved with a reference to the prefix of whoever requests the domain, but the call happens via some automatic Qt / QML callback magic,
+  # I'm not sure what the best way of injecting that there would be.
+  # https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/dcb3a523c56a400e5c3c163c2836cafca168767e/src/LomiriToolkit/i18n_p.h#L34
+  #
+  # Using /run/current-system/sw/share/locale instead of /usr/share/locale isn't a great
+  # solution, but at least it should get us working localisations
+  + ''
     substituteInPlace src/LomiriToolkit/i18n.cpp \
       --replace-fail "/usr" "/run/current-system/sw"
-
-    # The code here overrides the regular QML import variables so the just-built modules are found & used in the tests
-    # But we need their QML dependencies too, so put them back in there
+  ''
+  # The code here overrides the regular QML import variables so the just-built modules are found & used in the tests
+  # But we need their QML dependencies too, so put them back in there
+  + ''
     substituteInPlace export_qml_dir.sh \
       --replace-fail '_IMPORT_PATH=$BUILD_DIR/qml' '_IMPORT_PATH=$BUILD_DIR/qml:${qtQmlPaths}'
-
-    # These tests try to load Suru theme icons, but override XDG_DATA_DIRS / use full paths to load them
+  ''
+  # These tests try to load Suru theme icons, but override XDG_DATA_DIRS / use full paths to load them
+  + ''
     substituteInPlace \
       tests/unit/visual/tst_visual.cpp \
-      tests/unit/visual/tst_icon.{11,13}.qml \
-      tests/unit/visual/tst_imageprovider.11.qml \
+      tests/unit/visual/tst_icon.qml \
+      tests/unit/visual13/tst_icon.{11,13}.qml \
+      tests/unit/visual/tst_imageprovider.qml \
+      tests/unit/visual13/tst_imageprovider.11.qml \
       --replace-fail '/usr/share' '${suru-icon-theme}/share'
   ''
-  + lib.optionalString (!withQt6) ''
-    for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do
-      substituteInPlace $subproject/$subproject.pro \
-        --replace-fail "\''$\''$[QT_INSTALL_PREFIX]" "$out" \
-        --replace-warn "\''$\''$[QT_INSTALL_LIBS]" "$out/lib"
-    done
-
+  + lib.optionalString (!withQt6) (
+    ''
+      for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do
+        substituteInPlace $subproject/$subproject.pro \
+          --replace-fail "\''$\''$[QT_INSTALL_PREFIX]" "$out"
+      done
+    ''
     # Install apicheck tool into bin
-    substituteInPlace apicheck/apicheck.pro \
-      --replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin"
-
-    substituteInPlace documentation/documentation.pro \
-      --replace-fail '/usr/share/doc' '$$PREFIX/share/doc' \
-      --replace-fail '$$[QT_INSTALL_DOCS]' '$$PREFIX/share/doc/lomiri-ui-toolkit'
-
+    + ''
+      substituteInPlace apicheck/apicheck.pro \
+        --replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin"
+    ''
+    + ''
+      substituteInPlace \
+        src/LomiriMetrics/LomiriMetrics.pro \
+        src/LomiriMetrics/lttng/lttng.pro \
+        --replace-fail '$$[QT_INSTALL_PLUGINS]' "$out/${qtbase.qtPluginPrefix}"
+    ''
+    + ''
+      substituteInPlace features/lomiri_qml_plugin.prf \
+        --replace-fail '$$[QT_INSTALL_QML]' "$out/${qtbase.qtQmlPrefix}"
+    ''
+    + ''
+      substituteInPlace documentation/documentation.pro \
+        --replace-fail '/usr/share/doc' '$$PREFIX/share/doc' \
+        --replace-fail '$$[QT_INSTALL_DOCS]' '$$PREFIX/share/doc/lomiri-ui-toolkit'
+    ''
     # Causes redefinition error with our own fortify hardening
-    sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf
-  ''
+    + ''
+      sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf
+    ''
+  )
   + lib.optionalString withQt6 ''
     substituteInPlace CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \
diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index d135f1380474..d07f0673be69 100644
--- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   testers,
@@ -37,13 +36,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-content-hub";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-content-hub";
     tag = finalAttrs.version;
-    hash = "sha256-ukaEur2RgdIVPYm90OUCs0L+F9OQ3zaypreyx33iD5M=";
+    hash = "sha256-48G17gzvk1ENgZHDjjvuHyyCiUfK8rkyokU2gNJ9KVg=";
   };
 
   outputs = [
@@ -55,15 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  patches = [
-    # Remove when version > 2.2.2
-    (fetchpatch {
-      name = "0001-lomiri-content-hub-Properly-include-lomiri-api-includedirs.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/commit/dab1854e5ec0a91fd28c9d84f06dcdd0af39518b.patch";
-      hash = "sha256-aQB8kLL2ZkKUOvFoDQ9rottFsCSNJ66wUjUZxP+kr5k=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace import/*/Content/CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 7d73afde6502..774f9bf34721 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   testers,
   boost,
@@ -33,13 +32,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-download-manager";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-download-manager";
     tag = finalAttrs.version;
-    hash = "sha256-/rb1Fx0TbBuff2dWAgxpd72opTnLe0itcGwLJ53Wu9U=";
+    hash = "sha256-FqpTEGbSwN+2oG/G2Zf80rSfezJP/ogtIkVdIrX4FMU=";
   };
 
   outputs = [
@@ -48,15 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals withDocumentation [ "doc" ];
 
-  patches = [
-    # Remove when version > 0.3.0
-    (fetchpatch {
-      name = "0001-lomiri-download-manager-Properly-include-lomiri-api-includedirs.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/b847aca92cea6f729b96f7a55f765ae4d9fbf741.patch";
-      hash = "sha256-hx/b80P5nbonlP3B8ekjZjxUGV3Ofm/lai0RU1ak9Gs=";
-    })
-  ];
-
   postPatch = ''
     # Substitute systemd's prefix in pkg-config call
     substituteInPlace CMakeLists.txt \
diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/1001-Fix-compat-with-libnotify-0.8.8.patch b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/1001-Fix-compat-with-libnotify-0.8.8.patch
deleted file mode 100644
index a741c5442cd0..000000000000
--- a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/1001-Fix-compat-with-libnotify-0.8.8.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From df28165c0955ab963aeda41ffda86651115f4efb Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Tue, 24 Feb 2026 21:04:37 +0100
-Subject: [PATCH] tests/authentication-test.cpp: Fix compat with libnotify
- 0.8.8
-
----
- tests/authentication-test.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/tests/authentication-test.cpp b/tests/authentication-test.cpp
-index 8c74867..2fee42d 100644
---- a/tests/authentication-test.cpp
-+++ b/tests/authentication-test.cpp
-@@ -245,12 +245,16 @@ TEST_F(AuthenticationTest, BasicRequest)
-     EXPECT_EQ("Cancel", dialogs[0].actions[3]);
- 
-     /* Hints */
--#if (NOTIFY_VERSION_MAJOR >= 0) && (NOTIFY_VERSION_MINOR >= 8)
-+#if NOTIFY_CHECK_VERSION(0, 8, 0)
-+#if NOTIFY_CHECK_VERSION(0, 8, 8)
-+    EXPECT_EQ(4, dialogs[0].hints.size());
-+#else
-     EXPECT_EQ(3, dialogs[0].hints.size());
-+#endif // NOTIFY_CHECK_VERSION(0, 8, 8)
-     EXPECT_NE(dialogs[0].hints.end(), dialogs[0].hints.find("sender-pid"));
- #else
-     EXPECT_EQ(2, dialogs[0].hints.size());
--#endif
-+#endif // NOTIFY_CHECK_VERSION(0, 8, 0)
-     EXPECT_NE(dialogs[0].hints.end(), dialogs[0].hints.find("x-lomiri-snap-decisions"));
-     EXPECT_NE(dialogs[0].hints.end(), dialogs[0].hints.find("x-lomiri-private-menu-model"));
- 
--- 
-2.51.2
-
diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
index daea4403b05b..8db2def5a1e4 100644
--- a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix
@@ -18,20 +18,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-polkit-agent";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-polkit-agent";
     tag = finalAttrs.version;
-    hash = "sha256-JKU2lm5wco9aC2cu3lgJ9OfGAzKQO/wQXFPEdb9Uz3Y=";
+    hash = "sha256-e7aPQ0c5uDz69D2RTWGodRKfPi2vBZbHk6ua4YLbC0s=";
   };
 
-  patches = [
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/17 merged & in release
-    ./1001-Fix-compat-with-libnotify-0.8.8.patch
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
index f5b086b06d13..d53ceaf0864c 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace autostart/CMakeLists.txt \
-      --replace-fail "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
+      --replace-fail "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg"
   '';
 
   postPatch = ''
diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
index deb47bc956a8..8d016f8ba767 100644
--- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdbusmenu-lxqt";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libdbusmenu-lxqt";
     rev = version;
-    hash = "sha256-PqX8ShSu3CYN9XIRp6IjVmr/eKH+oLNhXvwiudUH660=";
+    hash = "sha256-5X73kRUtOYeqBEIw2ctUnwXnWKPHDaoT489yT5nugZw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index f0c2c46d9c87..e1f25909741b 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -15,7 +15,7 @@
   qttools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.3.1",
+  version ? "2.4.0",
   qtx11extras ? null,
 }:
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash =
       {
         "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
-        "2.3.1" = "sha256-2PDVNMBwzDpUOkZ7GnrWDMlXBeUgCyZ6vHXurW6fr4s=";
+        "2.4.0" = "sha256-gfyskv/TpAdBES0+O1MrrkQqTDqtAGtDMIwv3NF7pnE=";
       }
       ."${finalAttrs.version}";
   };
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 662769fc4801..5e08c5106e34 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liblxqt";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "liblxqt";
     rev = version;
-    hash = "sha256-KAteTQRJ7xfh21tYcNoZjvLfWSiUYboasqL5D4YKARo=";
+    hash = "sha256-kGKgKpgiK40933O3T/astH0X1Y4oIH6kEKjjMBh43MA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index ab9038c110fb..44d074a8e011 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -8,7 +8,7 @@
   lxqt-build-tools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "4.3.0",
+  version ? "4.4.0",
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash =
       {
         "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
-        "4.3.0" = "sha256-aec+NjKkaH8dI0cFVxGehdRGO2aH6BD+aix+IvD+2LI=";
+        "4.4.0" = "sha256-9Hj5RnPWtqRkzhrAuXoHnMAQloFbnF/8koPT8ExfSAs=";
       }
       ."${finalAttrs.version}";
   };
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 72030d8d5df8..af0bc01e980f 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lximage-qt";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lximage-qt";
     rev = version;
-    hash = "sha256-RJKXcaZJe5gyDubdglOmzmJ9XCH0gAW4fc7OR3anCoU=";
+    hash = "sha256-ThP7MuAKysJ/Q/JSO12CuwCt6mCU5tZ2DiKEO0Nfg3U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index 3589471aeed3..dd66a85c1372 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-about";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-about";
     rev = version;
-    hash = "sha256-EP0Sd/VvLufqtn/7ZQwdI/h+BJhkGks7jTlEoEqYWgk=";
+    hash = "sha256-wJ4KJ+gSj0sdlO1l68RzAaOM8HxdPP6S1gWCoRfRZ3c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index 0e8850e862e9..277d0e1dc70a 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-admin";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-admin";
     rev = version;
-    hash = "sha256-FzYKmqCd61jLfbyPknsWuf7KpdF+SoAMqeSEZPOYc8w=";
+    hash = "sha256-SNEOqyLIDlOio4LttsCUgC/EnGcCSDTwPxhJo1lEvJE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index c5cddf8c8df9..5a2d9947fbf8 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-archiver";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-archiver";
     rev = version;
-    hash = "sha256-57ufvirD1YYEVoFtX/JY8EnMRWZ4ouhbxNm8przg5XA=";
+    hash = "sha256-f8s29INIJeqmPr6BWqQxYWWkjbG1wy+bUYZSy2OECKg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index eef1fcc73ed2..5b65c989bf02 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -9,7 +9,7 @@
   perl,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.3.0",
+  version ? "2.4.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
-        "2.3.0" = "sha256-lbDcIOrOkGU/n0bPPAlZSsdBYMlBh3afXwwTkTWQLpo=";
+        "2.4.0" = "sha256-PvDXL4hHaHeHt7CXeNCj8L2bv3YYY78ZDTxsctc73fo=";
       }
       ."${version}";
   };
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \
       --replace-fail AppleClang Clang
   ''
-  + lib.optionalString (lib.versionOlder version "2.3.0") ''
+  + lib.optionalString (lib.versionOlder version "2.4.0") ''
     substituteInPlace CMakeLists.txt \
       --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index 7ef745b30049..a0fe994122f4 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-config";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-config";
     tag = finalAttrs.version;
-    hash = "sha256-2fviPhSBwUU9jg3217PLbREh8MkArd2Uc4bhFXo2J7U=";
+    hash = "sha256-BG3+/QZkqCZp7kdaHgiruOMq506l8+9KKNq+IUgoTPw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index 87dc4f06eadd..5ddfce6a6299 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-globalkeys";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-globalkeys";
     rev = version;
-    hash = "sha256-ahRKkWmr6BkSByE5Vm5oqkkgQQ0Hyh4Ka7PYI8Es7AY=";
+    hash = "sha256-VhySpJYHdi17U4yJBWXEWE2KEyG7AVcWYLpYXr2iCyc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
index 335d257d4aae..844b11175baa 100644
--- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-menu-data";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-menu-data";
     rev = version;
-    hash = "sha256-9TYW3VA4qGlrkUzgZGkxf8RkIW2cTLkY6H8JHGDnoLg=";
+    hash = "sha256-Bu/M88VInCD6DzKFLjE3gZ5odJa0tvJ0EXHeLCBlgLw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index 79ec16557c71..869dc36db9aa 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-notificationd";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-notificationd";
     rev = version;
-    hash = "sha256-TfTOuarMq2m5rAdcfiKqjyGeJzKyUSvhkJ2EoGUMTUQ=";
+    hash = "sha256-o+J7xg60T0WsznDOrfg7EjNlT9FQFbniNkvgkF12N0Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index 06bf0e17053c..cec884533e6c 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-openssh-askpass";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-openssh-askpass";
     rev = version;
-    hash = "sha256-f8v9HBuL78YOauipCnMRIEydudFilpFJz+KgMlnJWGU=";
+    hash = "sha256-87soVKVcC3B6Wm7iRy15k/rjLb9OX/2se0btIOyKA6Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 04a62049fd8d..9cbfd76e52ae 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-panel";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-panel";
     tag = finalAttrs.version;
-    hash = "sha256-n/U2EgEZfh8mJWtEX+HByqHqtm9NqIXnURqUzSOcvns=";
+    hash = "sha256-6A22/zBeR04KQXfEMOHefNABB//qWhFSZ8c+6CA3Ni4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index 7a2e29a5091b..533592b02ee7 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-policykit";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-policykit";
     rev = version;
-    hash = "sha256-Hk8ig9x1UIKpugbJ2x16DsbCmRT0I1AnX/Y5lvP5u4Q=";
+    hash = "sha256-cMYBR0Uwc6v+s+F+uYbClbGh8BgovtxShgB62LX/WgU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index 72cfd62dd538..242f55c4c51a 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-powermanagement";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-powermanagement";
     rev = version;
-    hash = "sha256-1TA9v2zrPoHiKUy6P4enmzvxWTD+/rGjrChE5WGMt3c=";
+    hash = "sha256-pHQp/bXeI+yGQJ2rgsP8H7ISpCqcGG+/F74Otz+vJpg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 4765a792c437..f997136a5a74 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-qtplugin";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-qtplugin";
     tag = finalAttrs.version;
-    hash = "sha256-3rY9VpZKnl1E3ma1ioiKECpazeymQYVuXrLXhRL407o=";
+    hash = "sha256-Ax12jHeNTyEI+2dYj9aW8S6wzDVKN+I9U7ufhx6rycQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index 413226587435..985d2929ed96 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-runner";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-runner";
     rev = version;
-    hash = "sha256-h+pZiSuCdQknsyfUb9Ve1yxVyOUqNgYhIpO7kD5z3pQ=";
+    hash = "sha256-L/9STKrYTZP/Ey1BCLaZFRdeipBAWdKkXIoiHvd3vq4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index 1026c8fbdb98..7cb99f3a24e6 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-session";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-session";
     rev = version;
-    hash = "sha256-5VJxRho6qdPvBFr0RkYaajvVZRwhc1emzqpII+lUyOQ=";
+    hash = "sha256-CV0g553V4qxq9Cj/RUbr5jxESrrzFjAwR80NKhwNgDU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index 494b71ea57ca..ef5e31beccdc 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-sudo";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-sudo";
     rev = version;
-    hash = "sha256-skxPI6KEHXJReadxQinBArkCx/FjpTYDFdEpRRiqx8E=";
+    hash = "sha256-wPkIvm6U/dZvf3sE/IsWfK1D647DmVZPV/JZbsRl/HI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
index 2b2c4e151d32..7d6466a0328b 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-themes";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-themes";
     rev = version;
-    hash = "sha256-sdfLwLYE29Qh0QCU6t5pKIyW2RYx32WRNvNV46nCaXo=";
+    hash = "sha256-whMW4fMiIcL4Qb/VNynVGBTIyObTMlf6AaWCnBYikZI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
index 20ba7d6d4426..2f08d2cb4800 100644
--- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-wayland-session";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-wayland-session";
     rev = version;
-    hash = "sha256-MmiYPclMW8Y9VMZsY8wx52S3fN3RzUVrhQAGs5qSTfI=";
+    hash = "sha256-QmknSFJLmAy3OxU9jv6xMAAxQXlWuUcuPNHDs8r2/ls=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 35de208fb41c..58d438e4260a 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pavucontrol-qt";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "pavucontrol-qt";
     rev = version;
-    hash = "sha256-6t7nbuC/13S+Q9mINP1WuyaDqZUKp4s9LObcbSRuJ1c=";
+    hash = "sha256-Ja+9Tb88SxdvsJPiQadeziCgFtOnInTBSHcisNjrSpA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 90845f83dead..c0497746aa3d 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pcmanfm-qt";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "pcmanfm-qt";
     rev = version;
-    hash = "sha256-Pv3N/JfUbLyCBpnmnEHL7i2du1q8vSKxTR1uIEsEe/U=";
+    hash = "sha256-KgYirooKoiUUkzEFsOScTZt/s1OTBLIjAYlW/Q0RQTk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index 325864cd98df..7ea12bf86fd1 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation {
   pname = "qlipper";
-  version = "5.1.2-unstable-2025-10-29";
+  version = "6.1.0";
 
   src = fetchFromGitHub {
     owner = "pvanek";
diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index 6c31cff2d160..1631c62c9180 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qps";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qps";
     rev = version;
-    hash = "sha256-npTkPcjcxi/hAxUtyayEZeUnVx41iRJThKzhidC+4bQ=";
+    hash = "sha256-KH92JZkVLxz2iECF5z39yzAwt7TU2/WnJomPoAn8iDI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index 87fd2479f5fc..b7b12e6fe7d3 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qterminal";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qterminal";
     rev = version;
-    hash = "sha256-HwWgVcO9swywei8Z3ifoGJjZ785gdF2A/kBHm4zgzFc=";
+    hash = "sha256-8Bp4ZZ/oi4p6pAo/vRAmeSu0tfWZBvTBZTrm4ppJwFU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index 5616c94b6572..efad2ed3a5bf 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -8,7 +8,7 @@
   lxqt-build-tools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.3.0",
+  version ? "2.4.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
-        "2.3.0" = "sha256-l+IFXiUst9PDNuD/KGzxYCUjymhWvcpMY9CF60gIfKg=";
+        "2.4.0" = "sha256-fTE39goab0md0koS28gRiQgnEumtR5/vTKgpM/wuCrk=";
       }
       ."${version}";
   };
diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
index 6b8b39d65a32..c49f9b4899f5 100644
--- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix
+++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtxdg-tools";
-  version = "4.3.0";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qtxdg-tools";
     rev = version;
-    hash = "sha256-v6mIpGuZ3YFb+P9FLlgNp5xf0ceAaVnMxRG+sQLP72Y=";
+    hash = "sha256-pVFdodYoLQs8o8rF8etd7BKImgJRoDsckGg9DRrwVIY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index caa8717adc43..8fb25f3aa07b 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "screengrab";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "screengrab";
     tag = finalAttrs.version;
-    hash = "sha256-LORWv3qLgQF2feKodOg72g5DCfWZvB8vi0bw9jbr+tQ=";
+    hash = "sha256-WgQWFNAu+cws442o1HubuaANsg0Hxg0XLyZ/CeA3abM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 9a45f570dbf7..67000e583447 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-lxqt";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "xdg-desktop-portal-lxqt";
     tag = finalAttrs.version;
-    hash = "sha256-DNlvqZzTzZURuHTURBUXaLvMKy2HxVpgI9JwJq6A5Sw=";
+    hash = "sha256-GtpOBnRa10xFpd0FHWJge9RtS58hdOawFQmDH6yD1yU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 6bf6aa6eda61..1cf07e0b7e12 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -16,6 +16,7 @@
   libportal-gtk3,
   granite,
   pango,
+  poppler_gi,
   sqlite,
   zeitgeist,
   libcloudproviders,
@@ -26,7 +27,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-files";
-  version = "7.2.0";
+  version = "7.3.0";
 
   outputs = [
     "out"
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = "files";
     rev = version;
-    hash = "sha256-m6ICWL2JZoWh3myHLOhrKZ4St8zJcyVWhfozg+kdOng=";
+    hash = "sha256-/LhQznVm9w8YO69LFrZw7goDY/S34pldAai8CbJpLGo=";
   };
 
   nativeBuildInputs = [
@@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
     libhandy
     libportal-gtk3
     pango
+    poppler_gi
     sqlite
     systemd
     zeitgeist
diff --git a/pkgs/development/beam-modules/expert/default.nix b/pkgs/development/beam-modules/expert/default.nix
index a656cb55203e..4cd3a438e436 100644
--- a/pkgs/development/beam-modules/expert/default.nix
+++ b/pkgs/development/beam-modules/expert/default.nix
@@ -1,25 +1,30 @@
 {
+  _experimental-update-script-combinators,
   erlang,
   fetchFromGitHub,
-  mixRelease,
-  lib,
   fetchMixDeps,
+  gnused,
+  lib,
+  mixRelease,
+  nix-update-script,
+  nurl,
+  writeShellApplication,
 }:
 let
-  version = "0.1.0";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
-    owner = "elixir-lang";
+    owner = "expert-lsp";
     repo = "expert";
     tag = "v${version}";
-    hash = "sha256-r/SovUjU12ENT6OqbYuGK7XAmoxchUgiHTswlON/WeI=";
+    hash = "sha256-CGWWbzrBjCbz9S8f1nCLx2x6j4MFgsSd5XjgrxhuvzE=";
   };
 
   engineDeps = fetchMixDeps {
     pname = "mix-deps-expert-engine";
 
     inherit src version;
-    hash = "sha256-2QCaY4TlscRmklPQ897xjjree7N8cLl7O83syfqPmng=";
+    hash = "sha256-relCdTBialz4Z/BpXZxmuhSYrvJqLINg/AVGfEhuDGo=";
 
     preConfigure = ''
       cd apps/engine
@@ -58,11 +63,29 @@ mixRelease rec {
 
   passthru = {
     inherit engineDeps;
+
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script { })
+      (lib.getExe (writeShellApplication {
+        name = "expert-update-engine";
+        runtimeInputs = [
+          gnused
+          nurl
+        ];
+        text = ''
+          nixpkgs="$(git rev-parse --show-toplevel)"
+          engineHashOld=${engineDeps.hash}
+          engineHashNew=$(nurl -e "(import $nixpkgs/. { }).$UPDATE_NIX_ATTR_PATH.engineDeps")
+          echo "$UPDATE_NIX_ATTR_PATH.engineDeps.hash" >&2
+          sed -i "s|$engineHashOld|$engineHashNew|" "$nixpkgs"/pkgs/development/beam-modules/expert/default.nix
+        '';
+      }))
+    ];
   };
 
   meta = {
-    homepage = "https://github.com/elixir-lang/expert";
-    changelog = "https://github.com/elixir-lang/expert/blob/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/expert-lsp/expert";
+    changelog = "https://github.com/expert-lsp/expert/blob/v0.1.1/CHANGELOG.md";
     description = "Official Elixir Language Server Protocol implementation";
     longDescription = ''
       Expert is the official language server implementation for the Elixir programming language.
diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/development/compilers/chicken/5/default.nix
index bead4e3f19cf..650a05042981 100644
--- a/pkgs/development/compilers/chicken/5/default.nix
+++ b/pkgs/development/compilers/chicken/5/default.nix
@@ -56,6 +56,7 @@ lib.makeScope newScope (self: {
                 "agpl" = lib.licenses.agpl3Only;
                 "artistic" = lib.licenses.artistic2;
                 "bsd" = lib.licenses.bsd3;
+                "bsd-0-clause" = lib.licenses.bsd0;
                 "bsd-1-clause" = lib.licenses.bsd1;
                 "bsd-2-clause" = lib.licenses.bsd2;
                 "bsd-3" = lib.licenses.bsd3;
diff --git a/pkgs/development/compilers/dart/source/default.nix b/pkgs/development/compilers/dart/source/default.nix
index 1f272165fe31..3637ad19e52c 100644
--- a/pkgs/development/compilers/dart/source/default.nix
+++ b/pkgs/development/compilers/dart/source/default.nix
@@ -1,7 +1,7 @@
 {
   bintools,
   buildPackages,
-  flutter,
+  callPackage,
   cacert,
   curlMinimal,
   dart-bin,
@@ -22,7 +22,6 @@
   samurai,
   stdenv,
   versionCheckHook,
-  writableTmpDirAsHomeHook,
   writeShellScript,
   writeText,
   zlib,
@@ -31,6 +30,8 @@
 let
   version = "3.11.4";
 
+  tools = callPackage ../../flutter/engine/tools.nix { inherit (stdenv) hostPlatform buildPlatform; };
+
   getArchInfo =
     platform:
     let
@@ -52,75 +53,78 @@ let
     ]
   );
 
-  src = stdenv.mkDerivation (finalAttrs: {
-    pname = "dart-source-deps";
-    inherit version;
+  src =
+    runCommand "dart-source-deps"
+      {
+        pname = "dart-source-deps";
+        inherit version;
 
-    nativeBuildInputs = [
-      cacert
-      curlMinimal
-      flutter.scope.cipd
-      gitMinimal
-      pax-utils
-      python3
-      writableTmpDirAsHomeHook
-    ];
+        nativeBuildInputs = [
+          cacert
+          curlMinimal
+          gitMinimal
+          pax-utils
+          python3
+          tools.cipd
+        ];
 
-    env = {
-      NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-      GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-      SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-      DEPOT_TOOLS_UPDATE = "0";
-      DEPOT_TOOLS_COLLECT_METRICS = "0";
-      PYTHONDONTWRITEBYTECODE = "1";
-      CIPD_HTTP_USER_AGENT = "standard-nix-build";
-    };
+        env = {
+          NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+          GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+          SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+          DEPOT_TOOLS_UPDATE = "0";
+          DEPOT_TOOLS_COLLECT_METRICS = "0";
+          PYTHONDONTWRITEBYTECODE = "1";
+          CIPD_HTTP_USER_AGENT = "standard-nix-build";
+        };
 
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-    outputHash = "sha256-y2F+wB0M5dq6koxGpCs9BExGU7p8tFOIiRqfdf8ip+8=";
-
-    buildCommand = ''
-      mkdir source
-      cd source
-      cp ${writeText ".gclient" ''
-        solutions = [{
-            'name': 'sdk',
-            'url': 'https://dart.googlesource.com/sdk.git@${finalAttrs.version}',
-        }]
-        target_os = ['linux']
-        target_cpu = ['x64', 'arm64', 'riscv64']
-        target_cpu_only = True
-      ''} .gclient
-      export PATH=${python3}/bin:$PATH:${flutter.scope.depot_tools}
-      python3 ${flutter.scope.depot_tools}/gclient.py sync --no-history --nohooks --noprehooks
-      find sdk -name ".versions" -type d -exec rm -rf {} +
-      rm --recursive --force sdk/buildtools/sysroot
-      rm --recursive --force sdk/buildtools/linux-arm64
-      rm --recursive --force sdk/buildtools/reclient
-      rm --recursive --force sdk/buildtools/*/clang
-      find sdk -type f \( -name "*.snapshot" -o -name "*.dill" -o -name "*.sym" \) -delete
-      rm --recursive --force sdk/tools/sdks/dart-sdk
-      find . -type l ! -exec test -e {} \; -delete
-      find . -name "ChangeLog*" -delete
-      rm --force .gclient .gclient_entries .gclient_previous_sync_commits .last_sync_hashes
-      rm --recursive --force .cipd .cipd_cache
-      find . -name ".git" -type d -prune -exec rm --recursive --force {} +
-      find . -name ".git*" -exec rm --recursive --force {} +
-      find . \( \
-          -name ".build-id" -o \
-          -name ".svn" -o \
-          -name "*~" -o \
-          -name "#*#" \
-      \) -exec rm --recursive --force {} +
-      for elf in $(scanelf --recursive --all --format "%F" sdk | sort); do
-          rm --force "$elf"
-      done
-      find . -name "__pycache__" -type d -exec rm --recursive --force {} +
-      find . -name "*.pyc" -delete
-      cp --recursive sdk $out
-    '';
-  });
+        outputHashAlgo = "sha256";
+        outputHashMode = "recursive";
+        outputHash = "sha256-y2F+wB0M5dq6koxGpCs9BExGU7p8tFOIiRqfdf8ip+8=";
+      }
+      ''
+        mkdir source
+        cd source
+        source ${../../../../build-support/fetchgit/deterministic-git}
+        export -f clean_git
+        export -f make_deterministic_repo
+        cp ${writeText ".gclient" ''
+          solutions = [{
+              'name': 'sdk',
+              'url': 'https://dart.googlesource.com/sdk.git@${version}',
+          }]
+          target_os = ['linux']
+          target_cpu = ['x64', 'arm64', 'riscv64']
+          target_cpu_only = True
+        ''} .gclient
+        export PATH=${python3}/bin:$PATH:${tools.depot_tools}
+        python3 ${tools.depot_tools}/gclient.py sync --no-history --nohooks --noprehooks
+        find sdk -name ".versions" -type d -exec rm -rf {} +
+        rm --recursive --force sdk/buildtools/sysroot
+        rm --recursive --force sdk/buildtools/linux-arm64
+        rm --recursive --force sdk/buildtools/reclient
+        rm --recursive --force sdk/buildtools/*/clang
+        find sdk -type f \( -name "*.snapshot" -o -name "*.dill" -o -name "*.sym" \) -delete
+        rm --recursive --force sdk/tools/sdks/dart-sdk
+        find . -type l ! -exec test -e {} \; -delete
+        find . -name "ChangeLog*" -delete
+        rm --force .gclient .gclient_entries .gclient_previous_sync_commits .last_sync_hashes
+        rm --recursive --force .cipd .cipd_cache
+        find . -name ".git" -type d -prune -exec rm --recursive --force {} +
+        find . -name ".git*" -exec rm --recursive --force {} +
+        find . \( \
+            -name ".build-id" -o \
+            -name ".svn" -o \
+            -name "*~" -o \
+            -name "#*#" \
+        \) -exec rm --recursive --force {} +
+        for elf in $(scanelf --recursive --all --format "%F" sdk | sort); do
+            rm --force "$elf"
+        done
+        find . -name "__pycache__" -type d -exec rm --recursive --force {} +
+        find . -name "*.pyc" -delete
+        cp --recursive sdk $out
+      '';
 in
 dart-bin.overrideAttrs (oldAttrs: {
   inherit version src;
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 9f7394d52ab6..12f086072b2a 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -24,13 +24,30 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ecl";
-  version = "24.5.10";
+  version = "26.3.27";
 
   src = fetchurl {
     url = "https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz";
-    hash = "sha256-5Opluxhh4OSVOGv6i8ZzvQFOltPPnZHpA4+RQ1y+Yis=";
+    hash = "sha256-QW1XB78R0rPY0z1nkUGaeG5MxZrAzD7FBe5ZtRqfXJo=";
   };
 
+  patches = [
+    # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/370
+    (fetchpatch {
+      name = "allocate-first_env-dynamically.patch";
+      url = "https://gitlab.com/embeddable-common-lisp/ecl/-/commit/61a14dfc6681f674ae5673856c0749fdf4af6564.patch";
+      hash = "sha256-DOn0mtlW1Bl59LxqEQiE90ZJlXDSbTbxL0s8NNL882o=";
+      includes = [ "src/c/main.d" ];
+    })
+
+    # https://gitlab.com/embeddable-common-lisp/ecl/-/work_items/838
+    (fetchpatch {
+      name = "clang-miscompilation.patch";
+      url = "https://gitlab.com/embeddable-common-lisp/ecl/-/commit/d39cc449f770c52cc4c8b297cf600d7bd53d172a.patch";
+      hash = "sha256-C+zVjAY/+hQ4Te62DQxIQsHu0AqewygmSEQpcmrA5EU=";
+    })
+  ];
+
   nativeBuildInputs = [
     libtool
     autoconf
@@ -50,31 +67,6 @@ stdenv.mkDerivation rec {
     boehmgc
   ];
 
-  patches = [
-    # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/ecl/patches/write_error.patch";
-      sha256 = "0hfxacpgn4919hg0mn4wf4m8r7y592r4gw7aqfnva7sckxi6w089";
-    })
-  ]
-  ++ lib.optionals stdenv.cc.isGNU [
-    # Fix gcc15 compat for downstream packages e.g. sage
-    # error: ‘bool’ cannot be defined via ‘typedef’
-    (fetchpatch {
-      url = "https://gitlab.com/embeddable-common-lisp/ecl/-/commit/1aec8f741f69fd736f020b7fe4d3afc33e60ae6a.patch";
-      sha256 = "sha256-/cA6iOOob0ATViQm5EwBbdin5peqRMjLPKa7RjkrJ94=";
-    })
-    # error: too many arguments to function 'fn'; expected 0, have 1
-    (fetchpatch {
-      url = "https://gitlab.com/embeddable-common-lisp/ecl/-/commit/5b4e9c4bbd7cce4a678eecd493e56c495490e8b5.patch";
-      sha256 = "sha256-QHxswFiW2rfDAQ98Sl+VVmyP4M/eIjJWQEcR/B+m398=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.com/embeddable-common-lisp/ecl/-/commit/5ec9e02f6db9694dcdef7574036f1e320d64a8af.patch";
-      sha256 = "sha256-ZRah0IqOt6OQZGqlCq0RKiToyxsRXQEXAiSUGgqZnKU=";
-    })
-  ];
-
   configureFlags = [
     (if threadSupport then "--enable-threads" else "--disable-threads")
     "--with-gmp-incdir=${lib.getDev gmp}/include"
diff --git a/pkgs/development/compilers/elm/packages/elm-review/default.nix b/pkgs/development/compilers/elm/packages/elm-review/default.nix
index 8c13a4ec29be..cb2b178dc335 100644
--- a/pkgs/development/compilers/elm/packages/elm-review/default.nix
+++ b/pkgs/development/compilers/elm/packages/elm-review/default.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "elm-review";
-  version = "2.13.4";
+  version = "2.13.5";
 
   src = fetchFromGitHub {
     owner = "jfmengels";
     repo = "node-elm-review";
     rev = "v${version}";
-    hash = "sha256-rhNLIShZERxrzdTdrPcthTQ+gHUikgR0jchBfcBDGTo=";
+    hash = "sha256-IjaPJ9ic/5Z8pdtziNwLqzXfnSmgkurjC6afmNIX4LU=";
   };
 
-  npmDepsHash = "sha256-mI94fYNKZ9Jx1Iyo/VjZqaXQ64tZA2S8mtn5l6TtCSc=";
+  npmDepsHash = "sha256-eY9U9mLVL9tizN8touWQfLqFAJJ8pHaSHVD//cvNdhE=";
 
   postPatch = ''
     sed -i "s/elm-tooling install/echo 'skipping elm-tooling install'/g" package.json
@@ -32,7 +32,7 @@ buildNpmPackage rec {
   };
 
   meta = {
-    changelog = "https://github.com/jfmengels/node-elm-review/blob/v${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/jfmengels/node-elm-review/blob/main/CHANGELOG.md";
     description = "Analyzes Elm projects, to help find mistakes before your users find them";
     mainProgram = "elm-review";
     homepage = "https://github.com/jfmengels/node-elm-review";
diff --git a/pkgs/development/compilers/flutter/all-artifacts.nix b/pkgs/development/compilers/flutter/all-artifacts.nix
deleted file mode 100644
index 7e2132f52f4f..000000000000
--- a/pkgs/development/compilers/flutter/all-artifacts.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ lib, callPackage }:
-
-let
-  oss = [
-    {
-      name = "linux";
-      isLinux = true;
-      isWindows = false;
-      isDarwin = false;
-    }
-    {
-      name = "windows";
-      isLinux = false;
-      isWindows = true;
-      isDarwin = false;
-    }
-    {
-      name = "darwin";
-      isLinux = false;
-      isWindows = false;
-      isDarwin = true;
-    }
-  ];
-
-  archs = [
-    {
-      name = "x86_64";
-      isx86_64 = true;
-      isAarch64 = false;
-      isRiscV64 = false;
-    }
-    {
-      name = "aarch64";
-      isx86_64 = false;
-      isAarch64 = true;
-      isRiscV64 = false;
-    }
-  ];
-
-  hostPlatforms = (
-    map
-      (p: {
-        inherit (p.os) isLinux isWindows isDarwin;
-        inherit (p.cpu) isx86_64 isAarch64 isRiscV64;
-
-        parsed = {
-          kernel = {
-            name = p.os.name;
-          };
-          cpu = {
-            name = p.cpu.name;
-          };
-        };
-      })
-      (
-        lib.cartesianProduct {
-          os = oss;
-          cpu = archs;
-        }
-      )
-  );
-in
-(lib.unique (
-  lib.concatMap (
-    hostPlatform:
-    callPackage ./host-artifacts.nix {
-      inherit hostPlatform;
-      supportedTargetFlutterPlatforms = [
-        "universal"
-        "web"
-        "android"
-        "linux"
-        "macos"
-        "ios"
-        "windows"
-      ];
-    }
-  ) hostPlatforms
-))
diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
new file mode 100644
index 000000000000..a425f8fce636
--- /dev/null
+++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
@@ -0,0 +1,102 @@
+# Schema:
+# ${flutterVersion}.${targetPlatform}.${hostPlatform}
+#
+# aarch64-darwin as a host is not yet supported.
+# https://github.com/flutter/flutter/issues/60118
+{
+  lib,
+  runCommand,
+  lndir,
+  cacert,
+  unzip,
+
+  flutterPlatform,
+  systemPlatform,
+  flutter,
+  hash,
+}:
+
+let
+  flutterPlatforms = [
+    "android"
+    "ios"
+    "web"
+    "linux"
+    "windows"
+    "macos"
+    "fuchsia"
+    "universal"
+  ];
+
+  flutter' = flutter.override {
+    # Use a version of Flutter with just enough capabilities to download
+    # artifacts.
+    supportedTargetFlutterPlatforms = [ ];
+
+    # Modify flutter-tool's system platform in order to get the desired platform's hashes.
+    flutter = flutter.unwrapped.override {
+      flutterTools = flutter.unwrapped.tools.override {
+        inherit systemPlatform;
+      };
+    };
+  };
+in
+runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
+  {
+    nativeBuildInputs = [
+      lndir
+      flutter'
+      unzip
+    ];
+
+    NIX_FLUTTER_TOOLS_VM_OPTIONS = "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt";
+    NIX_FLUTTER_OPERATING_SYSTEM =
+      {
+        "x86_64-linux" = "linux";
+        "aarch64-linux" = "linux";
+        "x86_64-darwin" = "macos";
+        "aarch64-darwin" = "macos";
+      }
+      .${systemPlatform};
+
+    outputHash = hash;
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+
+    passthru = {
+      inherit flutterPlatform;
+    };
+  }
+  (
+    ''
+      export FLUTTER_ROOT="$NIX_BUILD_TOP"
+      lndir -silent '${flutter'}' "$FLUTTER_ROOT"
+      rm --recursive --force "$FLUTTER_ROOT/bin/cache"
+      mkdir "$FLUTTER_ROOT/bin/cache"
+      mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk"
+      lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk"
+    ''
+    # Could not determine engine revision
+    + lib.optionalString (lib.versionAtLeast flutter'.version "3.32") ''
+      cp '${flutter'}/bin/internal/engine.version' "$FLUTTER_ROOT/bin/cache/engine.stamp"
+    ''
+    + ''
+
+      HOME="$(mktemp -d)" flutter precache ${
+        lib.optionalString (
+          flutter ? engine && flutter.engine.meta.available
+        ) "--local-engine ${flutter.engine.outName}"
+      } \
+        --verbose '--${flutterPlatform}' ${
+          builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))
+        }
+
+      rm --recursive --force "$FLUTTER_ROOT/bin/cache/lockfile"
+      rm --recursive --force "$FLUTTER_ROOT/bin/cache/dart-sdk"
+    ''
+    + ''
+      find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete
+
+      cp --recursive bin/cache "$out"
+    ''
+  )
diff --git a/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix b/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
new file mode 100644
index 000000000000..dbdd81ba596a
--- /dev/null
+++ b/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
@@ -0,0 +1,14 @@
+{ }:
+{
+  buildInputs ? [ ],
+  ...
+}:
+{
+  # Use arm64 instead of arm64e.
+  postPatch = ''
+    if [ "$pname" == "flutter-tools" ]; then
+      substituteInPlace lib/src/ios/xcodeproj.dart \
+        --replace-fail arm64e arm64
+    fi
+  '';
+}
diff --git a/pkgs/development/compilers/flutter/artifacts/overrides/linux.nix b/pkgs/development/compilers/flutter/artifacts/overrides/linux.nix
new file mode 100644
index 000000000000..a06188f98e3a
--- /dev/null
+++ b/pkgs/development/compilers/flutter/artifacts/overrides/linux.nix
@@ -0,0 +1,12 @@
+{
+  gtk3,
+}:
+
+{
+  buildInputs ? [ ],
+  ...
+}:
+
+{
+  buildInputs = buildInputs ++ [ gtk3 ];
+}
diff --git a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix
new file mode 100644
index 000000000000..64eb4072d24e
--- /dev/null
+++ b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  stdenv,
+  callPackage,
+  autoPatchelfHook,
+  src,
+}:
+
+(stdenv.mkDerivation {
+  inherit (src) name;
+  inherit src;
+
+  nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir --parents "$out/bin"
+    cp --recursive . "$out/bin/cache"
+    rm --force "$out/bin/cache/flutter.version.json"
+
+    runHook postInstall
+  '';
+}).overrideAttrs
+  (
+    if builtins.pathExists (./overrides + "/${src.flutterPlatform}.nix") then
+      callPackage (./overrides + "/${src.flutterPlatform}.nix") { }
+    else
+      ({ ... }: { })
+  )
diff --git a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
index 94cf1f9fbd33..a2adc097947e 100644
--- a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
+++ b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
@@ -54,32 +54,39 @@ lib.extendMkDerivation {
       ...
     }:
     let
-      flutterMode' = args.flutterMode or "release";
+      hasEngine = flutter ? engine && flutter.engine != null && flutter.engine.meta.available;
+      flutterMode' = args.flutterMode or (if hasEngine then flutter.engine.runtimeMode else "release");
+
+      flutterFlags = lib.optional hasEngine "--local-engine host_${flutterMode'}${
+        lib.optionalString (!flutter.engine.isOptimized) "_unopt"
+      }";
 
       flutterBuildFlags' = [
         "--${flutterMode'}"
       ]
-      ++ (args.flutterBuildFlags or [ ]);
+      ++ (args.flutterBuildFlags or [ ])
+      ++ flutterFlags;
 
       universal = args // {
         flutterMode = flutterMode';
+        flutterFlags = flutterFlags;
         flutterBuildFlags = flutterBuildFlags';
 
-        # Pub needs SSL certificates. Dart normally looks in a hardcoded path.
-        # https://github.com/dart-lang/sdk/blob/3.1.0/runtime/bin/security_context_linux.cc#L48
-        #
-        # Dart does not respect SSL_CERT_FILE...
-        # https://github.com/dart-lang/sdk/issues/48506
-        # ...and Flutter does not support --root-certs-file, so the path cannot be manually set.
-        # https://github.com/flutter/flutter/issues/56607
-        # https://github.com/flutter/flutter/issues/113594
-        #
-        # libredirect is of no use either, as Flutter does not pass any
-        # environment variables (including LD_PRELOAD) to the Pub process.
-        #
-        # Instead, Flutter is patched to allow the path to the Dart binary used for
-        # Pub commands to be overriden.
         sdkSetupScript = ''
+          # Pub needs SSL certificates. Dart normally looks in a hardcoded path.
+          # https://github.com/dart-lang/sdk/blob/3.1.0/runtime/bin/security_context_linux.cc#L48
+          #
+          # Dart does not respect SSL_CERT_FILE...
+          # https://github.com/dart-lang/sdk/issues/48506
+          # ...and Flutter does not support --root-certs-file, so the path cannot be manually set.
+          # https://github.com/flutter/flutter/issues/56607
+          # https://github.com/flutter/flutter/issues/113594
+          #
+          # libredirect is of no use either, as Flutter does not pass any
+          # environment variables (including LD_PRELOAD) to the Pub process.
+          #
+          # Instead, Flutter is patched to allow the path to the Dart binary used for
+          # Pub commands to be overriden.
           export NIX_FLUTTER_PUB_DART="${
             runCommand "dart-with-certs" { nativeBuildInputs = [ makeWrapper ]; } ''
               mkdir -p "$out/bin"
@@ -89,11 +96,13 @@ lib.extendMkDerivation {
           }/bin/dart"
 
           export HOME="$NIX_BUILD_TOP"
-          # flutter config --no-analytics &>/dev/null # mute first-run
-          flutter config --enable-linux-desktop >/dev/null
+          flutter config $flutterFlags --no-analytics &>/dev/null # mute first-run
+          flutter config $flutterFlags --enable-linux-desktop >/dev/null
         '';
 
-        pubGetScript = args.pubGetScript or "flutter pub get";
+        pubGetScript =
+          args.pubGetScript
+            or "flutter${lib.optionalString hasEngine " --local-engine $flutterMode"} pub get";
 
         sdkSourceBuilders = {
           # https://github.com/dart-lang/pub/blob/68dc2f547d0a264955c1fa551fa0a0e158046494/lib/src/sdk/flutter.dart#L81
diff --git a/pkgs/development/compilers/flutter/cipd.nix b/pkgs/development/compilers/flutter/cipd.nix
deleted file mode 100644
index c5997d1d8a29..000000000000
--- a/pkgs/development/compilers/flutter/cipd.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  constants,
-  fetchurl,
-  writeShellScriptBin,
-}:
-
-let
-  cipdBin = fetchurl {
-    url = "https://chrome-infra-packages.appspot.com/client?platform=${constants.hostConstants.alt-os}-${constants.hostConstants.arch}&version=git_revision:927335d3d594ba6b46a8c3f2d64fade13c22075b";
-    executable = true;
-    hash =
-      {
-        "linux-amd64" = "sha256-CP3AbEJm9vbyYfEnF9eD/vZwWK8Ps7kqQjZPY+HTuSQ=";
-        "linux-arm64" = "sha256-C97vamQ/+/0aaro+idwogtamQUfeVAopHQ1mdID2Utc=";
-        "mac-amd64" = "sha256-oyxJAG2Xg7m6w/IYrFgEPw0qLCTjL3/XB/3npod2Xsg=";
-        "mac-arm64" = "sha256-a0bD+qSn34Edn63o7rmQ4v4IVWnETIgWbxDZ1igNbP4=";
-      }
-      ."${constants.hostConstants.alt-os}-${constants.hostConstants.arch}";
-  };
-in
-writeShellScriptBin "cipd" ''
-  if [[ "$1" == "ensure" ]]; then
-    for arg in "$@"; do
-      if [[ "$prev" == "-ensure-file" ]]; then
-        sed --in-place \
-          --expression='s/''${platform}/${constants.hostConstants.platform}/g' \
-          --expression='s|gn/gn/${constants.hostConstants.platform}|gn/gn/${constants.buildConstants.platform}|g' \
-          --expression='\|src/flutter/third_party/java/openjdk|,+2 d' \
-          "$arg"
-        break
-      fi
-      prev="$arg"
-    done
-  fi
-
-  exec ${cipdBin} "$@"
-''
diff --git a/pkgs/development/compilers/flutter/constants.nix b/pkgs/development/compilers/flutter/constants.nix
deleted file mode 100644
index d900122ea6f7..000000000000
--- a/pkgs/development/compilers/flutter/constants.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv }:
-
-let
-  makeConstants =
-    platform:
-    let
-      os =
-        {
-          linux = "linux";
-          darwin = "macos";
-          windows = "windows";
-        }
-        .${platform.parsed.kernel.name} or (throw "Unsupported OS: ${platform.parsed.kernel.name}");
-
-      arch =
-        {
-          x86_64 = "amd64";
-          aarch64 = "arm64";
-          riscv64 = "riscv64";
-        }
-        .${platform.parsed.cpu.name} or (throw "Unsupported CPU: ${platform.parsed.cpu.name}");
-      alt-os = if platform.isDarwin then "mac" else os;
-      alt-arch = if platform.isx86_64 then "x64" else arch;
-    in
-    {
-      inherit
-        os
-        arch
-        alt-os
-        alt-arch
-        ;
-      platform = "${os}-${arch}";
-      alt-platform = "${alt-os}-${alt-arch}";
-    };
-in
-{
-  inherit makeConstants;
-  buildConstants = makeConstants stdenv.buildPlatform;
-  targetConstants = makeConstants stdenv.targetPlatform;
-  hostConstants = makeConstants stdenv.hostPlatform;
-}
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 27e12e586b53..2c886bf529fc 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -1,51 +1,146 @@
 {
-  callPackage,
-  lib,
   useNixpkgsEngine ? false,
+  callPackage,
+  fetchzip,
+  fetchFromGitHub,
+  dart,
+  dart-bin,
+  lib,
+  stdenv,
+  runCommand,
 }:
-
 let
+  mkCustomFlutter = args: callPackage ./flutter.nix args;
+  wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; };
   getPatches =
     dir:
-    if builtins.pathExists dir then
-      map (fileName: dir + "/${fileName}") (builtins.attrNames (builtins.readDir dir))
-    else
-      [ ];
-
-  makeFlutterScope = callPackage ./scope.nix { };
-
-  allVersions = lib.mapAttrs' (versionName: _: {
-    name = "v${versionName}";
-    value =
-      let
-        versionDir = ./versions + "/${versionName}";
-        versionData = lib.importJSON (versionDir + "/data.json");
-        globalPatches = getPatches ./patches;
-        versionPatches = getPatches (versionDir + "/patches");
-        globalEnginePatches = getPatches ./engine/patches;
-        versionEnginePatches = getPatches (versionDir + "/engine/patches");
-      in
-      makeFlutterScope (
-        versionData
-        // {
-          inherit useNixpkgsEngine;
-          patches = globalPatches ++ versionPatches;
-          enginePatches = globalEnginePatches ++ versionEnginePatches;
-        }
-      );
-  }) (builtins.readDir ./versions);
-
-  getLatestForChannel =
-    channel:
     let
-      channelVersions = lib.filterAttrs (_: scope: scope.channel == channel) allVersions;
-      sortedNames = lib.naturalSort (builtins.attrNames channelVersions);
+      files = builtins.attrNames (builtins.readDir dir);
     in
-    if sortedNames == [ ] then null else channelVersions.${lib.last sortedNames}.flutter;
+    if (builtins.pathExists dir) then map (f: dir + ("/" + f)) files else [ ];
+  mkFlutter =
+    {
+      version,
+      engineVersion,
+      engineSwiftShaderHash,
+      engineSwiftShaderRev,
+      engineHashes,
+      enginePatches,
+      dartVersion,
+      flutterHash,
+      dartHash,
+      patches,
+      pubspecLock,
+      artifactHashes,
+      channel,
+    }:
+    let
+      args = {
+        inherit
+          version
+          engineVersion
+          engineSwiftShaderRev
+          engineSwiftShaderHash
+          engineHashes
+          enginePatches
+          patches
+          pubspecLock
+          artifactHashes
+          useNixpkgsEngine
+          channel
+          ;
 
-  stable = getLatestForChannel "stable";
-  beta = getLatestForChannel "beta";
+        dart =
+          let
+            hash =
+              dartHash.${stdenv.hostPlatform.system}
+                or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+          in
+          (
+            if lib.versionAtLeast version "3.41" then
+              (dart-bin.overrideAttrs (oldAttrs: {
+                version = dartVersion;
+                src = oldAttrs.src.overrideAttrs (_: {
+                  inherit hash;
+                });
+              }))
+            else
+              (dart-bin.overrideAttrs (_: {
+                # This overrideAttrs is used to replace the version in src.url
+                version = dartVersion;
+                __intentionallyOverridingVersion = true;
+              })).overrideAttrs
+                (oldAttrs: {
+                  src = fetchzip {
+                    inherit (oldAttrs.src) url;
+                    inherit hash;
+                  };
+                })
+          );
+        src =
+          let
+            source = fetchFromGitHub {
+              owner = "flutter";
+              repo = "flutter";
+              tag = version;
+              hash = flutterHash;
+            };
+          in
+          (
+            if lib.versionAtLeast version "3.32" then
+              # # Could not determine engine revision
+              (runCommand source.name { } ''
+                cp --recursive ${source} $out
+                chmod +w $out/bin
+                mkdir $out/bin/cache
+                cp $out/bin/internal/engine.version $out/bin/cache/engine.stamp
+                touch $out/bin/cache/engine.realm
+              '')
+            else
+              source
+          );
+      };
+    in
+    (mkCustomFlutter args).overrideAttrs (
+      prev: next: {
+        passthru = next.passthru // {
+          inherit wrapFlutter mkCustomFlutter mkFlutter;
+          buildFlutterApplication = callPackage ./build-support/build-flutter-application.nix {
+            flutter = wrapFlutter (mkCustomFlutter args);
+          };
+        };
+      }
+    );
+
+  flutterVersions = lib.mapAttrs' (
+    version: _:
+    let
+      versionDir = ./versions + "/${version}";
+      data = lib.importJSON (versionDir + "/data.json");
+    in
+    lib.nameValuePair "v${version}" (
+      wrapFlutter (
+        mkFlutter (
+          {
+            patches = (getPatches ./patches) ++ (getPatches (versionDir + "/patches"));
+            enginePatches = (getPatches ./engine/patches) ++ (getPatches (versionDir + "/engine/patches"));
+          }
+          // data
+        )
+      )
+    )
+  ) (builtins.readDir ./versions);
+
+  stableFlutterVersions = lib.attrsets.filterAttrs (_: v: v.channel == "stable") flutterVersions;
+  betaFlutterVersions = lib.attrsets.filterAttrs (_: v: v.channel == "beta") flutterVersions;
 in
-(lib.mapAttrs (_: scope: scope.flutter) allVersions)
-// lib.optionalAttrs (stable != null) { inherit stable; }
-// lib.optionalAttrs (beta != null) { inherit beta; }
+flutterVersions
+// {
+  inherit wrapFlutter mkFlutter;
+}
+// lib.optionalAttrs (betaFlutterVersions != { }) {
+  beta = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames betaFlutterVersions))};
+}
+// lib.optionalAttrs (stableFlutterVersions != { }) {
+  stable = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames stableFlutterVersions))};
+}
diff --git a/pkgs/development/compilers/flutter/engine/constants.nix b/pkgs/development/compilers/flutter/engine/constants.nix
new file mode 100644
index 000000000000..768f103e849f
--- /dev/null
+++ b/pkgs/development/compilers/flutter/engine/constants.nix
@@ -0,0 +1,48 @@
+{ lib, platform }:
+let
+  self = {
+    os =
+      if platform.isLinux then
+        "linux"
+      else if platform.isDarwin then
+        "macos"
+      else if platform.isWindows then
+        "windows"
+      else
+        throw "Unsupported OS \"${platform.parsed.kernel.name}\"";
+
+    alt-os = if platform.isDarwin then "mac" else self.os;
+
+    arch =
+      if platform.isx86_64 then
+        "amd64"
+      else if platform.isx86 && platform.is32bit then
+        "386"
+      else if platform.isAarch64 then
+        "arm64"
+      else if platform.isMips && platform.parsed.cpu.significantByte == "littleEndian" then
+        "mipsle"
+      else if platform.isMips64 then
+        "mips64${lib.optionalString (platform.parsed.cpu.significantByte == "littleEndian") "le"}"
+      else if platform.isPower64 then
+        "ppc64${lib.optionalString (platform.parsed.cpu.significantByte == "littleEndian") "le"}"
+      else if platform.isS390x then
+        "s390x"
+      else if platform.isRiscV64 then
+        "riscv64"
+      else
+        throw "Unsupported CPU \"${platform.parsed.cpu.name}\"";
+
+    alt-arch =
+      if platform.isx86_64 then
+        "x64"
+      else if platform.isAarch64 then
+        "arm64"
+      else
+        platform.parsed.cpu.name;
+
+    platform = "${self.os}-${self.arch}";
+    alt-platform = "${self.os}-${self.alt-arch}";
+  };
+in
+self
diff --git a/pkgs/development/compilers/flutter/engine/dart.nix b/pkgs/development/compilers/flutter/engine/dart.nix
new file mode 100644
index 000000000000..4846392aa8ba
--- /dev/null
+++ b/pkgs/development/compilers/flutter/engine/dart.nix
@@ -0,0 +1,12 @@
+{ engine, runCommand }:
+runCommand "flutter-engine-${engine.version}-dart"
+  {
+    version = engine.dartSdkVersion;
+
+    meta = engine.meta // {
+      description = "Dart SDK compiled from the Flutter Engine";
+    };
+  }
+  ''
+    ln --symbolic ${engine}/out/${engine.outName}/dart-sdk $out
+  ''
diff --git a/pkgs/development/compilers/flutter/engine/default.nix b/pkgs/development/compilers/flutter/engine/default.nix
index defb8d99bc6a..0821bce822a5 100644
--- a/pkgs/development/compilers/flutter/engine/default.nix
+++ b/pkgs/development/compilers/flutter/engine/default.nix
@@ -1,317 +1,78 @@
 {
   callPackage,
-  constants,
-  dart,
-  depot_tools,
-  dos2unix,
-  enginePatches,
-  freetype,
-  gn,
-  gtk3,
-  harfbuzz,
-  lib,
-  libepoxy,
-  libjpeg,
-  libpng,
-  libwebp,
-  libx11,
-  libxxf86vm,
-  llvmPackages,
-  ninja,
-  patches,
-  pkg-config,
-  python312,
-  sqlite,
-  stdenv,
-  symlinkJoin,
+  dartSdkVersion,
+  flutterVersion,
+  swiftshaderHash,
+  swiftshaderRev,
   version,
-  zlib,
-  runtimeMode ? "release",
-}:
-
+  hashes,
+  url,
+  patches,
+  runtimeModes,
+  lib,
+  stdenv,
+  ...
+}@args:
 let
-  python3 = python312;
+  mainRuntimeMode = args.mainRuntimeMode or builtins.elemAt runtimeModes 0;
+  altRuntimeMode = args.altRuntimeMode or builtins.elemAt runtimeModes 1;
 
-  llvm = symlinkJoin {
-    name = "llvm";
-    paths = [
-      llvmPackages.clang
-      llvmPackages.llvm
-    ];
-  };
-
-  outputAttrs = {
-    flutter-gtk =
-      lib.replaceStrings [ "-" "/" ] [ "_M_" "_S_" ]
-        "${constants.hostConstants.alt-platform}-${runtimeMode}/${constants.hostConstants.alt-platform}-flutter-gtk";
-    flutter-glfw =
-      lib.replaceStrings [ "-" "/" ] [ "_M_" "_S_" ]
-        "${constants.hostConstants.alt-platform}-${runtimeMode}/${constants.hostConstants.alt-platform}-flutter-glfw";
-    font-subset =
-      lib.replaceStrings [ "-" "/" ] [ "_M_" "_S_" ]
-        "${constants.hostConstants.alt-platform}/font-subset";
-    artifacts =
-      lib.replaceStrings [ "-" "/" ] [ "_M_" "_S_" ]
-        "${constants.hostConstants.alt-platform}/artifacts";
-    flutter_patched_sdk = "flutter_patched_sdk";
-  };
+  runtimeModesBuilds = lib.genAttrs runtimeModes (
+    runtimeMode:
+    callPackage ./package.nix {
+      inherit
+        dartSdkVersion
+        flutterVersion
+        swiftshaderHash
+        swiftshaderRev
+        version
+        hashes
+        url
+        patches
+        runtimeMode
+        ;
+      isOptimized = args.isOptimized or runtimeMode != "debug";
+    }
+  );
 in
-stdenv.mkDerivation (finalAttrs: {
-  __structuredAttrs = true;
-  strictDeps = true;
-  pname = "flutter-engine-linux-${runtimeMode}";
-  inherit version;
+stdenv.mkDerivation (
+  {
+    pname = "flutter-engine";
+    inherit url runtimeModes altRuntimeMode;
+    inherit (runtimeModesBuilds.${mainRuntimeMode}) version src meta;
 
-  src = callPackage ./source.nix { };
+    dontUnpack = true;
+    dontBuild = true;
 
-  sourceRoot = "${finalAttrs.src.name}/engine/src";
+    installPhase = ''
+      runHook preInstall
 
-  prePatch = ''
-    pushd ../..
-    chmod --recursive +w .
-  '';
-
-  patches = patches ++ enginePatches;
-
-  postPatch = ''
-    popd
-    dos2unix flutter/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-    patchShebangs ../../bin/internal/content_aware_hash.sh
-    mkdir --parents flutter/third_party/dart/tools/sdks/dart-sdk/ flutter/prebuilts/${constants.hostConstants.alt-platform}/dart-sdk
-    ln --symbolic ${dart}/bin flutter/third_party/dart/tools/sdks/dart-sdk/bin
-    ln --symbolic ${dart}/bin flutter/prebuilts/${constants.hostConstants.alt-platform}/dart-sdk/bin
-    echo "${dart.version}" > flutter/third_party/dart/sdk/version
-    mkdir --parents flutter/third_party/gn/
-    ln --symbolic ${lib.getExe gn} flutter/third_party/gn/gn
-    mkdir --parents flutter/third_party/swiftshader/third_party
-    ln --symbolic ${llvmPackages.llvm.monorepoSrc} flutter/third_party/swiftshader/third_party/llvm-project
-    mkdir --parents flutter/buildtools/${constants.hostConstants.alt-platform}
-    ln --symbolic ${llvm} flutter/buildtools/${constants.hostConstants.alt-platform}/clang
-  ''
-  # https://github.com/dart-lang/sdk/issues/52295
-  + ''
-    mkdir --parents flutter/third_party/dart/.git/logs
-    touch flutter/third_party/dart/.git/logs/HEAD
-  ''
-  # DEPS hooks
-  + ''
-    python3 flutter/third_party/dart/tools/generate_package_config.py
-    python3 flutter/third_party/dart/tools/generate_sdk_version_file.py
-    python3 flutter/tools/pub_get_offline.py
-  ''
-  # reusable system library settings
-  + ''
-    local use_system="
-      freetype2
-      harfbuzz
-      libjpeg-turbo
-      libpng
-      libwebp
-      sqlite
-      zlib
-      "
-    for _lib in $use_system; do
-      echo "Removing buildscripts for system provided $_lib"
-      find . -type f -path "*third_party/$_lib/*" \
-        \! -path "*third_party/$_lib/chromium/*" \
-        \! -path "*third_party/$_lib/google/*" \
-        \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-        -delete
-    done
-    echo "Replacing gn files"
-    python3 build/linux/unbundle/replace_gn_files.py --system-libraries $use_system
-  ''
-  # ValueError: ZIP does not support timestamps before 1980
-  + ''
-    substituteInPlace flutter/build/zip.py \
-      --replace-fail "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED)" "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False)"
-  ''
-  + ''
-    sed --in-place '5i #include <cstring>' flutter/display_list/dl_storage.cc
-    sed --in-place '5i #include <cstring>' flutter/display_list/dl_vertices.cc
-    sed --in-place '5i #include <cstring>' flutter/display_list/effects/color_filters/dl_matrix_color_filter.h
-    sed --in-place '5i #include <cstring>' flutter/display_list/geometry/dl_region.cc
-    sed --in-place '5i #include <cstring>' flutter/display_list/effects/dl_color_source.cc
-    sed --in-place '5i #include <cstring>' flutter/display_list/dl_builder.cc
-    sed --in-place '5i #include <cstring>' flutter/display_list/display_list.cc
-    sed --in-place '5i #include <cstring>' flutter/vulkan/vulkan_application.cc
-    sed --in-place '5i #include <cstring>' flutter/runtime/dart_vm.cc
-    sed --in-place '5i #include <cstring>' flutter/runtime/dart_isolate.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/android/android_surface_gl_skia.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/glfw/platform_handler.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/linux/fl_accessibility_channel.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/linux/fl_text_input_handler.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/linux/fl_application.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/linux/fl_event_channel.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/linux/fl_keyboard_channel.cc
-    sed --in-place '5i #include <cstring>' flutter/impeller/renderer/backend/vulkan/debug_report_vk.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/linux/fl_text_input_channel.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/linux/fl_settings_portal.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/linux/fl_gnome_settings.cc
-    sed --in-place '5i #include <cstring>' flutter/impeller/toolkit/glvk/trampoline.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/android/android_context_dynamic_impeller.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/fuchsia/dart_runner/builtin_libraries.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/fuchsia/flutter/text_delegate.cc
-    sed --in-place '5i #include <cstring>' flutter/third_party/accessibility/ax/ax_enum_util.cc
-    sed --in-place '5i #include <cstring>' flutter/examples/vulkan_glfw/src/main.cc
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/linux/public/flutter_linux/fl_method_channel.h
-    sed --in-place '5i #include <cstring>' flutter/shell/platform/linux/fl_accessible_text_field.cc
-    substituteInPlace flutter/shell/platform/linux/fl_view_accessible.cc \
-      --replace-fail "// Workaround missing C code compatibility in ATK header." "#include <glib.h>"
-  '';
-
-  nativeBuildInputs = [
-    (python3.withPackages (ps: with ps; [ pyyaml ]))
-    dart
-    depot_tools
-    dos2unix
-    ninja
-    pkg-config
-  ];
-
-  buildInputs = [
-    freetype
-    gtk3
-    harfbuzz
-    libepoxy
-    libjpeg
-    libpng
-    libwebp
-    libx11
-    libxxf86vm
-    sqlite
-    zlib
-  ];
-
-  env = {
-    NIX_CFLAGS_COMPILE = toString (
-      [
-        "-O2"
-        "-Wno-error"
-        "-Wno-unused-command-line-argument"
-        "-Wno-absolute-value"
-        "-Wno-implicit-float-conversion"
-        "-Wno-error=unused-command-line-argument"
-        "-D_GLIBCXX_DEBUG=0"
-      ]
-      ++ (lib.optionals stdenv.hostPlatform.isLinux [ "-U_FORTIFY_SOURCE" ])
-    );
-    TERM = "dumb";
-  };
-
-  configurePhase =
-    let
-      gnFlags = lib.concatStringsSep " " (
-        [
-          "--no-goma"
-          "--no-dart-version-git-info"
-          "--linux"
-          "--linux-cpu=${constants.hostConstants.alt-arch}"
-          "--runtime-mode=${runtimeMode}"
-          "--no-rbe"
-          "--prebuilt-dart-sdk"
-          "--build-glfw-shell"
-          "--build-engine-artifacts"
-          "--no-enable-unittests"
-          "--enable-fontconfig"
-          ''--gn-args="use_default_linux_sysroot=false"''
-        ]
-        ++ (lib.optionals (runtimeMode == "release") [ "--no-backtrace" ])
-        ++ (
-          if (runtimeMode == "debug") then
-            [
-              "--unoptimized"
-              "--no-stripped"
-            ]
-          else
-            [ "--no-lto" ]
-        )
-      );
-    in
+      mkdir --parents $out/out
     ''
-      runHook preConfigure
-
-      python3 flutter/tools/gn ${gnFlags} --target-dir="${constants.hostConstants.alt-platform}-${runtimeMode}"
-
-      runHook postConfigure
+    + lib.concatMapStrings (
+      runtimeMode:
+      let
+        runtimeModeBuild = runtimeModesBuilds.${runtimeMode};
+        runtimeModeOut = runtimeModeBuild.outName;
+      in
+      ''
+        ln --symbolic --force ${runtimeModeBuild}/out/${runtimeModeOut} $out/out/${runtimeModeOut}
+      ''
+    ) runtimeModes
+    + ''
+      runHook postInstall
     '';
 
-  buildPhase = ''
-    runHook preBuild
-
-    ninja -C out/${constants.hostConstants.alt-platform}-${runtimeMode} -j $NIX_BUILD_CORES
-
-    runHook postBuild
-  '';
-
-  outputs = [ "out" ] ++ builtins.attrValues outputAttrs;
-
-  installPhase = ''
-    runHook preInstall
-
-    pushd out/${constants.hostConstants.alt-platform}-${runtimeMode}
-  ''
-  # flutter-gtk
-  + ''
-    install -D --mode=0644 libflutter_linux_gtk.so --target-directory=''$${outputAttrs.flutter-gtk}
-    install -D --mode=0755 gen_snapshot --target-directory=''$${outputAttrs.flutter-gtk}
-    cp --recursive flutter_linux ''$${outputAttrs.flutter-gtk}/flutter_linux
-  ''
-  # flutter-glfw
-  + ''
-    install -D --mode=0644 flutter_export.h --target-directory=''$${outputAttrs.flutter-glfw}
-    install -D --mode=0644 flutter_glfw.h --target-directory=''$${outputAttrs.flutter-glfw}
-    install -D --mode=0644 flutter_messenger.h --target-directory=''$${outputAttrs.flutter-glfw}
-    install -D --mode=0644 flutter_plugin_registrar.h --target-directory=''$${outputAttrs.flutter-glfw}
-    install -D --mode=0755 gen_snapshot --target-directory=''$${outputAttrs.flutter-glfw}
-    install -D --mode=0644 libflutter_linux_glfw.so --target-directory=''$${outputAttrs.flutter-glfw}
-  ''
-  # font-subset
-  + ''
-    install -D --mode=0644 font-subset --target-directory=''$${outputAttrs.font-subset}
-    install -D --mode=0644 gen/const_finder.dart.snapshot --target-directory=''$${outputAttrs.font-subset}
-  ''
-  # flutter_patched_sdk
-  + ''
-    install -D --mode=0644 gen/flutter/build/archives/LICENSE.flutter_patched_sdk.md ''$${outputAttrs.flutter_patched_sdk}/LICENSE.flutter_patched_sdk.md
-    install -D --mode=0644 flutter_patched_sdk/platform_strong.dill --target-directory=''$${outputAttrs.flutter_patched_sdk}/flutter_patched_sdk/
-    install -D --mode=0644 flutter_patched_sdk/vm_outline_strong.dill --target-directory=''$${outputAttrs.flutter_patched_sdk}/flutter_patched_sdk/
-  ''
-  # artifacts
-  + ''
-    install -D --mode=0644 gen/flutter/lib/snapshot/vm_isolate_snapshot.bin --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0644 gen/flutter/lib/snapshot/isolate_snapshot.bin --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0644 icudtl.dat --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0644 flutter_tester --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0644 gen/frontend_server_aot.dart.snapshot --target-directory=''$${outputAttrs.artifacts}/frontend_server.dart.snapshot
-    install -D --mode=0644 gen/flutter/build/archives/LICENSE.artifacts.md --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0644 gen/flutter/lib/snapshot/vm_isolate_snapshot.bin --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0644 libtessellator.so --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0644 libpath_ops.so --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0644 gen/flutter/lib/snapshot/isolate_snapshot.bin --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0644 libimpeller.so --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0755 gen_snapshot --target-directory=''$${outputAttrs.artifacts}
-    install -D --mode=0755 impellerc --target-directory=''$${outputAttrs.artifacts}
-    cp --recursive shader_lib ''$${outputAttrs.artifacts}/shader_lib
-  ''
-  # others
-  + ''
-    install -D --mode=0644 libflutter_engine.so --target-directory=$out
-    install -D --mode=0755 analyze_snapshot --target-directory=$out
-    popd
-
-    runHook postInstall
-  '';
-
-  dontStrip = (runtimeMode != "release");
-
-  meta = {
-    broken = stdenv.hostPlatform.isDarwin || (lib.versionOlder version "3.41");
-    maintainers = with lib.maintainers; [ RossComputerGuy ];
-    license = lib.licenses.bsd3;
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-  };
-})
+    passthru = {
+      inherit (runtimeModesBuilds.${mainRuntimeMode})
+        dartSdkVersion
+        isOptimized
+        runtimeMode
+        outName
+        dart
+        swiftshader
+        ;
+    };
+  }
+  // runtimeModesBuilds
+)
diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix
new file mode 100644
index 000000000000..7d79b09e8662
--- /dev/null
+++ b/pkgs/development/compilers/flutter/engine/package.nix
@@ -0,0 +1,390 @@
+{
+  lib,
+  callPackage,
+  fetchurl,
+  bash,
+  symlinkJoin,
+  darwin,
+  clang,
+  tools ? callPackage ./tools.nix {
+    inherit (stdenv)
+      hostPlatform
+      buildPlatform
+      ;
+  },
+  stdenv,
+  dart,
+  fetchgit,
+  llvmPackages,
+  patchelf,
+  gn,
+  openbox,
+  xorg-server,
+  libxxf86vm,
+  libxrender,
+  libxrandr,
+  libxi,
+  libxinerama,
+  libxfixes,
+  libxext,
+  libxcursor,
+  libx11,
+  xorgproto,
+  libxcb,
+  libglvnd,
+  libepoxy,
+  wayland,
+  freetype,
+  pango,
+  glib,
+  harfbuzz,
+  cairo,
+  gdk-pixbuf,
+  at-spi2-atk,
+  zlib,
+  gtk3,
+  pkg-config,
+  ninja,
+  python312,
+  gitMinimal,
+  version,
+  flutterVersion,
+  dartSdkVersion,
+  swiftshaderHash,
+  swiftshaderRev,
+  hashes,
+  patches,
+  url,
+  runtimeMode ? "release",
+  isOptimized ? runtimeMode != "debug",
+}:
+let
+  constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; };
+
+  python3 = python312;
+
+  src = callPackage ./source.nix {
+    inherit
+      flutterVersion
+      version
+      hashes
+      url
+      ;
+    inherit (stdenv)
+      hostPlatform
+      buildPlatform
+      targetPlatform
+      ;
+  };
+
+  swiftshader = fetchgit {
+    url = "https://swiftshader.googlesource.com/SwiftShader.git";
+    hash = swiftshaderHash;
+    rev = swiftshaderRev;
+
+    postFetch = ''
+      rm --recursive --force $out/third_party/llvm-project
+    '';
+  };
+
+  llvm = symlinkJoin {
+    name = "llvm";
+    paths = [
+      clang
+      llvmPackages.llvm
+    ];
+  };
+
+  outName = "host_${runtimeMode}${lib.optionalString (!isOptimized) "_unopt"}";
+
+  dartPath = "flutter/third_party/dart";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "flutter-engine-${runtimeMode}${lib.optionalString (!isOptimized) "-unopt"}";
+  inherit version src patches;
+
+  setOutputFlags = false;
+  doStrip = isOptimized;
+
+  toolchain = symlinkJoin {
+    name = "flutter-engine-toolchain-${version}";
+
+    paths =
+      lib.flatten (
+        map (dep: lib.optionals (lib.isDerivation dep) ([ dep ] ++ map (output: dep.${output}) dep.outputs))
+          (
+            lib.optionals (stdenv.hostPlatform.isLinux) [
+              gtk3
+              wayland
+              libepoxy
+              libglvnd
+              freetype
+              at-spi2-atk
+              glib
+              gdk-pixbuf
+              harfbuzz
+              pango
+              cairo
+              libxcb
+              libx11
+              libxcursor
+              libxrandr
+              libxrender
+              libxinerama
+              libxi
+              libxext
+              libxfixes
+              libxxf86vm
+              xorgproto
+              zlib
+            ]
+            ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+              clang
+              llvm
+            ]
+          )
+      )
+      ++ [
+        stdenv.cc.libc_dev
+        stdenv.cc.libc_lib
+      ];
+
+    # Needed due to Flutter expecting everything to be relative to $out
+    # and not true absolute path (ie relative to "/").
+    postBuild = ''
+      mkdir --parents $(dirname $(dirname "$out/$out"))
+      ln --symbolic $(dirname "$out") $out/$(dirname "$out")
+    '';
+  };
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${finalAttrs.toolchain}/include"
+    "-O2"
+    "-Wno-error"
+    "-Wno-absolute-value"
+    "-Wno-implicit-float-conversion"
+  ]
+  ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE";
+
+  nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    xorg-server
+    openbox
+  ];
+
+  nativeBuildInputs = [
+    (python3.withPackages (
+      ps: with ps; [
+        pyyaml
+      ]
+    ))
+    (tools.vpython python3)
+    gitMinimal
+    pkg-config
+    ninja
+    dart
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [ patchelf ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    darwin.system_cmds
+    darwin.xcode
+    tools.xcode-select
+  ]
+  ++ lib.optionals (stdenv.cc.libc ? bin) [ stdenv.cc.libc.bin ];
+
+  buildInputs = [
+    gtk3
+    libepoxy
+  ]
+  ++ lib.optionals (lib.versionAtLeast flutterVersion "3.41") [
+    at-spi2-atk
+    glib
+  ];
+
+  dontPatch = true;
+
+  env.patchgit = toString [
+    dartPath
+    "flutter"
+    "."
+    "flutter/third_party/skia"
+  ];
+
+  postUnpack =
+    lib.optionalString (lib.versionAtLeast flutterVersion "3.38") ''
+      chmod +w .
+      mkdir --parents bin/internal
+      echo '#!${lib.getExe bash}' > bin/internal/content_aware_hash.sh
+      echo 'echo 1111111111111111111111111111111111111111' >> bin/internal/content_aware_hash.sh
+      chmod +x bin/internal/content_aware_hash.sh
+    ''
+    + ''
+      pushd ${finalAttrs.src.name}
+
+      cp ${
+        fetchurl {
+          url = "https://raw.githubusercontent.com/chromium/chromium/631a813125b886a52274653144019fd1681a0e97/build/config/linux/pkg-config.py";
+          hash = "sha256-9coRpgCewlkFXSGrMVkudaZUll0IFc9jDRBP+2PloOI=";
+        }
+      } src/build/config/linux/pkg-config.py
+
+      cp --preserve=mode,ownership,timestamps --recursive --reflink=auto ${swiftshader} src/flutter/third_party/swiftshader
+      chmod --recursive u+w -- src/flutter/third_party/swiftshader
+
+      ln --symbolic ${llvmPackages.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project
+
+      mkdir --parents src/flutter/buildtools/${constants.alt-platform}
+      ln --symbolic ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang
+
+      mkdir --parents src/buildtools/${constants.alt-platform}
+      ln --symbolic ${llvm} src/buildtools/${constants.alt-platform}/clang
+
+      mkdir --parents src/${dartPath}/tools/sdks
+      ln --symbolic ${dart} src/${dartPath}/tools/sdks/dart-sdk
+
+      mkdir --parents src/flutter/third_party/gn/
+      ln --symbolic --force ${lib.getExe gn} src/flutter/third_party/gn/gn
+
+      for dir in ''${patchgit[@]}; do
+        pushd src/$dir
+        rm --recursive --force .git
+        git init
+        git add .
+        git config user.name "nobody"
+        git config user.email "nobody@local.host"
+        git commit --all --message="$dir" --quiet
+        popd
+      done
+
+      dart src/${dartPath}/tools/generate_package_config.dart
+      echo "${dartSdkVersion}" >src/${dartPath}/sdk/version
+      python3 src/flutter/third_party/dart/tools/generate_sdk_version_file.py
+      rm --recursive --force src/third_party/angle/.git
+      python3 src/flutter/tools/pub_get_offline.py
+
+      pushd src/flutter
+
+      for p in ''${patches[@]}; do
+        patch -p1 -i $p
+      done
+
+      popd
+    ''
+    # error: 'close_range' is missing exception specification 'noexcept(true)'
+    + lib.optionalString (lib.versionAtLeast flutterVersion "3.35") ''
+      substituteInPlace src/flutter/third_party/dart/runtime/bin/process_linux.cc \
+        --replace-fail "(unsigned int first, unsigned int last, int flags)" "(unsigned int first, unsigned int last, int flags) noexcept(true)"
+    ''
+    # src/flutter/third_party/libcxx/include/__type_traits/is_referenceable.h:33:1: error: templates must have C++ linkage
+    + lib.optionalString (lib.versionAtLeast flutterVersion "3.41") ''
+      substituteInPlace src/flutter/shell/platform/linux/fl_view_accessible.cc \
+        --replace-fail "// Workaround missing C code compatibility in ATK header." "#include <glib.h>"
+    ''
+    + ''
+      popd
+    '';
+
+  configureFlags = [
+    "--no-prebuilt-dart-sdk"
+    "--embedder-for-target"
+    "--no-goma"
+    "--no-dart-version-git-info"
+  ]
+  ++ lib.optionals (stdenv.targetPlatform.isx86_64 == false) [
+    "--linux"
+    "--linux-cpu ${constants.alt-arch}"
+  ]
+  ++ lib.optional (!isOptimized) "--unoptimized"
+  ++ lib.optional (runtimeMode == "debug") "--no-stripped"
+  ++ lib.optional finalAttrs.finalPackage.doCheck "--enable-unittests"
+  ++ lib.optional (!finalAttrs.finalPackage.doCheck) "--no-enable-unittests";
+
+  configurePhase = ''
+    runHook preConfigure
+
+    export PYTHONPATH=$src/src/build
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export PATH=${darwin.xcode}/Contents/Developer/usr/bin/:$PATH
+  ''
+  + ''
+    python3 ./src/flutter/tools/gn $configureFlags \
+      --runtime-mode ${runtimeMode} \
+      --out-dir $out \
+      --target-sysroot ${finalAttrs.toolchain} \
+      --target-dir ${outName} \
+      --target-triple ${stdenv.targetPlatform.config} \
+      --enable-fontconfig
+
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    export TERM=dumb
+  ''
+  # ValueError: ZIP does not support timestamps before 1980
+  + ''
+    substituteInPlace src/flutter/build/zip.py \
+      --replace-fail "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED)" "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False)"
+  ''
+  + ''
+    ninja -C $out/out/${outName} -j$NIX_BUILD_CORES
+
+    runHook postBuild
+  '';
+
+  # Tests are broken
+  doCheck = false;
+  checkPhase = ''
+    runHook preCheck
+
+    ln --symbolic $out/out src/out
+    touch src/out/run_tests.log
+    sh src/flutter/testing/run_tests.sh ${outName}
+    rm src/out/run_tests.log
+
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    rm --recursive --force $out/out/${outName}/{obj,exe.unstripped,lib.unstripped,zip_archives}
+    rm $out/out/${outName}/{args.gn,build.ninja,build.ninja.d,compile_commands.json,toolchain.ninja}
+    find $out/out/${outName} -name '*_unittests' -delete
+    find $out/out/${outName} -name '*_benchmarks' -delete
+  ''
+  + lib.optionalString (finalAttrs.finalPackage.doCheck) ''
+    rm $out/out/${outName}/{display_list_rendertests,flutter_tester}
+  ''
+  + ''
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit
+      dartSdkVersion
+      isOptimized
+      runtimeMode
+      outName
+      swiftshader
+      ;
+    dart = callPackage ./dart.nix { engine = finalAttrs.finalPackage; };
+  };
+
+  meta = {
+    # Very broken on Darwin
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "Flutter engine";
+    homepage = "https://flutter.dev";
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
+    license = lib.licenses.bsd3;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+  };
+})
diff --git a/pkgs/development/compilers/flutter/engine/patches/git-revision.patch b/pkgs/development/compilers/flutter/engine/patches/git-revision.patch
deleted file mode 100644
index ad2c22ddf694..000000000000
--- a/pkgs/development/compilers/flutter/engine/patches/git-revision.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/engine/src/flutter/build/git_revision.py
-+++ b/engine/src/flutter/build/git_revision.py
-@@ -22,18 +22,7 @@
-   if not os.path.exists(repository):
-     raise IOError('path does not exist')
- 
--  git = 'git'
--  if is_windows():
--    git = 'git.bat'
--  version = subprocess.check_output([
--      git,
--      '-C',
--      repository,
--      'rev-parse',
--      'HEAD',
--  ])
--
--  return str(version.strip(), 'utf-8')
-+  return '0' * 41
- 
- 
- def main():
---- a/engine/src/flutter/tools/gn
-+++ b/engine/src/flutter/tools/gn
-@@ -286,18 +286,7 @@
-   if not os.path.exists(repository):
-     raise IOError('path does not exist')
- 
--  git = 'git'
--  if sys.platform.startswith(('cygwin', 'win')):
--    git = 'git.bat'
--  version = subprocess.check_output([
--      git,
--      '-C',
--      repository,
--      'rev-parse',
--      'HEAD',
--  ])
--
--  return str(version.strip(), 'utf-8')
-+  return '0' * 41
- 
- 
- def setup_git_versions():
diff --git a/pkgs/development/compilers/flutter/engine/patches/no-vpython.patch b/pkgs/development/compilers/flutter/engine/patches/no-vpython.patch
deleted file mode 100644
index 8b162f653919..000000000000
--- a/pkgs/development/compilers/flutter/engine/patches/no-vpython.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/engine/src/.gn
-+++ b/engine/src/.gn
-@@ -3,7 +3,7 @@
- 
- # Use vpython3 from depot_tools for exec_script() calls.
- # See `gn help dotfile` for details.
--script_executable = "vpython3"
-+script_executable = "python3"
- 
- # The location of the build configuration file.
- buildconfig = "//build/config/BUILDCONFIG.gn"
diff --git a/pkgs/development/compilers/flutter/engine/patches/not-in-git.patch b/pkgs/development/compilers/flutter/engine/patches/not-in-git.patch
deleted file mode 100644
index b67b7b2f6fa9..000000000000
--- a/pkgs/development/compilers/flutter/engine/patches/not-in-git.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/engine/src/flutter/tools/pub_get_offline.py
-+++ b/engine/src/flutter/tools/pub_get_offline.py
-@@ -148,10 +148,6 @@
-       SRC_ROOT, 'flutter', 'third_party', 'dart', 'tools', 'sdks', 'dart-sdk', 'bin'
-   )
- 
--  # Delete all package_config.json files. These may be stale.
--  # Required ones will be regenerated fresh below.
--  delete_config_files()
--
-   # Ensure all relevant packages are listed in ALL_PACKAGES.
-   unlisted = find_unlisted_packages()
-   if len(unlisted) > 0:
diff --git a/pkgs/development/compilers/flutter/engine/patches/shared-libcxx.patch b/pkgs/development/compilers/flutter/engine/patches/shared-libcxx.patch
deleted file mode 100644
index e93ffce50471..000000000000
--- a/pkgs/development/compilers/flutter/engine/patches/shared-libcxx.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/engine/src/flutter/third_party/flatbuffers/include/flatbuffers/util.h
-+++ b/engine/src/flutter/third_party/flatbuffers/include/flatbuffers/util.h
-@@ -202,7 +202,7 @@
- 
- // clang-format off
- // Use locale independent functions {strtod_l, strtof_l, strtoll_l, strtoull_l}.
--#if defined(FLATBUFFERS_LOCALE_INDEPENDENT) && (FLATBUFFERS_LOCALE_INDEPENDENT > 0)
-+#if defined(__GLIBC__) && defined(FLATBUFFERS_LOCALE_INDEPENDENT) && (FLATBUFFERS_LOCALE_INDEPENDENT > 0)
-   class ClassicLocale {
-     #ifdef _MSC_VER
-       typedef _locale_t locale_type;
---- a/engine/src/flutter/third_party/flatbuffers/src/util.cpp
-+++ b/engine/src/flutter/third_party/flatbuffers/src/util.cpp
-@@ -252,7 +252,7 @@
- }
- 
- // Locale-independent code.
--#if defined(FLATBUFFERS_LOCALE_INDEPENDENT) && \
-+#if defined(__GLIBC__) && defined(FLATBUFFERS_LOCALE_INDEPENDENT) && \
-     (FLATBUFFERS_LOCALE_INDEPENDENT > 0)
- 
- // clang-format off
diff --git a/pkgs/development/compilers/flutter/engine/patches/unbundle-engine.patch b/pkgs/development/compilers/flutter/engine/patches/unbundle-engine.patch
deleted file mode 100644
index 1a0077ad5315..000000000000
--- a/pkgs/development/compilers/flutter/engine/patches/unbundle-engine.patch
+++ /dev/null
@@ -1,933 +0,0 @@
-diff --git a/engine/src/build/linux/unbundle/freetype2.gn b/engine/src/build/linux/unbundle/freetype2.gn
-new file mode 100644
-index 0000000..3b8cafb
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/freetype2.gn
-@@ -0,0 +1,35 @@
-+# Copyright 2013 The Flutter Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+config("freetype_config") {
-+  include_dirs = [ "include/freetype-flutter-config" ]
-+
-+  cflags = []
-+
-+  if (is_clang) {
-+    cflags += [
-+      "-Wno-unused-function",
-+      "-Wno-unused-variable",
-+    ]
-+  }
-+}
-+
-+pkg_config("system_freetype2") {
-+  packages = [ "freetype2" ]
-+}
-+
-+source_set("freetype2") {
-+  output_name = "freetype2"
-+  deps = [
-+    "//third_party/libpng",
-+    "//third_party/zlib",
-+  ]
-+  public_configs = [
-+    ":freetype_config",
-+    ":system_freetype2",
-+  ]
-+}
-diff --git a/engine/src/build/linux/unbundle/harfbuzz.gn b/engine/src/build/linux/unbundle/harfbuzz.gn
-new file mode 100644
-index 0000000..72d3e06
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/harfbuzz.gn
-@@ -0,0 +1,31 @@
-+# Copyright 2013 The Flutter Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/linux/pkg_config.gni")
-+
-+pkg_config("system_harfbuzz") {
-+  packages = [ "harfbuzz" ]
-+}
-+
-+pkg_config("system_harfbuzz_subset") {
-+  packages = [ "harfbuzz-subset" ]
-+}
-+
-+source_set("harfbuzz") {
-+  output_name = "harfbuzz"
-+  deps = [
-+    "//third_party/freetype2",
-+    "//third_party/icu:icuuc",
-+  ]
-+  public_configs = [ ":system_harfbuzz" ]
-+}
-+
-+source_set("harfbuzz_subset") {
-+  output_name = "harfbuzz_subset"
-+  deps = [
-+    "//third_party/freetype2",
-+    "//third_party/icu:icuuc",
-+  ]
-+  public_configs = [ ":system_harfbuzz_subset" ]
-+}
-diff --git a/engine/src/build/linux/unbundle/icu.gn b/engine/src/build/linux/unbundle/icu.gn
-new file mode 100644
-index 0000000..9e54d4e
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/icu.gn
-@@ -0,0 +1,264 @@
-+# Copyright 2016 The Chromium Authors
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+group("icu") {
-+  public_deps = [
-+    ":icui18n",
-+    ":icuuc",
-+  ]
-+}
-+
-+config("icu_config") {
-+  defines = [
-+    "USING_SYSTEM_ICU=1",
-+    "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
-+
-+    # U_EXPORT (defined in unicode/platform.h) is used to set public visibility
-+    # on classes through the U_COMMON_API and U_I18N_API macros (among others).
-+    # When linking against the system ICU library, we want its symbols to have
-+    # public LTO visibility. This disables CFI checks for the ICU classes and
-+    # allows whole-program optimization to be applied to the rest of Chromium.
-+    #
-+    # Both U_COMMON_API and U_I18N_API macros would be defined to U_EXPORT only
-+    # when U_COMBINED_IMPLEMENTATION is defined (see unicode/utypes.h). Because
-+    # we override the default system UCHAR_TYPE (char16_t), it is not possible
-+    # to use U_COMBINED_IMPLEMENTATION at this moment, meaning the U_COMMON_API
-+    # and U_I18N_API macros are set to U_IMPORT which is an empty definition.
-+    #
-+    # Until building with UCHAR_TYPE=char16_t is supported, one way to apply
-+    # public visibility (and thus public LTO visibility) to all ICU classes is
-+    # to define U_IMPORT to have the same value as U_EXPORT. For more details,
-+    # please see: https://crbug.com/822820
-+    "U_IMPORT=U_EXPORT",
-+  ]
-+}
-+
-+pkg_config("system_icui18n") {
-+  packages = [ "icu-i18n" ]
-+}
-+
-+pkg_config("system_icuuc") {
-+  packages = [ "icu-uc" ]
-+}
-+
-+source_set("icui18n") {
-+  public_deps = [ ":icui18n_shim" ]
-+  public_configs = [
-+    ":icu_config",
-+    ":system_icui18n",
-+  ]
-+}
-+
-+source_set("icuuc") {
-+  public_deps = [ ":icuuc_shim" ]
-+  public_configs = [
-+    ":icu_config",
-+    ":system_icuuc",
-+  ]
-+}
-+
-+group("icui18n_hidden_visibility") {
-+  public_deps = [ ":icui18n" ]
-+}
-+
-+group("icuuc_hidden_visibility") {
-+  public_deps = [ ":icuuc" ]
-+}
-+
-+shim_headers("icui18n_shim") {
-+  root_path = "source/i18n"
-+  headers = [
-+    # This list can easily be updated using the commands below:
-+    # cd third_party/icu/source/i18n
-+    # find unicode -iname '*.h' -printf '    "%p",\n' | LC_ALL=C sort -u
-+    "unicode/alphaindex.h",
-+    "unicode/basictz.h",
-+    "unicode/calendar.h",
-+    "unicode/choicfmt.h",
-+    "unicode/coleitr.h",
-+    "unicode/coll.h",
-+    "unicode/compactdecimalformat.h",
-+    "unicode/curramt.h",
-+    "unicode/currpinf.h",
-+    "unicode/currunit.h",
-+    "unicode/datefmt.h",
-+    "unicode/dcfmtsym.h",
-+    "unicode/decimfmt.h",
-+    "unicode/dtfmtsym.h",
-+    "unicode/dtitvfmt.h",
-+    "unicode/dtitvinf.h",
-+    "unicode/dtptngen.h",
-+    "unicode/dtrule.h",
-+    "unicode/fieldpos.h",
-+    "unicode/fmtable.h",
-+    "unicode/format.h",
-+    "unicode/fpositer.h",
-+    "unicode/gender.h",
-+    "unicode/gregocal.h",
-+    "unicode/listformatter.h",
-+    "unicode/measfmt.h",
-+    "unicode/measunit.h",
-+    "unicode/measure.h",
-+    "unicode/msgfmt.h",
-+    "unicode/numfmt.h",
-+    "unicode/numsys.h",
-+    "unicode/plurfmt.h",
-+    "unicode/plurrule.h",
-+    "unicode/rbnf.h",
-+    "unicode/rbtz.h",
-+    "unicode/regex.h",
-+    "unicode/region.h",
-+    "unicode/reldatefmt.h",
-+    "unicode/scientificnumberformatter.h",
-+    "unicode/search.h",
-+    "unicode/selfmt.h",
-+    "unicode/simpletz.h",
-+    "unicode/smpdtfmt.h",
-+    "unicode/sortkey.h",
-+    "unicode/stsearch.h",
-+    "unicode/tblcoll.h",
-+    "unicode/timezone.h",
-+    "unicode/tmunit.h",
-+    "unicode/tmutamt.h",
-+    "unicode/tmutfmt.h",
-+    "unicode/translit.h",
-+    "unicode/tzfmt.h",
-+    "unicode/tznames.h",
-+    "unicode/tzrule.h",
-+    "unicode/tztrans.h",
-+    "unicode/ucal.h",
-+    "unicode/ucol.h",
-+    "unicode/ucoleitr.h",
-+    "unicode/ucsdet.h",
-+    "unicode/udat.h",
-+    "unicode/udateintervalformat.h",
-+    "unicode/udatpg.h",
-+    "unicode/ufieldpositer.h",
-+    "unicode/uformattable.h",
-+    "unicode/ugender.h",
-+    "unicode/ulocdata.h",
-+    "unicode/umsg.h",
-+    "unicode/unirepl.h",
-+    "unicode/unum.h",
-+    "unicode/unumsys.h",
-+    "unicode/upluralrules.h",
-+    "unicode/uregex.h",
-+    "unicode/uregion.h",
-+    "unicode/ureldatefmt.h",
-+    "unicode/usearch.h",
-+    "unicode/uspoof.h",
-+    "unicode/utmscale.h",
-+    "unicode/utrans.h",
-+    "unicode/vtzone.h",
-+  ]
-+  additional_includes = [ "flutter" ]
-+}
-+
-+shim_headers("icuuc_shim") {
-+  root_path = "source/common"
-+  headers = [
-+    # This list can easily be updated using the commands below:
-+    # cd third_party/icu/source/common
-+    # find unicode -iname '*.h' -printf '    "%p",\n' | LC_ALL=C sort -u
-+    "unicode/appendable.h",
-+    "unicode/brkiter.h",
-+    "unicode/bytestream.h",
-+    "unicode/bytestrie.h",
-+    "unicode/bytestriebuilder.h",
-+    "unicode/caniter.h",
-+    "unicode/casemap.h",
-+    "unicode/char16ptr.h",
-+    "unicode/chariter.h",
-+    "unicode/dbbi.h",
-+    "unicode/docmain.h",
-+    "unicode/dtintrv.h",
-+    "unicode/edits.h",
-+    "unicode/enumset.h",
-+    "unicode/errorcode.h",
-+    "unicode/filteredbrk.h",
-+    "unicode/icudataver.h",
-+    "unicode/icuplug.h",
-+    "unicode/idna.h",
-+    "unicode/localematcher.h",
-+    "unicode/localpointer.h",
-+    "unicode/locdspnm.h",
-+    "unicode/locid.h",
-+    "unicode/messagepattern.h",
-+    "unicode/normalizer2.h",
-+    "unicode/normlzr.h",
-+    "unicode/parseerr.h",
-+    "unicode/parsepos.h",
-+    "unicode/platform.h",
-+    "unicode/ptypes.h",
-+    "unicode/putil.h",
-+    "unicode/rbbi.h",
-+    "unicode/rep.h",
-+    "unicode/resbund.h",
-+    "unicode/schriter.h",
-+    "unicode/simpleformatter.h",
-+    "unicode/std_string.h",
-+    "unicode/strenum.h",
-+    "unicode/stringpiece.h",
-+    "unicode/stringtriebuilder.h",
-+    "unicode/symtable.h",
-+    "unicode/ubidi.h",
-+    "unicode/ubiditransform.h",
-+    "unicode/ubrk.h",
-+    "unicode/ucasemap.h",
-+    "unicode/ucat.h",
-+    "unicode/uchar.h",
-+    "unicode/ucharstrie.h",
-+    "unicode/ucharstriebuilder.h",
-+    "unicode/uchriter.h",
-+    "unicode/uclean.h",
-+    "unicode/ucnv.h",
-+    "unicode/ucnv_cb.h",
-+    "unicode/ucnv_err.h",
-+    "unicode/ucnvsel.h",
-+    "unicode/uconfig.h",
-+    "unicode/ucurr.h",
-+    "unicode/udata.h",
-+    "unicode/udisplaycontext.h",
-+    "unicode/uenum.h",
-+    "unicode/uidna.h",
-+    "unicode/uiter.h",
-+    "unicode/uldnames.h",
-+    "unicode/ulistformatter.h",
-+    "unicode/uloc.h",
-+    "unicode/umachine.h",
-+    "unicode/umisc.h",
-+    "unicode/unifilt.h",
-+    "unicode/unifunct.h",
-+    "unicode/unimatch.h",
-+    "unicode/uniset.h",
-+    "unicode/unistr.h",
-+    "unicode/unorm.h",
-+    "unicode/unorm2.h",
-+    "unicode/uobject.h",
-+    "unicode/urename.h",
-+    "unicode/urep.h",
-+    "unicode/ures.h",
-+    "unicode/uscript.h",
-+    "unicode/uset.h",
-+    "unicode/usetiter.h",
-+    "unicode/ushape.h",
-+    "unicode/usprep.h",
-+    "unicode/ustring.h",
-+    "unicode/ustringtrie.h",
-+    "unicode/utext.h",
-+    "unicode/utf.h",
-+    "unicode/utf16.h",
-+    "unicode/utf32.h",
-+    "unicode/utf8.h",
-+    "unicode/utf_old.h",
-+    "unicode/utrace.h",
-+    "unicode/utypes.h",
-+    "unicode/uvernum.h",
-+    "unicode/uversion.h",
-+  ]
-+  additional_includes = [ "flutter" ]
-+}
-diff --git a/engine/src/build/linux/unbundle/libjpeg-turbo.gn b/engine/src/build/linux/unbundle/libjpeg-turbo.gn
-new file mode 100644
-index 0000000..be0c674
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/libjpeg-turbo.gn
-@@ -0,0 +1,11 @@
-+# Copyright 2013 The Flutter Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+config("libjpeg_config") {
-+  libs = [ "jpeg" ]
-+}
-+
-+group("libjpeg") {
-+  public_configs = [ ":libjpeg_config" ]
-+}
-diff --git a/engine/src/build/linux/unbundle/libpng.gn b/engine/src/build/linux/unbundle/libpng.gn
-new file mode 100644
-index 0000000..91e0ee4
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/libpng.gn
-@@ -0,0 +1,23 @@
-+# Copyright 2016 The Chromium Authors
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("libpng_config") {
-+  packages = [ "libpng" ]
-+}
-+
-+shim_headers("libpng_shim") {
-+  root_path = "."
-+  headers = [
-+    "png.h",
-+    "pngconf.h",
-+  ]
-+}
-+
-+source_set("libpng") {
-+  deps = [ ":libpng_shim" ]
-+  public_configs = [ ":libpng_config" ]
-+}
-diff --git a/engine/src/build/linux/unbundle/libwebp.gn b/engine/src/build/linux/unbundle/libwebp.gn
-new file mode 100644
-index 0000000..708cc9c
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/libwebp.gn
-@@ -0,0 +1,35 @@
-+# Copyright 2016 The Chromium Authors
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("system_libwebp") {
-+  packages = [
-+    "libwebp",
-+    "libwebpdemux",
-+    "libwebpmux",
-+  ]
-+}
-+
-+shim_headers("libwebp_shim") {
-+  root_path = "src/src"
-+  headers = [
-+    "webp/decode.h",
-+    "webp/demux.h",
-+    "webp/encode.h",
-+    "webp/mux.h",
-+    "webp/mux_types.h",
-+    "webp/types.h",
-+  ]
-+}
-+
-+source_set("libwebp_webp") {
-+  deps = [ ":libwebp_shim" ]
-+  public_configs = [ ":system_libwebp" ]
-+}
-+
-+group("libwebp") {
-+  deps = [ ":libwebp_webp" ]
-+}
-diff --git a/engine/src/build/linux/unbundle/libxml.gn b/engine/src/build/linux/unbundle/libxml.gn
-new file mode 100644
-index 0000000..b42d044
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/libxml.gn
-@@ -0,0 +1,13 @@
-+# Copyright 2016 The Chromium Authors
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/linux/pkg_config.gni")
-+
-+pkg_config("system_libxml") {
-+  packages = [ "libxml-2.0" ]
-+}
-+
-+source_set("libxml") {
-+  public_configs = [ ":system_libxml" ]
-+}
-diff --git a/engine/src/build/linux/unbundle/replace_gn_files.py b/engine/src/build/linux/unbundle/replace_gn_files.py
-new file mode 100755
-index 0000000..b8b24c6
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/replace_gn_files.py
-@@ -0,0 +1,101 @@
-+#!/usr/bin/env python3
-+# Copyright 2016 The Chromium Authors
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+"""
-+Replaces GN files in tree with files from here that
-+make the build use system libraries.
-+"""
-+
-+import argparse
-+import os
-+import shutil
-+import sys
-+
-+
-+REPLACEMENTS = {
-+  # Use system libabsl_2xxx. These 18 shims MUST be used together.
-+  'absl_algorithm': 'flutter/third_party/abseil-cpp/absl/algorithm/BUILD.gn',
-+  'absl_base': 'flutter/third_party/abseil-cpp/absl/base/BUILD.gn',
-+  'absl_cleanup': 'flutter/third_party/abseil-cpp/absl/cleanup/BUILD.gn',
-+  'absl_container': 'flutter/third_party/abseil-cpp/absl/container/BUILD.gn',
-+  'absl_debugging': 'flutter/third_party/abseil-cpp/absl/debugging/BUILD.gn',
-+  'absl_flags': 'flutter/third_party/abseil-cpp/absl/flags/BUILD.gn',
-+  'absl_functional': 'flutter/third_party/abseil-cpp/absl/functional/BUILD.gn',
-+  'absl_hash': 'flutter/third_party/abseil-cpp/absl/hash/BUILD.gn',
-+  'absl_memory': 'flutter/third_party/abseil-cpp/absl/memory/BUILD.gn',
-+  'absl_meta': 'flutter/third_party/abseil-cpp/absl/meta/BUILD.gn',
-+  'absl_numeric': 'flutter/third_party/abseil-cpp/absl/numeric/BUILD.gn',
-+  'absl_random': 'flutter/third_party/abseil-cpp/absl/random/BUILD.gn',
-+  'absl_status': 'flutter/third_party/abseil-cpp/absl/status/BUILD.gn',
-+  'absl_strings': 'flutter/third_party/abseil-cpp/absl/strings/BUILD.gn',
-+  'absl_synchronization': 'flutter/third_party/abseil-cpp/absl/synchronization/BUILD.gn',
-+  'absl_time': 'flutter/third_party/abseil-cpp/absl/time/BUILD.gn',
-+  'absl_types': 'flutter/third_party/abseil-cpp/absl/types/BUILD.gn',
-+  'absl_utility': 'flutter/third_party/abseil-cpp/absl/utility/BUILD.gn',
-+  #
-+  'fontconfig': 'third_party/fontconfig/BUILD.gn',
-+  'freetype2': 'flutter/third_party/freetype2/BUILD.gn',
-+  'harfbuzz': 'flutter/build/secondary/flutter/third_party/harfbuzz/BUILD.gn',
-+  'icu': 'flutter/third_party/icu/BUILD.gn',
-+  'libjpeg-turbo': 'flutter/third_party/libjpeg-turbo/BUILD.gn',
-+  'libpng': 'flutter/third_party/libpng/BUILD.gn',
-+  'libwebp': 'flutter/build/secondary/flutter/third_party/libwebp/BUILD.gn',
-+  'libxml': 'third_party/libxml/BUILD.gn',
-+  'libXNVCtrl': 'flutter/third_party/angle/src/third_party/libXNVCtrl/BUILD.gn',
-+  'sqlite': 'flutter/third_party/sqlite/BUILD.gn',
-+  # Use system libSPIRV-Tools in Swiftshader. These two shims MUST be used together.
-+  'swiftshader-SPIRV-Headers': 'flutter/third_party/swiftshader/third_party/SPIRV-Headers/BUILD.gn',
-+  'swiftshader-SPIRV-Tools': 'flutter/third_party/swiftshader/third_party/SPIRV-Tools/BUILD.gn',
-+  # Use system libSPIRV-Tools inside ANGLE. These two shims MUST be used together
-+  # and can only be used if WebGPU is not compiled (use_dawn=false)
-+  'vulkan-SPIRV-Headers': 'flutter/third_party/vulkan-deps/spirv-headers/src/BUILD.gn',
-+  'vulkan-SPIRV-Tools': 'flutter/third_party/vulkan-deps/spirv-tools/src/BUILD.gn',
-+  #
-+  'zlib': 'flutter/third_party/zlib/BUILD.gn',
-+}
-+
-+
-+def DoMain(argv):
-+  my_dirname = os.path.dirname(__file__)
-+  source_tree_root = os.path.abspath(
-+    os.path.join(my_dirname, '..', '..', '..'))
-+
-+  parser = argparse.ArgumentParser()
-+  parser.add_argument('--system-libraries', nargs='*', default=[])
-+  parser.add_argument('--undo', action='store_true')
-+
-+  args = parser.parse_args(argv)
-+
-+  handled_libraries = set()
-+  for lib, path in REPLACEMENTS.items():
-+    if lib not in args.system_libraries:
-+      continue
-+    handled_libraries.add(lib)
-+
-+    if args.undo:
-+      # Restore original file, and also remove the backup.
-+      # This is meant to restore the source tree to its original state.
-+      os.rename(os.path.join(source_tree_root, path + '.bak'),
-+                os.path.join(source_tree_root, path))
-+    else:
-+      # Create a backup copy for --undo.
-+      shutil.copyfile(os.path.join(source_tree_root, path),
-+                      os.path.join(source_tree_root, path + '.bak'))
-+
-+      # Copy the GN file from directory of this script to target path.
-+      shutil.copyfile(os.path.join(my_dirname, '%s.gn' % lib),
-+                      os.path.join(source_tree_root, path))
-+
-+  unhandled_libraries = set(args.system_libraries) - handled_libraries
-+  if unhandled_libraries:
-+    print('Unrecognized system libraries requested: %s' % ', '.join(
-+        sorted(unhandled_libraries)), file=sys.stderr)
-+    return 1
-+
-+  return 0
-+
-+
-+if __name__ == '__main__':
-+  sys.exit(DoMain(sys.argv[1:]))
-diff --git a/engine/src/build/linux/unbundle/sqlite.gn b/engine/src/build/linux/unbundle/sqlite.gn
-new file mode 100644
-index 0000000..e6c653d
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/sqlite.gn
-@@ -0,0 +1,20 @@
-+# Copyright 2013 The Flutter Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("system_sqlite") {
-+  packages = [ "sqlite3" ]
-+}
-+
-+shim_headers("sqlite_shim") {
-+  root_path = "//third_party/sqlite"
-+  headers = [ "sqlite3.h" ]
-+}
-+
-+source_set("sqlite") {
-+  public_deps = [ ":sqlite_shim" ]
-+  public_configs = [ ":system_sqlite" ]
-+}
-diff --git a/engine/src/build/linux/unbundle/zlib.gn b/engine/src/build/linux/unbundle/zlib.gn
-new file mode 100644
-index 0000000..6daf3c6
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/zlib.gn
-@@ -0,0 +1,72 @@
-+# Copyright 2016 The Chromium Authors
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/shim_headers.gni")
-+
-+declare_args() {
-+  use_zlib_ng = false
-+}
-+
-+if (use_zlib_ng) {
-+  _suffix = "-ng"
-+} else {
-+  _suffix = ""
-+}
-+
-+shim_headers("zlib_shim") {
-+  root_path = "."
-+  headers = [ "zlib.h%zlib$_suffix.h" ]
-+  additional_includes = [ "flutter", "flutter/third_party" ]
-+}
-+
-+config("system_zlib") {
-+  defines = [ "USE_SYSTEM_ZLIB=1" ]
-+}
-+
-+config("zlib_config") {
-+  configs = [ ":system_zlib" ]
-+}
-+
-+source_set("zlib") {
-+  public_deps = [ ":zlib_shim" ]
-+  libs = [ "z$_suffix" ]
-+  public_configs = [ ":system_zlib" ]
-+}
-+
-+shim_headers("minizip_shim") {
-+  root_path = "contrib"
-+  headers = [
-+    "minizip/crypt.h",
-+    "minizip/ioapi.h",
-+    "minizip/iowin32.h",
-+    "minizip/mztools.h",
-+    "minizip/unzip.h",
-+    "minizip/zip.h",
-+  ]
-+}
-+
-+source_set("minizip") {
-+  deps = [ ":minizip_shim" ]
-+  libs = [ "minizip" ]
-+}
-+
-+static_library("zip") {
-+  sources = [
-+    "google/zip.cc",
-+    "google/zip.h",
-+    "google/zip_internal.cc",
-+    "google/zip_internal.h",
-+    "google/zip_reader.cc",
-+    "google/zip_reader.h",
-+  ]
-+  deps = [ ":minizip" ]
-+}
-+
-+static_library("compression_utils") {
-+  sources = [
-+    "google/compression_utils.cc",
-+    "google/compression_utils.h",
-+  ]
-+  deps = [ ":zlib" ]
-+}
-diff --git a/engine/src/build/shim_headers.gni b/engine/src/build/shim_headers.gni
-new file mode 100644
-index 0000000..1d24e0a
---- /dev/null
-+++ b/engine/src/build/shim_headers.gni
-@@ -0,0 +1,42 @@
-+# Copyright 2016 The Chromium Authors
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+template("shim_headers") {
-+  action_name = "gen_${target_name}"
-+  config_name = "${target_name}_config"
-+  shim_headers_path = "${root_gen_dir}/shim_headers/${target_name}"
-+  config(config_name) {
-+    include_dirs = [ shim_headers_path ]
-+    if (defined(invoker.additional_includes)) {
-+      foreach(i, invoker.additional_includes) {
-+        include_dirs += [ shim_headers_path + "/" + i ]
-+      }
-+    }
-+  }
-+  action(action_name) {
-+    script = "//tools/generate_shim_headers.py"
-+    args = [
-+      "--generate",
-+      "--headers-root",
-+      rebase_path(invoker.root_path),
-+      "--output-directory",
-+      rebase_path(shim_headers_path),
-+    ]
-+    if (defined(invoker.prefix)) {
-+      args += [
-+        "--prefix",
-+        invoker.prefix,
-+      ]
-+    }
-+    args += invoker.headers
-+    outputs = []
-+    foreach(h, invoker.headers) {
-+      outputs += [ shim_headers_path + "/" +
-+                   rebase_path(invoker.root_path, "//") + "/" + h ]
-+    }
-+  }
-+  group(target_name) {
-+    public_deps = [ ":${action_name}" ]
-+    all_dependent_configs = [ ":${config_name}" ]
-+  }
-+}
-diff --git a/engine/src/tools/generate_shim_headers.py b/engine/src/tools/generate_shim_headers.py
-new file mode 100644
-index 0000000..aaa16f8
---- /dev/null
-+++ b/engine/src/tools/generate_shim_headers.py
-@@ -0,0 +1,116 @@
-+#!/usr/bin/env python
-+# Copyright 2012 The Chromium Authors
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+"""
-+Generates shim headers that mirror the directory structure of bundled headers,
-+but just forward to the system ones.
-+
-+This allows seamless compilation against system headers with no changes
-+to our source code.
-+"""
-+
-+
-+import optparse
-+import os.path
-+import sys
-+
-+
-+SHIM_TEMPLATE = """
-+#if defined(OFFICIAL_BUILD)
-+#error shim headers must not be used in official builds!
-+#endif
-+"""
-+
-+
-+def GeneratorMain(argv):
-+  parser = optparse.OptionParser()
-+  parser.add_option('--headers-root', action='append')
-+  parser.add_option('--define', action='append')
-+  parser.add_option('--output-directory')
-+  parser.add_option('--prefix', default='')
-+  parser.add_option('--use-include-next', action='store_true')
-+  parser.add_option('--outputs', action='store_true')
-+  parser.add_option('--generate', action='store_true')
-+
-+  options, args = parser.parse_args(argv)
-+
-+  if not options.headers_root:
-+    parser.error('Missing --headers-root parameter.')
-+  if not options.output_directory:
-+    parser.error('Missing --output-directory parameter.')
-+  if not args:
-+    parser.error('Missing arguments - header file names.')
-+
-+  source_tree_root = os.path.abspath(
-+    os.path.join(os.path.dirname(__file__), '..'))
-+
-+  for root in options.headers_root:
-+    target_directory = os.path.join(
-+      options.output_directory,
-+      os.path.relpath(root, source_tree_root))
-+    if options.generate and not os.path.exists(target_directory):
-+      os.makedirs(target_directory)
-+
-+    for header_spec in args:
-+      if ';' in header_spec:
-+        (header_filename,
-+         include_before,
-+         include_after) = header_spec.split(';', 2)
-+      else:
-+        header_filename = header_spec
-+        include_before = ''
-+        include_after = ''
-+      if '%' in header_filename:
-+        (header_filename,
-+         upstream_header_filename) = header_filename.split('%', 1)
-+      else:
-+        upstream_header_filename = header_filename
-+      if options.outputs:
-+        yield os.path.join(target_directory, header_filename)
-+      if options.generate:
-+        header_path = os.path.join(target_directory, header_filename)
-+        header_dir = os.path.dirname(header_path)
-+        if not os.path.exists(header_dir):
-+          os.makedirs(header_dir)
-+        with open(header_path, 'w') as f:
-+          f.write(SHIM_TEMPLATE)
-+
-+          if options.define:
-+            for define in options.define:
-+              key, value = define.split('=', 1)
-+              # This non-standard push_macro extension is supported
-+              # by compilers we support (GCC, clang).
-+              f.write('#pragma push_macro("%s")\n' % key)
-+              f.write('#undef %s\n' % key)
-+              f.write('#define %s %s\n' % (key, value))
-+
-+          if include_before:
-+            for header in include_before.split(':'):
-+              f.write('#include %s\n' % header)
-+
-+          include_target = options.prefix + upstream_header_filename
-+          if options.use_include_next:
-+            f.write('#include_next <%s>\n' % include_target)
-+          else:
-+            f.write('#include <%s>\n' % include_target)
-+
-+          if include_after:
-+            for header in include_after.split(':'):
-+              f.write('#include %s\n' % header)
-+
-+          if options.define:
-+            for define in options.define:
-+              key, value = define.split('=', 1)
-+              # This non-standard pop_macro extension is supported
-+              # by compilers we support (GCC, clang).
-+              f.write('#pragma pop_macro("%s")\n' % key)
-+
-+
-+def DoMain(argv):
-+  return '\n'.join(GeneratorMain(argv))
-+
-+
-+if __name__ == '__main__':
-+  DoMain(sys.argv[1:])
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/vulkan-SPIRV-Headers.gn
-@@ -0,0 +1,19 @@
-+# This shim can only be used if you build Chromium without DAWN
-+
-+import("//build/shim_headers.gni")
-+
-+shim_headers("vulkan-SPIRV-Headers_shim") {
-+  root_path = "include"
-+  headers = [
-+    "spirv/unified1/GLSL.std.450.h",
-+    "spirv/unified1/NonSemanticClspvReflection.h",
-+    "spirv/unified1/NonSemanticDebugPrintf.h",
-+    "spirv/unified1/OpenCL.std.h",
-+    "spirv/unified1/spirv.h",
-+    "spirv/unified1/spirv.hpp",
-+  ]
-+}
-+
-+source_set("spv_headers") {
-+  deps = [ ":vulkan-SPIRV-Headers_shim" ]
-+}
---- /dev/null
-+++ b/engine/src/build/linux/unbundle/vulkan-SPIRV-Tools.gn
-@@ -0,0 +1,73 @@
-+# This shim can only be used if you build Chromium without DAWN
-+
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("spvtools_internal_config") {
-+  packages = [ "SPIRV-Tools" ]
-+}
-+
-+shim_headers("vulkan-SPIRV-Tools_shim") {
-+  root_path = "include"
-+  headers = [
-+    "spirv-tools/instrument.hpp",
-+    "spirv-tools/libspirv.h",
-+    "spirv-tools/libspirv.hpp",
-+    "spirv-tools/linker.hpp",
-+    "spirv-tools/optimizer.hpp",
-+  ]
-+}
-+
-+source_set("SPIRV-Tools") {
-+  deps = [ ":vulkan-SPIRV-Tools_shim" ]
-+  public_configs = [ ":spvtools_internal_config" ]
-+}
-+
-+source_set("spvtools") {
-+  deps = [ ":vulkan-SPIRV-Tools_shim" ]
-+  public_configs = [ ":spvtools_internal_config" ]
-+}
-+
-+source_set("spvtools_core_enums_unified1") {
-+  deps = [ ":vulkan-SPIRV-Tools_shim" ]
-+  public_configs = [ ":spvtools_internal_config" ]
-+}
-+
-+source_set("spvtools_core_tables_unified1") {
-+  deps = [ ":vulkan-SPIRV-Tools_shim" ]
-+  public_configs = [ ":spvtools_internal_config" ]
-+}
-+
-+source_set("spvtools_headers") {
-+  deps = [ ":vulkan-SPIRV-Tools_shim" ]
-+  public_configs = [ ":spvtools_internal_config" ]
-+}
-+
-+source_set("spvtools_language_header_cldebuginfo100") {
-+  deps = [ ":vulkan-SPIRV-Tools_shim" ]
-+  public_configs = [ ":spvtools_internal_config" ]
-+}
-+
-+source_set("spvtools_language_header_debuginfo") {
-+  deps = [ ":vulkan-SPIRV-Tools_shim" ]
-+  public_configs = [ ":spvtools_internal_config" ]
-+}
-+
-+source_set("spvtools_language_header_vkdebuginfo100") {
-+  deps = [ ":vulkan-SPIRV-Tools_shim" ]
-+  public_configs = [ ":spvtools_internal_config" ]
-+}
-+
-+source_set("spvtools_opt") {
-+  deps = [ ":vulkan-SPIRV-Tools_shim" ]
-+  public_configs = [ ":spvtools_internal_config" ]
-+}
-+
-+config("spvtools_public_config") {
-+  configs = [ ":spvtools_internal_config" ]
-+}
-+
-+source_set("spvtools_val") {
-+  deps = [ ":vulkan-SPIRV-Tools_shim" ]
-+  public_configs = [ ":spvtools_internal_config" ]
-+}
diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix
index 81fe84f21225..e95828c0b8ab 100644
--- a/pkgs/development/compilers/flutter/engine/source.nix
+++ b/pkgs/development/compilers/flutter/engine/source.nix
@@ -1,60 +1,73 @@
 {
+  lib,
+  callPackage,
   curlMinimal,
+  pkg-config,
   gitMinimal,
   python312,
-  depot_tools,
   runCommand,
   writeText,
   cacert,
+  flutterVersion,
   version,
-  engineHash ? "",
-  cipd,
-  writableTmpDirAsHomeHook,
-}:
-
+  hashes,
+  url,
+  hostPlatform,
+  targetPlatform,
+  buildPlatform,
+  ...
+}@pkgs:
 let
-  gclient = writeText ".gclient" ''
-    solutions = [
-      {
-        "name": ".",
-        "url": "https://github.com/flutter/flutter.git@${version}",
-        "managed": False,
-        "custom_vars": {
-          "download_dart_sdk": False,
-          "download_esbuild": False,
-          "download_android_deps": False,
-          "download_jdk": False,
-          "download_linux_deps": False,
-          "download_windows_deps": False,
-          "download_fuchsia_deps": False,
-          "checkout_llvm": False,
-          "setup_githooks": False,
-          "release_candidate": True,
-        },
-      }
-    ]
-    target_os = [ "linux" ]
-    target_cpu = [ "x64", "arm64", "riscv64" ]
+  target-constants = callPackage ./constants.nix { platform = targetPlatform; };
+  build-constants = callPackage ./constants.nix { platform = buildPlatform; };
+  tools = pkgs.tools or (callPackage ./tools.nix { inherit hostPlatform buildPlatform; });
+
+  boolOption = value: if value then "True" else "False";
+
+  gclient = writeText "flutter-${version}.gclient" ''
+    solutions = [{
+      "managed": False,
+      "name": ".",
+      "url": "${url}",
+      "custom_vars": {
+        "download_fuchsia_deps": False,
+        "download_android_deps": False,
+        "download_linux_deps": ${boolOption targetPlatform.isLinux},
+        "setup_githooks": False,
+        "download_esbuild": False,
+        "download_dart_sdk": True,
+        "host_cpu": "${build-constants.alt-arch}",
+        "host_os": "${build-constants.alt-os}",
+      },
+    }]
+
     target_os_only = True
+    target_os = [
+      "${target-constants.alt-os}"
+    ]
+
     target_cpu_only = True
+    target_cpu = [
+      "${target-constants.alt-arch}"
+    ]
   '';
 in
-runCommand "flutter-engine-source-${version}"
+runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPlatform.system}"
   {
     pname = "flutter-engine-source";
     inherit version;
 
     nativeBuildInputs = [
       curlMinimal
+      pkg-config
       gitMinimal
-      cipd
+      tools.cipd
       (python312.withPackages (
         ps: with ps; [
           httplib2
           six
         ]
       ))
-      writableTmpDirAsHomeHook
     ];
 
     env = {
@@ -68,26 +81,23 @@ runCommand "flutter-engine-source-${version}"
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = engineHash;
+    outputHash =
+      (hashes."${buildPlatform.system}" or { })."${targetPlatform.system}"
+        or (throw "Hash not set for ${targetPlatform.system} on ${buildPlatform.system}");
   }
   ''
-    mkdir --parents source
-    cd source
-    cp ${gclient} .gclient
-    export PATH=$PATH:${depot_tools}
-    python3 ${depot_tools}/gclient.py sync --no-history --shallow --nohooks --jobs=$NIX_BUILD_CORES
-    rm --recursive --force engine/src/flutter/buildtools engine/src/flutter/third_party/dart/tools/sdks/dart-sdk engine/src/flutter/third_party/gn third_party/ninja
-    rm --recursive --force engine/src/flutter/third_party/swiftshader/.git
-    rm --recursive --force engine/src/flutter/third_party/swiftshader/tests
-    rm --recursive --force engine/src/flutter/third_party/swiftshader/docs
-    rm --recursive --force engine/src/flutter/third_party/swiftshader/infra
-    rm --recursive --force engine/src/flutter/third_party/swiftshader/.vscode
-    rm --recursive --force engine/src/flutter/third_party/swiftshader/llvm-16.0
-    rm --recursive --force engine/src/flutter/third_party/swiftshader/llvm-10.0
-    rm --recursive --force engine/src/flutter/third_party/llvm-project
-    find engine/src/flutter/third_party/swiftshader/third_party -type d \( -name "test" -o -name "tests" -o -name "unittests" \) -prune -exec rm --recursive --force {} +
-    find engine/src/flutter/third_party/swiftshader -type f \( -name "*.o" -o -name "*.a" -o -name "*.so" \) -delete
-    find . -type d \( -name ".git" -o -name ".cipd" \) -prune -exec rm --recursive --force {} +
-    find . -type f -name ".gclient*" -delete
-    cp --recursive . $out
+    source ${../../../../build-support/fetchgit/deterministic-git}
+    export -f clean_git
+    export -f make_deterministic_repo
+
+    mkdir --parents flutter
+    cp ${gclient} flutter/.gclient
+    cd flutter
+    export PATH=$PATH:${tools.depot_tools}
+    python3 ${tools.depot_tools}/gclient.py sync --no-history --shallow --nohooks -j $NIX_BUILD_CORES
+    mv engine $out
+
+    find $out -name '.git' -exec rm --recursive --force {} \; || true
+
+    rm --recursive $out/src/flutter/{buildtools,prebuilts,third_party/swiftshader,third_party/gn/.versions,third_party/dart/tools/sdks/dart-sdk}
   ''
diff --git a/pkgs/development/compilers/flutter/engine/tools.nix b/pkgs/development/compilers/flutter/engine/tools.nix
new file mode 100644
index 000000000000..fcc841eaae47
--- /dev/null
+++ b/pkgs/development/compilers/flutter/engine/tools.nix
@@ -0,0 +1,103 @@
+{
+  stdenv,
+  buildPlatform,
+  hostPlatform,
+  callPackage,
+  fetchgit,
+  fetchurl,
+  writeText,
+  runCommand,
+  darwin,
+  writeShellScriptBin,
+  depot_toolsCommit ? "580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7",
+  depot_toolsHash ? "sha256-k+XQSYJQYc9vAUjwrRxaAlX/sK74W45m5byS31hSpwc=",
+  cipdCommit ? "7120a6a515089a3ff5d1f61ff4ee17750dc038af",
+  cipdHashes ? {
+    "linux-386" = "sha256-CshLfw49uglvWNwWE4K7ucBUF+IZlXDaIQsTXtFEJ8U=";
+    "linux-amd64" = "sha256-rxpI+HqfZiOYvzyyQ9P93s70feDmrLgbm4Xh3o88LwQ=";
+    "linux-arm64" = "sha256-XTTKbw1Q2lin+pf7VADalpBy3AWMTEd7yItsE/pePxw=";
+    "linux-armv6l" = "sha256-e5qe2KcguRLPuAq6wOG7A3YghHHon+oHY3fRLhU+e9E=";
+    "linux-loong64" = "sha256-LPTK4Ly173jac+cSGrsWw0ajrWEYepeJDGtP/7Xh528=";
+    "linux-mips" = "sha256-nR5khvHbAijs0MEr8+UgbuHTRNQAsMOyGTU/DI3K5Os=";
+    "linux-mips64" = "sha256-4a/zD1CrC/sxtBHqSRpom0SYVoN38bz3FAM40OSdVI0=";
+    "linux-mips64le" = "sha256-JnfKuBGLHYNLnRieS0KV8sYaTjh2rbp1yijvNOrU0FE=";
+    "linux-mipsle" = "sha256-nWqoay8c4faRk2+G5TvwbsbnndjTU4oglOTfhSC+TLQ=";
+    "linux-ppc64" = "sha256-pjeI/bx0i+QchQLhNB88ACPI34SrFvvFA01F5Nb16Ys=";
+    "linux-ppc64le" = "sha256-ZDMDwrP1zYlOI1hdbd3iZwKr59v/8CWj2sZ1RdosAiE=";
+    "linux-riscv64" = "sha256-O2EvOnjwbNssB7FtbK44yFcXfkrh9HOsPs/HF+uD2m8=";
+    "linux-s390x" = "sha256-BKeNDtuc9IkmV4GpuZcdsGc2F039KQeLdozxh7u+FDw=";
+    "macos-amd64" = "sha256-ZKBm8PbKjg4t0jIBPRKAv85L8eZOwJ1wBvh3cRSqHOI=";
+    "macos-arm64" = "sha256-AvjJp7JF05CetYDnwNJneAsotm1vBHWqB/vCdcIohoU=";
+    "windows-386" = "sha256-AVLbWh+WtJKynFDS6IfhuvYudw4Ow9s6w2JyDWG/2CI=";
+    "windows-amd64" = "sha256-puAQhiPGuwzkElWiBdTRGWOaUR2AIP7Qv9S3pwEY74E=";
+    "windows-arm64" = "sha256-4wxOMG+zvkM7gjhAiQvvNqNS0AamKKJdaBM/+rRxgXk=";
+  },
+}:
+let
+  constants = callPackage ./constants.nix { platform = buildPlatform; };
+  host-constants = callPackage ./constants.nix { platform = hostPlatform; };
+  stdenv-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; };
+in
+{
+  depot_tools = fetchgit {
+    url = "https://chromium.googlesource.com/chromium/tools/depot_tools.git";
+    rev = depot_toolsCommit;
+    hash = depot_toolsHash;
+  };
+
+  cipd =
+    let
+      unwrapped =
+        runCommand "cipd-${cipdCommit}"
+          {
+            src = fetchurl {
+              name = "cipd-${cipdCommit}-unwrapped";
+              url = "https://chrome-infra-packages.appspot.com/client?platform=${stdenv-constants.platform}&version=git_revision:${cipdCommit}";
+              hash = cipdHashes.${stdenv-constants.platform};
+            };
+          }
+          ''
+            mkdir --parents $out/bin
+            install --mode=0755 $src $out/bin/cipd
+          '';
+    in
+    writeShellScriptBin "cipd" ''
+      params=$@
+
+      if [[ "$1" == "ensure" ]]; then
+        shift 1
+        params="ensure"
+
+        while [ "$#" -ne 0 ]; do
+          if [[ "$1" == "-ensure-file" ]]; then
+            ensureFile="$2"
+            shift 2
+            params="$params -ensure-file $ensureFile"
+
+            sed -i 's/''${platform}/${host-constants.platform}/g' "$ensureFile"
+            sed -i 's/gn\/gn\/${stdenv-constants.platform}/gn\/gn\/${constants.platform}/g' "$ensureFile"
+
+            if grep flutter/java/openjdk "$ensureFile" >/dev/null; then
+              sed -i '/src\/flutter\/third_party\/java\/openjdk/,+2 d' "$ensureFile"
+            fi
+          else
+            params="$params $1"
+            shift 1
+          fi
+        done
+      fi
+
+      exec ${unwrapped}/bin/cipd $params
+    '';
+
+  vpython =
+    pythonPkg:
+    runCommand "vpython3" { } ''
+      mkdir --parents $out/bin
+      ln --symbolic ${pythonPkg}/bin/python $out/bin/vpython3
+    '';
+
+  xcode-select = writeShellScriptBin "xcode-select" ''
+    echo ${darwin.xcode}/Contents/Developer
+  '';
+}
diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix
index 4c40870dbf6a..e99b347c69af 100644
--- a/pkgs/development/compilers/flutter/flutter-tools.nix
+++ b/pkgs/development/compilers/flutter/flutter-tools.nix
@@ -1,74 +1,86 @@
 {
-  buildDartApplication,
-  dart,
-  flutterSource,
   lib,
-  patches,
-  pubspecLock,
-  runCommand,
   stdenv,
-  version,
+  systemPlatform,
+  buildDartApplication,
+  runCommand,
+  writeTextFile,
+  git,
   which,
-  writableTmpDirAsHomeHook,
+  dart,
+  version,
+  flutterSrc,
+  patches ? [ ],
+  pubspecLock,
+  engineVersion,
 }:
 
 let
-  dartEntryPoints = {
-    "flutter_tools.snapshot" = "bin/flutter_tools.dart";
+  # https://github.com/flutter/flutter/blob/17c92b7ba68ea609f4eb3405211d019c9dbc4d27/engine/src/flutter/tools/engine_tool/test/commands/stamp_command_test.dart#L125
+  engine_stamp = writeTextFile {
+    name = "engine_stamp";
+    text = builtins.toJSON {
+      build_date = "2025-06-27T12:30:00.000Z";
+      build_time_ms = 1751027400000;
+      git_revision = engineVersion;
+      git_revision_date = "2025-06-27T17:11:53-07:00";
+      content_hash = "1111111111111111111111111111111111111111";
+    };
   };
+
+  dartEntryPoints."flutter_tools.snapshot" = "bin/flutter_tools.dart";
 in
-buildDartApplication.override { inherit dart; } (finalAttrs: {
-  __structuredAttrs = true;
-  strictDeps = true;
+buildDartApplication.override { inherit dart; } {
   pname = "flutter-tools";
-  inherit
-    version
-    patches
-    pubspecLock
-    dartEntryPoints
-    ;
-
-  src = flutterSource;
-
-  sourceRoot = "${finalAttrs.src.name}/packages/flutter_tools";
-
+  inherit version dartEntryPoints;
   dartOutputType = "jit-snapshot";
 
-  dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${stdenv.hostPlatform.system}" ];
+  src = flutterSrc;
+  sourceRoot = "${flutterSrc.name}/packages/flutter_tools";
 
+  inherit patches;
   # The given patches are made for the entire SDK source tree.
   prePatch = ''
     chmod --recursive u+w "../.."
     pushd "../.."
   '';
-
   postPatch = ''
-    echo -n "${version}" > version
     popd
   ''
+  # Use arm64 instead of arm64e.
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace lib/src/ios/xcodeproj.dart \
-      --replace-fail "arm64e" "arm64"
+      --replace-fail arm64e arm64
+  ''
+  # need network
+  + lib.optionalString (lib.versionAtLeast version "3.35.0") ''
+    cp ${engine_stamp} ../../bin/cache/engine_stamp.json
+    substituteInPlace lib/src/flutter_cache.dart \
+      --replace-fail "registerArtifact(FlutterEngineStamp(this, logger));" ""
   '';
 
   # When the JIT snapshot is being built, the application needs to run.
   # It attempts to generate configuration files, and relies on a few external
   # tools.
   nativeBuildInputs = [
+    git
     which
-    writableTmpDirAsHomeHook
   ];
-
   preConfigure = ''
-    export FLUTTER_ROOT=$(realpath ../../)
+    export HOME=.
+    export FLUTTER_ROOT="$(realpath ../../)"
     mkdir --parents "$FLUTTER_ROOT/bin/cache"
-    ln --symbolic "${dart}" "$FLUTTER_ROOT/bin/cache/dart-sdk"
+    ln --symbolic '${dart}' "$FLUTTER_ROOT/bin/cache/dart-sdk"
   '';
 
+  dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${systemPlatform}" ];
+
   # The Dart wrapper launchers are useless for the Flutter tool - it is designed
   # to be launched from a snapshot by the SDK.
   postInstall = ''
-    rm "$out"/${builtins.concatStringsSep " " (builtins.attrNames dartEntryPoints)}
+    pushd "$out"
+    rm ${builtins.concatStringsSep " " (builtins.attrNames dartEntryPoints)}
+    popd
   '';
 
   sdkSourceBuilders = {
@@ -78,7 +90,7 @@ buildDartApplication.override { inherit dart; } (finalAttrs: {
       runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } ''
         for path in '${dart}/pkg/${name}'; do
           if [ -d "$path" ]; then
-            ln --symbolic "$path" "$out"
+            ln -s "$path" "$out"
             break
           fi
         done
@@ -89,4 +101,6 @@ buildDartApplication.override { inherit dart; } (finalAttrs: {
         fi
       '';
   };
-})
+
+  inherit pubspecLock;
+}
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index eaa6ef2f5bf3..80bc56cd149d 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -1,358 +1,221 @@
 {
-  scope,
-  lib,
-  stdenv,
-  dart,
-  autoPatchelfHook,
-  flutterSource,
-  flutter-tools,
-  callPackage,
-  host-artifacts,
-  artifacts ? host-artifacts,
+  useNixpkgsEngine ? false,
   version,
   engineVersion,
-  channel,
-  dartVersion,
+  engineHashes ? { },
+  engineUrl ? "https://github.com/flutter/flutter.git@${engineVersion}",
+  enginePatches ? [ ],
+  engineRuntimeModes ? [
+    "release"
+    "debug"
+  ],
+  engineSwiftShaderHash,
+  engineSwiftShaderRev,
   patches,
+  channel,
+  dart,
+  src,
+  pubspecLock,
+  artifactHashes ? null,
+  lib,
+  stdenv,
+  callPackage,
   makeWrapper,
+  darwin,
   gitMinimal,
   which,
   jq,
-  unzip,
-  gnutar,
-  pkg-config,
-  atk,
-  cairo,
-  gdk-pixbuf,
-  glib,
-  gtk3,
-  harfbuzz,
-  libepoxy,
-  pango,
-  libx11,
-  xorgproto,
-  libdeflate,
-  zlib,
-  cmake,
-  ninja,
-  clang,
-  darwin,
-  cipd,
-  depot_tools,
-  wrapGAppsHook3,
   writableTmpDirAsHomeHook,
-  fd,
-  cacert,
-  moreutils,
-  writeTextFile,
-  supportedTargetFlutterPlatforms,
-  extraPkgConfigPackages ? [ ],
-  extraLibraries ? [ ],
-  extraIncludes ? [ ],
-  extraCxxFlags ? [ ],
-  extraCFlags ? [ ],
-  extraLinkerFlags ? [ ],
-}:
+  flutterTools ? null,
+}@args:
 
 let
-  appRuntimeDeps =
-    lib.optionals
-      (stdenv.hostPlatform.isLinux && (builtins.elem "linux" supportedTargetFlutterPlatforms))
-      [
-        atk
-        cairo
-        gdk-pixbuf
-        glib
-        gtk3
-        harfbuzz
-        libepoxy
-        pango
-        libx11
-        libdeflate
-      ];
-
-  # Development packages required for compilation.
-  appBuildDeps =
-    let
-      # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3
-      deps =
-        pkg: lib.filter lib.isDerivation ((pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ]));
-      withKey = pkg: {
-        key = pkg.outPath;
-        val = pkg;
-      };
-      collect = pkg: lib.map withKey ([ pkg ] ++ deps pkg);
-    in
-    lib.map (e: e.val) (
-      lib.genericClosure {
-        startSet = lib.map withKey appRuntimeDeps;
-        operator = item: collect item.val;
+  engine =
+    if args.useNixpkgsEngine or false then
+      callPackage ./engine/default.nix {
+        inherit (args) dart;
+        dartSdkVersion = args.dart.version;
+        flutterVersion = version;
+        swiftshaderRev = engineSwiftShaderRev;
+        swiftshaderHash = engineSwiftShaderHash;
+        version = engineVersion;
+        hashes = engineHashes;
+        url = engineUrl;
+        patches = enginePatches;
+        runtimeModes = engineRuntimeModes;
       }
-    );
+    else
+      null;
 
-  appStaticBuildDeps =
-    (lib.optionals
-      (stdenv.hostPlatform.isLinux && (builtins.elem "linux" supportedTargetFlutterPlatforms))
-      [
-        libx11
-        xorgproto
-        zlib
-      ]
-    )
-    ++ extraLibraries;
+  dart = if args.useNixpkgsEngine or false then engine.dart else args.dart;
 
-  # Tools used by the Flutter SDK to compile applications.
-  buildTools =
-    lib.optionals
-      (stdenv.hostPlatform.isLinux && (builtins.elem "linux" supportedTargetFlutterPlatforms))
-      [
-        pkg-config
-        cmake
-        ninja
-        clang
-      ];
+  flutterTools =
+    args.flutterTools or (callPackage ./flutter-tools.nix {
+      inherit
+        dart
+        engineVersion
+        patches
+        pubspecLock
+        version
+        ;
+      flutterSrc = src;
+      systemPlatform = stdenv.hostPlatform.system;
+    });
 
-  # Nix-specific compiler configuration.
-  pkgConfigPackages = map (lib.getOutput "dev") (appBuildDeps ++ extraPkgConfigPackages);
+  unwrapped = stdenv.mkDerivation {
+    name = "flutter-${version}-unwrapped";
+    inherit src patches version;
 
-  includeFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") (
-    appStaticBuildDeps ++ extraIncludes
-  );
+    nativeBuildInputs = [
+      makeWrapper
+      jq
+      gitMinimal
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
+    strictDeps = true;
 
-  linkerFlags =
-    (map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps) ++ extraLinkerFlags;
-in
-stdenv.mkDerivation (finalAttrs: {
-  __structuredAttrs = true;
-  strictDeps = true;
-  pname = "flutter";
-  inherit version patches;
-
-  src = flutterSource;
-
-  nativeBuildInputs = [
-    moreutils
-    makeWrapper
-    jq
-    unzip
-    gnutar
-  ]
-  ++
-    lib.optionals
-      (stdenv.hostPlatform.isLinux && (builtins.elem "linux" supportedTargetFlutterPlatforms))
-      [
-        wrapGAppsHook3
-        autoPatchelfHook
-      ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
-
-  buildInputs = appRuntimeDeps;
-
-  postPatch = ''
-    patchShebangs --build ./bin/
-    patchShebangs packages/flutter_tools/bin
-  '';
-
-  preConfigure = ''
-    if [ "$(< bin/internal/engine.version)" != '${engineVersion}' ]; then
-      echo 1>&2 "The given engine version (${engineVersion}) does not match the version required by the Flutter SDK ($(< bin/internal/engine.version))."
-      exit 1
-    fi
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-
-    mkdir --parents bin/cache
-  ''
-  # Add a flutter_tools artifact stamp, and build a snapshot.
-  # This is the Flutter CLI application.
-  + ''
-    echo "nixpkgs000000000000000000000000000000000" > bin/cache/flutter_tools.stamp
-    ln --symbolic ${flutter-tools}/share/flutter_tools.snapshot bin/cache/flutter_tools.snapshot
-  ''
-  # Some of flutter_tools's dependencies contain static assets. The
-  # application attempts to read its own package_config.json to find these
-  # assets at runtime.
-  + ''
-    mkdir --parents packages/flutter_tools/.dart_tool
-    ln --symbolic ${flutter-tools.pubcache}/package_config.json packages/flutter_tools/.dart_tool/package_config.json
-  ''
-  + lib.optionalString (lib.versionOlder version "3.33") ''
-    echo -n "${version}" > version
-  ''
-  + ''
-    cp ${
-      writeTextFile {
-        name = "flutter.version.json";
-        text = builtins.toJSON {
-          flutterVersion = version;
-          frameworkVersion = version;
-          channel = channel;
-          repositoryUrl = "https://github.com/flutter/flutter.git";
-          frameworkRevision = "nixpkgs000000000000000000000000000000000";
-          frameworkCommitDate = "1970-01-01 00:00:00";
-          engineRevision = engineVersion;
-          dartSdkVersion = dartVersion;
-        };
-      }
-    } bin/cache/flutter.version.json
-    jq --arg version "$(jq --raw-output .version ${dart}/bin/resources/devtools/version.json)" '. + {devToolsVersion: $version}' bin/cache/flutter.version.json | sponge bin/cache/flutter.version.json
-    echo "${engineVersion}" > bin/cache/engine.stamp
-  ''
-  # Suppress a small error now that `.gradle`'s location changed.
-  # Location changed because of the patch "gradle-flutter-tools-wrapper.patch".
-  + ''
-    mkdir --parents packages/flutter_tools/gradle/.gradle
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    ${lib.concatMapStrings (artifact: ''
-      ${lib.optionalString (
-        artifact.target == "bin/cache/flutter_web_sdk"
-      ) ''rm --recursive --force "$out/${artifact.target}"''}
-      ${
-        if
-          (
-            (lib.hasSuffix ".zip" artifact.path)
-            || (lib.hasSuffix ".tar.gz" artifact.path)
-            || (lib.hasSuffix ".tgz" artifact.path)
-          )
-        then
-          ''
-            temp_path=$(mktemp -d)
-            ${lib.optionalString (lib.hasSuffix ".zip" artifact.path) ''unzip -o "${artifact.path}" -d "$temp_path"''}
-            ${lib.optionalString (
-              (lib.hasSuffix ".tar.gz" artifact.path) || (lib.hasSuffix ".tgz" artifact.path)
-            ) ''tar --extract --gzip --file "${artifact.path}" --directory "$temp_path"''}
-          ''
-        else
-          ''
-            temp_path="${artifact.path}"
-          ''
-      }
-      content_count=$(ls --almost-all "$temp_path" | wc --lines)
-      target_path="$out/${artifact.target}"
-      if [ "$content_count" -eq 1 ] && [ ! -e "$target_path" ]; then
-        mkdir --parents "$(dirname "$target_path")"
-        cp --recursive --no-target-directory "$temp_path"/* "$target_path"
-      else
-        mkdir --parents "$target_path"
-        cp --recursive "$temp_path"/* "$target_path"/
+    preConfigure = ''
+      if [ "$(< bin/internal/engine.version)" != '${engineVersion}' ]; then
+        echo 1>&2 "The given engine version (${engineVersion}) does not match the version required by the Flutter SDK ($(< bin/internal/engine.version))."
+        exit 1
       fi
-      chmod --recursive +w "$target_path"
-      if [ "${artifact.path}" != "$temp_path" ]; then
-        rm --recursive --force "$temp_path"
-      fi
-    '') artifacts}
-
-    cp --recursive . $out
-    ln --symbolic --force ${dart} $out/bin/cache/dart-sdk
-  ''
-  # The regular launchers are designed to download/build/update SDK
-  # components, and are not very useful in Nix.
-  # Replace them with simple links and wrappers.
-  + ''
-    rm $out/bin/{dart,flutter}
-    ln --symbolic ${lib.getExe dart} $out/bin/dart
-
-    for path in ${
-      builtins.concatStringsSep " " (
-        builtins.foldl' (
-          paths: pkg:
-          paths
-          ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") [
-            "lib"
-            "share"
-          ])
-        ) [ ] pkgConfigPackages
-      )
-    }; do
-      addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"
-    done
-
-    makeWrapper ${lib.getExe dart} $out/bin/flutter \
-      --set-default FLUTTER_ROOT $out \
-      --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
-      --set FLUTTER_ALREADY_LOCKED true \
-      --suffix PATH : '${
-        lib.makeBinPath (
-          [
-            depot_tools
-            cipd
-            which
-          ]
-          ++ buildTools
-        )
-      }' \
-      --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \
-      --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \
-      --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \
-      --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \
-      --prefix LDFLAGS "''\t" '${
-        builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)
-      }' \
-      ''${gappsWrapperArgs[@]} \
-      --add-flags "--disable-dart-dev --packages='${flutter-tools.pubcache}/package_config.json' --root-certs-file='${cacert}/etc/ssl/certs/ca-bundle.crt' $out/bin/cache/flutter_tools.snapshot"
-
-    runHook postInstall
-  '';
-
-  doInstallCheck = true;
-
-  nativeInstallCheckInputs = [
-    which
-    writableTmpDirAsHomeHook
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
-
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    $out/bin/flutter config --android-studio-dir $HOME
-    $out/bin/flutter config --android-sdk $HOME
-    $out/bin/flutter --version | fgrep --quiet '${builtins.substring 0 10 engineVersion}'
-
-    runHook postInstallCheck
-  '';
-
-  dontWrapGApps = true;
-
-  # https://github.com/flutter/engine/pull/28525
-  appendRunpaths = lib.optionals (
-    stdenv.hostPlatform.isLinux && (builtins.elem "linux" supportedTargetFlutterPlatforms)
-  ) [ "$ORIGIN" ];
-
-  passthru = {
-    buildFlutterApplication = callPackage ./build-support/build-flutter-application.nix {
-      flutter = scope.flutter;
-    };
-    updateScript = ./update.py;
-    inherit scope;
-    inherit (scope) dart;
-  };
-
-  meta = {
-    description = "Makes it easy and fast to build beautiful apps for mobile and beyond";
-    longDescription = ''
-      Flutter is Google's SDK for crafting beautiful,
-      fast user experiences for mobile, web, and desktop from a single codebase.
     '';
-    homepage = "https://flutter.dev";
-    license = lib.licenses.bsd3;
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-      "x86_64-darwin"
-      "aarch64-darwin"
-    ];
-    mainProgram = "flutter";
-    maintainers = with lib.maintainers; [ ericdallo ];
-    teams = [ lib.teams.flutter ];
+
+    postPatch = ''
+      patchShebangs --build ./bin/
+      patchShebangs packages/flutter_tools/bin
+    '';
+
+    buildPhase = ''
+      runHook preBuild
+    ''
+    # The flutter_tools package tries to run many Git commands. In most
+    # cases, unexpected output is handled gracefully, but commands are never
+    # expected to fail completely. A blank repository needs to be created.
+    + ''
+      rm --recursive --force .git # Remove any existing Git directory
+      git init --initial-branch=nixpkgs
+      GIT_AUTHOR_NAME=Nixpkgs GIT_COMMITTER_NAME=Nixpkgs \
+      GIT_AUTHOR_EMAIL= GIT_COMMITTER_EMAIL= \
+      GIT_AUTHOR_DATE='1/1/1970 00:00:00 +0000' GIT_COMMITTER_DATE='1/1/1970 00:00:00 +0000' \
+        git commit --allow-empty --message="Initial commit"
+      (. '${../../../build-support/fetchgit/deterministic-git}'; make_deterministic_repo .)
+    ''
+    + ''
+      mkdir --parents bin/cache
+
+      # Add a flutter_tools artifact stamp, and build a snapshot.
+      # This is the Flutter CLI application.
+      echo "$(git rev-parse HEAD)" > bin/cache/flutter_tools.stamp
+      ln --symbolic '${flutterTools}/share/flutter_tools.snapshot' bin/cache/flutter_tools.snapshot
+
+      # Some of flutter_tools's dependencies contain static assets. The
+      # application attempts to read its own package_config.json to find these
+      # assets at runtime.
+      mkdir --parents packages/flutter_tools/.dart_tool
+      ln --symbolic '${flutterTools.pubcache}/package_config.json' packages/flutter_tools/.dart_tool/package_config.json
+
+      echo -n "${version}" > version
+      cat <<EOF > bin/cache/flutter.version.json
+      {
+        "devToolsVersion": "$(cat "${dart}/bin/resources/devtools/version.json" | jq --raw-output .version)",
+        "flutterVersion": "${version}",
+        "frameworkVersion": "${version}",
+        "channel": "${channel}",
+        "repositoryUrl": "https://github.com/flutter/flutter.git",
+        "frameworkRevision": "nixpkgs000000000000000000000000000000000",
+        "frameworkCommitDate": "1970-01-01 00:00:00",
+        "engineRevision": "${engineVersion}",
+        "dartSdkVersion": "${dart.version}"
+      }
+      EOF
+
+      # Suppress a small error now that `.gradle`'s location changed.
+      # Location changed because of the patch "gradle-flutter-tools-wrapper.patch".
+      mkdir --parents "$out/packages/flutter_tools/gradle/.gradle"
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir --parents $out
+      cp --recursive . $out
+      rm --recursive --force $out/bin/cache/dart-sdk
+      ln --symbolic --force ${dart} $out/bin/cache/dart-sdk
+
+      # The regular launchers are designed to download/build/update SDK
+      # components, and are not very useful in Nix.
+      # Replace them with simple links and wrappers.
+      rm "$out/bin"/{dart,flutter}
+      ln --symbolic "$out/bin/cache/dart-sdk/bin/dart" "$out/bin/dart"
+      makeShellWrapper "$out/bin/dart" "$out/bin/flutter" \
+        --set-default FLUTTER_ROOT "$out" \
+        --set FLUTTER_ALREADY_LOCKED true \
+        --add-flags "--disable-dart-dev --packages='${flutterTools.pubcache}/package_config.json' \$NIX_FLUTTER_TOOLS_VM_OPTIONS $out/bin/cache/flutter_tools.snapshot"
+
+      runHook postInstall
+    '';
+
+    doInstallCheck = true;
+    nativeInstallCheckInputs = [
+      which
+      writableTmpDirAsHomeHook
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
+    installCheckPhase = ''
+      runHook preInstallCheck
+
+      $out/bin/flutter config --android-studio-dir $HOME
+      $out/bin/flutter config --android-sdk $HOME
+      $out/bin/flutter --version | fgrep --quiet '${builtins.substring 0 10 engineVersion}'
+
+      runHook postInstallCheck
+    '';
+
+    passthru = {
+      # TODO: rely on engine.version instead of engineVersion
+      inherit
+        dart
+        engineVersion
+        artifactHashes
+        channel
+        ;
+      tools = flutterTools;
+      # The derivation containing the original Flutter SDK files.
+      # When other derivations wrap this one, any unmodified files
+      # found here should be included as-is, for tooling compatibility.
+      sdk = unwrapped;
+    }
+    // lib.optionalAttrs (engine != null) {
+      inherit engine;
+    };
+
+    meta = {
+      broken = (lib.versionOlder version "3.32") && useNixpkgsEngine;
+      description = "Makes it easy and fast to build beautiful apps for mobile and beyond";
+      longDescription = ''
+        Flutter is Google's SDK for crafting beautiful,
+        fast user experiences for mobile, web, and desktop from a single codebase.
+      '';
+      homepage = "https://flutter.dev";
+      license = lib.licenses.bsd3;
+      sourceProvenance =
+        with lib.sourceTypes;
+        if useNixpkgsEngine then [ fromSource ] else [ binaryNativeCode ];
+      platforms = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      mainProgram = "flutter";
+      maintainers = with lib.maintainers; [
+        ericdallo
+      ];
+      teams = [ lib.teams.flutter ];
+    };
   };
-})
+in
+unwrapped
diff --git a/pkgs/development/compilers/flutter/host-artifacts.nix b/pkgs/development/compilers/flutter/host-artifacts.nix
deleted file mode 100644
index 444e5cabd764..000000000000
--- a/pkgs/development/compilers/flutter/host-artifacts.nix
+++ /dev/null
@@ -1,302 +0,0 @@
-{
-  lib,
-  stdenv,
-  constants,
-  engineVersion,
-  artifactHashes,
-  useNixpkgsEngine,
-  engines,
-  fetchurl,
-  hostPlatform ? stdenv.hostPlatform,
-  supportedTargetFlutterPlatforms,
-}:
-
-let
-  hostConstants = constants.makeConstants hostPlatform;
-
-  engineBaseUrl = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}/";
-  baseUrl = "https://storage.googleapis.com/flutter_infra_release/";
-
-  getUrl =
-    path:
-    if
-      (
-        lib.hasPrefix "flutter/" path
-        || lib.hasPrefix "gradle-" path
-        || lib.hasPrefix "ios-usb-dependencies" path
-      )
-    then
-      baseUrl + path
-    else
-      engineBaseUrl + path;
-
-  artifacts = {
-    universal = [
-      {
-        path = "flutter/fonts/3012db47f3130e62f7cc0beabff968a33cbec8d8/fonts.zip";
-        target = "bin/cache/artifacts/material_fonts";
-        hash = "sha256-5W+o6btFif3pZL495FHz5bJR5KHq+x3JjZSt0DTdWoY=";
-      }
-      {
-        path = "gradle-wrapper/fd5c1f2c013565a3bea56ada6df9d2b8e96d56aa/gradle-wrapper.tgz";
-        target = "bin/cache/artifacts/gradle_wrapper";
-        hash = "sha256-MelCi68aKy9IXxEQxYmfhSZJsz1Goumwf50XdS1QGQo=";
-      }
-      {
-        path = "sky_engine.zip";
-        target = "bin/cache/pkg";
-      }
-      {
-        path = "flutter_gpu.zip";
-        target = "bin/cache/pkg";
-      }
-      {
-        path = "flutter_patched_sdk.zip";
-        target = "bin/cache/artifacts/engine/common";
-      }
-      {
-        path = "flutter_patched_sdk_product.zip";
-        target = "bin/cache/artifacts/engine/common";
-      }
-      {
-        path = "${hostPlatform.parsed.kernel.name}-${
-          if hostPlatform.isWindows then "x64" else hostConstants.alt-arch
-        }/artifacts.zip";
-        target = "bin/cache/artifacts/engine/${hostPlatform.parsed.kernel.name}-${
-          if (hostPlatform.isDarwin || hostPlatform.isWindows) then "x64" else hostConstants.alt-arch
-        }";
-      }
-      {
-        path = "${hostPlatform.parsed.kernel.name}-${
-          if hostPlatform.isWindows then "x64" else hostConstants.alt-arch
-        }/font-subset.zip";
-        target = "bin/cache/artifacts/engine/${hostPlatform.parsed.kernel.name}-${
-          if (hostPlatform.isDarwin || hostPlatform.isWindows) then "x64" else hostConstants.alt-arch
-        }";
-      }
-    ];
-
-    web = [
-      {
-        path = "flutter-web-sdk.zip";
-        target = "bin/cache/flutter_web_sdk";
-      }
-    ];
-
-    linux = [
-      {
-        path = "linux-${hostConstants.alt-arch}/artifacts.zip";
-        target = "bin/cache/artifacts/engine/linux-${hostConstants.alt-arch}";
-      }
-      {
-        path = "linux-${hostConstants.alt-arch}-debug/linux-${hostConstants.alt-arch}-flutter-gtk.zip";
-        target = "bin/cache/artifacts/engine/linux-${hostConstants.alt-arch}";
-      }
-      {
-        path = "linux-${hostConstants.alt-arch}-profile/linux-${hostConstants.alt-arch}-flutter-gtk.zip";
-        target = "bin/cache/artifacts/engine/linux-${hostConstants.alt-arch}-profile";
-      }
-      {
-        path = "linux-${hostConstants.alt-arch}-release/linux-${hostConstants.alt-arch}-flutter-gtk.zip";
-        target = "bin/cache/artifacts/engine/linux-${hostConstants.alt-arch}-release";
-      }
-    ];
-
-    # arm64?
-    windows = [
-      {
-        path = "windows-x64/artifacts.zip";
-        target = "bin/cache/artifacts/engine/windows-x64";
-      }
-      {
-        path = "windows-x64-debug/windows-x64-flutter.zip";
-        target = "bin/cache/artifacts/engine/windows-x64";
-      }
-      {
-        path = "windows-x64/flutter-cpp-client-wrapper.zip";
-        target = "bin/cache/artifacts/engine/windows-x64";
-      }
-      {
-        path = "windows-x64-profile/windows-x64-flutter.zip";
-        target = "bin/cache/artifacts/engine/windows-x64-profile";
-      }
-      {
-        path = "windows-x64-release/windows-x64-flutter.zip";
-        target = "bin/cache/artifacts/engine/windows-x64-release";
-      }
-    ];
-
-    macos = [
-      {
-        path = "darwin-x64/framework.zip";
-        target = "bin/cache/artifacts/engine/darwin-x64";
-      }
-      {
-        path = "darwin-x64/gen_snapshot.zip";
-        target = "bin/cache/artifacts/engine/darwin-x64";
-      }
-      {
-        path = "darwin-x64-profile/artifacts.zip";
-        target = "bin/cache/artifacts/engine/darwin-x64-profile";
-      }
-      {
-        path = "darwin-x64-profile/framework.zip";
-        target = "bin/cache/artifacts/engine/darwin-x64-profile";
-      }
-      {
-        path = "darwin-x64-profile/gen_snapshot.zip";
-        target = "bin/cache/artifacts/engine/darwin-x64-profile";
-      }
-      {
-        path = "darwin-x64-release/artifacts.zip";
-        target = "bin/cache/artifacts/engine/darwin-x64-release";
-      }
-      {
-        path = "darwin-x64-release/framework.zip";
-        target = "bin/cache/artifacts/engine/darwin-x64-release";
-      }
-      {
-        path = "darwin-x64-release/gen_snapshot.zip";
-        target = "bin/cache/artifacts/engine/darwin-x64-release";
-      }
-      {
-        path = "darwin-${hostConstants.alt-arch}/artifacts.zip";
-        target = "bin/cache/artifacts/engine/darwin-x64";
-      }
-    ];
-
-    ios = [
-      {
-        path = "ios/artifacts.zip";
-        target = "bin/cache/artifacts/engine/ios";
-      }
-      {
-        path = "ios-profile/artifacts.zip";
-        target = "bin/cache/artifacts/engine/ios-profile";
-      }
-      {
-        path = "ios-release/artifacts.zip";
-        target = "bin/cache/artifacts/engine/ios-release";
-      }
-      {
-        path = "ios-usb-dependencies/libimobiledevice/0bf0f9e941c85d06ce4b5909d7a61b3a4f2a6a05/libimobiledevice.zip";
-        target = "bin/cache/artifacts/libimobiledevice";
-        hash = "sha256-EPzWDY5SYegep6DB9ESd/ApklzLtE8reEllMUPzmkLg=";
-      }
-      {
-        path = "ios-usb-dependencies/libusbmuxd/19d6bec393c9f9b31ccb090059f59268da32e281/libusbmuxd.zip";
-        target = "bin/cache/artifacts/libusbmuxd";
-        hash = "sha256-RQT0Kq8rKKgokp1haASMZ8K84+M2ZbaJcs/MunZ7/L0=";
-      }
-      {
-        path = "ios-usb-dependencies/libplist/cf5897a71ea412ea2aeb1e2f6b5ea74d4fabfd8c/libplist.zip";
-        target = "bin/cache/artifacts/libplist";
-        hash = "sha256-cx5758EQb/0SkrVusXGFzH2dUChzFd5dFpMKxlxKbS8=";
-      }
-      {
-        path = "ios-usb-dependencies/openssl/22dbb176deef7d9a80f5c94f57a4b518ea935f50/openssl.zip";
-        target = "bin/cache/artifacts/openssl";
-        hash = "sha256-erz3j0oIZm2IqvFD41APkTgz7YZaaDReokMwGhFCsmA=";
-      }
-      {
-        path = "ios-usb-dependencies/libimobiledeviceglue/050ff3bf8fdab6ce53a2ddc6ae49b11b1c02a168/libimobiledeviceglue.zip";
-        target = "bin/cache/artifacts/libimobiledeviceglue";
-        hash = "sha256-4rXsfBxIaByVcIuzs05G5RergFZrgaBs1XBmu7ibwAA=";
-      }
-      {
-        path = "ios-usb-dependencies/ios-deploy/7a29ab0b6d611f2bf5de4b6f929a82a091866307/ios-deploy.zip";
-        target = "bin/cache/artifacts/ios-deploy";
-        hash = "sha256-1p6agbzur4xFai4ZzzjHp4ZvRv+VWcPygBgBYQdQ2Vw=";
-      }
-    ];
-
-    android = [
-      {
-        path = "android-x86/artifacts.zip";
-        target = "bin/cache/artifacts/engine/android-x86";
-      }
-      {
-        path = "android-x64/artifacts.zip";
-        target = "bin/cache/artifacts/engine/android-x64";
-      }
-      {
-        path = "android-arm/artifacts.zip";
-        target = "bin/cache/artifacts/engine/android-arm";
-      }
-      {
-        path = "android-arm-profile/artifacts.zip";
-        target = "bin/cache/artifacts/engine/android-arm-profile";
-      }
-      {
-        path = "android-arm-release/artifacts.zip";
-        target = "bin/cache/artifacts/engine/android-arm-release";
-      }
-      {
-        path = "android-arm64/artifacts.zip";
-        target = "bin/cache/artifacts/engine/android-arm64";
-      }
-      {
-        path = "android-arm64-profile/artifacts.zip";
-        target = "bin/cache/artifacts/engine/android-arm64-profile";
-      }
-      {
-        path = "android-arm64-release/artifacts.zip";
-        target = "bin/cache/artifacts/engine/android-arm64-release";
-      }
-      {
-        path = "android-x64-profile/artifacts.zip";
-        target = "bin/cache/artifacts/engine/android-x64-profile";
-      }
-      {
-        path = "android-x64-release/artifacts.zip";
-        target = "bin/cache/artifacts/engine/android-x64-release";
-      }
-      {
-        path = "android-arm-profile/${hostPlatform.parsed.kernel.name}-x64.zip";
-        target = "bin/cache/artifacts/engine/android-arm-profile/${hostPlatform.parsed.kernel.name}-x64";
-      }
-      {
-        path = "android-arm-release/${hostPlatform.parsed.kernel.name}-x64.zip";
-        target = "bin/cache/artifacts/engine/android-arm-release/${hostPlatform.parsed.kernel.name}-x64";
-      }
-      {
-        path = "android-arm64-profile/${hostPlatform.parsed.kernel.name}-x64.zip";
-        target = "bin/cache/artifacts/engine/android-arm64-profile/${hostPlatform.parsed.kernel.name}-x64";
-      }
-      {
-        path = "android-arm64-release/${hostPlatform.parsed.kernel.name}-x64.zip";
-        target = "bin/cache/artifacts/engine/android-arm64-release/${hostPlatform.parsed.kernel.name}-x64";
-      }
-      {
-        path = "android-x64-profile/${hostPlatform.parsed.kernel.name}-x64.zip";
-        target = "bin/cache/artifacts/engine/android-x64-profile/${hostPlatform.parsed.kernel.name}-x64";
-      }
-      {
-        path = "android-x64-release/${hostPlatform.parsed.kernel.name}-x64.zip";
-        target = "bin/cache/artifacts/engine/android-x64-release/${hostPlatform.parsed.kernel.name}-x64";
-      }
-    ];
-  };
-in
-(lib.unique (
-  lib.map (
-    artifact:
-    let
-      artifactName = lib.removeSuffix ".${lib.last (lib.splitString "." artifact.path)}" artifact.path;
-      artifactNameUnderscore = lib.replaceStrings [ "-" "/" ] [ "_M_" "_S_" ] artifactName;
-      useEngineOutput = useNixpkgsEngine && (builtins.elem artifactNameUnderscore engines.outputs);
-    in
-    {
-      path =
-        if useEngineOutput then
-          engines.${artifactNameUnderscore}
-        else
-          fetchurl {
-            url = getUrl artifact.path;
-            hash = artifactHashes.${artifact.path} or artifact.hash or "";
-          };
-      target = artifact.target;
-      id = artifact.path;
-    }
-  ) (lib.concatMap (x: artifacts.${x}) supportedTargetFlutterPlatforms)
-))
diff --git a/pkgs/development/compilers/flutter/patches/opt-in-analytics.patch b/pkgs/development/compilers/flutter/patches/opt-in-analytics.patch
deleted file mode 100644
index 036958c47f3b..000000000000
--- a/pkgs/development/compilers/flutter/patches/opt-in-analytics.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/packages/flutter_tools/lib/src/reporting/usage.dart
-+++ b/packages/flutter_tools/lib/src/reporting/usage.dart
-@@ -218,7 +218,7 @@
-       if (globals.platform.environment.containsKey('FLUTTER_HOST')) {
-         analytics.setSessionValue('aiid', globals.platform.environment['FLUTTER_HOST']);
-       }
--      analytics.analyticsOpt = AnalyticsOpt.optOut;
-+      analytics.analyticsOpt = AnalyticsOpt.optIn;
-     }
- 
-     return _DefaultUsage._(
---- a/packages/flutter_tools/lib/src/reporting/first_run.dart
-+++ b/packages/flutter_tools/lib/src/reporting/first_run.dart
-@@ -37,6 +37,8 @@
-   ║ See Google's privacy policy:                                               ║
-   ║ https://policies.google.com/privacy                                        ║
-   ╚════════════════════════════════════════════════════════════════════════════╝
-+nixpkgs overrides: reporting is disabled by default. Opt-out is not a sent event.
-+Run 'flutter config --analytics' to opt in to reports.
- ''';
- 
- /// The first run messenger determines whether the first run license terms
diff --git a/pkgs/development/compilers/flutter/patches/pmos-if-touch-is-a-mouse-then-mouse-is-touch.patch b/pkgs/development/compilers/flutter/patches/pmos-if-touch-is-a-mouse-then-mouse-is-touch.patch
deleted file mode 100644
index 8abd25546790..000000000000
--- a/pkgs/development/compilers/flutter/patches/pmos-if-touch-is-a-mouse-then-mouse-is-touch.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-flutter defines a list of pointer kinds that can scroll the screen.
-however, it does not bother recognizing the pointer kind on linux,
-so every pointer is set to be recognized as mouse. effectively, touch
-can't scroll anything. this workarounds the issue by making mouse
-one of the "touch-like device types".
-
-Bug: https://github.com/flutter/flutter/issues/63209
-
---- a/packages/flutter/lib/src/widgets/scroll_configuration.dart
-+++ b/packages/flutter/lib/src/widgets/scroll_configuration.dart
-@@ -25,6 +25,7 @@
-   // The VoiceAccess sends pointer events with unknown type when scrolling
-   // scrollables.
-   PointerDeviceKind.unknown,
-+  PointerDeviceKind.mouse,
- };
- 
- /// The default overscroll indicator applied on [TargetPlatform.android].
diff --git a/pkgs/development/compilers/flutter/scope.nix b/pkgs/development/compilers/flutter/scope.nix
deleted file mode 100644
index 9ef8c0d8359f..000000000000
--- a/pkgs/development/compilers/flutter/scope.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  dart,
-  dart-bin,
-  fetchFromGitHub,
-  fetchgit,
-  lib,
-  newScope,
-  stdenv,
-  engineRuntimeModes ? [
-    "release"
-    "debug"
-    "profile"
-  ],
-  supportedTargetFlutterPlatforms ? [
-    "universal"
-    "web"
-  ]
-  ++ (lib.optionals (stdenv.hostPlatform.isLinux) [ "linux" ])
-  ++ (lib.optionals (stdenv.hostPlatform.isx86_64) [ "android" ])
-  ++ (lib.optionals stdenv.hostPlatform.isDarwin [
-    "macos"
-    "ios"
-  ]),
-}:
-
-versionData:
-lib.makeScope newScope (
-  self:
-  versionData
-  // {
-    inherit supportedTargetFlutterPlatforms;
-
-    constants = self.callPackage ./constants.nix { };
-
-    depot_tools = fetchgit {
-      url = "https://chromium.googlesource.com/chromium/tools/depot_tools.git";
-      rev = "a0e694f18f15b364d2f9c23c4dde396bfc973fd1";
-      postFetch = ''
-        substituteInPlace $out/gerrit_util.py \
-          --replace-fail "import httplib2.socks" "httplib2.socks = None"
-        substituteInPlace $out/gerrit_util.py \
-          --replace-fail "httplib2.socks.socksocket._socksocket__rewriteproxy = __fixed_rewrite_proxy" "pass"
-        substituteInPlace $out/gerrit_util.py \
-          --replace-fail "httplib2.socks.PROXY_TYPE_HTTP_NO_TUNNEL" "3"
-      '';
-      hash = "sha256-N9xBfLS8DnBjOD149EOu5pr8ffBOb39vebhFUwPBllc=";
-    };
-
-    flutterSource = fetchFromGitHub {
-      owner = "flutter";
-      repo = "flutter";
-      tag = self.version;
-      hash = self.flutterHash;
-    };
-
-    dart =
-      let
-        hash =
-          self.dartHash.${
-            if (stdenv.hostPlatform.isLinux && (lib.versionAtLeast self.version "3.41")) then
-              "linux"
-            else
-              stdenv.hostPlatform.system
-          } or (throw "No dart hash for ${stdenv.hostPlatform.system}");
-      in
-      (if (lib.versionAtLeast self.version "3.41") then dart else dart-bin).overrideAttrs (oldAttrs: {
-        version = self.dartVersion;
-        src = oldAttrs.src.overrideAttrs (_: {
-          version = self.dartVersion;
-          outputHash = hash;
-        });
-      });
-
-    cipd = self.callPackage ./cipd.nix { };
-
-    engine = self.callPackage ./engine/default.nix { };
-
-    engines =
-      let
-        enginePackages = map (
-          runtimeMode: self.callPackage ./engine/default.nix { runtimeMode = runtimeMode; }
-        ) engineRuntimeModes;
-        outputs = lib.unique (builtins.concatMap (e: e.outputs) enginePackages);
-        mergedOutputs = lib.genAttrs outputs (
-          outputName:
-          let
-            found = lib.findFirst (e: e ? ${outputName}) null enginePackages;
-          in
-          found.${outputName}
-        );
-      in
-      mergedOutputs
-      // {
-        inherit outputs;
-      };
-
-    host-artifacts = self.callPackage ./host-artifacts.nix { inherit (stdenv) hostPlatform; };
-
-    all-artifacts = self.callPackage ./all-artifacts.nix { };
-
-    flutter-tools = self.callPackage ./flutter-tools.nix { };
-
-    flutter = self.callPackage ./flutter.nix { scope = self; };
-  }
-)
diff --git a/pkgs/development/compilers/flutter/sdk-symlink.nix b/pkgs/development/compilers/flutter/sdk-symlink.nix
new file mode 100644
index 000000000000..d8ddd9bd0c2e
--- /dev/null
+++ b/pkgs/development/compilers/flutter/sdk-symlink.nix
@@ -0,0 +1,65 @@
+{
+  symlinkJoin,
+  makeWrapper,
+}:
+flutter:
+
+let
+  self = symlinkJoin {
+    inherit (flutter) pname;
+    name = "${flutter.name}-sdk-links";
+    paths = [
+      flutter
+      flutter.cacheDir
+      flutter.sdk
+    ];
+
+    nativeBuildInputs = [ makeWrapper ];
+    postBuild = ''
+      wrapProgram "$out/bin/flutter" \
+        --set-default FLUTTER_ROOT "$out"
+
+      # symlinkJoin seems to be missing the .git directory for some reason.
+      if [ -d '${flutter.sdk}/.git' ]; then
+        ln --symbolic '${flutter.sdk}/.git' "$out"
+      fi
+
+      # For iOS/macOS builds, *.xcframework/'s from the pre-built
+      # artifacts are copied into each built app. However, the symlinkJoin
+      # means that the *.xcframework's contain symlinks into the nix store,
+      # which causes issues when actually running the apps.
+      #
+      # We'll fix this by only linking to an outer *.xcframework dir instead
+      # of trying to symlinkJoin the files inside the *.xcframework.
+      artifactsDir="$out/bin/cache/artifacts/engine"
+      shopt -s globstar
+      for file in "$artifactsDir"/**/*.xcframework/Info.plist; do
+        # Get the unwrapped path from the Info.plist inside each .xcframework
+        origFile="$(readlink -f "$file")"
+        origFrameworkDir="$(dirname "$origFile")"
+
+        # Remove the symlinkJoin .xcframework dir and replace it with a symlink
+        # to the unwrapped .xcframework dir.
+        frameworkDir="$(dirname "$file")"
+        rm --recursive "$frameworkDir"
+        ln --symbolic "$origFrameworkDir" "$frameworkDir"
+      done
+      shopt -u globstar
+    '';
+
+    passthru = flutter.passthru // {
+      # Update the SDK attribute.
+      # This allows any modified SDK files to be included
+      # in future invocations.
+      sdk = self;
+    };
+
+    meta = flutter.meta // {
+      longDescription = ''
+        ${flutter.meta.longDescription}
+        Modified binaries are linked into the original SDK directory for use with tools that use the whole SDK.
+      '';
+    };
+  };
+in
+self
diff --git a/pkgs/development/compilers/flutter/update.py b/pkgs/development/compilers/flutter/update.py
deleted file mode 100755
index c2e6ae6f20e8..000000000000
--- a/pkgs/development/compilers/flutter/update.py
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/usr/bin/env nix-shell
-# !nix-shell -i python3 -p python3Packages.pyyaml nix-update dart
-
-import argparse
-import json
-import logging
-import shutil
-import stat
-import subprocess
-import sys
-import tempfile
-import urllib.request
-from pathlib import Path
-from typing import Any, NoReturn
-
-import yaml
-
-FLUTTER_RELEASES_URL = (
-    "https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json"
-)
-
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(levelname)s: %(message)s",
-    stream=sys.stderr,
-)
-logger = logging.getLogger(__name__)
-
-
-def fatal_error(msg: str) -> NoReturn:
-    logger.error(msg)
-    sys.exit(1)
-
-
-def run_command(cmd: list[str], cwd: Path | None = None) -> str:
-    try:
-        result = subprocess.run(
-            cmd,
-            capture_output=True,
-            text=True,
-            cwd=cwd,
-            check=True,
-        )
-        return result.stdout.strip()
-    except subprocess.CalledProcessError as e:
-        fatal_error(f"Command failed: {' '.join(cmd)}\n{e.stderr.strip()}")
-
-
-def fetch_url(url: str) -> bytes:
-    with urllib.request.urlopen(url, timeout=30) as response:
-        return response.read()
-
-
-def get_nixpkgs_root() -> Path:
-    return Path(run_command(["git", "rev-parse", "--show-toplevel"]))
-
-
-def run_nix_eval(cmds: list[str]) -> str:
-    return run_command(["nix", "eval", "--json", "--impure", *cmds])
-
-
-def run_nix_prefetch(url: str, unpack: bool = False) -> str:
-    args = ["nix", "store", "prefetch-file", "--json"]
-    if unpack:
-        args.append("--unpack")
-    args.append(url)
-
-    output = run_command(args)
-
-    hash_value = json.loads(output).get("hash")
-    if not hash_value:
-        fatal_error(f"No hash in prefetch output: {output}")
-    return hash_value
-
-
-def get_version_str(flutter_version: str) -> str:
-    return "_".join(flutter_version.split(".")[:2])
-
-
-def requires_engine_hash(flutter_version: str) -> bool:
-    parts = flutter_version.split(".")
-    if len(parts) < 2:
-        return False
-    major, minor = int(parts[0]), int(parts[1])
-    return major > 3 or (major == 3 and minor >= 41)
-
-
-def get_version_data(
-    target_version: str | None = None, channel: str | None = None
-) -> tuple[str, str, str, str]:
-    channel = channel or "stable"
-    releases_data = json.loads(fetch_url(FLUTTER_RELEASES_URL).decode("utf-8"))
-
-    if not target_version:
-        release_hash = releases_data["current_release"].get(channel)
-        if not release_hash:
-            fatal_error(f"Channel '{channel}' not found in current releases")
-        release = next(
-            (r for r in releases_data["releases"] if r["hash"] == release_hash),
-            None,
-        )
-    else:
-        release = next(
-            (r for r in releases_data["releases"] if r["version"] == target_version),
-            None,
-        )
-
-    if not release:
-        fatal_error(f"Version {target_version or 'latest'} not found in '{channel}'")
-
-    target_version = release["version"]
-    release_hash = release["hash"]
-    dart_version = release.get("dart_sdk_version")
-
-    if not dart_version:
-        fatal_error(f"No dart_sdk_version found for {target_version}")
-
-    if " " in dart_version:
-        dart_version = dart_version.split(" ")[2].strip("()")
-
-    engine_url = f"https://github.com/flutter/flutter/raw/{release_hash}/bin/internal/engine.version"
-    engine_version = fetch_url(engine_url).decode("utf-8").strip()
-
-    return target_version, engine_version, dart_version, channel
-
-
-def extract_nix_url(output: str) -> str:
-    try:
-        urls = json.loads(output)
-        return urls[0] if isinstance(urls, list) and urls else ""
-    except json.JSONDecodeError:
-        return output.strip('[]"').replace("\\", "")
-
-
-def get_dart_hashes(flutter_version: str) -> dict[str, str]:
-    version_str = get_version_str(flutter_version)
-    platforms = ["x86_64-darwin", "aarch64-darwin"]
-    if not requires_engine_hash(flutter_version):
-        platforms += ["x86_64-linux", "aarch64-linux"]
-    dart_hashes = {}
-
-    for system in platforms:
-        cmds = [
-            "--file",
-            ".",
-            f"flutterPackages-bin.v{version_str}.passthru.scope.dart.src.drvAttrs.urls",
-            "--system",
-            system,
-        ]
-        output = run_nix_eval(cmds)
-        url = extract_nix_url(output)
-
-        if not url:
-            fatal_error(f"No Dart SDK URL found for {system}")
-
-        dart_hashes[system] = run_nix_prefetch(url)
-
-    return dart_hashes
-
-
-def get_flutter_hash(flutter_version: str) -> str:
-    version_str = get_version_str(flutter_version)
-    cmds = [
-        "--file",
-        ".",
-        f"flutterPackages-bin.v{version_str}.passthru.scope.flutterSource.drvAttrs.urls",
-    ]
-    output = run_nix_eval(cmds)
-    url = extract_nix_url(output)
-
-    if not url:
-        fatal_error(f"No Flutter source URL found for {flutter_version}")
-
-    return run_nix_prefetch(url, unpack=True)
-
-
-def get_artifact_hashes(flutter_version: str, engine_version: str) -> dict[str, str]:
-    version_str = get_version_str(flutter_version)
-    nixpkgs_root = get_nixpkgs_root()
-
-    expr = (
-        f"let pkgs = import {nixpkgs_root} {{ }}; "
-        "in (builtins.map (x: x.path.url) "
-        f'pkgs.flutterPackages-bin."v{version_str}".passthru.scope.all-artifacts)'
-    )
-
-    output = run_nix_eval(["--expr", expr])
-
-    artifacts = json.loads(output)
-
-    if not isinstance(artifacts, list):
-        fatal_error("Artifacts is not a list")
-
-    artifact_hashes = {}
-    for url in artifacts:
-        if engine_version not in url:
-            continue
-
-        path_parts = url.split("/")
-
-        hash_idx = path_parts.index(engine_version)
-        path_key = "/".join(path_parts[hash_idx + 1 :])
-
-        if path_key not in artifact_hashes:
-            artifact_hashes[path_key] = run_nix_prefetch(url)
-
-    return artifact_hashes
-
-
-def get_pubspec_lock(flutter_version: str) -> dict[str, Any]:
-    version_str = get_version_str(flutter_version)
-    target = f".#flutterPackages-bin.v{version_str}.scope.flutterSource"
-
-    flutter_src_str = run_command([
-        "nix",
-        "build",
-        "--no-link",
-        "--print-out-paths",
-        target,
-    ])
-    if not flutter_src_str:
-        fatal_error(f"No Flutter source path found for {flutter_version}")
-
-    flutter_src = Path(flutter_src_str)
-
-    with tempfile.TemporaryDirectory(prefix="flutter_src_") as temp_dir_name:
-        temp_dir = Path(temp_dir_name)
-        flutter_copy = temp_dir / "flutter"
-
-        shutil.copytree(flutter_src, flutter_copy, symlinks=False)
-
-        for path_item in flutter_copy.rglob("*"):
-            path_item.chmod(path_item.stat().st_mode | stat.S_IWUSR)
-        flutter_copy.chmod(flutter_copy.stat().st_mode | stat.S_IWUSR)
-
-        flutter_tools_path = flutter_copy / "packages" / "flutter_tools"
-        if not flutter_tools_path.exists():
-            fatal_error(f"flutter_tools not found at {flutter_tools_path}")
-
-        run_command(["dart", "pub", "get"], cwd=flutter_tools_path)
-
-        pubspec_lock_path = flutter_tools_path / "pubspec.lock"
-        if not pubspec_lock_path.exists():
-            fatal_error(f"pubspec.lock not found at {pubspec_lock_path}")
-
-        with pubspec_lock_path.open("r", encoding="utf-8") as f:
-            return yaml.safe_load(f)
-
-
-def save_json(data: dict[str, Any], output_path: Path) -> None:
-    output_path.parent.mkdir(parents=True, exist_ok=True)
-    with output_path.open("w", encoding="utf-8") as f:
-        json.dump(data, f, indent=2, sort_keys=True)
-        f.write("\n")
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(
-        description="Update Flutter data.json for nixpkgs",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    parser.add_argument(
-        "--version",
-        type=str,
-        help="Specific Flutter version (e.g., 3.41.4). Uses latest from channel if omitted.",
-    )
-    parser.add_argument(
-        "--channel",
-        type=str,
-        default="stable",
-        choices=["stable", "beta"],
-        help="Release channel (default: stable)",
-    )
-
-    args = parser.parse_args()
-
-    logger.info("Fetching version data...")
-    flutter_version, engine_version, dart_version, channel = get_version_data(
-        args.version, args.channel
-    )
-
-    logger.info(f"Target Flutter Version: {flutter_version}")
-    logger.info(f"Engine Version (commit): {engine_version}")
-    logger.info(f"Dart Version: {dart_version}")
-
-    version_str = get_version_str(flutter_version)
-    version_dir = Path(__file__).resolve().parent / "versions" / version_str
-    output_path = version_dir / "data.json"
-
-    has_engine_hash = requires_engine_hash(flutter_version)
-
-    data = {
-        "version": flutter_version,
-        "engineVersion": engine_version,
-        "channel": channel,
-        "dartVersion": dart_version,
-        "dartHash": {},
-        "flutterHash": "",
-        "artifactHashes": {},
-        "pubspecLock": {},
-    }
-
-    save_json(data, output_path)
-
-    logger.info("Fetching Dart hashes...")
-    data["dartHash"] = get_dart_hashes(flutter_version)
-
-    if has_engine_hash:
-        data["dartHash"]["linux"] = (
-            "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
-        )
-        save_json(data, output_path)
-        logger.info("Running nix-update for dart hash...")
-        run_command([
-            "nix-update",
-            "--version",
-            "skip",
-            "--override-filename",
-            str(output_path),
-            f"flutterPackages-source.v{version_str}.passthru.scope.dart",
-        ])
-        with output_path.open("r", encoding="utf-8") as f:
-            updated_data = json.load(f)
-        data["dartHash"]["linux"] = updated_data.get("dartHash")["linux"]
-
-        data["engineHash"] = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
-        save_json(data, output_path)
-        logger.info("Running nix-update for engine hash...")
-        run_command([
-            "nix-update",
-            "--version",
-            "skip",
-            "--override-filename",
-            str(output_path),
-            f"flutterPackages-source.v{version_str}.passthru.scope.engine",
-        ])
-        with output_path.open("r", encoding="utf-8") as f:
-            updated_data = json.load(f)
-        data["engineHash"] = updated_data.get("engineHash")
-
-    logger.info("Fetching Flutter source hash...")
-    data["flutterHash"] = get_flutter_hash(flutter_version)
-
-    logger.info("Fetching artifact hashes...")
-    data["artifactHashes"] = get_artifact_hashes(flutter_version, engine_version)
-
-    save_json(data, output_path)
-
-    logger.info("Generating pubspec.lock...")
-    data["pubspecLock"] = get_pubspec_lock(flutter_version)
-
-    save_json(data, output_path)
-
-    logger.info(f"Update complete. Data written to {output_path}")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
new file mode 100644
index 000000000000..8edff6a2e876
--- /dev/null
+++ b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
@@ -0,0 +1,44 @@
+{
+  callPackage,
+  flutterPackages,
+  lib,
+  symlinkJoin,
+}:
+let
+  nixpkgsRoot = "@nixpkgs_root@";
+  flutterCompactVersion = "@flutter_compact_version@";
+
+  flutterPlatforms = [
+    "android"
+    "ios"
+    "web"
+    "linux"
+    "windows"
+    "macos"
+    "fuchsia"
+    "universal"
+  ];
+  systemPlatforms = [
+    "x86_64-linux"
+    "aarch64-linux"
+    "x86_64-darwin"
+    "aarch64-darwin"
+  ];
+
+  derivations = lib.foldl' (
+    acc: flutterPlatform:
+    acc
+    ++ (map (
+      systemPlatform:
+      callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix" {
+        flutter = flutterPackages."v${flutterCompactVersion}";
+        inherit flutterPlatform systemPlatform;
+        hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+      }
+    ) systemPlatforms)
+  ) [ ] flutterPlatforms;
+in
+symlinkJoin {
+  name = "evaluate-derivations";
+  paths = derivations;
+}
diff --git a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
new file mode 100644
index 000000000000..0972a3578b52
--- /dev/null
+++ b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
@@ -0,0 +1,22 @@
+{
+  lib,
+  fetchurl,
+}:
+
+let
+  dartVersion = "@dart_version@";
+  system =
+    {
+      x86_64-linux = "linux-x64";
+      aarch64-linux = "linux-arm64";
+      x86_64-darwin = "macos-x64";
+      aarch64-darwin = "macos-arm64";
+    }
+    ."@platform@";
+in
+fetchurl {
+  url = "https://storage.googleapis.com/dart-archive/channels/${
+    if lib.strings.hasSuffix ".beta" dartVersion then "beta" else "stable"
+  }/release/${dartVersion}/sdk/dartsdk-${system}-release.zip";
+  hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+}
diff --git a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
new file mode 100644
index 000000000000..c96a7b9adad2
--- /dev/null
+++ b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
@@ -0,0 +1,36 @@
+{
+  callPackage,
+  symlinkJoin,
+  lib,
+}:
+let
+  nixpkgsRoot = "@nixpkgs_root@";
+  version = "@flutter_version@";
+  engineVersion = "@engine_version@";
+
+  systemPlatforms = [
+    "x86_64-linux"
+    "aarch64-linux"
+  ];
+
+  derivations = lib.foldl' (
+    acc: buildPlatform:
+    acc
+    ++ (map (
+      targetPlatform:
+      callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" {
+        targetPlatform = lib.systems.elaborate targetPlatform;
+        hostPlatform = lib.systems.elaborate buildPlatform;
+        buildPlatform = lib.systems.elaborate buildPlatform;
+        flutterVersion = version;
+        version = engineVersion;
+        url = "https://github.com/flutter/flutter.git@${engineVersion}";
+        hashes."${buildPlatform}"."${targetPlatform}" = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+      }
+    ) systemPlatforms)
+  ) [ ] systemPlatforms;
+in
+symlinkJoin {
+  name = "evaluate-derivations";
+  paths = derivations;
+}
diff --git a/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in b/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in
new file mode 100644
index 000000000000..aa71f8ae2ad3
--- /dev/null
+++ b/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in
@@ -0,0 +1,10 @@
+{ fetchgit }:
+fetchgit {
+  url = "https://swiftshader.googlesource.com/SwiftShader.git";
+  rev = "@engine_swiftshader_rev@";
+
+  # Keep with in sync of pkgs/development/compilers/flutter/engine/package.nix
+  postFetch = ''
+    rm -rf $out/third_party/llvm-project
+  '';
+}
diff --git a/pkgs/development/compilers/flutter/update/get-flutter.nix.in b/pkgs/development/compilers/flutter/update/get-flutter.nix.in
new file mode 100644
index 000000000000..02d802e026f0
--- /dev/null
+++ b/pkgs/development/compilers/flutter/update/get-flutter.nix.in
@@ -0,0 +1,7 @@
+{ fetchFromGitHub }:
+fetchFromGitHub {
+  owner = "flutter";
+  repo = "flutter";
+  tag = "@flutter_version@";
+  hash = "@hash@";
+}
diff --git a/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in b/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
new file mode 100644
index 000000000000..3d87a69815e7
--- /dev/null
+++ b/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
@@ -0,0 +1,40 @@
+{
+  flutterPackages,
+  stdenv,
+  cacert,
+  writableTmpDirAsHomeHook,
+}:
+let
+  flutterCompactVersion = "@flutter_compact_version@";
+  inherit (flutterPackages."v${flutterCompactVersion}") dart;
+in
+stdenv.mkDerivation (finalAttrs: {
+  name = "pubspec-lock";
+  src = @flutter_src@;
+
+  nativeBuildInputs = [
+    dart
+    writableTmpDirAsHomeHook
+  ];
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "@hash@";
+
+  buildPhase = ''
+    runHook preBuild
+
+    cd packages/flutter_tools
+    dart --root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt pub get
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp pubspec.lock $out
+
+    runHook postInstall
+  '';
+})
diff --git a/pkgs/development/compilers/flutter/update/update.py b/pkgs/development/compilers/flutter/update/update.py
new file mode 100755
index 000000000000..7a28cc46d949
--- /dev/null
+++ b/pkgs/development/compilers/flutter/update/update.py
@@ -0,0 +1,501 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3Packages.pyyaml
+
+import argparse
+import json
+import os
+import re
+import subprocess
+import sys
+import tempfile
+import urllib.request
+from pathlib import Path
+
+import yaml
+
+FAKE_HASH = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+
+NIXPKGS_ROOT = (
+    subprocess.Popen(
+        ["git", "rev-parse", "--show-toplevel"], stdout=subprocess.PIPE, text=True
+    )
+    .communicate()[0]
+    .strip()
+)
+
+
+def load_code(name, **kwargs):
+    with Path(
+        f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/update/{name}.in"
+    ).open("r", encoding="utf-8") as f:
+        code = f.read()
+
+    for key, value in kwargs.items():
+        code = code.replace(f"@{key}@", value)
+
+    return code
+
+
+# Return out paths
+def nix_build(code):
+    with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8", delete=False) as temp:
+        temp.write(code)
+        temp.flush()
+        os.fsync(temp.fileno())
+    temp_name = temp.name
+
+    process = subprocess.Popen(
+        [
+            "nix-build",
+            "--impure",
+            "--no-out-link",
+            "--expr",
+            f"with import {NIXPKGS_ROOT} {{}}; callPackage {temp_name} {{}}",
+        ],
+        stdout=subprocess.PIPE,
+        text=True,
+    )
+
+    process.wait()
+    Path(temp_name).unlink()  # Clean up the temporary file
+    return process.stdout.read().strip().splitlines()[0]
+
+
+# Return errors
+def nix_build_to_fail(code):
+    with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8", delete=False) as temp:
+        temp.write(code)
+        temp.flush()
+        os.fsync(temp.fileno())
+    temp_name = temp.name
+
+    process = subprocess.Popen(
+        [
+            "nix-build",
+            "--impure",
+            "--keep-going",
+            "--no-link",
+            "--expr",
+            f"with import {NIXPKGS_ROOT} {{}}; callPackage {temp_name} {{}}",
+        ],
+        stderr=subprocess.PIPE,
+        text=True,
+    )
+
+    stderr = ""
+    while True:
+        line = process.stderr.readline()
+        if not line:
+            break
+        stderr += line
+        print(line.strip())
+
+    process.wait()
+    Path(temp_name).unlink()  # Clean up the temporary file
+    return stderr
+
+
+def get_engine_hashes(engine_version, flutter_version):
+    code = load_code(
+        "get-engine-hashes.nix",
+        nixpkgs_root=NIXPKGS_ROOT,
+        flutter_version=flutter_version,
+        engine_version=engine_version,
+    )
+
+    stderr = nix_build_to_fail(code)
+
+    pattern = re.compile(
+        rf"/nix/store/.*-flutter-engine-source-{engine_version}-(.+?-.+?)-(.+?-.+?).drv':\n\s+specified: .*\n\s+got:\s+(.+?)\n"
+    )
+    matches = pattern.findall(stderr)
+    result_dict = {}
+
+    for match in matches:
+        flutter_platform, architecture, got = match
+        result_dict.setdefault(flutter_platform, {})[architecture] = got
+
+    def sort_dict_recursive(d):
+        return {
+            k: sort_dict_recursive(v) if isinstance(v, dict) else v
+            for k, v in sorted(d.items())
+        }
+
+    return sort_dict_recursive(result_dict)
+
+
+def get_artifact_hashes(flutter_compact_version):
+    code = load_code(
+        "get-artifact-hashes.nix",
+        nixpkgs_root=NIXPKGS_ROOT,
+        flutter_compact_version=flutter_compact_version,
+    )
+
+    stderr = nix_build_to_fail(code)
+
+    pattern = re.compile(
+        r"/nix/store/.*-flutter-artifacts-(.+?)-(.+?).drv':\n\s+specified: .*\n\s+got:\s+(.+?)\n"
+    )
+    matches = pattern.findall(stderr)
+    result_dict = {}
+
+    for match in matches:
+        flutter_platform, architecture, got = match
+        result_dict.setdefault(flutter_platform, {})[architecture] = got
+
+    def sort_dict_recursive(d):
+        return {
+            k: sort_dict_recursive(v) if isinstance(v, dict) else v
+            for k, v in sorted(d.items())
+        }
+
+    return sort_dict_recursive(result_dict)
+
+
+def get_dart_hashes(dart_version, channel):
+    platforms = ["x86_64-linux", "aarch64-linux", "x86_64-darwin", "aarch64-darwin"]
+    result_dict = {}
+    for platform in platforms:
+        code = load_code(
+            "get-dart-hashes.nix",
+            dart_version=dart_version,
+            platform=platform,
+        )
+        stderr = nix_build_to_fail(code)
+
+        pattern = re.compile(r"got:\s+(.+?)\n")
+        result_dict[platform] = pattern.findall(stderr)[0]
+
+    return result_dict
+
+
+def get_flutter_hash_and_src(flutter_version):
+    code = load_code("get-flutter.nix", flutter_version=flutter_version, hash="")
+
+    stderr = nix_build_to_fail(code)
+    pattern = re.compile(r"got:\s+(.+?)\n")
+    flutter_hash_value = pattern.findall(stderr)[0]
+
+    code = load_code(
+        "get-flutter.nix", flutter_version=flutter_version, hash=flutter_hash_value
+    )
+
+    return (flutter_hash_value, nix_build(code))
+
+
+def get_pubspec_lock(flutter_compact_version, flutter_src):
+    code = load_code(
+        "get-pubspec-lock.nix",
+        flutter_compact_version=flutter_compact_version,
+        flutter_src=flutter_src,
+        hash="",
+    )
+
+    stderr = nix_build_to_fail(code)
+    pattern = re.compile(r"got:\s+(.+?)\n")
+    pubspec_lock_hash = pattern.findall(stderr)[0]
+
+    code = load_code(
+        "get-pubspec-lock.nix",
+        flutter_compact_version=flutter_compact_version,
+        flutter_src=flutter_src,
+        hash=pubspec_lock_hash,
+    )
+
+    pubspec_lock_file = nix_build(code)
+
+    with Path(pubspec_lock_file).open("r", encoding="utf-8") as f:
+        pubspec_lock_yaml = f.read()
+
+    return yaml.safe_load(pubspec_lock_yaml)
+
+
+def get_engine_swiftshader_rev(engine_version):
+    with urllib.request.urlopen(
+        f"https://github.com/flutter/flutter/raw/{engine_version}/DEPS"
+    ) as f:
+        deps = f.read().decode("utf-8")
+        pattern = re.compile(
+            r"Var\('swiftshader_git'\) \+ '\/SwiftShader\.git' \+ '@' \+ \'([0-9a-fA-F]{40})\'\,"
+        )
+        return pattern.findall(deps)[0]
+
+
+def get_engine_swiftshader_hash(engine_swiftshader_rev):
+    code = load_code(
+        "get-engine-swiftshader.nix",
+        engine_swiftshader_rev=engine_swiftshader_rev,
+        hash="",
+    )
+
+    stderr = nix_build_to_fail(code)
+    pattern = re.compile(r"got:\s+(.+?)\n")
+    return pattern.findall(stderr)[0]
+
+
+def write_data(
+    nixpkgs_flutter_version_directory,
+    flutter_version,
+    channel,
+    engine_hash,
+    engine_hashes,
+    engine_swiftshader_hash,
+    engine_swiftshader_rev,
+    dart_version,
+    dart_hash,
+    flutter_hash,
+    artifact_hashes,
+    pubspec_lock,
+):
+    with Path(f"{nixpkgs_flutter_version_directory}/data.json").open(
+        "w", encoding="utf-8"
+    ) as f:
+        f.write(
+            json.dumps(
+                {
+                    "version": flutter_version,
+                    "engineVersion": engine_hash,
+                    "engineSwiftShaderHash": engine_swiftshader_hash,
+                    "engineSwiftShaderRev": engine_swiftshader_rev,
+                    "channel": channel,
+                    "engineHashes": engine_hashes,
+                    "dartVersion": dart_version,
+                    "dartHash": dart_hash,
+                    "flutterHash": flutter_hash,
+                    "artifactHashes": artifact_hashes,
+                    "pubspecLock": pubspec_lock,
+                },
+                indent=2,
+            ).strip()
+            + "\n"
+        )
+
+
+def update_all_packages():
+    versions_directory = f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/versions"
+    versions = [d.name for d in Path(versions_directory).iterdir()]
+    versions = sorted(
+        versions,
+        key=lambda x: (int(x.split("_")[0]), int(x.split("_")[1])),
+        reverse=True,
+    )
+
+    new_content = [
+        "flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });",
+        "flutterPackages-source = recurseIntoAttrs (",
+        "  callPackage ../development/compilers/flutter { useNixpkgsEngine = true; }",
+        ");",
+        "flutterPackages = flutterPackages-bin;",
+        "flutter = flutterPackages.stable;",
+    ] + [
+        f"flutter{version.replace('_', '')} = flutterPackages.v{version};"
+        for version in versions
+    ]
+
+    with Path(f"{NIXPKGS_ROOT}/pkgs/top-level/all-packages.nix").open(
+        "r", encoding="utf-8"
+    ) as file:
+        lines = file.read().splitlines(keepends=True)
+
+    start = -1
+    end = -1
+    for i, line in enumerate(lines):
+        if (
+            "flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });"
+            in line
+        ):
+            start = i
+        if start != -1 and len(line.strip()) == 0:
+            end = i
+            break
+
+    if start != -1 and end != -1:
+        del lines[start:end]
+        lines[start:start] = [f"  {line}\n" for line in new_content]
+
+    with Path(f"{NIXPKGS_ROOT}/pkgs/top-level/all-packages.nix").open(
+        "w", encoding="utf-8"
+    ) as file:
+        file.write("".join(lines))
+
+
+# Finds Flutter version, Dart version, and Engine hash.
+# If the Flutter version is given, it uses that. Otherwise finds the
+# latest stable Flutter version.
+def find_versions(flutter_version=None, channel=None):
+    engine_hash = None
+    dart_version = None
+
+    releases = json.load(
+        urllib.request.urlopen(
+            "https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json"
+        )
+    )
+
+    if not channel:
+        channel = "stable"
+
+    if not flutter_version:
+        release_hash = releases["current_release"][channel]
+        release = next(
+            filter(
+                lambda release: release["hash"] == release_hash, releases["releases"]
+            )
+        )
+        flutter_version = release["version"]
+
+    tags = (
+        subprocess.Popen(
+            ["git", "ls-remote", "--tags", "https://github.com/flutter/flutter.git"],
+            stdout=subprocess.PIPE,
+            text=True,
+        )
+        .communicate()[0]
+        .strip()
+    )
+
+    try:
+        flutter_hash = (
+            next(
+                filter(
+                    lambda line: line.endswith(f"refs/tags/{flutter_version}"),
+                    tags.splitlines(),
+                )
+            )
+            .split("refs")[0]
+            .strip()
+        )
+
+        engine_hash = (
+            urllib.request.urlopen(
+                f"https://github.com/flutter/flutter/raw/{flutter_hash}/bin/internal/engine.version"
+            )
+            .read()
+            .decode("utf-8")
+            .strip()
+        )
+    except StopIteration:
+        sys.exit(f"Couldn't find Engine hash for Flutter version: {flutter_version}")
+
+    try:
+        dart_version = next(
+            filter(
+                lambda release: release["version"] == flutter_version,
+                releases["releases"],
+            )
+        )["dart_sdk_version"]
+
+        if " " in dart_version:
+            dart_version = dart_version.split(" ")[2][:-1]
+    except StopIteration:
+        sys.exit(f"Couldn't find Dart version for Flutter version: {flutter_version}")
+
+    return (flutter_version, engine_hash, dart_version, channel)
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Update Flutter in Nixpkgs")
+    parser.add_argument("--version", type=str, help="Specify Flutter version")
+    parser.add_argument("--channel", type=str, help="Specify Flutter release channel")
+    parser.add_argument(
+        "--artifact-hashes", action="store_true", help="Whether to get artifact hashes"
+    )
+    args = parser.parse_args()
+
+    (flutter_version, engine_hash, dart_version, channel) = find_versions(
+        args.version, args.channel
+    )
+
+    flutter_compact_version = "_".join(flutter_version.split(".")[:2])
+
+    if args.artifact_hashes:
+        print(
+            json.dumps(get_artifact_hashes(flutter_compact_version), indent=2).strip()
+            + "\n"
+        )
+        return
+
+    print(
+        f"Flutter version: {flutter_version} ({flutter_compact_version}) on ({channel})"
+    )
+    print(f"Engine hash: {engine_hash}")
+    print(f"Dart version: {dart_version}")
+
+    dart_hash = get_dart_hashes(dart_version, channel)
+    (flutter_hash, flutter_src) = get_flutter_hash_and_src(flutter_version)
+
+    nixpkgs_flutter_version_directory = f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/versions/{flutter_compact_version}"
+
+    if Path(f"{nixpkgs_flutter_version_directory}/data.json").exists():
+        Path(f"{nixpkgs_flutter_version_directory}/data.json").unlink()
+    Path(nixpkgs_flutter_version_directory).mkdir(parents=True, exist_ok=True)
+
+    update_all_packages()
+
+    common_data_args = {
+        "nixpkgs_flutter_version_directory": nixpkgs_flutter_version_directory,
+        "flutter_version": flutter_version,
+        "channel": channel,
+        "dart_version": dart_version,
+        "engine_hash": engine_hash,
+        "flutter_hash": flutter_hash,
+        "dart_hash": dart_hash,
+    }
+
+    write_data(
+        pubspec_lock={},
+        artifact_hashes={},
+        engine_hashes={},
+        engine_swiftshader_hash=FAKE_HASH,
+        engine_swiftshader_rev="0",
+        **common_data_args,
+    )
+
+    pubspec_lock = get_pubspec_lock(flutter_compact_version, flutter_src)
+
+    write_data(
+        pubspec_lock=pubspec_lock,
+        artifact_hashes={},
+        engine_hashes={},
+        engine_swiftshader_hash=FAKE_HASH,
+        engine_swiftshader_rev="0",
+        **common_data_args,
+    )
+
+    artifact_hashes = get_artifact_hashes(flutter_compact_version)
+
+    write_data(
+        pubspec_lock=pubspec_lock,
+        artifact_hashes=artifact_hashes,
+        engine_hashes={},
+        engine_swiftshader_hash=FAKE_HASH,
+        engine_swiftshader_rev="0",
+        **common_data_args,
+    )
+
+    engine_hashes = get_engine_hashes(engine_hash, flutter_version)
+
+    write_data(
+        pubspec_lock=pubspec_lock,
+        artifact_hashes=artifact_hashes,
+        engine_hashes=engine_hashes,
+        engine_swiftshader_hash=FAKE_HASH,
+        engine_swiftshader_rev="0",
+        **common_data_args,
+    )
+
+    engine_swiftshader_rev = get_engine_swiftshader_rev(engine_hash)
+    engine_swiftshader_hash = get_engine_swiftshader_hash(engine_swiftshader_rev)
+
+    write_data(
+        pubspec_lock=pubspec_lock,
+        artifact_hashes=artifact_hashes,
+        engine_hashes=engine_hashes,
+        engine_swiftshader_hash=engine_swiftshader_hash,
+        engine_swiftshader_rev=engine_swiftshader_rev,
+        **common_data_args,
+    )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/pkgs/development/compilers/flutter/versions/3_29/data.json b/pkgs/development/compilers/flutter/versions/3_29/data.json
index 295ee16b5fcb..a3c5323a3aef 100644
--- a/pkgs/development/compilers/flutter/versions/3_29/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_29/data.json
@@ -1,80 +1,75 @@
 {
-  "artifactHashes": {
-    "android-arm-profile/artifacts.zip": "sha256-5YqQUqktJUztmJ8BKIgms1THk4ZJ7Gn1fOy4nzILnXc=",
-    "android-arm-profile/darwin-x64.zip": "sha256-OEDxV6NyfUu87O1b4rs7ZMEx4tcTKHN4+HtkxDG93QA=",
-    "android-arm-profile/linux-x64.zip": "sha256-EEw/zY2eCeHXYoKp0lPCQEa3WQ44Ac6ETHF8a+ZWO+c=",
-    "android-arm-profile/windows-x64.zip": "sha256-mPcL6iOno0XAeAUcoXyPkLy4DQBMPQkHRXLWBiyBs5o=",
-    "android-arm-release/artifacts.zip": "sha256-YsmAQyVS5nvINOzwIEzjlhN0JX7l9RrfLOai+SOcbTo=",
-    "android-arm-release/darwin-x64.zip": "sha256-z71217SH8gpnGss3h6Dmga5vFydwhBo+eghFvc6cD4U=",
-    "android-arm-release/linux-x64.zip": "sha256-TgUJ9TBQurr1M5TmYvmUuAe2fsCKRTrq2I9MdJ+DN4U=",
-    "android-arm-release/windows-x64.zip": "sha256-j8LOfJ5XyO8PIwF8ZnvVekWAG1PNgCCcSYFAbiESUsM=",
-    "android-arm/artifacts.zip": "sha256-XDQvEKs/uYpOckInNFDJduuOmRZAepHGdOiGVZ1Gqgo=",
-    "android-arm64-profile/artifacts.zip": "sha256-KGyCUre2r1BR1QnkIEZrdruLA56zKc4DOMIKCV8tMKk=",
-    "android-arm64-profile/darwin-x64.zip": "sha256-hoO1FlgNxQKC2RXDdIbHdgrrXAnpXVF6tYBhWYA0vAs=",
-    "android-arm64-profile/linux-x64.zip": "sha256-lZxErv1Dw5HDWDRAOuGGkd6G5JPvgPHSDAdYa02Fn7I=",
-    "android-arm64-profile/windows-x64.zip": "sha256-Or9sFk9wgnu6mpV3L4CU3w+DeOldsF+dGXgLGMyIJQk=",
-    "android-arm64-release/artifacts.zip": "sha256-NcKkplrWu2A5e+3Xd2rDCd54lrO0JckqIDlxgwaflIc=",
-    "android-arm64-release/darwin-x64.zip": "sha256-2HwoWjucRwA2MWYuOqEOdcGsMsFPNtna1dUgHDHQvMc=",
-    "android-arm64-release/linux-x64.zip": "sha256-SlEhHUhr8dTM8ykXarlA3fZBEiY4UVOwuJW54M7mu8g=",
-    "android-arm64-release/windows-x64.zip": "sha256-s/jwY4XLQkANEHac1D05xNTmOQ+ee/XmCJmu75zq9DY=",
-    "android-arm64/artifacts.zip": "sha256-dcN5d1AbWZKsEytj1IHzzo71Q8oKyMBjfGNiMMwBGqs=",
-    "android-x64-profile/artifacts.zip": "sha256-/j00KLxumCl0YeJXllXs7cTGteW/zgUaOWobuRMOEiQ=",
-    "android-x64-profile/darwin-x64.zip": "sha256-FOoJI/SYMWv+I308L9mzOfjb6YWRHFsExwWwiaszbE8=",
-    "android-x64-profile/linux-x64.zip": "sha256-SjnWs/ahkTCqq8XazWxr3KT6YErT1d1+puHCT/AevGM=",
-    "android-x64-profile/windows-x64.zip": "sha256-zc2EHmeLx383uUsVE1Tqr4Y4oMOPPnyb1vP6NWtSIXs=",
-    "android-x64-release/artifacts.zip": "sha256-ERy3zRJfQgenp5yrB2yLlcbBJCMjgCoDljRXSmtUcMc=",
-    "android-x64-release/darwin-x64.zip": "sha256-hngQzsx28eSKZPmSIGdDiwB6ACxWFb19Hoxbgs9De1o=",
-    "android-x64-release/linux-x64.zip": "sha256-/qK/lM4nOStr+uhCfyhczbKZShOyrlSEl8QtCecGlSk=",
-    "android-x64-release/windows-x64.zip": "sha256-hYIPyGDtK0ovpXPlVyGIxIK4YaBinzhMfYBga6UWxNE=",
-    "android-x64/artifacts.zip": "sha256-uKXp/pL8aq++kwNwltjH3cN1/+N78nAZKQy97KSC+Fw=",
-    "android-x86/artifacts.zip": "sha256-IgotpG/va94e0ZWRc9PFkZBxT5JXuWk+5Mk5n10y1yw=",
-    "darwin-arm64/artifacts.zip": "sha256-vrxj4NezowGxLaYCdbDPXiCHZsqbv1bTkxOX3qzJv+w=",
-    "darwin-arm64/font-subset.zip": "sha256-4wlQrcmx450Vg7ShtcoKuJ5YtGkTitdHZ/fsRtEDJWw=",
-    "darwin-x64-profile/artifacts.zip": "sha256-g22kEEy8AIbVA6qZAcQLX9BB6ifafzL9xNCug+IaeAo=",
-    "darwin-x64-profile/framework.zip": "sha256-vEYX6NavbMoT+u97wr7K0b4NMal1yO9/M4bFWuZHapY=",
-    "darwin-x64-profile/gen_snapshot.zip": "sha256-j/kdHmCoC1JdycTT0FpoQ7f/VX1ZTUSKWmKsqI/CkKs=",
-    "darwin-x64-release/artifacts.zip": "sha256-NGMfznwDSIIYNuGbjDojfoprfTk71xP0mhXmp6hyo4g=",
-    "darwin-x64-release/framework.zip": "sha256-iYq0LTZb9D77Zd6PCfPk8cwEBUMj7ImV3648qNFkNfs=",
-    "darwin-x64-release/gen_snapshot.zip": "sha256-zj/+5Ox40f/FDYHH1h5QL3CAYf72IJwwKO5pVZ0MefE=",
-    "darwin-x64/artifacts.zip": "sha256-DgUPPScyhCox1CpeqrNuj93e64fGwmUzCRrFuPd3Mjo=",
-    "darwin-x64/font-subset.zip": "sha256-kBPObRjfcyt/qN689Wyj1P0FkRdNlzUTVuLZ+MchaxE=",
-    "darwin-x64/framework.zip": "sha256-AJKtDRsrW44P42zwFNepUHHPg5ZBNXlqnkYipGFYvbg=",
-    "darwin-x64/gen_snapshot.zip": "sha256-oH3sRPVJRPTagJCpEJ6sJj99ScIt9whgFwQnZuLvQx4=",
-    "flutter-web-sdk.zip": "sha256-5fcBtu5xh73o34UNgKl852HOpyu2iwk2KNzVHCgfO84=",
-    "flutter_gpu.zip": "sha256-ZUldHLUkF8nFaAdzB6e6SEfjwHf9s1NV+pafhs8Jj1E=",
-    "flutter_patched_sdk.zip": "sha256-7uxxBt/ubgVg+15d/o/UOnWAG69yx34psG7f4S3lvJw=",
-    "flutter_patched_sdk_product.zip": "sha256-jE2H3RD1mHFUWi+T2oLxaE8j+Pg8O9MbLc3C1636XsQ=",
-    "ios-profile/artifacts.zip": "sha256-hSW6t3ZwvQ9MpAv+sA1ymvF8eISViWb9OiflOZH1aDo=",
-    "ios-release/artifacts.zip": "sha256-L6xse/UqQMTtPNi/b6fYjj/RR+uLCd372sQsNRlyo1Q=",
-    "ios/artifacts.zip": "sha256-FJUsbkiq9ZW9CiriRzUL7Be8fChRgGnM0FJ/HeWlks8=",
-    "linux-arm64-debug/linux-arm64-flutter-gtk.zip": "sha256-eThLDiCqnewYjHNCnZM0COS9Cr5D9XjC+mtaUk0lcOA=",
-    "linux-arm64-profile/linux-arm64-flutter-gtk.zip": "sha256-YpQwuVqRJHY/DtR18nJucOvC9/hweQMBLt4BTCbHWWE=",
-    "linux-arm64-release/linux-arm64-flutter-gtk.zip": "sha256-/1OssZKRXtO5V6zLog5jv+H4nal3ied8kldMUGlISD8=",
-    "linux-arm64/artifacts.zip": "sha256-mkJdwu5KahaMU+lDtqhgFVcaYAZC4BZjYZ4RdMCgmHM=",
-    "linux-arm64/font-subset.zip": "sha256-n51PYirH0ZuM5z16re+XGxrntTpvFUUVfrP4KiBvbZ4=",
-    "linux-x64-debug/linux-x64-flutter-gtk.zip": "sha256-ESZ6xJR14JFfQ8PYJBdb8HA1V37ODpJHt0rLF8CanVA=",
-    "linux-x64-profile/linux-x64-flutter-gtk.zip": "sha256-VDXUMsTaAbpTDj+1xnQ+UhA9upWgpGG+n4XgBWLbhhM=",
-    "linux-x64-release/linux-x64-flutter-gtk.zip": "sha256-gtGWH+EhGLpk5NkGorhcIQSNX4TVg7F7+7blY5s4NrM=",
-    "linux-x64/artifacts.zip": "sha256-sFklXc5SwJTlQtaHNHD5sye+9xWRrLmng2LsNI5QhHk=",
-    "linux-x64/font-subset.zip": "sha256-cQbvsbn13uhWnx4tZPEJnVBaubv/lhYn1ethyhhgHds=",
-    "sky_engine.zip": "sha256-R2mm5f0qkn5ziknBT+XV0PwarRaCtwo9lTdD6mk2Kig=",
-    "windows-x64-debug/windows-x64-flutter.zip": "sha256-TxOA/F2oxNoOy7mUZfy/MsnVyGw64kFy2WV88Y5FVVw=",
-    "windows-x64-profile/windows-x64-flutter.zip": "sha256-osnuasxTGq3OqxYqSMlYSC/K1V4RXJDWuY6H9oJQnc4=",
-    "windows-x64-release/windows-x64-flutter.zip": "sha256-dLGNkXp51LusJquBM9UrL92WFUDDC5G0K0DDRd04iAU=",
-    "windows-x64/artifacts.zip": "sha256-XkzPHFwQsuNLIMn62VG9u6fQp2ABSXEtaf7oq7MM+J8=",
-    "windows-x64/flutter-cpp-client-wrapper.zip": "sha256-gdLKahdiHCths6t7Iy+YwapgBga0yhDxktVtO43jHkY=",
-    "windows-x64/font-subset.zip": "sha256-k3ke2TlZiuSQYQEp2WshLccGotJpHYBfnTQJQK4Wg4o="
-  },
+  "version": "3.29.3",
+  "engineVersion": "cf56914b326edb0ccb123ffdc60f00060bd513fa",
+  "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
+  "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
   "channel": "stable",
-  "dartHash": {
-    "aarch64-darwin": "sha256-EG5j2VkAkJk6le5R5ocp3i0Jyit7e9FsC1+1emCzZXw=",
-    "aarch64-linux": "sha256-NFLMrWHgV+t/oX6F7RqgNdRMNuM9rAdlVxd5j0fmTKg=",
-    "x86_64-darwin": "sha256-BgiG0riugy+Jzn25ce62IYpQfjcHEVJIfdUuslakSa4=",
-    "x86_64-linux": "sha256-whb91w9lbFDHjcag/65uXO16mnzO3qPkAvprXr4keIw="
+  "engineHashes": {
+    "aarch64-linux": {
+      "aarch64-linux": "sha256-3BIBG9z433CDsBqX1T6K2y5kUI5ZTqXBBXLoCrX/f2A=",
+      "x86_64-linux": "sha256-3BIBG9z433CDsBqX1T6K2y5kUI5ZTqXBBXLoCrX/f2A="
+    },
+    "x86_64-linux": {
+      "aarch64-linux": "sha256-+4CswkW7+0gBcZKrLjugTIG5NWAxCB8y39iUxdND2I4=",
+      "x86_64-linux": "sha256-+4CswkW7+0gBcZKrLjugTIG5NWAxCB8y39iUxdND2I4="
+    }
   },
   "dartVersion": "3.7.2",
-  "engineVersion": "cf56914b326edb0ccb123ffdc60f00060bd513fa",
+  "dartHash": {
+    "x86_64-linux": "sha256-ClgSWEu0+lLcPIlabVvBY197/c/kyio6Zoq3KppbW3Y=",
+    "aarch64-linux": "sha256-NACnkq/pVMiWxfAt4+bkUjM0ZLwBWk5GQrbc9HGFE4k=",
+    "x86_64-darwin": "sha256-liZz9Bj1RFH7vmEpdMiJ9/h3Yut/o0qEBvydq8dGdKs=",
+    "aarch64-darwin": "sha256-544u8sIlQudxjBCSZlnQESLsOOdWp5h4lVTaY9P+pRQ="
+  },
   "flutterHash": "sha256-VWmKhxjerGKmw9fXhrRRVcKpUhefmJ2agRkIyWeAOO4=",
+  "artifactHashes": {
+    "android": {
+      "aarch64-darwin": "sha256-xWeagoJGFkHKW0oT5FSJCy254qemp5jZq/zXpadOrVY=",
+      "aarch64-linux": "sha256-2z7PgRGqUlFQZHJ53EdDT4p5Vk6OT2BJKx2QwSF7/QI=",
+      "x86_64-darwin": "sha256-xWeagoJGFkHKW0oT5FSJCy254qemp5jZq/zXpadOrVY=",
+      "x86_64-linux": "sha256-2z7PgRGqUlFQZHJ53EdDT4p5Vk6OT2BJKx2QwSF7/QI="
+    },
+    "fuchsia": {
+      "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
+      "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
+      "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
+      "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
+    },
+    "ios": {
+      "aarch64-darwin": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=",
+      "aarch64-linux": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=",
+      "x86_64-darwin": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=",
+      "x86_64-linux": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k="
+    },
+    "linux": {
+      "aarch64-darwin": "sha256-W8usesonlRBxd5CFQyQAyVfx4yMkd2UcZWbhVlB8Jwc=",
+      "aarch64-linux": "sha256-W8usesonlRBxd5CFQyQAyVfx4yMkd2UcZWbhVlB8Jwc=",
+      "x86_64-darwin": "sha256-RxNVQpRR4EWbK0WD+d6tZbweW3QE7Z3fipKFpf4YyG8=",
+      "x86_64-linux": "sha256-RxNVQpRR4EWbK0WD+d6tZbweW3QE7Z3fipKFpf4YyG8="
+    },
+    "macos": {
+      "aarch64-darwin": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=",
+      "aarch64-linux": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=",
+      "x86_64-darwin": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=",
+      "x86_64-linux": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE="
+    },
+    "universal": {
+      "aarch64-darwin": "sha256-MxtHKccpQfurtKumtp00CRqB/riU5+wiHsuUh4sCXVY=",
+      "aarch64-linux": "sha256-w2onIP0zkg8N/vsnC9DKCrG4iIUvRiBhbHvSJYzW/fQ=",
+      "x86_64-darwin": "sha256-vq4/tCBQQtmJarcnrrL+saCUKS/xCoFHmKAxBSn1edI=",
+      "x86_64-linux": "sha256-TglGaiwmbxCYJ6bk1zJwhIYlPf3+VVTO5zCMpzyu/JY="
+    },
+    "web": {
+      "aarch64-darwin": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=",
+      "aarch64-linux": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=",
+      "x86_64-darwin": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=",
+      "x86_64-linux": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q="
+    },
+    "windows": {
+      "x86_64-darwin": "sha256-l9rG2aRTrN26QFnLvbeGiUvMz8+faCo3byIbz33DWpY=",
+      "x86_64-linux": "sha256-l9rG2aRTrN26QFnLvbeGiUvMz8+faCo3byIbz33DWpY="
+    }
+  },
   "pubspecLock": {
     "packages": {
       "_fe_analyzer_shared": {
@@ -1047,6 +1042,5 @@
     "sdks": {
       "dart": ">=3.7.0-0 <4.0.0"
     }
-  },
-  "version": "3.29.3"
+  }
 }
diff --git a/pkgs/development/compilers/flutter/versions/3_29/patches/no-cache.patch b/pkgs/development/compilers/flutter/versions/3_29/patches/no-cache.patch
deleted file mode 100644
index 74d15f724325..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_29/patches/no-cache.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/packages/flutter_tools/lib/src/cache.dart
-+++ b/packages/flutter_tools/lib/src/cache.dart
-@@ -321,7 +321,7 @@
-   bool fatalStorageWarning = true;
- 
-   static RandomAccessFile? _lock;
--  static bool _lockEnabled = true;
-+  static bool _lockEnabled = false;
- 
-   /// Turn off the [lock]/[releaseLock] mechanism.
-   ///
-@@ -725,7 +725,6 @@
-   }
- 
-   void setStampFor(String artifactName, String version) {
--    getStampFileFor(artifactName).writeAsStringSync(version);
-   }
- 
-   File getStampFileFor(String artifactName) {
-@@ -1010,31 +1009,6 @@
-   }
- 
-   Future<bool> checkForArtifacts(String? engineVersion) async {
--    engineVersion ??= version;
--    final String url = '${cache.storageBaseUrl}/flutter_infra_release/flutter/$engineVersion/';
--
--    bool exists = false;
--    for (final String pkgName in getPackageDirs()) {
--      exists = await cache.doesRemoteExist(
--        'Checking package $pkgName is available...',
--        Uri.parse('$url$pkgName.zip'),
--      );
--      if (!exists) {
--        return false;
--      }
--    }
--
--    for (final List<String> toolsDir in getBinaryDirs()) {
--      final String cacheDir = toolsDir[0];
--      final String urlPath = toolsDir[1];
--      exists = await cache.doesRemoteExist(
--        'Checking $cacheDir tools are available...',
--        Uri.parse(url + urlPath),
--      );
--      if (!exists) {
--        return false;
--      }
--    }
-     return true;
-   }
- 
diff --git a/pkgs/development/compilers/flutter/versions/3_29/patches/version.patch b/pkgs/development/compilers/flutter/versions/3_29/patches/version.patch
deleted file mode 100644
index 40cfcda6a011..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_29/patches/version.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- a/packages/flutter_tools/lib/src/version.dart
-+++ b/packages/flutter_tools/lib/src/version.dart
-@@ -95,11 +95,7 @@
-       }
-     }
- 
--    final String frameworkRevision = _runGit(
--      gitLog(<String>['-n', '1', '--pretty=format:%H']).join(' '),
--      globals.processUtils,
--      flutterRoot,
--    );
-+    final String frameworkRevision = 'nixpkgs000000000000000000000000000000000';
- 
-     return FlutterVersion.fromRevision(
-       clock: clock,
-@@ -192,11 +188,7 @@
-   // TODO(fujino): calculate this relative to frameworkCommitDate for
-   // _FlutterVersionFromFile so we don't need a git call.
-   String get frameworkAge {
--    return _frameworkAge ??= _runGit(
--      FlutterVersion.gitLog(<String>['-n', '1', '--pretty=format:%ar']).join(' '),
--      globals.processUtils,
--      flutterRoot,
--    );
-+    return 'unknown';
-   }
- 
-   void ensureVersionFile();
-@@ -327,9 +319,7 @@
-   /// remote git repository is not reachable due to a network issue.
-   static Future<String> fetchRemoteFrameworkCommitDate() async {
-     try {
--      // Fetch upstream branch's commit and tags
--      await _run(<String>['git', 'fetch', '--tags']);
--      return _gitCommitDate(gitRef: kGitTrackingUpstream, workingDirectory: Cache.flutterRoot);
-+      return 'unknown';
-     } on VersionCheckError catch (error) {
-       globals.printError(error.message);
-       rethrow;
-@@ -354,14 +344,7 @@
-   /// If [redactUnknownBranches] is true and the branch is unknown,
-   /// the branch name will be returned as `'[user-branch]'` ([kUserBranch]).
-   String getBranchName({bool redactUnknownBranches = false}) {
--    _branch ??= () {
--      final String branch = _runGit(
--        'git symbolic-ref --short HEAD',
--        globals.processUtils,
--        flutterRoot,
--      );
--      return branch == 'HEAD' ? '' : branch;
--    }();
-+    _branch ??= 'stable';
-     if (redactUnknownBranches || _branch!.isEmpty) {
-       // Only return the branch names we know about; arbitrary branch names might contain PII.
-       if (!kOfficialChannels.contains(_branch) && !kObsoleteBranches.containsKey(_branch)) {
-@@ -404,30 +387,7 @@
-   bool lenient = false,
-   required String? workingDirectory,
- }) {
--  final List<String> args = FlutterVersion.gitLog(<String>[
--    gitRef,
--    '-n',
--    '1',
--    '--pretty=format:%ad',
--    '--date=iso',
--  ]);
--  try {
--    // Don't plumb 'lenient' through directly so that we can print an error
--    // if something goes wrong.
--    return _runSync(args, lenient: false, workingDirectory: workingDirectory);
--  } on VersionCheckError catch (e) {
--    if (lenient) {
--      final DateTime dummyDate = DateTime.fromMillisecondsSinceEpoch(0);
--      globals.printError(
--        'Failed to find the latest git commit date: $e\n'
--        'Returning $dummyDate instead.',
--      );
--      // Return something that DateTime.parse() can parse.
--      return dummyDate.toString();
--    } else {
--      rethrow;
--    }
--  }
-+  return 'unknown';
- }
- 
- class _FlutterVersionFromFile extends FlutterVersion {
-@@ -541,20 +501,7 @@
-   @override
-   String? get repositoryUrl {
-     if (_repositoryUrl == null) {
--      final String gitChannel = _runGit(
--        'git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
--        globals.processUtils,
--        flutterRoot,
--      );
--      final int slash = gitChannel.indexOf('/');
--      if (slash != -1) {
--        final String remote = gitChannel.substring(0, slash);
--        _repositoryUrl = _runGit(
--          'git ls-remote --get-url $remote',
--          globals.processUtils,
--          flutterRoot,
--        );
--      }
-+      _repositoryUrl = 'https://github.com/flutter/flutter.git';
-     }
-     return _repositoryUrl;
-   }
-@@ -926,6 +873,16 @@
-   final String? gitTag;
- 
-   static GitTagVersion determine(
-+    ProcessUtils processUtils,
-+    Platform platform, {
-+    String? workingDirectory,
-+    bool fetchTags = false,
-+    String gitRef = 'HEAD',
-+  }) {
-+    return GitTagVersion.unknown();
-+  }
-+
-+  static GitTagVersion determine_orig(
-     ProcessUtils processUtils,
-     Platform platform, {
-     String? workingDirectory,
diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json
index 323b74eb9900..078a4c8a8d51 100644
--- a/pkgs/development/compilers/flutter/versions/3_32/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_32/data.json
@@ -1,80 +1,75 @@
 {
-  "artifactHashes": {
-    "android-arm-profile/artifacts.zip": "sha256-zDWexI+zuOfmJc4EnnANllZAyNbp0mb82EOIPmech3A=",
-    "android-arm-profile/darwin-x64.zip": "sha256-hbt0aCFcEl6Wk44k9hezrq6QFrtk07JFjci5MamePts=",
-    "android-arm-profile/linux-x64.zip": "sha256-lmoROV2f0iHLxvVclpOkXCSN/pS5LDz3LvVTJBsxtd8=",
-    "android-arm-profile/windows-x64.zip": "sha256-a4p6exLes0AfkTHVd80zk81JP9WwpdkYXMdyo6JhQ2E=",
-    "android-arm-release/artifacts.zip": "sha256-mjylyqqCjshOuhJ5Os7fxAnWdBz0oY4cE4YKLxmVhpk=",
-    "android-arm-release/darwin-x64.zip": "sha256-LASl5TmDLj0Qy+UrgtzSOijpT7Oz4rMiNmC5wMXZ5Os=",
-    "android-arm-release/linux-x64.zip": "sha256-lUDZI1/kiAdd3sI/aswsbIjYg6iePXfuhRPYzQNmnJo=",
-    "android-arm-release/windows-x64.zip": "sha256-4DH2j5MrPwi3Zn4tmsO8yohANQ0nC1nNjEWFhYGS5e8=",
-    "android-arm/artifacts.zip": "sha256-/0wqrYzhP4LSZuV8o01TaCHgON94JaE9yva78nr8NRs=",
-    "android-arm64-profile/artifacts.zip": "sha256-1VsImF6T00WlnJrOjdste1Ct0DYmOKWdjaWyjWPQUv4=",
-    "android-arm64-profile/darwin-x64.zip": "sha256-nF98oM6jmI1DPrdvqFjjX3HzilqsKxelj3sMQD/sV9s=",
-    "android-arm64-profile/linux-x64.zip": "sha256-qe3G57ww/H7PoK4Y6CEVjl5LVTecxTvia1fLJgprWUw=",
-    "android-arm64-profile/windows-x64.zip": "sha256-y9bnrKnX1w0RpYZ8gcShWUMACZCP2vdVWteFy47mTJo=",
-    "android-arm64-release/artifacts.zip": "sha256-rYRDJNgNjWHS5vxmq60+lafR02vfdyiRDcy5WbzCjzA=",
-    "android-arm64-release/darwin-x64.zip": "sha256-GQZR3p1OnI/cYw+GMawOId/FPpCCWbwDASTN0hKUXjQ=",
-    "android-arm64-release/linux-x64.zip": "sha256-ByMH2CSI3eOzYMeM9Kvpi3eljYtybkIpXqE0iJ+p4zk=",
-    "android-arm64-release/windows-x64.zip": "sha256-pR/QMQzn3KbjZFPBysQ5kAfkcC3Vdqx97jLMQ2iL2Cs=",
-    "android-arm64/artifacts.zip": "sha256-OxhJ9s1O6O5jLI6rKiisEiHaWvumYgVJLozJEnfjP1A=",
-    "android-x64-profile/artifacts.zip": "sha256-OS/wqrZK/IcvI1795TdVnlYqsyki8SBNFI34rQeT58U=",
-    "android-x64-profile/darwin-x64.zip": "sha256-YniOHobbhrxHTSrt4hYNhrz0xpvWIusg19qe5MRbJUk=",
-    "android-x64-profile/linux-x64.zip": "sha256-9/S7Q5djz2e6TU/NI6N2Y24hsamky4XD+djkCX5JwAg=",
-    "android-x64-profile/windows-x64.zip": "sha256-wf4CZhFv25svHTbY8cB2v0YyB2EwZqB+wLZf3XQHd50=",
-    "android-x64-release/artifacts.zip": "sha256-zpNIFJxQuJsEntQDvJgrPUFxaP06skS6T6N8eEW5H6M=",
-    "android-x64-release/darwin-x64.zip": "sha256-uh2tqQac85zgUH/I9ACUSsdqL46BfPvgosuyECO5j6k=",
-    "android-x64-release/linux-x64.zip": "sha256-WYK27e9gpn6cZOBVca/6drLH18kE7qZVQu2rKiYhkV0=",
-    "android-x64-release/windows-x64.zip": "sha256-3gah7k9T9JNUHeKgHy/v4l9O7A6BZrnVtwVbALx4dVg=",
-    "android-x64/artifacts.zip": "sha256-jrPwJSXQQ2dH7h/HtRJmTvL/uqy9moG5FR2Y6M+6y1M=",
-    "android-x86/artifacts.zip": "sha256-iGlh72so0ieVraCU77Xix9g2CWfmF1wpjsH2A/eIz/w=",
-    "darwin-arm64/artifacts.zip": "sha256-BSFNTVaNXE8178rjKiXHU4KZXyGk1pcbnBlDe3AjdGI=",
-    "darwin-arm64/font-subset.zip": "sha256-uNjn2tEUGrgIFId+4m03Aj7ABcx5w5TJB0aVL0xL2G4=",
-    "darwin-x64-profile/artifacts.zip": "sha256-G8v4R0bvByd3ek93nDxF16KIdcDaGIUhtMoJAMwzGko=",
-    "darwin-x64-profile/framework.zip": "sha256-/XY/Ta1sEM3iCZ2qnIGWskHrrzhAIQTnN4x+aRtqOUo=",
-    "darwin-x64-profile/gen_snapshot.zip": "sha256-eUxbCo8TvFdxz4KoMGHi2IT7kq5WL51ZHFrIUb+7FG4=",
-    "darwin-x64-release/artifacts.zip": "sha256-N14BAWCnMU9Ezuj/VRbmthxiHP7dtr6YlUG8b2XT37o=",
-    "darwin-x64-release/framework.zip": "sha256-Q/17YSyMKU0+iObwV7SvyKODI+P7a3ErXlNm4HidHAQ=",
-    "darwin-x64-release/gen_snapshot.zip": "sha256-rRCTkI5qXMFviMxeTush2t+RSdvP1HxgF2ovGQHDMHI=",
-    "darwin-x64/artifacts.zip": "sha256-Gt46l5s1lHHTwHxTVRO0W2+ymG/SsuWS6Ee56EUWwCs=",
-    "darwin-x64/font-subset.zip": "sha256-fDTfVUQp/PayjqEbj5HOkfZEcnMePtrE36tXbpRFaHw=",
-    "darwin-x64/framework.zip": "sha256-b2q5XpSGV3HvNZc72/6OlfcpxfDoC0MyS7UsCIVa2I8=",
-    "darwin-x64/gen_snapshot.zip": "sha256-MvJcufyFXJNMwPU80qkU2YyPy28o4D4HWJoII2pjiXs=",
-    "flutter-web-sdk.zip": "sha256-u+lbjL8mEuaUEZZZ7sXa5w+MQXWFGns7uNxhzaw53O4=",
-    "flutter_gpu.zip": "sha256-WwtMMiFP+Pi9TQbacTGPBtR80afaqioPgBZOK34YtWk=",
-    "flutter_patched_sdk.zip": "sha256-SoQomgnpZFSgI4a9eh+7teVZ+KTTqYm3Uyh+99IwVVM=",
-    "flutter_patched_sdk_product.zip": "sha256-QhDNJ7DkFAWqZG4XLKOB7Nyqg/Tc7bH4e4xUZrJqXGQ=",
-    "ios-profile/artifacts.zip": "sha256-TWN5VVlzZw0K3dXsS1gyLnvvRGNC9mXlMS4U+52qIOI=",
-    "ios-release/artifacts.zip": "sha256-I0OY5WGKF3HH66K8MlHrIDsTS9HxBYmBe9uLeLjkjbc=",
-    "ios/artifacts.zip": "sha256-uO1HQFIswJbiCkY4OSexNI92KPmG90sP7zavjxUmZ3g=",
-    "linux-arm64-debug/linux-arm64-flutter-gtk.zip": "sha256-ky/wf3lIwViqWuDgcXAdH7r8SdpDaE55nIu2dMMk9g0=",
-    "linux-arm64-profile/linux-arm64-flutter-gtk.zip": "sha256-HSzTOa0HetnobXfTenrE60kUul/Riy8C5AsyIOaQd2o=",
-    "linux-arm64-release/linux-arm64-flutter-gtk.zip": "sha256-+hBJ1ELS2rsCcvbYTGllCMkYroLFeWncXaYusfFS+pw=",
-    "linux-arm64/artifacts.zip": "sha256-J13A0cMXbb7BfIOI8wT4/d2/el4KjmRcz0+azy/sM7A=",
-    "linux-arm64/font-subset.zip": "sha256-nWwP3VI15gLPN/FRqN5TJ74l2ojbbe3bHhXVdEGztuM=",
-    "linux-x64-debug/linux-x64-flutter-gtk.zip": "sha256-mPmS92NUxaUrIUtH0BVZKSOYGwYXeLr3qg9YdkjjFYQ=",
-    "linux-x64-profile/linux-x64-flutter-gtk.zip": "sha256-48SB0A+sKiR55BMt+ZqAxRSxr3ikf/vJTFhnrWSMPk0=",
-    "linux-x64-release/linux-x64-flutter-gtk.zip": "sha256-WxqyHrIEyjgH/p9AjLqkOSHIsRZFEHNb5XYtAS9BP88=",
-    "linux-x64/artifacts.zip": "sha256-2jFV0xPe3trdEmC+ApWJfbz1v7T6ZkY3Iq+TmRgmpd4=",
-    "linux-x64/font-subset.zip": "sha256-eHAeGxsVWtKZhT/7W0TyOY5lMoIkl//rjWAxp0OVZWA=",
-    "sky_engine.zip": "sha256-t72yVeV6QYQtfIwiJNoL96gSvQD0DJW7wE6k7Ut9RaU=",
-    "windows-x64-debug/windows-x64-flutter.zip": "sha256-HNpEBvJ4wnCTa50JSxk6PmDaOex+kxPg24U3eq/BGbQ=",
-    "windows-x64-profile/windows-x64-flutter.zip": "sha256-2DwFbYQgZUjnBn6Zt6mUC1R39Xi0jR+9OeGerD2y4mw=",
-    "windows-x64-release/windows-x64-flutter.zip": "sha256-DcU909remUeNvvCRym0vGjDjUoJ0tTCALTPGJi8Omcs=",
-    "windows-x64/artifacts.zip": "sha256-Jvn4GYQPI4HIdxrzIDHssnRUdJ9t5Hmg1ii8T+uSoeY=",
-    "windows-x64/flutter-cpp-client-wrapper.zip": "sha256-cBNZivR/2ZK70ZJwOUiV9X7f6yuqtJmrYuupOfP4HFk=",
-    "windows-x64/font-subset.zip": "sha256-NN6mjRubl5SPNvFGHE8fKBn++NWfDYqca5wuquc0uow="
-  },
+  "version": "3.32.8",
+  "engineVersion": "ef0cd000916d64fa0c5d09cc809fa7ad244a5767",
+  "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
+  "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
   "channel": "stable",
-  "dartHash": {
-    "aarch64-darwin": "sha256-UIC8b0p4zM4OOOceRkdsCNYeCBRTZGlI8/DHcXepKPg=",
-    "aarch64-linux": "sha256-eKMkAJe+47ebAJxp6tIuGq7e3ty+CT6qmACExWYQlsg=",
-    "x86_64-darwin": "sha256-OTcd89ZPlPWz2cERnD9UkWTFYoxqE7lFG3tEhZ8fkRQ=",
-    "x86_64-linux": "sha256-DVjAEKNh8/FYixwvV5QvfMr3t6u+A0BP73oQLrY48J0="
+  "engineHashes": {
+    "aarch64-linux": {
+      "aarch64-linux": "sha256-JrbIMYwdfe36y6bHj1eAjYOKPGGp7mfWxWDCoCm7wiQ=",
+      "x86_64-linux": "sha256-JrbIMYwdfe36y6bHj1eAjYOKPGGp7mfWxWDCoCm7wiQ="
+    },
+    "x86_64-linux": {
+      "aarch64-linux": "sha256-R0ut5hzzBgfjbZFB1ofK4jEmr3CcBKHFJUl3c7nmn0E=",
+      "x86_64-linux": "sha256-R0ut5hzzBgfjbZFB1ofK4jEmr3CcBKHFJUl3c7nmn0E="
+    }
   },
   "dartVersion": "3.8.1",
-  "engineVersion": "ef0cd000916d64fa0c5d09cc809fa7ad244a5767",
+  "dartHash": {
+    "x86_64-linux": "sha256-3eE40VMwrPFD502lIaz+CkD7mBnSI/WqJ3C4DVQ01Z4=",
+    "aarch64-linux": "sha256-0GXCO00ar5532h+cXBEIe8BhGVKOuGuoPzr1M00muh4=",
+    "x86_64-darwin": "sha256-S3iGDVLollApke2SnXAcV919qsDTVmz5Gf9fTletr00=",
+    "aarch64-darwin": "sha256-haHQks9N1mBIqRsYg9sOLw7ra7gC708gsTWfKxvIK1c="
+  },
   "flutterHash": "sha256-s5T16+cMmL2ustJQjwFbfS8G+/TJW/WCEF1IO4WgbXQ=",
+  "artifactHashes": {
+    "android": {
+      "aarch64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=",
+      "aarch64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY=",
+      "x86_64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=",
+      "x86_64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY="
+    },
+    "fuchsia": {
+      "aarch64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=",
+      "aarch64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=",
+      "x86_64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=",
+      "x86_64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I="
+    },
+    "ios": {
+      "aarch64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=",
+      "aarch64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=",
+      "x86_64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=",
+      "x86_64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY="
+    },
+    "linux": {
+      "aarch64-darwin": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=",
+      "aarch64-linux": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=",
+      "x86_64-darwin": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM=",
+      "x86_64-linux": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM="
+    },
+    "macos": {
+      "aarch64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=",
+      "aarch64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=",
+      "x86_64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=",
+      "x86_64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg="
+    },
+    "universal": {
+      "aarch64-darwin": "sha256-h4v8Pyw7VqFDWh+VCcz12bgd1o5FIb+cpomR0k570f4=",
+      "aarch64-linux": "sha256-ZBDA3tS2GwnubeIuXhZ7Zxc75KNim5OCYkkn03KMYGs=",
+      "x86_64-darwin": "sha256-USoiNw8AUinCwMvrpOTmhSDq/TP1f0N9ZT8l8ZILzOo=",
+      "x86_64-linux": "sha256-OfSxYyyaRxaUCDR8ZjTdIBQ3PFpRXoA1YHIIooXAKKY="
+    },
+    "web": {
+      "aarch64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=",
+      "aarch64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=",
+      "x86_64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=",
+      "x86_64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50="
+    },
+    "windows": {
+      "x86_64-darwin": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4=",
+      "x86_64-linux": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4="
+    }
+  },
   "pubspecLock": {
     "packages": {
       "_fe_analyzer_shared": {
@@ -1051,6 +1046,5 @@
     "sdks": {
       "dart": ">=3.7.0 <4.0.0"
     }
-  },
-  "version": "3.32.8"
+  }
 }
diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/no-cache.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/no-cache.patch
deleted file mode 100644
index d596d6c64322..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_32/patches/no-cache.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/packages/flutter_tools/lib/src/cache.dart
-+++ b/packages/flutter_tools/lib/src/cache.dart
-@@ -321,7 +321,7 @@
-   bool fatalStorageWarning = true;
- 
-   static RandomAccessFile? _lock;
--  static bool _lockEnabled = true;
-+  static bool _lockEnabled = false;
- 
-   /// Turn off the [lock]/[releaseLock] mechanism.
-   ///
-@@ -727,7 +727,6 @@
-   }
- 
-   void setStampFor(String artifactName, String version) {
--    getStampFileFor(artifactName).writeAsStringSync(version);
-   }
- 
-   File getStampFileFor(String artifactName) {
-@@ -1015,31 +1014,6 @@
-   }
- 
-   Future<bool> checkForArtifacts(String? engineVersion) async {
--    engineVersion ??= version;
--    final String url = '${cache.storageBaseUrl}/flutter_infra_release/flutter/$engineVersion/';
--
--    bool exists = false;
--    for (final String pkgName in getPackageDirs()) {
--      exists = await cache.doesRemoteExist(
--        'Checking package $pkgName is available...',
--        Uri.parse('$url$pkgName.zip'),
--      );
--      if (!exists) {
--        return false;
--      }
--    }
--
--    for (final List<String> toolsDir in getBinaryDirs()) {
--      final String cacheDir = toolsDir[0];
--      final String urlPath = toolsDir[1];
--      exists = await cache.doesRemoteExist(
--        'Checking $cacheDir tools are available...',
--        Uri.parse(url + urlPath),
--      );
--      if (!exists) {
--        return false;
--      }
--    }
-     return true;
-   }
- 
diff --git a/pkgs/development/compilers/flutter/versions/3_32/patches/version.patch b/pkgs/development/compilers/flutter/versions/3_32/patches/version.patch
deleted file mode 100644
index 61e6cd40ddff..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_32/patches/version.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- a/packages/flutter_tools/lib/src/version.dart
-+++ b/packages/flutter_tools/lib/src/version.dart
-@@ -95,11 +95,7 @@
-       }
-     }
- 
--    final String frameworkRevision = _runGit(
--      gitLog(<String>['-n', '1', '--pretty=format:%H']).join(' '),
--      globals.processUtils,
--      flutterRoot,
--    );
-+    final String frameworkRevision = 'nixpkgs000000000000000000000000000000000';
- 
-     return FlutterVersion.fromRevision(
-       clock: clock,
-@@ -198,16 +194,7 @@
-   final String flutterRoot;
- 
-   String _getTimeSinceCommit({String? revision}) {
--    return _runGit(
--      FlutterVersion.gitLog(<String>[
--        '-n',
--        '1',
--        '--pretty=format:%ar',
--        if (revision != null) revision,
--      ]).join(' '),
--      globals.processUtils,
--      flutterRoot,
--    );
-+    return 'unknown';
-   }
- 
-   // TODO(fujino): calculate this relative to frameworkCommitDate for
-@@ -356,9 +343,7 @@
-   /// remote git repository is not reachable due to a network issue.
-   static Future<String> fetchRemoteFrameworkCommitDate() async {
-     try {
--      // Fetch upstream branch's commit and tags
--      await _run(<String>['git', 'fetch', '--tags']);
--      return _gitCommitDate(gitRef: kGitTrackingUpstream, workingDirectory: Cache.flutterRoot);
-+      return 'unknown';
-     } on VersionCheckError catch (error) {
-       globals.printError(error.message);
-       rethrow;
-@@ -383,14 +368,7 @@
-   /// If [redactUnknownBranches] is true and the branch is unknown,
-   /// the branch name will be returned as `'[user-branch]'` ([kUserBranch]).
-   String getBranchName({bool redactUnknownBranches = false}) {
--    _branch ??= () {
--      final String branch = _runGit(
--        'git symbolic-ref --short HEAD',
--        globals.processUtils,
--        flutterRoot,
--      );
--      return branch == 'HEAD' ? '' : branch;
--    }();
-+    _branch ??= 'stable';
-     if (redactUnknownBranches || _branch!.isEmpty) {
-       // Only return the branch names we know about; arbitrary branch names might contain PII.
-       if (!kOfficialChannels.contains(_branch) && !kObsoleteBranches.containsKey(_branch)) {
-@@ -433,30 +411,7 @@
-   bool lenient = false,
-   required String? workingDirectory,
- }) {
--  final List<String> args = FlutterVersion.gitLog(<String>[
--    gitRef,
--    '-n',
--    '1',
--    '--pretty=format:%ad',
--    '--date=iso',
--  ]);
--  try {
--    // Don't plumb 'lenient' through directly so that we can print an error
--    // if something goes wrong.
--    return _runSync(args, lenient: false, workingDirectory: workingDirectory);
--  } on VersionCheckError catch (e) {
--    if (lenient) {
--      final DateTime dummyDate = DateTime.fromMillisecondsSinceEpoch(0);
--      globals.printError(
--        'Failed to find the latest git commit date: $e\n'
--        'Returning $dummyDate instead.',
--      );
--      // Return something that DateTime.parse() can parse.
--      return dummyDate.toString();
--    } else {
--      rethrow;
--    }
--  }
-+  return 'unknown';
- }
- 
- class _FlutterVersionFromFile extends FlutterVersion {
-@@ -585,20 +540,7 @@
-   @override
-   String? get repositoryUrl {
-     if (_repositoryUrl == null) {
--      final String gitChannel = _runGit(
--        'git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
--        globals.processUtils,
--        flutterRoot,
--      );
--      final int slash = gitChannel.indexOf('/');
--      if (slash != -1) {
--        final String remote = gitChannel.substring(0, slash);
--        _repositoryUrl = _runGit(
--          'git ls-remote --get-url $remote',
--          globals.processUtils,
--          flutterRoot,
--        );
--      }
-+      _repositoryUrl = 'https://github.com/flutter/flutter.git';
-     }
-     return _repositoryUrl;
-   }
-@@ -970,6 +912,16 @@
-   final String? gitTag;
- 
-   static GitTagVersion determine(
-+    ProcessUtils processUtils,
-+    Platform platform, {
-+    String? workingDirectory,
-+    bool fetchTags = false,
-+    String gitRef = 'HEAD',
-+  }) {
-+    return GitTagVersion.unknown();
-+  }
-+
-+  static GitTagVersion determine_orig(
-     ProcessUtils processUtils,
-     Platform platform, {
-     String? workingDirectory,
diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json
index 187a2f4b3263..6d04fcf6b864 100644
--- a/pkgs/development/compilers/flutter/versions/3_35/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_35/data.json
@@ -1,80 +1,75 @@
 {
-  "artifactHashes": {
-    "android-arm-profile/artifacts.zip": "sha256-tkMKTImxVqFBQhJDVD2NB0thlB/A1NFRekV1ScYLwVM=",
-    "android-arm-profile/darwin-x64.zip": "sha256-ktPTy7G41qtJ5oOeE6mfKK3IQQlBAmIBtFm7cUEOkxQ=",
-    "android-arm-profile/linux-x64.zip": "sha256-3Imdiu+I4WmOqsYmJjnyRFkOOfgIJjPbDUba6V08VmQ=",
-    "android-arm-profile/windows-x64.zip": "sha256-jJEhtr8Jvuak7n5Wq0t2wMMk2J6Vpmu5WlbXl3zN1AE=",
-    "android-arm-release/artifacts.zip": "sha256-WxypxJNW28+v88bGjfksIYSiCVdDkOnqzlBOJSPxwGQ=",
-    "android-arm-release/darwin-x64.zip": "sha256-J17mW6Xfbd+YT5N7n1Y+QTRK9DVk8l1ai37UDdt3rEY=",
-    "android-arm-release/linux-x64.zip": "sha256-gs/SzGsz9cjp6qM2Izqg0CbfX5WWFE1Cgy3X8mIB5Mc=",
-    "android-arm-release/windows-x64.zip": "sha256-ON/g8l1MlXB53CDjF8fZgOJ69l32WGhMnD5Bnxn7nys=",
-    "android-arm/artifacts.zip": "sha256-/1CR0aybIBZGopc0O5A9jG9Sn0MWlPts2WkhFva+72c=",
-    "android-arm64-profile/artifacts.zip": "sha256-geB9xlwjS+TDcE2CabNwX4R3gLwLmELO3OvJLMhaCG8=",
-    "android-arm64-profile/darwin-x64.zip": "sha256-cx8D1W5ezsf0DoWTU4nQycFtER59uSu5T8Mbrq7F4mc=",
-    "android-arm64-profile/linux-x64.zip": "sha256-bp3WdqCC0uD3gcbtcTpe0Bk28Co75PEjlYunN0nAGR0=",
-    "android-arm64-profile/windows-x64.zip": "sha256-bVDWw5Z7MHUqezYVdO5wZT7mnTSzmBoI/4PAFopsOyw=",
-    "android-arm64-release/artifacts.zip": "sha256-0/Q7w98SG69nEd2S2pp8djnk7zmC1YfLIW126tQtooc=",
-    "android-arm64-release/darwin-x64.zip": "sha256-9kcha9KcoHsEgY6jSdP92ETk+BqFeQ7LsgD0ubHkNLE=",
-    "android-arm64-release/linux-x64.zip": "sha256-JqVh/V7HBzbsa/9iacL2RZFf3X9GFs2llsDaTbOQdsU=",
-    "android-arm64-release/windows-x64.zip": "sha256-Xrtl3WBXvzLnn/I1vCsGIS+DyTCE9gJYBLDucn/H8u4=",
-    "android-arm64/artifacts.zip": "sha256-e3+ybL9AG3xN559EcWBtBxitudQd9HUluEHB15IX7ps=",
-    "android-x64-profile/artifacts.zip": "sha256-5bvosBPGtU2T1GGLGkPmyTVJ90JBdrGK+8C79mgSRSA=",
-    "android-x64-profile/darwin-x64.zip": "sha256-7vIRNLkQmVGhc48GtdYfC4oA3d35kPQtj3vcIKBchJc=",
-    "android-x64-profile/linux-x64.zip": "sha256-wYYyhpVXNjUPmoSbarHkTv2xSPUkmnSSVaDaYGNSTJM=",
-    "android-x64-profile/windows-x64.zip": "sha256-1FXPNfRQjncl5Pyg5x4TslWeCOIyrKBhjVBFkGLzHeM=",
-    "android-x64-release/artifacts.zip": "sha256-mRoPNcpq5hBL/AxskFK8ccbvKwzgb2vEUVJ9WtgUlH0=",
-    "android-x64-release/darwin-x64.zip": "sha256-AfWv2mUDxFzwDK/dGl/TrrkP2YyyOGNmfde6bj06AtE=",
-    "android-x64-release/linux-x64.zip": "sha256-4demp82PCXeOje3l+qOc/Eq+ngY8QybWE4iFGVK6lNc=",
-    "android-x64-release/windows-x64.zip": "sha256-3mQXqHuOhwDTRlsknFA8R/27luOzs28glJVD+3G/5EI=",
-    "android-x64/artifacts.zip": "sha256-BheP9zRanNkBOVzPwQvYp4jd9l/MIcnbmkshlwfT6Dc=",
-    "android-x86/artifacts.zip": "sha256-vXZo+hOtp1hRDvBBJfNmqlE6/ettAB9iEGdJZ/AeYKg=",
-    "darwin-arm64/artifacts.zip": "sha256-4CqgWDqeTGgNfmllemwbK692tRJ6y6O0/S8WdHPr2cI=",
-    "darwin-arm64/font-subset.zip": "sha256-gyTIBlcwE0UZZ/zVZIK2CkIoqQlbixcp54RBmyCgiJ4=",
-    "darwin-x64-profile/artifacts.zip": "sha256-Q7vaWylDWDSi8Fm2rnjX2OZrg9suz/oZIMLG+L8LPfg=",
-    "darwin-x64-profile/framework.zip": "sha256-t1FS8OI8Ptxpfker8th1KkWlKDb7lvd76o3vT5zLSos=",
-    "darwin-x64-profile/gen_snapshot.zip": "sha256-lzPl2i1XCdzmpV5Si5R/xju7JnmXz5N3MuTOWQHo6UY=",
-    "darwin-x64-release/artifacts.zip": "sha256-BXxo25VzpbNGsedjuXgOqnhDo1iOpDdXZ8ECYcCcgSY=",
-    "darwin-x64-release/framework.zip": "sha256-S22KfsuOjv9b4A/6F9cj47E4gGo1SYlP6xCRqV4D3iY=",
-    "darwin-x64-release/gen_snapshot.zip": "sha256-YR1Mqh3xMvlrLBaBC8q9TAloYWmBng15LdIDYq6JBMk=",
-    "darwin-x64/artifacts.zip": "sha256-eL9Y7UHaso/MKN0mSx8W4OqxwzDn/csuX8M8UwAjFWA=",
-    "darwin-x64/font-subset.zip": "sha256-vBUjrHafLzmJR13cFWr46flx4A9HE9p72DDfGIXHEcc=",
-    "darwin-x64/framework.zip": "sha256-oBeGU6XuQrXmF4z7ln7mUMsJMHg5XDjikxXgBKMJQ28=",
-    "darwin-x64/gen_snapshot.zip": "sha256-b9FUB6TQmGw5k+M2Z3y56CvInw/LTrPL9YyG5D4Uqoc=",
-    "flutter-web-sdk.zip": "sha256-0LQD3PWbBXc34qhxAHB/ESYjvpKndFheDYtMFxW6V2I=",
-    "flutter_gpu.zip": "sha256-b7GxH12dA1rGr1TUMFAm0R2xCGTwUIYHr0/Pktck+Rg=",
-    "flutter_patched_sdk.zip": "sha256-qiZzEVkaRfD3ELEmsQQrN9tvF9MMiEsRioGcaT6qW5E=",
-    "flutter_patched_sdk_product.zip": "sha256-jAD6sghpvJb/WUuPaT8SQGWnNCBE82qAOF41E8gE/LE=",
-    "ios-profile/artifacts.zip": "sha256-c8UEecqig9GwF3p+rS+KoCSieN1bfxX4vbL3RnNa9qU=",
-    "ios-release/artifacts.zip": "sha256-nfQ8YxiKXY4LYjiSfDGub6afhlnSPDIZ2+9wYrWkpsI=",
-    "ios/artifacts.zip": "sha256-63HYgql1rNuOqZtyCDyThXzFiE5YCLGqCw5XFtZfEn0=",
-    "linux-arm64-debug/linux-arm64-flutter-gtk.zip": "sha256-/bTubsiLpGYDywasjZxIylUitAQDFe83MQbC1E/PXLo=",
-    "linux-arm64-profile/linux-arm64-flutter-gtk.zip": "sha256-K7RhTflYahi7rQ9V4vhoHgG7iUkyUMx1BgdVKcayxuw=",
-    "linux-arm64-release/linux-arm64-flutter-gtk.zip": "sha256-m06sitBb919gU4G4g0hE0pCxW36H+d15NRQNCLvW3v4=",
-    "linux-arm64/artifacts.zip": "sha256-Sn3DR+eIvjae5SS7sX60IaFLDsEXOLBSxtKE4pTj6mM=",
-    "linux-arm64/font-subset.zip": "sha256-lGHk7ac3yS1Q51qRP5pj5y626TJzz3AzQTlx38N1hLI=",
-    "linux-x64-debug/linux-x64-flutter-gtk.zip": "sha256-ntz4GCTMutdQgqSxdC69YtIZFct4UkvYz5AbJT/6rVQ=",
-    "linux-x64-profile/linux-x64-flutter-gtk.zip": "sha256-kKePD4dJdAIBiEL2rBqGZCzP7PRlukEVq+yoTvW2p94=",
-    "linux-x64-release/linux-x64-flutter-gtk.zip": "sha256-oftxkU+eDRLWggV+EAymWk0pWsz3K5VaL6so9KpZAJo=",
-    "linux-x64/artifacts.zip": "sha256-NjqBtYiJahp52E7V7Px/wnGZVWjsFmPKxAbMIYL4kGg=",
-    "linux-x64/font-subset.zip": "sha256-dZXC7iFVzb/V8QTbfscdkdtjTzdMy7ce0Z1GlX+jm9E=",
-    "sky_engine.zip": "sha256-Zq7h04ARytTgc3yBUHNeUw50dzOPquZaiXtEC62RCFU=",
-    "windows-x64-debug/windows-x64-flutter.zip": "sha256-NhJsnViwfq+PGeCEqLNnx2lHDQgUptsRun3RStkbeCI=",
-    "windows-x64-profile/windows-x64-flutter.zip": "sha256-m07X3s+PYps2GzHNt4HfuRiJjXQse6v14GGwjh9yqiE=",
-    "windows-x64-release/windows-x64-flutter.zip": "sha256-PY5eIoQdDN58L41mnfk3LImf8FlRsp5ue9nbnYouvM4=",
-    "windows-x64/artifacts.zip": "sha256-eDq8AoAXetZoMM1Zovw1Jm2mGFHWWbmg2XzsSb558Rk=",
-    "windows-x64/flutter-cpp-client-wrapper.zip": "sha256-nqgeZnzp7dKgs+lp2jVrRgvvRD+MGi2NceqivM6Qk0I=",
-    "windows-x64/font-subset.zip": "sha256-1WbKyP4By37Tci6nQ2S7OsCKnWScflYk7T5L0P0DGuQ="
-  },
+  "version": "3.35.7",
+  "engineVersion": "035316565ad77281a75305515e4682e6c4c6f7ca",
+  "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
+  "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
   "channel": "stable",
-  "dartHash": {
-    "aarch64-darwin": "sha256-AdBnLbgmZvcvlFLfOO4VFqcs2bwpgYvT6t34LkBVYVI=",
-    "aarch64-linux": "sha256-1i918/G/tEoi+9XPCltHx1hRbOyl3Me87IiJbiWD57o=",
-    "x86_64-darwin": "sha256-TGel6P9oew5ao8DAMS5kCxLl1eknjZG7Jc7A32YofXk=",
-    "x86_64-linux": "sha256-7CLoEnFYLe+B0+EOKlVa5dPYHGlRRlo9Fs/EeTjp+So="
+  "engineHashes": {
+    "aarch64-linux": {
+      "aarch64-linux": "sha256-v2L0MQRTXvWngb8fu/AR9iofq2CDq1HFedXE8cSzOws=",
+      "x86_64-linux": "sha256-v2L0MQRTXvWngb8fu/AR9iofq2CDq1HFedXE8cSzOws="
+    },
+    "x86_64-linux": {
+      "aarch64-linux": "sha256-RKfKhFwlwVEguWqI6OinTqdCM3yNTP/5PwevREmS4Nk=",
+      "x86_64-linux": "sha256-RKfKhFwlwVEguWqI6OinTqdCM3yNTP/5PwevREmS4Nk="
+    }
   },
   "dartVersion": "3.9.2",
-  "engineVersion": "035316565ad77281a75305515e4682e6c4c6f7ca",
+  "dartHash": {
+    "x86_64-linux": "sha256-ZJcii2WBCE4PNt5+S2nH4hj+WoZuhRLFkzMlSZEa01Y=",
+    "aarch64-linux": "sha256-EzNApYsHor1suB9dFgJuewMqa0v7cADKLUzLym5GLOY=",
+    "x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=",
+    "aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw="
+  },
   "flutterHash": "sha256-0GI3P11vys6JU+H5MXKznHTItOXZwap7bxHzgj6umc4=",
+  "artifactHashes": {
+    "android": {
+      "aarch64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
+      "aarch64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM=",
+      "x86_64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
+      "x86_64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM="
+    },
+    "fuchsia": {
+      "aarch64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "aarch64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "x86_64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "x86_64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM="
+    },
+    "ios": {
+      "aarch64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "aarch64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "x86_64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "x86_64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY="
+    },
+    "linux": {
+      "aarch64-darwin": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
+      "aarch64-linux": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
+      "x86_64-darwin": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA=",
+      "x86_64-linux": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA="
+    },
+    "macos": {
+      "aarch64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "aarch64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "x86_64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "x86_64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c="
+    },
+    "universal": {
+      "aarch64-darwin": "sha256-oPUDsJxKbbWEH1XgxOFoBnVYJAjgeCBKIrYtBafWtWU=",
+      "aarch64-linux": "sha256-ae6UH4K09lcl7UZzD/WKFxWUKEZQsLmizODs/RMKcis=",
+      "x86_64-darwin": "sha256-wxDWrT35CUIEQaKeIK0adr0oPfv6to60Z6R+8zrwhmU=",
+      "x86_64-linux": "sha256-CxvOlq8nxeY5esRanl2N7oO4RFgBTwQcRdS7Pp/5tt8="
+    },
+    "web": {
+      "aarch64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "aarch64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "x86_64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "x86_64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o="
+    },
+    "windows": {
+      "x86_64-darwin": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k=",
+      "x86_64-linux": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k="
+    }
+  },
   "pubspecLock": {
     "packages": {
       "_fe_analyzer_shared": {
@@ -1081,6 +1076,5 @@
     "sdks": {
       "dart": ">=3.9.0-21.0.dev <4.0.0"
     }
-  },
-  "version": "3.35.7"
+  }
 }
diff --git a/pkgs/development/compilers/flutter/versions/3_35/patches/content-unaware-hash.patch b/pkgs/development/compilers/flutter/versions/3_35/patches/content-unaware-hash.patch
deleted file mode 100644
index d912db5c15cc..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_35/patches/content-unaware-hash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/bin/internal/content_aware_hash.sh
-+++ b/bin/internal/content_aware_hash.sh
-@@ -13,6 +13,9 @@
-
- set -e
-
-+echo '0000000000000000000000000000000000000000'
-+exit 0
-+
- FLUTTER_ROOT="$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")"
-
- unset GIT_DIR
diff --git a/pkgs/development/compilers/flutter/versions/3_35/patches/no-cache.patch b/pkgs/development/compilers/flutter/versions/3_35/patches/no-cache.patch
deleted file mode 100644
index e0cdb21fd030..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_35/patches/no-cache.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/packages/flutter_tools/lib/src/cache.dart
-+++ b/packages/flutter_tools/lib/src/cache.dart
-@@ -318,7 +318,7 @@
-   var fatalStorageWarning = true;
- 
-   static RandomAccessFile? _lock;
--  static var _lockEnabled = true;
-+  static var _lockEnabled = false;
- 
-   /// Turn off the [lock]/[releaseLock] mechanism.
-   ///
-@@ -721,7 +721,6 @@
-   }
- 
-   void setStampFor(String artifactName, String version) {
--    getStampFileFor(artifactName).writeAsStringSync(version);
-   }
- 
-   File getStampFileFor(String artifactName) {
-@@ -1010,31 +1009,6 @@
-   }
- 
-   Future<bool> checkForArtifacts(String? engineVersion) async {
--    engineVersion ??= version;
--    final url = '${cache.storageBaseUrl}/flutter_infra_release/flutter/$engineVersion/';
--
--    var exists = false;
--    for (final String pkgName in getPackageDirs()) {
--      exists = await cache.doesRemoteExist(
--        'Checking package $pkgName is available...',
--        Uri.parse('$url$pkgName.zip'),
--      );
--      if (!exists) {
--        return false;
--      }
--    }
--
--    for (final List<String> toolsDir in getBinaryDirs()) {
--      final String cacheDir = toolsDir[0];
--      final String urlPath = toolsDir[1];
--      exists = await cache.doesRemoteExist(
--        'Checking $cacheDir tools are available...',
--        Uri.parse(url + urlPath),
--      );
--      if (!exists) {
--        return false;
--      }
--    }
-     return true;
-   }
- 
diff --git a/pkgs/development/compilers/flutter/versions/3_35/patches/version.patch b/pkgs/development/compilers/flutter/versions/3_35/patches/version.patch
deleted file mode 100644
index 60a8c7d05738..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_35/patches/version.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- a/packages/flutter_tools/lib/src/version.dart
-+++ b/packages/flutter_tools/lib/src/version.dart
-@@ -97,11 +97,7 @@
-       }
-     }
- 
--    final String frameworkRevision = _runGit(
--      gitLog(<String>['-n', '1', '--pretty=format:%H']).join(' '),
--      globals.processUtils,
--      flutterRoot,
--    );
-+    final String frameworkRevision = 'nixpkgs000000000000000000000000000000000';
- 
-     return FlutterVersion.fromRevision(
-       clock: clock,
-@@ -207,16 +203,7 @@
-   final String flutterRoot;
- 
-   String _getTimeSinceCommit({String? revision}) {
--    return _runGit(
--      FlutterVersion.gitLog(<String>[
--        '-n',
--        '1',
--        '--pretty=format:%ar',
--        if (revision != null) revision,
--      ]).join(' '),
--      globals.processUtils,
--      flutterRoot,
--    );
-+    return 'unknown';
-   }
- 
-   // TODO(fujino): calculate this relative to frameworkCommitDate for
-@@ -380,9 +367,7 @@
-   /// remote git repository is not reachable due to a network issue.
-   static Future<String> fetchRemoteFrameworkCommitDate() async {
-     try {
--      // Fetch upstream branch's commit and tags
--      await _run(<String>['git', 'fetch', '--tags']);
--      return _gitCommitDate(gitRef: kGitTrackingUpstream, workingDirectory: Cache.flutterRoot);
-+      return 'unknown';
-     } on VersionCheckError catch (error) {
-       globals.printError(error.message);
-       rethrow;
-@@ -407,14 +392,7 @@
-   /// If [redactUnknownBranches] is true and the branch is unknown,
-   /// the branch name will be returned as `'[user-branch]'` ([kUserBranch]).
-   String getBranchName({bool redactUnknownBranches = false}) {
--    _branch ??= () {
--      final String branch = _runGit(
--        'git symbolic-ref --short HEAD',
--        globals.processUtils,
--        flutterRoot,
--      );
--      return branch == 'HEAD' ? '' : branch;
--    }();
-+    _branch ??= 'stable';
-     if (redactUnknownBranches || _branch!.isEmpty) {
-       // Only return the branch names we know about; arbitrary branch names might contain PII.
-       if (!kOfficialChannels.contains(_branch) && !kObsoleteBranches.containsKey(_branch)) {
-@@ -457,30 +435,7 @@
-   bool lenient = false,
-   required String? workingDirectory,
- }) {
--  final List<String> args = FlutterVersion.gitLog(<String>[
--    gitRef,
--    '-n',
--    '1',
--    '--pretty=format:%ad',
--    '--date=iso',
--  ]);
--  try {
--    // Don't plumb 'lenient' through directly so that we can print an error
--    // if something goes wrong.
--    return _runSync(args, lenient: false, workingDirectory: workingDirectory);
--  } on VersionCheckError catch (e) {
--    if (lenient) {
--      final dummyDate = DateTime.fromMillisecondsSinceEpoch(0);
--      globals.printError(
--        'Failed to find the latest git commit date: $e\n'
--        'Returning $dummyDate instead.',
--      );
--      // Return something that DateTime.parse() can parse.
--      return dummyDate.toString();
--    } else {
--      rethrow;
--    }
--  }
-+  return 'unknown';
- }
- 
- class _FlutterVersionFromFile extends FlutterVersion {
-@@ -621,20 +576,7 @@
-   @override
-   String? get repositoryUrl {
-     if (_repositoryUrl == null) {
--      final String gitChannel = _runGit(
--        'git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream',
--        globals.processUtils,
--        flutterRoot,
--      );
--      final int slash = gitChannel.indexOf('/');
--      if (slash != -1) {
--        final String remote = gitChannel.substring(0, slash);
--        _repositoryUrl = _runGit(
--          'git ls-remote --get-url $remote',
--          globals.processUtils,
--          flutterRoot,
--        );
--      }
-+      _repositoryUrl = 'https://github.com/flutter/flutter.git';
-     }
-     return _repositoryUrl;
-   }
-@@ -1015,6 +957,16 @@
-   final String gitTag;
- 
-   static GitTagVersion determine(
-+    ProcessUtils processUtils,
-+    Platform platform, {
-+    String? workingDirectory,
-+    bool fetchTags = false,
-+    String gitRef = 'HEAD',
-+  }) {
-+    return GitTagVersion.unknown();
-+  }
-+
-+  static GitTagVersion determine_orig(
-     ProcessUtils processUtils,
-     Platform platform, {
-     String? workingDirectory,
diff --git a/pkgs/development/compilers/flutter/versions/3_38/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json
index b9b0ae6820a0..88baf3ba0ece 100644
--- a/pkgs/development/compilers/flutter/versions/3_38/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_38/data.json
@@ -1,80 +1,75 @@
 {
-  "artifactHashes": {
-    "android-arm-profile/artifacts.zip": "sha256-SszXOMnso0LzdaOUl5I2v9Kfx+xFfrssoB6d5wk8IQ8=",
-    "android-arm-profile/darwin-x64.zip": "sha256-eEmHXcgcsNt5AXoV/g876veTV4hGTHFx8KPs/pB1h44=",
-    "android-arm-profile/linux-x64.zip": "sha256-UStYtnQ2bO0QYwsLYlvDcAxd02kauagXAndHERlXhYE=",
-    "android-arm-profile/windows-x64.zip": "sha256-QzhKpS9nPLfcxUHipL9emSROXxAukOOOy/4Bv9g4UFg=",
-    "android-arm-release/artifacts.zip": "sha256-DOn06RWlhwJDeVqr6slARQywnbLdRHp45UXA8ek0xTA=",
-    "android-arm-release/darwin-x64.zip": "sha256-hWULmwI30CgXHBr/DPuQwsUWdEYcEb1zu2wDrlQ8dbI=",
-    "android-arm-release/linux-x64.zip": "sha256-7Pkw0ahZkFT/CM0xdJPGqfjFgg8UcSoPfKawMlI7uSo=",
-    "android-arm-release/windows-x64.zip": "sha256-Kq6EURxjwsnzwaFziy3wshrgr14+Nz50Mug6gHGKByk=",
-    "android-arm/artifacts.zip": "sha256-PDy8hUidPU/KhQ7jzv3scnquh8W1Lu2N/DzrC2xjyhw=",
-    "android-arm64-profile/artifacts.zip": "sha256-8v9xjQQ9sCdIJc9m3gfb5GikjTnMLOZNhqV4HuyxjKM=",
-    "android-arm64-profile/darwin-x64.zip": "sha256-0DWhGSixA3wBMk4cy14JnyGs9qz9MXbGAVLQdHtltqI=",
-    "android-arm64-profile/linux-x64.zip": "sha256-muSzoz1hv1/itvt9RE2PoJtPGLWP6vTTOX1Mzz+H4kU=",
-    "android-arm64-profile/windows-x64.zip": "sha256-vxLVdkEJL3eriZDIKgoUoaTRgEwxGh+/8LLpeRSPc1g=",
-    "android-arm64-release/artifacts.zip": "sha256-T00v6QgwlD8yeb+KZaq5Oze7BNi7QVk2umouGMxzcDk=",
-    "android-arm64-release/darwin-x64.zip": "sha256-jONivWNSZxD3ZdhNA0+3UBsI5SBr6Ghxgub34vDj66w=",
-    "android-arm64-release/linux-x64.zip": "sha256-DHxJksRVK4dYoxI3mb7MfQrTki8CrTFurjtgj9f+7cg=",
-    "android-arm64-release/windows-x64.zip": "sha256-r0B8VB16L/zGyEopOUoFJj+Pb9WgfG0Iv+U5z8d6PK4=",
-    "android-arm64/artifacts.zip": "sha256-hfxdM6OoWyqh5iwyXNo5qXLvvIONhdA/60g1SsPOjZU=",
-    "android-x64-profile/artifacts.zip": "sha256-h+Lhj5j9CzLGUu9f3oX8kZ75B0s7iehmr/D7uv3t5yk=",
-    "android-x64-profile/darwin-x64.zip": "sha256-cHGALDMpEuzlW8kW+kB5H1Tk8E4KrTiiclj5ZmOcMp4=",
-    "android-x64-profile/linux-x64.zip": "sha256-cta/XKPOwgyIJUR3l1Qdmaexh60WQ3RiBlCwM4hc0Q0=",
-    "android-x64-profile/windows-x64.zip": "sha256-h6CPE4lPvSxCziroNuRYtSPqEmMfDeau/7MW7F4Ne5E=",
-    "android-x64-release/artifacts.zip": "sha256-cyGK3qsmfnK1kD+kD23PUy6EeJOz4eGqQlRnQcY1K7Y=",
-    "android-x64-release/darwin-x64.zip": "sha256-gImreJnjCb+OF3dXQE4WE1S0h13Z/5xFmVuBcUJvGrY=",
-    "android-x64-release/linux-x64.zip": "sha256-43NlGPjZK8V2i6Tv5rRhZBI3ItpSSIXrke13/uAGct8=",
-    "android-x64-release/windows-x64.zip": "sha256-CcLvO3w1LLlMTVQ5TR8sTL5sCMZXsGVa5u5j1fh/mSs=",
-    "android-x64/artifacts.zip": "sha256-ALbGKIFJ9n+cvE4+00doce+0LenwbOUyQtiflC2GJ7M=",
-    "android-x86/artifacts.zip": "sha256-ovnEERQizyUxcucOxLqxrK1dBO5IqKHsI7ob94w8G4o=",
-    "darwin-arm64/artifacts.zip": "sha256-+yIE6rmPxgTv8Uuhi8lzyMTG5zpb0R2Li7P/xhkvRSA=",
-    "darwin-arm64/font-subset.zip": "sha256-5yR3y+FYn2Fkudqe9QiLWDbCE811Ds9hac4jTCLiW1w=",
-    "darwin-x64-profile/artifacts.zip": "sha256-jD4X0HBjJIbuBsamH8bexBWGcMqhyk3hSOMKtempgPQ=",
-    "darwin-x64-profile/framework.zip": "sha256-NNDGYSL7/9841I2siCzFwjRaZu8Td4c+f/JF1Q2IenE=",
-    "darwin-x64-profile/gen_snapshot.zip": "sha256-CBGLnupxRxFk16ww97RC3XZRr53pKYQX6PtMfM+53sk=",
-    "darwin-x64-release/artifacts.zip": "sha256-4dA2edSUJHJfdGb9JwfkBe60R2TuENN3R8RlwUEh1Hk=",
-    "darwin-x64-release/framework.zip": "sha256-QiQwwJtwYutkbAhF0YtWuBP3mMRJ+4W0Kns//sXzpzU=",
-    "darwin-x64-release/gen_snapshot.zip": "sha256-a1ajKvgccl/745zxbGPNtqBIzNrkuHWNh9DNxS1Gn8U=",
-    "darwin-x64/artifacts.zip": "sha256-qVdAKm7Crnm0DEkw9PTf4KBA45PdoGZdsr5F5BWXtLw=",
-    "darwin-x64/font-subset.zip": "sha256-hLgb0BCZXwOlch1nD8SK7Bf2ao9gE1IUjlThRYxg/8c=",
-    "darwin-x64/framework.zip": "sha256-wLWLQpjFCitYNUJpMNsH3kCKRe+ADQixrEWSrKgK/w0=",
-    "darwin-x64/gen_snapshot.zip": "sha256-gbxqc2Rr0ftDftiV5l8FG3oFtpJ1fkB+TzQXCyiMEqk=",
-    "flutter-web-sdk.zip": "sha256-2mtnmqOWwnHd6wLyxEpaTCzSAMSXxLaBSgZBetum3N0=",
-    "flutter_gpu.zip": "sha256-+4BSuZJDwZoUMnd99U2FJa9A6+1ZsR4gpGyjfNszVlU=",
-    "flutter_patched_sdk.zip": "sha256-0IJy6Rhm41zE4uanx0KClZ2C3YOaKrT34ZmIgkyyFbs=",
-    "flutter_patched_sdk_product.zip": "sha256-XJtmN6N3RMJRJA78xHg5wsfXrcoKXelC4CJXVOUhyCw=",
-    "ios-profile/artifacts.zip": "sha256-65Qje/KLH0Y/r1iowRiTdXHOPX+4TNXkxRtA2T9pyP8=",
-    "ios-release/artifacts.zip": "sha256-tfYI/LC3GyjVOxvuAWbWq9/oYuHLl2iZxZ9CFTWwzoI=",
-    "ios/artifacts.zip": "sha256-njLT9/SY6fhqZYdBlF7LruNG40y+0CxmCeTd9HGoURk=",
-    "linux-arm64-debug/linux-arm64-flutter-gtk.zip": "sha256-SZ5o61Wz4DUFiLPDwR4BE2c/Ppm9wU9zqpO4cVg6sjk=",
-    "linux-arm64-profile/linux-arm64-flutter-gtk.zip": "sha256-TEY+99KUeI8sLWNGcG3bAAhbhhXDPl+jKzQMq9XO6N0=",
-    "linux-arm64-release/linux-arm64-flutter-gtk.zip": "sha256-pWknANDo3Jb0ctSAE8gBAwpjEPfxoXhBzu98BsQrLPI=",
-    "linux-arm64/artifacts.zip": "sha256-u/wxbplJm8pEGiZ4PM8apWcYwSXrV85JbfVqtn8MQXc=",
-    "linux-arm64/font-subset.zip": "sha256-S2SY5yXZht/Wj3GF4t+VPdJDNxe4q8aeiFvRboJDevk=",
-    "linux-x64-debug/linux-x64-flutter-gtk.zip": "sha256-3DiNbB+xSa/bYqoi/29JdGaIv+fIzrpfKFH1toQQo/M=",
-    "linux-x64-profile/linux-x64-flutter-gtk.zip": "sha256-m2h6C1ApGqIBfZ01agnzngbuhzAapmzrpc4FzwjjlN0=",
-    "linux-x64-release/linux-x64-flutter-gtk.zip": "sha256-Mcb7/sF0bc4L0T73iuUWou/OOlcuOuwQrRfqLQMrCO4=",
-    "linux-x64/artifacts.zip": "sha256-ie03ozwWndpB3ztxugUY4v0gCHav2chK6PbgxheKI/k=",
-    "linux-x64/font-subset.zip": "sha256-NKJnqJsOGO6Gh0/GJ/kLOhncmYIwRHSP6tx5fm909Wc=",
-    "sky_engine.zip": "sha256-nz7bVhV2odmt16WL4yp4eMa1/ecg1IGTewEvgPagIsY=",
-    "windows-x64-debug/windows-x64-flutter.zip": "sha256-bG/Yv0yrNMTH8aBgRQBTaG6Wo2KsUYUAccjWhWY+FW4=",
-    "windows-x64-profile/windows-x64-flutter.zip": "sha256-2/3kncn1RB1U41T83xudVsRqXhD3kGiiPbbAixeyQA0=",
-    "windows-x64-release/windows-x64-flutter.zip": "sha256-NL1801xcnuJ60D/KF8A0F8gEJ9TGFhnR8+mwKFnC4V4=",
-    "windows-x64/artifacts.zip": "sha256-rXQrattA8ykNsOzQlcaKX7EJt43gfOBtXyg9r2/Voq4=",
-    "windows-x64/flutter-cpp-client-wrapper.zip": "sha256-Qg4orxxNDofGOb9iiEapIjXh5aRdAewft7XZn/jw1FM=",
-    "windows-x64/font-subset.zip": "sha256-bVoEA88BeTe0zqjQEKzXgG4xfamSXv1oUdSqPwoB3pQ="
-  },
+  "version": "3.38.10",
+  "engineVersion": "cafcda5721a78a7884db92f13c5e89f7643d52dd",
+  "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
+  "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
   "channel": "stable",
-  "dartHash": {
-    "aarch64-darwin": "sha256-99gMhvkzSJmYEsGuD3kBN1e3l685Xyy6cNICegC+Vk4=",
-    "aarch64-linux": "sha256-Z8mPnmppTtPLNiY0Ny1pRzBAs3EoNtQsr82zxWwKBOs=",
-    "x86_64-darwin": "sha256-pd37vWDOIKGdek/CuUSH7sVyiKqlLOW6GLT4IkzkwYA=",
-    "x86_64-linux": "sha256-1DudOiG4LvKjfTGUW5nmuI9fjcROwZG0c/1inXjQuZQ="
+  "engineHashes": {
+    "aarch64-linux": {
+      "aarch64-linux": "sha256-qhOj6VT1aKhBApEr5R10NwalozUPMQKuUXfhcscTDTs=",
+      "x86_64-linux": "sha256-qhOj6VT1aKhBApEr5R10NwalozUPMQKuUXfhcscTDTs="
+    },
+    "x86_64-linux": {
+      "aarch64-linux": "sha256-VriQI7YmeM/HrZvLPRllxn5D/0r5xJiCzsn4XeBXO+A=",
+      "x86_64-linux": "sha256-VriQI7YmeM/HrZvLPRllxn5D/0r5xJiCzsn4XeBXO+A="
+    }
   },
   "dartVersion": "3.10.9",
-  "engineVersion": "cafcda5721a78a7884db92f13c5e89f7643d52dd",
+  "dartHash": {
+    "x86_64-linux": "sha256-Js8cesRAseVfa5CCQSmnJJVBYl+S7Zy7ax/vNbWMjQ0=",
+    "aarch64-linux": "sha256-Ba7CCHPzor8H6ksrQUqDnx82i92OSE4qiihMaDKNexI=",
+    "x86_64-darwin": "sha256-btQavXZ3CVM0ByGlZJ5z2TUfXsPljY4iFeU1rgf4KQE=",
+    "aarch64-darwin": "sha256-zmEK01ooqIKtVlw+7JlDAVvviFOcaqOrbGPkdirst6A="
+  },
   "flutterHash": "sha256-dFVejSD3l2C6FM3/vimOId5Nklctv7ISO9uDhLTNf80=",
+  "artifactHashes": {
+    "android": {
+      "aarch64-darwin": "sha256-NFvkU3aDAmCAuO+ZrNaY5CJpPyioc6eB6cFZfziXEQU=",
+      "aarch64-linux": "sha256-eHu5nWrxht1O6dP6LQ2UHNpPMNaRt/vL+cY2Okhtn0g=",
+      "x86_64-darwin": "sha256-NFvkU3aDAmCAuO+ZrNaY5CJpPyioc6eB6cFZfziXEQU=",
+      "x86_64-linux": "sha256-eHu5nWrxht1O6dP6LQ2UHNpPMNaRt/vL+cY2Okhtn0g="
+    },
+    "fuchsia": {
+      "aarch64-darwin": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=",
+      "aarch64-linux": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=",
+      "x86_64-darwin": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=",
+      "x86_64-linux": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE="
+    },
+    "ios": {
+      "aarch64-darwin": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=",
+      "aarch64-linux": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=",
+      "x86_64-darwin": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=",
+      "x86_64-linux": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI="
+    },
+    "linux": {
+      "aarch64-darwin": "sha256-IMa7QTMRYoWlJcI/SCO6aBtmKtIozQAcAgeQFWCFgb4=",
+      "aarch64-linux": "sha256-IMa7QTMRYoWlJcI/SCO6aBtmKtIozQAcAgeQFWCFgb4=",
+      "x86_64-darwin": "sha256-nmLLXotJuHrFrpRMjdb/38l/rPRDiFvFf0BwfVvs9V8=",
+      "x86_64-linux": "sha256-nmLLXotJuHrFrpRMjdb/38l/rPRDiFvFf0BwfVvs9V8="
+    },
+    "macos": {
+      "aarch64-darwin": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=",
+      "aarch64-linux": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=",
+      "x86_64-darwin": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=",
+      "x86_64-linux": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A="
+    },
+    "universal": {
+      "aarch64-darwin": "sha256-viiNdnQKAaTO91yNwGrSwr5jT2Zm+38rLNCyb7N3faw=",
+      "aarch64-linux": "sha256-u9qKNkrdxkIVP4+rn0vzDSY37twJ/TLV7nfX6IqRj+4=",
+      "x86_64-darwin": "sha256-ztUb0vhegvskVdXcIi6xQtfJdIZTCWQB8zfR0CTLD54=",
+      "x86_64-linux": "sha256-Xlm/ds/m0nm2cAXszCxCCjMNDyyK4AcldrvnwYImxSE="
+    },
+    "web": {
+      "aarch64-darwin": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=",
+      "aarch64-linux": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=",
+      "x86_64-darwin": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=",
+      "x86_64-linux": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw="
+    },
+    "windows": {
+      "x86_64-darwin": "sha256-HId39NR+rbe1fqEssNb7gD6bvmeLj1N9UJYV8hxJFt0=",
+      "x86_64-linux": "sha256-HId39NR+rbe1fqEssNb7gD6bvmeLj1N9UJYV8hxJFt0="
+    }
+  },
   "pubspecLock": {
     "packages": {
       "_fe_analyzer_shared": {
@@ -1091,6 +1086,5 @@
     "sdks": {
       "dart": ">=3.9.0 <4.0.0"
     }
-  },
-  "version": "3.38.10"
+  }
 }
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/content-unaware-hash.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/content-unaware-hash.patch
deleted file mode 100644
index d912db5c15cc..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_38/patches/content-unaware-hash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/bin/internal/content_aware_hash.sh
-+++ b/bin/internal/content_aware_hash.sh
-@@ -13,6 +13,9 @@
-
- set -e
-
-+echo '0000000000000000000000000000000000000000'
-+exit 0
-+
- FLUTTER_ROOT="$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")"
-
- unset GIT_DIR
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/no-cache.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/no-cache.patch
deleted file mode 100644
index e0cdb21fd030..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_38/patches/no-cache.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/packages/flutter_tools/lib/src/cache.dart
-+++ b/packages/flutter_tools/lib/src/cache.dart
-@@ -318,7 +318,7 @@
-   var fatalStorageWarning = true;
- 
-   static RandomAccessFile? _lock;
--  static var _lockEnabled = true;
-+  static var _lockEnabled = false;
- 
-   /// Turn off the [lock]/[releaseLock] mechanism.
-   ///
-@@ -721,7 +721,6 @@
-   }
- 
-   void setStampFor(String artifactName, String version) {
--    getStampFileFor(artifactName).writeAsStringSync(version);
-   }
- 
-   File getStampFileFor(String artifactName) {
-@@ -1010,31 +1009,6 @@
-   }
- 
-   Future<bool> checkForArtifacts(String? engineVersion) async {
--    engineVersion ??= version;
--    final url = '${cache.storageBaseUrl}/flutter_infra_release/flutter/$engineVersion/';
--
--    var exists = false;
--    for (final String pkgName in getPackageDirs()) {
--      exists = await cache.doesRemoteExist(
--        'Checking package $pkgName is available...',
--        Uri.parse('$url$pkgName.zip'),
--      );
--      if (!exists) {
--        return false;
--      }
--    }
--
--    for (final List<String> toolsDir in getBinaryDirs()) {
--      final String cacheDir = toolsDir[0];
--      final String urlPath = toolsDir[1];
--      exists = await cache.doesRemoteExist(
--        'Checking $cacheDir tools are available...',
--        Uri.parse(url + urlPath),
--      );
--      if (!exists) {
--        return false;
--      }
--    }
-     return true;
-   }
- 
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/version.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/version.patch
deleted file mode 100644
index 49f2c5294d51..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_38/patches/version.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- a/packages/flutter_tools/lib/src/version.dart
-+++ b/packages/flutter_tools/lib/src/version.dart
-@@ -99,10 +99,7 @@
-       }
-     }
- 
--    final String frameworkRevision = git
--        .logSync(['-n', '1', '--pretty=format:%H'], workingDirectory: flutterRoot)
--        .stdout
--        .trim();
-+    final String frameworkRevision = 'nixpkgs000000000000000000000000000000000';
- 
-     return FlutterVersion.fromRevision(
-       clock: clock,
-@@ -222,10 +219,7 @@
-   final String flutterRoot;
- 
-   String _getTimeSinceCommit({String? revision}) {
--    return _git
--        .logSync(['-n', '1', '--pretty=format:%ar', ?revision], workingDirectory: flutterRoot)
--        .stdout
--        .trim();
-+    return 'unknown';
-   }
- 
-   // TODO(fujino): calculate this relative to frameworkCommitDate for
-@@ -391,13 +385,7 @@
-   /// remote git repository is not reachable due to a network issue.
-   Future<String> _fetchRemoteFrameworkCommitDate() async {
-     try {
--      // Fetch upstream branch's commit and tags
--      await _run(_git, ['fetch', '--tags']);
--      return _gitCommitDate(
--        git: _git,
--        gitRef: kGitTrackingUpstream,
--        workingDirectory: Cache.flutterRoot,
--      );
-+      return 'unknown';
-     } on VersionCheckError catch (error) {
-       globals.printError(error.message);
-       rethrow;
-@@ -422,13 +410,7 @@
-   /// If [redactUnknownBranches] is true and the branch is unknown,
-   /// the branch name will be returned as `'[user-branch]'` ([kUserBranch]).
-   String getBranchName({bool redactUnknownBranches = false}) {
--    _branch ??= () {
--      final String branch = _git
--          .runSync(['symbolic-ref', '--short', 'HEAD'], workingDirectory: flutterRoot)
--          .stdout
--          .trim();
--      return branch == 'HEAD' ? '' : branch;
--    }();
-+    _branch ??= 'stable';
-     if (redactUnknownBranches || _branch!.isEmpty) {
-       // Only return the branch names we know about; arbitrary branch names might contain PII.
-       if (!kOfficialChannels.contains(_branch) && !kObsoleteBranches.containsKey(_branch)) {
-@@ -464,31 +446,7 @@
-   required Git git,
-   required String? workingDirectory,
- }) {
--  final RunResult result = git.logSync([
--    gitRef,
--    '-n',
--    '1',
--    '--pretty=format:%ad',
--    '--date=iso',
--  ], workingDirectory: workingDirectory);
--  if (result.exitCode == 0) {
--    return result.stdout.trim();
--  }
--  final error = VersionCheckError(
--    'Command exited with code ${result.exitCode}: ${result.command.join(' ')}\n'
--    'Standard out: ${result.stdout}\n'
--    'Standard error: ${result.stderr}',
--  );
--  if (lenient) {
--    final dummyDate = DateTime.fromMillisecondsSinceEpoch(0);
--    globals.printError(
--      'Failed to find the latest git commit date: $error\n'
--      'Returning $dummyDate instead.',
--    );
--    // Return something that DateTime.parse() can parse.
--    return dummyDate.toString();
--  }
--  throw error;
-+  return 'unknown';
- }
- 
- class _FlutterVersionFromFile extends FlutterVersion {
-@@ -639,23 +597,7 @@
-   @override
-   String? get repositoryUrl {
-     if (_repositoryUrl == null) {
--      final String gitChannel = _git
--          .runSync([
--            'rev-parse',
--            '--abbrev-ref',
--            '--symbolic',
--            kGitTrackingUpstream,
--          ], workingDirectory: flutterRoot)
--          .stdout
--          .trim();
--      final int slash = gitChannel.indexOf('/');
--      if (slash != -1) {
--        final String remote = gitChannel.substring(0, slash);
--        _repositoryUrl = _git
--            .runSync(['ls-remote', '--get-url', remote], workingDirectory: flutterRoot)
--            .stdout
--            .trim();
--      }
-+      _repositoryUrl = 'https://github.com/flutter/flutter.git';
-     }
-     return _repositoryUrl;
-   }
-@@ -1005,6 +947,16 @@
-   final String gitTag;
- 
-   static GitTagVersion determine(
-+    Platform platform, {
-+    required Git git,
-+    String? workingDirectory,
-+    bool fetchTags = false,
-+    String gitRef = 'HEAD',
-+  }) {
-+    return GitTagVersion.unknown();
-+  }
-+
-+  static GitTagVersion determine_orig(
-     Platform platform, {
-     required Git git,
-     String? workingDirectory,
diff --git a/pkgs/development/compilers/flutter/versions/3_41/data.json b/pkgs/development/compilers/flutter/versions/3_41/data.json
index 2a11cfc9cd13..0159af0063c2 100644
--- a/pkgs/development/compilers/flutter/versions/3_41/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_41/data.json
@@ -1,80 +1,75 @@
 {
-  "artifactHashes": {
-    "android-arm-profile/artifacts.zip": "sha256-plu68ELMftDhiYcgkJBaE8asLzo2ctLl/2ba4efaBlg=",
-    "android-arm-profile/darwin-x64.zip": "sha256-YqIngn4CqUWFTw7DJ0uzQbTC5LPXy/eMS7j3fpdk0Zs=",
-    "android-arm-profile/linux-x64.zip": "sha256-mysciyN6YhdyMU1eJuGbVVNWF65NiPn9hLv0TdYYIZ0=",
-    "android-arm-profile/windows-x64.zip": "sha256-OHZ0sgA1cY4PA9W2Ih8sSTeM+DKMZUtYl7wUVcFZiOw=",
-    "android-arm-release/artifacts.zip": "sha256-TYHND/VUpanPdCII9d9Db66M4U3Lsu3/Pbol8UNBCMk=",
-    "android-arm-release/darwin-x64.zip": "sha256-sEPX65dQSMVliEnYTCxN06ZKjp1RwhMeoSuhH/LZNS0=",
-    "android-arm-release/linux-x64.zip": "sha256-tP3BZFvzhIK5CawnU+ubmq+GRFqfPJ5POoaoHG+RdD4=",
-    "android-arm-release/windows-x64.zip": "sha256-Y3sDe7MtG0NRHvnLLIjUIXOsXXrRclhexta41SUa9Qs=",
-    "android-arm/artifacts.zip": "sha256-Y4ocz8l+LI1ojslfOloU3KgCC2i8etsEmZY99UnoAI4=",
-    "android-arm64-profile/artifacts.zip": "sha256-VAocgCx7m8pM8PXK/mLzqNaJBzRfg3cCl45uVT7KdQU=",
-    "android-arm64-profile/darwin-x64.zip": "sha256-UXz/SAQstAtTmjdSdxql7OUlqsnkzr56vwnMkToeObk=",
-    "android-arm64-profile/linux-x64.zip": "sha256-iprtcLB/sCngKjPcN3lHaqLL2QndGo3KbQIsdnqtlKE=",
-    "android-arm64-profile/windows-x64.zip": "sha256-x5RmwOpJ+O77IxhTJ2+wXlMqgaNdT9dCV6p1aMooSl0=",
-    "android-arm64-release/artifacts.zip": "sha256-oQI+gLEf0NsWYVH/9124njBEctiBUKvuNWnghaaLO9s=",
-    "android-arm64-release/darwin-x64.zip": "sha256-wWjvqLRtsm+0SDYYg8lw+vCBNBDKzcJpzOkmEuSdEls=",
-    "android-arm64-release/linux-x64.zip": "sha256-YmrheUHylvRK/FlOZkRMD9i47K5U8obOraRFsXKhwhs=",
-    "android-arm64-release/windows-x64.zip": "sha256-riqR9TEIb9f/QaWcPbhkNUIEdJ5ZQIKKxoD5KlCB5yc=",
-    "android-arm64/artifacts.zip": "sha256-UZUCwJxdjiZy4UZz6xCyuWsSmequIptaPxCIeczw8Vg=",
-    "android-x64-profile/artifacts.zip": "sha256-+mbN3pO70AcmEJZYOb4or2BV8p9yYjZYHxZaNSb5QPk=",
-    "android-x64-profile/darwin-x64.zip": "sha256-w2ggxB3eSCwvKCohnJlbX258nQUMjK8s4jXkr74m4aw=",
-    "android-x64-profile/linux-x64.zip": "sha256-Vggd6cRe2d3zFSG570+TZUoHNPJuVHjleSQnDfqKsxQ=",
-    "android-x64-profile/windows-x64.zip": "sha256-4zguzW7Tm7nscfApeeaHbYPy9+Jw3o22gRxXZZ79ae8=",
-    "android-x64-release/artifacts.zip": "sha256-DfdyXrqSGxemAlvF/nwjcWkjo2d/fwWOyVWGPiM3Ff8=",
-    "android-x64-release/darwin-x64.zip": "sha256-H8r9NtoVKfI0Y09HKBA2TzjPZhBTktUrJyZsXJL1Z+Y=",
-    "android-x64-release/linux-x64.zip": "sha256-HZEh7f0vWDPtqYAqJ5CdgAhpUJW5RWLg25yyDpM3rX4=",
-    "android-x64-release/windows-x64.zip": "sha256-5zNvcGkL9ArsrZ+PHvWi97kUc6h+EWckIUGM/KDz1Qw=",
-    "android-x64/artifacts.zip": "sha256-O+3ykJd+Z7ZB2sZbwe+KtdP2JiatnI4di0l8DsuUofc=",
-    "android-x86/artifacts.zip": "sha256-iLM7ZfYMPM3Lmbvo7XDJW0zFqu1tS7NxmbImq8Ke9hU=",
-    "darwin-arm64/artifacts.zip": "sha256-MVnRN8HvmsLqnsiBpNvbEvgGg4ino7SWgp+9Y/Kq76M=",
-    "darwin-arm64/font-subset.zip": "sha256-capuWYsdAFYRZGeSGoRpLfw116GMXTZQn18VTYRk7ss=",
-    "darwin-x64-profile/artifacts.zip": "sha256-UEVqrW7LcDMNe7vLnul9qnyvfA7bXULxv7FDRUzXhpU=",
-    "darwin-x64-profile/framework.zip": "sha256-+kxuSBSFLPAjcBee7DEupLnJP0HW5yzXF78MGLsur9o=",
-    "darwin-x64-profile/gen_snapshot.zip": "sha256-Q8mHzXPiAx2HReJHaYnWVLbf2PiuK5f0GFtT2Y+jqTA=",
-    "darwin-x64-release/artifacts.zip": "sha256-J+2vH/MLJ61kvVkIXxx1NGl2kSDPC8xFEvqeoopxwW4=",
-    "darwin-x64-release/framework.zip": "sha256-MsqwiLv7oTySmkeibNBQvmT63Fh5c8bGtexWRnWhIT8=",
-    "darwin-x64-release/gen_snapshot.zip": "sha256-ZvzW84hd3dyhsJLNw3bGUDH1vjuLzd6bFh+LY70NDLQ=",
-    "darwin-x64/artifacts.zip": "sha256-Ovq1yaTvYQjyr1ZYtdC/ngeQvvCOTBAjE7IV0wYCCE4=",
-    "darwin-x64/font-subset.zip": "sha256-IHLrPa4fAqPrdeHYdsIz93BHO0Np+2MSCbk7C2sgwwk=",
-    "darwin-x64/framework.zip": "sha256-EQjB10gVKzjdmaiIOf46U6YbAHaCVmdzHXPc6Ds8KcE=",
-    "darwin-x64/gen_snapshot.zip": "sha256-4+J8H82bxIFviUvvthyBZGrBwYO11mFJErL2whooZFY=",
-    "flutter-web-sdk.zip": "sha256-7rZynFWlGy0SJ2wCRlItpvwEBK2bIUqsm+f97FF5js4=",
-    "flutter_gpu.zip": "sha256-+xx4iFMM6cm4eYJUqp2iq/UWCSjtmn22RNEG8z6stvQ=",
-    "flutter_patched_sdk.zip": "sha256-SwWY3Gxv3hYZAzmVAJwwLl51CFdC4Pfgq8+VLsVHarY=",
-    "flutter_patched_sdk_product.zip": "sha256-nxOERMQz0qq7EFVm6OWpl8BR6E+20xLG0du5Jj+YHbE=",
-    "ios-profile/artifacts.zip": "sha256-RL1GqX0/6fv+SeUW3FNyfKQl/bpTM84STQSzHLCSh7E=",
-    "ios-release/artifacts.zip": "sha256-gnRjcv8bz1du/w9T8bZBaspUqIkeKxPB0BqPsbofq34=",
-    "ios/artifacts.zip": "sha256-qjr2yU4XsbdiyJwAK6v7bINiALIIOFyUmWpKFhaDou0=",
-    "linux-arm64-debug/linux-arm64-flutter-gtk.zip": "sha256-WmN2CNXlSslMxwQO8siUbvOL1C2B7DyAiubOpof0hps=",
-    "linux-arm64-profile/linux-arm64-flutter-gtk.zip": "sha256-RZJOPNYA/TuoLGQfpOveJ0dhBs4xKf4Iy3MmCLBoBE8=",
-    "linux-arm64-release/linux-arm64-flutter-gtk.zip": "sha256-qQFBvIOsQwLEnsSlfV+r9yK/3rBQyyIQZayJzarO9iI=",
-    "linux-arm64/artifacts.zip": "sha256-JnPSiHx6hYCK2kx/zQqxvjbIGZPwH5UDI4dZyJ5kPIU=",
-    "linux-arm64/font-subset.zip": "sha256-9TcFWpN3suISmjNgje7WSqygiWbu9Q5t6SAfhqZlF00=",
-    "linux-x64-debug/linux-x64-flutter-gtk.zip": "sha256-og0JAIZL/Arklv4cpeOMhqhN+n2VcVWJg6T0G3hb1sQ=",
-    "linux-x64-profile/linux-x64-flutter-gtk.zip": "sha256-LXOooWgdQcjm4rc7RXi8765snfvovIxXDVfCaOSBc/o=",
-    "linux-x64-release/linux-x64-flutter-gtk.zip": "sha256-ICePn3G3SngJ5O78B0YvUf0lspWXJBRi3ESUOmRhtzI=",
-    "linux-x64/artifacts.zip": "sha256-15A66Yj0IUzvmXcijWIFFaYGuXccJp0L1rqg7APkwiM=",
-    "linux-x64/font-subset.zip": "sha256-YcYgMtvtIJekxpAByUkF8OViQxe1+EBczpKer15meeA=",
-    "sky_engine.zip": "sha256-qIs/zBZ9VvCU4PUNrmJRPvF0UsEZ6fe4HVIGoYEYdhs=",
-    "windows-x64-debug/windows-x64-flutter.zip": "sha256-4QYdKTF2GipzX+KS0FkEwQV9MBEkKUjUi7Nav21bv2k=",
-    "windows-x64-profile/windows-x64-flutter.zip": "sha256-a7ANXvvQ2nawAdPOxOuTgrQMgFSihCtQhzAiOQJtOLE=",
-    "windows-x64-release/windows-x64-flutter.zip": "sha256-qLG8IChKep+nwYcogcM5JOGP0wZwdUPdjf4mg8TPmVU=",
-    "windows-x64/artifacts.zip": "sha256-2GZ4oVJ/XjiNDs0goanWPbmhkiwARGU+GsrhZnTdzd0=",
-    "windows-x64/flutter-cpp-client-wrapper.zip": "sha256-lqxP9xCNa7ClZyNIaxnZv/MorPFmV8haDde/Sm2DG4Q=",
-    "windows-x64/font-subset.zip": "sha256-t0hARPeFDhVqad2H1dlhvkf6l3a4EcsoVHotageUghA="
-  },
+  "version": "3.41.6",
+  "engineVersion": "425cfb54d01a9472b3e81d9e76fd63a4a44cfbcb",
+  "engineSwiftShaderHash": "sha256-qbtCl2nTpmtp9dnaoXc7rF3RqLnAZEmzw1BzPoCRWrc=",
+  "engineSwiftShaderRev": "794b0cfce1d828d187637e6d932bae484fbe0976",
   "channel": "stable",
-  "dartHash": {
-    "aarch64-darwin": "sha256-DwyZtAeZLuaX2MFVPzhERiFeX45wI9sTc4Y2SVopRE8=",
-    "linux": "sha256-y2F+wB0M5dq6koxGpCs9BExGU7p8tFOIiRqfdf8ip+8=",
-    "x86_64-darwin": "sha256-GHTjTHJmbIPfsAbF4AmxjDETSw9YD04/6lGecoe1xrA="
+  "engineHashes": {
+    "aarch64-linux": {
+      "aarch64-linux": "sha256-MDmnLj7uUgAQ3UIgU4XU8r57TMv50tFdfmYYcFhcsxM=",
+      "x86_64-linux": "sha256-MDmnLj7uUgAQ3UIgU4XU8r57TMv50tFdfmYYcFhcsxM="
+    },
+    "x86_64-linux": {
+      "aarch64-linux": "sha256-93ut4VKfLefvB/dNAlf7MrfchM8dS4uhvyhM0Lt94jQ=",
+      "x86_64-linux": "sha256-93ut4VKfLefvB/dNAlf7MrfchM8dS4uhvyhM0Lt94jQ="
+    }
   },
   "dartVersion": "3.11.4",
-  "engineHash": "sha256-DJwtw5yJsTou6mXb5lSjP1two72rRqdO2Q/+WkhWGS8=",
-  "engineVersion": "425cfb54d01a9472b3e81d9e76fd63a4a44cfbcb",
+  "dartHash": {
+    "x86_64-linux": "sha256-UtYvBbAHzLcRfPQcGb7aHIfBRLJ+pgCxa0ycjqj8j9Q=",
+    "aarch64-linux": "sha256-w1um8N4fXrvyNQZhK//DR8e6lMOkx1EQyrEVeJIWbTw=",
+    "x86_64-darwin": "sha256-GHTjTHJmbIPfsAbF4AmxjDETSw9YD04/6lGecoe1xrA=",
+    "aarch64-darwin": "sha256-DwyZtAeZLuaX2MFVPzhERiFeX45wI9sTc4Y2SVopRE8="
+  },
   "flutterHash": "sha256-oI/Ml2gT1jStnpAwS/SBant3ja8d7hSEZ74kin8kENk=",
+  "artifactHashes": {
+    "android": {
+      "aarch64-darwin": "sha256-XqHuTqBB5htEaOXwBWW2JE7KIHfQ4AnyTVTu6ekrL34=",
+      "aarch64-linux": "sha256-+0pmhXISuitKlG94LraIAr0qDu7ob4DrefMiBcZBbRU=",
+      "x86_64-darwin": "sha256-XqHuTqBB5htEaOXwBWW2JE7KIHfQ4AnyTVTu6ekrL34=",
+      "x86_64-linux": "sha256-+0pmhXISuitKlG94LraIAr0qDu7ob4DrefMiBcZBbRU="
+    },
+    "fuchsia": {
+      "aarch64-darwin": "sha256-CZpjr9MPSxKW37Mz3/E11drpCQRKVHrG8VDU0qVl45E=",
+      "aarch64-linux": "sha256-CZpjr9MPSxKW37Mz3/E11drpCQRKVHrG8VDU0qVl45E=",
+      "x86_64-darwin": "sha256-CZpjr9MPSxKW37Mz3/E11drpCQRKVHrG8VDU0qVl45E=",
+      "x86_64-linux": "sha256-CZpjr9MPSxKW37Mz3/E11drpCQRKVHrG8VDU0qVl45E="
+    },
+    "ios": {
+      "aarch64-darwin": "sha256-GFDc9AwM9WCO8Y0KUclhQwSsHBz6KVuFFx6OtbHAPy4=",
+      "aarch64-linux": "sha256-GFDc9AwM9WCO8Y0KUclhQwSsHBz6KVuFFx6OtbHAPy4=",
+      "x86_64-darwin": "sha256-GFDc9AwM9WCO8Y0KUclhQwSsHBz6KVuFFx6OtbHAPy4=",
+      "x86_64-linux": "sha256-GFDc9AwM9WCO8Y0KUclhQwSsHBz6KVuFFx6OtbHAPy4="
+    },
+    "linux": {
+      "aarch64-darwin": "sha256-/rAQETXAXGblIinEfTmwV29lFfHj4Ws9BvD1MZ/bnqM=",
+      "aarch64-linux": "sha256-/rAQETXAXGblIinEfTmwV29lFfHj4Ws9BvD1MZ/bnqM=",
+      "x86_64-darwin": "sha256-Q/3ba2UhzMaJrOAFz6HaHAbgcTHEztMUPg+SEAt0PAM=",
+      "x86_64-linux": "sha256-Q/3ba2UhzMaJrOAFz6HaHAbgcTHEztMUPg+SEAt0PAM="
+    },
+    "macos": {
+      "aarch64-darwin": "sha256-HPLmvF32alDhh1jRigp/zJU77nLueDFEsDmM4eBIdos=",
+      "aarch64-linux": "sha256-HPLmvF32alDhh1jRigp/zJU77nLueDFEsDmM4eBIdos=",
+      "x86_64-darwin": "sha256-HPLmvF32alDhh1jRigp/zJU77nLueDFEsDmM4eBIdos=",
+      "x86_64-linux": "sha256-HPLmvF32alDhh1jRigp/zJU77nLueDFEsDmM4eBIdos="
+    },
+    "universal": {
+      "aarch64-darwin": "sha256-kJv9nhT15oWafKEjahk0Dlh8sko6DGvrfpBowlDKps4=",
+      "aarch64-linux": "sha256-XVUgeHwC0BgqeMWvkhMwi8k2yrcWNbUPTMw7F++UkV4=",
+      "x86_64-darwin": "sha256-9xkjn2IOfOIy4xtUO43YfJwwYXcL7LHvJ3FVTa7jt5w=",
+      "x86_64-linux": "sha256-l56TIx2e3hCxMzyhzZLE8vo4H59XWnSofyPfa1i5Oyo="
+    },
+    "web": {
+      "aarch64-darwin": "sha256-oJQjHSkQS+P2jNEr1GAJp61bNk05579okyGK5BovjRA=",
+      "aarch64-linux": "sha256-oJQjHSkQS+P2jNEr1GAJp61bNk05579okyGK5BovjRA=",
+      "x86_64-darwin": "sha256-oJQjHSkQS+P2jNEr1GAJp61bNk05579okyGK5BovjRA=",
+      "x86_64-linux": "sha256-oJQjHSkQS+P2jNEr1GAJp61bNk05579okyGK5BovjRA="
+    },
+    "windows": {
+      "x86_64-darwin": "sha256-rDuCsweWYvlT6Z8kGr1AK0UMzRUpn8MYscdF7qqmbnc=",
+      "x86_64-linux": "sha256-rDuCsweWYvlT6Z8kGr1AK0UMzRUpn8MYscdF7qqmbnc="
+    }
+  },
   "pubspecLock": {
     "packages": {
       "_fe_analyzer_shared": {
@@ -1091,7 +1086,5 @@
     "sdks": {
       "dart": ">=3.10.0-0.0.dev <4.0.0"
     }
-  },
-  "version": "3.41.6"
+  }
 }
-
diff --git a/pkgs/development/compilers/flutter/versions/3_41/patches/content-unaware-hash.patch b/pkgs/development/compilers/flutter/versions/3_41/patches/content-unaware-hash.patch
deleted file mode 100644
index 461dc7f171f6..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_41/patches/content-unaware-hash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/bin/internal/content_aware_hash.sh
-+++ b/bin/internal/content_aware_hash.sh
-@@ -13,6 +13,9 @@
- 
- set -e
- 
-+echo '0000000000000000000000000000000000000000'
-+exit 0
-+
- FLUTTER_ROOT="$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")"
- 
- unset GIT_DIR
diff --git a/pkgs/development/compilers/flutter/versions/3_41/patches/no-cache.patch b/pkgs/development/compilers/flutter/versions/3_41/patches/no-cache.patch
deleted file mode 100644
index 83b347dc01b7..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_41/patches/no-cache.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/packages/flutter_tools/lib/src/cache.dart
-+++ b/packages/flutter_tools/lib/src/cache.dart
-@@ -318,7 +319,7 @@
-   var fatalStorageWarning = true;
- 
-   static RandomAccessFile? _lock;
--  static var _lockEnabled = true;
-+  static var _lockEnabled = false;
- 
-   /// Turn off the [lock]/[releaseLock] mechanism.
-   ///
-@@ -721,7 +722,6 @@
-   }
- 
-   void setStampFor(String artifactName, String version) {
--    getStampFileFor(artifactName).writeAsStringSync(version);
-   }
- 
-   File getStampFileFor(String artifactName) {
-@@ -1010,31 +1010,6 @@
-   }
- 
-   Future<bool> checkForArtifacts(String? engineVersion) async {
--    engineVersion ??= version;
--    final url = '${cache.storageBaseUrl}/flutter_infra_release/flutter/$engineVersion/';
--
--    var exists = false;
--    for (final String pkgName in getPackageDirs()) {
--      exists = await cache.doesRemoteExist(
--        'Checking package $pkgName is available...',
--        Uri.parse('$url$pkgName.zip'),
--      );
--      if (!exists) {
--        return false;
--      }
--    }
--
--    for (final List<String> toolsDir in getBinaryDirs()) {
--      final String cacheDir = toolsDir[0];
--      final String urlPath = toolsDir[1];
--      exists = await cache.doesRemoteExist(
--        'Checking $cacheDir tools are available...',
--        Uri.parse(url + urlPath),
--      );
--      if (!exists) {
--        return false;
--      }
--    }
-     return true;
-   }
- 
diff --git a/pkgs/development/compilers/flutter/versions/3_41/patches/version.patch b/pkgs/development/compilers/flutter/versions/3_41/patches/version.patch
deleted file mode 100644
index 92c8b8e50db9..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_41/patches/version.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- a/packages/flutter_tools/lib/src/version.dart
-+++ b/packages/flutter_tools/lib/src/version.dart
-@@ -99,10 +99,7 @@ abstract class FlutterVersion {
-       }
-     }
- 
--    final String frameworkRevision = git
--        .logSync(['-n', '1', '--pretty=format:%H'], workingDirectory: flutterRoot)
--        .stdout
--        .trim();
-+    final String frameworkRevision = 'nixpkgs000000000000000000000000000000000';
- 
-     return FlutterVersion.fromRevision(
-       clock: clock,
-@@ -222,10 +219,7 @@ abstract class FlutterVersion {
-   final String flutterRoot;
- 
-   String _getTimeSinceCommit({String? revision}) {
--    return _git
--        .logSync(['-n', '1', '--pretty=format:%ar', ?revision], workingDirectory: flutterRoot)
--        .stdout
--        .trim();
-+    return 'unknown';
-   }
- 
-   // TODO(fujino): calculate this relative to frameworkCommitDate for
-@@ -391,13 +385,7 @@ abstract class FlutterVersion {
-   /// remote git repository is not reachable due to a network issue.
-   Future<String> _fetchRemoteFrameworkCommitDate() async {
-     try {
--      // Fetch upstream branch's commit and tags
--      await _run(_git, ['fetch', '--tags']);
--      return _gitCommitDate(
--        git: _git,
--        gitRef: kGitTrackingUpstream,
--        workingDirectory: Cache.flutterRoot,
--      );
-+      return 'unknown';
-     } on VersionCheckError catch (error) {
-       globals.printError(error.message);
-       rethrow;
-@@ -422,13 +410,7 @@ abstract class FlutterVersion {
-   /// If [redactUnknownBranches] is true and the branch is unknown,
-   /// the branch name will be returned as `'[user-branch]'` ([kUserBranch]).
-   String getBranchName({bool redactUnknownBranches = false}) {
--    _branch ??= () {
--      final String branch = _git
--          .runSync(['symbolic-ref', '--short', 'HEAD'], workingDirectory: flutterRoot)
--          .stdout
--          .trim();
--      return branch == 'HEAD' ? '' : branch;
--    }();
-+    _branch ??= 'stable';
-     if (redactUnknownBranches || _branch!.isEmpty) {
-       // Only return the branch names we know about; arbitrary branch names might contain PII.
-       if (!kOfficialChannels.contains(_branch) && !kObsoleteBranches.containsKey(_branch)) {
-@@ -464,31 +446,7 @@ String _gitCommitDate({
-   required Git git,
-   required String? workingDirectory,
- }) {
--  final RunResult result = git.logSync([
--    gitRef,
--    '-n',
--    '1',
--    '--pretty=format:%ad',
--    '--date=iso',
--  ], workingDirectory: workingDirectory);
--  if (result.exitCode == 0) {
--    return result.stdout.trim();
--  }
--  final error = VersionCheckError(
--    'Command exited with code ${result.exitCode}: ${result.command.join(' ')}\n'
--    'Standard out: ${result.stdout}\n'
--    'Standard error: ${result.stderr}',
--  );
--  if (lenient) {
--    final dummyDate = DateTime.fromMillisecondsSinceEpoch(0);
--    globals.printError(
--      'Failed to find the latest git commit date: $error\n'
--      'Returning $dummyDate instead.',
--    );
--    // Return something that DateTime.parse() can parse.
--    return dummyDate.toString();
--  }
--  throw error;
-+  return 'unknown';
- }
- 
- class _FlutterVersionFromFile extends FlutterVersion {
-@@ -639,23 +597,7 @@ class _FlutterVersionGit extends FlutterVersion {
-   @override
-   String? get repositoryUrl {
-     if (_repositoryUrl == null) {
--      final String gitChannel = _git
--          .runSync([
--            'rev-parse',
--            '--abbrev-ref',
--            '--symbolic',
--            kGitTrackingUpstream,
--          ], workingDirectory: flutterRoot)
--          .stdout
--          .trim();
--      final int slash = gitChannel.indexOf('/');
--      if (slash != -1) {
--        final String remote = gitChannel.substring(0, slash);
--        _repositoryUrl = _git
--            .runSync(['ls-remote', '--get-url', remote], workingDirectory: flutterRoot)
--            .stdout
--            .trim();
--      }
-+      _repositoryUrl = 'https://github.com/flutter/flutter.git';
-     }
-     return _repositoryUrl;
-   }
-@@ -1010,6 +952,16 @@ class GitTagVersion {
-     String? workingDirectory,
-     bool fetchTags = false,
-     String gitRef = 'HEAD',
-+  }) {
-+    return GitTagVersion.unknown();
-+  }
-+
-+  static GitTagVersion determine_orig(
-+    Platform platform, {
-+    required Git git,
-+    String? workingDirectory,
-+    bool fetchTags = false,
-+    String gitRef = 'HEAD',
-   }) {
-     if (fetchTags) {
-       final String channel = git
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
new file mode 100644
index 000000000000..f9009186364f
--- /dev/null
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -0,0 +1,211 @@
+{
+  lib,
+  stdenv,
+  darwin,
+  callPackage,
+  flutter,
+  supportedTargetFlutterPlatforms ? [
+    "universal"
+    "web"
+  ]
+  ++ lib.optional (stdenv.hostPlatform.isLinux && !(flutter ? engine)) "linux"
+  ++ lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isDarwin) "android"
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    "macos"
+    "ios"
+  ],
+  artifactHashes ? flutter.artifactHashes,
+  extraPkgConfigPackages ? [ ],
+  extraLibraries ? [ ],
+  extraIncludes ? [ ],
+  extraCxxFlags ? [ ],
+  extraCFlags ? [ ],
+  extraLinkerFlags ? [ ],
+  makeWrapper,
+  writeShellScript,
+  wrapGAppsHook3,
+  gitMinimal,
+  which,
+  pkg-config,
+  atk,
+  cairo,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  harfbuzz,
+  libepoxy,
+  pango,
+  libx11,
+  xorgproto,
+  libdeflate,
+  zlib,
+  cmake,
+  ninja,
+  clang,
+  symlinkJoin,
+}:
+
+let
+  supportsLinuxDesktopTarget = builtins.elem "linux" supportedTargetFlutterPlatforms;
+
+  flutterPlatformArtifacts = lib.genAttrs supportedTargetFlutterPlatforms (
+    flutterPlatform:
+    (callPackage ./artifacts/prepare-artifacts.nix {
+      src = callPackage ./artifacts/fetch-artifacts.nix {
+        inherit flutterPlatform;
+        systemPlatform = stdenv.hostPlatform.system;
+        flutter = callPackage ./wrapper.nix { inherit flutter; };
+        hash = artifactHashes.${flutterPlatform}.${stdenv.hostPlatform.system} or "";
+      };
+    })
+  );
+
+  cacheDir = symlinkJoin {
+    name = "flutter-cache-dir";
+    paths = builtins.attrValues flutterPlatformArtifacts;
+    postBuild = ''
+      mkdir --parents "$out/bin/cache"
+      ln --symbolic '${flutter}/bin/cache/dart-sdk' "$out/bin/cache"
+    '';
+    passthru.flutterPlatform = flutterPlatformArtifacts;
+  };
+
+  # By default, Flutter stores downloaded files (such as the Pub cache) in the SDK directory.
+  # Wrap it to ensure that it does not do that, preferring home directories instead.
+  immutableFlutter = writeShellScript "flutter_immutable" ''
+    export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"}
+    ${flutter}/bin/flutter "$@"
+  '';
+
+  # Tools that the Flutter tool depends on.
+  tools = [
+    gitMinimal
+    which
+  ];
+
+  # Libraries that Flutter apps depend on at runtime.
+  appRuntimeDeps = lib.optionals supportsLinuxDesktopTarget [
+    atk
+    cairo
+    gdk-pixbuf
+    glib
+    gtk3
+    harfbuzz
+    libepoxy
+    pango
+    libx11
+    libdeflate
+  ];
+
+  # Development packages required for compilation.
+  appBuildDeps =
+    let
+      # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3
+      deps =
+        pkg: lib.filter lib.isDerivation ((pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ]));
+      withKey = pkg: {
+        key = pkg.outPath;
+        val = pkg;
+      };
+      collect = pkg: lib.map withKey ([ pkg ] ++ deps pkg);
+    in
+    lib.map (e: e.val) (
+      lib.genericClosure {
+        startSet = lib.map withKey appRuntimeDeps;
+        operator = item: collect item.val;
+      }
+    );
+
+  # Some header files and libraries are not properly located by the Flutter SDK.
+  # They must be manually included.
+  appStaticBuildDeps =
+    (lib.optionals supportsLinuxDesktopTarget [
+      libx11
+      xorgproto
+      zlib
+    ])
+    ++ extraLibraries;
+
+  # Tools used by the Flutter SDK to compile applications.
+  buildTools = lib.optionals supportsLinuxDesktopTarget [
+    pkg-config
+    cmake
+    ninja
+    clang
+  ];
+
+  # Nix-specific compiler configuration.
+  pkgConfigPackages = map (lib.getOutput "dev") (appBuildDeps ++ extraPkgConfigPackages);
+  includeFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") (
+    appStaticBuildDeps ++ extraIncludes
+  );
+  linkerFlags =
+    (map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps) ++ extraLinkerFlags;
+in
+(callPackage ./sdk-symlink.nix { }) (
+  stdenv.mkDerivation {
+    pname = "flutter-wrapped";
+    inherit (flutter) version;
+
+    nativeBuildInputs = [
+      makeWrapper
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]
+    ++ lib.optionals supportsLinuxDesktopTarget [
+      glib
+      wrapGAppsHook3
+    ];
+
+    passthru = flutter.passthru // {
+      inherit (flutter) version;
+      unwrapped = flutter;
+      updateScript = ./update/update.py;
+      inherit cacheDir;
+    };
+
+    dontUnpack = true;
+    dontWrapGApps = true;
+
+    installPhase = ''
+      runHook preInstall
+
+      for path in ${
+        builtins.concatStringsSep " " (
+          builtins.foldl' (
+            paths: pkg:
+            paths
+            ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") [
+              "lib"
+              "share"
+            ])
+          ) [ ] pkgConfigPackages
+        )
+      }; do
+        addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"
+      done
+
+      mkdir --parents $out/bin
+      makeWrapper '${immutableFlutter}' $out/bin/flutter \
+        --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
+    ''
+    + lib.optionalString (flutter ? engine && flutter.engine.meta.available) ''
+      --set-default FLUTTER_ENGINE "${flutter.engine}" \
+      --add-flags "--local-engine-host ${flutter.engine.outName}" \
+    ''
+    + ''
+        --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \
+        --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \
+        --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \
+        --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \
+        --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \
+        --prefix LDFLAGS "''\t" '${
+          builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)
+        }' \
+        ''${gappsWrapperArgs[@]}
+
+      runHook postInstall
+    '';
+
+    inherit (flutter) meta;
+  }
+)
diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix
index 1e90828a6643..edd28a26ce95 100644
--- a/pkgs/development/compilers/gcc/common/builder.nix
+++ b/pkgs/development/compilers/gcc/common/builder.nix
@@ -278,106 +278,117 @@ originalAttrs:
           makeCompatibilitySymlink lib $targetConfig/lib64
         '';
 
-    postInstall = ''
-      # Clean up our compatibility symlinks (see above)
-      for link in "''${compatibilitySymlinks[@]}"; do
-        echo "Removing compatibility symlink: $link"
-        rm -f "$link"
-      done
-
-      # Move target runtime libraries to lib output.
-      # For non-cross, they're in $out/lib; for cross, they're in $out/$targetConfig/lib.
-      targetLibDir="''${targetConfig+$targetConfig/}lib"
-
-      moveToOutput "$targetLibDir/lib*.so*" "''${!outputLib}"
-      moveToOutput "$targetLibDir/lib*.dylib" "''${!outputLib}"
-      moveToOutput "$targetLibDir/lib*.dll.a" "''${!outputLib}"
-      moveToOutput "$targetLibDir/lib*.dll" "''${!outputLib}"
-      moveToOutput "share/gcc-*/python" "''${!outputLib}"
-
-      if [ -z "$enableShared" ]; then
-          moveToOutput "$targetLibDir/lib*.a" "''${!outputLib}"
-      fi
-
-      for i in "''${!outputLib}"/$targetLibDir/*.py; do
-          substituteInPlace "$i" --replace "$out" "''${!outputLib}"
-      done
-
-      # Multilib and cross can't exist at the same time, so just use lib64 here
-      if [ -n "$enableMultilib" ]; then
-          moveToOutput "lib64/lib*.so*" "''${!outputLib}"
-          moveToOutput "lib64/lib*.dylib" "''${!outputLib}"
-          moveToOutput "lib64/lib*.dll.a" "''${!outputLib}"
-          moveToOutput "lib64/lib*.dll" "''${!outputLib}"
-
-          for i in "''${!outputLib}"/lib64/*.py; do
-              substituteInPlace "$i" --replace "$out" "''${!outputLib}"
-          done
-      fi
-
-      # Remove `fixincl' to prevent a retained dependency on the
-      # previous gcc.
-      rm -rf $out/libexec/gcc/*/*/install-tools
-      rm -rf $out/lib/gcc/*/*/install-tools
-
-      # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
-      rm -rf $out/bin/gccbug
-
-      # Remove .la files, they're not adjusted for the makeCompatibilitySymlink magic,
-      # which confuses libtool and leads to weird linking errors.
-      # Removing the files just makes libtool link .so files directly, which is usually
-      # what we want anyway.
-      find $out -name '*.la' -delete
-
-      if type "install_name_tool"; then
-          for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do
-              install_name_tool -id "$i" "$i" || true
-              for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do
-                new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"`
-                install_name_tool -change "$old_path" "$new_path" "$i" || true
-              done
-          done
-      fi
-
-      # Get rid of some "fixed" header files
-      rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h}
-
-      # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
-      for i in $out/bin/*-gcc*; do
-          if cmp -s $out/bin/gcc $i; then
-              ln -sfn gcc $i
+    postInstall =
+      # SH installs libraries into a multilib subdirectory (e.g. lib/!m4/)
+      # even with --disable-multilib; move them to the expected location.
+      lib.optionalString stdenv.targetPlatform.isSh4 ''
+        for _mdir in $out/''${targetConfig+$targetConfig/}lib/!*/; do
+          if [ -d "$_mdir" ]; then
+            mv "$_mdir"/* $out/''${targetConfig+$targetConfig/}lib/
+            rmdir "$_mdir"
           fi
-      done
+        done
+      ''
+      + ''
+        # Clean up our compatibility symlinks (see above)
+        for link in "''${compatibilitySymlinks[@]}"; do
+          echo "Removing compatibility symlink: $link"
+          rm -f "$link"
+        done
 
-      for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do
-          if cmp -s $out/bin/g++ $i; then
-              ln -sfn g++ $i
-          fi
-      done
+        # Move target runtime libraries to lib output.
+        # For non-cross, they're in $out/lib; for cross, they're in $out/$targetConfig/lib.
+        targetLibDir="''${targetConfig+$targetConfig/}lib"
 
-      # Two identical man pages are shipped (moving and compressing is done later)
-      for i in "$out"/share/man/man1/*g++.1; do
-          if test -e "$i"; then
-              man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"`
-              ln -sf "$man_prefix"gcc.1 "$i"
-          fi
-      done
-    ''
-    + lib.optionalString stdenv.targetPlatform.isCygwin ''
-      targetBinDir="''${targetConfig+$targetConfig/}bin"
-      for i in "''${!outputBin}/$targetLibDir"/cyg*.dll; do
-        mkdir -p "''${!outputLib}/$targetBinDir"
-        mv "$i" "''${!outputLib}/$targetBinDir"/
-      done
-    ''
-    # if cross-compiling, link from $lib/lib to $lib/${targetConfig}.
-    # since native-compiles have $lib/lib as a directory (not a
-    # symlink), this ensures that in every case we can assume that
-    # $lib/lib contains the .so files
-    + lib.optionalString isCross ''
-      if [ -e "$lib/$targetConfig/lib" ]; then
-        ln -s "$lib/$targetConfig/lib" "$lib/lib"
-      fi
-    '';
+        moveToOutput "$targetLibDir/lib*.so*" "''${!outputLib}"
+        moveToOutput "$targetLibDir/lib*.dylib" "''${!outputLib}"
+        moveToOutput "$targetLibDir/lib*.dll.a" "''${!outputLib}"
+        moveToOutput "$targetLibDir/lib*.dll" "''${!outputLib}"
+        moveToOutput "share/gcc-*/python" "''${!outputLib}"
+
+        if [ -z "$enableShared" ]; then
+            moveToOutput "$targetLibDir/lib*.a" "''${!outputLib}"
+        fi
+
+        for i in "''${!outputLib}"/$targetLibDir/*.py; do
+            substituteInPlace "$i" --replace "$out" "''${!outputLib}"
+        done
+
+        # Multilib and cross can't exist at the same time, so just use lib64 here
+        if [ -n "$enableMultilib" ]; then
+            moveToOutput "lib64/lib*.so*" "''${!outputLib}"
+            moveToOutput "lib64/lib*.dylib" "''${!outputLib}"
+            moveToOutput "lib64/lib*.dll.a" "''${!outputLib}"
+            moveToOutput "lib64/lib*.dll" "''${!outputLib}"
+
+            for i in "''${!outputLib}"/lib64/*.py; do
+                substituteInPlace "$i" --replace "$out" "''${!outputLib}"
+            done
+        fi
+
+        # Remove `fixincl' to prevent a retained dependency on the
+        # previous gcc.
+        rm -rf $out/libexec/gcc/*/*/install-tools
+        rm -rf $out/lib/gcc/*/*/install-tools
+
+        # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
+        rm -rf $out/bin/gccbug
+
+        # Remove .la files, they're not adjusted for the makeCompatibilitySymlink magic,
+        # which confuses libtool and leads to weird linking errors.
+        # Removing the files just makes libtool link .so files directly, which is usually
+        # what we want anyway.
+        find $out -name '*.la' -delete
+
+        if type "install_name_tool"; then
+            for i in "''${!outputLib}"/lib/*.*.dylib "''${!outputLib}"/lib/*.so.[0-9]; do
+                install_name_tool -id "$i" "$i" || true
+                for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do
+                  new_path=`echo "$old_path" | sed "s,$out,''${!outputLib},"`
+                  install_name_tool -change "$old_path" "$new_path" "$i" || true
+                done
+            done
+        fi
+
+        # Get rid of some "fixed" header files
+        rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux,sys/mount.h,bits/statx.h,pthread.h}
+
+        # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
+        for i in $out/bin/*-gcc*; do
+            if cmp -s $out/bin/gcc $i; then
+                ln -sfn gcc $i
+            fi
+        done
+
+        for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do
+            if cmp -s $out/bin/g++ $i; then
+                ln -sfn g++ $i
+            fi
+        done
+
+        # Two identical man pages are shipped (moving and compressing is done later)
+        for i in "$out"/share/man/man1/*g++.1; do
+            if test -e "$i"; then
+                man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"`
+                ln -sf "$man_prefix"gcc.1 "$i"
+            fi
+        done
+      ''
+      + lib.optionalString stdenv.targetPlatform.isCygwin ''
+        targetBinDir="''${targetConfig+$targetConfig/}bin"
+        for i in "''${!outputBin}/$targetLibDir"/cyg*.dll; do
+          mkdir -p "''${!outputLib}/$targetBinDir"
+          mv "$i" "''${!outputLib}/$targetBinDir"/
+        done
+      ''
+      # if cross-compiling, link from $lib/lib to $lib/${targetConfig}.
+      # since native-compiles have $lib/lib as a directory (not a
+      # symlink), this ensures that in every case we can assume that
+      # $lib/lib contains the .so files
+      + lib.optionalString isCross ''
+        if [ -e "$lib/$targetConfig/lib" ]; then
+          ln -s "$lib/$targetConfig/lib" "$lib/lib"
+        fi
+      '';
   }
 ))
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
index 98da0be6322e..e2c735c0751f 100644
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -227,6 +227,9 @@ let
         ]
       else
         [ "--disable-multilib" ]
+        # SH targets need m4 and m4-nofpu variants (the kernel uses -m4-nofpu).
+        # An empty list disables -m4-nofpu entirely.
+        ++ lib.optional targetPlatform.isSh4 "--with-multilib-list=m4,m4-nofpu"
     )
     ++ lib.optional (!enableShared) "--disable-shared"
     ++ lib.singleton (lib.enableFeature enablePlugin "plugin")
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index ed6582c474eb..2b66c97aa3ae 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -319,8 +319,6 @@
         # https://gitlab.haskell.org/ghc/ghc/-/issues/26518 krank:ignore-line
         ./ghc-define-undefined-elf-st-visibility.patch
       ]
-
-      # Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810
       ++
         lib.optionals
           (
diff --git a/pkgs/development/compilers/go/1.26.nix b/pkgs/development/compilers/go/1.26.nix
index 57c3227d5f76..003798243198 100644
--- a/pkgs/development/compilers/go/1.26.nix
+++ b/pkgs/development/compilers/go/1.26.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.26.1";
+  version = "1.26.2";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-MXIpPQSyCdwRRGmOe6E/BHf2uoxf/QvmbCD9vJeF37s=";
+    hash = "sha256-LpHrtpR6lulDb7KzkmqIAu/mOm03Xf/sT4Kqnb1v1Ds=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/compilers/go/tests.nix b/pkgs/development/compilers/go/tests.nix
index 3eeaa8b53262..4f433a303f3a 100644
--- a/pkgs/development/compilers/go/tests.nix
+++ b/pkgs/development/compilers/go/tests.nix
@@ -9,11 +9,11 @@
   runCommand,
   bintools,
   # A package with CGO_ENABLED=0
-  athens,
+  uplosi,
 }:
 let
   skopeo' = skopeo.override { buildGoModule = buildGoModule; };
-  athens' = athens.override { buildGoModule = buildGoModule; };
+  uplosi' = uplosi.override { buildGoModule = buildGoModule; };
   expectedCgoEnabledType = "DYN";
   expectedCgoDisabledType = "EXE";
 in
@@ -24,7 +24,7 @@ in
     command = "go version";
     version = "go${go.version}";
   };
-  athens = testers.testVersion { package = athens'; };
+  uplosi = testers.testVersion { package = uplosi'; };
 }
 # bin type tests assume ELF file + linux-specific exe types
 // lib.optionalAttrs stdenv.hostPlatform.isLinux {
@@ -41,13 +41,13 @@ in
       exit 1
     fi
   '';
-  athens-bin-type = runCommand "athens-bin-type" { meta.broken = stdenv.hostPlatform.isStatic; } ''
-    bin="${lib.getExe athens'}"
+  uplosi-bin-type = runCommand "uplosi-bin-type" { meta.broken = stdenv.hostPlatform.isStatic; } ''
+    bin="${lib.getExe uplosi'}"
     ${lib.optionalString (stdenv.buildPlatform == stdenv.targetPlatform) ''
       # For CGO_ENABLED=0 the internal linker should be used, except
       # for cross where we rely on external linking by default
-      if ${lib.getExe' bintools "readelf"} -p .comment ${lib.getExe athens'} | grep -Fq "GCC: (GNU)"; then
-        echo "${lib.getExe athens'} has a GCC .comment, but it should have used the internal go linker"
+      if ${lib.getExe' bintools "readelf"} -p .comment ${lib.getExe uplosi'} | grep -Fq "GCC: (GNU)"; then
+        echo "${lib.getExe uplosi'} has a GCC .comment, but it should have used the internal go linker"
         exit 1
       fi
     ''}
diff --git a/pkgs/development/compilers/jetbrains-jdk/21.nix b/pkgs/development/compilers/jetbrains-jdk/21.nix
new file mode 100644
index 000000000000..821202d6da21
--- /dev/null
+++ b/pkgs/development/compilers/jetbrains-jdk/21.nix
@@ -0,0 +1,26 @@
+{
+  callPackage,
+  jetbrains,
+  jdk,
+  debugBuild ? false,
+  withJcef ? true,
+}:
+
+callPackage ./common.nix
+  {
+    inherit jdk debugBuild withJcef;
+  }
+  {
+    # To get the new tag:
+    # git clone https://github.com/jetbrains/jetbrainsruntime
+    # cd jetbrainsruntime
+    # git tag --points-at [revision]
+    # Look for the line that starts with jbr-
+    javaVersion = "21.0.10";
+    build = "1163.110";
+    # run `git log -1 --pretty=%ct` in jdk repo for new value on update
+    sourceDateEpoch = 1765114563;
+    srcHash = "sha256-Qmffu7p6frBoH2Zh+EiqvEoMNNBE79qfkgLSC3+XuI0=";
+    homePath = "${jetbrains.jdk-21}/lib/openjdk";
+    jcefPackage = jetbrains.jcef-21;
+  }
diff --git a/pkgs/development/compilers/jetbrains-jdk/common.nix b/pkgs/development/compilers/jetbrains-jdk/common.nix
new file mode 100644
index 000000000000..4a685776d46a
--- /dev/null
+++ b/pkgs/development/compilers/jetbrains-jdk/common.nix
@@ -0,0 +1,236 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  jdk,
+  git,
+  autoconf,
+  unzip,
+  rsync,
+  shaderc,
+  vulkan-headers,
+  libxdamage,
+  libxxf86vm,
+  libxrandr,
+  libxi,
+  libxcursor,
+  libxrender,
+  libx11,
+  libxext,
+  libxkbcommon,
+  libxcb,
+  nss,
+  nspr,
+  libdrm,
+  libgbm,
+  wayland,
+  udev,
+  fontconfig,
+  debugBuild ? false,
+  withJcef ? true,
+}:
+
+{
+  javaVersion,
+  build,
+  sourceDateEpoch,
+  srcHash,
+  homePath,
+  jcefPackage ? null,
+  extraBuildPhase ? "",
+  vendorVersionString ? null,
+  extraConfigureFlags ? [ ],
+  extraNativeBuildInputs ? [ ],
+  extraBuildInputs ? [ ],
+}:
+
+assert debugBuild -> withJcef;
+
+let
+  arch =
+    {
+      "aarch64-linux" = "aarch64";
+      "x86_64-linux" = "x64";
+    }
+    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  cpu = stdenv.hostPlatform.parsed.cpu.name;
+  version = "${javaVersion}-b${build}";
+  openjdkTag = "jbr-release-${javaVersion}b${build}";
+in
+jdk.overrideAttrs (oldAttrs: {
+  pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef";
+  inherit
+    javaVersion
+    build
+    version
+    openjdkTag
+    ;
+
+  src = fetchFromGitHub {
+    owner = "JetBrains";
+    repo = "JetBrainsRuntime";
+    rev = "jb${version}";
+    hash = srcHash;
+  };
+
+  env = (oldAttrs.env or { }) // {
+    BOOT_JDK = jdk.home;
+    # run `git log -1 --pretty=%ct` in jdk repo for new value on update
+    SOURCE_DATE_EPOCH = sourceDateEpoch;
+  };
+
+  patches = [ ];
+
+  dontConfigure = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    ${lib.optionalString withJcef "cp -r ${jcefPackage} jcef_linux_${arch}"}
+    ${extraBuildPhase}
+
+    sed \
+        -e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/" \
+        -e "s/SOURCE_DATE_EPOCH=.*//" \
+        -e "s/export SOURCE_DATE_EPOCH//" \
+        -i jb/project/tools/common/scripts/common.sh
+
+    declare -a realConfigureFlags
+
+    for configureFlag in "''${configureFlags[@]}"; do
+      case "$configureFlag" in
+        --host=*)
+          # intentionally omit flag
+          ;;
+        ${lib.optionalString (vendorVersionString != null) ''
+          --with-vendor-version-string=*)
+            # Replace the flag from the JDK to include that it is JBR and the package version, so it passes the installation tests
+            realConfigureFlags+=('--with-vendor-version-string="${vendorVersionString}"')
+            ;;
+        ''}
+        *)
+          realConfigureFlags+=("$configureFlag")
+          ;;
+      esac
+    done
+
+    ${lib.concatMapStringsSep "\n" (flag: ''realConfigureFlags+=("${flag}")'') extraConfigureFlags}
+
+    echo "computed configure flags: ''${realConfigureFlags[*]}"
+    substituteInPlace jb/project/tools/linux/scripts/mkimages_${arch}.sh --replace-fail "STATIC_CONF_ARGS" "STATIC_CONF_ARGS ''${realConfigureFlags[*]}"
+
+    sed \
+        -e "s/create_image_bundle \"jb/#/" \
+        -e "s/echo Creating /exit 0 #/" \
+        -i jb/project/tools/linux/scripts/mkimages_${arch}.sh
+
+    patchShebangs .
+    ./jb/project/tools/linux/scripts/mkimages_${arch}.sh ${build} ${
+      if debugBuild then "fd" else (if withJcef then "jcef" else "nomod")
+    }
+
+    runHook postBuild
+  '';
+
+  installPhase =
+    let
+      buildType = if debugBuild then "fastdebug" else "release";
+      debugSuffix = if debugBuild then "-fastdebug" else "";
+      jcefSuffix = if debugBuild || !withJcef then "" else "_jcef";
+      jbrsdkDir = "jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build}";
+    in
+    ''
+      runHook preInstall
+
+      mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir}
+      rm -rf build/linux-${cpu}-server-${buildType}/images/jdk
+      mv build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} build/linux-${cpu}-server-${buildType}/images/jdk
+    ''
+    + oldAttrs.installPhase
+    + "runHook postInstall";
+
+  postInstall = lib.optionalString withJcef ''
+    chmod +x $out/lib/openjdk/lib/chrome-sandbox
+  '';
+
+  dontStrip = debugBuild;
+
+  postFixup = ''
+    # Build the set of output library directories to rpath against
+    LIBDIRS="${
+      lib.makeLibraryPath [
+        libxdamage
+        libxxf86vm
+        libxrandr
+        libxi
+        libxcursor
+        libxrender
+        libx11
+        libxext
+        libxkbcommon
+        libxcb
+        nss
+        nspr
+        libdrm
+        libgbm
+        wayland
+        udev
+        fontconfig
+      ]
+    }"
+    for output in ${lib.concatStringsSep " " oldAttrs.outputs}; do
+      if [ "$output" = debug ]; then continue; fi
+      LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
+    done
+    # Add the local library paths to remove dependencies on the bootstrap
+    for output in ${lib.concatStringsSep " " oldAttrs.outputs}; do
+      if [ "$output" = debug ]; then continue; fi
+      OUTPUTDIR=$(eval echo \$$output)
+      BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
+      echo "$BINLIBS" | while read i; do
+        patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+      done
+    done
+  '';
+
+  nativeBuildInputs = [
+    git
+    autoconf
+    unzip
+    rsync
+    shaderc # glslc
+  ]
+  ++ extraNativeBuildInputs
+  ++ oldAttrs.nativeBuildInputs;
+
+  buildInputs = [
+    vulkan-headers
+  ]
+  ++ extraBuildInputs
+  ++ oldAttrs.buildInputs or [ ];
+
+  meta = {
+    description = "OpenJDK fork to better support Jetbrains's products";
+    longDescription = ''
+      JetBrains Runtime is a runtime environment for running IntelliJ Platform
+      based products on Windows, Mac OS X, and Linux. JetBrains Runtime is
+      based on OpenJDK project with some modifications. These modifications
+      include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI
+      support, ligatures, some fixes for native crashes not presented in
+      official build, and other small enhancements.
+      JetBrains Runtime is not a certified build of OpenJDK. Please, use at
+      your own risk.
+    '';
+    homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime";
+    inherit (jdk.meta) license platforms mainProgram;
+    maintainers = with lib.maintainers; [
+      aoli-al
+    ];
+
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+
+  passthru = oldAttrs.passthru // {
+    home = homePath;
+  };
+})
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 33f6231aafbd..58b655bdf220 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -1,210 +1,53 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
+  callPackage,
+  fetchurl,
   jetbrains,
   jdk,
-  git,
-  autoconf,
-  unzip,
-  rsync,
   debugBuild ? false,
   withJcef ? true,
-
-  libxdamage,
-  libxxf86vm,
-  libxrandr,
-  libxi,
-  libxcursor,
-  libxrender,
-  libx11,
-  libxext,
+  wayland-scanner,
+  wayland-protocols,
   libxkbcommon,
-  libxcb,
-  nss,
-  nspr,
-  libdrm,
-  libgbm,
-  wayland,
-  udev,
-  fontconfig,
-  shaderc,
-  vulkan-headers,
 }:
 
-assert debugBuild -> withJcef;
-
 let
-  arch =
-    {
-      "aarch64-linux" = "aarch64";
-      "x86_64-linux" = "x64";
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-  cpu = stdenv.hostPlatform.parsed.cpu.name;
-in
-jdk.overrideAttrs (oldAttrs: rec {
-  pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef";
-  javaVersion = "21.0.9";
-  build = "1163.86";
-  # To get the new tag:
-  # git clone https://github.com/jetbrains/jetbrainsruntime
-  # cd jetbrainsruntime
-  # git tag --points-at [revision]
-  # Look for the line that starts with jbr-
-  openjdkTag = "jbr-release-21.0.9b1163.86";
-  version = "${javaVersion}-b${build}";
-
-  src = fetchFromGitHub {
-    owner = "JetBrains";
-    repo = "JetBrainsRuntime";
-    rev = "jb${version}";
-    hash = "sha256-P2boCbGB66X8LB4sZHGFO8lqHbv6F4kqGVMGBd9yKu0=";
-  };
-
-  env = (oldAttrs.env or { }) // {
-    BOOT_JDK = jdk.home;
-    # run `git log -1 --pretty=%ct` in jdk repo for new value on update
-    SOURCE_DATE_EPOCH = 1765114563;
-  };
-
-  patches = [ ];
-
-  dontConfigure = true;
-
-  buildPhase = ''
-    runHook preBuild
-
-    ${lib.optionalString withJcef "cp -r ${jetbrains.jcef} jcef_linux_${arch}"}
-
-    sed \
-        -e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/" \
-        -e "s/SOURCE_DATE_EPOCH=.*//" \
-        -e "s/export SOURCE_DATE_EPOCH//" \
-        -i jb/project/tools/common/scripts/common.sh
-    declare -a realConfigureFlags
-    for configureFlag in "''${configureFlags[@]}"; do
-      case "$configureFlag" in
-        --host=*)
-          # intentionally omit flag
-          ;;
-        *)
-          realConfigureFlags+=("$configureFlag")
-          ;;
-      esac
-    done
-    echo "computed configure flags: ''${realConfigureFlags[*]}"
-    substituteInPlace jb/project/tools/linux/scripts/mkimages_${arch}.sh --replace-fail "STATIC_CONF_ARGS" "STATIC_CONF_ARGS ''${realConfigureFlags[*]}"
-    sed \
-        -e "s/create_image_bundle \"jb/#/" \
-        -e "s/echo Creating /exit 0 #/" \
-        -i jb/project/tools/linux/scripts/mkimages_${arch}.sh
-
-    patchShebangs .
-    ./jb/project/tools/linux/scripts/mkimages_${arch}.sh ${build} ${
-      if debugBuild then "fd" else (if withJcef then "jcef" else "nomod")
-    }
-
-    runHook postBuild
-  '';
-
-  installPhase =
+  gtk-protocols =
     let
-      buildType = if debugBuild then "fastdebug" else "release";
-      debugSuffix = if debugBuild then "-fastdebug" else "";
-      jcefSuffix = if debugBuild || !withJcef then "" else "_jcef";
-      jbrsdkDir = "jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build}";
+      rev = "refs/tags/4.22.1";
+      hash = "sha256-zCcXuiEYL2N4Q+WT96ouVDwdZVSohgU/QA2BkGlnZZ0=";
     in
-    ''
-      runHook preInstall
-
-      mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir}
-      rm -rf build/linux-${cpu}-server-${buildType}/images/jdk
-      mv build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} build/linux-${cpu}-server-${buildType}/images/jdk
-    ''
-    + oldAttrs.installPhase
-    + "runHook postInstall";
-
-  postInstall = lib.optionalString withJcef ''
-    chmod +x $out/lib/openjdk/lib/chrome-sandbox
-  '';
-
-  dontStrip = debugBuild;
-
-  postFixup = ''
-    # Build the set of output library directories to rpath against
-    LIBDIRS="${
-      lib.makeLibraryPath [
-        libxdamage
-        libxxf86vm
-        libxrandr
-        libxi
-        libxcursor
-        libxrender
-        libx11
-        libxext
-        libxkbcommon
-        libxcb
-        nss
-        nspr
-        libdrm
-        libgbm
-        wayland
-        udev
-        fontconfig
-      ]
-    }"
-    for output in ${lib.concatStringsSep " " oldAttrs.outputs}; do
-      if [ "$output" = debug ]; then continue; fi
-      LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
-    done
-    # Add the local library paths to remove dependencies on the bootstrap
-    for output in ${lib.concatStringsSep " " oldAttrs.outputs}; do
-      if [ "$output" = debug ]; then continue; fi
-      OUTPUTDIR=$(eval echo \$$output)
-      BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-      echo "$BINLIBS" | while read i; do
-        patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-      done
-    done
-  '';
-
-  nativeBuildInputs = [
-    git
-    autoconf
-    unzip
-    rsync
-    shaderc # glslc
-  ]
-  ++ oldAttrs.nativeBuildInputs;
-
-  buildInputs = [
-    vulkan-headers
-  ]
-  ++ oldAttrs.buildInputs or [ ];
-
-  meta = {
-    description = "OpenJDK fork to better support Jetbrains's products";
-    longDescription = ''
-      JetBrains Runtime is a runtime environment for running IntelliJ Platform
-      based products on Windows, Mac OS X, and Linux. JetBrains Runtime is
-      based on OpenJDK project with some modifications. These modifications
-      include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI
-      support, ligatures, some fixes for native crashes not presented in
-      official build, and other small enhancements.
-      JetBrains Runtime is not a certified build of OpenJDK. Please, use at
-      your own risk.
+    fetchurl {
+      # We only need the wayland protocols file
+      url = "https://raw.githubusercontent.com/GNOME/gtk/${rev}/gdk/wayland/protocol/gtk-shell.xml";
+      hash = hash;
+    };
+in
+callPackage ./common.nix
+  {
+    inherit jdk debugBuild withJcef;
+  }
+  {
+    # To get the new tag:
+    # git clone https://github.com/jetbrains/jetbrainsruntime
+    # cd jetbrainsruntime
+    # git tag --points-at [revision]
+    # Look for the line that starts with jbr-
+    javaVersion = "25.0.2";
+    build = "329.72";
+    # run `git log -1 --pretty=%ct` in jdk repo for new value on update
+    sourceDateEpoch = 1769205294;
+    srcHash = "sha256-K4Izbij+1YO4UERHS0mwGKZX/VtIaxyNPZD068Vf99Q=";
+    homePath = "${jetbrains.jdk}/lib/openjdk";
+    jcefPackage = jetbrains.jcef;
+    extraBuildPhase = ''
+      cp -r ${gtk-protocols.out} gtk-shell.xml
     '';
-    homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime";
-    inherit (jdk.meta) license platforms mainProgram;
-    maintainers = with lib.maintainers; [
-      aoli-al
+    vendorVersionString = "nix/JBR-25.0.2-b329.72${if withJcef then "-jcef" else ""}";
+    extraConfigureFlags = [
+      "--with-wayland-protocols=${wayland-protocols.out}/share/wayland-protocols"
     ];
-
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-
-  passthru = oldAttrs.passthru // {
-    home = "${jetbrains.jdk}/lib/openjdk";
-  };
-})
+    extraNativeBuildInputs = [
+      wayland-scanner
+      libxkbcommon
+    ];
+  }
diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
index 2bc5004691aa..7e9eb75e2e91 100644
--- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix
@@ -9,6 +9,7 @@
   jdk,
   git,
   rsync,
+  which,
   lib,
   ant,
   ninja,
@@ -91,11 +92,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "jcef-jetbrains";
-  rev = "6f9ab690b28a1262f82e6f869c310bdf1d0697ac";
+  rev = "a492f5c1bbe877d2f58d4b066d0a1c89ab579b84";
   # This is the commit number
-  # Currently from the branch: https://github.com/JetBrains/jcef/tree/251
+  # Currently from the branch: https://github.com/JetBrains/jcef/tree/261
   # Run `git rev-list --count HEAD`
-  version = "1086";
+  version = "1131";
 
   nativeBuildInputs = [
     cmake
@@ -103,12 +104,14 @@ stdenv.mkDerivation rec {
     jdk
     git
     rsync
+    which
     ant
     ninja
     strip-nondeterminism
     stripJavaArchivesHook
     autoPatchelfHook
   ];
+
   buildInputs = [
     boost
     libGL
@@ -123,7 +126,7 @@ stdenv.mkDerivation rec {
     owner = "jetbrains";
     repo = "jcef";
     inherit rev;
-    hash = "sha256-w5t1M66KW5cUbNTpAc4ksGd+414EJsXwbq1UP1COFsw=";
+    hash = "sha256-c1gJu6gogALx3viLi9saLvqOn+zS9jCpWizB2g1Xa/g=";
   };
 
   # Find the hash in tools/buildtools/linux64/clang-format.sha1
@@ -172,6 +175,13 @@ stdenv.mkDerivation rec {
 
   postBuild = ''
     export JCEF_ROOT_DIR=$(realpath ..)
+
+    # Apply https://github.com/JetBrains/jcef/pull/42
+    substituteInPlace ../build.xml \
+      --replace-fail \
+        '<matches pattern="17*.*" string="''${java.version}"/>' \
+        '<javaversion atLeast="17"/>'
+
     ../tools/compile.sh ${platform} Release
   '';
 
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index c087b25153f9..f07dec30a6b9 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -23,12 +23,12 @@ in
 {
   julia_110-bin = wrapJulia (
     callPackage (import ./generic-bin.nix {
-      version = "1.10.10";
+      version = "1.10.11";
       sha256 = {
-        x86_64-linux = "6a78a03a71c7ab792e8673dc5cedb918e037f081ceb58b50971dfb7c64c5bf81";
-        aarch64-linux = "a4b157ed68da10471ea86acc05a0ab61c1a6931ee592a9b236be227d72da50ff";
-        x86_64-darwin = "942b0d4accc9704861c7781558829b1d521df21226ad97bd01e1e43b1518d3e6";
-        aarch64-darwin = "52d3f82c50d9402e42298b52edc3d36e0f73e59f81fc8609d22fa094fbad18be";
+        x86_64-linux = "1grpvdzkh4b6mfdn1khbs1nz1b7q61rkzfip3q2x4330fjqwcjgv";
+        aarch64-linux = "1cn62bmrgz344zsml80rqpmryp8hk6bdni3zhh43lpqf8a0aj11h";
+        x86_64-darwin = "0jzk0kl1jvnav8ccarpwzfvyyzibfhrhfj72s3q17kzxwhpgbimx";
+        aarch64-darwin = "0nzh0zwjlagn4aglimyajmqv5m6qwdqz7lyjaszfxzyf1p0hcmxx";
       };
     }) { }
   );
@@ -57,8 +57,8 @@ in
   julia_110 = wrapJulia (
     callPackage
       (import ./generic.nix {
-        version = "1.10.10";
-        hash = "sha256-/NTIGLlcNu4sI1rICa+PS/Jn+YnWi37zFBcbfMnv3Ys=";
+        version = "1.10.11";
+        hash = "sha256-XItQngSzszyIGzSvqdXBV/yLQGDxf5x8SnrQ/DtzUtU=";
         patches = [
           # Revert https://github.com/JuliaLang/julia/pull/55354
           # [build] Some improvements to the LLVM build system
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index f3e8510c0d8b..84802712f5f4 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kotlin";
-  version = "2.3.20";
+  version = "2.3.21";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
-    sha256 = "sha256-IiulFs3EBSzgvp0uxq3zxcZPxTFW192R0fUxeAlDG5g=";
+    sha256 = "sha256-qM/B1izU0N5NBPQldeQBNb1iBYjBfVaKIOucfCWa8U8=";
   };
 
   propagatedBuildInputs = [ jre ];
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 2b05d88ab079..650a4f3b7251 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -28,9 +28,9 @@ let
     "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
     "22.1.2".officialRelease.sha256 = "sha256-z6YcxgDd3F3JwfU5Y/wMw5MK+ZPISI3KLwHwUaraTuw=";
     "23.0.0-git".gitRelease = {
-      rev = "26697f4d07eb921aebabdaa7d064c5165c70717e";
-      rev-version = "23.0.0-unstable-2026-04-05";
-      sha256 = "sha256-0TDdZRERXJzSGnKK74+L4taPs0EEKH1hsoRmrGy00Ks=";
+      rev = "1b2ccf9c6c79d6e57ba6f0a4cf8a3bd1075edebb";
+      rev-version = "23.0.0-unstable-2026-04-19";
+      sha256 = "sha256-GLGH/FIwyEf48tRcEAnbs7SZceOexYbZH8hHA34hPIE=";
     };
   }
   // llvmVersions;
diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix
index e65b74b6cc5b..fd9299482bb3 100644
--- a/pkgs/development/compilers/opensmalltalk-vm/default.nix
+++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix
@@ -60,7 +60,7 @@ let
           --replace "/bin/rm" "rm"
         substituteInPlace ./platforms/unix/config/configure \
           --replace "/usr/bin/file" "file" \
-          --replace "/usr/bin/pkg-config" "pkg-config" \
+          --replace "/usr/bin/pkg-config" "pkg-config"
       '';
 
       preConfigure = ''
diff --git a/pkgs/development/compilers/rust/1_94.nix b/pkgs/development/compilers/rust/1_94.nix
index 995e1437ee89..42e23b200c64 100644
--- a/pkgs/development/compilers/rust/1_94.nix
+++ b/pkgs/development/compilers/rust/1_94.nix
@@ -50,8 +50,8 @@ let
 in
 import ./default.nix
   {
-    rustcVersion = "1.94.0";
-    rustcSha256 = "sha256-uD+SHNPzIf9hT5wGqLhw2JKZ/AKIi0ilVJaDo2gjR0w=";
+    rustcVersion = "1.94.1";
+    rustcSha256 = "sha256-TBQqYl8S4833FsaK4Z9PYNmK0UgmJ7CFebFYOOla1RQ=";
     rustcPatches = [ ./ignore-missing-docs.patch ];
 
     llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
@@ -66,27 +66,27 @@ import ./default.nix
     # Note: the version MUST be the same version that we are building. Upstream
     # ensures that each released compiler can compile itself:
     # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363
-    bootstrapVersion = "1.94.0";
+    bootstrapVersion = "1.94.1";
 
     # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
     bootstrapHashes = {
-      i686-unknown-linux-gnu = "4c309c178f96770968ce79226af935996b1715389abf4bc08bdd4f596660201d";
-      x86_64-unknown-linux-gnu = "3bb1925a0a5ad2c17be731ee6e977e4a68490ab2182086db897bd28be21e965f";
-      x86_64-unknown-linux-musl = "57a78e193b11573da839c7177b8d29552aeb2c4751973179a384d472210f9c89";
-      arm-unknown-linux-gnueabihf = "2abf1ca017b0762f0750bcebff1c4814805a28c66935c09139d2adf3565105c6";
-      armv7-unknown-linux-gnueabihf = "338514f8c7adccb67c851ce220baceef0cec53b26291ae805094dbdbb5ceaad1";
-      aarch64-unknown-linux-gnu = "a0dc5a65ab337421347533e5be11d3fab11f119683a0dbd257ef3fe968bd2d72";
-      aarch64-unknown-linux-musl = "8ff50ffcf1da9aaea29767864abcdc4cce2eb840d3200e9a3ff585ad17f002b8";
-      x86_64-apple-darwin = "97724032da92646194a802a7991f1166c4dc9f0a63f3bb01a53860e98f31d08c";
-      aarch64-apple-darwin = "94903e93a4334d42bb6d92377a39903349c07f3709c792864bcdf7959f3c8c7d";
-      powerpc64-unknown-linux-gnu = "34dcc95d487f5a7da33ec05abf394515f80559d030e45b1c1744e2005690d720";
-      powerpc64le-unknown-linux-gnu = "fc6fa22878c5d12cb60e0ebaffdad70161965719bcc5d0b6793b132a0de8f759";
-      powerpc64le-unknown-linux-musl = "52472bac4cdecb95e7a091ad9bb328747a09b8cfe7082a90511d5250a330cdbc";
-      riscv64gc-unknown-linux-gnu = "ee71279fee2755d7f613597b24c8b168cc4e404d17e4e966c6b92aaf4d3c21ef";
-      s390x-unknown-linux-gnu = "a27d205e95d9e1ec3f14d94c2cc28b1b6d3b64dda50c1f25a787a30989782a18";
-      loongarch64-unknown-linux-gnu = "12361da66b693b848f6908d2321d03bb53ee9037bcc3d406876e6fc7b945e23d";
-      loongarch64-unknown-linux-musl = "42278996624153a2b872905be08796515e49079dfcdee5f28d4c389f18c2f0e5";
-      x86_64-unknown-freebsd = "6fba7bf41553e67b6d0f2014f7e128818b92f215b1e96a100ac5eaed06a41a04";
+      i686-unknown-linux-gnu = "b458db6cf8366fa9f830bf05b15e3866fbb2b7e0a1921b91fd52aff9accfb405";
+      x86_64-unknown-linux-gnu = "ea7866c5cab0d8c99e7416bcc5f9ecf0e122d396b85c7e7dee5669f10ee80194";
+      x86_64-unknown-linux-musl = "5568d1b7992dcb0cabc9936476a0569ff314a3f1322886b4f414eb2d07b0ffd6";
+      arm-unknown-linux-gnueabihf = "0b5d43c00ef1a72352f7b08937018ab52f624047f1403e0d2c4d7c67456eff16";
+      armv7-unknown-linux-gnueabihf = "31b7deb5f38a504e21865a8bd98ff546884e66910ee11ed55e51a976ac7a645a";
+      aarch64-unknown-linux-gnu = "99dba6decb780158b2b94f0054ec15c8cd4a04a497c84349fb86fb7a70722c78";
+      aarch64-unknown-linux-musl = "caa1d50676518532cc9b4c4c491f219edbdcb9ebf9e6624432b5b43b87d8cc0a";
+      x86_64-apple-darwin = "6d9c5a4bf9962987d616417e2669a50b52cc7ecbfa682d56e9ce8244a57d7b60";
+      aarch64-apple-darwin = "630349bd157632ff65aafd1b5753e6a09153278cdac8196e8678b40b30cf1ecb";
+      powerpc64-unknown-linux-gnu = "ef5ece383b3b0c2e3b020b95420020b247d73e6885cc9d8b328456b84cfcb6e6";
+      powerpc64le-unknown-linux-gnu = "e4375d9081ce229786849ac4cd1be56e3a4ff117371d557ebcdb832c5ec20a4e";
+      powerpc64le-unknown-linux-musl = "80fc13d8a78427a7065208a8aac17f542a173efd73c217be11b75de83c2f661f";
+      riscv64gc-unknown-linux-gnu = "58038bca429819cc4cd52b9c364983c2e8a4c1dade8beaa0e4edd767e952ebf8";
+      s390x-unknown-linux-gnu = "9b1043df30e406bf87cd73be5e5472f0353313ea081bd2ab1feb3b3d45f03e76";
+      loongarch64-unknown-linux-gnu = "462881b156c5bd838943c6074649ad296dc87162753010fd328c2b698655b6ec";
+      loongarch64-unknown-linux-musl = "5100cd191031a9549b2689b774306e5f37902dcc259a99b9e2de502720c52c0c";
+      x86_64-unknown-freebsd = "68b687b408a4b443faeb2c81e2cb1c51f8f738da30ce04b0584db81068d77229";
     };
 
     selectRustPackage = pkgs: pkgs.rust_1_94;
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 5a0a447a826f..ddb5dc2d07e2 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -30,8 +30,8 @@ let
     "2.4.10".sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg=";
     # By unofficial and very loose convention we keep the latest version of
     # SBCL, and the previous one in case someone quickly needs to roll back.
-    "2.6.0".sha256 = "sha256-CkvVsByI5rRcLwWWBdJyirk3emUpsupiKnq7W6LWkcY=";
     "2.6.1".sha256 = "sha256-XyzVu30+bZFJpZwFrNhCmzvhhJIRdp5aN0UdAB4ZbX8=";
+    "2.6.3".sha256 = "sha256-50MvtkKVLdJaX8DFbSGPPQqlls5C0z76gwkbyn1pmIo=";
   };
   # Collection of pre-built SBCL binaries for platforms that need them for
   # bootstrapping. Ideally these are to be avoided.  If ECL (or any other
@@ -77,6 +77,8 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sbcl";
   inherit version;
+  __structuredAttrs = true;
+  strictDeps = true;
 
   src = fetchurl {
     # Changing the version shouldn’t change the source for the
@@ -182,15 +184,20 @@ stdenv.mkDerivation (finalAttrs: {
     # "https://sourceforge.net/p/sbcl/mailman/sbcl-devel/thread/2cf20df7-01d0-44f2-8551-0df01fe55f1a%400brg.net/"),
     # but for Nix envvars are sufficiently useful that it’s worth maintaining
     # this functionality downstream.
-    if lib.versionOlder "2.5.2" finalAttrs.version then
+    if lib.versionOlder "2.6.2" finalAttrs.version then
       [
-        ./dynamic-space-size-envvar-2.5.3-feature.patch
-        ./dynamic-space-size-envvar-2.5.3-tests.patch
+        ./patches/dynamic-space-size-envvar-2.6.3-feature.patch
+        ./patches/dynamic-space-size-envvar-2.6.3-tests.patch
+      ]
+    else if lib.versionOlder "2.5.2" finalAttrs.version then
+      [
+        ./patches/dynamic-space-size-envvar-2.5.3-feature.patch
+        ./patches/dynamic-space-size-envvar-2.5.3-tests.patch
       ]
     else
       [
-        ./dynamic-space-size-envvar-2.5.2-feature.patch
-        ./dynamic-space-size-envvar-2.5.2-tests.patch
+        ./patches/dynamic-space-size-envvar-2.5.2-feature.patch
+        ./patches/dynamic-space-size-envvar-2.5.2-tests.patch
       ];
 
   sbclPatchPhase =
diff --git a/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.2-feature.patch b/pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.5.2-feature.patch
similarity index 100%
rename from pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.2-feature.patch
rename to pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.5.2-feature.patch
diff --git a/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.2-tests.patch b/pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.5.2-tests.patch
similarity index 100%
rename from pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.2-tests.patch
rename to pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.5.2-tests.patch
diff --git a/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.3-feature.patch b/pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.5.3-feature.patch
similarity index 100%
rename from pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.3-feature.patch
rename to pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.5.3-feature.patch
diff --git a/pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.3-tests.patch b/pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.5.3-tests.patch
similarity index 100%
rename from pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.3-tests.patch
rename to pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.5.3-tests.patch
diff --git a/pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.6.3-feature.patch b/pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.6.3-feature.patch
new file mode 100644
index 000000000000..e39c3797a8c9
--- /dev/null
+++ b/pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.6.3-feature.patch
@@ -0,0 +1,64 @@
+From 6bb8cde826589777e50ddb78e8e1fe7652194a4f Mon Sep 17 00:00:00 2001
+From: Hraban Luyat <hraban@0brg.net>
+Date: Sat, 13 Apr 2024 14:04:57 -0400
+Subject: [PATCH 1/2] feat: SBCL_DYNAMIC_SPACE_SIZE envvar
+
+---
+ src/runtime/runtime.c | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
+index 295ee2b3c..5c4560f50 100644
+--- a/src/runtime/runtime.c
++++ b/src/runtime/runtime.c
+@@ -416,6 +416,29 @@ static int is_memsize_arg(char *argv[], int argi, int argc, int *merge_core_page
+     return 0;
+ }
+ 
++/**
++ * Read memory options from the environment, if present.
++ *
++ * Memory settings are read in the following priority:
++ *
++ * 1. command line arguments
++ * 2. environment variable
++ * 3. embedded options in core
++ * 4. default
++ */
++static void
++read_memsize_from_env(void) {
++  const char *val = getenv("SBCL_DYNAMIC_SPACE_SIZE");
++  // The distinction is blurry between setting an envvar to the empty string and
++  // unsetting it entirely. Depending on the calling environment it can even be
++  // tricky to properly unset an envvar in the first place. An empty envvar is
++  // practically always intended to just mean “unset”, so let’s interpret it
++  // that way.
++  if (val != NULL && (strcmp(val, "") != 0)) {
++    dynamic_space_size = parse_size_arg(val, "SBCL_DYNAMIC_SPACE_SIZE");
++  }
++}
++
+ static struct cmdline_options
+ parse_argv(struct memsize_options memsize_options,
+            int argc, char *argv[], char *envp[], char *core)
+@@ -457,6 +480,9 @@ parse_argv(struct memsize_options memsize_options,
+         thread_control_stack_size = memsize_options.thread_control_stack_size;
+         dynamic_values_bytes = memsize_options.thread_tls_bytes;
+         if (memsize_options.present_in_core == 2) {
++            /* Only accept environment variable memory options where you would
++             * accept those options as command-line arguments. */
++            read_memsize_from_env();
+             int stop_parsing = 0; // have we seen '--'
+             int output_index = 1;
+ #ifndef LISP_FEATURE_WIN32
+@@ -490,6 +516,7 @@ parse_argv(struct memsize_options memsize_options,
+ #endif
+         }
+     } else {
++        read_memsize_from_env();
+         bool end_runtime_options = 0;
+         /* Parse our any of the command-line options that we handle from C,
+          * stopping at the first one that we don't, and leave the rest */
+-- 
+2.51.2
+
diff --git a/pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.6.3-tests.patch b/pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.6.3-tests.patch
new file mode 100644
index 000000000000..736299920ddd
--- /dev/null
+++ b/pkgs/development/compilers/sbcl/patches/dynamic-space-size-envvar-2.6.3-tests.patch
@@ -0,0 +1,132 @@
+From 89075e2964ca830f0c49da36fcc72b5fcb603449 Mon Sep 17 00:00:00 2001
+From: Hraban Luyat <hraban@0brg.net>
+Date: Sat, 13 Apr 2024 15:39:58 -0400
+Subject: [PATCH 2/2] test: dynamic space size envvar and precedence
+
+---
+ tests/memory-args.test.sh | 22 +++++++++++++++++
+ tests/save7.test.sh       | 51 +++++++++++++++++++++++++++++++++------
+ 2 files changed, 66 insertions(+), 7 deletions(-)
+ create mode 100755 tests/memory-args.test.sh
+
+diff --git a/tests/memory-args.test.sh b/tests/memory-args.test.sh
+new file mode 100755
+index 000000000..72ef0cc79
+--- /dev/null
++++ b/tests/memory-args.test.sh
+@@ -0,0 +1,22 @@
++#!/bin/sh
++
++. ./subr.sh
++
++use_test_subdirectory
++
++set -e
++
++# Allow slight shrinkage if heap relocation has to adjust for alignment
++SBCL_DYNAMIC_SPACE_SIZE=234mb run_sbcl_with_args --script <<EOF
++(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536))
++EOF
++
++SBCL_DYNAMIC_SPACE_SIZE=555mb run_sbcl_with_args --dynamic-space-size 234mb --script <<EOF
++(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536))
++EOF
++
++run_sbcl_with_args --dynamic-space-size 234mb --script <<EOF
++(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536))
++EOF
++
++exit $EXIT_TEST_WIN
+diff --git a/tests/save7.test.sh b/tests/save7.test.sh
+index faa647e1a..1f2821b5d 100644
+--- a/tests/save7.test.sh
++++ b/tests/save7.test.sh
+@@ -25,6 +25,9 @@ echo "::: Success"
+ 
+ run_sbcl_with_args --noinform --control-stack-size 384KB --dynamic-space-size 260MB \
+     --disable-debugger --no-userinit --no-sysinit --noprint <<EOF
++  ; allow slight shrinkage if heap relocation has to adjust for alignment
++  (defun dynamic-space-size-good-p (expected-mb)
++    (<= 0 (- (* expected-mb 1024 1024) (dynamic-space-size)) 65536))
+   (save-lisp-and-die "$tmpcore" :executable t :save-runtime-options :accept-runtime-options)
+ EOF
+ chmod u+x "$tmpcore"
+@@ -57,6 +60,29 @@ if [ $? -ne 0 ]; then
+ fi
+ echo "::: Success"
+ 
++echo "::: Running :DYNAMIC-SPACE-SIZE-ENV-ACCEPT"
++SBCL_DYNAMIC_SPACE_SIZE=432MB ./"$tmpcore" --no-userinit --no-sysinit --noprint <<EOF
++  (when (dynamic-space-size-good-p 432)
++    (exit :code 42))
++EOF
++if [ $? -ne 42 ]; then
++  exit 1
++fi
++echo "::: Success"
++
++echo "::: Running :DYNAMIC-SPACE-SIZE-PRECEDENCE"
++SBCL_DYNAMIC_SPACE_SIZE=432MB ./"$tmpcore" --dynamic-space-size 333MB \
++  --no-userinit --no-sysinit --noprint <<EOF
++  (when (dynamic-space-size-good-p 333))
++    (exit :code 42))
++EOF
++status=$?
++if [ $status -ne 42 ]; then
++    echo "saved core should have prioritized memory specification from arg"
++    exit 1
++fi
++echo "::: Success"
++
+ echo "::: Running :DYNAMIC-SPACE-SIZE-ARG"
+ run_sbcl_with_core "$tmpcore" --noinform --control-stack-size 640KB \
+     --tls-limit 5000 \
+@@ -66,11 +92,8 @@ run_sbcl_with_core "$tmpcore" --noinform --control-stack-size 640KB \
+        sb-vm:n-word-bytes))
+   (assert (eql (extern-alien "thread_control_stack_size" unsigned) (* 640 1024)))
+   (assert (eql (extern-alien "dynamic_values_bytes" (unsigned 32))
+-               (* 5000 tls-element-size)))
+-  ; allow slight shrinkage if heap relocation has to adjust for alignment
+-  (defun dynamic-space-size-good-p ()
+-    (<= 0 (- (* 260 1048576) (dynamic-space-size)) 65536))
+-  (assert (dynamic-space-size-good-p))
++               (* 5000 tls-element-size)))
++  (assert (dynamic-space-size-good-p 260))
+   (save-lisp-and-die "${tmpcore}2" :executable t :save-runtime-options t)
+ EOF
+ chmod u+x "${tmpcore}2"
+@@ -82,15 +105,29 @@ echo "::: INFO: prepared test core"
+   (when (and (eql (extern-alien "thread_control_stack_size" unsigned) (* 640 1024))
+              (eql (extern-alien "dynamic_values_bytes" (unsigned 32))
+                   (* 5000 tls-element-size))
+-             (dynamic-space-size-good-p))
++             (dynamic-space-size-good-p 260))
+     (exit :code 42))
+ EOF
+ status=$?
+-rm "$tmpcore" "${tmpcore}2"
+ if [ $status -ne 42 ]; then
+     echo "re-saved executable used wrong memory size options"
+     exit 1
+ fi
+ echo "::: Success"
+ 
++echo "::: Running :DYNAMIC-SPACE-SIZE-ENV-IGNORE"
++SBCL_DYNAMIC_SPACE_SIZE=432MB ./"${tmpcore}2" --no-userinit --no-sysinit --noprint <<EOF
++  (when (dynamic-space-size-good-p 260)
++    (exit :code 42))
++EOF
++status=$?
++if [ $status -ne 42 ]; then
++    echo "re-saved executable should have ignored memory specification from env"
++    exit 1
++fi
++echo "::: Success"
++rm "$tmpcore" "${tmpcore}2"
++
++
++
+ exit $EXIT_TEST_WIN
+-- 
+2.51.2
+
diff --git a/pkgs/development/compilers/swift/swiftpm2nix/default.nix b/pkgs/development/compilers/swift/swiftpm2nix/default.nix
index f0765cb79a0c..208067014730 100644
--- a/pkgs/development/compilers/swift/swiftpm2nix/default.nix
+++ b/pkgs/development/compilers/swift/swiftpm2nix/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
           jq
           nurl
         ]
-      } \
+      }
   '';
 
   preferLocalBuild = true;
diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix
index 45abea1fc783..dd86c89ecd5e 100644
--- a/pkgs/development/compilers/zulu/17.nix
+++ b/pkgs/development/compilers/zulu/17.nix
@@ -10,43 +10,43 @@ callPackage ./common.nix (
     # Note that the latest build may differ by platform
     dists = {
       x86_64-linux = {
-        zuluVersion = "17.52.17";
-        jdkVersion = "17.0.12";
+        zuluVersion = "17.64.17";
+        jdkVersion = "17.0.18";
         hash =
           if enableJavaFX then
-            "sha256-qKpkvk7/IEnlOJoy7An0AVGUXWkWeuuiQzqKKE/+Ec4="
+            "sha256-jQ2ByIKtivoc9nJ/LPMZCktyjceqXY+B6a36sXmwUbE="
           else
-            "sha256-JCRcjQzkkV2G5wsoi13psbTHjxCtuw5rqT4pEAOarRk=";
+            "sha256-gZ4/CepiiQGiGyEE7Y9SVuF66RpBRbJysushMfgyrx0=";
       };
 
       aarch64-linux = {
-        zuluVersion = "17.52.17";
-        jdkVersion = "17.0.12";
+        zuluVersion = "17.64.17";
+        jdkVersion = "17.0.18";
         hash =
           if enableJavaFX then
-            "sha256-mpTM/43oyDsOnoZM8AW1Z7EFTznnPAnYoC+T6csc8Fw="
+            "sha256-ciyywX9R72RRt6HPfdmmsgFo/0ebr2xzNhnroAEDT7E="
           else
-            "sha256-uIz2D5WjqySy5lobuvWp3kFTGsBKhXzT56QgCGyXwSY=";
+            "sha256-21fcnh+CIsL47604yMo2CxAR2Ln7m+oJVths1157Lb0=";
       };
 
       x86_64-darwin = {
-        zuluVersion = "17.52.17";
-        jdkVersion = "17.0.12";
+        zuluVersion = "17.64.17";
+        jdkVersion = "17.0.18";
         hash =
           if enableJavaFX then
-            "sha256-jb1oPmRzlYUMONovdsHowlC44X3/PFZ8KilxSsR924U="
+            "sha256-td551xWmeHcD26J0gxboKS6Y3f5iLRhcUy97pfxhHxk="
           else
-            "sha256-8VlGFUhCn3NE2A42xi69KzZqu0RoGOV1ZYj8oaqCnTc=";
+            "sha256-mHVhWicg6xAn8BaT4uCN93ChT8gYSYAfX7h7kRgdqyI=";
       };
 
       aarch64-darwin = {
-        zuluVersion = "17.52.17";
-        jdkVersion = "17.0.12";
+        zuluVersion = "17.64.17";
+        jdkVersion = "17.0.18";
         hash =
           if enableJavaFX then
-            "sha256-rEILTKTpX8DEoOGhlrhbxpcCyF2+QrjW92h0ox9ezp0="
+            "sha256-TnN+tPJ8HJSlZ0EUDq5SHo40EviO0iMX0P9eYHyRVP4="
           else
-            "sha256-RZ3hNQQFE+spTT9lFHLjmkolSkpHDg2Hvro6xi7uNww=";
+            "sha256-EiRGuK028dyAZ3Jy29rXH9XKjXbfd0wB54Oce/TSZ9Y=";
       };
     };
   }
diff --git a/pkgs/development/coq-modules/Ordinal/default.nix b/pkgs/development/coq-modules/Ordinal/default.nix
index 381f9fdab4e4..958643c7e10b 100644
--- a/pkgs/development/coq-modules/Ordinal/default.nix
+++ b/pkgs/development/coq-modules/Ordinal/default.nix
@@ -2,6 +2,7 @@
   lib,
   mkCoqDerivation,
   coq,
+  stdlib,
   version ? null,
 }:
 mkCoqDerivation {
@@ -12,11 +13,13 @@ mkCoqDerivation {
     with lib.versions;
     lib.switch coq.version [
       {
-        case = range "8.12" "8.20";
-        out = "0.5.4";
+        case = range "8.12" "9.2";
+        out = "0.5.6";
       }
     ] null;
   release = {
+    "0.5.6".sha256 = "sha256-ox9GaUsh/tWJGEPawPnNqXULI0kYglKmNmiTL8dF3uU=";
+    "0.5.5".sha256 = "sha256-Z7+alcN63hxJOtBAXPg9ExNdwS2SiB63ZjDEnPhGi6g=";
     "0.5.4".sha256 = "sha256-PaEC71FzJzHVGYpf3J1jvb/JsJzzMio0L5d5dPwiXuc=";
     "0.5.3".sha256 = "sha256-Myxwy749ZCBpqia6bf91cMTyJn0nRzXskD7Ue8kc37c=";
     "0.5.2".sha256 = "sha256-jf16EyLAnKm+42K+gTTHVFJqeOVQfIY2ozbxIs5x5DE=";
@@ -24,6 +27,7 @@ mkCoqDerivation {
     "0.5.0".sha256 = "sha256-Jq0LnR7TgRVcPqh8Ha6tIIK3KfRUgmzA9EhxeySgPnM=";
   };
   releaseRev = v: "v${v}";
+  propagatedBuildInputs = [ stdlib ];
   installPhase = ''
     make -f Makefile.coq COQMF_COQLIB=$out/lib/coq/${coq.coq-version}/ install
   '';
diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix
index d5c7bd558e85..8bfca13c6837 100644
--- a/pkgs/development/coq-modules/compcert/default.nix
+++ b/pkgs/development/coq-modules/compcert/default.nix
@@ -98,8 +98,8 @@ let
       -toolprefix ${tools}/bin/ \
       -use-external-Flocq \
       -use-external-MenhirLib \
-      ${target} \
-    ''; # don't remove the \ above, the command gets appended in override below
+      ${target}
+    '';
 
     installTargets = "documentation install";
     installFlags = [ ]; # trust ./configure
@@ -342,6 +342,10 @@ in
 patched_compcert.overrideAttrs (
   o:
   lib.optionalAttrs (coq.version != null && coq.version == "dev") {
-    configurePhase = "${o.configurePhase} -ignore-ocaml-version -ignore-coq-version";
+    configurePhase = ''
+      ${o.configurePhase} \
+        -ignore-ocaml-version \
+        -ignore-coq-version
+    '';
   }
 )
diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
index f42b58f05578..fa9a3fffd6cd 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
@@ -265,7 +265,7 @@
     };
 
     # 12.9 to 13.0 adds support for GCC 15 and Clang 20
-    # https://docs.nvidia.com/cuda/archive/13.0.2/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    # https://docs.nvidia.com/cuda/archive/13.0.3/cuda-installation-guide-linux/index.html#host-compiler-support-policy
     "13.0" = {
       clang = {
         maxMajorVersion = "20";
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.2.json b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.3.json
similarity index 89%
rename from pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.2.json
rename to pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.3.json
index d4caeeddd7e4..0e047612d14f 100644
--- a/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.2.json
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.3.json
@@ -1,6 +1,6 @@
 {
-    "release_date": "2025-10-09",
-    "release_label": "13.0.2",
+    "release_date": "2026-04-13",
+    "release_label": "13.0.3",
     "release_product": "cuda",
     "collectx_bringup": {
         "name": "UFM telemetry CollectX Bringup",
@@ -492,72 +492,72 @@
         "name": "NVIDIA Driver Assistant",
         "license": "MIT",
         "license_path": "driver_assistant/LICENSE.txt",
-        "version": "0.22.95.05",
+        "version": "0.46.126.20",
         "linux-all": {
-            "relative_path": "driver_assistant/source/driver_assistant-0.22.95.05-archive.tar.xz",
-            "sha256": "1f4d19c468988dc0f23ca7c1844d6434dfc9a6f0c4eaca43a7a63ab9a51c8552",
-            "md5": "bce1617e3337e8bbab4a51937e0ff544",
-            "size": "38944"
+            "relative_path": "driver_assistant/source/driver_assistant-0.46.126.20-archive.tar.xz",
+            "sha256": "bc4e771eecbb278c1f45de7f1fa02cf5c074c7bb32bdd3daf8fc6e193630e910",
+            "md5": "be792c22f78a8456bda52319daaa5c6b",
+            "size": "39644"
         }
     },
     "fabricmanager": {
         "name": "NVIDIA Fabric Manager",
         "license": "NVIDIA Driver",
         "license_path": "fabricmanager/LICENSE.txt",
-        "version": "580.95.05",
+        "version": "580.126.20",
         "linux-x86_64": {
-            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-580.95.05-archive.tar.xz",
-            "sha256": "f0220bfb67d04b4107acf00cc95abe5a9268fd8f8b5bae26971f4df232e4369c",
-            "md5": "a6568aa288cb4784b85ba6826463f918",
-            "size": "8249864"
+            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-580.126.20-archive.tar.xz",
+            "sha256": "cc561be3fa0bb7894436a9b128867465be639e8888c55e346d9440b8e140d1f6",
+            "md5": "977fa86eab794129d285f3d17baf788f",
+            "size": "8403428"
         },
         "linux-sbsa": {
-            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-580.95.05-archive.tar.xz",
-            "sha256": "ea91191e91b306da1ee2932da399fab8fe46395ec6820f638432b0176fc7a28e",
-            "md5": "3acd0c87be46dfcc6a45704aa34f0f03",
-            "size": "7501248"
+            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-580.126.20-archive.tar.xz",
+            "sha256": "1c85140a8aadbab4af25a195c2b55d59d3b15269271562bf0e72ce770cdc28ba",
+            "md5": "cbd0ebcdef304837051d76dfddbdf89b",
+            "size": "7635236"
         }
     },
     "imex": {
         "name": "Nvidia-Imex",
         "license": "NVIDIA Proprietary",
         "license_path": "imex/LICENSE.txt",
-        "version": "580.95.05",
+        "version": "580.126.20",
         "linux-x86_64": {
-            "relative_path": "imex/linux-x86_64/nvidia-imex-linux-x86_64-580.95.05-archive.tar.xz",
-            "sha256": "8f8c2fe1571ffbc9d7810289b8fb323340083a896d51daffeebee94d5a60b37e",
-            "md5": "0557449a6dadc51171bc54323a1b64c9",
-            "size": "7772976"
+            "relative_path": "imex/linux-x86_64/nvidia-imex-linux-x86_64-580.126.20-archive.tar.xz",
+            "sha256": "065a2283e4bbcd4a6711742b4b39761019e6edb15db93d2a32c36c4d60721a67",
+            "md5": "487715978bfec33e90d15ea97e208e07",
+            "size": "7784304"
         },
         "linux-sbsa": {
-            "relative_path": "imex/linux-sbsa/nvidia-imex-linux-sbsa-580.95.05-archive.tar.xz",
-            "sha256": "3d0179eeed5899b32bb893ec3466c9e3ae347bf7947e35313224480eb966ed92",
-            "md5": "c7e9affa44fbb1d94d7888808b706eed",
-            "size": "7212868"
+            "relative_path": "imex/linux-sbsa/nvidia-imex-linux-sbsa-580.126.20-archive.tar.xz",
+            "sha256": "c428dce2aa77f19ab9b776b0d8d4a121fd0a0bb08e9f1271a3c44e29a667d16b",
+            "md5": "1075f059ec75864454fb84d9c48d58df",
+            "size": "7220272"
         }
     },
     "libcublas": {
         "name": "CUDA cuBLAS",
         "license": "CUDA Toolkit",
         "license_path": "libcublas/LICENSE.txt",
-        "version": "13.1.0.3",
+        "version": "13.1.1.3",
         "linux-x86_64": {
-            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-13.1.0.3-archive.tar.xz",
-            "sha256": "88bc951efd906032a371153ca61975e0d9c4761e4012169169a6b3a47931606e",
-            "md5": "980968a3f2a7fc483be4a07dd56e09ad",
-            "size": "838952932"
+            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-13.1.1.3-archive.tar.xz",
+            "sha256": "980cbd746a63566602d1699e2ade005c49408bd95618a57d0888f475e5c721a4",
+            "md5": "f954081d69f7ec632897fe399fd879cb",
+            "size": "838976088"
         },
         "linux-sbsa": {
-            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-13.1.0.3-archive.tar.xz",
-            "sha256": "18832d4798b0a4fc75fa90d58c1780203713ca2e35751a2492262e58f2620c50",
-            "md5": "5773abd5980d9a7af9c0732700287156",
-            "size": "1084803912"
+            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-13.1.1.3-archive.tar.xz",
+            "sha256": "88b4d3d94d536d9a122eb149af01dc524699336ba3c0b33d019e175d177235fb",
+            "md5": "2faefeaf517f98c157789a160821e200",
+            "size": "1084810396"
         },
         "windows-x86_64": {
-            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-13.1.0.3-archive.zip",
-            "sha256": "4ac4847bbe4f7709b244956fcfc32197a2954ee70b155cb67eebd9ee26f7e339",
-            "md5": "1d3169b46c18bbb58df11c1227931a54",
-            "size": "403672823"
+            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-13.1.1.3-archive.zip",
+            "sha256": "d6dfb0f7ad09730bafa1fd948bc65472e28c8a6dc30b4a2b32191f2380f9282b",
+            "md5": "d0a2941fbb1406a08d9178c5b81d44d3",
+            "size": "403660026"
         }
     },
     "libcufft": {
@@ -726,18 +726,18 @@
         "name": "NVIDIA NSCQ API",
         "license": "NVIDIA Driver",
         "license_path": "libnvidia_nscq/LICENSE.txt",
-        "version": "580.95.05",
+        "version": "580.126.20",
         "linux-x86_64": {
-            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-580.95.05-archive.tar.xz",
-            "sha256": "c2285c12f10ec2afc0ad2949f7fcc282b6fd37f32165c1df241451ccabb1067a",
-            "md5": "6bc20061ebdae98fadd7a76110b44430",
-            "size": "380464"
+            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-580.126.20-archive.tar.xz",
+            "sha256": "90d57066756670d1445cac1c7ef68ef0c4a6a2e640da571cd7ae9abf802ff237",
+            "md5": "e56c42ef9a3e280184d2c218f62db828",
+            "size": "380488"
         },
         "linux-sbsa": {
-            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-580.95.05-archive.tar.xz",
-            "sha256": "67cba21aad38e48247e88f480ed67a3096f7173abc190a3f3fbcb312f9649ac6",
-            "md5": "e368f46e7ea592090d3efe425ffc5bbe",
-            "size": "351076"
+            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-580.126.20-archive.tar.xz",
+            "sha256": "75e9eb4fa1f8f81ac06640ab27e21009ea9312a67688ed1cff12cd3ff274d4a6",
+            "md5": "8092d80159d6ebec65b88a084a1827ac",
+            "size": "351132"
         }
     },
     "libnvjitlink": {
@@ -816,12 +816,12 @@
         "name": "LIBNVSDM",
         "license": "NVIDIA",
         "license_path": "libnvsdm/LICENSE.txt",
-        "version": "580.95.05",
+        "version": "580.126.20",
         "linux-x86_64": {
-            "relative_path": "libnvsdm/linux-x86_64/libnvsdm-linux-x86_64-580.95.05-archive.tar.xz",
-            "sha256": "61731fb08bcc5cc143e8514d5ec4f24d42ef9f2563d0ba1ea78bac9eabee8075",
-            "md5": "a46f9176919e90badd89240de658ec7c",
-            "size": "499756"
+            "relative_path": "libnvsdm/linux-x86_64/libnvsdm-linux-x86_64-580.126.20-archive.tar.xz",
+            "sha256": "c546ec22ff14d839750ff3eaaadac2e1144906db136362620a9c1cef1d3e0a0f",
+            "md5": "bfe604e25284e12bf63f7e5ede881d95",
+            "size": "500140"
         }
     },
     "libnvvm": {
@@ -852,54 +852,54 @@
         "name": "NVLink 5 MFT",
         "license": "NVIDIA Proprietary",
         "license_path": "mft/LICENSE.txt",
-        "version": "4.33.0.3004",
+        "version": "4.34.1.10",
         "linux-x86_64": {
-            "relative_path": "mft/linux-x86_64/mft-linux-x86_64-4.33.0.3004-archive.tar.xz",
-            "sha256": "d8b885df13e32730275436d56cd48a3c4a755b2591ff4e3e6836c7a9f9433af1",
-            "md5": "0ee5b7ee7e9e3d982d39c65117891db9",
-            "size": "50206528"
+            "relative_path": "mft/linux-x86_64/mft-linux-x86_64-4.34.1.10-archive.tar.xz",
+            "sha256": "09882e5efd1b6add83fa6a0c7a7f3bebf9ce442f27578e3f8e1fc8d2a92bed4c",
+            "md5": "0291822b2a959b158ca47583fa5e7284",
+            "size": "44015492"
         },
         "linux-sbsa": {
-            "relative_path": "mft/linux-sbsa/mft-linux-sbsa-4.33.0.3004-archive.tar.xz",
-            "sha256": "26aa6ecb6827d88003b50c7d649962b78eb58cba190fdb1f4836b9a3bc75b22e",
-            "md5": "93f81aed65d166b5cb4b2c1193778f3d",
-            "size": "46314988"
+            "relative_path": "mft/linux-sbsa/mft-linux-sbsa-4.34.1.10-archive.tar.xz",
+            "sha256": "db93d7ffe902b1c96dd24915c3d81dbc50510920f9e6e46d046319d7c765622c",
+            "md5": "65007ad5d5ff5f5599152d8faba00e2a",
+            "size": "35388352"
         }
     },
     "mft_autocomplete": {
         "name": "NVLink 5 MFT AUTOCOMPLETE",
         "license": "NVIDIA Proprietary",
         "license_path": "mft_autocomplete/LICENSE.txt",
-        "version": "4.33.0.3004",
+        "version": "4.34.1.10",
         "linux-x86_64": {
-            "relative_path": "mft_autocomplete/linux-x86_64/mft_autocomplete-linux-x86_64-4.33.0.3004-archive.tar.xz",
-            "sha256": "8d16437d55f15ab5c6da9fa26aec6806eb7f6e9606006a7f09593344c848acdb",
-            "md5": "00c429dd417652d24a93f7e66fbab865",
-            "size": "12240"
+            "relative_path": "mft_autocomplete/linux-x86_64/mft_autocomplete-linux-x86_64-4.34.1.10-archive.tar.xz",
+            "sha256": "cfc4581f6c6217043d4055e888654b99f32e6fc2f5d3fe2d7f4720ca1c1a5ecc",
+            "md5": "6ada9b362ec0eac65d273d6e988d5247",
+            "size": "12120"
         },
         "linux-sbsa": {
-            "relative_path": "mft_autocomplete/linux-sbsa/mft_autocomplete-linux-sbsa-4.33.0.3004-archive.tar.xz",
-            "sha256": "b4d492b889d76ea156b97739da4661dfd36c2053a0090065317701c323b51859",
-            "md5": "1a7327e04ae79247054cc551d8f0b263",
-            "size": "12176"
+            "relative_path": "mft_autocomplete/linux-sbsa/mft_autocomplete-linux-sbsa-4.34.1.10-archive.tar.xz",
+            "sha256": "b0dad3ced837b4156c086430dff9b85be3304a76345d1d34999805c1556b1fd2",
+            "md5": "e2df68f21f73cb88c993527f27f9cbbf",
+            "size": "12116"
         }
     },
     "mft_oem": {
         "name": "NVLink 5 MFT OEM",
         "license": "NVIDIA Proprietary",
         "license_path": "mft_oem/LICENSE.txt",
-        "version": "4.33.0.3004",
+        "version": "4.34.1.10",
         "linux-x86_64": {
-            "relative_path": "mft_oem/linux-x86_64/mft_oem-linux-x86_64-4.33.0.3004-archive.tar.xz",
-            "sha256": "0f703047ad69e46c6e3f021fc1ae5e086530a52311da08b3a49451db7f1332e7",
-            "md5": "42498e50e4bdedbb3a99ba434a3ee6a5",
-            "size": "3674360"
+            "relative_path": "mft_oem/linux-x86_64/mft_oem-linux-x86_64-4.34.1.10-archive.tar.xz",
+            "sha256": "a71c667bb9c2b693c0989bd1831fb2e4bcf97ee66cf22bc456e0a4844a7b6126",
+            "md5": "1b8a61c798631dbf6f954c6076e91aa6",
+            "size": "3020496"
         },
         "linux-sbsa": {
-            "relative_path": "mft_oem/linux-sbsa/mft_oem-linux-sbsa-4.33.0.3004-archive.tar.xz",
-            "sha256": "fb755738e56a883d68bb408f28e293df00d1e66e1554e48f339f0f0cf0b7be04",
-            "md5": "fe00dfbbac0c16f74e0d8f21a759d522",
-            "size": "3276404"
+            "relative_path": "mft_oem/linux-sbsa/mft_oem-linux-sbsa-4.34.1.10-archive.tar.xz",
+            "sha256": "70dd3e454ba5f571ff9345fc61077a63d7ebefc224697732039746d1a4e7186c",
+            "md5": "5014329ddd31e3a3f85a9a4c8a98089c",
+            "size": "2472232"
         }
     },
     "nsight_compute": {
@@ -966,18 +966,18 @@
         "name": "NVIDIA Linux Driver",
         "license": "NVIDIA Driver",
         "license_path": "nvidia_driver/LICENSE.txt",
-        "version": "580.95.05",
+        "version": "580.126.20",
         "linux-x86_64": {
-            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-580.95.05-archive.tar.xz",
-            "sha256": "3528df4fb0c7a1665ae2af5d26effeb67f76fc86742ffc1defd7714408405d4d",
-            "md5": "414882bb4f82d3f30f56e22bcb162a67",
-            "size": "492741996"
+            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-580.126.20-archive.tar.xz",
+            "sha256": "81f53cda334f2e59610ec0237149d829f3e1be96ed20113998801445fc96cdf6",
+            "md5": "7d02a481f6bc11ef26de66f44dd20758",
+            "size": "492770800"
         },
         "linux-sbsa": {
-            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-580.95.05-archive.tar.xz",
-            "sha256": "95b52919632928d7a245e5696b71cd68285e6bffd1f22cdcd4f9686d5d5b0b09",
-            "md5": "119f7e0375f09e0a9c1ec4befca800f0",
-            "size": "367188496"
+            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-580.126.20-archive.tar.xz",
+            "sha256": "fabf8df1db0c7146b032ead41ef4c350fe51f6fd816fa0f1da6173901627fe69",
+            "md5": "163b0aa76ae8de556914b002f8996bae",
+            "size": "367307944"
         }
     },
     "nvidia_fs": {
@@ -1002,18 +1002,18 @@
         "name": "NVLSM SM component",
         "license": "NVIDIA Proprietary",
         "license_path": "nvlsm/LICENSE.txt",
-        "version": "2025.06.6",
+        "version": "2025.06.11",
         "linux-x86_64": {
-            "relative_path": "nvlsm/linux-x86_64/nvlsm-linux-x86_64-2025.06.6-archive.tar.xz",
-            "sha256": "bd77ad2504966450aab15041223eea34538a57e870b7d447c097ec721efba792",
-            "md5": "798accd845365da78e2ce99b0aac22ce",
-            "size": "7005320"
+            "relative_path": "nvlsm/linux-x86_64/nvlsm-linux-x86_64-2025.06.11-archive.tar.xz",
+            "sha256": "251296a10538ebb6acee3e0f835f5a3bf0eea7521e8c130a593cd263691ef935",
+            "md5": "2506eccf671d270a687e9d15917a0197",
+            "size": "6993868"
         },
         "linux-sbsa": {
-            "relative_path": "nvlsm/linux-sbsa/nvlsm-linux-sbsa-2025.06.6-archive.tar.xz",
-            "sha256": "1f24d590129e4951d57b1ba75f321bc7ec66b487249ac53b771f0d3a5c5ff371",
-            "md5": "953f75c92485fd63057ec365511f27da",
-            "size": "9365804"
+            "relative_path": "nvlsm/linux-sbsa/nvlsm-linux-sbsa-2025.06.11-archive.tar.xz",
+            "sha256": "0178f31beee1f7b144af147a3234505b03f1bb38cf9d8460bd6c65107f66b8f2",
+            "md5": "87b5ca468a91cbd06a3b859dd378f1a3",
+            "size": "9349944"
         }
     },
     "visual_studio_integration": {
@@ -1028,4 +1028,4 @@
             "size": "887859"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/cuda-modules/packages/cuda_crt.nix b/pkgs/development/cuda-modules/packages/cuda_crt.nix
index 3cf2246235bd..f8ee427fbed1 100644
--- a/pkgs/development/cuda-modules/packages/cuda_crt.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_crt.nix
@@ -1,10 +1,41 @@
-{ backendStdenv, buildRedist }:
+{
+  lib,
+  backendStdenv,
+  buildRedist,
+  cudaOlder,
+  glibc,
+}:
 buildRedist {
   redistName = "cuda";
   pname = "cuda_crt";
 
   outputs = [ "out" ];
 
+  # Fix compatibility with glibc 2.42:
+  # - CUDA >= 13.0 fixed sinpi/cospi (using __NV_IEC_60559_FUNCS_EXCEPTION_SPECIFIER), but
+  #   rsqrt/rsqrtf in math_functions.h still lack noexcept, conflicting with glibc 2.42's
+  #   declarations.
+  # - CUDA >= 13.2 fixed rsqrt/rsqrtf as well (using _NV_RSQRT_SPECIFIER).
+  postInstall = lib.optionalString (cudaOlder "13.2" && lib.versionAtLeast glibc.version "2.42") ''
+    nixLog "Patching math_functions.h rsqrt signatures to match glibc's ones"
+    substituteInPlace "''${!outputInclude:?}/include/crt/math_functions.h" \
+      --replace-fail \
+        "rsqrt(double x);" \
+        "rsqrt(double x) noexcept (true);" \
+      --replace-fail \
+        "rsqrtf(float x);" \
+        "rsqrtf(float x) noexcept (true);"
+
+    nixLog "Patching math_functions.hpp rsqrt signatures to match glibc's ones"
+    substituteInPlace "''${!outputInclude:?}/include/crt/math_functions.hpp" \
+      --replace-fail \
+        "__func__(double rsqrt(const double a))" \
+        "__func__(double rsqrt(const double a) throw())" \
+      --replace-fail \
+        "__func__(float rsqrtf(const float a))" \
+        "__func__(float rsqrtf(const float a) throw())"
+  '';
+
   brokenAssertions = [
     # TODO(@connorbaker): Build fails on x86 when using pkgsLLVM.
     #  .../include/crt/host_defines.h:67:2:
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
index 404811ffa2f5..2bb34f2cf84f 100644
--- a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
@@ -168,6 +168,11 @@ buildRedist (finalAttrs: {
       # The cospi|sinpi|rsqrt function signatures in include/common/math_functions.h do not match
       # glibc 2.42's.
       # Indeed, there they are declared with noexcept(true) which is not the case in cuda_nvcc.
+      # - In CUDA < 13.0, sinpi/cospi/rsqrt all lack exception specifiers.
+      # - In CUDA >= 13.0, NVIDIA fixed sinpi/cospi (using __NV_IEC_60559_FUNCS_EXCEPTION_SPECIFIER)
+      #   but rsqrt/rsqrtf still lack noexcept, so we only patch those.
+      #   As the CRT headers (including math_functions.h) moved to the cuda_crt package, the glibc
+      #   2.42 compatibility patch is applied there instead.
       + lib.optionalString (cudaOlder "13.0" && lib.versionAtLeast glibc.version "2.42") ''
         nixLog "Patching math_functions.h signatures to match glibc's ones"
         substituteInPlace "''${!outputInclude:?}/include/crt/math_functions.h" \
@@ -213,6 +218,7 @@ buildRedist (finalAttrs: {
             "__func__(float cospif(const float a))" \
             "__func__(float cospif(const float a) throw())"
       ''
+
       # Fix clang CUDA compilation: host_defines.h redefines __noinline__ as
       # __attribute__((noinline)), which conflicts with libstdc++ >=12 using
       # __attribute__((__noinline__)) — the macro expands to
diff --git a/pkgs/development/cuda-modules/packages/libcuobjclient.nix b/pkgs/development/cuda-modules/packages/libcuobjclient.nix
new file mode 100644
index 000000000000..e4e4655f8c36
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcuobjclient.nix
@@ -0,0 +1,31 @@
+{
+  buildRedist,
+  libcufile,
+  numactl,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcuobjclient";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  buildInputs = [
+    libcufile
+    numactl
+  ];
+
+  meta = {
+    description = "CUDA cuObject Client";
+    longDescription = ''
+      High-performance suite of libraries designed to enable direct data transfers between GPU
+      memory or system memory and object storage (S3-compatible) solution via RDMA.
+    '';
+    homepage = "https://docs.nvidia.com/gpudirect-storage/cuobject/";
+    changelog = "https://docs.nvidia.com/gpudirect-storage/cuobject/";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvbandwidth/package.nix b/pkgs/development/cuda-modules/packages/nvbandwidth/package.nix
new file mode 100644
index 000000000000..0e36cd50bf28
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvbandwidth/package.nix
@@ -0,0 +1,87 @@
+{
+  lib,
+  backendStdenv,
+  fetchFromGitHub,
+  flags,
+
+  # nativeBuildInputs
+  cmake,
+  cuda_nvcc,
+
+  # buildInputs
+  boost,
+  cuda_cudart,
+  cuda_nvml_dev,
+
+  # passthru
+  nvbandwidth,
+
+  config,
+  cudaSupport ? config.cudaSupport,
+}:
+backendStdenv.mkDerivation (finalAttrs: {
+  pname = "nvbandwidth";
+  version = "0.9";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "nvbandwidth";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-j1bKWXHIkjsE/M+w5rRF0UGjkj1gLA2yi+5hc1sWl/A=";
+  };
+
+  patches = [
+    # Force a dynamic Boost build and link against the CUDA driver / NVML stubs via the CMake
+    # imported targets exposed by `find_package(CUDAToolkit)`.
+    ./use-cuda-imported-targets.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    cuda_nvcc
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
+  ];
+
+  buildInputs = [
+    boost
+    cuda_cudart # cuda_runtime.h, libcuda stub
+    cuda_nvml_dev # libnvidia-ml
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 nvbandwidth -t $out/bin
+
+    runHook postInstall
+  '';
+
+  passthru.gpuCheck = nvbandwidth.overrideAttrs (_: {
+    requiredSystemFeatures = [ "cuda" ];
+    doInstallCheck = true;
+    postInstallCheck = ''
+      $out/bin/${nvbandwidth.meta.mainProgram}
+    '';
+
+    # Failing (probably a sandbox limitation):
+    #   hwloc/linux: failed to find sysfs cpu topology directory, aborting linux discovery.
+    meta.broken = true;
+  });
+
+  meta = {
+    description = "Tool for bandwidth measurements on NVIDIA GPUs";
+    homepage = "https://github.com/NVIDIA/nvbandwidth";
+    changelog = "https://github.com/NVIDIA/nvbandwidth/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    mainProgram = "nvbandwidth";
+    platforms = lib.platforms.linux;
+    broken = !cudaSupport;
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/nvbandwidth/use-cuda-imported-targets.patch b/pkgs/development/cuda-modules/packages/nvbandwidth/use-cuda-imported-targets.patch
new file mode 100644
index 000000000000..f0707cc4021f
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvbandwidth/use-cuda-imported-targets.patch
@@ -0,0 +1,47 @@
+Use CMake imported targets and disable the static Boost build.
+
+The upstream link command `target_link_libraries(... ${NVML_LIB_NAME} cuda)`
+expands to plain `-lnvidia-ml -lcuda`, which forces the linker to look up
+those names on its search path. The corresponding stubs live in non-standard
+`*/lib/stubs` directories that aren't on the Nix linker search path, so the
+build fails. Switching to the `CUDA::nvml` / `CUDA::cuda_driver` imported
+targets exposed by `find_package(CUDAToolkit)` makes CMake link against the
+absolute stub paths it discovers via `CUDAToolkit_ROOT` instead.
+
+The static-Boost branch is also dropped: it dispatches on `/etc/os-release`,
+which doesn't exist in the Nix sandbox, and we want a dynamic build anyway.
+---
+ CMakeLists.txt | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,16 +43,11 @@
+     set(CMAKE_BUILD_TYPE "Release")
+ endif()
+
+-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+-    file(READ "/etc/os-release" OS_RELEASE_CONTENT)
+-    # Skip static libs on Fedora - https://github.com/NVIDIA/nvbandwidth/issues/4
+-    if(NOT OS_RELEASE_CONTENT MATCHES "ID=.*fedora|azurelinux")
+-        set(Boost_USE_STATIC_LIBS ON)
+-    endif()
+-else()
++if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
+     set(Boost_USE_STATIC_LIBS ON)
+ endif()
+ find_package(Boost COMPONENTS program_options REQUIRED)
++find_package(CUDAToolkit REQUIRED)
+
+ set(src
+     environment.cpp
+@@ -85,7 +80,7 @@
+
+ add_executable(nvbandwidth ${src})
+ target_include_directories(nvbandwidth PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES} .)
+-target_link_libraries(nvbandwidth Boost::program_options ${NVML_LIB_NAME} cuda)
++target_link_libraries(nvbandwidth Boost::program_options CUDA::nvml CUDA::cuda_driver)
+
+ if (MULTINODE)
+     find_package(MPI REQUIRED)
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
index afa2ab7a079a..395fb195ee38 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
@@ -35,10 +35,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "2.21.0-unstable-2026-01-25";
+  version = "2.21.3-unstable-2026-03-30";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
-    sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
+    url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
+    sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
   };
   postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
   isLibrary = true;
@@ -106,5 +106,5 @@ mkDerivation {
   '';
   homepage = "https://github.com/nixos/cabal2nix#readme";
   description = "Convert Cabal files into Nix build instructions";
-  license = lib.licenses.bsd3;
+  license = lib.licensesSpdx."BSD-3-Clause";
 }
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
index 8a5382ee2ac3..8a2bb2d4cfe1 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
@@ -18,10 +18,10 @@
 }:
 mkDerivation {
   pname = "distribution-nixpkgs";
-  version = "1.7.1.1-unstable-2026-01-25";
+  version = "1.7.1.1-unstable-2026-03-30";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
-    sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
+    url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
+    sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
   };
   postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
   enableSeparateDataOutput = true;
@@ -49,5 +49,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme";
   description = "Types and functions to manipulate the Nixpkgs distribution";
-  license = lib.licenses.bsd3;
+  license = lib.licensesSpdx."BSD-3-Clause";
 }
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
index c0363bea2617..170a502afe9b 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
@@ -13,14 +13,13 @@
   lib,
   tar,
   time,
-  utf8-string,
 }:
 mkDerivation {
   pname = "hackage-db";
-  version = "2.1.3-unstable-2026-01-25";
+  version = "2.1.3-unstable-2026-03-30";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
-    sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
+    url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
+    sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
   };
   postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
   isLibrary = true;
@@ -36,9 +35,8 @@ mkDerivation {
     filepath
     tar
     time
-    utf8-string
   ];
   homepage = "https://github.com/NixOS/cabal2nix/tree/master/hackage-db#readme";
   description = "Access cabal-install's Hackage database via Data.Map";
-  license = lib.licenses.bsd3;
+  license = lib.licensesSpdx."BSD-3-Clause";
 }
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
index 53130dcbc60d..85c20c7d927f 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
@@ -14,10 +14,10 @@
 }:
 mkDerivation {
   pname = "language-nix";
-  version = "2.3.0-unstable-2026-01-25";
+  version = "2.3.0-unstable-2026-03-30";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/751a8eccfc92f8ce3ca9d517c554e7dcb3f409bd.tar.gz";
-    sha256 = "1i9ifxmh5bqgpa7a6l46lqkzpr7z3zfm7bdkllq56hz1nmj4gbqx";
+    url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
+    sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
   };
   postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
   libraryHaskellDepends = [
@@ -39,5 +39,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme";
   description = "Data types and functions to represent the Nix language";
-  license = lib.licenses.bsd3;
+  license = lib.licensesSpdx."BSD-3-Clause";
 }
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1148e0af58a6..ef0381a6c58b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -42,12 +42,12 @@ with haskellLib;
     ])
 
     (overrideCabal (drv: {
-      version = "1.3.0.0-unstable-2025-04-25";
+      version = "1.3.0.0-unstable-2026-01-30";
       src = pkgs.fetchFromGitHub {
         owner = "AccelerateHS";
         repo = "accelerate";
-        rev = "3f681a5091eddf5a3b97f4cd0de32adc830e1117";
-        sha256 = "sha256-tCcl7wAls+5cBSrqbxfEAJngbV43OJcLJdaC4qqkBxc=";
+        rev = "c22387ed2e00b00a6c79dcec5d22b53874da91fc";
+        sha256 = "sha256-AtKdxeCytRbmOIFe7OPbSMlhFhJnrgMuIqLFIeqnBGU";
       };
     }))
   ];
@@ -143,6 +143,10 @@ with haskellLib;
 
         cabal-install-solver = super.cabal-install-solver.overrideScope cabalInstallOverlay;
 
+        cabal2nix-unstable = super.cabal2nix-unstable.overrideScope cabalInstallOverlay;
+        distribution-nixpkgs-unstable = super.distribution-nixpkgs-unstable.overrideScope cabalInstallOverlay;
+        hackage-db-unstable = super.hackage-db-unstable.overrideScope cabalInstallOverlay;
+
         # Needs cabal-install >= 3.8 /as well as/ matching Cabal
         guardian = lib.pipe (super.guardian.overrideScope cabalInstallOverlay) [
           # Tests need internet access (run stack)
@@ -154,28 +158,12 @@ with haskellLib;
     )
     cabal-install
     cabal-install-solver
+    cabal2nix-unstable
+    distribution-nixpkgs-unstable
+    hackage-db-unstable
     guardian
     ;
 
-  # cabal2nix depends on hpack which doesn't support Cabal >= 3.16
-  cabal2nix-unstable = super.cabal2nix-unstable.override (
-    prev:
-    # Manually override the relevant dependencies to reduce rebuild amount
-    let
-      cabalOverride = {
-        Cabal = self.Cabal_3_14_2_0;
-      };
-    in
-    cabalOverride
-    // lib.mapAttrs (_: drv: drv.override cabalOverride) {
-      inherit (prev)
-        distribution-nixpkgs
-        hackage-db
-        hpack
-        ;
-    }
-  );
-
   # Stack uses pure nix-shells for certain operations including HTTPS requests
   # This patch makes stack add pkgs.cacert, so the certificate DB is available.
   # https://github.com/commercialhaskell/stack/pull/6854 krank:ignore-line
@@ -213,6 +201,12 @@ with haskellLib;
     }
   );
 
+  # First to upgrade to lsp >= 2.8 while HLS hasn't yet had a compatible release
+  futhark = super.futhark.override {
+    lsp = self.lsp_2_8_0_0;
+    lsp-types = self.lsp-types_2_4_0_0;
+  };
+
   #######################################
   ### HASKELL-LANGUAGE-SERVER SECTION ###
   #######################################
@@ -243,6 +237,15 @@ with haskellLib;
       lib.mapAttrs (_: pkg: pkg.overrideScope hls_overlay) (
         super
         // {
+          # Work around test suite not finding executable due to https://github.com/haskell/cabal/issues/11598
+          fourmolu = appendPatches [
+            (pkgs.fetchpatch {
+              name = "fourmolu-absolute-build-tool-paths.patch";
+              url = "https://github.com/fourmolu/fourmolu/commit/9217bc926ab80d20b815f0486be2184db07df4fc.patch";
+              hash = "sha256-ANzuKy5WfWCGZ7HFVBpTtuyUqzFfef/xR/v1KiyJEX4=";
+            })
+          ] super.fourmolu;
+
           # HLS 2.11: Too strict bound on Diff 1.0.
           haskell-language-server = lib.pipe super.haskell-language-server [
             dontCheck
@@ -274,6 +277,15 @@ with haskellLib;
     disableCabalFlag "auto" super.ghc-lib-parser-ex
   );
 
+  # Work around test suite not finding executable due to https://github.com/haskell/cabal/issues/11598
+  cabal-add = appendPatches [
+    (pkgs.fetchpatch {
+      name = "cabal-add-absolute-build-tool-paths.patch";
+      url = "https://github.com/Bodigrim/cabal-add/commit/3b94b0175c294c2d0a30b6d8da3f56189216816c.patch";
+      hash = "sha256-4Nbro9Gl+RC78yprO8fYG/IWS7QvJPd0dKqSZb5jq9k=";
+    })
+  ] super.cabal-add;
+
   ###########################################
   ### END HASKELL-LANGUAGE-SERVER SECTION ###
   ###########################################
@@ -299,7 +311,7 @@ with haskellLib;
       "vector-tests-O2"
     ];
     # inspection-testing doesn't work on all archs & ABIs
-    doCheck = !self.inspection-testing.meta.broken;
+    doCheck = super.vector.doCheck && !self.inspection-testing.meta.broken;
   }) super.vector;
 
   # https://github.com/lspitzner/data-tree-print/issues/4
@@ -426,6 +438,18 @@ with haskellLib;
   # https://github.com/raehik/binrep/issues/14
   binrep = warnAfterVersion "1.1.0" (doJailbreak super.binrep);
 
+  # Does not support QuickCheck == 2.15.*
+  # https://codeberg.org/noiioiu/comonad-coactions/issues/1
+  comonad-coactions = dontCheck super.comonad-coactions;
+
+  # doctests don't evaluate properly
+  # https://github.com/morphismtech/distributors/issues/23
+  distributors = dontCheck super.distributors;
+
+  # Needs QuickCheck >= 2.16
+  # https://github.com/input-output-hk/io-sim/issues/248
+  io-sim = dontCheck super.io-sim;
+
   # 2024-06-23: Hourglass is archived and had its last commit 6 years ago.
   # Patch is needed to add support for time 1.10, which is only used in the tests
   # https://github.com/vincenthz/hs-hourglass/pull/56
@@ -534,15 +558,20 @@ with haskellLib;
   jpeg-turbo = dontCheck super.jpeg-turbo;
   JuicyPixels-jpeg-turbo = dontCheck super.JuicyPixels-jpeg-turbo;
 
-  # Fixes compilation for basement on i686
-  # https://github.com/haskell-foundation/foundation/pull/573
   basement = appendPatches [
+    # Fixes compilation for basement on i686
+    # https://github.com/haskell-foundation/foundation/pull/573
     (fetchpatch {
       name = "basement-i686-ghc-9.4.patch";
       url = "https://github.com/haskell-foundation/foundation/pull/573/commits/38be2c93acb6f459d24ed6c626981c35ccf44095.patch";
       sha256 = "17kz8glfim29vyhj8idw8bdh3id5sl9zaq18zzih3schfvyjppj7";
       stripLen = 1;
     })
+
+    # Fixes compilation on windows
+    # Repo is archived, package is abandoned: https://github.com/haskell-foundation/foundation
+    ./patches/basement-add-cast.patch
+
   ] super.basement;
 
   # Fixes compilation of memory with GHC >= 9.4 on 32bit platforms
@@ -630,17 +659,18 @@ with haskellLib;
   # check requires mysql server
   mysql-simple = dontCheck super.mysql-simple;
 
-  # Hackage tarball only includes what is supported by `cabal install git-annex`,
-  # but we want e.g. completions as well. See
-  # https://web.archive.org/web/20160724083703/https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
-  # or git-annex @ 3571b077a1244330cc736181ee04b4d258a78476 doc/bugs/bash_completion_file_is_missing*
-  git-annex = lib.pipe super.git-annex [
+  # Requires file-io >= 0.2 if using OsPath flag (which we want for GHC >= 9.10)
+  git-annex = lib.pipe (super.git-annex.override { file-io = self.file-io_0_2_0; }) [
     (overrideCabal (drv: {
+      # Hackage tarball only includes what is supported by `cabal install git-annex`,
+      # but we want e.g. completions as well. See
+      # https://web.archive.org/web/20160724083703/https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
+      # or git-annex @ 3571b077a1244330cc736181ee04b4d258a78476 doc/bugs/bash_completion_file_is_missing*
       src = pkgs.fetchgit {
         name = "git-annex-${super.git-annex.version}-src";
         url = "git://git-annex.branchable.com/";
         tag = super.git-annex.version;
-        sha256 = "sha256-wH/As9KdHLlUgGUuIVjBjC8akqHfCZPBWABFXry6z28=";
+        sha256 = "sha256-oh9lrQvj1Ooi3PI5heNXBopX35s1K5Kyn/mH7V4sXB8=";
         # delete android and Android directories which cause issues on
         # darwin (case insensitive directory). Since we don't need them
         # during the build process, we can delete it to prevent a hash
@@ -889,13 +919,20 @@ with haskellLib;
   ];
 
   pandoc = appendPatches [
-    # Adjust text fixtures for djot >= 0.1.2.3, patch extracted from unrelated change.
+    # Adjust test fixtures for djot >= 0.1.2.3, patch extracted from unrelated change.
     (pkgs.fetchpatch {
       name = "pandoc-djot-0.1.2.3.patch";
       url = "https://github.com/jgm/pandoc/commit/643712ca70b924c0edcc059699aa1ee42234be34.patch";
       hash = "sha256-khDkb1PzC0fTaWTq3T04UvgoI+XefOJMaTV1d3Du8BU=";
       includes = [ "test/djot-reader.native" ];
     })
+    # Adjust tests for skylighting-format-blaze-html >= 0.1.2
+    (pkgs.fetchpatch {
+      name = "pandoc-skylighting-format-blaze-html-0.1.2.patch";
+      url = "https://github.com/jgm/pandoc/commit/cab682ba58f2eb7e940d1af508e196ff6b1c1112.patch";
+      hash = "sha256-lpddKGa8xs+Lhi62HhBgV04fUq2kkippA1xX2/b2ukM=";
+      includes = [ "test/Tests/Writers/HTML.hs" ];
+    })
   ] super.pandoc;
 
   # Too strict upper bound on data-default-class (< 0.2)
@@ -1245,6 +1282,10 @@ with haskellLib;
     broken = pkgs.stdenv.hostPlatform.isLinux && pkgs.stdenv.hostPlatform.isi686;
   }) super.vimus;
 
+  # 2026-02-19: too strict bounds on bytestring (<0.11) and text (<2)
+  # https://github.com/theam/require/pull/31
+  require = doJailbreak super.require;
+
   # https://github.com/kazu-yamamoto/logger/issues/42
   logger = dontCheck super.logger;
 
@@ -1970,6 +2011,14 @@ with haskellLib;
     })
   ] super.moto;
 
+  # c2hs/language-c don't support C23 [[nodiscard]] yet: https://github.com/visq/language-c/issues/107.
+  # To work around this, we tell the preprocessor of GCC 15 to use an older standard (the GCC 14 default).
+  avif =
+    if pkgs.stdenv.hasCC && pkgs.stdenv.cc.isGNU then
+      appendConfigureFlags [ "--c2hs-options=--cppopts=-std=gnu17" ] super.avif
+    else
+      super.avif;
+
   # Readline uses Distribution.Simple from Cabal 2, in a way that is not
   # compatible with Cabal 3. No upstream repository found so far
   readline = appendPatch ./patches/readline-fix-for-cabal-3.patch super.readline;
@@ -1979,7 +2028,7 @@ with haskellLib;
   util = appendConfigureFlags [
     "--ghc-option=-fno-safe-haskell"
     "--haddock-option=--optghc=-fno-safe-haskell"
-  ] super.util;
+  ] (doJailbreak super.util); # unmaintained
   category = appendConfigureFlags [
     "--ghc-option=-fno-safe-haskell"
     "--haddock-option=--optghc=-fno-safe-haskell"
@@ -2066,6 +2115,22 @@ with haskellLib;
   # https://github.com/obsidiansystems/database-id/issues/1
   database-id-class = doJailbreak super.database-id-class;
 
+  # Allow granite >= 0.4
+  dataframe = lib.pipe super.dataframe [
+    (warnAfterVersion "0.5.0.1")
+    doJailbreak
+  ];
+
+  # TODO: when (likely in 25.x) Stackage bumps random to 1.3, review
+  dataframe-persistent = lib.pipe super.dataframe-persistent [
+    doJailbreak # 2026-01-23: too strict bounds on dataframe >= 0.4
+    dontCheck # 2026-01-23: test uses dataframe function not exported in 0.3.3.6
+  ];
+
+  # 2026-01-23: too strict bounds on random >= 1.3
+  # TODO: when (likely in 25.x) Stackage bumps random to 1.3, unpin
+  ihaskell-dataframe = doJailbreak super.ihaskell-dataframe;
+
   # Too strict version bounds on base
   # https://github.com/gibiansky/IHaskell/issues/1217
   ihaskell-display = doJailbreak super.ihaskell-display;
@@ -2358,6 +2423,12 @@ with haskellLib;
   # https://github.com/andrewufrank/uniform-fileio/issues/2
   uniform-fileio = dontCheck super.uniform-fileio;
 
+  # Waiting on https://github.com/mastratisi/railroad/commit/3fc1360ebec6337de3115968660361b1b7e92f0b
+  railroad = lib.pipe super.railroad [
+    (warnAfterVersion "0.1.1.1")
+    doJailbreak
+  ];
+
   # The shipped Setup.hs file is broken.
   csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv;
 
@@ -2403,6 +2474,13 @@ with haskellLib;
     pkgs.stdenv.hostPlatform.isPower64 && pkgs.stdenv.hostPlatform.isBigEndian
   ) super.crypton-x509-validation;
 
+  crypton-x509-system = overrideCabal (drv: {
+    # Case sensitive when doing cross-compilation to windows
+    postPatch = drv.postPatch or "" + ''
+      substituteInPlace crypton-x509-system.cabal --replace-fail "Crypt32" "crypt32"
+    '';
+  }) super.crypton-x509-system;
+
   # Likely fallout from the crypton issues
   # exception: HandshakeFailed (Error_Protocol "bad PubKeyALG_Ed448 signature for ecdhparams" DecryptError)
   tls = dontCheckIf (
@@ -2493,6 +2571,12 @@ with haskellLib;
 
   # Unmaintained
   records-sop = doJailbreak super.records-sop;
+  failure = appendPatch (fetchpatch {
+    # https://github.com/snoyberg/failure/pull/5
+    name = "switch-error-to-except";
+    url = "https://github.com/snoyberg/failure/commit/d46bebb5afdc17a0feb268bc86adb00b7edc4cc3.patch";
+    sha256 = "sha256-CDd/vvlRq1cldyH+qsJVNMiwViqKVSosr9A0ilv2gLM";
+  }) (doJailbreak super.failure);
 
   # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20)
   polynomial =
@@ -2544,6 +2628,14 @@ with haskellLib;
     ];
   }) super.hexstring;
 
+  # 2026-02-19: GHC 9.10 increased simplifier ticks, need higher threshold
+  # https://github.com/lehins/hip/issues/56
+  hip = overrideCabal (drv: {
+    configureFlags = (drv.configureFlags or [ ]) ++ [
+      "--ghc-options=-fsimpl-tick-factor=200"
+    ];
+  }) super.hip;
+
   # Disabling doctests.
   regex-tdfa = overrideCabal {
     testTargets = [ "regex-tdfa-unittest" ];
@@ -2794,6 +2886,21 @@ with haskellLib;
   # Too strict bounds on hspec < 2.11
   fuzzyset_0_2_4 = doJailbreak super.fuzzyset_0_2_4;
 
+  # The following all have too strict bounds on hs-opentelemtry-api < 0.3
+  # https://github.com/iand675/hs-opentelemetry/issues/203
+  hs-opentelemetry-exporter-handle = doJailbreak super.hs-opentelemetry-exporter-handle;
+  hs-opentelemetry-exporter-in-memory = doJailbreak super.hs-opentelemetry-exporter-in-memory;
+  hs-opentelemetry-instrumentation-cloudflare = doJailbreak super.hs-opentelemetry-instrumentation-cloudflare;
+  hs-opentelemetry-instrumentation-conduit = doJailbreak super.hs-opentelemetry-instrumentation-conduit;
+  hs-opentelemetry-instrumentation-hspec = doJailbreak super.hs-opentelemetry-instrumentation-hspec;
+  hs-opentelemetry-instrumentation-http-client = doJailbreak super.hs-opentelemetry-instrumentation-http-client;
+  hs-opentelemetry-instrumentation-persistent = doJailbreak super.hs-opentelemetry-instrumentation-persistent;
+  hs-opentelemetry-instrumentation-postgresql-simple = doJailbreak super.hs-opentelemetry-instrumentation-postgresql-simple;
+  hs-opentelemetry-instrumentation-tasty = doJailbreak super.hs-opentelemetry-instrumentation-tasty;
+  hs-opentelemetry-instrumentation-wai = doJailbreak super.hs-opentelemetry-instrumentation-wai;
+  hs-opentelemetry-instrumentation-yesod = doJailbreak super.hs-opentelemetry-instrumentation-yesod;
+  hs-opentelemetry-utils-exceptions = doJailbreak super.hs-opentelemetry-utils-exceptions;
+
   html-charset = dontCheck super.html-charset;
 
   # bytestring <0.11.0, optparse-applicative <0.13.0
@@ -2965,12 +3072,6 @@ with haskellLib;
     })
   ] (doJailbreak super.http2-client);
 
-  # Needs tls >= 2.1.10
-  http2-tls =
-    lib.warnIf (lib.versionAtLeast self.tls.version "2.1.10")
-      "haskellPackages.http2-tls: tls override can be removed"
-      (super.http2-tls.override { tls = self.tls_2_2_1; });
-
   # Relax http2 version bound (5.3.9 -> 5.3.10)
   # https://github.com/well-typed/grapesy/issues/297
   # Tests fail with duplicate IsLabel instance error
@@ -3023,6 +3124,10 @@ with haskellLib;
   # 2025-04-09: jailbreak to allow tasty-quickcheck >= 0.11
   bzlib = warnAfterVersion "0.5.2.0" (doJailbreak super.bzlib);
 
+  # Missing test files in sdist
+  # https://github.com/vmchale/lzlib/issues/1
+  lzlib = dontCheck super.lzlib;
+
   # 2025-07-29: test suite "test" fails to build because of missing source files,
   # fixed by https://github.com/commercialhaskell/path/pull/193
   path = warnAfterVersion "0.9.6" (dontCheck super.path);
@@ -3097,12 +3202,6 @@ with haskellLib;
   # 2025-04-13: jailbreak to allow hedgehog >= 1.5
   hw-bits = warnAfterVersion "0.7.2.2" (doJailbreak super.hw-bits);
 
-  # 2025-04-23: jailbreak to allow bytestring >= 0.12
-  brillo-rendering = warnAfterVersion "1.13.3" (doJailbreak super.brillo-rendering);
-  brillo-examples = warnAfterVersion "1.13.3" (doJailbreak super.brillo-examples);
-  brillo-juicy = warnAfterVersion "0.2.4" (doJailbreak super.brillo-juicy);
-  brillo = warnAfterVersion "1.13.3" (doJailbreak super.brillo);
-
   monad-bayes =
     # Floating point precision issues. Test suite is only checked on x86_64.
     # https://github.com/tweag/monad-bayes/issues/368
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
index d5c3595591c1..37eec6f9f12a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
@@ -88,7 +88,7 @@ with haskellLib;
   }) super.cpphs;
   cabal-install-parsers = doJailbreak super.cabal-install-parsers; # base, Cabal-syntax, etc.
   ghc-exactprint_1_12_0_0 = addBuildDepends [
-    # somehow buildDepends was missing
+    # cabal2nix drops conditional block: impl (ghc >= 9.12)
     self.Diff
     self.extra
     self.ghc-paths
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix
index e3ccdf381d5f..812caea9b98b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix
@@ -70,10 +70,20 @@ with haskellLib;
   xhtml = null;
   Win32 = null;
 
+  #
+  # Only support GHC 9.14
+  #
+
+  scrod = doDistribute (unmarkBroken super.scrod);
+
   #
   # Version upgrades
   #
 
+  ghc-exactprint = doDistribute self.ghc-exactprint_1_14_0_0;
+  hedgehog = doDistribute self.hedgehog_1_7;
+  hie-bios = doDistribute (dontCheck self.hie-bios_0_18_0); # Tests access homeless-shelter.
+  lifted-async = doDistribute self.lifted-async_0_11_0;
   parallel = doDistribute self.parallel_3_3_0_0;
   tagged = doDistribute self.tagged_0_8_10;
   unordered-containers = doDistribute self.unordered-containers_0_2_21;
@@ -85,6 +95,8 @@ with haskellLib;
   primitive = doJailbreak (dontCheck super.primitive); # base <4.22 and a lot of dependencies on packages not yet working.
   splitmix = doJailbreak super.splitmix; # base <4.22
 
+  # https://github.com/phadej/boring/issues/48
+  boring = doJailbreak super.boring;
   # https://github.com/haskellari/indexed-traversable/issues/49
   indexed-traversable = doJailbreak super.indexed-traversable;
   # https://github.com/haskellari/indexed-traversable/issues/50
@@ -121,6 +133,20 @@ with haskellLib;
   # https://github.com/sjakobi/newtype-generics/pull/28/files
   newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
 
+  # haskell-debugger only works with ghc 9.14+
+  haskell-debugger-view = doDistribute (unmarkBroken super.haskell-debugger-view);
+  haskell-debugger = doDistribute (doJailbreak super.haskell-debugger); # hie-bios < 0.18, random >=1.3.1
+
+  ghc-exactprint_1_14_0_0 = addBuildDepends [
+    # cabal2nix drops conditional block: impl (ghc >= 9.14)
+    self.Diff
+    self.extra
+    self.ghc-paths
+    self.silently
+    self.syb
+    self.HUnit
+  ] super.ghc-exactprint_1_14_0_0;
+
   #
   # Test suite issues
   #
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
index 5483021c3e73..36bbe2539b5d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@@ -58,7 +58,8 @@ self: super: {
   # Becomes a core package in GHC >= 9.10
   os-string = doDistribute self.os-string_2_0_10;
 
-  # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available
+  # Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
+  ghc-experimental = null;
   ghc-internal = null;
   # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage
   ghc-toolchain = null;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
index 414ad17b0c81..f7603f5a088d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
@@ -66,7 +66,8 @@ in
   # Becomes a core package in GHC >= 9.10
   os-string = doDistribute self.os-string_2_0_10;
 
-  # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available
+  # Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
+  ghc-experimental = null;
   ghc-internal = null;
   # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage
   ghc-toolchain = null;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
index 84238d0fcde5..9150d4031bc7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
@@ -66,7 +66,8 @@ in
   # Becomes a core package in GHC >= 9.10
   os-string = doDistribute self.os-string_2_0_10;
 
-  # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available
+  # Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
+  ghc-experimental = null;
   ghc-internal = null;
   # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage
   ghc-toolchain = null;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index fa86c37165ff..91efaecae918 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -1,8 +1,9 @@
 # These packages don't compile.
 broken-packages:
-  - 2captcha # failure in job https://hydra.nixos.org/build/233233765 at 2023-09-02
+  - 2captcha # failure in job https://hydra.nixos.org/build/324105279 at 2026-03-15
   - 3d-graphics-examples # failure in job https://hydra.nixos.org/build/234454565 at 2023-09-13
   - 3dmodels # failure in job https://hydra.nixos.org/build/233220850 at 2023-09-02
+  - A-gent # failure in job https://hydra.nixos.org/build/324105105 at 2026-03-15
   - AAI # failure in job https://hydra.nixos.org/build/233258828 at 2023-09-02
   - aasam # failure in job https://hydra.nixos.org/build/233216423 at 2023-09-02
   - abacate # failure in job https://hydra.nixos.org/build/233201225 at 2023-09-02
@@ -20,7 +21,6 @@ broken-packages:
   - AC-MiniTest # failure in job https://hydra.nixos.org/build/233216015 at 2023-09-02
   - AC-Terminal # failure in job https://hydra.nixos.org/build/233192747 at 2023-09-02
   - AC-VanillaArray # failure in job https://hydra.nixos.org/build/233216801 at 2023-09-02
-  - accelerate # failure in job https://hydra.nixos.org/build/307516269 at 2025-09-19
   - accelerate-fftw # failure in job https://hydra.nixos.org/build/296049868 at 2025-05-02
   - accelerate-random # failure in job https://hydra.nixos.org/build/296049869 at 2025-05-02
   - accelerate-utility # failure in job https://hydra.nixos.org/build/296049871 at 2025-05-02
@@ -65,6 +65,7 @@ broken-packages:
   - adaptive-containers # failure in job https://hydra.nixos.org/build/233243181 at 2023-09-02
   - adaptive-tuple # failure in job https://hydra.nixos.org/build/233244881 at 2023-09-02
   - adb # failure in job https://hydra.nixos.org/build/233193888 at 2023-09-02
+  - add-dependent-file # failure in job https://hydra.nixos.org/build/324105286 at 2026-03-15
   - addy # failure in job https://hydra.nixos.org/build/233240594 at 2023-09-02
   - adhoc-fixtures-hspec # failure in job https://hydra.nixos.org/build/252725981 at 2024-03-16
   - adjunction # failure in job https://hydra.nixos.org/build/233237774 at 2023-09-02
@@ -203,6 +204,7 @@ broken-packages:
   - aosd # failure in job https://hydra.nixos.org/build/233207331 at 2023-09-02
   - apache-md5 # failure in job https://hydra.nixos.org/build/233193946 at 2023-09-02
   - apart # failure in job https://hydra.nixos.org/build/233219668 at 2023-09-02
+  - apecs-brillo # failure in job https://hydra.nixos.org/build/324105789 at 2026-03-15
   - api-builder # failure in job https://hydra.nixos.org/build/233205755 at 2023-09-02
   - api-maker # failure in job https://hydra.nixos.org/build/252711269 at 2024-03-16
   - api-rpc-factom # failure in job https://hydra.nixos.org/build/233198474 at 2023-09-02
@@ -396,8 +398,10 @@ broken-packages:
   - based # failure in job https://hydra.nixos.org/build/233211900 at 2023-09-02
   - basement-cd # failure in job https://hydra.nixos.org/build/233191991 at 2023-09-02
   - basen # failure in job https://hydra.nixos.org/build/233210680 at 2023-09-02
+  - basesystems # failure in job https://hydra.nixos.org/build/324105845 at 2026-03-15
   - basex-client # failure in job https://hydra.nixos.org/build/233214592 at 2023-09-02
   - bash # failure in job https://hydra.nixos.org/build/252719390 at 2024-03-16
+  - basic # failure in job https://hydra.nixos.org/build/323973354 at 2026-03-12
   - basic-gps # failure in job https://hydra.nixos.org/build/252718385 at 2024-03-16
   - basics # failure in job https://hydra.nixos.org/build/236678238 at 2023-10-04
   - baskell # failure in job https://hydra.nixos.org/build/233246705 at 2023-09-02
@@ -970,6 +974,7 @@ broken-packages:
   - composite-opaleye # failure in job https://hydra.nixos.org/build/233256318 at 2023-09-02
   - composite-swagger # failure in job https://hydra.nixos.org/build/233258006 at 2023-09-02
   - composition-tree # failure in job https://hydra.nixos.org/build/233219116 at 2023-09-02
+  - comprehensions-ghc # failure in job https://hydra.nixos.org/build/323973363 at 2026-03-12
   - compressed # failure in job https://hydra.nixos.org/build/233214349 at 2023-09-02
   - compression # failure in job https://hydra.nixos.org/build/233250833 at 2023-09-02
   - compstrat # failure in job https://hydra.nixos.org/build/233255500 at 2023-09-02
@@ -1068,6 +1073,7 @@ broken-packages:
   - cooklang-hs # failure in job https://hydra.nixos.org/build/295092511 at 2025-04-22
   - copilot-bluespec # failure in job https://hydra.nixos.org/build/253685418 at 2024-03-31
   - copilot-frp-sketch # copilot >=3.7 && <3.8,
+  - copilot-sbv # failure in job https://hydra.nixos.org/build/323973373 at 2026-03-12
   - copilot-verifier # failure in job https://hydra.nixos.org/build/297024747 at 2025-05-14
   - copilot-visualizer # failure in job https://hydra.nixos.org/build/315095584 at 2025-11-29
   - copr # failure in job https://hydra.nixos.org/build/233252310 at 2023-09-02
@@ -1163,6 +1169,7 @@ broken-packages:
   - cuckoo # failure in job https://hydra.nixos.org/build/233210915 at 2023-09-02
   - cuckoo-filter # failure in job https://hydra.nixos.org/build/233226484 at 2023-09-02
   - cudd # failure in job https://hydra.nixos.org/build/252716117 at 2024-03-16
+  - cuddle # failure in job https://hydra.nixos.org/build/324115154 at 2026-03-15
   - curl-aeson # failure in job https://hydra.nixos.org/build/233210106 at 2023-09-02
   - curl-runnings # failure in job https://hydra.nixos.org/build/233258680 at 2023-09-02
   - curly-expander # failure in job https://hydra.nixos.org/build/307517676 at 2025-09-19
@@ -1261,7 +1268,6 @@ broken-packages:
   - database-migrate # failure in job https://hydra.nixos.org/build/233201597 at 2023-09-02
   - database-study # failure in job https://hydra.nixos.org/build/233222466 at 2023-09-02
   - datadog # failure in job https://hydra.nixos.org/build/233191124 at 2023-09-02
-  - dataframe # failure in job https://hydra.nixos.org/build/315095739 at 2025-11-29
   - DataIndex # failure in job https://hydra.nixos.org/build/233254506 at 2023-09-02
   - datalog # failure in job https://hydra.nixos.org/build/233242707 at 2023-09-02
   - datapacker # failure in job https://hydra.nixos.org/build/233206524 at 2023-09-02
@@ -1382,6 +1388,7 @@ broken-packages:
   - dictionaries # failure in job https://hydra.nixos.org/build/233210367 at 2023-09-02
   - dictparser # failure in job https://hydra.nixos.org/build/233215487 at 2023-09-02
   - diet # failure in job https://hydra.nixos.org/build/233259625 at 2023-09-02
+  - diff # failure in job https://hydra.nixos.org/build/323973376 at 2026-03-12
   - diff-gestalt # failure in job https://hydra.nixos.org/build/233195164 at 2023-09-02
   - diffcabal # failure in job https://hydra.nixos.org/build/233203648 at 2023-09-02
   - DifferentialEvolution # failure in job https://hydra.nixos.org/build/233230795 at 2023-09-02
@@ -1585,6 +1592,7 @@ broken-packages:
   - eflint # failure in job https://hydra.nixos.org/build/295122827 at 2025-04-22
   - egison-pattern-src-haskell-mode # failure in job https://hydra.nixos.org/build/295093048 at 2025-04-22
   - egison-quote # failure in job https://hydra.nixos.org/build/320478191 at 2026-01-30
+  - egison-tutorial # failure in job https://hydra.nixos.org/build/324115176 at 2026-03-15
   - ehaskell # failure in job https://hydra.nixos.org/build/233196183 at 2023-09-02
   - ehs # failure in job https://hydra.nixos.org/build/233234594 at 2023-09-02
   - eibd-client-simple # failure in job https://hydra.nixos.org/build/233225416 at 2023-09-02
@@ -1655,6 +1663,7 @@ broken-packages:
   - epanet-haskell # failure in job https://hydra.nixos.org/build/233197331 at 2023-09-02
   - epass # failure in job https://hydra.nixos.org/build/233194117 at 2023-09-02
   - ephemeral # failure in job https://hydra.nixos.org/build/321063329 at 2026-02-07
+  - ephemeral-pg # failure in job https://hydra.nixos.org/build/322985350 at 2026-03-11
   - epi-sim # failure in job https://hydra.nixos.org/build/233246076 at 2023-09-02
   - epic # failure in job https://hydra.nixos.org/build/233204921 at 2023-09-02
   - epoll # failure in job https://hydra.nixos.org/build/233247564 at 2023-09-02
@@ -1703,6 +1712,8 @@ broken-packages:
   - eved # failure in job https://hydra.nixos.org/build/233194319 at 2023-09-02
   - event # failure in job https://hydra.nixos.org/build/233209756 at 2023-09-02
   - event-driven # failure in job https://hydra.nixos.org/build/233233946 at 2023-09-02
+  - eventium-test-helpers
+  - eventium-testkit # failure in job https://hydra.nixos.org/build/324106739 at 2026-03-15
   - eventloop # failure in job https://hydra.nixos.org/build/295093203 at 2025-04-22
   - eventsource-api # failure in job https://hydra.nixos.org/build/233243220 at 2023-09-02
   - eventsourced # failure in job https://hydra.nixos.org/build/233192731 at 2023-09-02
@@ -1775,7 +1786,6 @@ broken-packages:
   - fadno-xml # failure in job https://hydra.nixos.org/build/307518209 at 2025-09-19
   - failable # failure in job https://hydra.nixos.org/build/252731566 at 2024-03-16
   - failable-list # failure in job https://hydra.nixos.org/build/233198924 at 2023-09-02
-  - failure # failure in job https://hydra.nixos.org/build/252738855 at 2024-03-16
   - failure-detector # failure in job https://hydra.nixos.org/build/233244451 at 2023-09-02
   - fake # failure in job https://hydra.nixos.org/build/233199052 at 2023-09-02
   - fake-type # failure in job https://hydra.nixos.org/build/233197081 at 2023-09-02
@@ -1921,6 +1931,7 @@ broken-packages:
   - fmark # failure in job https://hydra.nixos.org/build/233196159 at 2023-09-02
   - FModExRaw # failure in job https://hydra.nixos.org/build/233259032 at 2023-09-02
   - fn-extra # failure in job https://hydra.nixos.org/build/252737996 at 2024-03-16
+  - foldable1 # 2026-03-12  - 2captcha # failure in job https://hydra.nixos.org/build/233233765 at 2023-09-02
   - foldl-exceptions # failure in job https://hydra.nixos.org/build/252719821 at 2024-03-16
   - foldl-incremental # failure in job https://hydra.nixos.org/build/233201921 at 2023-09-02
   - foldl-statistics # failure in job https://hydra.nixos.org/build/233243724 at 2023-09-02
@@ -2334,6 +2345,7 @@ broken-packages:
   - grid # failure in job https://hydra.nixos.org/build/307518948 at 2025-09-19
   - gridfs # failure in job https://hydra.nixos.org/build/233213958 at 2023-09-02
   - grids # failure in job https://hydra.nixos.org/build/233218294 at 2023-09-02
+  - grisette-monad-coroutine # failure in job https://hydra.nixos.org/build/324107237 at 2026-03-15
   - grm # failure in job https://hydra.nixos.org/build/233259788 at 2023-09-02
   - groot # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237248418 at 2023-10-21
   - GroteTrap # failure in job https://hydra.nixos.org/build/233203176 at 2023-09-02
@@ -2501,6 +2513,7 @@ broken-packages:
   - HasChor # failure in job https://hydra.nixos.org/build/295090966 at 2025-04-22
   - hash # failure in job https://hydra.nixos.org/build/233219137 at 2023-09-02
   - hash-cons # failure in job https://hydra.nixos.org/build/307519073 at 2025-09-19
+  - hash-tree # failure in job https://hydra.nixos.org/build/324107337 at 2026-03-15
   - hashable-extras # failure in job https://hydra.nixos.org/build/233191748 at 2023-09-02
   - hashable-generics # failure in job https://hydra.nixos.org/build/233209175 at 2023-09-02
   - hashable-orphans # failure in job https://hydra.nixos.org/build/252738804 at 2024-03-16
@@ -2610,7 +2623,9 @@ broken-packages:
   - hasql-cursor-transaction # failure in job https://hydra.nixos.org/build/307610892 at 2025-09-19
   - hasql-effectful # failure in job https://hydra.nixos.org/build/252721674 at 2024-03-16
   - hasql-explain-tests # failure in job https://hydra.nixos.org/build/233247034 at 2023-09-02
+  - hasql-generate # failure in job https://hydra.nixos.org/build/324107360 at 2026-03-15
   - hasql-generic # failure in job https://hydra.nixos.org/build/233204654 at 2023-09-02
+  - hasql-mapping # failure in job https://hydra.nixos.org/build/324107379 at 2026-03-15
   - hasql-migration # failure in job https://hydra.nixos.org/build/295094132 at 2025-04-22
   - hasql-mover # failure in job https://hydra.nixos.org/build/295094128 at 2025-04-22
   - hasql-pipes # failure in job https://hydra.nixos.org/build/295094119 at 2025-04-22
@@ -2705,7 +2720,6 @@ broken-packages:
   - helisp # failure in job https://hydra.nixos.org/build/233221194 at 2023-09-02
   - helium-overture # failure in job https://hydra.nixos.org/build/295094176 at 2025-04-22
   - helix # failure in job https://hydra.nixos.org/build/233254335 at 2023-09-02
-  - hell # failure in job https://hydra.nixos.org/build/295094172 at 2025-04-22
   - helm # failure in job https://hydra.nixos.org/build/233251620 at 2023-09-02
   - help-esb # failure in job https://hydra.nixos.org/build/233202622 at 2023-09-02
   - hemkay # failure in job https://hydra.nixos.org/build/233227889 at 2023-09-02
@@ -2805,7 +2819,6 @@ broken-packages:
   - hint-server # failure in job https://hydra.nixos.org/build/233240346 at 2023-09-02
   - hinter # failure in job https://hydra.nixos.org/build/233245954 at 2023-09-02
   - hinterface # failure in job https://hydra.nixos.org/build/233250383 at 2023-09-02
-  - hip # failure in job https://hydra.nixos.org/build/307610903 at 2025-09-19
   - hipchat-hs # failure in job https://hydra.nixos.org/build/233198550 at 2023-09-02
   - Hipmunk # failure in job https://hydra.nixos.org/build/233259272 at 2023-09-02
   - hips # failure in job https://hydra.nixos.org/build/252728413 at 2024-03-16
@@ -2989,6 +3002,7 @@ broken-packages:
   - hs-excelx # failure in job https://hydra.nixos.org/build/233230761 at 2023-09-02
   - hs-fltk # failure in job https://hydra.nixos.org/build/233225244 at 2023-09-02
   - hs-gizapp # failure in job https://hydra.nixos.org/build/233248733 at 2023-09-02
+  - hs-hath # failure in job https://hydra.nixos.org/build/323973515 at 2026-03-12
   - hs-java # failure in job https://hydra.nixos.org/build/233224973 at 2023-09-02
   - hs-json-rpc # failure in job https://hydra.nixos.org/build/233217334 at 2023-09-02
   - hs-logo # failure in job https://hydra.nixos.org/build/233211298 at 2023-09-02
@@ -2996,16 +3010,7 @@ broken-packages:
   - hs-onnxruntime-capi # failure in job https://hydra.nixos.org/build/307519371 at 2025-09-19
   - hs-openmoji-data # failure in job https://hydra.nixos.org/build/295094356 at 2025-04-22
   - hs-opentelemetry-awsxray # failure in job https://hydra.nixos.org/build/295094396 at 2025-04-22
-  - hs-opentelemetry-exporter-handle # failure in job https://hydra.nixos.org/build/311053149 at 2025-11-02
-  - hs-opentelemetry-exporter-in-memory # failure in job https://hydra.nixos.org/build/311053165 at 2025-11-02
   - hs-opentelemetry-instrumentation-auto # failure in job https://hydra.nixos.org/build/253678404 at 2024-03-31
-  - hs-opentelemetry-instrumentation-conduit # failure in job https://hydra.nixos.org/build/311053155 at 2025-11-02
-  - hs-opentelemetry-instrumentation-hspec # failure in job https://hydra.nixos.org/build/311053154 at 2025-11-02
-  - hs-opentelemetry-instrumentation-persistent # failure in job https://hydra.nixos.org/build/311053162 at 2025-11-02
-  - hs-opentelemetry-instrumentation-postgresql-simple # failure in job https://hydra.nixos.org/build/311053156 at 2025-11-02
-  - hs-opentelemetry-instrumentation-tasty # failure in job https://hydra.nixos.org/build/311053195 at 2025-11-02
-  - hs-opentelemetry-instrumentation-wai # failure in job https://hydra.nixos.org/build/311053157 at 2025-11-02
-  - hs-opentelemetry-utils-exceptions # failure in job https://hydra.nixos.org/build/311053185 at 2025-11-02
   - hs-pattrans # failure in job https://hydra.nixos.org/build/233230577 at 2023-09-02
   - hs-pgms # failure in job https://hydra.nixos.org/build/233237693 at 2023-09-02
   - hs-pkg-config # failure in job https://hydra.nixos.org/build/233240839 at 2023-09-02
@@ -3223,6 +3228,7 @@ broken-packages:
   - hwall-auth-iitk # failure in job https://hydra.nixos.org/build/233217629 at 2023-09-02
   - hweblib # failure in job https://hydra.nixos.org/build/233250183 at 2023-09-02
   - hwhile # failure in job https://hydra.nixos.org/build/233206114 at 2023-09-02
+  - hwm # failure in job https://hydra.nixos.org/build/322986067 at 2026-03-11
   - hworker # failure in job https://hydra.nixos.org/build/233220098 at 2023-09-02
   - hwsl2 # failure in job https://hydra.nixos.org/build/233203941 at 2023-09-02
   - hx # failure in job https://hydra.nixos.org/build/233225223 at 2023-09-02
@@ -3231,6 +3237,7 @@ broken-packages:
   - hxt-pickle-utils # failure in job https://hydra.nixos.org/build/233212654 at 2023-09-02
   - hxthelper # failure in job https://hydra.nixos.org/build/282936106 at 2024-12-24 (> 10 years since last release)
   - hyakko # failure in job https://hydra.nixos.org/build/233199297 at 2023-09-02
+  - hydra # failure in job https://hydra.nixos.org/build/324107722 at 2026-03-15
   - hydra-hs # failure in job https://hydra.nixos.org/build/233238247 at 2023-09-02
   - hydrogen # failure in job https://hydra.nixos.org/build/233219053 at 2023-09-02
   - hydrogen-multimap # failure in job https://hydra.nixos.org/build/233241591 at 2023-09-02
@@ -3767,7 +3774,9 @@ broken-packages:
   - linear-accelerate # failure in job https://hydra.nixos.org/build/296049888 at 2025-05-02
   - linear-algebra-cblas # failure in job https://hydra.nixos.org/build/233239710 at 2023-09-02
   - linear-core-prototype # failure in job https://hydra.nixos.org/build/311053837 at 2025-11-02
+  - linear-free # failure in job https://hydra.nixos.org/build/322986262 at 2026-03-11
   - linear-maps # failure in job https://hydra.nixos.org/build/233258332 at 2023-09-02
+  - linear-massiv # failure in job https://hydra.nixos.org/build/324108008 at 2026-03-15
   - linear-socket # failure in job https://hydra.nixos.org/build/233192053 at 2023-09-02
   - linear-vect # failure in job https://hydra.nixos.org/build/233252054 at 2023-09-02
   - linearmap-category # failure in job https://hydra.nixos.org/build/236690982 at 2023-10-04
@@ -3810,6 +3819,8 @@ broken-packages:
   - list-t-text # failure in job https://hydra.nixos.org/build/233235451 at 2023-09-02
   - list-zip-def # failure in job https://hydra.nixos.org/build/233202564 at 2023-09-02
   - listlike-instances # failure in job https://hydra.nixos.org/build/233238303 at 2023-09-02
+  - ListT # failure in job https://hydra.nixos.org/build/323973336 at 2026-03-12
+  - literal-flake-input # failure in job https://hydra.nixos.org/build/322986332 at 2026-03-11
   - literals # failure in job https://hydra.nixos.org/build/233233709 at 2023-09-02
   - LiterateMarkdown # failure in job https://hydra.nixos.org/build/233233229 at 2023-09-02
   - little-earley # failure in job https://hydra.nixos.org/build/233197880 at 2023-09-02
@@ -4400,6 +4411,8 @@ broken-packages:
   - notmuch-haskell # failure in job https://hydra.nixos.org/build/233332618 at 2023-09-02
   - NoTrace # failure in job https://hydra.nixos.org/build/233229305 at 2023-09-02
   - notzero # failure in job https://hydra.nixos.org/build/233216133 at 2023-09-02
+  - nova-cache # failure in job https://hydra.nixos.org/build/324108475 at 2026-03-15
+  - nova-nix # failure in job https://hydra.nixos.org/build/322986559 at 2026-03-11
   - np-linear # failure in job https://hydra.nixos.org/build/233257696 at 2023-09-02
   - nptools # failure in job https://hydra.nixos.org/build/233234905 at 2023-09-02
   - ntha # failure in job https://hydra.nixos.org/build/252730602 at 2024-03-16
@@ -4604,6 +4617,7 @@ broken-packages:
   - pandoc-query # failure in job https://hydra.nixos.org/build/252730669 at 2024-03-16
   - pandoc-select-code # failure in job https://hydra.nixos.org/build/233238415 at 2023-09-02
   - pandoc-symreg # failure in job https://hydra.nixos.org/build/252726624 at 2024-03-16
+  - pandoc-typescript # failure in job https://hydra.nixos.org/build/322986648 at 2026-03-11
   - pandoc-unlit # failure in job https://hydra.nixos.org/build/233219811 at 2023-09-02
   - pandoc-utils # failure in job https://hydra.nixos.org/build/233203436 at 2023-09-02
   - PandocAgda # failure in job https://hydra.nixos.org/build/233332745 at 2023-09-02
@@ -4758,6 +4772,7 @@ broken-packages:
   - pg-transact # failure in job https://hydra.nixos.org/build/233253337 at 2023-09-02
   - pgdl # failure in job https://hydra.nixos.org/build/233203790 at 2023-09-02
   - pgf2 # failure in job https://hydra.nixos.org/build/233234332 at 2023-09-02
+  - pgmq-core # failure in job https://hydra.nixos.org/build/322986651 at 2026-03-11
   - pgp-wordlist # failure in job https://hydra.nixos.org/build/252723543 at 2024-03-16
   - pgsql-simple # failure in job https://hydra.nixos.org/build/233228421 at 2023-09-02
   - pgstream # failure in job https://hydra.nixos.org/build/233201596 at 2023-09-02
@@ -4853,6 +4868,7 @@ broken-packages:
   - PlayingCards # failure in job https://hydra.nixos.org/build/233239100 at 2023-09-02
   - playlists-http # failure in job https://hydra.nixos.org/build/295096180 at 2025-04-22
   - plegg # failure in job https://hydra.nixos.org/build/255679256 at 2024-04-16
+  - plexus-protocol # failure in job https://hydra.nixos.org/build/322986670 at 2026-03-11
   - plist # failure in job https://hydra.nixos.org/build/233233906 at 2023-09-02
   - plist-buddy # failure in job https://hydra.nixos.org/build/233199181 at 2023-09-02
   - plivo # failure in job https://hydra.nixos.org/build/233256647 at 2023-09-02
@@ -5367,7 +5383,6 @@ broken-packages:
   - reqcatcher # failure in job https://hydra.nixos.org/build/295096611 at 2025-04-22
   - request # failure in job https://hydra.nixos.org/build/233256702 at 2023-09-02
   - request-monad # failure in job https://hydra.nixos.org/build/233204896 at 2023-09-02
-  - require # failure in job https://hydra.nixos.org/build/233203170 at 2023-09-02
   - rescue # failure in job https://hydra.nixos.org/build/233230073 at 2023-09-02
   - reservoir # failure in job https://hydra.nixos.org/build/233194430 at 2023-09-02
   - resolve # failure in job https://hydra.nixos.org/build/233224070 at 2023-09-02
@@ -5407,6 +5422,7 @@ broken-packages:
   - rigel-viz # failure in job https://hydra.nixos.org/build/233251060 at 2023-09-02
   - ring-buffers # failure in job https://hydra.nixos.org/build/233259860 at 2023-09-02
   - rings # failure in job https://hydra.nixos.org/build/252730924 at 2024-03-16
+  - risc-v # 2026-03-12 (too strict bound on clash-prelude)
   - riscv-isa # failure in job https://hydra.nixos.org/build/233192811 at 2023-09-02
   - risk-weaver # failure in job https://hydra.nixos.org/build/295096664 at 2025-04-22
   - rison # failure in job https://hydra.nixos.org/build/233231694 at 2023-09-02
@@ -5464,6 +5480,7 @@ broken-packages:
   - ruff # failure in job https://hydra.nixos.org/build/233200285 at 2023-09-02
   - ruin # failure in job https://hydra.nixos.org/build/233247866 at 2023-09-02
   - run-haskell-module # failure in job https://hydra.nixos.org/build/307521638 at 2025-09-19
+  - runGhcBWrap-core # failure in job https://hydra.nixos.org/build/322986910 at 2026-03-11
   - runhs # failure in job https://hydra.nixos.org/build/233193983 at 2023-09-02
   - runmany # failure in job https://hydra.nixos.org/build/233241476 at 2023-09-02
   - runtime-instances # failure in job https://hydra.nixos.org/build/233217985 at 2023-09-02
@@ -5509,6 +5526,8 @@ broken-packages:
   - satyros # failure in job https://hydra.nixos.org/build/233199726 at 2023-09-02
   - savage # failure in job https://hydra.nixos.org/build/233213243 at 2023-09-02
   - sax # failure in job https://hydra.nixos.org/build/233218617 at 2023-09-02
+  - sbv-program # failure in job https://hydra.nixos.org/build/323973607 at 2026-03-12
+  - sbvPlugin # 2026-03-12
   - sc2-proto # failure in job https://hydra.nixos.org/build/252730301 at 2024-03-16
   - scale # failure in job https://hydra.nixos.org/build/233222189 at 2023-09-02
   - scaleimage # failure in job https://hydra.nixos.org/build/233240688 at 2023-09-02
@@ -5516,6 +5535,7 @@ broken-packages:
   - scgi # failure in job https://hydra.nixos.org/build/233247314 at 2023-09-02
   - schedevr # failure in job https://hydra.nixos.org/build/233240124 at 2023-09-02
   - schedule-planner # failure in job https://hydra.nixos.org/build/233192691 at 2023-09-02
+  - scheduling # failure in job https://hydra.nixos.org/build/323973618 at 2026-03-12
   - schedyield # failure in job https://hydra.nixos.org/build/233213288 at 2023-09-02
   - schemas # failure in job https://hydra.nixos.org/build/233225239 at 2023-09-02
   - scholdoc-types # failure in job https://hydra.nixos.org/build/233194927 at 2023-09-02
@@ -5540,6 +5560,7 @@ broken-packages:
   - screenshot-to-clipboard # failure in job https://hydra.nixos.org/build/307611311 at 2025-09-19
   - script-monad # failure in job https://hydra.nixos.org/build/233221600 at 2023-09-02
   - scrobble # failure in job https://hydra.nixos.org/build/233252277 at 2023-09-02
+  - scrod # failure in job https://hydra.nixos.org/build/322986912 at 2026-03-11
   - scroll-list # failure in job https://hydra.nixos.org/build/233217737 at 2023-09-02
   - scrz # failure in job https://hydra.nixos.org/build/233230705 at 2023-09-02
   - scythe # failure in job https://hydra.nixos.org/build/233259400 at 2023-09-02
@@ -5562,6 +5583,7 @@ broken-packages:
   - seclib # failure in job https://hydra.nixos.org/build/233203235 at 2023-09-02
   - second-transfer # failure in job https://hydra.nixos.org/build/233214725 at 2023-09-02
   - secp256k1 # failure in job https://hydra.nixos.org/build/233231129 at 2023-09-02
+  - secp256k1-haskell # failure in job https://hydra.nixos.org/build/323790174 at 2026-03-11
   - secp256k1-legacy # failure in job https://hydra.nixos.org/build/233197038 at 2023-09-02
   - secret-santa # failure in job https://hydra.nixos.org/build/233208686 at 2023-09-02
   - secure-memory # failure in job https://hydra.nixos.org/build/233226568 at 2023-09-02
@@ -5662,6 +5684,7 @@ broken-packages:
   - SessionLogger # failure in job https://hydra.nixos.org/build/233235790 at 2023-09-02
   - sessions # failure in job https://hydra.nixos.org/build/233214614 at 2023-09-02
   - sessiontypes # failure in job https://hydra.nixos.org/build/233224975 at 2023-09-02
+  - Set # 2026-03-12
   - set-monad # failure in job https://hydra.nixos.org/build/307521878 at 2025-09-19
   - set-of # failure in job https://hydra.nixos.org/build/233202960 at 2023-09-02
   - set-with # failure in job https://hydra.nixos.org/build/233209870 at 2023-09-02
@@ -5705,6 +5728,7 @@ broken-packages:
   - shellish # failure in job https://hydra.nixos.org/build/233217316 at 2023-09-02
   - shellmate # failure in job https://hydra.nixos.org/build/233217636 at 2023-09-02
   - shentong # failure in job https://hydra.nixos.org/build/252711957 at 2024-03-16
+  - shibuya-core # failure in job https://hydra.nixos.org/build/322987078 at 2026-03-11
   - shikensu # failure in job https://hydra.nixos.org/build/233230883 at 2023-09-02
   - shimmer # failure in job https://hydra.nixos.org/build/233192737 at 2023-09-02
   - shine-examples # failure in job https://hydra.nixos.org/build/233192871 at 2023-09-02
@@ -5794,6 +5818,7 @@ broken-packages:
   - skell # failure in job https://hydra.nixos.org/build/233245484 at 2023-09-02
   - skemmtun # failure in job https://hydra.nixos.org/build/233223893 at 2023-09-02
   - sketch-frp-copilot # copilot >=4.3 && <4.4,
+  - skews # unmaintained (?), tests time out https://hydra.nixos.org/build/324109291
   - skopedate # failure in job https://hydra.nixos.org/build/233220634 at 2023-09-02
   - skulk # failure in job https://hydra.nixos.org/build/233258672 at 2023-09-02
   - skylighting-extensions # failure in job https://hydra.nixos.org/build/233221387 at 2023-09-02
@@ -6334,6 +6359,7 @@ broken-packages:
   - streamproc # failure in job https://hydra.nixos.org/build/233196179 at 2023-09-02
   - streamt # failure in job https://hydra.nixos.org/build/252724093 at 2024-03-16
   - strelka-core # failure in job https://hydra.nixos.org/build/233218594 at 2023-09-02
+  - strict-checked-vars # failure in job https://hydra.nixos.org/build/324109460 at 2026-03-15
   - strict-containers # failure in job https://hydra.nixos.org/build/307522197 at 2025-09-19
   - strict-ghc-plugin # failure in job https://hydra.nixos.org/build/233246830 at 2023-09-02
   - strict-io # failure in job https://hydra.nixos.org/build/295097302 at 2025-04-22
@@ -6430,6 +6456,7 @@ broken-packages:
   - symantic-parser # failure in job https://hydra.nixos.org/build/233197879 at 2023-09-02
   - symantic-xml # failure in job https://hydra.nixos.org/build/233230860 at 2023-09-02
   - symbolic-link # failure in job https://hydra.nixos.org/build/233255331 at 2023-09-02
+  - symbolic-regression # failure in job https://hydra.nixos.org/build/322987224 at 2026-03-11
   - symengine # failure in job https://hydra.nixos.org/build/233203977 at 2023-09-02
   - symtegration # failure in job https://hydra.nixos.org/build/307522286 at 2025-09-19
   - sync # failure in job https://hydra.nixos.org/build/233254114 at 2023-09-02
@@ -6478,7 +6505,9 @@ broken-packages:
   - tahoe-great-black-swamp-types # failure in job https://hydra.nixos.org/build/252721139 at 2024-03-16
   - tai # failure in job https://hydra.nixos.org/build/233210483 at 2023-09-02
   - tai64 # failure in job https://hydra.nixos.org/build/233257422 at 2023-09-02
+  - tailwind # failure in job https://hydra.nixos.org/build/322987223 at 2026-03-11
   - Tainted # failure in job https://hydra.nixos.org/build/252722384 at 2024-03-16
+  - taiwan-id # failure in job https://hydra.nixos.org/build/324109532 at 2026-03-15
   - tak # failure in job https://hydra.nixos.org/build/233191188 at 2023-09-02
   - Takusen # failure in job https://hydra.nixos.org/build/233230088 at 2023-09-02
   - takusen-oracle # failure in job https://hydra.nixos.org/build/233197944 at 2023-09-02
@@ -6680,6 +6709,7 @@ broken-packages:
   - timeutils # failure in job https://hydra.nixos.org/build/233230513 at 2023-09-02
   - timezone-detect # failure in job https://hydra.nixos.org/build/233205213 at 2023-09-02
   - tini # failure in job https://hydra.nixos.org/build/252732072 at 2024-03-16
+  - tintin # failure in job https://hydra.nixos.org/build/322987320 at 2026-03-11
   - tiny-scheduler # failure in job https://hydra.nixos.org/build/233224849 at 2023-09-02
   - tinyapp # failure in job https://hydra.nixos.org/build/283207451 at 2024-12-31
   - tinyid # failure in job https://hydra.nixos.org/build/233249999 at 2023-09-02
@@ -6760,6 +6790,7 @@ broken-packages:
   - translatable-intset # failure in job https://hydra.nixos.org/build/233252531 at 2023-09-02
   - translate # failure in job https://hydra.nixos.org/build/233239029 at 2023-09-02
   - trasa # failure in job https://hydra.nixos.org/build/294586179 at 2025-04-09
+  - traversal-template # 2026-03-12
   - traverse-code # failure in job https://hydra.nixos.org/build/233236749 at 2023-09-02
   - travis # failure in job https://hydra.nixos.org/build/233230706 at 2023-09-02
   - travis-meta-yaml # failure in job https://hydra.nixos.org/build/233251064 at 2023-09-02
@@ -6794,6 +6825,7 @@ broken-packages:
   - ttn-client # failure in job https://hydra.nixos.org/build/233226059 at 2023-09-02
   - tttool # failure in job https://hydra.nixos.org/build/233234046 at 2023-09-02
   - tubes # failure in job https://hydra.nixos.org/build/233245507 at 2023-09-02
+  - tuispec # failure in job https://hydra.nixos.org/build/322987364 at 2026-03-11
   - tuntap # failure in job https://hydra.nixos.org/build/233199575 at 2023-09-02
   - tuple-append-instances # failure in job https://hydra.nixos.org/build/233256201 at 2023-09-02
   - tuple-fields # failure in job https://hydra.nixos.org/build/252721117 at 2024-03-16
@@ -6820,6 +6852,7 @@ broken-packages:
   - twitter-conduit # failure in job https://hydra.nixos.org/build/295097843 at 2025-04-22
   - twitter-feed # failure in job https://hydra.nixos.org/build/233251565 at 2023-09-02
   - tx # failure in job https://hydra.nixos.org/build/233223988 at 2023-09-02
+  - txt # 2026-03-12
   - txtblk # failure in job https://hydra.nixos.org/build/233219915 at 2023-09-02
   - TYB # failure in job https://hydra.nixos.org/build/233246075 at 2023-09-02
   - tyfam-witnesses # failure in job https://hydra.nixos.org/build/233191033 at 2023-09-02
@@ -6829,6 +6862,7 @@ broken-packages:
   - type-compare # failure in job https://hydra.nixos.org/build/233207530 at 2023-09-02
   - type-eq # failure in job https://hydra.nixos.org/build/233214388 at 2023-09-02
   - type-errors-pretty # failure in job https://hydra.nixos.org/build/233238808 at 2023-09-02
+  - type-fold # failure in job https://hydra.nixos.org/build/322987327 at 2026-03-11
   - type-indexed-queues # failure in job https://hydra.nixos.org/build/233197833 at 2023-09-02
   - type-int # failure in job https://hydra.nixos.org/build/233245978 at 2023-09-02
   - type-interpreter # failure in job https://hydra.nixos.org/build/233192182 at 2023-09-02
@@ -6856,6 +6890,7 @@ broken-packages:
   - typed-encoding # failure in job https://hydra.nixos.org/build/233208093 at 2023-09-02
   - typed-gui # failure in job https://hydra.nixos.org/build/309817848 at 2025-10-15
   - typed-process-effectful # failure in job https://hydra.nixos.org/build/236684332 at 2023-10-04
+  - typed-protocols # failure in job https://hydra.nixos.org/build/324109773 at 2026-03-15
   - typed-protocols-doc # failure in job https://hydra.nixos.org/build/311460024 at 2025-11-02
   - typed-session # failure in job https://hydra.nixos.org/build/270089993 at 2024-08-31
   - typed-session-state-algorithm # failure in job https://hydra.nixos.org/build/273462641 at 2024-10-01
@@ -6878,12 +6913,14 @@ broken-packages:
   - uAgda # failure in job https://hydra.nixos.org/build/233252487 at 2023-09-02
   - uberlast # failure in job https://hydra.nixos.org/build/233233074 at 2023-09-02
   - ucam-webauth-types # failure in job https://hydra.nixos.org/build/233260145 at 2023-09-02
+  - ucd # failure in job https://hydra.nixos.org/build/323973626 at 2026-03-12
   - ucl # failure in job https://hydra.nixos.org/build/233246651 at 2023-09-02
   - uconv # failure in job https://hydra.nixos.org/build/233215580 at 2023-09-02
   - udbus # failure in job https://hydra.nixos.org/build/233237275 at 2023-09-02
   - udp-conduit # failure in job https://hydra.nixos.org/build/233252067 at 2023-09-02
   - udp-streaming # failure in job https://hydra.nixos.org/build/233217795 at 2023-09-02
   - ueberzug # failure in job https://hydra.nixos.org/build/233205559 at 2023-09-02
+  - uhd # failure in job https://hydra.nixos.org/build/322987359 at 2026-03-11
   - uhexdump # failure in job https://hydra.nixos.org/build/233209647 at 2023-09-02
   - uhttpc # failure in job https://hydra.nixos.org/build/233232481 at 2023-09-02
   - ui-command # failure in job https://hydra.nixos.org/build/233223762 at 2023-09-02
@@ -6978,10 +7015,10 @@ broken-packages:
   - users-persistent # failure in job https://hydra.nixos.org/build/233258182 at 2023-09-02
   - users-postgresql-simple # failure in job https://hydra.nixos.org/build/252737462 at 2024-03-16
   - utc # failure in job https://hydra.nixos.org/build/233218307 at 2023-09-02
+  - utf # failure in job https://hydra.nixos.org/build/323973630 at 2026-03-12
   - utf8-conversions # failure in job https://hydra.nixos.org/build/233245725 at 2023-09-02
   - utf8-prelude # failure in job https://hydra.nixos.org/build/233240100 at 2023-09-02
   - utf8-validator # failure in job https://hydra.nixos.org/build/233211712 at 2023-09-02
-  - util # failure in job https://hydra.nixos.org/build/233234741 at 2023-09-02
   - util-logict # failure in job https://hydra.nixos.org/build/233215338 at 2023-09-02
   - util-plus # failure in job https://hydra.nixos.org/build/233231591 at 2023-09-02
   - util-primitive # failure in job https://hydra.nixos.org/build/233258861 at 2023-09-02
@@ -6995,6 +7032,7 @@ broken-packages:
   - vabal-lib # failure in job https://hydra.nixos.org/build/233198776 at 2023-09-02
   - vacuum # failure in job https://hydra.nixos.org/build/233238529 at 2023-09-02
   - vado # failure in job https://hydra.nixos.org/build/233202865 at 2023-09-02
+  - valid # failure in job https://hydra.nixos.org/build/323973634 at 2026-03-12
   - valid-names # failure in job https://hydra.nixos.org/build/233213115 at 2023-09-02
   - validated-types # failure in job https://hydra.nixos.org/build/233258079 at 2023-09-02
   - Validation # failure in job https://hydra.nixos.org/build/233253977 at 2023-09-02
@@ -7040,6 +7078,7 @@ broken-packages:
   - Verba # failure in job https://hydra.nixos.org/build/233237824 at 2023-09-02
   - verbalexpressions # failure in job https://hydra.nixos.org/build/233247870 at 2023-09-02
   - verdict # failure in job https://hydra.nixos.org/build/233238835 at 2023-09-02
+  - verifiable-expressions # failure in job https://hydra.nixos.org/build/323973629 at 2026-03-12
   - verify # failure in job https://hydra.nixos.org/build/233239874 at 2023-09-02
   - verilog # failure in job https://hydra.nixos.org/build/233211999 at 2023-09-02
   - verismith # failure in job https://hydra.nixos.org/build/299186734 at 2025-06-23
@@ -7073,6 +7112,7 @@ broken-packages:
   - vocoder # failure in job https://hydra.nixos.org/build/295122919 at 2025-04-22
   - vowpal-utils # failure in job https://hydra.nixos.org/build/233251505 at 2023-09-02
   - voyeur # failure in job https://hydra.nixos.org/build/233234792 at 2023-09-02
+  - vpq # failure in job https://hydra.nixos.org/build/323973628 at 2026-03-12
   - VRML # failure in job https://hydra.nixos.org/build/233256643 at 2023-09-02
   - vt-utils # failure in job https://hydra.nixos.org/build/233244619 at 2023-09-02
   - vte # failure in job https://hydra.nixos.org/build/233234429 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 8469662958ee..56bb238acddc 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -26,12 +26,17 @@
 # keep-sorted start skip_lines=1 case=no numeric=yes
 default-package-overrides:
   - chs-cabal == 0.1.1.2 # matches Cabal 3.12 (GHC 9.10)
+  # 2026-01-23: dataframe >= 0.3.3.7 uses random-1.3, which breaks dependency coherence on 25.11, whose default version is random-1.2
+  # TODO: when (likely in 25.x) Stackage bumps random to 1.3, review
+  - dataframe == 0.3.3.6
   # 2025-12-26: Needs to match egison-pattern-src from Stackage LTS
   - egison-pattern-src-th-mode < 0.2.2
   - extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10)
+  - futhark-server == 1.3.0.0 # required by futhark-0.25.36
   # 2026-01-30: Needs to match hasql from Stackage LTS 24
   - hasql-notifications < 0.2.5.0
   # 2026-02-04: as requested by ghcide >= 2.13
+  - hie-bios < 0.18.0
   - hiedb < 0.8.0
   # 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8
   # https://github.com/haskell-nix/hnix/pull/1112
@@ -44,6 +49,10 @@ default-package-overrides:
   # liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10)
   - liquidhaskell == 0.9.10.*
   - liquidhaskell-boot == 0.9.10.*
+  # 2025-03-07: HLS and many other pkgs don't support lsp >= 2.8 (yet)
+  - lsp < 2.8
+  - lsp-test < 0.18
+  - lsp-types < 2.4
   # Needs to match microlens == 0.4.* in Stackage LTS 24
   - microlens-pro < 0.2.0.4
   # We currently use pandoc-crossref with a patch to revert it to pandoc == 3.7.*,
@@ -98,6 +107,7 @@ extra-packages:
   - hasql-transaction < 1.1.1           # 2025-01-19: Needed for building postgrest
   - hlint == 3.6.*                      # 2025-04-14: needed for hls with ghc-lib-parser 9.6
   - hlint == 3.8.*                      # 2025-09-21: needed for hls with ghc-lib-parser 9.8
+  - hpack == 0.39.1                     # 2026-03-15: to match upstream stack-3.9.3
   - language-javascript == 0.7.0.0      # required by purescript
   - network-run == 0.4.0                # 2024-10-20: for GHC 9.10/network == 3.1.*
   - ormolu == 0.7.2.0                   # 2023-11-13: for ghc-lib-parser 9.6 compat
@@ -125,6 +135,7 @@ package-maintainers:
     - ghcjs-dom
     - ghcjs-dom-javascript
     - ghcjs-dom-jsaddle
+    - haskell-debugger
     - jsaddle
     - jsaddle-clib
     - jsaddle-dom
@@ -472,30 +483,31 @@ package-maintainers:
     - gopher-proxy
     # other packages I can help out for
     - cabal-install
-    - hledger
-    - pandoc
-    - systemd
+    - chatter
+    - citeproc
+    - diagrams
+    - envy
+    - Euterpea2
     - fast-logger
     - flat
-    - Euterpea2
-    - utc
-    - socket
     - gitit
-    - yarn-lock
-    - yarn2nix
-    - large-hashable
     - haskell-ci
-    - diagrams
-    - rel8
-    - regex-rure
-    - jacinda
-    - citeproc
-    - mighttpd2
-    # owothia
+    - hledger
     - irc-client
-    - chatter
-    - envy
+    - jacinda
     - krank
+    - large-hashable
+    - libriscv
+    - mighttpd2
+    - nix-serve-ng
+    - pandoc
+    - regex-rure
+    - rel8
+    - socket
+    - systemd
+    - utc
+    - yarn2nix
+    - yarn-lock
   t4ccer:
     - aeson-better-errors
     - cheapskate
@@ -949,3 +961,13 @@ dont-distribute-packages:
   - persistent-zookeeper # depends on hzk
   - pocket-dns # depends on persistent-zookeeper
   - zoovisitor # depends on zookeeper_mt, which depends on openssl-1.1
+
+  # These packages are deprecated due to the usage of opentracing which is a archived upstream.
+  - opentracing
+  - opentracing-wai
+  - opentracing-jaeger
+  - opentracing-zipkin-v2
+  - opentracing-zipkin-v1
+  - opentracing-http-client
+  - opentracing-zipkin-common
+  - lightstep-haskell # Lightstep opentracing library.
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 1a878bd18f99..87bbe230daa6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage LTS 24.29
+# Stackage LTS 24.34
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -23,7 +23,7 @@ default-package-overrides:
   - aeson-better-errors ==0.9.1.3
   - aeson-casing ==0.2.0.0
   - aeson-combinators ==0.1.2.2
-  - aeson-diff ==1.1.0.13
+  - aeson-diff ==1.1.0.15
   - aeson-gadt-th ==0.2.5.4
   - aeson-generic-compat ==0.0.2.0
   - aeson-jsonpath ==0.3.0.2
@@ -168,9 +168,9 @@ default-package-overrides:
   - beam-core ==0.10.4.0
   - beam-migrate ==0.5.3.2
   - beam-postgres ==0.5.4.4
-  - beam-sqlite ==0.5.5.0
-  - bech32 ==1.1.9
-  - bech32-th ==1.1.9
+  - beam-sqlite ==0.5.6.0
+  - bech32 ==1.1.10
+  - bech32-th ==1.1.10
   - bench ==1.0.13
   - bench-show ==0.3.2
   - benchpress ==0.2.3.0
@@ -206,7 +206,7 @@ default-package-overrides:
   - bits ==0.6
   - bits-extra ==0.0.2.3
   - bitset-word8 ==0.1.1.2
-  - bitvec ==1.1.5.0
+  - bitvec ==1.1.6.0
   - bitwise ==1.0.0.1
   - bitwise-enum ==1.0.1.2
   - Blammo ==2.1.3.0
@@ -229,7 +229,7 @@ default-package-overrides:
   - bm ==0.2.0.0
   - bmp ==1.2.6.4
   - bnb-staking-csvs ==0.2.2.0
-  - BNFC ==2.9.6.1
+  - BNFC ==2.9.6.2
   - BNFC-meta ==0.6.1
   - board-games ==0.4.0.1
   - bodhi ==0.1.0
@@ -266,7 +266,7 @@ default-package-overrides:
   - burrito ==2.0.1.16
   - butcher ==1.3.3.2
   - bv ==0.5
-  - bv-sized ==1.0.6
+  - bv-sized ==1.0.7
   - byte-count-reader ==0.10.1.12
   - byte-order ==0.1.3.1
   - byteable ==0.1.1
@@ -324,13 +324,13 @@ default-package-overrides:
   - capability ==0.5.0.1
   - cardano-coin-selection ==1.0.1
   - carray ==0.1.6.8
-  - casa-client ==0.0.3
+  - casa-client ==0.0.4
   - casa-types ==0.0.3
   - case-insensitive ==1.2.1.0
   - cased ==0.1.0.0
   - cases ==0.1.4.4
   - casing ==0.1.4.1
-  - cassava ==0.5.4.1
+  - cassava >= 0.5.4.0 && (> 0.5.5.0 || < 0.5.5.0) && < 0.6.0.0
   - cassava-conduit ==0.6.6
   - cassava-megaparsec ==2.1.1
   - cast ==0.1.0.2
@@ -364,7 +364,7 @@ default-package-overrides:
   - chell ==0.5.0.2
   - chell-hunit ==0.3.0.2
   - chimera ==0.4.1.0
-  - choice ==0.2.4.1
+  - choice ==0.2.4.2
   - chronologique ==0.3.1.3
   - chronos ==1.1.7.0
   - chunked-data ==0.3.1
@@ -457,7 +457,7 @@ default-package-overrides:
   - configurator-export ==0.1.0.1
   - constrained-categories ==0.4.2.0
   - constraint-tuples ==0.2
-  - constraints ==0.14.3
+  - constraints ==0.14.4
   - constraints-extras ==0.4.0.2
   - construct ==0.3.2
   - consumers ==2.3.3.1
@@ -516,7 +516,7 @@ default-package-overrides:
   - cryptohash-sha1 ==0.11.101.0
   - cryptohash-sha256 ==0.11.102.1
   - cryptohash-sha512 ==0.11.103.0
-  - crypton ==1.0.5
+  - crypton ==1.0.6
   - crypton-conduit ==0.2.3
   - crypton-connection ==0.4.5
   - crypton-pem ==0.3.0
@@ -575,7 +575,7 @@ default-package-overrides:
   - data-memocombinators ==0.5.1
   - data-msgpack ==0.0.13
   - data-msgpack-types ==0.0.3
-  - data-or ==1.0.0.7
+  - data-or ==1.0.0.12
   - data-ordlist ==0.4.7.0
   - data-prometheus ==0.1.0.0
   - data-ref ==0.1
@@ -587,8 +587,8 @@ default-package-overrides:
   - dataurl ==0.1.0.0
   - DAV ==1.3.4
   - dbcleaner ==0.1.3
-  - dbus ==1.4.1
-  - dbus-hslogger ==0.1.0.1
+  - dbus ==1.4.2
+  - dbus-hslogger ==0.1.1.0
   - debian ==4.0.5
   - debian-build ==0.10.2.1
   - debug-trace-var ==0.2.0
@@ -667,7 +667,7 @@ default-package-overrides:
   - distribution-opensuse ==1.1.4
   - distributive ==0.6.3
   - djinn-lib ==0.0.1.4
-  - djot ==0.1.2.4
+  - djot ==0.1.3
   - dl-fedora ==2.0.1
   - dlist ==1.0
   - dlist-instances ==0.1.1.1
@@ -685,7 +685,7 @@ default-package-overrides:
   - doctest-exitcode-stdio ==0.0.0.1
   - doctest-extract ==0.1.2
   - doctest-lib ==0.1.1.1
-  - doctest-parallel ==0.4
+  - doctest-parallel ==0.4.1
   - doldol ==0.4.1.2
   - domain ==0.1.1.5
   - domain-aeson ==0.1.1.3
@@ -739,7 +739,7 @@ default-package-overrides:
   - elerea ==2.9.0
   - elf ==0.31
   - eliminators ==0.9.5
-  - elm-bridge ==0.8.4
+  - elm-bridge ==0.8.5
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - elm-syntax ==0.3.3.0
@@ -839,11 +839,11 @@ default-package-overrides:
   - fields-json ==0.4.0.0
   - file-embed ==0.0.16.0
   - file-embed-lzma ==0.1
-  - file-io ==0.1.5
+  - file-io ==0.1.6
   - file-modules ==0.1.2.4
   - file-path-th ==0.1.0.0
   - filecache ==0.5.3
-  - filelock ==0.1.1.8
+  - filelock ==0.1.1.9
   - filemanip ==0.3.6.3
   - filepath-bytestring ==1.5.2.0.3
   - filepattern ==0.1.3
@@ -932,7 +932,7 @@ default-package-overrides:
   - generic-data-functions ==0.6.0
   - generic-data-surgery ==0.3.0.0
   - generic-deriving ==1.14.7
-  - generic-enumeration ==0.1.0.4
+  - generic-enumeration ==0.1.0.5
   - generic-functor ==1.1.0.0
   - generic-lens ==2.2.2.0
   - generic-lens-core ==2.2.1.0
@@ -995,7 +995,7 @@ default-package-overrides:
   - ghc-lib-parser-ex ==9.12.0.0
   - ghc-parser ==0.2.8.0
   - ghc-paths ==0.1.0.12
-  - ghc-source-gen ==0.4.6.0
+  - ghc-source-gen ==0.4.7.0
   - ghc-syntax-highlighter ==0.0.13.0
   - ghc-tcplugins-extra ==0.4.6
   - ghc-trace-events ==0.1.2.10
@@ -1050,8 +1050,8 @@ default-package-overrides:
   - git-lfs ==1.2.5
   - git-mediate ==1.1.0
   - githash ==0.1.7.0
-  - github ==0.30.0.1
-  - github-release ==2.0.0.17
+  - github ==0.30.0.2
+  - github-release ==2.0.0.18
   - github-rest ==1.2.1
   - github-types ==0.2.1
   - github-webhooks ==0.18.0
@@ -1167,7 +1167,7 @@ default-package-overrides:
   - graphite ==0.10.0.1
   - graphql ==1.5.0.2
   - graphql-client ==1.2.4
-  - graphql-spice ==1.0.6.0
+  - graphql-spice ==1.0.7.0
   - graphs ==0.7.3
   - graphula ==2.1.2.0
   - graphviz ==2999.20.2.1
@@ -1282,7 +1282,7 @@ default-package-overrides:
   - hidapi ==0.1.8
   - hinfo ==0.0.3.0
   - hinotify ==0.4.2
-  - hint ==0.9.0.8
+  - hint ==0.9.0.9
   - histogram-fill ==0.9.1.0
   - hjsmin ==0.2.1
   - hkd-default ==1.1.0.0
@@ -1314,7 +1314,7 @@ default-package-overrides:
   - hourglass-orphans ==0.1.0.0
   - hp2pretty ==0.10.1
   - hpack ==0.38.3
-  - hpc-codecov ==0.6.3.0
+  - hpc-codecov ==0.6.4.0
   - hpc-lcov ==1.2.0
   - HPDF ==1.7
   - hpke ==0.0.0
@@ -1361,15 +1361,15 @@ default-package-overrides:
   - hslua-typing ==0.1.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.7.9
+  - HsOpenSSL ==0.11.7.10
   - HsOpenSSL-x509-system ==0.1.0.4
-  - hspec ==2.11.16
-  - hspec-api ==2.11.16
+  - hspec ==2.11.17
+  - hspec-api ==2.11.17
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
   - hspec-contrib ==0.5.2
-  - hspec-core ==2.11.16
-  - hspec-discover ==2.11.16
+  - hspec-core ==2.11.17
+  - hspec-discover ==2.11.17
   - hspec-expectations ==0.8.4
   - hspec-expectations-json ==1.0.2.1
   - hspec-expectations-lifted ==0.10.0
@@ -1380,7 +1380,7 @@ default-package-overrides:
   - hspec-junit-formatter ==1.1.2.1
   - hspec-leancheck ==0.0.6
   - hspec-megaparsec ==2.2.1
-  - hspec-meta ==2.11.16
+  - hspec-meta ==2.11.17
   - hspec-need-env ==0.1.0.13
   - hspec-parsec ==0
   - hspec-smallcheck ==0.5.3
@@ -1418,7 +1418,7 @@ default-package-overrides:
   - http-io-streams ==0.1.7.2
   - http-link-header ==1.2.3
   - http-media ==0.8.1.1
-  - http-query ==0.1.3
+  - http-query ==0.1.3.1
   - http-reverse-proxy ==0.6.2.0
   - http-semantics ==0.3.0
   - http-streams ==0.8.9.9
@@ -1562,12 +1562,13 @@ default-package-overrides:
   - json-feed ==2.0.0.18
   - json-rpc ==1.1.2
   - json-spec ==1.1.1.2
-  - json-spec-elm ==0.4.0.6
-  - json-spec-elm-servant ==0.4.4.1
+  - json-spec-elm ==0.4.0.7
+  - json-spec-elm-servant ==0.4.4.3
   - json-spec-openapi ==1.0.1.3
   - json-stream ==0.4.6.0
   - jsonifier ==0.2.1.3
   - jsonpath ==0.3.0.0
+  - jsonrpc-tinyclient ==1.1.0.0
   - JuicyCairo ==0.1.0.1
   - JuicyPixels ==3.3.9
   - JuicyPixels-extra ==0.6.0
@@ -1596,7 +1597,7 @@ default-package-overrides:
   - knob ==0.2.2
   - koji ==0.0.2
   - koji-tool ==1.3.1
-  - kvitable ==1.1.1.0
+  - kvitable ==1.1.1.1
   - labels ==0.3.3
   - lackey ==2.0.0.12
   - lambdabot-core ==5.3.1.2
@@ -1605,7 +1606,7 @@ default-package-overrides:
   - lame ==0.2.2
   - language-avro ==0.1.4.0
   - language-bash ==0.11.1
-  - language-c ==0.10.1
+  - language-c ==0.10.2
   - language-c-quote ==0.13.0.2
   - language-c99 ==0.2.0
   - language-c99-simple ==0.3.0
@@ -1694,10 +1695,10 @@ default-package-overrides:
   - lockfree-queue ==0.2.4
   - log-base ==0.12.1.0
   - log-domain ==0.13.2
-  - logfloat ==0.14.0
+  - logfloat ==0.14.0.2
   - logger-thread ==0.1.0.2
   - logging ==3.0.6
-  - logging-effect ==1.4.1
+  - logging-effect ==1.4.2
   - logging-facade ==0.3.1
   - logging-facade-syslog ==1
   - logict ==0.8.2.0
@@ -1757,17 +1758,18 @@ default-package-overrides:
   - mbox-utility ==0.0.3.1
   - mcmc ==0.8.3.1
   - mcmc-types ==1.0.3
-  - mcp-server ==0.1.0.16
+  - mcp-server ==0.1.0.19
   - mealy ==0.5.1.1
   - med-module ==0.1.3
   - median-stream ==0.7.0.0
   - megaparsec ==9.7.0
   - megaparsec-tests ==9.7.0
   - melf ==1.3.1
-  - mem-info ==0.4.1.2
+  - mem-info ==0.4.2.0
   - membership ==0.0.1
   - memcache ==0.3.0.2
   - memory ==0.18.0
+  - memory-hexstring ==1.1.0.0
   - MemoTrie ==0.6.11
   - mempack ==0.1.2.0
   - mergeful ==0.3.0.0
@@ -1796,13 +1798,13 @@ default-package-overrides:
   - midi-music-box ==0.0.1.2
   - mighty-metropolis ==2.0.0
   - mime-mail ==0.5.1
-  - mime-mail-ses ==0.4.3
-  - mime-types ==0.1.2.1
+  - mime-mail-ses ==0.4.4
+  - mime-types ==0.1.2.2
   - minimal-configuration ==0.1.4
   - minimorph ==0.3.0.1
   - minisat ==0.1.4
   - minisat-solver ==0.1
-  - miniterion ==0.1.1.1
+  - miniterion ==0.1.2.1
   - miniutter ==0.5.1.2
   - minmax ==0.1.1.0
   - mintty ==0.1.4
@@ -1865,12 +1867,12 @@ default-package-overrides:
   - mongoDB ==2.7.1.4
   - mono-traversable ==1.0.21.0
   - mono-traversable-instances ==0.1.1.0
-  - monoid-extras ==0.7
+  - monoid-extras ==0.7.0.1
   - monoid-insertleft ==0.1.0.1
   - monoid-map ==0.2.0.1
   - monoid-subclasses ==1.2.6.1
   - monoid-transformer ==0.0.4
-  - monoidal-containers ==0.6.6.0
+  - monoidal-containers ==0.6.7.0
   - monoidal-functors ==0.2.3.0
   - monoidmap ==0.0.4.4
   - monoidmap-aeson ==0.0.0.6
@@ -1878,12 +1880,12 @@ default-package-overrides:
   - monoidmap-internal ==0.0.0.1
   - monoidmap-quickcheck ==0.0.0.3
   - more-containers ==0.2.2.2
-  - morpheus-graphql-app ==0.28.2
-  - morpheus-graphql-client ==0.28.2
-  - morpheus-graphql-code-gen-utils ==0.28.2
-  - morpheus-graphql-core ==0.28.2
-  - morpheus-graphql-server ==0.28.2
-  - morpheus-graphql-subscriptions ==0.28.2
+  - morpheus-graphql-app ==0.28.5
+  - morpheus-graphql-client ==0.28.5
+  - morpheus-graphql-code-gen-utils ==0.28.5
+  - morpheus-graphql-core ==0.28.5
+  - morpheus-graphql-server ==0.28.5
+  - morpheus-graphql-subscriptions ==0.28.5
   - moss ==0.2.0.1
   - mountpoints ==1.0.2
   - mpi-hs ==0.7.3.1
@@ -1918,7 +1920,7 @@ default-package-overrides:
   - n2o-nitro ==0.11.2
   - nagios-check ==0.3.2
   - named ==0.3.0.2
-  - named-text ==1.2.2.0
+  - named-text ==1.2.3.0
   - names-th ==0.3.0.1
   - nano-erl ==0.1.0.1
   - NanoID ==3.4.1.2
@@ -1942,7 +1944,7 @@ default-package-overrides:
   - netwire-input-glfw ==0.0.12
   - network ==3.2.8.0
   - network-bsd ==2.8.1.0
-  - network-byte-order ==0.1.7
+  - network-byte-order ==0.1.8
   - network-conduit-tls ==1.4.0.1
   - network-control ==0.1.7
   - network-house ==0.1.0.3
@@ -1958,7 +1960,7 @@ default-package-overrides:
   - network-transport-tcp ==0.8.6
   - network-transport-tests ==0.3.4
   - network-uri ==2.6.4.2
-  - network-uri-template ==0.1.1.4
+  - network-uri-template ==0.1.2.0
   - network-wait ==0.2.0.0
   - newtype ==0.2.2.1
   - newtype-generics ==0.6.2
@@ -2016,16 +2018,16 @@ default-package-overrides:
   - ogma-language-xmlspec ==1.7.0
   - ogma-spec ==1.7.0
   - old-locale ==1.0.0.7
-  - old-time ==1.1.0.5
+  - old-time ==1.1.1.0
   - ollama-haskell ==0.2.1.0
-  - om-doh ==0.1.0.4
-  - om-elm ==2.0.1.1
-  - om-fail ==0.1.0.6
-  - om-fork ==0.7.1.12
+  - om-doh ==0.1.0.5
+  - om-elm ==2.0.1.2
+  - om-fail ==0.1.0.7
+  - om-fork ==0.7.1.13
   - om-http ==0.5.0.1
-  - om-logging ==1.1.0.10
-  - om-show ==0.1.2.11
-  - om-time ==0.3.1.1
+  - om-logging ==1.1.0.11
+  - om-show ==0.1.2.12
+  - om-time ==0.3.1.2
   - once ==0.4
   - one-liner ==2.1.1
   - one-liner-instances ==0.1.3.0
@@ -2052,7 +2054,7 @@ default-package-overrides:
   - opml-conduit ==0.9.0.0
   - opt-env-conf ==0.9.0.0
   - optics ==0.4.2.1
-  - optics-core ==0.4.1.1
+  - optics-core ==0.4.2
   - optics-extra ==0.4.2.1
   - optics-operators ==0.1.0.1
   - optics-th ==0.4.1
@@ -2072,7 +2074,7 @@ default-package-overrides:
   - pager ==0.1.1.0
   - pagination ==0.2.2
   - pagure ==0.2.1
-  - pagure-cli ==0.2.2
+  - pagure-cli ==0.2.3
   - palette ==0.3.0.4
   - pandoc ==3.7.0.2
   - pandoc-cli ==3.7.0.2
@@ -2187,7 +2189,7 @@ default-package-overrides:
   - Plural ==0.0.2
   - pointed ==5.0.5
   - pointedlist ==0.6.1
-  - pointless-fun ==1.1.0.8
+  - pointless-fun ==1.1.0.13
   - poll ==0.0.0.2
   - poly ==0.5.1.0
   - poly-arity ==0.1.0
@@ -2202,7 +2204,7 @@ default-package-overrides:
   - pooled-io ==0.0.2.3
   - port-utils ==0.2.1.0
   - portable-lines ==0.1
-  - posix-paths ==0.3.0.0
+  - posix-paths ==0.3.0.1
   - posix-pty ==0.2.2
   - possibly ==1.0.0.0
   - post-mess-age ==0.2.1.0
@@ -2214,7 +2216,7 @@ default-package-overrides:
   - postgresql-migration ==0.2.1.8
   - postgresql-schema ==0.1.14
   - postgresql-simple ==0.7.0.1
-  - postgresql-syntax ==0.4.2
+  - postgresql-syntax ==0.4.3
   - postgresql-typed ==0.6.2.5
   - pptable ==0.3.0.0
   - pqueue ==1.5.0.0
@@ -2222,7 +2224,7 @@ default-package-overrides:
   - pred-set ==0.0.1
   - prefix-units ==0.3.0.1
   - prelude-compat ==0.0.0.2
-  - prelude-safeenum ==0.1.1.3
+  - prelude-safeenum ==0.1.1.8
   - pretty-class ==1.0.1.1
   - pretty-hex ==1.1
   - pretty-relative-time ==0.3.0.0
@@ -2313,7 +2315,7 @@ default-package-overrides:
   - quickcheck-quid ==0.0.1.8
   - quickcheck-simple ==0.1.1.1
   - quickcheck-special ==0.1.0.6
-  - quickcheck-state-machine ==0.10.2
+  - quickcheck-state-machine ==0.10.3
   - quickcheck-text ==0.1.2.1
   - quickcheck-transformer ==0.3.1.2
   - quickcheck-unicode ==1.0.1.0
@@ -2343,7 +2345,7 @@ default-package-overrides:
   - Rasterific ==0.7.5.4
   - rasterific-svg ==0.3.3.2
   - rate-limit ==1.4.3
-  - ratel ==2.0.0.17
+  - ratel ==2.0.0.18
   - ratel-wai ==2.0.0.12
   - ratio-int ==0.1.2
   - rattle ==0.2
@@ -2437,7 +2439,7 @@ default-package-overrides:
   - rhine-terminal ==1.5
   - rhythmic-sequences ==0.8.0.0
   - riak-protobuf ==0.25.0.0
-  - richenv ==0.1.0.3
+  - richenv ==0.1.0.4
   - rio ==0.1.24.0
   - rio-orphans ==0.1.2.0
   - rio-prettyprint ==0.1.8.0
@@ -2498,6 +2500,7 @@ default-package-overrides:
   - sayable ==1.2.6.0
   - sbp ==6.2.2
   - sbv ==11.7
+  - scale ==1.1.0.0
   - scalpel ==0.6.2.2
   - scalpel-core ==0.6.2.2
   - scanf ==0.1.0.0
@@ -2585,7 +2588,7 @@ default-package-overrides:
   - SHA ==1.6.4.4
   - shake ==0.19.9
   - shake-plus ==0.3.4.0
-  - shakespeare ==2.1.0.1
+  - shakespeare ==2.1.7.1
   - shakespeare-text ==1.1.0
   - shared-memory ==0.2.0.1
   - shell-conduit ==5.0.0
@@ -2637,7 +2640,7 @@ default-package-overrides:
   - skylighting ==0.14.7
   - skylighting-core ==0.14.7
   - skylighting-format-ansi ==0.1
-  - skylighting-format-blaze-html ==0.1.1.3
+  - skylighting-format-blaze-html ==0.1.2
   - skylighting-format-context ==0.1.0.2
   - skylighting-format-latex ==0.1
   - skylighting-format-typst ==0.1
@@ -2691,7 +2694,7 @@ default-package-overrides:
   - sqlite-simple ==0.4.19.0
   - squeather ==0.8.0.0
   - srcloc ==0.6.0.1
-  - srtree ==2.0.1.5
+  - srtree ==2.0.1.6
   - stache ==2.3.4
   - stack-all ==0.7.1
   - stack-clean-old ==0.5.2
@@ -2707,10 +2710,10 @@ default-package-overrides:
   - statistics ==0.16.5.0
   - statistics-linreg ==0.3
   - statsd-rupp ==0.5.0.1
-  - status-notifier-item ==0.3.1.0
+  - status-notifier-item ==0.3.2.10
   - step-function ==0.2.1
   - stitch ==0.6.0.0
-  - stm-chans ==3.0.0.9
+  - stm-chans ==3.0.0.11
   - stm-conduit ==4.0.1
   - stm-containers ==1.2.2
   - stm-delay ==0.1.1.2
@@ -2840,7 +2843,7 @@ default-package-overrides:
   - tasty-expected-failure ==0.12.3
   - tasty-fail-fast ==0.0.3
   - tasty-focus ==1.0.1
-  - tasty-golden ==2.3.5
+  - tasty-golden ==2.3.6
   - tasty-hedgehog ==1.4.0.2
   - tasty-hslua ==1.1.1.1
   - tasty-hspec ==1.2.0.4
@@ -2929,7 +2932,7 @@ default-package-overrides:
   - th-desugar ==1.17
   - th-env ==0.1.1
   - th-expand-syns ==0.4.12.0
-  - th-extras ==0.0.0.8
+  - th-extras ==0.0.0.9
   - th-lego ==0.3.0.3
   - th-lift ==0.8.7
   - th-lift-instances ==0.1.20
@@ -2956,7 +2959,7 @@ default-package-overrides:
   - tidal-core ==1.10.1
   - tidal-link ==1.2.0
   - tile ==0.3.0.0
-  - time-compat ==1.9.8
+  - time-compat ==1.9.9
   - time-domain ==0.1.0.5
   - time-lens ==0.4.0.2
   - time-locale-compat ==0.1.1.5
@@ -2976,7 +2979,7 @@ default-package-overrides:
   - titlecase ==1.0.1
   - tldr ==0.9.2
   - tls ==2.1.8
-  - tls-session-manager ==0.0.8
+  - tls-session-manager ==0.0.9
   - tlynx ==0.8.0.0
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
@@ -2997,7 +3000,7 @@ default-package-overrides:
   - torsor ==0.1.0.1
   - tracing ==0.0.7.4
   - transaction ==0.1.1.4
-  - transformers-base ==0.4.6
+  - transformers-base ==0.4.6.1
   - transformers-compat ==0.7.2
   - transformers-either ==0.1.4
   - traverse-with-class ==1.0.1.1
@@ -3069,7 +3072,7 @@ default-package-overrides:
   - unicode-show ==0.1.1.1
   - unicode-transforms ==0.4.0.1
   - unidecode ==0.1.0.4
-  - unification-fd ==0.12.0.2
+  - unification-fd ==0.12.0.3
   - union ==0.1.3
   - union-angle ==0.1.0.1
   - union-color ==0.1.4.0
@@ -3090,7 +3093,7 @@ default-package-overrides:
   - universe-instances-extended ==1.1.4
   - universe-reverse-instances ==1.1.2
   - universe-some ==1.2.2
-  - unix-bytestring ==0.4.0.3
+  - unix-bytestring ==0.4.0.4
   - unix-compat ==0.7.4.1
   - unix-time ==0.4.17
   - unjson ==0.15.4
@@ -3118,7 +3121,7 @@ default-package-overrides:
   - valida ==1.1.0
   - valida-base ==0.2.0
   - validate-input ==0.5.0.0
-  - validation ==1.1.3
+  - validation ==1.1.5
   - validation-selective ==0.2.0.0
   - validity ==0.12.1.0
   - validity-aeson ==0.2.0.5
@@ -3135,7 +3138,7 @@ default-package-overrides:
   - validity-unordered-containers ==0.2.0.3
   - validity-uuid ==0.1.0.3
   - validity-vector ==0.2.0.3
-  - valor ==1.0.0.0
+  - valor ==1.0.0.1
   - vary ==0.1.1.3
   - varying ==0.8.1.0
   - vault ==0.3.1.6
@@ -3178,7 +3181,7 @@ default-package-overrides:
   - vty-unix ==0.2.0.0
   - vty-windows ==0.2.0.3
   - wai ==3.2.4
-  - wai-app-static ==3.1.9
+  - wai-app-static ==3.1.9.1
   - wai-cli ==0.2.3
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.7
@@ -3216,6 +3219,13 @@ default-package-overrides:
   - web-routes ==0.27.16
   - web-routes-th ==0.22.8.3
   - web-view ==0.7.0
+  - web3 ==1.1.0.0
+  - web3-bignum ==1.1.0.0
+  - web3-crypto ==1.1.0.0
+  - web3-ethereum ==1.1.0.1
+  - web3-polkadot ==1.1.0.1
+  - web3-provider ==1.1.0.0
+  - web3-solidity ==1.1.0.0
   - webdriver ==0.12.0.1
   - webdriver-precore ==0.1.0.2
   - webdriver-wrapper ==0.2.0.1
@@ -3252,7 +3262,7 @@ default-package-overrides:
   - wl-pprint ==1.2.1
   - wl-pprint-annotated ==0.1.0.1
   - wl-pprint-text ==1.2.0.2
-  - wled-json ==0.1.0.2
+  - wled-json ==0.1.0.3
   - word-compat ==0.0.6
   - word-trie ==0.3.0
   - word-wrap ==0.5
@@ -3260,7 +3270,7 @@ default-package-overrides:
   - world-peace ==1.0.2.0
   - wrap ==0.0.0
   - wraxml ==0.5
-  - wreq ==0.5.4.3
+  - wreq ==0.5.4.4
   - wreq-stringless ==0.5.9.1
   - writer-cps-transformers ==0.5.6.1
   - ws ==0.0.6
@@ -3270,7 +3280,7 @@ default-package-overrides:
   - x11-xim ==0.0.9.0
   - Xauth ==0.1
   - xdg-basedir ==0.2.2
-  - xdg-desktop-entry ==0.1.1.2
+  - xdg-desktop-entry ==0.1.1.3
   - xdg-userdirs ==0.1.0.2
   - xeno ==0.6
   - xls ==0.1.3
@@ -3291,8 +3301,8 @@ default-package-overrides:
   - xmlbf-xmlhtml ==0.2.2
   - xmlgen ==0.6.2.2
   - xmlhtml ==0.2.5.4
-  - xmonad ==0.18.0
-  - xmonad-contrib ==0.18.1
+  - xmonad ==0.18.1
+  - xmonad-contrib ==0.18.2
   - xor ==0.0.1.4
   - xss-sanitize ==0.3.7.2
   - xxhash-ffi ==0.3.1
@@ -3313,9 +3323,9 @@ default-package-overrides:
   - yesod-auth-hashdb ==1.7.1.7
   - yesod-auth-oauth2 ==0.7.4.0
   - yesod-bin ==1.6.2.3
-  - yesod-core ==1.6.28.1
+  - yesod-core ==1.6.29.1
   - yesod-eventsource ==1.6.0.1
-  - yesod-form ==1.7.9
+  - yesod-form ==1.7.9.2
   - yesod-form-bootstrap4 ==3.0.1.1
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.2
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index 154e3812ff1e..585b490011b6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -4,6 +4,7 @@
 # depend on a dependency marked as broken.
 dont-distribute-packages:
 
+ - 4Blocks
  - a50
  - abcBridge
  - AbortT-monadstf
@@ -11,15 +12,6 @@ dont-distribute-packages:
  - ac-machine-conduit
  - accelerate-arithmetic
  - accelerate-fourier
- - accelerate-io
- - accelerate-io-array
- - accelerate-io-bmp
- - accelerate-io-bytestring
- - accelerate-io-cereal
- - accelerate-io-JuicyPixels
- - accelerate-io-repa
- - accelerate-io-serialise
- - accelerate-io-vector
  - accelerate-llvm
  - accelerate-llvm-native
  - accelerate-typelits
@@ -64,6 +56,7 @@ dont-distribute-packages:
  - algorithmic-composition-complex
  - algorithmic-composition-frequency-shift
  - algorithmic-composition-overtones
+ - algraph
  - AlignmentAlgorithms
  - alloy-proxy-fd
  - alms
@@ -153,6 +146,7 @@ dont-distribute-packages:
  - attenuation-profunctors
  - AttoJson
  - attoparsec-enumerator
+ - attoparsec-isotropic
  - attoparsec-iteratee
  - attoparsec-text-enumerator
  - atuin
@@ -210,7 +204,6 @@ dont-distribute-packages:
  - base32-bytestring
  - baserock-schema
  - BASIC
- - basic
  - batchd
  - batchd-core
  - batchd-docker
@@ -223,6 +216,7 @@ dont-distribute-packages:
  - bbi
  - bdcs
  - bdcs-api
+ - beam-duckdb
  - beam-th
  - beautifHOL
  - bech32-th
@@ -312,6 +306,8 @@ dont-distribute-packages:
  - blunt
  - bno055-haskell
  - bogre-banana
+ - bolty
+ - bolty-streamly
  - bond
  - bond-haskell
  - bond-haskell-compiler
@@ -507,7 +503,6 @@ dont-distribute-packages:
  - color-counter
  - colorless-http-client
  - colorless-scotty
- - colour-accelerate
  - colour-space
  - columbia
  - columnar
@@ -535,7 +530,6 @@ dont-distribute-packages:
  - composite-tuple
  - composite-xml
  - composite-xstep
- - comprehensions-ghc
  - computational-algebra
  - concraft
  - concraft-hr
@@ -590,7 +584,6 @@ dont-distribute-packages:
  - convertible-text
  - coordinate
  - copilot-cbmc
- - copilot-sbv
  - CoreFoundation
  - coroutine-enumerator
  - coroutine-iteratee
@@ -600,14 +593,12 @@ dont-distribute-packages:
  - cprng-aes
  - cprng-aes-effect
  - cql-io-tinylog
- - cql_4_1_0_0
  - cqrs-example
  - cqrs-memory
  - cqrs-postgresql
  - cqrs-sqlite3
  - cqrs-test
  - cqrs-testkit
- - crackNum
  - craft
  - craftwerk-cairo
  - craftwerk-gtk
@@ -672,8 +663,6 @@ dont-distribute-packages:
  - datadog-tracing
  - datafix
  - dataflow
- - dataframe-hasktorch
- - dataframe-persistent
  - datasets
  - date-conversions
  - dbjava
@@ -741,7 +730,6 @@ dont-distribute-packages:
  - diagrams-html5
  - diagrams-wx
  - dialog
- - diff
  - difference-monoid
  - DifferenceLogic
  - differential
@@ -765,7 +753,6 @@ dont-distribute-packages:
  - distribution-plot
  - dixi
  - dl-fedora
- - dl-fedora_2_2
  - dmenu-pkill
  - dmenu-pmount
  - dmenu-search
@@ -864,7 +851,6 @@ dont-distribute-packages:
  - ersatz-viz
  - esotericbot
  - EsounD
- - esqueleto-postgis
  - esqueleto-streaming
  - estreps
  - Etage-Graph
@@ -889,12 +875,9 @@ dont-distribute-packages:
  - eventful-sql-common
  - eventful-sqlite
  - eventful-test-helpers
- - eventium-core
  - eventium-memory
  - eventium-postgresql
- - eventium-sql-common
  - eventium-sqlite
- - eventium-test-helpers
  - eventlog-live-otelcol
  - EventSocket
  - eventsource-geteventstore-store
@@ -907,7 +890,6 @@ dont-distribute-packages:
  - every-bit-counts
  - exact-kantorovich
  - exference
- - exist
  - exist-instances
  - existential
  - expand
@@ -925,7 +907,6 @@ dont-distribute-packages:
  - factual-api
  - fadno
  - FailureT
- - fair
  - fallingblocks
  - family-tree
  - fast-arithmetic
@@ -945,7 +926,6 @@ dont-distribute-packages:
  - fay-uri
  - fay-websockets
  - fbrnch
- - fbrnch_1_8
  - fcd
  - FComp
  - feature-flipper-postgres
@@ -1007,9 +987,9 @@ dont-distribute-packages:
  - fluid-idl-scotty
  - FM-SBLEX
  - fmt-for-rio
- - foldable1
  - foldl-transduce-attoparsec
  - follower
+ - fontwhich
  - foo
  - Forestry
  - FormalGrammars
@@ -1152,6 +1132,7 @@ dont-distribute-packages:
  - glazier-react-examples
  - glazier-react-widget
  - glean
+ - glean-lsp
  - GLFW-OGL
  - GLFW-task
  - global
@@ -1226,8 +1207,6 @@ dont-distribute-packages:
  - grid-proto
  - gridbounds
  - gridland
- - grisette
- - grisette-monad-coroutine
  - gross
  - groundhog-converters
  - groundhog-inspector
@@ -1336,7 +1315,6 @@ dont-distribute-packages:
  - HasGP
  - hash-addressed
  - hash-addressed-cli
- - hashable-accelerate
  - Hashell
  - hashflare
  - hask-home
@@ -1401,9 +1379,14 @@ dont-distribute-packages:
  - haskgame
  - hasklepias
  - haskoin-bitcoind
+ - haskoin-core
  - haskoin-crypto
+ - haskoin-node
  - haskoin-protocol
  - haskoin-script
+ - haskoin-store
+ - haskoin-store-data
+ - haskoin-wallet
  - haskoon
  - haskoon-httpspec
  - haskoon-salvia
@@ -1601,7 +1584,6 @@ dont-distribute-packages:
  - hoppy-runtime
  - hoppy-std
  - horde-ad
- - hotel-california
  - hotswap
  - hp2any-graph
  - hp2any-manager
@@ -1642,11 +1624,7 @@ dont-distribute-packages:
  - hs-ffmpeg
  - hs-functors
  - hs-gen-iface
- - hs-hath
  - hs-ix
- - hs-opentelemetry-instrumentation-cloudflare
- - hs-opentelemetry-instrumentation-http-client
- - hs-opentelemetry-instrumentation-yesod
  - hs-profunctors
  - hs-sdl-term-emulator
  - hs2ats
@@ -1775,7 +1753,6 @@ dont-distribute-packages:
  - hylotab
  - hyloutils
  - hyperbole
- - hyperbole_0_6_0
  - hyperpublic
  - ide-backend
  - ide-backend-server
@@ -1785,10 +1762,8 @@ dont-distribute-packages:
  - identicon-style-squares
  - idna
  - iException
- - ifscs
  - ige-mac-integration
  - igrf
- - ihaskell-dataframe
  - ihaskell-rlangqq
  - ihaskell-symtegration
  - ihttp
@@ -2036,6 +2011,7 @@ dont-distribute-packages:
  - layered-state
  - layouting
  - lazy-hash-cache
+ - lazy-scope
  - lda
  - ldap-scim-bridge
  - ldapply
@@ -2074,7 +2050,6 @@ dont-distribute-packages:
  - lighttpd-conf
  - lighttpd-conf-qq
  - linear-code
- - linearEqSolver
  - linearscan-hoopl
  - LinearSplit
  - LinkChecker
@@ -2093,7 +2068,6 @@ dont-distribute-packages:
  - list-t-html-parser
  - list-tuple
  - listenbrainz-client
- - ListT
  - liszt
  - lit
  - live-sequencer
@@ -2237,12 +2211,14 @@ dont-distribute-packages:
  - metro-transport-xor
  - metronome
  - MFlow
+ - mfmts
  - Mhailist
  - Michelangelo
  - micro-gateway
  - microformats2-types
  - MicrosoftTranslator
  - midimory
+ - mig-rio
  - mig-server
  - mighttpd
  - minecraft-data
@@ -2371,7 +2347,6 @@ dont-distribute-packages:
  - MutationOrder
  - mute-unmute
  - mvclient
- - mwc-random-accelerate
  - mwc-random-monad
  - mxnet-dataiter
  - mxnet-examples
@@ -2526,6 +2501,7 @@ dont-distribute-packages:
  - overload
  - pa-json
  - package-o-tron
+ - packstream-bolt
  - padKONTROL
  - PageIO
  - Paillier
@@ -2576,7 +2552,6 @@ dont-distribute-packages:
  - penny-bin
  - penny-lib
  - peparser
- - perceptual-hash
  - perdure
  - perf-analysis
  - perfecthash
@@ -2592,12 +2567,15 @@ dont-distribute-packages:
  - persistent-hssqlppp
  - persistent-iproute
  - persistent-map
- - persistent-postgresql_2_14_3_0
  - persistent-protobuf
  - persona-idp
  - peyotls
  - peyotls-codec
  - pg-entity
+ - pgmq-config
+ - pgmq-effectful
+ - pgmq-hasql
+ - pgmq-migration
  - phatsort
  - phladiprelio-general-shared
  - phladiprelio-general-simple
@@ -2642,6 +2620,7 @@ dont-distribute-packages:
  - piyo
  - pkgtreediff
  - planet-mitchell
+ - plexus-synapse
  - plocketed
  - Plot-ho-matic
  - PlslTools
@@ -2836,7 +2815,6 @@ dont-distribute-packages:
  - rallod
  - randfile
  - random-access-file
- - random-class
  - random-effin
  - random-extras
  - random-hypergeometric
@@ -2883,6 +2861,7 @@ dont-distribute-packages:
  - refh
  - reflex-animation
  - reflex-backend-wai
+ - reflex-classhss
  - reflex-gloss-scene
  - reflex-libtelnet
  - reflex-localize
@@ -2960,7 +2939,6 @@ dont-distribute-packages:
  - riot
  - ripple
  - ripple-federation
- - risc-v
  - rivet
  - RJson
  - rlwe-challenges
@@ -2994,7 +2972,6 @@ dont-distribute-packages:
  - roundtrip-xml
  - route-generator
  - route-planning
- - row
  - rpc
  - rpf
  - rsagl
@@ -3008,7 +2985,6 @@ dont-distribute-packages:
  - s-expression
  - S3
  - safe-coupling
- - safe-failure
  - safe-failure-cme
  - safe-plugins
  - safer-file-handles
@@ -3031,7 +3007,6 @@ dont-distribute-packages:
  - sandwich-contexts-kubernetes
  - sandwich-contexts-minio
  - sandwich-webdriver
- - sandwich-webdriver_0_4_0_2
  - sarsi
  - sasl
  - sat-micro-hs
@@ -3040,8 +3015,6 @@ dont-distribute-packages:
  - satchmo-toysat
  - sauron
  - SBench
- - sbv-program
- - sbvPlugin
  - sc2-lowlevel
  - sc2-support
  - sc2hs
@@ -3052,7 +3025,6 @@ dont-distribute-packages:
  - scalpel-search
  - scan-metadata
  - scan-vector-machine
- - scheduling
  - schematic
  - scholdoc
  - scholdoc-citeproc
@@ -3143,7 +3115,6 @@ dont-distribute-packages:
  - servant-zeppelin-server
  - servant-zeppelin-swagger
  - sessiontypes-distributed
- - Set
  - SFML-control
  - SFont
  - SGdemo
@@ -3165,6 +3136,8 @@ dont-distribute-packages:
  - Shellac-haskeline
  - Shellac-readline
  - shellmate-extras
+ - shibuya-metrics
+ - shibuya-pgmq-adapter
  - shine-varying
  - short-vec
  - short-vec-lens
@@ -3203,7 +3176,6 @@ dont-distribute-packages:
  - SimpleLog
  - SimpleServer
  - simseq
- - singletons-base_3_5_1
  - singletons-presburger
  - siphon
  - siren-json
@@ -3226,7 +3198,6 @@ dont-distribute-packages:
  - smith-cli
  - smith-client
  - Smooth
- - smt
  - smtlib2-debug
  - smtlib2-pipe
  - smtlib2-quickcheck
@@ -3305,6 +3276,7 @@ dont-distribute-packages:
  - sqlcli-odbc
  - sqlite-simple-interpolate
  - sqlite-simple-typed
+ - squealgen
  - squeeze
  - srt-dhall
  - srt-formatting
@@ -3399,10 +3371,10 @@ dont-distribute-packages:
  - symantic-http-test
  - symantic-lib
  - symbiote
- - symbolic-regression
  - symmetry-operations-symbols
  - Synapse
  - synapse
+ - synapse-cc
  - syncthing-hs
  - syntax
  - syntax-attoparsec
@@ -3486,7 +3458,6 @@ dont-distribute-packages:
  - timeprint
  - timezone-unix
  - tinkoff-invest-sdk
- - tintin
  - tinytools-vty
  - tip-haskell-frontend
  - tip-lib
@@ -3516,6 +3487,7 @@ dont-distribute-packages:
  - toxcore-c
  - toysolver
  - tpb
+ - trace-embrace
  - tracing-control
  - trajectory
  - trans-fx-data
@@ -3531,7 +3503,6 @@ dont-distribute-packages:
  - trasa-form
  - trasa-server
  - trasa-th
- - traversal-template
  - TreeCounter
  - treemap-html-tools
  - treersec
@@ -3564,7 +3535,6 @@ dont-distribute-packages:
  - twill
  - twirl
  - twitter-enumerator
- - txt
  - type-assertions
  - type-cache
  - type-cereal
@@ -3590,7 +3560,6 @@ dont-distribute-packages:
  - u2f
  - uber
  - ucam-webauth
- - ucd
  - udbus-model
  - uhc-light
  - uhc-util
@@ -3638,7 +3607,6 @@ dont-distribute-packages:
  - usb-id-database
  - usb-iteratee
  - usb-safe
- - utf
  - UTFTConverter
  - util-exception
  - util-primitive-control
@@ -3658,7 +3626,6 @@ dont-distribute-packages:
  - vacuum-graphviz
  - vacuum-opengl
  - vacuum-ubigraph
- - valid
  - validated-literals
  - variable-media-field-dhall
  - variable-media-field-optics
@@ -3675,7 +3642,6 @@ dont-distribute-packages:
  - vectortiles
  - venzone
  - verdict-json
- - verifiable-expressions
  - versioning-servant
  - vertexenum
  - vflow-types
@@ -3693,7 +3659,7 @@ dont-distribute-packages:
  - vocoder-dunai
  - voicebase
  - vorbiscomment
- - vpq
+ - vpn-router
  - vty-ui-extras
  - waargonaut
  - wahsp
@@ -3736,12 +3702,12 @@ dont-distribute-packages:
  - web3-polkadot
  - web3-provider
  - web3-solidity
+ - web3-tools
  - WebBits-Html
  - WebBits-multiplate
  - WebCont
  - webcrank-wai
  - webdriver-w3c
- - webdriver_0_14_0_0
  - webify
  - webserver
  - websnap
@@ -3906,4 +3872,3 @@ dont-distribute-packages:
  - zoovisitor
  - zuramaru
  - zwirn
- - _4Blocks
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 8c596d8e66bb..25dd807fab28 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -29,6 +29,7 @@
 
 let
   inherit (pkgs) lib;
+  canExecute = pkgs.stdenv.buildPlatform.canExecute pkgs.stdenv.hostPlatform;
 in
 
 with haskellLib;
@@ -56,10 +57,18 @@ builtins.intersectAttrs super {
   ### HASKELL-LANGUAGE-SERVER SECTION ###
   #######################################
 
-  cabal-add = overrideCabal (drv: {
-    # tests depend on executable
-    preCheck = ''export PATH="$PWD/dist/build/cabal-add:$PATH"'';
-  }) super.cabal-add;
+  cabal-add =
+    # Can't find executable without https://github.com/haskell/cabal/pull/9912
+    if lib.versionOlder self.ghc.version "9.12" then
+      overrideCabal (drv: {
+        # tests depend on executable
+        preCheck = ''
+          ${drv.preCheck or ""}
+          export PATH="$PWD/dist/build/cabal-add:$PATH"
+        '';
+      }) super.cabal-add
+    else
+      super.cabal-add;
 
   haskell-language-server = overrideCabal (drv: {
     # starting with 1.6.1.1 haskell-language-server wants to be linked dynamically
@@ -96,6 +105,16 @@ builtins.intersectAttrs super {
   # ghcide-bench tests need network
   ghcide-bench = dontCheck super.ghcide-bench;
 
+  # Test suite scredit-test uses `cabal run`.
+  screp = overrideCabal {
+    testTargets = [ "screp-test" ];
+  } super.screp;
+
+  # `integration` test suite requires a running MySQL server (?)
+  mysql-haskell = overrideCabal {
+    testTargets = [ "test" ];
+  } super.mysql-haskell;
+
   # 2023-04-01: TODO: Either reenable at least some tests or remove the preCheck override
   ghcide = overrideCabal (drv: {
     # tests depend on executable
@@ -317,6 +336,9 @@ builtins.intersectAttrs super {
     ];
   }) super.arbtt;
 
+  # Needs to execute `git` while compiling the test suite?!
+  quick-process = addTestToolDepends [ pkgs.buildPackages.git ] super.quick-process;
+
   hzk = appendConfigureFlag "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" super.hzk;
 
   # Foreign dependency name clashes with another Haskell package.
@@ -325,6 +347,26 @@ builtins.intersectAttrs super {
   # Heist's test suite requires system pandoc
   heist = addTestToolDepend pkgs.pandoc super.heist;
 
+  pandoc = lib.pipe super.pandoc [
+    # pandoc can't do I/O (including reading data files). See
+    # <https://pandoc.org/pandoc-server.html#description>.
+    # It's simpler to just enable this globally rather than building multiple pandocs.
+    (enableCabalFlag "embed_data_files")
+    # pandoc still references these data files and we can't prevent their installation.
+    # pkgs.pandoc removes the reference to $out, so having everything in one place is best.
+    (overrideCabal { enableSeparateDataOutput = false; })
+  ];
+
+  # So pandoc-server can be used:
+  # https://pandoc.org/MANUAL.html#running-pandoc-as-a-web-server
+  # TODO(@sternenseemann): provide pandoc-server.cgi symlink?
+  pandoc-cli = overrideCabal (drv: {
+    postInstall = ''
+      ${drv.postInstall or ""}
+      ln -s "''${!outputBin}/bin/pandoc" "''${!outputBin}/bin/pandoc-server"
+    '';
+  }) super.pandoc-cli;
+
   # Use Nixpkgs' double-conversion library
   double-conversion = disableCabalFlag "embedded_double_conversion" (
     addBuildDepends [ pkgs.double-conversion ] super.double-conversion
@@ -425,6 +467,14 @@ builtins.intersectAttrs super {
           )
       );
 
+  # Requires postgresql with postgis and predefined geometry type
+  esqueleto-postgis = overrideCabal (drv: {
+    testFlags = drv.testFlags or [ ] ++ [
+      "-p"
+      "!/roundtrip xy geometry/ && !/roundtrip xyz geometry/ && !/roundtryp xyzm geometry/ && !/function bindings/"
+    ];
+  }) super.esqueleto-postgis;
+
   shelly = overrideCabal (drv: {
     # /usr/bin/env is unavailable in the sandbox
     preCheck = drv.preCheck or "" + ''
@@ -477,6 +527,7 @@ builtins.intersectAttrs super {
   network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
   oidc-client = dontCheck super.oidc-client; # the spec runs openid against google.com
   persistent-migration = dontCheck super.persistent-migration; # spec requires pg_ctl binary
+  notion-client = dontCheck super.notion-client;
   pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw
   pixiv = dontCheck super.pixiv;
   riak = dontCheck super.riak; # http://hydra.cryp.to/build/498763/log/raw
@@ -655,7 +706,7 @@ builtins.intersectAttrs super {
   # Wants to check against a real DB, Needs freetds
   odbc = dontCheck (addExtraLibraries [ pkgs.freetds ] super.odbc);
 
-  # Tests attempt to use NPM to install from the network into
+  # Tests attempt to use npm to install from the network into
   # /homeless-shelter. Disabled.
   purescript = dontCheck super.purescript;
 
@@ -1003,6 +1054,13 @@ builtins.intersectAttrs super {
     ];
   }) super.lsp-test;
 
+  lsp_2_8_0_0 = doDistribute (
+    super.lsp_2_8_0_0.override {
+      lsp-types = self.lsp-types_2_4_0_0;
+    }
+  );
+  lsp-types_2_4_0_0 = doDistribute super.lsp-types_2_4_0_0;
+
   # the test suite attempts to run the binaries built in this package
   # through $PATH but they aren't in $PATH
   dhall-lsp-server = dontCheck super.dhall-lsp-server;
@@ -1817,11 +1875,16 @@ builtins.intersectAttrs super {
   inherit
     (
       let
-        fourmoluTestFix = overrideCabal (drv: {
-          preCheck = drv.preCheck or "" + ''
-            export PATH="$PWD/dist/build/fourmolu:$PATH"
-          '';
-        });
+        fourmoluTestFix =
+          # Can't find executable without https://github.com/haskell/cabal/pull/9912
+          if lib.versionOlder self.ghc.version "9.12" then
+            overrideCabal (drv: {
+              preCheck = drv.preCheck or "" + ''
+                export PATH="$PWD/dist/build/fourmolu:$PATH"
+              '';
+            })
+          else
+            lib.id;
       in
       builtins.mapAttrs (_: fourmoluTestFix) super
     )
@@ -1956,9 +2019,10 @@ builtins.intersectAttrs super {
     ]
     ++ old.buildTools or [ ];
     postInstall = old.postInstall + ''
-      mkdir -p "$out/share/man/man1"
-      "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
-
+      ${lib.optionalString canExecute ''
+        mkdir -p "$out/share/man/man1"
+        "$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
+      ''}
       wrapProgram "$out/bin/cabal" \
         --prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.groff ]}"
     '';
@@ -1966,6 +2030,9 @@ builtins.intersectAttrs super {
     broken = false;
   }) super.cabal-install;
 
+  # lots of errors
+  haskell-debugger = dontCheck super.haskell-debugger;
+
   keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic;
 
   # Disable checks to break dependency loop with SCalendar
diff --git a/pkgs/development/haskell-modules/configuration-windows.nix b/pkgs/development/haskell-modules/configuration-windows.nix
index 3dd93aa5c17f..5489c415f09c 100644
--- a/pkgs/development/haskell-modules/configuration-windows.nix
+++ b/pkgs/development/haskell-modules/configuration-windows.nix
@@ -8,11 +8,35 @@ with haskellLib;
 
 (self: super: {
   # cabal2nix doesn't properly add dependencies conditional on os(windows)
-  network =
-    if pkgs.stdenv.hostPlatform.isWindows then
-      addBuildDepends [ self.temporary ] super.network
-    else
-      super.network;
+  digest = addBuildDepends [ self.zlib ] super.digest;
+  echo = addBuildDepends [ self.mintty ] super.echo;
+  http-client = addBuildDepends [ self.safe ] super.http-client;
+  regex-posix = addBuildDepends [ self.regex-posix-clib ] super.regex-posix;
+  simple-sendfile =
+    with self;
+    addBuildDepends [ conduit conduit-extra resourcet ] super.simple-sendfile;
+  snap-core = addBuildDepends [ self.time-locale-compat ] super.snap-core;
+  tar-conduit = addBuildDepends [ self.unix-compat ] super.tar-conduit;
+  unix-time = addBuildDepends [ pkgs.windows.pthreads ] super.unix-time;
+  warp = addBuildDepends [ self.unix-compat ] super.warp;
+
+  network = lib.pipe super.network [
+    (addBuildDepends [ self.temporary ])
+
+    # https://github.com/haskell/network/pull/605
+    (appendPatch (fetchpatch {
+      name = "dont-frag-wine.patch";
+      url = "https://github.com/haskell/network/commit/ecd94408696117d34d4c13031c30d18033504827.patch";
+      sha256 = "sha256-8LtAkBmgMMMIW6gPYDVuwYck/4fcOf08Hp2zLmsRW2w=";
+    }))
+  ];
+
+  # Workaround for
+  #   Mingw-w64 runtime failure:
+  #   32 bit pseudo relocation at 00000001400EB99E out of range, targeting 00006FFFFFEB8170, yielding the value 00006FFEBFDCC7CE.
+  # Root cause seems to be undefined references to libffi as shown by linking errors if we instead use "-Wl,--disable-auto-import"
+  # See https://github.com/rust-lang/rust/issues/132226#issuecomment-2445100058
+  iserv-proxy = appendConfigureFlag "--ghc-option=-optl=-Wl,--disable-runtime-pseudo-reloc" super.iserv-proxy;
 
   # Avoids a cycle by disabling use of the external interpreter for the packages that are dependencies of iserv-proxy.
   # See configuration-nix.nix, where iserv-proxy and network are handled.
@@ -30,11 +54,4 @@ with haskellLib;
     splitmix
     temporary
     ;
-
-  # https://github.com/fpco/streaming-commons/pull/84
-  streaming-commons = appendPatch (fetchpatch {
-    name = "fix-headers-case.patch";
-    url = "https://github.com/fpco/streaming-commons/commit/6da611f63e9e862523ce6ee53262ddbc9681ae24.patch";
-    sha256 = "sha256-giEQqXZfoiAvtCFohdgOoYna2Tnu5aSYAOUH8YVldi0=";
-  }) super.streaming-commons;
 })
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 955c0a438184..e8d85a3e120b 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -13,6 +13,7 @@
   haskellLib,
   iserv-proxy,
   nodejs,
+  windows,
   writeShellScriptBin,
 }:
 
@@ -22,6 +23,8 @@ let
   crossSupport = rec {
     emulator = stdenv.hostPlatform.emulator buildPackages;
 
+    needsExternalInterpreterSetup = !stdenv.hostPlatform.isGhcjs; # JS backend already handles this
+
     canProxyTH =
       # iserv-proxy currently does not build on GHC 9.6
       lib.versionAtLeast ghc.version "9.8" && stdenv.hostPlatform.emulatorAvailable buildPackages;
@@ -36,11 +39,14 @@ let
               enableExecutableProfiling = enableProfiling;
             };
             buildProxy = lib.getExe' iserv-proxy.build "iserv-proxy";
-            hostProxy = lib.getExe' (overrides iserv-proxy.host) "iserv-proxy-interpreter";
+            hostProxy = lib.getExe' (overrides iserv-proxy.host) (
+              "iserv-proxy-interpreter" + stdenv.hostPlatform.extensions.executable
+            );
           in
           buildPackages.writeShellScriptBin ("iserv-wrapper" + lib.optionalString enableProfiling "-prof") ''
             set -euo pipefail
             PORT=$((5000 + $RANDOM % 5000))
+            ${lib.optionalString stdenv.hostPlatform.isWindows "export WINEDEBUG=-all WINEPREFIX=$TMP"}
             (>&2 echo "---> Starting interpreter on port $PORT")
             ${emulator} ${hostProxy} tmp $PORT &
             RISERV_PID="$!"
@@ -80,7 +86,6 @@ let
     removeReferencesTo
     pkg-config
     coreutils
-    glibcLocales
     emscripten
     ;
 
@@ -254,8 +259,10 @@ in
   # of `meta.pkgConfigModules`. This option defaults to false for now, since
   # this metadata is far from complete in nixpkgs.
   __onlyPropagateKnownPkgConfigModules ? false,
-
-  enableExternalInterpreter ? isCross && crossSupport.canProxyTH,
+  enableExternalInterpreter ?
+    isCross && crossSupport.canProxyTH && crossSupport.needsExternalInterpreterSetup,
+  # iserv-proxy needs local network access
+  __darwinAllowLocalNetworking ? stdenv.hostPlatform.isDarwin && enableExternalInterpreter,
 }@args:
 
 assert editedCabalFile != null -> revision != null;
@@ -355,11 +362,17 @@ let
   ++ optional (allPkgconfigDepends != [ ]) "--with-pkg-config=${pkg-config.targetPrefix}pkg-config"
 
   ++ optionals enableExternalInterpreter (
-    map (opt: "--ghc-option=${opt}") [
-      "-fexternal-interpreter"
-      "-pgmi"
-      crossSupport.iservWrapper
-    ]
+    map (opt: "--ghc-option=${opt}") (
+      [
+        "-fexternal-interpreter"
+        "-pgmi"
+        crossSupport.iservWrapper
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isWindows [
+        "-L${windows.pthreads}/bin"
+        "-L${windows.pthreads}/lib"
+      ]
+    )
   );
 
   makeGhcOptions = opts: lib.concatStringsSep " " (map (opt: "--ghc-option=${opt}") opts);
@@ -662,7 +675,8 @@ lib.fix (
 
       env =
         optionalAttrs (stdenv.buildPlatform.libc == "glibc") {
-          LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
+          # To match LANG for e.g. haddock
+          LOCALE_ARCHIVE = "${buildPackages.glibcLocales}/lib/locale/locale-archive";
         }
         // env';
 
@@ -1074,23 +1088,7 @@ lib.fix (
                 if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" else "${ghcEnv}/${ghcLibdir}";
             }
             // optionalAttrs (stdenv.buildPlatform.libc == "glibc") {
-              # TODO: Why is this written in terms of `buildPackages`, unlike
-              # the outer `env`?
-              #
-              # According to @sternenseemann [1]:
-              #
-              # > The condition is based on `buildPlatform`, so it needs to
-              # > match. `LOCALE_ARCHIVE` is set to accompany `LANG` which
-              # > concerns things we execute on the build platform like
-              # > `haddock`.
-              # >
-              # > Arguably the outer non `buildPackages` one is incorrect and
-              # > probably works by accident in most cases since the locale
-              # > archive is not platform specific (the trouble is that it
-              # > may sometimes be impossible to cross-compile). At least
-              # > that would be my assumption.
-              #
-              # [1]: https://github.com/NixOS/nixpkgs/pull/424368#discussion_r2202683378
+              # To match LANG for e.g. haddock
               LOCALE_ARCHIVE = "${buildPackages.glibcLocales}/lib/locale/locale-archive";
             }
             // env';
@@ -1142,5 +1140,8 @@ lib.fix (
     // optionalAttrs (disallowedRequisites != [ ] || disallowGhcReference) {
       disallowedRequisites = disallowedRequisites ++ (if disallowGhcReference then [ ghc ] else [ ]);
     }
+    // optionalAttrs (__darwinAllowLocalNetworking || args ? __darwinLocalNetworking) {
+      __darwinAllowLocalNetworking = true;
+    }
   )
 )
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0234a9e16268..957f39e6a76c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -129,10 +129,36 @@ self: {
       ];
       description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "4Blocks";
     }
   ) { };
 
+  A-gent = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      mtl,
+      process,
+    }:
+    mkDerivation {
+      pname = "A-gent";
+      version = "0.11.0.5";
+      sha256 = "0ydrdqya81nxv4zxqflciihl4khidm4ipqqhh1x3bbwyqmayhv5x";
+      libraryHaskellDepends = [
+        base
+        containers
+        mtl
+        process
+      ];
+      description = "Polite & well educated LLM agent with excellent manners that always behaves well";
+      license = "(SSPL-1.0 OR AGPL-3.0-only)";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   AAI = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -510,7 +536,7 @@ self: {
         vector
       ];
       description = "Efficient, high-level dynamic programming";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -1612,7 +1638,7 @@ self: {
       ];
       executableToolDepends = [ emacs ];
       description = "A dependently typed functional programming language and proof assistant";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [
         lib.maintainers.iblech
         lib.maintainers.ncfavier
@@ -1675,7 +1701,7 @@ self: {
         tasty-hunit
       ];
       description = "Aho-Corasick string matching algorithm";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -1926,7 +1952,7 @@ self: {
         text
       ];
       description = "Near-future Sci-Fi roguelike and tactical squad combat game";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       badPlatforms = lib.platforms.darwin;
       mainProgram = "Allure";
     }
@@ -2207,7 +2233,7 @@ self: {
         requirements
       ];
       description = "First-class Attribute Grammars implemented using type-level programming";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
@@ -2434,7 +2460,7 @@ self: {
         COrdering
       ];
       description = "Balanced binary trees using the AVL algorithm";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -2528,82 +2554,6 @@ self: {
   ) { };
 
   BNFC = callPackage (
-    {
-      mkDerivation,
-      alex,
-      array,
-      base,
-      containers,
-      deepseq,
-      directory,
-      filepath,
-      happy,
-      hspec,
-      hspec-discover,
-      HUnit,
-      mtl,
-      pretty,
-      process,
-      QuickCheck,
-      string-qq,
-      temporary,
-      time,
-      transformers,
-    }:
-    mkDerivation {
-      pname = "BNFC";
-      version = "2.9.6.1";
-      sha256 = "0h06vg9d71igr4rvs82f8sfa0grv6cvwpix82wal7b1ri0gskz97";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        array
-        base
-        containers
-        deepseq
-        directory
-        filepath
-        mtl
-        pretty
-        process
-        string-qq
-        time
-        transformers
-      ];
-      libraryToolDepends = [
-        alex
-        happy
-      ];
-      executableHaskellDepends = [ base ];
-      testHaskellDepends = [
-        array
-        base
-        containers
-        deepseq
-        directory
-        filepath
-        hspec
-        HUnit
-        mtl
-        pretty
-        process
-        QuickCheck
-        string-qq
-        temporary
-        time
-      ];
-      testToolDepends = [
-        alex
-        happy
-        hspec-discover
-      ];
-      description = "A compiler front-end generator";
-      license = lib.licenses.bsd3;
-      mainProgram = "bnfc";
-    }
-  ) { };
-
-  BNFC_2_9_6_2 = callPackage (
     {
       mkDerivation,
       alex,
@@ -2665,7 +2615,6 @@ self: {
       ];
       description = "A compiler front-end generator";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "bnfc";
     }
   ) { };
@@ -3094,7 +3043,7 @@ self: {
         tasty-hunit
       ];
       description = "Bessel J-function, Anger J-function, Weber E-function, and Anger-Weber function";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -3470,7 +3419,7 @@ self: {
         vector-th-unbox
       ];
       description = "European Nucleotide Archive data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -3620,7 +3569,7 @@ self: {
         text
       ];
       description = "streaming FASTA parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fastaextract";
     }
@@ -4111,7 +4060,7 @@ self: {
         vector-th-unbox
       ];
       description = "Collection of types for bioinformatics";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -4290,7 +4239,7 @@ self: {
         vector-th-unbox
       ];
       description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "SubOptDistance";
     }
@@ -5488,26 +5437,26 @@ self: {
       array,
       base,
       containers,
+      haskeline,
       mtl,
       parsec,
-      readline,
     }:
     mkDerivation {
       pname = "CPL";
-      version = "0.1.0";
-      sha256 = "1qn9cjw11rbkbqhv16y8wqkzkrfarxr1nr3d7byzlvi1sv7fg7x5";
+      version = "0.2.0";
+      sha256 = "16wpmzhx222p0p3xiyk6wr51xklccbar6mky95fb2rj2rpmxswsl";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
         array
         base
         containers
+        haskeline
         mtl
         parsec
-        readline
       ];
       description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "cpl";
     }
   ) { };
@@ -5889,7 +5838,7 @@ self: {
       ];
       doCheck = false;
       description = "A framework for packaging Haskell software";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -5940,7 +5889,7 @@ self: {
       ];
       doCheck = false;
       description = "A framework for packaging Haskell software";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -5993,7 +5942,7 @@ self: {
       ];
       doCheck = false;
       description = "A framework for packaging Haskell software";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6044,7 +5993,7 @@ self: {
       ];
       doCheck = false;
       description = "A framework for packaging Haskell software";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6070,7 +6019,7 @@ self: {
         transformers
       ];
       description = "API for the Hooks build-type";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -6187,7 +6136,7 @@ self: {
         unix
       ];
       description = "A library for working with .cabal files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6233,7 +6182,7 @@ self: {
       ];
       libraryToolDepends = [ alex ];
       description = "A library for working with .cabal files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6279,7 +6228,7 @@ self: {
       ];
       libraryToolDepends = [ alex ];
       description = "A library for working with .cabal files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6325,7 +6274,7 @@ self: {
       ];
       libraryToolDepends = [ alex ];
       description = "A library for working with .cabal files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6421,19 +6370,27 @@ self: {
       containers,
       fgl,
       parsec,
+      tasty,
+      tasty-hunit,
     }:
     mkDerivation {
       pname = "CarneadesDSL";
-      version = "1.3";
-      sha256 = "06ri47cfskvpm65zb63kjrwwhzlmcp2f0z99hqkfw216p85648a3";
+      version = "2.0.0.0";
+      sha256 = "0i8rr4ba50hqpnrb9kr4576y816yy9qqnn3vci42qyb81ym24rja";
       libraryHaskellDepends = [
         base
         containers
         fgl
         parsec
       ];
+      testHaskellDepends = [
+        base
+        containers
+        tasty
+        tasty-hunit
+      ];
       description = "An implementation and DSL for the Carneades argumentation model";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -6444,27 +6401,42 @@ self: {
       mkDerivation,
       base,
       CarneadesDSL,
-      cmdargs,
       containers,
       Dung,
       fgl,
+      optparse-applicative,
+      tasty,
+      tasty-hunit,
     }:
     mkDerivation {
       pname = "CarneadesIntoDung";
-      version = "1.0";
-      sha256 = "0gmrc778zan5rrkb7rip61736rzx13abfzyjcj4bgdvc3fhih1rx";
+      version = "2.0.0.0";
+      sha256 = "1akldkr5idqfr225w0xzzch5ak2r4d3az5xz3rmi5qal5rdmdfxk";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
         CarneadesDSL
-        cmdargs
         containers
         Dung
         fgl
       ];
+      executableHaskellDepends = [
+        base
+        CarneadesDSL
+        Dung
+        optparse-applicative
+      ];
+      testHaskellDepends = [
+        base
+        CarneadesDSL
+        containers
+        Dung
+        tasty
+        tasty-hunit
+      ];
       description = "A translation from the Carneades argumentation model into Dung's AFs";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "caell";
     }
@@ -6805,7 +6777,7 @@ self: {
         vector
       ];
       description = "A backend for the Chart library for FLTKHS";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -7294,8 +7266,10 @@ self: {
     }:
     mkDerivation {
       pname = "ClasshSS";
-      version = "0.1.0.0";
-      sha256 = "141wqmfwp3rgf9h1whwzznz0bq82ph5lcxax0f85qfnxbvbsqnyn";
+      version = "0.2.0.0";
+      sha256 = "1v2wd26z5ajqk4xfwqa7xmaz6ql554d7qlcdh27gkaj4q6n9g1lb";
+      revision = "2";
+      editedCabalFile = "0ajjcv29yglk4c28g0daz31ir9gmmbj1d0s4l9cbqx5y3win3w50";
       libraryHaskellDepends = [
         base
         data-default
@@ -7304,7 +7278,7 @@ self: {
         text
       ];
       description = "Typified Tailwind for Rapid Development";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -7377,7 +7351,7 @@ self: {
         wide-word
       ];
       description = "ClickHouse driver";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -7402,7 +7376,7 @@ self: {
         tls
       ];
       description = "ClickHaskell TLS extension";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -8162,7 +8136,7 @@ self: {
         text
       ];
       description = "Simple CLI user input library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -9294,7 +9268,7 @@ self: {
         vector
       ];
       description = "utilities for DP";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -10896,24 +10870,41 @@ self: {
     {
       mkDerivation,
       base,
-      cmdargs,
       containers,
+      doctest,
+      optparse-applicative,
       parsec,
+      QuickCheck,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
     }:
     mkDerivation {
       pname = "Dung";
-      version = "1.1";
-      sha256 = "1higdpqg599lfc92m7dd4zy98l9vjg5xr4n4qjv0wifszj8lrsgb";
+      version = "2.0.0.0";
+      sha256 = "0qdm2bifih5x02a9c134d32qpj0dxvnc11qbd36miqmx3a2g23xv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
-        cmdargs
         containers
         parsec
       ];
+      executableHaskellDepends = [
+        base
+        optparse-applicative
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        doctest
+        QuickCheck
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
       description = "An implementation of the Dung argumentation frameworks";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dungell";
       broken = true;
@@ -11393,7 +11384,7 @@ self: {
         text
       ];
       description = "Environment Variable Parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -13421,7 +13412,7 @@ self: {
         WeakSets
       ];
       description = "Finite categories and usual categorical constructions on them";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -13472,7 +13463,7 @@ self: {
         WeakSets
       ];
       description = "Transform objects of the package FiniteCategories into graphs using GraphViz";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -13528,7 +13519,7 @@ self: {
       sha256 = "0cpkklm4dqv023ywb2qh49pndbsj2vz7rd2892vnsd9idd34aj6w";
       libraryHaskellDepends = [ base ];
       description = "A version of Prelude suitable for teaching";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -13878,7 +13869,7 @@ self: {
         criterion
       ];
       description = "Tree- and forest structures";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -14033,7 +14024,7 @@ self: {
         vector
       ];
       description = "(Context-free) grammars in formal language theory";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -14469,7 +14460,7 @@ self: {
         vinyl
       ];
       description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -14584,7 +14575,7 @@ self: {
         vinyl
       ];
       description = "A streamly layer for Frames I/O";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "Demo";
       broken = true;
@@ -15210,7 +15201,7 @@ self: {
         utf8-string
       ];
       description = "Bindings to the GOST R 34.11-2012 hashing implementation";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -15800,7 +15791,7 @@ self: {
         random
       ];
       description = "Automatic SMS message generator";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "GenSmsPdu";
       broken = true;
@@ -19372,7 +19363,7 @@ self: {
         unliftio
       ];
       description = "A flexible mock framework for testing effectful code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -19895,7 +19886,7 @@ self: {
         gauge
       ];
       description = "quantitative finance library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       platforms = lib.platforms.x86;
       hydraPlatforms = lib.platforms.none;
     }
@@ -19935,7 +19926,7 @@ self: {
         HROOT-tree
       ];
       description = "Haskell binding to the ROOT data analysis framework";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -19966,7 +19957,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT Core modules";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -20002,7 +19993,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT Graf modules";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -20035,7 +20026,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT Hist modules";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -20068,7 +20059,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT IO modules";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -20101,7 +20092,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT Math modules";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -20138,7 +20129,7 @@ self: {
       ];
       librarySystemDepends = [ RHTTP ];
       description = "Haskell binding to ROOT Net modules";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { RHTTP = null; };
@@ -20171,7 +20162,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT Tree modules";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -20633,7 +20624,7 @@ self: {
         containers
       ];
       description = "Haskell Bindings for libsvm";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -20848,7 +20839,7 @@ self: {
         test-framework-hunit
       ];
       description = "A library for client-side HTTP";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -20905,7 +20896,7 @@ self: {
         strict
       ];
       description = "Tableau based theorem prover for hybrid logics";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "htab";
     }
@@ -21852,7 +21843,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "The classic game of Hangman";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "Hangman";
       broken = true;
@@ -22145,7 +22136,7 @@ self: {
         transformers
       ];
       description = "Functional choreographic programming in Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -22372,7 +22363,7 @@ self: {
         random
       ];
       description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -22857,7 +22848,7 @@ self: {
         yaml
       ];
       description = "Cashflow modeling library for structured finance";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "Hastructure-exe";
     }
   ) { };
@@ -24157,10 +24148,8 @@ self: {
     }:
     mkDerivation {
       pname = "HsOpenSSL";
-      version = "0.11.7.9";
-      sha256 = "0z3nyqlcgqw4ncn90gs6bznyj3lrqpjv83nzs4854knm15x6cbsa";
-      revision = "1";
-      editedCabalFile = "0nw5p8szaip7g4yh81b89wc4k7j0crda0wilfyaqb0kc6qal71m2";
+      version = "0.11.7.10";
+      sha256 = "191a05vyanf9zd4i9am6gprr5a8kkrqb595a0l2lhnqvz26fpg40";
       libraryHaskellDepends = [
         base
         bytestring
@@ -24459,7 +24448,7 @@ self: {
         vector
       ];
       description = "JSON to YAML Adapter";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
@@ -24727,7 +24716,7 @@ self: {
         MemoTrie
       ];
       description = "A package for solving dynamic programming problems in Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -25054,6 +25043,29 @@ self: {
     }
   ) { };
 
+  IStr = callPackage (
+    {
+      mkDerivation,
+      base,
+      haskell-src-meta,
+      template-haskell,
+    }:
+    mkDerivation {
+      pname = "IStr";
+      version = "0.1.0.0";
+      sha256 = "1d9ryvvpcz1q5nch90ghg5ifyh6w6iflcx7x4y51nvd28b3rdk03";
+      revision = "4";
+      editedCabalFile = "1jcn5b4i0qns9r79q62dvvaisbcj0y7ig6kbylwr4mi130gzjwpg";
+      libraryHaskellDepends = [
+        base
+        haskell-src-meta
+        template-haskell
+      ];
+      description = "String Interpolation of Haskell expressions using #{expr} syntax";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   IcoGrid = callPackage (
     {
       mkDerivation,
@@ -25206,7 +25218,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Imperative approach to testing stateful applications. ImpSpec is built on top of HSpec and QuickCheck.";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -25308,7 +25320,7 @@ self: {
         random
       ];
       description = "Infinitely deep trees for lazy stateless memoization";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -26373,7 +26385,7 @@ self: {
         JuicyPixels
       ];
       description = "Efficiently scale, crop, flip images with JuicyPixels";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -26411,7 +26423,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "JuicyPixels wrappers for libjpeg-turbo";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -26705,26 +26717,22 @@ self: {
       base,
       containers,
       directory,
-      generic-lens,
-      lens,
       mtl,
+      transformers,
     }:
     mkDerivation {
       pname = "Kawaii-Parser";
-      version = "3.0.0";
-      sha256 = "09zj4ryqypd46i4ilfqx9mf9y9cs4p4gjyqyks3a11b0qmvlhna9";
-      revision = "2";
-      editedCabalFile = "0m63mixkaiwzw0m6ksl28q26cijkkxiydrjn6vcz10ymfyjm7mkw";
+      version = "4.0.0";
+      sha256 = "1m4mpvgp3kx8wabklxj73i0gh1zhqk5al16s41qbnsz14da3d3nx";
       libraryHaskellDepends = [
         base
         containers
         directory
-        generic-lens
-        lens
         mtl
+        transformers
       ];
       description = "A simple parsing library and some additional utilities";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -27198,7 +27206,7 @@ self: {
         text-short
       ];
       description = "Lightweight Directory Access Protocol (LDAP) version 3";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -27446,7 +27454,7 @@ self: {
         happy
       ];
       description = "LALR(1) parsetable generator and interpreter";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "lr-demo";
     }
   ) { };
@@ -27750,7 +27758,7 @@ self: {
         vector
       ];
       description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       mainProgram = "LambdaHack";
     }
@@ -28169,7 +28177,7 @@ self: {
       sha256 = "1rj5n931370nxrnqj1728p38mcqbpswmxc73c5g1mlh66k0gqqk4";
       libraryHaskellDepends = [ base ];
       description = "European option implied vol calculation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -28582,6 +28590,7 @@ self: {
       description = "List transformer";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -28666,7 +28675,7 @@ self: {
       testHaskellDepends = [ base ];
       doHaddock = false;
       description = "Converter to convert from .lhs to .md and vice versa.";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "lhsc";
       broken = true;
@@ -29725,7 +29734,7 @@ self: {
         hspec
       ];
       description = "Reals in the interval [0,1), as machine words";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -30171,7 +30180,7 @@ self: {
         process
       ];
       description = "A partial Cabal replacement";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "mcabal";
     }
   ) { };
@@ -30225,7 +30234,7 @@ self: {
         time
       ];
       description = "A small compiler for Haskell";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "mhs";
     }
   ) { };
@@ -30315,7 +30324,7 @@ self: {
       ];
       testToolDepends = [ goldplate ];
       description = "A toy dependently typed programming language with type-based termination";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "miniagda";
       broken = true;
@@ -31281,7 +31290,7 @@ self: {
         warp
       ];
       description = "Type-safe and efficient choreographies with location-set polymorphism";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -32312,7 +32321,7 @@ self: {
         split
       ];
       description = "Instances of NcStore for hypercuboids";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "Main";
     }
@@ -32403,7 +32412,7 @@ self: {
         vector
       ];
       description = "Simple scoring schemes for word alignments";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -33330,7 +33339,7 @@ self: {
             OGDF
           ];
           description = "Haskell binding to OGDF";
-          license = lib.licensesSpdx."BSD-2-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -34448,7 +34457,7 @@ self: {
         criterion
       ];
       description = "Efficient ordered (by popcount) enumeration of bits";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.x86;
     }
   ) { };
@@ -35434,8 +35443,8 @@ self: {
     }:
     mkDerivation {
       pname = "PenroseKiteDart";
-      version = "1.5.1";
-      sha256 = "0812x3ddlqflkypzjid3b5n3pdb2wwmp0b24yfmi9z15v5dbf2hm";
+      version = "1.6.1";
+      sha256 = "1250m14qlq43gv3k1xydab08vhfl44cyrcalkjpm9b3fk3p9vncq";
       libraryHaskellDepends = [
         base
         containers
@@ -36091,7 +36100,7 @@ self: {
         vector-th-unbox
       ];
       description = "Efficient multidimensional arrays";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -36289,7 +36298,7 @@ self: {
         QuickCheck
       ];
       description = "Property-based testing framework for testing asynchronous FRP programs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -36698,7 +36707,7 @@ self: {
         time
       ];
       description = "Quasiquotations for a python like interpolated string formatter";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -36953,7 +36962,7 @@ self: {
     }
   ) { };
 
-  QuickCheck_2_17_1_0 = callPackage (
+  QuickCheck_2_18_0_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -36969,8 +36978,8 @@ self: {
     }:
     mkDerivation {
       pname = "QuickCheck";
-      version = "2.17.1.0";
-      sha256 = "0dvrgc666jik35x6linmzn03k6sgr5b9a1ai8wplv7b2ai7l6c08";
+      version = "2.18.0.0";
+      sha256 = "0mdwkcbxz8z7y8l3zmqm20y6f52jrxb16n7ccl2bjfqw7fnn517x";
       libraryHaskellDepends = [
         base
         containers
@@ -37017,7 +37026,7 @@ self: {
         transformers
       ];
       description = "A GenT monad transformer for QuickCheck library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -37917,7 +37926,7 @@ self: {
         time
       ];
       description = "A puzzle game written in Haskell with a cat in lead role";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "raincat";
@@ -38801,7 +38810,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "rounding variants floor, ceil and truncate for floating point operations +-*/√…";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -38852,7 +38861,7 @@ self: {
         vector
       ];
       description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -38926,7 +38935,7 @@ self: {
         X
       ];
       description = "Library for accessing S3 compatible storage services";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -39518,7 +39527,7 @@ self: {
         time
       ];
       description = "The Simple Javascript Wrench";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "sjw";
       broken = true;
@@ -40210,7 +40219,7 @@ self: {
         vector-th-unbox
       ];
       description = "Base types and classes for statistics, sciences and humanities";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -40409,7 +40418,7 @@ self: {
         bytestring
       ];
       description = "simple static linked SHA3 using private symbols and the ref impl";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -40644,8 +40653,9 @@ self: {
         util
       ];
       description = "See README for more info";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -41038,7 +41048,7 @@ self: {
         warp
       ];
       description = "A programming model for declarative, high performance user interface";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -41083,7 +41093,7 @@ self: {
         unliftio
       ];
       description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41123,7 +41133,7 @@ self: {
         unliftio
       ];
       description = "Use the high-performance Snabbdom virtual dom library written in JavaScript";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41147,7 +41157,7 @@ self: {
         text
       ];
       description = "A backend for rendering Shpadoinkle as Text";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41175,7 +41185,7 @@ self: {
         unliftio
       ];
       description = "Support for the native browser console";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -41261,7 +41271,7 @@ self: {
         unliftio
       ];
       description = "Chrome extension to aide in development";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "devtools";
     }
@@ -41298,7 +41308,7 @@ self: {
         unliftio
       ];
       description = "Shpadoinkle as a static site";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41444,7 +41454,7 @@ self: {
         unliftio
       ];
       description = "A typed, template generated Html DSL, and helpers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41502,7 +41512,7 @@ self: {
         warp
       ];
       description = "Isreal Swan will make a snowman for you!";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "isreal";
       broken = true;
@@ -41528,7 +41538,7 @@ self: {
         text
       ];
       description = "Lens combinators for Shpadoinkle applications";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41596,7 +41606,7 @@ self: {
         warp
       ];
       description = "A single page application rounter for Shpadoinkle based on Servant";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41622,7 +41632,7 @@ self: {
         text
       ];
       description = "Integration of the streaming library with Shpadoinkle continuations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41669,7 +41679,7 @@ self: {
         text
       ];
       description = "Read standard file formats into Shpadoinkle with Template Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41735,7 +41745,7 @@ self: {
         quickcheck-classes-base
       ];
       description = "A collection of common reusable types and components";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -43407,8 +43417,8 @@ self: {
       pname = "StrictCheck";
       version = "0.4.0";
       sha256 = "0l7h39a7a1zc7xrsz6ggscn6406q3wi57n50w8hvdm4dd6qf333f";
-      revision = "2";
-      editedCabalFile = "01fbqjhiw16q2a0g2gr3wf3nrmq9npbhx5n7q1bhpy2pv9sqbsgr";
+      revision = "3";
+      editedCabalFile = "1q4b5m3jvwxy88996nhqw8xjrkpj1c5912rr9z4wj3692lpf5hpd";
       libraryHaskellDepends = [
         base
         bifunctors
@@ -43513,7 +43523,7 @@ self: {
       sha256 = "0nxk4a997sibj8nl1b1r6mcn0r7qbyz68jnirv29lq2yyh6lbja4";
       doHaddock = false;
       description = "Svg Icons and more";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -43576,7 +43586,7 @@ self: {
         random
       ];
       description = "Synapse is a machine learning library written in pure Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -43861,7 +43871,7 @@ self: {
         template-haskell
       ];
       description = "A \"noDSL\" approach to mixing shell scripting with Haskell programs using Template Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "thsh";
     }
   ) { };
@@ -45235,7 +45245,7 @@ self: {
       editedCabalFile = "06dzrj9ksla1x108rbcf716zbgmwv2pjc4d5ng504bn7q4vhvs6l";
       libraryHaskellDepends = [ base ];
       description = "Trivial monad with Unit type";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -45942,7 +45952,7 @@ self: {
         parsec
       ];
       description = "A Valve Value-keyvalue parser for Haskell made with Parsec";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -46364,7 +46374,7 @@ self: {
         vulkan
       ];
       description = "Bindings to the VulkanMemoryAllocator library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = [
         "i686-linux"
         "armv7l-linux"
@@ -46733,7 +46743,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Simple set types. Useful to create sets of arbitrary types and nested sets.";
-      license = lib.licensesSpdx."LGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -48007,7 +48017,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libxft ];
       description = "Bindings to the Xft and some Xrender parts";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.slotThe ];
     }
   ) { inherit (pkgs) libxft; };
@@ -48859,7 +48869,7 @@ self: {
         Z-IO
       ];
       description = "Crypto for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -48930,7 +48940,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Array, vector and text";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -48993,7 +49003,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Simple and high performance IO toolkit for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -49091,7 +49101,7 @@ self: {
         Z-Data
       ];
       description = "YAML tools";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -49217,7 +49227,7 @@ self: {
         syz
       ];
       description = "An implementation of Attribute Grammars using Functional Zippers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -49370,7 +49380,7 @@ self: {
         text
       ];
       description = "Convert distfix precedence grammars to unambiguous context-free grammars";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -49752,7 +49762,7 @@ self: {
       sha256 = "1vcmiq2gk8v87dx1gsxlyq6mn42pnz643rpy89kvpxrvr8qmri2b";
       libraryHaskellDepends = [ base ];
       description = "Manage the implicit parameter namespace dynamically at compile time";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -49880,7 +49890,7 @@ self: {
         wide-word
       ];
       description = "Data structures and algorithms";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       mainProgram = "example-lazy-segtree";
     }
   ) { };
@@ -49968,7 +49978,7 @@ self: {
         rerebase
       ];
       description = "Sequence optimized for monoidal construction and folding";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -50054,8 +50064,6 @@ self: {
       ];
       description = "An embedded language for accelerated array processing";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -50697,7 +50705,6 @@ self: {
       ];
       description = "Convert between Accelerate arrays and raw pointers";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -50874,7 +50881,6 @@ self: {
       ];
       description = "Binary serialisation of Accelerate arrays using serialise";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -52289,7 +52295,7 @@ self: {
         wreq
       ];
       description = "implements ACME clients (rfc-8555)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -52720,7 +52726,7 @@ self: {
         text
       ];
       description = "AcousticBrainz API client";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -52743,7 +52749,7 @@ self: {
         transformers
       ];
       description = "Abstraction over management of resources";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -53009,7 +53015,7 @@ self: {
       ];
       doHaddock = false;
       description = "Semigroup actions and torsors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -53115,7 +53121,7 @@ self: {
       sha256 = "07zi06qqmrn14awz7vxn5rx1j62fc9xp2qx52s1j91kh9zy8pzxn";
       libraryHaskellDepends = [ base ];
       description = "Multidimensional integration";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     }
   ) { };
 
@@ -53222,6 +53228,39 @@ self: {
     }
   ) { };
 
+  add-dependent-file = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      Cabal,
+      Cabal-syntax,
+      directory,
+      filepath,
+      regex-compat,
+      template-haskell,
+    }:
+    mkDerivation {
+      pname = "add-dependent-file";
+      version = "0.0.1";
+      sha256 = "1rsfvgrlyd76vpdsrq6qcl4zm3g361lj7g4r63r2jwdrv5ayzrg8";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        Cabal
+        Cabal-syntax
+        directory
+        filepath
+        regex-compat
+        template-haskell
+      ];
+      description = "Safer TH addDependentFile wrapper";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   addLicenseInfo = callPackage (
     {
       mkDerivation,
@@ -53296,7 +53335,7 @@ self: {
         validation-selective
       ];
       description = "A full-featured library for parsing, validating, and rendering email addresses";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -53331,7 +53370,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Manage fine grained fixtures";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -53367,7 +53406,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Manage fine grained fixtures";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -53490,7 +53529,7 @@ self: {
         hs-functors
       ];
       description = "See README for more info";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -54034,7 +54073,7 @@ self: {
         tasty-hunit
       ];
       description = "AES Galois/Counter Mode (GCM) AEAD Cipher";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { inherit (pkgs) openssl; };
 
@@ -54172,7 +54211,7 @@ self: {
         vector
       ];
       description = "Fast JSON parsing and encoding";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -54576,7 +54615,7 @@ self: {
         vector
       ];
       description = "Easy functions for converting from Aeson.Value";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -54653,7 +54692,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "JSON encoding/decoding for dependent-sum";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -54717,10 +54756,8 @@ self: {
     }:
     mkDerivation {
       pname = "aeson-diff";
-      version = "1.1.0.13";
-      sha256 = "0sd13q0nj0k1sam5xfj6dcjcki18f375sa69hm6i4xc6snfhn3cb";
-      revision = "1";
-      editedCabalFile = "1028adallw7bm72948lj322bb5a99gfs0qc1j0pnm8hryp6n7ma5";
+      version = "1.1.0.15";
+      sha256 = "1hs5pz2va0n3s39v8alh56mjwdy8nm94hnmnc6csmfn8lgav74j4";
       isLibrary = true;
       isExecutable = true;
       setupHaskellDepends = [
@@ -55142,7 +55179,7 @@ self: {
         text
       ];
       description = "Type-level default fields for aeson Generic FromJSON parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -55196,7 +55233,7 @@ self: {
         time
       ];
       description = "Generates TypeScript definitions that match Generic Aeson encodings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tests";
       broken = true;
@@ -55551,6 +55588,43 @@ self: {
     }
   ) { };
 
+  aeson-openapi-record-as-tuple = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      generic-random,
+      hspec,
+      openapi3,
+      primitive,
+      QuickCheck,
+      vector,
+    }:
+    mkDerivation {
+      pname = "aeson-openapi-record-as-tuple";
+      version = "1.0.0";
+      sha256 = "1vyghzr771p6zd55rq8wv7f2pbig0arsignparmx9myc8wl3gzzj";
+      libraryHaskellDepends = [
+        aeson
+        base
+        openapi3
+        primitive
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        generic-random
+        hspec
+        QuickCheck
+      ];
+      description = "Encode and decode Haskell records as JSON tuples";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
+    }
+  ) { };
+
   aeson-optics = callPackage (
     {
       mkDerivation,
@@ -55702,7 +55776,7 @@ self: {
         tasty-quickcheck-laws
       ];
       description = "Possible values for aeson";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -56151,7 +56225,7 @@ self: {
       ];
       testToolDepends = [ markdown-unlit ];
       description = "Conveniently wrap a single value in a record when encoding to and from JSON";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -56283,7 +56357,7 @@ self: {
         vector
       ];
       description = "Aeson instances for the Tiled map editor";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -56400,7 +56474,7 @@ self: {
         vector
       ];
       description = "Aliases to \"aeson\" AST making it importable unqualified";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -56470,7 +56544,7 @@ self: {
         vector
       ];
       description = "API for parsing \"aeson\" JSON tree into Haskell types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -56863,7 +56937,7 @@ self: {
         uniqueness-periods-vector-stats
       ];
       description = "An AFTOVolio implementation for creating texts with special phonetic / prosodic properties";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -57179,7 +57253,7 @@ self: {
         text
       ];
       description = "Check for unused code in an Agda project";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "agda-unused";
       broken = true;
@@ -57232,7 +57306,7 @@ self: {
         yaml
       ];
       description = "Compiling Agda code to readable Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "agda2hs";
       maintainers = [ lib.maintainers.ncfavier ];
     }
@@ -57357,7 +57431,7 @@ self: {
       ];
       doHaddock = false;
       description = "Agda backend to generate training data for machine learning purposes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "agda2train";
       broken = true;
@@ -57422,7 +57496,7 @@ self: {
         text
       ];
       description = "Actually Good Encryption";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -57958,7 +58032,7 @@ self: {
         unordered-containers
       ];
       description = "Automatically generate a GraphQL API for an SQLite database";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "airgql";
       broken = true;
@@ -59416,7 +59490,7 @@ self: {
         transformers
       ];
       description = "A library for algebraic graph construction and transformation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -59454,7 +59528,7 @@ self: {
         transformers
       ];
       description = "A library for algebraic graph construction and transformation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -59564,7 +59638,7 @@ self: {
       ];
       doHaddock = false;
       description = "Flexible and simple path manipulation library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -59906,6 +59980,52 @@ self: {
     }
   ) { };
 
+  algraph = callPackage (
+    {
+      mkDerivation,
+      ansi-terminal,
+      base,
+      binary,
+      containers,
+      either-unwrap,
+      fgl,
+      mtl,
+      QuickCheck,
+      tesths,
+      text,
+      Unique,
+      vector,
+    }:
+    mkDerivation {
+      pname = "algraph";
+      version = "0.7.0.0";
+      sha256 = "14sd7kvnxpc0gk2m44lqild6jghv7k3hr4r40fkf8lgfw9c2iz7v";
+      libraryHaskellDepends = [
+        base
+        binary
+        containers
+        either-unwrap
+        mtl
+        text
+        Unique
+      ];
+      testHaskellDepends = [
+        ansi-terminal
+        base
+        binary
+        containers
+        fgl
+        QuickCheck
+        tesths
+        Unique
+        vector
+      ];
+      description = "Graph library using adjacency list representation";
+      license = lib.licenses.lgpl3Only;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   align = callPackage (
     {
       mkDerivation,
@@ -59995,7 +60115,7 @@ self: {
         utility-ht
       ];
       description = "Find relative time displacement of two recordings of the same music";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "align-audio";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -60031,7 +60151,7 @@ self: {
         text
       ];
       description = "Aligns text prefixes before '=' for consistent formatting";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "align-equal";
       broken = true;
@@ -60788,7 +60908,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ alsa-lib ];
       description = "Binding to the ALSA Library API (MIDI sequencer)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.linux;
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -61077,7 +61197,7 @@ self: {
       version = "0.1";
       sha256 = "15fwq1pmb3d46cgsj59q3iz2qs0lgvq5b9d6gxfysnjlm3sp0ivw";
       description = "provides a typeclass that is always satisfied";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -61268,7 +61388,7 @@ self: {
         uuid
       ];
       description = "Comprehensive Amazon Web Services SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -61310,7 +61430,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Access Analyzer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61351,7 +61471,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Account SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61392,7 +61512,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Alexa For Business SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61433,7 +61553,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Prometheus Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61474,7 +61594,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Amplify SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61515,7 +61635,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AmplifyBackend SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61556,7 +61676,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Amplify UI Builder SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61597,7 +61717,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon API Gateway SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61638,7 +61758,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ApiGatewayManagementApi SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61679,7 +61799,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ApiGatewayV2 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61720,7 +61840,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AppConfig SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61761,7 +61881,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AppConfig Data SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61802,7 +61922,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Appflow SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61843,7 +61963,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AppIntegrations Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61884,7 +62004,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Application Auto Scaling SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61925,7 +62045,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch Application Insights SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -61966,7 +62086,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Application Cost Profiler SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62007,7 +62127,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon App Mesh SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62048,7 +62168,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon App Runner SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62089,7 +62209,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AppStream SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62130,7 +62250,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AppSync SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62171,7 +62291,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ARC - Zonal Shift SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62212,7 +62332,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Athena SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62253,7 +62373,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Audit Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62294,7 +62414,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Auto Scaling SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62335,7 +62455,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Auto Scaling Plans SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62376,7 +62496,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Backup SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62417,7 +62537,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Backup Gateway SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62458,7 +62578,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Backup Storage SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62499,7 +62619,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Batch SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62540,7 +62660,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon BillingConductor SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62581,7 +62701,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Braket SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62622,7 +62742,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Budgets SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62663,7 +62783,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Certificate Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62704,7 +62824,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Certificate Manager Private Certificate Authority SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62745,7 +62865,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62786,7 +62906,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK Identity SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62827,7 +62947,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK Media Pipelines SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62868,7 +62988,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK Meetings SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62909,7 +63029,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK Messaging SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62950,7 +63070,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK Voice SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -62991,7 +63111,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cloud9 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63032,7 +63152,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cloud Control API SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63073,7 +63193,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudDirectory SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63114,7 +63234,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudFormation SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63155,7 +63275,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudFront SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63196,7 +63316,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudHSM SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63237,7 +63357,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudHSM V2 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63278,7 +63398,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudSearch SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63319,7 +63439,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudSearch Domain SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63360,7 +63480,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudTrail SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63401,7 +63521,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63442,7 +63562,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EventBridge SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63483,7 +63603,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch Logs SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63524,7 +63644,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeArtifact SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63565,7 +63685,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeBuild SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63606,7 +63726,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeCommit SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63647,7 +63767,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeDeploy SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63688,7 +63808,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeGuru Reviewer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63729,7 +63849,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeGuru Profiler SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63770,7 +63890,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodePipeline SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63811,7 +63931,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeStar SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63852,7 +63972,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeStar connections SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63893,7 +64013,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeStar Notifications SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63934,7 +64054,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cognito Identity SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -63975,7 +64095,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cognito Identity Provider SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64016,7 +64136,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cognito Sync SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64057,7 +64177,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Comprehend SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64098,7 +64218,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Comprehend Medical SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64139,7 +64259,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Compute Optimizer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64180,7 +64300,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Config SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64221,7 +64341,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64262,7 +64382,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Contact Lens SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64303,7 +64423,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ConnectCampaignService SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64344,7 +64464,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Cases SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64385,7 +64505,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Participant Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64427,7 +64547,7 @@ self: {
         text
       ];
       description = "A Haskell equivalent of \"aws rds generate-db-auth-token\"";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "generate-db-auth-token";
       broken = true;
@@ -64471,7 +64591,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Control Tower SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64563,7 +64683,7 @@ self: {
         time
       ];
       description = "Core data types and functionality for Amazonka libraries";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64604,7 +64724,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cost Explorer Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64645,7 +64765,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cost and Usage Report Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64686,7 +64806,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Customer Profiles SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64727,7 +64847,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Glue DataBrew SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64768,7 +64888,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Data Exchange SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64809,7 +64929,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Data Pipeline SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64850,7 +64970,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DataSync SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64891,7 +65011,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Detective SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64932,7 +65052,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Device Farm SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -64973,7 +65093,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DevOps Guru SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65014,7 +65134,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Direct Connect SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65055,7 +65175,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Application Discovery Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65096,7 +65216,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Data Lifecycle Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65137,7 +65257,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Database Migration Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65178,7 +65298,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DocumentDB with MongoDB compatibility SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65219,7 +65339,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DocumentDB Elastic Clusters SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65260,7 +65380,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Disaster Recovery Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65301,7 +65421,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Directory Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65351,7 +65471,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DynamoDB SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -65394,7 +65514,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DynamoDB Accelerator (DAX) SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65444,7 +65564,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DynamoDB Streams SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -65487,7 +65607,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Block Store SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65528,7 +65648,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Compute Cloud SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65569,7 +65689,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EC2 Instance Connect SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65610,7 +65730,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EC2 Container Registry SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65651,7 +65771,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Container Registry Public SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65692,7 +65812,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EC2 Container Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65733,7 +65853,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic File System SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65774,7 +65894,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Kubernetes Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65815,7 +65935,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Inference SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65856,7 +65976,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ElastiCache SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65897,7 +66017,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Beanstalk SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65938,7 +66058,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elasticsearch Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -65979,7 +66099,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Transcoder SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66020,7 +66140,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Load Balancing SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66061,7 +66181,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Load Balancing SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66102,7 +66222,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EMR SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66143,7 +66263,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EMR Containers SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66184,7 +66304,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EMR Serverless SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66225,7 +66345,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch Evidently SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66266,7 +66386,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon FinSpace User Environment Management service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66307,7 +66427,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon FinSpace Public API SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66348,7 +66468,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Fault Injection Simulator SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66389,7 +66509,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Firewall Management Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66430,7 +66550,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Forecast Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66471,7 +66591,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Forecast Query Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66512,7 +66632,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Fraud Detector SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66553,7 +66673,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon FSx SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66594,7 +66714,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon GameLift SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66635,7 +66755,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon GameSparks SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66676,7 +66796,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Glacier SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66717,7 +66837,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Global Accelerator SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66758,7 +66878,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Glue SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66799,7 +66919,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Managed Grafana SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66840,7 +66960,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Greengrass SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66881,7 +67001,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Greengrass V2 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66922,7 +67042,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Ground Station SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -66963,7 +67083,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon GuardDuty SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67004,7 +67124,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Health APIs and Notifications SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67045,7 +67165,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon HealthLake SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67086,7 +67206,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Honeycode SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67127,7 +67247,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Identity and Access Management SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67215,7 +67335,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SSO Identity Store SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67256,7 +67376,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EC2 Image Builder SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67297,7 +67417,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Import/Export SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67338,7 +67458,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Inspector SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67379,7 +67499,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Inspector2 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67420,7 +67540,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67461,7 +67581,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Analytics SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67502,7 +67622,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Data Plane SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67543,7 +67663,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Jobs Data Plane SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67584,7 +67704,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT RoboRunner SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67625,7 +67745,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT 1-Click Devices Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67666,7 +67786,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT 1-Click Projects Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67707,7 +67827,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Core Device Advisor SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67748,7 +67868,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Events SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67789,7 +67909,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Events Data SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67830,7 +67950,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Fleet Hub SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67871,7 +67991,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT FleetWise SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67912,7 +68032,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Secure Tunneling SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67953,7 +68073,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT SiteWise SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -67994,7 +68114,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Things Graph SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68035,7 +68155,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT TwinMaker SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68076,7 +68196,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Wireless SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68117,7 +68237,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Interactive Video Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68158,7 +68278,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Interactive Video Service Chat SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68199,7 +68319,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Managed Streaming for Kafka SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68240,7 +68360,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Managed Streaming for Kafka Connect SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68281,7 +68401,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon KendraFrontendService SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68322,7 +68442,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Keyspaces SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68363,7 +68483,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68404,7 +68524,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Analytics SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68445,7 +68565,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Firehose SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68486,7 +68606,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Video Streams SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68527,7 +68647,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Video Streams Archived Media SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68568,7 +68688,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Video Streams Media SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68609,7 +68729,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Video Signaling Channels SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68650,7 +68770,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Video WebRTC Storage SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68691,7 +68811,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Analytics SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68732,7 +68852,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Key Management Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68773,7 +68893,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lake Formation SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68814,7 +68934,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lambda SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68855,7 +68975,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lex Model Building Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68896,7 +69016,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lex Runtime Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68937,7 +69057,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lex Model Building V2 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -68978,7 +69098,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon License Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69019,7 +69139,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon License Manager Linux Subscriptions SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69060,7 +69180,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon License Manager User Subscriptions SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69101,7 +69221,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lightsail SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69142,7 +69262,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Location Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69183,7 +69303,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lookout for Equipment SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69224,7 +69344,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lookout for Metrics SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69265,7 +69385,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lookout for Vision SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69306,7 +69426,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MainframeModernization SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69347,7 +69467,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Macie SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69388,7 +69508,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Macie 2 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69429,7 +69549,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Managed Blockchain SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69470,7 +69590,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Marketplace Commerce Analytics SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69511,7 +69631,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Marketplace Catalog Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69552,7 +69672,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Marketplace Entitlement Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69593,7 +69713,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Marketplace Metering SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69634,7 +69754,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Mechanical Turk SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69675,7 +69795,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MediaConnect SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69716,7 +69836,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaConvert SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69757,7 +69877,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaLive SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69798,7 +69918,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaPackage SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69839,7 +69959,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaPackage VOD SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69880,7 +70000,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaStore SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69921,7 +70041,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaStore Data Plane SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -69962,7 +70082,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MediaTailor SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70003,7 +70123,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MemoryDB SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70044,7 +70164,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Application Migration Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70085,7 +70205,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Migration Hub Refactor Spaces SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70126,7 +70246,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Migration Hub SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70167,7 +70287,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Migration Hub Config SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70208,7 +70328,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Migration Hub Orchestrator SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70249,7 +70369,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Migration Hub Strategy Recommendations SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70290,7 +70410,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Machine Learning SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70331,7 +70451,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Mobile SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70372,7 +70492,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MQ SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70468,7 +70588,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MWAA SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70509,7 +70629,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Neptune SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70550,7 +70670,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Network Firewall SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70591,7 +70711,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Network Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70632,7 +70752,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon NimbleStudio SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70673,7 +70793,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch Observability Access Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70714,7 +70834,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Omics SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70755,7 +70875,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon OpenSearch Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70796,7 +70916,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon OpenSearch Service Serverless SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70837,7 +70957,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon OpsWorks SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70878,7 +70998,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon OpsWorks CM SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70919,7 +71039,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Organizations SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -70960,7 +71080,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Outposts SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71001,7 +71121,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Panorama SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71042,7 +71162,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Personalize SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71083,7 +71203,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Personalize Events SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71124,7 +71244,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Personalize Runtime SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71165,7 +71285,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Performance Insights SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71206,7 +71326,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Pinpoint SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71247,7 +71367,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Pinpoint Email Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71288,7 +71408,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Pinpoint SMS and Voice Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71329,7 +71449,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Pinpoint SMS Voice V2 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71370,7 +71490,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EventBridge Pipes SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71411,7 +71531,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Polly SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71452,7 +71572,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Price List Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71493,7 +71613,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Private 5G SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71534,7 +71654,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Proton SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71575,7 +71695,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon QLDB SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71616,7 +71736,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon QLDB Session SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71657,7 +71777,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon QuickSight SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71698,7 +71818,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Resource Access Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71739,7 +71859,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Recycle Bin SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71780,7 +71900,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Relational Database Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71821,7 +71941,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon RDS DataService SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71862,7 +71982,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Redshift SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71903,7 +72023,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Redshift Data API Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71944,7 +72064,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Redshift Serverless SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -71985,7 +72105,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Rekognition SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72026,7 +72146,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Resilience Hub SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72067,7 +72187,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Resource Explorer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72108,7 +72228,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Resource Groups SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72149,7 +72269,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Resource Groups Tagging API SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72190,7 +72310,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon RoboMaker SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72231,7 +72351,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IAM Roles Anywhere SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72273,7 +72393,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route 53 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72314,7 +72434,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cloud Map SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72355,7 +72475,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route 53 Domains SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72396,7 +72516,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route53 Recovery Cluster SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72437,7 +72557,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route53 Recovery Control Config SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72478,7 +72598,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route53 Recovery Readiness SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72519,7 +72639,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route 53 Resolver SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72560,7 +72680,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch RUM SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72604,7 +72724,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Storage Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72679,7 +72799,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Storage Service SDK - Client-Side Encryption";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -72765,7 +72885,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon S3 on Outposts SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72806,7 +72926,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SageMaker Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72847,7 +72967,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Augmented AI Runtime SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72888,7 +73008,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Sagemaker Edge Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72929,7 +73049,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SageMaker Feature Store Runtime SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -72970,7 +73090,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SageMaker geospatial capabilities SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73011,7 +73131,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SageMaker Metrics Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73052,7 +73172,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SageMaker Runtime SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73093,7 +73213,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Savings Plans SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73134,7 +73254,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EventBridge Scheduler SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73175,7 +73295,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Schemas SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73216,7 +73336,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SimpleDB SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73257,7 +73377,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Secrets Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73298,7 +73418,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SecurityHub SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73339,7 +73459,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Security Lake SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73380,7 +73500,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ServerlessApplicationRepository SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73421,7 +73541,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Quotas SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73462,7 +73582,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Service Catalog SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73503,7 +73623,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Service Catalog App Registry SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73544,7 +73664,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Email Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73585,7 +73705,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Email Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73626,7 +73746,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Shield SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73667,7 +73787,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Signer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73708,7 +73828,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SimSpace Weaver SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73749,7 +73869,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Server Migration Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73790,7 +73910,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Pinpoint SMS and Voice Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73831,7 +73951,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Snow Device Management SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73872,7 +73992,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Import/Export Snowball SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73913,7 +74033,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Notification Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73954,7 +74074,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Queue Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -73995,7 +74115,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Systems Manager (SSM) SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74036,7 +74156,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Systems Manager Incident Manager Contacts SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74077,7 +74197,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Systems Manager Incident Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74118,7 +74238,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Systems Manager for SAP SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74159,7 +74279,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Single Sign-On SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74200,7 +74320,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Single Sign-On Admin SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74241,7 +74361,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SSO OIDC SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74282,7 +74402,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Step Functions SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74323,7 +74443,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Storage Gateway SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74364,7 +74484,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Security Token Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74405,7 +74525,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Support SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74446,7 +74566,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Support App SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74487,7 +74607,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Workflow Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74528,7 +74648,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Synthetics SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74585,7 +74705,7 @@ self: {
         yaml
       ];
       description = "Common functionality for Amazonka library test-suites";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74626,7 +74746,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Textract SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74667,7 +74787,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Timestream Query SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74708,7 +74828,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Timestream Write SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74749,7 +74869,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Transcribe Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74790,7 +74910,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Transfer Family SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74831,7 +74951,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Translate SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74872,7 +74992,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Voice ID SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74913,7 +75033,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WAF SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74954,7 +75074,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WAF Regional SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -74995,7 +75115,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WAFV2 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -75036,7 +75156,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Well-Architected Tool SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -75077,7 +75197,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Wisdom Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -75118,7 +75238,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkDocs SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -75159,7 +75279,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkLink SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -75200,7 +75320,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkMail SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -75241,7 +75361,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkMail Message Flow SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -75282,7 +75402,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkSpaces SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -75323,7 +75443,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkSpaces Web SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -75364,7 +75484,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon X-Ray SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -77422,7 +77542,7 @@ self: {
         HUnit
       ];
       description = "Yet another alternative Prelude for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -77585,42 +77705,51 @@ self: {
     {
       mkDerivation,
       base,
+      containers,
       criterion,
+      deepseq,
+      filepath,
       free,
       hspec,
-      mtl,
+      hspec-golden,
       QuickCheck,
       quickcheck-transformer,
       random,
+      text,
     }:
     mkDerivation {
       pname = "antigen";
-      version = "0.3.0.0";
-      sha256 = "0wh163xsy3pspdpxbk8lx04q73bn8f2cg8cy5mhcm8j29bb2l3fz";
-      revision = "2";
-      editedCabalFile = "14ndq7wmjwbnx6jv533606vm5zn34j3v7q4f6w4q4kf43ab9f4mm";
+      version = "0.4.0.0";
+      sha256 = "04c0zr3pygqn6frxfy6hcys4r9hmqrjsi2adplzglvvjcd7hpfh8";
+      enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         base
+        containers
         free
-        mtl
         QuickCheck
         quickcheck-transformer
         random
+        text
       ];
       testHaskellDepends = [
         base
+        filepath
         hspec
+        hspec-golden
         QuickCheck
         quickcheck-transformer
+        text
       ];
       benchmarkHaskellDepends = [
         base
         criterion
+        deepseq
         QuickCheck
         quickcheck-transformer
+        text
       ];
       description = "Fault injection for QuickCheck";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -77649,7 +77778,7 @@ self: {
         time
       ];
       description = "Simple job/task/event scheduler/cronjob";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -77723,7 +77852,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -77752,7 +77881,7 @@ self: {
         text
       ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -77827,7 +77956,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -77879,7 +78008,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -77924,7 +78053,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -77989,7 +78118,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -78034,7 +78163,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -78127,7 +78256,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -78217,7 +78346,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -78276,7 +78405,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -78354,7 +78483,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -78390,7 +78519,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -78669,7 +78798,7 @@ self: {
         unordered-containers
       ];
       description = "Utility functions commonly used while solving Advent of Code puzzles";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -78694,7 +78823,7 @@ self: {
         ghc-prim
       ];
       description = "prelude for Algebra of Programming";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -79000,6 +79129,8 @@ self: {
       ];
       description = "Simple brillo renderer for apecs";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -79024,7 +79155,7 @@ self: {
         vector
       ];
       description = "Adaptation of the apecs library for the effectful ecosystem";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -81092,7 +81223,7 @@ self: {
       sha256 = "0bkcwrxz313825vvm0yspj7vw2zmky8g2vq1yb9s8wgxzm4b7m8n";
       libraryHaskellDepends = [ base ];
       description = "A class for things that can be applied";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -81157,7 +81288,7 @@ self: {
       sha256 = "0jr81m0mksfxbvzjs3c73kilr09w4gh7zv1amdx9xcvq5zb96imd";
       libraryHaskellDepends = [ base ];
       description = "Generalized logic operations for Applicative and Alternative functors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -81316,7 +81447,7 @@ self: {
         vector
       ];
       description = "Lift a binary, non-decreasing function onto ordered lists and order the output";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -81413,7 +81544,7 @@ self: {
         unix-compat
       ];
       description = "Perform refactorings specified by the refact library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "refactor";
     }
   ) { };
@@ -81970,7 +82101,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Datadog client for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -82004,7 +82135,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "LRU cache based on STM";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -82055,7 +82186,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Counter library for submitting metrics to a backend such as datadog";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -82104,7 +82235,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Simple logging library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "arbor-monad-logger-example";
       broken = true;
@@ -82165,7 +82296,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Core metric library for publishing metrics";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -82237,7 +82368,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Metric library backend for datadog";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -82271,7 +82402,7 @@ self: {
         text
       ];
       description = "Convenience types and functions for postgresql-simple";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -82534,7 +82665,7 @@ self: {
         text
       ];
       description = "Distribute hackage packages to archlinux";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -82612,7 +82743,7 @@ self: {
         time
       ];
       description = "Arch Linux official and AUR web interface binding";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.berberman ];
     }
   ) { };
@@ -83179,7 +83310,7 @@ self: {
         transformers
       ];
       description = "Parse and render JSON";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "argo";
       broken = true;
@@ -83580,7 +83711,7 @@ self: {
         unix
       ];
       description = "Run docker-compose with help from Nix/NixOS";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "arion";
       maintainers = [ lib.maintainers.roberth ];
     }
@@ -83893,6 +84024,96 @@ self: {
     }
   ) { };
 
+  arithmoi_0_13_3_0 = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      bitvec,
+      chimera,
+      constraints,
+      containers,
+      deepseq,
+      exact-pi,
+      ghc-bignum,
+      infinite-list,
+      integer-logarithms,
+      integer-roots,
+      mod,
+      QuickCheck,
+      quickcheck-classes,
+      random,
+      semirings,
+      smallcheck,
+      tasty,
+      tasty-bench,
+      tasty-hunit,
+      tasty-quickcheck,
+      tasty-rerun,
+      tasty-smallcheck,
+      transformers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "arithmoi";
+      version = "0.13.3.0";
+      sha256 = "1p2x13g1nxbz1bm8bz21kn4zw0gza491cfn5h83d6wvqkzd16dqh";
+      configureFlags = [ "-f-llvm" ];
+      libraryHaskellDepends = [
+        array
+        base
+        bitvec
+        chimera
+        constraints
+        containers
+        deepseq
+        exact-pi
+        ghc-bignum
+        infinite-list
+        integer-logarithms
+        integer-roots
+        mod
+        random
+        semirings
+        transformers
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        exact-pi
+        infinite-list
+        integer-roots
+        mod
+        QuickCheck
+        quickcheck-classes
+        semirings
+        smallcheck
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        tasty-rerun
+        tasty-smallcheck
+        vector
+      ];
+      benchmarkHaskellDepends = [
+        base
+        constraints
+        containers
+        infinite-list
+        integer-logarithms
+        mod
+        random
+        semirings
+        tasty-bench
+        vector
+      ];
+      description = "Efficient basic number-theoretic functions";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   arity-generic-liftA = callPackage (
     {
       mkDerivation,
@@ -84114,7 +84335,7 @@ self: {
         tasty-hunit
       ];
       description = "Builders for arrays";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -84149,7 +84370,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Lists of chunks";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -84379,7 +84600,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell bindings to the ArrayFire general-purpose GPU library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -84416,7 +84637,7 @@ self: {
         tasty-smallcheck
       ];
       description = "Memory-efficient ArrayList implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -84667,7 +84888,7 @@ self: {
         text
       ];
       description = "Basic types and instances for Valve's Artifact Card-set API";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -84721,7 +84942,7 @@ self: {
         template-haskell
       ];
       description = "Archive execution tool";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "arx";
     }
   ) { };
@@ -84784,7 +85005,7 @@ self: {
         text
       ];
       description = "Tiny client for the arXiv Atom API with a simple query DSL";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -84825,7 +85046,7 @@ self: {
         time
       ];
       description = "Command line tool to search and download papers from arXiv.org";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "arxiv-client-cli";
     }
@@ -84991,7 +85212,7 @@ self: {
         text
       ];
       description = "The ASCII character set and encoding";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -85051,7 +85272,7 @@ self: {
         hspec
       ];
       description = "ASCII letter case";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -85081,7 +85302,7 @@ self: {
         hspec
       ];
       description = "ASCII character without an upper/lower case distinction";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -85109,7 +85330,7 @@ self: {
         hspec
       ];
       description = "A Char type representing an ASCII character";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -85185,7 +85406,7 @@ self: {
         hspec
       ];
       description = "ASCII character groups";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -85257,7 +85478,7 @@ self: {
         text
       ];
       description = "ASCII representations of numbers";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -85283,7 +85504,7 @@ self: {
         hedgehog
       ];
       description = "Various categorizations of ASCII characters";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -85409,7 +85630,7 @@ self: {
         text
       ];
       description = "Representing ASCII with refined supersets";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -85484,7 +85705,7 @@ self: {
         text
       ];
       description = "Template Haskell support for ASCII";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -85739,8 +85960,8 @@ self: {
     }:
     mkDerivation {
       pname = "asciidoc";
-      version = "0.1";
-      sha256 = "0fsxz5m40idr8klzqb0x1j84fdyabzyjy8rmdca6jgy11zhjhgrx";
+      version = "0.1.0.1";
+      sha256 = "1wf0xvvx47myw41nc3dlm83rzw9pibzl6154zc7yll4cc0cfy5br";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -85776,7 +85997,7 @@ self: {
         text
       ];
       description = "AsciiDoc parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "hasciidoc";
     }
   ) { };
@@ -85946,7 +86167,7 @@ self: {
         hspec-discover
       ];
       description = "Library for creating and querying segmented feeds";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "asif";
       broken = true;
@@ -86085,7 +86306,7 @@ self: {
         text-short
       ];
       description = "ASN.1 BER Encode and Decode";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -86650,7 +86871,7 @@ self: {
         weigh
       ];
       description = "A solution to the assignment problem";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -86690,7 +86911,7 @@ self: {
       editedCabalFile = "1r0as5s5a0xv2pcpxj1a1snxc3kdq1crh6hfy7y5n9d5xm010svn";
       libraryHaskellDepends = [ base ];
       description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -86717,7 +86938,7 @@ self: {
         hedgehog
       ];
       description = "Association lists (lists of tuples)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -86749,7 +86970,7 @@ self: {
         ListLike
       ];
       description = "Association lists (list-like collections of tuples)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -88094,7 +88315,7 @@ self: {
         xml-types
       ];
       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     }
   ) { };
 
@@ -88155,7 +88376,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Mutable counters that can be modified with atomic operatinos";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -88201,7 +88422,7 @@ self: {
         text
       ];
       description = "Type-safe, composable CSS utility functions. Inspired by Tailwindcss and Elm-UI";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -88269,7 +88490,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Generalizations of atomicModifyIORef";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -88292,7 +88513,7 @@ self: {
         primitive
       ];
       description = "A safe approach to CAS and other atomic ops in Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -88508,7 +88729,7 @@ self: {
         text
       ];
       description = "Interface to automated theorem provers";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -88617,7 +88838,7 @@ self: {
         tasty-bench
       ];
       description = "Faster integer division and modulus operations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -89300,7 +89521,7 @@ self: {
         vector
       ];
       description = "Parsing of aeson's Value with attoparsec";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -89441,7 +89662,7 @@ self: {
         uuid
       ];
       description = "Parsers for the standard Haskell data types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -89541,7 +89762,7 @@ self: {
         text
       ];
       description = "Use Attoparsec to parse framed protocol byte streams";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -89709,7 +89930,8 @@ self: {
       ];
       doHaddock = false;
       description = "right-to-left parser backward compatible with attoparsec";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -89838,7 +90060,7 @@ self: {
         text
       ];
       description = "Conveniently run Attoparsec parsers";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -89916,7 +90138,7 @@ self: {
         time
       ];
       description = "Attoparsec parsers of time";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -90294,7 +90516,7 @@ self: {
         tasty-hunit
       ];
       description = "Access metadata from the Arch Linux User Repository";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -90431,7 +90653,7 @@ self: {
         versions
       ];
       description = "A secure package manager for Arch Linux and the AUR";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "aura";
     }
@@ -90726,7 +90948,7 @@ self: {
         tasty-hunit
       ];
       description = "Automatically add things to module export list";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -90750,8 +90972,8 @@ self: {
     }:
     mkDerivation {
       pname = "auto-extract";
-      version = "0.1.0.0";
-      sha256 = "124sb4wiwv684zhjj3lnmj6nv9yn0a1ps2zj91i6wfjb2h41lsri";
+      version = "0.1.0.1";
+      sha256 = "0chz6c7xhd4hphz8n6a45cwfgfkjjkhl7frq4qb5nbfnljccg4xw";
       libraryHaskellDepends = [
         base
         bytestring
@@ -90771,7 +90993,7 @@ self: {
         tasty-hunit
       ];
       description = "Extract code segment to top level function";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -90820,7 +91042,7 @@ self: {
         tasty-hunit
       ];
       description = "Automatically add import statements";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -90880,7 +91102,7 @@ self: {
         tasty-hunit
       ];
       description = "Case splitting plugin";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -91278,7 +91500,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Automatically re-export modules";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "autoexporter";
     }
   ) { };
@@ -91370,7 +91592,7 @@ self: {
         tasty-quickcheck
       ];
       description = "automata";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -91441,7 +91663,7 @@ self: {
         transformers
       ];
       description = "Effectful streams and automata in coalgebraic encoding";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -91518,7 +91740,7 @@ self: {
         witherable
       ];
       description = "Effectful streams and automata in coalgebraic encoding";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -91716,7 +91938,7 @@ self: {
         filepath
       ];
       description = "Custom Setup to automate package modules discovery";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -92447,7 +92669,7 @@ self: {
         vector
       ];
       description = "Avro serialization support for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -92534,7 +92756,7 @@ self: {
         unordered-containers
       ];
       description = "Tool for decoding avro";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "avro-decode";
       broken = true;
@@ -92967,7 +93189,7 @@ self: {
         vector
       ];
       description = "Export grades from AWS Academy to different formats";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "aws-academy-grade-exporter";
       broken = true;
@@ -93012,7 +93234,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Types and optics for manipulating Amazon Resource Names (ARNs)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -93069,7 +93291,7 @@ self: {
         neat-interpolation
       ];
       description = "Generate signed cookies for AWS CloudFront";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "aws-cloudfront-signed-cookies";
       broken = true;
@@ -93546,7 +93768,7 @@ self: {
         tz
       ];
       description = "AWS EventBridge cron, rate, and one-time parser with scheduler";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -94106,7 +94328,7 @@ self: {
         text
       ];
       description = "Haskell on AWS Lambda Runtime API";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example-lambda";
       broken = true;
@@ -94548,7 +94770,7 @@ self: {
         validation
       ];
       description = "Fetch data from AWS Secrets Manager";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -94890,7 +95112,7 @@ self: {
         text
       ];
       description = "Extract recent daily AWS costs";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
       mainProgram = "aws-spend-summary";
       maintainers = [ lib.maintainers.danielrolls ];
     }
@@ -95148,7 +95370,7 @@ self: {
         text
       ];
       description = "Extract recent daily AWS costs";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "awsspendsummary";
       broken = true;
@@ -95475,7 +95697,7 @@ self: {
         urbit-hob
       ];
       description = "Interact with Azimuth from Haskell";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -95517,7 +95739,7 @@ self: {
         vector
       ];
       description = "A modular game engine and Entity-Component-System (ECS) for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -95542,7 +95764,7 @@ self: {
         mtl
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -95580,7 +95802,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "OpenGL rendering for Aztecs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -95612,7 +95834,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "OpenGL text rendering for Aztecs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -95642,7 +95864,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "GLFW backed for Aztecs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "aztecs-glfw";
     }
   ) { };
@@ -95677,7 +95899,7 @@ self: {
         QuickCheck
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -95710,7 +95932,7 @@ self: {
         text
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -95747,7 +95969,7 @@ self: {
         text
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -95783,7 +96005,7 @@ self: {
         text
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -95807,7 +96029,7 @@ self: {
         linear
       ];
       description = "Transform components for Aztecs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -95931,7 +96153,7 @@ self: {
         wreq
       ];
       description = "send email with microsoft azure";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -96006,7 +96228,7 @@ self: {
       libraryToolDepends = [ proto-lens-protoc ];
       testHaskellDepends = [ base ];
       description = "Azure Functions Worker";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -96400,7 +96622,7 @@ self: {
         yaml
       ];
       description = "A tool and library for building virtual machine images";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "b9c";
     }
@@ -96484,7 +96706,7 @@ self: {
         tasty-hunit
       ];
       description = "Library for generating parsers from ABNF";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -96718,7 +96940,7 @@ self: {
         unix
       ];
       description = "Backstop a target directory by source directories";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "backstop";
       broken = true;
@@ -97000,7 +97222,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Text layout engine built on top of HarfBuzz";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -97477,7 +97699,7 @@ self: {
         time
       ];
       description = "German bank holidays and public holidays";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -97647,7 +97869,7 @@ self: {
         hspec-discover
       ];
       description = "Barbies with layered clothes";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -97676,7 +97898,7 @@ self: {
         base
       ];
       description = "Create strippable HKD via TH";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -98004,7 +98226,7 @@ self: {
         ghc-prim
       ];
       description = "Core data structures and operations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -98123,7 +98345,7 @@ self: {
       editedCabalFile = "03x7hrd4xv9xa0v72srn19v402nwws93n7jgakliabfshacd4pp3";
       libraryHaskellDepends = [ base ];
       description = "Backport of 'Foreign.C.ConstPtr'";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     }
   ) { };
 
@@ -98176,7 +98398,7 @@ self: {
         text
       ];
       description = "RFC4648 Binary-to-text encodings (e.g. base64)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -98234,7 +98456,7 @@ self: {
       libraryHaskellDepends = [ base ];
       doHaddock = false;
       description = "\"base\" package sans \"Prelude\" module";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -98270,7 +98492,7 @@ self: {
       sha256 = "1lqxa8lhnhiyxkqcwq82a8g2sizhagy3l0z7x57xrmn9y81sy241";
       libraryHaskellDepends = [ base ];
       description = "Featureful preludes formed solely from the \"base\" package";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -98339,7 +98561,7 @@ self: {
         text
       ];
       description = "Fast RFC 4648-compliant Base16 encoding";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -98466,7 +98688,7 @@ self: {
         text
       ];
       description = "Fast RFC 4648-compliant Base32 encoding";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -98771,7 +98993,7 @@ self: {
         wide-word
       ];
       description = "Base62 encoding and decoding";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -98883,7 +99105,7 @@ self: {
         random
       ];
       description = "Base64 encoding of byte sequences";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -98953,8 +99175,8 @@ self: {
       pname = "base64-bytestring-type";
       version = "1.0.1";
       sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn";
-      revision = "22";
-      editedCabalFile = "0a5640qjbd3f96v9sf6r1laqpqk83xh073qlq75174kcg5zi4rxa";
+      revision = "25";
+      editedCabalFile = "1jz1jcbbc42dc9ck6gysjw3bf00s4pbi20i4xpdf5qih3ddabw21";
       libraryHaskellDepends = [
         aeson
         base
@@ -99112,7 +99334,7 @@ self: {
       sha256 = "1s4nacp3ripdn895c863hmnpaqmbkiisjp3y45v1q28qdjy052qv";
       libraryHaskellDepends = [ base ];
       description = "alternative prelude";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -99129,7 +99351,7 @@ self: {
       libraryHaskellDepends = [ ghc-internal ];
       executableHaskellDepends = [ ghc-internal ];
       description = "baseless claims";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "exe";
     }
   ) { };
@@ -99294,6 +99516,33 @@ self: {
     }
   ) { };
 
+  basesystems = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      bytestring,
+      containers,
+      text,
+    }:
+    mkDerivation {
+      pname = "basesystems";
+      version = "1.0.0.0";
+      sha256 = "1904s9ii1nxpxcg6ah2192k7j193s8i1lnci2d6r4jb15s30b61d";
+      libraryHaskellDepends = [
+        array
+        base
+        bytestring
+        containers
+        text
+      ];
+      description = "Implements encoders/decoders for basesystems";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   basex-client = callPackage (
     {
       mkDerivation,
@@ -99377,6 +99626,7 @@ self: {
       description = "Lifting values from base types";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -99400,7 +99650,7 @@ self: {
       sha256 = "0dgckarxy6lyaq2m02yisv41k7q0k40xph7v039rxx71bgih196d";
       libraryHaskellDepends = [ base ];
       description = "Basic implementation of General Problem Solver algorithm";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -99523,7 +99773,7 @@ self: {
         transformers
       ];
       description = "Modules for primitive types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -100376,7 +100626,7 @@ self: {
         transformers
       ];
       description = "Library for parsing, constructing, and printing BBCode";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -101201,6 +101451,63 @@ self: {
     }
   ) { };
 
+  beam-duckdb = callPackage (
+    {
+      mkDerivation,
+      base,
+      beam-core,
+      beam-migrate,
+      bytestring,
+      dlist,
+      duckdb-simple,
+      free,
+      hedgehog,
+      scientific,
+      tasty,
+      tasty-hedgehog,
+      tasty-hunit,
+      text,
+      time,
+      transformers,
+      uuid-types,
+    }:
+    mkDerivation {
+      pname = "beam-duckdb";
+      version = "0.2.0.0";
+      sha256 = "0n41x3jd2qilf7h6vnq6il8b03n41mlpp7lycmk0120388vylk3i";
+      revision = "2";
+      editedCabalFile = "098aqsxyls0cj9xs5lzw5ks3j725ycay2f1i3mccvx90l1fay188";
+      libraryHaskellDepends = [
+        base
+        beam-core
+        beam-migrate
+        bytestring
+        dlist
+        duckdb-simple
+        free
+        scientific
+        text
+        time
+        transformers
+        uuid-types
+      ];
+      testHaskellDepends = [
+        base
+        beam-core
+        duckdb-simple
+        hedgehog
+        tasty
+        tasty-hedgehog
+        tasty-hunit
+        text
+        time
+      ];
+      description = "DuckDB backend for Beam";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   beam-large-records = callPackage (
     {
       mkDerivation,
@@ -101245,7 +101552,7 @@ self: {
         time
       ];
       description = "Integration of large-records with beam-core";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -101474,6 +101781,7 @@ self: {
       beam-core,
       beam-migrate,
       bytestring,
+      containers,
       direct-sqlite,
       dlist,
       free,
@@ -101492,8 +101800,8 @@ self: {
     }:
     mkDerivation {
       pname = "beam-sqlite";
-      version = "0.5.5.0";
-      sha256 = "0shybfbix30mir99138frswlbd768s5yp6r29jsp6ndgc2k7s6sr";
+      version = "0.5.6.0";
+      sha256 = "0iv94115aw1imbbcy6lbiqsr699215x15j1snyzypzbkqca0khi6";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -101501,6 +101809,7 @@ self: {
         beam-core
         beam-migrate
         bytestring
+        containers
         direct-sqlite
         dlist
         free
@@ -101673,7 +101982,7 @@ self: {
         word8
       ];
       description = "Low-level Haskell bindings to the BearLibTerminal graphics library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "omni";
       broken = true;
@@ -101759,8 +102068,8 @@ self: {
     }:
     mkDerivation {
       pname = "bech32";
-      version = "1.1.9";
-      sha256 = "0l3h4c1aqjqrlxdc4gq409dwly61i7k2d7g3gz0gya9nf39xc3f4";
+      version = "1.1.10";
+      sha256 = "0zrld26c0075dsl6v3gdiy0fimyaz5dlvfm0g2rldgg7qvi45q9a";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -101798,7 +102107,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bech32";
       broken = true;
@@ -101817,8 +102126,8 @@ self: {
     }:
     mkDerivation {
       pname = "bech32-th";
-      version = "1.1.9";
-      sha256 = "0bc3wx5np17lb1y4s843f8m65687ainiv8biqfhfg7i2gfsc60cs";
+      version = "1.1.10";
+      sha256 = "0xnnnbm7mjx5syyvx7qrmkk4carzj9cc004xdzdivgs1n8726frg";
       libraryHaskellDepends = [
         base
         bech32
@@ -101833,7 +102142,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Template Haskell extensions to the Bech32 library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -102181,7 +102490,7 @@ self: {
         vector
       ];
       description = "Bencode encoding and decoding library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -102454,7 +102763,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Bencodex reader/writer for Haskell";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -102512,7 +102821,7 @@ self: {
         ghc-prim
       ];
       description = "A library for encoding and decoding of BEncode data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -102653,7 +102962,7 @@ self: {
         hspec
       ];
       description = "Simplify tests where Either or Maybe types are returned from monadic code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -103409,7 +103718,7 @@ self: {
         transformers
       ];
       description = "Make instance constraints bidirectional";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -104025,7 +104334,7 @@ self: {
         some
       ];
       description = "Bin: binary natural numbers";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
@@ -104164,7 +104473,7 @@ self: {
         zlib
       ];
       description = "Binary serialisation for Haskell values using lazy ByteStrings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -104579,7 +104888,7 @@ self: {
         vector
       ];
       description = "Orphan instances for binary";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -104748,7 +105057,7 @@ self: {
         tasty-quickcheck
       ];
       description = "An efficient but limited parser API specialised to bytestrings";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -105168,7 +105477,7 @@ self: {
         unordered-containers
       ];
       description = "Tagged binary serialisation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -105281,7 +105590,7 @@ self: {
         binary
       ];
       description = "VarInt encoding/decoding via Data.Binary";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -105307,7 +105616,7 @@ self: {
       testHaskellDepends = [ base ];
       doHaddock = false;
       description = "Haskell bindings to binaryen";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -105388,7 +105697,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Variable binding for abstract syntax tree";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -106258,7 +106567,7 @@ self: {
         bindings-DSL
       ];
       description = "Low level bindings to libpci";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -106550,7 +106859,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ portaudio ];
       description = "Low-level bindings to portaudio library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) portaudio; };
 
@@ -107728,7 +108037,7 @@ self: {
         tasty-hunit
       ];
       description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -107900,7 +108209,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Birds of Paradise";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -108229,7 +108538,7 @@ self: {
         toolshed
       ];
       description = "Plays chess";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -108419,7 +108728,7 @@ self: {
         bytestring
       ];
       description = "Bit array based on ByteString";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -108468,7 +108777,7 @@ self: {
         tasty-hunit
       ];
       description = "Bitcoin address generation and rendering. Parsing coming soon.";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -108677,7 +108986,7 @@ self: {
         text
       ];
       description = "BIP 158 compact block filters";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -108712,7 +109021,7 @@ self: {
         time
       ];
       description = "Bitcoin hash primitives";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -108820,7 +109129,7 @@ self: {
         tasty-hunit
       ];
       description = "Bitcoin keys";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -109110,7 +109419,7 @@ self: {
         unordered-containers
       ];
       description = "Resources for working with miniscript, and script descriptors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -109262,7 +109571,7 @@ self: {
         text
       ];
       description = "A library for working with bitcoin-core regtest networks";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bitcoind-rpc-explorer";
     }
@@ -109311,7 +109620,7 @@ self: {
         transformers
       ];
       description = "A streamlined interface to bitcoin core using Haskoin types and Servant";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -109343,7 +109652,7 @@ self: {
       ];
       testToolDepends = [ sydtest-discover ];
       description = "Generic and easy to use haskell bitfields";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -109469,8 +109778,8 @@ self: {
     }:
     mkDerivation {
       pname = "bitmasks";
-      version = "0";
-      sha256 = "0wanpwhi4d5lpsa6rrgw45i7hcy0xgrjlqbf3ij0vic601a19gny";
+      version = "0.0.1";
+      sha256 = "1li40blqmqsgwpdzvf55q9djaqvzpiddaz8d446ng1z6xvjg0zp4";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -109478,7 +109787,7 @@ self: {
         QuickCheck
       ];
       description = "Bitmasks for efficient storing of boolean flags";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -109688,7 +109997,7 @@ self: {
         vector
       ];
       description = "Useful bitwise operations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -109730,7 +110039,7 @@ self: {
         hspec
       ];
       description = "Showing data as strings of 0 and 1";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -109904,7 +110213,7 @@ self: {
         vector
       ];
       description = "Fast, packed, strict and lazy bit streams with stream fusion";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     }
   ) { };
 
@@ -109923,7 +110232,7 @@ self: {
         bytestring
       ];
       description = "Lazy bit strings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -110120,10 +110429,8 @@ self: {
     }:
     mkDerivation {
       pname = "bitvec";
-      version = "1.1.5.0";
-      sha256 = "1ifyz0lsmgqz8yjyx4887m1wnm7ar389k6gkvcnk9mg1bgp7rll3";
-      revision = "3";
-      editedCabalFile = "1cw8gz65n5m20sy9wrxrg2kz2lskqcw81ib952jmha72c3ffcjs3";
+      version = "1.1.6.0";
+      sha256 = "0asfdk12mgwl14c5fahfr856l1b00z8103iz9x73z5s1wcyd6hhs";
       libraryHaskellDepends = [
         base
         bytestring
@@ -110340,7 +110647,7 @@ self: {
         validation
       ];
       description = "A lousy Prelude replacement by a lousy dude";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -110363,7 +110670,7 @@ self: {
         text
       ];
       description = "A lousy Prelude replacement by a lousy dude";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -110723,7 +111030,7 @@ self: {
         criterion
       ];
       description = "A library providing BLAKE2";
-      license = lib.licensesSpdx."Unlicense";
+      license = lib.meta.getLicenseFromSpdxId "Unlicense";
     }
   ) { };
 
@@ -110750,7 +111057,7 @@ self: {
         tasty-hunit
       ];
       description = "BLAKE3 hashing algorithm";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       platforms = lib.platforms.x86;
     }
   ) { };
@@ -111254,7 +111561,7 @@ self: {
         text
       ];
       description = "blaze-html backend for colonnade";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -111969,7 +112276,7 @@ self: {
         text
       ];
       description = "An HTML generator for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -112072,8 +112379,8 @@ self: {
     }:
     mkDerivation {
       pname = "blockfrost-api";
-      version = "0.14.0.0";
-      sha256 = "1bk77cgcf8bwc3mb89dsfsbrx7d5w16jdzf0jij3x3rj6zys26va";
+      version = "0.15.0.0";
+      sha256 = "0xdawvkc54dgyh28z82cx3hx2xb1mplhw883cz3dy6k1348wc172";
       libraryHaskellDepends = [
         aeson
         base
@@ -112108,7 +112415,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "API definitions for blockfrost.io";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -112135,8 +112442,8 @@ self: {
     }:
     mkDerivation {
       pname = "blockfrost-client";
-      version = "0.11.0.0";
-      sha256 = "0cfdhyqiqcyv92yfvy1as07cwajy23ckip4c3c5rw6apwixn32z0";
+      version = "0.12.0.0";
+      sha256 = "0ar5vxbppmc36rk22wsak8dq3n7ndq5iq2cpipiasbpm5xg7bssh";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -112162,7 +112469,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "blockfrost.io basic client";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       maintainers = [ lib.maintainers.sorki ];
     }
   ) { };
@@ -112212,7 +112519,7 @@ self: {
         text
       ];
       description = "blockfrost.io common client definitions / instances";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -112245,7 +112552,7 @@ self: {
         time
       ];
       description = "blockfrost.io pretty-printing utilities";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -112362,7 +112669,7 @@ self: {
       ];
       doHaddock = false;
       description = "Perform batches of disk I/O operations";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -112386,8 +112693,8 @@ self: {
     }:
     mkDerivation {
       pname = "blockio-uring";
-      version = "0.1.0.2";
-      sha256 = "1kal4vrygj12a53m9bavdbffsyqmh7m73vr62z2rz3y0yq3wxj3z";
+      version = "0.1.0.3";
+      sha256 = "1v873rrfp87ypssw3jxv29sc9iilyc1423g90gycf09l1xsf7flx";
       libraryHaskellDepends = [
         base
         primitive
@@ -112416,7 +112723,7 @@ self: {
       ];
       benchmarkPkgconfigDepends = [ liburing ];
       description = "Perform batches of asynchronous disk IO operations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -112569,7 +112876,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Elasticsearch client library for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -112664,7 +112971,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Elasticsearch client library for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -112763,7 +113070,7 @@ self: {
         hedgehog
       ];
       description = "visual bloom filter for neotrellis m4 output";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bloohm";
       broken = true;
@@ -112801,7 +113108,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Pure and impure Bloom Filter implementations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -112825,8 +113132,8 @@ self: {
     }:
     mkDerivation {
       pname = "bloomfilter-blocked";
-      version = "0.1.0.1";
-      sha256 = "0np51dnfd8shcpvhxv6bf9cfyjn8q8qc45ckzi6m6zxbnp5l9k10";
+      version = "0.1.0.2";
+      sha256 = "17jrim5fqkjiaba16s61nn895fk1fhgn14i2ccq09b1ccrj9jpsm";
       libraryHaskellDepends = [
         base
         bytestring
@@ -112854,7 +113161,7 @@ self: {
       ];
       doHaddock = false;
       description = "Fast, compact Bloom filters";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -113232,20 +113539,20 @@ self: {
       sha256 = "17vlgidjmz7dyqllfwc9q6r2xvmjhj7w6wwyxrc2xpgpg7jbklm2";
       libraryHaskellDepends = [ bluefin-internal ];
       description = "The Bluefin effect system";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
 
-  bluefin_0_2_6_0 = callPackage (
+  bluefin_0_4_1_0 = callPackage (
     { mkDerivation, bluefin-internal }:
     mkDerivation {
       pname = "bluefin";
-      version = "0.2.6.0";
-      sha256 = "0fdlj319kny23giacwha56xb3z482hjybpjjrqfsv1aqwzvaw4si";
+      version = "0.4.1.0";
+      sha256 = "18k1iqfjggwv6l6fllchzhv8rhhy24q05knzzsgzyjw4z8gp38kf";
       libraryHaskellDepends = [ bluefin-internal ];
       description = "The Bluefin effect system";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -113265,8 +113572,8 @@ self: {
       pname = "bluefin-algae";
       version = "0.1.0.2";
       sha256 = "02g513vqn052qd41zm9brw8lf1ic4135mi8kr3s4w0721vm4nkhh";
-      revision = "3";
-      editedCabalFile = "0m1fa0yy0inqii6ks97p3hx1sh66ira6mib3qi4slm5b2kln02qb";
+      revision = "4";
+      editedCabalFile = "02hx8g5kyx26znb145d55w6wm50lyjb5cx0y6d9dxnf11b2i21dj";
       libraryHaskellDepends = [
         base
         bluefin
@@ -113284,7 +113591,7 @@ self: {
         tasty-bench
       ];
       description = "Algebraic effects and named handlers in Bluefin";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -113298,12 +113605,14 @@ self: {
       pname = "bluefin-contrib";
       version = "0.2.0.0";
       sha256 = "0fqv8gjgxaa1jkfhvbcdwq18r1yhf0l8clr0w77vfizwj0425nqm";
+      revision = "1";
+      editedCabalFile = "0lkryncx38hpra2lc3a2djd5mj0n7yg73cgahhmvyc916vglw3lf";
       libraryHaskellDepends = [
         base
         bluefin
       ];
       description = "The Bluefin effect system, user contributions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -113333,11 +113642,11 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "The Bluefin effect system, internals";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
-  bluefin-internal_0_3_4_0 = callPackage (
+  bluefin-internal_0_4_1_0 = callPackage (
     {
       mkDerivation,
       async,
@@ -113349,8 +113658,8 @@ self: {
     }:
     mkDerivation {
       pname = "bluefin-internal";
-      version = "0.3.4.0";
-      sha256 = "0cg8d3rhy23rwn14p8j6cz1xjfsal1j6ij05h3kw2bla7alcjig0";
+      version = "0.4.1.0";
+      sha256 = "03qyjjkphqf1z242vfz4pa9pdha602vmmsqd97z18p01m5yqd01f";
       libraryHaskellDepends = [
         async
         base
@@ -113361,11 +113670,67 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "The Bluefin effect system, internals";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
+  bluefin-opaleye = callPackage (
+    {
+      mkDerivation,
+      base,
+      bluefin,
+      bluefin-postgresql,
+      containers,
+      opaleye,
+      postgresql-simple,
+      pretty,
+      product-profunctors,
+      text,
+    }:
+    mkDerivation {
+      pname = "bluefin-opaleye";
+      version = "0.1.0.0";
+      sha256 = "11cqgcz9jgnlw7j5zs9fsdc8p5629mwydidvq0f1rhin9gb1dbyc";
+      libraryHaskellDepends = [
+        base
+        bluefin
+        bluefin-postgresql
+        containers
+        opaleye
+        postgresql-simple
+        pretty
+        product-profunctors
+        text
+      ];
+      description = "bluefin support for high-level PostgreSQL operations via Opaleye";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  bluefin-postgresql = callPackage (
+    {
+      mkDerivation,
+      base,
+      bluefin,
+      postgresql-simple,
+      unliftio-pool,
+    }:
+    mkDerivation {
+      pname = "bluefin-postgresql";
+      version = "0.1.0.0";
+      sha256 = "0wg7z44b875jba988m4yzsqd3zk6rdq669lkd86pgsprr8rqpd2l";
+      libraryHaskellDepends = [
+        base
+        bluefin
+        postgresql-simple
+        unliftio-pool
+      ];
+      description = "bluefin support for mid-level PostgreSQL operations";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   bluefin-random = callPackage (
     {
       mkDerivation,
@@ -113377,15 +113742,15 @@ self: {
       pname = "bluefin-random";
       version = "0.2.0.0";
       sha256 = "1kvhcz84gdpv0x4jmqi75i2l85kfkmsyp8vqpl39hgxwy1d8fmyf";
-      revision = "1";
-      editedCabalFile = "185pbhxr5kpm4jqr8j8fxv6ifigv7038xy474dy3dak08b9ijnh3";
+      revision = "2";
+      editedCabalFile = "0b10d9af349q7pj4qs0q05f9xc34mlfbvpdy4vqm4jfw1kg0ddg7";
       libraryHaskellDepends = [
         base
         bluefin
         random
       ];
       description = "The Bluefin effect system, random generators";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -113459,7 +113824,7 @@ self: {
         text
       ];
       description = "Tools for interacting with Bluesky / AT Protocol";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -114074,7 +114439,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Generate Haskell boilerplate";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "boilerplate";
       broken = true;
@@ -114130,12 +114495,135 @@ self: {
         vector
       ];
       description = "Bolt driver for Neo4j";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
   ) { };
 
+  bolty = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      crypton-connection,
+      data-default,
+      extra,
+      mtl,
+      network,
+      packstream-bolt,
+      persist,
+      resource-pool,
+      sandwich,
+      scientific,
+      split,
+      text,
+      text-show,
+      time,
+      unordered-containers,
+      uuid-types,
+      validation-selective,
+      vector,
+      word8,
+    }:
+    mkDerivation {
+      pname = "bolty";
+      version = "0.1.0.2";
+      sha256 = "1d5ic68akkjd3w352rdnk1vp3b4dx3mv2w5irar4ykvg0iy87i0v";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        crypton-connection
+        data-default
+        extra
+        mtl
+        network
+        packstream-bolt
+        persist
+        resource-pool
+        scientific
+        split
+        text
+        text-show
+        time
+        unordered-containers
+        uuid-types
+        validation-selective
+        vector
+        word8
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        crypton-connection
+        data-default
+        extra
+        mtl
+        network
+        packstream-bolt
+        persist
+        sandwich
+        split
+        text
+        text-show
+        unordered-containers
+        validation-selective
+        vector
+        word8
+      ];
+      description = "Haskell driver for Neo4j (BOLT protocol 4.4-5.4)";
+      license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  bolty-streamly = callPackage (
+    {
+      mkDerivation,
+      base,
+      bolty,
+      data-default,
+      packstream-bolt,
+      sandwich,
+      streamly-core,
+      text,
+      unordered-containers,
+      validation-selective,
+      vector,
+    }:
+    mkDerivation {
+      pname = "bolty-streamly";
+      version = "0.1.0.0";
+      sha256 = "11wjapwlsi4mc2h0j5fiqyd3nnzd52sagkrlmc3fgl46q4198mx6";
+      libraryHaskellDepends = [
+        base
+        bolty
+        packstream-bolt
+        streamly-core
+        text
+        unordered-containers
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        bolty
+        data-default
+        packstream-bolt
+        sandwich
+        streamly-core
+        text
+        unordered-containers
+        validation-selective
+        vector
+      ];
+      description = "Streamly streaming interface for bolty Neo4j driver";
+      license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   boltzmann-brain = callPackage (
     {
       mkDerivation,
@@ -115482,7 +115970,7 @@ self: {
         transformers
       ];
       description = "Boring and Absurd types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -115592,7 +116080,7 @@ self: {
         wide-word
       ];
       description = "Implementation of BORSH serialisation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -115634,7 +116122,7 @@ self: {
       libraryHaskellDepends = [ base ];
       libraryPkgconfigDepends = [ botan ];
       description = "Raw Botan bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.mikatammi ];
     }
   ) { botan = null; };
@@ -115682,7 +116170,7 @@ self: {
         text
       ];
       description = "Low-level Botan bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.mikatammi ];
     }
   ) { };
@@ -115780,7 +116268,7 @@ self: {
         text
       ];
       description = "Encoding and decoding for the Bottom spec";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bottom";
       broken = true;
@@ -115885,7 +116373,7 @@ self: {
         utf8-string
       ];
       description = "ScopeH and ScopeT extras for bound";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -115998,7 +116486,7 @@ self: {
         tasty-hunit
       ];
       description = "A strict, immutable, thread-safe, single-ended, bounded queue";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -116200,7 +116688,7 @@ self: {
         time
       ];
       description = "A profunctor effect system?";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -116225,7 +116713,7 @@ self: {
         time
       ];
       description = "CSV parsing in a box";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -116265,7 +116753,7 @@ self: {
         optparse-applicative
       ];
       description = "Box websockets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "box-socket";
     }
   ) { };
@@ -116361,7 +116849,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A minimal typed unix path library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -116741,7 +117229,7 @@ self: {
         tasty-hunit
       ];
       description = "Set breakpoints using a GHC plugin";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -117046,7 +117534,7 @@ self: {
         vty
       ];
       description = "Calendar widget for the Brick TUI library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -117160,7 +117648,7 @@ self: {
         vector
       ];
       description = "Search forward or backward for certain kinds of items in brick list";
-      license = lib.licensesSpdx."0BSD";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -117189,7 +117677,7 @@ self: {
         vector
       ];
       description = "Skip a certain kind of items when moving in brick list";
-      license = lib.licensesSpdx."0BSD";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
     }
   ) { };
 
@@ -117238,7 +117726,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Panes library for Brick providing composition and isolation for TUI apps";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       mainProgram = "mywork-example";
     }
   ) { };
@@ -117299,7 +117787,7 @@ self: {
         vty
       ];
       description = "Tabular list widgets for brick";
-      license = lib.licensesSpdx."0BSD";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
     }
   ) { };
 
@@ -117593,30 +118081,28 @@ self: {
     {
       mkDerivation,
       base,
-      bmp,
       brillo-rendering,
-      bytestring,
+      c2hs,
       containers,
-      ghc-prim,
       GLFW-b,
       OpenGL,
+      text,
     }:
     mkDerivation {
       pname = "brillo";
-      version = "1.13.3";
-      sha256 = "16xb0ii3mhlz4ppl2ifmskq70i6bkwk2my28gp7xfxq1dviqzmh8";
+      version = "2.0.0";
+      sha256 = "0zyw0il34npadynf50ij7gxbq9z2hwfi3ldpfz4ks4r7f87xnb5w";
       libraryHaskellDepends = [
         base
-        bmp
         brillo-rendering
-        bytestring
         containers
-        ghc-prim
         GLFW-b
         OpenGL
+        text
       ];
+      libraryToolDepends = [ c2hs ];
       description = "Painless 2D vector graphics, animations, and simulations powered by GLFW";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -117625,21 +118111,17 @@ self: {
       mkDerivation,
       base,
       brillo,
-      containers,
-      ghc-prim,
     }:
     mkDerivation {
       pname = "brillo-algorithms";
-      version = "1.13.3";
-      sha256 = "0mbvi03f24vvp9zbipib869v68syfx8lpwzsx0q2ljx3axrxwi8d";
+      version = "2.0.0";
+      sha256 = "1klan3qblm0kjp57bx1j4n7zwmjp62m8jrhq59apcczhl7wcrsby";
       libraryHaskellDepends = [
         base
         brillo
-        containers
-        ghc-prim
       ];
       description = "Data structures and algorithms for working with 2D graphics";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -117648,77 +118130,141 @@ self: {
   brillo-examples = callPackage (
     {
       mkDerivation,
+      array,
       base,
-      bmp,
       brillo,
       brillo-algorithms,
+      brillo-export,
       brillo-rendering,
-      bytestring,
       containers,
-      ghc-prim,
+      directory,
+      freetype2,
+      FULE,
       GLFW-b,
+      mtl,
       random,
+      split,
+      text,
       vector,
     }:
     mkDerivation {
       pname = "brillo-examples";
-      version = "1.13.3";
-      sha256 = "0ygg78kkxksaj0qh46rxza4hwrr97985hhcjkqh2gin7bpgy89mj";
+      version = "2.0.1";
+      sha256 = "15fbfpism75vg1zcx8k7xk0yr7ypzyvbw3ckr299l4d1wr9b34wx";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
+        array
         base
-        bmp
         brillo
         brillo-algorithms
+        brillo-export
         brillo-rendering
-        bytestring
         containers
-        ghc-prim
+        directory
+        freetype2
+        FULE
         GLFW-b
+        mtl
         random
+        split
+        text
         vector
       ];
       description = "Examples using the Brillo library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
+  brillo-export = callPackage (
+    {
+      mkDerivation,
+      base,
+      brillo,
+      brillo-rendering,
+      bytestring,
+      directory,
+      filepath,
+      GLFW-b,
+      JuicyPixels,
+      OpenGLRaw,
+      text,
+      vector,
+      webp,
+    }:
+    mkDerivation {
+      pname = "brillo-export";
+      version = "0.2.0.0";
+      sha256 = "03ivx077jhkrmhfbmyd8d62bzgl9bynlcbgmla6cmk3nak96pjpx";
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        base
+        brillo-rendering
+        bytestring
+        GLFW-b
+        JuicyPixels
+        OpenGLRaw
+        text
+        vector
+        webp
+      ];
+      executableHaskellDepends = [
+        base
+        brillo
+      ];
+      testHaskellDepends = [
+        base
+        brillo
+        bytestring
+        directory
+        filepath
+        GLFW-b
+        JuicyPixels
+        text
+      ];
+      description = "Export Brillo pictures to png, bmp, tga, tiff, gif, svg and juicy-pixels-image";
+      license = lib.licenses.mit;
+      mainProgram = "brillo-export-exe";
+    }
+  ) { };
+
   brillo-juicy = callPackage (
     {
       mkDerivation,
       base,
-      bmp,
       brillo,
       bytestring,
       JuicyPixels,
       vector,
+      webp,
     }:
     mkDerivation {
       pname = "brillo-juicy";
-      version = "0.2.4";
-      sha256 = "1aqvxrxfyfjvhzgjxqivfjsyg06lgsz2irk1j52q14rmydd8h2di";
+      version = "0.3.0";
+      sha256 = "0jwyb2rj2ycqhzm4hqfcxmly2cpp2ajbbbzp28w265yrd1nzkrnj";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
-        bmp
         brillo
         bytestring
         JuicyPixels
         vector
+        webp
       ];
       executableHaskellDepends = [
         base
-        bmp
         brillo
         bytestring
         JuicyPixels
         vector
+        webp
       ];
       description = "Load any image supported by Juicy.Pixels in your brillo application";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "brillo-juicy-viewer";
     }
   ) { };
@@ -117730,23 +118276,27 @@ self: {
       bmp,
       bytestring,
       containers,
+      freetype2,
+      GLFW-b,
       OpenGL,
-      vector,
+      text,
     }:
     mkDerivation {
       pname = "brillo-rendering";
-      version = "1.13.3";
-      sha256 = "0apczzdk7fwkjjkm32rv7i39pjl8jnax9bbgjd8p1095dnqhawiy";
+      version = "2.0.0";
+      sha256 = "1x9igwnych1fjch0s9lnli6dj455qaj4j2pyyd1m874qp7cmk43y";
       libraryHaskellDepends = [
         base
         bmp
         bytestring
         containers
+        freetype2
+        GLFW-b
         OpenGL
-        vector
+        text
       ];
       description = "Brillo picture data types and rendering functions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -117885,7 +118435,7 @@ self: {
         yaml
       ];
       description = "Haskell source code formatter";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "brittany";
       broken = true;
@@ -117958,7 +118508,7 @@ self: {
       ];
       doHaddock = false;
       description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -117971,7 +118521,7 @@ self: {
       libraryHaskellDepends = [ broadcast-chan ];
       doHaddock = false;
       description = "Conduit-based parallel streaming code for broadcast-chan";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -117986,7 +118536,7 @@ self: {
       libraryHaskellDepends = [ broadcast-chan ];
       doHaddock = false;
       description = "Pipes-based parallel streaming code for broadcast-chan";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -118044,7 +118594,7 @@ self: {
         random
       ];
       description = "Helpers for generating tests for broadcast-chan";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -119894,7 +120444,7 @@ self: {
         transformers
       ];
       description = "Build Systems à la Carte";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -119950,7 +120500,7 @@ self: {
         text
       ];
       description = "Compute, fetch and install Cabal build plans into a local environment";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "build-env";
       broken = true;
@@ -120069,7 +120619,7 @@ self: {
         primitive-unaligned
       ];
       description = "bounded ByteArray builder type";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -120431,7 +120981,7 @@ self: {
         split
       ];
       description = "Automatically bump package versions, also transitively";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "bumper";
     }
   ) { };
@@ -120533,7 +121083,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Parse webforms & render to interactive hypertext";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bureaucromancy";
       broken = true;
@@ -120607,7 +121157,7 @@ self: {
         text
       ];
       description = "Parse and render URI templates";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -121149,7 +121699,7 @@ self: {
       sha256 = "0afywcb7n2h2vycxg47myaqz49xrlnjpyq753smildjlkl79jx79";
       libraryHaskellDepends = [ base ];
       description = "Define embeddings of small bit vectors into larger ones";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -121221,56 +121771,12 @@ self: {
       ];
       doHaddock = false;
       description = "Efficient little-endian bit vector library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
   bv-sized = callPackage (
-    {
-      mkDerivation,
-      base,
-      bitwise,
-      bytestring,
-      deepseq,
-      hedgehog,
-      MonadRandom,
-      panic,
-      parameterized-utils,
-      random,
-      tasty,
-      tasty-hedgehog,
-      th-lift,
-    }:
-    mkDerivation {
-      pname = "bv-sized";
-      version = "1.0.6";
-      sha256 = "1whz889kykmsps7z8xai4347gf186c3ygq6v9bgp148hfqqaiqmd";
-      libraryHaskellDepends = [
-        base
-        bitwise
-        bytestring
-        deepseq
-        panic
-        parameterized-utils
-        random
-        th-lift
-      ];
-      testHaskellDepends = [
-        base
-        bytestring
-        hedgehog
-        MonadRandom
-        parameterized-utils
-        tasty
-        tasty-hedgehog
-      ];
-      description = "a bitvector datatype that is parameterized by the vector width";
-      license = lib.licenses.bsd3;
-    }
-  ) { };
-
-  bv-sized_1_0_7 = callPackage (
     {
       mkDerivation,
       base,
@@ -121290,6 +121796,8 @@ self: {
       pname = "bv-sized";
       version = "1.0.7";
       sha256 = "1hs83r58hxpchacrhhgvzkkx4vk50vz93njx6i1c93d14yaalysn";
+      revision = "1";
+      editedCabalFile = "02g265s8xfkl3xkv3fs0lyw6khip6p02vp8wl4bc8429bi7jmy0f";
       libraryHaskellDepends = [
         base
         bitwise
@@ -121311,7 +121819,6 @@ self: {
       ];
       description = "a bitvector datatype that is parameterized by the vector width";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -121334,7 +121841,7 @@ self: {
         parameterized-utils
       ];
       description = "Well-typed lenses for bv-sized bitvectors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -121371,7 +121878,7 @@ self: {
         tasty-hunit
       ];
       description = "Give aliases to record fields";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -121432,7 +121939,7 @@ self: {
         text
       ];
       description = "Library for creating command-line interfaces (colors, menus, etc.)";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -121489,7 +121996,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Sets and maps with 8-bit words for keys";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -121525,7 +122032,7 @@ self: {
         text
       ];
       description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       maintainers = [ lib.maintainers.danielrolls ];
     }
   ) { };
@@ -121554,7 +122061,7 @@ self: {
         wide-word
       ];
       description = "Portable big-endian and little-endian conversions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -121671,7 +122178,7 @@ self: {
         text-short
       ];
       description = "Build byte arrays";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -121754,7 +122261,7 @@ self: {
         unordered-containers
       ];
       description = "Universal hashing of bytes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -121781,7 +122288,7 @@ self: {
         primitive
       ];
       description = "Fast logging";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
     }
   ) { };
@@ -121989,7 +122496,7 @@ self: {
         random
       ];
       description = "Calculate string metrics on Bytes efficiently";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -122018,7 +122525,7 @@ self: {
         tasty-hunit
       ];
       description = "Template haskell macro for casing on Bytes";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -122095,7 +122602,7 @@ self: {
         gauge
       ];
       description = "Slicing managed and unmanaged memory";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -122149,7 +122656,7 @@ self: {
         primitive
       ];
       description = "Nonresumable byte parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -122197,7 +122704,7 @@ self: {
         tasty-bench
       ];
       description = "Fast, compact, strict and lazy byte strings with a list interface";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -122223,7 +122730,7 @@ self: {
         text
       ];
       description = "Aeson instances for ByteString, using base 64 encoding";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -122572,7 +123079,7 @@ self: {
         mono-traversable
       ];
       description = "Byte String implemented on Finger Tree";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -122638,7 +123145,7 @@ self: {
         tasty-smallcheck
       ];
       description = "Efficiently parse and produce common integral and fractional numbers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -122915,7 +123422,7 @@ self: {
         rerebase
       ];
       description = "An efficient strict bytestring builder";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -122938,7 +123445,7 @@ self: {
         primitive
       ];
       description = "break bytestrings up into substrings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -123050,7 +123557,7 @@ self: {
         criterion
       ];
       description = "A very efficient ByteString builder implementation based on the binary tree";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -123100,7 +123607,7 @@ self: {
         QuickCheck
       ];
       description = "An efficient finite map from bytestrings to values";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -123243,7 +123750,7 @@ self: {
         unpacked-maybe
       ];
       description = "Tries with Bytes as keys";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -123388,7 +123895,7 @@ self: {
         tasty-hunit
       ];
       description = "High-level bindings to bz3";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -123423,7 +123930,7 @@ self: {
       sha256 = "0iax0fq5y24lcjkjsk66khry9s6v9hhd3zfrwg8mvgs07waq2m59";
       doHaddock = false;
       description = "bzip2 C sources";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -124057,7 +124564,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Manipulate patterns in cellular automata, create and parse RLE files";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -124226,7 +124733,7 @@ self: {
         temporary
       ];
       description = "Extend Cabal build-depends from the command line";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-add";
     }
@@ -124289,7 +124796,7 @@ self: {
         temporary
       ];
       description = "Extend Cabal build-depends from the command line";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "cabal-add";
     }
   ) { };
@@ -124484,7 +124991,7 @@ self: {
         time
       ];
       description = "Bundling C/C++ projects in Cabal package made easy";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -124634,7 +125141,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "CI Assistant for Haskell projects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-cache";
     }
@@ -124901,18 +125408,19 @@ self: {
         text
       ];
       description = "Create a Debianization for a Cabal package";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-debian";
       broken = true;
     }
   ) { };
 
-  cabal-debian_5_4_4 = callPackage (
+  cabal-debian_5_5 = callPackage (
     {
       mkDerivation,
       base,
       Cabal,
+      Cabal-syntax,
       containers,
       data-default,
       debian,
@@ -124926,6 +125434,7 @@ self: {
       mtl,
       network-uri,
       optparse-applicative,
+      ordered-containers,
       parsec,
       pretty,
       prettyprinter,
@@ -124940,13 +125449,14 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-debian";
-      version = "5.4.4";
-      sha256 = "1q1wfq0m00b7hz9csncnbp176x8d901fk43hsziqjv3jdx99na0q";
+      version = "5.5";
+      sha256 = "1jwhw1h88aqdjc7bbnzs6q7waal54v5cg0gjyqwfpxbcjji8ppbp";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
         Cabal
+        Cabal-syntax
         containers
         data-default
         debian
@@ -124960,6 +125470,7 @@ self: {
         mtl
         network-uri
         optparse-applicative
+        ordered-containers
         parsec
         pretty
         prettyprinter
@@ -124975,7 +125486,7 @@ self: {
       executableHaskellDepends = [ base ];
       testHaskellDepends = [
         base
-        Cabal
+        Cabal-syntax
         containers
         debian
         Diff
@@ -124989,7 +125500,7 @@ self: {
         text
       ];
       description = "Create a Debianization for a Cabal package";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-debian";
       broken = true;
@@ -125043,7 +125554,7 @@ self: {
         QuickCheck
       ];
       description = "QuickCheck for Cabal tests";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -125195,7 +125706,7 @@ self: {
         time
       ];
       description = "Cabal utility";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-edit";
       broken = true;
@@ -125349,7 +125860,7 @@ self: {
         doctest-parallel
       ];
       description = "Fix for cabal files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-fix";
       broken = true;
@@ -125409,7 +125920,7 @@ self: {
         zlib
       ];
       description = "Generate a FlatPak manifest from a Cabal package description";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "cabal-flatpak";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -125596,13 +126107,13 @@ self: {
         transformers
       ];
       description = "Formats package descriptions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "cabal-gild";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
 
-  cabal-gild_1_7_0_1 = callPackage (
+  cabal-gild_1_7_0_2 = callPackage (
     {
       mkDerivation,
       base,
@@ -125622,8 +126133,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-gild";
-      version = "1.7.0.1";
-      sha256 = "1r7bzwfacvjwvsdp1gbh91nrwsc7wlxd7kcnsmhxwkdc25m61yrp";
+      version = "1.7.0.2";
+      sha256 = "18a8p7imdsi4yix6qh0qwpi5knw17gj8nj3zzlpd9s88ydl6yq75";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -125653,7 +126164,7 @@ self: {
         transformers
       ];
       description = "Formats package descriptions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-gild";
       maintainers = [ lib.maintainers.turion ];
@@ -125781,7 +126292,7 @@ self: {
       ];
       doCheck = false;
       description = "Give Haskell development tools access to Cabal project environment";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -125848,7 +126359,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "generate hoogle database for cabal project and dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "cabal-hoogle";
     }
   ) { };
@@ -126032,7 +126543,7 @@ self: {
             mv bash-completion $out/share/bash-completion/completions
           '';
           description = "The command-line interface for Cabal and Hackage";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           mainProgram = "cabal";
           maintainers = [ lib.maintainers.sternenseemann ];
@@ -126416,7 +126927,7 @@ self: {
         tasty-quickcheck
       ];
       description = "The solver component of cabal-install";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -126577,7 +127088,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Matrix builds for cabal";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-matrix";
       broken = true;
@@ -126719,7 +127230,7 @@ self: {
         process
       ];
       description = "Make Cabal aware of pkg-config package versions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.roberth ];
     }
   ) { };
@@ -126787,7 +127298,7 @@ self: {
         vector
       ];
       description = "Library and utility for processing cabal's plan.json file";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       mainProgram = "cabal-plan";
     }
   ) { };
@@ -126821,7 +127332,7 @@ self: {
         text
       ];
       description = "Derives cabal bounds from build plans";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       mainProgram = "cabal-plan-bounds";
       maintainers = [ lib.maintainers.nomeata ];
     }
@@ -126949,6 +127460,65 @@ self: {
     }
   ) { };
 
+  cabal-rpm_2_3_2 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      Cabal,
+      cached-json-file,
+      directory,
+      extra,
+      fedora-krb,
+      filepath,
+      html-entities,
+      http-client,
+      http-client-tls,
+      http-query,
+      safe,
+      simple-cabal,
+      simple-cmd,
+      simple-cmd-args,
+      text,
+      time,
+      unix,
+    }:
+    mkDerivation {
+      pname = "cabal-rpm";
+      version = "2.3.2";
+      sha256 = "1sn44smpwihp0w7jml95b78ylgca3wbdzj4m8hyx8wq2qcpwva1q";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        Cabal
+        cached-json-file
+        directory
+        extra
+        fedora-krb
+        filepath
+        html-entities
+        http-client
+        http-client-tls
+        http-query
+        safe
+        simple-cabal
+        simple-cmd
+        simple-cmd-args
+        text
+        time
+        unix
+      ];
+      description = "RPM packaging tool for Haskell Cabal-based packages";
+      license = lib.licenses.gpl3Only;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "cabal-rpm";
+    }
+  ) { };
+
   cabal-scaffold = callPackage (
     {
       mkDerivation,
@@ -127038,7 +127608,7 @@ self: {
         yaml
       ];
       executableHaskellDepends = [ base ];
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-scaffold";
       broken = true;
@@ -127162,7 +127732,7 @@ self: {
         utility-ht
       ];
       description = "Topologically sort cabal packages";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -127209,7 +127779,7 @@ self: {
         utility-ht
       ];
       description = "Topologically sort cabal packages";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -127714,8 +128284,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal2nix";
-      version = "2.21.0";
-      sha256 = "0jqmk22wgq9ab3jx93ab181bnwdcand2y2hvj32b1czzb5jrqhg9";
+      version = "2.21.2";
+      sha256 = "05janvispyh5sq77klzyhkwzqix4x2bf0mn7bvxb1qwsd02ygzxv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -128308,8 +128878,8 @@ self: {
     }:
     mkDerivation {
       pname = "cached-io";
-      version = "1.3.1.0";
-      sha256 = "0xfm64bhm0xpw2fqxzrxxzq4nlzybvvhis2093agzn3pbv0xif9v";
+      version = "1.3.2.0";
+      sha256 = "1hjh90gbd4y48v98p53r0sy1vvcar6cwq1vp4zd4z109j3f509dk";
       libraryHaskellDepends = [
         base
         exceptions
@@ -128322,7 +128892,7 @@ self: {
         tasty-hunit
       ];
       description = "A simple library to cache IO actions";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -128420,7 +128990,7 @@ self: {
         transformers
       ];
       description = "Cache combinators";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -128678,7 +129248,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Command-line client for Nix binary cache hosting https://cachix.org";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       maintainers = [ lib.maintainers.domenkozar ];
     }
   ) { inherit (pkgs) nix; };
@@ -128752,7 +129322,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Servant HTTP API specification for https://cachix.org";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       maintainers = [ lib.maintainers.domenkozar ];
     }
   ) { };
@@ -128851,7 +129421,7 @@ self: {
         random
       ];
       description = "That rabbit's got a vicious streak a mile wide!";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -128963,7 +129533,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ cairo ];
       description = "Binding to the Cairo library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) cairo; };
 
@@ -130009,7 +130579,7 @@ self: {
         QuickCheck
       ];
       description = "HIE-based Haskell call graph and source code visualizer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "calligraphy";
     }
   ) { };
@@ -130304,8 +130874,8 @@ self: {
     }:
     mkDerivation {
       pname = "canadian-income-tax";
-      version = "2024.1.0.1";
-      sha256 = "04q4p0f4cmrg8zljbb79pmz1jbisv41zcz9g13gkqgp4q9r5di9s";
+      version = "2025.0";
+      sha256 = "0k0v57dksww0c770jcp5wl1hl68w4vqilcw0sxjavcc43a228w9y";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -130367,7 +130937,7 @@ self: {
         time
       ];
       description = "Canadian income tax calculation";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -130862,7 +131432,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Convert data to and from a natural number representation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -131217,7 +131787,7 @@ self: {
         vector
       ];
       description = "Cap'n Proto for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "capnpc-haskell";
     }
@@ -132385,11 +132955,10 @@ self: {
       casa-types,
       conduit,
       conduit-extra,
-      crypton,
+      cryptohash-sha256,
       exceptions,
       http-conduit,
       http-types,
-      memory,
       network-uri,
       resourcet,
       template-haskell,
@@ -132400,8 +132969,8 @@ self: {
     }:
     mkDerivation {
       pname = "casa-client";
-      version = "0.0.3";
-      sha256 = "0jsnb4a9wwsyxr7i177hsfkybd4qya39jbx2rgyi8l0aiv31vc25";
+      version = "0.0.4";
+      sha256 = "1ji8qr012ywa4knz8s7m34dqai9gh78d6dkzj47lbiy9xgrr4i05";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -132411,11 +132980,10 @@ self: {
         casa-types
         conduit
         conduit-extra
-        crypton
+        cryptohash-sha256
         exceptions
         http-conduit
         http-types
-        memory
         network-uri
         resourcet
         template-haskell
@@ -132870,7 +133438,7 @@ self: {
         rerebase
       ];
       description = "A converter for spinal, snake and camel cases";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -133677,7 +134245,7 @@ self: {
         vector
       ];
       description = "io-streams interface for the cassava CSV library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -133716,7 +134284,7 @@ self: {
         vector
       ];
       description = "`TemplateHaskell` helpers for `cassava`";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -133862,7 +134430,7 @@ self: {
         text
       ];
       description = "Portable CRC-32C";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -134205,8 +134773,8 @@ self: {
     }:
     mkDerivation {
       pname = "category-printf";
-      version = "0.1.1.0";
-      sha256 = "198bpnmmkwzx9z0n850pgzr2i9yw0kmd4g2m3fhifkhgy6zfidji";
+      version = "0.1.1.1";
+      sha256 = "0cg5d8m05arl724mkn2h7aaaqd2r09j6hm4dshvnhx8phlag5rm9";
       libraryHaskellDepends = [
         base
         bytestring
@@ -134400,7 +134968,7 @@ self: {
       ];
       doHaddock = false;
       description = "Dependency injection library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "cauldron-example-wiring";
     }
   ) { };
@@ -134680,7 +135248,7 @@ self: {
         vector
       ];
       description = "Bindings to read Crystallographic Binary Files (mostly from detectors)";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cbf-bench-binary";
       broken = true;
@@ -135236,7 +135804,7 @@ self: {
         websockets
       ];
       description = "A library for the Chrome Devtools Protocol";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -136011,7 +136579,7 @@ self: {
         unordered-containers
       ];
       description = "Integration of \"cereal\" and \"unordered-containers\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -136230,7 +136798,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Type directed application configuration parsing and accessors";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -136408,7 +136976,7 @@ self: {
         base-prelude
       ];
       description = "A Future type that is easy to represent and handle in C/C++";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -136643,8 +137211,8 @@ self: {
     }:
     mkDerivation {
       pname = "cgrep";
-      version = "9.0.0";
-      sha256 = "1mdrs9gvsi1vg1pg0isl8s6y6kc644p1pydilwv88lpsyfsf94qa";
+      version = "9.1.0";
+      sha256 = "1zzccmjhnlvf1q7n1zcmym1m62fkwd9a39rq2fjj457jzh9cgk8b";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -136692,7 +137260,7 @@ self: {
         yaml
       ];
       description = "Command line tool";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cgrep";
       broken = true;
@@ -136730,7 +137298,7 @@ self: {
         path-io
       ];
       description = "A container-/cgroup-aware substitute for the GHC RTS `-N` flag";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -136869,7 +137437,7 @@ self: {
         time
       ];
       description = "Mining Client for Kadena Chainweb";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "chainweb-mining-client";
     }
@@ -137308,7 +137876,7 @@ self: {
         witherable
       ];
       description = "Stateful monad transformer based on monoidal actions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -137341,7 +137909,7 @@ self: {
         tasty-hunit
       ];
       description = "Stateful monad transformer based on monoidal actions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -137387,7 +137955,7 @@ self: {
         tasty-hunit
       ];
       description = "Stateful monad transformer based on monoidal actions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -137416,7 +137984,7 @@ self: {
         some
       ];
       description = "Stateful monad transformer based on monoidal actions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -137464,7 +138032,7 @@ self: {
         vector
       ];
       description = "A diagnostics library for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -137579,7 +138147,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Pattern synonyms for ASCII characters for Word8, Word16 etc";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -137819,7 +138387,7 @@ self: {
         time
       ];
       description = "Charting library targetting SVGs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -137882,7 +138450,7 @@ self: {
         numhask
       ];
       description = "See readme.md";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "chart-svg-various";
     }
@@ -138576,7 +139144,7 @@ self: {
         QuickCheck
       ];
       description = "Checks context free grammar for ambiguity using brute force up to given limit";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -138867,7 +139435,7 @@ self: {
         transformers
       ];
       description = "A simple and intuitive library for automated testing";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -138890,7 +139458,7 @@ self: {
         HUnit
       ];
       description = "HUnit support for Chell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -138915,7 +139483,7 @@ self: {
         random
       ];
       description = "QuickCheck support for Chell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -139190,7 +139758,7 @@ self: {
         containers
       ];
       description = "A Library for Chess Game Logic";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -139308,7 +139876,7 @@ self: {
         text
       ];
       description = "Parse and scrape recipe blogs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "chez-grater";
       broken = true;
@@ -139378,7 +139946,7 @@ self: {
         uuid
       ];
       description = "A tmux client for Polysemy";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -139450,7 +140018,7 @@ self: {
         tasty-hedgehog
       ];
       description = "Testing tools for chiasma";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -139509,7 +140077,7 @@ self: {
         vector
       ];
       description = "Lazy infinite streams with O(1) indexing and applications for memoization";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -139581,11 +140149,11 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "choice";
-      version = "0.2.4.1";
-      sha256 = "099c5ibal8llzr5nh62dnpb1pwj30gxqwdcjx0rds51ga2j32z5i";
+      version = "0.2.4.2";
+      sha256 = "0v9yykg2ip6y1cf25d101nvpsn8p1p4mw213pmi3005qqhv17hcc";
       libraryHaskellDepends = [ base ];
       description = "A solution to boolean blindness";
-      license = lib.licenses.publicDomain;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -140293,7 +140861,7 @@ self: {
         time
       ];
       description = "A high-performance time library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -140333,7 +140901,7 @@ self: {
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Benchmarking tool with focus on comparing results";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "chronos";
       broken = true;
@@ -140598,7 +141166,7 @@ self: {
       sha256 = "018k9a014q4zprsla5k5hrdq1zwpp7hmckc0ldaj7nf6vg1hxas2";
       libraryHaskellDepends = [ base ];
       description = "Automatically convert Generic instances to and from church representations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -140701,7 +141269,7 @@ self: {
         unagi-chan
       ];
       description = "Channel/Arrow based streaming computation library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -140761,7 +141329,7 @@ self: {
         uuid
       ];
       description = "API bindings to IOHK's Cicero job scheduler";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cicero-cli";
       broken = true;
@@ -140885,8 +141453,8 @@ self: {
     }:
     mkDerivation {
       pname = "cimple";
-      version = "0.0.30";
-      sha256 = "1x7dkkjiays4yc7j4bi35qgcn44gzanxzcrfrf517jwnykishyc0";
+      version = "0.0.32";
+      sha256 = "19xb0z9gngkm24mzjr3fpzdxrcwfy2z9i871llydiy47dh3blaph";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -141637,7 +142205,7 @@ self: {
         vector
       ];
       description = "Circular fixed-sized mutable vectors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -141658,7 +142226,7 @@ self: {
         hspec
       ];
       description = "Make bounded enum types circular";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -141919,12 +142487,12 @@ self: {
         transformers
       ];
       description = "Generates citations and bibliography from CSL styles";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       maintainers = [ lib.maintainers.sternenseemann ];
     }
   ) { };
 
-  citeproc_0_12 = callPackage (
+  citeproc_0_13 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -141953,8 +142521,8 @@ self: {
     }:
     mkDerivation {
       pname = "citeproc";
-      version = "0.12";
-      sha256 = "1b3dlh3904cxckh5kc4b2ilnsy9rhfhr90qkcwagfaz4chkdbhfl";
+      version = "0.13";
+      sha256 = "1dvpb2yh4z84xcw95pdzfmwlll6bdz0in382ilhwd3jhd7jy4b67";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -141992,7 +142560,7 @@ self: {
         transformers
       ];
       description = "Generates citations and bibliography from CSL styles";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.sternenseemann ];
     }
@@ -142662,7 +143230,7 @@ self: {
         time
       ];
       description = "Type-safe DSL for healthcare claims validation and X12 processing";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "claims-x12-dsl-exe";
     }
   ) { };
@@ -142919,7 +143487,7 @@ self: {
         tasty-hunit
       ];
       description = "A class for types with only finitely many inhabitants";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -143019,7 +143587,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Clash: a functional hardware description language - GHC frontend";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -143186,7 +143754,7 @@ self: {
         unordered-containers
       ];
       description = "Clash: a functional hardware description language - As a library";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       mainProgram = "v16-upgrade-primitives";
     }
   ) { };
@@ -143234,7 +143802,7 @@ self: {
         transformers
       ];
       description = "Hedgehog Generators for clash-lib";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -143389,7 +143957,7 @@ self: {
         template-haskell
       ];
       description = "Clash: a functional hardware description language - Prelude library";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -143416,7 +143984,7 @@ self: {
         text
       ];
       description = "Hedgehog Generators for clash-prelude";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -143804,7 +144372,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "An interface for a handler-independent, typeclass-based effect system";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -143833,7 +144401,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "An interface for a handler-independent, typeclass-based effect system";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -143874,7 +144442,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Automatic compliance with the classy-effects protocols";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -144204,8 +144772,8 @@ self: {
     }:
     mkDerivation {
       pname = "claude";
-      version = "1.0.1";
-      sha256 = "1jsga6n5ws5m9wf2n1l7gck7n0d2928f9r094vf26s88vm9dl64q";
+      version = "1.4.0";
+      sha256 = "08glyqfkf1zx42mcqqii9d4ydhrbsg0n3dlizhihpnnrdd1rybik";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -144244,7 +144812,7 @@ self: {
         vector
       ];
       description = "Servant bindings to Anthropic's Claude API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -146107,8 +146675,8 @@ self: {
     }:
     mkDerivation {
       pname = "climb";
-      version = "0.5.1";
-      sha256 = "0sn3cn9l1ibbr1vm87phxwdlcwwgwlvannm14v5r6af3b274ibhy";
+      version = "0.7.0";
+      sha256 = "023hh9i70pwxb5v8gxgv18g2391pkyxwjmbw86wii90k4c78nk15";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -146561,7 +147129,7 @@ self: {
         unix
       ];
       description = "Project file manager for Claude AI integrations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -146704,7 +147272,7 @@ self: {
         template-haskell
       ];
       description = "Closed type class declarations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -146927,7 +147495,7 @@ self: {
         warp
       ];
       description = "Lightweight and efficient choreographic programming for cloud services";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -146968,7 +147536,7 @@ self: {
         time
       ];
       description = "Unofficial Haskell SDK for the CloudEvents specification";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -147130,7 +147698,7 @@ self: {
         template-haskell
       ];
       description = "CLI tool to easily spin up and control compute instances in various cloud environments";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "cloudy";
       maintainers = [ lib.maintainers.cdepillabout ];
     }
@@ -147918,7 +148486,7 @@ self: {
         text
       ];
       description = "Collection of Lens for cmark-gfm with minimal dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -147981,7 +148549,7 @@ self: {
         text
       ];
       description = "Collection of lens for CMark with minimal dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -148343,7 +148911,7 @@ self: {
         hedgehog
       ];
       description = "(C)oncurrent (M)onoidal (F)olds";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -148830,7 +149398,7 @@ self: {
         hedgehog
       ];
       description = "Composable Contravariant Comonadic Logging Library";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -148853,7 +149421,7 @@ self: {
         stm
       ];
       description = "Asynchronous backend for co-log library";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -148875,7 +149443,7 @@ self: {
         Glob
       ];
       description = "Composable Contravariant Comonadic Logging Library";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -148927,7 +149495,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "effectful log effect using co-log-core";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -148958,7 +149526,7 @@ self: {
         text
       ];
       description = "Structured messages support in co-log ecosystem";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -148988,7 +149556,7 @@ self: {
         polysemy
       ];
       description = "Composable Contravariant Comonadic Logging Library";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       mainProgram = "play-colog-poly";
     }
   ) { };
@@ -149034,7 +149602,7 @@ self: {
         polysemy-plugin
       ];
       description = "A Polysemy logging effect for high quality (unstructured) logs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
       broken = true;
@@ -149072,7 +149640,7 @@ self: {
         co-log
       ];
       description = "Simple enhancements for logging with co-log";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       mainProgram = "co-log-simple";
     }
   ) { };
@@ -149237,14 +149805,13 @@ self: {
         vector
       ];
       description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
   cobot-io = callPackage (
     {
       mkDerivation,
-      array,
       attoparsec,
       base,
       binary,
@@ -149271,10 +149838,9 @@ self: {
     }:
     mkDerivation {
       pname = "cobot-io";
-      version = "0.1.5.5";
-      sha256 = "1j41byh9swjj09rlwjxdhwvdnjm2gnf8y4zxv0mwpgmdc18bwszy";
+      version = "0.1.5.7";
+      sha256 = "1bfki5ak33dx6dwzxqaa56iphk3ab5358lpbxayzw724dbzjfn3q";
       libraryHaskellDepends = [
-        array
         attoparsec
         base
         binary
@@ -149296,7 +149862,6 @@ self: {
         vector
       ];
       testHaskellDepends = [
-        array
         attoparsec
         base
         binary
@@ -149922,7 +150487,7 @@ self: {
         transformers
       ];
       description = "CodeT";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -149963,7 +150528,7 @@ self: {
         transformers
       ];
       description = "GHC type-checker plugin for solving LiftT instances from codet";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -150197,7 +150762,7 @@ self: {
       sha256 = "1g2a723xlbj2blpyfgcr6jg6a2yyca7pa5dgw9jnpip98hssmhsa";
       libraryHaskellDepends = [ base ];
       description = "Coercions with improved type inference";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -150211,7 +150776,7 @@ self: {
       editedCabalFile = "01zvrzly922rxf1cl9g8fh6hz8963xl1mmr30pbsbxfl1246ilbw";
       libraryHaskellDepends = [ base ];
       description = "Coercible but only in one direction";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -150234,7 +150799,7 @@ self: {
         profunctors
       ];
       description = "Combine profunctors with coercible-subtypes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -150865,7 +151430,7 @@ self: {
         tasty-hunit
       ];
       description = "Equivariant CSM classes of coincident root loci";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -150922,7 +151487,7 @@ self: {
             utility-ht
           ];
           description = "Linear Programming using COIN-OR/CLP and comfort-array";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           badPlatforms = [ "aarch64-linux" ];
           maintainers = [ lib.maintainers.thielema ];
         }
@@ -151594,7 +152159,7 @@ self: {
         hashable
       ];
       description = "Generate a color for a hashable object";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -151818,7 +152383,6 @@ self: {
       ];
       description = "Working with colours in Accelerate";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -151907,7 +152471,7 @@ self: {
         text
       ];
       description = "Print and parse colors";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -151941,7 +152505,7 @@ self: {
         text
       ];
       description = "Convenient interface for printing colourful messages";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -152525,7 +153089,7 @@ self: {
         mtl
       ];
       description = "Collection of combinators over standard typeclasses";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -152664,7 +153228,7 @@ self: {
       ];
       doHaddock = false;
       description = "Additional shape types for the comfort-array package";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -152719,7 +153283,7 @@ self: {
         utility-ht
       ];
       description = "Numerical Basic Linear Algebra using BLAS";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -152764,7 +153328,7 @@ self: {
         storable-record
       ];
       description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -152816,7 +153380,7 @@ self: {
         utility-ht
       ];
       description = "Linear Programming using GLPK and comfort-array";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { inherit (pkgs) glpk; };
@@ -153087,7 +153651,7 @@ self: {
         unordered-containers
       ];
       description = "A command line argument/option parser library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "task-manager";
     }
   ) { };
@@ -153113,7 +153677,7 @@ self: {
         mtl
       ];
       description = "A monad for commanders";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -153237,7 +153801,7 @@ self: {
         text
       ];
       description = "Pure Haskell commonmark parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -153363,7 +153927,7 @@ self: {
         text
       ];
       description = "An initial encoding of the CommonMark language";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -153427,7 +153991,7 @@ self: {
         yaml
       ];
       description = "Simple interface to commonmark-hs for parsing real-world Markdown";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -153481,7 +154045,7 @@ self: {
         url-slug
       ];
       description = "Obsidian-friendly commonmark wikilink parser";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -153605,7 +154169,7 @@ self: {
         containers
       ];
       description = "Commutative semigroups";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -153637,6 +154201,49 @@ self: {
     }
   ) { };
 
+  comonad-coactions = callPackage (
+    {
+      mkDerivation,
+      adjunctions,
+      base,
+      checkers,
+      comonad,
+      containers,
+      free,
+      kan-extensions,
+      QuickCheck,
+      tasty,
+      tasty-quickcheck,
+      template-haskell,
+    }:
+    mkDerivation {
+      pname = "comonad-coactions";
+      version = "0.1.0.0";
+      sha256 = "1y7svy4sggpm1ycvr62iih0ix23k360gj6qis5f6z7w3qp3ivgrq";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        adjunctions
+        base
+        comonad
+        free
+        kan-extensions
+        template-haskell
+      ];
+      testHaskellDepends = [
+        base
+        checkers
+        comonad
+        containers
+        QuickCheck
+        tasty
+        tasty-quickcheck
+      ];
+      description = "Coactions of comonads on functors";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
+    }
+  ) { };
+
   comonad-extras = callPackage (
     {
       mkDerivation,
@@ -153845,7 +154452,7 @@ self: {
         yaml
       ];
       description = "Compatibility checker for OpenAPI";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -154028,7 +154635,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Stacks, queues, and deques with compact representations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -155854,6 +156461,7 @@ self: {
       description = "Plugin to generalize comprehensions";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -156265,7 +156873,7 @@ self: {
       sha256 = "0aprzrslrbsl3d7j49nmx0kxx71m39zi7xlfyw8wnazqpi8mfwwb";
       libraryHaskellDepends = [ base ];
       description = "Concurrent actions that may fail with a value";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -156306,6 +156914,30 @@ self: {
     }
   ) { };
 
+  concoct = callPackage (
+    {
+      mkDerivation,
+      base,
+      mtl,
+    }:
+    mkDerivation {
+      pname = "concoct";
+      version = "0.1.0";
+      sha256 = "1nrfi51ah5bfpj040kqjblgfgyq15gllrmaj3qdnvw3c4qy091pj";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        mtl
+      ];
+      executableHaskellDepends = [ base ];
+      testHaskellDepends = [ base ];
+      description = "A declarative UI framework";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "ui";
+    }
+  ) { };
+
   concorde = callPackage (
     {
       mkDerivation,
@@ -159048,8 +159680,8 @@ self: {
       pname = "conferer";
       version = "1.1.0.0";
       sha256 = "1hkdrqxrac1mbzvd29f6ds4cbihdv0j0daai7yc282myv0varh09";
-      revision = "5";
-      editedCabalFile = "1zg5qxjimmcxqzzi7mpiby8kh39zn9dmxmlidd1wiq6qlmg8l0a6";
+      revision = "6";
+      editedCabalFile = "1ic8c64jx0ql6vrhxrx6xkwcll5rjm5zfijzp6hh7gp2dj1qmbi2";
       libraryHaskellDepends = [
         base
         bytestring
@@ -159374,10 +160006,8 @@ self: {
     }:
     mkDerivation {
       pname = "conferer-snap";
-      version = "1.0.0.0";
-      sha256 = "15gz77b5jf35hmcnd6kza1wgzpbgk3pcvhi7mp7yk64ybksld98r";
-      revision = "3";
-      editedCabalFile = "1003bs7v68gafav7skvrbjnj21hk4lcdgjnmwc53k4nzp80nd367";
+      version = "1.1.0.0";
+      sha256 = "165acbsh3kxpxclkjayhk57r2f4m9rq3f0ynqb2bnqpp6pnfx5g4";
       libraryHaskellDepends = [
         base
         conferer
@@ -159866,7 +160496,7 @@ self: {
         text
       ];
       description = "Schema definitions for the config-value package";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -159932,7 +160562,7 @@ self: {
         text
       ];
       description = "Simple, layout-based value language similar to YAML or JSON";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -160137,7 +160767,7 @@ self: {
         yaml
       ];
       description = "Tools for specifying and parsing configurations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "example";
     }
   ) { };
@@ -160451,7 +161081,7 @@ self: {
         text
       ];
       description = "Tracable multi-source config management";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -160971,7 +161601,7 @@ self: {
         doctest
       ];
       description = "A safe interface for Const summarization";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -161223,7 +161853,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Existential type that can be constrained";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -161336,42 +161966,6 @@ self: {
   ) { };
 
   constraints = callPackage (
-    {
-      mkDerivation,
-      base,
-      binary,
-      boring,
-      deepseq,
-      hashable,
-      hspec,
-      hspec-discover,
-      mtl,
-      transformers,
-    }:
-    mkDerivation {
-      pname = "constraints";
-      version = "0.14.3";
-      sha256 = "1c3vsybgzd35rrydza7kjh1m92kb7hhamxfz61zii9imhk2gjjjq";
-      libraryHaskellDepends = [
-        base
-        binary
-        boring
-        deepseq
-        hashable
-        mtl
-        transformers
-      ];
-      testHaskellDepends = [
-        base
-        hspec
-      ];
-      testToolDepends = [ hspec-discover ];
-      description = "Constraint manipulation";
-      license = lib.licensesSpdx."BSD-2-Clause";
-    }
-  ) { };
-
-  constraints_0_14_4 = callPackage (
     {
       mkDerivation,
       base,
@@ -161403,8 +161997,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Constraint manipulation";
-      license = lib.licensesSpdx."BSD-2-Clause";
-      hydraPlatforms = lib.platforms.none;
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -161785,7 +162378,7 @@ self: {
         transformers-base
       ];
       description = "Concurrent PostgreSQL data consumers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -161849,7 +162442,7 @@ self: {
         transformers-base
       ];
       description = "Concurrent PostgreSQL data consumers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -161887,7 +162480,7 @@ self: {
         transformers-base
       ];
       description = "Prometheus metrics for the consumers library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -161969,7 +162562,7 @@ self: {
         template-haskell
       ];
       description = "Assorted concrete container types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -162283,7 +162876,7 @@ self: {
         text-show
       ];
       description = "Generate art from context-free grammars";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "examples";
     }
   ) { };
@@ -162537,7 +163130,7 @@ self: {
         weigh
       ];
       description = "Unified interface for primitive arrays";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -162892,7 +163485,7 @@ self: {
         witherable
       ];
       description = "Higher-order functions with their function arguments at the end, for channeling the full power of BlockArguments and LambdaCase";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -163659,7 +164252,7 @@ self: {
         template-haskell
       ];
       description = "Statically typed unit conversions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -163825,7 +164418,7 @@ self: {
       ];
       doHaddock = false;
       description = "A type-safe client generator for Convex for both Rust and Python";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "convex-schema-parser";
       broken = true;
@@ -163859,7 +164452,7 @@ self: {
         Unique
       ];
       description = "Convex hull";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -163962,7 +164555,7 @@ self: {
         time
       ];
       description = "For serving cookies";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -164022,7 +164615,7 @@ self: {
         megaparsec
       ];
       description = "Parser for the Cook markup language";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cooklang-hs";
       broken = true;
@@ -164096,7 +164689,7 @@ self: {
     }
   ) { };
 
-  copilot_4_6_1 = callPackage (
+  copilot_4_7 = callPackage (
     {
       mkDerivation,
       base,
@@ -164112,8 +164705,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot";
-      version = "4.6.1";
-      sha256 = "12sxdyv0vc9z8qz3vqghk2km3fzkhyqqizpgl3mrndcgz584y3h5";
+      version = "4.7";
+      sha256 = "1z842g8d3crhjfxmchail95dhy9pdss3p3lpz7y5wmpxviw0zjvy";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -164148,8 +164741,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-bluespec";
-      version = "4.6.1";
-      sha256 = "1krfc6zhdj728x0v3xm9b69h16ci8hsqqhhnrqjsl9p2w0hvlli7";
+      version = "4.7";
+      sha256 = "0pb9393wh1hicrhpda86q9vy53yjb98ls0j02ixq9isnh9sa2v86";
       libraryHaskellDepends = [
         base
         copilot-core
@@ -164220,7 +164813,7 @@ self: {
     }
   ) { };
 
-  copilot-c99_4_6_1 = callPackage (
+  copilot-c99_4_7 = callPackage (
     {
       mkDerivation,
       base,
@@ -164242,8 +164835,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-c99";
-      version = "4.6.1";
-      sha256 = "109854rkpgd5b5j2mdgj3vvmrksbprsv6gbcgp0my455r7sxhh0g";
+      version = "4.7";
+      sha256 = "0i7qlx3fc8bldqhbl2d495jmiwpxmp38w7qaf90116z5gny2grq3";
       libraryHaskellDepends = [
         base
         copilot-core
@@ -164334,7 +164927,7 @@ self: {
     }
   ) { };
 
-  copilot-core_4_6_1 = callPackage (
+  copilot-core_4_7 = callPackage (
     {
       mkDerivation,
       base,
@@ -164346,8 +164939,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-core";
-      version = "4.6.1";
-      sha256 = "1jhrck3rw1y20c7xzzgnvr2x7dzqgs7qhysv24pa5d5mnylpa3py";
+      version = "4.7";
+      sha256 = "1z0lax28n3b3i3k3rycixd6jl5qc2hzwna73xhf7wb0nvs635xw1";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -164434,7 +165027,7 @@ self: {
     }
   ) { };
 
-  copilot-interpreter_4_6_1 = callPackage (
+  copilot-interpreter_4_7 = callPackage (
     {
       mkDerivation,
       base,
@@ -164447,8 +165040,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-interpreter";
-      version = "4.6.1";
-      sha256 = "1lb27k01vnlwk683w8svxf7axzd4c0ar82p6f0nr2si3w5ypb7fb";
+      version = "4.7";
+      sha256 = "0wq7dzydz16z060fzb4h13jwlxsxmqp37qjind9adv8w07i77gdl";
       libraryHaskellDepends = [
         base
         copilot-core
@@ -164517,7 +165110,7 @@ self: {
     }
   ) { };
 
-  copilot-language_4_6_1 = callPackage (
+  copilot-language_4_7 = callPackage (
     {
       mkDerivation,
       array,
@@ -164537,8 +165130,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-language";
-      version = "4.6.1";
-      sha256 = "0yr9cz9y0dpf1cqw6bbg3lx956nv22hfdnh3diqpg3yzcv84n1lx";
+      version = "4.7";
+      sha256 = "1shxzcx1ni1affcfn0cj7na0yqrp090c524rqmhl11h49grs4lxg";
       libraryHaskellDepends = [
         array
         base
@@ -164605,7 +165198,7 @@ self: {
     }
   ) { };
 
-  copilot-libraries_4_6_1 = callPackage (
+  copilot-libraries_4_7 = callPackage (
     {
       mkDerivation,
       base,
@@ -164621,8 +165214,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-libraries";
-      version = "4.6.1";
-      sha256 = "0mcj29cxxpiga9wv5y4mmzrbd1vdxkyzdyi6w8krz2ng4yb67f3a";
+      version = "4.7";
+      sha256 = "02cpnrg76by6idn6f8iqzkbf15m354qhplxwxwsavj5hncvp03ik";
       libraryHaskellDepends = [
         base
         containers
@@ -164666,7 +165259,7 @@ self: {
     }
   ) { };
 
-  copilot-prettyprinter_4_6_1 = callPackage (
+  copilot-prettyprinter_4_7 = callPackage (
     {
       mkDerivation,
       base,
@@ -164675,8 +165268,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-prettyprinter";
-      version = "4.6.1";
-      sha256 = "1jjmzrzzy3zqj24cm3hqpcxcnysjv6s6xbs8rqshjjjbrkang0pk";
+      version = "4.7";
+      sha256 = "0k34i9gxlf8vhr3bzgwdadq312h6xn8p3l6c8y3i8jdw9ikpjhbk";
       libraryHaskellDepends = [
         base
         copilot-core
@@ -164715,6 +165308,7 @@ self: {
       description = "A compiler for CoPilot targeting SBV";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -164781,7 +165375,7 @@ self: {
     }
   ) { };
 
-  copilot-theorem_4_6_1 = callPackage (
+  copilot-theorem_4_7 = callPackage (
     {
       mkDerivation,
       base,
@@ -164809,8 +165403,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-theorem";
-      version = "4.6.1";
-      sha256 = "1x4pxhr9psm9bc29hvg100a2hlfy2qj81f1kf2njj08jh4wfs2bl";
+      version = "4.7";
+      sha256 = "0mzjy5295w6vcwrxqbnqf79rmzw6xd2is2m9iwwl8lk31pp6jyz0";
       libraryHaskellDepends = [
         base
         bimap
@@ -164884,8 +165478,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-verifier";
-      version = "4.6.1";
-      sha256 = "0pm62nammyh2pmlxd3bh42892v0b2mmfn2v1rxpivak8q5xl47fz";
+      version = "4.7";
+      sha256 = "1hkv7jnw4z32idmipj879m8ripjq4bpcblb3wsydi1vpkmzan2xs";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -164977,7 +165571,7 @@ self: {
       ];
       doHaddock = false;
       description = "System for verifying the correctness of generated Copilot programs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "verify-examples";
       broken = true;
@@ -165002,8 +165596,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-visualizer";
-      version = "4.6.1";
-      sha256 = "17jkl7p46k6bx3jh0dk69hj19yccgfnybcbs3gyqkba40sqjygf7";
+      version = "4.7";
+      sha256 = "1zj06gkaxym7dggpw368jx3zyfrps4wylk66g3jbns6rgs1z2zaa";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -165780,7 +166374,7 @@ self: {
         text
       ];
       description = "Types for interaction with CoreNLP";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -165835,7 +166429,7 @@ self: {
         transformers
       ];
       description = "classy optical monadic state";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -166354,7 +166948,7 @@ self: {
         tasty-hunit
       ];
       description = "Countable, Searchable, Finite, Empty classes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -166520,7 +167114,7 @@ self: {
         text
       ];
       description = "Country data type and functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -166694,7 +167288,7 @@ self: {
         tasty-hunit
       ];
       description = "Well-conditioned estimation of large-dimensional covariance matrices";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -166772,7 +167366,7 @@ self: {
         vector
       ];
       description = "Standalone IR for Cardano scripts";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -166825,7 +167419,7 @@ self: {
         semirings
       ];
       description = "Coya monoids";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -166860,7 +167454,7 @@ self: {
         text
       ];
       description = "Haskell bindings to the CozoDB C API";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -167176,7 +167770,7 @@ self: {
         vector-algorithms
       ];
       description = "Competitive programming problemsetting toolchain";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -167391,7 +167985,7 @@ self: {
       executableHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "A library to detect CPU features";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "cpu-features-demo";
     }
   ) { };
@@ -167415,7 +168009,7 @@ self: {
         enumset
       ];
       description = "Binding for the cpuid machine instruction on x86 compatible processors";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
       platforms = lib.platforms.x86;
     }
   ) { };
@@ -167615,7 +168209,7 @@ self: {
         uuid
       ];
       description = "Cassandra CQL binary protocol";
-      license = lib.licensesSpdx."0BSD";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -168265,8 +168859,7 @@ self: {
         tasty-golden
       ];
       description = "Crack various integer and floating-point data formats";
-      license = lib.licensesSpdx."BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "crackNum";
     }
   ) { };
@@ -168774,7 +169367,7 @@ self: {
         criterion
       ];
       description = "crc32c";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.x86;
     }
   ) { };
@@ -168879,7 +169472,7 @@ self: {
         transformers
       ];
       description = "Garbage collected event folding CRDT";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -168952,7 +169545,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Framework for artificial life experiments";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -169158,7 +169751,7 @@ self: {
         unliftio
       ];
       description = "Reasoning about amortized time complexity";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "creditmonad";
     }
   ) { };
@@ -169235,7 +169828,7 @@ self: {
         vector
       ];
       description = "A clean aeson wrapper";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -169729,7 +170322,7 @@ self: {
         vector
       ];
       description = "A simple tool for comparing in Criterion benchmark results";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "criterion-cmp";
       broken = true;
@@ -170039,14 +170632,20 @@ self: {
     }:
     mkDerivation {
       pname = "crockford";
-      version = "0.2";
-      sha256 = "1fgsmf2k0v1j7b3gv06q9c65410qa2ivl59rwkm7j931wsymsg26";
+      version = "0.2.1";
+      sha256 = "0hpd1w2n1i87xw0156bnk0yjgafqy82q4h3ldj1l9z54f0pgk5s4";
       libraryHaskellDepends = [
         base
         digits
         QuickCheck
         safe
       ];
+      testHaskellDepends = [
+        base
+        digits
+        QuickCheck
+        safe
+      ];
       description = "An implementation of Douglas Crockford's base32 encoding";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
@@ -170270,7 +170869,7 @@ self: {
         unliftio
       ];
       description = "Encryption and decryption";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -170309,7 +170908,7 @@ self: {
         text
       ];
       description = "Dead simple broken links checker on local HTML folders";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "croque-mort";
       broken = true;
@@ -170396,7 +170995,7 @@ self: {
         what4
       ];
       description = "Crucible is a library for language-agnostic symbolic simulation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -170463,7 +171062,7 @@ self: {
         text
       ];
       description = "An interactive debugger for Crucible programs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "crucible-debug";
       broken = true;
@@ -170550,7 +171149,7 @@ self: {
         what4
       ];
       description = "Support for translating and executing LLVM code in Crucible";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -170618,7 +171217,7 @@ self: {
         what4
       ];
       description = "An implementation of symbolic I/O primitives for Crucible";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -170678,7 +171277,7 @@ self: {
         what4
       ];
       description = "A syntax for reading and writing Crucible control-flow graphs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -170841,7 +171440,7 @@ self: {
         yaml
       ];
       description = "Simple top-level library for Crucible Simulation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -170968,7 +171567,7 @@ self: {
         what4
       ];
       description = "A verification tool for C programs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -171220,7 +171819,7 @@ self: {
         QuickCheck
       ];
       description = "An educational tool for studying classical cryptography schemes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -171735,7 +172334,7 @@ self: {
         tasty-hunit
       ];
       description = "Adaptation of the crypto-rng library for the effectful ecosystem";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -171863,6 +172462,42 @@ self: {
     }
   ) { };
 
+  crypto-token_0_2_0 = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      bytestring,
+      crypton,
+      hspec,
+      hspec-discover,
+      network-byte-order,
+      ram,
+    }:
+    mkDerivation {
+      pname = "crypto-token";
+      version = "0.2.0";
+      sha256 = "0lp546cklx1sq745q0z8i27i7hqzb8bpyfk5dak43kkddvjlhy80";
+      libraryHaskellDepends = [
+        array
+        base
+        bytestring
+        crypton
+        network-byte-order
+        ram
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        hspec
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "crypto tokens";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   crypto-totp = callPackage (
     {
       mkDerivation,
@@ -172300,7 +172935,7 @@ self: {
         criterion
       ];
       description = "Fast, pure and practical SHA-512 implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -172559,62 +173194,12 @@ self: {
       ];
       doHaddock = false;
       description = "Cryptol: The Language of Cryptography";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
   crypton = callPackage (
-    {
-      mkDerivation,
-      base,
-      basement,
-      bytestring,
-      deepseq,
-      gauge,
-      integer-gmp,
-      memory,
-      random,
-      tasty,
-      tasty-hunit,
-      tasty-kat,
-      tasty-quickcheck,
-    }:
-    mkDerivation {
-      pname = "crypton";
-      version = "1.0.5";
-      sha256 = "111xhadds1nvi6kn87iirf1pb18469zq584b9dzlpx118xb5kwdk";
-      libraryHaskellDepends = [
-        base
-        basement
-        bytestring
-        deepseq
-        integer-gmp
-        memory
-      ];
-      testHaskellDepends = [
-        base
-        bytestring
-        memory
-        tasty
-        tasty-hunit
-        tasty-kat
-        tasty-quickcheck
-      ];
-      benchmarkHaskellDepends = [
-        base
-        bytestring
-        deepseq
-        gauge
-        memory
-        random
-      ];
-      description = "Cryptography Primitives sink";
-      license = lib.licenses.bsd3;
-    }
-  ) { };
-
-  crypton_1_0_6 = callPackage (
     {
       mkDerivation,
       base,
@@ -172661,6 +173246,60 @@ self: {
       ];
       description = "Cryptography Primitives sink";
       license = lib.licenses.bsd3;
+    }
+  ) { };
+
+  crypton_1_1_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      base16,
+      bytestring,
+      deepseq,
+      gauge,
+      integer-gmp,
+      primitive,
+      ram,
+      random,
+      tasty,
+      tasty-hunit,
+      tasty-kat,
+      tasty-quickcheck,
+      text,
+    }:
+    mkDerivation {
+      pname = "crypton";
+      version = "1.1.1";
+      sha256 = "04200abr2wavnkq73kch9wwnl5lcnd4n69jdfzg6mngz6pzby0sf";
+      libraryHaskellDepends = [
+        base
+        base16
+        bytestring
+        deepseq
+        integer-gmp
+        primitive
+        ram
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        ram
+        tasty
+        tasty-hunit
+        tasty-kat
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        deepseq
+        gauge
+        ram
+        random
+      ];
+      description = "Cryptography Primitives sink";
+      license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -172750,24 +173389,24 @@ self: {
       crypton,
       hspec,
       hspec-discover,
-      memory,
+      ram,
     }:
     mkDerivation {
       pname = "crypton-box";
-      version = "1.1.0";
-      sha256 = "10z6n196lmyq87b2lzlh48k1azwg581s7p7x1ral9q9q564b2b9n";
+      version = "1.2.0";
+      sha256 = "1igpbilq9cb7h2cc3hbkdijir9sj7ml5aqj7vfd0rqc2ajlhgvyc";
       libraryHaskellDepends = [
         base
         bytestring
         crypton
-        memory
+        ram
       ];
       testHaskellDepends = [
         base
         bytestring
         crypton
         hspec
-        memory
+        ram
       ];
       testToolDepends = [ hspec-discover ];
       description = "NaCl crypto/secret box implementations based on crypton primitives";
@@ -172860,6 +173499,40 @@ self: {
     }
   ) { };
 
+  crypton-connection_0_4_6 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      crypton-socks,
+      crypton-x509-store,
+      crypton-x509-system,
+      data-default,
+      network,
+      tls,
+    }:
+    mkDerivation {
+      pname = "crypton-connection";
+      version = "0.4.6";
+      sha256 = "0d20qp4jim89s6psi0iyjwjzgbi4piw9pxyyr15qrshpb22vg1nn";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        crypton-socks
+        crypton-x509-store
+        crypton-x509-system
+        data-default
+        network
+        tls
+      ];
+      description = "Simple and easy network connection API";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   crypton-pem = callPackage (
     {
       mkDerivation,
@@ -172946,6 +173619,8 @@ self: {
       pname = "crypton-x509";
       version = "1.7.7";
       sha256 = "10pkva9wvm6ih48bprxlnyhnn3nr6xq9dhkrk4hfxpsaij6f9v7g";
+      revision = "1";
+      editedCabalFile = "08ipy4qfz8w9kb7n3aig4psfjfaxl4brnkncbz34cbfmvsijgql9";
       libraryHaskellDepends = [
         asn1-encoding
         asn1-parse
@@ -172974,7 +173649,7 @@ self: {
     }
   ) { };
 
-  crypton-x509_1_8_0 = callPackage (
+  crypton-x509_1_9_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -172985,8 +173660,8 @@ self: {
       crypton-asn1-parse,
       crypton-asn1-types,
       crypton-pem,
-      memory,
       mtl,
+      ram,
       tasty,
       tasty-quickcheck,
       time-hourglass,
@@ -172994,8 +173669,8 @@ self: {
     }:
     mkDerivation {
       pname = "crypton-x509";
-      version = "1.8.0";
-      sha256 = "1kf2y6l25k0izvlmcafyi41nx3yx4w5jv82wi6b11shx5k8wds3w";
+      version = "1.9.0";
+      sha256 = "1kbn88qfk61rixbk1k35k9hn7rdw0b9pfjw7li5gm18rz7avlp8m";
       libraryHaskellDepends = [
         base
         bytestring
@@ -173005,7 +173680,7 @@ self: {
         crypton-asn1-parse
         crypton-asn1-types
         crypton-pem
-        memory
+        ram
         time-hourglass
         transformers
       ];
@@ -173046,6 +173721,8 @@ self: {
       pname = "crypton-x509-store";
       version = "1.6.11";
       sha256 = "07vq7f883cm5krqz2kc0qkh9ks54jknrwdqvfqsk91s12b693a83";
+      revision = "1";
+      editedCabalFile = "02cjsx9pijk2wlhk2i977dr1ak647yywl71fcw1b6j54k1swafm6";
       libraryHaskellDepends = [
         asn1-encoding
         asn1-types
@@ -173094,6 +173771,8 @@ self: {
       pname = "crypton-x509-store";
       version = "1.6.14";
       sha256 = "1d4dipa7by8zj913aag31swikpz4xznkfsq8d0f6ndvsciyvmpk8";
+      revision = "1";
+      editedCabalFile = "065l9k29j7702gr7s75aclwvrssdcdqjs3yfl35h6agpq121jylh";
       libraryHaskellDepends = [
         asn1-encoding
         asn1-types
@@ -173120,7 +173799,7 @@ self: {
     }
   ) { };
 
-  crypton-x509-store_1_8_0 = callPackage (
+  crypton-x509-store_1_9_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -173140,8 +173819,8 @@ self: {
     }:
     mkDerivation {
       pname = "crypton-x509-store";
-      version = "1.8.0";
-      sha256 = "0zps1xr2869syfqxr4jdf7wzby95w1fqk33nada33ws04qqshzd7";
+      version = "1.9.0";
+      sha256 = "0rl7zdzgfhp1l38pbx44v67gcv3gpr32cf43004zpl8i7i0974fy";
       libraryHaskellDepends = [
         base
         bytestring
@@ -173204,7 +173883,7 @@ self: {
     }
   ) { };
 
-  crypton-x509-system_1_8_0 = callPackage (
+  crypton-x509-system_1_9_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -173220,8 +173899,8 @@ self: {
     }:
     mkDerivation {
       pname = "crypton-x509-system";
-      version = "1.8.0";
-      sha256 = "0qv3a1sxblcw5mxn6h2c68qzwf9cdb9m3qqw5n0zm1n27gf26zxw";
+      version = "1.9.0";
+      sha256 = "1znfhsdn9nzdjlmzq92gvzzc1rjbwvi81bfsby95qflng2dq3vl9";
       libraryHaskellDepends = [
         base
         bytestring
@@ -173254,13 +173933,13 @@ self: {
       crypton-x509-system,
       crypton-x509-validation,
       directory,
-      memory,
+      ram,
       time-hourglass,
     }:
     mkDerivation {
       pname = "crypton-x509-util";
-      version = "1.8.0";
-      sha256 = "0kxl31z2rdmjjdd4i8ivb5i3sy5hdfj17ln0y339917ql5rcp16j";
+      version = "1.9.0";
+      sha256 = "1zl6xsd39bjsjf6idi9zvvqldl7wy1d9zlsk76qqw6sw0y53rvmr";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -173275,7 +173954,7 @@ self: {
         crypton-x509-system
         crypton-x509-validation
         directory
-        memory
+        ram
         time-hourglass
       ];
       description = "Utility for X509 certificate and chain";
@@ -173310,6 +173989,8 @@ self: {
       pname = "crypton-x509-validation";
       version = "1.6.14";
       sha256 = "07b09kgrd3m5ahxpj458r5ycd30bz8ldwjwf19mdcnfv4x0kj3pd";
+      revision = "1";
+      editedCabalFile = "0dvb732qpfn1bkpv6qmv7jj5k4v09wi9zfndxbzid8dsqqz39b63";
       libraryHaskellDepends = [
         asn1-encoding
         asn1-types
@@ -173345,7 +174026,7 @@ self: {
     }
   ) { };
 
-  crypton-x509-validation_1_8_0 = callPackage (
+  crypton-x509-validation_1_9_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -173359,16 +174040,16 @@ self: {
       crypton-x509-store,
       data-default,
       iproute,
-      memory,
       mtl,
+      ram,
       tasty,
       tasty-hunit,
       time-hourglass,
     }:
     mkDerivation {
       pname = "crypton-x509-validation";
-      version = "1.8.0";
-      sha256 = "0is9bbz6x002q473r80ddnr0v32h8kdmjk6hgvp5f8wi8iwjrmf3";
+      version = "1.9.0";
+      sha256 = "1n2gsg10ygwi9ljpzp9jqpym54c3az9i00k1nwnlpambwh2y15hk";
       libraryHaskellDepends = [
         base
         bytestring
@@ -173381,8 +174062,8 @@ self: {
         crypton-x509-store
         data-default
         iproute
-        memory
         mtl
+        ram
         time-hourglass
       ];
       testHaskellDepends = [
@@ -173394,7 +174075,7 @@ self: {
         crypton-x509
         crypton-x509-store
         data-default
-        memory
+        ram
         tasty
         tasty-hunit
         time-hourglass
@@ -173622,8 +174303,10 @@ self: {
     }:
     mkDerivation {
       pname = "cryptostore";
-      version = "0.4.0.0";
-      sha256 = "0zkwbfxw6xb940ill8d9naxb7gjb9hxh0k01p4jrf36f56cpq6kd";
+      version = "0.5.0.0";
+      sha256 = "1dclq655n776w4npjd1d19knpppdqasfdgsvrh80pf2rs8kcw3s9";
+      revision = "1";
+      editedCabalFile = "00ghqyrxz67wdn060r018s1xhc8w1mli5ivvq94k37a55cs8dmpr";
       libraryHaskellDepends = [
         asn1-encoding
         asn1-types
@@ -174617,7 +175300,7 @@ self: {
         transformers
       ];
       description = "extracts data from a CSV file";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -175079,7 +175762,7 @@ self: {
       ];
       doHaddock = false;
       description = "Haskell Implementation of Cuckoo Filters";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -175231,6 +175914,7 @@ self: {
   cuddle = callPackage (
     {
       mkDerivation,
+      antigen,
       base,
       base16-bytestring,
       boxes,
@@ -175239,11 +175923,15 @@ self: {
       cborg,
       containers,
       data-default-class,
+      filepath,
       foldable1-classes-compat,
       generic-optics,
       generic-random,
+      half,
       hashable,
       hspec,
+      hspec-core,
+      hspec-golden,
       hspec-megaparsec,
       HUnit,
       megaparsec,
@@ -175255,7 +175943,9 @@ self: {
       parser-combinators,
       pretty-simple,
       prettyprinter,
+      prettyprinter-ansi-terminal,
       QuickCheck,
+      quickcheck-transformer,
       random,
       regex-tdfa,
       scientific,
@@ -175265,12 +175955,13 @@ self: {
     }:
     mkDerivation {
       pname = "cuddle";
-      version = "1.1.2.0";
-      sha256 = "0cipqiw0rq2g3vcsmyi9q5cd3n0gimn7jjn2mh5afvdq940gvpk7";
+      version = "1.2.0.0";
+      sha256 = "0638jvj6wkczrxfswlcbzkci20s79s1yf4v22fz5gdmv34l21gvm";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
+        antigen
         base
         base16-bytestring
         boxes
@@ -175281,6 +175972,7 @@ self: {
         data-default-class
         foldable1-classes-compat
         generic-optics
+        half
         hashable
         megaparsec
         mtl
@@ -175289,6 +175981,9 @@ self: {
         ordered-containers
         parser-combinators
         prettyprinter
+        prettyprinter-ansi-terminal
+        QuickCheck
+        quickcheck-transformer
         random
         regex-tdfa
         scientific
@@ -175296,30 +175991,39 @@ self: {
         tree-diff
       ];
       executableHaskellDepends = [
+        antigen
         base
         base16-bytestring
         bytestring
         cborg
+        containers
         megaparsec
         mtl
         optparse-applicative
         prettyprinter
+        prettyprinter-ansi-terminal
+        QuickCheck
         random
         text
       ];
       testHaskellDepends = [
+        antigen
         base
         bytestring
         cborg
         containers
         data-default-class
+        filepath
         generic-random
         hspec
+        hspec-core
+        hspec-golden
         hspec-megaparsec
         HUnit
         megaparsec
         pretty-simple
         prettyprinter
+        prettyprinter-ansi-terminal
         QuickCheck
         random
         string-qq
@@ -175327,8 +176031,10 @@ self: {
         tree-diff
       ];
       description = "CDDL Generator and test utilities";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "cuddle";
+      broken = true;
     }
   ) { };
 
@@ -175376,7 +176082,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Support for construction, rendering, and parsing of CUE sheets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -175638,7 +176344,7 @@ self: {
         text
       ];
       description = "Curly braces (brackets) expanding";
-      license = lib.licensesSpdx."LGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -176611,7 +177317,7 @@ self: {
         template-haskell
       ];
       description = "Customizable string interpolation quasiquoters";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -176861,7 +177567,7 @@ self: {
         text
       ];
       description = "Common Vulnerability Scoring System";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -177174,7 +177880,7 @@ self: {
       ];
       doHaddock = false;
       description = "Digits 0-9";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -177830,7 +178536,7 @@ self: {
         optics-core
       ];
       description = "Use OverloadedRecordDot for nested optics access";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -177864,7 +178570,7 @@ self: {
       ];
       doHaddock = false;
       description = "Servant support for lucid2";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -177903,7 +178609,7 @@ self: {
       ];
       doHaddock = false;
       description = "SQLite client library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -178353,7 +179059,7 @@ self: {
         mv contrib/darcs_completion $out/share/bash-completion/completions/darcs
       '';
       description = "a distributed, interactive, smart revision control system";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       mainProgram = "darcs";
     }
   ) { };
@@ -179720,7 +180426,7 @@ self: {
         QuickCheck
       ];
       description = "Simple functional ring type";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -179760,7 +180466,7 @@ self: {
         constraints
       ];
       description = "Define Backwards Compatibility Schemes for Arbitrary Data";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -179881,7 +180587,7 @@ self: {
       ];
       doHaddock = false;
       description = "Fast and safe implementation of common compiler machinery";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     }
   ) { };
 
@@ -179906,7 +180612,7 @@ self: {
         mtl
       ];
       description = "A class for types with a default value";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -179918,7 +180624,7 @@ self: {
       sha256 = "1d6m12yv5vjciwbig484jrv9qpy7v762k51rpalcimhbzg231r8a";
       libraryHaskellDepends = [ data-default ];
       description = "A class for types with a default value (compatibility shim)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -180024,7 +180730,7 @@ self: {
         data-default-class
       ];
       description = "Default instances for types in base";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -180095,7 +180801,7 @@ self: {
         data-default-class
       ];
       description = "Default instances for types in containers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -180118,7 +180824,7 @@ self: {
         dlist
       ];
       description = "Default instances for types in dlist";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -180162,7 +180868,7 @@ self: {
         old-locale
       ];
       description = "Default instances for types in old-locale";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -180495,7 +181201,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "A basic framework for effect systems based on effects represented by GADTs";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -180533,7 +181239,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "A basic framework for effect systems based on effects represented by GADTs";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -180584,7 +181290,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Template Haskell utilities for the data-effects library";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -180610,7 +181316,7 @@ self: {
         primitive
       ];
       description = "Coerce between unlifted boxed and lifted types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -180950,7 +181656,7 @@ self: {
         hashable
       ];
       description = "Fixpoint data types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -181057,7 +181763,7 @@ self: {
         HUnit
       ];
       description = "Specify that lifted values were forced to WHNF or NF";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -181079,7 +181785,7 @@ self: {
         hspec
       ];
       description = "A simple multi-way tree data structure";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -181147,7 +181853,7 @@ self: {
         distributive
       ];
       description = "Updatable analogue of Distributive functors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -181851,11 +182557,11 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "data-or";
-      version = "1.0.0.7";
-      sha256 = "1n8ym5skpyd15akra1vj97z2h3bq62fh1966yz1i8qds5xq96a4x";
+      version = "1.0.0.12";
+      sha256 = "00i8saxn6wdp9k3q4h8sp46pnhx37s3infipv3db8r6llhma2ns1";
       libraryHaskellDepends = [ base ];
       description = "A data type for non-exclusive disjunction";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -181921,7 +182627,7 @@ self: {
         text
       ];
       description = "Read PDF form fields";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pdfreader";
       broken = true;
@@ -181991,7 +182697,7 @@ self: {
         raw-strings-qq
       ];
       description = "Prometheus metrics text format";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -182045,7 +182751,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -182070,7 +182776,7 @@ self: {
         transformers
       ];
       description = "Unify STRef and IORef in plain Haskell 98";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -182165,7 +182871,7 @@ self: {
         unordered-containers
       ];
       description = "Data.Reify for GADTs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "example-ast";
     }
   ) { };
@@ -182418,6 +183124,78 @@ self: {
     }
   ) { };
 
+  data-sketches_0_4_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      criterion,
+      data-sketches-core,
+      directory,
+      ghc-prim,
+      hedgehog,
+      hspec,
+      hspec-junit-formatter,
+      mtl,
+      mwc-random,
+      pretty-show,
+      primitive,
+      process,
+      QuickCheck,
+      statistics,
+      temporary,
+      vector,
+      vector-algorithms,
+    }:
+    mkDerivation {
+      pname = "data-sketches";
+      version = "0.4.0.0";
+      sha256 = "1k36j8biixgkkvfl6s52ywh5f06i59azv1if1zmidbnq0kkmadkh";
+      libraryHaskellDepends = [
+        base
+        data-sketches-core
+        ghc-prim
+        mtl
+        mwc-random
+        primitive
+        vector
+        vector-algorithms
+      ];
+      testHaskellDepends = [
+        base
+        data-sketches-core
+        directory
+        ghc-prim
+        hedgehog
+        hspec
+        hspec-junit-formatter
+        mtl
+        mwc-random
+        pretty-show
+        primitive
+        process
+        QuickCheck
+        statistics
+        temporary
+        vector
+        vector-algorithms
+      ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        data-sketches-core
+        ghc-prim
+        mtl
+        mwc-random
+        primitive
+        vector
+        vector-algorithms
+      ];
+      description = "Stochastic streaming algorithms for approximate computation on large datasets. Includes KLL, HLL, Theta, Count-Min, and REQ sketches.";
+      license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   data-sketches-core = callPackage (
     {
       mkDerivation,
@@ -182455,6 +183233,44 @@ self: {
     }
   ) { };
 
+  data-sketches-core_0_2_0_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      deepseq,
+      ghc-prim,
+      mwc-random,
+      primitive,
+      vector,
+      vector-algorithms,
+    }:
+    mkDerivation {
+      pname = "data-sketches-core";
+      version = "0.2.0.1";
+      sha256 = "1zccphcsrzdx16wcf45nps6j8vdhdzp2jkknnqfshs90kq2pbc64";
+      libraryHaskellDepends = [
+        base
+        deepseq
+        ghc-prim
+        mwc-random
+        primitive
+        vector
+        vector-algorithms
+      ];
+      testHaskellDepends = [
+        base
+        deepseq
+        ghc-prim
+        mwc-random
+        primitive
+        vector
+        vector-algorithms
+      ];
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   data-spacepart = callPackage (
     {
       mkDerivation,
@@ -182780,7 +183596,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "SVD (System view description) file handling";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "pretty-svd";
     }
   ) { };
@@ -183069,7 +183885,7 @@ self: {
         vector
       ];
       description = "Dynamic growable resizable mutable generic vector";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -183190,7 +184006,7 @@ self: {
       sha256 = "1zq9xsiky6mf0b0n83za0y8w28fl4gf53h49d1zd220dqmxx057q";
       libraryHaskellDepends = [ base ];
       description = "Encryption library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -183377,7 +184193,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Datadog tracing client and mock agent";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "datadog-agent";
     }
@@ -183614,6 +184430,90 @@ self: {
   ) { };
 
   dataframe = callPackage (
+    {
+      mkDerivation,
+      array,
+      attoparsec,
+      base,
+      bytestring,
+      bytestring-lexing,
+      containers,
+      criterion,
+      directory,
+      filepath,
+      granite,
+      hashable,
+      HUnit,
+      mmap,
+      parallel,
+      process,
+      random,
+      random-shuffle,
+      snappy-hs,
+      template-haskell,
+      text,
+      time,
+      vector,
+      vector-algorithms,
+      zstd,
+    }:
+    mkDerivation {
+      pname = "dataframe";
+      version = "0.3.3.6";
+      sha256 = "0x32x6lg5kq3l2zpcpbp1nw6k279lp1y4nsfm9ppaz18j9k39nqy";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        array
+        attoparsec
+        base
+        bytestring
+        bytestring-lexing
+        containers
+        directory
+        granite
+        hashable
+        mmap
+        parallel
+        process
+        random
+        snappy-hs
+        template-haskell
+        text
+        time
+        vector
+        vector-algorithms
+        zstd
+      ];
+      executableHaskellDepends = [
+        base
+        directory
+        filepath
+        process
+        random
+        time
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        HUnit
+        random
+        random-shuffle
+        text
+        time
+        vector
+      ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        process
+      ];
+      description = "A fast, safe, and intuitive DataFrame library";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
+    }
+  ) { };
+
+  dataframe_0_7_0_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -183625,6 +184525,7 @@ self: {
       cassava,
       containers,
       criterion,
+      deepseq,
       directory,
       filepath,
       Glob,
@@ -183640,8 +184541,10 @@ self: {
       regex-tdfa,
       scientific,
       snappy-hs,
+      stm,
       template-haskell,
       text,
+      these,
       time,
       unix,
       unordered-containers,
@@ -183652,8 +184555,8 @@ self: {
     }:
     mkDerivation {
       pname = "dataframe";
-      version = "0.4.1.0";
-      sha256 = "1673idd2dvny2cih4a5wn21i6xc1a0z60y1vm8p1rlsm5b1vr4x0";
+      version = "0.7.0.0";
+      sha256 = "1khnk687vz4n0m9v0p6dw5x45g9n5yjx6x21i0cx3lkv00wm2fbj";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -183665,6 +184568,7 @@ self: {
         bytestring-lexing
         cassava
         containers
+        deepseq
         directory
         filepath
         Glob
@@ -183677,8 +184581,10 @@ self: {
         regex-tdfa
         scientific
         snappy-hs
+        stm
         template-haskell
         text
+        these
         time
         unordered-containers
         vector
@@ -183688,6 +184594,8 @@ self: {
       ];
       executableHaskellDepends = [
         base
+        bytestring
+        containers
         directory
         filepath
         process
@@ -183699,6 +184607,7 @@ self: {
       ];
       testHaskellDepends = [
         base
+        bytestring
         containers
         directory
         HUnit
@@ -183706,6 +184615,7 @@ self: {
         random
         random-shuffle
         text
+        these
         time
         vector
       ];
@@ -183713,11 +184623,11 @@ self: {
         base
         criterion
         process
+        random
       ];
       description = "A fast, safe, and intuitive DataFrame library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -183741,8 +184651,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Converts between dataframes and hasktorch tensors";
-      license = lib.licensesSpdx."MIT";
-      hydraPlatforms = lib.platforms.none;
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -183796,8 +184705,7 @@ self: {
         vector
       ];
       description = "Persistent database integration for the dataframe library";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
-      hydraPlatforms = lib.platforms.none;
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
     }
   ) { };
 
@@ -184055,6 +184963,71 @@ self: {
     }
   ) { };
 
+  datastar-hs = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      ghc-heap,
+      hspec,
+      http-media,
+      http-types,
+      lucid2,
+      servant-server,
+      stm,
+      tagged,
+      text,
+      time,
+      uuid,
+      wai,
+      warp,
+    }:
+    mkDerivation {
+      pname = "datastar-hs";
+      version = "0.1.0.2";
+      sha256 = "13nbnyfp40grrn04m9yzbf3h2wi94ccp6jk3ip4a5ldfaxzwbf2v";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        http-types
+        text
+        wai
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        ghc-heap
+        http-media
+        http-types
+        lucid2
+        servant-server
+        stm
+        tagged
+        text
+        time
+        uuid
+        wai
+        warp
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        hspec
+        text
+        wai
+      ];
+      description = "Haskell bindings for Datastar";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   dataurl = callPackage (
     {
       mkDerivation,
@@ -184424,7 +185397,7 @@ self: {
         criterion
       ];
       description = "Generation and traversal of compressed directed acyclic dawg graphs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -184447,7 +185420,7 @@ self: {
         kan-extensions
       ];
       description = "A comonoid w.r.t. Day";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -184465,8 +185438,8 @@ self: {
     }:
     mkDerivation {
       pname = "daytripper";
-      version = "1.0.0";
-      sha256 = "0mi03wgaa4pmrzmr0l5h34nl3wgzl14h825zlbpcjdm0zg0diw64";
+      version = "1.0.1";
+      sha256 = "0m5mnzbi4wiki6gysqqv29q8ypmz3b78yg8q9iqkla1mqdsr2gic";
       libraryHaskellDepends = [
         base
         bytestring
@@ -184946,8 +185919,8 @@ self: {
     }:
     mkDerivation {
       pname = "dbus";
-      version = "1.4.1";
-      sha256 = "016xrx8gnvldpwgalpsxzvkwagavpzw9m7j65w5msskaxk474ln7";
+      version = "1.4.2";
+      sha256 = "18d9v2p1cdf6z1hd5s7fw5hhzj4yag6qc2rzya4mpbv21b7cbvbs";
       libraryHaskellDepends = [
         base
         bytestring
@@ -185107,23 +186080,26 @@ self: {
     {
       mkDerivation,
       base,
+      containers,
       dbus,
       hslogger,
       optparse-applicative,
     }:
     mkDerivation {
       pname = "dbus-hslogger";
-      version = "0.1.0.1";
-      sha256 = "0i2y69kagp53cmlb7p3y6ysr9k5wvfd0vcnpwsasyn1jpk6g80zi";
+      version = "0.1.1.0";
+      sha256 = "0g66y3jhwb8a6haxfqf493haxw558072ki19m831vzq955w86xs5";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
+        containers
         dbus
         hslogger
       ];
       executableHaskellDepends = [
         base
+        containers
         dbus
         hslogger
         optparse-applicative
@@ -185134,6 +186110,49 @@ self: {
     }
   ) { };
 
+  dbus-menu = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      dbus,
+      enclosed-exceptions,
+      filepath,
+      gi-glib,
+      gi-gobject,
+      gi-gtk3,
+      gtk3,
+      haskell-gi,
+      haskell-gi-base,
+      hslogger,
+      template-haskell,
+      text,
+    }:
+    mkDerivation {
+      pname = "dbus-menu";
+      version = "0.1.3.2";
+      sha256 = "16jqm07s4zvprrlr86srymjjdz373bx00w6298vl93hmr7vn5fa6";
+      libraryHaskellDepends = [
+        base
+        containers
+        dbus
+        enclosed-exceptions
+        filepath
+        gi-glib
+        gi-gobject
+        gi-gtk3
+        haskell-gi
+        haskell-gi-base
+        hslogger
+        template-haskell
+        text
+      ];
+      libraryPkgconfigDepends = [ gtk3 ];
+      description = "A Haskell implementation of the DBusMenu protocol";
+      license = lib.licenses.bsd3;
+    }
+  ) { inherit (pkgs) gtk3; };
+
   dbus-qq = callPackage (
     {
       mkDerivation,
@@ -186185,7 +187204,7 @@ self: {
           ];
           doHaddock = false;
           description = "Haskell bindings for Dear ImGui";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -186293,7 +187312,101 @@ self: {
         text
       ];
       description = "Modules for working with the Debian package system";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  debian_4_1_2 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      bz2,
+      Cabal,
+      containers,
+      directory,
+      exceptions,
+      filepath,
+      hostname,
+      HUnit,
+      lens,
+      ListLike,
+      mtl,
+      network-uri,
+      ordered-containers,
+      parsec,
+      pretty,
+      process,
+      pureMD5,
+      regex-compat,
+      regex-tdfa,
+      SHA,
+      template-haskell,
+      temporary,
+      text,
+      th-lift,
+      th-orphans,
+      time,
+      unix,
+      zlib,
+    }:
+    mkDerivation {
+      pname = "debian";
+      version = "4.1.2";
+      sha256 = "1wgrmzmf5jyfjqd8zi3yc5j08hphmhhnqiwbgsf6vrm4jaw2sk9q";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        bz2
+        Cabal
+        containers
+        directory
+        exceptions
+        filepath
+        hostname
+        HUnit
+        lens
+        ListLike
+        mtl
+        network-uri
+        ordered-containers
+        parsec
+        pretty
+        process
+        pureMD5
+        regex-compat
+        regex-tdfa
+        SHA
+        template-haskell
+        temporary
+        text
+        th-lift
+        th-orphans
+        time
+        unix
+        zlib
+      ];
+      executableHaskellDepends = [
+        base
+        directory
+        filepath
+        process
+      ];
+      testHaskellDepends = [
+        base
+        Cabal
+        HUnit
+        ordered-containers
+        parsec
+        pretty
+        regex-tdfa
+        text
+      ];
+      description = "Modules for working with the Debian package system";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -186389,7 +187502,7 @@ self: {
         tasty-quickcheck
       ];
       description = "de Bruijn indices and levels";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -186412,7 +187525,7 @@ self: {
         some
       ];
       description = "de Bruijn indices and levels";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -186755,7 +187868,7 @@ self: {
         tasty-golden
       ];
       description = "Like Debug.Trace but writing to files.";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -186841,7 +187954,7 @@ self: {
         optparse-applicative
       ];
       description = "Utilities for making your applications more debuggable";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -187258,7 +188371,7 @@ self: {
         witherable
       ];
       description = "Deeply-nested, multiple key type maps";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -187574,7 +188687,7 @@ self: {
         stm
       ];
       description = "Candidate NFData Instances for Types in base";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -187687,7 +188800,7 @@ self: {
         semigroupoids
       ];
       description = "Applicative maps";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -187734,7 +188847,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Abstractions over deferred folds";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -188030,7 +189143,7 @@ self: {
         sop-core
       ];
       description = "Defunctionalization helpers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -188052,7 +189165,7 @@ self: {
         singleton-bool
       ];
       description = "Defunctionalization helpers: booleans";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -188066,7 +189179,7 @@ self: {
       sha256 = "0yy02va22bhxk1gl1m1k4c84sc788g891p5m81mr3bai5y7vq402";
       libraryHaskellDepends = [ base ];
       description = "Defunctionalization helpers: core definitions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -188087,7 +189200,7 @@ self: {
         sop-core
       ];
       description = "Defunctionalization helpers: lists";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -188291,7 +189404,7 @@ self: {
         Unique
       ];
       description = "Delaunay tessellation";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -188432,7 +189545,7 @@ self: {
         base
       ];
       description = "Parse bounce messages per RFC3464, RFC3463";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -188560,7 +189673,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Facilities for storing a Haskell value, using delta types";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -188593,7 +189706,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Delta types, also known as change actions";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -188650,7 +189763,7 @@ self: {
         vector
       ];
       description = "Framework for ∆Q System Development";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -188716,7 +189829,7 @@ self: {
         transformers
       ];
       description = "Demangler for C++ mangled names";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "demangle";
       broken = true;
@@ -188983,7 +190096,7 @@ self: {
         unliftio-core
       ];
       description = "Dependency injection for records-of-functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -189053,7 +190166,7 @@ self: {
         unliftio-core
       ];
       description = "Giving good advice to functions in records-of-functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -189116,7 +190229,7 @@ self: {
         unordered-containers
       ];
       description = "A dynamic environment for dependency injection";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -189174,7 +190287,7 @@ self: {
         unliftio-core
       ];
       description = "Pair resources files with types within your program";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -189234,6 +190347,8 @@ self: {
       pname = "dependent-enummap";
       version = "0.1.0.0";
       sha256 = "1i0p0yipihjm9p6mpag9zw1r8gfl7lwcg35w97gqfy4lbbx2rp4n";
+      revision = "1";
+      editedCabalFile = "1a8dxvlqk52l5qx3ybbcjm2m4py4ywnrlwpggxdbg98a1x188wxg";
       libraryHaskellDepends = [
         base
         containers
@@ -189246,7 +190361,7 @@ self: {
         some
       ];
       description = "A generalisation of EnumMap to dependent types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -189384,7 +190499,7 @@ self: {
         dependent-sum
       ];
       description = "Dependent finite maps (partial dependent products)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -189773,7 +190888,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Double-ended queues";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -190027,7 +191142,7 @@ self: {
         HUnit
       ];
       description = "This package generates data constructor predicate functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -190106,7 +191221,7 @@ self: {
         primitive-unaligned
       ];
       description = "Derive Prim and PrimUnaligned";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -190322,7 +191437,7 @@ self: {
         bytestring
       ];
       description = "Type driven generic aeson instance customisation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -190408,7 +191523,7 @@ self: {
         HUnit
       ];
       description = "Derive a Show instance without field selector names";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -190449,7 +191564,7 @@ self: {
         unliftio-core
       ];
       description = "Derive instances for monad transformer stacks";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -190462,7 +191577,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Deriving via first-class functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -190544,7 +191659,7 @@ self: {
         HUnit
       ];
       description = "Parse and render JSON simply";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "derulo";
       broken = true;
@@ -190602,7 +191717,7 @@ self: {
         transformers
       ];
       description = "Combinators for describing binary data structures";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -191130,7 +192245,7 @@ self: {
         text
       ];
       description = "Conversion between Devanagari Unicode, Harvard-Kyoto, IAST and ISO15919";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -191347,7 +192462,7 @@ self: {
         xmlbf
       ];
       description = "Render and parse df1 logs as HTML";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -191479,7 +192594,7 @@ self: {
         unordered-containers
       ];
       description = "A generic data integrity layer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dfinity-radix-tree-example";
     }
@@ -191914,7 +193029,7 @@ self: {
       ];
       doCheck = false;
       description = "A configuration language guaranteed to terminate";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "dhall";
       maintainers = [ lib.maintainers.Gabriella439 ];
     }
@@ -192664,7 +193779,7 @@ self: {
         yasi
       ];
       description = "Convert recursive ADTs from and to Dhall";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -192743,7 +193858,7 @@ self: {
         unordered-containers
       ];
       description = "Encrypt Decrypt Dhall expressions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dhall-secret";
     }
@@ -192816,7 +193931,7 @@ self: {
         text
       ];
       description = "Render dhall text with shell commands as function arguments";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dhall-text-shell";
       broken = true;
@@ -192893,7 +194008,7 @@ self: {
         text
       ];
       description = "Compile Dhall expressions to Cabal files";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -193184,7 +194299,7 @@ self: {
         random
       ];
       description = "abstract syntax tree for multiple programming languages";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -193202,8 +194317,8 @@ self: {
     }:
     mkDerivation {
       pname = "dhscanner-bitcode";
-      version = "1.0.10";
-      sha256 = "0b9b7swrpdy09yj1sqg50xpbarjgh154r6j1ii4xl827x82gs3l3";
+      version = "1.0.15";
+      sha256 = "0pwb89rxm3pfyy1cq4zd5m8wwk5afjpj60zmp7443q7fwpygx8b4";
       libraryHaskellDepends = [
         aeson
         base
@@ -193218,7 +194333,7 @@ self: {
         random
       ];
       description = "Intermediate language for static code analysis";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -193235,8 +194350,8 @@ self: {
     }:
     mkDerivation {
       pname = "dhscanner-kbgen";
-      version = "1.0.13";
-      sha256 = "0p1rahl6bnznbgqm380nvavpq01rh8amarb9fcgp6lv19wisdxdx";
+      version = "1.0.25";
+      sha256 = "066jr09bhlbaqbg72049wn09464j6vr1jk866pjbwipcl3yk6bzb";
       libraryHaskellDepends = [
         aeson
         base
@@ -193245,7 +194360,7 @@ self: {
         dhscanner-bitcode
       ];
       description = "knowledge base predicates for static code analysis";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -194531,7 +195646,7 @@ self: {
         text
       ];
       description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "diagrams-pandoc";
     }
   ) { };
@@ -195025,7 +196140,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A Dialogflow Fulfillment library for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -195053,7 +196168,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "I/O in Haskell Report 1.2";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "examples";
     }
   ) { };
@@ -195145,7 +196260,7 @@ self: {
         random-fu
       ];
       description = "Simplistic D&D style dice-rolling system";
-      license = lib.licensesSpdx."Unlicense";
+      license = lib.meta.getLicenseFromSpdxId "Unlicense";
       mainProgram = "dice";
     }
   ) { };
@@ -195430,6 +196545,7 @@ self: {
       description = "Diff and patch";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -195483,7 +196599,7 @@ self: {
         show-combinators
       ];
       description = "Map file locations across diffs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -195862,7 +196978,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ zlib ];
       description = "CRC32 and Adler32 hashes for bytestrings";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { inherit (pkgs) zlib; };
 
@@ -196411,7 +197527,7 @@ self: {
         QuickCheck
       ];
       description = "Converts integers to lists of digits and back";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -196453,7 +197569,7 @@ self: {
         QuickCheck
       ];
       description = "Directed Graphs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -197382,7 +198498,7 @@ self: {
         unix
       ];
       description = "Platform-agnostic library for filesystem operations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -197568,7 +198684,7 @@ self: {
         unix
       ];
       description = "Stream directory entries in constant memory in vanilla IO";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -197611,7 +198727,7 @@ self: {
         unix
       ];
       description = "Stream directory entries in constant memory in vanilla IO";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -197767,7 +198883,7 @@ self: {
         vector
       ];
       description = "Multivariate Dirichlet distribution";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -197991,7 +199107,7 @@ self: {
         tasty-golden
       ];
       description = "Functional programming language for teaching discrete math";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "disco";
       broken = true;
@@ -198700,7 +199816,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Disjoint containers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -198821,7 +199937,7 @@ self: {
         text
       ];
       description = "On-disk storage, but referentially transparent";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -199244,7 +200360,7 @@ self: {
         network-transport-tcp
       ];
       description = "Cloud Haskell: Erlang-style concurrency in Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -199284,7 +200400,7 @@ self: {
         tasty-hunit
       ];
       description = "Cloud Haskell Async API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -199395,7 +200511,7 @@ self: {
         tasty-hunit
       ];
       description = "The Cloud Haskell Application Platform";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -199476,7 +200592,7 @@ self: {
         tasty-hunit
       ];
       description = "Execution Framework for The Cloud Haskell Application Platform";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -199533,7 +200649,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Cloud Haskell Extras";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -199970,7 +201086,7 @@ self: {
         tasty-hunit
       ];
       description = "Simple zero-configuration backend for Cloud Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -200037,7 +201153,7 @@ self: {
         tasty-hunit
       ];
       description = "Supervisors for The Cloud Haskell Application Platform";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -200064,7 +201180,7 @@ self: {
         stm
       ];
       description = "Cloud Haskell Test Support";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -200206,7 +201322,7 @@ self: {
         tasty
       ];
       description = "Tests and test support tools for distributed-process";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -200300,7 +201416,7 @@ self: {
         rank1dynamic
       ];
       description = "Compositional, type-safe, polymorphic static values and closures";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -200511,8 +201627,10 @@ self: {
       containers,
       contravariant,
       distributive,
+      doctest,
       hspec,
       lens,
+      MemoTrie,
       mtl,
       profunctors,
       tagged,
@@ -200524,8 +201642,8 @@ self: {
     }:
     mkDerivation {
       pname = "distributors";
-      version = "0.2.0.1";
-      sha256 = "11qdcaj1fa5zvxdy85bqc1qm6pnlv4cwym1i8zi1mxcvcmc38fci";
+      version = "0.3.0.0";
+      sha256 = "0c0nvlwb7dm4179bdkavh96xzjdija94xvv13ayils0b72xzifdq";
       libraryHaskellDepends = [
         adjunctions
         base
@@ -200535,6 +201653,7 @@ self: {
         contravariant
         distributive
         lens
+        MemoTrie
         mtl
         profunctors
         tagged
@@ -200552,8 +201671,10 @@ self: {
         containers
         contravariant
         distributive
+        doctest
         hspec
         lens
+        MemoTrie
         mtl
         profunctors
         tagged
@@ -200564,7 +201685,7 @@ self: {
         witherable
       ];
       description = "Unifying Parsers, Printers & Grammars";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -200587,7 +201708,7 @@ self: {
         text
       ];
       description = "ditto is a type-safe HTML form generation and validation library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -200842,7 +201963,7 @@ self: {
         pretty
       ];
       description = "Generate Haskell code from a type";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "djinn";
     }
   ) { };
@@ -200945,8 +202066,8 @@ self: {
     }:
     mkDerivation {
       pname = "djot";
-      version = "0.1.2.4";
-      sha256 = "10k5j5ah051jhiykic95mn3lr5vhc5jc8pvpgqicy3jq1rcf5am1";
+      version = "0.1.3";
+      sha256 = "1066rgzb9lf2fa9bi3i7rdln9yn7kkjwx31gfhljqsryxqqr9prn";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -200984,7 +202105,7 @@ self: {
         tasty-bench
       ];
       description = "Parser and renderer for djot light markup syntax";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "djoths";
     }
   ) { };
@@ -201471,14 +202592,15 @@ self: {
       filepath,
       Glob,
       http-directory,
+      safe,
       simple-cmd,
       simple-cmd-args,
       simple-prompt,
     }:
     mkDerivation {
       pname = "dnf-repo";
-      version = "0.6.1";
-      sha256 = "0zxbxadvsvj2247npbn35k4vblaf681lgsq40r06vbh0bildy490";
+      version = "0.6.2";
+      sha256 = "0njl38nwvdzfxfq17n99mrri8h1kpymv1hwhwanj75f3y5cq4fq3";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -201490,6 +202612,7 @@ self: {
         filepath
         Glob
         http-directory
+        safe
         simple-cmd
         simple-cmd-args
         simple-prompt
@@ -201598,7 +202721,7 @@ self: {
         text
       ];
       description = "DNS name parsing and pattern matching utilities";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -201853,7 +202976,7 @@ self: {
         time
       ];
       description = "DigitalOcean Spaces API bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -203108,7 +204231,7 @@ self: {
         transformers
       ];
       description = "Run doctest's in a Cabal.Test.exitcode-stdio environment";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -203144,7 +204267,7 @@ self: {
         utility-ht
       ];
       description = "Alternative doctest implementation that extracts comments to modules";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "doctest-extract-0.1";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -203158,7 +204281,7 @@ self: {
       sha256 = "1hb3zx1xzib3v41blnwcbhc2v0rzwdzq7gm4sajqndimwjkkxc67";
       libraryHaskellDepends = [ base ];
       description = "Parts of doctest exposed as library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -203196,10 +204319,8 @@ self: {
     }:
     mkDerivation {
       pname = "doctest-parallel";
-      version = "0.4";
-      sha256 = "1y907fg2y7ayddwv38rjv6nyc18w682dxwkq3msqnlkddglqlxfx";
-      revision = "1";
-      editedCabalFile = "14727y7lzskg9qazpc1p2fsj35fbqdm4g54hii3q0626y62ff7mj";
+      version = "0.4.1";
+      sha256 = "01dagq1wa56hswhabw56dyv172y0lp5fh0gg7ij1i01fqg61rc5s";
       libraryHaskellDepends = [
         base
         base-compat
@@ -203709,7 +204830,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A cross-platform dotfiles manager";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dojang";
     }
@@ -203981,7 +205102,7 @@ self: {
         th-orphans
       ];
       description = "Codegen helping you define domain models";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -204026,7 +205147,7 @@ self: {
         rerebase
       ];
       description = "Integration of domain with aeson";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -204109,7 +205230,7 @@ self: {
         rerebase
       ];
       description = "Integration of domain with cereal";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -204134,7 +205255,7 @@ self: {
         th-lift-instances
       ];
       description = "Low-level API of \"domain\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -204169,7 +205290,7 @@ self: {
         rerebase
       ];
       description = "Integration of domain with optics";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -204580,7 +205701,7 @@ self: {
         text
       ];
       description = "Datatypes and encoding for graphviz dot files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -204902,7 +206023,7 @@ self: {
         these
       ];
       description = "dot language parsing and printing";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -204940,7 +206061,7 @@ self: {
         text
       ];
       description = "Fast conversion between single and double precision floating point and text";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -205315,7 +206436,7 @@ self: {
         vector-space
       ];
       description = "Reverse mode automatic differentiation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -205519,7 +206640,7 @@ self: {
         Win32
       ];
       description = "Windows DPAPI bindings";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -205979,7 +207100,7 @@ self: {
         relude
       ];
       description = "See README for more info";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dr-cabal";
       broken = true;
@@ -206081,7 +207202,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Actor library for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -206360,7 +207481,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Deriving without spelling out \"deriving\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -206945,7 +208066,7 @@ self: {
         QuickCheck
       ];
       description = "Haskell Digital Signal Processing";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -207030,7 +208151,7 @@ self: {
         vector
       ];
       description = "DSV (delimiter-separated values)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -207344,7 +208465,7 @@ self: {
         doctest
       ];
       description = "Automatically generate dual constructions";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.sellout ];
       broken = true;
@@ -207431,8 +208552,8 @@ self: {
     }:
     mkDerivation {
       pname = "duckdb-ffi";
-      version = "1.4.1.4";
-      sha256 = "0qrd5r9lhyr5wqckbvm5733bgihda01qygc9xy59y9qfrrskyz20";
+      version = "1.5.0.0";
+      sha256 = "0fc86bz60zghbbnv1q3kfx1pw40mgpbg9vy8m4awcp46r0acxhp0";
       libraryHaskellDepends = [
         base
         bytestring
@@ -207453,7 +208574,7 @@ self: {
         time
       ];
       description = "Haskell FFI bindings for DuckDB";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -207485,7 +208606,7 @@ self: {
         vector
       ];
       description = "Haskell bindings for duckdb";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -207498,6 +208619,7 @@ self: {
       base,
       bytestring,
       containers,
+      directory,
       duckdb-ffi,
       QuickCheck,
       tasty,
@@ -207511,8 +208633,8 @@ self: {
     }:
     mkDerivation {
       pname = "duckdb-simple";
-      version = "0.1.2.3";
-      sha256 = "07i67sm28c87jwm36x5y6v4m67jwdby3rjj4hap1k336ri6kcz2i";
+      version = "0.1.5.0";
+      sha256 = "1smmznxzimvpxj45wbw6916wgvw5q5gndp16x4vikiy56j6hwlq8";
       libraryHaskellDepends = [
         array
         base
@@ -207529,6 +208651,7 @@ self: {
         base
         bytestring
         containers
+        directory
         duckdb-ffi
         QuickCheck
         tasty
@@ -207540,7 +208663,7 @@ self: {
         uuid
       ];
       description = "Haskell FFI bindings for DuckDB";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -207631,7 +208754,7 @@ self: {
         unordered-containers
       ];
       description = "A Haskell library for parsing text into structured data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -207908,6 +209031,30 @@ self: {
     }
   ) { };
 
+  dunning-t-digest = callPackage (
+    {
+      mkDerivation,
+      base,
+      fingertree,
+      vector,
+    }:
+    mkDerivation {
+      pname = "dunning-t-digest";
+      version = "0.1.0.1";
+      sha256 = "02i502n15szsvprziar84hagq99h9crdn1x26q2jkhc0frzpah7d";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        fingertree
+        vector
+      ];
+      executableHaskellDepends = [ base ];
+      description = "Dunning t-digest for online quantile estimation";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   duoidal-transformers = callPackage (
     {
       mkDerivation,
@@ -208047,7 +209194,7 @@ self: {
         tasty-hunit
       ];
       description = "Duplicate any closure";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -208191,7 +209338,7 @@ self: {
         filepath
       ];
       description = "durable/atomic file system writes (from rio package)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -208470,8 +209617,8 @@ self: {
     }:
     mkDerivation {
       pname = "dvv";
-      version = "0.1.1.0";
-      sha256 = "0sdi830lm1i1vm3ws8m3h1i1ymfwg9nzvmfz0fnq03yg511krjz7";
+      version = "0.1.2.1";
+      sha256 = "12gciwz3n3nrq6sxq51xn155rvciy7lik31g3bgc5ax75idqhydb";
       libraryHaskellDepends = [
         base
         hashable
@@ -208487,7 +209634,7 @@ self: {
         unordered-containers
       ];
       description = "Dotted Version Vectors (DVV)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -208612,7 +209759,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A minimal testing library";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -208738,7 +209885,7 @@ self: {
         generics-sop
       ];
       description = "Programatically identify space leaks in your program";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -209848,7 +210995,7 @@ self: {
         vector
       ];
       description = "Configure dzen2 bars in Dhall language";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dzen-dhall";
       broken = true;
@@ -209913,7 +211060,7 @@ self: {
         transformers
       ];
       description = "An event-oriented observability library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -209957,7 +211104,7 @@ self: {
         unordered-containers
       ];
       description = "OpenTelemetry-based rendering for e11y";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -209988,7 +211135,7 @@ self: {
         base
       ];
       description = "Automatically read config.json from the current directory";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "simple-example";
     }
   ) { };
@@ -210122,7 +211269,7 @@ self: {
         vector
       ];
       description = "Binding to C++ earcut library";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -210611,7 +211758,7 @@ self: {
         time
       ];
       description = "A Haskell description of the eBird API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -210653,7 +211800,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "A command-line utility for interacting with the eBird API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ebird-cli";
     }
@@ -210686,7 +211833,7 @@ self: {
         text
       ];
       description = "Client functions for querying the eBird API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -210972,6 +212119,8 @@ self: {
       pname = "ech-config";
       version = "0.0.1";
       sha256 = "1fpynisvv87m0rfdydbvrg4k3nznv33yslb0ny0c518kxbbvcdmj";
+      revision = "1";
+      editedCabalFile = "1k85s6646px5n17k46kp7vzdyrqikx0ja5ywvfmx8jxrsx4sygib";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -211087,7 +212236,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Build \"as static as possible\" executable on Linux";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "ecstatic";
     }
   ) { };
@@ -211227,7 +212376,7 @@ self: {
         text
       ];
       description = "Hole-Fit Synthesis using ECTAs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -211443,7 +212592,7 @@ self: {
         text
       ];
       description = "Templating language with similar syntax and features to Liquid or Jinja2";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ede";
       broken = true;
@@ -212078,6 +213227,18 @@ self: {
     }
   ) { };
 
+  effable = callPackage (
+    { mkDerivation, base }:
+    mkDerivation {
+      pname = "effable";
+      version = "0.3.1.1";
+      sha256 = "0bhin9ngl078asi7d8cgd8df21ngbb2f1sk3i3x708qn9m48kasz";
+      libraryHaskellDepends = [ base ];
+      description = "A data structure for emission plans";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   effect-handlers = callPackage (
     {
       mkDerivation,
@@ -212227,7 +213388,7 @@ self: {
         unliftio
       ];
       description = "An easy to use, performant extensible effects library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -212262,7 +213423,7 @@ self: {
         unliftio-core
       ];
       description = "An easy to use, performant extensible effects library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -212297,7 +213458,7 @@ self: {
         text
       ];
       description = "effectful support for high-level PostgreSQL operations via Opaleye";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -212323,7 +213484,7 @@ self: {
         effectful-core
       ];
       description = "A GHC plugin for improving disambiguation of effects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -212360,7 +213521,7 @@ self: {
         timeit
       ];
       description = "Simple work queue for bounded concurrency (effectful wrapper)";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -212385,7 +213546,7 @@ self: {
         unliftio-pool
       ];
       description = "effectful support for mid-level PostgreSQL operations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -212406,7 +213567,7 @@ self: {
         primitive
       ];
       description = "`ST`-style mutation for `effectful`";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -212441,7 +213602,7 @@ self: {
         effectful-core
       ];
       description = "Template Haskell utilities for the effectful library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -212544,7 +213705,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Effectful effects for testing";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -212845,8 +214006,8 @@ self: {
     }:
     mkDerivation {
       pname = "egison";
-      version = "4.2.1";
-      sha256 = "056rbb9nl00dbfr97k4865i0djkbqsqgqxpg0f1l9phrif5308vl";
+      version = "5.0.0";
+      sha256 = "07sb43axq7pifk7gjx43hk0j67gq3q58ldqbfmjkam38zscmmbp1";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -212854,6 +214015,7 @@ self: {
         base
         containers
         directory
+        filepath
         hashable
         haskeline
         megaparsec
@@ -212880,7 +214042,6 @@ self: {
         haskeline
         mtl
         optparse-applicative
-        prettyprinter
         regex-tdfa
         text
       ];
@@ -212890,7 +214051,6 @@ self: {
         Glob
         HUnit
         mtl
-        process
         test-framework
         test-framework-hunit
         transformers
@@ -212902,6 +214062,7 @@ self: {
       ];
       description = "Programming language with non-linear pattern-matching against non-free data";
       license = lib.licenses.mit;
+      mainProgram = "egison";
     }
   ) { };
 
@@ -213188,7 +214349,9 @@ self: {
       ];
       description = "A tutorial program for the Egison programming language";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "egison-tutorial";
+      broken = true;
     }
   ) { };
 
@@ -213267,7 +214430,7 @@ self: {
         transformers
       ];
       description = "Minimalistic SMTP client for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -213397,7 +214560,7 @@ self: {
       executableHaskellDepends = [ base ];
       executableToolDepends = [ markdown-unlit ];
       description = "IO with Exceptions tracked on the type-level";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "readme";
       broken = true;
@@ -213420,8 +214583,8 @@ self: {
       pname = "either";
       version = "5.0.3";
       sha256 = "00a8h2jgrpqdlsi8vjrm2qa6rmw33ksirxv9s6i90nlmhhg6jrkd";
-      revision = "1";
-      editedCabalFile = "1kxv5srzblkva3ajiw8jrzj05jbjncwj499hcsk9zsyml9ig9if3";
+      revision = "2";
+      editedCabalFile = "00rn9d0zi9gln0gjczhk14vzgypq4qy1cpnjzgllz0hmgc5w51pm";
       libraryHaskellDepends = [
         base
         bifunctors
@@ -213486,7 +214649,7 @@ self: {
         doctest
       ];
       description = "Functions involving lists of Either";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -213523,7 +214686,7 @@ self: {
         hspec-discover
       ];
       description = "The simplest ‘MonadFail’ instance";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -213535,7 +214698,7 @@ self: {
       sha256 = "0llfkcq1j7l09vhn38s1asin90ki2xzkpr9xxqpvx0jvpdppza7i";
       libraryHaskellDepends = [ base ];
       description = "Either with a stricter Semigroup instance";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -213605,7 +214768,7 @@ self: {
             vector
           ];
           description = "Binding to EJDB2 C library, an embedded JSON noSQL database";
-          license = lib.licensesSpdx."MIT";
+          license = lib.meta.getLicenseFromSpdxId "MIT";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -214212,7 +215375,7 @@ self: {
         unpacked-maybe-text
       ];
       description = "Serialization of Elasticsearch requests and responses";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -214661,8 +215824,8 @@ self: {
     }:
     mkDerivation {
       pname = "elm-bridge";
-      version = "0.8.4";
-      sha256 = "1f16inr64xhsb2h9gbqlr1a38j3xqsw33v2xlr7k33yr2plss12y";
+      version = "0.8.5";
+      sha256 = "1jb6dr34l955b2km4a7k8zg1vn452206qdsikwhdygp6ynwfzilq";
       libraryHaskellDepends = [
         aeson
         base
@@ -215457,7 +216620,7 @@ self: {
       ];
       doHaddock = false;
       description = "Crossing the road between Haskell and Elm";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -215754,7 +216917,7 @@ self: {
         text
       ];
       description = "Generate Elm datatype definitions, encoders and decoders from Haskell datatypes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "generate-test-app-code";
     }
   ) { };
@@ -215949,7 +217112,7 @@ self: {
         tlynx
       ];
       description = "Validate and (optionally) redo ELynx analyses";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       mainProgram = "elynx";
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -215982,7 +217145,7 @@ self: {
         tlynx
       ];
       description = "Validate and (optionally) redo ELynx analyses";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "elynx";
       maintainers = [ lib.maintainers.dschrempf ];
@@ -216038,7 +217201,7 @@ self: {
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Simulate molecular sequences along trees";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -216092,7 +217255,7 @@ self: {
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Simulate molecular sequences along trees";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -216120,7 +217283,7 @@ self: {
         hspec
       ];
       description = "Import and export Nexus files";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -216147,7 +217310,7 @@ self: {
         hspec
       ];
       description = "Import and export Nexus files";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -216198,7 +217361,7 @@ self: {
         vector
       ];
       description = "Handle molecular sequences";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -216248,7 +217411,7 @@ self: {
         vector
       ];
       description = "Handle molecular sequences";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -216293,7 +217456,7 @@ self: {
         zlib
       ];
       description = "Tools for ELynx";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -216337,7 +217500,7 @@ self: {
         zlib
       ];
       description = "Tools for ELynx";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -216406,7 +217569,7 @@ self: {
         random
       ];
       description = "Handle phylogenetic trees";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -216473,7 +217636,7 @@ self: {
         random
       ];
       description = "Handle phylogenetic trees";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -216543,7 +217706,7 @@ self: {
         websockets
       ];
       description = "Static site generator library with hot reload";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     }
   ) { };
 
@@ -216594,7 +217757,7 @@ self: {
         url-slug
       ];
       description = "Useful route types for Ema";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -216638,7 +217801,7 @@ self: {
         url-slug
       ];
       description = "Generic deriving for Ema routes";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -216729,7 +217892,7 @@ self: {
         void
       ];
       description = "Utilities to write Emacs dynamic modules";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -216780,7 +217943,7 @@ self: {
         void
       ];
       description = "Utilities to write Emacs dynamic modules";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -216970,7 +218133,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "Perform basic syntax and deliverability checks on email addresses";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       mainProgram = "email-validator";
     }
   ) { };
@@ -217361,7 +218524,7 @@ self: {
         yaml
       ];
       description = "Emanate a structured view of your plain-text notes";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "emanote";
       broken = true;
@@ -217468,7 +218631,7 @@ self: {
         chronos
       ];
       description = "execute actions periodically while avoiding drift";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -217667,7 +218830,7 @@ self: {
         transformers
       ];
       description = "Embedded shell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -218927,7 +220090,7 @@ self: {
         deepseq
       ];
       description = "Enum wrappers for IntMap and IntSet";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -218999,7 +220162,7 @@ self: {
         template-haskell
       ];
       description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -219072,7 +220235,7 @@ self: {
       sha256 = "0xm9638nkikfy62abims10jmmr9y3rm2vb22aqh4qmjcj4r37ibq";
       libraryHaskellDepends = [ base ];
       description = "Conditionally running IO actions based on environment variables";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -219323,7 +220486,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Provides FromEnv in envy instance for Record of extensible";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -219574,7 +220737,59 @@ self: {
         profunctors
       ];
       description = "See readme.md";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
+  ephemeral-pg = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      directory,
+      filepath,
+      hashable,
+      hasql,
+      hspec,
+      network,
+      process,
+      QuickCheck,
+      temporary,
+      text,
+      transformers,
+      typed-process,
+      unix,
+    }:
+    mkDerivation {
+      pname = "ephemeral-pg";
+      version = "0.2.1.0";
+      sha256 = "1fcwbmp6rrvx2hzal6nhs6nn7wdp0x119rwnlk9ilixxzx25188g";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        directory
+        filepath
+        hashable
+        hasql
+        network
+        process
+        temporary
+        text
+        transformers
+        typed-process
+        unix
+      ];
+      testHaskellDepends = [
+        base
+        hasql
+        hspec
+        QuickCheck
+        text
+      ];
+      description = "Temporary PostgreSQL databases for testing";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -219790,7 +221005,7 @@ self: {
         zip-archive
       ];
       description = "Library for parsing epub document metadata";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       mainProgram = "epub-metadata-example";
     }
   ) { };
@@ -219842,7 +221057,7 @@ self: {
         regex-compat
       ];
       description = "Command line utilities for working with epub files";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -219955,7 +221170,7 @@ self: {
         void
       ];
       description = "Proof assistant for Haskell using DataKinds & PolyKinds";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -220024,7 +221239,7 @@ self: {
         time
       ];
       description = "Application level triggered, and edge triggered event multiqueues";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -220208,7 +221423,7 @@ self: {
         websockets
       ];
       description = "Decentralized messaging and synchronization";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "erebos";
       broken = true;
@@ -220268,7 +221483,7 @@ self: {
         unix
       ];
       description = "Test framework with virtual network using Linux namespaces";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       platforms = lib.platforms.linux;
       mainProgram = "erebos-tester";
     }
@@ -220531,7 +221746,7 @@ self: {
         time
       ];
       description = "Generic API client library for ERPNext";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -220572,7 +221787,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Source code error pretty printing";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "errata-example";
     }
   ) { };
@@ -220618,7 +221833,7 @@ self: {
         doctest
       ];
       description = "The canonical error type";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -220677,7 +221892,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Error code functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -221216,7 +222431,7 @@ self: {
         text
       ];
       description = "draw circuit (DAG) for Ersatz.Bit";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -221295,7 +222510,7 @@ self: {
         tasty-hunit
       ];
       description = "Easily build and run haskell code to solve AoC problems";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -221936,52 +223151,65 @@ self: {
     {
       mkDerivation,
       base,
+      base16,
+      binary,
+      bytestring,
+      call-stack,
       containers,
       esqueleto,
       geojson,
       hedgehog,
+      hspec,
+      HUnit,
       monad-logger,
       persistent,
       persistent-postgresql,
       resourcet,
       tasty,
+      tasty-hspec,
       tasty-hunit,
       tasty-quickcheck,
       text,
-      wkt-geom,
     }:
     mkDerivation {
       pname = "esqueleto-postgis";
-      version = "1.0.1";
-      sha256 = "0s87xwqbh0b4xl956g7zgf58ga92cfnnbijqyw0rd007y4rf0v7m";
+      version = "4.1.0";
+      sha256 = "1i7dimzs7kxjhznd3fmpf50mz37vb7fqiqw0y19yfp3kxaqyrhxv";
       libraryHaskellDepends = [
         base
+        base16
+        binary
+        bytestring
         containers
         esqueleto
         geojson
         persistent
         text
-        wkt-geom
       ];
       testHaskellDepends = [
         base
+        base16
+        binary
+        bytestring
+        call-stack
         containers
         esqueleto
         geojson
         hedgehog
+        hspec
+        HUnit
         monad-logger
         persistent
         persistent-postgresql
         resourcet
         tasty
+        tasty-hspec
         tasty-hunit
         tasty-quickcheck
         text
-        wkt-geom
       ];
       description = "postgis bindings for esqueleto";
-      license = lib.licensesSpdx."MIT";
-      hydraPlatforms = lib.platforms.none;
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -222061,7 +223289,7 @@ self: {
         transformers
       ];
       description = "PostgreSQL full text search for Esqueleto";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -222138,7 +223366,7 @@ self: {
         vector-sized
       ];
       description = "General purpose live coding framework";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
@@ -223255,7 +224483,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Mathematics utilities for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -223451,7 +224679,7 @@ self: {
         unix
       ];
       description = "Bindings to libevdev";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.linux;
     }
   ) { inherit (pkgs) libevdev; };
@@ -223489,7 +224717,7 @@ self: {
         unix
       ];
       description = "Bridge for working with evdev and streamly";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.linux;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -224157,14 +225385,14 @@ self: {
       path-pieces,
       template-haskell,
       text,
+      time,
       transformers,
       uuid,
-      x-sum-type-boilerplate,
     }:
     mkDerivation {
       pname = "eventium-core";
-      version = "0.1.0";
-      sha256 = "0jrfx6azvan38aqqb5f4dzapzlgkxaj3la6yqkmafs2fdpbqwm7b";
+      version = "0.2.1";
+      sha256 = "0w9hbwzp40i2f7cp74cicj4l23sc023s6saz20n8c47j7iy51854";
       libraryHaskellDepends = [
         aeson
         base
@@ -224174,9 +225402,9 @@ self: {
         path-pieces
         template-haskell
         text
+        time
         transformers
         uuid
-        x-sum-type-boilerplate
       ];
       testHaskellDepends = [
         aeson
@@ -224189,14 +225417,13 @@ self: {
         path-pieces
         template-haskell
         text
+        time
         transformers
         uuid
-        x-sum-type-boilerplate
       ];
       testToolDepends = [ hspec-discover ];
       description = "Core module for eventium";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -224206,7 +225433,7 @@ self: {
       base,
       containers,
       eventium-core,
-      eventium-test-helpers,
+      eventium-testkit,
       hspec,
       hspec-discover,
       HUnit,
@@ -224216,8 +225443,8 @@ self: {
     }:
     mkDerivation {
       pname = "eventium-memory";
-      version = "0.1.0";
-      sha256 = "197axw6mfbgf9bq9rjd0lpflvmqxm16sk72bxcsppn2vhx0pa4na";
+      version = "0.2.1";
+      sha256 = "0xx4mv3zb0jycmjrvz6xxlmb9ka2xkpl54j11h26vp65fc10mj8w";
       libraryHaskellDepends = [
         base
         containers
@@ -224230,7 +225457,7 @@ self: {
         base
         containers
         eventium-core
-        eventium-test-helpers
+        eventium-testkit
         hspec
         HUnit
         mtl
@@ -224252,7 +225479,7 @@ self: {
       bytestring,
       eventium-core,
       eventium-sql-common,
-      eventium-test-helpers,
+      eventium-testkit,
       hspec,
       hspec-discover,
       HUnit,
@@ -224264,8 +225491,8 @@ self: {
     }:
     mkDerivation {
       pname = "eventium-postgresql";
-      version = "0.1.0";
-      sha256 = "0cri25a2r0v2mkk9why8r7pwqh6m8j0dwivcccpi51924ih3jsc3";
+      version = "0.2.1";
+      sha256 = "01wdp5i8a7nkw95n1wb3hnrclc3pqkx7k7j3ir67zyzzc7a6y1in";
       libraryHaskellDepends = [
         aeson
         base
@@ -224282,7 +225509,7 @@ self: {
         bytestring
         eventium-core
         eventium-sql-common
-        eventium-test-helpers
+        eventium-testkit
         hspec
         HUnit
         mtl
@@ -224307,14 +225534,14 @@ self: {
       eventium-core,
       mtl,
       persistent,
-      persistent-template,
       text,
+      time,
       uuid,
     }:
     mkDerivation {
       pname = "eventium-sql-common";
-      version = "0.1.0";
-      sha256 = "0px9qz53rrq1a7wzgxgk0ykkgpkzmqh1gdm5xcq931fnl9kp2irh";
+      version = "0.2.1";
+      sha256 = "1qs6jjjza04wqn25xdgkxfw2k1mhw81cmcfac75q7hr5wd0kxlr6";
       libraryHaskellDepends = [
         aeson
         base
@@ -224322,13 +225549,12 @@ self: {
         eventium-core
         mtl
         persistent
-        persistent-template
         text
+        time
         uuid
       ];
       description = "Common library for SQL event stores";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -224340,7 +225566,7 @@ self: {
       bytestring,
       eventium-core,
       eventium-sql-common,
-      eventium-test-helpers,
+      eventium-testkit,
       hspec,
       hspec-discover,
       HUnit,
@@ -224352,8 +225578,8 @@ self: {
     }:
     mkDerivation {
       pname = "eventium-sqlite";
-      version = "0.1.0";
-      sha256 = "0lfpcbqsjmmbi7ld5kqpria0fl8cpvqyqqg7laazd5cwzm4pmwvz";
+      version = "0.2.1";
+      sha256 = "0wbkwpbfphp9lh3lgw14jqd86ywsnbdzb0ydxzs3xs1aq3x3gnvb";
       libraryHaskellDepends = [
         aeson
         base
@@ -224371,7 +225597,7 @@ self: {
         bytestring
         eventium-core
         eventium-sql-common
-        eventium-test-helpers
+        eventium-testkit
         hspec
         HUnit
         mtl
@@ -224416,6 +225642,38 @@ self: {
       description = "Common module used for eventium tests";
       license = lib.licenses.mit;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
+  eventium-testkit = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      eventium-core,
+      extra,
+      hspec,
+      monad-logger,
+      text,
+    }:
+    mkDerivation {
+      pname = "eventium-testkit";
+      version = "0.2.1";
+      sha256 = "00ssl4gy8aiwj7r4x4a6d41ydvhdz4mw967d9nlgfc0ii7h5py7n";
+      libraryHaskellDepends = [
+        aeson
+        base
+        eventium-core
+        extra
+        hspec
+        monad-logger
+        text
+      ];
+      description = "Testing utilities for eventium";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -224454,7 +225712,7 @@ self: {
         unordered-containers
       ];
       description = "Live processing of eventlog data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -224493,7 +225751,7 @@ self: {
         text
       ];
       description = "Stream eventlog data into InfluxDB";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "eventlog-live-influxdb";
     }
   ) { };
@@ -224561,7 +225819,7 @@ self: {
         yaml
       ];
       description = "Stream eventlog data to the OpenTelemetry Collector";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "eventlog-live-otelcol";
     }
@@ -224571,11 +225829,34 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "eventlog-socket";
-      version = "0.1.0.0";
-      sha256 = "0rlwasd1hamyhpn4h3kk3s5sfhxvc1j8sz4nkxnmch6xgcqcp4yl";
+      version = "0.1.1.0";
+      sha256 = "1y3hji0xcqqkkr5drm4nss3q3wvqlmcq870y6ggx3j0kz2sd2w32";
       libraryHaskellDepends = [ base ];
       description = "Stream GHC eventlog events to external processes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  eventlog-socket-control = callPackage (
+    {
+      mkDerivation,
+      base,
+      binary,
+      bytestring,
+      text,
+    }:
+    mkDerivation {
+      pname = "eventlog-socket-control";
+      version = "0.1.0.0";
+      sha256 = "0zk897dhykrgj0i750cq558bm39vn1frgq9asxq58zwf4jbfqdmr";
+      libraryHaskellDepends = [
+        base
+        binary
+        bytestring
+        text
+      ];
+      description = "Control command protocol for eventlog-socket";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -224648,7 +225929,7 @@ self: {
         text
       ];
       description = "Visualise an eventlog";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "eventlog2html";
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -225177,7 +226458,7 @@ self: {
         unliftio-core
       ];
       description = "An event-oriented observability library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -225240,7 +226521,7 @@ self: {
         warp
       ];
       description = "Grab bag of eventuo11y-enriched functionality";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -225260,7 +226541,7 @@ self: {
         template-haskell
       ];
       description = "DSL for defining eventuo11y fields and selectors";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -225295,7 +226576,7 @@ self: {
         uuid
       ];
       description = "aeson-based rendering for eventuo11y";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -225319,7 +226600,7 @@ self: {
         text
       ];
       description = "OpenTelemetry-based rendering for eventuo11y";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -225343,7 +226624,7 @@ self: {
         prometheus
       ];
       description = "Prometheus backend for eventuo11y";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -225699,7 +226980,7 @@ self: {
         tasty-hunit
       ];
       description = "Exact Kantorovich distance between finite probability measures";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -225813,7 +227094,7 @@ self: {
       libraryHaskellDepends = [ base ];
       executableHaskellDepends = [ base ];
       description = "Example Haskell Project";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "example-haskell-project";
     }
   ) { };
@@ -226084,6 +227365,8 @@ self: {
       pname = "exceptions";
       version = "0.10.12";
       sha256 = "08xz6j33l1zy6vihsiggn1p2pxp3yn974n4ssch1b5mz14xj8djk";
+      revision = "1";
+      editedCabalFile = "1694v2d1c8bn6hayk659irc5ljdwv50j3wz3fxswfbxqqj3my3ql";
       libraryHaskellDepends = [
         base
         mtl
@@ -226513,7 +227796,7 @@ self: {
         xml-optics
       ];
       description = "A library for crawling exhentai";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -226656,7 +227939,7 @@ self: {
         vector
       ];
       description = "Haskell bindings to ExifTool";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -227046,7 +228329,6 @@ self: {
       ];
       description = "Dependent sum type";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -227173,8 +228455,8 @@ self: {
     }:
     mkDerivation {
       pname = "exitcode";
-      version = "0.1.0.10";
-      sha256 = "0w5n3gfxv7950q6ds37a92jxg7nw8vgqxd0n801qi0ai9q16w3bd";
+      version = "0.2.0.0";
+      sha256 = "0lvwabnl28j9wm5l9cdxcd8vr61ngv05sg6izh7r2q9scv9nrswj";
       libraryHaskellDepends = [
         base
         bifunctors
@@ -227270,7 +228552,7 @@ self: {
         incipit-base
       ];
       description = "Customizable quasiquote interpolation";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -227764,7 +229046,7 @@ self: {
         hspec
       ];
       description = "Predicates that can explain themselves";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -227833,7 +229115,7 @@ self: {
         transformers
       ];
       description = "Exceptions which are explicit in the type signature";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -228381,7 +229663,7 @@ self: {
         HUnit
       ];
       description = "Support for an 80-bit extended float";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -228569,7 +229851,7 @@ self: {
         template-haskell
       ];
       description = "Extensible, efficient, optics-friendly data types and effects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -228757,7 +230039,7 @@ self: {
         unliftio
       ];
       description = "Message passing concurrency as extensible-effect";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -228810,7 +230092,7 @@ self: {
         extensible
       ];
       description = "Operational-based extensible effect library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -228927,7 +230209,7 @@ self: {
         text
       ];
       description = "Parse Haskell Language Extensions";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "extensions";
     }
@@ -228990,7 +230272,7 @@ self: {
         text
       ];
       description = "Parse Haskell Language Extensions";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       mainProgram = "extensions";
     }
   ) { };
@@ -229052,7 +230334,7 @@ self: {
         text
       ];
       description = "Parse Haskell Language Extensions";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "extensions";
     }
@@ -229116,7 +230398,7 @@ self: {
         HUnit
       ];
       description = "Extism bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -229141,7 +230423,7 @@ self: {
         json
       ];
       description = "Extism manifest bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -229177,7 +230459,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Extism Plugin Development Kit";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -229639,7 +230921,7 @@ self: {
         toolshed
       ];
       description = "Rational arithmetic in an irrational world";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "factory";
       broken = true;
@@ -229921,8 +231203,6 @@ self: {
       ];
       description = "A simple type class for success/failure computations. (deprecated)";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -229993,7 +231273,6 @@ self: {
       ];
       description = "Lists with fair choice";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -230280,7 +231559,7 @@ self: {
         QuickCheck
       ];
       description = "Extensible fake file system for testing";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -230310,7 +231589,7 @@ self: {
         QuickCheck
       ];
       description = "Monad to pull from fake stream-like objects";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -230572,7 +231851,65 @@ self: {
         tasty-hunit
       ];
       description = "Property-based testing with internal integrated shrinking";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      maintainers = [ lib.maintainers.maralorn ];
+    }
+  ) { };
+
+  falsify_0_3_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      base16-bytestring,
+      binary,
+      bytestring,
+      containers,
+      data-default,
+      mtl,
+      optics-core,
+      optparse-applicative,
+      QuickCheck,
+      selective,
+      sop-core,
+      splitmix,
+      tagged,
+      tasty,
+      tasty-hunit,
+      vector,
+    }:
+    mkDerivation {
+      pname = "falsify";
+      version = "0.3.0";
+      sha256 = "1lw16gpxk9kil87jl7nm3indiff7w9h5f4vxihfrmqwzmcq05ipk";
+      libraryHaskellDepends = [
+        base
+        base16-bytestring
+        binary
+        bytestring
+        containers
+        data-default
+        mtl
+        optics-core
+        optparse-applicative
+        selective
+        sop-core
+        splitmix
+        tagged
+        tasty
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        data-default
+        QuickCheck
+        selective
+        tasty
+        tasty-hunit
+      ];
+      description = "Property-based testing with internal integrated shrinking";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -231607,7 +232944,7 @@ self: {
         template-haskell
       ];
       description = "A fast open-union type suitable for 100+ contained alternatives";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -232096,7 +233433,7 @@ self: {
         HUnit
       ];
       description = "Stubs for dependencies of test code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -232173,8 +233510,8 @@ self: {
         }:
         mkDerivation {
           pname = "fb-util";
-          version = "0.2.0.0";
-          sha256 = "0618nh92kmsx4gfw37lspaiqsz4g8vcsfchax46bw172z8yg7mim";
+          version = "0.2.0.1";
+          sha256 = "0zp4kc6bb47539j4rc75jr3kf5iqvjy0bi52rfvrxycbngkrl4ch";
           libraryHaskellDepends = [
             aeson
             aeson-pretty
@@ -232267,7 +233604,7 @@ self: {
             vector
           ];
           description = "Various utility libraries";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -232542,7 +233879,7 @@ self: {
         xdg-basedir
       ];
       description = "Fedora packager tool to build package branches";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fbrnch";
     }
@@ -232676,7 +234013,7 @@ self: {
         fcf-family
       ];
       description = "Family-of-families instances for base";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -232758,7 +234095,7 @@ self: {
         text
       ];
       description = "Data structures and algorithms for first-class-families";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -232787,7 +234124,7 @@ self: {
         first-class-families
       ];
       description = "Family of families: featherweight defunctionalization";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -233033,7 +234370,7 @@ self: {
         text
       ];
       description = "Admin API for Firebase Cloud Messaging";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fcm-client";
       broken = true;
@@ -233160,7 +234497,7 @@ self: {
       ];
       executablePkgconfigDepends = [ ncurses ];
       description = "A terminal broughlike game about manipulating vision";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fearOfView";
       broken = true;
@@ -233347,7 +234684,7 @@ self: {
         random
       ];
       description = "Forward error correction of ByteStrings";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "benchmark-zfec";
       broken = true;
@@ -233431,7 +234768,7 @@ self: {
       csv,
       directory,
       extra,
-      fedora-dists,
+      fedora-releases,
       filepath,
       http-conduit,
       http-types,
@@ -233439,14 +234776,15 @@ self: {
       process,
       simple-cmd,
       simple-cmd-args,
+      simple-prompt,
       split,
       time,
       unix,
     }:
     mkDerivation {
       pname = "fedora-haskell-tools";
-      version = "1.1";
-      sha256 = "194jkagrvkhzgw224jybxy4gvavs9qm6lp1b26ddbnpddf3v6paf";
+      version = "1.2";
+      sha256 = "17arls0gmqb2n1n1fbci9gcrj0p8ijblcl4npq5417yxgq06a1x2";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -233455,7 +234793,7 @@ self: {
         csv
         directory
         extra
-        fedora-dists
+        fedora-releases
         filepath
         http-conduit
         http-types
@@ -233463,6 +234801,7 @@ self: {
         process
         simple-cmd
         simple-cmd-args
+        simple-prompt
         split
         time
         unix
@@ -233667,7 +235006,7 @@ self: {
     }
   ) { };
 
-  fedora-repoquery_0_8 = callPackage (
+  fedora-repoquery_0_8_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -233689,8 +235028,8 @@ self: {
     }:
     mkDerivation {
       pname = "fedora-repoquery";
-      version = "0.8";
-      sha256 = "0fzydnlaalbnhkmdcsizrbwm7h3i44g29g2l514fw0lvc1s8ln9z";
+      version = "0.8.1";
+      sha256 = "0g2vnk9hm5apr2ixl6k567wg8kkzkfmg265pb244cm0raam417cd";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -234243,7 +235582,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Declarative feedback loop manager";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -234301,7 +235640,7 @@ self: {
       executableSystemDepends = [ mxnet ];
       executableToolDepends = [ c2hs ];
       description = "FFI to MXNet";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mxnet-op-gen";
     }
@@ -234379,7 +235718,7 @@ self: {
         store
       ];
       description = "Cocodataset with cocoapi";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "imageutils";
       broken = true;
@@ -234529,7 +235868,7 @@ self: {
         vector
       ];
       description = "Some datasets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -234581,7 +235920,7 @@ self: {
         store
       ];
       description = "fei examples";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -234621,7 +235960,7 @@ self: {
         vector
       ];
       description = "A collection of standard models";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -234683,7 +236022,7 @@ self: {
         wl-pprint-text
       ];
       description = "Train a neural network with MXNet in Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -235052,7 +236391,7 @@ self: {
           ];
           libraryToolDepends = [ c2hs ];
           description = "C bindings plus conveniences for the festival tts system";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -235280,7 +236619,7 @@ self: {
         unordered-containers
       ];
       description = "Automatic C++ binding generation";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -235301,7 +236640,7 @@ self: {
         template-haskell
       ];
       description = "Runtime for fficxx-generated library";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -235474,7 +236813,7 @@ self: {
             fftwFloat
           ];
           description = "Low-level interface to FFTW (Fast Fourier Transform)";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           maintainers = [ lib.maintainers.thielema ];
         }
       )
@@ -235544,7 +236883,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "FFunctor typeclass";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -235682,7 +237021,7 @@ self: {
         semirings
       ];
       description = "fibonacci algebra";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -235869,7 +237208,7 @@ self: {
         tasty-hunit
       ];
       description = "Codegen Haskell types to other languages";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -236118,6 +237457,7 @@ self: {
       base,
       bytestring,
       deepseq,
+      directory,
       filepath,
       tasty,
       tasty-hunit,
@@ -236126,8 +237466,8 @@ self: {
     }:
     mkDerivation {
       pname = "file-io";
-      version = "0.1.5";
-      sha256 = "0nvxp3d7j2fdkfcvk5n7swc0id7c7gzp3g0jr4q4vpljqzj1j2ii";
+      version = "0.1.6";
+      sha256 = "046plhgvymqjmw7s9irf5b6jvixznapw1ihngb8qg6nzq5nris8a";
       libraryHaskellDepends = [
         base
         bytestring
@@ -236138,13 +237478,14 @@ self: {
       testHaskellDepends = [
         base
         bytestring
+        directory
         filepath
         tasty
         tasty-hunit
         temporary
       ];
       description = "Basic file IO operations via 'OsPath'";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -236182,7 +237523,7 @@ self: {
         temporary
       ];
       description = "Basic file IO operations via 'OsPath'";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -236363,7 +237704,7 @@ self: {
         tasty-bench
       ];
       description = "File URI parsing";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -236481,8 +237822,8 @@ self: {
     }:
     mkDerivation {
       pname = "filelock";
-      version = "0.1.1.8";
-      sha256 = "0bmnj888w2srz2rywmh13dqwmqsqyzkgkz952h1gdd7ycvlj5avj";
+      version = "0.1.1.9";
+      sha256 = "1rzaanib630jlr6g7xp02qbmjdf7p1nlfv171jhq7qwr0drlhci4";
       libraryHaskellDepends = [
         base
         unix
@@ -236493,7 +237834,7 @@ self: {
         process
       ];
       description = "Portable interface to file locking (flock / LockFileEx)";
-      license = lib.licenses.publicDomain;
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     }
   ) { };
 
@@ -236598,7 +237939,7 @@ self: {
         tasty-bench
       ];
       description = "Library for manipulating FilePaths in a cross platform way";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -236883,7 +238224,7 @@ self: {
         semigroups
       ];
       description = "A shared set of abstractions and types for representing filessytem data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -237173,7 +238514,7 @@ self: {
         tagged
       ];
       description = "Nat and Fin: peano naturals and finite numbers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -237578,6 +238919,8 @@ self: {
       pname = "finitary";
       version = "2.2.0.0";
       sha256 = "035pbixg74z7xbjw33y50xxgkhml5l3y93izmlilgd8dil8biwl3";
+      revision = "1";
+      editedCabalFile = "0inj6lnh71mlilkdgvpfpp2rmc9494gsf44bd9qg5jz26j4v8ss8";
       libraryHaskellDepends = [
         base
         bitvec
@@ -237606,7 +238949,7 @@ self: {
         vector-sized
       ];
       description = "A better, more type-safe Enum";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
     }
   ) { };
 
@@ -237664,7 +239007,7 @@ self: {
         vector
       ];
       description = "Flexible and easy deriving of type classes for finitary types";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -237700,7 +239043,7 @@ self: {
         optics-core
       ];
       description = "Prisms and Isos between finitary types";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -237844,8 +239187,8 @@ self: {
       pname = "finite-semigroups";
       version = "0.1.0.0";
       sha256 = "0xvqnafhqhv17jr0pl9r4fxj5rcp8q18pymmbckrq1dc7hffdqq2";
-      revision = "1";
-      editedCabalFile = "1hb2f392007ks1vcvhs6rd82piwmbz5n0v477lv9kja2ww90i4y5";
+      revision = "2";
+      editedCabalFile = "1sks4zr25pcn46xwibmvmc10lcii8bzakpbv3czzi639xs5fwrsi";
       libraryHaskellDepends = [
         base
         containers
@@ -237857,7 +239200,7 @@ self: {
         HUnit
       ];
       description = "Operations and classification for finite semigroups";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -238079,6 +239422,56 @@ self: {
     }
   ) { nano-http = null; };
 
+  firebase-hs = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      http-client,
+      http-client-tls,
+      http-types,
+      jose,
+      lens,
+      stm,
+      text,
+      time,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "firebase-hs";
+      version = "0.1.1.0";
+      sha256 = "0fkf42m9higfyqm3cjyhz1mscw768rplsc9ma2c5xj42n890n28d";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        http-client
+        http-client-tls
+        http-types
+        jose
+        lens
+        stm
+        text
+        time
+        transformers
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        http-types
+        text
+        time
+      ];
+      description = "Firebase Auth, Firestore, and Servant integration for Haskell";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   firefly = callPackage (
     {
       mkDerivation,
@@ -238284,7 +239677,7 @@ self: {
         template-haskell
       ];
       description = "First-class typeclass instances";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -238303,7 +239696,7 @@ self: {
         transformers
       ];
       description = "First class patterns and pattern matching, using type families";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -238731,7 +240124,7 @@ self: {
         text
       ];
       description = "Fixes whitespace issues";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "fix-whitespace";
     }
   ) { };
@@ -238767,7 +240160,7 @@ self: {
         ghc-internal
       ];
       description = "Fixed-point number build on generic integral number";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -238794,7 +240187,7 @@ self: {
         utility-ht
       ];
       description = "Lists with statically known length based on non-empty package";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -238940,7 +240333,7 @@ self: {
         time
       ];
       description = "Pure Haskell library to repeat an action at a specific frequency";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -238977,11 +240370,11 @@ self: {
         template-haskell
       ];
       description = "Generic vectors with statically known size";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
-  fixed-vector_2_1_0_0 = callPackage (
+  fixed-vector_2_1_1_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -238995,8 +240388,8 @@ self: {
     }:
     mkDerivation {
       pname = "fixed-vector";
-      version = "2.1.0.0";
-      sha256 = "04nda87wy4zfs2crmajk9yv0kypk52kqf0vbsyalffw6h72rm0ag";
+      version = "2.1.1.0";
+      sha256 = "12n0j7vizzvpiwhz89c790l5xxqpdzii3linsml4ancvfz4hdgzn";
       libraryHaskellDepends = [
         base
         deepseq
@@ -239012,7 +240405,7 @@ self: {
         template-haskell
       ];
       description = "Generic vectors with statically known size";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -239657,7 +241050,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Complete high-level binding to libFLAC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) flac; };
 
@@ -239695,7 +241088,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Support for writing pictures into FLAC metadata blocks with JuicyPixels";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -240161,7 +241554,7 @@ self: {
         parsec
       ];
       description = "flatten a latex multi-file latex document and remove all comments";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
       mainProgram = "flat-tex";
     }
   ) { };
@@ -240330,7 +241723,7 @@ self: {
         text
       ];
       description = "Flatbuffers encoding based on a syntax tree";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -240375,7 +241768,7 @@ self: {
         text
       ];
       description = "Parse flatbuffers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -240404,7 +241797,7 @@ self: {
         vector
       ];
       description = "Haskell bindings for FlatCV image processing library";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -240553,7 +241946,7 @@ self: {
         text
       ];
       description = "Flexible numeric parsers for real-world programming languages";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -240871,7 +242264,7 @@ self: {
       ];
       libraryToolDepends = [ proto-lens-protoc ];
       description = "Flink stateful functions SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -241222,7 +242615,7 @@ self: {
         HUnit
       ];
       description = "Write more understandable Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -242610,7 +244003,7 @@ self: {
         criterion
       ];
       description = "fnmatch C wrapper";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -242637,7 +244030,7 @@ self: {
         tasty-hunit
       ];
       description = "A general abstraction for manipulating elements of container data structures";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -242809,6 +244202,7 @@ self: {
       description = "Foldable types with at least 1 element";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -242831,8 +244225,8 @@ self: {
       pname = "foldable1-classes-compat";
       version = "0.1.3";
       sha256 = "1yg83bxl41ysjlbznn8v9nbp6v0yix858fb92w5a5dzyrjhxq0bp";
-      revision = "1";
-      editedCabalFile = "1jspmaifvx1xjpd7bhk8bx8kk829jjry76d6h7675q5b2p1qal6z";
+      revision = "2";
+      editedCabalFile = "0v07rqlcz4738jzvswyljii7pchwav2nr6jz59mlv5jgp86vhc5i";
       libraryHaskellDepends = [
         base
         ghc-prim
@@ -242856,7 +244250,7 @@ self: {
       ];
       doHaddock = false;
       description = "Compatibility package for the Foldable1 and Bifoldable1 type classes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -242941,7 +244335,7 @@ self: {
         safe-exceptions
       ];
       description = "Exception handling with FoldM";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -243127,7 +244521,7 @@ self: {
         lens-family-core
       ];
       description = "Transducers for foldl folds";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -243497,8 +244891,8 @@ self: {
         }:
         mkDerivation {
           pname = "folly-clib";
-          version = "20250713.1537";
-          sha256 = "1qwznpx922gcy17nzvv249dq4f6f2lvh7y055cpd6kzqk03a984j";
+          version = "20260203.1245";
+          sha256 = "1kdj31w20wgycbmq5gnhywkbs9n9028xii54mfabf2cyfn8w3qns";
           librarySystemDepends = [
             boost
             boost_filesystem
@@ -243513,7 +244907,7 @@ self: {
           ];
           doHaddock = false;
           description = "The folly C++ library from Meta";
-          license = lib.licensesSpdx."Apache-2.0";
+          license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -243641,13 +245035,52 @@ self: {
         text
       ];
       description = "Queries your system (Linux/BSD/etc) font database";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fontconfig-pure";
       broken = true;
     }
   ) { inherit (pkgs) fontconfig; };
 
+  fontwhich = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      extra,
+      gi-pango,
+      gi-pangocairo,
+      simple-cmd,
+      simple-cmd-args,
+      text,
+      unicode-data-names,
+      unicode-data-scripts,
+    }:
+    mkDerivation {
+      pname = "fontwhich";
+      version = "0.2";
+      sha256 = "0784d0i55wnrqr8ajd7lpw5cdw67gni430g3vhp45mx3ic9srm7c";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        base
+        bytestring
+        extra
+        gi-pango
+        gi-pangocairo
+        simple-cmd
+        simple-cmd-args
+        text
+        unicode-data-names
+        unicode-data-scripts
+      ];
+      description = "Determine fonts used to render text";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "fontwhich";
+    }
+  ) { };
+
   foo = callPackage (
     {
       mkDerivation,
@@ -243875,7 +245308,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A collection of helpers for ffi";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -244310,7 +245743,7 @@ self: {
         text
       ];
       description = "Formatting of doubles";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -244406,7 +245839,7 @@ self: {
         text
       ];
       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -244548,16 +245981,20 @@ self: {
       mkDerivation,
       base,
       bytestring,
+      directory,
       grammatical-parsers,
       monoid-subclasses,
+      optparse-applicative,
       parsers,
       rank2classes,
       text,
     }:
     mkDerivation {
       pname = "forms-data-format";
-      version = "0.2.1";
-      sha256 = "0l0v6m1ixpq7bmafnnn66gjjfwv28lvr20jsh35yfjifznw2vgbn";
+      version = "0.3";
+      sha256 = "1cyandfai5c1f6in6i66xyva0qjs54xvk673wcv9wv4241dm13jz";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [
         base
         bytestring
@@ -244567,8 +246004,15 @@ self: {
         rank2classes
         text
       ];
+      executableHaskellDepends = [
+        base
+        bytestring
+        directory
+        optparse-applicative
+        text
+      ];
       description = "Parse and serialize FDF, the Forms Data Format";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -245400,7 +246844,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fourmolu";
     }
@@ -245508,7 +246952,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fourmolu";
     }
@@ -245620,7 +247064,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "fourmolu";
     }
   ) { };
@@ -245661,7 +247105,7 @@ self: {
         tasty-bench
       ];
       description = "IEEE 754-2019 compliant operations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -245857,7 +247301,7 @@ self: {
       libraryPkgconfigDepends = [ fplll ];
       testHaskellDepends = [ base ];
       description = "Haskell bindings to <https://fplll.github.io/fplll/ fplll>";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) fplll; };
@@ -246130,7 +247574,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Reference implementation of FractalText";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -246163,7 +247607,7 @@ self: {
       sha256 = "0y2rkbmpzhn0zz273i1lfxv7f270yv89nmacs9m17rhjcj9n7243";
       libraryHaskellDepends = [ base ];
       description = "Numbers in the range [0.005, 1] as a sum of 2, 3, 4 or 5 unit fractions of special types.";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -246452,7 +247896,7 @@ self: {
         process
       ];
       description = "CLI frecency history";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "frecently";
     }
   ) { };
@@ -246779,8 +248223,8 @@ self: {
     }:
     mkDerivation {
       pname = "freckle-http";
-      version = "0.3.0.1";
-      sha256 = "1b5dxyaq7d4fmcgmm1ap90419yphw9y585ipf1bs48vjfjpxszp3";
+      version = "0.3.1.0";
+      sha256 = "0y6qbl0hb6nwcb843l0q0j7nvzdgpc5l5fq9xgdjgyxnnzbjkm6k";
       libraryHaskellDepends = [
         aeson
         annotated-exception
@@ -246994,8 +248438,8 @@ self: {
     }:
     mkDerivation {
       pname = "freckle-otel";
-      version = "0.0.0.2";
-      sha256 = "0x70wcqbpzy8x5xd88kvf2k5pg9655w1xqp94ryq2yprkq6vhils";
+      version = "0.0.0.3";
+      sha256 = "1rjwksaafmpzx8n8hf5bnp72bawqrzgcp84z89zzmnsw6vv6f514";
       libraryHaskellDepends = [
         aeson
         base
@@ -247031,7 +248475,7 @@ self: {
         text
         unliftio
       ];
-      description = "...";
+      description = "Some extensions to the hs-opentelemetry-sdk library";
       license = lib.licenses.mit;
       hydraPlatforms = lib.platforms.none;
     }
@@ -247097,8 +248541,8 @@ self: {
     }:
     mkDerivation {
       pname = "freckle-stats";
-      version = "0.0.0.0";
-      sha256 = "1sz6wx8d6jsxvv90rs4l21zrcvphwahbvw0q6jrc4mq3q74nx8nm";
+      version = "0.0.0.1";
+      sha256 = "1n3y0lqd6wgw0lmfa6q34ix83yaz5b3hqay7fga1x0shc4cank83";
       libraryHaskellDepends = [
         aeson
         base
@@ -247289,7 +248733,7 @@ self: {
         transformers
       ];
       description = "Free algebras";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -247317,7 +248761,7 @@ self: {
         transformers
       ];
       description = "Free Applicative Transformer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -247367,7 +248811,7 @@ self: {
         criterion
       ];
       description = "efficient data types for free categories and arrows";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -247549,7 +248993,7 @@ self: {
         void
       ];
       description = "Create games for free";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -247613,7 +249057,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Lawful list and set monad transformers based on free monads";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -248131,7 +249575,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "class NonDetable.N and Failable.F";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -248230,7 +249674,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Freer par monad";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -248280,7 +249724,7 @@ self: {
         mtl
       ];
       description = "A friendly effect system for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "freer-simple-examples";
       broken = true;
@@ -248629,7 +250073,7 @@ self: {
         happy
       ];
       description = "A functional DSL for vertex-centric large-scale graph processing";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fregel";
       broken = true;
@@ -248695,7 +250139,7 @@ self: {
         gauge
       ];
       description = "Are you ready to get freaky?";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -248746,7 +250190,7 @@ self: {
         text-replace
       ];
       description = "Identifies and replaces frequent subsequences in long strings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "frequent-substring-exe";
     }
@@ -248843,7 +250287,7 @@ self: {
         template-haskell
       ];
       description = "high-powered optics in a small package";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -248866,7 +250310,7 @@ self: {
         fused-effects
       ];
       description = "fresnel/fused-effects integration";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -249028,7 +250472,7 @@ self: {
         optparse-applicative
       ];
       description = "Attempt to pretty-print any input";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "friendly";
     }
   ) { };
@@ -249086,7 +250530,7 @@ self: {
         semigroups
       ];
       description = "Linear time composable parser for PEG grammars";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -249127,7 +250571,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Provides a generic way to construct values from environment variables";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -249567,6 +251011,8 @@ self: {
       pname = "fs-api";
       version = "0.4.0.0";
       sha256 = "1aw9x4cgflm2fy5ps3cgpwfzgfp7r7r9fps2vkzbqz03gjpql0dm";
+      revision = "1";
+      editedCabalFile = "1k4s6y38q6in1sc5yddwm94shprpybihvibv0pm0rvdddnjwx735";
       libraryHaskellDepends = [
         base
         bytestring
@@ -249593,7 +251039,7 @@ self: {
         text
       ];
       description = "Abstract interface for the file system";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -249642,6 +251088,8 @@ self: {
       pname = "fs-sim";
       version = "0.4.1.0";
       sha256 = "13igdxy6dnqdbvav7a66narfrckz0gaqwyih9wxra3pyf4jzzs9g";
+      revision = "1";
+      editedCabalFile = "1kj1bvkk7s6ly5qc1ixi3c0mh0v48ni2g4jk2ygflm0brl4259h9";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -249676,7 +251124,7 @@ self: {
         text
       ];
       description = "Simulated file systems";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -250049,7 +251497,7 @@ self: {
         unix
       ];
       description = "Watch a file/directory and run a command when it's modified";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fswatcher";
       broken = true;
@@ -250091,7 +251539,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "FTC Queue";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -250469,7 +251917,7 @@ self: {
         vector
       ];
       description = "In-memory full text search engine";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -251270,7 +252718,7 @@ self: {
         transformers
       ];
       description = "FFunctor: functors on (the usual) Functors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -251369,7 +252817,7 @@ self: {
         transformers
       ];
       description = "Convert values from one type into another";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -251638,7 +253086,7 @@ self: {
         time
       ];
       description = "GLL parser with simple combinator interface";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -251798,7 +253246,7 @@ self: {
       sha256 = "0jf8yhk45n06avl9avgmawvazsz585i7jppvcds6pjd8pqdb2qk4";
       libraryHaskellDepends = [ base ];
       description = "Type-level function utilities";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -251841,7 +253289,7 @@ self: {
         transformers
       ];
       description = "A fast, flexible, fused effect system";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -251874,7 +253322,7 @@ self: {
       ];
       testToolDepends = [ markdown-unlit ];
       description = "Handle exceptions thrown in IO with fused-effects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -251904,7 +253352,7 @@ self: {
         microlens
       ];
       description = "Monadic lens combinators for fused-effects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -251987,7 +253435,7 @@ self: {
         gauge
       ];
       description = "High-quality random number generation as an effect";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -252010,7 +253458,7 @@ self: {
         optics-core
       ];
       description = "Bridge between the optics and fused-effects ecosystems";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -252033,7 +253481,7 @@ self: {
         transformers
       ];
       description = "Random number generation for fused-effects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -252063,7 +253511,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A readline-like effect and carrier for fused-effects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -252149,7 +253597,7 @@ self: {
         template-haskell
       ];
       description = "Template Haskell helpers for fused-effects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -252220,7 +253668,7 @@ self: {
         transformers
       ];
       description = "GHC plugin to make stream fusion more predictable";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -252232,7 +253680,7 @@ self: {
       sha256 = "14lzymjna6faiwj7bdm1jrz42jfj3w1wi2hv66mldjhadf45613d";
       libraryHaskellDepends = [ base ];
       description = "Types for the fusion-plugin package";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -252297,6 +253745,7 @@ self: {
       temporary,
       terminal-size,
       text,
+      text-rope,
       time,
       transformers,
       vector,
@@ -252305,8 +253754,8 @@ self: {
     }:
     mkDerivation {
       pname = "futhark";
-      version = "0.25.34";
-      sha256 = "1xf3nwf7wkdsv36nz77apingynx5d3lcdk8dk0s6j5l15h6n0i26";
+      version = "0.25.36";
+      sha256 = "1wyc7pakrd2rrql3bqww9xid5w26y9ll2c35kqnpx8fwv73918j1";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -252366,6 +253815,7 @@ self: {
         temporary
         terminal-size
         text
+        text-rope
         time
         transformers
         vector
@@ -252387,7 +253837,7 @@ self: {
       ];
       doHaddock = false;
       description = "An optimising compiler for a functional, array-oriented language";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       mainProgram = "futhark";
       maintainers = [ lib.maintainers.athas ];
     }
@@ -252415,8 +253865,8 @@ self: {
     }:
     mkDerivation {
       pname = "futhark-data";
-      version = "1.1.2.0";
-      sha256 = "17v16w3085s835iqwn4zhyqybaw13w6h7vmfb1q2339d7xy28z34";
+      version = "1.1.4.0";
+      sha256 = "1yph307aaxzdavy4wyvkr722dl0kpil6ndsvixphwdkfk9q36xqk";
       libraryHaskellDepends = [
         base
         binary
@@ -252444,7 +253894,7 @@ self: {
         vector
       ];
       description = "An implementation of the Futhark data format";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -252464,8 +253914,8 @@ self: {
     }:
     mkDerivation {
       pname = "futhark-manifest";
-      version = "1.5.0.0";
-      sha256 = "1cgwldc7by8305vn0kj7mhawqsfywzkp6fwra5i2ygr93xv7dl64";
+      version = "1.7.0.0";
+      sha256 = "1l24qmzc288g8ivz25i6kcngawxxvi1nb3667ydsnb9bl45k75pc";
       libraryHaskellDepends = [
         aeson
         base
@@ -252483,7 +253933,7 @@ self: {
         text
       ];
       description = "Definition and serialisation instances for Futhark manifests";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -252502,8 +253952,8 @@ self: {
     }:
     mkDerivation {
       pname = "futhark-server";
-      version = "1.2.3.0";
-      sha256 = "12gih73pvy54k4fs7s690b40cfhrvgzahhw3n571pi73ia86mljb";
+      version = "1.3.0.0";
+      sha256 = "1v8c5zfsc6x48z31lrfcyibbj4742cql3lglg6l59ly39cxi4and";
       libraryHaskellDepends = [
         base
         binary
@@ -252516,7 +253966,43 @@ self: {
         text
       ];
       description = "Client implementation of the Futhark server protocol";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
+    }
+  ) { };
+
+  futhark-server_1_3_2_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      binary,
+      bytestring,
+      directory,
+      futhark-data,
+      mtl,
+      process,
+      temporary,
+      text,
+    }:
+    mkDerivation {
+      pname = "futhark-server";
+      version = "1.3.2.0";
+      sha256 = "1rpvd0z09bgnzj6npgc6ngz8par7zcda9y408yjfv5vawd9srv07";
+      revision = "1";
+      editedCabalFile = "1jfsv31s90prnh5gipyfa533sdivh8r2mxq0pbvq1vjbiwjqd81q";
+      libraryHaskellDepends = [
+        base
+        binary
+        bytestring
+        directory
+        futhark-data
+        mtl
+        process
+        temporary
+        text
+      ];
+      description = "Client implementation of the Futhark server protocol";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -252785,7 +254271,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Tools for processing unstructured text data";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -252936,7 +254422,7 @@ self: {
         tasty-hunit
       ];
       description = "Library for constructing and manipulating fuzzy sets and fuzzy relations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -252978,7 +254464,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Fuzzy text matching";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bench";
       broken = true;
@@ -253063,7 +254549,7 @@ self: {
         vector
       ];
       description = "Fuzzy set data structure for approximate string matching";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -253228,14 +254714,37 @@ self: {
   ) { };
 
   fx = callPackage (
-    { mkDerivation, base }:
+    {
+      mkDerivation,
+      base,
+      hspec,
+      hspec-discover,
+      monad-parallel,
+      mtl,
+      rerebase,
+      stm,
+      text,
+      transformers,
+    }:
     mkDerivation {
       pname = "fx";
-      version = "0.10.1";
-      sha256 = "1awscv2y8ywcyyn08hdmlh3qdjs33akr7grfdfls59rmhidg4fhd";
-      libraryHaskellDepends = [ base ];
-      description = "Horizontally composable effects";
-      license = lib.licenses.mit;
+      version = "0.11";
+      sha256 = "1ibz7hxq6svlfdvmlr0hz8y43rpjs6hf1j08wrbx78vb3irb18cl";
+      libraryHaskellDepends = [
+        base
+        monad-parallel
+        mtl
+        stm
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        hspec
+        rerebase
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Modular effectful computations with explicit environments and errors";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -253721,7 +255230,7 @@ self: {
         hspec
       ];
       description = "Composable, streaming, and efficient left folds";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -254017,7 +255526,7 @@ self: {
       sha256 = "0r8wybcqn7g24q8abrw757h76r75l4jh4hjx91yh44h4c1r6k4yf";
       doHaddock = false;
       description = "TBA";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -254309,6 +255818,196 @@ self: {
     }
   ) { };
 
+  gb-nix-cache = callPackage (
+    {
+      mkDerivation,
+      base,
+      base64-bytestring,
+      bytestring,
+      containers,
+      crypton,
+      directory,
+      filepath,
+      lzma,
+      memory,
+      text,
+      unix,
+      vector,
+    }:
+    mkDerivation {
+      pname = "gb-nix-cache";
+      version = "0.1.0.0";
+      sha256 = "0j7fcrdw3kk78j9wd3sz3ra86sl7hmlfwm33z83h0y7gg0y8cn2y";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        base64-bytestring
+        bytestring
+        containers
+        crypton
+        directory
+        filepath
+        lzma
+        memory
+        text
+        unix
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        base64-bytestring
+        bytestring
+        crypton
+        directory
+        memory
+        text
+      ];
+      description = "Pure Nix binary cache protocol library";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  gb-sprite = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      directory,
+      zlib,
+    }:
+    mkDerivation {
+      pname = "gb-sprite";
+      version = "0.4.0.0";
+      sha256 = "1812fs30l05amj47kfcplgdjy34q5wabb59gyy1rzdldqki6yql0";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        zlib
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        directory
+      ];
+      description = "Procedural 2D sprite and VFX generation";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  gb-synth = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      directory,
+    }:
+    mkDerivation {
+      pname = "gb-synth";
+      version = "0.2.1.0";
+      sha256 = "14j1dlkfjdhsxr0znnvl8spzjnn8agrqmhzbb8ai8r977bykycq3";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        containers
+        directory
+      ];
+      description = "Procedural music and sound effect synthesis";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  gb-vector = callPackage (
+    {
+      mkDerivation,
+      base,
+      directory,
+      text,
+    }:
+    mkDerivation {
+      pname = "gb-vector";
+      version = "0.1.0.5";
+      sha256 = "0vdcqmb901p3mj0xfw10z5k72ylc25xj2yprjm7d091ljway00s5";
+      libraryHaskellDepends = [
+        base
+        text
+      ];
+      testHaskellDepends = [
+        base
+        directory
+        text
+      ];
+      description = "Pure Haskell SVG generation";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  gbnet-hs = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      crc32c,
+      criterion,
+      crypton,
+      deepseq,
+      memory,
+      mtl,
+      network,
+      optics,
+      optics-th,
+      QuickCheck,
+      stm,
+      template-haskell,
+      transformers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "gbnet-hs";
+      version = "0.2.6.0";
+      sha256 = "00vj0pxvlcgrf4imkf982y1rj56bwml6pnvxhl2cfa4azqmdb5cd";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        crc32c
+        crypton
+        deepseq
+        memory
+        mtl
+        network
+        optics
+        optics-th
+        stm
+        template-haskell
+        transformers
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        containers
+        network
+        QuickCheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+      ];
+      description = "Transport-level networking library with zero-copy Storable serialization";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   gbs-downloader = callPackage (
     {
       mkDerivation,
@@ -254417,7 +256116,7 @@ self: {
         yaml
       ];
       description = "A library for downloading data from a Great Black Swamp server";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -255469,7 +257168,7 @@ self: {
         x509
       ];
       description = "a simple Gemini capsule (server)";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -255568,7 +257267,7 @@ self: {
         transformers
       ];
       description = "A simple Happstack-style Gemini router";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -255603,7 +257302,7 @@ self: {
         utf8-string
       ];
       description = "A lightweight server for the Gemini protocol";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -255650,7 +257349,7 @@ self: {
         transformers
       ];
       description = "A barebones textboard for the Gemini protocol";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "gemini-textboard";
     }
   ) { };
@@ -255676,7 +257375,7 @@ self: {
         text
       ];
       description = "a tiny gemtext parser";
-      license = lib.licensesSpdx."LGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-or-later";
     }
   ) { };
 
@@ -255766,7 +257465,7 @@ self: {
         unordered-containers
       ];
       description = "yet another static gemlog generator + converter";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
     }
   ) { };
 
@@ -255919,7 +257618,7 @@ self: {
         text
       ];
       description = "A library for interacting with various generative AI LLMs";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -256082,7 +257781,7 @@ self: {
         transformers
       ];
       description = "Exception-safe resource management in more monads";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -256357,7 +258056,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Generic case analysis";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -256595,8 +258294,8 @@ self: {
     }:
     mkDerivation {
       pname = "generic-diff";
-      version = "0.1.0.0";
-      sha256 = "0wqa9jd2za2jzsm390fzsxfmz8rv3x8d9x3k95d7w7wc7zr57xdf";
+      version = "0.1.0.1";
+      sha256 = "1k777in0ns4h4hnbnikzwp7hdw7k9r18cbh8rfgg9li6sq2dnkfp";
       libraryHaskellDepends = [
         base
         generics-sop
@@ -256614,7 +258313,48 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Generic structural diffs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  generic-diff-instances = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      generic-diff,
+      generics-sop,
+      hspec,
+      hspec-discover,
+      QuickCheck,
+      sop-core,
+      text,
+    }:
+    mkDerivation {
+      pname = "generic-diff-instances";
+      version = "0.1.0.0";
+      sha256 = "0mrydcw7797f6pwb4jpz4gz4q186gbsd3cpd3qskwkhm5sjma6dl";
+      libraryHaskellDepends = [
+        base
+        containers
+        generic-diff
+        generics-sop
+        sop-core
+        text
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        generic-diff
+        generics-sop
+        hspec
+        QuickCheck
+        sop-core
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Diff instances for common types";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -256652,11 +258392,11 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "generic-enumeration";
-      version = "0.1.0.4";
-      sha256 = "0f83fnvmmi4yvdn9i2r1vkpk6cy4lqpxgjv26f380akyf30av90p";
+      version = "0.1.0.5";
+      sha256 = "0x624z5zq9d0w2yrcb9b5qpnjnvm4qkni6csdm1nh7f14yx1v3wq";
       libraryHaskellDepends = [ base ];
       description = "Generically derived enumerations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -256729,7 +258469,7 @@ self: {
         inspection-testing
       ];
       description = "Generically extract and replace collections of record fields";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -256884,7 +258624,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Monomorphic field lens like with generic-lens";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -256897,7 +258637,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Derive Bounded and Enum for sum types and Enum for product types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -256939,7 +258679,7 @@ self: {
         generics-sop
       ];
       description = "First class pattern matching";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -257117,7 +258857,7 @@ self: {
         optics-core
       ];
       description = "Monomorphic field opics like with generic-lens";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -259964,7 +261704,7 @@ self: {
         QuickCheck
       ];
       description = "Terrestrial coordinate systems and geodetic calculations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -259998,7 +261738,7 @@ self: {
         QuickCheck
       ];
       description = "Terrestrial coordinate systems and geodetic calculations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -260337,7 +262077,7 @@ self: {
       ];
       testSystemDepends = [ geos ];
       description = "Bindings for GEOS";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -260384,7 +262124,7 @@ self: {
         time
       ];
       description = "A gerrit client library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -260531,7 +262271,7 @@ self: {
         th-lift-instances
       ];
       description = "gettext-th can internationalise a haskell program without runtime dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -260555,7 +262295,7 @@ self: {
         HUnit
       ];
       description = "The family of Extreme Value Distributions";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -260868,7 +262608,7 @@ self: {
             happy
           ];
           description = "The GHC API";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
         }
       )
@@ -260929,7 +262669,7 @@ self: {
         ghc-bignum
       ];
       description = "Backwards-compatible orphan instances for ghc-bignum";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -260971,7 +262711,7 @@ self: {
         unix
       ];
       description = "Shared functionality between GHC and its boot libraries";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -261010,7 +262750,7 @@ self: {
       testHaskellDepends = [ base ];
       doHaddock = false;
       description = "\"GHC.ByteOrder\" API Compatibility Layer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -261128,12 +262868,34 @@ self: {
       sha256 = "0y8n31ri08rl1nzm4phjz5azia7zmwswv2fhzkx828xll6cpqbc3";
       libraryHaskellDepends = [ base ];
       description = "GHC compatibility for MicroHs";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
   ) { };
 
+  ghc-compat-plugin = callPackage (
+    {
+      mkDerivation,
+      base,
+      ghc,
+      ghc-boot-th,
+    }:
+    mkDerivation {
+      pname = "ghc-compat-plugin";
+      version = "0.1.0.1";
+      sha256 = "0q4xsxzf7cw5nm7aw7np6zdy7sca6dq4vbg4jm1c2gbc72dh1y9h";
+      libraryHaskellDepends = [
+        base
+        ghc
+        ghc-boot-th
+      ];
+      testHaskellDepends = [ base ];
+      description = "Eases support for multiple GHC versions";
+      license = lib.licenses.agpl3Only;
+    }
+  ) { };
+
   ghc-core = callPackage (
     {
       mkDerivation,
@@ -261321,7 +263083,7 @@ self: {
         vty-crossplatform
       ];
       description = "A simple TUI using ghc-debug";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ghc-debug-brick";
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -261386,7 +263148,7 @@ self: {
         vector
       ];
       description = "Useful functions for writing heap analysis tools which use ghc-debug";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -261429,7 +263191,7 @@ self: {
         unordered-containers
       ];
       description = "Connect to a socket created by ghc-debug-stub and analyse the heap of the debuggee program";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -261450,7 +263212,7 @@ self: {
         filepath
       ];
       description = "Definitions needed by ghc-debug-stub and ghc-debug-common";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -261475,7 +263237,7 @@ self: {
         ghc-prim
       ];
       description = "Functions for instrumenting your application so the heap can be analysed with ghc-debug-common";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -261544,7 +263306,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A step-through machine-interface debugger for GHC Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-debug-adapter";
       broken = true;
@@ -261570,7 +263332,7 @@ self: {
         template-haskell
       ];
       description = "Automatically generate GHC API counterparts to Haskell declarations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -261601,7 +263363,7 @@ self: {
         text
       ];
       description = "An AST and compiler plugin for dumping GHC's Core representation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -261704,7 +263466,7 @@ self: {
         regex-tdfa
       ];
       description = "Handy tools for working with ghc-dump dumps";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-dump";
     }
@@ -261751,7 +263513,7 @@ self: {
         ghc-events
       ];
       description = "Let an application read its own eventlog";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -261790,7 +263552,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Library and tool for parsing .eventlog files from GHC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ghc-events";
     }
   ) { };
@@ -261826,7 +263588,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Library and tool for parsing .eventlog files from GHC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-events";
     }
@@ -261888,7 +263650,7 @@ self: {
         base
       ];
       description = "Analyze and visualize event logs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-events-analyze";
       broken = true;
@@ -262196,7 +263958,7 @@ self: {
         syb
       ];
       description = "ExactPrint for GHC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -262247,7 +264009,7 @@ self: {
         syb
       ];
       description = "ExactPrint for GHC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -262260,7 +264022,7 @@ self: {
       isLibrary = true;
       isExecutable = true;
       description = "ExactPrint for GHC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -262274,7 +264036,7 @@ self: {
       isLibrary = true;
       isExecutable = true;
       description = "ExactPrint for GHC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -262294,7 +264056,7 @@ self: {
         ghc-internal
       ];
       description = "Experimental features of GHC's standard library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -262393,7 +264155,7 @@ self: {
         rts
       ];
       description = "Functions for walking GHC's heap";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -262461,8 +264223,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-hie";
-      version = "0.0.3";
-      sha256 = "06cxddv5mqfwahw0nxn1q01vgzgbrgw1g5g9qibxz8d1cpm14w4y";
+      version = "0.0.4";
+      sha256 = "1smxidy27ccy66xjs7b11v3pcpbbjh2ifs42qzd1p07ll9j03j1z";
       libraryHaskellDepends = [
         array
         base
@@ -262552,7 +264314,7 @@ self: {
         template-haskell
       ];
       description = "Translate Haskell source to Template Haskell expression";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -262738,7 +264500,7 @@ self: {
       version = "9.1401.0";
       sha256 = "0cm61xppbqdc6g3z746dbsvbk96g687lrk3ncz0ysmm03h6rbr42";
       description = "Basic libraries";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -262830,7 +264592,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -262895,7 +264657,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -262960,7 +264722,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -263027,7 +264789,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -263093,7 +264855,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -263150,7 +264912,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -263207,7 +264969,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -263268,7 +265030,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -263328,7 +265090,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -263465,7 +265227,7 @@ self: {
         uniplate
       ];
       description = "Programming with GHC parse trees";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ghc-lib-parser-ex-build-tool";
     }
   ) { };
@@ -263520,7 +265282,7 @@ self: {
         uniplate
       ];
       description = "Programming with GHC parse trees";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-lib-parser-ex-build-tool";
     }
@@ -264026,7 +265788,7 @@ self: {
         hspec
       ];
       description = "GHC Plugin for non-empty lists";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -264055,7 +265817,7 @@ self: {
       testHaskellDepends = [ base ];
       doHaddock = false;
       description = "Type checker plugins without the type checking";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -264085,7 +265847,7 @@ self: {
       libraryHaskellDepends = [ rts ];
       librarySystemDepends = [ c ];
       description = "GHC primitives";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { c = null; };
@@ -264133,7 +265895,7 @@ self: {
         text
       ];
       description = "Library for parsing GHC time and allocation profiling reports";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -264348,10 +266110,10 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-source-gen";
-      version = "0.4.6.0";
-      sha256 = "00rgfsa7jmg29y9nknaqbshy96km2gxa8g91pgspw29rhw2ir3ll";
+      version = "0.4.7.0";
+      sha256 = "1lyb6nl5kkgm8f17qz778yghif75id44hm1byjkbndafslw1j32f";
       revision = "1";
-      editedCabalFile = "1kap75bw4i0wirx3ban6hgqh5cfq900l8jg9qm16y9fd0rwcff9j";
+      editedCabalFile = "1688igs14jd03751ir3xrfapq08xb9wfisxavzg6pqbng99h6vdc";
       libraryHaskellDepends = [
         base
         ghc
@@ -264405,7 +266167,7 @@ self: {
       sha256 = "1b5xm1zlvw3kv45y2dksisc4lhfbvk7df7sb7n1ypxmdvzwi010a";
       libraryHaskellDepends = [ base ];
       description = "RTS Callstack annotation library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -264436,7 +266198,7 @@ self: {
         text
       ];
       description = "RTS Callstack profiler for GHC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -264454,8 +266216,8 @@ self: {
       pname = "ghc-stack-profiler-core";
       version = "0.1.0.0";
       sha256 = "17chnk3kw9dbf63j0hhx2js3i871kkqm8mpvkgcg7in5rm27v0ra";
-      revision = "1";
-      editedCabalFile = "0ypr0v6r3h5y1iwgi9yp3w6hm4rsf765qmrhprbhlhwp4yd2b2yc";
+      revision = "3";
+      editedCabalFile = "1rb9sq04d8bf6ygdp41fg99zrmwvmbp4rx25b5bibqr975v7hg2h";
       libraryHaskellDepends = [
         base
         binary
@@ -264465,7 +266227,7 @@ self: {
         transformers
       ];
       description = "Thread sample types and serialisation logic for `ghc-stack-profiler`";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -264505,7 +266267,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Convert eventlog messages from `ghc-stack-profiler` into a speedscope json";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-stack-profiler-speedscope";
       broken = true;
@@ -264613,7 +266375,7 @@ self: {
         text
       ];
       description = "Symbol on term level";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -264645,7 +266407,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Syntax highlighter for Haskell using the lexer of GHC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -264675,7 +266437,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Syntax highlighter for Haskell using the lexer of GHC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -264733,7 +266495,7 @@ self: {
         yaml
       ];
       description = "Utility for generating ctags and etags with GHC API";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-tags";
     }
@@ -264792,7 +266554,7 @@ self: {
         yaml
       ];
       description = "Utility for generating ctags and etags with GHC API";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-tags";
     }
@@ -264849,7 +266611,7 @@ self: {
         yaml
       ];
       description = "Utility for generating ctags and etags with GHC API";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       mainProgram = "ghc-tags";
     }
   ) { };
@@ -264868,10 +266630,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-tags-core";
-      version = "0.6.1.1";
-      sha256 = "1p1ykmbq16lg30s2cnwds16aiq4wxiv9s59sa933fk9mv2841gb1";
-      revision = "1";
-      editedCabalFile = "1j3i4cdwr1wpzxgv8vhzzly6mfgkfggxhb8shrfkrrczr6vr2z96";
+      version = "0.6.2.0";
+      sha256 = "0dq2bxff907a7sp9q1j9783d1ffyiclxw2b5y4cpyswlm5dm2v2a";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -264883,7 +266643,7 @@ self: {
         text
       ];
       description = "CTags and ETags from Haskell syntax tree";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -264918,7 +266678,7 @@ self: {
         text
       ];
       description = "Streaming interface for ghc-tags-core";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -264942,10 +266702,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-tags-plugin";
-      version = "0.6.1.1";
-      sha256 = "1w1m942hzw63igdjvhb15n5w0yzkm2hp5lyv1dl815dvzj0bn8kq";
-      revision = "1";
-      editedCabalFile = "0hs57qfx8sv3mrpc4scqnynhzxpkklbzyk5af3nr4ambiayk4bjw";
+      version = "0.6.2.0";
+      sha256 = "15mxy2avxwgy4iphk7zn1p55xwmjz374c21020g8j3x17cqa3j35";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -264965,7 +266723,7 @@ self: {
         text
       ];
       description = "A compiler plugin which generates tags file from GHC parsed syntax tree";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -264992,7 +266750,7 @@ self: {
         transformers
       ];
       description = "An API for type-checker plugins";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -265116,7 +266874,7 @@ self: {
         tasty-bench
       ];
       description = "Faster traceEvent and traceMarker, and binary object logging for eventlog";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -265204,7 +266962,7 @@ self: {
         tasty-hunit
       ];
       description = "Additional type-level operations on GHC.TypeLits.Nat";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -265285,7 +267043,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Derive KnownNat constraints from other KnownNat constraints";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -265403,7 +267161,7 @@ self: {
         template-haskell
       ];
       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -265455,7 +267213,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -265539,7 +267297,7 @@ self: {
         xdot
       ];
       description = "Live visualization of data structures in GHCi";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.dalpd ];
     }
   ) { };
@@ -265563,7 +267321,7 @@ self: {
         time
       ];
       description = "Dump the ghc flags during compilation";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -265948,7 +267706,7 @@ self: {
         tasty-hunit
       ];
       description = "GHC plugin that writes errors to a file for use with quickfix";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -265983,7 +267741,7 @@ self: {
         websockets
       ];
       description = "A websocket server that survives GHCi reloads";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -266044,7 +267802,7 @@ self: {
         text
       ];
       description = "A GHCi session in LaTeX";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ghci4luatex";
     }
   ) { };
@@ -266278,7 +268036,7 @@ self: {
         optparse-applicative
       ];
       description = "The core of an IDE";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "ghcide";
     }
   ) { };
@@ -266375,7 +268133,7 @@ self: {
       ];
       testToolDepends = [ ghcide ];
       description = "An LSP client for running performance experiments on HLS";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghcide-bench";
       broken = true;
@@ -266423,7 +268181,7 @@ self: {
         text
       ];
       description = "Test utils for ghcide";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -266497,7 +268255,7 @@ self: {
       ];
       doHaddock = false;
       description = "A Terminal User Interface (TUI) for GHCi";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ghcitui";
     }
   ) { };
@@ -266534,7 +268292,7 @@ self: {
       version = "0.8.0.4";
       sha256 = "081w3234jramsmafnl86v37lwbckr2vc93gr9pdwc31yzni9kbml";
       description = "base library for GHCJS";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       platforms = [ "javascript-ghcjs" ];
       maintainers = [ lib.maintainers.alexfmpe ];
     }
@@ -266575,7 +268333,7 @@ self: {
         vector
       ];
       description = "Allow GHCJS projects to compile under GHC and develop using intero";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -266617,7 +268375,7 @@ self: {
         transformers
       ];
       description = "DOM library that supports both GHCJS and GHC";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -266666,7 +268424,7 @@ self: {
       version = "0.9.9.3";
       sha256 = "1k62w5czg544ias8q2kvhp8qnlafzisgx1p0gq8d2kh662w99kcg";
       description = "DOM library using JSFFI and GHCJS";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       platforms = [ "javascript-ghcjs" ];
       maintainers = [ lib.maintainers.alexfmpe ];
     }
@@ -266681,7 +268439,7 @@ self: {
       libraryHaskellDepends = [ jsaddle-dom ];
       doHaddock = false;
       description = "DOM library that supports both GHCJS and GHC using jsaddle";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -266693,7 +268451,7 @@ self: {
       version = "0.9.9.0";
       sha256 = "0fhcs89x180kw75qgbfh28wjyn55frwdfj4rqlqa1smx0fwhzyy1";
       description = "DOM library using JSFFI and GHCJS";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -267252,7 +269010,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "ghc toolchain installer";
-      license = lib.licensesSpdx."LGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghcup";
       broken = true;
@@ -268591,7 +270349,7 @@ self: {
         haskell-gi-base
       ];
       description = "Haskell implementation of GListModel interface from gi-gio";
-      license = lib.licensesSpdx."LGPL-2.1-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -271474,7 +273232,7 @@ self: {
       ];
       doHaddock = false;
       description = "Generate easy-to-remember, hard-to-guess passwords";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -271543,7 +273301,7 @@ self: {
         gauge
       ];
       description = "Refreshed parsec-style library for compatibility with Scala parsley";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -271658,7 +273416,7 @@ self: {
         utf8-string
       ];
       description = "An implementation of the Jinja2 template language in Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "ginger";
     }
   ) { };
@@ -271748,7 +273506,7 @@ self: {
         vector
       ];
       description = "Jinja templates for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ginger2";
       broken = true;
@@ -271903,7 +273661,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ system-glib ];
       description = "Binding to GIO";
-      license = lib.licensesSpdx."LGPL-2.1-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-only";
     }
   ) { system-glib = pkgs.glib; };
 
@@ -272189,6 +273947,7 @@ self: {
       containers,
       crypto-api,
       crypton,
+      crypton-connection,
       data-default,
       DAV,
       dbus,
@@ -272254,6 +274013,7 @@ self: {
       template-haskell,
       text,
       time,
+      tls,
       torrent,
       transformers,
       unbounded-delays,
@@ -272275,8 +274035,8 @@ self: {
     }:
     mkDerivation {
       pname = "git-annex";
-      version = "10.20260115";
-      sha256 = "0pi9zrw1dincw71ind4s7b3j7g1ji76bgh6rmvq5vhq30vbcy1v3";
+      version = "10.20260213";
+      sha256 = "0makjv87hvxvljv2jw22g62z0xrrcdxd6gn888vj9h8yy9j32q61";
       configureFlags = [
         "-fassistant"
         "-f-benchmark"
@@ -272323,6 +274083,7 @@ self: {
         containers
         crypto-api
         crypton
+        crypton-connection
         data-default
         DAV
         dbus
@@ -272387,6 +274148,7 @@ self: {
         template-haskell
         text
         time
+        tls
         torrent
         transformers
         unbounded-delays
@@ -272418,6 +274180,8 @@ self: {
       mkDerivation,
       base,
       brick,
+      containers,
+      directory,
       extra,
       hspec,
       microlens,
@@ -272431,13 +274195,15 @@ self: {
     }:
     mkDerivation {
       pname = "git-brunch";
-      version = "1.7.2.0";
-      sha256 = "0v11y1ashifgcgyfrm58940sckzcfamgnszgv1c6lcjn9yvglvf0";
+      version = "1.8.0";
+      sha256 = "1p4m6xmbbxjnnj7w1nkm3rllfxdbyfl6lhf2vbcr4a9xlshr22fv";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
         base
         brick
+        containers
+        directory
         extra
         hspec
         microlens
@@ -272452,6 +274218,8 @@ self: {
       testHaskellDepends = [
         base
         brick
+        containers
+        directory
         extra
         hspec
         microlens
@@ -273084,7 +274852,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Recover Git repositories from disk recovery tool output (photorec)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "git-phoenix";
       broken = true;
@@ -273177,7 +274945,7 @@ self: {
         text
       ];
       description = "Git remote helper to store git objects on IPFS";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "git-remote-ipfs";
     }
@@ -273680,8 +275448,8 @@ self: {
     }:
     mkDerivation {
       pname = "github";
-      version = "0.30.0.1";
-      sha256 = "1lqdpr1dkap9prnsz14shk3kjan5k36s7c0n9kc50pkqjlq2hj21";
+      version = "0.30.0.2";
+      sha256 = "0i5mvr8x6c7kyn4v9s3h3g7b9b2r9d6yivr4zw6xcsnwb2s422zy";
       libraryHaskellDepends = [
         aeson
         base
@@ -273725,7 +275493,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Access to the GitHub API, v3";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -273755,8 +275523,8 @@ self: {
       pname = "github-actions";
       version = "0.1.1.0";
       sha256 = "1nxph5yypjqjcwwr7r397pdgnk7ad7y144dgmapzvrbz3xbzkz2d";
-      revision = "1";
-      editedCabalFile = "12dvv7jg1qhlf087fb9sg06nlr5k8d3ph4237q3v604lz4ib4vpq";
+      revision = "2";
+      editedCabalFile = "1gw1nw5wb07agl5y33ggx8mr37x9v8cx3z7qahs8fj5j7pq6v1cc";
       libraryHaskellDepends = [
         aeson
         base
@@ -273789,7 +275557,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Github Actions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -274054,8 +275822,8 @@ self: {
     }:
     mkDerivation {
       pname = "github-release";
-      version = "2.0.0.17";
-      sha256 = "0vz4avcflyavwwgals33g217b385g0nz1zbqg2bbz3c4sqgmrnqb";
+      version = "2.0.0.18";
+      sha256 = "0y2r6hqd9chdv1f406zcxb0szs88a2hvqa7z8v9k6q6ymww0dlsk";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -274073,7 +275841,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Upload files to GitHub releases";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "github-release";
     }
   ) { };
@@ -274535,7 +276303,7 @@ self: {
         tasty-smallcheck
       ];
       description = "Heads up, and you see your GIT context";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -274604,7 +276372,7 @@ self: {
         text
       ];
       description = "Library for reading .gitignore files and filtering paths";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -274744,9 +276512,7 @@ self: {
       ];
       description = "Wiki using happstack, git or darcs, and pandoc";
       license = "GPL";
-      maintainers = [
-        lib.maintainers.sternenseemann
-      ];
+      maintainers = [ lib.maintainers.sternenseemann ];
     }
   ) { };
 
@@ -274845,7 +276611,70 @@ self: {
         vector
       ];
       description = "A Haskell library for the GitLab web API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  gitlab-haskell_1_2_1_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      crypton-connection,
+      data-default,
+      http-client,
+      http-conduit,
+      http-types,
+      mtl,
+      prettyprinter,
+      tasty,
+      tasty-hunit,
+      temporary,
+      text,
+      time,
+      transformers,
+      tree-diff,
+      unix-compat,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "gitlab-haskell";
+      version = "1.2.1.0";
+      sha256 = "1x80hgf2q36xcdl0h7gw2qq56zlk0dps4i1msw5zk4ay2y4n8vsn";
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        crypton-connection
+        data-default
+        http-client
+        http-conduit
+        http-types
+        mtl
+        temporary
+        text
+        time
+        transformers
+        unix-compat
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        prettyprinter
+        tasty
+        tasty-hunit
+        text
+        tree-diff
+        unordered-containers
+        vector
+      ];
+      description = "A Haskell library for the GitLab web API";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -275384,7 +277213,7 @@ self: {
         text
       ];
       description = "Compile git revision info into Haskell projects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -275691,7 +277520,7 @@ self: {
       sha256 = "14wm8wp4jxi4fq75bvr6sl4xmsxjfw30yq7011v28xqpm9015ns0";
       libraryHaskellDepends = [ base ];
       description = "Haskell bindings for the gl3w library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -276228,6 +278057,7 @@ self: {
           json,
           libfolly,
           libunwind,
+          lmdb-clib,
           mangle,
           microlens,
           monad-control,
@@ -276260,7 +278090,7 @@ self: {
           STMonadTrans,
           tar,
           tasty,
-          tasty-hunit-adapter,
+          tasty-hunit,
           template-haskell,
           temporary,
           text,
@@ -276279,13 +278109,13 @@ self: {
           vector-algorithms,
           wai,
           warp,
-          xxHash,
+          xxhash,
           yaml,
         }:
         mkDerivation {
           pname = "glean";
-          version = "0.1.0.0";
-          sha256 = "0x8k1h1g75j90kdl9hdk0sb1yl237a89s21zah14igvrnamjhyn1";
+          version = "0.2.0.1";
+          sha256 = "1gkmbghqj62xnbk6w6m3s4zbpzan77zmc48r10fv1b0zjxszza4l";
           isLibrary = false;
           isExecutable = true;
           enableSeparateDataOutput = true;
@@ -276318,9 +278148,11 @@ self: {
             haskeline
             haxl
             hinotify
+            http-types
             HUnit
             IntervalMap
             json
+            lmdb-clib
             mangle
             microlens
             monad-control
@@ -276349,7 +278181,7 @@ self: {
             STMonadTrans
             tar
             tasty
-            tasty-hunit-adapter
+            tasty-hunit
             template-haskell
             temporary
             text
@@ -276366,6 +278198,7 @@ self: {
             uuid
             vector
             vector-algorithms
+            wai
             yaml
           ];
           librarySystemDepends = [ atomic ];
@@ -276377,7 +278210,7 @@ self: {
             libfolly
             libunwind
             rocksdb
-            xxHash
+            xxhash
           ];
           libraryToolDepends = [
             alex
@@ -276507,7 +278340,7 @@ self: {
           testPkgconfigDepends = [ gtest_main ];
           doHaddock = false;
           description = "A system for collecting, deriving and working with facts about source code";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
         }
       )
@@ -276521,9 +278354,64 @@ self: {
         libfolly = null;
         inherit (pkgs) libunwind;
         inherit (pkgs) rocksdb;
-        inherit (pkgs) xxHash;
+        inherit (pkgs) xxhash;
       };
 
+  glean-lsp = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      containers,
+      data-default,
+      directory,
+      exceptions,
+      fb-util,
+      filepath,
+      glean,
+      hashable,
+      lsp,
+      optparse-applicative,
+      text,
+      thrift-lib,
+      transformers,
+      unliftio,
+      unliftio-core,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "glean-lsp";
+      version = "0.1.0.0";
+      sha256 = "08cayybdj22nip48n9i3p5gjhpbpbx3m6hdwry6vx98xf5wygdp9";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        aeson
+        base
+        containers
+        data-default
+        directory
+        exceptions
+        fb-util
+        filepath
+        glean
+        hashable
+        lsp
+        optparse-applicative
+        text
+        thrift-lib
+        transformers
+        unliftio
+        unliftio-core
+        unordered-containers
+      ];
+      description = "Generic Glean-based LSP Server";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "glean-lsp";
+    }
+  ) { };
+
   glfw-group = callPackage (
     {
       mkDerivation,
@@ -276552,7 +278440,7 @@ self: {
         text
       ];
       description = "GLFW package with window groups destroyed together";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -276640,7 +278528,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ glib ];
       description = "Binding to the GLIB library for Gtk2Hs";
-      license = lib.licensesSpdx."LGPL-2.1-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-only";
     }
   ) { inherit (pkgs) glib; };
 
@@ -276869,7 +278757,7 @@ self: {
         HUnit
       ];
       description = "Console IRC client";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       mainProgram = "glirc";
     }
   ) { };
@@ -276928,8 +278816,8 @@ self: {
     }:
     mkDerivation {
       pname = "glob-imports";
-      version = "0.0.5.0";
-      sha256 = "14a47injxa8230ajbqcqg70963h74dgsjxzd3320br8dvrva6v14";
+      version = "0.0.6.0";
+      sha256 = "0laa8bparad3by5ycazswif4hb35f51k137dacm5p6i7wz1l1i86";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -277180,7 +279068,7 @@ self: {
         text
       ];
       description = "Globus Data Transfer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -277608,7 +279496,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Massiv-based alternative for gloss-raster";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -277642,7 +279530,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Painless relative-sized pictures in Gloss";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -277717,7 +279605,7 @@ self: {
         hspec
       ];
       description = "Low-level Haskell bindings to the GLPK library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) glpk; };
 
@@ -277998,7 +279886,7 @@ self: {
         tasty-hunit
       ];
       description = "Attempts to fix your syntax erroring Lua files";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "glualint";
       broken = true;
@@ -278732,7 +280620,7 @@ self: {
         utility-ht
       ];
       description = "2D and 3D plots using gnuplot";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -278851,7 +280739,7 @@ self: {
         mwc-random
       ];
       description = "Common, non-geometric tools for use with Goal";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -278880,7 +280768,7 @@ self: {
         indexed-list-literals
       ];
       description = "The basic geometric type system of Goal";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -278936,7 +280824,7 @@ self: {
         goal-probability
       ];
       description = "Optimization of latent variable and dynamical models with Goal";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -278987,7 +280875,7 @@ self: {
         goal-geometry
       ];
       description = "Optimization on manifolds of probability distributions with Goal";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -279302,7 +281190,7 @@ self: {
         text
       ];
       description = "Megaparsec parser for Godot `tscn` and `gdextension` files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bench";
       broken = true;
@@ -279498,7 +281386,7 @@ self: {
         time
       ];
       description = "Comprehensive Google Services SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279510,7 +281398,7 @@ self: {
       sha256 = "0h6iwa2z863qgi1vixp28xgq8f2vk0dwlvs3ppbh1f4i9viqvr8b";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Abusive Experience Report SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279522,7 +281410,7 @@ self: {
       sha256 = "1a1x97xgpmznjgqjrbgz63vfdlgdilzi6y7myxm8v6fin4pf1y2p";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Accelerated Mobile Pages (AMP) URL SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279534,7 +281422,7 @@ self: {
       sha256 = "0cy8bwkrgwmz2lm1bqq1w3c895x5h6bfd27wlp6zihivj4kmky8j";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Access Approval SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279546,7 +281434,7 @@ self: {
       sha256 = "1n0llmpcp8da4nzmz6350gnjaj0ir3wl1iqnx9y1wvq99jr1xb4s";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Access Context Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279558,7 +281446,7 @@ self: {
       sha256 = "1msm75jv2p73fxw9nffjyqyw8zyg0xpna1dhir08pzsmwwyysdx8";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Ad Exchange Buyer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279570,7 +281458,7 @@ self: {
       sha256 = "1k2is2alb7d5zdxpqbiv07kxbg86gzkc8zmlndva8p7zrrayanwd";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Ad Exchange Seller SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279582,7 +281470,7 @@ self: {
       sha256 = "0k8fdnyyd20qis54nnarj7dk17ncfsn1br83mhjsgkp5x956zlzr";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Ad Exchange Buyer API II SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279594,7 +281482,7 @@ self: {
       sha256 = "0hj5ic3mhigk524d760g9s2xlqfx5aj6rxqwyzfs9hrnvl88m79c";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Ad Experience Report SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279606,7 +281494,7 @@ self: {
       sha256 = "068ib1s04y39q0llrnn64ha1l1q61jspfgkb3chcb056yiam3z7k";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Admin SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279618,7 +281506,7 @@ self: {
       sha256 = "1aw1369bb5lqzc8z0aqpghjk4pzqk3747ciiwzjibxp5fw6gp8fb";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Admin SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279651,7 +281539,7 @@ self: {
       sha256 = "189fx1ih296s26rn7m92rmay6csps1ihnyrm8wif1530xf6i7i9j";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Admin SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279663,7 +281551,7 @@ self: {
       sha256 = "02qh6rqmbllfj27zi4ddgfy88ck7gayzr9ziw6r2brajwdd7rmcx";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google AdSense Management SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279675,7 +281563,7 @@ self: {
       sha256 = "1h0iv25rpv495qgn021dlxi0cy9v1yxhr6q1l42nb5sp3nfx8j4l";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google AdSense Host SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279708,7 +281596,7 @@ self: {
       sha256 = "0grqgrczqwa3f8ir7yx8rlw1y0alrqz8m4dhbx6268dz5y192421";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Workspace Alert Center SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279720,7 +281608,7 @@ self: {
       sha256 = "1pqr20s11z75m8lzqq4kx86h8gf9hqmv0n45kbb1v99nmiyl6scq";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Analytics SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279732,7 +281620,7 @@ self: {
       sha256 = "1ps7lln0z027g0lmg0b8bs14ycz3i607a6ja5kxh9xpqi2bcj1pq";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Analytics Reporting SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279744,7 +281632,7 @@ self: {
       sha256 = "0l40nv4jfba6h7vpfca548k7y5yya54n237f11gksclyij5xzc5j";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play EMM SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279756,7 +281644,7 @@ self: {
       sha256 = "14knrvx11f97jb7z7vbmjmh8zrchds5wzacaaiz68g5pqh44sqqg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Android Developer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279768,7 +281656,7 @@ self: {
       sha256 = "0vf3y14bjzs1yb6fsaizsgcjvpk8r3gxavbkkf9cdy3zz6mdfs6y";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Android Device Provisioning Partner SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279780,7 +281668,7 @@ self: {
       sha256 = "0hcfjz9lz9j4sk5vxsq0a67gbrgi9cmrwblkyslzlc3jqd689grh";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Android Management SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279792,7 +281680,7 @@ self: {
       sha256 = "1d6nsqd6lynk2cvrb53zd1h74w46f8grjrgawrdczkhn9sjplgg4";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google App Engine Admin SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279804,7 +281692,7 @@ self: {
       sha256 = "0ai1ip5hkqbk0shwhgkjrc81422f0as78spahvyp2b18h9ds3f12";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Drive Activity SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279816,7 +281704,7 @@ self: {
       sha256 = "119gfvs7wfchf4l50r13pwwqilxfkxbpdsr1hxa0qshx7qs4hdn3";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Calendar SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279828,7 +281716,7 @@ self: {
       sha256 = "13xr8d87xyv1nif1vm8hx92aqp7w2h68qqpci01jrlgvbwikwg0z";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Enterprise License Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279840,7 +281728,7 @@ self: {
       sha256 = "02as3zv92pmki03ylcjc999cfk4qwgp066ns5wmvhg71x66wcy97";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Workspace Reseller SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279852,7 +281740,7 @@ self: {
       sha256 = "1imkjjq2l8j36anzn4rv51mcdr3j1w9wxk2z4ps8py9whz2yfqa3";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Tasks SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279864,7 +281752,7 @@ self: {
       sha256 = "1ipa3a1d6in8kvk6qrbmpsfns30nci95dlsb2x3ds8jx9rwffsad";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google App State SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279897,7 +281785,7 @@ self: {
       sha256 = "0r19gn2i4bvbacvsaw371nwiif41zi3bqvkv1b92nfyzig9nnnpr";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google BigQuery SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279909,7 +281797,7 @@ self: {
       sha256 = "0vv8jhqk2z1ji8l2k83021ycsbqqf4mkzq13k6yra5k62f886hb0";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google BigQuery Data Transfer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279921,7 +281809,7 @@ self: {
       sha256 = "1q30h5qgrxwi3vpk28iklmy220lhvpk1bc1cdl2wvj9g87vk3jyg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Bigtable Admin SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279933,7 +281821,7 @@ self: {
       sha256 = "0ws694ymsrlk4hw1jzqi4lpjjmjas8cdvxxz9dcmkbd3yhpsq16z";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Billing SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279945,7 +281833,7 @@ self: {
       sha256 = "0m82qlih6dxijd83bsjfbw4dxrn1k1w8gnfdxdxxvccf58xxkb48";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Binary Authorization SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279957,7 +281845,7 @@ self: {
       sha256 = "02qrqqkhy7v14jygqnwv99bkfmnjpkjbxx33avk3fzx5vfh04phh";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Blogger SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279969,7 +281857,7 @@ self: {
       sha256 = "0b8r416cg9cy36adv4frndcc64vy1wcqmhpshbs4ba583yqxndw6";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Books SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279981,7 +281869,7 @@ self: {
       sha256 = "1m5ikfi8gl8xsi1kgv3ca7pfjd56gykw29s4x5mkm76a727sy454";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Chat SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -279993,7 +281881,7 @@ self: {
       sha256 = "1cg0xvxs8hkdzrsal7wn0gchscssvnwpfx2kzqqv3k539vjxb07w";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Civic Information SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280005,7 +281893,7 @@ self: {
       sha256 = "0d32fmi65cmhallbiwifwzbwald508025crshh951g2l4sypdbsx";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Classroom SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280017,7 +281905,7 @@ self: {
       sha256 = "1r2ijkzlqi2a34qq6978n8f3iqn2f14srw8cyglhy7if6f23ybp0";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Asset SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280029,7 +281917,7 @@ self: {
       sha256 = "16scs0jzk0fbvhchf68f69b3pmipffdvi38ihfdn7495dipikpjp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Error Reporting SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280041,7 +281929,7 @@ self: {
       sha256 = "1w5cpsafgks7zhx08bri3sx9m30ad39wxraa296czhvzhlrz95qq";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Functions SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280053,7 +281941,7 @@ self: {
       sha256 = "0ygdq4fvgbbjw1jzrvr7r02qjjvr21fjsyvjs5r781bsps9msr66";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Identity SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280065,7 +281953,7 @@ self: {
       sha256 = "1dvgygzzyk038p6f5qwgiipiz1466zmm760yi1ci9sh7fl4i4ndp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud IoT SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280077,7 +281965,7 @@ self: {
       sha256 = "0wvk6ll7xmlly1bi1kwpj3vp4scg06cjsb1xnpd2rd6j2fhi2vmz";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Key Management Service (KMS) SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280110,7 +281998,7 @@ self: {
       sha256 = "18siw287hdcfmcdp0sxd1r94pk4rri71987mi5mjgxgan90lhgxk";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Private Catalog SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280122,7 +282010,7 @@ self: {
       sha256 = "12sf1rmiv52gfml3xcv76iza8mry9vhcpk4xzdb80yaw8343idj3";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Private Catalog Producer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280134,7 +282022,7 @@ self: {
       sha256 = "0hwby0sk3rxsii76425hgy9d7p4v5l0infsqj0qbs0197qhwh4zi";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Profiler SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280146,7 +282034,7 @@ self: {
       sha256 = "14gbhgyy8g7kaarxpy8llpvgydapq49sr8gzda144gkfq68svabw";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Scheduler SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280158,7 +282046,7 @@ self: {
       sha256 = "1nhqkvm5v2m4xbcdi29m8padjzmampcsy3l61vknwfc0n6f89rhf";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Search SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280170,7 +282058,7 @@ self: {
       sha256 = "1zi69k64klas18kmq525z52nchc9gqdk7v15x8prdln6x46ic1dn";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Shell SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280182,7 +282070,7 @@ self: {
       sha256 = "11ygaka332an20cyl5i9bj5jxkgddc36pfdl07mjab68b6500ggc";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Tasks SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280194,7 +282082,7 @@ self: {
       sha256 = "0wnn3pfx28g7iqr8vwk2v5vqh06vwcmgjj0blwi9aznkm1g3qp1k";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Trace SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280206,7 +282094,7 @@ self: {
       sha256 = "1vcwyv86a3mpis6d1rgldn61qzxfz8x2ncfv3r7rrpr79zclqhkj";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Perspective Comment Analyzer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280218,7 +282106,7 @@ self: {
       sha256 = "0j4kabhl6wlyhqjiiz6qw6hc8q9c8c0x0ylqxfiwxgr8j0m3x17h";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Composer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280230,7 +282118,7 @@ self: {
       sha256 = "094p7nms03jypq44snnsz05z485dz5ynawcnmjjlmwh387i59j4x";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Compute Engine SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280242,7 +282130,7 @@ self: {
       sha256 = "01q4dmqxwdy8p9ix9dhj0dgqs71z7mmjznybv2r8jmfwxm4nxgka";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Consumer Surveys SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280254,7 +282142,7 @@ self: {
       sha256 = "0ci3xdl0rb5nq54z6i748gh240ipgp9wa36pncq3yasf58pn9rvp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Kubernetes Engine SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280266,7 +282154,7 @@ self: {
       sha256 = "1vzmzbgr88qij6fgi2gsz3iavvbzdxnpjf864l656fkvr5xw83wl";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Container Analysis SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280278,7 +282166,7 @@ self: {
       sha256 = "12mmiza1sd4fryy86kzy88adw8nkswxpf1r2sryndjkyk9a47knx";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Build SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280340,7 +282228,7 @@ self: {
         tasty
       ];
       description = "Core data types and functionality for Gogol libraries";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280352,7 +282240,7 @@ self: {
       sha256 = "04yvwb12qpf57p82a7j5h7z0ckxmfircxzyl1a9h8qwmkf2h9g9n";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Custom Search SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280364,7 +282252,7 @@ self: {
       sha256 = "0qi91p8x8jx3rnz4vpk7mkcms1hqjhwlmrvpjzxx489bazllsz66";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Dataflow SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280376,7 +282264,7 @@ self: {
       sha256 = "0r28ccchciw067w1gsm9pcfhnmr6ggk0m5p27i3rhwz1v3mhspnf";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Data Fusion SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280388,7 +282276,7 @@ self: {
       sha256 = "1gls8g771b7d90a57zz30cwpg0sr9vjmjwkb2sn1syr3q82vz8ba";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Dataproc SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280400,7 +282288,7 @@ self: {
       sha256 = "0d727wn1yr4w5svvzsfyvn8ybl6l0ijr1mq86zwpz041709llbfg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Datastore SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280412,7 +282300,7 @@ self: {
       sha256 = "0m71pa6ilqy5s20vmn8q4gn1vikr2fjxvhz8h54qswn5sanjpiz8";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Debugger API (Deprecated) SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280424,7 +282312,7 @@ self: {
       sha256 = "143k175i32i4nw54r1w7490wqj9g703a5787aw86r468xfagwmdy";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Deployment Manager V2 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280436,7 +282324,7 @@ self: {
       sha256 = "1vhc4fx78h26hcxhmgijfprsvshqgh8v6q9dialckh7rq226g0mn";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Campaign Manager 360 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280448,7 +282336,7 @@ self: {
       sha256 = "1gijb69hmba7dh493zifv5809zri33fmi7fi8wmf3973qaylp7g6";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Dialogflow SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280460,7 +282348,7 @@ self: {
       sha256 = "1a6r481sxp50x5mpw8inp4904jm0a21m1rcya2wijwrj8xblynpp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Digital Asset Links SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280472,7 +282360,7 @@ self: {
       sha256 = "1gyh5fbiv98j74p3bkg0kv1clszdpy8ksb47k4bnpjg8livfgzf4";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google API Discovery Service SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280484,7 +282372,7 @@ self: {
       sha256 = "15q8fr1y21zacz30kjvpxsn2irnzqjl5r2xvhkd2mbcpplyvcbcz";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Sensitive Data Protection (DLP) SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280496,7 +282384,7 @@ self: {
       sha256 = "1igqrn1w1jda0xplbslwib2mdv9mzhfb4dpqgymlmp5g1ps9qy28";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud DNS SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280508,7 +282396,7 @@ self: {
       sha256 = "1chxs5a1wlql6vb9wqr9navijis7khbpndy0grwzfcdafcyz71jm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Docs SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280520,7 +282408,7 @@ self: {
       sha256 = "01955ainvq9fmmjvkwpgbarmnplw30ilf05shsnjskdhp6b1hqvc";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google DoubleClick Bid Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280532,7 +282420,7 @@ self: {
       sha256 = "1l70nmx86wvixyr84zjhns69l58z1v65aiycmqi3i441c5hjrax2";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Search Ads 360 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280544,7 +282432,7 @@ self: {
       sha256 = "0alf3jahdmkjxjzqj2bs5wlrvx7d3414kbhpi1pvdcy8s3fm2b49";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Drive SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280556,7 +282444,7 @@ self: {
       sha256 = "06lnmdz833wvkh9h2q8q73mnqyp2klmfhg132zabwpcpkywlinvl";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Drive Activity SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280568,7 +282456,7 @@ self: {
       sha256 = "1v2s3696i71z4pqclqc2x53c51n4llv6wbpvms1mr666zgmchvxr";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Fact Check Tools SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280580,7 +282468,7 @@ self: {
       sha256 = "0fd23xaqcqn6qq696i1dlrbdlk7yw15h8wq9jsy0l8sqa8f9ygn2";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Filestore SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280592,7 +282480,7 @@ self: {
       sha256 = "18ywm1xzr0sqj4pp6lsjw8pbhydimapnxa5xylybc1ii69jqq3xj";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Firebase Dynamic Links SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280604,7 +282492,7 @@ self: {
       sha256 = "1znwn8xl2yfxarbf6gcmwlhrm7mn4xan89bd2sh1sd520155yw4q";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Firebase Rules SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280616,7 +282504,7 @@ self: {
       sha256 = "0v0jbgffkxgk17qn79qjbcp3rnnfihcikb9709kwkz5vf246rzs7";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Firebase Hosting SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280628,7 +282516,7 @@ self: {
       sha256 = "09n8bfaa9spara3yh5awjcfyxdwcag5qi7w01vk9m9snfzdypfrg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Firebase Remote Config SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280640,7 +282528,7 @@ self: {
       sha256 = "0fillhmd5xdb45mfg62fr6vhki4gdc8mqvqzs56il3p70ykbrgby";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Firestore SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280652,7 +282540,7 @@ self: {
       sha256 = "19a63kbgf8r268ybj1dyd7z4bzaw2dd6ygp3pk4swabjjj1pfrvx";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Fitness SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280664,7 +282552,7 @@ self: {
       sha256 = "15dsq67qnpnmninklr9pm5yy1xn8a459pvgmhaabbp2x31ghqjiv";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Web Fonts Developer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280697,7 +282585,7 @@ self: {
       sha256 = "18scbflas6w5avgsm5ndnj1qyn277mlj3v2fl71mrfjwr6171l5c";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Fusion Tables SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280709,7 +282597,7 @@ self: {
       sha256 = "0l73pqrsfnwxv3mbg6lxkzmbal1xb5gxcb3rnv16d60ng50xrpc3";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Game Services SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280721,7 +282609,7 @@ self: {
       sha256 = "1qfag0mqyp5fk7p225qlc2551hdyzpmflnx0i59b24vm2yym1y4a";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Game Services Publishing SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280733,7 +282621,7 @@ self: {
       sha256 = "0zy5bqi8lsb6r19bb5sd8fjcqx9v4g0lphxj60p20p94k5vw7wcd";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Game Management SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280745,7 +282633,7 @@ self: {
       sha256 = "0ddyddxan844csb6mflrsq42ivvwrwcm6lhqy7wydysbf1wcfgmm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Genomics SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280757,7 +282645,7 @@ self: {
       sha256 = "045hqcyypvi8c2d9lh6szp1crz1xk9ll2ll93w5viyvzz2fzlpza";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Gmail SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280769,7 +282657,7 @@ self: {
       sha256 = "0gskbydkk39zs6aa8ss4y3ibnsdb69zmm7jbi6ijr56y7qv11fgm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Groups Migration SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280781,7 +282669,7 @@ self: {
       sha256 = "0n0j1m01y9k2q07mkrdm5n9pp3ahs9byhl0kpi8na30y4zhscxr8";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Groups Settings SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280793,7 +282681,7 @@ self: {
       sha256 = "1dskfbpm1mv2dax64izj8sarkssajnbkinc4pwkvgfgjhf9l9sq9";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Healthcare SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280805,7 +282693,7 @@ self: {
       sha256 = "0ylryxz1wa8v246mwzpvqkqmggj2gbd9mxmgf5cbnkibmnbcwswg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Identity and Access Management (IAM) SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280817,7 +282705,7 @@ self: {
       sha256 = "1jzqijf08jmmavgc5f7vpvs1ixiw6h9k4x8y7q8kwiayp57gcgfh";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google IAM Service Account Credentials SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280829,7 +282717,7 @@ self: {
       sha256 = "0v7xm5qr5im2hcvq34s7c880f6yxnzwc4cax1cwm4f3zjq7galmb";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Identity-Aware Proxy SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280841,7 +282729,7 @@ self: {
       sha256 = "1wdm8w4z4iicbla6139501v7ri9k9w6f0b131li0578dxqw411m0";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Identity Toolkit SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280853,7 +282741,7 @@ self: {
       sha256 = "1hxk0gzk183vjljj57qkgyi5y4j1rigvjxkivxzvzlqyvpbirdrs";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Web Search Indexing SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280865,7 +282753,7 @@ self: {
       sha256 = "0i9pi31vz2ngk8fpv16cizc2yjhs0pacnwf2c0fk9nylg9x4ms38";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Talent Solution SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280877,7 +282765,7 @@ self: {
       sha256 = "02py8n5kk1lxmm7bkxag041rwzip4jxpdmldciq4vyq9fkkxvy57";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Knowledge Graph Search SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280889,7 +282777,7 @@ self: {
       sha256 = "0y0r5c1kgzxmsply7zksh9dbzs2sd4fxwb4ps4w4lqzjkchdbj4x";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Natural Language SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280922,7 +282810,7 @@ self: {
       sha256 = "14s5hw0qby8acqmf9f3kh068iaglmf9lp6p802vf3bg3qqx43857";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Library Agent SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280934,7 +282822,7 @@ self: {
       sha256 = "1a2w6dyb0h3dy9fxzsrmq81d7vr3z2nk7xc0wkb4jhsdvn3nwkzk";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Logging SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -280946,7 +282834,7 @@ self: {
       sha256 = "0ydxl3cxrw65bfp708im1mlqgf76bi8m0wl8x295mgzyyvi6q75g";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Manufacturer Center SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281000,7 +282888,7 @@ self: {
       sha256 = "0si4kk7da0mxgqddjamxa8cmci75rlpl2bivjyqx99awff788376";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Mirror SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281012,7 +282900,7 @@ self: {
       sha256 = "1vr7kv86b1cz364a5mbcl8w14k3f0rdkya4dqc99j46rqa89hcjs";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google AI Platform Training & Prediction SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281024,7 +282912,7 @@ self: {
       sha256 = "1psii00flwy8yh76ng1ixpzdix4i31gr9nlysvi20m962j2zb8x7";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Monitoring SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281036,7 +282924,7 @@ self: {
       sha256 = "1yrzaa7wab67dw7yyz3kv78rka6vrmq4q53rrjda25y5mbzax08j";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google OAuth2 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281048,7 +282936,7 @@ self: {
       sha256 = "0mwxzx6qqbcybanf8cvdrwi4q2y1rs9wlrs4ivsx5csjk07zrbpy";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud OS Login SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281060,7 +282948,7 @@ self: {
       sha256 = "000p7lhs82fgw80x2g77bgk0ywhxcj22388a37xfdlvfwk7rxxhp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google PageSpeed Insights SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281072,7 +282960,7 @@ self: {
       sha256 = "0jcqch35rw33fp3xc24x6063hfxfd6hkdhy8ns1b3ry0x59r42na";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Partners SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281084,7 +282972,7 @@ self: {
       sha256 = "1qjr57q91kr6gf37y24z0hr4lwkqq5fk474mb53s6ipqiyqxsk1s";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google People SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281117,7 +283005,7 @@ self: {
       sha256 = "05nc0w5v5sgg2z1ldx8y6a06nqy81hsq1bln882gv5595mcz3134";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Movies Partner SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281129,7 +283017,7 @@ self: {
       sha256 = "1mga3ppvlzjw133g8li20hjacp8k280qwpcsrfh1a9srmkflnqpi";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Custom App Publishing SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281141,7 +283029,7 @@ self: {
       sha256 = "1jy99vdjqhlhvgir9h7hfc4w27nql44gqv9bn7g6w77xrh5qbbgg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google + SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281153,7 +283041,7 @@ self: {
       sha256 = "00nyww46c4fxqvzm8jdl8wnmv0a7inm4hcyp56vl336l5fzw6wid";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google + Domains SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281165,7 +283053,7 @@ self: {
       sha256 = "0i87jzs5vrd7zwmrpkbf0jpw7yhq0y9hhiyay18kl78jkwh8gp9v";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Poly SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281198,7 +283086,7 @@ self: {
       sha256 = "13yzm104viq54pddz321bh9fknr4i0pywsnmlayav82gy6q70fnn";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Proximity Beacon SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281210,7 +283098,7 @@ self: {
       sha256 = "0ay6npsyzcq2m6dww8xdima8d19bqnrpi942hpmn5ny1rlxahvnj";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Pub/Sub SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281222,7 +283110,7 @@ self: {
       sha256 = "1nvn2c936ia0jzkc6lljcrnxp69y7wj8yk4n95y4wqmibi7v1pc6";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google QPX Express SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281234,7 +283122,7 @@ self: {
       sha256 = "1xcgfz3d34iac66kld3fjszi6zn03hw6i51niyapnmgs7qwvw8xm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google reCAPTCHA Enterprise SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281246,7 +283134,7 @@ self: {
       sha256 = "1fynpbfhnhpxki81wak3w6256rhb6yj2n6h605zpkmqb6zgdcraw";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Memorystore for Redis SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281258,7 +283146,7 @@ self: {
       sha256 = "0316qcavy06s6lc77nd3kvkcivx99a29kybqk2v8gkm3d3hgnay6";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Remote Build Execution SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281270,7 +283158,7 @@ self: {
       sha256 = "1nx55xgghprwzs81x4xvald37xvjzwrsfq5lrrarig5gsz3crb8h";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Replica Pool SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281282,7 +283170,7 @@ self: {
       sha256 = "14cwrx4qw002464i913n6hxq7rw962w2kcrw3bzng74ndhaaswd2";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Compute Engine Instance Group Updater SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281294,7 +283182,7 @@ self: {
       sha256 = "12mhxjw4x9cb5sgpy2z4sk9qkmarhwv8mb8q88qigx4d1abqj5gm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Resource Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281327,7 +283215,7 @@ self: {
       sha256 = "07wqy2cp62d8gs4izqzqv50yaj7b37jfhq5qm67j9dr3s56kzz6q";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Run Admin SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281339,7 +283227,7 @@ self: {
       sha256 = "0hrjl2vcbmk3hx38c0alh2lgz10xnsvb90lb5x9fkls2n6l0q3lm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Runtime Configuration SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281351,7 +283239,7 @@ self: {
       sha256 = "13yyab714dpd42j6683p4c6v97apc2qy4ihyhrsjr7yn6ysyc4jy";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Safe Browsing SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281363,7 +283251,7 @@ self: {
       sha256 = "1a2ppyk9869bkwzfhaznqkja5pkdwjwal276k4mzn0ba7jrq47hs";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Apps Script SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281375,7 +283263,7 @@ self: {
       sha256 = "0l5q9zj6scj72zg4sd1hkn5jwm4hh4q85wq6y5pm8s1sbqk3wsqz";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Search Console SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281387,7 +283275,7 @@ self: {
       sha256 = "0vkipvyapjimizikzfgk4q2cdn0my5j85agnnz79hvlkqb412ggp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Security Command Center SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281399,7 +283287,7 @@ self: {
       sha256 = "0z5mfig3k7k90r5khcs8is4c278dsp9y6qa5fljfkljkd4bniyv4";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Broker SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281411,7 +283299,7 @@ self: {
       sha256 = "17g49aqdgml3w16mj8qf3m0lz7wa6qhmvz1m7s5q2dly8i7klb9q";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Consumer Management SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281423,7 +283311,7 @@ self: {
       sha256 = "0zw9a5q6nsyar5210ryh3svzv8jgjwjmn6mm1kpiqx32bi0gcb53";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Control SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281435,7 +283323,7 @@ self: {
       sha256 = "0i3v8ryswaz84d27v867v5f3rpa6wa518k9y9sim87l4yvqdd72s";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Management SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281447,7 +283335,7 @@ self: {
       sha256 = "0180yqdgrbsf7zazvdsbi1hwy671qc4m80chv458fgnhl6irqzsj";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Networking SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281459,7 +283347,7 @@ self: {
       sha256 = "0mc44gczmh6acgfp3x0lhd7kv7agqdqskv91bvnrk9lmrhcqchr6";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Usage SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281471,7 +283359,7 @@ self: {
       sha256 = "0gh7flld3vai2fwx9gqw3gcrjwwdk3nkahdxdzrixk96lrvfd2lb";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service User SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281483,7 +283371,7 @@ self: {
       sha256 = "0jx155xaa053mp7sdrrjng28vdvls51bqg374bp8015dqx8pq388";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Sheets SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281495,7 +283383,7 @@ self: {
       sha256 = "09j3a7scawkxq81mghnypwhxi5jfx1w8nircmmhpm6a9543ikbgl";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Content API for Shopping SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281507,7 +283395,7 @@ self: {
       sha256 = "04nn9382mwi4x83whhp66x99mml2djf97nlvpq0n5d6vs5nl65vf";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Site Verification SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281519,7 +283407,7 @@ self: {
       sha256 = "06cc335zva6qdqr3mmhgsmhzyg09lipzmcsffwvngmbbk6adqfag";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Slides SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281531,7 +283419,7 @@ self: {
       sha256 = "1v5wl66rl9kj7ckzvmy65a23s9d3ajfrxc4rsmpx6zzg3xmxjlw0";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Source Repositories SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281543,7 +283431,7 @@ self: {
       sha256 = "0wbkqr2f2dha298n3sz007y9jg9c4yxn69m5ln7ffxa135yan6l8";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Spanner SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281555,7 +283443,7 @@ self: {
       sha256 = "0z1la9nan5dfdksgkajh1a2smlj4vjqk3r2586cshyn4lf1iswsa";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Spectrum Database SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281567,7 +283455,7 @@ self: {
       sha256 = "1bg6kqxjgwj5qrkrvl7gk9h9r60z41k9h7zf6y7a74arw1ycnfcs";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Speech-to-Text SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281579,7 +283467,7 @@ self: {
       sha256 = "0aamc6i0l1ad9x4fnw1psq37fr8iq4pflmi7r9zpqpqh61225qic";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud SQL Admin SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281591,7 +283479,7 @@ self: {
       sha256 = "1sdmnkaclgi1n9kip5v3791dbvl992sbf95kp967261cwdm00mw5";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Storage JSON SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281603,7 +283491,7 @@ self: {
       sha256 = "14v3gk3pp3cn1r27dc9j6f0a8ska2mdpyarx54607x3y23bl1xc5";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Storage Transfer SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281615,7 +283503,7 @@ self: {
       sha256 = "03zd6hk87fchc2v7wch7s2jjlp6kk2pdadd3vqapnfai5b4nmi0c";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Street View Publish SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281627,7 +283515,7 @@ self: {
       sha256 = "1bpybiarlh030k825ikf4sc3wm54qn8jxn9wcycfchz311rahci1";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Surveys SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281639,7 +283527,7 @@ self: {
       sha256 = "1lfadp570iampv44s8kjykimll2h3jrm7kmg696lc4gvr45ps9iz";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Tag Manager SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281672,7 +283560,7 @@ self: {
       sha256 = "0spim4pb7l582ydp4p5fz24bdqdl2d3jl75sw90g39fkdhx8b36s";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Testing SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281684,7 +283572,7 @@ self: {
       sha256 = "0dal449bcdlr04mllfam1m9n0qz8p3ddlv8vm1xpxzw52090jq3m";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Text-to-Speech SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281696,7 +283584,7 @@ self: {
       sha256 = "108x732f9bxsqwj1wnmp3sb19v2hc0amjq3hjpw8f2iciyy4l5ia";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Tool Results SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281708,7 +283596,7 @@ self: {
       sha256 = "09hbn03scg5axmfy15d29v5nmqxgsc8289x95rahcy00vjcx0aip";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud TPU SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281720,7 +283608,7 @@ self: {
       sha256 = "0a98hq71pl3hiv8axaqibs7i5vx9h36zcp4lhj1ckca9mbqps87g";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Tracing SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281732,7 +283620,7 @@ self: {
       sha256 = "15ai2f66bi5hvfpfqx3kpr7pb9nw5sw13p6igs9a2vmdaqf57mkg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Translation SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281744,7 +283632,7 @@ self: {
       sha256 = "0j846nnb5w2lki10wnvdslds4bi387hxcfrr3m8q156n0dvgzz5q";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google URL Shortener SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281777,7 +283665,7 @@ self: {
       sha256 = "08dyv38d0ga4dc6zlxz41dgba84ylxc336xv0c33jqxhrzdq6654";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Vault SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281789,7 +283677,7 @@ self: {
       sha256 = "1303p25mdzvk79rhy942f1v27n476cqj1sclycq3mnflf661sbwa";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Video Intelligence SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281801,7 +283689,7 @@ self: {
       sha256 = "13llhpsj0lzd4r6mbgzlcqgj8m14i0qk3il3pynxwhzvn1nccjps";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Vision SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281813,7 +283701,7 @@ self: {
       sha256 = "1da7zap20g3s8n8pail5sh7wy4i7m718qr1h3dmqpd4413p9ybcn";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Search Console SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281825,7 +283713,7 @@ self: {
       sha256 = "0asdbgv7n7vcc7z2qxr4aqva0w75wzxba2niyq10648ya1dxrx5d";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Web Security Scanner SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281837,7 +283725,7 @@ self: {
       sha256 = "1zgfx51z3wxmjkyzg876kfmwb516n5dhaygg1bmjhqc6xwzzp2si";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google YouTube Data API v3 SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281849,7 +283737,7 @@ self: {
       sha256 = "01rcrcj83smzhz9bzdhwrnd799w2gg62ypvkffyd1n06frs6jlaf";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google YouTube Analytics SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281861,7 +283749,7 @@ self: {
       sha256 = "14p05jzz2vpxhgr2gb8pp5i8ni46zy3j5vjhlq3gb2ri7cz76asz";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google YouTube Reporting SDK";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -281925,14 +283813,16 @@ self: {
       mkDerivation,
       aeson,
       base,
-      benchpress,
       boxes,
       bytestring,
+      deepseq,
       directory,
       filepath,
       hspec,
       hspec-core,
+      microlens,
       process,
+      QuickCheck,
       statistics,
       text,
       time,
@@ -281940,17 +283830,18 @@ self: {
     }:
     mkDerivation {
       pname = "golds-gym";
-      version = "0.2.0.0";
-      sha256 = "17jngahdl6kiaik3fmgj6glg00qhmi7jrdjrl4jdflicjrwwk99i";
+      version = "0.7.0.0";
+      sha256 = "00bf9j6dyyz7vdwb9y4hi9b1wmmh94picakq7hhxia5sbv4p0fc3";
       libraryHaskellDepends = [
         aeson
         base
-        benchpress
         boxes
         bytestring
+        deepseq
         directory
         filepath
         hspec-core
+        microlens
         process
         statistics
         text
@@ -281960,9 +283851,14 @@ self: {
       testHaskellDepends = [
         base
         hspec
+        QuickCheck
+        statistics
+        text
+        time
+        vector
       ];
       description = "Golden testing framework for performance benchmarks";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -283578,8 +285474,8 @@ self: {
     }:
     mkDerivation {
       pname = "gothic";
-      version = "0.1.8.4";
-      sha256 = "052ixajcs3nvsdwdhrhd4l7y9vxrhhdmcxdpwb4irl524mskimzm";
+      version = "0.1.8.5";
+      sha256 = "1j6mzniw3n2v4lg3pzkxz05jk50baclnmx84lfxnjv71rz83sjz6";
       libraryHaskellDepends = [
         aeson
         base
@@ -284143,7 +286039,7 @@ self: {
         gpu-vulkan-core
       ];
       description = "Thin wrapper for VK_KHR_surface extension of the Vulkan API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -284172,7 +286068,7 @@ self: {
         gpu-vulkan-core-khr-surface
       ];
       description = "Thin wrapper for VK_KHR_swapchain extension of the Vulkan API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -284210,7 +286106,7 @@ self: {
         typelevel-tools-yj
       ];
       description = "VK_KHR_surface extension of the Vulkan API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -284254,7 +286150,7 @@ self: {
         typelevel-tools-yj
       ];
       description = "GLFW surface for Vulkan";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -284301,7 +286197,7 @@ self: {
         typelevel-tools-yj
       ];
       description = "VK_KHR_swapchain extension of the Vulkan API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -284426,7 +286322,7 @@ self: {
         typelevel-tools-yj
       ];
       description = "medium wrapper for VK_KHR_surface extension of the Vulkan API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -284458,7 +286354,7 @@ self: {
         typelevel-tools-yj
       ];
       description = "medium wrapper for GLFW surface for the Vulkan API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -284505,7 +286401,7 @@ self: {
         typelevel-tools-yj
       ];
       description = "medium wrapper for VK_KHR_swapchain extension of the Vulkan API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -284569,7 +286465,7 @@ self: {
         criterion
       ];
       description = "Applicative non-linear consumption";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -284602,7 +286498,7 @@ self: {
         text
       ];
       description = "Applicative parsers for form parameter lists";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -284682,7 +286578,7 @@ self: {
         tasty-hunit
       ];
       description = "API for creating grafana dashboards represented as json";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -284721,7 +286617,7 @@ self: {
         unordered-containers
       ];
       description = "Configure grafana dashboards from Dhall expression";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "grafdhall";
     }
   ) { };
@@ -284965,8 +286861,8 @@ self: {
     }:
     mkDerivation {
       pname = "granite";
-      version = "0.3.0.5";
-      sha256 = "0d2k9lnrqpsjhsqn82pm7pwm7qwnrccga60vkxw75sjgqv9862f3";
+      version = "0.4.0.0";
+      sha256 = "0gy9hjlv7sm0kdrrn9xqh16kl3aj3kxgg6zp20501cbwcdnr95sd";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -284985,7 +286881,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Easy terminal plotting";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "granite";
     }
   ) { };
@@ -285283,7 +287179,7 @@ self: {
         unordered-containers
       ];
       description = "Native Haskell implementation of the gRPC framework";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -285307,7 +287203,7 @@ self: {
         proto-lens-etcd
       ];
       description = "grapesy-etcd - GRPC interface to etcd";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -285814,7 +287710,7 @@ self: {
         transformers
       ];
       description = "Trace the call graph of a program";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -285854,7 +287750,7 @@ self: {
         directory
       ];
       description = "Converts a graph-trace log into a DOT file for use with Graphviz";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "graph-trace-dot";
     }
   ) { };
@@ -285884,7 +287780,7 @@ self: {
         process
       ];
       description = "Converts a graph-trace log into an HTML document";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "graph-trace-viz";
     }
   ) { };
@@ -286504,64 +288400,6 @@ self: {
   ) { };
 
   graphql-spice = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      base,
-      conduit,
-      containers,
-      exceptions,
-      graphql,
-      hspec,
-      hspec-discover,
-      hspec-expectations,
-      megaparsec,
-      scientific,
-      template-haskell,
-      text,
-      time,
-      transformers,
-      unordered-containers,
-      vector,
-    }:
-    mkDerivation {
-      pname = "graphql-spice";
-      version = "1.0.6.0";
-      sha256 = "1dm8wq9nyahjf15fx7v25i8jf9rfphl02nqlvf21gs7m0ljgn82k";
-      libraryHaskellDepends = [
-        aeson
-        base
-        conduit
-        containers
-        exceptions
-        graphql
-        hspec-expectations
-        megaparsec
-        scientific
-        template-haskell
-        text
-        time
-        transformers
-        unordered-containers
-        vector
-      ];
-      testHaskellDepends = [
-        aeson
-        base
-        graphql
-        hspec
-        scientific
-        text
-        time
-        unordered-containers
-      ];
-      testToolDepends = [ hspec-discover ];
-      description = "GraphQL with batteries";
-      license = lib.licensesSpdx."MPL-2.0";
-    }
-  ) { };
-
-  graphql-spice_1_0_7_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -286615,8 +288453,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "GraphQL with batteries";
-      license = lib.licensesSpdx."MPL-2.0";
-      hydraPlatforms = lib.platforms.none;
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -287034,7 +288871,7 @@ self: {
       ];
       testToolDepends = [ tasty-autocollect ];
       description = "Monadic DOT graph builder DSL";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "example";
     }
   ) { };
@@ -287223,7 +289060,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Gray encoding schemes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -287830,7 +289667,7 @@ self: {
         tasty-bench
       ];
       description = "Uniformly-random pre-factored numbers (Kalai)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "grfn-exe";
       broken = true;
@@ -287861,7 +289698,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Tools for working with regular grids (graphs, lattices)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -288139,7 +289976,7 @@ self: {
         text
       ];
       description = "Parser for reStructuredText-style grid tables";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -288254,7 +290091,6 @@ self: {
       ];
       description = "Symbolic evaluation as a library";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -288298,6 +290134,7 @@ self: {
       description = "Support for monad-coroutine package with Grisette";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -288939,7 +290776,7 @@ self: {
         utility-ht
       ];
       description = "Shell command for grouping files by dates into folders";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "group-by-date";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -289119,7 +290956,7 @@ self: {
       sha256 = "0f5c8dg9b74glfw2sdvdcl9c8igs6knz1bayk4gvvzvypsl547nf";
       libraryHaskellDepends = [ base ];
       description = "Groups";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -289140,7 +290977,7 @@ self: {
         groups
       ];
       description = "Generically derive Group instances";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -289215,7 +291052,7 @@ self: {
         vector
       ];
       description = "A contiguous growable array type";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -289582,7 +291419,7 @@ self: {
         tree-diff
       ];
       description = "Implementation of the pure part of the gRPC spec";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -289692,7 +291529,7 @@ self: {
       sha256 = "0if8kvwx51bwsdkwpk9ardmlm9l5v91vfy4g3bj2gmd3184nw6la";
       libraryHaskellDepends = [ base ];
       description = "Gruvbox colors for use in Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -289851,7 +291688,7 @@ self: {
         X11
       ];
       description = "A visual generic menu";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "gsmenu";
     }
@@ -290132,7 +291969,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ gtk2 ];
       description = "Binding to the Gtk+ graphical user interface library";
-      license = lib.licensesSpdx."LGPL-2.1-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-only";
     }
   ) { inherit (pkgs) gtk2; };
 
@@ -290264,6 +292101,35 @@ self: {
     }
   ) { inherit (pkgs) gtk-mac-integration-gtk2; };
 
+  gtk-scaling-image = callPackage (
+    {
+      mkDerivation,
+      base,
+      gi-cairo-connector,
+      gi-cairo-render,
+      gi-gdk3,
+      gi-gdkpixbuf,
+      gi-gtk3,
+      hslogger,
+    }:
+    mkDerivation {
+      pname = "gtk-scaling-image";
+      version = "0.1.0.0";
+      sha256 = "0bk9v1zw0psllssvhjckrpl396hggsnrrl52kg78jqxm0bmf3fwh";
+      libraryHaskellDepends = [
+        base
+        gi-cairo-connector
+        gi-cairo-render
+        gi-gdk3
+        gi-gdkpixbuf
+        gi-gtk3
+        hslogger
+      ];
+      description = "Generic GTK image scaling helpers for haskell-gi";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   gtk-serialized-event = callPackage (
     {
       mkDerivation,
@@ -290324,6 +292190,7 @@ self: {
       containers,
       dbus,
       dbus-hslogger,
+      dbus-menu,
       directory,
       enclosed-exceptions,
       filepath,
@@ -290334,6 +292201,7 @@ self: {
       gi-gdk3,
       gi-gdkpixbuf,
       gi-glib,
+      gi-gtk-layer-shell,
       gi-gtk3,
       gtk-strut,
       gtk3,
@@ -290349,8 +292217,8 @@ self: {
     }:
     mkDerivation {
       pname = "gtk-sni-tray";
-      version = "0.1.9.0";
-      sha256 = "082y2h267zynqqlpvbqn7pai2lj0izq1q629a3jsw0y89k3vagpi";
+      version = "0.2.0.0";
+      sha256 = "1nhw7nlcghwi9rlrd55951brfi98fz7za9jhn9bnrca6yd8pkh35";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -290358,6 +292226,7 @@ self: {
         bytestring
         containers
         dbus
+        dbus-menu
         directory
         enclosed-exceptions
         filepath
@@ -290382,9 +292251,11 @@ self: {
       libraryPkgconfigDepends = [ gtk3 ];
       executableHaskellDepends = [
         base
+        containers
         dbus
         dbus-hslogger
         gi-gdk3
+        gi-gtk-layer-shell
         gi-gtk3
         gtk-strut
         hslogger
@@ -290535,7 +292406,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Tools to build the Gtk2Hs suite of User Interface libraries";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     }
   ) { };
 
@@ -290819,7 +292690,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ gtk3 ];
       description = "Binding to the Gtk+ 3 graphical user interface library";
-      license = lib.licensesSpdx."LGPL-2.1-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-only";
     }
   ) { inherit (pkgs) gtk3; };
 
@@ -291308,7 +293179,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "The border guardian for your package dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "guardian";
       broken = true;
@@ -291461,7 +293332,7 @@ self: {
         unix
       ];
       description = "ghcWithPackages cmdline util";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "gw";
       broken = true;
@@ -291766,7 +293637,7 @@ self: {
             libxrandr
           ];
           description = "Raylib bindings for Haskell";
-          license = lib.licensesSpdx."Apache-2.0";
+          license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
           badPlatforms = lib.platforms.darwin;
         }
       )
@@ -291939,7 +293810,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "A Haskell binding for H3";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -292007,7 +293878,7 @@ self: {
         time
       ];
       description = "Control your Arduino board from Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -292698,7 +294569,7 @@ self: {
         zlib
       ];
       description = "native Haskell implementation of OpenPGP (RFC4880)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -293164,8 +295035,8 @@ self: {
     }:
     mkDerivation {
       pname = "haal";
-      version = "0.1.0.0";
-      sha256 = "09kahyxrvdp3nyidjqjivxbqlhnkpq7fk8rkn7y0v0dlfj9zqmnz";
+      version = "0.3.0.0";
+      sha256 = "1kllgy5q29xr1zh2xif1c7ixlhjkcr9cs5j3km90fr9sdd9hjjxl";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -293190,7 +295061,7 @@ self: {
         random
       ];
       description = "A Haskell library for Active Automata Learning";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -294309,7 +296180,7 @@ self: {
         servant-client
       ];
       description = "An API binding to Hackage API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -294396,7 +296267,7 @@ self: {
       ];
       doHaddock = false;
       description = "CLI tool for Hackage";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       mainProgram = "hackage-cli";
     }
   ) { };
@@ -294752,7 +296623,7 @@ self: {
         with-utf8
       ];
       description = "No frills releasing to Hackage";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hackage-publish";
       broken = true;
@@ -294855,7 +296726,7 @@ self: {
         time
       ];
       description = "List Hackage reverse dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -294907,7 +296778,7 @@ self: {
         time
       ];
       description = "List Hackage reverse dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -295628,7 +297499,7 @@ self: {
       ];
       doHaddock = false;
       description = "Hackage and Portage integration tool";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       mainProgram = "hackport";
     }
   ) { };
@@ -295711,7 +297582,7 @@ self: {
         haddock-test
       ];
       description = "A documentation-generation tool for Haskell libraries";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "haddock";
     }
@@ -295787,7 +297658,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A documentation-generation tool for Haskell libraries";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -295801,7 +297672,7 @@ self: {
       sha256 = "1nqq7k8ssl6h1d501d8ayzsdlihnbfrqy4l5z43msc6lr7ffvz2r";
       libraryHaskellDepends = [ base ];
       description = "A documentation-only package exemplifying haddock markup features";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -295889,7 +297760,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Library exposing some functionality of Haddock";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -295960,7 +297831,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Eliminate warnings for names referred in Haddock only";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -296272,7 +298143,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A simple Hadoop streaming library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -296360,7 +298231,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "Confirm delegation of NS and MX records";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       mainProgram = "haeredes";
     }
   ) { };
@@ -297333,8 +299204,8 @@ self: {
       pname = "hakyll";
       version = "4.16.7.1";
       sha256 = "18wg5ay6l3ngsmqq00g6y7djmg4f8285kwdi47g0rg70mq6sn0py";
-      revision = "1";
-      editedCabalFile = "0y4my8p32yihpxkfvm159vgh5na35f1jgrnj6fhlvq2c3460p0cf";
+      revision = "3";
+      editedCabalFile = "185panz8k3wqiy1hpzaa9p38v1n7vwcj2r6ij2pwqs7qrrwqr6dw";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -297510,7 +299381,7 @@ self: {
         text
       ];
       description = "Hakyll extension for rendering Coq code using Alectryon";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -297943,7 +299814,7 @@ self: {
         text
       ];
       description = "A Hakyll plugin for rendering diagrams figures from embedded Haskell code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -298102,7 +299973,7 @@ self: {
         vector
       ];
       description = "Hakyll utilities to work with images";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -298317,7 +300188,7 @@ self: {
         text
       ];
       description = "Use shortcut-links in markdown file for Hakyll";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -298594,8 +300465,8 @@ self: {
       pname = "half";
       version = "0.3.3";
       sha256 = "00mb2xfz0q8sq8zxqpw3ycp1p8gjhlgc0wxh5xr7kzyn52b08xpl";
-      revision = "1";
-      editedCabalFile = "1l21z6a7h6qkfnk0mp4qg3mgqjzrx5a9ra0ymb45rr3svvw9w45m";
+      revision = "2";
+      editedCabalFile = "1jy2q5nmf3mi97s44zyzrmq0dg3sgn1z0jcw5p19lhfdz2vlk5dk";
       libraryHaskellDepends = [
         base
         binary
@@ -298712,7 +300583,7 @@ self: {
       sha256 = "1y09vl853nsc6fx19bwmmmh9k7di825j4y7rsm06wyk35m911yv7";
       libraryHaskellDepends = [ base ];
       description = "A library to provide special kind of two-column output for Phladiprelio";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -298742,7 +300613,7 @@ self: {
         JuicyPixels
       ];
       description = "Integration between Halide and JuicyPixels";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.linux;
       hydraPlatforms = lib.platforms.none;
     }
@@ -298772,7 +300643,7 @@ self: {
         hspec
       ];
       description = "Integration between Halide and ArrayFire";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -298833,7 +300704,7 @@ self: {
         vector
       ];
       description = "Haskell bindings to Halide";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.linux;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -301808,7 +303679,7 @@ self: {
         list-tries
       ];
       description = "Support for static URL routing with overlap detection for Happstack";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -302136,7 +304007,7 @@ self: {
         Chart-diagrams
       ];
       description = "Generate simple okay-looking bar plots without much effort";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -302165,7 +304036,7 @@ self: {
       ];
       doHaddock = false;
       description = "Happy is a parser generator for Haskell implemented using this library";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -302192,7 +304063,7 @@ self: {
       ];
       doHaddock = false;
       description = "Happy is a parser generator for Haskell implemented using this library";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -302650,7 +304521,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Haskell program configuration using higher kinded data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -302879,7 +304750,7 @@ self: {
         first-class-families
       ];
       description = "Haskell array programming";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "harpie-bug-issue1";
     }
   ) { };
@@ -302918,7 +304789,7 @@ self: {
         first-class-families
       ];
       description = "Haskell array programming";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "harpie-bug-issue1";
     }
@@ -302947,7 +304818,7 @@ self: {
         prettyprinter
       ];
       description = "numhask shim for harpie";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -302974,7 +304845,7 @@ self: {
         prettyprinter
       ];
       description = "numhask shim for harpie";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -303128,7 +304999,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "This library 'Has' transformers";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
@@ -303295,7 +305166,7 @@ self: {
       sha256 = "1vgbmlcd33vky1mf9sx6dkbh8yjp7nyr4528y6qz7xn7z1lxfyyx";
       libraryHaskellDepends = [ base ];
       description = "Haskell to and from Scalameta";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -303800,7 +305671,7 @@ self: {
         temporary
       ];
       description = "Hash-addressed file storage";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -303868,7 +305739,7 @@ self: {
         unordered-containers
       ];
       description = "Hash-addressed file storage app";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hash-addressed";
     }
@@ -303978,19 +305849,19 @@ self: {
       containers,
       crypton,
       hspec,
-      memory,
       QuickCheck,
+      ram,
     }:
     mkDerivation {
       pname = "hash-tree";
-      version = "0.0.1";
-      sha256 = "0dixldpjd2mm4r9cvklg6xsh1jx3kadab8scas7g97jiq9cwilhq";
+      version = "0.1.0";
+      sha256 = "1zbsfg77ysia5grkqphzsgia1hf3yh2v0rsjq4b6r47f4w6jjl4r";
       libraryHaskellDepends = [
         base
         bytestring
         containers
         crypton
-        memory
+        ram
       ];
       testHaskellDepends = [
         base
@@ -303999,11 +305870,13 @@ self: {
         containers
         crypton
         hspec
-        memory
         QuickCheck
+        ram
       ];
       description = "Merkle Hash Tree";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -304060,7 +305933,7 @@ self: {
         unix
       ];
       description = "A class for types that can be converted to a hash value";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -304109,7 +305982,7 @@ self: {
         text
       ];
       description = "A class for types that can be converted to a hash value";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -304235,7 +306108,7 @@ self: {
         time-compat
       ];
       description = "Provides instances missing from Hashable";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -304409,7 +306282,7 @@ self: {
         vector
       ];
       description = "Hash digests for files and directories";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hasherize";
       broken = true;
@@ -304453,7 +306326,7 @@ self: {
       ];
       benchmarkSystemDepends = [ openssl ];
       description = "Hash functions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { inherit (pkgs) openssl; };
 
@@ -304757,7 +306630,7 @@ self: {
         vector
       ];
       description = "Mutable hash tables in the ST monad";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -304907,6 +306780,66 @@ self: {
     }
   ) { };
 
+  hask-redis-mux = callPackage (
+    {
+      mkDerivation,
+      attoparsec,
+      base,
+      bytestring,
+      containers,
+      crypton-x509-system,
+      data-default-class,
+      dns,
+      file-embed,
+      hspec,
+      iproute,
+      mtl,
+      network,
+      stm,
+      text,
+      time,
+      tls,
+      vector,
+    }:
+    mkDerivation {
+      pname = "hask-redis-mux";
+      version = "0.1.0.1";
+      sha256 = "0jggx311ibr9piqzk469pzklqk4742znq5vd1xq91c5z387ihj1b";
+      libraryHaskellDepends = [
+        attoparsec
+        base
+        bytestring
+        containers
+        crypton-x509-system
+        data-default-class
+        dns
+        file-embed
+        iproute
+        mtl
+        network
+        stm
+        text
+        time
+        tls
+        vector
+      ];
+      testHaskellDepends = [
+        attoparsec
+        base
+        bytestring
+        containers
+        hspec
+        stm
+        text
+        time
+        vector
+      ];
+      doHaddock = false;
+      description = "A RESP protocol implementation and multiplexed Redis client library";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   haskades = callPackage (
     {
       mkDerivation,
@@ -305856,7 +307789,7 @@ self: {
         tasty-quickcheck
       ];
       description = "A lightweight library for asynchronous job workers with multiple broker backends";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -305933,7 +307866,7 @@ self: {
         text
       ];
       description = "PostgreSQL/PGMQ broker implementation for haskell-bee";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "simple-worker";
       broken = true;
@@ -306005,7 +307938,7 @@ self: {
         unix-time
       ];
       description = "Redis broker implementation for haskell-bee";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -306071,7 +308004,7 @@ self: {
         unix-time
       ];
       description = "STM broker implementation for haskell-bee";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -306110,7 +308043,7 @@ self: {
         text
       ];
       description = "Reusable test suite for any haskell-bee Broker implementation";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -306415,7 +308348,7 @@ self: {
       ];
       doHaddock = false;
       description = "Cabal package script generator for Travis-CI";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       mainProgram = "haskell-ci";
       maintainers = [ lib.maintainers.sternenseemann ];
     }
@@ -306750,6 +308683,7 @@ self: {
       ghc,
       ghc-boot,
       ghc-boot-th,
+      ghc-experimental,
       ghc-heap,
       ghci,
       haskeline,
@@ -306777,13 +308711,14 @@ self: {
     }:
     mkDerivation {
       pname = "haskell-debugger";
-      version = "0.11.0.0";
-      sha256 = "00l8z1rnfbax7imr4syq845i8nf6kxqm3lsw75r4dinrvf94nh42";
+      version = "0.12.2.0";
+      sha256 = "16x87g1y3r5l1hbl2v23cycmcdzyihr2ha1afh47xda1grlqzd7l";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         aeson
         array
+        async
         attoparsec
         base
         base16-bytestring
@@ -306799,12 +308734,12 @@ self: {
         ghc
         ghc-boot
         ghc-boot-th
+        ghc-experimental
         ghc-heap
         ghci
         haskell-debugger-view
         hie-bios
         mtl
-        prettyprinter
         process
         text
         time
@@ -306822,6 +308757,7 @@ self: {
         exceptions
         filepath
         ghc
+        ghci
         haskeline
         hie-bios
         implicit-hie
@@ -306832,6 +308768,7 @@ self: {
         prettyprinter
         process
         text
+        time
         transformers
         unordered-containers
       ];
@@ -306858,9 +308795,10 @@ self: {
         unordered-containers
       ];
       description = "A step-through debugger for GHC Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hdb";
+      maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
 
@@ -306874,8 +308812,8 @@ self: {
     }:
     mkDerivation {
       pname = "haskell-debugger-view";
-      version = "0.2.0.0";
-      sha256 = "0wcw8kppq68gdpyyhvp1j338c0rcdrrxkd0w6sfwsq7z5nkww7cg";
+      version = "0.2.1.0";
+      sha256 = "0dwqnmjg3p6y1y0669j9q7kfy0pll1v89b9m5s88299p06sb20fv";
       libraryHaskellDepends = [
         base
         bytestring
@@ -306883,7 +308821,7 @@ self: {
         text
       ];
       description = "Custom debug visualization instances for @haskell-debugger@";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -307217,7 +309155,7 @@ self: {
         hspec-expectations
       ];
       description = "Haskell bindings for ffprobe";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -307658,7 +309596,7 @@ self: {
         vector
       ];
       description = "Auto-generated Gemini API Client for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -307804,7 +309742,7 @@ self: {
         uuid-types
       ];
       description = "Haskell port of purescript-halogen library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "halogen-core-prototype";
       broken = true;
@@ -307888,7 +309826,7 @@ self: {
         tasty-hunit
       ];
       description = "Bindings to the igraph C library (v0.8.5).";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -308274,7 +310212,7 @@ self: {
       benchmarkToolDepends = [ eventlog2html ];
       doHaddock = false;
       description = "LSP server for GHC";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -308287,7 +310225,7 @@ self: {
       sha256 = "0h8s19j2flby3qrvb93j1d2lpjl1jgin8lj6dqpb7c86h59f2xlx";
       libraryHaskellDepends = [ base ];
       description = "A fully compliant Haskell 98 lexer";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -309143,7 +311081,7 @@ self: {
         text
       ];
       description = "Haskell interface for Tembo's PGMQ PostgreSQL extension";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -310054,7 +311992,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "haskell-stack-trace-plugin";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
       broken = true;
@@ -310095,7 +312033,7 @@ self: {
         time
       ];
       description = "A simple throttling library, which drops messages from same group";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -311273,7 +313211,7 @@ self: {
         process
       ];
       description = "Rebuild Haskell dependencies in Gentoo";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       mainProgram = "haskell-updater";
     }
   ) { };
@@ -311393,7 +313331,7 @@ self: {
         base
       ];
       description = "Haskell 2020[draft] Standard Library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -312826,7 +314764,7 @@ self: {
         vector
       ];
       description = "embedded DSL for defining epidemiologic cohorts";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -313094,6 +315032,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Bitcoin & Bitcoin Cash library for Haskell";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -313243,6 +315182,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "P2P library for Bitcoin and Bitcoin Cash";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -313542,6 +315482,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Storage and index for Bitcoin and Bitcoin Cash";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "haskoin-store";
     }
   ) { };
@@ -313635,6 +315576,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Data for Haskoin Store";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -313861,6 +315803,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Lightweight CLI wallet for Bitcoin and Bitcoin Cash";
       license = lib.licenses.publicDomain;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "hw";
     }
   ) { };
@@ -314476,7 +316419,7 @@ self: {
         weigh
       ];
       description = "Haskell bindings to libtorch, supporting both typed and untyped tensors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -314531,7 +316474,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Code generation tools for Hasktorch";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ht-codegen";
       broken = true;
@@ -314561,7 +316504,7 @@ self: {
         text
       ];
       description = "Testing library for Hasktorch's FFI bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -314599,7 +316542,7 @@ self: {
         text
       ];
       description = "Bindings to Torch";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -314644,7 +316587,7 @@ self: {
         text
       ];
       description = "Bindings to Cutorch";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { ATen = null; };
@@ -314713,7 +316656,7 @@ self: {
       ];
       doHaddock = false;
       description = "Core Hasktorch abstractions wrapping FFI bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -314753,7 +316696,7 @@ self: {
       ];
       doHaddock = false;
       description = "Backpack signatures for Tensor operations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -314775,7 +316718,7 @@ self: {
         hasktorch-types-th
       ];
       description = "Functions to partially satisfy tensor signatures";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -314799,7 +316742,7 @@ self: {
       ];
       doHaddock = false;
       description = "Signatures for support tensors in hasktorch";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -314823,7 +316766,7 @@ self: {
       ];
       doHaddock = false;
       description = "Core types for Hasktorch backpack signatures";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -314846,7 +316789,7 @@ self: {
       ];
       libraryToolDepends = [ c2hs ];
       description = "C-types for Torch";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -314869,7 +316812,7 @@ self: {
       ];
       libraryToolDepends = [ c2hs ];
       description = "C-types for Cutorch";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -314922,7 +316865,7 @@ self: {
         vector
       ];
       description = "Neural architectures in hasktorch";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -314979,7 +316922,7 @@ self: {
         criterion
       ];
       description = "Haskus binary format manipulation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -315143,7 +317086,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Haskus data utility modules";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -315163,7 +317106,7 @@ self: {
         doctest
       ];
       description = "Haskus types utility modules";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -315215,7 +317158,7 @@ self: {
         QuickCheck
       ];
       description = "Variant and EADT";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -315248,7 +317191,7 @@ self: {
         text
       ];
       description = "Haskus web";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -315560,7 +317503,7 @@ self: {
         vector-sized
       ];
       description = "A monad for interfacing with external SMT solvers";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     }
   ) { };
 
@@ -315741,7 +317684,7 @@ self: {
       ];
       doHaddock = false;
       description = "An efficient PostgreSQL driver with a flexible mapping API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -315829,11 +317772,11 @@ self: {
       ];
       doHaddock = false;
       description = "Fast PostgreSQL driver with a flexible mapping API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
-  hasql_1_10_2 = callPackage (
+  hasql_1_10_3 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -315870,8 +317813,8 @@ self: {
     }:
     mkDerivation {
       pname = "hasql";
-      version = "1.10.2";
-      sha256 = "1l9la57k41v3swq7wfwrqwv07xvaawwdl0ycwhwwxgivs0smv40x";
+      version = "1.10.3";
+      sha256 = "1ir88nqpwdyv8m1xvd6j5byf0jzfq1dm05kl3fcplxh6habsjvsi";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -315931,7 +317874,7 @@ self: {
         rerebase
       ];
       description = "Fast PostgreSQL driver with a flexible mapping API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -316064,7 +318007,7 @@ self: {
         tasty-hunit
       ];
       description = "A declarative abstraction over PostgreSQL Cursor";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -316097,7 +318040,7 @@ self: {
         transformers
       ];
       description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -316178,11 +318121,11 @@ self: {
         tasty-hunit
       ];
       description = "Toolkit for constructing Hasql statements dynamically";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
-  hasql-dynamic-statements_0_5_0_1 = callPackage (
+  hasql-dynamic-statements_0_5_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -316199,8 +318142,8 @@ self: {
     }:
     mkDerivation {
       pname = "hasql-dynamic-statements";
-      version = "0.5.0.1";
-      sha256 = "13xjv3k9xykczp6rch4rvxzmxg6226grl4hfsak2322231qbc1n9";
+      version = "0.5.1";
+      sha256 = "1kc85pcz1vpxkhiqp3psc76jmgpb7pglv8k2bipg9x5ijfnl95lp";
       libraryHaskellDepends = [
         base
         bytestring
@@ -316218,7 +318161,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Hasql extension for dynamic construction of statements";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -316257,7 +318200,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Effectful bindings for hasql";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hasql-effectful-example";
       broken = true;
@@ -316297,7 +318240,59 @@ self: {
         tasty-hunit
       ];
       description = "Hasql queries testing interface";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
+  hasql-generate = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      data-default-class,
+      hasql,
+      postgresql-libpq,
+      scientific,
+      template-haskell,
+      text,
+      time,
+      uuid,
+      vector,
+    }:
+    mkDerivation {
+      pname = "hasql-generate";
+      version = "1.1.0";
+      sha256 = "0ylfryjm38rx6rn2s1qx88j22l9ssik3mvjqnvpxqd0z3j3zjayg";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        data-default-class
+        hasql
+        postgresql-libpq
+        scientific
+        template-haskell
+        text
+        time
+        uuid
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        data-default-class
+        hasql
+        scientific
+        text
+        time
+        uuid
+      ];
+      description = "Compile-time PostgreSQL data generation for hasql";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -316381,7 +318376,7 @@ self: {
         vector
       ];
       description = "Implicit definitions for Hasql, such as default codecs for standard types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -316419,7 +318414,7 @@ self: {
         vector
       ];
       description = "Implicit definitions for Hasql, such as default codecs for standard types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -316482,7 +318477,7 @@ self: {
         tmp-postgres
       ];
       description = "QuasiQuoter that supports expression interpolation for hasql";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -316511,7 +318506,42 @@ self: {
         text
       ];
       description = "LISTEN/NOTIFY with hasql";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  hasql-mapping = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      hasql,
+      iproute,
+      scientific,
+      text,
+      time,
+      uuid,
+    }:
+    mkDerivation {
+      pname = "hasql-mapping";
+      version = "0.1";
+      sha256 = "1jppr5z54ca79smjyrk031swgxivz4mnhrli31x33fkyidi0xm8j";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        hasql
+        iproute
+        scientific
+        text
+        time
+        uuid
+      ];
+      description = "SDK for defining modular mappings to databases on top of Hasql";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -316601,7 +318631,7 @@ self: {
         transformers
       ];
       description = "Hasql migrations library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -316769,7 +318799,7 @@ self: {
         time
       ];
       description = "\"optparse-applicative\" parsers for \"hasql\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -316802,7 +318832,7 @@ self: {
         time
       ];
       description = "\"optparse-applicative\" parsers for \"hasql\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -316872,7 +318902,7 @@ self: {
         rerebase
       ];
       description = "Pool of connections for Hasql";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -316921,11 +318951,11 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Pool of connections for Hasql";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
-  hasql-pool_1_4_1 = callPackage (
+  hasql-pool_1_4_2 = callPackage (
     {
       mkDerivation,
       async,
@@ -316947,8 +318977,8 @@ self: {
     }:
     mkDerivation {
       pname = "hasql-pool";
-      version = "1.4.1";
-      sha256 = "1vkb8zz0dx92p5x1scb9i9i42v699lcq97b6q0jzh1sx09slfxr0";
+      version = "1.4.2";
+      sha256 = "0w1hwyyv4pilb9gn5kzvh0nl6aq1i97y68wzxpapba3cmrsad0zd";
       libraryHaskellDepends = [
         base
         bytestring
@@ -316971,7 +319001,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Pool of connections for Hasql";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -317123,6 +319153,8 @@ self: {
       mkDerivation,
       base,
       hasql,
+      hasql-mapping,
+      postgresql-types,
       postgresql-types-algebra,
       ptr-peeker,
       ptr-poker,
@@ -317131,11 +319163,13 @@ self: {
     }:
     mkDerivation {
       pname = "hasql-postgresql-types";
-      version = "0.1.0.1";
-      sha256 = "0x1vdfqm1mg640cvsa6m4i37nnrrs6l5p076hx4gbmzjcv30xv21";
+      version = "0.2";
+      sha256 = "10yh2mlr97w7s7gz63g5mzgcnrbadkzv59xfs99hf0rs0syckm2l";
       libraryHaskellDepends = [
         base
         hasql
+        hasql-mapping
+        postgresql-types
         postgresql-types-algebra
         ptr-peeker
         ptr-poker
@@ -317143,7 +319177,7 @@ self: {
         text-builder
       ];
       description = "Integration of \"hasql\" with \"postgresql-types\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -317278,7 +319312,7 @@ self: {
         hspec
       ];
       description = "A pool of connections for Hasql based on resource-pool";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317342,7 +319376,7 @@ self: {
         transformers
       ];
       description = "Stream Hasql queries with Conduit";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317365,7 +319399,7 @@ self: {
         hasql-transaction-io
       ];
       description = "Stream Hasql queries";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -317423,7 +319457,7 @@ self: {
         unliftio-core
       ];
       description = "An example program that shows how to use Hasql streams with Rel8";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hasql-streaming";
     }
@@ -317452,7 +319486,7 @@ self: {
         transformers
       ];
       description = "Stream Hasql queries with Pipes";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317481,7 +319515,7 @@ self: {
         transformers
       ];
       description = "Stream Hasql queries with Streaming";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317510,7 +319544,7 @@ self: {
         transformers
       ];
       description = "Stream Hasql queries with Streamly";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317551,7 +319585,7 @@ self: {
         vector
       ];
       description = "Template Haskell utilities for Hasql";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -317588,7 +319622,7 @@ self: {
         vector
       ];
       description = "Template Haskell utilities for Hasql";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -317665,7 +319699,7 @@ self: {
         rerebase
       ];
       description = "Composable abstraction over retryable transactions for Hasql";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -317703,7 +319737,7 @@ self: {
         rerebase
       ];
       description = "Composable abstraction over retryable transactions for Hasql";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -317739,7 +319773,7 @@ self: {
         unliftio-core
       ];
       description = "Perform IO actions during transactions for Hasql";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317774,7 +319808,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Parse PostgreSQL connection URI into Hasql.Connection Settings";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -318522,7 +320556,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "Manipulates network blocks in CIDR notation";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       mainProgram = "hath";
     }
   ) { };
@@ -318694,7 +320728,7 @@ self: {
         text
       ];
       description = "Library for checking for weak/compromised passwords";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "readme";
     }
   ) { };
@@ -319388,7 +321422,7 @@ self: {
         mmap
       ];
       description = "A command line tool to compute BLAKE3 hashes";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       platforms = lib.platforms.x86;
       mainProgram = "hb3sum";
     }
@@ -319857,7 +321891,7 @@ self: {
         hspec
       ];
       description = "Blosc (numerical compression library) bindings for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -320187,7 +322221,7 @@ self: {
         witherable
       ];
       description = "2d Delaunay triangulation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -320694,7 +322728,7 @@ self: {
         string-interpolate
       ];
       description = "Haskell artifact name counts";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hcount";
       broken = true;
@@ -322047,7 +324081,7 @@ self: {
         selective
       ];
       description = "More informative parser";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -322177,7 +324211,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "License Header Manager";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "headroom";
     }
   ) { };
@@ -322238,7 +324272,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "interactively inspect Haskell values at runtime";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -322827,7 +324861,7 @@ self: {
       sha256 = "00lnlv0hwlsq5y5r0b2y0v18l7kcwbfn8w5gnphrw3rihdp70ik8";
       libraryHaskellDepends = [ base ];
       description = "Abstract unit test interface";
-      license = lib.licensesSpdx."0BSD";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
     }
   ) { };
 
@@ -322977,7 +325011,7 @@ self: {
         microlens
       ];
       description = "Reddit API bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -323253,7 +325287,7 @@ self: {
         vector
       ];
       description = "Hedgehog will eat your typeclass bugs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -323363,7 +325397,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Supplemental library for hedgehog";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -323413,8 +325447,8 @@ self: {
       pname = "hedgehog-fn";
       version = "1.0";
       sha256 = "05drd7jsz54kgwxr5z9vifmql6xif7ma7878qddw2nss5s6wa2qp";
-      revision = "4";
-      editedCabalFile = "1hsykw437b402bkbys1ajr6w1g0s3a1hsbp0k0207hrclrbf1s95";
+      revision = "5";
+      editedCabalFile = "0d0vs3f7d81jvaf3may90fdj36bss4n817ww04483w2q6wcw99bz";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -323449,7 +325483,7 @@ self: {
         typerep-map
       ];
       description = "Customizable Gen for ADT using Generics";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -323542,7 +325576,7 @@ self: {
         hedgehog
       ];
       description = "GHC Generics automatically derived hedgehog generators";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -323584,7 +325618,7 @@ self: {
         hedgehog
       ];
       description = "Golden testing capabilities for hedgehog using Aeson";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -323607,7 +325641,7 @@ self: {
         lens
       ];
       description = "Hedgehog properties for lens laws";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -323630,7 +325664,7 @@ self: {
         optics-core
       ];
       description = "Hedgehog properties for optics laws";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -323847,7 +325881,7 @@ self: {
         hedis
       ];
       description = "Adaptation of the hedis library for the effectful ecosystem";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -323871,7 +325905,7 @@ self: {
         scientific
         time
       ];
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -324197,7 +326231,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "higher-order algebraic effects done right";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -324299,7 +326333,7 @@ self: {
         unliftio
       ];
       description = "higher-order algebraic effects done right";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -324341,7 +326375,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Fast equality saturation in Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -324590,7 +326624,7 @@ self: {
         xmlhtml
       ];
       description = "An Haskell template system supporting both HTML5 and XML";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -324834,7 +326868,7 @@ self: {
         xmlhtml
       ];
       description = "Extra heist functionality";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -324981,7 +327015,7 @@ self: {
         zeugma
       ];
       description = "Clipboard Manager";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hel";
     }
@@ -325264,6 +327298,8 @@ self: {
       bytestring,
       constraints,
       containers,
+      criterion,
+      criterion-measurement,
       directory,
       ghc-prim,
       haskell-src-exts,
@@ -325278,14 +327314,16 @@ self: {
       text,
       th-lift,
       th-orphans,
+      these,
+      time,
       typed-process,
       unliftio,
       vector,
     }:
     mkDerivation {
       pname = "hell";
-      version = "666.20250113";
-      sha256 = "0fbzsl8qmsfdnl05xf3j133dngiidsfkc31lv9y28b04slgqbga1";
+      version = "666.20251111";
+      sha256 = "03plj98kjaafd79w64fdka2hva133p1jlx85as86d101mn4mzwg9";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -325295,6 +327333,8 @@ self: {
         bytestring
         constraints
         containers
+        criterion
+        criterion-measurement
         directory
         ghc-prim
         haskell-src-exts
@@ -325309,15 +327349,44 @@ self: {
         text
         th-lift
         th-orphans
+        these
+        time
+        typed-process
+        unliftio
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        constraints
+        containers
+        criterion
+        criterion-measurement
+        directory
+        ghc-prim
+        haskell-src-exts
+        hspec
+        lucid2
+        mtl
+        optparse-applicative
+        QuickCheck
+        syb
+        template-haskell
+        temporary
+        text
+        th-lift
+        th-orphans
+        these
+        time
         typed-process
         unliftio
         vector
       ];
       description = "Haskell-based shell scripting language";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "hell";
-      broken = true;
     }
   ) { };
 
@@ -325785,8 +327854,8 @@ self: {
     }:
     mkDerivation {
       pname = "henforcer";
-      version = "1.0.0.0";
-      sha256 = "1mlavim9qvpxxadswx5nfkjb8qwrvs8jpx05h3hxm99baj4pa7bc";
+      version = "1.0.0.1";
+      sha256 = "1shv4nzn1s586bfvmv0vv2z6agqfj9cswip5ycqaw669hbj8a4nc";
       libraryHaskellDepends = [
         base
         containers
@@ -325807,7 +327876,7 @@ self: {
       ];
       doHaddock = false;
       description = "GHC plugin to enforce user specified rules on code";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -325835,6 +327904,63 @@ self: {
     }
   ) { };
 
+  heph-aligned-storable = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      half,
+      hashable,
+      hedgehog,
+      lifted-base,
+      linear,
+      monad-control,
+      tasty,
+      tasty-discover,
+      tasty-hedgehog,
+      tasty-hunit,
+      tasty-inspection-testing,
+      unliftio,
+      vector,
+      vector-sized,
+    }:
+    mkDerivation {
+      pname = "heph-aligned-storable";
+      version = "0.1.0.0";
+      sha256 = "1hghhx9j0w6v893vxvh16khsc7yyk891xz0xklzqaj10a72pydk5";
+      libraryHaskellDepends = [
+        base
+        half
+        hashable
+        linear
+        unliftio
+        vector
+        vector-sized
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        half
+        hashable
+        hedgehog
+        lifted-base
+        linear
+        monad-control
+        tasty
+        tasty-discover
+        tasty-hedgehog
+        tasty-hunit
+        tasty-inspection-testing
+        unliftio
+        vector
+        vector-sized
+      ];
+      testToolDepends = [ tasty-discover ];
+      description = "Generically derive Storable instances suitable for CPU-GPU transfer";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   heph-sparse-set = callPackage (
     {
       mkDerivation,
@@ -325888,7 +328014,7 @@ self: {
         vector
       ];
       description = "Really fast mutable sparse sets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -325929,7 +328055,7 @@ self: {
         uuid
       ];
       description = "Generate UUIDv7 values";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -326014,7 +328140,7 @@ self: {
         QuickCheck
       ];
       description = "Accessible format for structured data serialization";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       mainProgram = "herb-format";
     }
   ) { };
@@ -326307,7 +328433,7 @@ self: {
           ];
           testToolDepends = [ hspec-discover ];
           description = "Runs Continuous Integration tasks on your machines";
-          license = lib.licensesSpdx."Apache-2.0";
+          license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
           maintainers = [ lib.maintainers.roberth ];
         }
       )
@@ -326439,7 +328565,7 @@ self: {
         vector
       ];
       description = "Hercules CI API definition with Servant";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "hercules-gen-swagger";
       maintainers = [ lib.maintainers.roberth ];
     }
@@ -326830,7 +328956,7 @@ self: {
           ];
           testToolDepends = [ hspec-discover ];
           description = "Bindings for the Nix evaluator";
-          license = lib.licensesSpdx."Apache-2.0";
+          license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
           maintainers = [ lib.maintainers.roberth ];
         }
       )
@@ -326903,7 +329029,7 @@ self: {
           ];
           testToolDepends = [ hspec-discover ];
           description = "Haskell bindings for Nix's libstore";
-          license = lib.licensesSpdx."Apache-2.0";
+          license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
           maintainers = [ lib.maintainers.roberth ];
         }
       )
@@ -327026,7 +329152,7 @@ self: {
         text
       ];
       description = "Heredocument on Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -327116,7 +329242,7 @@ self: {
         vector
       ];
       description = "Fast JSON decoding via simdjson C++ bindings";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -327711,7 +329837,7 @@ self: {
         infinite-list
       ];
       description = "Zip lists with Traversables";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -327784,7 +329910,7 @@ self: {
         stm
       ];
       description = "Comparison of distinctly typed values with evidence capture";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -328156,7 +330282,7 @@ self: {
           ];
           doHaddock = false;
           description = "Symbolic EVM Evaluator";
-          license = lib.licensesSpdx."AGPL-3.0-only";
+          license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
           mainProgram = "hevm";
           maintainers = [ lib.maintainers.arturcygan ];
         }
@@ -328277,7 +330403,7 @@ self: {
         text
       ];
       description = "ByteString-Text hexidecimal conversions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -328442,7 +330568,7 @@ self: {
         wreq
       ];
       description = "Lenses for the hexml package";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -328943,7 +331069,7 @@ self: {
         text
       ];
       description = "Streaming-friendly XML parsers";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -329507,7 +331633,7 @@ self: {
         text
       ];
       description = "File/folder watching for OS X";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.darwin;
     }
   ) { };
@@ -329664,7 +331790,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ gdal ];
       description = "Haskell binding to the GDAL library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) gdal; };
 
@@ -329914,7 +332040,7 @@ self: {
         vinyl
       ];
       description = "Geometric Algorithms, Data structures, and Data types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -330145,7 +332271,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Reading and Writing ipe7 files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -330245,14 +332371,13 @@ self: {
     }:
     mkDerivation {
       pname = "hgettext";
-      version = "0.1.40.2";
-      sha256 = "0jva2l263491idbx40118p7hrfky5iz19k1y0z7ci0i0hbqfv2ry";
+      version = "0.1.40.3";
+      sha256 = "1qcw60pdi3b37cc8j1gp5q6mi4qx9bgsxhhaxr5w29s9l7dnq8mf";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
         Cabal
-        containers
         directory
         filepath
         process
@@ -330260,12 +332385,10 @@ self: {
       ];
       executableHaskellDepends = [
         base
-        Cabal
         containers
         cpphs
         deepseq
         extra
-        filepath
         haskell-src-exts
         split
         uniplate
@@ -330571,7 +332694,7 @@ self: {
         network
       ];
       description = "Haskell module to interact with the greetd daemon trough it's IPC protocol";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -331395,7 +333518,103 @@ self: {
         yaml
       ];
       description = "Set up a GHC API session";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "hie-bios";
+    }
+  ) { };
+
+  hie-bios_0_18_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      base16-bytestring,
+      bytestring,
+      co-log-core,
+      conduit,
+      conduit-extra,
+      cryptohash-sha1,
+      deepseq,
+      directory,
+      exceptions,
+      extra,
+      file-embed,
+      filepath,
+      ghc,
+      optparse-applicative,
+      prettyprinter,
+      tasty,
+      tasty-expected-failure,
+      tasty-hunit,
+      template-haskell,
+      temporary,
+      text,
+      time,
+      transformers,
+      unix-compat,
+      unordered-containers,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "hie-bios";
+      version = "0.18.0";
+      sha256 = "0bzav8ppm7mfy01d8vin67ik5jb6zld06716zy0i32c2fys6wack";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        base16-bytestring
+        bytestring
+        co-log-core
+        conduit
+        conduit-extra
+        cryptohash-sha1
+        deepseq
+        directory
+        exceptions
+        extra
+        file-embed
+        filepath
+        ghc
+        prettyprinter
+        template-haskell
+        temporary
+        text
+        time
+        transformers
+        unix-compat
+        unordered-containers
+        yaml
+      ];
+      executableHaskellDepends = [
+        base
+        co-log-core
+        directory
+        filepath
+        optparse-applicative
+        prettyprinter
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        co-log-core
+        directory
+        extra
+        filepath
+        ghc
+        prettyprinter
+        tasty
+        tasty-expected-failure
+        tasty-hunit
+        temporary
+        text
+        transformers
+        yaml
+      ];
+      description = "Set up a GHC API session";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "hie-bios";
     }
   ) { };
@@ -331621,7 +333840,7 @@ self: {
         temporary
       ];
       description = "Generates a references DB from .hie files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "hiedb";
     }
   ) { };
@@ -331691,7 +333910,7 @@ self: {
         temporary
       ];
       description = "Generates a references DB from .hie files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hiedb";
     }
@@ -331859,7 +334078,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "hierarchical environments for dependency injection";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -332148,7 +334367,7 @@ self: {
       ];
       testToolDepends = [ markdown-unlit ];
       description = "Partial types as a type constructor";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332258,7 +334477,7 @@ self: {
         ftcqueue
       ];
       description = "This package is used by package yaftee";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -332281,7 +334500,7 @@ self: {
         freer-base-classes
       ];
       description = "This package is used by package yaftee";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -332721,7 +334940,7 @@ self: {
         utility-ht
       ];
       description = "Linear Programming using HiGHS and comfort-array";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) highs; };
 
@@ -332760,7 +334979,7 @@ self: {
         text
       ];
       description = "Haskell wrapper for Pikchr, a PIC-like markup language for diagrams";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hikchr";
       broken = true;
@@ -332900,7 +335119,7 @@ self: {
       ];
       testToolDepends = [ hlint ];
       description = "A standard library for Haskell as an alternative to rio";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -333513,7 +335732,7 @@ self: {
         quickcheck-text
       ];
       description = "Generic project initialization tool";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "hi";
       maintainers = [ lib.maintainers.poscat ];
     }
@@ -333743,10 +335962,8 @@ self: {
     }:
     mkDerivation {
       pname = "hint";
-      version = "0.9.0.8";
-      sha256 = "19xvi3g35983vhvq467d8gxx23zq7zbd4d6awh2ijb84vgbff7zf";
-      revision = "2";
-      editedCabalFile = "0d89mkqxknwd0aq6zh64hqjvvdkwax7qn6jiv6a2np1gr6d89w4w";
+      version = "0.9.0.9";
+      sha256 = "12wjmmldwkz97in7ymmnar5sbl56f36ljz0z7p9xxc5889bw61kw";
       libraryHaskellDepends = [
         base
         containers
@@ -333798,7 +336015,7 @@ self: {
         relude
       ];
       description = "Helper for using hint with Nix package databases";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -334079,8 +336296,6 @@ self: {
       ];
       description = "Haskell Image Processing (HIP) Library";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -335022,7 +337237,7 @@ self: {
         text
       ];
       description = "Haskell Git Helper Tool";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hit";
       broken = true;
@@ -335138,7 +337353,7 @@ self: {
       ];
       doHaddock = false;
       description = "Haskell/Nix development build tools";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hix";
       broken = true;
@@ -336259,7 +338474,7 @@ self: {
         wizards
       ];
       description = "Command-line interface for the hledger accounting system";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       mainProgram = "hledger";
       maintainers = [
         lib.maintainers.maralorn
@@ -336789,7 +339004,7 @@ self: {
         utf8-string
       ];
       description = "A library providing the core functionality of hledger";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
     }
   ) { };
 
@@ -336991,7 +339206,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Terminal interface for the hledger accounting system";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       mainProgram = "hledger-ui";
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -337146,7 +339361,7 @@ self: {
       executableHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Web user interface for the hledger accounting system";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       mainProgram = "hledger-web";
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -337568,7 +339783,7 @@ self: {
         containers
       ];
       description = "GHC plugin for hlint";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -337874,7 +340089,7 @@ self: {
         text
       ];
       description = "Provide Alternate Number Formats plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -337887,7 +340102,7 @@ self: {
       version = "1.1.0.0";
       sha256 = "11hnkbpg13zvnq69svm46zm5k55yshgz97kjjx1g3jcb9ah1brm1";
       description = "Integration with the Brittany code formatter";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     }
   ) { };
 
@@ -337931,7 +340146,7 @@ self: {
         hls-test-utils
       ];
       description = "Integration with the cabal-fmt code formatter";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338010,7 +340225,7 @@ self: {
         transformers
       ];
       description = "Cabal integration plugin with Haskell Language Server";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338068,7 +340283,7 @@ self: {
         text
       ];
       description = "Call hierarchy plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -338117,7 +340332,7 @@ self: {
         text
       ];
       description = "Change a declarations type signature with a Code Action";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338130,7 +340345,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "0jib2y256fb5b8wgsi9rjsdb3ywwpcbcnbbxmg6q3gwnglrdb1lx";
       description = "Class/instance management plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -338196,7 +340411,7 @@ self: {
         vector
       ];
       description = "HLS Plugin to support smart selection range and Folding range";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338293,7 +340508,7 @@ self: {
         text
       ];
       description = "Eval plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338332,7 +340547,7 @@ self: {
         transformers
       ];
       description = "Common utilities to interaction between ghc-exactprint and HLS plugins";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -338378,7 +340593,7 @@ self: {
         text
       ];
       description = "Show fixity explicitly while hovering";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338438,7 +340653,7 @@ self: {
         text
       ];
       description = "Explicit imports plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338493,7 +340708,7 @@ self: {
         text
       ];
       description = "Explicit record fields plugin for Haskell Language Server";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338506,7 +340721,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "1wyk88lynchhzriqj7m9ph0s2c2ivkqg1nmhgb1knkvp8ag27iik";
       description = "Integration with the Floskell code formatter";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -338561,7 +340776,7 @@ self: {
       ];
       testToolDepends = [ fourmolu ];
       description = "Integration with the Fourmolu code formatter";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338574,7 +340789,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "0aa602m024s3ch23np2iixmkwv6474va20bjdgiwdgc8vahg4grg";
       description = "Convert to GADT syntax plugin";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -338652,7 +340867,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell Language Server internal graph API";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -338663,7 +340878,7 @@ self: {
       version = "2.2.0.0";
       sha256 = "0wp8hk5hwl43z5mjcas332z92y3zv9g8wrc5zhzli8pa37ab6r8x";
       description = "Haddock comments plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -338674,7 +340889,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "0ix89wp8nq3iywh6d3w8j7lnfm2g3l9gks8sxkww0z0mfhfxvywc";
       description = "Hlint integration plugin with Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -338717,7 +340932,7 @@ self: {
         hls-test-utils
       ];
       description = "Module name plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338778,7 +340993,7 @@ self: {
       ];
       testToolDepends = [ ormolu ];
       description = "Integration with the Ormolu code formatter";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338840,7 +341055,7 @@ self: {
         text
       ];
       description = "Overloaded record dot plugin for Haskell Language Server";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -338953,7 +341168,7 @@ self: {
         random-fu
       ];
       description = "Haskell Language Server API for plugin communication";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -339005,7 +341220,7 @@ self: {
         text
       ];
       description = "Pragmas plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -339058,7 +341273,7 @@ self: {
         text
       ];
       description = "A Haskell Language Server plugin that qualifies imported names";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -339071,7 +341286,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "0lqy7c3vqn832gs9z86n4clsqb6g73rhnlrvn3sg3h8hkxasfzjf";
       description = "Exactprint refactorings for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -339118,7 +341333,7 @@ self: {
         text
       ];
       description = "Refine imports plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -339131,7 +341346,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "15gjh7r9cc43yz1zp52q349fag4nxv25vhzn5pdma4ch366xyr4g";
       description = "Rename plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -339142,7 +341357,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "11cl4q79jxl73s62ccdarp1570k95picgn3q8lgnqznc6ywdv3zh";
       description = "Retrie integration plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -339197,7 +341412,7 @@ self: {
         text
       ];
       description = "HLS Plugin to support smart selection range";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -339282,7 +341497,7 @@ self: {
         text-rope
       ];
       description = "Call hierarchy plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -339294,7 +341509,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "00fx8rxdnmam0672vb0az2lw5inqyc22cjfrh8wiwx36i28r8zqj";
       description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -339305,7 +341520,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "1zhw2ysf5ccsrz1vahff6hr683b581v4py2pyf9xfnjfay5gl0id";
       description = "Stan integration plugin with Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -339316,7 +341531,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "171068mmb7sdk14s5v794jc0n0mrrq8fkzp2z2wlrmk38mqi3773";
       description = "Integration with the Stylish Haskell code formatter";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -339327,7 +341542,7 @@ self: {
       version = "2.2.0.0";
       sha256 = "05rgapkpr3giln245aswlcgwqpfglifsjq1n8sgwgi04bn2w6vng";
       description = "Wingman plugin for Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -339392,7 +341607,7 @@ self: {
         text-rope
       ];
       description = "Utilities used in the tests of Haskell Language Server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -339876,7 +342091,7 @@ self: {
       mkDerivation,
       base,
       hmatrix,
-      QuadProgpp,
+      quadprogpp,
       vector,
     }:
     mkDerivation {
@@ -339888,11 +342103,11 @@ self: {
         hmatrix
         vector
       ];
-      librarySystemDepends = [ QuadProgpp ];
+      librarySystemDepends = [ quadprogpp ];
       description = "Bindings to the QuadProg++ quadratic programming library";
       license = lib.licenses.bsd3;
     }
-  ) { inherit (pkgs) QuadProgpp; };
+  ) { inherit (pkgs) quadprogpp; };
 
   hmatrix-repa = callPackage (
     {
@@ -340593,7 +342808,7 @@ self: {
       ];
       doHaddock = false;
       description = "Hidden Markov Models using LAPACK primitives";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -340687,7 +342902,7 @@ self: {
       ];
       executableSystemDepends = [ ncurses ];
       description = "A 2019 fork of an ncurses mp3 player written in Haskell";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       mainProgram = "hmp3";
     }
   ) { inherit (pkgs) ncurses; };
@@ -340706,7 +342921,7 @@ self: {
       libraryHaskellDepends = [ base ];
       librarySystemDepends = [ mpfr ];
       description = "Haskell binding to the MPFR library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) mpfr; };
 
@@ -340768,7 +342983,7 @@ self: {
         time
       ];
       description = "Haskell Music Theory";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     }
   ) { };
 
@@ -340814,7 +343029,7 @@ self: {
         time
       ];
       description = "Haskell Music Theory Base";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     }
   ) { };
 
@@ -341157,7 +343372,7 @@ self: {
         time
       ];
       description = "Haskell implementation of the Nix language";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "hnix";
       maintainers = [
         lib.maintainers.Anton-Latukha
@@ -341259,7 +343474,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Core effects for interacting with the Nix store";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       maintainers = [
         lib.maintainers.Anton-Latukha
         lib.maintainers.sorki
@@ -341341,7 +343556,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Core types used for interacting with the Nix store";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       maintainers = [
         lib.maintainers.Anton-Latukha
@@ -341396,7 +343611,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Nix store database support";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -341438,7 +343653,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "JSON serialization for core types";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -341511,7 +343726,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "NAR file format";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -341555,7 +343770,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Read-only Nix store";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -341598,7 +343813,7 @@ self: {
         unordered-containers
       ];
       description = "Remote hnix store";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       maintainers = [
         lib.maintainers.Anton-Latukha
         lib.maintainers.sorki
@@ -341690,7 +343905,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Remote hnix store";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       maintainers = [
         lib.maintainers.Anton-Latukha
@@ -341748,7 +343963,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Test utilities and instances";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -341977,8 +344192,8 @@ self: {
     }:
     mkDerivation {
       pname = "ho-rewriting";
-      version = "0.2.1";
-      sha256 = "1hnbsgbrynng5zhi2p6794g70h99rdx1bcnqwvk4ibzfk8snd09x";
+      version = "0.3";
+      sha256 = "0qwjza7fxilk011y9fjb8mzv3xcccprv6lxf4lpcsf4miwjcy0sj";
       libraryHaskellDepends = [
         base
         compdata
@@ -342017,7 +344232,7 @@ self: {
         stm
       ];
       description = "Simple tools for communicating sequential processes";
-      license = lib.licensesSpdx."Zlib";
+      license = lib.meta.getLicenseFromSpdxId "Zlib";
     }
   ) { };
 
@@ -342123,7 +344338,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell OAuth2 authentication client";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -342185,7 +344400,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell OAuth2 authentication client";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -342244,7 +344459,7 @@ self: {
         warp
       ];
       description = "hoauth2 demo application";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hoauth2-demo";
       broken = true;
@@ -342303,7 +344518,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "OAuth2 Identity Providers";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -342345,7 +344560,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "tutorial for hoauth2-providers module";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hoauth2-providers-tutorial";
       broken = true;
@@ -342387,7 +344602,7 @@ self: {
         uri-bytestring
       ];
       description = "Tutorial for using hoauth2";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -342583,7 +344798,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "OpenOCD Haskell interface";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "hocd-read-mem";
     }
   ) { };
@@ -342839,6 +345054,8 @@ self: {
       pname = "hodatime";
       version = "0.2.1.1";
       sha256 = "1172y9x52vkr5965iqfpgdl7s02dgywpa5b87mhm8nkcy8819fkv";
+      revision = "1";
+      editedCabalFile = "0hamb8r902d73pgqcs58rw8blh11md0xccb5rakmsvka35n1d384";
       libraryHaskellDepends = [
         base
         binary
@@ -343342,7 +345559,7 @@ self: {
         time
       ];
       description = "Library for country public holidays";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -343405,7 +345622,7 @@ self: {
         tasty-discover
       ];
       description = "Tools and combinators for solving constraint problems";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -343579,7 +345796,7 @@ self: {
         text
       ];
       description = "Client library for the Home Assistant API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ha-client";
     }
   ) { };
@@ -343711,7 +345928,7 @@ self: {
         single-tuple
       ];
       description = "Homotuple, all whose elements are the same type";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -344913,8 +347130,8 @@ self: {
       pname = "hookup";
       version = "0.8";
       sha256 = "1p8mkb71bbs3lv7n1krcngaskn2s2icm3sl30qs8dsla7ww8afqm";
-      revision = "1";
-      editedCabalFile = "0z9q3y8zfnjz3snrzkqva1nl81l0v98zl542blayxhyhzkxb980i";
+      revision = "2";
+      editedCabalFile = "0nai8vzcrgcwdn8ca8p0rs5pg2d1nlc8v44r5mf9xp9l0wjaq2ab";
       libraryHaskellDepends = [
         async
         attoparsec
@@ -344926,7 +347143,7 @@ self: {
         stm
       ];
       description = "Abstraction over creating network connections with SOCKS5 and TLS";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -345248,7 +347465,7 @@ self: {
         happy
       ];
       description = "hOpenPGP-based command-line tools";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -345817,7 +348034,7 @@ self: {
       ];
       doHaddock = false;
       description = "Higher Order Reverse Derivatives Efficiently - Automatic Differentiation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -345899,7 +348116,7 @@ self: {
         sydtest
       ];
       description = "Generate nix expressions from horizon-spec definitions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -345932,7 +348149,7 @@ self: {
         th-lift
       ];
       description = "Horizon Stable Package Set Type Definitions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -345955,7 +348172,7 @@ self: {
         lens
       ];
       description = "Horizon Stable Package Set Lenses";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -345988,7 +348205,7 @@ self: {
         text
       ];
       description = "Horizon Stable Package Set Pretty Printer";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -346030,7 +348247,7 @@ self: {
         tasty-hunit
       ];
       description = "horizontal rule for the terminal";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "hr";
     }
   ) { };
@@ -346105,7 +348322,7 @@ self: {
         transformers
       ];
       description = "Haskell Open Sound Control";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     }
   ) { };
 
@@ -346228,7 +348445,7 @@ self: {
         text
       ];
       description = "Network Host Addresses";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -346388,7 +348605,6 @@ self: {
         unordered-containers
       ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "hotel";
     }
   ) { };
@@ -347057,6 +349273,8 @@ self: {
       pname = "hpack";
       version = "0.39.1";
       sha256 = "1brb4cw8746djnaisc6qjsphdylbyc8z7ym9hzzpxqqj0frx9hlr";
+      revision = "1";
+      editedCabalFile = "1z7qrcfimfjannf1s89p8ff4ri34b2ycmrd63cvqla2x3rbbq2q2";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -347150,6 +349368,143 @@ self: {
     }
   ) { };
 
+  hpack_0_39_3 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bifunctors,
+      bytestring,
+      Cabal,
+      containers,
+      cryptohash-sha256,
+      crypton,
+      deepseq,
+      directory,
+      filepath,
+      Glob,
+      hspec,
+      hspec-discover,
+      http-client,
+      http-client-tls,
+      http-types,
+      HUnit,
+      infer-license,
+      interpolate,
+      mockery,
+      mtl,
+      pretty,
+      QuickCheck,
+      scientific,
+      template-haskell,
+      temporary,
+      text,
+      transformers,
+      unordered-containers,
+      vcr,
+      vector,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "hpack";
+      version = "0.39.3";
+      sha256 = "1cisz24831wndv403b0yxvgavisn3z4m7vw5yq7g66aj8c01bibm";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bifunctors
+        bytestring
+        Cabal
+        containers
+        cryptohash-sha256
+        crypton
+        deepseq
+        directory
+        filepath
+        Glob
+        http-client
+        http-client-tls
+        http-types
+        infer-license
+        mtl
+        pretty
+        scientific
+        text
+        transformers
+        unordered-containers
+        vector
+        yaml
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        bifunctors
+        bytestring
+        Cabal
+        containers
+        cryptohash-sha256
+        crypton
+        deepseq
+        directory
+        filepath
+        Glob
+        http-client
+        http-client-tls
+        http-types
+        infer-license
+        mtl
+        pretty
+        scientific
+        text
+        transformers
+        unordered-containers
+        vector
+        yaml
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bifunctors
+        bytestring
+        Cabal
+        containers
+        cryptohash-sha256
+        crypton
+        deepseq
+        directory
+        filepath
+        Glob
+        hspec
+        http-client
+        http-client-tls
+        http-types
+        HUnit
+        infer-license
+        interpolate
+        mockery
+        mtl
+        pretty
+        QuickCheck
+        scientific
+        template-haskell
+        temporary
+        text
+        transformers
+        unordered-containers
+        vcr
+        vector
+        yaml
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "A modern format for Haskell packages";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "hpack";
+    }
+  ) { };
+
   hpack-convert = callPackage (
     {
       mkDerivation,
@@ -347830,7 +350185,7 @@ self: {
         time
       ];
       description = "Code Coverage Library for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -347853,8 +350208,8 @@ self: {
     }:
     mkDerivation {
       pname = "hpc-codecov";
-      version = "0.6.3.0";
-      sha256 = "0ilra8ijfsk4jrh7v36g9qq22s2rs0w4islg88wcd66m95ff1djq";
+      version = "0.6.4.0";
+      sha256 = "03lcsklcsv8zqmjxvw4zy6ikqqxz8zl988llgvkhydl7zfdnyp7w";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -348170,7 +350525,7 @@ self: {
         utf8-string
       ];
       description = "A tool for looking through PDF file using Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hpdft";
       broken = true;
@@ -348293,6 +350648,8 @@ self: {
       pname = "hpke";
       version = "0.0.0";
       sha256 = "0g5q37gj5aqb35zp84fb0p706g1zvyrhrjy4ajmvx0bh9zxps2vv";
+      revision = "1";
+      editedCabalFile = "0k9n2q6kxjaq7zlcx8ysrqvsymzlvl2pxnyrkbnqb4yvkkmzakyh";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -348313,6 +350670,43 @@ self: {
     }
   ) { };
 
+  hpke_0_1_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      base16-bytestring,
+      bytestring,
+      crypton,
+      hspec,
+      hspec-discover,
+      QuickCheck,
+      ram,
+    }:
+    mkDerivation {
+      pname = "hpke";
+      version = "0.1.0";
+      sha256 = "18kzr2fsar42b3w86mcr3kblihxfq9v9bqcanb9gf5sb6iff000s";
+      libraryHaskellDepends = [
+        base
+        base16-bytestring
+        bytestring
+        crypton
+        ram
+      ];
+      testHaskellDepends = [
+        base
+        base16-bytestring
+        bytestring
+        hspec
+        QuickCheck
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Hybrid Public Key Encryption";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   hplayground = callPackage (
     {
       mkDerivation,
@@ -348550,7 +350944,7 @@ self: {
         vector
       ];
       description = "Haskell bindings to libpqtypes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) libpq; };
 
@@ -348633,7 +351027,7 @@ self: {
         vector
       ];
       description = "Haskell bindings to libpqtypes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) libpq; };
@@ -348669,7 +351063,7 @@ self: {
         text
       ];
       description = "Adaptation of the hpqtypes library for the effectful ecosystem";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -348733,7 +351127,7 @@ self: {
         tasty-bench
       ];
       description = "Extra utilities for hpqtypes library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -348795,7 +351189,7 @@ self: {
         tasty-bench
       ];
       description = "Extra utilities for hpqtypes library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -349358,7 +351752,7 @@ self: {
         hspec-expectations
       ];
       description = "Quantitative Library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) gsl; };
@@ -349387,7 +351781,7 @@ self: {
         random
       ];
       description = "A library for simulating quantum circuits";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hqcsim-exe";
       broken = true;
@@ -349453,7 +351847,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
-      license = lib.licensesSpdx."LGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mctest";
       broken = true;
@@ -349475,7 +351869,7 @@ self: {
         time
       ];
       description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
-      license = lib.licensesSpdx."LGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-or-later";
     }
   ) { };
 
@@ -350108,7 +352502,7 @@ self: {
             time
           ];
           description = "Haskell bindings for ASAP:O";
-          license = lib.licensesSpdx."MIT";
+          license = lib.meta.getLicenseFromSpdxId "MIT";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -350429,7 +352823,7 @@ self: {
         void
       ];
       description = "Conllu validating parser and utils";
-      license = lib.licensesSpdx."LGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hs-conllu";
       broken = true;
@@ -350816,7 +353210,9 @@ self: {
       co-log-polysemy,
       conduit,
       conduit-extra,
+      constraints,
       containers,
+      contravariant,
       crypton,
       crypton-connection,
       crypton-x509,
@@ -350829,6 +353225,7 @@ self: {
       exceptions,
       extra,
       filepath,
+      ghc-compact,
       ghc-prim,
       hex-text,
       hspec,
@@ -350848,9 +353245,10 @@ self: {
       network-uri,
       optparse-applicative,
       polysemy,
-      polysemy-zoo,
       process,
+      random,
       recv,
+      reflection,
       relude,
       resourcet,
       retry,
@@ -350861,6 +353259,7 @@ self: {
       servant-server,
       sqlite-simple,
       stm,
+      streaming,
       streaming-commons,
       string-interpolate,
       suspend,
@@ -350884,8 +353283,8 @@ self: {
     }:
     mkDerivation {
       pname = "hs-hath";
-      version = "1.1.1";
-      sha256 = "11l0q99d9a5ynhxxbqk1vfhjxbzrqkvy7wln4ygkwmxd4y3cf1rg";
+      version = "1.1.2";
+      sha256 = "08zr0acn9sg3gnj26qa8jxzw3bqq6vp6p7iglcdynddh1lvnz9mc";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -350902,7 +353301,9 @@ self: {
         co-log-polysemy
         conduit
         conduit-extra
+        constraints
         containers
+        contravariant
         crypton
         crypton-connection
         crypton-x509
@@ -350915,6 +353316,7 @@ self: {
         exceptions
         extra
         filepath
+        ghc-compact
         ghc-prim
         hex-text
         http-client
@@ -350933,9 +353335,10 @@ self: {
         network-uri
         optparse-applicative
         polysemy
-        polysemy-zoo
         process
+        random
         recv
+        reflection
         relude
         resourcet
         retry
@@ -350946,6 +353349,7 @@ self: {
         servant-server
         sqlite-simple
         stm
+        streaming
         streaming-commons
         string-interpolate
         suspend
@@ -351002,7 +353406,6 @@ self: {
         network
         optparse-applicative
         polysemy
-        polysemy-zoo
         process
         relude
         resourcet
@@ -351066,7 +353469,6 @@ self: {
         network
         optparse-applicative
         polysemy
-        polysemy-zoo
         process
         relude
         resourcet
@@ -351098,6 +353500,7 @@ self: {
       description = "A Haskell implementation of the Hentai@Home client";
       license = lib.licenses.gpl3Only;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -351120,7 +353523,7 @@ self: {
         hspec
       ];
       description = "A tool to highlight terminal strings";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "test-exe";
     }
   ) { };
@@ -351470,7 +353873,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libonnxruntime ];
       description = "Low-level bindings for ONNX Runtime";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -351537,8 +353940,8 @@ self: {
     }:
     mkDerivation {
       pname = "hs-opentelemetry-api";
-      version = "0.3.0.0";
-      sha256 = "0iksazlv4v7shzkq55cnxbvg9ln1gyzjbmngkhnw1hympi7bg2cz";
+      version = "0.3.1.0";
+      sha256 = "0969dz945vrg4snabnwdxq1yw0v610mwxrgnfqp5jlzql7dv66a8";
       libraryHaskellDepends = [
         async
         attoparsec
@@ -351648,8 +354051,6 @@ self: {
         text
       ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -351672,8 +354073,6 @@ self: {
         unagi-chan
       ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -351698,8 +354097,8 @@ self: {
     }:
     mkDerivation {
       pname = "hs-opentelemetry-exporter-otlp";
-      version = "0.1.0.1";
-      sha256 = "1l0ggy1xybshl663p43m1maxbljcyh19dshxbrzmacsqb6mc6pqa";
+      version = "0.1.1.0";
+      sha256 = "157i9qghmj8wrhblic7yp8yc75s7rpq8ly2rnykfbi7zq0rdsif5";
       libraryHaskellDepends = [
         base
         bytestring
@@ -351771,7 +354170,7 @@ self: {
         unordered-containers
       ];
       description = "Plugin for instrumenting an application";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -351802,7 +354201,6 @@ self: {
         wai
       ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -351825,8 +354223,6 @@ self: {
         text
       ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -351851,8 +354247,6 @@ self: {
         text
       ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -351893,7 +354287,41 @@ self: {
         unordered-containers
       ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  hs-opentelemetry-instrumentation-hw-kafka-client = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      case-insensitive,
+      containers,
+      hs-opentelemetry-api,
+      hs-opentelemetry-semantic-conventions,
+      http-types,
+      hw-kafka-client,
+      text,
+      unliftio-core,
+    }:
+    mkDerivation {
+      pname = "hs-opentelemetry-instrumentation-hw-kafka-client";
+      version = "0.1.0.0";
+      sha256 = "0w465m7yzxj0y9b3c97hzz3yz8l4q648dcwvig2rsa4brkncjc3a";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        case-insensitive
+        containers
+        hs-opentelemetry-api
+        hs-opentelemetry-semantic-conventions
+        http-types
+        hw-kafka-client
+        text
+        unliftio-core
+      ];
+      description = "OpenTelemetry instrumentation for hw-kafka-client";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -351928,8 +354356,45 @@ self: {
         vault
       ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+    }
+  ) { };
+
+  hs-opentelemetry-instrumentation-persistent-mysql = callPackage (
+    {
+      mkDerivation,
+      base,
+      hs-opentelemetry-api,
+      hs-opentelemetry-instrumentation-persistent,
+      iproute,
+      monad-logger,
+      mysql,
+      persistent,
+      persistent-mysql,
+      resource-pool,
+      text,
+      unliftio-core,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "hs-opentelemetry-instrumentation-persistent-mysql";
+      version = "0.0.0.0";
+      sha256 = "06riwq0ry9m39s6s9yng7mhd1a96dj9xlwb6h5akzzwnyy927cmq";
+      libraryHaskellDepends = [
+        base
+        hs-opentelemetry-api
+        hs-opentelemetry-instrumentation-persistent
+        iproute
+        monad-logger
+        mysql
+        persistent
+        persistent-mysql
+        resource-pool
+        text
+        unliftio-core
+        unordered-containers
+      ];
+      description = "OpenTelemetry instrumentation for persistent-mysql";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -351949,8 +354414,8 @@ self: {
     }:
     mkDerivation {
       pname = "hs-opentelemetry-instrumentation-postgresql-simple";
-      version = "0.2.0.0";
-      sha256 = "04jqfxbaqq364l7yg2kf47854m1mlays1cp3llwvckvifw8nniim";
+      version = "0.2.0.1";
+      sha256 = "1hlzxnbgn672jlynxkdlnmbj5vccgz9hkhm6n4gcznynb299ilz2";
       libraryHaskellDepends = [
         base
         bytestring
@@ -351964,8 +354429,6 @@ self: {
         unordered-containers
       ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -352004,8 +354467,6 @@ self: {
         text
       ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -352039,8 +354500,6 @@ self: {
       ];
       description = "WAI instrumentation middleware for OpenTelemetry";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -352076,7 +354535,6 @@ self: {
       ];
       description = "Yesod middleware for providing OpenTelemetry instrumentation";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -352088,8 +354546,8 @@ self: {
     }:
     mkDerivation {
       pname = "hs-opentelemetry-otlp";
-      version = "0.1.1.0";
-      sha256 = "1qghv5j4br5lkrkndajljfvsmv9cbz38q3z72bmfpxp4n6jykj89";
+      version = "0.2.0.0";
+      sha256 = "0yf9n7q0r5rrf7kdwl4gsqr4zdlb7rlgv0ksbj3aghvpbvnw33hx";
       libraryHaskellDepends = [
         base
         proto-lens-runtime
@@ -352173,7 +354631,7 @@ self: {
         primitive
       ];
       description = "Datadog Propagator for OpenTelemetry";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -352281,6 +354739,48 @@ self: {
     }
   ) { };
 
+  hs-opentelemetry-semantic-conventions = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      directory,
+      filepath,
+      Glob,
+      hs-opentelemetry-api,
+      text,
+      unordered-containers,
+      vector,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "hs-opentelemetry-semantic-conventions";
+      version = "0.1.0.0";
+      sha256 = "1ag6ig3vkbhjlq69pliiidxg7j40mb6q36lmi50a7jdkfpfgw1z0";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        hs-opentelemetry-api
+        text
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        directory
+        filepath
+        Glob
+        text
+        unordered-containers
+        vector
+        yaml
+      ];
+      description = "OpenTelemetry Semantic Conventions for Haskell";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "generate";
+    }
+  ) { };
+
   hs-opentelemetry-utils-exceptions = callPackage (
     {
       mkDerivation,
@@ -352303,8 +354803,6 @@ self: {
       ];
       testHaskellDepends = [ base ];
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -352765,7 +355263,7 @@ self: {
         hspec
       ];
       description = "Read and write SAM, BAM, and CRAM files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -352872,7 +355370,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Terminal Emulator written in Haskell, SDL2 Backend";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hs-sdl-term-emulator";
     }
@@ -352975,7 +355473,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Convert an eventlog into the speedscope json format";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "hs-speedscope";
     }
   ) { };
@@ -353082,7 +355580,7 @@ self: {
         warp
       ];
       description = "Bindings to the Tango Controls system";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -353132,7 +355630,7 @@ self: {
         criterion
       ];
       description = "Terminal Emulator written in 100% Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -353160,7 +355658,7 @@ self: {
       ];
       doHaddock = false;
       description = "High-level bindings for tree-sitter";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     }
   ) { };
 
@@ -353191,7 +355689,7 @@ self: {
         tree-sitter-while
       ];
       description = "Low-level bindings for tree-sitter";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -353815,13 +356313,13 @@ self: {
       base,
       base64-bytestring,
       bytestring,
-      cryptonite,
+      crypton,
+      crypton-x509,
       data-default,
       http-types,
       HUnit,
       hxt,
       hxt-charproperties,
-      hxt-http,
       hxt-unicode,
       invertible,
       invertible-hxt,
@@ -353832,24 +356330,24 @@ self: {
       network-uri,
       process,
       semigroups,
-      string-conversions,
+      silently,
       template-haskell,
       time,
       utf8-string,
-      x509,
       zlib,
     }:
     mkDerivation {
       pname = "hsaml2";
-      version = "0.1.2";
-      sha256 = "06vnnq5lvx3wrh6jl64vcm14fi4yj2yv9q424p2ixn55x0bsfk3i";
+      version = "0.2.0";
+      sha256 = "02nnf0szhhnm1shk9bm94k3kr60a4jzf4n8ag3xcplhcisg1lmnn";
       libraryHaskellDepends = [
         asn1-encoding
         asn1-types
         base
         base64-bytestring
         bytestring
-        cryptonite
+        crypton
+        crypton-x509
         data-default
         http-types
         hxt
@@ -353863,10 +356361,10 @@ self: {
         network-uri
         process
         semigroups
+        silently
         template-haskell
         time
         utf8-string
-        x509
         zlib
       ];
       libraryPkgconfigDepends = [ libxml2 ];
@@ -353874,16 +356372,15 @@ self: {
         base
         base64-bytestring
         bytestring
-        cryptonite
+        crypton
+        crypton-x509
         http-types
         HUnit
         hxt
-        hxt-http
         network-uri
         semigroups
-        string-conversions
         time
-        x509
+        utf8-string
       ];
       description = "OASIS Security Assertion Markup Language (SAML) V2.0";
       license = lib.licenses.asl20;
@@ -354301,7 +356798,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Haskell bindings to BLST";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -354395,7 +356892,7 @@ self: {
         vector
       ];
       description = "Haskell SuperCollider";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     }
   ) { };
 
@@ -355307,7 +357804,7 @@ self: {
         text
       ];
       description = "Haskell bindings to the libcdio disc-reading library";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -355805,7 +358302,7 @@ self: {
         time
       ];
       description = "Haskell shell script templates";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -356287,7 +358784,7 @@ self: {
         text
       ];
       description = "Core package representing Haskell advisories";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -356359,7 +358856,7 @@ self: {
         time
       ];
       description = "Synchronize with the Haskell security advisory database";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsec-sync";
       broken = true;
@@ -356494,7 +358991,7 @@ self: {
         toml-parser
       ];
       description = "Tools for working with the Haskell security advisory database";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsec-tools";
       broken = true;
@@ -356593,7 +359090,7 @@ self: {
         tls
       ];
       description = "sendxmpp clone, sending XMPP messages via CLI";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       mainProgram = "hsendxmpp";
     }
   ) { };
@@ -356944,7 +359441,7 @@ self: {
         yaml
       ];
       description = "A SFTP client tool for secure file transfer operations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsftp";
       broken = true;
@@ -357274,7 +359771,7 @@ self: {
         tasty-th
       ];
       description = "ini configuration files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -357320,7 +359817,7 @@ self: {
         transformers
       ];
       description = "Inspect Haskell source files";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsinspect";
       broken = true;
@@ -357410,7 +359907,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "LSP interface over the hsinspect binary";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsinspect-lsp";
     }
@@ -357458,7 +359955,7 @@ self: {
         transformers
       ];
       description = "Install Haskell software";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       mainProgram = "hsinstall";
     }
   ) { };
@@ -357505,7 +360002,7 @@ self: {
         transformers
       ];
       description = "Install Haskell software";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsinstall";
     }
@@ -357888,7 +360385,7 @@ self: {
         text
       ];
       description = "Bindings to Lua, an embeddable scripting language";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -357937,7 +360434,7 @@ self: {
         text
       ];
       description = "Bindings to Lua, an embeddable scripting language";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -357987,7 +360484,7 @@ self: {
         vector
       ];
       description = "Allow aeson data types to be used with Lua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358035,7 +360532,7 @@ self: {
         text
       ];
       description = "Type classes for HsLua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358068,7 +360565,7 @@ self: {
         unix
       ];
       description = "Command-line interface for Lua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358110,7 +360607,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Bindings to Lua, an embeddable scripting language";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358137,7 +360634,7 @@ self: {
         text
       ];
       description = "Examples of how to combine Haskell and Lua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358166,7 +360663,7 @@ self: {
         tasty-lua
       ];
       description = "Opinionated, but extensible Lua list type";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358212,7 +360709,7 @@ self: {
         text
       ];
       description = "Marshalling of values between Haskell and Lua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358247,7 +360744,7 @@ self: {
         text
       ];
       description = "Lua module wrapping Text.DocLayout.";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358282,7 +360779,7 @@ self: {
         text
       ];
       description = "Lua module wrapping Text.DocLayout.";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -358324,7 +360821,7 @@ self: {
         text
       ];
       description = "Lua module to work with file paths";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358362,7 +360859,7 @@ self: {
         tasty-lua
       ];
       description = "Lua module to work with file paths";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -358408,7 +360905,7 @@ self: {
         text
       ];
       description = "Lua module wrapper around Haskell's System module";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358458,7 +360955,7 @@ self: {
         tasty-lua
       ];
       description = "Lua module wrapper around Haskell's System module";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -358496,7 +360993,7 @@ self: {
         text
       ];
       description = "Lua module for text";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358532,7 +361029,7 @@ self: {
         tasty-lua
       ];
       description = "Lua module for text";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -358574,7 +361071,7 @@ self: {
         text
       ];
       description = "Lua module to work with version specifiers";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358610,7 +361107,7 @@ self: {
         tasty-lua
       ];
       description = "Lua module to work with version specifiers";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -358659,7 +361156,7 @@ self: {
         tasty-lua
       ];
       description = "Lua module to work with file zips";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358703,7 +361200,7 @@ self: {
         tasty-lua
       ];
       description = "Lua module to work with file zips";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -358762,7 +361259,7 @@ self: {
         text
       ];
       description = "Object orientation tools for HsLua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358801,7 +361298,7 @@ self: {
         tasty-hslua
       ];
       description = "Object orientation tools for HsLua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -358850,7 +361347,7 @@ self: {
         text
       ];
       description = "Utilities to build Lua modules";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358892,7 +361389,7 @@ self: {
         tasty-hunit
       ];
       description = "Utilities to build Lua modules";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -358922,7 +361419,7 @@ self: {
         text
       ];
       description = "Isocline-based Lua REPL";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -358964,7 +361461,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Type specifiers for Lua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -359004,7 +361501,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Type specifiers for Lua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -359819,8 +362316,8 @@ self: {
     }:
     mkDerivation {
       pname = "hspec";
-      version = "2.11.16";
-      sha256 = "1brjn0awqrmjz75a69nskx19f19b9y32hcnd2f3lif5sv5df1zgs";
+      version = "2.11.17";
+      sha256 = "0mlpximvp3xqly03lnqqqvphfsjw6vqdyzblc568mq1bpg1wir1r";
       libraryHaskellDepends = [
         base
         hspec-core
@@ -359871,8 +362368,8 @@ self: {
     }:
     mkDerivation {
       pname = "hspec-api";
-      version = "2.11.16";
-      sha256 = "00k1ihl2lbp1md7qzjhhl96ax5vabzh3q5lfbs88svzwprpmkrr5";
+      version = "2.11.17";
+      sha256 = "1zqq1l6fyyd53dxc1l0383vdn6zs4bx4fkrm6aj0k661m753z43g";
       libraryHaskellDepends = [
         base
         hspec-core
@@ -360032,8 +362529,8 @@ self: {
     }:
     mkDerivation {
       pname = "hspec-core";
-      version = "2.11.16";
-      sha256 = "0kj2kljczp6y02w2sd9bcgpa5cdisx7sc5a57wrz99h1p6968a7m";
+      version = "2.11.17";
+      sha256 = "11ca7gd7kg60a9dd2vqysnsific140920h040ycdzc2wa9m1gdc4";
       libraryHaskellDepends = [
         ansi-terminal
         array
@@ -360141,8 +362638,8 @@ self: {
     }:
     mkDerivation {
       pname = "hspec-discover";
-      version = "2.11.16";
-      sha256 = "1b4g26bxadzaypr6ib7a75ycapg8k927pfq8g0y2pm111lgcyv5x";
+      version = "2.11.17";
+      sha256 = "0lj6rvx8013vg3nva4kwv0fs854983gpsqdy90rh7wwdyy6rsv1m";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -360171,6 +362668,63 @@ self: {
     }
   ) { };
 
+  hspec-discover-discover = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      containers,
+      directory,
+      filepath,
+      hspec,
+      hspec-discover,
+      optparse-applicative,
+      process,
+      temporary,
+      text,
+    }:
+    mkDerivation {
+      pname = "hspec-discover-discover";
+      version = "1.0.0.0";
+      sha256 = "113zpjq016zghk11jdaly9yjj478vv3diizyy29n1mv35mhwsiv7";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        async
+        base
+        containers
+        directory
+        filepath
+        optparse-applicative
+        text
+      ];
+      executableHaskellDepends = [
+        async
+        base
+        containers
+        directory
+        filepath
+        optparse-applicative
+        text
+      ];
+      testHaskellDepends = [
+        async
+        base
+        containers
+        directory
+        filepath
+        hspec
+        optparse-applicative
+        process
+        temporary
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "hspec-discover-discover";
+    }
+  ) { };
+
   hspec-expectations = callPackage (
     {
       mkDerivation,
@@ -360451,7 +363005,7 @@ self: {
         hspec-core
       ];
       description = "A Formatter for hspec that provides Github Actions Annotations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -360793,7 +363347,7 @@ self: {
         megaparsec
       ];
       description = "Utility functions for testing Megaparsec parsers with Hspec";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -360821,8 +363375,8 @@ self: {
     }:
     mkDerivation {
       pname = "hspec-meta";
-      version = "2.11.16";
-      sha256 = "0rk9d4xrzjsz986ylx133iyakb4s7m64pgvkv2x5k8xf4mgd192y";
+      version = "2.11.17";
+      sha256 = "0z5644drs1q4mdb6vp20f1im3ji0a5vww3wybfydpfpsnz8kbvjj";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -361382,7 +363936,7 @@ self: {
         hspec-core
       ];
       description = "Table-driven (by-example) HSpec tests";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -361476,6 +364030,7 @@ self: {
     {
       mkDerivation,
       base,
+      effable,
       hedgehog,
       hspec,
       hspec-api,
@@ -361486,10 +364041,11 @@ self: {
     }:
     mkDerivation {
       pname = "hspec-tidy-formatter";
-      version = "0.1.1.0";
-      sha256 = "031ssdyv4b69iy11rx4yrjx2155kgmdaprbd5i33jggsiqspgp9p";
+      version = "0.2.0.1";
+      sha256 = "102j1awmkbpm1dqbbkxff39q4ar5pdcl37rcwdkcvhz1n9zf5zfa";
       libraryHaskellDepends = [
         base
+        effable
         hspec-api
       ];
       testHaskellDepends = [
@@ -361504,7 +364060,7 @@ self: {
         markdown-unlit
       ];
       description = "A custom hspec formatter for easy-to-read terminal output";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -361525,7 +364081,7 @@ self: {
         tmp-proc
       ];
       description = "Simplify use of tmp-proc from hspec tests";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -362026,7 +364582,7 @@ self: {
         doctest
       ];
       description = "My opinionated Haskell project formatter";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hspretty";
       broken = true;
@@ -362266,7 +364822,7 @@ self: {
             text
           ];
           description = "Haskell binding for Qt Quick";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
         }
       )
@@ -362569,7 +365125,7 @@ self: {
         utf8-string
       ];
       description = "RELP (Reliable Event Logging Protocol) server implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -362674,7 +365230,7 @@ self: {
         unix
       ];
       description = "Using Haskell for Unix shell scripting tasks";
-      license = lib.licensesSpdx."LGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -363767,7 +366323,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Bindings to TagLib, audio meta-data library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) taglib; };
 
@@ -364266,7 +366822,7 @@ self: {
         unordered-containers
       ];
       description = "A codec library for HTML-escaped text and HTML-entities";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -364732,7 +367288,7 @@ self: {
         text
       ];
       description = "Use htmx with various haskell libraries";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -364755,7 +367311,7 @@ self: {
         text
       ];
       description = "Use htmx with lucid";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -364782,7 +367338,7 @@ self: {
         text
       ];
       description = "Use htmx with servant";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -365006,7 +367562,7 @@ self: {
         vector
       ];
       description = "Parse TOML values produced by htoml-megaparsec package";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -365049,7 +367605,7 @@ self: {
         th-compat
       ];
       description = "a library to build and work with heterogeneous, type level indexed rose trees";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -365377,6 +367933,8 @@ self: {
       pname = "http-api-data";
       version = "0.7";
       sha256 = "13l1bfcjvpgmp0i66j35x9j4rq8fb8wihc3xwagwqr8f6iw0cih9";
+      revision = "1";
+      editedCabalFile = "1mfnzfsmc9gavmdbd0hs28ngim8c0749hkvzqqddp67dziamf55q";
       libraryHaskellDepends = [
         base
         bytestring
@@ -365430,7 +367988,7 @@ self: {
         text
       ];
       description = "Code for using the ip package with http-api-data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -365525,7 +368083,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "a library to make http requests without worrying much";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -365672,8 +368230,8 @@ self: {
     }:
     mkDerivation {
       pname = "http-client-brread-timeout";
-      version = "0.1.1.0";
-      sha256 = "0prghn5hif47r9viy9g7slpw03zs91z9k9z135ar5b6xa5xdz058";
+      version = "0.3.0.0";
+      sha256 = "18lj337658p4fc2r3z5bf1yirqga3qyn17y3gykdlpm9spl46y9v";
       libraryHaskellDepends = [
         base
         bytestring
@@ -365999,7 +368557,7 @@ self: {
         temporary
       ];
       description = "http-client TLS backend using Rustls";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -366090,8 +368648,8 @@ self: {
       pname = "http-client-tls";
       version = "0.3.6.4";
       sha256 = "18qqzif376hv5lqv1c7sp4b90mq5cyfhybip472j9fcaxrph0mkp";
-      revision = "2";
-      editedCabalFile = "1wqn9mjwsk5qgir5l1mj74p5k8zzpvkvdhdrbsiqx8y3b4ns7q7g";
+      revision = "3";
+      editedCabalFile = "1my72cym4xz9c9p5y2npjd38gyis0zvf2b09lwyh2haslmmc845z";
       libraryHaskellDepends = [
         base
         bytestring
@@ -366128,6 +368686,71 @@ self: {
     }
   ) { };
 
+  http-client-tls_0_4_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      base16,
+      bytestring,
+      case-insensitive,
+      containers,
+      cryptohash-md5,
+      crypton-connection,
+      data-default,
+      exceptions,
+      gauge,
+      hspec,
+      http-client,
+      http-types,
+      network,
+      network-uri,
+      text,
+      tls,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "http-client-tls";
+      version = "0.4.0";
+      sha256 = "0g5fhkfyc0lc2j4v2hkx0d610jqbf44sqkcag2qpnra6y16g2731";
+      libraryHaskellDepends = [
+        base
+        base16
+        bytestring
+        case-insensitive
+        containers
+        cryptohash-md5
+        crypton-connection
+        data-default
+        exceptions
+        http-client
+        http-types
+        network
+        network-uri
+        text
+        tls
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        crypton-connection
+        data-default
+        hspec
+        http-client
+        http-types
+        tls
+      ];
+      benchmarkHaskellDepends = [
+        base
+        gauge
+        http-client
+      ];
+      doCheck = false;
+      description = "http-client backend using the connection package and tls library";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   http-client-websockets = callPackage (
     {
       mkDerivation,
@@ -366162,7 +368785,7 @@ self: {
         websockets
       ];
       description = "Glue code for http-client and websockets";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     }
   ) { };
 
@@ -366246,6 +368869,8 @@ self: {
       pname = "http-conduit";
       version = "2.3.9.1";
       sha256 = "1bs12v0vh4ik87imfp4xrvpyr3kb3dm4m8y8h1djlcyjxhans10k";
+      revision = "1";
+      editedCabalFile = "0sfw10xzgds4l62mx8akn873zkgpj0byqywiysjl68qplcnillkc";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -366419,7 +369044,7 @@ self: {
         zlib
       ];
       description = "HTTP downloader tailored for web-crawler needs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -366750,7 +369375,7 @@ self: {
       ];
       doHaddock = false;
       description = "Perform HTTP Requests";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -366798,7 +369423,7 @@ self: {
       ];
       doHaddock = false;
       description = "Instantiations of http-exchange";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -366821,7 +369446,7 @@ self: {
         bytestring
       ];
       description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -366867,7 +369492,7 @@ self: {
         tasty-golden
       ];
       description = "Types and serialization for HTTP";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -367528,8 +370153,8 @@ self: {
     }:
     mkDerivation {
       pname = "http-query";
-      version = "0.1.3";
-      sha256 = "1z0mj12yxbflh0f523liqdbi0i6xz8zraz3lzlpfyl5kfp96jrfk";
+      version = "0.1.3.1";
+      sha256 = "0vidjdm2sysg8h12f4yl0la0i18gyv7lkx4qzihp7m0y2858v3sp";
       libraryHaskellDepends = [
         aeson
         base
@@ -367769,7 +370394,7 @@ self: {
         utf8-string
       ];
       description = "HTTP senmatics libarry";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -367802,7 +370427,7 @@ self: {
         utf8-string
       ];
       description = "HTTP semantics library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -368111,7 +370736,7 @@ self: {
         text
       ];
       description = "Generic HTTP types for Haskell (for both client and server code)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -368579,8 +371204,8 @@ self: {
     }:
     mkDerivation {
       pname = "http2-tls";
-      version = "0.5.2";
-      sha256 = "14n7dhrlcx423bwslyc1rybndc6qpyw0blll9k9sly1fiallw8xs";
+      version = "0.5.3";
+      sha256 = "1awhnls36h3i4qbcnjxbjipzq0qfcgzx7brb9nlnmi5p8fbz5458";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -368639,10 +371264,8 @@ self: {
     }:
     mkDerivation {
       pname = "http3";
-      version = "0.1.2";
-      sha256 = "09s7n19aw4my7rrpjkrh4ql53282gjgfjkd2k1fn85xgz3y7jcbc";
-      revision = "1";
-      editedCabalFile = "0mgq4c3065iidllx3agvwclwacq6zgrpv4wrd20z1l8gz26hg2ar";
+      version = "0.1.3";
+      sha256 = "0agb0cp5lh74vv47ryv38pk46mpiqpv659i9qqmgvigaxkl379sh";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -368690,7 +371313,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "HTTP/3 library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -369281,7 +371904,7 @@ self: {
         fingertree
       ];
       description = "Pure Haskell implementation of the Huffman encoding algorithm";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -369365,7 +371988,7 @@ self: {
         doctest-parallel
       ];
       description = "uiua port";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -369551,7 +372174,7 @@ self: {
         witherable
       ];
       description = "A TUI MPD client, inspired by ncmpcpp";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hum";
       broken = true;
@@ -369650,7 +372273,7 @@ self: {
         text
       ];
       description = "Redefinition-free prelude alternative";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -370814,7 +373437,7 @@ self: {
         hspec-discover
       ];
       description = "Convenience functions for Aeson";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -370899,7 +373522,7 @@ self: {
         hw-xml
       ];
       description = "Demo library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -371029,7 +373652,7 @@ self: {
       ];
       doHaddock = false;
       description = "Balanced parentheses";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-balancedparens";
     }
@@ -371092,7 +373715,7 @@ self: {
         vector
       ];
       description = "Bit manipulation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -371129,7 +373752,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "CI Assistant for Haskell projects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-ci-assist";
       broken = true;
@@ -371194,7 +373817,7 @@ self: {
         vector
       ];
       description = "Conduits for tokenizing streams";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -371235,7 +373858,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Additional merges and joins for Conduit";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -371262,7 +373885,7 @@ self: {
       ];
       testToolDepends = [ doctest-discover ];
       description = "Diagnostics library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -371388,7 +374011,7 @@ self: {
         vector
       ];
       description = "Unbelievably fast streaming DSV file parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-dsv";
       broken = true;
@@ -371473,7 +374096,7 @@ self: {
         vector
       ];
       description = "File Dump";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-dump";
       broken = true;
@@ -371581,7 +374204,7 @@ self: {
         vector
       ];
       description = "Elias-Fano";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-eliasfano";
     }
@@ -371644,7 +374267,7 @@ self: {
         vector
       ];
       description = "Excess";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -371687,7 +374310,7 @@ self: {
         hspec-discover
       ];
       description = "Generic finger-tree structure, with example instances";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -371736,7 +374359,7 @@ self: {
         hspec-discover
       ];
       description = "Generic strict finger-tree structure";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -371769,7 +374392,7 @@ self: {
       ];
       testToolDepends = [ doctest-discover ];
       description = "Extra hedgehog functionality";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -371816,7 +374439,7 @@ self: {
         hspec-discover
       ];
       description = "Interoperability between hspec and hedgehog";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -371853,7 +374476,7 @@ self: {
         hspec-discover
       ];
       description = "Additional facilities for Integers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -371925,7 +374548,7 @@ self: {
       ];
       doHaddock = false;
       description = "Library for manipulating IP addresses and CIDR blocks";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-ip";
     }
@@ -372063,7 +374686,7 @@ self: {
       ];
       doHaddock = false;
       description = "Memory efficient JSON parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-json";
     }
@@ -372111,7 +374734,7 @@ self: {
       ];
       doHaddock = false;
       description = "Memory efficient JSON parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -372186,7 +374809,7 @@ self: {
         lens
       ];
       description = "Lens for hw-json";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -372239,7 +374862,7 @@ self: {
       ];
       testToolDepends = [ doctest-discover ];
       description = "SIMD-based JSON semi-indexer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "hw-json-simd";
     }
   ) { };
@@ -372332,7 +374955,7 @@ self: {
         mmap
       ];
       description = "Memory efficient JSON parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-json";
     }
@@ -372433,7 +375056,7 @@ self: {
         mmap
       ];
       description = "Memory efficient JSON parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-json-standard-cursor";
     }
@@ -372499,7 +375122,7 @@ self: {
         hw-hspec-hedgehog
       ];
       description = "Avro support for Kafka infrastructure";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -372550,7 +375173,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Kafka bindings for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { inherit (pkgs) rdkafka; };
 
@@ -372609,7 +375232,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Conduit bindings for hw-kafka-client";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -372654,7 +375277,7 @@ self: {
         hspec-discover
       ];
       description = "Combinators for lazy IO";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -372702,7 +375325,7 @@ self: {
         hspec-discover
       ];
       description = "Monadic query DSL";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "hw-mquery-example";
     }
   ) { };
@@ -372784,7 +375407,7 @@ self: {
         vector
       ];
       description = "Packed Vector";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-packed-vector";
       broken = true;
@@ -372832,7 +375455,7 @@ self: {
         hspec-discover
       ];
       description = "Simple parser support";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -372868,7 +375491,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Primitive functions and data types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -372977,7 +375600,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Opinionated polysemy library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -373024,7 +375647,7 @@ self: {
         unliftio
       ];
       description = "Opinionated prelude library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -373094,7 +375717,7 @@ self: {
         vector
       ];
       description = "Primitive functions and data types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -373141,7 +375764,7 @@ self: {
         vector
       ];
       description = "Primitive support for bit manipulation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.x86;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-prim-bits-exe";
@@ -373249,7 +375872,7 @@ self: {
       ];
       doHaddock = false;
       description = "Rank-select";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-rankselect";
     }
@@ -373320,7 +375943,7 @@ self: {
         vector
       ];
       description = "Rank-select base";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -373416,7 +376039,7 @@ self: {
         vector
       ];
       description = "SIMD library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -373498,7 +376121,7 @@ self: {
       ];
       testToolDepends = [ doctest-discover ];
       description = "SIMD library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-simd";
       broken = true;
@@ -373579,7 +376202,7 @@ self: {
         vector
       ];
       description = "Primitive functions and data types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -373617,7 +376240,7 @@ self: {
         hspec-discover
       ];
       description = "String parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -373698,7 +376321,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Library for creating and extracting tar archives";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-tar";
       broken = true;
@@ -373797,7 +376420,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Supports IO on URIs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-uri";
     }
@@ -373955,7 +376578,7 @@ self: {
         vector
       ];
       description = "XML parser based on succinct data structures";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-xml";
       broken = true;
@@ -374136,6 +376759,118 @@ self: {
     }
   ) { };
 
+  hwm = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      ansi-terminal,
+      async,
+      base,
+      base16-bytestring,
+      bytestring,
+      Cabal,
+      containers,
+      cryptohash-sha256,
+      directory,
+      filepath,
+      Glob,
+      hpack,
+      http-client,
+      http-types,
+      modern-uri,
+      mtl,
+      optparse-applicative,
+      process,
+      relude,
+      req,
+      retry,
+      stm,
+      text,
+      time,
+      transformers,
+      typed-process,
+      unordered-containers,
+      yaml,
+      zip-archive,
+    }:
+    mkDerivation {
+      pname = "hwm";
+      version = "0.4.0";
+      sha256 = "1b8xbwp3qwzdnidc9511kn54fzyaf9smpw3r5jqyf1d42yxzl17z";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        ansi-terminal
+        async
+        base
+        base16-bytestring
+        bytestring
+        Cabal
+        containers
+        cryptohash-sha256
+        directory
+        filepath
+        Glob
+        hpack
+        http-client
+        http-types
+        modern-uri
+        mtl
+        optparse-applicative
+        process
+        relude
+        req
+        retry
+        stm
+        text
+        time
+        transformers
+        typed-process
+        unordered-containers
+        yaml
+        zip-archive
+      ];
+      executableHaskellDepends = [
+        aeson
+        ansi-terminal
+        async
+        base
+        base16-bytestring
+        bytestring
+        Cabal
+        containers
+        cryptohash-sha256
+        directory
+        filepath
+        Glob
+        hpack
+        http-client
+        http-types
+        modern-uri
+        mtl
+        optparse-applicative
+        process
+        relude
+        req
+        retry
+        stm
+        text
+        time
+        transformers
+        typed-process
+        unordered-containers
+        yaml
+        zip-archive
+      ];
+      description = "Haskell Workspace Manager - Orchestrates Stack, Cabal, and HLS";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "hwm";
+      broken = true;
+    }
+  ) { };
+
   hworker = callPackage (
     {
       mkDerivation,
@@ -375138,7 +377873,7 @@ self: {
         random
       ];
       description = "A Yahtzee game implementation in Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "hyahtzee";
     }
   ) { };
@@ -375249,8 +377984,8 @@ self: {
     {
       mkDerivation,
       aeson,
-      aeson-pretty,
       base,
+      base64-bytestring,
       bytestring,
       containers,
       directory,
@@ -375260,20 +377995,24 @@ self: {
       HsYAML,
       HUnit,
       mtl,
+      process,
       QuickCheck,
       scientific,
       split,
       text,
+      time,
       vector,
     }:
     mkDerivation {
       pname = "hydra";
-      version = "0.12.0";
-      sha256 = "05pshwws8c7abbnmrfx9l646b58f567g6xs91cxvzxqs16glp87c";
+      version = "0.13.0";
+      sha256 = "0pr8wd73jbk40d8ks6gryivj9n1i81qbrcq9vzzmz27402730ihw";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [
         aeson
-        aeson-pretty
         base
+        base64-bytestring
         bytestring
         containers
         directory
@@ -375284,10 +378023,25 @@ self: {
         text
         vector
       ];
+      executableHaskellDepends = [
+        aeson
+        base
+        base64-bytestring
+        bytestring
+        containers
+        directory
+        filepath
+        hspec
+        HsYAML
+        scientific
+        split
+        text
+        vector
+      ];
       testHaskellDepends = [
         aeson
-        aeson-pretty
         base
+        base64-bytestring
         bytestring
         containers
         directory
@@ -375297,15 +378051,19 @@ self: {
         HsYAML
         HUnit
         mtl
+        process
         QuickCheck
         scientific
         split
         text
+        time
         vector
       ];
       testToolDepends = [ hspec-discover ];
       description = "Graph programming language";
       license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -375956,7 +378714,7 @@ self: {
         text
       ];
       description = "Display class for the HyperHaskell graphical Haskell interpreter";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -375989,7 +378747,7 @@ self: {
         text
       ];
       description = "Display instances for the HyperHaskell graphical Haskell interpreter";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -376030,7 +378788,7 @@ self: {
         transformers
       ];
       description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "hyper-haskell-server";
     }
   ) { };
@@ -376110,7 +378868,7 @@ self: {
         websockets
       ];
       description = "Interactive HTML apps using type-safe serverside Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -376215,7 +378973,7 @@ self: {
       ];
       testToolDepends = [ skeletest ];
       description = "Interactive HTML apps using type-safe serverside Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -376309,7 +379067,7 @@ self: {
         tasty-hunit
       ];
       description = "Hypergeometric function of a matrix argument";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -376950,6 +379708,8 @@ self: {
       pname = "hzenity";
       version = "0.4.1";
       sha256 = "1fpjbkdqbx052c4975gg7qdb97gh3dhvv7dc550f7ka5bii97d4k";
+      revision = "1";
+      editedCabalFile = "1i6mq44pmsmmhzyxlbrfgrqkqn2m63y6zwwr94nhh0rahyilwdhs";
       libraryHaskellDepends = [
         base
         containers
@@ -377115,7 +379875,7 @@ self: {
         tasty-hunit
       ];
       description = "Haskell interval types. Bounds checking.";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -377292,7 +380052,7 @@ self: {
         time
       ];
       description = "iCalendar data types, parser, and printer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -378325,7 +381085,7 @@ self: {
         tf-random
       ];
       description = "Flexible generation of identicons";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -378541,7 +381301,7 @@ self: {
         text
       ];
       description = "Pure Haskell IDN and Punycode implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -378777,7 +381537,7 @@ self: {
         transformers
       ];
       description = "Functional Programming Language with Dependent Types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) gmp; };
 
@@ -378928,7 +381688,7 @@ self: {
       ];
       doHaddock = false;
       description = "Branch on whether a constraint is satisfied";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -378983,7 +381743,7 @@ self: {
         bytestring
       ];
       description = "Constructing and dissecting IFF files";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -379015,7 +381775,6 @@ self: {
       ];
       description = "An inductive-form set constraint solver";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -379670,8 +382429,7 @@ self: {
         ihaskell
         text
       ];
-      license = lib.licensesSpdx."BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ihaskell-dataframe-exe";
     }
   ) { };
@@ -380288,7 +383046,7 @@ self: {
         wreq
       ];
       description = "Haskell Web Framework";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -380347,7 +383105,7 @@ self: {
       ];
       doHaddock = false;
       description = "JSX-like but for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -380532,7 +383290,7 @@ self: {
         wreq
       ];
       description = "Dev tools for IHP";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -380554,7 +383312,7 @@ self: {
         with-utf8
       ];
       description = "Provides the IHP migrate binary";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "migrate";
       maintainers = [ lib.maintainers.mpscholten ];
     }
@@ -380602,7 +383360,7 @@ self: {
         text
       ];
       description = "Call GPT4 from your Haskell apps";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -380655,7 +383413,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Extra data types for postgresql-simple";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -380752,7 +383510,7 @@ self: {
         vector
       ];
       description = "Optimised list functions for doing index-related things";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -381544,7 +384302,7 @@ self: {
         xml-types
       ];
       description = "Execute arbitrary actions for each item from RSS/Atom feeds";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -381808,7 +384566,7 @@ self: {
         wires
       ];
       description = "Immutaball platformer game (prototype version)";
-      license = lib.licensesSpdx."0BSD";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -381843,7 +384601,7 @@ self: {
         hspec
       ];
       description = "A GHC plugin for automatically importing modules";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -382035,7 +384793,7 @@ self: {
       ];
       doHaddock = false;
       description = "Framework for defaulting superclasses";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -382125,7 +384883,7 @@ self: {
         parsec
       ];
       description = "A math-inspired programmatic 2D & 3D CAD system";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sorki ];
     }
   ) { };
@@ -382218,7 +384976,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Auto generate hie-bios cradles";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -382293,7 +385051,7 @@ self: {
         yaml
       ];
       description = "Helps maintain consistency of imports";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -382897,7 +385655,7 @@ self: {
         polysemy-time
       ];
       description = "A Prelude for Polysemy";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -382924,7 +385682,7 @@ self: {
         text
       ];
       description = "A Prelude for Polysemy – Base Reexports";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -382945,7 +385703,7 @@ self: {
         polysemy
       ];
       description = "A Prelude for Polysemy";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -383567,7 +386325,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Simple, no-frills indexed lists";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -383678,7 +386436,7 @@ self: {
       sha256 = "166329a5jmrs4q1ycb132gq7kbrdyzrvrxzzzwp5czmv00lvns9f";
       libraryHaskellDepends = [ base ];
       description = "Utilities for indexed profunctors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -383726,7 +386484,7 @@ self: {
         transformers
       ];
       description = "Atkey indexed monad transformers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -384072,7 +386830,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Convenient imperative eDSL over Lorentz";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "indigo";
     }
@@ -384156,6 +386914,8 @@ self: {
       pname = "inf-backprop";
       version = "0.2.0.2";
       sha256 = "0nssr4j4gd3lf6asxvmf2qq9j8z6q5318kn0ky5r3kqmgdp54wfc";
+      revision = "1";
+      editedCabalFile = "0b85vsjhkjyjfn7ja68vdl0q9jb10mq1cnv06agkpvm4bmrbrl4q";
       libraryHaskellDepends = [
         base
         combinatorial
@@ -384447,7 +387207,7 @@ self: {
         text
       ];
       description = "A statically-typed functional scripting language";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -384721,7 +387481,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Infinite lists";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -385160,7 +387920,7 @@ self: {
       sha256 = "0k3bl5adj512bzqysapnggvf6fmi0hs3mvxkymsh9af7gan8y504";
       libraryHaskellDepends = [ base ];
       description = "Initialization and Deinitialization of 'Storable' values";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -385282,7 +388042,7 @@ self: {
         text
       ];
       description = "Canonical categorical conversions (injections and projections)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -385450,7 +388210,7 @@ self: {
         vector
       ];
       description = "Lets you embed C++ code into Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.roberth ];
     }
   ) { };
@@ -385499,7 +388259,7 @@ self: {
         vector
       ];
       description = "Lets you embed CUDA code into Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -385530,7 +388290,7 @@ self: {
         inline-c
       ];
       description = "Lets you embed Objective-C code into Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -385688,7 +388448,7 @@ self: {
       ];
       doHaddock = false;
       description = "Python interpreter embedded into haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) python3; };
 
@@ -385787,7 +388547,7 @@ self: {
         template-haskell
       ];
       description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) R; };
 
@@ -385920,6 +388680,8 @@ self: {
       pname = "insert-ordered-containers";
       version = "0.2.7";
       sha256 = "05rncapknzx8yii2mzfbg0hvack4jx11jwgh0pmqlng6fqdvpvbp";
+      revision = "2";
+      editedCabalFile = "0aglqc4mldqspiwl59sfqw1mx5phr2hz8dazqs6kr02mkazy5n2l";
       libraryHaskellDepends = [
         aeson
         base
@@ -385948,7 +388710,60 @@ self: {
         unordered-containers
       ];
       description = "Associative containers retaining insertion order for traversals";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  insert-ordered-containers_0_3_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      base-compat,
+      deepseq,
+      hashable,
+      indexed-traversable,
+      lens,
+      optics-core,
+      optics-extra,
+      QuickCheck,
+      semigroupoids,
+      tasty,
+      tasty-quickcheck,
+      transformers,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "insert-ordered-containers";
+      version = "0.3.0";
+      sha256 = "0p8qjggvqv4wjbbg9i13d6abnyxv6rrc2lngy5ahwmv94g5d03b3";
+      libraryHaskellDepends = [
+        aeson
+        base
+        deepseq
+        hashable
+        indexed-traversable
+        lens
+        optics-core
+        optics-extra
+        semigroupoids
+        transformers
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        base-compat
+        hashable
+        lens
+        QuickCheck
+        tasty
+        tasty-quickcheck
+        unordered-containers
+      ];
+      description = "Associative containers retaining insertion order for traversals";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -386740,7 +389555,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Direct conversion functions between Ints and Words";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -386866,11 +389681,11 @@ self: {
       pname = "int-supply";
       version = "1.0.0";
       sha256 = "0h7yi4clvy44gb2nxjv50m5lnlgqdkj781pv0iqlgwyqjigwappz";
-      revision = "2";
-      editedCabalFile = "11gbra5328854mnjm5hvpvz1wccmki1fy6bkbqd6fpxaj5cffmbp";
+      revision = "3";
+      editedCabalFile = "0xrz0pp0lxq16vw62ad6rnzx6xbkxngdn58h63sjfwnwd1fp960x";
       libraryHaskellDepends = [ base ];
       description = "A simple, efficient supply of integers using atomic fetch-and-add";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -386900,7 +389715,7 @@ self: {
         primitive
       ];
       description = "Advent of Code 2019 intcode interpreter";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -386945,7 +389760,7 @@ self: {
         text
       ];
       description = "Conversion from strings to Integer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -387097,7 +389912,7 @@ self: {
         quaalude
       ];
       description = "Integer, Natural, and Positive";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -387264,7 +390079,7 @@ self: {
         unix
       ];
       description = "Poll modern Intel/AMD CPU power consumption on Linux via RAPL";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       mainProgram = "intel-powermon";
     }
   ) { };
@@ -387370,7 +390185,7 @@ self: {
         vector
       ];
       description = "Type level prompt with LLMs via louter";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -387413,7 +390228,7 @@ self: {
       testHaskellDepends = [ base ];
       doHaddock = false;
       description = "A GHC Core plugin for intensional datatype refinement checking";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -387635,7 +390450,7 @@ self: {
       sha256 = "1wf6g0a1pz6xiixqnkrdjlb2xr4ck2vab9vd0w6kp0pbhqc6qysp";
       libraryHaskellDepends = [ base ];
       description = "Some simple functions to deal with transformations from structures to other ones, basically lists";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -388089,7 +390904,7 @@ self: {
         utility-ht
       ];
       description = "piecewise linear and cubic Hermite interpolation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -388176,7 +390991,7 @@ self: {
         typed-process
       ];
       description = "Shared memory and control structures for IPC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -388318,7 +391133,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "An implementation of Allen's interval algebra for temporal logic";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tutorial";
       broken = true;
@@ -388345,7 +391160,7 @@ self: {
         hedgehog
       ];
       description = "Intervals of functors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -388403,7 +391218,7 @@ self: {
         time-compat
       ];
       description = "Intervals, and monoids thereof";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -388425,7 +391240,7 @@ self: {
         QuickCheck
       ];
       description = "Interval Tree Clocks";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -388546,7 +391361,7 @@ self: {
         vector
       ];
       description = "A game of competitive puzzle-design";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "intricacy";
@@ -388988,7 +391803,7 @@ self: {
         vector
       ];
       description = "Automatically generate a function’s inverse";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -389257,10 +392072,8 @@ self: {
     }:
     mkDerivation {
       pname = "io-classes";
-      version = "1.9.0.0";
-      sha256 = "1qgj52m078j3cr0pfijvp6r7a793n0ssaqy6nyfy1bv9qxs761hz";
-      revision = "1";
-      editedCabalFile = "0m5g282s0jl5071b5dazng8s968rdcnyw90v9ckmxy19z48j0lg3";
+      version = "1.10.0.0";
+      sha256 = "0cwf0dc59qw5qyhf758ws71ajp4gxjqbxh5zsmcakrnbcv2i977b";
       libraryHaskellDepends = [
         array
         async
@@ -389282,7 +392095,7 @@ self: {
       ];
       doHaddock = false;
       description = "Type classes for concurrency with STM, ST and timing";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -389309,7 +392122,7 @@ self: {
         si-timers
       ];
       description = "Experimental MTL instances for io-classes";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -389339,7 +392152,7 @@ self: {
         template-haskell
       ];
       description = "Use Template Haskell to embed the result of an IO computation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -389476,8 +392289,10 @@ self: {
     }:
     mkDerivation {
       pname = "io-sim";
-      version = "1.9.1.0";
-      sha256 = "0l6plpb8d9qcdfnf58gw3cwvyc2ibrfkycznr5zxq9lqkhddx9bn";
+      version = "1.10.0.0";
+      sha256 = "02gk2xgiv9mrl1cvwqabi8rki7w15cj23s65h0qmw1dyf29rbb9q";
+      revision = "1";
+      editedCabalFile = "1qmnvisf3r4n2ji4z0k3fskbwk8ys9p84mrhapa8ymsray2ccwz4";
       libraryHaskellDepends = [
         base
         containers
@@ -389510,7 +392325,7 @@ self: {
         io-classes
       ];
       description = "A pure simulator for monadic concurrency with STM";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -389935,7 +392750,7 @@ self: {
         text
       ];
       description = "Library for IP and MAC addresses";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -390129,7 +392944,7 @@ self: {
         text
       ];
       description = "Internal Phonetic Alphabet (IPA)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -390237,6 +393052,50 @@ self: {
     }
   ) { };
 
+  ipedb = callPackage (
+    {
+      mkDerivation,
+      base,
+      directory,
+      filepath,
+      ghc-events,
+      optparse-applicative,
+      sqlite-simple,
+      tasty,
+      tasty-hunit,
+      temporary,
+      text,
+    }:
+    mkDerivation {
+      pname = "ipedb";
+      version = "0.1.0.0";
+      sha256 = "166j51hla80z0gx0h99pglxhjihqdl1kg5zgqxp791mcwb4ar48l";
+      revision = "1";
+      editedCabalFile = "0bqy75q125kldyhxvgyf58fdcbdnm1h9293vz20zaa1ky9ffh31h";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        ghc-events
+        optparse-applicative
+        sqlite-simple
+        text
+      ];
+      executableHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        directory
+        filepath
+        tasty
+        tasty-hunit
+        temporary
+      ];
+      description = "Generate a database for IPE data";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "ipedb";
+    }
+  ) { };
+
   ipfs = callPackage (
     {
       mkDerivation,
@@ -390353,7 +393212,7 @@ self: {
         text
       ];
       description = "Auto-generated IPFS HTTP API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -390398,7 +393257,7 @@ self: {
         text
       ];
       description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -390986,6 +393845,8 @@ self: {
       pname = "irc-core";
       version = "2.13";
       sha256 = "0z95cl8pg6zhzmz642bzgxc0525645whvxbmz6h1i8g1mll3i6kx";
+      revision = "1";
+      editedCabalFile = "055qxsnaq618lcal3qbp8nv4b0j0xl55nkm3c552imczac4pxjpk";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -391004,7 +393865,7 @@ self: {
         text
       ];
       description = "IRC core library for glirc";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -391407,7 +394268,7 @@ self: {
       ];
       doHaddock = false;
       description = "RFC-compliant universal resource identifier library (URL, URI, IRI)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -391577,7 +394438,7 @@ self: {
         text
       ];
       description = "Haskell CLI framework";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -391724,7 +394585,7 @@ self: {
         text
       ];
       description = "ISBN Validation and Manipulation";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -392272,7 +395133,7 @@ self: {
         text
       ];
       description = "Isomorphism typeclass as a lawful solution to the conversion problem";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -394102,7 +396963,7 @@ self: {
       ];
       doHaddock = false;
       description = "Functional, expression-oriented data processing language";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       mainProgram = "ja";
       maintainers = [ lib.maintainers.sternenseemann ];
     }
@@ -394145,7 +397006,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libjack2 ];
       description = "Bindings for the JACK Audio Connection Kit";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { inherit (pkgs) libjack2; };
@@ -394389,7 +397250,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Generate flamegraphs from Jaeger .json dumps.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "jaeger-flamegraph";
       broken = true;
@@ -394645,7 +397506,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Japanese holidays utility";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -394757,7 +397618,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Stack-based concatenative language embedded in Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -395303,7 +398164,7 @@ self: {
         vector
       ];
       description = "Labeled one-dimensional arrays";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "bench-report";
     }
   ) { };
@@ -395352,7 +398213,7 @@ self: {
         vector
       ];
       description = "Type-safe data frames based on higher-kinded types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -395399,7 +398260,7 @@ self: {
         vector
       ];
       description = "IO operations for the `javelin` package";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -395854,7 +398715,7 @@ self: {
         time
       ];
       description = "Yet another streaming library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -395949,7 +398810,7 @@ self: {
         text
       ];
       description = "Handle Jira wiki markup";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "jira-wiki-markup";
     }
   ) { };
@@ -396367,7 +399228,7 @@ self: {
         time
       ];
       description = "Job queue";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -396727,7 +399588,7 @@ self: {
         text
       ];
       description = "JSON with Structure";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -396781,7 +399642,7 @@ self: {
         text
       ];
       description = "OpenAPI Definitions for Jordan, Automatically";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -396841,7 +399702,7 @@ self: {
         transformers
       ];
       description = "Servant Combinators for Jordan";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -396895,7 +399756,7 @@ self: {
         transformers
       ];
       description = "Servant Client Instances for Jordan Servant Types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -396961,7 +399822,7 @@ self: {
         transformers
       ];
       description = "OpenAPI schemas for Jordan-Powered Servant APIs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -397018,7 +399879,7 @@ self: {
         wai
       ];
       description = "Servers for Jordan-Based Servant Combinators";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -397120,7 +399981,7 @@ self: {
         time
       ];
       description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -397195,7 +400056,7 @@ self: {
         time
       ];
       description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -397365,7 +400226,7 @@ self: {
         hspec
       ];
       description = "Transform Joy code using conditional rewrite rules";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -397418,7 +400279,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "FFI bindings to libjpeg-turbo";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -397698,7 +400559,7 @@ self: {
         transformers
       ];
       description = "DOM library that uses jsaddle to support both GHCJS and GHC";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -397733,7 +400594,7 @@ self: {
         text
       ];
       description = "JSaddle Hello World, an example package";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -397798,7 +400659,7 @@ self: {
         websockets
       ];
       description = "Interface for JavaScript that works with GHCJS and GHC";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [
         lib.maintainers.alexfmpe
         lib.maintainers.maralorn
@@ -397826,7 +400687,7 @@ self: {
       ];
       doHaddock = false;
       description = "Run JSaddle JSM with the GHC Wasm backend";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     }
   ) { };
 
@@ -397926,7 +400787,7 @@ self: {
       version = "0.9.9.3";
       sha256 = "1icj9cll7ifrharpngwhzgfyxixckd6viwk94f8wmqbf4yyyfsmv";
       description = "Interface for JavaScript that works with GHCJS and GHC";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       platforms = lib.platforms.darwin;
       maintainers = [ lib.maintainers.alexfmpe ];
     }
@@ -397985,7 +400846,7 @@ self: {
         text
       ];
       description = "Convenience utilities for JSDOM";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -398042,7 +400903,7 @@ self: {
         text
       ];
       description = "Support for serialising Haskell to and from JSON";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -398560,7 +401421,7 @@ self: {
         text
       ];
       description = "Load JSON from files in a directory structure";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "jsondir";
     }
   ) { };
@@ -398700,7 +401561,7 @@ self: {
         hspec
       ];
       description = "JSON Feed";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -399125,7 +401986,7 @@ self: {
         text
       ];
       description = "Kitchen sink for querying JSON";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -399519,7 +402380,52 @@ self: {
         vector
       ];
       description = "Type-level JSON specification";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  json-spec_1_3_0_1 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      hspec,
+      om-show,
+      scientific,
+      text,
+      time,
+      vector,
+    }:
+    mkDerivation {
+      pname = "json-spec";
+      version = "1.3.0.1";
+      sha256 = "1yn0qci01vq36lb8njc80nww7g3aj719254x7f4lqmlw4pafwrlp";
+      libraryHaskellDepends = [
+        aeson
+        base
+        containers
+        scientific
+        text
+        time
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        hspec
+        om-show
+        scientific
+        text
+        time
+        vector
+      ];
+      description = "Type-level JSON specification";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -399536,8 +402442,8 @@ self: {
     }:
     mkDerivation {
       pname = "json-spec-elm";
-      version = "0.4.0.6";
-      sha256 = "1kr3j1lijki5v54gq71c1qm2ina2nsk26msxix4w9z8dg66nk6xr";
+      version = "0.4.0.7";
+      sha256 = "0n2kr3816qgs4hrhnl5xjvh58ixpjwv5rhf8s3kxdhn5ik5nwj23";
       libraryHaskellDepends = [
         base
         bound
@@ -399555,7 +402461,44 @@ self: {
         text
       ];
       description = "Elm code generate for `json-spec`";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  json-spec-elm_0_5_0_2 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bound,
+      containers,
+      elm-syntax,
+      json-spec,
+      mtl,
+      text,
+    }:
+    mkDerivation {
+      pname = "json-spec-elm";
+      version = "0.5.0.2";
+      sha256 = "1mkr06rip1x6i4dcjsfk9ir6w7sxn04h5zj7h5fcgd70aq0hpqy3";
+      libraryHaskellDepends = [
+        base
+        bound
+        containers
+        elm-syntax
+        json-spec
+        mtl
+        text
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        elm-syntax
+        json-spec
+        text
+      ];
+      description = "Elm code generate for `json-spec`";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -399587,8 +402530,8 @@ self: {
     }:
     mkDerivation {
       pname = "json-spec-elm-servant";
-      version = "0.4.4.1";
-      sha256 = "0236nyzixcj5z10kmmdxhdzb9gmaczjk0p9icgyh972zm6ql00l0";
+      version = "0.4.4.3";
+      sha256 = "011kgpias7bic73aj5v8islkiwyys7jy9llcncafa9hm9bc3dbs4";
       libraryHaskellDepends = [
         base
         bound
@@ -399631,7 +402574,84 @@ self: {
         uuid
       ];
       description = "Generated elm code for servant APIs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  json-spec-elm-servant_0_5_0_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      binary,
+      bound,
+      bytestring,
+      containers,
+      cookie,
+      directory,
+      elm-syntax,
+      filepath,
+      hspec,
+      http-types,
+      json-spec,
+      json-spec-elm,
+      mtl,
+      prettyprinter,
+      process,
+      servant,
+      text,
+      time,
+      unordered-containers,
+      uuid,
+    }:
+    mkDerivation {
+      pname = "json-spec-elm-servant";
+      version = "0.5.0.0";
+      sha256 = "0zix48wxcaszz52dg2sykrpw8853w98ali7wyvn3dg1m1v7h1s15";
+      libraryHaskellDepends = [
+        base
+        bound
+        containers
+        directory
+        elm-syntax
+        filepath
+        http-types
+        json-spec
+        json-spec-elm
+        mtl
+        prettyprinter
+        process
+        servant
+        text
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        binary
+        bound
+        bytestring
+        containers
+        cookie
+        directory
+        elm-syntax
+        filepath
+        hspec
+        http-types
+        json-spec
+        json-spec-elm
+        mtl
+        prettyprinter
+        process
+        servant
+        text
+        time
+        unordered-containers
+        uuid
+      ];
+      description = "Generated elm code for servant APIs";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -399673,7 +402693,50 @@ self: {
         time
       ];
       description = "json-spec-openapi";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  json-spec-openapi_1_2_0_2 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      hspec,
+      insert-ordered-containers,
+      json-spec,
+      lens,
+      openapi3,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "json-spec-openapi";
+      version = "1.2.0.2";
+      sha256 = "066xzjx1h2bsz0a49xl0wsvwm8zc2vdnh3kwwqpwma0bill6b8bf";
+      libraryHaskellDepends = [
+        aeson
+        base
+        insert-ordered-containers
+        json-spec
+        lens
+        openapi3
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        hspec
+        insert-ordered-containers
+        json-spec
+        lens
+        openapi3
+        text
+        time
+      ];
+      description = "json-spec-openapi";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -399838,7 +402901,7 @@ self: {
         text
       ];
       description = "High-performance JSON parser and encoder";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -400032,7 +403095,7 @@ self: {
         vector
       ];
       description = "Automatic type declaration for JSON input data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "json-to-type";
       broken = true;
@@ -400136,7 +403199,7 @@ self: {
         text
       ];
       description = "Tokenize JSON";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -400548,7 +403611,7 @@ self: {
         text-builder
       ];
       description = "Fast and simple JSON encoding toolkit";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -400635,7 +403698,7 @@ self: {
         tasty-hunit
       ];
       description = "JsonLogic Evaluation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -400685,7 +403748,7 @@ self: {
         tasty-hunit
       ];
       description = "JsonLogic Aeson Support";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -400784,7 +403847,7 @@ self: {
         text
       ];
       description = "Jsonnet implementaton in pure Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hs-jsonnet";
       broken = true;
@@ -400924,6 +403987,33 @@ self: {
     }
   ) { };
 
+  jsonrpc = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      hspec,
+      text,
+    }:
+    mkDerivation {
+      pname = "jsonrpc";
+      version = "0.2.0.0";
+      sha256 = "1bhy1bdz4jb128awmqcs5m2s2nna6g0l0q6fx7ix3ix29d40khny";
+      libraryHaskellDepends = [
+        aeson
+        base
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        hspec
+      ];
+      description = "JSON-RPC 2.0 types and type classes for Haskell";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
+    }
+  ) { };
+
   jsonrpc-conduit = callPackage (
     {
       mkDerivation,
@@ -400991,8 +404081,8 @@ self: {
     }:
     mkDerivation {
       pname = "jsonrpc-tinyclient";
-      version = "1.0.1.0";
-      sha256 = "1rhfhyjzfazwvzw7xf3f5xccnd7p4wx9n9avbbrjwj2bzvlfn9b8";
+      version = "1.1.0.0";
+      sha256 = "1w4przplgsgw09h0lh9l84wpzd65wa7agsbp2c37lr9l30spbwrg";
       libraryHaskellDepends = [
         aeson
         base
@@ -401110,8 +404200,8 @@ self: {
     }:
     mkDerivation {
       pname = "jsonschema";
-      version = "0.2.0.0";
-      sha256 = "1paqgmyl1q9nllw83vljckdzj5ir300a3qy866rlj24x4vhqk2df";
+      version = "0.2.0.1";
+      sha256 = "0z111nciwzbj0pdv4c2pfhzby2qkq0fnc35dxbids8cvw58m8ffa";
       libraryHaskellDepends = [
         aeson
         base
@@ -401130,7 +404220,7 @@ self: {
         vector
       ];
       description = "JSON Schema derivation and validation";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -402342,7 +405432,7 @@ self: {
         text
       ];
       description = "Application wrapper for the k8s environment";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -402409,7 +405499,7 @@ self: {
       sha256 = "07x6dsc4d4f3vksi21fxd1vix9wqsydrl17f2xq8858m2ay0j28j";
       doHaddock = false;
       description = "TBA";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -402795,7 +405885,7 @@ self: {
         wide-word
       ];
       description = "Serialization for kafka wire protocol";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -402986,7 +406076,7 @@ self: {
         text
       ];
       description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -403617,7 +406707,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Katip integration for Effectful";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -403903,7 +406993,7 @@ self: {
         unordered-containers
       ];
       description = "Katip scribe for raven (https://sentry.io)";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -404072,7 +407162,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "WAI middleware for logging request and response info through katip";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -404525,7 +407615,7 @@ self: {
         unliftio
       ];
       description = "Unicode segmentation and shaping using kb_text_shape";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -404690,10 +407780,17 @@ self: {
   kdl-hs = callPackage (
     {
       mkDerivation,
+      aeson,
       base,
+      bytestring,
       containers,
+      data-default,
+      directory,
+      filepath,
       megaparsec,
+      pretty-show,
       prettyprinter,
+      process,
       scientific,
       skeletest,
       temporary,
@@ -404702,27 +407799,44 @@ self: {
     }:
     mkDerivation {
       pname = "kdl-hs";
-      version = "0.2.1";
-      sha256 = "0xv1i7830f0ngqlzfkq7x0ii663nb57h2h0p3fjg6g5kl1qk6q5q";
+      version = "1.0.1";
+      sha256 = "1z2y85avj0npgdin46pagyjdnh34sixf5vjasxphkcgshbw4pa8x";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [
         base
         containers
+        data-default
         megaparsec
         prettyprinter
         scientific
         text
         transformers
       ];
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        scientific
+        text
+      ];
       testHaskellDepends = [
         base
         containers
+        directory
+        filepath
+        pretty-show
+        process
+        scientific
         skeletest
         temporary
         text
       ];
       testToolDepends = [ skeletest ];
       description = "KDL language parser and API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "kdl-hs-test-decoder";
     }
   ) { };
 
@@ -406107,7 +409221,7 @@ self: {
       ];
       doHaddock = false;
       description = "Kempe compiler";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "kc";
       broken = true;
@@ -406361,12 +409475,12 @@ self: {
         wreq
       ];
       description = "Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime.";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "keter";
     }
   ) { };
 
-  keter_2_3_0 = callPackage (
+  keter_2_3_2 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -406406,6 +409520,7 @@ self: {
       tasty,
       tasty-hunit,
       template-haskell,
+      temporary,
       text,
       time,
       tls,
@@ -406427,8 +409542,8 @@ self: {
     }:
     mkDerivation {
       pname = "keter";
-      version = "2.3.0";
-      sha256 = "1aih6gp74xh1zw6yq8qr8k24w41j7jzzfnv2j67r099ihg60yi28";
+      version = "2.3.2";
+      sha256 = "01m5pqrfyznmmc4ms94dqpgnsrl5b0mf4ihmnljr2bvnknp2dk7v";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -406492,6 +409607,7 @@ self: {
         base
         bytestring
         conduit
+        containers
         http-client
         http-conduit
         http-types
@@ -406503,6 +409619,7 @@ self: {
         stm
         tasty
         tasty-hunit
+        temporary
         tls
         transformers
         unix
@@ -406510,9 +409627,10 @@ self: {
         wai
         warp
         wreq
+        yaml
       ];
       description = "Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime.";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "keter";
     }
@@ -406614,7 +409732,7 @@ self: {
         wai-extra
       ];
       description = "Simple Keter rate limiting plugin";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { inherit (pkgs) zlib; };
 
@@ -406740,7 +409858,7 @@ self: {
         split
       ];
       description = "CLI and library to generate QR codes";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "kewar";
     }
   ) { };
@@ -406950,7 +410068,7 @@ self: {
         text
       ];
       description = "An abstract Handle for accessing collections in stores like Redis";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -406983,7 +410101,7 @@ self: {
         text
       ];
       description = "Validate a keyed-vals Handle";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -407019,7 +410137,7 @@ self: {
         keyed-vals-hspec-tests
       ];
       description = "Implements a keyed-vals Handle using in-process memory";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -407067,7 +410185,7 @@ self: {
         tmp-proc-redis
       ];
       description = "Access Redis using a keyed-vals Handle";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -407499,8 +410617,8 @@ self: {
       pname = "ki";
       version = "1.0.1.2";
       sha256 = "167cak6krbgpni3dakzg4jrv1v0mgips5pg10dh2fl2d0jskrckk";
-      revision = "2";
-      editedCabalFile = "19d3a6pc0qnkic7kkazi8ci5y2vqam1kx18r9g2zmqyimnk5m7vg";
+      revision = "3";
+      editedCabalFile = "1h8rjg3n7w01vjip7hry5r17gkr3p9yf41vla3hqlkqvl6mj219m";
       libraryHaskellDepends = [
         base
         containers
@@ -407513,7 +410631,7 @@ self: {
         tasty-hunit
       ];
       description = "A lightweight structured concurrency library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -407545,7 +410663,7 @@ self: {
         tasty-hunit
       ];
       description = "Adaptation of the ki library for the effectful ecosystem";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -407562,15 +410680,15 @@ self: {
       pname = "ki-unlifted";
       version = "1.0.0.2";
       sha256 = "11b4jm161znazwf2pn3qdn4dbz1g5a12dvhm03ddx6lrha7yv1xv";
-      revision = "3";
-      editedCabalFile = "0w6fcxq04c1awpv87kw8i0w7hhkxfcl9x2ki4dvsj8fmrj9ii2z0";
+      revision = "4";
+      editedCabalFile = "0ikigqff47z5b4r09rndszr2mqgq36clskyrysvr3i9jx0jxj0c5";
       libraryHaskellDepends = [
         base
         ki
         unliftio-core
       ];
       description = "A lightweight structured concurrency library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -407766,7 +410884,7 @@ self: {
         hspec-core
       ];
       description = "Boolean strong typing";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -407891,7 +411009,7 @@ self: {
         singletons-base
       ];
       description = "Type-level integers. Like KnownNat, but for integers.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -407920,7 +411038,7 @@ self: {
         singletons-base
       ];
       description = "Type-level rationals. Like KnownNat, but for rationals.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -407952,7 +411070,7 @@ self: {
         hspec
       ];
       description = "A category polymorphic `Functor` typeclass";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -408290,7 +411408,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Advanced keyboard remapping utility";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "kmonad";
       maintainers = [
         lib.maintainers.auscyber
@@ -408579,7 +411697,7 @@ self: {
         transformers
       ];
       description = "Memory-backed handles";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -408645,7 +411763,7 @@ self: {
         bifunctors
       ];
       description = "Easy type-level lists with term-level membership proofs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -408902,7 +412020,7 @@ self: {
         vector
       ];
       description = "a concatenative not-quite-lisp for kittens";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "koneko";
       broken = true;
@@ -408937,7 +412055,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Formalising the rules of Konnakol, an Indian percussional art form";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -409013,7 +412131,7 @@ self: {
         transformers-base
       ];
       description = "Utilities for working with many HStringTemplate templates from files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -409291,7 +412409,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Krank checks issue tracker link status in your source code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "krank";
       maintainers = [ lib.maintainers.sternenseemann ];
     }
@@ -410033,7 +413151,7 @@ self: {
       executableHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "coverage driven random testing framework";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "kudzu";
       broken = true;
@@ -410215,7 +413333,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Find the alpha emoji";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -410237,8 +413355,8 @@ self: {
     }:
     mkDerivation {
       pname = "kvitable";
-      version = "1.1.1.0";
-      sha256 = "03mk2hkv5c2rc5xpc23g66akahz719d9ialq2zfg81az32d84x79";
+      version = "1.1.1.1";
+      sha256 = "0mspa616p0kb7y99hh4kvh65zi0vv1r7j4k3m1kqfjby5fivjccz";
       libraryHaskellDepends = [
         base
         containers
@@ -410708,7 +413826,7 @@ self: {
         text
       ];
       description = "Generate Ruby clients from Servant APIs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -410824,7 +413942,7 @@ self: {
         text
       ];
       description = "Interpreters for lambda calculus, calculus of constructions, and more";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "lambda";
       broken = true;
@@ -411091,7 +414209,7 @@ self: {
         read-bounded
       ];
       description = "Declarative command-line parser with type-driven pattern matching";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -411750,7 +414868,7 @@ self: {
         mtl
       ];
       description = "Lambdabot for Telegram";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "telegram-lambdabot";
       broken = true;
@@ -412515,7 +415633,7 @@ self: {
         tasty-bench
       ];
       description = "A libary for generating low-level sounds with high-level combinators";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -412740,7 +415858,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A high-level binding to the LAME encoder";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -412809,7 +415927,7 @@ self: {
         tasty-hunit
       ];
       description = "Run dependent IO actions asynchronously";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -412869,7 +415987,7 @@ self: {
       testToolDepends = [ markdown-unlit ];
       doHaddock = false;
       description = "Haskell bindings for the Linux Landlock API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "landlocked";
     }
@@ -413053,7 +416171,7 @@ self: {
         text
       ];
       description = "Parser, pretty-printer, and more for the Modula-2 programming language";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "parse";
     }
@@ -413090,7 +416208,7 @@ self: {
         vector
       ];
       description = "ASN.1 encoding and decoding";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -413279,7 +416397,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Parsing and pretty-printing Bash shell scripts";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -413380,8 +416498,8 @@ self: {
     }:
     mkDerivation {
       pname = "language-c";
-      version = "0.10.1";
-      sha256 = "08x4hm0dbrqdl8mmwg3bbfja03w122lyv8qdilh90kvfwmyqf9cv";
+      version = "0.10.2";
+      sha256 = "08pmap439qgmw5jnw0ha42as0zaldqbawb61v3z67lm2lkfmw4zi";
       libraryHaskellDepends = [
         array
         base
@@ -413405,7 +416523,7 @@ self: {
         process
       ];
       description = "Analysis and generation of C code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -413908,7 +417026,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Dockerfile parser, pretty-printer and embedded DSL";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
     }
   ) { };
 
@@ -413965,7 +417083,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Dockerfile parser, pretty-printer and embedded DSL";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -414090,7 +417208,7 @@ self: {
         pretty
       ];
       description = "A library for the analysis and creation of Graphviz DOT files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ppdot";
     }
   ) { };
@@ -414356,7 +417474,7 @@ self: {
         text
       ];
       description = "Datatypes and parsing/printing functions to represent the Gemini markup language";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -414753,7 +417871,7 @@ self: {
         parsec
       ];
       description = "javascript parser for es6 and es7";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -414863,7 +417981,7 @@ self: {
         text
       ];
       description = "Lua parser and pretty-printer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -416162,6 +419280,8 @@ self: {
       pname = "language-toolkit";
       version = "1.3.0.0";
       sha256 = "0zfa0lzj0gvzzfgvs97ajfd3zy1sz3m37j508la8swkjvh83s6sm";
+      revision = "1";
+      editedCabalFile = "0g5bw5kjn9lscaz055nrr0c2ks7xhxv3vs1hcm1rp2wy1816fyw1";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -416289,7 +419409,7 @@ self: {
         QuickCheck
       ];
       description = "Matrix programming library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -416381,7 +419501,7 @@ self: {
         utility-ht
       ];
       description = "Numerical Linear Algebra using LAPACK";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -416546,7 +419666,7 @@ self: {
         vector
       ];
       description = "Conversion of objects between 'lapack' and 'hmatrix'";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -416629,7 +419749,7 @@ self: {
         validation-selective
       ];
       description = "Scalable anonymous records";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -416678,7 +419798,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Generic programming API for large-records and large-anon";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -416832,7 +419952,7 @@ self: {
         transformers
       ];
       description = "Efficient compilation for large records, linear in the size of the record";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -417279,7 +420399,7 @@ self: {
         pandoc-types
       ];
       description = "Use actual LaTeX to render formulae inside Hakyll pages";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -417317,7 +420437,7 @@ self: {
         transformers
       ];
       description = "A library for rendering LaTeX formulae as SVG using an actual LaTeX";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -417355,7 +420475,7 @@ self: {
         pandoc-types
       ];
       description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "latex-svg-filter";
     }
@@ -417389,7 +420509,7 @@ self: {
         random
       ];
       description = "Pure incremental byte parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -417420,7 +420540,7 @@ self: {
         time
       ];
       description = "lathe + time";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -417718,7 +420838,7 @@ self: {
         transformers
       ];
       description = "Hedgehog support for lawful-classes";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -417757,7 +420877,7 @@ self: {
         transformers
       ];
       description = "QuickCheck support for lawful-classes";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -417770,7 +420890,7 @@ self: {
       sha256 = "0dza7qrq54k0p50bv7hj9y0c12kl3x51j6kh9k7aammfnl14hrri";
       libraryHaskellDepends = [ base ];
       description = "Types for lawful-classes";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -417825,11 +420945,11 @@ self: {
         text
       ];
       description = "Lawful typeclasses for bidirectional conversion between types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
-  lawful-conversions_0_3_1 = callPackage (
+  lawful-conversions_0_4_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -417844,15 +420964,13 @@ self: {
       tasty,
       tasty-quickcheck,
       text,
-      time,
       unordered-containers,
-      uuid-types,
       vector,
     }:
     mkDerivation {
       pname = "lawful-conversions";
-      version = "0.3.1";
-      sha256 = "0rv5q5svsz5r20i5yd0hdlwgg39q1j9xngc3ng1xajiy3kqnfysk";
+      version = "0.4.0";
+      sha256 = "1m6glf5dsxs7fp6qizij7byvwiqflm3db4dxd3m7q3yy4izkk0ln";
       libraryHaskellDepends = [
         base
         bytestring
@@ -417862,9 +420980,7 @@ self: {
         profunctors
         QuickCheck
         text
-        time
         unordered-containers
-        uuid-types
         vector
       ];
       testHaskellDepends = [
@@ -417878,7 +420994,7 @@ self: {
         text
       ];
       description = "Lawful typeclasses for bidirectional conversion between types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -418227,16 +421343,19 @@ self: {
     }:
     mkDerivation {
       pname = "layoutz";
-      version = "0.2.0.0";
-      sha256 = "0pzrmffr2bkj9c923apcgzwq864jsk016pi7njphfmykk9dazazg";
+      version = "0.3.3.0";
+      sha256 = "0ra8v9ybpx5i69g0w2r8j2xqnsq90l74ka2x8p221c134g0i7vrp";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [ base ];
+      executableHaskellDepends = [ base ];
       testHaskellDepends = [
         base
         tasty
         tasty-hunit
       ];
-      description = "Simple, beautiful CLI output for Haskell";
-      license = lib.licensesSpdx."Apache-2.0";
+      description = "Simple, beautiful CLI output";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -418258,7 +421377,7 @@ self: {
         tasty-hunit
       ];
       description = "Simple, beautiful CLI output for Haskell";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -418351,7 +421470,7 @@ self: {
         transformers-base
       ];
       description = "Asynchronous actions that don't start right away";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -418382,7 +421501,7 @@ self: {
         tasty-hunit
       ];
       description = "A bracket with lazy resource allocation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -418641,7 +421760,8 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Alternative lazy ByteString and ST-like IO Handle";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -418757,7 +421877,7 @@ self: {
       sha256 = "1p0qhdbcnmx17j069n3w89jv8wpxzari4ihylrjk2x78k4b3p1cb";
       libraryHaskellDepends = [ base ];
       description = "LazyIO applicative for asymptotic performance";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -419153,7 +422273,7 @@ self: {
         yaml
       ];
       description = "See README for synopsis";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ldap-scim-bridge";
     }
@@ -419847,7 +422967,7 @@ self: {
         text
       ];
       description = "Signed and unsigned LEB128 codec for binary library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -420897,7 +424017,7 @@ self: {
         lens-action
       ];
       description = "Lens interface for your filesystem; still a bit experimental";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -420918,7 +424038,7 @@ self: {
         lens
       ];
       description = "Indexed version of Plated";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -421087,8 +424207,8 @@ self: {
       pname = "lens-properties";
       version = "4.11.1";
       sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g";
-      revision = "9";
-      editedCabalFile = "14hiqpw4n3f73s62qqaqzb5pl47bm35qnyiwcxi7gn3acmzycjls";
+      revision = "10";
+      editedCabalFile = "0m1hds617w5nmnfrkcr9nd0isc1k2qnhjimqccfah8blm4jy17g7";
       libraryHaskellDepends = [
         base
         lens
@@ -421249,7 +424369,7 @@ self: {
         tell
       ];
       description = "MonadTell-based lens combinators";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -421474,7 +424594,7 @@ self: {
         witherable
       ];
       description = "lens-compatible tools for working with witherable";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -421634,7 +424754,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "frugal issue tracker";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       mainProgram = "lentil";
       maintainers = [ lib.maintainers.rvl ];
     }
@@ -421823,7 +424943,7 @@ self: {
       ];
       executableSystemDepends = [ openssl ];
       description = "The Stateless Password Manager";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       mainProgram = "lesspass";
     }
   ) { inherit (pkgs) openssl; };
@@ -422082,7 +425202,7 @@ self: {
         util
       ];
       description = "See README for more info";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -422150,6 +425270,47 @@ self: {
     }
   ) { };
 
+  lfudacaching = callPackage (
+    {
+      mkDerivation,
+      base,
+      deepseq,
+      ghc-prim,
+      hashable,
+      psqueues,
+      tasty,
+      tasty-bench,
+      tasty-hunit,
+    }:
+    mkDerivation {
+      pname = "lfudacaching";
+      version = "0.1.0.1";
+      sha256 = "0i6yjcvkmwzk07xjm8z58ing157r35mh8b3f295q19ix057y6i79";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        deepseq
+        ghc-prim
+        hashable
+        psqueues
+      ];
+      executableHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        tasty
+        tasty-hunit
+      ];
+      benchmarkHaskellDepends = [
+        base
+        tasty-bench
+      ];
+      description = "Pure LFUDA, GDSF, and LFU cache implementations";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      mainProgram = "lfuda-demo";
+    }
+  ) { };
+
   lgtk = callPackage (
     {
       mkDerivation,
@@ -422416,7 +425577,7 @@ self: {
         regex-compat
       ];
       description = "Preprocessor for typesetting Haskell sources with LaTeX";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       mainProgram = "lhs2TeX";
       maintainers = [ lib.maintainers.nomeata ];
     }
@@ -422476,7 +425637,7 @@ self: {
         tasty-hunit
       ];
       description = "A binding to the libBF library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -422586,7 +425747,7 @@ self: {
         temporary
       ];
       description = "Haskell interface to libarchive";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) libarchive; };
 
@@ -422793,7 +425954,7 @@ self: {
       sha256 = "12wsws5fsq3khfxakppagi5730c38ahh1ngax3gyh9ppqhzgfqmn";
       doHaddock = false;
       description = "libffi clibs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -423246,7 +426407,7 @@ self: {
         uuid
       ];
       description = "A Haskell implementation of JSON Web Token (JWT)";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -423733,7 +426894,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "An MPD client library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -423992,7 +427153,7 @@ self: {
             QuickCheck
           ];
           description = "Parsing, formatting, and validating international phone numbers";
-          license = lib.licensesSpdx."MIT";
+          license = lib.meta.getLicenseFromSpdxId "MIT";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -424301,7 +427462,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Move/rename according a set of rules";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "librarian-exe";
     }
@@ -424399,7 +427560,7 @@ self: {
       sha256 = "09iyvp3271l5a1idklzxdcs3wxmjxqigkn1cjjv4vk8vww6zwzkb";
       doHaddock = false;
       description = "TBA";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -424460,7 +427621,7 @@ self: {
             transformers
           ];
           description = "libremidi bindings for haskell";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           mainProgram = "libremidi-exe";
           broken = true;
@@ -424507,7 +427668,7 @@ self: {
             libressl
           ];
           description = "libtls bindings";
-          license = lib.licensesSpdx."BSD-2-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -424580,9 +427741,10 @@ self: {
       ];
       doHaddock = false;
       description = "A versatile, flexible and executable formal model for the RISC-V architecture";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "riscv-tiny";
+      maintainers = [ lib.maintainers.sternenseemann ];
       broken = true;
     }
   ) { };
@@ -424703,7 +427865,7 @@ self: {
       testPkgconfigDepends = [ libsodium ];
       testToolDepends = [ c2hs ];
       description = "Low-level bindings to the libsodium C library";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -424722,7 +427884,7 @@ self: {
       libraryHaskellDepends = [ base ];
       librarySystemDepends = [ libsodium ];
       description = "FFI bindings to libsodium";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { inherit (pkgs) libsodium; };
@@ -424917,8 +428079,8 @@ self: {
       pname = "libsystemd-journal";
       version = "1.4.6.0";
       sha256 = "0wxf56i9mv6fm40rwzawbf829z73r4x7jchgardl770dg5zmy9yb";
-      revision = "2";
-      editedCabalFile = "0y4i59d0n5zdj3504xs6hksxzr75f784n4g4nyq1y2m4iy4ay1p4";
+      revision = "3";
+      editedCabalFile = "14m0cy3zqvzqzyg8cnw5vjg2p7ca897v2v7221ah469bq0cc0zxp";
       libraryHaskellDepends = [
         base
         bytestring
@@ -424937,7 +428099,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ systemd ];
       description = "Haskell bindings to libsystemd-journal";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
     }
   ) { inherit (pkgs) systemd; };
@@ -424990,7 +428152,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libtelnet ];
       description = "Bindings to libtelnet";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -425064,7 +428226,7 @@ self: {
             safe-exceptions
           ];
           description = "Haskell bindings for PyTorch";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
         }
       )
       {
@@ -425088,7 +428250,7 @@ self: {
         ghc
       ];
       description = "Helpers for integrating libtorch-ffi with Hasktorch";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -425109,7 +428271,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libversion ];
       description = "Haskell binding to libversion";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) libversion; };
 
@@ -425134,7 +428296,7 @@ self: {
       libraryPkgconfigDepends = [ libvirt ];
       libraryToolDepends = [ cpphs ];
       description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -425360,7 +428522,7 @@ self: {
       sha256 = "0jaif8y10ql8rmkfhm6nwfk65q8rnpk58a6j5cf4gksz9v2nnlh4";
       doHaddock = false;
       description = "libyaml clibs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -425387,7 +428549,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libyaml ];
       description = "Low-level, streaming YAML interface via streamly";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) libyaml; };
 
@@ -425482,7 +428644,7 @@ self: {
         directory
       ];
       description = "A license compatibility helper";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "licensor";
       broken = true;
@@ -425595,7 +428757,7 @@ self: {
         tomland
       ];
       description = "Synchronize personal configs across multiple machines";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "life";
       broken = true;
@@ -425640,7 +428802,7 @@ self: {
         zenhack-prelude
       ];
       description = "Flexible manual resource management";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -426104,7 +429266,7 @@ self: {
         transformers
       ];
       description = "LIFX LAN API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -426314,7 +429476,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "LightStep OpenTracing client library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "lightstep-haskell-stress-test";
     }
@@ -426902,7 +430064,7 @@ self: {
         random
       ];
       description = "Line-indexed file reader";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -427172,14 +430334,15 @@ self: {
       ];
       doHaddock = false;
       description = "Standard library for linear types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
-  linear-base_0_6_0 = callPackage (
+  linear-base_0_7_0 = callPackage (
     {
       mkDerivation,
       base,
+      bytestring,
       containers,
       deepseq,
       ghc-bignum,
@@ -427206,10 +430369,11 @@ self: {
     }:
     mkDerivation {
       pname = "linear-base";
-      version = "0.6.0";
-      sha256 = "0rjqzzrw513nrjf4fmq78mnnz63c1j7wgipqp273klx96iwznbk7";
+      version = "0.7.0";
+      sha256 = "05702yygp25l1268h4clcsacsdp8xvkqhzafax4q5bjh61hg0g9d";
       libraryHaskellDepends = [
         base
+        bytestring
         containers
         ghc-bignum
         ghc-prim
@@ -427248,7 +430412,7 @@ self: {
       ];
       doHaddock = false;
       description = "Standard library for linear types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -427393,7 +430557,7 @@ self: {
         text
       ];
       description = "Linear core validates optimizations wrt linearity";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -427410,8 +430574,8 @@ self: {
     }:
     mkDerivation {
       pname = "linear-free";
-      version = "0.1.0.0";
-      sha256 = "1j0g3zc3gaiz93c1zirhkh1rgj14ym12z1z3w19fr7ilknn86aw4";
+      version = "0.3.0.0";
+      sha256 = "1x31l3rxdpd2f5xdk1l623acfa5aw1vq7p01mimcbh0kpzzx6xn6";
       libraryHaskellDepends = [
         base
         linear-base
@@ -427424,7 +430588,9 @@ self: {
         QuickCheck
       ];
       description = "Linear free monads";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -427492,7 +430658,7 @@ self: {
         reflection
       ];
       description = "Geographic coordinates, built on the linear package";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -427550,6 +430716,62 @@ self: {
     }
   ) { };
 
+  linear-massiv = callPackage (
+    {
+      mkDerivation,
+      base,
+      criterion,
+      deepseq,
+      ghc-prim,
+      hmatrix,
+      linear,
+      massiv,
+      primitive,
+      QuickCheck,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      vector,
+    }:
+    mkDerivation {
+      pname = "linear-massiv";
+      version = "0.1.0.5";
+      sha256 = "1z8zwhgjrg4yw1ilcd80wk3w139n5j3pvskg4mys9p9h6vwkqi5f";
+      libraryHaskellDepends = [
+        base
+        deepseq
+        ghc-prim
+        linear
+        massiv
+        primitive
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        linear
+        massiv
+        QuickCheck
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        vector
+      ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        deepseq
+        hmatrix
+        linear
+        massiv
+        vector
+      ];
+      description = "Type-safe numerical linear algebra backed by massiv arrays";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   linear-opengl = callPackage (
     {
       mkDerivation,
@@ -427608,7 +430830,7 @@ self: {
         utility-ht
       ];
       description = "Linear Programming basic definitions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -427635,7 +430857,7 @@ self: {
         constraints
       ];
       description = "Build SMC morphisms using linear types";
-      license = lib.licensesSpdx."LGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-or-later";
     }
   ) { };
 
@@ -427741,7 +430963,6 @@ self: {
       description = "Use SMT solvers to solve linear systems over integers and rationals";
       license = lib.licenses.bsd3;
       badPlatforms = [ "aarch64-linux" ];
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -427935,8 +431156,8 @@ self: {
     }:
     mkDerivation {
       pname = "linenoise";
-      version = "0.4.2";
-      sha256 = "19fzj9rwsajh702vhhfshwkwd5kwgl8c5iw02j8wiivamnvrv611";
+      version = "0.6.0";
+      sha256 = "13yia363m9b1xp89czqi4vmid9acbii9h01gj27nkjrlfnbck59q";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -428029,7 +431250,7 @@ self: {
         hspec
       ];
       description = "File extension based programming language detection";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "generate";
       broken = true;
@@ -428057,6 +431278,60 @@ self: {
     }
   ) { };
 
+  link-canonical = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      case-insensitive,
+      containers,
+      exceptions,
+      generic-lens,
+      http-client,
+      http-client-tls,
+      http-types,
+      lens,
+      modern-uri,
+      mtl,
+      tasty,
+      tasty-hunit,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "link-canonical";
+      version = "0.1.0.0";
+      sha256 = "1jl6k8jp2xda3cs9p7jg2xghk4f80sx38vq9m69kwr36gww07cl9";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        case-insensitive
+        containers
+        exceptions
+        generic-lens
+        http-client
+        http-client-tls
+        http-types
+        lens
+        modern-uri
+        text
+        time
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        http-types
+        modern-uri
+        mtl
+        tasty
+        tasty-hunit
+        text
+      ];
+      description = "URL canonicalization library for semantic link identity";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   link-relations = callPackage (
     {
       mkDerivation,
@@ -428093,23 +431368,26 @@ self: {
       http-client,
       http-client-tls,
       http-types,
+      list-t,
       lrucache,
       monad-logger,
       mtl,
       network-uri,
-      optparse-applicative,
+      opt-env-conf,
       path,
       path-io,
       retry,
       stm,
+      stm-containers,
       tagsoup,
       text,
       unliftio,
+      validity-network-uri,
     }:
     mkDerivation {
       pname = "linkcheck";
-      version = "0.1.0.0";
-      sha256 = "18wb2naxqhvnvyjjmgbsa0ky98ikgrdhrcra9bxy1vfizhrpwhfn";
+      version = "0.3.0.0";
+      sha256 = "0xqqrqj1p6p41mas7f23k0v3i2h43494r7cy2zpw99dd55fqsc33";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -428121,21 +431399,23 @@ self: {
         http-client
         http-client-tls
         http-types
+        list-t
         lrucache
         monad-logger
         mtl
         network-uri
-        optparse-applicative
+        opt-env-conf
         path
         path-io
         retry
         stm
+        stm-containers
         tagsoup
         text
         unliftio
+        validity-network-uri
       ];
       executableHaskellDepends = [ base ];
-      testHaskellDepends = [ base ];
       description = "Check for broken links in CI";
       license = lib.licenses.mit;
       mainProgram = "linkcheck";
@@ -428627,7 +431907,7 @@ self: {
       sha256 = "0j5q4ddsg3bmkhb82da39rj3h1knhxm74z3jknprzwhavz2wxcn6";
       libraryHaskellDepends = [ base ];
       description = "Linux capabilities Haskell data type";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -429155,7 +432435,7 @@ self: {
         mtl
       ];
       description = "RISC-V Core";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -429485,7 +432765,7 @@ self: {
         unordered-containers
       ];
       description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "fixpoint";
       maintainers = [ lib.maintainers.artem ];
     }
@@ -429607,7 +432887,7 @@ self: {
         unordered-containers
       ];
       description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fixpoint";
       maintainers = [ lib.maintainers.artem ];
@@ -429805,7 +433085,7 @@ self: {
       ];
       testSystemDepends = [ z3 ];
       description = "Liquid Types for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.artem ];
     }
   ) { inherit (pkgs) z3; };
@@ -429839,7 +433119,7 @@ self: {
       ];
       testSystemDepends = [ z3 ];
       description = "Liquid Types for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.artem ];
     }
@@ -429959,7 +433239,7 @@ self: {
         unordered-containers
       ];
       description = "Liquid Types for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.artem ];
     }
   ) { };
@@ -430076,7 +433356,7 @@ self: {
         unordered-containers
       ];
       description = "Liquid Types for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.artem ];
     }
@@ -430187,11 +433467,11 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "list-extras";
-      version = "0.4.1.6";
-      sha256 = "0h5abhm84vhk5pfd6rrimgrb5l2bs2w5a7gpkg0rvlacbv4di4rz";
+      version = "0.4.1.11";
+      sha256 = "13nnajdnbby0zj95y6ccq5ipf6ilaq0zckjj8m9hbk8ci558kbh8";
       libraryHaskellDepends = [ base ];
       description = "Common not-so-common functions for lists";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -430340,7 +433620,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "List all remote forwards for mail accounts stored in a SQL database";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       mainProgram = "list-remote-forwards";
     }
   ) { };
@@ -430378,7 +433658,7 @@ self: {
         tasty-bench
       ];
       description = "List shuffling and sampling";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -430390,7 +433670,7 @@ self: {
       sha256 = "1n1b1fk8zn9hz162lmy9d123icd2i6cnlvpkk2ypbphmnam0xr43";
       libraryHaskellDepends = [ base ];
       description = "Easily and clearly create lists with only one element in them";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -430432,7 +433712,7 @@ self: {
         mtl-prelude
       ];
       description = "ListT done right";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -430697,7 +433977,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Tries and Patricia tries: finite sets and maps for list keys";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -430744,7 +434024,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "List-like operations for tuples";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -430859,7 +434139,7 @@ self: {
       sha256 = "1kyl7gg0prq7cyr0radwqcwdmqj3d0w2rjs1406nkryjfibsxgkh";
       libraryHaskellDepends = [ base ];
       description = "Helpers for working with NonEmpty lists";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -431141,6 +434421,96 @@ self: {
     }
   ) { };
 
+  literal-flake-input = callPackage (
+    {
+      mkDerivation,
+      base,
+      binary,
+      ekg-core,
+      ekg-wai,
+      file-embed,
+      hnix,
+      http-types,
+      monad-logger,
+      optparse-applicative,
+      QuickCheck,
+      ref-tf,
+      regex-tdfa,
+      relude,
+      tagged,
+      tar,
+      tasty,
+      tasty-discover,
+      tasty-hunit,
+      tasty-quickcheck,
+      template-haskell,
+      time,
+      trace-embrace,
+      unliftio,
+      warp,
+      warp-tls,
+      wl-pprint-text,
+      yesod-core,
+    }:
+    mkDerivation {
+      pname = "literal-flake-input";
+      version = "0.0.4";
+      sha256 = "1hw3lqydck5fsmya0a8hcip2ynbi3gg99ypkmz1zsbfza8djdpl8";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        binary
+        ekg-core
+        ekg-wai
+        file-embed
+        hnix
+        http-types
+        monad-logger
+        optparse-applicative
+        ref-tf
+        regex-tdfa
+        relude
+        tagged
+        tar
+        template-haskell
+        time
+        trace-embrace
+        unliftio
+        warp
+        warp-tls
+        wl-pprint-text
+        yesod-core
+      ];
+      executableHaskellDepends = [
+        base
+        optparse-applicative
+        relude
+        tagged
+        unliftio
+        yesod-core
+      ];
+      testHaskellDepends = [
+        base
+        optparse-applicative
+        QuickCheck
+        relude
+        tagged
+        tasty
+        tasty-discover
+        tasty-hunit
+        tasty-quickcheck
+        unliftio
+        yesod-core
+      ];
+      testToolDepends = [ tasty-discover ];
+      description = "Web service converting URLs into archived nix attrsets";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   literally = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -431149,7 +434519,7 @@ self: {
       sha256 = "1hhasxqq0wj1qh9i8a29lpg0shxwj38fhflypkz0rq67vfigilmg";
       libraryHaskellDepends = [ base ];
       description = "Type-safe conversion of type literals into runtime values";
-      license = lib.licensesSpdx."0BSD";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
     }
   ) { };
 
@@ -431215,7 +434585,7 @@ self: {
         unliftio
       ];
       description = "transform literate source code to Markdown";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "literatex";
     }
   ) { };
@@ -431248,7 +434618,7 @@ self: {
         tasty-hunit
       ];
       description = "Simple implementation of Earley parsing";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -431555,7 +434925,7 @@ self: {
         text
       ];
       description = "Haskell bindings for the llama.cpp llama-server and a simple CLI";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       mainProgram = "llamacall";
     }
   ) { };
@@ -431594,6 +434964,49 @@ self: {
     }
   ) { inherit (pkgs) llama-cpp; };
 
+  llm-with-context = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      data-default,
+      directory,
+      http-client,
+      http-client-tls,
+      http-types,
+      parsec,
+      scrappy-core,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "llm-with-context";
+      version = "0.1.0.0";
+      sha256 = "138gddxryi4zwyg9f037zpzqzp38sdwabfznfcbnf604fpd3qzc8";
+      revision = "2";
+      editedCabalFile = "1d6438wycfp0dx69q89rq2q276mq4fb8gmz8mx78w3wd08kyg313";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        data-default
+        directory
+        http-client
+        http-client-tls
+        http-types
+        parsec
+        scrappy-core
+        text
+        transformers
+      ];
+      description = "Typified interactions with LLMs";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   llrbtree = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -432031,7 +435444,7 @@ self: {
         transformers
       ];
       description = "Support for writing an EDSL with LLVM-JIT as target";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -432070,7 +435483,7 @@ self: {
         utility-ht
       ];
       description = "Processor specific intrinsics for the llvm interface";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -432132,7 +435545,7 @@ self: {
       ];
       doHaddock = false;
       description = "Utility functions for the llvm interface";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -432155,7 +435568,7 @@ self: {
       ];
       librarySystemDepends = [ LLVM ];
       description = "FFI bindings to the LLVM compiler toolkit";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { LLVM = null; };
@@ -432616,7 +436029,7 @@ self: {
         transformers
       ];
       description = "General purpose LLVM bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -432650,7 +436063,7 @@ self: {
         utility-ht
       ];
       description = "Generate Pkg-Config configuration file for LLVM";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "llvm-pkg-config";
     }
   ) { };
@@ -432697,7 +436110,7 @@ self: {
         text
       ];
       description = "A pretty printing library inspired by the llvm binding";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -432796,7 +436209,7 @@ self: {
         versions
       ];
       description = "LLVM bitcode parsing library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "llvm-disasm";
     }
   ) { };
@@ -432934,6 +436347,18 @@ self: {
     }
   ) { inherit (pkgs) lmdb; };
 
+  lmdb-clib = callPackage (
+    { mkDerivation }:
+    mkDerivation {
+      pname = "lmdb-clib";
+      version = "0.9.31";
+      sha256 = "1n4qql3lsr4hcwyg6cbdg8rkdqw27dqkglrk1r4dfp30q8k62qzw";
+      doHaddock = false;
+      description = "Lightning Memory-Mapped Database";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   lmdb-high-level = callPackage (
     {
       mkDerivation,
@@ -433268,7 +436693,7 @@ self: {
         text
       ];
       description = "Support for developing against the LNURL protocol";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -433326,7 +436751,7 @@ self: {
         optparse-applicative
       ];
       description = "A command line tool to manage LNURL auth identities";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "lnurl-authenticator";
     }
@@ -433460,7 +436885,7 @@ self: {
         integer-types
       ];
       description = "Line and column positions and ranges in text files";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -433484,7 +436909,7 @@ self: {
         loc
       ];
       description = "Hedgehog generators for loc";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -434017,7 +437442,7 @@ self: {
         unordered-containers
       ];
       description = "Structured logging solution (base package)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -434160,7 +437585,7 @@ self: {
         text
       ];
       description = "Adaptation of the log library for the effectful ecosystem";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -434213,7 +437638,7 @@ self: {
         vector
       ];
       description = "Structured logging solution (Elasticsearch back end)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -434614,14 +438039,14 @@ self: {
     }:
     mkDerivation {
       pname = "logfloat";
-      version = "0.14.0";
-      sha256 = "1f7zk31vvfi3i6psgljg483r2z38vkrakcxdzir0n09w8y367vzz";
+      version = "0.14.0.2";
+      sha256 = "0f7yrz1416bzmzgrvj5f8w9irjchgi410rxn2cbmbyfx0pdva6jd";
       libraryHaskellDepends = [
         array
         base
       ];
       description = "Log-domain floating point numbers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -434775,67 +438200,6 @@ self: {
   ) { };
 
   logging-effect = callPackage (
-    {
-      mkDerivation,
-      async,
-      base,
-      bytestring,
-      criterion,
-      exceptions,
-      fast-logger,
-      free,
-      lifted-async,
-      monad-control,
-      monad-logger,
-      mtl,
-      prettyprinter,
-      semigroups,
-      stm,
-      stm-delay,
-      text,
-      time,
-      transformers,
-      transformers-base,
-      unliftio-core,
-    }:
-    mkDerivation {
-      pname = "logging-effect";
-      version = "1.4.1";
-      sha256 = "1w8al4wlrda7qdifs86zqvlqdzzpd0awjn1nvcln7ax2yd5ncwnp";
-      libraryHaskellDepends = [
-        async
-        base
-        exceptions
-        free
-        monad-control
-        mtl
-        prettyprinter
-        semigroups
-        stm
-        stm-delay
-        text
-        time
-        transformers
-        transformers-base
-        unliftio-core
-      ];
-      benchmarkHaskellDepends = [
-        base
-        bytestring
-        criterion
-        fast-logger
-        lifted-async
-        monad-logger
-        prettyprinter
-        text
-        time
-      ];
-      description = "A mtl-style monad transformer for general purpose & compositional logging";
-      license = lib.licenses.bsd3;
-    }
-  ) { };
-
-  logging-effect_1_4_2 = callPackage (
     {
       mkDerivation,
       async,
@@ -434893,7 +438257,6 @@ self: {
       ];
       description = "A mtl-style monad transformer for general purpose & compositional logging";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -435251,7 +438614,7 @@ self: {
       sha256 = "1jw64bajnz1fizgkw9b01fpk7iyf5w7b8rd1zmhkqxg85npx3kql";
       libraryHaskellDepends = [ base ];
       description = "Simple logical constraints 'syntax-sugar' writing library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -436245,8 +439608,8 @@ self: {
     }:
     mkDerivation {
       pname = "looksee";
-      version = "0.8.1";
-      sha256 = "1xzidd03v499rcggkwdgj650jl3q9qbzwxwqll9hglbr5c12d4kb";
+      version = "0.8.2";
+      sha256 = "1jz863hv0p34f5nsmi20d57cyji2ldhg2fr4zqz5frj507p603dm";
       libraryHaskellDepends = [
         base
         bifunctors
@@ -436398,7 +439761,7 @@ self: {
         vector
       ];
       description = "monadic loop dsl";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -437078,7 +440441,7 @@ self: {
         unordered-containers
       ];
       description = "Multi-protocol LLM router and client library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -437235,7 +440598,7 @@ self: {
         tasty-hunit
       ];
       description = "LPeg – Parsing Expression Grammars For Lua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -437272,7 +440635,7 @@ self: {
         groups
       ];
       description = "Left and right actions, semidirect products and torsors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -437309,7 +440672,7 @@ self: {
         groups
       ];
       description = "Left and right actions, semidirect products and torsors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -437354,7 +440717,7 @@ self: {
         tasty-hunit
       ];
       description = "A Haskell client for the LrcLib API (lyrics database)";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     }
   ) { };
 
@@ -437794,7 +441157,7 @@ self: {
       ];
       doHaddock = false;
       description = "Log-structured merge-trees";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) rocksdb; };
@@ -437878,7 +441241,91 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell library for the Microsoft Language Server Protocol";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  lsp_2_8_0_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      attoparsec,
+      base,
+      bytestring,
+      co-log-core,
+      containers,
+      data-default,
+      directory,
+      exceptions,
+      extra,
+      filepath,
+      hashable,
+      hspec,
+      hspec-discover,
+      lens,
+      lens-aeson,
+      lsp-types,
+      mtl,
+      prettyprinter,
+      sorted-list,
+      stm,
+      text,
+      text-rope,
+      transformers,
+      unliftio,
+      unliftio-core,
+      unordered-containers,
+      websockets,
+    }:
+    mkDerivation {
+      pname = "lsp";
+      version = "2.8.0.0";
+      sha256 = "085lxh87c2dink3vqzcpz96bk4fl9afqjvpjk3d3hmxr6smgfh6p";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        async
+        attoparsec
+        base
+        bytestring
+        co-log-core
+        containers
+        data-default
+        directory
+        exceptions
+        extra
+        filepath
+        hashable
+        lens
+        lens-aeson
+        lsp-types
+        mtl
+        prettyprinter
+        sorted-list
+        stm
+        text
+        text-rope
+        transformers
+        unliftio
+        unliftio-core
+        unordered-containers
+        websockets
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        hspec
+        sorted-list
+        text
+        text-rope
+        unordered-containers
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Haskell library for the Microsoft Language Server Protocol";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -437958,7 +441405,7 @@ self: {
         unliftio
       ];
       description = "Haskell library for Language Server Protocol clients";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -438058,7 +441505,108 @@ self: {
         process
       ];
       description = "Functional test framework for LSP servers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  lsp-test_0_18_0_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      ansi-terminal,
+      async,
+      base,
+      bytestring,
+      co-log-core,
+      conduit,
+      conduit-parse,
+      containers,
+      data-default,
+      Diff,
+      directory,
+      exceptions,
+      extra,
+      filepath,
+      Glob,
+      hspec,
+      lens,
+      lens-aeson,
+      lsp,
+      lsp-types,
+      mtl,
+      parser-combinators,
+      process,
+      some,
+      text,
+      time,
+      transformers,
+      unix,
+      unliftio,
+    }:
+    mkDerivation {
+      pname = "lsp-test";
+      version = "0.18.0.0";
+      sha256 = "14fhjbf8s9nwks4fxghczwsc34i13swsn0iap9g6wqb0vnn4rbh3";
+      libraryHaskellDepends = [
+        aeson
+        aeson-pretty
+        ansi-terminal
+        async
+        base
+        bytestring
+        co-log-core
+        conduit
+        conduit-parse
+        containers
+        data-default
+        Diff
+        directory
+        exceptions
+        extra
+        filepath
+        Glob
+        lens
+        lens-aeson
+        lsp
+        lsp-types
+        mtl
+        parser-combinators
+        process
+        some
+        text
+        time
+        transformers
+        unix
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        co-log-core
+        containers
+        data-default
+        directory
+        extra
+        filepath
+        hspec
+        lens
+        lsp
+        mtl
+        parser-combinators
+        process
+        text
+        unliftio
+      ];
+      testToolDepends = [ lsp ];
+      benchmarkHaskellDepends = [
+        base
+        extra
+        lsp
+        process
+      ];
+      description = "Functional test framework for LSP servers";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -438161,7 +441709,112 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Haskell library for the Microsoft Language Server Protocol, data types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      mainProgram = "generator";
+    }
+  ) { };
+
+  lsp-types_2_4_0_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      binary,
+      containers,
+      data-default,
+      deepseq,
+      Diff,
+      directory,
+      dlist,
+      exceptions,
+      file-embed,
+      filepath,
+      generic-arbitrary,
+      hashable,
+      hspec,
+      hspec-discover,
+      hspec-golden,
+      indexed-traversable,
+      indexed-traversable-instances,
+      lens,
+      mod,
+      mtl,
+      network-uri,
+      prettyprinter,
+      QuickCheck,
+      quickcheck-instances,
+      regex,
+      row-types,
+      safe,
+      some,
+      template-haskell,
+      text,
+      witherable,
+    }:
+    mkDerivation {
+      pname = "lsp-types";
+      version = "2.4.0.0";
+      sha256 = "0biz81dpxj6gr7z0i1i4lra9by4pqz8s0pjj4x6h5jccmab79l9b";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        binary
+        containers
+        data-default
+        deepseq
+        Diff
+        dlist
+        exceptions
+        file-embed
+        filepath
+        generic-arbitrary
+        hashable
+        indexed-traversable
+        indexed-traversable-instances
+        lens
+        mod
+        mtl
+        network-uri
+        prettyprinter
+        QuickCheck
+        quickcheck-instances
+        row-types
+        safe
+        some
+        template-haskell
+        text
+      ];
+      executableHaskellDepends = [
+        base
+        containers
+        directory
+        filepath
+        mtl
+        prettyprinter
+        regex
+        text
+        witherable
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        filepath
+        hspec
+        hspec-golden
+        lens
+        network-uri
+        prettyprinter
+        QuickCheck
+        quickcheck-instances
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
+      doHaddock = false;
+      description = "Haskell library for the Microsoft Language Server Protocol, data types";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "generator";
     }
   ) { };
@@ -438557,7 +442210,7 @@ self: {
         tasty-hunit
       ];
       description = "Lua, an embeddable scripting language";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { inherit (pkgs) lua5_4; };
 
@@ -438578,7 +442231,7 @@ self: {
         QuickCheck
       ];
       description = "Arbitrary instances for Lua types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -438867,7 +442520,7 @@ self: {
         lucid
       ];
       description = "Provides ARIA attributes for Lucid templates";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -438913,7 +442566,7 @@ self: {
         vector
       ];
       description = "Helper functions for using lucid with colonnade";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -439265,7 +442918,7 @@ self: {
         QuickCheck
       ];
       description = "An implementation of Luhn's check digit algorithm";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -439587,7 +443240,7 @@ self: {
         stm
       ];
       description = "TMVar that can be listened to";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -440002,7 +443655,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Bindings to LZ4";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -440152,7 +443805,7 @@ self: {
         temporary
       ];
       description = "lz4 bindings for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -440184,16 +443837,16 @@ self: {
       bytestring,
       c2hs,
       criterion,
-      directory,
       filepath,
-      hspec,
       pathological-bytestrings,
+      tasty,
+      tasty-hunit,
       temporary,
     }:
     mkDerivation {
       pname = "lzlib";
-      version = "1.0.7.4";
-      sha256 = "1zj6jm22hmndn3wd9afc0rw27dvvfzpzpsmaq0mdwvmp3hi92ja0";
+      version = "1.0.7.5";
+      sha256 = "0wl341cvrr7rkwh8khwgwgmprk3fryd43f7qcbf3kqliw1q5sr9m";
       libraryHaskellDepends = [
         base
         bytestring
@@ -440201,10 +443854,9 @@ self: {
       libraryToolDepends = [ c2hs ];
       testHaskellDepends = [
         base
-        bytestring
-        directory
-        hspec
         pathological-bytestrings
+        tasty
+        tasty-hunit
       ];
       benchmarkHaskellDepends = [
         base
@@ -440249,7 +443901,7 @@ self: {
         tasty-quickcheck
       ];
       description = "LZMA/XZ compression and decompression";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) xz; };
 
@@ -440385,7 +444037,7 @@ self: {
         tasty-quickcheck
       ];
       description = "LZMA/XZ compression and decompression (static)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -440603,7 +444255,7 @@ self: {
         transformers
       ];
       description = "A toolkit for working with macaroons";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -440924,7 +444576,7 @@ self: {
         text
       ];
       description = "Parse machines streams with attoparsec parsers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -441025,7 +444677,7 @@ self: {
         text
       ];
       description = "Transcode encodings with machines";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -441837,7 +445489,7 @@ self: {
         ghc-prim
       ];
       description = "magma is an algebraic structure";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -441987,7 +445639,7 @@ self: {
         optparse-applicative
       ];
       description = "Preconfigured email connection pool on top of smtp";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "exe";
     }
   ) { };
@@ -442035,7 +445687,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "Count mailboxes in a SQL database";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       mainProgram = "mailbox-count";
     }
   ) { };
@@ -442177,7 +445829,7 @@ self: {
         wreq
       ];
       description = "API binding for Mailgun";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -443777,7 +447429,7 @@ self: {
         HUnit
       ];
       description = "Convert C++ type signatures to their mangled form";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mangle";
     }
@@ -443957,7 +447609,7 @@ self: {
         utility-ht
       ];
       description = "A parser for web documents according to the HTML5 specification";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -444239,7 +447891,7 @@ self: {
         unordered-containers
       ];
       description = "foldl wrappers for map-reduce";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -444327,7 +447979,7 @@ self: {
         vector
       ];
       description = "Efficient, polymorphic Map Algebra";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -444378,7 +448030,66 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Types which represent functions k -> v";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "view";
+    }
+  ) { };
+
+  mappings_0_4_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      cond,
+      containers,
+      formatting,
+      hspec,
+      hspec-discover,
+      indexed-traversable,
+      partialord,
+      transformers,
+      trivial-constraint,
+    }:
+    mkDerivation {
+      pname = "mappings";
+      version = "0.4.0.0";
+      sha256 = "0qyz0lgw611c9ngbxcbj4i12j9mxn96kvx8dqs688ablfq17ll2m";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        cond
+        containers
+        formatting
+        indexed-traversable
+        partialord
+        transformers
+        trivial-constraint
+      ];
+      executableHaskellDepends = [
+        base
+        cond
+        containers
+        formatting
+        indexed-traversable
+        partialord
+        transformers
+        trivial-constraint
+      ];
+      testHaskellDepends = [
+        base
+        cond
+        containers
+        formatting
+        hspec
+        indexed-traversable
+        partialord
+        transformers
+        trivial-constraint
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Types which represent functions k -> v";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "view";
     }
   ) { };
@@ -445085,7 +448796,7 @@ self: {
         tasty-golden
       ];
       description = "A markup parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -445653,7 +449364,7 @@ self: {
         text
       ];
       description = "Fast and extensible bytestring builder";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -446063,7 +449774,7 @@ self: {
       executableHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "A micro web framework based on pattern matching";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "matcha-exe";
       broken = true;
@@ -446214,7 +449925,7 @@ self: {
         hedgehog
       ];
       description = "A variety of mathematical utilities";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -446328,7 +450039,7 @@ self: {
       sha256 = "0l8jv0zm1mar6848n5jyd6dzy02q0cvkgvgnry9db382i1r4g9bq";
       libraryHaskellDepends = [ base ];
       description = "Class for interpolation of values";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -446342,7 +450053,7 @@ self: {
       sha256 = "092qbl1x0l6hcm9vn3nx3gyxnqcfx3z2kkfkqw5zmmmyn9zkjsgx";
       libraryHaskellDepends = [ base ];
       description = "Typeclass for metric spaces";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -446380,7 +450091,7 @@ self: {
         text
       ];
       description = "A library for formulating and solving math programs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -446420,7 +450131,7 @@ self: {
         unliftio
       ];
       description = "A GLPK backend to the math-programming library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -446458,7 +450169,7 @@ self: {
         text
       ];
       description = "Utility functions for testing implementations of the math-programming library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -446929,7 +450640,7 @@ self: {
         criterion
       ];
       description = "A native implementation of matrix operations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -446973,7 +450684,6 @@ self: {
     {
       mkDerivation,
       aeson,
-      aeson-casing,
       aeson-pretty,
       base,
       base64,
@@ -446995,13 +450705,10 @@ self: {
     }:
     mkDerivation {
       pname = "matrix-client";
-      version = "0.1.6.1";
-      sha256 = "0nr1nk6mxvrs0dspy315pviid7db7ry889y9gsg1i3a0pn3dna08";
-      revision = "1";
-      editedCabalFile = "1n6zv3chb8x5aya14qpcbyssr16labwypbbxfh0zp7kcfmy9acf8";
+      version = "0.1.9.0";
+      sha256 = "0rykyb9ncj0azz15q729n8925027idyn04qyqz01ylblrb1b371j";
       libraryHaskellDepends = [
         aeson
-        aeson-casing
         base
         base64
         bytestring
@@ -447021,7 +450728,6 @@ self: {
       ];
       testHaskellDepends = [
         aeson
-        aeson-casing
         aeson-pretty
         base
         base64
@@ -447042,7 +450748,7 @@ self: {
         unordered-containers
       ];
       description = "A matrix client library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -447211,7 +450917,7 @@ self: {
         vector
       ];
       description = "Haskell matrix library with interface to C++ linear algebra libraries";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -448361,7 +452067,7 @@ self: {
         vector
       ];
       description = "Sample from a posterior using Markov chain Monte Carlo";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -448444,80 +452150,70 @@ self: {
     {
       mkDerivation,
       aeson,
-      async,
+      attoparsec,
       base,
-      base64-bytestring,
       bytestring,
       containers,
-      cryptonite,
-      http-conduit,
+      hspec,
+      hspec-wai,
+      http-media,
       http-types,
       jose,
-      memory,
+      mcp-types,
       mtl,
-      optparse-applicative,
-      random,
-      scientific,
+      process,
       servant,
-      servant-auth,
       servant-auth-server,
       servant-server,
-      stm,
       text,
       time,
-      transformers,
-      unordered-containers,
-      uuid,
       wai,
       wai-extra,
-      warp,
+      wai-test,
     }:
     mkDerivation {
       pname = "mcp";
-      version = "0.2.0.1";
-      sha256 = "0mmm890m86dv16hw7mjbznswhw1jrm7kbn45qqhfp661k3kwlw1j";
-      isLibrary = true;
-      isExecutable = true;
+      version = "0.3.1.0";
+      sha256 = "1cab6j8a8f7fr5byl7kxa00z4p94izqrf0pqxrv1bj2qcc2gwipm";
       libraryHaskellDepends = [
         aeson
-        async
         base
-        base64-bytestring
         bytestring
         containers
-        cryptonite
-        http-conduit
-        http-types
-        jose
-        memory
+        http-media
+        mcp-types
         mtl
-        random
         servant
-        servant-auth
         servant-auth-server
         servant-server
-        stm
         text
         time
-        transformers
-        unordered-containers
-        uuid
+        wai
+      ];
+      testHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        bytestring
+        containers
+        hspec
+        hspec-wai
+        http-types
+        jose
+        mcp-types
+        mtl
+        process
+        servant
+        servant-auth-server
+        servant-server
+        text
+        time
         wai
         wai-extra
-        warp
+        wai-test
       ];
-      executableHaskellDepends = [
-        aeson
-        base
-        containers
-        optparse-applicative
-        scientific
-        text
-        time
-      ];
-      testHaskellDepends = [ base ];
-      description = "A Haskell implementation of the Model Context Protocol (MCP)";
-      license = lib.licensesSpdx."MIT";
+      description = "A Servant-based Model Context Protocol (MCP) server for Haskell";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -448536,14 +452232,13 @@ self: {
       QuickCheck,
       template-haskell,
       text,
-      vector,
       wai,
       warp,
     }:
     mkDerivation {
       pname = "mcp-server";
-      version = "0.1.0.16";
-      sha256 = "1dr5s9la0d9qljn1lrkh074rjfkrc3xvd40h9hbhjmkfaxn7lyji";
+      version = "0.1.0.19";
+      sha256 = "11vijbd9dyqi0zd53014paxp3zgnn2gjnk0lr49c2kgs4i7529mf";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -448555,82 +452250,57 @@ self: {
         network-uri
         template-haskell
         text
-        vector
         wai
         warp
       ];
       executableHaskellDepends = [
         base
-        containers
-        network-uri
         text
       ];
       testHaskellDepends = [
         aeson
         base
         bytestring
-        containers
         hspec
         network-uri
         QuickCheck
-        template-haskell
         text
       ];
       description = "Library for building Model Context Protocol (MCP) servers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
-  mcp-server_0_1_0_17 = callPackage (
+  mcp-types = callPackage (
     {
       mkDerivation,
       aeson,
       base,
-      bytestring,
       containers,
       hspec,
-      http-types,
-      network-uri,
-      QuickCheck,
-      template-haskell,
+      jsonrpc,
       text,
-      wai,
-      warp,
     }:
     mkDerivation {
-      pname = "mcp-server";
-      version = "0.1.0.17";
-      sha256 = "1q8z3ml3iznns3sa0gla12z8gjm0s6552yd47jbqywxz1f86pi47";
-      isLibrary = true;
-      isExecutable = true;
+      pname = "mcp-types";
+      version = "0.1.1";
+      sha256 = "1qakgi0yr1q8l14pd2z8p40cx1pw48g4w33nygbkb2kgrv2ja30m";
       libraryHaskellDepends = [
         aeson
         base
-        bytestring
         containers
-        http-types
-        network-uri
-        template-haskell
-        text
-        wai
-        warp
-      ];
-      executableHaskellDepends = [
-        base
+        jsonrpc
         text
       ];
       testHaskellDepends = [
         aeson
         base
-        bytestring
+        containers
         hspec
-        network-uri
-        QuickCheck
-        text
+        jsonrpc
       ];
-      description = "Library for building Model Context Protocol (MCP) servers";
-      license = lib.licensesSpdx."BSD-3-Clause";
-      hydraPlatforms = lib.platforms.none;
+      description = "Core types and protocol definitions for the Model Context Protocol (MCP)";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -448692,7 +452362,7 @@ self: {
         primitive
       ];
       description = "MD5 Hash";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -448889,7 +452559,7 @@ self: {
         uuid
       ];
       description = "Manipulate FSMs and store them in PostgreSQL";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -448932,7 +452602,7 @@ self: {
         vector-algorithms
       ];
       description = "Mealy machines for processing time-series and ordered data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -449139,7 +452809,7 @@ self: {
         vector
       ];
       description = "A schema language for JSON";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -449816,7 +453486,7 @@ self: {
         weigh
       ];
       description = "Monadic parser combinators";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -449835,7 +453505,7 @@ self: {
         megaparsec
       ];
       description = "A megaparsec library for CSV files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -449892,7 +453562,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Test utilities and the test suite of Megaparsec";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -450140,8 +453810,8 @@ self: {
     }:
     mkDerivation {
       pname = "mello";
-      version = "0.3.0";
-      sha256 = "0aznzydk9p4r7jnwhf46dcz56gwikyv1fm006w5n3nxf20qqaybb";
+      version = "0.5.0";
+      sha256 = "0caajqihzs6is5ijr9kivrg16bd8j8h99fi40z0203kcxmq6n0kx";
       libraryHaskellDepends = [
         base
         bowtie
@@ -450448,8 +454118,8 @@ self: {
     }:
     mkDerivation {
       pname = "mem-info";
-      version = "0.4.1.2";
-      sha256 = "1v7jmhydbndpncb5p30rlqv2frnzbk3zjja7f64hrxjdnia6h94x";
+      version = "0.4.2.0";
+      sha256 = "1y4wih0izqrj1nwkxvs1c17smhjhzq9kbsj17wb2pfyf0iimwyd7";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -450486,8 +454156,7 @@ self: {
         unix
       ];
       description = "Print the core memory usage of programs";
-      license = lib.licensesSpdx."BSD-3-Clause";
-      mainProgram = "printmem";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -450516,7 +454185,7 @@ self: {
         th-lift
       ];
       description = "Indices for type level lists";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -450546,7 +454215,7 @@ self: {
         type-spec
       ];
       description = "Type-safe memory units";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -450830,7 +454499,7 @@ self: {
         transformers
       ];
       description = "Open temporary anonymous Linux file handles";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       platforms = lib.platforms.linux;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -451057,7 +454726,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A memoization library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -451222,8 +454891,8 @@ self: {
     }:
     mkDerivation {
       pname = "memory-hexstring";
-      version = "1.0.1.0";
-      sha256 = "0jwkikrv3pkhvxhq2bm675hiivx18m2p89x5irn3hn6mz85p08hq";
+      version = "1.1.0.0";
+      sha256 = "1i9zdvf9ldl3g768wxpx2jq3wlgrp8yi8920zjj3a0srlin754iy";
       libraryHaskellDepends = [
         aeson
         base
@@ -451375,7 +455044,7 @@ self: {
     }
   ) { };
 
-  mempack_0_2_0_0 = callPackage (
+  mempack_0_2_1_0 = callPackage (
     {
       mkDerivation,
       avro,
@@ -451398,8 +455067,8 @@ self: {
     }:
     mkDerivation {
       pname = "mempack";
-      version = "0.2.0.0";
-      sha256 = "0prm0rl92j0pgwg0hkb28l846jnlf3fldwbknpx8inashijvqn6a";
+      version = "0.2.1.0";
+      sha256 = "06b2qfd02khjvvv42cdryrqyj7kxzr0fp82kg2dfwn6sfrvqp245";
       libraryHaskellDepends = [
         base
         bytestring
@@ -451486,7 +455155,7 @@ self: {
         transformers
       ];
       description = "Securely erase memory contents by writing zeros to it";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -451659,7 +455328,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A functor for consistent merging of information";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -451948,7 +455617,7 @@ self: {
         random-bytestring
       ];
       description = "Merkle Tree Logs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -452147,7 +455816,7 @@ self: {
         typed-process
       ];
       description = "Temporary message-db for integration testing";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -452578,7 +456247,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "rebindable methods for improving testability";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -452991,6 +456660,39 @@ self: {
     }
   ) { };
 
+  mfmts = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      basesystems,
+      bytestring,
+      containers,
+      crypton,
+      memory,
+      text,
+    }:
+    mkDerivation {
+      pname = "mfmts";
+      version = "1.0.0.0";
+      sha256 = "1h2gr2a03gs1gy3wngq0l25bdph3xfvmhipqmzybaknjiix5mix8";
+      libraryHaskellDepends = [
+        array
+        base
+        basesystems
+        bytestring
+        containers
+        crypton
+        memory
+        text
+      ];
+      doHaddock = false;
+      description = "Implements multiformats specification";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   mfsolve = callPackage (
     {
       mkDerivation,
@@ -453371,7 +457073,7 @@ self: {
         warp-tls
       ];
       description = "a minimalistic DNS-authoritative server";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "microdns";
       broken = true;
@@ -453591,7 +457293,7 @@ self: {
         vector
       ];
       description = "Law-abiding lenses for Aeson, using microlens";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -453973,6 +457675,8 @@ self: {
       pname = "microlens-th";
       version = "0.4.3.17";
       sha256 = "150a9kgab4l6324dkf9vpvgbwarw89xfhcdhdj8awcm3gh12qxhx";
+      revision = "1";
+      editedCabalFile = "17qwxaxsnrzb443szfgk2359swkxnjbymjmpmig8lrcbyfj9rc2p";
       libraryHaskellDepends = [
         base
         containers
@@ -454006,6 +457710,8 @@ self: {
       pname = "microlens-th";
       version = "0.4.3.18";
       sha256 = "12zdn20v1jl3q2cr96bf9rcj8qmrfr1kd3q0pdkjmayf108g8zj1";
+      revision = "1";
+      editedCabalFile = "035fxh8sd352nqxnd7d6y6dk9l67gqbbbdzax7iknhcb12cvl0f8";
       libraryHaskellDepends = [
         base
         containers
@@ -454181,7 +457887,7 @@ self: {
         text
       ];
       description = "Mustache templates for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -454584,7 +458290,7 @@ self: {
         wxcore
       ];
       description = "A Memory-like (Concentration, Pairs, ...) game for tones";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "midimory";
     }
@@ -454785,6 +458491,28 @@ self: {
     }
   ) { };
 
+  mig-rio = callPackage (
+    {
+      mkDerivation,
+      base,
+      mig-server,
+      rio,
+    }:
+    mkDerivation {
+      pname = "mig-rio";
+      version = "0.1.0.1";
+      sha256 = "0w7505l7pj9jx14pqz2wp8fzl9mwmrm4qqdbpd0r5grngqrjj8va";
+      libraryHaskellDepends = [
+        base
+        mig-server
+        rio
+      ];
+      description = "Utils to use RIO with mig library";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   mig-server = callPackage (
     {
       mkDerivation,
@@ -454805,8 +458533,8 @@ self: {
     }:
     mkDerivation {
       pname = "mig-server";
-      version = "0.2.1.0";
-      sha256 = "19n68hf0gv032lmpmg31gi1g7g4ps3padm8gs31rf6yp1pbzv5k1";
+      version = "0.2.2.0";
+      sha256 = "0w7bhr846yl1fhvqq1pxdymmiy6292h854i0clskvg7jy7l46kkr";
       libraryHaskellDepends = [
         aeson
         base
@@ -454848,8 +458576,8 @@ self: {
     }:
     mkDerivation {
       pname = "mig-swagger-ui";
-      version = "0.1.0.1";
-      sha256 = "1hygqx3f9zq2qir5b2a8bz8yfk2irhmql366jf5817873q7kfvc0";
+      version = "0.1.1.0";
+      sha256 = "112rr2r6cxx87kg3l9hg3nc9hvzrsqqbm72bjck8ghvp4dvij6i9";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -455127,7 +458855,7 @@ self: {
         text
       ];
       description = "Semi-automatic database schema migrations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -455172,7 +458900,7 @@ self: {
         text
       ];
       description = "Semi-automatic database schema migrations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -455215,7 +458943,7 @@ self: {
         text
       ];
       description = "Semi-automatic database schema migrations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -455254,7 +458982,7 @@ self: {
         text
       ];
       description = "Semi-automatic database schema migrations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -455546,15 +459274,15 @@ self: {
       base,
       base16-bytestring,
       base64-bytestring,
-      byteable,
       bytestring,
       case-insensitive,
       conduit,
-      cryptohash,
+      crypton,
       http-client,
       http-client-tls,
       http-conduit,
       http-types,
+      memory,
       mime-mail,
       optparse-applicative,
       tasty,
@@ -455566,23 +459294,23 @@ self: {
     }:
     mkDerivation {
       pname = "mime-mail-ses";
-      version = "0.4.3";
-      sha256 = "0v4b0y28kf7mx80z16j82wmaccpggkc262f7cn9g9j2nfayy2xhj";
+      version = "0.4.4";
+      sha256 = "1yzwqvk675yjb06hn8c0kykic242g8gcry4i5phqg6mqn30ldpzz";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
         base16-bytestring
         base64-bytestring
-        byteable
         bytestring
         case-insensitive
         conduit
-        cryptohash
+        crypton
         http-client
         http-client-tls
         http-conduit
         http-types
+        memory
         mime-mail
         text
         time
@@ -455654,8 +459382,8 @@ self: {
     }:
     mkDerivation {
       pname = "mime-types";
-      version = "0.1.2.1";
-      sha256 = "0nb30xn011p30y6sn5krnqvg9i5qmyan43ywg6wa36qzhqp5mjhw";
+      version = "0.1.2.2";
+      sha256 = "0h2996pqa51qdw4n47p3mgs8ad5gm594nlfk75q3hb6pg13lfvp5";
       libraryHaskellDepends = [
         base
         bytestring
@@ -455698,7 +459426,7 @@ self: {
         random
       ];
       description = "Double-ended priority queues";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -455712,7 +459440,7 @@ self: {
       sha256 = "07h6hgq4k1wm4ldwb29fgmmbl9ygrlbq3qv3ymfvc25l5rvgss4h";
       doHaddock = false;
       description = "TBA";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -455845,11 +459573,11 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "mini";
-      version = "1.6.0.0";
-      sha256 = "04gcdvygrk2xxhqafjfnvk7cpz8n4wbwhxjqhfcz65l4id0aslpc";
+      version = "1.6.1.0";
+      sha256 = "18vxnsn1lgrqc2clnygi68y7234z0jlqlz4cqjdpy0v0xspy90mf";
       libraryHaskellDepends = [ base ];
       description = "Minimal essentials";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -455971,7 +459699,7 @@ self: {
         unix
       ];
       description = "Minimalist CI framework to run checks on local machine";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       mainProgram = "minici";
     }
   ) { };
@@ -456001,7 +459729,7 @@ self: {
         HUnit
       ];
       description = "Minimal bindings to libcurl";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -456177,7 +459905,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "A SDL2-based graphics library, batteries-included";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -456227,7 +459955,7 @@ self: {
         mtl
       ];
       description = "A binding library of minilight for Lua langauge";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
     }
@@ -456435,7 +460163,7 @@ self: {
         xml-conduit
       ];
       description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -456490,7 +460218,7 @@ self: {
         warp
       ];
       description = "A Haskell introspectable web router";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -456528,7 +460256,7 @@ self: {
         warp
       ];
       description = "Minion conduit support";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "minion-conduit-example";
     }
   ) { };
@@ -456554,7 +460282,7 @@ self: {
         text
       ];
       description = "Minion HTMX support";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -456598,7 +460326,7 @@ self: {
         warp
       ];
       description = "Minion JWT support";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "minion-jwt-example";
     }
   ) { };
@@ -456648,7 +460376,7 @@ self: {
         text
       ];
       description = "Minion openapi3 support";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -456694,7 +460422,7 @@ self: {
         warp
       ];
       description = "Minion wrappers for wai-extra";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -456851,7 +460579,7 @@ self: {
         system-cxx-std-lib
       ];
       description = "A Haskell bundle of the Minisat SAT solver";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -456928,13 +460656,15 @@ self: {
       base,
       deepseq,
       directory,
+      silently,
       tasty,
       tasty-hunit,
     }:
     mkDerivation {
       pname = "miniterion";
-      version = "0.1.1.1";
-      sha256 = "1gz00kydz4zdmd0cvfjk1s68mvcmrcdp7h6y4vhp2whqcaiyyppl";
+      version = "0.1.2.1";
+      sha256 = "0mqsarjai9cbgasjgvj4fjdndmcccaywwfxkcz8v69vgiq4irqb7";
+      enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         base
         deepseq
@@ -456942,12 +460672,13 @@ self: {
       testHaskellDepends = [
         base
         directory
+        silently
         tasty
         tasty-hunit
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Simple and lightweight benchmarking utilities";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -457289,7 +461020,7 @@ self: {
         vector
       ];
       description = "fortune-mod clone";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -457641,7 +461372,7 @@ self: {
         transformers
       ];
       description = "A tasty Haskell front-end web framework";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -457678,7 +461409,7 @@ self: {
       isLibrary = false;
       isExecutable = true;
       description = "A tasty Haskell front-end web framework";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = [ "javascript-ghcjs" ];
     }
   ) { };
@@ -457796,7 +461527,7 @@ self: {
         unix
       ];
       description = "A Haskell git implimentation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -457830,7 +461561,7 @@ self: {
         posix-paths
       ];
       description = "Useability extras built on top of miss";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -457922,7 +461653,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "A git wrapper with a streamlined UX";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mit";
       broken = true;
@@ -457989,7 +461720,7 @@ self: {
         hspec
       ];
       description = "Vim plugin manager written in Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "miv";
     }
   ) { };
@@ -458282,6 +462013,8 @@ self: {
       pname = "mlkem";
       version = "0.1.1.0";
       sha256 = "1l77dqysiq797ci3168z708qz7i986yvmvisssfdr36rwnsz7nrl";
+      revision = "1";
+      editedCabalFile = "18nzz4gg1cb2275k3qqfi3y9d05kfm9fqh4z4aarliv6hbs0nvvd";
       libraryHaskellDepends = [
         base
         basement
@@ -458314,7 +462047,7 @@ self: {
         memory
       ];
       description = "Module-Lattice-based Key-Encapsulation Mechanism";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -458492,7 +462225,7 @@ self: {
         weigh
       ];
       description = "Strict markdown processor for writers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -458536,7 +462269,7 @@ self: {
         text
       ];
       description = "Command line interface to the MMark markdown processor";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "mmark";
     }
   ) { };
@@ -458584,7 +462317,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Commonly useful extensions for the MMark markdown processor";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -459186,7 +462919,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Read environment variables into a user-defined data type";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -459246,7 +462979,7 @@ self: {
         uuid-types
       ];
       description = "A TypeID and UUIDv7 implementation for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -459399,7 +463132,7 @@ self: {
         yaml
       ];
       description = "A HTTP server for testing HTTP clients";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mock-httpd";
       broken = true;
@@ -459859,7 +463592,7 @@ self: {
         weigh
       ];
       description = "Modern library for working with URIs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -459991,7 +463724,7 @@ self: {
         doctest
       ];
       description = "A type for integers modulo some constant";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -460406,7 +464139,7 @@ self: {
         type-set
       ];
       description = "Monadic Functional Reactive Programming";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -460465,7 +464198,7 @@ self: {
         unordered-containers
       ];
       description = "Samples of moffy";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -460533,7 +464266,7 @@ self: {
         union-color
       ];
       description = "Events for sample codes of moffy";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -460561,7 +464294,7 @@ self: {
         moffy-samples-gtk3-run
       ];
       description = "Sample executables of moffy - GTK3 version";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "moffy_samples_gtk3";
     }
@@ -460627,7 +464360,7 @@ self: {
         union-color
       ];
       description = "Package to run moffy samples - GTK3 version";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -460655,7 +464388,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Sample executables of moffy - GTK4 version";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "moffy_samples_gtk4";
     }
@@ -460724,7 +464457,7 @@ self: {
         union-color
       ];
       description = "Package to run moffy samples - Gtk4 version";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -460790,7 +464523,7 @@ self: {
         bytestring
       ];
       description = "Modular Haskell Web Server";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hws";
       broken = true;
@@ -460985,6 +464718,7 @@ self: {
       mkDerivation,
       base,
       checkers,
+      constraints,
       free,
       kan-extensions,
       mmorph,
@@ -460997,10 +464731,13 @@ self: {
     }:
     mkDerivation {
       pname = "monad-actions";
-      version = "1.0.0.0";
-      sha256 = "1lva4vy9rnsnw6g9xaggxq9g3j6g9c86sc9ldj4frb4y44xxzm3c";
+      version = "2.0.1.0";
+      sha256 = "1cg4l9cq6qgavj6ji26hjp958k9n76zikb2jjw4434dhf2dm6wfw";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [
         base
+        constraints
         free
         kan-extensions
         mmorph
@@ -461020,8 +464757,8 @@ self: {
         tasty-quickcheck
         transformers
       ];
-      description = "Left or right actions of a monad on a functor";
-      license = lib.licensesSpdx."LGPL-2.0-or-later";
+      description = "Actions of monads on functors";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.0-or-later";
     }
   ) { };
 
@@ -461295,7 +465032,7 @@ self: {
         vty-unix
       ];
       description = "A library for probabilistic programming";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "example";
       maintainers = [ lib.maintainers.turion ];
     }
@@ -461734,7 +465471,7 @@ self: {
         unix
       ];
       description = "A fast and lightweight effect system";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -461775,7 +465512,7 @@ self: {
         time
       ];
       description = "A flexible logging system utilizing the `monad-effect` effect system";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -462010,7 +465747,7 @@ self: {
         comonad
       ];
       description = "Ideal Monads and coproduct of them";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -462022,7 +465759,7 @@ self: {
       sha256 = "0ajn06f3q181nf6xa4kish04bv74crqmsmk7i1ny4kw1m9ag139d";
       libraryHaskellDepends = [ base ];
       description = "Monads with an unsaveInterleaveIO-like operation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -463275,7 +467012,7 @@ self: {
         transformers
       ];
       description = "A new, simple, composable concurrency abstraction";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
@@ -463328,7 +467065,7 @@ self: {
         transformers
       ];
       description = "A new, simple, composable concurrency abstraction";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.turion ];
     }
@@ -463342,7 +467079,7 @@ self: {
       sha256 = "0hqlwimwdhxwcikmy41qlkzr09dxx7ibpzr2g4czlv07c6fwlm3q";
       libraryHaskellDepends = [ base ];
       description = "Monads of program skeleta";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -463599,7 +467336,7 @@ self: {
         typed-process
       ];
       description = "Functions to exit the program anywhere in MonadThrow monads";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -463650,7 +467387,7 @@ self: {
         time
       ];
       description = "Adaptation of the monad-time library for the effectful ecosystem";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -463867,7 +467604,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A monad transformer for data validation";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -463942,7 +467679,7 @@ self: {
       sha256 = "048xk3zr7237c0mzr6lfca3qsgh60icnp8vw3vg2pj12z8id62ka";
       libraryHaskellDepends = [ base ];
       description = "A collection of monad transformers";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -463982,7 +467719,7 @@ self: {
         transformers
       ];
       description = "The Acme and AcmeT monads";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -464091,6 +467828,7 @@ self: {
       mkDerivation,
       base,
       containers,
+      filepath,
       fused-effects,
       ghc,
       ghc-boot,
@@ -464099,8 +467837,8 @@ self: {
     }:
     mkDerivation {
       pname = "monadic-bang";
-      version = "0.2.2.2";
-      sha256 = "149hxzgm1awa9rn9z8f9pgwy2i703va549wgkq7sfy77vmir4lzc";
+      version = "0.2.2.3";
+      sha256 = "1cxrv98vad459wy7sl7y0kkngql8cxl24sy01gr5kr2flr3kc05n";
       libraryHaskellDepends = [
         base
         containers
@@ -464110,13 +467848,14 @@ self: {
       ];
       testHaskellDepends = [
         base
+        filepath
         ghc
         ghc-boot
         ghc-paths
         transformers
       ];
       description = "GHC plugin to desugar ! into do-notation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -464146,7 +467885,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Recursion Schemes for Monadic version";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -464418,7 +468157,7 @@ self: {
         text
       ];
       description = "The best ideas in monad-related classes and types";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -464476,7 +468215,7 @@ self: {
         transformers
       ];
       description = "Monad classes, using type families";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -464617,7 +468356,7 @@ self: {
         text
       ];
       description = "Pure Haskell library for audio metadata parsing and writing";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       mainProgram = "monatone";
     }
   ) { };
@@ -465281,34 +469020,6 @@ self: {
   ) { };
 
   monoid-extras = callPackage (
-    {
-      mkDerivation,
-      base,
-      criterion,
-      groups,
-      semigroupoids,
-      semigroups,
-    }:
-    mkDerivation {
-      pname = "monoid-extras";
-      version = "0.7";
-      sha256 = "0c25hcvsw6xqdgy6p8q5jdgxmnqhiq7z2hm43cn0yh9nk2y294ws";
-      libraryHaskellDepends = [
-        base
-        groups
-        semigroupoids
-      ];
-      benchmarkHaskellDepends = [
-        base
-        criterion
-        semigroups
-      ];
-      description = "Various extra monoid-related definitions and utilities";
-      license = lib.licenses.bsd3;
-    }
-  ) { };
-
-  monoid-extras_0_7_0_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -465333,7 +469044,6 @@ self: {
       ];
       description = "Various extra monoid-related definitions and utilities";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -465372,7 +469082,7 @@ self: {
         witherable
       ];
       description = "A monoidal map with the right group instance";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -465530,44 +469240,6 @@ self: {
   ) { };
 
   monoidal-containers = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      base,
-      containers,
-      deepseq,
-      hashable,
-      lens,
-      newtype,
-      semialign,
-      these,
-      unordered-containers,
-      witherable,
-    }:
-    mkDerivation {
-      pname = "monoidal-containers";
-      version = "0.6.6.0";
-      sha256 = "0i2hc4x1y6437az5cg1rg8p57m1m6k742h5vbdw0vr4hrq2ldsqi";
-      libraryHaskellDepends = [
-        aeson
-        base
-        containers
-        deepseq
-        hashable
-        lens
-        newtype
-        semialign
-        these
-        unordered-containers
-        witherable
-      ];
-      description = "Containers with monoidal accumulation";
-      license = lib.licenses.bsd3;
-      maintainers = [ lib.maintainers.alexfmpe ];
-    }
-  ) { };
-
-  monoidal-containers_0_6_7_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -465601,7 +469273,6 @@ self: {
       ];
       description = "Containers with monoidal accumulation";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -465650,7 +469321,7 @@ self: {
         mtl
       ];
       description = "Monoidal Functors Library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "co-log";
     }
   ) { };
@@ -465670,7 +469341,7 @@ self: {
         ghc
       ];
       description = "A monoidal interface for aggregating GHC plugins";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -465699,7 +469370,7 @@ self: {
         nothunks
       ];
       description = "Monoidal map type";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -465728,7 +469399,7 @@ self: {
         nothunks
       ];
       description = "Monoidal map type";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -465775,7 +469446,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "JSON support for monoidmap";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -465808,7 +469479,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Examples for monoidmap";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -465831,7 +469502,7 @@ self: {
         monoidmap
       ];
       description = "Hashing support for monoidmap";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -465891,7 +469562,7 @@ self: {
         tasty-hunit
       ];
       description = "Internal support for monoidmap";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -465951,7 +469622,7 @@ self: {
         tasty-hunit
       ];
       description = "Internal support for monoidmap";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -465977,7 +469648,7 @@ self: {
         QuickCheck
       ];
       description = "QuickCheck support for monoidmap";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -466519,7 +470190,7 @@ self: {
         time-compat
       ];
       description = "MonthName";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -466550,7 +470221,7 @@ self: {
         tasty-smallcheck
       ];
       description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -466755,7 +470426,7 @@ self: {
       ];
       doHaddock = false;
       description = "Invocation helpers for the ReaderT-record-of-functions style";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -467309,7 +470980,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Upgradeability infrastructure based on Morley";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "morley-ustore-reader";
     }
@@ -467502,8 +471173,8 @@ self: {
     }:
     mkDerivation {
       pname = "morpheus-graphql";
-      version = "0.28.2";
-      sha256 = "0ia6hky3l9mlkxsmlfxgvqp45qm3b9dxl3xpxnbzxnf7j0h01ylk";
+      version = "0.28.5";
+      sha256 = "03srjbsirfkxfbk5sizixrqw7kyf9xfkhgxb4qxvhf8rh912i55x";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -467577,8 +471248,8 @@ self: {
     }:
     mkDerivation {
       pname = "morpheus-graphql-app";
-      version = "0.28.2";
-      sha256 = "0d1jx5sn096qh4hyl7qjgpf40jw02f94sbd0l8p4wi77pr6a1l9k";
+      version = "0.28.5";
+      sha256 = "156w5naxmda7hb4v107c8p1rzdqq53slf2nd393drsqd8qz7wv26";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -467693,8 +471364,8 @@ self: {
     }:
     mkDerivation {
       pname = "morpheus-graphql-client";
-      version = "0.28.2";
-      sha256 = "02j1ix47fdp5wmrqcpcc1lx0jwb98pzhcc96j5972y94i38dgdmn";
+      version = "0.28.5";
+      sha256 = "0l164jakzf0f351454hjdw6y8mccwj289ykjszq3n4rvcb67qi7l";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -467771,8 +471442,8 @@ self: {
     }:
     mkDerivation {
       pname = "morpheus-graphql-code-gen";
-      version = "0.28.2";
-      sha256 = "1ibrdk4d612ka2jyzjv5p3423gj4d1j5wr7hyr5w61nghnsrqq0a";
+      version = "0.28.5";
+      sha256 = "0bxjlk4bpk5yflrsvmp2jayfjwn3qqm098cva0cgshim06xfxyax";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -467830,8 +471501,8 @@ self: {
     }:
     mkDerivation {
       pname = "morpheus-graphql-code-gen-utils";
-      version = "0.28.2";
-      sha256 = "09jjswzg0i4fcqwjag0plmn7v0n8mq29rkj1bynf5iq9zv7yb8db";
+      version = "0.28.5";
+      sha256 = "0yn2fblmain2hkgwvqdkghxh08w7h6aq6rf48pv6d6adn2ziis0q";
       libraryHaskellDepends = [
         base
         bytestring
@@ -467874,8 +471545,8 @@ self: {
     }:
     mkDerivation {
       pname = "morpheus-graphql-core";
-      version = "0.28.2";
-      sha256 = "1ndc5a5nw2lcxan81h1362m93x24s5aa6lqvsn2ap8casxw8kwhc";
+      version = "0.28.5";
+      sha256 = "1595m4qcwbpz4zwa2jwcq7bgplxis2j69j3n24wcfs6pv1jlbbmj";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -467944,14 +471615,15 @@ self: {
     }:
     mkDerivation {
       pname = "morpheus-graphql-server";
-      version = "0.28.2";
-      sha256 = "1yrb4db39qgjhwrs05qggnsmp4g784kafxba7k2iir2k9yalibkz";
+      version = "0.28.5";
+      sha256 = "0yb6kbzbriqxhgr93jxaqg072n6ikdilhmwndkys9sq0l4adfp7k";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
         base
         bytestring
         containers
+        file-embed
         morpheus-graphql-app
         morpheus-graphql-core
         mtl
@@ -468006,8 +471678,8 @@ self: {
     }:
     mkDerivation {
       pname = "morpheus-graphql-subscriptions";
-      version = "0.28.2";
-      sha256 = "1abs20208fsg9yrgy1725l2is5vbsdii09mlxyzr0qy6vv6lfacn";
+      version = "0.28.5";
+      sha256 = "1zf1xai9b82768cc8z9q30snsnhggyi1xrsabww24mnbb1a3qsja";
       libraryHaskellDepends = [
         aeson
         base
@@ -468043,8 +471715,8 @@ self: {
     }:
     mkDerivation {
       pname = "morpheus-graphql-tests";
-      version = "0.28.2";
-      sha256 = "0hn7w9pji4dil6rhfyp6046kgbxmxb45clpvi8wz3i62ymfjy8kb";
+      version = "0.28.5";
+      sha256 = "04avy0rpw9md4dd5jjjr4px9z2jwgwfz3mywrdi6mq03sk57xysh";
       libraryHaskellDepends = [
         aeson
         base
@@ -468866,7 +472538,7 @@ self: {
         optparse-applicative
       ];
       description = "Print current MPD song and status as JSON";
-      license = lib.licensesSpdx."Unlicense";
+      license = lib.meta.getLicenseFromSpdxId "Unlicense";
       mainProgram = "mpd-current-json";
     }
   ) { };
@@ -469385,7 +473057,7 @@ self: {
         text
       ];
       description = "Datastructures to describe TCP and MPTCP connections";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -469492,7 +473164,7 @@ self: {
         text
       ];
       description = "A Multipath TCP path manager";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mptcp-pm";
@@ -469672,7 +473344,7 @@ self: {
         QuickCheck
       ];
       description = "A Multipath TCP analyzer";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mptcpanalyzer";
     }
@@ -469915,7 +473587,7 @@ self: {
         hspec
       ];
       description = "A simple way to read environment variables in Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -470254,7 +473926,7 @@ self: {
         zstd
       ];
       description = "Types and parser for the MSDF atlas layout";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -471105,12 +474777,14 @@ self: {
       pname = "mtl";
       version = "2.3.2";
       sha256 = "1dk4zn2kgi9lxk3x0bhinn5a9dh06by8p5hq1wm7m4nkmi7sk6iz";
+      revision = "1";
+      editedCabalFile = "09d9hlnxfidhxqf17ljpqmpgms1a50qydq3w3713am9m47qfsyjd";
       libraryHaskellDepends = [
         base
         transformers
       ];
       description = "Monad classes for transformers, using functional dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -471223,7 +474897,7 @@ self: {
         transformers
       ];
       description = "Monad classes for transformers, using functional dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -471355,7 +475029,7 @@ self: {
         mtl
       ];
       description = "Lift substacks of monad transformer stacks";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -471464,7 +475138,7 @@ self: {
         mtl
       ];
       description = "Reified monad transformer stacks";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -472594,7 +476268,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A few multimap variants";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -472622,7 +476296,7 @@ self: {
       ];
       doHaddock = false;
       description = "Multiple Exceptions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -472642,7 +476316,7 @@ self: {
         hedgehog
       ];
       description = "Typeclasses augmented with a phantom type parameter";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -472805,7 +476479,7 @@ self: {
         template-haskell
       ];
       description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -472831,7 +476505,7 @@ self: {
         sop-core
       ];
       description = "Uncurry functions with multiple arguments";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -472898,7 +476572,7 @@ self: {
         toml-reader
       ];
       description = "Simple tool for running commands in multiple directories";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "muld";
       broken = true;
@@ -473094,7 +476768,7 @@ self: {
         hedgehog
       ];
       description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -473130,7 +476804,7 @@ self: {
         serialise
       ];
       description = "CBOR encoding of multihashes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -473999,7 +477673,7 @@ self: {
         haskeline
       ];
       description = "A framework for multiverse debugging";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "multiverse-debugging-exe";
     }
   ) { };
@@ -474043,7 +477717,7 @@ self: {
         transformers
       ];
       description = "Traverse data types via generics, acting on multiple types simultaneously";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -475156,7 +478830,7 @@ self: {
         ppad-secp256k1
       ];
       description = "MuSig2 library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -475462,7 +479136,7 @@ self: {
         vector
       ];
       description = "Mutable Fenwick trees";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -475533,7 +479207,7 @@ self: {
         primitive
       ];
       description = "Interoperate mutable references with regular lens";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -475587,7 +479261,7 @@ self: {
         safe-exceptions
       ];
       description = "A trivial lock based on MVar";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -475823,7 +479497,7 @@ self: {
       ];
       doCheck = false;
       description = "Fast, high quality pseudo random number generation";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -475845,7 +479519,6 @@ self: {
       ];
       description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -476660,6 +480333,7 @@ self: {
       pem,
       QuickCheck,
       quickcheck-instances,
+      ram,
       scanner,
       scientific,
       tasty,
@@ -476675,8 +480349,8 @@ self: {
     }:
     mkDerivation {
       pname = "mysql-haskell";
-      version = "1.1.7";
-      sha256 = "0798v6ybbknfp0xxq8wc8ladisrnnn8yhh1k6z5ya62gppp5v48m";
+      version = "1.2.0";
+      sha256 = "1ilqva74p8kl2x5pb1wf8bv3pb3f0k5njjzd2pa90lzy812w5h2g";
       libraryHaskellDepends = [
         base
         binary
@@ -476694,6 +480368,7 @@ self: {
         monad-loops
         network
         pem
+        ram
         scientific
         text
         time
@@ -476741,7 +480416,7 @@ self: {
         vector
       ];
       description = "pure haskell MySQL driver";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -476956,7 +480631,7 @@ self: {
         vector
       ];
       description = "pure haskell MySQL driver";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -477226,7 +480901,7 @@ self: {
         vty
       ];
       description = "Tool to keep track of what you have been working on and where";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mywork";
       broken = true;
@@ -477296,7 +480971,7 @@ self: {
         text
       ];
       description = "A Haskell client for the Myxine GUI server";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -477547,7 +481222,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Domain-specific languages for describing composable web services";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -477896,7 +481571,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Named parameters (keyword arguments) for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -477936,7 +481611,7 @@ self: {
         text
       ];
       description = "NBT (named binary tag) serialization and deserialization";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -478145,8 +481820,8 @@ self: {
     }:
     mkDerivation {
       pname = "named-text";
-      version = "1.2.2.0";
-      sha256 = "1xlwfandp1xs71f7vmgkazrami9pqqsffndi8v7160b58grc1y6y";
+      version = "1.2.3.0";
+      sha256 = "0vx1y0cxxzsf3f67sgi9rx5bf510yhmb16s5n0j5r25m4i807y4d";
       libraryHaskellDepends = [
         aeson
         base
@@ -478172,7 +481847,7 @@ self: {
         unordered-containers
       ];
       description = "A parameterized named text type and associated functionality";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -478562,7 +482237,7 @@ self: {
         transformers
       ];
       description = "Create compilers using small passes and many intermediate representations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dumb-nanopass-example";
       broken = true;
@@ -478898,7 +482573,7 @@ self: {
         text
       ];
       description = "Refinement types for natural numbers with an optics interface";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -479248,7 +482923,7 @@ self: {
         unlifted
       ];
       description = "Arithmetic of natural numbers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -479427,7 +483102,7 @@ self: {
         transformers
       ];
       description = "Parse/encode graph6, digraph6 and sparse6 formats (nauty)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -479559,7 +483234,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Unpack a Jupyter notebook into its sources, metadata and outputs";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "nbparts";
       broken = true;
@@ -479771,7 +483446,7 @@ self: {
         tasty-hunit
       ];
       description = "Quasiquoter for neat and simple multiline text interpolation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -479956,7 +483631,7 @@ self: {
       sha256 = "08jk7hn5mp89vxfkh9cl7rj5b9sjjwil4lic5gpgsbwpvy8rd8a8";
       libraryHaskellDepends = [ base ];
       description = "The Neither datatype";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -480097,7 +483772,7 @@ self: {
         random
       ];
       description = "Unofficial nekos.best API wrapper";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -480221,7 +483896,7 @@ self: {
         hedgehog
       ];
       description = "NonEmpty lists that look [more, like, this]";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -480338,7 +484013,7 @@ self: {
         vector
       ];
       description = "Neptune Client";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example-app";
       broken = true;
@@ -480353,7 +484028,7 @@ self: {
       sha256 = "0nbgb9lz0ibha72gyh0q86rbssik2fxphab6f1asm0r5kz5va3ly";
       libraryHaskellDepends = [ base ];
       description = "Nerd Font Icons for use in haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -480811,7 +484486,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "NestedText: A Human Friendly Data Format";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -482121,7 +485796,7 @@ self: {
         unix
       ];
       description = "Binding to C socket API operating on bytearrays";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -482574,7 +486249,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Arbitrary Instances for Network Types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -482780,8 +486455,8 @@ self: {
     }:
     mkDerivation {
       pname = "network-byte-order";
-      version = "0.1.7";
-      sha256 = "0yc6s2zdxkr2awmf56vqwds417ix8rgq33ffsk44wdk7gyny0328";
+      version = "0.1.8";
+      sha256 = "0hg783v6w8fqi0hdfc2ks4q2qj7gk627y50vzs1dngwyds0nd5sj";
       libraryHaskellDepends = [
         base
         bytestring
@@ -482858,7 +486533,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "CAN bus networking";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -483018,7 +486693,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Library to control network protocols";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -483147,7 +486822,7 @@ self: {
         network
       ];
       description = "Adaptation of the network library for the effectful ecosystem";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -483703,7 +487378,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Types for working with Linux packet sockets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -484037,7 +487712,7 @@ self: {
         transformers
       ];
       description = "Simple interface to TLS secured network sockets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -484066,7 +487741,7 @@ self: {
         websockets
       ];
       description = "Simple interface to WebSockets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -484095,7 +487770,7 @@ self: {
         websockets
       ];
       description = "Simple interface to TLS secured WebSockets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -484231,7 +487906,7 @@ self: {
         transformers
       ];
       description = "Network abstraction layer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -484345,7 +488020,7 @@ self: {
         network-transport-tests
       ];
       description = "In-memory instantiation of Network.Transport";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -484378,8 +488053,8 @@ self: {
       pname = "network-transport-quic";
       version = "0.1.1";
       sha256 = "1grif580mw6kp5hdgmimia8a14ydqcz1q4wj824hs3qwmxgmp44d";
-      revision = "1";
-      editedCabalFile = "0sm97r2p3fgd64mdq12pamv2554cmi6wpi84y5h700xvvd5aqlg8";
+      revision = "2";
+      editedCabalFile = "0flm8syhran28h0a66hsrzkqsfdsr9hcjwmbw0wr6x981ldlabn8";
       libraryHaskellDepends = [
         async
         base
@@ -484418,7 +488093,7 @@ self: {
         tasty-bench
       ];
       description = "Networking layer for Cloud Haskell based on QUIC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -484458,7 +488133,7 @@ self: {
         network-transport-tests
       ];
       description = "TCP instantiation of Network.Transport";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -484487,7 +488162,7 @@ self: {
         random
       ];
       description = "Unit tests for Network.Transport implementations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -484623,7 +488298,7 @@ self: {
         stm
       ];
       description = "Network functions that do not throw exceptions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
     }
   ) { };
@@ -484782,58 +488457,6 @@ self: {
   ) { };
 
   network-uri-template = callPackage (
-    {
-      mkDerivation,
-      base,
-      conduit,
-      containers,
-      hspec,
-      markdown-unlit,
-      megaparsec,
-      network-uri,
-      optparse-applicative,
-      prettyprinter,
-      prettyprinter-ansi-terminal,
-      text,
-    }:
-    mkDerivation {
-      pname = "network-uri-template";
-      version = "0.1.1.4";
-      sha256 = "0bvjjjmv4338jib5gw83qwjk3m1hkiaqjg06dj7gmvnyaag60jfy";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        base
-        containers
-        megaparsec
-        network-uri
-        prettyprinter
-        text
-      ];
-      executableHaskellDepends = [
-        base
-        containers
-        optparse-applicative
-        prettyprinter
-        prettyprinter-ansi-terminal
-        text
-      ];
-      testHaskellDepends = [
-        base
-        conduit
-        containers
-        hspec
-        megaparsec
-        text
-      ];
-      testToolDepends = [ markdown-unlit ];
-      description = "Library for parsing and expanding URI Templates, as per RFC 6570";
-      license = lib.licenses.agpl3Only;
-      mainProgram = "network-uri-template";
-    }
-  ) { };
-
-  network-uri-template_0_1_2_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -484881,7 +488504,6 @@ self: {
       testToolDepends = [ markdown-unlit ];
       description = "Library for parsing and expanding URI Templates, as per RFC 6570";
       license = lib.licenses.agpl3Only;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "network-uri-template";
     }
   ) { };
@@ -485493,7 +489115,7 @@ self: {
       ];
       doHaddock = false;
       description = "Future-proof system for plain-text notes";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "neuron";
     }
@@ -485632,7 +489254,7 @@ self: {
         text
       ];
       description = "newline specifications as values";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -485744,7 +489366,7 @@ self: {
         warp
       ];
       description = "A basic newsletter implimentation, using various backends";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "newsletter-server";
       broken = true;
@@ -485780,7 +489402,7 @@ self: {
         text
       ];
       description = "A mailgun backend for the newsletter package";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486004,7 +489626,7 @@ self: {
         random
       ];
       description = "Newtype Wrapper Zoo";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -486219,8 +489841,8 @@ self: {
     }:
     mkDerivation {
       pname = "ngx-export";
-      version = "1.7.10.2";
-      sha256 = "0d712xy7gy03z22cdns4alf6nbqj62dlhrqq4msv4hlbk1w6iivk";
+      version = "1.7.11";
+      sha256 = "1r8cj7hqyfnadcq2lyh16bczfcv3c2cpw63hyxdzkfg315yjnhmb";
       libraryHaskellDepends = [
         async
         base
@@ -486298,19 +489920,17 @@ self: {
       http-client-tls,
       http-types,
       ngx-export,
-      safe,
       snap-core,
       snap-server,
       text,
       time,
       tls,
       unordered-containers,
-      vector,
     }:
     mkDerivation {
       pname = "ngx-export-healthcheck";
-      version = "1.6.3";
-      sha256 = "1v58z19p4ma7k7g0hv2fz3j6vsw8y9pa5q7lspsw9d7z18rrfb8x";
+      version = "1.6.4";
+      sha256 = "1vi4j0prz1j9vgznpcmd8ymqa7nl84hbx5iai1f64azgxvanw2cs";
       libraryHaskellDepends = [
         aeson
         async
@@ -486329,14 +489949,12 @@ self: {
         http-client-tls
         http-types
         ngx-export
-        safe
         snap-core
         snap-server
         text
         time
         tls
         unordered-containers
-        vector
       ];
       description = "Active health checks and monitoring of Nginx upstreams";
       license = lib.licenses.bsd3;
@@ -486354,8 +489972,8 @@ self: {
     }:
     mkDerivation {
       pname = "ngx-export-log";
-      version = "1.5.2";
-      sha256 = "0l77znlaps924a7nqzkhc4w971y4q9lm3mr0m6xa3n7bdbmgy99i";
+      version = "1.6.2.2";
+      sha256 = "13vjamnbvgyxr7vics7mdqlcjkrlyi2k3v9m4y0lp83nwx1ryc15";
       libraryHaskellDepends = [
         base
         bytestring
@@ -486382,8 +490000,8 @@ self: {
     }:
     mkDerivation {
       pname = "ngx-export-tools";
-      version = "1.2.6.2";
-      sha256 = "0fb7w75bk3z0mbkpcp6vsq3ag6cjhbnqpha1gdxx4ijns4g6dp7f";
+      version = "1.2.6.3";
+      sha256 = "0a2pwdgiy0mr2k6asyjfa22sblg5qbc0ys28pwsfqccgyabg28fn";
       libraryHaskellDepends = [
         aeson
         base
@@ -486435,8 +490053,8 @@ self: {
     }:
     mkDerivation {
       pname = "ngx-export-tools-extra";
-      version = "1.2.12";
-      sha256 = "0py9pylysfnpzlcd7kxxj890lh6gs9xycp7sadppss1yb38li21f";
+      version = "1.2.12.2";
+      sha256 = "1k37qdi1mp3b1qxyv7fxdn9i3b1r7hd8991588zjywakdsnk9y2w";
       libraryHaskellDepends = [
         aeson
         array
@@ -487330,7 +490948,7 @@ self: {
         typed-process
       ];
       description = "Explain why two Nix derivations differ";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "nix-diff";
       maintainers = [
         lib.maintainers.Gabriella439
@@ -487433,7 +491051,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Convert a tree of files into fixed-output derivations";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "nix-freeze-tree";
       broken = true;
@@ -487483,7 +491101,7 @@ self: {
         optparse-applicative
       ];
       description = "Reify the Nix build graph into a Haskell graph data structure";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "nix-graph";
     }
   ) { };
@@ -487527,7 +491145,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Parse and render .narinfo files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "pretty-narinfo";
       maintainers = [ lib.maintainers.sorki ];
     }
@@ -487638,8 +491256,9 @@ self: {
         vector
       ];
       description = "A drop-in replacement for nix-serve that's faster and more stable";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "nix-serve";
+      maintainers = [ lib.maintainers.sternenseemann ];
     }
   ) { inherit (pkgs) nix; };
 
@@ -487907,7 +491526,7 @@ self: {
         vty
       ];
       description = "Interactively browse a Nix store paths dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "nix-tree";
       maintainers = [ lib.maintainers.utdemir ];
     }
@@ -488290,7 +491909,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Tool for semi-automatic updating of nixpkgs repository";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "nixpkgs-update";
       broken = true;
@@ -488334,7 +491953,7 @@ self: {
       ];
       doHaddock = false;
       description = "Nkeys ed25519 encoding for use with NATS";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -488652,7 +492271,7 @@ self: {
         doctest
       ];
       description = "A GHC plugin to remove support for recursion";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -489444,7 +493063,7 @@ self: {
         utility-ht
       ];
       description = "List-like structures with static restrictions on the number of elements";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -489580,6 +493199,37 @@ self: {
     }
   ) { };
 
+  non-negative-time-diff = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      deepseq,
+      directory,
+      ghc-typelits-natnormalise,
+      mtl,
+      safecopy,
+      time,
+    }:
+    mkDerivation {
+      pname = "non-negative-time-diff";
+      version = "0.0.2";
+      sha256 = "1jl1s4bpc985pa6gdhbzlkiqlnx5alm36vz32kk4k4z7gb8pdp7p";
+      libraryHaskellDepends = [
+        aeson
+        base
+        deepseq
+        directory
+        ghc-typelits-natnormalise
+        mtl
+        safecopy
+        time
+      ];
+      description = "type safe diffUTCTime";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   nonce = callPackage (
     {
       mkDerivation,
@@ -489741,7 +493391,7 @@ self: {
         hedgehog-classes
       ];
       description = "nonempty structure";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -489776,7 +493426,7 @@ self: {
         vector
       ];
       description = "Non-empty vectors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -489805,7 +493455,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Create NonEmpty version of any container";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -489840,7 +493490,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "aeson instances for 'NonEmpty'";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -489861,7 +493511,7 @@ self: {
         QuickCheck
       ];
       description = "QuickCheck instance for 'NonEmpty'";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -489884,7 +493534,7 @@ self: {
         text
       ];
       description = "'NonEmpty' wrappers for text";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -490366,7 +494016,7 @@ self: {
         transformers
       ];
       description = "An opinionated Prelude replacement library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -490443,7 +494093,7 @@ self: {
         tasty-hedgehog
       ];
       description = "Examine values for unexpected thunks";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -490456,17 +494106,25 @@ self: {
       bytestring,
       containers,
       dbus,
+      directory,
+      filepath,
       gi-dbusmenu,
       gi-gio,
       gi-glib,
       github,
+      gogol,
+      gogol-gmail,
       haskeline,
       hslogger,
+      http-client,
       http-conduit,
       http-types,
+      mtl,
+      network,
       optparse-applicative,
       process,
       regex-compat,
+      resourcet,
       status-notifier-item,
       text,
       transformers,
@@ -490475,10 +494133,11 @@ self: {
     }:
     mkDerivation {
       pname = "notifications-tray-icon";
-      version = "0.1.1.0";
-      sha256 = "07q201smb9knbwlflca1py5chck4a74lz0dvz7im01q1b1w6799r";
+      version = "0.2.0.1";
+      sha256 = "1i06947sz10az1a66w9f71bp738d0ig4hn6k1amx50qfx8my3d3i";
       isLibrary = true;
       isExecutable = true;
+      enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
         async
@@ -490486,15 +494145,23 @@ self: {
         bytestring
         containers
         dbus
+        directory
+        filepath
         gi-dbusmenu
         gi-gio
         gi-glib
         github
+        gogol
+        gogol-gmail
         hslogger
+        http-client
         http-conduit
         http-types
+        mtl
+        network
         process
         regex-compat
+        resourcet
         status-notifier-item
         text
         transformers
@@ -490503,6 +494170,8 @@ self: {
       executableHaskellDepends = [
         base
         bytestring
+        directory
+        filepath
         github
         haskeline
         hslogger
@@ -490519,6 +494188,81 @@ self: {
     }
   ) { };
 
+  notion-client = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      base16-bytestring,
+      bytestring,
+      containers,
+      cryptohash-sha256,
+      filepath,
+      http-api-data,
+      http-client,
+      http-client-tls,
+      servant,
+      servant-client,
+      servant-multipart-api,
+      servant-multipart-client,
+      tasty,
+      tasty-hunit,
+      text,
+      time,
+      time-compat,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "notion-client";
+      version = "0.1.0.0";
+      sha256 = "1q1l6ls0dk5wfbc7q8d357ahw4ia0f450q6a6kdk755ax5c8c75k";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        base16-bytestring
+        bytestring
+        containers
+        cryptohash-sha256
+        filepath
+        http-api-data
+        http-client-tls
+        servant
+        servant-client
+        servant-multipart-api
+        servant-multipart-client
+        text
+        time
+        time-compat
+        unordered-containers
+        vector
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        containers
+        text
+        unordered-containers
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        http-client
+        http-client-tls
+        servant-client
+        tasty
+        tasty-hunit
+        text
+      ];
+      description = "Type-safe Haskell client for the Notion API";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      mainProgram = "notion-client-example";
+    }
+  ) { };
+
   notmuch =
     callPackage
       (
@@ -490560,7 +494304,7 @@ self: {
           ];
           libraryToolDepends = [ c2hs ];
           description = "Haskell binding to Notmuch, the mail indexer";
-          license = lib.licensesSpdx."GPL-3.0-or-later";
+          license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
         }
       )
       {
@@ -490769,6 +494513,176 @@ self: {
     }
   ) { };
 
+  nova-cache = callPackage (
+    {
+      mkDerivation,
+      base,
+      base64-bytestring,
+      bytestring,
+      containers,
+      crypton,
+      directory,
+      filepath,
+      lzma,
+      ram,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "nova-cache";
+      version = "0.3.1.0";
+      sha256 = "1ir4xd3x92cs84yavlv0sk32qrw86bv83c13nbhxnkczcswx7ynn";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        base64-bytestring
+        bytestring
+        containers
+        crypton
+        directory
+        filepath
+        lzma
+        ram
+        text
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        base64-bytestring
+        bytestring
+        crypton
+        directory
+        ram
+        text
+      ];
+      description = "Pure Nix binary cache protocol library";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
+  nova-net = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      criterion,
+      deepseq,
+      mtl,
+      network,
+      QuickCheck,
+      stm,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "nova-net";
+      version = "0.1.0.0";
+      sha256 = "0qjpzvs9ldbkyqgzg7vsq0k8wl7k9gv36vbn0x5kc32g4nq0rrmg";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        deepseq
+        mtl
+        network
+        stm
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        QuickCheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        criterion
+        deepseq
+      ];
+      description = "General-purpose reliable UDP with C99 hot path and Haskell protocol logic";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  nova-nix = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      bytestring,
+      containers,
+      crypton,
+      directory,
+      filepath,
+      http-client,
+      http-client-tls,
+      http-types,
+      memory,
+      mtl,
+      nova-cache,
+      primitive,
+      process,
+      regex-tdfa,
+      sqlite-simple,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "nova-nix";
+      version = "0.1.8.0";
+      sha256 = "1kzgsgwkrfj74pz5d4bn03805rsqqpq4d8z8ihkvjcq763q88wid";
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        array
+        base
+        bytestring
+        containers
+        crypton
+        directory
+        filepath
+        http-client
+        http-client-tls
+        http-types
+        memory
+        mtl
+        nova-cache
+        primitive
+        process
+        regex-tdfa
+        sqlite-simple
+        text
+        time
+      ];
+      executableHaskellDepends = [
+        base
+        containers
+        directory
+        filepath
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        primitive
+        process
+        text
+      ];
+      description = "Windows-native Nix implementation in pure Haskell";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "nova-nix";
+      broken = true;
+    }
+  ) { };
+
   now-haskell = callPackage (
     {
       mkDerivation,
@@ -491636,7 +495550,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Efficient, infinite-precision 2D and 3D spatial containers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -491763,7 +495677,7 @@ self: {
         these
       ];
       description = "A heterogeneous, n-ary generalisation of These";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -492099,7 +496013,7 @@ self: {
         tasty-bench
       ];
       description = "Create number walls and save them as images";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -492620,7 +496534,7 @@ self: {
         utility-ht
       ];
       description = "An experimental alternative hierarchy of numeric type classes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -492782,7 +496696,7 @@ self: {
         vector
       ];
       description = "core package for Numerical Haskell project";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -492802,7 +496716,7 @@ self: {
         system-cxx-std-lib
       ];
       description = "Numerical integration";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -492826,7 +496740,7 @@ self: {
       sha256 = "1sh6k2b90p2gwxspqpv3v5bl8pbs5nfzkpsxmsk59ag852klhbci";
       libraryHaskellDepends = [ base ];
       description = "A numeric class hierarchy";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -492851,7 +496765,7 @@ self: {
         vector
       ];
       description = "Multi-dimensional arrays";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -492886,7 +496800,7 @@ self: {
         numhask
       ];
       description = "numerical free algebras";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -492919,7 +496833,7 @@ self: {
         numhask-prelude
       ];
       description = "Laws and tests for numhask";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -492975,7 +496889,7 @@ self: {
       ];
       testHaskellDepends = [ doctest ];
       description = "A numeric prelude";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -493052,7 +496966,7 @@ self: {
         vector
       ];
       description = "Numerical spaces";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -493345,7 +497259,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Generate nix sources expr for the latest version of packages";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "nvfetcher";
       maintainers = [ lib.maintainers.berberman ];
     }
@@ -493439,7 +497353,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell plugin backend for neovim";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -493924,7 +497838,7 @@ self: {
         markdown-unlit
       ];
       description = "Type-safe time library";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "play-o-clock";
       broken = true;
@@ -494146,7 +498060,7 @@ self: {
         tasty-bench
       ];
       description = "Composable concurrent computation done right";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -494262,6 +498176,101 @@ self: {
     }
   ) { };
 
+  oauth2-server = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      base64-bytestring,
+      blaze-html,
+      blaze-markup,
+      bytestring,
+      containers,
+      cryptonite,
+      http-api-data,
+      http-client,
+      http-types,
+      memory,
+      network-uri,
+      QuickCheck,
+      random,
+      scientific,
+      servant,
+      servant-auth-server,
+      servant-blaze,
+      servant-server,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      text,
+      time,
+      transformers,
+      wai,
+      wai-extra,
+      warp,
+    }:
+    mkDerivation {
+      pname = "oauth2-server";
+      version = "0.3.0.0";
+      sha256 = "0ln77syr6kahcsc2fbw6aqf3a55qgg36rbndkh6axpgpy4q5mcxx";
+      libraryHaskellDepends = [
+        aeson
+        base
+        base64-bytestring
+        blaze-html
+        bytestring
+        containers
+        cryptonite
+        http-api-data
+        http-types
+        memory
+        network-uri
+        random
+        servant
+        servant-auth-server
+        servant-blaze
+        servant-server
+        text
+        time
+        transformers
+      ];
+      testHaskellDepends = [
+        aeson
+        async
+        base
+        base64-bytestring
+        blaze-html
+        blaze-markup
+        bytestring
+        containers
+        cryptonite
+        http-api-data
+        http-client
+        http-types
+        memory
+        network-uri
+        QuickCheck
+        scientific
+        servant
+        servant-auth-server
+        servant-blaze
+        servant-server
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        text
+        time
+        transformers
+        wai
+        wai-extra
+        warp
+      ];
+      description = "OAuth 2.1 authorization server implementation";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
+    }
+  ) { };
+
   oauthenticated = callPackage (
     {
       mkDerivation,
@@ -494378,7 +498387,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Live in-memory sync of Obsidian Markdown notes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -494472,7 +498481,7 @@ self: {
         text
       ];
       description = "Ordered Reduced Binary Decision Diagrams";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -494626,7 +498635,7 @@ self: {
         witherable
       ];
       description = "Composable objects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -494811,7 +498820,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Object capability based IO";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -496679,7 +500688,7 @@ self: {
         xml-types
       ];
       description = "An Entity-Component-Systems engine core";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -496959,15 +500968,23 @@ self: {
       mkDerivation,
       base,
       old-locale,
+      tasty,
+      tasty-hunit,
     }:
     mkDerivation {
       pname = "old-time";
-      version = "1.1.0.5";
-      sha256 = "17x96snkj17ancbb1rk5vmsb9rxas81k6ijrmmm15nzqny27c5h9";
+      version = "1.1.1.0";
+      sha256 = "1awn7n6ggki30p3alx03839z3py5d5j5wjws6z5yy3b8q8xhsi1c";
       libraryHaskellDepends = [
         base
         old-locale
       ];
+      testHaskellDepends = [
+        base
+        old-locale
+        tasty
+        tasty-hunit
+      ];
       description = "Time library";
       license = lib.licenses.bsd3;
     }
@@ -497081,7 +501098,7 @@ self: {
         text
       ];
       description = "A typed-hole plugin that uses LLMs to generate valid hole-fits";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -497179,8 +501196,8 @@ self: {
     }:
     mkDerivation {
       pname = "om-doh";
-      version = "0.1.0.4";
-      sha256 = "12n3qap371fkwdkpm4fjr42xqnfs3kk3pmikzxxkx9zfvxk7zw58";
+      version = "0.1.0.5";
+      sha256 = "0cl0s0bg0c6afy3ps6g9bay177lqxf9v45c6xby08srm38mjgfwn";
       libraryHaskellDepends = [
         base
         base64
@@ -497192,7 +501209,7 @@ self: {
         text
       ];
       description = "om-doh";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -497214,8 +501231,8 @@ self: {
     }:
     mkDerivation {
       pname = "om-elm";
-      version = "2.0.1.1";
-      sha256 = "0vxyy8izj5rdqr7hm690mph34ag111pynn5gfkvjkwyjnv3q39hz";
+      version = "2.0.1.2";
+      sha256 = "017xwjz59bm7wlw3m6c89gv7qsa1r49mbvmp4yqdmwp1vjvp1vxd";
       libraryHaskellDepends = [
         base
         bytestring
@@ -497231,7 +501248,7 @@ self: {
         wai
       ];
       description = "Haskell utilities for building embedded Elm programs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -497245,8 +501262,8 @@ self: {
     }:
     mkDerivation {
       pname = "om-fail";
-      version = "0.1.0.6";
-      sha256 = "1zxb3k29wvr97bdirvnnansj3insvwc0zsi6p9smblrdasydl117";
+      version = "0.1.0.7";
+      sha256 = "0xlgcrbdh16fr0pkpl70xfcd87ypz649npnk8pz38mx7z5lg3lhq";
       libraryHaskellDepends = [
         base
         monad-logger
@@ -497254,7 +501271,7 @@ self: {
         transformers
       ];
       description = "Monad transformer providing MonadFail";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -497272,8 +501289,8 @@ self: {
     }:
     mkDerivation {
       pname = "om-fork";
-      version = "0.7.1.12";
-      sha256 = "1zrq2mwpx9f8z4x2xkp33zqzbiczgw92xdfxd3xwjfc8r0rag0p6";
+      version = "0.7.1.13";
+      sha256 = "1kcra5lcprqzb5kggdwmpc6dmily79671r617jhij0377f3xw4h7";
       libraryHaskellDepends = [
         aeson
         base
@@ -497295,7 +501312,7 @@ self: {
         unliftio
       ];
       description = "Concurrency utilities";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -497356,13 +501373,13 @@ self: {
         warp
       ];
       description = "Http utilities";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
   ) { };
 
-  om-http_0_6_0_0 = callPackage (
+  om-http_0_6_0_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -497391,8 +501408,8 @@ self: {
     }:
     mkDerivation {
       pname = "om-http";
-      version = "0.6.0.0";
-      sha256 = "05szwhsd4pyxnlq215n584hnxck09grsqypdh7im9gkfx8mmqxkg";
+      version = "0.6.0.1";
+      sha256 = "0hpwx6rd6ry9sibc74bz0xsi4wnqhncmykcwmhickmv20s9z4byk";
       libraryHaskellDepends = [
         aeson
         async
@@ -497419,7 +501436,7 @@ self: {
         warp
       ];
       description = "Http utilities";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -497497,7 +501514,7 @@ self: {
         x509-store
       ];
       description = "om-kubernetes";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -497535,8 +501552,8 @@ self: {
     }:
     mkDerivation {
       pname = "om-legion";
-      version = "6.9.0.8";
-      sha256 = "0n5angaqy7q4s2krapgvlwd5ss0j1xwrayfii3w75hfd65gw3frj";
+      version = "6.9.0.9";
+      sha256 = "1w2604rk6z3br7mzf05cdam4q1iamw3gab9rq5vg0w7671qwjfb8";
       libraryHaskellDepends = [
         aeson
         async
@@ -497567,7 +501584,7 @@ self: {
         uuid
       ];
       description = "Legion Framework";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -497586,8 +501603,8 @@ self: {
     }:
     mkDerivation {
       pname = "om-logging";
-      version = "1.1.0.10";
-      sha256 = "0s2yj64mvqf7agm8xlvrb407ir4i89giyd70475yaza6nixmm9r5";
+      version = "1.1.0.11";
+      sha256 = "12g0xp74bwvyk10jb3wa7r96p16q84yw26qwm64iqs6m0s762qxd";
       libraryHaskellDepends = [
         aeson
         base
@@ -497600,7 +501617,7 @@ self: {
         time
       ];
       description = "Opinionated logging utilities";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -497621,8 +501638,8 @@ self: {
     }:
     mkDerivation {
       pname = "om-plugin-imports";
-      version = "0.4.0.2.9.12";
-      sha256 = "0fl0vmj7dvidyqx0qrcpchkjb2n76kgch32q6ysqsfzv6jyyw5cn";
+      version = "0.4.0.2.9.14";
+      sha256 = "1ad1zbhr4pph5dv4d16rw9l58ghvpglv3qyd3cx8lfzl39chbi28";
       libraryHaskellDepends = [
         base
         containers
@@ -497644,7 +501661,7 @@ self: {
         time
       ];
       description = "Plugin-based explicit import generation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -497659,15 +501676,15 @@ self: {
     }:
     mkDerivation {
       pname = "om-show";
-      version = "0.1.2.11";
-      sha256 = "1abp4yygjcgpr92d767fgzqn1zp67j71mhfwaq6rvsbvqy3pi5zi";
+      version = "0.1.2.12";
+      sha256 = "02yg08lgq3pcd8rbliwq8mr9xq9m7xq8r32zlp6p0wkacf3ahi8c";
       libraryHaskellDepends = [
         aeson
         base
         text
       ];
       description = "Utilities for showing string-like things";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -497696,8 +501713,8 @@ self: {
     }:
     mkDerivation {
       pname = "om-socket";
-      version = "1.0.0.4";
-      sha256 = "01lxvngyx28qk3s4f7ix0grl45jy3zgki1l32dkqan69nklzzgln";
+      version = "1.0.0.5";
+      sha256 = "1r3wl9530nd5piwl5dj8rlpc0p6df3kgycl7zcmfd5f8f1mz44fw";
       libraryHaskellDepends = [
         aeson
         base
@@ -497731,7 +501748,7 @@ self: {
         unliftio-core
       ];
       description = "Socket utilities";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -497747,8 +501764,8 @@ self: {
     }:
     mkDerivation {
       pname = "om-time";
-      version = "0.3.1.1";
-      sha256 = "03g2yipal5v5rnvzrljn0gvy3jn6fk0hqwy84vi13qwy6crbxnrr";
+      version = "0.3.1.2";
+      sha256 = "06g2fhljg2h45xf27zbmgm4v5l1xi2ns1vkbrrhrh1pn0vl92nri";
       libraryHaskellDepends = [
         aeson
         base
@@ -497758,7 +501775,7 @@ self: {
         transformers
       ];
       description = "Misc. time utilites";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -498143,7 +502160,7 @@ self: {
         text
       ];
       description = "Pretty-printing short Aeson values as text";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -498270,7 +502287,7 @@ self: {
         torsor
       ];
       description = "HMAC-Based and Time-Based One-Time Passwords";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "one-time-password";
     }
   ) { };
@@ -498356,7 +502373,7 @@ self: {
         numhask
       ];
       description = "See readme.md";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -498399,7 +502416,7 @@ self: {
         numhask-prelude
       ];
       description = "See readme.md";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -498528,7 +502545,7 @@ self: {
         hspec-discover
       ];
       description = "Combinators for handling errors of many types in a composable way";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -498557,7 +502574,7 @@ self: {
         transformers
       ];
       description = "Oops examples";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -498580,7 +502597,7 @@ self: {
         doctest
       ];
       description = "Common operators encouraging large-scale easy reading";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -498811,7 +502828,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Text search utilities for Opaleye";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -498952,7 +502969,7 @@ self: {
         xml-parser
       ];
       description = "OPC XML-DA Client";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -499271,7 +503288,7 @@ self: {
         witness
       ];
       description = "open witnesses";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -499281,6 +503298,7 @@ self: {
       aeson,
       base,
       bytestring,
+      case-insensitive,
       containers,
       filepath,
       http-api-data,
@@ -499289,6 +503307,7 @@ self: {
       http-types,
       servant,
       servant-client,
+      servant-client-core,
       servant-multipart-api,
       servant-multipart-client,
       tasty,
@@ -499300,14 +503319,15 @@ self: {
     }:
     mkDerivation {
       pname = "openai";
-      version = "2.2.1";
-      sha256 = "02y0hyamyar36xmlcyzlw2plxhmsjc5z3hm9ci1znzq72yp5k0p8";
+      version = "2.5.3";
+      sha256 = "0rgmpwk2pf34y1ngcwa5d0k841waxy1z78a08nkigc5qxlxymm00";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         aeson
         base
         bytestring
+        case-insensitive
         containers
         filepath
         http-api-data
@@ -499316,6 +503336,7 @@ self: {
         http-types
         servant
         servant-client
+        servant-client-core
         servant-multipart-api
         servant-multipart-client
         text
@@ -499341,7 +503362,7 @@ self: {
         text
       ];
       description = "Servant bindings to OpenAI";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -499542,7 +503563,7 @@ self: {
         warp
       ];
       description = "Auto-generated API bindings for openai";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -499959,7 +503980,7 @@ self: {
       ];
       librarySystemDepends = [ opencascade-occt ];
       description = "Thin Wrapper for the OpenCASCADE CAD Kernel";
-      license = lib.licensesSpdx."LGPL-2.1-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-only";
     }
   ) { inherit (pkgs) opencascade-occt; };
 
@@ -499993,7 +504014,7 @@ self: {
         transformers
       ];
       description = "OpenCC bindings";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -500026,6 +504047,47 @@ self: {
     }
   ) { };
 
+  opencode = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      http-api-data,
+      http-client,
+      http-client-tls,
+      http-types,
+      mtl,
+      relude,
+      servant,
+      servant-client,
+      servant-client-core,
+      text,
+    }:
+    mkDerivation {
+      pname = "opencode";
+      version = "0.1.0.1";
+      sha256 = "1fmx4sn6253nawf4kv59pwhk2581r0g10r9c9iyggfjsz1whvzp5";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        http-api-data
+        http-client
+        http-client-tls
+        http-types
+        mtl
+        relude
+        servant
+        servant-client
+        servant-client-core
+        text
+      ];
+      description = "Haskell client library for OpenCode server API";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   opencog-atomspace = callPackage (
     {
       mkDerivation,
@@ -500300,7 +504362,7 @@ self: {
       libraryPkgconfigDepends = [ opendht-c ];
       libraryToolDepends = [ c2hs ];
       description = "Haskell bindings for OpenDHT";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -500666,7 +504728,7 @@ self: {
         unordered-containers
       ];
       description = "An OpenID Connect library that does all the heavy lifting for you";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -501126,7 +505188,7 @@ self: {
         ghc-trace-events
         hashable
       ];
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -501242,7 +505304,7 @@ self: {
         opentelemetry
         tasty-bench
       ];
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -501268,7 +505330,7 @@ self: {
         opentelemetry
         text
       ];
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -501338,7 +505400,7 @@ self: {
         typed-process
         unordered-containers
       ];
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "eventlog-to-lightstep";
     }
@@ -501381,7 +505443,7 @@ self: {
         unordered-containers
       ];
       description = "GHC plugin for open telemetry";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -501407,7 +505469,7 @@ self: {
         text
         wai
       ];
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -501936,7 +505998,8 @@ self: {
         vinyl
       ];
       description = "OpenTracing for Haskell";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -501963,7 +506026,8 @@ self: {
         text
       ];
       description = "OpenTracing instrumentation of http-client";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -502012,7 +506076,7 @@ self: {
         vector-instances
       ];
       description = "Jaeger backend for OpenTracing";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -502038,7 +506102,8 @@ self: {
         wai
       ];
       description = "Middleware adding OpenTracing tracing for WAI applications";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -502061,7 +506126,8 @@ self: {
         text
       ];
       description = "Zipkin OpenTracing Backend Commons";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -502108,7 +506174,7 @@ self: {
         vector-instances
       ];
       description = "Zipkin V1 backend for OpenTracing";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -502146,7 +506212,8 @@ self: {
         text
       ];
       description = "Zipkin V2 backend for OpenTracing";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -502417,7 +506484,7 @@ self: {
         text-builder-linear
       ];
       description = "Stack-based esoteric programming language";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "oplang";
       broken = true;
@@ -502763,8 +506830,8 @@ self: {
       pname = "optics";
       version = "0.4.2.1";
       sha256 = "0sszgi7xw8k57y6w16w80rp7zbcmx0h44bxb46n4yibmp9mdhlz6";
-      revision = "1";
-      editedCabalFile = "1qq3a7laqhs2xc3jpvh2vys620vvl24l6pskm6pc754553xhzzcz";
+      revision = "3";
+      editedCabalFile = "0a7di79v746gf9l5nkm6i1aamjb4z7bqcjr2xikf8ylsq3yz0454";
       libraryHaskellDepends = [
         array
         base
@@ -502800,7 +506867,7 @@ self: {
         vector
       ];
       description = "Optics as an abstract interface";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -502817,10 +506884,8 @@ self: {
     }:
     mkDerivation {
       pname = "optics-core";
-      version = "0.4.1.1";
-      sha256 = "1yxkgdxnjk2gjzrnapvwn87qqpxpb7k91mxnnk20l4m0cqy7x09y";
-      revision = "1";
-      editedCabalFile = "1jrkfh40zsjd0jgwpc98fmid66zfkh1jl3dqsivwxaiazy76cfa6";
+      version = "0.4.2";
+      sha256 = "1rywdmndpd3v6adiy3p6v07rrzfvlnxl19nkm59kkcnnia9c938v";
       libraryHaskellDepends = [
         array
         base
@@ -502830,7 +506895,7 @@ self: {
         transformers
       ];
       description = "Optics as an abstract interface: core definitions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -502855,8 +506920,8 @@ self: {
       pname = "optics-extra";
       version = "0.4.2.1";
       sha256 = "0hfa5yb7l3l310lfxkii13fjzb69g619agadc5a86i734nisf8vy";
-      revision = "4";
-      editedCabalFile = "0ravf8rwqdaqkbpc8vh566snh52mmpxwqxvp8bzk85a4cyi509sd";
+      revision = "5";
+      editedCabalFile = "1jnszx2lspvwr121mdxka4kjxh99q03hzf2cvfzw19qpvrgj2g68";
       libraryHaskellDepends = [
         array
         base
@@ -502873,7 +506938,7 @@ self: {
         vector
       ];
       description = "Extra utilities and instances for optics-core";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -502929,8 +506994,8 @@ self: {
       pname = "optics-th";
       version = "0.4.1";
       sha256 = "05zxljfqmhr5if7l8gld5s864nql6kqjfizsf1z7r3ydknvmff6p";
-      revision = "10";
-      editedCabalFile = "04jlmkxjnii6qpklgp1kmjxzvd21k3hspqjhk4cmk8h8wd3y6nbb";
+      revision = "11";
+      editedCabalFile = "04wpbb9fcrn34z0pha365b7snywrmb03zy1axj3rzyv0bvwm4xwa";
       libraryHaskellDepends = [
         base
         containers
@@ -502946,7 +507011,7 @@ self: {
         tagged
       ];
       description = "Optics construction using TemplateHaskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -503003,7 +507068,7 @@ self: {
         rerebase
       ];
       description = "Simple command line interface arguments parser";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -503032,7 +507097,7 @@ self: {
         time
       ];
       description = "Command-line arguments parsing for Hasql";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -503247,7 +507312,7 @@ self: {
       ];
       doHaddock = false;
       description = "Powerful and easy command-line option parser";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -503393,7 +507458,7 @@ self: {
         text
       ];
       description = "Extra functions for working with optparse-applicative";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -503446,7 +507511,7 @@ self: {
         mtl
       ];
       description = "Declarative command line option parser";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -503634,7 +507699,7 @@ self: {
         text
       ];
       description = "Like `optparse-generic`, but with `TemplateHaskell` for faster builds";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -503700,6 +507765,8 @@ self: {
       pname = "opus";
       version = "0.3.0.0";
       sha256 = "0q4g71dd7dl73q9hnn2vg1pphqxncfh1qrddjdbzwmcdi54jhcmw";
+      revision = "1";
+      editedCabalFile = "1jhp5l8zbns3i8ccwzmnx2qrxk1ji52a0l85zr9pi939qjjvfyp3";
       libraryHaskellDepends = [
         base
         bytestring
@@ -503718,11 +507785,11 @@ self: {
         microlens
       ];
       description = "Bindings to libopus for the Opus audio codec";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
-  ) { opus = null; };
+  ) { inherit (pkgs) opus; };
 
   opusfile = callPackage (
     {
@@ -504032,7 +508099,7 @@ self: {
       sha256 = "1fgzxlz2rynscnic1jawvrymhp70wxq04lpvp0ls84ky90zyzak8";
       libraryHaskellDepends = [ base ];
       description = "Axiomata & lemmata for easier use of Data.Type.Ord";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -504205,7 +508272,7 @@ self: {
       sha256 = "1na61sq78r190lcn4lw437mj5wcdq9p53zn3vbz16w3b1vwdwfii";
       libraryHaskellDepends = [ base ];
       description = "Utilities for Orderings";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -504411,7 +508478,7 @@ self: {
         time
       ];
       description = "Parser for Emacs org-mode files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -504440,7 +508507,7 @@ self: {
         text
       ];
       description = "Lucid integration for org-mode";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -504497,7 +508564,7 @@ self: {
         time
       ];
       description = "Parser for Org Mode documents";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -505016,7 +509083,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ormolu";
     }
@@ -505110,7 +509177,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ormolu";
     }
@@ -505207,7 +509274,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ormolu";
     }
   ) { };
@@ -505223,13 +509290,12 @@ self: {
       QuickCheck,
       test-framework,
       test-framework-hunit,
-      test-framework-quickcheck2,
       vector,
     }:
     mkDerivation {
       pname = "orthotope";
-      version = "0.1.7.2";
-      sha256 = "0jj5wfbkgi8q28j9liaj1s52j71rd9nx8sh0vkiavaqcik7a81xs";
+      version = "0.1.8.0";
+      sha256 = "03iik8v6vz30jnyg0dcn2ylmpm3y5zgwfclx86qkjhraa49djngz";
       libraryHaskellDepends = [
         base
         deepseq
@@ -505242,10 +509308,8 @@ self: {
         base
         deepseq
         HUnit
-        QuickCheck
         test-framework
         test-framework-hunit
-        test-framework-quickcheck2
         vector
       ];
       description = "Multidimensional arrays inspired by APL";
@@ -505479,7 +509543,7 @@ self: {
         warp
       ];
       description = "API bindings for Ory Kratos";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -505529,7 +509593,7 @@ self: {
         text
       ];
       description = "/etc/os-release helpers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -505572,7 +509636,7 @@ self: {
         tasty-bench
       ];
       description = "Library for manipulating Operating system strings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -505623,7 +509687,7 @@ self: {
         tasty-bench
       ];
       description = "Compatibility layer for os-string";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -505958,7 +510022,7 @@ self: {
         tasty-hunit
       ];
       description = "Open Source Vulnerability format";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -506181,7 +510245,7 @@ self: {
         text
       ];
       description = "A library to test programs that output text";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -506442,7 +510506,7 @@ self: {
       ];
       doHaddock = false;
       description = "Overloaded pragmas as a plugin";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -506599,7 +510663,7 @@ self: {
       ];
       doHaddock = false;
       description = "An efficient CPU-based multidimensional array (tensor) library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -506622,7 +510686,7 @@ self: {
         pa-prelude
       ];
       description = "Collect a tree of errors and pretty-print";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -506663,7 +510727,7 @@ self: {
         time
       ];
       description = "“Vertical” parsing of values";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -506712,7 +510776,7 @@ self: {
         vector
       ];
       description = "Our JSON parsers/encoders";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -506725,7 +510789,7 @@ self: {
       sha256 = "03y2cn6yy06xcpnjs5zc8hd8iba4k44wrrncl7ksplg8j3iank1x";
       libraryHaskellDepends = [ base ];
       description = "Labels, and labelled tuples and enums (GHC >9.2)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -506774,7 +510838,7 @@ self: {
         vector
       ];
       description = "The Possehl Analytics Prelude";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -506805,7 +510869,7 @@ self: {
         text
       ];
       description = "Some pretty-printing helpers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -506832,7 +510896,7 @@ self: {
         typed-process
       ];
       description = "Helper functions for spawning subprocesses";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -506969,7 +511033,7 @@ self: {
         text
       ];
       description = "A package for retrieving a package's version number";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -507175,7 +511239,7 @@ self: {
         split
         vector
       ];
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "examples";
       broken = true;
@@ -507466,6 +511530,44 @@ self: {
     }
   ) { };
 
+  packstream-bolt = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      deepseq,
+      hashable,
+      int-cast,
+      persist,
+      text,
+      text-show,
+      time,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "packstream-bolt";
+      version = "0.1.0.0";
+      sha256 = "1ws1k7xcmdq66y5iq2lc53zx1y66r558vy06iinnq2mvsqjhlpcw";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        deepseq
+        hashable
+        int-cast
+        persist
+        text
+        text-show
+        time
+        unordered-containers
+        vector
+      ];
+      description = "PackStream binary serialization format";
+      license = lib.licenses.asl20;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   packunused = callPackage (
     {
       mkDerivation,
@@ -507575,7 +511677,7 @@ self: {
       ];
       doHaddock = false;
       description = "Time Library for Pact";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -507644,7 +511746,7 @@ self: {
         time
       ];
       description = "API to the Paddle payment processor";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -508035,6 +512137,7 @@ self: {
       aeson-pretty,
       base,
       bytestring,
+      extra,
       filepath,
       http-query,
       optparse-applicative,
@@ -508043,12 +512146,13 @@ self: {
       simple-cmd-args,
       text,
       unordered-containers,
+      vector,
       yaml,
     }:
     mkDerivation {
       pname = "pagure-cli";
-      version = "0.2.2";
-      sha256 = "14kmhy8fkh32ixhfd48brfhzlhdh55yhnm5x4qwg7syxp94y26gc";
+      version = "0.2.3";
+      sha256 = "1xld54xgwvis7rj2208lqdxfc3mlxcwgxw3il64cx35ivd59rhxz";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -508056,6 +512160,7 @@ self: {
         aeson-pretty
         base
         bytestring
+        extra
         filepath
         http-query
         optparse-applicative
@@ -508064,6 +512169,7 @@ self: {
         simple-cmd-args
         text
         unordered-containers
+        vector
         yaml
       ];
       description = "A Pagure gitforge query tool";
@@ -508257,7 +512363,7 @@ self: {
         strict
       ];
       description = "Finding palindromes in strings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "palindromes";
     }
   ) { };
@@ -508279,7 +512385,7 @@ self: {
       librarySystemDepends = [ pam ];
       libraryToolDepends = [ c2hs ];
       description = "Haskell binding for C PAM API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
     }
   ) { inherit (pkgs) pam; };
@@ -508362,7 +512468,7 @@ self: {
         primitive
       ];
       description = "Parse syslog traffic from PAN-OS";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pan-os-syslog-to-avro";
       broken = true;
@@ -508626,7 +512732,7 @@ self: {
       ];
       doHaddock = false;
       description = "Conversion between markup formats";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       maintainers = [
         lib.maintainers.maralorn
         lib.maintainers.sternenseemann
@@ -508634,7 +512740,7 @@ self: {
     }
   ) { };
 
-  pandoc_3_8_3 = callPackage (
+  pandoc_3_9 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -508721,8 +512827,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc";
-      version = "3.8.3";
-      sha256 = "0208kyybr90mxpv6x4cnrsd4s1010bafg9gf098j9a3lvw3fmynf";
+      version = "3.9";
+      sha256 = "0y8nr10lmp0bsx2lsr8lcnlw8aj15fq9zq5bpfx0h1sd5z74932s";
       configureFlags = [ "-f-trypandoc" ];
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
@@ -508834,7 +512940,7 @@ self: {
       ];
       doHaddock = false;
       description = "Conversion between markup formats";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [
         lib.maintainers.maralorn
@@ -508864,7 +512970,7 @@ self: {
         text
       ];
       description = "A monadic DSL for building pandoc documents";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -509047,13 +513153,13 @@ self: {
         warp
       ];
       description = "Conversion between documentation formats";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       mainProgram = "pandoc";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
 
-  pandoc-cli_3_8_3 = callPackage (
+  pandoc-cli_3_9 = callPackage (
     {
       mkDerivation,
       base,
@@ -509069,8 +513175,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc-cli";
-      version = "3.8.3";
-      sha256 = "106f8hac5s0xm815k9az28insvkdmw37ybb1yjavb8v9ib1f1h2v";
+      version = "3.9";
+      sha256 = "1a94m8hdljqjh19753qph75xikd1y3bl79i1bbbi5vx07p2h0vnx";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -509086,7 +513192,7 @@ self: {
         warp
       ];
       description = "Conversion between documentation formats";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc";
       maintainers = [ lib.maintainers.maralorn ];
@@ -509116,7 +513222,7 @@ self: {
         pandoc-types
       ];
       description = "A pandoc filter that provides a Markdown extension for columns";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-columns";
       broken = true;
@@ -509219,7 +513325,7 @@ self: {
     }
   ) { };
 
-  pandoc-crossref_0_3_22 = callPackage (
+  pandoc-crossref_0_3_23 = callPackage (
     {
       mkDerivation,
       base,
@@ -509249,8 +513355,10 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc-crossref";
-      version = "0.3.22";
-      sha256 = "1vjypnw1w6a0m5yls7965xmi71g4fw0j7a0w1p7ygxf6anvcxi0i";
+      version = "0.3.23";
+      sha256 = "104nmakm5i8s30gbfszkv4pdcvf21i16q118pmvhvfahsl6kq7ra";
+      revision = "1";
+      editedCabalFile = "14b90zs7x0ii3yhxmrfkrc6qj0vvxdk6axndprm1q6v92r86pl1s";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -509709,7 +513817,7 @@ self: {
         pandoc-types
       ];
       description = "Pandoc filter to include files, with image path and heading level adjustment";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-include-plus";
       broken = true;
@@ -509810,7 +513918,7 @@ self: {
         pandoc-types
       ];
       description = "A pandoc filter that provides a Markdown extension to wrap text in table cells";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-linear-table";
       broken = true;
@@ -509838,7 +513946,7 @@ self: {
         text
       ];
       description = "Extract \"contextual links\" from Pandoc";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -509867,7 +513975,7 @@ self: {
         pandoc-types
       ];
       description = "A pandoc filter that provides a Markdown extension for logic proofs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-logic-proof";
       broken = true;
@@ -509959,11 +514067,11 @@ self: {
         text
       ];
       description = "Lua engine to power custom pandoc conversions";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
-  pandoc-lua-engine_0_5_0_2 = callPackage (
+  pandoc-lua-engine_0_5_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -510000,8 +514108,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc-lua-engine";
-      version = "0.5.0.2";
-      sha256 = "0vxvg0x4ym9sryr2yvbm4bpig18j4b3xzzmb4crkbdm8as17ak88";
+      version = "0.5.1";
+      sha256 = "12p9f7x9bs3yark9k4nfx43c2pbgq9l1w69c60j1m7hpzh0w3ik2";
       libraryHaskellDepends = [
         aeson
         base
@@ -510046,7 +514154,7 @@ self: {
         text
       ];
       description = "Lua engine to power custom pandoc conversions";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -510107,7 +514215,7 @@ self: {
         text
       ];
       description = "Use pandoc types in Lua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -510353,7 +514461,7 @@ self: {
         text
       ];
       description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       mainProgram = "pandoc-plot";
     }
   ) { };
@@ -510463,7 +514571,7 @@ self: {
         text
       ];
       description = "Pandoc filter to extract only the links";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -510488,7 +514596,7 @@ self: {
         pandoc-types
       ];
       description = "Pandoc filter to extract only the code blocks";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-select-code";
       broken = true;
@@ -510536,11 +514644,11 @@ self: {
         wai-cors
       ];
       description = "Pandoc document conversion as an HTTP servant-server";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
-  pandoc-server_0_1_1 = callPackage (
+  pandoc-server_0_1_2 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -510561,8 +514669,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc-server";
-      version = "0.1.1";
-      sha256 = "0xpz73k93zxy0yflbqi4b1vvzjfbzl3w4vrnvaac8xadyfd7605c";
+      version = "0.1.2";
+      sha256 = "1igs9fkbid824pj2bxgwk4s485fgc8sn9qqcbafyybfs571qqw1x";
       libraryHaskellDepends = [
         aeson
         base
@@ -510581,7 +514689,7 @@ self: {
         wai-cors
       ];
       description = "Pandoc document conversion as an HTTP servant-server";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -510791,7 +514899,34 @@ self: {
         text
       ];
       description = "Types for representing a structured document";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  pandoc-typescript = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-typescript,
+      base,
+      pandoc-types,
+      text,
+    }:
+    mkDerivation {
+      pname = "pandoc-typescript";
+      version = "0.1.0.0";
+      sha256 = "0pk51kawv0i90iyiqlxq2lil4r5xk5qpn9zrnjwvwp2irb85rgrq";
+      libraryHaskellDepends = [
+        aeson
+        aeson-typescript
+        base
+        pandoc-types
+        text
+      ];
+      description = "TypeScript type generation for Pandoc AST types";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -511002,7 +515137,7 @@ self: {
         base
       ];
       description = "Merge environment variables and command line options generically";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -511091,7 +515226,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ pango ];
       description = "Binding to the Pango text rendering engine";
-      license = lib.licensesSpdx."LGPL-2.1-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-only";
     }
   ) { inherit (pkgs) pango; };
 
@@ -512723,7 +516858,7 @@ self: {
         validators
       ];
       description = "ParDual class for Parallel <-> Sequential";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -513084,11 +517219,11 @@ self: {
         tasty-hunit
       ];
       description = "Classes and data structures for working with data-kind indexed types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
-  parameterized-utils_2_2_0_0 = callPackage (
+  parameterized-utils_2_3_0_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -513102,9 +517237,7 @@ self: {
       hedgehog-classes,
       indexed-traversable,
       microlens,
-      microlens-pro,
       mtl,
-      profunctors,
       tasty,
       tasty-ant-xml,
       tasty-hedgehog,
@@ -513116,8 +517249,8 @@ self: {
     }:
     mkDerivation {
       pname = "parameterized-utils";
-      version = "2.2.0.0";
-      sha256 = "0kz5ssgah0n5in76mibif3phqqd5mxy5cca26aafcvvm2g45v336";
+      version = "2.3.0.0";
+      sha256 = "0wx4vab2044whkflpxj7ixkk80i1mk4xn9ffr2sxi7vyclsikzx8";
       libraryHaskellDepends = [
         base
         base-orphans
@@ -513128,9 +517261,7 @@ self: {
         hashtables
         indexed-traversable
         microlens
-        microlens-pro
         mtl
-        profunctors
         template-haskell
         text
         th-abstraction
@@ -513151,7 +517282,7 @@ self: {
         tasty-hunit
       ];
       description = "Classes and data structures for working with data-kind indexed types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -513171,7 +517302,7 @@ self: {
         transformers
       ];
       description = "A known-parametric Functor typeclass";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -513448,7 +517579,7 @@ self: {
         happy
       ];
       description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -513548,7 +517679,7 @@ self: {
         text
       ];
       description = "A quick-and-dirty, low-friction benchmark tool with immediate feedback";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -513599,7 +517730,7 @@ self: {
         protolude
       ];
       description = "Help Manage project specific documentation";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "parochial";
       broken = true;
@@ -513725,7 +517856,7 @@ self: {
         transformers
       ];
       description = "Parsable and Printable classes";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     }
   ) { };
 
@@ -513756,7 +517887,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Test functions for the parsable package";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     }
   ) { };
 
@@ -513847,7 +517978,7 @@ self: {
         text
       ];
       description = "Parse machine-readable GHC GC stats";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -514406,7 +518537,7 @@ self: {
       sha256 = "1gs0yz7qw5j4w06pfpaiaingr6873znkkrs2m4izrw4xiz1nql4w";
       libraryHaskellDepends = [ base ];
       description = "Lightweight package providing commonly useful parser combinators";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -514439,7 +518570,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Test suite of parser-combinators";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -514495,6 +518626,8 @@ self: {
       pname = "parser-regex";
       version = "0.3.0.0";
       sha256 = "1vf8r4wwx97cj2dwd20znqbzp4svczw1hk9rjhpqh257l7b217pi";
+      revision = "1";
+      editedCabalFile = "0wli9hpy4i0y469a4djdvs4q5psnnjcd82h6ib9k0h05d1h6w305";
       libraryHaskellDepends = [
         base
         containers
@@ -514514,7 +518647,7 @@ self: {
         text
       ];
       description = "Regex based parsers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -514546,7 +518679,7 @@ self: {
         regex-applicative
       ];
       description = "Parsing library with unbiased choice and support for embedding arbitrary monad";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -514875,7 +519008,7 @@ self: {
       ];
       testToolDepends = [ cpphs ];
       description = "A fast parser combinator library backed by Typed Template Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -514938,7 +519071,7 @@ self: {
         th-test-utils
       ];
       description = "A fast parser combinator library backed by Typed Template Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -515197,7 +519330,7 @@ self: {
         hedgehog
       ];
       description = "A partial binary associative operator";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -515220,7 +519353,7 @@ self: {
         partial-semigroup
       ];
       description = "Property testing for partial semigroups using Hedgehog";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -515280,7 +519413,7 @@ self: {
         hspec
       ];
       description = "Data structure supporting partial orders";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -515393,7 +519526,7 @@ self: {
         transformers-except
       ];
       description = "Platform-Agnostic Security Tokens";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -515502,7 +519635,7 @@ self: {
         random
       ];
       description = "a simple password manager";
-      license = lib.licensesSpdx."LGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "passman";
       broken = true;
@@ -515917,7 +520050,7 @@ self: {
         utf8-string
       ];
       description = "Provides the Pasta curves: Pallas, Vesta and their field elements Fp and Fq";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pasta-curves";
       broken = true;
@@ -516170,8 +520303,8 @@ self: {
     }:
     mkDerivation {
       pname = "patch-image";
-      version = "0.3.3.3";
-      sha256 = "1mncv450iwhd26syn077dzv855dqcx8m10gj0r4bsb9yqnmnyahw";
+      version = "0.3.4";
+      sha256 = "0qwx01mb5cafdj0zlvhbm3f1a6lnvv61iga5q7611wy2g033442x";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -516351,7 +520484,7 @@ self: {
       ];
       doHaddock = false;
       description = "Support for well-typed paths";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -516525,7 +520658,7 @@ self: {
         unix-compat
       ];
       description = "Interface to ‘directory’ package for users of ‘path’";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -516599,7 +520732,7 @@ self: {
         path
       ];
       description = "A singleton wrapper for the `path` library";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -516643,7 +520776,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "A wrapper around the @path@ library, tagged with semantic name";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -516672,7 +520805,7 @@ self: {
         text
       ];
       description = "Read and write UTF-8 text files";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -516697,7 +520830,7 @@ self: {
         relude
       ];
       description = "`Data.Tree` for file paths";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -516877,7 +521010,7 @@ self: {
         QuickCheck
       ];
       description = "Type-safe replacement for System.FilePath etc";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -516980,11 +521113,11 @@ self: {
         uuid
       ];
       description = "Sentry SDK";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
-  patrol_1_2_0_3 = callPackage (
+  patrol_1_2_0_4 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -517004,8 +521137,8 @@ self: {
     }:
     mkDerivation {
       pname = "patrol";
-      version = "1.2.0.3";
-      sha256 = "1l0yfznc25cm4daa80fpqy7slym16pizbqqjv54mzzsqdfl30bn2";
+      version = "1.2.0.4";
+      sha256 = "0cm3wp62l2skcg2hamv8axd4xxxrn2y645pygsjxrv4sz3v28a8h";
       libraryHaskellDepends = [
         aeson
         base
@@ -517037,7 +521170,7 @@ self: {
         uuid
       ];
       description = "Sentry SDK";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -517239,7 +521372,7 @@ self: {
         vector
       ];
       description = "Greatest convex majorants and least concave minorants";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -518257,7 +522390,7 @@ self: {
         tasty-hunit
       ];
       description = "Integration over convex polytopes";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -518961,7 +523094,7 @@ self: {
       ];
       testToolDepends = [ markdown-unlit ];
       description = "Pear Trees: An indexed type using type-level binary numbers";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -519859,7 +523992,6 @@ self: {
       benchmarkToolDepends = [ cpphs ];
       description = "Find duplicate images";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "phash";
     }
   ) { };
@@ -519978,7 +524110,7 @@ self: {
         transformers
       ];
       description = "Database migration support for use in other libraries";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -520043,7 +524175,7 @@ self: {
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Performance methods and monad";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "perf-explore";
     }
   ) { };
@@ -520103,7 +524235,7 @@ self: {
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Performance tools";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "perf-explore";
     }
@@ -520153,7 +524285,7 @@ self: {
         vector
       ];
       description = "analysis example using perf";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "perf-examples";
     }
@@ -520278,7 +524410,7 @@ self: {
         vector
       ];
       description = "Library for performing vector shuffles";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
       broken = true;
@@ -520871,7 +525003,7 @@ self: {
         text
       ];
       description = "Minimal serialization library with focus on performance";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -522345,8 +526477,8 @@ self: {
     }:
     mkDerivation {
       pname = "persistent-mysql-pure";
-      version = "1.0.2";
-      sha256 = "0aaw7w52ba57r27mjmjkrwpv0949aiad5515ypckkqpi0i2cj4n5";
+      version = "1.0.3";
+      sha256 = "145zjyyghsg9as5ymwgs18529vbkyrw5bq66574pbap13rhs82lk";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -522398,7 +526530,7 @@ self: {
         unliftio-core
       ];
       description = "A pure haskell backend for the persistent library using MySQL database server";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "persistent-mysql-pure-example";
       broken = true;
@@ -523231,7 +527363,7 @@ self: {
         temporary
       ];
       description = "STM transactions involving persistent storage";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -523895,7 +528027,7 @@ self: {
         unordered-containers
       ];
       description = "CLI program for profiles management";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "pfile";
     }
   ) { };
@@ -523968,7 +528100,7 @@ self: {
         vector
       ];
       description = "A pleasant PostgreSQL layer";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -524002,7 +528134,7 @@ self: {
         text
       ];
       description = "PostgreSQL database performance insights";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -524164,7 +528296,7 @@ self: {
         proto-lens-protoc
       ];
       description = "Parse PostgreSQL DDL and DML: Haskell bindings for libpg_query";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -524471,6 +528603,244 @@ self: {
     }
   ) { };
 
+  pgmq-config = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      effectful-core,
+      ephemeral-pg,
+      generic-lens,
+      hasql,
+      hasql-pool,
+      lens,
+      pgmq-core,
+      pgmq-effectful,
+      pgmq-hasql,
+      pgmq-migration,
+      random,
+      tasty,
+      tasty-hunit,
+      text,
+    }:
+    mkDerivation {
+      pname = "pgmq-config";
+      version = "0.1.3.0";
+      sha256 = "0llfbcra52jqrwy6bngl2hik9vlfgg1xndlmv3s6iblcj838j53h";
+      libraryHaskellDepends = [
+        base
+        containers
+        effectful-core
+        generic-lens
+        hasql
+        hasql-pool
+        lens
+        pgmq-core
+        pgmq-effectful
+        pgmq-hasql
+        text
+      ];
+      testHaskellDepends = [
+        base
+        ephemeral-pg
+        generic-lens
+        hasql
+        hasql-pool
+        lens
+        pgmq-core
+        pgmq-hasql
+        pgmq-migration
+        random
+        tasty
+        tasty-hunit
+        text
+      ];
+      description = "Declarative queue configuration for PGMQ (PostgreSQL Message Queue)";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  pgmq-core = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      template-haskell,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "pgmq-core";
+      version = "0.1.3.0";
+      sha256 = "1bi3ih43gy1pj6hrnsbbzx5jyz7519asxvp1mck00x4q8c3f0fag";
+      libraryHaskellDepends = [
+        aeson
+        base
+        template-haskell
+        text
+        time
+      ];
+      description = "Core types for pgmq-hs, a Haskell client for PGMQ";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
+  pgmq-effectful = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      effectful-core,
+      hasql,
+      hasql-pool,
+      hs-opentelemetry-api,
+      hs-opentelemetry-propagator-w3c,
+      pgmq-core,
+      pgmq-hasql,
+      text,
+      unliftio,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "pgmq-effectful";
+      version = "0.1.3.0";
+      sha256 = "1f6aj5s7y8mby6z7dp5qqcmxpl85dxhyvxk8cqwlndjj10d46ck3";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        effectful-core
+        hasql
+        hasql-pool
+        hs-opentelemetry-api
+        hs-opentelemetry-propagator-w3c
+        pgmq-core
+        pgmq-hasql
+        text
+        unliftio
+        unordered-containers
+        vector
+      ];
+      description = "Effectful effects for PGMQ (PostgreSQL Message Queue)";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  pgmq-hasql = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      ephemeral-pg,
+      generic-lens,
+      hasql,
+      hasql-pool,
+      hasql-transaction,
+      hedgehog,
+      lens,
+      pgmq-core,
+      pgmq-migration,
+      random,
+      scientific,
+      tasty,
+      tasty-hedgehog,
+      tasty-hunit,
+      template-haskell,
+      text,
+      time,
+      vector,
+    }:
+    mkDerivation {
+      pname = "pgmq-hasql";
+      version = "0.1.3.0";
+      sha256 = "03iwplvsbw4cq6m90bkarlwyxj8p30kn738ahv5za5a8dz2zkwrm";
+      libraryHaskellDepends = [
+        aeson
+        base
+        generic-lens
+        hasql
+        hasql-transaction
+        lens
+        pgmq-core
+        template-haskell
+        text
+        time
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        ephemeral-pg
+        hasql
+        hasql-pool
+        hedgehog
+        pgmq-core
+        pgmq-migration
+        random
+        scientific
+        tasty
+        tasty-hedgehog
+        tasty-hunit
+        text
+        time
+        vector
+      ];
+      description = "Hasql-based client for PGMQ (PostgreSQL Message Queue)";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  pgmq-migration = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      ephemeral-pg,
+      file-embed,
+      hasql,
+      hasql-migration,
+      hasql-transaction,
+      tasty,
+      tasty-hunit,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "pgmq-migration";
+      version = "0.1.3.0";
+      sha256 = "09imp5ynin48hv93n8073rr855c3zbw85vlqnbxgh3zkbmpl8qvr";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        file-embed
+        hasql
+        hasql-migration
+        hasql-transaction
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        ephemeral-pg
+        hasql
+        hasql-migration
+        hasql-transaction
+        tasty
+        tasty-hunit
+      ];
+      description = "PGMQ schema migrations without PostgreSQL extension";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   pgp-wordlist = callPackage (
     {
       mkDerivation,
@@ -524517,6 +528887,54 @@ self: {
     }
   ) { };
 
+  pgrep = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      directory,
+      filepath,
+      optparse-applicative,
+      parsec,
+      process,
+      scrappy-core,
+    }:
+    mkDerivation {
+      pname = "pgrep";
+      version = "0.1.0.0";
+      sha256 = "12r47c0r0nb691dr4rrvlnvmr5kwyw6hii9liq0wl5ggliwwscms";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        containers
+        directory
+        filepath
+        parsec
+        process
+        scrappy-core
+      ];
+      executableHaskellDepends = [
+        base
+        containers
+        directory
+        filepath
+        optparse-applicative
+        scrappy-core
+      ];
+      testHaskellDepends = [
+        base
+        directory
+        filepath
+        parsec
+        scrappy-core
+      ];
+      description = "grep-like CLI using Parsec parsers instead of regex";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "pgrep";
+    }
+  ) { };
+
   pgsql-simple = callPackage (
     {
       mkDerivation,
@@ -524656,7 +529074,7 @@ self: {
         postgresql-simple
       ];
       description = "pgvector support for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -524862,7 +529280,6 @@ self: {
       silently,
       text,
       time,
-      transformers,
       utf8-string,
       vector,
       xml-conduit,
@@ -524870,8 +529287,8 @@ self: {
     }:
     mkDerivation {
       pname = "phino";
-      version = "0.0.0.64";
-      sha256 = "0lmvrrqpm44qhi5jm1davklfg2w1wnzmivnqyd2w6lg153kidizs";
+      version = "0.0.0.65";
+      sha256 = "1abm32pm9zfqyg68pmnswf447mlrzdzjcg4a9risqwaj8jyx56sn";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -524891,7 +529308,6 @@ self: {
         scientific
         text
         time
-        transformers
         utf8-string
         vector
         xml-conduit
@@ -524918,7 +529334,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Command-Line Manipulator of 𝜑-Calculus Expressions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "phino";
       broken = true;
@@ -525044,7 +529460,7 @@ self: {
         phonetic-languages-phonetics-basics
       ];
       description = "A shared by different general implementations of the PhLADiPreLiO functionality";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -525094,7 +529510,7 @@ self: {
         rhythmic-sequences
       ];
       description = "A generalized functionality of PhLADiPreLiO for different languages that uses hash algorithms";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -525107,7 +529523,7 @@ self: {
       sha256 = "1ymsxi750bwah3x1cvq1qvjlgibnbvgkrfv1vkjxs4lb8xa20b3g";
       libraryHaskellDepends = [ base ];
       description = "Allows to estimate some kind of the rhythmicity properties for the text";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -525144,7 +529560,7 @@ self: {
         ukrainian-phonetics-basic-array
       ];
       description = "A shared by different Ukrainian implementations of the PhLADiPreLiO functionality";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -525221,7 +529637,7 @@ self: {
         ukrainian-phonetics-basic-array
       ];
       description = "A PhLADiPreLiO implementation for Ukrainian that uses hashes and asynchronous concurrency";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "phladiprelioUkr";
     }
@@ -526511,7 +530927,7 @@ self: {
         unix
       ];
       description = "Rename photo image files based on EXIF shoot date";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "photoname";
       broken = true;
@@ -527040,7 +531456,7 @@ self: {
         text
       ];
       description = "Instant StatsD in Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -527817,7 +532233,7 @@ self: {
         text
       ];
       description = "Functional 2D Game Framework";
-      license = lib.licensesSpdx."Zlib";
+      license = lib.meta.getLicenseFromSpdxId "Zlib";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -527874,7 +532290,7 @@ self: {
         vector
       ];
       description = "Servant bindings to Pinecone";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "pinecone-example";
     }
   ) { };
@@ -527912,7 +532328,7 @@ self: {
         transformers
       ];
       description = "icmp echo requests";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -528033,7 +532449,7 @@ self: {
         tasty-hunit
       ];
       description = "Preserve warnings in a GHCi session";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -528349,7 +532765,7 @@ self: {
         transformers
       ];
       description = "Encode and decode JSON streams using Aeson and Pipes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -528439,7 +532855,7 @@ self: {
         transformers
       ];
       description = "Attoparsec and Pipes integration";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -530193,7 +534609,7 @@ self: {
         pulse-simple
       ];
       description = "Pipes for pulse-simple audio";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -530461,7 +534877,7 @@ self: {
         transformers
       ];
       description = "properly streaming text";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -530906,7 +535322,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A program for turning pixel art into 3D prints";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pixel-printer-exe";
       broken = true;
@@ -531085,7 +535501,7 @@ self: {
         http-client-tls
       ];
       description = "Pixiv API binding based on servant-client";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -531377,7 +535793,7 @@ self: {
         directory
       ];
       description = "Bindings and wrappers for PL_SYNTH - no-deps sound effects synthesizer and tracker";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -532185,7 +536601,7 @@ self: {
         word8
       ];
       description = "Library and executable for working with playlist files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "playlist";
     }
   ) { };
@@ -532235,7 +536651,7 @@ self: {
       sha256 = "1j7jblcmnvg2f5pdsakr9afqyssaspffbr4rdrixzayywbbrgbic";
       libraryHaskellDepends = [ base ];
       description = "A semi-cross-platform interface for pledge(2) and unveil(2)";
-      license = lib.licensesSpdx."Unlicense";
+      license = lib.meta.getLicenseFromSpdxId "Unlicense";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -532279,6 +536695,151 @@ self: {
     }
   ) { };
 
+  plexus-protocol = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-casing,
+      async,
+      base,
+      bytestring,
+      containers,
+      directory,
+      filepath,
+      network,
+      stm,
+      streaming,
+      text,
+      time,
+      websockets,
+    }:
+    mkDerivation {
+      pname = "plexus-protocol";
+      version = "0.3.0.0";
+      sha256 = "06rxyfr1910hpsiz1c5ygkg5jjpmaifmf9a943ml7ys9a153vq9c";
+      libraryHaskellDepends = [
+        aeson
+        aeson-casing
+        async
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        network
+        stm
+        streaming
+        text
+        time
+        websockets
+      ];
+      description = "Plexus RPC protocol types and client";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
+  plexus-synapse = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      array,
+      async,
+      base,
+      bytestring,
+      containers,
+      directory,
+      filepath,
+      hashable,
+      hspec,
+      mtl,
+      mustache,
+      network,
+      optparse-applicative,
+      plexus-protocol,
+      prettyprinter,
+      process,
+      regex-tdfa,
+      scientific,
+      stm,
+      streaming,
+      text,
+      time,
+      transformers,
+      unordered-containers,
+      vector,
+      websockets,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "plexus-synapse";
+      version = "3.5.0";
+      sha256 = "02byicw0s0z515ks9ajv058r40k2951kkjii96whgzp61facx737";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        array
+        async
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        hashable
+        mtl
+        mustache
+        network
+        plexus-protocol
+        prettyprinter
+        process
+        regex-tdfa
+        scientific
+        stm
+        streaming
+        text
+        time
+        transformers
+        unordered-containers
+        vector
+        websockets
+        yaml
+      ];
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        mtl
+        optparse-applicative
+        plexus-protocol
+        prettyprinter
+        text
+        time
+      ];
+      testHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        bytestring
+        containers
+        hspec
+        plexus-protocol
+        process
+        text
+        vector
+      ];
+      description = "Schema-driven CLI for Plexus RPC servers";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "synapse";
+    }
+  ) { };
+
   plist = callPackage (
     {
       mkDerivation,
@@ -533362,7 +537923,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-application-service";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533391,8 +537952,8 @@ self: {
     }:
     mkDerivation {
       pname = "pms-domain-model";
-      version = "0.1.3.0";
-      sha256 = "1dpjhh9q4hb2hbvpxiwlqy87yimq9kn7v7b7nywc4x8sj5dz3ll7";
+      version = "0.1.4.0";
+      sha256 = "0qbh7kxhzbp55wfwca84fnwyl2lzs6cbmwgfwl85y70zi27iqls7";
       libraryHaskellDepends = [
         aeson
         async
@@ -533424,7 +537985,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-domain-model";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -533460,8 +538021,8 @@ self: {
     }:
     mkDerivation {
       pname = "pms-domain-service";
-      version = "0.1.0.0";
-      sha256 = "1xfxcz5qarwnsyj2is4pxzlcgsdcmfiralclcwv1v96y5bkwf72b";
+      version = "0.1.1.0";
+      sha256 = "1qdkip9fqk20xfbswx0f62fic9w19md22vcimcc1rbcgw3w810dy";
       libraryHaskellDepends = [
         aeson
         base
@@ -533498,7 +538059,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-domain-service";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533566,7 +538127,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-cmdrun";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533598,8 +538159,8 @@ self: {
     }:
     mkDerivation {
       pname = "pms-infra-filesystem";
-      version = "0.0.1.0";
-      sha256 = "19jizc4rdyxnyva8r6p60sgi8llx41hcq1ypcc2qngpvxkg1blfh";
+      version = "0.0.2.0";
+      sha256 = "0gbkg1k220lrmvjz2pdkdjhw8rpjjm6rjqfygwnv095s4gcb6zkw";
       libraryHaskellDepends = [
         aeson
         async
@@ -533636,7 +538197,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-filesystem";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533704,7 +538265,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-procspawn";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533778,7 +538339,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-serial";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533850,7 +538411,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-socket";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533920,7 +538481,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-watch";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533994,7 +538555,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infrastructure";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -534055,7 +538616,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-ui-notification";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -534116,7 +538677,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-ui-request";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -534177,7 +538738,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-ui-response";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -534234,7 +538795,7 @@ self: {
         yaftee-conduit-mono-traversable
       ];
       description = "PNG's chunk codec on Yaftee";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -534529,7 +539090,7 @@ self: {
         text
       ];
       description = "A container wrapper";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "podenv";
       broken = true;
@@ -534784,11 +539345,11 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "pointless-fun";
-      version = "1.1.0.8";
-      sha256 = "1s8chhic15ywbd6k6rv9nkh3nb4sibgslnndd954rprz2nj7zn2h";
+      version = "1.1.0.13";
+      sha256 = "1lrwv6pwnagay3yx36kxhz7j866wqjah7a557l9137kqx7n1hp8v";
       libraryHaskellDepends = [ base ];
       description = "Some common point-free combinators";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -535039,7 +539600,7 @@ self: {
         gauge
       ];
       description = "Texas holdem hand evaluation and simulation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "poker-exe";
     }
@@ -535349,7 +539910,7 @@ self: {
         text
       ];
       description = "Haskell PVP version adviser";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "policeman";
       broken = true;
@@ -535398,7 +539959,7 @@ self: {
         utility-ht
       ];
       description = "Bindings to poll.h";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -535469,7 +540030,7 @@ self: {
         text
       ];
       description = "Functionality to help examine Haddock information of a module";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -535870,7 +540431,7 @@ self: {
         containers
       ];
       description = "Multivariate polynomial rings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -536071,7 +540632,7 @@ self: {
         sqel
       ];
       description = "Account management with Servant and Polysemy";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -536161,7 +540722,7 @@ self: {
         zeugma
       ];
       description = "Account management with Servant and Polysemy";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -536200,7 +540761,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Polysemy wrapper around the Blockfrost client";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -536276,7 +540837,7 @@ self: {
         tasty
       ];
       description = "A Polysemy effect for Chronos";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -536331,7 +540892,7 @@ self: {
         torsor
       ];
       description = "Polysemy effects for concurrency";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -536362,7 +540923,7 @@ self: {
         uuid
       ];
       description = "Polysemy effects for databases";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -536521,7 +541082,7 @@ self: {
         zeugma
       ];
       description = "Polysemy effects for databases";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -536585,7 +541146,7 @@ self: {
         tasty
       ];
       description = "Test utilities for polysemy-hasql";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -536648,7 +541209,7 @@ self: {
         warp
       ];
       description = "Polysemy effects for HTTP clients";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -536807,7 +541368,7 @@ self: {
         polysemy-plugin
       ];
       description = "Polysemy effects for logging";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -536857,7 +541418,7 @@ self: {
         tasty
       ];
       description = "Colog adapters for polysemy-log";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -536901,7 +541462,7 @@ self: {
         tasty
       ];
       description = "Di adapters for polysemy-log";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -536944,7 +541505,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Primitive functions and data types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -537234,7 +541795,7 @@ self: {
         unix
       ];
       description = "Polysemy effects for system processes";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -537275,7 +541836,7 @@ self: {
         polysemy-plugin
       ];
       description = "Readline effect for polysemy";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       mainProgram = "echo-repl";
     }
   ) { };
@@ -537299,7 +541860,7 @@ self: {
         req
       ];
       description = "Polysemy effect for req";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -537337,7 +541898,7 @@ self: {
         tasty
       ];
       description = "Polysemy error tracking";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -537387,7 +541948,7 @@ self: {
         text
       ];
       description = "Well-typed filesystem operation effects";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -537478,7 +542039,7 @@ self: {
         tasty
       ];
       description = "Polysemy effects for testing";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -537514,7 +542075,7 @@ self: {
         time
       ];
       description = "A Polysemy effect for time";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -537820,8 +542381,8 @@ self: {
     }:
     mkDerivation {
       pname = "polytree";
-      version = "0.0.9";
-      sha256 = "17ldq6vd8zfvcd5w5dxy41cyda0j91ikr5437jqxnzw4yv6pp79a";
+      version = "0.1.1";
+      sha256 = "1gq48l0xkpnvsbvrq5d6cf1g1cn7s54gqv0cdq2vrzd2lp40y54x";
       libraryHaskellDepends = [
         base
         bifunctors
@@ -537893,7 +542454,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Alternative to `Dynamic` with type guarantees";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -538361,7 +542922,7 @@ self: {
         xml-types
       ];
       description = "An XMPP client library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -538516,7 +543077,7 @@ self: {
         timeit
       ];
       description = "Simple work queue for bounded concurrency";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -538549,7 +543110,7 @@ self: {
         utility-ht
       ];
       description = "Run jobs on a limited number of threads and support data dependencies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -538649,7 +543210,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Static key-value storage backed by poppy";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -539095,7 +543656,7 @@ self: {
         warp
       ];
       description = "A minimalist HTTP server framework written on top of wai";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "porpoise-example";
       broken = true;
@@ -539226,7 +543787,7 @@ self: {
       ];
       doHaddock = false;
       description = "Data structures and functions for interacting with the Portage package manager";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
     }
   ) { };
 
@@ -539357,7 +543918,7 @@ self: {
         PortMidi
       ];
       description = "PortMidi utilities";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       mainProgram = "portmidi-list-devices";
     }
@@ -539680,7 +544241,7 @@ self: {
         template-haskell
       ];
       description = "A product-of-sums generics library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -539740,7 +544301,7 @@ self: {
         uuid
       ];
       description = "Simple extensible library to run SQL file against PostgreSQL database";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -539973,7 +544534,7 @@ self: {
         tasty-hunit
       ];
       description = "posix bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
     }
   ) { };
@@ -540042,8 +544603,8 @@ self: {
     }:
     mkDerivation {
       pname = "posix-paths";
-      version = "0.3.0.0";
-      sha256 = "1ljphynpaaibs9zjxwk1b774q66s3biinfx2sgdzxyzssbl9va42";
+      version = "0.3.0.1";
+      sha256 = "0qkcahncbm68kjdy8mwrmzsjvyw40nq7sp8w6zigxfacwr8y5pwk";
       libraryHaskellDepends = [
         base
         bytestring
@@ -540532,7 +545093,7 @@ self: {
         websockets
       ];
       description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "postgres-websockets";
       maintainers = [ lib.maintainers.wolfgangwalther ];
     }
@@ -540600,7 +545161,7 @@ self: {
         rerebase
       ];
       description = "Encoders and decoders for the PostgreSQL's binary format";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -540667,7 +545228,7 @@ self: {
         rerebase
       ];
       description = "Encoders and decoders for the PostgreSQL's binary format";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -540735,7 +545296,7 @@ self: {
         rerebase
       ];
       description = "Encoders and decoders for the PostgreSQL's binary format";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -540854,8 +545415,8 @@ self: {
     }:
     mkDerivation {
       pname = "postgresql-connection-string";
-      version = "0.1.0.5";
-      sha256 = "06b3rcjj0ynqq3zqk509cik9j96zr2r7mq6j8z83k9q5s9a4h073";
+      version = "0.1.0.6";
+      sha256 = "045ivan7dyg450akbl6v898dns8fswm4vlnpz0wqvcl3ykblisrd";
       libraryHaskellDepends = [
         base
         bytestring
@@ -540876,7 +545437,7 @@ self: {
         text
       ];
       description = "PostgreSQL connection string type, parser and builder";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -540983,8 +545544,8 @@ self: {
       pname = "postgresql-libpq";
       version = "0.11.0.0";
       sha256 = "18yj7vb51r72ybzi7849w83b79gydnh7az1wkc037fz6iwhb2jh3";
-      revision = "1";
-      editedCabalFile = "1i546w5an064cbikp66a4yq7j8gmi2iy9vkm1sax6yjzfpgsqzya";
+      revision = "2";
+      editedCabalFile = "1xas8j5wrwg5v3p3fy4cz4rwdr4dilr5bhhxq0nr1275pk3ifbb8";
       libraryHaskellDepends = [
         base
         bytestring
@@ -540998,7 +545559,7 @@ self: {
         tasty-hunit
       ];
       description = "low-level binding to libpq";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -541011,7 +545572,7 @@ self: {
       libraryHaskellDepends = [ base ];
       doHaddock = false;
       description = "low-level binding to libpq: configure based provider";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -541064,7 +545625,7 @@ self: {
       libraryPkgconfigDepends = [ libpq ];
       doHaddock = false;
       description = "low-level binding to libpq: pkg-config based provider";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) libpq; };
 
@@ -541184,7 +545745,7 @@ self: {
         postgresql-simple
       ];
       description = "PostgreSQL Schema Migrations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "migrate";
     }
   ) { };
@@ -541216,7 +545777,7 @@ self: {
         text
       ];
       description = "A PostgreSQL persistent schema migration utility";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -541260,6 +545821,29 @@ self: {
     }
   ) { };
 
+  postgresql-operation-counting = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      pretty,
+      text,
+    }:
+    mkDerivation {
+      pname = "postgresql-operation-counting";
+      version = "0.1.0.0";
+      sha256 = "1dlqlz59na8yzzan2yiihyp27nkjkxx79gqffjr4rjfkkjpr0niq";
+      libraryHaskellDepends = [
+        base
+        containers
+        pretty
+        text
+      ];
+      description = "Track and render a tally of which PostgreSQL operations have been performed";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   postgresql-orm = callPackage (
     {
       mkDerivation,
@@ -541357,7 +545941,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Converter for question mark style and dollar sign style of PostgreSQL SQL";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -541499,7 +546083,7 @@ self: {
         utf8-string
       ];
       description = "pure Haskell PostgreSQL driver";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -541681,7 +546265,7 @@ self: {
         postgresql-simple
       ];
       description = "Automatic re-connection support for PostgreSQL";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -541920,7 +546504,7 @@ self: {
         time
       ];
       description = "A simple interval type for PostgreSQL";
-      license = lib.licensesSpdx."0BSD";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -542058,7 +546642,7 @@ self: {
         transformers
       ];
       description = "Implementation of named parameters for `postgresql-simple` library";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -542138,8 +546722,8 @@ self: {
     }:
     mkDerivation {
       pname = "postgresql-simple-postgresql-types";
-      version = "0.1.0.1";
-      sha256 = "0rzi00yww6xb9srai836fz6d6mxa7r8yrbmx5b65yhx02y56rym2";
+      version = "0.1.1";
+      sha256 = "06j8vds1l6fbnz191amf0yk59y29w6x0kvglgdcmbgj4qj78zv95";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -542165,7 +546749,7 @@ self: {
         text
       ];
       description = "Integration of \"postgresql-simple\" with \"postgresql-types\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -542345,8 +546929,8 @@ self: {
     }:
     mkDerivation {
       pname = "postgresql-syntax";
-      version = "0.4.2";
-      sha256 = "0aqr407n7lgf3r9043y3zgrixz251apyri8w31nzyydvq3qy5sda";
+      version = "0.4.3";
+      sha256 = "1r55wwr34nbc3xzwibbkx5qg0dfxfvbf9h1pghpcqyvm4ycdpscw";
       libraryHaskellDepends = [
         base
         bytestring
@@ -542366,7 +546950,7 @@ self: {
         tasty-hunit
       ];
       description = "PostgreSQL AST parsing and rendering";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -542714,8 +547298,8 @@ self: {
     }:
     mkDerivation {
       pname = "postgresql-types";
-      version = "0.1.1.1";
-      sha256 = "1w7f5z4dicy0a7h6cwd9lv71dj4qy587czdpf5fs26yij9hsvgi0";
+      version = "0.1.3";
+      sha256 = "1i9djnaxgkd4ljw2hynr8xyqvlr8acifdp1kfabmbpbx755jjkmr";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -542766,7 +547350,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Precise PostgreSQL types representation and driver-agnostic codecs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -542798,7 +547382,7 @@ self: {
         text-builder
       ];
       description = "Type classes for PostgreSQL type mappings";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -543637,7 +548221,7 @@ self: {
         tasty-hunit
       ];
       description = "PowerDNS API bindings for api/v1";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -543909,7 +548493,7 @@ self: {
         ppad-base16
       ];
       description = "A pure AEAD-ChaCha20-Poly1305 construction";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -543953,7 +548537,7 @@ self: {
         weigh
       ];
       description = "Pure base16 encoding and decoding on bytestrings";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -543998,7 +548582,7 @@ self: {
         criterion
       ];
       description = "base58 and base58check encoding/decoding";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -544037,7 +548621,7 @@ self: {
         deepseq
       ];
       description = "bech32 and bech32m encoding/decoding, per BIPs 173 & 350";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -544061,8 +548645,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-bip32";
-      version = "0.3.3";
-      sha256 = "1h0j5wq6hky83hj79gz2s1dv2bs8cib754va0lq4mjznfga82y6z";
+      version = "0.3.4";
+      sha256 = "0fwn3m03iwv6l5i6f915rb4l4dimswi1x3shy0mc48n491z2m1xs";
       libraryHaskellDepends = [
         base
         bytestring
@@ -544093,7 +548677,7 @@ self: {
         ppad-secp256k1
       ];
       description = "BIP32 hierarchical deterministic wallets";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -544121,8 +548705,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-bip39";
-      version = "0.3.2";
-      sha256 = "1kkbwar3diispj5idi72djqyfsmszd1wajl3ia9ma9087ag6jfnq";
+      version = "0.3.3";
+      sha256 = "0sh80v2q614fr2a8447jil1qlyi0ivpjxa7jfsnvzyzpa0w1r4v6";
       libraryHaskellDepends = [
         base
         bytestring
@@ -544154,7 +548738,7 @@ self: {
         deepseq
       ];
       description = "BIP39 mnemonic codes";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -544196,7 +548780,7 @@ self: {
         ppad-base16
       ];
       description = "A pure ChaCha20 stream cipher";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -544232,7 +548816,7 @@ self: {
         weigh
       ];
       description = "Large fixed-width words and constant-time arithmetic";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -544277,7 +548861,7 @@ self: {
         ppad-sha512
       ];
       description = "A HMAC-based key derivation function";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -544289,20 +548873,24 @@ self: {
       base,
       bytestring,
       criterion,
+      deepseq,
       ppad-base16,
       ppad-sha256,
       ppad-sha512,
       primitive,
       tasty,
       tasty-hunit,
+      weigh,
     }:
     mkDerivation {
       pname = "ppad-hmac-drbg";
-      version = "0.2.1";
-      sha256 = "12wpx5ba1z5c5x8slk2fvs72dmzjq2qq801wa8n02j9153mxnhgi";
+      version = "0.3.1";
+      sha256 = "0ass2pyl01dnz8fxvildv3x8r0kinr2b5qd0jqg2rjdn1m7291ra";
       libraryHaskellDepends = [
         base
         bytestring
+        ppad-sha256
+        ppad-sha512
         primitive
       ];
       testHaskellDepends = [
@@ -544310,8 +548898,6 @@ self: {
         base
         bytestring
         ppad-base16
-        ppad-sha256
-        ppad-sha512
         tasty
         tasty-hunit
       ];
@@ -544319,11 +548905,11 @@ self: {
         base
         bytestring
         criterion
-        ppad-sha256
-        ppad-sha512
+        deepseq
+        weigh
       ];
       description = "HMAC-based deterministic random bit generator";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -544369,7 +548955,7 @@ self: {
         ppad-sha512
       ];
       description = "A password-based key derivation function";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -544410,7 +548996,7 @@ self: {
         ppad-base16
       ];
       description = "A pure Poly1305 MAC";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -544451,7 +549037,7 @@ self: {
         SHA
       ];
       description = "The RIPEMD-160 hashing algorithm";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -544497,7 +549083,7 @@ self: {
         weigh
       ];
       description = "Primitive Script support";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -544522,8 +549108,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-secp256k1";
-      version = "0.5.3";
-      sha256 = "1xxgfnnw70bhqafb7m40930is8l5yi09zm9dslsgi1y8kbjjl3p1";
+      version = "0.5.4";
+      sha256 = "1iqa533crlw9n2s5hqvlix4fc8vz01hswgcq1y32gf1mfgyzfsxl";
       libraryHaskellDepends = [
         base
         bytestring
@@ -544554,7 +549140,7 @@ self: {
         weigh
       ];
       description = "Schnorr signatures, ECDSA, and ECDH on the elliptic curve secp256k1";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -544578,8 +549164,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-sha256";
-      version = "0.3.1";
-      sha256 = "10blakf26r9fq4ah1bnd73gxdkh8sr0lm8vxw667s77m10ylbwk4";
+      version = "0.3.2";
+      sha256 = "0apxh062v2xbq5varh7jkjn9ghhn8041jciwwqxrz71rl1nr17hv";
       libraryHaskellDepends = [
         base
         bytestring
@@ -544604,7 +549190,7 @@ self: {
         weigh
       ];
       description = "The SHA-256 and HMAC-SHA256 algorithms";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -544629,8 +549215,8 @@ self: {
     }:
     mkDerivation {
       pname = "ppad-sha512";
-      version = "0.2.1";
-      sha256 = "0ric9q4y6k5vvd4sjsdnpry20y678qs26p7wig39fbm84b3dq83x";
+      version = "0.2.2";
+      sha256 = "096xvbdnrqlmm686qz4c1rr3d1vi7hbnjvd0w3g20dwyhlai36mc";
       libraryHaskellDepends = [
         base
         bytestring
@@ -544655,7 +549241,7 @@ self: {
         weigh
       ];
       description = "The SHA-512 and HMAC-SHA512 algorithms";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -544900,6 +549486,9 @@ self: {
       extra,
       filepath,
       Glob,
+      hashable,
+      hspec,
+      hspec-discover,
       http-client,
       http-client-tls,
       http-types,
@@ -544914,8 +549503,8 @@ self: {
     }:
     mkDerivation {
       pname = "pr-tools";
-      version = "0.1.0.0";
-      sha256 = "0r9588mdf2n65gnnc4jy9nwvklmdd0mzyyp0k8hsd12k7av8fl1f";
+      version = "0.2.0.0";
+      sha256 = "0k1jfqk4n4nk2h3w9vvbrqssxc4hp67g5zzpm3cs6cggn91jd08w";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -544927,6 +549516,7 @@ self: {
         Diff
         directory
         extra
+        hashable
         http-client
         http-client-tls
         http-types
@@ -544958,8 +549548,15 @@ self: {
         uuid
         yaml
       ];
+      testHaskellDepends = [
+        base
+        containers
+        hspec
+        hspec-discover
+      ];
+      testToolDepends = [ hspec-discover ];
       description = "Decentralized git pull request and code review flows";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -545436,7 +550033,7 @@ self: {
         text
       ];
       description = "A library for writing predicates and transformations over predicates in Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -545887,7 +550484,7 @@ self: {
         template-haskell
       ];
       description = "A Prelude";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -546037,11 +550634,11 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "prelude-safeenum";
-      version = "0.1.1.3";
-      sha256 = "1p6q2kv8gbkhzam03sl2bkjp8xq7q77h88v6afvca3yrlg4mlw62";
+      version = "0.1.1.8";
+      sha256 = "0c7k9w5bh8hk6hxd3ya4ih7x0vckr1slwfna4nr48q21n0svx308";
       libraryHaskellDepends = [ base ];
       description = "A redefinition of the Prelude's Enum class in order to render it safe";
-      license = lib.licenses.bsd3;
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -546580,7 +551177,7 @@ self: {
         wl-pprint
       ];
       description = "Pretty-printing library";
-      license = lib.licensesSpdx."LGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -546771,7 +551368,7 @@ self: {
       ];
       doHaddock = false;
       description = "Produce nice human-readable HTML";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -547138,7 +551735,7 @@ self: {
         web-rep
       ];
       description = "Pretty print charts from ghci";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "prettychart-watch";
     }
   ) { };
@@ -547187,7 +551784,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "API for prettyprinting custom syntax trees (extracted from elm-format)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -547335,7 +551932,7 @@ self: {
         vector
       ];
       description = "Some useful combinators for the prettyprinter package";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -547467,7 +552064,7 @@ self: {
         text
       ];
       description = "Configurable pretty-printing";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -547528,7 +552125,7 @@ self: {
         text
       ];
       description = "A prettyprinter backend for graphviz";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -547565,7 +552162,7 @@ self: {
         text
       ];
       description = "Efficient interpolation for Prettyprinter";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -547590,7 +552187,7 @@ self: {
         text
       ];
       description = "A prettyprinter backend for lucid";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -547655,7 +552252,7 @@ self: {
       sha256 = "15igqxb77ycl9lfs1bl1l9x3cynsg4kqzkr54q46ly4l315bsrq4";
       libraryHaskellDepends = [ ghc-prim ];
       description = "An ergonomic but conservative interface to ghc-prim";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -547710,7 +552307,7 @@ self: {
         quickcheck-classes
       ];
       description = "Prim typeclass instances";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -547966,7 +552563,7 @@ self: {
         tasty-bench
       ];
       description = "Bindings to the primecount library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) primecount; };
 
@@ -548113,7 +552710,7 @@ self: {
         primitive
       ];
       description = "Addresses to unmanaged memory";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -548139,7 +552736,7 @@ self: {
         primitive-unlifted
       ];
       description = "Wrappers for primops around atomic operations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -548158,7 +552755,7 @@ self: {
         primitive
       ];
       description = "primitive functions with bounds-checking";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -548238,7 +552835,7 @@ self: {
       sha256 = "1xnyyw76kh42fy1b1wkc143bg3588gbp48990xdskcad1aj4fyan";
       libraryHaskellDepends = [ primitive ];
       description = "convenience class for PrimMonad m/PrimState m";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -548293,7 +552890,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Extras for the \"primitive\" library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -548318,7 +552915,7 @@ self: {
         QuickCheck
       ];
       description = "using the `Prim` interface for the FFI";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -548401,7 +552998,7 @@ self: {
         primitive
       ];
       description = "Types for offsets into unboxed arrays";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -548420,7 +553017,7 @@ self: {
         primitive
       ];
       description = "Unboxed variables for `Prim` values";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -548443,7 +553040,7 @@ self: {
         cpu
       ];
       description = "Serialisation of primitive types";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -548499,7 +553096,7 @@ self: {
         primitive-unlifted
       ];
       description = "Slices of primitive arrays";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -548550,7 +553147,7 @@ self: {
         random
       ];
       description = "Sort primitive arrays";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -548569,7 +553166,7 @@ self: {
         primitive
       ];
       description = "primitive operations on StableNames";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -548596,7 +553193,7 @@ self: {
         primitive
       ];
       description = "Unaligned access to primitive arrays";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -548635,7 +553232,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Primitive GHC types with unlifted types inside";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -549197,7 +553794,7 @@ self: {
       ];
       doHaddock = false;
       description = "Abstract syntax for writing documents";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -549245,7 +553842,7 @@ self: {
         vector
       ];
       description = "Utilities for tracking source locations";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -549273,7 +553870,7 @@ self: {
         hspec
       ];
       description = "Discrete probability monad";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -549335,7 +553932,7 @@ self: {
         lens
       ];
       description = "A library for modular probabilistic modelling";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "prob-fx";
       broken = true;
@@ -549407,7 +554004,7 @@ self: {
         deepseq
       ];
       description = "Probability distributions via piecewise polynomials";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -549516,7 +554113,7 @@ self: {
     }
   ) { };
 
-  process_1_6_26_1 = callPackage (
+  process_1_6_27_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -549527,10 +554124,8 @@ self: {
     }:
     mkDerivation {
       pname = "process";
-      version = "1.6.26.1";
-      sha256 = "1w58md2dv4ijprjgd3v3imxn7f052l1g6bxlhkx8cyb0fyxd4cdl";
-      revision = "1";
-      editedCabalFile = "159sw9ryhwd0i8mrkh6p0gz1kah4ys9fd4plskmqjqcx6drzawcm";
+      version = "1.6.27.0";
+      sha256 = "14xnd4kv3bdbcc6fza6ccnrccc65as0vnzr3dg8g6q1msckg97pf";
       libraryHaskellDepends = [
         base
         deepseq
@@ -549539,7 +554134,7 @@ self: {
         unix
       ];
       description = "Process libraries";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -550019,7 +554614,7 @@ self: {
         process
       ];
       description = "C bindings for the gnu-extension functions process_vm_readv and process_vm_writev";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -550089,7 +554684,7 @@ self: {
         unix
       ];
       description = "Ergonomic process launching with extreme flexibility and speed";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -550489,7 +555084,7 @@ self: {
         optparse-applicative
       ];
       description = "Generate flamegraphs from ghc RTS .prof files";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "prof-flamegraph";
       broken = true;
@@ -551063,7 +555658,7 @@ self: {
         tasty-hunit
       ];
       description = "A project initialization library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -551075,11 +555670,9 @@ self: {
       aeson,
       async,
       attoparsec,
-      barbies,
       base,
       base16-bytestring,
       base64-bytestring,
-      blaze-html,
       bytestring,
       byteunits,
       Cabal,
@@ -551140,7 +555733,6 @@ self: {
       resourcet,
       rset,
       scientific,
-      scotty,
       semigroups,
       sqlite-simple,
       stm,
@@ -551152,6 +555744,7 @@ self: {
       temporary,
       text,
       text-manipulate,
+      th-lift-instances,
       time,
       transformers,
       unix,
@@ -551169,8 +555762,8 @@ self: {
     }:
     mkDerivation {
       pname = "project-m36";
-      version = "1.2.0";
-      sha256 = "0339b1kkgjc5cg36balnf3jlkljjg1lix9akf82v3b9453hg4ykf";
+      version = "1.2.6";
+      sha256 = "0bvc6v3j3p8qgrf8pzpx5klk54k8xgpn8bka7bm7gjjdzg9sjrxi";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -551178,6 +555771,7 @@ self: {
         async
         attoparsec
         base
+        base16-bytestring
         base64-bytestring
         bytestring
         cassava
@@ -551209,9 +555803,12 @@ self: {
         hashable
         haskeline
         http-api-data
+        http-conduit
+        http-types
         linux-xattr
         list-t
         megaparsec
+        modern-uri
         monad-parallel
         MonadRandom
         mtl
@@ -551220,6 +555817,7 @@ self: {
         old-locale
         optparse-applicative
         parallel
+        parser-combinators
         path-pieces
         prettyprinter
         process
@@ -551238,9 +555836,11 @@ self: {
         streamly
         streamly-core
         system-linux-proc
+        template-haskell
         temporary
         text
         text-manipulate
+        th-lift-instances
         time
         transformers
         unix
@@ -551254,13 +555854,10 @@ self: {
       executableHaskellDepends = [
         aeson
         attoparsec
-        barbies
         base
         base16-bytestring
         base64-bytestring
-        blaze-html
         bytestring
-        Cabal
         cassava
         conduit
         containers
@@ -551272,7 +555869,6 @@ self: {
         deepseq-generics
         directory
         either
-        exceptions
         filepath
         ghc
         ghc-paths
@@ -551282,7 +555878,6 @@ self: {
         http-api-data
         http-conduit
         http-types
-        HUnit
         list-t
         megaparsec
         modern-uri
@@ -551298,7 +555893,6 @@ self: {
         random
         recursion-schemes
         scientific
-        scotty
         semigroups
         stm
         stm-containers
@@ -551315,7 +555909,6 @@ self: {
         warp
         warp-tls
         websockets
-        winery
       ];
       testHaskellDepends = [
         aeson
@@ -551388,6 +555981,8 @@ self: {
         deepseq-generics
         directory
         filepath
+        ghc
+        ghc-paths
         gnuplot
         hashable
         haskeline
@@ -551420,8 +556015,9 @@ self: {
         websockets
         winery
       ];
+      doHaddock = false;
       description = "Relational Algebra Engine";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -551592,7 +556188,7 @@ self: {
         inspection-testing
       ];
       description = "Profunctor-based lightweight implementation of optics";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -552171,7 +556767,7 @@ self: {
         warp
       ];
       description = "Instrument a wai application with various metrics";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "prometheus-wai-middleware-example";
       broken = true;
@@ -552264,7 +556860,7 @@ self: {
         text
       ];
       description = "A user-friendly, dependently-typed library for asking your users questions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -552287,7 +556883,7 @@ self: {
         text
       ];
       description = "A user-friendly, dependently-typed library for asking your users questions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -552370,7 +556966,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Telegram bot for proof assistants";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "proof-assistant-bot";
       broken = true;
@@ -552475,7 +557071,7 @@ self: {
         containers
       ];
       description = "A Propagator Library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -552664,7 +557260,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A library for tests, based on transforming and writing properties";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -552740,7 +557336,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable";
-      license = lib.licensesSpdx."EUPL-1.2";
+      license = lib.meta.getLicenseFromSpdxId "EUPL-1.2";
     }
   ) { };
 
@@ -552813,7 +557409,7 @@ self: {
         text
       ];
       description = "A simple language for writing documents";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -552850,7 +557446,7 @@ self: {
         unordered-containers
       ];
       description = "A DSL for processing Prosidy documents";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -552964,7 +557560,7 @@ self: {
           ];
           libraryToolDepends = [ c2hs ];
           description = "Simple audio library for Windows, Linux, OSX";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -552999,7 +557595,7 @@ self: {
       libraryPkgconfigDepends = [ SDL2 ];
       libraryToolDepends = [ c2hs ];
       description = "Simple audio library for SDL";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -553086,7 +557682,7 @@ self: {
         prelate
       ];
       description = "Neovim Project Manager";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "proteome";
       broken = true;
@@ -553283,7 +557879,7 @@ self: {
       ];
       libraryToolDepends = [ proto-lens-protoc ];
       description = "proto-lens-etcd - protobuffer lenses for etcd provided by protoc-lens-protoc";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -553316,7 +557912,7 @@ self: {
         vector
       ];
       description = "JSON protobuf encoding for proto-lens";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -553644,7 +558240,7 @@ self: {
         vector
       ];
       description = "A higher-level API to the proto3-wire library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -553814,7 +558410,7 @@ self: {
         zigzag
       ];
       description = "Slow protobuf implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -554449,7 +559045,7 @@ self: {
         vinyl
       ];
       description = "Lightweight dependency injection / namespaced+typed implicit-ish arguments";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -554601,7 +559197,7 @@ self: {
         yaml
       ];
       description = "Prune unused Haskell dependencies";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "prune-juice";
       broken = true;
@@ -554875,7 +559471,7 @@ self: {
         vector
       ];
       description = "PostgreSQL client";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -555023,7 +559619,7 @@ self: {
         tasty-hunit
       ];
       description = "Integrate libpsx with the GHC RTS";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -555277,7 +559873,7 @@ self: {
         rerebase
       ];
       description = "Experimental abstractions for operations on pointers";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -555301,8 +559897,8 @@ self: {
     }:
     mkDerivation {
       pname = "ptr-peeker";
-      version = "0.2";
-      sha256 = "02wwg9b2kk4lcjncpfwgy7gl43nx4zkj13kk9nxbwi7vyx1m36z6";
+      version = "0.2.0.1";
+      sha256 = "0dpxx2vl40dxcyzfs94x1n3dvcmmiq01hy18raj8gv97iipa0jq2";
       libraryHaskellDepends = [
         base
         bytestring
@@ -555327,7 +559923,7 @@ self: {
         tasty-hunit
       ];
       description = "High-performance composable binary data deserializers";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -555371,7 +559967,7 @@ self: {
         rerebase
       ];
       description = "Pointer poking action construction and composition toolkit";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -555409,8 +560005,8 @@ self: {
     }:
     mkDerivation {
       pname = "pty-mcp-server";
-      version = "0.1.5.0";
-      sha256 = "0d4hgy279kbq40045r4xclyv1y2gmxmqm5m8va34a35qciv756nc";
+      version = "0.1.6.0";
+      sha256 = "1hzf973h21cdgbpn6sq8diqi415y1czvbkdvblhdv2k5sfk5l3cs";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -555432,7 +560028,7 @@ self: {
         safe-exceptions
       ];
       description = "pty-mcp-server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pty-mcp-server";
     }
@@ -556440,7 +561036,7 @@ self: {
         vector
       ];
       description = "High-performance composable noise generation (Perlin, Simplex, Cellular)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -556555,7 +561151,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Derive fromString/toString-like for pure sum types";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -556591,7 +561187,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Derive fromString/toString-like for pure sum types (aeson instances)";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -556772,11 +561368,43 @@ self: {
         time
       ];
       description = "types and parser for email messages (including MIME)";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
 
+  purekell = callPackage (
+    {
+      mkDerivation,
+      base,
+      hspec,
+      hspec-discover,
+      megaparsec,
+      QuickCheck,
+      text,
+    }:
+    mkDerivation {
+      pname = "purekell";
+      version = "0.1.0.0";
+      sha256 = "1an4yh387wz7k9vqnh77y1wmcaanwb3imp61v74d1xdz1raish8z";
+      libraryHaskellDepends = [
+        base
+        megaparsec
+        text
+      ];
+      testHaskellDepends = [
+        base
+        hspec
+        megaparsec
+        QuickCheck
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Bidirectional Haskell/PureScript expression translator";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+    }
+  ) { };
+
   purenix = callPackage (
     {
       mkDerivation,
@@ -556813,7 +561441,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Nix backend for PureScript. Transpile PureScript code to Nix.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "purenix";
     }
   ) { };
@@ -556858,7 +561486,7 @@ self: {
       ];
       doHaddock = false;
       description = "Pure Haskell SAT-solver";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -557185,7 +561813,7 @@ self: {
       ];
       doCheck = false;
       description = "PureScript Programming Language Compiler";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "purs";
     }
   ) { };
@@ -557229,7 +561857,7 @@ self: {
         vector
       ];
       description = "PureScript Programming Language Abstract Syntax Tree";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -557356,7 +561984,7 @@ self: {
       ];
       libraryToolDepends = [ happy ];
       description = "PureScript Programming Language Concrete Syntax Tree";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -557544,7 +562172,7 @@ self: {
         text
       ];
       description = "Support for purl (mostly universal package url)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -558573,7 +563201,7 @@ self: {
         vector-stream
       ];
       description = "Fast persistent vectors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -558873,7 +563501,7 @@ self: {
         test-framework-hunit
       ];
       description = "Serialization/deserialization using Python Pickle format";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pickle";
       broken = true;
@@ -558962,7 +563590,7 @@ self: {
         tasty-silver
       ];
       description = "Types and prettyprinter for the IL of the QBE compiler backend";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -559163,7 +563791,7 @@ self: {
       ];
       doHaddock = false;
       description = "Command line tool qhs, SQL queries on CSV and TSV files";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "qhs";
       broken = true;
@@ -559341,7 +563969,7 @@ self: {
         template-haskell
       ];
       description = "Typesafe library for linear algebra";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -559489,7 +564117,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "QuasiQuoter for byte sequence";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -559690,8 +564318,8 @@ self: {
     }:
     mkDerivation {
       pname = "qrcode-core";
-      version = "0.9.10";
-      sha256 = "117xsv0p2l6nwbl0a7qwip1cnix4x6gljl12w11pzrqmvrhgilx2";
+      version = "0.9.11";
+      sha256 = "18l9nv4x39gg3z1l2qhxl3f3yrrf8n56xj3c6jmpdwfxwa2fr1kd";
       libraryHaskellDepends = [
         base
         binary
@@ -559723,8 +564351,8 @@ self: {
     }:
     mkDerivation {
       pname = "qrcode-juicypixels";
-      version = "0.8.6";
-      sha256 = "0i17wcv570x4a9cg0cdkzz4g86jwgfx68sg62bbvw7zwyc00bpma";
+      version = "0.8.7";
+      sha256 = "1wvg9188fl2qm7pn7zswp63hkvhfins9236maisbyaqbbygprmp2";
       libraryHaskellDepends = [
         base
         base64-bytestring
@@ -560053,7 +564681,7 @@ self: {
       editedCabalFile = "0pqi04fvyclnx4lfq8ifax6l4kayay6xbmwp0k0h7yjz14k252gn";
       libraryHaskellDepends = [ base ];
       description = "Extremely minimal prelude";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -560153,7 +564781,7 @@ self: {
         text
       ];
       description = "GHC plugin to automatically insert qualified imports";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -560265,7 +564893,7 @@ self: {
         unordered-containers
       ];
       description = "Rage against the quantification";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -560294,7 +564922,7 @@ self: {
         vector
       ];
       description = "Rage against the quantification - integration with Aeson";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -560979,7 +565607,7 @@ self: {
         tasty-hunit
       ];
       description = "queue sheet utility";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "queue-sheet";
     }
   ) { };
@@ -561036,7 +565664,7 @@ self: {
         tasty-bench
       ];
       description = "Queue data structures";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -561059,10 +565687,8 @@ self: {
     }:
     mkDerivation {
       pname = "quibble-core";
-      version = "0.1.0.1";
-      sha256 = "108cqh3xzl73ijh7fg91cyw0lpn2svm13l8nn922ab9401jy9x8c";
-      revision = "1";
-      editedCabalFile = "0kfb3714jq791riywhh0nbixzjj7nkpl2y0w8c1cy5hhx2q1jigy";
+      version = "0.1.0.2";
+      sha256 = "00qkm5zp9v0nxj8hqy7yx83r6lpcnrn9vc6gcjshn1c8fx73h91w";
       libraryHaskellDepends = [
         base
         bytestring
@@ -561082,7 +565708,7 @@ self: {
         tasty-hunit
       ];
       description = "Convenient SQL query language for Haskell (but only for single tables)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -561108,11 +565734,11 @@ self: {
       hspec,
       hspec-discover,
       iproute,
-      memory,
       network,
       network-byte-order,
       network-control,
       QuickCheck,
+      ram,
       random,
       serialise,
       stm,
@@ -561121,8 +565747,8 @@ self: {
     }:
     mkDerivation {
       pname = "quic";
-      version = "0.2.23";
-      sha256 = "0kjbqxd0hpi91s9jpyp7s8kr9jqd7aqh8lxkwhq9l0cjfwqgisn0";
+      version = "0.3.0";
+      sha256 = "0rqa4wq1s3s2bs2zcl7bvmiqpsb2zabvlv46w5pbijsj6aamjrx5";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -561141,10 +565767,10 @@ self: {
         fast-logger
         filepath
         iproute
-        memory
         network
         network-byte-order
         network-control
+        ram
         random
         serialise
         stm
@@ -561219,7 +565845,7 @@ self: {
         text
       ];
       description = "Quick-start wrappers for QUIC";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -561390,7 +566016,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Run external processes verified at compilation/installation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -561679,7 +566305,7 @@ self: {
         vector
       ];
       description = "QuickCheck common typeclasses";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -561704,7 +566330,7 @@ self: {
         transformers
       ];
       description = "QuickCheck common typeclasses from `base`";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -561766,7 +566392,7 @@ self: {
         tasty-quickcheck
       ];
       description = "A library for stateful property-based testing";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -561810,7 +566436,7 @@ self: {
         splitmix
       ];
       description = "Extra utilities for QuickCheck";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -561848,7 +566474,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Testing group class instances with QuickCheck";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -561956,7 +566582,7 @@ self: {
         QuickCheck
       ];
       description = "Common quickcheck instances";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -562027,7 +566653,7 @@ self: {
         QuickCheck
       ];
       description = "Common quickcheck instances";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -562072,8 +566698,8 @@ self: {
     }:
     mkDerivation {
       pname = "quickcheck-lockstep";
-      version = "0.8.2";
-      sha256 = "0lbpijrychl5z1garzs52nv7rnl34ll0sgqcb5znccafgnah04gd";
+      version = "0.8.3";
+      sha256 = "0d32rj715mg1iikjrwjkd08cgr6q20h82bamh23p0ymlp9wp8jxs";
       libraryHaskellDepends = [
         base
         constraints
@@ -562098,7 +566724,7 @@ self: {
         temporary
       ];
       description = "Library for lockstep-style testing with 'quickcheck-dynamic'";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -562147,7 +566773,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Testing monoid subclass instances with QuickCheck";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -562285,7 +566911,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Quasi-unique identifiers for QuickCheck";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -562524,8 +567150,8 @@ self: {
     }:
     mkDerivation {
       pname = "quickcheck-state-machine";
-      version = "0.10.2";
-      sha256 = "01cs422p7jqqgnhhm2lcdsm2ilz0hcakhm16vcdfgmxbmp0af15c";
+      version = "0.10.3";
+      sha256 = "07a408jahjknfy587f2hcbyiv6vs03cl2jv8kv493kh3rfnpnz85";
       libraryHaskellDepends = [
         base
         base-compat
@@ -562595,7 +567221,7 @@ self: {
       ];
       doHaddock = false;
       description = "Test monadic programs using state machine based models";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -562744,7 +567370,7 @@ self: {
         transformers
       ];
       description = "A GenT monad transformer for QuickCheck library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -564086,7 +568712,7 @@ self: {
         th-compat
       ];
       description = "Monad transformer for Quote from template-haskell";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -564200,7 +568826,7 @@ self: {
         weigh
       ];
       description = "R-/R*-trees";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -564804,6 +569430,37 @@ self: {
     }
   ) { };
 
+  railroad = callPackage (
+    {
+      mkDerivation,
+      base,
+      effectful,
+      hspec,
+      mtl,
+      validation,
+    }:
+    mkDerivation {
+      pname = "railroad";
+      version = "0.1.1.1";
+      sha256 = "0jhjmzy8ym7136hfxbw49dkq7i4ixkckbvij3frnw0samh7acawk";
+      libraryHaskellDepends = [
+        base
+        effectful
+        mtl
+        validation
+      ];
+      testHaskellDepends = [
+        base
+        effectful
+        hspec
+        mtl
+        validation
+      ];
+      description = "A railway oriented mini-DSL for unified error handling";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   rails-session = callPackage (
     {
       mkDerivation,
@@ -565220,7 +569877,7 @@ self: {
         vector
       ];
       description = "Random access lists";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
@@ -565247,7 +569904,7 @@ self: {
         ral
       ];
       description = "Length-indexed random access lists: lens utilities";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
@@ -565274,7 +569931,7 @@ self: {
         ral
       ];
       description = "Length-indexed random access lists: optics utilities";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
@@ -565310,7 +569967,7 @@ self: {
         deepseq
       ];
       description = "Random access list with a list compatible interface";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -565337,6 +569994,37 @@ self: {
     }
   ) { };
 
+  ram = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      deepseq,
+      ghc-prim,
+      QuickCheck,
+      tasty,
+    }:
+    mkDerivation {
+      pname = "ram";
+      version = "0.21.1";
+      sha256 = "0gkr63maq8z15306l5qq8h0j1yaxrldn5ih8fncpppd1q37nwxj8";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        deepseq
+        ghc-prim
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        QuickCheck
+        tasty
+      ];
+      description = "memory and related abstraction stuff";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   raml = callPackage (
     {
       mkDerivation,
@@ -565382,7 +570070,7 @@ self: {
         hspec
       ];
       description = "Determine how intervals relate to each other";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -565771,7 +570459,6 @@ self: {
       ];
       description = "Class of random value generation";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -565818,7 +570505,7 @@ self: {
         vector
       ];
       description = "Uniform draws of partitions and cycle-partitions, with thinning";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -566463,7 +571150,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Memory efficient sets with ranges of elements";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -566615,7 +571302,7 @@ self: {
         random-shuffle
       ];
       description = "Efficient sets for semi-contiguous data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -566684,7 +571371,7 @@ self: {
         tasty-hunit
       ];
       description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -567387,8 +572074,8 @@ self: {
     }:
     mkDerivation {
       pname = "ratel";
-      version = "2.0.0.17";
-      sha256 = "1vr1a7r32xknsvkbbj6y5lalf9kyj5zrm8hc7jgnsavmyi8gswzb";
+      version = "2.0.0.18";
+      sha256 = "1rzvwij2z6pa1r88ipf1a7zsx5mz6blxq5apdykip5x63d2rrlcx";
       libraryHaskellDepends = [
         aeson
         base
@@ -567406,7 +572093,7 @@ self: {
         hspec
       ];
       description = "Notify Honeybadger about exceptions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -567435,7 +572122,7 @@ self: {
         wai
       ];
       description = "Notify Honeybadger about exceptions via a WAI middleware";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -567760,7 +572447,7 @@ self: {
         filepath
       ];
       description = "Parse and generate Rocket League replays";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "rattletrap";
       broken = true;
@@ -567962,6 +572649,8 @@ self: {
       pname = "rawlock";
       version = "0.1.2.0";
       sha256 = "0prw2sbhf78grggw90bc5wclycd86m6v7wpw1s5hqx9vv0y4ssfi";
+      revision = "1";
+      editedCabalFile = "0dh6yh6nhjlf4qk8nf25vj59xav8ndl0wnffjckhlykgmj80agi9";
       libraryHaskellDepends = [
         base
         io-classes
@@ -567977,7 +572666,7 @@ self: {
         tasty-quickcheck
       ];
       description = "A writer-biased RAW lock";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -568068,7 +572757,7 @@ self: {
         h-raylib
       ];
       description = "Haskell bindings for rlImGui";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -568110,7 +572799,7 @@ self: {
         random
       ];
       description = "Ray tracing library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -568530,8 +573219,8 @@ self: {
     }:
     mkDerivation {
       pname = "rdf4h";
-      version = "5.2.1";
-      sha256 = "1jah12gcmc85qpbhw6igi28rvmww38fqmj1waqw7c16y0lxnkvxb";
+      version = "5.2.2";
+      sha256 = "1ra2wj3h9xhwc8qabb0aha7v0nbsfwhj494zypb4gphymr0nc4jm";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -568610,7 +573299,7 @@ self: {
         text
       ];
       description = "The ActivityStreams 2 RDF vocabulary for rdf4h";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -568738,7 +573427,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Codecs for use with AWS rds-data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -568834,7 +573523,7 @@ self: {
         tasty-discover
       ];
       description = "Codecs for use with AWS rds-data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "rds-data-codecs";
       broken = true;
@@ -568967,7 +573656,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Codecs for use with AWS rds-data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "rds-data";
     }
@@ -569052,7 +573741,7 @@ self: {
         text
       ];
       description = "Create React components in Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -569911,7 +574600,7 @@ self: {
       sha256 = "0b2syhxan3fpf9h1zq3izpb8bgsl4qrk975afy3r2ji6dhjq81cl";
       libraryHaskellDepends = [ base ];
       description = "Class for reading bounded values";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -570266,7 +574955,7 @@ self: {
         mtl
       ];
       description = "Readline effect for in-other-words";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "echo-repl";
     }
@@ -570340,7 +575029,7 @@ self: {
         numhask
       ];
       description = "Literate programming support";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "readme-lhs-example";
       broken = true;
@@ -570466,7 +575155,7 @@ self: {
         QuickCheck
       ];
       description = "Random number generation based on physical media touched by humans";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "real-dice";
     }
   ) { };
@@ -570711,7 +575400,7 @@ self: {
         vector
       ];
       description = "SVG file loader and serializer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -570878,7 +575567,7 @@ self: {
         void
       ];
       description = "A more progressive alternative to the \"base\" package";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -570947,7 +575636,7 @@ self: {
         void
       ];
       description = "A more progressive alternative to the \"base\" package";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -571010,7 +575699,7 @@ self: {
         tasty-quickcheck
       ];
       description = "A variable binding library based on well-scoped de Bruijn indices";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -571053,7 +575742,7 @@ self: {
         template-haskell
       ];
       description = "Recursively defined values";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       maintainers = [ lib.maintainers.nomeata ];
     }
   ) { };
@@ -571153,7 +575842,7 @@ self: {
         vector
       ];
       description = "Recommendations using alternating least squares algorithm";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "movielens";
     }
   ) { };
@@ -571663,7 +576352,68 @@ self: {
         vector
       ];
       description = "Recover run-time type information from the GHC heap";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  recover-rtti_0_6_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      ghc-heap,
+      mtl,
+      primitive,
+      QuickCheck,
+      sop-core,
+      stm,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      text,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "recover-rtti";
+      version = "0.6.0";
+      sha256 = "0v8aml3aygyc6imaw2fhdmdz5c3cni7m7s1grsdjns21lryjmb70";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        ghc-heap
+        mtl
+        primitive
+        sop-core
+        stm
+        text
+        unordered-containers
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        mtl
+        primitive
+        QuickCheck
+        sop-core
+        stm
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        text
+        unordered-containers
+        vector
+      ];
+      description = "Recover run-time type information from the GHC heap";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -571746,8 +576496,8 @@ self: {
       pname = "recursion-schemes";
       version = "5.2.3";
       sha256 = "020fk7s4dzim3957h8447mi3jp95k25zrac86dcaavldxjy88kiv";
-      revision = "1";
-      editedCabalFile = "0la8md7lv8awhvsyw30mqbyfjvskvndcm9446wnh4bhjhi0813li";
+      revision = "2";
+      editedCabalFile = "0ppyrsm3vnn1lkfan11583rqn26vgzaihbsqa80s969fdf97zb6m";
       libraryHaskellDepends = [
         base
         comonad
@@ -571987,7 +576737,7 @@ self: {
       ];
       doHaddock = false;
       description = "Extensible records and variants indexed by a type-level Red-Black tree";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -572122,7 +576872,7 @@ self: {
         unliftio
       ];
       description = "hide secret text on the terminal";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "redact";
     }
   ) { };
@@ -572300,7 +577050,7 @@ self: {
         QuickCheck
       ];
       description = "Specify valid redis globs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -572803,7 +577553,7 @@ self: {
         yaml
       ];
       description = "Static analysis tool for Rust embedded systems complexity";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "reduxwise-exe";
     }
   ) { };
@@ -573142,7 +577892,7 @@ self: {
         linear-base
       ];
       description = "A reference counting library to alias linear resources";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -573277,7 +578027,7 @@ self: {
         QuickCheck
       ];
       description = "Refinement types with static and runtime checking";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.raehik ];
     }
   ) { };
@@ -573317,7 +578067,7 @@ self: {
         unordered-containers
       ];
       description = "Type-checked proof that a key exists in a container and can be safely indexed";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -573843,6 +578593,40 @@ self: {
     }
   ) { };
 
+  reflex-classhss = callPackage (
+    {
+      mkDerivation,
+      base,
+      ClasshSS,
+      containers,
+      data-default,
+      lens,
+      reflex-dom-core,
+      template-haskell,
+      text,
+    }:
+    mkDerivation {
+      pname = "reflex-classhss";
+      version = "0.1.0.0";
+      sha256 = "0wxnmggjrgxqry28lxch7l3a9g1m10fwdljqggdqw2784vf02wr3";
+      revision = "1";
+      editedCabalFile = "0y6ima3jars538xmyhnpsafja960f2q6gcnilfrn2qw8nvx8w8m8";
+      libraryHaskellDepends = [
+        base
+        ClasshSS
+        containers
+        data-default
+        lens
+        reflex-dom-core
+        template-haskell
+        text
+      ];
+      description = "ClasshSS defined element builders for Reflex";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   reflex-dom = callPackage (
     {
       mkDerivation,
@@ -574248,7 +579032,7 @@ self: {
         text
       ];
       description = "Compatible highlevel Wigdets for some Ionic Input Components";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -574299,7 +579083,7 @@ self: {
         time
       ];
       description = "Render Pandoc documents to HTML using reflex-dom";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -574416,7 +579200,7 @@ self: {
         tasty-hspec
       ];
       description = "reflex-dom-th transpiles HTML templates to haskell code for reflex-dom";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -574634,7 +579418,7 @@ self: {
         time
       ];
       description = "Interact with a GADT API in your reflex-dom application";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "readme";
     }
@@ -574710,7 +579494,7 @@ self: {
         temporary
       ];
       description = "A GHCi widget library for use in reflex applications";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "reflex-ghci";
       broken = true;
@@ -574939,7 +579723,7 @@ self: {
         reflex
       ];
       description = "Reflex bindings for libtelnet";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       platforms = lib.platforms.linux;
       hydraPlatforms = lib.platforms.none;
     }
@@ -575622,7 +580406,7 @@ self: {
         transformers
       ];
       description = "See README for more info";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -575851,7 +580635,7 @@ self: {
       ];
       doHaddock = false;
       description = "Register allocation by graph colorization";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -577024,7 +581808,7 @@ self: {
         text
       ];
       description = "Types that can only be constructed if they match a regular expression";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -577829,7 +582613,7 @@ self: {
         tasty-hunit
       ];
       description = "Simple linear and quadratic regression";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -578333,7 +583117,7 @@ self: {
         hspec-discover
       ];
       description = "A data structure representing Relations on Sets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -578710,7 +583494,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Automation of Haskell package release process";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "releaser";
     }
   ) { };
@@ -578979,7 +583763,7 @@ self: {
         transformers
       ];
       description = "Equiprobable draw from publicly verifiable random data";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -579036,7 +583820,7 @@ self: {
         unordered-containers
       ];
       description = "Safe, performant, user-friendly and lightweight Haskell Standard Library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -579615,7 +584399,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Reorder expressions in a syntax tree according to operator fixities";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -580252,7 +585036,7 @@ self: {
         pinned-warnings
       ];
       description = "Currated set of plugins for REPL based development";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -580370,7 +585154,7 @@ self: {
         text
       ];
       description = "Find, replace, split string patterns with Megaparsec parsers (instead of regex)";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -580932,7 +585716,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doCheck = false;
       description = "HTTP client library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -580982,7 +585766,7 @@ self: {
         weigh
       ];
       description = "Conduit helpers for the req HTTP client library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -581134,11 +585918,12 @@ self: {
       http-client,
       http-client-tls,
       http-types,
+      text,
     }:
     mkDerivation {
       pname = "request";
-      version = "0.3.1.0";
-      sha256 = "1w9l1imizdnksz2czpmf2l9plc9vkzk5ymvdhm79275acc2a5b9h";
+      version = "0.4.0.0";
+      sha256 = "1l3x0p4i3kmi065y19g5q8kbwi2pndipkaay9j7m8zprklgzixzg";
       libraryHaskellDepends = [
         base
         bytestring
@@ -581146,11 +585931,13 @@ self: {
         http-client
         http-client-tls
         http-types
+        text
       ];
       testHaskellDepends = [
         base
         bytestring
         hspec
+        text
       ];
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
@@ -581261,8 +586048,6 @@ self: {
       ];
       description = "Scrap your qualified import clutter";
       license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -581282,7 +586067,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Propagate HasCallStack with constraints";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -581349,7 +586134,7 @@ self: {
         parsec
       ];
       description = "Regular-expressions extended with fixpoints for context-free powers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -581361,7 +586146,7 @@ self: {
       sha256 = "047wlwvffmgg70d70dsv6160wq6hfxp4frb0414np270grq0vk3p";
       libraryHaskellDepends = [ rebase ];
       description = "Reexports from \"base\" with a bunch of other standard libraries";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -581374,7 +586159,7 @@ self: {
       libraryHaskellDepends = [ rebase ];
       doHaddock = false;
       description = "Reexports from \"base\" with a bunch of other standard libraries";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -581674,7 +586459,7 @@ self: {
         semigroupoids
       ];
       description = "High performance variable binders";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -581737,7 +586522,7 @@ self: {
         tasty-hunit
       ];
       description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
@@ -581883,7 +586668,7 @@ self: {
         stm
       ];
       description = "A region-based resource effect for the effectful ecosystem";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -581934,7 +586719,7 @@ self: {
         time
       ];
       description = "A high-performance striped resource pooling implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -581961,7 +586746,7 @@ self: {
         time
       ];
       description = "A high-performance striped resource pooling implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -582076,8 +586861,8 @@ self: {
     }:
     mkDerivation {
       pname = "resource-registry";
-      version = "0.2.0.0";
-      sha256 = "1akvv9ydkg55q7vhnm6va2mb2cmyh29f38bkw0m3cv0wxhf3hm1d";
+      version = "0.2.1.0";
+      sha256 = "0ky6jlpgq10f08ydgg9pzm5mxmq8r6dzxfmq2v69azk2vlnwymyl";
       libraryHaskellDepends = [
         base
         bimap
@@ -582099,7 +586884,7 @@ self: {
         tree-diff
       ];
       description = "Track allocated resources";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -582188,7 +586973,7 @@ self: {
         resourcet
       ];
       description = "Adaptation of the resourcet library for the effectful ecosystem";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -582215,7 +587000,7 @@ self: {
         unliftio-core
       ];
       description = "ResourceT extras";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -582274,7 +587059,7 @@ self: {
         utf8-string
       ];
       description = "A fast, non-backtracking parser for the redis RESP3 protocol";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -583242,7 +588027,7 @@ self: {
         unix
       ];
       description = "A tool that returns to a landmark parent directory";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "ret";
     }
   ) { };
@@ -583731,7 +588516,7 @@ self: {
         tasty-hunit
       ];
       description = "Adaptation of the retry library for the effectful ecosystem";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -583769,7 +588554,7 @@ self: {
       sha256 = "110hbw4b8gbkgszc7d77rw9qpiwsz4lvsfbsb4cpw9fwzrcpvwnh";
       libraryHaskellDepends = [ base ];
       description = "A library to provide special kind of big numbers writing";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -583891,7 +588676,7 @@ self: {
         deepseq
       ];
       description = "reversed lists/snoc lists";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -584768,7 +589553,7 @@ self: {
         vector-sized
       ];
       description = "Functional Reactive Programming with type-level clocks";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
@@ -584858,7 +589643,7 @@ self: {
         vector-sized
       ];
       description = "Functional Reactive Programming with type-level clocks";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.turion ];
     }
@@ -585464,7 +590249,7 @@ self: {
         warp
       ];
       description = "Static site generator based on Shake";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -585528,7 +590313,7 @@ self: {
         warp
       ];
       description = "Static site generator based on Shake";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -585618,7 +590403,7 @@ self: {
         tasty
       ];
       description = "Neovim plugin framework for Polysemy";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -585677,7 +590462,7 @@ self: {
         tasty
       ];
       description = "CLI for Ribosome";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ribosome";
     }
@@ -585760,7 +590545,7 @@ self: {
         tasty
       ];
       description = "Neovim plugin host for Polysemy";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -585794,7 +590579,7 @@ self: {
         ribosome-host
       ];
       description = "Test tools for Ribosome";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -585963,7 +590748,7 @@ self: {
         tasty
       ];
       description = "Test tools for Ribosome";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -585985,8 +590770,8 @@ self: {
     }:
     mkDerivation {
       pname = "richenv";
-      version = "0.1.0.3";
-      sha256 = "0v6ymwypp6023srv9axh0rc98bsvkhk29nwhap9rb33x8ibb8vr9";
+      version = "0.1.0.4";
+      sha256 = "111am7dh5l3gmsakjlkjdi4wcs409xh1wbk6v8gygaq37kbjcjjc";
       libraryHaskellDepends = [
         aeson
         base
@@ -586007,7 +590792,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Rich environment variable setup for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -586377,7 +591162,7 @@ self: {
         QuickCheck
       ];
       description = "mutable ring buffers with atomic updates in GHC Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -586704,7 +591489,7 @@ self: {
         unliftio-messagebox
       ];
       description = "A library for process pools coupled with asynchronous message queues";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "rio-process-pool-memleak-test";
     }
@@ -586880,6 +591665,7 @@ self: {
       description = "RISC-V";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -587010,7 +591796,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A DSL for Risk-oriented Object Detection Requirements";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -587483,7 +592269,7 @@ self: {
         vector
       ];
       description = "Reed-Muller Expansion normal form for Boolean Formulas";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -587512,7 +592298,7 @@ self: {
         what4
       ];
       description = "What4 adapter for the RME solver";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -587827,7 +592613,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Calculate per instrument profit from Robin-Hood activity report";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "rhprofit";
       broken = true;
@@ -588092,17 +592878,20 @@ self: {
         vector-sized
       ];
       description = "Implementation of the ROC (Taiwan) National ID standard";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
-  roc-id_0_3_0_0 = callPackage (
+  roc-id_0_4_0_0 = callPackage (
     {
       mkDerivation,
       base,
       cabal-doctest,
       doctest,
+      finitary,
+      finite-typelits,
       hspec,
+      microlens,
       MonadRandom,
       nonempty-containers,
       QuickCheck,
@@ -588111,14 +592900,16 @@ self: {
     }:
     mkDerivation {
       pname = "roc-id";
-      version = "0.3.0.0";
-      sha256 = "1c570kr3yv9b8j4ly76dxiwx8xs6cg1230dscazmwbjr8vv13046";
+      version = "0.4.0.0";
+      sha256 = "1qwhlx2rnx4ws6g3zvkvq8briblxkdqk9ir7qyg6yrwbz9dqf8v3";
       setupHaskellDepends = [
         base
         cabal-doctest
       ];
       libraryHaskellDepends = [
         base
+        finitary
+        finite-typelits
         MonadRandom
         nonempty-containers
         text
@@ -588126,7 +592917,9 @@ self: {
       testHaskellDepends = [
         base
         doctest
+        finitary
         hspec
+        microlens
         MonadRandom
         nonempty-containers
         QuickCheck
@@ -588134,7 +592927,7 @@ self: {
         text
       ];
       description = "Implementation of the ROC (Taiwan) Uniform ID Number format";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -588965,19 +593758,19 @@ self: {
       criterion,
       deepseq,
       hashable,
-      integer-gmp,
       mtl,
       scientific,
       template-haskell,
       text,
       time,
+      unliftio,
       unordered-containers,
       vector,
     }:
     mkDerivation {
       pname = "ron";
-      version = "0.12";
-      sha256 = "0hmnvlla8zm8jhn56qbaqs248dq4b4sf48kz7dcggz150i624aa9";
+      version = "0.13";
+      sha256 = "1bxaas1fnqbhgah4ggb7lr939kmn95hznrrkjjzdhm5bq3wb7rvl";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -588986,12 +593779,12 @@ self: {
         bytestring
         containers
         hashable
-        integer-gmp
         mtl
         scientific
         template-haskell
         text
         time
+        unliftio
         unordered-containers
         vector
       ];
@@ -588999,10 +593792,9 @@ self: {
         base
         criterion
         deepseq
-        integer-gmp
       ];
       description = "RON";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -589080,36 +593872,50 @@ self: {
     {
       mkDerivation,
       base,
+      bytestring,
       containers,
       Diff,
+      directory,
+      filelock,
+      filepath,
+      generic-lens,
       hashable,
-      integer-gmp,
+      lens,
       mtl,
+      network-info,
       ron,
+      stm,
       text,
+      tf-random,
       time,
-      transformers,
       unordered-containers,
     }:
     mkDerivation {
       pname = "ron-rdt";
-      version = "0.10";
-      sha256 = "1dsplv4g0nflkns1yyx6lqf83qnc5y1bycgfydwa9hn1kliqf73c";
+      version = "0.12";
+      sha256 = "1mr78j0mj1v4q1j6ib2xw5fdl5azpgary31kvxipnaii1y9y2qaa";
       libraryHaskellDepends = [
         base
+        bytestring
         containers
         Diff
+        directory
+        filelock
+        filepath
+        generic-lens
         hashable
-        integer-gmp
+        lens
         mtl
+        network-info
         ron
+        stm
         text
+        tf-random
         time
-        transformers
         unordered-containers
       ];
       description = "Replicated Data Types (RON-RDT)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -589149,7 +593955,7 @@ self: {
         transformers
       ];
       description = "RON-Schema";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -589195,7 +594001,7 @@ self: {
         transformers
       ];
       description = "RON Storage";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -589467,7 +594273,7 @@ self: {
         quickcheck-classes
       ];
       description = "rose trees";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -590076,7 +594882,7 @@ self: {
         vector
       ];
       description = "Directed rounding for built-in floating types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -590356,7 +595162,6 @@ self: {
       doHaddock = false;
       description = "Row types";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -591137,7 +595942,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Let your mind know that your hands need a rest!";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -591218,8 +596023,10 @@ self: {
     }:
     mkDerivation {
       pname = "rss-conduit";
-      version = "0.6.0.1";
-      sha256 = "07fmf5d93ywgqz4fp0aw5n1vzqlphrhcmiqrc0xpcphi17ig9m7l";
+      version = "0.6.0.2";
+      sha256 = "0vc5k2224zj054wjvbw9sv2043f7nmgk990xfz01xhilbpacgyhj";
+      revision = "1";
+      editedCabalFile = "08lgg60s1zqyxdiqy41r1acw6gs4cxl4lj8w54ayi8hdcpg2r0cv";
       libraryHaskellDepends = [
         atom-conduit
         base
@@ -591268,7 +596075,7 @@ self: {
         xml-types
       ];
       description = "Streaming parser/renderer for the RSS standard";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -591359,7 +596166,7 @@ self: {
         ghc-prim
       ];
       description = "stream-fusion framework from vector";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -591373,7 +596180,7 @@ self: {
       sha256 = "18kpashzq6wnf1yc2xvz7l6c53v45yimzsahaavdf60pvw4zfhrx";
       libraryHaskellDepends = [ base ];
       description = "A more fine-grained version of state threads (ST)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -591988,7 +596795,46 @@ self: {
         primitive-unlifted
       ];
       description = "runST without boxing penalty";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  runGhcBWrap-core = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      data-default,
+      filepath,
+      IStr,
+      parsec,
+      random,
+      scrappy-core,
+      split,
+      text,
+    }:
+    mkDerivation {
+      pname = "runGhcBWrap-core";
+      version = "0.1.0.0";
+      sha256 = "1jlsyh25hjilynksqmzqy3hyhb5ypx9ig6iwybaj13ymwnhvgd97";
+      revision = "1";
+      editedCabalFile = "1v3mxiidcksbj2fqf29nylmdpvmhf2dhs8pc82vk0dfban5r9543";
+      libraryHaskellDepends = [
+        aeson
+        base
+        data-default
+        filepath
+        IStr
+        parsec
+        random
+        scrappy-core
+        split
+        text
+      ];
+      description = "Build haskell executables";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -592086,7 +596932,7 @@ self: {
         process
       ];
       description = "Stack wrapper for single-file Haskell programs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "runhs";
       broken = true;
@@ -592201,7 +597047,7 @@ self: {
         type-reflection
       ];
       description = "Look up class instances at runtime";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -592266,7 +597112,7 @@ self: {
         transformers
       ];
       description = "TLS bindings for Rustls";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -593098,7 +597944,6 @@ self: {
       ];
       description = "Library for safe functions (deprecated)";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -593184,7 +598029,7 @@ self: {
         QuickCheck
       ];
       description = "Recursive Arbitrary instances without headaches";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -593587,7 +598432,7 @@ self: {
         doctest
       ];
       description = "Safe arithmetic operations";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -593707,7 +598552,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Use RecordWildCards safely";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -594561,7 +599406,7 @@ self: {
         HUnit
       ];
       description = "Semantic version numbers and constraints";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -594861,7 +599706,7 @@ self: {
         storable-record
       ];
       description = "Handling of samples in an (audio) signal";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -594883,7 +599728,7 @@ self: {
         sample-frame
       ];
       description = "Orphan instances for types from sample-frame and numericprelude";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -594943,7 +599788,7 @@ self: {
         tasty-quickcheck
       ];
       description = "A stable adaptive mergesort implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -596224,7 +601069,7 @@ self: {
       ];
       testToolDepends = [ alex ];
       description = "A staged lexer generator";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -596330,7 +601175,7 @@ self: {
         containers
       ];
       description = "A high-level wrapper over minisat";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -596381,7 +601226,7 @@ self: {
         base
       ];
       description = "SAT encoding monad";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     }
   ) { };
 
@@ -596557,7 +601402,7 @@ self: {
       ];
       doHaddock = false;
       description = "Handle POSIX cron schedules";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -596595,7 +601440,7 @@ self: {
         hspec-core
       ];
       description = "Handle POSIX cron schedules";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -596698,7 +601543,7 @@ self: {
         time
       ];
       description = "The eye that watches everything you did on Twitter";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "sauron";
     }
@@ -596886,7 +601731,7 @@ self: {
         text
       ];
       description = "Construction of context-adjusted pretty output";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -597174,11 +602019,11 @@ self: {
         time
       ];
       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) z3; };
 
-  sbv_13_5 = callPackage (
+  sbv_13_6 = callPackage (
     {
       mkDerivation,
       array,
@@ -597218,8 +602063,8 @@ self: {
     }:
     mkDerivation {
       pname = "sbv";
-      version = "13.5";
-      sha256 = "0gikry5cwjgl8xrvrdqv6cvzxspn4lyfciyqk2j7h511j9snyiqf";
+      version = "13.6";
+      sha256 = "14znf1fl5ab5m1i3109qgzv8lmz17ir77bpc9cvw4s4qymq7i4k9";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         array
@@ -597279,7 +602124,7 @@ self: {
         time
       ];
       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) z3; };
@@ -597311,6 +602156,7 @@ self: {
       description = "Component-based program synthesis using SBV";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -597352,8 +602198,9 @@ self: {
         tasty-golden
       ];
       description = "Formally prove properties of Haskell programs using SBV/SMT";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -597626,8 +602473,8 @@ self: {
     }:
     mkDerivation {
       pname = "scale";
-      version = "1.0.1.0";
-      sha256 = "19cnzd316qbzxdjgia35l1yay1qpc6x10sgpfbv58yr4z65s01rx";
+      version = "1.1.0.0";
+      sha256 = "1s74g7bf95vw8a7ihpacfxvcy7dhi3bmvfrhmcar8hayhi56g0fr";
       libraryHaskellDepends = [
         base
         bitvec
@@ -597995,7 +602842,7 @@ self: {
         unliftio-core
       ];
       description = "Metadata types for Albedo Scanners";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -598388,7 +603235,7 @@ self: {
         transformers
       ];
       description = "Pure deterministic scheduled computations";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
     }
   ) { };
 
@@ -598549,6 +603396,7 @@ self: {
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "scheduler";
+      broken = true;
     }
   ) { };
 
@@ -599234,7 +604082,7 @@ self: {
         x509-store
       ];
       description = "Haskell query for SciDB via shim";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hquery";
       broken = true;
@@ -599392,7 +604240,7 @@ self: {
         scientific
       ];
       description = "Scientific notation intended for tokenization";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -599772,7 +604620,7 @@ self: {
         unliftio
       ];
       description = "CPS resource allocation but as a Monad and completely safe";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -600417,7 +605265,7 @@ self: {
         wai
       ];
       description = "A Better way of modeling web resources";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -600890,6 +605738,139 @@ self: {
     }
   ) { };
 
+  scrappy-core = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      lens,
+      modern-uri,
+      network-uri,
+      parsec,
+      parser-combinators,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "scrappy-core";
+      version = "0.1.0.1";
+      sha256 = "0gw3lgywjdl9kmmc76bb1xsvp0v5chfz1ny619cya3fl7dbp6mvq";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        lens
+        modern-uri
+        network-uri
+        parsec
+        parser-combinators
+        text
+        transformers
+      ];
+      description = "html pattern matching library and high-level interface concurrent requests lib for webscraping";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  scrappy-requests = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      directory,
+      exceptions,
+      http-client,
+      http-client-tls,
+      http-types,
+      lens,
+      modern-uri,
+      mtl,
+      network-uri,
+      parsec,
+      parser-combinators,
+      scrappy-core,
+      text,
+      time,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "scrappy-requests";
+      version = "0.1.0.0";
+      sha256 = "0rhbjd2s9hhs1kv11f84wm7qsw40a0imrmnf33qas3yrbwlf26dl";
+      revision = "1";
+      editedCabalFile = "0xmwhqi68gddlvh9gj2gbqr7967av6mzkmycwgj3y138icsvv6wx";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        directory
+        exceptions
+        http-client
+        http-client-tls
+        http-types
+        lens
+        modern-uri
+        mtl
+        network-uri
+        parsec
+        parser-combinators
+        scrappy-core
+        text
+        time
+        transformers
+      ];
+      description = "html pattern matching library and high-level interface concurrent requests lib for webscraping";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  scrappy-template = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      lens,
+      modern-uri,
+      network-uri,
+      parsec,
+      parser-combinators,
+      scrappy-core,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "scrappy-template";
+      version = "0.1.0.0";
+      sha256 = "1plckvg1a6jxbwi3y7840cf8a37vjbvhg9ivzzfmpayc3agha2fw";
+      revision = "1";
+      editedCabalFile = "1gv9i9n4f6asv5hn1qwrzhmbjhbdy6anbyijl1cn4v0pqi7jc0hd";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        lens
+        modern-uri
+        network-uri
+        parsec
+        parser-combinators
+        scrappy-core
+        text
+        transformers
+      ];
+      description = "html pattern matching library and high-level interface concurrent requests lib for webscraping";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   screenshot-to-clipboard = callPackage (
     {
       mkDerivation,
@@ -600928,13 +605909,62 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Take screenshot and copy it to the system clipboard";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "screenshot-to-clipboard";
       broken = true;
     }
   ) { };
 
+  screp = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      directory,
+      filepath,
+      optparse-applicative,
+      parsec,
+      process,
+      scrappy-core,
+    }:
+    mkDerivation {
+      pname = "screp";
+      version = "0.3.0.0";
+      sha256 = "1libcjl6q26gzhalrprvv0ng8cp6g4z9nq0zqmhdyawmkw68ly3i";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        containers
+        directory
+        filepath
+        parsec
+        process
+        scrappy-core
+      ];
+      executableHaskellDepends = [
+        base
+        containers
+        directory
+        filepath
+        optparse-applicative
+        parsec
+        scrappy-core
+      ];
+      testHaskellDepends = [
+        base
+        directory
+        filepath
+        parsec
+        process
+        scrappy-core
+      ];
+      description = "grep-like CLI using Parsec parsers instead of regex";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   script-monad = callPackage (
     {
       mkDerivation,
@@ -601003,6 +606033,47 @@ self: {
     }
   ) { };
 
+  scripths = callPackage (
+    {
+      mkDerivation,
+      base,
+      filepath,
+      process,
+      tasty,
+      tasty-hunit,
+      temporary,
+      text,
+    }:
+    mkDerivation {
+      pname = "scripths";
+      version = "0.2.0.2";
+      sha256 = "1jy61b2w27x3k2jcfwns6f9jnj8x3cfvbgvm3xzca3s5w05wfxjp";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        filepath
+        process
+        temporary
+        text
+      ];
+      executableHaskellDepends = [
+        base
+        filepath
+        text
+      ];
+      testHaskellDepends = [
+        base
+        tasty
+        tasty-hunit
+        text
+      ];
+      description = "GHCi scripts for standalone execution and Markdown documentation";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      mainProgram = "scripths";
+    }
+  ) { };
+
   scrobble = callPackage (
     {
       mkDerivation,
@@ -601054,6 +606125,65 @@ self: {
     }
   ) { };
 
+  scrod = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      Cabal-syntax,
+      containers,
+      exceptions,
+      ghc,
+      ghc-boot-th,
+      haddock-library,
+      parsec,
+      tasty,
+      tasty-bench,
+      tasty-hunit,
+      template-haskell,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "scrod";
+      version = "1.1.0.0";
+      sha256 = "1m6hs8znd6sgqjzh7jf0kgj6ac5cz5myiqz45zj3fkwbhghv763c";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        Cabal-syntax
+        containers
+        exceptions
+        ghc
+        ghc-boot-th
+        haddock-library
+        parsec
+        template-haskell
+        text
+        transformers
+      ];
+      executableHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        tasty
+        tasty-hunit
+        transformers
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        tasty-bench
+      ];
+      description = "Worse Haskell documentation";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "scrod";
+      broken = true;
+    }
+  ) { };
+
   scroll = callPackage (
     {
       mkDerivation,
@@ -601921,7 +607051,7 @@ self: {
       executableSystemDepends = [ SDL2_mixer ];
       executablePkgconfigDepends = [ SDL2_mixer ];
       description = "Haskell bindings to SDL2_mixer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -602980,6 +608110,8 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Bindings for secp256k1";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { inherit (pkgs) secp256k1; };
 
@@ -603396,7 +608528,7 @@ self: {
         text-display
       ];
       description = "Cryptography for the casual user";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -603570,7 +608702,7 @@ self: {
         simple-prompt
       ];
       description = "Select a subset of RPM packages";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -603819,7 +608951,7 @@ self: {
       sha256 = "17vfwyjr3pxzjf35lhqqxid5bds52vk0gdqmnq4hvbjin3l07l98";
       libraryHaskellDepends = [ base ];
       description = "Framework and service for analyzing and diffing untrusted code";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -603864,7 +608996,7 @@ self: {
         text
       ];
       description = "Types and functionality for working with source code";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -603916,7 +609048,7 @@ self: {
         unix
       ];
       description = "Cross-platform abstraction for system semaphores";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -604237,7 +609369,7 @@ self: {
         semigroupoids
       ];
       description = "Support for QualifiedDo with semigroupoids classes";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -604350,7 +609482,7 @@ self: {
         quickcheck-instances
       ];
       description = "Semilattices";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -604894,7 +610026,7 @@ self: {
         wreq
       ];
       description = "A tool to send command execution results to Sensu";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "sensu-run";
       broken = true;
@@ -605558,7 +610690,7 @@ self: {
         transformers
       ];
       description = "Sequences and measured sequences";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -605815,7 +610947,7 @@ self: {
         QuickCheck
       ];
       description = "Grammar-based compression algorithms SEQUITUR";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -605904,7 +611036,7 @@ self: {
         tasty-quickcheck
       ];
       description = "`binary` backend for `serdoc`";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -605941,7 +611073,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Generated documentation of serialization formats";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -606187,7 +611319,7 @@ self: {
         uuid-types
       ];
       description = "Encode and decode UUID values in CBOR using uuid-types, cborg and serialise";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -606555,7 +611687,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A family of combinators for defining webservices APIs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -606632,7 +611764,7 @@ self: {
         text
       ];
       description = "Servant endpoints compatible with Rails's ActiveResource";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -606713,7 +611845,7 @@ self: {
         webdriver
       ];
       description = "Generates a TypeScript client for Servant APIs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tests";
     }
@@ -606819,7 +611951,7 @@ self: {
         unordered-containers
       ];
       description = "Authentication combinators for servant";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -606882,7 +612014,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "servant-client/servant-auth compatibility";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -607024,7 +612156,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "servant-docs/servant-auth compatibility";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -607238,7 +612370,7 @@ self: {
         markdown-unlit
       ];
       description = "servant-server/servant-auth compatibility";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -607284,7 +612416,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "servant-swagger/servant-auth compatibility";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -608080,7 +613212,7 @@ self: {
         markdown-unlit
       ];
       description = "Automatic derivation of querying functions for servant";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -608150,7 +613282,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Core functionality and class for client function generation for servant APIs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -608199,7 +613331,7 @@ self: {
         transformers-base
       ];
       description = "A servant client for frontend JavaScript";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -608377,7 +613509,7 @@ self: {
         warp
       ];
       description = "Servant Stream support for conduit";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -608633,7 +613765,7 @@ self: {
         transformers
       ];
       description = "generate API docs for your servant webservice";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "greet-docs";
     }
   ) { };
@@ -608674,7 +613806,7 @@ self: {
         servant
       ];
       description = "Generate endpoints overview for Servant API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -608913,7 +614045,7 @@ self: {
       ];
       testToolDepends = [ markdown-unlit ];
       description = "Servant Errors wai-middlware";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -608922,28 +614054,45 @@ self: {
   servant-event-stream = callPackage (
     {
       mkDerivation,
+      aeson,
+      attoparsec,
       base,
       bytestring,
+      hspec,
       http-media,
       lens,
+      QuickCheck,
+      servant,
+      servant-client-core,
       servant-foreign,
       servant-server,
       text,
     }:
     mkDerivation {
       pname = "servant-event-stream";
-      version = "0.3.1.0";
-      sha256 = "1hpwm093ry1kclyxj4fgr03zcg85c7v9d9drcaxrmrsnihra6ii3";
+      version = "0.4.0.1";
+      sha256 = "05xxvyi1jpa7c5xx17b93mzn98zln8qppg40mbzd0k79m2pd7r4w";
       libraryHaskellDepends = [
+        aeson
+        attoparsec
         base
         bytestring
         http-media
         lens
+        servant
+        servant-client-core
         servant-foreign
         servant-server
         text
       ];
-      testHaskellDepends = [ base ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        hspec
+        QuickCheck
+        servant
+      ];
       description = "Servant support for Server-Sent events";
       license = lib.licenses.bsd3;
     }
@@ -609148,7 +614297,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Helpers for generating clients for servant APIs in any programming language";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -609396,7 +614545,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "HATEOAS extension for servant";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -609549,7 +614698,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Servant authentication with HMAC";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -609692,7 +614841,7 @@ self: {
         markdown-unlit
       ];
       description = "Automatic derivation of querying functions for servant";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -609910,7 +615059,7 @@ self: {
         text
       ];
       description = "JSON-RPC messages and endpoints";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -609935,7 +615084,7 @@ self: {
         servant-jsonrpc
       ];
       description = "Generate JSON-RPC servant clients";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -609962,7 +615111,7 @@ self: {
         servant-server
       ];
       description = "JSON-RPC servant servers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -610076,7 +615225,7 @@ self: {
         text
       ];
       description = "Lint Servant Routes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -610160,7 +615309,7 @@ self: {
         warp
       ];
       description = "Servant Stream support for machines";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -610948,7 +616097,7 @@ self: {
         warp
       ];
       description = "Servant Stream support for pipes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -611015,7 +616164,7 @@ self: {
         warp
       ];
       description = "Utilities for using servant in a polysemy stack";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -611140,7 +616289,7 @@ self: {
         warp
       ];
       description = "Helpers for using prometheus with servant";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -611369,7 +616518,7 @@ self: {
         servant-queryparam-core
       ];
       description = "Client support for servant-queryparam-core";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -611390,7 +616539,7 @@ self: {
         servant
       ];
       description = "Use records for query parameters in servant APIs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -611415,7 +616564,7 @@ self: {
         servant-queryparam-core
       ];
       description = "Instances of classes from openapi3 for servant-queryparam-core";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -611440,7 +616589,7 @@ self: {
         text
       ];
       description = "Server support for servant-queryparam-core";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -611529,7 +616678,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "QuickCheck entire APIs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -611923,7 +617072,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Generate route descriptions from Servant APIs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -611971,7 +617120,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Golden test your Servant APIs using `servant-routes`";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -612317,7 +617466,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A family of combinators for defining webservices APIs and serving them";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "greet";
     }
   ) { };
@@ -613069,7 +618218,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -613934,7 +619083,7 @@ self: {
         xmlbf-xeno
       ];
       description = "Servant support for the XML Content-Type";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -613963,7 +619112,7 @@ self: {
         xml-types
       ];
       description = "Servant XML content-type with support for xml-conduit";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -615038,7 +620187,7 @@ self: {
         utility-ht
       ];
       description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -616171,7 +621320,7 @@ self: {
         vector
       ];
       description = "Validation SHA Implementations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -616204,7 +621353,7 @@ self: {
         primitive
       ];
       description = "SHA-1 Hash";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -616718,7 +621867,7 @@ self: {
         text
       ];
       description = "Build rules for historical benchmarking";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -617606,6 +622755,7 @@ self: {
       file-embed,
       ghc-prim,
       hspec,
+      hspec-discover,
       HUnit,
       parsec,
       process,
@@ -617620,8 +622770,8 @@ self: {
     }:
     mkDerivation {
       pname = "shakespeare";
-      version = "2.1.0.1";
-      sha256 = "0byj0zhxi1pr8l5f18phzkwcf7z38lyk2zznz8hbkqadfgrmbdkc";
+      version = "2.1.7.1";
+      sha256 = "06fix8z3kjgl50k5srbixi100jx5rf050xbh9f564n4s5q2irbys";
       libraryHaskellDepends = [
         aeson
         base
@@ -617663,6 +622813,7 @@ self: {
         time
         transformers
       ];
+      testToolDepends = [ hspec-discover ];
       description = "A toolkit for making compile-time interpolated templates";
       license = lib.licenses.mit;
       maintainers = [ lib.maintainers.psibi ];
@@ -617906,7 +623057,7 @@ self: {
         vector
       ];
       description = "“Shuffle and merge overlapping chunks” lossless compression";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -617963,7 +623114,7 @@ self: {
         QuickCheck
       ];
       description = "Shannon-fano compression algorithm in Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "shannon-fano";
     }
   ) { };
@@ -618414,7 +623565,7 @@ self: {
         template-haskell
       ];
       description = "Transform a shell script into a series of scripts with only shebang lines";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "shebanger";
     }
   ) { };
@@ -618757,7 +623908,7 @@ self: {
         text
       ];
       description = "A tool for generating shell.nix files";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "nix-shellify";
       maintainers = [ lib.maintainers.danielrolls ];
     }
@@ -618901,7 +624052,7 @@ self: {
         Glob
       ];
       description = "Out of the shell solution for scripting in Haskell";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       mainProgram = "readme";
     }
   ) { };
@@ -619044,7 +624195,7 @@ self: {
         utf8-string
       ];
       description = "Easy, repeatable testing of CLI programs/commands";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "shelltest";
     }
@@ -619338,6 +624489,208 @@ self: {
     }
   ) { };
 
+  shibuya-core = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      effectful,
+      effectful-core,
+      generic-lens,
+      hs-opentelemetry-api,
+      hs-opentelemetry-propagator-w3c,
+      hspec,
+      lens,
+      memory,
+      nqe,
+      QuickCheck,
+      stm,
+      streamly,
+      streamly-core,
+      text,
+      time,
+      unliftio,
+      unordered-containers,
+      uuid,
+      vector,
+    }:
+    mkDerivation {
+      pname = "shibuya-core";
+      version = "0.1.0.0";
+      sha256 = "0nrp8fisd8mh7h92mjgz1nz62aq508pg8kg09sik4gza9730ivh4";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        effectful
+        effectful-core
+        generic-lens
+        hs-opentelemetry-api
+        hs-opentelemetry-propagator-w3c
+        lens
+        nqe
+        stm
+        streamly
+        streamly-core
+        text
+        time
+        unliftio
+        unordered-containers
+        uuid
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        effectful
+        hs-opentelemetry-api
+        hspec
+        memory
+        nqe
+        QuickCheck
+        stm
+        streamly
+        streamly-core
+        text
+        time
+        unliftio
+      ];
+      description = "Supervised queue processing framework for Haskell";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
+  shibuya-metrics = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      containers,
+      http-types,
+      prometheus-client,
+      shibuya-core,
+      stm,
+      text,
+      time,
+      unliftio,
+      wai,
+      wai-websockets,
+      warp,
+      websockets,
+    }:
+    mkDerivation {
+      pname = "shibuya-metrics";
+      version = "0.1.0.0";
+      sha256 = "0nic5mfs0908l37sh50hdyfzjck4ifnj8mjb1yd2aaqa9xx3zl6f";
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        containers
+        http-types
+        prometheus-client
+        shibuya-core
+        stm
+        text
+        time
+        unliftio
+        wai
+        wai-websockets
+        warp
+        websockets
+      ];
+      description = "Metrics web server for Shibuya queue processing framework";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  shibuya-pgmq-adapter = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      effectful-core,
+      ephemeral-pg,
+      hasql,
+      hasql-pool,
+      hspec,
+      pgmq-core,
+      pgmq-effectful,
+      pgmq-hasql,
+      pgmq-migration,
+      QuickCheck,
+      quickcheck-instances,
+      random,
+      shibuya-core,
+      stm,
+      streamly,
+      streamly-core,
+      text,
+      time,
+      vector,
+    }:
+    mkDerivation {
+      pname = "shibuya-pgmq-adapter";
+      version = "0.1.0.0";
+      sha256 = "1n8hd1cm3sjx04za2zvqaj14hpp2f1w07r85mf5pn3y4s75d06ry";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        effectful-core
+        pgmq-core
+        pgmq-effectful
+        pgmq-hasql
+        shibuya-core
+        stm
+        streamly
+        streamly-core
+        text
+        time
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        effectful-core
+        ephemeral-pg
+        hasql
+        hasql-pool
+        hspec
+        pgmq-core
+        pgmq-effectful
+        pgmq-hasql
+        pgmq-migration
+        QuickCheck
+        quickcheck-instances
+        random
+        shibuya-core
+        stm
+        streamly
+        streamly-core
+        text
+        time
+        vector
+      ];
+      description = "PGMQ adapter for the Shibuya queue processing framework";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   shift = callPackage (
     {
       mkDerivation,
@@ -619502,7 +624855,7 @@ self: {
       isLibrary = false;
       isExecutable = true;
       description = "Examples for the shine package";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -619814,7 +625167,7 @@ self: {
         tasty-bench
       ];
       description = "Additional ShortByteString API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -619865,7 +625218,7 @@ self: {
         doctest
       ];
       description = "Link shortcuts for use in text markup";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -620315,7 +625668,7 @@ self: {
         vector
       ];
       description = "Generate swift types from haskell types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -620383,7 +625736,7 @@ self: {
         tasty-quickcheck
       ];
       description = "timers using SI units (seconds)";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -621093,7 +626446,7 @@ self: {
         transformers
       ];
       description = "Standard Webhooks";
-      license = lib.licensesSpdx."0BSD";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
     }
   ) { };
 
@@ -621139,7 +626492,7 @@ self: {
         text
       ];
       description = "Calculate expressions involving significant figures";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "significant-figures-cli";
       broken = true;
@@ -621280,7 +626633,7 @@ self: {
         prettyprinter
       ];
       description = "Prettyprinting transformers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -621371,7 +626724,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A Haskell interface to simdutf";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -621436,7 +626789,7 @@ self: {
         text
       ];
       description = "A library to fetch and parse financial data from the SimFin(+) API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -621833,7 +627186,7 @@ self: {
     }
   ) { };
 
-  simple-cabal_0_2_0 = callPackage (
+  simple-cabal_0_2_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -621841,19 +627194,17 @@ self: {
       Cabal,
       directory,
       filepath,
-      safe,
     }:
     mkDerivation {
       pname = "simple-cabal";
-      version = "0.2.0";
-      sha256 = "1mrsa53sacjji56xj3wkp2yd0skblrxnqzq7myy60a7nk6brb30g";
+      version = "0.2.1";
+      sha256 = "1avakk5blfz6cz0hmhqzzkc79rz3i3f66lqnmzj6msjjpms1xfxc";
       libraryHaskellDepends = [
         base
         bytestring
         Cabal
         directory
         filepath
-        safe
       ];
       description = "Cabal compatibility wrapper library";
       license = lib.licenses.bsd3;
@@ -623446,7 +628797,7 @@ self: {
         text
       ];
       description = "A parser for SQL";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -624043,8 +629394,8 @@ self: {
     }:
     mkDerivation {
       pname = "simplest-sqlite";
-      version = "0.1.0.4";
-      sha256 = "012azwr8grq38ic1dsdxp4482zsc7y37376n1f10nv9ls598bgyh";
+      version = "0.1.0.9";
+      sha256 = "1kf619q0j24i0s9zzh148fk3h0avjngs73k5y08ml983bpb1wg9f";
       libraryHaskellDepends = [
         base
         bytestring
@@ -624436,7 +629787,7 @@ self: {
         hspec
       ];
       description = "Simple pool";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -624587,7 +629938,7 @@ self: {
             xext
           ];
           description = "A programming language for simple GUIs";
-          license = lib.licensesSpdx."BSD-3-Clause";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           mainProgram = "sindre";
           broken = true;
@@ -624629,7 +629980,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "a class for single tuple implementations";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -624663,7 +630014,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Like singletons, but much smaller";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -624692,7 +630043,7 @@ self: {
         some
       ];
       description = "Type level booleans";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -624880,7 +630231,7 @@ self: {
       ];
       testToolDepends = [ singletons-base-code-generator ];
       description = "A promoted and singled version of the base library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -624906,7 +630257,7 @@ self: {
         filepath
       ];
       description = "Code generator for the singletons-base test suite";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "singletons-base-code-generator";
       broken = true;
@@ -624932,7 +630283,7 @@ self: {
         singletons-base
       ];
       description = "An optional type with type level default";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -624965,7 +630316,7 @@ self: {
         transformers
       ];
       description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -625234,7 +630585,7 @@ self: {
         vector
       ];
       description = "Encode and decode CSV files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -625580,8 +630931,8 @@ self: {
       pname = "size-based";
       version = "0.1.3.3";
       sha256 = "1xc31iy57v9hm97hhr26ws2wwsf56gczwnq7q8ckiy5pgw6fmr1g";
-      revision = "1";
-      editedCabalFile = "0idqj2k42anjwaq0zi6x7iz9jbwy6z3q1zjiml44v2ak21dswxga";
+      revision = "2";
+      editedCabalFile = "09nvp9wvdhipixgynjcvlhcfc9fxg3g6m9l4yl859m6psmlnwzmi";
       libraryHaskellDepends = [
         base
         dictionary-sharing
@@ -625654,7 +631005,7 @@ self: {
         vector
       ];
       description = "Sized sequence data-types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -625813,7 +631164,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Create a Sized version of any container";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -625848,7 +631199,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "aeson instances for 'Sized'";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -625869,7 +631220,7 @@ self: {
         sized-wrapper
       ];
       description = "QuickCheck instance for 'Sized'";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -625892,7 +631243,7 @@ self: {
         text
       ];
       description = "'Sized' wrappers for text";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -626133,20 +631484,20 @@ self: {
         unliftio
       ];
       description = "Batteries-included, opinionated test framework";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "skeletest-preprocessor";
     }
   ) { };
 
-  skeletest_0_3_2 = callPackage (
+  skeletest_0_3_7 = callPackage (
     {
       mkDerivation,
       aeson,
       aeson-pretty,
       ansi-terminal,
       base,
-      colour,
       containers,
+      data-default,
       Diff,
       directory,
       exceptions,
@@ -626167,8 +631518,8 @@ self: {
     }:
     mkDerivation {
       pname = "skeletest";
-      version = "0.3.2";
-      sha256 = "10iviwgza1h5nymzr0yc1yd68qffz47rvbg44ym494qr32c4368p";
+      version = "0.3.7";
+      sha256 = "0jnwn3x0gmjavik130941d7qng8q4i20rjnhsminfirgp166bw6x";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -626176,7 +631527,6 @@ self: {
         aeson-pretty
         ansi-terminal
         base
-        colour
         containers
         Diff
         directory
@@ -626205,6 +631555,7 @@ self: {
         aeson
         base
         containers
+        data-default
         directory
         filepath
         process
@@ -626212,7 +631563,7 @@ self: {
         unliftio
       ];
       description = "Batteries-included, opinionated test framework";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "skeletest-preprocessor";
     }
@@ -626441,7 +631792,7 @@ self: {
         vector
       ];
       description = "Random access lists: skew binary";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -626479,6 +631830,8 @@ self: {
       ];
       description = "A very quick-and-dirty WebSocket server";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -626833,8 +632186,8 @@ self: {
     }:
     mkDerivation {
       pname = "skylighting-format-blaze-html";
-      version = "0.1.1.3";
-      sha256 = "1rjjfcnq1395zmgxv123yy3khia7swrhcr77h8lg4h5jxgm2rs24";
+      version = "0.1.2";
+      sha256 = "13jcjpdsi29cw2kwghiczh0l3k49da03crlwjfrrq0zxmkkc07mi";
       libraryHaskellDepends = [
         base
         blaze-html
@@ -627151,7 +632504,7 @@ self: {
         text
       ];
       description = "A programmable markup language to generate HTML";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       mainProgram = "slab";
     }
   ) { };
@@ -627507,7 +632860,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Bindings for the Slack web API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -627902,7 +633255,7 @@ self: {
         text
       ];
       description = "SLIP-0032: Extended serialization format for BIP-32 wallets";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -627937,7 +633290,7 @@ self: {
         hspec-hedgehog
       ];
       description = "Sized list";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -627969,7 +633322,7 @@ self: {
         hspec-hedgehog
       ];
       description = "Sized list";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -628224,7 +633577,7 @@ self: {
         text-icu
       ];
       description = "Clean URI slugs for Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "slugger";
     }
   ) { };
@@ -628310,7 +633663,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Handle molecular sequences";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       mainProgram = "slynx";
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -628364,7 +633717,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Handle molecular sequences";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "slynx";
       maintainers = [ lib.maintainers.dschrempf ];
@@ -628389,7 +633742,7 @@ self: {
       ];
       doHaddock = false;
       description = "Serialize to bytes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -628517,7 +633870,7 @@ self: {
         gauge
       ];
       description = "See README for more info";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -629317,7 +634670,7 @@ self: {
       ];
       doHaddock = false;
       description = "String manipulation tool written in haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "smh";
       broken = true;
@@ -629374,7 +634727,7 @@ self: {
         primitive
       ];
       description = "Parse arrays of tokens";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -629584,7 +634937,6 @@ self: {
       ];
       description = "Interface to Satisfiability Modulo Theories solvers";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -629670,8 +635022,8 @@ self: {
       pname = "smtlib-backends";
       version = "0.4";
       sha256 = "16n2ig71wjqp1ziplwrq3639fqn582ymx5g9ls7f814ddjgc70xg";
-      revision = "2";
-      editedCabalFile = "0w883nmycnfb3y7vhpiak7fz8aasa7hvg6wxy6w3g0whr35zwqm6";
+      revision = "3";
+      editedCabalFile = "0mjv04pcni5xaxn0g2bw80jcqiav7i6mi2akd0nbanz9xjab5nbl";
       libraryHaskellDepends = [
         base
         bytestring
@@ -629698,8 +635050,8 @@ self: {
       pname = "smtlib-backends-process";
       version = "0.3";
       sha256 = "0jc7fmf3x53w8v0a8cj8v8r2f4gpn1jhndl80hyqzsblvrw5hcfg";
-      revision = "5";
-      editedCabalFile = "01rz1vbnh3r50lzvlz6qk9vlfxhz013nnbzyr846yy7kxgl2mp8w";
+      revision = "6";
+      editedCabalFile = "0c2rv2205fsgd6sxzc5bvrvkrl2glnp4lwn7s5wyw8g0zp90slcg";
       libraryHaskellDepends = [
         base
         bytestring
@@ -629734,8 +635086,8 @@ self: {
       pname = "smtlib-backends-tests";
       version = "0.3";
       sha256 = "0lj4bpl4nkw6w2hfjzz16zmrbaj5g3myvbmzlsc5rdsz0xwisfb8";
-      revision = "5";
-      editedCabalFile = "1frvbpr40dyp2rj2b1hj34f7lfjdb8a3kvbl447gzrqaqapvlya1";
+      revision = "6";
+      editedCabalFile = "0bnpbl50a9l766byn9cf658wzsh3sdhmghz96f9qxzm97wdr85jc";
       libraryHaskellDepends = [
         base
         smtlib-backends
@@ -629766,8 +635118,8 @@ self: {
           pname = "smtlib-backends-z3";
           version = "0.3.1";
           sha256 = "1mgjlfhqcbqc84a87g6bp0i9pnmpz87b7w43x200mwx1k877zddy";
-          revision = "3";
-          editedCabalFile = "1h31rj7r524wpd4wljgbyjrkk3fpi1l73n6dxbnf0psh3k8hak10";
+          revision = "4";
+          editedCabalFile = "1j41d4hrxlxhadl1z74r6a4ifvcsm174wkmz2b50ivxsgikxcvbd";
           libraryHaskellDepends = [
             base
             bytestring
@@ -630015,6 +635367,51 @@ self: {
     }
   ) { };
 
+  smtp-mail_0_5_0_1 = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      base16-bytestring,
+      base64-bytestring,
+      bytestring,
+      crypton,
+      crypton-connection,
+      data-default-class,
+      filepath,
+      mime-mail,
+      network,
+      network-bsd,
+      ram,
+      text,
+    }:
+    mkDerivation {
+      pname = "smtp-mail";
+      version = "0.5.0.1";
+      sha256 = "1xcs3k3p5p4qgr77icizk154fysf63c2cj04l4k2dz2bnzz1f9ih";
+      libraryHaskellDepends = [
+        array
+        base
+        base16-bytestring
+        base64-bytestring
+        bytestring
+        crypton
+        crypton-connection
+        data-default-class
+        filepath
+        mime-mail
+        network
+        network-bsd
+        ram
+        text
+      ];
+      description = "Simple email sending via SMTP";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.mpscholten ];
+    }
+  ) { };
+
   smtp-mail-ng = callPackage (
     {
       mkDerivation,
@@ -630266,7 +635663,7 @@ self: {
         typed-process
       ];
       description = "GHC Source Plugin that helps to minimise imports and generate explicit exports";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -630302,7 +635699,7 @@ self: {
         text
       ];
       description = "Strict ByteString Parser Combinator";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -630541,7 +635938,7 @@ self: {
         xmlhtml
       ];
       description = "Top-level package for the Snap Web Framework";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -630809,7 +636206,7 @@ self: {
         zlib
       ];
       description = "Snap: A Haskell Web Framework (core interfaces and types)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -633405,7 +638802,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Fast Haskell bindings to Google’s Snappy compression library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { inherit (pkgs) snappy; };
 
@@ -633431,8 +638828,8 @@ self: {
     }:
     mkDerivation {
       pname = "snappy-c";
-      version = "0.1.2";
-      sha256 = "0y23af1c7gyi1ypf0wvw618iph4w1rfxsa1dq6z9f0l4kx52qps9";
+      version = "0.1.3";
+      sha256 = "1c58n69mar37vyx38g32kn08gk314mdch40vrzhd2rglxnf0m2bc";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -633467,7 +638864,7 @@ self: {
         zlib
       ];
       description = "Bindings to Google's Snappy: A fast compression library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "snappy-cli";
     }
   ) { inherit (pkgs) snappy; };
@@ -633527,18 +638924,16 @@ self: {
       mkDerivation,
       base,
       bytestring,
-      vector,
     }:
     mkDerivation {
       pname = "snappy-hs";
-      version = "0.1.0.4";
-      sha256 = "0wxqyv955gvd1m1v9cmial2qxdrqm3gm69pl59jaiwmhq74bc56r";
+      version = "0.1.0.5";
+      sha256 = "0pclgy7jj7p569sdsa0qhvgpqp2k2x8qdbrybgwgg6adv7axgihx";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
         bytestring
-        vector
       ];
       executableHaskellDepends = [
         base
@@ -633546,7 +638941,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Snappy compression library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "snappy-hs";
     }
   ) { };
@@ -633773,7 +639168,7 @@ self: {
         yesod-form
       ];
       description = "Import to snelstart";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "snelstart-import";
       broken = true;
@@ -633909,7 +639304,7 @@ self: {
         vector
       ];
       description = "SNMP protocol library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -634616,7 +640011,7 @@ self: {
         unix
       ];
       description = "Unix domain sockets";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -634846,7 +640241,7 @@ self: {
       ];
       doHaddock = false;
       description = "High-level network sockets";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -634911,7 +640306,7 @@ self: {
       ];
       doHaddock = false;
       description = "Support for the Sockets and Pipes book";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -635066,7 +640461,7 @@ self: {
         tls
       ];
       description = "A SOCKS5 (RFC 1928) implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -635123,6 +640518,89 @@ self: {
     }
   ) { };
 
+  sofetch = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      containers,
+      exceptions,
+      hashable,
+      hspec,
+      semigroupoids,
+      text,
+      time,
+      transformers,
+      unliftio-core,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "sofetch";
+      version = "0.1.0.4";
+      sha256 = "0f45daxn3nv6c9dx4pbdv3380fksnc7vkvblz33cxnh29nk70a68";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        async
+        base
+        containers
+        exceptions
+        hashable
+        semigroupoids
+        text
+        time
+        transformers
+        unliftio-core
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        async
+        base
+        containers
+        exceptions
+        hashable
+        hspec
+        semigroupoids
+        text
+        time
+        transformers
+        unliftio-core
+        unordered-containers
+      ];
+      description = "A low-boilerplate Haxl-like data fetching library";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  sofetch-otel = callPackage (
+    {
+      mkDerivation,
+      base,
+      hs-opentelemetry-api,
+      hspec,
+      sofetch,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "sofetch-otel";
+      version = "0.1.0.0";
+      sha256 = "106l60kimi69z9pc09kz2fprdnf4sw1pc92d5zzg0n80gxpfh901";
+      libraryHaskellDepends = [
+        base
+        hs-opentelemetry-api
+        sofetch
+      ];
+      testHaskellDepends = [
+        base
+        hs-opentelemetry-api
+        hspec
+        sofetch
+        unordered-containers
+      ];
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   softfloat-hs = callPackage (
     {
       mkDerivation,
@@ -635510,7 +640988,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Self-Organising Maps";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -635526,8 +641004,8 @@ self: {
       pname = "some";
       version = "1.0.6";
       sha256 = "1fdzhi2rmcigb1c727dyzfak8rgb77bzfr33k1cp987lbnnhd9pp";
-      revision = "2";
-      editedCabalFile = "1w4xi6k44bjyrvhq70550fwrvqfybrq747aws708q18zsbriandc";
+      revision = "3";
+      editedCabalFile = "1lrdpbpf3nk8bqcf21crya3hqfjxjj3rmxrgfibr2qdhpkfpzk1r";
       libraryHaskellDepends = [
         base
         deepseq
@@ -635655,7 +641133,7 @@ self: {
         tasty-hunit
       ];
       description = "Check satisfiability of expressions on natural numbers";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -635973,7 +641451,7 @@ self: {
         type-errors-pretty
       ];
       description = "Haskell EDSL for Souffle";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -636036,7 +641514,7 @@ self: {
         vector
       ];
       description = "Souffle Datalog bindings for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -636075,7 +641553,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Apply sound changes to words";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -636128,7 +641606,7 @@ self: {
         utility-ht
       ];
       description = "Approximate a song from other pieces of sound";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "sound-collage";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -636420,7 +641898,7 @@ self: {
         utility-ht
       ];
       description = "Play, write, read, convert audio signals using Sox";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -636652,7 +642130,7 @@ self: {
         tasty-hunit
       ];
       description = "Gopher server library and daemon";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       mainProgram = "spacecookie";
       maintainers = [ lib.maintainers.sternenseemann ];
     }
@@ -636933,7 +642411,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A simple programming and debugging environment";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "spade";
@@ -637246,7 +642724,7 @@ self: {
         containers
       ];
       description = "A sparse set-based parsing library for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -637505,7 +642983,7 @@ self: {
         vector
       ];
       description = "Sparse set data structure";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "sparse-set";
     }
   ) { };
@@ -637595,7 +643073,7 @@ self: {
         hspec
       ];
       description = "Sparse vector data structures";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "sparse-vector";
     }
   ) { };
@@ -637701,7 +643179,7 @@ self: {
         X11
       ];
       description = "A unix-style (read from stdin, write to stdout) global hotkey daemon";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "spartacon";
     }
@@ -637862,7 +643340,7 @@ self: {
         tasty-quickcheck
       ];
       description = "SPDX license expression language, Extras";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -637898,7 +643376,7 @@ self: {
         text
       ];
       description = "SPDX license templates";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -638151,7 +643629,7 @@ self: {
         tasty-hedgehog
       ];
       description = "Embedded specification language & model checker in Haskell";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -638310,7 +643788,7 @@ self: {
         text
       ];
       description = "Manage the application of templates to custom yaml";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
       mainProgram = "specup";
       maintainers = [ lib.maintainers.danielrolls ];
     }
@@ -638788,7 +644266,7 @@ self: {
         doctest
       ];
       description = "Spiros Boosalis's Custom Prelude";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -638802,7 +644280,7 @@ self: {
       sha256 = "0sr39lxh4jrzinins8i0lv0y715sc11grp2yq47sa1jpzvaf246v";
       libraryHaskellDepends = [ base ];
       description = "SPIR-V enumerations generated from Khronos JSON";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -638827,7 +644305,7 @@ self: {
         text
       ];
       description = "Types and generator for SPIR-V JSON spec";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -638993,7 +644471,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "Parallel implementation of the Sorokina/Zeilfelder spline scheme";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       mainProgram = "spline3";
     }
   ) { };
@@ -639063,7 +644541,7 @@ self: {
         stm
       ];
       description = "HLint as a GHC source plugin";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -639160,7 +644638,7 @@ self: {
         utility-ht
       ];
       description = "Split a big audio file into pieces at positions of silence";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "split-record";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -639207,7 +644685,7 @@ self: {
         template-haskell
       ];
       description = "Fast Splittable PRNG";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -639364,7 +644842,7 @@ self: {
       editedCabalFile = "0j9jsbn4f73fb1a5rp1qzw4jdh6n3mmlky16pvxw2gnz8kcficng";
       libraryHaskellDepends = [ base ];
       description = "Unified API for phantom typed newtypes and type aliases";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -639563,7 +645041,7 @@ self: {
       ];
       doHaddock = false;
       description = "Spotify Web API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "examples";
       broken = true;
@@ -639638,7 +645116,7 @@ self: {
         QuickCheck
       ];
       description = "Read and write spreadsheets from and to CSV files in a lazy way";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -640284,7 +645762,7 @@ self: {
         stm
       ];
       description = "High-level SQLite client";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -640368,7 +645846,7 @@ self: {
         tasty-hedgehog
       ];
       description = "Guided derivation for Hasql statements";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -640634,7 +646112,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Generate type-safe Haskell code from SQL via https://github.com/sqlc-dev/sqlc.";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "sqlc-hs";
     }
@@ -640815,7 +646293,7 @@ self: {
         deepseq
       ];
       description = "A primitive yet easy to use sqlite library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -640928,7 +646406,7 @@ self: {
         sqlite-simple
       ];
       description = "Interpolated SQLite queries via quasiquotation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -641182,7 +646660,7 @@ self: {
         with-utf8
       ];
       description = "Squeal PostgreSQL Library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "example";
     }
   ) { };
@@ -641214,7 +646692,7 @@ self: {
         text
       ];
       description = "LTree extension for Squeal";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -641236,8 +646714,8 @@ self: {
     }:
     mkDerivation {
       pname = "squeal-postgresql-qq";
-      version = "0.1.5.0";
-      sha256 = "05isiwqwcl22w0gzwsjxdfbnkhiyxqjqkz95qp67m5nhbnfa061s";
+      version = "0.1.5.1";
+      sha256 = "17p98fzmm7vpw5biv8hz8rnca7xh6vjrd031s8fjghbrz2hlsznd";
       libraryHaskellDepends = [
         aeson
         base
@@ -641266,7 +646744,7 @@ self: {
         uuid
       ];
       description = "QuasiQuoter transforming raw sql into Squeal expressions";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -641285,7 +646763,73 @@ self: {
         squeal-postgresql
       ];
       description = "UUID OSSP extension for Squeal";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  squealgen = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      directory,
+      falsify,
+      filepath,
+      generics-sop,
+      hspec,
+      hspec-expectations-lifted,
+      iproute,
+      mtl,
+      network-ip,
+      postgresql-binary,
+      process,
+      squeal-postgresql,
+      tasty,
+      tasty-hspec,
+      temporary,
+      text,
+      tmp-postgres,
+      unliftio,
+    }:
+    mkDerivation {
+      pname = "squealgen";
+      version = "0.2.0.0";
+      sha256 = "1svr1s08kjk99d6jcm7qlycb2v41mshhc8qisgyiilirhkzilkap";
+      isLibrary = false;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      executableHaskellDepends = [
+        base
+        process
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        containers
+        directory
+        falsify
+        filepath
+        generics-sop
+        hspec
+        hspec-expectations-lifted
+        iproute
+        mtl
+        network-ip
+        postgresql-binary
+        process
+        squeal-postgresql
+        tasty
+        tasty-hspec
+        temporary
+        text
+        tmp-postgres
+        unliftio
+      ];
+      description = "generate squeal types from an existing database";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "squealgen";
     }
   ) { };
 
@@ -641682,135 +647226,6 @@ self: {
   ) { };
 
   srtree = callPackage (
-    {
-      mkDerivation,
-      ad,
-      attoparsec,
-      attoparsec-expr,
-      base,
-      binary,
-      bytestring,
-      containers,
-      dlist,
-      exceptions,
-      filepath,
-      hashable,
-      HUnit,
-      ieee754,
-      lens,
-      list-shuffle,
-      massiv,
-      mtl,
-      nlopt,
-      optparse-applicative,
-      random,
-      scheduler,
-      split,
-      statistics,
-      transformers,
-      unliftio,
-      unliftio-core,
-      unordered-containers,
-      vector,
-      zlib,
-    }:
-    mkDerivation {
-      pname = "srtree";
-      version = "2.0.1.5";
-      sha256 = "0h856i6gsh01rpp08lkvdrigylhbf1h016xwkccmmyd20iz3023l";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        attoparsec
-        attoparsec-expr
-        base
-        binary
-        bytestring
-        containers
-        dlist
-        exceptions
-        filepath
-        hashable
-        ieee754
-        lens
-        list-shuffle
-        massiv
-        mtl
-        random
-        scheduler
-        split
-        statistics
-        transformers
-        unliftio
-        unliftio-core
-        unordered-containers
-        vector
-        zlib
-      ];
-      librarySystemDepends = [ nlopt ];
-      executableHaskellDepends = [
-        attoparsec
-        attoparsec-expr
-        base
-        binary
-        bytestring
-        containers
-        dlist
-        exceptions
-        filepath
-        hashable
-        ieee754
-        lens
-        list-shuffle
-        massiv
-        mtl
-        optparse-applicative
-        random
-        scheduler
-        split
-        statistics
-        transformers
-        unliftio
-        unliftio-core
-        unordered-containers
-        vector
-        zlib
-      ];
-      testHaskellDepends = [
-        ad
-        attoparsec
-        attoparsec-expr
-        base
-        binary
-        bytestring
-        containers
-        dlist
-        exceptions
-        filepath
-        hashable
-        HUnit
-        ieee754
-        lens
-        list-shuffle
-        massiv
-        mtl
-        random
-        scheduler
-        split
-        statistics
-        transformers
-        unliftio
-        unliftio-core
-        unordered-containers
-        vector
-        zlib
-      ];
-      description = "A general library to work with Symbolic Regression expression trees";
-      license = lib.licenses.bsd3;
-    }
-  ) { inherit (pkgs) nlopt; };
-
-  srtree_2_0_1_6 = callPackage (
     {
       mkDerivation,
       ad,
@@ -641936,7 +647351,6 @@ self: {
       ];
       description = "A general library to work with Symbolic Regression expression trees";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) nlopt; };
 
@@ -642494,7 +647908,7 @@ self: {
         primitive
       ];
       description = "shared heap regions between local mutable state threads";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -642535,7 +647949,7 @@ self: {
         pqueue
       ];
       description = "Purely functional stable heaps (fair priority queues)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -642583,7 +647997,7 @@ self: {
         ghc-prim
       ];
       description = "algorithms around stable marriage";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -642752,7 +648166,7 @@ self: {
         text
       ];
       description = "Mustache templates for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "stache";
     }
   ) { };
@@ -642833,8 +648247,8 @@ self: {
     }:
     mkDerivation {
       pname = "stack";
-      version = "3.9.1";
-      sha256 = "1k06kram1y4732pgkrndmgrvyvm43abdvmqkjjs8p8f6qk256na9";
+      version = "3.9.3";
+      sha256 = "1kwb2dlfv2dkvim0c4z0w0pmhmj6dgp22gy61xbmdiksjch93lq1";
       configureFlags = [
         "-fdisable-git-info"
         "-fhide-dependency-versions"
@@ -643063,7 +648477,7 @@ self: {
         $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
       '';
       description = "A program for developing Haskell projects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "stack";
       maintainers = [ lib.maintainers.cdepillabout ];
     }
@@ -643235,7 +648649,7 @@ self: {
         turtle
       ];
       description = "Console program used to fix Stack build errors automatically";
-      license = lib.licensesSpdx."AGPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stack-fix";
       broken = true;
@@ -643868,7 +649282,7 @@ self: {
         text
       ];
       description = "Convert stack projects to cabal.project + cabal.project.freeze";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stack2cabal";
       broken = true;
@@ -644626,7 +650040,7 @@ self: {
         text
       ];
       description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stackage-to-hackage";
       broken = true;
@@ -644887,7 +650301,7 @@ self: {
         utf8-string
       ];
       description = "Program to fold GHC prof files into flamegraph input";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stackcollapse-ghc";
       broken = true;
@@ -645123,7 +650537,7 @@ self: {
         th-lift
       ];
       description = "GHC.Generics style staged generics";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -645213,8 +650627,8 @@ self: {
     }:
     mkDerivation {
       pname = "stakhanov";
-      version = "0.0.1.0";
-      sha256 = "1v966nnavbm81xzh0i9ad3r0kz3isp1f3hddb9hwdpvmzykcv9xk";
+      version = "0.1.0.0";
+      sha256 = "1vgfxnpx7hxjqp67xp1m5mfny3dgwydiy4jfnzqbqhziyrfvz6xd";
       libraryHaskellDepends = [
         aeson
         base
@@ -645234,7 +650648,7 @@ self: {
         vector
       ];
       description = "A Haskell PGMQ client";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -645279,7 +650693,7 @@ self: {
         time
       ];
       description = "Retries for humans";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "readme";
     }
   ) { };
@@ -645379,7 +650793,7 @@ self: {
       ];
       doHaddock = false;
       description = "Haskell STatic ANalyser";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       mainProgram = "stan";
     }
   ) { };
@@ -646013,7 +651427,7 @@ self: {
         transformers
       ];
       description = "Type-safe and interoperable static values and closures";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -646504,7 +651918,7 @@ self: {
         vector
       ];
       description = "A library of statistical types, data, and functions";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -646713,7 +652127,7 @@ self: {
       sha256 = "1cg0db7malqm75rlxxcmp2w00pvlf1kki4fz5p7lc86qy7241vzb";
       libraryHaskellDepends = [ base ];
       description = "A discrete probability monad with statistics";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -646919,19 +652333,23 @@ self: {
       containers,
       dbus,
       dbus-hslogger,
+      directory,
       filepath,
       hslogger,
+      hspec,
       lens,
       optparse-applicative,
+      process,
       template-haskell,
       text,
       transformers,
+      unix,
       vector,
     }:
     mkDerivation {
       pname = "status-notifier-item";
-      version = "0.3.1.0";
-      sha256 = "1x3zqa2b9vl5mirfbh2bmyali47jpfcqsw4xxgbmsgz9jiffpda9";
+      version = "0.3.2.10";
+      sha256 = "0xyfb1ffq8bhjc20j05myb1ijdxim030ax17xryjf2nfrxfq19hd";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -646941,6 +652359,7 @@ self: {
         bytestring-to-vector
         containers
         dbus
+        directory
         filepath
         hslogger
         lens
@@ -646956,6 +652375,17 @@ self: {
         hslogger
         optparse-applicative
       ];
+      testHaskellDepends = [
+        base
+        containers
+        dbus
+        directory
+        filepath
+        hslogger
+        hspec
+        process
+        unix
+      ];
       description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
       license = lib.licenses.bsd3;
     }
@@ -647228,7 +652658,7 @@ self: {
       sha256 = "0ldn5yxpj99yhhp5x7zlxjmd9qgqyjg68avr19k7argwcf3nr9y9";
       doHaddock = false;
       description = "TBA";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -647274,7 +652704,7 @@ self: {
         template-haskell
       ];
       description = "Binding to Standard Template Library C++";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -647621,7 +653051,7 @@ self: {
         QuickCheck
       ];
       description = "Staircase functions or piecewise constant functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -647866,7 +653296,7 @@ self: {
         stm-queue
       ];
       description = "A simplistic actor model based on STM";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -647899,14 +653329,14 @@ self: {
     }:
     mkDerivation {
       pname = "stm-chans";
-      version = "3.0.0.9";
-      sha256 = "0p9jq5fq3g77kf2kq807zrwqpw0z9a6zhw57h21wk4yb6zshs1ks";
+      version = "3.0.0.11";
+      sha256 = "1wkmg69zzmpcmiqm3qyjwx8nkfk9l098kc901n0a0yiwgs2fz4xj";
       libraryHaskellDepends = [
         base
         stm
       ];
       description = "Additional types of channels for STM";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -648055,7 +653485,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Containers for STM";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -648211,7 +653641,7 @@ self: {
         rebase
       ];
       description = "STM-specialised Hash Array Mapped Trie";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -648236,7 +653666,7 @@ self: {
         stm
       ];
       description = "A library for constructing incremental computations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -648392,7 +653822,7 @@ self: {
         time
       ];
       description = "An implementation of a real-time concurrent queue";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -649023,7 +654453,7 @@ self: {
         utility-ht
       ];
       description = "Elegant definition of Storable instances for records";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -649072,7 +654502,7 @@ self: {
         utility-ht
       ];
       description = "Storable instance for pairs and triples";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -649125,7 +654555,7 @@ self: {
         utility-ht
       ];
       description = "Fast, packed, strict storable arrays with a list interface like ByteString";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -656093,7 +661523,7 @@ self: {
         tasty-hunit
       ];
       description = "Attoparsec integration for the streaming ecosystem";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -656187,7 +661617,7 @@ self: {
         vector
       ];
       description = "Measures and compares the performance of streaming libraries";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -656590,7 +662020,7 @@ self: {
         wai-extra
       ];
       description = "Client-side consumption of a ServerEvent";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -656819,7 +662249,7 @@ self: {
         zlib
       ];
       description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -656866,7 +662296,7 @@ self: {
         tasty-hunit
       ];
       description = "Stream packets via libpcap";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -657214,7 +662644,7 @@ self: {
         unordered-containers
       ];
       description = "Streaming, dataflow programming and declarative concurrency";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -657268,7 +662698,7 @@ self: {
         unordered-containers
       ];
       description = "Streaming data pipelines with declarative concurrency";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -657330,7 +662760,7 @@ self: {
       ];
       testSystemDepends = [ archive ];
       description = "Stream data from archives using the streamly library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.shlok ];
       broken = true;
@@ -657531,7 +662961,7 @@ self: {
         unix
       ];
       description = "Streaming, parsers, arrays, serialization and more";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -657568,7 +662998,7 @@ self: {
         transformers
       ];
       description = "Streaming, parsers, arrays, serialization and more";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -657622,7 +663052,7 @@ self: {
         vector
       ];
       description = "Examples for Streamly";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -657649,7 +663079,7 @@ self: {
         streamly-core
       ];
       description = "Streamly compatibility with filepath package";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -657687,7 +663117,7 @@ self: {
         temporary
       ];
       description = "File system event notification API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -657724,7 +663154,7 @@ self: {
         time
       ];
       description = "Folder watching as a Streamly stream";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -657792,7 +663222,7 @@ self: {
       ];
       testSystemDepends = [ lmdb ];
       description = "Stream data to or from LMDB databases using the streamly library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.shlok ];
       broken = true;
@@ -657836,7 +663266,7 @@ self: {
         streamly
       ];
       description = "Streamly combinators for LZ4 compression";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -657932,7 +663362,7 @@ self: {
         tasty-bench
       ];
       description = "Use OS processes as stream transformation functions";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -657977,7 +663407,7 @@ self: {
         tasty-bench
       ];
       description = "Use OS processes as stream transformation functions";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -658035,7 +663465,7 @@ self: {
         tasty-bench
       ];
       description = "Statistical measures for finite or infinite data streams";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -658071,7 +663501,7 @@ self: {
         text
       ];
       description = "Library for streamly and text interoperation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -658131,7 +663561,7 @@ self: {
       ];
       testSystemDepends = [ zip ];
       description = "Stream data from zip archives using the streamly library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -658435,8 +663865,8 @@ self: {
       pname = "strict-checked-vars";
       version = "0.2.1.0";
       sha256 = "12c4j4rlmxcdri2sgrb383nnvbjmvhxf8pp4mgmkfsipvwyv2clm";
-      revision = "1";
-      editedCabalFile = "0ghsx08krngbbh9i21lcgbh60i7d3yzma5h6i88nsz07x757xndw";
+      revision = "2";
+      editedCabalFile = "1b900zijda9r9k3n9zp0hibqkwi7wrhz4gzrc8al9c9a32xlpdrf";
       libraryHaskellDepends = [
         base
         io-classes
@@ -658451,7 +663881,9 @@ self: {
         tasty-quickcheck
       ];
       description = "Strict MVars and TVars with invariant checking for IO and IOSim";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -658542,7 +663974,7 @@ self: {
         vector
       ];
       description = "Strict containers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -658800,7 +664232,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Strict linked list";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -658819,7 +664251,7 @@ self: {
         deepseq
       ];
       description = "Strict variants of mutable data types from base";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -658853,7 +664285,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Strict MVars for IO and IOSim";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -658901,7 +664333,7 @@ self: {
         stm
       ];
       description = "Strict STM interface polymorphic over stm implementation";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -658929,7 +664361,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Strict tuples";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -658950,7 +664382,7 @@ self: {
         strict-tuple
       ];
       description = "Optics for the `strict-tuple` library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -658998,7 +664430,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Lightweight strict types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -660021,7 +665453,7 @@ self: {
         text
       ];
       description = "Types for the Stripe API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -660272,7 +665704,7 @@ self: {
         text
       ];
       description = "Listen for Stripe webhook events with Scotty";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -660342,7 +665774,7 @@ self: {
         text
       ];
       description = "Verification of Stripe webhook signatures";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -660414,7 +665846,7 @@ self: {
         wreq
       ];
       description = "Use the Stripe API via Wreq";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -660527,11 +665959,11 @@ self: {
         transformers
       ];
       description = "A client for the Strava V3 API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
-  strive_6_1_0_3 = callPackage (
+  strive_6_1_0_4 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -660548,8 +665980,8 @@ self: {
     }:
     mkDerivation {
       pname = "strive";
-      version = "6.1.0.3";
-      sha256 = "091irrvl8sab9chx9bpdvf4k782w07ya217ya0ngsf8p5h6s4nmc";
+      version = "6.1.0.4";
+      sha256 = "1flcys4jq8z5k2s451n87cflh9mv08mhni95zyryg1ld8di7vh5f";
       libraryHaskellDepends = [
         aeson
         base
@@ -660564,7 +665996,7 @@ self: {
         transformers
       ];
       description = "A client for the Strava V3 API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -660808,7 +666240,7 @@ self: {
         utf8-string
       ];
       description = "Inspect the padding and size of C data declarations and their fields";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "struct-inspector";
       broken = true;
@@ -660966,7 +666398,7 @@ self: {
         vector
       ];
       description = "Structure (hash) of your data types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -661539,7 +666971,7 @@ self: {
         text
       ];
       description = "Haskell code prettifier";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stylish-haskell";
     }
@@ -661638,7 +667070,7 @@ self: {
         text
       ];
       description = "Haskell code prettifier";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stylish-haskell";
     }
@@ -661737,7 +667169,7 @@ self: {
         text
       ];
       description = "Haskell code prettifier";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stylish-haskell";
     }
@@ -661836,7 +667268,7 @@ self: {
         text
       ];
       description = "Haskell code prettifier";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "stylish-haskell";
     }
   ) { };
@@ -662194,7 +667626,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Subcategories induced by class constraints";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -662483,7 +667915,7 @@ self: {
         websockets
       ];
       description = "Plexus protocol types and client for Substrate";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -662567,7 +667999,7 @@ self: {
         text
       ];
       description = "Algebraic CLI for Plexus - coalgebraic schema navigation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "synapse";
     }
@@ -662925,7 +668357,7 @@ self: {
       ];
       doHaddock = false;
       description = "Memory efficient JSON parser";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -662963,7 +668395,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Suffix arrays and friends";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -663376,17 +668808,20 @@ self: {
     }:
     mkDerivation {
       pname = "summer";
-      version = "0.3.7.2";
-      sha256 = "0dqjvq1h116x3pbmi27nlgwp6sq5w8d6clcvbw9nlb85cn6awr4y";
+      version = "0.4.0.0";
+      sha256 = "1labgqa0zvi17xxckcgv0bjk05prn9ys71km5wwb30nywgmz62wi";
       libraryHaskellDepends = [
         base
         generics-sop
         profunctors
         vector
       ];
-      testHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        generics-sop
+      ];
       description = "An implementation of extensible products and sums";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -663453,7 +668888,7 @@ self: {
         validation-selective
       ];
       description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -663498,7 +668933,7 @@ self: {
         relude
       ];
       description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "summon-tui";
     }
@@ -664216,7 +669651,7 @@ self: {
         text
       ];
       description = "Apache Pulsar client for Haskell";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -664369,7 +669804,7 @@ self: {
         hspec
       ];
       description = "Monitor groups of threads with non-hierarchical lifetimes";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -664429,7 +669864,7 @@ self: {
         supply-chain-core
       ];
       description = "Composable request-response pipelines";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -664450,7 +669885,7 @@ self: {
         hspec
       ];
       description = "Composable request-response pipelines";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -664493,7 +669928,7 @@ self: {
         transformers
       ];
       description = "Supply-chain interface for basic streaming";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -664823,7 +670258,7 @@ self: {
         happy
       ];
       description = "SystemVerilog to Verilog conversion";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "sv2v";
     }
   ) { };
@@ -664986,7 +670421,7 @@ self: {
         text
       ];
       description = "Svg Icons and more";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "svg-icons-exe";
     }
   ) { };
@@ -665165,7 +670600,7 @@ self: {
         text
       ];
       description = "Optimise SVGs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "svgone";
     }
@@ -665206,7 +670641,7 @@ self: {
         xml
       ];
       description = "A tool to prune unused symbols from icon SVG files";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "svgsym";
       broken = true;
@@ -665978,7 +671413,7 @@ self: {
       ];
       doHaddock = false;
       description = "2D resource gathering game with programmable robots";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -666184,7 +671619,7 @@ self: {
         time
       ];
       description = "A semantic web toolkit";
-      license = lib.licensesSpdx."LGPL-2.1-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-2.1-or-later";
       mainProgram = "Swish";
     }
   ) { };
@@ -666361,7 +671796,7 @@ self: {
         template-haskell
       ];
       description = "Swizzle functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -666390,7 +671825,7 @@ self: {
         template-haskell
       ];
       description = "Swizzle lens functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -666419,7 +671854,7 @@ self: {
         template-haskell
       ];
       description = "Swizzle modify functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -666442,7 +671877,7 @@ self: {
         template-haskell
       ];
       description = "Swizzle set functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -666561,7 +671996,7 @@ self: {
     }
   ) { };
 
-  syb_0_7_3 = callPackage (
+  syb_0_7_4 = callPackage (
     {
       mkDerivation,
       base,
@@ -666572,8 +672007,8 @@ self: {
     }:
     mkDerivation {
       pname = "syb";
-      version = "0.7.3";
-      sha256 = "139vmi0nvgcxga9qk0daks8cnfx1g9rgsb6xdgi1pz21d7a6hrk7";
+      version = "0.7.4";
+      sha256 = "0gysqpj6mjxcbq9r6zxmz7i8163pd2i3gl6vrz0718b77yccmjnx";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -666734,7 +672169,7 @@ self: {
     }
   ) { };
 
-  sydtest_0_23_0_1 = callPackage (
+  sydtest_0_23_0_2 = callPackage (
     {
       mkDerivation,
       async,
@@ -666766,8 +672201,8 @@ self: {
     }:
     mkDerivation {
       pname = "sydtest";
-      version = "0.23.0.1";
-      sha256 = "03vzlrzlqz9nx8phmhvasgfkpz5kphvmbyh7z7lp5am4sj0g9kvp";
+      version = "0.23.0.2";
+      sha256 = "1fzkywg9gs5mldf86a8d84i91qv4vsz5n1qg6q3vy1rh4a8if9gf";
       libraryHaskellDepends = [
         async
         autodocodec
@@ -667948,7 +673383,7 @@ self: {
         unordered-containers
       ];
       description = "Basic symantic combinators for Embedded Domain-Specific Languages (EDSL)";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -668013,7 +673448,7 @@ self: {
         transformers
       ];
       description = "Symantics combinators for generating documents";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -668532,7 +673967,7 @@ self: {
       ];
       doHaddock = false;
       description = "Parser combinators statically optimized and staged via typed meta-programming";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -668769,7 +674204,7 @@ self: {
         unix
       ];
       description = "Symlink functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -668812,8 +674247,8 @@ self: {
     }:
     mkDerivation {
       pname = "symbolic-regression";
-      version = "0.1.0.2";
-      sha256 = "0j1avmyajhqw38hgrlq53zhcifl73mzx7hshpmns5p5nlb6fiikl";
+      version = "0.2.0.1";
+      sha256 = "0l3lyj35dn05a19ib0pccrn4bwmkfqm9ch9qdndjj1hpjdfzyx91";
       libraryHaskellDepends = [
         attoparsec
         attoparsec-expr
@@ -668849,8 +674284,9 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Symbolic Regression in Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -668869,7 +674305,7 @@ self: {
         youProbablyWantSymbolizeWithAZ
       ];
       description = "You want Symbolize with a Z";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -668948,7 +674384,7 @@ self: {
         vector-hashtables
       ];
       description = "Efficient global Symbol table, with Garbage Collection";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -669271,11 +674707,96 @@ self: {
         random
       ];
       description = "Synapse is a machine learning library written in pure Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
+  synapse-cc = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      ansi-terminal,
+      async,
+      base,
+      base16-bytestring,
+      bytestring,
+      containers,
+      cryptohash-sha256,
+      directory,
+      filepath,
+      fsnotify,
+      hspec,
+      mtl,
+      optparse-applicative,
+      plexus-protocol,
+      plexus-synapse,
+      process,
+      QuickCheck,
+      stm,
+      text,
+      time,
+      transformers,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "synapse-cc";
+      version = "0.2.0";
+      sha256 = "11h1lwjqpmz9dy4dhp67xnbdcxx2ygp6454hqcrsm8fxqkkis4yz";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        aeson-pretty
+        ansi-terminal
+        async
+        base
+        base16-bytestring
+        bytestring
+        containers
+        cryptohash-sha256
+        directory
+        filepath
+        fsnotify
+        mtl
+        optparse-applicative
+        plexus-protocol
+        plexus-synapse
+        process
+        stm
+        text
+        time
+        transformers
+        unordered-containers
+      ];
+      executableHaskellDepends = [
+        base
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        hspec
+        optparse-applicative
+        plexus-protocol
+        process
+        QuickCheck
+        stm
+        text
+      ];
+      description = "Unified compiler toolchain for Plexus backends";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "synapse-cc";
+    }
+  ) { };
+
   sync = callPackage (
     {
       mkDerivation,
@@ -670066,7 +675587,7 @@ self: {
         utility-ht
       ];
       description = "Control synthesizer effects via ALSA/MIDI";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       badPlatforms = lib.platforms.darwin;
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -670361,7 +675882,7 @@ self: {
       ];
       doHaddock = false;
       description = "Efficient signal processing using runtime compilation";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -670561,7 +676082,7 @@ self: {
         primitive
       ];
       description = "Decode RFC 3164 and RFC 5424 syslog message formats";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -670897,8 +676418,8 @@ self: {
       pname = "system-linux-proc";
       version = "0.1.1.1";
       sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5";
-      revision = "4";
-      editedCabalFile = "0q77ybg2x81k9vvmyiwxqgal4s3kai6b93gdirak7ypf5fbb62q5";
+      revision = "6";
+      editedCabalFile = "06jq0xrljkphxpwpc606a9c5wyks6s166y78aisxj3kbdhhs26qg";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -671222,7 +676743,7 @@ self: {
       ];
       librarySystemDepends = [ systemd ];
       description = "systemd bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.linux;
     }
   ) { inherit (pkgs) systemd; };
@@ -671256,7 +676777,7 @@ self: {
         wreq
       ];
       description = "Send notifications for systemd units to ntfy.sh";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "systemd-ntfy";
       broken = true;
@@ -671288,7 +676809,7 @@ self: {
         unix
       ];
       description = "Let systemd bind the server's socket for you";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -671388,7 +676909,7 @@ self: {
       ];
       testToolDepends = [ tasty-autocollect ];
       description = "Let you put anything in the system tray";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "systranything";
     }
   ) { };
@@ -672005,184 +677526,231 @@ self: {
     }
   ) { };
 
-  taffybar = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      ansi-terminal,
-      attoparsec,
-      base,
-      bytestring,
-      conduit,
-      containers,
-      data-default,
-      dbus,
-      dbus-hslogger,
-      directory,
-      dyre,
-      either,
-      enclosed-exceptions,
-      extra,
-      filepath,
-      fsnotify,
-      gi-cairo-connector,
-      gi-cairo-render,
-      gi-gdk3,
-      gi-gdkpixbuf,
-      gi-gdkx113,
-      gi-glib,
-      gi-gtk-hs,
-      gi-gtk3,
-      gi-pango,
-      gtk-sni-tray,
-      gtk-strut,
-      gtk3,
-      haskell-gi-base,
-      hslogger,
-      hspec,
-      hspec-core,
-      hspec-discover,
-      hspec-golden,
-      HStringTemplate,
-      http-client,
-      http-client-tls,
-      http-conduit,
-      http-types,
-      multimap,
-      optparse-applicative,
-      parsec,
-      process,
-      QuickCheck,
-      rate-limit,
-      regex-compat,
-      safe,
-      scotty,
-      split,
-      status-notifier-item,
-      stm,
-      template-haskell,
-      text,
-      time,
-      time-locale-compat,
-      time-units,
-      transformers,
-      tuple,
-      typed-process,
-      unix,
-      unliftio,
-      unliftio-core,
-      utf8-string,
-      X11,
-      xdg-basedir,
-      xdg-desktop-entry,
-      xml,
-      xml-helpers,
-      xmonad,
-    }:
-    mkDerivation {
-      pname = "taffybar";
-      version = "4.1.1";
-      sha256 = "1fbh2jgv0isl02w806grsb7xlyjyaj4x0qmx9j556kci172g70mm";
-      isLibrary = true;
-      isExecutable = true;
-      enableSeparateDataOutput = true;
-      libraryHaskellDepends = [
-        aeson
-        ansi-terminal
-        attoparsec
-        base
-        bytestring
-        conduit
-        containers
-        data-default
-        dbus
-        dbus-hslogger
-        directory
-        dyre
-        either
-        enclosed-exceptions
-        extra
-        filepath
-        fsnotify
-        gi-cairo-connector
-        gi-cairo-render
-        gi-gdk3
-        gi-gdkpixbuf
-        gi-gdkx113
-        gi-glib
-        gi-gtk-hs
-        gi-gtk3
-        gi-pango
-        gtk-sni-tray
-        gtk-strut
-        haskell-gi-base
-        hslogger
-        hspec
-        HStringTemplate
-        http-client
-        http-client-tls
-        http-conduit
-        http-types
-        multimap
-        parsec
-        process
-        QuickCheck
-        rate-limit
-        regex-compat
-        safe
-        scotty
-        split
-        status-notifier-item
-        stm
-        template-haskell
-        text
-        time
-        time-locale-compat
-        time-units
-        transformers
-        tuple
-        typed-process
-        unix
-        unliftio
-        unliftio-core
-        utf8-string
-        X11
-        xdg-basedir
-        xdg-desktop-entry
-        xml
-        xml-helpers
-        xmonad
-      ];
-      libraryPkgconfigDepends = [ gtk3 ];
-      libraryToolDepends = [ hspec-discover ];
-      executableHaskellDepends = [
-        base
-        data-default
-        directory
-        hslogger
-        optparse-applicative
-      ];
-      executablePkgconfigDepends = [ gtk3 ];
-      testHaskellDepends = [
-        base
-        data-default
-        filepath
-        gi-gtk3
-        hspec
-        hspec-core
-        hspec-golden
-        QuickCheck
-        transformers
-      ];
-      testToolDepends = [ hspec-discover ];
-      doHaddock = false;
-      description = "A desktop bar similar to xmobar, but with more GUI";
-      license = lib.licensesSpdx."BSD-3-Clause";
-      badPlatforms = lib.platforms.darwin;
-      mainProgram = "taffybar";
-      maintainers = [ lib.maintainers.rvl ];
-    }
-  ) { inherit (pkgs) gtk3; };
+  taffybar =
+    callPackage
+      (
+        {
+          mkDerivation,
+          aeson,
+          ansi-terminal,
+          attoparsec,
+          base,
+          bytestring,
+          conduit,
+          containers,
+          data-default,
+          dbus,
+          dbus-hslogger,
+          dbus-menu,
+          dhall,
+          directory,
+          disk-free-space,
+          dyre,
+          either,
+          enclosed-exceptions,
+          extra,
+          filepath,
+          fsnotify,
+          gi-cairo-connector,
+          gi-cairo-render,
+          gi-gdk3,
+          gi-gdkpixbuf,
+          gi-gdkx113,
+          gi-glib,
+          gi-gtk-hs,
+          gi-gtk-layer-shell,
+          gi-gtk3,
+          gi-pango,
+          gtk-sni-tray,
+          gtk-strut,
+          gtk3,
+          haskell-gi-base,
+          hslogger,
+          hspec,
+          hspec-core,
+          hspec-discover,
+          hspec-golden,
+          HStringTemplate,
+          http-client,
+          http-client-tls,
+          http-conduit,
+          http-types,
+          JuicyPixels,
+          monad-control,
+          multimap,
+          network,
+          optparse-applicative,
+          parsec,
+          process,
+          QuickCheck,
+          rate-limit,
+          regex-compat,
+          safe,
+          scotty,
+          split,
+          status-notifier-item,
+          stm,
+          systemd,
+          template-haskell,
+          text,
+          time,
+          time-locale-compat,
+          time-units,
+          transformers,
+          tuple,
+          typed-process,
+          unix,
+          unliftio,
+          unliftio-core,
+          utf8-string,
+          X11,
+          xdg-basedir,
+          xdg-desktop-entry,
+          xml,
+          xml-helpers,
+          xmonad,
+          xmonad-contrib,
+          yaml,
+        }:
+        mkDerivation {
+          pname = "taffybar";
+          version = "6.0.0";
+          sha256 = "1vk3vyms5zzs4mray4a9x90gdl700j6h7x4kayndaqwj418rvdjw";
+          isLibrary = true;
+          isExecutable = true;
+          enableSeparateDataOutput = true;
+          libraryHaskellDepends = [
+            aeson
+            ansi-terminal
+            attoparsec
+            base
+            bytestring
+            conduit
+            containers
+            data-default
+            dbus
+            dbus-hslogger
+            dbus-menu
+            directory
+            disk-free-space
+            dyre
+            either
+            enclosed-exceptions
+            extra
+            filepath
+            fsnotify
+            gi-cairo-connector
+            gi-cairo-render
+            gi-gdk3
+            gi-gdkpixbuf
+            gi-gdkx113
+            gi-glib
+            gi-gtk-hs
+            gi-gtk-layer-shell
+            gi-gtk3
+            gi-pango
+            gtk-sni-tray
+            gtk-strut
+            haskell-gi-base
+            hslogger
+            hspec
+            HStringTemplate
+            http-client
+            http-client-tls
+            http-conduit
+            http-types
+            monad-control
+            multimap
+            network
+            parsec
+            process
+            QuickCheck
+            rate-limit
+            regex-compat
+            safe
+            scotty
+            split
+            status-notifier-item
+            stm
+            template-haskell
+            text
+            time
+            time-locale-compat
+            time-units
+            transformers
+            tuple
+            typed-process
+            unix
+            unliftio
+            unliftio-core
+            utf8-string
+            X11
+            xdg-basedir
+            xdg-desktop-entry
+            xml
+            xml-helpers
+            xmonad
+            yaml
+          ];
+          libraryPkgconfigDepends = [
+            gtk3
+            systemd
+          ];
+          libraryToolDepends = [ hspec-discover ];
+          executableHaskellDepends = [
+            base
+            bytestring
+            data-default
+            dhall
+            directory
+            filepath
+            gi-gdk3
+            gi-gdkpixbuf
+            gi-gtk3
+            gtk-strut
+            hslogger
+            JuicyPixels
+            optparse-applicative
+            text
+            transformers
+            typed-process
+            unix
+            unliftio
+            X11
+            xmonad
+            xmonad-contrib
+          ];
+          executablePkgconfigDepends = [ gtk3 ];
+          testHaskellDepends = [
+            base
+            bytestring
+            data-default
+            directory
+            filepath
+            gi-gtk3
+            hspec
+            hspec-core
+            hspec-golden
+            JuicyPixels
+            QuickCheck
+            text
+            transformers
+            typed-process
+            unix
+            unliftio
+          ];
+          testToolDepends = [ hspec-discover ];
+          doHaddock = false;
+          description = "A desktop bar similar to xmobar, but with more GUI";
+          license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+          badPlatforms = lib.platforms.darwin;
+          maintainers = [ lib.maintainers.rvl ];
+        }
+      )
+      {
+        inherit (pkgs) gtk3;
+        inherit (pkgs) systemd;
+      };
 
   tag-bits = callPackage (
     {
@@ -672402,7 +677970,7 @@ self: {
         transformers
       ];
       description = "Trivial monad transformer that allows identical monad stacks to have different types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -672984,7 +678552,7 @@ self: {
         utf8-string
       ];
       description = "Black magic tagsoup";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "tagstew";
     }
   ) { };
@@ -673072,7 +678640,7 @@ self: {
         text
       ];
       description = "Hierarchical Tags & Tag Trees";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -673092,7 +678660,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Abstractions related to Tahoe-LAFS \"capabilities\"";
-      license = lib.licensesSpdx."LGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "LGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -673250,7 +678818,7 @@ self: {
         text
       ];
       description = "Tahoe-LAFS directory-like abstraction for collections of data objects";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -673459,7 +679027,7 @@ self: {
         yaml
       ];
       description = "An implementation of the \"Great Black Swamp\" LAFS protocol";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -673505,7 +679073,7 @@ self: {
         utility-ht
       ];
       description = "An HSpec for Great Black Swamp storage backends";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -673539,7 +679107,7 @@ self: {
         text
       ];
       description = "Types related to implementation of a Tahoe-LAFS Great Black Swamp server";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -673623,7 +679191,7 @@ self: {
         x509
       ];
       description = "An implementation of the Tahoe-LAFS SSK cryptographic protocols";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -673894,8 +679462,61 @@ self: {
         with-utf8
       ];
       description = "Tailwind wrapped in Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "tailwind-run";
+      broken = true;
+    }
+  ) { };
+
+  taiwan-id = callPackage (
+    {
+      mkDerivation,
+      base,
+      cabal-doctest,
+      doctest,
+      finitary,
+      finite-typelits,
+      hspec,
+      microlens,
+      MonadRandom,
+      nonempty-containers,
+      QuickCheck,
+      quickcheck-classes,
+      text,
+    }:
+    mkDerivation {
+      pname = "taiwan-id";
+      version = "0.1.0.0";
+      sha256 = "1b9ysrmcv8npp1fhsxhpv205m7kv44y760gbfv6983nhd3hr1m7a";
+      setupHaskellDepends = [
+        base
+        cabal-doctest
+      ];
+      libraryHaskellDepends = [
+        base
+        finitary
+        finite-typelits
+        MonadRandom
+        nonempty-containers
+        text
+      ];
+      testHaskellDepends = [
+        base
+        doctest
+        finitary
+        hspec
+        microlens
+        MonadRandom
+        nonempty-containers
+        QuickCheck
+        quickcheck-classes
+        text
+      ];
+      description = "Implementation of Taiwan's uniform ID number format";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -674171,7 +679792,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Line oriented fast enough text search";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "talash";
       broken = true;
@@ -674498,7 +680119,7 @@ self: {
         transformers
       ];
       description = "Heterogenous memoisation monad";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -674568,7 +680189,7 @@ self: {
         vector
       ];
       description = "A tasty enhancement to cassava for easy csv exporting";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -674641,7 +680262,7 @@ self: {
       ];
       doHaddock = false;
       description = "Reading, writing and manipulating \".tar\" archive files.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -674718,7 +680339,7 @@ self: {
       ];
       doHaddock = false;
       description = "Reading, writing and manipulating \".tar\" archive files.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -674789,7 +680410,7 @@ self: {
       ];
       doHaddock = false;
       description = "Reading, writing and manipulating \".tar\" archive files.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -675115,7 +680736,7 @@ self: {
         QuickCheck
       ];
       description = "Targeted generators for QuickCheck";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -675470,7 +681091,7 @@ self: {
         temporary
       ];
       description = "CLI task / todo list manager with SQLite backend";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tasklite";
     }
@@ -675608,7 +681229,7 @@ self: {
         protolude
       ];
       description = "CLI task / todo list manager with SQLite backend";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -675695,7 +681316,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Types and aeson instances for taskwarrior tasks";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -676088,7 +681709,7 @@ self: {
         text
       ];
       description = "Check multiple items during a tasty test";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -676115,7 +681736,7 @@ self: {
         tasty
       ];
       description = "Ingredient for tasty which generates per-test coverage reports";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -676196,7 +681817,7 @@ self: {
         tasty-smallcheck
       ];
       description = "Test discovery for the tasty framework";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "tasty-discover";
     }
   ) { };
@@ -676266,7 +681887,7 @@ self: {
         temporary
       ];
       description = "Test discovery for the tasty framework";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tasty-discover";
     }
@@ -676372,7 +681993,7 @@ self: {
         tasty-hunit
       ];
       description = "Handle flaky Tasty-based tests";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -676401,23 +682022,20 @@ self: {
         tasty-hunit
       ];
       description = "Simple focus mechanism for tasty";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
   tasty-golden = callPackage (
     {
       mkDerivation,
-      async,
       base,
       bytestring,
       containers,
       deepseq,
       directory,
       filepath,
-      mtl,
       optparse-applicative,
-      tagged,
       tasty,
       tasty-hunit,
       temporary,
@@ -676426,21 +682044,18 @@ self: {
     }:
     mkDerivation {
       pname = "tasty-golden";
-      version = "2.3.5";
-      sha256 = "03klnxn9rcv0l7fl4w8q6s59fzl1328j1wzwi1za4gb0l90vadwb";
+      version = "2.3.6";
+      sha256 = "1g0asy8x7wh0zicaxy194hbamdixzswimq4mi07w200plaipydwg";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
-        async
         base
         bytestring
         containers
         deepseq
         directory
         filepath
-        mtl
         optparse-applicative
-        tagged
         tasty
         temporary
         text
@@ -676497,7 +682112,7 @@ self: {
         yaml
       ];
       description = "Additional golden test helpers for the tasty-golden package";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -676534,7 +682149,7 @@ self: {
         text
       ];
       description = "Grade your tasty-testsuite";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -676679,7 +682294,7 @@ self: {
         tasty-hunit
       ];
       description = "Tasty helpers to test HsLua";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -676712,7 +682327,7 @@ self: {
         tasty-smallcheck
       ];
       description = "Hspec support for the Tasty test framework";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -677017,7 +682632,7 @@ self: {
         text
       ];
       description = "JSON reporter for the tasty testing framework";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -677187,7 +682802,7 @@ self: {
         tasty-hunit
       ];
       description = "Write tests in Lua, integrate into tasty";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -677302,7 +682917,7 @@ self: {
         tasty-focus
       ];
       description = "Unopinionated top-level entry point to tasty ecosystem";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -677412,8 +683027,8 @@ self: {
       pname = "tasty-quickcheck";
       version = "0.11.1";
       sha256 = "0si4ccgqlv8h33d6310rrqba7f4pz3g8cinqfj42yd7damsdxm73";
-      revision = "4";
-      editedCabalFile = "13sn5bwvw04d7l3xv6mkj8mf6wyvhqqhabdqnb4xchzcc48akdxz";
+      revision = "5";
+      editedCabalFile = "1205icd0f94vvw40g72y4ij5a4sxzl84hg5ckav4dhfcxipnpshj";
       libraryHaskellDepends = [
         base
         optparse-applicative
@@ -677499,7 +683114,7 @@ self: {
         transformers
       ];
       description = "Rerun only tests which failed in a previous test run";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -677793,7 +683408,7 @@ self: {
         tasty
       ];
       description = "Test vector support for tasty";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -677984,7 +683599,7 @@ self: {
         profunctors
       ];
       description = "Types and combinators for taxes";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -678009,7 +683624,7 @@ self: {
         time
       ];
       description = "Tax types and computations for Australia";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
     }
   ) { };
 
@@ -678426,7 +684041,7 @@ self: {
         vector-algorithms
       ];
       description = "On-line accumulation of rank-based statistics";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -679070,7 +684685,7 @@ self: {
         webgear-core
       ];
       description = "Easily define multiple interrelated data types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tedious-web-exe";
       broken = true;
@@ -679112,7 +684727,7 @@ self: {
         prettyprinter-ansi-terminal
       ];
       description = "Prettier error";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -679593,7 +685208,7 @@ self: {
         in-other-words
       ];
       description = "Binding to the telegraph API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -679783,7 +685398,7 @@ self: {
         transformers
       ];
       description = "The MonadTell class and related monad transformers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -680003,7 +685618,7 @@ self: {
         template-haskell
       ];
       description = "Backward-compatibility layer for Template Haskell newer than 2.8";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -680024,7 +685639,7 @@ self: {
         template-haskell
       ];
       description = "The 'Lift' typeclass";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -680072,7 +685687,7 @@ self: {
         template-haskell
       ];
       description = "The 'QuasiQuoter' interface";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -680314,6 +685929,39 @@ self: {
     }
   ) { };
 
+  templates = callPackage (
+    {
+      mkDerivation,
+      base,
+      ClasshSS,
+      containers,
+      data-default,
+      filepath,
+      lens,
+      reflex-classhss,
+      reflex-dom,
+      text,
+    }:
+    mkDerivation {
+      pname = "templates";
+      version = "0.1.0.0";
+      sha256 = "01i0iipzyd7f1vd9hmp9br4wa9wcixzbmzk46iq8v3h8wxfc6hf8";
+      libraryHaskellDepends = [
+        base
+        ClasshSS
+        containers
+        data-default
+        filepath
+        lens
+        reflex-classhss
+        reflex-dom
+        text
+      ];
+      description = "Out of the box reflex-dom elements";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   templatise = callPackage (
     {
       mkDerivation,
@@ -680390,7 +686038,7 @@ self: {
       ];
       doHaddock = false;
       description = "You can use template.hs to create a new Haskell GitHub repository.";
-      license = lib.licensesSpdx."Unlicense";
+      license = lib.meta.getLicenseFromSpdxId "Unlicense";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "initialise";
       broken = true;
@@ -680509,7 +686157,7 @@ self: {
         proto-lens-protobuf-types
         proto-lens-runtime
       ];
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -680782,7 +686430,7 @@ self: {
         zlib
       ];
       testToolDepends = [ hspec-discover ];
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -680845,7 +686493,7 @@ self: {
         vector
       ];
       librarySystemDepends = [ temporal_bridge ];
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -680892,6 +686540,49 @@ self: {
     }
   ) { };
 
+  temporary-ospath = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      directory,
+      exceptions,
+      file-io,
+      filepath,
+      os-string,
+      tasty,
+      tasty-hunit,
+      unix,
+    }:
+    mkDerivation {
+      pname = "temporary-ospath";
+      version = "1.3";
+      sha256 = "1wk9zd6w3vfk9k0p4y81pb624lgrk14591l1bmvkw2lsgpasgl3l";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        directory
+        exceptions
+        file-io
+        filepath
+        os-string
+        unix
+      ];
+      testHaskellDepends = [
+        base
+        directory
+        file-io
+        filepath
+        os-string
+        tasty
+        tasty-hunit
+        unix
+      ];
+      description = "Portable temporary file and directory support";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
   temporary-rc = callPackage (
     {
       mkDerivation,
@@ -681853,7 +687544,7 @@ self: {
         QuickCheck
       ];
       description = "Tunable sorting for responsive robustness and beyond";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "tensort";
     }
   ) { };
@@ -681914,7 +687605,7 @@ self: {
         termbox-bindings-hs
       ];
       description = "termbox";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -681937,7 +687628,7 @@ self: {
         termbox
       ];
       description = "termbox + reactive-banana";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -681972,7 +687663,7 @@ self: {
       sha256 = "0da1jq7x2bp92k6ffn4v1mv9c13lm73rj0sjpqkjcrpgygajrqxm";
       libraryHaskellDepends = [ base ];
       description = "termbox bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -681991,7 +687682,7 @@ self: {
         termbox-bindings-c
       ];
       description = "termbox bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -682014,7 +687705,7 @@ self: {
         termbox
       ];
       description = "termbox + The Elm Architecture";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -682724,7 +688415,7 @@ self: {
         tls
       ];
       description = "create temporary SSL certificates in tests";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -683337,7 +689028,7 @@ self: {
         simple-get-opt
       ];
       description = "A library to make a quick test-runner script";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "test-runner";
       broken = true;
@@ -683891,7 +689582,26 @@ self: {
         text
       ];
       description = "Testcontainers integration for PostgreSQL";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
+  tesths = callPackage (
+    {
+      mkDerivation,
+      ansi-terminal,
+      base,
+    }:
+    mkDerivation {
+      pname = "tesths";
+      version = "0.2.2.1";
+      sha256 = "0lmfcvnc11slbb4radlary35fhkzdy12jphphp8dzknswd83iqg2";
+      libraryHaskellDepends = [
+        ansi-terminal
+        base
+      ];
+      description = "A lightweight testing framework for Haskell";
+      license = lib.licenses.lgpl3Only;
     }
   ) { };
 
@@ -683955,7 +689665,7 @@ self: {
         vec
       ];
       description = "Pure implementation of tensors, for use in tests";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -684303,7 +690013,7 @@ self: {
     }
   ) { };
 
-  texmath_0_13_0_2 = callPackage (
+  texmath_0_13_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -684326,8 +690036,8 @@ self: {
     }:
     mkDerivation {
       pname = "texmath";
-      version = "0.13.0.2";
-      sha256 = "1iwb67rnyhq8w4vm0500273iy2pks0h130k65i6x3zbsg15hdlvs";
+      version = "0.13.1";
+      sha256 = "0lxk76f23qirxv1h7fw6al3246g4f0mghnzlkx7d3ln4czkmk73g";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -684474,7 +690184,7 @@ self: {
       ];
       doCheck = false;
       description = "An efficient packed Unicode text type";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -684556,7 +690266,7 @@ self: {
         text-builder-linear
       ];
       description = "Text styling for ANSI terminals";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -684593,7 +690303,7 @@ self: {
         text
       ];
       description = "ASCII string and character processing";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -684654,7 +690364,7 @@ self: {
         rerebase
       ];
       description = "Efficient strict text builder";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -684705,7 +690415,7 @@ self: {
         text-builder-linear
       ];
       description = "Efficient and flexible strict text builder";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -684755,7 +690465,7 @@ self: {
         text-builder-linear
       ];
       description = "Efficient and flexible strict text builder";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -684798,7 +690508,7 @@ self: {
         text-builder-linear
       ];
       description = "Internals of \"text-builder\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -684840,7 +690550,7 @@ self: {
         text-builder-linear
       ];
       description = "Internals of \"text-builder\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -684899,7 +690609,7 @@ self: {
         rerebase
       ];
       description = "Edge of developments for \"text-builder\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -684946,7 +690656,7 @@ self: {
         time
       ];
       description = "Edge of developments for \"text-builder\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -684964,8 +690674,8 @@ self: {
     }:
     mkDerivation {
       pname = "text-builder-lawful-conversions";
-      version = "0.1.4";
-      sha256 = "0dqinf0nkrviaxz2p465w7zh9nz73a2ivs35b2kx1bd3l8gvl9wp";
+      version = "0.1.4.1";
+      sha256 = "101j68bhvkzqcjhsgqg92z53dw3nkzkmhrwjv2k0s850s82yk95v";
       libraryHaskellDepends = [
         base
         lawful-conversions
@@ -684983,7 +690693,7 @@ self: {
         text-builder
       ];
       description = "Orphan instances of \"lawful-conversions\" for \"text-builder\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -685026,7 +690736,7 @@ self: {
         text
       ];
       description = "Builder for Text and ByteString based on linear types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -685047,7 +690757,7 @@ self: {
         time
       ];
       description = "Various formats for \"time\" in terms of \"text-builder\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -685074,7 +690784,7 @@ self: {
         text
       ];
       description = "A text compression library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -685161,7 +690871,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Safe conversions between textual types";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -685191,7 +690901,7 @@ self: {
         text
       ];
       description = "Convert between various textual representations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -685259,7 +690969,7 @@ self: {
         text-builder-linear
       ];
       description = "A typeclass for user-facing output";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -685314,7 +691024,7 @@ self: {
       ];
       doHaddock = false;
       description = "Classes and newtypes for deriving uniform textual encodings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -685908,7 +691618,7 @@ self: {
         text
       ];
       description = "Case conversion, word boundary manipulation, and textual subjugation";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -685989,7 +691699,7 @@ self: {
         weigh
       ];
       description = "Calculate various string metrics efficiently";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -686383,7 +692093,7 @@ self: {
         text
       ];
       description = "Simple text replacements from a list of search/replace pairs";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "text-replace";
       broken = true;
@@ -686459,7 +692169,7 @@ self: {
         text-rope
       ];
       description = "2D text zipper based on text-rope";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -686535,8 +692245,8 @@ self: {
       pname = "text-show";
       version = "3.11.3";
       sha256 = "0mvahiljlvizfbldnv8cjn94h9j76s1zj7d8gb6wl6rwxf7fphrg";
-      revision = "1";
-      editedCabalFile = "0vhl7zqqg3q8dm4dkw0b940ka8kaaxsa7adxpbw1frgqg8xrg960";
+      revision = "2";
+      editedCabalFile = "0drmrkhy2y4wrff69q7fk61z5q69cj9hik7dpgg8b6a46r743z66";
       libraryHaskellDepends = [
         array
         base
@@ -686624,8 +692334,8 @@ self: {
       pname = "text-show-instances";
       version = "3.9.10";
       sha256 = "09cb391gi0hgkjk4ap4d83vg13lczrghmb9db96a4ckw1bp9pbc1";
-      revision = "5";
-      editedCabalFile = "0mrlg1pn18vc8bj6dh3wncc7xcyaaamdsz5ja24sgxv2g08m3wvg";
+      revision = "6";
+      editedCabalFile = "0103l5byrg5pik2a1646mvaqxg98505pldpap9xm6ys0yvg05an3";
       libraryHaskellDepends = [
         aeson
         base
@@ -687549,7 +693259,7 @@ self: {
         template-haskell
       ];
       description = "Compile-time CAS(Computer Algebra System)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -687733,7 +693443,7 @@ self: {
         unordered-containers
       ];
       description = "Check that datatypes are deep strict using Template Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -687929,10 +693639,8 @@ self: {
     }:
     mkDerivation {
       pname = "th-extras";
-      version = "0.0.0.8";
-      sha256 = "1hvpvb02j2zyg4mpdqzs3w4s7wva78npdlrnpsii7nps2fpvcmrs";
-      revision = "2";
-      editedCabalFile = "08hbgfr7r7nqq2pak4ip1yjy53b7vhs6dgdqw522hhydfg6y9ia5";
+      version = "0.0.0.9";
+      sha256 = "188k0734c9c34qk1fys14cgxyl162h9m6kikcyafgj3zw3s3wzpx";
       libraryHaskellDepends = [
         base
         containers
@@ -688198,7 +693906,7 @@ self: {
         template-haskell
       ];
       description = "Template Haskell construction utilities";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -688227,7 +693935,7 @@ self: {
         transformers
       ];
       description = "Implicit (recursive) let insertion";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -688325,7 +694033,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Serialize compilation of modules with TH code modifing shared state";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -688889,7 +694597,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Give your dependencies stars on GitHub!";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "thank-you-stars";
       broken = true;
@@ -688965,7 +694673,7 @@ self: {
         unagi-chan
       ];
       description = "Minimalistic actor library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -689002,7 +694710,7 @@ self: {
         rerebase
       ];
       description = "Minimalistic actor library experiments";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -689063,7 +694771,7 @@ self: {
         time
       ];
       description = "Haskell API bindings for http://themoviedb.org";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tmdb";
       broken = true;
@@ -690256,8 +695964,8 @@ self: {
     }:
     mkDerivation {
       pname = "thrift-compiler";
-      version = "0.2.0.0";
-      sha256 = "0w4m3hqs24lc4bszk0df944v9vr08r8l3i2nk32yrmc96b8ncl7x";
+      version = "0.3.0.0";
+      sha256 = "0rhan2q5qp5q037g37ra7isr0i8ny7d3fcdn8r1cx193580202w0";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -690308,7 +696016,7 @@ self: {
         text
       ];
       description = "A compiler from the Thrift Interface Definition Language (IDL) to Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "thrift-compiler";
     }
@@ -690343,7 +696051,7 @@ self: {
         unordered-containers
       ];
       description = "Support for using Haxl with Thrift services";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -690365,6 +696073,7 @@ self: {
       hspec,
       hspec-contrib,
       http-client,
+      http-client-tls,
       http-types,
       HUnit,
       network,
@@ -690380,8 +696089,8 @@ self: {
     }:
     mkDerivation {
       pname = "thrift-http";
-      version = "0.2.0.0";
-      sha256 = "0n4s8wanfl27b5vjlqlf8jf3cmxmy447zwlgffw1w90940fznj9p";
+      version = "0.3.0.0";
+      sha256 = "0g3sjfpm341zxc844s2b0gn0a240z84gm8v5pav6sqawkjhy1rar";
       libraryHaskellDepends = [
         aeson
         async
@@ -690397,6 +696106,7 @@ self: {
         hspec
         hspec-contrib
         http-client
+        http-client-tls
         http-types
         HUnit
         network
@@ -690422,16 +696132,19 @@ self: {
         hashable
         hspec
         hspec-contrib
+        http-client
+        http-types
         HUnit
         STMonadTrans
         text
         thrift-lib
         transformers
         unordered-containers
+        wai
       ];
       doHaddock = false;
       description = "Support for Thrift-over-HTTP server and client";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -690533,7 +696246,7 @@ self: {
       testToolDepends = [ thrift-compiler ];
       doHaddock = false;
       description = "Libraries for Haskell Thrift";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -690836,7 +696549,7 @@ self: {
         text
       ];
       description = "Image thumbnail creation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -691193,7 +696906,7 @@ self: {
         text
       ];
       description = "A basic implementation of a personal ticket management system";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ticket-manager";
       broken = true;
@@ -691400,7 +697113,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Ableton Link integration for Tidal";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       mainProgram = "tidal-linktest";
     }
   ) { };
@@ -691683,7 +697396,7 @@ self: {
       ];
       testSystemDepends = [ tb_client ];
       description = "A Haskell client library for Tigerbeetle database";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tigerbeetle-hs";
       broken = true;
@@ -691832,7 +697545,7 @@ self: {
         tasty-bench
       ];
       description = "Haskell implementation of tiktoken";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -691989,7 +697702,7 @@ self: {
         deepseq
       ];
       description = "A time library";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -692031,7 +697744,6 @@ self: {
       HUnit,
       QuickCheck,
       random,
-      tagged,
       tasty,
       tasty-hunit,
       tasty-quickcheck,
@@ -692040,8 +697752,8 @@ self: {
     }:
     mkDerivation {
       pname = "time-compat";
-      version = "1.9.8";
-      sha256 = "1w2wxz9q3w04mwjm43xk8nrs61fhaf82xpz5q13in4sv99lzhbjh";
+      version = "1.9.9";
+      sha256 = "09bwvzxd41mmr3vq4az301fziy3aaglhky7bbs2ib76gagnxvylh";
       libraryHaskellDepends = [
         base
         base-orphans
@@ -692057,12 +697769,10 @@ self: {
         HUnit
         QuickCheck
         random
-        tagged
         tasty
         tasty-hunit
         tasty-quickcheck
         template-haskell
-        time
       ];
       description = "Compatibility package for time";
       license = lib.licenses.bsd3;
@@ -692084,7 +697794,7 @@ self: {
         time
       ];
       description = "A library for time domains and durations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
@@ -692104,7 +697814,7 @@ self: {
         time
       ];
       description = "A library for time domains and durations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.turion ];
     }
@@ -693166,7 +698876,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Data type representing a piecewise-constant function over time";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -693327,7 +699037,7 @@ self: {
         unliftio
       ];
       description = "Efficient timeout with reset";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -693493,7 +699203,7 @@ self: {
         tasty-bench
       ];
       description = "A timer wheel";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -693686,6 +699396,8 @@ self: {
       pname = "timestamp";
       version = "0.2";
       sha256 = "1cl57lf53kqmrhplf944zqhp59vjah57yakqd9m2rn0m5n6hz6sg";
+      revision = "1";
+      editedCabalFile = "0fnb3b3ymwr2nz9yv3fwyv6snwi5mmh4rh744fzcic8kqxl0m1si";
       libraryHaskellDepends = [
         base
         cereal
@@ -693779,7 +699491,7 @@ self: {
         text
       ];
       description = "A library for profiling time in Haskell applications";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -694136,6 +699848,7 @@ self: {
       license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tintin";
+      broken = true;
     }
   ) { };
 
@@ -694267,7 +699980,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Library to build tiny apps in Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -694311,7 +700024,7 @@ self: {
         entropy
       ];
       description = "A secure URL-friendly string ID generator";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -695454,7 +701167,7 @@ self: {
     }
   ) { };
 
-  tls_2_2_1 = callPackage (
+  tls_2_3_0 = callPackage (
     {
       mkDerivation,
       async,
@@ -695475,11 +701188,11 @@ self: {
       hpke,
       hspec,
       hspec-discover,
-      memory,
       mtl,
       network,
       network-run,
       QuickCheck,
+      ram,
       random,
       serialise,
       tasty-bench,
@@ -695490,8 +701203,8 @@ self: {
     }:
     mkDerivation {
       pname = "tls";
-      version = "2.2.1";
-      sha256 = "0cwi77q86llncxnksq45lv0nfgc0d163p134g6ql6v3mc5h49cih";
+      version = "2.3.0";
+      sha256 = "1zjnzj12y1mc5l0ibgc549iwasp6wp2azcgv4n0927yjrayd8gx3";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -695508,9 +701221,9 @@ self: {
         data-default
         ech-config
         hpke
-        memory
         mtl
         network
+        ram
         random
         serialise
         transformers
@@ -695664,8 +701377,8 @@ self: {
     }:
     mkDerivation {
       pname = "tls-session-manager";
-      version = "0.0.8";
-      sha256 = "1nijzmapkjzg88aa03wznjk8hc94klph3g0mazrlmp0w4nr4hzww";
+      version = "0.0.9";
+      sha256 = "1j0sbrxrz0d522igjgk7s361vd9yashjd8j25yypxclx83qfcp6i";
       libraryHaskellDepends = [
         auto-update
         base
@@ -695682,6 +701395,40 @@ self: {
     }
   ) { };
 
+  tls-session-manager_0_1_0 = callPackage (
+    {
+      mkDerivation,
+      auto-update,
+      base,
+      bytestring,
+      clock,
+      crypto-token,
+      psqueues,
+      ram,
+      serialise,
+      tls,
+    }:
+    mkDerivation {
+      pname = "tls-session-manager";
+      version = "0.1.0";
+      sha256 = "07mxdw9rh74m7l3z1ibwc490kn093w1xhbdm6qi1qfnkz1b199r9";
+      libraryHaskellDepends = [
+        auto-update
+        base
+        bytestring
+        clock
+        crypto-token
+        psqueues
+        ram
+        serialise
+        tls
+      ];
+      description = "In-memory TLS session DB and session ticket";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   tls-sslkeylogfile = callPackage (
     {
       mkDerivation,
@@ -695709,7 +701456,7 @@ self: {
         tls
       ];
       description = "SSLKEYLOGFILE support for Haskell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -695763,7 +701510,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Handle phylogenetic trees";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       mainProgram = "tlynx";
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -695819,7 +701566,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Handle phylogenetic trees";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tlynx";
       maintainers = [ lib.maintainers.dschrempf ];
@@ -696062,7 +701809,7 @@ self: {
         warp-tls
       ];
       description = "Run 'tmp' processes in integration tests";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -696135,7 +701882,7 @@ self: {
         hspec
       ];
       description = "Test a simple service with backends running on docker using tmp-proc";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -696173,7 +701920,7 @@ self: {
         tmp-proc
       ];
       description = "Launch a PostgreSQL database in docker using tmp-proc";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -696209,7 +701956,7 @@ self: {
         tmp-proc
       ];
       description = "Launch RabbitMQ in docker using tmp-proc";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -696245,7 +701992,7 @@ self: {
         tmp-proc
       ];
       description = "Launch Redis in docker using tmp-proc";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -696282,7 +702029,7 @@ self: {
         tmp-proc
       ];
       description = "Launch ZipKin in docker using tmp-proc";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -696579,7 +702326,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Unofficial Haskell SDK for the Todoist REST API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -696788,7 +702535,7 @@ self: {
         text
       ];
       description = "Fast rate limiting using the token bucket algorithm (BSD)";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "token-limiter-extended-tests";
       broken = true;
@@ -696971,7 +702718,7 @@ self: {
         transformers
       ];
       description = "Check uniqueness and tokenize safely";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -697308,7 +703055,7 @@ self: {
         markdown-unlit
       ];
       description = "TOML 1.1.0 parser";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -697406,7 +703153,7 @@ self: {
         toml-reader
       ];
       description = "Alternative parser for TOML values produced by the toml-reader package";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -697439,7 +703186,7 @@ self: {
         toml-parser
       ];
       description = "toml-parser test drivers";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -697504,7 +703251,7 @@ self: {
         unordered-containers
       ];
       description = "Bidirectional TOML serialization";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -698223,7 +703970,7 @@ self: {
         template-haskell
         time
       ];
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -698266,7 +704013,7 @@ self: {
         text
       ];
       description = "Tribial tools";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -698404,7 +704151,7 @@ self: {
         vector
       ];
       description = "Extensible records library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -698506,7 +704253,7 @@ self: {
         vector
       ];
       description = "Directed acyclic graphs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -698572,7 +704319,7 @@ self: {
       sha256 = "0ljcxlv019qfbs3wvp03j8l261i1p6vv3vycabcd0hpy0dbq80d9";
       libraryHaskellDepends = [ base ];
       description = "Torsor Typeclass";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -699164,7 +704911,7 @@ self: {
         vector
       ];
       description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -699401,7 +705148,7 @@ self: {
         text
       ];
       description = "Data Type for Rewriting Systems";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     }
   ) { };
 
@@ -699445,7 +705192,7 @@ self: {
         text
       ];
       description = "Parser and pretty printer for the TPTP language";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -699508,6 +705255,7 @@ self: {
   trace-embrace = callPackage (
     {
       mkDerivation,
+      add-dependent-file,
       aeson,
       base,
       bytestring,
@@ -699537,9 +705285,10 @@ self: {
     }:
     mkDerivation {
       pname = "trace-embrace";
-      version = "1.2.0";
-      sha256 = "05wgj9pf9vqafa1h7sbjxzy2lx213qwrpr4f2dq7s7i2l9hf2a3k";
+      version = "1.3.0";
+      sha256 = "0rp3xmvz59p832k7sdz9wnj2v2ki0j2j13vfx8432jn1gmxw3ax3";
       libraryHaskellDepends = [
+        add-dependent-file
         aeson
         base
         bytestring
@@ -699583,7 +705332,8 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Smart version of Debug.Trace module";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -699885,11 +705635,12 @@ self: {
       text,
       time,
       vty,
+      vty-crossplatform,
     }:
     mkDerivation {
       pname = "trackit";
-      version = "0.8";
-      sha256 = "02d47f599w0mksyr16i8lxydg3h9dni5dx1lh9y5vw7mfqklz5ff";
+      version = "0.8.1";
+      sha256 = "0z0w782l63nz81qaaf1alh2j2lxs8spmpxhpcqwv2c4yi6ihij97";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -699908,6 +705659,7 @@ self: {
         text
         time
         vty
+        vty-crossplatform
       ];
       description = "A command-line tool for live monitoring";
       license = lib.licenses.bsd3;
@@ -700011,7 +705763,7 @@ self: {
         unliftio-core
       ];
       description = "Haskell bindings for Tracy frame profiler";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -700543,6 +706295,8 @@ self: {
       pname = "transformers";
       version = "0.6.3.0";
       sha256 = "10zn7xryl60n91xl99dp7zkg3hdkjc8dljc3xdl2k4q75y7xws2i";
+      revision = "2";
+      editedCabalFile = "18gqlyxjvalskkab4sg5h09xg5ziwb53la62qv000skpb2fwra0p";
       libraryHaskellDepends = [ base ];
       description = "Concrete functor and monad transformers";
       license = lib.licenses.bsd3;
@@ -700588,8 +706342,8 @@ self: {
     }:
     mkDerivation {
       pname = "transformers-base";
-      version = "0.4.6";
-      sha256 = "146g69yxmlrmvqnzwcw4frxfl3z04lda9zqwcqib34dnkrlghfrj";
+      version = "0.4.6.1";
+      sha256 = "1n21kd1vbg4s6p1vpzfkvb457p1dc1b96c50x02dan6np6ry6gdl";
       libraryHaskellDepends = [
         base
         base-orphans
@@ -700818,7 +706572,7 @@ self: {
         transformers
       ];
       description = "An Either monad transformer";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -700843,7 +706597,7 @@ self: {
         transformers
       ];
       description = "An Except monad transformer with";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -700910,7 +706664,7 @@ self: {
         writer-cps-transformers
       ];
       description = "Ad-hoc type classes for lifting";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -701293,7 +707047,7 @@ self: {
         doctest
       ];
       description = "Type Safe Web Routing";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -701330,7 +707084,7 @@ self: {
         trasa
       ];
       description = "Type safe http requests";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -701489,7 +707243,7 @@ self: {
         wai
       ];
       description = "Type safe web server";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -701519,7 +707273,7 @@ self: {
         trasa
       ];
       description = "Template Haskell to generate trasa routes";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -701555,8 +707309,9 @@ self: {
         util
       ];
       description = "See README for more info";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -701596,7 +707351,7 @@ self: {
         template-haskell
       ];
       description = "General data structure lifting for Template Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -701849,7 +707604,7 @@ self: {
         hspec-core
       ];
       description = "Efficient implementation of the implicit treap data structure";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -701940,7 +707695,7 @@ self: {
         Diff
       ];
       description = "Diffing of (expression) trees";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
@@ -701985,7 +707740,7 @@ self: {
         vector
       ];
       description = "Tree Edit Distance to determine the similarity between two trees";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "tree-edit-distance-exe";
     }
   ) { };
@@ -702044,7 +707799,7 @@ self: {
         mtl
       ];
       description = "Configurable text rendering of trees";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -702082,7 +707837,7 @@ self: {
         hedgehog
       ];
       description = "Unstable bindings for the tree-sitter parsing library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702102,7 +707857,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for C#";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702122,7 +707877,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Go";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702143,7 +707898,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702163,7 +707918,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Java";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702183,7 +707938,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for JSON";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702203,7 +707958,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for OCaml";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702223,7 +707978,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for PHP";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702243,7 +707998,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Python";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702263,7 +708018,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for QL";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702283,7 +708038,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Ruby";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702303,7 +708058,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Rust";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702323,7 +708078,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for TSX";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702343,7 +708098,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for TypeScript";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -702370,7 +708125,7 @@ self: {
         mtl
       ];
       description = "Functions and newtype wrappers for traversing Trees";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -702917,7 +708672,7 @@ self: {
       ];
       doHaddock = false;
       description = "Bindings to the TREXIO library for wave function data";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) trexio; };
 
@@ -702967,7 +708722,7 @@ self: {
         splitmix
       ];
       description = "Trial Data Structure";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -702990,7 +708745,7 @@ self: {
         trial
       ];
       description = "Trial helper functions for optparse-applicative";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -703015,7 +708770,7 @@ self: {
         trial
       ];
       description = "Trial helper functions for tomland";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -703349,7 +709104,7 @@ self: {
         hspec
       ];
       description = "A command-line tool for trimming whitespace";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "trim";
       broken = true;
@@ -703620,7 +709375,7 @@ self: {
         time
       ];
       description = "Template Haskell hack to violate module abstractions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -703745,7 +709500,7 @@ self: {
         text
       ];
       description = "An implementation of a trust chain";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -703771,7 +709526,7 @@ self: {
       sha256 = "164jxd8cyjb4qkmwqchzcpvd5fh7d124gbpryi26y8cbabmhfm8z";
       libraryHaskellDepends = [ base ];
       description = "Generalized booleans and truthy values";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -704334,7 +710089,7 @@ self: {
         text-short
       ];
       description = "Textual Type Classes";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -704659,6 +710414,74 @@ self: {
     }
   ) { };
 
+  tuispec = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      containers,
+      directory,
+      filepath,
+      jsonrpc,
+      optparse-applicative,
+      posix-pty,
+      process,
+      scientific,
+      tasty,
+      tasty-hunit,
+      text,
+      time,
+      unix,
+    }:
+    mkDerivation {
+      pname = "tuispec";
+      version = "0.2.0.0";
+      sha256 = "1qjal3lw3nnaf3r7azggr1cvq0y8q6p7jqdqzhqcqrkd4n9fgjxs";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        jsonrpc
+        posix-pty
+        process
+        tasty
+        tasty-hunit
+        text
+        time
+        unix
+      ];
+      executableHaskellDepends = [
+        base
+        optparse-applicative
+        text
+        unix
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        directory
+        filepath
+        process
+        scientific
+        tasty
+        tasty-hunit
+        text
+      ];
+      description = "Playwright-like black-box testing for terminal UIs over PTY";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "tuispec";
+      broken = true;
+    }
+  ) { };
+
   tuntap = callPackage (
     {
       mkDerivation,
@@ -704834,7 +710657,7 @@ self: {
         tasty-hunit
       ];
       description = "Access tuple fields using record dot syntax";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "gen-source";
       broken = true;
@@ -705089,7 +710912,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Small monomorphic tuples";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -705571,7 +711394,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Tiny web application framework for WAI";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -706516,7 +712339,7 @@ self: {
         vector
       ];
       description = "Simple 2D Game Engine";
-      license = lib.licensesSpdx."Zlib";
+      license = lib.meta.getLicenseFromSpdxId "Zlib";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
@@ -706569,7 +712392,7 @@ self: {
         wai
       ];
       description = "Haskell twirp foundations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -707097,6 +712920,7 @@ self: {
       description = "Text";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -707569,7 +713393,7 @@ self: {
         Glob
       ];
       description = "Combinators for writing pretty type errors easily";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -707589,6 +713413,20 @@ self: {
     }
   ) { };
 
+  type-fold = callPackage (
+    { mkDerivation, base }:
+    mkDerivation {
+      pname = "type-fold";
+      version = "0.1.0.0";
+      sha256 = "06k6a9p0pvrn31dcqidfpzg1ighrc657hcxblg01awgcwrqdxv14";
+      libraryHaskellDepends = [ base ];
+      description = "A library for folding types to a value";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   type-fun = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -708144,7 +713982,7 @@ self: {
         template-haskell
       ];
       description = "Type-level functions for record types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "vector-example";
     }
   ) { };
@@ -708229,7 +714067,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Type-level natural and proofs of their properties";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -708435,7 +714273,7 @@ self: {
         tasty-hunit
       ];
       description = "Support functions to work with type representations";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -708456,7 +714294,7 @@ self: {
         invariant
       ];
       description = "Classes for the rig (sums and products) of types";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -708470,7 +714308,7 @@ self: {
       editedCabalFile = "0xcamv7cy7saywzx2vj7d0l1hpjqkz8jzkdy8hdabz7q9zlynshg";
       libraryHaskellDepends = [ base ];
       description = "Type safe BST and AVL trees";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -708498,7 +714336,7 @@ self: {
         template-haskell
       ];
       description = "Type set";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -708907,7 +714745,7 @@ self: {
         unordered-containers
       ];
       description = "An implementation of LangChain in Haskell";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "typechain-exe";
       broken = true;
@@ -709225,7 +715063,7 @@ self: {
         singletons-base
       ];
       description = "A framework for strongly typed FSM";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -709253,7 +715091,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "GUI framework based on typed-fsm";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -709335,7 +715173,7 @@ self: {
         tasty-hunit
       ];
       description = "A binding of the typed-process library for the effectful effect system";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -709347,6 +715185,7 @@ self: {
       base,
       bytestring,
       contra-tracer,
+      deepseq,
       directory,
       io-classes,
       io-sim,
@@ -709360,14 +715199,15 @@ self: {
     }:
     mkDerivation {
       pname = "typed-protocols";
-      version = "1.1.0.1";
-      sha256 = "1sfcdhvb99yzmzsh63qdvghbjhd5r1g3bi6yyb432pdqnw9i4s9g";
-      revision = "1";
-      editedCabalFile = "10hvss36prs3mg3xi6czh41ajlbaiwsaq613jacp48d0hh7x7cxq";
+      version = "1.2.0.0";
+      sha256 = "1sxw1m4k8vwp0acdh5q1yrn6k68q7l75aa91qip2cvb0bwqkqsg1";
+      revision = "2";
+      editedCabalFile = "1hacq8s04g3jmm7q31008ab0xlf560byji66030xgplzcd34dc4g";
       libraryHaskellDepends = [
         base
         bytestring
         contra-tracer
+        deepseq
         io-classes
         network
         QuickCheck
@@ -709389,7 +715229,9 @@ self: {
       ];
       doHaddock = false;
       description = "A framework for strongly typed protocols";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -709466,7 +715308,7 @@ self: {
         typed-protocols
       ];
       description = "Derive documentation from typed-protocols source code";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "typed-protocols-doc-demo";
       broken = true;
@@ -709508,7 +715350,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "An efficient and versatile typed range library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -709547,7 +715389,7 @@ self: {
         template-haskell
       ];
       description = "typed session framework";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -709581,7 +715423,7 @@ self: {
         raw-strings-qq
       ];
       description = "Automatically generate status for typed-session";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -709953,7 +715795,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Plugin to faciliate type-level let";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -710261,7 +716103,7 @@ self: {
       ];
       doHaddock = false;
       description = "Efficient implementation of a dependent map with types as keys";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -710337,7 +716179,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -710429,7 +716271,7 @@ self: {
         text-show
       ];
       description = "Typelevel printf";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -710785,11 +716627,11 @@ self: {
         time
       ];
       description = "Parsing and evaluating typst syntax";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
-  typst_0_8_1 = callPackage (
+  typst_0_9 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -710819,8 +716661,10 @@ self: {
     }:
     mkDerivation {
       pname = "typst";
-      version = "0.8.1";
-      sha256 = "1234gmz8f4daj06dgfn7h3jrzbvv9dfxbpqsgqlhzm8zna1p7jgr";
+      version = "0.9";
+      sha256 = "11np3g5l6yqm33j4vkl65pfdcjs2dj7302lyyp9pq2i6lsi7kxmn";
+      revision = "1";
+      editedCabalFile = "1qyhvyfz9dizkclmc5jkq5cmdjms8qmsppy66qn7il2dz7aggbj2";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -710858,7 +716702,7 @@ self: {
         time
       ];
       description = "Parsing and evaluating typst syntax";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -710878,7 +716722,7 @@ self: {
         text
       ];
       description = "Symbol and emoji lookup for typst language";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -710897,7 +716741,7 @@ self: {
         text
       ];
       description = "Symbol and emoji lookup for typst language";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -711550,8 +717394,9 @@ self: {
         gauge
       ];
       description = "Unicode Character Database — Predicates on characters specified by Unicode";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -711582,7 +717427,7 @@ self: {
         containers
       ];
       description = "Datatype and parser for the Universal Configuration Language (UCL) using libucl";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -711963,6 +717808,40 @@ self: {
     }
   ) { };
 
+  uhd = callPackage (
+    {
+      mkDerivation,
+      base,
+      optparse-applicative,
+      time,
+      uhd,
+      vector,
+    }:
+    mkDerivation {
+      pname = "uhd";
+      version = "0.1.0.0";
+      sha256 = "10n9mqjar39a9m9dbxfiaj11y5fynzhlcjb6qshykqr2cxzdwbjc";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        time
+        vector
+      ];
+      librarySystemDepends = [ uhd ];
+      executableHaskellDepends = [
+        base
+        optparse-applicative
+        time
+        vector
+      ];
+      description = "Interface with Ettus USRP SDRs";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { inherit (pkgs) uhd; };
+
   uhexdump = callPackage (
     {
       mkDerivation,
@@ -712054,7 +717933,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Minimalistic console UI (getLine), arrow key support (edit, browse cmd history)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "example";
     }
   ) { };
@@ -712304,7 +718183,7 @@ self: {
         time
       ];
       description = "Implementation of ULID - Universally Unique Lexicographically Sortable Identifier";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ulid-exe";
     }
   ) { };
@@ -712352,7 +718231,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Another ULID implementation with tight memory representation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -712408,7 +718287,7 @@ self: {
         hspec
       ];
       description = "Bindings for libunac(3)";
-      license = lib.licensesSpdx."Unlicense";
+      license = lib.meta.getLicenseFromSpdxId "Unlicense";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -712720,7 +718599,7 @@ self: {
         unbound-generics
       ];
       description = "Unification based on unbound-generics";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -712877,7 +718756,7 @@ self: {
         vector
       ];
       description = "A library for reference cells backed by unboxed-vectors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
       broken = true;
@@ -712986,7 +718865,7 @@ self: {
       libraryHaskellDepends = [ base ];
       executableHaskellDepends = [ base ];
       description = "Customize uncaught exception handling";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       mainProgram = "uncaught-exception-demo";
     }
   ) { };
@@ -713073,7 +718952,7 @@ self: {
         unliftio
       ];
       description = "a library which implements easy, concurrent and pretty logging";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       mainProgram = "unclogging";
       maintainers = [ lib.maintainers.mangoiv ];
     }
@@ -713096,7 +718975,7 @@ self: {
         int-supply
       ];
       description = "Unconditional jumps";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -713213,7 +719092,7 @@ self: {
         transformers
       ];
       description = "Class of data structures that can be unfolded";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -713267,7 +719146,7 @@ self: {
         stm
       ];
       description = "Make any action thread safe";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -713613,7 +719492,7 @@ self: {
         text-icu
       ];
       description = "Haskell implementation of the Unicode Collation Algorithm";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -713644,7 +719523,7 @@ self: {
         tasty-bench
       ];
       description = "Access Unicode Character Database (UCD)";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -713673,7 +719552,7 @@ self: {
         tasty-bench
       ];
       description = "Access Unicode Character Database (UCD)";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -713711,7 +719590,7 @@ self: {
         unicode-data
       ];
       description = "Unicode characters names and aliases";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -713732,7 +719611,7 @@ self: {
         bytestring
       ];
       description = "Parsers for Unicode Character Database (UCD) files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -713761,7 +719640,7 @@ self: {
         tasty-bench
       ];
       description = "Unicode characters scripts";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -713794,7 +719673,7 @@ self: {
         tasty-bench
       ];
       description = "Unicode security mechanisms database";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -714023,7 +719902,7 @@ self: {
         text
       ];
       description = "Unicode normalization";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -714146,8 +720025,8 @@ self: {
     }:
     mkDerivation {
       pname = "unification-fd";
-      version = "0.12.0.2";
-      sha256 = "027vp4jqm0gn8za0y058idypnrcmk2c8byj6zfmd9zgs4imxp957";
+      version = "0.12.0.3";
+      sha256 = "0pj1rh5nw3p48lbnkdd58lnvvlc73k6j3qvs22wzgx5657f5cgn5";
       libraryHaskellDepends = [
         base
         containers
@@ -714156,7 +720035,7 @@ self: {
         mtl
       ];
       description = "Simple generic unification algorithms";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -714179,7 +720058,7 @@ self: {
         test-invariant
       ];
       description = "Pointless functions and a simplistic zero and monoid";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     }
   ) { };
 
@@ -714236,7 +720115,7 @@ self: {
         uniform-strings
       ];
       description = "Handling errors in the uniform framework";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     }
   ) { };
 
@@ -714316,7 +720195,7 @@ self: {
         zlib
       ];
       description = "Uniform file handling operations";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     }
   ) { };
 
@@ -714616,7 +720495,7 @@ self: {
         uniform-algebras
       ];
       description = "Manipulate and convert strings of characters uniformly and consistently";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     }
   ) { };
 
@@ -714645,7 +720524,7 @@ self: {
         uniform-strings
       ];
       description = "Time in the uniform framework";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     }
   ) { };
 
@@ -714723,7 +720602,7 @@ self: {
         uniform-time
       ];
       description = "A uniform base to build apps on";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
     }
   ) { };
 
@@ -714791,7 +720670,7 @@ self: {
         lens
       ];
       description = "Extensible type-safe unions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -714962,7 +720841,7 @@ self: {
         with-utf8
       ];
       description = "Union mount filesystem paths into Haskell datastructures";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -715107,7 +720986,7 @@ self: {
         transformers
       ];
       description = "Esoteric programming language where each number can only appear once";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "unique";
       broken = true;
@@ -715144,7 +721023,7 @@ self: {
         utility-ht
       ];
       description = "Solve simple simultaneous equations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -715182,7 +721061,7 @@ self: {
         utility-ht
       ];
       description = "Solve simple simultaneous equations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -715624,7 +721503,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Extensible typed Dimensions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -715887,7 +721766,7 @@ self: {
         universe-some
       ];
       description = "A class for finite and recursively enumerable types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -715919,7 +721798,7 @@ self: {
         QuickCheck
       ];
       description = "A class for finite and recursively enumerable types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -715940,7 +721819,7 @@ self: {
         universe-some
       ];
       description = "Universe instances for types from dependent-sum";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -715990,7 +721869,7 @@ self: {
         universe-base
       ];
       description = "Universe instances for types from selected extra packages";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -716036,7 +721915,7 @@ self: {
         universe-base
       ];
       description = "Instances of standard classes that are made possible by enumerations";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -716071,7 +721950,7 @@ self: {
         universe-base
       ];
       description = "Universe instances for Some from some";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -716184,7 +722063,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Custom prelude used in Serokell";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -716231,14 +722110,14 @@ self: {
     }:
     mkDerivation {
       pname = "unix-bytestring";
-      version = "0.4.0.3";
-      sha256 = "0y5nqdh79j5sf2w6v61gakazm45m1qyj5c8cf4b6qycjh31cv32l";
+      version = "0.4.0.4";
+      sha256 = "1km7a4nkiwayb1ckm66fkdx3984j7dxv3piibg2gb65wkvp9gix8";
       libraryHaskellDepends = [
         base
         bytestring
       ];
       description = "Unix/Posix-specific functions for ByteStrings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -716490,7 +722369,7 @@ self: {
         zenhack-prelude
       ];
       description = "Straightforward bindings to the posix API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -716674,7 +722553,7 @@ self: {
         unliftio
       ];
       description = "Unleash feature toggle client";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
     }
@@ -716722,7 +722601,7 @@ self: {
         text
       ];
       description = "Unleash feature toggle client core";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -716747,7 +722626,7 @@ self: {
         transformers-base
       ];
       description = "Typeclass for monads that can be unlifted to arbitrary base monads";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -716774,7 +722653,7 @@ self: {
         unliftio-core
       ];
       description = "(un)lifted classes and functions for the STM monad";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -716797,7 +722676,7 @@ self: {
         text-short
       ];
       description = "Unlifted and levity-polymorphic types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -717005,7 +722884,7 @@ self: {
         unliftio
       ];
       description = "Fast and robust message queues for concurrent processes";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "unliftio-messagebox-memleak-test";
       broken = true;
@@ -717081,7 +722960,7 @@ self: {
         unliftio-core
       ];
       description = "Use MonadUnliftIO on servant APIs";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -717552,7 +723431,7 @@ self: {
         quickcheck-classes
       ];
       description = "maybes of numeric values with fewer indirections";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -717573,7 +723452,7 @@ self: {
         text-short
       ];
       description = "optional text that unpacks well";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -717789,7 +723668,7 @@ self: {
         ghc
       ];
       description = "Unsatisfiable type class";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -717962,6 +723841,39 @@ self: {
     }
   ) { };
 
+  unwitch = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      ghc-bignum,
+      hspec,
+      hspec-core,
+      text,
+    }:
+    mkDerivation {
+      pname = "unwitch";
+      version = "2.1.0";
+      sha256 = "020jlm0jrnxfrnaw5dp5fa0hn52m9lyq6aqcyv2zjih3dz6867yn";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        ghc-bignum
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        ghc-bignum
+        hspec
+        hspec-core
+        text
+      ];
+      description = "converts between primitives";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
+    }
+  ) { };
+
   unwrapped-functors = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -717993,7 +723905,7 @@ self: {
         bifunctors
       ];
       description = "Unzip functions for general Traversable containers";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -718060,7 +723972,7 @@ self: {
         split
       ];
       description = "Command-line tool to generate paths for moving upward in a file system";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "up";
     }
@@ -719177,7 +725089,7 @@ self: {
         uri-encode
       ];
       description = "Encoding and decoding of URL slugs";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -719920,6 +725832,8 @@ self: {
       pname = "utc";
       version = "0.2.0.1";
       sha256 = "0vnydjjvv0kh1mww9vb9l90crl9ddd5n63dwpjjs8ln56b5yvv5h";
+      revision = "1";
+      editedCabalFile = "0qsz2b3ksqx2083yzaav8kds9pl9fmwlqp4j7yf3apr7vpg1gmm3";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -719969,8 +725883,9 @@ self: {
         gauge
       ];
       description = "UTF-8";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -720059,7 +725974,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Unicode";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -720169,8 +726084,6 @@ self: {
       ];
       description = "Utilities";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -720227,7 +726140,7 @@ self: {
         logict
       ];
       description = "See README for more info";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -720381,7 +726294,7 @@ self: {
         QuickCheck
       ];
       description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -720405,7 +726318,7 @@ self: {
         proto-lens-runtime
       ];
       description = "Generated code for a gRPC interface for UTxO Blockchains";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -720485,7 +726398,7 @@ self: {
         uuid
       ];
       description = "An SDK for clients of the UTxO RPC specification";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -720566,7 +726479,7 @@ self: {
         warp-grpc
       ];
       description = "An SDK for UTxO RPC services";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
     }
@@ -720790,7 +726703,7 @@ self: {
         text
       ];
       description = "utilities for parse errors";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -721293,7 +727206,7 @@ self: {
         text
       ];
       description = "Tweak .cabal files";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.berberman ];
       broken = true;
@@ -721724,7 +727637,7 @@ self: {
         text
       ];
       description = "Runs commands on remote machines using ssh";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -721747,6 +727660,7 @@ self: {
       description = "Type isomorphic to `Either` with `Applicative` instance which combines errors";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -721957,21 +727871,21 @@ self: {
       hedgehog,
       HUnit,
       lens,
+      selective,
       semigroupoids,
       semigroups,
     }:
     mkDerivation {
       pname = "validation";
-      version = "1.1.3";
-      sha256 = "159pvlzs5caabay4irs6dgrxpyhrcakyxqv7fvhs8cnarlafjhbv";
-      revision = "1";
-      editedCabalFile = "0lmrs8yrb075l91r7iq8yk7hy2scdd3z1335wmackhcfw8z5bp1z";
+      version = "1.1.5";
+      sha256 = "1xi4iynz82743zv5pyjd779y8qf1nzp5glmci5cxwndic6kxkp8k";
       libraryHaskellDepends = [
         assoc
         base
         bifunctors
         deepseq
         lens
+        selective
         semigroupoids
         semigroups
       ];
@@ -722041,7 +727955,7 @@ self: {
         text
       ];
       description = "Lighweight pure data validation based on Applicative and Selective functors";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -722554,33 +728468,6 @@ self: {
   ) { };
 
   valor = callPackage (
-    {
-      mkDerivation,
-      base,
-      doctest,
-      hspec,
-      hspec-discover,
-      QuickCheck,
-    }:
-    mkDerivation {
-      pname = "valor";
-      version = "1.0.0.0";
-      sha256 = "0ssdyy84xh68rxinp6i36zg7c3k10122b1l30q1qi8r10bvyg3r0";
-      libraryHaskellDepends = [ base ];
-      testHaskellDepends = [
-        base
-        doctest
-        hspec
-        QuickCheck
-      ];
-      testToolDepends = [ hspec-discover ];
-      doHaddock = false;
-      description = "Simple and powerful data validation";
-      license = lib.licensesSpdx."MIT";
-    }
-  ) { };
-
-  valor_1_0_0_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -722602,8 +728489,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Simple and powerful data validation";
-      license = lib.licensesSpdx."MIT";
-      hydraPlatforms = lib.platforms.none;
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -722730,7 +728616,7 @@ self: {
         stm
       ];
       description = "The VarMonad typeclass, generalizing types of references";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -722780,7 +728666,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Utilities for working with variadic functions using type-level lists";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -723012,7 +728898,7 @@ self: {
         QuickCheck
       ];
       description = "Variant and EADT";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -723069,7 +728955,7 @@ self: {
         QuickCheck
       ];
       description = "integer arithmetic codes";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -723194,7 +729080,7 @@ self: {
         unordered-containers
       ];
       description = "a persistent store for values of arbitrary types";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -723667,7 +729553,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Library for handling files ignored by VCS systems";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "ignore";
     }
   ) { };
@@ -723869,7 +729755,7 @@ self: {
         vector
       ];
       description = "Vec: length-indexed (sized) list";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -723894,7 +729780,7 @@ self: {
         vec
       ];
       description = "Vec: length-indexed (sized) list: lens support";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -723919,7 +729805,7 @@ self: {
         vec
       ];
       description = "Vec: length-indexed (sized) list: optics support";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -724065,7 +729951,7 @@ self: {
       ];
       doHaddock = false;
       description = "Efficient Arrays";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -724085,6 +729971,8 @@ self: {
       pname = "vector-algorithms";
       version = "0.9.1.0";
       sha256 = "1clfam0brcpjwpzz14di6d51nx5mnsk7sd9bd250srq2d1kp9dnj";
+      revision = "1";
+      editedCabalFile = "0bakvl54qag5m13ilrqxcv3wdrnb57c76vjmlh3a5v1sk3zgxv5k";
       libraryHaskellDepends = [
         base
         bitvec
@@ -724169,7 +730057,7 @@ self: {
         vector
       ];
       description = "Instances of Data.Binary for vector";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -724223,7 +730111,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Vector builder";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -724329,7 +730217,7 @@ self: {
         hedgehog-classes
       ];
       description = "circular vectors";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -724462,7 +730350,7 @@ self: {
       ];
       doHaddock = false;
       description = "Storable vectors with cpu-independent representation";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -724483,7 +730371,7 @@ self: {
         vector
       ];
       description = "Utilities for the \"vector\" library";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -724796,7 +730684,7 @@ self: {
       ];
       doHaddock = false;
       description = "Fast and flexible quicksort implementation for mutable vectors";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -724931,7 +730819,7 @@ self: {
         vector
       ];
       description = "Size tagged vectors";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -725263,7 +731151,7 @@ self: {
         vector
       ];
       description = "GIS Vector Tiles, as defined by Mapbox";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -725408,7 +731296,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "ASCII platform-adventure game";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "venzone";
     }
@@ -725573,6 +731461,7 @@ self: {
       license = lib.licenses.asl20;
       badPlatforms = [ "aarch64-linux" ];
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -725798,7 +731687,7 @@ self: {
         uuid
       ];
       description = "Small alternative prelude";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -725958,7 +731847,7 @@ self: {
         text
       ];
       description = "Types and parsers for software version numbers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -725992,7 +731881,7 @@ self: {
         tasty-hunit
       ];
       description = "Vertex enumeration";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -726098,7 +731987,7 @@ self: {
       ];
       doHaddock = false;
       description = "Array library monomorphized with backpack";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -726144,7 +732033,7 @@ self: {
         text
       ];
       description = "types for ingesting vflow data with aeson";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -726887,7 +732776,7 @@ self: {
         yaml
       ];
       description = "Frontend for video metadata tagging tools";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "vimeta";
     }
@@ -727230,7 +733119,7 @@ self: {
         vinyl
       ];
       description = "Syntax sugar for vinyl records using overloaded labels";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -727698,7 +733587,7 @@ self: {
         profunctors
       ];
       description = "Profunctor optics via the profunctor representation theorem";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -728298,6 +734187,82 @@ self: {
     }
   ) { };
 
+  vpn-router = callPackage (
+    {
+      mkDerivation,
+      base,
+      blaze-markup,
+      conduit,
+      conduit-extra,
+      network,
+      optparse-applicative,
+      QuickCheck,
+      regex-tdfa,
+      relude,
+      tagged,
+      tasty,
+      tasty-discover,
+      tasty-hunit,
+      tasty-quickcheck,
+      template-haskell,
+      trace-embrace,
+      typelits-printf,
+      unliftio,
+      wai,
+      yesod-core,
+    }:
+    mkDerivation {
+      pname = "vpn-router";
+      version = "0.0.1";
+      sha256 = "0rki9xx73vqzk9g7frrg60mnb7yshl10sb5f7jq2rlw7wvsalcxl";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        blaze-markup
+        conduit
+        conduit-extra
+        network
+        optparse-applicative
+        regex-tdfa
+        relude
+        tagged
+        template-haskell
+        trace-embrace
+        typelits-printf
+        unliftio
+        wai
+        yesod-core
+      ];
+      executableHaskellDepends = [
+        base
+        optparse-applicative
+        relude
+        tagged
+        unliftio
+        yesod-core
+      ];
+      testHaskellDepends = [
+        base
+        optparse-applicative
+        QuickCheck
+        relude
+        tagged
+        tasty
+        tasty-discover
+        tasty-hunit
+        tasty-quickcheck
+        unliftio
+        yesod-core
+      ];
+      testToolDepends = [ tasty-discover ];
+      description = "Switch VPN with web interface for LAN";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "vpn-router";
+    }
+  ) { };
+
   vpq = callPackage (
     {
       mkDerivation,
@@ -728330,6 +734295,7 @@ self: {
       description = "Priority queue based on vector";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -728631,7 +734597,7 @@ self: {
         vty-unix
       ];
       description = "Cross-platform support for Vty";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -728654,7 +734620,7 @@ self: {
         vty-unix
       ];
       description = "Cross-platform support for Vty";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -728877,7 +734843,7 @@ self: {
         vty
       ];
       description = "Unix backend for Vty";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "vty-unix-build-width-table";
     }
   ) { };
@@ -728929,7 +734895,7 @@ self: {
         Win32
       ];
       description = "Windows backend for Vty";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.windows;
     }
   ) { };
@@ -728981,7 +734947,7 @@ self: {
         Win32
       ];
       description = "Windows backend for Vty";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.windows;
       hydraPlatforms = lib.platforms.none;
     }
@@ -729004,8 +734970,8 @@ self: {
     }:
     mkDerivation {
       pname = "vulkan";
-      version = "3.26.4";
-      sha256 = "1s8gn6bnhxvbhwwscbh2x5fz2zvwqbgkhcz8pgx347lgcjzalc1r";
+      version = "3.26.6";
+      sha256 = "07ia7ay6bma4d2bgx40ial1nsgfhxy1lmvba8ax5xnd3lkkfgjsz";
       libraryHaskellDepends = [
         base
         bytestring
@@ -729023,7 +734989,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Bindings to the Vulkan graphics API";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = [
         "i686-linux"
         "armv7l-linux"
@@ -729563,18 +735529,18 @@ self: {
     {
       mkDerivation,
       base,
+      base64-bytestring,
       blaze-html,
       blaze-markup,
       bytestring,
       containers,
-      crypton,
+      cryptohash-md5,
       directory,
       file-embed,
       filepath,
       hspec,
       http-date,
       http-types,
-      memory,
       mime-types,
       mockery,
       old-locale,
@@ -729593,23 +735559,23 @@ self: {
     }:
     mkDerivation {
       pname = "wai-app-static";
-      version = "3.1.9";
-      sha256 = "0rjaivvfdpi512iik78hdhapngpikm8cgw5rzb0ax27ml56x8wxk";
+      version = "3.1.9.1";
+      sha256 = "0b5wlgl424rwlr68xdrj30jrw0x1gj3101xcf38b1flwl2ki7f0b";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
+        base64-bytestring
         blaze-html
         blaze-markup
         bytestring
         containers
-        crypton
+        cryptohash-md5
         directory
         file-embed
         filepath
         http-date
         http-types
-        memory
         mime-types
         old-locale
         optparse-applicative
@@ -729648,6 +735614,96 @@ self: {
     }
   ) { };
 
+  wai-app-static_3_2_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      base64-bytestring,
+      blaze-html,
+      blaze-markup,
+      bytestring,
+      containers,
+      cryptohash-md5,
+      directory,
+      file-embed,
+      filepath,
+      hspec,
+      http-date,
+      http-types,
+      mime-types,
+      mockery,
+      old-locale,
+      optparse-applicative,
+      template-haskell,
+      temporary,
+      text,
+      time,
+      transformers,
+      unix-compat,
+      unordered-containers,
+      wai,
+      wai-extra,
+      warp,
+      zlib,
+    }:
+    mkDerivation {
+      pname = "wai-app-static";
+      version = "3.2.1";
+      sha256 = "0x040ikyrwjiik1lds5q2bpaya3a8kfvyij0kjjljf0bdfl2dyr7";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        base64-bytestring
+        blaze-html
+        blaze-markup
+        bytestring
+        containers
+        cryptohash-md5
+        directory
+        file-embed
+        filepath
+        http-date
+        http-types
+        mime-types
+        old-locale
+        optparse-applicative
+        template-haskell
+        text
+        time
+        transformers
+        unix-compat
+        unordered-containers
+        wai
+        wai-extra
+        warp
+        zlib
+      ];
+      executableHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        bytestring
+        filepath
+        hspec
+        http-date
+        http-types
+        mime-types
+        mockery
+        temporary
+        text
+        transformers
+        unix-compat
+        wai
+        wai-extra
+        zlib
+      ];
+      description = "WAI application for static serving";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "warp";
+    }
+  ) { };
+
   wai-cli = callPackage (
     {
       mkDerivation,
@@ -729859,7 +735915,7 @@ self: {
         wai-extra
       ];
       description = "Encrypted cookies for WAI";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -729901,7 +735957,7 @@ self: {
         wai-extra
       ];
       description = "Cross-site request forgery protection for WAI";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -730526,7 +736582,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Wrap WAI applications to run on AWS Lambda";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -731956,7 +738012,7 @@ self: {
         warp-tls
       ];
       description = "WAI middleware that delegates handling of requests";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -732910,7 +738966,7 @@ self: {
         wai
       ];
       description = "Problem details middleware for WAI";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -732986,7 +739042,7 @@ self: {
         warp
       ];
       description = "See README for more info";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -733548,7 +739604,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "WAI middleware to automatically encrypt and sign cookies";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "waicookie-genkey";
       broken = true;
@@ -734073,7 +740129,7 @@ self: {
         criterion
       ];
       description = "A request rate limiting middleware using token buckets";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -734602,7 +740658,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Automatic type-safe conversion between Haskell data types using Template Haskell";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -734963,6 +741019,8 @@ self: {
       pname = "warp-quic";
       version = "0.0.3";
       sha256 = "0vbgbvkl5j8x0lrz568cd2viq0vl5dwzavfincz7a01v5w90qr9c";
+      revision = "1";
+      editedCabalFile = "05yxiyjz9xpirghjjsdwsrrqsxz4kn2dsx9wqyq4daj85pzm3pz2";
       libraryHaskellDepends = [
         base
         bytestring
@@ -735055,7 +741113,7 @@ self: {
         warp
       ];
       description = "Socket activation and other systemd integration for the Warp web server (WAI)";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "warp-systemd-example";
       maintainers = [ lib.maintainers.mpscholten ];
     }
@@ -735078,8 +741136,8 @@ self: {
       pname = "warp-tls";
       version = "3.4.13";
       sha256 = "0xxcd5202qcvd1jkiaj85gd8r3www3p7mxwf2j92awvg75jh9lsi";
-      revision = "1";
-      editedCabalFile = "09d5q913kc55i77qj0gfs7w5f4d1da4azp9ddlk112y3hzwkzp3x";
+      revision = "2";
+      editedCabalFile = "00ff52l030bhc49yclngjkn6p17zv28ycyxkdpmaiic1cipzbkaa";
       libraryHaskellDepends = [
         base
         bytestring
@@ -735451,7 +741509,7 @@ self: {
         text
       ];
       description = "WebAssembly Language Toolkit and Interpreter";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -735760,7 +741818,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Work with WAVE and RF64 files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -735955,7 +742013,7 @@ self: {
         uuid-types
       ];
       description = "Bidirectional URL path, URL query string and HTTP headers codecs";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -736001,7 +742059,7 @@ self: {
         process
       ];
       description = "Run a command on a specified directory";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "wd";
     }
   ) { };
@@ -736127,7 +742185,7 @@ self: {
         xml
       ];
       description = "Weather and related data info command-line tool";
-      license = lib.licensesSpdx."GPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "weatherhs";
     }
@@ -736157,7 +742215,7 @@ self: {
       ];
       doHaddock = false;
       description = "Compositional breadth-first walks";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -736177,7 +742235,7 @@ self: {
         some
       ];
       description = "Core definitions for weave";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -736238,7 +742296,7 @@ self: {
         time
       ];
       description = "Parsing/printing of persistent web cookies";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -736647,7 +742705,7 @@ self: {
         optparse-applicative
       ];
       description = "representations of a web page";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "web-rep-example";
     }
   ) { };
@@ -737049,7 +743107,7 @@ self: {
         text
       ];
       description = "Type-safe HTML and CSS";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -737100,7 +743158,7 @@ self: {
         text
       ];
       description = "Type-safe HTML and CSS with intuitive layouts and composable styles";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -737137,7 +743195,7 @@ self: {
         web-view
       ];
       description = "Build HTML tables using web-view and colonnade";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -737152,8 +743210,8 @@ self: {
     }:
     mkDerivation {
       pname = "web3";
-      version = "1.0.1.0";
-      sha256 = "09l820lmgyvfpiqc57qx1kc355lxjalb4ijbk4dv0qi8px9pasvz";
+      version = "1.1.0.0";
+      sha256 = "180kiv4jal2lx6b6wxgp6yq95s1ri8f1v3hr5kzq9hvs5zi64w8w";
       libraryHaskellDepends = [
         base
         web3-ethereum
@@ -737182,8 +743240,8 @@ self: {
     }:
     mkDerivation {
       pname = "web3-bignum";
-      version = "1.0.1.0";
-      sha256 = "1h0r9sw9i7p9k91rl461nx1hss8s1s8i9iwilmp2dy0k4f50rzps";
+      version = "1.1.0.0";
+      sha256 = "0f5gz2ii0535xivhzh9m6y00z1ym4ljajq95j0hpz8m5xpn38r9d";
       libraryHaskellDepends = [
         base
         cereal
@@ -737216,6 +743274,7 @@ self: {
       mkDerivation,
       aeson,
       base,
+      basement,
       bytestring,
       containers,
       crypton,
@@ -737225,22 +743284,25 @@ self: {
       hspec-expectations,
       memory,
       memory-hexstring,
+      scientific,
       text,
       uuid-types,
       vector,
     }:
     mkDerivation {
       pname = "web3-crypto";
-      version = "1.0.1.0";
-      sha256 = "0p5bg9riai1z6wsii4q1i5135v7lcbdgspkhwvacy57w7yda3kda";
+      version = "1.1.0.0";
+      sha256 = "0krcyg02kksqb1ag0k73q7khb3xlzl0b0k752g8c6swi5izbi7bc";
       libraryHaskellDepends = [
         aeson
         base
+        basement
         bytestring
         containers
         crypton
         memory
         memory-hexstring
+        scientific
         text
         uuid-types
         vector
@@ -737248,6 +743310,7 @@ self: {
       testHaskellDepends = [
         aeson
         base
+        basement
         bytestring
         containers
         crypton
@@ -737257,6 +743320,7 @@ self: {
         hspec-expectations
         memory
         memory-hexstring
+        scientific
         text
         uuid-types
         vector
@@ -737301,8 +743365,9 @@ self: {
     }:
     mkDerivation {
       pname = "web3-ethereum";
-      version = "1.0.1.0";
-      sha256 = "1cd69g5wp7faq9hz1kvwp15y3v0wc3h5cpq0vbdbbaq8q7xg09yy";
+      version = "1.1.0.1";
+      sha256 = "136ff9cfdp5rnzwy1z1n96qxggw9xbd3ykapiv1smb0n2sgf968y";
+      enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
         aeson-casing
@@ -737436,8 +743501,9 @@ self: {
     }:
     mkDerivation {
       pname = "web3-polkadot";
-      version = "1.0.1.0";
-      sha256 = "13bqv3npvqd93dqk7bxaqqfrzrn0q2ndsnlsc4awx0x5vssw0hdj";
+      version = "1.1.0.1";
+      sha256 = "0rsypasqrp5xai9fmnv2grxpmmy0rf5s0ks9d4719cbd64ygx1qn";
+      enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
         base
@@ -737511,8 +743577,8 @@ self: {
     }:
     mkDerivation {
       pname = "web3-provider";
-      version = "1.0.1.0";
-      sha256 = "1nmqsdcxh4cgdw0bpfaf9d64cnlwgg7qms66dfd3givwfb5bsb0d";
+      version = "1.1.0.0";
+      sha256 = "023nn40r60f7yywi3bg197vwhkajy5sah76swfyxjxkmdnlcxsb8";
       libraryHaskellDepends = [
         async
         base
@@ -737558,8 +743624,8 @@ self: {
     }:
     mkDerivation {
       pname = "web3-solidity";
-      version = "1.0.1.0";
-      sha256 = "1gy7w0cqxk2nzd5p1cncwv60ldm2g81ydyfmj0640h2h0v4d8r9k";
+      version = "1.1.0.0";
+      sha256 = "1fy3npxcan1k3izh5sqvcx9ldqfmpvm00f68h9n97jfs9hsvhzd5";
       libraryHaskellDepends = [
         aeson
         base
@@ -737645,6 +743711,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "Tools for working with Crypto/Web3";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -737905,7 +743972,7 @@ self: {
         validation
       ];
       description = "Relying party (server) implementation of the WebAuthn 2 specification";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -737977,7 +744044,7 @@ self: {
         wai
       ];
       description = "A super-simple web server framework";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -738033,7 +744100,7 @@ self: {
         tasty-hunit
       ];
       description = "Plug-n-play #hex-syntax for your colors";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -738467,7 +744534,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "A typed wrapper for W3C WebDriver protocol. A base for other libraries.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -738535,7 +744602,7 @@ self: {
       ];
       doHaddock = false;
       description = "A typed wrapper for W3C WebDriver (HTTP and BiDi) protocols";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -738785,7 +744852,7 @@ self: {
         zlib
       ];
       description = "Wrapper around the webdriver package that automatically manages Selenium";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -739081,7 +745148,7 @@ self: {
         wai-extra
       ];
       description = "Composable, type-safe library to build HTTP APIs";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -739132,7 +745199,7 @@ self: {
         wai-extra
       ];
       description = "Composable, type-safe library to build HTTP APIs";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -739168,7 +745235,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -739203,7 +745270,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -739276,7 +745343,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -739350,7 +745417,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -739384,7 +745451,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -739417,7 +745484,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -739447,7 +745514,7 @@ self: {
         webgear-core
       ];
       description = "Host swagger UI based on WebGear API specifications";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
     }
   ) { };
 
@@ -739476,7 +745543,7 @@ self: {
         webgear-core
       ];
       description = "Host swagger UI based on WebGear API specifications";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -739549,7 +745616,7 @@ self: {
         hspec
       ];
       description = "Haskell bindings to WebGPU Dawn for GPU computing and graphics";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -740559,7 +746626,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Detect dead code";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "weeder";
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -741064,7 +747131,7 @@ self: {
       ];
       doHaddock = false;
       description = "WGPU";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -741090,7 +747157,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ SDL2 ];
       description = "WGPU Raw";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -741249,7 +747316,7 @@ self: {
         versions
       ];
       description = "Solver-agnostic symbolic values support for issuing queries";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "quickstart";
     }
   ) { };
@@ -741410,7 +747477,7 @@ self: {
         versions
       ];
       description = "Solver-agnostic symbolic values support for issuing queries";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -741517,7 +747584,7 @@ self: {
         tasty-hunit
       ];
       description = "A compatibility layer for GHC's 'wherefrom' function";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -741545,7 +747612,7 @@ self: {
         tasty-hunit
       ];
       description = "A compatibility layer for GHC's 'wherefrom' function";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -741604,7 +747671,7 @@ self: {
         which
       ];
       description = "which-embed";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
     }
   ) { };
 
@@ -741849,6 +747916,8 @@ self: {
       pname = "wide-word";
       version = "0.1.9.0";
       sha256 = "1x4a42swszpfspqkdlfj1k7ifq1ia5ih3fmgmna74zbfajxwkpa6";
+      revision = "1";
+      editedCabalFile = "09p5v02b9ps0ncas3yk960k8d79myqsfpi8y3a23zgkf7r7vs7nq";
       libraryHaskellDepends = [
         base
         binary
@@ -741889,7 +747958,7 @@ self: {
         wide-word
       ];
       description = "Instances for wide-word";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -742606,7 +748675,7 @@ self: {
         unordered-containers
       ];
       description = "An implementation of the web Document Object Model, and its rendering";
-      license = lib.licensesSpdx."MPL-2.0";
+      license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -742715,7 +748784,7 @@ self: {
         X11
       ];
       description = "OS window icon/name utilities";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -743137,7 +749206,7 @@ self: {
         transformers
       ];
       description = "Convert values from one type into another";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -743328,7 +749397,7 @@ self: {
         vector
       ];
       description = "filterable traversable";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -743347,7 +749416,7 @@ self: {
         witherable
       ];
       description = "Witherable = Traversable + Filterable";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -743401,7 +749470,7 @@ self: {
         countable
       ];
       description = "values that witness types";
-      license = lib.licensesSpdx."BSD-2-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause";
     }
   ) { };
 
@@ -743610,7 +749679,7 @@ self: {
         text
       ];
       description = "A library for working with .wkt files.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -743865,6 +749934,7 @@ self: {
       barbies,
       base,
       bytestring,
+      crypton,
       deriving-aeson,
       hspec,
       hspec-discover,
@@ -743874,8 +749944,8 @@ self: {
     }:
     mkDerivation {
       pname = "wled-json";
-      version = "0.1.0.2";
-      sha256 = "0ny0cfpxznq34afh5wap09fki9aqjksfvyf6fldph591ngamhmkf";
+      version = "0.1.0.3";
+      sha256 = "10czvkfrmmpa9jwmpabna9yw75v72525z20l3k938zlqw6kik8bm";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -743883,6 +749953,7 @@ self: {
         barbies
         base
         bytestring
+        crypton
         deriving-aeson
         http-conduit
       ];
@@ -743898,7 +749969,59 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Convenient interface for interacting with WLED devices";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+    }
+  ) { };
+
+  wlsunset-sni = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      dbus,
+      gi-dbusmenu,
+      gi-gio,
+      gi-glib,
+      haskell-gi-base,
+      hslogger,
+      optparse-applicative,
+      process,
+      status-notifier-item,
+      stm,
+      text,
+      transformers,
+      unix,
+    }:
+    mkDerivation {
+      pname = "wlsunset-sni";
+      version = "0.1.0.0";
+      sha256 = "0r4skifnswd0z8gmvfnahh25pwfqkcd5zjkl979d6qj8yji682dw";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        bytestring
+        dbus
+        gi-dbusmenu
+        gi-gio
+        gi-glib
+        haskell-gi-base
+        hslogger
+        process
+        status-notifier-item
+        stm
+        text
+        transformers
+        unix
+      ];
+      executableHaskellDepends = [
+        base
+        hslogger
+        optparse-applicative
+      ];
+      description = "StatusNotifierItem tray icon for controlling wlsunset";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
+      mainProgram = "wlsunset-sni";
     }
   ) { };
 
@@ -744015,7 +750138,7 @@ self: {
       sha256 = "0f0pa2vlp56j35llhzq1qqkwkfpm7r96av8jw22jngd0kcpc185b";
       libraryHaskellDepends = [ base ];
       description = "Convenient typeclass for defining arbitrary-index enums";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -744246,7 +750369,7 @@ self: {
         weigh
       ];
       description = "treat integral types as arrays of smaller integral types";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -744266,7 +750389,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Compatibility shim for the Int/Word internal change in GHC 9.2";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -744293,7 +750416,7 @@ self: {
         typed-process
       ];
       description = "SoX for algorithmic composition with groups of notes liken to words";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -744305,7 +750428,7 @@ self: {
       sha256 = "0kpw4gmy4yvpmcvz1sk0nfr21f7zvv3fnd2k59zx1amx8n4c5s7n";
       libraryHaskellDepends = [ base ];
       description = "General datatypes for music creation for one instrument";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -744599,7 +750722,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Word8 set";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -744734,8 +750857,8 @@ self: {
     }:
     mkDerivation {
       pname = "wordify";
-      version = "0.5.0.0";
-      sha256 = "1az84h8c3n92b6y5ccq8mar18cbv1hqb76p37irn4a5lv2l05lsj";
+      version = "0.6.0.0";
+      sha256 = "16gqsp7krynnn35qvv821959yl5mh1lrhz7dxsfvdaib10cxfwlj";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -744834,7 +750957,7 @@ self: {
         vector
       ];
       description = "Command-line tool to get random words";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "wordlist";
       broken = true;
@@ -745413,7 +751536,7 @@ self: {
         transformers
       ];
       description = "LOGO-like Turtle graphics with a monadic interface";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -745557,7 +751680,7 @@ self: {
         xml-basic
       ];
       description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
     }
   ) { };
 
@@ -745804,7 +751927,6 @@ self: {
       doctest,
       exceptions,
       filepath,
-      ghc-prim,
       hashable,
       http-client,
       http-client-tls,
@@ -745835,8 +751957,8 @@ self: {
     }:
     mkDerivation {
       pname = "wreq";
-      version = "0.5.4.3";
-      sha256 = "00z6i4myg18bq15h9h889k7s9j5564cfjvzxd65i37dknwi2mpw6";
+      version = "0.5.4.4";
+      sha256 = "1j5s8k8z49rcpzs5mfs7afy15fanp2rw8g01b9s7adi2m57l3jv6";
       isLibrary = true;
       isExecutable = true;
       setupHaskellDepends = [
@@ -745855,7 +751977,6 @@ self: {
         containers
         crypton
         exceptions
-        ghc-prim
         hashable
         http-client
         http-client-tls
@@ -745905,7 +752026,7 @@ self: {
         vector
       ];
       description = "An easy-to-use HTTP client library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -745931,7 +752052,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Adaptation of the wreq library for the effectful ecosystem";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -747014,7 +753135,7 @@ self: {
         yaml
       ];
       description = "Unimportant Unix adminstration tool";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pao";
     }
@@ -747212,7 +753333,7 @@ self: {
         websockets
       ];
       description = "Secure WebSocket (WSS) clients";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -747644,8 +753765,8 @@ self: {
     }:
     mkDerivation {
       pname = "wyvern-diagrams";
-      version = "0.3.2.0";
-      sha256 = "0adpl9g87hn8ak29lakjzp2syhk3kaa23sxgwlgh0424fn8jms7f";
+      version = "0.4.1.0";
+      sha256 = "06vgmv4r9spq4q94paawyklm2h45aj330z75l7vkh889wma8g8jx";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -747661,9 +753782,7 @@ self: {
         unordered-containers
       ];
       executableHaskellDepends = [
-        array
         base
-        diagrams-lib
         diagrams-svg
         optparse-applicative
       ];
@@ -747674,7 +753793,7 @@ self: {
         HUnit
       ];
       description = "Simple flowchart diagrams. Inspired by DRAKON.";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "wyvern-diagrams";
       broken = true;
@@ -747861,6 +753980,8 @@ self: {
       pname = "x509-ocsp";
       version = "0.4.0.1";
       sha256 = "0pq1xxa5wl5gprkxjc31112mi9s8q4i5anr698hssziaglh4h13r";
+      revision = "2";
+      editedCabalFile = "19ikss9ln3y4jpwjx7jlqm7wrnhwdscm28z0ll9qa92snrw2vbkq";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         asn1-encoding
@@ -747882,36 +754003,38 @@ self: {
         pem
       ];
       description = "Basic X509 OCSP implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
-  x509-ocsp_0_4_1_0 = callPackage (
+  x509-ocsp_0_5_1_0 = callPackage (
     {
       mkDerivation,
       base,
       bytestring,
-      cryptohash-sha1,
+      crypton,
       crypton-asn1-encoding,
       crypton-asn1-types,
       crypton-pem,
       crypton-x509,
       crypton-x509-validation,
       HUnit,
+      ram,
     }:
     mkDerivation {
       pname = "x509-ocsp";
-      version = "0.4.1.0";
-      sha256 = "1yqggigc9anfmkpfg179i7mzh0jk9nyqrsw6kxhgl0qmrgmfh2jc";
+      version = "0.5.1.0";
+      sha256 = "1zmiz7pssxqk2zpcyh68c6yinl31k4021lcm7myyz71s5b3akcri";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         base
         bytestring
-        cryptohash-sha1
+        crypton
         crypton-asn1-encoding
         crypton-asn1-types
         crypton-x509
         crypton-x509-validation
+        ram
       ];
       testHaskellDepends = [
         base
@@ -747924,7 +754047,7 @@ self: {
         HUnit
       ];
       description = "Basic X509 OCSP implementation";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -748302,7 +754425,7 @@ self: {
         xcb-types
       ];
       description = "A cffi-based python binding for X";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "xcffibgen";
       broken = true;
@@ -748334,7 +754457,7 @@ self: {
         temporary
       ];
       description = "Cabal hooks for producing an XCFramework from a Haskell library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -748566,8 +754689,8 @@ self: {
     }:
     mkDerivation {
       pname = "xdg-desktop-entry";
-      version = "0.1.1.2";
-      sha256 = "185ngzawaxnd9vihd5879am0ifjnnnzjf77z4mx92p31mb341q6g";
+      version = "0.1.1.3";
+      sha256 = "0kbj76fxmkk4wc0rvw916kw6lryzjiw4m74cz9jhrwmgaap38z4b";
       libraryHaskellDepends = [
         base
         directory
@@ -748589,7 +754712,7 @@ self: {
         unix
       ];
       description = "Parse files conforming to the xdg desktop entry spec";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -749814,7 +755937,7 @@ self: {
         utility-ht
       ];
       description = "Basics for XML/HTML representation and processing";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -750150,7 +756273,7 @@ self: {
         text
       ];
       description = "Warm and fuzzy creation of XML documents";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -750544,7 +756667,7 @@ self: {
         xml-conduit
       ];
       description = "Lenses, traversals, and prisms for xml-conduit";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -750595,7 +756718,7 @@ self: {
         xml-conduit
       ];
       description = "Optics for xml-conduit";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -750666,7 +756789,7 @@ self: {
         xml-conduit
       ];
       description = "XML parser with informative error-reporting and simple API";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -750811,7 +756934,7 @@ self: {
         protolude
       ];
       description = "XML pretty printer";
-      license = lib.licensesSpdx."GPL-2.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "xml-prettify";
       broken = true;
@@ -751015,7 +757138,7 @@ self: {
         tasty-hunit
       ];
       description = "Parse XML from bytes";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -751229,7 +757352,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Utilities for dealing with Content-values of \"xml-types\"";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -751262,7 +757385,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ xmlsec1 ];
       description = "Verifying XML signatures";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -751639,7 +757762,7 @@ self: {
         unordered-containers
       ];
       description = "XML parser and renderer with HTML 5 quirks mode";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -751939,8 +758062,8 @@ self: {
     }:
     mkDerivation {
       pname = "xmonad";
-      version = "0.18.0";
-      sha256 = "1ysxxjkkx2l160nlj1h8ysxrfhxjlmbws2nm0wyiivmjgn20xs11";
+      version = "0.18.1";
+      sha256 = "1w51yza8rxcm97afyfdjvxhndn5fzizfmbs8h83sl0xc0hqmz2wq";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -752044,8 +758167,8 @@ self: {
     }:
     mkDerivation {
       pname = "xmonad-contrib";
-      version = "0.18.1";
-      sha256 = "0ck4hq9yhdzggrs3q4ji6nbg6zwhmhc0ckf9vr9d716d98h9swq5";
+      version = "0.18.2";
+      sha256 = "0kbaccm8nmx2yxg82yhniv0r87b6yw26qa6w5p83a38i86jfz0rd";
       libraryHaskellDepends = [
         base
         bytestring
@@ -752289,8 +758412,8 @@ self: {
     }:
     mkDerivation {
       pname = "xmonad-extras";
-      version = "0.17.2";
-      sha256 = "0rcvmd6m17n8pqi9ky29hd431iniq3vck08wjvyxxgfvq3m842i8";
+      version = "0.17.3";
+      sha256 = "0j88ziqzxra19hi72mlxhkq43j2a5f0kqd4p1vqr5vdx37wisd61";
       configureFlags = [
         "-f-with_hlist"
         "-fwith_parsec"
@@ -752610,7 +758733,7 @@ self: {
       ];
       doHaddock = false;
       description = "Text-based notification server for XMobar";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "echo";
@@ -752651,7 +758774,7 @@ self: {
         criterion
       ];
       description = "Efficient XOR masking";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
@@ -752713,7 +758836,7 @@ self: {
         Xorshift128Plus
       ];
       description = "Simple implementation of xorshift+ PRNG";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -753369,7 +759492,7 @@ self: {
         hedgehog
       ];
       description = "XTEA (eXtended Tiny Encryption Algorithm)";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -753490,7 +759613,7 @@ self: {
       tasty-bench,
       tasty-quickcheck,
       text,
-      xxHash,
+      xxhash,
     }:
     mkDerivation {
       pname = "xxhash-ffi";
@@ -753502,7 +759625,7 @@ self: {
         hashable
         text
       ];
-      libraryPkgconfigDepends = [ xxHash ];
+      libraryPkgconfigDepends = [ xxhash ];
       testHaskellDepends = [
         base
         bytestring
@@ -753520,9 +759643,9 @@ self: {
         tasty-bench
       ];
       description = "Bindings and high-level helpers for xxHash";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
-  ) { inherit (pkgs) xxHash; };
+  ) { inherit (pkgs) xxhash; };
 
   xz = callPackage (
     {
@@ -753557,7 +759680,7 @@ self: {
         tasty-quickcheck
       ];
       description = "LZMA/XZ compression and decompression";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) xz; };
 
@@ -753569,7 +759692,7 @@ self: {
       sha256 = "0q9cwdbqvc8i337gp9wmxbb79v8i2lasi39i92r42202m7mzsa79";
       doHaddock = false;
       description = "LZMA/XZ clibs";
-      license = lib.licensesSpdx."0BSD";
+      license = lib.meta.getLicenseFromSpdxId "0BSD";
     }
   ) { };
 
@@ -753771,7 +759894,7 @@ self: {
         higher-order-open-union
       ];
       description = "Yet Another heFTy-inspired Extensible Effect";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -753803,7 +759926,7 @@ self: {
         yaftee
       ];
       description = "Basic monads implemented on Yaftee";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -753838,7 +759961,7 @@ self: {
         yaftee-basic-monads
       ];
       description = "Conduit implemented on Yaftee";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -753888,7 +760011,7 @@ self: {
         yaftee-conduit
       ];
       description = "Yaftee Conduit tools for ByteString";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -753929,7 +760052,7 @@ self: {
         yaftee-conduit
       ];
       description = "Finger tree-based byte string tools for Yaftee Conduit";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -753967,7 +760090,7 @@ self: {
         yaftee-conduit
       ];
       description = "Mono traversable tools for Yaftee Conduit";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -755392,7 +761515,7 @@ self: {
         versions
       ];
       description = "Support for parsing and rendering YAML documents";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -755529,7 +761652,7 @@ self: {
         tasty-hunit
       ];
       description = "Flexible declarative YAML parsing toolkit";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -755695,7 +761818,7 @@ self: {
         vector
       ];
       description = "Haskell bindings for YAMLScript";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "yamlscript-test";
       broken = true;
@@ -756133,7 +762256,7 @@ self: {
         deepseq
       ];
       description = "Yet another records libraries";
-      license = lib.licensesSpdx."ISC";
+      license = lib.meta.getLicenseFromSpdxId "ISC";
     }
   ) { };
 
@@ -756399,7 +762522,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Yet another string interpolator";
-      license = lib.licensesSpdx."CC0-1.0";
+      license = lib.meta.getLicenseFromSpdxId "CC0-1.0";
     }
   ) { };
 
@@ -756531,7 +762654,7 @@ self: {
         doctest
       ];
       description = "Total recursion schemes";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -756616,7 +762739,7 @@ self: {
         doctest
       ];
       description = "Pattern functors and instances for types in the containers package";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -756690,7 +762813,7 @@ self: {
         yaya
       ];
       description = "Hedgehog testing support for the Yaya recursion scheme library";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -756764,7 +762887,7 @@ self: {
         doctest
       ];
       description = "QuickCheck testing support for the Yaya recursion scheme library";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -756827,7 +762950,7 @@ self: {
         yaya-hedgehog
       ];
       description = "Test suites for `yaya`";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -756871,7 +762994,7 @@ self: {
         yaya-hedgehog
       ];
       description = "Non-total extensions to the Yaya recursion scheme library";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -756943,7 +763066,7 @@ self: {
         yaya-unsafe
       ];
       description = "Test suites for `yaya-unsafe`";
-      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -758663,7 +764786,7 @@ self: {
         yesod-form
       ];
       description = "A yesod-auth plugin for multi-tenant SSO via OpenID Connect";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -758831,7 +764954,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Traditional email/pass auth for Yesod";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       platforms = lib.platforms.x86;
       mainProgram = "yesod-auth-simple-test";
     }
@@ -759100,7 +765223,7 @@ self: {
         yesod-elements
       ];
       description = "Helper functions for using yesod with colonnade";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -759260,6 +765383,7 @@ self: {
       cookie,
       data-default,
       deepseq,
+      encoding,
       entropy,
       fast-logger,
       gauge,
@@ -759295,8 +765419,8 @@ self: {
     }:
     mkDerivation {
       pname = "yesod-core";
-      version = "1.6.28.1";
-      sha256 = "072cj4kpv785y96d1y769fadgihw2pn0hz3bqhahin60lqq5bkwi";
+      version = "1.6.29.1";
+      sha256 = "140mds5yaw58asxrmx251y2ydsd90c1m4svhy5qzymdmfjqb5932";
       libraryHaskellDepends = [
         aeson
         attoparsec-aeson
@@ -759314,6 +765438,7 @@ self: {
         cookie
         data-default
         deepseq
+        encoding
         entropy
         fast-logger
         http-types
@@ -759349,6 +765474,7 @@ self: {
         conduit-extra
         containers
         cookie
+        encoding
         hspec
         hspec-expectations
         http-types
@@ -760012,8 +766138,8 @@ self: {
     }:
     mkDerivation {
       pname = "yesod-form";
-      version = "1.7.9";
-      sha256 = "1s59d3ccf76dmi43ivcfzbah9b0y18i9c3gv66dmcwy5f6wqhd52";
+      version = "1.7.9.2";
+      sha256 = "1v514nc95x7wb16va623k91k4df89yyspkyz6xv23b74bqngv9cf";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -762391,7 +768517,7 @@ self: {
         yesod-static
       ];
       description = "A streamly-based library providing performance-focused alternatives for functionality found in yesod-static";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -763039,7 +769165,7 @@ self: {
         void
       ];
       description = "Yet Another Logger";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       mainProgram = "example";
     }
   ) { };
@@ -764321,7 +770447,7 @@ self: {
         random
         text
       ];
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       mainProgram = "yiyd";
     }
   ) { };
@@ -764352,7 +770478,7 @@ self: {
         template-haskell
       ];
       description = "try hackage";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "yj-sandbox-exe";
     }
   ) { };
@@ -764551,7 +770677,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Bindings to Facebook's Yoga layout library";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -764662,7 +770788,7 @@ self: {
         text
       ];
       description = "Yosys RTL Intermediate Language";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -764821,7 +770947,7 @@ self: {
         yaml
       ];
       description = "Builds a static website from templates and data in YAML or CSV files";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
       mainProgram = "yst";
     }
   ) { };
@@ -765788,7 +771914,7 @@ self: {
       editedCabalFile = "0sj45k2v33x3312yz1bdbck2bcv5q64mh7v7xy35ghp72ynw1z8z";
       libraryHaskellDepends = [ base ];
       description = "@zenhack's personal custom prelude";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
     }
   ) { };
 
@@ -765893,7 +772019,7 @@ self: {
       ];
       doHaddock = false;
       description = "Zeolite is a statically-typed, general-purpose programming language";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -766538,7 +772664,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Command-line utility for working with zettelkast files";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "zettelkast";
       broken = true;
@@ -766578,7 +772704,7 @@ self: {
         tasty-hedgehog
       ];
       description = "Polysemy effects for testing";
-      license = lib.licensesSpdx."BSD-2-Clause-Patent";
+      license = lib.meta.getLicenseFromSpdxId "BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -766902,7 +773028,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Zigzag encoding of integers into unsigned integers";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -766993,7 +773119,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Typed templates with jinja like syntax";
-      license = lib.licensesSpdx."GPL-2.0-or-later";
+      license = lib.meta.getLicenseFromSpdxId "GPL-2.0-or-later";
     }
   ) { };
 
@@ -767111,7 +773237,7 @@ self: {
         time
       ];
       description = "Operations on zip archives";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       mainProgram = "haskell-zip-app";
       maintainers = [ lib.maintainers.mpscholten ];
     }
@@ -767699,7 +773825,7 @@ self: {
         tasty-quickcheck
       ];
       description = "zlib compression bindings";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -767711,7 +773837,7 @@ self: {
       sha256 = "153aldw8vqy6wzz7knbzyfkxsr3gsv5hjf4y84s12ifx2fi8zfkn";
       doHaddock = false;
       description = "zlib C library bits";
-      license = lib.licensesSpdx."Zlib";
+      license = lib.meta.getLicenseFromSpdxId "Zlib";
     }
   ) { };
 
@@ -767768,7 +773894,7 @@ self: {
         tools-yj
       ];
       description = "Thin wrapper for zlib";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { inherit (pkgs) zlib; };
 
@@ -767868,7 +773994,7 @@ self: {
         zlib-core
       ];
       description = "Zlib wrapper built on Yaftee";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
     }
   ) { };
 
@@ -768341,7 +774467,7 @@ self: {
         Z-Data
       ];
       description = "A haskell binding to Apache Zookeeper C library(mt) using Haskell Z project";
-      license = lib.licensesSpdx."BSD-3-Clause";
+      license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) zookeeper_mt; };
@@ -768865,7 +774991,7 @@ self: {
         tasty-hunit
       ];
       description = "A zuul client library";
-      license = lib.licensesSpdx."Apache-2.0";
+      license = lib.meta.getLicenseFromSpdxId "Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "zuul-cli";
       broken = true;
@@ -768875,28 +775001,48 @@ self: {
   zwirn = callPackage (
     {
       mkDerivation,
+      aeson,
       alex,
       array,
       base,
       bytestring,
+      conferer,
+      conferer-yaml,
       containers,
+      criterion,
+      deepseq,
+      directory,
+      easyplot,
       exceptions,
+      file-io,
       filepath,
       happy,
+      haskeline,
+      hmt,
       hosc,
+      lens,
+      lsp,
       mtl,
       network,
-      pretty,
+      prettyprinter,
+      pure-noise,
+      random,
+      stm,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      tasty-smallcheck,
       text,
+      text-rope,
       tidal-link,
-      zwirn-core,
+      utf8-string,
     }:
     mkDerivation {
       pname = "zwirn";
-      version = "0.1.0.0";
-      sha256 = "0aq53m9clg5xc745xl7fnm6x5m4igwvxnbzpp3d5fc4mj92vsc96";
-      revision = "1";
-      editedCabalFile = "18ciy6ycv90jxs09ywizlwx609rkwf0pchqqijbn6mg9xd4jbnwm";
+      version = "0.2.2.0";
+      sha256 = "1sxb21fz53h5l6hm1lab9w7y4j3k8i1cg9ccbyq10hqgj84xdkvc";
+      isLibrary = false;
+      isExecutable = true;
       libraryHaskellDepends = [
         array
         base
@@ -768904,20 +775050,58 @@ self: {
         containers
         exceptions
         filepath
+        hmt
         hosc
         mtl
         network
-        pretty
+        prettyprinter
+        pure-noise
+        random
+        stm
         text
         tidal-link
-        zwirn-core
       ];
       libraryToolDepends = [
         alex
         happy
       ];
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        conferer
+        conferer-yaml
+        containers
+        directory
+        easyplot
+        exceptions
+        file-io
+        filepath
+        haskeline
+        lens
+        lsp
+        mtl
+        text
+        text-rope
+        tidal-link
+        utf8-string
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        tasty-smallcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        deepseq
+      ];
+      doHaddock = false;
       description = "a live coding language for playing with nested functions of time";
-      license = lib.licensesSpdx."GPL-3.0-only";
+      license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -769017,7 +775201,7 @@ self: {
         zxcvbn-hs
       ];
       description = "Password strength estimation based on zxcvbn";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -769127,7 +775311,7 @@ self: {
         zlib
       ];
       description = "Password strength estimation based on zxcvbn";
-      license = lib.licensesSpdx."MIT";
+      license = lib.meta.getLicenseFromSpdxId "MIT";
       mainProgram = "zxcvbn-example";
     }
   ) { };
diff --git a/pkgs/development/haskell-modules/patches/basement-add-cast.patch b/pkgs/development/haskell-modules/patches/basement-add-cast.patch
new file mode 100644
index 000000000000..1dd4fb559989
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/basement-add-cast.patch
@@ -0,0 +1,13 @@
+diff --git a/Basement/Terminal/Size.hsc b/Basement/Terminal/Size.hsc
+index 62c315e..4bfe0ad 100644
+--- a/Basement/Terminal/Size.hsc
++++ b/Basement/Terminal/Size.hsc
+@@ -121,7 +121,7 @@ instance Storable ConsoleScreenBufferInfo where
+         #{poke CONSOLE_SCREEN_BUFFER_INFO, dwMaximumWindowSize} ptr m
+     
+ invalidHandleValue :: IntPtr
+-invalidHandleValue = #{const INVALID_HANDLE_VALUE}
++invalidHandleValue = IntPtr $ #{const (long long int)INVALID_HANDLE_VALUE}
+ 
+ stdOutputHandle :: CULong
+ stdOutputHandle = #{const STD_OUTPUT_HANDLE}
diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index 7fcbd33c8c8c..9614575f2620 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 genericBuilder:
 
 genericBuilder {
-  version = "27.3.4.10";
-  hash = "sha256-x1f9r1t5Ckk+AVn2P372aWLoDtgqZzNIeOuzjI6hm+g=";
+  version = "27.3.4.11";
+  hash = "sha256-yOgsaeUv6GwFX6qPVb28zet6Hli5vg/PZCKW2s2/JEA=";
 }
diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix
index d373f3a2f6cf..544fdabf13b3 100644
--- a/pkgs/development/interpreters/erlang/28.nix
+++ b/pkgs/development/interpreters/erlang/28.nix
@@ -1,6 +1,6 @@
 genericBuilder:
 
 genericBuilder {
-  version = "28.4.2";
-  hash = "sha256-Xf7FN+LmoVHAfW1tO9XkBcBPsuLb7R7yrSLmiFTsXe8=";
+  version = "28.5";
+  hash = "sha256-A4gIjfWsrfZR89xNWyynTAdJtGj6ZWth3xIQBMLqcpc=";
 }
diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/pkgs/development/interpreters/lua-5/wrap.sh
index 47b82279c17c..13d6dd6c625c 100644
--- a/pkgs/development/interpreters/lua-5/wrap.sh
+++ b/pkgs/development/interpreters/lua-5/wrap.sh
@@ -31,13 +31,15 @@ wrapLuaProgramsIn() {
     if head -n1 "$f" | grep -q '#!.*'; then
         # Cross-compilation hack: exec '/nix/store/...-lua-.../bin/lua' execute
         # the host lua
+        # NOTE: We don't --replace-fail, because this hook is also used
+        # on Lua packages' wrapped binaries.
         substituteInPlace "$f" \
-          --replace-fail "@luaBuild@" "@luaHost@"
+          --replace-quiet "@luaBuild@" "@luaHost@"
         # Build platform's Luarocks writes scripts that reference luarocks
         # itself in them, so we fix these references to reference the host
         # platform's luarocks.
         substituteInPlace "$f" \
-          --replace-fail "@luarocksBuild@" "@luarocksHost@"
+          --replace-quiet "@luarocksBuild@" "@luarocksHost@"
     fi
 
     # wrapProgram creates the executable shell script described
@@ -60,7 +62,7 @@ wrapLuaProgramsIn() {
 
     # Same as above, but now for the wrapper script
     substituteInPlace "$f" \
-      --replace-fail "@luarocksBuild@" "@luarocksHost@"
+      --replace-quiet "@luarocksBuild@" "@luarocksHost@"
 
   done
 }
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 62a699d02483..e9b414ebb8db 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -427,7 +427,7 @@ stdenv.mkDerivation (finalAttrs: {
     # backport fix for https://github.com/python/cpython/issues/95855
     ./platform-triplet-detection.patch
   ]
-  ++ optionals (static && pythonAtLeast "3.14") [
+  ++ optionals (pythonAtLeast "3.14") [
     # https://github.com/python/cpython/issues/146264
     # https://github.com/python/cpython/pull/146265
     ./3.14/hacl-static-ldeps-for-static-modules.patch
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 042fd47e8661..5f4ac7b84645 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -112,6 +112,9 @@ lib.extendMkDerivation {
     "dependencies"
     "optional-dependencies"
     "build-system"
+
+    # Deprecated arguments
+    "pytestFlagsArray"
   ];
 
   extendDrvArgs =
@@ -418,7 +421,12 @@ lib.extendMkDerivation {
           optional-dependencies
           ;
         updateScript = nix-update-script { };
+        # __stdenvPythonCompat[Pos] attributes are here for overrideStdenvCompat in `python-packages-base.nix` to work.
+        # They are internal and subject to changes.
+        # TODO(@ShamrockLee): Remove when overrideStdenvCompat gets removed.
         ${if attrs ? stdenv then "__stdenvPythonCompat" else null} = attrs.stdenv;
+        ${if attrs ? stdenv then "__stdenvPythonCompatPos" else null} =
+          builtins.unsafeGetAttrPos "stdenv" attrs;
       }
       // attrs.passthru or { };
 
@@ -434,6 +442,19 @@ lib.extendMkDerivation {
       # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`.
       installCheckPhase = attrs.checkPhase;
     }
+    // (
+      let
+        deprecatedFlagNotEmpty =
+          attrs ? pytestFlagsArray && attrs.pytestFlagsArray != null && attrs.pytestFlagsArray != [ ];
+        pos = builtins.unsafeGetAttrPos "pytestFlagsArray" attrs;
+      in
+      {
+        ${if deprecatedFlagNotEmpty then "pytestFlagsArray" else null} = throw ''
+          buildPythonPackage: Deprecated flag pytestFlagsArray found at ${pos.file}:${toString pos.line}
+            Use pytestFlags or (enabled|disabled)(TestPaths|Tests|TestMarks) instead.
+        '';
+      }
+    )
     //
       lib.mapAttrs
         (
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index bee93cf1451f..df4de47e13f2 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -390,7 +390,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://www.pypy.org/";
-    changelog = "https://doc.pypy.org/en/stable/release-v${version}.html";
+    changelog = "https://doc.pypy.org/release-v${version}.html";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     mainProgram = "pypy";
     license = lib.licenses.mit;
diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
index 6fbeb7301215..aeb5582e4c8b 100644
--- a/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -24,10 +24,24 @@ let
       let
         result = f origArgs;
         overrideWith =
+          # Preserve the plain arguments whenever possible,
+          # as `overrideStdenvCompat` works more reliably with `args.stdenv`
+          # than `result.__stdenvPythonCompat`.
+          # TODO(@ShamrockLee): After `overrideStdenvCompat` is fully deprecated,
+          # simplify as
+          # ```nix
+          # newArgs: lib.extends (lib.toExtension newArgs) origArgs
+          # ```
           if lib.isFunction origArgs then
-            newArgs: lib.extends (_: lib.toFunction newArgs) origArgs
+            newArgs: lib.extends (lib.toExtension newArgs) origArgs
           else
-            newArgs: origArgs // lib.toFunction newArgs origArgs;
+            newArgs:
+            if !(lib.isFunction newArgs) then
+              origArgs // newArgs
+            else if !(lib.isFunction (newArgs origArgs)) then
+              origArgs // newArgs origArgs
+            else
+              finalAttrs: origArgs // newArgs finalAttrs origArgs;
       in
       if lib.isAttrs result then
         result
@@ -55,24 +69,29 @@ let
         args:
         let
           result = f args;
-          getName = x: x.pname or (lib.getName (x.name or "<unnamed>"));
-          applyMsgStdenvArg =
-            name:
-            lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511) ''
-              ${name}: Passing `stdenv` directly to `buildPythonPackage` or `buildPythonApplication` is deprecated. You should use their `.override` function instead, e.g:
-                buildPythonPackage.override { stdenv = customStdenv; } { }
-            '';
+          handleStdenvArg =
+            attrs: attrName:
+            let
+              name = attrs.pname or (lib.getName (attrs.name or "<unnamed>"));
+              pos = attrs.__stdenvPythonCompatPos or (builtins.unsafeGetAttrPos attrName attrs);
+              msg = [
+                "${name}: Passing `stdenv` directly to `buildPythonPackage` or `buildPythonApplication` is deprecated. You should use their `.override` function instead, e.g:"
+                "  buildPythonPackage.override { stdenv = customStdenv; } { }"
+              ]
+              ++ lib.optionals (pos != null) [
+                "`stdenv` argument found at ${pos.file}:${toString pos.line}"
+              ];
+            in
+            lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511) (lib.concatLines msg) attrs.${attrName};
         in
         if lib.isFunction args && result ? __stdenvPythonCompat then
           # Less reliable, as constructing with the wrong `stdenv` might lead to evaluation errors in the package definition.
-          f'.override { stdenv = applyMsgStdenvArg (getName result) result.__stdenvPythonCompat; } (
+          f'.override { stdenv = handleStdenvArg result "__stdenvPythonCompat"; } (
             finalAttrs: removeAttrs (args finalAttrs) [ "stdenv" ]
           )
         else if (!lib.isFunction args) && (args ? stdenv) then
           # More reliable, but only works when args is not `(finalAttrs: { })`
-          f'.override { stdenv = applyMsgStdenvArg (getName args) args.stdenv; } (
-            removeAttrs args [ "stdenv" ]
-          )
+          f'.override { stdenv = handleStdenvArg args "stdenv"; } (removeAttrs args [ "stdenv" ])
         else
           result
       )
diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
index 817225bcc47c..e6e660d704e5 100644
--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
@@ -27,278 +27,298 @@
   eggBuildHook,
   eggInstallHook,
 }:
+lib.extendMkDerivation {
+  constructDrv = stdenv.mkDerivation;
 
-{
-  name ? "${attrs.pname}-${attrs.version}",
-
-  # Build-time dependencies for the package
-  nativeBuildInputs ? [ ],
-
-  # Run-time dependencies for the package
-  buildInputs ? [ ],
-
-  # Dependencies needed for running the checkPhase.
-  # These are added to buildInputs when doCheck = true.
-  checkInputs ? [ ],
-  nativeCheckInputs ? [ ],
-
-  # propagate build dependencies so in case we have A -> B -> C,
-  # C can import package A propagated by B
-  propagatedBuildInputs ? [ ],
-
-  # DEPRECATED: use propagatedBuildInputs
-  pythonPath ? [ ],
-
-  # Enabled to detect some (native)BuildInputs mistakes
-  strictDeps ? true,
-
-  outputs ? [ "out" ],
-
-  # used to disable derivation, useful for specific python versions
-  disabled ? false,
-
-  # Raise an error if two packages are installed with the same name
-  # TODO: For cross we probably need a different PYTHONPATH, or not
-  # add the runtime deps until after buildPhase.
-  catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform),
-
-  # Additional arguments to pass to the makeWrapper function, which wraps
-  # generated binaries.
-  makeWrapperArgs ? [ ],
-
-  # Skip wrapping of python programs altogether
-  dontWrapPythonPrograms ? false,
-
-  # Don't use Pip to install a wheel
-  # Note this is actually a variable for the pipInstallPhase in pip's setupHook.
-  # It's included here to prevent an infinite recursion.
-  dontUsePipInstall ? false,
-
-  # Skip setting the PYTHONNOUSERSITE environment variable in wrapped programs
-  permitUserSite ? false,
-
-  # Remove bytecode from bin folder.
-  # When a Python script has the extension `.py`, bytecode is generated
-  # Typically, executables in bin have no extension, so no bytecode is generated.
-  # However, some packages do provide executables with extensions, and thus bytecode is generated.
-  removeBinBytecode ? true,
-
-  # Several package formats are supported.
-  # "setuptools" : Install a common setuptools/distutils based package. This builds a wheel.
-  # "wheel" : Install from a pre-compiled wheel.
-  # "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel.
-  # "egg": Install a package from an egg.
-  # "other" : Provide your own buildPhase and installPhase.
-  format ? "setuptools",
-
-  meta ? { },
-
-  passthru ? { },
-
-  doCheck ? true,
-
-  disabledTestPaths ? [ ],
-
-  ...
-}@attrs:
-
-let
-  withDistOutput = lib.elem format [
-    "pyproject"
-    "setuptools"
-    "wheel"
+  excludeDrvArgNames = [
+    "disabled"
+    "checkPhase"
+    "checkInputs"
+    "nativeCheckInputs"
+    "doCheck"
+    "doInstallCheck"
+    "dontWrapPythonPrograms"
+    "catchConflicts"
+    "format"
+    "disabledTestPaths"
   ];
 
-  name_ = name;
+  extendDrvArgs =
+    finalAttrs:
+    {
+      name ? "${attrs.pname}-${attrs.version}",
+
+      # Build-time dependencies for the package
+      nativeBuildInputs ? [ ],
+
+      # Run-time dependencies for the package
+      buildInputs ? [ ],
+
+      # Dependencies needed for running the checkPhase.
+      # These are added to buildInputs when doCheck = true.
+      checkInputs ? [ ],
+      nativeCheckInputs ? [ ],
+
+      # propagate build dependencies so in case we have A -> B -> C,
+      # C can import package A propagated by B
+      propagatedBuildInputs ? [ ],
+
+      # DEPRECATED: use propagatedBuildInputs
+      pythonPath ? [ ],
+
+      # Enabled to detect some (native)BuildInputs mistakes
+      strictDeps ? true,
+
+      outputs ? [ "out" ],
+
+      # used to disable derivation, useful for specific python versions
+      disabled ? false,
+
+      # Raise an error if two packages are installed with the same name
+      # TODO: For cross we probably need a different PYTHONPATH, or not
+      # add the runtime deps until after buildPhase.
+      catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform),
+
+      # Additional arguments to pass to the makeWrapper function, which wraps
+      # generated binaries.
+      makeWrapperArgs ? [ ],
+
+      # Skip wrapping of python programs altogether
+      dontWrapPythonPrograms ? false,
+
+      # Don't use Pip to install a wheel
+      # Note this is actually a variable for the pipInstallPhase in pip's setupHook.
+      # It's included here to prevent an infinite recursion.
+      dontUsePipInstall ? false,
+
+      # Skip setting the PYTHONNOUSERSITE environment variable in wrapped programs
+      permitUserSite ? false,
+
+      # Remove bytecode from bin folder.
+      # When a Python script has the extension `.py`, bytecode is generated
+      # Typically, executables in bin have no extension, so no bytecode is generated.
+      # However, some packages do provide executables with extensions, and thus bytecode is generated.
+      removeBinBytecode ? true,
+
+      # Several package formats are supported.
+      # "setuptools" : Install a common setuptools/distutils based package. This builds a wheel.
+      # "wheel" : Install from a pre-compiled wheel.
+      # "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel.
+      # "egg": Install a package from an egg.
+      # "other" : Provide your own buildPhase and installPhase.
+      format ? "setuptools",
+
+      meta ? { },
+
+      passthru ? { },
+
+      doCheck ? true,
+
+      disabledTestPaths ? [ ],
+
+      ...
+    }@attrs:
 
-  validatePythonMatches =
-    attrName:
     let
-      isPythonModule =
-        drv:
-        # all pythonModules have the pythonModule attribute
-        (drv ? "pythonModule")
-        # Some pythonModules are turned in to a pythonApplication by setting the field to false
-        && (!builtins.isBool drv.pythonModule);
-      isMismatchedPython = drv: drv.pythonModule != python;
+      withDistOutput = lib.elem format [
+        "pyproject"
+        "setuptools"
+        "wheel"
+      ];
 
-      optionalLocation =
+      name_ = name;
+
+      validatePythonMatches =
+        attrName:
         let
-          pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs;
+          isPythonModule =
+            drv:
+            # all pythonModules have the pythonModule attribute
+            (drv ? "pythonModule")
+            # Some pythonModules are turned in to a pythonApplication by setting the field to false
+            && (!builtins.isBool drv.pythonModule);
+          isMismatchedPython = drv: drv.pythonModule != python;
+
+          optionalLocation =
+            let
+              pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs;
+            in
+            lib.optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}";
+
+          leftPadName =
+            name: against:
+            let
+              len = lib.max (lib.stringLength name) (lib.stringLength against);
+            in
+            lib.strings.fixedWidthString len " " name;
+
+          throwMismatch =
+            drv:
+            let
+              myName = "'${namePrefix}${name}'";
+              theirName = "'${drv.name}'";
+            in
+            throw ''
+              Python version mismatch in ${myName}:
+
+              The Python derivation ${myName} depends on a Python derivation
+              named ${theirName}, but the two derivations use different versions
+              of Python:
+
+                  ${leftPadName myName theirName} uses ${python}
+                  ${leftPadName theirName myName} uses ${toString drv.pythonModule}
+
+              Possible solutions:
+
+                * If ${theirName} is a Python library, change the reference to ${theirName}
+                  in the ${attrName} of ${myName} to use a ${theirName} built from the same
+                  version of Python
+
+                * If ${theirName} is used as a tool during the build, move the reference to
+                  ${theirName} in ${myName} from ${attrName} to nativeBuildInputs
+
+                * If ${theirName} provides executables that are called at run time, pass its
+                  bin path to makeWrapperArgs:
+
+                      makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${lib.getName drv} ] }" ];
+
+              ${optionalLocation}
+            '';
+
+          checkDrv = drv: if (isPythonModule drv) && (isMismatchedPython drv) then throwMismatch drv else drv;
+
         in
-        lib.optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}";
-
-      leftPadName =
-        name: against:
-        let
-          len = lib.max (lib.stringLength name) (lib.stringLength against);
-        in
-        lib.strings.fixedWidthString len " " name;
-
-      throwMismatch =
-        drv:
-        let
-          myName = "'${namePrefix}${name}'";
-          theirName = "'${drv.name}'";
-        in
-        throw ''
-          Python version mismatch in ${myName}:
-
-          The Python derivation ${myName} depends on a Python derivation
-          named ${theirName}, but the two derivations use different versions
-          of Python:
-
-              ${leftPadName myName theirName} uses ${python}
-              ${leftPadName theirName myName} uses ${toString drv.pythonModule}
-
-          Possible solutions:
-
-            * If ${theirName} is a Python library, change the reference to ${theirName}
-              in the ${attrName} of ${myName} to use a ${theirName} built from the same
-              version of Python
-
-            * If ${theirName} is used as a tool during the build, move the reference to
-              ${theirName} in ${myName} from ${attrName} to nativeBuildInputs
-
-            * If ${theirName} provides executables that are called at run time, pass its
-              bin path to makeWrapperArgs:
-
-                  makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${lib.getName drv} ] }" ];
-
-          ${optionalLocation}
-        '';
-
-      checkDrv = drv: if (isPythonModule drv) && (isMismatchedPython drv) then throwMismatch drv else drv;
+        inputs: map checkDrv inputs;
 
     in
-    inputs: map checkDrv inputs;
+    {
 
-  # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
-  self = toPythonModule (
-    stdenv.mkDerivation (
-      (removeAttrs attrs [
-        "disabled"
-        "checkPhase"
-        "checkInputs"
-        "nativeCheckInputs"
-        "doCheck"
-        "doInstallCheck"
-        "dontWrapPythonPrograms"
-        "catchConflicts"
-        "format"
-        "disabledTestPaths"
-        "outputs"
-      ])
-      // {
+      name = namePrefix + name_;
 
-        name = namePrefix + name_;
+      nativeBuildInputs = [
+        python
+        wrapPython
+        ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, ...)?
+        pythonRemoveTestsDirHook
+      ]
+      ++ lib.optionals catchConflicts [
+        pythonCatchConflictsHook
+      ]
+      ++ lib.optionals removeBinBytecode [
+        pythonRemoveBinBytecodeHook
+      ]
+      ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
+        unzip
+      ]
+      ++ lib.optionals (format == "setuptools") [
+        setuptoolsBuildHook
+      ]
+      ++ lib.optionals (format == "pyproject") [
+        pipBuildHook
+      ]
+      ++ lib.optionals (format == "wheel") [
+        wheelUnpackHook
+      ]
+      ++ lib.optionals (format == "egg") [
+        eggUnpackHook
+        eggBuildHook
+        eggInstallHook
+      ]
+      ++ lib.optionals (format != "other") [
+        pipInstallHook
+      ]
+      ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
+        # This is a test, however, it should be ran independent of the checkPhase and checkInputs
+        pythonImportsCheckHook
+      ]
+      ++ lib.optionals withDistOutput [
+        pythonOutputDistHook
+      ]
+      ++ nativeBuildInputs;
 
-        nativeBuildInputs = [
+      buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath);
+
+      propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (
+        propagatedBuildInputs
+        ++ [
+          # we propagate python even for packages transformed with 'toPythonApplication'
+          # this pollutes the PATH but avoids rebuilds
+          # see https://github.com/NixOS/nixpkgs/issues/170887 for more context
           python
-          wrapPython
-          ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, ...)?
-          pythonRemoveTestsDirHook
         ]
-        ++ lib.optionals catchConflicts [
-          pythonCatchConflictsHook
-        ]
-        ++ lib.optionals removeBinBytecode [
-          pythonRemoveBinBytecodeHook
-        ]
-        ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
-          unzip
-        ]
-        ++ lib.optionals (format == "setuptools") [
-          setuptoolsBuildHook
-        ]
-        ++ lib.optionals (format == "pyproject") [
-          pipBuildHook
-        ]
-        ++ lib.optionals (format == "wheel") [
-          wheelUnpackHook
-        ]
-        ++ lib.optionals (format == "egg") [
-          eggUnpackHook
-          eggBuildHook
-          eggInstallHook
-        ]
-        ++ lib.optionals (format != "other") [
-          pipInstallHook
-        ]
-        ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
-          # This is a test, however, it should be ran independent of the checkPhase and checkInputs
-          pythonImportsCheckHook
-        ]
-        ++ lib.optionals withDistOutput [
-          pythonOutputDistHook
-        ]
-        ++ nativeBuildInputs;
+      );
 
-        buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath);
+      inherit strictDeps;
 
-        propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (
-          propagatedBuildInputs
-          ++ [
-            # we propagate python even for packages transformed with 'toPythonApplication'
-            # this pollutes the PATH but avoids rebuilds
-            # see https://github.com/NixOS/nixpkgs/issues/170887 for more context
-            python
-          ]
-        );
-
-        inherit strictDeps;
-
-        env = {
-          LANG = "${if python.stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8";
-        }
-        // (attrs.env or { });
-
-        # Python packages don't have a checkPhase, only an installCheckPhase
-        doCheck = false;
-        doInstallCheck = attrs.doCheck or true;
-        nativeInstallCheckInputs = nativeCheckInputs;
-        installCheckInputs = checkInputs;
-
-        postFixup =
-          lib.optionalString (!dontWrapPythonPrograms) ''
-            wrapPythonPrograms
-          ''
-          + attrs.postFixup or "";
-
-        # Python packages built through cross-compilation are always for the host platform.
-        disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [
-          python.pythonOnBuildForHost
-        ];
-
-        outputs = outputs ++ lib.optional withDistOutput "dist";
-
-        meta = {
-          # default to python's platforms
-          platforms = python.meta.platforms;
-          isBuildPythonPackage = python.meta.platforms;
-        }
-        // meta;
+      env = {
+        LANG = "${if python.stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8";
       }
-      // lib.optionalAttrs (attrs ? checkPhase) {
-        # If given use the specified checkPhase, otherwise use the setup hook.
-        # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`.
-        installCheckPhase = attrs.checkPhase;
-      }
-      // lib.optionalAttrs (disabledTestPaths != [ ]) {
-        disabledTestPaths = lib.escapeShellArgs disabledTestPaths;
-      }
-    )
-  );
+      // (attrs.env or { });
 
-  passthru.updateScript =
+      # Python packages don't have a checkPhase, only an installCheckPhase
+      doCheck = false;
+      doInstallCheck = attrs.doCheck or true;
+      nativeInstallCheckInputs = nativeCheckInputs;
+      installCheckInputs = checkInputs;
+
+      postFixup =
+        lib.optionalString (!dontWrapPythonPrograms) ''
+          wrapPythonPrograms
+        ''
+        + attrs.postFixup or "";
+
+      # Python packages built through cross-compilation are always for the host platform.
+      disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [
+        python.pythonOnBuildForHost
+      ];
+
+      outputs = outputs ++ lib.optional withDistOutput "dist";
+
+      passthru = {
+        inherit
+          disabled
+          ;
+        updateScript =
+          let
+            filename = builtins.head (lib.splitString ":" finalAttrs.finalPackage.meta.position);
+          in
+          [
+            update-python-libraries
+            filename
+          ];
+      }
+      // passthru;
+
+      meta = {
+        # default to python's platforms
+        platforms = python.meta.platforms;
+        isBuildPythonPackage = python.meta.platforms;
+      }
+      // meta;
+    }
+    // lib.optionalAttrs (attrs ? checkPhase) {
+      # If given use the specified checkPhase, otherwise use the setup hook.
+      # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`.
+      installCheckPhase = attrs.checkPhase;
+    }
+    // lib.optionalAttrs (disabledTestPaths != [ ]) {
+      disabledTestPaths = lib.escapeShellArgs disabledTestPaths;
+    };
+
+  transformDrv =
     let
-      filename = builtins.head (lib.splitString ":" self.meta.position);
+      # Workaround to make the `lib.extendDerivation`-based disabled functionality
+      # respect `<pkg>.overrideAttrs`
+      # It doesn't cover `<pkg>.<output>.overrideAttrs`.
+      disablePythonPackage =
+        drv:
+        lib.extendDerivation (
+          drv.disabled
+          -> throw "${lib.removePrefix namePrefix drv.name} not supported for interpreter ${python.executable}"
+        ) { } drv
+        // {
+          overrideAttrs = fdrv: disablePythonPackage (drv.overrideAttrs fdrv);
+        };
     in
-    attrs.passthru.updateScript or [
-      update-python-libraries
-      filename
-    ];
-in
-lib.extendDerivation (
-  disabled -> throw "${name} not supported for interpreter ${python.executable}"
-) passthru self
+    drv: disablePythonPackage (toPythonModule drv);
+}
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 6f90732dc92c..db3d8685ee2b 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -327,6 +327,8 @@ let
               $rbConfig $out/lib/libruby*
           '';
 
+          # TODO: this check got relaxed on darwin;
+          # see https://github.com/NixOS/nixpkgs/pull/499156#issuecomment-4221517043
           installCheckPhase = ''
             overriden_cc=$(CC=foo $out/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["CC"]')
             if [[ "$overriden_cc" != "foo" ]]; then
@@ -335,7 +337,9 @@ let
             fi
 
             fallback_cc=$(unset CC; $out/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["CC"]')
-            if [[ "$fallback_cc" != "$CC" ]]; then
+            if [[ ${
+              if stdenv.hostPlatform.isDarwin then ''! "$fallback_cc" =~ "$CC"'' else ''"$fallback_cc" != "$CC"''
+            } ]]; then
                echo "CC='$fallback_cc' should be '$CC' by default" >&2
                false
             fi
@@ -401,14 +405,14 @@ in
   };
 
   ruby_3_4 = generic {
-    version = rubyVersion "3" "4" "8" "";
-    hash = "sha256-U8TdrUH7thifH17g21elHVS9H4f4dVs9aGBBVqNbBFs=";
+    version = rubyVersion "3" "4" "9" "";
+    hash = "sha256-e7TU9egHzCclHRTZ1ghtGCxbJYdRkeRKsVtwnNen3Zw=";
     cargoHash = "sha256-5Tp8Kth0yO89/LIcU8K01z6DdZRr8MAA0DPKqDEjIt0=";
   };
 
   ruby_4_0 = generic {
-    version = rubyVersion "4" "0" "2" "";
-    hash = "sha256-UVArJrULaN9JYzNspB42jN6SySj6+RZU3kxMF5H4Kqw=";
+    version = rubyVersion "4" "0" "3" "";
+    hash = "sha256-d5ZKzDcNXIN1uVAuW6bBPAPvkaueufUhyE+0K5yaaw8=";
     cargoHash = "sha256-z7NwWc4TaR042hNx0xgRkh/BQEpEJtE53cfrN0qNiE0=";
   };
 
diff --git a/pkgs/development/interpreters/spidermonkey/140.nix b/pkgs/development/interpreters/spidermonkey/140.nix
index f3ea1a1c1dd7..f66957465bf9 100644
--- a/pkgs/development/interpreters/spidermonkey/140.nix
+++ b/pkgs/development/interpreters/spidermonkey/140.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "140.7.1";
-  hash = "sha512-fYZ/o8nJSQP2WDvnWtSqjZGPmPdMmcZhWg5AyvIcVFowFJEVIUh2aT7xdYoyDr3M7wF8SENlwZXlWZjM4IhmPA==";
+  version = "140.9.0";
+  hash = "sha512-vAP9KnPQCoi9Cjye6u/mGP+zQib7e8L6xKAiRv8p/gOEI793U4Jz7m+sJfsePk+pi7UiAmrjQnoK1fQdLsa6mA==";
 }
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index d963a31ea02f..24a047691af6 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -16,7 +16,6 @@
   libxt,
   qtbase,
   qttools,
-  qtwebengine,
   readline,
   qtwebsockets,
   qtwayland,
@@ -27,7 +26,6 @@
   supercolliderPlugins,
   writeText,
   runCommand,
-  withWebengine ? false, # vulnerable, so disabled by default
 }:
 
 stdenv.mkDerivation rec {
@@ -82,7 +80,6 @@ stdenv.mkDerivation rec {
     qtwayland
     readline
   ]
-  ++ lib.optional withWebengine qtwebengine
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
 
   hardeningDisable = [ "stackprotector" ];
@@ -90,7 +87,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DSC_WII=OFF"
     "-DSC_EL=${if useSCEL then "ON" else "OFF"}"
-    (lib.cmakeBool "SC_USE_QTWEBENGINE" withWebengine)
+    (lib.cmakeBool "SC_USE_QTWEBENGINE" false)
   ];
 
   passthru = {
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 9f2e781124e5..21702a4c74c6 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -130,6 +130,7 @@ let
 
     passthru = rec {
       inherit release version;
+      isTcl9 = lib.versions.major version == "9";
       libPrefix = "tcl${release}";
       libdir = "lib/${libPrefix}";
       tclPackageHook = callPackage (
@@ -142,6 +143,16 @@ let
           };
         } ./tcl-package-hook.sh
       ) { };
+      tclRequiresCheckHook = callPackage (
+        { buildPackages }:
+        makeSetupHook {
+          name = "tcl-requires-check-hook";
+          propagatedBuildInputs = [ buildPackages.makeBinaryWrapper ];
+          meta = {
+            inherit (meta) maintainers platforms;
+          };
+        } ./tcl-requires-check-hook.sh
+      ) { };
       # verify that Tcl's clock library can access tzdata
       tests.tzdata = runCommand "${pname}-test-tzdata" { } ''
         ${baseInterp}/bin/tclsh <(echo "set t [clock scan {2004-10-30 05:00:00} \
diff --git a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
index 55da68361071..33897cdd1c96 100644
--- a/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
+++ b/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix
@@ -1,34 +1,10 @@
-# Generic builder for tcl packages/applications, generally based on mk-python-derivation.nix
+# Generic builder for tcl packages/applications
 {
   tcl,
   lib,
   makeWrapper,
-  runCommand,
-  writeScript,
 }:
 
-{
-  buildInputs ? [ ],
-  nativeBuildInputs ? [ ],
-  propagatedBuildInputs ? [ ],
-  checkInputs ? [ ],
-  nativeCheckInputs ? [ ],
-
-  # true if we should skip the configuration phase altogether
-  dontConfigure ? false,
-
-  # Extra flags passed to configure step
-  configureFlags ? [ ],
-
-  # Whether or not we should add common Tcl-related configure flags
-  addTclConfigureFlags ? true,
-
-  meta ? { },
-  passthru ? { },
-  doCheck ? true,
-  ...
-}@attrs:
-
 let
   inherit (tcl) stdenv;
   inherit (lib) getBin optionalAttrs;
@@ -37,36 +13,54 @@ let
     "--with-tcl=${tcl}/lib"
     "--with-tclinclude=${tcl}/include"
     "--exec-prefix=${placeholder "out"}"
+    # Enable stubs by default for compatibility across minor versions
+    "--enable-stubs"
   ];
 
-  self = (
-    stdenv.mkDerivation (
-      (removeAttrs attrs [
-        "addTclConfigureFlags"
-        "checkPhase"
-        "checkInputs"
-        "nativeCheckInputs"
-        "doCheck"
-      ])
-      // {
+in
+lib.extendMkDerivation {
+  constructDrv = stdenv.mkDerivation;
+  excludeDrvArgNames = [
+    "addTclConfigureFlags"
+    "checkPhase"
+    "checkInputs"
+    "nativeCheckInputs"
+    "doCheck"
+  ];
+  extendDrvArgs =
+    finalAttrs:
+    args@{
+      # true if we should skip the configuration phase altogether
+      dontConfigure ? false,
 
-        buildInputs = buildInputs ++ [ tcl.tclPackageHook ];
-        nativeBuildInputs = nativeBuildInputs ++ [
-          makeWrapper
-          tcl
-        ];
-        propagatedBuildInputs = propagatedBuildInputs ++ [ tcl ];
+      # Extra flags passed to configure step
+      configureFlags ? [ ],
 
-        env = {
-          TCLSH = "${getBin tcl}/bin/tclsh";
-        }
-        // (attrs.env or { });
+      # Whether or not we should add common Tcl-related configure flags
+      addTclConfigureFlags ? true,
+      ...
+    }:
+    (
+      {
+        buildInputs = args.buildInputs or [ ] ++ [ tcl.tclPackageHook ];
+
+        nativeBuildInputs =
+          args.nativeBuildInputs or [ ]
+          ++ [
+            makeWrapper
+            tcl
+          ]
+          ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+            tcl.tclRequiresCheckHook
+          ];
+
+        propagatedBuildInputs = args.propagatedBuildInputs or [ ] ++ [ tcl ];
 
         # Run tests after install, at which point we've done all TCLLIBPATH setup
         doCheck = false;
-        doInstallCheck = attrs.doCheck or (attrs.doInstallCheck or false);
-        installCheckInputs = checkInputs ++ (attrs.installCheckInputs or [ ]);
-        nativeInstallCheckInputs = nativeCheckInputs ++ (attrs.nativeInstallCheckInputs or [ ]);
+        doInstallCheck = args.doCheck or (args.doInstallCheck or false);
+        installCheckInputs = args.checkInputs or [ ] ++ args.installCheckInputs or [ ];
+        nativeInstallCheckInputs = args.nativeCheckInputs or [ ] ++ args.nativeInstallCheckInputs or [ ];
 
         # Add typical values expected by TEA for configureFlags
         configureFlags =
@@ -75,17 +69,19 @@ let
           else
             configureFlags;
 
+        env = {
+          TCLSH = "${getBin tcl}/bin/tclsh";
+        }
+        // args.env or { };
+
         meta = {
           platforms = tcl.meta.platforms;
         }
-        // meta;
+        // args.meta or { };
 
       }
-      // optionalAttrs (attrs ? checkPhase) {
-        installCheckPhase = attrs.checkPhase;
+      // optionalAttrs (args ? checkPhase) {
+        installCheckPhase = args.checkPhase;
       }
-    )
-  );
-
-in
-lib.extendDerivation true passthru self
+    );
+}
diff --git a/pkgs/development/interpreters/tcl/tcl-requires-check-hook.sh b/pkgs/development/interpreters/tcl/tcl-requires-check-hook.sh
new file mode 100644
index 000000000000..0027a0c4b386
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/tcl-requires-check-hook.sh
@@ -0,0 +1,17 @@
+# Setup hook for checking whether Tcl requires succeed
+echo "Sourcing tcl-requires-check-hook.sh"
+
+tclRequiresCheckPhase () {
+    echo "Executing tclRequiresCheckPhase"
+
+    if [ -n "$tclRequiresCheck" ]; then
+        echo "Check whether the following packages can be required: $tclRequiresCheck"
+        export TCLLIBPATH="$out/lib $TCLLIBPATH" # Redundant if tcl-package-hook is also used
+        tclsh <<<'exit [catch {foreach req $env(tclRequiresCheck) {package require $req}}]'
+    fi
+}
+
+if [ -z "${dontUseTclRequiresCheck-}" ]; then
+    echo "Using tclRequiresCheckPhase"
+    preDistPhases+=" tclRequiresCheckPhase"
+fi
diff --git a/pkgs/development/lean-modules/lean4/default.nix b/pkgs/development/lean-modules/lean4/default.nix
index e53d298db06f..7ba6dd5170f4 100644
--- a/pkgs/development/lean-modules/lean4/default.nix
+++ b/pkgs/development/lean-modules/lean4/default.nix
@@ -86,6 +86,7 @@ let
     cmakeFlags = [
       "-DUSE_GITHASH=OFF"
       "-DINSTALL_LICENSE=OFF"
+      "-DINSTALL_CADICAL=OFF"
       "-DUSE_MIMALLOC=ON"
     ];
 
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index 87f1fe703d31..ab9173bcdbec 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  fetchpatch,
   fetchurl,
   fetchzip,
   perl,
@@ -29,22 +28,14 @@ in
 
 stdenv.mkDerivation rec {
   pname = "aspell";
-  version = "0.60.8.1";
+  version = "0.60.8.2";
 
   src = fetchurl {
     url = "mirror://gnu/aspell/aspell-${version}.tar.gz";
-    hash = "sha256-1toSs01C1Ff6YE5DWtSEp0su/80SD/QKzWuz+yiH0hs=";
+    hash = "sha256-V/5IY+rmBI9yJFqFdbRLcY+4XKFLn4wK/EGyVN/XaRk=";
   };
 
-  patches = [
-    # fix gcc-15 / clang-19 build. can remove on next update
-    (fetchpatch {
-      name = "fix-gcc-15-build.patch";
-      url = "https://github.com/GNUAspell/aspell/commit/ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041.patch";
-      hash = "sha256-rW1FcfARdtT4wX+zGd2x/1K8zRp9JZhdR/zRd8RwPZA=";
-    })
-  ]
-  ++ lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
+  patches = lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
 
   postPatch = ''
     patch interfaces/cc/aspell.h < ${./clang.patch}
diff --git a/pkgs/development/libraries/azure-sdk-for-cpp/core.nix b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix
index 0b2ef8ad9d85..d986815ceef3 100644
--- a/pkgs/development/libraries/azure-sdk-for-cpp/core.nix
+++ b/pkgs/development/libraries/azure-sdk-for-cpp/core.nix
@@ -10,7 +10,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "azure-sdk-for-cpp-core";
-  version = "1.16.2";
+  version = "1.16.3";
   outputs = [
     "out"
     "dev"
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Azure";
     repo = "azure-sdk-for-cpp";
     tag = "azure-core_${finalAttrs.version}";
-    hash = "sha256-IGhJi8fnNY/NXnZ6ZGclJxG1gEx7BRj9setMaFUJZNQ=";
+    hash = "sha256-1OLyTwjfSunwvDMbMTNw0w8txhJxXthtAVeFf7abrIs=";
   };
   sourceRoot = "${finalAttrs.src.name}/sdk/core/azure-core";
 
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
index 23ed07441755..57273c2defb7 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -4,6 +4,7 @@
   fetchpatch,
   fetchurl,
   autoreconfHook,
+  autoconf269,
   ...
 }@args:
 
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index c9e1a6bb1d1e..cff2dc31ada7 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -4,6 +4,7 @@
   fetchpatch,
   fetchurl,
   autoreconfHook,
+  autoconf269,
   ...
 }@args:
 
diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix
index a23ee5b936fc..a1bc3c4f0707 100644
--- a/pkgs/development/libraries/db/db-6.0.nix
+++ b/pkgs/development/libraries/db/db-6.0.nix
@@ -4,6 +4,7 @@
   fetchpatch,
   fetchurl,
   autoreconfHook,
+  autoconf269,
   ...
 }@args:
 
diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix
index 78c6cf4eb8a7..9fe5d1525b0e 100644
--- a/pkgs/development/libraries/db/db-6.2.nix
+++ b/pkgs/development/libraries/db/db-6.2.nix
@@ -4,6 +4,7 @@
   fetchpatch,
   fetchurl,
   autoreconfHook,
+  autoconf269,
   ...
 }@args:
 
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index 50695b6349db..25dc5785f6e0 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -4,6 +4,7 @@
   fetchpatch,
   fetchurl,
   autoreconfHook,
+  autoconf269,
   cxxSupport ? true,
   compat185 ? true,
   dbmSupport ? false,
@@ -26,9 +27,9 @@ stdenv.mkDerivation (
       sha256 = sha256;
     };
 
-    # The provided configure script features `main` returning implicit `int`, which causes
-    # configure checks to work incorrectly with clang 16.
-    nativeBuildInputs = [ autoreconfHook ];
+    # autoreconfHook: the provided configure script features `main` returning implicit `int`,
+    # which causes configure checks to work incorrectly with clang 16.
+    nativeBuildInputs = lib.optionals stdenv.cc.isClang [ autoconf269 ] ++ [ autoreconfHook ];
 
     patches = [
       (fetchpatch {
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
index 022b766d9097..6895f555ddc7 100644
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
         options.h \
         insn-constants.h \
   ''
-  + lib.optionalString stdenv.targetPlatform.isM68k ''
+  + lib.optionalString (stdenv.targetPlatform.isM68k || stdenv.targetPlatform.isSh4) ''
     sysroot-suffix.h \
   ''
   + lib.optionalString stdenv.targetPlatform.isAarch32 ''
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index db165c62806e..6814348c1d24 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gettext";
-  version = "0.26";
+  version = "1.0";
 
   src = fetchurl {
     url = "mirror://gnu/gettext/${pname}-${version}.tar.gz";
-    hash = "sha256-Oaz0sDcemxELYABVYqrOWzYx/tmxu57Mz8f1bli7HX8=";
+    hash = "sha256-hdmbecmBpASHTALgNCF2z3XHaY4rUf5BAxz2Um2XTxo=";
   };
   patches = [
     ./absolute-paths.diff
@@ -53,13 +53,13 @@ stdenv.mkDerivation rec {
     # Fixing this requires replacing all the older copies of the problematic file with a new one.
     #
     # This is ugly, but it avoids requiring workarounds in every package using gettext and autoreconfPhase.
-    declare -a oldFiles=($(tar tf gettext-tools/misc/archive.dir.tar | grep '^gettext-0\.[19].*/extern-inline.m4'))
+    declare -a oldFiles=($(tar tf gettext-tools/autotools/archive.dir.tar | grep '^gettext-0\.[19].*/extern-inline.m4'))
     oldFilesDir=$(mktemp -d)
     for oldFile in "''${oldFiles[@]}"; do
       mkdir -p "$oldFilesDir/$(dirname "$oldFile")"
       cp -a gettext-tools/gnulib-m4/extern-inline.m4 "$oldFilesDir/$oldFile"
     done
-    tar uf gettext-tools/misc/archive.dir.tar --owner=0 --group=0 --numeric-owner -C "$oldFilesDir" "''${oldFiles[@]}"
+    tar uf gettext-tools/autotools/archive.dir.tar --owner=0 --group=0 --numeric-owner -C "$oldFilesDir" "''${oldFiles[@]}"
 
     substituteAllInPlace gettext-runtime/src/gettext.sh.in
     substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd
diff --git a/pkgs/development/libraries/glibc/2.42-master.patch b/pkgs/development/libraries/glibc/2.42-master.patch
index f82e155832c4..47ed7dd1183b 100644
--- a/pkgs/development/libraries/glibc/2.42-master.patch
+++ b/pkgs/development/libraries/glibc/2.42-master.patch
@@ -5750,3 +5750,1407 @@ index a69b732801..9df4bb7424 100644
      }
  
    if ((flags & WRDE_APPEND) == 0)
+
+commit 912d89a766847649a3857985a3b5e6065c51bfd4
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Thu Jan 8 12:35:08 2026 +0100
+
+    Switch currency symbol for the bg_BG locale to euro
+    
+    Bulgaria joined the eurozone on 2026-01-01.
+    
+    Suggested-by: Йордан Гигов <jgigov@abv.bg>
+    Reviewed-by: Collin Funk <collin.funk1@gmail.com>
+    (cherry picked from commit 78fdb2d6b1c34ea8e779fd48f9436dfbd50b6387)
+
+diff --git a/localedata/locales/bg_BG b/localedata/locales/bg_BG
+index 159a6c3334..eda2a8d01b 100644
+--- a/localedata/locales/bg_BG
++++ b/localedata/locales/bg_BG
+@@ -248,8 +248,8 @@ reorder-end
+ END LC_COLLATE
+ 
+ LC_MONETARY
+-int_curr_symbol           "BGN "
+-currency_symbol           "лв."
++int_curr_symbol           "EUR "
++currency_symbol           "€"
+ mon_decimal_point         ","
+ mon_thousands_sep         " "
+ mon_grouping              3
+
+commit 39897805917ab1c44dbf4452b9c4c2bbafc7117b
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Fri Feb 13 09:02:07 2026 +0100
+
+    nss: Introduce dedicated struct nss_database_for_fork type
+    
+    The initialized field in struct nss_database_data is rather confusing
+    because it is not used by the regular NSS code, only by the fork
+    state synchronization code.  Introduce a separate type and place
+    the initialized field there.
+    
+    Reviewed-by: Sam James <sam@gentoo.org>
+    (cherry picked from commit 7bb859f4198d0be19c31a9937eae4f6c2c9a079e)
+
+diff --git a/nss/nss_database.c b/nss/nss_database.c
+index a7ac32beb9..a6b7d5c956 100644
+--- a/nss/nss_database.c
++++ b/nss/nss_database.c
+@@ -56,7 +56,6 @@ global_state_allocate (void *closure)
+     {
+       result->data.nsswitch_conf.size = -1; /* Force reload.  */
+       memset (result->data.services, 0, sizeof (result->data.services));
+-      result->data.initialized = true;
+       result->data.reload_disabled = false;
+       __libc_lock_init (result->lock);
+       result->root_ino = 0;
+@@ -451,8 +450,8 @@ nss_database_check_reload_and_get (struct nss_database_state *local,
+   /* Avoid overwriting the global configuration until we have loaded
+      everything successfully.  Otherwise, if the file change
+      information changes back to what is in the global configuration,
+-     the lookups would use the partially-written  configuration.  */
+-  struct nss_database_data staging = { .initialized = true, };
++     the lookups would use the partially-written configuration.  */
++  struct nss_database_data staging = { };
+ 
+   bool ok = nss_database_reload (&staging, &initial);
+ 
+@@ -503,7 +502,7 @@ __nss_database_freeres (void)
+ }
+ 
+ void
+-__nss_database_fork_prepare_parent (struct nss_database_data *data)
++__nss_database_fork_prepare_parent (struct nss_database_for_fork *data)
+ {
+   /* Do not use allocate_once to trigger loading unnecessarily.  */
+   struct nss_database_state *local = atomic_load_acquire (&global_database_state);
+@@ -515,20 +514,21 @@ __nss_database_fork_prepare_parent (struct nss_database_data *data)
+          because it avoids acquiring the lock during the actual
+          fork.  */
+       __libc_lock_lock (local->lock);
+-      *data = local->data;
++      data->data = local->data;
+       __libc_lock_unlock (local->lock);
++      data->initialized = true;
+     }
+ }
+ 
+ void
+-__nss_database_fork_subprocess (struct nss_database_data *data)
++__nss_database_fork_subprocess (struct nss_database_for_fork *data)
+ {
+   struct nss_database_state *local = atomic_load_acquire (&global_database_state);
+   if (data->initialized)
+     {
+       /* Restore the state at the point of the fork.  */
+       assert (local != NULL);
+-      local->data = *data;
++      local->data = data->data;
+       __libc_lock_init (local->lock);
+     }
+   else if (local != NULL)
+diff --git a/nss/nss_database.h b/nss/nss_database.h
+index 0eaea49685..c170da03f6 100644
+--- a/nss/nss_database.h
++++ b/nss/nss_database.h
+@@ -70,15 +70,21 @@ struct nss_database_data
+   struct file_change_detection nsswitch_conf;
+   nss_action_list services[NSS_DATABASE_COUNT];
+   int reload_disabled;          /* Actually bool; int for atomic access.  */
+-  bool initialized;
++};
++
++/* Use to store a consistent state snapshot across fork.  */
++struct nss_database_for_fork
++{
++  bool initialized;  /* Set to true if the data field below is initialized.  */
++  struct nss_database_data data;
+ };
+ 
+ /* Called by fork in the parent process, before forking.  */
+-void __nss_database_fork_prepare_parent (struct nss_database_data *data)
++void __nss_database_fork_prepare_parent (struct nss_database_for_fork *)
+   attribute_hidden;
+ 
+ /* Called by fork in the new subprocess, after forking.  */
+-void __nss_database_fork_subprocess (struct nss_database_data *data)
++void __nss_database_fork_subprocess (struct nss_database_for_fork *)
+   attribute_hidden;
+ 
+ #endif /* _NSS_DATABASE_H */
+diff --git a/posix/fork.c b/posix/fork.c
+index 011e92fc1d..7f2370f2eb 100644
+--- a/posix/fork.c
++++ b/posix/fork.c
+@@ -50,7 +50,7 @@ __libc_fork (void)
+ 
+   lastrun = __run_prefork_handlers (multiple_threads);
+ 
+-  struct nss_database_data nss_database_data;
++  struct nss_database_for_fork nss_database_data;
+ 
+   /* If we are not running multiple threads, we do not have to
+      preserve lock state.  If fork runs from a signal handler, only
+
+commit 937ef7aaf3ce41038b3e12675a6298b86b389af2
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Fri Feb 13 09:02:07 2026 +0100
+
+    Linux: In getlogin_r, use utmp fallback only for specific errors
+    
+    Most importantly, if getwpuid_r fails, it does not make sense to retry
+    via utmp because the user ID obtained from there is less reliable than
+    the one from /proc/self/loginuid.
+    
+    Reviewed-by: Sam James <sam@gentoo.org>
+    (cherry picked from commit 28660f4b45afa8921c2faebaec2846f95f670ba0)
+
+diff --git a/sysdeps/unix/sysv/linux/getlogin_r.c b/sysdeps/unix/sysv/linux/getlogin_r.c
+index f03ecd4da9..0e66944570 100644
+--- a/sysdeps/unix/sysv/linux/getlogin_r.c
++++ b/sysdeps/unix/sysv/linux/getlogin_r.c
+@@ -37,7 +37,12 @@ __getlogin_r_loginuid (char *name, size_t namesize)
+ {
+   int fd = __open_nocancel ("/proc/self/loginuid", O_RDONLY);
+   if (fd == -1)
+-    return -1;
++    {
++      if (errno == ENOENT)
++	/* Trigger utmp fallback.  */
++	return -1;
++      return errno;
++    }
+ 
+   /* We are reading a 32-bit number.  12 bytes are enough for the text
+      representation.  If not, something is wrong.  */
+@@ -45,6 +50,8 @@ __getlogin_r_loginuid (char *name, size_t namesize)
+   ssize_t n = TEMP_FAILURE_RETRY (__read_nocancel (fd, uidbuf,
+ 						   sizeof (uidbuf)));
+   __close_nocancel_nostatus (fd);
++  if (n < 0)
++    return errno;
+ 
+   uid_t uid;
+   char *endp;
+@@ -53,12 +60,13 @@ __getlogin_r_loginuid (char *name, size_t namesize)
+       || (uidbuf[n] = '\0',
+ 	  uid = strtoul (uidbuf, &endp, 10),
+ 	  endp == uidbuf || *endp != '\0'))
+-    return -1;
++    return EINVAL;
+ 
+   /* If there is no login uid, linux sets /proc/self/loginid to the sentinel
+      value of, (uid_t) -1, so check if that value is set and return early to
+      avoid making unneeded nss lookups. */
+   if (uid == (uid_t) -1)
++    /* Trigger utmp fallback.  */
+     return -1;
+ 
+   struct passwd pwd;
+@@ -78,9 +86,14 @@ __getlogin_r_loginuid (char *name, size_t namesize)
+ 	}
+     }
+ 
+-  if (res != 0 || tpwd == NULL)
++  if (res != 0)
++    {
++      result = res;
++      goto out;
++    }
++  if (tpwd == NULL)
+     {
+-      result = -1;
++      result = ENOENT;
+       goto out;
+     }
+ 
+
+commit ebd45473f5421e0fced5ba2cde0f1aaa36e79b61
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Fri Feb 13 09:02:07 2026 +0100
+
+    nss: Missing checks in __nss_configure_lookup, __nss_database_get (bug 28940)
+    
+    This avoids a null pointer dereference in the
+    nss_database_check_reload_and_get function, and assertion failures.
+    
+    Reviewed-by: Sam James <sam@gentoo.org>
+    (cherry picked from commit 5b713b49443eb6a4e54e50e2f0147105f86dab02)
+
+diff --git a/nss/Makefile b/nss/Makefile
+index 1991b7482a..f690c29b94 100644
+--- a/nss/Makefile
++++ b/nss/Makefile
+@@ -326,6 +326,7 @@ tests := \
+   tst-gshadow \
+   tst-nss-getpwent \
+   tst-nss-hash \
++  tst-nss-malloc-failure-getlogin_r \
+   tst-nss-test1 \
+   tst-nss-test2 \
+   tst-nss-test4 \
+diff --git a/nss/nss_database.c b/nss/nss_database.c
+index a6b7d5c956..7aa460c7df 100644
+--- a/nss/nss_database.c
++++ b/nss/nss_database.c
+@@ -250,9 +250,12 @@ __nss_configure_lookup (const char *dbname, const char *service_line)
+ 
+   /* Force any load/cache/read whatever to happen, so we can override
+      it.  */
+-  __nss_database_get (db, &result);
++  if (!__nss_database_get (db, &result))
++    return -1;
+ 
+   local = nss_database_state_get ();
++  if (local == NULL)
++    return -1;
+ 
+   result = __nss_action_parse (service_line);
+   if (result == NULL)
+@@ -477,6 +480,8 @@ bool
+ __nss_database_get (enum nss_database db, nss_action_list *actions)
+ {
+   struct nss_database_state *local = nss_database_state_get ();
++  if (local == NULL)
++    return false;
+   return nss_database_check_reload_and_get (local, actions, db);
+ }
+ libc_hidden_def (__nss_database_get)
+diff --git a/nss/tst-nss-malloc-failure-getlogin_r.c b/nss/tst-nss-malloc-failure-getlogin_r.c
+new file mode 100644
+index 0000000000..0e2985ad57
+--- /dev/null
++++ b/nss/tst-nss-malloc-failure-getlogin_r.c
+@@ -0,0 +1,345 @@
++/* Test NSS/getlogin_r with injected allocation failures (bug 28940).
++   Copyright (C) 2026 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <errno.h>
++#include <getopt.h>
++#include <malloc.h>
++#include <netdb.h>
++#include <nss.h>
++#include <stdbool.h>
++#include <stdlib.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/namespace.h>
++#include <support/support.h>
++#include <support/xstdio.h>
++#include <unistd.h>
++
++/* This test calls getpwuid_r via getlogin_r (on Linux).
++
++   This test uses the NSS system configuration to exercise that code
++   path.  It means that it can fail (crash) if malloc failure is not
++   handled by NSS modules for the passwd database.  */
++
++/* Data structure allocated via MAP_SHARED, so that writes from the
++   subprocess are visible.  */
++struct shared_data
++{
++  /* Number of tracked allocations performed so far.  */
++  volatile unsigned int allocation_count;
++
++  /* If this number is reached, one allocation fails.  */
++  volatile unsigned int failing_allocation;
++
++  /* The number of allocations performed during initialization
++     (before the actual getlogin_r call).  */
++  volatile unsigned int init_allocation_count;
++
++  /* Error code of an expected getlogin_r failure.  */
++  volatile int expected_failure;
++
++  /* The subprocess stores the expected name here.  */
++  char name[100];
++};
++
++/* Allocation count in shared mapping.  */
++static struct shared_data *shared;
++
++/* Returns true if a failure should be injected for this allocation.  */
++static bool
++fail_this_allocation (void)
++{
++  if (shared != NULL)
++    {
++      unsigned int count = shared->allocation_count;
++      shared->allocation_count = count + 1;
++      return count == shared->failing_allocation;
++    }
++  else
++    return false;
++}
++
++/* Failure-injecting wrappers for allocation functions used by glibc.  */
++
++void *
++malloc (size_t size)
++{
++  if (fail_this_allocation ())
++    {
++      errno = ENOMEM;
++      return NULL;
++    }
++  extern __typeof (malloc) __libc_malloc;
++  return __libc_malloc (size);
++}
++
++void *
++calloc (size_t a, size_t b)
++{
++  if (fail_this_allocation ())
++    {
++      errno = ENOMEM;
++      return NULL;
++    }
++  extern __typeof (calloc) __libc_calloc;
++  return __libc_calloc (a, b);
++}
++
++void *
++realloc (void *ptr, size_t size)
++{
++  if (fail_this_allocation ())
++    {
++      errno = ENOMEM;
++      return NULL;
++    }
++  extern __typeof (realloc) __libc_realloc;
++  return __libc_realloc (ptr, size);
++}
++
++/* No-op subprocess to verify that support_isolate_in_subprocess does
++   not perform any heap allocations.  */
++static void
++no_op (void *ignored)
++{
++}
++
++/* Perform a getlogin_r call in a subprocess, to obtain the number of
++   allocations used and the expected result of a successful call.  */
++static void
++initialize (void *configure_lookup)
++{
++  shared->init_allocation_count = 0;
++  if (configure_lookup != NULL)
++    {
++      TEST_COMPARE (__nss_configure_lookup ("passwd", configure_lookup), 0);
++      shared->init_allocation_count = shared->allocation_count;
++    }
++
++  shared->name[0] = '\0';
++  int ret = getlogin_r (shared->name, sizeof (shared->name));
++  if (ret != 0)
++    {
++      printf ("info: getlogin_r failed: %s (%d)\n",
++              strerrorname_np (ret), ret);
++      shared->expected_failure = ret;
++    }
++  else
++    {
++      shared->expected_failure = 0;
++      if (shared->name[0] == '\0')
++        FAIL ("error: getlogin_r succeeded without result\n");
++      else
++        printf ("info: getlogin_r: \"%s\"\n", shared->name);
++    }
++}
++
++/* Perform getlogin_r in a subprocess with fault injection.  */
++static void
++test_in_subprocess (void *configure_lookup)
++{
++  if (configure_lookup != NULL
++      && __nss_configure_lookup ("passwd", configure_lookup) < 0)
++    {
++      printf ("info: __nss_configure_lookup failed: %s (%d)\n",
++              strerrorname_np (errno), errno);
++      TEST_COMPARE (errno, ENOMEM);
++      TEST_VERIFY (shared->allocation_count <= shared->init_allocation_count);
++      return;
++    }
++
++  unsigned int inject_at = shared->failing_allocation;
++  char name[sizeof (shared->name)] = "name not set";
++  int ret = getlogin_r (name, sizeof (name));
++  shared->failing_allocation = ~0U;
++
++  if (ret == 0)
++    {
++      TEST_COMPARE (shared->expected_failure, 0);
++      TEST_COMPARE_STRING (name, shared->name);
++    }
++  else
++    {
++      printf ("info: allocation %u failure results in error %s (%d)\n",
++              inject_at, strerrorname_np (ret), ret);
++
++      if (ret != ENOMEM)
++        {
++          if (shared->expected_failure != 0)
++            TEST_COMPARE (ret, shared->expected_failure);
++          else if (configure_lookup == NULL)
++            /* The ENOENT failure can happen due to an issue related
++               to bug 22041: dlopen failure does not result in ENOMEM.  */
++            TEST_COMPARE (ret, ENOENT);
++          else
++            FAIL ("unexpected getlogin_r error");
++        }
++    }
++
++  if (shared->expected_failure == 0)
++    {
++      /* The second call should succeed.  */
++      puts ("info: about to perform second getlogin_r call");
++      ret = getlogin_r (name, sizeof (name));
++      if (configure_lookup == NULL)
++        {
++          /* This check can fail due to bug 22041 if the malloc error
++             injection causes a failure internally in dlopen.  */
++          if (ret != 0)
++            {
++              printf ("warning: second getlogin_r call failed with %s (%d)\n",
++                      strerrorname_np (ret), ret);
++              TEST_COMPARE (ret, ENOENT);
++            }
++        }
++      else
++        /* If __nss_configure_lookup has been called, the error caching
++           bug does not happen because nss_files is built-in, and the
++           second getlogin_r is expected to succeed.  */
++        TEST_COMPARE (ret, 0);
++      if (ret == 0)
++        TEST_COMPARE_STRING (name, shared->name);
++    }
++}
++
++/* Set by the --failing-allocation command line option.  Together with
++   --direct, this can be used to trigger an allocation failure in the
++   original process, which may help with debugging.  */
++static int option_failing_allocation = -1;
++
++/* Set by --override, to be used with --failing-allocation.  Turns on
++   the __nss_configure_lookup call for passwd/files, which is disabled
++   by default.  */
++static int option_override = 0;
++
++static int
++do_test (void)
++{
++  char files[] = "files";
++
++  if (option_failing_allocation >= 0)
++    {
++      /* The test was invoked with --failing-allocation.  Perform just
++         one test, using the original nsswitch.conf.  This is a
++         condensed version of the probing/testing loop below.  */
++      printf ("info: testing with failing allocation %d\n",
++              option_failing_allocation);
++      shared = support_shared_allocate (sizeof (*shared));
++      shared->failing_allocation = ~0U;
++      char *configure_lookup = option_override ? files : NULL;
++      support_isolate_in_subprocess (initialize, configure_lookup);
++      shared->allocation_count = 0;
++      shared->failing_allocation = option_failing_allocation;
++      test_in_subprocess (configure_lookup); /* No subprocess.  */
++      support_shared_free (shared);
++      shared = NULL;
++      return 0;
++    }
++
++  bool any_success = false;
++
++  for (int do_configure_lookup = 0; do_configure_lookup < 2;
++       ++do_configure_lookup)
++    {
++      if (do_configure_lookup)
++        puts ("info: testing with nsswitch.conf override");
++      else
++        puts ("info: testing with original nsswitch.conf");
++
++      char *configure_lookup = do_configure_lookup ? files : NULL;
++
++      shared = support_shared_allocate (sizeof (*shared));
++
++      /* Disable fault injection.  */
++      shared->failing_allocation = ~0U;
++
++      support_isolate_in_subprocess (no_op, NULL);
++      TEST_COMPARE (shared->allocation_count, 0);
++
++      support_isolate_in_subprocess (initialize, configure_lookup);
++
++      if (shared->name[0] != '\0')
++        any_success = true;
++
++      /* The number of allocations in the successful case.  Once the
++         number of expected allocations is exceeded, injecting further
++         failures does not make a difference (assuming that the number
++         of malloc calls is deterministic).  */
++      unsigned int maximum_allocation_count = shared->allocation_count;
++      printf ("info: initial getlogin_r performed %u allocations\n",
++              maximum_allocation_count);
++
++      for (unsigned int inject_at = 0; inject_at <= maximum_allocation_count;
++           ++inject_at)
++        {
++          printf ("info: running fault injection at allocation %u\n",
++                  inject_at);
++          shared->allocation_count = 0;
++          shared->failing_allocation = inject_at;
++          support_isolate_in_subprocess (test_in_subprocess, configure_lookup);
++        }
++
++      support_shared_free (shared);
++      shared = NULL;
++    }
++
++  {
++    FILE *fp = fopen (_PATH_NSSWITCH_CONF, "r");
++    if (fp == NULL)
++      printf ("info: no %s file\n", _PATH_NSSWITCH_CONF);
++    else
++      {
++        printf ("info: %s contents follows\n", _PATH_NSSWITCH_CONF);
++        int last_ch = '\n';
++        while (true)
++          {
++            int ch = fgetc (fp);
++            if (ch == EOF)
++              break;
++            putchar (ch);
++            last_ch = ch;
++          }
++        if (last_ch != '\n')
++          putchar ('\n');
++        printf ("(end of %s contents)\n", _PATH_NSSWITCH_CONF);
++        xfclose (fp);
++      }
++  }
++
++  support_record_failure_barrier ();
++
++  if (!any_success)
++    FAIL_UNSUPPORTED ("no successful getlogin_r calls");
++
++  return 0;
++}
++
++static void
++cmdline_process (int c)
++{
++  if (c == 'F')
++    option_failing_allocation = atoi (optarg);
++}
++
++#define CMDLINE_OPTIONS                                                 \
++  { "failing-allocation", required_argument, NULL, 'F' },               \
++  { "override", no_argument, &option_override, 1 },
++
++#define CMDLINE_PROCESS cmdline_process
++
++#include <support/test-driver.c>
+
+commit 9cd9c9054409d192aab06bfea32624af9ffa8121
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Fri Nov 28 11:46:09 2025 +0100
+
+    iconvdata: Fix invalid pointer arithmetic in ANSI_X3.110 module
+    
+    The expression inptr + 1 can technically be invalid: if inptr == inend,
+    inptr may point one element past the end of an array.
+    
+    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+    (cherry picked from commit e98bd0c54d5e296ad1be91b6fe35260c6b87e733)
+
+diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c
+index c5506b13b8..94e6e6b745 100644
+--- a/iconvdata/ansi_x3.110.c
++++ b/iconvdata/ansi_x3.110.c
+@@ -407,7 +407,7 @@ static const char from_ucs4[][2] =
+ 	   is also available.  */					      \
+ 	uint32_t ch2;							      \
+ 									      \
+-	if (inptr + 1 >= inend)						      \
++	if (inend - inptr <= 1)						      \
+ 	  {								      \
+ 	    /* The second character is not available.  */		      \
+ 	    result = __GCONV_INCOMPLETE_INPUT;				      \
+
+commit 1a19d5a507eb82a2cf1cf8bd1c14ca1758fb8a82
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Mon Jan 26 17:12:37 2026 +0100
+
+    posix: Run tst-wordexp-reuse-mem test
+    
+    The test was not properly scheduled for execution with a Makefile
+    dependency.
+    
+    Fixes commit 80cc58ea2de214f85b0a1d902a3b668ad2ecb302 ("posix: Reset
+    wordexp_t fields with WRDE_REUSE (CVE-2025-15281 / BZ 33814").
+    
+    (cherry picked from commit bed2db02f3183e93f21d506786c5f884a1dec9e7)
+
+diff --git a/posix/Makefile b/posix/Makefile
+index 1ea86efcc1..0b29c9aa4e 100644
+--- a/posix/Makefile
++++ b/posix/Makefile
+@@ -495,7 +495,7 @@ tests-special += \
+   $(objpfx)tst-pcre-mem.out \
+   $(objpfx)tst-rxspencer-no-utf8-mem.out \
+   $(objpfx)tst-vfork3-mem.out \
+-  $(objpfx)tst-wordexp-reuse.out \
++  $(objpfx)tst-wordexp-reuse-mem.out \
+   # tests-special
+ endif
+ endif
+
+commit 8e863fb1c92360520704a69dc948be6bb4a17cb3
+Author: Carlos O'Donell <carlos@redhat.com>
+Date:   Fri Mar 20 16:43:33 2026 -0400
+
+    resolv: Count records correctly (CVE-2026-4437)
+    
+    The answer section boundary was previously ignored, and the code in
+    getanswer_ptr would iterate past the last resource record, but not
+    beyond the end of the returned data.  This could lead to subsequent data
+    being interpreted as answer records, thus violating the DNS
+    specification.  Such resource records could be maliciously crafted and
+    hidden from other tooling, but processed by the glibc stub resolver and
+    acted upon by the application.  While we trust the data returned by the
+    configured recursive resolvers, we should not trust its format and
+    should validate it as required.  It is a security issue to incorrectly
+    process the DNS protocol.
+    
+    A regression test is added for response section crossing.
+    
+    No regressions on x86_64-linux-gnu.
+    
+    Reviewed-by: Collin Funk <collin.funk1@gmail.com>
+    (cherry picked from commit 9f5f18aab40ec6b61fa49a007615e6077e9a979b)
+
+diff --git a/resolv/Makefile b/resolv/Makefile
+index 8fa3398d76..0ba5fba710 100644
+--- a/resolv/Makefile
++++ b/resolv/Makefile
+@@ -104,6 +104,7 @@ tests += \
+   tst-resolv-basic \
+   tst-resolv-binary \
+   tst-resolv-byaddr \
++  tst-resolv-dns-section \
+   tst-resolv-edns \
+   tst-resolv-invalid-cname \
+   tst-resolv-network \
+@@ -115,6 +116,7 @@ tests += \
+   tst-resolv-semi-failure \
+   tst-resolv-short-response \
+   tst-resolv-trailing \
++  # tests
+ 
+ # This test calls __res_context_send directly, which is not exported
+ # from libresolv.
+@@ -293,6 +295,8 @@ $(objpfx)tst-resolv-aliases: $(objpfx)libresolv.so $(shared-thread-library)
+ $(objpfx)tst-resolv-basic: $(objpfx)libresolv.so $(shared-thread-library)
+ $(objpfx)tst-resolv-binary: $(objpfx)libresolv.so $(shared-thread-library)
+ $(objpfx)tst-resolv-byaddr: $(objpfx)libresolv.so $(shared-thread-library)
++$(objpfx)tst-resolv-dns-section: $(objpfx)libresolv.so \
++  $(shared-thread-library)
+ $(objpfx)tst-resolv-edns: $(objpfx)libresolv.so $(shared-thread-library)
+ $(objpfx)tst-resolv-network: $(objpfx)libresolv.so $(shared-thread-library)
+ $(objpfx)tst-resolv-res_init: $(objpfx)libresolv.so
+diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
+index 14da73ee1d..27096edad2 100644
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -820,7 +820,7 @@ getanswer_ptr (unsigned char *packet, size_t packetlen,
+   /* expected_name may be updated to point into this buffer.  */
+   unsigned char name_buffer[NS_MAXCDNAME];
+ 
+-  while (ancount > 0)
++  for (; ancount > 0; --ancount)
+     {
+       struct ns_rr_wire rr;
+       if (!__ns_rr_cursor_next (&c, &rr))
+diff --git a/resolv/tst-resolv-dns-section.c b/resolv/tst-resolv-dns-section.c
+new file mode 100644
+index 0000000000..1171baef51
+--- /dev/null
++++ b/resolv/tst-resolv-dns-section.c
+@@ -0,0 +1,162 @@
++/* Test handling of invalid section transitions (bug 34014).
++   Copyright (C) 2022-2026 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <array_length.h>
++#include <errno.h>
++#include <netdb.h>
++#include <resolv.h>
++#include <stdlib.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/format_nss.h>
++#include <support/resolv_test.h>
++#include <support/support.h>
++
++/* Name of test, and the second section type.  */
++struct item {
++  const char *test;
++  int ns_section;
++};
++
++static const struct item test_items[] =
++  {
++    { "Test crossing from ns_s_an to ns_s_ar.", ns_s_ar },
++    { "Test crossing from ns_s_an to ns_s_an.", ns_s_ns },
++
++    { NULL, 0 },
++  };
++
++/* The response is designed to contain the following:
++   - An Answer section with one T_PTR record that is skipped.
++   - A second section with a semantically invalid T_PTR record.
++   The original defect is that the response parsing would cross
++   section boundaries and handle the additional section T_PTR
++   as if it were an answer.  A conforming implementation would
++   stop as soon as it reaches the end of the section.  */
++static void
++response (const struct resolv_response_context *ctx,
++          struct resolv_response_builder *b,
++          const char *qname, uint16_t qclass, uint16_t qtype)
++{
++  TEST_COMPARE (qclass, C_IN);
++
++  /* We only test PTR.  */
++  TEST_COMPARE (qtype, T_PTR);
++
++  unsigned int count;
++  char *tail = NULL;
++
++  if (strstr (qname, "in-addr.arpa") != NULL
++      && sscanf (qname, "%u.%ms", &count, &tail) == 2)
++    TEST_COMPARE_STRING (tail, "0.168.192.in-addr.arpa");
++  else if (sscanf (qname, "%x.%ms", &count, &tail) == 2)
++    {
++    TEST_COMPARE_STRING (tail, "\
++0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa");
++    }
++  else
++    FAIL_EXIT1 ("invalid QNAME: %s\n", qname);
++  free (tail);
++
++  /* We have a bounded number of possible tests.  */
++  TEST_VERIFY (count >= 0);
++  TEST_VERIFY (count <= 15);
++
++  struct resolv_response_flags flags = {};
++  resolv_response_init (b, flags);
++  resolv_response_add_question (b, qname, qclass, qtype);
++  resolv_response_section (b, ns_s_an);
++
++  /* Actual answer record, but the wrong name (skipped).  */
++  resolv_response_open_record (b, "1.0.0.10.in-addr.arpa", qclass, qtype, 60);
++
++  /* Record the answer.  */
++  resolv_response_add_name (b, "test.ptr.example.net");
++  resolv_response_close_record (b);
++
++  /* Add a second section to test section boundary crossing.  */
++  resolv_response_section (b, test_items[count].ns_section);
++  /* Semantically incorrect, but hide a T_PTR entry.  */
++  resolv_response_open_record (b, qname, qclass, qtype, 60);
++  resolv_response_add_name (b, "wrong.ptr.example.net");
++  resolv_response_close_record (b);
++}
++
++
++/* Perform one check using a reverse lookup.  */
++static void
++check_reverse (int af, int count)
++{
++  TEST_VERIFY (af == AF_INET || af == AF_INET6);
++  TEST_VERIFY (count < array_length (test_items));
++
++  char addr[sizeof (struct in6_addr)] = { 0 };
++  socklen_t addrlen;
++  if (af == AF_INET)
++    {
++      addr[0] = (char) 192;
++      addr[1] = (char) 168;
++      addr[2] = (char) 0;
++      addr[3] = (char) count;
++      addrlen = 4;
++    }
++  else
++    {
++      addr[0] = 0x20;
++      addr[1] = 0x01;
++      addr[2] = 0x0d;
++      addr[3] = 0xb8;
++      addr[4] = addr[5] = addr[6] = addr[7] = 0x0;
++      addr[8] = addr[9] = addr[10] = addr[11] = 0x0;
++      addr[12] = 0x0;
++      addr[13] = 0x0;
++      addr[14] = 0x0;
++      addr[15] = count;
++      addrlen = 16;
++    }
++
++  h_errno = 0;
++  struct hostent *answer = gethostbyaddr (addr, addrlen, af);
++  TEST_VERIFY (answer == NULL);
++  TEST_VERIFY (h_errno == NO_RECOVERY);
++  if (answer != NULL)
++    printf ("error: unexpected success: %s\n",
++	    support_format_hostent (answer));
++}
++
++static int
++do_test (void)
++{
++  struct resolv_test *obj = resolv_test_start
++    ((struct resolv_redirect_config)
++     {
++       .response_callback = response
++     });
++
++  for (int i = 0; test_items[i].test != NULL; i++)
++    {
++      check_reverse (AF_INET, i);
++      check_reverse (AF_INET6, i);
++    }
++
++  resolv_test_end (obj);
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+
+commit 426378547e6ddead92f28f5558a124eb0821d2f9
+Author: Carlos O'Donell <carlos@redhat.com>
+Date:   Fri Mar 20 17:14:33 2026 -0400
+
+    resolv: Check hostname for validity (CVE-2026-4438)
+    
+    The processed hostname in getanswer_ptr should be correctly checked to
+    avoid invalid characters from being allowed, including shell
+    metacharacters. It is a security issue to fail to check the returned
+    hostname for validity.
+    
+    A regression test is added for invalid metacharacters and other cases
+    of invalid or valid characters.
+    
+    No regressions on x86_64-linux-gnu.
+    
+    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+    (cherry picked from commit e10977481f4db4b2a3ce34fa4c3a1e26651ae312)
+
+diff --git a/resolv/Makefile b/resolv/Makefile
+index 0ba5fba710..088a22ea18 100644
+--- a/resolv/Makefile
++++ b/resolv/Makefile
+@@ -107,6 +107,7 @@ tests += \
+   tst-resolv-dns-section \
+   tst-resolv-edns \
+   tst-resolv-invalid-cname \
++  tst-resolv-invalid-ptr \
+   tst-resolv-network \
+   tst-resolv-noaaaa \
+   tst-resolv-noaaaa-vc \
+@@ -306,6 +307,8 @@ $(objpfx)tst-resolv-res_init-thread: $(objpfx)libresolv.so \
+   $(shared-thread-library)
+ $(objpfx)tst-resolv-invalid-cname: $(objpfx)libresolv.so \
+   $(shared-thread-library)
++$(objpfx)tst-resolv-invalid-ptr: $(objpfx)libresolv.so \
++  $(shared-thread-library)
+ $(objpfx)tst-resolv-noaaaa: $(objpfx)libresolv.so $(shared-thread-library)
+ $(objpfx)tst-resolv-noaaaa-vc: $(objpfx)libresolv.so $(shared-thread-library)
+ $(objpfx)tst-resolv-nondecimal: $(objpfx)libresolv.so $(shared-thread-library)
+diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
+index 27096edad2..1bc2e1df95 100644
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -866,7 +866,7 @@ getanswer_ptr (unsigned char *packet, size_t packetlen,
+ 	  char hname[MAXHOSTNAMELEN + 1];
+ 	  if (__ns_name_unpack (c.begin, c.end, rr.rdata,
+ 				name_buffer, sizeof (name_buffer)) < 0
+-	      || !__res_binary_hnok (expected_name)
++	      || !__res_binary_hnok (name_buffer)
+ 	      || __ns_name_ntop (name_buffer, hname, sizeof (hname)) < 0)
+ 	    {
+ 	      *h_errnop = NO_RECOVERY;
+diff --git a/resolv/tst-resolv-invalid-ptr.c b/resolv/tst-resolv-invalid-ptr.c
+new file mode 100644
+index 0000000000..0c802ab967
+--- /dev/null
++++ b/resolv/tst-resolv-invalid-ptr.c
+@@ -0,0 +1,255 @@
++/* Test handling of invalid T_PTR results (bug 34015).
++   Copyright (C) 2022-2026 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <array_length.h>
++#include <errno.h>
++#include <netdb.h>
++#include <resolv.h>
++#include <stdlib.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/format_nss.h>
++#include <support/resolv_test.h>
++#include <support/support.h>
++
++/* Name of test, the answer, the expected error return, and if we
++   expect the call to fail.  */
++struct item {
++  const char *test;
++  const char *answer;
++  int expected;
++  bool fail;
++};
++
++static const struct item test_items[] =
++  {
++    /* Test for invalid characters.  */
++    { "Invalid use of \"|\"",
++      "test.|.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"&\"",
++      "test.&.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \";\"",
++      "test.;.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"<\"",
++      "test.<.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \">\"",
++      "test.>.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"(\"",
++      "test.(.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \")\"",
++      "test.).ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"$\"",
++      "test.$.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"`\"",
++      "test.`.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"\\\"",
++      "test.\\.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"\'\"",
++      "test.'.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"\"\"",
++      "test.\".ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \" \"",
++      "test. .ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"\\t\"",
++      "test.\t.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"\\n\"",
++      "test.\n.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"\\r\"",
++      "test.\r.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"*\"",
++      "test.*.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"?\"",
++      "test.?.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"[\"",
++      "test.[.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"]\"",
++      "test.].ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \",\"",
++      "test.,.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"~\"",
++      "test.~.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \":\"",
++      "test.:.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"!\"",
++      "test.!.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"@\"",
++      "test.@.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"#\"",
++      "test.#.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"%\"",
++      "test.%%.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of \"^\"",
++      "test.^.ptr.example", NO_RECOVERY, true },
++
++    /* Test for invalid UTF-8 characters (2-byte, 4-byte, 6-byte).  */
++    { "Invalid use of UTF-8 (2-byte, U+00C0-U+00C2)",
++      "ÁÂÃ.test.ptr.example", NO_RECOVERY, true },
++    { "Invalid use of UTF-8 (4-byte, U+0750-U+0752)",
++      "ݐݑݒ.test.ptr.example", NO_RECOVERY, true },
++     { "Invalid use of UTF-8 (6-byte, U+0904-U+0906)",
++      "ऄअआ.test.ptr.example", NO_RECOVERY, true },
++
++    /* Test for "-" which may be valid depending on position.  */
++    { "Invalid leading \"-\"",
++      "-test.ptr.example", NO_RECOVERY, true },
++    { "Valid trailing \"-\"",
++      "test-.ptr.example", 0, false },
++    { "Valid mid-label use of \"-\"",
++      "te-st.ptr.example", 0, false },
++
++    /* Test for "_" which is always valid in any position.  */
++    { "Valid leading use of \"_\"",
++      "_test.ptr.example", 0, false },
++    { "Valid mid-label use of \"_\"",
++      "te_st.ptr.example", 0, false },
++    { "Valid trailing use of \"_\"",
++      "test_.ptr.example", 0, false },
++
++    /* Sanity test the broader set [A-Za-z0-9_-] of valid characters.  */
++    { "Valid \"[A-Z]\"",
++      "test.ABCDEFGHIJKLMNOPQRSTUVWXYZ.ptr.example", 0, false },
++    { "Valid \"[a-z]\"",
++      "test.abcdefghijklmnopqrstuvwxyz.ptr.example", 0, false },
++    { "Valid \"[0-9]\"",
++      "test.0123456789.ptr.example", 0, false },
++    { "Valid mixed use of \"[A-Za-z0-9_-]\"",
++      "test.012abcABZ_-.ptr.example", 0, false },
++  };
++
++static void
++response (const struct resolv_response_context *ctx,
++          struct resolv_response_builder *b,
++          const char *qname, uint16_t qclass, uint16_t qtype)
++{
++  TEST_COMPARE (qclass, C_IN);
++
++  /* We only test PTR.  */
++  TEST_COMPARE (qtype, T_PTR);
++
++  unsigned int count, count1;
++  char *tail = NULL;
++
++  /* The test implementation can handle up to 255 tests.  */
++  if (strstr (qname, "in-addr.arpa") != NULL
++      && sscanf (qname, "%u.%ms", &count, &tail) == 2)
++    TEST_COMPARE_STRING (tail, "0.168.192.in-addr.arpa");
++  else if (sscanf (qname, "%x.%x.%ms", &count, &count1, &tail) == 3)
++    {
++      TEST_COMPARE_STRING (tail, "\
++0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa");
++      count |= count1 << 4;
++    }
++  else
++    FAIL_EXIT1 ("invalid QNAME: %s\n", qname);
++  free (tail);
++
++  /* Cross check. Count has a fixed bound (soft limit).  */
++  TEST_VERIFY (count >= 0 && count <= 255);
++
++  /* We have a fixed number of tests (hard limit).  */
++  TEST_VERIFY_EXIT (count < array_length (test_items));
++
++  struct resolv_response_flags flags = {};
++  resolv_response_init (b, flags);
++  resolv_response_add_question (b, qname, qclass, qtype);
++  resolv_response_section (b, ns_s_an);
++
++  /* Actual answer record.  */
++  resolv_response_open_record (b, qname, qclass, qtype, 60);
++
++  /* Record the answer.  */
++  resolv_response_add_name (b, test_items[count].answer);
++  resolv_response_close_record (b);
++}
++
++/* Perform one check using a reverse lookup.  */
++static void
++check_reverse (int af, int count)
++{
++  TEST_VERIFY (af == AF_INET || af == AF_INET6);
++  TEST_VERIFY_EXIT (count < array_length (test_items));
++
++  /* Generate an address to query for each test.  */
++  char addr[sizeof (struct in6_addr)] = { 0 };
++  socklen_t addrlen;
++  if (af == AF_INET)
++    {
++      addr[0] = (char) 192;
++      addr[1] = (char) 168;
++      addr[2] = (char) 0;
++      addr[3] = (char) count;
++      addrlen = 4;
++    }
++  else
++    {
++      addr[0] = 0x20;
++      addr[1] = 0x01;
++      addr[2] = 0x0d;
++      addr[3] = 0xb8;
++      addr[4] = addr[5] = addr[6] = addr[7] = 0x0;
++      addr[8] = addr[9] = addr[10] = addr[11] = 0x0;
++      addr[12] = 0x0;
++      addr[13] = 0x0;
++      addr[14] = 0x0;
++      addr[15] = (char) count;
++      addrlen = 16;
++    }
++
++  h_errno = 0;
++  struct hostent *answer = gethostbyaddr (addr, addrlen, af);
++
++  /* Verify h_errno is as expected.  */
++  TEST_COMPARE (h_errno, test_items[count].expected);
++  if (h_errno != test_items[count].expected)
++    /* And print more information if it's not.  */
++    printf ("INFO: %s\n", test_items[count].test);
++
++  if (test_items[count].fail)
++    {
++      /* We expected a failure so verify answer is NULL.  */
++      TEST_VERIFY (answer == NULL);
++      /* If it's not NULL we should print out what we received.  */
++      if (answer != NULL)
++        printf ("error: unexpected success: %s\n",
++		support_format_hostent (answer));
++    }
++  else
++    /* We don't expect a failure so answer must be valid.  */
++    TEST_COMPARE_STRING (answer->h_name, test_items[count].answer);
++}
++
++static int
++do_test (void)
++{
++  struct resolv_test *obj = resolv_test_start
++    ((struct resolv_redirect_config)
++     {
++       .response_callback = response
++     });
++
++  for (int i = 0; i < array_length (test_items); i++)
++    {
++      check_reverse (AF_INET, i);
++      check_reverse (AF_INET6, i);
++    }
++  resolv_test_end (obj);
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+
+commit 68099ccc941664481386c62cba40bbc5dac8b00e
+Author: Xi Ruoyao <xry111@xry111.site>
+Date:   Tue Feb 3 16:20:12 2026 +0800
+
+    elf: parse /proc/self/maps as the last resort to find the gap for tst-link-map-contiguous-ldso
+    
+    The initialization process of libc.so calls mmap() several times and the
+    kernel may lay the maps into the gap.  If all pages in the gap are
+    occupied, the test would not be able to find the gap with mmap() and the
+    test would fail.
+    
+    The failure reproduces most frequently on LoongArch because with the
+    commonly used page size (16 KiB) the gap only contains 4 pages and the
+    probability they are all occupied is not near to zero.
+    
+    With the changes in the patch, a test run may output:
+    
+        info: ld.so link map is not contiguous
+        info: object "/dev/zero" found at 0x7ffff1fe0000 - 0x7ffff1fe4000
+        info: anonymous mapping found at 0x7ffff1fe4000 - 0x7ffff1fec000
+    
+    Also take the chance to fix a mistake in the "object found at" message
+    which has puzzled me during the initial debug session.
+    
+    Signed-off-by: Xi Ruoyao <xry111@xry111.site>
+    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+    (cherry picked from commit aed8390a6a22e5751fc12704c0c5f2a8271fc286)
+
+diff --git a/elf/tst-link-map-contiguous-ldso.c b/elf/tst-link-map-contiguous-ldso.c
+index 04de808bb2..f0e26682f2 100644
+--- a/elf/tst-link-map-contiguous-ldso.c
++++ b/elf/tst-link-map-contiguous-ldso.c
+@@ -18,15 +18,73 @@
+ 
+ #include <dlfcn.h>
+ #include <gnu/lib-names.h>
++#include <inttypes.h>
+ #include <link.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <support/check.h>
++#include <support/support.h>
+ #include <support/xdlfcn.h>
+ #include <support/xunistd.h>
++#include <support/xstdio.h>
+ #include <sys/mman.h>
+ #include <unistd.h>
+ 
++/* Slow path in case we cannot find a gap with mmap (when the runtime has
++   mapped all the pages in the gap for some reason).  */
++static bool
++find_gap_with_proc_self_map (const struct link_map *l)
++{
++  int pagesize = getpagesize ();
++
++  support_need_proc ("Reads /proc/self/maps to find gap in ld.so mapping");
++
++  /* Parse /proc/self/maps and find all the mappings in the ld.so range
++     but not from ld.so.  */
++  FILE *f = xfopen ("/proc/self/maps", "r");
++  char *line = NULL, *path_ldso = NULL;
++  size_t len;
++  bool found = false;
++  while (xgetline (&line, &len, f))
++    {
++      uintptr_t from, to;
++      char *path = NULL;
++      int r = sscanf (line, "%" SCNxPTR "-%" SCNxPTR "%*s%*s%*s%*s%ms",
++                      &from, &to, &path);
++
++      TEST_VERIFY (r == 2 || r == 3);
++      TEST_COMPARE (from % pagesize, 0);
++      TEST_COMPARE (to % pagesize, 0);
++
++      if (path_ldso == NULL && l->l_map_start == from)
++        {
++          TEST_COMPARE (r, 3);
++          path_ldso = path;
++          continue;
++        }
++
++      if (from > l->l_map_start && to < l->l_map_end
++          && (r == 2 || (path_ldso != NULL && strcmp (path, path_ldso))))
++        {
++          if (r == 2)
++            printf ("info: anonymous mapping found at 0x%" PRIxPTR " - 0x%"
++                    PRIxPTR "\n", from, to);
++          else
++            printf ("info: object \"%s\" found at 0x%" PRIxPTR " - 0x%"
++                    PRIxPTR "\n", path, from, to);
++
++          found = true;
++        }
++
++      free (path);
++    }
++
++  free (path_ldso);
++  free (line);
++  xfclose (f);
++  return found;
++}
++
+ static int
+ do_test (void)
+ {
+@@ -64,16 +122,18 @@ do_test (void)
+               if ((void *) dlfo.dlfo_link_map != (void *) l)
+                 {
+                   printf ("info: object \"%s\" found at %p\n",
+-                          dlfo.dlfo_link_map->l_name, ptr);
++                          dlfo.dlfo_link_map->l_name, expected);
+                   gap_found = true;
+                 }
+             }
+           else
+             TEST_COMPARE (dlfo_ret, -1);
++
+           xmunmap (ptr, 1);
+           addr += pagesize;
+         }
+-      if (!gap_found)
++
++      if (!gap_found && !find_gap_with_proc_self_map (l))
+         FAIL ("no ld.so gap found");
+     }
+   else
+
+commit a56a2943d2ce541102c630142c2eae0fbfc5886b
+Author: Michael Jeanson <mjeanson@efficios.com>
+Date:   Fri Feb 20 11:01:00 2026 -0500
+
+    tests: fix tst-rseq with Linux 7.0
+    
+    A sub-test of tst-rseq is to validate the return code and errno of the
+    rseq syscall when attempting to register the exact same rseq area as was
+    done in the dynamic loader.
+    
+    This involves finding the rseq area address by adding the
+    '__rseq_offset' to the thread pointer and calculating the area size from
+    the AT_RSEQ_FEATURE_SIZE auxiliary vector. However the test currently
+    calculates the size of the rseq area allocation in the TLS block which
+    must be a multiple of AT_RSEQ_ALIGN.
+    
+    Up until now that happened to be the same value since the feature size
+    and alignment exposed by the kernel were below the minimum ABI size of
+    32. Starting with Linux 7.0 the feature size has reached 33 while the
+    alignment is now 64.
+    
+    This results in the test trying to re-register the rseq area with a
+    different size and thus not getting the expected errno value.
+    
+    Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
+    Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+    (cherry picked from commit 67f303b47dc584f204e3f2441b9832082415eebc)
+
+diff --git a/sysdeps/unix/sysv/linux/tst-rseq.c b/sysdeps/unix/sysv/linux/tst-rseq.c
+index 00181cfefb..e83ea2b939 100644
+--- a/sysdeps/unix/sysv/linux/tst-rseq.c
++++ b/sysdeps/unix/sysv/linux/tst-rseq.c
+@@ -48,8 +48,7 @@ do_rseq_main_test (void)
+   size_t rseq_align = MAX (getauxval (AT_RSEQ_ALIGN), RSEQ_MIN_ALIGN);
+   size_t rseq_feature_size = MAX (getauxval (AT_RSEQ_FEATURE_SIZE),
+                                   RSEQ_AREA_SIZE_INITIAL_USED);
+-  size_t rseq_alloc_size = roundup (MAX (rseq_feature_size,
+-                                    RSEQ_AREA_SIZE_INITIAL_USED), rseq_align);
++  size_t rseq_reg_size = MAX (rseq_feature_size, RSEQ_AREA_SIZE_INITIAL);
+   struct rseq *rseq_abi = __thread_pointer () + __rseq_offset;
+ 
+   TEST_VERIFY_EXIT (rseq_thread_registered ());
+@@ -89,8 +88,8 @@ do_rseq_main_test (void)
+   /* Test a rseq registration with the same arguments as the internal
+      registration which should fail with errno == EBUSY.  */
+   TEST_VERIFY (((unsigned long) rseq_abi % rseq_align) == 0);
+-  TEST_VERIFY (__rseq_size <= rseq_alloc_size);
+-  int ret = syscall (__NR_rseq, rseq_abi, rseq_alloc_size, 0, RSEQ_SIG);
++  TEST_VERIFY (__rseq_size <= rseq_reg_size);
++  int ret = syscall (__NR_rseq, rseq_abi, rseq_reg_size, 0, RSEQ_SIG);
+   TEST_VERIFY (ret != 0);
+   TEST_COMPARE (errno, EBUSY);
+ }
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d513be55d715..a013a2db2f0c 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -51,7 +51,7 @@
 
 let
   version = "2.42";
-  patchSuffix = "-51";
+  patchSuffix = "-61";
   sha256 = "sha256-0XdeMuRijmTvkw9DW2e7Y691may2viszW58Z8WUJ8X8=";
 in
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation (
       /*
         No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
          $ git fetch --all -p && git checkout origin/release/2.40/master && git describe
-         glibc-2.42-51-gcbf39c26b2
+         glibc-2.42-61-ga56a2943d2
          $ git show --minimal --reverse glibc-2.42.. ':!ADVISORIES' > 2.42-master.patch
 
         To compare the archive contents zdiff can be used.
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index b62bac16e287..4fea97b7408d 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -42,8 +42,6 @@ in
     # override the patches in `common.nix` -- so instead you should
     # write `patches = (previousAttrs.patches or []) ++ [ ... ]`.
 
-    NIX_NO_SELF_RPATH = true;
-
     postConfigure = ''
       # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
       # This has to be done *after* `configure' because it builds some
@@ -68,6 +66,8 @@ in
     ];
 
     env = (previousAttrs.env or { }) // {
+      NIX_NO_SELF_RPATH = true;
+
       NIX_CFLAGS_COMPILE =
         (previousAttrs.env.NIX_CFLAGS_COMPILE or "")
         + lib.concatStringsSep " " (
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 7a86bec8d746..1b704e101443 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -115,7 +115,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-bad";
-  version = "1.26.5";
+  version = "1.26.11";
 
   outputs = [
     "out"
@@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${finalAttrs.version}.tar.xz";
-    hash = "sha256-mJDyYvOyqVZNy2KenraX13uT0fcYl+2hqBcLfc/nMpQ=";
+    hash = "sha256-EQ+4J5Xw5Wmx4nsSq5aZ01x3YuH/TblTNdasjRRCrz0=";
   };
 
   patches = [
@@ -431,6 +431,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = if enableGplPlugins then lib.licenses.gpl2Plus else lib.licenses.lgpl2Plus;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tmarkus ];
   };
 })
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index b3531d024121..6b1b2671e381 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-base";
-  version = "1.26.5";
+  version = "1.26.11";
 
   outputs = [
     "out"
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${finalAttrs.version}.tar.xz";
-    hash = "sha256-8MDibL7apXcyy2pXjozBOhFkvxjXN9VcMzBhxS8MSNc=";
+    hash = "sha256-/FD4hdQfXQQHzgh27HI12ee4LUjbL0vHLF8kSkrHkmM=";
   };
 
   strictDeps = true;
@@ -206,6 +206,6 @@ stdenv.mkDerivation (finalAttrs: {
       "gstreamer-video-1.0"
     ];
     platforms = lib.platforms.unix;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tmarkus ];
   };
 })
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 5179b6e5d5e5..4bf0b650b0b9 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -40,7 +40,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gstreamer";
-  version = "1.26.5";
+  version = "1.26.11";
 
   outputs = [
     "bin"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Cn7bDntC2+a1dfzmGkgIo/ayDghaHq7LwCXQ7CHx53Q=";
+    hash = "sha256-LgvRktBDjqYGpvdqlcjhZUIWdlb/7Cwrw6r27gg3+/Y=";
   };
 
   depsBuildBuild = [
@@ -156,6 +156,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
+      tmarkus
       ttuegel
     ];
   };
diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix
index 080760f4ed23..d9c788cfdd59 100644
--- a/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -28,7 +28,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-devtools";
-  version = "1.26.5";
+  version = "1.26.11";
 
   outputs = [
     "out"
@@ -37,29 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Y9Rqjv+ooiXiWkZLp1OKzoU/4NwecDZrJ8IIE15UAc4=";
+    hash = "sha256-Vl9IU4jJSYr+v3gAQYPN/xATEhEoZBqlbtql6pRBK+I=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs)
       src
-      patches
       cargoRoot
       ;
     name = "gst-devtools-${finalAttrs.version}";
-    hash = "sha256-gU+SBvxwmrGiyeKXF3SA2ohIHNTS4ZBC+elB0u1QKRE=";
+    hash = "sha256-sqN1IBkbrT3pQqUQKU2pr8G1t4kNMKk0NR7NH7dTvAE=";
   };
 
-  patches = [
-    # dots-viewer: sort static files
-    # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9208
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/b3099f78775eab1ac19a9e163c0386e01e74b768.patch";
-      stripLen = 2;
-      hash = "sha256-QRHqbZ6slYcwGl+o9Oi4jV+ANMorCED4cQV5qDS74eg=";
-    })
-  ];
-
   depsBuildBuild = [
     pkg-config
   ];
@@ -136,6 +125,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gstreamer.freedesktop.org";
     license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tmarkus ];
   };
 })
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 99ffb34f8b64..743c0e475e9a 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-editing-services";
-  version = "1.26.5";
+  version = "1.26.11";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-${finalAttrs.version}.tar.xz";
-    hash = "sha256-c0kAlE+Q7OXi85g8M1F4/aUAI/40KqdezZ2KnDi2TZ4=";
+    hash = "sha256-o26HkAtErBYIYS8tYW/AMvnX2SAyfE0jGv+2/pNJcU0=";
   };
 
   nativeBuildInputs = [
@@ -87,6 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gstreamer.freedesktop.org";
     license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tmarkus ];
   };
 })
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index b95e7110c6c0..9c531daf1486 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -78,7 +78,7 @@ assert raspiCameraSupport -> hostSupportsRaspiCamera;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-good";
-  version = "1.26.5";
+  version = "1.26.11";
 
   outputs = [
     "out"
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6whi6TQEsHPpjsUDUOzn5mheopNsq4EYwrjpOOLL6os=";
+    hash = "sha256-AB3rCHbV10PNNEir90onrew/2FABL8sbAJlIYb1sEUU=";
   };
 
   patches = [
@@ -305,6 +305,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tmarkus ];
   };
 })
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 66573381c184..05319b971754 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-libav";
-  version = "1.26.5";
+  version = "1.26.11";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${finalAttrs.version}.tar.xz";
-    hash = "sha256-1t4FiE70I3bdjN6JlA97UM7Zb09vUoiOdkzYIz508FI=";
+    hash = "sha256-m7PSaB7w3pLRsanZVRhiNu4i5k83Lbm/wNIuLQ3xmGU=";
   };
 
   nativeBuildInputs = [
@@ -73,6 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gstreamer.freedesktop.org";
     license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tmarkus ];
   };
 })
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index e3bc29fec294..4a77e4a43e8d 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -261,6 +261,6 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl21Plus
     ];
     platforms = lib.platforms.unix;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tmarkus ];
   };
 })
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 1fbc9f19cd2a..182433745fd4 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-rtsp-server";
-  version = "1.26.5";
+  version = "1.26.11";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Mo3/JFdBloPypPBsoRnP0ivrYyzuGtaDBZEhMyU1PEQ=";
+    hash = "sha256-th1DBNjOqqoboTn7HOk18E8ac9fhgkPAoFsvsEMFQG8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index d3670fa88cc1..3f225da93ed1 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -27,7 +27,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-ugly";
-  version = "1.26.5";
+  version = "1.26.11";
 
   outputs = [
     "out"
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${finalAttrs.version}.tar.xz";
-    hash = "sha256-PfxDQ1vpfhEIFrrG1gKw8gagOFRieWg9nSU3L/En21I=";
+    hash = "sha256-v5yfcu43SCXP1DhowoW8sBcA3yWEBp51169FX+SCRPg=";
   };
 
   nativeBuildInputs = [
@@ -118,6 +118,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = if enableGplPlugins then lib.licenses.gpl2Plus else lib.licenses.lgpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tmarkus ];
   };
 })
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index dd98ca848a7f..903be8f1e245 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -36,7 +36,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gstreamer-vaapi";
-  version = "1.26.5";
+  version = "1.26.11";
 
   outputs = [
     "out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-${finalAttrs.version}.tar.xz";
-    hash = "sha256-tC1E22PzGVpvMyluHq0ywU0B7ydFK3Bo8aLYZiT1Xqk=";
+    hash = "sha256-8S+TAnPHodPg1/hblP+dE3nRYqzMky6Mo9OJk+0n/Kw=";
   };
 
   nativeBuildInputs = [
@@ -112,6 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gstreamer.freedesktop.org";
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tmarkus ];
   };
 })
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 5e74e9ec0e9b..9a0bb2387e80 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -22,11 +22,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libunistring";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "mirror://gnu/libunistring/libunistring-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ElQq12GUcO/ZWmIxdNzUs2TySDyvcIxr7oN8tTpUy50=";
+    hash = "sha256-6CZksXAGTmIzGWISayWdRS1Tsie7SpOrIAQNhG/sAdg=";
   };
 
   outputs = [
diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/development/libraries/mbedtls/generic.nix
index df19340cf0d8..2a7f436e9c67 100644
--- a/pkgs/development/libraries/mbedtls/generic.nix
+++ b/pkgs/development/libraries/mbedtls/generic.nix
@@ -54,6 +54,23 @@ stdenv.mkDerivation rec {
     # the repository and do not need to be regenerated. See:
     # https://github.com/Mbed-TLS/mbedtls/releases/tag/v3.3.0 below "Requirement changes".
     "-DGEN_FILES=off"
+  ]
+  ++ lib.optionals stdenv.cc.isGNU [
+    # mbedtls widely uses a pattern of starting unions with an
+    # unsigned int dummy member, and then initializing those unions to
+    # { 0 }.  The problem with this is that it only initializes that
+    # first union member, so in the common case where the non-dummy
+    # members are larger than the dummy member, they will only be
+    # partially initialized since GCC 15[1].  Upstream has added
+    # ad-hoc memset calls to mitigate this issue, but initializers are
+    # also still widely used.  To avoid the risk of using
+    # uninitialized memory, force the compiler to zero all bits of
+    # unions, not just the first element, until upstream has a
+    # systemic fix in place[2].
+    #
+    # [1]: https://gcc.gnu.org/gcc-15/changes.html
+    # [2]: https://github.com/Mbed-TLS/mbedtls/issues/9885
+    "-DCMAKE_C_FLAGS=-fzero-init-padding-bits=unions"
   ];
 
   doCheck = true;
diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix
index 5e7743f117b6..fb64f9e70d60 100644
--- a/pkgs/development/libraries/mesa/darwin.nix
+++ b/pkgs/development/libraries/mesa/darwin.nix
@@ -127,6 +127,10 @@ stdenv.mkDerivation {
 
   mesonBuildType = "release";
 
+  postFixup = ''
+    install_name_tool -add_rpath "$out/lib" "$out/lib/libGL.dylib"
+  '';
+
   passthru = {
     # needed to pass evaluation of bad platforms
     driverLink = throw "driverLink not supported on darwin";
diff --git a/pkgs/development/libraries/mesa/gbm.nix b/pkgs/development/libraries/mesa/gbm.nix
index af461413c200..e4f36f7f1779 100644
--- a/pkgs/development/libraries/mesa/gbm.nix
+++ b/pkgs/development/libraries/mesa/gbm.nix
@@ -20,14 +20,14 @@ stdenv.mkDerivation rec {
 
   # We don't use the versions from common.nix, because libgbm is a world rebuild,
   # so the updates need to happen separately on staging.
-  version = "25.1.0";
+  version = "26.0.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-UlI+6OMUj5F6uVAw+Mg2wOZrjfdRq73d1qufaXVI/go";
+    hash = "sha256-CTOnJKsx9hDtLhDnuJSGc/lBQ2ZcDm3/Iie7awusGho=";
   };
 
   mesonAutoFeatures = "disabled";
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index ef64f8584f54..4c5e9de01c39 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ngtcp2";
-  version = "1.19.0";
+  version = "1.22.0";
 
   src = fetchurl {
     url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${finalAttrs.version}/ngtcp2-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-snZBbT1cChV4En+8Q2qXLRD0vK66g6aj2ukbQcxRqTI=";
+    hash = "sha256-P+q2i4PqGpbXur+mxvYYaYmJ2+HAm9dglpuCJ429GGM=";
   };
 
   outputs = [
diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix
index e047a0c7e5a6..234ef4809cd2 100644
--- a/pkgs/development/libraries/nss/latest.nix
+++ b/pkgs/development/libraries/nss/latest.nix
@@ -5,8 +5,8 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
 
 import ./generic.nix {
-  version = "3.123";
-  hash = "sha256-Ue98HQIvVWcn42xrbheOAdZmvfAdOTWp83VhHSGuAVc=";
+  version = "3.123.1";
+  hash = "sha256-SwgcOG0nl1oCOhy7Supxz1KigPozSrDCloypVaFMSOc=";
   filename = "latest.nix";
   versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
 }
diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index 24287d428065..70353953b642 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openexr";
-  version = "3.3.5";
+  version = "3.3.8";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "openexr";
     rev = "v${version}";
-    hash = "sha256-J1SButHDPy0gGkVOZKfemaMF0MY/lifB5n39+3GRKR8=";
+    hash = "sha256-bJJdfr+OybCl8L27m1uRynGaU1V8D70bSzQjkDuqMDU=";
   };
 
   outputs = [
diff --git a/pkgs/development/libraries/openssl/3.5/openssl-aes-gcm-ppc-remove-localentry-directive.patch b/pkgs/development/libraries/openssl/3.5/openssl-aes-gcm-ppc-remove-localentry-directive.patch
new file mode 100644
index 000000000000..43e6d333844d
--- /dev/null
+++ b/pkgs/development/libraries/openssl/3.5/openssl-aes-gcm-ppc-remove-localentry-directive.patch
@@ -0,0 +1,65 @@
+From 5aaa7e5fdc59e88a13d2911cb86d814d4e2669da Mon Sep 17 00:00:00 2001
+From: Danny Tsen <dtsen@us.ibm.com>
+Date: Wed, 28 Jan 2026 07:23:13 -0500
+Subject: [PATCH] aes-gcm-ppc.pl: Removed .localentry directive
+
+Otherwise there is mixing of  ELFv1 ABI and ELFv2 ABI directives
+and PPC64 big endian builds fail.
+
+Fixes #29815
+
+Signed-off-by: Danny Tsen <dtsen@us.ibm.com>
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+MergeDate: Tue Feb  3 08:39:50 2026
+(Merged from https://github.com/openssl/openssl/pull/29827)
+---
+ crypto/modes/asm/aes-gcm-ppc.pl | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/crypto/modes/asm/aes-gcm-ppc.pl b/crypto/modes/asm/aes-gcm-ppc.pl
+index 68918a9305a2b..fd5dcc22a6117 100644
+--- a/crypto/modes/asm/aes-gcm-ppc.pl
++++ b/crypto/modes/asm/aes-gcm-ppc.pl
+@@ -409,7 +409,6 @@
+ ################################################################################
+ .align 4
+ aes_gcm_crypt_1x:
+-.localentry	aes_gcm_crypt_1x,0
+ 
+ 	cmpdi	5, 16
+ 	bge	__More_1x
+@@ -492,7 +491,6 @@
+ ################################################################################
+ .align 4
+ __Process_partial:
+-.localentry	__Process_partial,0
+ 
+ 	# create partial mask
+ 	vspltisb 16, -1
+@@ -564,7 +562,6 @@
+ .global ppc_aes_gcm_encrypt
+ .align 5
+ ppc_aes_gcm_encrypt:
+-.localentry     ppc_aes_gcm_encrypt,0
+ 
+ 	SAVE_REGS
+ 	LOAD_HASH_TABLE
+@@ -752,7 +749,6 @@
+ .global ppc_aes_gcm_decrypt
+ .align 5
+ ppc_aes_gcm_decrypt:
+-.localentry	ppc_aes_gcm_decrypt, 0
+ 
+ 	SAVE_REGS
+ 	LOAD_HASH_TABLE
+@@ -1032,7 +1028,6 @@
+ .size   ppc_aes_gcm_decrypt,.-ppc_aes_gcm_decrypt
+ 
+ aes_gcm_out:
+-.localentry	aes_gcm_out,0
+ 
+ 	mr	3, 11			# return count
+ 
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 0d69d6e44ac2..bfbfe1de963e 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -486,6 +486,10 @@ in
         else
           ./3.5/use-etc-ssl-certs.patch
       )
+
+      # Don't cause ELF ABI mismatch on powerpc64
+      # https://github.com/openssl/openssl/issues/29815
+      ./3.5/openssl-aes-gcm-ppc-remove-localentry-directive.patch
     ]
     ++ lib.optionals stdenv.hostPlatform.isMinGW [
       ./3.5/fix-mingw-linking.patch
@@ -522,6 +526,10 @@ in
         else
           ./3.5/use-etc-ssl-certs.patch
       )
+
+      # Don't cause ELF ABI mismatch on powerpc64
+      # https://github.com/openssl/openssl/issues/29815
+      ./3.5/openssl-aes-gcm-ppc-remove-localentry-directive.patch
     ]
     ++ lib.optionals stdenv.hostPlatform.isMinGW [
       # Fix from https://github.com/openssl/openssl/pull/29826
diff --git a/pkgs/development/libraries/protobuf/33.nix b/pkgs/development/libraries/protobuf/33.nix
index a1973638f0eb..25455d41d31d 100644
--- a/pkgs/development/libraries/protobuf/33.nix
+++ b/pkgs/development/libraries/protobuf/33.nix
@@ -2,8 +2,8 @@
 
 callPackage ./generic.nix (
   {
-    version = "33.5";
-    hash = "sha256-bn8wMZSAqukZyo+fLT4O044ld53FvIfCdajr2WwM93E=";
+    version = "33.6";
+    hash = "sha256-Uoj1Q5D+ofWFc/GPOgOHgIWVwKrpJrpkHMpL+yU0/k8=";
   }
   // args
 )
diff --git a/pkgs/development/libraries/protobuf/34.nix b/pkgs/development/libraries/protobuf/34.nix
index eec03e75e67f..ec10fc8824d8 100644
--- a/pkgs/development/libraries/protobuf/34.nix
+++ b/pkgs/development/libraries/protobuf/34.nix
@@ -2,8 +2,8 @@
 
 callPackage ./generic.nix (
   {
-    version = "34.0";
-    hash = "sha256-qtSP3I7RA7F6tKe+VfGd+oNXMT5HZ/Xl7u4vkefNxX4=";
+    version = "34.1";
+    hash = "sha256-PaIVJ8NtgnrqowbKLkX+uprsQjuxDch9AUxX4YBBNh4=";
   }
   // args
 )
diff --git a/pkgs/development/libraries/protobuf/fix-upb-packed-enum-be.patch b/pkgs/development/libraries/protobuf/fix-upb-packed-enum-be.patch
new file mode 100644
index 000000000000..e4ce3b891c8e
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/fix-upb-packed-enum-be.patch
@@ -0,0 +1,22 @@
+From 3935d8b9fd740e0ed45fade633ab967baee1dfcc Mon Sep 17 00:00:00 2001
+From: Jonathan Albrecht <jonathan.albrecht@ibm.com>
+Date: Tue, 3 Feb 2026 15:07:37 -0500
+Subject: [PATCH] Fix an endian problem when memcpying in
+ _upb_Decoder_DecodeEnumPacked
+
+---
+ upb/wire/decode.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/upb/wire/decode.c b/upb/wire/decode.c
+index 9b050866b45ea..0810ba3e6116b 100644
+--- a/upb/wire/decode.c
++++ b/upb/wire/decode.c
+@@ -359,6 +359,7 @@ static const char* _upb_Decoder_DecodeEnumPacked(
+       _upb_Decoder_AddEnumValueToUnknown(d, msg, field, &elem);
+       continue;
+     }
++    _upb_Decoder_MungeInt32(&elem);
+     if (_upb_Decoder_Reserve(d, arr, 1)) {
+       out = UPB_PTR_AT(upb_Array_MutableDataPtr(arr),
+                        arr->UPB_PRIVATE(size) * 4, void);
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 2b8ac3fd864c..91e6bc878b01 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -65,6 +65,17 @@ stdenv.mkDerivation (finalAttrs: {
         hash = "sha256-2/vc4anc+kH7otfLHfBtW8dRowPyObiXZn0+HtQktak=";
       })
     ]
+    ++ lib.optionals (lib.versionAtLeast version "33") [
+      # Fix protoc plugins crashing on big-endian platforms
+      # https://github.com/protocolbuffers/protobuf/pull/25363
+      (fetchpatch {
+        url = "https://github.com/protocolbuffers/protobuf/commit/8282f0f8ecf8b847e5964a308e041ba3b049811c.patch";
+        hash = "sha256-4c/yLuAd29Cxrz6I9F2Lj02lW2bazIcGb+86uxZY7qA=";
+      })
+      # Fix packed enum decoding on big-endian platforms
+      # https://github.com/protocolbuffers/protobuf/pull/25683
+      ./fix-upb-packed-enum-be.patch
+    ]
     ++ lib.optionals (lib.versionAtLeast version "34") [
       # upb linker-array fix for newer toolchains (notably GCC 15):
       # `UPB_linkarr_internal_empty_upb_AllExts` can conflict with extension
diff --git a/pkgs/development/libraries/qdjango/default.nix b/pkgs/development/libraries/qdjango/default.nix
index 1105f2839325..d0f1a66b440a 100644
--- a/pkgs/development/libraries/qdjango/default.nix
+++ b/pkgs/development/libraries/qdjango/default.nix
@@ -5,6 +5,7 @@
   testers,
   doxygen,
   qmake,
+  qtbase,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -55,7 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
-  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  preCheck = ''
+    export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
     # at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path.
     # for some reason, this doesn't work when just exporting the needed paths even though the autogenerated wrappers
     # should at most prepend paths? just patch them into the wrappers instead
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 2e4d3c1b1997..e9856f26c034 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -49,6 +49,10 @@ let
         url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/81b14ae4eed038662b53cd20786fd5e0816279ec/community/qt5-qtbase/loongarch64.patch";
         hash = "sha256-BnpejF6/L73kVVts0R0/OMbVN8G4DXVFwBMJPLU9QbE=";
       })
+      (fetchpatch {
+        url = "https://salsa.debian.org/qt-kde-team/qt/qtbase/-/raw/6910758e1141f8ea65a8f2359ac30163d65bf6e2/debian/patches/cross_build_mysql.diff";
+        hash = "sha256-tzmmLmMXmeDwRVjdpWekDJvSkrIIlslC12HP7XPcm3E=";
+      })
     ];
     qtdeclarative = [
       ./qtdeclarative.patch
@@ -185,52 +189,6 @@ let
         hash = "sha256-B/z/+tai01RU/bAJSCp5a0/dGI8g36nwso8MiJv27YM=";
       })
     ];
-    qtwebengine = [
-      ./qtwebengine-link-pulseaudio.patch
-      # Fixes Chromium build failure with Ninja 1.12.
-      # See: https://bugreports.qt.io/browse/QTBUG-124375
-      # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09
-      ./qtwebengine-ninja-1.12.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./qtwebengine-darwin-no-platform-check.patch
-      ./qtwebengine-mac-dont-set-dsymutil-path.patch
-      ./qtwebengine-darwin-checks.patch
-    ];
-    qtwebkit = [
-      (fetchpatch {
-        name = "qtwebkit-python39-json.patch";
-        url = "https://github.com/qtwebkit/qtwebkit/commit/78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch";
-        sha256 = "yCX/UL666BPxjnxT6rIsUrJsPcSWHhZwMFJfuHhbkhk=";
-      })
-      (fetchpatch {
-        name = "qtwebkit-bison-3.7-build.patch";
-        url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
-        sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
-      })
-      (fetchpatch {
-        name = "qtwebkit-glib-2.68.patch";
-        url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch";
-        sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0";
-      })
-      (fetchpatch {
-        name = "qtwebkit-darwin-handle.patch";
-        url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch";
-        sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE=";
-      })
-      (fetchpatch {
-        name = "qtwebkit-libxml2-api-change.patch";
-        url = "https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch";
-        sha256 = "WZEj+UuKhgJBM7auhND3uddk1wWdTY728jtiWVe7CSI=";
-      })
-      ./qtwebkit.patch
-      ./qtwebkit-icu68.patch
-      ./qtwebkit-cstdint.patch
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      ./qtwebkit-darwin-no-readline.patch
-      ./qtwebkit-darwin-no-qos-classes.patch
-    ];
     qttools = [ ./qttools.patch ];
   };
 
@@ -311,26 +269,8 @@ let
       qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix { };
       qtwayland = callPackage ../modules/qtwayland.nix { };
       qtwebchannel = callPackage ../modules/qtwebchannel.nix { };
-      qtwebengine =
-        # Actually propagating stdenv change
-        let
-          # Won’t build with Clang 20, as `-Wenum-constexpr-conversion`
-          # was made a hard error.
-          # qt5webengine no longer maintained, FTBFS with GCC 15
-          stdenv' = if stdenv.cc.isClang then llvmPackages_19.stdenv else gcc14Stdenv;
-          qtModule' = qtModuleWithStdenv stdenv';
-        in
-        callPackage ../modules/qtwebengine.nix {
-          inherit (srcs.qtwebengine) version;
-          inherit (darwin) bootstrap_cmds;
-          stdenv = stdenv';
-          qtModule = qtModule';
-          python = python3;
-        };
       qtwebglplugin = callPackage ../modules/qtwebglplugin.nix { };
-      qtwebkit = callPackage ../modules/qtwebkit.nix { };
       qtwebsockets = callPackage ../modules/qtwebsockets.nix { };
-      qtwebview = callPackage ../modules/qtwebview.nix { };
       qtx11extras = callPackage ../modules/qtx11extras.nix { };
       qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix { };
 
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch
deleted file mode 100644
index 213fb624dab1..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/configure.pri b/configure.pri
-index 3a33bdc82..c1460b8b5 100644
---- a/configure.pri
-+++ b/configure.pri
-@@ -442,24 +442,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) {
- }
- 
- defineTest(qtwebengine_isMacOsPlatformSupported) {
--    !qtwebengine_isMinXcodeVersion(10, 0, 0) {
--        qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.")
--        return(false)
--    }
--    !clang|intel_icc {
--        qtwebengine_platformError("requires Clang.")
--        return(false)
--    }
--    # We require macOS 10.13 (darwin version 17.0.0) or newer.
--    darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
--    lessThan(darwin_major_version, 17) {
--        qtwebengine_platformError("requires macOS version 10.13 or newer.")
--        return(false)
--    }
--    !qtwebengine_isMinOSXSDKVersion(10, 13): {
--        qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
--        return(false)
--    }
-     CONFIG(debug, debug|release):isUniversal(){
-         qtwebengine_platformError("Universal builds can not be done with debug configuration due to large binary size.")
-         return(false)
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch
deleted file mode 100644
index 86663ee80b57..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri
---- a/src/buildtools/config/mac_osx.pri
-+++ b/src/buildtools/config/mac_osx.pri
-@@ -5,8 +5,6 @@ load(functions)
- # otherwise query for it.
- QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
- isEmpty(QMAKE_MAC_SDK_VERSION) {
--     QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null")
--     isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
- }
- 
- # chromium/build/mac/find_sdk.py expects the SDK version (mac_sdk_min) in Major.Minor format.
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch
deleted file mode 100644
index 052ec89dbc17..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/src/core/config/common.pri
-+++ b/src/core/config/common.pri
-@@ -47,3 +47,5 @@
-
- !qtConfig(webengine-nodejs10): gn_args += use_rollup=false
- gn_args += enable_ipc_logging=false
-+
-+gn_args += link_pulseaudio=true
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch
deleted file mode 100644
index dcdf5f57ffdc..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn
---- a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn
-+++ b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn
-@@ -184,8 +184,6 @@ template("mac_toolchain") {
-     # If dSYMs are enabled, this flag will be added to the link tools.
-     if (_enable_dsyms) {
-       dsym_switch = " -Wcrl,dsym,{{root_out_dir}} "
--      dsym_switch += "-Wcrl,dsymutilpath," +
--                     "${prefix}dsymutil" + " "
- 
-       dsym_output_dir =
-           "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM"
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch
deleted file mode 100644
index c70788516fd4..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/src/3rdparty/chromium/content/public/browser/BUILD.gn b/src/3rdparty/chromium/content/public/browser/BUILD.gn
---- a/src/3rdparty/chromium/content/public/browser/BUILD.gn	1969-12-31 19:00:01.000000000 -0500
-+++ b/src/3rdparty/chromium/content/public/browser/BUILD.gn	2024-05-29 22:12:36.416136269 -0400
-@@ -469,6 +469,7 @@
-     "//build:chromeos_buildflags",
-     "//cc",
-     "//components/viz/host",
-+    "//components/spellcheck:buildflags",
-     "//content/browser",  # Must not be public_deps!
-     "//device/fido",
-     "//gpu",
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit-cstdint.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-cstdint.patch
deleted file mode 100644
index 6ef551575e12..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebkit-cstdint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h
---- qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me	2023-02-20 15:40:04.045911245 +0100
-+++ qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h	2023-02-20 15:40:39.038549787 +0100
-@@ -16,6 +16,7 @@
- #include <algorithm>
- #include <string.h>
- #include <stdlib.h>
-+#include <cstdint>
- 
- namespace gl
- {
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch
deleted file mode 100644
index a7087f517623..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
---- a/Source/cmake/OptionsQt.cmake
-+++ b/Source/cmake/OptionsQt.cmake
-@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG)
- endif ()
- 
- if (APPLE)
--    SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1)
- endif ()
- 
- if (ENABLE_MATHML)
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch
deleted file mode 100644
index 4871032f6f2c..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
---- a/Source/JavaScriptCore/shell/CMakeLists.txt
-+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
-@@ -9,7 +9,6 @@ set(JSC_LIBRARIES
- )
- 
- if (WTF_OS_MAC_OS_X)
--    list(APPEND JSC_LIBRARIES edit)
- endif ()
- 
- if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC")
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -563,7 +563,6 @@
- #if PLATFORM(IOS)
- 
- #define HAVE_NETWORK_EXTENSION 1
--#define HAVE_READLINE 1
- #if USE(APPLE_INTERNAL_SDK)
- #define USE_CFNETWORK 1
- #endif
-@@ -650,7 +649,6 @@
- #define HAVE_MADV_DONTNEED 1
- #define HAVE_MERGESORT 1
- #define HAVE_PTHREAD_SETNAME_NP 1
--#define HAVE_READLINE 1
- #define HAVE_SYS_TIMEB_H 1
- 
- #if !PLATFORM(GTK) && !PLATFORM(QT)
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch
deleted file mode 100644
index 73463d7567a3..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebkit-icu68.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
-Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
-        ucnv_setFallback(m_converterICU, TRUE);
-                                         ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
-In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
-Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
-            isAccessible = TRUE;
-                           ^
-Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
-            isAccessible = FALSE;
-                           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
-            return TRUE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
-            return FALSE;
-                   ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
-        return FALSE;
-               ^
-Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
-    return TRUE;
-           ^
-
---- a/Source/WebCore/platform/text/TextCodecICU.cpp
-+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
-@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
-     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
-     ASSERT(U_SUCCESS(err));
-     if (m_converterICU)
--        ucnv_setFallback(m_converterICU, TRUE);
-+        ucnv_setFallback(m_converterICU, true);
- }
- 
- int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
---- a/Source/WebCore/platform/text/icu/UTextProvider.h
-+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
-@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
-             text->chunkOffset = text->chunkLength;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     } else {
-@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
-             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
-             ASSERT(offset < std::numeric_limits<int32_t>::max());
-             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
--            isAccessible = TRUE;
-+            isAccessible = true;
-             return true;
-         }
-         if (nativeIndex <= 0 && !text->chunkNativeStart) {
-             text->chunkOffset = 0;
--            isAccessible = FALSE;
-+            isAccessible = false;
-             return true;
-         }
-     }
---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
-@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
-         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (index >= length && uText->chunkNativeLimit == length) {
-             // Off the end of the buffer, but we can't get it.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return FALSE;
-+            return false;
-         }
-     } else {
-         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
-             // Already inside the buffer. Set the new offset.
-             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
--            return TRUE;
-+            return true;
-         }
-         if (!index && !uText->chunkNativeStart) {
-             // Already at the beginning; can't go any farther.
-             uText->chunkOffset = 0;
--            return FALSE;
-+            return false;
-         }
-     }
-     
-@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
- 
-     uText->nativeIndexingLimit = uText->chunkLength;
- 
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
-@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
- static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
-@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
- static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
- {
-     if (!text->context)
--        return FALSE;
-+        return false;
-     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
-     UBool isAccessible;
-     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
-@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
-         ASSERT(newContext == UTextProviderContext::PriorContext);
-         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
-     }
--    return TRUE;
-+    return true;
- }
- 
- static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch
deleted file mode 100644
index b94a4b76cbab..000000000000
--- a/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake
---- a/Source/WebKit2/PlatformQt.cmake
-+++ b/Source/WebKit2/PlatformQt.cmake
-@@ -261,6 +261,7 @@
- list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
-     ${GLIB_INCLUDE_DIRS}
-     ${GSTREAMER_INCLUDE_DIRS}
-+    ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
-     ${Qt5Quick_INCLUDE_DIRS}
-     ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
-     ${SQLITE_INCLUDE_DIR}
-
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index 07b617c7b97d..87a7bb97707d 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -43,18 +43,6 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
     };
   };
 
-  # qtwebkit does not have an official release tarball on the qt mirror and is
-  # mostly maintained by the community.
-  qtwebkit = rec {
-    src = fetchFromGitHub {
-      owner = "qt";
-      repo = "qtwebkit";
-      rev = "v${version}";
-      sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
-    };
-    version = "5.212.0-alpha4";
-  };
-
   # qtsystems has no official releases
   qtsystems = {
     version = "unstable-2019-01-03";
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 028b9e4e2d93..cf2b8fdf7e27 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -15,6 +15,8 @@
   perl,
   pkg-config,
   python3,
+  copyPathToStore,
+  makeSetupHook,
   which,
   # darwin support
   xcbuild,
@@ -63,8 +65,7 @@
   # options
   libGLSupported ? !stdenv.hostPlatform.isDarwin,
   libGL,
-  # qmake detection for libmysqlclient does not seem to work when cross compiling
-  mysqlSupport ? stdenv.hostPlatform == stdenv.buildPlatform,
+  mysqlSupport ? true,
   libmysqlclient,
   buildExamples ? false,
   buildTests ? false,
@@ -84,6 +85,23 @@ let
       "linux-generic-g++"
     else
       throw "Please add a qtPlatformCross entry for ${plat.config}";
+  qtPluginPrefix = "lib/qt-${qtCompatVersion}/plugins";
+  qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml";
+  qtDocPrefix = "share/doc/qt-${qtCompatVersion}";
+  fix_qt_builtin_paths = copyPathToStore ../hooks/fix-qt-builtin-paths.sh;
+  fix_qt_module_paths = copyPathToStore ../hooks/fix-qt-module-paths.sh;
+
+  devTools = [
+    "bin/fixqt4headers.pl"
+    "bin/moc"
+    "bin/qdbuscpp2xml"
+    "bin/qdbusxml2cpp"
+    "bin/qlalr"
+    "bin/qmake"
+    "bin/rcc"
+    "bin/syncqt.pl"
+    "bin/uic"
+  ];
 in
 
 stdenv.mkDerivation (
@@ -92,7 +110,6 @@ stdenv.mkDerivation (
     {
       pname = "qtbase";
       inherit qtCompatVersion src version;
-      debug = debugSymbols;
 
       propagatedBuildInputs = [
         libxml2
@@ -136,7 +153,9 @@ stdenv.mkDerivation (
           libxcb-render-util
           libxcb-wm
         ]
-        ++ lib.optional libGLSupported libGL
+        ++ lib.optionals libGLSupported [
+          libGL
+        ]
       );
 
       buildInputs = [
@@ -146,10 +165,18 @@ stdenv.mkDerivation (
       ++ lib.optionals (!stdenv.hostPlatform.isDarwin) (
         lib.optional withLibinput libinput ++ lib.optional withGtk3 gtk3
       )
-      ++ lib.optional developerBuild gdb
-      ++ lib.optional (cups != null) cups
-      ++ lib.optional mysqlSupport libmysqlclient
-      ++ lib.optional (libpq != null) libpq;
+      ++ lib.optionals developerBuild [
+        gdb
+      ]
+      ++ lib.optionals (cups != null) [
+        cups
+      ]
+      ++ lib.optionals mysqlSupport [
+        libmysqlclient
+      ]
+      ++ lib.optionals (libpq != null) [
+        libpq
+      ];
 
       nativeBuildInputs = [
         bison
@@ -160,8 +187,12 @@ stdenv.mkDerivation (
         pkg-config
         which
       ]
-      ++ lib.optionals mysqlSupport [ libmysqlclient ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+      ++ lib.optionals mysqlSupport [
+        libmysqlclient
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        xcbuild
+      ];
 
     }
     // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
@@ -192,11 +223,9 @@ stdenv.mkDerivation (
 
       inherit patches;
 
-      fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh;
-      fix_qt_module_paths = ../hooks/fix-qt-module-paths.sh;
       preHook = ''
-        . "$fix_qt_builtin_paths"
-        . "$fix_qt_module_paths"
+        . ${fix_qt_builtin_paths}
+        . ${fix_qt_module_paths}
         . ${../hooks/move-qt-dev-tools.sh}
         . ${../hooks/fix-qmake-libtool.sh}
       '';
@@ -204,13 +233,13 @@ stdenv.mkDerivation (
       postPatch = ''
         for prf in qml_plugin.prf qt_plugin.prf qt_docs.prf qml_module.prf create_cmake.prf; do
             substituteInPlace "mkspecs/features/$prf" \
-                --subst-var qtPluginPrefix \
-                --subst-var qtQmlPrefix \
-                --subst-var qtDocPrefix
+                --subst-var-by qtPluginPrefix ${qtPluginPrefix} \
+                --subst-var-by qtQmlPrefix ${qtQmlPrefix} \
+                --subst-var-by qtDocPrefix ${qtDocPrefix}
         done
 
-        substituteInPlace configure --replace /bin/pwd pwd
-        substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
+        substituteInPlace configure --replace-fail /bin/pwd pwd
+        substituteInPlace src/corelib/global/global.pri --replace-fail /bin/ls ${coreutils}/bin/ls
         sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i mkspecs/*/*.conf
 
         sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5Config.cmake.in
@@ -260,20 +289,16 @@ stdenv.mkDerivation (
           ''
       );
 
-      qtPluginPrefix = "lib/qt-${qtCompatVersion}/plugins";
-      qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml";
-      qtDocPrefix = "share/doc/qt-${qtCompatVersion}";
-
       setOutputFlags = false;
       preConfigure = ''
         export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
 
-        NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
+        NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\""
 
         # paralellize compilation of qtmake, which happens within ./configure
         export MAKEFLAGS+=" -j$NIX_BUILD_CORES"
 
-        ./bin/syncqt.pl -version $version
+        ./bin/syncqt.pl -version ${version}
       ''
       + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
         # QT's configure script will refuse to use pkg-config unless these two environment variables are set
@@ -295,9 +320,9 @@ stdenv.mkDerivation (
         NIX_OUTPUT_BIN = $bin
         NIX_OUTPUT_DEV = $dev
         NIX_OUTPUT_OUT = $out
-        NIX_OUTPUT_DOC = $dev/$qtDocPrefix
-        NIX_OUTPUT_QML = $bin/$qtQmlPrefix
-        NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix
+        NIX_OUTPUT_DOC = $dev/${qtDocPrefix}
+        NIX_OUTPUT_QML = $bin/${qtQmlPrefix}
+        NIX_OUTPUT_PLUGIN = $bin/${qtPluginPrefix}
         EOF
         }
 
@@ -321,13 +346,19 @@ stdenv.mkDerivation (
             ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"''
             ''-DNIXPKGS_LIBXCURSOR="${libxcursor.out}/lib/libXcursor"''
           ]
-          ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
-          ++ lib.optional stdenv.hostPlatform.isLinux "-DUSE_X11"
+          ++ lib.optionals libGLSupported [
+            ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isLinux [
+            "-DUSE_X11"
+          ]
           ++ lib.optionals withGtk3 [
             ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
             ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
           ]
-          ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"
+          ++ lib.optionals decryptSslTraffic [
+            "-DQT_DECRYPT_SSL_TRAFFIC"
+          ]
         );
       }
       // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
@@ -336,15 +367,15 @@ stdenv.mkDerivation (
           "-Wno-free-nonheap-object"
           "-w"
         ];
+      }
+      // lib.optionalAttrs (libpq != null) {
+        # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
+        # if dependency paths contain the string "pq", which can occur in the hash.
+        # To prevent these failures, we need to override PostgreSQL detection.
+        PSQL_LIBS = "-L${libpq}/lib -lpq";
       };
 
       prefixKey = "-prefix ";
-
-      # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
-      # if dependency paths contain the string "pq", which can occur in the hash.
-      # To prevent these failures, we need to override PostgreSQL detection.
-      PSQL_LIBS = lib.optionalString (libpq != null) "-L${libpq}/lib -lpq";
-
     }
     // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
       configurePlatforms = [ ];
@@ -352,9 +383,12 @@ stdenv.mkDerivation (
     // {
       # TODO Remove obsolete and useless flags once the build will be totally mastered
       configureFlags = [
-        "-plugindir $(out)/$(qtPluginPrefix)"
-        "-qmldir $(out)/$(qtQmlPrefix)"
-        "-docdir $(out)/$(qtDocPrefix)"
+        "-plugindir"
+        "${placeholder "out"}/${qtPluginPrefix}"
+        "-qmldir"
+        "${placeholder "out"}/${qtQmlPrefix}"
+        "-docdir"
+        "${placeholder "out"}/${qtDocPrefix}"
 
         "-verbose"
         "-confirm-license"
@@ -371,7 +405,8 @@ stdenv.mkDerivation (
 
         "-gui"
         "-widgets"
-        "-opengl desktop"
+        "-opengl"
+        "desktop"
         "-icu"
         "-L"
         "${icu.out}/lib"
@@ -380,10 +415,14 @@ stdenv.mkDerivation (
         "-pch"
       ]
       ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-        "-device ${qtPlatformCross stdenv.hostPlatform}"
-        "-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+        "-device"
+        (qtPlatformCross stdenv.hostPlatform)
+        "-device-option"
+        "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+      ]
+      ++ lib.optionals debugSymbols [
+        "-debug"
       ]
-      ++ lib.optional debugSymbols "-debug"
       ++ lib.optionals developerBuild [
         "-developer-build"
         "-no-warnings-are-errors"
@@ -438,10 +477,14 @@ stdenv.mkDerivation (
         "-${if libpq != null then "plugin" else "no"}-sql-psql"
         "-system-libpng"
 
-        "-make libs"
-        "-make tools"
-        "-${lib.optionalString (!buildExamples) "no"}make examples"
-        "-${lib.optionalString (!buildTests) "no"}make tests"
+        "-make"
+        "libs"
+        "-make"
+        "tools"
+        "-${lib.optionalString (!buildExamples) "no"}make"
+        "examples"
+        "-${lib.optionalString (!buildTests) "no"}make"
+        "tests"
       ]
       ++ (
         if stdenv.hostPlatform.isDarwin then
@@ -456,7 +499,8 @@ stdenv.mkDerivation (
           ]
           ++ [
             "-xcb"
-            "-qpa xcb"
+            "-qpa"
+            "xcb"
             "-L"
             "${libx11.out}/lib"
             "-I"
@@ -474,8 +518,12 @@ stdenv.mkDerivation (
             "-dbus-linked"
             "-glib"
           ]
-          ++ lib.optional withGtk3 "-gtk"
-          ++ lib.optional withLibinput "-libinput"
+          ++ lib.optionals withGtk3 [
+            "-gtk"
+          ]
+          ++ lib.optionals withLibinput [
+            "-libinput"
+          ]
           ++ [
             "-inotify"
           ]
@@ -485,13 +533,7 @@ stdenv.mkDerivation (
             "-I"
             "${cups.dev}/include"
           ]
-          ++ lib.optionals mysqlSupport [
-            "-L"
-            "${libmysqlclient}/lib"
-            "-I"
-            "${libmysqlclient}/include"
-          ]
-          ++ lib.optional (qttranslations != null) [
+          ++ lib.optionals (qttranslations != null) [
             "-translationdir"
             "${qttranslations}/translations"
           ]
@@ -502,18 +544,6 @@ stdenv.mkDerivation (
         moveToOutput "mkspecs" "$dev"
       '';
 
-      devTools = [
-        "bin/fixqt4headers.pl"
-        "bin/moc"
-        "bin/qdbuscpp2xml"
-        "bin/qdbusxml2cpp"
-        "bin/qlalr"
-        "bin/qmake"
-        "bin/rcc"
-        "bin/syncqt.pl"
-        "bin/uic"
-      ];
-
       postFixup = ''
         # Don't retain build-time dependencies like gdb.
         sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
@@ -521,6 +551,7 @@ stdenv.mkDerivation (
         fixQtBuiltinPaths "''${!outputDev}" '*.pr?'
 
         # Move development tools to $dev
+        devTools="${lib.concatStringsSep " " devTools}"
         moveQtDevTools
         moveToOutput bin "$dev"
 
@@ -531,9 +562,34 @@ stdenv.mkDerivation (
 
       dontStrip = debugSymbols;
 
-      setupHook = ../hooks/qtbase-setup-hook.sh;
+      setupHook =
+        let
+          hook = makeSetupHook {
+            name = "qtbase5-setup-hook";
+            substitutions = {
+              inherit
+                qtPluginPrefix
+                qtQmlPrefix
+                qtDocPrefix
+                fix_qt_builtin_paths
+                fix_qt_module_paths
+                ;
+              debug = debugSymbols;
+            };
+          } ../hooks/qtbase-setup-hook.sh;
+        in
+        "${hook}/nix-support/setup-hook";
 
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+      passthru = {
+        inherit
+          qtPluginPrefix
+          qtQmlPrefix
+          qtDocPrefix
+          ;
+        tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+      };
+
+      __structuredAttrs = true;
 
       meta = {
         homepage = "https://www.qt.io/";
diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
index b4ff43033bc2..f10ef301ebef 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
@@ -36,5 +36,7 @@ qtModule {
     "out"
   ];
   qmakeFlags = [ "GST_VERSION=1.0" ];
-  NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin) "-lobjc";
+  env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
+    NIX_LDFLAGS = "-lobjc";
+  };
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
deleted file mode 100644
index cb42d9d3ce0e..000000000000
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ /dev/null
@@ -1,525 +0,0 @@
-{
-  qtModule,
-  qtdeclarative,
-  qtquickcontrols,
-  qtlocation,
-  qtwebchannel,
-  fetchpatch,
-  fetchpatch2,
-
-  bison,
-  flex,
-  gperf,
-  ninja,
-  pkg-config,
-  python,
-  which,
-  nodejs,
-  perl,
-  buildPackages,
-  pkgsBuildTarget,
-  pkgsBuildBuild,
-
-  expat,
-  libxdamage,
-  libxcomposite,
-  xrandr,
-  libxkbfile,
-  libpciaccess,
-  libxcursor,
-  libxscrnsaver,
-  libxrandr,
-  libxtst,
-  fontconfig,
-  freetype,
-  harfbuzz,
-  icu,
-  dbus,
-  libdrm,
-  zlib,
-  minizip,
-  libjpeg,
-  libpng,
-  libtiff,
-  libwebp,
-  libopus,
-  jsoncpp,
-  protobuf,
-  libvpx,
-  srtp,
-  snappy,
-  nss,
-  libevent,
-  alsa-lib,
-  pulseaudio,
-  libcap,
-  pciutils,
-  systemd,
-  enableProprietaryCodecs ? true,
-  gn,
-  cctools,
-  cups,
-  bootstrap_cmds,
-  xcbuild,
-  writeScriptBin,
-  ffmpeg_7 ? null,
-  lib,
-  stdenv,
-  version ? null,
-  qtCompatVersion,
-  pipewireSupport ? stdenv.hostPlatform.isLinux,
-  pipewire,
-  postPatch ? "",
-  nspr,
-  lndir,
-}:
-
-let
-  # qtwebengine expects to find an executable in $PATH which runs on
-  # the build platform yet knows about the host `.pc` files.  Most
-  # configury allows setting $PKG_CONFIG to point to an
-  # arbitrarily-named script which serves this purpose; however QT
-  # insists that it is named `pkg-config` with no target prefix.  So
-  # we re-wrap the host platform's pkg-config.
-  pkg-config-wrapped-without-prefix = stdenv.mkDerivation {
-    name = "pkg-config-wrapper-without-target-prefix";
-    dontUnpack = true;
-    dontBuild = true;
-    installPhase = ''
-      mkdir -p $out/bin
-      ln -s '${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config' $out/bin/pkg-config
-    '';
-  };
-
-in
-
-qtModule (
-  {
-    pname = "qtwebengine";
-    nativeBuildInputs = [
-      bison
-      flex
-      gperf
-      ninja
-      pkg-config
-      (python.withPackages (ps: [ ps.html5lib ]))
-      which
-      gn
-      nodejs
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      perl
-      lndir
-      (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtbase)
-      pkgsBuildBuild.pkg-config
-      (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols)
-      pkg-config-wrapped-without-prefix
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin [
-      bootstrap_cmds
-      xcbuild
-    ];
-    doCheck = true;
-    outputs = [
-      "bin"
-      "dev"
-      "out"
-    ];
-
-    enableParallelBuilding = true;
-
-    # Don’t use the gn setup hook
-    dontUseGnConfigure = true;
-
-    # ninja builds some components with -Wno-format,
-    # which cannot be set at the same time as -Wformat-security
-    hardeningDisable = [ "format" ];
-
-    patches = [
-      # Support FFmpeg 5
-      (fetchpatch2 {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/14074e4d789167bd776939037fe6df8d4d7dc0b3/qt5-webengine-ffmpeg5.patch";
-        hash = "sha256-jTbJFXBPwRMzr8IeTxrv9dtS+/xDS/zR4dysV/bRg3I=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/";
-      })
-
-      # Support FFmpeg 7
-      (fetchpatch2 {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/e8fb4f86104243b90966b69cdfaa967273d834b6/qt5-webengine-ffmpeg7.patch";
-        hash = "sha256-YNeHmOVp0M5HB+b91AOxxJxl+ktBtLYVdHlq13F7xtY=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/chromium/";
-      })
-
-      # Support PipeWire ≥ 0.3
-      (fetchpatch2 {
-        url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/c9db2cd9e144bd7a5e9246f5f7a01fe52fd089ba/qt5-webengine-pipewire-0.3.patch";
-        hash = "sha256-mGexRfVDF3yjNzSi9BjavhzPtsXI0BooSr/rZ1z/BDo=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/";
-      })
-
-      # Fix race condition exposed by missing dependency
-      # https://bugs.gentoo.org/933368
-      ./qtwebengine-fix_build_pdf_extension_util.patch
-
-      # The latest version of Clang changed what macros it predefines on Apple
-      # targets, causing errors about predefined macros in zlib.
-      (fetchpatch2 {
-        url = "https://github.com/chromium/chromium/commit/2f39ac8d0a414dd65c0e1d5aae38c8f97aa06ae9.patch";
-        hash = "sha256-3kA2os0IntxIiJwzS5nPd7QWYlOWOpoLKYsOQFYv0Sk=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/chromium/";
-      })
-
-      # The latest version of Clang changed what macros it predefines on Apple
-      # targets, causing errors about predefined macros in libpng.
-      (fetchpatch2 {
-        url = "https://github.com/chromium/chromium/commit/66defc14abe47c0494da9faebebfa0a5b6efcf38.patch";
-        hash = "sha256-ErS5Eycls5+xQLGYKz1r/tQC6IcRJWb/WoGsUyzO9WY=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/chromium/";
-      })
-
-      # https://trac.macports.org/ticket/71563
-      # src/3rdparty/chromium/third_party/freetype/src/src/gzip/ftzconf.h:228:12: error: unknown type name 'Byte'
-      (fetchpatch2 {
-        url = "https://github.com/macports/macports-ports/raw/f9a4136c48020b01ecc6dffa99b88333c360f056/aqua/qt5/files/patch-qtwebengine-chromium-freetype-gzip.diff";
-        hash = "sha256-NeLmMfYMo80u3h+5GTenMANWfWLPeS35cKg+h3vzW4g=";
-        extraPrefix = "";
-      })
-
-      # src/3rdparty/chromium/base/process/process_metrics_mac.cc:303:17: error: static assertion expression is not an integral constant expression
-      (fetchpatch2 {
-        url = "https://github.com/macports/macports-ports/raw/f9a4136c48020b01ecc6dffa99b88333c360f056/aqua/qt5/files/patch-qtwebengine_chromium_static_page_size.diff";
-        hash = "sha256-8TFN5XU0SUvPJCFU6wvcKP5a8HCd0ygUnLT8BF4MZ/E=";
-        extraPrefix = "";
-      })
-
-      # Add "-target-feature +aes" to the arm crc32c build flags
-      (fetchpatch2 {
-        url = "https://github.com/chromium/chromium/commit/9f43d823b6b4cdea62f0cc7563ff01f9239b8970.patch";
-        hash = "sha256-2WCx+ZOWA8ZyV2yiSQLx9uFZOoeWQHxLqwLEZsV41QU=";
-        stripLen = 1;
-        extraPrefix = "src/3rdparty/chromium/";
-      })
-
-      # Fix build with clang and libc++ 19
-      # https://github.com/freebsd/freebsd-ports/commit/0ddd6468fb3cb9ba390973520517cb1ca2cd690d
-      (fetchpatch2 {
-        url = "https://github.com/freebsd/freebsd-ports/raw/0ddd6468fb3cb9ba390973520517cb1ca2cd690d/www/qt5-webengine/files/patch-libc++19";
-        hash = "sha256-pSVPnuEpjFHW60dbId5sZ3zHP709EWG4LSWoS+TkgcQ=";
-        extraPrefix = "";
-      })
-      (fetchpatch2 {
-        url = "https://github.com/freebsd/freebsd-ports/raw/0ddd6468fb3cb9ba390973520517cb1ca2cd690d/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_hash__table.h";
-        hash = "sha256-+vyWC7Indd1oBhvL5fMTlIH4mM4INgISZFAbHsq32Lg=";
-        extraPrefix = "";
-      })
-      (fetchpatch2 {
-        url = "https://github.com/freebsd/freebsd-ports/raw/0ddd6468fb3cb9ba390973520517cb1ca2cd690d/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_internal_track__event__data__source.h";
-        hash = "sha256-DcAYOV9b30ogPCiedvQimEmiZpUJquk5j6WLjJxR54U=";
-        extraPrefix = "";
-      })
-
-      # Fix the build with gperf ≥ 3.2 and Clang 19.
-      ./qtwebengine-gperf-3.2.patch
-    ];
-
-    postPatch = ''
-      # Patch Chromium build tools
-      (
-        cd src/3rdparty/chromium;
-
-        patch -p1 < ${
-          (fetchpatch {
-            # support for building with python 3.12
-            name = "python312-six.patch";
-            url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/6b0c0e76e0934db2f84be40cb5978cee47266e78/python3.12-six.patch";
-            hash = "sha256-YgP9Sq5+zTC+U7+0hQjZokwb+fytk0UEIJztUXFhTkI=";
-          })
-        }
-
-        # Manually fix unsupported shebangs
-        substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
-          --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
-
-        # TODO: be more precise
-        patchShebangs .
-      )
-    ''
-    # Prevent Chromium build script from making the path to `clang` relative to
-    # the build directory.  `clang_base_path` is the value of `QMAKE_CLANG_DIR`
-    # from `src/core/config/mac_osx.pri`.
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace ./src/3rdparty/chromium/build/toolchain/mac/BUILD.gn \
-        --replace 'prefix = rebase_path("$clang_base_path/bin/", root_build_dir)' 'prefix = "$clang_base_path/bin/"'
-    ''
-    # Patch library paths in Qt sources
-    + ''
-      sed -i \
-        -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
-        -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
-        -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
-        src/core/web_engine_library_info.cpp
-    ''
-    # Patch library paths in Chromium sources
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
-        src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
-
-      sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
-        src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/buildtools/config/mac_osx.pri \
-        --replace 'QMAKE_CLANG_DIR = "/usr"' 'QMAKE_CLANG_DIR = "${stdenv.cc}"'
-
-      # Use system ffmpeg
-      echo "gn_args += use_system_ffmpeg=true" >> src/core/config/mac_osx.pri
-      echo "LIBS += -lavformat -lavcodec -lavutil" >> src/core/core_common.pri
-    ''
-    + postPatch;
-
-    env = {
-      NIX_CFLAGS_COMPILE = toString (
-        lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-          "-w "
-        ]
-        ++ lib.optionals stdenv.cc.isGNU [
-          # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
-          "-Wno-class-memaccess"
-        ]
-        ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
-          # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
-          # TODO: investigate and fix properly
-          "-march=westmere"
-        ]
-        ++ lib.optionals stdenv.cc.isClang [
-          "-Wno-elaborated-enum-base"
-          # 5.15.17: need to silence these two warnings
-          # https://trac.macports.org/ticket/70850
-          "-Wno-enum-constexpr-conversion"
-          "-Wno-unused-but-set-variable"
-          # Clang 19
-          "-Wno-error=missing-template-arg-list-after-template-kw"
-        ]
-      );
-    }
-    // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
-      NIX_CFLAGS_LINK = "-Wl,--no-warn-search-mismatch";
-      "NIX_CFLAGS_LINK_${buildPackages.stdenv.cc.suffixSalt}" = "-Wl,--no-warn-search-mismatch";
-    };
-
-    preConfigure = ''
-      export NINJAFLAGS=-j$NIX_BUILD_CORES
-
-      if [ -d "$PWD/tools/qmake" ]; then
-          QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
-      fi
-    ''
-    + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-      export QMAKE_CC=$CC
-      export QMAKE_CXX=$CXX
-      export QMAKE_LINK=$CXX
-      export QMAKE_AR=$AR
-    '';
-
-    qmakeFlags = [
-      "--"
-      "-system-ffmpeg"
-    ]
-    ++ lib.optional (
-      pipewireSupport && stdenv.buildPlatform == stdenv.hostPlatform
-    ) "-webengine-webrtc-pipewire"
-    ++ lib.optional enableProprietaryCodecs "-proprietary-codecs";
-
-    propagatedBuildInputs = [
-      qtdeclarative
-      qtquickcontrols
-      qtlocation
-      qtwebchannel
-
-      # Image formats
-      libjpeg
-      libpng
-      libtiff
-      libwebp
-
-      # Video formats
-      srtp
-      libvpx
-
-      # Audio formats
-      libopus
-
-      # Text rendering
-      harfbuzz
-      icu
-
-      expat
-      libevent
-      ffmpeg_7
-    ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-      dbus
-      zlib
-      minizip
-      snappy
-      nss
-      protobuf
-      jsoncpp
-
-      # Audio formats
-      alsa-lib
-      pulseaudio
-
-      # Text rendering
-      fontconfig
-      freetype
-
-      libcap
-      pciutils
-
-      # X11 libs
-      xrandr
-      libxscrnsaver
-      libxcursor
-      libxrandr
-      libpciaccess
-      libxtst
-      libxcomposite
-      libxdamage
-      libdrm
-      libxkbfile
-
-    ]
-    ++ lib.optionals pipewireSupport [
-      # Pipewire
-      pipewire
-    ]
-
-    # FIXME These dependencies shouldn't be needed but can't find a way
-    # around it. Chromium pulls this in while bootstrapping GN.
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ];
-
-    buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-      cups
-
-      # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py`
-      # to get some information about the host platform.
-      (writeScriptBin "sw_vers" ''
-        #!${stdenv.shell}
-
-        while [ $# -gt 0 ]; do
-          case "$1" in
-            -buildVersion) echo "17E199";;
-          *) break ;;
-
-          esac
-          shift
-        done
-      '')
-    ];
-
-    dontUseNinjaBuild = true;
-    dontUseNinjaInstall = true;
-
-    postInstall =
-      lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-        mkdir -p $out/libexec
-      ''
-      + lib.optionalString stdenv.hostPlatform.isLinux ''
-        cat > $out/libexec/qt.conf <<EOF
-        [Paths]
-        Prefix = ..
-        EOF
-
-      ''
-      + ''
-        # Fix for out-of-sync QtWebEngine and Qt releases (since 5.15.3)
-        sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake
-      '';
-
-    requiredSystemFeatures = [ "big-parallel" ];
-
-    meta = {
-      description = "Web engine based on the Chromium web browser";
-      mainProgram = "qwebengine_convert_dict";
-      maintainers = [ ];
-
-      # qtwebengine-5.15.8: "QtWebEngine can only be built for x86,
-      # x86-64, ARM, Aarch64, and MIPSel architectures."
-      platforms =
-        with lib.systems.inspect.patterns;
-        let
-          inherit (lib.systems.inspect) patternLogicalAnd;
-        in
-        lib.concatMap (patternLogicalAnd isUnix) (
-          lib.concatMap lib.toList [
-            isx86_32
-            isx86_64
-            isAarch32
-            isAarch64
-            (patternLogicalAnd isMips isLittleEndian)
-          ]
-        );
-
-      # This build takes a long time; particularly on slow architectures
-      timeout = 24 * 3600;
-
-      knownVulnerabilities = [
-        ''
-          qt5 qtwebengine is unmaintained upstream since april 2025.
-          It is based on chromium 87.0.4280.144, and supposedly patched up to 135.0.7049.95 which is outdated.
-
-          Security issues are frequently discovered in chromium.
-          The following list of CVEs was fixed in the life cycle of chromium 138 and likely also affects qtwebengine:
-          - CVE-2025-8879
-          - CVE-2025-8880
-          - CVE-2025-8901
-          - CVE-2025-8881
-          - CVE-2025-8882
-          - CVE-2025-8576
-          - CVE-2025-8577
-          - CVE-2025-8578
-          - CVE-2025-8579
-          - CVE-2025-8580
-          - CVE-2025-8581
-          - CVE-2025-8582
-          - CVE-2025-8583
-          - CVE-2025-8292
-          - CVE-2025-8010
-          - CVE-2025-8011
-          - CVE-2025-7656
-          - CVE-2025-6558 (known to be exploited in the wild)
-          - CVE-2025-7657
-          - CVE-2025-6554
-          - CVE-2025-6555
-          - CVE-2025-6556
-          - CVE-2025-6557
-
-          The actual list of CVEs affecting qtwebengine is likely much longer,
-          as this list is missing issues fixed in chromium 136/137 and even more
-          issues are continuously discovered and lack upstream fixes in qtwebengine.
-        ''
-      ];
-    };
-
-  }
-  // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
-    configurePlatforms = [ ];
-    # to get progress output in `nix-build` and `nix build -L`
-    preBuild = ''
-      export TERM=dumb
-    '';
-    depsBuildBuild = [
-      pkgsBuildBuild.stdenv
-      zlib
-      nss
-      nspr
-    ];
-
-  }
-)
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
deleted file mode 100644
index bf4282fffef0..000000000000
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-  qtModule,
-  stdenv,
-  lib,
-  fetchurl,
-  qtbase,
-  qtdeclarative,
-  qtlocation,
-  qtmultimedia,
-  qtsensors,
-  qtwebchannel,
-  fontconfig,
-  libwebp,
-  libxml2,
-  libxslt,
-  sqlite,
-  systemd,
-  glib,
-  gst_all_1,
-  cmake,
-  bison,
-  flex,
-  gdb,
-  gperf,
-  perl,
-  pkg-config,
-  python3,
-  ruby,
-}:
-
-let
-  hyphen = stdenv.mkDerivation rec {
-    pname = "hyphen";
-    version = "2.8.8";
-    src = fetchurl {
-      url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-${version}.tar.gz";
-      sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705";
-    };
-    postPatch = ''
-      patchShebangs tests
-    '';
-    buildInputs = [ perl ];
-  };
-in
-qtModule {
-  pname = "qtwebkit";
-  propagatedBuildInputs = [
-    qtbase
-    qtdeclarative
-    qtlocation
-    qtsensors
-    qtwebchannel
-  ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin qtmultimedia;
-  buildInputs = [
-    fontconfig
-    libwebp
-    libxml2
-    libxslt
-    sqlite
-    glib
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base
-    hyphen
-  ];
-  nativeBuildInputs = [
-    bison
-    flex
-    gdb
-    gperf
-    perl
-    pkg-config
-    python3
-    ruby
-    cmake
-  ];
-
-  cmakeFlags = [
-    "-DPORT=Qt"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    "-DQt5Multimedia_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5Multimedia"
-    "-DQt5MultimediaWidgets_DIR=${lib.getDev qtmultimedia}/lib/cmake/Qt5MultimediaWidgets"
-    "-DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF"
-  ];
-
-  env.NIX_CFLAGS_COMPILE = toString (
-    [
-      # with gcc7 this warning blows the log over Hydra's limit
-      "-Wno-expansion-to-defined"
-    ]
-    # with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit
-    ++ lib.optional stdenv.cc.isGNU "-Wno-class-memaccess"
-    # with clang this warning blows the log over Hydra's limit
-    ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-inconsistent-missing-override"
-    ++ lib.optional (
-      !stdenv.hostPlatform.isDarwin
-    ) ''-DNIXPKGS_LIBUDEV="${lib.getLib systemd}/lib/libudev"''
-  );
-
-  doCheck = false; # fails 13 out of 13 tests (ctest)
-
-  # remove forbidden references to $TMPDIR
-  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
-    patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/libexec/*
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    maintainers = [ ];
-    knownVulnerabilities = [
-      "QtWebkit upstream is unmaintained and receives no security updates, see https://blogs.gnome.org/mcatanzaro/2022/11/04/stop-using-qtwebkit/"
-    ];
-  };
-}
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix
deleted file mode 100644
index 097ff2e03a9c..000000000000
--- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  stdenv,
-  qtModule,
-  qtdeclarative,
-  qtwebengine,
-}:
-
-qtModule {
-  pname = "qtwebview";
-  propagatedBuildInputs = [
-    qtdeclarative
-    qtwebengine
-  ];
-  outputs = [
-    "out"
-    "dev"
-    "bin"
-  ];
-  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework WebKit";
-}
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 04daeb222aef..d37e11aa9efe 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -97,11 +97,14 @@ mkDerivation (
           done
       fi
 
+      ${lib.optionalString (lib.hasAttr "devTools" args) ''devTools="${lib.concatStringsSep " " args.devTools}"''}
       moveQtDevTools
 
       ${args.postFixup or ""}
     '';
 
+    __structuredAttrs = true;
+
     meta = {
       homepage = "https://www.qt.io";
       description = "Cross-platform application framework for C++";
diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh
index 7e4781e5114e..73d170689480 100644
--- a/pkgs/development/libraries/qt-6/fetch.sh
+++ b/pkgs/development/libraries/qt-6/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.qt.io/official_releases/qt/6.10/6.10.2/submodules/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.qt.io/official_releases/qt/6.11/6.11.0/submodules/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/another-crash-fix.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/another-crash-fix.patch
deleted file mode 100644
index e63a70c53708..000000000000
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/another-crash-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
-+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
-@@ -1583,10 +1583,9 @@
-                     o->deleteLater();
-             } else {
-                 // If the object is C++-owned, we still have to release the weak reference we have
--                // to it.
--                ddata->jsWrapper.clear();
--                if (lastCall && ddata->propertyCache)
--                    ddata->propertyCache.reset();
-+                // to it. If the "main" wrapper is not ours, we should leave it alone, though.
-+                if (ddata->jsWrapper.as<QObjectWrapper>() == this)
-+                    ddata->jsWrapper.clear();
-             }
-         }
-     }
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index 972a8f372170..786229c5651b 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -10,6 +10,7 @@
   lib,
   pkgsBuildBuild,
   replaceVars,
+  fetchpatch,
 }:
 
 qtModule {
@@ -36,10 +37,12 @@ qtModule {
     # add version specific QML import path
     ./use-versioned-import-path.patch
 
-    # Backport of https://codereview.qt-project.org/c/qt/qtdeclarative/+/704031
-    # Fixes common Plasma crash
-    # FIXME: remove in 6.10.3
-    ./another-crash-fix.patch
+    # revert codesigning change on Darwin that doesn't work with our signing tools
+    (fetchpatch {
+      url = "https://github.com/qt/qtdeclarative/commit/a7084abd9778b955d80e7419e82f6f7b92f7978d.diff";
+      hash = "sha256-ESy35OlmsvI4yFQ/rFT8oelOUBCwCmlcbQJvwcTrCig=";
+      revert = true;
+    })
   ];
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
index ea00d966e8a3..effea1d03ab4 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
@@ -6,13 +6,13 @@
 
 qtModule rec {
   pname = "qtmqtt";
-  version = "6.10.2";
+  version = "6.11.0";
 
   src = fetchFromGitHub {
     owner = "qt";
     repo = "qtmqtt";
     tag = "v${version}";
-    hash = "sha256-NjYvL6BCn0UP7F2CW81upzZ8EwFAkhoUa5cdaH0uhM4=";
+    hash = "sha256-7X+HWAftWHn40RPFQD3/f+bp00LQk8Vsb871WfxdZSE=";
   };
 
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/qt-6/modules/qttools/default.nix b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
index 58ef182fff2c..c81cb2ac55fa 100644
--- a/pkgs/development/libraries/qt-6/modules/qttools/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
@@ -14,10 +14,6 @@
 qtModule {
   pname = "qttools";
 
-  patches = [
-    ./paths.patch
-  ];
-
   postPatch = ''
     substituteInPlace \
       src/qdoc/catch/CMakeLists.txt \
diff --git a/pkgs/development/libraries/qt-6/modules/qttools/paths.patch b/pkgs/development/libraries/qt-6/modules/qttools/paths.patch
deleted file mode 100644
index 6b1eca682c59..000000000000
--- a/pkgs/development/libraries/qt-6/modules/qttools/paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/linguist/shared/runqttool.cpp
-+++ b/src/linguist/shared/runqttool.cpp
-@@ -20,9 +20,21 @@ class FMT {
-     Q_DECLARE_TR_FUNCTIONS(Linguist)
- };
-
-+static QString qtBasePath(QLibraryInfo::LibraryPath location)
-+{
-+  switch (location) {
-+    case QLibraryInfo::BinariesPath:
-+      return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/bin");
-+    case QLibraryInfo::LibraryExecutablesPath:
-+      return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/libexec");
-+    default:
-+      return QLibraryInfo::path(location);
-+  }
-+}
-+
- static QString qtToolFilePath(const QString &toolName, QLibraryInfo::LibraryPath location)
- {
--    QString filePath = QLibraryInfo::path(location) + u'/' + toolName;
-+    QString filePath = qtBasePath(location) + u'/' + toolName;
- #ifdef Q_OS_WIN
-     filePath.append(QLatin1String(".exe"));
- #endif
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index c76700cbd193..8facbea4362b 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -117,15 +117,6 @@ qtModule {
 
     # Reproducibility QTBUG-136068
     ./gn-object-sorted.patch
-  ]
-  ++ lib.optionals stdenv.cc.isClang [
-    # https://chromium-review.googlesource.com/c/chromium/src/+/6633292
-    (fetchpatch2 {
-      url = "https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch?full_index=1";
-      stripLen = 1;
-      extraPrefix = "src/3rdparty/chromium/";
-      hash = "sha256-zDIlHd8bBtrThkFnrcyA13mhXYIQt6sKsi6qAyQ34yo=";
-    })
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix
index 585e16fb0148..73067dc5fd5c 100644
--- a/pkgs/development/libraries/qt-6/srcs.nix
+++ b/pkgs/development/libraries/qt-6/srcs.nix
@@ -4,315 +4,339 @@
 
 {
   qt3d = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qt3d-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0vdvid42m9jyhmpclfgpc7j1ivxlj0jr23kp5pxa1v0z96fwmfzy";
-      name = "qt3d-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qt3d-everywhere-src-6.11.0.tar.xz";
+      sha256 = "086xpissihbil51ryl83dlcpkpv3pp3ryj0712x9k9z6756j7ks0";
+      name = "qt3d-everywhere-src-6.11.0.tar.xz";
     };
   };
   qt5compat = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qt5compat-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1hk18428bpp60ypjzabzpc77nr10bzignqppqppvjbn0zbq1i91z";
-      name = "qt5compat-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qt5compat-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0gn6sj136y8yl1c00nbm81rmhws0mgx35ny7llx74j97ddj58ag6";
+      name = "qt5compat-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtactiveqt-everywhere-src-6.10.2.tar.xz";
-      sha256 = "09swk8xv93gmk67v6zccxr3hjy4404q0awljfjlapas9xi10bnym";
-      name = "qtactiveqt-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtactiveqt-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1kbqa0gx41s097281g4zym9jmjs2ffc75p3rgkbs6bvnlrvl0h89";
+      name = "qtactiveqt-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtbase = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtbase-everywhere-src-6.10.2.tar.xz";
-      sha256 = "07pjmnwmlsbxc9zxgcazq9w4jnq6ypw50ndm7kamyaqs54lqvdxf";
-      name = "qtbase-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtbase-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0pkmrd8ypw1v21cx0890gc6z4v0xr5qip2jnr56r2kc6g5cxh6i3";
+      name = "qtbase-everywhere-src-6.11.0.tar.xz";
+    };
+  };
+  qtcanvaspainter = {
+    version = "6.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtcanvaspainter-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1gmgzmh81wrnj81xsmilqwhc1wv7j2avg91mww8jlrv5rplzynjl";
+      name = "qtcanvaspainter-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtcharts = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtcharts-everywhere-src-6.10.2.tar.xz";
-      sha256 = "001ckwq5w5w164cz2hkkb2dvci1d77mm9hf4hha9ivgdqns1cla0";
-      name = "qtcharts-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtcharts-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1dcldlw24qd9swynxcdsxnk8haiv442wx323j7qgfwjp13a9nh5c";
+      name = "qtcharts-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtconnectivity-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0chs66537ki0yvq94m2i3k69wf8kyr741m4wg6vbamr8ychz0n6g";
-      name = "qtconnectivity-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtconnectivity-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0fhrqqz58h3smkksfgnax73bmsiz7q9a1w9vhwd83vs9r0jc3w60";
+      name = "qtconnectivity-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtdatavis3d-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1hav6ncccdhw2kyx608xhchpmygx6sbfap8x6ch35l53yj5l0sdp";
-      name = "qtdatavis3d-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtdatavis3d-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1jr3bkvp4wj1jdafc64ziq4raxbya6jk6s0d4mq0w2kr7zpqrggf";
+      name = "qtdatavis3d-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtdeclarative-everywhere-src-6.10.2.tar.xz";
-      sha256 = "03sb1wfxqvy5dhyd85yc0776vvm2jzczlpwbvzqdpp3cyr7r2jd2";
-      name = "qtdeclarative-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtdeclarative-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1sgxxmg49flana7mylyz4c5mf5hr00kzl8nkwwj87pqx8dlybv2f";
+      name = "qtdeclarative-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtdoc = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtdoc-everywhere-src-6.10.2.tar.xz";
-      sha256 = "011pp0nf019dg790vhr9i3xiy6vspzjpr8w8xd9cpyk723nsj54c";
-      name = "qtdoc-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtdoc-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1wwl2vr1qs2lqmz45iqpkzkxqp97g0yzfmz0kb5wpi8sys7c07bx";
+      name = "qtdoc-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtgraphs = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtgraphs-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1bvsvmwf4csl63fqf4gdqb03s97b9dl0sdyffrp9mn37lmmgr47n";
-      name = "qtgraphs-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtgraphs-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0nxifvs5042pzyd5syhgpmxzsq07fhpbbm57ckwzsn55q14cnvyz";
+      name = "qtgraphs-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtgrpc = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtgrpc-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0dnibqlsnra4kwk1dng4g6rrndszx5kz1p12zzjj0y8cq74vz1kk";
-      name = "qtgrpc-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtgrpc-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0yd8jjxigaynv386f3cs1i743nm7yngciw346xqfil3chd8wpvcx";
+      name = "qtgrpc-everywhere-src-6.11.0.tar.xz";
     };
   };
   qthttpserver = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qthttpserver-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0hs6zq1qfs4yfr9bf2d089q37wcyhgvx48vq54szsn72prcqsmi6";
-      name = "qthttpserver-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qthttpserver-everywhere-src-6.11.0.tar.xz";
+      sha256 = "16wqglm8ws63qs7i769xy94bygwbhkz7hjfw27hnps7d4yirb41b";
+      name = "qthttpserver-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtimageformats = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtimageformats-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0rwxcdpzx5mls7sqvscq58hb2h01j4qpy3h07ixiw21qhrqrr3wb";
-      name = "qtimageformats-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtimageformats-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1j0cjj7gxjbprszw349janl3zk38rkby1bmxil329zp2qlmb1bfk";
+      name = "qtimageformats-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtlanguageserver = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtlanguageserver-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0lqdqknblw4nsv1mgi5jw6rqsf7h9zf59af7bw371d5hhhn3y14s";
-      name = "qtlanguageserver-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtlanguageserver-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1gq5yjvk6iyg606pgpxkb136qlz9hpb7ngll81nhiyb1ym1y9j0v";
+      name = "qtlanguageserver-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtlocation = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtlocation-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0g0gwldmdslzx0zjdpi3vc0pqnd266qkxynh8xy534y5xmfz04yk";
-      name = "qtlocation-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtlocation-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1vxb6n8xf98zcg2bw29gsaqa74sg6jn9ilzs8c5b9q79i9m3if49";
+      name = "qtlocation-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtlottie = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtlottie-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1302lh7432372qy0mw2pv67miikf2ny2n103s8mhyfl30xx6pn55";
-      name = "qtlottie-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtlottie-everywhere-src-6.11.0.tar.xz";
+      sha256 = "02ndplkk4bq01b0fh9l2ykw09v0k5nbsayrs9wcjwrdwg5law8rg";
+      name = "qtlottie-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtmultimedia-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0aryhch6qlamgfcbrxc0d1ggq4f96vjg68r7b8b33mzv0q0yzxwk";
-      name = "qtmultimedia-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtmultimedia-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0h30l8zflkla7rcshgs0jfjbjwvq9rqx0wq83f6vd0x9lz0cmi4h";
+      name = "qtmultimedia-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtnetworkauth-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1cw1355xxf0ca96xwjaw33nnrxh1qw26naa2zha5fpsh9fggsaag";
-      name = "qtnetworkauth-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtnetworkauth-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1mqly8had79f54dlygh42jr0c0jfiv4j4w2rbr0s7qx9nk9ig342";
+      name = "qtnetworkauth-everywhere-src-6.11.0.tar.xz";
+    };
+  };
+  qtopenapi = {
+    version = "6.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtopenapi-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1h2pcq6i72yic0r7ns36vj678d1xqy291jamqd6b6jkjddmj1hlg";
+      name = "qtopenapi-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtpositioning = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtpositioning-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1kndqjh3ylbs5a2chqv3a6jip83j6zy9dlya82c7crkw8xjgllbh";
-      name = "qtpositioning-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtpositioning-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1scnnz65qyfg0nl9vjkqcss8xsw3yf91w71d9p1kwlfybscd07yn";
+      name = "qtpositioning-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtquick3d = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquick3d-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0xfdlafzz7k3vps0kzz4mnyv0cmr0f5v8a4qkqvhqn0y3prkjm5r";
-      name = "qtquick3d-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtquick3d-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1549gdb3yxj1bpl54kgnkkhzjx0zxqi71ssp4rj6qnz56fxh085l";
+      name = "qtquick3d-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtquick3dphysics = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquick3dphysics-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1nqw5kqrivmajbw2sqxll8zgqjk79g2pic8rghfkb52ps1xzdbxp";
-      name = "qtquick3dphysics-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtquick3dphysics-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0dcx9913xss435cijx5bzckvsn66qfi6c39rx0gyv9iiys76qym5";
+      name = "qtquick3dphysics-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtquickeffectmaker = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquickeffectmaker-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1i62d7s6fl4lf92cfwljk7blirz82mv174k1d5nrw38c9qxz3jp3";
-      name = "qtquickeffectmaker-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtquickeffectmaker-everywhere-src-6.11.0.tar.xz";
+      sha256 = "05fpv497rmx2lw7gx05sxyxjwx8gq8fbbnkzhnw73pk2xqzq20mc";
+      name = "qtquickeffectmaker-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtquicktimeline = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtquicktimeline-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0933sggxp28mybdr8wgfyny9m0c23h70f3fy1mwxy7yjb2vxhckh";
-      name = "qtquicktimeline-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtquicktimeline-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1micycw7m25gw0bgbfq7bnr7cg7qrjj2r69320rglc8lak6f3nq6";
+      name = "qtquicktimeline-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtremoteobjects-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1kb5xd1ckp4phq820rl9h6nbaryrybzk2zxlq83cykg79w23ys5w";
-      name = "qtremoteobjects-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtremoteobjects-everywhere-src-6.11.0.tar.xz";
+      sha256 = "15yykbaxqc6v2flgjvn92w7gwfvi820dg4cxkjxcfhpix2m21571";
+      name = "qtremoteobjects-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtscxml = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtscxml-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0si3vpzva8wyqa0gh0fyk75knlgmsyjalahp41nv1cginf6ig70g";
-      name = "qtscxml-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtscxml-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1rylchpvzldy7hhr3icr85w8m4hf7wch17yqh368yrn3q19klf3c";
+      name = "qtscxml-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtsensors = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtsensors-everywhere-src-6.10.2.tar.xz";
-      sha256 = "10gmis63gpqhbb7ljy1gx3gh7hww6psk66c6jqvaxgzbgidm3rli";
-      name = "qtsensors-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtsensors-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1iy33w7gjp06xi4342si979q9w84cvbbk90kxmk2gx69icjjja21";
+      name = "qtsensors-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtserialbus = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtserialbus-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0yrsg50gmjlxnp1574fzkfbxls1cmjkn1qpagayhx55nrzzbydj7";
-      name = "qtserialbus-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtserialbus-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1qfs9zqvz3hf16w8gg6nlwxcv6sz72546pds02dabhkcw47nqvmh";
+      name = "qtserialbus-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtserialport = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtserialport-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0sxxvrn1bwrzm140988prn12f14pj15v8z3yxs7zl7qiv8lvy35l";
-      name = "qtserialport-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtserialport-everywhere-src-6.11.0.tar.xz";
+      sha256 = "111pmva70mcffhq09q2h1gcr03fivs9j2ywx4ib00pbyxfvr4ii6";
+      name = "qtserialport-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtshadertools = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtshadertools-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1j8ncwhjcy2k6p05cldnb20vbqijq1frdac9xpk9cvky9yydpn8q";
-      name = "qtshadertools-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtshadertools-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0jp1sb9pl7y821awln7rpk0hz7d5ipwnkqhy51caich9i2pb2g74";
+      name = "qtshadertools-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtspeech = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtspeech-everywhere-src-6.10.2.tar.xz";
-      sha256 = "051h4v0qqjkz1brkypx6i2wzdpn8pwz5353f0f7hsavr2p3zcdyr";
-      name = "qtspeech-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtspeech-everywhere-src-6.11.0.tar.xz";
+      sha256 = "08fv8v6rvcv0pa6r52kr2na2rcpjr3yk556ksinnh6aslv8qbid9";
+      name = "qtspeech-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtsvg = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtsvg-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1qfnv8ssflndjhv6r8s9vxfl8yblra956d00f8c3bwna707zhzzh";
-      name = "qtsvg-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtsvg-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1rih59jsn0wq12gq5gbs1cz9by27x2x4wjpd0ya7s207pr9xda6z";
+      name = "qtsvg-everywhere-src-6.11.0.tar.xz";
+    };
+  };
+  qttasktree = {
+    version = "6.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qttasktree-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0kxkm3qvzw5i5x2ads6skpz8z6shbn2msznmr614yvsdgiga4yjr";
+      name = "qttasktree-everywhere-src-6.11.0.tar.xz";
     };
   };
   qttools = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qttools-everywhere-src-6.10.2.tar.xz";
-      sha256 = "092vimkdpad6q9dilkhc45wmzzzs5ykfmbkfbi1d4xpxq43jqg8y";
-      name = "qttools-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qttools-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0xpwv483zrw3jkajhv9sbr7bm95qahxg770vn1jqk10hg8yrkcfg";
+      name = "qttools-everywhere-src-6.11.0.tar.xz";
     };
   };
   qttranslations = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qttranslations-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0i56a03b7f6snvxfjsa5q4mnw6x7kxjnx2yw2rbm8sypr4xq3cxk";
-      name = "qttranslations-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qttranslations-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0mpy3y76n1jw2prhad9rqyn48miqlmqg3581jgzr4s1iwhpqpx2l";
+      name = "qttranslations-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtvirtualkeyboard-everywhere-src-6.10.2.tar.xz";
-      sha256 = "0swqvcgp6p80k2g7nzb6dcjr2spxcj4lk48s7ll3ygx8j5h2awv2";
-      name = "qtvirtualkeyboard-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtvirtualkeyboard-everywhere-src-6.11.0.tar.xz";
+      sha256 = "11p6m1s7r7q2y6a2ak5lyzfd2907s2skfa630snf64x32cblp2nq";
+      name = "qtvirtualkeyboard-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtwayland = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwayland-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1qkyabklzzzbh4ryxhbnvnpz52vzqvyqwzd6lqkdy6978gmrh69r";
-      name = "qtwayland-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtwayland-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0dsdv1d4p1wf0sqd26cmj486bvwlprmqzmjddsw24agrc3kyc477";
+      name = "qtwayland-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebchannel-everywhere-src-6.10.2.tar.xz";
-      sha256 = "09rc9y51bdb46pj7wad59gycy2l4ki3siizxai6kgq0risgsa7p3";
-      name = "qtwebchannel-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtwebchannel-everywhere-src-6.11.0.tar.xz";
+      sha256 = "097vm6pxh18bil9ld9cxg50v861nyhaha4f6bjfjqph1icx18ip9";
+      name = "qtwebchannel-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtwebengine = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebengine-everywhere-src-6.10.2.tar.xz";
-      sha256 = "07ln4f89qlxvsxg5gjwvwqhcfkhvf5kympk7hmhqi6m6jbrdsvl5";
-      name = "qtwebengine-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtwebengine-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0dk72k92zp19jkph1vl88l2dyrh105v6cycsxln1anfxnb423fb3";
+      name = "qtwebengine-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebsockets-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1g9fnj73q3s8a49qzhr1iv2h7z50hwwnja80s9bgd7jhx8dpbk7c";
-      name = "qtwebsockets-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtwebsockets-everywhere-src-6.11.0.tar.xz";
+      sha256 = "0cnh67ncfh0gvpqfiqhr0cpmswq9zysza130axlmh69mzg8i17sn";
+      name = "qtwebsockets-everywhere-src-6.11.0.tar.xz";
     };
   };
   qtwebview = {
-    version = "6.10.2";
+    version = "6.11.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.10/6.10.2/submodules/qtwebview-everywhere-src-6.10.2.tar.xz";
-      sha256 = "1d7as06xmbmjx1rfnhrvizhy85dz3xdlx3pzy370r44q17zhdi3y";
-      name = "qtwebview-everywhere-src-6.10.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.11/6.11.0/submodules/qtwebview-everywhere-src-6.11.0.tar.xz";
+      sha256 = "1cy4x331h0f4d5l8c18xrvdq6hwz7r16qd1xhr8gdm8j9bcsw3nb";
+      name = "qtwebview-everywhere-src-6.11.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/qtspell/default.nix b/pkgs/development/libraries/qtspell/default.nix
index 141915c5ba2b..385237961468 100644
--- a/pkgs/development/libraries/qtspell/default.nix
+++ b/pkgs/development/libraries/qtspell/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides spell-checking to Qt's text widgets, using the enchant spell-checking library";
     homepage = "https://github.com/manisandro/qtspell";
-    changelog = "https://github.com/manisandro/qtspell/blob/version/NEWS";
+    changelog = "https://github.com/manisandro/qtspell/blob/${version}/NEWS";
     maintainers = with lib.maintainers; [ dansbandit ];
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.all;
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
deleted file mode 100644
index a33b4bda9d3c..000000000000
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  qmake,
-  qtwebkit,
-  hunspell,
-}:
-
-stdenv.mkDerivation {
-  pname = "qtwebkit-plugins";
-  version = "unstable-2017-01-25";
-
-  src = fetchFromGitHub {
-    owner = "QupZilla";
-    repo = "qtwebkit-plugins";
-    rev = "b58ee9d5b31977491662aa4e8bee16404638bf14";
-    sha256 = "04wvlhdj45g1v1a3zl0pkf9r72i22h1br10lhhrgad7ypym974gw";
-  };
-
-  nativeBuildInputs = [ qmake ];
-
-  buildInputs = [
-    qtwebkit
-    hunspell
-  ];
-
-  dontWrapQtApps = true;
-
-  postPatch = ''
-    sed -i "s,-lhunspell,-lhunspell-${lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri
-    sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro
-  '';
-
-  meta = {
-    description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit";
-    homepage = "https://github.com/QupZilla/qtwebkit-plugins";
-    license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/libraries/rlottie-qml/default.nix b/pkgs/development/libraries/rlottie-qml/default.nix
index 542180c6f086..c223d4928c3b 100644
--- a/pkgs/development/libraries/rlottie-qml/default.nix
+++ b/pkgs/development/libraries/rlottie-qml/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Fix QML install path
     substituteInPlace CMakeLists.txt \
       --replace-fail 'QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}"' 'QT_IMPORTS_DIR "''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"' \
-      --replace-fail "\''${QT_IMPORTS_DIR}/\''${PLUGIN}" "\''${QT_IMPORTS_DIR}" \
+      --replace-fail "\''${QT_IMPORTS_DIR}/\''${PLUGIN}" "\''${QT_IMPORTS_DIR}"
   '';
 
   strictDeps = true;
diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index f0b5a08af427..cc6d362619be 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
 
     substituteInPlace \
       $dev/share/cmake/Caffe2/Caffe2Targets-release.cmake \
-      --replace \''${_IMPORT_PREFIX}/lib "$out/lib" \
+      --replace \''${_IMPORT_PREFIX}/lib "$out/lib"
   '';
 
   postFixup =
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index e0a4395f0f60..799e4927f6c6 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -170,7 +170,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openblas";
-  version = "0.3.31";
+  version = "0.3.32";
 
   outputs = [
     "out"
@@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "OpenMathLib";
     repo = "OpenBLAS";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YBR81GOLnTsc0g1SZL+j31/OFucJrBRFqtOTV8lcy8U=";
+    hash = "sha256-D0Wu5Ew72aTqSjj970yOfAwPg1T4Qm6zmpaGlQ/5Q1k=";
   };
 
   patches = [
@@ -190,16 +190,19 @@ stdenv.mkDerivation (finalAttrs: {
     # INCLUDEDIR already fixed in upstream HEAD & significant refactor
     # to config gen so not PRing changes
     ./cmake-include-fixes.patch
-  ]
-  ++ lib.optionals singleThreaded [
-    # fix single threaded build
+    # Fix build on LoongArch (error: '_Float16' is not supported on this target)
     (fetchpatch {
-      url = "https://github.com/OpenMathLib/OpenBLAS/commit/874243421298866d116e1e8bdbd7e0ed4e31e4f6.diff";
-      hash = "sha256-+L98AjuMaDdmEdF8yruvBpljQ+hGmsfNuJSLxB4quDU=";
+      url = "https://github.com/OpenMathLib/OpenBLAS/commit/7086a1b075ca317e12cfe79d40a32ad342a30496.patch";
+      hash = "sha256-pA3HK2f2MJr/+h/uale7edIYk/KH194EscYFcsujPXY=";
     })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # This commit led to miscompilation of certain ASIMD extensions code paths.
+    # There was an attempted fix in upstream but this still leaves some scipy tests failing.
     (fetchpatch {
-      url = "https://github.com/OpenMathLib/OpenBLAS/commit/d2906e8787ccc50051505f97262027bae6b55258.diff";
-      hash = "sha256-jYYMDr2rDJjM8ESO7/yPDl7Z/Y1MsrFBB4HsNOuFL9M=";
+      url = "https://github.com/OpenMathLib/OpenBLAS/commit/3f6e928d34aca977bd5d4191e6d2c2338a342.patch";
+      revert = true;
+      hash = "sha256-EccgzxgyfAjVbV+HPemGHmzkRe0kpixu3eS3BZWr0g4=";
     })
   ];
 
diff --git a/pkgs/development/libraries/science/math/openblas/make.nix b/pkgs/development/libraries/science/math/openblas/make.nix
deleted file mode 100644
index 77af9fe00cbd..000000000000
--- a/pkgs/development/libraries/science/math/openblas/make.nix
+++ /dev/null
@@ -1,346 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  perl,
-  which,
-  # Most packages depending on openblas expect integer width to match
-  # pointer width, but some expect to use 32-bit integers always
-  # (for compatibility with reference BLAS).
-  blas64 ? null,
-  # Multi-threaded applications must not call a threaded OpenBLAS
-  # (the only exception is when an application uses OpenMP as its
-  # *only* form of multi-threading). See
-  #     https://github.com/OpenMathLib/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded
-  #     https://github.com/OpenMathLib/OpenBLAS/issues/2543
-  # This flag builds a single-threaded OpenBLAS using the flags
-  # stated in thre.
-  singleThreaded ? false,
-  buildPackages,
-  # Select a specific optimization target (other than the default)
-  # See https://github.com/OpenMathLib/OpenBLAS/blob/develop/TargetList.txt
-  target ? null,
-  # Select whether DYNAMIC_ARCH is enabled or not.
-  dynamicArch ? null,
-  # enable AVX512 optimized kernels.
-  # These kernels have been a source of trouble in the past.
-  # Use with caution.
-  enableAVX512 ? false,
-  enableStatic ? stdenv.hostPlatform.isStatic,
-  enableShared ? !stdenv.hostPlatform.isStatic,
-
-  # for passthru.tests
-  ceres-solver,
-  giac,
-  octave,
-  opencv,
-  python3,
-  openmp ? null,
-}:
-
-let
-  blas64_ = blas64;
-in
-
-let
-  setTarget = x: if target == null then x else target;
-  setDynamicArch = x: if dynamicArch == null then x else dynamicArch;
-
-  # To add support for a new platform, add an element to this set.
-  configs = {
-    armv6l-linux = {
-      BINARY = 32;
-      TARGET = setTarget "ARMV6";
-      DYNAMIC_ARCH = setDynamicArch false;
-      USE_OPENMP = true;
-    };
-
-    armv7l-linux = {
-      BINARY = 32;
-      TARGET = setTarget "ARMV7";
-      DYNAMIC_ARCH = setDynamicArch false;
-      USE_OPENMP = true;
-    };
-
-    aarch64-darwin = {
-      BINARY = 64;
-      TARGET = setTarget "VORTEX";
-      DYNAMIC_ARCH = setDynamicArch true;
-      USE_OPENMP = false;
-      MACOSX_DEPLOYMENT_TARGET = "11.0";
-    };
-
-    aarch64-linux = {
-      BINARY = 64;
-      TARGET = setTarget "ARMV8";
-      DYNAMIC_ARCH = setDynamicArch true;
-      USE_OPENMP = true;
-    };
-
-    i686-linux = {
-      BINARY = 32;
-      TARGET = setTarget "P2";
-      DYNAMIC_ARCH = setDynamicArch true;
-      USE_OPENMP = true;
-    };
-
-    x86_64-darwin = {
-      BINARY = 64;
-      TARGET = setTarget "ATHLON";
-      DYNAMIC_ARCH = setDynamicArch true;
-      NO_AVX512 = !enableAVX512;
-      USE_OPENMP = false;
-      MACOSX_DEPLOYMENT_TARGET = "10.7";
-    };
-
-    x86_64-linux = {
-      BINARY = 64;
-      TARGET = setTarget "ATHLON";
-      DYNAMIC_ARCH = setDynamicArch true;
-      NO_AVX512 = !enableAVX512;
-      USE_OPENMP = !stdenv.hostPlatform.isMusl;
-    };
-
-    x86_64-windows = {
-      BINARY = 64;
-      TARGET = setTarget "ATHLON";
-      DYNAMIC_ARCH = setDynamicArch true;
-      NO_AVX512 = !enableAVX512;
-      USE_OPENMP = false;
-    };
-
-    powerpc64-linux = {
-      BINARY = 64;
-      TARGET = setTarget "POWER4";
-      DYNAMIC_ARCH = setDynamicArch false;
-      USE_OPENMP = !stdenv.hostPlatform.isMusl;
-    };
-
-    powerpc64le-linux = {
-      BINARY = 64;
-      TARGET = setTarget "POWER5";
-      DYNAMIC_ARCH = setDynamicArch true;
-      USE_OPENMP = !stdenv.hostPlatform.isMusl;
-    };
-
-    riscv64-linux = {
-      BINARY = 64;
-      TARGET = setTarget "RISCV64_GENERIC";
-      DYNAMIC_ARCH = setDynamicArch false;
-      USE_OPENMP = true;
-    };
-
-    loongarch64-linux = {
-      TARGET = setTarget "LA64_GENERIC";
-      DYNAMIC_ARCH = setDynamicArch false;
-      USE_OPENMP = true;
-    };
-
-    s390x-linux = {
-      BINARY = 64;
-      TARGET = setTarget "ZARCH_GENERIC";
-      DYNAMIC_ARCH = setDynamicArch true;
-      USE_OPENMP = true;
-    };
-
-    x86_64-freebsd = {
-      BINARY = 64;
-      TARGET = setTarget "ATHLON";
-      DYNAMIC_ARCH = setDynamicArch true;
-      NO_AVX512 = !enableAVX512;
-      USE_OPENMP = true;
-    };
-  };
-in
-
-let
-  config =
-    configs.${stdenv.hostPlatform.system}
-      or (throw "unsupported system: ${stdenv.hostPlatform.system}");
-in
-
-let
-  blas64 = if blas64_ != null then blas64_ else lib.hasPrefix "x86_64" stdenv.hostPlatform.system;
-  # Convert flag values to format OpenBLAS's build expects.
-  # `toString` is almost what we need other than bools,
-  # which we need to map {true -> 1, false -> 0}
-  # (`toString` produces empty string `""` for false instead of `0`)
-  mkMakeFlagValue =
-    val:
-    if !builtins.isBool val then
-      toString val
-    else if val then
-      "1"
-    else
-      "0";
-  mkMakeFlagsFromConfig = lib.mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}");
-
-  shlibExt = stdenv.hostPlatform.extensions.sharedLibrary;
-
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "openblas";
-  version = "0.3.31";
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  src = fetchFromGitHub {
-    owner = "OpenMathLib";
-    repo = "OpenBLAS";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-YBR81GOLnTsc0g1SZL+j31/OFucJrBRFqtOTV8lcy8U=";
-  };
-
-  ${if singleThreaded then "patches" else null} = [
-    # fix single threaded build
-    (fetchpatch {
-      url = "https://github.com/OpenMathLib/OpenBLAS/commit/874243421298866d116e1e8bdbd7e0ed4e31e4f6.diff";
-      hash = "sha256-+L98AjuMaDdmEdF8yruvBpljQ+hGmsfNuJSLxB4quDU=";
-    })
-    (fetchpatch {
-      url = "https://github.com/OpenMathLib/OpenBLAS/commit/d2906e8787ccc50051505f97262027bae6b55258.diff";
-      hash = "sha256-jYYMDr2rDJjM8ESO7/yPDl7Z/Y1MsrFBB4HsNOuFL9M=";
-    })
-  ];
-
-  inherit blas64;
-
-  # Some hardening features are disabled due to sporadic failures in
-  # OpenBLAS-based programs. The problem may not be with OpenBLAS itself, but
-  # with how these flags interact with hardening measures used downstream.
-  # In either case, OpenBLAS must only be used by trusted code--it is
-  # inherently unsuitable for security-conscious applications--so there should
-  # be no objection to disabling these hardening measures.
-  hardeningDisable = [
-    # don't modify or move the stack
-    "stackprotector"
-    "pic"
-    # don't alter index arithmetic
-    "strictoverflow"
-    # don't interfere with dynamic target detection
-    "relro"
-    "bindnow"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-    # "__builtin_clear_padding not supported for variable length aggregates"
-    # in aarch64-specific code
-    "trivialautovarinit"
-  ];
-
-  nativeBuildInputs = [
-    perl
-    which
-  ];
-
-  buildInputs = lib.optional (stdenv.cc.isClang && config.USE_OPENMP) openmp;
-
-  depsBuildBuild = [
-    buildPackages.gfortran
-    buildPackages.stdenv.cc
-  ];
-
-  enableParallelBuilding = true;
-
-  makeFlags = mkMakeFlagsFromConfig (
-    config
-    // {
-      FC = "${stdenv.cc.targetPrefix}gfortran";
-      CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}";
-      PREFIX = placeholder "out";
-      OPENBLAS_INCLUDE_DIR = "${placeholder "dev"}/include";
-      NUM_THREADS = 64;
-      INTERFACE64 = blas64;
-      NO_STATIC = !enableStatic;
-      NO_SHARED = !enableShared;
-      CROSS = stdenv.hostPlatform != stdenv.buildPlatform;
-      HOSTCC = "cc";
-      # Makefile.system only checks defined status
-      # This seems to be a bug in the openblas Makefile:
-      # on x86_64 it expects NO_BINARY_MODE=
-      # but on aarch64 it expects NO_BINARY_MODE=0
-      NO_BINARY_MODE =
-        if stdenv.hostPlatform.isx86_64 then
-          toString (stdenv.hostPlatform != stdenv.buildPlatform)
-        else
-          stdenv.hostPlatform != stdenv.buildPlatform;
-      # This disables automatic build job count detection (which honours neither enableParallelBuilding nor NIX_BUILD_CORES)
-      # and uses the main make invocation's job count, falling back to 1 if no parallelism is used.
-      # https://github.com/OpenMathLib/OpenBLAS/blob/v0.3.20/getarch.c#L1781-L1792
-      MAKE_NB_JOBS = 0;
-    }
-    // (lib.optionalAttrs stdenv.cc.isClang {
-      LDFLAGS = "-L${lib.getLib buildPackages.gfortran.cc}/lib"; # contains `libgfortran.so`; building with clang needs this, gcc has it implicit
-    })
-    // (lib.optionalAttrs singleThreaded {
-      # As described on https://github.com/OpenMathLib/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded
-      USE_THREAD = false;
-      USE_LOCKING = true; # available with openblas >= 0.3.7
-      USE_OPENMP = false; # openblas will refuse building with both USE_OPENMP=1 and USE_THREAD=0
-    })
-  );
-
-  # The default "all" target unconditionally builds the "tests" target.
-  buildFlags = lib.optionals (!finalAttrs.doCheck) [ "shared" ];
-
-  doCheck = true;
-  checkTarget = "tests";
-
-  postInstall = ''
-        # Write pkgconfig aliases. Upstream report:
-        # https://github.com/OpenMathLib/OpenBLAS/issues/1740
-        for alias in blas cblas lapack; do
-          cat <<EOF > $out/lib/pkgconfig/$alias.pc
-    Name: $alias
-    Version: ${finalAttrs.version}
-    Description: $alias provided by the OpenBLAS package.
-    Cflags: -I$dev/include
-    Libs: -L$out/lib -lopenblas
-    EOF
-        done
-
-        # Setup symlinks for blas / lapack
-  ''
-  + lib.optionalString stdenv.hostPlatform.isMinGW ''
-    ln -s $out/bin/*.dll $out/lib
-  ''
-  + lib.optionalString enableShared ''
-    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}
-    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}
-    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}
-    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}
-  ''
-  + lib.optionalString (stdenv.hostPlatform.isLinux && enableShared) ''
-    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3
-    ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3
-    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3
-    ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3
-  ''
-  + lib.optionalString enableStatic ''
-    ln -s $out/lib/libopenblas.a $out/lib/libblas.a
-    ln -s $out/lib/libopenblas.a $out/lib/libcblas.a
-    ln -s $out/lib/libopenblas.a $out/lib/liblapack.a
-    ln -s $out/lib/libopenblas.a $out/lib/liblapacke.a
-  '';
-
-  passthru.tests = {
-    inherit (python3.pkgs) numpy scipy scikit-learn;
-    inherit
-      ceres-solver
-      giac
-      octave
-      opencv
-      ;
-  };
-
-  meta = {
-    description = "Basic Linear Algebra Subprograms";
-    license = lib.licenses.bsd3;
-    homepage = "https://github.com/OpenMathLib/OpenBLAS";
-    platforms = lib.attrNames configs;
-    maintainers = with lib.maintainers; [ ttuegel ];
-  };
-})
diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index 5c5b607c92e8..f0d216933fd2 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simpleitk";
-  version = "2.5.3";
+  version = "2.5.4";
 
   src = fetchFromGitHub {
     owner = "SimpleITK";
     repo = "SimpleITK";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lHpoYGrL7HHOLcYdMKsAPhh7g0hLVsgkRxk1fsmvAzQ=";
+    hash = "sha256-9EJwdF0ja1GuMJ7HU3Xg2IHyz/zWSsS1JdWrvla61HI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index f8722d6cd3d1..54b4ef4557f2 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -83,6 +83,8 @@ stdenv.mkDerivation rec {
     "--includedir=${placeholder "dev"}/include"
     "--libdir=${placeholder "out"}/lib"
     (if stdenv.hostPlatform.isStatic then "--disable-tcl" else "--with-tcl=${lib.getLib tcl}/lib")
+    # Enabling limit-on-update/delete by adding -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT to NIX_CFLAGS_COMPILE does not work: the lemon parser generator (built early in buildPhase) doesn't receive the flag when it's invoked, as it's not been wrapped with Nix magic.
+    "--enable-update-limit"
   ]
   ++ lib.optional (!interactive) "--disable-readline"
   # autosetup only looks up readline.h in predefined set of directories.
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index bde0f5da0f73..b4bce91d0878 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -151,6 +151,8 @@ stdenv.mkDerivation (finalAttrs: {
     # users/groups which aren't guaranteed to exist on the system.
     rm -R $out/lib/udev
 
+    mkdir -p $out/etc/tpm2-tss
+
     # write fapi-config suitable for testing
     cat > $out/etc/tpm2-tss/fapi-config-test.json <<EOF
     {
diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix
index 3f24ddce7222..e787cdf8adc5 100644
--- a/pkgs/development/libraries/ustream-ssl/default.nix
+++ b/pkgs/development/libraries/ustream-ssl/default.nix
@@ -6,7 +6,6 @@
   pkg-config,
   libubox-nossl,
   ssl_implementation,
-  additional_buildInputs ? [ ],
 }:
 
 stdenv.mkDerivation {
@@ -35,7 +34,7 @@ stdenv.mkDerivation {
     cmake
     pkg-config
   ];
-  buildInputs = [ ssl_implementation ] ++ additional_buildInputs;
+  buildInputs = [ ssl_implementation ];
 
   passthru = {
     inherit ssl_implementation;
diff --git a/pkgs/development/libraries/wayland/darwin.patch b/pkgs/development/libraries/wayland/darwin.patch
deleted file mode 100644
index 2c6d923e267c..000000000000
--- a/pkgs/development/libraries/wayland/darwin.patch
+++ /dev/null
@@ -1,619 +0,0 @@
-diff --git a/egl/wayland-egl-symbols-check b/egl/wayland-egl-symbols-check
-index d04fd042f..82b9499d1 100755
---- a/egl/wayland-egl-symbols-check
-+++ b/egl/wayland-egl-symbols-check
-@@ -14,7 +14,15 @@ if ! test -n "$NM"; then
- 	exit 99
- fi
- 
--AVAIL_FUNCS="$($NM -D --format=bsd --defined-only $LIB | awk '{print $3}')"
-+if [ "$(uname)" == "Darwin" ]; then
-+  NM_DYNSYM_TABLE=""
-+  SYMBOL_PREFIX="_"
-+else
-+  NM_DYNSYM_TABLE="-D"
-+  SYMBOL_PREFIX=""
-+fi
-+
-+AVAIL_FUNCS="$($NM ${NM_DYNSYM_TABLE} --format=bsd --defined-only $LIB | awk '{print $3}')"
- 
- # Official ABI, taken from the header.
- REQ_FUNCS="wl_egl_window_resize
-@@ -37,7 +45,7 @@ if test -n "$NEW_ABI"; then
- fi
- 
- REMOVED_ABI=$(echo "$REQ_FUNCS" | while read func; do
--    echo "$AVAIL_FUNCS" | grep -q "^$func$" && continue
-+    echo "$AVAIL_FUNCS" | grep -q "^${SYMBOL_PREFIX}$func$" && continue
- 
-     echo $func
- done)
-diff --git a/meson.build b/meson.build
-index a3126b63e..97a9036c2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -16,7 +16,7 @@ config_h.set_quoted('PACKAGE', meson.project_name())
- config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
- 
- cc_args = []
--if host_machine.system() not in ['freebsd', 'openbsd']
-+if host_machine.system() not in ['freebsd', 'openbsd', 'darwin']
- 	cc_args += ['-D_POSIX_C_SOURCE=200809L']
- endif
- add_project_arguments(cc_args, language: 'c')
-@@ -69,8 +69,8 @@ endif
- config_h.set10('HAVE_BROKEN_MSG_CMSG_CLOEXEC', have_broken_msg_cmsg_cloexec)
- 
- if get_option('libraries')
--	if host_machine.system() in ['freebsd', 'openbsd']
--		# When building for FreeBSD, epoll(7) is provided by a userspace
-+	if host_machine.system() in ['freebsd', 'openbsd', 'darwin']
-+		# When building for BSDs, epoll(7) is provided by a userspace
- 		# wrapper around kqueue(2).
- 		epoll_dep = dependency('epoll-shim')
- 	else
-diff --git a/src/event-loop.c b/src/event-loop.c
-index 89294fd97..60c574690 100644
---- a/src/event-loop.c
-+++ b/src/event-loop.c
-@@ -45,6 +45,14 @@
- #include "wayland-server-private.h"
- #include "wayland-os.h"
- 
-+#ifdef __APPLE__
-+/* epoll-shim should provide this by design */
-+struct itimerspec {
-+	struct timespec it_interval;
-+	struct timespec it_value;
-+};
-+#endif
-+
- /** \cond INTERNAL */
- 
- #define TIMER_REMOVED -2
-diff --git a/src/wayland-client.c b/src/wayland-client.c
-index fe14a6b13..5f72ec248 100644
---- a/src/wayland-client.c
-+++ b/src/wayland-client.c
-@@ -38,7 +38,6 @@
- #include <sys/un.h>
- #include <ctype.h>
- #include <fcntl.h>
--#include <poll.h>
- #include <pthread.h>
- 
- #include "wayland-util.h"
-@@ -1999,7 +1998,7 @@ wl_display_poll(struct wl_display *display,
- 			timespec_sub_saturate(&result, &deadline, &now);
- 			remaining_timeout = &result;
- 		}
--		ret = ppoll(pfd, 1, remaining_timeout, NULL);
-+		ret = wl_os_ppoll(pfd, 1, remaining_timeout, NULL);
- 	} while (ret == -1 && errno == EINTR);
- 
- 	return ret;
-diff --git a/src/wayland-os.c b/src/wayland-os.c
-index f00ead4b9..9f0f6fb1c 100644
---- a/src/wayland-os.c
-+++ b/src/wayland-os.c
-@@ -39,6 +39,9 @@
- #ifdef HAVE_SYS_UCRED_H
- #include <sys/ucred.h>
- #endif
-+#if defined(__APPLE__) && !defined(EPOLL_SHIM_DISABLE_WRAPPER_MACROS)
-+#include <epoll-shim/detail/poll.h>
-+#endif
- 
- #include "wayland-os.h"
- 
-@@ -74,18 +77,20 @@ int
- wl_os_socket_cloexec(int domain, int type, int protocol)
- {
- 	int fd;
--
-+#if !defined(__APPLE__)
-+	/* It is ok to bypass this logic on Darwin,
-+	   FD_CLOEXEC will be set by set_cloexec_or_close() */
- 	fd = wl_socket(domain, type | SOCK_CLOEXEC, protocol);
- 	if (fd >= 0)
- 		return fd;
- 	if (errno != EINVAL)
- 		return -1;
--
-+#endif
- 	fd = wl_socket(domain, type, protocol);
- 	return set_cloexec_or_close(fd);
- }
- 
--#if defined(__FreeBSD__)
-+#if defined(LOCAL_PEERCRED)
- int
- wl_os_socket_peercred(int sockfd, uid_t *uid, gid_t *gid, pid_t *pid)
- {
-@@ -101,6 +106,14 @@ wl_os_socket_peercred(int sockfd, uid_t *uid, gid_t *gid, pid_t *pid)
- #if HAVE_XUCRED_CR_PID
- 	/* Since https://cgit.freebsd.org/src/commit/?id=c5afec6e895a */
- 	*pid = ucred.cr_pid;
-+#elif defined(LOCAL_PEERPID)
-+	/* Try LOCAL_PEERPID if no cr_pid in xucred */
-+	size_t pid_size;
-+	pid_t peerpid;
-+	if (getsockopt(sockfd, SOL_LOCAL, LOCAL_PEERPID, &peerpid, &pid_size))
-+		*pid = peerpid;
-+	else
-+		*pid = 0;
- #else
- 	*pid = 0;
- #endif
-@@ -178,13 +191,16 @@ recvmsg_cloexec_fallback(int sockfd, struct msghdr *msg, int flags)
- ssize_t
- wl_os_recvmsg_cloexec(int sockfd, struct msghdr *msg, int flags)
- {
--#if HAVE_BROKEN_MSG_CMSG_CLOEXEC
-+#if HAVE_BROKEN_MSG_CMSG_CLOEXEC || defined(__APPLE__)
- 	/*
- 	 * FreeBSD had a broken implementation of MSG_CMSG_CLOEXEC between 2015
- 	 * and 2021, so we have to use the non-MSG_CMSG_CLOEXEC fallback
- 	 * directly when compiling against a version that does not include the
- 	 * fix (https://cgit.freebsd.org/src/commit/?id=6ceacebdf52211).
- 	 */
-+	/*
-+	 * Darwin has no MSG_CMSG_CLOEXEC, so use fallback too.
-+	 */
- #pragma message("Using fallback directly since MSG_CMSG_CLOEXEC is broken.")
- #else
- 	ssize_t len;
-@@ -220,7 +236,7 @@ wl_os_accept_cloexec(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
- {
- 	int fd;
- 
--#ifdef HAVE_ACCEPT4
-+#if defined(HAVE_ACCEPT4) && !defined(__APPLE__)
- 	fd = accept4(sockfd, addr, addrlen, SOCK_CLOEXEC);
- 	if (fd >= 0)
- 		return fd;
-@@ -273,3 +289,18 @@ wl_os_mremap_maymove(int fd, void *old_data, ssize_t *old_size,
- 
- 	return result;
- }
-+
-+int
-+wl_os_ppoll(struct pollfd *fds, nfds_t nfds,
-+      const struct timespec *timeout_ts, const sigset_t *sigmask)
-+{
-+#if defined(__APPLE__)
-+#ifndef EPOLL_SHIM_DISABLE_WRAPPER_MACROS
-+	return epoll_shim_ppoll(fds, nfds, timeout_ts, sigmask);
-+#else
-+	return -1;
-+#endif
-+#endif
-+
-+	return ppoll(fds, nfds, timeout_ts, sigmask);
-+}
-diff --git a/src/wayland-os.h b/src/wayland-os.h
-index 068fd2fea..3f9d02bce 100644
---- a/src/wayland-os.h
-+++ b/src/wayland-os.h
-@@ -28,6 +28,7 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <poll.h>
- 
- int
- wl_os_socket_cloexec(int domain, int type, int protocol);
-@@ -51,6 +52,9 @@ void *
- wl_os_mremap_maymove(int fd, void *old_data, ssize_t *old_size,
- 		     ssize_t new_size, int prot, int flags);
- 
-+int
-+wl_os_ppoll(struct pollfd *fds, nfds_t nfds,
-+      const struct timespec *timeout_ts, const sigset_t *sigmask);
- 
- /*
-  * The following are for wayland-os.c and the unit tests.
-diff --git a/tests/client-test.c b/tests/client-test.c
-index 5585c0cd0..b5c3f924a 100644
---- a/tests/client-test.c
-+++ b/tests/client-test.c
-@@ -97,7 +97,13 @@ TEST(client_destroy_listener)
- 	bool user_data_destroyed = false;
- 	int s[2];
- 
-+#ifdef SOCK_CLOEXEC
- 	assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0);
-+#else
-+	assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0);
-+	assert(set_cloexec_or_close(s[0]) != -1);
-+	assert(set_cloexec_or_close(s[1]) != -1);
-+#endif
- 	display = wl_display_create();
- 	assert(display);
- 	client = wl_client_create(display, s[0]);
-@@ -184,7 +190,13 @@ TEST(client_destroy_removes_link)
- 	struct client_destroy_listener destroy_listener;
- 	int s[2];
- 
-+#ifdef SOCK_CLOEXEC
- 	assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0);
-+#else
-+	assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0);
-+	assert(set_cloexec_or_close(s[0]) != -1);
-+	assert(set_cloexec_or_close(s[1]) != -1);
-+#endif
- 	display = wl_display_create();
- 	assert(display);
- 	client = wl_client_create(display, s[0]);
-diff --git a/tests/connection-test.c b/tests/connection-test.c
-index aed97a0a4..60244223c 100644
---- a/tests/connection-test.c
-+++ b/tests/connection-test.c
-@@ -48,7 +48,13 @@ setup(int *s)
- {
- 	struct wl_connection *connection;
- 
-+#ifdef SOCK_CLOEXEC
- 	assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0);
-+#else
-+	assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0);
-+	assert(set_cloexec_or_close(s[0]) != -1);
-+	assert(set_cloexec_or_close(s[1]) != -1);
-+#endif
- 
- 	connection = wl_connection_create(s[0], WL_BUFFER_DEFAULT_MAX_SIZE);
- 	assert(connection);
-@@ -181,8 +187,14 @@ struct marshal_data {
- static void
- setup_marshal_data(struct marshal_data *data)
- {
-+#ifdef SOCK_CLOEXEC
- 	assert(socketpair(AF_UNIX,
- 			  SOCK_STREAM | SOCK_CLOEXEC, 0, data->s) == 0);
-+#else
-+	assert(socketpair(AF_UNIX, SOCK_STREAM , 0, data->s) == 0);
-+	assert(set_cloexec_or_close(data->s[0]) != -1);
-+	assert(set_cloexec_or_close(data->s[1]) != -1);
-+#endif
- 	data->read_connection = wl_connection_create(data->s[0],
- 						     WL_BUFFER_DEFAULT_MAX_SIZE);
- 	assert(data->read_connection);
-@@ -885,7 +897,13 @@ TEST(request_bogus_size)
- 	for (bogus_size = 11; bogus_size >= 0; bogus_size--) {
- 		fprintf(stderr, "* bogus size %d\n", bogus_size);
- 
-+#ifdef SOCK_CLOEXEC
- 		assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0);
-+#else
-+		assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0);
-+		assert(set_cloexec_or_close(s[0]) != -1);
-+		assert(set_cloexec_or_close(s[1]) != -1);
-+#endif
- 		display = wl_display_create();
- 		assert(display);
- 		client = wl_client_create(display, s[0]);
-diff --git a/tests/display-test.c b/tests/display-test.c
-index 89606c731..fbcd40fd5 100644
---- a/tests/display-test.c
-+++ b/tests/display-test.c
-@@ -39,6 +39,10 @@
- #include <sys/stat.h>
- #include <sys/mman.h>
- 
-+#ifdef __APPLE__
-+#include <fcntl.h>
-+#endif
-+
- #include <pthread.h>
- #include <poll.h>
- 
-@@ -1499,6 +1503,10 @@ send_overflow_client(void *data)
- 	/* Limit the send buffer size for the display socket to guarantee
- 	 * that the test will cause an overflow. */
- 	sock = wl_display_get_fd(c->wl_display);
-+#if __APPLE__
-+	/* Darwin sockets may by non-blocked after accept() */
-+	assert(fcntl(sock, F_SETFL, ~O_NONBLOCK) != -1);
-+#endif
- 	assert(setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &optval, sizeof(optval)) == 0);
- 
- 	/* Request to break out of 'display_run' in the main process */
-diff --git a/tests/os-wrappers-test.c b/tests/os-wrappers-test.c
-index 061d29e6a..d9cd7c40d 100644
---- a/tests/os-wrappers-test.c
-+++ b/tests/os-wrappers-test.c
-@@ -62,12 +62,12 @@ static int
- socket_wrapper(int domain, int type, int protocol)
- {
- 	wrapped_calls_socket++;
--
-+#ifdef SOCK_CLOEXEC
- 	if (fall_back && (type & SOCK_CLOEXEC)) {
- 		errno = EINVAL;
- 		return -1;
- 	}
--
-+#endif
- 	return socket(domain, type, protocol);
- }
- 
-@@ -111,11 +111,12 @@ static ssize_t
- recvmsg_wrapper(int sockfd, struct msghdr *msg, int flags)
- {
- 	wrapped_calls_recvmsg++;
--
-+#ifdef MSG_CMSG_CLOEXEC
- 	if (fall_back && (flags & MSG_CMSG_CLOEXEC)) {
- 		errno = EINVAL;
- 		return -1;
- 	}
-+#endif
- 
- 	return recvmsg(sockfd, msg, flags);
- }
-@@ -160,8 +161,11 @@ do_os_wrappers_socket_cloexec(int n)
- 	 * Must have 2 calls if falling back, but must also allow
- 	 * falling back without a forced fallback.
- 	 */
-+#ifdef SOCK_CLOEXEC
- 	assert(wrapped_calls_socket > n);
--
-+#else
-+	assert(wrapped_calls_socket == 1);
-+#endif
- 	exec_fd_leak_check(nr_fds);
- }
- 
-@@ -234,8 +238,14 @@ struct marshal_data {
- static void
- setup_marshal_data(struct marshal_data *data)
- {
-+#ifdef SOCK_CLOEXEC
- 	assert(socketpair(AF_UNIX,
- 			  SOCK_STREAM | SOCK_CLOEXEC, 0, data->s) == 0);
-+#else
-+	assert(socketpair(AF_UNIX, SOCK_STREAM, 0, data->s) == 0);
-+	assert(set_cloexec_or_close(data->s[0]) != -1);
-+	assert(set_cloexec_or_close(data->s[1]) != -1);
-+#endif
- 
- 	data->read_connection = wl_connection_create(data->s[0],
- 						     WL_BUFFER_DEFAULT_MAX_SIZE);
-@@ -325,7 +335,7 @@ do_os_wrappers_recvmsg_cloexec(int n)
- 	struct marshal_data data;
- 
- 	data.nr_fds_begin = count_open_fds();
--#if HAVE_BROKEN_MSG_CMSG_CLOEXEC
-+#if HAVE_BROKEN_MSG_CMSG_CLOEXEC || !defined(MSG_CMSG_CLOEXEC)
- 	/* We call the fallback directly on FreeBSD versions with a broken
- 	 * MSG_CMSG_CLOEXEC, so we don't call the local recvmsg() wrapper. */
- 	data.wrapped_calls = 0;
-diff --git a/tests/queue-test.c b/tests/queue-test.c
-index 7dfdd3064..de9adfc6d 100644
---- a/tests/queue-test.c
-+++ b/tests/queue-test.c
-@@ -23,7 +23,26 @@
-  * SOFTWARE.
-  */
- 
-+#ifndef __APPLE__
- #define _GNU_SOURCE /* For memrchr */
-+#else
-+#include <string.h>
-+/* No memrchr() on Darwin, borrow one from OpenBSD */
-+static void *
-+memrchr(const void *s, int c, size_t n)
-+{
-+	const unsigned char *cp;
-+
-+	if (n != 0) {
-+		cp = (unsigned char *)s + n;
-+		do {
-+			if (*(--cp) == (unsigned char)c)
-+				return((void *)cp);
-+		} while (--n != 0);
-+	}
-+	return(NULL);
-+}
-+#endif
- #include <stdlib.h>
- #include <stdint.h>
- #include <stdio.h>
-diff --git a/tests/resources-test.c b/tests/resources-test.c
-index 92707297b..33f6e21d2 100644
---- a/tests/resources-test.c
-+++ b/tests/resources-test.c
-@@ -40,7 +40,14 @@ TEST(create_resource_tst)
- 	int s[2];
- 	uint32_t id;
- 
-+#ifdef SOCK_CLOEXEC
- 	assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0);
-+#else
-+	assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0);
-+	assert(set_cloexec_or_close(s[0]) != -1);
-+	assert(set_cloexec_or_close(s[1]) != -1);
-+#endif
-+
- 	display = wl_display_create();
- 	assert(display);
- 	client = wl_client_create(display, s[0]);
-@@ -111,7 +118,13 @@ TEST(destroy_res_tst)
- 		.notify = &destroy_notify
- 	};
- 
-+#ifdef SOCK_CLOEXEC
- 	assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0);
-+#else
-+	assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0);
-+	assert(set_cloexec_or_close(s[0]) != -1);
-+	assert(set_cloexec_or_close(s[1]) != -1);
-+#endif
- 	display = wl_display_create();
- 	assert(display);
- 	client = wl_client_create(display, s[0]);
-@@ -159,7 +172,13 @@ TEST(create_resource_with_same_id)
- 	int s[2];
- 	uint32_t id;
- 
-+#ifdef SOCK_CLOEXEC
- 	assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0);
-+#else
-+	assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0);
-+	assert(set_cloexec_or_close(s[0]) != -1);
-+	assert(set_cloexec_or_close(s[1]) != -1);
-+#endif
- 	display = wl_display_create();
- 	assert(display);
- 	client = wl_client_create(display, s[0]);
-@@ -243,7 +262,13 @@ TEST(resource_destroy_iteration)
- 		.notify = &resource_destroy_notify
- 	};
- 
-+#ifdef SOCK_CLOEXEC
- 	assert(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, s) == 0);
-+#else
-+	assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0);
-+	assert(set_cloexec_or_close(s[0]) != -1);
-+	assert(set_cloexec_or_close(s[1]) != -1);
-+#endif
- 	display = wl_display_create();
- 	assert(display);
- 	client = wl_client_create(display, s[0]);
-diff --git a/tests/test-helpers.c b/tests/test-helpers.c
-index 1af813bb4..9ae96b1b4 100644
---- a/tests/test-helpers.c
-+++ b/tests/test-helpers.c
-@@ -88,6 +88,30 @@ count_open_fds(void)
- 	/* return the current number of entries */
- 	return size / sizeof(struct kinfo_file);
- }
-+#elif defined(__APPLE__)
-+#include <libproc.h>
-+
-+/* 
-+ * On Darwin, use libproc API to get fds of a PID
-+ */
-+int
-+count_open_fds(void)
-+{
-+	int buffer_size, buffer_used;
-+	pid_t pid = getpid();
-+	int nfds;
-+	struct proc_fdinfo *fdinfo;
-+
-+	buffer_size = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, 0, 0);
-+	fdinfo = malloc(buffer_size);
-+
-+	buffer_used = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, fdinfo, buffer_size);
-+	assert(buffer_used > 0 && "proc_pidinfo PROC_PIDLISTFDS failed.");
-+
-+	nfds = buffer_used / PROC_PIDLISTFD_SIZE;
-+	free(fdinfo);
-+	return nfds;
-+}
- #else
- int
- count_open_fds(void)
-diff --git a/tests/test-runner.c b/tests/test-runner.c
-index 9a50d1dd1..639f5a2e8 100644
---- a/tests/test-runner.c
-+++ b/tests/test-runner.c
-@@ -63,7 +63,12 @@ static int timeouts_enabled = 1;
- /* set to one if the output goes to the terminal */
- static int is_atty = 0;
- 
-+#if __APPLE__
-+extern const struct test __start_test_section __asm("section$start$__RODATA$test_section");
-+extern const struct test __stop_test_section __asm("section$end$__RODATA$test_section");
-+#else
- extern const struct test __start_test_section, __stop_test_section;
-+#endif
- 
- static const struct test *
- find_test(const char *name)
-@@ -308,6 +313,23 @@ is_debugger_attached(void)
- 
- 	return rc;
- }
-+#elif defined(__APPLE__)
-+#include <sys/sysctl.h>
-+/* https://stackoverflow.com/a/2200786 */
-+static int
-+is_debugger_attached(void)
-+{
-+	int ret;
-+	int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() };
-+	struct kinfo_proc info;
-+	size_t size;
-+
-+	info.kp_proc.p_flag = 0;
-+	ret = sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, NULL, 0);
-+	assert(ret == 0);
-+
-+	return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
-+}
- #else
- static int
- is_debugger_attached(void)
-diff --git a/tests/test-runner.h b/tests/test-runner.h
-index d07340096..50eff6afb 100644
---- a/tests/test-runner.h
-+++ b/tests/test-runner.h
-@@ -37,11 +37,17 @@ struct test {
- 	int must_fail;
- } __attribute__ ((aligned (16)));
- 
-+#if __APPLE__
-+#define TEST_SECTION "__RODATA,test_section"
-+#else
-+#define TEST_SECTION "test_section"
-+#endif
-+
- #define TEST(name)							\
- 	static void name(void);						\
- 									\
- 	const struct test test##name					\
--		 __attribute__ ((used, section ("test_section"))) = {	\
-+		 __attribute__ ((used, section (TEST_SECTION))) = {	\
- 		#name, name, 0						\
- 	};								\
- 									\
-@@ -51,7 +57,7 @@ struct test {
- 	static void name(void);						\
- 									\
- 	const struct test test##name					\
--		 __attribute__ ((used, section ("test_section"))) = {	\
-+		 __attribute__ ((used, section (TEST_SECTION))) = {	\
- 		#name, name, 1						\
- 	};								\
- 									\
-@@ -93,3 +99,28 @@ test_disable_coredumps(void);
- 	} while (0);
- 
- #endif
-+
-+/* For systems without SOCK_CLOEXEC */
-+#include <fcntl.h>
-+__attribute__((used))
-+static int
-+set_cloexec_or_close(int fd)
-+{
-+	long flags;
-+
-+	if (fd == -1)
-+		return -1;
-+
-+	flags = fcntl(fd, F_GETFD);
-+	if (flags == -1)
-+		goto err;
-+
-+	if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1)
-+		goto err;
-+
-+	return fd;
-+
-+err:
-+	close(fd);
-+	return -1;
-+}
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 876e767d32ec..4b90274ef3b2 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -32,11 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-gokkh6Aa1nszTsqDtUMXp8hqA6ic+trP71IR8RpdBTY=";
   };
 
-  patches = [
-    # patch from: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/481
-    ./darwin.patch
-  ];
-
   postPatch = lib.optionalString withDocumentation ''
     patchShebangs doc/doxygen/gen-doxygen.py
   '';
diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 676191efcd7e..8a14819a2805 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayland-protocols";
-  version = "1.47";
+  version = "1.48";
 
   doCheck =
     stdenv.hostPlatform == stdenv.buildPlatform
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
-    hash = "sha256-X9Q0m8vJurmkb4z3fR9DQpanoFLIdECglPY/z2KljiA=";
+    hash = "sha256-OYA2rA62SEmC3b3n/4aEjXUyMfnN7q6YPwa1KUZiWqE=";
   };
 
   postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index cac050463469..993fb9ea47f4 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -76,5 +76,5 @@ in
   # Don't forget to change the hashes in xapian-omega and
   # python3Packages.xapian. They inherit the version from this package, and
   # should always be built with the equivalent xapian version.
-  xapian_1_4 = generic "1.4.27" "sha256-vLyZz78WCAEZwlcfwpZ5T1Ob1ULKOSbxfCmZYAgwq2E=";
+  xapian_1_4 = generic "1.4.31" "sha256-/s9gnqLv3IpkvjaXFarHMzNqEfdICmVFJElkrmvICBE=";
 }
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index 8fb02bee902b..591adee8f401 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz";
-    hash = "sha256-HRk7MoXsFQVXJXsEnuHYyUxAvN6QbOC6fxo4oamlpcE=";
+    hash = "sha256-p9+2CN2LPqU93oUjbUdXloJgacTRJhieozp5M0myMXo=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 769a6283e438..d1ade7177909 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -46,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-uzKaCizQJ00FUZ1hxmfAYuBpkNcuEl7i36jeZPARnRY=";
     };
 
+  # https://github.com/madler/zlib/pull/1171
+  patches = [
+    ./export-variable.patch
+  ];
+
   postPatch = ''
     substituteInPlace configure \
       --replace-fail '/usr/bin/libtool' '${stdenv.cc.targetPrefix}ar' \
diff --git a/pkgs/development/libraries/zlib/export-variable.patch b/pkgs/development/libraries/zlib/export-variable.patch
new file mode 100644
index 000000000000..a33af41e0405
--- /dev/null
+++ b/pkgs/development/libraries/zlib/export-variable.patch
@@ -0,0 +1,29 @@
+From 3625bc4c8e2015bbd0d902c75d9ef8bb5a8a3c17 Mon Sep 17 00:00:00 2001
+From: Robert Wolke <rwolke@users.noreply.github.com>
+Date: Wed, 18 Feb 2026 14:33:27 +0100
+Subject: [PATCH] fix: Add missing replacment of VGFMAFLAG
+
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index bc723443e..4e6c8d85b 100755
+--- a/configure
++++ b/configure
+@@ -1024,6 +1024,7 @@ sed < ${SRCDIR}Makefile.in "
+ /^LDFLAGS *=/s#=.*#=$LDFLAGS#
+ /^LDSHARED *=/s#=.*#=$LDSHARED#
+ /^CPP *=/s#=.*#=$CPP#
++/^VGFMAFLAG *=/s#=.*#=$VGFMAFLAG#
+ /^STATICLIB *=/s#=.*#=$STATICLIB#
+ /^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
+ /^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
+@@ -1054,6 +1055,7 @@ sed < ${SRCDIR}zlib.pc.in "
+ /^CC *=/s#=.*#=$CC#
+ /^CFLAGS *=/s#=.*#=$CFLAGS#
+ /^CPP *=/s#=.*#=$CPP#
++/^VGFMAFLAG *=/s#=.*#=$VGFMAFLAG#
+ /^LDSHARED *=/s#=.*#=$LDSHARED#
+ /^STATICLIB *=/s#=.*#=$STATICLIB#
+ /^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 76f07a76156b..304cac321285 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -95,18 +95,18 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "argparse";
-      version = "0.7.1-1";
+      version = "0.7.2-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/argparse-0.7.1-1.rockspec";
-          sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8";
+          url = "mirror://luarocks/argparse-0.7.2-1.rockspec";
+          sha256 = "1az7ikzll699sbz2qxq9wkm0ncmic33dhg85zqlznbnz28vy6jza";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/luarocks/argparse/archive/0.7.1.zip";
-        sha256 = "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1";
+        url = "https://github.com/luarocks/argparse/archive/0.7.2.zip";
+        sha256 = "0ji3hh0s2g2i5sribiib2vpy30xzfkv61m4mzwawfpgraqg03r6y";
       };
 
-      disabled = luaOlder "5.1" || luaAtLeast "5.5";
+      disabled = luaOlder "5.1" || luaAtLeast "5.6";
 
       meta = {
         homepage = "https://github.com/luarocks/argparse";
@@ -1008,15 +1008,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2615-1";
+      version = "0.0.2629-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2615-1.rockspec";
-          sha256 = "04y7lh9mm7lj605xpsrb6p142mpmnnisf781slfmcsgl2zbm4pk9";
+          url = "mirror://luarocks/fzf-lua-0.0.2629-1.rockspec";
+          sha256 = "0n4p78119nir3cbb5ig313nf2mlnzf16kxkbwy1xc7lnhy9czv4q";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/cebf88881a4fab2c20a2a950269953417af1c3e8.zip";
-        sha256 = "13b4zrx4j2pnl9sh6mcyx120gm29flk7zr03vkik2difpcpdi518";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/1ae863c83e0823225b4e041845f10c918d5fb882.zip";
+        sha256 = "0hsxklwq6kqvjcpdlwilqk7wmw0pdah5g8skg1iya97fj13imnc6";
       };
 
       disabled = luaOlder "5.1";
@@ -3857,17 +3857,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luasystem";
-      version = "0.7.0-1";
+      version = "0.7.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luasystem-0.7.0-1.rockspec";
-          sha256 = "1c50g495s2xzf041p9yl58idxa1mv28sxbgymy05jyp30g0ifqw5";
+          url = "mirror://luarocks/luasystem-0.7.1-1.rockspec";
+          sha256 = "10hnakzkyjqh6plks2wz2844l7rw619vfc5b3idqw9pndpw6fylz";
         }).outPath;
       src = fetchFromGitHub {
         owner = "lunarmodules";
         repo = "luasystem";
-        tag = "v0.7.0";
-        hash = "sha256-/hob/bDP3CQeMZuz29a4XTRzlU7I7O2W/EszJEueq8c=";
+        tag = "v0.7.1";
+        hash = "sha256-HxOtwWyAYOxTQXm0KyJVvSNTxWOJnn4pnX0FFu4HYh4=";
       };
 
       disabled = luaOlder "5.1";
@@ -5495,21 +5495,21 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "rustaceanvim";
-      version = "9.0.2-2";
+      version = "9.0.3-2";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/rustaceanvim-9.0.2-2.rockspec";
-          sha256 = "09vq53b68a9ywilb7fa1bsn52wmdzdvbflih0p8ppjzsk1lyilsv";
+          url = "mirror://luarocks/rustaceanvim-9.0.3-2.rockspec";
+          sha256 = "1afjl8f0qgqlingk8schjnpqi1ihh35s33pf57xpn6chx281zb7d";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.2.zip";
-        sha256 = "0kmd12d234fwrikhz33y7npdmyi7ahldb9mjdwlvl3kgq0lkpg74";
+        url = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.3.zip";
+        sha256 = "14573r04zqn72a6qjhnjii0n6n2s8smdg5rsccr1svy2aplvwxrj";
       };
 
       disabled = lua.luaversion != "5.1";
 
       meta = {
-        homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.2.zip";
+        homepage = "https://github.com/mrcjkb/rustaceanvim/archive/refs/tags/v9.0.3.zip";
         maintainers = with lib.maintainers; [ mrcjkb ];
         license.fullName = "GPL-2.0-only";
         description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim";
@@ -5882,8 +5882,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "nvim-telescope";
         repo = "telescope.nvim";
-        rev = "028d9a0695a0cc4cfa893889f8c408ed7ccc8adc";
-        hash = "sha256-xU/lozREXuXkjBq8L94sLwyEE6f7k8Q3y0BkjPssB1Y=";
+        rev = "506338434fec5ad19cb1f8d45bf92d66c4917393";
+        hash = "sha256-ekfqqG44cS13FJ0qQKOCl8bftxF8BSRD5v+wZrCAvb8=";
       };
 
       disabled = lua.luaversion != "5.1";
diff --git a/pkgs/development/lua-modules/lua-https/default.nix b/pkgs/development/lua-modules/lua-https/default.nix
new file mode 100644
index 000000000000..4bcd27849cc8
--- /dev/null
+++ b/pkgs/development/lua-modules/lua-https/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildLuaPackage,
+  writeScript,
+  fetchFromGitHub,
+  cmake,
+  lua,
+  curl,
+}:
+
+buildLuaPackage rec {
+  pname = "lua-https";
+  version = "0-unstable-2025-02-28";
+
+  src = fetchFromGitHub {
+    owner = "love2d";
+    repo = "lua-https";
+    rev = "e1b77046dd3cf1a9f61ddeb63cb39d47c844c089";
+    hash = "sha256-NQVB5ncw2bYJEHPQtBXqCdwp6FdQ4SJ/x97fasE5z0A=";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    lua
+    curl
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib/lua/${lua.luaversion}")
+    (lib.cmakeFeature "LIBRARY_LOADER" "linktime")
+    (lib.cmakeBool "USE_CURL_BACKEND" true) # off by default on darwin
+    (lib.cmakeBool "USE_OPENSSL_BACKEND" false) # on by default on linux, but incompatible with linktime library loader
+    (lib.cmakeBool "USE_NSURL_BACKEND" false) # on by default on darwin
+  ];
+
+  passthru.updateScript = writeScript "update.sh" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p curl jq common-updater-scripts
+
+    set -euo pipefail
+
+    response=$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL "https://api.github.com/repos/${src.owner}/${src.repo}/commits?per_page=1")
+    rev=$(echo "$response" | jq -r '.[0].sha')
+    date=$(echo "$response" | jq -r '.[0].commit.committer.date' | cut -c1-10)
+    update-source-version luaPackages.lua-https 0-unstable-$date --rev=$rev
+  '';
+
+  meta = {
+    homepage = "https://love2d.org/wiki/lua-https";
+    description = "Simple Lua HTTPS module using native platform backends specifically written for LÖVE 12.0";
+    license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+  };
+}
diff --git a/pkgs/development/lua-modules/luv/default.nix b/pkgs/development/lua-modules/luv/default.nix
index 342ff447e922..674380893251 100644
--- a/pkgs/development/lua-modules/luv/default.nix
+++ b/pkgs/development/lua-modules/luv/default.nix
@@ -13,7 +13,7 @@
 
 buildLuarocksPackage rec {
   pname = "luv";
-  version = "1.51.0-2";
+  version = "1.52.1-0";
 
   src = fetchFromGitHub {
     owner = "luvit";
@@ -21,7 +21,7 @@ buildLuarocksPackage rec {
     rev = version;
     # Need deps/lua-compat-5.3 only
     fetchSubmodules = true;
-    hash = "sha256-UJHNXftAvtDuporyKCuJ7+KbtG0lBZ+DtESixS8rabQ=";
+    hash = "sha256-mU+Gvlpvp6iZE5IpXfTr+21QQ34vZk+tYhnr0b891qg=";
   };
 
   # to make sure we dont use bundled deps
@@ -43,31 +43,19 @@ buildLuarocksPackage rec {
   buildInputs = [ libuv ];
   nativeBuildInputs = [ cmake ];
 
-  # Need to specify WITH_SHARED_LIBUV=ON cmake flag, but
-  # Luarocks doesn't take cmake variables from luarocks config.
-  # Need to specify it in rockspec. See https://github.com/luarocks/luarocks/issues/1160.
-  knownRockspec = runCommand "luv-${version}.rockspec" { } ''
-    patch ${src}/luv-scm-0.rockspec -o - > $out <<'EOF'
-    --- a/luv-scm-0.rockspec
-    +++ b/luv-scm-0.rockspec
-    @@ -1,5 +1,5 @@
-     package = "luv"
-    -version = "scm-0"
-    +version = "${version}"
-     source = {
-       url = 'git://github.com/luvit/luv.git'
-     }
-    @@ -24,6 +24,7 @@
-     build =
-       type = 'cmake',
-       variables = {
-    +     WITH_SHARED_LIBUV="ON",
-          CMAKE_C_FLAGS="$(CFLAGS)",
-          CMAKE_MODULE_LINKER_FLAGS="$(LIBFLAG)",
-          LUA_LIBDIR="$(LUA_LIBDIR)",
-    EOF
+  rockspecFilename = "luv-scm-0.rockspec";
+
+  postConfigure = ''
+    mv "$rockspecFilename" "$generatedRockspecFilename"
+    rockspecFilename="$generatedRockspecFilename"
+    substituteInPlace "$rockspecFilename" \
+      --replace-fail 'version = "scm-0"' "version = \"$version\""
   '';
 
+  luarocksConfig.variables = {
+    WITH_SHARED_LIBUV = "ON";
+  };
+
   __darwinAllowLocalNetworking = true;
 
   doInstallCheck = true;
@@ -80,18 +68,23 @@ buildLuarocksPackage rec {
   disabled = luaOlder "5.1";
 
   passthru = {
-    tests.test =
-      runCommand "luv-${version}-test"
-        {
-          nativeBuildInputs = [ (lua.withPackages (ps: [ ps.luv ])) ];
-        }
-        ''
-          lua <<EOF
-          local uv = require("luv")
-          assert(uv.fs_mkdir(assert(uv.os_getenv("out")), 493))
-          print(uv.version_string())
-          EOF
-        '';
+    tests = {
+      test =
+        runCommand "luv-${version}-test"
+          {
+            nativeBuildInputs = [ (lua.withPackages (ps: [ ps.luv ])) ];
+          }
+          ''
+            lua <<EOF
+            local uv = require("luv")
+            assert(uv.fs_mkdir(assert(uv.os_getenv("out")), 493))
+            print(uv.version_string())
+            EOF
+          '';
+
+      # Test libluv too
+      inherit (lua.pkgs) libluv;
+    };
 
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/development/lua-modules/luv/lib.nix b/pkgs/development/lua-modules/luv/lib.nix
index e1d0791ffe7c..d13961b8259e 100644
--- a/pkgs/development/lua-modules/luv/lib.nix
+++ b/pkgs/development/lua-modules/luv/lib.nix
@@ -34,4 +34,9 @@ stdenv.mkDerivation {
     cmake
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ];
+
+  passthru.tests = {
+    # Test luv too
+    luv = lua.pkgs.luv.passthru.tests.test;
+  };
 }
diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index 58a1311e91de..52edb004c401 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -12,7 +12,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -90,7 +90,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -154,7 +154,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -230,7 +230,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -276,7 +276,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -352,7 +352,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -398,7 +398,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -476,7 +476,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -568,7 +568,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -660,7 +660,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -752,7 +752,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -844,7 +844,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -936,7 +936,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -1028,7 +1028,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -1212,7 +1212,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -1304,7 +1304,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -1396,7 +1396,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -1460,7 +1460,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1524,7 +1524,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1588,7 +1588,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1652,7 +1652,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1716,7 +1716,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1780,7 +1780,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1845,7 +1845,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1876,7 +1876,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1907,7 +1907,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1936,7 +1936,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -1986,7 +1986,7 @@
         }
       ],
       "displayName": "Android Auto Desktop Head Unit Emulator",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-auto",
       "path": "extras/google/auto",
@@ -2012,7 +2012,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -2048,7 +2048,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -2077,7 +2077,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -2106,7 +2106,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK (Deprecated)",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -2144,7 +2144,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -2173,7 +2173,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -2202,7 +2202,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -2231,7 +2231,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -2260,7 +2260,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -2289,7 +2289,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 20552,
+      "last-available-day": 20569,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2306,636 +2306,6 @@
           "id:0": "google"
         }
       }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "b621b9d5adf273bb0725948589863e60e96eeaf1",
-          "size": 91207,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip"
-        }
-      ],
-      "displayName": "Solver for ConstraintLayout 1.0.0",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "2aa2aceecc6ba172742d0af0b43f11d03924eeb8",
-          "size": 95406,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"
-        }
-      ],
-      "displayName": "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a",
-          "size": 97549,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"
-        }
-      ],
-      "displayName": "Solver for ConstraintLayout 1.0.0-alpha8",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "042c25575e7650e96f0f5f5d1d3c54ed38eb821a",
-          "size": 104706,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip"
-        }
-      ],
-      "displayName": "Solver for ConstraintLayout 1.0.0-beta1",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "28492fd42b20ae1586591ff906556d459cfdaae8",
-          "size": 107335,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip"
-        }
-      ],
-      "displayName": "Solver for ConstraintLayout 1.0.0-beta2",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "268e763fa64bd217d8d830e59ce76be19aaba631",
-          "size": 107593,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip"
-        }
-      ],
-      "displayName": "Solver for ConstraintLayout 1.0.0-beta3",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "2213bf37e7a2869db2635895b8e90ca6841e79d2",
-          "size": 109361,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip"
-        }
-      ],
-      "displayName": "Solver for ConstraintLayout 1.0.0-beta4",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "3918cfef73e64048d0b3e048068e208b414e7e91",
-          "size": 92284,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip"
-        }
-      ],
-      "displayName": "Solver for ConstraintLayout 1.0.0-beta5",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "76f8823def9a6da8954a54737762a6820bc1d043",
-          "size": 91823,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip"
-        }
-      ],
-      "displayName": "Solver for ConstraintLayout 1.0.1",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "96d7ff669f0e808e9833b2c2e320702826ccc8be",
-          "size": 91961,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip"
-        }
-      ],
-      "displayName": "Solver for ConstraintLayout 1.0.2",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "70acf99689b933bc6735645d5c3d92b91954b6cb",
-          "size": 39153,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip"
-        }
-      ],
-      "dependencies": {
-        "dependency:0": {
-          "element-attributes": {
-            "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0"
-          }
-        }
-      },
-      "displayName": "ConstraintLayout for Android 1.0.0",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "645a9be1f0c1177301e71cd0ddccf1dd67c554fe",
-          "size": 15554,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"
-        }
-      ],
-      "dependencies": {
-        "dependency:0": {
-          "element-attributes": {
-            "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4"
-          }
-        }
-      },
-      "displayName": "com.android.support.constraint:constraint-layout:1.0.0-alpha4",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "7912ba03b04831f918f523648f118c4ee4da7604",
-          "size": 24797,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"
-        }
-      ],
-      "dependencies": {
-        "dependency:0": {
-          "element-attributes": {
-            "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8"
-          }
-        }
-      },
-      "displayName": "ConstraintLayout for Android 1.0.0-alpha8",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "11f2f5cec4ff02986bad75435e5be77b704b4c64",
-          "size": 31750,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip"
-        }
-      ],
-      "dependencies": {
-        "dependency:0": {
-          "element-attributes": {
-            "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1"
-          }
-        }
-      },
-      "displayName": "ConstraintLayout for Android 1.0.0-beta1",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "623939865ede2e5c2c975dc55963e0d182bcce95",
-          "size": 31812,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip"
-        }
-      ],
-      "dependencies": {
-        "dependency:0": {
-          "element-attributes": {
-            "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2"
-          }
-        }
-      },
-      "displayName": "ConstraintLayout for Android 1.0.0-beta2",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b",
-          "size": 32622,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip"
-        }
-      ],
-      "dependencies": {
-        "dependency:0": {
-          "element-attributes": {
-            "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3"
-          }
-        }
-      },
-      "displayName": "ConstraintLayout for Android 1.0.0-beta3",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "dc60844aab93a09a54a3c107685a77b18d7c1c39",
-          "size": 32687,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip"
-        }
-      ],
-      "dependencies": {
-        "dependency:0": {
-          "element-attributes": {
-            "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4"
-          }
-        }
-      },
-      "displayName": "ConstraintLayout for Android 1.0.0-beta4",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "4660f6c7a576ea1364f0c3225db71c29ca660d9a",
-          "size": 39266,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip"
-        }
-      ],
-      "dependencies": {
-        "dependency:0": {
-          "element-attributes": {
-            "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5"
-          }
-        }
-      },
-      "displayName": "ConstraintLayout for Android 1.0.0-beta5",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "342b0894b8651fff37586f80f383733e97aba9f9",
-          "size": 39547,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip"
-        }
-      ],
-      "dependencies": {
-        "dependency:0": {
-          "element-attributes": {
-            "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1"
-          }
-        }
-      },
-      "displayName": "ConstraintLayout for Android 1.0.1",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
-    },
-    "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2": {
-      "archives": [
-        {
-          "os": "all",
-          "sha1": "3d9688a50fe0ed7348275f85d1b02278f616d8a4",
-          "size": 39625,
-          "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip"
-        }
-      ],
-      "dependencies": {
-        "dependency:0": {
-          "element-attributes": {
-            "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
-          }
-        }
-      },
-      "displayName": "ConstraintLayout for Android 1.0.2",
-      "last-available-day": 19823,
-      "license": "android-sdk-license",
-      "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2",
-      "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2",
-      "revision": "1",
-      "revision-details": {
-        "major:0": "1"
-      },
-      "type-details": {
-        "element-attributes": {
-          "xsi:type": "ns8:mavenType"
-        },
-        "vendor:0": {
-          "display:1": "Android",
-          "id:0": "android"
-        }
-      }
     }
   },
   "images": {
@@ -2959,7 +2329,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -3003,7 +2373,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -3049,7 +2419,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -3101,7 +2471,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -3150,7 +2520,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -3198,7 +2568,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -3242,7 +2612,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -3288,7 +2658,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -3340,7 +2710,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -3396,7 +2766,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -3433,7 +2803,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -3477,7 +2847,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -3523,7 +2893,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -3575,7 +2945,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -3631,7 +3001,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -3668,7 +3038,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -3712,7 +3082,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -3766,7 +3136,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3818,7 +3188,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3874,7 +3244,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3918,7 +3288,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -3964,7 +3334,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -4016,7 +3386,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -4072,7 +3442,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -4116,7 +3486,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -4162,7 +3532,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -4214,7 +3584,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -4263,7 +3633,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -4300,7 +3670,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -4339,7 +3709,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -4383,7 +3753,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -4427,7 +3797,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -4471,7 +3841,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -4510,7 +3880,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -4562,7 +3932,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -4614,7 +3984,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -4666,7 +4036,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -4715,7 +4085,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -4754,7 +4124,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -4798,7 +4168,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -4842,7 +4212,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -4886,7 +4256,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -4925,7 +4295,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -4977,7 +4347,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -5029,7 +4399,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -5081,7 +4451,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -5130,7 +4500,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -5174,7 +4544,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -5213,7 +4583,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -5257,7 +4627,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -5301,7 +4671,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -5345,7 +4715,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -5384,7 +4754,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -5436,7 +4806,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -5488,7 +4858,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -5540,7 +4910,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -5596,7 +4966,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -5635,7 +5005,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -5679,7 +5049,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -5723,7 +5093,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -5767,7 +5137,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -5813,7 +5183,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -5865,7 +5235,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -5917,7 +5287,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -5971,7 +5341,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -6027,7 +5397,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -6073,7 +5443,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -6117,7 +5487,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -6156,7 +5526,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -6200,7 +5570,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -6244,7 +5614,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -6283,7 +5653,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -6335,7 +5705,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -6387,7 +5757,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -6439,7 +5809,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -6493,7 +5863,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -6564,7 +5934,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -6610,7 +5980,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -6661,7 +6031,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -6705,7 +6075,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -6749,7 +6119,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -6800,7 +6170,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -6867,7 +6237,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -6934,7 +6304,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -7003,7 +6373,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -7059,7 +6429,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -7110,7 +6480,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -7154,7 +6524,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -7198,7 +6568,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -7249,7 +6619,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -7316,7 +6686,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -7385,7 +6755,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -7446,7 +6816,7 @@
             }
           },
           "displayName": "Automotive Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-28-android-automotive-playstore-x86",
           "path": "system-images/android-28/android-automotive-playstore/x86",
@@ -7491,7 +6861,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -7537,7 +6907,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -7588,7 +6958,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -7625,7 +6995,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -7662,7 +7032,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -7713,7 +7083,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -7780,7 +7150,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -7847,7 +7217,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -7906,7 +7276,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-28/google_apis_playstore/arm64-v8a",
@@ -7973,7 +7343,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -8040,7 +7410,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -8101,7 +7471,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-29-android-automotive-playstore-x86",
           "path": "system-images/android-29/android-automotive-playstore/x86",
@@ -8161,7 +7531,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -8200,7 +7570,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -8263,7 +7633,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -8326,7 +7696,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -8377,7 +7747,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -8434,7 +7804,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -8491,7 +7861,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -8550,7 +7920,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-29/google_apis_playstore/arm64-v8a",
@@ -8631,7 +8001,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -8712,7 +8082,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -8773,7 +8143,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-30-android-automotive-playstore-x86_64",
           "path": "system-images/android-30/android-automotive-playstore/x86_64",
@@ -8833,7 +8203,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -8879,7 +8249,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear-cn/arm64-v8a",
@@ -8923,7 +8293,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear-cn/x86",
@@ -8962,7 +8332,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -9011,7 +8381,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -9062,7 +8432,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -9129,7 +8499,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -9196,7 +8566,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -9262,7 +8632,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-30/google_apis_playstore/arm64-v8a",
@@ -9343,7 +8713,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -9424,7 +8794,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-x86_64",
           "path": "system-images/android-30/google_apis_playstore/x86_64",
@@ -9495,7 +8865,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -9554,7 +8924,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -9605,7 +8975,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -9654,7 +9024,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -9715,7 +9085,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -9782,7 +9152,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -9858,7 +9228,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-31/google_apis_playstore/arm64-v8a",
@@ -9925,7 +9295,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-x86_64",
           "path": "system-images/android-31/google_apis_playstore/x86_64",
@@ -9986,7 +9356,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play arm64-v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-arm64-v8a",
           "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
@@ -10039,7 +9409,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play x86_64 System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-x86_64",
           "path": "system-images/android-32/android-automotive-playstore/x86_64",
@@ -10094,7 +9464,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -10143,7 +9513,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -10204,7 +9574,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -10271,7 +9641,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -10347,7 +9717,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-32/google_apis_playstore/arm64-v8a",
@@ -10428,7 +9798,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -10489,7 +9859,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-arm64-v8a",
           "path": "system-images/android-33/android-automotive/arm64-v8a",
@@ -10542,7 +9912,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-x86_64",
           "path": "system-images/android-33/android-automotive/x86_64",
@@ -10607,7 +9977,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -10666,7 +10036,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -10712,7 +10082,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -10756,7 +10126,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -10807,7 +10177,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -10856,7 +10226,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -10917,7 +10287,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
@@ -10984,7 +10354,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
@@ -11053,7 +10423,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33/google_apis_playstore/arm64-v8a",
@@ -11120,7 +10490,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -11195,7 +10565,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a",
@@ -11244,7 +10614,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-33x-google_apis_playstore-x86_64",
           "path": "system-images/android-33-ext4/google_apis_playstore/x86_64",
@@ -11307,7 +10677,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -11367,7 +10737,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -11407,7 +10777,7 @@
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -11444,7 +10814,7 @@
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -11495,7 +10865,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -11544,7 +10914,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -11605,7 +10975,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -11673,7 +11043,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -11743,7 +11113,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34/google_apis_playstore/arm64-v8a",
@@ -11812,7 +11182,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34/google_apis_playstore/x86_64",
@@ -11875,7 +11245,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-arm64-v8a",
           "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
@@ -11928,7 +11298,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-x86_64",
           "path": "system-images/android-34-ext9/android-automotive/x86_64",
@@ -11997,7 +11367,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
@@ -12046,7 +11416,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-34x-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -12087,7 +11457,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-arm64-v8a",
           "path": "system-images/android-35/android-wear/arm64-v8a",
@@ -12119,7 +11489,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-x86_64",
           "path": "system-images/android-35/android-wear/x86_64",
@@ -12165,7 +11535,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35-default-arm64-v8a",
           "path": "system-images/android-35/default/arm64-v8a",
@@ -12210,7 +11580,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35-default-x86_64",
           "path": "system-images/android-35/default/x86_64",
@@ -12257,7 +11627,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
@@ -12315,7 +11685,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
@@ -12375,7 +11745,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore/arm64-v8a",
@@ -12433,7 +11803,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
           "path": "system-images/android-35/google_apis_playstore/x86_64",
@@ -12493,7 +11863,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-page_size_16kb-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
@@ -12555,7 +11925,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
           "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
@@ -12621,7 +11991,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-automotive-arm64-v8a",
           "path": "system-images/android-35-ext15/android-automotive/arm64-v8a",
@@ -12674,7 +12044,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-automotive-x86_64",
           "path": "system-images/android-35-ext15/android-automotive/x86_64",
@@ -12717,7 +12087,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-arm64-v8a",
           "path": "system-images/android-35-ext15/android-wear/arm64-v8a",
@@ -12750,7 +12120,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-x86_64",
           "path": "system-images/android-35-ext15/android-wear/x86_64",
@@ -12797,7 +12167,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis/arm64-v8a",
@@ -12846,7 +12216,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis-x86_64",
           "path": "system-images/android-35-ext15/google_apis/x86_64",
@@ -12897,7 +12267,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a",
@@ -12946,7 +12316,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis_playstore-x86_64",
           "path": "system-images/android-35-ext15/google_apis_playstore/x86_64",
@@ -12999,7 +12369,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-arm64-v8a",
           "path": "system-images/android-36/android-tv/arm64-v8a",
@@ -13044,7 +12414,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-x86",
           "path": "system-images/android-36/android-tv/x86",
@@ -13079,7 +12449,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-arm64-v8a",
           "path": "system-images/android-36/android-wear-signed/arm64-v8a",
@@ -13112,7 +12482,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-x86_64",
           "path": "system-images/android-36/android-wear-signed/x86_64",
@@ -13159,7 +12529,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36-default-arm64-v8a",
           "path": "system-images/android-36/default/arm64-v8a",
@@ -13204,7 +12574,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36-default-x86_64",
           "path": "system-images/android-36/default/x86_64",
@@ -13251,7 +12621,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis-arm64-v8a",
           "path": "system-images/android-36/google_apis/arm64-v8a",
@@ -13300,7 +12670,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis-x86_64",
           "path": "system-images/android-36/google_apis/x86_64",
@@ -13351,7 +12721,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore/arm64-v8a",
@@ -13400,7 +12770,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis_playstore-x86_64",
           "path": "system-images/android-36/google_apis_playstore/x86_64",
@@ -13451,7 +12821,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a",
@@ -13504,7 +12874,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36-page_size_16kb-x86_64",
           "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64",
@@ -13549,7 +12919,7 @@
             }
           ],
           "displayName": "Wear OS 6.1 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36.1-android-wear-arm64-v8a",
           "path": "system-images/android-36.1/android-wear-signed/arm64-v8a",
@@ -13582,7 +12952,7 @@
             }
           ],
           "displayName": "Wear OS 6.1 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36.1-android-wear-x86_64",
           "path": "system-images/android-36.1/android-wear-signed/x86_64",
@@ -13629,7 +12999,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_ps16k/arm64-v8a",
@@ -13687,7 +13057,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis-x86_64",
           "path": "system-images/android-36.1/google_apis_ps16k/x86_64",
@@ -13747,7 +13117,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/arm64-v8a",
@@ -13805,7 +13175,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis_playstore-x86_64",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/x86_64",
@@ -13975,7 +13345,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis/arm64-v8a",
@@ -14024,7 +13394,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis-x86_64",
           "path": "system-images/android-36-ext19/google_apis/x86_64",
@@ -14075,7 +13445,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis_playstore/arm64-v8a",
@@ -14124,7 +13494,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis_playstore-x86_64",
           "path": "system-images/android-36-ext19/google_apis_playstore/x86_64",
@@ -14159,9 +13529,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "04ed7e1ab0cde1397365cc44b711686797e14d29",
-              "size": 2106860933,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-37.0_r03.zip"
+              "sha1": "ab0e60335152d75d3fabaaa23438190d0a66be51",
+              "size": 2201073607,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-37.0_r04.zip"
             }
           ],
           "dependencies": {
@@ -14177,13 +13547,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.0-google_apis-arm64-v8a",
           "path": "system-images/android-37.0/google_apis_ps16k/arm64-v8a",
           "revision": "37.0-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:7": "arm64-v8a",
@@ -14216,9 +13586,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "b89a6686f9a9e9942d596bed45d422cbccb70c98",
-              "size": 2097719373,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-37.0_r03.zip"
+              "sha1": "d8754fe51083e036070dc7b58c1f297e244deff1",
+              "size": 2181070454,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-37.0_r04.zip"
             }
           ],
           "dependencies": {
@@ -14234,13 +13604,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-37.0-google_apis-x86_64",
           "path": "system-images/android-37.0/google_apis_ps16k/x86_64",
           "revision": "37.0-google_apis-x86_64",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:7": "x86_64",
@@ -14275,9 +13645,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "af41f56168a8a0f8a8018b2afd9423b2f1303d35",
-              "size": 2221330318,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-37.0_r03.zip"
+              "sha1": "d7756dd1e4e2d93b774be1624cf73037d0259d7d",
+              "size": 2319010289,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-37.0_r04.zip"
             }
           ],
           "dependencies": {
@@ -14293,13 +13663,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-37.0-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-37.0/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "37.0-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:7": "arm64-v8a",
@@ -14332,9 +13702,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "f3f64bbefb58a681614f61de5a752795eff74b95",
-              "size": 2225510754,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-37.0_r03.zip"
+              "sha1": "e187789f6e20c728636bc99fa0b384c6965bf17a",
+              "size": 2322377552,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-37.0_r04.zip"
             }
           ],
           "dependencies": {
@@ -14350,13 +13720,13 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-37.0-google_apis_playstore-x86_64",
           "path": "system-images/android-37.0/google_apis_playstore_ps16k/x86_64",
           "revision": "37.0-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "3"
+            "major:0": "4"
           },
           "type-details": {
             "abi:7": "x86_64",
@@ -14411,7 +13781,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis/arm64-v8a",
@@ -14461,7 +13831,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis/x86_64",
@@ -14513,7 +13883,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/arm64-v8a",
@@ -14563,7 +13933,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis_playstore-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/x86_64",
@@ -14615,7 +13985,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/arm64-v8a",
@@ -14669,7 +14039,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-page_size_16kb-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/x86_64",
@@ -14727,24 +14097,24 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_ps16k/arm64-v8a",
           "revision": "CANARY-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "10"
+            "major:0": "11"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
             "abi:8": "arm64-v8a",
-            "api-level:0": "36.1",
+            "api-level:0": "37.0",
             "base-extension:3": "true",
             "codename:1": "CANARY",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "21",
+            "extension-level:2": "22",
             "tag:4": {
               "display:1": "Google APIs",
               "id:0": "google_apis"
@@ -14790,24 +14160,24 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-CANARY-google_apis-x86_64",
           "path": "system-images/android-CANARY/google_apis_ps16k/x86_64",
           "revision": "CANARY-google_apis-x86_64",
           "revision-details": {
-            "major:0": "10"
+            "major:0": "11"
           },
           "type-details": {
             "abi:6": "x86_64",
             "abi:8": "x86_64",
-            "api-level:0": "36.1",
+            "api-level:0": "37.0",
             "base-extension:3": "true",
             "codename:1": "CANARY",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "21",
+            "extension-level:2": "22",
             "tag:4": {
               "display:1": "Google APIs",
               "id:0": "google_apis"
@@ -14855,24 +14225,24 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "CANARY-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "10"
+            "major:0": "11"
           },
           "type-details": {
             "abi:6": "arm64-v8a",
             "abi:8": "arm64-v8a",
-            "api-level:0": "36.1",
+            "api-level:0": "37.0",
             "base-extension:3": "true",
             "codename:1": "CANARY",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "21",
+            "extension-level:2": "22",
             "tag:4": {
               "display:1": "Google APIs PlayStore",
               "id:0": "google_apis_playstore"
@@ -14918,24 +14288,24 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-CANARY-google_apis_playstore-x86_64",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/x86_64",
           "revision": "CANARY-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "10"
+            "major:0": "11"
           },
           "type-details": {
             "abi:6": "x86_64",
             "abi:8": "x86_64",
-            "api-level:0": "36.1",
+            "api-level:0": "37.0",
             "base-extension:3": "true",
             "codename:1": "CANARY",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "21",
+            "extension-level:2": "22",
             "tag:4": {
               "display:1": "Google APIs PlayStore",
               "id:0": "google_apis_playstore"
@@ -14983,7 +14353,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.0-CANARY/google_apis_playstore_ps16k/arm64-v8a",
@@ -15037,7 +14407,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-preview-license",
           "name": "system-image-CANARY-page_size_16kb-x86_64",
           "path": "system-images/android-36.0-CANARY/google_apis_playstore_ps16k/x86_64",
@@ -15077,9 +14447,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "f86850ed7f5f6f8833ead78c6eec75eeb23ddea4",
-              "size": 2083840044,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-CinnamonBun_r02.zip"
+              "sha1": "6cb74af3f08d97d1474be7189c78d126e5651b04",
+              "size": 2202341861,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-CinnamonBun_r01.zip"
             }
           ],
           "dependencies": {
@@ -15095,23 +14465,23 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CinnamonBun-google_apis-arm64-v8a",
           "path": "system-images/android-CinnamonBun/google_apis_ps16k/arm64-v8a",
           "revision": "CinnamonBun-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "1"
           },
           "type-details": {
             "abi:8": "arm64-v8a",
-            "api-level:0": "36.1",
+            "api-level:0": "37.0",
             "base-extension:3": "true",
             "codename:1": "CinnamonBun",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "21",
+            "extension-level:2": "22",
             "tag:4": {
               "display:1": "Google APIs",
               "id:0": "google_apis"
@@ -15135,9 +14505,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "99f81267df3c5c0d978609a5b2b286034bd93d3e",
-              "size": 2073828390,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-CinnamonBun_r02.zip"
+              "sha1": "8e91601915fc96eec2cf5c6289aab9e4f7bc689a",
+              "size": 2182107073,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-CinnamonBun_r01.zip"
             }
           ],
           "dependencies": {
@@ -15153,23 +14523,23 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-CinnamonBun-google_apis-x86_64",
           "path": "system-images/android-CinnamonBun/google_apis_ps16k/x86_64",
           "revision": "CinnamonBun-google_apis-x86_64",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "1"
           },
           "type-details": {
             "abi:8": "x86_64",
-            "api-level:0": "36.1",
+            "api-level:0": "37.0",
             "base-extension:3": "true",
             "codename:1": "CinnamonBun",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "21",
+            "extension-level:2": "22",
             "tag:4": {
               "display:1": "Google APIs",
               "id:0": "google_apis"
@@ -15195,9 +14565,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "ba064e28780a5a156a85116d741234eac4e7bb37",
-              "size": 2171953354,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-CinnamonBun_r02.zip"
+              "sha1": "616bfdbcfe269f9d87335248e94ca0d7a6907c1a",
+              "size": 2319960319,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-CinnamonBun_r01.zip"
             }
           ],
           "dependencies": {
@@ -15213,23 +14583,23 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CinnamonBun-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/arm64-v8a",
           "revision": "CinnamonBun-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "1"
           },
           "type-details": {
             "abi:8": "arm64-v8a",
-            "api-level:0": "36.1",
+            "api-level:0": "37.0",
             "base-extension:3": "true",
             "codename:1": "CinnamonBun",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "21",
+            "extension-level:2": "22",
             "tag:4": {
               "display:1": "Google APIs PlayStore",
               "id:0": "google_apis_playstore"
@@ -15253,9 +14623,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "dc918be7e86d342ed7e3e174bbb62223ac8a06a9",
-              "size": 2173131758,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-CinnamonBun_r02.zip"
+              "sha1": "2085a225d35c8e2d1d1ec72253effc99bd059936",
+              "size": 2323444922,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-CinnamonBun_r01.zip"
             }
           ],
           "dependencies": {
@@ -15271,23 +14641,23 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20552,
+          "last-available-day": 20569,
           "license": "android-sdk-license",
           "name": "system-image-CinnamonBun-google_apis_playstore-x86_64",
           "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/x86_64",
           "revision": "CinnamonBun-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "1"
           },
           "type-details": {
             "abi:8": "x86_64",
-            "api-level:0": "36.1",
+            "api-level:0": "37.0",
             "base-extension:3": "true",
             "codename:1": "CinnamonBun",
             "element-attributes": {
               "xsi:type": "ns12:sysImgDetailsType"
             },
-            "extension-level:2": "21",
+            "extension-level:2": "22",
             "tag:4": {
               "display:1": "Google APIs PlayStore",
               "id:0": "google_apis_playstore"
@@ -15883,7 +15253,7 @@
     "build-tools": "37.0.0",
     "cmake": "4.1.2",
     "cmdline-tools": "20.0",
-    "emulator": "36.5.10",
+    "emulator": "36.5.11",
     "ndk": "29.0.14206865",
     "ndk-bundle": "22.1.7171670",
     "platform-tools": "37.0.0",
@@ -15891,7 +15261,7 @@
     "skiaparser": "8",
     "sources": "37.0",
     "tools": "26.1.1",
-    "fingerprint": "7fb1f87547f5d4c6"
+    "fingerprint": "46e2779744ab55bb"
   },
   "licenses": {
     "android-googletv-license": [
@@ -15959,7 +15329,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16008,7 +15378,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16057,7 +15427,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16106,7 +15476,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16155,7 +15525,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16204,7 +15574,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16253,7 +15623,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16302,7 +15672,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16351,7 +15721,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -16399,7 +15769,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -16447,7 +15817,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16496,7 +15866,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16545,7 +15915,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16594,7 +15964,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16643,7 +16013,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16692,7 +16062,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -16740,7 +16110,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16789,7 +16159,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -16837,7 +16207,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16886,7 +16256,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -16934,7 +16304,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -16982,7 +16352,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -17030,7 +16400,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -17078,7 +16448,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -17126,7 +16496,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -17174,7 +16544,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -17222,7 +16592,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -17270,7 +16640,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -17318,7 +16688,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -17366,7 +16736,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -17414,7 +16784,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -17462,7 +16832,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -17510,7 +16880,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -17558,7 +16928,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -17606,7 +16976,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -17654,7 +17024,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -17702,7 +17072,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -17750,7 +17120,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -17798,7 +17168,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -17846,7 +17216,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17896,7 +17266,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17946,7 +17316,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -17994,7 +17364,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -18042,7 +17412,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -18090,7 +17460,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -18138,7 +17508,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -18188,7 +17558,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -18238,7 +17608,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -18288,7 +17658,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -18336,7 +17706,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -18384,7 +17754,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -18432,7 +17802,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -18480,7 +17850,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -18528,7 +17898,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -18576,7 +17946,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -18617,7 +17987,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -18658,7 +18028,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -18699,7 +18069,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -18741,7 +18111,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -18782,7 +18152,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -18823,7 +18193,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -18864,7 +18234,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -18905,7 +18275,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -18946,7 +18316,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -18988,7 +18358,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -19030,7 +18400,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -19072,7 +18442,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -19113,7 +18483,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -19155,7 +18525,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -19197,7 +18567,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -19239,7 +18609,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -19281,7 +18651,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35.0.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.1",
@@ -19322,7 +18692,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0",
@@ -19363,7 +18733,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc1",
@@ -19405,7 +18775,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc3",
@@ -19447,7 +18817,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc4",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc4",
@@ -19489,7 +18859,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc5",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc5",
@@ -19531,7 +18901,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0",
@@ -19572,7 +18942,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1-rc1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0-rc1",
@@ -19614,7 +18984,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0",
@@ -19655,7 +19025,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37-rc1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0-rc1",
@@ -19697,7 +19067,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 37-rc2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/37.0.0-rc2",
@@ -19748,7 +19118,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -19789,7 +19159,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -19830,7 +19200,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -19871,7 +19241,7 @@
           }
         ],
         "displayName": "CMake 3.30.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.3",
@@ -19912,7 +19282,7 @@
           }
         ],
         "displayName": "CMake 3.30.4",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.4",
@@ -19953,7 +19323,7 @@
           }
         ],
         "displayName": "CMake 3.30.5",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.5",
@@ -19994,7 +19364,7 @@
           }
         ],
         "displayName": "CMake 3.31.0",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.0",
@@ -20035,7 +19405,7 @@
           }
         ],
         "displayName": "CMake 3.31.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.1",
@@ -20076,7 +19446,7 @@
           }
         ],
         "displayName": "CMake 3.31.4",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.4",
@@ -20117,7 +19487,7 @@
           }
         ],
         "displayName": "CMake 3.31.5",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.5",
@@ -20158,7 +19528,7 @@
           }
         ],
         "displayName": "CMake 3.31.6",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.6",
@@ -20206,7 +19576,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -20247,7 +19617,7 @@
           }
         ],
         "displayName": "CMake 4.0.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.2",
@@ -20288,7 +19658,7 @@
           }
         ],
         "displayName": "CMake 4.0.3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.3",
@@ -20329,7 +19699,7 @@
           }
         ],
         "displayName": "CMake 4.1.0",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.0",
@@ -20370,7 +19740,7 @@
           }
         ],
         "displayName": "CMake 4.1.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.1",
@@ -20411,7 +19781,7 @@
           }
         ],
         "displayName": "CMake 4.1.2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.2",
@@ -20454,7 +19824,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -20494,7 +19864,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -20534,7 +19904,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -20574,7 +19944,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -20614,7 +19984,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -20654,7 +20024,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -20695,7 +20065,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -20736,7 +20106,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0",
@@ -20776,7 +20146,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -20817,7 +20187,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/17.0",
@@ -20857,7 +20227,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0",
@@ -20897,7 +20267,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0-alpha01",
@@ -20938,7 +20308,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -20979,7 +20349,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -21019,7 +20389,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/20.0",
@@ -21059,7 +20429,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -21099,7 +20469,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -21139,7 +20509,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -21179,7 +20549,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -21219,7 +20589,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -21259,7 +20629,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -21299,7 +20669,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -21316,44 +20686,6 @@
       }
     },
     "emulator": {
-      "34.2.11": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "b1d6652408c1e5015ce2f590270aee7b0b19fb07",
-            "size": 298395480,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-11592276.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "f363626bc90b00e2d7cf8ceef9dcb295d3f7f292",
-            "size": 394402351,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-11592276.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "797a55cb5139c96eb17faca0b816b940eb006468",
-            "size": 418099397,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-11592276.zip"
-          }
-        ],
-        "displayName": "Android Emulator",
-        "last-available-day": 19823,
-        "license": "android-sdk-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "34.2.11",
-        "revision-details": {
-          "major:0": "34",
-          "micro:2": "11",
-          "minor:1": "2"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "34.2.16": {
         "archives": [
           {
@@ -21430,82 +20762,6 @@
           }
         }
       },
-      "35.1.3": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "1fa0fe4bc06558a6bdbf622de1df6659c86fa832",
-            "size": 298471131,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-11643238.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "8c082cc61fff70561e41df68de78081a86b24bc8",
-            "size": 394818583,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-11643238.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "5128479f4d3eaef70f5412b665f6a706bbf2d898",
-            "size": 423494132,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-11643238.zip"
-          }
-        ],
-        "displayName": "Android Emulator",
-        "last-available-day": 19823,
-        "license": "android-sdk-preview-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "35.1.3",
-        "revision-details": {
-          "major:0": "35",
-          "micro:2": "3",
-          "minor:1": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
-      "35.1.4": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "28c76739fbca9f2c879eb51f960aeaffacfd2ecd",
-            "size": 349797729,
-            "url": "https://dl.google.com/android/repository/emulator-linux_x64-11672324.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "27da156d86d02ca82f898ac8adb0bfd7147e3f08",
-            "size": 414289925,
-            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-11672324.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "f8083528676b40f2592133cdb4eaf4809cdfa164",
-            "size": 463059783,
-            "url": "https://dl.google.com/android/repository/emulator-windows_x64-11672324.zip"
-          }
-        ],
-        "displayName": "Android Emulator",
-        "last-available-day": 19823,
-        "license": "android-sdk-license",
-        "name": "emulator",
-        "path": "emulator",
-        "revision": "35.1.4",
-        "revision-details": {
-          "major:0": "35",
-          "micro:2": "4",
-          "minor:1": "1"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "35.2.5": {
         "archives": [
           {
@@ -22648,6 +21904,54 @@
           }
         }
       },
+      "36.5.11": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "a6d99c53669d2eb750b6949adb85668fbd7355fe",
+            "size": 331545207,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-15261927.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "f7ed5a0413c492c11fcffcf19f2024787d6bac9b",
+            "size": 449816006,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-15261927.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "0d33a553d860410f9b05801c11e1779a40fa1ea5",
+            "size": 384547861,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-15261927.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "384b7fe8dccdc8c11f0596be4589adf44528c6e5",
+            "size": 418625872,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-15261927.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20569,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.5.11",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "11",
+          "minor:1": "5"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "36.6.2": {
         "archives": [
           {
@@ -22743,6 +22047,54 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.6.5": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "0db7ea0a28dfbbcab6d43e43fa6f4b177a088bb3",
+            "size": 347666973,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-15221694.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "f1303f9f14bdbe2a38ab661b7cb065979437fc79",
+            "size": 463292401,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-15221694.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "6512876f641240c78657b32f6fabddc1e5cddde1",
+            "size": 397030375,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-15221694.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "d7de9d1ae3fbcd782085d9cc7b658a846efb2414",
+            "size": 429608279,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-15221694.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20569,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.6.5",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "5",
+          "minor:1": "6"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -22868,7 +22220,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -22930,7 +22282,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -22992,7 +22344,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -23054,7 +22406,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -23117,7 +22469,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -23179,7 +22531,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -23243,7 +22595,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -23307,7 +22659,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -23369,7 +22721,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -23417,7 +22769,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -23466,7 +22818,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -23514,7 +22866,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -23570,7 +22922,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -23626,7 +22978,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -23681,7 +23033,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -23737,7 +23089,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -23792,7 +23144,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -23847,7 +23199,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -23902,7 +23254,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -23958,7 +23310,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -24013,7 +23365,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -24068,7 +23420,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -24124,7 +23476,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -24180,7 +23532,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -24236,7 +23588,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -24285,7 +23637,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -24334,7 +23686,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -24383,7 +23735,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -24431,7 +23783,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -24479,7 +23831,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -24527,7 +23879,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -24576,7 +23928,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -24625,7 +23977,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -24674,7 +24026,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -24722,7 +24074,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -24771,7 +24123,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -24820,7 +24172,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -24869,7 +24221,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -24918,7 +24270,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -24966,7 +24318,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -25014,7 +24366,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -25062,7 +24414,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -25104,7 +24456,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -25146,7 +24498,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -25187,7 +24539,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -25228,7 +24580,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -25269,7 +24621,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -25310,7 +24662,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -25352,7 +24704,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -25394,7 +24746,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -25435,7 +24787,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.1.12297006",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.1.12297006",
@@ -25476,7 +24828,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.2.12479018",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.2.12479018",
@@ -25517,7 +24869,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.3.13750724",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.3.13750724",
@@ -25558,7 +24910,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12433566",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12433566",
@@ -25600,7 +24952,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12674087",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12674087",
@@ -25642,7 +24994,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12916984",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12916984",
@@ -25684,7 +25036,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.13004108",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.0.13004108",
@@ -25725,7 +25077,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.1.13356709",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.1.13356709",
@@ -25766,7 +25118,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.2.13676358",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.2.13676358",
@@ -25807,7 +25159,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13113456",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13113456",
@@ -25849,7 +25201,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13599879",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13599879",
@@ -25891,7 +25243,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13846066",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13846066",
@@ -25933,7 +25285,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14033849",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.14033849",
@@ -25975,7 +25327,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14206865",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/29.0.14206865",
@@ -26016,7 +25368,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 30.0.14904198",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/30.0.14904198",
@@ -26081,7 +25433,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26143,7 +25495,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26205,7 +25557,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26267,7 +25619,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26330,7 +25682,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26392,7 +25744,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26456,7 +25808,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -26520,7 +25872,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26582,7 +25934,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26630,7 +25982,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26679,7 +26031,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26727,7 +26079,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26783,7 +26135,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26839,7 +26191,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26894,7 +26246,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26950,7 +26302,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27005,7 +26357,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27060,7 +26412,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27115,7 +26467,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27171,7 +26523,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27226,7 +26578,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27281,7 +26633,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27337,7 +26689,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27393,7 +26745,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27449,7 +26801,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -27469,44 +26821,6 @@
     },
     "patcher": {},
     "platform-tools": {
-      "35.0.1": {
-        "archives": [
-          {
-            "os": "linux",
-            "sha1": "959bf20c19ab1c82861ae4a7e7fdb293f4f1fe75",
-            "size": 7035310,
-            "url": "https://dl.google.com/android/repository/platform-tools_r35.0.1-linux.zip"
-          },
-          {
-            "os": "macosx",
-            "sha1": "a54ebb00559f3e4582d8e06fc04bab7ce0a2a6c2",
-            "size": 12476293,
-            "url": "https://dl.google.com/android/repository/platform-tools_r35.0.1-darwin.zip"
-          },
-          {
-            "os": "windows",
-            "sha1": "bef587e13dda79457631574b5ee93c0c596b592f",
-            "size": 6551888,
-            "url": "https://dl.google.com/android/repository/platform-tools_r35.0.1-win.zip"
-          }
-        ],
-        "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 19823,
-        "license": "android-sdk-license",
-        "name": "platform-tools",
-        "path": "platform-tools",
-        "revision": "35.0.1",
-        "revision-details": {
-          "major:0": "35",
-          "micro:2": "1",
-          "minor:1": "0"
-        },
-        "type-details": {
-          "element-attributes": {
-            "xsi:type": "ns5:genericDetailsType"
-          }
-        }
-      },
       "35.0.2": {
         "archives": [
           {
@@ -27683,20 +26997,20 @@
           {
             "arch": "all",
             "os": "macosx",
-            "sha1": "ff8facde137e57994112672a0d0f411a3ca7b201",
-            "size": 16442198,
+            "sha1": "8c4c926d0ca192376b2a04b0318484724319e67c",
+            "size": 16442240,
             "url": "https://dl.google.com/android/repository/platform-tools_r37.0.0-darwin.zip"
           },
           {
             "arch": "all",
             "os": "windows",
-            "sha1": "8a8351438a9bde81726129214940e0275f7949c7",
-            "size": 8092184,
+            "sha1": "f29bfb58d0d6f9a57d7dbcba6cc259f9ca6f58f1",
+            "size": 8092164,
             "url": "https://dl.google.com/android/repository/platform-tools_r37.0.0-win.zip"
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -27725,7 +27039,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -27763,7 +27077,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -27801,7 +27115,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -27839,7 +27153,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -27877,7 +27191,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -27915,7 +27229,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -27953,7 +27267,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -27991,7 +27305,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -28029,7 +27343,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -28067,7 +27381,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -28119,7 +27433,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28158,7 +27472,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -28196,7 +27510,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -28234,7 +27548,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -28272,7 +27586,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -28310,7 +27624,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -28348,7 +27662,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -28386,7 +27700,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -28424,7 +27738,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -28462,7 +27776,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -28500,7 +27814,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -28552,7 +27866,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28591,7 +27905,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -28629,7 +27943,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -28667,7 +27981,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -28705,7 +28019,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -28744,7 +28058,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33-ext5",
@@ -28778,7 +28092,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28823,7 +28137,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-34-ext12",
@@ -28856,7 +28170,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -28894,7 +28208,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35-ext15",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35-ext15",
@@ -28927,7 +28241,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36",
@@ -28960,7 +28274,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36.1",
@@ -28993,7 +28307,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36-ext19",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36-ext19",
@@ -29026,7 +28340,7 @@
           }
         ],
         "displayName": "Android SDK Platform 37.0",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-37.0",
@@ -29074,7 +28388,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29127,7 +28441,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29180,7 +28494,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29219,7 +28533,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -29257,7 +28571,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -29295,7 +28609,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -29333,7 +28647,7 @@
           }
         ],
         "displayName": "Android SDK Platform Baklava-ext19",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-Baklava-ext19",
@@ -29361,28 +28675,28 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "c302ae12b604acd942e31568f32917fe3141750c",
-            "size": 67144025,
-            "url": "https://dl.google.com/android/repository/platform-CANARY_r10.zip"
+            "sha1": "ed3b7cc69b5e8e66cbed77d1e4dda6629bbabf4b",
+            "size": 57118318,
+            "url": "https://dl.google.com/android/repository/platform-CANARY_r11.zip"
           }
         ],
         "displayName": "Android SDK Platform CANARY",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-CANARY",
         "revision": "CANARY",
         "revision-details": {
-          "major:0": "10"
+          "major:0": "11"
         },
         "type-details": {
-          "api-level:0": "36.1",
+          "api-level:0": "37.0",
           "base-extension:3": "true",
           "codename:1": "CANARY",
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
-          "extension-level:2": "21",
+          "extension-level:2": "22",
           "layoutlib:4": {
             "element-attributes": {
               "api": "15"
@@ -29395,28 +28709,28 @@
           {
             "arch": "all",
             "os": "all",
-            "sha1": "fc958eeaf4d3075d3f0eb8108df883baba9bb419",
-            "size": 67069204,
-            "url": "https://dl.google.com/android/repository/platform-CinnamonBun_r02.zip"
+            "sha1": "cd25c57fb97e11c02ca33d5d7c82cf543e1a1d46",
+            "size": 67416452,
+            "url": "https://dl.google.com/android/repository/platform-CinnamonBun_r01.zip"
           }
         ],
         "displayName": "Android SDK Platform CinnamonBun",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-CinnamonBun",
         "revision": "CinnamonBun",
         "revision-details": {
-          "major:0": "2"
+          "major:0": "1"
         },
         "type-details": {
-          "api-level:0": "36.1",
+          "api-level:0": "37.0",
           "base-extension:3": "true",
           "codename:1": "CinnamonBun",
           "element-attributes": {
             "xsi:type": "ns11:platformDetailsType"
           },
-          "extension-level:2": "21",
+          "extension-level:2": "22",
           "layoutlib:4": {
             "element-attributes": {
               "api": "15"
@@ -29466,7 +28780,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -29584,7 +28898,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -29705,7 +29019,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -29797,7 +29111,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 31-36",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/3",
@@ -29824,7 +29138,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -29853,7 +29167,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -29881,7 +29195,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -29909,7 +29223,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -29937,7 +29251,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -29965,7 +29279,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -29993,7 +29307,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -30021,7 +29335,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -30049,7 +29363,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -30077,7 +29391,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -30105,7 +29419,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -30133,7 +29447,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -30161,7 +29475,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -30189,7 +29503,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -30217,7 +29531,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -30245,7 +29559,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -30273,7 +29587,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -30301,7 +29615,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -30329,7 +29643,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -30357,7 +29671,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -30386,7 +29700,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -30415,7 +29729,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -30444,7 +29758,7 @@
           }
         ],
         "displayName": "Sources for Android 36",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36",
@@ -30472,7 +29786,7 @@
           }
         ],
         "displayName": "Sources for Android 36.1",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36.1",
@@ -30500,7 +29814,7 @@
           }
         ],
         "displayName": "Sources for Android 37.0",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-37.0",
@@ -30568,7 +29882,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 20552,
+        "last-available-day": 20569,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",
diff --git a/pkgs/development/ocaml-modules/atd/jsonlike.nix b/pkgs/development/ocaml-modules/atd/jsonlike.nix
new file mode 100644
index 000000000000..7c75fe3df48d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/atd/jsonlike.nix
@@ -0,0 +1,18 @@
+{
+  buildDunePackage,
+  atd,
+  re,
+}:
+
+buildDunePackage {
+  pname = "atd-jsonlike";
+  inherit (atd) src version;
+
+  minimalOCamlVersion = "4.12";
+
+  propagatedBuildInputs = [ re ];
+
+  meta = (removeAttrs atd.meta [ "mainProgram" ]) // {
+    description = "Generic JSON-like AST for use with ATD code generators";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/atd/yamlx.nix b/pkgs/development/ocaml-modules/atd/yamlx.nix
new file mode 100644
index 000000000000..3d6b0957935f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/atd/yamlx.nix
@@ -0,0 +1,19 @@
+{
+  buildDunePackage,
+  atd-jsonlike,
+  yamlx,
+}:
+
+buildDunePackage {
+  pname = "atd-yamlx";
+  inherit (atd-jsonlike) version src;
+
+  propagatedBuildInputs = [
+    atd-jsonlike
+    yamlx
+  ];
+
+  meta = atd-jsonlike.meta // {
+    description = "YAML-to-jsonlike bridge for use with ATD code generators";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix b/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix
index 6e2270189c95..164c13d4e4cd 100644
--- a/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix
+++ b/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix
@@ -6,11 +6,11 @@
 
 buildDunePackage (finalAttrs: {
   pname = "atdgen-codec-runtime";
-  version = "4.0.0";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "https://github.com/ahrefs/atd/releases/download/${finalAttrs.version}/atd-${finalAttrs.version}.tbz";
-    hash = "sha256-NRT+TcTniGQLPpqf7DtbEG5vYJtZ0oUicB3hvS6pCfE=";
+    hash = "sha256-QOVMjs3EV5QVUiH0KZwqnUkXD07EFCToyInSNaUtOlU=";
   };
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix
index 7cd1a3c51013..c52f28b68e7d 100644
--- a/pkgs/development/ocaml-modules/atdgen/default.nix
+++ b/pkgs/development/ocaml-modules/atdgen/default.nix
@@ -1,12 +1,17 @@
 {
+  lib,
   buildDunePackage,
+  ocaml,
   alcotest,
   atd,
+  atd-jsonlike,
+  atd-yamlx,
   atdgen-codec-runtime,
   atdgen-runtime,
+  atdml,
   biniou,
   re,
-  python3,
+  yamlx,
 }:
 
 buildDunePackage {
@@ -20,15 +25,18 @@ buildDunePackage {
 
   propagatedBuildInputs = [ atdgen-runtime ];
 
-  doCheck = true;
+  doCheck = lib.versionAtLeast ocaml.version "4.14";
   nativeCheckInputs = [
     atd
+    atdml
     biniou
-    (python3.withPackages (ps: [ ps.jsonschema ]))
   ];
   checkInputs = [
     alcotest
     atdgen-codec-runtime
+    yamlx
+    atd-jsonlike
+    atd-yamlx
   ];
 
   meta = (removeAttrs atd.meta [ "mainProgram" ]) // {
diff --git a/pkgs/development/ocaml-modules/atdml/default.nix b/pkgs/development/ocaml-modules/atdml/default.nix
index 1b45f276222b..a2465772e000 100644
--- a/pkgs/development/ocaml-modules/atdml/default.nix
+++ b/pkgs/development/ocaml-modules/atdml/default.nix
@@ -9,6 +9,8 @@ buildDunePackage {
   pname = "atdml";
   inherit (atd) version src;
 
+  minimalOCamlVersion = "4.10";
+
   buildInputs = [ cmdliner ];
 
   propagatedBuildInputs = [ atd ];
diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix
index 9cc68872f68a..491408108f5d 100644
--- a/pkgs/development/ocaml-modules/bos/default.nix
+++ b/pkgs/development/ocaml-modules/bos/default.nix
@@ -15,11 +15,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ocaml${ocaml.version}-bos";
-  version = "0.2.1";
+  version = if lib.versionAtLeast ocaml.version "4.14" then "0.3.0" else "0.2.1";
 
   src = fetchurl {
     url = "https://erratique.ch/software/bos/releases/bos-${finalAttrs.version}.tbz";
-    sha256 = "sha256-2NYueGsQ1pfgRXIFqO7eqifrzJDxhV8Y3xkMrC49jzc=";
+    hash =
+      {
+        "0.3.0" = "sha256-CJ82ntAJZ+kticxfzYSMVr2rXAJzfaTUg1UL9Wtaebw=";
+        "0.2.1" = "sha256-2NYueGsQ1pfgRXIFqO7eqifrzJDxhV8Y3xkMrC49jzc=";
+      }
+      ."${finalAttrs.version}";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/bytesrw/default.nix b/pkgs/development/ocaml-modules/bytesrw/default.nix
index daa87419488f..2b015aa2a132 100644
--- a/pkgs/development/ocaml-modules/bytesrw/default.nix
+++ b/pkgs/development/ocaml-modules/bytesrw/default.nix
@@ -3,7 +3,7 @@
   fetchzip,
   libblake3,
   libmd,
-  xxHash,
+  xxhash,
   zlib,
   zstd,
   buildTopkgPackage,
@@ -26,7 +26,7 @@ buildTopkgPackage rec {
   buildInputs = [
     libblake3
     libmd
-    xxHash
+    xxhash
     zlib
     zstd
   ];
diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix
index c1c86eac9df0..f3bb3358a11d 100644
--- a/pkgs/development/ocaml-modules/checkseum/default.nix
+++ b/pkgs/development/ocaml-modules/checkseum/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchurl,
   buildDunePackage,
-  ocaml,
   dune-configurator,
   optint,
   fmt,
@@ -14,14 +13,12 @@
 }:
 
 buildDunePackage (finalAttrs: {
-  version = "0.5.2";
+  version = "0.5.3";
   pname = "checkseum";
 
-  minimalOCamlVersion = "4.07";
-
   src = fetchurl {
     url = "https://github.com/mirage/checkseum/releases/download/v${finalAttrs.version}/checkseum-${finalAttrs.version}.tbz";
-    hash = "sha256-nl5P1EBctKi03wCHdUMlGDPgimSZ70LMuNulgt8Nr8g=";
+    hash = "sha256-uIwRmUNBITo1wj80Fou6enS/P4kFH3e+s52COtzhpTE=";
   };
 
   buildInputs = [ dune-configurator ];
@@ -38,7 +35,7 @@ buildDunePackage (finalAttrs: {
     rresult
   ];
 
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
 
   meta = {
     description = "ADLER-32 and CRC32C Cyclic Redundancy Check";
diff --git a/pkgs/development/ocaml-modules/decoders-bencode/default.nix b/pkgs/development/ocaml-modules/decoders-bencode/default.nix
index 6117dfab67d1..0ae7d2468755 100644
--- a/pkgs/development/ocaml-modules/decoders-bencode/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-bencode/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Bencode backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-cbor/default.nix b/pkgs/development/ocaml-modules/decoders-cbor/default.nix
index c93b5cd38625..c14b5e2f93d9 100644
--- a/pkgs/development/ocaml-modules/decoders-cbor/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-cbor/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "CBOR backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix b/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix
index 71ea3a104b73..59c288f859c7 100644
--- a/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-ezjsonm/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Ezjsonm backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix b/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix
index e6c4f567d0b3..b663c813499d 100644
--- a/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-ezxmlm/default.nix
@@ -27,7 +27,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Ezxmlm backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix b/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix
index a7dacffc8464..742749cf1d76 100644
--- a/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-jsonaf/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Jsonaf backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-jsonm/default.nix b/pkgs/development/ocaml-modules/decoders-jsonm/default.nix
index 031ff6796c45..c0445f732c8a 100644
--- a/pkgs/development/ocaml-modules/decoders-jsonm/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-jsonm/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Jsonm backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-msgpck/default.nix b/pkgs/development/ocaml-modules/decoders-msgpck/default.nix
index 14e2fcf3d544..536dc7564603 100644
--- a/pkgs/development/ocaml-modules/decoders-msgpck/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-msgpck/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Msgpck backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-sexplib/default.nix b/pkgs/development/ocaml-modules/decoders-sexplib/default.nix
index d2ca0652cfb3..9a22691408ce 100644
--- a/pkgs/development/ocaml-modules/decoders-sexplib/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-sexplib/default.nix
@@ -31,7 +31,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "sexplib backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders-yojson/default.nix b/pkgs/development/ocaml-modules/decoders-yojson/default.nix
index 0a6bd35ce951..78bcdeaade95 100644
--- a/pkgs/development/ocaml-modules/decoders-yojson/default.nix
+++ b/pkgs/development/ocaml-modules/decoders-yojson/default.nix
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Yojson backend for decoders";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/decoders/default.nix b/pkgs/development/ocaml-modules/decoders/default.nix
index c7ec127e4e92..bbdbcfde4e7a 100644
--- a/pkgs/development/ocaml-modules/decoders/default.nix
+++ b/pkgs/development/ocaml-modules/decoders/default.nix
@@ -24,7 +24,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     description = "Elm-inspired decoders for Ocaml";
     homepage = "https://github.com/mattjbray/ocaml-decoders";
-    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/${finalAttrs.version}/CHANGES.md";
+    changelog = "https://github.com/mattjbray/ocaml-decoders/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ infinidoge ];
   };
diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix
index f10a4bb70397..404fa325250d 100644
--- a/pkgs/development/ocaml-modules/digestif/default.nix
+++ b/pkgs/development/ocaml-modules/digestif/default.nix
@@ -5,19 +5,13 @@
   buildDunePackage,
   eqaf,
   alcotest,
-  astring,
-  bos,
   crowbar,
-  findlib,
-  fpath,
 }:
 
 buildDunePackage (finalAttrs: {
   pname = "digestif";
   version = "1.3.0";
 
-  minimalOCamlVersion = "4.08";
-
   src = fetchurl {
     url = "https://github.com/mirage/digestif/releases/download/v${finalAttrs.version}/digestif-${finalAttrs.version}.tbz";
     hash = "sha256-mmzcszJTnIf0cj/DvXNiayZ1p7EWH98P7TCRhs4Y9Cc=";
@@ -27,17 +21,10 @@ buildDunePackage (finalAttrs: {
 
   checkInputs = [
     alcotest
-    astring
-    bos
     crowbar
-    fpath
   ];
   doCheck = true;
 
-  postCheck = ''
-    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ test/test_runes.ml
-  '';
-
   meta = {
     description = "Simple hash algorithms in OCaml";
     homepage = "https://github.com/mirage/digestif";
diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix
index 0c423b51db86..1bc6e756e8c2 100644
--- a/pkgs/development/ocaml-modules/dns/cli.nix
+++ b/pkgs/development/ocaml-modules/dns/cli.nix
@@ -29,8 +29,6 @@
 buildDunePackage {
   pname = "dns-cli";
 
-  minimalOCamlVersion = "4.08";
-
   inherit (dns) version src;
 
   # no need to propagate as this is primarily
diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index af6f114043ba..3df6ed7dc2ff 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -18,13 +18,13 @@
 
 buildDunePackage (finalAttrs: {
   pname = "dns";
-  version = "10.2.4";
+  version = "10.2.5";
 
   minimalOCamlVersion = "4.13";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-dns/releases/download/v${finalAttrs.version}/dns-${finalAttrs.version}.tbz";
-    hash = "sha256-2FLRXKL1jbVzZ5vxhoh0VgC5Epbi5USGYJhp1mbz0S8=";
+    hash = "sha256-I68JGm5MEzIrf5CUV35tct/NXiPE7AD6NSDttP+fX+8=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/duration/default.nix b/pkgs/development/ocaml-modules/duration/default.nix
index ba42a8b3af17..ab27a0aa2bd4 100644
--- a/pkgs/development/ocaml-modules/duration/default.nix
+++ b/pkgs/development/ocaml-modules/duration/default.nix
@@ -1,23 +1,20 @@
 {
   lib,
   buildDunePackage,
-  ocaml,
   fetchurl,
   alcotest,
 }:
 
 buildDunePackage (finalAttrs: {
   pname = "duration";
-  version = "0.2.1";
-
-  duneVersion = "3";
+  version = "0.3.1";
 
   src = fetchurl {
     url = "https://github.com/hannesm/duration/releases/download/v${finalAttrs.version}/duration-${finalAttrs.version}.tbz";
-    hash = "sha256-xzjB84z7mYIMEhzT3fgZ3ksiKPDVDqy9HMPOmefHHis=";
+    hash = "sha256-zYjaaTlR4SEuqD4kzhf3Z+laOanOKt2gZUsy11zmjBM=";
   };
 
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
   checkInputs = [ alcotest ];
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix
index d34201eb8414..90c50211c7c4 100644
--- a/pkgs/development/ocaml-modules/earlybird/default.nix
+++ b/pkgs/development/ocaml-modules/earlybird/default.nix
@@ -21,7 +21,7 @@
 
 buildDunePackage (finalAttrs: {
   pname = "earlybird";
-  version = "1.3.5";
+  version = "1.3.6";
 
   minimalOCamlVersion = "4.12";
 
@@ -29,7 +29,7 @@ buildDunePackage (finalAttrs: {
     owner = "hackwaly";
     repo = "ocamlearlybird";
     tag = finalAttrs.version;
-    hash = "sha256-QDRtuphOb02L75JyCF9K1NqvIdtWlfefeLG3HmJVHW4=";
+    hash = "sha256-UtJwb941JEIaE4zUlOWqFX3w0U7gFdYlYpKl+mZ1FNg=";
   };
 
   nativeBuildInputs = [ menhir ];
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index 553ffabd31f8..04893298e58f 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -18,7 +18,7 @@
   coqPackages,
   version ?
     if lib.versionAtLeast ocaml.version "4.13" then
-      "3.6.2"
+      "3.7.1"
     else if lib.versionAtLeast ocaml.version "4.08" then
       "1.20.0"
     else
@@ -34,6 +34,7 @@ in
 
 let
   fetched = coqPackages.metaFetch {
+    release."3.7.1".sha256 = "sha256-AQn0T9bAj17tAcVZdl3PTj4ri0fCXQJvAVN1dFn19GY=";
     release."3.6.2".sha256 = "sha256-BDE4L5qYZfaMt+6JivNBJIaJGeDSf5E+Kw1Wera/WFk=";
     release."3.6.1".sha256 = "sha256-zoVgRqNAXeCgk3zGntVkkZxIiQrCU5+ONeI97BiT674=";
     release."3.4.5".sha256 = "sha256-cck6XqC98Z9lb3CYS8K/aB1WOckjAyXzZ14vX41nJvI=";
diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix
index f70aea3e038f..418db720f5f5 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/base.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix
@@ -1,13 +1,13 @@
 { lib, fetchFromGitHub }:
 
 rec {
-  version = "1.2.8";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ffmpeg";
     tag = "v${version}";
-    hash = "sha256-wQvpbvAAg4tybAFdGq0O9vfCc0v2iPFk04Q3zgTwa7Y=";
+    hash = "sha256-qGXuE+wHNuy24jeuGpvMlYIQw7N5g6tXMa7r0pwXVX0=";
   };
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/httpcats/default.nix b/pkgs/development/ocaml-modules/httpcats/default.nix
index 74b1578935d4..a77e462c19d2 100644
--- a/pkgs/development/ocaml-modules/httpcats/default.nix
+++ b/pkgs/development/ocaml-modules/httpcats/default.nix
@@ -1,9 +1,9 @@
 {
-  fetchFromGitHub,
+  fetchpatch2,
+  fetchzip,
   buildDunePackage,
   lib,
   logs,
-  miou,
   fmt,
   h2,
   h1,
@@ -21,13 +21,18 @@ buildDunePackage (finalAttrs: {
   pname = "httpcats";
   version = "0.2.1";
 
-  src = fetchFromGitHub {
-    owner = "robur-coop";
-    repo = "httpcats";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-I7u/n49WOnpc0EaagsjC4Ts/kz0Xj6YHZv6+QZKLrC4=";
+  src = fetchzip {
+    url = "https://github.com/robur-coop/httpcats/releases/download/v${finalAttrs.version}/httpcats-${finalAttrs.version}.tbz";
+    hash = "sha256-ehtwxQGHw8igzI0dy2Zzs+VOqvck/tAUuuJl+jSpVU8=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/robur-coop/httpcats/commit/d8787555d4831e0488780d42bd2c65de662d1d38.patch";
+      hash = "sha256-6zXPb+mvw2rcEMv28b0npcL8cKl3CASxDbl7FOAGsXs=";
+    })
+  ];
+
   propagatedBuildInputs = [
     h2
     h1
@@ -38,6 +43,8 @@ buildDunePackage (finalAttrs: {
     happy-eyeballs-miou-unix
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   doCheck = true;
   checkInputs = [
     logs
@@ -50,7 +57,7 @@ buildDunePackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/robur-coop/httpcats/";
     description = "A simple HTTP client / server using h1, h2, and miou";
-    changelog = "https://github.com/robur-coop/httpcats/blob/${finalAttrs.src.tag}/CHANGES.md";
+    changelog = "https://github.com/robur-coop/httpcats/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ rpqt ];
   };
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 754cbb3c5bff..065bb32e1f1f 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -7,7 +7,7 @@
   dune-configurator,
   ocplib-endian,
   ppxlib,
-  version ? if lib.versionAtLeast ppxlib.version "0.36" then "6.1.1" else "5.9.1",
+  version ? if lib.versionAtLeast ppxlib.version "0.36" then "6.1.2" else "5.9.1",
 }:
 
 buildDunePackage {
@@ -22,7 +22,7 @@ buildDunePackage {
       {
         "5.9.1" = "sha256-oPYLFugMTI3a+hmnwgUcoMgn5l88NP1Roq0agLhH/vI=";
         "5.9.2" = "sha256-pzowRN1wwaF2iMfMPE7RCtA2XjlaXC3xD0yznriVfu8=";
-        "6.1.1" = "sha256-EMlA+mh66bfVNqDcmuaW7GoEEu6xQhCRjZx7t7pHuGo=";
+        "6.1.2" = "sha256-9Uxo1ekB3VcvdR4FCVdVWzvPHuVwflYIdD/fWvg0/kc=";
       }
       ."${version}";
   };
diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix
index c72a4528bb87..02824128b6bb 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -7,11 +7,11 @@
 
 buildDunePackage rec {
   pname = "ocaml-version";
-  version = "4.0.4";
+  version = "4.1.0";
 
   src = fetchurl {
     url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
-    hash = "sha256-6sviBLiEjcCtLcnk74vGy4ZTALVd1Rd5INUzAzn+HO4=";
+    hash = "sha256-QTfVH6kNu4SkjAylM3ySyIkOYAXQFrffSFkZ2FojjgY=";
   };
 
   checkInputs = [ alcotest ];
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index a7d0e734b990..1591aeea6494 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -64,7 +64,13 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://projects.camlcity.org/projects/ocamlnet.html";
     description = "Library implementing Internet protocols (http, cgi, email, etc.) for OCaml";
-    license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
+    license =
+      with lib.licenses;
+      AND [
+        mit
+        bsd3
+        gpl2Only
+      ];
     inherit (ocaml.meta) platforms;
     broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0";
   };
diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix
index 8c71a2321e3d..8b193e13ea90 100644
--- a/pkgs/development/ocaml-modules/postgresql/default.nix
+++ b/pkgs/development/ocaml-modules/postgresql/default.nix
@@ -25,7 +25,7 @@ buildDunePackage rec {
   meta = {
     description = "Bindings to the PostgreSQL library";
     license = lib.licenses.lgpl21Plus;
-    changelog = "https://raw.githubusercontent.com/mmottl/postgresql-ocaml/refs/tags/${version}/CHANGES.md";
+    changelog = "https://raw.githubusercontent.com/mmottl/postgresql-ocaml/refs/tags/${version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ bcc32 ];
     homepage = "https://mmottl.github.io/postgresql-ocaml";
   };
diff --git a/pkgs/development/ocaml-modules/ppx_mikmatch/default.nix b/pkgs/development/ocaml-modules/ppx_mikmatch/default.nix
index 2af11e5a6b9d..c77a609606dd 100644
--- a/pkgs/development/ocaml-modules/ppx_mikmatch/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_mikmatch/default.nix
@@ -10,11 +10,11 @@
 
 buildDunePackage (finalAttrs: {
   pname = "ppx_mikmatch";
-  version = "1.3";
+  version = "1.4";
   src = fetchurl {
     name = "ppx_mikmatch-${finalAttrs.version}.tar.gz";
     url = "https://codeload.github.com/ahrefs/ppx_mikmatch/tar.gz/refs/tags/${finalAttrs.version}";
-    hash = "sha256-i97gSyutefbJbDZv/yjaeHfV1CU6j3RSaQ1oPjiz8hg=";
+    hash = "sha256-KrtE3vyHM/Az6xXrniw9zwiCiqxAVUoTVRRwGSwDczI=";
   };
 
   minimalOCamlVersion = "5.3";
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index 0d5d2dfb7c15..cee4f4c7c619 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -9,7 +9,7 @@
       if lib.versionAtLeast ocaml.version "4.08" then
         if lib.versionAtLeast ocaml.version "4.11" then
           if lib.versionAtLeast ocaml.version "5.03" then
-            if lib.versionAtLeast ocaml.version "5.04" then "0.37.0" else "0.36.2"
+            if lib.versionAtLeast ocaml.version "5.04" then "0.38.0" else "0.36.2"
           else
             "0.34.0"
         else
@@ -100,7 +100,10 @@ let
       };
       "0.37.0" = {
         sha256 = "sha256-LiI4N+fOzDvISkMkMsCnL04dW+kWXJwzdy8VbbhdsLM=";
-        min_version = "4.08";
+        max_version = "5.5";
+      };
+      "0.38.0" = {
+        sha256 = "sha256-ieBJsxAvZnCiE9NNgC6jqw/FMKiVnS8aHo24MAY0KaM=";
       };
     }
     ."${version}";
diff --git a/pkgs/development/ocaml-modules/rio/default.nix b/pkgs/development/ocaml-modules/rio/default.nix
index ed82f82fd30e..e705007d570e 100644
--- a/pkgs/development/ocaml-modules/rio/default.nix
+++ b/pkgs/development/ocaml-modules/rio/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   minimalOCamlVersion = "5.1";
 
   src = fetchurl {
-    url = "https://github.com/riot-ml/riot/releases/download/${version}/riot-${version}.tbz";
+    url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz";
     hash = "sha256-SsiDz53b9bMIT9Q3IwDdB3WKy98WSd9fiieU41qZpeE=";
   };
 
@@ -22,8 +22,8 @@ buildDunePackage rec {
 
   meta = {
     description = "Ergonomic, composable, efficient read/write streams";
-    homepage = "https://github.com/riot-ml/riot";
-    changelog = "https://github.com/riot-ml/riot/blob/${version}/CHANGES.md";
+    homepage = "https://github.com/leostera/riot";
+    changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix
index 69fba965db35..2530db31841f 100644
--- a/pkgs/development/ocaml-modules/smtml/default.nix
+++ b/pkgs/development/ocaml-modules/smtml/default.nix
@@ -21,6 +21,7 @@
   ocaml_intrinsics ? null,
   prelude,
   ppx_enumerate,
+  rresult,
   scfg,
   yojson,
   z3,
@@ -31,13 +32,13 @@
 
 buildDunePackage (finalAttrs: {
   pname = "smtml";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "formalsec";
     repo = "smtml";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dWZrN0hTxxqGC2queit91GDuw/x5fyRPwHbmKxkvc/w=";
+    hash = "sha256-7kshzfxWpOx2LyGOs/j/eaTB4b4ba4sp5n4yztGfFV4=";
   };
 
   minimalOCamlVersion = "4.14";
@@ -67,6 +68,7 @@ buildDunePackage (finalAttrs: {
     ocaml_intrinsics
     ppx_enumerate
     prelude
+    rresult
     scfg
     yojson
     z3
diff --git a/pkgs/development/ocaml-modules/xxhash/default.nix b/pkgs/development/ocaml-modules/xxhash/default.nix
index 941d01208657..4d7834aa8a6e 100644
--- a/pkgs/development/ocaml-modules/xxhash/default.nix
+++ b/pkgs/development/ocaml-modules/xxhash/default.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   buildDunePackage,
-  xxHash,
+  pkgs,
   ctypes,
   ctypes-foreign,
   dune-configurator,
@@ -33,7 +33,7 @@ buildDunePackage rec {
   propagatedBuildInputs = [
     ctypes
     ctypes-foreign
-    xxHash
+    pkgs.xxhash
   ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/yamlx/default.nix b/pkgs/development/ocaml-modules/yamlx/default.nix
index 152c879c8ac7..15eb9a8ef564 100644
--- a/pkgs/development/ocaml-modules/yamlx/default.nix
+++ b/pkgs/development/ocaml-modules/yamlx/default.nix
@@ -8,11 +8,11 @@
 
 buildDunePackage (finalAttrs: {
   pname = "yamlx";
-  version = "0.1.0";
+  version = "0.3.0";
 
   src = fetchurl {
     url = "https://github.com/mjambon/yamlx/releases/download/${finalAttrs.version}/yamlx-${finalAttrs.version}.tbz";
-    hash = "sha256-Ihar37R1dUFMXSgNGEJu5z6ysFMcrg1Hd74hNLletwE=";
+    hash = "sha256-9pGp4XSCjMEwsUqHtwoyLBKTUdPjmYccqaU3dLkgVzg=";
   };
 
   propagatedBuildInputs = [ ppx_deriving ];
diff --git a/pkgs/development/perl-modules/Plack-xsendfile-disable-by-default-CVE-2026-7381.patch b/pkgs/development/perl-modules/Plack-xsendfile-disable-by-default-CVE-2026-7381.patch
new file mode 100644
index 000000000000..32244e52ac8c
--- /dev/null
+++ b/pkgs/development/perl-modules/Plack-xsendfile-disable-by-default-CVE-2026-7381.patch
@@ -0,0 +1,31 @@
+diff --git a/lib/Plack/Middleware/XSendfile.pm b/lib/Plack/Middleware/XSendfile.pm
+index f2cd859..f96ccb5 100644
+--- a/lib/Plack/Middleware/XSendfile.pm
++++ b/lib/Plack/Middleware/XSendfile.pm
+@@ -10,7 +10,11 @@ use Plack::Util::Accessor qw( variation );
+ 
+ sub new {
+     my $class = shift;
+-    Carp::carp("Plack::Middleware::XSendfile is deprecated and will be removed in a future release");
++    unless (($ENV{PLACK_ENABLE_INSECURE_XSENDFILE} // '') eq '1') {
++        Carp::croak(
++          "CVE-2026-7381: Plack::Middleware::XSendfile is disabled by default. Set PLACK_ENABLE_INSECURE_XSENDFILE=1 to enable"
++        );
++    }
+     $class->SUPER::new(@_);
+ }
+ 
+diff --git a/t/Plack-Middleware/xsendfile.t b/t/Plack-Middleware/xsendfile.t
+index f1a02fa..248815e 100644
+--- a/t/Plack-Middleware/xsendfile.t
++++ b/t/Plack-Middleware/xsendfile.t
+@@ -6,6 +6,9 @@ use Plack::Builder;
+ use Plack::Test;
+ use Cwd;
+ 
++# CVE-2026-7381: Insecure feature disabled by default, but enable for tests
++$ENV{PLACK_ENABLE_INSECURE_XSENDFILE} = 1;
++
+ sub is_wo_case($$;$) {
+     is lc $_[0], lc $_[1], $_[2];
+ }
diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix
index 6639905058ba..b6019159ecfe 100644
--- a/pkgs/development/perl-modules/Po4a/default.nix
+++ b/pkgs/development/perl-modules/Po4a/default.nix
@@ -5,13 +5,13 @@
   docbook_xsl,
   docbook_xsl_ns,
   gettext,
+  libxml2,
   libxslt,
   glibcLocales,
   docbook_xml_dtd_45,
   docbook_sgml_dtd_41,
   opensp,
   bash,
-  fetchpatch,
   perl,
   buildPerlPackage,
   ModuleBuild,
@@ -27,25 +27,38 @@
 
 buildPerlPackage rec {
   pname = "po4a";
-  version = "0.73";
+  version = "0.74";
 
   src = fetchurl {
     url = "https://github.com/mquinson/po4a/releases/download/v${version}/po4a-${version}.tar.gz";
-    hash = "sha256-bxj4LYyyo3c5QTfqOWzD6BldbNbkVP4CGKoPDjYDjqA=";
+    hash = "sha256-JfwyPyuje71Iw68Ov0mVJkSw5GgmH5hjPpEhmoOP58I=";
   };
 
+  patches = [
+    # Fix compatibility with gettext >= 1.0, whose msginit merges into
+    # existing files instead of overwriting, producing broken PO headers
+    # when the output file already exists but is empty.
+    # https://github.com/mquinson/po4a/issues/636
+    ./gettext-1.0-msginit-compat.patch
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs =
     # the tests for the tex-format use kpsewhich -- texlive's file finding utility.
     # We don't want to depend on texlive here, so we replace it with a minimal
     # shellscript that suffices for the tests in t/fmt/tex/, i.e. it looks up
-    # article.cls to an existing file, but doesn't find article-wrong.cls.
+    # subtext.tex and article.cls to appropriate files, but doesn't find article-wrong.cls.
     let
-      kpsewhich-stub = writeShellScriptBin "kpsewhich" ''[[ $1 = "article.cls" ]] && echo /dev/null'';
+      kpsewhich-stub = writeShellScriptBin "kpsewhich" ''
+        srcdir="$NIX_BUILD_TOP/${lib.strings.removeSuffix ".tar.gz" src.name}"
+        [[ $1 = "article.cls" ]] && echo /dev/null
+        [[ $1 = "subtext.tex" ]] && echo "$srcdir/t/fmt/tex/subtext.tex"
+      '';
     in
     [
       gettext
+      libxml2
       libxslt
       docbook_xsl
       docbook_xsl_ns
@@ -56,18 +69,6 @@ buildPerlPackage rec {
       kpsewhich-stub
       glibcLocales
     ];
-  patches = [
-    # Needs a patch for 5.40 until the next release
-    (fetchpatch {
-      url = "https://github.com/mquinson/po4a/commit/28fe52651eb8096d97d6bd3a97b3168522ba5306.patch";
-      hash = "sha256-QUXxkSzcnwRvU+2y2KoBXmtfE8qTZ2BV0StkJHqZehQ=";
-    })
-    (fetchpatch {
-      name = "gettext-0.25.patch";
-      url = "https://github.com/mquinson/po4a/commit/7d88a5e59606a9a29ffe73325fff4a5ddb865d5c.patch";
-      hash = "sha256-5x+EX++v7DxOHOZgRM2tv5eNN1Gy28f+qaqH27emZhk=";
-    })
-  ];
 
   # TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build
   propagatedBuildInputs =
diff --git a/pkgs/development/perl-modules/Po4a/gettext-1.0-msginit-compat.patch b/pkgs/development/perl-modules/Po4a/gettext-1.0-msginit-compat.patch
new file mode 100644
index 000000000000..86317dc9343f
--- /dev/null
+++ b/pkgs/development/perl-modules/Po4a/gettext-1.0-msginit-compat.patch
@@ -0,0 +1,27 @@
+Fix po4a compatibility with gettext >= 1.0
+
+gettext 1.0 changed msginit behavior: when the output file already
+exists, msginit now merges into it (like msgmerge) instead of
+overwriting. This causes problems when po4a passes an empty PO file as
+the output target, because msginit produces a PO with stripped headers
+and corrupted UTF-8 content.
+
+Fix by removing the output file before calling msginit, ensuring
+msginit creates a fresh PO file with proper headers.
+
+See: https://github.com/mquinson/po4a/issues/636
+See: https://savannah.gnu.org/news/?id=10853
+
+--- a/po4a
++++ b/po4a
+@@ -1875,6 +1875,10 @@
+                 }
+
+                 my $read_pot_filename = find_input_file($pot_filename);
++                # Remove the output file if it exists (e.g. as an empty file),
++                # because gettext >= 1.0's msginit merges into existing files
++                # instead of overwriting, producing broken PO headers.
++                unlink $outfile if ( -e $outfile && -z $outfile );
+                 my $cmd =
+                   "msginit$Config{_exe} -i \"$read_pot_filename\" --locale $lang -o \"$outfile\" --no-translator >$devnull";
+                 run_cmd($cmd);
diff --git a/pkgs/development/php-packages/ds/default.nix b/pkgs/development/php-packages/ds/default.nix
index 0b289e9c2421..3cfb2314da93 100644
--- a/pkgs/development/php-packages/ds/default.nix
+++ b/pkgs/development/php-packages/ds/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "1.6.0";
+  version = "2.0.0";
 in
 buildPecl {
   inherit version;
@@ -17,7 +17,7 @@ buildPecl {
     owner = "php-ds";
     repo = "ext-ds";
     rev = "v${version}";
-    sha256 = "sha256-c7MIqaPwIgdzKHRqR2km1uTQRrrr3OzDzopTbz5rLnE=";
+    sha256 = "sha256-QWBxjt3rzD3m3y2ScbYvtZnjPUYsd3uMMQOFY/RQ3Io=";
   };
 
   buildInputs = [ pcre2 ];
diff --git a/pkgs/development/php-packages/excimer/default.nix b/pkgs/development/php-packages/excimer/default.nix
index 06a8538faa6c..1c0346280aed 100644
--- a/pkgs/development/php-packages/excimer/default.nix
+++ b/pkgs/development/php-packages/excimer/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.2.5";
+  version = "1.2.6";
 in
 buildPecl {
   inherit version;
@@ -15,7 +15,7 @@ buildPecl {
     owner = "wikimedia";
     repo = "mediawiki-php-excimer";
     tag = version;
-    hash = "sha256-xFnyqofazXtPfwp/4xNYwrPEW9vWzz5akXjCOiyP4nw=";
+    hash = "sha256-LnmhItq7OpxXXE6EnTOXZVdfo+MTa2Ud9j16rs8dTBo=";
   };
 
   meta = {
diff --git a/pkgs/development/php-packages/ioncube-loader/default.nix b/pkgs/development/php-packages/ioncube-loader/default.nix
index b2cd73a9ed38..9b15f880223d 100644
--- a/pkgs/development/php-packages/ioncube-loader/default.nix
+++ b/pkgs/development/php-packages/ioncube-loader/default.nix
@@ -9,28 +9,32 @@ let
   source =
     {
       "aarch64-darwin" = {
-        url = "https://web.archive.org/web/20250614103627/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_dar_arm64.tar.gz";
-        sha256 = "sha256-Dji4PIX5GqU6mOC7ZrSEu3dAZtsiVVuvKQ9Z5aGiuQ4=";
+        url = "https://web.archive.org/web/20260428124658/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_mac_arm64.tar.gz";
+        sha256 = "sha256-KzBF5ufljAjjP2V1lUJgW9Z+7G1evafV7pvfADFMkMM=";
       };
       "aarch64-linux" = {
-        url = "https://web.archive.org/web/20250614103715/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_aarch64.tar.gz";
-        sha256 = "sha256-zushkH7g3L62bDdjgTZamWcxOp35xQisOjSG6e2EEHg=";
+        url = "https://web.archive.org/web/20260428121019/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_aarch64.tar.gz";
+        sha256 = "sha256-TNw9y8dapjNdNKdW0FpY6pHBrq7oqSK1Ao5oqhy3dvs=";
       };
       "x86_64-linux" = {
-        url = "https://web.archive.org/web/20250614103238/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz";
-        sha256 = "sha256-W8AXulfQx2nkT9nznCCx2lrayKA3R+n2TyhU1ScNjMg=";
+        url = "https://web.archive.org/web/20260313061550/https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz";
+        sha256 = "sha256-uCBEHux1R4FdC7aQa9oJJYgmwTTl3w5JQi+0KBDLZMc=";
       };
     }
     .${stdenv.hostPlatform.system};
 
   phpVersion = lib.versions.majorMinor php.version;
-  systemPrefix = lib.substring 0 3 stdenv.hostPlatform.parsed.kernel.name; # lin, dar, fre
+  systemPrefix =
+    if stdenv.hostPlatform.isDarwin then
+      "mac"
+    else
+      lib.substring 0 3 stdenv.hostPlatform.parsed.kernel.name; # lin, fre
 
   filename = "ioncube_loader_${systemPrefix}_${phpVersion}${lib.optionalString php.ztsSupport "_ts"}.so";
 in
 stdenv.mkDerivation {
   pname = "ioncube-loader";
-  version = "14.4.1";
+  version = "15.5.0";
 
   extensionName = "ioncube-loader";
 
@@ -49,7 +53,6 @@ stdenv.mkDerivation {
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ neverbehave ];
-    broken = lib.versionAtLeast php.version "8.5";
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/development/php-packages/php-cs-fixer/composer.lock b/pkgs/development/php-packages/php-cs-fixer/composer.lock
index d3ad13c34cf8..b15358eaa3e3 100644
--- a/pkgs/development/php-packages/php-cs-fixer/composer.lock
+++ b/pkgs/development/php-packages/php-cs-fixer/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "62fd328a73b4ad8e2c1474d419ffe3af",
+    "content-hash": "ece7450e5eb672c027b998cfd2c9a771",
     "packages": [
         {
             "name": "clue/ndjson-react",
@@ -292,6 +292,75 @@
             ],
             "time": "2024-05-06T16:37:16+00:00"
         },
+        {
+            "name": "ergebnis/agent-detector",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ergebnis/agent-detector.git",
+                "reference": "5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ergebnis/agent-detector/zipball/5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64",
+                "reference": "5b654a9f1ff8a5d2ce6a57568df5ae8801c87f64",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0 || ~8.6.0"
+            },
+            "require-dev": {
+                "ergebnis/composer-normalize": "^2.50.0",
+                "ergebnis/license": "^2.7.0",
+                "ergebnis/php-cs-fixer-config": "^6.60.2",
+                "ergebnis/phpstan-rules": "^2.13.1",
+                "ergebnis/phpunit-slow-test-detector": "^2.24.0",
+                "ergebnis/rector-rules": "^1.16.0",
+                "fakerphp/faker": "^1.24.1",
+                "infection/infection": "^0.26.6",
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^2.1.46",
+                "phpstan/phpstan-deprecation-rules": "^2.0.4",
+                "phpstan/phpstan-phpunit": "^2.0.16",
+                "phpstan/phpstan-strict-rules": "^2.0.10",
+                "phpunit/phpunit": "^9.6.34",
+                "rector/rector": "^2.4.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.0-dev"
+                },
+                "composer-normalize": {
+                    "indent-size": 2,
+                    "indent-style": "space"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Ergebnis\\AgentDetector\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andreas Möller",
+                    "email": "am@localheinz.com",
+                    "homepage": "https://localheinz.com"
+                }
+            ],
+            "description": "Provides a detector for detecting the presence of an agent.",
+            "homepage": "https://github.com/ergebnis/agent-detector",
+            "support": {
+                "issues": "https://github.com/ergebnis/agent-detector/issues",
+                "security": "https://github.com/ergebnis/agent-detector/blob/main/.github/SECURITY.md",
+                "source": "https://github.com/ergebnis/agent-detector"
+            },
+            "time": "2026-04-10T13:45:13+00:00"
+        },
         {
             "name": "evenement/evenement",
             "version": "v3.0.2",
@@ -1148,16 +1217,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "6d643a93b47398599124022eb24d97c153c12f27"
+                "reference": "1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6d643a93b47398599124022eb24d97c153c12f27",
-                "reference": "6d643a93b47398599124022eb24d97c153c12f27",
+                "url": "https://api.github.com/repos/symfony/console/zipball/1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707",
+                "reference": "1e92e39c51f95b88e3d66fa2d9f06d1fb45dd707",
                 "shasum": ""
             },
             "require": {
@@ -1222,7 +1291,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.4.6"
+                "source": "https://github.com/symfony/console/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -1242,7 +1311,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-25T17:02:47+00:00"
+            "time": "2026-03-30T13:54:39+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1313,16 +1382,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.4.4",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "dc2c0eba1af673e736bb851d747d266108aea746"
+                "reference": "f57b899fa736fd71121168ef268f23c206083f0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dc2c0eba1af673e736bb851d747d266108aea746",
-                "reference": "dc2c0eba1af673e736bb851d747d266108aea746",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f57b899fa736fd71121168ef268f23c206083f0a",
+                "reference": "f57b899fa736fd71121168ef268f23c206083f0a",
                 "shasum": ""
             },
             "require": {
@@ -1374,7 +1443,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.4"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -1394,7 +1463,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-05T11:45:34+00:00"
+            "time": "2026-03-30T13:54:39+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -1474,16 +1543,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "3ebc794fa5315e59fd122561623c2e2e4280538e"
+                "reference": "58b9790d12f9670b7f53a1c1738febd3108970a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/3ebc794fa5315e59fd122561623c2e2e4280538e",
-                "reference": "3ebc794fa5315e59fd122561623c2e2e4280538e",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/58b9790d12f9670b7f53a1c1738febd3108970a5",
+                "reference": "58b9790d12f9670b7f53a1c1738febd3108970a5",
                 "shasum": ""
             },
             "require": {
@@ -1520,7 +1589,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.4.6"
+                "source": "https://github.com/symfony/filesystem/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -1540,20 +1609,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-25T16:50:00+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "8655bf1076b7a3a346cb11413ffdabff50c7ffcf"
+                "reference": "e0be088d22278583a82da281886e8c3592fbf149"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/8655bf1076b7a3a346cb11413ffdabff50c7ffcf",
-                "reference": "8655bf1076b7a3a346cb11413ffdabff50c7ffcf",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/e0be088d22278583a82da281886e8c3592fbf149",
+                "reference": "e0be088d22278583a82da281886e8c3592fbf149",
                 "shasum": ""
             },
             "require": {
@@ -1588,7 +1657,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.4.6"
+                "source": "https://github.com/symfony/finder/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -1608,20 +1677,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-29T09:40:50+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v7.4.0",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "b38026df55197f9e39a44f3215788edf83187b80"
+                "reference": "2888fcdc4dc2fd5f7c7397be78631e8af12e02b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b38026df55197f9e39a44f3215788edf83187b80",
-                "reference": "b38026df55197f9e39a44f3215788edf83187b80",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/2888fcdc4dc2fd5f7c7397be78631e8af12e02b4",
+                "reference": "2888fcdc4dc2fd5f7c7397be78631e8af12e02b4",
                 "shasum": ""
             },
             "require": {
@@ -1659,7 +1728,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.4.0"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -1679,20 +1748,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-11-12T15:39:26+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/141046a8f9477948ff284fa65be2095baafb94f2",
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2",
                 "shasum": ""
             },
             "require": {
@@ -1742,7 +1811,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -1762,20 +1831,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
+                "reference": "ad1b7b9092976d6c948b8a187cec9faaea9ec1df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
-                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/ad1b7b9092976d6c948b8a187cec9faaea9ec1df",
+                "reference": "ad1b7b9092976d6c948b8a187cec9faaea9ec1df",
                 "shasum": ""
             },
             "require": {
@@ -1824,7 +1893,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -1844,11 +1913,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-27T09:58:17+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -1909,7 +1978,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -1933,16 +2002,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
+                "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
-                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315",
+                "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315",
                 "shasum": ""
             },
             "require": {
@@ -1994,7 +2063,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -2014,20 +2083,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-23T08:48:59+00:00"
+            "time": "2026-04-10T17:25:58+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
+                "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
-                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
+                "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
                 "shasum": ""
             },
             "require": {
@@ -2078,7 +2147,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -2098,11 +2167,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-02T08:10:11+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
@@ -2158,7 +2227,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -2182,16 +2251,16 @@
         },
         {
             "name": "symfony/polyfill-php84",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php84.git",
-                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191"
+                "reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191",
-                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/88486db2c389b290bf87ff1de7ebc1e13e42bb06",
+                "reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06",
                 "shasum": ""
             },
             "require": {
@@ -2238,7 +2307,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -2258,20 +2327,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-24T13:30:11+00:00"
+            "time": "2026-04-10T18:47:49+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v7.4.5",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "608476f4604102976d687c483ac63a79ba18cc97"
+                "reference": "60f19cd3badc8de688421e21e4305eba50f8089a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/608476f4604102976d687c483ac63a79ba18cc97",
-                "reference": "608476f4604102976d687c483ac63a79ba18cc97",
+                "url": "https://api.github.com/repos/symfony/process/zipball/60f19cd3badc8de688421e21e4305eba50f8089a",
+                "reference": "60f19cd3badc8de688421e21e4305eba50f8089a",
                 "shasum": ""
             },
             "require": {
@@ -2303,7 +2372,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.4.5"
+                "source": "https://github.com/symfony/process/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -2323,7 +2392,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-26T15:07:59+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -2414,16 +2483,16 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v7.4.0",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "8a24af0a2e8a872fb745047180649b8418303084"
+                "reference": "70a852d72fec4d51efb1f48dcd968efcaf5ccb89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/8a24af0a2e8a872fb745047180649b8418303084",
-                "reference": "8a24af0a2e8a872fb745047180649b8418303084",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/70a852d72fec4d51efb1f48dcd968efcaf5ccb89",
+                "reference": "70a852d72fec4d51efb1f48dcd968efcaf5ccb89",
                 "shasum": ""
             },
             "require": {
@@ -2456,7 +2525,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.4.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -2476,20 +2545,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-04T07:05:15+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "9f209231affa85aa930a5e46e6eb03381424b30b"
+                "reference": "114ac57257d75df748eda23dd003878080b8e688"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/9f209231affa85aa930a5e46e6eb03381424b30b",
-                "reference": "9f209231affa85aa930a5e46e6eb03381424b30b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/114ac57257d75df748eda23dd003878080b8e688",
+                "reference": "114ac57257d75df748eda23dd003878080b8e688",
                 "shasum": ""
             },
             "require": {
@@ -2547,7 +2616,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.4.6"
+                "source": "https://github.com/symfony/string/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -2567,7 +2636,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-09T09:33:46+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         }
     ],
     "packages-dev": [
@@ -2963,16 +3032,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.8.0",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "21dc724a0583619cd1652f673303492272778051"
+                "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
-                "reference": "21dc724a0583619cd1652f673303492272778051",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/7d0ed42f28e42d61352a7a79de682e5e67fec884",
+                "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884",
                 "shasum": ""
             },
             "require": {
@@ -2988,6 +3057,7 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "http-interop/http-factory-tests": "0.9.0",
+                "jshttp/mime-db": "1.54.0.1",
                 "phpunit/phpunit": "^8.5.44 || ^9.6.25"
             },
             "suggest": {
@@ -3059,7 +3129,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.8.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.9.0"
             },
             "funding": [
                 {
@@ -3075,7 +3145,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-23T21:21:41+00:00"
+            "time": "2026-03-10T16:41:02+00:00"
         },
         {
             "name": "infection/abstract-testframework-adapter",
@@ -3505,16 +3575,16 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "v6.7.2",
+            "version": "6.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jsonrainbow/json-schema.git",
-                "reference": "6fea66c7204683af437864e7c4e7abf383d14bc0"
+                "reference": "89ac92bcfe5d0a8a4433c7b89d394553ae7250cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/6fea66c7204683af437864e7c4e7abf383d14bc0",
-                "reference": "6fea66c7204683af437864e7c4e7abf383d14bc0",
+                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/89ac92bcfe5d0a8a4433c7b89d394553ae7250cc",
+                "reference": "89ac92bcfe5d0a8a4433c7b89d394553ae7250cc",
                 "shasum": ""
             },
             "require": {
@@ -3574,9 +3644,9 @@
             ],
             "support": {
                 "issues": "https://github.com/jsonrainbow/json-schema/issues",
-                "source": "https://github.com/jsonrainbow/json-schema/tree/v6.7.2"
+                "source": "https://github.com/jsonrainbow/json-schema/tree/6.8.0"
             },
-            "time": "2026-02-15T15:06:22+00:00"
+            "time": "2026-04-02T12:43:11+00:00"
         },
         {
             "name": "keradus/cli-executor",
@@ -6195,16 +6265,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "9400e2f9226b3b64ebb0a8ae967ae84e54e39640"
+                "reference": "2d19dde43fa2ff720b9a40763ace7226594f503b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/9400e2f9226b3b64ebb0a8ae967ae84e54e39640",
-                "reference": "9400e2f9226b3b64ebb0a8ae967ae84e54e39640",
+                "url": "https://api.github.com/repos/symfony/config/zipball/2d19dde43fa2ff720b9a40763ace7226594f503b",
+                "reference": "2d19dde43fa2ff720b9a40763ace7226594f503b",
                 "shasum": ""
             },
             "require": {
@@ -6250,7 +6320,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v7.4.6"
+                "source": "https://github.com/symfony/config/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -6270,20 +6340,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-25T16:50:00+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "a3f7d594ca53a34a7d39ae683fbca09408b0c598"
+                "reference": "f7025fd7b687c240426562f86ada06a93b1e771d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a3f7d594ca53a34a7d39ae683fbca09408b0c598",
-                "reference": "a3f7d594ca53a34a7d39ae683fbca09408b0c598",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f7025fd7b687c240426562f86ada06a93b1e771d",
+                "reference": "f7025fd7b687c240426562f86ada06a93b1e771d",
                 "shasum": ""
             },
             "require": {
@@ -6334,7 +6404,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v7.4.6"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -6354,20 +6424,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-25T16:50:00+00:00"
+            "time": "2026-03-31T06:50:29+00:00"
         },
         {
             "name": "symfony/polyfill-php85",
-            "version": "v1.33.0",
+            "version": "v1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php85.git",
-                "reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91"
+                "reference": "2c408a6bb0313e6001a83628dc5506100474254e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91",
-                "reference": "d4e5fcd4ab3d998ab16c0db48e6cbb9a01993f91",
+                "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/2c408a6bb0313e6001a83628dc5506100474254e",
+                "reference": "2c408a6bb0313e6001a83628dc5506100474254e",
                 "shasum": ""
             },
             "require": {
@@ -6414,7 +6484,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php85/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php85/tree/v1.36.0"
             },
             "funding": [
                 {
@@ -6434,20 +6504,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-23T16:12:55+00:00"
+            "time": "2026-04-10T16:50:15+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "045321c440ac18347b136c63d2e9bf28a2dc0291"
+                "reference": "9510c3966f749a1d1ff0059e1eabef6cc621e7fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/045321c440ac18347b136c63d2e9bf28a2dc0291",
-                "reference": "045321c440ac18347b136c63d2e9bf28a2dc0291",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9510c3966f749a1d1ff0059e1eabef6cc621e7fd",
+                "reference": "9510c3966f749a1d1ff0059e1eabef6cc621e7fd",
                 "shasum": ""
             },
             "require": {
@@ -6501,7 +6571,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.4.6"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -6521,20 +6591,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-15T10:53:20+00:00"
+            "time": "2026-03-30T13:44:50+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v7.4.0",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "03a60f169c79a28513a78c967316fbc8bf17816f"
+                "reference": "398907e89a2a56fe426f7955c6fa943ec0c77225"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/03a60f169c79a28513a78c967316fbc8bf17816f",
-                "reference": "03a60f169c79a28513a78c967316fbc8bf17816f",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/398907e89a2a56fe426f7955c6fa943ec0c77225",
+                "reference": "398907e89a2a56fe426f7955c6fa943ec0c77225",
                 "shasum": ""
             },
             "require": {
@@ -6582,7 +6652,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.4.0"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -6602,20 +6672,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-11T10:15:23+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v7.4.6",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "58751048de17bae71c5aa0d13cb19d79bca26391"
+                "reference": "c58fdf7b3d6c2995368264c49e4e8b05bcff2883"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/58751048de17bae71c5aa0d13cb19d79bca26391",
-                "reference": "58751048de17bae71c5aa0d13cb19d79bca26391",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/c58fdf7b3d6c2995368264c49e4e8b05bcff2883",
+                "reference": "c58fdf7b3d6c2995368264c49e4e8b05bcff2883",
                 "shasum": ""
             },
             "require": {
@@ -6658,7 +6728,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v7.4.6"
+                "source": "https://github.com/symfony/yaml/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -6678,7 +6748,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-09T09:33:46+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "thecodingmachine/safe",
@@ -6875,16 +6945,16 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "2.1.6",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "ff31ad6efc62e66e518fbab1cde3453d389bcdc8"
+                "reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/ff31ad6efc62e66e518fbab1cde3453d389bcdc8",
-                "reference": "ff31ad6efc62e66e518fbab1cde3453d389bcdc8",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/eb0d790f735ba6cff25c683a85a1da0eadeff9e4",
+                "reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4",
                 "shasum": ""
             },
             "require": {
@@ -6931,9 +7001,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/2.1.6"
+                "source": "https://github.com/webmozarts/assert/tree/2.3.0"
             },
-            "time": "2026-02-27T10:28:38+00:00"
+            "time": "2026-04-11T10:33:05+00:00"
         }
     ],
     "aliases": [],
@@ -6949,5 +7019,5 @@
         "ext-tokenizer": "*"
     },
     "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }
diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index cf9fe25e48b0..a395a5ec3ba7 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -7,17 +7,17 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "php-cs-fixer";
-  version = "3.94.2";
+  version = "3.95.1";
 
   src = fetchFromGitHub {
     owner = "PHP-CS-Fixer";
     repo = "PHP-CS-Fixer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eX9awtJeOJSX0Q+687egTTRZFpj5qTjjAamGpJUMKzA=";
+    hash = "sha256-nQSVAEb57kcboaqTa344eIsDC7qRiCAA6M9x77hsTio=";
   };
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-b3K7Ed/gtqyyEDrivMX8SFXe0X2XeJJ+zM6Pp1jY+Ow=";
+  vendorHash = "sha256-VIwZQutV2qlz0kZDQCncEM8Wa2zT9o+oM9O+FmhiTas=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix
index a6fb3c8f3563..bb6e2b61c95b 100644
--- a/pkgs/development/php-packages/spx/default.nix
+++ b/pkgs/development/php-packages/spx/default.nix
@@ -15,7 +15,7 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "NoiseByNorthwest";
     repo = "php-spx";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-P53g/o4i+QETWdErZaGA3AREvnr8kL9h0B1BMQlKdFA=";
   };
 
@@ -25,7 +25,7 @@ buildPecl {
   ];
 
   meta = {
-    changelog = "https://github.com/NoiseByNorthwest/php-spx/releases/tag/${version}";
+    changelog = "https://github.com/NoiseByNorthwest/php-spx/releases/tag/v${version}";
     description = "Simple & straight-to-the-point PHP profiling extension with its built-in web UI";
     homepage = "https://github.com/NoiseByNorthwest/php-spx";
     license = lib.licenses.php301;
diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix
index 9a1b4d9f98b0..b8ac2bb1d7bc 100644
--- a/pkgs/development/php-packages/swoole/default.nix
+++ b/pkgs/development/php-packages/swoole/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "6.1.7";
+  version = "6.1.8";
 in
 buildPecl {
   inherit version;
@@ -19,7 +19,7 @@ buildPecl {
     owner = "swoole";
     repo = "swoole-src";
     rev = "v${version}";
-    hash = "sha256-MY0wWb6p2P+g7xrEGqicvdIbX57vgSFKunKVxj80PgQ=";
+    hash = "sha256-z/f3GLI/PQJJWcY968fOH00btDaKDx3M0Nb/IOjDgeY=";
   };
 
   buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ];
diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix
index e90ed4ddfe38..0672d6fb97cd 100644
--- a/pkgs/development/python-modules/accelerate/default.nix
+++ b/pkgs/development/python-modules/accelerate/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "accelerate";
-  version = "1.12.0";
+  version = "1.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "accelerate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PwwaQSLOm+8Hd3trM1P+jRhYyoWM3QxOe5XT99haEmg=";
+    hash = "sha256-IfKePiU38fUd5HefaS7J1s8Mb6hVmldINemxAJY+83o=";
   };
 
   buildInputs = [ llvmPackages.openmp ];
@@ -180,15 +180,7 @@ buildPythonPackage (finalAttrs: {
   ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
     # RuntimeError: torch_shm_manager: execl failed: Permission denied
     "CheckpointTest"
-  ]
-  ++
-    lib.optionals
-      (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 && (pythonAtLeast "3.14"))
-      [
-        # https://github.com/huggingface/accelerate/issues/3899
-        "test_accelerate_test"
-        "test_cpu"
-      ];
+  ];
 
   disabledTestPaths = lib.optionals (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64)) [
     # numerous instances of torch.multiprocessing.spawn.ProcessRaisedException:
diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix
index 136939fdb57b..ab51dc1360d3 100644
--- a/pkgs/development/python-modules/acme-tiny/default.nix
+++ b/pkgs/development/python-modules/acme-tiny/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "acme-tiny";
-  version = "5.0.2";
+  version = "5.0.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "acme_tiny";
     inherit version;
-    hash = "sha256-s84ZVYPcLxOnxvqQBS+Ks0myMtvCZ62cv0co6u2E3dg=";
+    hash = "sha256-LV64B+JZhq69qbBJ2dFG8YW6/q1u+x6MxB1rQrm8pjw=";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/python-modules/actron-neo-api/default.nix b/pkgs/development/python-modules/actron-neo-api/default.nix
index 7c82d159a8fd..91c56ade8efa 100644
--- a/pkgs/development/python-modules/actron-neo-api/default.nix
+++ b/pkgs/development/python-modules/actron-neo-api/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "actron-neo-api";
-  version = "0.5.4";
+  version = "0.5.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kclif9";
     repo = "actronneoapi";
     tag = "v${version}";
-    hash = "sha256-XyX9o1fIyY5TZqLzK1a+KLkLDVEorw2illg+lHutLtc=";
+    hash = "sha256-bBPhwiJQYDBEPZKA1Cq94X9LYAmBkOWCI+4afrQntmw=";
   };
 
   build-system = [
@@ -39,15 +39,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # test hangs
-    "test_poll_for_token_pending"
-    # AttributeError: property 'authorization_header' of 'ActronAirOAuth2DeviceCodeAuth' object has no setter
-    "test_lazy_token_refres"
-    # ActronAirAuthError: Refresh token is required to refresh the access token
-    "test_get_user_info"
-  ];
-
   meta = {
     changelog = "https://github.com/kclif9/actronneoapi/releases/tag/${src.tag}";
     description = "Communicate with Actron Air systems via the Actron Neo API";
diff --git a/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix b/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix
index f4549c970f69..b9ea9cd04c84 100644
--- a/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix
+++ b/pkgs/development/python-modules/agentic-threat-hunting-framework/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "agentic-threat-hunting-framework";
-  version = "0.11.1";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Nebulock-Inc";
     repo = "agentic-threat-hunting-framework";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dqiWldjPv5iU6OGsoZ4fTdw6dXbu/duFHt19qcPfVjk=";
+    hash = "sha256-mAhue0ruf0PGwix+ab6eaKrGJoKOh/8I+LiBWa+viMU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aggregate6/default.nix b/pkgs/development/python-modules/aggregate6/default.nix
index bf625f816d92..dd489d313f81 100644
--- a/pkgs/development/python-modules/aggregate6/default.nix
+++ b/pkgs/development/python-modules/aggregate6/default.nix
@@ -3,33 +3,26 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  py-radix-sr,
+  py-radix,
   versionCheckHook,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "aggregate6";
-  version = "1.0.14";
+  version = "1.0.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "job";
     repo = "aggregate6";
     rev = version;
-    hash = "sha256-sF5F4AIIQuMTuWE3zoBE1akJX9QSmAaRp1qgoHzSJMo=";
+    hash = "sha256-GXIZ2aNZUeiVkhmo2jdwIEk9jL/in2KuuKgi//TQGq0=";
   };
 
-  # py-radix-sr is a fork, with fixes
-  # NOTE: it should be worth switching to py-radix again in the future as there
-  #       is still development sadly currently without a new release.
-  postPatch = ''
-    substituteInPlace setup.py --replace-fail 'py-radix==0.10.0' 'py-radix-sr'
-  '';
-
   build-system = [ setuptools ];
 
-  dependencies = [ py-radix-sr ];
+  dependencies = [ py-radix ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix
index d8fb770699ce..c795828767e3 100644
--- a/pkgs/development/python-modules/aio-pika/default.nix
+++ b/pkgs/development/python-modules/aio-pika/default.nix
@@ -1,67 +1,39 @@
 {
   lib,
-  aiomisc-pytest,
   aiormq,
   buildPythonPackage,
-  docker,
   fetchFromGitHub,
-  pamqp,
-  poetry-core,
-  pytestCheckHook,
-  shortuuid,
-  testcontainers,
-  wrapt,
+  uv-build,
   yarl,
 }:
 
 buildPythonPackage rec {
   pname = "aio-pika";
-  version = "9.5.8";
+  version = "9.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mosquito";
     repo = "aio-pika";
     tag = version;
-    hash = "sha256-0jVxgU+r/d2n4YO5/YAZrZUWDCAlZldBshCGpcEV/sQ=";
+    hash = "sha256-N5MjFIolMRTTn4aV1NskBwonB/8FSuEZETumUrAa02Y=";
   };
 
-  build-system = [ poetry-core ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.26,<0.10.0" uv_build
+  '';
+
+  build-system = [ uv-build ];
 
   dependencies = [
     aiormq
     yarl
   ];
 
-  nativeCheckInputs = [
-    aiomisc-pytest
-    docker
-    pamqp
-    pytestCheckHook
-    shortuuid
-    testcontainers
-    wrapt
-  ];
-
-  disabledTests = [
-    # Tests attempt to connect to a RabbitMQ server
-    "test_connection_interleave"
-    "test_connection_happy_eyeballs_delay"
-    "test_robust_connection_interleave"
-    "test_robust_connection_happy_eyeballs_delay"
-  ];
-
-  disabledTestPaths = [
-    # Tests attempt to connect to a RabbitMQ server
-    "tests/test_amqp.py"
-    "tests/test_amqp_robust.py"
-    "tests/test_amqp_robust_proxy.py"
-    "tests/test_amqps.py"
-    "tests/test_master.py"
-    "tests/test_memory_leak.py"
-    "tests/test_rpc.py"
-    "tests/test_types.py"
-  ];
+  # Tests require running a RabbitMQ server.
+  # They rely on having AMQP_URL set or running Docker.
+  doCheck = false;
 
   pythonImportsCheck = [ "aio_pika" ];
 
diff --git a/pkgs/development/python-modules/aioblescan/default.nix b/pkgs/development/python-modules/aioblescan/default.nix
index 1de147641d4b..d53bfe7a9e65 100644
--- a/pkgs/development/python-modules/aioblescan/default.nix
+++ b/pkgs/development/python-modules/aioblescan/default.nix
@@ -3,17 +3,20 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "aioblescan";
   version = "0.2.14";
-  format = "setuptools";
+  pyproject = true;
+
+  build-system = [ setuptools ];
 
   src = fetchFromGitHub {
     owner = "frawau";
     repo = "aioblescan";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-JeA9jX566OSRiejdnlifbcNGm0J0C+xzA6zXDUyZ6jc=";
   };
 
@@ -25,8 +28,8 @@ buildPythonPackage rec {
     description = "Library to listen for BLE advertized packets";
     mainProgram = "aioblescan";
     homepage = "https://github.com/frawau/aioblescan";
-    changelog = "https://github.com/frawau/aioblescan/releases/tag/${version}";
+    changelog = "https://github.com/frawau/aioblescan/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix
index 38aa46b44f53..b22ca1c0420b 100644
--- a/pkgs/development/python-modules/aioboto3/default.nix
+++ b/pkgs/development/python-modules/aioboto3/default.nix
@@ -75,6 +75,17 @@ buildPythonPackage (finalAttrs: {
     "test_s3_copy_multipart"
     "test_s3_download_file_404"
     "test_s3_upload_file"
+  ]
+  ++ [
+    # DynamoDB tests fail with aiobotocore 3.x due to HTTP header issue with moto:
+    # "Duplicate 'Server' header found" - same issue as aiobotocore disables
+    "test_dynamo_resource_query"
+    "test_dynamo_resource_put"
+    "test_dynamo_resource_batch_write_flush_on_exit_context"
+    "test_dynamo_resource_batch_write_flush_amount"
+    "test_flush_doesnt_reset_item_buffer"
+    "test_dynamo_resource_property"
+    "test_dynamo_resource_waiter"
   ];
 
   pythonImportsCheck = [ "aioboto3" ];
diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix
index a3552ded199a..e97a1ac33322 100644
--- a/pkgs/development/python-modules/aiocoap/default.nix
+++ b/pkgs/development/python-modules/aiocoap/default.nix
@@ -15,7 +15,7 @@
   websockets,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "aiocoap";
   version = "0.4.17";
   pyproject = true;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "chrysn";
     repo = "aiocoap";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-l9MChfvBTJn/ABTqrw4i+YUNGJnDZmOJS/kumImaa/s=";
   };
 
@@ -70,8 +70,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python CoAP library";
     homepage = "https://aiocoap.readthedocs.io/";
-    changelog = "https://github.com/chrysn/aiocoap/blob/${src.tag}/NEWS";
+    changelog = "https://github.com/chrysn/aiocoap/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/aioghost/default.nix b/pkgs/development/python-modules/aioghost/default.nix
index b6fb9e2550c3..3539d3ea8d35 100644
--- a/pkgs/development/python-modules/aioghost/default.nix
+++ b/pkgs/development/python-modules/aioghost/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aioghost";
-  version = "0.4.10";
+  version = "0.4.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TryGhost";
     repo = "aioghost";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Rumg/ABsA2pK1NRPVPW8wZmUL8VwzV48mU97PFWmCEY=";
+    hash = "sha256-wz0c2bJIUGkU5niIhJWXthsVToatsuoOzix+VBnETL0=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/aiohttp-asgi-connector/default.nix b/pkgs/development/python-modules/aiohttp-asgi-connector/default.nix
index e5e23d75d69d..e6ebf80bfbe5 100644
--- a/pkgs/development/python-modules/aiohttp-asgi-connector/default.nix
+++ b/pkgs/development/python-modules/aiohttp-asgi-connector/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "An AIOHTTP ClientSession connector for directly interacting with ASGI applications";
     homepage = "https://github.com/thearchitector/aiohttp-asgi-connector";
-    changelog = "https://github.com/thearchitector/aiohttp-asgi-connector/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/thearchitector/aiohttp-asgi-connector/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index dc1cccab6f10..84e3199959be 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -50,14 +50,14 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.13.3";
+  version = "3.13.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiohttp";
     tag = "v${version}";
-    hash = "sha256-V+digrfigdA3hwd2xW47BACh3r07j6pGE8WFAGivZnA=";
+    hash = "sha256-/MpN8Lvdm6ZN18eLip0YXHEFzJqRsWWyx1HHfqTmjqA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/aiontfy/default.nix b/pkgs/development/python-modules/aiontfy/default.nix
index 1de685beed70..72102d5dddfc 100644
--- a/pkgs/development/python-modules/aiontfy/default.nix
+++ b/pkgs/development/python-modules/aiontfy/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "aiontfy";
-  version = "0.8.4";
+  version = "0.8.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tr4nt0r";
     repo = "aiontfy";
     tag = "v${version}";
-    hash = "sha256-mj2wYsmA+CI0y4WykP7CLPUFfSCISCdinajkIHDdAZs=";
+    hash = "sha256-LDt8JapUQcojMWyW931zt3U4QMwQew4wOly2AyYvbkI=";
   };
 
   build-system = [
@@ -29,10 +29,6 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  pythonRelaxDeps = [
-    "orjson"
-  ];
-
   dependencies = [
     aiohttp
     mashumaro
diff --git a/pkgs/development/python-modules/aiopegelonline/default.nix b/pkgs/development/python-modules/aiopegelonline/default.nix
index 7d9fe6f35ca4..59bc8ab73f18 100644
--- a/pkgs/development/python-modules/aiopegelonline/default.nix
+++ b/pkgs/development/python-modules/aiopegelonline/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Library to retrieve data from PEGELONLINE";
     homepage = "https://github.com/mib1185/aiopegelonline";
-    changelog = "https://github.com/mib1185/aiopegelonline/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/mib1185/aiopegelonline/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix
index b06dc5fa3007..31e7a30b6fa2 100644
--- a/pkgs/development/python-modules/aiormq/default.nix
+++ b/pkgs/development/python-modules/aiormq/default.nix
@@ -1,44 +1,41 @@
 {
   lib,
-  aiomisc-pytest,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
   pamqp,
+  uv-build,
   yarl,
-  poetry-core,
 }:
 
 buildPythonPackage rec {
   pname = "aiormq";
-  version = "6.9.2";
+  version = "9.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mosquito";
     repo = "aiormq";
     tag = version;
-    hash = "sha256-ApwL3okhpc3Dtq4bfWCCnoikyRx+4zPI9XtJ+qPKQdg=";
+    hash = "sha256-GFeOwjSQ1+nxP9hgNoELoEInTmhhO0JnNeoe2qfWNcg=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "uv_build>=0.10.4,<0.11.0" uv_build
+  '';
+
   pythonRelaxDeps = [ "pamqp" ];
 
-  build-system = [ poetry-core ];
+  build-system = [ uv-build ];
 
   dependencies = [
     pamqp
     yarl
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  checkInputs = [ aiomisc-pytest ];
-
-  # Tests attempt to connect to a RabbitMQ server
-  disabledTestPaths = [
-    "tests/test_channel.py"
-    "tests/test_connection.py"
-  ];
+  # Tests require running a RabbitMQ server.
+  # They rely on having AMQP_URL set or running Docker.
+  doCheck = false;
 
   pythonImportsCheck = [ "aiormq" ];
 
diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index c928da236af1..e98e68d5102f 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "aioshelly";
-  version = "13.23.1";
+  version = "13.24.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aioshelly";
     tag = version;
-    hash = "sha256-vAYhOBfwDKWO0K4pHVf3qqpXTztb5Qzn8TEzk6ecbw0=";
+    hash = "sha256-yb6oZlrB3MBafKoga9vRrcixXlZeknVRsMztX4hV3PA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix
index 98ada059e360..8d441fc14216 100644
--- a/pkgs/development/python-modules/aiosomecomfort/default.nix
+++ b/pkgs/development/python-modules/aiosomecomfort/default.nix
@@ -9,20 +9,24 @@
 
 buildPythonPackage rec {
   pname = "aiosomecomfort";
-  version = "0.0.35";
+  version = "0.0.36";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mkmer";
     repo = "AIOSomecomfort";
     tag = version;
-    hash = "sha256-zhCpV11nzRpWiCPNgeBfBzXgLM2NAw1p9R0ACD3u/mk=";
+    hash = "sha256-Da2Nvke01S7Pt+md2G5RRJqyUc6M3tcj4qsdSJVoQds=";
   };
 
   build-system = [
     setuptools
   ];
 
+  pythonRelaxDeps = [
+    "aiohttp"
+  ];
+
   dependencies = [
     aiohttp
     prettytable
diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix
index 32169475b486..2182709658d1 100644
--- a/pkgs/development/python-modules/aiotractive/default.nix
+++ b/pkgs/development/python-modules/aiotractive/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "aiotractive";
-  version = "1.0.2";
+  version = "1.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zhulik";
     repo = "aiotractive";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tr8USF7GF9CMOcjy62e+oTu4k/1jIAOsZmWTFWEzJvk=";
+    hash = "sha256-wRV/ZQ2T3Dlrmq6jY5IatrGr07uxPFWcVoMiJN+md88=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix
index 0996fc96e86e..87802bbc7856 100644
--- a/pkgs/development/python-modules/aiovlc/default.nix
+++ b/pkgs/development/python-modules/aiovlc/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python module to control VLC";
     homepage = "https://github.com/MartinHjelmare/aiovlc";
-    changelog = "https://github.com/MartinHjelmare/aiovlc/blob/v${finalAttrs.src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/MartinHjelmare/aiovlc/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix
index 1e0184d6a365..e0285de62caa 100644
--- a/pkgs/development/python-modules/aioxmpp/default.nix
+++ b/pkgs/development/python-modules/aioxmpp/default.nix
@@ -91,7 +91,7 @@ buildPythonPackage rec {
   meta = {
     description = "Pure-python XMPP library for asyncio";
     homepage = "https://codeberg.org/jssfr/aioxmpp";
-    changelog = "https://codeberg.org/jssfr/aioxmpp/blob/${src.rev}/docs/api/changelog.rst";
+    changelog = "https://codeberg.org/jssfr/aioxmpp/src/tag/${src.tag}/docs/api/changelog.rst";
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
diff --git a/pkgs/development/python-modules/aligator/default.nix b/pkgs/development/python-modules/aligator/default.nix
index 47c91f33ab4b..c8b92df57a36 100644
--- a/pkgs/development/python-modules/aligator/default.nix
+++ b/pkgs/development/python-modules/aligator/default.nix
@@ -7,6 +7,7 @@
 
   aligator,
 
+  ctestCheckHook,
   crocoddyl,
   pinocchio,
   python,
@@ -37,6 +38,7 @@ toPythonModule (
     ++ lib.optional buildStandalone aligator;
 
     nativeCheckInputs = [
+      ctestCheckHook
       pythonImportsCheckHook
     ];
 
@@ -45,7 +47,12 @@ toPythonModule (
       pytest
     ];
 
-    disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    disabledTests = [
+      # known to work in pinocchio 3, but not 4.
+      # ref https://github.com/Simple-Robotics/aligator/pull/404
+      "aligator-test-py-constrained-dynamics"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # SIGTRAP
       "aligator-test-py-rollout"
     ];
diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix
index 4b5424b6fb1f..a816e4657ce6 100644
--- a/pkgs/development/python-modules/allure-python-commons-test/default.nix
+++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "allure-python-commons-test";
-  version = "2.15.3";
+  version = "2.16.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "allure_python_commons_test";
     inherit version;
-    hash = "sha256-eRjjsxiXm/7nMyaJS5pXhpNmrjOhnd1o7+F9ZwGzI/I=";
+    hash = "sha256-otfGxWNnbMUGuQcqsroOOfiqhCQqe25c39Ur57ek2og=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/amd-aiter/default.nix b/pkgs/development/python-modules/amd-aiter/default.nix
new file mode 100644
index 000000000000..021d39ae5836
--- /dev/null
+++ b/pkgs/development/python-modules/amd-aiter/default.nix
@@ -0,0 +1,180 @@
+{
+  lib,
+  amd-aiter,
+  buildPythonPackage,
+  einops,
+  fetchFromGitHub,
+  ninja,
+  numpy,
+  packaging,
+  pandas,
+  psutil,
+  pybind11,
+  python,
+  rocmPackages,
+  runCommand,
+  setuptools,
+  setuptools-scm,
+  torch,
+  writableTmpDirAsHomeHook,
+}:
+let
+  # Provide a default set of include paths needed by aiter at runtime for JIT modules
+  defaultRocmIncl = lib.makeIncludePath (
+    (with rocmPackages; [
+      clr
+      hipblas
+      hipblas-common
+      hipblaslt
+      hipcub
+      hipfft
+      hipsolver
+      hipsparse
+      rocblas
+      rocprim
+      rocsolver
+      rocsparse
+      rocthrust
+    ])
+    ++ [
+      pybind11
+    ]
+  );
+in
+buildPythonPackage (finalAttrs: {
+  pname = "amd-aiter";
+  version = "0.1.11.post1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "aiter";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9CCSmEw0kIoxERhtkKhBkaAGx42kCssH7IPjTgbg9LA=";
+  };
+
+  postPatch = ''
+    rmdir 3rdparty/composable_kernel
+    ln -sf ${rocmPackages.composable_kernel.src} 3rdparty/composable_kernel
+
+    substituteInPlace pyproject.toml \
+      --replace-fail '"flydsl==0.0.1.dev95158637"' ""
+
+    # TODO: upstream fix. get_git_commit_id_short() assumes a git clone;
+    # fails in hermetic builds, should fall back gracefully.
+    substituteInPlace csrc/cpp_itfs/utils.py \
+      --replace-fail \
+        'commit_id = get_git_commit_id_short()' \
+        'commit_id = "${finalAttrs.version}"'
+
+    # NIX_AITER_ROCM_INCL is a colon-separated list of include dirs
+    # defaults to packages known to be needed by aiter
+    substituteInPlace aiter/jit/utils/cpp_extension.py \
+      --replace-fail \
+        'paths.append(_join_rocm_home("include"))' \
+        'paths.append(_join_rocm_home("include")); paths.extend(os.environ.get("NIX_AITER_ROCM_INCL", "${defaultRocmIncl}").split(":"))'
+
+    # setuptools runs setup.py twice (metadata + wheel). prepare_packaging()
+    # copies 3rdparty/ (with nix store read-only files) into aiter_meta/, then
+    # the second run can't rmtree or overwrite them.
+    substituteInPlace setup.py \
+      --replace-fail \
+        $'prepare_packaging()\n\n\nclass' \
+        $'if not os.path.exists("aiter_meta"): prepare_packaging()\n\n\nclass' \
+      --replace-fail \
+        'if os.path.exists("aiter_meta") and os.path.isdir("aiter_meta"):' \
+        'if False:'
+  '';
+
+  env = {
+    BUILD_TARGET = "rocm";
+    PREBUILD_KERNELS = "0";
+    ROCM_PATH = "${rocmPackages.clr}";
+    SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+  };
+
+  build-system = [
+    ninja
+    packaging
+    pandas
+    psutil
+    pybind11
+    setuptools
+    setuptools-scm
+  ];
+
+  buildInputs = [ rocmPackages.clr ];
+
+  nativeBuildInputs = [
+    rocmPackages.hipcc
+    writableTmpDirAsHomeHook
+  ];
+
+  dependencies = [
+    einops
+    ninja
+    numpy
+    packaging
+    pandas
+    psutil
+    pybind11
+    torch
+  ];
+
+  # Most tests and imports require a GPU and writable $HOME for JIT cache
+  doCheck = false;
+
+  # Test JIT module builds for CDNA3 iff rocm enabled for torch
+  passthru.tests = lib.optionalAttrs torch.rocmSupport (
+    let
+      mkJitTest =
+        name: moduleName:
+        runCommand "amd-aiter-jit-${name}"
+          {
+            nativeBuildInputs = [
+              (python.withPackages (_: [ amd-aiter ]))
+              rocmPackages.clr
+              writableTmpDirAsHomeHook
+            ];
+            env = {
+              CXX = "amdclang++";
+              GPU_ARCHS = "gfx942";
+              PYTORCH_ROCM_ARCH = "gfx942";
+            };
+          }
+          ''
+            export AITER_JIT_DIR=$(mktemp -d)
+            python3 -c "
+            from aiter.jit.core import get_args_of_build, build_module
+            args = get_args_of_build('${moduleName}')
+            build_module(
+                '${moduleName}',
+                args['srcs'], args['flags_extra_cc'], args['flags_extra_hip'],
+                args['blob_gen_cmd'], args['extra_include'], args['extra_ldflags'],
+                args['verbose'], args['is_python_module'], args['is_standalone'],
+                args['torch_exclude'],
+            )
+            print('JIT compile of ${moduleName} finished')
+            "
+            touch $out
+          '';
+    in
+    {
+      jit-module-opus-sort = mkJitTest "opus-sort" "module_moe_sorting_opus";
+      jit-module-mhc = mkJitTest "mhc" "module_mhc";
+    }
+  );
+
+  meta = {
+    description = "AI Tensor Engine for ROCm";
+    homepage = "https://github.com/ROCm/aiter";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryNativeCode
+    ];
+    maintainers = with lib.maintainers; [ lach ];
+    teams = [ lib.teams.rocm ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/python-modules/ansi2image/default.nix b/pkgs/development/python-modules/ansi2image/default.nix
index 7c55a1915d15..3967bbc87c3f 100644
--- a/pkgs/development/python-modules/ansi2image/default.nix
+++ b/pkgs/development/python-modules/ansi2image/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ansi2image";
-  version = "0.1.4";
+  version = "0.1.5";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "helviojunior";
     repo = "ansi2image";
     tag = "v${version}";
-    hash = "sha256-1sPEEWcOzesLQXSeMsUra8ZRSMAKzH6iisOgdhpxhKM=";
+    hash = "sha256-GWrVo1WJux+ATvG5F9J4WMDlI0XAeTpQg7NrkN1P4Co=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index d24dee524f2c..eb3dcf16e611 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ansible-core";
-  version = "2.20.4";
+  version = "2.20.5";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
     owner = "ansible";
     repo = "ansible";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7KsxZH1d5FfdnsYfKSNGCmdYuBi8KzZxyZbG2WNAM9Y=";
+    hash = "sha256-AU6LTKqtBMW2s+0a0HsMrkXDqaWbcEqbtG3dp/5bQOA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 84be3d90c8cd..822bc7b0b484 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "4.12.1";
+  version = "4.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "agronholm";
     repo = "anyio";
     tag = version;
-    hash = "sha256-7rfQ6mwB2sNKc28ZPMZNgVs7TFgBUBzH6xGXmtfzX9k=";
+    hash = "sha256-W2uR1VwI9u4QIPmbcYp8jDatEdya97NaJwAABlaRHzM=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index 2e3bb006071a..d3c07ea9bbff 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "apispec";
-  version = "6.9.0";
+  version = "6.10.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ejjOfD7tx3cebjMpWv3YxLCs3ZhltIP4z2zDack+jR4=";
+    hash = "sha256-CoiFVc1KpftxdgQb4VaEFU/YlhBV4WcucDq/c36HYb8=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/appium-python-client/default.nix b/pkgs/development/python-modules/appium-python-client/default.nix
index 270bfe6d3d1e..750441a75cdd 100644
--- a/pkgs/development/python-modules/appium-python-client/default.nix
+++ b/pkgs/development/python-modules/appium-python-client/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "appium-python-client";
-  version = "5.3.0";
+  version = "5.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "appium";
     repo = "python-client";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2lQDGDO7xwNRMErxKcfFkXEMnO96zlDhHyakZkh7pfY=";
+    hash = "sha256-oZ0J35qX55U2pHa5LUpocKvSLIXAK06i68UYaTNruHM=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix
index 2816e92cb6cf..ea9cd651a335 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/pkgs/development/python-modules/apprise/default.nix
@@ -23,12 +23,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "apprise";
-  version = "1.9.9";
+  version = "1.10.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-/WIsDfFr3HntOFU5c1VzSIyv4kBdJXR+h+69awmyYBI=";
+    hash = "sha256-t2jzLZnkXtX0w+7x9nkD6APJf5e6YaUxpdCkXUDfkKg=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
index efa2eff09e36..5c91f2217155 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -20,18 +20,18 @@
 
 buildPythonPackage rec {
   pname = "approvaltests";
-  version = "17.4.1";
+  version = "18.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "approvals";
     repo = "ApprovalTests.Python";
     tag = "v${version}";
-    hash = "sha256-8JOd1JRwJS+y5Eh/an0RrGtwBZMPW/ziGTRd1H9Sveo=";
+    hash = "sha256-2lz3TMI4/QoNVfnZga5Ro9rheixFpVJfNbvVLy0lnLA=";
   };
 
   postPatch = ''
-    test -f setup.py || mv setup/setup.publish.py setup.py
+    test -f setup.py || mv setup/setup.approvaltests.py setup.py
 
     patchShebangs internal_documentation/scripts
   '';
diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 8a921df9f281..55a885843f2a 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "asdf";
-  version = "5.1.0";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "asdf-format";
     repo = "asdf";
     tag = version;
-    hash = "sha256-pET6isOd8u0mK+axgedUcQkz4y5PCSzPMy+LOqEgtEs=";
+    hash = "sha256-StudmLkXINe/lIJneid763jBdo6jAHlnjj4PHsGFxwM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index 142a1691e235..e5c29e34c1fa 100644
--- a/pkgs/development/python-modules/ase/default.nix
+++ b/pkgs/development/python-modules/ase/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "ase";
-  version = "3.26.0";
+  version = "3.28.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "ase";
     repo = "ase";
     tag = version;
-    hash = "sha256-1738NQPgOqSr2PZu1T2b9bL0V+ZzGk2jcWBhLF21VQs=";
+    hash = "sha256-ZbQxCd8uFTNPVUjjsCCiZR9pKRucobWfxDZGdyMm6ko=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/asgineer/default.nix b/pkgs/development/python-modules/asgineer/default.nix
index 30f1b77fbbeb..676ebb921f71 100644
--- a/pkgs/development/python-modules/asgineer/default.nix
+++ b/pkgs/development/python-modules/asgineer/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   meta = {
     description = "Really thin ASGI web framework";
     homepage = "https://asgineer.readthedocs.io";
-    changelog = "https://github.com/almarklein/asgineer/releases/tag/v${src.tag}";
+    changelog = "https://github.com/almarklein/asgineer/releases/tag/${src.tag}";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix
index eb0ae2f6528d..e36298ef4e29 100644
--- a/pkgs/development/python-modules/asyncio-dgram/default.nix
+++ b/pkgs/development/python-modules/asyncio-dgram/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python support for higher level Datagram";
     homepage = "https://github.com/jsbronder/asyncio-dgram";
-    changelog = "https://github.com/jsbronder/asyncio-dgram/blob/v${finalAttrs.src.tag}/ChangeLog";
+    changelog = "https://github.com/jsbronder/asyncio-dgram/blob/${finalAttrs.src.tag}/ChangeLog";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix
index 44509b3b0c0b..9f0ec060f04d 100644
--- a/pkgs/development/python-modules/atopile/default.nix
+++ b/pkgs/development/python-modules/atopile/default.nix
@@ -214,10 +214,13 @@ buildPythonPackage (finalAttrs: {
     "test_muster_specific_targets_with_dependencies"
   ];
 
-  # in order to use pytest marker, we need to use ppytestFlagsArray
-  # using pytestFlags causes `ERROR: file or directory not found: slow`
-  pytestFlagsArray = [
-    "-m='not slow and not not_in_ci and not regression'"
+  disabledTestMarks = [
+    "slow"
+    "not_in_ci"
+    "regression"
+  ];
+
+  pytestFlags = [
     "--timeout=10" # any test taking long, timouts with more than 60s
     "--benchmark-disable"
     "--tb=line"
diff --git a/pkgs/development/python-modules/attrs-strict/default.nix b/pkgs/development/python-modules/attrs-strict/default.nix
index c1ec8c711deb..589c6a57c047 100644
--- a/pkgs/development/python-modules/attrs-strict/default.nix
+++ b/pkgs/development/python-modules/attrs-strict/default.nix
@@ -26,6 +26,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-dDOD4Y57E+i8D0S4q+C6t7zjBTsS8q2UFiS22Dsp0Z8=";
   };
 
+  patches = [
+    # Upstream PR: https://github.com/bloomberg/attrs-strict/pull/117
+    ./fix-tests.patch
+  ];
+
   build-system = [
     setuptools
     setuptools-scm
@@ -41,13 +46,6 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # AssertionError: Regex pattern did not match
-    "test_real_types"
-    "test_recursive"
-    "test_union_when_type_is_not_specified_raises"
-  ];
-
   meta = {
     description = "Python package which contains runtime validation for attrs data classes based on the types existing in the typing module";
     homepage = "https://github.com/bloomberg/attrs-strict";
diff --git a/pkgs/development/python-modules/attrs-strict/fix-tests.patch b/pkgs/development/python-modules/attrs-strict/fix-tests.patch
new file mode 100644
index 000000000000..5c49da8e2ff8
--- /dev/null
+++ b/pkgs/development/python-modules/attrs-strict/fix-tests.patch
@@ -0,0 +1,73 @@
+diff --git a/tests/test_auto_attribs__py3.py b/tests/test_auto_attribs__py3.py
+index 67b3ff8..8241f9d 100644
+--- a/tests/test_auto_attribs__py3.py
++++ b/tests/test_auto_attribs__py3.py
+@@ -28,9 +28,13 @@ from attrs_strict import type_validator
+             None,
+             0xBAD,
+             "Value of value 2989 is not of type {}".format(
+-                "typing.Optional[str]"
+-                if sys.version_info == (2, 7) or sys.version_info > (3, 9)
+-                else "typing.Union[str, NoneType]"
++                "str | None"
++                if sys.version_info >= (3, 14)
++                else (
++                    "typing.Optional[str]"
++                    if sys.version_info == (2, 7) or sys.version_info > (3, 9)
++                    else "typing.Union[str, NoneType]"
++                )
+             ),
+         ),
+     ],
+@@ -75,9 +79,13 @@ def test_recursive():
+     Self(Self())
+     Self(Self(None))
+     type_repr = (
+-        "typing.Optional[test_auto_attribs__py3.Self]"
+-        if sys.version_info == (2, 7) or sys.version_info > (3, 9)
+-        else "typing.Union[test_auto_attribs__py3.Self, NoneType]"
++        "test_auto_attribs__py3.Self | None"
++        if sys.version_info >= (3, 14)
++        else (
++            "typing.Optional[test_auto_attribs__py3.Self]"
++            if sys.version_info == (2, 7) or sys.version_info > (3, 9)
++            else "typing.Union[test_auto_attribs__py3.Self, NoneType]"
++        )
+     )
+     msg = f"Value of parent 17 is not of type {type_repr}"
+     with pytest.raises(ValueError, match=re.escape(msg)):
+diff --git a/tests/test_union.py b/tests/test_union.py
+index e1b11a9..49d7c20 100644
+--- a/tests/test_union.py
++++ b/tests/test_union.py
+@@ -16,16 +16,26 @@ from attrs_strict import type_validator
+         (
+             2.0,
+             Union[int, str],
+-            "Value of foo 2.0 is not of type typing.Union[int, str]",
++            (
++                "Value of foo 2.0 is not of type {}".format(
++                    "int | str"
++                    if sys.version_info >= (3, 14)
++                    else "typing.Union[int, str]"
++                )
++            ),
+         ),
+         (
+             [1, 2, "p"],
+             List[Union[None, int]],
+             (
+                 "Value of foo p is not of type {} in [1, 2, 'p']".format(
+-                    "typing.Optional[int]"
+-                    if sys.version_info >= (3, 9)
+-                    else "typing.Union[NoneType, int]"
++                    "None | int"
++                    if sys.version_info >= (3, 14)
++                    else (
++                        "typing.Optional[int]"
++                        if sys.version_info >= (3, 9)
++                        else "typing.Union[NoneType, int]"
++                    )
+                 )
+             ),
+         ),
diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix
index 30a5be99e417..b7e82bc72c64 100644
--- a/pkgs/development/python-modules/aurorapy/default.nix
+++ b/pkgs/development/python-modules/aurorapy/default.nix
@@ -8,16 +8,16 @@
   six,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "aurorapy";
-  version = "0.2.7";
+  version = "0.3";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "energievalsabbia";
     repo = "aurorapy";
-    rev = version;
-    hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec=";
+    tag = finalAttrs.version;
+    hash = "sha256-bc5i2x35sZXkCSJraTqX3Zc5B9eKL1qDh97/7ixyHLY=";
   };
 
   postPatch = ''
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Implementation of the communication protocol for Power-One Aurora inverters";
     homepage = "https://gitlab.com/energievalsabbia/aurorapy";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix
index 1e85d9c173b7..bb69ffc60a94 100644
--- a/pkgs/development/python-modules/authlib/default.nix
+++ b/pkgs/development/python-modules/authlib/default.nix
@@ -4,9 +4,10 @@
   cachelib,
   cryptography,
   fetchFromGitHub,
-  flask,
   flask-sqlalchemy,
+  flask,
   httpx,
+  joserfc,
   mock,
   pytest-asyncio,
   pytestCheckHook,
@@ -17,22 +18,23 @@
   werkzeug,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "authlib";
-  version = "1.6.9";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "authlib";
-    tag = "v${version}";
-    hash = "sha256-9H9DF3LmxzUv0M0fxYh6FLtdAA9FgRklceMlGdjlp+g=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-vy1IOhwLkETSLSSHCWEgDOq79eZW+qEU9CJOHFMrBWE=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     cryptography
+    joserfc
   ];
 
   nativeCheckInputs = [
@@ -62,8 +64,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library for building OAuth and OpenID Connect servers";
     homepage = "https://github.com/lepture/authlib";
-    changelog = "https://github.com/lepture/authlib/blob/${src.tag}/docs/changelog.rst";
+    changelog = "https://github.com/lepture/authlib/blob/${finalAttrs.src.tag}/docs/upgrades/changelog.rst";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ flokli ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/awsiotsdk/default.nix b/pkgs/development/python-modules/awsiotsdk/default.nix
index 80fc51c514f5..bc368b92c344 100644
--- a/pkgs/development/python-modules/awsiotsdk/default.nix
+++ b/pkgs/development/python-modules/awsiotsdk/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "awsiotsdk";
-  version = "1.28.2";
+  version = "1.29.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-iot-device-sdk-python-v2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uhuKHn2aCqdJ1mN7Rp9/RNEuAv9STtgqpjF3Cjvw2pg=";
+    hash = "sha256-YSBtViejJFlu3r38Kx1sn+TNkfq0+Zy/KfoBlJdj5Gg=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix
index 59a9594bebfe..1099087afc3b 100644
--- a/pkgs/development/python-modules/axis/default.nix
+++ b/pkgs/development/python-modules/axis/default.nix
@@ -13,9 +13,9 @@
   xmltodict,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "axis";
-  version = "68";
+  version = "69";
   pyproject = true;
 
   disabled = pythonOlder "3.14";
@@ -23,14 +23,14 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Kane610";
     repo = "axis";
-    tag = "v${version}";
-    hash = "sha256-2a7zGgWc0QxxjCCg5yCfcepzLhEfvASv/Y8mDgl4y8M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-igeDyGKG235ooe/QrHjbya9WTCzwC8GfMoCwtpaBlR8=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "setuptools==82.0.1" "setuptools" \
-      --replace-fail "wheel==0.46.3" "wheel"
+      --replace-fail "wheel==0.47.0" "wheel"
   '';
 
   build-system = [ setuptools ];
@@ -53,9 +53,9 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for communicating with devices from Axis Communications";
     homepage = "https://github.com/Kane610/axis";
-    changelog = "https://github.com/Kane610/axis/releases/tag/v${version}";
+    changelog = "https://github.com/Kane610/axis/releases/tag/v${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "axis";
   };
-}
+})
diff --git a/pkgs/development/python-modules/azure-storage-file-datalake/default.nix b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
index 97b1688542c8..67a8e593b127 100644
--- a/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
+++ b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-file-datalake";
-  version = "12.21.0";
+  version = "12.23.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "azure_storage_file_datalake";
     inherit version;
-    hash = "sha256-tJzSFW6jJfb0So9mdNc8WUnprEjWSA+vkBspOYVfzdM=";
+    hash = "sha256-lM4aIJ5ya846VCZoIpAfoZDSApyJtSvm9eeNfl+xCS8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/banks/default.nix b/pkgs/development/python-modules/banks/default.nix
index 2bb4a2189891..d0440bd9dc0c 100644
--- a/pkgs/development/python-modules/banks/default.nix
+++ b/pkgs/development/python-modules/banks/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "banks";
-  version = "2.4.1";
+  version = "2.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "masci";
     repo = "banks";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wa3refEIYQIPmtl8NGtoyg2PTY3zQt6R4EgXUbcUgrk=";
+    hash = "sha256-FSulHLWXNO9jz9K7qgrrZcvfe2iQGxdkJVOZlo+Qw/c=";
   };
 
   env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix
index 4daa5461fd77..7aec8f8d36c9 100644
--- a/pkgs/development/python-modules/bdffont/default.nix
+++ b/pkgs/development/python-modules/bdffont/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "bdffont";
-  version = "0.0.35";
+  version = "0.0.36";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TakWolf";
     repo = "bdffont";
     tag = finalAttrs.version;
-    hash = "sha256-a93l7iX2/Htigs36zCv1x8SAGzycGU2y/stN0j794fw=";
+    hash = "sha256-PCx1uMjCa5d8odDGRi4BRaf1E1AP0oZUv0QYr24E6Yo=";
   };
 
   build-system = [ uv-build ];
diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 37f7ee3783cb..de4f49c186ff 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -90,6 +90,7 @@
   # tests
   pytestCheckHook,
   pytest-cov-stub,
+  pytest-factoryboy,
   pytest-flask,
   mock,
   rarfile,
@@ -112,12 +113,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "beets";
-  version = "2.9.0";
+  version = "2.10.0";
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = "beets";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dJhWKZwhKXyFQVO9xt2v/NSa7bSg0e78zga/t9dlTyE=";
+    hash = "sha256-DbZV8n+2nbILLIi7niXohcIynwza+w5LVo/jy4wmTbw=";
   };
   pyproject = true;
 
@@ -181,6 +182,7 @@ buildPythonPackage (finalAttrs: {
     ffmpeg
     pytestCheckHook
     pytest-cov-stub
+    pytest-factoryboy
     pytest-flask
     mock
     rarfile
diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index 797cfd2ebe49..99703c943757 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -63,7 +63,6 @@
   starlette,
   tomli-w,
   tritonclient,
-  uv,
   uvicorn,
   watchfiles,
   # native check inputs
@@ -202,7 +201,6 @@ buildPythonPackage {
     simple-di
     starlette
     tomli-w
-    uv
     uvicorn
     watchfiles
   ];
diff --git a/pkgs/development/python-modules/biocutils/default.nix b/pkgs/development/python-modules/biocutils/default.nix
index 5d65eb9100ae..c51de623781b 100644
--- a/pkgs/development/python-modules/biocutils/default.nix
+++ b/pkgs/development/python-modules/biocutils/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "biocutils";
-  version = "0.3.4";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "BiocPy";
     repo = "BiocUtils";
     tag = version;
-    hash = "sha256-G7g+jjXoKtnp+d7a5NoEtVBEN5Di1P/pWjgiJJv6fHA=";
+    hash = "sha256-aVJIeSHs90X6xjVkFfEs9UZR5cEPuUJx2QA6hHYrmjI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix
index 1defc1f5233d..5ea12bfc5043 100644
--- a/pkgs/development/python-modules/blebox-uniapi/default.nix
+++ b/pkgs/development/python-modules/blebox-uniapi/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   setuptools,
   aiohttp,
-  semver,
   deepmerge,
   jmespath,
   pytest-asyncio,
@@ -13,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "blebox-uniapi";
-  version = "2.5.0";
+  version = "2.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "blebox";
     repo = "blebox_uniapi";
     tag = "v${version}";
-    hash = "sha256-johTs1AGvC6mGasK87ijhBNbHb1m36Ep9TR8XPG35d0=";
+    hash = "sha256-+XdUteik6VDPXWgO9vDC34n2fIIDMUI5jTYzs/qCpLU=";
   };
 
   postPatch = ''
@@ -28,12 +27,11 @@ buildPythonPackage rec {
       --replace-fail "pytest-runner" ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     jmespath
-    semver
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/bot-safe-agents/default.nix b/pkgs/development/python-modules/bot-safe-agents/default.nix
index cebc5690ae5f..9e8a8ff77cb3 100644
--- a/pkgs/development/python-modules/bot-safe-agents/default.nix
+++ b/pkgs/development/python-modules/bot-safe-agents/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "bot-safe-agents";
-  version = "1.1";
+  version = "1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ivan-sincek";
     repo = "bot-safe-agents";
     tag = "v${version}";
-    hash = "sha256-x+AoHg8JFq++qZIhxljIZp2pfxEd0jtETclttddN4sk=";
+    hash = "sha256-b4X3z8jX8kF3G1CEYxWl2jhWid3fRl7WfIMRfvAWlko=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 87a5aa8f3f33..d4e6c0be2e35 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "boto3-stubs";
-  version = "1.42.91";
+  version = "1.43.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit (finalAttrs) version;
-    hash = "sha256-J3424exTCrajFkdSPf70DgfQsGVDG+blQ2OiQ/eL+rs=";
+    hash = "sha256-DUZjbz52GpIHARSzmnaxVMXabFeUyJDhRAp/GRvx/y4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
index a402a1defbf6..1ba87cf8320f 100644
--- a/pkgs/development/python-modules/bravado-core/default.nix
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -21,19 +21,19 @@
 
 buildPythonPackage rec {
   pname = "bravado-core";
-  version = "6.6.1";
+  version = "6.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "bravado-core";
     rev = "v${version}";
-    hash = "sha256-kyHmZNPl5lLKmm5i3TSi8Tfi96mQHqaiyBfceBJcOdw=";
+    hash = "sha256-tMrGNezHtmSwuZOdTI+dMIFZ8SWi38LoOWevdwHcKr8=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jsonref
     jsonschema # jsonschema[format-nongpl]
     python-dateutil
@@ -47,9 +47,10 @@ buildPythonPackage rec {
   ]
   ++ jsonschema.optional-dependencies.format-nongpl;
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  checkInputs = [ mock ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    mock
+  ];
 
   pythonImportsCheck = [ "bravado_core" ];
 
diff --git a/pkgs/development/python-modules/brax/default.nix b/pkgs/development/python-modules/brax/default.nix
index e2609c149536..d74a839c505a 100644
--- a/pkgs/development/python-modules/brax/default.nix
+++ b/pkgs/development/python-modules/brax/default.nix
@@ -40,6 +40,7 @@ buildPythonPackage (finalAttrs: {
   pname = "brax";
   version = "0.14.2";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google";
@@ -48,6 +49,20 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-/oznBa44xKl+9T1YrTVhCbuKZj16V1BTlnmCGRbF45g=";
   };
 
+  patches = [
+    # AttributeError: jax.device_put_replicated is deprecated; use jax.device_put instead.
+    # See https://docs.jax.dev/en/latest/migrate_pmap.html#drop-in-replacements for a drop-in replacement.
+    ./dont-use-device_put_replicated-compat.patch
+  ];
+
+  # TypeError: clip() got an unexpected keyword argument 'a_min'
+  postPatch = ''
+    substituteInPlace brax/fluid.py \
+      --replace-fail \
+        "box = 6.0 * jp.clip(jp.sum(diag_inertia_v, axis=-1), a_min=1e-12)" \
+        "box = 6.0 * jp.clip(jp.sum(diag_inertia_v, axis=-1), min=1e-12)"
+  '';
+
   build-system = [
     hatchling
   ];
diff --git a/pkgs/development/python-modules/brax/dont-use-device_put_replicated-compat.patch b/pkgs/development/python-modules/brax/dont-use-device_put_replicated-compat.patch
new file mode 100644
index 000000000000..261aa5907a60
--- /dev/null
+++ b/pkgs/development/python-modules/brax/dont-use-device_put_replicated-compat.patch
@@ -0,0 +1,68 @@
+diff --git a/brax/training/agents/apg/train.py b/brax/training/agents/apg/train.py
+index f5fcb0e..87b198f 100644
+--- a/brax/training/agents/apg/train.py
++++ b/brax/training/agents/apg/train.py
+@@ -310,7 +310,7 @@ def train(
+           specs.Array((env.observation_size,), jnp.dtype(dtype))
+       ),
+   )
+-  training_state = jax.device_put_replicated(
++  training_state = pmap.device_put_replicated(
+       training_state, jax.local_devices()[:local_devices_to_use]
+   )
+ 
+diff --git a/brax/training/agents/ppo/train.py b/brax/training/agents/ppo/train.py
+index 9aec960..6624733 100644
+--- a/brax/training/agents/ppo/train.py
++++ b/brax/training/agents/ppo/train.py
+@@ -753,7 +753,7 @@ def train(
+         {},
+     )
+ 
+-  training_state = jax.device_put_replicated(
++  training_state = pmap.device_put_replicated(
+       training_state, jax.local_devices()[:local_devices_to_use]
+   )
+ 
+diff --git a/brax/training/agents/sac/train.py b/brax/training/agents/sac/train.py
+index be716e9..8dcf3bf 100644
+--- a/brax/training/agents/sac/train.py
++++ b/brax/training/agents/sac/train.py
+@@ -108,7 +108,7 @@ def _init_training_state(
+       alpha_params=log_alpha,
+       normalizer_params=normalizer_params,
+   )
+-  return jax.device_put_replicated(
++  return pmap.device_put_replicated(
+       training_state, jax.local_devices()[:local_devices_to_use]
+   )
+ 
+diff --git a/brax/training/pmap.py b/brax/training/pmap.py
+index 82760fc..af62ef8 100644
+--- a/brax/training/pmap.py
++++ b/brax/training/pmap.py
+@@ -19,12 +19,23 @@ from typing import Any
+ 
+ import jax
+ import jax.numpy as jnp
++from jax.sharding import Mesh, NamedSharding, PartitionSpec as P
++import numpy as np
++
++
++def device_put_replicated(x, devices):
++  """Drop-in replacement for jax.device_put_replicated supporting pytrees."""
++  mesh = Mesh(np.array(devices), ('x',))
++  sharding = NamedSharding(mesh, P('x'))
++  return jax.tree.map(
++      lambda y: jax.device_put(jnp.stack([y] * len(devices)), sharding), x
++  )
+ 
+ 
+ def bcast_local_devices(value, local_devices_to_use=1):
+   """Broadcasts an object to all local devices."""
+   devices = jax.local_devices()[:local_devices_to_use]
+-  return jax.device_put_replicated(value, devices)
++  return device_put_replicated(value, devices)
+ 
+ 
+ def synchronize_hosts():
diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index 01145766af4d..79944b0dbc2d 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "build";
-  version = "1.4.0";
+  version = "1.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "build";
     tag = version;
-    hash = "sha256-otaAFL87o+1YB5/ar2rlOpDjFCWOKs+gfqZImuWH8IA=";
+    hash = "sha256-wPTiiBaPBy8hsxJHhoeohsqoaMG7VXN5Vv7+PK9ZaO4=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix
index 9e4e626fa337..0b7b5c4ab3a8 100644
--- a/pkgs/development/python-modules/bx-py-utils/default.nix
+++ b/pkgs/development/python-modules/bx-py-utils/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "bx-py-utils";
-  version = "116";
+  version = "118";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "boxine";
     repo = "bx_py_utils";
     tag = "v${version}";
-    hash = "sha256-wrPEwYeM4HjhgRO51XyPx6e/TsX52378bFhPw1NZreM=";
+    hash = "sha256-SasoLZ8Ay+aqBItT/O8RMGEbPXxXsL//ssvttMcnZnQ=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index 509f6b18256f..7daab37c42a4 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "cairosvg";
-  version = "2.8.2";
+  version = "2.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "CairoSVG";
     tag = version;
-    hash = "sha256-KWUZA8pcHMnDEkAYZt3zDzPNynhGBuLZuagNPfHF8EA=";
+    hash = "sha256-WtMFOYaN/cRrL1Q4ma/UkR3kNFObNhp0Gm7i9NQAqz8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
index 558da207c50d..dcd92647d0fa 100644
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python API wrapper for the Censys Search Engine (censys.io)";
     homepage = "https://github.com/censys/censys-python";
-    changelog = "https://github.com/censys/censys-python/releases/tag/v${src.tag}";
+    changelog = "https://github.com/censys/censys-python/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "censys";
diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix
index 20af5e0aa293..ca55da18c87c 100644
--- a/pkgs/development/python-modules/certipy-ad/default.nix
+++ b/pkgs/development/python-modules/certipy-ad/default.nix
@@ -40,6 +40,7 @@ buildPythonPackage (finalAttrs: {
     "pycryptodome"
     "pyopenssl"
     "beautifulsoup4"
+    "requests"
   ];
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix
index dde855d7415c..ed93783889d6 100644
--- a/pkgs/development/python-modules/chex/default.nix
+++ b/pkgs/development/python-modules/chex/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   flit-core,
@@ -20,25 +21,35 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "chex";
   version = "0.1.91";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "deepmind";
     repo = "chex";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-lJ9+kvG7dRtfDVgvkcJ9/jtnX0lMfxY4mmZ290y/74U=";
   };
 
+  patches = [
+    # jax.device_put_replicated is removed in jax 0.10.0
+    # This fix was merged upstream -> remove when updating to the next release
+    (fetchpatch {
+      url = "https://github.com/google-deepmind/chex/commit/5fbd2c9a9936799daf92354e0307b9e88b9cc163.patch";
+      excludes = [
+        "chex/_src/variants.py"
+      ];
+      hash = "sha256-ZTimSq7/yt2UEiWmLcfFBadX8+VcaxuPhkQJEyiEZlE=";
+    })
+  ];
+
   build-system = [
     flit-core
   ];
 
-  pythonRelaxDeps = [
-    "typing_extensions"
-  ];
   dependencies = [
     absl-py
     jax
@@ -69,8 +80,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library of utilities for helping to write reliable JAX code";
     homepage = "https://github.com/deepmind/chex";
-    changelog = "https://github.com/google-deepmind/chex/releases/tag/v${version}";
+    changelog = "https://github.com/google-deepmind/chex/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ndl ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index 000a11787feb..3a1f93ed3f04 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -68,19 +68,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "chromadb";
-  version = "1.5.7";
+  version = "1.5.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chroma-core";
     repo = "chroma";
     tag = finalAttrs.version;
-    hash = "sha256-JrkfLwEL7iTL9P/4UDM4hFQtRL1JYH47dgZ1d+Mphqw=";
+    hash = "sha256-bxRRpwd7pmE+/JMARaqjuE+xFh8Qx70Aon2w56sOi1I=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Szy2mSTriMwMViVTbI+0XaizcQBKh1Ncipf84moDREI=";
+    hash = "sha256-0vuXMxwbbpfMA0UcHcLieTJK6u67o6EYdJLH5Q+wtc8=";
   };
 
   # Can't use fetchFromGitHub as the build expects a zipfile
@@ -263,6 +263,11 @@ buildPythonPackage (finalAttrs: {
     "chromadb/test/test_client.py::test_http_client_with_inconsistent_host_settings[async_client]"
     "chromadb/test/test_client.py::test_http_client_with_inconsistent_port_settings[async_client]"
     "chromadb/test/test_client.py::test_http_client[async_client]"
+
+    # ValueError: Could not connect to a Chroma server.
+    "chromadb/test/property/test_add_mcmr.py::test_add_small[single-region]"
+    "chromadb/test/property/test_add_mcmr.py::test_add_medium[single-region]"
+    "chromadb/test/property/test_add_mcmr.py::test_add_large[single-region]"
   ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix
index 0d3850cf63cb..536f6426df0b 100644
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "clarifai-grpc";
-  version = "12.3.1";
+  version = "12.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Clarifai";
     repo = "clarifai-python-grpc";
     tag = version;
-    hash = "sha256-glPzDXIOqR6fek9gFwE7Hu1MkWPIsuTuBwQpruqo2mA=";
+    hash = "sha256-tR6HvzesMp11e8h35UpaZxaMa5flN1B4Sil3sbEG0cw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix
index 4b2cbf44a304..17da75bd68f7 100644
--- a/pkgs/development/python-modules/claude-agent-sdk/default.nix
+++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "claude-agent-sdk";
-  version = "0.1.60";
+  version = "0.1.68";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "claude-agent-sdk-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4pDR8YkzF5tt6JlWN5zfNxQah7hz97bqeputPUstqfY=";
+    hash = "sha256-m42AYi9OkII9NOSNV9D9M7GMamh2Qncpz21s7BS1E70=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index eaac95161e88..a346bc46f72c 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -6,21 +6,24 @@
   mock,
   pytestCheckHook,
   pygments,
+  setuptools,
   tabulate,
 }:
 
 buildPythonPackage rec {
   pname = "cli-helpers";
-  version = "2.10.0";
-  format = "setuptools";
+  version = "2.14.0";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "cli_helpers";
     inherit version;
-    hash = "sha256-Dgk2F5t4bADGtzhjtbklKIn3pUUl8UAU7HJ+Qf8iryg=";
+    hash = "sha256-eY4HMfL01CV2fLEqOtlmvyi13nelZRZiBhu0pmvujzU=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     configobj
     tabulate
   ]
diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix
index 8de827a9f176..96774ac32e3b 100644
--- a/pkgs/development/python-modules/cloudpathlib/default.nix
+++ b/pkgs/development/python-modules/cloudpathlib/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "cloudpathlib";
-  version = "0.23.0";
+  version = "0.24.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "drivendataorg";
     repo = "cloudpathlib";
     tag = "v${version}";
-    hash = "sha256-lRZYWGX3Yqs1GTIL3ugOiu+K9RF6vJdbKP/SZAStHLc=";
+    hash = "sha256-MpCgK1JnQ/Etp0EyH5z6iknrQeJ4Wn6rwBw2EjgVAic=";
   };
 
   postPatch =
diff --git a/pkgs/development/python-modules/clu/default.nix b/pkgs/development/python-modules/clu/default.nix
index 9f6f4f966517..5818e92219e3 100644
--- a/pkgs/development/python-modules/clu/default.nix
+++ b/pkgs/development/python-modules/clu/default.nix
@@ -31,6 +31,7 @@ buildPythonPackage (finalAttrs: {
   pname = "clu";
   version = "0.0.12";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google";
@@ -39,6 +40,15 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-ntqRz3fCXMf0EDQsddT68Mdi105ECBVQpVsStzk2kvQ=";
   };
 
+  # Fix Jax 0.10.0 compatibility
+  # TypeError: clip() got an unexpected keyword argument 'a_min'
+  postPatch = ''
+    substituteInPlace clu/metrics.py \
+      --replace-fail \
+        "variance = jnp.clip(variance, a_min=0.0)" \
+        "variance = jnp.clip(variance, min=0.0)"
+  '';
+
   build-system = [
     setuptools
   ];
diff --git a/pkgs/development/python-modules/cobble/default.nix b/pkgs/development/python-modules/cobble/default.nix
index 13fe8f3235d6..de4ac19ddb36 100644
--- a/pkgs/development/python-modules/cobble/default.nix
+++ b/pkgs/development/python-modules/cobble/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     "test_sub_sub_classes_are_included_in_abc"
   ];
 
-  passthru.updateScripts = gitUpdater { };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     description = "Create Python data objects";
diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index f08907499408..c1d4d8d169d2 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -9,25 +9,29 @@
   # dependencies
   fastavro,
   httpx,
-  httpx-sse,
   pydantic,
   pydantic-core,
   requests,
   tokenizers,
   types-requests,
   typing-extensions,
+
+  # optional-dependencies
+  aiohttp,
+  httpx-aiohttp,
+  oci,
 }:
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.21.1";
+  version = "6.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     tag = version;
-    hash = "sha256-RT4Sxk9fKunuyEXl2pvKgS6U82fPKjMPmSl9jwm+GBk=";
+    hash = "sha256-be6vhTGXnf1/iaD13VYjey/to+HX28VfmYlUPE2eFT4=";
   };
 
   build-system = [ poetry-core ];
@@ -35,7 +39,6 @@ buildPythonPackage rec {
   dependencies = [
     fastavro
     httpx
-    httpx-sse
     pydantic
     pydantic-core
     requests
@@ -44,7 +47,13 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  pythonRelaxDeps = [ "httpx-sse" ];
+  optional-dependencies = {
+    aiohttp = [
+      aiohttp
+      httpx-aiohttp
+    ];
+    oci = [ oci ];
+  };
 
   # tests require CO_API_KEY
   doCheck = false;
diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index cdd427f4d875..c3e7a7319b87 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "coiled";
-  version = "1.133.1";
+  version = "1.134.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-BAlj+ExOQtwogKC5JaJGCoEs1lSkIrVRBABElqXSc1c=";
+    hash = "sha256-frU9QzSYhEDrruxwSGuhX/VVCuQdI2cFg+G0QQmOHaU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/colcon/default.nix b/pkgs/development/python-modules/colcon/default.nix
index 4b8592491010..650ce4adc1f2 100644
--- a/pkgs/development/python-modules/colcon/default.nix
+++ b/pkgs/development/python-modules/colcon/default.nix
@@ -66,6 +66,8 @@ buildPythonPackage rec {
   pythonRemoveDeps = [
     # We use pytest-cov-stub instead (and it is not a runtime dependency anyways)
     "pytest-cov"
+    # Upper bound on setuptools is too strict for nixpkgs
+    "setuptools"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix
index 800bc6a88c15..896a3dffc1b8 100644
--- a/pkgs/development/python-modules/colored/default.nix
+++ b/pkgs/development/python-modules/colored/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "colored";
-  version = "2.3.1";
+  version = "2.3.2";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "dslackw";
     repo = "colored";
     tag = version;
-    hash = "sha256-PPaPw7pCZJeBz6h5omZ+kcRXsqi6ncLYGM7FNfZ0r4w=";
+    hash = "sha256-MnRWb9uQczkwikyorkS77PTpajCG6M/FZibm4ww+xC4=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/connect-box/default.nix b/pkgs/development/python-modules/connect-box/default.nix
index 3376f3ea67ed..f34d7dbc1ba4 100644
--- a/pkgs/development/python-modules/connect-box/default.nix
+++ b/pkgs/development/python-modules/connect-box/default.nix
@@ -41,10 +41,9 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "connect_box" ];
 
-  pytestFlagsArray = [
+  pytestFlags = [
     "--vcr-record=none"
-    "-W"
-    "ignore::DeprecationWarning"
+    "-Wignore::DeprecationWarning"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix
index da2a8d11f986..900b61320bc5 100644
--- a/pkgs/development/python-modules/container-inspector/default.nix
+++ b/pkgs/development/python-modules/container-inspector/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Suite of analysis utilities and command line tools for container images";
     homepage = "https://github.com/nexB/container-inspector";
-    changelog = "https://github.com/nexB/container-inspector/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/nexB/container-inspector/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix
index 7087383d8e06..e3f1412d82da 100644
--- a/pkgs/development/python-modules/copier/default.nix
+++ b/pkgs/development/python-modules/copier/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "copier";
-  version = "9.14.3";
+  version = "9.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm $out/tests/demo/doc/ma*ana.txt
     '';
-    hash = "sha256-wRYqpdMsxm2AHaLpdhsdkC6oDZP2a3VXJx/pNNrQieM=";
+    hash = "sha256-KHmnY8+65KdO9wzywiY8fYAVgyMChSUWbEW569IFYnk=";
   };
 
   env.POETRY_DYNAMIC_VERSIONING_BYPASS = version;
diff --git a/pkgs/development/python-modules/country-list/default.nix b/pkgs/development/python-modules/country-list/default.nix
index 8e4ee9ab6d95..2a301e1f6c33 100644
--- a/pkgs/development/python-modules/country-list/default.nix
+++ b/pkgs/development/python-modules/country-list/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [
+  enabledTestPaths = [
     "tests.py"
   ];
 
diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix
index f0f36c5833d8..854b034af747 100644
--- a/pkgs/development/python-modules/crate/default.nix
+++ b/pkgs/development/python-modules/crate/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/crate/crate-python";
     description = "Python client library for CrateDB";
-    changelog = "https://github.com/crate/crate-python/blob/${version}/CHANGES.txt";
+    changelog = "https://github.com/crate/crate-python/blob/${version}/CHANGES.rst";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ doronbehar ];
   };
diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix
index f0fbc27cc802..6fc1b8d17010 100644
--- a/pkgs/development/python-modules/crewai/default.nix
+++ b/pkgs/development/python-modules/crewai/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  nix-update-script,
 
   # build-system
   hatchling,
@@ -55,14 +56,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "crewai";
-  version = "1.14.1";
+  version = "1.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "crewAIInc";
     repo = "crewAI";
     tag = finalAttrs.version;
-    hash = "sha256-MwBcum9HX0emKPB0UpTCBTvZRnNP0YqU02YCEHZ4CeA=";
+    hash = "sha256-AMGAo2fllV4RasRXoeOpJii8aWfu7/JW1iXp3VgTGVo=";
   };
 
   postPatch = ''
@@ -534,6 +535,9 @@ buildPythonPackage (finalAttrs: {
     "test_azure_agent_with_native_tool_calling"
     "test_azure_agent_kickoff_with_tools_mocked"
     "test_azure_streaming_emits_tool_call_events"
+
+    # Tests time dependent
+    "test_older_than"
   ];
 
   nativeCheckInputs = [
@@ -552,10 +556,17 @@ buildPythonPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  pytestFlagsArray = [
+  pytestFlags = [
     "--override-ini=addopts="
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^([0-9]+\\.[0-9]+\\.[0-9]+)$"
+    ];
+  };
+
   meta = {
     description = "Framework for orchestrating role-playing, autonomous AI agents";
     homepage = "https://github.com/crewAIInc/crewAI";
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 9f15dc7baaa2..d5f2eb5d2711 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "46.0.5";
+  version = "46.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyca";
     repo = "cryptography";
     tag = version;
-    hash = "sha256-jzdkAVMnKr0z1MBUgs6xjLnTZrqNOBwq3w56JDwgFgk=";
+    hash = "sha256-b6wQnPEf18ViqQVch+Jg1w0Cn372QKxLknD9rL4JjxY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index 1cc7266a5e85..2c5b04fd2c12 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools-scm,
+  encutils,
   more-itertools,
   cssselect,
   jaraco-test,
@@ -13,19 +14,27 @@
 
 buildPythonPackage rec {
   pname = "cssutils";
-  version = "2.11.1";
+  version = "2.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jaraco";
     repo = "cssutils";
     tag = "v${version}";
-    hash = "sha256-U9myMfKz1HpYVJXp85izRBpm2wjLHYZj8bUVt3ROTEg=";
+    hash = "sha256-K9jbuX7AueSB3AB7PAVjpQhzb3Umn9OoHaL4RrMzKEs=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"coherent.licensed",' ""
+  '';
+
   build-system = [ setuptools-scm ];
 
-  dependencies = [ more-itertools ];
+  dependencies = [
+    encutils
+    more-itertools
+  ];
 
   nativeCheckInputs = [
     cssselect
@@ -37,7 +46,6 @@ buildPythonPackage rec {
 
   disabledTests = [
     # access network
-    "encutils"
     "website.logging"
   ];
 
@@ -46,7 +54,7 @@ buildPythonPackage rec {
   meta = {
     description = "CSS Cascading Style Sheets library for Python";
     homepage = "https://github.com/jaraco/cssutils";
-    changelog = "https://github.com/jaraco/cssutils/blob/${src.rev}/NEWS.rst";
+    changelog = "https://github.com/jaraco/cssutils/blob/${src.tag}/NEWS.rst";
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
diff --git a/pkgs/development/python-modules/csv2md/default.nix b/pkgs/development/python-modules/csv2md/default.nix
index 9cbc322bf0ca..15c0ad1029c1 100644
--- a/pkgs/development/python-modules/csv2md/default.nix
+++ b/pkgs/development/python-modules/csv2md/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "csv2md";
-  version = "1.5.0";
+  version = "1.6.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "lzakharov";
     repo = "csv2md";
     rev = "v${version}";
-    hash = "sha256-xIcDBmLLB6cU5M05tOGRcwPmHCXRSXELv7TuaMEfVEg=";
+    hash = "sha256-51MCeM/zfjYMhB8Ryt1RMevEwszAzgYrJsyViEIOYVY=";
   };
 
   pythonImportsCheck = [ "csv2md" ];
diff --git a/pkgs/development/python-modules/cuda-bindings/12_9.nix b/pkgs/development/python-modules/cuda-bindings/12_9.nix
new file mode 100644
index 000000000000..c7e178a8560d
--- /dev/null
+++ b/pkgs/development/python-modules/cuda-bindings/12_9.nix
@@ -0,0 +1,43 @@
+{
+  replaceVars,
+  cudaLibPaths,
+}:
+{
+  version = "12.9.6";
+  sourceHash = "sha256-uRv27h2b6wXC8oOf5k2KxZ0bUFNvNu6XO05FBbJcU1k=";
+
+  nvidiaLibsPatch = replaceVars ./patch-nvidia-libs-paths_12_9.patch {
+    inherit (cudaLibPaths)
+      libcudart
+      libcufile
+      libnvfatbin
+      libnvjitlink
+      libnvml
+      libnvrtc
+      libnvvm
+      ;
+  };
+
+  pythonImportsCheck = [
+    "cuda.bindings.nvfatbin"
+    "cuda.bindings.nvml"
+  ];
+
+  disabledTests = [
+    # sysfs cpu topology is not available in the sandbox, causing:
+    #   cuda.bindings.nvml.UnknownError: Unknown Error
+    #   hwloc/linux: failed to find sysfs cpu topology directory, aborting linux discovery.
+    "test_device_get_cpu_affinity_within_scope"
+    "test_device_get_memory_affinity"
+
+    # Requires the nvidia_fs kernel module (GPUDirect Storage), causing:
+    #   cuda.bindings.cufile.cuFileError: NVFS_SETUP_ERROR (5033): NVFS driver initialization error
+    "test_buf_register_already_registered"
+    "test_buf_register_host_memory"
+    "test_buf_register_invalid_flags"
+    "test_buf_register_large_buffer"
+    "test_buf_register_multiple_buffers"
+    "test_buf_register_simple"
+    "test_driver_open"
+  ];
+}
diff --git a/pkgs/development/python-modules/cuda-bindings/13_0.nix b/pkgs/development/python-modules/cuda-bindings/13_0.nix
new file mode 100644
index 000000000000..d3cbcc6120cb
--- /dev/null
+++ b/pkgs/development/python-modules/cuda-bindings/13_0.nix
@@ -0,0 +1,40 @@
+{
+  replaceVars,
+  cudaLibPaths,
+}:
+{
+  version = "13.0.3";
+  sourceHash = "sha256-Uq1oQWtilocQPh6cZ3P/L/L6caCHv17u1y67sm5fhhA=";
+
+  nvidiaLibsPatch = replaceVars ./patch-nvidia-libs-paths_13_0.patch {
+    inherit (cudaLibPaths)
+      libcudart
+      libcufile
+      libnvjitlink
+      libnvrtc
+      libnvvm
+      ;
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "cython>=3.1,<3.2" "cython"
+  '';
+
+  disabledTests = [
+    # Requires the nvidia_fs kernel module (GPUDirect Storage), causing:
+    #   cuda.bindings.cufile.cuFileError: NVFS_SETUP_ERROR (5033): NVFS driver initialization error
+    "test_buf_register_already_registered"
+    "test_buf_register_host_memory"
+    "test_buf_register_invalid_flags"
+    "test_buf_register_large_buffer"
+    "test_buf_register_multiple_buffers"
+    "test_buf_register_simple"
+    "test_driver_open"
+    "test_get_bar_size_in_kb"
+    "test_get_parameter_min_max_value"
+    "test_set_parameter_posix_pool_slab_array"
+    "test_set_stats_level"
+    "test_stats_start_stop"
+  ];
+}
diff --git a/pkgs/development/python-modules/cuda-bindings/13_1.nix b/pkgs/development/python-modules/cuda-bindings/13_1.nix
new file mode 100644
index 000000000000..882b1632cec6
--- /dev/null
+++ b/pkgs/development/python-modules/cuda-bindings/13_1.nix
@@ -0,0 +1,45 @@
+{
+  replaceVars,
+  cudaLibPaths,
+}:
+{
+  version = "13.1.1";
+  sourceHash = "sha256-AvIw2G4EGWsX7PxFGxzECXhwkbwYslHzRdUArTNf7jE=";
+
+  nvidiaLibsPatch = replaceVars ./patch-nvidia-libs-paths_13_1.patch {
+    inherit (cudaLibPaths)
+      libcudart
+      libcufile
+      libnvjitlink
+      libnvml
+      libnvrtc
+      libnvvm
+      ;
+  };
+
+  pythonImportsCheck = [
+    "cuda.bindings._nvml"
+  ];
+
+  disabledTests = [
+    # sysfs cpu topology is not available in the sandbox, causing:
+    #   cuda.bindings._nvml.UnknownError: Unknown Error
+    #   hwloc/linux: failed to find sysfs cpu topology directory, aborting linux discovery.
+    "test_device_get_cpu_affinity_within_scope"
+    "test_device_get_memory_affinity"
+
+    # Requires the nvidia_fs kernel module (GPUDirect Storage), causing:
+    #   cuda.bindings.cufile.cuFileError: NVFS_SETUP_ERROR (5033): NVFS driver initialization error
+    "test_buf_register_already_registered"
+    "test_buf_register_host_memory"
+    "test_buf_register_invalid_flags"
+    "test_buf_register_large_buffer"
+    "test_buf_register_multiple_buffers"
+    "test_buf_register_simple"
+    "test_get_bar_size_in_kb"
+    "test_get_parameter_min_max_value"
+    "test_set_parameter_posix_pool_slab_array"
+    "test_set_stats_level"
+    "test_stats_start_stop"
+  ];
+}
diff --git a/pkgs/development/python-modules/cuda-bindings/13_2.nix b/pkgs/development/python-modules/cuda-bindings/13_2.nix
new file mode 100644
index 000000000000..a2ce0c462b39
--- /dev/null
+++ b/pkgs/development/python-modules/cuda-bindings/13_2.nix
@@ -0,0 +1,50 @@
+{
+  replaceVars,
+  cudaLibPaths,
+}:
+{
+  version = "13.2.0";
+  sourceHash = "sha256-VOaRjZwg1phGjkOeXjWMcs/vjlPMNKiVSKyKrQG5ohM=";
+
+  nvidiaLibsPatch = replaceVars ./patch-nvidia-libs-paths_13_2.patch {
+    inherit (cudaLibPaths)
+      libcudart
+      libcufile
+      libnvfatbin
+      libnvjitlink
+      libnvml
+      libnvrtc
+      libnvvm
+      ;
+  };
+
+  pythonImportsCheck = [
+    "cuda.bindings.nvfatbin"
+    "cuda.bindings.nvml"
+  ];
+
+  disabledTests = [
+    # Requires GPU discovery support not available in the test environment
+    "test_discover_gpus"
+
+    # sysfs cpu topology is not available in the sandbox, causing:
+    #   cuda.bindings.nvml.UnknownError: Unknown Error
+    #   hwloc/linux: failed to find sysfs cpu topology directory, aborting linux discovery.
+    "test_device_get_cpu_affinity_within_scope"
+    "test_device_get_memory_affinity"
+
+    # Requires the nvidia_fs kernel module (GPUDirect Storage), causing:
+    #   cuda.bindings.cufile.cuFileError: NVFS_SETUP_ERROR (5033): NVFS driver initialization error
+    "test_buf_register_already_registered"
+    "test_buf_register_host_memory"
+    "test_buf_register_invalid_flags"
+    "test_buf_register_large_buffer"
+    "test_buf_register_multiple_buffers"
+    "test_buf_register_simple"
+    "test_get_bar_size_in_kb"
+    "test_get_parameter_min_max_value"
+    "test_set_parameter_posix_pool_slab_array"
+    "test_set_stats_level"
+    "test_stats_start_stop"
+  ];
+}
diff --git a/pkgs/development/python-modules/cuda-bindings/default.nix b/pkgs/development/python-modules/cuda-bindings/default.nix
index 69fd864aa433..c7a3dcbba44c 100644
--- a/pkgs/development/python-modules/cuda-bindings/default.nix
+++ b/pkgs/development/python-modules/cuda-bindings/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   cudaPackages,
+  replaceVars,
   addDriverRunpath,
 
   # build-system
@@ -15,19 +16,52 @@
   symlinkJoin,
 
   # dependencies
-  cuda-pathfinder,
+  numpy,
 
   # tests
-  numpy,
+  cuda-pathfinder,
+  pytest-benchmark,
   pytestCheckHook,
+  util-linux,
 
   # passthru
   cuda-bindings,
 }:
 
+let
+  cudaVersion = cudaPackages.cudaMajorMinorVersion;
+
+  versionSpecificAttrs =
+    let
+      args = {
+        inherit replaceVars;
+        cudaLibPaths = {
+          libcudart = lib.getLib cudaPackages.cuda_cudart;
+          libcufile = lib.getLib cudaPackages.libcufile;
+          libnvfatbin = lib.getLib cudaPackages.libnvfatbin;
+          libnvjitlink = lib.getLib cudaPackages.libnvjitlink;
+          libnvml = addDriverRunpath.driverLink;
+          libnvrtc = lib.getLib cudaPackages.cuda_nvrtc;
+          libnvvm =
+            if cudaOlder "13.0" then "${cudaPackages.cuda_nvcc}/nvvm" else lib.getLib cudaPackages.libnvvm;
+        };
+      };
+    in
+    {
+      # cuda-bindings patch versions DO NOT correspond to cuda toolkits' own path versions.
+      # Only major.minor is supposed to match
+      "12.9" = import ./12_9.nix args;
+      "13.0" = import ./13_0.nix args;
+      "13.1" = import ./13_1.nix args;
+      "13.2" = import ./13_2.nix args;
+    }
+    .${cudaVersion} or (throw "Unsupported cuda-bindings version: ${cudaVersion}");
+
+  inherit (cudaPackages) cudaOlder cudaAtLeast;
+in
 buildPythonPackage (finalAttrs: {
   pname = "cuda-bindings";
-  version = "12.9.6";
+  inherit (versionSpecificAttrs) version;
   pyproject = true;
   __structuredAttrs = true;
 
@@ -35,9 +69,16 @@ buildPythonPackage (finalAttrs: {
     owner = "NVIDIA";
     repo = "cuda-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uRv27h2b6wXC8oOf5k2KxZ0bUFNvNu6XO05FBbJcU1k=";
+    hash = versionSpecificAttrs.sourceHash;
   };
 
+  # Apply patch relative to cuda_bindings
+  patchFlags = [ "-p2" ];
+
+  patches = [
+    versionSpecificAttrs.nvidiaLibsPatch
+  ];
+
   sourceRoot = "${finalAttrs.src.name}/cuda_bindings";
 
   postPatch =
@@ -61,7 +102,8 @@ buildPythonPackage (finalAttrs: {
         --replace-fail \
           "path = 'libcuda.so.1'" \
           "path = '${libCudaPath}/lib/libcuda.so.1'"
-    '';
+    ''
+    + (versionSpecificAttrs.postPatch or "");
 
   preBuild = ''
     export CUDA_PYTHON_PARALLEL_LEVEL=$NIX_BUILD_CORES
@@ -86,43 +128,65 @@ buildPythonPackage (finalAttrs: {
   };
 
   buildInputs = [
-    cudaPackages.cuda_nvcc # crt/host_defines.h
     cudaPackages.libcufile # cufile.h
+  ]
+  # Until 13.0, crt headers are shipped in nvcc
+  ++ lib.optionals (cudaOlder "13.0") [
+    cudaPackages.cuda_nvcc # crt/host_defines.h
+  ]
+  ++ lib.optionals (cudaAtLeast "13.0") [
+    cudaPackages.cuda_crt # crt/host_defines.h
   ];
 
+  pythonRemoveDeps = [
+    # We circumvent cuda_pathfinder to localize nvidia libs with patches
+    "cuda-pathfinder"
+  ];
   dependencies = [
-    cuda-pathfinder
+    # Not explicitly listed as a dependency, but is required at import time
+    numpy
   ];
 
   pythonImportsCheck = [
     "cuda"
-    "cuda.cuda"
-    "cuda.cudart"
-    "cuda.nvrtc"
-  ];
+    "cuda.bindings.cufile"
+    "cuda.bindings.driver"
+    "cuda.bindings.nvjitlink"
+    "cuda.bindings.nvrtc"
+    "cuda.bindings.nvvm"
+    "cuda.bindings.runtime"
+  ]
+  ++ (versionSpecificAttrs.pythonImportsCheck or [ ]);
 
   preCheck = ''
     rm -rf cuda
   '';
 
   nativeCheckInputs = [
-    numpy
     pytestCheckHook
+  ]
+  ++ lib.optionals (cudaPackages.cudaAtLeast "13.0") [
+    # Although we don't want cuda.pathfinder as a dependency (to handle dlopens), it is imported by
+    # some tests
+    cuda-pathfinder
+
+    pytest-benchmark
+    util-linux # findmnt
   ];
 
   enabledTestPaths = [
     "tests/"
   ];
 
-  disabledTestPaths = [
+  disabledTestPaths = lib.optionals (cudaOlder "13.0") [
     # The current driver shipped in NixOS (590.48.01) advertises CUDA 13.1, causing the following
     # error:
     # cuda.bindings._internal.utils.NotSupportedError: only CUDA 12 driver is supported
-    #
-    # Ideally, we should transition to cuda 13 across the whole nixpkgs tree.
     "tests/test_nvjitlink.py"
   ];
 
+  disabledTests = versionSpecificAttrs.disabledTests or [ ];
+
   # Tests need access to a GPU
   doCheck = false;
   passthru.gpuCheck = cuda-bindings.overridePythonAttrs {
diff --git a/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_12_9.patch b/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_12_9.patch
new file mode 100644
index 000000000000..abfdf8f5aa4e
--- /dev/null
+++ b/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_12_9.patch
@@ -0,0 +1,178 @@
+diff --git a/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in b/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
+index f684be6870..9437de642b 100644
+--- a/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
++++ b/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
+@@ -8,7 +8,7 @@ cimport cuda.bindings._lib.windll as windll
+ {{else}}
+ cimport cuda.bindings._lib.dlfcn as dlfcn
+ {{endif}}
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ 
+@@ -47,7 +47,7 @@ cdef int _cuPythonInit() except -1 nogil:
+     # Load library
+     with gil, __symbol_lock:
+         {{if 'Windows' == platform.system()}}
+-        handle = load_nvidia_dynamic_lib("nvrtc")._handle_uint
++        handle = CDLL("@libnvrtc@/lib/libnvrtc.so")._handle
+ 
+         # Load function
+         {{if 'nvrtcGetErrorString' in found_functions}}
+@@ -156,7 +156,7 @@ cdef int _cuPythonInit() except -1 nogil:
+         {{endif}}
+ 
+         {{else}}
+-        handle = <void*><uintptr_t>(load_nvidia_dynamic_lib("nvrtc")._handle_uint)
++        handle = <void*><uintptr_t>(CDLL("@libnvrtc@/lib/libnvrtc.so")._handle)
+ 
+         # Load function
+         {{if 'nvrtcGetErrorString' in found_functions}}
+diff --git a/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx b/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
+index 78ea77b283..0b875a6cd3 100644
+--- a/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
+@@ -9,7 +9,7 @@ import threading
+ 
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ import cython
+ 
+@@ -95,7 +95,7 @@ cdef void* __cuFileSetParameterString = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("cufile")._handle_uint
++    cdef uintptr_t handle = CDLL("@libcufile@/lib/libcufile.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx
+index f5a9bbd218..8271f7aa20 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx
+@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -73,7 +73,7 @@ cdef void* __nvFatbinAddTileIR = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvfatbin")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvfatbin@/lib/libnvfatbin.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
+index d676aac372..ed3c000566 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
+@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -76,7 +76,7 @@ cdef void* __nvJitLinkVersion = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvJitLink")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvjitlink@/lib/libnvJitLink.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx
+index 28f0919423..852f75e46d 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx
+@@ -10,7 +10,7 @@ import threading
+ 
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -406,7 +406,7 @@ cdef void* __nvmlDeviceSetRusdSettings_v1 = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvml")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvml@/lib/libnvidia-ml.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
+index 8a84834a9a..a3ced66807 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
+@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -75,7 +75,7 @@ cdef void* __nvvmGetProgramLog = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvvm")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvvm@/lib/libnvvm.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/cyruntime.pyx.in b/cuda_bindings/cuda/bindings/cyruntime.pyx.in
+index 5cd65fbd96..fbbcffbbb7 100644
+--- a/cuda_bindings/cuda/bindings/cyruntime.pyx.in
++++ b/cuda_bindings/cuda/bindings/cyruntime.pyx.in
+@@ -1874,7 +1874,7 @@ cdef cudaError_t cudaGraphicsVDPAURegisterOutputSurface(cudaGraphicsResource** r
+ {{if True}}
+ 
+ from libc.stdint cimport uintptr_t
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ {{if 'Windows' == platform.system()}}
+ cimport cuda.bindings._lib.windll as windll
+ {{else}}
+@@ -1884,11 +1884,11 @@ cimport cuda.bindings._lib.dlfcn as dlfcn
+ cdef cudaError_t getLocalRuntimeVersion(int* runtimeVersion) except ?cudaErrorCallRequiresNewerDriver nogil:
+     # Load
+     with gil:
+-        loaded_dl = load_nvidia_dynamic_lib("cudart")
++        loaded_dl = CDLL("@libcudart@/lib/libcudart.so")
+         {{if 'Windows' == platform.system()}}
+-        handle = <uintptr_t>loaded_dl._handle_uint
++        handle = <uintptr_t>loaded_dl._handle
+         {{else}}
+-        handle = <void *><uintptr_t>loaded_dl._handle_uint
++        handle = <void *><uintptr_t>loaded_dl._handle
+         {{endif}}
+ 
+     {{if 'Windows' == platform.system()}}
+diff --git a/cuda_bindings/cuda/bindings/nvml.pyx b/cuda_bindings/cuda/bindings/nvml.pyx
+index 42c9fdcc87..0661379a68 100644
+--- a/cuda_bindings/cuda/bindings/nvml.pyx
++++ b/cuda_bindings/cuda/bindings/nvml.pyx
+@@ -27471,4 +27471,3 @@ cpdef str vgpu_type_get_name(unsigned int vgpu_type_id):
+         __status__ = nvmlVgpuTypeGetName(<nvmlVgpuTypeId_t>vgpu_type_id, vgpu_type_name, <unsigned int*>size)
+     check_status(__status__)
+     return cpython.PyUnicode_FromStringAndSize(vgpu_type_name, size[0])
+-
diff --git a/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_0.patch b/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_0.patch
new file mode 100644
index 000000000000..fe21e832c58e
--- /dev/null
+++ b/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_0.patch
@@ -0,0 +1,125 @@
+diff --git a/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in b/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
+index 8409032852..b3a04478c2 100644
+--- a/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
++++ b/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
+@@ -8,7 +8,7 @@ cimport cuda.bindings._lib.windll as windll
+ {{else}}
+ cimport cuda.bindings._lib.dlfcn as dlfcn
+ {{endif}}
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ 
+@@ -45,7 +45,7 @@ cdef int _cuPythonInit() except -1 nogil:
+     # Load library
+     with gil, __symbol_lock:
+         {{if 'Windows' == platform.system()}}
+-        handle = load_nvidia_dynamic_lib("nvrtc")._handle_uint
++        handle = CDLL("@libnvrtc@/lib/libnvrtc.so")._handle
+ 
+         # Load function
+         {{if 'nvrtcGetErrorString' in found_functions}}
+@@ -146,7 +146,7 @@ cdef int _cuPythonInit() except -1 nogil:
+         {{endif}}
+ 
+         {{else}}
+-        handle = <void*><uintptr_t>(load_nvidia_dynamic_lib("nvrtc")._handle_uint)
++        handle = <void*><uintptr_t>(CDLL("@libnvrtc@/lib/libnvrtc.so")._handle)
+ 
+         # Load function
+         {{if 'nvrtcGetErrorString' in found_functions}}
+diff --git a/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx b/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
+index 33b6384647..9fe3eb78e4 100644
+--- a/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
+@@ -9,7 +9,7 @@ import threading
+ 
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ import cython
+ 
+@@ -107,7 +107,7 @@ cdef void* __cuFileGetParameterPosixPoolSlabArray = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("cufile")._handle_uint
++    cdef uintptr_t handle = CDLL("@libcufile@/lib/libcufile.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
+index a8e2b4e56b..917facb824 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
+@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -76,7 +76,7 @@ cdef void* __nvJitLinkVersion = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvJitLink")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvjitlink@/lib/libnvJitLink.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
+index 64d97334b9..d325e68ea7 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
+@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -75,7 +75,7 @@ cdef void* __nvvmGetProgramLog = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvvm")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvvm@/lib/libnvvm.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/cyruntime.pyx.in b/cuda_bindings/cuda/bindings/cyruntime.pyx.in
+index 3031e43d2f..bb83421b46 100644
+--- a/cuda_bindings/cuda/bindings/cyruntime.pyx.in
++++ b/cuda_bindings/cuda/bindings/cyruntime.pyx.in
+@@ -1886,7 +1886,7 @@ cdef cudaError_t cudaGraphicsVDPAURegisterOutputSurface(cudaGraphicsResource** r
+ {{if True}}
+ 
+ from libc.stdint cimport uintptr_t
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ {{if 'Windows' == platform.system()}}
+ cimport cuda.bindings._lib.windll as windll
+ {{else}}
+@@ -1896,11 +1896,11 @@ cimport cuda.bindings._lib.dlfcn as dlfcn
+ cdef cudaError_t getLocalRuntimeVersion(int* runtimeVersion) except ?cudaErrorCallRequiresNewerDriver nogil:
+     # Load
+     with gil:
+-        loaded_dl = load_nvidia_dynamic_lib("cudart")
++        loaded_dl = CDLL("@libcudart@/lib/libcudart.so")
+         {{if 'Windows' == platform.system()}}
+-        handle = <uintptr_t>loaded_dl._handle_uint
++        handle = <uintptr_t>loaded_dl._handle
+         {{else}}
+-        handle = <void *><uintptr_t>loaded_dl._handle_uint
++        handle = <void *><uintptr_t>loaded_dl._handle
+         {{endif}}
+ 
+     {{if 'Windows' == platform.system()}}
diff --git a/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_1.patch b/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_1.patch
new file mode 100644
index 000000000000..0585ca7500ae
--- /dev/null
+++ b/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_1.patch
@@ -0,0 +1,147 @@
+diff --git a/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in b/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
+index 608aebd1af..7f60917f71 100644
+--- a/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
++++ b/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
+@@ -8,7 +8,7 @@ cimport cuda.bindings._lib.windll as windll
+ {{else}}
+ cimport cuda.bindings._lib.dlfcn as dlfcn
+ {{endif}}
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ 
+@@ -45,7 +45,7 @@ cdef int _cuPythonInit() except -1 nogil:
+     # Load library
+     with gil, __symbol_lock:
+         {{if 'Windows' == platform.system()}}
+-        handle = load_nvidia_dynamic_lib("nvrtc")._handle_uint
++        handle = CDLL("@libnvrtc@/lib/libnvrtc.so")._handle
+ 
+         # Load function
+         {{if 'nvrtcGetErrorString' in found_functions}}
+@@ -146,7 +146,7 @@ cdef int _cuPythonInit() except -1 nogil:
+         {{endif}}
+ 
+         {{else}}
+-        handle = <void*><uintptr_t>(load_nvidia_dynamic_lib("nvrtc")._handle_uint)
++        handle = <void*><uintptr_t>(CDLL("@libnvrtc@/lib/libnvrtc.so")._handle)
+ 
+         # Load function
+         {{if 'nvrtcGetErrorString' in found_functions}}
+diff --git a/cuda_bindings/cuda/bindings/_internal/_nvml_linux.pyx b/cuda_bindings/cuda/bindings/_internal/_nvml_linux.pyx
+index 1622cc82aa..ddff5dad75 100644
+--- a/cuda_bindings/cuda/bindings/_internal/_nvml_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/_nvml_linux.pyx
+@@ -10,7 +10,7 @@ import threading
+ 
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -410,7 +410,7 @@ cdef void* __nvmlDeviceGetSramUniqueUncorrectedEccErrorCounts = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    return dlopen("libnvidia-ml.so.1", RTLD_NOW | RTLD_GLOBAL)
++    return dlopen("@libnvml@/lib/libnvidia-ml.so.1", RTLD_NOW | RTLD_GLOBAL)
+ 
+ 
+ cdef int _init_nvml() except -1 nogil:
+diff --git a/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx b/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
+index c64eb00c5c..9ba4ea2727 100644
+--- a/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
+@@ -9,7 +9,7 @@ import threading
+ 
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ import cython
+ 
+@@ -107,7 +107,7 @@ cdef void* __cuFileGetParameterPosixPoolSlabArray = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("cufile")._handle_uint
++    cdef uintptr_t handle = CDLL("@libcufile@/lib/libcufile.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
+index 8c96b6d640..96761a95ae 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
+@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -76,7 +76,7 @@ cdef void* __nvJitLinkVersion = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvJitLink")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvjitlink@/lib/libnvJitLink.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
+index 408a2cb592..2b31888e1f 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
+@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -75,7 +75,7 @@ cdef void* __nvvmGetProgramLog = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvvm")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvvm@/lib/libnvvm.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/cyruntime.pyx.in b/cuda_bindings/cuda/bindings/cyruntime.pyx.in
+index 248346d274..e041b41d69 100644
+--- a/cuda_bindings/cuda/bindings/cyruntime.pyx.in
++++ b/cuda_bindings/cuda/bindings/cyruntime.pyx.in
+@@ -2012,7 +2012,7 @@ cdef cudaError_t cudaGraphicsVDPAURegisterOutputSurface(cudaGraphicsResource** r
+ {{if True}}
+ 
+ from libc.stdint cimport uintptr_t
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ {{if 'Windows' == platform.system()}}
+ cimport cuda.bindings._lib.windll as windll
+ {{else}}
+@@ -2022,11 +2022,11 @@ cimport cuda.bindings._lib.dlfcn as dlfcn
+ cdef cudaError_t getLocalRuntimeVersion(int* runtimeVersion) except ?cudaErrorCallRequiresNewerDriver nogil:
+     # Load
+     with gil:
+-        loaded_dl = load_nvidia_dynamic_lib("cudart")
++        loaded_dl = CDLL("@libcudart@/lib/libcudart.so")
+         {{if 'Windows' == platform.system()}}
+-        handle = <uintptr_t>loaded_dl._handle_uint
++        handle = <uintptr_t>loaded_dl._handle
+         {{else}}
+-        handle = <void *><uintptr_t>loaded_dl._handle_uint
++        handle = <void *><uintptr_t>loaded_dl._handle
+         {{endif}}
+ 
+     {{if 'Windows' == platform.system()}}
diff --git a/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_2.patch b/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_2.patch
new file mode 100644
index 000000000000..f0cabbad67d5
--- /dev/null
+++ b/pkgs/development/python-modules/cuda-bindings/patch-nvidia-libs-paths_13_2.patch
@@ -0,0 +1,169 @@
+diff --git a/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in b/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
+index 534dcb55cb..bd3feb2760 100644
+--- a/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
++++ b/cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx.in
+@@ -8,7 +8,7 @@ cimport cuda.bindings._lib.windll as windll
+ {{else}}
+ cimport cuda.bindings._lib.dlfcn as dlfcn
+ {{endif}}
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ 
+@@ -47,7 +47,7 @@ cdef int _cuPythonInit() except -1 nogil:
+     # Load library
+     with gil, __symbol_lock:
+         {{if 'Windows' == platform.system()}}
+-        handle = load_nvidia_dynamic_lib("nvrtc")._handle_uint
++        handle = CDLL("@libnvrtc@/lib/libnvrtc.so")._handle
+ 
+         # Load function
+         {{if 'nvrtcGetErrorString' in found_functions}}
+@@ -156,7 +156,7 @@ cdef int _cuPythonInit() except -1 nogil:
+         {{endif}}
+ 
+         {{else}}
+-        handle = <void*><uintptr_t>(load_nvidia_dynamic_lib("nvrtc")._handle_uint)
++        handle = <void*><uintptr_t>(CDLL("@libnvrtc@/lib/libnvrtc.so")._handle)
+ 
+         # Load function
+         {{if 'nvrtcGetErrorString' in found_functions}}
+diff --git a/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx b/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
+index 5231808058..f74cf1daec 100644
+--- a/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
+@@ -9,7 +9,7 @@ import threading
+ 
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ import cython
+ 
+@@ -107,7 +107,7 @@ cdef void* __cuFileGetParameterPosixPoolSlabArray = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("cufile")._handle_uint
++    cdef uintptr_t handle = CDLL("@libcufile@/lib/libcufile.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx
+index f5a9bbd218..8271f7aa20 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx
+@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -73,7 +73,7 @@ cdef void* __nvFatbinAddTileIR = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvfatbin")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvfatbin@/lib/libnvfatbin.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
+index d676aac372..ed3c000566 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
+@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -76,7 +76,7 @@ cdef void* __nvJitLinkVersion = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvJitLink")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvjitlink@/lib/libnvJitLink.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx
+index 28f0919423..852f75e46d 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx
+@@ -10,7 +10,7 @@ import threading
+ 
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -406,7 +406,7 @@ cdef void* __nvmlDeviceSetRusdSettings_v1 = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvml")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvml@/lib/libnvidia-ml.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
+index 8a84834a9a..a3ced66807 100644
+--- a/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
++++ b/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
+@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
+ import threading
+ from .utils import FunctionNotFoundError, NotSupportedError
+ 
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ 
+ 
+ ###############################################################################
+@@ -75,7 +75,7 @@ cdef void* __nvvmGetProgramLog = NULL
+ 
+ 
+ cdef void* load_library() except* with gil:
+-    cdef uintptr_t handle = load_nvidia_dynamic_lib("nvvm")._handle_uint
++    cdef uintptr_t handle = CDLL("@libnvvm@/lib/libnvvm.so")._handle
+     return <void*>handle
+ 
+ 
+diff --git a/cuda_bindings/cuda/bindings/cyruntime.pyx.in b/cuda_bindings/cuda/bindings/cyruntime.pyx.in
+index 244410a382..769664e157 100644
+--- a/cuda_bindings/cuda/bindings/cyruntime.pyx.in
++++ b/cuda_bindings/cuda/bindings/cyruntime.pyx.in
+@@ -2042,7 +2042,7 @@ cdef cudaError_t cudaGraphicsVDPAURegisterOutputSurface(cudaGraphicsResource** r
+ {{if True}}
+ 
+ from libc.stdint cimport uintptr_t
+-from cuda.pathfinder import load_nvidia_dynamic_lib
++from ctypes import CDLL
+ {{if 'Windows' == platform.system()}}
+ cimport cuda.bindings._lib.windll as windll
+ {{else}}
+@@ -2052,11 +2052,11 @@ cimport cuda.bindings._lib.dlfcn as dlfcn
+ cdef cudaError_t getLocalRuntimeVersion(int* runtimeVersion) except ?cudaErrorCallRequiresNewerDriver nogil:
+     # Load
+     with gil:
+-        loaded_dl = load_nvidia_dynamic_lib("cudart")
++        loaded_dl = CDLL("@libcudart@/lib/libcudart.so")
+         {{if 'Windows' == platform.system()}}
+-        handle = <uintptr_t>loaded_dl._handle_uint
++        handle = <uintptr_t>loaded_dl._handle
+         {{else}}
+-        handle = <void *><uintptr_t>loaded_dl._handle_uint
++        handle = <void *><uintptr_t>loaded_dl._handle
+         {{endif}}
+ 
+     {{if 'Windows' == platform.system()}}
diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix
index e6f636dc8209..b4549e50e766 100644
--- a/pkgs/development/python-modules/curio/default.nix
+++ b/pkgs/development/python-modules/curio/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for performing concurrent I/O with coroutines in Python";
     homepage = "https://github.com/dabeaz/curio";
-    changelog = "https://github.com/dabeaz/curio/raw/${version}/CHANGES";
+    changelog = "https://github.com/dabeaz/curio/raw/${src.rev}/CHANGES";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.pbsds ];
   };
diff --git a/pkgs/development/python-modules/cwl-upgrader/default.nix b/pkgs/development/python-modules/cwl-upgrader/default.nix
index bf378e69b529..9ee9927b26af 100644
--- a/pkgs/development/python-modules/cwl-upgrader/default.nix
+++ b/pkgs/development/python-modules/cwl-upgrader/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Library to upgrade CWL syntax to a newer version";
     homepage = "https://github.com/common-workflow-language/cwl-upgrader";
-    changelog = "https://github.com/common-workflow-language/cwl-upgrader/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/common-workflow-language/cwl-upgrader/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "cwl-upgrader";
diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix
index e91507d1815b..2e57faa20b74 100644
--- a/pkgs/development/python-modules/cwl-utils/default.nix
+++ b/pkgs/development/python-modules/cwl-utils/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Utilities for CWL";
     homepage = "https://github.com/common-workflow-language/cwl-utils";
-    changelog = "https://github.com/common-workflow-language/cwl-utils/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/common-workflow-language/cwl-utils/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix
index 0f9f1d7fc3b3..1e0f96586424 100644
--- a/pkgs/development/python-modules/cx-freeze/default.nix
+++ b/pkgs/development/python-modules/cx-freeze/default.nix
@@ -17,10 +17,7 @@
   patchelf,
   dmgbuild,
 
-  # tests
-  anyio,
-  bcrypt,
-
+  darwin,
   python,
   pytest-mock,
   pytestCheckHook,
@@ -82,6 +79,9 @@ buildPythonPackage rec {
     pytestCheckHook
     writableTmpDirAsHomeHook
     versionCheckHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.sigtool
   ];
 
   versionCheckProgram = "${placeholder "out"}/bin/cxfreeze";
diff --git a/pkgs/development/python-modules/cx-logging/default.nix b/pkgs/development/python-modules/cx-logging/default.nix
index 17a358200068..fd984216f9e5 100644
--- a/pkgs/development/python-modules/cx-logging/default.nix
+++ b/pkgs/development/python-modules/cx-logging/default.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
@@ -21,6 +22,11 @@ buildPythonPackage (finalAttrs: {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "setuptools>=70.1,<75" "setuptools"
+  ''
+  # The flag -soname isn't recognized by the linker on darwin. Only -install_name is valid.
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace setup.py \
+      --replace-fail "-soname" "-install_name"
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix
index d65cd09759bc..4aa1d26ad9de 100644
--- a/pkgs/development/python-modules/databricks-sdk/default.nix
+++ b/pkgs/development/python-modules/databricks-sdk/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "databricks-sdk";
-  version = "0.102.0";
+  version = "0.105.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "databricks-sdk-py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WHy+JTdjgq7D+Iy7OTx5V8zLBpY4SNztL3UkPM9gIns=";
+    hash = "sha256-Xy5Yy5ZCp+9y2DqLMpzdO0KeT3KdRIMkogvou4eiyEI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/datasets/3.nix b/pkgs/development/python-modules/datasets/3.nix
new file mode 100644
index 000000000000..c8afbe89da5f
--- /dev/null
+++ b/pkgs/development/python-modules/datasets/3.nix
@@ -0,0 +1,85 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  # build-system
+  setuptools,
+
+  # dependencies
+  dill,
+  filelock,
+  fsspec,
+  httpx,
+  huggingface-hub,
+  multiprocess,
+  numpy,
+  pandas,
+  pyarrow,
+  pyyaml,
+  requests,
+  tqdm,
+  xxhash,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "datasets";
+  version = "3.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "huggingface";
+    repo = "datasets";
+    tag = finalAttrs.version;
+    hash = "sha256-/xhu0cDKfCEwrp9IzKd0+AeQky1198f9sba/pdutvAk=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    dill
+    filelock
+    fsspec
+    httpx
+    huggingface-hub
+    multiprocess
+    numpy
+    pandas
+    pyarrow
+    pyyaml
+    requests
+    tqdm
+    xxhash
+  ]
+  ++ fsspec.optional-dependencies.http;
+
+  pythonRelaxDeps = [
+    # https://github.com/huggingface/datasets/blob/a256b85cbc67aa3f0e75d32d6586afc507cf535b/setup.py#L117
+    # "pin until dill has official support for determinism"
+    "dill"
+    # https://github.com/huggingface/datasets/blob/4.5.0/setup.py#L127
+    "multiprocess"
+    # https://github.com/huggingface/datasets/blob/4.5.0/setup.py#L130
+    "fsspec"
+  ];
+
+  # Tests require pervasive internet access
+  doCheck = false;
+
+  # Module import will attempt to create a cache directory
+  postFixup = "export HF_MODULES_CACHE=$TMPDIR";
+
+  pythonImportsCheck = [ "datasets" ];
+
+  meta = {
+    description = "Open-access datasets and evaluation metrics for natural language processing";
+    mainProgram = "datasets-cli";
+    homepage = "https://github.com/huggingface/datasets";
+    changelog = "https://github.com/huggingface/datasets/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      osbm
+      malteneuss
+    ];
+  };
+})
diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index 9d40ebea0107..c6e3c172f8a5 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -20,7 +20,7 @@
   tqdm,
   xxhash,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "datasets";
   version = "4.5.0";
   pyproject = true;
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "datasets";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-K8JqIbYz3ZfT1t1h5dRGCo9kBQp0E+kElqzaw2InaOI=";
   };
 
@@ -75,8 +75,8 @@ buildPythonPackage rec {
     description = "Open-access datasets and evaluation metrics for natural language processing";
     mainProgram = "datasets-cli";
     homepage = "https://github.com/huggingface/datasets";
-    changelog = "https://github.com/huggingface/datasets/releases/tag/${src.tag}";
+    changelog = "https://github.com/huggingface/datasets/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ osbm ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index 2a83a163c223..8c9c845391d3 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -71,7 +71,7 @@ buildPythonPackage rec {
     description = "Data visualization toolchain based on aggregating into a grid";
     mainProgram = "datashader";
     homepage = "https://datashader.org";
-    changelog = "https://github.com/holoviz/datashader/blob/${src.tag}/CHANGELOG.rst";
+    changelog = "https://github.com/holoviz/datashader/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       nickcao
diff --git a/pkgs/development/python-modules/datasketch/default.nix b/pkgs/development/python-modules/datasketch/default.nix
index 8d2ff1f78571..3fa258565dbe 100644
--- a/pkgs/development/python-modules/datasketch/default.nix
+++ b/pkgs/development/python-modules/datasketch/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "datasketch";
-  version = "1.9.0";
+  version = "1.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ekzhu";
     repo = "datasketch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ijBkbY6OioK5RP8zAeCnwlbrwE0OHa4tbEnCOabLTqs=";
+    hash = "sha256-PSSu+ymAFWSsNRaAByGuUjoDSqzkiC0mwHpuD5YVFjA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix
index cc980dc937a7..1acc1ffc0c96 100644
--- a/pkgs/development/python-modules/dazl/default.nix
+++ b/pkgs/development/python-modules/dazl/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "dazl";
-  version = "8.8.0";
+  version = "8.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "digital-asset";
     repo = "dazl-client";
     tag = "v${version}";
-    hash = "sha256-8J7sSGOZSE/U8NPuOKIXtpEpvJwMUG/mctp/nN4OK5A=";
+    hash = "sha256-ZJBaamazyNAYU5xbUvNGLUV5OsyymCdJCoUvoUlIkm4=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix
index 449c1f270deb..307c83a50af9 100644
--- a/pkgs/development/python-modules/dbt-adapters/default.nix
+++ b/pkgs/development/python-modules/dbt-adapters/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "dbt-adapters";
-  version = "1.22.5";
+  version = "1.22.10";
   pyproject = true;
 
   # missing tags on GitHub
   src = fetchPypi {
     pname = "dbt_adapters";
     inherit version;
-    hash = "sha256-gN/NWm55NtvPp6hg4YtpZszpmUmjJRSHvPAou0e1GEI=";
+    hash = "sha256-KPyp+cLzEHBs4CyPew8pftyhTWvZeteSiqxVr0zily8=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix
index 4b256fd20002..4740da8e661c 100644
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "dbt-common";
-  version = "1.37.3-unstable-2026-03-02";
+  version = "1.37.3-unstable-2026-03-27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-common";
-    rev = "5b0fcac03a1a01e4001ef1ff75a4132cdb412886"; # They don't tag releases
-    hash = "sha256-b4nMtIkQ8RzBjVexwoiv+V26P/7emdSEEj58BdaggnM=";
+    rev = "db4a7b70486b5337bf0e387260211a418ac36936"; # They don't tag releases
+    hash = "sha256-FcnCg05z9yalhAU1eueZ0x+YEuAfCeYSUlecoEQvS6k=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix
index 476f1970b559..21460734c004 100644
--- a/pkgs/development/python-modules/dbt-snowflake/default.nix
+++ b/pkgs/development/python-modules/dbt-snowflake/default.nix
@@ -36,9 +36,9 @@ buildPythonPackage rec {
 
   enabledTestPaths = [ "tests/unit" ];
 
-  pytestFlagsArray = [
+  pytestFlags = [
     # pyproject.toml specifies -n auto which only pytest-xdist understands
-    "--override-ini addopts=''"
+    "--override-ini=addopts="
   ];
 
   pythonImportsCheck = [ "dbt.adapters.snowflake" ];
diff --git a/pkgs/development/python-modules/dbus-python/default.nix b/pkgs/development/python-modules/dbus-python/default.nix
index 0cc3713723af..ed518d645081 100644
--- a/pkgs/development/python-modules/dbus-python/default.nix
+++ b/pkgs/development/python-modules/dbus-python/default.nix
@@ -63,11 +63,6 @@ lib.fix (
       dbus-glib
     ];
 
-    pypaBuildFlags = [
-      # Don't discard meson build directory, still needed for tests!
-      "-Cbuild-dir=_meson-build"
-    ];
-
     mesonFlags = [ (lib.mesonBool "tests" finalPackage.doInstallCheck) ];
 
     # workaround bug in meson-python
@@ -87,7 +82,7 @@ lib.fix (
     checkPhase = ''
       runHook preCheck
 
-      meson test -C _meson-build --no-rebuild --print-errorlogs --timeout-multiplier 0
+      meson test -C build --no-rebuild --print-errorlogs --timeout-multiplier 0
 
       runHook postCheck
     '';
diff --git a/pkgs/development/python-modules/ddgs/default.nix b/pkgs/development/python-modules/ddgs/default.nix
index f6e2067e1a1e..358de956b071 100644
--- a/pkgs/development/python-modules/ddgs/default.nix
+++ b/pkgs/development/python-modules/ddgs/default.nix
@@ -8,20 +8,21 @@
   mcp,
   primp,
   setuptools,
+  trio,
   uvicorn,
   versionCheckHook,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "ddgs";
-  version = "9.13.1";
+  version = "9.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deedy5";
     repo = "ddgs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PCw6P8bYFmdRzDGyOsJ5vOBR8oEQkOSbvy5lGmkzdMQ=";
+    hash = "sha256-KA8MIuzArdkP/nlkaKdqJd/15Lb36Q7ePbVUf81iY6M=";
   };
 
   build-system = [ setuptools ];
@@ -40,6 +41,11 @@ buildPythonPackage (finalAttrs: {
     mcp = [
       mcp
     ];
+    dht = [
+      fastapi
+      uvicorn
+      trio
+    ];
   };
 
   nativeCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/development/python-modules/deal-solver/default.nix b/pkgs/development/python-modules/deal-solver/default.nix
index 620e8b995cfe..c0cdb95e02bd 100644
--- a/pkgs/development/python-modules/deal-solver/default.nix
+++ b/pkgs/development/python-modules/deal-solver/default.nix
@@ -48,6 +48,8 @@ buildPythonPackage rec {
     "test_expr_asserts_ok"
     "test_fuzz_math_floats"
     "test_model_skip_helpers2"
+    # test does not pass on python314 because an error message has changed
+    "test_type_error__table"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix
index d8b37c9d8dca..7ccba3536c87 100644
--- a/pkgs/development/python-modules/deebot-client/default.nix
+++ b/pkgs/development/python-modules/deebot-client/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "deebot-client";
-  version = "18.1.0";
+  version = "18.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -31,12 +31,12 @@ buildPythonPackage (finalAttrs: {
     owner = "DeebotUniverse";
     repo = "client.py";
     tag = finalAttrs.version;
-    hash = "sha256-+URVdNcuV7H/vrYw+8fq6IdZ9OSZsbqDEZSd8s5XKyA=";
+    hash = "sha256-t9ODbQhbJvnXfdWbnmjAqO6DQnJ+MzM8TD24KAs7NZ4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-umCaUmtlKPs/sxdZ0BdA9pbg5gy4aOQl3uSAioD1gXs=";
+    hash = "sha256-9GitKi4NEsXiKXN1cV2NDpOydUkOsAjIWo4QaL254y0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/deep-ep/default.nix b/pkgs/development/python-modules/deep-ep/default.nix
index 38309a06f988..0ad6abb30b53 100644
--- a/pkgs/development/python-modules/deep-ep/default.nix
+++ b/pkgs/development/python-modules/deep-ep/default.nix
@@ -8,7 +8,6 @@
   setuptools,
 
   # env
-  symlinkJoin,
   cudaPackages,
 
   # buildInputs
@@ -20,11 +19,6 @@
   cudaSupport ? config.cudaSupport,
 }:
 let
-  inherit (lib)
-    getBin
-    getInclude
-    ;
-
   minSupportedCudaCapability = "8.0"; # build fails with 7.5
 
   minCudaCapability = builtins.head (
@@ -66,31 +60,34 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
 
       DISABLE_SM90_FEATURES = if disableSm90Features then "1" else "0";
 
-      CUDA_HOME = symlinkJoin {
-        name = "cuda-redist";
-        paths = with cudaPackages; [
-          (getBin cuda_nvcc)
-
-          (getInclude cuda_cccl) # <nv/target>
-          (getInclude cuda_cudart) # cuda_runtime.h
-          (getInclude libcublas) # cublas_v2.h
-          (getInclude libcusolver) # cusolverDn.h
-          (getInclude libcusparse) # cusparse.h
-        ];
-      };
+      CUDA_HOME = (lib.getBin cudaPackages.cuda_nvcc).outPath;
     }
 
     # nvshmem must be disabled (unsetting NVSHMEM_DIR) when supporting <9.0 capabilities
     # https://github.com/deepseek-ai/DeepEP/blob/v1.2.1/setup.py#L65
     // lib.optionalAttrs (!disableSm90Features) {
-      NVSHMEM_DIR = (getInclude cudaPackages.libnvshmem).outPath;
+      NVSHMEM_DIR = (lib.getInclude cudaPackages.libnvshmem).outPath;
     }
   );
 
   buildInputs = [
     pybind11
     rdma-core
-  ];
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
+    [
+      cuda_cccl # <nv/target>
+      cuda_cudart # cuda_runtime.h
+      libcublas # cublas_v2.h
+      libcusolver # cusolverDn.h
+      libcusparse # cusparse.h
+    ]
+    # On CUDA >=13.0, crt/host_config.h is shipped in cudaPackages.cuda_crt
+    ++ lib.optionals cuda_crt.meta.available [
+      cuda_crt # crt/host_config.h
+    ]
+  );
 
   pythonImportsCheck = [ "deep_ep" ];
 
diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix
index fd49d7e4cb10..07218162bb4e 100644
--- a/pkgs/development/python-modules/devtools/default.nix
+++ b/pkgs/development/python-modules/devtools/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail 'asttokens>=2.0.0,<3.0.0' 'asttokens>=2.0.0' \
+      --replace-fail 'asttokens>=2.0.0,<3.0.0' 'asttokens>=2.0.0'
   '';
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/dicomweb-client/default.nix b/pkgs/development/python-modules/dicomweb-client/default.nix
index 85b467c426bf..a4064bec4720 100644
--- a/pkgs/development/python-modules/dicomweb-client/default.nix
+++ b/pkgs/development/python-modules/dicomweb-client/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dicomweb-client";
-  version = "0.60.1";
+  version = "0.61.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ImagingDataCommons";
     repo = "dicomweb-client";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZxeZiCw8I5+Bf266PQ6WQA8mBRC7K3/kZrmuW4l6kQU=";
+    hash = "sha256-uCImuJDZr2gyWnLCU2JCmkGO/EloRty1fIRujwzYzAg=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix
index fe21de1b240a..d2845bb7a70a 100644
--- a/pkgs/development/python-modules/diofant/default.nix
+++ b/pkgs/development/python-modules/diofant/default.nix
@@ -82,6 +82,6 @@ buildPythonPackage rec {
     description = "Python CAS library";
     homepage = "https://github.com/diofant/diofant";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ suhr ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix
index 340305fc63b2..8f6cf0d383cb 100644
--- a/pkgs/development/python-modules/distrax/default.nix
+++ b/pkgs/development/python-modules/distrax/default.nix
@@ -22,14 +22,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "distrax";
-  version = "0.1.7";
+  version = "0.1.8";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "distrax";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-R6rGGNzup3O6eZ2z4vygYWTjroE/Irt3aog8Op+0hco=";
+    hash = "sha256-MZGaK55FHQPVwgzZ2RPOohYgotw+o1ca0k6bLd/sjFQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 458fedfc944a..d36f2048a919 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "django-allauth";
-  version = "65.16.0";
+  version = "65.16.1";
   pyproject = true;
 
   src = fetchFromCodeberg {
     owner = "allauth";
     repo = "django-allauth";
     tag = version;
-    hash = "sha256-uYJErt7RElFrSMyVtnUgdkoIVIBzuAENZZHn/7kmfDE=";
+    hash = "sha256-ZtrbIklik0GmVMNtZegXJ8ot+5LKjO0B5ioo5nArKMk=";
   };
 
   nativeBuildInputs = [ gettext ];
diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix
index 157506501cb2..cc57f2dd5d2b 100644
--- a/pkgs/development/python-modules/django-anymail/default.nix
+++ b/pkgs/development/python-modules/django-anymail/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "django-anymail";
-  version = "14.0";
+  version = "15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anymail";
     repo = "django-anymail";
     tag = "v${version}";
-    hash = "sha256-S/HEbWyvfAQ/kHodN0ylrg1lU7lYWGUznSqVC+yUzSU=";
+    hash = "sha256-SAiHjVFh0x1lXoxAlU+Lpfzv9pndsz/V9AVWwyKehEo=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix
index ac426b332d98..9dd305b3ad37 100644
--- a/pkgs/development/python-modules/django-filingcabinet/default.nix
+++ b/pkgs/development/python-modules/django-filingcabinet/default.nix
@@ -97,8 +97,8 @@ buildPythonPackage rec {
 
   pnpmDeps = fetchPnpmDeps {
     inherit pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-kvLV/pCX/wQHG0ttrjSro7/CoQ5K1T0aFChafQOwvNw=";
+    fetcherVersion = 3;
+    hash = "sha256-p+RpEDVbdYmeSD4bB0oUMrTpsVDGYkqME13awnoTNd0=";
   };
 
   postBuild = ''
diff --git a/pkgs/development/python-modules/django-ical/default.nix b/pkgs/development/python-modules/django-ical/default.nix
index 09f8e8a6c271..13f3986e99e0 100644
--- a/pkgs/development/python-modules/django-ical/default.nix
+++ b/pkgs/development/python-modules/django-ical/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "iCal feeds for Django based on Django's syndication feed framework";
     homepage = "https://github.com/jazzband/django-ical";
-    changelog = "https://github.com/jazzband/django-ical/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
+    changelog = "https://github.com/jazzband/django-ical/blob/${finalAttrs.src.tag}/CHANGES.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ kurogeek ];
   };
diff --git a/pkgs/development/python-modules/django-jinja/default.nix b/pkgs/development/python-modules/django-jinja/default.nix
index 20f88ca5ac2c..b48a32ee4ae8 100644
--- a/pkgs/development/python-modules/django-jinja/default.nix
+++ b/pkgs/development/python-modules/django-jinja/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     export DJANGO_SETTINGS_MODULE=settings
   '';
 
-  pytestFlagsArray = [
+  enabledTestPaths = [
     "testapp/tests.py"
   ];
 
diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix
index d55eca8dede7..d41c9daaa84f 100644
--- a/pkgs/development/python-modules/django-modeltranslation/default.nix
+++ b/pkgs/development/python-modules/django-modeltranslation/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   meta = {
     description = "Translates Django models using a registration approach";
     homepage = "https://github.com/deschler/django-modeltranslation";
-    changelog = "https://github.com/deschler/django-modeltranslation/blob/v${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/deschler/django-modeltranslation/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ augustebaum ];
   };
diff --git a/pkgs/development/python-modules/django-pgpubsub/default.nix b/pkgs/development/python-modules/django-pgpubsub/default.nix
index b9498dc50260..e37d3bea14b0 100644
--- a/pkgs/development/python-modules/django-pgpubsub/default.nix
+++ b/pkgs/development/python-modules/django-pgpubsub/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pyproject.toml \
     --replace 'poetry.masonry.api' 'poetry.core.masonry.api' \
-    --replace 'poetry>=1.1.13' 'poetry-core>=1.0.0' \
+    --replace 'poetry>=1.1.13' 'poetry-core>=1.0.0'
   '';
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index e25c6b9e0160..31f1300a4e7c 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "django-postgresql-netfields";
-  version = "1.3.2";
+  version = "1.4.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "jimfunk";
     repo = "django-postgresql-netfields";
     rev = "v${version}";
-    hash = "sha256-iZ6KmbVlp2nf3T0Pj4XD1einhoK0kmUmUXOZBmmrzZw=";
+    hash = "sha256-oUmgV3MaEOYULvadHZgGYtshlIqYrvQpejYfeMzx1vg=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix
index 43859c8dcbeb..a946f4d89b54 100644
--- a/pkgs/development/python-modules/django-rq/default.nix
+++ b/pkgs/development/python-modules/django-rq/default.nix
@@ -53,6 +53,11 @@ buildPythonPackage (finalAttrs: {
     export DJANGO_SETTINGS_MODULE=tests.settings
   '';
 
+  disabledTests = [
+    # ValueError: Job ID must only contain letters, numbers, underscores and dashes
+    "test_scheduled_jobs"
+  ];
+
   meta = {
     description = "Simple app that provides django integration for RQ (Redis Queue)";
     homepage = "https://github.com/rq/django-rq";
diff --git a/pkgs/development/python-modules/django-tree-queries/default.nix b/pkgs/development/python-modules/django-tree-queries/default.nix
index 3c49051b1a1c..9b367b176cfe 100644
--- a/pkgs/development/python-modules/django-tree-queries/default.nix
+++ b/pkgs/development/python-modules/django-tree-queries/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "django-tree-queries";
-  version = "0.23";
+  version = "0.24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "feincms";
     repo = "django-tree-queries";
     tag = version;
-    hash = "sha256-ZAR93mleN4Gqf9v2ufnPjIqatkygpvXoLpfN4bJpHw8=";
+    hash = "sha256-VPJU/0tnnLSayJhuOO0YOtqegULF6CB6ve8/1ytFydA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/django-treenode/default.nix b/pkgs/development/python-modules/django-treenode/default.nix
index 60432e4b83f5..e7959e3fce35 100644
--- a/pkgs/development/python-modules/django-treenode/default.nix
+++ b/pkgs/development/python-modules/django-treenode/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "django-treenode";
-  version = "0.23.3";
+  version = "0.24.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fabiocaccamo";
     repo = "django-treenode";
     tag = version;
-    hash = "sha256-EinTO794JMUjH25WFo5LJh5HWQoOjq8hI0RR2z7u6+c=";
+    hash = "sha256-ZdoFUYgPbfS7ORqd1kVh+XpJetZZ4alEkaVu5jqw5II=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix
index fd11ff8c17db..146c8d029191 100644
--- a/pkgs/development/python-modules/django/5.nix
+++ b/pkgs/development/python-modules/django/5.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.2.12";
+  version = "5.2.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django";
     repo = "django";
     tag = version;
-    hash = "sha256-vMP+/BLDOZL8NEP31Dp26XEK7bpusYluMevOg9iRT3s=";
+    hash = "sha256-8tRDExsCtyEonz+e18PYnfhb8qmgZNeBWUjg+LbB39U=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix
index e33755a9194e..b7b87f380371 100644
--- a/pkgs/development/python-modules/dm-control/default.nix
+++ b/pkgs/development/python-modules/dm-control/default.nix
@@ -29,14 +29,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dm-control";
-  version = "1.0.39";
+  version = "1.0.40";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "dm_control";
     tag = finalAttrs.version;
-    hash = "sha256-N5/zFIJIj0T0TxATeExbcSuAy/kNotY5odSiJuehZ7Y=";
+    hash = "sha256-93ALiUTTp7IJsgA09DnS26+a6Sn40s91mNCIU5CbEG8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/dnsight/default.nix b/pkgs/development/python-modules/dnsight/default.nix
index 0da61c71b7d6..f7773a9a68d9 100644
--- a/pkgs/development/python-modules/dnsight/default.nix
+++ b/pkgs/development/python-modules/dnsight/default.nix
@@ -85,7 +85,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "SDK and CLI tool for DNS, email and web security hygiene";
     homepage = "https://github.com/dnsight/dnsight";
-    changelog = "https://github.com/dnsight/dnsight/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/dnsight/dnsight/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "dnsight";
diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix
index 8a912144d29f..8a1ab1cf8dab 100644
--- a/pkgs/development/python-modules/docformatter/default.nix
+++ b/pkgs/development/python-modules/docformatter/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "docformatter";
-  version = "1.7.7";
+  version = "1.7.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "docformatter";
     tag = "v${version}";
-    hash = "sha256-eLjaHso1p/nD9K0E+HkeBbnCnvjZ1sdpfww9tzBh0TI=";
+    hash = "sha256-Z1ZW5ljWRDnS2mlAmbQyAcE97nU+PrpKaP1aox3VQtQ=";
   };
 
   patches = [ ./test-path.patch ];
diff --git a/pkgs/development/python-modules/dockerflow/default.nix b/pkgs/development/python-modules/dockerflow/default.nix
index 216bb5508136..0b19dc36d1ee 100644
--- a/pkgs/development/python-modules/dockerflow/default.nix
+++ b/pkgs/development/python-modules/dockerflow/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "dockerflow";
-  version = "2026.01.26";
+  version = "2026.03.04";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = "python-dockerflow";
     tag = version;
-    hash = "sha256-wtofNcpsOAq2yQJf6n+DcVfzY+IQ2k6S8r2zHIWAosg=";
+    hash = "sha256-cNf9qsoIJY5aRsQ82WZPmOrq2V6Siidp2B36JFTnMVw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index 2956fb054601..a5386e11148b 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "docling-core";
-  version = "2.71.0";
+  version = "2.73.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9EkxYJALfIxTmOl8yOJO4tSCLtPeNj2hjXmIH2OGv8E=";
+    hash = "sha256-aK+XHZjKsmFPgRv0oDed1CdBwZags/zcALumgcfQjjY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix
index 7a91de39c52b..c1f5e064327d 100644
--- a/pkgs/development/python-modules/docling-ibm-models/default.nix
+++ b/pkgs/development/python-modules/docling-ibm-models/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "docling-ibm-models";
-  version = "3.13.0";
+  version = "3.13.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-ibm-models";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T8sVXG9s7jlhoRNexPRmCaiHPtQUAhDa9Z0Ri9i0zcc=";
+    hash = "sha256-PYIcsKffrsZl4f9SFinUdrvUVEXm1fO/n7ZxXuiiByU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/dotwiz/default.nix b/pkgs/development/python-modules/dotwiz/default.nix
index 03c135cde365..f48073117402 100644
--- a/pkgs/development/python-modules/dotwiz/default.nix
+++ b/pkgs/development/python-modules/dotwiz/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   meta = {
     description = "Dict subclass that supports dot access notation";
     homepage = "https://github.com/rnag/dotwiz";
-    changelog = "https://github.com/rnag/dotwiz/blob/v${src.tag}/HISTORY.rst";
+    changelog = "https://github.com/rnag/dotwiz/blob/${src.tag}/HISTORY.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix
index ea5d6568cb45..797777ede9ba 100644
--- a/pkgs/development/python-modules/dploot/default.nix
+++ b/pkgs/development/python-modules/dploot/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "dploot";
-  version = "3.1.3";
+  version = "3.2.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xCw4mAP9CUtcTeQQ//4zI0BcQUmTai9hvYSZ9F9k4rc=";
+    hash = "sha256-P2rPkBE60Ha+m1nqQULQ3k2RDUro+Zp0TUfPAQNS06g=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index b618ab9ea3bc..b87e8d3c974a 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -25,19 +25,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "dulwich";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = "dulwich";
     tag = "dulwich-${finalAttrs.version}";
-    hash = "sha256-9y7+00M2Ib5j+1fHNsJBomkyNZWhihqcIvAgGpJ5AB8=";
+    hash = "sha256-R5vq3mb1nSqEn+LIUaXc8Edrw8TgTb5H4LOXnHgeAzQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-NEYauayn7laPLQUomQAFEskFP5m8546jYltazR/gn1A=";
+    hash = "sha256-r2Ef8ciZW6rNBg8eLr5lkqtTEXugy7B9DjbSCErJkzc=";
   };
 
   nativeBuildInputs = [
@@ -89,8 +89,6 @@ buildPythonPackage (finalAttrs: {
   '';
 
   disabledTestPaths = [
-    # "Code [in contrib] is not an official part of Dulwich, and may no longer work"
-    "tests/contrib"
     # AssertionError: GPGMEError not raised
     "tests/test_signature.py::GPGSignatureVendorTests::test_verify_invalid_signature"
   ];
diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
index 2e514cd135f1..bba728e0c3e2 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "elevenlabs";
-  version = "2.43.0";
+  version = "2.45.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-w8IvjwC1X81BhPgTcHWx/vDL9M/ZoHUNsvTySmN0qW0=";
+    hash = "sha256-E9+hlFfDx1pBEMPcsx1vuawkbmsgCDv3s+/JYqVUu3U=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix
index 780dcf69ad57..cef275238932 100644
--- a/pkgs/development/python-modules/elgato/default.nix
+++ b/pkgs/development/python-modules/elgato/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   postPatch = ''
     # Upstream doesn't set a version for the pyproject.toml
     substituteInPlace pyproject.toml \
-      --replace "0.0.0" "${version}" \
+      --replace "0.0.0" "${version}"
   '';
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix
index d295511b9506..dbc358e6ad3c 100644
--- a/pkgs/development/python-modules/elkm1-lib/default.nix
+++ b/pkgs/development/python-modules/elkm1-lib/default.nix
@@ -8,23 +8,21 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "elkm1-lib";
-  version = "2.2.13";
+  version = "2.2.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gwww";
     repo = "elkm1";
-    tag = version;
-    hash = "sha256-Z8OfaRggVkGzX7d/O8a7L110ophj3sKD2x5JskusUe8=";
+    tag = finalAttrs.version;
+    hash = "sha256-lejeRHteVMO7qz8qMPCG5d8V/rj550FL+WuogM/Lcbw=";
   };
 
   build-system = [ hatchling ];
 
-  dependencies = [
-    pyserial-asyncio-fast
-  ];
+  dependencies = [ pyserial-asyncio-fast ];
 
   nativeCheckInputs = [
     pytest-asyncio
@@ -34,10 +32,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "elkm1_lib" ];
 
   meta = {
-    description = "Python module for interacting with ElkM1 alarm/automation panel";
+    description = "Module for interacting with ElkM1 alarm/automation panel";
     homepage = "https://github.com/gwww/elkm1";
-    changelog = "https://github.com/gwww/elkm1/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/gwww/elkm1/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix
deleted file mode 100644
index fdb06f2436cc..000000000000
--- a/pkgs/development/python-modules/emailthreads/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildPythonPackage,
-  isPy3k,
-  unittestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "emailthreads";
-  version = "0.1.3";
-  format = "setuptools";
-  disabled = !isPy3k;
-
-  # pypi is missing files for tests
-  src = fetchFromGitHub {
-    owner = "emersion";
-    repo = "python-emailthreads";
-    rev = "v${version}";
-    hash = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs=";
-  };
-
-  nativeCheckInputs = [ unittestCheckHook ];
-
-  env.PKGVER = version;
-
-  meta = {
-    homepage = "https://github.com/emersion/python-emailthreads";
-    description = "Python library to parse and format email threads";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ eadwu ];
-  };
-}
diff --git a/pkgs/development/python-modules/emoji-country-flag/default.nix b/pkgs/development/python-modules/emoji-country-flag/default.nix
index 074a3a64c0c3..36161f8d16bc 100644
--- a/pkgs/development/python-modules/emoji-country-flag/default.nix
+++ b/pkgs/development/python-modules/emoji-country-flag/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   meta = {
     description = "Flag emoji from country codes for Python";
     homepage = "https://github.com/cvzi/flag";
-    changelog = "https://github.com/cvzi/flag/releases/tag/v${src.tag}";
+    changelog = "https://github.com/cvzi/flag/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       skohtv
diff --git a/pkgs/development/python-modules/encutils/default.nix b/pkgs/development/python-modules/encutils/default.nix
new file mode 100644
index 000000000000..37f91db5a007
--- /dev/null
+++ b/pkgs/development/python-modules/encutils/default.nix
@@ -0,0 +1,39 @@
+{
+  buildPythonPackage,
+  chardet,
+  fetchPypi,
+  flit-core,
+  lib,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "encutils";
+  version = "1.0.0";
+  pyproject = true;
+
+  # pyproject.toml on GitHub uses coherent.build as build-system
+  src = fetchPypi {
+    inherit (finalAttrs) pname version;
+    hash = "sha256-OOylrxjOur2L5DwX8UydP7uoPMX3rI46schuJMSyuRo=";
+  };
+
+  build-system = [ flit-core ];
+
+  dependencies = [
+    chardet
+  ];
+
+  pythonImportsCheck = [ "encutils" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Collection of helper functions to detect encodings of text files";
+    homepage = "https://github.com/coherent-oss/encutils";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+})
diff --git a/pkgs/development/python-modules/epicstore-api/default.nix b/pkgs/development/python-modules/epicstore-api/default.nix
index 4bc4e125c364..32d596b4bd69 100644
--- a/pkgs/development/python-modules/epicstore-api/default.nix
+++ b/pkgs/development/python-modules/epicstore-api/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = {
-    changelog = "https://github.com/SD4RK/epicstore_api/releases/tag/v_${src.tag}";
+    changelog = "https://github.com/SD4RK/epicstore_api/releases/tag/${src.tag}";
     description = "Epic Games Store Web API Wrapper written in Python";
     homepage = "https://github.com/SD4RK/epicstore_api";
     license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/epitran/default.nix b/pkgs/development/python-modules/epitran/default.nix
index de3f2afa1c2b..594e880e3a93 100644
--- a/pkgs/development/python-modules/epitran/default.nix
+++ b/pkgs/development/python-modules/epitran/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "epitran";
-  version = "1.34.0";
+  version = "1.35.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dmort27";
     repo = "epitran";
     tag = "v${version}";
-    hash = "sha256-LKESBSLn2gpXx8kEXmykEkTboIMiS5gZ2Kb9rj1lDTk=";
+    hash = "sha256-XXEZEptrVH+wfWm85B8yZ+RI+6AUZjWFKMjst/V7aE0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix
index 841e4f2858ab..2c71c42b3861 100644
--- a/pkgs/development/python-modules/equinox/default.nix
+++ b/pkgs/development/python-modules/equinox/default.nix
@@ -21,14 +21,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "equinox";
-  version = "0.13.6";
+  version = "0.13.7";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "patrick-kidger";
     repo = "equinox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OETWXAcCp945mMrpC8U4gSBvEeQX8RoUGZR4irBs7Ak=";
+    hash = "sha256-vgmU8cqNCyiZYah1SSwzVtLS+YB2T1uooCC17k12+h8=";
   };
 
   # Relax speed constraints on tests that can fail on busy builders
@@ -56,27 +57,14 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
   ];
 
-  pytestFlags = [
-    # DeprecationWarning: The default axis_types will change in JAX v0.9.0 to jax.sharding.AxisType.Explicit.
-    "-Wignore::DeprecationWarning"
-  ];
-
-  disabledTestPaths = [
-    # ValueError: not enough values to unpack (expected 2, got 0)
-    "tests/test_finalise_jaxpr.py"
-  ];
+  pythonImportsCheck = [ "equinox" ];
 
   disabledTests = [
-    # Failed: DID NOT WARN. No warnings of type (<class 'Warning'>,) were emitted.
-    # Reported upstream: https://github.com/patrick-kidger/equinox/issues/1186
-    "test_jax_transform_warn"
-
-    # Flaky: AssertionError: Non-linear scaling detected
+    # Flaky under heavy load:
+    #   AssertionError: Non-linear scaling detected: ratio=1.56
     "test_speed_buffer_while"
   ];
 
-  pythonImportsCheck = [ "equinox" ];
-
   meta = {
     description = "JAX library based around a simple idea: represent parameterised functions (such as neural networks) as PyTrees";
     changelog = "https://github.com/patrick-kidger/equinox/releases/tag/${finalAttrs.src.tag}";
diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index 34b462d08206..7375eb8feb56 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "eve";
-  version = "2.2.5";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyeve";
     repo = "eve";
     tag = "v${version}";
-    hash = "sha256-l5dAHgau6LVROkNgFQcCJl2uiSh/2Jg/GtZgSHbUBug=";
+    hash = "sha256-y0QfxLDoTKNZuAKcPqrLjwkZ0mRseBVq7OyflwUd+Lk=";
   };
 
   pythonRelaxDeps = [ "events" ];
diff --git a/pkgs/development/python-modules/exa-py/default.nix b/pkgs/development/python-modules/exa-py/default.nix
new file mode 100644
index 000000000000..0dbe5c755d83
--- /dev/null
+++ b/pkgs/development/python-modules/exa-py/default.nix
@@ -0,0 +1,85 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build
+  poetry-core,
+
+  # deps
+  httpcore,
+  httpx,
+  openai,
+  pydantic,
+  python-dotenv,
+  requests,
+  typing-extensions,
+
+  # tests
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytest-mock,
+  pytestCheckHook,
+
+  # passthru
+  unstableGitUpdater,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "exa-py";
+  version = "2.12.0-unstable-2026-04-15";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  # pypi doesn't include tests but there aren't any upstream git tags
+  src = fetchFromGitHub {
+    owner = "exa-labs";
+    repo = "exa-py";
+    rev = "af7f88999763f1cb7e3c4a67f4aa24cef5f6eb11";
+    hash = "sha256-7rLEvjngSRObFdT1DcrZfqWBCsvWVxdNIgxBNhNNk+4=";
+  };
+
+  # https://github.com/pytest-dev/pytest-asyncio/issues/658
+  # default behaviour changes with new python version.
+  # planning on trying to vendor upstream
+  postPatch = ''
+    substituteInPlace tests/unit/test_search_monitors.py --replace-fail \
+      'get_event_loop().run_until_complete' 'run'
+  '';
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    httpcore
+    httpx
+    openai
+    pydantic
+    python-dotenv
+    requests
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [
+    "exa_py"
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  pytestFlags = [ "tests/" ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Official Python SDK for Exa, the web search API for AI";
+    homepage = "https://github.com/exa-labs/exa-py/";
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    license = lib.licenses.mit;
+  };
+})
diff --git a/pkgs/development/python-modules/executorch/default.nix b/pkgs/development/python-modules/executorch/default.nix
index c8e393dc4166..02604cfe8f10 100644
--- a/pkgs/development/python-modules/executorch/default.nix
+++ b/pkgs/development/python-modules/executorch/default.nix
@@ -7,6 +7,8 @@
 
   # nativeBuildInputs
   gitMinimal,
+  # cuda-only:
+  autoPatchelfHook,
 
   # build-system
   certifi,
@@ -46,8 +48,11 @@
   transformers,
   writableTmpDirAsHomeHook,
   yaspin,
+
+  cudaSupport ? torch.cudaSupport,
+  cudaPackages,
 }:
-buildPythonPackage (finalAttrs: {
+buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   pname = "executorch";
   version = "1.2.0";
   pyproject = true;
@@ -107,6 +112,9 @@ buildPythonPackage (finalAttrs: {
     #  Some binaries contain forbidden references to /build/. Check the error above!
     CMAKE_ARGS = lib.concatStringsSep " " [
       (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
+
+      # For some cmake-tier reason, cmakeBool does not work here
+      (lib.cmakeFeature "EXECUTORCH_BUILD_CUDA" (if cudaSupport then "ON" else "OFF"))
     ];
   };
 
@@ -122,6 +130,15 @@ buildPythonPackage (finalAttrs: {
 
   nativeBuildInputs = [
     gitMinimal
+  ]
+  ++ lib.optionals cudaSupport [
+    autoPatchelfHook
+    cudaPackages.cuda_nvcc
+  ];
+
+  buildInputs = lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_nvrtc
   ];
 
   pythonRemoveDeps = [
diff --git a/pkgs/development/python-modules/farama-notifications/default.nix b/pkgs/development/python-modules/farama-notifications/default.nix
index ad4beb12f073..c897be03b2ac 100644
--- a/pkgs/development/python-modules/farama-notifications/default.nix
+++ b/pkgs/development/python-modules/farama-notifications/default.nix
@@ -5,27 +5,28 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "farama-notifications";
-  version = "0.0.4";
+  version = "0.0.6";
+  pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = "farama-notifications";
-    rev = version;
-    hash = "sha256-UUrJ/5t5x54xs1gweNUhwqrMJQXiyrUPn1bBfTsiPcw=";
+    tag = finalAttrs.version;
+    hash = "sha256-gvOLitPqpJW1kLVZUkf8UVhKdjhCZhu9ORmdLHzil1E=";
   };
 
-  pyproject = true;
-
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   pythonImportsCheck = [ "farama_notifications" ];
 
   meta = {
     description = "Allows for providing notifications on import to all Farama Packages";
     homepage = "https://github.com/Farama-Foundation/Farama-Notifications";
+    changelog = "https://github.com/Farama-Foundation/Farama-Notifications/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/fastexcel/default.nix b/pkgs/development/python-modules/fastexcel/default.nix
index 14752fe91b91..b61f484b14cb 100644
--- a/pkgs/development/python-modules/fastexcel/default.nix
+++ b/pkgs/development/python-modules/fastexcel/default.nix
@@ -20,19 +20,20 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fastexcel";
-  version = "0.19.0";
+  version = "0.20.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "ToucanToco";
     repo = "fastexcel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BMFZOduKN6D3y9aRkt9VAG2T9oNFBUcnmux1qTKgY5c=";
+    hash = "sha256-YL8EkV6IuqAMxooOMbqCrTfDM4uhH9A+v7UFw1f/iek=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-aTYwXJN2hncZsEAGSlQzK5cX4uWpNoS0wpsXL0I6pZo=";
+    hash = "sha256-TK/5eES+RlSDFIbhVjzbPgdrDRRKZlCiuqtLRm8R/go=";
   };
 
   nativeBuildInputs = [
@@ -42,10 +43,6 @@ buildPythonPackage (finalAttrs: {
     rustc
   ];
 
-  maturinBuildFlags = [
-    "--features __maturin"
-  ];
-
   optional-dependencies = {
     pyarrow = [
       pyarrow
diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix
index 18897706e7a0..5a82e61c88cf 100644
--- a/pkgs/development/python-modules/fastmcp/default.nix
+++ b/pkgs/development/python-modules/fastmcp/default.nix
@@ -12,23 +12,32 @@
   # dependencies
   anthropic,
   authlib,
+  azure-identity,
   cyclopts,
   exceptiongroup,
   httpx,
   jsonref,
   jsonschema-path,
   mcp,
+  fakeredis,
+  google-genai,
   openai,
   openapi-pydantic,
+  opentelemetry-api,
   packaging,
   platformdirs,
   py-key-value-aio,
   pydantic,
+  pydantic-monty,
   pydocket,
+  pyjwt,
   pyperclip,
   python-dotenv,
+  pyyaml,
   rich,
+  uncalled-for,
   uvicorn,
+  watchfiles,
   websockets,
 
   # tests
@@ -37,6 +46,7 @@
   fastapi,
   inline-snapshot,
   lupa,
+  opentelemetry-sdk,
   psutil,
   pytest-asyncio,
   pytest-httpx,
@@ -45,14 +55,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fastmcp";
-  version = "2.14.5";
+  version = "3.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jlowin";
     repo = "fastmcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j3aUvAKm0rW5X/l1VXoSBc5fCjSLxnyznwzj1D3E7Ck=";
+    hash = "sha256-YfFAJvfKLOgfGFWyQmR4FGHrRc066Y0mAYhXJqJ9vyw=";
   };
 
   build-system = [
@@ -61,6 +71,7 @@ buildPythonPackage (finalAttrs: {
   ];
 
   pythonRelaxDeps = [
+    "py-key-value-aio"
     "pydocket"
   ];
   dependencies = [
@@ -72,25 +83,39 @@ buildPythonPackage (finalAttrs: {
     jsonschema-path
     mcp
     openapi-pydantic
+    opentelemetry-api
     packaging
     platformdirs
     py-key-value-aio
     pydantic
-    pydocket
     pyperclip
     python-dotenv
+    pyyaml
     rich
+    uncalled-for
     uvicorn
+    watchfiles
     websockets
   ]
-  ++ py-key-value-aio.optional-dependencies.disk
+  ++ py-key-value-aio.optional-dependencies.filetree
   ++ py-key-value-aio.optional-dependencies.keyring
   ++ py-key-value-aio.optional-dependencies.memory
   ++ pydantic.optional-dependencies.email;
 
   optional-dependencies = {
     anthropic = [ anthropic ];
+    azure = [
+      azure-identity
+      pyjwt
+    ];
+    code-mode = [ pydantic-monty ];
+    gemini = [ google-genai ];
     openai = [ openai ];
+    tasks = [
+      pydocket
+      fakeredis
+    ]
+    ++ fakeredis.optional-dependencies.lua;
   };
 
   pythonImportsCheck = [ "fastmcp" ];
@@ -101,31 +126,21 @@ buildPythonPackage (finalAttrs: {
     fastapi
     inline-snapshot
     lupa
+    opentelemetry-sdk
     psutil
     pytest-asyncio
     pytest-httpx
     pytestCheckHook
     writableTmpDirAsHomeHook
   ]
-  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies
+  ++ finalAttrs.passthru.optional-dependencies.anthropic
+  ++ finalAttrs.passthru.optional-dependencies.azure
+  ++ finalAttrs.passthru.optional-dependencies.code-mode
+  ++ finalAttrs.passthru.optional-dependencies.gemini
+  ++ finalAttrs.passthru.optional-dependencies.openai
   ++ inline-snapshot.optional-dependencies.dirty-equals;
 
   disabledTests = [
-    # redis.exceptions.ResponseError: unknown command `evalsha`, with args beginning with:
-    "test_get_prompt_as_task_returns_prompt_task"
-    "test_prompt_task_server_generated_id"
-
-    "test_logging_middleware_with_payloads"
-    "test_structured_logging_middleware_produces_json"
-
-    # AssertionError: assert 'INFO' == 'DEBUG'
-    "test_temporary_settings"
-
-    # mcp.shared.exceptions.McpError: Connection closed
-    "test_log_file_captures_stderr_output_with_path"
-    "test_log_file_captures_stderr_output_with_textio"
-    "test_log_file_none_uses_default_behavior"
-
     # RuntimeError: Client failed to connect: Connection closed
     "test_keep_alive_maintains_session_across_multiple_calls"
     "test_keep_alive_false_starts_new_session_across_multiple_calls"
@@ -148,32 +163,55 @@ buildPythonPackage (finalAttrs: {
     "test_timeout"
     "test_timeout_tool_call_overrides_client_timeout_even_if_lower"
 
-    # assert 0 == 2
+    # Requires prefab-ui (optional dependency)
+    "test_auto_registers_renderer_resource"
+    "test_equivalent_to_app_true"
+
+    # Requires pydocket (tasks optional dependency, not in test inputs)
+    "test_mounted_server_does_not_have_docket"
+    "test_get_tasks_returns_task_eligible_tools"
+    "test_task_teardown_does_not_hang"
+    "test_background_task_can_read_snapshotted_request_headers"
+    "test_background_task_current_http_dependencies_restore_headers"
+    "test_task_execution_auto_populated_for_task_enabled_tool"
+    "test_function_tool_task_config_still_works"
+    "test_async_partial_with_task_true_does_not_raise"
+    "test_sync_partial_with_task_true_raises"
+    "test_is_docket_available"
+    "test_require_docket_passes_when_installed"
+
+    # Shared dependency caching differs in sandbox
+    "TestSharedDependencies"
+
+    # AssertionError: assert 'INFO' == 'DEBUG'
+    "test_temporary_settings"
+
+    # Subprocess-based multi-client tests fail in sandbox
     "test_multi_client"
+    "test_multi_server"
+    "test_single_server_config_include_tags_filtering"
+    "test_server_starts_without_auth"
     "test_canonical_multi_client_with_transforms"
-
-    # AssertionError: assert {'annotations...object'}, ...} == {'annotations...sers']}}, ...}
-    "test_list_tools"
-
-    # AssertionError: assert len(caplog.records) == 1
-    "test_log"
-
-    #  assert [TextContent(...e, meta=None)] == [TextContent(...e, meta=None)]
-    "test_read_resource_tool_works"
-
-    # fastmcp.exceptions.ToolError: Unknown tool
-    "test_multi_client_with_logging"
-    "test_multi_client_with_elicitation"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # RuntimeError: Server failed to start after 10 attempts
     "test_unauthorized_access"
-
-    # Failed: DID NOT RAISE <class 'fastmcp.exceptions.ToolError'>
     "test_stateless_proxy"
   ];
 
-  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+  disabledTestPaths = [
+    # Requires prefab-ui (optional dependency)
+    "tests/apps"
+    "tests/test_apps_prefab.py"
+    "tests/test_fastmcp_app.py"
+    # Subprocess crash recovery tests are flaky in sandbox
+    "tests/client/test_stdio.py"
+    # Requires pydocket/fakeredis (tasks optional dependency, not in test inputs)
+    "tests/server/tasks"
+    "tests/server/test_server_docket.py"
+    "tests/client/tasks"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # RuntimeError: Server failed to start after 10 attempts
     "tests/client/auth/test_oauth_client.py"
     "tests/client/test_sse.py"
diff --git a/pkgs/development/python-modules/fastremap/default.nix b/pkgs/development/python-modules/fastremap/default.nix
index 04aeb227fa5e..0849db7dd601 100644
--- a/pkgs/development/python-modules/fastremap/default.nix
+++ b/pkgs/development/python-modules/fastremap/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "fastremap";
-  version = "1.18.1";
+  version = "1.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "seung-lab";
     repo = "fastremap";
     tag = version;
-    hash = "sha256-nVnOdxDSVM7Qe/peALgV035OknOUm0B1dzpTIq3HEMs=";
+    hash = "sha256-fPDgCpCJrMomxr0dicM9NBqzH4s+/Ux37hTsnsGts2g=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix
index 87d3bc908e1e..5a363abcea5c 100644
--- a/pkgs/development/python-modules/ffcv/default.nix
+++ b/pkgs/development/python-modules/ffcv/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     substituteInPlace setup.py \
       --replace-fail "'assertpy'," "" \
       --replace-fail "'fastargs'," "" \
-      --replace-fail "'psutil'," "" \
+      --replace-fail "'psutil'," ""
   '';
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/fitbit-web-api/default.nix b/pkgs/development/python-modules/fitbit-web-api/default.nix
index 7bfb4f5e8749..a5bc5ca0e787 100644
--- a/pkgs/development/python-modules/fitbit-web-api/default.nix
+++ b/pkgs/development/python-modules/fitbit-web-api/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "fitbit-web-api";
-  version = "2.13.5";
+  version = "2.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "fitbit-web-api";
     tag = "v${version}";
-    hash = "sha256-HqlySvC6EGnetrh0t8shapS/ggSRVoI8xPXta2eBqlk=";
+    hash = "sha256-1XqUhQQRTlEOIbZGzRx9CvJVAE50Enu+4fQXpOgNPdA=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/flash-mla/default.nix b/pkgs/development/python-modules/flash-mla/default.nix
new file mode 100644
index 000000000000..e301ce5b1454
--- /dev/null
+++ b/pkgs/development/python-modules/flash-mla/default.nix
@@ -0,0 +1,96 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  replaceVars,
+  cudaPackages,
+
+  # build-system
+  setuptools,
+  torch,
+
+  # buildInputs
+  pybind11,
+
+  # passthru
+  nix-update-script,
+
+  config,
+  cudaSupport ? config.cudaSupport,
+}:
+
+let
+  inherit (lib)
+    getBin
+    optionalAttrs
+    optionals
+    ;
+in
+buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
+  pname = "flash-mla";
+  version = "0-unstable-2026-03-31";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "deepseek-ai";
+    repo = "FlashMLA";
+    rev = "71c737929f2567bd0a094ae140f8f60f390b1232";
+    # Using the cutlass git subodules is necessary to get cutlass/util/command_line.h which is not
+    # shipped in cudaPackages.cutlass
+    fetchSubmodules = true;
+    hash = "sha256-d8Hh+1QFwD6cl9fE8/XSYdWiJJjY9bSRk5h4N2sEV2U=";
+  };
+
+  patches = [
+    (replaceVars ./inject-git-rev.patch {
+      git_rev = "+${finalAttrs.src.rev}";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail \
+        'subprocess.run(["git", "submodule", "update", "--init", "csrc/cutlass"])' \
+        ""
+  '';
+
+  env = optionalAttrs cudaSupport {
+    CUDA_HOME = (getBin cudaPackages.cuda_nvcc).outPath;
+  };
+
+  build-system = [
+    setuptools
+    torch
+  ];
+
+  buildInputs = [
+    pybind11
+  ]
+  ++ optionals cudaSupport (
+    with cudaPackages;
+    [
+      cuda_cudart # cuda_runtime.h
+      libcublas # cublas_v2.h
+      libcurand # curand_kernel.h
+      libcusolver # cusolverDn.h
+      libcusparse # cusparse.h
+    ]
+  );
+
+  pythonImportsCheck = [ "flash_mla" ];
+
+  # Tests are not meant to run with pytest
+  doCheck = false;
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Efficient Multi-head Latent Attention Kernels";
+    homepage = "https://github.com/deepseek-ai/FlashMLA";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    broken = !cudaSupport;
+  };
+})
diff --git a/pkgs/development/python-modules/flash-mla/inject-git-rev.patch b/pkgs/development/python-modules/flash-mla/inject-git-rev.patch
new file mode 100644
index 000000000000..4b3899f2fdb8
--- /dev/null
+++ b/pkgs/development/python-modules/flash-mla/inject-git-rev.patch
@@ -0,0 +1,19 @@
+diff --git a/setup.py b/setup.py
+index 513b435..2178018 100644
+--- a/setup.py
++++ b/setup.py
+@@ -133,13 +133,7 @@ ext_modules.append(
+     )
+ )
+ 
+-try:
+-    cmd = ['git', 'rev-parse', '--short', 'HEAD']
+-    rev = '+' + subprocess.check_output(cmd).decode('ascii').rstrip()
+-except Exception as _:
+-    now = datetime.now()
+-    date_time_str = now.strftime("%Y-%m-%d-%H-%M-%S")
+-    rev = '+' + date_time_str
++rev = "@git_rev@"
+ 
+ 
+ setup(
diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index 119b841cde81..89f24260f486 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -13,7 +13,6 @@
   numpy,
   optax,
   orbax-checkpoint,
-  orbax-export,
   pyyaml,
   rich,
   tensorstore,
@@ -36,14 +35,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "flax";
-  version = "0.12.6";
+  version = "0.12.7";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "flax";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rIDfF9W8cxF0njH4e4uhqURQ0C4N8Boe76u6meMgC34=";
+    hash = "sha256-a78KiTsCCARWZvbxz9QKdUKnjkDJGXcPVVJu5rU4m/U=";
   };
 
   build-system = [
@@ -58,7 +58,6 @@ buildPythonPackage (finalAttrs: {
     numpy
     optax
     orbax-checkpoint
-    orbax-export
     pyyaml
     rich
     tensorstore
@@ -78,11 +77,6 @@ buildPythonPackage (finalAttrs: {
     tensorflow
   ];
 
-  pytestFlags = [
-    # FutureWarning: In the future `np.object` will be defined as the corresponding NumPy scalar.
-    "-Wignore::FutureWarning"
-  ];
-
   disabledTestPaths = [
     # Docs test, needs extra deps + we're not interested in it.
     "docs/_ext/codediff_test.py"
diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix
index 01cc6cefbc04..b93de984153c 100644
--- a/pkgs/development/python-modules/freebox-api/default.nix
+++ b/pkgs/development/python-modules/freebox-api/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python module to interact with the Freebox OS API";
     homepage = "https://github.com/hacf-fr/freebox-api";
-    changelog = "https://github.com/hacf-fr/freebox-api/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/hacf-fr/freebox-api/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "freebox_api";
diff --git a/pkgs/development/python-modules/fsspec-xrootd/default.nix b/pkgs/development/python-modules/fsspec-xrootd/default.nix
index 4ab66502a4b5..e07fdec45aab 100644
--- a/pkgs/development/python-modules/fsspec-xrootd/default.nix
+++ b/pkgs/development/python-modules/fsspec-xrootd/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fsspec-xrootd";
-  version = "0.5.3";
+  version = "0.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CoffeaTeam";
     repo = "fsspec-xrootd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-phtvWBKaBu6piVB226y9R29njI39z6vRLBbwlHZbpKk=";
+    hash = "sha256-dlSh2TH7SQ95kFNPlSjMa697WdBURRlBxNtNf04uaBU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix
index ee8e1ed82a01..827988124b82 100644
--- a/pkgs/development/python-modules/fsspec/default.nix
+++ b/pkgs/development/python-modules/fsspec/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "fsspec";
-  version = "2026.1.0";
+  version = "2026.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "filesystem_spec";
     tag = version;
-    hash = "sha256-jwtFFjaAZbGY7PeR3ZZzai+el0SlyojyAkptaqNePhE=";
+    hash = "sha256-K/qHc9uBYq/HkA6xhKAujdCBqH+0kcFnfD3a506A9Ns=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/funk/default.nix b/pkgs/development/python-modules/funk/default.nix
index c97f432617ec..b3637b40dde8 100644
--- a/pkgs/development/python-modules/funk/default.nix
+++ b/pkgs/development/python-modules/funk/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   # Disabling tests, they rely on Nose which is outdated and not supported
   doCheck = false;
 
-  passthru.updateScripts = gitUpdater { };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     description = "Mocking framework for Python, influenced by JMock";
diff --git a/pkgs/development/python-modules/funsor/default.nix b/pkgs/development/python-modules/funsor/default.nix
index b82ca7614486..96c7dcd3a62e 100644
--- a/pkgs/development/python-modules/funsor/default.nix
+++ b/pkgs/development/python-modules/funsor/default.nix
@@ -49,6 +49,13 @@ buildPythonPackage rec {
     })
   ];
 
+  # TypeError: clip() got an unexpected keyword argument 'a_max'
+  postPatch = ''
+    substituteInPlace funsor/jax/ops.py \
+      --replace-fail "a_max=" "max=" \
+      --replace-fail "a_min=" "min="
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix
index 0f2ba6274676..1a81e2556ec7 100644
--- a/pkgs/development/python-modules/gcsfs/default.nix
+++ b/pkgs/development/python-modules/gcsfs/default.nix
@@ -2,29 +2,36 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
+
+  # dependencies
+  aiohttp,
+  decorator,
+  fsspec,
   google-auth,
   google-auth-oauthlib,
   google-cloud-storage,
   google-cloud-storage-control,
   requests,
-  decorator,
-  fsspec,
+
+  # optional-dependencies
   fusepy,
-  aiohttp,
   crcmod,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gcsfs";
-  version = "2026.1.0";
+  version = "2026.3.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "gcsfs";
-    tag = version;
-    hash = "sha256-WAHRaLsb6znzfuTOtulDhI0rQOOmmcgv9UEEMujPgkE=";
+    tag = finalAttrs.version;
+    hash = "sha256-RLh3xFW/0qX5labJeUDsRRmQtnTdkvBS+gzJUJ1IP7k=";
   };
 
   build-system = [
@@ -55,8 +62,8 @@ buildPythonPackage rec {
   meta = {
     description = "Convenient Filesystem interface over GCS";
     homepage = "https://github.com/fsspec/gcsfs";
-    changelog = "https://github.com/fsspec/gcsfs/raw/${src.tag}/docs/source/changelog.rst";
+    changelog = "https://github.com/fsspec/gcsfs/raw/${finalAttrs.src.tag}/docs/source/changelog.rst";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ nbren12 ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/genai-prices/default.nix b/pkgs/development/python-modules/genai-prices/default.nix
index 2b0168e61040..0169ef60cdf8 100644
--- a/pkgs/development/python-modules/genai-prices/default.nix
+++ b/pkgs/development/python-modules/genai-prices/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "genai-prices";
-  version = "0.0.56";
+  version = "0.0.57";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "genai-prices";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xiyYK+Dzx4aI9pFpO6mWf860br//PBeIl2N4xRuNQPk=";
+    hash = "sha256-gEviMu89IL4qSU4/wjGhLo8l1kA5N2alGp+/VcQpEHM=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/python";
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index d17753e95ae8..18b0a6f56c54 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "generic";
-  version = "1.1.6";
+  version = "1.1.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CFtkkGjFjvM4WsYz08nmik61eM5S71GT+Rh+nI8mZ1k=";
+    hash = "sha256-0U2uZihULrCEQ0WI01B1bIjy8wx+I0itX8+gH723zu0=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/gerbonara/default.nix b/pkgs/development/python-modules/gerbonara/default.nix
index f858980e5b76..eaf6dcacddc4 100644
--- a/pkgs/development/python-modules/gerbonara/default.nix
+++ b/pkgs/development/python-modules/gerbonara/default.nix
@@ -9,16 +9,16 @@
   rtree,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gerbonara";
-  version = "1.6.2";
+  version = "1.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jaseg";
     repo = "gerbonara";
-    tag = "v${version}";
-    hash = "sha256-fT13JMoOvKMxdHoagZAmIsGhU3M1S4bEmKUHae+EJcI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XWxYgnzvebO+iTL6idWyX+j7bsyvNkWdKDEuqsU/p4w=";
   };
 
   build-system = [ uv-build ];
@@ -38,9 +38,9 @@ buildPythonPackage rec {
 
   meta = {
     description = "Pythonic library for reading/modifying/writing Gerber/Excellon/IPC-356 files";
-    mainProgram = "gerbonara";
     homepage = "https://github.com/jaseg/gerbonara";
-    license = with lib.licenses; [ asl20 ];
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ wulfsta ];
+    mainProgram = "gerbonara";
   };
-}
+})
diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix
index 4986dde7dfc8..6bbb30d25905 100644
--- a/pkgs/development/python-modules/gguf/default.nix
+++ b/pkgs/development/python-modules/gguf/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gguf";
-  version = "8799";
+  version = "8951";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-AQWcj6FtBGKKU8DiAH/ZHH6XU/5hrBKiYvIoULpL+1g=";
+    hash = "sha256-/FFpf9qqQArKLMhxujZfUfSMcRiaQmhEC8bL5a7T4Ns=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/gguf-py";
@@ -59,6 +59,8 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Module for writing binary files in the GGUF format";
     homepage = "https://ggml.ai/";
+    downloadPage = "https://github.com/ggml-org/llama.cpp/releases";
+    changelog = "https://github.com/ggml-org/llama.cpp/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       mitchmindtree
diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix
index 6ea46fce5595..fc8254869ddd 100644
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "glean-parser";
-  version = "18.2.0";
+  version = "19.0.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "glean_parser";
     inherit version;
-    hash = "sha256-VDLOZL9HMp3+Smt+QE1TnMsG2Z/d633u7XRUkfvVt+c=";
+    hash = "sha256-uy4KSra+fg2qcE5NTp40ogIPhFpx38bEU2apF8vL9LM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index 1ca91283765a..387595c64b57 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -7,22 +7,24 @@
   google-auth,
   requests-oauthlib,
   click,
-  mock,
   pytestCheckHook,
+  gitUpdater,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "google-auth-oauthlib";
-  version = "1.2.4";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
-    repo = "google-auth-library-python-oauthlib";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-itnkKMHTpJNjMVvpXYq9V/ybaE/Ekt3uED1IoVebRcg=";
+    repo = "google-cloud-python";
+    tag = "google-auth-oauthlib-v${finalAttrs.version}";
+    hash = "sha256-lfB544cDaywiGTV0KlecU7oEl2Gbb4Ou8UCp+YjGtOA=";
   };
 
+  sourceRoot = "${finalAttrs.src.name}/packages/google-auth-oauthlib";
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -35,7 +37,6 @@ buildPythonPackage (finalAttrs: {
   };
 
   nativeCheckInputs = [
-    mock
     pytestCheckHook
   ]
   ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
@@ -53,10 +54,14 @@ buildPythonPackage (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
+  passthru.updateScript = {
+    rev-prefix = "google-auth-oauthlib-v";
+  };
+
   meta = {
     description = "Google Authentication Library: oauthlib integration";
-    homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib";
-    changelog = "https://github.com/googleapis/google-auth-library-python-oauthlib/blob/v${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-auth-oauthlib";
+    changelog = "https://github.com/googleapis/google-cloud-python/blob/${finalAttrs.src.tag}/packages/google-auth-oauthlib/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       sarahec
diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index 363463ff49d9..f1be9e6ea0b4 100644
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -83,7 +83,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python Client for Google Cloud Asset API";
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset";
-    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-${finalAttrs.src.tag}/packages/google-cloud-asset/CHANGELOG.md";
+    changelog = "https://github.com/googleapis/google-cloud-python/blob/${finalAttrs.src.tag}/packages/google-cloud-asset/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };
diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix
index 484c54ebf3d9..fd7a2e6b7a86 100644
--- a/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-automl";
-  version = "2.18.0";
+  version = "2.19.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_automl";
     inherit version;
-    hash = "sha256-F9JU0usvIFAxWQem49LpoD4KbJ+yaq1akoCJ7qUhRXI=";
+    hash = "sha256-xyZ7Wafv97FSB/5oaJ67P7kian4nL/E78nUL9ocUWM4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index 0e675a2061be..dedf77c6eeb5 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-container";
-  version = "2.62.0";
+  version = "2.64.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_container";
     inherit version;
-    hash = "sha256-O647Jw3v9kD1Pn0naPvAP/vzUxqIZWD7nk97VRRs1T8=";
+    hash = "sha256-tBWT4YnyXUxaW195ZmnB5DhLoKJfaymPZLVWkVseN00=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index 953254199a85..f5b745956ce1 100644
--- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Google Cloud Data Catalog API API client library";
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datacatalog";
-    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-${finalAttrs.src.tag}/packages/google-cloud-datacatalog/CHANGELOG.md";
+    changelog = "https://github.com/googleapis/google-cloud-python/blob/${finalAttrs.src.tag}/packages/google-cloud-datacatalog/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };
diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix
index 12237631551d..da2cddb15351 100644
--- a/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datastore";
-  version = "2.23.0";
+  version = "2.24.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_datastore";
     inherit version;
-    hash = "sha256-gASYg6Suko/cxmG6aAPsJnZl3A5vPOLakUQQeaa7Y4c=";
+    hash = "sha256-8IfAKmqkrGi78X8MBIrj7jVYVr8JxRQ5v7oZN0E4d5I=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix
index 2d72c0712d58..b94f421edd06 100644
--- a/pkgs/development/python-modules/google-cloud-dns/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dns/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dns";
-  version = "0.36.0";
+  version = "0.36.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_dns";
     inherit version;
-    hash = "sha256-SwpOx2wnOQHUixtzEyw/3NMYdIUMpkJM115tYxrjcR4=";
+    hash = "sha256-Uf4riBDfgTadviwIe6KUSypgIZBeMQSOTe6cmP8fEkk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix
index 58e632a2d84f..1377f8e92f93 100644
--- a/pkgs/development/python-modules/google-cloud-firestore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -2,7 +2,7 @@
   lib,
   aiounittest,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   freezegun,
   google-api-core,
   google-cloud-core,
@@ -16,19 +16,23 @@
   pythonOlder,
   pyyaml,
   setuptools,
+  nix-update-script,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "google-cloud-firestore";
-  version = "2.26.0";
+  version = "2.27.0";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "google_cloud_firestore";
-    inherit (finalAttrs) version;
-    hash = "sha256-ED/Cve3LgBoxWQ/vmg1QdU7mO4A5RvmvyQSBfIW9k10=";
+  src = fetchFromGitHub {
+    owner = "googleapis";
+    repo = "google-cloud-python";
+    tag = "google-cloud-firestore-v${finalAttrs.version}";
+    hash = "sha256-hdUT4SRPOL+ArpU4RcsNCUCV3UCW3vQgwtHuxJiyZeU=";
   };
 
+  sourceRoot = "${finalAttrs.src.name}/packages/google-cloud-firestore";
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -78,10 +82,17 @@ buildPythonPackage (finalAttrs: {
     "google.cloud.firestore_admin_v1"
   ];
 
+  updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "google-cloud-firestore-v(.*)"
+    ];
+  };
+
   meta = {
     description = "Google Cloud Firestore API client library";
-    homepage = "https://github.com/googleapis/python-firestore";
-    changelog = "https://github.com/googleapis/python-firestore/blob/v${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-firestore";
+    changelog = "https://github.com/googleapis/google-cloud-python/tree/${finalAttrs.src.tag}/packages/google-cloud-firestore/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ sarahec ];
   };
diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index 3639bb831ee0..6a34f80611a6 100644
--- a/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-language";
-  version = "2.19.0";
+  version = "2.20.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_language";
     inherit version;
-    hash = "sha256-O4j26r0cJBOhxskYy+QKIqXRRAGTAwlxfbtwmzU8bGQ=";
+    hash = "sha256-MoROVi9/Fen4E2GGkTyBhRPh9Aw71oXd1Ew7WyhV3JM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index e2b1348506a7..1981e59db386 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-os-config";
-  version = "1.23.0";
+  version = "1.24.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_os_config";
     inherit version;
-    hash = "sha256-pinPVbPt42st+JgUxszzwdQ8fxtD22x8AutIYIUbrzo=";
+    hash = "sha256-3fZOrEfA2pSD1XO33pq+1IpabL4nkxrpQ5aJn1mOAZI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix
index c5d913cf5bf4..5fc0a98412f3 100644
--- a/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-redis";
-  version = "2.20.0";
+  version = "2.21.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_redis";
     inherit version;
-    hash = "sha256-pnLkxqxBj/IM6J73AnYtZ4nD1W/9F8MT6Z+SWiWPHoo=";
+    hash = "sha256-6ulUf+zR5wLWoc5wHGgZ1Rp+bEjNUmdZlIRXx+EkEUI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix
index 8d3411afdc13..6e4bbff2f88a 100644
--- a/pkgs/development/python-modules/google-cloud-shell/default.nix
+++ b/pkgs/development/python-modules/google-cloud-shell/default.nix
@@ -12,15 +12,15 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "google-cloud-shell";
-  version = "1.14.0";
+  version = "1.15.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_shell";
-    inherit version;
-    hash = "sha256-hnlYocYjIiPjO4HparvKTC0pFtRXAkRVB9O9TYHOjFU=";
+    inherit (finalAttrs) version;
+    hash = "sha256-FSnxSR937S5mUz7uxACWB3NRD5bFNaxTKiTWCzt/VAg=";
   };
 
   build-system = [ setuptools ];
@@ -51,8 +51,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python Client for Cloud Shell";
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-shell";
-    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-shell-v${version}/packages/google-cloud-shell/CHANGELOG.md";
+    changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-shell-v${finalAttrs.version}/packages/google-cloud-shell/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index c42e332258b7..80e8ec37aaa6 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-speech";
-  version = "2.36.0";
+  version = "2.38.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_speech";
     inherit version;
-    hash = "sha256-OkRaAzzHdy99BzwDFCp+gASEFdtCmBNyxrge3Hah4no=";
+    hash = "sha256-GFS1HLt5Vyc7a6YfSmz0neyNCexFCZFYeJflAmfqylE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index ce738191c2f6..55e252a4f12c 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -2,13 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  google-api-core,
   google-auth,
   google-cloud-core,
   google-cloud-iam,
   google-cloud-kms,
   google-cloud-testutils,
+  google-crc32c,
   google-resumable-media,
+  grpc-google-iam-v1,
+  grpcio,
+  grpcio-status,
   mock,
+  opentelemetry-api,
+  proto-plus,
   protobuf,
   pytestCheckHook,
   pytest-asyncio,
@@ -18,29 +25,39 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
-  version = "3.8.0";
+  version = "3.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-storage";
     tag = "v${version}";
-    hash = "sha256-CHku6tiELE3deP6ZCRx/ekn60FmF3gO51cOAF1DkQrI=";
+    hash = "sha256-pKy1A9RNyRlAn4bXclcdvbfW4kZOP9Z4HqKWwcrDePo=";
   };
 
-  pythonRelaxDeps = [ "google-auth" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
+    google-api-core
     google-auth
     google-cloud-core
+    google-crc32c
     google-resumable-media
     requests
   ];
 
   optional-dependencies = {
+    grpc = [
+      google-api-core
+      grpc-google-iam-v1
+      grpcio
+      grpcio-status
+      proto-plus
+      protobuf
+    ]
+    ++ google-api-core.optional-dependencies.grpc;
     protobuf = [ protobuf ];
+    tracing = [ opentelemetry-api ];
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index 341d36a9e3f7..2983e4425d86 100644
--- a/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-tasks";
-  version = "2.21.0";
+  version = "2.22.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_tasks";
     inherit version;
-    hash = "sha256-0o8zJIVT+vD/Ap4Zgaq1bNE72TNjXDvDOqGHZ15+FNE=";
+    hash = "sha256-vJfYR/HfvxtgK2e5Kbe69XD+o13O2q2rta39+BameEE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix
index 6ce14fa5ba12..839c2322562a 100644
--- a/pkgs/development/python-modules/google-cloud-trace/default.nix
+++ b/pkgs/development/python-modules/google-cloud-trace/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-trace";
-  version = "1.18.0";
+  version = "1.19.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "google_cloud_trace";
     inherit version;
-    hash = "sha256-RtQrkCc9o7xIULsNa5ogXrgmpUVh/xswyjPMkhdMPzc=";
+    hash = "sha256-WCk8bvzubHS7hU/wGwCII772aEXBTxX/pSCdVFCYpl0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix
index 30d7dba4512a..84a518517da1 100644
--- a/pkgs/development/python-modules/googleapis-common-protos/default.nix
+++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix
@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "googleapis-common-protos";
   version = "1.73.0";
   pyproject = true;
@@ -16,11 +16,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
-    tag = "googleapis-common-protos-v${version}";
+    tag = "googleapis-common-protos-v${finalAttrs.version}";
     hash = "sha256-LrsmLySAOTsECwxa1NaFuyZAjar0Jbg9DHNi6uqYaxk=";
   };
 
-  sourceRoot = "${src.name}/packages/googleapis-common-protos";
+  sourceRoot = "${finalAttrs.src.name}/packages/googleapis-common-protos";
 
   build-system = [ setuptools ];
 
@@ -53,9 +53,9 @@ buildPythonPackage rec {
 
   meta = {
     description = "Common protobufs used in Google APIs";
-    homepage = "https://github.com/googleapis/python-api-common-protos";
-    changelog = "https://github.com/googleapis/python-api-common-protos/releases/tag/${src.tag}";
+    homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/googleapis-common-protos";
+    changelog = "https://github.com/googleapis/google-cloud-python/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.sarahec ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix
index 596ae5dc7f60..1c372d054ef8 100644
--- a/pkgs/development/python-modules/googletrans/default.nix
+++ b/pkgs/development/python-modules/googletrans/default.nix
@@ -28,7 +28,6 @@ buildPythonPackage rec {
   meta = {
     description = "Library to interact with Google Translate API";
     homepage = "https://py-googletrans.readthedocs.io";
-    changelog = "https://github.com/ssut/py-googletrans/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ unode ];
     mainProgram = "translate";
diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
index c4b655154839..26631076f719 100644
--- a/pkgs/development/python-modules/green/default.nix
+++ b/pkgs/development/python-modules/green/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   checkPhase = ''
     $out/bin/green -tvvv \
       green.test.test_version \
-      green.test.test_cmdline \
+      green.test.test_cmdline
   '';
 
   pythonImportsCheck = [ "green" ];
diff --git a/pkgs/development/python-modules/greenback/default.nix b/pkgs/development/python-modules/greenback/default.nix
index 3cbf47a7a5a1..b287188af03f 100644
--- a/pkgs/development/python-modules/greenback/default.nix
+++ b/pkgs/development/python-modules/greenback/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = {
     description = "Use anyio and asyncio from synchronous code";
     homepage = "https://github.com/oremanj/greenback";
-    changelog = "https://github.com/oremanj/greenback/blob/${src.rev}/CHANGES.rst";
+    changelog = "https://github.com/oremanj/greenback/blob/${src.tag}/docs/source/history.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ taranarmo ];
   };
diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix
index 6abb7629726c..d38d2e3ad854 100644
--- a/pkgs/development/python-modules/groq/default.nix
+++ b/pkgs/development/python-modules/groq/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "groq";
-  version = "1.1.2";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "groq";
     repo = "groq-python";
     tag = "v${version}";
-    hash = "sha256-uOTttpjV2iislaink/0Jewkinyb2hYt0J+sv/OSuhJ4=";
+    hash = "sha256-PisqKpVM2KAlGgZDcCoFJhoib7WhuM1AkJOGYVimW0U=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix
index 36402aa4aaa9..028c63669ca3 100644
--- a/pkgs/development/python-modules/grpcio-channelz/default.nix
+++ b/pkgs/development/python-modules/grpcio-channelz/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-channelz";
-  version = "1.78.0";
+  version = "1.80.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_channelz";
     inherit version;
-    hash = "sha256-5E/gR414spB1xtJYuMUQdhnAZGXAE6sYSeW+9JOvFT4=";
+    hash = "sha256-fs6As480ti6Q5uHFqghYXwwPE8GpyI6vdNioZxw6n6E=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix
index 929e90aef8e8..2db14472125a 100644
--- a/pkgs/development/python-modules/grpcio-health-checking/default.nix
+++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix
@@ -11,13 +11,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-health-checking";
-  version = "1.78.0";
+  version = "1.80.0";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "grpcio_health_checking";
     inherit version;
-    hash = "sha256-eFJtXGC5uZ/RiVS4n4bXADPHAulq1szJdJuvFhNpebM=";
+    hash = "sha256-LMXwi8i4FrhlWrb1nHFFAGO6IHZtMeIaST6RLjVgyLE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix
index a10c4dc6fb3c..914cffe15618 100644
--- a/pkgs/development/python-modules/grpcio-reflection/default.nix
+++ b/pkgs/development/python-modules/grpcio-reflection/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-reflection";
-  version = "1.78.0";
+  version = "1.80.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_reflection";
     inherit version;
-    hash = "sha256-5uYMC4XbzfljtNTRUMDx0ji6iR2AW1dcUsA2XQf8DEA=";
+    hash = "sha256-6cdqq8QyQnmUW3C8dqPUG8T5OWv/zxz8EBGlccLFYiE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index e9997b8849a3..a4ebf1aaf5a2 100644
--- a/pkgs/development/python-modules/grpcio-status/default.nix
+++ b/pkgs/development/python-modules/grpcio-status/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-status";
-  version = "1.78.0";
+  version = "1.80.0";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "grpcio_status";
     inherit version;
-    hash = "sha256-o0z9KBAb/qhLWqD5NrS0IwGekhOIKQcWavazvdxZ4Yk=";
+    hash = "sha256-33OAKkyJo+qIqir/lx6Ib8zOFivC5lEUCLPWehRDgc0=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index d855789f1842..812e24eaf438 100644
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-testing";
-  version = "1.78.0";
+  version = "1.80.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_testing";
     inherit version;
-    hash = "sha256-BuQoB75GlJvciDOaA6cQ7AVbBta8ghy1ljZuUWWRU8w=";
+    hash = "sha256-+1rVfED/36l3MEPfo46MN3Oa+ONHHxZwoh54BRzRmv0=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 00033efa4620..d079a2447a3f 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -13,13 +13,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.78.0";
+  version = "1.80.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_tools";
     inherit version;
-    hash = "sha256-Sw3YZWAnQxbhVdklFYJ2+FZFCBkwiLxD4g0/Xf+Vays=";
+    hash = "sha256-JgUrGcbODc9S0QJElq6j4r36hkFZ8G3HuXsi0EGpSyY=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index a7c59f6a2c4f..880782e6c683 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -18,12 +18,12 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.78.0";
+  version = "1.80.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-c4K5UYlUbzdcF09TpfqHPO+RxLgAX6oFzFs77qnE8cU=";
+    hash = "sha256-KayhXt0GiMIroB18wBywANcrIDP0o8cqgaGbVv0UMlc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index fc182732af42..797f0a320a9d 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "gst-python";
-  version = "1.26.0";
+  version = "1.26.11";
 
   pyproject = false;
 
@@ -32,21 +32,14 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/gst-python/gst-python-${version}.tar.xz";
-    hash = "sha256-5QRqBdd6uxVnGtAc0ZCNF9YuWgb114Qb5DQq3io/uNs=";
+    hash = "sha256-ETFrp2m1bSbYsUZMcZipkkyurkgTT321kXH68ac9xDY=";
   };
 
-  patches = [
-    # Fix segfault with PyGObject>=3.52.0
-    # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8653
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/69bba61e548c7a63bc18137e63e41489a7de9d36.patch";
-      stripLen = 2;
-      hash = "sha256-BfWPc8dsB09KiEm9bNT8e+jH76jiDefQlEhhLJoq7tI=";
-    })
-
-    # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4322
-    ./skip-failing-test-not-initialized.patch
-  ];
+  # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4322
+  postPatch = ''
+    substituteInPlace testsuite/meson.build \
+      --replace-fail "['gstinit', 'test_gst_init.py']," ""
+  '';
 
   # Python 2.x is not supported.
   disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch b/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch
deleted file mode 100644
index 169c85a0802c..000000000000
--- a/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/testsuite/test_gst.py b/testsuite/test_gst.py
-index 2111b968..fd8a4627 100644
---- a/testsuite/test_gst.py
-+++ b/testsuite/test_gst.py
-@@ -38,45 +38,6 @@ class TimeArgsTest(TestCase):
-         self.assertEqual(Gst.TIME_ARGS(Gst.SECOND), '0:00:01.000000000')
- 
- 
--class TestNotInitialized(TestCase):
--    def testNotInitialized(self):
--        if sys.version_info >= (3, 0):
--            assert_type = Gst.NotInitialized
--        else:
--            assert_type = TypeError
--
--        with self.assertRaises(assert_type):
--            Gst.Caps.from_string("audio/x-raw")
--
--        with self.assertRaises(assert_type):
--            Gst.Structure.from_string("audio/x-raw")
--
--        with self.assertRaises(assert_type):
--            Gst.ElementFactory.make("identity", None)
--
--    def testNotDeinitialized(self):
--        Gst.init(None)
--
--        assert(Gst.Caps.from_string("audio/x-raw"))
--        assert(Gst.Structure.from_string("audio/x-raw"))
--        assert(Gst.ElementFactory.make("identity", None))
--
--        Gst.deinit()
--        if sys.version_info >= (3, 0):
--            assert_type = Gst.NotInitialized
--        else:
--            assert_type = TypeError
--
--        with self.assertRaises(assert_type):
--            Gst.Caps.from_string("audio/x-raw")
--
--        with self.assertRaises(assert_type):
--            Gst.Structure.from_string("audio/x-raw")
--
--        with self.assertRaises(assert_type):
--            Gst.ElementFactory.make("identity", None)
--
--
- class TestStructure(TestCase):
- 
-     def test_new(self):
diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix
index e0466e7b83f8..bb6d80bdd483 100644
--- a/pkgs/development/python-modules/guidata/default.nix
+++ b/pkgs/development/python-modules/guidata/default.nix
@@ -113,7 +113,12 @@ buildPythonPackage rec {
   meta = {
     description = "Python library generating graphical user interfaces for easy dataset editing and display";
     homepage = "https://github.com/PlotPyStack/guidata";
-    changelog = "https://github.com/PlotPyStack/guidata/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/PlotPyStack/guidata/blob/master/doc/release_notes/release_${lib.versions.major version}.${
+      lib.pipe version [
+        lib.versions.minor
+        (lib.fixedWidthString 2 "0")
+      ]
+    }.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ doronbehar ];
   };
diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix
index 89b8ba72f766..d163732a96f2 100644
--- a/pkgs/development/python-modules/gymnasium/default.nix
+++ b/pkgs/development/python-modules/gymnasium/default.nix
@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "gymnasium";
-  version = "1.2.3";
+  version = "1.3.0";
 
   pyproject = true;
 
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     owner = "Farama-Foundation";
     repo = "gymnasium";
     tag = "v${version}";
-    hash = "sha256-b712BPs7AS8UE8Zsu9GW/J6Vag9NB/x728MtQ5yrjbY=";
+    hash = "sha256-asQ/RqnmGRoVdwBkp4RIkqzGtQ7PnISt8/mRcXrNbBc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index b0ab2fc32af4..0adb77a037ef 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -79,6 +79,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "h5py" ];
 
+  passthru = {
+    # To evaluate more easily *Support flags of it from within Python Packages.
+    inherit hdf5;
+  };
+
   meta = {
     changelog = "https://github.com/h5py/h5py/blob/${version}/docs/whatsnew/${lib.versions.majorMinor version}.rst";
     description = "Pythonic interface to the HDF5 binary data format";
diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index 76caaf33f46d..c4bdd3aed5a2 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "hcloud";
-  version = "2.17.1";
+  version = "2.19.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-BPG30bsh4FprIdr8f9NjJpjizww22ER4gBRf1/QS/BM=";
+    hash = "sha256-sXoudQNFbnpHDfuvayWLt9P17xojIn0CGZ2pHMh9wVY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix
index d70fc70a2a23..43620b0a92d2 100644
--- a/pkgs/development/python-modules/hdate/default.nix
+++ b/pkgs/development/python-modules/hdate/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "hdate";
-  version = "1.1.2";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "py-libhdate";
     repo = "py-libhdate";
     tag = "v${version}";
-    hash = "sha256-nM9LHcXuDpQ2j4ACF6W5H3iTJcKdbcY4bkbumIkKyeE=";
+    hash = "sha256-6CCaHnpZEU7krLzkRKRF4Iui7Vd7AOfIn1fTzIdxPtw=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/heretic-llm/default.nix b/pkgs/development/python-modules/heretic-llm/default.nix
index 749d46b9fad9..fb7a05c08439 100644
--- a/pkgs/development/python-modules/heretic-llm/default.nix
+++ b/pkgs/development/python-modules/heretic-llm/default.nix
@@ -80,7 +80,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Tool to remove censorship removal for language models";
     homepage = "https://github.com/p-e-w/heretic";
-    changelog = "https://github.com/p-e-w/heretic/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/p-e-w/heretic/releases/tag/${finalAttrs.src.tag}";
     license = with lib.licenses; [
       agpl3Only
       agpl3Plus
diff --git a/pkgs/development/python-modules/hier-config/default.nix b/pkgs/development/python-modules/hier-config/default.nix
index 4d8c8a24e7ac..681c8a86df1e 100644
--- a/pkgs/development/python-modules/hier-config/default.nix
+++ b/pkgs/development/python-modules/hier-config/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Module to handle hierarchical configurations";
     homepage = "https://github.com/netdevops/hier_config";
-    changelog = "https://github.com/netdevops/hier_config/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/netdevops/hier_config/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 5588552b1cb1..6784d9b15084 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "holidays";
-  version = "0.94";
+  version = "0.95";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PJV1hIrj8Lblmzzqob3pmNpfkvl/9kwvc4od5rxZbk0=";
+    hash = "sha256-MyTOCHQw/TYvH9Xm3UcXHjza2f/2ICbb3vcTGt1Cpgg=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix
deleted file mode 100644
index 5d8c99914da0..000000000000
--- a/pkgs/development/python-modules/howdoi/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  lib,
-  appdirs,
-  buildPythonPackage,
-  cachelib,
-  colorama,
-  cssselect,
-  fetchFromGitHub,
-  fetchpatch,
-  keep,
-  lxml,
-  pygments,
-  pyquery,
-  requests,
-  rich,
-  pytestCheckHook,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "howdoi";
-  version = "2.0.20";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "gleitz";
-    repo = "howdoi";
-    tag = "v${version}";
-    hash = "sha256-u0k+h7Sp2t/JUnfPqRzDpEA+vNXB7CpyZ/SRvk+B9t0=";
-  };
-
-  patches = [
-    # Bad test case fix: comparing hardcoded string to internet search result
-    # PR merged: https://github.com/gleitz/howdoi/pull/497
-    # Please remove on the next release
-    (fetchpatch {
-      url = "https://github.com/gleitz/howdoi/commit/7d24e9e1c87811a6e66d60f504381383cf1ac3fd.patch";
-      hash = "sha256-AFQMnMEijaExqiimbNaVeIRmZJ4Yj0nGUOEjfsvBLh8=";
-    })
-  ];
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    appdirs
-    cachelib
-    colorama
-    cssselect
-    keep
-    lxml
-    pygments
-    pyquery
-    requests
-    rich
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  disabledTests = [
-    "test_colorize"
-    # Tests are flaky, OSError: [Errno 24] Too many open files happens
-    "test_answer_links_using_l_option"
-    "test_answers_bing"
-    "test_answers"
-    "test_json_output"
-    "test_missing_pre_or_code_query"
-    "test_multiple_answers"
-    "test_position"
-    "test_unicode_answer"
-  ];
-
-  pythonImportsCheck = [ "howdoi" ];
-
-  meta = {
-    description = "Instant coding answers via the command line";
-    homepage = "https://github.com/gleitz/howdoi";
-    changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix
index b878b614a389..94a241123942 100644
--- a/pkgs/development/python-modules/hstspreload/default.nix
+++ b/pkgs/development/python-modules/hstspreload/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "hstspreload";
-  version = "2026.3.1";
+  version = "2026.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sethmlarson";
     repo = "hstspreload";
     tag = finalAttrs.version;
-    hash = "sha256-vxELSpTQMidvwDzSny1oJINE6ZxYC9H4pw3SDP44xCI=";
+    hash = "sha256-QmhQJqt75rP5YWBLJ3fA7Ud7o6AWIpUUSoJ5tAA9pPo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/httpx-retries/default.nix b/pkgs/development/python-modules/httpx-retries/default.nix
new file mode 100644
index 000000000000..f56331bae012
--- /dev/null
+++ b/pkgs/development/python-modules/httpx-retries/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatch-fancy-pypi-readme,
+  hatchling,
+  httpx,
+  pytest-asyncio,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "httpx-retries";
+  version = "0.5.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "will-ockmore";
+    repo = "httpx-retries";
+    tag = finalAttrs.version;
+    hash = "sha256-LElTcIWNsb2AVbk3dXcCnXeB8JhyM7Y64nTZGZWlVm8=";
+  };
+
+  build-system = [
+    hatch-fancy-pypi-readme
+    hatchling
+  ];
+
+  dependencies = [ httpx ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "httpx_retries" ];
+
+  meta = {
+    description = "Retry layer for HTTPX";
+    homepage = "https://github.com/will-ockmore/httpx-retries";
+    changelog = "https://github.com/will-ockmore/httpx-retries/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+})
diff --git a/pkgs/development/python-modules/hueble/default.nix b/pkgs/development/python-modules/hueble/default.nix
index 051b1bd68303..87b63ec3b319 100644
--- a/pkgs/development/python-modules/hueble/default.nix
+++ b/pkgs/development/python-modules/hueble/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "hueble";
-  version = "2.2.1";
+  version = "2.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "flip-dots";
     repo = "HueBLE";
     tag = "v${version}";
-    hash = "sha256-JbihHDG44PeS6rxUOXSRF9NlH/smUGz3/JrCmXqTT5s=";
+    hash = "sha256-ASegu+kssupiJD6IFDAmZk7kl+RVUsTep6Zjs6IhVBI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/human-readable/default.nix b/pkgs/development/python-modules/human-readable/default.nix
index 043a5a19c8b0..faa76071c3f1 100644
--- a/pkgs/development/python-modules/human-readable/default.nix
+++ b/pkgs/development/python-modules/human-readable/default.nix
@@ -6,27 +6,28 @@
   hatch-vcs,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "human-readable";
-  version = "2.0.2";
+  version = "2.0.3";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "human_readable";
-    inherit version;
-    hash = "sha256-I2s/hqxUexK2yizqiJt4HF5yceR7mM3ieV862ZaDs84=";
+    inherit (finalAttrs) version;
+    hash = "sha256-P4Ef1W7oZpVyyy7J+FK1PuBwB0jlPDaVcx/9mrT8Uks=";
   };
 
-  pyproject = true;
-
-  nativeBuildInputs = [
+  build-system = [
     hatchling
     hatch-vcs
   ];
 
+  pythonImportsCheck = [ "human_readable" ];
+
   meta = {
     description = "Library to make data intended for machines, readable to humans";
     homepage = "https://github.com/staticdev/human-readable";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mkg20001 ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/hydra-joblib-launcher/default.nix b/pkgs/development/python-modules/hydra-joblib-launcher/default.nix
index 33ccb24a6cd2..83a6ac63a366 100644
--- a/pkgs/development/python-modules/hydra-joblib-launcher/default.nix
+++ b/pkgs/development/python-modules/hydra-joblib-launcher/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: {
   ];
 
   # tries to write to source directory otherwise:
-  pytestFlagsArray = [ "-p no:cacheprovider" ];
+  pytestFlags = [ "-pno:cacheprovider" ];
 
   meta = {
     inherit (hydra-core.meta) changelog license;
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index 6f7d3eb7588e..6b2e44c08d79 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "hypothesis";
-  version = "6.150.2";
+  version = "6.151.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "HypothesisWorks";
     repo = "hypothesis";
     tag = "hypothesis-python-${version}";
-    hash = "sha256-5u6/x+sO14N6qiyLcnJbTxqYfoWjpNi/m/lt6PfLFTE=";
+    hash = "sha256-zxX4zF6huOF7sTpVFAiN0iElxsW2C5BE0kiZbpPzXpc=";
   };
 
   # I tried to package sphinx-selective-exclude, but it throws
@@ -92,6 +92,8 @@ buildPythonPackage rec {
     "test_prints_seed_only_on_healthcheck"
     # calls script with the naked interpreter
     "test_constants_from_running_file"
+    # fails consistenly
+    "test_prints_seed_on_very_slow_shrinking"
   ]
   ++ lib.optionals (pythonAtLeast "3.12") [
     # AssertionError: assert [b'def      \...   f(): pass'] == [b'def\\', b'    f(): pass']
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 3b0fe8a8e3e7..0bd78ebdac36 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iamdata";
-  version = "0.1.202604191";
+  version = "0.1.202605021";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cS7eh68a1EQmoqOkCnkvmYefUazQm7qClMZwRWXsSOo=";
+    hash = "sha256-nnvd6bVqsnBH5K3zSI5VNs8NK4CT35Rotx7FIw2EiXE=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix
index 519712568574..4a387e15993f 100644
--- a/pkgs/development/python-modules/iaqualink/default.nix
+++ b/pkgs/development/python-modules/iaqualink/default.nix
@@ -4,25 +4,25 @@
   fetchFromGitHub,
   hatch-vcs,
   hatchling,
+  httpx-retries,
   httpx,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
+  pyyaml,
   respx,
+  typer,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "iaqualink";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
-
   src = fetchFromGitHub {
     owner = "flz";
     repo = "iaqualink-py";
-    tag = "v${version}";
-    hash = "sha256-s/ZhcbTaCvn7ei1O4+P4fKPojitl+4gsatc9PZx+W2g=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Bn4dcfTRkY+qc/c39ip+vZvlbqll7qZOl7phMgw9EjY=";
   };
 
   build-system = [
@@ -30,21 +30,34 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  dependencies = [ httpx ] ++ httpx.optional-dependencies.http2;
+  dependencies = [
+    httpx
+    httpx-retries
+  ]
+  ++ httpx.optional-dependencies.http2;
+
+  optional-dependencies = {
+    cli = [
+      pyyaml
+      typer
+    ];
+  };
 
   nativeCheckInputs = [
     pytest-cov-stub
     pytestCheckHook
     respx
-  ];
+    typer
+  ]
+  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
   pythonImportsCheck = [ "iaqualink" ];
 
   meta = {
     description = "Python library for Jandy iAqualink";
     homepage = "https://github.com/flz/iaqualink-py";
-    changelog = "https://github.com/flz/iaqualink-py/releases/tag/v${src.tag}";
+    changelog = "https://github.com/flz/iaqualink-py/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix
index 8f499225e418..70d05e492e23 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@@ -448,7 +448,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Productivity-centric Python Big Data Framework";
     homepage = "https://github.com/ibis-project/ibis";
-    changelog = "https://github.com/ibis-project/ibis/blob/${finalAttrs.src.tag}/docs/release_notes.md";
+    changelog = "https://github.com/ibis-project/ibis/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       cpcloud
diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix
deleted file mode 100644
index 84c89aa5258f..000000000000
--- a/pkgs/development/python-modules/idna-ssl/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  idna,
-}:
-
-buildPythonPackage rec {
-  pname = "idna-ssl";
-  version = "1.1.0";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c";
-  };
-
-  propagatedBuildInputs = [ idna ];
-
-  # Infinite recursion: tests require aiohttp, aiohttp requires idna-ssl
-  doCheck = false;
-
-  meta = {
-    description = "Patch ssl.match_hostname for Unicode(idna) domains support";
-    homepage = "https://github.com/aio-libs/idna-ssl";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix
index 93277ee7733b..3e49ffcad2c7 100644
--- a/pkgs/development/python-modules/imap-tools/default.nix
+++ b/pkgs/development/python-modules/imap-tools/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "imap-tools";
-  version = "1.12.0";
+  version = "1.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ikvk";
     repo = "imap_tools";
     tag = "v${version}";
-    hash = "sha256-EUAt1M9ez5T/y02xHbyl/U/dkBHri92C6hTxY8iCplc=";
+    hash = "sha256-VNH3aUqIa7hSJr6A7SJUSad1JkKD1D0QZ3WKQuOQoeE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix
index 106bd1735764..41e0fdb0ca17 100644
--- a/pkgs/development/python-modules/importlib-metadata/default.nix
+++ b/pkgs/development/python-modules/importlib-metadata/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "importlib-metadata";
-  version = "8.7.1";
+  version = "9.0.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "importlib_metadata";
     inherit version;
-    hash = "sha256-Sf7xrmRAwYIFL0B8jTSmj3Lvw225ypDcARM5jy/d6Ls=";
+    hash = "sha256-pPV6tZnmouMBbXWVz9cutGYaUQbnh6lbzJDHEFuDHvw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/indevolt-api/default.nix b/pkgs/development/python-modules/indevolt-api/default.nix
index c88df046d164..018781a486cd 100644
--- a/pkgs/development/python-modules/indevolt-api/default.nix
+++ b/pkgs/development/python-modules/indevolt-api/default.nix
@@ -4,19 +4,18 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  wheel,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "indevolt-api";
-  version = "1.2.3";
+  version = "1.6.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Xirt";
     repo = "indevolt-api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-l5O4Wn3TBG0grAVUnUJPvdavSka+7YX5cpQp7PzxuAg=";
+    hash = "sha256-Fhi9+6nWt7upUuA045SwPCwWevZDZTWnTiTBHsaR9W4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/inky/default.nix b/pkgs/development/python-modules/inky/default.nix
index ee90cb351eb5..2c92ab6ea62b 100644
--- a/pkgs/development/python-modules/inky/default.nix
+++ b/pkgs/development/python-modules/inky/default.nix
@@ -15,14 +15,14 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "inky";
-  version = "2.3.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pimoroni";
     repo = "inky";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1z2AZr6mlrl1O071iWS+tbWopUEUzLZe/QTmvl2atxQ=";
+    hash = "sha256-wHAAfTAJ0MEmGrZypH/YOkyMzC+sav8fBEXnk/Q2ed0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/installer/cross.patch b/pkgs/development/python-modules/installer/cross.patch
index 3e7f185f041d..a35e1763482d 100644
--- a/pkgs/development/python-modules/installer/cross.patch
+++ b/pkgs/development/python-modules/installer/cross.patch
@@ -1,5 +1,5 @@
 diff --git a/src/installer/__main__.py b/src/installer/__main__.py
-index 51014b9..45682d0 100644
+index b7a7445..6110e62 100644
 --- a/src/installer/__main__.py
 +++ b/src/installer/__main__.py
 @@ -30,6 +30,13 @@ def _get_main_parser() -> argparse.ArgumentParser:
@@ -16,27 +16,20 @@ index 51014b9..45682d0 100644
      parser.add_argument(
          "--compile-bytecode",
          action="append",
-@@ -86,7 +93,7 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None:
-     with WheelFile.open(args.wheel) as source:
-         destination = SchemeDictionaryDestination(
-             scheme_dict=_get_scheme_dict(source.distribution, prefix=args.prefix),
--            interpreter=sys.executable,
-+            interpreter=args.executable,
-             script_kind=get_launcher_kind(),
-             bytecode_optimization_levels=bytecode_levels,
-             destdir=args.destdir,
-@@ -94,5 +101,6 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None:
-         installer.install(source, destination, {})
- 
- 
-+
- if __name__ == "__main__":  # pragma: no cover
-     _main(sys.argv[1:], "python -m installer")
+@@ -102,7 +109,7 @@ def _main(cli_args: Sequence[str], program: str | None = None) -> None:
+                 source.validate_record(validate_contents=args.validate_record == "all")
+             destination = SchemeDictionaryDestination(
+                 scheme_dict=_get_scheme_dict(source.distribution, prefix=args.prefix),
+-                interpreter=sys.executable,
++                interpreter=args.executable,
+                 script_kind=get_launcher_kind(),
+                 bytecode_optimization_levels=bytecode_levels,
+                 destdir=args.destdir,
 diff --git a/tests/test_main.py b/tests/test_main.py
-index 391a13d..d7b4192 100644
+index cb09b3d..3200819 100644
 --- a/tests/test_main.py
 +++ b/tests/test_main.py
-@@ -53,6 +53,28 @@ def test_main_prefix(fancy_wheel, tmp_path):
+@@ -74,6 +74,28 @@ def test_main_prefix(fancy_wheel, tmp_path):
      }
  
  
diff --git a/pkgs/development/python-modules/installer/default.nix b/pkgs/development/python-modules/installer/default.nix
index b7273769abbb..b0fcdf21f463 100644
--- a/pkgs/development/python-modules/installer/default.nix
+++ b/pkgs/development/python-modules/installer/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonAtLeast,
   fetchFromGitHub,
   pytestCheckHook,
   flit-core,
@@ -11,27 +10,21 @@
 
 buildPythonPackage rec {
   pname = "installer";
-  version = "0.7.0";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "installer";
     rev = version;
-    hash = "sha256-thHghU+1Alpay5r9Dc3v7ATRFfYKV8l9qR0nbGOOX/A=";
+    hash = "sha256-zOnDOaH+9h78Z1667n1Cr8HIm8+OPn2Vc1Zl4XksiCM=";
   };
 
-  patches =
-    lib.optionals (pythonAtLeast "3.13") [
-      # Fix compatibility with Python 3.13
-      # https://github.com/pypa/installer/pull/201
-      ./python313-compat.patch
-    ]
-    ++ [
-      # Add -m flag to installer to correctly support cross
-      # https://github.com/pypa/installer/pull/258
-      ./cross.patch
-    ];
+  patches = [
+    # Add -m flag to installer to correctly support cross
+    # https://github.com/pypa/installer/pull/258
+    ./cross.patch
+  ];
 
   nativeBuildInputs = [ flit-core ];
 
diff --git a/pkgs/development/python-modules/installer/python313-compat.patch b/pkgs/development/python-modules/installer/python313-compat.patch
deleted file mode 100644
index 423a550510eb..000000000000
--- a/pkgs/development/python-modules/installer/python313-compat.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b23f89b10cf5d179bd6b0bad195ee36f43a5fb9e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Edgar=20Ram=C3=ADrez=20Mondrag=C3=B3n?=
- <16805946+edgarrmondragon@users.noreply.github.com>
-Date: Tue, 19 Dec 2023 06:09:41 -0600
-Subject: [PATCH] Fix removed `importlib.resources.read_binary` in Python 3.13
- (#201)
-
-diff --git a/noxfile.py b/noxfile.py
-index a690c59..6a69cce 100644
---- a/noxfile.py
-+++ b/noxfile.py
-@@ -22,7 +22,7 @@ def lint(session):
-     session.run("pre-commit", "run", "--all-files", *args)
- 
- 
--@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3"])
-+@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3"])
- def test(session):
-     session.install(".")
-     session.install("-r", "tests/requirements.txt")
-@@ -42,7 +42,7 @@ def test(session):
-     )
- 
- 
--@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3"])
-+@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3"])
- def doctest(session):
-     session.install(".")
-     session.install("-r", "docs/requirements.txt")
-diff --git a/src/installer/scripts.py b/src/installer/scripts.py
-index d18060b..c9f96b4 100644
---- a/src/installer/scripts.py
-+++ b/src/installer/scripts.py
-@@ -3,9 +3,19 @@
- import io
- import os
- import shlex
-+import sys
- import zipfile
--from importlib.resources import read_binary
--from typing import TYPE_CHECKING, Mapping, Optional, Tuple
-+from types import ModuleType
-+from typing import TYPE_CHECKING, Mapping, Optional, Tuple, Union
-+
-+if sys.version_info >= (3, 9):  # pragma: no cover
-+    from importlib.resources import files
-+
-+    def read_binary(package: Union[str, ModuleType], file_path: str) -> bytes:
-+        return (files(package) / file_path).read_bytes()
-+
-+else:  # pragma: no cover
-+    from importlib.resources import read_binary
- 
- from installer import _scripts
- 
diff --git a/pkgs/development/python-modules/invocations/default.nix b/pkgs/development/python-modules/invocations/default.nix
index 1a8ee27a6528..d0603e412008 100644
--- a/pkgs/development/python-modules/invocations/default.nix
+++ b/pkgs/development/python-modules/invocations/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  build,
   blessed,
   fetchFromGitHub,
   invoke,
@@ -13,13 +14,14 @@
   pytest-relaxed,
   pytest-mock,
   icecream,
+  setuptools,
   pip,
 }:
 
 buildPythonPackage rec {
   pname = "invocations";
   version = "4.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyinvoke";
@@ -31,11 +33,14 @@ buildPythonPackage rec {
   patches = [ ./replace-blessings-with-blessed.patch ];
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace "semantic_version>=2.4,<2.7" "semantic_version"
+    substituteInPlace pyproject.toml \
+      --replace-fail "semantic_version>=2.4,<2.7" "semantic_version"
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
+    build
     blessed
     invoke
     releases
diff --git a/pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch b/pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch
index fe03889e8555..625c60478e5f 100644
--- a/pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch
+++ b/pkgs/development/python-modules/invocations/replace-blessings-with-blessed.patch
@@ -13,14 +13,14 @@ index 54322c3..81ac173 100644
  from invoke import Collection, task, Exit
 diff --git a/setup.py b/setup.py
 index 78ae28b..c78a74c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -16,7 +16,7 @@ requirements = [
+--- a/pyproject.toml	2026-04-25 00:07:29.730867343 +0200
++++ b/pyproject.toml	2026-04-25 00:08:23.736953102 +0200
+@@ -16,7 +16,7 @@
      # time if missing), but that got hairy fast, and these are all
      # pure-Python packages, so it shouldn't be a huge burden for users to
      # obtain them.
 -    "blessings>=1.6",
 +    "blessed",
-     "releases>=1.6",
-     "semantic_version>=2.4,<2.7",
-     "tabulate>=0.7.5",
+     "build>=1.3",
+     # For envs that don't actually have pip - we use some of its tooling atm.
+     "pip~=25.2",
diff --git a/pkgs/development/python-modules/iocx/default.nix b/pkgs/development/python-modules/iocx/default.nix
index 2f19b87cde71..28e35fe1c63b 100644
--- a/pkgs/development/python-modules/iocx/default.nix
+++ b/pkgs/development/python-modules/iocx/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "iocx";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iocx-dev";
     repo = "iocx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WdUHqQXq/qJyqZ5O9+E777+fQaQowvftDtQ0mj67FHw=";
+    hash = "sha256-QLnlxCFVN2hxQtprNuete9iEAy3k4lxJUwbZcPhHMH0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/irisclient/default.nix b/pkgs/development/python-modules/irisclient/default.nix
index d3250cdb1aa6..5d463edcc8b6 100644
--- a/pkgs/development/python-modules/irisclient/default.nix
+++ b/pkgs/development/python-modules/irisclient/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python client for Iris REST api";
-    changelog = "https://github.com/houqp/iris-python-client/blob/v${src.tag}/HISTORY.rst";
+    changelog = "https://github.com/houqp/iris-python-client/blob/${src.tag}/HISTORY.rst";
     homepage = "https://github.com/houqp/iris-python-client";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ onny ];
diff --git a/pkgs/development/python-modules/israel-rail-api/default.nix b/pkgs/development/python-modules/israel-rail-api/default.nix
index 4265ecb5d55b..ae6fd6651f70 100644
--- a/pkgs/development/python-modules/israel-rail-api/default.nix
+++ b/pkgs/development/python-modules/israel-rail-api/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "israel-rail-api";
-  version = "0.1.4";
+  version = "0.1.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sh0oki";
     repo = "israel-rail-api";
     tag = "v${version}";
-    hash = "sha256-vYMqMrvLQsy0MSfYAdlXqV1rF76A/cqkttWh47J8xn8=";
+    hash = "sha256-kcux4IBA3FoNnsqNGHsEta9OAkvjYB40234VlidrNzM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix
index b5835a6b2360..ab8bebde6350 100644
--- a/pkgs/development/python-modules/jaraco-email/default.nix
+++ b/pkgs/development/python-modules/jaraco-email/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
-    changelog = "https://github.com/jaraco/jaraco.email/blob/${src.rev}/CHANGES.rst";
+    changelog = "https://github.com/jaraco/jaraco.email/blob/${src.tag}/NEWS.rst";
     description = "E-mail facilities by jaraco";
     homepage = "https://github.com/jaraco/jaraco.email";
     license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
index c7826b24546f..57454d4f84b6 100644
--- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
@@ -50,8 +50,8 @@ buildPythonPackage (finalAttrs: {
       .${stdenv.hostPlatform.system};
     hash =
       {
-        x86_64-linux = "sha256-U2owUpInbFdF77un61dXaEnFp8dzmKOp5h/TG69RAvA=";
-        aarch64-linux = "sha256-VvSifl8ZypFMD0QCU5RpqpLQG/cTNqzQ7Y/dwgqRvI0=";
+        x86_64-linux = "sha256-MJUVRT9Zyq2Vv3bIvGScJLwOPRLQe68895K+CCq97js=";
+        aarch64-linux = "sha256-NqwxbFiKDgjrZPhoJwUmrco4VtS3CxN2C36bc76F0s8=";
       }
       .${stdenv.hostPlatform.system};
   };
diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
index 0ccf040f552f..ad450298399c 100644
--- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
@@ -39,42 +39,42 @@ let
     "3.11-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp311";
-      hash = "sha256-1Vd82Ge9kmd2nkU7rYUNSAeoQ5a8l29jKlFe29d+SEs=";
+      hash = "sha256-lXMXyv8eawBqE1UXM3cN8jWidHBkviawJ0YP46WPWO4=";
     };
     "3.11-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp311";
-      hash = "sha256-s5VfN10XkC8NJ+cFlnLNGWOlU0WVOkJpnk4HjOxyWtw=";
+      hash = "sha256-GkpKVqgyrTDgHBQIWx+iRApV+kzggI5AXnNlDv+K+zE=";
     };
     "3.12-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp312";
-      hash = "sha256-iKVZCNd1sG3akqjE9MAVd44lulw2BbV/hLAAUvZujvE=";
+      hash = "sha256-oWugDXI2YUWCfKOajISfn+4Rd9ZzjJ7f1ys6n+31zxg=";
     };
     "3.12-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp312";
-      hash = "sha256-sozPBbzAvHzLy9Mm2AKEZXTPbaA5FY52FHvZb1xvEYk=";
+      hash = "sha256-6vGmGVqg60i0IMcfIrktGXeNlIAkl3yuRkEnnV9sH4E=";
     };
     "3.13-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp313";
-      hash = "sha256-vX3+0Xv6nQ4wFvjCpnZ8dHnZHhvf33kW6ysHQ1zEZY4=";
+      hash = "sha256-7QdNN5Z7zmHBuv3fndCoMCMGwS+QcAylrfo9CP3Uruc=";
     };
     "3.13-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp313";
-      hash = "sha256-uaJwhdiTzFnCsoaxeJdV+Rzz6rHeobW+nmMvTJc5og4=";
+      hash = "sha256-dHnmfZ2Y1KD1JflPi4GIDcwFhjH23hGLkd6R2xtAle0=";
     };
     "3.14-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp314";
-      hash = "sha256-U1F0LA/LIdqeCUoZZasg/eUlhih392kYpJCxtWZk1To=";
+      hash = "sha256-96ahiBNJ3DnyRIGioBn/KUuUkJuAqIge/iHUW2pfaR0=";
     };
     "3.14-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp314";
-      hash = "sha256-MyEmmeG7sb7V0q4Urp/3Kh7tLQkqUearzAJ4prK4KHQ=";
+      hash = "sha256-iIb8V5df7gG+FyX4mLaSkvYVtwgwrvXC+95jgzNha10=";
     };
   };
 in
diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index c68c1e516388..d2a0a7109cf2 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -6,7 +6,6 @@
   lapack,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   cudaSupport ? config.cudaSupport,
 
   # build-system
@@ -41,25 +40,18 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "jax";
-  version = "0.9.2";
+  version = "0.10.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "jax";
     # google/jax contains tags for jax and jaxlib. Only use jax tags!
     tag = "jax-v${finalAttrs.version}";
-    hash = "sha256-/vLCTAF46M1H0Q64RLM7+IFMofmjZmZ4IFzvm/y7zkg=";
+    hash = "sha256-/RCihrjONN/+QwyQRNEmlIa7JsCLzz+SkBe5sd+ThgU=";
   };
 
-  patches = [
-    # https://github.com/jax-ml/jax/pull/32840
-    (fetchpatch2 {
-      url = "https://github.com/Prince213/jax/commit/af5c211d49f3b99447db2252d2cc2b8e0fb54d1c.patch?full_index=1";
-      hash = "sha256-ijEd+MDe91qyYfE+aMzR5rNmTeGadin6Io8PIfJWc3o=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   # The version is automatically set to ".dev" if this variable is not set.
diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index ef55de72ac84..deb80c9b68ad 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -18,7 +18,7 @@
 }:
 
 let
-  version = "0.9.2";
+  version = "0.10.0";
   inherit (python) pythonVersion;
 
   # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
@@ -49,65 +49,65 @@ let
       "3.11-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp311";
-        hash = "sha256-msmVtLoaru2uDWnzGZh9UV3K7NRQW2QrYxL54VQ5NR8=";
+        hash = "sha256-m+IpmTpB5bK4TyNOzBml3gLzXt2xGVzwJ71TnhYB4V0=";
       };
       "3.11-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp311";
-        hash = "sha256-MG3lSh3nOGyAbHI+NWzjMtkj73SPinLWdP77dIEh1Nw=";
+        hash = "sha256-PblOvIWTddlV3jUEGCrdfOFzPOPTDBXg7wMWAstRpVk=";
       };
       "3.11-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp311";
-        hash = "sha256-eF8XfD63jLfceXxV7VxLYxIUGEXJpoaVfkhLrL/OXog=";
+        hash = "sha256-J3Ay6fB0w/1f/R4MsD1P5m4nLeRyZnzbxBitmbIbZGo=";
       };
 
       "3.12-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp312";
-        hash = "sha256-iLJ2px9PIHGx/S6SKr/WfIfGl3pVGhA2/rzqeNXvfiI=";
+        hash = "sha256-sL+4ZaB98ubXQYwLDCkt0pS1UAUjsd1YcrGA2yqkgNQ=";
       };
       "3.12-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp312";
-        hash = "sha256-/vAthGhjtybnJFKZOIOoWW6sMl8ioux+qSHaD7xVCbQ=";
+        hash = "sha256-qh1w8aTifrQDZU5x4vso1XhtPpt3/BhH6MU4mICSfKQ=";
       };
       "3.12-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp312";
-        hash = "sha256-l8L75Yy+5KJ9lMpzXXCdIxspmrbtizsQdfUthk39MsE=";
+        hash = "sha256-fB2bRjMnx6IzPyEBFOywTyj+/FG6gjOoWiKAzOdb20I=";
       };
 
       "3.13-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp313";
-        hash = "sha256-ttUAPjrdXDRqNK6e3EcFjLwttgyO1cUAllIhdtrwHJ8=";
+        hash = "sha256-0wPcMbZei3k9VgD4GxWDvgPcm4dqTBCz4lm2YJocvjs=";
       };
       "3.13-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp313";
-        hash = "sha256-vvYe7zbtOM7BBp6pc/iK+eAzNeiE9lAew/5/YiKhVVs=";
+        hash = "sha256-bY14twcLNOTFu6X34Qkn5/Sqybab4X6bCliYVTpDOPM=";
       };
       "3.13-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp313";
-        hash = "sha256-UqADJQj4z1eRx6e+4UJTHucGw8BVGBF/sLbujV4X/ec=";
+        hash = "sha256-OEY1//VYmaKVu8gu5sb3c6MA54fcRyypK755q/qsg2k=";
       };
 
       "3.14-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp314";
-        hash = "sha256-PXFRFApJNvMhiy0bE0PdI3vShlz1FEKIS22C/ohKPec=";
+        hash = "sha256-KkLPBMD4i8A7FQoX+n3bsvQOCWZn7IobhA7YeRPm5zU=";
       };
       "3.14-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp314";
-        hash = "sha256-vkYnxC1Erdf+F9KE71ef+NFZ48tpR/ZDd1jzQXfoeOY=";
+        hash = "sha256-rUfgckMJeewhY3qkh9TcRkAouOm+JyaPN95pU2x240E=";
       };
       "3.14-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp314";
-        hash = "sha256-urFo0lVVRkRhvQdzI0hPaQxHHmnOiww5o5+4Gz46i/A=";
+        hash = "sha256-mLJmcpQ2cnQoc/ZbwDIWgZ/FUyXJnxRlkNAHwBcr/zA=";
       };
     };
 in
@@ -116,6 +116,8 @@ buildPythonPackage {
   inherit version;
   format = "wheel";
 
+  __structuredAttrs = true;
+
   # See https://discourse.nixos.org/t/ofborg-does-not-respect-meta-platforms/27019/6.
   src = (
     srcs."${pythonVersion}-${stdenv.hostPlatform.system}"
diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix
index f236d6774f5f..ef4a59e68ad9 100644
--- a/pkgs/development/python-modules/json-stream/default.nix
+++ b/pkgs/development/python-modules/json-stream/default.nix
@@ -11,16 +11,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "json-stream";
-  version = "2.5.0";
+  version = "2.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "daggaz";
     repo = "json-stream";
-    tag = "v${version}";
-    hash = "sha256-iSJY53VImv9GSIC2IB969zzYYNg7gFKJH8QQFpjzrQU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fQuTvd2Kizy8icYoewvJJVDc7FXuXRQkwJfOCka3Eo4=";
   };
 
   build-system = [ setuptools ];
@@ -44,4 +44,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
index d85560e462e6..df6bf37d1163 100644
--- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
@@ -10,21 +10,21 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "jsonrpc-websocket";
-  version = "3.2.0";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "emlove";
     repo = "jsonrpc-websocket";
-    tag = version;
-    hash = "sha256-SgwEY/5MPEkSrcsQV4qkVgKmYYYsWA2YluReOz7sEjc=";
+    tag = finalAttrs.version;
+    hash = "sha256-vhE5jee3ryrKFm9s8SFklBIk+pV8FkUERwWQ75u/PIw=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     async-timeout
     jsonrpc-base
@@ -48,7 +48,8 @@ buildPythonPackage rec {
   meta = {
     description = "JSON-RPC websocket client library for asyncio";
     homepage = "https://github.com/emlove/jsonrpc-websocket";
+    changelog = "https://github.com/emlove/jsonrpc-websocket/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ peterhoeg ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix
index 074d8a997993..b6be7d4e5171 100644
--- a/pkgs/development/python-modules/jsonschema-path/default.nix
+++ b/pkgs/development/python-modules/jsonschema-path/default.nix
@@ -13,21 +13,19 @@
 
 buildPythonPackage rec {
   pname = "jsonschema-path";
-  version = "0.3.4";
+  version = "0.4.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "jsonschema-path";
     tag = version;
-    hash = "sha256-rCepDnVAOEsokKjWCuqDYbGIq6/wn4rsQRx5dXTUsYo=";
+    hash = "sha256-xDNWQddw4ftq762EPvTjyXUEsyRfgs2ffeKVgbWVUs4=";
   };
 
   build-system = [ poetry-core ];
 
-  pythonRelaxDeps = [ "referencing" ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     pathable
     pyyaml
     referencing
diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix
index 3a31aebd83b1..3c8df95c282e 100644
--- a/pkgs/development/python-modules/jsonschema-spec/default.nix
+++ b/pkgs/development/python-modules/jsonschema-spec/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "jsonschema-spec";
-  version = "0.3.4";
+  version = "0.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "jsonschema-spec";
     tag = version;
-    hash = "sha256-rCepDnVAOEsokKjWCuqDYbGIq6/wn4rsQRx5dXTUsYo=";
+    hash = "sha256-abAhWtBnZUeg1VGphfnvxPzSnPM6VjM/XKLPJVIrIXg=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/juliandate/default.nix b/pkgs/development/python-modules/juliandate/default.nix
index 68032d721d2a..667bbc231a04 100644
--- a/pkgs/development/python-modules/juliandate/default.nix
+++ b/pkgs/development/python-modules/juliandate/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Conversions between Julian Dates and Julian/Gregorian calendar dates";
     homepage = "https://github.com/seanredmond/juliandate";
-    changelog = "https://github.com/seanredmond/juliandate/blob/v${src.tag}/HISTORY.MD";
+    changelog = "https://github.com/seanredmond/juliandate/blob/${src.tag}/HISTORY.MD";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index e2b45e47cc93..fcc2cae5d8c0 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab-git";
-  version = "0.51.4";
+  version = "0.52.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyterlab";
     repo = "jupyterlab-git";
     tag = "v${version}";
-    hash = "sha256-8/XspIMT2x/buBKbUTknpyh0VGionozavjgi67gg1/k=";
+    hash = "sha256-BMzn+134hSYUFrDF+4+Bs81hzSURP9VNX4D9x2UuPMQ=";
   };
 
   nativeBuildInputs = [
@@ -42,7 +42,7 @@ buildPythonPackage rec {
 
   offlineCache = yarn-berry_3.fetchYarnBerryDeps {
     inherit src;
-    hash = "sha256-9GmQv4UYH+uRPgAZed6IJC+7uMKhlXvokVwd248yi/4=";
+    hash = "sha256-3pVc4xz5ilamCg97wdaLQliBHeSr3mPYwhgnz/lvfj0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix
index 8c411b54105f..7e0b3a331df5 100644
--- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab-lsp";
-  version = "5.2.0";
+  version = "5.3.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "jupyterlab_lsp";
     inherit version;
-    hash = "sha256-Y2hIhbNcHcnYPlS0sGOAyTda19dRopdWSbNXMIyNMLk=";
+    hash = "sha256-vfAU/rwOwpf/aQh+lXVJ1yTrDCnfPyTU9MQHWKca/D8=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix
index a87b821b54aa..b091c9a92abf 100644
--- a/pkgs/development/python-modules/jupyterlab-server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-server/default.nix
@@ -1,8 +1,12 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+
+  # build-system
   hatchling,
+
+  # dependencies
   babel,
   jinja2,
   json5,
@@ -10,30 +14,40 @@
   jupyter-server,
   packaging,
   requests,
+
+  # optional-dependencies
   openapi-core,
+  ruamel-yaml,
+
+  # tests
   pytest-jupyter,
+  pytest-timeout,
   pytestCheckHook,
   requests-mock,
-  ruamel-yaml,
   strict-rfc3339,
+  writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "jupyterlab-server";
   version = "2.28.0";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "jupyterlab_server";
-    inherit version;
-    hash = "sha256-NbqoGJixX5NXPi3spQ0RrArkB+u2iCmdOlITJlAzcSw=";
+  src = fetchFromGitHub {
+    owner = "jupyterlab";
+    repo = "jupyterlab_server";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/h25HBKt6maaxuZRK+VMVA0AqTZhQkDnGVDgBisQcCw=";
   };
 
-  postPatch = ''
-    sed -i "/timeout/d" pyproject.toml
-  '';
+  patches = [
+    # oopenapi-core changed their API, which breaks jupyterlab-server
+    ./fix-openapi-core-compat.patch
+  ];
 
-  build-system = [ hatchling ];
+  build-system = [
+    hatchling
+  ];
 
   dependencies = [
     babel
@@ -52,38 +66,30 @@ buildPythonPackage rec {
     ];
   };
 
+  pythonImportsCheck = [ "jupyterlab_server" ];
+
   nativeCheckInputs = [
     pytest-jupyter
+    pytest-timeout
     pytestCheckHook
     requests-mock
     strict-rfc3339
+    writableTmpDirAsHomeHook
   ]
-  ++ optional-dependencies.openapi;
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  pytestFlags = [
-    "-Wignore::DeprecationWarning"
-  ];
+  ++ finalAttrs.passthru.optional-dependencies.openapi;
 
   disabledTestPaths = [
     # require optional language pack packages for tests
     "tests/test_translation_api.py"
   ];
 
-  pythonImportsCheck = [
-    "jupyterlab_server"
-  ];
-
   __darwinAllowLocalNetworking = true;
 
   meta = {
     description = "Set of server components for JupyterLab and JupyterLab like applications";
     homepage = "https://github.com/jupyterlab/jupyterlab_server";
-    changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     teams = [ lib.teams.jupyter ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/jupyterlab-server/fix-openapi-core-compat.patch b/pkgs/development/python-modules/jupyterlab-server/fix-openapi-core-compat.patch
new file mode 100644
index 000000000000..0b736618e12f
--- /dev/null
+++ b/pkgs/development/python-modules/jupyterlab-server/fix-openapi-core-compat.patch
@@ -0,0 +1,58 @@
+diff --git a/jupyterlab_server/spec.py b/jupyterlab_server/spec.py
+index 94347b9..6e0d7d4 100644
+--- a/jupyterlab_server/spec.py
++++ b/jupyterlab_server/spec.py
+@@ -9,17 +9,17 @@ import typing
+ from pathlib import Path
+ 
+ if typing.TYPE_CHECKING:
+-    from openapi_core.spec.paths import Spec
++    from jsonschema_path import SchemaPath
+ 
+ HERE = Path(os.path.dirname(__file__)).resolve()
+ 
+ 
+-def get_openapi_spec() -> Spec:
++def get_openapi_spec() -> SchemaPath:
+     """Get the OpenAPI spec object."""
+-    from openapi_core.spec.paths import Spec
++    from jsonschema_path import SchemaPath
+ 
+     openapi_spec_dict = get_openapi_spec_dict()
+-    return Spec.from_dict(openapi_spec_dict)  # type:ignore[arg-type]
++    return SchemaPath.from_dict(openapi_spec_dict)
+ 
+ 
+ def get_openapi_spec_dict() -> dict[str, typing.Any]:
+diff --git a/jupyterlab_server/test_utils.py b/jupyterlab_server/test_utils.py
+index c1d8956..337bb53 100644
+--- a/jupyterlab_server/test_utils.py
++++ b/jupyterlab_server/test_utils.py
+@@ -13,8 +13,8 @@ from urllib.parse import parse_qs, urlparse
+ 
+ import tornado.httpclient
+ import tornado.web
++from jsonschema_path import SchemaPath
+ from openapi_core import V30RequestValidator, V30ResponseValidator
+-from openapi_core.spec.paths import Spec
+ from openapi_core.validation.request.datatypes import RequestParameters
+ from tornado.httpclient import HTTPRequest, HTTPResponse
+ from werkzeug.datastructures import Headers, ImmutableMultiDict
+@@ -32,7 +32,7 @@ class TornadoOpenAPIRequest:
+     Converts a torando request to an OpenAPI one
+     """
+ 
+-    def __init__(self, request: HTTPRequest, spec: Spec):
++    def __init__(self, request: HTTPRequest, spec: SchemaPath):
+         """Initialize the request."""
+         self.request = request
+         self.spec = spec
+@@ -76,7 +76,7 @@ class TornadoOpenAPIRequest:
+         # https://github.com/OAI/OpenAPI-Specification/issues/892
+         url = None
+         o = urlparse(self.request.url)
+-        for path_ in self.spec["paths"]:
++        for path_ in self.spec["paths"].keys():
+             if url:
+                 continue  # type:ignore[unreachable]
+             has_arg = "{" in path_
diff --git a/pkgs/development/python-modules/kagglesdk/default.nix b/pkgs/development/python-modules/kagglesdk/default.nix
index 223d054ae27b..49ccb2e72a76 100644
--- a/pkgs/development/python-modules/kagglesdk/default.nix
+++ b/pkgs/development/python-modules/kagglesdk/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "kagglesdk";
-  version = "0.1.19";
+  version = "0.1.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kaggle";
     repo = "kagglesdk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AfR4MlVev8KuhHKD71A87BmT0lXpNipnpRlvgaGcAos=";
+    hash = "sha256-tQWkISdaTn/gC5+qxI3rCMRo+4QYE7XPi9mcVgKz3qM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/kde-material-you-colors/default.nix b/pkgs/development/python-modules/kde-material-you-colors/default.nix
index 6d7289051550..9caf8df9b57a 100644
--- a/pkgs/development/python-modules/kde-material-you-colors/default.nix
+++ b/pkgs/development/python-modules/kde-material-you-colors/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "kde-material-you-colors";
-  version = "2.0.2";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "kde-material-you-colors";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fvDWBcXCIviCXMlLFPowJttNmpX1JO1OZsnSPyNhLv8=";
+    hash = "sha256-sN7u3jePevJnTHhQL6eAYKU2AD2QNW7VYuEHLN5RsK8=";
   };
 
   build-system = [ setuptools ];
@@ -42,7 +42,7 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://store.kde.org/p/2136963";
     description = "Automatic color scheme generator from your wallpaper for KDE Plasma powered by Material You";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ sigmanificient ];
+    maintainers = with lib.maintainers; [ issai ];
     mainProgram = "kde-material-you-colors";
   };
 })
diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix
index 76ef8f87c8b1..077e173e6c86 100644
--- a/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2026.3.28.223133";
+  version = "2026.4.22.141111";
   pyproject = true;
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-U/lHc4SZcUEG1yq2sMkSzM9n/n6TuNhbx4U2ZmMqAY0=";
+    hash = "sha256-2gzQETX2YayiahCGw9sSS6mCo5DmApBZB54ISQBm43M=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index f16660f4c420..e0503d4b0f23 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -59,14 +59,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "kserve";
-  version = "0.17.0";
+  version = "0.18.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "kserve";
     repo = "kserve";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gLYYuIy43cuXrCvjjXLHMim0m/EAwaivLdFhKuUdeX0=";
+    hash = "sha256-qmv6DzYA/c/uGS4LNTdn3PnzhtLrhprF6r9ccngsUTU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python/kserve";
diff --git a/pkgs/development/python-modules/langchain-experimental/default.nix b/pkgs/development/python-modules/langchain-experimental/default.nix
index 84b8e7a40d92..da4d8d1a8729 100644
--- a/pkgs/development/python-modules/langchain-experimental/default.nix
+++ b/pkgs/development/python-modules/langchain-experimental/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [ "tests/unit_tests" ];
+  enabledTestPaths = [ "tests/unit_tests" ];
 
   pythonImportsCheck = [ "langchain_experimental" ];
 
diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix
index 064abf7f8823..d31f032c4bec 100644
--- a/pkgs/development/python-modules/langfuse/default.nix
+++ b/pkgs/development/python-modules/langfuse/default.nix
@@ -2,63 +2,42 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonAtLeast,
-  anyio,
   backoff,
   httpx,
-  idna,
-  langchain,
-  llama-index,
-  openai,
   opentelemetry-api,
   opentelemetry-sdk,
   opentelemetry-exporter-otlp,
   packaging,
   poetry-core,
   pydantic,
-  requests,
   wrapt,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "langfuse";
-  version = "3.12.0";
+  version = "4.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langfuse";
     repo = "langfuse-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LHKNy5KSJhRhxkrp4+pjD0GGHTooaj7adrRA7I4mbdo=";
+    hash = "sha256-JJfVh09ziAnizQcUusjEJPLUBpi9o04gfBysO+hA6Fg=";
   };
 
-  # https://github.com/langfuse/langfuse/issues/9618
-  disabled = pythonAtLeast "3.14";
-
   build-system = [ poetry-core ];
 
-  pythonRelaxDeps = [ "packaging" ];
-
   dependencies = [
-    anyio
     backoff
     httpx
-    idna
     opentelemetry-api
     opentelemetry-sdk
     opentelemetry-exporter-otlp
     packaging
     pydantic
-    requests
     wrapt
   ];
 
-  optional-dependencies = {
-    langchain = [ langchain ];
-    llama-index = [ llama-index ];
-    openai = [ openai ];
-  };
-
   pythonImportsCheck = [ "langfuse" ];
 
   # tests require network access and openai api key
diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index ec6d7e36e977..b366fb7fcc32 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "langgraph-cli";
-  version = "0.4.23";
+  version = "0.4.24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "cli==${finalAttrs.version}";
-    hash = "sha256-nF6w1SUEFECSv87TbvNpNGiv1wFbKsDlUy8MprTdG70=";
+    hash = "sha256-gDN0qxh1cPaupIrNK+o/8ExWORnRY3k6C5Vgd3A1Rf0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/libs/cli";
diff --git a/pkgs/development/python-modules/latex2mathml/default.nix b/pkgs/development/python-modules/latex2mathml/default.nix
index b3d77daf2b5a..9ab55f770a71 100644
--- a/pkgs/development/python-modules/latex2mathml/default.nix
+++ b/pkgs/development/python-modules/latex2mathml/default.nix
@@ -2,34 +2,40 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  hatchling,
+  uv-build,
   pytestCheckHook,
   pytest-cov-stub,
   multidict,
-  xmljson,
+  syrupy,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "latex2mathml";
-  version = "3.79.0";
+  version = "3.81.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "roniemartinez";
     repo = "latex2mathml";
     tag = finalAttrs.version;
-    hash = "sha256-/ixS6TlovxOZgBqDq1t6KzcG6EKBSYwf3c+drHjQec4=";
+    hash = "sha256-NY8SVEN9i8OcT8YS8887/TgLuIYAsS26me2BqGW0ubs=";
   };
 
-  build-system = [ hatchling ];
+  build-system = [ uv-build ];
 
   nativeCheckInputs = [
     pytestCheckHook
     pytest-cov-stub
     multidict
-    xmljson
+    syrupy
   ];
 
+  # nixpkgs is only at uv_build 0.10.0
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'uv_build>=0.10.11,<0.11.0' 'uv_build'
+  '';
+
   pythonImportsCheck = [ "latex2mathml" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix
index 1efcea26aed9..33f4e1c5c56a 100644
--- a/pkgs/development/python-modules/librosa/default.nix
+++ b/pkgs/development/python-modules/librosa/default.nix
@@ -41,6 +41,7 @@ buildPythonPackage (finalAttrs: {
   pname = "librosa";
   version = "0.11.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "librosa";
@@ -112,6 +113,11 @@ buildPythonPackage (finalAttrs: {
     "test_unknown_axis"
     "test_axis_bound_warning"
     "test_auto_aspect"
+
+    # audioread.exceptions.NoBackendError
+    "test_get_duration_audioread"
+    "test_get_samplerate_audioread"
+    "test_load_force_audioread"
   ]
   ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     # AssertionError (numerical comparison fails)
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 36251d2b81f7..c6917416da86 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "libtmux";
-  version = "0.55.0";
+  version = "0.55.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = "libtmux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-34YwI0QjewDeigHYLiTdEi8PgleW1VCiaQSQvrSpf/s=";
+    hash = "sha256-A8mi0Q9ScbHmFRSvcF+wbn+lAO8B3/rU/+HvTXvxWPE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix
index 1c47b1b3b5c8..ad479f304311 100644
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "limnoria";
-  version = "2026.1.16";
+  version = "2026.3.21";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-ZkEXZMjJsEgSwX2a8TwaQ/vtvskSOFwNBZg/Ru5q/bc=";
+    hash = "sha256-hg4NYKyUMu4jDv9i3gdejbz0w/v0ptswzO7TUSXP3+4=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix
index 008c58b2d61f..4c7a10963b3d 100644
--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@@ -50,14 +50,14 @@
 
 buildPythonPackage rec {
   pname = "litellm";
-  version = "1.82.3";
+  version = "1.83.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "BerriAI";
     repo = "litellm";
     tag = "v${version}-stable";
-    hash = "sha256-oeaK8Flt/oSX9nA7tFHyBp+hvsDeRK+w16zljyA9vdE=";
+    hash = "sha256-oVQ0FHZmXDY7HU4AMEQ9xcl10mIbqja9/j2mdunTWI4=";
   };
 
   build-system = [ poetry-core ];
@@ -122,8 +122,14 @@ buildPythonPackage rec {
     "litellm_enterprise"
   ];
 
-  # Relax dependency check on openai, may not be needed in the future
-  pythonRelaxDeps = [ "openai" ];
+  pythonRelaxDeps = [
+    "aiohttp"
+    "click"
+    "importlib-metadata"
+    "jsonschema"
+    "openai"
+    "python-dotenv"
+  ];
 
   # access network
   doCheck = false;
diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix
index bbd8b64672c8..0aa79480e997 100644
--- a/pkgs/development/python-modules/lizard/default.nix
+++ b/pkgs/development/python-modules/lizard/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "lizard";
-  version = "1.21.6";
+  version = "1.22.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "terryyin";
     repo = "lizard";
     tag = version;
-    hash = "sha256-ZRXO9XijsZdtDffEvQ6iYVr8PKP93JD01L/bg9NOEpM=";
+    hash = "sha256-k4HrecW6577GaxEGlkKNtqrHP1cSWOvWN32EUNeOuSg=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix
index cbfac84a7b74..f097f590d881 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-huggingface";
-  version = "0.6.1";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_embeddings_huggingface";
     inherit version;
-    hash = "sha256-OyH/7aIvgiHtVXeLs9rtcWZKsHs0Hx3S9AiWO9IDVbk=";
+    hash = "sha256-2ooqZd+UBBEsRDDfraCdT4RroWUZeiXb539zQBTFaoc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix
index 97016414c49b..37a0fa6ce05e 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llama-index-llms-openai-like";
-  version = "0.7.1";
+  version = "0.7.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_llms_openai_like";
     inherit (finalAttrs) version;
-    hash = "sha256-znzvNoax5i18CBNLTYylZwbMqBbkxAmOrt4zACgppvk=";
+    hash = "sha256-7Z/3P5ddzkcPmKxhyYIVG6eO7fo/ubA4lLwdExKyE/8=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
index 7fb50ab9bd57..5226d06b13f3 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llama-index-llms-openai";
-  version = "0.7.5";
+  version = "0.7.7";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_llms_openai";
     inherit (finalAttrs) version;
-    hash = "sha256-VBI+Z5p83cHy6WnyeKRlQFBzDa+EaRcxoMU64U/qw8c=";
+    hash = "sha256-rp1vpf8ZguIY1ATDKLiDonbBI3ThsS2BEBrCVMvladE=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/llama-index-workflows/default.nix b/pkgs/development/python-modules/llama-index-workflows/default.nix
index 756101460a48..fd2c18851830 100644
--- a/pkgs/development/python-modules/llama-index-workflows/default.nix
+++ b/pkgs/development/python-modules/llama-index-workflows/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llama-index-workflows";
-  version = "2.19.0";
+  version = "2.20.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_workflows";
     inherit (finalAttrs) version;
-    hash = "sha256-GXuiE9KDdRaQL4V1hYkatWsUI+9P1yh/Xn8z+i8hVXU=";
+    hash = "sha256-3ydg/qnhAMl6TpGdJVRh40RBOsrEOC0X2CFzN4BuR3I=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/llguidance/default.nix b/pkgs/development/python-modules/llguidance/default.nix
index 8e307699086d..4d0ff0db3ba0 100644
--- a/pkgs/development/python-modules/llguidance/default.nix
+++ b/pkgs/development/python-modules/llguidance/default.nix
@@ -23,19 +23,19 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llguidance";
-  version = "1.7.2";
+  version = "1.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "guidance-ai";
     repo = "llguidance";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Eu+hhYCVoZWMdwrjiHyvbGwjYKnbkBETZNMQ+SOb8AU=";
+    hash = "sha256-vEF9+nlYP8LnlROgDU0HPg8H+OmZCQARoE6ngGIw7NM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src pname version;
-    hash = "sha256-oeFm9dPqlJWPnrA7//D31E1W2St+zIRd8pzR6gUhiTg=";
+    hash = "sha256-5dJkC0Iz0IBXxSq5ZeorLta7WEd81ajagSoXt1Zsq7Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/llm-ollama/default.nix b/pkgs/development/python-modules/llm-ollama/default.nix
index f9ea4c7feec2..1ac0fa8379c5 100644
--- a/pkgs/development/python-modules/llm-ollama/default.nix
+++ b/pkgs/development/python-modules/llm-ollama/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "llm-ollama";
-  version = "0.15.1";
+  version = "0.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "taketwo";
     repo = "llm-ollama";
     tag = version;
-    hash = "sha256-iSLLFC+kYcKq6VOYspkgUyTobU6qUs7FxoAXBmm8H44=";
+    hash = "sha256-EzZHkFuqkpd/rtQI1dV/wl8KZWblgWnwUl4vP3y9D8M=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/logurich/default.nix b/pkgs/development/python-modules/logurich/default.nix
index 0e65d7f47acc..9006b3713c73 100644
--- a/pkgs/development/python-modules/logurich/default.nix
+++ b/pkgs/development/python-modules/logurich/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Logger that combine loguru and rich";
     homepage = "https://github.com/PakitoSec/logurich";
-    changelog = "https://github.com/PakitoSec/logurich/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/PakitoSec/logurich/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix
index 172b5e128c0f..64d1ff7f8671 100644
--- a/pkgs/development/python-modules/lupa/default.nix
+++ b/pkgs/development/python-modules/lupa/default.nix
@@ -1,9 +1,22 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
+  srcOnly,
+  runCommand,
+
+  # build-system
   cython,
-  fetchPypi,
   setuptools,
+
+  # devendor
+  lua5_1,
+  lua5_2,
+  lua5_3,
+  lua5_4,
+  lua5_5,
+  luajit_2_0,
+  luajit_2_1,
 }:
 
 buildPythonPackage (finalAttrs: {
@@ -11,11 +24,35 @@ buildPythonPackage (finalAttrs: {
   version = "2.8";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit (finalAttrs) pname version;
-    hash = "sha256-2AImQbnsjs8sXsvp9H5acOC4fEta6SG5LLAqY44KzQg=";
+  src = fetchFromGitHub {
+    owner = "scoder";
+    repo = "lupa";
+    tag = "lupa-${finalAttrs.version}";
+    # we fetch the vendored lua sources for gracefull de-vendor degredation when a new lua is added
+    fetchSubmodules = true;
+    hash = "sha256-XLBUQ1TrzWWST9RJdMTnpsceldDNzidnL82bixLhSRA=";
   };
 
+  patches = [
+    # The updated lua52 src has a radically changed makefile, matching lua53
+    ./remove-lua52-special-case.patch
+  ];
+
+  # devendor/update the luas to newer patched versions
+  postPatch = ''
+    (
+      set -x
+      rm -rf third-party/lua51;    cp -r ${srcOnly lua5_1}     third-party/lua51
+      rm -rf third-party/lua52;    cp -r ${srcOnly lua5_2}/src third-party/lua52
+      rm -rf third-party/lua53;    cp -r ${srcOnly lua5_3}/src third-party/lua53
+      rm -rf third-party/lua54;    cp -r ${srcOnly lua5_4}/src third-party/lua54
+      rm -rf third-party/lua55;    cp -r ${srcOnly lua5_5}/src third-party/lua55
+      rm -rf third-party/luajit20; cp -r ${srcOnly luajit_2_0} third-party/luajit20
+      rm -rf third-party/luajit21; cp -r ${srcOnly luajit_2_1} third-party/luajit21
+      chmod -R +w third-party/*
+    )
+  '';
+
   build-system = [
     cython
     setuptools
@@ -23,10 +60,26 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "lupa" ];
 
+  # this helps us discover new lua versions when bumping, without blocking mass python-updates
+  passthru.tests.expected-third-party = runCommand "lupa-expected-third-party" { } ''
+    declare -a expected=( lua51 lua52 lua53 lua54 lua55 luajit20 luajit21 )
+
+    declare -a found_paths=( ${finalAttrs.src}/third-party/* )
+    declare -a found=("''${found_paths[@]##*/}")
+    if [[ "''${found[*]}" != "''${expected[*]}" ]]; then
+      echo >&2 "./third-party/ contains unexpected paths!"
+      echo >&2 "expected: ''${expected[*]}"
+      echo >&2 "found:    ''${found[*]}"
+      exit 1
+    else
+      touch $out
+    fi
+  '';
+
   meta = {
     description = "Lua in Python";
     homepage = "https://github.com/scoder/lupa";
-    changelog = "https://github.com/scoder/lupa/blob/lupa-${finalAttrs.version}/CHANGES.rst";
+    changelog = "https://github.com/scoder/lupa/blob/${finalAttrs.src.tag}/CHANGES.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/lupa/remove-lua52-special-case.patch b/pkgs/development/python-modules/lupa/remove-lua52-special-case.patch
new file mode 100644
index 000000000000..e222ec74bd50
--- /dev/null
+++ b/pkgs/development/python-modules/lupa/remove-lua52-special-case.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 972277e..ec426a0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -302,8 +302,6 @@ def use_bundled_lua(path, macros):
+         os.path.splitext(obj_file)[0] + '.c' if obj_file != 'lj_vm.o' else 'lj_vm.s'
+         for obj_file in obj_files
+     ]
+-    if libname == 'lua52':
+-        lua_sources.extend(['lbitlib.c', 'lcorolib.c', 'lctype.c'])
+     src_dir = os.path.dirname(makefile)
+     ext_libraries = [
+         [libname, {
diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index d2576871e319..7d0d1cb2a38e 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "lxmf";
-  version = "0.9.4";
+  version = "0.9.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "lxmf";
     tag = finalAttrs.version;
-    hash = "sha256-WeEGwdbW2hmN7sdMl8tR5pmaXGqRb6y5Zb536ty3eiY=";
+    hash = "sha256-Q84v1CkyEYpW4QdtOD6zp7bn4UzMDeS9Q8fO91BnuPA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mammoth/default.nix b/pkgs/development/python-modules/mammoth/default.nix
index ae8023b0c55e..a44ce6b34c3a 100644
--- a/pkgs/development/python-modules/mammoth/default.nix
+++ b/pkgs/development/python-modules/mammoth/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     export PATH=$out/bin:$PATH
   '';
 
-  passthru.updateScripts = gitUpdater { };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     description = "Convert Word documents (.docx files) to HTML";
diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix
index 2f7313d2c79b..22ed0b7bd6f3 100644
--- a/pkgs/development/python-modules/markitdown/default.nix
+++ b/pkgs/development/python-modules/markitdown/default.nix
@@ -100,7 +100,7 @@ buildPythonPackage (finalAttrs: {
     "test_module_misc"
   ];
 
-  passthru.updateScripts = gitUpdater { };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     description = "Python tool for converting files and office documents to Markdown";
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index a3b75830bdd3..329d5d71a942 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "marshmallow-sqlalchemy";
-  version = "1.4.2";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "marshmallow_sqlalchemy";
     inherit version;
-    hash = "sha256-ZBAwS/mOwm6jXz+dPO6C5R/Qk8Q0YSrdMqC9zbVmj3w=";
+    hash = "sha256-5RGSwgR3BkWi+rDXL0T4eJJy7vdZUfhLFgjWtLC/4OY=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix
index 1eeb2ea73ccc..2d8ae434aebe 100644
--- a/pkgs/development/python-modules/mcstatus/default.nix
+++ b/pkgs/development/python-modules/mcstatus/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mcstatus";
-  version = "13.0.1";
+  version = "13.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "py-mine";
     repo = "mcstatus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Btnv5caqZXh7aLGHH7WBduX4CJ+OhcCKgvD0uLC0mPg=";
+    hash = "sha256-Fn2i9CCO5wESKSpeM8YlqrzF6RCwBbYQs2wSEgOYAcE=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/md2pdf/default.nix b/pkgs/development/python-modules/md2pdf/default.nix
index ba17df6e1393..c898ab22b992 100644
--- a/pkgs/development/python-modules/md2pdf/default.nix
+++ b/pkgs/development/python-modules/md2pdf/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "md2pdf";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmaupetit";
     repo = "md2pdf";
     tag = "v${version}";
-    hash = "sha256-ksccl9K0o0mZleyLe1K1ob78W2MKZksTFtu6/dZUWeg=";
+    hash = "sha256-EZIiuyy2FhHgpCh95/KbYfQpxyPQfDHnB/Q5yo2xVac=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix
index 480141933fc0..411ed9edd046 100644
--- a/pkgs/development/python-modules/mediafile/default.nix
+++ b/pkgs/development/python-modules/mediafile/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mediafile";
-  version = "0.16.0";
+  version = "0.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = "mediafile";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GKEm2LKR3F9uy3FdhvpLPE9Auca8+40Zp53yaLk45XE=";
+    hash = "sha256-FujuFkZH0wjZcd3wIpJw8mDvE/2/mew5tfxAyxA2RkI=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix
index 78ee091ecfd8..7bec67cd363e 100644
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@@ -36,13 +36,13 @@ assert !lapack.isILP64;
 
 buildPythonPackage rec {
   pname = "meep";
-  version = "1.32.0";
+  version = "1.33.0";
 
   src = fetchFromGitHub {
     owner = "NanoComp";
     repo = "meep";
     tag = "v${version}";
-    hash = "sha256-XyGs4U8r3ZaqCq2ArMeeI/wFmJEig8iBaPytf7QIehw=";
+    hash = "sha256-ih1SoCMnIihBy5qCiEh0tTMpCaD7Joo1/HLtE0tv9LY=";
   };
 
   pyproject = false;
diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index fec556a7d413..339dbad67522 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "meilisearch";
-  version = "0.40.0";
+  version = "0.41.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "meilisearch-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mxIE2/gZhV8geE0UJ2ModGKs0TPjJLyp38Wvcs59wz8=";
+    hash = "sha256-05N77HOFmuy73my4ndq7yKJl4SD3OEX36heFsXNx358=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh
index 8604ba9ebe7c..592262525b8a 100644
--- a/pkgs/development/python-modules/meson-python/add-build-flags.sh
+++ b/pkgs/development/python-modules/meson-python/add-build-flags.sh
@@ -1,11 +1,25 @@
 mesonPythonBuildFlagsHook() {
-  # Add all of mesonFlags to -Csetup-args for pypa builds
+  # Use a build directory with a deterministic path by setting `build-dir` [1]
+  # and allow consumers to override it via `mesonBuildDir`.
+  # Setting `build-dir` also causes the build directory to be _persistent_,
+  # i.e., it won't be deleted after the build [2].
+  #
+  # [1] https://github.com/mesonbuild/meson-python/issues/671
+  # [2] https://mesonbuild.com/meson-python/how-to-guides/config-settings.html#using-a-persistent-build-directory
+  #
+  : ${mesonBuildDir:=build}
+  appendToVar pypaBuildFlags "-Cbuild-dir=$mesonBuildDir"
+  appendToVar pipBuildFlags "-Cbuild-dir=$mesonBuildDir"
+
+  # Add all of mesonFlags to `setup-args`
   local flagsArray=()
   concatTo flagsArray mesonFlags mesonFlagsArray
   for f in "${flagsArray[@]}"; do
     appendToVar pypaBuildFlags "-Csetup-args=$f"
-    # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html
-    appendToVar pipBuildFlags "--config-settings=setup-args=$f"
+
+    # Using the same config key multiple times requires pip>=23.1, see:
+    # https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html
+    appendToVar pipBuildFlags "-Csetup-args=$f"
   done
 }
 
diff --git a/pkgs/development/python-modules/mike/default.nix b/pkgs/development/python-modules/mike/default.nix
index eb48339a27f0..c70a415d9d55 100644
--- a/pkgs/development/python-modules/mike/default.nix
+++ b/pkgs/development/python-modules/mike/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "mike";
-  version = "2.1.3";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jimporter";
     repo = "mike";
     tag = "v${version}";
-    hash = "sha256-eGUkYcPTrXwsZPqyDgHJlEFXzhMnenoZsjeHVGO/9WU=";
+    hash = "sha256-+QFtInHma433XI4EcMTpFKZVdk+x2JREo73qM35G0pQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index f4cbda227303..1626169e6dc1 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mitogen";
-  version = "0.3.45";
+  version = "0.3.47";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitogen-hq";
     repo = "mitogen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PwvtniLqy8gSHqN0NxMQqh9Jf8zj7PaVTFot61w4LPM=";
+    hash = "sha256-vCfGig2Sc4NpDl2lEM5FkFAsA/+EFd8Sv643onkMWqQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
index 9745d865e24a..035de58d6efb 100644
--- a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
+++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
   meta = {
     description = "Plugin for customizing the navigation structure of your MkDocs site";
     homepage = "https://github.com/lukasgeiter/mkdocs-awesome-nav";
-    changelog = "https://github.com/lukasgeiter/mkdocs-awesome-nav/blob/${src.tag}/CHANGELOG";
+    changelog = "https://github.com/lukasgeiter/mkdocs-awesome-nav/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phaer ];
   };
diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index 413b7d058ce1..85d5b0a56be0 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -7,6 +7,7 @@
   setuptools,
 
   # dependencies
+  aiohttp,
   alembic,
   cachetools,
   click,
@@ -38,12 +39,12 @@
   requests,
   scikit-learn,
   scipy,
+  skops,
   sqlalchemy,
   sqlparse,
   uvicorn,
 
   # tests
-  aiohttp,
   azure-core,
   azure-storage-blob,
   azure-storage-file,
@@ -76,20 +77,20 @@
 
 buildPythonPackage rec {
   pname = "mlflow";
-  version = "3.8.1";
+  version = "3.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mlflow";
     repo = "mlflow";
     tag = "v${version}";
-    hash = "sha256-QjRFQRShVjTnCN7/+LJ0iiB/h0+P4GJJV4RaviQdS2U=";
+    hash = "sha256-Oe6nBnnOz7MvGUNCcCGhHl6ZbyDfAhQ0LlfMBF4p6Hc=";
   };
 
   pythonRelaxDeps = [
     "cryptography"
     "gunicorn"
-    "importlib-metadata"
+    "importlib_metadata"
     "packaging"
     "protobuf"
     "pytz"
@@ -99,6 +100,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
+    aiohttp
     alembic
     cachetools
     click
@@ -132,6 +134,7 @@ buildPythonPackage rec {
     scikit-learn
     scipy
     shap
+    skops
     sqlalchemy
     sqlparse
     uvicorn
diff --git a/pkgs/development/python-modules/mlx-lm/default.nix b/pkgs/development/python-modules/mlx-lm/default.nix
index cff7c736fa53..842e5c8c6e48 100644
--- a/pkgs/development/python-modules/mlx-lm/default.nix
+++ b/pkgs/development/python-modules/mlx-lm/default.nix
@@ -24,14 +24,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "mlx-lm";
-  version = "0.31.2";
+  version = "0.31.3";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "ml-explore";
     repo = "mlx-lm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ujt0KMs4dzIlbg7cg72TudAvlwJ4uWEG5Lx7+5j8cOU=";
+    hash = "sha256-DPOJfsIucG8mWt4ZKenymCJo/i9Jw+a+iuIygIIYkA8=";
   };
 
   build-system = [
@@ -79,12 +80,6 @@ buildPythonPackage (finalAttrs: {
     "tests/test_models.py::TestModels::test_gated_delta_masked"
   ];
 
-  disabledTests = [
-    # ValueError: [rope] dims must be positive but got 0
-    # Reported upstream: https://github.com/ml-explore/mlx-lm/issues/1089
-    "test_all_models"
-  ];
-
   meta = {
     description = "Run LLMs with MLX";
     homepage = "https://github.com/ml-explore/mlx-lm";
diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix
index 6cdc7cb6e6c9..9f22360363e3 100644
--- a/pkgs/development/python-modules/mlx/default.nix
+++ b/pkgs/development/python-modules/mlx/default.nix
@@ -20,6 +20,7 @@
 
   # tests
   numpy,
+  psutil,
   pytestCheckHook,
   python,
   runCommand,
@@ -41,14 +42,15 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "mlx";
-  version = "0.31.1";
+  version = "0.31.2";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "ml-explore";
     repo = "mlx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PiNk/MdMw9Vpat2KuslBTyaFuK+mJ4UvwJqBnysvvUU=";
+    hash = "sha256-0Oxacz61WGWZrpWw+fMQjEQfwOx1l1L2d0kWl54/LrQ=";
   };
 
   patches = [
@@ -120,6 +122,7 @@ buildPythonPackage (finalAttrs: {
   # Run the mlx Python test suite.
   nativeCheckInputs = [
     numpy
+    psutil
     pytestCheckHook
   ];
 
diff --git a/pkgs/development/python-modules/mlx/dont-fetch-json.patch b/pkgs/development/python-modules/mlx/dont-fetch-json.patch
index e134d25d2cd3..c52f579922c1 100644
--- a/pkgs/development/python-modules/mlx/dont-fetch-json.patch
+++ b/pkgs/development/python-modules/mlx/dont-fetch-json.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2451aa65..f88d4889 100644
+index 6d24df02..113629ba 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -241,14 +241,6 @@ else()
+@@ -313,14 +313,6 @@ else()
    set(MLX_BUILD_ACCELERATE OFF)
  endif()
  
@@ -14,7 +14,6 @@ index 2451aa65..f88d4889 100644
 -target_include_directories(
 -  mlx PRIVATE $<BUILD_INTERFACE:${json_SOURCE_DIR}/single_include/nlohmann>)
 -
- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/mlx)
- 
- target_include_directories(
-
+ # Add standalone JACCL library (RDMA over Thunderbolt distributed backend)
+ if(MLX_BUILD_CPU
+    AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
diff --git a/pkgs/development/python-modules/mlx/dont-fetch-nanobind.patch b/pkgs/development/python-modules/mlx/dont-fetch-nanobind.patch
index f2858448a93b..c9822ae1e2c7 100644
--- a/pkgs/development/python-modules/mlx/dont-fetch-nanobind.patch
+++ b/pkgs/development/python-modules/mlx/dont-fetch-nanobind.patch
@@ -1,15 +1,15 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0ed30932..e5842707 100644
+index a2395d02..6d24df02 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -339,13 +339,7 @@ if(MLX_BUILD_PYTHON_BINDINGS)
+@@ -354,13 +354,7 @@ if(MLX_BUILD_PYTHON_BINDINGS)
      Python 3.10
      COMPONENTS Interpreter Development.Module
      REQUIRED)
 -  FetchContent_Declare(
 -    nanobind
 -    GIT_REPOSITORY https://github.com/wjakob/nanobind.git
--    GIT_TAG v2.10.2
+-    GIT_TAG v2.12.0
 -    GIT_SHALLOW TRUE
 -    EXCLUDE_FROM_ALL)
 -  FetchContent_MakeAvailable(nanobind)
diff --git a/pkgs/development/python-modules/mlxtend/0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch b/pkgs/development/python-modules/mlxtend/0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch
deleted file mode 100644
index 2d807ef2c2e0..000000000000
--- a/pkgs/development/python-modules/mlxtend/0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 1fb59eb42f4bef229b953de313c7e78f0857ea42 Mon Sep 17 00:00:00 2001
-From: Philip Wilk <p.wilk@student.reading.ac.uk>
-Date: Sun, 23 Mar 2025 16:14:51 +0000
-Subject: [PATCH] StackingCVClassifier/fit: ensure compatibility with
- *scikit-learn* versions 1.4 and above by dynamically selecting between
- `fit_params` and `params`
-
----
- mlxtend/classifier/stacking_cv_classification.py | 5 ++++-
- mlxtend/regressor/stacking_cv_regression.py      | 6 +++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/mlxtend/classifier/stacking_cv_classification.py b/mlxtend/classifier/stacking_cv_classification.py
-index 5bff6907..f4c45b8c 100644
---- a/mlxtend/classifier/stacking_cv_classification.py
-+++ b/mlxtend/classifier/stacking_cv_classification.py
-@@ -15,6 +15,7 @@ from sklearn.base import TransformerMixin, clone
- from sklearn.model_selection import cross_val_predict
- from sklearn.model_selection._split import check_cv
- from sklearn.preprocessing import LabelEncoder
-+from sklearn import __version__ as sklearn_version
- 
- from ..externals.estimator_checks import check_is_fitted
- from ..externals.name_estimators import _name_estimators
-@@ -266,6 +267,8 @@ class StackingCVClassifier(
-             if self.verbose > 1:
-                 print(_name_estimators((model,))[0][1])
- 
-+            param_name = "fit_params" if sklearn_version < "1.4" else "params"
-+
-             prediction = cross_val_predict(
-                 model,
-                 X,
-@@ -273,10 +276,10 @@ class StackingCVClassifier(
-                 groups=groups,
-                 cv=final_cv,
-                 n_jobs=self.n_jobs,
--                fit_params=fit_params,
-                 verbose=self.verbose,
-                 pre_dispatch=self.pre_dispatch,
-                 method="predict_proba" if self.use_probas else "predict",
-+                **{param_name: fit_params},
-             )
- 
-             if not self.use_probas:
-diff --git a/mlxtend/regressor/stacking_cv_regression.py b/mlxtend/regressor/stacking_cv_regression.py
-index a1faf2ff..d2fb1c49 100644
---- a/mlxtend/regressor/stacking_cv_regression.py
-+++ b/mlxtend/regressor/stacking_cv_regression.py
-@@ -19,6 +19,7 @@ from sklearn.base import RegressorMixin, TransformerMixin, clone
- from sklearn.model_selection import cross_val_predict
- from sklearn.model_selection._split import check_cv
- from sklearn.utils import check_X_y
-+from sklearn import __version__ as sklearn_version
- 
- from ..externals.estimator_checks import check_is_fitted
- from ..externals.name_estimators import _name_estimators
-@@ -211,6 +212,9 @@ class StackingCVRegressor(_BaseXComposition, RegressorMixin, TransformerMixin):
-             fit_params = None
-         else:
-             fit_params = dict(sample_weight=sample_weight)
-+
-+        param_name = "fit_params" if sklearn_version < "1.4" else "params"
-+
-         meta_features = np.column_stack(
-             [
-                 cross_val_predict(
-@@ -221,8 +225,8 @@ class StackingCVRegressor(_BaseXComposition, RegressorMixin, TransformerMixin):
-                     cv=kfold,
-                     verbose=self.verbose,
-                     n_jobs=self.n_jobs,
--                    fit_params=fit_params,
-                     pre_dispatch=self.pre_dispatch,
-+                    **{param_name: fit_params},
-                 )
-                 for regr in self.regr_
-             ]
--- 
-2.47.1
-
diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix
index c6ff6cfdbd23..8b0cf517676d 100644
--- a/pkgs/development/python-modules/mlxtend/default.nix
+++ b/pkgs/development/python-modules/mlxtend/default.nix
@@ -38,11 +38,6 @@ buildPythonPackage rec {
     joblib
   ];
 
-  patches = [
-    # https://github.com/rasbt/mlxtend/issues/1117
-    ./0001-StackingCVClassifier-fit-ensure-compatibility-with-s.patch
-  ];
-
   nativeCheckInputs = [ pytestCheckHook ];
 
   pytestFlags = [ "-sv" ];
@@ -52,6 +47,14 @@ buildPythonPackage rec {
     "test_invalid_labels_1"
     "test_default"
     "test_nullability"
+    # see upstream issue https://github.com/rasbt/mlxtend/issues/1161
+    # skip the "TypeError: only 0-dimensional arrays can be converted to Python scalars" failures in test_perceptron
+    "test_standardized_iris_data"
+    "test_progress_1"
+    "test_progress_2"
+    "test_progress_3"
+    "test_score_function"
+    "test_nonstandardized_iris_data"
   ];
 
   disabledTestPaths = [
@@ -59,10 +62,6 @@ buildPythonPackage rec {
     "mlxtend/evaluate/tests/test_feature_importance.py" # urlopen error
     "mlxtend/evaluate/tests/test_bias_variance_decomp.py" # keras.api._v2
     "mlxtend/evaluate/tests/test_bootstrap_point632.py" # keras.api._v2
-    # Failing tests, most likely an upstream issue. See https://github.com/rasbt/mlxtend/issues/1117
-    "mlxtend/classifier/tests/test_ensemble_vote_classifier.py"
-    "mlxtend/classifier/tests/test_stacking_classifier.py"
-    "mlxtend/classifier/tests/test_stacking_cv_classifier.py"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/mmcif-pdbx/default.nix b/pkgs/development/python-modules/mmcif-pdbx/default.nix
index b2266bb76d66..db961d8f3ae9 100644
--- a/pkgs/development/python-modules/mmcif-pdbx/default.nix
+++ b/pkgs/development/python-modules/mmcif-pdbx/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "mmcif-pdbx";
-  version = "2.0.1";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Electrostatics";
     repo = "mmcif_pdbx";
     tag = "v${version}";
-    hash = "sha256-ymMQ/q4IMoq+B8RvIdL0aqolKxyE/4rnVfd4bUV5OUY=";
+    hash = "sha256-HzRJ8bzUHAmF7WA20DefvgSNDxMaqJCxfgqTHrS0BqU=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/mne/default.nix b/pkgs/development/python-modules/mne/default.nix
index b967acbe362c..c1efad30c8fb 100644
--- a/pkgs/development/python-modules/mne/default.nix
+++ b/pkgs/development/python-modules/mne/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonAtLeast,
+  stdenv,
   hatchling,
   hatch-vcs,
   numpy,
@@ -28,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "mne";
-  version = "1.11.0";
+  version = "1.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mne-tools";
     repo = "mne-python";
     tag = "v${version}";
-    hash = "sha256-lssSHlWUj3TU0F/31jTFc+oFdBx1C+9aolee6M8mJtw=";
+    hash = "sha256-8PzYTG8z35IG0nVegoPaJB/vpULujqHDd2VtLeXS0SQ=";
   };
 
   postPatch = ''
@@ -92,9 +93,10 @@ buildPythonPackage rec {
     "test_fine_cal_systems"
     "test_simulate_raw_bem"
   ]
-  ++ lib.optionals (pythonAtLeast "3.14") [
-    #https://github.com/mne-tools/mne-python/issues/13577
-    "test_set_montage_artinis_basic"
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # Fails when no "model name" is present in /proc/cpuinfo,
+    # which is common on Arm Linux systems
+    "test_sys_info_basic"
   ];
 
   pytestFlag = [
diff --git a/pkgs/development/python-modules/modelscope/default.nix b/pkgs/development/python-modules/modelscope/default.nix
index 45afcc95a203..db0cacdf3183 100644
--- a/pkgs/development/python-modules/modelscope/default.nix
+++ b/pkgs/development/python-modules/modelscope/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "modelscope";
-  version = "1.35.4";
+  version = "1.36.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelscope";
     repo = "modelscope";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-n33vf7GC4Oucw4/dWXeXeThRrkmSCk1rfS4BWzOxl7I=";
+    hash = "sha256-Cf6s5AujXL5kP7OPVbYSvfkvtAYH/XQJy1BKA8f3sGs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/modelsearch/default.nix b/pkgs/development/python-modules/modelsearch/default.nix
index c79c336e1405..8caa4a4f6007 100644
--- a/pkgs/development/python-modules/modelsearch/default.nix
+++ b/pkgs/development/python-modules/modelsearch/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "modelsearch";
-  version = "1.2.0";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "wagtail";
     repo = "django-modelsearch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zmurjjiJO6A/9XuGsGQcBWRX4NW9xVCFkCVRUk0Ziro=";
+    hash = "sha256-UH1t/CXJ7OX250SoUZYKMIAHuCxYxOT6l79RXI/oMLs=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix
index 4638affcb6a5..14c7a725c332 100644
--- a/pkgs/development/python-modules/molecule/default.nix
+++ b/pkgs/development/python-modules/molecule/default.nix
@@ -22,12 +22,12 @@
 
 buildPythonPackage rec {
   pname = "molecule";
-  version = "25.12.0";
+  version = "26.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-sia/G+Z84PowxyaqsiYGP5RD5WHX49BI9V37LuUa29Y=";
+    hash = "sha256-EuTJBQefZ2KK52VQbGl9K4p0SmXy1Mv1o7IssJ0Nr8Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/monkeytype/default.nix b/pkgs/development/python-modules/monkeytype/default.nix
deleted file mode 100644
index 195e5e72f434..000000000000
--- a/pkgs/development/python-modules/monkeytype/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  libcst,
-  mypy-extensions,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "monkeytype";
-  version = "23.3.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "Instagram";
-    repo = "MonkeyType";
-    tag = "v${version}";
-    hash = "sha256-DQ/3go53+0PQkhZcL2dX8MI/z4Iq7kTYd5EbacMNxT4=";
-  };
-
-  build-system = [
-    setuptools
-  ];
-
-  dependencies = [
-    libcst
-    mypy-extensions
-  ];
-
-  pythonImportsCheck = [
-    "monkeytype"
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    # Disable broken tests
-    "test_excludes_site_packages"
-    "test_callee_throws_recovers"
-    "test_nested_callee_throws_recovers"
-    "test_caller_handles_callee_exception"
-    "test_generator_trace"
-    "test_return_none"
-    "test_access_property"
-  ];
-
-  meta = {
-    description = "Python library that generates static type annotations by collecting runtime types";
-    homepage = "https://github.com/Instagram/MonkeyType/";
-    changelog = "https://github.com/Instagram/MonkeyType/blob/${src.rev}/CHANGES.rst";
-    license = lib.licenses.bsd3;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/mpl-typst/default.nix b/pkgs/development/python-modules/mpl-typst/default.nix
index 47f092e89fa0..c333bece263e 100644
--- a/pkgs/development/python-modules/mpl-typst/default.nix
+++ b/pkgs/development/python-modules/mpl-typst/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     numpy
   ];
 
-  pytestFlagsArray = [ "-v" ];
+  pytestFlags = [ "-v" ];
 
   pythonImportsCheck = [
     "mpl_typst"
diff --git a/pkgs/development/python-modules/mscerts/default.nix b/pkgs/development/python-modules/mscerts/default.nix
index c1682229f6d9..23f9f4b0c09a 100644
--- a/pkgs/development/python-modules/mscerts/default.nix
+++ b/pkgs/development/python-modules/mscerts/default.nix
@@ -5,16 +5,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "mscerts";
-  version = "2025.8.29";
+  version = "2026.4.30";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ralphje";
     repo = "mscerts";
-    tag = version;
-    hash = "sha256-K7U4dbhH3yWElSKRhU9mHU4W+Hdc6Vb9kf/TE4EJs8c=";
+    tag = finalAttrs.version;
+    hash = "sha256-S6YQt0PaY9OpFFrTcnHrak+8/x105Af7xLW5jln8GK0=";
   };
 
   build-system = [ setuptools ];
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   meta = {
     description = "Makes the Microsoft Trusted Root Program's Certificate Trust Lists available in Python";
     homepage = "https://github.com/ralphje/mscerts";
-    license = with lib.licenses; [ mpl20 ];
+    license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix
index 1e72810e3911..a4eb8c5a5fb8 100644
--- a/pkgs/development/python-modules/msgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/msgraph-sdk/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "msgraph-sdk";
-  version = "1.55.0";
+  version = "1.56.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-F6iL+bQS/r7t9NUGtspNx8E0viK4Fm211AqrxNgNGqg=";
+    hash = "sha256-Y2PX07IzHO3wjVEYUw1o6vb1cr1pa8BJIR9Uliho3lQ=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix
index 2120bed89958..c22c2630b14d 100644
--- a/pkgs/development/python-modules/msgspec/default.nix
+++ b/pkgs/development/python-modules/msgspec/default.nix
@@ -11,6 +11,7 @@
   pre-commit,
   pyright,
   pytest,
+  pytestCheckHook,
   pyyaml,
   setuptools,
   setuptools-scm,
@@ -68,8 +69,12 @@ buildPythonPackage rec {
     yaml = [ pyyaml ];
   };
 
-  # Requires libasan to be accessible
-  doCheck = false;
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # `tests/typing` runs type checkers
+  enabledTestPaths = [ "tests/unit" ];
 
   pythonImportsCheck = [ "msgspec" ];
 
diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix
index 7e3d9735e438..2c643f134bb3 100644
--- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix
+++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python tool and library for decrypting MS Office files with passwords or other keys";
     homepage = "https://github.com/nolze/msoffcrypto-tool";
-    changelog = "https://github.com/nolze/msoffcrypto-tool/blob/v${finalAttrs.src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/nolze/msoffcrypto-tool/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "msoffcrypto-tool";
diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix
index b2e0cd54af53..4ea724ca1c60 100644
--- a/pkgs/development/python-modules/msprime/default.nix
+++ b/pkgs/development/python-modules/msprime/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "msprime";
-  version = "1.3.4";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0PlEo3pREx34zZZ5fyR5gXPEC6L/XAlFgdHKVvxRFzA=";
+    hash = "sha256-aKcgjq6jDKRzNlKHyDMHj2VK8eGGsk/AEF53F8k7uWc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/msticpy/default.nix b/pkgs/development/python-modules/msticpy/default.nix
index 5a50e51ff8f1..1f1035a660ae 100644
--- a/pkgs/development/python-modules/msticpy/default.nix
+++ b/pkgs/development/python-modules/msticpy/default.nix
@@ -47,16 +47,16 @@
   urllib3,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "msticpy";
-  version = "2.17.2";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "msticpy";
-    tag = "v${version}";
-    hash = "sha256-tzAfynPyIqvWHxzLZ67r/Q5hNBKZAJhllhEVJ69L43k=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-aX5Nd0tNuweBp2SqGwe4/Z4LcdJaX3p5LLNQAOdGVGo=";
   };
 
   pythonRelaxDeps = [
@@ -117,8 +117,8 @@ buildPythonPackage rec {
   meta = {
     description = "Microsoft Threat Intelligence Security Tools";
     homepage = "https://github.com/microsoft/msticpy";
-    changelog = "https://github.com/microsoft/msticpy/releases/tag/${src.tag}";
+    changelog = "https://github.com/microsoft/msticpy/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix
index 6b147259b12b..d48c6c86b82b 100644
--- a/pkgs/development/python-modules/mujoco/default.nix
+++ b/pkgs/development/python-modules/mujoco/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
   # in the project's CI.
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-0yXFRIcCqRnbWz0AUP/wr4bUfaFG1ZZ4cishEve1UIQ=";
+    hash = "sha256-JQr+V0WNaIGy12WfoAKaEoy1fLu2ICaNlWR/ua10IYM=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/python-modules/multipart/default.nix b/pkgs/development/python-modules/multipart/default.nix
index 4eb143a42c57..1d02c7d6a0c3 100644
--- a/pkgs/development/python-modules/multipart/default.nix
+++ b/pkgs/development/python-modules/multipart/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "multipart";
-  version = "1.3.0";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "defnull";
     repo = "multipart";
     tag = "v${version}";
-    hash = "sha256-6vlyoi4nayZOKyfO4jbKNzUy7G6K7mySYzkqfp+45O4=";
+    hash = "sha256-kLiOK6ovW3ki1CONXVQZCJw/U3K1AoR6rrmJUstwZOw=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/multitasking/default.nix b/pkgs/development/python-modules/multitasking/default.nix
index d57f0bce0aa8..dc22c33d6116 100644
--- a/pkgs/development/python-modules/multitasking/default.nix
+++ b/pkgs/development/python-modules/multitasking/default.nix
@@ -2,26 +2,30 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "multitasking";
-  version = "0.0.12";
-  format = "setuptools";
+  version = "0.0.13";
+  pyproject = true;
 
-  # GitHub source releases aren't tagged
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-L7ovqO2MS4XiJ8XdfcQcfWWN47byR5JzFhdaVzSbhNE=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-2Ja134d8nKXu3b8OWZQSRpTWy1NaummPsjNExwJRVaE=";
   };
 
+  build-system = [ setuptools ];
+
   doCheck = false; # No tests included
+
   pythonImportsCheck = [ "multitasking" ];
 
   meta = {
     description = "Non-blocking Python methods using decorators";
     homepage = "https://github.com/ranaroussi/multitasking";
+    changelog = "https://github.com/ranaroussi/multitasking/releases/tag/${finalAttrs.version}";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ef4cdde02b6a..387cf12aea45 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -43,603 +43,603 @@ let
 in
 {
   mypy-boto3-accessanalyzer =
-    buildMypyBoto3Package "accessanalyzer" "1.42.85"
-      "sha256-L62TL/CQ3heDwvDw/MX7M3A0UukHWp1bf1ez10i5Bwc=";
+    buildMypyBoto3Package "accessanalyzer" "1.43.0"
+      "sha256-BwX8ieQDuKQ+ZXvGD+INPX6pS6qvqewhj8Ttfi1Rs8Q=";
 
   mypy-boto3-account =
-    buildMypyBoto3Package "account" "1.42.6"
-      "sha256-FtWO7IGhuWHuDyZTxFWdP8YC5Lz7CErmvKYQ+cYnxEs=";
+    buildMypyBoto3Package "account" "1.43.0"
+      "sha256-KNFTnweHO/8xVFHLcjBP0USqBQfc5BQjj+JBEGlM7kI=";
 
   mypy-boto3-acm =
-    buildMypyBoto3Package "acm" "1.42.80"
-      "sha256-axTuM7Bo1Or6YKwpjDNzCOMYkhbQ4eUiHEVSoRNgdEw=";
+    buildMypyBoto3Package "acm" "1.43.0"
+      "sha256-GGKJP2yX4n6n0+K/LmSSNbpeb9e7b194L9pg7yO3WAk=";
 
   mypy-boto3-acm-pca =
-    buildMypyBoto3Package "acm-pca" "1.42.3"
-      "sha256-0lg6uZvh8R3Vk1WpUUliceEbU8oHniIkfpYkX1q8VnM=";
+    buildMypyBoto3Package "acm-pca" "1.43.0"
+      "sha256-o5hZAxSZklg7hzL7MWCBYnnYTRoBSSAKPLpub1NVO74=";
 
   mypy-boto3-amp =
-    buildMypyBoto3Package "amp" "1.42.3"
-      "sha256-hT/YK9234i1l9viz0pGJm7ab5spLxbfGmlzeKc/8naA=";
+    buildMypyBoto3Package "amp" "1.43.0"
+      "sha256-yDDyrgINiqUb6lcpQI9oWDy6lw+NiJR4hwmxnAPpQeA=";
 
   mypy-boto3-amplify =
-    buildMypyBoto3Package "amplify" "1.42.3"
-      "sha256-T3jbr0pptSc8vfUoSU9qQSelKfALNmm9W9rD7KppajE=";
+    buildMypyBoto3Package "amplify" "1.43.0"
+      "sha256-+NcDF7OKlkYfnuGf1IyFMr4XsLWSet855TSoOzsRuX4=";
 
   mypy-boto3-amplifybackend =
-    buildMypyBoto3Package "amplifybackend" "1.42.3"
-      "sha256-LyQTUXGSdt7IJrOOOEcJg66VcI9xtX3/kG2B+r+B9og=";
+    buildMypyBoto3Package "amplifybackend" "1.43.0"
+      "sha256-dfL8YonjWmWI+U6VsmXCOTmfo3kIUPgOKCKT+/q6b70=";
 
   mypy-boto3-amplifyuibuilder =
-    buildMypyBoto3Package "amplifyuibuilder" "1.42.3"
-      "sha256-Q8nkt2PJnip62r2lbCZcB9qGE6sSg28ZAycLI8gIQ7s=";
+    buildMypyBoto3Package "amplifyuibuilder" "1.43.0"
+      "sha256-XrlXdqhPSVWqssEe+UuREy69icRZE/wCxvM5KVnHS64=";
 
   mypy-boto3-apigateway =
-    buildMypyBoto3Package "apigateway" "1.42.68"
-      "sha256-cjHTz3Q9T7NBcr/p00heOzlBVlnVMfzWylivg37dtWk=";
+    buildMypyBoto3Package "apigateway" "1.43.0"
+      "sha256-LoKLFyWsPkSm4DODnXkpqzblQse4osUJLAetitR+/VQ=";
 
   mypy-boto3-apigatewaymanagementapi =
-    buildMypyBoto3Package "apigatewaymanagementapi" "1.42.3"
-      "sha256-Krejmp4mDW+6W1eGgpk8qeujMKXepkZZF3FS6PuG1tI=";
+    buildMypyBoto3Package "apigatewaymanagementapi" "1.43.0"
+      "sha256-2Y8XmI/8Y/nMrCraK9gqkOTiPgfrhTZ77fm4Xxbxsrg=";
 
   mypy-boto3-apigatewayv2 =
-    buildMypyBoto3Package "apigatewayv2" "1.42.76"
-      "sha256-MynmttId2CWYjULMj8RaB4xMwKnoWdh3FRmVv+Z5wYM=";
+    buildMypyBoto3Package "apigatewayv2" "1.43.0"
+      "sha256-MzXtUHNFCx5jRkcU4PIh3xIs6A9jNbORcdls/3UjQIc=";
 
   mypy-boto3-appconfig =
-    buildMypyBoto3Package "appconfig" "1.42.3"
-      "sha256-YG03dlJZyFSjV06sw/5co5VrXEVrEv+AyOHLIL2rkRk=";
+    buildMypyBoto3Package "appconfig" "1.43.0"
+      "sha256-JcXo/dGd0aeQzrJFC9scPHKI2Tna+PaWLWVZwC17igo=";
 
   mypy-boto3-appconfigdata =
-    buildMypyBoto3Package "appconfigdata" "1.42.3"
-      "sha256-WV426fR3IFkW4fEdKMbDNdYGog5VvLeTpDpLSKSysy0=";
+    buildMypyBoto3Package "appconfigdata" "1.43.0"
+      "sha256-lXABSpVWIFB3Q+Zrk8Xl5toHs5tI8UbHq8ayWas51WI=";
 
   mypy-boto3-appfabric =
-    buildMypyBoto3Package "appfabric" "1.42.3"
-      "sha256-1yz5ybS89QjB90u8jBtGfcO3yr8ps0YgY8hR8f4ULuE=";
+    buildMypyBoto3Package "appfabric" "1.43.0"
+      "sha256-orCWB6FeVF4iJiIja5hNW14PZ/QUGaaRUktPr7dPgpE=";
 
   mypy-boto3-appflow =
-    buildMypyBoto3Package "appflow" "1.42.3"
-      "sha256-JUvz8VRO/t7KlrvFYWb53Qj8uXDOwHFtT16QCxO/ubw=";
+    buildMypyBoto3Package "appflow" "1.43.0"
+      "sha256-AaezdFSoG0JtWQBOAd1f3gUhtppML68j9NvePYbjsdI=";
 
   mypy-boto3-appintegrations =
-    buildMypyBoto3Package "appintegrations" "1.42.63"
-      "sha256-8/3+GHPdEo8uJx0XLN+V4MUx9fw6eo0blTjBc50q13o=";
+    buildMypyBoto3Package "appintegrations" "1.43.0"
+      "sha256-8nS9kfOsFIRMoiF9Iy8czuGCBV1JNF3AHyMjIjcvp3U=";
 
   mypy-boto3-application-autoscaling =
-    buildMypyBoto3Package "application-autoscaling" "1.42.3"
-      "sha256-lO+lh3quoxg68y9p1wx8plhWFFtVBf6BNIKZhYMQ8OQ=";
+    buildMypyBoto3Package "application-autoscaling" "1.43.0"
+      "sha256-f9Xs8j/KPZjmNJaifdX1Pi+oxliZHAeX80q/qXUURv0=";
 
   mypy-boto3-application-insights =
-    buildMypyBoto3Package "application-insights" "1.42.3"
-      "sha256-8AwPxJHXtgmSPfyfuoLeno49sLJ3lJhBWB+vK56iTUI=";
+    buildMypyBoto3Package "application-insights" "1.43.0"
+      "sha256-nKvPnx0AUoi76f0WPMV0HhiKwgYJslxM+OP+NQAN2fA=";
 
   mypy-boto3-applicationcostprofiler =
-    buildMypyBoto3Package "applicationcostprofiler" "1.42.3"
-      "sha256-6fh0DnPk3yhleWCLnUJ/is5nRXrXZXEzpi8oO4q1zK0=";
+    buildMypyBoto3Package "applicationcostprofiler" "1.43.0"
+      "sha256-RTA5W/ZbYVewNvnS9X3ZN7cO4+m+nwewKRhqP80OJic=";
 
   mypy-boto3-appmesh =
-    buildMypyBoto3Package "appmesh" "1.42.3"
-      "sha256-97tJFt934dOeY79zPZmYdSIorRSgVT0N1PT0DvcDbjA=";
+    buildMypyBoto3Package "appmesh" "1.43.0"
+      "sha256-oEoGMnF/+BU62mYNnh0Aoj89AZkk6iArw3pCTV37ld4=";
 
   mypy-boto3-apprunner =
-    buildMypyBoto3Package "apprunner" "1.42.3"
-      "sha256-Mvf3bBhrRRR+hoAsBPq7p9COJqVxV9LL+GrnikrHX2g=";
+    buildMypyBoto3Package "apprunner" "1.43.0"
+      "sha256-gJM0o+V8YnmwVkgnRzR+Peaz45JuRpE8Hs6LRwfTeUQ=";
 
   mypy-boto3-appstream =
-    buildMypyBoto3Package "appstream" "1.42.90"
-      "sha256-LSqnigahgDeiz+szGMjALUzJgxyXfEHvT7aftR8gIhQ=";
+    buildMypyBoto3Package "appstream" "1.43.2"
+      "sha256-lNImOTgL0fRu5Kjv9w4j5eifxpv1qjhVRd1/4bIGfQY=";
 
   mypy-boto3-appsync =
-    buildMypyBoto3Package "appsync" "1.42.6"
-      "sha256-+juUSMxU7Ohy6l/CHdq5vPmlRM/f0PcXl35LsT7k03s=";
+    buildMypyBoto3Package "appsync" "1.43.0"
+      "sha256-kHjAZUMhXV5jTPswlMh0Y3/V7R99jyuknh5sqVWb7Ts=";
 
   mypy-boto3-arc-zonal-shift =
-    buildMypyBoto3Package "arc-zonal-shift" "1.42.3"
-      "sha256-9GHZy/GvevYqzWoY9ubb+/8P33SMvNUurg9WsUq82ls=";
+    buildMypyBoto3Package "arc-zonal-shift" "1.43.0"
+      "sha256-yVYalO7e/czfc2dsoN2aEypJQMCPclY/Gvo799FYBsU=";
 
   mypy-boto3-athena =
-    buildMypyBoto3Package "athena" "1.42.43"
-      "sha256-1IGcRscPDjjEn/7129vTl8jWakc/jBsRawOhxFq/66c=";
+    buildMypyBoto3Package "athena" "1.43.0"
+      "sha256-0+/67dkC+suDivd53hHJ+d1D8Kg2ZxRJvUS0EUaZjXE=";
 
   mypy-boto3-auditmanager =
-    buildMypyBoto3Package "auditmanager" "1.42.3"
-      "sha256-jW+LgaUpdeCSJLnpNE13DSio9nFmp0icoLEMwxX44KU=";
+    buildMypyBoto3Package "auditmanager" "1.43.0"
+      "sha256-23zuWICJ49no8T4AlgZV0kDkz0j5pe1xE7uKKmszm9U=";
 
   mypy-boto3-autoscaling =
-    buildMypyBoto3Package "autoscaling" "1.42.90"
-      "sha256-1XOMMOYTNH/wss2fFh7d21dXFa4/anppb/+I5dHSBQI=";
+    buildMypyBoto3Package "autoscaling" "1.43.0"
+      "sha256-8Wme8qFuxcX74RuNmGl+9mszIpPXh5bcttMRoeqN7ww=";
 
   mypy-boto3-autoscaling-plans =
-    buildMypyBoto3Package "autoscaling-plans" "1.42.3"
-      "sha256-BJ5MKA8jpafHN014Y+pLo1IKcVq1PAfufGlCFwEGSKk=";
+    buildMypyBoto3Package "autoscaling-plans" "1.43.0"
+      "sha256-imuX16TqfUAoPqzJTclvPMWiVnDSh6nJ8QbSksLEKps=";
 
   mypy-boto3-backup =
-    buildMypyBoto3Package "backup" "1.42.86"
-      "sha256-qPxL3n/CZGpncMBs1nIOmZPsQP5wAF3bE8kH+zGvkZo=";
+    buildMypyBoto3Package "backup" "1.43.0"
+      "sha256-O3fCM33tfF8mxS34KUEQLz4OAV9rSkAtVEcYfd1MBJ8=";
 
   mypy-boto3-backup-gateway =
-    buildMypyBoto3Package "backup-gateway" "1.42.58"
-      "sha256-G3kwLm2IEgXNFrs8V2uCj0su2S3P72FzmWSOEYjlV4c=";
+    buildMypyBoto3Package "backup-gateway" "1.43.0"
+      "sha256-FZuhcgbPBohluThfTy99inR5nyG0r3q/AsxNEvtgJU4=";
 
   mypy-boto3-batch =
-    buildMypyBoto3Package "batch" "1.42.76"
-      "sha256-lyBhjflCwnVm1o2k/vTEvb2+xFrEYBKVuKEcFtlAYZY=";
+    buildMypyBoto3Package "batch" "1.43.0"
+      "sha256-qkYs/jiXHYUjQMXSYx8XepvxFcrwRXYp2OUJNual8Jw=";
 
   mypy-boto3-billingconductor =
-    buildMypyBoto3Package "billingconductor" "1.42.7"
-      "sha256-ZQsHPgnPepj1HbBd37u76Fd1td4M7B5o6kId8FPP5yQ=";
+    buildMypyBoto3Package "billingconductor" "1.43.0"
+      "sha256-M1CIE4fho0uGdF6/h87BCiz7Y9q2P2nAHC2NS/d9JOA=";
 
   mypy-boto3-braket =
-    buildMypyBoto3Package "braket" "1.42.85"
-      "sha256-+pwEL8dUctaNIV68zH9Waa3FlmiPzD/4AdKX0HhnbrY=";
+    buildMypyBoto3Package "braket" "1.43.0"
+      "sha256-yVV4PXfWEkxmy2qlgQtcs3iIVo6mzwKY3i2j/OLsf9U=";
 
   mypy-boto3-budgets =
-    buildMypyBoto3Package "budgets" "1.42.33"
-      "sha256-opWm1iTVk4erudBdsTJ/AzXF3gDDwOGHiZEwV7CP8V4=";
+    buildMypyBoto3Package "budgets" "1.43.0"
+      "sha256-KXhiiIB9ydHdwGClmYbaaT4t2sA7BdEXQG9HFpnuE1w=";
 
   mypy-boto3-ce =
-    buildMypyBoto3Package "ce" "1.42.28"
-      "sha256-WOV41Me/uQKGrDotJutJyUuH8XIeMFrnkE204NFFFGk=";
+    buildMypyBoto3Package "ce" "1.43.0"
+      "sha256-RsvQvkie+k0OMjgs30ZlwiRygo0LhZk0V7vMAXU6gQ8=";
 
   mypy-boto3-chime =
-    buildMypyBoto3Package "chime" "1.42.3"
-      "sha256-7p41zcpRdNp1A09ipeKMnsLzws+z/Zsq6AMk6aePvoA=";
+    buildMypyBoto3Package "chime" "1.43.0"
+      "sha256-wEKvEv5sCqZ8urD6rF2FxbhnT+riado4SMkZb4GTjZE=";
 
   mypy-boto3-chime-sdk-identity =
-    buildMypyBoto3Package "chime-sdk-identity" "1.42.3"
-      "sha256-ISo7In03FFfx4u7qzLR9u+9XuzmLW7VLYYs1WmMT5BI=";
+    buildMypyBoto3Package "chime-sdk-identity" "1.43.0"
+      "sha256-UFQbNUX0qbRtX3VkmgMJPZyPqcj51+Of1C/RJdvSyjo=";
 
   mypy-boto3-chime-sdk-media-pipelines =
-    buildMypyBoto3Package "chime-sdk-media-pipelines" "1.42.3"
-      "sha256-7Azzr1VUhy9D+75EwPDUs0rAsGIGetAvWAyLRywc+6M=";
+    buildMypyBoto3Package "chime-sdk-media-pipelines" "1.43.0"
+      "sha256-XD0O/cLPR/0dgH3PUQRnwEHW2iGGMqPuxdEk7070hmI=";
 
   mypy-boto3-chime-sdk-meetings =
-    buildMypyBoto3Package "chime-sdk-meetings" "1.42.3"
-      "sha256-1mD2BSPxGoRcre0iHaUWkn7E8GypVbaINF8BiT2nb64=";
+    buildMypyBoto3Package "chime-sdk-meetings" "1.43.0"
+      "sha256-5MeFYmCsBP+KN7t3Q0UZxF/Yt3st1wXS+bpHAj04Fi4=";
 
   mypy-boto3-chime-sdk-messaging =
-    buildMypyBoto3Package "chime-sdk-messaging" "1.42.3"
-      "sha256-VhdO0Sa0eJuD/JWk+ALrG+XviDbb81PW9pYOaCPWzF0=";
+    buildMypyBoto3Package "chime-sdk-messaging" "1.43.0"
+      "sha256-tzV4iGq77gV+G8V29kn3qq9Riqa5TqDObBi2uVAXpx8=";
 
   mypy-boto3-chime-sdk-voice =
-    buildMypyBoto3Package "chime-sdk-voice" "1.42.3"
-      "sha256-Yj+PL5SHeMuiC3kougQa6zahznlD32+1NQWqoD8xdEg=";
+    buildMypyBoto3Package "chime-sdk-voice" "1.43.0"
+      "sha256-Vtu56EDQljvG3JZbiqt3CJzhquUIbYY2/Kn7QXw4Poc=";
 
   mypy-boto3-cleanrooms =
-    buildMypyBoto3Package "cleanrooms" "1.42.91"
-      "sha256-Pl1Ov1IHCe/zKO7eiGbJVeF8+aYXoeNZtMPhZQX63Qk=";
+    buildMypyBoto3Package "cleanrooms" "1.43.0"
+      "sha256-iQRlqBZZG4pnuy57HXKwFYJ64+wkS9v7h/pKl19R5sg=";
 
   mypy-boto3-cloud9 =
-    buildMypyBoto3Package "cloud9" "1.42.3"
-      "sha256-KZVvBn+NTk8gPgzPxb1vbC8osYsmNBR106k05Y2h6R4=";
+    buildMypyBoto3Package "cloud9" "1.43.0"
+      "sha256-76N3xUFKaU+cepHviRw2SWdjptNmVZkg6giAF7B1b5s=";
 
   mypy-boto3-cloudcontrol =
-    buildMypyBoto3Package "cloudcontrol" "1.42.3"
-      "sha256-JnSrsxpu+qcRkywLOexkrtfFjAkK9uZ/R4+lo6pIleo=";
+    buildMypyBoto3Package "cloudcontrol" "1.43.0"
+      "sha256-KwwGrKpyWEtL6cqtQA3TjWuQodCGETNCopw9GCQE4BY=";
 
   mypy-boto3-clouddirectory =
-    buildMypyBoto3Package "clouddirectory" "1.42.3"
-      "sha256-3ODxia6FDYDvvzITeP7asJhuVV4M9mMI8iw0JlaSuIU=";
+    buildMypyBoto3Package "clouddirectory" "1.43.0"
+      "sha256-Ula0Hx4jZ6JVlT9v4P88bmtQSYyFtofeZiN9vAILqxw=";
 
   mypy-boto3-cloudformation =
-    buildMypyBoto3Package "cloudformation" "1.42.3"
-      "sha256-O9OEm8iaNx1MNoaRU1syAkS6AFec3dY7tYtz8o1w5RA=";
+    buildMypyBoto3Package "cloudformation" "1.43.0"
+      "sha256-W+hFvD3Buc29i2sHH618QtAiHUCHrAzHxbndIZsyRgY=";
 
   mypy-boto3-cloudfront =
-    buildMypyBoto3Package "cloudfront" "1.42.80"
-      "sha256-hWVzlj2dFEy6a7pyIgcYuz4Slxo5g8ntR8Rd/BO8ZOY=";
+    buildMypyBoto3Package "cloudfront" "1.43.0"
+      "sha256-VdzeLDZ+AC5tqngdlPsKI8QvY+DlruTKcpXL3z4lpdw=";
 
   mypy-boto3-cloudhsm =
-    buildMypyBoto3Package "cloudhsm" "1.42.3"
-      "sha256-Bxet+xXHr3VUxQEaNhJzvZAFkT0yk4O9CaJks91gtkY=";
+    buildMypyBoto3Package "cloudhsm" "1.43.0"
+      "sha256-TgO3rIefF/8y6hBV6N8pxK7JboMBTFWMK28sE/WvxyU=";
 
   mypy-boto3-cloudhsmv2 =
-    buildMypyBoto3Package "cloudhsmv2" "1.42.3"
-      "sha256-i1q4pVmKPj7e6amzdWWz+ZuXR14dCENIhG07mU5xsEE=";
+    buildMypyBoto3Package "cloudhsmv2" "1.43.0"
+      "sha256-iWBFQhEfZEsk/iHFMz2q3FvZqY/DeOcgJLLMbcFtD7Q=";
 
   mypy-boto3-cloudsearch =
-    buildMypyBoto3Package "cloudsearch" "1.42.3"
-      "sha256-vinIbxGEPhGko4DnHDtNKBGm5EwYu7SpknV/QVdQr3Q=";
+    buildMypyBoto3Package "cloudsearch" "1.43.0"
+      "sha256-XWNJ5/MQnUSXTAA5Fa6MYxXj/ygw6tVjnTY+Nar8vU8=";
 
   mypy-boto3-cloudsearchdomain =
-    buildMypyBoto3Package "cloudsearchdomain" "1.42.3"
-      "sha256-t3cUQtOO2ZDZsBdcA9XinyF5tZiZVC5fatcbwQlzXAA=";
+    buildMypyBoto3Package "cloudsearchdomain" "1.43.0"
+      "sha256-uyv85XKo/8MreIxPhVtrocfjYaYEoW7ppWT50LA1dv0=";
 
   mypy-boto3-cloudtrail =
-    buildMypyBoto3Package "cloudtrail" "1.42.3"
-      "sha256-cJHd1HRP4r0xrlegID0GXjIKNqEtS3hUB2J6XmhIL8U=";
+    buildMypyBoto3Package "cloudtrail" "1.43.0"
+      "sha256-4NRQ3ZuXmsb90QTVwt57MneonBWDQjNj1lD3UnqYAOg=";
 
   mypy-boto3-cloudtrail-data =
-    buildMypyBoto3Package "cloudtrail-data" "1.42.3"
-      "sha256-S2NgrjralqxjjGo39TwaUSStqspnhI/E2/BLXUGP0Hc=";
+    buildMypyBoto3Package "cloudtrail-data" "1.43.0"
+      "sha256-PVskBSuwqSfNybHDtLLfVpDG0dwR/Q1LhrHz1imsR8A=";
 
   mypy-boto3-cloudwatch =
-    buildMypyBoto3Package "cloudwatch" "1.42.90"
-      "sha256-JJOtHOlHDMYwjk4zEPArq7rmrlSINUxfd4etVVWGItw=";
+    buildMypyBoto3Package "cloudwatch" "1.43.2"
+      "sha256-oI+4JjIbiNqAQ6QXXX3OeigRmsIqym4S2TiwrjMijQU=";
 
   mypy-boto3-codeartifact =
-    buildMypyBoto3Package "codeartifact" "1.42.3"
-      "sha256-YkeABuPHoW5nQG1B01thEv8T5M8KB1cxstw5eCiet1A=";
+    buildMypyBoto3Package "codeartifact" "1.43.0"
+      "sha256-CubsXd2HL6MvlyE5z1pnAacMWILCRnlWE0cZODrVeJk=";
 
   mypy-boto3-codebuild =
-    buildMypyBoto3Package "codebuild" "1.42.3"
-      "sha256-yacISwHjButV2KY3cYD2QyvnGaNFt62lhjpsLh85OPc=";
+    buildMypyBoto3Package "codebuild" "1.43.0"
+      "sha256-2w+09jNgnpl3wQSKfnz7vsaQBVy+puyOsvimwa/axgg=";
 
   mypy-boto3-codecatalyst =
-    buildMypyBoto3Package "codecatalyst" "1.42.3"
-      "sha256-XX3A98JxTsrinKTDxj949XYUliqoTKiu+WUY7jK3q4o=";
+    buildMypyBoto3Package "codecatalyst" "1.43.0"
+      "sha256-wslSfhGAP7FLmfRb+9Ez1eHm2kYScWzbm1DjaH9t5Qk=";
 
   mypy-boto3-codecommit =
-    buildMypyBoto3Package "codecommit" "1.42.3"
-      "sha256-8vPx4zud7dPV+FXln6rR6RaYlY+wiGhrf6KPsJoBxsc=";
+    buildMypyBoto3Package "codecommit" "1.43.0"
+      "sha256-0g9BWShZat95aZvymEAJdKsKjZhSoye/YBi7L2KauPo=";
 
   mypy-boto3-codedeploy =
-    buildMypyBoto3Package "codedeploy" "1.42.3"
-      "sha256-nUPEMOLK9Lb61aYZ8bgjBCEotVXL2ku2BPdVXwjNPXM=";
+    buildMypyBoto3Package "codedeploy" "1.43.0"
+      "sha256-lFLE/ggwLC/ZI1f5woZTJadm5T1XBDWd2BmuqK92hC8=";
 
   mypy-boto3-codeguru-reviewer =
-    buildMypyBoto3Package "codeguru-reviewer" "1.42.3"
-      "sha256-qUk0c9axiud0GSWBOwm0W5cNJOGRLkSi4Sz+GdmF/c4=";
+    buildMypyBoto3Package "codeguru-reviewer" "1.43.0"
+      "sha256-XVttoZ5ZrLYKhKipByY5DS6QkCn8hVkvOpv7LDfWrA0=";
 
   mypy-boto3-codeguru-security =
-    buildMypyBoto3Package "codeguru-security" "1.42.3"
-      "sha256-nvbGqJPJ67ipJSPtVWF10vbZSx5PtXE5HTKPH8runvc=";
+    buildMypyBoto3Package "codeguru-security" "1.43.0"
+      "sha256-3AUfJHKef3RMi2bNCGhbuLXz2pLnRBkwxaWgTipPW2c=";
 
   mypy-boto3-codeguruprofiler =
-    buildMypyBoto3Package "codeguruprofiler" "1.42.3"
-      "sha256-rDZJQ/nKSLdwz48jmVGXWf61sq7hQzKFt8b6zitZiRE=";
+    buildMypyBoto3Package "codeguruprofiler" "1.43.0"
+      "sha256-4N/7oY35YL5yhAJV48w6Gn3/vqy2D4i7YRVM4RrpFME=";
 
   mypy-boto3-codepipeline =
-    buildMypyBoto3Package "codepipeline" "1.42.3"
-      "sha256-lZRCPyZPbUXrCLvZicdB4Yi8RfK1NS5Cjt8uuxz12rY=";
+    buildMypyBoto3Package "codepipeline" "1.43.0"
+      "sha256-NGqIXvyBN6ryi91iyVsCHiIP2YYWT10jfjymR2pVOfE=";
 
   mypy-boto3-codestar =
     buildMypyBoto3Package "codestar" "1.35.0"
       "sha256-B9Aq+hh9BOzCIYMkS21IZYb3tNCnKnV2OpSIo48aeJM=";
 
   mypy-boto3-codestar-connections =
-    buildMypyBoto3Package "codestar-connections" "1.42.3"
-      "sha256-N2s7ir1VezlVgTJfL1Q9wmT5VyhCyxvy9hPMM9pgavg=";
+    buildMypyBoto3Package "codestar-connections" "1.43.0"
+      "sha256-RRk2nw7TiXH6ktFN96roZ+XS/iu1F6nmqNM9rPZkccM=";
 
   mypy-boto3-codestar-notifications =
-    buildMypyBoto3Package "codestar-notifications" "1.42.3"
-      "sha256-/Do27W8Ye71TMnvS9cihH+NgyuhbYjnQZlRy5IhZPyE=";
+    buildMypyBoto3Package "codestar-notifications" "1.43.0"
+      "sha256-QIdgZzTxbWIotkfHQCUxc7SVrKUReLJD1Fs+R+97Is4=";
 
   mypy-boto3-cognito-identity =
-    buildMypyBoto3Package "cognito-identity" "1.42.3"
-      "sha256-N9PEmvqI7Yc7AAuDdOj1iePSq7hJTgOmS+4z7GzYd98=";
+    buildMypyBoto3Package "cognito-identity" "1.43.0"
+      "sha256-CavBKgp+dEMR2poR+bG2PgZb+wX1zlNmuOyJsV3LfVM=";
 
   mypy-boto3-cognito-idp =
-    buildMypyBoto3Package "cognito-idp" "1.42.90"
-      "sha256-BSU4enN4Z7vc1zT3s+ha0YXNFh4UB63CULw2auK5EJM=";
+    buildMypyBoto3Package "cognito-idp" "1.43.0"
+      "sha256-oxmjIvweCKsN/QybmuHCKeGPzQMZsJOZ4HXvUnA15h8=";
 
   mypy-boto3-cognito-sync =
-    buildMypyBoto3Package "cognito-sync" "1.42.3"
-      "sha256-hRjavmc5Uz2JInrXnUrFlby+XPaP2hIShhPbHreE5/4=";
+    buildMypyBoto3Package "cognito-sync" "1.43.0"
+      "sha256-EoEbHL7mVL92u2sEuQSC3duOm6XD31EBGMeWmRhbXjE=";
 
   mypy-boto3-comprehend =
-    buildMypyBoto3Package "comprehend" "1.42.3"
-      "sha256-b+dX5aCg7czhnGTapZ1DdIYyNcr8bb1SGEmw96oe2jI=";
+    buildMypyBoto3Package "comprehend" "1.43.0"
+      "sha256-GCBFy/aUd9tlvFe+gqJJ6WTXybWI0T6bQRx5PTd9M6c=";
 
   mypy-boto3-comprehendmedical =
-    buildMypyBoto3Package "comprehendmedical" "1.42.3"
-      "sha256-F4zRXA2p9DfQnXItfz4VYlB1ueDwV5MORUCDHxOcr2w=";
+    buildMypyBoto3Package "comprehendmedical" "1.43.0"
+      "sha256-sXIPfVu+Ss+UHCZ7W1qof+rbEb266dqrSU3V6/j5PzY=";
 
   mypy-boto3-compute-optimizer =
-    buildMypyBoto3Package "compute-optimizer" "1.42.3"
-      "sha256-M8vUOtM7Q5gnwi9ZPGu6n+I4Twl02Su4eRGqq2+Ow1o=";
+    buildMypyBoto3Package "compute-optimizer" "1.43.0"
+      "sha256-6fPO+EuWQP7JbsVfMzpCr502G0ewx/pvubEqEnhhln0=";
 
   mypy-boto3-config =
-    buildMypyBoto3Package "config" "1.42.68"
-      "sha256-UNxmIK9UD6AVmT4nyQzunNAKjp2YmV1wQ5oloHOwcXw=";
+    buildMypyBoto3Package "config" "1.43.0"
+      "sha256-kPG0jzeHlRm8dNKCrxJY2Jw/N06PL+C/34gB9qhz2BY=";
 
   mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.42.91"
-      "sha256-d/xCgnFZIqqBBq4XbOFjpRCxqdpH8FIgm8msv4V8hZQ=";
+    buildMypyBoto3Package "connect" "1.43.0"
+      "sha256-M1VhBDYXAvRDV8U47BAeP0zlr7d6ZClYwEkDUUy35fA=";
 
   mypy-boto3-connect-contact-lens =
-    buildMypyBoto3Package "connect-contact-lens" "1.42.3"
-      "sha256-DskvuhNLcAzgDj7jBahKQmhYI6N8iWvGU5Q+1x2IQDI=";
+    buildMypyBoto3Package "connect-contact-lens" "1.43.0"
+      "sha256-7rXsHj0fTM5UPbdvtGH0AimOjKbrrSZwW7pueKjF/uA=";
 
   mypy-boto3-connectcampaigns =
-    buildMypyBoto3Package "connectcampaigns" "1.42.3"
-      "sha256-omWYUcr7Aj6r1F1kKAmM32fn9577UeUgqesnIiBIpPQ=";
+    buildMypyBoto3Package "connectcampaigns" "1.43.0"
+      "sha256-diymNW6D5QCBts8lrsxQy1Q18+LeRkhtOThRkd4gWsk=";
 
   mypy-boto3-connectcases =
-    buildMypyBoto3Package "connectcases" "1.42.90"
-      "sha256-zJ8mqzUaYMPA8CYMRKRAt/9QS0h1MmERWlDj8QN4/XU=";
+    buildMypyBoto3Package "connectcases" "1.43.0"
+      "sha256-4rq7ErTAeExDoq40tL6gjEsQjvGfOhUGuiDBoVOw4vQ=";
 
   mypy-boto3-connectparticipant =
-    buildMypyBoto3Package "connectparticipant" "1.42.3"
-      "sha256-vDq9icNnmldtEKNlE3yia15L2LNbQiNctYRM2qS2GaE=";
+    buildMypyBoto3Package "connectparticipant" "1.43.0"
+      "sha256-q+pbs4ZSKslCsusngqG7Z1ubXLs+SLIrwywLR/fkGM8=";
 
   mypy-boto3-controltower =
-    buildMypyBoto3Package "controltower" "1.42.3"
-      "sha256-EJatOlrK5f9nET1S2rq8o3ZZBcYZzKerscG6aiVzW3E=";
+    buildMypyBoto3Package "controltower" "1.43.0"
+      "sha256-TvuQwrUio7zZucfmOwDGJskn5cqZB3Z3I1CELx/ZnG4=";
 
   mypy-boto3-cur =
-    buildMypyBoto3Package "cur" "1.42.3"
-      "sha256-SAgpP1O6oGP8QIp6qoG4bu/axKZyVWgbdt8ZmZkrezY=";
+    buildMypyBoto3Package "cur" "1.43.0"
+      "sha256-pi0hMLpgYGrNU0/infONBg2WmES6NV0tfPgTjuRtWXk=";
 
   mypy-boto3-customer-profiles =
-    buildMypyBoto3Package "customer-profiles" "1.42.90"
-      "sha256-XMK02iA2ID/NKPIqSbcYsInjhPc0n+5nltVzHPziyuY=";
+    buildMypyBoto3Package "customer-profiles" "1.43.0"
+      "sha256-P+3AG1/Dj29UUJyAfXJcLvBxnLq6miVReVirg+/ewks=";
 
   mypy-boto3-databrew =
-    buildMypyBoto3Package "databrew" "1.42.3"
-      "sha256-PYO9ZRqOwz+typG60P14BoeDTSztuoNna35i3QWQE5w=";
+    buildMypyBoto3Package "databrew" "1.43.0"
+      "sha256-/+SVztnadibGuzLO1F6hOvPTMOCRq7iaA9Bc36KUzUQ=";
 
   mypy-boto3-dataexchange =
-    buildMypyBoto3Package "dataexchange" "1.42.80"
-      "sha256-CX9SlnnRzlF/AwIYKDL6tys4i4F9LJgildf/3luFvd4=";
+    buildMypyBoto3Package "dataexchange" "1.43.0"
+      "sha256-OPnECfEDg+3xeJVSRN61zMJcKvDfPWvcS0elJNEG1jM=";
 
   mypy-boto3-datapipeline =
-    buildMypyBoto3Package "datapipeline" "1.42.3"
-      "sha256-MExczpvtitz7h8p+wS8mKCToOQiiQwcOl3jzbKHbVzI=";
+    buildMypyBoto3Package "datapipeline" "1.43.0"
+      "sha256-KvH54NWvZxopuZFYYIbZxASO/WbO+ng7Wd7/sr+OTLI=";
 
   mypy-boto3-datasync =
-    buildMypyBoto3Package "datasync" "1.42.85"
-      "sha256-hzPwLZfupdoW57qSucoU9QCzQbeeHmmBnRRjrf8Szhk=";
+    buildMypyBoto3Package "datasync" "1.43.0"
+      "sha256-GAjsb2LKpwkD4+GEqxUbGlQR4rXzMxAGP6WH1j1y918=";
 
   mypy-boto3-dax =
-    buildMypyBoto3Package "dax" "1.42.3"
-      "sha256-ckBSxGRvIg5zvbjpXiWK04FLfbf77kWkxlVGhYJBGps=";
+    buildMypyBoto3Package "dax" "1.43.0"
+      "sha256-enqysaiJ2TY8K9Fya6ih4kW8Yo9LSbI61NT4G5ywjTU=";
 
   mypy-boto3-detective =
-    buildMypyBoto3Package "detective" "1.42.3"
-      "sha256-Yi12y0nw4kLlMI8E2syBMqrOW5ruImUn2mMQAZdKFXg=";
+    buildMypyBoto3Package "detective" "1.43.0"
+      "sha256-cQqctK2DnuHUuhMb+07M60JkyuBveerK2ybTt4bM+kA=";
 
   mypy-boto3-devicefarm =
-    buildMypyBoto3Package "devicefarm" "1.42.3"
-      "sha256-cknaGndSi5ak+3gRl4Acp3yHg3kD2g4bIGw7WxB3yfA=";
+    buildMypyBoto3Package "devicefarm" "1.43.0"
+      "sha256-vwaHsbqy5/hS/s+cNGvjldHffDpJ1Gx5nBSLKwvBU4g=";
 
   mypy-boto3-devops-guru =
-    buildMypyBoto3Package "devops-guru" "1.42.3"
-      "sha256-jJriPVQX4T4oUT2cnmZigxqjTXNx+esnU2xYvkp0C6E=";
+    buildMypyBoto3Package "devops-guru" "1.43.0"
+      "sha256-4VGCEZbno4w3H5+bc+2/f4ZkgefUDgWOOBkuGTVqvWk=";
 
   mypy-boto3-directconnect =
-    buildMypyBoto3Package "directconnect" "1.42.3"
-      "sha256-Jn3ozTTbTDJkDm4mHNO/PS5xGnvk2tuNmaac7iGYCl8=";
+    buildMypyBoto3Package "directconnect" "1.43.0"
+      "sha256-qoADzGwSCK2RXSaZKirR5g8SQBmDUuQtUGRdCv69Irw=";
 
   mypy-boto3-discovery =
-    buildMypyBoto3Package "discovery" "1.42.3"
-      "sha256-rZxsnERZZWod9U+7IyPVFYSncmbpNwtzoGQopSkb9sk=";
+    buildMypyBoto3Package "discovery" "1.43.0"
+      "sha256-+JRa3rx25BROhc3oXbMEW44C6aBj5hK1upz8kqU4MAY=";
 
   mypy-boto3-dlm =
-    buildMypyBoto3Package "dlm" "1.42.84"
-      "sha256-2oHpWP361CWG0XoAaiy5hxKAK9PBBdbyRNiDjLJ6/6U=";
+    buildMypyBoto3Package "dlm" "1.43.0"
+      "sha256-jkgV+/T/mGbAFQh46ZYBLTM66Rtd762XUUsbcFciJkk=";
 
   mypy-boto3-dms =
-    buildMypyBoto3Package "dms" "1.42.80"
-      "sha256-pkUCCZiYPvenvC/+Drd5SHImQTdJEDTGEJKz53cMhZ0=";
+    buildMypyBoto3Package "dms" "1.43.0"
+      "sha256-SDTUIwYwaIa8GTCU4P6x0gjZcjVtv+fY39ahC6rnYDQ=";
 
   mypy-boto3-docdb =
-    buildMypyBoto3Package "docdb" "1.42.3"
-      "sha256-ANTxQ58GFmS8ZVO4JQ94T2DbnpSmP3IneM0gEjXcfxw=";
+    buildMypyBoto3Package "docdb" "1.43.0"
+      "sha256-C6J9oFEXb579bPb6dONRUrB+QVOGuHLmwpV7EsE8qlY=";
 
   mypy-boto3-docdb-elastic =
-    buildMypyBoto3Package "docdb-elastic" "1.42.3"
-      "sha256-lELlqGCIpJDadB4McePclQ56IyVBo7s9B05mBI3vWdY=";
+    buildMypyBoto3Package "docdb-elastic" "1.43.0"
+      "sha256-67KqkSc8oUjKhuvQW6glmb211JZd+xkF03Mt8FISE8k=";
 
   mypy-boto3-drs =
-    buildMypyBoto3Package "drs" "1.42.90"
-      "sha256-oTKndZ70tzTxlniyg8hcXtEMWWGPHpS46RBFGNiZ0l0=";
+    buildMypyBoto3Package "drs" "1.43.0"
+      "sha256-1cKleN7L5xTlQCPq3OKiSQcnkeooPKS1AqIg1sBXOMk=";
 
   mypy-boto3-ds =
-    buildMypyBoto3Package "ds" "1.42.3"
-      "sha256-VLjmuBf9xHv0qwv2F3l/14KptFqXVE0OmwPF/WC06NI=";
+    buildMypyBoto3Package "ds" "1.43.0"
+      "sha256-LE8moRJrwRp3T4UGkj+vdRyq9Qw7t/UxcQm1Dw3/Dfs=";
 
   mypy-boto3-dynamodb =
-    buildMypyBoto3Package "dynamodb" "1.42.73"
-      "sha256-P9ngk6jJgqU9VfasPRCdiZV/6Ctcfs5l8nt3Ltelyps=";
+    buildMypyBoto3Package "dynamodb" "1.43.0"
+      "sha256-8M6jjgWPHQc2HstV2PQGZdgktCz0hkckx/zMi/OUb80=";
 
   mypy-boto3-dynamodbstreams =
-    buildMypyBoto3Package "dynamodbstreams" "1.42.3"
-      "sha256-Sf//Fv7Dhwlm/XYEdpF1+tHmUM+jy4tt5IA/maHh7zo=";
+    buildMypyBoto3Package "dynamodbstreams" "1.43.0"
+      "sha256-iSYi24MTQ+NNQH1e/bvJMD6NVQ/qV/OY49SSpTLwdDo=";
 
   mypy-boto3-ebs =
-    buildMypyBoto3Package "ebs" "1.42.3"
-      "sha256-92qhSUqTiLgbtvCdi/Mmgve18mcYR00ABL+bNy7/OnY=";
+    buildMypyBoto3Package "ebs" "1.43.0"
+      "sha256-dXNkOcMonYrBh4yzeubd+v3mW42s9XpmpfvgbtgoJgY=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.42.85"
-      "sha256-YYfuAmvVS4IKnqROoCzUjd2O0KyshgnVIQ0nBUh8KhQ=";
+    buildMypyBoto3Package "ec2" "1.43.0"
+      "sha256-JBWWuBm6ljK3xfOVvzTHucAK4XVN/KZ5l8rpZRjgyfU=";
 
   mypy-boto3-ec2-instance-connect =
-    buildMypyBoto3Package "ec2-instance-connect" "1.42.3"
-      "sha256-qe5aitxIPiQA2Et/+MtGVsnmWvk45Rg04/U/kR+tmK0=";
+    buildMypyBoto3Package "ec2-instance-connect" "1.43.0"
+      "sha256-xJQTd7AglqOdFW1SuEV2Hr7BbDRhzhmmWvLg+k7Ie6s=";
 
   mypy-boto3-ecr =
-    buildMypyBoto3Package "ecr" "1.42.86"
-      "sha256-TWtQ8YpclFCeRdqngLdHi3KZT+Q6V3IP9zKgm+m3Yy0=";
+    buildMypyBoto3Package "ecr" "1.43.0"
+      "sha256-tsQBQQYNC3qMWW7jwbRz6rVIfh1R/5Kh/xHq9Y5zf6s=";
 
   mypy-boto3-ecr-public =
-    buildMypyBoto3Package "ecr-public" "1.42.3"
-      "sha256-syjw4M02YXRXsJpM3e7OikE3sSTl/hIIJ3857PP2BII=";
+    buildMypyBoto3Package "ecr-public" "1.43.0"
+      "sha256-02BUkAFhr9sT8ohkJJFPYNni0O9/UI/G0GUee/Kx5Dw=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.42.88"
-      "sha256-rAic7ide3nLM1I1o/h8vlwWyRFRlqcEh9GxvRugUt7o=";
+    buildMypyBoto3Package "ecs" "1.43.0"
+      "sha256-r2UhnI0quhdur/l/5LxlaVSwgDYQGdR1KdwadfvuR2c=";
 
   mypy-boto3-efs =
-    buildMypyBoto3Package "efs" "1.42.3"
-      "sha256-lNlav7BQkVjbYE9cdnvcdNki9IDo6tTlerD+lt69Rio=";
+    buildMypyBoto3Package "efs" "1.43.0"
+      "sha256-R5CFa1FuJ/b361hpJx0c83RI0ZI2Vk3oflTP2CP6WsI=";
 
   mypy-boto3-eks =
-    buildMypyBoto3Package "eks" "1.42.85"
-      "sha256-xU0Qd++d81VAt6Alnz463UdfVdsbs9LYnV8+pWnpC6E=";
+    buildMypyBoto3Package "eks" "1.43.1"
+      "sha256-ZC5DCPPLUWIEV9mVAtG/DBhrdIawwrtMBCY/DGB6MvM=";
 
   mypy-boto3-elastic-inference =
     buildMypyBoto3Package "elastic-inference" "1.36.0"
       "sha256-duU3LIeW3FNiplVmduZsNXBoDK7vbO6ecrBt1Y7C9rU=";
 
   mypy-boto3-elasticache =
-    buildMypyBoto3Package "elasticache" "1.42.81"
-      "sha256-kTf5q/0orWbvDDO42dIGbFNgqVXMHVbtaJ+4dpEDWV4=";
+    buildMypyBoto3Package "elasticache" "1.43.0"
+      "sha256-6NjmoXMu9RDobyrdRWYVNPc6Q8JDLP+TzAsy2z+ELgk=";
 
   mypy-boto3-elasticbeanstalk =
-    buildMypyBoto3Package "elasticbeanstalk" "1.42.61"
-      "sha256-bhwGh02NXqxOs+Pm1PtJUPZrZPM7MC9KsW0sBnx434g=";
+    buildMypyBoto3Package "elasticbeanstalk" "1.43.0"
+      "sha256-tfFoITPeC8GybrrYdo49Qmsr9ZvAWMuvFmi4w8HIivw=";
 
   mypy-boto3-elastictranscoder =
     buildMypyBoto3Package "elastictranscoder" "1.42.3"
       "sha256-6fH7Mf2p9tYmendYBCHXKo+6NKkRP2j2ofLTrkxlrtU=";
 
   mypy-boto3-elb =
-    buildMypyBoto3Package "elb" "1.42.3"
-      "sha256-T8SWdNXQ+4IIPC2V9eKut2I9xi3ZhhXMbUZC8eBPW+o=";
+    buildMypyBoto3Package "elb" "1.43.0"
+      "sha256-ft2sKNwhMdRhms/ZXOetpR/gnB3YNYGsbQWQySagk2E=";
 
   mypy-boto3-elbv2 =
-    buildMypyBoto3Package "elbv2" "1.42.3"
-      "sha256-ha8UiyvXgKk/G98JZYIfJh3v2EKWZwgxNir6BL0+RjU=";
+    buildMypyBoto3Package "elbv2" "1.43.0"
+      "sha256-duh/9/eUhdVkmkEgdf5EB5nbp/TlXQQLMMAorlYPRu8=";
 
   mypy-boto3-emr =
-    buildMypyBoto3Package "emr" "1.42.77"
-      "sha256-BNf5bHJc1SVZ1HdMRV49gU7vUGs3y25jRRhnDWiwbAo=";
+    buildMypyBoto3Package "emr" "1.43.0"
+      "sha256-xp3QbOVif4Z9QbnKUHlPbIWHxuXzecUk2bb1Y1/ekH4=";
 
   mypy-boto3-emr-containers =
-    buildMypyBoto3Package "emr-containers" "1.42.3"
-      "sha256-aSceDS6MkuNWdpvaZoeYGFeE8tApcoHus7FIlIlsX3M=";
+    buildMypyBoto3Package "emr-containers" "1.43.0"
+      "sha256-fvFFfq6wf98uG59Zb4dQFIx+i+NH14zn94lX7jwKPkI=";
 
   mypy-boto3-emr-serverless =
-    buildMypyBoto3Package "emr-serverless" "1.42.23"
-      "sha256-/6DQxeWrGSYhODipYuEaYnEbctT2LbNonuiOmd5Oo1Q=";
+    buildMypyBoto3Package "emr-serverless" "1.43.0"
+      "sha256-2Ly3Ty1hw3U5NTRf1KCIw4Q/1WSD7pFEBafr1JiYLPA=";
 
   mypy-boto3-entityresolution =
-    buildMypyBoto3Package "entityresolution" "1.42.10"
-      "sha256-DyAxO4HPA98ON9Q2Sp5HF1lQNp8yecGiEaV12m0E7zM=";
+    buildMypyBoto3Package "entityresolution" "1.43.2"
+      "sha256-vJVCkj3pNY8p6UKnr1zdMy8um84ONHYEYG2izkVaNA8=";
 
   mypy-boto3-es =
-    buildMypyBoto3Package "es" "1.42.81"
-      "sha256-1u92YJbRkzn8OK8Igcg0H4bTPcxkWgoHRwPXzAv9Cgk=";
+    buildMypyBoto3Package "es" "1.43.0"
+      "sha256-I+9aGV6qURFYoHe2rNdk+BfcIvN1lc5Ot2G04F7nGfg=";
 
   mypy-boto3-events =
-    buildMypyBoto3Package "events" "1.42.3"
-      "sha256-zoJFU3RC1bgWvK/rTsAKRoWDbl1+VehjlGM9s18h7Fg=";
+    buildMypyBoto3Package "events" "1.43.0"
+      "sha256-IVuNaG6bdFqGQJCTHR382i5JvsMjg/iH1YCixGSS3CY=";
 
   mypy-boto3-evidently =
     buildMypyBoto3Package "evidently" "1.42.35"
       "sha256-kdSGsikyLazIdSKidTt6bk5i+syJgx/GE0y+KRpC1rw=";
 
   mypy-boto3-finspace =
-    buildMypyBoto3Package "finspace" "1.42.3"
-      "sha256-gwJY/iL22IIxcjIYtcURZSyn/7XeHEubw1rAgHFydj4=";
+    buildMypyBoto3Package "finspace" "1.43.0"
+      "sha256-CjVX0pF3be2BNpJy/+zWJ7/YZSszPlLWgIL/Qo7jKoY=";
 
   mypy-boto3-finspace-data =
-    buildMypyBoto3Package "finspace-data" "1.42.3"
-      "sha256-OcVF/cSLsJ3zcv7iDF4z/z5p6qJTxrj0kwg6x1WpY5g=";
+    buildMypyBoto3Package "finspace-data" "1.43.0"
+      "sha256-bPKKphp64m4s7ceo0ypSfyqY/AGzqFkIWQksqDIRLSM=";
 
   mypy-boto3-firehose =
-    buildMypyBoto3Package "firehose" "1.42.3"
-      "sha256-OBj2x8ELpXJvwfkGf6LeOnBXc0WzLbkKsZ4zlnoI/fM=";
+    buildMypyBoto3Package "firehose" "1.43.0"
+      "sha256-3y8ubLM+XkcUxBxNt5QUocBDLvzVaAY73pqXfCSr1mc=";
 
   mypy-boto3-fis =
-    buildMypyBoto3Package "fis" "1.42.3"
-      "sha256-CT7k07oPtWrCFNxA6Ga3I2Ej6clheMAdMDd//m3bgm0=";
+    buildMypyBoto3Package "fis" "1.43.0"
+      "sha256-r/8/UTc1qhymzpKf/F3hXQlA2tMZBwd4JmqCio6cFdc=";
 
   mypy-boto3-fms =
-    buildMypyBoto3Package "fms" "1.42.3"
-      "sha256-0h6KDGLtMUvl9VN+TIElcnxf+T85MPPwWhYKlIZ90uY=";
+    buildMypyBoto3Package "fms" "1.43.0"
+      "sha256-+MaSBJxS/iQ/6veTEuSoJY5vaSDAaXsaJwMyW00wqUA=";
 
   mypy-boto3-forecast =
-    buildMypyBoto3Package "forecast" "1.42.3"
-      "sha256-vtRPtRfGg/Ab72ZDu5mU+IOkMWm9q1KExgHPoSeqYT8=";
+    buildMypyBoto3Package "forecast" "1.43.0"
+      "sha256-3Tzd2aOwX4q+v0qi0sytq45o1/ynJKi6zupG5sGPIQg=";
 
   mypy-boto3-forecastquery =
-    buildMypyBoto3Package "forecastquery" "1.42.3"
-      "sha256-PMF12libsd9i/8gEjR35zGklqq7dKPoQlRmtPUytfVw=";
+    buildMypyBoto3Package "forecastquery" "1.43.0"
+      "sha256-i22wXb7ln99O04Ks/goZ9TV+GEDKmtCXekHw+umTBzk=";
 
   mypy-boto3-frauddetector =
-    buildMypyBoto3Package "frauddetector" "1.42.3"
-      "sha256-okrKcMKNM5rJPzPx/kFnarcDBYoQh/IdJHZy3cK1m8c=";
+    buildMypyBoto3Package "frauddetector" "1.43.0"
+      "sha256-C7V/8x9FgRwUaudSDWK9+VdHoR0Xcc8l4W5KzFTKzDk=";
 
   mypy-boto3-fsx =
-    buildMypyBoto3Package "fsx" "1.42.3"
-      "sha256-NqNGcL3HfJgx2ScPLKMNNwpVS3bO4Cu7JpYlenSJwJg=";
+    buildMypyBoto3Package "fsx" "1.43.0"
+      "sha256-4roB3AEdN4zXGceUNkrmarmTThmPbS9SltvHG6kF+84=";
 
   mypy-boto3-gamelift =
-    buildMypyBoto3Package "gamelift" "1.42.82"
-      "sha256-4sWx8fog6KbXwh29KzzsoqYoej7IFYCjcSW0D+dw5+M=";
+    buildMypyBoto3Package "gamelift" "1.43.0"
+      "sha256-WGFXXyxUTvKbPbJnkAxcn5LbCzN4hTJ/5LhyTQZI3+s=";
 
   mypy-boto3-glacier =
-    buildMypyBoto3Package "glacier" "1.42.30"
-      "sha256-TtiFsS2IIBgVxTwAWwU5M/0pBfXs1zxnnyjMuMhjWDY=";
+    buildMypyBoto3Package "glacier" "1.43.0"
+      "sha256-xywLVBOF2ZfCHFXrTSZmlWCrzOLkVW9elRSSiY86u60=";
 
   mypy-boto3-globalaccelerator =
-    buildMypyBoto3Package "globalaccelerator" "1.42.3"
-      "sha256-N0kQ7Fc44SFKXhl4V+oAclPNlWhluOs53NDokiXcSNM=";
+    buildMypyBoto3Package "globalaccelerator" "1.43.0"
+      "sha256-vMz4YKm78XMavlPUNiSVAYmAbyUBrJhUXbFrhxIvUJA=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.42.89"
-      "sha256-U+NzY02OyhR/GbZy+2Ye3+FgAVzF/UTNhUH3fy9SmMc=";
+    buildMypyBoto3Package "glue" "1.43.0"
+      "sha256-37wgxUoswgRZGpTYplXtIjyBEwO57aEzlcTOwg8g/pg=";
   mypy-boto3-grafana =
-    buildMypyBoto3Package "grafana" "1.42.51"
-      "sha256-QHAuRJrioMD7ASgV1Wobm81Gb+Z87c78yBs9X1+Kz+E=";
+    buildMypyBoto3Package "grafana" "1.43.0"
+      "sha256-ciXs8g462XTc+GTyxuGDDEsoR9DMD+bOdSUFe0OLshM=";
 
   mypy-boto3-greengrass =
-    buildMypyBoto3Package "greengrass" "1.42.3"
-      "sha256-8D2hxBxdFbrrXSHzvOUBoNkedTErIQG4mlcMx3r9yx4=";
+    buildMypyBoto3Package "greengrass" "1.43.0"
+      "sha256-Xo93GLmd72kiV+e6/f4+gHdEdeMO6C8ph37wKweEl+U=";
 
   mypy-boto3-greengrassv2 =
-    buildMypyBoto3Package "greengrassv2" "1.42.3"
-      "sha256-w3vOm8K/2rToF1CFWtAobCzswkv2d/gm1bzy6XiOFVA=";
+    buildMypyBoto3Package "greengrassv2" "1.43.0"
+      "sha256-kw8ncmITgoIGnWIOk9X3S8klQ4B56LtH1CVLFKwA2ic=";
 
   mypy-boto3-groundstation =
-    buildMypyBoto3Package "groundstation" "1.42.91"
-      "sha256-mzSkLSIQyrcPyU+LhrlRJtjWbkpLXM8/iOpAH0lA6zA=";
+    buildMypyBoto3Package "groundstation" "1.43.0"
+      "sha256-nTKK7qqa2apyNM4/U2AphLGvoSqemVKfpAciilJ0pRE=";
 
   mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.42.84"
-      "sha256-5sa/UWt6MAEl6zmsmohWZHc0iokmccLa4JgbXDYe/Rs=";
+    buildMypyBoto3Package "guardduty" "1.43.0"
+      "sha256-xLN9980fWNie8P+lPG7rKbvIH3qsuioPnnwcB/HDnlc=";
 
   mypy-boto3-health =
-    buildMypyBoto3Package "health" "1.42.59"
-      "sha256-ryg+TwVNMUGrKcvt565Y4BTylGnucbPVUsi/modP8mM=";
+    buildMypyBoto3Package "health" "1.43.0"
+      "sha256-UHDodWN6MLV54LA31Pc7vlMr7a0tVrmCfVjXl96cjsE=";
 
   mypy-boto3-healthlake =
-    buildMypyBoto3Package "healthlake" "1.42.3"
-      "sha256-dHLvIxMXNFxa5ImKkifyeMfFciLc3kzWD9776mmD5Vs=";
+    buildMypyBoto3Package "healthlake" "1.43.0"
+      "sha256-YeeEfYiM8ZJxcmxk6an+uCan9sMzYN4SWiApLaGCyzo=";
 
   mypy-boto3-iam =
-    buildMypyBoto3Package "iam" "1.42.64"
-      "sha256-0BMIrUoZf4xGWu2AAlAnk4AvEPoKATI7Xv2k4vvZN6U=";
+    buildMypyBoto3Package "iam" "1.43.2"
+      "sha256-uwMlq15hxaRid1n/6fpvv00icUbwtIWFVfegKJYi9Qo=";
 
   mypy-boto3-identitystore =
-    buildMypyBoto3Package "identitystore" "1.42.20"
-      "sha256-rb8qotqFW+ZcesRS0TUl+NMsrOS7CTQosZ633jSE38k=";
+    buildMypyBoto3Package "identitystore" "1.43.0"
+      "sha256-9lzXp7Ug90MSZ7WdMiXoMnUiaAA9zCk/oS6gc0ulEMo=";
 
   mypy-boto3-imagebuilder =
-    buildMypyBoto3Package "imagebuilder" "1.42.91"
-      "sha256-+e/fx5ApGKHgCOcwwzbf8uFtnwN5RgN5/hSEBmmS9rA=";
+    buildMypyBoto3Package "imagebuilder" "1.43.0"
+      "sha256-HHmkU/o6zilpJMmpvE6hWmHw9hf2dJFFctNUjsjbGcA=";
 
   mypy-boto3-importexport =
-    buildMypyBoto3Package "importexport" "1.42.3"
-      "sha256-Wu7msQDFRWieeKOSI4IqCovlny14zFPr/5UKvGEw9GU=";
+    buildMypyBoto3Package "importexport" "1.43.0"
+      "sha256-UPfzmcKh+ZgETuak1eYRQEyKke20BW5q0Os62mj5D+E=";
 
   mypy-boto3-inspector =
-    buildMypyBoto3Package "inspector" "1.42.3"
-      "sha256-9I+RMsF8b8PK2OsmtgX8v6C6gvZ3h8zB9fQQF5CWh2o=";
+    buildMypyBoto3Package "inspector" "1.43.0"
+      "sha256-9P8m5QYikdsimepaivrYcb/tP1iThyPZWFMkyo24+bo=";
 
   mypy-boto3-inspector2 =
-    buildMypyBoto3Package "inspector2" "1.42.49"
-      "sha256-iCLS3XGlO6FBe9ADkRKGQxPEuOfd2sVRkLiHhMrGZ3M=";
+    buildMypyBoto3Package "inspector2" "1.43.0"
+      "sha256-ddF5Z3B3NMKoM1RUWFQzUQTnBL75IwlVevM/R2bO9OI=";
 
   mypy-boto3-internetmonitor =
-    buildMypyBoto3Package "internetmonitor" "1.42.3"
-      "sha256-rXXlHFkPI9DeMO2j+a0kLrieNt73t8//2UnUM2JskfI=";
+    buildMypyBoto3Package "internetmonitor" "1.43.0"
+      "sha256-F+4rmr2/nI1TQCFnMY0dPxAXlgN3IBSfiQaDGup5HSw=";
 
   mypy-boto3-iot =
-    buildMypyBoto3Package "iot" "1.42.14"
-      "sha256-MMdIYRtWfA+JZ9F7s3/RbswInpLbf6v4mdecmtAJahI=";
+    buildMypyBoto3Package "iot" "1.43.2"
+      "sha256-4/pzyGy3MPDZiezsGyNskYyMZ7tR/Z8wvRWdH2GY8s8=";
 
   mypy-boto3-iot-data =
-    buildMypyBoto3Package "iot-data" "1.42.3"
-      "sha256-Giui5uqyTCAjCfpA5n/z+KwRNyqeMbd6fuxo+9Df8Ao=";
+    buildMypyBoto3Package "iot-data" "1.43.0"
+      "sha256-JqxgidIcq9qZ7CzFWIRYC+vWTpzbOs2n/0ZfYTPkfPg=";
 
   mypy-boto3-iot-jobs-data =
-    buildMypyBoto3Package "iot-jobs-data" "1.42.3"
-      "sha256-rm1KJfUHizaTEOylpdQP5XzF3JbwBaBh2IfJWW0b5bs=";
+    buildMypyBoto3Package "iot-jobs-data" "1.43.0"
+      "sha256-ai2rWv+gAsIDUgdXOlDlDUIKdwwYIjIWvy2Mks4b06g=";
 
   mypy-boto3-iot1click-devices =
     buildMypyBoto3Package "iot1click-devices" "1.35.93"
@@ -654,164 +654,164 @@ in
       "sha256-KnsQjmsXPq1VOsgdfPQ8NpXbXJ3ed3nQ6u4xd5SvGHI=";
 
   mypy-boto3-iotdeviceadvisor =
-    buildMypyBoto3Package "iotdeviceadvisor" "1.42.3"
-      "sha256-WhX8rHHzku28prFL5IC96CS1ySSEziRkf1idvTwVqWU=";
+    buildMypyBoto3Package "iotdeviceadvisor" "1.43.0"
+      "sha256-bHz1uxp2Bito7mcs5VBTYUaI3VmrKnSvtYcPjHIOwbE=";
 
   mypy-boto3-iotevents =
-    buildMypyBoto3Package "iotevents" "1.42.3"
-      "sha256-uYkkQGEGNQnf/uY1sVR2dkt7TrBTOgG/2YLCdNmp1E8=";
+    buildMypyBoto3Package "iotevents" "1.43.0"
+      "sha256-vrbVRBb2BCGTG+0hth2BQVmF62R/ufvrXHYfl2L9R/w=";
 
   mypy-boto3-iotevents-data =
-    buildMypyBoto3Package "iotevents-data" "1.42.3"
-      "sha256-UngbBKgLaBTORn0pbbRTIOc4iqGekayb0IjuU5QrgEo=";
+    buildMypyBoto3Package "iotevents-data" "1.43.0"
+      "sha256-UMcPVbdXrdQ0MApotjGVJTMhJABvM5sOU9liZSZJWBs=";
 
   mypy-boto3-iotfleethub =
     buildMypyBoto3Package "iotfleethub" "1.40.17"
       "sha256-SeJi6Z/TJAiqL6+21CMP6iZF/Skv1hnmldPrJpOHUfo=";
 
   mypy-boto3-iotfleetwise =
-    buildMypyBoto3Package "iotfleetwise" "1.42.3"
-      "sha256-BYUvPWrFNSZhMKDlQm0jgcU3utv2cLGKq9POWLLLmXM=";
+    buildMypyBoto3Package "iotfleetwise" "1.43.0"
+      "sha256-LTEwiPO3NwdWlo4X0JJxjsQ95xpvpqPb6Wb28CR6ZOk=";
 
   mypy-boto3-iotsecuretunneling =
-    buildMypyBoto3Package "iotsecuretunneling" "1.42.3"
-      "sha256-fFaYE0C7np/DqrRPbqGYNw/dYNkyPot/iF+OufT49Q0=";
+    buildMypyBoto3Package "iotsecuretunneling" "1.43.0"
+      "sha256-han7AMRHtSLHVlPIBwAS2nGanHHiPTov2n/ayLZmC6c=";
 
   mypy-boto3-iotsitewise =
-    buildMypyBoto3Package "iotsitewise" "1.42.3"
-      "sha256-U94/P/4BgTFj7J3AYOLiAEGBvXM1keI2c5iAp3x05iM=";
+    buildMypyBoto3Package "iotsitewise" "1.43.0"
+      "sha256-pUKqVV5J1wMo40qRdxo8ckLXleoHu6OA8F6X2uoqq1c=";
 
   mypy-boto3-iotthingsgraph =
-    buildMypyBoto3Package "iotthingsgraph" "1.42.3"
-      "sha256-TxALbXgBraOVwmbJcIiWOx9ZbJA7LkzcswhuFw967/s=";
+    buildMypyBoto3Package "iotthingsgraph" "1.43.0"
+      "sha256-nfRWM0Zn2keciPpMsqWSCKITeJg1qZ7j8Q0+r0Gw6is=";
 
   mypy-boto3-iottwinmaker =
-    buildMypyBoto3Package "iottwinmaker" "1.42.3"
-      "sha256-8GAK05LdnC3ve/9Vma/Ej13uCSvTSSC1iYUGr/u3Qgk=";
+    buildMypyBoto3Package "iottwinmaker" "1.43.0"
+      "sha256-v5cHLJTqCyncFbrEz5dFN4PEsQ63cVKXKj6jwllUpPU=";
 
   mypy-boto3-iotwireless =
-    buildMypyBoto3Package "iotwireless" "1.42.3"
-      "sha256-tov3sxMjqWU5A7Jr9rQVbi+R/sc9TMeexyjwvgOKuJg=";
+    buildMypyBoto3Package "iotwireless" "1.43.0"
+      "sha256-CAn84uzip9Cd8Xr33gxAx6+iQ9hRYPO0u718BtYCr84=";
 
   mypy-boto3-ivs =
-    buildMypyBoto3Package "ivs" "1.42.3"
-      "sha256-TzudGWLWWzTRWZb3585Tkar1iXmt5TtFNox+DJzvhS4=";
+    buildMypyBoto3Package "ivs" "1.43.0"
+      "sha256-wGqp7Kw0TuAOd9RiOzEFUujuWnPTfEdWcjtNZkT/VJU=";
 
   mypy-boto3-ivs-realtime =
-    buildMypyBoto3Package "ivs-realtime" "1.42.86"
-      "sha256-0O6dAerORo30pB6IRlfyUjSHBaAgQ+JeND63vWcswoM=";
+    buildMypyBoto3Package "ivs-realtime" "1.43.0"
+      "sha256-0rzVOt5tK99dXME4fBoww2DsvoHEIQ/KXzBxSx3ShXY=";
 
   mypy-boto3-ivschat =
-    buildMypyBoto3Package "ivschat" "1.42.3"
-      "sha256-eAzIwmz5eZKf2NBGSMw4NopdHqAR5TcF9/0KQqVWr0s=";
+    buildMypyBoto3Package "ivschat" "1.43.0"
+      "sha256-9XMdnVsYUmz8Uf9kAgVMbG960vy0TOJturoD9/ZoM98=";
 
   mypy-boto3-kafka =
-    buildMypyBoto3Package "kafka" "1.42.65"
-      "sha256-H7VAzW6c3HYxvKOG8H3hNbJepywDCqDLK5oeKGMqNTg=";
+    buildMypyBoto3Package "kafka" "1.43.1"
+      "sha256-RJ7g5WeLvVe6AaiGwWVHewC3JnFw7cAqv+B8C9FQ/8E=";
 
   mypy-boto3-kafkaconnect =
-    buildMypyBoto3Package "kafkaconnect" "1.42.47"
-      "sha256-61rA7KEkt8Z/rzOEoArxsuspgfIe+NfjqT4yoCmM/3Q=";
+    buildMypyBoto3Package "kafkaconnect" "1.43.0"
+      "sha256-FM/OFQLL6E/ikP6PIFF7sMwNjBoVfufLWH99tL/B7xA=";
 
   mypy-boto3-kendra =
-    buildMypyBoto3Package "kendra" "1.42.3"
-      "sha256-IPlyrXIrWHs9DzrNd4hBqeRNwT5oJ2fQ6zIfSHdGsMc=";
+    buildMypyBoto3Package "kendra" "1.43.0"
+      "sha256-7zx7u3kh6NiBuL7O1nlbg0oxBnPSh1HMRnyTrf/AyV8=";
 
   mypy-boto3-kendra-ranking =
-    buildMypyBoto3Package "kendra-ranking" "1.42.3"
-      "sha256-rIkIFitznxD9ytbq4cdAbiPTJFZRwZywQ50HVo7D+VU=";
+    buildMypyBoto3Package "kendra-ranking" "1.43.0"
+      "sha256-IHb9mlWLil3R/3HakccUY/4ewEKVSSpRcySglLob3MQ=";
 
   mypy-boto3-keyspaces =
-    buildMypyBoto3Package "keyspaces" "1.42.31"
-      "sha256-isLoakoBigys+KBGRoFryEqtKT2g+Wv2D/+ttlxOlfk=";
+    buildMypyBoto3Package "keyspaces" "1.43.0"
+      "sha256-f36IwT8zw4RvLqbZgGas6euLVdKR5gJJl7eLBF8PjaE=";
 
   mypy-boto3-kinesis =
-    buildMypyBoto3Package "kinesis" "1.42.41"
-      "sha256-3xWp1Dg6ZC3t0dUNqD+iYJaKAxN5ILv8Sq1QLx7IXvo=";
+    buildMypyBoto3Package "kinesis" "1.43.0"
+      "sha256-VRGpxnoRDh17SvfHg0mHwlCShMwKrkwqPHtXJoFlJXU=";
 
   mypy-boto3-kinesis-video-archived-media =
-    buildMypyBoto3Package "kinesis-video-archived-media" "1.42.3"
-      "sha256-XBxm5NK29LZb32jX0RUmmAaYAhvuJYuFenuAmXvcsN0=";
+    buildMypyBoto3Package "kinesis-video-archived-media" "1.43.0"
+      "sha256-yfOcuzek1G6SBO0/iKrcmi4/l2KlE1a35gf1UdmbKEE=";
 
   mypy-boto3-kinesis-video-media =
-    buildMypyBoto3Package "kinesis-video-media" "1.42.3"
-      "sha256-q7mE4VRVyg912foe+mNVAE2oJezEX+r+ob77kY1RyrI=";
+    buildMypyBoto3Package "kinesis-video-media" "1.43.0"
+      "sha256-bmd/SlahjC1HKvg1Ac+4m2RtXiNvDjJ1drGqTLXF8ak=";
 
   mypy-boto3-kinesis-video-signaling =
-    buildMypyBoto3Package "kinesis-video-signaling" "1.42.3"
-      "sha256-WpwJ8fy1YA5ZvVl7JvME6dofkyyJ2qvfP5QRVI5WdAg=";
+    buildMypyBoto3Package "kinesis-video-signaling" "1.43.0"
+      "sha256-P5jFW3ANT/TZQlFWPMicvTDOmZIBFauHyqocXSE6JJw=";
 
   mypy-boto3-kinesis-video-webrtc-storage =
-    buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.42.3"
-      "sha256-5d7z/X+zHGUGYMcs18vXTl2JtiCbq/6ZoW7icoFTv3c=";
+    buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.43.0"
+      "sha256-a9G1wZpyLWHd1QM+ySCYs5RBZNGWJBttQhrrjTTb7v0=";
 
   mypy-boto3-kinesisanalytics =
-    buildMypyBoto3Package "kinesisanalytics" "1.42.3"
-      "sha256-DsxrKv4SwSJc08EAb2kSGFfT+QkU/HQbCiOOirtLpj8=";
+    buildMypyBoto3Package "kinesisanalytics" "1.43.0"
+      "sha256-mFybt0ZyAZIvW5UoJQxxDGAALawLzwGJqE+Y0YOPQC0=";
 
   mypy-boto3-kinesisanalyticsv2 =
-    buildMypyBoto3Package "kinesisanalyticsv2" "1.42.80"
-      "sha256-SoUg2kSi/08rTIMYbpIdDxmcSHgoS8ll+e22PZsIX9w=";
+    buildMypyBoto3Package "kinesisanalyticsv2" "1.43.0"
+      "sha256-0uyfEjT25rn7SJ+5g71VRnq38+mirYXikGE456DAuKs=";
 
   mypy-boto3-kinesisvideo =
-    buildMypyBoto3Package "kinesisvideo" "1.42.3"
-      "sha256-x9ntwcOhUm5Hsd/L+O5N77xJ/NWxgQhNVdtaaShM7p8=";
+    buildMypyBoto3Package "kinesisvideo" "1.43.0"
+      "sha256-SjI/irHvvEjhPyjQcEf1VAWM80ZLH76EFs/1JFDuTi4=";
 
   mypy-boto3-kms =
-    buildMypyBoto3Package "kms" "1.42.50"
-      "sha256-bCVvuhK3mpTeNDYDYaACVWgQMhKR9mIi9BbbCI0ynCA=";
+    buildMypyBoto3Package "kms" "1.43.0"
+      "sha256-x7burzJDYflPJr+SFtUMjL1DJ0qwRHe1GL79TCZBWDg=";
 
   mypy-boto3-lakeformation =
-    buildMypyBoto3Package "lakeformation" "1.42.79"
-      "sha256-tMre640822/6JE0YVSHud03xqS4VbgJy9RJsN3eIEhE=";
+    buildMypyBoto3Package "lakeformation" "1.43.0"
+      "sha256-gYTCgaRwH3zKi6gg4MC8DUwXQT+jZO6lqc/vi+JUahU=";
 
   mypy-boto3-lambda =
-    buildMypyBoto3Package "lambda" "1.42.85"
-      "sha256-ukCJSNwcd/4cbCsK/skywVtR0E+hFAPpDa3/Phs8KOc=";
+    buildMypyBoto3Package "lambda" "1.43.0"
+      "sha256-pY3ia1wTvlTeqzFyPumreqqSK+HfvQk9w6TKEsyFMVc=";
 
   mypy-boto3-lex-models =
-    buildMypyBoto3Package "lex-models" "1.42.3"
-      "sha256-COIQ8BVxOf44lUIOactGZJK/nYovEOIZ2kvuzME8cos=";
+    buildMypyBoto3Package "lex-models" "1.43.0"
+      "sha256-IaCx86fBpIsBp6ue8uE0z3U3HKeq0fDhfJVmPDsiQk8=";
 
   mypy-boto3-lex-runtime =
-    buildMypyBoto3Package "lex-runtime" "1.42.3"
-      "sha256-tkSUeZeD8Aa1DzQIDBt8rQYBecfllEyl9kATJkM6FYM=";
+    buildMypyBoto3Package "lex-runtime" "1.43.0"
+      "sha256-1kE3yNQBw8a1bYq3xMfAEfqW2p4FduGQ/uAJjI81xds=";
 
   mypy-boto3-lexv2-models =
-    buildMypyBoto3Package "lexv2-models" "1.42.65"
-      "sha256-dbemEfeaDlVDZXujl02F329tcJVmW+inkn8nQEZU83g=";
+    buildMypyBoto3Package "lexv2-models" "1.43.0"
+      "sha256-oCXwBVVHNBIlBTn99cxrpkj/nUWNk4NReXsLKRvlwRo=";
 
   mypy-boto3-lexv2-runtime =
-    buildMypyBoto3Package "lexv2-runtime" "1.42.3"
-      "sha256-KzxXQppuVCTPDd47r981rhMYk830gcbeXFqvIHQHyEk=";
+    buildMypyBoto3Package "lexv2-runtime" "1.43.0"
+      "sha256-efpFIYAdYkvWBlj0tLsQagps6XJfO4XLjlfwKS2vi3s=";
 
   mypy-boto3-license-manager =
-    buildMypyBoto3Package "license-manager" "1.42.3"
-      "sha256-8rAVXY9ZgoPCJ4S4bON2SAMI1zEsVLK3B1M2HY0Pb10=";
+    buildMypyBoto3Package "license-manager" "1.43.0"
+      "sha256-DGbHoepZkxN9ICxqnda/6mBJxiTH9X8gU/wT+xMGs3g=";
 
   mypy-boto3-license-manager-linux-subscriptions =
-    buildMypyBoto3Package "license-manager-linux-subscriptions" "1.42.3"
-      "sha256-m/5Zdb1oc/veXnkx5j5EchEXdU7vZsLSoQQAexjtFm0=";
+    buildMypyBoto3Package "license-manager-linux-subscriptions" "1.43.0"
+      "sha256-zoWGCMfhDKcnoU2LWkGbwy+17uoqDgLaqiEH3ohb5+E=";
 
   mypy-boto3-license-manager-user-subscriptions =
-    buildMypyBoto3Package "license-manager-user-subscriptions" "1.42.3"
-      "sha256-Ru2IODClBpjyDb8JNzBJi9LPY12mg46dpSBz182qkuI=";
+    buildMypyBoto3Package "license-manager-user-subscriptions" "1.43.0"
+      "sha256-kCI94Z4gBIthwj3Q7OqdIYPPWqavxLTKY3FQDeuPsmI=";
 
   mypy-boto3-lightsail =
-    buildMypyBoto3Package "lightsail" "1.42.84"
-      "sha256-3XrmddaaOKkdaYOMguNWZ3k18yiOtUF23xMVtZ7n8gQ=";
+    buildMypyBoto3Package "lightsail" "1.43.0"
+      "sha256-HA4SqeZxi+iSD/WcokROHaCQEUGAQhEG9FghFEdUWhY=";
 
   mypy-boto3-location =
-    buildMypyBoto3Package "location" "1.42.3"
-      "sha256-VGQzgnrUynTDjfYpEk+FR+PrljbULl0UpbeqbaPKqSc=";
+    buildMypyBoto3Package "location" "1.43.0"
+      "sha256-EunrKwNaYp0CDiwp8frI7zASilMF4wYHjDSuCsJ6aJM=";
 
   mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.42.90"
-      "sha256-V+msnycNcwaLWCpOnCJ2gGRVs6irf1Qk09pzlYTSkBk=";
+    buildMypyBoto3Package "logs" "1.43.2"
+      "sha256-LpQlM5FyqetOuHJMReJScyFj7qQlpnJ4/neymHiMSBo=";
 
   mypy-boto3-lookoutequipment =
-    buildMypyBoto3Package "lookoutequipment" "1.42.3"
-      "sha256-C1SPukBZ1zmtayQQY9nnrneSFkQGErLBxDzVYvCH3Xc=";
+    buildMypyBoto3Package "lookoutequipment" "1.43.0"
+      "sha256-2LImXNFMIsFKasOZhZxAbVx4XiX0TiuffDRJ6LgJaHI=";
 
   mypy-boto3-lookoutmetrics =
     buildMypyBoto3Package "lookoutmetrics" "1.40.15"
@@ -822,156 +822,156 @@ in
       "sha256-MlMkIgzc2D3i5xAPdk+th0e9AYrvRxGwzl4zwEwy4xw=";
 
   mypy-boto3-m2 =
-    buildMypyBoto3Package "m2" "1.42.3"
-      "sha256-Uouysx/L59B/V4dG9GWlGulqCwXTQYTTsdyXzrxFSXE=";
+    buildMypyBoto3Package "m2" "1.43.0"
+      "sha256-7coHyMnmbrLSRi3/7+x54hOj3+shCS9v8OFvOWBIKrg=";
 
   mypy-boto3-machinelearning =
-    buildMypyBoto3Package "machinelearning" "1.42.3"
-      "sha256-mERVlNSjfxNqfyGRlNgfP1MrzhGrMYgIuZ0pZLPrfBQ=";
+    buildMypyBoto3Package "machinelearning" "1.43.0"
+      "sha256-MBstuygQi7eZgW3qqEh5Mu4tK8lO5aiYIg623z+DOEQ=";
 
   mypy-boto3-macie2 =
-    buildMypyBoto3Package "macie2" "1.42.89"
-      "sha256-Y19V3g8CM4L2L5dWPjpokPNj6iX39OPxUP+H1blFaH0=";
+    buildMypyBoto3Package "macie2" "1.43.0"
+      "sha256-I1rFY/t0hwRHhnASQvNIvd/dVolKYrMHv70ch+0V3Hg=";
 
   mypy-boto3-managedblockchain =
-    buildMypyBoto3Package "managedblockchain" "1.42.3"
-      "sha256-VHzWqMSf/pfC8NLN7vJftpIVO9u3z/0YhxPezDBxJvg=";
+    buildMypyBoto3Package "managedblockchain" "1.43.0"
+      "sha256-ZsalJBzTODl1ba6QA0bj/7rrZ70DNro4PUTfrowYepw=";
 
   mypy-boto3-managedblockchain-query =
-    buildMypyBoto3Package "managedblockchain-query" "1.42.3"
-      "sha256-kiKP12WkHvskEVNPRAUTRJqksrz6I5y31snfFpcz8HQ=";
+    buildMypyBoto3Package "managedblockchain-query" "1.43.0"
+      "sha256-ce8c73a1ksdQpCN6cSg5KMkbVqomFNyZnaf7pag9wBg=";
 
   mypy-boto3-marketplace-catalog =
-    buildMypyBoto3Package "marketplace-catalog" "1.42.41"
-      "sha256-lyq6RaR12pc3LKJokhd+S5wSppt4hWdsHoVsQe34GMY=";
+    buildMypyBoto3Package "marketplace-catalog" "1.43.0"
+      "sha256-NXmJGktOefYDVoA0Ah0YDRPvgCfQDv/BwLqbQijTUdk=";
 
   mypy-boto3-marketplace-entitlement =
-    buildMypyBoto3Package "marketplace-entitlement" "1.42.58"
-      "sha256-vD0N5KMd6GE/UyMuhaULwwKNDy8ndKPSbW0bLo3eW5g=";
+    buildMypyBoto3Package "marketplace-entitlement" "1.43.0"
+      "sha256-j8CGEyfiQPa5ZvIoZdyzGrLnxbb93+uXrufCdkmiI2Q=";
 
   mypy-boto3-marketplacecommerceanalytics =
-    buildMypyBoto3Package "marketplacecommerceanalytics" "1.42.3"
-      "sha256-1cIpxNx/Q1C89D27DO0PTsFRhZvSok7L1e+B6WjPXvs=";
+    buildMypyBoto3Package "marketplacecommerceanalytics" "1.43.0"
+      "sha256-Ob9sh8Ng8I3sWiy/qwu+lfSvf+W2KQiprWX6QCNiSLM=";
 
   mypy-boto3-mediaconnect =
-    buildMypyBoto3Package "mediaconnect" "1.42.87"
-      "sha256-JxR2l3AZarl6nr9l6UiBxTC7638DvVwNQmm6a0dxpsI=";
+    buildMypyBoto3Package "mediaconnect" "1.43.0"
+      "sha256-OT4bGX7DaTrMuzEdK71GemaeWzPa7MbDd4+bApuPZLw=";
 
   mypy-boto3-mediaconvert =
-    buildMypyBoto3Package "mediaconvert" "1.42.90"
-      "sha256-8sAP5D2FKZoHZpV/7pyrV73l7ydOSA62p9KvfmsWQKA=";
+    buildMypyBoto3Package "mediaconvert" "1.43.0"
+      "sha256-jiYmf0SWN0WBh6kJRllwmPMgcZyCxPRuP2GD2DavqKM=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.42.86"
-      "sha256-udG3y+0adjMbsHjwb2rI84KzPH5FDDoJsIwcjXeTuPc=";
+    buildMypyBoto3Package "medialive" "1.43.0"
+      "sha256-9qc29IQF9OzXua26/slmxeeRMTvdX1kATpvuLJvl4Yk=";
 
   mypy-boto3-mediapackage =
-    buildMypyBoto3Package "mediapackage" "1.42.3"
-      "sha256-AfhNnU0FEAARqIOysN3XEsNXQN9hhoXNTkRT4oiP56Q=";
+    buildMypyBoto3Package "mediapackage" "1.43.0"
+      "sha256-OPbU92VvD3YPihFUl00xa4PWvIXUy49CqPFGGZXxAt4=";
 
   mypy-boto3-mediapackage-vod =
-    buildMypyBoto3Package "mediapackage-vod" "1.42.3"
-      "sha256-ZbxRVZaTcS4k2d0+qAT8GOK5tieYduZ4FqXd/k+CElk=";
+    buildMypyBoto3Package "mediapackage-vod" "1.43.0"
+      "sha256-5AqWiNGz9jemWb8dZkuGQXxPXIruMdDWcoRzbT+ZGro=";
 
   mypy-boto3-mediapackagev2 =
-    buildMypyBoto3Package "mediapackagev2" "1.42.75"
-      "sha256-vNcG4lHCHnbdMiZH42WWTcKWocAW0KHx4IPyLVEa6a4=";
+    buildMypyBoto3Package "mediapackagev2" "1.43.0"
+      "sha256-bGxwx1LeiPWn6gz4Yqu6pIQ7sMgCro5W4oO/Wk72gok=";
 
   mypy-boto3-mediastore =
-    buildMypyBoto3Package "mediastore" "1.42.3"
-      "sha256-BieG4cimqiiVqdP7/J1tsCc5YQlVEbiA5bOYCvUBspY=";
+    buildMypyBoto3Package "mediastore" "1.43.0"
+      "sha256-tT1iRnm3gOaY8clsRshI9NL1FF4aHlBhWyJMi/7HpE8=";
 
   mypy-boto3-mediastore-data =
-    buildMypyBoto3Package "mediastore-data" "1.42.3"
-      "sha256-VBsw9c9B6r3G5vJ0iVUCi4wVoFprYseRLeMWs69KpTQ=";
+    buildMypyBoto3Package "mediastore-data" "1.43.0"
+      "sha256-8K0Xm6PMo+daS6xt4kBqaVvO2/LruFV7PVvugI7sNDU=";
 
   mypy-boto3-mediatailor =
-    buildMypyBoto3Package "mediatailor" "1.42.84"
-      "sha256-wexKrijfrq42wqGLHNFFLjNKqwxByuSfWC+hPnbkvOY=";
+    buildMypyBoto3Package "mediatailor" "1.43.0"
+      "sha256-SIcglcosop2grZI1DjyHKURX/DYA7RSGGWQ1IvsYFFY=";
 
   mypy-boto3-medical-imaging =
-    buildMypyBoto3Package "medical-imaging" "1.42.81"
-      "sha256-aUcF7P7jC/WxH+uym/hE3Dtqqw7rP9zC+mavyVcfQj0=";
+    buildMypyBoto3Package "medical-imaging" "1.43.0"
+      "sha256-dq7im8OpCHkvqXupdBpwCfDzt+WORF9DB82u9OHQ484=";
 
   mypy-boto3-memorydb =
-    buildMypyBoto3Package "memorydb" "1.42.3"
-      "sha256-7e9/QHJJbdGyNnpxVZZCdbxdc0ncJ7a2UsBiVF629VA=";
+    buildMypyBoto3Package "memorydb" "1.43.0"
+      "sha256-13fAVct/Icy2iWt9z+fFyHLbp+7X6kZjLCtiiqC8Emc=";
 
   mypy-boto3-meteringmarketplace =
-    buildMypyBoto3Package "meteringmarketplace" "1.42.58"
-      "sha256-2mZV1S76X3SaxuZ8OdSpUD3wjGjY+wv0mSJgGBG/d4Q=";
+    buildMypyBoto3Package "meteringmarketplace" "1.43.0"
+      "sha256-+gJkfsKfgRQbXovoZwas++rwAFxKlkGUdjqVGgE9jvA=";
 
   mypy-boto3-mgh =
-    buildMypyBoto3Package "mgh" "1.42.3"
-      "sha256-kFHGogiCfbftZr67o8zT7eb8na74J4AGneac03q+Pvc=";
+    buildMypyBoto3Package "mgh" "1.43.0"
+      "sha256-V6xgiUn87wqIlWJGOpc7Zu24EDzROAspAn3qkRifsFU=";
 
   mypy-boto3-mgn =
-    buildMypyBoto3Package "mgn" "1.42.68"
-      "sha256-zrUwEeofbz+Tj7GgHzOzodYzsnPKqAISOuRGG6B7rpY=";
+    buildMypyBoto3Package "mgn" "1.43.0"
+      "sha256-YpSyhr87CmLo2+LGQzXU8q9uZt5YiDm23Ukpdh8eZIg=";
 
   mypy-boto3-migration-hub-refactor-spaces =
-    buildMypyBoto3Package "migration-hub-refactor-spaces" "1.42.3"
-      "sha256-22PPd3dk1V3i26ETACZ9nxOjtNNaV/dBT0FxKEBZgkk=";
+    buildMypyBoto3Package "migration-hub-refactor-spaces" "1.43.0"
+      "sha256-PIgHi6/xkiAjzrvgRgh6b2dLPTGoVnvd3xVLAW6nTCc=";
 
   mypy-boto3-migrationhub-config =
-    buildMypyBoto3Package "migrationhub-config" "1.42.3"
-      "sha256-CdCtIzK3FoZsoPIzykK1BE8CXuWNAAG+qhd2HujoS0A=";
+    buildMypyBoto3Package "migrationhub-config" "1.43.0"
+      "sha256-InMFJXbw+lFAqmmjeCs8v1ICBrvnIJb/0xKRla/FVPc=";
 
   mypy-boto3-migrationhuborchestrator =
-    buildMypyBoto3Package "migrationhuborchestrator" "1.42.3"
-      "sha256-d42VxAv6JSb35fAax31Sk5qsINDFqMWcvh0KQt1GmZQ=";
+    buildMypyBoto3Package "migrationhuborchestrator" "1.43.0"
+      "sha256-Qzuv+hkKiTS26EfgCkzV9FSgL1LCYhsT5nx1xdAQG64=";
 
   mypy-boto3-migrationhubstrategy =
-    buildMypyBoto3Package "migrationhubstrategy" "1.42.3"
-      "sha256-MmYBlk+qaxdFtmp0XMK30JwBLxxrlh3tIgdB6Bau19o=";
+    buildMypyBoto3Package "migrationhubstrategy" "1.43.0"
+      "sha256-Xn8quvaU8HAJKLiUuh7vGqy6j/VYWrrdwAEuMnFSdzw=";
 
   mypy-boto3-mq =
-    buildMypyBoto3Package "mq" "1.42.3"
-      "sha256-/twFblngRZJ99dNaMvxw4elY6Ohjx42edAUdZt8CGnM=";
+    buildMypyBoto3Package "mq" "1.43.0"
+      "sha256-fZFP/qF24Wssjh0RDXx4jBfCIGZn0OF8AMJ8e8P2yfU=";
 
   mypy-boto3-mturk =
-    buildMypyBoto3Package "mturk" "1.42.3"
-      "sha256-gnoqOotJJC7ASGttRBWNfO6lBG77KdBGJhGNc8PDjP4=";
+    buildMypyBoto3Package "mturk" "1.43.0"
+      "sha256-Igsngmg9PeJcyqX/Ih+fgzUuBotaf+2UWHK9RKEePL4=";
 
   mypy-boto3-mwaa =
-    buildMypyBoto3Package "mwaa" "1.42.3"
-      "sha256-BkxJ1ilQTVsOqdq63kNtKyKqxrKrEXUkg3v6EN73HR8=";
+    buildMypyBoto3Package "mwaa" "1.43.0"
+      "sha256-w9AGeJrbRrTD31ANqKy6+MIQKenn05akYLfsXfnOw+w=";
 
   mypy-boto3-neptune =
-    buildMypyBoto3Package "neptune" "1.42.91"
-      "sha256-Z7ZROhIbvx2O33MbWUtkCii9V5DaXLuCEP3uX3JJ23c=";
+    buildMypyBoto3Package "neptune" "1.43.0"
+      "sha256-++taPLvX9mWzlCBHtr3pLVPWUT/WcFdtCD73pxoDqjY=";
 
   mypy-boto3-neptunedata =
-    buildMypyBoto3Package "neptunedata" "1.42.78"
-      "sha256-xm+KGZ0gWvTNgHoFrIsB8gqPFZTNE9csQmcrWtQ4axY=";
+    buildMypyBoto3Package "neptunedata" "1.43.0"
+      "sha256-rkVxsY4MQ+eB3uQhD3kI7bBpCHiDVcQDNUXA5zUyeok=";
 
   mypy-boto3-network-firewall =
-    buildMypyBoto3Package "network-firewall" "1.42.3"
-      "sha256-1y1aQ8A+XkPyNlXNODlau+Lgfdc6wCgmjiugLWY7nIk=";
+    buildMypyBoto3Package "network-firewall" "1.43.0"
+      "sha256-23FKHmxHWa7mgIWe0SRxbBzO6LZNdNkaU1XOqqI8knw=";
 
   mypy-boto3-networkmanager =
-    buildMypyBoto3Package "networkmanager" "1.42.3"
-      "sha256-pHiapVK4OoRLk0peUfMu3JRtgBd7vytqv8o3o2q5LK0=";
+    buildMypyBoto3Package "networkmanager" "1.43.0"
+      "sha256-UYfkIUzPjS8+9WjqbyHgzdLODOloASlx0o+ETyjksXQ=";
 
   mypy-boto3-nimble =
     buildMypyBoto3Package "nimble" "1.35.0"
       "sha256-gs9eGyRaZN7Fsl0D5fSqtTiYZ+Exp0s8QW/X8ZR7guA=";
 
   mypy-boto3-oam =
-    buildMypyBoto3Package "oam" "1.42.3"
-      "sha256-CGt/WuKol9nVwLHEwNgEsQDzIBhFarJNbq30OpiK0+I=";
+    buildMypyBoto3Package "oam" "1.43.0"
+      "sha256-BUl/wnJKR3TB1YsTCLrJdEoH9Lz8DZ6H94STOOX8gkQ=";
 
   mypy-boto3-omics =
-    buildMypyBoto3Package "omics" "1.42.78"
-      "sha256-h0urK602L1j2CtD1xsUOMaXizzc2CxbttMlaSNyQNoM=";
+    buildMypyBoto3Package "omics" "1.43.0"
+      "sha256-by5t5x+vu84vjqe176tFcz1zhDUIsmUo6dH5f3OyWOw=";
 
   mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.42.81"
-      "sha256-0L6N0wVUGDwjuLRgz0Sd/Do1u/CoXRatk3OWFnGCgwM=";
+    buildMypyBoto3Package "opensearch" "1.43.0"
+      "sha256-rQRJE32K/Ds/q8bB8FcrTcPbPc6NXBVvcI2TJzXJSbI=";
 
   mypy-boto3-opensearchserverless =
-    buildMypyBoto3Package "opensearchserverless" "1.42.75"
-      "sha256-StMw1EwBQfqX5UYp3DuJyVjS2zrtVGq4E7/iHzZfodg=";
+    buildMypyBoto3Package "opensearchserverless" "1.43.0"
+      "sha256-XrDuzW9pc2H2PS3h6rI781j9knG+ERTdEvOigumtZug=";
 
   mypy-boto3-opsworks =
     buildMypyBoto3Package "opsworks" "1.40.0"
@@ -982,84 +982,84 @@ in
       "sha256-JEuEjo0htTuDCZx2nNJK2Zq59oSUqkMf4BrNamerfVk=";
 
   mypy-boto3-organizations =
-    buildMypyBoto3Package "organizations" "1.42.83"
-      "sha256-sQqxy9tcynLqyBfXS4+FOgAcIQsttj8hiRf+GFK+tHE=";
+    buildMypyBoto3Package "organizations" "1.43.0"
+      "sha256-v72X9KJETKK9ppx1It9+5ywwEdtHRRBmj8GcSJrOBCc=";
 
   mypy-boto3-osis =
-    buildMypyBoto3Package "osis" "1.42.3"
-      "sha256-+t1Mh2gV7wu5YAFzp0jABFUC6/8P/FHMnBCHilIFXac=";
+    buildMypyBoto3Package "osis" "1.43.0"
+      "sha256-0rAEnU+3VsESGKlu8OTnY//rzwRqvROhRFga+vnwd1k=";
 
   mypy-boto3-outposts =
-    buildMypyBoto3Package "outposts" "1.42.86"
-      "sha256-roB4+wKTlaxt7vX5x77mhQoJVn4AyziwaiVCxlG3BDI=";
+    buildMypyBoto3Package "outposts" "1.43.0"
+      "sha256-fVKNAX3cx9jeCndcQYyxp9lgqHL91yFOg6dX/kNv27Q=";
 
   mypy-boto3-panorama =
-    buildMypyBoto3Package "panorama" "1.42.3"
-      "sha256-ynBHsnTvNz9G8sM9d88RI31ZMl0UzBgIz3ONEsJ+aHA=";
+    buildMypyBoto3Package "panorama" "1.43.0"
+      "sha256-DDNWvmo+i3O3s8sL16zg+QhWYzfrSTPOBHni8PVOgbs=";
 
   mypy-boto3-payment-cryptography =
-    buildMypyBoto3Package "payment-cryptography" "1.42.83"
-      "sha256-TpWy7EJGmqSb3u2+/5TPaAMjTOCtcuyEVJh48ADuxm8=";
+    buildMypyBoto3Package "payment-cryptography" "1.43.1"
+      "sha256-0O67JQj59+esJWCBGVzRNj73yBbnldhay28rxh7nlN0=";
 
   mypy-boto3-payment-cryptography-data =
-    buildMypyBoto3Package "payment-cryptography-data" "1.42.12"
-      "sha256-6DvE6qkfAHVvo0xDDA+w1bMacVqejk4kN2a0CiTbP3M=";
+    buildMypyBoto3Package "payment-cryptography-data" "1.43.0"
+      "sha256-Npyleoivecba7q9HyHNFRjs66fwNGR5dsAsu4e51luo=";
 
   mypy-boto3-pca-connector-ad =
-    buildMypyBoto3Package "pca-connector-ad" "1.42.3"
-      "sha256-xblYVZWgmt894TaYQ5I2LE7D3aQfOV542+N/ccmcl+Y=";
+    buildMypyBoto3Package "pca-connector-ad" "1.43.0"
+      "sha256-vAaiVQlvQzF8Pmmletyj8eWJ0oWeh3BFsLz4yJDP1Hw=";
 
   mypy-boto3-personalize =
-    buildMypyBoto3Package "personalize" "1.42.3"
-      "sha256-/cKsRTSz7rt/HNhARxw+JT/V0xNUTdjK7hA2G8Bn19U=";
+    buildMypyBoto3Package "personalize" "1.43.0"
+      "sha256-YM3HbNdW4xYvsJaiQ0MxAOo7bTHXbB95jNwyUBqV488=";
 
   mypy-boto3-personalize-events =
-    buildMypyBoto3Package "personalize-events" "1.42.3"
-      "sha256-Q0bgcDmMPc38oK8ht6Riqa0tMQ6QM9YgnEN2ZbhZbuQ=";
+    buildMypyBoto3Package "personalize-events" "1.43.0"
+      "sha256-G4Yi1ZVrkTRZYIHoWGOITtn0aUTiInKICGYr+0Jdyw4=";
 
   mypy-boto3-personalize-runtime =
-    buildMypyBoto3Package "personalize-runtime" "1.42.3"
-      "sha256-YyT/dD0x8U/ubEFBpKvBWiSWQj0ImYblJM0kKB/6ih8=";
+    buildMypyBoto3Package "personalize-runtime" "1.43.0"
+      "sha256-jA+JYi8QNlcBHN594d4Iur14ytDdg7/G3pXIWdvY2Yo=";
 
   mypy-boto3-pi =
-    buildMypyBoto3Package "pi" "1.42.3"
-      "sha256-tj7qGsD5o0orvoUcbU7pxmfLwVyu2bux/yEQwYHisns=";
+    buildMypyBoto3Package "pi" "1.43.0"
+      "sha256-V61eo3XMqDqvZzPltRq2JMjKhJUnv1AhOn2/xHPWCEo=";
 
   mypy-boto3-pinpoint =
-    buildMypyBoto3Package "pinpoint" "1.42.3"
-      "sha256-BojorzQHOokGEYaY38eUKmo4lggBGdcplQw9ZO26p9s=";
+    buildMypyBoto3Package "pinpoint" "1.43.0"
+      "sha256-nMG7mVx53CqENoZ2AJnvMbzn+ZIK/Tf1eeBc8PsJ50c=";
 
   mypy-boto3-pinpoint-email =
-    buildMypyBoto3Package "pinpoint-email" "1.42.3"
-      "sha256-AcDdmMa0wduyJgWbOjfLcyq5v44Oj8WktWB7PL4Pjso=";
+    buildMypyBoto3Package "pinpoint-email" "1.43.0"
+      "sha256-KPqjClzMa/GzS/PHI5l/TVCbTmZltTAS21kr1BTAR1g=";
 
   mypy-boto3-pinpoint-sms-voice =
-    buildMypyBoto3Package "pinpoint-sms-voice" "1.42.3"
-      "sha256-lDlP16Hoz5J6A/fhL79EgR1livk+WztLLTvy+nLrwhg=";
+    buildMypyBoto3Package "pinpoint-sms-voice" "1.43.0"
+      "sha256-A8/WYxFn06rUXtcIHsKfs7HxvOBges0wDGskm31NIyw=";
 
   mypy-boto3-pinpoint-sms-voice-v2 =
-    buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.42.80"
-      "sha256-QURYOr/OWZ/jekVzDrrH5OnZw9Dcu6qoO3POf00nvWs=";
+    buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.43.0"
+      "sha256-gkNI9kZ0fOLazbkKBu6JHlwiCmhk28WfL9o7FFj9f5Y=";
 
   mypy-boto3-pipes =
-    buildMypyBoto3Package "pipes" "1.42.3"
-      "sha256-315QgDF/CNolDYIYUcEGqdc5rQotI1uw0q8aQN9sW08=";
+    buildMypyBoto3Package "pipes" "1.43.0"
+      "sha256-5bmcUB1MIxJ34XQSsE41OrGfhy8c614AZenIWM885v8=";
 
   mypy-boto3-polly =
-    buildMypyBoto3Package "polly" "1.42.76"
-      "sha256-55tgrwAp2iMnve5aq+EStZ4BROxWZNA3VTZi5UdZu3o=";
+    buildMypyBoto3Package "polly" "1.43.0"
+      "sha256-kD3REDwAHOj2eFUwzEPmrqjFaqj/mF5urdyf5QvQv/Q=";
 
   mypy-boto3-pricing =
-    buildMypyBoto3Package "pricing" "1.42.82"
-      "sha256-oo2K5E+2+mbJgcq8FjBJdbuuWF3x8IRPrCEZU+Ml0hE=";
+    buildMypyBoto3Package "pricing" "1.43.0"
+      "sha256-bj4/jUE8pkOLIiC1um5TU0AVhc877vWZndeixsxMthc=";
 
   mypy-boto3-privatenetworks =
     buildMypyBoto3Package "privatenetworks" "1.38.0"
       "sha256-T04icQC+XwQZhaAEBWRiqfCUaayXP1szpbLdAG/7t3k=";
 
   mypy-boto3-proton =
-    buildMypyBoto3Package "proton" "1.42.3"
-      "sha256-YLKdwGViP2a82dXdgk+GW1Xhg3RLhs77g6sB++ACVEQ=";
+    buildMypyBoto3Package "proton" "1.43.0"
+      "sha256-zWR60l2zlboeCCP7n9wrx6j4R6/jfnrBkWaT0u669pc=";
 
   mypy-boto3-qldb =
     buildMypyBoto3Package "qldb" "1.40.54"
@@ -1070,200 +1070,200 @@ in
       "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg=";
 
   mypy-boto3-quicksight =
-    buildMypyBoto3Package "quicksight" "1.42.91"
-      "sha256-1IfgDzLDaDkL0ZeDVoC4TrMvRGJ3ai0LhG7F/ixx6ks=";
+    buildMypyBoto3Package "quicksight" "1.43.2"
+      "sha256-Xx5T3gaf6AlZLHooWhnD5lU6DPGBz/rNyvSzCUFc7vQ=";
 
   mypy-boto3-ram =
-    buildMypyBoto3Package "ram" "1.42.59"
-      "sha256-jBfqP9lFktW0qJfalR0wGCuHvZv4u6XMoQR466hXLV0=";
+    buildMypyBoto3Package "ram" "1.43.0"
+      "sha256-7IRVzeDmUM7LceRhz429R8RKeBJEQfVZ96FIHQmfh4Q=";
 
   mypy-boto3-rbin =
-    buildMypyBoto3Package "rbin" "1.42.3"
-      "sha256-55wnvv8vd/G5KdZoJipaSLzC13wRoop7ZXwTLDU4GtE=";
+    buildMypyBoto3Package "rbin" "1.43.0"
+      "sha256-ZmYC3YQujmfSUK0pOGCGFwT7LrSa3oJfo9juUb+2Xpk=";
 
   mypy-boto3-rds =
-    buildMypyBoto3Package "rds" "1.42.90"
-      "sha256-qdm9TSIVwVqMWYNt5rHnIGqof6XY4nyGK/VsrtdF1mc=";
+    buildMypyBoto3Package "rds" "1.43.0"
+      "sha256-ZKRhSBcrpdi3T2Qdw5v8WFg7dDbGCUlZBgIrmgHSUFs=";
 
   mypy-boto3-rds-data =
-    buildMypyBoto3Package "rds-data" "1.42.3"
-      "sha256-XHcwFnP9i2zw5yPwvhcMMCSTmBpQy7ZdxQ4eMR0ao4M=";
+    buildMypyBoto3Package "rds-data" "1.43.0"
+      "sha256-sgjEU7RqruiFWqUxxiDt/mx0uTJFhJQxkJsXvo5lYbk=";
 
   mypy-boto3-redshift =
-    buildMypyBoto3Package "redshift" "1.42.42"
-      "sha256-hQyZdqznZ8uJVoiwuiVRQRG8fDVWykuyWGJ6BOEc0bE=";
+    buildMypyBoto3Package "redshift" "1.43.0"
+      "sha256-oTWIE3DrHvzypf21knCGIBc4iFFPb0cDaDXWxlCOTMA=";
 
   mypy-boto3-redshift-data =
-    buildMypyBoto3Package "redshift-data" "1.42.87"
-      "sha256-KjFXEK3rcYOgaN1unw0mFxqW8VKPzsYT95KQO4DTZp8=";
+    buildMypyBoto3Package "redshift-data" "1.43.0"
+      "sha256-N8VjcHLbK2bd2Nd338HZvA3gfoSN581qMsbIjkdv1QI=";
 
   mypy-boto3-redshift-serverless =
-    buildMypyBoto3Package "redshift-serverless" "1.42.28"
-      "sha256-9sMbueRSG+9HdUXt0qH7L52J4coYQMV3ij7z9lGJJb8=";
+    buildMypyBoto3Package "redshift-serverless" "1.43.0"
+      "sha256-wDNJZO9wawzUzfDG7Qo7If/J1wUhrqNxklBEv4Wd4dg=";
 
   mypy-boto3-rekognition =
-    buildMypyBoto3Package "rekognition" "1.42.3"
-      "sha256-1WBI1Q2LMnerRfzoo7iohiE+KYEhz6HZqsqq2U7jvWY=";
+    buildMypyBoto3Package "rekognition" "1.43.0"
+      "sha256-yrq9Pk5zgOWfsYakcPdA0xqK+QVI8mRV2j3iy4fqBX0=";
 
   mypy-boto3-resiliencehub =
-    buildMypyBoto3Package "resiliencehub" "1.42.3"
-      "sha256-fijgv07T/uckhzTbyzvQ8IzbtaYyz5QTeHGl3w4+Sko=";
+    buildMypyBoto3Package "resiliencehub" "1.43.0"
+      "sha256-q1NTyAk8F3hQBeh23YBA/416Xr9Di0xGfGm9fqzmMTU=";
 
   mypy-boto3-resource-explorer-2 =
-    buildMypyBoto3Package "resource-explorer-2" "1.42.30"
-      "sha256-KP7USy0B599a9Z0R3LwpKeb/XpjPUde3qe2oNH87xR4=";
+    buildMypyBoto3Package "resource-explorer-2" "1.43.0"
+      "sha256-XhHk7nD1VavCKtBYk8QZOgUpoPzvBNKpnOT7qD/+5ec=";
 
   mypy-boto3-resource-groups =
-    buildMypyBoto3Package "resource-groups" "1.42.3"
-      "sha256-e2HQgjT94ETQuVS6ILTxBrVVbCmFb1pRo0FLiSCSJ4Y=";
+    buildMypyBoto3Package "resource-groups" "1.43.0"
+      "sha256-cI7cDSHrRZj3RTYVHJ/6lYqz6qgYUPIlc4VUeSW7xIY=";
 
   mypy-boto3-resourcegroupstaggingapi =
-    buildMypyBoto3Package "resourcegroupstaggingapi" "1.42.3"
-      "sha256-9UQvGxwF0vqxM2EXTneV6yIZrPI28EukXE0qi6lWivU=";
+    buildMypyBoto3Package "resourcegroupstaggingapi" "1.43.0"
+      "sha256-3M5dYW3rS41I/BW6Km80r0uTEgG6Gv+1vcFHJF19i2g=";
 
   mypy-boto3-robomaker =
     buildMypyBoto3Package "robomaker" "1.40.59"
       "sha256-jYAsZ1lMU9cl4rIvRO1UZLn4nIsuauWrNRwyB0j4HK0=";
 
   mypy-boto3-rolesanywhere =
-    buildMypyBoto3Package "rolesanywhere" "1.42.5"
-      "sha256-KsxXc2bn5flyurs3oC3PR3LgaiC6UpBy5+2JKFhnSPc=";
+    buildMypyBoto3Package "rolesanywhere" "1.43.0"
+      "sha256-bB+jfYzbQCjbWLJvGze7kK9U1+7kqHINhNiIumiBaPY=";
 
   mypy-boto3-route53 =
-    buildMypyBoto3Package "route53" "1.42.6"
-      "sha256-5FkF5dhEfWGt5XNRqT4kGhhSfjxdWKM02QqmgOMSaBM=";
+    buildMypyBoto3Package "route53" "1.43.0"
+      "sha256-Lva6G5n+26LxafVZ2wcZLgZYiYYnYwVM1E/jJkEiAUU=";
 
   mypy-boto3-route53-recovery-cluster =
-    buildMypyBoto3Package "route53-recovery-cluster" "1.42.3"
-      "sha256-UmasOtzfGq3MAelpwB9Ddi7QdUzMHYoGvd4hmTNmVfo=";
+    buildMypyBoto3Package "route53-recovery-cluster" "1.43.0"
+      "sha256-LRvMiVOd/1BFnQhN+NR573WjuALNpCM4/DK7NC1h5GM=";
 
   mypy-boto3-route53-recovery-control-config =
-    buildMypyBoto3Package "route53-recovery-control-config" "1.42.3"
-      "sha256-qEo5gf2kknkHmYgYnMDnEqnsffn47hVrkdnjwYOUI3A=";
+    buildMypyBoto3Package "route53-recovery-control-config" "1.43.0"
+      "sha256-upsBu22q1OGGkWaKk7nd+csGSyJoNdp8JZvSHHOU/U0=";
 
   mypy-boto3-route53-recovery-readiness =
-    buildMypyBoto3Package "route53-recovery-readiness" "1.42.3"
-      "sha256-9vR13ok2puJXdMyFSXVwgL+OJ2vBXUicZiV2KepvBbE=";
+    buildMypyBoto3Package "route53-recovery-readiness" "1.43.0"
+      "sha256-4DYUxjIUCC/NHV5BRkeUNXC8wVF1rUJCDO3VWxubtjk=";
 
   mypy-boto3-route53domains =
-    buildMypyBoto3Package "route53domains" "1.42.3"
-      "sha256-AasFHhNs7b904wj2hzm0Hhj0CHit16bl+f+0cl9Y/t4=";
+    buildMypyBoto3Package "route53domains" "1.43.0"
+      "sha256-ysbd7dnJ6atg+xoilLs2yYK6dr571NmxIAQJ1UlW/oM=";
 
   mypy-boto3-route53resolver =
-    buildMypyBoto3Package "route53resolver" "1.42.10"
-      "sha256-4zDAA7G0yZl+cm8l2aW/ATWy/Zv/1ogO1IYy7fmBKCk=";
+    buildMypyBoto3Package "route53resolver" "1.43.0"
+      "sha256-z7x9WVUzjzg5bSL7cizhgvMgnmQJ68Fhu+d46XIOpDI=";
 
   mypy-boto3-rum =
-    buildMypyBoto3Package "rum" "1.42.3"
-      "sha256-4/Q39UsUYaluauoaLm6BOej+Krl2VbO1xKKo1orRIkI=";
+    buildMypyBoto3Package "rum" "1.43.0"
+      "sha256-8or7NMBfeq9jZRzAu0Q1ShoTXTm8GCXR4kov0kaJCcE=";
 
   mypy-boto3-s3 =
-    buildMypyBoto3Package "s3" "1.42.85"
-      "sha256-QB46GErAlzvAi1Vsw7JlXY8uVlcLbth85jUhDfT2Zvs=";
+    buildMypyBoto3Package "s3" "1.43.0"
+      "sha256-O/sCex89+TFv9y/yn0stwNfWXtUDLYvPSJIiKZQihYg=";
 
   mypy-boto3-s3control =
-    buildMypyBoto3Package "s3control" "1.42.80"
-      "sha256-dKWK0wd1SYgz+68BDg0BDRV+bz9f8GqTfbhFpd3H+A8=";
+    buildMypyBoto3Package "s3control" "1.43.0"
+      "sha256-OBw9qPJPv+TrySrNFXo+GCJUjf5fqT10VJujnmjmCqo=";
 
   mypy-boto3-s3outposts =
-    buildMypyBoto3Package "s3outposts" "1.42.3"
-      "sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw=";
+    buildMypyBoto3Package "s3outposts" "1.43.0"
+      "sha256-T+JIJpHxD7IzAwq8yxgq6zbVMj/btpbhKnylMyfFvvU=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.42.91"
-      "sha256-M3Mbmu5fJdyl5UHS+wIklJ1UlFRzTxxQ2Rz057k0Auc=";
+    buildMypyBoto3Package "sagemaker" "1.43.1"
+      "sha256-mL/QtpqU7AEY8xD+mr5/X2U+MopldHOSvNY00vzAQU0=";
 
   mypy-boto3-sagemaker-a2i-runtime =
-    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3"
-      "sha256-dmUsLcno/E2Sb/mcdVve8qb10gOq2wMBy9P0w+MmS1w=";
+    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.43.0"
+      "sha256-jnUH8nHt54uG7FBxZx49prqx1Cc8DzNDgwNiL1QHeIA=";
 
   mypy-boto3-sagemaker-edge =
-    buildMypyBoto3Package "sagemaker-edge" "1.42.3"
-      "sha256-k6ZCEvbci8RRwe1vlkO0t7PYqt2NpmePqqARujXhrOI=";
+    buildMypyBoto3Package "sagemaker-edge" "1.43.0"
+      "sha256-wwBlAR8kwqMGpHHMmXTUD1jW8YvtMl4lRR9KTV6RxME=";
 
   mypy-boto3-sagemaker-featurestore-runtime =
-    buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.42.3"
-      "sha256-68wT26P5cEJAl2nFgmV9NGy9q+hXa7+pSQtBX65Don0=";
+    buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.43.0"
+      "sha256-LOetuw4G9ZFw1AJQgTUGFK0yVmu0rgcz9fxmTZgRH8c=";
 
   mypy-boto3-sagemaker-geospatial =
-    buildMypyBoto3Package "sagemaker-geospatial" "1.42.3"
-      "sha256-GENjDtRmX7c7uAOgbKn1vEkpXDJu7Z2Qilks8TVn9GY=";
+    buildMypyBoto3Package "sagemaker-geospatial" "1.43.0"
+      "sha256-qU03CsCdINIbkUWWZyJbWe0lcuw/xt/7P/ahMhB6afw=";
 
   mypy-boto3-sagemaker-metrics =
-    buildMypyBoto3Package "sagemaker-metrics" "1.42.3"
-      "sha256-+SQRuoyCF3xgXvSbazaRk9dPQeOfGJZYu3vKSn4l44Y=";
+    buildMypyBoto3Package "sagemaker-metrics" "1.43.0"
+      "sha256-OxrliFuV8nojK9YroUDbJAUt1eECaLeW/Nnww0+iU5g=";
 
   mypy-boto3-sagemaker-runtime =
-    buildMypyBoto3Package "sagemaker-runtime" "1.42.54"
-      "sha256-Y3kJS5tHq/aBkvWs3PJCuI0AcfYa8aa2hogo+CC9uPE=";
+    buildMypyBoto3Package "sagemaker-runtime" "1.43.0"
+      "sha256-Z1RCFA6/um97HHZodIDXoeubMlI4DAlOi++JJq6nP4Y=";
 
   mypy-boto3-savingsplans =
-    buildMypyBoto3Package "savingsplans" "1.42.62"
-      "sha256-ah5aNvlMpjEz/nec9LBb8eb/WVUT8hw12sQzTA/Wu0s=";
+    buildMypyBoto3Package "savingsplans" "1.43.0"
+      "sha256-UdTdVjxyxI4cZR13CjCtP+mj9EvH+pwB8lAYfNPWFXc=";
 
   mypy-boto3-scheduler =
-    buildMypyBoto3Package "scheduler" "1.42.3"
-      "sha256-nyVmH5XeePQ71QEVc6GZ3UYJ4l/6oI/CUVImT/thRr4=";
+    buildMypyBoto3Package "scheduler" "1.43.0"
+      "sha256-4i9uiELT5+lZ6QJKsggSda/gxpKOkuwiT7xI4URdL68=";
 
   mypy-boto3-schemas =
-    buildMypyBoto3Package "schemas" "1.42.3"
-      "sha256-iu65bUCX50x4VRLSWNXwvpE2gOjOhyJxmvhWtHYvrSI=";
+    buildMypyBoto3Package "schemas" "1.43.0"
+      "sha256-xg8JYWDWm6+Xr0juzrrfkh7rmQDGuU7Rtdd0z55I1cg=";
 
   mypy-boto3-sdb =
-    buildMypyBoto3Package "sdb" "1.42.3"
-      "sha256-CwXzHFKnprY3TLQUMkGU9PC3rR/mjrKwUN9eJ30hPWk=";
+    buildMypyBoto3Package "sdb" "1.43.0"
+      "sha256-CW9tYiy+Um/VTlnt0GhJvo/BSPnJJ5ILEPwMAhraHvY=";
 
   mypy-boto3-secretsmanager =
-    buildMypyBoto3Package "secretsmanager" "1.42.8"
-      "sha256-WrQvNc6TJ2XrsWhBRvR4qHzEuDvvlQ/Rqg4mi4jVnIE=";
+    buildMypyBoto3Package "secretsmanager" "1.43.0"
+      "sha256-Jl7i/d+dPkKuOWhWJft4YaU5EQ2OMkNyhHwOHL1mayA=";
 
   mypy-boto3-securityhub =
-    buildMypyBoto3Package "securityhub" "1.42.89"
-      "sha256-cXpUTYf1lt0Wtu39NzdaKjgJRyRsIOpJ+GJPvO7Iu/Y=";
+    buildMypyBoto3Package "securityhub" "1.43.0"
+      "sha256-puy9WXT8LIhXkXQVCabuo9luvtTw59Jj/yz3UmOGJZ0=";
 
   mypy-boto3-securitylake =
-    buildMypyBoto3Package "securitylake" "1.42.3"
-      "sha256-NoJ45saKUlWFpzUksZPrnUfj8yl1ivfXRoID38pqxGU=";
+    buildMypyBoto3Package "securitylake" "1.43.0"
+      "sha256-pwyBQN0XXWN83ccE0gbCcJE8ozPn2pNMgj/nEOo/yq0=";
 
   mypy-boto3-serverlessrepo =
-    buildMypyBoto3Package "serverlessrepo" "1.42.3"
-      "sha256-JIwTLfrkWY98gY+eH15Sy7r9Kif+68pBqgmZoj2DTWQ=";
+    buildMypyBoto3Package "serverlessrepo" "1.43.0"
+      "sha256-UWNKYI0t5AzHph0jUQEc0R4NJT7izkr/pzO7k14LfDg=";
 
   mypy-boto3-service-quotas =
-    buildMypyBoto3Package "service-quotas" "1.42.10"
-      "sha256-aqQDN3jmfxcZ8PLBE9wsb4M2N7w3B+3ruKNcAngyKFE=";
+    buildMypyBoto3Package "service-quotas" "1.43.0"
+      "sha256-m025z2loWJuRtVezRAXMZIKXMu/V/7cFxghxIOSLLQ4=";
 
   mypy-boto3-servicecatalog =
-    buildMypyBoto3Package "servicecatalog" "1.42.3"
-      "sha256-pCZjmXqOAWJVmiuL0q8nsCN6RZJDWYH9sM/a8NYe84A=";
+    buildMypyBoto3Package "servicecatalog" "1.43.0"
+      "sha256-J1UnC0SGqnPl1qjGh6gDaLBLa8OW2YMZtGJ27zQJcmM=";
 
   mypy-boto3-servicecatalog-appregistry =
-    buildMypyBoto3Package "servicecatalog-appregistry" "1.42.3"
-      "sha256-Duojb0uujD4zvfXBRiCSq33Gj/Fdf8t0VDfGKxhnGjw=";
+    buildMypyBoto3Package "servicecatalog-appregistry" "1.43.0"
+      "sha256-tX0woQcWoUOPKxSthE9p2rs1gsiA57DJY4JgreeAt0c=";
 
   mypy-boto3-servicediscovery =
-    buildMypyBoto3Package "servicediscovery" "1.42.3"
-      "sha256-TNOD43uSjgeiYfwBJTQuflWDoQobhOw39+527t71tyA=";
+    buildMypyBoto3Package "servicediscovery" "1.43.0"
+      "sha256-g1TsUJgdMpo1Sf8rPcmVi0ZNnTRmuqAKFz6LbMuZrp8=";
 
   mypy-boto3-ses =
-    buildMypyBoto3Package "ses" "1.42.3"
-      "sha256-gGSjHXCQf4jHTYaJQWRRQfdpr82gGklxWeWBrLx5/Is=";
+    buildMypyBoto3Package "ses" "1.43.0"
+      "sha256-JO9Mm6dTJuFnbyRzuSaPpT2lvDNaSUMlspWgeH+bt5M=";
 
   mypy-boto3-sesv2 =
-    buildMypyBoto3Package "sesv2" "1.42.63"
-      "sha256-GlrB1mkbgd6cbnC1O2dKPdyUsKqWgMR7A5UCsXbInSc=";
+    buildMypyBoto3Package "sesv2" "1.43.0"
+      "sha256-rHuTd77z8sOL25W1F+LaRabZpqOkv/J+oiclvHvnGuc=";
 
   mypy-boto3-shield =
-    buildMypyBoto3Package "shield" "1.42.3"
-      "sha256-AXqV0TsOLNYBdDVFzigW99tfKCUvvrS7S/F8nT3xSOw=";
+    buildMypyBoto3Package "shield" "1.43.0"
+      "sha256-Pd/d8Fxq1HQsGeiGP331Ss5RFNQA0W3HLU0B97llPZY=";
 
   mypy-boto3-signer =
-    buildMypyBoto3Package "signer" "1.42.7"
-      "sha256-fCXwGT1LLfoP3NowF1/8O/vQ6jHAY2/wikZ7ZkMgn1o=";
+    buildMypyBoto3Package "signer" "1.43.0"
+      "sha256-O/moShH3i7avL5pzZ3NnmAwMAm0UUFp9g/TVTurpKzk=";
 
   mypy-boto3-simspaceweaver =
-    buildMypyBoto3Package "simspaceweaver" "1.42.3"
-      "sha256-g9Yh4KSIERm9Uo2F9hnDPF+6tU57mxt0Q9goLyBnMfE=";
+    buildMypyBoto3Package "simspaceweaver" "1.43.0"
+      "sha256-Uh/EREUJuFFWw3ObXhDSWgU8DXRi2znVgfWhMhnhE0s=";
 
   mypy-boto3-sms =
     buildMypyBoto3Package "sms" "1.40.0"
@@ -1274,162 +1274,162 @@ in
       "sha256-qWnTJxM1h3pmY2PnI8PjT7u4+xODrSQM41IK8QsJCfM=";
 
   mypy-boto3-snow-device-management =
-    buildMypyBoto3Package "snow-device-management" "1.42.3"
-      "sha256-wNuzufARcqJ8liqDq2uSLxf6OvHt6ILm4uwi2mZ22rM=";
+    buildMypyBoto3Package "snow-device-management" "1.43.0"
+      "sha256-fv7WLk2Kbrw8niNgGfqx88TZQVWbm9lUgyL2NCDitIE=";
 
   mypy-boto3-snowball =
-    buildMypyBoto3Package "snowball" "1.42.3"
-      "sha256-hRI6ESK7/wbcKYo5aB2W5QXQ0hDrfKIHTTyN/RpEYrA=";
+    buildMypyBoto3Package "snowball" "1.43.0"
+      "sha256-wXdXItgB+AgAXYF1KWJvn6XfFwdWXQR4RG6LknRlobM=";
 
   mypy-boto3-sns =
-    buildMypyBoto3Package "sns" "1.42.3"
-      "sha256-Ht/oi/MOsZHcSZN45154ABzPDCnjcqxJqM/MhgBdin4=";
+    buildMypyBoto3Package "sns" "1.43.0"
+      "sha256-KtYPjmxmLpG0xvRUOcvrU/BO0qdk8KYR115PoP3+TEE=";
 
   mypy-boto3-sqs =
-    buildMypyBoto3Package "sqs" "1.42.3"
-      "sha256-aZmVuab2mpfG0+kSanbwZ1HjtAVkAXT+fCD+cdndyCo=";
+    buildMypyBoto3Package "sqs" "1.43.0"
+      "sha256-Psjh5lHoMK/89/4VGy4wkLjqmNc8sGkFOwnKTH9MhjY=";
 
   mypy-boto3-ssm =
-    buildMypyBoto3Package "ssm" "1.42.54"
-      "sha256-9LwZoIY1dXgItm75SltSw3KdqZhYd0WWJibmBgahviw=";
+    buildMypyBoto3Package "ssm" "1.43.0"
+      "sha256-M8tlm2GCFgFB+VmPvfb/kh3JQkeob2IVKr2HCyTk/2I=";
 
   mypy-boto3-ssm-contacts =
-    buildMypyBoto3Package "ssm-contacts" "1.42.3"
-      "sha256-94OFvLuYx8Y4eKtGXA2Vbl6Rxh2MV9IOHfbFB2tL3kM=";
+    buildMypyBoto3Package "ssm-contacts" "1.43.0"
+      "sha256-fwItFwvc3+G8xmDVqtSJqbEi6fey6JFFeNILLOsYOQA=";
 
   mypy-boto3-ssm-incidents =
-    buildMypyBoto3Package "ssm-incidents" "1.42.3"
-      "sha256-s3qgmNIltIoSjjA1r6t9cRmX78Nhizx+sSBn73XB7sI=";
+    buildMypyBoto3Package "ssm-incidents" "1.43.0"
+      "sha256-o2eCfk7QZjKSv8Bm8AmP3BL6M4QGVJrz8oMsmbF/yds=";
 
   mypy-boto3-ssm-sap =
-    buildMypyBoto3Package "ssm-sap" "1.42.13"
-      "sha256-Act3QA/AfxQSawufOj0Onfs0N3s1ua2GTTz/EtluRR8=";
+    buildMypyBoto3Package "ssm-sap" "1.43.0"
+      "sha256-Kd3EQQ6ZjEyBixSeXFSiPci9qyk/NuFP46O7jH8Esuc=";
 
   mypy-boto3-sso =
-    buildMypyBoto3Package "sso" "1.42.3"
-      "sha256-eLm650XMxikqnBzOWD6aZo8dYVmVkl3Mk0+SqZcON8c=";
+    buildMypyBoto3Package "sso" "1.43.0"
+      "sha256-V1og1LY/ORrXbfFVs4vF8LYe30/kvG71F3rWwXmNSJ4=";
 
   mypy-boto3-sso-admin =
-    buildMypyBoto3Package "sso-admin" "1.42.41"
-      "sha256-AbfHjc5UxxCdT5w7WS2EYMmWZU2xGpIeIe3ZZzhidL0=";
+    buildMypyBoto3Package "sso-admin" "1.43.1"
+      "sha256-1LtstuBIeRytha3ExMzo17fE4TUe2zVQq9ud8rGfFwM=";
 
   mypy-boto3-sso-oidc =
-    buildMypyBoto3Package "sso-oidc" "1.42.67"
-      "sha256-POfoZvj0owBR5hm8kaVqbc0jJEQemELE/PK5EUvAfvU=";
+    buildMypyBoto3Package "sso-oidc" "1.43.0"
+      "sha256-rMrmybKplGKYPFr1cIQaHRs/bwcKFYlFWCQRe7PxXOk=";
 
   mypy-boto3-stepfunctions =
-    buildMypyBoto3Package "stepfunctions" "1.42.3"
-      "sha256-vzj520LhROhseAff8SdVTe/hVIoQuiWCT2nMdFVPpbU=";
+    buildMypyBoto3Package "stepfunctions" "1.43.0"
+      "sha256-ure1FWQ1DXOg8bmOwCzTqKm5Mci0L+jm/XcPsCe/jYE=";
 
   mypy-boto3-storagegateway =
-    buildMypyBoto3Package "storagegateway" "1.42.3"
-      "sha256-92jALXRmjt/8Ji99jF3304T/xKW+gV1Ix3/N+fmodJc=";
+    buildMypyBoto3Package "storagegateway" "1.43.0"
+      "sha256-Y3p6SUr/Ej8SiWm9Dk3ifaxF3vesKlCdglgIcoJDemk=";
 
   mypy-boto3-sts =
-    buildMypyBoto3Package "sts" "1.42.91"
-      "sha256-8i2gqRwZNEGSSqXiTFdKvnymyyExqQyut0JW+hSgaHg=";
+    buildMypyBoto3Package "sts" "1.43.0"
+      "sha256-fDjP/Q8H/yJtC4AWYQv1+hm9b6KnWgTP3uy6LKvqikw=";
 
   mypy-boto3-support =
-    buildMypyBoto3Package "support" "1.42.3"
-      "sha256-G99OogEGnAisLOIMdCdLJHfiFoZEWL+7UmySNOKyoTQ=";
+    buildMypyBoto3Package "support" "1.43.0"
+      "sha256-e6w7bGtbIWb/Jj2RSfEWup+zLjONPbYMUpWL0oEHgwo=";
 
   mypy-boto3-support-app =
-    buildMypyBoto3Package "support-app" "1.42.3"
-      "sha256-1MD4eTC9fVXlQoARoHll43GMf1rKLG2pvGzPGH0Q6vw=";
+    buildMypyBoto3Package "support-app" "1.43.0"
+      "sha256-/B05S4INFBRdthN3+ybnXQdzIWwldRKEdfdp4ngJKUs=";
 
   mypy-boto3-swf =
-    buildMypyBoto3Package "swf" "1.42.3"
-      "sha256-OwWkvl0G76mX+rDyu5IMff+DsfD00k37y/TEFBp6Vf4=";
+    buildMypyBoto3Package "swf" "1.43.0"
+      "sha256-EGelGYE1b7seBg7WHOnY1Vumlw8iMqBAMIuUpPmIUIA=";
 
   mypy-boto3-synthetics =
-    buildMypyBoto3Package "synthetics" "1.42.3"
-      "sha256-IvQ168llb/sf6AeAmNueoe3U7ghNuJ8Kbw5gh8kFMq0=";
+    buildMypyBoto3Package "synthetics" "1.43.0"
+      "sha256-UmRSnFX0xy8YlB/RVAxSeRLwNSUE4rqkkXI1lf6MqvQ=";
 
   mypy-boto3-textract =
-    buildMypyBoto3Package "textract" "1.42.3"
-      "sha256-j4vFnFjR5/kf6KeJtCXJFwqfEUOQ3Rz+++OJrLd3MR0=";
+    buildMypyBoto3Package "textract" "1.43.0"
+      "sha256-HT/oZkcrMOpYUruaOmwm88XHj9Mp8EGkceYczF4TVlo=";
 
   mypy-boto3-timestream-query =
-    buildMypyBoto3Package "timestream-query" "1.42.3"
-      "sha256-iChDRilp+M6JnrE0q7sUIZ7I1XqX2wuU9yAo5B5vsOQ=";
+    buildMypyBoto3Package "timestream-query" "1.43.0"
+      "sha256-fCQPZ6Vb67Fc3l70/X2w0AhhUyz29PIBpTW49nfhwG8=";
 
   mypy-boto3-timestream-write =
-    buildMypyBoto3Package "timestream-write" "1.42.3"
-      "sha256-KDNxfSnrpiTc42Hf6agslUac3X0H8HMHEXSBYOeN5B8=";
+    buildMypyBoto3Package "timestream-write" "1.43.0"
+      "sha256-eYFkK6WzRSoUVnxhmQV6WGsnwS18+1oZOKPatxUPDBw=";
 
   mypy-boto3-tnb =
-    buildMypyBoto3Package "tnb" "1.42.3"
-      "sha256-NCC+R+BEAT1bZ+J3zvC/FI7lZkHfR8OiCIQUjVefMxY=";
+    buildMypyBoto3Package "tnb" "1.43.0"
+      "sha256-fc0e8DEx/b6M3kPB4Y07qqqMayg2BGSQ69gkuhcrl9Y=";
 
   mypy-boto3-transcribe =
-    buildMypyBoto3Package "transcribe" "1.42.25"
-      "sha256-RQkxMKk7svSYMoPac44m9X0YyEEQWCz/geSRD2qjlI8=";
+    buildMypyBoto3Package "transcribe" "1.43.0"
+      "sha256-0hww0SSW03bUktNCr81f5C56U961ETH96Gn1VZwX1Iw=";
 
   mypy-boto3-transfer =
-    buildMypyBoto3Package "transfer" "1.42.84"
-      "sha256-42Ep7vDUBgqDLeIaQEakr45Pay6HOC0nHE4gamNFyw4=";
+    buildMypyBoto3Package "transfer" "1.43.0"
+      "sha256-tC7uaKRyBaeJRefCknpR+CHWyTmV3DxuauCaAj37hV0=";
 
   mypy-boto3-translate =
-    buildMypyBoto3Package "translate" "1.42.3"
-      "sha256-olIHhtYBAz8+avIUNnLoD2pdMq+TLrB8Mn+haKeUl/0=";
+    buildMypyBoto3Package "translate" "1.43.0"
+      "sha256-3gP5TN3PkxdmGXMMACoCASgaJnlRp1hdnzfHRLjYiWo=";
 
   mypy-boto3-verifiedpermissions =
-    buildMypyBoto3Package "verifiedpermissions" "1.42.73"
-      "sha256-TwSUJodBgjjNTth4HC8XQ4h20eXCVX+r6Dwl2D7K7n0=";
+    buildMypyBoto3Package "verifiedpermissions" "1.43.0"
+      "sha256-iuOLfL7+iJAL2AOxDmL7aPUG3PEgTB+BsdwepYKTZ1E=";
 
   mypy-boto3-voice-id =
-    buildMypyBoto3Package "voice-id" "1.42.3"
-      "sha256-ovnE8szKPWozcpBtzxDE8Cqz5zUuY7rIm7IbKMnzVfw=";
+    buildMypyBoto3Package "voice-id" "1.43.0"
+      "sha256-OY+yyrxn5dKgzCjYvHp0oVlHY5i9zSO0nS7zyotc94o=";
 
   mypy-boto3-vpc-lattice =
-    buildMypyBoto3Package "vpc-lattice" "1.42.3"
-      "sha256-FyymePjaNzAl07HDHPW6M71N1eCkED5L75hhGPoGogA=";
+    buildMypyBoto3Package "vpc-lattice" "1.43.0"
+      "sha256-gmn8WkX6N2D0yTCtojqjO+Vp91OrqAmEbD62i5d3AXU=";
 
   mypy-boto3-waf =
-    buildMypyBoto3Package "waf" "1.42.3"
-      "sha256-NIRqd/ZG9qZhb8GJUgk8KZUsejQwCPriCMND7EJLY5M=";
+    buildMypyBoto3Package "waf" "1.43.0"
+      "sha256-sbQAgZlIVUy728L1TZOXvTzxmp4yvzswgMXJ5ieF3CE=";
 
   mypy-boto3-waf-regional =
-    buildMypyBoto3Package "waf-regional" "1.42.3"
-      "sha256-FEl4TtWX042gUuznqlc25HoIbMcCKhE85uuJPh8Kt+E=";
+    buildMypyBoto3Package "waf-regional" "1.43.0"
+      "sha256-zwxwpve6uEpXNyMQzaFPIEqDI/JoP5ks2wmO5gqLf7c=";
 
   mypy-boto3-wafv2 =
-    buildMypyBoto3Package "wafv2" "1.42.57"
-      "sha256-fCmLmGyNNPDQLK7eVKPPcimWQbodt3tgs/7F4MZW39Y=";
+    buildMypyBoto3Package "wafv2" "1.43.0"
+      "sha256-aaKxHvrUbUJfJyVAhohJNqOp5fpGPuR5x/11z2dGKz0=";
 
   mypy-boto3-wellarchitected =
-    buildMypyBoto3Package "wellarchitected" "1.42.3"
-      "sha256-+grWgv9THkvVIf3IPxN4bai4cpMHsv5NdJQnEKB5Ivo=";
+    buildMypyBoto3Package "wellarchitected" "1.43.0"
+      "sha256-FL52LqxnJxTErc99qpdB2O3NWq6mVudmHQ2QVDe1/k8=";
 
   mypy-boto3-wisdom =
-    buildMypyBoto3Package "wisdom" "1.42.3"
-      "sha256-r2iOH2Uc9dPqglIaSwNVv3yemOWVI3KY+M4bLaOFLio=";
+    buildMypyBoto3Package "wisdom" "1.43.0"
+      "sha256-Yyltlus+qxQqAzzi6P5yXElnn2tXaEUtB9lvobTGFBc=";
 
   mypy-boto3-workdocs =
-    buildMypyBoto3Package "workdocs" "1.42.3"
-      "sha256-bIMm0QOfErvZMFXiFCHMMi+xfvcsFI25geMXzCHEBkU=";
+    buildMypyBoto3Package "workdocs" "1.43.0"
+      "sha256-Swmj8MryTKviSMT8kvA+Lr1YOxEpStPhDCRoSKc0iT4=";
 
   mypy-boto3-worklink =
     buildMypyBoto3Package "worklink" "1.35.0"
       "sha256-AgK4Xg1dloJmA+h4+mcBQQVTvYKjLCk5tPDbl/ItCVQ=";
 
   mypy-boto3-workmail =
-    buildMypyBoto3Package "workmail" "1.42.3"
-      "sha256-wTEMdjr8c14xH1KDPLnSnD3eg/TkOt5eF2ooGxzcIoc=";
+    buildMypyBoto3Package "workmail" "1.43.0"
+      "sha256-AKgxPXa2diiYTDxZf6x+UAaDPtOK2RGTbG/p3falJ6M=";
 
   mypy-boto3-workmailmessageflow =
-    buildMypyBoto3Package "workmailmessageflow" "1.42.3"
-      "sha256-bxh+mhwsHHwt/cx/njegTa/QGHu+xa7YPg4SRos1deM=";
+    buildMypyBoto3Package "workmailmessageflow" "1.43.0"
+      "sha256-2glzIKBlui8YPvzI74bT4ADqEZ0lH9CuZqHtwz64Z3k=";
 
   mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.42.66"
-      "sha256-HFB5MRlLqUlk2KSwh6Fzv352mTR3ComSRK0vwNVxwoQ=";
+    buildMypyBoto3Package "workspaces" "1.43.0"
+      "sha256-0ESAx26RITxxE4/mwDSC7TxlfKObjU1Q0vTJ3pgK+7k=";
 
   mypy-boto3-workspaces-web =
-    buildMypyBoto3Package "workspaces-web" "1.42.51"
-      "sha256-1LoVLQsBJnWfTwVi9F4kJjZhFWq71/uZPDDV7az9xGI=";
+    buildMypyBoto3Package "workspaces-web" "1.43.0"
+      "sha256-u4iLZ4mf7rRJvTpbroMyLfAQ8Y8StMpIVXFGkVvv3l0=";
 
   mypy-boto3-xray =
-    buildMypyBoto3Package "xray" "1.42.3"
-      "sha256-gJLEGWfu0tD+4JaiKwgrsQfP4rtGeo3X+9w5JZPxlpw=";
+    buildMypyBoto3Package "xray" "1.43.0"
+      "sha256-aIAPLrlVqF0WatRitflWPL1tBXiEWAcTfJPNP45w60Q=";
 }
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index e46dcae1ee8e..529fc3193fcd 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  fetchurl,
   buildPythonPackage,
   fetchPypi,
   hatchling,
@@ -23,21 +22,14 @@
   pytestCheckHook,
 }:
 
-let
-  # see https://github.com/jupyter/nbconvert/issues/1896
-  style-css = fetchurl {
-    url = "https://cdn.jupyter.org/notebook/5.4.0/style/style.min.css";
-    hash = "sha256-WGWmCfRDewRkvBIc1We2GQdOVAoFFaO4LyIvdk61HgE=";
-  };
-in
 buildPythonPackage rec {
   pname = "nbconvert";
-  version = "7.16.6";
+  version = "7.17.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-V2p+N8ZIDae4Rl7vpmwXhEJDgWzhzMNyYzxrccPA9YI=";
+    hash = "sha256-NNDQp+c848urbFquj09Gh5coCwH9i9LKdG2oVp7d19I=";
   };
 
   # Add $out/share/jupyter to the list of paths that are used to search for
@@ -46,9 +38,6 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteAllInPlace ./nbconvert/exporters/templateexporter.py
-
-    mkdir -p share/templates/classic/static
-    cp ${style-css} share/templates/classic/static/style.css
   '';
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix
index 5a67b05d90cb..77054afdc230 100644
--- a/pkgs/development/python-modules/nbdev/default.nix
+++ b/pkgs/development/python-modules/nbdev/default.nix
@@ -48,9 +48,9 @@ buildPythonPackage (finalAttrs: {
   pythonImportsCheck = [ "nbdev" ];
 
   meta = {
-    homepage = "https://github.com/fastai/nbdev";
+    homepage = "https://github.com/AnswerDotAI/nbdev";
     description = "Create delightful software with Jupyter Notebooks";
-    changelog = "https://github.com/fastai/nbdev/blob/${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/AnswerDotAI/nbdev/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ rxiao ];
   };
diff --git a/pkgs/development/python-modules/netbox-attachments/default.nix b/pkgs/development/python-modules/netbox-attachments/default.nix
index b78d183341b8..660a0d1fb011 100644
--- a/pkgs/development/python-modules/netbox-attachments/default.nix
+++ b/pkgs/development/python-modules/netbox-attachments/default.nix
@@ -10,7 +10,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "netbox-attachments";
-  version = "11.0.1";
+  version = "11.1.0";
   pyproject = true;
 
   disabled = python.pythonVersion != netbox.python.pythonVersion;
@@ -19,7 +19,7 @@ buildPythonPackage (finalAttrs: {
     owner = "Kani999";
     repo = "netbox-attachments";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8wZeHLt8Hx8hghsliKtKxCI/2dQh/EQitZ4YXPSj/Qs=";
+    hash = "sha256-xe5p2PaLI+PBkQohmueth32BOQ7u9ZOCllq/WByAu6c=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/netbox-bgp/default.nix b/pkgs/development/python-modules/netbox-bgp/default.nix
index 2c9aa21a1b0c..2e6d1d74bb19 100644
--- a/pkgs/development/python-modules/netbox-bgp/default.nix
+++ b/pkgs/development/python-modules/netbox-bgp/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "netbox-bgp";
-  version = "0.18.0";
+  version = "0.18.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "netbox-bgp";
     tag = "v${version}";
-    hash = "sha256-Y2+TsGBpiBfj0e3mVdE2CjKlp0wX6zaFNcnc3gRKaHM=";
+    hash = "sha256-CLvtu4Xhja1hU48uAF1aEMNInc3FiworYvgGykQtWV4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/netbox-contextmenus/default.nix b/pkgs/development/python-modules/netbox-contextmenus/default.nix
index 83ac474527ce..080824cd5fc5 100644
--- a/pkgs/development/python-modules/netbox-contextmenus/default.nix
+++ b/pkgs/development/python-modules/netbox-contextmenus/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "netbox-contextmenus";
-  version = "1.4.13";
+  version = "1.4.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PieterL75";
     repo = "netbox_contextmenus";
     tag = "v${version}";
-    hash = "sha256-xgJ9EzdLc2xK9Kam8fS3f9bEgWq2O7NFx3D8Ci3Hc8o=";
+    hash = "sha256-YqyxZaHKXhMLDdBTAAKQsCBBSXikxBgcOvXEfa6f+0Y=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/netbox-dns/default.nix b/pkgs/development/python-modules/netbox-dns/default.nix
index 297c94df9c54..9e944b00c189 100644
--- a/pkgs/development/python-modules/netbox-dns/default.nix
+++ b/pkgs/development/python-modules/netbox-dns/default.nix
@@ -7,14 +7,14 @@
 }:
 buildPythonPackage rec {
   pname = "netbox-plugin-dns";
-  version = "1.4.6";
+  version = "1.5.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "peteeckel";
     repo = "netbox-plugin-dns";
     tag = version;
-    hash = "sha256-+7I3Kahh2LtOytTg/vb8bFVubGbWMwfKUMUsUpApqGE=";
+    hash = "sha256-0H6ZFyPAoX7PuXQg95Y8uAVRnwZmLUVGe7W6ONVHJ/M=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/netbox-documents/default.nix b/pkgs/development/python-modules/netbox-documents/default.nix
index 438e9e98c02f..61ed7df7e072 100644
--- a/pkgs/development/python-modules/netbox-documents/default.nix
+++ b/pkgs/development/python-modules/netbox-documents/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "netbox-documents";
-  version = "0.7.4";
+  version = "0.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jasonyates";
     repo = "netbox-documents";
     tag = "v${version}";
-    hash = "sha256-Y1PmvoYwtVqQ8Ze7bSa5+Hb3B2W9clDXLOZzOqCvWZE=";
+    hash = "sha256-XFVfNLU9a/0tQAVTrN2B1Oia/isOD8G5BdA3fVUn2sM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix
index c22d21808b06..84bb803256ba 100644
--- a/pkgs/development/python-modules/netbox-interface-synchronization/default.nix
+++ b/pkgs/development/python-modules/netbox-interface-synchronization/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "netbox-interface-synchronization";
-  version = "4.1.7";
+  version = "4.5.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "NetTech2001";
     repo = "netbox-interface-synchronization";
     tag = finalAttrs.version;
-    hash = "sha256-02fdfE1BwpWsh21M0oP65kMAbFxDxYHsAEWA64rUl18=";
+    hash = "sha256-DZ1xOfHop/rASWbBzVILVqvll94tQM7tRiSXwOo/QQI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/netbox-qrcode/default.nix b/pkgs/development/python-modules/netbox-qrcode/default.nix
index 1b68bb95ccd8..24932bcc2a64 100644
--- a/pkgs/development/python-modules/netbox-qrcode/default.nix
+++ b/pkgs/development/python-modules/netbox-qrcode/default.nix
@@ -9,7 +9,7 @@
   # dependencies
   pillow,
   qrcode,
-  psycopg,
+  psycopg2,
 
   # nativeCheckInputs
   django,
@@ -40,7 +40,7 @@ buildPythonPackage (finalAttrs: {
     django
     netaddr
     netbox
-    psycopg # not specified in pyproject.toml, but required at import time
+    psycopg2 # not specified in pyproject.toml, but required at import time
   ];
 
   preFixup = ''
diff --git a/pkgs/development/python-modules/netbox-routing/default.nix b/pkgs/development/python-modules/netbox-routing/default.nix
index ffccac2914cd..124dcb064116 100644
--- a/pkgs/development/python-modules/netbox-routing/default.nix
+++ b/pkgs/development/python-modules/netbox-routing/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "netbox-routing";
-  version = "0.3.2";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DanSheps";
     repo = "netbox-routing";
     tag = "v${version}";
-    hash = "sha256-HB07q6VO/PjbLLzKmHPMK91ZnppFtm9woQwdJIOFs5s=";
+    hash = "sha256-POnxnLES4Jub4u8pvpehMo0KfOCyAPGH83cRFRPgfOc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/netbox-topology-views/default.nix b/pkgs/development/python-modules/netbox-topology-views/default.nix
index f28fb4593707..0d4e50c27496 100644
--- a/pkgs/development/python-modules/netbox-topology-views/default.nix
+++ b/pkgs/development/python-modules/netbox-topology-views/default.nix
@@ -10,7 +10,7 @@
 }:
 buildPythonPackage rec {
   pname = "netbox-topology-views";
-  version = "4.5.0";
+  version = "4.5.1";
   pyproject = true;
 
   disabled = python.pythonVersion != netbox.python.pythonVersion;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "netbox-community";
     repo = "netbox-topology-views";
     tag = "v${version}";
-    hash = "sha256-1KEkNfo++lX0uF0xS9JOyG7dQBQYYo2cSGkjicJ5+vE=";
+    hash = "sha256-uKxIu8IPeEwBdRbtQaLWGwLnxvFyJ5FrScsU/ufyTuM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/nexusrpc/default.nix b/pkgs/development/python-modules/nexusrpc/default.nix
index 4adba207216b..83504c927be0 100644
--- a/pkgs/development/python-modules/nexusrpc/default.nix
+++ b/pkgs/development/python-modules/nexusrpc/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "nexus-rpc";
-  version = "1.3.0";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nexus-rpc";
     repo = "sdk-python";
     tag = version;
-    hash = "sha256-i2FfJ3aCncbqLY2oBG8zAPTbgxzH30MSmZxhDltN4JA=";
+    hash = "sha256-il+zCyU0dOlqFHGedyeBKgwQlqx1FLNuriGIw3RV3Gs=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix
index 25370ff81e3f..74d74d512115 100644
--- a/pkgs/development/python-modules/niaaml/default.nix
+++ b/pkgs/development/python-modules/niaaml/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "niaaml";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firefly-cpp";
     repo = "NiaAML";
     tag = version;
-    hash = "sha256-AUQhdJc2nSuggV6zNOMihVJIbHAQX6EXsnhn97Tp35A=";
+    hash = "sha256-j3vnslVvktfhtRsR1hw+WfLGbhmjdUzhY+HLR9EWD7o=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/nicegui/default.nix b/pkgs/development/python-modules/nicegui/default.nix
index 4db5c9ee06aa..0fb6736f00b7 100644
--- a/pkgs/development/python-modules/nicegui/default.nix
+++ b/pkgs/development/python-modules/nicegui/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nicegui";
-  version = "3.7.1";
+  version = "3.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+hZUGRHK51x4nlcbOOGbW15U6YZgKsxuzZPBad9mjXA=";
+    hash = "sha256-YSt4BoJZZwncPewk46VNHq0RR5sUpW0j055ryPYAdn4=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix
index a8c3805f49ee..f66a0d57f092 100644
--- a/pkgs/development/python-modules/niquests/default.nix
+++ b/pkgs/development/python-modules/niquests/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "niquests";
-  version = "3.18.6";
+  version = "3.18.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "niquests";
     tag = "v${version}";
-    hash = "sha256-hJD5hI/qvYo31eu05fhDZhgRNTbbGJnFE293HM+TuIA=";
+    hash = "sha256-ujqnb0B282MJi+2oy9AJfJY3KCE5JTjuJuyeeV0gZWA=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/nixl/default.nix b/pkgs/development/python-modules/nixl/default.nix
new file mode 100644
index 000000000000..8aa00155a58d
--- /dev/null
+++ b/pkgs/development/python-modules/nixl/default.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  buildPythonPackage,
+  python,
+  nixl,
+
+  # build-system
+  build,
+  meson-python,
+  pybind11,
+  pytest,
+  pyyaml,
+  setuptools,
+  types-pyyaml,
+
+  # dependencies
+  numpy,
+  torch,
+
+  config,
+  cudaSupport ? config.cudaSupport,
+  cudaPackages,
+}:
+
+buildPythonPackage.override { inherit (nixl) stdenv; } (finalAttrs: {
+  inherit (nixl)
+    pname
+    version
+    src
+    __structuredAttrs
+    strictDeps
+    nativeBuildInputs
+    dontUseCmakeConfigure
+    buildInputs
+    mesonFlags
+    ;
+  pyproject = true;
+
+  postPatch = (nixl.postPatch or "") + ''
+    substituteInPlace pyproject.toml \
+      --replace-fail \
+        '"patchelf",' \
+        ""
+  '';
+
+  build-system = [
+    build
+    meson-python
+    pybind11
+    pytest
+    pyyaml
+    setuptools
+    types-pyyaml
+  ];
+  dontUseMesonConfigure = true;
+
+  dependencies = [
+    numpy
+    torch
+  ];
+
+  # Install the `nixl` shim module (re-exports nixl_cu{12,13}).
+  # Upstream builds this as a separate wheel via `uv build` (nixl-meta), but that doesn't work in
+  # the sandbox.
+  postInstall = ''
+    install -Dm644 \
+      src/bindings/python/nixl-meta/nixl/__init__.py \
+      "$out/${python.sitePackages}/nixl/__init__.py"
+  '';
+
+  pythonImportsCheck = [
+    "nixl"
+  ]
+  ++ lib.optionals cudaSupport [
+    "nixl_cu${cudaPackages.cudaMajorVersion}"
+  ];
+
+  # No tests we can run in the sandbox
+  doCheck = false;
+
+  meta = nixl.meta // {
+    description = "Python API for nixl";
+  };
+})
diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py
index 0625a3d5d959..ac1944ef35e1 100644
--- a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py
+++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py
@@ -89,7 +89,7 @@ class FetchConfig:
 
 def make_request(url: str, token=None) -> urllib.request.Request:
     headers = {}
-    if token is not None:
+    if token:
         headers["Authorization"] = f"token {token}"
     return urllib.request.Request(url, headers=headers)
 
@@ -140,7 +140,7 @@ class Repo:
         self._branch = branch
         # Redirect is the new Repo to use
         self.redirect: "Repo | None" = None
-        self.token: str | None = "dummy_token"
+        self.token: str | None = None
 
     @property
     def name(self):
@@ -234,7 +234,9 @@ class Repo:
 
     def as_nix(self, plugin: "Plugin") -> str:
         ref_attr = (
-            f'tag = "{plugin.tag}";' if plugin.tag is not None else f'rev = "{plugin.commit}";'
+            f'tag = "{plugin.tag}";'
+            if plugin.tag is not None
+            else f'rev = "{plugin.commit}";'
         )
         return f"""fetchgit {{
       url = "{self.uri}";
@@ -242,6 +244,9 @@ class Repo:
       hash = "{plugin.to_sri_hash()}";
     }}"""
 
+    def get_license_spdx_id(self, fallback_license: str | None = None) -> str | None:
+        return fallback_license
+
 
 class RepoGitHub(Repo):
     def __init__(self, owner: str, repo: str, branch: str) -> None:
@@ -439,9 +444,7 @@ class RepoGitHub(Repo):
     def _check_for_redirect(self, url: str, req: http.client.HTTPResponse):
         response_url = req.geturl()
         if url != response_url:
-            new_owner, new_name = (
-                urlsplit(response_url).path.strip("/").split("/")[:2]
-            )
+            new_owner, new_name = urlsplit(response_url).path.strip("/").split("/")[:2]
 
             new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self._branch)
             self.redirect = new_repo
@@ -460,6 +463,41 @@ class RepoGitHub(Repo):
         loaded = json.loads(data)
         return loaded["hash"]
 
+    def get_license_spdx_id(self, fallback_license: str | None = None) -> str | None:
+        license_url = f"https://api.github.com/repos/{self.owner}/{self.repo}/license"
+        log.debug("Fetching license metadata from %s", license_url)
+
+        def log_fetch_failure(reason: str) -> str | None:
+            log.warning(
+                "Failed to fetch license metadata for %s/%s: %s; reusing %s",
+                self.owner,
+                self.repo,
+                reason,
+                fallback_license or "no cached license",
+            )
+            return fallback_license
+
+        try:
+            req = make_request(license_url, self.token)
+            with urllib.request.urlopen(req, timeout=10) as response:
+                data = json.load(response)
+        except urllib.error.HTTPError as e:
+            if e.code == 404:
+                return None
+            return log_fetch_failure(f"HTTP {e.code}")
+        except urllib.error.URLError as e:
+            return log_fetch_failure(str(e))
+
+        license_info = data.get("license")
+        if not isinstance(license_info, dict):
+            return None
+
+        spdx_id = license_info.get("spdx_id")
+        if not spdx_id or spdx_id == "NOASSERTION":
+            return None
+
+        return spdx_id
+
     def as_nix(self, plugin: "Plugin") -> str:
         if plugin.has_submodules:
             submodule_attr = "\n      fetchSubmodules = true;"
@@ -467,7 +505,9 @@ class RepoGitHub(Repo):
             submodule_attr = ""
 
         ref_attr = (
-            f'tag = "{plugin.tag}";' if plugin.tag is not None else f'rev = "{plugin.commit}";'
+            f'tag = "{plugin.tag}";'
+            if plugin.tag is not None
+            else f'rev = "{plugin.commit}";'
         )
 
         return f"""fetchFromGitHub {{
@@ -526,6 +566,7 @@ class Plugin:
     date: datetime | None = None
     last_tag: str | None = None
     tag: str | None = None
+    license: str | None = None
 
     @property
     def normalized_name(self) -> str:
@@ -781,6 +822,7 @@ class Editor:
                 date,
                 last_tag=last_tag,
                 tag=source_tag,
+                license=attr.get("license"),
             )
 
             plugins.append((pdesc, p))
@@ -1105,9 +1147,16 @@ def prefetch_plugin(
         latest_tag,
     )
 
-    cached_plugin = cache[target_cache_key(p.repo.uri, commit, source_tag)] if cache else None
+    cached_plugin = (
+        cache[target_cache_key(p.repo.uri, commit, source_tag)] if cache else None
+    )
     if cached_plugin is not None:
         log.debug(f"Cache hit for {p.name}!")
+        license_spdx_id = (
+            cached_plugin.license
+            or (current_plugin.license if current_plugin else None)
+            or p.repo.get_license_spdx_id()
+        )
         return (
             replace(
                 cached_plugin,
@@ -1117,6 +1166,7 @@ def prefetch_plugin(
                 date=date,
                 last_tag=latest_tag,
                 tag=source_tag,
+                license=license_spdx_id,
             ),
             p.repo.redirect,
         )
@@ -1124,7 +1174,14 @@ def prefetch_plugin(
     has_submodules = p.repo.has_submodules()
     log.debug(f"prefetch {p.name}")
     sha256 = (
-        p.repo.prefetch(f"{GIT_TAGS_PREFIX}{source_tag}") if source_tag else p.repo.prefetch(commit)
+        p.repo.prefetch(f"{GIT_TAGS_PREFIX}{source_tag}")
+        if source_tag
+        else p.repo.prefetch(commit)
+    )
+    license_spdx_id = (
+        current_plugin.license
+        if current_plugin and current_plugin.license
+        else p.repo.get_license_spdx_id()
     )
 
     return (
@@ -1137,6 +1194,7 @@ def prefetch_plugin(
             date=date,
             last_tag=latest_tag,
             tag=source_tag,
+            license=license_spdx_id,
         ),
         p.repo.redirect,
     )
@@ -1243,6 +1301,7 @@ class Cache:
                     attr.get("version", ""),
                     last_tag=attr.get("last_tag"),
                     tag=attr.get("tag"),
+                    license=attr.get("license"),
                 )
                 downloads[cache_key] = p
         return downloads
diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
index 34df9b34f54b..a8a8fa50a527 100644
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nomadnet";
-  version = "0.9.9";
+  version = "0.9.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "NomadNet";
     tag = finalAttrs.version;
-    hash = "sha256-qLe9fnIE9kY9JerAAH318dq1SOshP9xX3l/2c91fnSA=";
+    hash = "sha256-vIV3FEvwqd2je/DzGWeshEx5Tb+DhOQIg7l0LbffEwY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/nonbloat-db/default.nix b/pkgs/development/python-modules/nonbloat-db/default.nix
deleted file mode 100644
index 0dda75d8ba15..000000000000
--- a/pkgs/development/python-modules/nonbloat-db/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  poetry-core,
-  poetry-dynamic-versioning,
-
-  # dependencies
-  aiofile,
-  typing-extensions,
-
-  # tests
-  pytestCheckHook,
-  pytest-asyncio,
-  pytest-cov-stub,
-  pytest-mock,
-  pytest-randomly,
-  faker,
-}:
-
-buildPythonPackage (finalAttrs: {
-  pname = "nonbloat-db";
-  version = "0.1.4";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "PerchunPak";
-    repo = "nonbloat-db";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-x6QFOZ+RYdophuRXMKE4RNi1xDnsa3naUMDbn1vG7hM=";
-  };
-
-  build-system = [
-    poetry-core
-    poetry-dynamic-versioning
-  ];
-
-  dependencies = [
-    aiofile
-    typing-extensions
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-asyncio
-    pytest-cov-stub
-    pytest-mock
-    pytest-randomly
-    faker
-  ];
-
-  pythonImportsCheck = [
-    "nbdb"
-    "nbdb.storage"
-  ];
-
-  disabledTests = [
-    # flaky
-    "test_write_in_background"
-  ];
-
-  meta = {
-    description = "Simple key-value database for my small projects";
-    homepage = "https://github.com/PerchunPak/nonbloat-db";
-    changelog = "https://github.com/PerchunPak/nonbloat-db/blob/${finalAttrs.src.tag}/CHANGES.md";
-    license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ PerchunPak ];
-  };
-})
diff --git a/pkgs/development/python-modules/nuclear/default.nix b/pkgs/development/python-modules/nuclear/default.nix
index c6fd2b0f8128..970a59bd7e80 100644
--- a/pkgs/development/python-modules/nuclear/default.nix
+++ b/pkgs/development/python-modules/nuclear/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "nuclear";
-  version = "2.7.0";
+  version = "2.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "igrek51";
     repo = "nuclear";
     rev = version;
-    hash = "sha256-xKsYS+v/7xm9LRdpFKMsbrPggw4VfVMWst/3olj2n3E=";
+    hash = "sha256-hoOvISKjl5XTxtv8I3BSkOI7oZFSL+yA3NiYceJGcIY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index 681b659d3f01..bee037126c99 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -35,7 +35,7 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 buildPythonPackage (finalAttrs: {
   pname = "numpy";
-  version = "2.4.2";
+  version = "2.4.4";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: {
     repo = "numpy";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-HFNa7siXRIBBjWrkqQd8QAPWQQsTrYFXNq2DRzVmkQk=";
+    hash = "sha256-LAGXw4vFpjZjZ2s/dXdzXHDm6Ah3pronjScqK02wivY=";
   };
 
   patches = lib.optionals python.hasDistutilsCxxPatch [
@@ -63,6 +63,22 @@ buildPythonPackage (finalAttrs: {
       --replace-fail '/bin/true' '${lib.getExe' coreutils "true"}'
   '';
 
+  mesonFlags = lib.optionals (!stdenv.hostPlatform.isLoongArch64) [
+    # This is required to support CPUs with feature-sets earlier than x86-64-v2
+    # (before 2009). This will still build optimizations for newer features, but
+    # allow for importing with older machines. See:
+    #
+    #  - https://github.com/NixOS/nixpkgs/issues/496822
+    #  - https://numpy.org/devdocs/reference/simd/build-options.html
+    #  - https://github.com/numpy/numpy/issues/31073
+    #
+    # NOTE: It is possible to enable CPU features based upon attributes defined
+    # in `lib/systems/architectures.nix`, but that might trigger tons of
+    # rebuilds on old x86_64 CPU machines, and it will be too complex for
+    # maintenance.
+    (lib.mesonOption "cpu-baseline" "none")
+  ];
+
   build-system = [
     cython
     gfortran
diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix
index b25f958cc9b9..2e114b7b5e06 100644
--- a/pkgs/development/python-modules/numpyro/default.nix
+++ b/pkgs/development/python-modules/numpyro/default.nix
@@ -40,6 +40,11 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-sNqllL9nBwXp0kn+HAjvIaHf7LR0UKh9q7DZ20yCr5A=";
   };
 
+  patches = [
+    # Remove usage of xla_pmap_p which was removed in jax 0.10.0
+    ./fix-jax-0.10.0-compat.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/numpyro/fix-jax-0.10.0-compat.patch b/pkgs/development/python-modules/numpyro/fix-jax-0.10.0-compat.patch
new file mode 100644
index 000000000000..ad9e937a1e06
--- /dev/null
+++ b/pkgs/development/python-modules/numpyro/fix-jax-0.10.0-compat.patch
@@ -0,0 +1,20 @@
+diff --git a/numpyro/ops/provenance.py b/numpyro/ops/provenance.py
+index 1234567..abcdefg 100644
+--- a/numpyro/ops/provenance.py
++++ b/numpyro/ops/provenance.py
+@@ -4,7 +4,7 @@
+ import jax
+ from jax.api_util import debug_info, flatten_fun, shaped_abstractify
+ from jax.extend.core import Literal
+-from jax.extend.core.primitives import call_p, closed_call_p, jit_p, xla_pmap_p
++from jax.extend.core.primitives import call_p, closed_call_p, jit_p
+ import jax.extend.linear_util as lu
+ from jax.interpreters.partial_eval import trace_to_jaxpr_dynamic
+
+@@ -114,7 +114,6 @@ def track_deps_call_rule(eqn, provenance_inputs):
+
+ track_deps_rules[call_p] = track_deps_call_rule
+-track_deps_rules[xla_pmap_p] = track_deps_call_rule
+
+
+ def track_deps_closed_call_rule(eqn, provenance_inputs):
diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index ba54ec5d1ec5..d69acef6d247 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-data";
-  version = "1.4.11";
+  version = "1.4.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = finalAttrs.version;
-    hash = "sha256-zd4SmDIHtOKYK19tr/72CIKAfhWtm7957Ax7b2kAXdw=";
+    hash = "sha256-Q+h5qSCvybxO+RojDNoS6g1Bt/fLpiWVJHRiMkgPpvY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/ohme/default.nix b/pkgs/development/python-modules/ohme/default.nix
index e1433f8ef8e2..b44802940c6b 100644
--- a/pkgs/development/python-modules/ohme/default.nix
+++ b/pkgs/development/python-modules/ohme/default.nix
@@ -6,16 +6,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "ohme";
-  version = "1.7.1";
+  version = "1.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dan-r";
     repo = "ohmepy";
-    tag = "v${version}";
-    hash = "sha256-A+cGgM3pkOv1b3/+3XiqdhLo2JJbSNruZKbNG2o9BaE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4Cz08MFtWJomWHQzTubD3s8kMfUt7aZwD7buwEN2yn8=";
   };
 
   build-system = [ setuptools ];
@@ -30,8 +30,8 @@ buildPythonPackage rec {
   meta = {
     description = "Module for interacting with the Ohme API";
     homepage = "https://github.com/dan-r/ohmepy";
-    changelog = "https://github.com/dan-r/ohmepy/releases/tag/${src.tag}";
+    changelog = "https://github.com/dan-r/ohmepy/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix
index a796d577c71d..060e4c29be6f 100644
--- a/pkgs/development/python-modules/ome-zarr/default.nix
+++ b/pkgs/development/python-modules/ome-zarr/default.nix
@@ -111,7 +111,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Implementation of next-generation file format (NGFF) specifications for storing bioimaging data in the cloud";
     homepage = "https://pypi.org/project/ome-zarr";
-    changelog = "https://github.com/ome/ome-zarr-py/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/ome/ome-zarr-py/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.bcdarwin ];
     mainProgram = "ome_zarr";
diff --git a/pkgs/development/python-modules/onnx-ir/default.nix b/pkgs/development/python-modules/onnx-ir/default.nix
index cd419744a99d..60c4a5425d0c 100644
--- a/pkgs/development/python-modules/onnx-ir/default.nix
+++ b/pkgs/development/python-modules/onnx-ir/default.nix
@@ -25,14 +25,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "onnx-ir";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "onnx";
     repo = "ir-py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-U6N1vnsvp2Tr2qSIl9gsUnrKDjeUuUXAXx6ZyRnUTKM=";
+    hash = "sha256-vdo8BiE7m9Qr3JktgcPGDZfykjcf/VYY39tfhtzOrpA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/onnxscript/default.nix b/pkgs/development/python-modules/onnxscript/default.nix
index 34068be3b9b3..a8e6baec1378 100644
--- a/pkgs/development/python-modules/onnxscript/default.nix
+++ b/pkgs/development/python-modules/onnxscript/default.nix
@@ -15,7 +15,8 @@
   onnx-ir,
   packaging,
   typing-extensions,
-  pynvml,
+  # cuda-only:
+  nvidia-ml-py,
 
   # tests
   onnxruntime,
@@ -30,14 +31,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "onnxscript";
-  version = "0.6.2";
+  version = "0.7.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "onnxscript";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-raeNa/OY9c8g+kHNxSAdLxhj+iwaMf/wrjUaKfW4E2s=";
+    hash = "sha256-PktzMtG8GpeRy3XUz8MFbOSISVzAIubpeOS0ESbVvrI=";
   };
 
   env = {
@@ -57,7 +59,7 @@ buildPythonPackage (finalAttrs: {
     typing-extensions
   ]
   ++ lib.optionals cudaSupport [
-    pynvml
+    nvidia-ml-py
   ];
 
   pythonImportsCheck = [ "onnxscript" ];
diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix
index 562433ab6272..225d06ee13b5 100644
--- a/pkgs/development/python-modules/open-meteo/default.nix
+++ b/pkgs/development/python-modules/open-meteo/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   postPatch = ''
     # Upstream doesn't set a version for the pyproject.toml
     substituteInPlace pyproject.toml \
-      --replace-fail "0.0.0" "${version}" \
+      --replace-fail "0.0.0" "${version}"
   '';
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index 4d3139d757dc..4354ff544054 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -51,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "openai";
-  version = "2.29.0";
+  version = "2.31.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "openai-python";
     tag = "v${version}";
-    hash = "sha256-Ea8dnhxpgLwiApqB2GjBUb8wEgFEojlIvteo7FHXHF8=";
+    hash = "sha256-YLqVOWc8a7gtu2NaWNP32ApjVgQ6qJB4XLT/zQzddAM=";
   };
 
   postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"'';
diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix
index f50a8bbc1e64..3fafd9f25fd4 100644
--- a/pkgs/development/python-modules/openapi-core/default.nix
+++ b/pkgs/development/python-modules/openapi-core/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "openapi-core";
-  version = "0.22.0";
+  version = "0.23.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "openapi-core";
     tag = version;
-    hash = "sha256-fdONzFde9k2NAd5Rd8vTLt/lQX72JdNSFJhPVWryRQw=";
+    hash = "sha256-wGaRx+IEqsvs7ygCDgh1H4di662SQhjmpB9LMP/YGKM=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix
index 0b2b95c7a625..af544f92e181 100644
--- a/pkgs/development/python-modules/openapi-schema-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix
@@ -6,11 +6,17 @@
   # build-system
   poetry-core,
 
-  # propagates
+  # dependencies
   jsonschema,
   jsonschema-specifications,
+  pydantic,
+  pydantic-settings,
+  referencing,
   rfc3339-validator,
 
+  # optional-dependencies
+  regress,
+
   # tests
   pytestCheckHook,
   pytest-cov-stub,
@@ -18,41 +24,41 @@
 
 buildPythonPackage rec {
   pname = "openapi-schema-validator";
-  version = "0.6.3";
+  version = "0.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "openapi-schema-validator";
     tag = version;
-    hash = "sha256-1Y049W4TbqvKZRwnvPVwyLq6CH6NQDrEfJknuMn8dGo=";
+    hash = "sha256-XOtSnlJJGEa6pOQDHTFRF0zqNxJIB2VlZvFv5kxwUIM=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     jsonschema
     jsonschema-specifications
+    pydantic
+    pydantic-settings
+    referencing
     rfc3339-validator
   ];
 
+  optional-dependencies = {
+    ecma-regex = [ regress ];
+  };
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-cov-stub
   ];
 
-  disabledTests = [
-    # https://github.com/python-openapi/openapi-schema-validator/issues/153
-    "test_array_prefixitems_invalid"
-  ];
-
-  pytestFlags = [ "-vvv" ];
-
   pythonImportsCheck = [ "openapi_schema_validator" ];
 
   meta = {
     changelog = "https://github.com/python-openapi/openapi-schema-validator/releases/tag/${src.tag}";
-    description = "Validates OpenAPI schema against the OpenAPI Schema Specification v3.0";
+    description = "Validates OpenAPI schema against the OpenAPI Schema Specification v3.0 and v3.1";
     homepage = "https://github.com/python-openapi/openapi-schema-validator";
     license = lib.licenses.bsd3;
     maintainers = [ ];
diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix
index 10d82f26212c..658b97639a83 100644
--- a/pkgs/development/python-modules/openapi-spec-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "openapi-spec-validator";
-  version = "0.7.2";
+  version = "0.8.4";
   pyproject = true;
 
   # no tests via pypi sdist
@@ -27,12 +27,16 @@ buildPythonPackage rec {
     owner = "python-openapi";
     repo = "openapi-spec-validator";
     tag = version;
-    hash = "sha256-APEx7+vc824DLmdzLvhfFVrcjPxVwwUwxkh19gjXEvc=";
+    hash = "sha256-KY9mDnF/R2UO8WZ0WyBzpZQsVBxzxnTK6zyqvUb+hVw=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "jsonschema"
+  ];
+
+  dependencies = [
     jsonschema
     jsonschema-path
     lazy-object-proxy
diff --git a/pkgs/development/python-modules/openfga-sdk/default.nix b/pkgs/development/python-modules/openfga-sdk/default.nix
index 19a0c5fe60bc..279e4ccfa04b 100644
--- a/pkgs/development/python-modules/openfga-sdk/default.nix
+++ b/pkgs/development/python-modules/openfga-sdk/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "openfga-sdk";
-  version = "0.10.1";
+  version = "0.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "python-sdk";
     tag = "v${version}";
-    hash = "sha256-BU1PDmO0eW4c5MOrVeaZY2YDd+tllQ+iQUDz0fwGRaU=";
+    hash = "sha256-weuwtEr2u9W5c8zgpHiQUspbUTyk2/WuXEp2kYZM4Xc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index cb93df1f0d69..5e16e90cc7dc 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -1,13 +1,13 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "3.12.0";
+  version = "3.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openrazer";
     repo = "openrazer";
     tag = "v${version}";
-    hash = "sha256-Sgn+7DABsTnRTx/lh/++JPmfsQ7dM6frkyzG0F5k2gA=";
+    hash = "sha256-iXMN/wFe0IWr9kwGmuU+j/n2DHvxP37VqY/NVn8F690=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix
index 143485ee5b52..5b8bedd5452b 100644
--- a/pkgs/development/python-modules/openstep-plist/default.nix
+++ b/pkgs/development/python-modules/openstep-plist/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "openstep-plist";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "openstep_plist";
     inherit version;
-    hash = "sha256-AGgwTRLOwP4TLE+dIHfHG/pP9DkEmU/SosqX1aB2M44=";
+    hash = "sha256-Kg1w/3oDzOZKcnBitkuy9cmvn9SmNqqkM5tqqiz2UZU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index ff5ac4d562ad..d0aee75cc728 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "opower";
-  version = "0.18.1";
+  version = "0.18.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "opower";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wy2FPWRSlxNEhqCfRwUyIxUCIdRJDIFICTJxM08+Xno=";
+    hash = "sha256-MAleCX4uhIvoXj9I4qcveTjI6wBg/VZr/UyZZfrapsA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/optiland/default.nix b/pkgs/development/python-modules/optiland/default.nix
new file mode 100644
index 000000000000..23a917c6a098
--- /dev/null
+++ b/pkgs/development/python-modules/optiland/default.nix
@@ -0,0 +1,118 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchpatch,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  matplotlib,
+  numba,
+  numpy,
+  pandas,
+  pyyaml,
+  requests,
+  scipy,
+  seaborn,
+  tabulate,
+  typing-extensions,
+  vtk,
+
+  # tests
+  pytestCheckHook,
+
+  # optional-dependencies
+  pyside6,
+  qtconsole,
+  torch,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "optiland";
+  version = "0.6.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "HarrisonKramer";
+    repo = "optiland";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-s+EFsfj+3VIgpqhBv8f6IblyxfxXHWnO/i1lO3bEke4=";
+  };
+
+  patches = [
+    # wayland is not supported, see:
+    # https://github.com/optiland/optiland/issues/556
+    (fetchpatch {
+      url = "https://github.com/optiland/optiland/commit/9644df6e06bd24c5a3a7cf36c8df9dd83050bccc.patch";
+      hash = "sha256-a74Z7rp3ji3+9lM8Q/RttMIzwlRBki1N2Y0YtBiVaEA=";
+    })
+    # A fixup for the above, see:
+    #
+    # - https://github.com/optiland/optiland/pull/564#discussion_r3106831922
+    # - https://github.com/optiland/optiland/pull/568
+    (fetchpatch {
+      url = "https://github.com/optiland/optiland/commit/652922bce5e1854f1d067e292422d95dee129a46.patch";
+      hash = "sha256-9O+DNbqBDDSAaRkwCy3o76lwy5MJ7WHQqzfcN1fcmnE=";
+    })
+  ];
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    matplotlib
+    numba
+    numpy
+    pandas
+    pyyaml
+    requests
+    scipy
+    seaborn
+    tabulate
+    typing-extensions
+    vtk
+  ];
+
+  passthru = {
+    optional-dependencies = {
+      gui = [
+        pyside6
+        qtconsole
+      ];
+      torch = [
+        torch
+      ];
+    };
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ]
+  # No need for optional-dependencies.gui, as the relevant tests requiring the
+  # gui dependencies are disabled below.
+  ++ finalAttrs.finalPackage.passthru.optional-dependencies.torch;
+
+  disabledTestPaths = [
+    # From some reason, importing pyside6 during tests causes a core dump of the
+    # python interpreter, so we disable all GUI tests.
+    "tests/gui/"
+  ];
+
+  pythonImportsCheck = [
+    "optiland"
+  ];
+
+  meta = {
+    description = "Comprehensive optical design, optimization, and analysis in Python, including GPU-accelerated and differentiable ray tracing via PyTorch";
+    homepage = "https://github.com/HarrisonKramer/optiland";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    # Intentionally not setting optiland meta.mainProgram, as it is not
+    # functional without additional qt6 and python libraries available. See
+    # pkgs/by-name/op/optiland/package.nix for a derivation with a working GUI.
+  };
+})
diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix
index 28342e6903d0..92ebd46a86f0 100644
--- a/pkgs/development/python-modules/optuna/default.nix
+++ b/pkgs/development/python-modules/optuna/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "optuna";
-  version = "4.7.0";
+  version = "4.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "optuna";
     repo = "optuna";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SbEmJ4V4pyxMUx3GPMqBUDLq4AslwichbZNmNwmNm0o=";
+    hash = "sha256-DgmNIq4LksG3YRQLSbshMzGGRW/qAxMccs/oCRxI5tc=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix
deleted file mode 100644
index 38de13c23a59..000000000000
--- a/pkgs/development/python-modules/orange-canvas-core/default.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools,
-  trubar,
-
-  # dependencies
-  anyqt,
-  cachecontrol,
-  commonmark,
-  dictdiffer,
-  docutils,
-  filelock,
-  lockfile,
-  numpy,
-  packaging,
-  pip,
-  qasync,
-  requests,
-  requests-cache,
-  truststore,
-  typing-extensions,
-
-  # tests
-  qt5,
-  pyqt5,
-  pytest-qt,
-  pytestCheckHook,
-
-  stdenv,
-  gitUpdater,
-}:
-
-buildPythonPackage rec {
-  pname = "orange-canvas-core";
-  version = "0.2.7";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "biolab";
-    repo = "orange-canvas-core";
-    tag = version;
-    hash = "sha256-mJSF2OWSIxBn1blQReLFlf8Uu/vP7F3vJrcrAz0uWFY=";
-  };
-
-  build-system = [
-    setuptools
-    trubar
-  ];
-
-  dependencies = [
-    anyqt
-    commonmark
-    dictdiffer
-    docutils
-    filelock
-    lockfile
-    numpy
-    packaging
-    pip
-    qasync
-    requests
-    requests-cache
-    truststore
-    typing-extensions
-  ];
-
-  pythonImportsCheck = [ "orangecanvas" ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-    export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
-    export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins";
-    export QT_QPA_PLATFORM=offscreen
-  '';
-
-  nativeCheckInputs = [
-    pyqt5
-    pytest-qt
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    # Failed: CALL ERROR: Exceptions caught in Qt event loop
-    "test_create_new_window"
-    "test_dont_load_swp_on_new_window"
-    "test_editlinksnode"
-    "test_flattened"
-    "test_links_edit"
-    "test_links_edit_widget"
-    "test_new_window"
-    "test_toolbox"
-    "test_tooltree_registry"
-    "test_widgettoolgrid"
-  ];
-
-  passthru.updateScript = gitUpdater { };
-
-  disabledTestPaths = [ "orangecanvas/canvas/items/tests/test_graphicstextitem.py" ];
-
-  meta = {
-    description = "Orange framework for building graphical user interfaces for editing workflows";
-    homepage = "https://github.com/biolab/orange-canvas-core";
-    changelog = "https://github.com/biolab/orange-canvas-core/releases/tag/${src.tag}";
-    license = [ lib.licenses.gpl3 ];
-    maintainers = [ ];
-    # Segmentation fault during tests
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-}
diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix
deleted file mode 100644
index dbf027a8d181..000000000000
--- a/pkgs/development/python-modules/orange-widget-base/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  lib,
-  gitUpdater,
-  stdenv,
-  buildPythonPackage,
-  setuptools,
-  fetchFromGitHub,
-  pyqt5,
-  pyqtwebengine,
-  matplotlib,
-  orange-canvas-core,
-  pyqtgraph,
-  typing-extensions,
-  qt5,
-  pytestCheckHook,
-  pytest-qt,
-  appnope,
-}:
-
-buildPythonPackage rec {
-  pname = "orange-widget-base";
-  version = "4.27.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "biolab";
-    repo = "orange-widget-base";
-    tag = version;
-    hash = "sha256-RTPzdeqz7HRyH726qXC0FMrAcwk6qZ8gmkXL7s5bl74=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    matplotlib
-    orange-canvas-core
-    pyqt5
-    pyqtgraph
-    pyqtwebengine
-    typing-extensions
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ appnope ];
-
-  pythonImportsCheck = [ "orangewidget" ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-    export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
-    export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins";
-    export QT_QPA_PLATFORM=offscreen
-  '';
-
-  nativeCheckInputs = [
-    pytest-qt
-    pytestCheckHook
-  ];
-
-  disabledTestPaths = [
-    "orangewidget/report/tests/test_report.py"
-    "orangewidget/tests/test_widget.py"
-  ];
-
-  passthru.updateScript = gitUpdater { };
-
-  meta = {
-    description = "Implementation of the base OWBaseWidget class and utilities for use in Orange Canvas workflows";
-    homepage = "https://github.com/biolab/orange-widget-base";
-    license = [ lib.licenses.gpl3Plus ];
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix
deleted file mode 100644
index 7959fca6cf8c..000000000000
--- a/pkgs/development/python-modules/orange3/default.nix
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  oldest-supported-numpy,
-  setuptools,
-
-  # nativeBuildInputs
-  copyDesktopItems,
-  cython,
-  qt5,
-  recommonmark,
-  sphinx,
-
-  # dependencies
-  baycomp,
-  bottleneck,
-  catboost,
-  chardet,
-  httpx,
-  joblib,
-  keyring,
-  keyrings-alt,
-  matplotlib,
-  numpy,
-  openpyxl,
-  opentsne,
-  orange-canvas-core,
-  orange-widget-base,
-  pandas,
-  pip,
-  pyqt5,
-  pyqtgraph,
-  pyqtwebengine,
-  python-louvain,
-  pyyaml,
-  qtconsole,
-  requests,
-  scikit-learn,
-  scipy,
-  serverfiles,
-  xgboost,
-  xlrd,
-  xlsxwriter,
-
-  makeDesktopItem,
-
-  # passthru
-  gitUpdater,
-  python,
-  pytest-qt,
-  pytestCheckHook,
-}:
-
-let
-  self = buildPythonPackage rec {
-    pname = "orange3";
-    version = "3.40.0";
-    pyproject = true;
-
-    src = fetchFromGitHub {
-      owner = "biolab";
-      repo = "orange3";
-      tag = version;
-      hash = "sha256-AOQGqOYaP3bPZtgjsVCxhA1T34Y9EIR5VeMwhZWmI88=";
-    };
-
-    build-system = [
-      oldest-supported-numpy
-      setuptools
-    ];
-
-    postPatch = ''
-      substituteInPlace pyproject.toml \
-          --replace-fail 'cython>=3.0' 'cython'
-
-      # disable update checking
-      echo -e "def check_for_updates():\n\tpass" >> Orange/canvas/__main__.py
-    '';
-
-    nativeBuildInputs = [
-      copyDesktopItems
-      cython
-      qt5.wrapQtAppsHook
-      recommonmark
-      sphinx
-    ];
-
-    enableParallelBuilding = true;
-
-    pythonRelaxDeps = [ "scikit-learn" ];
-
-    dependencies = [
-      baycomp
-      bottleneck
-      catboost
-      chardet
-      httpx
-      joblib
-      keyring
-      keyrings-alt
-      matplotlib
-      numpy
-      openpyxl
-      opentsne
-      orange-canvas-core
-      orange-widget-base
-      pandas
-      pip
-      pyqt5
-      pyqtgraph
-      pyqtwebengine
-      python-louvain
-      pyyaml
-      qtconsole
-      requests
-      scikit-learn
-      scipy
-      serverfiles
-      setuptools
-      xgboost
-      xlrd
-      xlsxwriter
-    ];
-
-    # FIXME: ImportError: cannot import name '_variable' from partially initialized module 'Orange.data' (most likely due to a circular import) (/build/source/Orange/data/__init__.py)
-    doCheck = false;
-
-    # FIXME: pythonRelaxDeps is not relaxing the scikit-learn version constraint, had to disable this
-    dontCheckRuntimeDeps = true;
-
-    pythonImportsCheck = [
-      "Orange"
-      "Orange.data._variable"
-    ];
-
-    desktopItems = [
-      (makeDesktopItem {
-        name = "orange";
-        exec = "orange-canvas";
-        desktopName = "Orange Data Mining";
-        genericName = "Data Mining Suite";
-        comment = "Explore, analyze, and visualize your data";
-        icon = "orange-canvas";
-        mimeTypes = [ "application/x-extension-ows" ];
-        categories = [
-          "Science"
-          "Education"
-          "ArtificialIntelligence"
-          "DataVisualization"
-          "NumericalAnalysis"
-          "Qt"
-        ];
-        keywords = [
-          "Machine Learning"
-          "Scientific Visualization"
-          "Statistical Analysis"
-        ];
-      })
-    ];
-
-    postInstall = ''
-      wrapProgram $out/bin/orange-canvas \
-        "${"$"}{qtWrapperArgs[@]}"
-      mkdir -p $out/share/icons/hicolor/{256x256,48x48}/apps
-      cp distribute/icon-256.png $out/share/icons/hicolor/256x256/apps/orange-canvas.png
-      cp distribute/icon-48.png $out/share/icons/hicolor/48x48/apps/orange-canvas.png
-    '';
-
-    passthru = {
-      updateScript = gitUpdater { };
-      tests.unittests = stdenv.mkDerivation {
-        name = "${self.name}-tests";
-        inherit (self) src;
-
-        preCheck = ''
-          export HOME=$(mktemp -d)
-          export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
-          export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins";
-          export QT_QPA_PLATFORM=offscreen
-
-          rm Orange -rf
-          cp -r ${self}/${python.sitePackages}/Orange .
-          chmod +w -R .
-
-          substituteInPlace Orange/classification/tests/test_xgb_cls.py \
-            --replace-fail test_learners mk_test_learners
-
-          substituteInPlace Orange/modelling/tests/test_xgb.py \
-            --replace-fail test_learners mk_test_learners
-
-          substituteInPlace Orange/**/tests/*.py \
-            --replace-fail test_filename filename_test
-
-          # TODO: debug why orange is crashing on GC, may be a upstream issue
-          chmod +x Orange/__init__.py
-          echo "import gc; gc.disable()" | tee -a Orange/__init__.py
-
-        '';
-
-        nativeBuildInputs = [
-          pytest-qt
-          pytestCheckHook
-        ];
-
-        postCheck = ''
-          touch $out
-        '';
-
-        doBuild = false;
-        doInstall = false;
-
-        buildInputs = [ self ];
-      };
-    };
-
-    meta = {
-      description = "Data mining and visualization toolbox for novice and expert alike";
-      homepage = "https://orangedatamining.com/";
-      changelog = "https://github.com/biolab/orange3/blob/${src.tag}/CHANGELOG.md";
-      license = [ lib.licenses.gpl3Plus ];
-      maintainers = [ ];
-      mainProgram = "orange-canvas";
-    };
-  };
-in
-self
diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix
index 2bcbfc0f9c2c..4c59abd298a7 100644
--- a/pkgs/development/python-modules/orjson/default.nix
+++ b/pkgs/development/python-modules/orjson/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "orjson";
-  version = "3.11.5";
+  version = "3.11.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ijl";
     repo = "orjson";
     tag = version;
-    hash = "sha256-MWNAP8p4TN5yXFtXKWCyguv3EnFpZHMG8YEIiFF1Vug=";
+    hash = "sha256-4a8vNQEe1P1t2BcqSL+d+GLHi1lhUtbA7p5/vj/J0Lc=";
   };
 
   patches = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
@@ -46,7 +46,7 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-sRVa1cCbZQJq4bASn7oreEKpzTvuDoMzVs/IbojQa8s=";
+    hash = "sha256-eB7jVTsvBSUjtaKsbRnRtYSd+SqnCaoDyG76iExmSHc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix
index 87e0306ce36d..423311203092 100644
--- a/pkgs/development/python-modules/oslo-concurrency/default.nix
+++ b/pkgs/development/python-modules/oslo-concurrency/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "oslo-concurrency";
-  version = "7.4.0";
+  version = "7.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "oslo.concurrency";
     tag = version;
-    hash = "sha256-i2w3c5/Xuhjc7cAaIiuRNtz5JTG9tjXsrn4IUhuMLxA=";
+    hash = "sha256-NZ6OsaDwqEsW2FZEi8cjXkLa7EwVqt3mYPRkG/jGiFM=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix
index 3b30f9a8e0ab..475913ba11da 100644
--- a/pkgs/development/python-modules/outlines/default.nix
+++ b/pkgs/development/python-modules/outlines/default.nix
@@ -120,7 +120,7 @@ buildPythonPackage (finalAttrs: {
     tensorflow
   ];
 
-  pytestFlagsArray = [
+  pytestFlags = [
     # FutureWarning: functools.partial will be a method descriptor in future Python versions; wrap it in enum.member() if you want to preserve the old behavior
     "-Wignore::FutureWarning"
   ];
diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix
index 126f0ff5a3a6..f923f7ea9e51 100644
--- a/pkgs/development/python-modules/paddleocr/default.nix
+++ b/pkgs/development/python-modules/paddleocr/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "paddleocr";
-  version = "3.4.0";
+  version = "3.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PaddlePaddle";
     repo = "PaddleOCR";
     tag = "v${version}";
-    hash = "sha256-pKRaE5+9a2W0RiOyDpT8UDjY1XUSJ95CV2VgdCkJpSI=";
+    hash = "sha256-9iodDGi2orALGga+Rozn4tgd9VyOx6Arm9y2v/ZfQmM=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix
index 86accde29c63..d5bd70dd3192 100644
--- a/pkgs/development/python-modules/pamqp/default.nix
+++ b/pkgs/development/python-modules/pamqp/default.nix
@@ -2,12 +2,12 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
+  hatchling,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
-  version = "3.3.0";
+  version = "4.0.0";
   pname = "pamqp";
 
   pyproject = true;
@@ -15,11 +15,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "gmr";
     repo = "pamqp";
-    rev = version;
-    hash = "sha256-0vjiPBLd8afnATjmV2sINsBd4j7L544u5DA3jLiLSsY=";
+    tag = version;
+    hash = "sha256-0rRVbzC5G+lH6Okvw8PtoPZKD8LlobAGYvDEIDw0aFo=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/gmr/pamqp/blob/${src.rev}/docs/changelog.rst";
+    changelog = "https://github.com/gmr/pamqp/blob/${src.tag}/docs/changelog.rst";
     description = "RabbitMQ Focused AMQP low-level library";
     homepage = "https://github.com/gmr/pamqp";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix
index 0850c92c811a..60ee4c09d2f2 100644
--- a/pkgs/development/python-modules/particle/default.nix
+++ b/pkgs/development/python-modules/particle/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "particle";
-  version = "0.26.1";
+  version = "0.26.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EHaY0K2NVtZWjvlzZ/Qk5dZyoUCHpd4xU51iGCV1kMc=";
+    hash = "sha256-I8xDFfkNB9n69Z+BPbptEgCGigFZXjfXyVbr0ICdZy0=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pathable/default.nix b/pkgs/development/python-modules/pathable/default.nix
index c447cb6f4a18..4921616d1c14 100644
--- a/pkgs/development/python-modules/pathable/default.nix
+++ b/pkgs/development/python-modules/pathable/default.nix
@@ -9,17 +9,17 @@
 
 buildPythonPackage rec {
   pname = "pathable";
-  version = "0.4.4";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "pathable";
     tag = version;
-    hash = "sha256-nN5jpI0Zi5ofdSuN9QbTHDXPmQRq9KAn8SoHuNDpZaw=";
+    hash = "sha256-D3TYVMcKXPA6fmy2JND5o8ja3Rk8Ne17Sxm4+fLw3Dw=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/paypal-checkout-serversdk/default.nix b/pkgs/development/python-modules/paypal-checkout-serversdk/default.nix
index 7db5b1a863ad..d8709d0478a7 100644
--- a/pkgs/development/python-modules/paypal-checkout-serversdk/default.nix
+++ b/pkgs/development/python-modules/paypal-checkout-serversdk/default.nix
@@ -43,7 +43,6 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/paypal/Checkout-Python-SDK/releases/tag/${version}";
     description = "Python SDK for Checkout RESTful APIs";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ hexa ];
diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix
index df4b98240c5b..f374126dde3f 100644
--- a/pkgs/development/python-modules/pcffont/default.nix
+++ b/pkgs/development/python-modules/pcffont/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pcffont";
-  version = "0.0.24";
+  version = "0.0.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TakWolf";
     repo = "pcffont";
     tag = version;
-    hash = "sha256-32u4FE5QLLqYmRVDuYYGC/laLCRH9phNGi1B9JC+cps=";
+    hash = "sha256-xxTOw7Fdey5YKDY1kq3EiAjW2jNHIU3wFDKvHdPgAQc=";
   };
 
   build-system = [ uv-build ];
diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix
index 996973e0ac85..4170d421d632 100644
--- a/pkgs/development/python-modules/pdm-backend/default.nix
+++ b/pkgs/development/python-modules/pdm-backend/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pdm-backend";
-  version = "2.4.7";
+  version = "2.4.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdm-project";
     repo = "pdm-backend";
     tag = version;
-    hash = "sha256-zWlavlYteXNUpWG2hxYikDfFEoZexTT3JOU64RqBhN4=";
+    hash = "sha256-zh+JP1sX+ra3Z6oVgxOabwMmD/bQjokdb0MelZ0k1KQ=";
   };
 
   env.PDM_BUILD_SCM_VERSION = version;
diff --git a/pkgs/development/python-modules/peakrdl-rust/default.nix b/pkgs/development/python-modules/peakrdl-rust/default.nix
index 5df80e88b5ed..a13ed8a20b49 100644
--- a/pkgs/development/python-modules/peakrdl-rust/default.nix
+++ b/pkgs/development/python-modules/peakrdl-rust/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "peakrdl-rust";
-  version = "0.7.2";
+  version = "0.7.3";
 
   pyproject = true;
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "darsor";
     repo = "PeakRDL-rust";
     tag = "v${version}";
-    hash = "sha256-eoEJUX6yvZU8xNA+tMWRmEH3CypohOpyVa6C9FzeehU=";
+    hash = "sha256-1rdTz3w1SEDFWpTjKIk9eLgj3F09lDOMqqdUf8iDd7g=";
   };
 
   build-system = [ uv-build ];
diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix
index ad3ab0ca58e9..9ce13d12861b 100644
--- a/pkgs/development/python-modules/pettingzoo/default.nix
+++ b/pkgs/development/python-modules/pettingzoo/default.nix
@@ -12,7 +12,7 @@
   numpy,
 
   # optional-dependencies
-  pygame,
+  pygame-ce,
   pymunk,
   chess,
   rlcard,
@@ -31,16 +31,17 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pettingzoo";
-  version = "1.25.0";
+  version = "1.26.1";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "Farama-Foundation";
     repo = "PettingZoo";
-    tag = version;
-    hash = "sha256-hQe/TMlLG//Bn8aaSo0/FPOUvOEyKfztuTIS7SMsUQ4=";
+    tag = finalAttrs.version;
+    hash = "sha256-WrfjkDnmir6bZvtMD7MVQKVoGvK+lutlOoNe9SNQ8jU=";
   };
 
   build-system = [
@@ -53,26 +54,25 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all = lib.concatAttrValues (lib.removeAttrs optional-dependencies [ "all" ]);
     atari = [
       # multi-agent-ale-py
-      pygame
+      pygame-ce
     ];
     butterfly = [
-      pygame
+      pygame-ce
       pymunk
     ];
     classic = [
       chess
-      pygame
+      pygame-ce
       rlcard
       shimmy
     ];
-    mpe = [ pygame ];
+    mpe = [ pygame-ce ];
     other = [ pillow ];
     sisl = [
       pybox2d
-      pygame
+      pygame-ce
       pymunk
       scipy
     ];
@@ -91,7 +91,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     chess
-    pygame
+    pygame-ce
     pymunk
     pytest-markdown-docs
     pytest-xdist
@@ -118,8 +118,8 @@ buildPythonPackage rec {
   meta = {
     description = "API standard for multi-agent reinforcement learning environments, with popular reference environments and related utilities";
     homepage = "https://github.com/Farama-Foundation/PettingZoo";
-    changelog = "https://github.com/Farama-Foundation/PettingZoo/releases/tag/${version}";
+    changelog = "https://github.com/Farama-Foundation/PettingZoo/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index b481f1e6b411..fa574d7148cd 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     postgresql
   ];
 
-  pytestFlagsArray = [ "-vvv" ];
+  pytestFlags = [ "-vvv" ];
 
   env = {
     PGDATABASE = "_test_db";
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index 5a0efab0657a..cb7214e768fb 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "pikepdf";
-  version = "10.3.0";
+  version = "10.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-fEIzmC17RYic4CFwBh5FdGbJmaWaiaPBK7eCQ7RCmr0=";
+    hash = "sha256-x17cRef8rB5UQQws48G/IqeSp4B3CaLzIoUIQ8fJeUg=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index c3050067712b..e2c0b2eb75ad 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -42,14 +42,14 @@
 
 buildPythonPackage rec {
   pname = "pillow";
-  version = "12.1.1";
+  version = "12.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-pillow";
     repo = "pillow";
     tag = version;
-    hash = "sha256-NlmNabyoHiakwvomjivTA7N304ovNCMDSaBLSmcmZ7w=";
+    hash = "sha256-7w6FbZLTAoUMvLtSPvafk3wSRv8TrkAAfgZ/dfu3HpA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix
index dabbfa6bf441..cd4f3df84388 100644
--- a/pkgs/development/python-modules/pinecone-client/default.nix
+++ b/pkgs/development/python-modules/pinecone-client/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pinecone-client";
-  version = "8.1.0";
+  version = "8.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pinecone-io";
     repo = "pinecone-python-client";
     tag = "v${version}";
-    hash = "sha256-rXsCaH8SbMttBQWfF8Gy6hz+PVboxkLJZCs0/o6lAEI=";
+    hash = "sha256-VfoSW17Bx/eFlnSxUiQZsfY/y210/sKIF5df/kb2kTc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix
index c3653d0f5af4..5d4f315f5a1e 100644
--- a/pkgs/development/python-modules/pip-api/default.nix
+++ b/pkgs/development/python-modules/pip-api/default.nix
@@ -9,7 +9,7 @@
   virtualenv,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pip-api";
   version = "0.0.34";
   pyproject = true;
@@ -17,13 +17,13 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "di";
     repo = "pip-api";
-    tag = version;
+    tag = "v${finalAttrs.version}";
     hash = "sha256-nmCP4hp+BsD80OBjerOu+QTBBExGHvn/v19od4V3ncI=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ pip ];
+  dependencies = [ pip ];
 
   nativeCheckInputs = [
     pretend
@@ -40,13 +40,15 @@ buildPythonPackage rec {
     "test_invoke_install"
     "test_invoke_uninstall"
     "test_isolation"
+    # Tests fails on hydra
+    "test_parse_requirements_editable"
   ];
 
   meta = {
     description = "Importable pip API";
-    homepage = "https://github.com/di/pip-api";
-    changelog = "https://github.com/di/pip-api/blob/${version}/CHANGELOG";
-    license = with lib.licenses; [ mit ];
+    homepage = "https://github.com/di/pip-api/";
+    changelog = "https://github.com/di/pip-api/blob/${finalAttrs.src.tag}/CHANGELOG";
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix
index b9d19289f13a..530726004d6d 100644
--- a/pkgs/development/python-modules/pivy/default.nix
+++ b/pkgs/development/python-modules/pivy/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pivy";
-  version = "0.6.10";
+  version = "0.6.11";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "coin3d";
     repo = "pivy";
     tag = version;
-    hash = "sha256-DRA4NTAHg2iB/D1CU9pJEpsZwX9GW3X5gpxbIwP54Ko=";
+    hash = "sha256-jBc7+hoG1x7KDYPbexPRwnll9qz4qA3Y1w7A7DuES2Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix
index 7e5f9082a9ed..7a9e257d12a4 100644
--- a/pkgs/development/python-modules/playwright/default.nix
+++ b/pkgs/development/python-modules/playwright/default.nix
@@ -31,14 +31,14 @@ in
 buildPythonPackage (finalAttrs: {
   pname = "playwright";
   # run ./pkgs/development/web/playwright/update.sh to update
-  version = "1.58.0";
+  version = "1.59.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "playwright-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gK19pjB8TDy/kK+fb4pjwlGZlUyY26p+CNxunvIMrrY=";
+    hash = "sha256-CbvVSx/KDaX+CZEJRlDd4GUwWejzjTKNyL4+FhgT6qE=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/plopp/default.nix b/pkgs/development/python-modules/plopp/default.nix
index e9f0eff94a96..860705b09687 100644
--- a/pkgs/development/python-modules/plopp/default.nix
+++ b/pkgs/development/python-modules/plopp/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "plopp";
-  version = "26.4.0";
+  version = "26.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scipp";
     repo = "plopp";
     tag = finalAttrs.version;
-    hash = "sha256-qjuhM0/qrGIZw00DOnaGODGHqzGn4r3gIAguJS5OPZ8=";
+    hash = "sha256-nluNaOQKkXolGCgx3Pr0m5OQ6vZbWPfdN7kbNKaVU68=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/plotpy/default.nix b/pkgs/development/python-modules/plotpy/default.nix
index 17ac66b97533..bd3e06c0913e 100644
--- a/pkgs/development/python-modules/plotpy/default.nix
+++ b/pkgs/development/python-modules/plotpy/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "plotpy";
-  version = "2.8.4";
+  version = "2.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PlotPyStack";
     repo = "PlotPy";
     tag = "v${version}";
-    hash = "sha256-h2cB0sFZ5o4VPqQZ8rXio0iNsKTVLHsOJddACYlPyLs=";
+    hash = "sha256-6nLkpzwQEvaX9dlrpK6IKaDSOX6hAks9p4FjpXFTJjI=";
   };
 
   build-system = [
@@ -117,7 +117,12 @@ buildPythonPackage rec {
   meta = {
     description = "Curve and image plotting tools for Python/Qt applications";
     homepage = "https://github.com/PlotPyStack/PlotPy";
-    changelog = "https://github.com/PlotPyStack/PlotPy/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/PlotPyStack/PlotPy/blob/master/doc/release_notes/release_${lib.versions.major version}.${
+      lib.pipe version [
+        lib.versions.minor
+        (lib.fixedWidthString 2 "0")
+      ]
+    }.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ doronbehar ];
   };
diff --git a/pkgs/development/python-modules/plover-stroke/default.nix b/pkgs/development/python-modules/plover-stroke/default.nix
new file mode 100644
index 000000000000..a97dfa33f5bd
--- /dev/null
+++ b/pkgs/development/python-modules/plover-stroke/default.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  pytest-qt,
+  pyside6,
+  versionCheckHook,
+  which,
+}:
+
+buildPythonPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "plover-stroke";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openstenoproject";
+    repo = "plover_stroke";
+    tag = finalAttrs.version;
+    hash = "sha256-A75OMzmEn0VmDAvmQCp6/7uptxzwWJTwsih3kWlYioA=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-qt
+    pyside6
+  ];
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    which
+  ];
+
+  versionCheckProgramArg = "${placeholder "out"}/${python.sitePackages}";
+
+  preInstallCheck = ''
+    versionCheckProgram="$(which ls)"
+  '';
+
+  pythonImportsCheck = [ "plover_stroke" ];
+
+  meta = {
+    description = "Helper class for working with steno strokes";
+    homepage = "https://github.com/openstenoproject/plover_stroke";
+    license = lib.licenses.gpl2Plus; # https://github.com/openstenoproject/plover_stroke/issues/4
+    maintainers = with lib.maintainers; [ pandapip1 ];
+  };
+})
diff --git a/pkgs/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix
new file mode 100644
index 000000000000..bda985cb0122
--- /dev/null
+++ b/pkgs/development/python-modules/plover/4.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  versionCheckHook,
+  appdirs,
+  babel,
+  evdev,
+  mock,
+  pyqt5,
+  pyserial,
+  pytestCheckHook,
+  pytest-qt,
+  plover-stroke,
+  rtf-tokenize,
+  setuptools,
+  wcwidth,
+  wheel,
+  xlib,
+  wrapQtAppsHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "plover";
+  version = "4.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openstenoproject";
+    repo = "plover";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8=";
+  };
+
+  postPatch = ''
+    sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason
+  '';
+
+  build-system = [
+    babel
+    setuptools
+    pyqt5
+    wheel
+  ];
+  dependencies = [
+    appdirs
+    evdev
+    pyqt5
+    pyserial
+    plover-stroke
+    rtf-tokenize
+    setuptools
+    wcwidth
+    xlib
+  ];
+  nativeBuildInputs = [
+    wrapQtAppsHook
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    versionCheckHook
+    pytest-qt
+    mock
+  ];
+
+  # Segfaults?!
+  disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ];
+
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
+  dontWrapQtApps = true;
+
+  pythonImportsCheck = [ "plover" ];
+
+  meta = {
+    description = "OpenSteno Plover stenography software";
+    homepage = "https://www.openstenoproject.org/plover/";
+    mainProgram = "plover";
+    maintainers = with lib.maintainers; [
+      twey
+      kovirobi
+      pandapip1
+      ShamrockLee
+    ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+})
diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix
new file mode 100644
index 000000000000..45899b201b7a
--- /dev/null
+++ b/pkgs/development/python-modules/plover/5.nix
@@ -0,0 +1,128 @@
+{
+  lib,
+  stdenv,
+  buildPackages,
+  buildPythonPackage,
+  fetchFromGitHub,
+  versionCheckHook,
+  appdirs,
+  babel,
+  evdev,
+  mock,
+  packaging,
+  pkginfo,
+  psutil,
+  pygments,
+  pyserial,
+  pyside6,
+  pytestCheckHook,
+  pytest-qt,
+  plover-stroke,
+  readme-renderer,
+  requests-cache,
+  requests-futures,
+  rtf-tokenize,
+  setuptools,
+  wcwidth,
+  wheel,
+  xlib,
+  qtbase,
+  wrapQtAppsHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "plover";
+  version = "5.0.0.dev2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openstenoproject";
+    repo = "plover";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-PZwxVrdQPhgbj+YmWZIUETngeJGs6IQty0hY43tLQO0=";
+  };
+
+  # pythonRelaxDeps seemingly doesn't work here
+  postPatch = ''
+    sed -i 's/,<77//g' pyproject.toml
+    sed -i /PySide6-Essentials/d pyproject.toml
+  '';
+
+  build-system = [
+    babel
+    setuptools
+    pyside6
+    wheel
+
+    # Replacement for missing pyside6-essentials tools,
+    # workaround for https://github.com/NixOS/nixpkgs/issues/277849.
+    # Ideally this would be solved in pyside6 itself but I spent four
+    # hours trying to untangle its build system before giving up. If
+    # anyone wants to spend the time fixing it feel free to request
+    # me (@Pandapip1) as a reviewer.
+    (buildPackages.writeShellScriptBin "pyside6-uic" ''
+      exec ${qtbase}/libexec/uic -g python "$@"
+    '')
+    (buildPackages.writeShellScriptBin "pyside6-rcc" ''
+      exec ${qtbase}/libexec/rcc -g python "$@"
+    '')
+  ];
+  dependencies = [
+    appdirs
+    evdev
+    packaging
+    pkginfo
+    psutil
+    pygments
+    pyserial
+    pyside6
+    plover-stroke
+    qtbase
+    readme-renderer
+    requests-cache
+    requests-futures
+    rtf-tokenize
+    setuptools
+    wcwidth
+    xlib
+  ]
+  ++ readme-renderer.optional-dependencies.md;
+  nativeBuildInputs = [
+    wrapQtAppsHook
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    versionCheckHook
+    pytest-qt
+    mock
+  ];
+
+  # Segfaults?!
+  disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ];
+
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
+  dontWrapQtApps = true;
+
+  pythonImportsCheck = [ "plover" ];
+
+  meta = {
+    description = "OpenSteno Plover stenography software";
+    homepage = "https://www.openstenoproject.org/plover/";
+    mainProgram = "plover";
+    maintainers = with lib.maintainers; [
+      twey
+      kovirobi
+      pandapip1
+      ShamrockLee
+    ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+})
diff --git a/pkgs/development/python-modules/pluginlib/default.nix b/pkgs/development/python-modules/pluginlib/default.nix
index c3e89726e999..1d723ec50068 100644
--- a/pkgs/development/python-modules/pluginlib/default.nix
+++ b/pkgs/development/python-modules/pluginlib/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pluginlib";
-  version = "0.10.0";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Rockhopper-Technologies";
     repo = "pluginlib";
     tag = version;
-    hash = "sha256-mt3VE8iJPCmbws8bAdYMK9to446z8FQtsMZOlkLVUIU=";
+    hash = "sha256-KaexWmRSipwX+tg4Fh03XqhWm2XtZnmy4IEscJDRY/E=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pocket-tts/default.nix b/pkgs/development/python-modules/pocket-tts/default.nix
index 12bdc0787598..47da5a38b838 100644
--- a/pkgs/development/python-modules/pocket-tts/default.nix
+++ b/pkgs/development/python-modules/pocket-tts/default.nix
@@ -25,18 +25,20 @@
 
   # optional-dependencies
   soundfile,
+  torchao,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "pocket-tts";
-  version = "1.1.1";
+  version = "2.0.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "kyutai-labs";
     repo = "pocket-tts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9Y/q/6Ti/oTyOgRzK+UT+LSM/iH3RGey+XojxbPvPS0=";
+    hash = "sha256-NbqL75EOS262L1km89raKXhgQVVOfi5yFP5Y4APH3yw=";
   };
 
   build-system = [
@@ -69,6 +71,9 @@ buildPythonPackage (finalAttrs: {
     audio = [
       soundfile
     ];
+    quantize = [
+      torchao
+    ];
   };
 
   pythonImportsCheck = [ "pocket_tts" ];
diff --git a/pkgs/development/python-modules/pocketsphinx/default.nix b/pkgs/development/python-modules/pocketsphinx/default.nix
index c532ea90bb5b..2d907d7e3e44 100644
--- a/pkgs/development/python-modules/pocketsphinx/default.nix
+++ b/pkgs/development/python-modules/pocketsphinx/default.nix
@@ -44,11 +44,13 @@ buildPythonPackage rec {
     description = "Small speech recognizer";
     homepage = "https://github.com/cmusphinx/pocketsphinx";
     changelog = "https://github.com/cmusphinx/pocketsphinx/blob/v${version}/NEWS";
-    license = with lib.licenses; [
-      bsd2
-      bsd3
-      mit
-    ];
+    license =
+      with lib.licenses;
+      AND [
+        bsd2
+        bsd3
+        mit
+      ];
     maintainers = with lib.maintainers; [ jopejoe1 ];
   };
 }
diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix
index ab013cd8caee..6a7a0319c444 100644
--- a/pkgs/development/python-modules/podman/default.nix
+++ b/pkgs/development/python-modules/podman/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "podman";
-  version = "5.7.0";
+  version = "5.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5GbgqwsFBXE3kXdOpbbcmIEkj5FWNBqyWdq2tZQbvK8=";
+    hash = "sha256-i4eWC1MyBdc+en3W3+4fdeDP79Z2hsk9SIg3PfG0mI0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index cebee5f6a7e6..be7b67a21b50 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "poetry-core";
-  version = "2.3.1";
+  version = "2.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = "poetry-core";
     tag = version;
-    hash = "sha256-gGXAPdFnrS/T7xvw8rpzI/7nW0bXdUiZnPeEwDgtWuQ=";
+    hash = "sha256-Rv6JCHsqu5rRvihGaUFcRk/NUT90bnIUM01QxUUkxh4=";
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix
index c161e1553688..0c5ccd4eb5d5 100644
--- a/pkgs/development/python-modules/pomegranate/default.nix
+++ b/pkgs/development/python-modules/pomegranate/default.nix
@@ -52,11 +52,11 @@ buildPythonPackage rec {
     })
   ];
 
-  pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+  disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
     # AssertionError: Arrays are not almost equal to 6 decimals
-    "--deselect=tests/distributions/test_normal_full.py::test_fit"
-    "--deselect=tests/distributions/test_normal_full.py::test_from_summaries"
-    "--deselect=tests/distributions/test_normal_full.py::test_serialization"
+    "tests/distributions/test_normal_full.py::test_fit"
+    "tests/distributions/test_normal_full.py::test_from_summaries"
+    "tests/distributions/test_normal_full.py::test_serialization"
   ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 59411f42ddaa..a3be2badc72f 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "26.4.0";
+  version = "26.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "pontos";
     tag = "v${version}";
-    hash = "sha256-xAQX2YjYS5aWT/8we8WR/q/IxhpSa+WWdjDScuhvTEw=";
+    hash = "sha256-aqoZHuH9TErkPvlf7xwQ4EA/f7LWwKFbePhuoG2dX+0=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix
index 187c570c645e..5fb49bd83749 100644
--- a/pkgs/development/python-modules/pook/default.nix
+++ b/pkgs/development/python-modules/pook/default.nix
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   meta = {
     description = "HTTP traffic mocking and testing";
     homepage = "https://github.com/h2non/pook";
-    changelog = "https://github.com/h2non/pook/blob/v${src.tag}/History.rst";
+    changelog = "https://github.com/h2non/pook/blob/${src.tag}/History.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/postgrest/default.nix b/pkgs/development/python-modules/postgrest/default.nix
index c43e09d93f3b..8d73316e36dc 100644
--- a/pkgs/development/python-modules/postgrest/default.nix
+++ b/pkgs/development/python-modules/postgrest/default.nix
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   meta = {
     description = "Client library for Supabase Functions";
     homepage = "https://github.com/supabase/supabase-py";
-    changelog = "https://github.com/supabase/supabase-py/blob/v${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/supabase/supabase-py/blob/${src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ macbucheron ];
     license = lib.licenses.mit;
   };
diff --git a/pkgs/development/python-modules/ppf-datamatrix/default.nix b/pkgs/development/python-modules/ppf-datamatrix/default.nix
index 1cc755e11ac3..0ce9d5625a5a 100644
--- a/pkgs/development/python-modules/ppf-datamatrix/default.nix
+++ b/pkgs/development/python-modules/ppf-datamatrix/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://github.com/adrianschlatter/ppf.datamatrix";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ kurogeek ];
-    changelog = "https://github.com/adrianschlatter/ppf.datamatrix/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/adrianschlatter/ppf.datamatrix/releases/tag/${finalAttrs.src.tag}";
   };
 })
diff --git a/pkgs/development/python-modules/precisely/default.nix b/pkgs/development/python-modules/precisely/default.nix
index 0682aa4a1dff..582d173d45a4 100644
--- a/pkgs/development/python-modules/precisely/default.nix
+++ b/pkgs/development/python-modules/precisely/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # Tests are outdated and based on Nose, which is not supported anymore.
   doCheck = false;
 
-  passthru.updateScripts = gitUpdater { };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     description = "Matcher library for Python";
diff --git a/pkgs/development/python-modules/primp/Cargo.lock b/pkgs/development/python-modules/primp/Cargo.lock
index de7423fd9a5e..7ddd4110acf7 100644
--- a/pkgs/development/python-modules/primp/Cargo.lock
+++ b/pkgs/development/python-modules/primp/Cargo.lock
@@ -46,9 +46,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstyle"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anyhow"
@@ -58,20 +58,51 @@ checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "arc-swap"
-version = "1.8.2"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9f3647c145568cec02c42054e07bdf9a5a698e15b466fb2341bfc393cd24aa5"
+checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
 dependencies = [
  "rustversion",
 ]
 
+[[package]]
+name = "argh"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "211818e820cda9ca6f167a64a5c808837366a6dfd807157c64c1304c486cd033"
+dependencies = [
+ "argh_derive",
+ "argh_shared",
+]
+
+[[package]]
+name = "argh_derive"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c442a9d18cef5dde467405d27d461d080d68972d6d0dfd0408265b6749ec427d"
+dependencies = [
+ "argh_shared",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "argh_shared"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ade012bac4db278517a0132c8c10c6427025868dca16c801087c28d5a411f1"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "asn1-rs"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
 dependencies = [
- "asn1-rs-derive",
+ "asn1-rs-derive 0.5.1",
  "asn1-rs-impl",
  "displaydoc",
  "nom",
@@ -81,6 +112,22 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "asn1-rs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60"
+dependencies = [
+ "asn1-rs-derive 0.6.0",
+ "asn1-rs-impl",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror 2.0.18",
+ "time",
+]
+
 [[package]]
 name = "asn1-rs-derive"
 version = "0.5.1"
@@ -93,6 +140,18 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "asn1-rs-derive"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "asn1-rs-impl"
 version = "0.2.0"
@@ -141,9 +200,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.16.1"
+version = "1.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf"
+checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f"
 dependencies = [
  "aws-lc-sys",
  "untrusted 0.7.1",
@@ -152,9 +211,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.38.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e"
+checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7"
 dependencies = [
  "cc",
  "cmake",
@@ -176,9 +235,9 @@ checksum = "7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5"
 
 [[package]]
 name = "bitflags"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 
 [[package]]
 name = "brotli"
@@ -221,9 +280,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.56"
+version = "1.2.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
+checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -231,6 +290,12 @@ dependencies = [
  "shlex",
 ]
 
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -251,7 +316,7 @@ checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -283,18 +348,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.60"
+version = "4.5.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a"
+checksum = "52fa72306bb30daf11bc97773431628e5b4916e97aaa74b7d3f625d4d495da02"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.60"
+version = "4.5.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876"
+checksum = "2071365c5c56eae7d77414029dde2f4f4ba151cf68d5a3261c9a40de428ace93"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -302,19 +367,29 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
+checksum = "0e78417baa3b3114dc0e95e7357389a249c4da97c3c2b540700079db6171bfd7"
 
 [[package]]
 name = "cmake"
-version = "0.1.57"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
+checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
 dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
 [[package]]
 name = "compression-codecs"
 version = "0.4.37"
@@ -348,9 +423,9 @@ dependencies = [
 
 [[package]]
 name = "cookie_store"
-version = "0.22.1"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b2c103cf610ec6cae3da84a766285b42fd16aad564758459e6ecf128c75206"
+checksum = "3fc4bff745c9b4c7fb1e97b25d13153da2bc7796260141df62378998d070207f"
 dependencies = [
  "cookie",
  "document-features",
@@ -499,7 +574,21 @@ version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
 dependencies = [
- "asn1-rs",
+ "asn1-rs 0.6.2",
+ "displaydoc",
+ "nom",
+ "num-bigint",
+ "num-traits",
+ "rusticata-macros",
+]
+
+[[package]]
+name = "der-parser"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6"
+dependencies = [
+ "asn1-rs 0.7.1",
  "displaydoc",
  "nom",
  "num-bigint",
@@ -509,9 +598,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.5.8"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 dependencies = [
  "powerfmt",
 ]
@@ -606,9 +695,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "find-msvc-tools"
@@ -798,36 +887,11 @@ dependencies = [
  "cfg-if",
  "libc",
  "r-efi 6.0.0",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
  "wasip2",
  "wasip3",
 ]
 
-[[package]]
-name = "h2"
-version = "0.4.13"
-dependencies = [
- "atomic-waker",
- "bytes",
- "env_logger",
- "fnv",
- "futures-core",
- "futures-sink",
- "hex",
- "http",
- "indexmap",
- "quickcheck",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "slab",
- "smallvec",
- "tokio",
- "tokio-util",
- "tracing",
- "walkdir",
-]
-
 [[package]]
 name = "h3"
 version = "0.0.8"
@@ -921,7 +985,7 @@ dependencies = [
  "idna",
  "ipnet",
  "once_cell",
- "rand 0.9.2",
+ "rand 0.9.4",
  "ring",
  "thiserror 2.0.18",
  "tinyvec",
@@ -943,7 +1007,7 @@ dependencies = [
  "moka",
  "once_cell",
  "parking_lot",
- "rand 0.9.2",
+ "rand 0.9.4",
  "resolv-conf",
  "smallvec",
  "thiserror 2.0.18",
@@ -1026,53 +1090,19 @@ checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
 
 [[package]]
 name = "hyper"
-version = "1.8.1"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
 dependencies = [
- "atomic-waker",
  "bytes",
- "form_urlencoded",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
  "http",
  "http-body",
- "http-body-util",
- "httparse",
- "httpdate",
- "itoa",
  "pin-project-lite",
- "pin-utils",
- "pretty_env_logger",
- "serde",
- "serde_json",
  "smallvec",
- "spmc",
  "tokio",
- "tokio-test",
- "tokio-util",
- "tracing",
  "want",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.27.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
-dependencies = [
- "http",
- "hyper",
- "hyper-util",
- "log",
- "rustls",
- "rustls-native-certs",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
-]
-
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -1092,31 +1122,21 @@ dependencies = [
 [[package]]
 name = "hyper-util"
 version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
 dependencies = [
- "base64",
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
  "http",
  "http-body",
- "http-body-util",
  "hyper",
- "ipnet",
  "libc",
- "percent-encoding",
  "pin-project-lite",
- "pnet_datalink",
- "pretty_env_logger",
- "socket2 0.6.2",
- "system-configuration",
+ "socket2",
  "tokio",
- "tokio-test",
- "tower-layer",
  "tower-service",
- "tower-test",
  "tracing",
- "windows-registry",
 ]
 
 [[package]]
@@ -1229,9 +1249,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.13.0"
+version = "2.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
 dependencies = [
  "equivalent",
  "hashbrown 0.16.1",
@@ -1241,23 +1261,24 @@ dependencies = [
 
 [[package]]
 name = "inventory"
-version = "0.3.22"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "009ae045c87e7082cb72dab0ccd01ae075dd00141ddc108f43a0ea150a9e7227"
+checksum = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b"
 dependencies = [
  "rustversion",
 ]
 
 [[package]]
 name = "ipconfig"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222"
 dependencies = [
- "socket2 0.5.10",
+ "socket2",
  "widestring",
- "windows-sys 0.48.0",
- "winreg",
+ "windows-registry",
+ "windows-result",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1277,9 +1298,9 @@ dependencies = [
 
 [[package]]
 name = "iri-string"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
+checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20"
 dependencies = [
  "memchr",
  "serde",
@@ -1307,9 +1328,53 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys 0.3.1",
+ "log",
+ "thiserror 1.0.69",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "jobserver"
@@ -1323,10 +1388,12 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.91"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca"
 dependencies = [
+ "cfg-if",
+ "futures-util",
  "once_cell",
  "wasm-bindgen",
 ]
@@ -1345,9 +1412,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.182"
+version = "0.2.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
+checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
 
 [[package]]
 name = "libm"
@@ -1363,9 +1430,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
 
 [[package]]
 name = "litrs"
@@ -1471,9 +1538,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
 dependencies = [
  "libc",
  "wasi",
@@ -1482,9 +1549,9 @@ dependencies = [
 
 [[package]]
 name = "moka"
-version = "0.12.14"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85f8024e1c8e71c778968af91d43700ce1d11b219d127d79fb2934153b82b42b"
+checksum = "957228ad12042ee839f93c8f257b62b4c0ab5eaae1d4fa60de53b27c9d7c5046"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-epoch",
@@ -1557,9 +1624,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.2.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
 [[package]]
 name = "num-integer"
@@ -1596,14 +1663,23 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9"
 dependencies = [
- "asn1-rs",
+ "asn1-rs 0.6.2",
+]
+
+[[package]]
+name = "oid-registry"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7"
+dependencies = [
+ "asn1-rs 0.7.1",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 dependencies = [
  "critical-section",
  "portable-atomic",
@@ -1617,9 +1693,9 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "openssl"
-version = "0.10.75"
+version = "0.10.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
+checksum = "f38c4372413cdaaf3cc79dd92d29d7d9f5ab09b51b10dded508fb90bb70b9222"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1649,18 +1725,18 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-src"
-version = "300.5.5+3.5.5"
+version = "300.6.0+3.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f1787d533e03597a7934fd0a765f0d28e94ecc5fb7789f8053b1e699a56f709"
+checksum = "a8e8cbfd3a4a8c8f089147fd7aaa33cf8c7450c4d09f8f80698a0cf093abeff4"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.111"
+version = "0.9.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
+checksum = "13ce1245cd07fcc4cfdb438f7507b0c7e4f3849a69fd84d52374c66d83741bb6"
 dependencies = [
  "cc",
  "libc",
@@ -1787,9 +1863,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
 name = "plotters"
@@ -1859,9 +1935,9 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "potential_utf"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
 dependencies = [
  "zerovec",
 ]
@@ -1909,40 +1985,147 @@ dependencies = [
 
 [[package]]
 name = "primp"
-version = "1.2.2"
+version = "1.2.3"
 dependencies = [
  "criterion",
- "h2",
  "http",
- "rand 0.10.0",
- "reqwest",
- "rustls",
+ "primp-h2",
+ "primp-reqwest",
+ "primp-rustls",
+ "rand 0.10.1",
  "serde",
  "serde_json",
  "tokio",
  "url",
 ]
 
+[[package]]
+name = "primp-h2"
+version = "0.4.13"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "env_logger",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "hex",
+ "http",
+ "indexmap",
+ "quickcheck",
+ "rand 0.8.6",
+ "serde",
+ "serde_json",
+ "slab",
+ "smallvec",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "walkdir",
+]
+
+[[package]]
+name = "primp-hyper"
+version = "1.8.1"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "form_urlencoded",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "pin-utils",
+ "pretty_env_logger",
+ "primp-h2",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "spmc",
+ "tokio",
+ "tokio-test",
+ "tokio-util",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "primp-hyper-rustls"
+version = "0.27.7"
+dependencies = [
+ "cfg-if",
+ "http",
+ "http-body-util",
+ "log",
+ "primp-hyper",
+ "primp-hyper-util",
+ "primp-rustls",
+ "primp-tokio-rustls",
+ "rustls-native-certs",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "tokio",
+ "tower-service",
+ "webpki-roots",
+]
+
+[[package]]
+name = "primp-hyper-util"
+version = "0.1.20"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "ipnet",
+ "libc",
+ "percent-encoding",
+ "pin-project-lite",
+ "pnet_datalink",
+ "pretty_env_logger",
+ "primp-hyper",
+ "socket2",
+ "system-configuration",
+ "tokio",
+ "tokio-test",
+ "tower-layer",
+ "tower-service",
+ "tower-test",
+ "tracing",
+ "windows-registry",
+]
+
 [[package]]
 name = "primp-python"
-version = "1.2.2"
+version = "1.2.3"
 dependencies = [
  "anyhow",
  "bytes",
  "encoding_rs",
  "foldhash 0.2.0",
- "h2",
  "html2text",
  "http",
  "indexmap",
  "mime",
  "once_cell",
  "primp",
+ "primp-h2",
  "pyo3",
  "pyo3-async-runtimes",
  "pyo3-log",
  "pythonize",
- "rand 0.10.0",
+ "rand 0.10.1",
  "serde_json",
  "tokio",
  "tokio-util",
@@ -1952,6 +2135,114 @@ dependencies = [
  "webpki-root-certs",
 ]
 
+[[package]]
+name = "primp-reqwest"
+version = "0.13.2"
+dependencies = [
+ "base64",
+ "brotli",
+ "bytes",
+ "cookie",
+ "cookie_store",
+ "doc-comment",
+ "encoding_rs",
+ "env_logger",
+ "flate2",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h3",
+ "h3-quinn",
+ "hickory-resolver",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper-tls",
+ "js-sys",
+ "libc",
+ "log",
+ "mime",
+ "mime_guess",
+ "native-tls",
+ "num_cpus",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "primp-h2",
+ "primp-hyper",
+ "primp-hyper-rustls",
+ "primp-hyper-util",
+ "primp-rustls",
+ "primp-tokio-rustls",
+ "quinn",
+ "rustls-native-certs",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-util",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-bindgen-test",
+ "wasm-streams",
+ "web-sys",
+ "webpki-roots",
+ "zstd",
+]
+
+[[package]]
+name = "primp-rustls"
+version = "0.23.38"
+dependencies = [
+ "aws-lc-rs",
+ "base64",
+ "bencher",
+ "brotli",
+ "brotli-decompressor",
+ "env_logger",
+ "hashbrown 0.16.1",
+ "hex",
+ "log",
+ "macro_rules_attribute",
+ "num-bigint",
+ "once_cell",
+ "rcgen 0.13.2",
+ "ring",
+ "rustls-pki-types",
+ "rustls-test",
+ "rustls-webpki",
+ "rustversion",
+ "serde",
+ "serde_json",
+ "subtle",
+ "time",
+ "webpki-roots",
+ "x509-parser 0.16.0",
+ "zeroize",
+ "zlib-rs",
+ "zstd",
+]
+
+[[package]]
+name = "primp-tokio-rustls"
+version = "0.26.4"
+dependencies = [
+ "argh",
+ "futures-util",
+ "lazy_static",
+ "primp-rustls",
+ "rcgen 0.14.7",
+ "tokio",
+ "webpki-roots",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.106"
@@ -1979,9 +2270,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.28.2"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf85e27e86080aafd5a22eae58a162e133a589551542b3e5cee4beb27e54f8e1"
+checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -2010,18 +2301,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.28.2"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf94ee265674bf76c09fa430b0e99c26e319c945d96ca0d5a8215f31bf81cf7"
+checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.28.2"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "491aa5fc66d8059dd44a75f4580a2962c1862a1c2945359db36f6c2818b748dc"
+checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -2040,9 +2331,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.28.2"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d671734e9d7a43449f8480f8b38115df67bef8d21f76837fa75ee7aaa5e52e"
+checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -2052,9 +2343,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.28.2"
+version = "0.28.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22faaa1ce6c430a1f71658760497291065e6450d7b5dc2bcf254d49f66ee700a"
+checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -2075,11 +2366,11 @@ dependencies = [
 
 [[package]]
 name = "quickcheck"
-version = "1.1.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95c589f335db0f6aaa168a7cd27b1fc6920f5e1470c804f814d9cd6e62a0f70b"
+checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
- "rand 0.10.0",
+ "rand 0.8.6",
 ]
 
 [[package]]
@@ -2096,7 +2387,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "socket2 0.6.2",
+ "socket2",
  "thiserror 2.0.18",
  "tokio",
  "tracing",
@@ -2105,15 +2396,15 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.13"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
+checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
 dependencies = [
  "aws-lc-rs",
  "bytes",
  "getrandom 0.3.4",
  "lru-slab",
- "rand 0.9.2",
+ "rand 0.9.4",
  "ring",
  "rustc-hash",
  "rustls",
@@ -2134,7 +2425,7 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.6.2",
+ "socket2",
  "tracing",
  "windows-sys 0.60.2",
 ]
@@ -2162,9 +2453,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -2173,9 +2464,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.5",
@@ -2183,13 +2474,13 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
 dependencies = [
  "chacha20",
  "getrandom 0.4.2",
- "rand_core 0.10.0",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -2232,15 +2523,15 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
 [[package]]
 name = "rayon"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -2269,6 +2560,20 @@ dependencies = [
  "yasna",
 ]
 
+[[package]]
+name = "rcgen"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10b99e0098aa4082912d4c649628623db6aba77335e4f4569ff5083a6448b32e"
+dependencies = [
+ "pem",
+ "ring",
+ "rustls-pki-types",
+ "time",
+ "x509-parser 0.18.1",
+ "yasna",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -2307,68 +2612,6 @@ version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
-[[package]]
-name = "reqwest"
-version = "0.13.2"
-dependencies = [
- "base64",
- "brotli",
- "bytes",
- "cookie",
- "cookie_store",
- "doc-comment",
- "encoding_rs",
- "env_logger",
- "flate2",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "h3",
- "h3-quinn",
- "hickory-resolver",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
- "hyper-util",
- "js-sys",
- "libc",
- "log",
- "mime",
- "mime_guess",
- "native-tls",
- "num_cpus",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "quinn",
- "rustls",
- "rustls-native-certs",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tokio-native-tls",
- "tokio-rustls",
- "tokio-util",
- "tower",
- "tower-http",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test",
- "wasm-streams",
- "web-sys",
- "webpki-roots",
- "zstd",
-]
-
 [[package]]
 name = "resolv-conf"
 version = "0.7.6"
@@ -2391,9 +2634,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
 
 [[package]]
 name = "rusticata-macros"
@@ -2419,35 +2662,16 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.37"
+version = "0.23.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21"
 dependencies = [
  "aws-lc-rs",
- "base64",
- "bencher",
- "brotli",
- "brotli-decompressor",
- "env_logger",
- "hashbrown 0.16.1",
- "hex",
- "log",
- "macro_rules_attribute",
- "num-bigint",
  "once_cell",
- "rcgen",
- "ring",
  "rustls-pki-types",
- "rustls-test",
  "rustls-webpki",
- "rustversion",
- "serde",
- "serde_json",
  "subtle",
- "time",
- "webpki-roots",
- "x509-parser",
  "zeroize",
- "zlib-rs",
- "zstd",
 ]
 
 [[package]]
@@ -2462,6 +2686,15 @@ dependencies = [
  "security-framework",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "rustls-pki-types"
 version = "1.14.0"
@@ -2472,18 +2705,45 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
+
 [[package]]
 name = "rustls-test"
 version = "0.1.0"
 dependencies = [
- "rustls",
+ "primp-rustls",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.9"
+version = "0.103.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
+checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -2514,9 +2774,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
 dependencies = [
  "windows-sys 0.61.2",
 ]
@@ -2529,9 +2789,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "security-framework"
-version = "3.7.0"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
+checksum = "d17b898a6d6948c3a8ee4372c17cb384f90d2e6e912ef00895b14fd7ab54ec38"
 dependencies = [
  "bitflags",
  "core-foundation 0.10.1",
@@ -2552,9 +2812,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 
 [[package]]
 name = "serde"
@@ -2629,9 +2889,9 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
 
 [[package]]
 name = "siphasher"
@@ -2653,22 +2913,12 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.5.10"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "socket2"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
-dependencies = [
- "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2779,9 +3029,9 @@ checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
 [[package]]
 name = "tempfile"
-version = "3.26.0"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
  "getrandom 0.3.4",
@@ -2851,9 +3101,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.47"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
+checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd"
 dependencies = [
  "deranged",
  "itoa",
@@ -2866,15 +3116,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.27"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
+checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2882,9 +3132,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -2902,9 +3152,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2917,9 +3167,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.50.0"
+version = "1.52.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
+checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6"
 dependencies = [
  "bytes",
  "libc",
@@ -2927,16 +3177,16 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.6.2",
+ "socket2",
  "tokio-macros",
  "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.6.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2953,16 +3203,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-rustls"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
-dependencies = [
- "rustls",
- "tokio",
-]
-
 [[package]]
 name = "tokio-stream"
 version = "0.1.18"
@@ -3184,11 +3424,11 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "uuid"
-version = "1.21.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b672338555252d43fd2240c714dc444b8c6fb0a5c5335e65a07bba7742735ddb"
+checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
 dependencies = [
- "getrandom 0.4.2",
+ "getrandom 0.3.4",
  "js-sys",
  "wasm-bindgen",
 ]
@@ -3232,11 +3472,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.46.0",
 ]
 
 [[package]]
@@ -3245,14 +3485,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.51.0",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.114"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3265,23 +3505,19 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.64"
+version = "0.4.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
+checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8"
 dependencies = [
- "cfg-if",
- "futures-util",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.114"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3289,9 +3525,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.114"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -3302,18 +3538,18 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.114"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.64"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6311c867385cc7d5602463b31825d454d0837a3aba7cdb5e56d5201792a3f7fe"
+checksum = "6bb55e2540ad1c56eec35fd63e2aea15f83b11ce487fd2de9ad11578dfc047ea"
 dependencies = [
  "async-trait",
  "cast",
@@ -3333,9 +3569,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.64"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67008cdde4769831958536b0f11b3bdd0380bde882be17fff9c2f34bb4549abd"
+checksum = "caf0ca1bd612b988616bac1ab34c4e4290ef18f7148a1d8b7f31c150080e9295"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3344,9 +3580,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-shared"
-version = "0.2.114"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe29135b180b72b04c74aa97b2b4a2ef275161eff9a6c7955ea9eaedc7e1d4e"
+checksum = "23cda5ecc67248c48d3e705d3e03e00af905769b78b9d2a1678b663b8b9d4472"
 
 [[package]]
 name = "wasm-encoder"
@@ -3397,9 +3633,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.91"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
+checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3417,9 +3653,9 @@ dependencies = [
 
 [[package]]
 name = "web_atoms"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a9779e9f04d2ac1ce317aee707aa2f6b773afba7b931222bff6983843b1576"
+checksum = "d7cff6eef815df1834fd250e3a2ff436044d82a9f1bc1980ca1dbdf07effc538"
 dependencies = [
  "phf",
  "phf_codegen",
@@ -3429,18 +3665,18 @@ dependencies = [
 
 [[package]]
 name = "webpki-root-certs"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca"
+checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c"
 dependencies = [
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed"
+checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -3519,11 +3755,11 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows-targets 0.48.5",
+ "windows-targets 0.42.2",
 ]
 
 [[package]]
@@ -3555,17 +3791,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
 ]
 
 [[package]]
@@ -3603,9 +3839,9 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
@@ -3621,9 +3857,9 @@ checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3639,9 +3875,9 @@ checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -3669,9 +3905,9 @@ checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -3687,9 +3923,9 @@ checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -3705,9 +3941,9 @@ checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -3723,9 +3959,9 @@ checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -3740,14 +3976,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
-name = "winreg"
-version = "0.50.0"
+name = "wit-bindgen"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "wit-bindgen"
@@ -3839,9 +4071,9 @@ dependencies = [
 
 [[package]]
 name = "writeable"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "x509-parser"
@@ -3849,17 +4081,35 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
 dependencies = [
- "asn1-rs",
+ "asn1-rs 0.6.2",
  "data-encoding",
- "der-parser",
+ "der-parser 9.0.0",
  "lazy_static",
  "nom",
- "oid-registry",
+ "oid-registry 0.7.1",
  "rusticata-macros",
  "thiserror 1.0.69",
  "time",
 ]
 
+[[package]]
+name = "x509-parser"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d43b0f71ce057da06bc0851b23ee24f3f86190b07203dd8f567d0b706a185202"
+dependencies = [
+ "asn1-rs 0.7.1",
+ "data-encoding",
+ "der-parser 10.0.0",
+ "lazy_static",
+ "nom",
+ "oid-registry 0.8.1",
+ "ring",
+ "rusticata-macros",
+ "thiserror 2.0.18",
+ "time",
+]
+
 [[package]]
 name = "yasna"
 version = "0.5.2"
@@ -3871,9 +4121,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
@@ -3882,9 +4132,9 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3894,18 +4144,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.40"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a789c6e490b576db9f7e6b6d661bcc9799f7c0ac8352f56ea20193b2681532e5"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.40"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f65c489a7071a749c849713807783f70672b28094011623e200cb86dcb835953"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3914,18 +4164,18 @@ dependencies = [
 
 [[package]]
 name = "zerofrom"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3955,9 +4205,9 @@ dependencies = [
 
 [[package]]
 name = "zerotrie"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -3966,9 +4216,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -3977,9 +4227,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix
index 414450b6acbf..d5fc8ca591fc 100644
--- a/pkgs/development/python-modules/primp/default.nix
+++ b/pkgs/development/python-modules/primp/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "primp";
-  version = "1.2.2";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deedy5";
     repo = "primp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AOMlf7Qo9CJFyEUXdtQuwnFQVBzejHTc6UHie/OlHOo=";
+    hash = "sha256-W5wjsuehTIdrImBVkmcEptiEE0CtlHJZ0kAbP3f3TTg=";
   };
 
   # The Cargo.lock is not pushed upstream
@@ -43,6 +43,13 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
     pytest-asyncio
   ];
+  # pytest runs from the source root but asyncio_mode=auto is configured in
+  # crates/primp-python/pyproject.toml, which pytest doesn't pick up from there
+  pytestFlagsArray = [
+    "-o"
+    "asyncio_mode=auto"
+  ];
+
   disabledTestPaths = [
     "crates/primp-python/tests/test_impersonate.py"
     "crates/primp-python/tests/test_header_order.py"
diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix
index 8e75cc25c487..f1c90aaa9b8c 100644
--- a/pkgs/development/python-modules/prometheus-async/default.nix
+++ b/pkgs/development/python-modules/prometheus-async/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "prometheus-async";
-  version = "25.1.0";
+  version = "26.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "prometheus-async";
     rev = version;
-    hash = "sha256-e/BVxATpafxddq26Rt7XTiK4ajY+saUApXbmTG0/I6I=";
+    hash = "sha256-wQ1RdJyD/M6VO1/6DSr9Pzd5FpB4zgNE/mIa7FH5gtk=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/protobuf/5.nix b/pkgs/development/python-modules/protobuf/5.nix
index 05f9ba66f81a..5e44c82d463f 100644
--- a/pkgs/development/python-modules/protobuf/5.nix
+++ b/pkgs/development/python-modules/protobuf/5.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://developers.google.com/protocol-buffers/";
     changelog = "https://github.com/protocolbuffers/protobuf/releases/v${version}";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ SuperSandro2000 ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix
index 1d05e4ad3346..6c96954b0df7 100644
--- a/pkgs/development/python-modules/protobuf/6.nix
+++ b/pkgs/development/python-modules/protobuf/6.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "protobuf";
-  version = "6.33.5";
+  version = "6.33.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-bdysKggfi3uWQsCUBrxqQpASj85fRxzd0WWWC7kRnlw=";
+    hash = "sha256-pnaNJSSDEsKXVYr5ap+ckp6MTO4GWcsH54BzEJXzgTU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/protobuf/7.nix b/pkgs/development/python-modules/protobuf/7.nix
index 627c67844622..2ca17523a3e6 100644
--- a/pkgs/development/python-modules/protobuf/7.nix
+++ b/pkgs/development/python-modules/protobuf/7.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "protobuf";
-  version = "7.34.0";
+  version = "7.34.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-OHGj32fHEKr3u40hTMmXNC5jzuvZQMjH/GXJs9aXWRo=";
+    hash = "sha256-nOQiRecEzFAnvnl8HbHrkxhNRNHN1xgR+y2bJa1UEoA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
index 67a4266df83d..cfc137558050 100644
--- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix
+++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "proton-vpn-api-core";
-  version = "4.19.1";
+  version = "5.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ProtonVPN";
     repo = "python-proton-vpn-api-core";
     rev = "v${version}";
-    hash = "sha256-PD/UQ+BoDO6firhlBJDRNrtiHgnp+4uIb8j+egXqxPA=";
+    hash = "sha256-XdQLgHKNqBNwY51niSiE1HHxLJ3efipS03IUiyHQCiY=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index e78a124b749f..d1ab8e98969c 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "7.2.1";
+  version = "7.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "giampaolo";
     repo = "psutil";
     tag = "release-${version}";
-    hash = "sha256-HGIFf7E356o0OcgLOPjACmrPXneQt/8IhzyudKKuLdg=";
+    hash = "sha256-plBv24QgNzmVMV2lFxCbNwHKtd620thJayWdjs4estw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index adf1609f25d4..0fbdd5c1ed00 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "publicsuffixlist";
-  version = "1.0.2.20260417";
+  version = "1.0.2.20260501";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-NiVaU/Oj/qNDbOicG3AUZVVOVFPL9/Vnbp6kyUJ6pyg=";
+    hash = "sha256-NyDmKQtUv8Dd0xdpiAn+1CnXphRWZVoaaydGxUmk7mE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix
index 657b8dce7c2a..21e5bb6928a8 100644
--- a/pkgs/development/python-modules/pubnub/default.nix
+++ b/pkgs/development/python-modules/pubnub/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pubnub";
-  version = "10.6.2";
+  version = "10.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pubnub";
     repo = "python";
     tag = finalAttrs.version;
-    hash = "sha256-YEcxDFO3UK7U17YgIENoxYN/hxqFw58cA2Dg4WJCOvU=";
+    hash = "sha256-gfbHYNP9qOq4FRr+YLwaAOg7XHhcDTanpotp9JMOpfA=";
   };
 
   pythonRelaxDeps = [ "httpx" ];
diff --git a/pkgs/development/python-modules/py-netgear-plus/default.nix b/pkgs/development/python-modules/py-netgear-plus/default.nix
index 267103195b08..018029c2adb8 100644
--- a/pkgs/development/python-modules/py-netgear-plus/default.nix
+++ b/pkgs/development/python-modules/py-netgear-plus/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "py-netgear-plus";
-  version = "0.6.1";
+  version = "0.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "foxey";
     repo = "py-netgear-plus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WXNhKpOoOYRwB1OYLFxVXy230MzG4vAZYZ0YUp5W/R8=";
+    hash = "sha256-hnaUvf4r279JKzIJVyZqf8Iypsi5FOEjwJir4/E+5Xs=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix
index f67b8bfc7c02..4d48cc1435c9 100644
--- a/pkgs/development/python-modules/py-opensonic/default.nix
+++ b/pkgs/development/python-modules/py-opensonic/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "py-opensonic";
-  version = "8.1.3";
+  version = "9.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "khers";
     repo = "py-opensonic";
     tag = "v${version}";
-    hash = "sha256-p8vcH0rL2ebFzZCouIEJ1EZCJaxpjQeOUtQug3B88T8=";
+    hash = "sha256-CkOAqeB9p6K3qFf7q/McyTpKte8w4sKo3fuBk6sx6ZE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/py-radix/default.nix b/pkgs/development/python-modules/py-radix/default.nix
new file mode 100644
index 000000000000..38b985db4ce2
--- /dev/null
+++ b/pkgs/development/python-modules/py-radix/default.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "py-radix";
+  version = "1.1.0";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "mjschultz";
+    repo = "py-radix";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-++QuZEwOHKjOsIbwLmDy30PvyG0Xe29l45PvOF+YWYw=";
+  };
+
+  pythonImportsCheck = [ "radix" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Python radix tree implementation for IPv4 and IPv6 prefix matching";
+    homepage = "https://github.com/mjschultz/py-radix";
+    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ marcel ];
+  };
+})
diff --git a/pkgs/development/python-modules/py-unifi-access/default.nix b/pkgs/development/python-modules/py-unifi-access/default.nix
index d31c917b2838..abc4ab782b97 100644
--- a/pkgs/development/python-modules/py-unifi-access/default.nix
+++ b/pkgs/development/python-modules/py-unifi-access/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "py-unifi-access";
-  version = "1.1.5";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "imhotep";
     repo = "py-unifi-access";
     tag = finalAttrs.version;
-    hash = "sha256-TGAZpvqX5H+kaSJb3rraDfXnekPGCMb092NF2ilNdHM=";
+    hash = "sha256-UxnW37JqUugdMix9MM5coHZvN9iTCmI53o7LfLL6t6M=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/py2vega/default.nix b/pkgs/development/python-modules/py2vega/default.nix
index a4160ef62934..9ddea06e9254 100644
--- a/pkgs/development/python-modules/py2vega/default.nix
+++ b/pkgs/development/python-modules/py2vega/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "py2vega";
-  version = "0.6.1";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "QuantStack";
     repo = "py2vega";
     tag = version;
-    hash = "sha256-M6vrObEj4cB53nvEi1oQdVWABlqGwG3xc2unY44Yhuc=";
+    hash = "sha256-GU4mSOHsU/DPBdKFau6pOYQpaojXOfQIXrSG3skWr/I=";
   };
 
   pythonRelaxDeps = [ "gast" ];
diff --git a/pkgs/development/python-modules/pyads/default.nix b/pkgs/development/python-modules/pyads/default.nix
index 77b659a07b34..6b1e06cf6669 100644
--- a/pkgs/development/python-modules/pyads/default.nix
+++ b/pkgs/development/python-modules/pyads/default.nix
@@ -4,6 +4,7 @@
   adslib,
   buildPythonPackage,
   fetchFromGitHub,
+  nix-update-script,
   pytestCheckHook,
   setuptools,
 }:
@@ -45,6 +46,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pyads" ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^(\\d+\\.\\d+\\.\\d+)$"
+    ];
+  };
+
   meta = {
     description = "Python wrapper for TwinCAT ADS library";
     homepage = "https://github.com/MrLeeh/pyads";
diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix
index c1b2c92fdeda..b4978fed4699 100644
--- a/pkgs/development/python-modules/pyahocorasick/default.nix
+++ b/pkgs/development/python-modules/pyahocorasick/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyahocorasick";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "WojciechMula";
     repo = "pyahocorasick";
     tag = "v${version}";
-    hash = "sha256-ysQZOyJZ9xrNp3plVpaDtGqzjNuRDAELtAcjbC8Byis=";
+    hash = "sha256-lExpRJlRoYS45Bw9FQwa7GKELBljKA83ZhXg7e5vPwM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index cef051f8f92e..1df2db016dc4 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "pyathena";
-  version = "3.25.0";
+  version = "3.30.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-YOc1YTRUZxNT+Iqa2vZH8QwdwQ2mdJGaDVmTOSsFt6s=";
+    hash = "sha256-AS2s9OUgXc5wW73HCogCWorq3BFLydLQrE/LEir6BFc=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyaxencoapi/default.nix b/pkgs/development/python-modules/pyaxencoapi/default.nix
index 9053e8b558e4..eca876818da2 100644
--- a/pkgs/development/python-modules/pyaxencoapi/default.nix
+++ b/pkgs/development/python-modules/pyaxencoapi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyaxencoapi";
-  version = "1.0.7";
+  version = "1.0.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AXENCO-FR";
     repo = "ha-py-axenco-api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ml58+kstIpqQUXDt/jpZeR8ueu5U3nnH7hiUcZxveAM=";
+    hash = "sha256-rqjDI8e3ZeZHsEk0EBaKlEl3w9blinlc2MsTCAKk85o=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix
index c4505f01ea50..484718723806 100644
--- a/pkgs/development/python-modules/pybind11/default.nix
+++ b/pkgs/development/python-modules/pybind11/default.nix
@@ -6,7 +6,6 @@
   cmake,
   ninja,
   scikit-build-core,
-  pybind11,
   boost,
   eigen,
   python,
@@ -29,22 +28,22 @@ let
     };
   } ./setup-hook.sh;
 in
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pybind11";
-  version = "3.0.1";
+  version = "3.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11";
-    tag = "v${version}";
-    hash = "sha256-ZiwNGsE1FOkhnWv/1ib1akhQ4FZvrXRCDnnBZoPp6r4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-q609c2Q1n37OJ9fK0uDcniQZPO2PL+fnWdArV56qR64=";
   };
 
   build-system = [
     cmake
     ninja
-    pybind11.passthru.scikit-build-core-no-tests
+    finalAttrs.passthru.scikit-build-core-no-tests
   ];
 
   buildInputs = lib.optionals buildTests [
@@ -105,7 +104,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://github.com/pybind/pybind11";
-    changelog = "https://github.com/pybind/pybind11/blob/${src.rev}/docs/changelog.rst";
+    changelog = "https://github.com/pybind/pybind11/blob/${finalAttrs.src.tag}/docs/changelog.md";
     description = "Seamless operability between C++11 and Python";
     mainProgram = "pybind11-config";
     longDescription = ''
@@ -119,4 +118,4 @@ buildPythonPackage rec {
       dotlambda
     ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index ea83e9dead9d..ee577817e98a 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pycaption";
-  version = "2.2.20";
+  version = "2.2.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pbs";
     repo = "pycaption";
     tag = version;
-    hash = "sha256-SDUTQ2oYLstFHw0rO9I3jeKIfEoAU7we66Uj4+vTXyE=";
+    hash = "sha256-kcxsbxqupXzW1VIxIxEjorp4m936d93iAtyfCei30Lg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pycycling/default.nix b/pkgs/development/python-modules/pycycling/default.nix
index 706975af95ea..027753f69a50 100644
--- a/pkgs/development/python-modules/pycycling/default.nix
+++ b/pkgs/development/python-modules/pycycling/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = {
     description = "Package for interacting with Bluetooth Low Energy (BLE) compatible bike trainers, power meters, radars and heart rate monitors";
     homepage = "https://github.com/zacharyedwardbull/pycycling";
-    changelog = "https://github.com/zacharyedwardbull/pycycling/releases/tag/${version}";
+    changelog = "https://github.com/zacharyedwardbull/pycycling/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ viraptor ];
   };
diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
index 1eeddfc39a13..acbd447db5cd 100644
--- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix
+++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-ai-slim";
-  version = "1.84.1";
+  version = "1.88.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LMfRGmLr51DzgJO97I/mJvyrVYD9tsF9OkCfw0ABWfw=";
+    hash = "sha256-2DyPJNbGFkbgYd2qLqhlTkmsgpLcTkkq3+7JKMocnBk=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";
diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix
index 66d55f15247b..82ccbaf2a39c 100644
--- a/pkgs/development/python-modules/pydantic-graph/default.nix
+++ b/pkgs/development/python-modules/pydantic-graph/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-graph";
-  version = "1.84.1";
+  version = "1.88.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "pydantic-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LMfRGmLr51DzgJO97I/mJvyrVYD9tsF9OkCfw0ABWfw=";
+    hash = "sha256-2DyPJNbGFkbgYd2qLqhlTkmsgpLcTkkq3+7JKMocnBk=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pydantic_graph";
diff --git a/pkgs/development/python-modules/pydantic-monty/default.nix b/pkgs/development/python-modules/pydantic-monty/default.nix
index 35bbba47ee76..e4fc0a102225 100644
--- a/pkgs/development/python-modules/pydantic-monty/default.nix
+++ b/pkgs/development/python-modules/pydantic-monty/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydantic-monty";
-  version = "0.0.13";
+  version = "0.0.17";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -24,12 +24,12 @@ buildPythonPackage (finalAttrs: {
     owner = "pydantic";
     repo = "monty";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0g0/NuwTuUfHVHE8YcVjUeZpSa+ANPWIXllu+qRXjZE=";
+    hash = "sha256-f+WcznnOMSc0ahgfvgVec4U0nH9j022NLnWQLdISv3M=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname src version;
-    hash = "sha256-LkTEMhz0MG6RfqejOQMdB2BZU6oxT3ZAo/N0oVlswsQ=";
+    hash = "sha256-y+vi7kZPavBNnIeLpAoKO2YcBTq2d9yeDl+eoRJV1Tk=";
   };
 
   dependencies = [ typing-extensions ];
diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix
index fb962113ee73..e6d61b347e5d 100644
--- a/pkgs/development/python-modules/pydeps/default.nix
+++ b/pkgs/development/python-modules/pydeps/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydeps";
-  version = "3.0.3";
+  version = "3.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thebjorn";
     repo = "pydeps";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7wMqDhBuGDmWHeaBE3Hs50FGO0vPvrNLQNGC+9u3jAs=";
+    hash = "sha256-/Ie75jQWG3t4cGMRMVPJ7r6aBdm4hC7/CgwmuOUk4BA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pydo/default.nix b/pkgs/development/python-modules/pydo/default.nix
index 41f5447d3a56..97ea9df47289 100644
--- a/pkgs/development/python-modules/pydo/default.nix
+++ b/pkgs/development/python-modules/pydo/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydo";
-  version = "0.30.0";
+  version = "0.31.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "pydo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tLw34aQ9gmKSQ/cy3Rz3eKqaw/Kv4lgS1saMYMCHPxo=";
+    hash = "sha256-66DdlrfK+scSCGJ9sCsTjiUxLhY5jKAKdg4JTfBMfso=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix
index 04623dcd79a7..077fbcb14973 100644
--- a/pkgs/development/python-modules/pydrawise/default.nix
+++ b/pkgs/development/python-modules/pydrawise/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pydrawise";
-  version = "2026.3.0";
+  version = "2026.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dknowles2";
     repo = "pydrawise";
     tag = version;
-    hash = "sha256-h91J8gcc5qiBCYvOeFhSDtvdMKfuWUTys6uw5wmLehI=";
+    hash = "sha256-+V0x8caTqrfaNZ2tSmqzkJs8B0X405NnR3HIms1ocS8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix
index d323075207e0..89502c642dcd 100644
--- a/pkgs/development/python-modules/pyeclib/default.nix
+++ b/pkgs/development/python-modules/pyeclib/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyeclib";
-  version = "1.7.0";
+  version = "1.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openstack";
     repo = "pyeclib";
     tag = version;
-    hash = "sha256-wYzZUtr80KgVTznD0ISy7qhGngm4Xmt8Mauu9lP+2T4=";
+    hash = "sha256-v7pkV5s10AxU+vgp+gcQF8lJmm6yzDwkqunWuT0zU4c=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyexpect/default.nix b/pkgs/development/python-modules/pyexpect/default.nix
index 70acc2ffd1d4..76b84fd27d2b 100644
--- a/pkgs/development/python-modules/pyexpect/default.nix
+++ b/pkgs/development/python-modules/pyexpect/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "pyexpect" ];
 
   meta = {
-    changelog = "https://dwt/pyexpect/releases/tag/${version}";
+    changelog = "https://github.com/dwt/pyexpect/releases/tag/${version}";
     description = "Minimal but very flexible implementation of the expect pattern";
     homepage = "https://github.com/dwt/pyexpect";
     license = lib.licenses.isc;
diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index a74896f22372..5cdfe0270eb6 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyexploitdb";
-  version = "0.3.22";
+  version = "0.3.24";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-yk01aq1rOed312E629Vt5TuXl1vQdgoZZB3c5tk3nEk=";
+    hash = "sha256-MIjqkn6oYYQWp6AezsXG0GGURCVavOJYzBpqJNPSEyo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 76810dad5f8c..fd6efdd93aee 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -1,18 +1,25 @@
 {
-  stdenv,
   lib,
-  replaceVars,
-  fetchFromGitHub,
+  stdenv,
   buildPythonPackage,
+  fetchFromGitHub,
+  replaceVars,
   python,
-  pkg-config,
-  setuptools,
-  cython,
-  ninja,
-  meson-python,
-  pyproject-metadata,
-  nix-update-script,
 
+  # build-system
+  cython,
+  meson-python,
+  ninja,
+  pyproject-metadata,
+  setuptools,
+  sphinx,
+  sphinx-autoapi,
+
+  # nativeBuildInputs
+  astroid,
+  pkg-config,
+
+  # buildInputs
   fontconfig,
   freetype,
   libjpeg,
@@ -23,22 +30,27 @@
   SDL2_image,
   SDL2_mixer,
   SDL2_ttf,
-  numpy,
-  astroid,
 
+  # tests
+  numpy,
+  writableTmpDirAsHomeHook,
+
+  # passthru
+  nix-update-script,
   pygame-gui,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pygame-ce";
-  version = "2.5.6";
+  version = "2.5.7";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "pygame-community";
     repo = "pygame-ce";
-    tag = version;
-    hash = "sha256-0DNvAs1E6OhN6wTvbMCDt9YAEFoBZp1r7hI4GSnJUl8=";
+    tag = finalAttrs.version;
+    hash = "sha256-Yjs2SLgPVMOy8DCS+Pfk0fs0G//sY20jfGQNJ5rN58Q=";
     # Unicode files cause different checksums on HFS+ vs. other filesystems
     postFetch = "rm -rf $out/docs/reST";
   };
@@ -50,52 +62,66 @@ buildPythonPackage rec {
           "${lib.getDev dep}/"
           "${lib.getDev dep}/include"
           "${lib.getDev dep}/include/SDL2"
-        ]) buildInputs
+        ]) finalAttrs.buildInputs
       );
       buildinputs_lib = builtins.toJSON (
         builtins.concatMap (dep: [
           "${lib.getLib dep}/"
           "${lib.getLib dep}/lib"
-        ]) buildInputs
+        ]) finalAttrs.buildInputs
       );
     })
-
-    # https://github.com/pygame-community/pygame-ce/pull/3680#issuecomment-3796052119
-    ./skip-failing-tests.patch
   ];
 
-  postPatch = ''
+  postPatch =
     # "pyproject-metadata!=0.9.1" was pinned due to https://github.com/pygame-community/pygame-ce/pull/3395
     # cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015)
-    substituteInPlace pyproject.toml \
-      --replace-fail '"pyproject-metadata!=0.9.1",' '"pyproject-metadata",' \
-      --replace-fail '"meson<=1.9.1",' '"meson",' \
-      --replace-fail '"meson-python<=0.18.0",' '"meson-python",' \
-      --replace-fail '"ninja<=1.13.0",' "" \
-      --replace-fail '"astroid<4.0.0",' "" \
-      --replace-fail '"cython<=3.1.4",' '"cython",' \
-      --replace-fail '"sphinx<=8.2.3",' "" \
-      --replace-fail '"sphinx-autoapi<=3.6.0",' ""
-    substituteInPlace buildconfig/config_{unix,darwin}.py \
-      --replace-fail 'from distutils' 'from setuptools._distutils'
-    substituteInPlace src_py/sysfont.py \
-      --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \
-      --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    ''
+      substituteInPlace pyproject.toml \
+        --replace-fail "meson-python<=0.18.0" "meson-python" \
+        --replace-fail "meson<=1.10.0" "meson" \
+        --replace-fail "ninja<=1.13.0" "ninja" \
+        --replace-fail "cython<=3.2.4" "cython" \
+        --replace-fail "sphinx<=8.2.3" "sphinx" \
+        --replace-fail "astroid<4.0.0" "astroid" \
+        --replace-fail "sphinx-autoapi<=3.6.0" "sphinx-autoapi" \
+        --replace-fail "pyproject-metadata!=0.9.1" "pyproject-metadata"
+    ''
+    # distutils now lives under setuptools._distutils
+    + ''
+      substituteInPlace buildconfig/config_{unix,darwin}.py \
+        --replace-fail 'from distutils' 'from setuptools._distutils'
+    ''
+    # Inject the path to fc-list
+    + ''
+      substituteInPlace src_py/sysfont.py \
+        --replace-fail \
+          'path="fc-list"' \
+          'path="${lib.getExe' fontconfig "fc-list"}"' \
+        --replace-fail \
+          '/usr/X11/bin/fc-list' \
+          '${lib.getExe' fontconfig "fc-list"}'
+    ''
     # flaky
-    rm test/system_test.py
-    substituteInPlace test/meson.build \
-      --replace-fail "'system_test.py'," ""
-  '';
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      rm test/system_test.py
+      substituteInPlace test/meson.build \
+        --replace-fail "'system_test.py'," ""
+    '';
+
+  build-system = [
+    astroid
+    cython
+    meson-python
+    ninja
+    pyproject-metadata
+    setuptools
+    sphinx
+    sphinx-autoapi
+  ];
 
   nativeBuildInputs = [
     pkg-config
-    cython
-    setuptools
-    ninja
-    meson-python
-    pyproject-metadata
   ];
 
   buildInputs = [
@@ -108,11 +134,11 @@ buildPythonPackage rec {
     (SDL2_image.override { enableSTB = false; })
     SDL2_mixer
     SDL2_ttf
-    astroid
   ];
 
   nativeCheckInputs = [
     numpy
+    writableTmpDirAsHomeHook
   ];
 
   preConfigure = ''
@@ -127,7 +153,6 @@ buildPythonPackage rec {
   };
 
   preCheck = ''
-    export HOME=$(mktemp -d)
     # No audio or video device in test environment
     export SDL_VIDEODRIVER=dummy
     export SDL_AUDIODRIVER=disk
@@ -158,18 +183,19 @@ buildPythonPackage rec {
     "pygame.version"
   ];
 
-  passthru.updateScript = nix-update-script { };
-
-  passthru.tests = {
-    inherit pygame-gui;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      inherit pygame-gui;
+    };
   };
 
   meta = {
     description = "Pygame Community Edition (CE) - library for multimedia application built on SDL";
     homepage = "https://pyga.me/";
-    changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${src.tag}";
+    changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.lgpl21Plus;
     maintainers = [ lib.maintainers.pbsds ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch b/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch
index 5e39dff13575..43910758aa42 100644
--- a/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch
+++ b/pkgs/development/python-modules/pygame-ce/fix-dependency-finding.patch
@@ -1,13 +1,19 @@
 diff --git a/buildconfig/config_darwin.py b/buildconfig/config_darwin.py
-index 9503ea70..d0d3ab6e 100644
+index fdc911318..9acce8e5f 100644
 --- a/buildconfig/config_darwin.py
 +++ b/buildconfig/config_darwin.py
-@@ -140,16 +140,8 @@ def main(auto_config=False):
-     ])
+@@ -138,22 +138,8 @@ def main(auto_config=False):
  
      print('Hunting dependencies...')
--    incdirs = ['/usr/local/include', '/opt/homebrew/include']
--    incdirs.extend(['/usr/local/include/SDL2', '/opt/homebrew/include/SDL2', '/opt/local/include/SDL2'])
+ 
+-    homebrew_prefix = '/opt/homebrew'
+-    try:
+-        homebrew_prefix = check_output(['brew', '--prefix'], text=True, stderr=DEVNULL).strip()
+-    except (FileNotFoundError, CalledProcessError):
+-        pass
+-
+-    incdirs = ['/usr/local/include', f'{homebrew_prefix}/include']
+-    incdirs.extend(['/usr/local/include/SDL2', f'{homebrew_prefix}/include/SDL2', '/opt/local/include/SDL2'])
 -
 -    incdirs.extend([
 -       #'/usr/X11/include',
@@ -15,17 +21,17 @@ index 9503ea70..d0d3ab6e 100644
 -       '/opt/local/include/freetype2/freetype']
 -    )
 -    #libdirs = ['/usr/local/lib', '/usr/X11/lib', '/opt/local/lib']
--    libdirs = ['/usr/local/lib', '/opt/local/lib', '/opt/homebrew/lib']
+-    libdirs = ['/usr/local/lib', '/opt/local/lib', f'{homebrew_prefix}/lib']
 +    incdirs = @buildinputs_include@
 +    libdirs = @buildinputs_lib@
  
      for d in DEPS:
          if isinstance(d, (list, tuple)):
 diff --git a/buildconfig/config_unix.py b/buildconfig/config_unix.py
-index 3eba5b5c..53cc6233 100644
+index a9ebc8394..0875da6dd 100644
 --- a/buildconfig/config_unix.py
 +++ b/buildconfig/config_unix.py
-@@ -240,11 +240,8 @@ def main(auto_config=False):
+@@ -238,11 +238,8 @@ def main(auto_config=False):
      if not DEPS[0].found:
          raise RuntimeError('Unable to run "sdl-config". Please make sure a development version of SDL is installed.')
  
diff --git a/pkgs/development/python-modules/pygame-ce/skip-failing-tests.patch b/pkgs/development/python-modules/pygame-ce/skip-failing-tests.patch
deleted file mode 100644
index d85b591ab13a..000000000000
--- a/pkgs/development/python-modules/pygame-ce/skip-failing-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/test/draw_test.py b/test/draw_test.py
-index ed99f0ce9..0484ef53d 100644
---- a/test/draw_test.py
-+++ b/test/draw_test.py
-@@ -7496,6 +7496,10 @@ class DrawModuleTest(unittest.TestCase):
-             with self.assertRaises(TypeError):
-                 draw.polygon(surf, col, points, 0)
- 
-+    @unittest.skipIf(
-+        True,
-+        "https://github.com/pygame-community/pygame-ce/pull/3680#issuecomment-3796052119",
-+    )
-     def test_aafunctions_depth_segfault(self):
-         """Ensure future commits don't break the segfault fixed by pull request
-         https://github.com/pygame-community/pygame-ce/pull/3008
-diff --git a/test/surface_test.py b/test/surface_test.py
-index c2c91f4f5..35b9e1aaf 100644
---- a/test/surface_test.py
-+++ b/test/surface_test.py
-@@ -286,6 +286,7 @@ class SurfaceTypeTest(unittest.TestCase):
-         for pt in test_utils.rect_outer_bounds(fill_rect):
-             self.assertNotEqual(s1.get_at(pt), color)
- 
-+    @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/575")
-     def test_fill_rle(self):
-         """Test RLEACCEL flag with fill()"""
-         color = (250, 25, 25, 255)
-diff --git a/test/window_test.py b/test/window_test.py
-index b8dd1f005..5b7939908 100644
---- a/test/window_test.py
-+++ b/test/window_test.py
-@@ -113,10 +113,7 @@ class WindowTypeTest(unittest.TestCase):
-         self.win.always_on_top = False
-         self.assertFalse(self.win.always_on_top)
- 
--    @unittest.skipIf(
--        SDL < (2, 0, 18),
--        "requires SDL 2.0.18+",
--    )
-+    @unittest.skipIf(True, "https://github.com/pygame-community/pygame-ce/pull/3680")
-     def test_mouse_rect(self):
-         self.win.mouse_rect = None
-         self.assertIsNone(self.win.mouse_rect)
diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index ea2fd3040bfe..be21cc0d92af 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -3,43 +3,57 @@
   pkgs,
   stdenv,
   buildPythonPackage,
-  nix-update-script,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
+
+  # dependencies
   pygame-ce,
   python-i18n,
+
+  # tests
   pytestCheckHook,
+  writableTmpDirAsHomeHook,
+
+  # passthru
+  nix-update-script,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pygame-gui";
   version = "0614";
   pyproject = true;
+  __structuredAttrs = true;
   # nixpkgs-update: no auto update
 
   src = fetchFromGitHub {
     owner = "MyreMylar";
     repo = "pygame_gui";
-    tag = "v_${version}";
+    tag = "v_${finalAttrs.version}";
     hash = "sha256-wLvWaJuXMXk7zOaSZfIpsXhQt+eCjOtlh8IRuKbR75o=";
   };
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
-    pygame-ce
-    python-i18n
-  ];
-
   postPatch = ''
     substituteInPlace pygame_gui/core/utility.py \
       --replace-fail "xsel" "${lib.getExe pkgs.xsel}"
   '';
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    pygame-ce
+    python-i18n
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
 
   preCheck = ''
-    export HOME=$TMPDIR
     export SDL_VIDEODRIVER=dummy
   '';
 
@@ -54,6 +68,22 @@ buildPythonPackage rec {
     "test_process_event_text_ctrl_v_select_range"
     "test_process_event_text_ctrl_a"
     "test_process_event_text_ctrl_x"
+
+    # Pixel-level rendering mismatches with pygame-ce 2.5.7
+    "test_clear"
+    "test_creation_grow_to_fit_width"
+    "test_draw_ui"
+    "test_on_hovered"
+    "test_on_unhovered"
+    "test_process_event_mouse_buttons"
+    "test_set_active"
+    "test_set_cursor_from_click_pos"
+    "test_set_cursor_position"
+    "test_set_default_text_colour"
+    "test_set_inactive"
+    "test_set_text"
+    "test_split"
+    "test_split_index"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # fails to determine "/" as an existing path
@@ -79,4 +109,4 @@ buildPythonPackage rec {
       pbsds
     ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix
index 370e67715223..11fec2795b0f 100644
--- a/pkgs/development/python-modules/pyghmi/default.nix
+++ b/pkgs/development/python-modules/pyghmi/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pyghmi";
-  version = "1.6.15";
+  version = "1.6.16";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dautNibA/fg/ZMqn1iPXCIVVcnr4Eq33Ueg5vjM59TU=";
+    hash = "sha256-VqMQ54Mx9fkq3UAbzEApzm0LuRKEGXQARf8HGH7yZ6U=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pygls/1.nix b/pkgs/development/python-modules/pygls/1.nix
index b08bb2b641c8..734a09f7479f 100644
--- a/pkgs/development/python-modules/pygls/1.nix
+++ b/pkgs/development/python-modules/pygls/1.nix
@@ -11,7 +11,7 @@
   websockets,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pygls";
   version = "1.3.1";
   pyproject = true;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openlawlibrary";
     repo = "pygls";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-AvrGoQ0Be1xKZhFn9XXYJpt5w+ITbDbj6NFZpaDPKao=";
   };
 
@@ -62,8 +62,8 @@ buildPythonPackage rec {
     broken = lib.versionAtLeast lsprotocol.version "2024";
     description = "Pythonic generic implementation of the Language Server Protocol";
     homepage = "https://github.com/openlawlibrary/pygls";
-    changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/openlawlibrary/pygls/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ kira-bruneau ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix
index cd0501310420..a6ec8564091a 100644
--- a/pkgs/development/python-modules/pygls/default.nix
+++ b/pkgs/development/python-modules/pygls/default.nix
@@ -13,7 +13,7 @@
   nix-update-script,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pygls";
   version = "2.1.1";
   pyproject = true;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "openlawlibrary";
     repo = "pygls";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-jxc1nKxfiRenb629a2WCZOzqyIOvT5XU4NrjmKPlDHk=";
   };
 
@@ -65,8 +65,8 @@ buildPythonPackage rec {
   meta = {
     description = "Pythonic generic implementation of the Language Server Protocol";
     homepage = "https://github.com/openlawlibrary/pygls";
-    changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/openlawlibrary/pygls/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ kira-bruneau ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix
index 94d10ee0aa75..352c0092a51a 100644
--- a/pkgs/development/python-modules/pygments/default.nix
+++ b/pkgs/development/python-modules/pygments/default.nix
@@ -14,15 +14,15 @@
 let
   pygments = buildPythonPackage (finalAttrs: {
     pname = "pygments";
-    version = "2.19.2";
+    version = "2.20.0";
     pyproject = true;
 
     src = fetchPypi {
       inherit (finalAttrs) pname version;
-      hash = "sha256-Y2yyR3zsf4lSU2lwvFM7xDdDVC9wOSrgJjdGAK3VuIc=";
+      hash = "sha256-Z1fNA3aAU/+Z8wOcGjbWwKoLJjQ4/KsXUgswowOoK18=";
     };
 
-    nativeBuildInputs = [ hatchling ];
+    build-system = [ hatchling ];
 
     # circular dependencies if enabled by default
     doCheck = false;
diff --git a/pkgs/development/python-modules/pygount/default.nix b/pkgs/development/python-modules/pygount/default.nix
index fb5013a2325e..e33fda50158d 100644
--- a/pkgs/development/python-modules/pygount/default.nix
+++ b/pkgs/development/python-modules/pygount/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pygount";
-  version = "3.1.1";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "roskakori";
     repo = "pygount";
     tag = "v${version}";
-    hash = "sha256-4RHztsMmC7WW1cNA1QU3Qodni1HGZF7Gbr4DOj8ffP4=";
+    hash = "sha256-1Ws/8znFusdn2jKFvbiPD7ZRbOnPDqBZceMizWfeVlM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix
index c6d2d246f4c8..48ae9fda7f80 100644
--- a/pkgs/development/python-modules/pygtfs/default.nix
+++ b/pkgs/development/python-modules/pygtfs/default.nix
@@ -6,19 +6,18 @@
   pytz,
   setuptools,
   setuptools-scm,
-  six,
   sqlalchemy,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pygtfs";
-  version = "0.1.10";
+  version = "0.1.11";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-bOG/bXz97eWM77AprQvEgtl9g2fQbbKcwniF1fAC0d0=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-NaSGjzBBFK3mqHibcKV2gQIQoWn+qZay7KJasjcwxW4=";
   };
 
   build-system = [
@@ -29,20 +28,21 @@ buildPythonPackage rec {
   dependencies = [
     docopt
     pytz
-    six
     sqlalchemy
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
+
   enabledTestPaths = [ "pygtfs/test/test.py" ];
 
   pythonImportsCheck = [ "pygtfs" ];
 
   meta = {
     description = "Python module for GTFS";
-    mainProgram = "gtfs2db";
     homepage = "https://github.com/jarondl/pygtfs";
-    license = with lib.licenses; [ mit ];
+    changelog = "https://github.com/jarondl/pygtfs/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "gtfs2db";
   };
-}
+})
diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix
index b05e4c384dd0..2429eefee5ff 100644
--- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix
+++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix
@@ -66,7 +66,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python library for validating X.509 certificates and paths";
     homepage = "https://github.com/MatthiasValvekens/pyHanko/tree/master/pkgs/pyhanko-certvalidator";
-    changelog = "https://github.com/MatthiasValvekens/pyhanko/blob/pyhanko-certvalidator/${src.tag}/docs/changelog.rst#pyhanko-certvalidator";
+    changelog = "https://github.com/MatthiasValvekens/pyhanko/blob/${src.tag}/docs/changelog.rst#pyhanko-certvalidator";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.antonmosich ];
   };
diff --git a/pkgs/development/python-modules/pyhive-integration/default.nix b/pkgs/development/python-modules/pyhive-integration/default.nix
index 23c302cc0ee1..c90f570d9ab2 100644
--- a/pkgs/development/python-modules/pyhive-integration/default.nix
+++ b/pkgs/development/python-modules/pyhive-integration/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyhive-integration";
-  version = "1.0.8";
+  version = "1.0.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Pyhass";
     repo = "Pyhiveapi";
-    tag = finalAttrs.version;
-    hash = "sha256-9qcRvkRV/3GT66jlnkdKk+J3frEcsJ3C+Oio5gbRi5s=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8Lv41xgkwVpisdJpzhhBxdAG3VdKYazmbvl3V7lAjYA=";
   };
 
   pythonRemoveDeps = [ "pre-commit" ];
diff --git a/pkgs/development/python-modules/pyjpegls/default.nix b/pkgs/development/python-modules/pyjpegls/default.nix
index 8e36ceffa59c..812be43bd35c 100644
--- a/pkgs/development/python-modules/pyjpegls/default.nix
+++ b/pkgs/development/python-modules/pyjpegls/default.nix
@@ -48,7 +48,7 @@ buildPythonPackage rec {
   meta = {
     description = "JPEG-LS for Python via CharLS C++ Library";
     homepage = "https://github.com/pydicom/pyjpegls";
-    changelog = "https://github.com/pydicom/pyjpegls/releases/tag/v${src.tag}";
+    changelog = "https://github.com/pydicom/pyjpegls/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };
diff --git a/pkgs/development/python-modules/pyjvcprojector/default.nix b/pkgs/development/python-modules/pyjvcprojector/default.nix
index 25a74f80dae9..6e4e71859baa 100644
--- a/pkgs/development/python-modules/pyjvcprojector/default.nix
+++ b/pkgs/development/python-modules/pyjvcprojector/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyjvcprojector";
-  version = "2.0.5";
+  version = "2.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SteveEasley";
     repo = "pyjvcprojector";
     tag = "v${version}";
-    hash = "sha256-cfeC5KuExA4GIw7vrSBtUC4TWI8PBukOfdhbWpscyok=";
+    hash = "sha256-HFnaMIlF+C2fi8NlMtQKEMY35lAS15ij4QyFMFYhiU8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index af492673be25..1d18045a863c 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyjwt";
-  version = "2.11.0";
+  version = "2.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jpadilla";
     repo = "pyjwt";
     tag = version;
-    hash = "sha256-Sves+/Mkk9O8rF/yRD6gID120diF1m+lt0exQ83LA1A=";
+    hash = "sha256-wgOa5JhQT82ppoad6s8gPH7tGRNbbVWmJaaDF84d+r0=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 9df2ae84c750..97666d8effc7 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylance";
-  version = "4.0.0";
+  version = "4.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Z7lgK7sIeZCL8VXfmwC8G1f7cBqG2nfFM3oyJZfmNQ4=";
+    hash = "sha256-bQnPa+5w5/WXw0i+D8jhk12Q/iKOFieKwZ9NPjAf5VQ=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/python";
@@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: {
       src
       sourceRoot
       ;
-    hash = "sha256-hZEcTo4B3+viRwWExkaguq+c7DejjaouNf0+L96rms4=";
+    hash = "sha256-Hr3qrCVNpLpEiHKFOaA0gf5wRY3Tn2pBwZf292jmoSU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 99bcf2293409..e91972254e54 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pylint";
-  version = "4.0.4";
+  version = "4.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pylint-dev";
     repo = "pylint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mKI/sRYl2ZwZ3JklmqBTs7vRG9EA4zDHaW61d/Xozb4=";
+    hash = "sha256-RMoX3RR7T54Bvx0bBSmyuEsezqkxfdE/hIUa4G9exjQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index a31cc9615899..b86433052bec 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "natekspencer";
     repo = "pylitterbot";
-    tag = "v${finalAttrs.version}";
+    tag = finalAttrs.version;
     hash = "sha256-bFJ6v27yfzMPqZijWCOlgdVS19IKIMqZcq2FjAyMnqo=";
   };
 
diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix
index b3f0192c13f3..e9044fb1b872 100644
--- a/pkgs/development/python-modules/pylxd/default.nix
+++ b/pkgs/development/python-modules/pylxd/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pylxd";
-  version = "2.3.7";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "pylxd";
     tag = version;
-    hash = "sha256-UbDkau3TLwFxWZxJGNF5hgtGn6JgVq5L2CvUgnb4IC8=";
+    hash = "sha256-s3BdHZFNkXRT1MoLQCQ4+XPPFanZNZVgOSmYhJkx7JE=";
   };
 
   pythonRelaxDeps = [ "urllib3" ];
diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix
index 8a108dd588be..6e13603f1ec3 100644
--- a/pkgs/development/python-modules/pynmeagps/default.nix
+++ b/pkgs/development/python-modules/pynmeagps/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pynmeagps";
-  version = "1.1.2";
+  version = "1.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "semuconsulting";
     repo = "pynmeagps";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0Jgo2lQwftnJfzaaxN2dA9D1ACvWMuOLVac/P/I9ty4=";
+    hash = "sha256-uVIlr+zRwbaQqtInJqCebzMR5pe7dEls3gVzbW7TYkQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pynzbgetapi/default.nix b/pkgs/development/python-modules/pynzbgetapi/default.nix
index 6e4f05efa538..d32e939d657e 100644
--- a/pkgs/development/python-modules/pynzbgetapi/default.nix
+++ b/pkgs/development/python-modules/pynzbgetapi/default.nix
@@ -29,7 +29,6 @@ buildPythonPackage rec {
   meta = {
     description = "Basic Python NZBGet API client";
     homepage = "https://github.com/voltron4lyfe/pynzbgetapi";
-    changelog = "https://github.com/voltron4lyfe/pynzbgetapi/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.jamiemagee ];
   };
diff --git a/pkgs/development/python-modules/pyoprf/default.nix b/pkgs/development/python-modules/pyoprf/default.nix
index 0e2c9abd7a4b..a59757506559 100644
--- a/pkgs/development/python-modules/pyoprf/default.nix
+++ b/pkgs/development/python-modules/pyoprf/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  pytestFlagsArray = [ "tests/test.py" ];
+  enabledTestPaths = [ "tests/test.py" ];
 
   meta = {
     homepage = "https://github.com/stef/liboprf/tree/master/python";
diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix
index aeb3153acd7c..1375a365b892 100644
--- a/pkgs/development/python-modules/pyoverkiz/default.nix
+++ b/pkgs/development/python-modules/pyoverkiz/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyoverkiz";
-  version = "1.20.1";
+  version = "1.20.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iMicknl";
     repo = "python-overkiz-api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PaJ4AC0N82iGTsgP620uI6Iw9l0aHrR7UutWLYxrOYE=";
+    hash = "sha256-6KcxtHO+mwyKyb2MGGY80M40o2OKwLYPBANipb3ySAY=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index aa98596c77b0..dc6123994982 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "pypdf";
-  version = "6.10.0";
+  version = "6.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     tag = version;
     # fetch sample files used in tests
     fetchSubmodules = true;
-    hash = "sha256-eAbA6vIRJ/wX5r/X218UG2yEqtGTuDAKFpLB702HvM0=";
+    hash = "sha256-f7U9kZrAnUHv0nBrcHI+Otd49jIJz0d1uWRHymWJnYo=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix
index 59edbf93e407..d089baeaabbc 100644
--- a/pkgs/development/python-modules/pypoolstation/default.nix
+++ b/pkgs/development/python-modules/pypoolstation/default.nix
@@ -8,14 +8,14 @@
   poetry-core,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pypoolstation";
-  version = "0.5.8";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-GIRx66esht82tKBJDhCDrwPkxsdBPi1w9tSQ7itF0qQ=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-blTvbvuIS2YISd0jBR/TXOSm594htGB7lc9JpA+3ayM=";
   };
 
   build-system = [ poetry-core ];
@@ -37,4 +37,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pyppeteer-ng/default.nix b/pkgs/development/python-modules/pyppeteer-ng/default.nix
index 135c4ec30ffc..b5f612bddd8d 100644
--- a/pkgs/development/python-modules/pyppeteer-ng/default.nix
+++ b/pkgs/development/python-modules/pyppeteer-ng/default.nix
@@ -63,7 +63,7 @@ buildPythonPackage rec {
       --replace-fail '_port = get_free_port()' ""
 
     substituteInPlace tests/utils/server.py \
-      --replace-fail '_Middleware' '_Middlewares' \
+      --replace-fail '_Middleware' '_Middlewares'
   '';
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 66138c7cb5a1..85cedbede6af 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -17,7 +17,6 @@
   enableVerbose ? true,
   withConnectivity ? false,
   withMultimedia ? false,
-  withWebKit ? false,
   withWebSockets ? false,
   withLocation ? false,
   withSerialPort ? false,
@@ -139,7 +138,6 @@ buildPythonPackage rec {
     ]
     ++ lib.optional withConnectivity qtconnectivity
     ++ lib.optional withMultimedia qtmultimedia
-    ++ lib.optional withWebKit qtwebkit
     ++ lib.optional withWebSockets qtwebsockets
     ++ lib.optional withLocation qtlocation
     ++ lib.optional withSerialPort qtserialport
@@ -156,7 +154,6 @@ buildPythonPackage rec {
       pyqt-builder
     ]
     ++ lib.optional withConnectivity qtconnectivity
-    ++ lib.optional withWebKit qtwebkit
     ++ lib.optional withWebSockets qtwebsockets
     ++ lib.optional withLocation qtlocation
     ++ lib.optional withSerialPort qtserialport
@@ -170,7 +167,6 @@ buildPythonPackage rec {
   passthru = {
     inherit sip pyqt5-sip;
     multimediaEnabled = withMultimedia;
-    webKitEnabled = withWebKit;
     WebSocketsEnabled = withWebSockets;
     connectivityEnabled = withConnectivity;
     locationEnabled = withLocation;
@@ -191,7 +187,6 @@ buildPythonPackage rec {
     "PyQt5.QtGui"
   ]
   ++ lib.optional withWebSockets "PyQt5.QtWebSockets"
-  ++ lib.optional withWebKit "PyQt5.QtWebKit"
   ++ lib.optional withMultimedia "PyQt5.QtMultimedia"
   ++ lib.optional withConnectivity "PyQt5.QtBluetooth"
   ++ lib.optional withLocation "PyQt5.QtPositioning"
diff --git a/pkgs/development/python-modules/pyqt5-stubs/default.nix b/pkgs/development/python-modules/pyqt5-stubs/default.nix
deleted file mode 100644
index fa7eec78b08b..000000000000
--- a/pkgs/development/python-modules/pyqt5-stubs/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pytestCheckHook,
-  pyqt5,
-  pyqt3d,
-  pyqtchart,
-  pyqtdatavisualization,
-  pyqtwebengine,
-}:
-
-buildPythonPackage rec {
-  pname = "pyqt5-stubs";
-  version = "5.15.6.0";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "python-qt-tools";
-    repo = "PyQt5-stubs";
-    rev = version;
-    hash = "sha256-qWnvlHnFRy8wbZJ28C0pYqAxod623Epe5z5FZufheDc=";
-  };
-  postPatch = ''
-    # pulls in a dependency to mypy, but we don't want to run linters
-    rm tests/test_stubs.py
-  ''
-  + lib.optionalString (!pyqt5.connectivityEnabled) ''
-    rm tests/qflags/test_QtBluetooth_*
-    rm tests/qflags/test_QtNfc_*
-  ''
-  + lib.optionalString (!pyqt5.locationEnabled) ''
-    rm tests/qflags/test_QtLocation_*
-    rm tests/qflags/test_QtPositioning_*
-  ''
-  + lib.optionalString (!pyqt5.multimediaEnabled) ''
-    rm tests/qflags/test_QtMultimedia_*
-  ''
-  + lib.optionalString (!pyqt5.serialPortEnabled) ''
-    rm tests/qflags/test_QtSerialPort_*
-  ''
-  + lib.optionalString (!pyqt5.toolsEnabled) ''
-    rm tests/qflags/test_QtDesigner_*
-  '';
-
-  pythonImportsCheck = [ "PyQt5-stubs" ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pyqt5
-    pyqt3d
-    pyqtchart
-    pyqtdatavisualization
-    pyqtwebengine
-  ];
-
-  meta = {
-    description = "Stubs for PyQt5";
-    homepage = "https://github.com/python-qt-tools/PyQt5-stubs";
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ _999eagle ];
-  };
-}
diff --git a/pkgs/development/python-modules/pyqt6-charts/default.nix b/pkgs/development/python-modules/pyqt6-charts/default.nix
index 92eb9ac0b9d7..a5234ebce56c 100644
--- a/pkgs/development/python-modules/pyqt6-charts/default.nix
+++ b/pkgs/development/python-modules/pyqt6-charts/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "pyqt6-charts";
-  version = "6.10.0";
+  version = "6.11.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pyqt6_charts";
     inherit version;
-    hash = "sha256-keFeKNARyqTIOIGpBoezXj0F71cpDN2XYIJMlb2saj4=";
+    hash = "sha256-EJHNkZgGo84F0idnKfeb5Oy9CpOVAKiJkCbD71dpxlA=";
   };
 
   # fix include path and increase verbosity
diff --git a/pkgs/development/python-modules/pyqt6-webengine/default.nix b/pkgs/development/python-modules/pyqt6-webengine/default.nix
index d1894ca206dd..009390998e4c 100644
--- a/pkgs/development/python-modules/pyqt6-webengine/default.nix
+++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "pyqt6-webengine";
-  version = "6.10.0";
+  version = "6.11.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pyqt6_webengine";
     inherit version;
-    hash = "sha256-Jn0nJ10Mea4nC8pLA1IKQfp+hcKk2WMtqMucwjOlWtE=";
+    hash = "sha256-Fc9J77u9TGvIdlOyxK6A1gSfgA4xYgszZzSuLjfL7a4=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index 64833cb7323a..f28ffe84b751 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -26,15 +26,16 @@
 let
   fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
 in
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyqtgraph";
   version = "0.14.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "pyqtgraph";
     repo = "pyqtgraph";
-    tag = "pyqtgraph-${version}";
+    tag = "pyqtgraph-${finalAttrs.version}";
     hash = "sha256-T5rhaBtcKP/sYjCmYNMYR0BGttkiLhWTfEbZNeAdJJ0=";
   };
 
@@ -70,10 +71,11 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # ZeroDivisionError: float division by zero
+    # See https://github.com/pyqtgraph/pyqtgraph/issues/3485
     "test_maps_tick_values_to_local_times"
     "test_maps_hour_ticks_to_local_times_when_skip_greater_than_one"
-
+    "test_plotscene"
+    "test_simple"
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isx86) [
     # small precision-related differences on other architectures,
@@ -89,7 +91,7 @@ buildPythonPackage rec {
   meta = {
     description = "Scientific Graphics and GUI Library for Python";
     homepage = "https://www.pyqtgraph.org/";
-    changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/${src.tag}/CHANGELOG";
+    changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/${finalAttrs.src.tag}/CHANGELOG";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
@@ -97,4 +99,4 @@ buildPythonPackage rec {
       doronbehar
     ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix
deleted file mode 100644
index 295f8d3ad991..000000000000
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  lib,
-  setuptools,
-  stdenv,
-  fetchPypi,
-  pkg-config,
-  libsForQt5,
-  darwin,
-  buildPythonPackage,
-  python,
-  isPy27,
-  pyqt5,
-  sip,
-  pyqt-builder,
-  mesa,
-}:
-
-let
-  inherit (darwin) autoSignDarwinBinariesHook;
-in
-buildPythonPackage (
-  rec {
-    pname = "pyqtwebengine";
-    version = "5.15.7";
-    pyproject = true;
-
-    disabled = isPy27;
-
-    src = fetchPypi {
-      pname = "PyQtWebEngine";
-      inherit version;
-      hash = "sha256-8SGsbkovlqwolhm8/Df2Tmg2LySjRlU/XWxC76Qiik0=";
-    };
-
-    postPatch = ''
-      substituteInPlace pyproject.toml \
-        --replace "[tool.sip.project]" "[tool.sip.project]''\nsip-include-dirs = [\"${pyqt5}/${python.sitePackages}/PyQt5/bindings\"]"
-    '';
-
-    outputs = [
-      "out"
-      "dev"
-    ];
-
-    nativeBuildInputs = [
-      pkg-config
-      libsForQt5.qmake
-      libsForQt5.wrapQtAppsHook
-    ]
-    ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ sip ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      python.pythonOnBuildForHost.pkgs.sip
-    ]
-    ++ [
-      libsForQt5.qtbase
-      libsForQt5.qtsvg
-      libsForQt5.qtwebengine
-      pyqt-builder
-      setuptools
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-      autoSignDarwinBinariesHook
-    ];
-
-    buildInputs = [
-      sip
-      libsForQt5.qtbase
-      libsForQt5.qtsvg
-      libsForQt5.qtwebengine
-    ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      libsForQt5.qtwebchannel
-      libsForQt5.qtdeclarative
-    ];
-
-    propagatedBuildInputs = [ pyqt5 ];
-
-    dontWrapQtApps = true;
-
-    # Avoid running qmake, which is in nativeBuildInputs
-    dontConfigure = true;
-
-    # Checked using pythonImportsCheck
-    doCheck = false;
-
-    pythonImportsCheck = [
-      "PyQt5.QtWebEngine"
-      "PyQt5.QtWebEngineWidgets"
-    ];
-
-    enableParallelBuilding = true;
-
-    passthru = {
-      inherit (libsForQt5) wrapQtAppsHook;
-    };
-
-    meta = {
-      description = "Python bindings for Qt5";
-      homepage = "http://www.riverbankcomputing.co.uk";
-      license = lib.licenses.gpl3;
-      hydraPlatforms = lib.lists.intersectLists libsForQt5.qtwebengine.meta.platforms mesa.meta.platforms;
-    };
-  }
-  // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
-    # TODO: figure out why the env hooks aren't adding these inclusions automatically
-    env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
-      "-I${lib.getDev libsForQt5.qtbase}/include/QtPrintSupport/"
-      "-I${lib.getDev libsForQt5.qtwebchannel}/include/QtWebChannel/"
-    ];
-  }
-)
diff --git a/pkgs/development/python-modules/pyschemes/default.nix b/pkgs/development/python-modules/pyschemes/default.nix
index 327cb078b071..6b7a90dd2640 100644
--- a/pkgs/development/python-modules/pyschemes/default.nix
+++ b/pkgs/development/python-modules/pyschemes/default.nix
@@ -3,29 +3,23 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  fetchpatch,
+  setuptools,
 }:
 
 buildPythonPackage {
   pname = "pyschemes";
-  version = "unstable-2017-11-08";
-  format = "setuptools";
+  version = "0-unstable-2022-09-12";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spy16";
     repo = "pyschemes";
-    rev = "ca6483d13159ba65ba6fc2f77b90421c40f2bbf2";
-    hash = "sha256-PssucudvlE8mztwVme70+h+2hRW/ri9oV9IZayiZhdU=";
+    rev = "c8afdbc045c1ff2bd7cc5a963e7084fc096f5257";
+    hash = "sha256-jv6dlZlLuJlTqw2V21BUEhCIc/UGvyjbhggw82eGMz0=";
   };
 
-  patches = [
-    # Fix python 3.10 compatibility. Tracked upstream in
-    # https://github.com/spy16/pyschemes/pull/6
-    (fetchpatch {
-      url = "https://github.com/spy16/pyschemes/commit/23011128c6c22838d4fca9e00fd322a20bb566c4.patch";
-      hash = "sha256-vDaWxMrn2aC2wmd035EWRZ3cd/XME81z/BWG0f2T9jc=";
-    })
-  ];
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "pyschemes" ];
diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix
index 66fb3a4664aa..d14b516513e2 100644
--- a/pkgs/development/python-modules/pysdl2/default.nix
+++ b/pkgs/development/python-modules/pysdl2/default.nix
@@ -19,18 +19,17 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pysdl2";
-  version = "0.9.17-unstable-2025-04-03";
+  version = "0.9.17-unstable-2025-11-18";
   pyproject = true;
-
-  pythonImportsCheck = [ "sdl2" ];
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "py-sdl";
     repo = "py-sdl2";
-    rev = "6414ee1c5f4a6eb91b71f5f9e35d469eee395b9f";
-    hash = "sha256-E6Jpuin4bqDkvFTaZTsTNkNQJd2e5fuTf2oLsQ71uQ0=";
+    rev = "3d0672135fab3ca58e2f00c0a76b7b25cb818784";
+    hash = "sha256-SgorCWZmJk13LNlTmh5Aomik14PTZdWliU3GWtkTASE=";
   };
 
   patches = [
@@ -72,6 +71,8 @@ buildPythonPackage rec {
     PYTHONFAULTHANDLER = "1";
   };
 
+  pythonImportsCheck = [ "sdl2" ];
+
   nativeCheckInputs = [
     numpy
     pillow
@@ -91,10 +92,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/py-sdl/py-sdl2/compare/0.9.17..${src.rev}";
+    changelog = "https://github.com/py-sdl/py-sdl2/compare/0.9.17..${finalAttrs.src.rev}";
     description = "Wrapper around the SDL2 library and as such similar to the discontinued PySDL project";
     homepage = "https://github.com/py-sdl/py-sdl2";
     license = lib.licenses.publicDomain;
     maintainers = with lib.maintainers; [ pmiddend ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pysdl3/default.nix b/pkgs/development/python-modules/pysdl3/default.nix
index 3df4aab1fd9d..c4e3e24b52f3 100644
--- a/pkgs/development/python-modules/pysdl3/default.nix
+++ b/pkgs/development/python-modules/pysdl3/default.nix
@@ -19,18 +19,18 @@
 let
   dochash =
     if stdenv.hostPlatform.isLinux then
-      "sha256-d2YQUBWRlDROwiDMJ5mQAR9o+cYsbv1jiulsr1SAaik="
+      "sha256-ldx6r0KKNl1mkohTkaEG4rawf4VjHeJvNUdPkmrAkYA="
     else if stdenv.hostPlatform.isDarwin then
-      "sha256-eIzTsn4wYz7TEyWN8QssM7fxpMfz/ENlxDVUMz0Cm4c="
+      "sha256-ga0ebb9zIPI5+Qza8APs0kbCxUIxqCmXRO/R8uWASOg="
     else if stdenv.hostPlatform.isWindows then
-      "sha256-+iagR5jvpHi8WDh4/DO+GDP6jajEpZ6G1ROhM+zkSiw="
+      "sha256-bBwETA9/ph0zXVNad9zMkQvfq1MmFJ08tCV+mUPwlXQ="
     else
       throw "PySDL3 does not support ${stdenv.hostPlatform.uname.system}";
   lib_ext = stdenv.hostPlatform.extensions.sharedLibrary;
 in
 buildPythonPackage rec {
   pname = "pysdl3";
-  version = "0.9.8b9";
+  version = "0.9.11b0";
   pyproject = true;
 
   pythonImportsCheck = [ "sdl3" ];
@@ -39,12 +39,12 @@ buildPythonPackage rec {
     owner = "Aermoss";
     repo = "PySDL3";
     tag = "v${version}";
-    hash = "sha256-TpfMpp8CGb8lYALCWlMtyucxObDg1VYEvBW+mVHN9JM=";
+    hash = "sha256-lUnQ5YDM6HXarZUSy+x95lStBXDQlvG5JL6hFdHg6z0=";
   };
 
   docfile = fetchurl {
     url = "https://github.com/Aermoss/PySDL3/releases/download/v${version}/${stdenv.hostPlatform.uname.system}-Docs.py";
-    hash = "${dochash}";
+    hash = dochash;
   };
 
   postUnpack = ''
@@ -83,6 +83,13 @@ buildPythonPackage rec {
     SDL_AUDIODRIVER = "dummy";
     SDL_RENDER_DRIVER = "software";
     PYTHONFAULTHANDLER = "1";
+
+    # For import checks, duplicated from setup hook.
+    SDL_CHECK_BINARY_VERSION = 0;
+    SDL_DISABLE_METADATA = 1;
+    # Checks for __doc__.py next to the file being executed.
+    # It's very fragile, and doesn't work during the import check.
+    SDL_DOC_GENERATOR = 0;
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pysdl3/setup-hook.sh b/pkgs/development/python-modules/pysdl3/setup-hook.sh
index fbe579ed56f3..8a156272dbc4 100644
--- a/pkgs/development/python-modules/pysdl3/setup-hook.sh
+++ b/pkgs/development/python-modules/pysdl3/setup-hook.sh
@@ -2,7 +2,7 @@
 # https://pysdl3.readthedocs.io/en/latest/install.html#the-environment-variable-method
 
 # Don't check Pypi for new PySDL3 releases at runtime
-export SDL_CHECK_VERSION=0
+export SDL_CHECK_BINARY_VERSION=0
 # Don't try to download SDL binaries at runtime
 export SDL_DOWNLOAD_BINARIES=0
 # Nixpkgs does not provide a metadata.json. Instead we want PySDL3 to find the
diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix
index 0a42c761d278..83af787ac285 100644
--- a/pkgs/development/python-modules/pysequoia/default.nix
+++ b/pkgs/development/python-modules/pysequoia/default.nix
@@ -8,17 +8,17 @@
 
 buildPythonPackage rec {
   pname = "pysequoia";
-  version = "0.1.32";
+  version = "0.1.33";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uqWJKz5o2/RJL81LW+sQve7YCAyl6PV3JWBqgktldT8=";
+    hash = "sha256-BNQJ8Ufggy3IfayPg+kfYwOXWuR5D3QIEJb/Zn7/xYA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-5TGxD3XOmi5NbTkhtxzZXExHFmveKewdlkDHSt+ZTVI=";
+    hash = "sha256-M3cIgvdjyzVtFspwEfFEvey4gnyZoBLT6k2ADtrxZn4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pysfcgal/default.nix b/pkgs/development/python-modules/pysfcgal/default.nix
index ac619c48eb1b..bedaa41c8f97 100644
--- a/pkgs/development/python-modules/pysfcgal/default.nix
+++ b/pkgs/development/python-modules/pysfcgal/default.nix
@@ -61,7 +61,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python wrapper for SFCGAL";
     homepage = "https://gitlab.com/sfcgal/pysfcgal";
-    changelog = "https://gitlab.com/sfcgal/pysfcgal/-/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://gitlab.com/sfcgal/pysfcgal/-/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.gpl3Plus;
     teams = with lib.teams; [
       geospatial
diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix
index 4a0215fe59da..560221978cca 100644
--- a/pkgs/development/python-modules/pyside2/default.nix
+++ b/pkgs/development/python-modules/pyside2/default.nix
@@ -7,7 +7,6 @@
   ninja,
   qt5,
   shiboken2,
-  withWebengine ? false, # vulnerable, so omit by default
 }:
 stdenv.mkDerivation rec {
   pname = "pyside2";
@@ -81,9 +80,6 @@ stdenv.mkDerivation rec {
       qtsvg
       qt3d
     ])
-    ++ lib.optionals withWebengine [
-      qt5.qtwebengine
-    ]
     ++ (with python.pkgs; [ setuptools ]);
 
   propagatedBuildInputs = [ shiboken2 ];
diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix
index 0a9621aaa2d2..f8165e7e8bc0 100644
--- a/pkgs/development/python-modules/pyside6/default.nix
+++ b/pkgs/development/python-modules/pyside6/default.nix
@@ -60,13 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   sourceRoot = "${finalAttrs.src.name}/sources/pyside6";
 
   patches = [
-    # revert commit that breaks generated cmake files
-    (fetchpatch {
-      url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=05e328476f2d6ef8a0f3f44aca1e5b1cdb7499fc";
-      revert = true;
-      stripLen = 2;
-      hash = "sha256-PPLV5K+xp7ZdG0Tah1wpBdNWN7fsXvZh14eBzO0R55c=";
-    })
+    ./fix-paths.patch
   ];
 
   # Qt Designer plugin moved to a separate output to reduce closure size
@@ -120,7 +114,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [ shiboken6 ];
 
-  cmakeFlags = [ "-DBUILD_TESTS=OFF" ];
+  cmakeFlags = [
+    "-DBUILD_TESTS=OFF"
+    "-Dis_pyside6_superproject_build=1"
+  ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/development/python-modules/pyside6/fix-paths.patch b/pkgs/development/python-modules/pyside6/fix-paths.patch
new file mode 100644
index 000000000000..f064dbc046b5
--- /dev/null
+++ b/pkgs/development/python-modules/pyside6/fix-paths.patch
@@ -0,0 +1,13 @@
+--- a/libpyside/CMakeLists.txt
++++ b/libpyside/CMakeLists.txt
+@@ -162,8 +162,8 @@ configure_package_config_file(
+ 
+ # Install-tree / wheel configuration
+ set(PYSIDE_PYTHONPATH "")
+-set(PYSIDE_TYPESYSTEMS "typesystems")
+-set(PYSIDE_GLUE "glue")
++set(PYSIDE_TYPESYSTEMS "share/PySide6${pyside6_SUFFIX}/typesystems")
++set(PYSIDE_GLUE "share/PySide6${pyside6_SUFFIX}/glue")
+ set(PYSIDE_SOVERSION "${pyside6_library_so_version}")
+ 
+ configure_package_config_file(
diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
index 80377f029908..0f397a08156b 100644
--- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
+++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
@@ -7,16 +7,16 @@
   pysigma-backend-elasticsearch,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pysigma-backend-opensearch";
-  version = "2.0.1";
+  version = "2.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma-backend-opensearch";
-    tag = "v${version}";
-    hash = "sha256-lYTaE4ar7VjyA/tnjiXQJtjHPP9bCjdYuPHYjbZEuxY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CCIQQeR/WXFV8A1elLxc4o32oox5wsOupI1XVjwFrUs=";
   };
 
   pythonRelaxDeps = [ "pysigma" ];
@@ -36,8 +36,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library to support OpenSearch for pySigma";
     homepage = "https://github.com/SigmaHQ/pySigma-backend-opensearch";
-    changelog = "https://github.com/SigmaHQ/pySigma-backend-opensearch/releases/tag/${src.tag}";
+    changelog = "https://github.com/SigmaHQ/pySigma-backend-opensearch/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.lgpl21Only;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix
index d9f1ee33e782..f2a8c542201f 100644
--- a/pkgs/development/python-modules/pysigma/default.nix
+++ b/pkgs/development/python-modules/pysigma/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pysigma";
-  version = "1.3.1";
+  version = "1.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "pySigma";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gMRcrP9ZVCi3QD0W5RlbCNIuZT/oTDpB0WqTKiwKcfU=";
+    hash = "sha256-MkKZ2iL2fkZcos60d1fd1OVBA28thVXrEmsEgvTMmS4=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/pystiebeleltron/default.nix b/pkgs/development/python-modules/pystiebeleltron/default.nix
index de0c3d509770..d7dfce119552 100644
--- a/pkgs/development/python-modules/pystiebeleltron/default.nix
+++ b/pkgs/development/python-modules/pystiebeleltron/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pystiebeleltron";
-  version = "0.2.5";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ThyMYthOS";
     repo = "python-stiebel-eltron";
     tag = "v${version}";
-    hash = "sha256-irZmtsGcbmr5+aniBofDg0fhkP646h3mpRyTdWndOyY=";
+    hash = "sha256-lzOZQnBoERoXke61raMMZiy/ThIrycNinsIZiL3jNHE=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pysunspec2/default.nix b/pkgs/development/python-modules/pysunspec2/default.nix
index dc9e1ae24419..460ca4ea3f97 100644
--- a/pkgs/development/python-modules/pysunspec2/default.nix
+++ b/pkgs/development/python-modules/pysunspec2/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pysunspec2";
-  version = "1.3.3";
+  version = "1.3.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sunspec";
     repo = "pysunspec2";
     tag = "v${version}";
-    hash = "sha256-mVx8Rt5GLyQ2ss0iJPi32Fhl9pD7hsXxW94p+8ri+w4=";
+    hash = "sha256-5iexVb6qXHmVczLydjXu+blGm9zwKGqUBLDUwl8HBrs=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index de922e034e3a..33648a0dc369 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytensor";
-  version = "2.38.2";
+  version = "2.38.3";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: {
     postFetch = ''
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${finalAttrs.src.tag})"/' $out/pytensor/_version.py
     '';
-    hash = "sha256-BKyaApIijxuJ0gNNXqahDOMW3rpF6+qgoCEpWj6Uz5g=";
+    hash = "sha256-+yfALDxNIjQUgzEJ3/ZtvLIGNmx6bPYRQ9zGXFbcMNM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pytest-assume/default.nix b/pkgs/development/python-modules/pytest-assume/default.nix
new file mode 100644
index 000000000000..4c344372f157
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-assume/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytest,
+  pytestCheckHook,
+  six,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pytest-assume";
+  version = "2.4.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "astraw38";
+    repo = "pytest-assume";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-QIwETun/n8SnBzK/axWiVTcuWiJ0ph3+2pQYVRMmVWI=";
+  };
+
+  build-system = [ setuptools ];
+
+  buildInputs = [ pytest ];
+
+  dependencies = [ six ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "pytest_assume" ];
+
+  meta = {
+    description = "Pytest plugin that allows multiple failures per test";
+    homepage = "https://github.com/astraw38/pytest-assume";
+    changelog = "https://github.com/astraw38/pytest-assume/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jfr ];
+  };
+})
diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix
index 2d6a6ea0641d..93136177d54b 100644
--- a/pkgs/development/python-modules/pytest-cov/default.nix
+++ b/pkgs/development/python-modules/pytest-cov/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "pytest-cov";
-  version = "7.0.0";
+  version = "7.1.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pytest_cov";
     inherit version;
-    hash = "sha256-M8l+2i4EmgxSmOkfUZMCoTNMJqxlwaSD1iBv1Fg2GvE=";
+    hash = "sha256-MGdPK19jUaoJcCqcjDZPagHCeq4ME2augBYWDR78VrI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pytest-insta/default.nix b/pkgs/development/python-modules/pytest-insta/default.nix
index d13adb3aba8b..391c31925b2b 100644
--- a/pkgs/development/python-modules/pytest-insta/default.nix
+++ b/pkgs/development/python-modules/pytest-insta/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Pytest plugin for snapshot testing";
     homepage = "https://github.com/vberlier/pytest-insta";
-    changelog = "https://github.com/vberlier/pytest-insta/blob/v${finalAttrs.src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/vberlier/pytest-insta/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/pytest-run-parallel/default.nix b/pkgs/development/python-modules/pytest-run-parallel/default.nix
index 838212cd38e0..7f7dfe9cad19 100644
--- a/pkgs/development/python-modules/pytest-run-parallel/default.nix
+++ b/pkgs/development/python-modules/pytest-run-parallel/default.nix
@@ -19,7 +19,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pytest-run-parallel";
   version = "0.8.2";
   pyproject = true;
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Quansight-Labs";
     repo = "pytest-run-parallel";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-/EoIemQvQFgo9Ic+ZcQJk7fC8S+OHOHaHODrsivarhY=";
   };
 
@@ -55,8 +55,8 @@ buildPythonPackage rec {
   meta = {
     description = "Simple pytest plugin to run tests concurrently";
     homepage = "https://github.com/Quansight-Labs/pytest-run-parallel";
-    changelog = "https://github.com/Quansight-Labs/pytest-run-parallel/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/Quansight-Labs/pytest-run-parallel/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ hexa ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix
index 72b67c58a3d2..b46373b85b9b 100644
--- a/pkgs/development/python-modules/pytest-subprocess/default.nix
+++ b/pkgs/development/python-modules/pytest-subprocess/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonAtLeast,
   fetchpatch,
   setuptools,
   pytest,
@@ -17,23 +16,22 @@
 
 buildPythonPackage rec {
   pname = "pytest-subprocess";
-  version = "1.5.3";
+  version = "1.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aklajnert";
     repo = "pytest-subprocess";
     tag = version;
-    hash = "sha256-3vBYOk/P78NOjAbs3fT6py5QOOK3fX+AKtO4j5vxZfk=";
+    hash = "sha256-TFTY6enuyzQx0U+qHVde71VHqVa0oEGbSJUwhMAsI7Q=";
   };
 
-  patches = lib.optionals (pythonAtLeast "3.13") [
+  patches = [
+    # https://github.com/aklajnert/pytest-subprocess/pull/202
     (fetchpatch {
-      # python 3.14 compat
-      # the patch however breaks 3.12:
-      # https://github.com/aklajnert/pytest-subprocess/issues/192
-      url = "https://github.com/aklajnert/pytest-subprocess/commit/be30d9a94ba45afb600717e3fcd95b8b2ff2c60e.patch";
-      hash = "sha256-TYk/Zu2MF+ROEKTgZI1rzA2MlW2it++xElfGZS0Dn5s=";
+      name = "fix-test_any_matching_program.patch";
+      url = "https://github.com/aklajnert/pytest-subprocess/commit/14c571b9b72a7b7e429189a9455fc715e6f0dbce.patch";
+      hash = "sha256-xDj5KSyv+JXRuMoUKpIr5oDN9y8V14LApRXbzNi9HI8=";
     })
   ];
 
@@ -51,8 +49,6 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  pytestFlags = [ "-Wignore::DeprecationWarning" ];
-
   meta = {
     description = "Plugin to fake subprocess for pytest";
     homepage = "https://github.com/aklajnert/pytest-subprocess";
diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index c651fdbf4326..59b44dfbec9a 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-bsblan";
-  version = "5.1.4";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "liudger";
     repo = "python-bsblan";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-97Hgsu0ipX5oSAZdCikaWhj6g3gEom/Is2wnm6vpblY=";
+    hash = "sha256-rp75cUDlciibMCpEEXn6zta6kquwCwXstRkA9A7JJYc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/python-debian/default.nix b/pkgs/development/python-modules/python-debian/default.nix
index 40a7f925dda3..c359e4631dfa 100644
--- a/pkgs/development/python-modules/python-debian/default.nix
+++ b/pkgs/development/python-modules/python-debian/default.nix
@@ -9,17 +9,17 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "python-debian";
-  version = "1.0.1";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "python-debian-team";
     repo = "python-debian";
-    tag = version;
-    hash = "sha256-lSKtlBqAa8cJZZHMVb90eYIGem4DwVZLldaYSAJBNek=";
+    tag = finalAttrs.version;
+    hash = "sha256-v2b9xobxCrSz0tOEBo6awmQuTyykyJlsryPBMRU9EmM=";
   };
 
   build-system = [
@@ -48,4 +48,4 @@ buildPythonPackage rec {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ nickcao ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix
index 35b5965ddf7c..793a6ab466de 100644
--- a/pkgs/development/python-modules/python-docs-theme/default.nix
+++ b/pkgs/development/python-modules/python-docs-theme/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-docs-theme";
-  version = "2025.12";
+  version = "2026.4";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: {
     owner = "python";
     repo = "python-docs-theme";
     tag = finalAttrs.version;
-    hash = "sha256-isKfYgakIsPdMSATx9tjjb+U8oERN560NkBDkbt9AeM=";
+    hash = "sha256-wfHon11V7fvK+PMWBY+MpxiPOyqIecRAu+rM4uONMzA=";
   };
 
   build-system = [ flit-core ];
@@ -30,7 +30,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Sphinx theme for CPython project";
     homepage = "https://github.com/python/python-docs-theme";
-    changelog = "https://github.com/python/python-docs-theme/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
+    changelog = "https://github.com/python/python-docs-theme/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.psfl;
     maintainers = with lib.maintainers; [ kaction ];
   };
diff --git a/pkgs/development/python-modules/python-iso639/default.nix b/pkgs/development/python-modules/python-iso639/default.nix
index 88f34647d506..c30777c78f1f 100644
--- a/pkgs/development/python-modules/python-iso639/default.nix
+++ b/pkgs/development/python-modules/python-iso639/default.nix
@@ -6,16 +6,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "python-iso639";
-  version = "2026.1.31";
+  version = "2026.4.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jacksonllee";
     repo = "iso639";
-    tag = "v${version}";
-    hash = "sha256-mavTbjf57EYUMil3DBOmTZl8WwRW7sjxddb4WuK+YlI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-aXckFcWG8zcP9GELTT5eHnQzklAYG70LyX34fhVGdTo=";
   };
 
   build-system = [ setuptools ];
@@ -27,10 +27,10 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/jacksonllee/iso639/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/jacksonllee/iso639/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "ISO 639 language codes, names, and other associated information";
     homepage = "https://github.com/jacksonllee/iso639";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix
index d298510eddab..5d79c54db215 100644
--- a/pkgs/development/python-modules/python-multipart/default.nix
+++ b/pkgs/development/python-modules/python-multipart/default.nix
@@ -15,16 +15,16 @@
   starlette,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "python-multipart";
-  version = "0.0.21";
+  version = "0.0.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kludex";
     repo = "python-multipart";
-    tag = version;
-    hash = "sha256-fvqXqQwU0JC4Pkvho5WGe/itlxttk1lKL7R5Vt0oKpA=";
+    tag = finalAttrs.version;
+    hash = "sha256-UegnwGxiXQalbp18t1dl2JOQH6BY975cpBa9uo3SOuk=";
   };
 
   build-system = [ hatchling ];
@@ -48,10 +48,10 @@ buildPythonPackage rec {
   };
 
   meta = {
-    changelog = "https://github.com/Kludex/python-multipart/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/Kludex/python-multipart/blob/${finalAttrs.version}/CHANGELOG.md";
     description = "Streaming multipart parser for Python";
     homepage = "https://github.com/Kludex/python-multipart";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ ris ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/python-obfuscator/default.nix b/pkgs/development/python-modules/python-obfuscator/default.nix
index af3c6b530e0f..ca3469b968ac 100644
--- a/pkgs/development/python-modules/python-obfuscator/default.nix
+++ b/pkgs/development/python-modules/python-obfuscator/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Module to obfuscate code";
     homepage = "https://github.com/davidteather/python-obfuscator";
-    changelog = "https://github.com/davidteather/python-obfuscator/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/davidteather/python-obfuscator/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/python-opendata-transport/default.nix b/pkgs/development/python-modules/python-opendata-transport/default.nix
index 03387302dbb1..047610cca456 100644
--- a/pkgs/development/python-modules/python-opendata-transport/default.nix
+++ b/pkgs/development/python-modules/python-opendata-transport/default.nix
@@ -2,39 +2,44 @@
   lib,
   aiohttp,
   buildPythonPackage,
-  fetchPypi,
-  setuptools,
+  fetchFromGitHub,
+  hatchling,
+  pytest-asyncio,
+  pytestCheckHook,
   urllib3,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "python-opendata-transport";
-  version = "0.5.0";
+  version = "0.6.2";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "python_opendata_transport";
-    inherit version;
-    hash = "sha256-CtYsks7Q33ww0Mr9ehhq7+fJhCsj4gxKytiCZ6G4Aqc=";
+  src = fetchFromGitHub {
+    owner = "home-assistant-ecosystem";
+    repo = "python-opendata-transport";
+    tag = finalAttrs.version;
+    hash = "sha256-CN+zy2x+4IKdAcpa2vIrOGXW39d+anU4HGPU83dGif0=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ hatchling ];
 
   dependencies = [
     aiohttp
     urllib3
   ];
 
-  # No tests are present
-  doCheck = false;
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "opendata_transport" ];
 
   meta = {
     description = "Python client for interacting with transport.opendata.ch";
     homepage = "https://github.com/home-assistant-ecosystem/python-opendata-transport";
-    changelog = "https://github.com/home-assistant-ecosystem/python-opendata-transport/releases/tag/${version}";
+    changelog = "https://github.com/home-assistant-ecosystem/python-opendata-transport/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix
index f4add78507a4..5f99c0e944fe 100644
--- a/pkgs/development/python-modules/python-otbr-api/default.nix
+++ b/pkgs/development/python-modules/python-otbr-api/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-otbr-api";
-  version = "2.9.0";
+  version = "2.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "python-otbr-api";
     tag = finalAttrs.version;
-    hash = "sha256-UhDcWw7QsKQ9t1SzdFoSf7ZrkUkKUaPwuMbrqEGA48o=";
+    hash = "sha256-WBL6R4yw/4yuF/T94NtaapGspn4L2H0glVatW6+hoRk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/python-youtube/default.nix b/pkgs/development/python-modules/python-youtube/default.nix
index d216e7219b40..2f5c72a2185b 100644
--- a/pkgs/development/python-modules/python-youtube/default.nix
+++ b/pkgs/development/python-modules/python-youtube/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "python-youtube";
-  version = "0.9.8";
+  version = "0.9.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sns-sdks";
     repo = "python-youtube";
     tag = "v${version}";
-    hash = "sha256-8Ozfga6gPLzPG770hluAgxIYI2TEX5uAe6BeMzIp+z4=";
+    hash = "sha256-80iGKxz3rwxuYB1bqEEMxMKogiiNK43tNrVnOiVPwWU=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix
index d50969710471..bdc067297370 100644
--- a/pkgs/development/python-modules/pytibber/default.nix
+++ b/pkgs/development/python-modules/pytibber/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytibber";
-  version = "0.37.1";
+  version = "0.37.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pyTibber";
     tag = finalAttrs.version;
-    hash = "sha256-r2EaT1e9ztmtLXtO9Bpr6mXVXlZQW74G2nTTkJAeZEA=";
+    hash = "sha256-ZM9oXX6iEmsR20f2Jgg3fME1lm3egKun1GvNOZIKTV0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix
index 83cd7fd1b3c7..691a0f672db7 100644
--- a/pkgs/development/python-modules/pytmx/default.nix
+++ b/pkgs/development/python-modules/pytmx/default.nix
@@ -2,18 +2,24 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools-scm,
+
+  # dependencies
   pygame,
   pyglet,
   pysdl2,
+
+  # tests
   pytestCheckHook,
-  setuptools-scm,
 }:
 
 buildPythonPackage {
   pname = "pytmx";
   version = "3.32";
-
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "bitcraft";
diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix
index 62bcb8a397ed..511278b7d6ea 100644
--- a/pkgs/development/python-modules/pytorch-lightning/default.nix
+++ b/pkgs/development/python-modules/pytorch-lightning/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pytorch-lightning";
-  version = "2.6.2";
+  version = "2.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lightning-AI";
     repo = "pytorch-lightning";
     tag = finalAttrs.version;
-    hash = "sha256-AUTCeRC0BvFmu+nDQ9ROecfk4Ifphe3x7Kv3cXPsACQ=";
+    hash = "sha256-zOSV2X3yZy0uh1lJ2yNl/hHBvfIDcIrATHtiRwThsQA=";
   };
 
   env.PACKAGE_NAME = "pytorch";
diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix
index 28cf124edf86..182a63c91648 100644
--- a/pkgs/development/python-modules/pyvips/default.nix
+++ b/pkgs/development/python-modules/pyvips/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
       --replace 'libvips.so.42' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \
       --replace 'libvips.42.dylib' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \
       --replace 'libgobject-2.0.so.0' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \
-      --replace 'libgobject-2.0.dylib' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \
+      --replace 'libgobject-2.0.dylib' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}'
   '';
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/pyworxcloud/default.nix b/pkgs/development/python-modules/pyworxcloud/default.nix
index 3a230dd7c1e2..107f65847846 100644
--- a/pkgs/development/python-modules/pyworxcloud/default.nix
+++ b/pkgs/development/python-modules/pyworxcloud/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pyworxcloud";
-  version = "6.3.5";
+  version = "6.3.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MTrab";
     repo = "pyworxcloud";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bfm+S5Yvto8UjvEfqFTKKqAIvgLJiLqxd7OeKkElZQY=";
+    hash = "sha256-9UBtzSo+CKbY8KXERdN+Cxu+D03qf33oTrXp288Qgik=";
   };
 
   pythonRelaxDeps = [ "awsiotsdk" ];
diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
index 89f14ce5782d..fbe48ea2cd47 100644
--- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
+++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "qcodes-contrib-drivers";
-  version = "0.24.0";
+  version = "0.24.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "QCoDeS";
     repo = "Qcodes_contrib_drivers";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8XEiBA+WHXrKczvXDIe4033U8JNLatxnHbsBZDorSC4=";
+    hash = "sha256-s3Q3UV2vvNBDrcYrcl9mh+3LRvnHGDxO7vUZd/OwJM8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/qh3/default.nix b/pkgs/development/python-modules/qh3/default.nix
index 55be7da2bb29..1f931f579ef6 100644
--- a/pkgs/development/python-modules/qh3/default.nix
+++ b/pkgs/development/python-modules/qh3/default.nix
@@ -14,19 +14,19 @@
 
 buildPythonPackage rec {
   pname = "qh3";
-  version = "1.7.1";
+  version = "1.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "qh3";
     tag = "v${version}";
-    hash = "sha256-duZstcheiv3eLPp2IMaZvYo5vq5SMBxcy7HQmBI0SaI=";
+    hash = "sha256-zZQyKQK/zJ58XnCgxk/SvexBF1Z+GBtvulhuhUiIago=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-BqUofzjfDNUhE27GYcV7CXUK2dT/BQ16Z5aQkHyYUIE=";
+    hash = "sha256-2HwwyHex1SE34dUGtooOf5LCkhkVhLpsoEHBFvLUkLM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix
index 8a5b5a650421..f74a5c1f7d00 100644
--- a/pkgs/development/python-modules/quart/default.nix
+++ b/pkgs/development/python-modules/quart/default.nix
@@ -71,7 +71,7 @@ buildPythonPackage rec {
     description = "Async Python micro framework for building web applications";
     mainProgram = "quart";
     homepage = "https://github.com/pallets/quart/";
-    changelog = "https://github.com/pallets/quart/blob/${src.tag}/CHANGES.rst";
+    changelog = "https://github.com/pallets/quart/blob/${src.tag}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ hexa ];
   };
diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index d7aa61ab488e..64d39f70ac98 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   clang-tools,
   cmake,
   cython,
@@ -19,34 +18,19 @@
 
 buildPythonPackage rec {
   pname = "rapidfuzz";
-  version = "3.14.3";
+  version = "3.14.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maxbachmann";
     repo = "RapidFuzz";
     tag = "v${version}";
-    hash = "sha256-DOXeZaD21Qsum4brBlMSFcBAUbNEOgCXc6AqEboP1e4=";
+    hash = "sha256-wF7eeSD6GQfN0EOwDvrgjMqN5u2wxXFlktQS7nIKgkU=";
   };
 
-  patches = [
-    # https://github.com/rapidfuzz/RapidFuzz/pull/463
-    (fetchpatch {
-      name = "support-taskflow-3.11.0.patch";
-      url = "https://github.com/rapidfuzz/RapidFuzz/commit/0ef2a4980c41b852283e6db7a747a1632307c75e.patch";
-      hash = "sha256-xb+J3PXwD51lZqIJcTzPJWrT/oqrIXxh1cLp91DhIPg=";
-    })
-    # https://github.com/rapidfuzz/RapidFuzz/pull/470
-    (fetchpatch {
-      name = "support-taskflow-4.0.0.patch";
-      url = "https://github.com/rapidfuzz/RapidFuzz/commit/4b794e6168d98fff4c518a64c4d809238b17d8fe.patch";
-      hash = "sha256-F4gwV4ewcHfR7ptcEVAvbiNFIvXqFCIM/Qk8giv4jAc=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "Cython >=3.1.6, <3.2.0" "Cython >=3.1.6"
+      --replace-fail "Cython >=3.1.6, <3.3.0" "Cython >=3.1.6"
   '';
 
   build-system = [
diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix
index ff5a984bac6e..f8f25cb29745 100644
--- a/pkgs/development/python-modules/ray/default.nix
+++ b/pkgs/development/python-modules/ray/default.nix
@@ -73,8 +73,9 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ray";
-  version = "2.55.0";
+  version = "2.55.1";
   format = "wheel";
+  __structuredAttres = true;
 
   disabled = pythonAtLeast "3.15";
 
@@ -90,22 +91,22 @@ buildPythonPackage (finalAttrs: {
       # Results are in ./ray-hashes.nix
       hashes = {
         x86_64-linux = {
-          cp311 = "sha256-UiSRRs/c92ns/+VPWyyvJVUb9up42d2JeIwKZpynabc=";
-          cp312 = "sha256-zUYL2/iopLt2iiDDixxTTYT+Y7wOXzWAxcDvcwK5hrM=";
-          cp313 = "sha256-8W3qMuXMWO1AbA7w3UvmnWDOd6B17bXwOANWpIv4WrM=";
-          cp314 = "sha256-6wpheWQbxCCmbuhcybOC5Y8i7/vTYpfjaDp5PlzcCJg=";
+          cp311 = "sha256-1TgtoYHAPuL1Au9Gzwrku8MBV7W9mmfXZR9qJyUoqFo=";
+          cp312 = "sha256-JjcF9rqynnYiqU+C2iX9f5zq12zfiaB6qyj3nN+PnZU=";
+          cp313 = "sha256-E4DgQ+tXzeabfpGZxvJVjO648PxByX0dXlDqBCEV8wI=";
+          cp314 = "sha256-FW7T5yrZW2RdIAbNcajd28yJtWv8AAJ/YiWt94vZy3Q=";
         };
         aarch64-linux = {
-          cp311 = "sha256-sf1zQnCT0a7x+3vTxUMKTmhtXhD6BAiXVxY6TCpRfes=";
-          cp312 = "sha256-t39AYHKsDOkEMaxDaCjzZMGDq1e6FcOg5oinSuPC0/M=";
-          cp313 = "sha256-zu6HqIRgKqs02xCUFeaDmm6RafR1DKtye36hYQ31uR8=";
-          cp314 = "sha256-t0OQ8gHyjwXI8lAGnf7VTW1qAQn/5IJCXXbBG+gg4wk=";
+          cp311 = "sha256-DqL2cKdyWDOtIzOoxGq2mGWtBsjl3p9laV4PjzUzHOw=";
+          cp312 = "sha256-JlQfabtVYH74M1uqx1su0S/yzgLVYxMhmyntoAMDkiE=";
+          cp313 = "sha256-tBXVkOBi8kiQfg/kKZSUPxFya3F4/PSxz1VGch+xpfg=";
+          cp314 = "sha256-TmGNYeGxS2/emlhhUfP9nUNbC4UEi5l7yqf0pTN0eys=";
         };
         aarch64-darwin = {
-          cp311 = "sha256-JCbpxFE8tIQr+vcKrt9LntwwL7Ad5cGQb2i5tCegwkM=";
-          cp312 = "sha256-bwuN+jcWzJvl/OO1Ppv9tzzqNgJb/m8dJ5KND4TP1pU=";
-          cp313 = "sha256-Hai4dVtuT94D23i2ziu87Pz70g05uTgz0kbFFdru3zw=";
-          cp314 = "sha256-1IvEUzs7dtWe0/nqsea3MipTp83vuPZX2bRu661W2+4=";
+          cp311 = "sha256-AFP9W0APesViY6obvT1o+3k0Gwi43Gl8iHgtWsp7PtQ=";
+          cp312 = "sha256-E3+QBu7ijKq4JggDzKMU83u9o/yU/foxx3C10Bliatg=";
+          cp313 = "sha256-+YRKknLvLm61dxAlhmByz0I0z0x8waMeI1t95xEYZL4=";
+          cp314 = "sha256-sGIEXGTCvOOaUWYWJPcpLHu/MPKp2Hhieq4x1G2lcS0=";
         };
       };
     in
diff --git a/pkgs/development/python-modules/rctclient/default.nix b/pkgs/development/python-modules/rctclient/default.nix
index a1a7a581be66..488ad68e7c1b 100644
--- a/pkgs/development/python-modules/rctclient/default.nix
+++ b/pkgs/development/python-modules/rctclient/default.nix
@@ -7,16 +7,16 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "rctclient";
-  version = "0.0.4";
+  version = "0.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "svalouch";
     repo = "python-rctclient";
-    tag = "v${version}";
-    hash = "sha256-QPla5h8wSM9Ynj44Uwc1a2yAnu8TXbyBWzVHQeW6jnI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-f85ETzuZpOgnWpiLipLtAjOPn63yniCffWdPLyCEC3w=";
   };
 
   build-system = [ setuptools ];
@@ -30,8 +30,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python implementation of the RCT Power GmbH Serial Communication Protocol";
     homepage = "https://github.com/svalouch/python-rctclient";
-    changelog = "https://github.com/svalouch/python-rctclient/releases/tag/${src.tag}";
-    license = with lib.licenses; [ gpl3Only ];
+    changelog = "https://github.com/svalouch/python-rctclient/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ _9R ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix
index 55d548fbdfab..6e5e7efcc2bc 100644
--- a/pkgs/development/python-modules/rdkit/default.nix
+++ b/pkgs/development/python-modules/rdkit/default.nix
@@ -137,7 +137,7 @@ buildPythonPackage rec {
       External/pubchem_shape/Wrap/CMakeLists.txt \
       --replace-fail \
         "find_package(Python3 COMPONENTS Interpreter Development.Module NumPy" \
-        "find_package(Python3 COMPONENTS Interpreter Development NumPy" \
+        "find_package(Python3 COMPONENTS Interpreter Development NumPy"
   '';
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/python-modules/reactivex/default.nix b/pkgs/development/python-modules/reactivex/default.nix
index af91ed442274..84cb4db4283a 100644
--- a/pkgs/development/python-modules/reactivex/default.nix
+++ b/pkgs/development/python-modules/reactivex/default.nix
@@ -2,10 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   poetry-core,
   pytest-asyncio,
   pytestCheckHook,
-  pythonAtLeast,
   typing-extensions,
 }:
 
@@ -14,9 +14,6 @@ buildPythonPackage rec {
   version = "4.1.0";
   pyproject = true;
 
-  # https://github.com/ReactiveX/RxPY/issues/737
-  disabled = pythonAtLeast "3.14";
-
   src = fetchFromGitHub {
     owner = "ReactiveX";
     repo = "RxPY";
@@ -24,6 +21,15 @@ buildPythonPackage rec {
     hash = "sha256-napPfp72gqy43UmkPu1/erhjmJbZypHZQikmjIFVBqA=";
   };
 
+  patches = [
+    # Upstream PR: https://github.com/ReactiveX/RxPY/pull/728
+    (fetchpatch {
+      name = "python-3.14.patch";
+      url = "https://github.com/ReactiveX/RxPY/commit/78f4a594ca2b0e27ad93ec0e1b1c0d56d5d6540d.patch";
+      hash = "sha256-1GQm/4BTd5ZnIqfEUSb0Ja3w0y1R9EoFpzwua7gpIzo=";
+    })
+  ];
+
   build-system = [ poetry-core ];
 
   dependencies = [ typing-extensions ];
diff --git a/pkgs/development/python-modules/realtime/default.nix b/pkgs/development/python-modules/realtime/default.nix
index 345d00f17c4b..34ac3f9bafb5 100644
--- a/pkgs/development/python-modules/realtime/default.nix
+++ b/pkgs/development/python-modules/realtime/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Client library for Supabase Functions";
     homepage = "https://github.com/supabase/supabase-py";
-    changelog = "https://github.com/supabase/supabase-py/blob/v${finalAttrs.src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/supabase/supabase-py/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ siegema ];
   };
diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index 5e6b93886aa1..66f7a75717a5 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "redis";
-  version = "7.2.1";
+  version = "7.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "redis-py";
     tag = "v${version}";
-    hash = "sha256-25FTKtGWTO8A2LFLk6DU0ebFKIrWrE8To0ex8jOn8+A=";
+    hash = "sha256-alrfAYzjvoYsaA2NYVgI56f3R+5ed4CsA35ZmvXnk6k=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix
index 3624dafe8bab..f1f77de34991 100644
--- a/pkgs/development/python-modules/reflex-chakra/default.nix
+++ b/pkgs/development/python-modules/reflex-chakra/default.nix
@@ -41,5 +41,6 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/reflex-dev/reflex-chakra/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
+    broken = true; # ImportError: cannot import name '_issubclass' from 'reflex.utils.types'
   };
 })
diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
deleted file mode 100644
index cd524f2b8f74..000000000000
--- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  hatchling,
-  charset-normalizer,
-  httpx,
-  pipdeptree,
-  platformdirs,
-  pydantic,
-  python-dateutil,
-  pyyaml,
-  rich,
-  tabulate,
-  typer,
-  websockets,
-}:
-
-buildPythonPackage rec {
-  pname = "reflex-hosting-cli";
-  version = "0.1.62";
-  pyproject = true;
-
-  # source is not published https://github.com/reflex-dev/reflex/issues/3762
-  src = fetchPypi {
-    pname = "reflex_hosting_cli";
-    inherit version;
-    hash = "sha256-ejq4ciGKfr36LqGGuDRAMi5lj6kM9+onCuwbr+HrDZg=";
-  };
-
-  pythonRelaxDeps = [
-    "click"
-    "rich"
-    "pipdeptree"
-  ];
-
-  build-system = [ hatchling ];
-
-  dependencies = [
-    charset-normalizer
-    httpx
-    pipdeptree
-    platformdirs
-    pydantic
-    python-dateutil
-    pyyaml
-    rich
-    tabulate
-    typer
-    websockets
-  ];
-
-  pythonImportsCheck = [
-    "reflex_cli"
-    "reflex_cli.cli"
-    "reflex_cli.deployments"
-  ];
-
-  # no tests on pypi
-  doCheck = false;
-
-  meta = {
-    description = "Reflex Hosting CLI";
-    homepage = "https://pypi.org/project/reflex-hosting-cli/";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ pbsds ];
-  };
-}
diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index e1661874280d..3b9cd46d0736 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -2,34 +2,39 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonAtLeast,
 
   # build-system
   hatchling,
-  pre-commit,
-  toml,
+  uv-dynamic-versioning,
 
   # dependencies
-  alembic,
+  requests,
   click,
   granian,
   httpx,
   packaging,
   platformdirs,
   psutil,
-  pydantic,
   python-multipart,
   python-socketio,
   redis,
-  reflex-hosting-cli,
   rich,
-  sqlmodel,
   starlette,
   typing-extensions,
   wrapt,
 
+  # sub package dependencies
+  pydantic,
+  griffelib,
+  mistletoe,
+  pyyaml,
+  typing-inspection,
+  email-validator,
+  ruff-format,
+
   # tests
   attrs,
+  typer,
   numpy,
   pandas,
   pillow,
@@ -41,71 +46,126 @@
   python-dotenv,
   ruff,
   starlette-admin,
-  unzip,
   uvicorn,
   versionCheckHook,
   writableTmpDirAsHomeHook,
 }:
 
+let
+
+  metaCommon = {
+    description = "Web apps in pure Python";
+    homepage = "https://github.com/reflex-dev/reflex";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ pbsds ];
+  };
+
+  buildSubPackage =
+    {
+      pname,
+      version,
+      src,
+      workspace,
+      workspaces,
+      subPkgs,
+    }:
+    buildPythonPackage {
+      inherit pname version src;
+      pyproject = true;
+      sourceRoot = "${src.name}/packages/${pname}";
+
+      build-system = [
+        hatchling
+        uv-dynamic-versioning
+        ruff
+      ]
+      ++ lib.optional (pname != "hatch-reflex-pyi") subPkgs.hatch-reflex-pyi;
+
+      preBuild = ''
+        # for .ruff_cache and whatnot, written by hatch-reflex-pyi
+        chmod -R +w ../..
+      '';
+
+      inherit (workspace) dependencies;
+
+      # the top-level package tests everything
+      doCheck = false;
+
+      meta = metaCommon;
+    };
+
+in
+
 buildPythonPackage (finalAttrs: {
   pname = "reflex";
-  version = "0.8.28";
+  version = "0.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "reflex-dev";
     repo = "reflex";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sohID83qFnXV8vsaRy+t4cKxkki97U7sFxHIEYIEWeY=";
+    hash = "sha256-YYy/K4AXeh9wS4Vodg3NOqwolPYHTgpP5/yWkutMsxo=";
   };
 
-  # For some reason, pre_commit is supposedly missing when python>=3.14
-  postPatch = lib.optionalString (pythonAtLeast "3.14") ''
-    substituteInPlace pyproject.toml \
-      --replace-fail '"pre_commit", ' ""
-  '';
-
   build-system = [
     hatchling
-    pre-commit
-    toml
+    uv-dynamic-versioning
   ];
 
-  dependencies = [
-    alembic
-    click
-    granian
-    httpx
-    packaging
-    platformdirs
-    psutil
-    pydantic
-    python-multipart
-    python-socketio
-    redis
-    reflex-hosting-cli
-    rich
-    sqlmodel
-    starlette
-    typing-extensions
-    wrapt
-  ]
-  ++ granian.optional-dependencies.reload;
+  nativeBuildInputs = [
+    ruff
+  ];
+
+  dependencies =
+    let
+      inherit (finalAttrs.passthru) subPkgs;
+    in
+    [
+      click
+      requests
+      granian
+      httpx
+      packaging
+      psutil
+      python-multipart
+      python-socketio
+      redis
+      rich
+      starlette
+      typing-extensions
+      wrapt
+      plotly
+
+      subPkgs.reflex-base
+      subPkgs.reflex-components-code
+      subPkgs.reflex-components-core
+      subPkgs.reflex-components-dataeditor
+      subPkgs.reflex-components-gridjs
+      subPkgs.reflex-components-lucide
+      subPkgs.reflex-components-markdown
+      subPkgs.reflex-components-moment
+      subPkgs.reflex-components-plotly
+      subPkgs.reflex-components-radix
+      subPkgs.reflex-components-react-player
+      subPkgs.reflex-components-recharts
+      subPkgs.reflex-components-sonner
+      subPkgs.reflex-hosting-cli
+    ]
+    ++ granian.optional-dependencies.reload;
 
   nativeCheckInputs = [
     attrs
+    typer
     numpy
     pandas
     pillow
     playwright
-    plotly
     pytest-asyncio
     pytest-mock
     pytestCheckHook
     python-dotenv
-    ruff
     starlette-admin
-    unzip
     uvicorn
     versionCheckHook
     writableTmpDirAsHomeHook
@@ -113,43 +173,254 @@ buildPythonPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
 
   disabledTests = [
-    # Tests touch network
-    "test_find_and_check_urls"
-    "test_event_actions"
-    "test_upload_file"
+    # Touches network
     "test_node_version"
+
     # /proc is too funky in nix sandbox
     "test_get_cpu_info"
+
     # flaky
     "test_preprocess" # KeyError: 'reflex___state____state'
     "test_send" # AssertionError: Expected 'post' to have been called once. Called 0 times.
     "test_state_manager_lock" # Lock expired for token 87164611-f...
-    # tries to pin the string of a traceback, doesn't account for ansi colors
-    "test_state_with_invalid_yield"
+
     # tries to run bun or npm
     "test_output_system_info"
-    # Comparison with magic string
-    "test_background_task_no_block"
+
     # reflex.utils.exceptions.StateSerializationError: Failed to serialize state
     # reflex___istate___dynamic____dill_state due to unpicklable object.
     "test_fallback_pickle"
+
+    # AssertionError (mocked_open.call_count == 2)
+    "test_delete_token_from_config"
   ];
 
   disabledTestPaths = [
     "tests/benchmarks/"
     "tests/integration/"
+
+    # circular imports (reflex-docgen)
+    "tests/units/docgen/test_class_and_component.py"
+    "tests/units/docgen/test_markdown.py"
+    "docs/app/tests/test_docgen_double_eval.py"
+
+    # circular imports (reflex_site_shared)
+    "docs/app/tests/test_routes.py"
   ];
 
   __darwinAllowLocalNetworking = true;
 
-  pythonImportsCheck = [ "reflex" ];
+  pythonImportsCheck = [
+    "reflex"
+    "reflex.admin"
+    "reflex.app"
+    "reflex.app_mixins.lifespan"
+    "reflex.app_mixins.middleware"
+    "reflex.app_mixins.mixin"
+    "reflex.assets"
+    "reflex.compiler"
+    "reflex.components"
+    "reflex.config"
+    "reflex.constants"
+    "reflex.custom_components"
+    "reflex.environment"
+    "reflex.event"
+    "reflex.experimental"
+    "reflex.experimental.client_state"
+    "reflex.experimental.hooks"
+    "reflex.experimental.memo"
+    "reflex.istate"
+    "reflex.middleware"
+    "reflex.model"
+    "reflex.page"
+    "reflex.plugins"
+    "reflex.plugins.sitemap"
+    "reflex.plugins.tailwind_v3"
+    "reflex.plugins.tailwind_v4"
+    "reflex.reflex"
+    "reflex.route"
+    "reflex.state"
+    "reflex.style"
+    "reflex.utils"
+    "reflex.vars"
+  ];
 
-  meta = {
-    description = "Web apps in pure Python";
-    homepage = "https://github.com/reflex-dev/reflex";
+  passthru = {
+    # all [tool.uv.sources] workspaces in pyproject.toml
+    workspaces =
+      let
+        inherit (finalAttrs.passthru) subPkgs;
+      in
+      # this is generated with:
+      # ./pkgs/development/python-modules/reflex/mk_workspaces.sh
+      {
+        hatch-reflex-pyi.dependencies = [
+          hatchling
+        ];
+        integrations-docs.dependencies = [
+        ];
+        reflex-base.dependencies = [
+          packaging
+          platformdirs
+          pydantic
+          rich
+          typing-extensions
+        ];
+        reflex-components-code.dependencies = [
+          subPkgs.reflex-base
+          subPkgs.reflex-components-core
+          subPkgs.reflex-components-lucide
+          subPkgs.reflex-components-radix
+          subPkgs.reflex-components-sonner
+          ruff
+        ];
+        reflex-components-core.dependencies = [
+          python-multipart
+          subPkgs.reflex-base
+          subPkgs.reflex-components-lucide
+          subPkgs.reflex-components-sonner
+          ruff
+          starlette
+          typing-extensions
+        ];
+        reflex-components-dataeditor.dependencies = [
+          subPkgs.reflex-base
+          subPkgs.reflex-components-core
+          subPkgs.reflex-components-lucide
+          subPkgs.reflex-components-sonner
+          ruff
+        ];
+        reflex-components-gridjs.dependencies = [
+          subPkgs.reflex-base
+          ruff
+        ];
+        reflex-components-internal.dependencies = [
+          finalAttrs.finalPackage # reflex
+          subPkgs.reflex-base
+          subPkgs.reflex-components-code
+          subPkgs.reflex-components-core
+          subPkgs.reflex-components-dataeditor
+          subPkgs.reflex-components-gridjs
+          subPkgs.reflex-components-lucide
+          subPkgs.reflex-components-markdown
+          subPkgs.reflex-components-moment
+          subPkgs.reflex-components-plotly
+          subPkgs.reflex-components-radix
+          subPkgs.reflex-components-react-player
+          subPkgs.reflex-components-recharts
+          subPkgs.reflex-components-sonner
+          subPkgs.reflex-hosting-cli
+          ruff
+        ];
+        reflex-components-lucide.dependencies = [
+          subPkgs.reflex-base
+          ruff
+        ];
+        reflex-components-markdown.dependencies = [
+          subPkgs.reflex-base
+          subPkgs.reflex-components-code
+          subPkgs.reflex-components-core
+          subPkgs.reflex-components-lucide
+          subPkgs.reflex-components-radix
+          subPkgs.reflex-components-sonner
+          ruff
+        ];
+        reflex-components-moment.dependencies = [
+          subPkgs.reflex-base
+          ruff
+        ];
+        reflex-components-plotly.dependencies = [
+          subPkgs.reflex-base
+          subPkgs.reflex-components-core
+          subPkgs.reflex-components-lucide
+          subPkgs.reflex-components-sonner
+          ruff
+        ];
+        reflex-components-radix.dependencies = [
+          subPkgs.reflex-base
+          subPkgs.reflex-components-core
+          subPkgs.reflex-components-lucide
+          subPkgs.reflex-components-sonner
+          ruff
+        ];
+        reflex-components-react-player.dependencies = [
+          subPkgs.reflex-base
+          subPkgs.reflex-components-core
+          subPkgs.reflex-components-lucide
+          subPkgs.reflex-components-sonner
+          ruff
+        ];
+        reflex-components-recharts.dependencies = [
+          subPkgs.reflex-base
+          ruff
+        ];
+        reflex-components-sonner.dependencies = [
+          subPkgs.reflex-base
+          subPkgs.reflex-components-lucide
+          ruff
+        ];
+        reflex-docgen.dependencies = [
+          griffelib
+          mistletoe
+          pyyaml
+          finalAttrs.finalPackage # reflex
+          typing-extensions
+          typing-inspection
+        ];
+        reflex-hosting-cli.dependencies = [
+          click
+          httpx
+          packaging
+          platformdirs
+          rich
+        ];
+        reflex-site-shared.dependencies = [
+          email-validator
+          httpx
+          pyyaml
+          finalAttrs.finalPackage # reflex
+          subPkgs.reflex-base
+          subPkgs.reflex-components-code
+          subPkgs.reflex-components-core
+          subPkgs.reflex-components-dataeditor
+          subPkgs.reflex-components-gridjs
+          subPkgs.reflex-components-internal
+          subPkgs.reflex-components-lucide
+          subPkgs.reflex-components-markdown
+          subPkgs.reflex-components-moment
+          subPkgs.reflex-components-plotly
+          subPkgs.reflex-components-radix
+          subPkgs.reflex-components-react-player
+          subPkgs.reflex-components-recharts
+          subPkgs.reflex-components-sonner
+          subPkgs.reflex-hosting-cli
+          ruff
+          ruff-format
+        ];
+      };
+
+    inherit buildSubPackage;
+    subPkgs = lib.flip lib.mapAttrs finalAttrs.passthru.workspaces (
+      pname: workspace:
+      (finalAttrs.passthru.buildSubPackage {
+        inherit pname workspace;
+        inherit (finalAttrs) version src;
+        inherit (finalAttrs.passthru) workspaces subPkgs;
+      })
+    );
+
+    tests = {
+      reflex-no-checks = finalAttrs.finalPackage.overrideAttrs (old: {
+        pname = "${old.pname}-sans-checks-phase";
+        doCheck = false;
+        nativeCheckInputs = [ ];
+      });
+    }
+    // finalAttrs.passthru.subPkgs;
+  };
+
+  meta = metaCommon // {
     changelog = "https://github.com/reflex-dev/reflex/releases/tag/${finalAttrs.src.tag}";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ pbsds ];
     mainProgram = "reflex";
   };
 })
diff --git a/pkgs/development/python-modules/reflex/mk_workspaces.sh b/pkgs/development/python-modules/reflex/mk_workspaces.sh
new file mode 100755
index 000000000000..f162c1fcc56d
--- /dev/null
+++ b/pkgs/development/python-modules/reflex/mk_workspaces.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env nix-shell
+#!nix-shell --pure -i bash -p nix jq yq
+set -euo pipefail
+
+src=$(nix-build . -A python3Packages.reflex.src --no-out-link)
+# echo >&2 "src=$src"; exit 0 # DEBUG
+
+declare -a workspace_paths=( "$src"/packages/* )
+# printf >&2 "%s\n" "${workspace_paths[@]}"; exit 0 # DEBUG
+
+declare -a workspaces=( "${workspace_paths[@]##*/}" )
+# printf >&2 "%s\n" "${workspaces[@]}"; exit 0 # DEBUG
+
+workspaces_json=$( printf '"%s"\n' "${workspaces[@]}" | jq -s '.' -c )
+
+for workspace in "${workspaces[@]}"; do
+  echo "$workspace.dependencies = ["
+  tomlq <"$src/packages/$workspace/pyproject.toml" \
+    --argjson "workspaces" "$workspaces_json" \
+    '.project.dependencies + (.tool.hatch.build.hooks."reflex-pyi".dependencies // [])
+      | map( split("[ !><=]"; null)[0] ) # remove ">= 1.2.3"
+      | map( gsub("_"; "-") )            # normalize attrpath/pname
+      | unique[]
+      | if (. as $dep | $workspaces|index($dep) != null) then
+          "  subPkgs.\(.)"
+        elif . == "reflex" then
+          "  finalAttrs.finalPackage # reflex"
+        else
+          "  \(.)"
+        end
+    ' -r
+  echo '];'
+done
diff --git a/pkgs/development/python-modules/rendercv-fonts/default.nix b/pkgs/development/python-modules/rendercv-fonts/default.nix
index 0e295edc48cf..e45be15d7d00 100644
--- a/pkgs/development/python-modules/rendercv-fonts/default.nix
+++ b/pkgs/development/python-modules/rendercv-fonts/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   # pythonRelaxDeps seems not taking effect for the build-system dependencies
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail 'hatchling==1.26.3' 'hatchling' \
+      --replace-fail 'hatchling==1.26.3' 'hatchling'
   '';
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/requests-hardened/default.nix b/pkgs/development/python-modules/requests-hardened/default.nix
index d1078070bfc3..45d6448958e7 100644
--- a/pkgs/development/python-modules/requests-hardened/default.nix
+++ b/pkgs/development/python-modules/requests-hardened/default.nix
@@ -14,14 +14,14 @@
 }:
 buildPythonPackage rec {
   pname = "requests-hardened";
-  version = "1.2.0";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "saleor";
     repo = "requests-hardened";
     tag = "v${version}";
-    hash = "sha256-J4xQY2W5upJQ3hrA2hjkw8voLpxNPpekNwmyMKKAVAo=";
+    hash = "sha256-tvSS3z1fhQdcxvsj5vK//mr5xYeIrLl+6/gtnWsiETk=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix
index e94e1d8c5cd3..191096580f51 100644
--- a/pkgs/development/python-modules/requests-ratelimiter/default.nix
+++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "requests-ratelimiter";
-  version = "0.9.3";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JWCook";
     repo = "requests-ratelimiter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-73/B9PlkZOm51srTzDFP+VXxlE77Ge5Mt5iY5fVagkk=";
+    hash = "sha256-P6tDx/jzGEyFC10WIyHQZIFMSEmtMnHjl+jEih987j8=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/requests-sse/default.nix b/pkgs/development/python-modules/requests-sse/default.nix
new file mode 100644
index 000000000000..fe985428c205
--- /dev/null
+++ b/pkgs/development/python-modules/requests-sse/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  requests,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "requests-sse";
+  version = "0.5.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "overcat";
+    repo = "requests-sse";
+    tag = finalAttrs.version;
+    hash = "sha256-+Zv7k+cYux7aBZk9MN7ySZh+pQUHNa6KjwxQ4l4aFxA=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    requests
+  ];
+
+  pythonImportsCheck = [
+    "requests_sse"
+  ];
+
+  # tests require internet access
+  doCheck = false;
+
+  meta = {
+    description = "Server-sent events python client library based on requests";
+    homepage = "https://github.com/overcat/requests-sse";
+    changelog = "https://github.com/overcat/requests-sse/blob/${finalAttrs.src.rev}/CHANGES.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
+  };
+})
diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index 9622c005d0e0..633658bec1ec 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "requests";
-  version = "2.32.5";
+  version = "2.33.1";
   pyproject = true;
 
   __darwinAllowLocalNetworking = true;
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "psf";
     repo = "requests";
     tag = "v${version}";
-    hash = "sha256-cEBalMFoYFaGG8M48k+OEBvzLegzrTNP1NxH2ljP6qg=";
+    hash = "sha256-cQnCTMmpdkvWwt7RFAIhAfmhVwGVn0Y8Z5Tr6lzDmS8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix
index 0bae3f20b92c..60fe41dff852 100644
--- a/pkgs/development/python-modules/rerun-sdk/default.nix
+++ b/pkgs/development/python-modules/rerun-sdk/default.nix
@@ -31,6 +31,7 @@
 buildPythonPackage {
   pname = "rerun-sdk";
   pyproject = true;
+  __structuredAttrs = true;
 
   inherit (rerun)
     src
diff --git a/pkgs/development/python-modules/rf-protocols/default.nix b/pkgs/development/python-modules/rf-protocols/default.nix
new file mode 100644
index 000000000000..6a832383ba15
--- /dev/null
+++ b/pkgs/development/python-modules/rf-protocols/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  prek,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "rf-protocols";
+  version = "2.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "rf-protocols";
+    tag = finalAttrs.version;
+    hash = "sha256-eB9Rcgd2eRs4Wx9Vjw//BT0jPPXN/PS0sukXOwmNnuc=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [
+    prek
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "rf_protocols" ];
+
+  meta = {
+    description = "Library to decode and encode radio frequency signals";
+    homepage = "https://github.com/home-assistant-libs/rf-protocols";
+    changelog = "https://github.com/home-assistant-libs/rf-protocols/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+})
diff --git a/pkgs/development/python-modules/rgbxy/default.nix b/pkgs/development/python-modules/rgbxy/default.nix
new file mode 100644
index 000000000000..df9b072c3ae7
--- /dev/null
+++ b/pkgs/development/python-modules/rgbxy/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "rgbxy";
+  # version 0.5 suffix is based upon pypi version not tagged on GitHub, see:
+  # - https://pypi.org/project/rgbxy/
+  # - https://github.com/benknight/hue-python-rgb-converter/tags
+  version = "0.5-unstable-2025-12-16";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "benknight";
+    repo = "hue-python-rgb-converter";
+    rev = "22a09c3c7d395b6e7b91b5f82944ccf1a7e9e47a";
+    hash = "sha256-J14vg/kDF1TuLt6kTNHN/5qxqDHbxkdGkqEAn3V57nU=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "rgbxy"
+  ];
+
+  meta = {
+    description = "RGB conversion tool written in Python for Philips Hue";
+    homepage = "https://github.com/benknight/hue-python-rgb-converter";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+})
diff --git a/pkgs/development/python-modules/rich-tables/default.nix b/pkgs/development/python-modules/rich-tables/default.nix
index 2c7d29b51316..7fd8038aa9d8 100644
--- a/pkgs/development/python-modules/rich-tables/default.nix
+++ b/pkgs/development/python-modules/rich-tables/default.nix
@@ -1,29 +1,39 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+
+  # build-system
   poetry-core,
+
+  # dependencies
   coloraide,
+  decorator,
   humanize,
   multimethod,
   platformdirs,
   rich,
   sqlparse,
   typing-extensions,
-  rgbxy ? null,
+
+  # tests
+  pytestCheckHook,
+  pytest-cov-stub,
+  freezegun,
+
+  # passthru
+  rgbxy,
 }:
-let
-  version = "0.8.0";
-in
-buildPythonPackage {
+buildPythonPackage (finalAttrs: {
   pname = "rich-tables";
-  inherit version;
+  version = "0.9.0";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "rich_tables";
-    inherit version;
-    hash = "sha256-MN8QH6kLyogbcQ0VE9U034cwSFnaFDB2/Rnvy1DYyl4=";
+  src = fetchFromGitHub {
+    owner = "snejus";
+    repo = "rich-tables";
+    tag = finalAttrs.version;
+    hash = "sha256-6sXWrFP8TDBcFaGCymsZfHL8bfsRbj63VZCeY1H6h/Y=";
   };
 
   build-system = [
@@ -32,6 +42,7 @@ buildPythonPackage {
 
   dependencies = [
     coloraide
+    decorator
     humanize
     multimethod
     platformdirs
@@ -40,6 +51,13 @@ buildPythonPackage {
     typing-extensions
   ];
 
+  nativeBuildInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    freezegun
+  ]
+  ++ finalAttrs.finalPackage.passthru.optional-dependencies.hue;
+
   optional-dependencies = {
     hue = [
       rgbxy
@@ -63,4 +81,4 @@ buildPythonPackage {
     ];
     mainProgram = "table";
   };
-}
+})
diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix
index 8e106b949c65..45f634ca431f 100644
--- a/pkgs/development/python-modules/rlax/default.nix
+++ b/pkgs/development/python-modules/rlax/default.nix
@@ -22,18 +22,25 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "rlax";
   version = "0.1.8";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "rlax";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-E/zYFd5bfx58FfA3uR7hzRAIs844QzJA8TZTwmwDByk=";
   };
 
+  # TypeError: clip() got an unexpected keyword argument 'a_min'
+  postPatch = ''
+    substituteInPlace rlax/_src/mpo_ops.py \
+      --replace-fail "a_min=" "min="
+  '';
+
   build-system = [
     flit-core
   ];
@@ -82,8 +89,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library of reinforcement learning building blocks in JAX";
     homepage = "https://github.com/deepmind/rlax";
-    changelog = "https://github.com/google-deepmind/rlax/releases/tag/${src.tag}";
+    changelog = "https://github.com/google-deepmind/rlax/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ onny ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index c39588c5bdf0..8e98127716cd 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "rns";
-  version = "1.1.6";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
     tag = finalAttrs.version;
-    hash = "sha256-21ym6R2zPxm8Z4zO6g/ZA4/A4S0SmwhOEqC6B+DTpOI=";
+    hash = "sha256-DsEE+KRR4INC6kR39VCWrhMgEHNPexrQABYea5OSntI=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix
index 7ff29f6201b4..f3ebbed7d38e 100644
--- a/pkgs/development/python-modules/rocketchat-api/default.nix
+++ b/pkgs/development/python-modules/rocketchat-api/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "rocketchat-api";
-  version = "3.5.0";
+  version = "3.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jadolg";
     repo = "rocketchat_API";
     tag = version;
-    hash = "sha256-IbynNQLRgVCY2I9rZ3S4annJ0ogiuRKLHJ2P9qvpj4o=";
+    hash = "sha256-GYk3ZMAothllMxFhSFc2p4nX0wQOaWtltcrXpwK6lzE=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index 246d508816a8..8f3c55996e7d 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   buildPythonPackage,
+  pythonAtLeast,
 
   # build-system
   hatchling,
@@ -22,14 +23,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "rq";
-  version = "2.7";
+  version = "2.8";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "rq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-332K+n3mWf+k7/QvIFJFhuDXqd1t2p8ZVv/l+Y167Bk=";
+    hash = "sha256-ZO67rsqub9hBUt4XMqrx+P7Dj1dEKD9zp4O5x1Kehe0=";
   };
 
   build-system = [ hatchling ];
@@ -57,11 +59,24 @@ buildPythonPackage (finalAttrs: {
   # redisTestHook does not work on darwin-x86_64
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
-    # PermissionError: [Errno 13] Permission denied: '/tmp/rq-tests.txt'
-    "test_deleted_jobs_arent_executed"
-    "test_suspend_worker_execution"
-  ];
+  disabledTests =
+    lib.optionals
+      ((pythonAtLeast "3.14") && stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64)
+      [
+        # AssertionError
+        "test_create_job_with_ttl_should_expire"
+        "test_execution_order_with_dual_dependency"
+        "test_execution_order_with_sole_dependency"
+        "test_sigint_handling"
+        "test_successful_job_repeat"
+        "test_suspend_worker_execution"
+        "test_work"
+      ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # PermissionError: [Errno 13] Permission denied: '/tmp/rq-tests.txt'
+      "test_deleted_jobs_arent_executed"
+      "test_suspend_worker_execution"
+    ];
 
   pythonImportsCheck = [ "rq" ];
 
diff --git a/pkgs/development/python-modules/rtf-tokenize/default.nix b/pkgs/development/python-modules/rtf-tokenize/default.nix
new file mode 100644
index 000000000000..0f54f2775e6d
--- /dev/null
+++ b/pkgs/development/python-modules/rtf-tokenize/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  python,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  versionCheckHook,
+  which,
+}:
+
+buildPythonPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "rtf-tokenize";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openstenoproject";
+    repo = "rtf_tokenize";
+    tag = finalAttrs.version;
+    hash = "sha256-bM/DFl1mpHgeBItdyA5Tt+Eo9u82Gz+6qwft2h0bM94=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    which
+  ];
+
+  versionCheckProgramArg = "${placeholder "out"}/${python.sitePackages}";
+
+  preInstallCheck = ''
+    versionCheckProgram="$(which ls)"
+  '';
+
+  pythonImportsCheck = [ "rtf_tokenize" ];
+
+  meta = {
+    description = "Simple RTF tokenizer package for Python";
+    homepage = "https://github.com/openstenoproject/rtf_tokenize";
+    license = lib.licenses.gpl2Plus; # https://github.com/openstenoproject/rtf_tokenize/issues/1
+    maintainers = with lib.maintainers; [
+      pandapip1
+      ShamrockLee
+    ];
+  };
+})
diff --git a/pkgs/development/python-modules/ruff-format/default.nix b/pkgs/development/python-modules/ruff-format/default.nix
new file mode 100644
index 000000000000..ec1073f6df4c
--- /dev/null
+++ b/pkgs/development/python-modules/ruff-format/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  cargo,
+  rustPlatform,
+  rustc,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "ruff-format";
+  version = "0.5.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "reflex-dev";
+    repo = "ruff-format";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7XWeEcvbsVffaDbGDW2251qaZtUj6Sip3TEs9lytoo8=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-D19Irgy8kh14neAJDMlNRQ81qyYB8NNZ25wxjbUk7wk=";
+  };
+
+  build-system = [
+    cargo
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+    rustc
+  ];
+
+  pythonImportsCheck = [
+    "ruff_format"
+  ];
+
+  meta = {
+    description = "Fast Python code formatter";
+    homepage = "https://github.com/reflex-dev/ruff-format";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pbsds ];
+  };
+})
diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index 63e91a184f73..d3cc520cf32a 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "2026.1.0";
+  version = "2026.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "s3fs";
     tag = version;
-    hash = "sha256-wkcDViE2Vr1fFMMFz3o7ewlI5UvVnWV7jIa9Es8d9Do=";
+    hash = "sha256-CWZHu9PXW/YZosCVtnCJ4T6eQCmrdFcP0vkoGr+RAhM=";
   };
 
   build-system = [
@@ -61,6 +61,7 @@ buildPythonPackage rec {
   disabledTests = [
     # require network access
     "test_async_close"
+    "test_session_close"
   ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index e1c8319ac354..179c83a53211 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sagemaker-core";
-  version = "1.0.77";
+  version = "1.0.78";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-core";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UWoRYMk2QUjgCaa76xJ8o6OyAiM0Zyf4jXgT4AYm8PM=";
+    hash = "sha256-pSxOMbw6ZUdlVTYoSW5ZwpTTh5VEJFf8U6sNq6kb5vM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/sagemaker-mlflow/default.nix b/pkgs/development/python-modules/sagemaker-mlflow/default.nix
index 096108afa892..3a84be94939d 100644
--- a/pkgs/development/python-modules/sagemaker-mlflow/default.nix
+++ b/pkgs/development/python-modules/sagemaker-mlflow/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker-mlflow";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-mlflow";
     tag = "v${version}";
-    hash = "sha256-EmfEqL+J+cZVdBfUJtAPHpUZCoDV4X1yRfVJYWky1HU=";
+    hash = "sha256-riCoUpao9QIrQMb7r9stJO/xTSsDfL+uNS664W5GRQc=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/satel-integra/default.nix b/pkgs/development/python-modules/satel-integra/default.nix
index 0c0eeec32372..387c6d5a0add 100644
--- a/pkgs/development/python-modules/satel-integra/default.nix
+++ b/pkgs/development/python-modules/satel-integra/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "satel-integra";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "c-soft";
     repo = "satel_integra";
     tag = version;
-    hash = "sha256-haSCSWLHEvd4AUXMvopYjFdEXQ2u6IGrT7q3sY711PQ=";
+    hash = "sha256-bYwAW8mbgE4D6xvAmkOPewAGkKJuF5AKPjXGeaJpk6s=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/scanpy/default.nix b/pkgs/development/python-modules/scanpy/default.nix
index 1bb17259226a..cad855c690a3 100644
--- a/pkgs/development/python-modules/scanpy/default.nix
+++ b/pkgs/development/python-modules/scanpy/default.nix
@@ -180,7 +180,7 @@ buildPythonPackage (finalAttrs: {
     export NUMBA_CACHE_DIR=$(mktemp -d);
   '';
 
-  pytestFlagsArray = [
+  pytestFlags = [
     # UserWarning: 'where' used without 'out', expect unitialized memory in output.
     # If this is intentional, use out=None.
     "-Wignore::UserWarning"
diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix
index e5b268701a48..d7136209d98a 100644
--- a/pkgs/development/python-modules/scikit-base/default.nix
+++ b/pkgs/development/python-modules/scikit-base/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-base";
-  version = "0.13.2";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sktime";
     repo = "skbase";
     tag = "v${version}";
-    hash = "sha256-NZpuc2MUziqpzB2x7ae9xH8mWzia2j/cgzUbJKAVTqE=";
+    hash = "sha256-qKMOvGm876zG2P9W593922YZvOOCSgUeEWXWkKiTnEY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index a75e0e565e6a..03cb2f7f66cd 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -105,12 +105,15 @@ let
       rm -r skimage
     '';
 
-    pytestFlagsArray = [
-      "${installedPackageRoot}"
+    pytestFlags = [
       "--pyargs"
       "skimage"
     ];
 
+    enabledTestPaths = [
+      installedPackageRoot
+    ];
+
     disabledTestPaths = [
       # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error).
       "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py"
diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix
index 1e9d4625ba5f..a32c9c46faa6 100644
--- a/pkgs/development/python-modules/scooby/default.nix
+++ b/pkgs/development/python-modules/scooby/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "scooby";
-  version = "0.11.0";
+  version = "0.11.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "banesullivan";
     repo = "scooby";
     tag = "v${version}";
-    hash = "sha256-krExDVT9evG9ODZjTGpX+S1ygh7lMob06fzOwhh/hzA=";
+    hash = "sha256-PP54hFyoM+QdKik9Gj0H6JhF8Ypqnh9yO/Z42O6NO4A=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix
index ab14e3a07e95..f0257c66503d 100644
--- a/pkgs/development/python-modules/sdds/default.nix
+++ b/pkgs/development/python-modules/sdds/default.nix
@@ -4,12 +4,13 @@
   fetchFromGitHub,
   numpy,
   pytestCheckHook,
+  hatchling,
 }:
 
 buildPythonPackage rec {
   pname = "sdds";
   version = "0.4.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pylhc";
@@ -18,7 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-2lsim4FlOKBZ4Lk/iKIcItE/hvqiAK4XTkoxm52At/8=";
   };
 
-  propagatedBuildInputs = [ numpy ];
+  build-system = [ hatchling ];
+
+  dependencies = [ numpy ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/sebaubuntu-libs/default.nix b/pkgs/development/python-modules/sebaubuntu-libs/default.nix
new file mode 100644
index 000000000000..91a1429d2bcd
--- /dev/null
+++ b/pkgs/development/python-modules/sebaubuntu-libs/default.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  nix-update-script,
+  android-image-kitchen,
+  gitpython,
+  poetry-core,
+  pyelftools,
+  requests,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "sebaubuntu-libs";
+  version = "2.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sebaubuntu-python";
+    repo = "sebaubuntu_libs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LV7Me+GmgOvDh0XGoLaftCKtP/fnB5xVqb8nArOMIys=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  dependencies = [
+    gitpython
+    pyelftools
+    requests
+  ];
+
+  postPatch = ''
+    # Patch libaik to use AIK from nixpkgs
+    substituteInPlace sebaubuntu_libs/libaik/__init__.py \
+      --replace-fail \
+        "Repo.clone_from(AIK_REPO, self.path)" "" \
+      --replace-fail \
+        "unpackimg.sh" "${lib.getExe' android-image-kitchen "aik-unpackimg"}" \
+      --replace-fail \
+        "repack.sh" "${lib.getExe' android-image-kitchen "aik-repackimg"}" \
+      --replace-fail \
+        "cleanup.sh" "${lib.getExe' android-image-kitchen "aik-cleanup"}" \
+      --replace-fail \
+        'command = [self.path / script, "--nosudo", *args]' \
+        'command = [script, "--nosudo", *args]' \
+      --replace-fail \
+        'return check_output(command, stderr=STDOUT, universal_newlines=True, encoding="utf-8")' \
+        'return check_output(command, stderr=STDOUT, universal_newlines=True, encoding="utf-8",
+          cwd=self.path)'
+  '';
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "sebaubuntu_libs" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "SebaUbuntu's shared libs";
+    homepage = "https://github.com/sebaubuntu-python/sebaubuntu_libs";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+  };
+})
diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix
index 53056bbcdd13..63968d773aee 100644
--- a/pkgs/development/python-modules/segments/default.nix
+++ b/pkgs/development/python-modules/segments/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "segments";
-  version = "2.3.0";
+  version = "2.4.0";
   pyproject = true;
   disabled = isPy27;
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "cldf";
     repo = "segments";
     rev = "v${version}";
-    sha256 = "sha256-5VgjaWeinXimpoCBhKBvVOmvcCIWrOqYMQegVDGJAKo=";
+    sha256 = "sha256-XhJH87Bb9wGNPpPymRjgPYLv2zr4hGAyIAbTMk0uCU0=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/serialx/default.nix b/pkgs/development/python-modules/serialx/default.nix
index f06d9064ab79..dc05c2455149 100644
--- a/pkgs/development/python-modules/serialx/default.nix
+++ b/pkgs/development/python-modules/serialx/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "serialx";
-  version = "1.2.3";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "puddly";
     repo = "serialx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FroHqWuNGna5FxP4PXZzhADaNNRQnVjG9S5JJq4CVkQ=";
+    hash = "sha256-ttKnjpF3SYo2QIKMuPU2EuTTp/Hq0s+4gvNdXdNApbs=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -62,6 +62,8 @@ buildPythonPackage (finalAttrs: {
   disabledTests = [
     # tries to access /sys/class/tty in sandbox
     "test_compat_tools_module"
+    # connects to 192.0.2.1
+    "test_async_socket_connect_timeout"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/shiboken6-generator/default.nix b/pkgs/development/python-modules/shiboken6-generator/default.nix
new file mode 100644
index 000000000000..680a952cdcfa
--- /dev/null
+++ b/pkgs/development/python-modules/shiboken6-generator/default.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  fetchgit,
+  llvmPackages,
+  python,
+  cmake,
+  stdenv,
+}:
+
+let
+  stdenv' = if stdenv.cc.isClang then stdenv else llvmPackages.stdenv;
+in
+stdenv'.mkDerivation (finalAttrs: {
+  pname = "shiboken6-generator";
+  version = "6.11.0";
+
+  src = fetchgit {
+    url = "https://code.qt.io/pyside/pyside-setup.git";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UbvH+wNiXjfMhaRUODx3p2cJmAz/dJ5kjPSprGKwsYg=";
+  };
+
+  patches = [
+    ./fix-include-qt-headers.patch
+  ];
+
+  sourceRoot = "${finalAttrs.src.name}/sources/shiboken6_generator";
+
+  nativeBuildInputs = [
+    cmake
+    python.pkgs.ninja
+    (python.withPackages (ps: [
+      ps.packaging
+      ps.setuptools
+    ]))
+  ];
+
+  buildInputs = [
+    llvmPackages.llvm
+    llvmPackages.libclang
+    python.pkgs.qt6.qtbase
+  ];
+
+  cmakeFlags = [
+    "-Dis_pyside6_superproject_build=1"
+  ];
+
+  dontWrapQtApps = true;
+
+  postInstall = ''
+    cd ../../..
+    chmod +w .
+    python3 setup.py egg_info --build-type=shiboken6-generator
+    cp -r shiboken6_generator.egg-info $out/${python.sitePackages}/
+  '';
+
+  meta = {
+    description = "Generator for the pyside6 Qt bindings - tools";
+    license = with lib.licenses; [
+      lgpl3Only
+      gpl2Only
+      gpl3Only
+    ];
+    homepage = "https://wiki.qt.io/Qt_for_Python";
+    changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}";
+    maintainers = [ ];
+    platforms = lib.platforms.all;
+    mainProgram = "shiboken6";
+  };
+})
diff --git a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch b/pkgs/development/python-modules/shiboken6-generator/fix-include-qt-headers.patch
similarity index 88%
rename from pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
rename to pkgs/development/python-modules/shiboken6-generator/fix-include-qt-headers.patch
index c9b2d51a94df..d8693a0701f6 100644
--- a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
+++ b/pkgs/development/python-modules/shiboken6-generator/fix-include-qt-headers.patch
@@ -8,7 +8,7 @@
  
  #include <clang-c/Index.h>
  
-@@ -638,6 +639,13 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
+@@ -391,6 +392,13 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
  {
      QByteArrayList result;
      HeaderPaths headerPaths;
@@ -19,16 +19,17 @@
 +    // /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-qtbase-6.4.2-dev/include
 +    QRegularExpression qtHeaderRegex(uR"(/[0-9a-z]{32}-qt[a-z0-9]+-)"_s);
 +
-     switch (compiler()) {
+     switch (_optionsTriplet.compiler()) {
      case Compiler::Msvc:
          result.append("-fms-compatibility-version="_ba + msvcCompatVersion());
-@@ -651,10 +659,27 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
+@@ -403,9 +411,25 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
+         if (needsClangBuiltinIncludes())
              appendClangBuiltinIncludes(&headerPaths);
          break;
-     case Compiler::Clang:
+-    case Compiler::Clang:
 -        headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s),
 -                                                   _compilerArguments));
-+    {
++    case Compiler::Clang: {
 +        // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors.
 +        // PySide requires that Qt headers are not -isystem
 +        // https://bugreports.qt.io/browse/PYSIDE-787
@@ -46,13 +47,11 @@
 +                headerPaths.append({h.path, HeaderType::Standard});
 +            }
 +        }
-         result.append(noStandardIncludeOption());
-         break;
 +    }
-     case Compiler::Gpp:
+         break;
+     case Compiler::Gpp: {
          if (needsClangBuiltinIncludes())
-             appendClangBuiltinIncludes(&headerPaths);
-@@ -664,8 +689,20 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
+@@ -416,8 +440,20 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
          const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(u"g++"_s),
                                                               _compilerArguments);
          for (const HeaderPath &h : gppPaths) {
@@ -72,5 +71,5 @@
 +                headerPaths.append({h.path, HeaderType::Standard});
 +            }
          }
-         break;
      }
+         break;
diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index c8c58bc2503d..e4f85d57adb9 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  fetchgit,
   llvmPackages,
   python,
+  shiboken6-generator,
   numpy,
   cmake,
-  autoPatchelfHook,
   stdenv,
 }:
 
@@ -14,32 +13,26 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "shiboken6";
-  version = "6.10.0";
 
-  src = fetchgit {
-    url = "https://code.qt.io/pyside/pyside-setup.git";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-zJV4rrqr2bzWFEG1CWOI+y6wbfQDvWAst6T3aSssj6M=";
-  };
+  inherit (shiboken6-generator) version src;
 
   sourceRoot = "${finalAttrs.src.name}/sources/shiboken6";
 
-  patches = [ ./fix-include-qt-headers.patch ];
-
   nativeBuildInputs = [
     cmake
-    (python.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools ]))
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+    python.pkgs.ninja
+    (python.pythonOnBuildForHost.withPackages (ps: [
+      ps.packaging
+      ps.setuptools
+    ]))
+  ];
+
+  propagatedNativeBuildInputs = [
+    shiboken6-generator
+  ];
 
   buildInputs = [
-    llvmPackages.llvm
-    llvmPackages.libclang
     python.pkgs.qt6.qtbase
-    python.pkgs.ninja
-    python.pkgs.packaging
-    python.pkgs.setuptools
-    numpy
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     python.pkgs.qt6.darwinVersionInputs
@@ -48,6 +41,7 @@ stdenv'.mkDerivation (finalAttrs: {
   cmakeFlags = [
     "-DBUILD_TESTS=OFF"
     "-DNUMPY_INCLUDE_DIR=${numpy.coreIncludeDir}"
+    "-Dis_pyside6_superproject_build=1"
   ];
 
   # We intentionally use single quotes around `${BASH}` since it expands from a CMake
@@ -65,14 +59,14 @@ stdenv'.mkDerivation (finalAttrs: {
   postInstall = ''
     cd ../../..
     chmod +w .
-    ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken6
+    python3 setup.py egg_info --build-type=shiboken6
     cp -r shiboken6.egg-info $out/${python.sitePackages}/
   '';
 
   dontWrapQtApps = true;
 
   meta = {
-    description = "Generator for the pyside6 Qt bindings";
+    description = "Generator for the pyside6 Qt bindings - Python library";
     license = with lib.licenses; [
       lgpl3Only
       gpl2Only
@@ -82,6 +76,5 @@ stdenv'.mkDerivation (finalAttrs: {
     changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}";
     maintainers = [ ];
     platforms = lib.platforms.all;
-    mainProgram = "shiboken6";
   };
 })
diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix
index 5c6e425ecd88..b2ff61dd31a7 100644
--- a/pkgs/development/python-modules/shiv/default.nix
+++ b/pkgs/development/python-modules/shiv/default.nix
@@ -41,6 +41,11 @@ buildPythonPackage rec {
     "test_preamble_no_pip"
     "test_alternate_root"
     "test_alternate_root_environment_variable"
+    # Network required (pip install in test fails in sandbox)
+    "test_ensure_no_modify"
+    "test_find_entry_point"
+    "test_find_entry_point_two_points"
+    "test_console_script_exists"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/siphashc/default.nix b/pkgs/development/python-modules/siphashc/default.nix
index 2e491f43b024..8e274550fb89 100644
--- a/pkgs/development/python-modules/siphashc/default.nix
+++ b/pkgs/development/python-modules/siphashc/default.nix
@@ -1,20 +1,22 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
   setuptools,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "siphashc";
   version = "2.7";
   pyproject = true;
   build-system = [ setuptools ];
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-ppRNc3aM9So6g0LunBka2UBFWQAvck9E4Ot6sOC96jM=";
+  src = fetchFromGitHub {
+    owner = "WeblateOrg";
+    repo = "siphashc";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Rj+0oIlGs2Xs2TTN0PIwcVUlTgd1AZITC8xBf/Hn31Q=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -24,8 +26,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python c-module for siphash";
     homepage = "https://github.com/WeblateOrg/siphashc";
-    changelog = "https://github.com/WeblateOrg/siphashc/blob/${version}/CHANGES.rst";
+    changelog = "https://github.com/WeblateOrg/siphashc/blob/${finalAttrs.src.tag}/CHANGES.rst";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ erictapen ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/skl2onnx/default.nix b/pkgs/development/python-modules/skl2onnx/default.nix
index 21be7c7cbb17..762a9017aa4e 100644
--- a/pkgs/development/python-modules/skl2onnx/default.nix
+++ b/pkgs/development/python-modules/skl2onnx/default.nix
@@ -14,14 +14,14 @@
   unittestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "skl2onnx";
-  version = "1.19.1";
+  version = "1.20.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-DBBfKjuHpiTdIY0fuY/dGc8b9iFxkNJc5+FUhBJ9Dl0=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-x06oJ9kroYb+ZZaV6PyYnNl7/DIO3OPTK5k2pYeNoQo=";
   };
 
   build-system = [ setuptools ];
@@ -55,6 +55,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Convert scikit-learn models to ONNX";
+    changelog = "https://github.com/onnx/sklearn-onnx/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [ asl20 ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/sklearn2pmml/default.nix b/pkgs/development/python-modules/sklearn2pmml/default.nix
index 93e1e83c9485..53dea7d9bfa8 100644
--- a/pkgs/development/python-modules/sklearn2pmml/default.nix
+++ b/pkgs/development/python-modules/sklearn2pmml/default.nix
@@ -66,7 +66,7 @@ buildPythonPackage (finalAttrs: {
     statsmodels
   ];
 
-  pytestFlagsArray = [
+  enabledTestPaths = [
     # Only run the main test suite; subpackage tests require
     # sklearn-pandas which is not available in nixpkgs
     "sklearn2pmml/tests"
diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix
index c381c19c15e0..f48ce48971e0 100644
--- a/pkgs/development/python-modules/skops/default.nix
+++ b/pkgs/development/python-modules/skops/default.nix
@@ -26,14 +26,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "skops";
-  version = "0.13.0";
+  version = "0.14";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "skops-dev";
     repo = "skops";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1550LIVyChqP5q4VZmflCXPyXXg4eHJU5AlVQJD2M8c=";
+    hash = "sha256-AyrsXomc3vpfdqsBL51UmGXsjPsAJ+dx3uf3T8nPk/Y=";
   };
 
   build-system = [ hatchling ];
@@ -62,35 +63,24 @@ buildPythonPackage (finalAttrs: {
   enabledTestPaths = [ "skops" ];
 
   disabledTests = [
-    # flaky
-    "test_base_case_works_as_expected"
-
     # fairlearn is not available in nixpkgs
     "TestAddFairlearnMetricFrame"
-
-    # numpy.linalg.LinAlgError: The covariance matrix of class 0 is not full rank.
-    # Increase the value of `reg_param` to reduce the collinearity.
-    "test_can_persist_fitted"
-
-  ];
-
-  disabledTestPaths = [
-    # minor output formatting issue
-    "skops/card/_model_card.py"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Segfaults on darwin
-    "skops/io/tests/test_persist.py"
-  ];
-
-  pytestFlags = [
-    # Warning from scipy.optimize in skops/io/tests/test_persist.py::test_dump_and_load_with_file_wrapper
-    # https://github.com/skops-dev/skops/issues/479
-    "-Wignore::DeprecationWarning"
-
-    # FutureWarning: Class PassiveAggressiveClassifier is deprecated; this is deprecated in version
-    # 1.8 and will be removed in 1.10. Use `SGDClassifier(...)` instead.
-    "-Wignore::FutureWarning"
+    # Fail in the sandbox with:
+    #   UNEXPECTED EXCEPTION: RuntimeError('*** -[__NSPlaceholderArray initWithObjects:count:]:
+    #   attempt to insert nil object from objects[1]')
+    "skops.card._model_card.Card"
+    "test_add_plot"
+    "test_add_plot_to_existing_section"
+    "test_add_plot_with_alt_text"
+    "test_add_plot_with_description"
+    "test_copy_plots"
+    "test_duplicate_permutation_importances"
+    "test_duplicate_permutation_importances_overwrite"
+    "test_multiple_permutation_importances"
+    "test_permutation_importances"
+    "test_permutation_importances_with_description"
   ];
 
   pythonImportsCheck = [ "skops" ];
diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix
index 0b37d4d0261b..2990385ef1ab 100644
--- a/pkgs/development/python-modules/skrl/default.nix
+++ b/pkgs/development/python-modules/skrl/default.nix
@@ -37,6 +37,23 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-5lkoYAmMIWqK3+E3WxXMWS9zal2DhZkfl30EkrHKpdI=";
   };
 
+  # Fix Jax 0.10.0 compatibility
+  # TypeError: clip() got an unexpected keyword argument 'a_min'
+  postPatch = ''
+    substituteInPlace skrl/models/jax/gaussian.py \
+      --replace-fail \
+        "jnp.clip(log_std, a_min=log_std_min, a_max=log_std_max)" \
+        "jnp.clip(log_std, min=log_std_min, max=log_std_max)" \
+      --replace-fail \
+        "jnp.clip(actions, a_min=clip_actions_min, a_max=clip_actions_max)" \
+        "jnp.clip(actions, min=clip_actions_min, max=clip_actions_max)"
+
+    substituteInPlace skrl/models/jax/deterministic.py \
+      --replace-fail \
+        "jnp.clip(actions, a_min=self._d_clip_actions_min, a_max=self._d_clip_actions_max)" \
+        "jnp.clip(actions, min=self._d_clip_actions_min, max=self._d_clip_actions_max)"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix
index 63ed36998d90..9a0a1c5b85a5 100644
--- a/pkgs/development/python-modules/social-auth-app-django/default.nix
+++ b/pkgs/development/python-modules/social-auth-app-django/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "social-auth-app-django";
-  version = "5.7.0";
+  version = "5.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-social-auth";
     repo = "social-app-django";
     tag = version;
-    hash = "sha256-iR94psgqFeZEGcS/L/W66H8nCNNKKu+hxOUGC93N8Do=";
+    hash = "sha256-NAUCA+FMMgY4xMYspiRO5Kt/S2jbSKDRnBxwmATYxKo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/socid-extractor/default.nix b/pkgs/development/python-modules/socid-extractor/default.nix
index 5b650087ff1b..9a2c740ec7b9 100644
--- a/pkgs/development/python-modules/socid-extractor/default.nix
+++ b/pkgs/development/python-modules/socid-extractor/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python module to extract details from personal pages";
     homepage = "https://github.com/soxoj/socid-extractor";
-    changelog = "https://github.com/soxoj/socid-extractor/blob/v${finalAttrs.src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/soxoj/socid-extractor/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "socid_extractor";
diff --git a/pkgs/development/python-modules/soundcard/default.nix b/pkgs/development/python-modules/soundcard/default.nix
index c402616ee1d1..cf67afd2acf8 100644
--- a/pkgs/development/python-modules/soundcard/default.nix
+++ b/pkgs/development/python-modules/soundcard/default.nix
@@ -10,7 +10,7 @@
 }:
 let
   pname = "soundcard";
-  version = "0.4.5";
+  version = "0.4.6";
 in
 buildPythonPackage {
   inherit pname version;
@@ -18,7 +18,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BycrqSfjLK/fY05KHKU7mjIYMhpgx9Lgj1S4MqVpRqo=";
+    hash = "sha256-m0bWSib5fNfYi8/Dhcl8Bp+Xxew0BOTnwjdxWYqM9Hs=";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix
index 4e1409053443..9f0b7fdf3076 100644
--- a/pkgs/development/python-modules/soundcloud-v2/default.nix
+++ b/pkgs/development/python-modules/soundcloud-v2/default.nix
@@ -4,20 +4,20 @@
   fetchFromGitHub,
   dacite,
   python-dateutil,
-  requests,
+  curl-cffi,
   setuptools,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "soundcloud-v2";
-  version = "1.6.2";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "7x11x13";
     repo = "soundcloud.py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V+eEBMlzHbNM3dd+vBNkIvjwc+DdV8RZTasSggCv/jY=";
+    hash = "sha256-5Mb7Dt5TYAI/xTMezSWE9klP4Psw59gTEy1448O7CIw=";
   };
 
   build-system = [ setuptools ];
@@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: {
   dependencies = [
     dacite
     python-dateutil
-    requests
+    curl-cffi
   ];
 
   # tests require network
diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix
index 61b0da9c3358..9eaa09b20a85 100644
--- a/pkgs/development/python-modules/speechrecognition/default.nix
+++ b/pkgs/development/python-modules/speechrecognition/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   cacert,
+  cohere,
   faster-whisper,
   flac,
   google-cloud-speech,
@@ -12,6 +13,7 @@
   openai,
   pocketsphinx,
   pyaudio,
+  pytest-httpserver,
   pytestCheckHook,
   requests,
   respx,
@@ -21,16 +23,16 @@
   typing-extensions,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "speechrecognition";
-  version = "3.14.3";
+  version = "3.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Uberi";
     repo = "speech_recognition";
-    tag = version;
-    hash = "sha256-g//KKxPRe1pWVJo7GsRNIV59r0J7XJEoXvH0tGuV3Jk=";
+    tag = finalAttrs.version;
+    hash = "sha256-EIDhWx1s1B0DX4Vmd/a8hRnTBgdBx9ALOonOWFPgUOg=";
   };
 
   postPatch = ''
@@ -52,6 +54,7 @@ buildPythonPackage rec {
   optional-dependencies = {
     assemblyai = [ requests ];
     audio = [ pyaudio ];
+    cohere = [ cohere ];
     faster-whisper = [ faster-whisper ];
     google-cloud = [ google-cloud-speech ];
     groq = [
@@ -67,15 +70,17 @@ buildPythonPackage rec {
       openai-whisper
       soundfile
     ];
+    # vosk = [ vosk ];
   };
 
   nativeCheckInputs = [
     groq
+    pytest-httpserver
     pytestCheckHook
     pocketsphinx
     respx
   ]
-  ++ lib.concatAttrValues optional-dependencies;
+  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
 
   pythonImportsCheck = [ "speech_recognition" ];
 
@@ -84,14 +89,19 @@ buildPythonPackage rec {
     "test_sphinx_keywords"
   ];
 
+  disabledTestPaths = [
+    # vosk is not available in nixpkgs
+    "tests/recognizers/test_vosk.py"
+  ];
+
   meta = {
     description = "Speech recognition module for Python, supporting several engines and APIs, online and offline";
     homepage = "https://github.com/Uberi/speech_recognition";
-    changelog = "https://github.com/Uberi/speech_recognition/releases/tag/${src.tag}";
+    changelog = "https://github.com/Uberi/speech_recognition/releases/tag/${finalAttrs.src.tag}";
     license = with lib.licenses; [
       gpl2Only
       bsd3
     ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix
index 5f52f0718c71..0a142e9c46d6 100644
--- a/pkgs/development/python-modules/sphinx-autoapi/default.nix
+++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "sphinx-autoapi";
-  version = "3.7.0";
+  version = "3.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "readthedocs";
     repo = "sphinx-autoapi";
     tag = "v${version}";
-    hash = "sha256-yUWjL+42wju0C+vlZrH30nqTNFCt57TPOZTuefNhaj0=";
+    hash = "sha256-pEfyVwvAqIg/1F5kX7WLlhdD+5tq3422u8N6nBizRcA=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
index 18f5c0d5590c..17e46d263abd 100644
--- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sphinx-autodoc-typehints";
-  version = "3.9.2";
+  version = "3.9.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "sphinx-autodoc-typehints";
     tag = finalAttrs.version;
-    hash = "sha256-RfeY9i7M+5SoZtJzdORm/ZyCZ+RLyERJFK7I9L1B7ws=";
+    hash = "sha256-TyG63QHuiquofeMkr078FsBVc9TAqPFfzWJ5L9sdqm0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/pkgs/development/python-modules/sphinx-codeautolink/default.nix
index 864ba81d611e..800193ea2648 100644
--- a/pkgs/development/python-modules/sphinx-codeautolink/default.nix
+++ b/pkgs/development/python-modules/sphinx-codeautolink/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "sphinx-codeautolink";
-  version = "0.17.5";
+  version = "0.18.1";
   pyproject = true;
 
   outputs = [
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "felix-hilden";
     repo = "sphinx-codeautolink";
     tag = "v${version}";
-    hash = "sha256-43XDCajH+uSHnofjK/gH4EAiv2ljjuBr8UbJtm/DsDI=";
+    hash = "sha256-kNnz8MzffqPCxS0uXdbw2ntcdGnz6KDBanFug5+SjOk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix b/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix
index 02d0af67b0a1..dbafa2b0550a 100644
--- a/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix
+++ b/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
     substituteInPlace src/sphinx_last_updated_by_git.py \
       --replace-fail "'git', 'ls-tree'" " '${lib.getExe gitMinimal}', 'ls-tree'" \
       --replace-fail "'git', 'log'" "'${lib.getExe gitMinimal}', 'log'" \
-      --replace-fail "'git', 'rev-parse'" "'${lib.getExe gitMinimal}', 'rev-parse'" \
+      --replace-fail "'git', 'rev-parse'" "'${lib.getExe gitMinimal}', 'rev-parse'"
   '';
 
   propagatedBuildInputs = [ gitMinimal ];
diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix
index ee2301acb08c..7d5315d85acf 100644
--- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix
+++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   preBuild = ''
-    # Don't use NPM to fetch assets. Assets are included in sdist.
+    # Don't use npm to fetch assets. Assets are included in sdist.
     export CI=1
   '';
 
diff --git a/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix b/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix
index b391790f4062..a9ff501b7228 100644
--- a/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-cockroachdb/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy-cockroachdb";
-  version = "2.0.3";
+  version = "2.0.4";
   pyproject = true;
 
   src = fetchPypi {
     pname = "sqlalchemy_cockroachdb";
     inherit version;
-    hash = "sha256-SLdj/9iypNydVkWZNKVtfV/61BXG5o0RS67l0Sz3nB0=";
+    hash = "sha256-9mNU0rk9qJy0UkxbeKRNDPWolD0yi38K7kqh38YXi2U=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 671f394e949b..43176c93edcd 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -43,14 +43,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sqlalchemy";
-  version = "2.0.48";
+  version = "2.0.49";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sqlalchemy";
     repo = "sqlalchemy";
     tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
-    hash = "sha256-0MHxHcQr7XvRZ3j1wj/PMIk94TVhyixDAgeAYKd1nGk=";
+    hash = "sha256-+6g9TONKwCQWmWXHjpIDPDh96ng4lwLc1C009/l769Q=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/sseclient-py/default.nix b/pkgs/development/python-modules/sseclient-py/default.nix
index 30803aaa6b10..8ba8a402e702 100644
--- a/pkgs/development/python-modules/sseclient-py/default.nix
+++ b/pkgs/development/python-modules/sseclient-py/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Pure-Python Server Side Events (SSE) client";
     homepage = "https://github.com/mpetazzoni/sseclient";
-    changelog = "https://github.com/mpetazzoni/sseclient/releases/tag/sseclient-py-${finalAttrs.src.tag}";
+    changelog = "https://github.com/mpetazzoni/sseclient/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jamiemagee ];
   };
diff --git a/pkgs/development/python-modules/stable-baselines3/default.nix b/pkgs/development/python-modules/stable-baselines3/default.nix
index cb752b201af5..efa234413391 100644
--- a/pkgs/development/python-modules/stable-baselines3/default.nix
+++ b/pkgs/development/python-modules/stable-baselines3/default.nix
@@ -24,6 +24,7 @@ buildPythonPackage (finalAttrs: {
   pname = "stable-baselines3";
   version = "2.8.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "DLR-RM";
@@ -34,6 +35,9 @@ buildPythonPackage (finalAttrs: {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "gymnasium"
+  ];
   dependencies = [
     cloudpickle
     gymnasium
@@ -58,6 +62,12 @@ buildPythonPackage (finalAttrs: {
     "tests/test_dict_env.py"
     "tests/test_her.py"
     "tests/test_save_load.py"
+
+    # gymnasium.error.DeprecatedEnv: Environment version v3 for `Taxi` is deprecated.
+    # Please use `Taxi-v4` instead.
+    "tests/test_spaces.py::test_discrete_obs_space[Taxi-v3-A2C]"
+    "tests/test_spaces.py::test_discrete_obs_space[Taxi-v3-DQN]"
+    "tests/test_spaces.py::test_discrete_obs_space[Taxi-v3-PPO]"
   ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/pkgs/development/python-modules/starkbank-ecdsa/default.nix
index 4647b05fde72..ecb04e1a5fda 100644
--- a/pkgs/development/python-modules/starkbank-ecdsa/default.nix
+++ b/pkgs/development/python-modules/starkbank-ecdsa/default.nix
@@ -3,20 +3,23 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "starkbank-ecdsa";
-  version = "2.2.0";
-  format = "setuptools";
+  version = "2.3.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "starkbank";
     repo = "ecdsa-python";
-    tag = "v${version}";
-    hash = "sha256-HarlCDE2qOLbyhMLOE++bTC+7srJqwmohM6vrJkJ/gc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5yF2tVCgHJX++NncWiYfLE0P98Sxy91VN3qgc8PSLOI=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   preCheck = ''
@@ -36,7 +39,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python ECDSA library";
     homepage = "https://github.com/starkbank/ecdsa-python";
-    license = with lib.licenses; [ mit ];
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/starlette-context/default.nix b/pkgs/development/python-modules/starlette-context/default.nix
index a18225be77ab..8d624e5dccb2 100644
--- a/pkgs/development/python-modules/starlette-context/default.nix
+++ b/pkgs/development/python-modules/starlette-context/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Middleware for Starlette that allows you to store and access the context data of a request";
     homepage = "https://github.com/tomwojcik/starlette-context";
-    changelog = "https://github.com/tomwojcik/starlette-context/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/tomwojcik/starlette-context/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/storage3/default.nix b/pkgs/development/python-modules/storage3/default.nix
index dd96780cbed3..97d6ba899034 100644
--- a/pkgs/development/python-modules/storage3/default.nix
+++ b/pkgs/development/python-modules/storage3/default.nix
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   meta = {
     description = "Client library for Supabase Functions";
     homepage = "https://github.com/supabase/supabase-py";
-    changelog = "https://github.com/supabase/supabase-py/blob/v${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/supabase/supabase-py/blob/${src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ siegema ];
     license = lib.licenses.mit;
   };
diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index 96db30289612..b8524a2405fd 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "--emoji" "" \
+      --replace-fail "--emoji" ""
   '';
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/streamlit-folium/default.nix b/pkgs/development/python-modules/streamlit-folium/default.nix
index 9cd90f60b14a..91bd46677919 100644
--- a/pkgs/development/python-modules/streamlit-folium/default.nix
+++ b/pkgs/development/python-modules/streamlit-folium/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "streamlit-folium";
-  version = "0.27.1";
+  version = "0.27.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "randyzwitch";
     repo = "streamlit-folium";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8FpU0dCuHlGvr2k8LAJs2tR3yRSIOHc+Q5V13oSNgEI=";
+    hash = "sha256-VGL9gl61aL8nqebb0XXYEsEiUcvPO4LpufioVDRMFkA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index f206d8c4de12..db7672f2658f 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "15.0.1";
+  version = "15.1.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PATozJ7I2VQvndmY4qQ2Hb49C2FQyhfT81JUbPIsVWU=";
+    hash = "sha256-JL07a9CWmkhBvU12gVVqnjXkbEFKB8hZCiJfvVqHhFA=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix
index 547f1b7f43b9..2c1aa3d5b918 100644
--- a/pkgs/development/python-modules/striprtf/default.nix
+++ b/pkgs/development/python-modules/striprtf/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "striprtf";
-  version = "0.0.29";
+  version = "0.0.32";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WoItB14XQXk07Trdb8ebX8j7VE/kNwsviUzdKPDd144=";
+    hash = "sha256-fzdaN12ZonAIQhcxaMkMm1RcskQkH/xdho7Z9rr5FV8=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/supabase-auth/default.nix b/pkgs/development/python-modules/supabase-auth/default.nix
index 3e0334be50c6..9d09abc88313 100644
--- a/pkgs/development/python-modules/supabase-auth/default.nix
+++ b/pkgs/development/python-modules/supabase-auth/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
   meta = {
     description = "Client library for Supabase Auth";
     homepage = "https://github.com/supabase/supabase-py/";
-    changelog = "https://github.com/supabase/supabase-py/blob/v${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/supabase/supabase-py/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ macbucheron ];
   };
diff --git a/pkgs/development/python-modules/supabase-functions/default.nix b/pkgs/development/python-modules/supabase-functions/default.nix
index 4ce9853c9419..5b64f658a45a 100644
--- a/pkgs/development/python-modules/supabase-functions/default.nix
+++ b/pkgs/development/python-modules/supabase-functions/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   meta = {
     description = "Client library for Supabase Functions";
     homepage = "https://github.com/supabase/supabase-py";
-    changelog = "https://github.com/supabase/supabase-py/blob/v${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/supabase/supabase-py/blob/${src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ macbucheron ];
     license = lib.licenses.mit;
   };
diff --git a/pkgs/development/python-modules/symbolic/default.nix b/pkgs/development/python-modules/symbolic/default.nix
index fccaf7e3e3d6..afc62c2ccd30 100644
--- a/pkgs/development/python-modules/symbolic/default.nix
+++ b/pkgs/development/python-modules/symbolic/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "symbolic";
-  version = "12.18.0";
+  version = "12.18.3";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -23,12 +23,12 @@ buildPythonPackage rec {
     tag = version;
     # the `py` directory is not included in the tarball, so we fetch the source via git instead
     forceFetchGit = true;
-    hash = "sha256-BPGT+Hb47LN7X6Qx31foqQUMLd8UW5wKVg5xzkQERh8=";
+    hash = "sha256-BQI5Fb8W9mwCYDHDlA3mAenofeWM2pp1BZkzMSdQzdc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-6u6j0AQTyR7lU5kWAHTfa0B0cY0EhTBDG9L7vq62UCw=";
+    hash = "sha256-MfD67NKyw2ygTK8b11WNIpazny2hJArJ+lpicsFJfRw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/taskw-ng/default.nix b/pkgs/development/python-modules/taskw-ng/default.nix
index 03f4d82ab771..5174da5d5039 100644
--- a/pkgs/development/python-modules/taskw-ng/default.nix
+++ b/pkgs/development/python-modules/taskw-ng/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "taskw-ng";
-  version = "2.0.0";
+  version = "0.2.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bergercookie";
     repo = "taskw-ng";
-    tag = version;
-    hash = "sha256-hTZi6Y3jVlBI+CGQtHZ4PBU5rjEjE2l8o2rusCkEma0=";
+    tag = "v${version}";
+    hash = "sha256-KxXLSDvUclQlNbMR+Zzl6tgBrH2QxqjLVoyBK3OiKVU=";
   };
 
   pythonRelaxDeps = [
@@ -44,6 +44,7 @@ buildPythonPackage rec {
 
   # TODO: doesn't pass because `can_use` fails and `task --version` seems not to be answering.
   # pythonImportsCheck = [ "taskw_ng" ];
+  passthru.skipBulkUpdate = true;
 
   meta = {
     description = "Module to interact with the Taskwarrior API";
diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix
index 0b2990ac73ea..55906476033d 100644
--- a/pkgs/development/python-modules/taxi/default.nix
+++ b/pkgs/development/python-modules/taxi/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "taxi";
-  version = "6.3.2";
+  version = "6.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sephii";
     repo = "taxi";
     rev = version;
-    hash = "sha256-zhBjULAPd1rGvTMdy7TJ3XoDDMGnoL6fyZFTVIHDvDI=";
+    hash = "sha256-FeAfat5/Dq0y/XHFbZnOEgFix2z+dP5GXvAANLTPFP8=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix
index 9c61387138b5..fe38ecce0db5 100644
--- a/pkgs/development/python-modules/teamcity-messages/default.nix
+++ b/pkgs/development/python-modules/teamcity-messages/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python unit test reporting to TeamCity";
     homepage = "https://github.com/JetBrains/teamcity-messages";
-    changelog = "https://github.com/JetBrains/teamcity-messages/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/JetBrains/teamcity-messages/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/tempman/default.nix b/pkgs/development/python-modules/tempman/default.nix
index 1cc8ddbf9bec..3809724c37ba 100644
--- a/pkgs/development/python-modules/tempman/default.nix
+++ b/pkgs/development/python-modules/tempman/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   # Disabling tests, they rely on dependencies that are outdated and not supported
   doCheck = false;
 
-  passthru.updateScripts = gitUpdater { };
+  passthru.updateScript = gitUpdater { };
 
   meta = {
     description = "Create and clean up temporary directories";
diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix
index 179a4442785c..41bcaecd63a8 100644
--- a/pkgs/development/python-modules/temporalio/default.nix
+++ b/pkgs/development/python-modules/temporalio/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "temporalio";
-  version = "1.23.0";
+  version = "1.26.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     repo = "sdk-python";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-AV9kpy6EpfwLm3yx+xf9PRUcti+KJsOizPsf6YqIYws=";
+    hash = "sha256-mCx7IP3/KUDTzmzgwBIpzi2UFf9gNFxlSrBpOyPm/xs=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -43,7 +43,7 @@ buildPythonPackage rec {
       src
       cargoRoot
       ;
-    hash = "sha256-uVSC4CPuoDw1JuZ6sCTErre1gYBov70qSvD4tQqKvl0=";
+    hash = "sha256-CL2ipOgnxGn0Zw2da85BzLJdjYamBXKftiRPExWCbb0=";
   };
 
   cargoRoot = "temporalio/bridge";
@@ -68,6 +68,10 @@ buildPythonPackage rec {
     rustc
   ];
 
+  pythonRelaxDeps = [
+    "protobuf"
+  ];
+
   pythonImportsCheck = [
     "temporalio"
     "temporalio.bridge.temporal_sdk_bridge"
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 2a045096ea46..6a6dc2e27ead 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.80";
+  version = "3.1.89";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-6MiRoIGIc608iu1av8JvqQ1JTZR8IG7P2xuPmjn9X58=";
+    hash = "sha256-EGsp7t/RpjefociO1ERwlZ6AlTUgRFgzQGqAge/4lx4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 22f2220d30c2..dabffc010f29 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -626,7 +626,7 @@ buildPythonPackage {
       -e "s/'gast[^']*',/'gast',/" \
       -e "/'libclang[^']*',/d" \
       -e "/'keras[^']*')\?,/d" \
-      -e "s/'protobuf[^']*',/'protobuf',/" \
+      -e "s/'protobuf[^']*',/'protobuf',/"
   '';
 
   # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index 86bbb51e9646..5c18c04d7166 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "1.4.5";
+  version = "1.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
     tag = "v${version}";
-    hash = "sha256-YmhLVbTIn2zthmw2d2AsmQFbWNHZvRFYAF5DB4gwIhQ=";
+    hash = "sha256-2LCpwVf10dsgZlouvu3Spr0geK8uDpEXKOI1l6sZqmM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/test2ref/default.nix b/pkgs/development/python-modules/test2ref/default.nix
index 4401694c22e6..5c4945b4d84f 100644
--- a/pkgs/development/python-modules/test2ref/default.nix
+++ b/pkgs/development/python-modules/test2ref/default.nix
@@ -2,22 +2,29 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   pdm-backend,
+
+  # dependencies
   binaryornot,
+
+  # tests
   pytest-cov-stub,
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "test2ref";
-  version = "1.1.1";
+  version = "1.2.3";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "nbiotcloud";
     repo = "test2ref";
-    tag = "v${version}";
-    hash = "sha256-Lo0rXKpiXGZle6X2f2Zofc/ihzAqruDyKNP4wp2jqv4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-20vE6o8yKphKxlfGo+lBZ1VlKyCVlNawlMYVcj4JAtY=";
   };
 
   build-system = [
@@ -35,11 +42,19 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # AssertionError:
+    #   Only in /build/pytest-of-nixbld/pytest-0/test_known0/ref: file0.txt
+    #   Only in /build/pytest-of-nixbld/pytest-0/test_known0/ref: sub0
+    # Reported upstream: https://github.com/nbiotcloud/test2ref/issues/36
+    "test_known"
+  ];
+
   meta = {
     description = "Testing Against Learned Reference Data";
     homepage = "https://github.com/nbiotcloud/test2ref";
-    changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/${src.tag}";
+    changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 27eed625fc07..59dfa4d632dd 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "8.2.3";
+  version = "8.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-9519UH723p9S9EO7RYJM4qM9e7TyMFDMkSVWqYt+RXg=";
+    hash = "sha256-827cm9pcj1o1FYeaoWKCJ6dEyXeDop4kYd205cySTfg=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/tftpy/default.nix b/pkgs/development/python-modules/tftpy/default.nix
index 9f7b7321d59e..ad4165d7f7ea 100644
--- a/pkgs/development/python-modules/tftpy/default.nix
+++ b/pkgs/development/python-modules/tftpy/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "tftpy";
-  version = "0.8.6";
+  version = "0.8.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9hb2pDo21IHCZlc2CFl7ndPHxjgYQV1yqgTx0XlUgOo=";
+    hash = "sha256-6KWqCS2rLhy7m5Q5IDaCe4CNw362zxsaszyBlXs/X+I=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix
index 321217d9d271..f4c881de90aa 100644
--- a/pkgs/development/python-modules/thinqconnect/default.nix
+++ b/pkgs/development/python-modules/thinqconnect/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "thinqconnect";
-  version = "1.0.11";
+  version = "1.0.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thinq-connect";
     repo = "pythinqconnect";
     tag = version;
-    hash = "sha256-ZM+CCnGJga66b68MLKkd80dHPhF4mYMIFuV1M+5K3C8=";
+    hash = "sha256-LOIqh/f9NiaBpkJqre1TejdUN0gbguSM3s8faGPcf54=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tinyhtml5/default.nix b/pkgs/development/python-modules/tinyhtml5/default.nix
index 3907abc36054..215c97897208 100644
--- a/pkgs/development/python-modules/tinyhtml5/default.nix
+++ b/pkgs/development/python-modules/tinyhtml5/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tinyhtml5";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CourtBouillon";
     repo = "tinyhtml5";
     tag = version;
-    hash = "sha256-8OKZAQyFMoICcln6XxTE9MHivXaW8pBVC6n+hbriIoU=";
+    hash = "sha256-PSDlCLPK3JVMq5dyt6xzNb4xx3F8Jwf8HAgYLKoXH+E=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index 4b7a0477c15f..497a42e91c6c 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -21,12 +21,14 @@ buildPythonPackage {
   src = python.src;
 
   prePatch = ''
-    mkdir $NIX_BUILD_TOP/tkinter
+    python_src=$PWD
+    tkinter_src=$PWD/../tkinter
+    mkdir -p "$tkinter_src"
 
     # copy the module bits and pieces from the python source
-    cp -v  Modules/{_tkinter.c,tkinter.h} ../tkinter/
-    cp -rv Modules/clinic ../tkinter/
-    cp -rv Lib/tkinter ../tkinter/
+    cp -v  Modules/{_tkinter.c,tkinter.h} "$tkinter_src"
+    cp -rv Modules/clinic "$tkinter_src"
+    cp -rv Lib/tkinter "$tkinter_src"
 
     # install our custom pyproject.toml
     cp ${
@@ -34,11 +36,11 @@ buildPythonPackage {
         python_version = python.version;
         python_internal_dir = "${python}/include/${python.libPrefix}/internal";
       }
-    } $NIX_BUILD_TOP/tkinter/pyproject.toml
+    } "$tkinter_src"/pyproject.toml
 
   ''
   + lib.optionalString (pythonOlder "3.13") ''
-    substituteInPlace "$NIX_BUILD_TOP/tkinter/tkinter/tix.py" --replace-fail \
+    substituteInPlace "$tkinter_src/tkinter/tix.py" --replace-fail \
       "os.environ.get('TIX_LIBRARY')" \
       "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
   '';
@@ -47,7 +49,7 @@ buildPythonPackage {
   patches = lib.optional (pythonOlder "3.12") ./fix-ttk-notebook-test.patch;
 
   preConfigure = ''
-    pushd $NIX_BUILD_TOP/tkinter
+    cd "$tkinter_src"
   '';
 
   build-system = [ setuptools ];
@@ -73,7 +75,7 @@ buildPythonPackage {
   nativeCheckInputs = lib.optional stdenv.hostPlatform.isLinux xvfb-run;
 
   preCheck = ''
-    cd $NIX_BUILD_TOP/Python-*/Lib
+    cd "$python_src"/Lib
     export HOME=$TMPDIR
   ''
   + lib.optionalString (pythonAtLeast "3.13" && pythonOlder "3.15") ''
diff --git a/pkgs/development/python-modules/torch/bin/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
index 58f8030a5095..f521fbe1903a 100644
--- a/pkgs/development/python-modules/torch/bin/binary-hashes.nix
+++ b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "2.10.0" = {
+  "2.11.0" = {
     x86_64-linux-310 = {
-      name = "torch-2.10.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-NjaFB7VuqlGsvTyWrIiTu5qGmR/80Gmf6joadKK4vcs=";
+      name = "torch-2.11.0+cu128-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.11.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-ctU/MXamnMIHEMTsuV99xMa6EMTk7aRbg5buee5A91o=";
     };
     x86_64-linux-311 = {
-      name = "torch-2.10.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-HQH/rr9kcVwPUHo5RjFJyxnllv9wK9S8+GJgHyiB2rw=";
+      name = "torch-2.11.0+cu128-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.11.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-yafKTHT64QpY5hdbSyzqlT+TIrtlYrvzOa1qBfUhkK0=";
     };
     x86_64-linux-312 = {
-      name = "torch-2.10.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-Yo6JvVEQztfevuKlfGmVlyW3+8ZOq4GjndcORsfii6U=";
+      name = "torch-2.11.0+cu128-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.11.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-0lLPl1+xjJSoUzYyOtQl9HPfVtqzWkSwA5m9cMejuZc=";
     };
     x86_64-linux-313 = {
-      name = "torch-2.10.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-e0vSPtY96XRW/MgcJv6p8C7gLOERIRHE2sDYz+V0sj4=";
+      name = "torch-2.11.0+cu128-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.11.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-25ZLM8VQNacqs+IWIoevjxzCdgOcZdAVdAzIjCbc7fc=";
     };
     x86_64-linux-314 = {
-      name = "torch-2.10.0-cp314-cp314-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.10.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
-      hash = "sha256-N9cf7qBod2hVaGoVEgWN8/GfbwQKFR8FWqdGYBZ4dE8=";
+      name = "torch-2.11.0+cu128-cp314-cp314-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.11.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
+      hash = "sha256-04moUGd/DSTa+uFXNkQDRCjY07nIC1HVW6Yv7X5sh3c=";
     };
     aarch64-darwin-310 = {
-      name = "torch-2.10.0-cp310-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp310-none-macosx_11_0_arm64.whl";
-      hash = "sha256-LRar/ObJJYTO6wDDsmZdV5hCTdntI16mm3LgRc1Trpc=";
+      name = "torch-2.11.0-cp310-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.11.0-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-kSCcfYokYLduj/Wyi3Yj2kqx0nR0t54d6D6VSHGYWv4=";
     };
     aarch64-darwin-311 = {
-      name = "torch-2.10.0-cp311-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp311-none-macosx_11_0_arm64.whl";
-      hash = "sha256-RYSrFnmVwEefaCHj3OrxmcgWbIEdOtu6XY7tu/pnZP0=";
+      name = "torch-2.11.0-cp311-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.11.0-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-116tzZf+DcfNDu3E1yFSSEwZyyz+Rs5VdmyOEpEWQl8=";
     };
     aarch64-darwin-312 = {
-      name = "torch-2.10.0-cp312-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp312-none-macosx_11_0_arm64.whl";
-      hash = "sha256-RaHFBXYpRErrHEUsGCmPp/MPL3rq3U3EH500CYApRAc=";
+      name = "torch-2.11.0-cp312-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.11.0-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-Q7NRFoAshfuI2Z9KOWuL1Ecr/KHdguaUmeWk+bi04lI=";
     };
     aarch64-darwin-313 = {
-      name = "torch-2.10.0-cp313-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp313-none-macosx_11_0_arm64.whl";
-      hash = "sha256-hANR2lnO23vLxRmBiABQgTwZ72uJin/s9zo6/HGv8/4=";
+      name = "torch-2.11.0-cp313-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.11.0-cp313-cp313-macosx_11_0_arm64.whl";
+      hash = "sha256-RC7J3HhZJWT9rWnPC+qp2i+Cq4EMy08TkDhpqQvz8V0=";
     };
     aarch64-darwin-314 = {
-      name = "torch-2.10.0-cp314-cp314-macosx_14_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.10.0-cp314-cp314-macosx_14_0_arm64.whl";
-      hash = "sha256-yIsRKf1OFPD4gpY8ZygxXKrjXS9HN00X7e7R7cdpdJc=";
+      name = "torch-2.11.0-cp314-cp314-macosx_14_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.11.0-cp314-cp314-macosx_11_0_arm64.whl";
+      hash = "sha256-ByoNbkhl6LDcDb/m6+1o+uI1EkIig17wPlgU1BTYwBI=";
     };
     aarch64-linux-310 = {
-      name = "torch-2.10.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-1j7mqAmC/XP+RLtw2X0pduAQMS/224HXv7kWewbdRbk=";
+      name = "torch-2.11.0+cpu-cp310-cp310-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-x9uuOlzQpKPqt2B0K5vjvXkoIllIjPgxdhl87zHOFhA=";
     };
     aarch64-linux-311 = {
-      name = "torch-2.10.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-HPy5sVWMblLf/Q1O/86DsTxa5dlzOBZMNyBIwh+c/Ms=";
+      name = "torch-2.11.0+cpu-cp311-cp311-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-RvuwqiV7t4Hvv61kj1sEXA4jJXO2YfFGFZPbYTQukJY=";
     };
     aarch64-linux-312 = {
-      name = "torch-2.10.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-F5RRcWSH+MsJtWRZZn+h9cTAlGwedfvq53z8QKV2jYc=";
+      name = "torch-2.11.0+cpu-cp312-cp312-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-cOyyZZr2Nzt8UzbmkuZlYFsCAeoh/1Gq6kfh116mtao=";
     };
     aarch64-linux-313 = {
-      name = "torch-2.10.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-5RmUSSzbdu3OKdqI3jZyowIvnvD/2QNFQ2lI1Jkr4sc=";
+      name = "torch-2.11.0+cpu-cp313-cp313-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-SLPiGjEURazdCyfxODDiHZOt73DUch4FHp8Fm665uPk=";
     };
     aarch64-linux-314 = {
-      name = "torch-2.10.0-cp314-cp314-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.10.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
-      hash = "sha256-oo/bz6L7rP/sgTAPJN0b7SsMz9vtEHqCPP8SvB2wcPY=";
+      name = "torch-2.11.0+cpu-cp314-cp314-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.11.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
+      hash = "sha256-cWdvapqEu9OF4BAZi1H6HCMk+488USoy0sga9l9o9Mk=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix
index 9f2e6fb7e7c9..14f9c523d3ef 100644
--- a/pkgs/development/python-modules/torch/bin/default.nix
+++ b/pkgs/development/python-modules/torch/bin/default.nix
@@ -15,8 +15,8 @@
   cudaPackages,
 
   # dependencies
-  cuda-bindings,
   filelock,
+  fsspec,
   jinja2,
   networkx,
   numpy,
@@ -25,6 +25,9 @@
   setuptools,
   sympy,
   typing-extensions,
+  # linux-only
+  cuda-bindings,
+  # x86_64-linux only
   triton,
 
   config,
@@ -35,7 +38,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "2.10.0";
+  version = "2.11.0";
 in
 buildPythonPackage {
   inherit version;
@@ -87,8 +90,16 @@ buildPythonPackage {
     "libcuda.so.1"
   ];
 
+  pythonRemoveDeps = [
+    "cuda-toolkit"
+    "nvidia-cudnn-cu12"
+    "nvidia-cusparselt-cu12"
+    "nvidia-nccl-cu12"
+    "nvidia-nvshmem-cu12"
+  ];
   dependencies = [
     filelock
+    fsspec
     jinja2
     networkx
     numpy
@@ -101,7 +112,9 @@ buildPythonPackage {
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     cuda-bindings
   ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ triton ];
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
+    triton
+  ];
 
   postInstall = ''
     # ONNX conversion
diff --git a/pkgs/development/python-modules/torch/bin/prefetch.sh b/pkgs/development/python-modules/torch/bin/prefetch.sh
index e29955d6a0ff..bf649d504e5a 100755
--- a/pkgs/development/python-modules/torch/bin/prefetch.sh
+++ b/pkgs/development/python-modules/torch/bin/prefetch.sh
@@ -11,21 +11,21 @@ linux_cpu_bucket="https://download.pytorch.org/whl/cpu"
 darwin_bucket="https://download.pytorch.org/whl/cpu"
 
 url_and_key_list=(
-  "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
-  "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl"
-  "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl"
-  "x86_64-linux-313 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torch-${version}-cp313-cp313-linux_x86_64.whl"
-  "x86_64-linux-314 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torch-${version}-cp314-cp314-linux_x86_64.whl"
-  "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
-  "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl"
-  "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl"
-  "aarch64-darwin-313 $darwin_bucket/torch-${version}-cp313-none-macosx_11_0_arm64.whl torch-${version}-cp313-none-macosx_11_0_arm64.whl"
-  "aarch64-darwin-314 $darwin_bucket/torch-${version}-cp314-cp314-macosx_14_0_arm64.whl torch-${version}-cp314-cp314-macosx_14_0_arm64.whl"
-  "aarch64-linux-310 $linux_cpu_bucket/torch-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_28_aarch64.whl"
-  "aarch64-linux-311 $linux_cpu_bucket/torch-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_28_aarch64.whl"
-  "aarch64-linux-312 $linux_cpu_bucket/torch-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torch-${version}-cp312-cp312-manylinux_2_28_aarch64.whl"
-  "aarch64-linux-313 $linux_cpu_bucket/torch-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torch-${version}-cp313-cp313-manylinux_2_28_aarch64.whl"
-  "aarch64-linux-314 $linux_cpu_bucket/torch-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torch-${version}-cp314-cp314-manylinux_2_28_aarch64.whl"
+  "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torch-${version}+${linux_cuda_version}-cp310-cp310-linux_x86_64.whl"
+  "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torch-${version}+${linux_cuda_version}-cp311-cp311-linux_x86_64.whl"
+  "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torch-${version}+${linux_cuda_version}-cp312-cp312-linux_x86_64.whl"
+  "x86_64-linux-313 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torch-${version}+${linux_cuda_version}-cp313-cp313-linux_x86_64.whl"
+  "x86_64-linux-314 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torch-${version}+${linux_cuda_version}-cp314-cp314-linux_x86_64.whl"
+  "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-cp310-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
+  "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-cp311-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl"
+  "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-cp312-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl"
+  "aarch64-darwin-313 $darwin_bucket/torch-${version}-cp313-cp313-macosx_11_0_arm64.whl torch-${version}-cp313-none-macosx_11_0_arm64.whl"
+  "aarch64-darwin-314 $darwin_bucket/torch-${version}-cp314-cp314-macosx_11_0_arm64.whl torch-${version}-cp314-cp314-macosx_14_0_arm64.whl"
+  "aarch64-linux-310 $linux_cpu_bucket/torch-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torch-${version}+cpu-cp310-cp310-manylinux_2_28_aarch64.whl"
+  "aarch64-linux-311 $linux_cpu_bucket/torch-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torch-${version}+cpu-cp311-cp311-manylinux_2_28_aarch64.whl"
+  "aarch64-linux-312 $linux_cpu_bucket/torch-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torch-${version}+cpu-cp312-cp312-manylinux_2_28_aarch64.whl"
+  "aarch64-linux-313 $linux_cpu_bucket/torch-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torch-${version}+cpu-cp313-cp313-manylinux_2_28_aarch64.whl"
+  "aarch64-linux-314 $linux_cpu_bucket/torch-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torch-${version}+cpu-cp314-cp314-manylinux_2_28_aarch64.whl"
 )
 
 hashfile="binary-hashes-$version.nix"
diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 4308a3711362..d9a475d7512e 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -318,6 +318,17 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
       url = "https://github.com/pytorch/pytorch/commit/39565a7dcf8f93ea22cedeaa20088b24ff6d2634.patch";
       hash = "sha256-Au5fVbs7i33d9c4Xj8koiBP7lGnsTGTaX4VlE2gAfy8=";
     })
+
+    # pybind11 3.0.3 changes led to ambiguous deduction in some return types
+    # that used `py::make_tuple`, so the type is explicitly specified where
+    # needed.
+    # Merged pull request: https://github.com/pytorch/pytorch/pull/179277
+    # TODO: remove at the next release
+    (fetchpatch {
+      name = "pybind11-3.0.3-ambiguous-return-type.patch";
+      url = "https://github.com/pytorch/pytorch/commit/b248ebc17075c0c3ad2b2532970d2ada32b2cf94.patch";
+      hash = "sha256-HY5JFGNoroFsfuUOO5j6WNP6gMHWUcIJFmWLqV8PV94=";
+    })
   ]
   ++ lib.optionals cudaSupport [
     ./fix-cmake-cuda-toolkit.patch
@@ -328,6 +339,11 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
     # with the Nix store, which fails. Simply remove this step to get
     # rpaths that point to the Nix store.
     ./disable-cmake-mkl-rpath.patch
+  ]
+  ++ lib.optionals rocmSupport [
+    # [ROCm] Make AOTriton bundling optional via BUILD_AOTRITON_INTO_WHEEL flag
+    # https://github.com/pytorch/pytorch/pull/182030
+    ./no-bundle-aotriton.patch
   ];
 
   postPatch = ''
@@ -495,6 +511,8 @@ buildPythonPackage.override { inherit stdenv; } (finalAttrs: {
   }
   // lib.optionalAttrs rocmSupport {
     AOTRITON_INSTALLED_PREFIX = "${rocmPackages.aotriton}";
+    # Don't copy AOTriton to output, load from AOTriton package
+    BUILD_AOTRITON_INTO_WHEEL = false;
     # Broken HIP flag setup, fails to compile due to not finding rocthrust
     # Only supports gfx942 so let's turn it off for now
     USE_FBGEMM_GENAI = setBool false;
diff --git a/pkgs/development/python-modules/torch/source/no-bundle-aotriton.patch b/pkgs/development/python-modules/torch/source/no-bundle-aotriton.patch
new file mode 100644
index 000000000000..dfc204d4aca7
--- /dev/null
+++ b/pkgs/development/python-modules/torch/source/no-bundle-aotriton.patch
@@ -0,0 +1,45 @@
+From 6ed1a4dbd96b1e2efe0513b9e6ff283c5f74cfa1 Mon Sep 17 00:00:00 2001
+From: Luna Nova <git@lunnova.dev>
+Date: Thu, 30 Apr 2026 07:29:42 -0700
+Subject: [PATCH] [ROCm] Make AOTriton bundling optional via
+ `BUILD_AOTRITON_INTO_WHEEL` flag
+
+Previously AOTriton was always copied to Torch's output/wheel.
+This is unnecessary and can waste a gigabyte of space easily for distros
+which have AOTriton as an installable package.
+---
+ cmake/External/aotriton.cmake | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/External/aotriton.cmake b/cmake/External/aotriton.cmake
+index d2f1e15ff11..1bf580f8059 100644
+--- a/cmake/External/aotriton.cmake
++++ b/cmake/External/aotriton.cmake
+@@ -239,12 +239,20 @@ if(NOT __AOTRITON_INCLUDED)
+     message(STATUS "Download AOTriton pre-compiled GPU images from ${__AOTRITON_URL}.")
+   endfunction()
+ 
++  # By default AOTriton's lib/ and include/ are distributed with torch
++  # adding hundreds of MiB and avoiding a separate AOTriton install
++  # For distros which have AOTriton as an installable package this can be disabled
++  # to avoid duplicating AOTriton into torch
++  option(BUILD_AOTRITON_INTO_WHEEL "Copy AOTriton lib/ and include/ into the torch install tree so they ship in the wheel" ON)
++
+   # Note it is INSTALL"ED"
+   if(DEFINED ENV{AOTRITON_INSTALLED_PREFIX})
+-    install(DIRECTORY
+-            $ENV{AOTRITON_INSTALLED_PREFIX}/lib
+-            $ENV{AOTRITON_INSTALLED_PREFIX}/include
+-            DESTINATION ${__AOTRITON_INSTALL_DIR})
++    if(BUILD_AOTRITON_INTO_WHEEL)
++      install(DIRECTORY
++              $ENV{AOTRITON_INSTALLED_PREFIX}/lib
++              $ENV{AOTRITON_INSTALLED_PREFIX}/include
++              DESTINATION ${__AOTRITON_INSTALL_DIR})
++    endif()
+     set(__AOTRITON_INSTALL_DIR "$ENV{AOTRITON_INSTALLED_PREFIX}")
+     message(STATUS "Using Preinstalled AOTriton at ${__AOTRITON_INSTALL_DIR}")
+   elseif(DEFINED ENV{AOTRITON_INSTALL_FROM_SOURCE})
+-- 
+2.53.0
+
diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index 119635676d7e..82ee8f1f88f1 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "torchaudio";
-  version = "2.10.0";
+  version = "2.11.0";
   format = "wheel";
 
   src =
diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
index fc17cc5d28bd..35d4f5bafdc5 100644
--- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "2.10.0" = {
+  "2.11.0" = {
     x86_64-linux-310 = {
-      name = "torchaudio-2.10.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-cGW9EKtplNMGZ1aOjGSYeUZ4zh7iPS8HVvsozm1iNII=";
+      name = "torchaudio-2.11.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.11.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-A0+64QMGG3RpTrGWOl6Rh0m8o8DpmK1b0FElvP6QMSI=";
     };
     x86_64-linux-311 = {
-      name = "torchaudio-2.10.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-xQ7R9L9nQ6gvjmIe7REI/9ZsWBLQCp9pXHSfnOX+zeQ=";
+      name = "torchaudio-2.11.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.11.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-ww4oVzu/6CsuiyFouId7+XgiWuI3iaEmMTBrrGUDPjo=";
     };
     x86_64-linux-312 = {
-      name = "torchaudio-2.10.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-0muRoXPO5tuav/aLSNZCNpUP/FYo0GRI7N16xWhB4Qo=";
+      name = "torchaudio-2.11.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.11.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-eLhqF/Fkvaq9zuk/394lh/xDuevxXNYdz3MLT4YVF2s=";
     };
     x86_64-linux-313 = {
-      name = "torchaudio-2.10.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-18a6jlE7lM2dX0Pu1HgHN+8bUJQd8RKt+19AHBsha3o=";
+      name = "torchaudio-2.11.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.11.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-NDo1SLMpGt9VLNSgOp+UkNlsszZ6itktywuPAUNDLoA=";
     };
     x86_64-linux-314 = {
-      name = "torchaudio-2.10.0-cp314-cp314-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.10.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
-      hash = "sha256-kIUsvrHzUZuLXZHO15RYJ+kq1TBIaHOEp6PEAa61zO0=";
+      name = "torchaudio-2.11.0-cp314-cp314-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.11.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
+      hash = "sha256-DTT3JLG6w4NUIOunhWpe/hJQJzW3BtuNNlXpJoCkOXM=";
     };
     aarch64-darwin-310 = {
-      name = "torchaudio-2.10.0-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-pbp+nADlp4aZSkaEU9ooWJkz6O+JyzMN15n+Y6hckrk=";
+      name = "torchaudio-2.11.0-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.11.0-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-brtZxpSQnsy11ht8wZnSl2kgEsQyhuNtkpg6p7rXWG0=";
     };
     aarch64-darwin-311 = {
-      name = "torchaudio-2.10.0-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-KIE2ZMTIZVeSHwrg7w9iTgZRMrAsUlv/WZ52VuGe9yc=";
+      name = "torchaudio-2.11.0-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.11.0-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-SS3WRkXp0LuEPpTx2aTR4xQmJi/8WU+v7MFpffnfXrk=";
     };
     aarch64-darwin-312 = {
-      name = "torchaudio-2.10.0-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-CF8bcjOeQyEAW5qs19BrHGTl86Lj/5/GrVmL+2/ezsQ=";
+      name = "torchaudio-2.11.0-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.11.0-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-oc8azIg77py5BqkzVy/taoqTP4bvNOnqfYA/cjF+jBs=";
     };
     aarch64-darwin-313 = {
-      name = "torchaudio-2.10.0-cp313-cp313-macosx_12_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp313-cp313-macosx_12_0_arm64.whl";
-      hash = "sha256-vSp2B4YHmOWEdH1zVrPxG0OtppWyZCFc5ae29o/g81U=";
+      name = "torchaudio-2.11.0-cp313-cp313-macosx_12_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.11.0-cp313-cp313-macosx_12_0_arm64.whl";
+      hash = "sha256-4/lpap7x1JrMRSFZsFI3DGNkBtBy6djxCJX9qHtZHqk=";
     };
     aarch64-darwin-314 = {
-      name = "torchaudio-2.10.0-cp314-cp314-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp314-cp314-macosx_11_0_arm64.whl";
-      hash = "sha256-6o8HhIRjaezV2yZs9+sUhLXstzSG0puROt3SZ9e/Vks=";
+      name = "torchaudio-2.11.0-cp314-cp314-macosx_12_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.11.0-cp314-cp314-macosx_12_0_arm64.whl";
+      hash = "sha256-zAnNH2AVuFSef+JV+xvlNGtX5/7gZUHT89uwEtjEcV8=";
     };
     aarch64-linux-310 = {
-      name = "torchaudio-2.10.0-cp310-cp310-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-8YL6GRdwG7wk+z4q63gBwVls9C0CPX1+NBBdLyfXKZg=";
+      name = "torchaudio-2.11.0-cp310-cp310-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.11.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-Qs45MDbKasUHImp6bPg74pyMClHD+3dUmPixVj9HY4c=";
     };
     aarch64-linux-311 = {
-      name = "torchaudio-2.10.0-cp311-cp311-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-01kA9GicsBZBlbMSY6dpmHyJU0Ehl6a0t1ghjS4tvIY=";
+      name = "torchaudio-2.11.0-cp311-cp311-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.11.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-el7N0g+ybY6x1iE13cbbD4BrF2Z8EOgt+RP9UJ0fXP4=";
     };
     aarch64-linux-312 = {
-      name = "torchaudio-2.10.0-cp312-cp312-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-SlEfXVXuA0gFJnDlg0gAd05CbOFoXYe0gqyeIyQHS7c=";
+      name = "torchaudio-2.11.0-cp312-cp312-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.11.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-ud0sasFEAB3G2sOLVkwd5zrCbvDBldUDfEqUmQsOK1o=";
     };
     aarch64-linux-313 = {
-      name = "torchaudio-2.10.0-cp313-cp313-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-3Y7Rtym0aU8Bd2rpXn20MrGoCNtDd/mVlv50wkzLor4=";
+      name = "torchaudio-2.11.0-cp313-cp313-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.11.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-L6qNjyUdH6RIE3ZbAHkQSLYX6dwG5s2SIquoECOSkRk=";
     };
     aarch64-linux-314 = {
-      name = "torchaudio-2.10.0-cp314-cp314-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.10.0-cp314-cp314-manylinux_2_28_aarch64.whl";
-      hash = "sha256-DxEeF2oX3R9uygFmLbr8G/o2ZBTd64bxCmUzD8rP8L8=";
+      name = "torchaudio-2.11.0-cp314-cp314-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.11.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
+      hash = "sha256-WR7YJ58BcO8okzhz9l6fX4xDkocIjvYoXNplmIsLphQ=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh
index bd9fed5959d1..6fef63f9e085 100755
--- a/pkgs/development/python-modules/torchaudio/prefetch.sh
+++ b/pkgs/development/python-modules/torchaudio/prefetch.sh
@@ -20,12 +20,12 @@ url_and_key_list=(
   "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl"
   "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl"
   "aarch64-darwin-313 $darwin_bucket/torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl"
-  "aarch64-darwin-314 $darwin_bucket/torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl"
-  "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl"
-  "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl"
-  "aarch64-linux-312 $linux_cpu_bucket/torchaudio-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchaudio-${version}-cp312-cp312-manylinux2014_aarch64.whl"
-  "aarch64-linux-313 $linux_cpu_bucket/torchaudio-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchaudio-${version}-cp313-cp313-manylinux2014_aarch64.whl"
-  "aarch64-linux-314 $linux_cpu_bucket/torchaudio-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchaudio-${version}-cp314-cp314-manylinux2014_aarch64.whl"
+  "aarch64-darwin-314 $darwin_bucket/torchaudio-${version}-cp314-cp314-macosx_12_0_arm64.whl torchaudio-${version}-cp314-cp314-macosx_12_0_arm64.whl"
+  "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux_2_28_aarch64.whl"
+  "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux_2_28_aarch64.whl"
+  "aarch64-linux-312 $linux_cpu_bucket/torchaudio-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torchaudio-${version}-cp312-cp312-manylinux_2_28_aarch64.whl"
+  "aarch64-linux-313 $linux_cpu_bucket/torchaudio-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torchaudio-${version}-cp313-cp313-manylinux_2_28_aarch64.whl"
+  "aarch64-linux-314 $linux_cpu_bucket/torchaudio-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torchaudio-${version}-cp314-cp314-manylinux_2_28_aarch64.whl"
 )
 
 hashfile=binary-hashes-"$version".nix
diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix
index 7060b38a1a88..d0d85974c3fe 100644
--- a/pkgs/development/python-modules/torchio/default.nix
+++ b/pkgs/development/python-modules/torchio/default.nix
@@ -97,7 +97,7 @@ buildPythonPackage rec {
   meta = {
     description = "Medical imaging toolkit for deep learning";
     homepage = "https://docs.torchio.org";
-    changelog = "https://github.com/TorchIO-project/torchio/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/TorchIO-project/torchio/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.bcdarwin ];
   };
diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index 468d28515e20..47165f8cf40c 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -22,7 +22,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "0.25.0";
+  version = "0.26.0";
 in
 buildPythonPackage {
   inherit version;
diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix
index cf209e7d61f7..4488399fede9 100644
--- a/pkgs/development/python-modules/torchvision/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "0.25.0" = {
+  "0.26.0" = {
     x86_64-linux-310 = {
-      name = "torchvision-0.25.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-QzUMoRPp8iTe25Cw28MYU/3k8yJ5TL5KdYn8yrV2jww=";
+      name = "torchvision-0.26.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.26.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-9Ev8Ybm+gLz1KnYtNNo2POoxJdEMAfN+JxWDgDx7uXs=";
     };
     x86_64-linux-311 = {
-      name = "torchvision-0.25.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-6/K0lcdgl3lrmi6skpDvvK6W4P2eWuUsQO/xiGELtEA=";
+      name = "torchvision-0.26.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.26.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-jyYp0FZXDJKbCh1Uc9nLAyC5C9oXZL2jU1U6csxrIGk=";
     };
     x86_64-linux-312 = {
-      name = "torchvision-0.25.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-ElWgyiv5h6z58QO5bFxM/jQV/Eoe7xf6CK9SegSk9XM=";
+      name = "torchvision-0.26.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.26.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-zPJrS2Wc/ObyIIy4MmBx1RxwIZo0hW399GjR4Zr1LA0=";
     };
     x86_64-linux-313 = {
-      name = "torchvision-0.25.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-qcDeiT3OnCkTyceuiKkWkQ+S0CuZ2hSWeIBtGOgHnyk=";
+      name = "torchvision-0.26.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.26.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-yx9hhKe6MPukBYDhoBpmBKhsVeef3aGH9AEW7mgEQew=";
     };
     x86_64-linux-314 = {
-      name = "torchvision-0.25.0-cp314-cp314-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.25.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
-      hash = "sha256-W3rT+2zwPvKi/WF8tLTkHvqbsBQ8Z/UGwqPmdlx7Eq0=";
+      name = "torchvision-0.26.0-cp314-cp314-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.26.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
+      hash = "sha256-qsZHyRMPHyX1yPW8o9lc/Za9+sk6tUUpaQsIjmTk+mQ=";
     };
     aarch64-darwin-310 = {
-      name = "torchvision-0.25.0-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-eBCEGRaiqHDL+1gfQIS1lHmQj7nbbt/feBOZMTkthnc=";
+      name = "torchvision-0.26.0-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-oG1HcqjhPncpBu1zbMU+xmOeXmBVT45fpsoWWqvrxGQ=";
     };
     aarch64-darwin-311 = {
-      name = "torchvision-0.25.0-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-p2znuNT84pGiVyHuL5IceDrMbb1Pwy3HQe0qHVqN3i8=";
+      name = "torchvision-0.26.0-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-Vb1q1K53vgG6Z6QQsFtR9TsNDuRfFG62oN+5AH5wqzw=";
     };
     aarch64-darwin-312 = {
-      name = "torchvision-0.25.0-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-ck8hKlig0NdYZJziiGAQVrX0agHeVFcC9CvMxbJcsMw=";
+      name = "torchvision-0.26.0-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-xAnhw/3r7Ho4NEZQhtvai/doDv95q/f9LxDGtZUgp6Q=";
     };
     aarch64-darwin-313 = {
-      name = "torchvision-0.25.0-cp313-cp313-macosx_12_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp313-cp313-macosx_12_0_arm64.whl";
-      hash = "sha256-bERBGcavj6SLecWfFSn8FaRaK7+CPPhfhR5yA9hPcn8=";
+      name = "torchvision-0.26.0-cp313-cp313-macosx_12_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0-cp313-cp313-macosx_12_0_arm64.whl";
+      hash = "sha256-XWPdQxYmkSWLGzUpuQQbrH1UyqN+rgkl+ZcQgmjL98Q=";
     };
     aarch64-darwin-314 = {
-      name = "torchvision-0.25.0-cp314-cp314-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0-cp314-cp314-macosx_11_0_arm64.whl";
-      hash = "sha256-pkrlQ/4KBXqTlUr5TCOWKXI9sZbtZQkOZ3XxNnJrIvg=";
+      name = "torchvision-0.26.0-cp314-cp314-macosx_12_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0-cp314-cp314-macosx_12_0_arm64.whl";
+      hash = "sha256-62GATrnb6IxaKmxNqN7B2A0tCm8YyZnFJOMiZssevNM=";
     };
     aarch64-linux-310 = {
-      name = "torchvision-0.25.0-cp310-cp310-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-c84E3qZJFP8REACDESBMNmEH1lHTsE+qDb7nfvtxM7c=";
+      name = "torchvision-0.26.0-cp310-cp310-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-l9+ahZXc4lbS5t0Wu80caN0A7scS431LbseYVFPdwqo=";
     };
     aarch64-linux-311 = {
-      name = "torchvision-0.25.0-cp311-cp311-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-Wb6Z0cRw70cLE0Roqmr6b5aAgaUDrLTuiD1wMy+CLjU=";
+      name = "torchvision-0.26.0-cp311-cp311-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-wR5VBB9rhKbE+yiYG5AUdaqBw4aVzOxt38xUw/qfrE8=";
     };
     aarch64-linux-312 = {
-      name = "torchvision-0.25.0-cp312-cp312-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-cnM06achz8GsKWzgv55p2UhoIb+lsedaj+tveAQdtIE=";
+      name = "torchvision-0.26.0-cp312-cp312-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-F/C1QjMfyUIwtCFMbRI/A4r3Mw/YEBlgjA0kAvO8MHk=";
     };
     aarch64-linux-313 = {
-      name = "torchvision-0.25.0-cp313-cp313-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-/lTL1ZQs0LJqkPF0jw1EIcr2e+NcKBxsO4VzczoD1jA=";
+      name = "torchvision-0.26.0-cp313-cp313-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-LpMq8SOjkTeBXf0VLGTMaD+ny9MnyWXoB8lyjHqklxo=";
     };
     aarch64-linux-314 = {
-      name = "torchvision-0.25.0-cp314-cp314-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.25.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
-      hash = "sha256-DC0NqbwBGg/eHRJa85ao++lNmb7PnTE3ZPJMp2V6NEg=";
+      name = "torchvision-0.26.0-cp314-cp314-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.26.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
+      hash = "sha256-eFdsjVqGZd5sqqbnw6P7fKpdwRIDK6YOEpqeeKRGoDs=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh
index f1f1612e42d1..6285ab06fed8 100755
--- a/pkgs/development/python-modules/torchvision/prefetch.sh
+++ b/pkgs/development/python-modules/torchvision/prefetch.sh
@@ -19,7 +19,7 @@ url_and_key_list=(
   "aarch64-darwin-311 $cpu_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl"
   "aarch64-darwin-312 $cpu_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl"
   "aarch64-darwin-313 $cpu_bucket/torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl"
-  "aarch64-darwin-314 $cpu_bucket/torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl"
+  "aarch64-darwin-314 $cpu_bucket/torchvision-${version}-cp314-cp314-macosx_12_0_arm64.whl torchvision-${version}-cp314-cp314-macosx_12_0_arm64.whl"
   "aarch64-linux-310 $cpu_bucket/torchvision-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl"
   "aarch64-linux-311 $cpu_bucket/torchvision-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl"
   "aarch64-linux-312 $cpu_bucket/torchvision-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torchvision-${version}-cp312-cp312-linux_aarch64.whl"
diff --git a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
index 090b6215651d..20e3c8d6f426 100644
--- a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
@@ -127,7 +127,7 @@ buildPythonPackage (finalAttrs: {
     EOF
   '';
 
-  pytestFlagsArray = [
+  enabledTestPaths = [
     "e2e/python/tests"
     "tests/test_apps/python/smoke_test.py"
   ];
diff --git a/pkgs/development/python-modules/tree-sitter-zeek/default.nix b/pkgs/development/python-modules/tree-sitter-zeek/default.nix
index dc7ada1438d5..00ebad4d7c94 100644
--- a/pkgs/development/python-modules/tree-sitter-zeek/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-zeek/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter-zeek";
-  version = "0.2.11";
+  version = "0.2.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zeek";
     repo = "tree-sitter-zeek";
     tag = "v${version}";
-    hash = "sha256-8ki1FRE1HSaG0180UWgEZxlmbOORvo3QlpLb9rMdmIQ=";
+    hash = "sha256-BWrzPMsUgbIvdWsafTtXApmGGr7Sdpb382iqhM8Etqk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/triton/0005-add-gcn5-gfx906-target.patch b/pkgs/development/python-modules/triton/0005-add-gcn5-gfx906-target.patch
new file mode 100644
index 000000000000..6fcc6a22bc42
--- /dev/null
+++ b/pkgs/development/python-modules/triton/0005-add-gcn5-gfx906-target.patch
@@ -0,0 +1,131 @@
+diff --git a/test/Conversion/amd/tritongpu_to_llvm.mlir b/test/Conversion/amd/tritongpu_to_llvm.mlir
+index 068e931a6..e651f7b0a 100644
+--- a/test/Conversion/amd/tritongpu_to_llvm.mlir
++++ b/test/Conversion/amd/tritongpu_to_llvm.mlir
+@@ -1,5 +1,6 @@
+ // RUN: triton-opt %s -split-input-file --allocate-shared-memory --convert-triton-amdgpu-to-llvm=arch=gfx942 --convert-builtin-func-to-llvm | FileCheck %s
+ // RUN: triton-opt %s -split-input-file --allocate-shared-memory --convert-triton-amdgpu-to-llvm=arch=gfx950 | FileCheck %s --check-prefix=GFX950
++// RUN: triton-opt %s -split-input-file --allocate-shared-memory --convert-triton-amdgpu-to-llvm=arch=gfx906 | FileCheck %s --check-prefix=GFX906
+ 
+ module attributes {"ttg.num-ctas" = 1 : i32, "ttg.num-warps" = 4 : i32} {
+   // CHECK-LABEL: atomic_add_f32_scalar
+@@ -633,3 +634,27 @@ module attributes {"ttg.num-ctas" = 1 : i32, "ttg.num-warps" = 4 : i32, "ttg.thr
+     tt.return
+   }
+ }
++
++// -----
++
++// GFX906-LABEL: v_dot_fp16_gfx906
++#blocked = #ttg.blocked<{sizePerThread = [1, 1], threadsPerWarp = [8, 8], warpsPerCTA = [2, 2], order = [1, 0]}>
++module attributes {"ttg.target" = "hip:gfx906", "ttg.num-ctas" = 1 : i32, "ttg.num-warps" = 4 : i32, "ttg.threads-per-warp" = 64 : i32} {
++  tt.func @v_dot_fp16_gfx906(%arg0: tensor<16x16xf16, #ttg.dot_op<{opIdx = 0, parent = #blocked}>>, %arg1: tensor<16x16xf16, #ttg.dot_op<{opIdx = 1, parent = #blocked}>>, %arg2: tensor<16x16xf32, #blocked>) {
++    // GFX906-COUNT-8: llvm.call_intrinsic "llvm.amdgcn.fdot2"
++    %0 = tt.dot %arg0, %arg1, %arg2, inputPrecision = ieee : tensor<16x16xf16, #ttg.dot_op<{opIdx = 0, parent = #blocked}>> * tensor<16x16xf16, #ttg.dot_op<{opIdx = 1, parent = #blocked}>> -> tensor<16x16xf32, #blocked>
++    tt.return
++  }
++}
++
++// -----
++
++// GFX906-LABEL: v_dot_i8_gfx906
++#blocked = #ttg.blocked<{sizePerThread = [1, 1], threadsPerWarp = [8, 8], warpsPerCTA = [2, 2], order = [1, 0]}>
++module attributes {"ttg.target" = "hip:gfx906", "ttg.num-ctas" = 1 : i32, "ttg.num-warps" = 4 : i32, "ttg.threads-per-warp" = 64 : i32} {
++  tt.func @v_dot_i8_gfx906(%arg0: tensor<16x16xi8, #ttg.dot_op<{opIdx = 0, parent = #blocked}>>, %arg1: tensor<16x16xi8, #ttg.dot_op<{opIdx = 1, parent = #blocked}>>, %arg2: tensor<16x16xi32, #blocked>) {
++    // GFX906-COUNT-4: llvm.call_intrinsic "llvm.amdgcn.sdot4"
++    %0 = tt.dot %arg0, %arg1, %arg2, inputPrecision = ieee : tensor<16x16xi8, #ttg.dot_op<{opIdx = 0, parent = #blocked}>> * tensor<16x16xi8, #ttg.dot_op<{opIdx = 1, parent = #blocked}>> -> tensor<16x16xi32, #blocked>
++    tt.return
++  }
++}
+diff --git a/third_party/amd/include/TritonAMDGPUToLLVM/TargetUtils.h b/third_party/amd/include/TritonAMDGPUToLLVM/TargetUtils.h
+index a689fe438..5d84110dc 100644
+--- a/third_party/amd/include/TritonAMDGPUToLLVM/TargetUtils.h
++++ b/third_party/amd/include/TritonAMDGPUToLLVM/TargetUtils.h
+@@ -8,6 +8,7 @@ namespace mlir::triton::AMD {
+ // A list of ISA families we care about.
+ enum class ISAFamily {
+   Unknown,
++  GCN5_1,
+   CDNA1,
+   CDNA2,
+   CDNA3,
+diff --git a/third_party/amd/lib/TritonAMDGPUToLLVM/TargetInfo.cpp b/third_party/amd/lib/TritonAMDGPUToLLVM/TargetInfo.cpp
+index af7b4b1f7..01cacc9de 100644
+--- a/third_party/amd/lib/TritonAMDGPUToLLVM/TargetInfo.cpp
++++ b/third_party/amd/lib/TritonAMDGPUToLLVM/TargetInfo.cpp
+@@ -71,6 +71,7 @@ llvm::AMDGPU::GPUKind TargetInfo::getGPUKind() const {
+ 
+ int TargetInfo::getWarpSize() const {
+   switch (getISAFamily()) {
++  case ISAFamily::GCN5_1:
+   case ISAFamily::CDNA1:
+   case ISAFamily::CDNA2:
+   case ISAFamily::CDNA3:
+@@ -335,10 +336,10 @@ bool TargetInfo::warpReduce(RewriterBase &rewriter, Location loc,
+     return true;
+   if (numLaneToReduce != getWarpSize())
+     return false;
+-  if (isCDNA(getISAFamily()) && getISAFamily() == ISAFamily::CDNA1)
+-    return false;
+-  if (isRDNA(getISAFamily()) &&
+-      llvm::is_contained({ISAFamily::RDNA1, ISAFamily::RDNA2}, getISAFamily()))
++  // DPP warp reduce requires gfx90a+ (CDNA2+) or gfx11+ (RDNA3+).
++  // Pre-CDNA2 GFX9 (gfx906/gfx908) and GFX10 (RDNA1/2) are excluded.
++  auto v = getIsaVersion();
++  if (!((v.Major == 9 && (v.Minor > 0 || v.Stepping >= 0xa)) || v.Major >= 11))
+     return false;
+ 
+   Operation *reduxOp = op.getSingleCombiner();
+@@ -438,7 +439,7 @@ bool TargetInfo::warpReduce(RewriterBase &rewriter, Location loc,
+     buf = createDppReduxOpWithBoundCtrl(valType, buf, 1 + dppCtrlRowShr,
+                                         allRows, allBanks);
+ 
+-    if (isCDNA(getISAFamily())) {
++    if (isCDNA(getISAFamily()) || getISAFamily() == ISAFamily::GCN5_1) {
+       // row_bcast:15 row_mask:0xa
+       buf = createDppReduxOpWithBoundCtrl(
+           valType, buf, static_cast<uint32_t>(DppCtrl::BCAST15), 0xa, allBanks);
+diff --git a/third_party/amd/lib/TritonAMDGPUToLLVM/TargetInfo.cpp.rej b/third_party/amd/lib/TritonAMDGPUToLLVM/TargetInfo.cpp.rej
+new file mode 100644
+index 000000000..b75ab8f11
+--- /dev/null
++++ b/third_party/amd/lib/TritonAMDGPUToLLVM/TargetInfo.cpp.rej
+@@ -0,0 +1,16 @@
++diff a/third_party/amd/lib/TritonAMDGPUToLLVM/TargetInfo.cpp b/third_party/amd/lib/TritonAMDGPUToLLVM/TargetInfo.cpp	(rejected hunks)
++@@ -395,10 +396,10 @@ bool TargetInfo::warpReduce(RewriterBase &rewriter, Location loc,
++     return true;
++   if (reduceLaneIdMask != (getWarpSize() - 1))
++     return false;
++-  if (isCDNA(getISAFamily()) && getISAFamily() == ISAFamily::CDNA1)
++-    return false;
++-  if (isRDNA(getISAFamily()) &&
++-      llvm::is_contained({ISAFamily::RDNA1, ISAFamily::RDNA2}, getISAFamily()))
+++  // DPP warp reduce requires gfx90a+ (CDNA2+) or gfx11+ (RDNA3+).
+++  // Pre-CDNA2 GFX9 (gfx906/gfx908) and GFX10 (RDNA1/2) are excluded.
+++  auto v = getIsaVersion();
+++  if (!((v.Major == 9 && (v.Minor > 0 || v.Stepping >= 0xa)) || v.Major >= 11))
++     return false;
++
++   Operation *reduxOp = op.getSingleCombiner();
+diff --git a/third_party/amd/lib/TritonAMDGPUToLLVM/TargetUtils.cpp b/third_party/amd/lib/TritonAMDGPUToLLVM/TargetUtils.cpp
+index b79841ab5..afb80d9fb 100644
+--- a/third_party/amd/lib/TritonAMDGPUToLLVM/TargetUtils.cpp
++++ b/third_party/amd/lib/TritonAMDGPUToLLVM/TargetUtils.cpp
+@@ -12,6 +12,9 @@ ISAFamily deduceISAFamily(llvm::StringRef arch) {
+   if (kind == llvm::AMDGPU::GK_GFX1250)
+     return ISAFamily::GFX1250;
+ 
++  if (kind == llvm::AMDGPU::GK_GFX906)
++    return ISAFamily::GCN5_1;
++
+   // CDNA ISA cases
+   switch (kind) {
+   case llvm::AMDGPU::GK_GFX950:
+@@ -41,6 +44,7 @@ ISAFamily deduceISAFamily(llvm::StringRef arch) {
+ 
+ bool supportsVDot(llvm::StringRef arch) {
+   switch (deduceISAFamily(arch)) {
++  case AMD::ISAFamily::GCN5_1:
+   case AMD::ISAFamily::CDNA1:
+   case AMD::ISAFamily::CDNA2:
+   case AMD::ISAFamily::CDNA3:
diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index 20151128fa89..cd81a8c6de0f 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -63,6 +63,8 @@ buildPythonPackage (finalAttrs: {
       libcudaStubsDir =
         if cudaSupport then "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs" else null;
     })
+    # Backport of https://github.com/triton-lang/triton/pull/9628 (does not apply cleanly)
+    ./0005-add-gcn5-gfx906-target.patch
   ]
   ++ lib.optionals cudaSupport [
     (replaceVars ./0003-nvidia-cudart-a-systempath.patch {
diff --git a/pkgs/development/python-modules/tuya-device-handlers/default.nix b/pkgs/development/python-modules/tuya-device-handlers/default.nix
index fef726756115..574b447b9341 100644
--- a/pkgs/development/python-modules/tuya-device-handlers/default.nix
+++ b/pkgs/development/python-modules/tuya-device-handlers/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tuya-device-handlers";
-  version = "0.0.17";
+  version = "0.0.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "tuya-device-handlers";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T3jwUeRVSAiRSzyIOo7M046C+Dul1/1I9kZj0OzIIcs=";
+    hash = "sha256-ZzK6IV6AF+5+oOW9ADM/zgwFTmKNT2CzaEuXXK2hyVo=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 316a281a106f..9f20df52c8ec 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -191,6 +191,8 @@ buildPythonPackage rec {
           # https://github.com/twisted/twisted/blob/twisted-25.5.0/src/twisted/internet/test/test_tcp.py
           "AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbort"
           "AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbortLater"
+          # Times out in Hydra on x86_64-darwin
+          "AbortConnectionTests_AsyncioSelectorReactorTests.test_fullWriteBufferAfterByteExchange"
         ];
       };
     in
diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix
index d9acc4e32202..e9c5b77a2bef 100644
--- a/pkgs/development/python-modules/txtai/default.nix
+++ b/pkgs/development/python-modules/txtai/default.nix
@@ -290,7 +290,7 @@ buildPythonPackage {
   ++ optional-dependencies.api
   ++ optional-dependencies.similarity;
 
-  pytestFlagsArray = [
+  enabledTestPaths = [
     "test/python/*"
   ];
 
diff --git a/pkgs/development/python-modules/typedunits/default.nix b/pkgs/development/python-modules/typedunits/default.nix
index a0f8d285e5ef..93c6220ba28c 100644
--- a/pkgs/development/python-modules/typedunits/default.nix
+++ b/pkgs/development/python-modules/typedunits/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "typedunits";
-  version = "0.0.1";
+  version = "0.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "quantumlib";
     repo = "TypedUnits";
     tag = "v${version}";
-    hash = "sha256-g/kUPEtdyNvcWJOqcTCF27pW22WTg0EiHoEXgSs2xMs=";
+    hash = "sha256-dADN9zBwspfDPdgce5EKEclI1qLcqc0N09RGsiPrJ0c=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix
index 887e1a5a602d..a0ecd6f88927 100644
--- a/pkgs/development/python-modules/types-aiobotocore/default.nix
+++ b/pkgs/development/python-modules/types-aiobotocore/default.nix
@@ -371,13 +371,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "types-aiobotocore";
-  version = "3.2.1";
+  version = "3.5.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_aiobotocore";
     inherit (finalAttrs) version;
-    hash = "sha256-jG7VRc+KHO0zveKRKXW2Bq0MojsZYN22vPyeS/fd5ic=";
+    hash = "sha256-hjbJ5amDfUHkUmRXA0nZjAza1R/nlh7hlmShEJS7ImI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix
index e6e94fb7898a..1047d820d480 100644
--- a/pkgs/development/python-modules/typst/default.nix
+++ b/pkgs/development/python-modules/typst/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python binding to typst";
     homepage = "https://github.com/messense/typst-py";
-    changelog = "https://github.com/messense/typst-py/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/messense/typst-py/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix
index 100722bc9c06..b9c451664e0f 100644
--- a/pkgs/development/python-modules/tzdata/default.nix
+++ b/pkgs/development/python-modules/tzdata/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "tzdata";
-  version = "2025.3";
+  version = "2026.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3jnCyl3HsDRPLrqG9J1hQBnSnwYPxOvIpBeJamILVqc=";
+    hash = "sha256-Z2WKGQPHWRcwnnU/3DSawO/Ywn23oMtAaiW+SED4f5g=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -25,6 +25,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "tzdata" ];
 
   meta = {
+    changelog = "https://github.com/python/tzdata/blob/${version}/NEWS.md";
     description = "Provider of IANA time zone data";
     homepage = "https://github.com/python/tzdata";
     license = lib.licenses.asl20;
diff --git a/pkgs/development/python-modules/ua-parser-builtins/default.nix b/pkgs/development/python-modules/ua-parser-builtins/default.nix
index 8d75882f6868..0af3d13faca7 100644
--- a/pkgs/development/python-modules/ua-parser-builtins/default.nix
+++ b/pkgs/development/python-modules/ua-parser-builtins/default.nix
@@ -24,4 +24,14 @@ buildPythonPackage rec {
     pyyaml
     versioningit
   ];
+
+  meta = {
+    inherit (ua-parser.meta)
+      description
+      homepage
+      license
+      changelog
+      ;
+    maintainers = [ ];
+  };
 }
diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix
index 7588932abd70..c792c463d625 100644
--- a/pkgs/development/python-modules/ultralytics/default.nix
+++ b/pkgs/development/python-modules/ultralytics/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ultralytics";
-  version = "8.4.37";
+  version = "8.4.41";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultralytics";
     repo = "ultralytics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-b6omoISVn/mwwq/GIm2M3B70tO6DanucbcTPitRYRS0=";
+    hash = "sha256-Ad8GuxPhpCRFOz6/0LiDjkqPMq7ooPRLJ6GKDLCfaKc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix
index 7959204b7581..5c6c951288a5 100644
--- a/pkgs/development/python-modules/unstructured-client/default.nix
+++ b/pkgs/development/python-modules/unstructured-client/default.nix
@@ -1,13 +1,11 @@
 {
   aiofiles,
   buildPythonPackage,
-  cryptography,
   deepdiff,
   fetchFromGitHub,
   httpcore,
   httpx,
   lib,
-  poetry-core,
   pydantic,
   pypdf,
   pypdfium2,
@@ -15,33 +13,29 @@
   pytestCheckHook,
   python,
   requests-toolbelt,
+  setuptools,
 }:
 
 buildPythonPackage (finalAttrs: {
   pname = "unstructured-client";
-  version = "0.42.12";
+  version = "0.43.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Unstructured-IO";
     repo = "unstructured-python-client";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xuaGvQEu1QpLn33AUgdWW120pVVNVPL08U/SCA7kGvc=";
+    hash = "sha256-Y/qhgm+mmKNPZhx/km02i7sc31izQH72REXYrKY++OM=";
   };
 
   preBuild = ''
     ${python.interpreter} scripts/prepare_readme.py
   '';
 
-  build-system = [ poetry-core ];
-
-  pythonRelaxDeps = [
-    "pydantic"
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     aiofiles
-    cryptography
     httpcore
     httpx
     pydantic
diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix
index fe37b4ad0c47..4c6de860c585 100644
--- a/pkgs/development/python-modules/uritools/default.nix
+++ b/pkgs/development/python-modules/uritools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "uritools";
-  version = "6.0.1";
+  version = "6.0.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-L56cuVTnh3Iysshj9ySkSgbrmNnH691pkUh26Uh7lPg=";
+    hash = "sha256-TWccO4yiMKXUfvpfimk/PQFTHzj09SMXApm+c0zJhRs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/url-normalize/default.nix b/pkgs/development/python-modules/url-normalize/default.nix
index d800fb80b7a4..149a7f542020 100644
--- a/pkgs/development/python-modules/url-normalize/default.nix
+++ b/pkgs/development/python-modules/url-normalize/default.nix
@@ -9,16 +9,16 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "url-normalize";
-  version = "2.2.1";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "niksite";
     repo = "url-normalize";
-    tag = "v${version}";
-    hash = "sha256-ZFY1KMEHvteMFVM3QcYjCiTz3dLxRWyv/dZQMzVxGvo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RZORbZfeRfzGJFsLXJUuqXVFsD8TfcHzjBGb80cTetQ=";
   };
 
   build-system = [ setuptools ];
@@ -34,10 +34,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "url_normalize" ];
 
   meta = {
-    changelog = "https://github.com/niksite/url-normalize/blob/${src.tag}/CHANGELOG.md";
     description = "URL normalization for Python";
     homepage = "https://github.com/niksite/url-normalize";
+    changelog = "https://github.com/niksite/url-normalize/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix
index 32341aeaf819..ec46491b574f 100644
--- a/pkgs/development/python-modules/urllib3-future/default.nix
+++ b/pkgs/development/python-modules/urllib3-future/default.nix
@@ -10,6 +10,7 @@
   jh2,
   lib,
   pytest-asyncio,
+  pytest-rerunfailures,
   pytest-timeout,
   pytestCheckHook,
   python-socks,
@@ -24,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "urllib3-future";
-  version = "2.19.904";
+  version = "2.19.913";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "urllib3.future";
     tag = version;
-    hash = "sha256-bYkT78OT665Ea3k4boORlaFiORaryqRXSfxXt0yZLSM=";
+    hash = "sha256-ReoVZb31M1N1oxSFYGd1x1P5/qBx/oFEjaxJEiMwbvM=";
   };
 
   postPatch = ''
@@ -68,6 +69,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     aiofile
     pytest-asyncio
+    pytest-rerunfailures
     pytest-timeout
     pytestCheckHook
     tornado
@@ -80,11 +82,6 @@ buildPythonPackage rec {
     "test/contrib/test_resolver.py::test_url_resolver"
   ];
 
-  disabledTests = [
-    # test hangs
-    "test_proxy_rejection"
-  ];
-
   meta = {
     changelog = "https://github.com/jawah/urllib3.future/blob/${src.tag}/CHANGES.rst";
     description = "Powerful HTTP 1.1, 2, and 3 client with both sync and async interfaces";
diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix
index 69e753c08bdf..fc181961e98f 100644
--- a/pkgs/development/python-modules/vehicle/default.nix
+++ b/pkgs/development/python-modules/vehicle/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   postPatch = ''
     # Upstream doesn't set a version for the pyproject.toml
     substituteInPlace pyproject.toml \
-      --replace "0.0.0" "${version}" \
+      --replace "0.0.0" "${version}"
   '';
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix
index b1c0a671a24f..5f26e0e12f0d 100644
--- a/pkgs/development/python-modules/vfblib/default.nix
+++ b/pkgs/development/python-modules/vfblib/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "vfblib";
-  version = "0.10.6";
+  version = "0.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LucasFonts";
     repo = "vfbLib";
     tag = "v${version}";
-    hash = "sha256-kPPRLs+i181stjoTjgi9XfxsQhx+VKGCggyfhy8o6Nw=";
+    hash = "sha256-AXZKJgZADE0J4WHB6pn/b6K3Jwawyq6j0tRt6HyRkpk=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix
index 2474e31e11ae..eabe258913c4 100644
--- a/pkgs/development/python-modules/victron-mqtt/default.nix
+++ b/pkgs/development/python-modules/victron-mqtt/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "victron-mqtt";
-  version = "2026.4.9";
+  version = "2026.4.19";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tomer-w";
     repo = "victron_mqtt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Lq3I5xZCu3UrllW0cHLo7wlKnDOl73TDRN97gThvP1M=";
+    hash = "sha256-KJAq/tYQHdlgeUTG+o3yKD5x1XKpYLDlDAr1ti2lbYI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index 2402baf230f9..c72d74d9c01d 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -8,7 +8,7 @@
   pyasn1-modules,
   pycparser,
   pyqt5,
-  pyqtwebengine,
+  # pyqtwebengine, # removed
   withGui ? false,
   wrapQtAppsHook,
   setuptools,
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = lib.optionals withGui [
     wrapQtAppsHook
   ];
 
@@ -48,10 +48,10 @@ buildPythonPackage rec {
 
   optional-dependencies.gui = [
     pyqt5
-    pyqtwebengine
+    # pyqtwebengine
   ];
 
-  postFixup = ''
+  postFixup = lib.optionalString withGui ''
     wrapQtApp $out/bin/vivbin
   '';
 
@@ -66,5 +66,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/vivisect/vivisect/blob/v${version}/CHANGELOG.rst";
     license = lib.licenses.asl20;
     maintainers = [ ];
+    broken = withGui; # https://github.com/vivisect/vivisect/issues/683
   };
 }
diff --git a/pkgs/development/python-modules/wagtail-modeladmin/default.nix b/pkgs/development/python-modules/wagtail-modeladmin/default.nix
index 2cffd8c880ee..732f74ac1089 100644
--- a/pkgs/development/python-modules/wagtail-modeladmin/default.nix
+++ b/pkgs/development/python-modules/wagtail-modeladmin/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "wagtail-modeladmin";
-  version = "2.2.0";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "wagtail-nest";
     repo = "wagtail-modeladmin";
     tag = "v${version}";
-    hash = "sha256-P75jrH4fMODZHht+RAOd0/MutxsWtmui5Kxk8F/Ew0Q=";
+    hash = "sha256-JA5Me7EcdfCPMhGKgydExV/hkzisFMg7KQWnuVrfzD4=";
   };
 
   # Fail with `AssertionError`
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index 087bd114b1a4..2bbc8c5923ec 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -10,13 +10,12 @@
   writableTmpDirAsHomeHook,
   versionCheckHook,
 
-  ## gpu-stats
+  ## wandb-xpu
   rustPlatform,
 
   ## wandb
   buildPythonPackage,
   replaceVars,
-  fetchpatch,
 
   # build-system
   hatchling,
@@ -76,26 +75,29 @@
 }:
 
 let
-  version = "0.25.1";
+  version = "0.26.1";
   src = fetchFromGitHub {
     owner = "wandb";
     repo = "wandb";
     tag = "v${version}";
-    hash = "sha256-jrHj+dNW/eUMcqT5XJbiAz1tlviVBhdtroJ8dA7GBr4=";
+    hash = "sha256-QtMjiRqE9ZhA1S8gHt1F8NBXTq7QQ3ENhk02Lry80F4=";
   };
 
-  gpu-stats = rustPlatform.buildRustPackage {
-    pname = "gpu-stats";
-    version = "0.6.0";
+  wandb-xpu = rustPlatform.buildRustPackage {
+    pname = "wandb-xpu";
+    version = "0.7.0";
     inherit src;
 
-    sourceRoot = "${src.name}/gpu_stats";
+    sourceRoot = "${src.name}/xpu";
 
-    cargoHash = "sha256-yzvXJYkQTNOScOI3yfVBH6IGZzcFduuXqW3pI5hEZGw=";
+    cargoHash = "sha256-RPvtMV9Mrzb6lJhMR+fi58h/ncvbNkbIjAP35sdaOO0=";
 
     checkFlags = [
       # fails in sandbox
       "--skip=gpu_amd::tests::test_gpu_amd_new"
+
+      # tries to download libtpu wheel from PyPI
+      "--skip=tpu_libtpu::tests::test_libtpu_sdk"
     ];
 
     nativeInstallCheckInputs = [
@@ -104,23 +106,50 @@ let
     doInstallCheck = true;
 
     meta = {
-      mainProgram = "gpu_stats";
+      mainProgram = "wandb-xpu";
     };
   };
 
+  inherit (stdenv.hostPlatform.extensions) sharedLibrary;
+  libRustParquet = "librust_parquet_ffi${sharedLibrary}";
+
+  parquet-rust-wrapper = rustPlatform.buildRustPackage {
+    pname = "arrow-rs-wrapper";
+    version = "0.1.0";
+    inherit src;
+
+    sourceRoot = "${src.name}/parquet-rust-wrapper";
+
+    cargoHash = "sha256-w98wliTcVJr4IlmKFVU+glmawMJl5qVCSUSJ8LeceJ8=";
+
+    # The original build script renames the library:
+    # https://github.com/wandb/wandb/blob/v0.26.0/parquet-rust-wrapper/build.sh#L37-L68
+    postInstall = ''
+      mv $out/lib/libarrow_rs_wrapper${sharedLibrary} $out/lib/${libRustParquet}
+    '';
+  };
+
   wandb-core = buildGoModule {
     pname = "wandb-core";
     inherit src version;
 
     sourceRoot = "${src.name}/core";
 
-    # hardcode the `gpu_stats` binary path.
-    postPatch = ''
-      substituteInPlace internal/monitor/gpuresourcemanager.go \
-        --replace-fail \
-          'cmdPath, err := getGPUCollectorCmdPath()' \
-          'cmdPath, err := "${lib.getExe gpu-stats}", error(nil)'
-    '';
+    postPatch =
+      # hardcode the `wandb-xpu` binary path.
+      ''
+        substituteInPlace internal/monitor/xpuresourcemanager.go \
+          --replace-fail \
+            'cmdPath, err := getXPUCmdPath()' \
+            'cmdPath, err := "${lib.getExe wandb-xpu}", error(nil)'
+      ''
+      # hardcode the `parquet-rust-wrapper` library path.
+      + ''
+        substituteInPlace internal/runhistoryreader/parquet/ffi/rustarrowreader.go \
+          --replace-fail \
+            "${libRustParquet}" \
+            "${lib.getLib parquet-rust-wrapper}/lib/${libRustParquet}"
+      '';
 
     vendorHash = null;
 
@@ -163,20 +192,14 @@ buildPythonPackage (finalAttrs: {
     (replaceVars ./hardcode-git-path.patch {
       git = lib.getExe gitMinimal;
     })
-
-    # https://github.com/wandb/wandb/pull/11552
-    (fetchpatch {
-      name = "add-protobuf-7-compatibility";
-      url = "https://github.com/wandb/wandb/commit/4ef09f3dd1ee408eb9194ea8b7feea2b1128839c.patch";
-      hash = "sha256-6weMJI51cWXz2mCxOGWYGrh0QCxtMGqz6HAVRF5b1xs=";
-    })
   ];
 
   postPatch =
-    # Prevent hatch from building wandb-core
+    # Prevent hatch from building wandb-core and arrow-rs-wrapper
     ''
       substituteInPlace hatch_build.py \
-        --replace-fail "artifacts.extend(self._build_wandb_core())" ""
+        --replace-fail "artifacts.extend(self._build_wandb_core())" "" \
+        --replace-fail "artifacts.extend(self._build_arrow_rs_wrapper())" ""
     ''
     # Hard-code the path to the `wandb-core` binary in the code.
     + ''
@@ -187,11 +210,11 @@ buildPythonPackage (finalAttrs: {
     '';
 
   env = {
-    # Prevent the install script to try building and embedding the `gpu_stats` and `wandb-core`
-    # binaries in the wheel.
-    # Their path have been patched accordingly in the `wandb-core` and `wanbd` source codes.
+    # Prevent the install script from trying to build and embed native binaries in the wheel.
+    # Their paths have been patched accordingly in the `wandb-core` and `wandb` source codes.
     # https://github.com/wandb/wandb/blob/v0.18.5/hatch_build.py#L37-L47
-    WANDB_BUILD_SKIP_GPU_STATS = true;
+    WANDB_BUILD_SKIP_WANDB_XPU = true;
+    WANDB_BUILD_SKIP_ORJSON = true;
     WANDB_BUILD_UNIVERSAL = true;
   };
 
@@ -199,11 +222,6 @@ buildPythonPackage (finalAttrs: {
     hatchling
   ];
 
-  # Protobuf 7 is not compatible with the current version of wandb
-  pythonRelaxDeps = [
-    "protobuf"
-  ];
-
   dependencies = [
     click
     gitpython
@@ -281,6 +299,9 @@ buildPythonPackage (finalAttrs: {
 
     # PermissionError: unable to write to .cache/wandb/artifacts
     "tests/unit_tests/test_artifacts/test_wandb_artifacts.py"
+
+    # Requires kfp which is not packaged
+    "tests/unit_tests/test_kfp.py"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Breaks in sandbox: "Timed out waiting for wandb service to start"
@@ -400,12 +421,20 @@ buildPythonPackage (finalAttrs: {
     "test_watch_parameters_torch_jit"
   ];
 
+  passthru = {
+    inherit
+      wandb-core
+      wandb-xpu
+      parquet-rust-wrapper
+      ;
+  };
+
   meta = {
     description = "CLI and library for interacting with the Weights and Biases API";
     homepage = "https://github.com/wandb/wandb";
     changelog = "https://github.com/wandb/wandb/raw/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ samuela ];
-    broken = gpu-stats.meta.broken || wandb-core.meta.broken;
+    broken = wandb-xpu.meta.broken || wandb-core.meta.broken;
   };
 })
diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix
index cb75a2927084..4a177ce151fd 100644
--- a/pkgs/development/python-modules/waterfurnace/default.nix
+++ b/pkgs/development/python-modules/waterfurnace/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "waterfurnace";
-  version = "1.7.1";
+  version = "1.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sdague";
     repo = "waterfurnace";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1uekNUkiFZnzjx1gctEUVXwcpL3h+0HZLTzBSNhKY8o=";
+    hash = "sha256-o5C964T53JgSBG2M3LP45xNika70CXZmR5Z4ThGdxSE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix
index 8d81d4770def..39e7931da584 100644
--- a/pkgs/development/python-modules/wcwidth/default.nix
+++ b/pkgs/development/python-modules/wcwidth/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "wcwidth";
-  version = "0.4.0";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jquast";
     repo = "wcwidth";
     tag = version;
-    hash = "sha256-TQFvXmYkcsDojZSPAR76Dyq2vRUO41sII0nhC78Fd7Y=";
+    hash = "sha256-J1uVqHMbOr9OZK6W7O3ilSgzB4i6R9jLN8RzwOxZZnA=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix
index 0f10d74990d3..6517c4c504e8 100644
--- a/pkgs/development/python-modules/weatherflow4py/default.nix
+++ b/pkgs/development/python-modules/weatherflow4py/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "weatherflow4py";
-  version = "1.5.2";
+  version = "1.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jeeftor";
     repo = "weatherflow4py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cfQWdQhjW6KjBLQWO9BSAVZ2btRCMjx1CpUifoOwPsU=";
+    hash = "sha256-4Bzoj3SABuziJdbDlDMcbAzGVRRBg5an5Lexlfq9vdw=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix
index 7ffca832322f..6181ad8291f5 100644
--- a/pkgs/development/python-modules/webdataset/default.nix
+++ b/pkgs/development/python-modules/webdataset/default.nix
@@ -20,7 +20,7 @@
   torch,
   torchvision,
 }:
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "webdataset";
   version = "1.0.2";
   pyproject = true;
@@ -80,7 +80,6 @@ buildPythonPackage rec {
     description = "High-performance Python-based I/O system for large (and small) deep learning problems, with strong support for PyTorch";
     mainProgram = "widsindex";
     homepage = "https://github.com/webdataset/webdataset";
-    changelog = "https://github.com/webdataset/webdataset/releases/tag/${version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ iynaix ];
   };
diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix
index 50e3f9127212..9e6dac8f9a11 100644
--- a/pkgs/development/python-modules/weconnect-mqtt/default.nix
+++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix
@@ -10,7 +10,7 @@
   weconnect,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "weconnect-mqtt";
   version = "0.49.5";
   pyproject = true;
@@ -18,13 +18,13 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tillsteinbach";
     repo = "WeConnect-mqtt";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-69p7lAO7W+odrm1kLhvB8v4kNKx6IWBUSOQKgrxVCCY=";
   };
 
   postPatch = ''
     substituteInPlace weconnect_mqtt/__version.py \
-      --replace-fail "0.0.0dev" "${version}"
+      --replace-fail "0.0.0dev" "${finalAttrs.version}"
     substituteInPlace requirements.txt \
       --replace-fail "weconnect[Images]~=" "weconnect>="
     substituteInPlace pytest.ini \
@@ -52,9 +52,9 @@ buildPythonPackage rec {
   meta = {
     description = "Python client that publishes data from Volkswagen WeConnect";
     homepage = "https://github.com/tillsteinbach/WeConnect-mqtt";
-    changelog = "https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/${src.tag}";
+    changelog = "https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/v${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "weconnect-mqtt";
   };
-}
+})
diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix
index 0573db759011..9630b198e69c 100644
--- a/pkgs/development/python-modules/weconnect/default.nix
+++ b/pkgs/development/python-modules/weconnect/default.nix
@@ -12,7 +12,7 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "weconnect";
   version = "0.60.11";
   pyproject = true;
@@ -20,13 +20,13 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tillsteinbach";
     repo = "WeConnect-python";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-llAWCjhP/fwI+H8BRpMYxba8jC+WDc66xkUDwT3NHcA=";
   };
 
   postPatch = ''
     substituteInPlace weconnect/__version.py \
-      --replace-fail "0.0.0dev" "${version}"
+      --replace-fail "0.0.0dev" "${finalAttrs.version}"
     substituteInPlace setup.py \
       --replace-fail "setup_requires=SETUP_REQUIRED" "setup_requires=[]" \
       --replace-fail "tests_require=TEST_REQUIRED" "tests_require=[]"
@@ -34,6 +34,11 @@ buildPythonPackage rec {
       --replace-fail "required_plugins = pytest-cov" ""
   '';
 
+  pythonRelaxDeps = [
+    "oauthlib"
+    "requests"
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -42,8 +47,6 @@ buildPythonPackage rec {
     requests
   ];
 
-  pythonRelaxDeps = [ "oauthlib" ];
-
   optional-dependencies = {
     Images = [
       ascii-magic
@@ -61,8 +64,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python client for the Volkswagen WeConnect Services";
     homepage = "https://github.com/tillsteinbach/WeConnect-python";
-    changelog = "https://github.com/tillsteinbach/WeConnect-python/releases/tag/${src.tag}";
+    changelog = "https://github.com/tillsteinbach/WeConnect-python/releases/tag/v${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix
index e74b34a16cd6..33bdf8b427ae 100644
--- a/pkgs/development/python-modules/whodap/default.nix
+++ b/pkgs/development/python-modules/whodap/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "whodap";
-  version = "0.1.15";
+  version = "0.1.16";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pogzyb";
     repo = "whodap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PEKFO+mVGtagmH2rny8zorvi9/zadWh+fiJqBc/NA+E=";
+    hash = "sha256-ybJiAWrAcs/9/8WutqsHvwsiWxR+tJL9wcQRaOiUZNQ=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Python RDAP utility for querying and parsing information about domain names";
     homepage = "https://github.com/pogzyb/whodap";
-    changelog = "https://github.com/pogzyb/whodap/releases/tag/v${finalAttrs.src.tag}";
+    changelog = "https://github.com/pogzyb/whodap/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix
index eba545151ebe..fa438c2bc15a 100644
--- a/pkgs/development/python-modules/wled/default.nix
+++ b/pkgs/development/python-modules/wled/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   postPatch = ''
     # Upstream doesn't set a version for the pyproject.toml
     substituteInPlace pyproject.toml \
-      --replace-fail "0.0.0" "${version}" \
+      --replace-fail "0.0.0" "${version}"
   '';
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix
index 94934ea0041d..14a07d65ae83 100644
--- a/pkgs/development/python-modules/xapian/default.nix
+++ b/pkgs/development/python-modules/xapian/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz";
-    hash = "sha256-ujteEICeV5rNEb0WV3nOP9KaiQTqN5aO9bV62Xw2GLo=";
+    hash = "sha256-o4zHukGIzAvSfcc2nwOQZ3IEcIehxU8bkzVdXpEDwwQ=";
   };
 
   configureFlags = [
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 823d1bcada2e..6bc6e731ce2b 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -33,18 +33,21 @@
   # tests
   pytest-asyncio,
   pytestCheckHook,
+  h5py,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "xarray";
-  version = "2026.02.0";
+  version = "2026.04.0";
   pyproject = true;
+  # Needed mainly for pytestFlags with spaces
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "pydata";
     repo = "xarray";
-    tag = "v${version}";
-    hash = "sha256-g1cKI0Et3RToWOxn+bELtT5jAaB8e1N+k9doCU+OgfY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BsgL+Xo9fTMLLdz5AfScnKGuBa76cE85LuUzB4ZNLiY=";
   };
 
   postPatch = ''
@@ -63,7 +66,7 @@ buildPythonPackage rec {
     pandas
   ];
 
-  optional-dependencies = lib.fix (self: {
+  optional-dependencies = {
     accel = [
       bottleneck
       # flox
@@ -90,25 +93,36 @@ buildPythonPackage rec {
       # nc-time-axis
       seaborn
     ];
-    complete = with self; accel ++ io ++ etc ++ parallel ++ viz;
-  });
+    complete =
+      with finalAttrs.finalPackage.passthru.optional-dependencies;
+      accel ++ io ++ etc ++ parallel ++ viz;
+  };
 
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
-    scipy
-  ];
-
-  disabledTestPaths = [
-    # https://github.com/pydata/xarray/issues/11183
-    "xarray/tests/test_dataarray.py::TestDataArray::test_curvefit_helpers" # Failed: DID NOT RAISE <class 'ValueError'>
-    "xarray/tests/test_variable.py::TestIndexVariable::test_concat_periods" # ValueError: Could not convert <xarray.IndexVariable 't' (t: 5)> Size: 40B
+  ]
+  # Besides scipy, these are not strictly needed for the tests, but adding all
+  # of these optional-dependencies extends the amount of tests from ~17k to
+  # ~21k.
+  ++ finalAttrs.finalPackage.optional-dependencies.io
+  ++ finalAttrs.finalPackage.optional-dependencies.accel
+  ++ finalAttrs.finalPackage.optional-dependencies.etc
+  ++ finalAttrs.finalPackage.optional-dependencies.parallel
+  # Not adding optional-dependencies.viz because adding cartopy causes infinite
+  # recursion, and doesn't cause more tests to be collected.
+  ;
+  pytestFlags = lib.optionals (!h5py.hdf5.szipSupport) [
+    "-k"
+    # Our h5py is built with hdf5 that is built without szip support, so we
+    # skip these tests
+    "not szip"
   ];
 
   pythonImportsCheck = [ "xarray" ];
 
   meta = {
-    changelog = "https://github.com/pydata/xarray/blob/${src.tag}/doc/whats-new.rst";
+    changelog = "https://github.com/pydata/xarray/blob/${finalAttrs.src.tag}/doc/whats-new.rst";
     description = "N-D labeled arrays and datasets in Python";
     homepage = "https://github.com/pydata/xarray";
     license = lib.licenses.asl20;
@@ -116,4 +130,4 @@ buildPythonPackage rec {
       doronbehar
     ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix
index b837fbb7af44..75e3538a8ad5 100644
--- a/pkgs/development/python-modules/xdoctest/default.nix
+++ b/pkgs/development/python-modules/xdoctest/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "xdoctest";
-  version = "1.3.0";
+  version = "1.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Erotemic";
     repo = "xdoctest";
     tag = "v${version}";
-    hash = "sha256-kxisUcpfAxhB7wd2QLY5jkoUXXDYrkJx7bNB1wMVB30=";
+    hash = "sha256-cwRelkADUrSbrzJ8JjgLCiPil2ynwFmaLLWByJWkXwA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix
index 1ad3c89c05c3..323159a80690 100644
--- a/pkgs/development/python-modules/xformers/default.nix
+++ b/pkgs/development/python-modules/xformers/default.nix
@@ -13,7 +13,7 @@
 
   # dependencies
   numpy,
-  pynvml,
+  nvidia-ml-py,
 
   # tests
   einops,
@@ -102,7 +102,7 @@ buildPythonPackage.override { stdenv = effectiveStdenv; } (finalAttrs: {
     torch
   ]
   ++ lib.optionals cudaSupport [
-    pynvml
+    nvidia-ml-py
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix
index deaa4bac689e..d019fd254b68 100644
--- a/pkgs/development/python-modules/yangson/default.nix
+++ b/pkgs/development/python-modules/yangson/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "yangson";
-  version = "1.6.6";
+  version = "1.7.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CZ-NIC";
     repo = "yangson";
     tag = version;
-    hash = "sha256-vpQCbHyQslPhY2tz5+6aLGeyI2+6tt43Zr04EABDuPM=";
+    hash = "sha256-hod18DLfITuPB1n/FkxvQozguP9tCIDNLlV2V5MtmBU=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/yardstick/default.nix b/pkgs/development/python-modules/yardstick/default.nix
index 315df02cd4e4..197cb394b6a1 100644
--- a/pkgs/development/python-modules/yardstick/default.nix
+++ b/pkgs/development/python-modules/yardstick/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "yardstick";
-  version = "0.16.1";
+  version = "0.16.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "yardstick";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4Kwgm2gmgOam7AVzlGYT3QhAyJf14h3pZohrhbzprpg=";
+    hash = "sha256-jKf1LH+YLRuds/5SKSgKm8PbI9OvkxgBhm5vOmg5EU0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/yaxmldiff/default.nix b/pkgs/development/python-modules/yaxmldiff/default.nix
index 5ffae301df62..a321c78e15d6 100644
--- a/pkgs/development/python-modules/yaxmldiff/default.nix
+++ b/pkgs/development/python-modules/yaxmldiff/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: {
   meta = {
     description = "Yet Another XML Differ";
     homepage = "https://github.com/latk/yaxmldiff.py";
-    changelog = "https://https://github.com/latk/yaxmldiff.py/blob/v${finalAttrs.src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/latk/yaxmldiff.py/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };
diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix
index db46867c0dfb..8c68171be3ae 100644
--- a/pkgs/development/python-modules/yolink-api/default.nix
+++ b/pkgs/development/python-modules/yolink-api/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "yolink-api";
-  version = "0.6.4";
+  version = "0.6.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "YoSmart-Inc";
     repo = "yolink-api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8gzVaBne79t2Muen9QuYg8/tKwxWwDWBS98IopxiWn0=";
+    hash = "sha256-2nZNrCLxgO/pwjZZQYb3C4ImVn70WRa+THbi4iRDgJw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix
index ce134cda79c5..5a39ed30ba26 100644
--- a/pkgs/development/python-modules/zarr/default.nix
+++ b/pkgs/development/python-modules/zarr/default.nix
@@ -33,7 +33,6 @@
   pytest-asyncio,
   pytestCheckHook,
   tomlkit,
-  uv,
 }:
 
 buildPythonPackage (finalAttrs: {
@@ -87,7 +86,6 @@ buildPythonPackage (finalAttrs: {
     pytest-asyncio
     pytestCheckHook
     tomlkit
-    uv
   ]
   ++ finalAttrs.finalPackage.passthru.optional-dependencies.cli;
 
diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index a5ca2aba1590..918408066c91 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -48,6 +48,9 @@ buildPythonPackage rec {
     "test_launch_and_close"
     "test_launch_and_close_context_manager"
     "test_launch_and_close_v4_v6"
+
+    # Flaky (see e.g. https://hydra.nixos.org/build/326378736); https://github.com/python-zeroconf/python-zeroconf/issues/1663
+    "test_run_coro_with_timeout"
   ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix
index c3053e6c0117..52103894859c 100644
--- a/pkgs/development/python-modules/zstandard/default.nix
+++ b/pkgs/development/python-modules/zstandard/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "cffi~=" "cffi>=" \
+      --replace-fail "cffi~=" "cffi>="
   '';
 
   build-system = [
@@ -49,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "Zstandard bindings for Python";
     homepage = "https://github.com/indygreg/python-zstandard";
-    license = lib.licenses.bsdOriginal;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 41372a40fdb1..0eb36b2bf7a4 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -3000,7 +3000,7 @@ let
       postPatch = ''
         substituteInPlace src/Makefile --replace-fail \
           "all:\$(PROG) ../inst/bwa clean" \
-          "all:\$(PROG) ../inst/bwa" \
+          "all:\$(PROG) ../inst/bwa"
       '';
     });
 
diff --git a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix
index a30305b890b7..8e4b2b0caa54 100644
--- a/pkgs/development/tcl-modules/by-name/ex/expect/package.nix
+++ b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix
@@ -51,8 +51,13 @@ tcl.mkTclDerivation rec {
 
   strictDeps = true;
 
-  env = lib.optionalAttrs stdenv.cc.isGNU {
-    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -std=gnu17";
+  env = {
+    NIX_CFLAGS_COMPILE = toString (
+      # Needed to avoid errors when building with GCC 15.
+      lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ]
+      # Autoconf 2.73 defaults to C23, but Expect uses K&R style function declarations.
+      ++ [ "-std=gnu17" ]
+    );
   };
 
   hardeningDisable = [ "format" ];
@@ -62,6 +67,8 @@ tcl.mkTclDerivation rec {
     ${lib.optionalString stdenv.hostPlatform.isDarwin "tclWrapperArgs+=(--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version})"}
   '';
 
+  tclRequiresCheck = [ "Expect" ];
+
   outputs = [
     "out"
     "dev"
@@ -74,5 +81,6 @@ tcl.mkTclDerivation rec {
     platforms = lib.platforms.unix;
     mainProgram = "expect";
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
+    broken = tcl.isTcl9;
   };
 }
diff --git a/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix b/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix
index 2aa3248f531d..9ea98c23381f 100644
--- a/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix
+++ b/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix
@@ -46,5 +46,6 @@ mkTclDerivation rec {
     license = lib.licenses.tcltk;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ thoughtpolice ];
+    broken = tcl.isTcl9;
   };
 }
diff --git a/pkgs/development/tcl-modules/by-name/le/lexec/package.nix b/pkgs/development/tcl-modules/by-name/le/lexec/package.nix
index 047676ba4cde..753ef8de6829 100644
--- a/pkgs/development/tcl-modules/by-name/le/lexec/package.nix
+++ b/pkgs/development/tcl-modules/by-name/le/lexec/package.nix
@@ -3,6 +3,7 @@
   mkTclDerivation,
   fetchzip,
   autoreconfHook,
+  tcl,
 }:
 
 mkTclDerivation {
@@ -24,5 +25,6 @@ mkTclDerivation {
     license = lib.licenses.tcltk;
     maintainers = with lib.maintainers; [ fgaz ];
     platforms = lib.platforms.all;
+    broken = tcl.isTcl9;
   };
 }
diff --git a/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix b/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
index aefab7d88c6f..dfc56bc68fd1 100644
--- a/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
+++ b/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
@@ -4,40 +4,30 @@
   fetchFromGitHub,
   autoreconfHook,
   tcl,
+  pandoc,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rl_json";
-  version = "0.15.7";
+  version = "0.16";
 
   src = fetchFromGitHub {
     owner = "RubyLane";
     repo = "rl_json";
     tag = finalAttrs.version;
-    hash = "sha256-6Y6bq/Lm6KCFFV3RF6v4fVPEN1LO+jE2xZV50a8zyng=";
+    hash = "sha256-rXr7x9Cr+gD938+NEPguvYVWH5s9bKccMobuZsb0IQY=";
     fetchSubmodules = true;
   };
 
-  # The vendored libtommath conflicts with tclTomMath.
-  # Replacing it with tclTomMath fixes the issue.
-  # https://github.com/RubyLane/rl_json/issues/57
-  # The switch to a vendored libtommath was done in 0.15.4 in commit
-  # https://github.com/RubyLane/rl_json/commit/9294d533f4d81288acf53045666b1587cf7fbf92
-  # "for proper bignum handling", but the commit message doesn't explain what's wrong
-  # with tclTomMath's bignum handling and all tests pass anyway.
   postPatch = ''
-    rm -r deps/libtommath
-    substituteInPlace Makefile.in \
-      --replace-fail 'deps: local/lib/libtommath.a' 'deps:'
-    substituteInPlace configure.ac \
-      --replace-fail -ltommath ""
-    substituteInPlace generic/rl_jsonInt.h \
-      --replace-fail '#include <tommath.h>' '#include <tclTomMath.h>'
+    mkdir doc/.build
+    cp doc/json.md.in doc/.build/json.md.in
   '';
 
   nativeBuildInputs = [
     autoreconfHook
     tcl.tclPackageHook
+    pandoc
   ];
 
   configureFlags = [
@@ -47,8 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
     "--datarootdir=${placeholder "out"}/share"
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix
index b53b6d1281f0..f3e7fd0a7157 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   mkTclDerivation,
   tclx,
+  tcl,
 }:
 
 mkTclDerivation {
@@ -31,5 +32,6 @@ mkTclDerivation {
     license = lib.licenses.bsd2;
     platforms = tclx.meta.platforms;
     maintainers = with lib.maintainers; [ nat-418 ];
+    broken = tcl.isTcl9;
   };
 }
diff --git a/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix
index a843734b69b6..952c0201bb32 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix
@@ -3,6 +3,7 @@
   mkTclDerivation,
   fetchFromGitHub,
   curl,
+  tcl,
 }:
 
 mkTclDerivation rec {
@@ -29,5 +30,6 @@ mkTclDerivation rec {
     changelog = "https://github.com/flightaware/tclcurl-fa/blob/master/ChangeLog.txt";
     license = lib.licenses.tcltk;
     maintainers = with lib.maintainers; [ fgaz ];
+    broken = tcl.isTcl9;
   };
 }
diff --git a/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix
index 33ca7b53001b..1d57dc6ec0c2 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix
@@ -19,6 +19,15 @@ mkTclDerivation rec {
 
   buildFlags = [ "all" ] ++ lib.optional withCritcl "critcl";
 
+  # Tcllib contains a huge amount of Tcl packages:
+  # https://core.tcl-lang.org/tcllib/doc/trunk/embedded/md/toc.md
+  # We sample a small amount of popular ones.
+  tclRequiresCheck = [
+    "struct::graph"
+    "doctools"
+    "json"
+  ];
+
   meta = {
     homepage = "https://core.tcl-lang.org/tcllib/";
     description = "Tcl-only library of standard routines for Tcl";
diff --git a/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix
index ad688ec56de4..cbfe979ac79a 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix
@@ -3,6 +3,7 @@
   mkTclDerivation,
   fetchzip,
   graphicsmagick,
+  tcl,
   tk,
 }:
 
@@ -34,5 +35,6 @@ mkTclDerivation rec {
     homepage = "http://www.graphicsmagick.org/TclMagick/doc/";
     license = lib.licenses.tcltk;
     maintainers = with lib.maintainers; [ fgaz ];
+    broken = tcl.isTcl9;
   };
 }
diff --git a/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
index 6ba554caacf8..56e061838e97 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
@@ -58,6 +58,8 @@ mkTclDerivation rec {
     done
   '';
 
+  tclRequiresCheck = [ "tclreadline" ];
+
   meta = {
     description = "GNU readline for interactive tcl shells";
     homepage = "https://github.com/flightaware/tclreadline";
diff --git a/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix
index f5f2d99b284d..d927b037f0c4 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix
@@ -3,6 +3,7 @@
   fetchurl,
   mkTclDerivation,
   openssl,
+  tcl,
 }:
 
 mkTclDerivation rec {
@@ -20,11 +21,14 @@ mkTclDerivation rec {
     "--with-ssl-dir=${openssl.dev}"
   ];
 
+  tclRequiresCheck = [ "tls" ];
+
   meta = {
     homepage = "https://core.tcl-lang.org/tcltls/index";
     description = "OpenSSL / RSA-bsafe Tcl extension";
     maintainers = [ lib.maintainers.agbrooks ];
     license = lib.licenses.tcltk;
     platforms = lib.platforms.unix;
+    broken = tcl.isTcl9;
   };
 }
diff --git a/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix
index 073a93432fda..58052bf4079f 100644
--- a/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix
@@ -2,6 +2,7 @@
   lib,
   mkTclDerivation,
   fetchfossil,
+  tcl,
 }:
 
 mkTclDerivation rec {
@@ -35,5 +36,6 @@ mkTclDerivation rec {
     homepage = "https://core.tcl-lang.org/tcludp";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fgaz ];
+    broken = tcl.isTcl9;
   };
 }
diff --git a/pkgs/development/tcl-modules/by-name/ti/tix/package.nix b/pkgs/development/tcl-modules/by-name/ti/tix/package.nix
index a27e45a711aa..b972d2dbf594 100644
--- a/pkgs/development/tcl-modules/by-name/ti/tix/package.nix
+++ b/pkgs/development/tcl-modules/by-name/ti/tix/package.nix
@@ -60,5 +60,6 @@ tcl.mkTclDerivation {
       bsd2 # tix
       gpl2 # patches from portage
     ];
+    broken = tcl.isTcl9;
   };
 }
diff --git a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix
index 9eca47fedb46..1844af448d08 100644
--- a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix
@@ -1,20 +1,20 @@
 {
   lib,
-  fetchsvn,
+  fetchzip,
   tcl,
   tcllib,
   tk,
   libx11,
+  zlib,
 }:
 
 tcl.mkTclDerivation rec {
   pname = "tkimg";
-  version = "623";
+  version = "2.1.1";
 
-  src = fetchsvn {
-    url = "svn://svn.code.sf.net/p/tkimg/code/trunk";
-    rev = version;
-    sha256 = "sha256-6GlkqYxXmMGjiJTZS2fQNVSimcKc1BZ/lvzvtkhty+o=";
+  src = fetchzip {
+    url = "mirror://sourceforge/tkimg/tkimg/Img-${version}.tar.gz";
+    hash = "sha256-TRtE2/BVrYgkdKtbF06UjLvokokgLGQ/EKDLxhz2Ckw=";
   };
 
   configureFlags = [
@@ -26,6 +26,7 @@ tcl.mkTclDerivation rec {
   buildInputs = [
     libx11
     tcllib
+    zlib
   ];
 
   meta = {
diff --git a/pkgs/development/tcl-modules/by-name/ve/vectcl/package.nix b/pkgs/development/tcl-modules/by-name/ve/vectcl/package.nix
index 9c4bdf2143d6..fbfde044f789 100644
--- a/pkgs/development/tcl-modules/by-name/ve/vectcl/package.nix
+++ b/pkgs/development/tcl-modules/by-name/ve/vectcl/package.nix
@@ -2,6 +2,7 @@
   lib,
   mkTclDerivation,
   fetchFromGitHub,
+  tcl,
 }:
 
 mkTclDerivation rec {
@@ -22,5 +23,6 @@ mkTclDerivation rec {
     description = "Numeric array and linear algebra extension for Tcl";
     maintainers = with lib.maintainers; [ fgaz ];
     license = lib.licenses.tcltk;
+    broken = tcl.isTcl9;
   };
 }
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 0304558173e0..6408a5f7a626 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -19,7 +19,7 @@ let
     { scalaVersion, sha256 }:
     stdenv.mkDerivation rec {
       pname = "ammonite";
-      version = "3.0.6";
+      version = "3.0.9";
 
       src = fetchurl {
         url = "https://github.com/com-lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
@@ -83,6 +83,7 @@ let
         homepage = "https://github.com/com-lihaoyi/Ammonite";
         license = lib.licenses.mit;
         mainProgram = "amm";
+        maintainers = with lib.maintainers; [ tbutter ];
         platforms = lib.platforms.all;
       };
     };
@@ -90,14 +91,14 @@ in
 {
   ammonite_2_12 = common {
     scalaVersion = "2.12";
-    sha256 = "sha256-EH6zBKSVy6uiCGYd+nTS5U2HTOdkOokYVxAiA98JLfE=";
+    sha256 = "sha256-gMyTQDPmHsl6b3CBCsIHb/8z2FwL3+Txuz0siFgvSws=";
   };
   ammonite_2_13 = common {
     scalaVersion = "2.13";
-    sha256 = "sha256-IpPySm8YJBqu1kbCp/oElMmiM25+vKlyMdDHMkYWrhM=";
+    sha256 = "sha256-NCB5ZuW+CqxFlYY10mF6TUHdZl1E8QFygPdyW2FtCe4=";
   };
   ammonite_3_3 = common {
     scalaVersion = "3.3";
-    sha256 = "sha256-C+ShjuF1EnF75cDN0o28q8Afw7wwod4EUsLkdTb54wo=";
+    sha256 = "sha256-H3/wjBDA8b+a+4FISohLQ10eB7VOMUqj+M39bZOefbw=";
   };
 }
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index dfea6d9c508c..0819a899a1dd 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -21,8 +21,9 @@
   python3,
   readline,
   ruby,
+  versionCheckHook,
   vte,
-  xxHash,
+  xxhash,
   zlib,
   useX11 ? false,
   rubyBindings ? false,
@@ -46,19 +47,19 @@ let
   qjs = fetchFromGitHub {
     owner = "quickjs-ng";
     repo = "quickjs";
-    rev = "e2b100e8c5fa7131e9fb22b8a0e9ca0f16eb9892"; # https://github.com/radareorg/radare2/blob/master/subprojects/qjs.wrap
-    hash = "sha256-vq+K93MuvFC+JKw4623gKs53ngw1097l5Kf/RBGU+mA=";
+    rev = "3087a2ce5bcb66cc1fcd9f34d3e5ce3bd43a67d9"; # https://github.com/radareorg/radare2/blob/master/subprojects/qjs.wrap
+    hash = "sha256-Z6DUe/W1+3SYPRPCiL3oNL5ovXCsW3dsFuGkA9WF3W4=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "radare2";
-  version = "6.1.2";
+  version = "6.1.4";
 
   src = fetchFromGitHub {
     owner = "radare";
     repo = "radare2";
     tag = finalAttrs.version;
-    hash = "sha256-YiKbXKKwbeAUkeq4LcUwOxTHU1Hua4YhcwDULiHVmrQ=";
+    hash = "sha256-3MwBtjR3XQMhbJHnD30OVedUEKcje5jDPszNynkGCT8=";
   };
 
   mesonFlags = [
@@ -109,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     # radare2 exposes r_lib which depends on these libraries
     file # for its list of magic numbers (`libmagic`)
     libzip
-    xxHash
+    xxhash
   ];
 
   postUnpack = ''
@@ -133,6 +134,12 @@ stdenv.mkDerivation (finalAttrs: {
     install_name_tool -add_rpath $out/lib $out/lib/libr_io.${finalAttrs.version}.dylib
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-v";
+  doInstallCheck = true;
+
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "UNIX-like reverse engineering framework and command-line toolset";
     longDescription = ''
@@ -163,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
       mic92
       raskin
     ];
-    mainProgram = "radare2";
+    mainProgram = "r2";
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/development/tools/analysis/radare2/update.sh b/pkgs/development/tools/analysis/radare2/update.sh
new file mode 100755
index 000000000000..bb9706815776
--- /dev/null
+++ b/pkgs/development/tools/analysis/radare2/update.sh
@@ -0,0 +1,78 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i sh -p curl jq nix-prefetch-github nix coreutils gnused gnugrep
+# shellcheck shell=sh
+set -eu
+
+# Directory of this script / the radare2 package
+SCRIPT_DIR="$(readlink -f "$(dirname "$0")")"
+NIXFILE="$SCRIPT_DIR/default.nix"
+
+# Determine latest release version
+LATEST_VERSION=$(curl -s https://api.github.com/repos/radareorg/radare2/releases/latest | jq -r '.tag_name')
+echo "Latest radare2 version: $LATEST_VERSION"
+
+CURRENT_VERSION=$(grep 'version = ' "$NIXFILE" | head -1 | sed 's/.*"\(.*\)".*/\1/')
+echo "Current radare2 version: $CURRENT_VERSION"
+
+if [ "$LATEST_VERSION" = "$CURRENT_VERSION" ]; then
+    echo "radare2 is already up to date"
+    exit 0
+fi
+
+# Update main package version and hash
+echo "Updating main source to $LATEST_VERSION..."
+MAIN_HASH=$(nix-prefetch-github radare radare2 --rev "$LATEST_VERSION" --json | jq -r '.hash')
+echo "  New main hash: $MAIN_HASH"
+
+sed -i "s|version = \"$CURRENT_VERSION\"|version = \"$LATEST_VERSION\"|" "$NIXFILE"
+sed -i "/src = fetchFromGitHub/,/};/{s|hash = \".*\"|hash = \"$MAIN_HASH\"|}" "$NIXFILE"
+
+# Update a single subproject
+# Arguments: name owner repo wrap_file ref_type
+update_subproject() {
+    name=$1
+    owner=$2
+    repo=$3
+    wrap_file=$4
+    ref_type=$5
+
+    echo "Checking subproject $name..."
+
+    # Fetch the wrap file from the new version
+    wrap_content=$(curl -sL "https://raw.githubusercontent.com/radareorg/radare2/$LATEST_VERSION/subprojects/$wrap_file")
+    new_rev=$(echo "$wrap_content" | grep '^revision' | sed 's/revision = //')
+
+    # Get the current revision from the nix file
+    current_rev=$(grep -A3 "repo = \"$repo\"" "$NIXFILE" | grep "$ref_type = " | sed 's/.*"\(.*\)".*/\1/')
+
+    if [ "$new_rev" = "$current_rev" ]; then
+        echo "  $name is unchanged at $current_rev"
+        return
+    fi
+
+    echo "  Updating $name: $current_rev -> $new_rev"
+
+    # Prefetch new hash
+    new_hash=$(nix-prefetch-github "$owner" "$repo" --rev "$new_rev" --json | jq -r '.hash')
+    echo "  New hash: $new_hash"
+
+    # Update revision and hash in the nix file
+    sed -i "/repo = \"$repo\"/,/};/{s|$ref_type = \"$current_rev\"|$ref_type = \"$new_rev\"|}" "$NIXFILE"
+    sed -i "/repo = \"$repo\"/,/};/{s|hash = \".*\"|hash = \"$new_hash\"|}" "$NIXFILE"
+}
+
+update_subproject binaryninja Vector35 binaryninja-api binaryninja.wrap rev
+update_subproject sdb radareorg sdb sdb.wrap tag
+update_subproject qjs quickjs-ng quickjs qjs.wrap rev
+
+echo "Update iaito to follow new radare2 version '$LATEST_VERSION'"
+IAITO_UPDATE_SCRIPT="$(readlink -f "$(dirname "$SCRIPT_DIR")/../../../by-name/ia/iaito/update.sh")"
+if "$IAITO_UPDATE_SCRIPT" "$LATEST_VERSION";then
+    echo "iaito updated to $LATEST_VERSION"
+else
+    # iaito release may not have been published yet, release dates are not in sync
+    # sometimes, iaito is released earlier than radare2
+    echo "failed to update iaito to $LATEST_VERSION, continuing"
+fi
+
+echo "Update complete. Please verify with: nix build .#radare2 .#iaito"
diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix
index fa20ebdc8961..40b564e4dd68 100644
--- a/pkgs/development/tools/analysis/rizin/default.nix
+++ b/pkgs/development/tools/analysis/rizin/default.nix
@@ -15,7 +15,7 @@
   libmspack,
   libzip,
   lz4,
-  xxHash,
+  xxhash,
   xz,
   meson,
   python3,
@@ -105,7 +105,7 @@ let
       openssl
       libmspack
       tree-sitter
-      xxHash
+      xxhash
       xz
       zstd
       binutils
diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix
index fa35bf32b445..fe528974e664 100644
--- a/pkgs/development/tools/analysis/splint/default.nix
+++ b/pkgs/development/tools/analysis/splint/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ flex ];
 
+  buildFlags = [
+    "CFLAGS=-std=gnu99"
+  ];
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index 254ca4f61924..a62f97f5dffc 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,8 +1,8 @@
 { lib, fetchFromGitHub }:
 let
-  version = "3.13.0";
-  vendorHash = "sha256-EkOg1D+zeEbVBPr4fpCPI31CvMnTD7FZ2hhQW7UzN8A=";
-  nodeModulesHash = "sha256-wORM+24nE771llb1Q7bn6iDtlJpm3kOqO3wTLUQmjyQ=";
+  version = "3.14.0";
+  vendorHash = "sha256-fibx+Ky2cfP71tPzeiDybx+0f/+XvZbDXC7PAWQMRIY=";
+  nodeModulesHash = "sha256-8QhWOlEWkRPZA3uktm2hDSon+UCPPGznvn/4cXqyvTY=";
 in
 {
   inherit version vendorHash nodeModulesHash;
@@ -11,7 +11,7 @@ in
     owner = "woodpecker-ci";
     repo = "woodpecker";
     tag = "v${version}";
-    hash = "sha256-EeND2L5l37fo3JBlFORR4m0tXQWlJ2qqIXIdQ1vJdgM=";
+    hash = "sha256-FFGNjQa4W6T1BmbNh3rD1m7vtJFBWmgxocRV+OO5ZfA=";
   };
 
   postInstall = ''
diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix
index 502672fdb26e..726e64994d01 100644
--- a/pkgs/development/tools/database/squirrel-sql/default.nix
+++ b/pkgs/development/tools/database/squirrel-sql/default.nix
@@ -12,11 +12,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "squirrel-sql";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";
-    sha256 = "sha256-HZYlW+HthutFP3xNUU2Wrd/Yet8oBF190gg52Wauqng=";
+    sha256 = "sha256-aYwA2TRXI74s1BXfhlatBqPzC1xCfEqTe/yK8DCMo4E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/electron/39-angle-patchdir.patch b/pkgs/development/tools/electron/39-angle-patchdir.patch
index 1b53bfb2aa85..3e7d49e922dc 100644
--- a/pkgs/development/tools/electron/39-angle-patchdir.patch
+++ b/pkgs/development/tools/electron/39-angle-patchdir.patch
@@ -6,6 +6,8 @@ index f5dbe8600f..9e1e5e0704 100644
    { "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
    { "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
    { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
--  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" }
-+  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" }
+-  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" },
++  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" },
+   { "patch_dir": "src/electron/patches/pdfium", "repo": "src/third_party/pdfium" },
+   { "patch_dir": "src/electron/patches/libaom", "repo": "src/third_party/libaom/source/libaom" }
  ]
diff --git a/pkgs/development/tools/electron/40-angle-patchdir.patch b/pkgs/development/tools/electron/40-angle-patchdir.patch
index 595d93b35891..82a3b7f40eca 100644
--- a/pkgs/development/tools/electron/40-angle-patchdir.patch
+++ b/pkgs/development/tools/electron/40-angle-patchdir.patch
@@ -6,6 +6,8 @@ index f5dbe8600f..9e1e5e0704 100644
    { "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
    { "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
    { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
--  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" }
-+  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" }
+-  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" },
++  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" },
+   { "patch_dir": "src/electron/patches/pdfium", "repo": "src/third_party/pdfium" },
+   { "patch_dir": "src/electron/patches/libaom", "repo": "src/third_party/libaom/source/libaom" }
  ]
diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 4c4791aeba72..315ec0c2a500 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,35 +12,35 @@
     },
     "39": {
         "hashes": {
-            "aarch64-darwin": "86fa117ba10e36149ca33d7c22de2cfc3fb7490ca88b07ce953d2efe1f2a41cd",
-            "aarch64-linux": "fd721650a0e25829b76d307e944383be828533cdddd53e44a0b772e96e3e019b",
-            "armv7l-linux": "5d0a75a53cdba1ecfc678910084802fe500f13f470310ae1d2c66840d3c7390b",
-            "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
-            "x86_64-darwin": "5dfe5559fd283c3962221c674b30a5b986895b644b1b4bc179e0c7673a14f1cf",
-            "x86_64-linux": "233b2775f1c46e5ebd5afeb4fb95ce9fda61229bad20aef1031468eb54b3656e"
+            "aarch64-darwin": "2c921ce845b4f5fa0abeb160f38f472ed486f7b1c8fb8a19f549a48f388bdbfa",
+            "aarch64-linux": "c0cb946a480b0f4a6dfdbed3287fd38b099b749696d7b9107e24287aa9eded97",
+            "armv7l-linux": "e16173659ba8d982ad5718309d0eb22f793c6a58e9c0fd2e518ef5f045d96b40",
+            "headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0",
+            "x86_64-darwin": "5a42fa7665fa67570990b5b2608d2414692a8176033401ffc07b3f26fca3901d",
+            "x86_64-linux": "9473c2773377344fd8822fe0255a1d2bff00b4f4b3e1fe8acadea00164e56c33"
         },
-        "version": "39.8.7"
+        "version": "39.8.9"
     },
     "40": {
         "hashes": {
-            "aarch64-darwin": "7a400c28aeba7bdf691ff03d2a620b76c7f8c75fdfac1f4543a8dc13b039fa24",
-            "aarch64-linux": "5af0073c52a8dc729e118340b5f50c4b2932bd94ba992e1c5380fe1545330373",
-            "armv7l-linux": "8f65d16758cdec2d4474732fb60e1f28e1829b4ee7ba67fcb9b5b6510652e667",
-            "headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",
-            "x86_64-darwin": "2600d89b2ffa452bb5dc2fe11f0f7719ae001273f6f6c68988140986e5f95508",
-            "x86_64-linux": "3bce6ee4e4e481f7ce6d0be384f6c539ce16e0b9b7f46115aec6516770f6c26d"
+            "aarch64-darwin": "70cc74c3c16f1d8536ed7095bac4eefadfa0ef27d2632507c0f7e3c137ed9ed7",
+            "aarch64-linux": "b732c89edcc45bd5d32135e0309f42dc76c0753501e002550e9459323f473634",
+            "armv7l-linux": "fc1f7800d1318578a0dabaa14485e8af915c34d94144c248f9d91e0f5b76dca5",
+            "headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p",
+            "x86_64-darwin": "e5fcf17b02e1ce362ef60984ecc65f029766322d4adff6ee8c51d7331b6eedf0",
+            "x86_64-linux": "cfe272fedfd4f164be45f7c8c12736220a98b60bb888fa51fb830031118ee6e8"
         },
-        "version": "40.8.5"
+        "version": "40.9.2"
     },
     "41": {
         "hashes": {
-            "aarch64-darwin": "e018684f96c873415fbea4713fc7db96b6d1e2bd3db4513e2b8c1887ec83a719",
-            "aarch64-linux": "f8983c877df8f2b93c76d35e45af9df82c9eb5f294b183f8fe5930e5155fdc4e",
-            "armv7l-linux": "71e8db75ab19d3c403c5476fdec120bbd19750b0c4cbe9086ff729e0e0c712c4",
-            "headers": "0620qjyndlq9kg9ypr9l7l97bd6z5fxx5sa2am0nh7z4cxvx5rz7",
-            "x86_64-darwin": "fb3750bcfccc0146065708bf065288252da02489d51414a6d5b77d04f94a3f2a",
-            "x86_64-linux": "fb0b31f5bb2b248d571c08ab57437c08a69b57f63ccdf9e55d6692b6132848d4"
+            "aarch64-darwin": "7a98f47f4c4f49399d3a838e9150b8828d2f5bf8aa7db769657ae82fab21f9d0",
+            "aarch64-linux": "c2bc73bf42630cf233fc9701d1cabb1edc0c367f47c8c967d9263cf90585e37a",
+            "armv7l-linux": "f116698dae5a68d9e9d650d97bcae6ef0ac6457d03e86b422f47ed4d79275d7c",
+            "headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7",
+            "x86_64-darwin": "9d0accc2157df3eb3a15c79f27a9dd763099d96aa286041cc1ba9a3ce6aed737",
+            "x86_64-linux": "b20e03cf174f8e56e235127d784dff8161ef4bb9c6bbc3d9383130225eb1e2a2"
         },
-        "version": "41.2.0"
+        "version": "41.3.0"
     }
 }
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index acbf58fdf2d5..6dd2fa8085d3 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,35 +12,35 @@
     },
     "39": {
         "hashes": {
-            "aarch64-darwin": "2e2a3533f9969ded3b11eb0baa5357abeb652975d9bcaea0b0725c9bd0866061",
-            "aarch64-linux": "a8caf72372eb47deb336dc440eb183c30d228b3fef5349dac7571d86103f117c",
-            "armv7l-linux": "5d5f02b2e28e8328435d2fd83207098e69dc3e5fecbbbdc2612792370ab2c4ec",
-            "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v",
-            "x86_64-darwin": "c74882bcbdd53f6e8cd65906809ac446bb032dce3ce8f109e2376d49b9b394ee",
-            "x86_64-linux": "e336dc2dce9d11d44f6eb5b5cc655d3311a9a109ea184625da3ac51181c3ad27"
+            "aarch64-darwin": "3d42fdf5593888c429b00ec93f6a82419a9d5c61a5d61570e579383f4c08f8cf",
+            "aarch64-linux": "276aedebc81eb62b7ae8f84066c8973fb7e9b273dbbea8362960d68ca87440d3",
+            "armv7l-linux": "fcc4530933f100a2aef219478bb15ead89da64da1b80e393152195b34468cec6",
+            "headers": "15alm4mx7ad4czrysnk7wds625y7rsz7ncr1djq8an8fdar3fnw0",
+            "x86_64-darwin": "f6a4774573be8922cd6b993e0d65af9d660b2648656ec26703ba8ee9b49f5b69",
+            "x86_64-linux": "dbff1ba3f73432215eb2968a00374a6f8e1028eae155c228fec034037e2deb14"
         },
-        "version": "39.8.7"
+        "version": "39.8.9"
     },
     "40": {
         "hashes": {
-            "aarch64-darwin": "60a199b111b7cb032f6400371064cfa75457c13fd1699aa25dae2ca780e10b63",
-            "aarch64-linux": "6dec383c6f0779daffdd7b8e106d7a4261bc798acf7c250195a98de79f0e92d5",
-            "armv7l-linux": "57304ae9d455ba9be1fc079138ccaa1c4f168dece10aec970477beea7b92270f",
-            "headers": "1jrcg0yqbi7xxlk7hanqbxvj2p4d7r2dqikbbawqvb7iakw4m5iv",
-            "x86_64-darwin": "6e774f3ae2d69accc3745e09f39fce6dc18d7cbe63e2698dfb7f36a2881b2f05",
-            "x86_64-linux": "804d1cd1c20c44691e071a2f9a25e42cfd28f4ccfd4368552072e37ad18ad807"
+            "aarch64-darwin": "ceb0feda64be263d6bfa0173c25959315e127d8f5bcd6d6189b1bcef5b356528",
+            "aarch64-linux": "8c488eb7691bbaa8c5c9868db92339f768a739ac2de127561df2f45bcdc09107",
+            "armv7l-linux": "a3115eb15d6bc34b9fca833b8e573ed967aa5fe11e2b37ceec6ba6a2d3eb28e4",
+            "headers": "0j9mqglwcp1rgcwm33qhlb4bydfjmy1si5f9z42kh7y6diz3361p",
+            "x86_64-darwin": "525a0bb96790542274f6cbd13d5fba81e4f5a6e7f6f488e351eb64ae7fcd391a",
+            "x86_64-linux": "3704387a4f3073d2dfa03c6cfce7dca6d78f3ee0b7f600f9eb3eeacf54c18432"
         },
-        "version": "40.8.5"
+        "version": "40.9.2"
     },
     "41": {
         "hashes": {
-            "aarch64-darwin": "9f8e18fec80a8a93d123549e379f1524c61bdd7c005d90a4df02a5aa5c9b779b",
-            "aarch64-linux": "83c9570411fb2ed83548b08b1a95928a3828ecb5f8a5f7c862f4188611420614",
-            "armv7l-linux": "217ffd04268cd8f459e1f6be0cd81431f45a04af3175073e0e56a4f15068e372",
-            "headers": "0620qjyndlq9kg9ypr9l7l97bd6z5fxx5sa2am0nh7z4cxvx5rz7",
-            "x86_64-darwin": "9e7fc8ded16d5f4c82373a4b048d48beec8529b6126bad188f08fc7923f8b40d",
-            "x86_64-linux": "84009c924c7e5feabee8066f7dbf54abf1997d033d9156a6a36e3b8cf9f0b148"
+            "aarch64-darwin": "f654e5cd471ff09f861fd7bc68a18866882881dab86b71e53aaac939ac286f16",
+            "aarch64-linux": "1781267ed7ecfe92457242edd5e8110470a24d3eff4d5fa6f4afc433f85292c5",
+            "armv7l-linux": "5e54790862956c39eae0ece135bd779d5c10a30b8749ff66e8896a58018af6ee",
+            "headers": "1w8rdbjanqkl1237ppcgrkwdng93gniv3mqfxqikv0rpsg2d7gi7",
+            "x86_64-darwin": "4b656ad287e5afe3efbcb371584fc8a602c8afa3322d4b19ba6550b42f15d3e9",
+            "x86_64-linux": "250c2f8382902f97754fa1ff4691f6608a2ac99489af58459017906aee66878f"
         },
-        "version": "41.2.0"
+        "version": "41.3.0"
     }
 }
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 141cd63c6139..9782b841607e 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -56,10 +56,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-RrqxAum+OEmuh/f2PfPFDulmU3LhTqUtwww8Nb+F7NI=",
+                    "hash": "sha256-y2aqNUsE8XmM+SoLThECL2J5b4NVydj0WAoy7t4AiJg=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v39.8.7"
+                    "tag": "v39.8.9"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1345,7 +1345,7 @@
         "electron_yarn_hash": "sha256-HCnJJqfgcilB+Cl2OaezL9Uu1xk0ZBdVEXg2VDR1dwU=",
         "modules": "140",
         "node": "22.22.1",
-        "version": "39.8.7"
+        "version": "39.8.9"
     },
     "40": {
         "chrome": "144.0.7559.236",
@@ -1404,10 +1404,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-Uvgjmq/xfD1IjYMC2CSmNHGWtsV9V2RJmtKhhRKITyM=",
+                    "hash": "sha256-wTKT4XA0ylL5uUZWfp9XhxiGUkfXrtEzw3Pw+nGwr4w=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v40.8.5"
+                    "tag": "v40.9.2"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1741,10 +1741,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-UvFXQgkp60pQ6K0/ifXq1BX1HzFHCXrseascaQ7rmW0=",
+                    "hash": "sha256-WJSNbXox5oT6WQXARbl9B+DcEaHrCpu96s5Pvq48bfE=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v24.14.0"
+                    "tag": "v24.14.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2690,13 +2690,13 @@
                 "fetcher": "fetchFromGitiles"
             }
         },
-        "electron_yarn_hash": "sha256-+7UFFBC4awv3Eg7aB5fKgIysAA2QIpds7s7xN2DuoP8=",
+        "electron_yarn_hash": "sha256-0P2Kt1uJA0lmZjIOr4Bpu6NDl4CwEKEgRz/B92oCs9M=",
         "modules": "143",
-        "node": "24.14.0",
-        "version": "40.8.5"
+        "node": "24.14.1",
+        "version": "40.9.2"
     },
     "41": {
-        "chrome": "146.0.7680.179",
+        "chrome": "146.0.7680.188",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2705,15 +2705,15 @@
                     "version": "0-unstable-2026-02-05"
                 }
             },
-            "version": "146.0.7680.179"
+            "version": "146.0.7680.188"
         },
         "chromium_npm_hash": "sha256-ByB1Ea5tduIJZXyydeBWsoS8OPABOgwHe+dNXRssdvc=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-HTeAvITnXbFdNiKmXWlOPfWFRjJ1ES2QkY5LjwX4OII=",
+                    "hash": "sha256-EKShXS1zF3TWCNLj8gCxjXlr80rA99QGM9ip28kgQH0=",
                     "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "tag": "146.0.7680.179",
+                    "tag": "146.0.7680.188",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2752,10 +2752,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-Pt/BZVy3kSREabV0LvLAQN5D2v2GHBvnRKUuZ9DIQ+Y=",
+                    "hash": "sha256-x3XSMSq1GuSTwQuOqbg9hCaMCoKx8UPGMDtJu5y1qfA=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v41.2.0"
+                    "tag": "v41.3.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2785,8 +2785,8 @@
             },
             "src/third_party/angle": {
                 "args": {
-                    "hash": "sha256-9Me/9kdDgcDLGP/0lLWpj294IoUp0hDD5hfFjSZbTOc=",
-                    "rev": "1c0f91aaa60a1f87725840495cbfd9717e7c77c8",
+                    "hash": "sha256-u/2B+93xg1sMlg+R9zjAFXpyjgLCyzB7JY4bjLafFFE=",
+                    "rev": "d1100603964278cd89c5eb94707fbca242c788bf",
                     "url": "https://chromium.googlesource.com/angle/angle.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3089,10 +3089,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-UvFXQgkp60pQ6K0/ifXq1BX1HzFHCXrseascaQ7rmW0=",
+                    "hash": "sha256-Y4FP+AstENp1uTYBo8HeTRDwvKClTdrZ4RztLeHNP3k=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v24.14.0"
+                    "tag": "v24.15.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3628,8 +3628,8 @@
             },
             "src/third_party/pdfium": {
                 "args": {
-                    "hash": "sha256-yfjXNWczeGwPlnAVB161OsFXiHms2IRstqKmoZ/AWFU=",
-                    "rev": "bccc616f83aaed08f65d4a707dfe00e24133772b",
+                    "hash": "sha256-/reVJqqKSGUX1INmwOPQabPodYwlbhlxTIO0pAlnJnY=",
+                    "rev": "9e6326d6112c90f525c5f85cd7e39318bc705317",
                     "url": "https://pdfium.googlesource.com/pdfium.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3999,8 +3999,8 @@
             },
             "src/third_party/webrtc": {
                 "args": {
-                    "hash": "sha256-g2GYFVTK8f296v7lUcYPqkI4qDoladsTpnKWb6SGRmw=",
-                    "rev": "6733aa5ba16e1e1087f339d1151c80c924a6fbf8",
+                    "hash": "sha256-2yynA/qNvjP6KN2jShDuwnaSMJ1xRduWP4xsbODPDOE=",
+                    "rev": "70d86bbfaeeadffb1193c2aad245edd23ef251ef",
                     "url": "https://webrtc.googlesource.com/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -4047,8 +4047,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-nG4goqqVAAWPMkq8296wCYhnwL93oAL+pF1oaMXyqZI=",
-                    "rev": "0ad812d268a7820dba9bf848b416aeda4dd1b2e5",
+                    "hash": "sha256-NFz9p4EWq46Tm+Y/hBXk4Vb0Ljy/s1BTbuiMH351IJs=",
+                    "rev": "f09a91282a26caa91d016c962d785d852cfdec36",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -4056,7 +4056,7 @@
         },
         "electron_yarn_hash": "sha256-tPI7O7xlvDjU5+krILVB6JhLpftMq4Bn8+KIKMjBVgA=",
         "modules": "145",
-        "node": "24.14.0",
-        "version": "41.2.0"
+        "node": "24.15.0",
+        "version": "41.3.0"
     }
 }
diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix
index c5da968ac230..32bfb6bcfdc8 100644
--- a/pkgs/development/tools/kustomize/kustomize-sops.nix
+++ b/pkgs/development/tools/kustomize/kustomize-sops.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kustomize-sops";
-  version = "4.4.0";
+  version = "4.5.1";
 
   src = fetchFromGitHub {
     owner = "viaduct-ai";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-a9SvkHt8ZQFobOjKAECSJcRZEeRE8pTKLnXN4DYNa7k=";
+    hash = "sha256-OYn31OBnpZF1jCO7OgGCZig/7G+V6PlljINsA67z2XM=";
   };
 
-  vendorHash = "sha256-ajXW6H1XBgVtMdK7/asfpy6e3rFAD2pz3Lg+QFnkVpo=";
+  vendorHash = "sha256-4NyrK3iaAqIaoikfProfsghYA5kX6dSGChnchhZZZ9A=";
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 6eac0fd18393..818117f1bb12 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "autoconf";
-  version = "2.72";
+  version = "2.73";
   outputs = [
     "out"
     "doc"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/autoconf/autoconf-${version}.tar.xz";
-    hash = "sha256-uohcExlXjWyU1G6bDc60AUyq/iSQ5Deg28o/JwoiP1o=";
+    hash = "sha256-n9ZyschCX6wvpn+gR3uZCYcmi5D/NtXwFtrle+DWtS4=";
   };
 
   strictDeps = true;
diff --git a/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff b/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff
deleted file mode 100644
index 947172f2866a..000000000000
--- a/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Backported patch originally targeted against 2.45.
---- a/bfd/elflink.c
-+++ b/bfd/elflink.c
-@@ -14356,5 +14356,6 @@ elf_gc_sweep (bfd *abfd, struct bfd_link_info *info)
-	  if (o->flags & SEC_GROUP)
-	    {
-	      asection *first = elf_next_in_group (o);
--	      o->gc_mark = first->gc_mark;
-+	      if (first != NULL)
-+	        o->gc_mark = first->gc_mark;
-	    }
-
-	  if (o->gc_mark)
diff --git a/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff b/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff
deleted file mode 100644
index 27592a8d0e87..000000000000
--- a/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Backported patch originally targeted against 2.45.
---- a/binutils/debug.c
-+++ b/binutils/debug.c
-@@ -2554,9 +2554,6 @@ debug_write_type (struct debug_handle *info,
-     case DEBUG_KIND_UNION_CLASS:
-       return debug_write_class_type (info, fns, fhandle, type, tag);
-     case DEBUG_KIND_ENUM:
--      if (type->u.kenum == NULL)
--	return (*fns->enum_type) (fhandle, tag, (const char **) NULL,
--				  (bfd_signed_vma *) NULL);
-       return (*fns->enum_type) (fhandle, tag, type->u.kenum->names,
- 				type->u.kenum->values);
-     case DEBUG_KIND_POINTER:
-@@ -3097,9 +3094,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
-       break;
-
-     case DEBUG_KIND_ENUM:
--      if (t1->u.kenum == NULL)
--	ret = t2->u.kenum == NULL;
--      else if (t2->u.kenum == NULL)
-+      if (t1->u.kenum->names == NULL)
-+	ret = t2->u.kenum->names == NULL;
-+      else if (t2->u.kenum->names == NULL)
- 	ret = false;
-       else
- 	{
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index d632b1ade6ea..05f863742d31 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -34,7 +34,7 @@ assert enableGoldDefault -> enableGold;
 let
   inherit (stdenv) buildPlatform hostPlatform targetPlatform;
 
-  version = "2.44";
+  version = "2.46";
 
   #INFO: The targetPrefix prepended to binary names to allow multiple binuntils
   # on the PATH to both be usable.
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnu/binutils/binutils-with-gold-${version}.tar.bz2";
-    hash = "sha256-NHM+pJXMDlDnDbTliQ3sKKxB8OFMShZeac8n+5moxMg=";
+    hash = "sha256-uMmj15bcCw6OqTXcJMXI1vNF6xd62lrGpbESLHfWIVg=";
   };
 
   # WARN: this package is used for bootstrapping fetchurl, and thus cannot use
@@ -120,14 +120,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./avr-size.patch
 
     ./windres-locate-gcc.patch
-
-    # Backported against CVE patched in the 2.45 series. See:
-    # https://nvd.nist.gov/vuln/detail/CVE-2025-5244
-    ./CVE-2025-5244.diff
-
-    # Backported against CVE patched in the 2.45 series. See:
-    # https://nvd.nist.gov/vuln/detail/CVE-2025-5245
-    ./CVE-2025-5245.diff
   ];
 
   outputs = [
diff --git a/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch b/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch
deleted file mode 100644
index 9f3504f33b53..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/remove-web-interface.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/cli/src/lib.rs b/cli/src/lib.rs
-index 4a00747e..e17d253b 100644
---- a/cli/src/lib.rs
-+++ b/cli/src/lib.rs
-@@ -6,7 +6,6 @@ pub mod highlight;
- pub mod init;
- pub mod input;
- pub mod logger;
- pub mod parse;
--pub mod playground;
- pub mod query;
- pub mod query_testing;
- pub mod tags;
-diff --git a/cli/src/main.rs b/cli/src/main.rs
-index 1758fada..4bc56cc2 100644
---- a/cli/src/main.rs
-+++ b/cli/src/main.rs
-@@ -23,7 +23,7 @@ use tree_sitter_cli::{
-     input::{get_input, get_tmp_source_file, CliInput},
-     logger,
-     parse::{self, ParseDebugType, ParseFileOptions, ParseOutput, ParseTheme},
--    playground, query,
-+    query,
-     tags::{self, TagsOptions},
-     test::{self, TestOptions, TestStats},
-     test_highlight, test_tags, util, version, wasm,
-@@ -1614,10 +1614,8 @@ impl Tags {
- 
- impl Playground {
-     fn run(self, current_dir: &Path) -> Result<()> {
--        let open_in_browser = !self.quiet;
--        let grammar_path = self.grammar_path.as_deref().map_or(current_dir, Path::new);
--        playground::serve(grammar_path, open_in_browser)?;
--        Ok(())
-+        println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport");
-+        std::process::exit(1);
-     }
- }
- 
diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index ac2cc0126365..5f56e4f6b88a 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -22,8 +22,8 @@ let
       hash = "sha256-hAL2daH0zJ1PJ7v6s1wtSi4dfrATHfA9rQlhnoZnTQw=";
     };
     "10" = {
-      version = "10.33.0";
-      hash = "sha256-v8wby60nmxOlFsRGp1s8WLaQS0XVehlRQRAV5Qt1GoA=";
+      version = "10.33.2";
+      hash = "sha256-envPE9f2zrOUbAOXg3PZm+n94cr8MAC9/tTE95EWdhA=";
     };
   };
 
diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix
index 9d811996d625..68f8a11d3d90 100644
--- a/pkgs/development/tools/prospector/default.nix
+++ b/pkgs/development/tools/prospector/default.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "PyCQA";
+    owner = "prospector-dev";
     repo = "prospector";
     tag = "v${version}";
     hash = "sha256-94JGKX91d2kul+KMYohga9KCOj6RN/YKpD8e4nWSOOM=";
@@ -70,8 +70,8 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = {
     description = "Tool to analyse Python code and output information about errors, potential problems, convention violations and complexity";
-    homepage = "https://github.com/PyCQA/prospector";
-    changelog = "https://github.com/PyCQA/prospector/blob/v${version}/CHANGELOG.rst";
+    homepage = "https://github.com/prospector-dev/prospector";
+    changelog = "https://github.com/prospector-dev/prospector/blob/v${version}/CHANGELOG.rst";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ kamadorueda ];
   };
diff --git a/pkgs/development/tools/yarn2nix-moretea/default.nix b/pkgs/development/tools/yarn2nix-moretea/default.nix
deleted file mode 100644
index 9b0aca26bbd0..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/default.nix
+++ /dev/null
@@ -1,543 +0,0 @@
-{
-  pkgs ? import <nixpkgs> { },
-  nodejs ? pkgs.nodejs,
-  yarn ? pkgs.yarn,
-  allowAliases ? pkgs.config.allowAliases,
-}@inputs:
-
-let
-  inherit (pkgs)
-    stdenv
-    lib
-    callPackage
-    git
-    rsync
-    runCommandLocal
-    ;
-
-  compose =
-    f: g: x:
-    f (g x);
-  id = x: x;
-  composeAll = builtins.foldl' compose id;
-
-  # https://docs.npmjs.com/files/package.json#license
-  # TODO: support expression syntax (OR, AND, etc)
-  getLicenseFromSpdxId =
-    licstr: if licstr == "UNLICENSED" then lib.licenses.unfree else lib.getLicenseFromSpdxId licstr;
-in
-rec {
-  # Export yarn again to make it easier to find out which yarn was used.
-  inherit yarn;
-
-  # Re-export pkgs
-  inherit pkgs;
-
-  unlessNull = item: alt: if item == null then alt else item;
-
-  reformatPackageName =
-    pname:
-    let
-      # regex adapted from `validate-npm-package-name`
-      # will produce 3 parts e.g.
-      # "@someorg/somepackage" -> [ "@someorg/" "someorg" "somepackage" ]
-      # "somepackage" -> [ null null "somepackage" ]
-      parts = builtins.tail (builtins.match "^(@([^/]+)/)?([^/]+)$" pname);
-      # if there is no organisation we need to filter out null values.
-      non-null = builtins.filter (x: x != null) parts;
-    in
-    builtins.concatStringsSep "-" non-null;
-
-  inherit getLicenseFromSpdxId;
-
-  # Generates the yarn.nix from the yarn.lock file
-  mkYarnNix =
-    {
-      yarnLock,
-      flags ? [ ],
-    }:
-    pkgs.runCommand "yarn.nix" { }
-      "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch --builtin-fetchgit ${lib.escapeShellArgs flags} > $out";
-
-  # Loads the generated offline cache. This will be used by yarn as
-  # the package source.
-  importOfflineCache =
-    yarnNix:
-    let
-      pkg = callPackage yarnNix { };
-    in
-    pkg.offline_cache;
-
-  defaultYarnFlags = [
-    "--offline"
-    "--frozen-lockfile"
-    "--ignore-engines"
-  ];
-
-  mkYarnModules =
-    {
-      name ? "${pname}-${version}", # safe name and version, e.g. testcompany-one-modules-1.0.0
-      pname, # original name, e.g @testcompany/one
-      version,
-      packageJSON,
-      yarnLock,
-      yarnNix ? mkYarnNix { inherit yarnLock; },
-      offlineCache ? importOfflineCache yarnNix,
-      yarnFlags ? [ ],
-      ignoreScripts ? true,
-      nodejs ? inputs.nodejs,
-      yarn ? inputs.yarn.override { inherit nodejs; },
-      pkgConfig ? { },
-      preBuild ? "",
-      postBuild ? "",
-      workspaceDependencies ? [ ], # List of yarn packages
-      packageResolutions ? { },
-    }:
-    let
-      extraNativeBuildInputs = lib.concatMap (key: pkgConfig.${key}.nativeBuildInputs or [ ]) (
-        builtins.attrNames pkgConfig
-      );
-      extraBuildInputs = lib.concatMap (key: pkgConfig.${key}.buildInputs or [ ]) (
-        builtins.attrNames pkgConfig
-      );
-
-      postInstall = map (
-        key:
-        if (pkgConfig.${key} ? postInstall) then
-          ''
-            for f in $(find -L -path '*/node_modules/${key}' -type d); do
-              (cd "$f" && (${pkgConfig.${key}.postInstall}))
-            done
-          ''
-        else
-          ""
-      ) (builtins.attrNames pkgConfig);
-
-      # build-time JSON generation to avoid IFD
-      # see https://wiki.nixos.org/wiki/Import_From_Derivation
-      workspaceJSON =
-        pkgs.runCommand "${name}-workspace-package.json"
-          {
-            nativeBuildInputs = [ pkgs.jq ];
-            inherit packageJSON;
-            passAsFile = [ "baseJSON" ];
-            baseJSON = builtins.toJSON {
-              private = true;
-              workspaces = [ "deps/**" ];
-              resolutions = packageResolutions;
-            };
-          }
-          ''
-            jq --slurpfile packageJSON "$packageJSON" '.resolutions = $packageJSON[0].resolutions + .resolutions' <"$baseJSONPath" >$out
-          '';
-
-      workspaceDependencyLinks = lib.concatMapStringsSep "\n" (dep: ''
-        mkdir -p "deps/${dep.pname}"
-        ln -sf ${dep.packageJSON} "deps/${dep.pname}/package.json"
-      '') workspaceDependencies;
-
-    in
-    stdenv.mkDerivation {
-      inherit preBuild postBuild name;
-      dontUnpack = true;
-      dontInstall = true;
-      nativeBuildInputs = [
-        yarn
-        nodejs
-        git
-      ]
-      ++ extraNativeBuildInputs;
-      buildInputs = extraBuildInputs;
-
-      configurePhase =
-        lib.optionalString (offlineCache ? outputHash) ''
-          if ! cmp -s ${yarnLock} ${offlineCache}/yarn.lock; then
-            echo "yarn.lock changed, you need to update the fetchYarnDeps hash"
-            exit 1
-          fi
-        ''
-        + ''
-          # Yarn writes cache directories etc to $HOME.
-          export HOME=$PWD/yarn_home
-        '';
-
-      buildPhase = ''
-        runHook preBuild
-
-        mkdir -p "deps/${pname}"
-        cp ${packageJSON} "deps/${pname}/package.json"
-        cp ${workspaceJSON} ./package.json
-        cp ${yarnLock} ./yarn.lock
-        chmod +w ./yarn.lock
-
-        yarn config --offline set yarn-offline-mirror ${offlineCache}
-
-        # Do not look up in the registry, but in the offline cache.
-        ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
-
-        ${workspaceDependencyLinks}
-
-        yarn install ${
-          lib.escapeShellArgs (defaultYarnFlags ++ lib.optional ignoreScripts "--ignore-scripts" ++ yarnFlags)
-        }
-
-        ${lib.concatStringsSep "\n" postInstall}
-
-        mkdir $out
-        mv node_modules $out/
-        mv deps $out/
-        patchShebangs $out
-
-        runHook postBuild
-      '';
-
-      dontCheckForBrokenSymlinks = true;
-    };
-
-  # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into
-  # the shell-hook environment.
-  linkNodeModulesHook = ''
-    if [[ -d node_modules || -L node_modules ]]; then
-      echo "./node_modules is present. Replacing."
-      rm -rf node_modules
-    fi
-
-    ln -s "$node_modules" node_modules
-  '';
-
-  mkYarnWorkspace =
-    {
-      src,
-      packageJSON ? src + "/package.json",
-      yarnLock ? src + "/yarn.lock",
-      nodejs ? inputs.nodejs,
-      yarn ? inputs.yarn.override { inherit nodejs; },
-      packageOverrides ? { },
-      ...
-    }@attrs:
-    let
-      package = lib.importJSON packageJSON;
-
-      packageGlobs =
-        if lib.isList package.workspaces then package.workspaces else package.workspaces.packages;
-
-      packageResolutions = package.resolutions or { };
-
-      globElemToRegex = lib.replaceStrings [ "*" ] [ ".*" ];
-
-      # PathGlob -> [PathGlobElem]
-      splitGlob = lib.splitString "/";
-
-      # Path -> [PathGlobElem] -> [Path]
-      # Note: Only directories are included, everything else is filtered out
-      expandGlobList =
-        base: globElems:
-        let
-          elemRegex = globElemToRegex (lib.head globElems);
-          rest = lib.tail globElems;
-          children = lib.attrNames (
-            lib.filterAttrs (name: type: type == "directory") (builtins.readDir base)
-          );
-          matchingChildren = lib.filter (child: builtins.match elemRegex child != null) children;
-        in
-        if globElems == [ ] then
-          [ base ]
-        else
-          lib.concatMap (child: expandGlobList (base + ("/" + child)) rest) matchingChildren;
-
-      # Path -> PathGlob -> [Path]
-      expandGlob = base: glob: expandGlobList base (splitGlob glob);
-
-      packagePaths = lib.concatMap (expandGlob src) packageGlobs;
-
-      packages = lib.listToAttrs (
-        map (
-          src:
-          let
-            packageJSON = src + "/package.json";
-
-            package = lib.importJSON packageJSON;
-
-            allDependencies = lib.foldl (a: b: a // b) { } (
-              map (field: lib.attrByPath [ field ] { } package) [
-                "dependencies"
-                "devDependencies"
-              ]
-            );
-
-            # { [name: String] : { pname : String, packageJSON : String, ... } } -> { [pname: String] : version } -> [{ pname : String, packageJSON : String, ... }]
-            getWorkspaceDependencies =
-              packages: allDependencies:
-              let
-                packageList = lib.attrValues packages;
-              in
-              composeAll [
-                (lib.filter (x: x != null))
-                (lib.mapAttrsToList (
-                  pname: _version: lib.findFirst (package: package.pname == pname) null packageList
-                ))
-              ] allDependencies;
-
-            workspaceDependencies = getWorkspaceDependencies packages allDependencies;
-
-            name = reformatPackageName package.name;
-          in
-          {
-            inherit name;
-            value = mkYarnPackage (
-              removeAttrs attrs [ "packageOverrides" ]
-              // {
-                inherit
-                  src
-                  packageJSON
-                  yarnLock
-                  nodejs
-                  yarn
-                  packageResolutions
-                  workspaceDependencies
-                  ;
-              }
-              // lib.attrByPath [ name ] { } packageOverrides
-            );
-          }
-        ) packagePaths
-      );
-    in
-    packages;
-
-  mkYarnPackage =
-    {
-      name ? null,
-      src,
-      packageJSON ? src + "/package.json",
-      yarnLock ? src + "/yarn.lock",
-      yarnNix ? mkYarnNix { inherit yarnLock; },
-      offlineCache ? importOfflineCache yarnNix,
-      nodejs ? inputs.nodejs,
-      yarn ? inputs.yarn.override { inherit nodejs; },
-      yarnFlags ? [ ],
-      yarnPreBuild ? "",
-      yarnPostBuild ? "",
-      pkgConfig ? { },
-      extraBuildInputs ? [ ],
-      publishBinsFor ? null,
-      workspaceDependencies ? [ ], # List of yarnPackages
-      packageResolutions ? { },
-      ...
-    }@attrs:
-    let
-      package = lib.importJSON packageJSON;
-      pname = attrs.pname or package.name;
-      safeName = reformatPackageName package.name;
-      version = attrs.version or package.version;
-      baseName = unlessNull name "${safeName}-${version}";
-
-      workspaceDependenciesTransitive = lib.unique (
-        (lib.flatten (map (dep: dep.workspaceDependencies) workspaceDependencies)) ++ workspaceDependencies
-      );
-
-      deps = mkYarnModules {
-        pname = package.name;
-        name = "${safeName}-modules-${version}";
-        preBuild = yarnPreBuild;
-        postBuild = yarnPostBuild;
-        workspaceDependencies = workspaceDependenciesTransitive;
-        inherit
-          packageJSON
-          version
-          yarnLock
-          offlineCache
-          nodejs
-          yarn
-          yarnFlags
-          pkgConfig
-          packageResolutions
-          ;
-      };
-
-      publishBinsFor_ = unlessNull publishBinsFor [ package.name ];
-
-      linkDirFunction = ''
-        linkDirToDirLinks() {
-          target=$1
-          if [ ! -f "$target" ]; then
-            mkdir -p "$target"
-          elif [ -L "$target" ]; then
-            local new=$(mktemp -d)
-            trueSource=$(realpath "$target")
-            if [ "$(ls $trueSource | wc -l)" -gt 0 ]; then
-              ln -s $trueSource/* $new/
-            fi
-            rm -r "$target"
-            mv "$new" "$target"
-          fi
-        }
-      '';
-
-      workspaceDependencyCopy = lib.concatMapStringsSep "\n" (dep: ''
-        # ensure any existing scope directory is not a symlink
-        linkDirToDirLinks "$(dirname node_modules/${dep.package.name})"
-        mkdir -p "deps/${dep.package.name}"
-        tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.package.name}" --strip-components=1
-        if [ ! -e "deps/${dep.package.name}/node_modules" ]; then
-          ln -s "${deps}/deps/${dep.package.name}/node_modules" "deps/${dep.package.name}/node_modules"
-        fi
-      '') workspaceDependenciesTransitive;
-
-    in
-    stdenv.mkDerivation (
-      removeAttrs attrs [
-        "yarnNix"
-        "pkgConfig"
-        "workspaceDependencies"
-        "packageResolutions"
-      ]
-      // {
-        inherit pname version src;
-
-        name = baseName;
-
-        buildInputs = [
-          yarn
-          nodejs
-          rsync
-        ]
-        ++ extraBuildInputs;
-
-        node_modules = deps + "/node_modules";
-
-        configurePhase =
-          attrs.configurePhase or ''
-            runHook preConfigure
-
-            for localDir in npm-packages-offline-cache node_modules; do
-              if [[ -d $localDir || -L $localDir ]]; then
-                echo "$localDir dir present. Removing."
-                rm -rf $localDir
-              fi
-            done
-
-            # move convent of . to ./deps/${package.name}
-            mv $PWD $NIX_BUILD_TOP/temp
-            mkdir -p "$PWD/deps/${package.name}"
-            rm -fd "$PWD/deps/${package.name}"
-            mv $NIX_BUILD_TOP/temp "$PWD/deps/${package.name}"
-            cd $PWD
-
-            ln -s ${deps}/deps/${package.name}/node_modules "deps/${package.name}/node_modules"
-
-            cp -r $node_modules node_modules
-            chmod -R +w node_modules
-
-            ${linkDirFunction}
-
-            linkDirToDirLinks "$(dirname node_modules/${package.name})"
-            ln -s "deps/${package.name}" "node_modules/${package.name}"
-
-            ${workspaceDependencyCopy}
-
-            # Help yarn commands run in other phases find the package
-            echo "--cwd deps/${package.name}" > .yarnrc
-            runHook postConfigure
-          '';
-
-        # Replace this phase on frontend packages where only the generated
-        # files are an interesting output.
-        installPhase =
-          attrs.installPhase or ''
-            runHook preInstall
-
-            mkdir -p $out/{bin,libexec/${package.name}}
-            mv node_modules $out/libexec/${package.name}/node_modules
-            mv deps $out/libexec/${package.name}/deps
-
-            node ${./internal/fixup_bin.js} $out/bin $out/libexec/${package.name}/node_modules ${lib.concatStringsSep " " publishBinsFor_}
-
-            runHook postInstall
-          '';
-
-        dontCheckForBrokenSymlinks = true;
-
-        doDist = attrs.doDist or true;
-
-        distPhase =
-          attrs.distPhase or ''
-            # pack command ignores cwd option
-            rm -f .yarnrc
-            cd $out/libexec/${package.name}/deps/${package.name}
-            mkdir -p $out/tarballs/
-            yarn pack --offline --ignore-scripts --filename $out/tarballs/${baseName}.tgz
-          '';
-
-        passthru = {
-          inherit package packageJSON deps;
-          workspaceDependencies = workspaceDependenciesTransitive;
-        }
-        // (attrs.passthru or { });
-
-        meta = {
-          inherit (nodejs.meta) platforms;
-        }
-        // lib.optionalAttrs (package ? description) { inherit (package) description; }
-        // lib.optionalAttrs (package ? homepage) { inherit (package) homepage; }
-        // lib.optionalAttrs (package ? license) { license = getLicenseFromSpdxId package.license; }
-        // (attrs.meta or { });
-      }
-    );
-
-  yarn2nix = mkYarnPackage {
-    src = ./yarn2nix;
-
-    # yarn2nix is the only package that requires the yarnNix option.
-    # All the other projects can auto-generate that file.
-    yarnNix = ./yarn.nix;
-
-    # Using the filter above and importing package.json from the filtered
-    # source results in an error in restricted mode. To circumvent this,
-    # we import package.json from the unfiltered source
-    packageJSON = ./yarn2nix/package.json;
-
-    yarnFlags = defaultYarnFlags ++ [
-      "--ignore-scripts"
-      "--production=true"
-    ];
-
-    nativeBuildInputs = [ pkgs.makeWrapper ];
-
-    buildPhase = ''
-      source ${./nix/expectShFunctions.sh}
-
-      expectFilePresent ./node_modules/.yarn-integrity
-
-      # check dependencies are installed
-      expectFilePresent ./node_modules/@yarnpkg/lockfile/package.json
-
-      # check devDependencies are not installed
-      expectFileOrDirAbsent ./node_modules/.bin/eslint
-      expectFileOrDirAbsent ./node_modules/eslint/package.json
-    '';
-
-    postInstall = ''
-      wrapProgram $out/bin/yarn2nix --prefix PATH : "${pkgs.nix-prefetch-git}/bin"
-    '';
-  };
-
-  fixup_yarn_lock =
-    runCommandLocal "fixup_yarn_lock"
-      {
-        buildInputs = [ nodejs ];
-      }
-      ''
-        mkdir -p $out/lib
-        mkdir -p $out/bin
-
-        cp ${./yarn2nix/lib/urlToName.js} $out/lib/urlToName.js
-        cp ${./internal/fixup_yarn_lock.js} $out/bin/fixup_yarn_lock
-
-        patchShebangs $out
-      '';
-}
-// lib.optionalAttrs allowAliases {
-  # Aliases
-  spdxLicense = getLicenseFromSpdxId; # added 2021-12-01
-}
diff --git a/pkgs/development/tools/yarn2nix-moretea/internal/fixup_bin.js b/pkgs/development/tools/yarn2nix-moretea/internal/fixup_bin.js
deleted file mode 100755
index a605147ab865..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/internal/fixup_bin.js
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env node
-
-/* Usage:
- * node fixup_bin.js <bin_dir> <modules_dir> [<bin_pkg_1>, <bin_pkg_2> ... ]
- */
-
-const fs = require("fs");
-const path = require("path");
-
-const derivationBinPath = process.argv[2];
-const nodeModules = process.argv[3];
-const packagesToPublishBin = process.argv.slice(4);
-
-function processPackage(name) {
-  console.log("fixup_bin: Processing ", name);
-
-  const packagePath = `${nodeModules}/${name}`;
-  const packageJsonPath = `${packagePath}/package.json`;
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath));
-
-  if (!packageJson.bin) {
-    console.log("fixup_bin: No binaries provided");
-    return;
-  }
-
-  // There are two alternative syntaxes for `bin`
-  // a) just a plain string, in which case the name of the package is the name of the binary.
-  // b) an object, where key is the name of the eventual binary, and the value the path to that binary.
-  if (typeof packageJson.bin === "string") {
-    const binName = packageJson.bin;
-    packageJson.bin = {};
-    packageJson.bin[packageJson.name] = binName;
-  }
-
-  // eslint-disable-next-line no-restricted-syntax, guard-for-in
-  for (const binName in packageJson.bin) {
-    const binPath = packageJson.bin[binName];
-    const normalizedBinName = binName.replace("@", "").replace("/", "-");
-
-    const targetPath = path.normalize(`${packagePath}/${binPath}`);
-    const createdPath = `${derivationBinPath}/${normalizedBinName}`;
-
-    console.log(
-      `fixup_bin: creating link ${createdPath} that points to ${targetPath}`
-    );
-
-    fs.symlinkSync(targetPath, createdPath);
-  }
-}
-
-packagesToPublishBin.forEach(pkg => {
-  processPackage(pkg);
-});
diff --git a/pkgs/development/tools/yarn2nix-moretea/internal/fixup_yarn_lock.js b/pkgs/development/tools/yarn2nix-moretea/internal/fixup_yarn_lock.js
deleted file mode 100755
index 319d02623459..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/internal/fixup_yarn_lock.js
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-
-/* Usage:
- * node fixup_yarn_lock.js yarn.lock
- */
-
-const fs = require("fs");
-const readline = require("readline");
-
-const urlToName = require("../lib/urlToName");
-
-const yarnLockPath = process.argv[2];
-
-const readFile = readline.createInterface({
-  input: fs.createReadStream(yarnLockPath, { encoding: "utf8" }),
-
-  // Note: we use the crlfDelay option to recognize all instances of CR LF
-  // ('\r\n') in input.txt as a single line break.
-  crlfDelay: Infinity,
-
-  terminal: false // input and output should be treated like a TTY
-});
-
-const result = [];
-
-readFile
-  .on("line", line => {
-    const arr = line.match(/^ {2}resolved "([^#]+)(#[^"]+)?"$/);
-
-    if (arr !== null) {
-      const [_, url, shaOrRev] = arr;
-
-      const fileName = urlToName(url);
-
-      result.push(`  resolved "${fileName}${shaOrRev ?? ""}"`);
-    } else {
-      result.push(line);
-    }
-  })
-  .on("close", () => {
-    fs.writeFile(yarnLockPath, result.join("\n"), "utf8", err => {
-      if (err) {
-        console.error(
-          "fixup_yarn_lock: fatal error when trying to write to yarn.lock",
-          err
-        );
-      }
-    });
-  });
diff --git a/pkgs/development/tools/yarn2nix-moretea/nix/expectShFunctions.sh b/pkgs/development/tools/yarn2nix-moretea/nix/expectShFunctions.sh
deleted file mode 100644
index fad230c69212..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/nix/expectShFunctions.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-expectFilePresent () {
-  if [ -f "$1" ]; then
-    echo "Test passed: file is present - $1"
-  else
-    echo "Test failed: file is absent - $1"
-    exit 1
-  fi
-}
-
-expectFileOrDirAbsent () {
-  if [ ! -e "$1" ];
-  then
-    echo "Test passed: file or dir is absent - $1"
-  else
-    echo "Test failed: file or dir is present - $1"
-    exit 1
-  fi
-}
-
-expectEqual () {
-  if [ "$1" == "$2" ];
-  then
-    echo "Test passed: output is equal to expected_output"
-  else
-    echo "Test failed: output is not equal to expected_output:"
-    echo "  output - $1"
-    echo "  expected_output - $2"
-    exit 1
-  fi
-}
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn.nix b/pkgs/development/tools/yarn2nix-moretea/yarn.nix
deleted file mode 100644
index aeaf39a5cc05..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn.nix
+++ /dev/null
@@ -1,3308 +0,0 @@
-{
-  fetchurl,
-  fetchgit,
-  linkFarm,
-  runCommand,
-  gnutar,
-}:
-rec {
-  offline_cache = linkFarm "offline" packages;
-  packages = [
-    {
-      name = "_babel_code_frame___code_frame_7.27.1.tgz";
-      path = fetchurl {
-        name = "_babel_code_frame___code_frame_7.27.1.tgz";
-        url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz";
-        sha512 = "cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==";
-      };
-    }
-    {
-      name = "_babel_generator___generator_7.28.5.tgz";
-      path = fetchurl {
-        name = "_babel_generator___generator_7.28.5.tgz";
-        url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz";
-        sha512 = "3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==";
-      };
-    }
-    {
-      name = "_babel_helper_globals___helper_globals_7.28.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_globals___helper_globals_7.28.0.tgz";
-        url = "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz";
-        sha512 = "+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==";
-      };
-    }
-    {
-      name = "_babel_helper_string_parser___helper_string_parser_7.27.1.tgz";
-      path = fetchurl {
-        name = "_babel_helper_string_parser___helper_string_parser_7.27.1.tgz";
-        url = "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz";
-        sha512 = "qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==";
-      };
-    }
-    {
-      name = "_babel_helper_validator_identifier___helper_validator_identifier_7.28.5.tgz";
-      path = fetchurl {
-        name = "_babel_helper_validator_identifier___helper_validator_identifier_7.28.5.tgz";
-        url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz";
-        sha512 = "qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==";
-      };
-    }
-    {
-      name = "_babel_parser___parser_7.28.5.tgz";
-      path = fetchurl {
-        name = "_babel_parser___parser_7.28.5.tgz";
-        url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz";
-        sha512 = "KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==";
-      };
-    }
-    {
-      name = "_babel_template___template_7.27.2.tgz";
-      path = fetchurl {
-        name = "_babel_template___template_7.27.2.tgz";
-        url = "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz";
-        sha512 = "LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==";
-      };
-    }
-    {
-      name = "_babel_traverse___traverse_7.28.5.tgz";
-      path = fetchurl {
-        name = "_babel_traverse___traverse_7.28.5.tgz";
-        url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz";
-        sha512 = "TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==";
-      };
-    }
-    {
-      name = "_babel_types___types_7.28.5.tgz";
-      path = fetchurl {
-        name = "_babel_types___types_7.28.5.tgz";
-        url = "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz";
-        sha512 = "qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==";
-      };
-    }
-    {
-      name = "_eslint_community_eslint_utils___eslint_utils_4.9.0.tgz";
-      path = fetchurl {
-        name = "_eslint_community_eslint_utils___eslint_utils_4.9.0.tgz";
-        url = "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz";
-        sha512 = "ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==";
-      };
-    }
-    {
-      name = "_eslint_community_regexpp___regexpp_4.12.2.tgz";
-      path = fetchurl {
-        name = "_eslint_community_regexpp___regexpp_4.12.2.tgz";
-        url = "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz";
-        sha512 = "EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==";
-      };
-    }
-    {
-      name = "_eslint_config_array___config_array_0.21.1.tgz";
-      path = fetchurl {
-        name = "_eslint_config_array___config_array_0.21.1.tgz";
-        url = "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.21.1.tgz";
-        sha512 = "aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==";
-      };
-    }
-    {
-      name = "_eslint_config_helpers___config_helpers_0.4.2.tgz";
-      path = fetchurl {
-        name = "_eslint_config_helpers___config_helpers_0.4.2.tgz";
-        url = "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.4.2.tgz";
-        sha512 = "gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==";
-      };
-    }
-    {
-      name = "_eslint_core___core_0.17.0.tgz";
-      path = fetchurl {
-        name = "_eslint_core___core_0.17.0.tgz";
-        url = "https://registry.yarnpkg.com/@eslint/core/-/core-0.17.0.tgz";
-        sha512 = "yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==";
-      };
-    }
-    {
-      name = "_eslint_eslintrc___eslintrc_2.1.4.tgz";
-      path = fetchurl {
-        name = "_eslint_eslintrc___eslintrc_2.1.4.tgz";
-        url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz";
-        sha512 = "269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==";
-      };
-    }
-    {
-      name = "_eslint_eslintrc___eslintrc_3.3.1.tgz";
-      path = fetchurl {
-        name = "_eslint_eslintrc___eslintrc_3.3.1.tgz";
-        url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.1.tgz";
-        sha512 = "gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==";
-      };
-    }
-    {
-      name = "_eslint_js___js_8.57.1.tgz";
-      path = fetchurl {
-        name = "_eslint_js___js_8.57.1.tgz";
-        url = "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz";
-        sha512 = "d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==";
-      };
-    }
-    {
-      name = "_eslint_js___js_9.39.1.tgz";
-      path = fetchurl {
-        name = "_eslint_js___js_9.39.1.tgz";
-        url = "https://registry.yarnpkg.com/@eslint/js/-/js-9.39.1.tgz";
-        sha512 = "S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==";
-      };
-    }
-    {
-      name = "_eslint_object_schema___object_schema_2.1.7.tgz";
-      path = fetchurl {
-        name = "_eslint_object_schema___object_schema_2.1.7.tgz";
-        url = "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.7.tgz";
-        sha512 = "VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==";
-      };
-    }
-    {
-      name = "_eslint_plugin_kit___plugin_kit_0.4.1.tgz";
-      path = fetchurl {
-        name = "_eslint_plugin_kit___plugin_kit_0.4.1.tgz";
-        url = "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz";
-        sha512 = "43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==";
-      };
-    }
-    {
-      name = "_humanfs_core___core_0.19.1.tgz";
-      path = fetchurl {
-        name = "_humanfs_core___core_0.19.1.tgz";
-        url = "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz";
-        sha512 = "5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==";
-      };
-    }
-    {
-      name = "_humanfs_node___node_0.16.7.tgz";
-      path = fetchurl {
-        name = "_humanfs_node___node_0.16.7.tgz";
-        url = "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.7.tgz";
-        sha512 = "/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==";
-      };
-    }
-    {
-      name = "_humanwhocodes_config_array___config_array_0.13.0.tgz";
-      path = fetchurl {
-        name = "_humanwhocodes_config_array___config_array_0.13.0.tgz";
-        url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz";
-        sha512 = "DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==";
-      };
-    }
-    {
-      name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz";
-      path = fetchurl {
-        name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz";
-        sha512 = "bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==";
-      };
-    }
-    {
-      name = "_humanwhocodes_object_schema___object_schema_2.0.3.tgz";
-      path = fetchurl {
-        name = "_humanwhocodes_object_schema___object_schema_2.0.3.tgz";
-        url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz";
-        sha512 = "93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==";
-      };
-    }
-    {
-      name = "_humanwhocodes_retry___retry_0.4.3.tgz";
-      path = fetchurl {
-        name = "_humanwhocodes_retry___retry_0.4.3.tgz";
-        url = "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.3.tgz";
-        sha512 = "bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==";
-      };
-    }
-    {
-      name = "_isaacs_cliui___cliui_8.0.2.tgz";
-      path = fetchurl {
-        name = "_isaacs_cliui___cliui_8.0.2.tgz";
-        url = "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz";
-        sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==";
-      };
-    }
-    {
-      name = "_jest_schemas___schemas_29.6.3.tgz";
-      path = fetchurl {
-        name = "_jest_schemas___schemas_29.6.3.tgz";
-        url = "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz";
-        sha512 = "mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==";
-      };
-    }
-    {
-      name = "_jridgewell_gen_mapping___gen_mapping_0.3.13.tgz";
-      path = fetchurl {
-        name = "_jridgewell_gen_mapping___gen_mapping_0.3.13.tgz";
-        url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz";
-        sha512 = "2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==";
-      };
-    }
-    {
-      name = "_jridgewell_resolve_uri___resolve_uri_3.1.2.tgz";
-      path = fetchurl {
-        name = "_jridgewell_resolve_uri___resolve_uri_3.1.2.tgz";
-        url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz";
-        sha512 = "bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==";
-      };
-    }
-    {
-      name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.5.5.tgz";
-      path = fetchurl {
-        name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.5.5.tgz";
-        url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz";
-        sha512 = "cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==";
-      };
-    }
-    {
-      name = "_jridgewell_trace_mapping___trace_mapping_0.3.31.tgz";
-      path = fetchurl {
-        name = "_jridgewell_trace_mapping___trace_mapping_0.3.31.tgz";
-        url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz";
-        sha512 = "zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==";
-      };
-    }
-    {
-      name = "_messageformat_core___core_3.4.0.tgz";
-      path = fetchurl {
-        name = "_messageformat_core___core_3.4.0.tgz";
-        url = "https://registry.yarnpkg.com/@messageformat/core/-/core-3.4.0.tgz";
-        sha512 = "NgCFubFFIdMWJGN5WuQhHCNmzk7QgiVfrViFxcS99j7F5dDS5EP6raR54I+2ydhe4+5/XTn/YIEppFaqqVWHsw==";
-      };
-    }
-    {
-      name = "_messageformat_date_skeleton___date_skeleton_1.1.0.tgz";
-      path = fetchurl {
-        name = "_messageformat_date_skeleton___date_skeleton_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/@messageformat/date-skeleton/-/date-skeleton-1.1.0.tgz";
-        sha512 = "rmGAfB1tIPER+gh3p/RgA+PVeRE/gxuQ2w4snFWPF5xtb5mbWR7Cbw7wCOftcUypbD6HVoxrVdyyghPm3WzP5A==";
-      };
-    }
-    {
-      name = "_messageformat_number_skeleton___number_skeleton_1.2.0.tgz";
-      path = fetchurl {
-        name = "_messageformat_number_skeleton___number_skeleton_1.2.0.tgz";
-        url = "https://registry.yarnpkg.com/@messageformat/number-skeleton/-/number-skeleton-1.2.0.tgz";
-        sha512 = "xsgwcL7J7WhlHJ3RNbaVgssaIwcEyFkBqxHdcdaiJzwTZAWEOD8BuUFxnxV9k5S0qHN3v/KzUpq0IUpjH1seRg==";
-      };
-    }
-    {
-      name = "_messageformat_parser___parser_5.1.1.tgz";
-      path = fetchurl {
-        name = "_messageformat_parser___parser_5.1.1.tgz";
-        url = "https://registry.yarnpkg.com/@messageformat/parser/-/parser-5.1.1.tgz";
-        sha512 = "3p0YRGCcTUCYvBKLIxtDDyrJ0YijGIwrTRu1DT8gIviIDZru8H23+FkY6MJBzM1n9n20CiM4VeDYuBsrrwnLjg==";
-      };
-    }
-    {
-      name = "_messageformat_runtime___runtime_3.0.2.tgz";
-      path = fetchurl {
-        name = "_messageformat_runtime___runtime_3.0.2.tgz";
-        url = "https://registry.yarnpkg.com/@messageformat/runtime/-/runtime-3.0.2.tgz";
-        sha512 = "dkIPDCjXcfhSHgNE1/qV6TeczQZR59Yx0xXeafVKgK3QVWoxc38ljwpksUpnzCGvN151KUbCJTDZVmahtf1YZw==";
-      };
-    }
-    {
-      name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz";
-      path = fetchurl {
-        name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz";
-        url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz";
-        sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==";
-      };
-    }
-    {
-      name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz";
-      path = fetchurl {
-        name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz";
-        url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz";
-        sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==";
-      };
-    }
-    {
-      name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz";
-      path = fetchurl {
-        name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz";
-        url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz";
-        sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==";
-      };
-    }
-    {
-      name = "_pkgjs_parseargs___parseargs_0.11.0.tgz";
-      path = fetchurl {
-        name = "_pkgjs_parseargs___parseargs_0.11.0.tgz";
-        url = "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz";
-        sha512 = "+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==";
-      };
-    }
-    {
-      name = "prettier_eslint___prettier_eslint_16.4.2.tgz";
-      path = fetchurl {
-        name = "prettier_eslint___prettier_eslint_16.4.2.tgz";
-        url = "https://registry.yarnpkg.com/prettier-eslint/-/prettier-eslint-16.4.2.tgz";
-        sha512 = "vtJAQEkaN8fW5QKl08t7A5KCjlZuDUNeIlr9hgolMS5s3+uzbfRHDwaRnzrdqnY2YpHDmeDS/8zY0MKQHXJtaA==";
-      };
-    }
-    {
-      name = "_rtsao_scc___scc_1.1.0.tgz";
-      path = fetchurl {
-        name = "_rtsao_scc___scc_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz";
-        sha512 = "zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==";
-      };
-    }
-    {
-      name = "_sinclair_typebox___typebox_0.27.8.tgz";
-      path = fetchurl {
-        name = "_sinclair_typebox___typebox_0.27.8.tgz";
-        url = "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz";
-        sha512 = "+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==";
-      };
-    }
-    {
-      name = "_types_estree___estree_1.0.8.tgz";
-      path = fetchurl {
-        name = "_types_estree___estree_1.0.8.tgz";
-        url = "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz";
-        sha512 = "dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==";
-      };
-    }
-    {
-      name = "_types_json_schema___json_schema_7.0.15.tgz";
-      path = fetchurl {
-        name = "_types_json_schema___json_schema_7.0.15.tgz";
-        url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz";
-        sha512 = "5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==";
-      };
-    }
-    {
-      name = "_types_json5___json5_0.0.29.tgz";
-      path = fetchurl {
-        name = "_types_json5___json5_0.0.29.tgz";
-        url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz";
-        sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==";
-      };
-    }
-    {
-      name = "_typescript_eslint_parser___parser_6.21.0.tgz";
-      path = fetchurl {
-        name = "_typescript_eslint_parser___parser_6.21.0.tgz";
-        url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz";
-        sha512 = "tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==";
-      };
-    }
-    {
-      name = "_typescript_eslint_scope_manager___scope_manager_6.21.0.tgz";
-      path = fetchurl {
-        name = "_typescript_eslint_scope_manager___scope_manager_6.21.0.tgz";
-        url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz";
-        sha512 = "OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==";
-      };
-    }
-    {
-      name = "_typescript_eslint_types___types_6.21.0.tgz";
-      path = fetchurl {
-        name = "_typescript_eslint_types___types_6.21.0.tgz";
-        url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz";
-        sha512 = "1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==";
-      };
-    }
-    {
-      name = "_typescript_eslint_typescript_estree___typescript_estree_6.21.0.tgz";
-      path = fetchurl {
-        name = "_typescript_eslint_typescript_estree___typescript_estree_6.21.0.tgz";
-        url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz";
-        sha512 = "6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==";
-      };
-    }
-    {
-      name = "_typescript_eslint_visitor_keys___visitor_keys_6.21.0.tgz";
-      path = fetchurl {
-        name = "_typescript_eslint_visitor_keys___visitor_keys_6.21.0.tgz";
-        url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz";
-        sha512 = "JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==";
-      };
-    }
-    {
-      name = "_ungap_structured_clone___structured_clone_1.3.0.tgz";
-      path = fetchurl {
-        name = "_ungap_structured_clone___structured_clone_1.3.0.tgz";
-        url = "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz";
-        sha512 = "WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==";
-      };
-    }
-    {
-      name = "_yarnpkg_lockfile___lockfile_1.1.0.tgz";
-      path = fetchurl {
-        name = "_yarnpkg_lockfile___lockfile_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz";
-        sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==";
-      };
-    }
-    {
-      name = "acorn_jsx___acorn_jsx_5.3.2.tgz";
-      path = fetchurl {
-        name = "acorn_jsx___acorn_jsx_5.3.2.tgz";
-        url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz";
-        sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==";
-      };
-    }
-    {
-      name = "acorn___acorn_8.15.0.tgz";
-      path = fetchurl {
-        name = "acorn___acorn_8.15.0.tgz";
-        url = "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz";
-        sha512 = "NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==";
-      };
-    }
-    {
-      name = "ajv___ajv_6.12.6.tgz";
-      path = fetchurl {
-        name = "ajv___ajv_6.12.6.tgz";
-        url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz";
-        sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
-      };
-    }
-    {
-      name = "ansi_escapes___ansi_escapes_7.2.0.tgz";
-      path = fetchurl {
-        name = "ansi_escapes___ansi_escapes_7.2.0.tgz";
-        url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.2.0.tgz";
-        sha512 = "g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==";
-      };
-    }
-    {
-      name = "ansi_regex___ansi_regex_2.1.1.tgz";
-      path = fetchurl {
-        name = "ansi_regex___ansi_regex_2.1.1.tgz";
-        url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==";
-      };
-    }
-    {
-      name = "ansi_regex___ansi_regex_5.0.1.tgz";
-      path = fetchurl {
-        name = "ansi_regex___ansi_regex_5.0.1.tgz";
-        url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz";
-        sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==";
-      };
-    }
-    {
-      name = "ansi_regex___ansi_regex_6.2.2.tgz";
-      path = fetchurl {
-        name = "ansi_regex___ansi_regex_6.2.2.tgz";
-        url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz";
-        sha512 = "Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==";
-      };
-    }
-    {
-      name = "ansi_styles___ansi_styles_2.2.1.tgz";
-      path = fetchurl {
-        name = "ansi_styles___ansi_styles_2.2.1.tgz";
-        url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz";
-        sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==";
-      };
-    }
-    {
-      name = "ansi_styles___ansi_styles_4.3.0.tgz";
-      path = fetchurl {
-        name = "ansi_styles___ansi_styles_4.3.0.tgz";
-        url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz";
-        sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
-      };
-    }
-    {
-      name = "ansi_styles___ansi_styles_5.2.0.tgz";
-      path = fetchurl {
-        name = "ansi_styles___ansi_styles_5.2.0.tgz";
-        url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz";
-        sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==";
-      };
-    }
-    {
-      name = "ansi_styles___ansi_styles_6.2.3.tgz";
-      path = fetchurl {
-        name = "ansi_styles___ansi_styles_6.2.3.tgz";
-        url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz";
-        sha512 = "4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==";
-      };
-    }
-    {
-      name = "argparse___argparse_2.0.1.tgz";
-      path = fetchurl {
-        name = "argparse___argparse_2.0.1.tgz";
-        url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz";
-        sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==";
-      };
-    }
-    {
-      name = "aria_query___aria_query_5.3.2.tgz";
-      path = fetchurl {
-        name = "aria_query___aria_query_5.3.2.tgz";
-        url = "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.2.tgz";
-        sha512 = "COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==";
-      };
-    }
-    {
-      name = "array_buffer_byte_length___array_buffer_byte_length_1.0.2.tgz";
-      path = fetchurl {
-        name = "array_buffer_byte_length___array_buffer_byte_length_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz";
-        sha512 = "LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==";
-      };
-    }
-    {
-      name = "array_includes___array_includes_3.1.9.tgz";
-      path = fetchurl {
-        name = "array_includes___array_includes_3.1.9.tgz";
-        url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.9.tgz";
-        sha512 = "FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==";
-      };
-    }
-    {
-      name = "array_union___array_union_2.1.0.tgz";
-      path = fetchurl {
-        name = "array_union___array_union_2.1.0.tgz";
-        url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz";
-        sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==";
-      };
-    }
-    {
-      name = "array.prototype.findlast___array.prototype.findlast_1.2.5.tgz";
-      path = fetchurl {
-        name = "array.prototype.findlast___array.prototype.findlast_1.2.5.tgz";
-        url = "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz";
-        sha512 = "CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==";
-      };
-    }
-    {
-      name = "array.prototype.findlastindex___array.prototype.findlastindex_1.2.6.tgz";
-      path = fetchurl {
-        name = "array.prototype.findlastindex___array.prototype.findlastindex_1.2.6.tgz";
-        url = "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz";
-        sha512 = "F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==";
-      };
-    }
-    {
-      name = "array.prototype.flat___array.prototype.flat_1.3.3.tgz";
-      path = fetchurl {
-        name = "array.prototype.flat___array.prototype.flat_1.3.3.tgz";
-        url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz";
-        sha512 = "rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==";
-      };
-    }
-    {
-      name = "array.prototype.flatmap___array.prototype.flatmap_1.3.3.tgz";
-      path = fetchurl {
-        name = "array.prototype.flatmap___array.prototype.flatmap_1.3.3.tgz";
-        url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz";
-        sha512 = "Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==";
-      };
-    }
-    {
-      name = "array.prototype.tosorted___array.prototype.tosorted_1.1.4.tgz";
-      path = fetchurl {
-        name = "array.prototype.tosorted___array.prototype.tosorted_1.1.4.tgz";
-        url = "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz";
-        sha512 = "p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==";
-      };
-    }
-    {
-      name = "arraybuffer.prototype.slice___arraybuffer.prototype.slice_1.0.4.tgz";
-      path = fetchurl {
-        name = "arraybuffer.prototype.slice___arraybuffer.prototype.slice_1.0.4.tgz";
-        url = "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz";
-        sha512 = "BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==";
-      };
-    }
-    {
-      name = "arrify___arrify_2.0.1.tgz";
-      path = fetchurl {
-        name = "arrify___arrify_2.0.1.tgz";
-        url = "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz";
-        sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==";
-      };
-    }
-    {
-      name = "ast_types_flow___ast_types_flow_0.0.8.tgz";
-      path = fetchurl {
-        name = "ast_types_flow___ast_types_flow_0.0.8.tgz";
-        url = "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz";
-        sha512 = "OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==";
-      };
-    }
-    {
-      name = "async_function___async_function_1.0.0.tgz";
-      path = fetchurl {
-        name = "async_function___async_function_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz";
-        sha512 = "hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==";
-      };
-    }
-    {
-      name = "available_typed_arrays___available_typed_arrays_1.0.7.tgz";
-      path = fetchurl {
-        name = "available_typed_arrays___available_typed_arrays_1.0.7.tgz";
-        url = "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz";
-        sha512 = "wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==";
-      };
-    }
-    {
-      name = "axe_core___axe_core_4.11.0.tgz";
-      path = fetchurl {
-        name = "axe_core___axe_core_4.11.0.tgz";
-        url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.11.0.tgz";
-        sha512 = "ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==";
-      };
-    }
-    {
-      name = "axobject_query___axobject_query_4.1.0.tgz";
-      path = fetchurl {
-        name = "axobject_query___axobject_query_4.1.0.tgz";
-        url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz";
-        sha512 = "qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==";
-      };
-    }
-    {
-      name = "babel_eslint___babel_eslint_10.1.0.tgz";
-      path = fetchurl {
-        name = "babel_eslint___babel_eslint_10.1.0.tgz";
-        url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz";
-        sha512 = "ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==";
-      };
-    }
-    {
-      name = "balanced_match___balanced_match_1.0.2.tgz";
-      path = fetchurl {
-        name = "balanced_match___balanced_match_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz";
-        sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==";
-      };
-    }
-    {
-      name = "boolify___boolify_1.0.1.tgz";
-      path = fetchurl {
-        name = "boolify___boolify_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/boolify/-/boolify-1.0.1.tgz";
-        sha512 = "ma2q0Tc760dW54CdOyJjhrg/a54317o1zYADQJFgperNGKIKgAUGIcKnuMiff8z57+yGlrGNEt4lPgZfCgTJgA==";
-      };
-    }
-    {
-      name = "brace_expansion___brace_expansion_1.1.12.tgz";
-      path = fetchurl {
-        name = "brace_expansion___brace_expansion_1.1.12.tgz";
-        url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz";
-        sha512 = "9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==";
-      };
-    }
-    {
-      name = "brace_expansion___brace_expansion_2.0.2.tgz";
-      path = fetchurl {
-        name = "brace_expansion___brace_expansion_2.0.2.tgz";
-        url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz";
-        sha512 = "Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==";
-      };
-    }
-    {
-      name = "braces___braces_3.0.3.tgz";
-      path = fetchurl {
-        name = "braces___braces_3.0.3.tgz";
-        url = "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz";
-        sha512 = "yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==";
-      };
-    }
-    {
-      name = "call_bind_apply_helpers___call_bind_apply_helpers_1.0.2.tgz";
-      path = fetchurl {
-        name = "call_bind_apply_helpers___call_bind_apply_helpers_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz";
-        sha512 = "Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==";
-      };
-    }
-    {
-      name = "call_bind___call_bind_1.0.8.tgz";
-      path = fetchurl {
-        name = "call_bind___call_bind_1.0.8.tgz";
-        url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz";
-        sha512 = "oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==";
-      };
-    }
-    {
-      name = "call_bound___call_bound_1.0.4.tgz";
-      path = fetchurl {
-        name = "call_bound___call_bound_1.0.4.tgz";
-        url = "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz";
-        sha512 = "+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==";
-      };
-    }
-    {
-      name = "callsites___callsites_3.1.0.tgz";
-      path = fetchurl {
-        name = "callsites___callsites_3.1.0.tgz";
-        url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz";
-        sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
-      };
-    }
-    {
-      name = "camelcase_keys___camelcase_keys_9.1.3.tgz";
-      path = fetchurl {
-        name = "camelcase_keys___camelcase_keys_9.1.3.tgz";
-        url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-9.1.3.tgz";
-        sha512 = "Rircqi9ch8AnZscQcsA1C47NFdaO3wukpmIRzYcDOrmvgt78hM/sj5pZhZNec2NM12uk5vTwRHZ4anGcrC4ZTg==";
-      };
-    }
-    {
-      name = "camelcase___camelcase_8.0.0.tgz";
-      path = fetchurl {
-        name = "camelcase___camelcase_8.0.0.tgz";
-        url = "https://registry.yarnpkg.com/camelcase/-/camelcase-8.0.0.tgz";
-        sha512 = "8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==";
-      };
-    }
-    {
-      name = "chalk___chalk_1.1.3.tgz";
-      path = fetchurl {
-        name = "chalk___chalk_1.1.3.tgz";
-        url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz";
-        sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==";
-      };
-    }
-    {
-      name = "chalk___chalk_4.1.2.tgz";
-      path = fetchurl {
-        name = "chalk___chalk_4.1.2.tgz";
-        url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz";
-        sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==";
-      };
-    }
-    {
-      name = "cli_cursor___cli_cursor_5.0.0.tgz";
-      path = fetchurl {
-        name = "cli_cursor___cli_cursor_5.0.0.tgz";
-        url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz";
-        sha512 = "aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==";
-      };
-    }
-    {
-      name = "cli_truncate___cli_truncate_5.1.1.tgz";
-      path = fetchurl {
-        name = "cli_truncate___cli_truncate_5.1.1.tgz";
-        url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-5.1.1.tgz";
-        sha512 = "SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==";
-      };
-    }
-    {
-      name = "cliui___cliui_8.0.1.tgz";
-      path = fetchurl {
-        name = "cliui___cliui_8.0.1.tgz";
-        url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz";
-        sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==";
-      };
-    }
-    {
-      name = "color_convert___color_convert_2.0.1.tgz";
-      path = fetchurl {
-        name = "color_convert___color_convert_2.0.1.tgz";
-        url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz";
-        sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==";
-      };
-    }
-    {
-      name = "color_name___color_name_1.1.4.tgz";
-      path = fetchurl {
-        name = "color_name___color_name_1.1.4.tgz";
-        url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz";
-        sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
-      };
-    }
-    {
-      name = "colorette___colorette_2.0.20.tgz";
-      path = fetchurl {
-        name = "colorette___colorette_2.0.20.tgz";
-        url = "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz";
-        sha512 = "IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==";
-      };
-    }
-    {
-      name = "commander___commander_14.0.2.tgz";
-      path = fetchurl {
-        name = "commander___commander_14.0.2.tgz";
-        url = "https://registry.yarnpkg.com/commander/-/commander-14.0.2.tgz";
-        sha512 = "TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==";
-      };
-    }
-    {
-      name = "common_tags___common_tags_1.8.2.tgz";
-      path = fetchurl {
-        name = "common_tags___common_tags_1.8.2.tgz";
-        url = "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz";
-        sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==";
-      };
-    }
-    {
-      name = "concat_map___concat_map_0.0.1.tgz";
-      path = fetchurl {
-        name = "concat_map___concat_map_0.0.1.tgz";
-        url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz";
-        sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==";
-      };
-    }
-    {
-      name = "confusing_browser_globals___confusing_browser_globals_1.0.11.tgz";
-      path = fetchurl {
-        name = "confusing_browser_globals___confusing_browser_globals_1.0.11.tgz";
-        url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz";
-        sha512 = "JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==";
-      };
-    }
-    {
-      name = "core_js___core_js_3.47.0.tgz";
-      path = fetchurl {
-        name = "core_js___core_js_3.47.0.tgz";
-        url = "https://registry.yarnpkg.com/core-js/-/core-js-3.47.0.tgz";
-        sha512 = "c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==";
-      };
-    }
-    {
-      name = "cross_spawn___cross_spawn_7.0.6.tgz";
-      path = fetchurl {
-        name = "cross_spawn___cross_spawn_7.0.6.tgz";
-        url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz";
-        sha512 = "uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==";
-      };
-    }
-    {
-      name = "damerau_levenshtein___damerau_levenshtein_1.0.8.tgz";
-      path = fetchurl {
-        name = "damerau_levenshtein___damerau_levenshtein_1.0.8.tgz";
-        url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz";
-        sha512 = "sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==";
-      };
-    }
-    {
-      name = "data_view_buffer___data_view_buffer_1.0.2.tgz";
-      path = fetchurl {
-        name = "data_view_buffer___data_view_buffer_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz";
-        sha512 = "EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==";
-      };
-    }
-    {
-      name = "data_view_byte_length___data_view_byte_length_1.0.2.tgz";
-      path = fetchurl {
-        name = "data_view_byte_length___data_view_byte_length_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz";
-        sha512 = "tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==";
-      };
-    }
-    {
-      name = "data_view_byte_offset___data_view_byte_offset_1.0.1.tgz";
-      path = fetchurl {
-        name = "data_view_byte_offset___data_view_byte_offset_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz";
-        sha512 = "BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==";
-      };
-    }
-    {
-      name = "debug___debug_3.2.7.tgz";
-      path = fetchurl {
-        name = "debug___debug_3.2.7.tgz";
-        url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz";
-        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
-      };
-    }
-    {
-      name = "debug___debug_4.4.3.tgz";
-      path = fetchurl {
-        name = "debug___debug_4.4.3.tgz";
-        url = "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz";
-        sha512 = "RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==";
-      };
-    }
-    {
-      name = "deep_equal___deep_equal_2.2.3.tgz";
-      path = fetchurl {
-        name = "deep_equal___deep_equal_2.2.3.tgz";
-        url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.3.tgz";
-        sha512 = "ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==";
-      };
-    }
-    {
-      name = "deep_is___deep_is_0.1.4.tgz";
-      path = fetchurl {
-        name = "deep_is___deep_is_0.1.4.tgz";
-        url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz";
-        sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==";
-      };
-    }
-    {
-      name = "define_data_property___define_data_property_1.1.4.tgz";
-      path = fetchurl {
-        name = "define_data_property___define_data_property_1.1.4.tgz";
-        url = "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz";
-        sha512 = "rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==";
-      };
-    }
-    {
-      name = "define_properties___define_properties_1.2.1.tgz";
-      path = fetchurl {
-        name = "define_properties___define_properties_1.2.1.tgz";
-        url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz";
-        sha512 = "8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==";
-      };
-    }
-    {
-      name = "dir_glob___dir_glob_3.0.1.tgz";
-      path = fetchurl {
-        name = "dir_glob___dir_glob_3.0.1.tgz";
-        url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz";
-        sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==";
-      };
-    }
-    {
-      name = "dlv___dlv_1.1.3.tgz";
-      path = fetchurl {
-        name = "dlv___dlv_1.1.3.tgz";
-        url = "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz";
-        sha512 = "+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==";
-      };
-    }
-    {
-      name = "docopt___docopt_0.6.2.tgz";
-      path = fetchurl {
-        name = "docopt___docopt_0.6.2.tgz";
-        url = "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz";
-        sha512 = "NqTbaYeE4gA/wU1hdKFdU+AFahpDOpgGLzHP42k6H6DKExJd0A55KEVWYhL9FEmHmgeLvEU2vuKXDuU+4yToOw==";
-      };
-    }
-    {
-      name = "doctrine___doctrine_2.1.0.tgz";
-      path = fetchurl {
-        name = "doctrine___doctrine_2.1.0.tgz";
-        url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz";
-        sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==";
-      };
-    }
-    {
-      name = "doctrine___doctrine_3.0.0.tgz";
-      path = fetchurl {
-        name = "doctrine___doctrine_3.0.0.tgz";
-        url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz";
-        sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==";
-      };
-    }
-    {
-      name = "dunder_proto___dunder_proto_1.0.1.tgz";
-      path = fetchurl {
-        name = "dunder_proto___dunder_proto_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz";
-        sha512 = "KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==";
-      };
-    }
-    {
-      name = "eastasianwidth___eastasianwidth_0.2.0.tgz";
-      path = fetchurl {
-        name = "eastasianwidth___eastasianwidth_0.2.0.tgz";
-        url = "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz";
-        sha512 = "I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==";
-      };
-    }
-    {
-      name = "emoji_regex___emoji_regex_10.6.0.tgz";
-      path = fetchurl {
-        name = "emoji_regex___emoji_regex_10.6.0.tgz";
-        url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.6.0.tgz";
-        sha512 = "toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==";
-      };
-    }
-    {
-      name = "emoji_regex___emoji_regex_8.0.0.tgz";
-      path = fetchurl {
-        name = "emoji_regex___emoji_regex_8.0.0.tgz";
-        url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz";
-        sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==";
-      };
-    }
-    {
-      name = "emoji_regex___emoji_regex_9.2.2.tgz";
-      path = fetchurl {
-        name = "emoji_regex___emoji_regex_9.2.2.tgz";
-        url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz";
-        sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==";
-      };
-    }
-    {
-      name = "environment___environment_1.1.0.tgz";
-      path = fetchurl {
-        name = "environment___environment_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/environment/-/environment-1.1.0.tgz";
-        sha512 = "xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==";
-      };
-    }
-    {
-      name = "es_abstract___es_abstract_1.24.0.tgz";
-      path = fetchurl {
-        name = "es_abstract___es_abstract_1.24.0.tgz";
-        url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.0.tgz";
-        sha512 = "WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==";
-      };
-    }
-    {
-      name = "es_define_property___es_define_property_1.0.1.tgz";
-      path = fetchurl {
-        name = "es_define_property___es_define_property_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz";
-        sha512 = "e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==";
-      };
-    }
-    {
-      name = "es_errors___es_errors_1.3.0.tgz";
-      path = fetchurl {
-        name = "es_errors___es_errors_1.3.0.tgz";
-        url = "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz";
-        sha512 = "Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==";
-      };
-    }
-    {
-      name = "es_get_iterator___es_get_iterator_1.1.3.tgz";
-      path = fetchurl {
-        name = "es_get_iterator___es_get_iterator_1.1.3.tgz";
-        url = "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz";
-        sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==";
-      };
-    }
-    {
-      name = "es_iterator_helpers___es_iterator_helpers_1.2.1.tgz";
-      path = fetchurl {
-        name = "es_iterator_helpers___es_iterator_helpers_1.2.1.tgz";
-        url = "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz";
-        sha512 = "uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==";
-      };
-    }
-    {
-      name = "es_object_atoms___es_object_atoms_1.1.1.tgz";
-      path = fetchurl {
-        name = "es_object_atoms___es_object_atoms_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz";
-        sha512 = "FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==";
-      };
-    }
-    {
-      name = "es_set_tostringtag___es_set_tostringtag_2.1.0.tgz";
-      path = fetchurl {
-        name = "es_set_tostringtag___es_set_tostringtag_2.1.0.tgz";
-        url = "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz";
-        sha512 = "j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==";
-      };
-    }
-    {
-      name = "es_shim_unscopables___es_shim_unscopables_1.1.0.tgz";
-      path = fetchurl {
-        name = "es_shim_unscopables___es_shim_unscopables_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz";
-        sha512 = "d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==";
-      };
-    }
-    {
-      name = "es_to_primitive___es_to_primitive_1.3.0.tgz";
-      path = fetchurl {
-        name = "es_to_primitive___es_to_primitive_1.3.0.tgz";
-        url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz";
-        sha512 = "w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==";
-      };
-    }
-    {
-      name = "escalade___escalade_3.2.0.tgz";
-      path = fetchurl {
-        name = "escalade___escalade_3.2.0.tgz";
-        url = "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz";
-        sha512 = "WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==";
-      };
-    }
-    {
-      name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
-      path = fetchurl {
-        name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
-        url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==";
-      };
-    }
-    {
-      name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz";
-      path = fetchurl {
-        name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz";
-        url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz";
-        sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
-      };
-    }
-    {
-      name = "eslint_config_airbnb_base___eslint_config_airbnb_base_15.0.0.tgz";
-      path = fetchurl {
-        name = "eslint_config_airbnb_base___eslint_config_airbnb_base_15.0.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz";
-        sha512 = "xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==";
-      };
-    }
-    {
-      name = "eslint_config_airbnb___eslint_config_airbnb_19.0.4.tgz";
-      path = fetchurl {
-        name = "eslint_config_airbnb___eslint_config_airbnb_19.0.4.tgz";
-        url = "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz";
-        sha512 = "T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==";
-      };
-    }
-    {
-      name = "eslint_config_prettier___eslint_config_prettier_10.1.8.tgz";
-      path = fetchurl {
-        name = "eslint_config_prettier___eslint_config_prettier_10.1.8.tgz";
-        url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz";
-        sha512 = "82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==";
-      };
-    }
-    {
-      name = "eslint_config_standard___eslint_config_standard_17.1.0.tgz";
-      path = fetchurl {
-        name = "eslint_config_standard___eslint_config_standard_17.1.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz";
-        sha512 = "IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==";
-      };
-    }
-    {
-      name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.9.tgz";
-      path = fetchurl {
-        name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.9.tgz";
-        url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz";
-        sha512 = "WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==";
-      };
-    }
-    {
-      name = "eslint_module_utils___eslint_module_utils_2.12.1.tgz";
-      path = fetchurl {
-        name = "eslint_module_utils___eslint_module_utils_2.12.1.tgz";
-        url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz";
-        sha512 = "L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==";
-      };
-    }
-    {
-      name = "eslint_plugin_es___eslint_plugin_es_3.0.1.tgz";
-      path = fetchurl {
-        name = "eslint_plugin_es___eslint_plugin_es_3.0.1.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz";
-        sha512 = "GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==";
-      };
-    }
-    {
-      name = "eslint_plugin_import___eslint_plugin_import_2.32.0.tgz";
-      path = fetchurl {
-        name = "eslint_plugin_import___eslint_plugin_import_2.32.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz";
-        sha512 = "whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==";
-      };
-    }
-    {
-      name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.10.2.tgz";
-      path = fetchurl {
-        name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.10.2.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz";
-        sha512 = "scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==";
-      };
-    }
-    {
-      name = "eslint_plugin_node___eslint_plugin_node_11.1.0.tgz";
-      path = fetchurl {
-        name = "eslint_plugin_node___eslint_plugin_node_11.1.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz";
-        sha512 = "oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==";
-      };
-    }
-    {
-      name = "eslint_plugin_promise___eslint_plugin_promise_7.2.1.tgz";
-      path = fetchurl {
-        name = "eslint_plugin_promise___eslint_plugin_promise_7.2.1.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-7.2.1.tgz";
-        sha512 = "SWKjd+EuvWkYaS+uN2csvj0KoP43YTu7+phKQ5v+xw6+A0gutVX2yqCeCkC3uLCJFiPfR2dD8Es5L7yUsmvEaA==";
-      };
-    }
-    {
-      name = "eslint_plugin_react___eslint_plugin_react_7.37.5.tgz";
-      path = fetchurl {
-        name = "eslint_plugin_react___eslint_plugin_react_7.37.5.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz";
-        sha512 = "Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==";
-      };
-    }
-    {
-      name = "eslint_scope___eslint_scope_7.2.2.tgz";
-      path = fetchurl {
-        name = "eslint_scope___eslint_scope_7.2.2.tgz";
-        url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz";
-        sha512 = "dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==";
-      };
-    }
-    {
-      name = "eslint_scope___eslint_scope_8.4.0.tgz";
-      path = fetchurl {
-        name = "eslint_scope___eslint_scope_8.4.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.4.0.tgz";
-        sha512 = "sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==";
-      };
-    }
-    {
-      name = "eslint_utils___eslint_utils_2.1.0.tgz";
-      path = fetchurl {
-        name = "eslint_utils___eslint_utils_2.1.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz";
-        sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==";
-      };
-    }
-    {
-      name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
-      path = fetchurl {
-        name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz";
-        sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==";
-      };
-    }
-    {
-      name = "eslint_visitor_keys___eslint_visitor_keys_3.4.3.tgz";
-      path = fetchurl {
-        name = "eslint_visitor_keys___eslint_visitor_keys_3.4.3.tgz";
-        url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz";
-        sha512 = "wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==";
-      };
-    }
-    {
-      name = "eslint_visitor_keys___eslint_visitor_keys_4.2.1.tgz";
-      path = fetchurl {
-        name = "eslint_visitor_keys___eslint_visitor_keys_4.2.1.tgz";
-        url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz";
-        sha512 = "Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==";
-      };
-    }
-    {
-      name = "eslint___eslint_8.57.1.tgz";
-      path = fetchurl {
-        name = "eslint___eslint_8.57.1.tgz";
-        url = "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz";
-        sha512 = "ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==";
-      };
-    }
-    {
-      name = "eslint___eslint_9.39.1.tgz";
-      path = fetchurl {
-        name = "eslint___eslint_9.39.1.tgz";
-        url = "https://registry.yarnpkg.com/eslint/-/eslint-9.39.1.tgz";
-        sha512 = "BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==";
-      };
-    }
-    {
-      name = "espree___espree_10.4.0.tgz";
-      path = fetchurl {
-        name = "espree___espree_10.4.0.tgz";
-        url = "https://registry.yarnpkg.com/espree/-/espree-10.4.0.tgz";
-        sha512 = "j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==";
-      };
-    }
-    {
-      name = "espree___espree_9.6.1.tgz";
-      path = fetchurl {
-        name = "espree___espree_9.6.1.tgz";
-        url = "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz";
-        sha512 = "oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==";
-      };
-    }
-    {
-      name = "esquery___esquery_1.6.0.tgz";
-      path = fetchurl {
-        name = "esquery___esquery_1.6.0.tgz";
-        url = "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz";
-        sha512 = "ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==";
-      };
-    }
-    {
-      name = "esrecurse___esrecurse_4.3.0.tgz";
-      path = fetchurl {
-        name = "esrecurse___esrecurse_4.3.0.tgz";
-        url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz";
-        sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==";
-      };
-    }
-    {
-      name = "estraverse___estraverse_5.3.0.tgz";
-      path = fetchurl {
-        name = "estraverse___estraverse_5.3.0.tgz";
-        url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz";
-        sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==";
-      };
-    }
-    {
-      name = "esutils___esutils_2.0.3.tgz";
-      path = fetchurl {
-        name = "esutils___esutils_2.0.3.tgz";
-        url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz";
-        sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
-      };
-    }
-    {
-      name = "eventemitter3___eventemitter3_5.0.1.tgz";
-      path = fetchurl {
-        name = "eventemitter3___eventemitter3_5.0.1.tgz";
-        url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz";
-        sha512 = "GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==";
-      };
-    }
-    {
-      name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
-      path = fetchurl {
-        name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
-        url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
-        sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
-      };
-    }
-    {
-      name = "fast_glob___fast_glob_3.3.3.tgz";
-      path = fetchurl {
-        name = "fast_glob___fast_glob_3.3.3.tgz";
-        url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz";
-        sha512 = "7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==";
-      };
-    }
-    {
-      name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz";
-      path = fetchurl {
-        name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz";
-        url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
-        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
-      };
-    }
-    {
-      name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
-      path = fetchurl {
-        name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz";
-        url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
-        sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==";
-      };
-    }
-    {
-      name = "fastq___fastq_1.19.1.tgz";
-      path = fetchurl {
-        name = "fastq___fastq_1.19.1.tgz";
-        url = "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz";
-        sha512 = "GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==";
-      };
-    }
-    {
-      name = "file_entry_cache___file_entry_cache_6.0.1.tgz";
-      path = fetchurl {
-        name = "file_entry_cache___file_entry_cache_6.0.1.tgz";
-        url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz";
-        sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==";
-      };
-    }
-    {
-      name = "file_entry_cache___file_entry_cache_8.0.0.tgz";
-      path = fetchurl {
-        name = "file_entry_cache___file_entry_cache_8.0.0.tgz";
-        url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz";
-        sha512 = "XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==";
-      };
-    }
-    {
-      name = "fill_range___fill_range_7.1.1.tgz";
-      path = fetchurl {
-        name = "fill_range___fill_range_7.1.1.tgz";
-        url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz";
-        sha512 = "YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==";
-      };
-    }
-    {
-      name = "find_up___find_up_5.0.0.tgz";
-      path = fetchurl {
-        name = "find_up___find_up_5.0.0.tgz";
-        url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz";
-        sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==";
-      };
-    }
-    {
-      name = "flat_cache___flat_cache_3.2.0.tgz";
-      path = fetchurl {
-        name = "flat_cache___flat_cache_3.2.0.tgz";
-        url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz";
-        sha512 = "CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==";
-      };
-    }
-    {
-      name = "flat_cache___flat_cache_4.0.1.tgz";
-      path = fetchurl {
-        name = "flat_cache___flat_cache_4.0.1.tgz";
-        url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz";
-        sha512 = "f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==";
-      };
-    }
-    {
-      name = "flatted___flatted_3.3.3.tgz";
-      path = fetchurl {
-        name = "flatted___flatted_3.3.3.tgz";
-        url = "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz";
-        sha512 = "GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==";
-      };
-    }
-    {
-      name = "for_each___for_each_0.3.5.tgz";
-      path = fetchurl {
-        name = "for_each___for_each_0.3.5.tgz";
-        url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz";
-        sha512 = "dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==";
-      };
-    }
-    {
-      name = "foreground_child___foreground_child_3.3.1.tgz";
-      path = fetchurl {
-        name = "foreground_child___foreground_child_3.3.1.tgz";
-        url = "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz";
-        sha512 = "gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==";
-      };
-    }
-    {
-      name = "fs.realpath___fs.realpath_1.0.0.tgz";
-      path = fetchurl {
-        name = "fs.realpath___fs.realpath_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==";
-      };
-    }
-    {
-      name = "function_bind___function_bind_1.1.2.tgz";
-      path = fetchurl {
-        name = "function_bind___function_bind_1.1.2.tgz";
-        url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz";
-        sha512 = "7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==";
-      };
-    }
-    {
-      name = "function.prototype.name___function.prototype.name_1.1.8.tgz";
-      path = fetchurl {
-        name = "function.prototype.name___function.prototype.name_1.1.8.tgz";
-        url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz";
-        sha512 = "e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==";
-      };
-    }
-    {
-      name = "functions_have_names___functions_have_names_1.2.3.tgz";
-      path = fetchurl {
-        name = "functions_have_names___functions_have_names_1.2.3.tgz";
-        url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz";
-        sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==";
-      };
-    }
-    {
-      name = "generator_function___generator_function_2.0.1.tgz";
-      path = fetchurl {
-        name = "generator_function___generator_function_2.0.1.tgz";
-        url = "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz";
-        sha512 = "SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==";
-      };
-    }
-    {
-      name = "get_caller_file___get_caller_file_2.0.5.tgz";
-      path = fetchurl {
-        name = "get_caller_file___get_caller_file_2.0.5.tgz";
-        url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz";
-        sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
-      };
-    }
-    {
-      name = "get_east_asian_width___get_east_asian_width_1.4.0.tgz";
-      path = fetchurl {
-        name = "get_east_asian_width___get_east_asian_width_1.4.0.tgz";
-        url = "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz";
-        sha512 = "QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==";
-      };
-    }
-    {
-      name = "get_intrinsic___get_intrinsic_1.3.0.tgz";
-      path = fetchurl {
-        name = "get_intrinsic___get_intrinsic_1.3.0.tgz";
-        url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz";
-        sha512 = "9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==";
-      };
-    }
-    {
-      name = "get_proto___get_proto_1.0.1.tgz";
-      path = fetchurl {
-        name = "get_proto___get_proto_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz";
-        sha512 = "sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==";
-      };
-    }
-    {
-      name = "get_stdin___get_stdin_8.0.0.tgz";
-      path = fetchurl {
-        name = "get_stdin___get_stdin_8.0.0.tgz";
-        url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz";
-        sha512 = "sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==";
-      };
-    }
-    {
-      name = "get_symbol_description___get_symbol_description_1.1.0.tgz";
-      path = fetchurl {
-        name = "get_symbol_description___get_symbol_description_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz";
-        sha512 = "w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==";
-      };
-    }
-    {
-      name = "glob_parent___glob_parent_5.1.2.tgz";
-      path = fetchurl {
-        name = "glob_parent___glob_parent_5.1.2.tgz";
-        url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz";
-        sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==";
-      };
-    }
-    {
-      name = "glob_parent___glob_parent_6.0.2.tgz";
-      path = fetchurl {
-        name = "glob_parent___glob_parent_6.0.2.tgz";
-        url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz";
-        sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==";
-      };
-    }
-    {
-      name = "glob___glob_10.5.0.tgz";
-      path = fetchurl {
-        name = "glob___glob_10.5.0.tgz";
-        url = "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz";
-        sha512 = "DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==";
-      };
-    }
-    {
-      name = "glob___glob_7.2.3.tgz";
-      path = fetchurl {
-        name = "glob___glob_7.2.3.tgz";
-        url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz";
-        sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==";
-      };
-    }
-    {
-      name = "globals___globals_13.24.0.tgz";
-      path = fetchurl {
-        name = "globals___globals_13.24.0.tgz";
-        url = "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz";
-        sha512 = "AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==";
-      };
-    }
-    {
-      name = "globals___globals_14.0.0.tgz";
-      path = fetchurl {
-        name = "globals___globals_14.0.0.tgz";
-        url = "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz";
-        sha512 = "oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==";
-      };
-    }
-    {
-      name = "globals___globals_16.5.0.tgz";
-      path = fetchurl {
-        name = "globals___globals_16.5.0.tgz";
-        url = "https://registry.yarnpkg.com/globals/-/globals-16.5.0.tgz";
-        sha512 = "c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==";
-      };
-    }
-    {
-      name = "globalthis___globalthis_1.0.4.tgz";
-      path = fetchurl {
-        name = "globalthis___globalthis_1.0.4.tgz";
-        url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz";
-        sha512 = "DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==";
-      };
-    }
-    {
-      name = "globby___globby_11.1.0.tgz";
-      path = fetchurl {
-        name = "globby___globby_11.1.0.tgz";
-        url = "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz";
-        sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==";
-      };
-    }
-    {
-      name = "gopd___gopd_1.2.0.tgz";
-      path = fetchurl {
-        name = "gopd___gopd_1.2.0.tgz";
-        url = "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz";
-        sha512 = "ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==";
-      };
-    }
-    {
-      name = "graphemer___graphemer_1.4.0.tgz";
-      path = fetchurl {
-        name = "graphemer___graphemer_1.4.0.tgz";
-        url = "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz";
-        sha512 = "EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==";
-      };
-    }
-    {
-      name = "has_ansi___has_ansi_2.0.0.tgz";
-      path = fetchurl {
-        name = "has_ansi___has_ansi_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz";
-        sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==";
-      };
-    }
-    {
-      name = "has_bigints___has_bigints_1.1.0.tgz";
-      path = fetchurl {
-        name = "has_bigints___has_bigints_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz";
-        sha512 = "R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==";
-      };
-    }
-    {
-      name = "has_flag___has_flag_4.0.0.tgz";
-      path = fetchurl {
-        name = "has_flag___has_flag_4.0.0.tgz";
-        url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz";
-        sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
-      };
-    }
-    {
-      name = "has_property_descriptors___has_property_descriptors_1.0.2.tgz";
-      path = fetchurl {
-        name = "has_property_descriptors___has_property_descriptors_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz";
-        sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==";
-      };
-    }
-    {
-      name = "has_proto___has_proto_1.2.0.tgz";
-      path = fetchurl {
-        name = "has_proto___has_proto_1.2.0.tgz";
-        url = "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz";
-        sha512 = "KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==";
-      };
-    }
-    {
-      name = "has_symbols___has_symbols_1.1.0.tgz";
-      path = fetchurl {
-        name = "has_symbols___has_symbols_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz";
-        sha512 = "1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==";
-      };
-    }
-    {
-      name = "has_tostringtag___has_tostringtag_1.0.2.tgz";
-      path = fetchurl {
-        name = "has_tostringtag___has_tostringtag_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz";
-        sha512 = "NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==";
-      };
-    }
-    {
-      name = "hasown___hasown_2.0.2.tgz";
-      path = fetchurl {
-        name = "hasown___hasown_2.0.2.tgz";
-        url = "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz";
-        sha512 = "0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==";
-      };
-    }
-    {
-      name = "husky___husky_9.1.7.tgz";
-      path = fetchurl {
-        name = "husky___husky_9.1.7.tgz";
-        url = "https://registry.yarnpkg.com/husky/-/husky-9.1.7.tgz";
-        sha512 = "5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==";
-      };
-    }
-    {
-      name = "ignore___ignore_5.3.2.tgz";
-      path = fetchurl {
-        name = "ignore___ignore_5.3.2.tgz";
-        url = "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz";
-        sha512 = "hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==";
-      };
-    }
-    {
-      name = "import_fresh___import_fresh_3.3.1.tgz";
-      path = fetchurl {
-        name = "import_fresh___import_fresh_3.3.1.tgz";
-        url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz";
-        sha512 = "TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==";
-      };
-    }
-    {
-      name = "imurmurhash___imurmurhash_0.1.4.tgz";
-      path = fetchurl {
-        name = "imurmurhash___imurmurhash_0.1.4.tgz";
-        url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz";
-        sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==";
-      };
-    }
-    {
-      name = "indent_string___indent_string_4.0.0.tgz";
-      path = fetchurl {
-        name = "indent_string___indent_string_4.0.0.tgz";
-        url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz";
-        sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==";
-      };
-    }
-    {
-      name = "inflight___inflight_1.0.6.tgz";
-      path = fetchurl {
-        name = "inflight___inflight_1.0.6.tgz";
-        url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz";
-        sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==";
-      };
-    }
-    {
-      name = "inherits___inherits_2.0.4.tgz";
-      path = fetchurl {
-        name = "inherits___inherits_2.0.4.tgz";
-        url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz";
-        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
-      };
-    }
-    {
-      name = "internal_slot___internal_slot_1.1.0.tgz";
-      path = fetchurl {
-        name = "internal_slot___internal_slot_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz";
-        sha512 = "4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==";
-      };
-    }
-    {
-      name = "is_arguments___is_arguments_1.2.0.tgz";
-      path = fetchurl {
-        name = "is_arguments___is_arguments_1.2.0.tgz";
-        url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.2.0.tgz";
-        sha512 = "7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==";
-      };
-    }
-    {
-      name = "is_array_buffer___is_array_buffer_3.0.5.tgz";
-      path = fetchurl {
-        name = "is_array_buffer___is_array_buffer_3.0.5.tgz";
-        url = "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz";
-        sha512 = "DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==";
-      };
-    }
-    {
-      name = "is_async_function___is_async_function_2.1.1.tgz";
-      path = fetchurl {
-        name = "is_async_function___is_async_function_2.1.1.tgz";
-        url = "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.1.tgz";
-        sha512 = "9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==";
-      };
-    }
-    {
-      name = "is_bigint___is_bigint_1.1.0.tgz";
-      path = fetchurl {
-        name = "is_bigint___is_bigint_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.1.0.tgz";
-        sha512 = "n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==";
-      };
-    }
-    {
-      name = "is_boolean_object___is_boolean_object_1.2.2.tgz";
-      path = fetchurl {
-        name = "is_boolean_object___is_boolean_object_1.2.2.tgz";
-        url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz";
-        sha512 = "wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==";
-      };
-    }
-    {
-      name = "is_callable___is_callable_1.2.7.tgz";
-      path = fetchurl {
-        name = "is_callable___is_callable_1.2.7.tgz";
-        url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz";
-        sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==";
-      };
-    }
-    {
-      name = "is_core_module___is_core_module_2.16.1.tgz";
-      path = fetchurl {
-        name = "is_core_module___is_core_module_2.16.1.tgz";
-        url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz";
-        sha512 = "UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==";
-      };
-    }
-    {
-      name = "is_data_view___is_data_view_1.0.2.tgz";
-      path = fetchurl {
-        name = "is_data_view___is_data_view_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz";
-        sha512 = "RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==";
-      };
-    }
-    {
-      name = "is_date_object___is_date_object_1.1.0.tgz";
-      path = fetchurl {
-        name = "is_date_object___is_date_object_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz";
-        sha512 = "PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==";
-      };
-    }
-    {
-      name = "is_extglob___is_extglob_2.1.1.tgz";
-      path = fetchurl {
-        name = "is_extglob___is_extglob_2.1.1.tgz";
-        url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz";
-        sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==";
-      };
-    }
-    {
-      name = "is_finalizationregistry___is_finalizationregistry_1.1.1.tgz";
-      path = fetchurl {
-        name = "is_finalizationregistry___is_finalizationregistry_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz";
-        sha512 = "1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==";
-      };
-    }
-    {
-      name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz";
-      path = fetchurl {
-        name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz";
-        url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz";
-        sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==";
-      };
-    }
-    {
-      name = "is_fullwidth_code_point___is_fullwidth_code_point_5.1.0.tgz";
-      path = fetchurl {
-        name = "is_fullwidth_code_point___is_fullwidth_code_point_5.1.0.tgz";
-        url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz";
-        sha512 = "5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==";
-      };
-    }
-    {
-      name = "is_generator_function___is_generator_function_1.1.2.tgz";
-      path = fetchurl {
-        name = "is_generator_function___is_generator_function_1.1.2.tgz";
-        url = "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz";
-        sha512 = "upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==";
-      };
-    }
-    {
-      name = "is_glob___is_glob_4.0.3.tgz";
-      path = fetchurl {
-        name = "is_glob___is_glob_4.0.3.tgz";
-        url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz";
-        sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==";
-      };
-    }
-    {
-      name = "is_map___is_map_2.0.3.tgz";
-      path = fetchurl {
-        name = "is_map___is_map_2.0.3.tgz";
-        url = "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz";
-        sha512 = "1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==";
-      };
-    }
-    {
-      name = "is_negative_zero___is_negative_zero_2.0.3.tgz";
-      path = fetchurl {
-        name = "is_negative_zero___is_negative_zero_2.0.3.tgz";
-        url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz";
-        sha512 = "5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==";
-      };
-    }
-    {
-      name = "is_number_object___is_number_object_1.1.1.tgz";
-      path = fetchurl {
-        name = "is_number_object___is_number_object_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz";
-        sha512 = "lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==";
-      };
-    }
-    {
-      name = "is_number___is_number_7.0.0.tgz";
-      path = fetchurl {
-        name = "is_number___is_number_7.0.0.tgz";
-        url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz";
-        sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
-      };
-    }
-    {
-      name = "is_path_inside___is_path_inside_3.0.3.tgz";
-      path = fetchurl {
-        name = "is_path_inside___is_path_inside_3.0.3.tgz";
-        url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz";
-        sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==";
-      };
-    }
-    {
-      name = "is_regex___is_regex_1.2.1.tgz";
-      path = fetchurl {
-        name = "is_regex___is_regex_1.2.1.tgz";
-        url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz";
-        sha512 = "MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==";
-      };
-    }
-    {
-      name = "is_set___is_set_2.0.3.tgz";
-      path = fetchurl {
-        name = "is_set___is_set_2.0.3.tgz";
-        url = "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz";
-        sha512 = "iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==";
-      };
-    }
-    {
-      name = "is_shared_array_buffer___is_shared_array_buffer_1.0.4.tgz";
-      path = fetchurl {
-        name = "is_shared_array_buffer___is_shared_array_buffer_1.0.4.tgz";
-        url = "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz";
-        sha512 = "ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==";
-      };
-    }
-    {
-      name = "is_string___is_string_1.1.1.tgz";
-      path = fetchurl {
-        name = "is_string___is_string_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz";
-        sha512 = "BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==";
-      };
-    }
-    {
-      name = "is_symbol___is_symbol_1.1.1.tgz";
-      path = fetchurl {
-        name = "is_symbol___is_symbol_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz";
-        sha512 = "9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==";
-      };
-    }
-    {
-      name = "is_typed_array___is_typed_array_1.1.15.tgz";
-      path = fetchurl {
-        name = "is_typed_array___is_typed_array_1.1.15.tgz";
-        url = "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz";
-        sha512 = "p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==";
-      };
-    }
-    {
-      name = "is_weakmap___is_weakmap_2.0.2.tgz";
-      path = fetchurl {
-        name = "is_weakmap___is_weakmap_2.0.2.tgz";
-        url = "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz";
-        sha512 = "K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==";
-      };
-    }
-    {
-      name = "is_weakref___is_weakref_1.1.1.tgz";
-      path = fetchurl {
-        name = "is_weakref___is_weakref_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz";
-        sha512 = "6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==";
-      };
-    }
-    {
-      name = "is_weakset___is_weakset_2.0.4.tgz";
-      path = fetchurl {
-        name = "is_weakset___is_weakset_2.0.4.tgz";
-        url = "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.4.tgz";
-        sha512 = "mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==";
-      };
-    }
-    {
-      name = "isarray___isarray_2.0.5.tgz";
-      path = fetchurl {
-        name = "isarray___isarray_2.0.5.tgz";
-        url = "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz";
-        sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==";
-      };
-    }
-    {
-      name = "isexe___isexe_2.0.0.tgz";
-      path = fetchurl {
-        name = "isexe___isexe_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz";
-        sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==";
-      };
-    }
-    {
-      name = "iterator.prototype___iterator.prototype_1.1.5.tgz";
-      path = fetchurl {
-        name = "iterator.prototype___iterator.prototype_1.1.5.tgz";
-        url = "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.5.tgz";
-        sha512 = "H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==";
-      };
-    }
-    {
-      name = "jackspeak___jackspeak_3.4.3.tgz";
-      path = fetchurl {
-        name = "jackspeak___jackspeak_3.4.3.tgz";
-        url = "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz";
-        sha512 = "OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==";
-      };
-    }
-    {
-      name = "js_tokens___js_tokens_4.0.0.tgz";
-      path = fetchurl {
-        name = "js_tokens___js_tokens_4.0.0.tgz";
-        url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz";
-        sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
-      };
-    }
-    {
-      name = "js_yaml___js_yaml_4.1.1.tgz";
-      path = fetchurl {
-        name = "js_yaml___js_yaml_4.1.1.tgz";
-        url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz";
-        sha512 = "qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==";
-      };
-    }
-    {
-      name = "jsesc___jsesc_3.1.0.tgz";
-      path = fetchurl {
-        name = "jsesc___jsesc_3.1.0.tgz";
-        url = "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz";
-        sha512 = "/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==";
-      };
-    }
-    {
-      name = "json_buffer___json_buffer_3.0.1.tgz";
-      path = fetchurl {
-        name = "json_buffer___json_buffer_3.0.1.tgz";
-        url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz";
-        sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==";
-      };
-    }
-    {
-      name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz";
-      path = fetchurl {
-        name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz";
-        url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
-        sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
-      };
-    }
-    {
-      name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz";
-      path = fetchurl {
-        name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz";
-        sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==";
-      };
-    }
-    {
-      name = "json5___json5_1.0.2.tgz";
-      path = fetchurl {
-        name = "json5___json5_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz";
-        sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==";
-      };
-    }
-    {
-      name = "jsx_ast_utils___jsx_ast_utils_3.3.5.tgz";
-      path = fetchurl {
-        name = "jsx_ast_utils___jsx_ast_utils_3.3.5.tgz";
-        url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz";
-        sha512 = "ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==";
-      };
-    }
-    {
-      name = "keyv___keyv_4.5.4.tgz";
-      path = fetchurl {
-        name = "keyv___keyv_4.5.4.tgz";
-        url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz";
-        sha512 = "oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==";
-      };
-    }
-    {
-      name = "language_subtag_registry___language_subtag_registry_0.3.23.tgz";
-      path = fetchurl {
-        name = "language_subtag_registry___language_subtag_registry_0.3.23.tgz";
-        url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz";
-        sha512 = "0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==";
-      };
-    }
-    {
-      name = "language_tags___language_tags_1.0.9.tgz";
-      path = fetchurl {
-        name = "language_tags___language_tags_1.0.9.tgz";
-        url = "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.9.tgz";
-        sha512 = "MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==";
-      };
-    }
-    {
-      name = "levn___levn_0.4.1.tgz";
-      path = fetchurl {
-        name = "levn___levn_0.4.1.tgz";
-        url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz";
-        sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==";
-      };
-    }
-    {
-      name = "lint_staged___lint_staged_16.2.7.tgz";
-      path = fetchurl {
-        name = "lint_staged___lint_staged_16.2.7.tgz";
-        url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-16.2.7.tgz";
-        sha512 = "lDIj4RnYmK7/kXMya+qJsmkRFkGolciXjrsZ6PC25GdTfWOAWetR0ZbsNXRAj1EHHImRSalc+whZFg56F5DVow==";
-      };
-    }
-    {
-      name = "listr2___listr2_9.0.5.tgz";
-      path = fetchurl {
-        name = "listr2___listr2_9.0.5.tgz";
-        url = "https://registry.yarnpkg.com/listr2/-/listr2-9.0.5.tgz";
-        sha512 = "ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==";
-      };
-    }
-    {
-      name = "locate_path___locate_path_6.0.0.tgz";
-      path = fetchurl {
-        name = "locate_path___locate_path_6.0.0.tgz";
-        url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz";
-        sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==";
-      };
-    }
-    {
-      name = "lodash.memoize___lodash.memoize_4.1.2.tgz";
-      path = fetchurl {
-        name = "lodash.memoize___lodash.memoize_4.1.2.tgz";
-        url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz";
-        sha512 = "t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==";
-      };
-    }
-    {
-      name = "lodash.merge___lodash.merge_4.6.2.tgz";
-      path = fetchurl {
-        name = "lodash.merge___lodash.merge_4.6.2.tgz";
-        url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz";
-        sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==";
-      };
-    }
-    {
-      name = "lodash___lodash_4.17.21.tgz";
-      path = fetchurl {
-        name = "lodash___lodash_4.17.21.tgz";
-        url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz";
-        sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";
-      };
-    }
-    {
-      name = "log_update___log_update_6.1.0.tgz";
-      path = fetchurl {
-        name = "log_update___log_update_6.1.0.tgz";
-        url = "https://registry.yarnpkg.com/log-update/-/log-update-6.1.0.tgz";
-        sha512 = "9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==";
-      };
-    }
-    {
-      name = "loglevel_colored_level_prefix___loglevel_colored_level_prefix_1.0.0.tgz";
-      path = fetchurl {
-        name = "loglevel_colored_level_prefix___loglevel_colored_level_prefix_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz";
-        sha512 = "u45Wcxxc+SdAlh4yeF/uKlC1SPUPCy0gullSNKXod5I4bmifzk+Q4lSLExNEVn19tGaJipbZ4V4jbFn79/6mVA==";
-      };
-    }
-    {
-      name = "loglevel___loglevel_1.9.2.tgz";
-      path = fetchurl {
-        name = "loglevel___loglevel_1.9.2.tgz";
-        url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.2.tgz";
-        sha512 = "HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==";
-      };
-    }
-    {
-      name = "loose_envify___loose_envify_1.4.0.tgz";
-      path = fetchurl {
-        name = "loose_envify___loose_envify_1.4.0.tgz";
-        url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz";
-        sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==";
-      };
-    }
-    {
-      name = "lru_cache___lru_cache_10.4.3.tgz";
-      path = fetchurl {
-        name = "lru_cache___lru_cache_10.4.3.tgz";
-        url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz";
-        sha512 = "JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==";
-      };
-    }
-    {
-      name = "make_plural___make_plural_7.4.0.tgz";
-      path = fetchurl {
-        name = "make_plural___make_plural_7.4.0.tgz";
-        url = "https://registry.yarnpkg.com/make-plural/-/make-plural-7.4.0.tgz";
-        sha512 = "4/gC9KVNTV6pvYg2gFeQYTW3mWaoJt7WZE5vrp1KnQDgW92JtYZnzmZT81oj/dUTqAIu0ufI2x3dkgu3bB1tYg==";
-      };
-    }
-    {
-      name = "map_obj___map_obj_5.0.0.tgz";
-      path = fetchurl {
-        name = "map_obj___map_obj_5.0.0.tgz";
-        url = "https://registry.yarnpkg.com/map-obj/-/map-obj-5.0.0.tgz";
-        sha512 = "2L3MIgJynYrZ3TYMriLDLWocz15okFakV6J12HXvMXDHui2x/zgChzg1u9mFFGbbGWE+GsLpQByt4POb9Or+uA==";
-      };
-    }
-    {
-      name = "math_intrinsics___math_intrinsics_1.1.0.tgz";
-      path = fetchurl {
-        name = "math_intrinsics___math_intrinsics_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz";
-        sha512 = "/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==";
-      };
-    }
-    {
-      name = "merge2___merge2_1.4.1.tgz";
-      path = fetchurl {
-        name = "merge2___merge2_1.4.1.tgz";
-        url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz";
-        sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==";
-      };
-    }
-    {
-      name = "micromatch___micromatch_4.0.8.tgz";
-      path = fetchurl {
-        name = "micromatch___micromatch_4.0.8.tgz";
-        url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz";
-        sha512 = "PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==";
-      };
-    }
-    {
-      name = "mimic_function___mimic_function_5.0.1.tgz";
-      path = fetchurl {
-        name = "mimic_function___mimic_function_5.0.1.tgz";
-        url = "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz";
-        sha512 = "VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==";
-      };
-    }
-    {
-      name = "minimatch___minimatch_9.0.3.tgz";
-      path = fetchurl {
-        name = "minimatch___minimatch_9.0.3.tgz";
-        url = "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz";
-        sha512 = "RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==";
-      };
-    }
-    {
-      name = "minimatch___minimatch_3.1.2.tgz";
-      path = fetchurl {
-        name = "minimatch___minimatch_3.1.2.tgz";
-        url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz";
-        sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
-      };
-    }
-    {
-      name = "minimatch___minimatch_9.0.5.tgz";
-      path = fetchurl {
-        name = "minimatch___minimatch_9.0.5.tgz";
-        url = "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz";
-        sha512 = "G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==";
-      };
-    }
-    {
-      name = "minimist___minimist_1.2.8.tgz";
-      path = fetchurl {
-        name = "minimist___minimist_1.2.8.tgz";
-        url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz";
-        sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==";
-      };
-    }
-    {
-      name = "minipass___minipass_7.1.2.tgz";
-      path = fetchurl {
-        name = "minipass___minipass_7.1.2.tgz";
-        url = "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz";
-        sha512 = "qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==";
-      };
-    }
-    {
-      name = "moo___moo_0.5.2.tgz";
-      path = fetchurl {
-        name = "moo___moo_0.5.2.tgz";
-        url = "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz";
-        sha512 = "iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==";
-      };
-    }
-    {
-      name = "ms___ms_2.1.3.tgz";
-      path = fetchurl {
-        name = "ms___ms_2.1.3.tgz";
-        url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz";
-        sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
-      };
-    }
-    {
-      name = "nano_spawn___nano_spawn_2.0.0.tgz";
-      path = fetchurl {
-        name = "nano_spawn___nano_spawn_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/nano-spawn/-/nano-spawn-2.0.0.tgz";
-        sha512 = "tacvGzUY5o2D8CBh2rrwxyNojUsZNU2zjNTzKQrkgGJQTbGAfArVWXSKMBokBeeg6C7OLRGUEyoFlYbfeWQIqw==";
-      };
-    }
-    {
-      name = "natural_compare___natural_compare_1.4.0.tgz";
-      path = fetchurl {
-        name = "natural_compare___natural_compare_1.4.0.tgz";
-        url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz";
-        sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==";
-      };
-    }
-    {
-      name = "object_assign___object_assign_4.1.1.tgz";
-      path = fetchurl {
-        name = "object_assign___object_assign_4.1.1.tgz";
-        url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz";
-        sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==";
-      };
-    }
-    {
-      name = "object_inspect___object_inspect_1.13.4.tgz";
-      path = fetchurl {
-        name = "object_inspect___object_inspect_1.13.4.tgz";
-        url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz";
-        sha512 = "W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==";
-      };
-    }
-    {
-      name = "object_is___object_is_1.1.6.tgz";
-      path = fetchurl {
-        name = "object_is___object_is_1.1.6.tgz";
-        url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz";
-        sha512 = "F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==";
-      };
-    }
-    {
-      name = "object_keys___object_keys_1.1.1.tgz";
-      path = fetchurl {
-        name = "object_keys___object_keys_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz";
-        sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
-      };
-    }
-    {
-      name = "object.assign___object.assign_4.1.7.tgz";
-      path = fetchurl {
-        name = "object.assign___object.assign_4.1.7.tgz";
-        url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz";
-        sha512 = "nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==";
-      };
-    }
-    {
-      name = "object.entries___object.entries_1.1.9.tgz";
-      path = fetchurl {
-        name = "object.entries___object.entries_1.1.9.tgz";
-        url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.9.tgz";
-        sha512 = "8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==";
-      };
-    }
-    {
-      name = "object.fromentries___object.fromentries_2.0.8.tgz";
-      path = fetchurl {
-        name = "object.fromentries___object.fromentries_2.0.8.tgz";
-        url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz";
-        sha512 = "k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==";
-      };
-    }
-    {
-      name = "object.groupby___object.groupby_1.0.3.tgz";
-      path = fetchurl {
-        name = "object.groupby___object.groupby_1.0.3.tgz";
-        url = "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz";
-        sha512 = "+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==";
-      };
-    }
-    {
-      name = "object.values___object.values_1.2.1.tgz";
-      path = fetchurl {
-        name = "object.values___object.values_1.2.1.tgz";
-        url = "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz";
-        sha512 = "gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==";
-      };
-    }
-    {
-      name = "once___once_1.4.0.tgz";
-      path = fetchurl {
-        name = "once___once_1.4.0.tgz";
-        url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz";
-        sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==";
-      };
-    }
-    {
-      name = "onetime___onetime_7.0.0.tgz";
-      path = fetchurl {
-        name = "onetime___onetime_7.0.0.tgz";
-        url = "https://registry.yarnpkg.com/onetime/-/onetime-7.0.0.tgz";
-        sha512 = "VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==";
-      };
-    }
-    {
-      name = "optionator___optionator_0.9.4.tgz";
-      path = fetchurl {
-        name = "optionator___optionator_0.9.4.tgz";
-        url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz";
-        sha512 = "6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==";
-      };
-    }
-    {
-      name = "own_keys___own_keys_1.0.1.tgz";
-      path = fetchurl {
-        name = "own_keys___own_keys_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz";
-        sha512 = "qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==";
-      };
-    }
-    {
-      name = "p_limit___p_limit_3.1.0.tgz";
-      path = fetchurl {
-        name = "p_limit___p_limit_3.1.0.tgz";
-        url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz";
-        sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==";
-      };
-    }
-    {
-      name = "p_locate___p_locate_5.0.0.tgz";
-      path = fetchurl {
-        name = "p_locate___p_locate_5.0.0.tgz";
-        url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz";
-        sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==";
-      };
-    }
-    {
-      name = "package_json_from_dist___package_json_from_dist_1.0.1.tgz";
-      path = fetchurl {
-        name = "package_json_from_dist___package_json_from_dist_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz";
-        sha512 = "UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==";
-      };
-    }
-    {
-      name = "parent_module___parent_module_1.0.1.tgz";
-      path = fetchurl {
-        name = "parent_module___parent_module_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz";
-        sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==";
-      };
-    }
-    {
-      name = "path_exists___path_exists_4.0.0.tgz";
-      path = fetchurl {
-        name = "path_exists___path_exists_4.0.0.tgz";
-        url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz";
-        sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
-      };
-    }
-    {
-      name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
-      path = fetchurl {
-        name = "path_is_absolute___path_is_absolute_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==";
-      };
-    }
-    {
-      name = "path_key___path_key_3.1.1.tgz";
-      path = fetchurl {
-        name = "path_key___path_key_3.1.1.tgz";
-        url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz";
-        sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==";
-      };
-    }
-    {
-      name = "path_parse___path_parse_1.0.7.tgz";
-      path = fetchurl {
-        name = "path_parse___path_parse_1.0.7.tgz";
-        url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz";
-        sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==";
-      };
-    }
-    {
-      name = "path_scurry___path_scurry_1.11.1.tgz";
-      path = fetchurl {
-        name = "path_scurry___path_scurry_1.11.1.tgz";
-        url = "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz";
-        sha512 = "Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==";
-      };
-    }
-    {
-      name = "path_type___path_type_4.0.0.tgz";
-      path = fetchurl {
-        name = "path_type___path_type_4.0.0.tgz";
-        url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz";
-        sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
-      };
-    }
-    {
-      name = "picocolors___picocolors_1.1.1.tgz";
-      path = fetchurl {
-        name = "picocolors___picocolors_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz";
-        sha512 = "xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==";
-      };
-    }
-    {
-      name = "picomatch___picomatch_2.3.1.tgz";
-      path = fetchurl {
-        name = "picomatch___picomatch_2.3.1.tgz";
-        url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz";
-        sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==";
-      };
-    }
-    {
-      name = "pidtree___pidtree_0.6.0.tgz";
-      path = fetchurl {
-        name = "pidtree___pidtree_0.6.0.tgz";
-        url = "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz";
-        sha512 = "eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==";
-      };
-    }
-    {
-      name = "possible_typed_array_names___possible_typed_array_names_1.1.0.tgz";
-      path = fetchurl {
-        name = "possible_typed_array_names___possible_typed_array_names_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz";
-        sha512 = "/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==";
-      };
-    }
-    {
-      name = "prelude_ls___prelude_ls_1.2.1.tgz";
-      path = fetchurl {
-        name = "prelude_ls___prelude_ls_1.2.1.tgz";
-        url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz";
-        sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==";
-      };
-    }
-    {
-      name = "prettier_eslint_cli___prettier_eslint_cli_8.0.1.tgz";
-      path = fetchurl {
-        name = "prettier_eslint_cli___prettier_eslint_cli_8.0.1.tgz";
-        url = "https://registry.yarnpkg.com/prettier-eslint-cli/-/prettier-eslint-cli-8.0.1.tgz";
-        sha512 = "jru4JUDHzWEtM/SOxqagU7hQTVP8BVrxO2J0qNauWZuPRld6Ea2eyNaEzIGx6I+yjmOLCsjNM+vU1AJgaW1ZSQ==";
-      };
-    }
-    {
-      name = "prettier___prettier_3.6.2.tgz";
-      path = fetchurl {
-        name = "prettier___prettier_3.6.2.tgz";
-        url = "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz";
-        sha512 = "I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==";
-      };
-    }
-    {
-      name = "pretty_format___pretty_format_29.7.0.tgz";
-      path = fetchurl {
-        name = "pretty_format___pretty_format_29.7.0.tgz";
-        url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz";
-        sha512 = "Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==";
-      };
-    }
-    {
-      name = "prop_types___prop_types_15.8.1.tgz";
-      path = fetchurl {
-        name = "prop_types___prop_types_15.8.1.tgz";
-        url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz";
-        sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==";
-      };
-    }
-    {
-      name = "punycode___punycode_2.3.1.tgz";
-      path = fetchurl {
-        name = "punycode___punycode_2.3.1.tgz";
-        url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz";
-        sha512 = "vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==";
-      };
-    }
-    {
-      name = "queue_microtask___queue_microtask_1.2.3.tgz";
-      path = fetchurl {
-        name = "queue_microtask___queue_microtask_1.2.3.tgz";
-        url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz";
-        sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==";
-      };
-    }
-    {
-      name = "quick_lru___quick_lru_6.1.2.tgz";
-      path = fetchurl {
-        name = "quick_lru___quick_lru_6.1.2.tgz";
-        url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-6.1.2.tgz";
-        sha512 = "AAFUA5O1d83pIHEhJwWCq/RQcRukCkn/NSm2QsTEMle5f2hP0ChI2+3Xb051PZCkLryI/Ir1MVKviT2FIloaTQ==";
-      };
-    }
-    {
-      name = "ramda___ramda_0.32.0.tgz";
-      path = fetchurl {
-        name = "ramda___ramda_0.32.0.tgz";
-        url = "https://registry.yarnpkg.com/ramda/-/ramda-0.32.0.tgz";
-        sha512 = "GQWAHhxhxWBWA8oIBr1XahFVjQ9Fic6MK9ikijfd4TZHfE2+urfk+irVlR5VOn48uwMgM+loRRBJd6Yjsbc0zQ==";
-      };
-    }
-    {
-      name = "react_is___react_is_16.13.1.tgz";
-      path = fetchurl {
-        name = "react_is___react_is_16.13.1.tgz";
-        url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz";
-        sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==";
-      };
-    }
-    {
-      name = "react_is___react_is_18.3.1.tgz";
-      path = fetchurl {
-        name = "react_is___react_is_18.3.1.tgz";
-        url = "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz";
-        sha512 = "/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==";
-      };
-    }
-    {
-      name = "reflect.getprototypeof___reflect.getprototypeof_1.0.10.tgz";
-      path = fetchurl {
-        name = "reflect.getprototypeof___reflect.getprototypeof_1.0.10.tgz";
-        url = "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz";
-        sha512 = "00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==";
-      };
-    }
-    {
-      name = "regexp.prototype.flags___regexp.prototype.flags_1.5.4.tgz";
-      path = fetchurl {
-        name = "regexp.prototype.flags___regexp.prototype.flags_1.5.4.tgz";
-        url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz";
-        sha512 = "dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==";
-      };
-    }
-    {
-      name = "regexpp___regexpp_3.2.0.tgz";
-      path = fetchurl {
-        name = "regexpp___regexpp_3.2.0.tgz";
-        url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz";
-        sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==";
-      };
-    }
-    {
-      name = "require_directory___require_directory_2.1.1.tgz";
-      path = fetchurl {
-        name = "require_directory___require_directory_2.1.1.tgz";
-        url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz";
-        sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==";
-      };
-    }
-    {
-      name = "require_relative___require_relative_0.8.7.tgz";
-      path = fetchurl {
-        name = "require_relative___require_relative_0.8.7.tgz";
-        url = "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz";
-        sha512 = "AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==";
-      };
-    }
-    {
-      name = "resolve_from___resolve_from_4.0.0.tgz";
-      path = fetchurl {
-        name = "resolve_from___resolve_from_4.0.0.tgz";
-        url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz";
-        sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==";
-      };
-    }
-    {
-      name = "resolve___resolve_1.22.11.tgz";
-      path = fetchurl {
-        name = "resolve___resolve_1.22.11.tgz";
-        url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz";
-        sha512 = "RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==";
-      };
-    }
-    {
-      name = "resolve___resolve_2.0.0_next.5.tgz";
-      path = fetchurl {
-        name = "resolve___resolve_2.0.0_next.5.tgz";
-        url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz";
-        sha512 = "U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==";
-      };
-    }
-    {
-      name = "restore_cursor___restore_cursor_5.1.0.tgz";
-      path = fetchurl {
-        name = "restore_cursor___restore_cursor_5.1.0.tgz";
-        url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-5.1.0.tgz";
-        sha512 = "oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==";
-      };
-    }
-    {
-      name = "reusify___reusify_1.1.0.tgz";
-      path = fetchurl {
-        name = "reusify___reusify_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz";
-        sha512 = "g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==";
-      };
-    }
-    {
-      name = "rfdc___rfdc_1.4.1.tgz";
-      path = fetchurl {
-        name = "rfdc___rfdc_1.4.1.tgz";
-        url = "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz";
-        sha512 = "q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==";
-      };
-    }
-    {
-      name = "rimraf___rimraf_3.0.2.tgz";
-      path = fetchurl {
-        name = "rimraf___rimraf_3.0.2.tgz";
-        url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz";
-        sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==";
-      };
-    }
-    {
-      name = "run_parallel___run_parallel_1.2.0.tgz";
-      path = fetchurl {
-        name = "run_parallel___run_parallel_1.2.0.tgz";
-        url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz";
-        sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==";
-      };
-    }
-    {
-      name = "rxjs___rxjs_7.8.2.tgz";
-      path = fetchurl {
-        name = "rxjs___rxjs_7.8.2.tgz";
-        url = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz";
-        sha512 = "dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==";
-      };
-    }
-    {
-      name = "safe_array_concat___safe_array_concat_1.1.3.tgz";
-      path = fetchurl {
-        name = "safe_array_concat___safe_array_concat_1.1.3.tgz";
-        url = "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz";
-        sha512 = "AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==";
-      };
-    }
-    {
-      name = "safe_identifier___safe_identifier_0.4.2.tgz";
-      path = fetchurl {
-        name = "safe_identifier___safe_identifier_0.4.2.tgz";
-        url = "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz";
-        sha512 = "6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==";
-      };
-    }
-    {
-      name = "safe_push_apply___safe_push_apply_1.0.0.tgz";
-      path = fetchurl {
-        name = "safe_push_apply___safe_push_apply_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz";
-        sha512 = "iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==";
-      };
-    }
-    {
-      name = "safe_regex_test___safe_regex_test_1.1.0.tgz";
-      path = fetchurl {
-        name = "safe_regex_test___safe_regex_test_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz";
-        sha512 = "x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==";
-      };
-    }
-    {
-      name = "semver___semver_6.3.1.tgz";
-      path = fetchurl {
-        name = "semver___semver_6.3.1.tgz";
-        url = "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz";
-        sha512 = "BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==";
-      };
-    }
-    {
-      name = "semver___semver_7.7.3.tgz";
-      path = fetchurl {
-        name = "semver___semver_7.7.3.tgz";
-        url = "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz";
-        sha512 = "SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==";
-      };
-    }
-    {
-      name = "set_function_length___set_function_length_1.2.2.tgz";
-      path = fetchurl {
-        name = "set_function_length___set_function_length_1.2.2.tgz";
-        url = "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz";
-        sha512 = "pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==";
-      };
-    }
-    {
-      name = "set_function_name___set_function_name_2.0.2.tgz";
-      path = fetchurl {
-        name = "set_function_name___set_function_name_2.0.2.tgz";
-        url = "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz";
-        sha512 = "7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==";
-      };
-    }
-    {
-      name = "set_proto___set_proto_1.0.0.tgz";
-      path = fetchurl {
-        name = "set_proto___set_proto_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz";
-        sha512 = "RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==";
-      };
-    }
-    {
-      name = "shebang_command___shebang_command_2.0.0.tgz";
-      path = fetchurl {
-        name = "shebang_command___shebang_command_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz";
-        sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==";
-      };
-    }
-    {
-      name = "shebang_regex___shebang_regex_3.0.0.tgz";
-      path = fetchurl {
-        name = "shebang_regex___shebang_regex_3.0.0.tgz";
-        url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz";
-        sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==";
-      };
-    }
-    {
-      name = "side_channel_list___side_channel_list_1.0.0.tgz";
-      path = fetchurl {
-        name = "side_channel_list___side_channel_list_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz";
-        sha512 = "FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==";
-      };
-    }
-    {
-      name = "side_channel_map___side_channel_map_1.0.1.tgz";
-      path = fetchurl {
-        name = "side_channel_map___side_channel_map_1.0.1.tgz";
-        url = "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz";
-        sha512 = "VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==";
-      };
-    }
-    {
-      name = "side_channel_weakmap___side_channel_weakmap_1.0.2.tgz";
-      path = fetchurl {
-        name = "side_channel_weakmap___side_channel_weakmap_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz";
-        sha512 = "WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==";
-      };
-    }
-    {
-      name = "side_channel___side_channel_1.1.0.tgz";
-      path = fetchurl {
-        name = "side_channel___side_channel_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz";
-        sha512 = "ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==";
-      };
-    }
-    {
-      name = "signal_exit___signal_exit_4.1.0.tgz";
-      path = fetchurl {
-        name = "signal_exit___signal_exit_4.1.0.tgz";
-        url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz";
-        sha512 = "bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==";
-      };
-    }
-    {
-      name = "slash___slash_3.0.0.tgz";
-      path = fetchurl {
-        name = "slash___slash_3.0.0.tgz";
-        url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz";
-        sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==";
-      };
-    }
-    {
-      name = "slice_ansi___slice_ansi_7.1.2.tgz";
-      path = fetchurl {
-        name = "slice_ansi___slice_ansi_7.1.2.tgz";
-        url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.2.tgz";
-        sha512 = "iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==";
-      };
-    }
-    {
-      name = "ssri___ssri_13.0.0.tgz";
-      path = fetchurl {
-        name = "ssri___ssri_13.0.0.tgz";
-        url = "https://registry.yarnpkg.com/ssri/-/ssri-13.0.0.tgz";
-        sha512 = "yizwGBpbCn4YomB2lzhZqrHLJoqFGXihNbib3ozhqF/cIp5ue+xSmOQrjNasEE62hFxsCcg/V/z23t4n8jMEng==";
-      };
-    }
-    {
-      name = "stop_iteration_iterator___stop_iteration_iterator_1.1.0.tgz";
-      path = fetchurl {
-        name = "stop_iteration_iterator___stop_iteration_iterator_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz";
-        sha512 = "eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==";
-      };
-    }
-    {
-      name = "string_argv___string_argv_0.3.2.tgz";
-      path = fetchurl {
-        name = "string_argv___string_argv_0.3.2.tgz";
-        url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz";
-        sha512 = "aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==";
-      };
-    }
-    {
-      name = "string_width___string_width_4.2.3.tgz";
-      path = fetchurl {
-        name = "string_width___string_width_4.2.3.tgz";
-        url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz";
-        sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==";
-      };
-    }
-    {
-      name = "string_width___string_width_5.1.2.tgz";
-      path = fetchurl {
-        name = "string_width___string_width_5.1.2.tgz";
-        url = "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz";
-        sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==";
-      };
-    }
-    {
-      name = "string_width___string_width_7.2.0.tgz";
-      path = fetchurl {
-        name = "string_width___string_width_7.2.0.tgz";
-        url = "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz";
-        sha512 = "tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==";
-      };
-    }
-    {
-      name = "string_width___string_width_8.1.0.tgz";
-      path = fetchurl {
-        name = "string_width___string_width_8.1.0.tgz";
-        url = "https://registry.yarnpkg.com/string-width/-/string-width-8.1.0.tgz";
-        sha512 = "Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==";
-      };
-    }
-    {
-      name = "string.prototype.includes___string.prototype.includes_2.0.1.tgz";
-      path = fetchurl {
-        name = "string.prototype.includes___string.prototype.includes_2.0.1.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz";
-        sha512 = "o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==";
-      };
-    }
-    {
-      name = "string.prototype.matchall___string.prototype.matchall_4.0.12.tgz";
-      path = fetchurl {
-        name = "string.prototype.matchall___string.prototype.matchall_4.0.12.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz";
-        sha512 = "6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==";
-      };
-    }
-    {
-      name = "string.prototype.repeat___string.prototype.repeat_1.0.0.tgz";
-      path = fetchurl {
-        name = "string.prototype.repeat___string.prototype.repeat_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz";
-        sha512 = "0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==";
-      };
-    }
-    {
-      name = "string.prototype.trim___string.prototype.trim_1.2.10.tgz";
-      path = fetchurl {
-        name = "string.prototype.trim___string.prototype.trim_1.2.10.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz";
-        sha512 = "Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==";
-      };
-    }
-    {
-      name = "string.prototype.trimend___string.prototype.trimend_1.0.9.tgz";
-      path = fetchurl {
-        name = "string.prototype.trimend___string.prototype.trimend_1.0.9.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz";
-        sha512 = "G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==";
-      };
-    }
-    {
-      name = "string.prototype.trimstart___string.prototype.trimstart_1.0.8.tgz";
-      path = fetchurl {
-        name = "string.prototype.trimstart___string.prototype.trimstart_1.0.8.tgz";
-        url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz";
-        sha512 = "UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==";
-      };
-    }
-    {
-      name = "strip_ansi___strip_ansi_6.0.1.tgz";
-      path = fetchurl {
-        name = "strip_ansi___strip_ansi_6.0.1.tgz";
-        url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz";
-        sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==";
-      };
-    }
-    {
-      name = "strip_ansi___strip_ansi_3.0.1.tgz";
-      path = fetchurl {
-        name = "strip_ansi___strip_ansi_3.0.1.tgz";
-        url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==";
-      };
-    }
-    {
-      name = "strip_ansi___strip_ansi_7.1.2.tgz";
-      path = fetchurl {
-        name = "strip_ansi___strip_ansi_7.1.2.tgz";
-        url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz";
-        sha512 = "gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==";
-      };
-    }
-    {
-      name = "strip_bom___strip_bom_3.0.0.tgz";
-      path = fetchurl {
-        name = "strip_bom___strip_bom_3.0.0.tgz";
-        url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz";
-        sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==";
-      };
-    }
-    {
-      name = "strip_json_comments___strip_json_comments_3.1.1.tgz";
-      path = fetchurl {
-        name = "strip_json_comments___strip_json_comments_3.1.1.tgz";
-        url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz";
-        sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==";
-      };
-    }
-    {
-      name = "supports_color___supports_color_2.0.0.tgz";
-      path = fetchurl {
-        name = "supports_color___supports_color_2.0.0.tgz";
-        url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz";
-        sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==";
-      };
-    }
-    {
-      name = "supports_color___supports_color_7.2.0.tgz";
-      path = fetchurl {
-        name = "supports_color___supports_color_7.2.0.tgz";
-        url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz";
-        sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==";
-      };
-    }
-    {
-      name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz";
-      path = fetchurl {
-        name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz";
-        url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz";
-        sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==";
-      };
-    }
-    {
-      name = "text_table___text_table_0.2.0.tgz";
-      path = fetchurl {
-        name = "text_table___text_table_0.2.0.tgz";
-        url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz";
-        sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==";
-      };
-    }
-    {
-      name = "to_regex_range___to_regex_range_5.0.1.tgz";
-      path = fetchurl {
-        name = "to_regex_range___to_regex_range_5.0.1.tgz";
-        url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz";
-        sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
-      };
-    }
-    {
-      name = "ts_api_utils___ts_api_utils_1.4.3.tgz";
-      path = fetchurl {
-        name = "ts_api_utils___ts_api_utils_1.4.3.tgz";
-        url = "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz";
-        sha512 = "i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==";
-      };
-    }
-    {
-      name = "tsconfig_paths___tsconfig_paths_3.15.0.tgz";
-      path = fetchurl {
-        name = "tsconfig_paths___tsconfig_paths_3.15.0.tgz";
-        url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz";
-        sha512 = "2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==";
-      };
-    }
-    {
-      name = "tslib___tslib_2.8.1.tgz";
-      path = fetchurl {
-        name = "tslib___tslib_2.8.1.tgz";
-        url = "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz";
-        sha512 = "oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==";
-      };
-    }
-    {
-      name = "type_check___type_check_0.4.0.tgz";
-      path = fetchurl {
-        name = "type_check___type_check_0.4.0.tgz";
-        url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz";
-        sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==";
-      };
-    }
-    {
-      name = "type_fest___type_fest_0.20.2.tgz";
-      path = fetchurl {
-        name = "type_fest___type_fest_0.20.2.tgz";
-        url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz";
-        sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==";
-      };
-    }
-    {
-      name = "type_fest___type_fest_4.41.0.tgz";
-      path = fetchurl {
-        name = "type_fest___type_fest_4.41.0.tgz";
-        url = "https://registry.yarnpkg.com/type-fest/-/type-fest-4.41.0.tgz";
-        sha512 = "TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==";
-      };
-    }
-    {
-      name = "typed_array_buffer___typed_array_buffer_1.0.3.tgz";
-      path = fetchurl {
-        name = "typed_array_buffer___typed_array_buffer_1.0.3.tgz";
-        url = "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz";
-        sha512 = "nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==";
-      };
-    }
-    {
-      name = "typed_array_byte_length___typed_array_byte_length_1.0.3.tgz";
-      path = fetchurl {
-        name = "typed_array_byte_length___typed_array_byte_length_1.0.3.tgz";
-        url = "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz";
-        sha512 = "BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==";
-      };
-    }
-    {
-      name = "typed_array_byte_offset___typed_array_byte_offset_1.0.4.tgz";
-      path = fetchurl {
-        name = "typed_array_byte_offset___typed_array_byte_offset_1.0.4.tgz";
-        url = "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz";
-        sha512 = "bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==";
-      };
-    }
-    {
-      name = "typed_array_length___typed_array_length_1.0.7.tgz";
-      path = fetchurl {
-        name = "typed_array_length___typed_array_length_1.0.7.tgz";
-        url = "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz";
-        sha512 = "3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==";
-      };
-    }
-    {
-      name = "unbox_primitive___unbox_primitive_1.1.0.tgz";
-      path = fetchurl {
-        name = "unbox_primitive___unbox_primitive_1.1.0.tgz";
-        url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz";
-        sha512 = "nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==";
-      };
-    }
-    {
-      name = "uri_js___uri_js_4.4.1.tgz";
-      path = fetchurl {
-        name = "uri_js___uri_js_4.4.1.tgz";
-        url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz";
-        sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
-      };
-    }
-    {
-      name = "vue_eslint_parser___vue_eslint_parser_9.4.3.tgz";
-      path = fetchurl {
-        name = "vue_eslint_parser___vue_eslint_parser_9.4.3.tgz";
-        url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz";
-        sha512 = "2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==";
-      };
-    }
-    {
-      name = "which_boxed_primitive___which_boxed_primitive_1.1.1.tgz";
-      path = fetchurl {
-        name = "which_boxed_primitive___which_boxed_primitive_1.1.1.tgz";
-        url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz";
-        sha512 = "TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==";
-      };
-    }
-    {
-      name = "which_builtin_type___which_builtin_type_1.2.1.tgz";
-      path = fetchurl {
-        name = "which_builtin_type___which_builtin_type_1.2.1.tgz";
-        url = "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz";
-        sha512 = "6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==";
-      };
-    }
-    {
-      name = "which_collection___which_collection_1.0.2.tgz";
-      path = fetchurl {
-        name = "which_collection___which_collection_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz";
-        sha512 = "K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==";
-      };
-    }
-    {
-      name = "which_typed_array___which_typed_array_1.1.19.tgz";
-      path = fetchurl {
-        name = "which_typed_array___which_typed_array_1.1.19.tgz";
-        url = "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz";
-        sha512 = "rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==";
-      };
-    }
-    {
-      name = "which___which_2.0.2.tgz";
-      path = fetchurl {
-        name = "which___which_2.0.2.tgz";
-        url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz";
-        sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==";
-      };
-    }
-    {
-      name = "word_wrap___word_wrap_1.2.5.tgz";
-      path = fetchurl {
-        name = "word_wrap___word_wrap_1.2.5.tgz";
-        url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz";
-        sha512 = "BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==";
-      };
-    }
-    {
-      name = "wrap_ansi___wrap_ansi_7.0.0.tgz";
-      path = fetchurl {
-        name = "wrap_ansi___wrap_ansi_7.0.0.tgz";
-        url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz";
-        sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==";
-      };
-    }
-    {
-      name = "wrap_ansi___wrap_ansi_8.1.0.tgz";
-      path = fetchurl {
-        name = "wrap_ansi___wrap_ansi_8.1.0.tgz";
-        url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz";
-        sha512 = "si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==";
-      };
-    }
-    {
-      name = "wrap_ansi___wrap_ansi_9.0.2.tgz";
-      path = fetchurl {
-        name = "wrap_ansi___wrap_ansi_9.0.2.tgz";
-        url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.2.tgz";
-        sha512 = "42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==";
-      };
-    }
-    {
-      name = "wrappy___wrappy_1.0.2.tgz";
-      path = fetchurl {
-        name = "wrappy___wrappy_1.0.2.tgz";
-        url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz";
-        sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==";
-      };
-    }
-    {
-      name = "y18n___y18n_5.0.8.tgz";
-      path = fetchurl {
-        name = "y18n___y18n_5.0.8.tgz";
-        url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz";
-        sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==";
-      };
-    }
-    {
-      name = "yaml___yaml_2.8.1.tgz";
-      path = fetchurl {
-        name = "yaml___yaml_2.8.1.tgz";
-        url = "https://registry.yarnpkg.com/yaml/-/yaml-2.8.1.tgz";
-        sha512 = "lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==";
-      };
-    }
-    {
-      name = "yargs_parser___yargs_parser_21.1.1.tgz";
-      path = fetchurl {
-        name = "yargs_parser___yargs_parser_21.1.1.tgz";
-        url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz";
-        sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==";
-      };
-    }
-    {
-      name = "yargs___yargs_17.7.2.tgz";
-      path = fetchurl {
-        name = "yargs___yargs_17.7.2.tgz";
-        url = "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz";
-        sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==";
-      };
-    }
-    {
-      name = "yocto_queue___yocto_queue_0.1.0.tgz";
-      path = fetchurl {
-        name = "yocto_queue___yocto_queue_0.1.0.tgz";
-        url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz";
-        sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==";
-      };
-    }
-  ];
-}
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/.gitignore b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/.gitignore
deleted file mode 100644
index 3c3629e647f5..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/.prettierignore b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/.prettierignore
deleted file mode 100644
index 3c3629e647f5..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/.prettierignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js
deleted file mode 100755
index 4f30de15593b..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/bin/yarn2nix.js
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require("fs");
-const lockfile = require("@yarnpkg/lockfile");
-const { docopt } = require("docopt");
-const deepEqual = require("deep-equal");
-const R = require("ramda");
-
-const fixPkgAddMissingSha1 = require("../lib/fixPkgAddMissingSha1");
-const mapObjIndexedReturnArray = require("../lib/mapObjIndexedReturnArray");
-const generateNix = require("../lib/generateNix");
-
-const USAGE = `
-Usage: yarn2nix [options]
-
-Options:
-  -h --help           Shows this help.
-  --no-nix            Hide the nix output
-  --no-patch          Don't patch the lockfile if hashes are missing
-  --lockfile=FILE     Specify path to the lockfile [default: ./yarn.lock].
-  --builtin-fetchgit  Use builtin fetchGit for git dependencies to support on-the-fly generation of yarn.nix without an internet connection
-`;
-
-const options = docopt(USAGE);
-
-const data = fs.readFileSync(options["--lockfile"], "utf8");
-
-// json example:
-
-// {
-//   type:'success',
-//   object:{
-//     'abbrev@1':{
-//       version:'1.0.9',
-//       resolved:'https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135'
-//     },
-//     'shell-quote@git+https://github.com/srghma/node-shell-quote.git#without_unlicenced_jsonify':{
-//       version:'1.6.0',
-//       resolved:'git+https://github.com/srghma/node-shell-quote.git#0aa381896e0cd7409ead15fd444f225807a61e0a'
-//     },
-//     '@graphile/plugin-supporter@git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git':{
-//       version:'1.6.0',
-//       resolved:'git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git#1234commit'
-//     },
-//   }
-// }
-
-const json = lockfile.parse(data);
-
-if (json.type !== "success") {
-  throw new Error("yarn.lock parse error");
-}
-
-// Check for missing hashes in the yarn.lock and patch if necessary
-
-let pkgs = R.pipe(
-  mapObjIndexedReturnArray((value, key) => ({
-    ...value,
-    nameWithVersion: key,
-  })),
-  R.uniqBy(R.prop("resolved")),
-)(json.object);
-
-(async () => {
-  if (!options["--no-patch"]) {
-    pkgs = await Promise.all(R.map(fixPkgAddMissingSha1, pkgs));
-  }
-
-  const origJson = lockfile.parse(data);
-
-  if (!deepEqual(origJson, json)) {
-    console.error("found changes in the lockfile", options["--lockfile"]);
-
-    if (options["--no-patch"]) {
-      console.error("...aborting");
-      process.exit(1);
-    }
-
-    fs.writeFileSync(options["--lockfile"], lockfile.stringify(json.object));
-  }
-
-  if (!options["--no-nix"]) {
-    // print to stdout
-    console.log(generateNix(pkgs, options["--builtin-fetchgit"]));
-  }
-})().catch((error) => {
-  console.error(error);
-
-  process.exit(1);
-});
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/eslint.config.mjs b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/eslint.config.mjs
deleted file mode 100644
index 8f815ceac4c5..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/eslint.config.mjs
+++ /dev/null
@@ -1,24 +0,0 @@
-import js from "@eslint/js";
-import globals from "globals";
-import { defineConfig } from "eslint/config";
-
-
-export default defineConfig([
-  { files: ["**/*.{js,mjs,cjs}"],
-    plugins: { js },
-    extends: ["js/recommended"],
-    rules: {
-      "no-unused-vars": [
-        "error",
-        {
-          "argsIgnorePattern": "^_",
-          "varsIgnorePattern": "^_",
-          "caughtErrorsIgnorePattern": "^_",
-          "destructuredArrayIgnorePattern": "^_"
-        }
-      ]
-    },
-  },
-  { files: ["**/*.js"], languageOptions: { sourceType: "commonjs" } },
-  { files: ["**/*.{js,mjs,cjs}"], languageOptions: { globals: globals.node } },
-]);
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js
deleted file mode 100644
index db085cb3f215..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/fixPkgAddMissingSha1.js
+++ /dev/null
@@ -1,64 +0,0 @@
-const https = require("https");
-const crypto = require("crypto");
-
-// TODO:
-// make test case where getSha1 function is used, i.e. the case when resolved is without sha1?
-// consider using https://github.com/request/request-promise-native
-
-function getSha1(url) {
-  return new Promise((resolve, reject) => {
-    https.get(url, (res) => {
-      const { statusCode } = res;
-      const hash = crypto.createHash("sha1");
-
-      if (statusCode !== 200) {
-        const err = new Error(`Request Failed.\nStatus Code: ${statusCode}`);
-
-        // consume response data to free up memory
-        res.resume();
-
-        reject(err);
-      }
-
-      res.on("data", (chunk) => {
-        hash.update(chunk);
-      });
-
-      res.on("end", () => {
-        resolve(hash.digest("hex"));
-      });
-
-      res.on("error", reject);
-    });
-  });
-}
-
-// Object -> Object
-async function fixPkgAddMissingSha1(pkg) {
-  // local dependency
-
-  if (!pkg.resolved) {
-    console.error(
-      `yarn2nix: can't find "resolved" field for package ${pkg.nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring`,
-    );
-    return pkg;
-  }
-
-  const [url, sha1] = pkg.resolved.split("#", 2);
-
-  if (sha1 || url.startsWith("https://codeload.github.com/")) {
-    return pkg;
-  }
-
-  // if there is no sha1 in resolved url
-  // (this could happen if yarn.lock was generated by older version of yarn)
-  // - request it from registry by https and add it to pkg
-  const newSha1 = await getSha1(url);
-
-  return {
-    ...pkg,
-    resolved: `${url}#${newSha1}`,
-  };
-}
-
-module.exports = fixPkgAddMissingSha1;
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
deleted file mode 100644
index 796b62713382..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
+++ /dev/null
@@ -1,179 +0,0 @@
-const R = require("ramda");
-const ssri = require("ssri");
-
-const urlToName = require("./urlToName");
-const { execFileSync } = require("child_process");
-
-// fetchgit transforms
-//
-// "shell-quote@git+https://github.com/srghma/node-shell-quote.git#without_unlicenced_jsonify":
-//   version "1.6.0"
-//   resolved "git+https://github.com/srghma/node-shell-quote.git#1234commit"
-//
-// to
-//
-// fetchGit {
-//   url = "https://github.com/srghma/node-shell-quote.git";
-//   ref = "without_unlicenced_jsonify";
-//   rev = "1234commit";
-// }
-//
-// and transforms
-//
-// "@graphile/plugin-supporter@git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git":
-//   version "0.6.0"
-//   resolved "git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git#1234commit"
-//
-// to
-//
-// fetchGit {
-//   url = "https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git";
-//   ref = "master";
-//   rev = "1234commit";
-// }
-
-function prefetchgit(url, rev) {
-  return JSON.parse(
-    execFileSync(
-      "nix-prefetch-git",
-      ["--rev", rev, url, "--fetch-submodules"],
-      {
-        stdio: ["ignore", "pipe", "ignore"],
-        timeout: 60000,
-      },
-    ),
-  ).sha256;
-}
-
-function fetchgit(fileName, url, rev, branch, builtinFetchGit) {
-  const repo = builtinFetchGit
-    ? `fetchGit ({
-         url = "${url}";
-         ref = "${branch}";
-         rev = "${rev}";
-       } // (if builtins.compareVersions "2.4pre" builtins.nixVersion < 0 then {
-         # workaround for https://github.com/NixOS/nix/issues/5128
-         allRefs = true;
-       } else {}))`
-    : `fetchgit {
-         url = "${url}";
-         rev = "${rev}";
-         sha256 = "${prefetchgit(url, rev)}";
-       }`;
-
-  return `    {
-    name = "${fileName}";
-    path =
-      let repo = ${repo};
-      in runCommand "${fileName}" { buildInputs = [gnutar]; } ''
-        # Set u+w because tar-fs can't unpack archives with read-only dirs
-        # https://github.com/mafintosh/tar-fs/issues/79
-        tar cf $out --mode u+w -C \${repo} .
-      '';
-  }`;
-}
-
-/**
- * Parse an integrity hash out of an SSRI string.
- *
- * Provides a default and uses the "best" supported algorithm if there are multiple.
- */
-function parseIntegrity(maybeIntegrity, fallbackHash) {
-  if (!maybeIntegrity && fallbackHash) {
-    return { algo: "sha1", hash: fallbackHash };
-  }
-
-  const integrities = ssri.parse(maybeIntegrity);
-  for (const key in integrities) {
-    if (!/^sha(1|256|512)$/.test(key)) {
-      delete integrities[key];
-    }
-  }
-
-  const algo = integrities.pickAlgorithm();
-  const hash = integrities[algo][0].digest;
-  return { algo, hash };
-}
-
-function fetchLockedDep(builtinFetchGit) {
-  return function (pkg) {
-    const { integrity, nameWithVersion, resolved } = pkg;
-
-    if (!resolved) {
-      console.error(
-        `yarn2nix: can't find "resolved" field for package ${nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring`,
-      );
-      return "";
-    }
-
-    const [url, sha1OrRev] = resolved.split("#");
-
-    const fileName = urlToName(url);
-
-    if (resolved.startsWith("https://codeload.github.com/")) {
-      const s = resolved.split("/");
-      const githubUrl = `https://github.com/${s[3]}/${s[4]}.git`;
-      const githubRev = s[6];
-
-      const [_, branch] = nameWithVersion.split("#");
-
-      return fetchgit(
-        fileName,
-        githubUrl,
-        githubRev,
-        branch || "master",
-        builtinFetchGit,
-      );
-    }
-
-    if (url.startsWith("git+") || url.startsWith("git:")) {
-      const rev = sha1OrRev;
-
-      const [_, branch] = nameWithVersion.split("#");
-
-      const urlForGit = url.replace(/^git\+/, "");
-
-      return fetchgit(
-        fileName,
-        urlForGit,
-        rev,
-        branch || "master",
-        builtinFetchGit,
-      );
-    }
-
-    const { algo, hash } = parseIntegrity(integrity, sha1OrRev);
-
-    return `    {
-      name = "${fileName}";
-      path = fetchurl {
-        name = "${fileName}";
-        url  = "${url}";
-        ${algo} = "${hash}";
-      };
-    }`;
-  };
-}
-
-const HEAD = `
-{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
-  offline_cache = linkFarm "offline" packages;
-  packages = [
-`.trim();
-
-// Object -> String
-function generateNix(pkgs, builtinFetchGit) {
-  const nameWithVersionAndPackageNix = R.map(
-    fetchLockedDep(builtinFetchGit),
-    pkgs,
-  );
-
-  const packagesDefinition = R.join(
-    "\n",
-    R.values(nameWithVersionAndPackageNix),
-  );
-
-  return R.join("\n", [HEAD, packagesDefinition, "  ];", "}"]);
-}
-
-module.exports = generateNix;
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js
deleted file mode 100644
index 1ab138b7452a..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/mapObjIndexedReturnArray.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const _curry2 = require("ramda/src/internal/_curry2");
-const _map = require("ramda/src/internal/_map");
-const keys = require("ramda/src/keys");
-
-// mapObjIndexed: ((v, k, {k: v}) → v') → {k: v} → {k: v'}
-// mapObjIndexedReturnArray: ((v, k, {k: v}) → v') → {k: v} → [v']
-
-/*
- * @example
- *
- *      const xyz = { x: 1, y: 2, z: 3 };
- *      const prependKeyAndDouble = (num, key, obj) => key + (num * 2);
- *
- *      mapObjIndexedReturnArray(prependKeyAndDouble, xyz); //=> ['x2', 'y4', 'z6']
- */
-
-const mapObjIndexedReturnArray = _curry2((fn, obj) =>
-  _map((key) => fn(obj[key], key, obj), keys(obj)),
-);
-
-module.exports = mapObjIndexedReturnArray;
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js
deleted file mode 100644
index 2228e4eb487a..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const path = require("path");
-
-// String -> String
-
-// @url examples:
-// - https://registry.yarnpkg.com/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz
-// - https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz
-// - git+https://github.com/srghma/node-shell-quote.git
-// - git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git
-// - https://codeload.github.com/Gargron/emoji-mart/tar.gz/934f314fd8322276765066e8a2a6be5bac61b1cf
-
-function urlToName(url) {
-  // Yarn generates `codeload.github.com` tarball URLs, where the final
-  // path component (file name) is the git hash. See #111.
-  // See also https://github.com/yarnpkg/yarn/blob/989a7406/src/resolvers/exotics/github-resolver.js#L24-L26
-  let isCodeloadGitTarballUrl =
-    url.startsWith("https://codeload.github.com/") && url.includes("/tar.gz/");
-
-  if (url.startsWith("git+") || isCodeloadGitTarballUrl) {
-    return path.basename(url);
-  }
-
-  return url
-    .replace(/https:\/\/(.)*(.com)\//g, "") // prevents having long directory names
-    .replace(/[@/%:-]/g, "_"); // replace @ and : and - and % characters with underscore
-}
-
-module.exports = urlToName;
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json
deleted file mode 100644
index 02085f39b604..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/package.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "name": "yarn2nix",
-  "version": "1.0.0",
-  "description": "Convert packages.json and yarn.lock into a Nix expression that downloads all the dependencies",
-  "main": "index.js",
-  "repository": ".",
-  "author": "Maarten Hoogendoorn <maarten@moretea.nl>",
-  "license": "MIT",
-  "scripts": {
-    "yarn2nix": "bin/yarn2nix.js",
-    "format": "prettier-eslint --write './**/*.{js,jsx,json}'",
-    "lint": "eslint ."
-  },
-  "bin": {
-    "yarn2nix": "bin/yarn2nix.js"
-  },
-  "engines": {
-    "node": ">=22.0.0"
-  },
-  "dependencies": {
-    "@yarnpkg/lockfile": "^1.1.0",
-    "deep-equal": "^2.2.3",
-    "docopt": "^0.6.2",
-    "ramda": "^0.32",
-    "ssri": "^13.0.0"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.39.1",
-    "babel-eslint": "^10.0.1",
-    "eslint": "^9.39.1",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jsx-a11y": "^6.1.2",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^7.2.1",
-    "eslint-plugin-react": "^7.12.2",
-    "globals": "^16.5.0",
-    "husky": "^9.1.7",
-    "lint-staged": "^16.2.7",
-    "prettier-eslint-cli": "^8.0.1"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  }
-}
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock
deleted file mode 100644
index b4690c0d3dac..000000000000
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock
+++ /dev/null
@@ -1,3229 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be"
-  integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.27.1"
-    js-tokens "^4.0.0"
-    picocolors "^1.1.1"
-
-"@babel/generator@^7.28.5":
-  version "7.28.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz#712722d5e50f44d07bc7ac9fe84438742dd61298"
-  integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==
-  dependencies:
-    "@babel/parser" "^7.28.5"
-    "@babel/types" "^7.28.5"
-    "@jridgewell/gen-mapping" "^0.3.12"
-    "@jridgewell/trace-mapping" "^0.3.28"
-    jsesc "^3.0.2"
-
-"@babel/helper-globals@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
-  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
-
-"@babel/helper-string-parser@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
-  integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
-
-"@babel/helper-validator-identifier@^7.27.1", "@babel/helper-validator-identifier@^7.28.5":
-  version "7.28.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
-  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
-
-"@babel/parser@^7.27.2", "@babel/parser@^7.28.5", "@babel/parser@^7.7.0":
-  version "7.28.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08"
-  integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==
-  dependencies:
-    "@babel/types" "^7.28.5"
-
-"@babel/template@^7.27.2":
-  version "7.27.2"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
-  integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
-  dependencies:
-    "@babel/code-frame" "^7.27.1"
-    "@babel/parser" "^7.27.2"
-    "@babel/types" "^7.27.1"
-
-"@babel/traverse@^7.7.0":
-  version "7.28.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
-  integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
-  dependencies:
-    "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.28.5"
-    "@babel/helper-globals" "^7.28.0"
-    "@babel/parser" "^7.28.5"
-    "@babel/template" "^7.27.2"
-    "@babel/types" "^7.28.5"
-    debug "^4.3.1"
-
-"@babel/types@^7.27.1", "@babel/types@^7.28.5", "@babel/types@^7.7.0":
-  version "7.28.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b"
-  integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.28.5"
-
-"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0", "@eslint-community/eslint-utils@^4.8.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz#7308df158e064f0dd8b8fdb58aa14fa2a7f913b3"
-  integrity sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==
-  dependencies:
-    eslint-visitor-keys "^3.4.3"
-
-"@eslint-community/regexpp@^4.12.1", "@eslint-community/regexpp@^4.6.1":
-  version "4.12.2"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b"
-  integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==
-
-"@eslint/config-array@^0.21.1":
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.21.1.tgz#7d1b0060fea407f8301e932492ba8c18aff29713"
-  integrity sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==
-  dependencies:
-    "@eslint/object-schema" "^2.1.7"
-    debug "^4.3.1"
-    minimatch "^3.1.2"
-
-"@eslint/config-helpers@^0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.4.2.tgz#1bd006ceeb7e2e55b2b773ab318d300e1a66aeda"
-  integrity sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==
-  dependencies:
-    "@eslint/core" "^0.17.0"
-
-"@eslint/core@^0.17.0":
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.17.0.tgz#77225820413d9617509da9342190a2019e78761c"
-  integrity sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==
-  dependencies:
-    "@types/json-schema" "^7.0.15"
-
-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
-"@eslint/eslintrc@^3.3.1":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.1.tgz#e55f7f1dd400600dd066dbba349c4c0bac916964"
-  integrity sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^10.0.1"
-    globals "^14.0.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
-"@eslint/js@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
-  integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
-
-"@eslint/js@9.39.1", "@eslint/js@^9.39.1":
-  version "9.39.1"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.39.1.tgz#0dd59c3a9f40e3f1882975c321470969243e0164"
-  integrity sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==
-
-"@eslint/object-schema@^2.1.7":
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.7.tgz#6e2126a1347e86a4dedf8706ec67ff8e107ebbad"
-  integrity sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==
-
-"@eslint/plugin-kit@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz#9779e3fd9b7ee33571a57435cf4335a1794a6cb2"
-  integrity sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==
-  dependencies:
-    "@eslint/core" "^0.17.0"
-    levn "^0.4.1"
-
-"@humanfs/core@^0.19.1":
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
-  integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
-
-"@humanfs/node@^0.16.6":
-  version "0.16.7"
-  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.7.tgz#822cb7b3a12c5a240a24f621b5a2413e27a45f26"
-  integrity sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==
-  dependencies:
-    "@humanfs/core" "^0.19.1"
-    "@humanwhocodes/retry" "^0.4.0"
-
-"@humanwhocodes/config-array@^0.13.0":
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
-  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
-  dependencies:
-    "@humanwhocodes/object-schema" "^2.0.3"
-    debug "^4.3.1"
-    minimatch "^3.0.5"
-
-"@humanwhocodes/module-importer@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
-  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-
-"@humanwhocodes/object-schema@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
-  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
-
-"@humanwhocodes/retry@^0.4.0", "@humanwhocodes/retry@^0.4.2":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.3.tgz#c2b9d2e374ee62c586d3adbea87199b1d7a7a6ba"
-  integrity sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==
-
-"@isaacs/cliui@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
-  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
-  dependencies:
-    string-width "^5.1.2"
-    string-width-cjs "npm:string-width@^4.2.0"
-    strip-ansi "^7.0.1"
-    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
-    wrap-ansi "^8.1.0"
-    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
-"@jest/schemas@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
-  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
-  dependencies:
-    "@sinclair/typebox" "^0.27.8"
-
-"@jridgewell/gen-mapping@^0.3.12":
-  version "0.3.13"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
-  integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==
-  dependencies:
-    "@jridgewell/sourcemap-codec" "^1.5.0"
-    "@jridgewell/trace-mapping" "^0.3.24"
-
-"@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
-  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
-
-"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
-  integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
-
-"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.28":
-  version "0.3.31"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
-  integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.1.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-
-"@messageformat/core@^3.2.0":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@messageformat/core/-/core-3.4.0.tgz#2814c23383dec7bddf535d54f2a03e410165ca9f"
-  integrity sha512-NgCFubFFIdMWJGN5WuQhHCNmzk7QgiVfrViFxcS99j7F5dDS5EP6raR54I+2ydhe4+5/XTn/YIEppFaqqVWHsw==
-  dependencies:
-    "@messageformat/date-skeleton" "^1.0.0"
-    "@messageformat/number-skeleton" "^1.0.0"
-    "@messageformat/parser" "^5.1.0"
-    "@messageformat/runtime" "^3.0.1"
-    make-plural "^7.0.0"
-    safe-identifier "^0.4.1"
-
-"@messageformat/date-skeleton@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@messageformat/date-skeleton/-/date-skeleton-1.1.0.tgz#3bad068cbf5873d14592cfc7a73dd4d8615e2739"
-  integrity sha512-rmGAfB1tIPER+gh3p/RgA+PVeRE/gxuQ2w4snFWPF5xtb5mbWR7Cbw7wCOftcUypbD6HVoxrVdyyghPm3WzP5A==
-
-"@messageformat/number-skeleton@^1.0.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@messageformat/number-skeleton/-/number-skeleton-1.2.0.tgz#e7c245c41a1b2722bc59dad68f4d454f761bc9b4"
-  integrity sha512-xsgwcL7J7WhlHJ3RNbaVgssaIwcEyFkBqxHdcdaiJzwTZAWEOD8BuUFxnxV9k5S0qHN3v/KzUpq0IUpjH1seRg==
-
-"@messageformat/parser@^5.1.0":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@messageformat/parser/-/parser-5.1.1.tgz#ca7d6c18e9f3f6b6bc984a465dac16da00106055"
-  integrity sha512-3p0YRGCcTUCYvBKLIxtDDyrJ0YijGIwrTRu1DT8gIviIDZru8H23+FkY6MJBzM1n9n20CiM4VeDYuBsrrwnLjg==
-  dependencies:
-    moo "^0.5.1"
-
-"@messageformat/runtime@^3.0.1":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@messageformat/runtime/-/runtime-3.0.2.tgz#7186cd772c55298cb5d2f2ec402af266db06af15"
-  integrity sha512-dkIPDCjXcfhSHgNE1/qV6TeczQZR59Yx0xXeafVKgK3QVWoxc38ljwpksUpnzCGvN151KUbCJTDZVmahtf1YZw==
-  dependencies:
-    make-plural "^7.0.0"
-
-"@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.5"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-
-"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.5"
-    fastq "^1.6.0"
-
-"@pkgjs/parseargs@^0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
-  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
-
-"@prettier/eslint@npm:prettier-eslint@^16.1.0":
-  version "16.4.2"
-  resolved "https://registry.yarnpkg.com/prettier-eslint/-/prettier-eslint-16.4.2.tgz#d84bff76e0ce4a6ffccacacb2474f7635ca8ac35"
-  integrity sha512-vtJAQEkaN8fW5QKl08t7A5KCjlZuDUNeIlr9hgolMS5s3+uzbfRHDwaRnzrdqnY2YpHDmeDS/8zY0MKQHXJtaA==
-  dependencies:
-    "@typescript-eslint/parser" "^6.21.0"
-    common-tags "^1.8.2"
-    dlv "^1.1.3"
-    eslint "^8.57.1"
-    indent-string "^4.0.0"
-    lodash.merge "^4.6.2"
-    loglevel-colored-level-prefix "^1.0.0"
-    prettier "^3.5.3"
-    pretty-format "^29.7.0"
-    require-relative "^0.8.7"
-    tslib "^2.8.1"
-    vue-eslint-parser "^9.4.3"
-
-"@rtsao/scc@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
-  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
-
-"@sinclair/typebox@^0.27.8":
-  version "0.27.8"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
-  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
-
-"@types/estree@^1.0.6":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
-  integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
-
-"@types/json-schema@^7.0.15":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
-
-"@types/json5@^0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
-
-"@typescript-eslint/parser@^6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
-  integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
-    debug "^4.3.4"
-
-"@typescript-eslint/scope-manager@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
-  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
-
-"@typescript-eslint/types@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
-  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
-
-"@typescript-eslint/typescript-estree@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
-  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/visitor-keys@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
-  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
-  dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    eslint-visitor-keys "^3.4.1"
-
-"@ungap/structured-clone@^1.2.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
-  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
-
-"@yarnpkg/lockfile@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
-  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
-
-acorn-jsx@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn@^8.15.0, acorn@^8.9.0:
-  version "8.15.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
-  integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
-
-ajv@^6.12.4:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-escapes@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.2.0.tgz#31b25afa3edd3efc09d98c2fee831d460ff06b49"
-  integrity sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==
-  dependencies:
-    environment "^1.0.0"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-regex@^6.0.1:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
-  integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
-
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-ansi-styles@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
-  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-
-ansi-styles@^6.1.0, ansi-styles@^6.2.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
-  integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-aria-query@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.2.tgz#93f81a43480e33a338f19163a3d10a50c01dcd59"
-  integrity sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==
-
-array-buffer-byte-length@^1.0.0, array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b"
-  integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==
-  dependencies:
-    call-bound "^1.0.3"
-    is-array-buffer "^3.0.5"
-
-array-includes@^3.1.6, array-includes@^3.1.8, array-includes@^3.1.9:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.9.tgz#1f0ccaa08e90cdbc3eb433210f903ad0f17c3f3a"
-  integrity sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    define-properties "^1.2.1"
-    es-abstract "^1.24.0"
-    es-object-atoms "^1.1.1"
-    get-intrinsic "^1.3.0"
-    is-string "^1.1.1"
-    math-intrinsics "^1.1.0"
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array.prototype.findlast@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904"
-  integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    es-shim-unscopables "^1.0.2"
-
-array.prototype.findlastindex@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz#cfa1065c81dcb64e34557c9b81d012f6a421c564"
-  integrity sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.9"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
-    es-shim-unscopables "^1.1.0"
-
-array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5"
-  integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==
-  dependencies:
-    call-bind "^1.0.8"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.5"
-    es-shim-unscopables "^1.0.2"
-
-array.prototype.flatmap@^1.3.2, array.prototype.flatmap@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b"
-  integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==
-  dependencies:
-    call-bind "^1.0.8"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.5"
-    es-shim-unscopables "^1.0.2"
-
-array.prototype.tosorted@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
-  integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.3"
-    es-errors "^1.3.0"
-    es-shim-unscopables "^1.0.2"
-
-arraybuffer.prototype.slice@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c"
-  integrity sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==
-  dependencies:
-    array-buffer-byte-length "^1.0.1"
-    call-bind "^1.0.8"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.5"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.6"
-    is-array-buffer "^3.0.4"
-
-arrify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
-  integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
-
-ast-types-flow@^0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz#0a85e1c92695769ac13a428bb653e7538bea27d6"
-  integrity sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==
-
-async-function@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
-  integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
-
-available-typed-arrays@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
-  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
-  dependencies:
-    possible-typed-array-names "^1.0.0"
-
-axe-core@^4.10.0:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.11.0.tgz#16f74d6482e343ff263d4f4503829e9ee91a86b6"
-  integrity sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==
-
-axobject-query@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"
-  integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==
-
-babel-eslint@^10.0.1:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
-  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
-    eslint-visitor-keys "^1.0.0"
-    resolve "^1.12.0"
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-boolify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/boolify/-/boolify-1.0.1.tgz#b5c09e17cacd113d11b7bb3ed384cc012994d86b"
-  integrity sha512-ma2q0Tc760dW54CdOyJjhrg/a54317o1zYADQJFgperNGKIKgAUGIcKnuMiff8z57+yGlrGNEt4lPgZfCgTJgA==
-
-brace-expansion@^1.1.7:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
-  integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace-expansion@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
-  integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==
-  dependencies:
-    balanced-match "^1.0.0"
-
-braces@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
-  dependencies:
-    fill-range "^7.1.1"
-
-call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
-  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
-  dependencies:
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-
-call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.7, call-bind@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
-  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
-  dependencies:
-    call-bind-apply-helpers "^1.0.0"
-    es-define-property "^1.0.0"
-    get-intrinsic "^1.2.4"
-    set-function-length "^1.2.2"
-
-call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
-  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
-  dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    get-intrinsic "^1.3.0"
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-camelcase-keys@^9.1.0:
-  version "9.1.3"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-9.1.3.tgz#6367b2f9ec5724af541f58f0dcfee9b200022e5c"
-  integrity sha512-Rircqi9ch8AnZscQcsA1C47NFdaO3wukpmIRzYcDOrmvgt78hM/sj5pZhZNec2NM12uk5vTwRHZ4anGcrC4ZTg==
-  dependencies:
-    camelcase "^8.0.0"
-    map-obj "5.0.0"
-    quick-lru "^6.1.1"
-    type-fest "^4.3.2"
-
-camelcase@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-8.0.0.tgz#c0d36d418753fb6ad9c5e0437579745c1c14a534"
-  integrity sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==
-
-chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^4.0.0, chalk@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-cli-cursor@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz#24a4831ecf5a6b01ddeb32fb71a4b2088b0dce38"
-  integrity sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==
-  dependencies:
-    restore-cursor "^5.0.0"
-
-cli-truncate@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-5.1.1.tgz#455476face9904d94b7d11e98d9adbca15292ea5"
-  integrity sha512-SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==
-  dependencies:
-    slice-ansi "^7.1.0"
-    string-width "^8.0.0"
-
-cliui@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
-  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.1"
-    wrap-ansi "^7.0.0"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-colorette@^2.0.20:
-  version "2.0.20"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
-  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
-
-commander@^14.0.2:
-  version "14.0.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.2.tgz#b71fd37fe4069e4c3c7c13925252ada4eba14e8e"
-  integrity sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==
-
-common-tags@^1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
-  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-confusing-browser-globals@^1.0.10:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
-  integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
-
-core-js@^3.33.0:
-  version "3.47.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.47.0.tgz#436ef07650e191afeb84c24481b298bd60eb4a17"
-  integrity sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==
-
-cross-spawn@^7.0.2, cross-spawn@^7.0.6:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
-  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
-damerau-levenshtein@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
-  integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
-
-data-view-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570"
-  integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==
-  dependencies:
-    call-bound "^1.0.3"
-    es-errors "^1.3.0"
-    is-data-view "^1.0.2"
-
-data-view-byte-length@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735"
-  integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==
-  dependencies:
-    call-bound "^1.0.3"
-    es-errors "^1.3.0"
-    is-data-view "^1.0.2"
-
-data-view-byte-offset@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191"
-  integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    is-data-view "^1.0.1"
-
-debug@^3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
-  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
-  dependencies:
-    ms "^2.1.3"
-
-deep-equal@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.3.tgz#af89dafb23a396c7da3e862abc0be27cf51d56e1"
-  integrity sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==
-  dependencies:
-    array-buffer-byte-length "^1.0.0"
-    call-bind "^1.0.5"
-    es-get-iterator "^1.1.3"
-    get-intrinsic "^1.2.2"
-    is-arguments "^1.1.1"
-    is-array-buffer "^3.0.2"
-    is-date-object "^1.0.5"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    isarray "^2.0.5"
-    object-is "^1.1.5"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.5.1"
-    side-channel "^1.0.4"
-    which-boxed-primitive "^1.0.2"
-    which-collection "^1.0.1"
-    which-typed-array "^1.1.13"
-
-deep-is@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
-  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
-
-define-data-property@^1.0.1, define-data-property@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
-  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    gopd "^1.0.1"
-
-define-properties@^1.1.3, define-properties@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
-  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
-  dependencies:
-    define-data-property "^1.0.1"
-    has-property-descriptors "^1.0.0"
-    object-keys "^1.1.1"
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-dlv@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
-  integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
-
-docopt@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz#b28e9e2220da5ec49f7ea5bb24a47787405eeb11"
-  integrity sha512-NqTbaYeE4gA/wU1hdKFdU+AFahpDOpgGLzHP42k6H6DKExJd0A55KEVWYhL9FEmHmgeLvEU2vuKXDuU+4yToOw==
-
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
-dunder-proto@^1.0.0, dunder-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
-  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
-  dependencies:
-    call-bind-apply-helpers "^1.0.1"
-    es-errors "^1.3.0"
-    gopd "^1.2.0"
-
-eastasianwidth@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
-  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
-emoji-regex@^10.3.0:
-  version "10.6.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.6.0.tgz#bf3d6e8f7f8fd22a65d9703475bc0147357a6b0d"
-  integrity sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-emoji-regex@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
-  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
-environment@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/environment/-/environment-1.1.0.tgz#8e86c66b180f363c7ab311787e0259665f45a9f1"
-  integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==
-
-es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9, es-abstract@^1.24.0:
-  version "1.24.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.0.tgz#c44732d2beb0acc1ed60df840869e3106e7af328"
-  integrity sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==
-  dependencies:
-    array-buffer-byte-length "^1.0.2"
-    arraybuffer.prototype.slice "^1.0.4"
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    data-view-buffer "^1.0.2"
-    data-view-byte-length "^1.0.2"
-    data-view-byte-offset "^1.0.1"
-    es-define-property "^1.0.1"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
-    es-set-tostringtag "^2.1.0"
-    es-to-primitive "^1.3.0"
-    function.prototype.name "^1.1.8"
-    get-intrinsic "^1.3.0"
-    get-proto "^1.0.1"
-    get-symbol-description "^1.1.0"
-    globalthis "^1.0.4"
-    gopd "^1.2.0"
-    has-property-descriptors "^1.0.2"
-    has-proto "^1.2.0"
-    has-symbols "^1.1.0"
-    hasown "^2.0.2"
-    internal-slot "^1.1.0"
-    is-array-buffer "^3.0.5"
-    is-callable "^1.2.7"
-    is-data-view "^1.0.2"
-    is-negative-zero "^2.0.3"
-    is-regex "^1.2.1"
-    is-set "^2.0.3"
-    is-shared-array-buffer "^1.0.4"
-    is-string "^1.1.1"
-    is-typed-array "^1.1.15"
-    is-weakref "^1.1.1"
-    math-intrinsics "^1.1.0"
-    object-inspect "^1.13.4"
-    object-keys "^1.1.1"
-    object.assign "^4.1.7"
-    own-keys "^1.0.1"
-    regexp.prototype.flags "^1.5.4"
-    safe-array-concat "^1.1.3"
-    safe-push-apply "^1.0.0"
-    safe-regex-test "^1.1.0"
-    set-proto "^1.0.0"
-    stop-iteration-iterator "^1.1.0"
-    string.prototype.trim "^1.2.10"
-    string.prototype.trimend "^1.0.9"
-    string.prototype.trimstart "^1.0.8"
-    typed-array-buffer "^1.0.3"
-    typed-array-byte-length "^1.0.3"
-    typed-array-byte-offset "^1.0.4"
-    typed-array-length "^1.0.7"
-    unbox-primitive "^1.1.0"
-    which-typed-array "^1.1.19"
-
-es-define-property@^1.0.0, es-define-property@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
-  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
-
-es-errors@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
-
-es-get-iterator@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6"
-  integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    has-symbols "^1.0.3"
-    is-arguments "^1.1.1"
-    is-map "^2.0.2"
-    is-set "^2.0.2"
-    is-string "^1.0.7"
-    isarray "^2.0.5"
-    stop-iteration-iterator "^1.0.0"
-
-es-iterator-helpers@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz#d1dd0f58129054c0ad922e6a9a1e65eef435fe75"
-  integrity sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.6"
-    es-errors "^1.3.0"
-    es-set-tostringtag "^2.0.3"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.6"
-    globalthis "^1.0.4"
-    gopd "^1.2.0"
-    has-property-descriptors "^1.0.2"
-    has-proto "^1.2.0"
-    has-symbols "^1.1.0"
-    internal-slot "^1.1.0"
-    iterator.prototype "^1.1.4"
-    safe-array-concat "^1.1.3"
-
-es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
-  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
-  dependencies:
-    es-errors "^1.3.0"
-
-es-set-tostringtag@^2.0.3, es-set-tostringtag@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
-  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
-  dependencies:
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.6"
-    has-tostringtag "^1.0.2"
-    hasown "^2.0.2"
-
-es-shim-unscopables@^1.0.2, es-shim-unscopables@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz#438df35520dac5d105f3943d927549ea3b00f4b5"
-  integrity sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==
-  dependencies:
-    hasown "^2.0.2"
-
-es-to-primitive@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18"
-  integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==
-  dependencies:
-    is-callable "^1.2.7"
-    is-date-object "^1.0.5"
-    is-symbol "^1.0.4"
-
-escalade@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
-  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
-
-escape-string-regexp@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
-eslint-config-airbnb-base@^15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
-  integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==
-  dependencies:
-    confusing-browser-globals "^1.0.10"
-    object.assign "^4.1.2"
-    object.entries "^1.1.5"
-    semver "^6.3.0"
-
-eslint-config-airbnb@^19.0.4:
-  version "19.0.4"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz#84d4c3490ad70a0ffa571138ebcdea6ab085fdc3"
-  integrity sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==
-  dependencies:
-    eslint-config-airbnb-base "^15.0.0"
-    object.assign "^4.1.2"
-    object.entries "^1.1.5"
-
-eslint-config-prettier@^10.1.8:
-  version "10.1.8"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz#15734ce4af8c2778cc32f0b01b37b0b5cd1ecb97"
-  integrity sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==
-
-eslint-config-standard@^17.1.0:
-  version "17.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz#40ffb8595d47a6b242e07cbfd49dc211ed128975"
-  integrity sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==
-
-eslint-import-resolver-node@^0.3.9:
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
-  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
-  dependencies:
-    debug "^3.2.7"
-    is-core-module "^2.13.0"
-    resolve "^1.22.4"
-
-eslint-module-utils@^2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz#f76d3220bfb83c057651359295ab5854eaad75ff"
-  integrity sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==
-  dependencies:
-    debug "^3.2.7"
-
-eslint-plugin-es@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893"
-  integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==
-  dependencies:
-    eslint-utils "^2.0.0"
-    regexpp "^3.0.0"
-
-eslint-plugin-import@^2.14.0:
-  version "2.32.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz#602b55faa6e4caeaa5e970c198b5c00a37708980"
-  integrity sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==
-  dependencies:
-    "@rtsao/scc" "^1.1.0"
-    array-includes "^3.1.9"
-    array.prototype.findlastindex "^1.2.6"
-    array.prototype.flat "^1.3.3"
-    array.prototype.flatmap "^1.3.3"
-    debug "^3.2.7"
-    doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.9"
-    eslint-module-utils "^2.12.1"
-    hasown "^2.0.2"
-    is-core-module "^2.16.1"
-    is-glob "^4.0.3"
-    minimatch "^3.1.2"
-    object.fromentries "^2.0.8"
-    object.groupby "^1.0.3"
-    object.values "^1.2.1"
-    semver "^6.3.1"
-    string.prototype.trimend "^1.0.9"
-    tsconfig-paths "^3.15.0"
-
-eslint-plugin-jsx-a11y@^6.1.2:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz#d2812bb23bf1ab4665f1718ea442e8372e638483"
-  integrity sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==
-  dependencies:
-    aria-query "^5.3.2"
-    array-includes "^3.1.8"
-    array.prototype.flatmap "^1.3.2"
-    ast-types-flow "^0.0.8"
-    axe-core "^4.10.0"
-    axobject-query "^4.1.0"
-    damerau-levenshtein "^1.0.8"
-    emoji-regex "^9.2.2"
-    hasown "^2.0.2"
-    jsx-ast-utils "^3.3.5"
-    language-tags "^1.0.9"
-    minimatch "^3.1.2"
-    object.fromentries "^2.0.8"
-    safe-regex-test "^1.0.3"
-    string.prototype.includes "^2.0.1"
-
-eslint-plugin-node@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
-  integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==
-  dependencies:
-    eslint-plugin-es "^3.0.0"
-    eslint-utils "^2.0.0"
-    ignore "^5.1.1"
-    minimatch "^3.0.4"
-    resolve "^1.10.1"
-    semver "^6.1.0"
-
-eslint-plugin-promise@^7.2.1:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-7.2.1.tgz#a0652195700aea40b926dc3c74b38e373377bfb0"
-  integrity sha512-SWKjd+EuvWkYaS+uN2csvj0KoP43YTu7+phKQ5v+xw6+A0gutVX2yqCeCkC3uLCJFiPfR2dD8Es5L7yUsmvEaA==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-
-eslint-plugin-react@^7.12.2:
-  version "7.37.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz#2975511472bdda1b272b34d779335c9b0e877065"
-  integrity sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==
-  dependencies:
-    array-includes "^3.1.8"
-    array.prototype.findlast "^1.2.5"
-    array.prototype.flatmap "^1.3.3"
-    array.prototype.tosorted "^1.1.4"
-    doctrine "^2.1.0"
-    es-iterator-helpers "^1.2.1"
-    estraverse "^5.3.0"
-    hasown "^2.0.2"
-    jsx-ast-utils "^2.4.1 || ^3.0.0"
-    minimatch "^3.1.2"
-    object.entries "^1.1.9"
-    object.fromentries "^2.0.8"
-    object.values "^1.2.1"
-    prop-types "^15.8.1"
-    resolve "^2.0.0-next.5"
-    semver "^6.3.1"
-    string.prototype.matchall "^4.0.12"
-    string.prototype.repeat "^1.0.0"
-
-eslint-scope@^7.1.1, eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
-
-eslint-scope@^8.4.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.4.0.tgz#88e646a207fad61436ffa39eb505147200655c82"
-  integrity sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
-
-eslint-utils@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
-  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
-
-eslint-visitor-keys@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
-  integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
-
-eslint@^8.51.0, eslint@^8.57.1:
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
-  integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.1"
-    "@humanwhocodes/config-array" "^0.13.0"
-    "@humanwhocodes/module-importer" "^1.0.1"
-    "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
-    ajv "^6.12.4"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
-    doctrine "^3.0.0"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
-    esquery "^1.4.2"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    find-up "^5.0.0"
-    glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
-    ignore "^5.2.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.3"
-    strip-ansi "^6.0.1"
-    text-table "^0.2.0"
-
-eslint@^9.39.1:
-  version "9.39.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.39.1.tgz#be8bf7c6de77dcc4252b5a8dcb31c2efff74a6e5"
-  integrity sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.8.0"
-    "@eslint-community/regexpp" "^4.12.1"
-    "@eslint/config-array" "^0.21.1"
-    "@eslint/config-helpers" "^0.4.2"
-    "@eslint/core" "^0.17.0"
-    "@eslint/eslintrc" "^3.3.1"
-    "@eslint/js" "9.39.1"
-    "@eslint/plugin-kit" "^0.4.1"
-    "@humanfs/node" "^0.16.6"
-    "@humanwhocodes/module-importer" "^1.0.1"
-    "@humanwhocodes/retry" "^0.4.2"
-    "@types/estree" "^1.0.6"
-    ajv "^6.12.4"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.6"
-    debug "^4.3.2"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^8.4.0"
-    eslint-visitor-keys "^4.2.1"
-    espree "^10.4.0"
-    esquery "^1.5.0"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^8.0.0"
-    find-up "^5.0.0"
-    glob-parent "^6.0.2"
-    ignore "^5.2.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.3"
-
-espree@^10.0.1, espree@^10.4.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-10.4.0.tgz#d54f4949d4629005a1fa168d937c3ff1f7e2a837"
-  integrity sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==
-  dependencies:
-    acorn "^8.15.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^4.2.1"
-
-espree@^9.3.1, espree@^9.6.0, espree@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
-  dependencies:
-    acorn "^8.9.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
-
-esquery@^1.4.0, esquery@^1.4.2, esquery@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
-  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
-  dependencies:
-    estraverse "^5.1.0"
-
-esrecurse@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
-  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-eventemitter3@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
-  integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
-
-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-glob@^3.2.9:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
-  integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.8"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
-
-fastq@^1.6.0:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5"
-  integrity sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==
-  dependencies:
-    reusify "^1.0.4"
-
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
-  dependencies:
-    flat-cache "^3.0.4"
-
-file-entry-cache@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
-  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
-  dependencies:
-    flat-cache "^4.0.0"
-
-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
-  dependencies:
-    flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
-
-flat-cache@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
-  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
-  dependencies:
-    flatted "^3.2.9"
-    keyv "^4.5.4"
-
-flatted@^3.2.9:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
-  integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
-
-for-each@^0.3.3, for-each@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
-  integrity sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==
-  dependencies:
-    is-callable "^1.2.7"
-
-foreground-child@^3.1.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
-  integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
-  dependencies:
-    cross-spawn "^7.0.6"
-    signal-exit "^4.0.1"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-function-bind@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
-  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
-
-function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"
-  integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    define-properties "^1.2.1"
-    functions-have-names "^1.2.3"
-    hasown "^2.0.2"
-    is-callable "^1.2.7"
-
-functions-have-names@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
-
-generator-function@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2"
-  integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==
-
-get-caller-file@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-east-asian-width@^1.0.0, get-east-asian-width@^1.3.0, get-east-asian-width@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz#9bc4caa131702b4b61729cb7e42735bc550c9ee6"
-  integrity sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==
-
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.2, get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7, get-intrinsic@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
-  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
-  dependencies:
-    call-bind-apply-helpers "^1.0.2"
-    es-define-property "^1.0.1"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.1.1"
-    function-bind "^1.1.2"
-    get-proto "^1.0.1"
-    gopd "^1.2.0"
-    has-symbols "^1.1.0"
-    hasown "^2.0.2"
-    math-intrinsics "^1.1.0"
-
-get-proto@^1.0.0, get-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
-  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
-  dependencies:
-    dunder-proto "^1.0.1"
-    es-object-atoms "^1.0.0"
-
-get-stdin@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
-  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
-
-get-symbol-description@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
-  integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==
-  dependencies:
-    call-bound "^1.0.3"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.6"
-
-glob-parent@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-parent@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
-
-glob@^10.3.10:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
-  integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
-  dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^3.1.2"
-    minimatch "^9.0.4"
-    minipass "^7.1.2"
-    package-json-from-dist "^1.0.0"
-    path-scurry "^1.11.1"
-
-glob@^7.1.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globals@^13.19.0:
-  version "13.24.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
-  dependencies:
-    type-fest "^0.20.2"
-
-globals@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
-  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
-
-globals@^16.5.0:
-  version "16.5.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-16.5.0.tgz#ccf1594a437b97653b2be13ed4d8f5c9f850cac1"
-  integrity sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==
-
-globalthis@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
-  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
-  dependencies:
-    define-properties "^1.2.1"
-    gopd "^1.0.1"
-
-globby@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
-gopd@^1.0.1, gopd@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
-  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
-
-graphemer@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
-  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-bigints@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe"
-  integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
-  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
-  dependencies:
-    es-define-property "^1.0.0"
-
-has-proto@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5"
-  integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==
-  dependencies:
-    dunder-proto "^1.0.0"
-
-has-symbols@^1.0.3, has-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
-  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
-
-has-tostringtag@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
-  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
-  dependencies:
-    has-symbols "^1.0.3"
-
-hasown@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
-  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
-  dependencies:
-    function-bind "^1.1.2"
-
-husky@^9.1.7:
-  version "9.1.7"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.7.tgz#d46a38035d101b46a70456a850ff4201344c0b2d"
-  integrity sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==
-
-ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
-  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
-
-import-fresh@^3.2.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
-  integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-internal-slot@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"
-  integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==
-  dependencies:
-    es-errors "^1.3.0"
-    hasown "^2.0.2"
-    side-channel "^1.1.0"
-
-is-arguments@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.2.0.tgz#ad58c6aecf563b78ef2bf04df540da8f5d7d8e1b"
-  integrity sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==
-  dependencies:
-    call-bound "^1.0.2"
-    has-tostringtag "^1.0.2"
-
-is-array-buffer@^3.0.2, is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280"
-  integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    get-intrinsic "^1.2.6"
-
-is-async-function@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.1.tgz#3e69018c8e04e73b738793d020bfe884b9fd3523"
-  integrity sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==
-  dependencies:
-    async-function "^1.0.0"
-    call-bound "^1.0.3"
-    get-proto "^1.0.1"
-    has-tostringtag "^1.0.2"
-    safe-regex-test "^1.1.0"
-
-is-bigint@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.1.0.tgz#dda7a3445df57a42583db4228682eba7c4170672"
-  integrity sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==
-  dependencies:
-    has-bigints "^1.0.2"
-
-is-boolean-object@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz#7067f47709809a393c71ff5bb3e135d8a9215d9e"
-  integrity sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==
-  dependencies:
-    call-bound "^1.0.3"
-    has-tostringtag "^1.0.2"
-
-is-callable@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-
-is-core-module@^2.13.0, is-core-module@^2.16.1:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
-  integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
-  dependencies:
-    hasown "^2.0.2"
-
-is-data-view@^1.0.1, is-data-view@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e"
-  integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==
-  dependencies:
-    call-bound "^1.0.2"
-    get-intrinsic "^1.2.6"
-    is-typed-array "^1.1.13"
-
-is-date-object@^1.0.5, is-date-object@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7"
-  integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==
-  dependencies:
-    call-bound "^1.0.2"
-    has-tostringtag "^1.0.2"
-
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
-is-finalizationregistry@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz#eefdcdc6c94ddd0674d9c85887bf93f944a97c90"
-  integrity sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==
-  dependencies:
-    call-bound "^1.0.3"
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-fullwidth-code-point@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz#046b2a6d4f6b156b2233d3207d4b5a9783999b98"
-  integrity sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==
-  dependencies:
-    get-east-asian-width "^1.3.1"
-
-is-generator-function@^1.0.10:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5"
-  integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==
-  dependencies:
-    call-bound "^1.0.4"
-    generator-function "^2.0.0"
-    get-proto "^1.0.1"
-    has-tostringtag "^1.0.2"
-    safe-regex-test "^1.1.0"
-
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-map@^2.0.2, is-map@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
-  integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
-
-is-negative-zero@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
-  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
-
-is-number-object@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
-  integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==
-  dependencies:
-    call-bound "^1.0.3"
-    has-tostringtag "^1.0.2"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-path-inside@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
-is-regex@^1.1.4, is-regex@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
-  integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==
-  dependencies:
-    call-bound "^1.0.2"
-    gopd "^1.2.0"
-    has-tostringtag "^1.0.2"
-    hasown "^2.0.2"
-
-is-set@^2.0.2, is-set@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
-  integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
-
-is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f"
-  integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==
-  dependencies:
-    call-bound "^1.0.3"
-
-is-string@^1.0.7, is-string@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
-  integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==
-  dependencies:
-    call-bound "^1.0.3"
-    has-tostringtag "^1.0.2"
-
-is-symbol@^1.0.4, is-symbol@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634"
-  integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==
-  dependencies:
-    call-bound "^1.0.2"
-    has-symbols "^1.1.0"
-    safe-regex-test "^1.1.0"
-
-is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15:
-  version "1.1.15"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
-  integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
-  dependencies:
-    which-typed-array "^1.1.16"
-
-is-weakmap@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
-  integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
-
-is-weakref@^1.0.2, is-weakref@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz#eea430182be8d64174bd96bffbc46f21bf3f9293"
-  integrity sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==
-  dependencies:
-    call-bound "^1.0.3"
-
-is-weakset@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.4.tgz#c9f5deb0bc1906c6d6f1027f284ddf459249daca"
-  integrity sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==
-  dependencies:
-    call-bound "^1.0.3"
-    get-intrinsic "^1.2.6"
-
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-iterator.prototype@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.5.tgz#12c959a29de32de0aa3bbbb801f4d777066dae39"
-  integrity sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-object-atoms "^1.0.0"
-    get-intrinsic "^1.2.6"
-    get-proto "^1.0.0"
-    has-symbols "^1.1.0"
-    set-function-name "^2.0.2"
-
-jackspeak@^3.1.2:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
-  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
-  dependencies:
-    "@isaacs/cliui" "^8.0.2"
-  optionalDependencies:
-    "@pkgjs/parseargs" "^0.11.0"
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
-  integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
-  dependencies:
-    argparse "^2.0.1"
-
-jsesc@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
-  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
-
-json-buffer@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
-  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
-
-json5@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
-  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
-  dependencies:
-    minimist "^1.2.0"
-
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.5:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
-  integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
-  dependencies:
-    array-includes "^3.1.6"
-    array.prototype.flat "^1.3.1"
-    object.assign "^4.1.4"
-    object.values "^1.1.6"
-
-keyv@^4.5.3, keyv@^4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
-  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
-  dependencies:
-    json-buffer "3.0.1"
-
-language-subtag-registry@^0.3.20:
-  version "0.3.23"
-  resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz#23529e04d9e3b74679d70142df3fd2eb6ec572e7"
-  integrity sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==
-
-language-tags@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.9.tgz#1ffdcd0ec0fafb4b1be7f8b11f306ad0f9c08777"
-  integrity sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==
-  dependencies:
-    language-subtag-registry "^0.3.20"
-
-levn@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
-  dependencies:
-    prelude-ls "^1.2.1"
-    type-check "~0.4.0"
-
-lint-staged@^16.2.7:
-  version "16.2.7"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-16.2.7.tgz#c4a635960c17b52fe774f1f40aee8ce1bd86531f"
-  integrity sha512-lDIj4RnYmK7/kXMya+qJsmkRFkGolciXjrsZ6PC25GdTfWOAWetR0ZbsNXRAj1EHHImRSalc+whZFg56F5DVow==
-  dependencies:
-    commander "^14.0.2"
-    listr2 "^9.0.5"
-    micromatch "^4.0.8"
-    nano-spawn "^2.0.0"
-    pidtree "^0.6.0"
-    string-argv "^0.3.2"
-    yaml "^2.8.1"
-
-listr2@^9.0.5:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-9.0.5.tgz#92df7c4416a6da630eb9ef46da469b70de97b316"
-  integrity sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==
-  dependencies:
-    cli-truncate "^5.0.0"
-    colorette "^2.0.20"
-    eventemitter3 "^5.0.1"
-    log-update "^6.1.0"
-    rfdc "^1.4.1"
-    wrap-ansi "^9.0.0"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
-
-lodash.merge@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
-lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-log-update@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-6.1.0.tgz#1a04ff38166f94647ae1af562f4bd6a15b1b7cd4"
-  integrity sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==
-  dependencies:
-    ansi-escapes "^7.0.0"
-    cli-cursor "^5.0.0"
-    slice-ansi "^7.1.0"
-    strip-ansi "^7.1.0"
-    wrap-ansi "^9.0.0"
-
-loglevel-colored-level-prefix@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz#6a40218fdc7ae15fc76c3d0f3e676c465388603e"
-  integrity sha512-u45Wcxxc+SdAlh4yeF/uKlC1SPUPCy0gullSNKXod5I4bmifzk+Q4lSLExNEVn19tGaJipbZ4V4jbFn79/6mVA==
-  dependencies:
-    chalk "^1.1.3"
-    loglevel "^1.4.1"
-
-loglevel@^1.4.1:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.2.tgz#c2e028d6c757720107df4e64508530db6621ba08"
-  integrity sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==
-
-loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lru-cache@^10.2.0:
-  version "10.4.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
-  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
-
-make-plural@^7.0.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-7.4.0.tgz#fa6990dd550dea4de6b20163f74e5ed83d8a8d6d"
-  integrity sha512-4/gC9KVNTV6pvYg2gFeQYTW3mWaoJt7WZE5vrp1KnQDgW92JtYZnzmZT81oj/dUTqAIu0ufI2x3dkgu3bB1tYg==
-
-map-obj@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-5.0.0.tgz#126c98596b63927d7360f287cccc67177aa1938b"
-  integrity sha512-2L3MIgJynYrZ3TYMriLDLWocz15okFakV6J12HXvMXDHui2x/zgChzg1u9mFFGbbGWE+GsLpQByt4POb9Or+uA==
-
-math-intrinsics@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
-  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
-
-merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-micromatch@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
-  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
-  dependencies:
-    braces "^3.0.3"
-    picomatch "^2.3.1"
-
-mimic-function@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz#acbe2b3349f99b9deaca7fb70e48b83e94e67076"
-  integrity sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==
-
-minimatch@9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^9.0.4:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
-  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimist@^1.2.0, minimist@^1.2.6:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3, minipass@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
-  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
-
-moo@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
-  integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
-
-ms@^2.1.1, ms@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-nano-spawn@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/nano-spawn/-/nano-spawn-2.0.0.tgz#f1250434c09ae18870d4f729fc54b406cf85a3e1"
-  integrity sha512-tacvGzUY5o2D8CBh2rrwxyNojUsZNU2zjNTzKQrkgGJQTbGAfArVWXSKMBokBeeg6C7OLRGUEyoFlYbfeWQIqw==
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
-
-object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
-object-inspect@^1.13.3, object-inspect@^1.13.4:
-  version "1.13.4"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
-  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
-
-object-is@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07"
-  integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-
-object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object.assign@^4.1.2, object.assign@^4.1.4, object.assign@^4.1.7:
-  version "4.1.7"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
-  integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-    has-symbols "^1.1.0"
-    object-keys "^1.1.1"
-
-object.entries@^1.1.5, object.entries@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.9.tgz#e4770a6a1444afb61bd39f984018b5bede25f8b3"
-  integrity sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.1.1"
-
-object.fromentries@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
-  integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-object-atoms "^1.0.0"
-
-object.groupby@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
-  integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-
-object.values@^1.1.6, object.values@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216"
-  integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
-  dependencies:
-    wrappy "1"
-
-onetime@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-7.0.0.tgz#9f16c92d8c9ef5120e3acd9dd9957cceecc1ab60"
-  integrity sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==
-  dependencies:
-    mimic-function "^5.0.0"
-
-optionator@^0.9.3:
-  version "0.9.4"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
-  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
-  dependencies:
-    deep-is "^0.1.3"
-    fast-levenshtein "^2.0.6"
-    levn "^0.4.1"
-    prelude-ls "^1.2.1"
-    type-check "^0.4.0"
-    word-wrap "^1.2.5"
-
-own-keys@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358"
-  integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==
-  dependencies:
-    get-intrinsic "^1.2.6"
-    object-keys "^1.1.1"
-    safe-push-apply "^1.0.0"
-
-p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-package-json-from-dist@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
-  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-parse@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
-
-path-scurry@^1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
-  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
-  dependencies:
-    lru-cache "^10.2.0"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-picocolors@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
-  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
-
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
-pidtree@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
-  integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
-
-possible-typed-array-names@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae"
-  integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==
-
-prelude-ls@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-
-prettier-eslint-cli@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/prettier-eslint-cli/-/prettier-eslint-cli-8.0.1.tgz#112a9002b816d13a96f1bb1eb4310952e26cd4f0"
-  integrity sha512-jru4JUDHzWEtM/SOxqagU7hQTVP8BVrxO2J0qNauWZuPRld6Ea2eyNaEzIGx6I+yjmOLCsjNM+vU1AJgaW1ZSQ==
-  dependencies:
-    "@messageformat/core" "^3.2.0"
-    "@prettier/eslint" "npm:prettier-eslint@^16.1.0"
-    arrify "^2.0.1"
-    boolify "^1.0.1"
-    camelcase-keys "^9.1.0"
-    chalk "^4.1.2"
-    common-tags "^1.8.2"
-    core-js "^3.33.0"
-    eslint "^8.51.0"
-    find-up "^5.0.0"
-    get-stdin "^8.0.0"
-    glob "^10.3.10"
-    ignore "^5.2.4"
-    indent-string "^4.0.0"
-    lodash.memoize "^4.1.2"
-    loglevel-colored-level-prefix "^1.0.0"
-    rxjs "^7.8.1"
-    yargs "^17.7.2"
-
-prettier@^3.5.3:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
-  integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
-
-pretty-format@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
-  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
-  dependencies:
-    "@jest/schemas" "^29.6.3"
-    ansi-styles "^5.0.0"
-    react-is "^18.0.0"
-
-prop-types@^15.8.1:
-  version "15.8.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
-  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.13.1"
-
-punycode@^2.1.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
-  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-quick-lru@^6.1.1:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-6.1.2.tgz#e9a90524108629be35287d0b864e7ad6ceb3659e"
-  integrity sha512-AAFUA5O1d83pIHEhJwWCq/RQcRukCkn/NSm2QsTEMle5f2hP0ChI2+3Xb051PZCkLryI/Ir1MVKviT2FIloaTQ==
-
-ramda@^0.32:
-  version "0.32.0"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.32.0.tgz#b2116807b59b6b177af7a2ad19b14a3653570e96"
-  integrity sha512-GQWAHhxhxWBWA8oIBr1XahFVjQ9Fic6MK9ikijfd4TZHfE2+urfk+irVlR5VOn48uwMgM+loRRBJd6Yjsbc0zQ==
-
-react-is@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-react-is@^18.0.0:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
-  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
-
-reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9"
-  integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==
-  dependencies:
-    call-bind "^1.0.8"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.9"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    get-intrinsic "^1.2.7"
-    get-proto "^1.0.1"
-    which-builtin-type "^1.2.1"
-
-regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.3, regexp.prototype.flags@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
-  integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==
-  dependencies:
-    call-bind "^1.0.8"
-    define-properties "^1.2.1"
-    es-errors "^1.3.0"
-    get-proto "^1.0.1"
-    gopd "^1.2.0"
-    set-function-name "^2.0.2"
-
-regexpp@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-
-require-relative@^0.8.7:
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
-  integrity sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve@^1.10.1, resolve@^1.12.0, resolve@^1.22.4:
-  version "1.22.11"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
-  integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
-  dependencies:
-    is-core-module "^2.16.1"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^2.0.0-next.5:
-  version "2.0.0-next.5"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"
-  integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==
-  dependencies:
-    is-core-module "^2.13.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-restore-cursor@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-5.1.0.tgz#0766d95699efacb14150993f55baf0953ea1ebe7"
-  integrity sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==
-  dependencies:
-    onetime "^7.0.0"
-    signal-exit "^4.1.0"
-
-reusify@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f"
-  integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==
-
-rfdc@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
-  integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
-
-rxjs@^7.8.1:
-  version "7.8.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
-  integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
-  dependencies:
-    tslib "^2.1.0"
-
-safe-array-concat@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
-  integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.2"
-    get-intrinsic "^1.2.6"
-    has-symbols "^1.1.0"
-    isarray "^2.0.5"
-
-safe-identifier@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
-  integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==
-
-safe-push-apply@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5"
-  integrity sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==
-  dependencies:
-    es-errors "^1.3.0"
-    isarray "^2.0.5"
-
-safe-regex-test@^1.0.3, safe-regex-test@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
-  integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    is-regex "^1.2.1"
-
-semver@^6.1.0, semver@^6.3.0, semver@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^7.3.6, semver@^7.5.4:
-  version "7.7.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
-  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
-
-set-function-length@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
-  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
-
-set-function-name@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
-  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    functions-have-names "^1.2.3"
-    has-property-descriptors "^1.0.2"
-
-set-proto@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e"
-  integrity sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==
-  dependencies:
-    dunder-proto "^1.0.1"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-side-channel-list@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
-  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
-  dependencies:
-    es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-
-side-channel-map@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
-  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.5"
-    object-inspect "^1.13.3"
-
-side-channel-weakmap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
-  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
-  dependencies:
-    call-bound "^1.0.2"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.5"
-    object-inspect "^1.13.3"
-    side-channel-map "^1.0.1"
-
-side-channel@^1.0.4, side-channel@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
-  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
-  dependencies:
-    es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-    side-channel-list "^1.0.0"
-    side-channel-map "^1.0.1"
-    side-channel-weakmap "^1.0.2"
-
-signal-exit@^4.0.1, signal-exit@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
-  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-slice-ansi@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.2.tgz#adf7be70aa6d72162d907cd0e6d5c11f507b5403"
-  integrity sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==
-  dependencies:
-    ansi-styles "^6.2.1"
-    is-fullwidth-code-point "^5.0.0"
-
-ssri@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-13.0.0.tgz#4226b303dc474003d88905f9098cb03361106c74"
-  integrity sha512-yizwGBpbCn4YomB2lzhZqrHLJoqFGXihNbib3ozhqF/cIp5ue+xSmOQrjNasEE62hFxsCcg/V/z23t4n8jMEng==
-  dependencies:
-    minipass "^7.0.3"
-
-stop-iteration-iterator@^1.0.0, stop-iteration-iterator@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
-  integrity sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==
-  dependencies:
-    es-errors "^1.3.0"
-    internal-slot "^1.1.0"
-
-string-argv@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
-  integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
-
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^5.0.1, string-width@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
-  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
-  dependencies:
-    eastasianwidth "^0.2.0"
-    emoji-regex "^9.2.2"
-    strip-ansi "^7.0.1"
-
-string-width@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc"
-  integrity sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==
-  dependencies:
-    emoji-regex "^10.3.0"
-    get-east-asian-width "^1.0.0"
-    strip-ansi "^7.1.0"
-
-string-width@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-8.1.0.tgz#9e9fb305174947cf45c30529414b5da916e9e8d1"
-  integrity sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==
-  dependencies:
-    get-east-asian-width "^1.3.0"
-    strip-ansi "^7.1.0"
-
-string.prototype.includes@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz#eceef21283640761a81dbe16d6c7171a4edf7d92"
-  integrity sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.3"
-
-string.prototype.matchall@^4.0.12:
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz#6c88740e49ad4956b1332a911e949583a275d4c0"
-  integrity sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.3"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.6"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    get-intrinsic "^1.2.6"
-    gopd "^1.2.0"
-    has-symbols "^1.1.0"
-    internal-slot "^1.1.0"
-    regexp.prototype.flags "^1.5.3"
-    set-function-name "^2.0.2"
-    side-channel "^1.1.0"
-
-string.prototype.repeat@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz#e90872ee0308b29435aa26275f6e1b762daee01a"
-  integrity sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
-string.prototype.trim@^1.2.10:
-  version "1.2.10"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81"
-  integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.2"
-    define-data-property "^1.1.4"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.5"
-    es-object-atoms "^1.0.0"
-    has-property-descriptors "^1.0.2"
-
-string.prototype.trimend@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942"
-  integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==
-  dependencies:
-    call-bind "^1.0.8"
-    call-bound "^1.0.2"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-
-string.prototype.trimstart@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
-  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^7.0.1, strip-ansi@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
-  integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
-  dependencies:
-    ansi-regex "^6.0.1"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
-
-strip-json-comments@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
-
-supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-supports-preserve-symlinks-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
-  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
-
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-ts-api-utils@^1.0.1:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz#bfc2215fe6528fecab2b0fba570a2e8a4263b064"
-  integrity sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==
-
-tsconfig-paths@^3.15.0:
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
-  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
-  dependencies:
-    "@types/json5" "^0.0.29"
-    json5 "^1.0.2"
-    minimist "^1.2.6"
-    strip-bom "^3.0.0"
-
-tslib@^2.1.0, tslib@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
-  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
-
-type-check@^0.4.0, type-check@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
-  dependencies:
-    prelude-ls "^1.2.1"
-
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
-type-fest@^4.3.2:
-  version "4.41.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.41.0.tgz#6ae1c8e5731273c2bf1f58ad39cbae2c91a46c58"
-  integrity sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==
-
-typed-array-buffer@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
-  integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
-  dependencies:
-    call-bound "^1.0.3"
-    es-errors "^1.3.0"
-    is-typed-array "^1.1.14"
-
-typed-array-byte-length@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce"
-  integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==
-  dependencies:
-    call-bind "^1.0.8"
-    for-each "^0.3.3"
-    gopd "^1.2.0"
-    has-proto "^1.2.0"
-    is-typed-array "^1.1.14"
-
-typed-array-byte-offset@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355"
-  integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==
-  dependencies:
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.8"
-    for-each "^0.3.3"
-    gopd "^1.2.0"
-    has-proto "^1.2.0"
-    is-typed-array "^1.1.15"
-    reflect.getprototypeof "^1.0.9"
-
-typed-array-length@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d"
-  integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==
-  dependencies:
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    is-typed-array "^1.1.13"
-    possible-typed-array-names "^1.0.0"
-    reflect.getprototypeof "^1.0.6"
-
-unbox-primitive@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2"
-  integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==
-  dependencies:
-    call-bound "^1.0.3"
-    has-bigints "^1.0.2"
-    has-symbols "^1.1.0"
-    which-boxed-primitive "^1.1.1"
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-vue-eslint-parser@^9.4.3:
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz#9b04b22c71401f1e8bca9be7c3e3416a4bde76a8"
-  integrity sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==
-  dependencies:
-    debug "^4.3.4"
-    eslint-scope "^7.1.1"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.3.1"
-    esquery "^1.4.0"
-    lodash "^4.17.21"
-    semver "^7.3.6"
-
-which-boxed-primitive@^1.0.2, which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e"
-  integrity sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==
-  dependencies:
-    is-bigint "^1.1.0"
-    is-boolean-object "^1.2.1"
-    is-number-object "^1.1.1"
-    is-string "^1.1.1"
-    is-symbol "^1.1.1"
-
-which-builtin-type@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e"
-  integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==
-  dependencies:
-    call-bound "^1.0.2"
-    function.prototype.name "^1.1.6"
-    has-tostringtag "^1.0.2"
-    is-async-function "^2.0.0"
-    is-date-object "^1.1.0"
-    is-finalizationregistry "^1.1.0"
-    is-generator-function "^1.0.10"
-    is-regex "^1.2.1"
-    is-weakref "^1.0.2"
-    isarray "^2.0.5"
-    which-boxed-primitive "^1.1.0"
-    which-collection "^1.0.2"
-    which-typed-array "^1.1.16"
-
-which-collection@^1.0.1, which-collection@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
-  integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
-  dependencies:
-    is-map "^2.0.3"
-    is-set "^2.0.3"
-    is-weakmap "^2.0.2"
-    is-weakset "^2.0.3"
-
-which-typed-array@^1.1.13, which-typed-array@^1.1.16, which-typed-array@^1.1.19:
-  version "1.1.19"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
-  integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
-  dependencies:
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.8"
-    call-bound "^1.0.4"
-    for-each "^0.3.5"
-    get-proto "^1.0.1"
-    gopd "^1.2.0"
-    has-tostringtag "^1.0.2"
-
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-word-wrap@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
-  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
-
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
-  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
-  dependencies:
-    ansi-styles "^6.1.0"
-    string-width "^5.0.1"
-    strip-ansi "^7.0.1"
-
-wrap-ansi@^9.0.0:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.2.tgz#956832dea9494306e6d209eb871643bb873d7c98"
-  integrity sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==
-  dependencies:
-    ansi-styles "^6.2.1"
-    string-width "^7.0.0"
-    strip-ansi "^7.1.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
-y18n@^5.0.5:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
-  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
-
-yaml@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.1.tgz#1870aa02b631f7e8328b93f8bc574fac5d6c4d79"
-  integrity sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==
-
-yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
-yargs@^17.7.2:
-  version "17.7.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
-  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
-  dependencies:
-    cliui "^8.0.1"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.1.1"
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 98ee9e560211..070a37f8f0ad 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -8,10 +8,13 @@
   ada,
   brotli,
   c-ares,
+  gtest,
+  hdrhistogram_c,
   libuv,
   lief,
   llhttp,
   merve,
+  nbytes,
   nghttp2,
   nghttp3,
   ngtcp2,
@@ -124,55 +127,65 @@ let
       null;
   # TODO: also handle MIPS flags (mips_arch, mips_fpu, mips_float_abi).
 
-  useSharedAdaAndSimd = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.2";
-  useSharedLief = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "25.6";
-  useSharedMerve = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "25.6.1";
-  useSharedSQLite = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.5";
-  useSharedZstd = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.15";
+  useSharedAdaAndSimd = lib.versionAtLeast version "22.2";
+  useSharedGtestAndHistogram = lib.versionAtLeast version (
+    if majorVersion == 24 then "24.14.0" else "25.4"
+  );
+  useSharedNBytes = lib.versionAtLeast version (if majorVersion == 24 then "24.14.0" else "25.5");
+  useSharedLief = lib.versionAtLeast version "25.6";
+  useSharedMerve = lib.versionAtLeast version (if majorVersion == 24 then "24.14.0" else "25.6.1");
+  useSharedSQLite = lib.versionAtLeast version "22.5";
+  useSharedZstd = lib.versionAtLeast version "22.15";
 
-  sharedLibDeps =
-    (lib.optionalAttrs (!stdenv.hostPlatform.isStatic) {
-      inherit
-        brotli
-        libuv
-        nghttp3
-        ngtcp2
-        openssl
-        uvwasi
-        zlib
-        ;
-      cares = c-ares;
-      http-parser = llhttp;
-      nghttp2 = nghttp2.overrideAttrs {
-        patches = [
-          (fetchpatch2 {
-            url = "https://github.com/nghttp2/nghttp2/commit/7784fa979d0bcf801a35f1afbb25fb048d815cd7.patch?full_index=1";
-            hash = "sha256-RG87Qifjpl7HTP9ac2JwHj2XAbDlFgOpAnpZX3ET6gU=";
-            excludes = [ "lib/includes/nghttp2/nghttp2.h" ];
-            revert = true;
-          })
-        ];
-      };
-    })
-    // (lib.optionalAttrs useSharedAdaAndSimd {
-      inherit
-        ada
-        simdjson
-        ;
-      simdutf = if lib.versionAtLeast version "25" then simdutf else simdutf_6;
-    })
-    // (lib.optionalAttrs useSharedSQLite {
-      inherit sqlite;
-    })
-    // (lib.optionalAttrs useSharedLief {
-      inherit lief;
-    })
-    // (lib.optionalAttrs useSharedMerve {
-      inherit merve;
-    })
-    // (lib.optionalAttrs useSharedZstd {
-      inherit zstd;
-    });
+  sharedLibDeps = {
+    inherit
+      brotli
+      libuv
+      nghttp3
+      ngtcp2
+      openssl
+      uvwasi
+      zlib
+      ;
+    cares = c-ares;
+    http-parser = llhttp;
+    nghttp2 = nghttp2.overrideAttrs {
+      patches = [
+        (fetchpatch2 {
+          url = "https://github.com/nghttp2/nghttp2/commit/7784fa979d0bcf801a35f1afbb25fb048d815cd7.patch?full_index=1";
+          hash = "sha256-RG87Qifjpl7HTP9ac2JwHj2XAbDlFgOpAnpZX3ET6gU=";
+          excludes = [ "lib/includes/nghttp2/nghttp2.h" ];
+          revert = true;
+        })
+      ];
+    };
+  }
+  // (lib.optionalAttrs useSharedAdaAndSimd {
+    inherit
+      ada
+      simdjson
+      ;
+    simdutf = if lib.versionAtLeast version "25" then simdutf else simdutf_6;
+  })
+  // (lib.optionalAttrs useSharedSQLite {
+    inherit sqlite;
+  })
+  // (lib.optionalAttrs useSharedGtestAndHistogram {
+    inherit gtest;
+    hdr-histogram = hdrhistogram_c;
+  })
+  // (lib.optionalAttrs useSharedLief {
+    inherit lief;
+  })
+  // (lib.optionalAttrs useSharedNBytes {
+    inherit nbytes;
+  })
+  // (lib.optionalAttrs useSharedMerve {
+    inherit merve;
+  })
+  // (lib.optionalAttrs useSharedZstd {
+    inherit zstd;
+  });
 
   copyLibHeaders = map (name: "${lib.getDev sharedLibDeps.${name}}/include/*") (
     builtins.attrNames sharedLibDeps
diff --git a/pkgs/development/web/nodejs/symlink.nix b/pkgs/development/web/nodejs/symlink.nix
index 87bbdbec6314..538ac2311946 100644
--- a/pkgs/development/web/nodejs/symlink.nix
+++ b/pkgs/development/web/nodejs/symlink.nix
@@ -3,12 +3,51 @@
   nodejs-slim,
   symlinkJoin,
 }:
-symlinkJoin {
+(symlinkJoin {
   pname = "nodejs";
-  inherit (nodejs-slim) version passthru meta;
+  inherit (nodejs-slim) version meta;
+  passthru = nodejs-slim.passthru // {
+    inherit (nodejs-slim) src;
+  };
   paths = [
     nodejs-slim
     nodejs-slim.npm
   ]
   ++ lib.optional (builtins.hasAttr "corepack" nodejs-slim) nodejs-slim.corepack;
-}
+}).overrideAttrs
+  (nodejs: {
+    passthru =
+      (builtins.listToAttrs (
+        map
+          (name: {
+            inherit name;
+            value = lib.warn "Use nodejs-slim.${name} instead of nodejs.${name}" nodejs-slim.${name};
+          })
+          (
+            builtins.filter (
+              name:
+              !lib.strings.hasPrefix "__" name
+              && !(builtins.elem name [
+                "override"
+                "overrideAttrs"
+                "overrideDerivation"
+                "outputs"
+                "outputName"
+                "system"
+                "type"
+
+                # Filter out arguments of `getOutput`
+                "bin"
+                "dev"
+                "include"
+                "lib"
+                "man"
+                "out"
+                "static"
+              ])
+              && !(builtins.hasAttr name nodejs)
+            ) (builtins.attrNames nodejs-slim)
+          )
+      ))
+      // nodejs.passthru;
+  })
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 872cbd4bf222..49028c848e91 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -23,8 +23,8 @@ let
       [ ];
 in
 buildNodejs {
-  version = "24.14.0";
-  sha256 = "9fe025ef4028aba95d16e7810518bf4a5e8abfb0bdc07d8a3fdbb0afd538d77f";
+  version = "24.14.1";
+  sha256 = "7822507713f202cf2a551899d250259643f477b671706db421a6fb55c4aa0991";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -63,6 +63,11 @@ buildNodejs {
         hash = "sha256-4cr94fsJrq5iCAHOf60wJQQkP/K2YWYY5W7GHs8Sbxg=";
         includes = [ "test/*" ];
       })
+      (fetchpatch2 {
+        url = "https://github.com/nodejs/node/commit/59a522af24173b244cb86829de145d46b143a45c.patch?full_index=1";
+        hash = "sha256-mjxl4rIio8lgjvxqfKrVwdhOUHUUDH2PMh0n8BowXIQ=";
+        includes = [ "src/*" ];
+      })
     ]
     ++ gypPatches
     ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [
diff --git a/pkgs/development/web/playwright/browsers.json b/pkgs/development/web/playwright/browsers.json
index bccc346c7b66..4ed4747f928b 100644
--- a/pkgs/development/web/playwright/browsers.json
+++ b/pkgs/development/web/playwright/browsers.json
@@ -2,29 +2,31 @@
   "comment": "This file is kept up to date via update.sh",
   "browsers": {
     "chromium": {
-      "revision": "1208",
-      "browserVersion": "145.0.7632.6",
+      "revision": "1217",
+      "browserVersion": "147.0.7727.15",
       "title": "Chrome for Testing"
     },
     "chromium-headless-shell": {
-      "revision": "1208",
-      "browserVersion": "145.0.7632.6",
+      "revision": "1217",
+      "browserVersion": "147.0.7727.15",
       "title": "Chrome Headless Shell"
     },
     "firefox": {
-      "revision": "1509",
-      "browserVersion": "146.0.1",
+      "revision": "1511",
+      "browserVersion": "148.0.2",
       "title": "Firefox"
     },
     "webkit": {
-      "revision": "2248",
+      "revision": "2272",
       "revisionOverrides": {
+        "mac14": "2251",
+        "mac14-arm64": "2251",
         "debian11-x64": "2105",
         "debian11-arm64": "2105",
         "ubuntu20.04-x64": "2092",
         "ubuntu20.04-arm64": "2092"
       },
-      "browserVersion": "26.0",
+      "browserVersion": "26.4",
       "title": "WebKit"
     },
     "ffmpeg": {
diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix
index 33d260bb84d1..c84c8593572c 100644
--- a/pkgs/development/web/playwright/chromium-headless-shell.nix
+++ b/pkgs/development/web/playwright/chromium-headless-shell.nix
@@ -36,8 +36,8 @@ let
       inherit (download) url stripRoot;
       hash =
         {
-          x86_64-linux = "sha256-/xskLzTc9tTZmu1lwkMpjV3QV7XjP92D/7zRcFuVWT8=";
-          aarch64-linux = "sha256-jckH5+eGJ4BhH1NAa5LIgf3/salKLAHW9XUOo5gob4c=";
+          x86_64-linux = "sha256-kQCw0nQHHuUIfn8rGVcN7Ip6ZOk5c3Or+GG5RvSica4=";
+          aarch64-linux = "sha256-s2IIjSY5t9AtT05dUS0mp4fPlaixND9+Cg0+0S8Kkx8=";
         }
         .${system} or throwSystem;
     };
@@ -72,8 +72,8 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-bgU7lZhp9XUFfGu58pFdZyhXho3Jiy4MjljR+yk0M1c=";
-        aarch64-darwin = "sha256-45DjMIu0t7IEYdXOmIqpV/1/MKdEfx/8T7DWagh6Zhc=";
+        x86_64-darwin = "sha256-kzbLpzzMpBurQHyGaz561A0K46GzgWPP2JSQKRV6C+Y=";
+        aarch64-darwin = "sha256-67ekk37uq5ITq9ZvwPTZhhqEgQY17g/3KJ/vnqZz3h0=";
       }
       .${system} or throwSystem;
   };
diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix
index e255b6b03a40..d1fb44b11cac 100644
--- a/pkgs/development/web/playwright/chromium.nix
+++ b/pkgs/development/web/playwright/chromium.nix
@@ -63,8 +63,8 @@ let
       inherit (download) url stripRoot;
       hash =
         {
-          x86_64-linux = "sha256-dJSO05xOzlSl/EwOWNQCeuSb+lhUU6NlGBnRu59irnM=";
-          aarch64-linux = "sha256-9DFLCPuc9WZjYLzlRW+Df2pb+mViPK3/IOkkUozELsw=";
+          x86_64-linux = "sha256-GtaJk9Qr1bTbDfpB+noGlLcIDEIS2uzDiV5rb2DZhVQ=";
+          aarch64-linux = "sha256-jsesQ6juzMPQzmn0Ygb8hmpxCeLHJVBL89qto5yuh5s=";
         }
         .${system} or throwSystem;
     };
@@ -130,8 +130,8 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-vQuBHM0jkk6S/Gco/bBqSPJqXi/CJt/+nkbGtFNpgwk=";
-        aarch64-darwin = "sha256-qXdgHeBS5IFIa4hZVmjq0+31v/uDPXHyc4aH7Wn2E7E=";
+        x86_64-darwin = "sha256-CxnLSe+sZYskO7H5f3cA+BlWCZsFOPpp1gVG5s37r80=";
+        aarch64-darwin = "sha256-n3JLK+hJwzPihC2qSHrSCYPz3jonZNz7GMgXiPBLaS0=";
       }
       .${system} or throwSystem;
   };
diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix
index 058278509365..7c0444c5f31b 100644
--- a/pkgs/development/web/playwright/driver.nix
+++ b/pkgs/development/web/playwright/driver.nix
@@ -19,20 +19,20 @@ let
   throwSystem = throw "Unsupported system: ${system}";
   browsersJSON = (lib.importJSON ./browsers.json).browsers;
 
-  version = "1.58.2";
+  version = "1.59.1";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "playwright";
     rev = "v${version}";
-    hash = "sha256-PRA3hjMlnHGVMidhEo371WXRPyVP2W0rle8ONUlKg9Y=";
+    hash = "sha256-kiH1jDyt5xMWc5C2dytoDC9fi1b5tWXZG8S6KEpuotM=";
   };
 
   babel-bundle = buildNpmPackage {
     pname = "babel-bundle";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright/bundles/babel";
-    npmDepsHash = "sha256-MVMxYncmIA4k6h7mLirJaroOSNbCpvKSGxN3BGGqJ9w=";
+    npmDepsHash = "sha256-ByCy4go8PM0ksDg+2DcJPyoKG7Z0uIqKM647ZQwYwAE=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -42,7 +42,7 @@ let
     pname = "expect-bundle";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright/bundles/expect";
-    npmDepsHash = "sha256-wXy6pkHJusB/WLgNKIPnuY4mTjntOMbrFrQp0UjrqAw=";
+    npmDepsHash = "sha256-PbPCsMqRkfU2c/mCsLSagew84XTgeO6H5+isNZQl2ek=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -52,7 +52,7 @@ let
     pname = "utils-bundle";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright/bundles/utils";
-    npmDepsHash = "sha256-HzMu3xDb7MleJSsQ1+VvpIFSxcRfnVXniYIv/c5PHRg=";
+    npmDepsHash = "sha256-BTaF1atpK+kG++ZJBUK4r3A7mbN2vv3xpDmb1NiNngE=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -62,7 +62,7 @@ let
     pname = "utils-bundle-core";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright-core/bundles/utils";
-    npmDepsHash = "sha256-/nxMK+gr4jmxeUazLRXd9LXdYYBVY9VnzbbXoxazX7c=";
+    npmDepsHash = "sha256-O8X80rTT10ht97towSocANnGwH4fH1f3nZMSl8TOc+Y=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -72,7 +72,7 @@ let
     pname = "zip-bundle";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright-core/bundles/zip";
-    npmDepsHash = "sha256-c0UZ0Jg86icwJp3xarpXpxWjRYeIjz9wpWtJZDHkd8U=";
+    npmDepsHash = "sha256-5BHgCelIPh8ljIcdrO4AHafjqfLowDwJcpN+mD13Syw=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -84,7 +84,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence
-    npmDepsHash = "sha256-kc77z9REuV7b+zHcUzBLf7F2+cbAhzD/kaGxa6xNnGo=";
+    npmDepsHash = "sha256-H3kKFthmZH4fqFPQA34w7iw2rubpEKLlJ9jaW6mpuyo=";
 
     nativeBuildInputs = [
       cacert
@@ -97,6 +97,10 @@ let
       sed -i '/\/\/ Update test runner./,/^\s*$/{d}' utils/build/build.js
       sed -i '/^\/\/ Update bundles\./,/^[[:space:]]*}$/d' utils/build/build.js
       sed -i '/execSync/d' ./utils/generate_third_party_notice.js
+      # The dlopen library check uses ldconfig which doesn't work under Nix.
+      # These libraries are already provided via rpath by autoPatchelfHook and wrapProgram.
+      substituteInPlace packages/playwright-core/src/server/registry/index.ts \
+        --replace-fail "['libGLESv2.so.2', 'libx264.so']" "[]"
       chmod +w packages/playwright/bundles/babel
       ln -s ${babel-bundle}/node_modules packages/playwright/bundles/babel/node_modules
       chmod +w packages/playwright/bundles/expect
diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix
index a9a1f840fc89..4f2ad3f89e19 100644
--- a/pkgs/development/web/playwright/firefox.nix
+++ b/pkgs/development/web/playwright/firefox.nix
@@ -19,8 +19,8 @@ let
       inherit (download) url stripRoot;
       hash =
         {
-          x86_64-linux = "sha256-+mwhR8QQ9fs7hD3C4Xn9xcL8LRU+rt2JO8Gcg/KjqRU=";
-          aarch64-linux = "sha256-drL8jduYK0rnmLYW9jzSTKHb0pKaezMnpER5kLikEvY=";
+          x86_64-linux = "sha256-kfXBssU8pJbBqEUQkgpUFXaskx95OyQEYXDhe6cteR8=";
+          aarch64-linux = "sha256-OMPpE0VUgZ65cPOZ7f3sfQMaI++lp6B/RBmhH0E7Y9k=";
         }
         .${system} or throwSystem;
     };
@@ -42,8 +42,8 @@ let
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-uxPOq2U1D9gFXqvNzclctLbHx4fZ9O92GtDQjCRYGiM=";
-        aarch64-darwin = "sha256-ZFRmtlNrzrjB3ELXmGC67XO1IhfWsWZ7rXaUQ6If65s=";
+        x86_64-darwin = "sha256-OfNmamn82tJ8+eY6DC8a3AynmhObZ8E0GTegF8l7km4=";
+        aarch64-darwin = "sha256-WEYhmqGhGvO47i/OICJgXyqj64Wt52juJDEe7nD7HXU=";
       }
       .${system} or throwSystem;
   };
diff --git a/pkgs/development/web/playwright/update.sh b/pkgs/development/web/playwright/update.sh
index fd8bc354beef..f3df940652e0 100755
--- a/pkgs/development/web/playwright/update.sh
+++ b/pkgs/development/web/playwright/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps unzip nix-prefetch
+#!nix-shell -i bash -p curl gnused common-updater-scripts jq prefetch-npm-deps
 # shellcheck shell=bash
 set -euo pipefail
 
@@ -103,10 +103,19 @@ replace_sha() {
 prefetch_browser() {
     local url="$1"
     local strip_root="$2"
+    local fake="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+    local expr
+    local out
 
-    # nix-prefetch is used to obtain sha with `stripRoot = false`
-    # doesn't work on macOS https://github.com/msteen/nix-prefetch/issues/53
-    nix-prefetch --option extra-experimental-features flakes -q "{ stdenv, fetchzip }: stdenv.mkDerivation { name=\"browser\"; src = fetchzip { url = \"$url\"; stripRoot = $strip_root; }; }"
+    # Use real fetchzip via fake-hash trick. nix-prefetch wrapper is broken on
+    # macOS (msteen/nix-prefetch#53), so parse the "got:" line from the
+    # mismatch error of a fixed-output derivation instead.
+    expr="(import \"$repo_root\" {}).fetchzip { url = \"$url\"; stripRoot = $strip_root; hash = \"$fake\"; }"
+    if out=$(nix-build --no-out-link -E "$expr" 2>&1); then
+        echo "prefetch_browser: unexpected build success for $url" >&2
+        return 1
+    fi
+    echo "$out" | grep -Eo 'got:[[:space:]]+sha256-[A-Za-z0-9+/=]+' | awk '{print $NF}' | head -n1
 }
 
 browser_download_info() {
diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix
index 17ddcf5c3d83..5100bdfc2e02 100644
--- a/pkgs/development/web/playwright/webkit.nix
+++ b/pkgs/development/web/playwright/webkit.nix
@@ -19,6 +19,7 @@
   gst_all_1,
   harfbuzz,
   harfbuzzFull,
+  hyphen,
   icu74,
   lcms,
   libavif,
@@ -38,8 +39,9 @@
   libwpe,
   libwpe-fdo,
   libxkbcommon,
-  libxml2,
+  libxml2_13,
   libxslt,
+  mesa,
   libgbm,
   sqlite,
   systemdLibs,
@@ -119,8 +121,8 @@ let
       inherit (download) url stripRoot;
       hash =
         {
-          x86_64-linux = "sha256-Ei08TuR+WedVAfKRSeRQq7ZhULgxXQIV0bQPcNFYhr4=";
-          aarch64-linux = "sha256-/+tven7ksYhXQxPYfazyZhNsgvE8rr3A28fZPwL4c9s=";
+          x86_64-linux = "sha256-BVIZxnnfhBvI737ojRZ+yUX8mcbQ6WOlNdYJ9t4R5yY=";
+          aarch64-linux = "sha256-t9kqUdyOgDXroKp7LWQsaiaRGZVZN3ZdfYLahl5GW2E=";
         }
         .${system} or throwSystem;
     };
@@ -144,6 +146,7 @@ let
       gst_all_1.gstreamer
       harfbuzz
       harfbuzzFull
+      hyphen
       icu74
       lcms
       libavif
@@ -162,7 +165,7 @@ let
       libwpe
       libwpe-fdo
       libvpx'
-      libxml2
+      libxml2_13
       libxslt
       libgbm
       sqlite
@@ -182,25 +185,26 @@ let
       # remove bundled libs
       rm -rf $out/minibrowser-wpe/sys
 
-      # TODO: still fails on ubuntu trying to find libEGL_mesa.so.0
       wrapProgram $out/minibrowser-wpe/bin/MiniBrowser \
         --prefix GIO_EXTRA_MODULES ":" "${glib-networking}/lib/gio/modules/" \
-        --prefix LD_LIBRARY_PATH ":" $out/minibrowser-wpe/lib
-
-    '';
-
-    preFixup = ''
-      # Fix libxml2 breakage. See https://github.com/NixOS/nixpkgs/pull/396195#issuecomment-2881757108
-      mkdir -p "$out/lib"
-      ln -s "${lib.getLib libxml2}/lib/libxml2.so" "$out/lib/libxml2.so.2"
+        --prefix LD_LIBRARY_PATH ":" $out/minibrowser-wpe/lib \
+        --run '
+          # Use Mesa as EGL vendor fallback when no system EGL vendor is configured.
+          # libglvnd discovers vendors via JSON files https://github.com/NVIDIA/libglvnd/blob/master/src/EGL/icd_enumeration.md
+          if [ -z "$__EGL_VENDOR_LIBRARY_DIRS" ] && [ -z "$__EGL_VENDOR_LIBRARY_FILENAMES" ] && \
+             ! [ -d /usr/share/glvnd/egl_vendor.d ] && ! [ -d /etc/glvnd/egl_vendor.d ] && \
+             ! [ -d /run/opengl-driver/share/glvnd/egl_vendor.d ]; then
+            export __EGL_VENDOR_LIBRARY_FILENAMES="${mesa}/share/glvnd/egl_vendor.d/50_mesa.json"
+          fi
+        '
     '';
   };
   webkit-darwin = fetchzip {
     inherit (download) url stripRoot;
     hash =
       {
-        x86_64-darwin = "sha256-An3sdw8HltgHQ6YASsxyhoK1fd8PxZ0BBCMpnOORkv8=";
-        aarch64-darwin = "sha256-suXPCuXLMz3xoFxE5+Yjd9OXxLfNDDJiU6O1Ic0PsOI=";
+        x86_64-darwin = "sha256-NjuRZrYzraE1FrPAmyMcQFAS2zWZXYe8cBQVbSU6zFw=";
+        aarch64-darwin = "sha256-9g7YHg+TQNmAE07K6jKSSRUJ7IENUQMp2q54Mk2BbaY=";
       }
       .${system} or throwSystem;
   };
diff --git a/pkgs/games/fteqw/default.nix b/pkgs/games/fteqw/default.nix
index 6f010ee3f1e4..8bb7cd851eac 100644
--- a/pkgs/games/fteqw/default.nix
+++ b/pkgs/games/fteqw/default.nix
@@ -81,7 +81,7 @@
 
       postFixup = ''
         patchelf $out/bin/${pname} \
-          --add-needed ${gnutls}/lib/libgnutls.so \
+          --add-needed ${gnutls}/lib/libgnutls.so
       '';
 
       description = "Dedicated server for FTEQW";
diff --git a/pkgs/kde/plasma/spectacle/default.nix b/pkgs/kde/plasma/spectacle/default.nix
index 7b158359610b..098bc2394cca 100644
--- a/pkgs/kde/plasma/spectacle/default.nix
+++ b/pkgs/kde/plasma/spectacle/default.nix
@@ -1,19 +1,29 @@
 {
-  lib,
+  fetchpatch,
   mkKdeDerivation,
+  pkg-config,
   qtwayland,
   qtmultimedia,
   opencv,
   tesseractLanguages ? [ ],
   tesseract5,
 }:
-let
-  tesseract = tesseract5.override { enableLanguages = tesseractLanguages; };
-in
 mkKdeDerivation {
   pname = "spectacle";
 
+  # Backport the upstream switch from runtime QLibrary loading to direct
+  # linking so Spectacle OCR can find Tesseract reliably on NixOS.
+  patches = [
+    (fetchpatch {
+      url = "https://invent.kde.org/graphics/spectacle/-/commit/13b0be099e7abe9bbb17b90e62c2e83afb248db7.patch";
+      hash = "sha256-HEgHsuajaF+WVMiRp0YKRmi+/NsIy5s8frwMJRIdDY8=";
+    })
+  ];
+
+  extraNativeBuildInputs = [ pkg-config ];
+
   extraBuildInputs = [
+    (tesseract5.override { enableLanguages = tesseractLanguages; })
     qtwayland
     qtmultimedia
     (opencv.override {
@@ -26,10 +36,5 @@ mkKdeDerivation {
     })
   ];
 
-  # no point adding the dependency when we have no language packs
-  preFixup = lib.optionalString (tesseractLanguages != [ ]) ''
-    patchelf --add-needed libtesseract.so.5 --add-rpath ${tesseract}/lib $out/bin/spectacle
-  '';
-
   meta.mainProgram = "spectacle";
 }
diff --git a/pkgs/misc/documentation-highlighter/README.md b/pkgs/misc/documentation-highlighter/README.md
index 62009879ed49..15fe8ac9ea27 100644
--- a/pkgs/misc/documentation-highlighter/README.md
+++ b/pkgs/misc/documentation-highlighter/README.md
@@ -6,7 +6,7 @@ This file was generated with pkgs/misc/documentation-highlighter/update.sh
 
 **This package contains only the CDN build assets of highlight.js.**
 
-This may be what you want if you'd like to install the pre-built distributable highlight.js client-side assets via NPM. If you want to use highlight.js mainly on the server-side, you likely want the [highlight.js][1] package instead.
+This may be what you want if you'd like to install the pre-built distributable highlight.js client-side assets via npm. If you want to use highlight.js mainly on the server-side, you likely want the [highlight.js][1] package instead.
 
 To access these files via CDN:<br>
 https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@latest/build/
diff --git a/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix b/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix
index d0aa908a3b83..dc23cff7e934 100644
--- a/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix
+++ b/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix
@@ -11,7 +11,11 @@ let
   inherit (buildPackages) gnused python3;
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix b/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix
index 3d267ef6ae5a..17b4b9f62118 100644
--- a/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix
@@ -14,7 +14,11 @@
 let
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix b/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix
index d905e3617611..462bfcce9706 100644
--- a/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix
@@ -10,7 +10,11 @@
 let
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix b/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix
index d26a1a9f4b13..614f670b10f9 100644
--- a/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix
@@ -11,7 +11,11 @@
 let
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix b/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix
index 06c4aaedc5af..eda8c5d8df5a 100644
--- a/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix
+++ b/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix
@@ -22,7 +22,11 @@ let
 
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix b/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix
index 1e6433c31098..08498f2786a0 100644
--- a/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix
@@ -19,7 +19,11 @@
 let
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix b/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix
index ea0ae1c12795..e13835513ed4 100644
--- a/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix
+++ b/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix
@@ -10,7 +10,11 @@
 let
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix b/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix
index 6c3883ed969a..9c285b013760 100644
--- a/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix
+++ b/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix
@@ -7,7 +7,11 @@
 let
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix b/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix
index ba35d58c481f..4fc44ef8dcfc 100644
--- a/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix
@@ -15,7 +15,11 @@
 let
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/by-name/si/sigtool/0001-fix-build-with-gcc.patch b/pkgs/os-specific/darwin/by-name/si/sigtool/0001-fix-build-with-gcc.patch
new file mode 100644
index 000000000000..dfebbdfb566e
--- /dev/null
+++ b/pkgs/os-specific/darwin/by-name/si/sigtool/0001-fix-build-with-gcc.patch
@@ -0,0 +1,24 @@
+From b18ae56b1bee86808d40f89900f999e835a7e1e9 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 13 Feb 2026 19:05:02 -0500
+Subject: [PATCH] fix-build-with-gcc
+
+---
+ emit.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/emit.h b/emit.h
+index 340f314..a8a6d3b 100644
+--- a/emit.h
++++ b/emit.h
+@@ -6,6 +6,7 @@
+ #include <memory>
+ #include <arpa/inet.h>
+ #include <cmath>
++#include <cstdint>
+ 
+ namespace SigTool {
+ 
+-- 
+2.51.2
+
diff --git a/pkgs/os-specific/darwin/by-name/si/sigtool/package.nix b/pkgs/os-specific/darwin/by-name/si/sigtool/package.nix
index 226956ba1cdd..d565bd4fb8c8 100644
--- a/pkgs/os-specific/darwin/by-name/si/sigtool/package.nix
+++ b/pkgs/os-specific/darwin/by-name/si/sigtool/package.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-K3VSFaqcZEomF7kROJz+AwxdW1MmxxEFDaRnWnzcw54=";
   };
 
+  patches = [
+    # Fix missing `UINT64_C` when building with GCC on Linux
+    ./0001-fix-build-with-gcc.patch
+  ];
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
 
diff --git a/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix b/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix
index a8b44093a9a5..7a911463152d 100644
--- a/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix
+++ b/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix
@@ -18,7 +18,11 @@
 let
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/by-name/to/top/package.nix b/pkgs/os-specific/darwin/by-name/to/top/package.nix
index ef7e6efe9d0e..69418a6d9b6c 100644
--- a/pkgs/os-specific/darwin/by-name/to/top/package.nix
+++ b/pkgs/os-specific/darwin/by-name/to/top/package.nix
@@ -9,7 +9,11 @@
 let
   f =
     pkgs: prev:
-    if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then
+    if
+      !pkgs.stdenv.hostPlatform.isDarwin
+      || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin"
+      || !(pkgs.stdenv ? __bootPackages)
+    then
       prev.darwin.sourceRelease
     else
       f pkgs.stdenv.__bootPackages pkgs;
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 136b7baeb6d9..8052d58a8eb3 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -129,6 +129,8 @@ lib.makeExtensible (self: {
   xcode_26_3_Apple_silicon = requireXcode "26.3_Apple_silicon" "sha256-q2p45zqAZUH6Z1Q3DHbZgpuuFTjZoMPhEfFdeIUvclw=";
   xcode_26_4 = requireXcode "26.4_Universal" "sha256-0Cg4Ytu2+JOLEqw1ZZoB6hxFXNA2KriTLwLpT8bmA7I=";
   xcode_26_4_Apple_silicon = requireXcode "26.4_Apple_silicon" "sha256-urkJVqUY6+5z0YiEqCru9M/OneDLAMzdGfOt7i3d1WI=";
+  xcode_26_4_1 = requireXcode "26.4.1_Universal" "sha256-N9QgPKfZV64gJPlr4r/0gPS0yAgJd3a+qlr0YbzMCU4=";
+  xcode_26_4_1_Apple_silicon = requireXcode "26.4.1_Apple_silicon" "sha256-8MtGX97e/2+zvY2Et9Jm9eXqVmyr+U02UqsKmffh9hs=";
   xcode =
     self."xcode_${
       lib.replaceStrings [ "." ] [ "_" ] (
diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix
index 04a9e8bf82d3..ebe9a880f0ca 100644
--- a/pkgs/os-specific/linux/akvcam/default.nix
+++ b/pkgs/os-specific/linux/akvcam/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "akvcam";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "webcamoid";
     repo = "akvcam";
     rev = version;
-    sha256 = "sha256-3fs+Kfafry77SQvsAidM29g9CcfjWirteS/VdNSWVCE=";
+    sha256 = "sha256-hjWmjMOxq1wX9/7RB+pUSPq/CxBzNOwV7VsYfbdrww4=";
   };
   sourceRoot = "${src.name}/src";
 
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 677b884d1c6d..4155f345bc7e 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -167,6 +167,7 @@ stdenv.mkDerivation rec {
     1 a busybox() { '$out'/bin/busybox "$@"; }\
     logger() { '$out'/bin/logger "$@"; }\
     ' ${debianDispatcherScript} > ${outDispatchPath}
+    sed -i 's|/sbin/resolvconf|"$(busybox which resolvconf)"|g' ${outDispatchPath}
     chmod 555 ${outDispatchPath}
     HOST_PATH=$out/bin patchShebangs --host ${outDispatchPath}
   '';
diff --git a/pkgs/os-specific/linux/drbd/utils.nix b/pkgs/os-specific/linux/drbd/utils.nix
index 7d16146e4244..6f365c9e3a59 100644
--- a/pkgs/os-specific/linux/drbd/utils.nix
+++ b/pkgs/os-specific/linux/drbd/utils.nix
@@ -16,6 +16,7 @@
   keyutils,
   udevCheckHook,
   gettext,
+  versionCheckHook,
 
   # drbd-utils are compiled twice, once with forOCF = true to extract
   # its OCF definitions for use in the ocf-resource-agents derivation,
@@ -25,12 +26,12 @@
   ocf-resource-agents,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "drbd";
   version = "9.33.0";
 
   src = fetchurl {
-    url = "https://pkg.linbit.com/downloads/drbd/utils/${pname}-utils-${version}.tar.gz";
+    url = "https://pkg.linbit.com/downloads/drbd/utils/drbd-utils-${finalAttrs.version}.tar.gz";
     hash = "sha256-Ij/gfQtkbpkbM7qepBRo+aZvkDVi59p2bdD8a06jPbk=";
   };
 
@@ -42,14 +43,16 @@ stdenv.mkDerivation rec {
     keyutils
     udevCheckHook
     gettext
+    perl
+    perlPackages.Po4a
   ];
 
   buildInputs = [
-    perl
-    perlPackages.Po4a
     gettext
   ];
 
+  strictDeps = true;
+
   configureFlags = [
     "--libdir=${placeholder "out"}/lib"
     "--sbindir=${placeholder "out"}/bin"
@@ -113,6 +116,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = [ "${placeholder "out"}/bin/drbdadm" ];
+  versionCheckProgramArg = "--version";
 
   passthru.tests.drbd = nixosTests.drbd;
 
@@ -131,4 +137,4 @@ stdenv.mkDerivation rec {
       mirroring the content of block devices (hard disks, partitions, logical volumes etc.) between hosts.
     '';
   };
-}
+})
diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index be0718d9b5dd..8a4e9d687929 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
 
+  postPatch = ''
+    substituteInPlace kernel/linux/ena/configure.sh --replace-fail '^HOSTCC' '^CC'
+  '';
   configurePhase = ''
     runHook preConfigure
     cd kernel/linux/ena
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 970bb43b9b2a..b35c04259335 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -185,6 +185,7 @@ let
       X86_INTEL_LPSS = yes;
       X86_INTEL_PSTATE = yes;
       X86_AMD_PSTATE = whenAtLeast "5.17" yes;
+      X86_AMD_PSTATE_DYNAMIC_EPP = whenAtLeast "7.1" yes;
       # Intel DPTF (Dynamic Platform and Thermal Framework) Support
       ACPI_DPTF = yes;
 
@@ -318,13 +319,14 @@ let
       IPV6_MROUTE = yes;
       IPV6_MROUTE_MULTIPLE_TABLES = yes;
       IPV6_PIMSM_V2 = yes;
-      IPV6_FOU_TUNNEL = module;
+      IPV6_FOU_TUNNEL = yes;
       IPV6_SEG6_LWTUNNEL = yes;
       IPV6_SEG6_HMAC = yes;
       IPV6_SEG6_BPF = yes;
       NET_CLS_ACT = yes;
       NET_CLS_BPF = module;
       NET_ACT_BPF = module;
+      NET_FOU = yes;
       NET_SCHED = yes;
       NET_SCH_BPF = whenAtLeast "6.16" (whenPlatformHasEBPFJit yes);
       L2TP_V3 = yes;
@@ -403,8 +405,8 @@ let
       MAC80211_DEBUGFS = yes;
 
       # HAM radio
-      HAMRADIO = yes;
-      AX25 = module;
+      HAMRADIO = whenOlder "7.1" yes;
+      AX25 = whenOlder "7.1" module;
     }
     // lib.optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
       # Not enabled by default, hides modules behind it
@@ -565,6 +567,9 @@ let
         # Enable CEC over DisplayPort
         DRM_DP_CEC = whenOlder "6.10" yes;
         DRM_DISPLAY_DP_AUX_CEC = whenAtLeast "6.10" yes;
+
+        # Enable RAS reporting via netlink
+        DRM_RAS = whenAtLeast "7.1" yes;
       }
       //
         lib.optionalAttrs
@@ -705,6 +710,7 @@ let
       EXT4_FS_SECURITY = yes;
 
       NTFS_FS = whenBetween "5.15" "6.9" no;
+      NTFS_FS_POSIX_ACL = whenAtLeast "7.1" yes;
       NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes;
       NTFS3_FS_POSIX_ACL = whenAtLeast "5.15" yes;
 
@@ -860,6 +866,14 @@ let
 
       INIT_ON_ALLOC_DEFAULT_ON = yes;
 
+      # Randomize kernel stack offset on syscall entry to make stack address dependent
+      # attacks harder, supported since 5.13.
+      # Only default enabled on AArch64 from 7.1 due to perf issues prior to that release
+      # that were resolved in "randomize_kstack: Maintain kstack_offset per task"
+      RANDOMIZE_KSTACK_OFFSET_DEFAULT = whenAtLeast (
+        if stdenv.hostPlatform.isAarch64 then "7.1" else "5.13"
+      ) yes;
+
       # Enable stack smashing protections in schedule()
       # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f
       SCHED_STACK_END_CHECK = yes;
@@ -1231,6 +1245,8 @@ let
         EFI = lib.mkIf stdenv.hostPlatform.isEfi yes;
         EFI_STUB = yes; # EFI bootloader in the bzImage itself
         EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = whenOlder "6.2" yes; # initrd kernel parameter for EFI
+        PSTORE = yes;
+        EFI_VARS_PSTORE = lib.mkIf (!stdenv.hostPlatform.isLoongArch64) yes;
 
         # Generic compression support for EFI payloads
         # Add new platforms only after they have been verified to build and boot.
@@ -1378,7 +1394,7 @@ let
         ) yes;
 
         # required for P2P DMABUF
-        DMABUF_MOVE_NOTIFY = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes);
+        DMABUF_MOVE_NOTIFY = lib.mkIf stdenv.hostPlatform.is64bit (whenBetween "6.6" "7.1" yes);
         # required for P2P transfers between accelerators
         HSA_AMD_P2P = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes);
 
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index a6e58099a242..37d28a722904 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,47 +1,42 @@
 {
     "testing": {
-        "version": "7.0-rc7",
-        "hash": "sha256:0d4199hy9z3md6ia1p2awy89y2fqpwvgadn0j850f4xckz2hqdgf",
+        "version": "7.1-rc1",
+        "hash": "sha256:030ip35npihl5az979w2cqymj5hl8h9na2930fa4ar4zkny83jzk",
         "lts": false
     },
     "6.1": {
-        "version": "6.1.169",
-        "hash": "sha256:0b7g7awbn1zryrh0pnjsh00d7j7ivda8i380jddhfj8ph1sfdjz0",
+        "version": "6.1.170",
+        "hash": "sha256:0i29gilsvl7vx7p6vqg0bc0d40ir1b968hyfjhdfms55g4pr2y5m",
         "lts": true
     },
     "5.15": {
-        "version": "5.15.203",
-        "hash": "sha256:0r6w6glfpzp6qz0kbxzpmabxwgw1y5k9a407lj98gsap5bcfgsqb",
+        "version": "5.15.204",
+        "hash": "sha256:1kfvfvzhdgjcj1pa2aqks3iah00ilfpp1i9bmbwjr3na0crlrzcv",
         "lts": true
     },
     "5.10": {
-        "version": "5.10.253",
-        "hash": "sha256:1j2sszv8j9s6qlrvbnyj1qf9aapl0srbps3g4bvf5s2hh29281zc",
+        "version": "5.10.254",
+        "hash": "sha256:17c63anhn63n2qki4n92xdr3cij6n3wmfa4sqai87kd1jyjkqivm",
         "lts": true
     },
     "6.6": {
-        "version": "6.6.135",
-        "hash": "sha256:0ahklx827y6rnh77a77bf4qr3sbp2z5z12l98avfv78nwznkilnk",
+        "version": "6.6.137",
+        "hash": "sha256:1i2npnsnhk41a88vimr521rxg77kljbkqmlyk1zrv7z4ic6ykwcj",
         "lts": true
     },
     "6.12": {
-        "version": "6.12.82",
-        "hash": "sha256:1a8r1wzfssrnqbf4yvbcfynf5w6la4vy1w5wlns1p63krl2hnmqf",
+        "version": "6.12.85",
+        "hash": "sha256:1v8a0z6znmr2m26l4744wndaimsh24zz6q4d7m4p8s0ayjcwjnp3",
         "lts": true
     },
     "6.18": {
-        "version": "6.18.23",
-        "hash": "sha256:0d2ihdz5hdy1ywhck76y9rnzzvkl2lhrb5xvc6w5l4ydpxv8wb9a",
+        "version": "6.18.26",
+        "hash": "sha256:1v5h0w3s8p5m22jxg992x1jfpwyi80ia70cdgiv47q3n6xfjyxsk",
         "lts": true
     },
-    "6.19": {
-        "version": "6.19.13",
-        "hash": "sha256:0j2ncikwi4mkx9v33ahzmi2qq2bx5f82701nnha1grs0lzzb2n85",
-        "lts": false
-    },
     "7.0": {
-        "version": "7.0",
-        "hash": "sha256:1w4i705i0nl1xqv7fdhdbhy7j3xrzhl31fabs6vmgiw7nf06szxv",
+        "version": "7.0.3",
+        "hash": "sha256:074zjl0v901a9hafgpcxyyd395qs7y4kr4fcpgg3ssc8ayzsvv8b",
         "lts": false
     }
 }
diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 4618051f261e..935534ec2e3b 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,14 +15,14 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.18.23";
-      hash = "sha256-IXR3gSaUsykNbdDxYCawDp6/5otc9wm88ewPGnpd5Kw=";
+      version = "6.18.25";
+      hash = "sha256-MC2hFOGC7WL0mrD4JEeCgRCNBYBYDt63jIP+HCgnTAg=";
       isLTS = true;
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.19.13";
-      hash = "sha256-r3CXmgMiZtD5ZHmGDsk2O1TwUR01iCX4m06royJMf68=";
+      version = "7.0.2";
+      hash = "sha256-RXdgP6jpy6GfZ70WG6k6rrryjHV2uUaqy4e+4jCgJek=";
     };
   };
 
@@ -58,7 +58,6 @@ let
 
             # Preemption
             PREEMPT = lib.mkOverride 60 yes;
-            PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
 
             # Google's BBRv3 TCP congestion Control
             TCP_CONG_BBR = yes;
@@ -90,6 +89,9 @@ let
             X86_FRED = yes;
             X86_POSTED_MSI = yes;
           }
+          // lib.optionalAttrs (lib.versionOlder (lib.versions.majorMinor version) "7.0") {
+            PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
+          }
           // lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor version) "6.13") {
             # Lazy preemption
             PREEMPT = lib.mkOverride 70 no;
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index e0a48a836268..8f07e6479bb3 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -18,7 +18,7 @@ in
 buildLinux (
   args
   // rec {
-    version = "6.19.12";
+    version = "7.0.3";
     pname = "linux-zen";
     modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
     isZen = true;
@@ -27,7 +27,7 @@ buildLinux (
       owner = "zen-kernel";
       repo = "zen-kernel";
       rev = "v${version}-${suffix}";
-      sha256 = "062qr3j5c3v4khv20q7g8lmrrvvg8708wwy02z3vygany43k3rgb";
+      sha256 = "16qbgrqq8wkp5gyy60n6rabpbyv47imaw9pnndg2mzisbb3cb808";
     };
 
     # This is based on the following source:
@@ -45,7 +45,6 @@ buildLinux (
 
       # Preempt (low-latency)
       PREEMPT = mkKernelOverride yes;
-      PREEMPT_VOLUNTARY = mkKernelOverride no;
       PREEMPT_LAZY = mkKernelOverride no;
 
       # Preemptible tree-based hierarchical RCU
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix
index 79ca931501d6..d9a96dd6e5a6 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix
@@ -14,11 +14,11 @@
 }:
 let
   inherit (import ./common.nix { inherit lib; }) pname meta;
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchurl {
     url = "https://musl.libc.org/releases/musl-${version}.tar.gz";
-    hash = "sha256-qaEYu+hNh2TaDqDSizqz+uhHf8fkCF2QECuFlvx8deQ=";
+    hash = "sha256-1YX9O2E8ZhUfwySejtRPdwIMtebB5jWmFtP5+CRgUSo=";
   };
 in
 bash.runCommand "${pname}-${version}"
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix
index 2376db89984e..e85e86d8de98 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/static.nix
@@ -16,11 +16,11 @@
 }:
 let
   inherit (import ./common.nix { inherit lib; }) pname meta;
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchurl {
     url = "https://musl.libc.org/releases/musl-${version}.tar.gz";
-    hash = "sha256-qaEYu+hNh2TaDqDSizqz+uhHf8fkCF2QECuFlvx8deQ=";
+    hash = "sha256-1YX9O2E8ZhUfwySejtRPdwIMtebB5jWmFtP5+CRgUSo=";
   };
 in
 bash.runCommand "${pname}-${version}"
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/tcc.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/tcc.nix
index 942399975fe8..0c379fee1509 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/musl/tcc.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/tcc.nix
@@ -15,11 +15,11 @@
 
 let
   inherit (import ./common.nix { inherit lib; }) pname meta;
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchurl {
     url = "https://musl.libc.org/releases/musl-${version}.tar.gz";
-    hash = "sha256-qaEYu+hNh2TaDqDSizqz+uhHf8fkCF2QECuFlvx8deQ=";
+    hash = "sha256-1YX9O2E8ZhUfwySejtRPdwIMtebB5jWmFtP5+CRgUSo=";
   };
 
   # Thanks to the live-bootstrap project!
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 290ee1da2b00..8fa9b8b8fe8b 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -10,23 +10,6 @@ unpackFile() {
 }
 
 
-buildPhase() {
-    runHook preBuild
-
-    if [ -n "$bin" ]; then
-        # Create the module.
-        echo "Building linux driver against kernel: $kernel";
-        cd kernel
-        unset src # used by the nv makefile
-        make $makeFlags -j $NIX_BUILD_CORES module
-
-        cd ..
-    fi
-
-    runHook postBuild
-}
-
-
 installPhase() {
     runHook preInstall
 
@@ -68,6 +51,7 @@ installPhase() {
         rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately
         rm -f $i/lib/libnvidia-gtk* # built from source
         rm -f $i/lib/libnvidia-wayland-client* # built from source
+        rm -f $i/lib/libnvidia-egl-* # built from source
         if [ "$useGLVND" = "1" ]; then
             # Pre-built libglvnd
             rm $i/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*
@@ -96,13 +80,7 @@ installPhase() {
             else
                 sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed
             fi
-
-            # nvidia currently only supports x86_64 and i686
-            if [ "$i" == "$lib32" ]; then
-                install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.i686.json
-            else
-                install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.x86_64.json
-            fi
+            install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.json
         fi
 
         if [ -e nvidia_layers.json ]; then
@@ -112,17 +90,14 @@ installPhase() {
 
         # EGL
         if [ "$useGLVND" = "1" ]; then
-            mkdir -p "$i/share/egl/egl_external_platform.d"
-            for icdname in $(find . -name '*_nvidia*.json')
-            do
-                cat "$icdname" | jq ".ICD.library_path |= \"$i/lib/\(.)\"" | tee "$i/share/egl/egl_external_platform.d/$icdname"
-            done
-
             # glvnd icd
             mkdir -p "$i/share/glvnd/egl_vendor.d"
-            mv "$i/share/egl/egl_external_platform.d/10_nvidia.json" "$i/share/glvnd/egl_vendor.d/10_nvidia.json"
+            for icdname in "10_nvidia.json";
+            do
+                cat "$icdname" | jq ".ICD.library_path |= \"$i/lib/\(.)\"" | tee "$i/share/glvnd/egl_vendor.d/$icdname"
+            done
 
-            if [[ -f "$i/share/egl/egl_external_platform.d/15_nvidia_gbm.json" ]]; then
+            if [[ -f "15_nvidia_gbm.json" ]]; then
               mkdir -p $i/lib/gbm
               ln -s $i/lib/libnvidia-allocator.so $i/lib/gbm/nvidia-drm_gbm.so
             fi
@@ -152,13 +127,6 @@ installPhase() {
         mkdir -p $bin/lib/xorg/modules/extensions
         cp -p libglx*.so* $bin/lib/xorg/modules/extensions
 
-        # Install the kernel module.
-        mkdir -p $bin/lib/modules/$kernelVersion/misc
-        for i in $(find ./kernel -name '*.ko'); do
-            nuke-refs $i
-            cp $i $bin/lib/modules/$kernelVersion/misc/
-        done
-
         # Install application profiles.
         if [ "$useProfiles" = "1" ]; then
             mkdir -p $bin/share/nvidia
@@ -167,6 +135,11 @@ installPhase() {
         fi
     fi
 
+    # Install the proprietary kernel module build files.
+    if [ -n "$modsrc" ]; then
+        cp -r kernel $modsrc
+    fi
+
     if [ -n "$firmware" ]; then
         # Install the GSP firmware
         install -Dm644 -t $firmware/lib/firmware/nvidia/$version firmware/gsp*.bin
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 709f3d838af5..f53b05469296 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -6,6 +6,7 @@
   fetchpatch,
   stdenv,
   pkgsi686Linux,
+  kernel,
 }:
 
 let
@@ -18,20 +19,9 @@ let
       lib32 =
         (pkgsi686Linux.callPackage imported {
           libsOnly = true;
-          kernel = null;
         }).out;
     };
 
-  kernel =
-    # a hacky way of extracting parameters from callPackage
-    callPackage (
-      {
-        kernel,
-        libsOnly ? false,
-      }:
-      if libsOnly then { } else kernel
-    ) { };
-
   selectHighestVersion = a: b: if lib.versionOlder a.version b.version then b else a;
 
   # https://forums.developer.nvidia.com/t/linux-6-7-3-545-29-06-550-40-07-error-modpost-gpl-incompatible-module-nvidia-ko-uses-gpl-only-symbol-rcu-read-lock/280908/19
@@ -76,16 +66,20 @@ rec {
   # Policy: use the highest stable version as the default (on our master).
   stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production;
 
+  latest = selectHighestVersion production new_feature;
+
+  bleeding_edge = selectHighestVersion latest beta;
+
   production = generic {
-    version = "595.58.03";
-    sha256_64bit = "sha256-jA1Plnt5MsSrVxQnKu6BAzkrCnAskq+lVRdtNiBYKfk=";
-    sha256_aarch64 = "sha256-hzzIKY1Te8QkCBWR+H5k1FB/HK1UgGhai6cl3wEaPT8=";
-    openSha256 = "sha256-6LvJyT0cMXGS290Dh8hd9rc+nYZqBzDIlItOFk8S4n8=";
-    settingsSha256 = "sha256-2vLF5Evl2D6tRQJo0uUyY3tpWqjvJQ0/Rpxan3NOD3c=";
-    persistencedSha256 = "sha256-AtjM/ml/ngZil8DMYNH+P111ohuk9mWw5t4z7CHjPWw=";
+    version = "595.71.05";
+    sha256_64bit = "sha256-NiA7iWC35JyKQva6H1hjzeNKBek9KyS3mK8G3YRva4I=";
+    sha256_aarch64 = "sha256-XzKloS00dFKTd4ATWkTIhm9eG/OzR/Sim6MboNZWPu8=";
+    openSha256 = "sha256-Lfz71QWKM6x/jD2B22SWpUi7/og30HRlXg1kL3EWzEw=";
+    settingsSha256 = "sha256-mXnf3jyvznfB3OfKd657rxv0rYHQb/dX/Riw/+N9EKU=";
+    persistencedSha256 = "sha256-Z/6IvEEa/XfZ5F5qoSIPvXJLGtscYVqjFxHZaN/M2Ts=";
   };
 
-  latest = selectHighestVersion production (generic {
+  new_feature = generic {
     version = "590.48.01";
     sha256_64bit = "sha256-ueL4BpN4FDHMh/TNKRCeEz3Oy1ClDWto1LO/LWlr1ok=";
     sha256_aarch64 = "sha256-FOz7f6pW1NGM2f74kbP6LbNijxKj5ZtZ08bm0aC+/YA=";
@@ -93,16 +87,16 @@ rec {
     settingsSha256 = "sha256-NWsqUciPa4f1ZX6f0By3yScz3pqKJV1ei9GvOF8qIEE=";
     persistencedSha256 = "sha256-wsNeuw7IaY6Qc/i/AzT/4N82lPjkwfrhxidKWUtcwW8=";
     patchesOpen = [ kernel_6_19_patch ];
-  });
+  };
 
-  beta = selectHighestVersion latest (generic {
+  beta = generic {
     version = "595.45.04";
     sha256_64bit = "sha256-zUllSSRsuio7dSkcbBTuxF+dN12d6jEPE0WgGvVOj14=";
     sha256_aarch64 = "sha256-jl6lQWsgF6ya22sAhYPpERJ9r+wjnWzbGnINDpUMzsk=";
     openSha256 = "sha256-uqNfImwTKhK8gncUdP1TPp0D6Gog4MSeIJMZQiJWDoE=";
     settingsSha256 = "sha256-Y45pryyM+6ZTJyRaRF3LMKaiIWxB5gF5gGEEcQVr9nA=";
     persistencedSha256 = "sha256-5FoeUaRRMBIPEWGy4Uo0Aho39KXmjzQsuAD9m/XkNpA=";
-  });
+  };
 
   # Vulkan developer beta driver
   # See here for more information: https://developer.nvidia.com/vulkan-driver
@@ -126,6 +120,7 @@ rec {
     sha256_64bit = "sha256-ueL4BpN4FDHMh/TNKRCeEz3Oy1ClDWto1LO/LWlr1ok=";
     persistencedSha256 = "sha256-wsNeuw7IaY6Qc/i/AzT/4N82lPjkwfrhxidKWUtcwW8=";
     fabricmanagerSha256 = "sha256-f/AQ8HrgoqBQyXNrXA/UaI4OMQ9QcjjYWIhr1/5uM74=";
+    openSha256 = "sha256-hECHfguzwduEfPo5pCDjWE/MjtRDhINVr4b1awFdP44=";
     useSettings = false;
     usePersistenced = true;
     useFabricmanager = true;
@@ -137,6 +132,7 @@ rec {
     sha256_64bit = "sha256-TKxT5I+K3/Zh1HyHiO0kBZokjJ/YCYzq/QiKSYmG7CY=";
     persistencedSha256 = "sha256-J1UwS0o/fxz45gIbH9uaKxARW+x4uOU1scvAO4rHU5Y=";
     fabricmanagerSha256 = "sha256-tyCHKIr8nxVfZIqcWKAwRoMLzmGlsOUhDlO5V/9W97Y=";
+    openSha256 = "sha256-ychsaurbQ2KNFr/SAprKI2tlvAigoKoFU1H7+SaxSrY=";
     useSettings = false;
     usePersistenced = true;
     useFabricmanager = true;
@@ -148,6 +144,7 @@ rec {
     sha256_64bit = "sha256-AlaGfggsr5PXsl+nyOabMWBiqcbHLG4ij617I4xvoX0=";
     persistencedSha256 = "sha256-x4K0Gp89LdL5YJhAI0AydMRxl6fyBylEnj+nokoBrK8=";
     fabricmanagerSha256 = "sha256-jSTKzeRVTUcYma1Cb0ajSdXKCi6KzUXCp2OByPSWSR4=";
+    openSha256 = "sha256-aTV5J4zmEgRCOavo6wLwh5efOZUG+YtoeIT/tnrC1Hg=";
     useSettings = false;
     usePersistenced = true;
     useFabricmanager = true;
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 4ee461ed8cbf..606a6e715cc1 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -41,16 +41,12 @@
   pkgsi686Linux,
   fetchurl,
   fetchzip,
-  kernel ? null,
-  kernelModuleMakeFlags ? [ ],
-  perl,
-  nukeReferences,
   which,
   libarchive,
   jq,
-  # Whether to build the libraries only (i.e. not the kernel module or
-  # nvidia-settings).  Used to support 32-bit binaries on 64-bit
-  # Linux.
+  zstd,
+  # Whether to build only userspace libraries (without bin/modsrc/firmware
+  # outputs). Used to support 32-bit binaries on 64-bit Linux.
   libsOnly ? false,
   # don't include the bundled 32-bit libraries on 64-bit platforms,
   # even if it’s in downloaded binary
@@ -65,7 +61,6 @@
   acceptLicense ? config.nvidia.acceptLicense or false,
 }:
 
-assert !libsOnly -> kernel != null;
 assert lib.versionOlder version "391" -> sha256_32bit != null;
 assert useSettings -> settingsSha256 != null;
 assert usePersistenced -> persistencedSha256 != null;
@@ -96,7 +91,6 @@ let
           --clean "$patch" > "$out"
       '';
 
-  nameSuffix = lib.optionalString (!libsOnly) "-${kernel.version}";
   pkgSuffix = lib.optionalString (lib.versionOlder version "304") "-pkg0";
   i686bundled = lib.versionAtLeast version "391" && !disable32Bit;
 
@@ -143,7 +137,6 @@ let
 in
 
 stdenv.mkDerivation (finalAttrs: {
-  name = "${finalAttrs.pname}-${finalAttrs.version}${nameSuffix}";
   pname = "nvidia-${if useFabricmanager then "dc" else "x11"}";
 
   builder = ./builder.sh;
@@ -201,31 +194,13 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
   ]
   ++ lib.optional i686bundled "lib32"
-  ++ lib.optional (!libsOnly) "bin"
+  ++ lib.optionals (!libsOnly) [
+    "bin"
+    "modsrc"
+  ]
   ++ lib.optional (!libsOnly && firmware) "firmware";
   outputDev = if libsOnly then null else "bin";
 
-  kernel = if libsOnly then null else kernel.dev;
-  kernelVersion = if libsOnly then null else kernel.modDirVersion;
-
-  makeFlags = lib.optionals (!libsOnly) (
-    kernelModuleMakeFlags
-    ++ [
-      "IGNORE_PREEMPT_RT_PRESENCE=1"
-      "NV_BUILD_SUPPORTS_HMM=1"
-      "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-      "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      "C_INCLUDE_PATH=${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"
-    ]
-  );
-
-  hardeningDisable = [
-    "pic"
-    "format"
-  ];
-
   dontStrip = true;
   dontPatchELF = true;
 
@@ -233,15 +208,12 @@ stdenv.mkDerivation (finalAttrs: {
   libPath32 = lib.optionalString i686bundled (libPathFor pkgsi686Linux);
 
   nativeBuildInputs = [
-    perl
-    nukeReferences
-    which
     libarchive
     jq
   ]
-  ++ lib.optionals (!libsOnly) kernel.moduleBuildDependencies;
-
-  disallowedReferences = lib.optionals (!libsOnly) [ kernel.dev ];
+  # NVIDIA has changed the compression format of their driver to zstd since version 530.30.02
+  # https://forums.developer.nvidia.com/t/linux-solaris-and-freebsd-driver-530-30-02-beta/244406
+  ++ (if (lib.versionAtLeast version "530") then [ zstd ] else [ which ]);
 
   passthru =
     let
@@ -274,9 +246,17 @@ stdenv.mkDerivation (finalAttrs: {
         );
     in
     {
+      mod = callPackage ./kernel-modules.nix {
+        open = false;
+        nvidia_x11 = finalAttrs.finalPackage;
+        # build files already patched when building the main package, so no need to patch them again
+        patches = [ ];
+        inherit broken;
+      };
       open = lib.mapNullable (
         hash:
-        callPackage ./open.nix {
+        callPackage ./kernel-modules.nix {
+          open = true;
           inherit hash;
           nvidia_x11 = finalAttrs.finalPackage;
           patches =
@@ -339,11 +319,15 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals (sha256_32bit != null) [ "i686-linux" ]
     ++ lib.optionals (sha256_aarch64 != null) [ "aarch64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [
+      binaryNativeCode
+      binaryFirmware
+    ];
     maintainers = with lib.maintainers; [
       kiskae
       edwtjo
     ];
     priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
-    inherit broken;
+    broken = broken && brokenOpen;
   };
 })
diff --git a/pkgs/os-specific/linux/nvidia-x11/kernel-modules.nix b/pkgs/os-specific/linux/nvidia-x11/kernel-modules.nix
new file mode 100644
index 000000000000..9e6998017f87
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/kernel-modules.nix
@@ -0,0 +1,81 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  kernel,
+  kernelModuleMakeFlags,
+  nvidia_x11,
+  open,
+  patches,
+  broken,
+  hash ? null,
+}:
+
+assert open -> hash != null;
+
+stdenv.mkDerivation {
+  pname = "nvidia-${if open then "open" else "kernel-modules"}";
+  version = "${nvidia_x11.version}-${kernel.version}";
+
+  src =
+    if open then
+      fetchFromGitHub {
+        owner = "NVIDIA";
+        repo = "open-gpu-kernel-modules";
+        tag = nvidia_x11.version;
+        inherit hash;
+      }
+    else
+      nvidia_x11.modsrc;
+
+  inherit patches;
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  makeFlags =
+    kernelModuleMakeFlags
+    ++ [
+      "IGNORE_PREEMPT_RT_PRESENCE=1"
+      "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+      "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+      "MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
+      "DATE="
+      "TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "C_INCLUDE_PATH=${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"
+    ];
+
+  buildTargets = [ "modules" ];
+  installTargets = [ "modules_install" ];
+  enableParallelBuilding = true;
+
+  allowedReferences = [ ];
+
+  meta = {
+    description = "NVIDIA Linux ${lib.optionalString open "Open "}GPU Kernel Modules";
+    homepage =
+      if open then "https://github.com/NVIDIA/open-gpu-kernel-modules" else nvidia_x11.meta.homepage;
+    license =
+      if open then
+        with lib.licenses;
+        [
+          gpl2Plus
+          mit
+        ]
+      else
+        nvidia_x11.meta.license;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    sourceProvenance =
+      with lib.sourceTypes;
+      [
+        fromSource
+      ]
+      ++ lib.optional (!open) binaryNativeCode;
+    maintainers = with lib.maintainers; [ nickcao ];
+    inherit broken;
+  };
+}
diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix
deleted file mode 100644
index 5a897e0dd138..000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/open.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  kernel,
-  kernelModuleMakeFlags,
-  nvidia_x11,
-  hash,
-  patches ? [ ],
-  broken ? false,
-}:
-
-stdenv.mkDerivation {
-  pname = "nvidia-open";
-  version = "${kernel.version}-${nvidia_x11.version}";
-
-  src = fetchFromGitHub {
-    owner = "NVIDIA";
-    repo = "open-gpu-kernel-modules";
-    rev = nvidia_x11.version;
-    inherit hash;
-  };
-
-  inherit patches;
-
-  nativeBuildInputs = kernel.moduleBuildDependencies;
-
-  makeFlags =
-    kernelModuleMakeFlags
-    ++ [
-      "IGNORE_PREEMPT_RT_PRESENCE=1"
-      "SYSSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-      "SYSOUT=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-      "MODLIB=$(out)/lib/modules/${kernel.modDirVersion}"
-      "DATE="
-      "TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      "C_INCLUDE_PATH=${lib.getLib stdenv.cc.cc}/lib/clang/${lib.versions.major stdenv.cc.cc.version}/include"
-    ];
-
-  installTargets = [ "modules_install" ];
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "NVIDIA Linux Open GPU Kernel Module";
-    homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules";
-    license = with lib.licenses; [
-      gpl2Plus
-      mit
-    ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-    maintainers = with lib.maintainers; [ nickcao ];
-    inherit broken;
-  };
-}
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index cf9a8f0f404b..556e53f937af 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -4,10 +4,11 @@ nvidia_x11: sha256:
   stdenv,
   lib,
   fetchFromGitHub,
+  buildPackages,
   m4,
-  glibc,
-  libtirpc,
   pkg-config,
+  addDriverRunpath,
+  libtirpc,
 }:
 
 stdenv.mkDerivation {
@@ -21,23 +22,29 @@ stdenv.mkDerivation {
     inherit sha256;
   };
 
-  env = {
-    LIBRARY_PATH = "${glibc}/lib";
+  env = lib.optionalAttrs (lib.versionOlder nvidia_x11.persistencedVersion "450.51") {
     NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
+    NIX_LDFLAGS = toString [ "-ltirpc" ];
   };
-  NIX_LDFLAGS = [ "-ltirpc" ];
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [
     m4
     pkg-config
+    addDriverRunpath
   ];
 
   buildInputs = [
     libtirpc
-    stdenv.cc.cc.lib
   ];
 
-  makeFlags = nvidia_x11.makeFlags ++ [ "DATE=true" ];
+  makeFlags = [
+    "DATE=true"
+    "DO_STRIP="
+    "HOST_CC=\$(CC_FOR_BUILD)"
+    "HOST_LD=\$(LD_FOR_BUILD)"
+  ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
@@ -47,8 +54,7 @@ stdenv.mkDerivation {
     cp $out/{bin,origBin}/nvidia-persistenced
     patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 $out/origBin/nvidia-persistenced
 
-    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-persistenced):${nvidia_x11}/lib" \
-      $out/bin/nvidia-persistenced
+    addDriverRunpath $out/bin/nvidia-persistenced
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
index 9e6f0ba7be7b..138b8c92dba2 100644
--- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -27,7 +27,7 @@ index 25e229bf3e..b9af1c3b13 100644
                          "/etc"))
                  return true;
 diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
-index 46f208824a..3a625ad2a6 100644
+index 7729a1d415..744abeee23 100644
 --- a/src/shutdown/umount.c
 +++ b/src/shutdown/umount.c
 @@ -178,8 +178,10 @@ int mount_points_list_get(FILE *f, MountPoint **head) {
diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
index 745e7181543d..fc80edc766cf 100644
--- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
  1 file changed, 2 insertions(+)
 
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 6e615d280a..e16cb17c7f 100644
+index 84e94e845a..a0052c1c88 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -6223,6 +6223,7 @@ static int run(int argc, char *argv[]) {
+@@ -6368,6 +6368,7 @@ static int run(int argc, char *argv[]) {
                                  goto finish;
                          }
                  } else {
@@ -21,11 +21,11 @@ index 6e615d280a..e16cb17c7f 100644
                          _cleanup_free_ char *p = NULL;
  
                          if (arg_pivot_root_new)
-@@ -6242,6 +6243,7 @@ static int run(int argc, char *argv[]) {
+@@ -6387,6 +6388,7 @@ static int run(int argc, char *argv[]) {
                                  log_error_errno(r, "Unable to determine if %s looks like it has an OS tree (i.e. whether /usr/ exists): %m", arg_directory);
                                  goto finish;
                          }
 +#endif
                  }
  
-                 if (arg_userns_mode == USER_NAMESPACE_MANAGED) {
+                 if (userns_fd >= 0) {
diff --git a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
index 0c9f1d206d6b..6ba6bcffd76c 100644
--- a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
+++ b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
@@ -46,10 +46,10 @@ index 862d57dcb6..8ba0ca4486 100644
  
  systemd_sleep_dir=${prefix}/lib/systemd/system-sleep
 diff --git a/src/libsystemd/sd-path/path-lookup.c b/src/libsystemd/sd-path/path-lookup.c
-index 389d7e2ad9..0819689ffa 100644
+index 32c14fb14a..7f0bf62844 100644
 --- a/src/libsystemd/sd-path/path-lookup.c
 +++ b/src/libsystemd/sd-path/path-lookup.c
-@@ -86,11 +86,7 @@ int runtime_directory(RuntimeScope scope, const char *fallback_suffix, char **re
+@@ -102,11 +102,7 @@ int runtime_directory(RuntimeScope scope, const char *fallback_suffix, char **re
  }
  
  static const char* const user_data_unit_paths[] = {
@@ -61,7 +61,7 @@ index 389d7e2ad9..0819689ffa 100644
          NULL
  };
  
-@@ -498,16 +494,13 @@ int lookup_paths_init(
+@@ -519,16 +515,13 @@ int lookup_paths_init(
                                         persistent_config,
                                         SYSTEM_CONFIG_UNIT_DIR,
                                         "/etc/systemd/system",
@@ -79,7 +79,7 @@ index 389d7e2ad9..0819689ffa 100644
                                         STRV_IFNOTNULL(generator_late));
                          break;
  
-@@ -525,13 +518,10 @@ int lookup_paths_init(
+@@ -546,13 +539,10 @@ int lookup_paths_init(
                          add = strv_new(persistent_config,
                                         USER_CONFIG_UNIT_DIR,
                                         "/etc/systemd/user",
@@ -95,7 +95,7 @@ index 389d7e2ad9..0819689ffa 100644
                          break;
  
                  case RUNTIME_SCOPE_USER:
-@@ -670,7 +660,6 @@ void lookup_paths_log(LookupPaths *lp) {
+@@ -692,7 +682,6 @@ void lookup_paths_log(LookupPaths *lp) {
  static const char* const system_generator_paths[] = {
          "/run/systemd/system-generators",
          "/etc/systemd/system-generators",
@@ -103,7 +103,7 @@ index 389d7e2ad9..0819689ffa 100644
          SYSTEM_GENERATOR_DIR,
          NULL,
  };
-@@ -678,7 +667,6 @@ static const char* const system_generator_paths[] = {
+@@ -700,7 +689,6 @@ static const char* const system_generator_paths[] = {
  static const char* const user_generator_paths[] = {
          "/run/systemd/user-generators",
          "/etc/systemd/user-generators",
@@ -111,7 +111,7 @@ index 389d7e2ad9..0819689ffa 100644
          USER_GENERATOR_DIR,
          NULL,
  };
-@@ -686,7 +674,6 @@ static const char* const user_generator_paths[] = {
+@@ -708,7 +696,6 @@ static const char* const user_generator_paths[] = {
  static const char* const system_env_generator_paths[] = {
          "/run/systemd/system-environment-generators",
          "/etc/systemd/system-environment-generators",
@@ -119,7 +119,7 @@ index 389d7e2ad9..0819689ffa 100644
          SYSTEM_ENV_GENERATOR_DIR,
          NULL,
  };
-@@ -694,7 +681,6 @@ static const char* const system_env_generator_paths[] = {
+@@ -716,7 +703,6 @@ static const char* const system_env_generator_paths[] = {
  static const char* const user_env_generator_paths[] = {
          "/run/systemd/user-environment-generators",
          "/etc/systemd/user-environment-generators",
diff --git a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
index bee57fa30b55..112f3f509f54 100644
--- a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
@@ -13,10 +13,10 @@ in containers.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index a5a51023c5..22cc7bd789 100644
+index 79fa19d976..2115d74595 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -1578,7 +1578,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
+@@ -1579,7 +1579,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
                  if (!unit_is_bound_by_inactive(u, &culprit))
                          continue;
  
diff --git a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
index 82f9198d7d4e..2abe659a42bf 100644
--- a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
+++ b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
@@ -11,10 +11,10 @@ Subject: [PATCH] hostnamed, localed, timedated: disable methods that change
  3 files changed, 25 insertions(+)
 
 diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index fbe1b2fa7a..30e7c75279 100644
+index 04c72e8137..1f9f296d56 100644
 --- a/src/hostname/hostnamed.c
 +++ b/src/hostname/hostnamed.c
-@@ -1388,6 +1388,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
+@@ -1421,6 +1421,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
          if (r < 0)
                  return r;
  
@@ -24,7 +24,7 @@ index fbe1b2fa7a..30e7c75279 100644
          name = empty_to_null(name);
  
          context_read_etc_hostname(c);
-@@ -1454,6 +1457,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
+@@ -1487,6 +1490,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
          if (r < 0)
                  return r;
  
@@ -69,10 +69,10 @@ index 041ba29cd8..02fbe3e278 100644
  
          r = x11_context_verify_and_warn(&in, LOG_ERR, error);
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index d1ef772b56..9b1fe439f1 100644
+index 43cf3fddb9..1455830cba 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
-@@ -678,6 +678,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
+@@ -680,6 +680,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
          if (r < 0)
                  return r;
  
@@ -83,7 +83,7 @@ index d1ef772b56..9b1fe439f1 100644
          if (!timezone_is_valid(z, LOG_DEBUG))
                  return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);
  
-@@ -756,6 +760,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
+@@ -758,6 +762,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
          if (r < 0)
                  return r;
  
@@ -93,7 +93,7 @@ index d1ef772b56..9b1fe439f1 100644
          if (lrtc == c->local_rtc && !fix_system)
                  return sd_bus_reply_method_return(m, NULL);
  
-@@ -954,6 +961,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
+@@ -956,6 +963,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
          if (r < 0)
                  return r;
  
diff --git a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index 2ad26b56efee..71c25227d4dc 100644
--- a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Change /usr/share/zoneinfo to /etc/zoneinfo
 
 NixOS uses this path.
 ---
- man/localtime.xml         | 4 ++--
- src/basic/time-util.c     | 8 ++++----
- src/firstboot/firstboot.c | 9 +++------
- src/nspawn/nspawn.c       | 4 ++--
- src/timedate/timedated.c  | 8 ++++----
- 5 files changed, 15 insertions(+), 18 deletions(-)
+ man/localtime.xml         |  4 ++--
+ src/basic/time-util.c     |  8 ++++----
+ src/firstboot/firstboot.c |  9 +++------
+ src/nspawn/nspawn.c       |  4 ++--
+ src/timedate/timedated.c  | 15 +++++++++------
+ 5 files changed, 20 insertions(+), 20 deletions(-)
 
 diff --git a/man/localtime.xml b/man/localtime.xml
 index 3a13e04a27..4fd58068a1 100644
@@ -35,7 +35,7 @@ index 3a13e04a27..4fd58068a1 100644
      <literal>Etc/UTC</literal>. The resulting link should lead to the
      corresponding binary
 diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index 5dd00af952..e682337ef0 100644
+index 5dd00af952..b97a41f6ac 100644
 --- a/src/basic/time-util.c
 +++ b/src/basic/time-util.c
 @@ -1443,7 +1443,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
@@ -70,15 +70,15 @@ index 5dd00af952..e682337ef0 100644
                  return r; /* Return EINVAL if not a symlink */
  
 -        const char *e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/");
-+        const char *e = PATH_STARTSWITH_SET(t, "/etc/zoneinfo/", "../etc/zoneinfo/", "zoneinfo/");
++        const char *e = PATH_STARTSWITH_SET(t, "/etc/zoneinfo/", "../etc/zoneinfo/");
          if (!e)
                  return -EINVAL;
          if (!timezone_is_valid(e, LOG_DEBUG))
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index 38e3adaed6..953ad05fb5 100644
+index ae1899593c..20d3071114 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
-@@ -576,7 +576,7 @@ static int prompt_timezone(int rfd, sd_varlink **mute_console_link) {
+@@ -584,7 +584,7 @@ static int prompt_timezone(int rfd, sd_varlink **mute_console_link) {
  
  static int process_timezone(int rfd, sd_varlink **mute_console_link) {
          _cleanup_close_ int pfd = -EBADF;
@@ -87,7 +87,7 @@ index 38e3adaed6..953ad05fb5 100644
          const char *e;
          int r;
  
-@@ -622,12 +622,9 @@ static int process_timezone(int rfd, sd_varlink **mute_console_link) {
+@@ -630,12 +630,9 @@ static int process_timezone(int rfd, sd_varlink **mute_console_link) {
          if (isempty(arg_timezone))
                  return 0;
  
@@ -103,25 +103,25 @@ index 38e3adaed6..953ad05fb5 100644
                  return log_error_errno(r, "Failed to create /etc/localtime symlink: %m");
  
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index e16cb17c7f..ff15d9d7f2 100644
+index a0052c1c88..cd4a48c9ef 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -1820,8 +1820,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
+@@ -1856,8 +1856,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
  static const char *timezone_from_path(const char *path) {
          return PATH_STARTSWITH_SET(
                          path,
 -                        "../usr/share/zoneinfo/",
 -                        "/usr/share/zoneinfo/");
-+                        "../etc/zoneinfo/", "zoneinfo/",
++                        "../etc/zoneinfo/",
 +                        "/etc/zoneinfo/");
  }
  
  static bool etc_writable(void) {
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 9b1fe439f1..916886aeff 100644
+index 1455830cba..6849ada033 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
-@@ -266,7 +266,7 @@ static int context_read_data(Context *c) {
+@@ -268,7 +268,7 @@ static int context_read_data(Context *c) {
  
          r = get_timezone(&t);
          if (r == -EINVAL)
@@ -130,7 +130,7 @@ index 9b1fe439f1..916886aeff 100644
          else if (r < 0)
                  log_warning_errno(r, "Failed to get target of /etc/localtime: %m");
  
-@@ -290,7 +290,7 @@ static int context_write_data_timezone(Context *c) {
+@@ -292,7 +292,7 @@ static int context_write_data_timezone(Context *c) {
  
          if (isempty(c->zone) || streq(c->zone, "UTC")) {
  
@@ -139,7 +139,7 @@ index 9b1fe439f1..916886aeff 100644
  
                          if (unlink(etc_localtime()) < 0 && errno != ENOENT)
                                  return -errno;
-@@ -298,9 +298,9 @@ static int context_write_data_timezone(Context *c) {
+@@ -300,17 +300,20 @@ static int context_write_data_timezone(Context *c) {
                          return 0;
                  }
  
@@ -151,3 +151,16 @@ index 9b1fe439f1..916886aeff 100644
                  if (!p)
                          return -ENOMEM;
  
+                 source = p;
+         }
+ 
+-        return symlinkat_atomic_full(source, AT_FDCWD, etc_localtime(),
+-                                     !secure_getenv("SYSTEMD_ETC_LOCALTIME"));
++        /* With zoneinfo being at /etc/zoneinfo instead of /usr/share/zoneinfo on NixOS, and etc_localtime() left untouched
++         * at /etc/localtime, a relative symlink would look like zoneinfo/UTC instead of ../usr/share/zoneinfo/UTC. This is
++         * an issue because not just systemd itself (src/basic/time-util.c @@ get_timezone), but also others like icu::TimeZone
++         * reject such symlinks. Forcing the symlink to be absolute (/etc/zoneinfo/UTC) takes care of at least both of them. */
++        return symlinkat_atomic_full(source, AT_FDCWD, etc_localtime(), /* flags */ 0);
+ }
+ 
+ static const char* etc_adjtime(void) {
diff --git a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
index 6b02907d6d60..813a6317dfd5 100644
--- a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
@@ -12,7 +12,7 @@ files that I might have missed.
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/basic/constants.h b/src/basic/constants.h
-index a26cff4062..3800c37e1b 100644
+index 3dbffdee26..d3c3a1b067 100644
 --- a/src/basic/constants.h
 +++ b/src/basic/constants.h
 @@ -40,13 +40,15 @@
diff --git a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
index 37b56151b0b2..5de6a93cd7f9 100644
--- a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
@@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
-index ff68f9e272..53f2ba1eee 100644
+index fc6df238be..cb8b45a41b 100644
 --- a/src/shutdown/shutdown.c
 +++ b/src/shutdown/shutdown.c
-@@ -329,6 +329,7 @@ static void notify_supervisor(void) {
+@@ -330,6 +330,7 @@ static void notify_supervisor(void) {
  int main(int argc, char *argv[]) {
          static const char* const dirs[] = {
                  SYSTEM_SHUTDOWN_PATH,
diff --git a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
index e39b77a9f86c..5da56ce4be17 100644
--- a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+++ b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
@@ -9,7 +9,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index 0d128053ba..4deec9f72d 100644
+index 43aaede5b0..a8e5a75e39 100644
 --- a/src/sleep/sleep.c
 +++ b/src/sleep/sleep.c
 @@ -248,6 +248,7 @@ static int execute(
diff --git a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
index 9b2955528b8d..b0b2c5384b9b 100644
--- a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+++ b/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
@@ -10,7 +10,7 @@ systemd itself uses extensively.
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/basic/path-util.h b/src/basic/path-util.h
-index 5b2baef4e1..7f366e4544 100644
+index e2e80ae91f..9f856490a3 100644
 --- a/src/basic/path-util.h
 +++ b/src/basic/path-util.h
 @@ -9,11 +9,11 @@
diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
index 5f2663d71425..4645b2f6d269 100644
--- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
+++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
@@ -16,10 +16,10 @@ executables that are being called from managers.
  1 file changed, 8 insertions(+)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index 22cc7bd789..0a56da1307 100644
+index 2115d74595..86f697313b 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -3996,9 +3996,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
+@@ -3999,9 +3999,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
           * adjust generated units to that. Let's pass down some bits of information that are easy for us to
           * determine (but a bit harder for generator scripts to determine), as environment variables. */
  
diff --git a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
index 91c6ba58515e..2cf174823605 100644
--- a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
+++ b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
@@ -27,11 +27,11 @@ filename_is_valid with path_is_valid.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
-index cf11b50695..7c5daffc23 100644
+index 9e05c847ed..c0dd773eee 100644
 --- a/src/shared/tpm2-util.c
 +++ b/src/shared/tpm2-util.c
-@@ -741,7 +741,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
-                 fn = strjoina("libtss2-tcti-", driver, ".so.0");
+@@ -918,7 +918,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
+                         return log_oom_debug();
  
                  /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */
 -                if (!filename_is_valid(fn))
diff --git a/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch b/pkgs/os-specific/linux/systemd/0017-meson-Don-t-link-ssh-dropins.patch
similarity index 91%
rename from pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
rename to pkgs/os-specific/linux/systemd/0017-meson-Don-t-link-ssh-dropins.patch
index 00fe9ff8def3..ffc324be19df 100644
--- a/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
+++ b/pkgs/os-specific/linux/systemd/0017-meson-Don-t-link-ssh-dropins.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] meson: Don't link ssh dropins
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index d3cf28c631..54e17a9e2d 100644
+index 3672005d75..406be24b45 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -214,13 +214,13 @@ sshconfdir = get_option('sshconfdir')
+@@ -210,13 +210,13 @@ sshconfdir = get_option('sshconfdir')
  if sshconfdir == ''
          sshconfdir = sysconfdir / 'ssh/ssh_config.d'
  endif
diff --git a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
deleted file mode 100644
index 7d9d626bef09..000000000000
--- a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: nikstur <nikstur@outlook.com>
-Date: Mon, 6 Nov 2023 22:51:38 +0100
-Subject: [PATCH] meson.build: do not create systemdstatedir
-
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 8289d8f28a..d3cf28c631 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2858,7 +2858,6 @@ install_data('LICENSE.GPL2',
- install_subdir('LICENSES',
-                install_dir : docdir)
- 
--install_emptydir(systemdstatedir)
- 
- #####################################################################
- 
diff --git a/pkgs/os-specific/linux/systemd/0019-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
similarity index 100%
rename from pkgs/os-specific/linux/systemd/0019-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
rename to pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index c5572e717d9f..fb6d62843ea7 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -202,17 +202,17 @@ let
   # command:
   #  $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \
   #     jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime'
-  releaseTimestamp = "1766012573";
+  releaseTimestamp = "1773777352";
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
-  version = "259.3";
+  version = "260.1";
 
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "systemd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OmJUIaPwoQFAwTHihP9bM0BJ/KWetyEgZp5jjEwRExY=";
+    hash = "sha256-FUKj3lvjz8TIsyu8NyJYtiNele+1BhdJPdw7r7nW6as=";
   };
 
   # On major changes, or when otherwise required, you *must* :
@@ -240,15 +240,14 @@ stdenv.mkDerivation (finalAttrs: {
     ./0014-core-don-t-taint-on-unmerged-usr.patch
     ./0015-tpm2_context_init-fix-driver-name-checking.patch
     ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
-    ./0017-meson.build-do-not-create-systemdstatedir.patch
 
     # systemd tries to link the systemd-ssh-proxy ssh config snippet with tmpfiles
     # if the install prefix is not /usr, but that does not work for us
     # because we include the config snippet manually
-    ./0018-meson-Don-t-link-ssh-dropins.patch
+    ./0017-meson-Don-t-link-ssh-dropins.patch
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
-    ./0019-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
+    ./0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
   ];
 
   postPatch = ''
@@ -432,10 +431,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "system-uid-max" "999")
     (lib.mesonOption "system-gid-max" "999")
 
-    # SysVinit
-    (lib.mesonOption "sysvinit-path" "")
-    (lib.mesonOption "sysvrcnd-path" "")
-
     # Login
     (lib.mesonOption "sulogin-path" "${lib.getOutput "login" util-linux}/bin/sulogin")
     (lib.mesonOption "nologin-path" "${lib.getOutput "login" util-linux}/bin/nologin")
@@ -503,7 +498,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "polkit" withPolkit)
     (lib.mesonEnable "elfutils" withCoredump)
     (lib.mesonEnable "libcurl" wantCurl)
-    (lib.mesonEnable "libidn" false)
     (lib.mesonEnable "libidn2" withLibidn2)
     (lib.mesonEnable "repart" withRepart)
     (lib.mesonEnable "sysupdate" withSysupdate)
@@ -557,6 +551,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys")
     (lib.mesonOption "setfont-path" "${kbd}/bin/setfont")
   ]
+  ++ lib.optionals withKexectools [
+    (lib.mesonOption "kexec-path" "${kexec-tools}/bin/kexec")
+  ]
   ++ lib.optionals withKmod [
     (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")
   ]
@@ -595,7 +592,6 @@ stdenv.mkDerivation (finalAttrs: {
             "man/systemd-run.xml"
             "src/analyze/test-verify.c"
             "src/test/test-env-file.c"
-            "src/test/test-fileio.c"
             "src/test/test-load-fragment.c"
           ];
         }
@@ -604,7 +600,6 @@ stdenv.mkDerivation (finalAttrs: {
           replacement = "${coreutils}/bin/cat";
           where = [
             "test/test-execute/exec-noexecpaths-simple.service"
-            "src/journal/cat.c"
           ];
         }
         {
@@ -613,16 +608,6 @@ stdenv.mkDerivation (finalAttrs: {
           where = [ "man/systemd-fsck@.service.xml" ];
         }
       ]
-      ++ lib.optionals withNspawn [
-        {
-          # we only need to patch getent when nspawn will actually be built/installed
-          # as of systemd 257.x, nspawn will not be installed on systemdLibs, so we don't need to patch it
-          # patching getent unconditionally here introduces infinite recursion on musl
-          search = "/usr/bin/getent";
-          replacement = "${getent}/bin/getent";
-          where = [ "src/nspawn/nspawn-setuid.c" ];
-        }
-      ]
       ++ lib.optionals withImportd [
         {
           search = "\"gpg\"";
@@ -634,7 +619,6 @@ stdenv.mkDerivation (finalAttrs: {
           replacement = "\\\"${gnutar}/bin/tar\\\"";
           where = [
             "src/import/export-tar.c"
-            "src/import/import-common.c"
             "src/import/import-tar.c"
           ];
           ignore = [
@@ -645,8 +629,10 @@ stdenv.mkDerivation (finalAttrs: {
             "src/import/export.c"
             "src/import/import.c"
             "src/import/importd.c"
-            # runs `tar` but also also creates a temporary directory with the string
+            # runs `tar` but also creates a temporary directory with the string
             "src/import/pull-tar.c"
+            # pull-oci.c has tar references handled in postPatch
+            "src/import/pull-oci.c"
             # tar referenced as file suffix
             "src/shared/import-util.c"
           ];
@@ -654,8 +640,8 @@ stdenv.mkDerivation (finalAttrs: {
       ]
       ++ lib.optionals withKmod [
         {
-          search = "/sbin/modprobe";
-          replacement = "${lib.getBin kmod}/sbin/modprobe";
+          search = "ExecStart=-modprobe";
+          replacement = "ExecStart=-${lib.getBin kmod}/bin/modprobe";
           where = [ "units/modprobe@.service" ];
         }
       ];
@@ -706,7 +692,7 @@ stdenv.mkDerivation (finalAttrs: {
       substituteInPlace src/libsystemd/sd-journal/catalog.c \
         --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
 
-      substituteInPlace src/import/pull-tar.c \
+      substituteInPlace src/import/pull-tar.c src/import/pull-oci.c \
         --replace 'wait_for_terminate_and_check("tar"' 'wait_for_terminate_and_check("${gnutar}/bin/tar"'
     '';
 
@@ -714,23 +700,10 @@ stdenv.mkDerivation (finalAttrs: {
   # warning messages
   postConfigure = ''
     substituteInPlace config.h \
-      --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \
-      --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \
-      --replace "SYSTEMD_CGROUP_AGENTS_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
+      --replace-fail "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH"
   '';
 
   env.NIX_CFLAGS_COMPILE = toString [
-    # Can't say ${polkit.bin}/bin/pkttyagent here because that would
-    # lead to a cyclic dependency.
-    "-UPOLKIT_AGENT_BINARY_PATH"
-    "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
-
-    # Set the release_agent on /sys/fs/cgroup/systemd to the
-    # currently running systemd (/run/current-system/systemd) so
-    # that we don't use an obsolete/garbage-collected release agent.
-    "-USYSTEMD_CGROUP_AGENTS_PATH"
-    "-DSYSTEMD_CGROUP_AGENTS_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""
-
     "-USYSTEMD_BINARY_PATH"
     "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
   ];
@@ -928,6 +901,7 @@ stdenv.mkDerivation (finalAttrs: {
             systemd-nspawn-configfile
             systemd-oomd
             systemd-portabled
+            systemd-pstore
             systemd-resolved
             systemd-shutdown
             systemd-sysupdate
diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix
index 713708d4a0ae..fbe1aad2053a 100644
--- a/pkgs/os-specific/linux/xpadneo/default.nix
+++ b/pkgs/os-specific/linux/xpadneo/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpadneo";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "atar-axis";
     repo = "xpadneo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rMNgKhve76OXr2ha/Sqpw8sy/FWqxDm/bKF4YPlpVlc=";
+    hash = "sha256-GeQls+DeJrzduBRQw0rc9hf58Ncd5fRmn6Xwn0kMaXs=";
   };
 
   setSourceRoot = ''
@@ -36,12 +36,17 @@ stdenv.mkDerivation (finalAttrs: {
   installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
   installTargets = [ "modules_install" ];
 
-  passthru.tests = {
-    xpadneo = nixosTests.xpadneo;
+  passthru = {
+    tests.xpadneo = nixosTests.xpadneo;
+    updateScript = nix-update-script {
+      extraArgs = [
+        # Skips pre-releases
+        "--version-regex"
+        "^v([\\d.]+)$"
+      ];
+    };
   };
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     description = "Advanced Linux driver for Xbox One wireless controllers";
     homepage = "https://atar-axis.github.io/xpadneo";
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index ac55f618dccc..ea017985f78e 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -76,20 +76,8 @@ let
       ];
       kernelIsCompatible =
         kernel:
-        let
-          nextMajorMinor =
-            ver:
-            "${lib.versions.major ver}.${
-              lib.pipe ver [
-                lib.versions.minor
-                lib.toInt
-                (x: x + 1)
-                toString
-              ]
-            }";
-        in
         (lib.versionAtLeast kernel.version kernelMinSupportedMajorMinor)
-        && (lib.versionOlder kernel.version (nextMajorMinor kernelMaxSupportedMajorMinor));
+        && (lib.versionAtLeast kernelMaxSupportedMajorMinor (lib.versions.majorMinor kernel.version));
 
       # XXX: You always want to build kernel modules with the same stdenv as the
       # kernel was built with. However, since zfs can also be built for userspace we
diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix
index 28bb0a8085f9..3d36f532cca2 100644
--- a/pkgs/os-specific/windows/mcfgthreads/default.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/default.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mcfgthread";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "lhmouse";
     repo = "mcfgthread";
     tag = "v${lib.versions.majorMinor finalAttrs.version}-ga.${lib.versions.patch finalAttrs.version}";
-    hash = "sha256-x20wmqm675+pFx+eOu2zWA3BZsG+TXgBTwOoc6+I7WA=";
+    hash = "sha256-1gD2Cu2suvxopTxGN2RYSzise6bS8lpkrXLcdm9ZBLU=";
   };
 
   postPatch = ''
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 9478a11f83f6..0e0c9368fab1 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -461,16 +461,18 @@ optionalAttrs allowAliases aliases
       generate =
         name: value:
         pkgs.callPackage (
-          { runCommand, yj }:
+          { runCommand, go-toml }:
           runCommand name
             {
-              nativeBuildInputs = [ yj ];
+              nativeBuildInputs = [ go-toml ];
               value = builtins.toJSON value;
               passAsFile = [ "value" ];
               preferLocalBuild = true;
             }
+            # -use-json-number: preserve JSON ints as TOML ints
+            # (Go's json.Decoder defaults to float64 for all numbers)
             ''
-              yj -jt < "$valuePath" > "$out"
+              jsontoml -use-json-number < "$valuePath" > "$out"
             ''
         ) { };
 
diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix
index d51b5d2f272b..49b9ac4c8a30 100644
--- a/pkgs/pkgs-lib/tests/formats.nix
+++ b/pkgs/pkgs-lib/tests/formats.nix
@@ -695,16 +695,51 @@ runBuildTests {
       float = 3.141
       int = 10
       list = [1, 2]
-      str = "foo"
+      str = 'foo'
       true = true
 
       [attrs]
-      foo = "foo"
+      foo = 'foo'
 
       [level1]
       [level1.level2]
       [level1.level2.level3]
-      level4 = "deep"
+      level4 = 'deep'
+    '';
+  };
+
+  # Regression test for https://github.com/NixOS/nixpkgs/issues/511970
+  # yj crashes on arrays mixing scalars and attrsets (heterogeneous arrays),
+  # e.g. Helix language-server configs like ["bash-ls", {name = "ts-ls"; ...}].
+  # TOML 1.0 allows mixed-type arrays; the converter must emit them as
+  # inline arrays with inline tables.
+  tomlHeterogeneousArray = shouldPass {
+    format = formats.toml { };
+    input = {
+      language-server = [
+        "bash-language-server"
+        {
+          name = "typescript-language-server";
+          except-features = [ "diagnostics" ];
+        }
+      ];
+    };
+    expected = ''
+      language-server = ['bash-language-server', {except-features = ['diagnostics'], name = 'typescript-language-server'}]
+    '';
+  };
+
+  # Regression test for https://github.com/sclevine/yj/issues/52
+  # yj truncates keys at the first comma because it stores TOML keys in Go
+  # struct tags, where commas are option separators.
+  # e.g. "stack(x,n)" is emitted as "stack(x" — silently losing data.
+  tomlCommaInKey = shouldPass {
+    format = formats.toml { };
+    input = {
+      "stack(x,n)" = "foobar";
+    };
+    expected = ''
+      'stack(x,n)' = 'foobar'
     '';
   };
 
diff --git a/pkgs/servers/apache-kafka/4_1.nix b/pkgs/servers/apache-kafka/4_1.nix
index 933054416127..cf78bf39e3e6 100644
--- a/pkgs/servers/apache-kafka/4_1.nix
+++ b/pkgs/servers/apache-kafka/4_1.nix
@@ -1,5 +1,5 @@
 import ./generic.nix {
-  kafkaVersion = "4.1.1";
+  kafkaVersion = "4.1.2";
   scalaVersion = "2.13";
-  hash = "sha256-eR6O5plpgtgFWCk2eoA5H5TBvKcymy+7ZYv8IRp3Ry4=";
+  hash = "sha256-GHleC5qJ3g7YRDrYM2Xib2QHgTr+xP4TnBrLDDNk5tw=";
 }
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 064edf0fb575..96523788522a 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -5,6 +5,7 @@
   fetchDebianPatch,
   libedit,
   autoreconfHook,
+  cmake,
   zlib,
   unzip,
   libtommath,
@@ -48,6 +49,9 @@ let
 
     enableParallelBuilding = true;
 
+    __structuredAttrs = true;
+    strictDeps = true;
+
     installPhase = ''
       runHook preInstall
       mkdir -p $out
@@ -62,13 +66,13 @@ rec {
   firebird_3 = stdenv.mkDerivation (
     base
     // rec {
-      version = "3.0.13";
+      version = "3.0.14";
 
       src = fetchFromGitHub {
         owner = "FirebirdSQL";
         repo = "firebird";
         rev = "v${version}";
-        hash = "sha256-ti3cFfByM2wxOLkAebwtFe25B5W7jOwi3f7MPYo/yUA=";
+        hash = "sha256-X6Jv32VniAefIWjLTPwEipsQVRl7HBb4EKyi2IL1VWM=";
       };
 
       patches = [
@@ -95,13 +99,13 @@ rec {
   firebird_4 = stdenv.mkDerivation (
     base
     // rec {
-      version = "4.0.6";
+      version = "4.0.7";
 
       src = fetchFromGitHub {
         owner = "FirebirdSQL";
         repo = "firebird";
         rev = "v${version}";
-        hash = "sha256-65wfG6huDzvG/tEVllA58OfZqoL4U/ilw5YIDqQywTs=";
+        hash = "sha256-4u1Vgwk5cMCkrGfGSk2xO7hVHiDda0ioitvX/r3KPQc=";
       };
 
       nativeBuildInputs = base.nativeBuildInputs ++ [ unzip ];
@@ -113,5 +117,33 @@ rec {
     }
   );
 
-  firebird = firebird_4;
+  firebird_5 = stdenv.mkDerivation (
+    base
+    // rec {
+      version = "5.0.4";
+
+      src = fetchFromGitHub {
+        owner = "FirebirdSQL";
+        repo = "firebird";
+        rev = "v${version}";
+        fetchSubmodules = true;
+        hash = "sha256-IJrfs8q7GtX4Y+Cmg4avT5QJmLpld38tyR3TR1CcgyE=";
+      };
+
+      # CMake is just used for libcds
+      dontUseCmakeConfigure = true;
+
+      nativeBuildInputs = base.nativeBuildInputs ++ [
+        cmake
+        unzip
+      ];
+      buildInputs = base.buildInputs ++ [
+        zlib
+        libtommath
+        libtomcrypt
+      ];
+    }
+  );
+
+  firebird = firebird_5;
 }
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 74ddad17b9f2..1bdac54022df 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2026.4.3";
+  version = "2026.4.4";
   components = {
     "3_day_blinds" =
       ps: with ps; [
diff --git a/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix b/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix
index dbbd4ce371eb..196286b30579 100644
--- a/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/auth_oidc/package.nix
@@ -4,34 +4,40 @@
   fetchFromGitHub,
   fetchNpmDeps,
   aiofiles,
-  bcrypt,
   jinja2,
   joserfc,
   nodejs,
   npmHooks,
-  python-jose,
+  pytestCheckHook,
+  pytest-homeassistant-custom-component,
+  pytest-cov-stub,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "christaangoossens";
   domain = "auth_oidc";
-  version = "0.6.5-alpha";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "christiaangoossens";
     repo = "hass-oidc-auth";
     tag = "v${version}";
-    hash = "sha256-nclrSO6KmPnwXRPuuFwR6iYHsyfqcelPRGERWVJpdyk=";
+    hash = "sha256-ZYJD0PVh2E07cdY1a7uxSxdooAMz78HwJpwr4uWofZM=";
   };
 
   postPatch = ''
-    rm custom_components/auth_oidc/static/style.css
+    # Tests import directly from auth_oidc, but the component is installed
+    # under custom_components.auth_oidc
+    for f in tests/test_hass_webserver.py tests/test_state_store.py; do
+      substituteInPlace "$f" \
+        --replace-fail "from auth_oidc" "from custom_components.auth_oidc"
+    done
   '';
 
   env.npmDeps = fetchNpmDeps {
     name = "${domain}-npm-deps";
     inherit src;
-    hash = "sha256-i75YeCZVSMFDWzaiDJRTYqQee5I15n9ll0YYX1PXYbA=";
+    hash = "sha256-R5i4o2VnaXwgX72r6cBJULxSKadkU22vriMMWoMc5As=";
   };
 
   nativeBuildInputs = [
@@ -41,16 +47,20 @@ buildHomeAssistantComponent rec {
 
   dependencies = [
     aiofiles
-    bcrypt
     jinja2
     joserfc
-    python-jose
   ];
 
   postBuild = ''
     npm run css
   '';
 
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-homeassistant-custom-component
+    pytest-cov-stub
+  ];
+
   meta = {
     changelog = "https://github.com/christiaangoossens/hass-oidc-auth/releases/tag/v${version}";
     description = "OpenID Connect authentication provider for Home Assistant";
diff --git a/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix b/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix
index 225b6ba94873..387e6e24dfda 100644
--- a/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/battery_notes/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "andrew-codechimp";
   domain = "battery_notes";
-  version = "3.4.4";
+  version = "3.4.5";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "HA-Battery-Notes";
     tag = version;
-    hash = "sha256-aF6OeTiTuN1A1ffW9LjTtkFW4CAMPWFGX0scjKAUyOE=";
+    hash = "sha256-amMrXBTkDZAeMjGScdXMyTZFm90o5jN3VbR2PTydgZA=";
   };
 
   # has no tests
diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
index 96e16216ee6f..8048490c4e66 100644
--- a/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "dckiller51";
   domain = "bodymiscale";
-  version = "2026.4.2";
+  version = "2026.4.3";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
     rev = version;
-    hash = "sha256-4U3e6PCzr1zS/2y7RjYMSHDVeOuN+l+gp4EhKMXjzyA=";
+    hash = "sha256-hkwOgEiBqx0w8gc8ZouH6LWz/psZPT3E3scdKHugsYI=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix b/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix
index 3fa321bee017..7a3175c75024 100644
--- a/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/browser-mod/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "thomasloven";
   domain = "browser_mod";
-  version = "2.10.2";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hass-browser_mod";
     tag = "v${version}";
-    hash = "sha256-GUYQlydFxifMR/ASJCTIfMBKh3lrB8lNDqJvHa/eVHs=";
+    hash = "sha256-IenC39xaHxD7Q+r8w4zfn8ZwF+s7i+dliwG4lOPPLHk=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ buildHomeAssistantComponent rec {
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-ZLWBi1EmqC1MD0O4ZQpie6IRHl6S+qGHhwonvjKGCqo=";
+    hash = "sha256-DmN2gWhtfGhqLJpSXW7XAt9stvsH6jJfR4FUQOZqh6M=";
   };
 
   npmBuildScript = "build";
diff --git a/pkgs/servers/home-assistant/custom-components/fellow/package.nix b/pkgs/servers/home-assistant/custom-components/fellow/package.nix
index dca7caeaa3d2..79b4879f6058 100644
--- a/pkgs/servers/home-assistant/custom-components/fellow/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/fellow/package.nix
@@ -8,12 +8,12 @@
 }:
 
 buildHomeAssistantComponent rec {
-  owner = "NewsGuyTor";
+  owner = "kristofferR";
   domain = "fellow";
   version = "1.3.3";
 
   src = fetchFromGitHub {
-    owner = "NewsGuyTor";
+    owner = "kristofferR";
     repo = "FellowAiden-HomeAssistant";
     tag = "v${version}";
     hash = "sha256-n1D/kP1vxc+/kgZGwl+5nLD6IzERmMXeiQjSKZGiqvc=";
@@ -27,9 +27,9 @@ buildHomeAssistantComponent rec {
   ];
 
   meta = {
-    changelog = "https://github.com/NewsGuyTor/FellowAiden-HomeAssistant/releases/tag/${src.tag}";
+    changelog = "https://github.com/kristofferR/FellowAiden-HomeAssistant/releases/tag/${src.tag}";
     description = "Home Assistant integration for Fellow Aiden coffee brewer";
-    homepage = "https://github.com/NewsGuyTor/FellowAiden-HomeAssistant";
+    homepage = "https://github.com/kristofferR/FellowAiden-HomeAssistant";
     license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.jamiemagee ];
   };
diff --git a/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix b/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix
index b4d17511ed30..fe84229bd446 100644
--- a/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/ha_mcp_tools/package.nix
@@ -3,22 +3,30 @@
   buildHomeAssistantComponent,
   fetchFromGitHub,
   nix-update-script,
+  ruamel-yaml,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "homeassistant-ai";
   domain = "ha_mcp_tools";
-  version = "7.2.0";
+  version = "7.3.0";
 
   src = fetchFromGitHub {
     owner = "homeassistant-ai";
     repo = "ha-mcp";
     tag = "v${version}";
-    hash = "sha256-1SiWrrUSMU/Pe3vXZIPdUwpVhZM41avmjhO+PFLWmUE=";
+    hash = "sha256-boWqv8lSN/UiqSRhVBgbucX+RC6q14Oa4WzkJPeZzVw=";
   };
 
+  dependencies = [
+    ruamel-yaml
+  ];
+
   passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9]+)$" ];
+    extraArgs = [
+      "--use-github-releases"
+      "--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9]+)$"
+    ];
   };
 
   meta = {
diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
index 3707134c4914..e51cbf410e3a 100644
--- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix
@@ -17,13 +17,13 @@
 buildHomeAssistantComponent rec {
   owner = "bramstroker";
   domain = "powercalc";
-  version = "1.20.13";
+  version = "1.20.14";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant-powercalc";
     tag = "v${version}";
-    hash = "sha256-Vg/hqDo0dW88VUKEXZcaRMwOAzm8EmbKGwV/xIfB5lQ=";
+    hash = "sha256-Tm9h6ZHByuiM9XZz3D1TZR3ISbb16l0K1Vy8sJxI4+s=";
   };
 
   dependencies = [ numpy ];
diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix
index cdbaf4ac3655..d1f17bfde7b1 100644
--- a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "ollo69";
   domain = "smartthinq_sensors";
-  version = "0.42.0";
+  version = "0.42.2";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-smartthinq-sensors";
     rev = "v${version}";
-    hash = "sha256-ks1feF4TjzQaI6r6HzZ2cXPcUO+yMoeav34C/2jlH3k=";
+    hash = "sha256-y8MGGTcOrr4IZUefBgq7wVG3H5UFAB7L2FkwoVsygb0=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
index 3cda3a88a9ca..1e397d40a129 100644
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wills106";
   domain = "solax_modbus";
-  version = "2026.04.3";
+  version = "2026.04.4";
 
   src = fetchFromGitHub {
     owner = "wills106";
     repo = "homeassistant-solax-modbus";
     tag = version;
-    hash = "sha256-hcalMQWkZmve/iuv9jgriEgLhhNVU94ETIbQOZ5aDd4=";
+    hash = "sha256-OH3RCm6QnqDdeIA3w0Z9GqSF8NyigoMaJeDNqR3OcIc=";
   };
 
   dependencies = [ pymodbus ];
diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index 14ccbbacdead..8ea351531cda 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -21,7 +21,7 @@ buildHomeAssistantComponent rec {
 
   postPatch = ''
     substituteInPlace custom_components/systemair/manifest.json \
-      --replace-fail "pymodbus==" "pymodbus>=" \
+      --replace-fail "pymodbus==" "pymodbus>="
   '';
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
index 229812fc44f9..26521583efd7 100644
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
@@ -20,13 +20,13 @@
 buildHomeAssistantComponent rec {
   owner = "mampfes";
   domain = "waste_collection_schedule";
-  version = "2.20.0";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_waste_collection_schedule";
     tag = "v${version}";
-    hash = "sha256-Dt1Ey2vIk5f6AEC9qepUb3S8+1rBwG5o6/6/pEoglcw=";
+    hash = "sha256-QUXtozk5FIUsXDJfb1GHGYa1LKh+CCARAsPKkX9ok34=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
index e1abe02afce2..639b3d77735c 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix
@@ -15,20 +15,20 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "atomic-calendar-revive";
-  version = "10.2.0";
+  version = "10.2.2";
 
   src = fetchFromGitHub {
     owner = "totaldebug";
     repo = "atomic-calendar-revive";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cqtXhBSFuEuh8IH/6S0qZN3+SrdCt0WXrBJlBcDUujY=";
+    hash = "sha256-FiER75oDc9fbdZlh/dLPKmuA11i/UWy2uoX/aPW2m1s=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-fhi1ysI2ygMfPTSiu40tt713fA/dy7r28Xyk0HxSvXE=";
+    hash = "sha256-DoMzpXCkK60o1YPpStCNCdpj0I+4OqXr7PcX3hjVhSg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
index 98edabe58f96..4e56645c71d1 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
@@ -21,8 +21,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-VbmbqTwuXfJQVSaQHGVwIZJf7350HsH+TGeVCtCXL38=";
+    fetcherVersion = 3;
+    hash = "sha256-gUVETXrl5rcXvn0YeKLfM+eErUpMxCuVlAOoyqQkLXs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
index ce40d5c17553..95c7e3e0c721 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
   pname = "light-entity-card";
   version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "ljmerza";
     repo = "light-entity-card";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Y25jtbKJNTVi6XUHntm2AtIzuht96/o5l+uScwEE9So=";
   };
 
@@ -31,8 +31,8 @@ buildNpmPackage rec {
   meta = {
     description = "Control any light or switch entity";
     homepage = "https://github.com/ljmerza/light-entity-card";
-    changelog = "https://github.com/ljmerza/light-entity-card/releases/tag/${version}";
+    changelog = "https://github.com/ljmerza/light-entity-card/releases/tag/${finalAttrs.src.tag}";
     maintainers = with lib.maintainers; [ SuperSandro2000 ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix
index f3f7c019e09b..d321b96a1d20 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "material-you-utilities";
-  version = "2.1.6";
+  version = "2.1.8";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "material-you-utilities";
     tag = version;
-    hash = "sha256-NIOPETbuEPlf7wIvDGh0580jmIkzy1DRLwgSrOC6S60=";
+    hash = "sha256-yfwZBkrfTmQRyzzajBhmuyxPkJ4fNeIner4TJV49rzo=";
   };
 
-  npmDepsHash = "sha256-S+2A098T3kRMOfznbwR2mOX9zCvYQGR+HsIjAjd55wg=";
+  npmDepsHash = "sha256-EIkEzy1UZ+EU+734LZJlU7yRrix97I2Uc+/ghtMRVv0=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
index 5312d416b07d..2574f5fbd45a 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "sankey-chart";
-  version = "4.0.2";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "MindFreeze";
     repo = "ha-sankey-chart";
     rev = "v${version}";
-    hash = "sha256-JZ2FtJkkF80ic7Dd9MTwOQKJ2hCfxN3IOQFcaJcXapE=";
+    hash = "sha256-wIYStC0sE+1HKWU4PI1KDEx2n4h/stCW64N9HeHcgCQ=";
   };
 
-  npmDepsHash = "sha256-AN/u8VHDY8FXzqS8bSK//DJnqSj1ML//5q7b5hhNVjw=";
+  npmDepsHash = "sha256-H2MX7KvCwThODH3b9yaaQQMYbdppuYiTjCSskzRYJL4=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
index 32786a78a71b..7af5928e7842 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "universal-remote-card";
-  version = "4.10.8";
+  version = "4.10.10";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "android-tv-card";
     rev = version;
-    hash = "sha256-VeLAvCdVFO0LsO/vvaHZVYy0F1DHjD82jHay+Au9kPU=";
+    hash = "sha256-2qtxohJLtccku1fQvxCV97QbZUwvn5FGvsuaunvsViA=";
   };
 
-  npmDepsHash = "sha256-c/ZqmMZECRUjQW88eJqdOowPynAdOcve8qtHZhuEBak=";
+  npmDepsHash = "sha256-c5A+GmMkqxgL8fQyDp8qul/cW40iTbgHf7O/iR0F2bY=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 3c5b3d7e2a29..1e4e7db2cc6b 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -253,7 +253,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2026.4.3";
+  hassVersion = "2026.4.4";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -274,13 +274,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-65LZU4OpvVeV70xujI3kd/8VIzZh723l9F5xe8qEvX4=";
+    hash = "sha256-x2BF1N1LDZAnryOkGy/Pru+mlw3CaOgnrmdQMg0uo7k=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-P76HVL5NW8TOpic1kRUXxeMeAtsy+UxkmTvsc0J+6nY=";
+    hash = "sha256-EPmX+3wAsvirvjDzQ0aUKGZbaNWh5mX+7iuCfZ2BUhI=";
   };
 
   build-system = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index e7065a8359fc..09f3c12a4dec 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20260325.7";
+  version = "20260325.8";
   format = "wheel";
 
   src = fetchPypi {
@@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-0OQM+UNI1QX3V53OQ57NuDXr05BllaYRjKnNrFXpwDc=";
+    hash = "sha256-+zM6D+mBsBNrx0oj99t83iJb2A8tz6OGe01LTWFvf5s=";
   };
 
   # there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
index 246535549fe7..e4b64247982f 100644
--- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
+++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.324";
+  version = "0.13.325";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "MatthewFlamm";
     repo = "pytest-homeassistant-custom-component";
     tag = version;
-    hash = "sha256-gN9lU2H8XVQgjtA3x7jiP9B1QqPq8oz9XfOCmi/EohI=";
+    hash = "sha256-Rs3CZsQDL/gCgJzUwBEbAX56EUNugpmwxNAAQRK6Nvs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 6b8023e9f247..8808bd8e31fe 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2026.4.3";
+  version = "2026.4.4";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-sWyeB/+G/1OtH7J97EifJw8AZIGd7IX1mLJ+1Dn/qjU=";
+    hash = "sha256-ysVtXtiMmXmCq39cOO2Eh+YJN+SIi+Y4Y62+psJSkWM=";
   };
 
   build-system = [
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index db2118b87ef1..aad0d44fd0d6 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -172,6 +172,13 @@ let
       # outdated snapshot
       "tests/components/hypontech/test_sensor.py::test_sensors"
     ];
+    influxdb = [
+      # These tests fail because they check for the number of warnings in the
+      # logs and there is an extra warning in the logs:
+      # `WARNING:aiohttp_fast_zlib:zlib_ng and isal are not available, falling back to zlib, performance will be degraded.`
+      "tests/components/influxdb/test_sensor.py::test_state_for_no_results"
+      "tests/components/influxdb/test_sensor.py::test_state_matches_first_query_result_for_multiple_return"
+    ];
     jellyfin = [
       # AssertionError: assert 'audio/x-flac' == 'audio/flac'
       "tests/components/jellyfin/test_media_source.py::test_resolve"
diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index 7191c6d93fd3..8e9facc7fc1f 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix args {
-  version = "1.28.3";
-  hash = "sha256-LJapRr+wiCohdE7UKXcKISOuGCjHxIZlCSmT3e6RqRg=";
+  version = "1.30.0";
+  hash = "sha256-BYGIxkvyK67KpyuAmmMYpPm6YjiJxVT+qwP3y4U6sxs=";
 }
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index 6c7f37612f9e..7ccd89fef7e0 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -132,8 +132,8 @@ stdenv.mkDerivation rec {
   ++ map (mod: "--add-module=${mod.src}") modules;
 
   env.NIX_CFLAGS_COMPILE =
-    "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough"
-    + optionalString stdenv.hostPlatform.isDarwin " -Wno-error=deprecated-declarations";
+    "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough -Wno-unterminated-string-initialization"
+    + optionalString stdenv.hostPlatform.isDarwin " -Wno-error=deprecated-declarations -Wno-unused-but-set-variable";
 
   preConfigure = (lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
 
diff --git a/pkgs/servers/kanidm/1_7.nix b/pkgs/servers/kanidm/1_7.nix
deleted file mode 100644
index c55c98a2d937..000000000000
--- a/pkgs/servers/kanidm/1_7.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-import ./generic.nix {
-  version = "1.7.4";
-  hash = "sha256-nWwwcRmCfKJECYN/5w30W3sDu9BqIGonF4ke8F04x3E=";
-  cargoHash = "sha256-h5jeQxvYzHRVfNYYh9qKukE4h4nhDyuRou2xuZq4AdM=";
-  unsupported = true;
-}
diff --git a/pkgs/servers/kanidm/1_8.nix b/pkgs/servers/kanidm/1_8.nix
index d6ddaba4ba09..27af30550891 100644
--- a/pkgs/servers/kanidm/1_8.nix
+++ b/pkgs/servers/kanidm/1_8.nix
@@ -2,5 +2,5 @@ import ./generic.nix {
   version = "1.8.6";
   hash = "sha256-+NZs8HHHmWGmlNNymIlbV7E28RiaGLmvtZkCWZJQvMk=";
   cargoHash = "sha256-NKCQRIxvWAT5saMO85noYZtm7h0OPFhWFqudvkQPYTE=";
-  eolDate = "2026-03-16";
+  unsupported = true;
 }
diff --git a/pkgs/servers/kanidm/1_9.nix b/pkgs/servers/kanidm/1_9.nix
index dd0877813c1e..2952a9f73a67 100644
--- a/pkgs/servers/kanidm/1_9.nix
+++ b/pkgs/servers/kanidm/1_9.nix
@@ -1,5 +1,5 @@
 import ./generic.nix {
-  version = "1.9.2";
-  hash = "sha256-OmUWh60WZ4HH9dFCKiWZ66jMRJx6P003HNWfU0ywIO0=";
-  cargoHash = "sha256-xQ5FR+GiGZLLEt5GnLnc/vtZdx0YY5hsd06vkF+e6sM=";
+  version = "1.9.3";
+  hash = "sha256-YI2nShQhsCd1vn7S4VeCELfcU0HsmZrFs60kllJJFAo=";
+  cargoHash = "sha256-b6kBDA/CDJHbybfvbRRZ++q9H+SVRu0BmgkwzN2i/YU=";
 }
diff --git a/pkgs/servers/klipper/cross-ffi.patch b/pkgs/servers/klipper/cross-ffi.patch
new file mode 100644
index 000000000000..9535d29c723f
--- /dev/null
+++ b/pkgs/servers/klipper/cross-ffi.patch
@@ -0,0 +1,14 @@
+diff --git a/klippy/chelper/__init__.py b/klippy/chelper/__init__.py
+index c26196e..b00bd97 100644
+--- a/chelper/__init__.py
++++ b/chelper/__init__.py
+@@ -318,11 +318,6 @@ def get_ffi():
+         FFI_main = cffi.FFI()
+         for d in defs_all:
+             FFI_main.cdef(d)
+-        FFI_lib = FFI_main.dlopen(destlib)
+-        # Setup error logging
+-        pyhelper_logging_callback = FFI_main.callback("void func(const char *)",
+-                                                      logging_callback)
+-        FFI_lib.set_python_logging_callback(pyhelper_logging_callback)
+     return FFI_main, FFI_lib
diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index a0af8d52230e..559eb44f74f3 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -3,12 +3,15 @@
   lib,
   fetchFromGitHub,
   python3,
+  python3Packages,
   extraPythonPackages ? ps: [ ],
   unstableGitUpdater,
   makeWrapper,
   writeShellScript,
 }:
-
+let
+  isCross = (stdenv.hostPlatform != stdenv.buildPlatform);
+in
 stdenv.mkDerivation rec {
   pname = "klipper";
   version = "0.13.0-unstable-2026-03-21";
@@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
 
   # NB: This is needed for the postBuild step
   nativeBuildInputs = [
-    (python3.withPackages (p: with p; [ cffi ]))
+    python3Packages.cffi
     makeWrapper
   ];
 
@@ -45,11 +48,31 @@ stdenv.mkDerivation rec {
     ))
   ];
 
-  # we need to run this to prebuild the chelper.
-  postBuild = ''
-    python ./chelper/__init__.py
+  # we need to run this to prebuild the chelper .so. However when cross
+  # compiling, a patch is temporarily required during the build process to
+  # prevent the build process from using dlopen() on this .so which has been
+  # built for a foreign architecture. We then place the unpatched __init__.py
+  # back, as this dlopen() call is required at runtime
+  postBuild =
+    if isCross then
+      ''
+        python ./chelper/__init__.py
+        mv ./chelper/__init__unpatched.py ./chelper/__init__.py
+      ''
+    else
+      ''
+        python ./chelper/__init__.py
+      '';
+
+  prePatch = lib.optionalString isCross ''
+    cp ./chelper/__init__.py ./chelper/__init__unpatched.py
   '';
 
+  patches = lib.optionals isCross [
+    # https://github.com/Klipper3d/klipper/pull/7254
+    ./cross-ffi.patch
+  ];
+
   # Python 3 is already supported but shebangs aren't updated yet
   postPatch = ''
     for file in klippy.py console.py parsedump.py; do
@@ -58,7 +81,7 @@ stdenv.mkDerivation rec {
     done
 
     # needed for cross compilation
-    substituteInPlace ./chelper/__init__.py \
+    substituteInPlace ./chelper/__init__*.py \
       --replace 'GCC_CMD = "gcc"' 'GCC_CMD = "${stdenv.cc.targetPrefix}cc"'
   '';
 
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix
index adc045f07dc0..dae817af6bb0 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafadruid-druid-datasource";
-  version = "1.7.0";
-  zipHash = "sha256-aVAIk5x+zKdq5SYjsl5LekZ96LW7g/ykaq/lPUNUi7k=";
+  version = "1.8.0";
+  zipHash = "sha256-iCd6OejO+AQtN3tzEJUDZUGa4Fg1X9k4DzUXN9U0Udc=";
   meta = {
     description = "Connects Grafana to Druid";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
index 9666486063f4..8e91d793346a 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix
@@ -2,12 +2,12 @@
 
 grafanaPlugin rec {
   pname = "grafana-clickhouse-datasource";
-  version = "4.14.0";
+  version = "4.16.0";
   zipHash = {
-    x86_64-linux = "sha256-+4RoyDRGLgD46FelK9zWfjokiXtgBhEU5RdsGheCEns=";
-    aarch64-linux = "sha256-9CJy8Wf/B17T64NyL4SBrmLYecdVYSXA5qnpKhcdAHs=";
-    x86_64-darwin = "sha256-ixrSa02vC/MBg29FNmBRd6YvhkL3QZnzOysLLFgjHEA=";
-    aarch64-darwin = "sha256-g7ovNQ5jJWcG82EJr6mnc2ijD/Wk6dY3cYhSchZOs5M=";
+    x86_64-linux = "sha256-fmYrMoLMFSA/bG7db7IhEKcgYAd3ukRTZOtT6h0bCbw=";
+    aarch64-linux = "sha256-TTo85HkQrq6bbifAfG30BPVP72nqOYP9yaJ7INpBN1U=";
+    x86_64-darwin = "sha256-Evu/YUQS62y7E/efJeQOJEgsbL0212Bl1aFl4SzMUqM=";
+    aarch64-darwin = "sha256-NC5yVkrnD1J1LiDbSnKwNZsUOCShgfSZy8FuDnXpZWs=";
   };
   meta = {
     description = "Connects Grafana to ClickHouse";
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
index c1346fcb543d..545de3184aef 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-exploretraces-app";
-  version = "2.0.1";
-  zipHash = "sha256-tollhGibyN4SCx1WjMiWbQMcdDGHs7yom1/L078JFhE=";
+  version = "2.0.2";
+  zipHash = "sha256-e179Vm7RwSHWrUZuvhHOPWtFuGJkVM22GzPN/WenR/Q=";
   meta = {
     description = "Opinionated traces app";
     license = lib.licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
index d755af82eeca..e7888391f00f 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-metricsdrilldown-app";
-  version = "2.0.2";
-  zipHash = "sha256-Cg4YFk2LCH6ALy5pUs7hVg3wUyfBBFNfj0Hp/aPBTIY=";
+  version = "2.0.3";
+  zipHash = "sha256-TIxJcWqXeTHukfpoI0R0sYhWyS4Hbdpd3zbFx3s02Ag=";
   meta = {
     description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
     license = lib.licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
index ce5a4fda5677..bd1224ef6828 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix
@@ -2,12 +2,12 @@
 
 grafanaPlugin {
   pname = "grafana-opensearch-datasource";
-  version = "2.33.0";
+  version = "2.33.1";
   zipHash = {
-    x86_64-linux = "sha256-oxPw/cQ/AYTHB4Z/hdt3Jqn3XXnx+bo3uAq6qS7hd6g=";
-    aarch64-linux = "sha256-0bF2ebVF26iPIKs+oICeaBwm6K8TZGqTP6ONR+yDFvY=";
-    x86_64-darwin = "sha256-yGJLaNCAmdIN1uuzh/v+adda6IRmcCH+mpbxno8qK9k=";
-    aarch64-darwin = "sha256-Kxgq9HYXPW3+uEzJPy0kKDFCXrSFpCgZQ+whqx4XtJ8=";
+    x86_64-linux = "sha256-IH1y3tbY++piN+Zlw9Jw2Z7c7pFcPQ7z/X3C0t3iAo8=";
+    aarch64-linux = "sha256-3Zm3omgkdYwHe0/39QCR+iwqe0bURKLB1k1cDkUYiAc=";
+    x86_64-darwin = "sha256-UJB56s/JEacST6sWTLv8lKt0ecpO4IHqelV8Awf6Wq0=";
+    aarch64-darwin = "sha256-QU+0jig8y/+7cshDTJ0J0LGGRVd1uJ5jtSyZcfDjx2k=";
   };
   meta = {
     description = "Empowers you to seamlessly integrate JSON data into Grafana";
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
index b722a269985c..699e6b6661e4 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-pyroscope-app";
-  version = "2.0.1";
-  zipHash = "sha256-ws/gYJnq2BQHeaPezGFsEgmvbURRo1kCI8yRO5X6588=";
+  version = "2.0.4";
+  zipHash = "sha256-merfONOOSaD3KOQkRP7v8J18pemW3dLBf3bz3QpEpiQ=";
   meta = {
     description = "Integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data";
     license = lib.licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix
index c3479c55a884..1becc370a285 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "marcusolsson-calendar-panel";
-  version = "4.2.0";
-  zipHash = "sha256-GQcLaeTvbHTdbH5NWa0SL5rUP9WTQOqy38ndZb4/rA8=";
+  version = "4.2.3";
+  zipHash = "sha256-uyxbYeP/DN/+WKtvu1cJWDj1GTEaXwuvhh9hNiAXKIo=";
   meta = {
     description = "Calendar Panel is a Grafana plugin that displays events from various data sources";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix
index 1aed71260068..a1ee1ef8017c 100644
--- a/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/redis-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "redis-app";
-  version = "2.2.1";
-  zipHash = "sha256-1ZzJaGhlM6CaTecj69aqJ9fqN7wYSsiDCMTRVkZJUb0=";
+  version = "2.3.2";
+  zipHash = "sha256-HncZBj0FCku7DRTCDigY2aH2oBScDg7d9XL7ixm7DOM=";
   meta = {
     description = "Redis Application plugin for Grafana";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
index 6a026ceadd90..8bcc2e23b9c5 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-metrics-datasource";
-  version = "0.23.4";
-  zipHash = "sha256-a0EJB+A+Rlfrpd2m1HZ2nw2sh4QuWe1O2oueVi4xPZE=";
+  version = "0.24.0";
+  zipHash = "sha256-NR5mUC5ctByObxRb+wJw7lRxuXbC4jgNjaIUXY0Y/94=";
   meta = {
     description = "VictoriaMetrics metrics datasource for Grafana";
     license = lib.licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
index 0b1dc3a3bb0e..3dc1aadadf96 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-variable-panel";
-  version = "5.1.2";
-  zipHash = "sha256-cYDnrTSYjZV/2/q4/ztq8khaSkAeXu6fRasfT1bMzrw=";
+  version = "5.1.3";
+  zipHash = "sha256-oNTTvNelEKENDJ7xsjbtwGg2rsKZn9iy52l1zZWE26I=";
   meta = {
     description = "Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index 5e780834b348..e16ee5826846 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -14,19 +14,19 @@ let
     }:
     buildGoModule rec {
       inherit pname;
-      version = "6.13.1";
+      version = "6.14.0";
       shortRev = "591ed6e"; # for internal version info
 
       src = fetchFromGitHub {
         owner = "sensu";
         repo = "sensu-go";
         rev = "v${version}";
-        sha256 = "sha256-VYdm1aNz1IXvDezrJB5yyViIWPl4zf4/xmkw2pm8gyk=";
+        sha256 = "sha256-/1oQz7mZyhH5U7DoVhRYnLv7AvwFrN1OBx9EEK+sCEw=";
       };
 
       inherit subPackages postInstall;
 
-      vendorHash = "sha256-32jz5CI94BZxMDo6Crc05DDvlXxMsldJpWvhfHLS37o=";
+      vendorHash = "sha256-ylzMqc+zTtuttLl75ILG0OzA/PqfrpvsiKhW6cPx+ls=";
 
       doCheck = false;
 
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 86efb44cfd16..07f7fbd98bec 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,11 +1,11 @@
 generic: {
   v74 = generic {
-    version = "7.4.8";
-    hash = "sha256-qbRStsV00igpziBpOhqpyriL8PWFt6oqajrUyxTdOxw=";
+    version = "7.4.9";
+    hash = "sha256-+X7YkyghpR9kUQCt99SA6HWA606DhJwQT0T9VWrxr88=";
   };
   v70 = generic {
-    version = "7.0.24";
-    hash = "sha256-b4rpkLmyV2fk//vLXMfEVdZ04qOS3CFHhIil0cDn1Zc=";
+    version = "7.0.25";
+    hash = "sha256-OkLoXanL2KrdEb/L4CHw+cbKpRD1ZON/OsEEaYSstyk=";
   };
   v60 = generic {
     version = "6.0.45";
diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json
index 694020f7c6bf..3466d547d8c7 100644
--- a/pkgs/servers/nextcloud/packages/32.json
+++ b/pkgs/servers/nextcloud/packages/32.json
@@ -1,8 +1,8 @@
 {
   "bookmarks": {
-    "hash": "sha256-2v+lm1VBHcSdptKehpe8F+u9CiV3wC7zrx0UGdbKAek=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.1.3/bookmarks-16.1.3.tar.gz",
-    "version": "16.1.3",
+    "hash": "sha256-Q4NwDrCuex5e2sGEG4Gu00Ne3UeojrSRlGPKQ8R2+/0=",
+    "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.1.4/bookmarks-16.1.4.tar.gz",
+    "version": "16.1.4",
     "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
     "homepage": "https://github.com/nextcloud/bookmarks",
     "licenses": [
@@ -21,7 +21,7 @@
   },
   "checksum": {
     "hash": "sha256-xA+BdtbAJVtM6YO5vdW7lfOGlyAkEhHlaCMvHmoHYX4=",
-    "url": "https://github.com/westberliner/checksum/releases/download/v2.0.3/checksum.tar.gz",
+    "url": "https://github.com/westberliner/checksum/releases/download/v2.1.0/checksum.tar.gz",
     "version": "2.0.3",
     "description": "Allows users to create a hash checksum of a file.\n        Possible algorithms are md5, sha1, sha256, sha384, sha512, sha3-256, sha3-512 and crc32.\n\n        Just open the details view of the file (Sidebar). There should be a new tab called \"Checksum\".\n        Select a algorithm and it will try to generate a hash.\n        If you want an other algorithm, just click on the reload button.",
     "homepage": "https://github.com/westberliner/checksum/",
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-h6Krtrm9YLZ0TEfsInN2bmY+/2v4Gyef5x0TIo9n/Ns=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v4.2.0/collectives-4.2.0.tar.gz",
-    "version": "4.2.0",
+    "hash": "sha256-hCH/P5at2pKCdBhCWoqaT0wrGkeRXcyNvno/b44+2DA=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v4.3.0/collectives-4.3.0.tar.gz",
+    "version": "4.3.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-rEDSTyUAC+0cOh0MRAPwVrGMGhEflTznjl1+GJTuDpI=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.7/contacts-v8.3.7.tar.gz",
-    "version": "8.3.7",
+    "hash": "sha256-pjD/XPbqLAo+uM1lVVvIUZ96wcWV5sNTJ/dd8iqs5xU=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.8/contacts-v8.3.8.tar.gz",
+    "version": "8.3.8",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -80,9 +80,9 @@
     ]
   },
   "deck": {
-    "hash": "sha256-RqY3onLYYw03MRWvZvwdO9QkleXB8Tz1q6OnkGqTsuY=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.16.3/deck-v1.16.3.tar.gz",
-    "version": "1.16.3",
+    "hash": "sha256-om9Ygy+UHl8DdHTr9TrmFhCNFi6WjIHoByYmTBostZQ=",
+    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.16.4/deck-v1.16.4.tar.gz",
+    "version": "1.16.4",
     "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
     "homepage": "https://github.com/nextcloud/deck",
     "licenses": [
@@ -130,9 +130,9 @@
     ]
   },
   "forms": {
-    "hash": "sha256-hiDhtnWtscpI+ICOk1nulJoCLovnBv8YBtso/CtJjH4=",
-    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.5/forms-v5.2.5.tar.gz",
-    "version": "5.2.5",
+    "hash": "sha256-N5OoSJj69RFmAX2g59r4j5EOUKeXbqwtScYo5Iv3y20=",
+    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.7/forms-v5.2.7.tar.gz",
+    "version": "5.2.7",
     "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API_v3.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!",
     "homepage": "https://github.com/nextcloud/forms",
     "licenses": [
@@ -150,9 +150,9 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-+/16SkinCG7ATPc0JsAM13psfl914eSxAo3TU0l/+h8=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.12/groupfolders-v20.1.12.tar.gz",
-    "version": "20.1.12",
+    "hash": "sha256-7G/ExoNBXdNp3XwN+O9TE9Jj+EZ00XsNrc38xtZGALA=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.13/groupfolders-v20.1.13.tar.gz",
+    "version": "20.1.13",
     "description": "Team Folders (formerly \"Group Folders\") allows administrators to create and manage shared folders that are accessible\n\t\t\tto selected teams within Nextcloud.\n\n\t\t\tAdmins can configure folders from the Team Folders section in the admin settings, where they can grant access to one\n\t\t\tor more teams, set custom permissions (such as read, write, and sharing rights), and assign storage quotas to each\n\t\t\tfolder.\n\n\t\t\tAs of Hub 10/Nextcloud 31, admins must be members of a team to assign it a Team Folder. The app supports advanced\n\t\t\tfeatures such as quota management, granular access control, and integration with Nextcloud’s trash and versioning\n\t\t\tsystems.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
@@ -180,9 +180,9 @@
     ]
   },
   "integration_deepl": {
-    "hash": "sha256-o50BZEMtN81UuemxP4+lJt1uI/40EwXiHfaf8FtvkbM=",
-    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.1.0/integration_deepl-v2.1.0.tar.gz",
-    "version": "2.1.0",
+    "hash": "sha256-RHYxxZw/2/uDdZdf8kGYgGBlBi1rfgXUtTtr9lgr/20=",
+    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.2.0/integration_deepl-v2.2.0.tar.gz",
+    "version": "2.2.0",
     "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: 🔴\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/integration_deepl",
     "licenses": [
@@ -210,9 +210,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-aaGl57K99xzO53zUTZDWvIdoR0SwWnaqaljVeZQOgBU=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.6/mail-v5.7.6.tar.gz",
-    "version": "5.7.6",
+    "hash": "sha256-IqsrI3Wt2eOMmb04VMFJytjwURu7otcIhcykdio+MHg=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.12/mail-v5.7.12.tar.gz",
+    "version": "5.7.12",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-KsHV3zN6kB391wIngALJLCgqcYLRw0PnU9JTDBM/lxo=",
-    "url": "https://github.com/nextcloud/news/releases/download/28.1.0/news.tar.gz",
-    "version": "28.1.0",
+    "hash": "sha256-5KVKrtCQ3Nt7E8/vjYebAcpI0U6QzgvdqFqRk9MPEgo=",
+    "url": "https://github.com/nextcloud/news/releases/download/28.2.0/news.tar.gz",
+    "version": "28.2.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -250,9 +250,9 @@
     ]
   },
   "notes": {
-    "hash": "sha256-iZmmdiwqBnDquPM+bUyzhiAbiI8Q67JR+pjDDRQW4sI=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.13.1/notes-v4.13.1.tar.gz",
-    "version": "4.13.1",
+    "hash": "sha256-NCBDtNO6jsqws4BE8sGOnox2xUuODleYodQ5vv6jqEs=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v5.0.0/notes-v5.0.0.tar.gz",
+    "version": "5.0.0",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
@@ -260,9 +260,9 @@
     ]
   },
   "oidc": {
-    "hash": "sha256-vWpugR+BoHUnAiAk8vEUzIm8UGgFTcNGAIGhyG4mTws=",
-    "url": "https://github.com/H2CK/oidc/releases/download/1.16.3/oidc-1.16.3.tar.gz",
-    "version": "1.16.3",
+    "hash": "sha256-81bCSHh3+kTFYIeOm8HdqnursJIheL1X2o5M4g8/Flw=",
+    "url": "https://github.com/H2CK/oidc/releases/download/1.16.5/oidc-1.16.5.tar.gz",
+    "version": "1.16.5",
     "description": "Nextcloud as OpenID Connect Identity Provider\n\nWith this app you can use Nextcloud as OpenID Connect Identity Provider. If other services\nare configured correctly, you are able to access those services with your Nextcloud login.\n\nFull documentation can be found at:\n\n- [User Documentation](https://github.com/H2CK/oidc/wiki#user-documentation)\n- [Developer Documentation](https://github.com/H2CK/oidc/wiki#developer-documentation)",
     "homepage": "https://github.com/H2CK/oidc",
     "licenses": [
@@ -270,9 +270,9 @@
     ]
   },
   "oidc_login": {
-    "hash": "sha256-gv/VzxDNpp0AGmpsiV6E5De9pwZTtiRVZv1LdfH659M=",
+    "hash": "sha256-KBa8A7aC0uS6FQoOSa7nIkaaYe+A2KeAtzfqoKw0Gn4=",
     "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.3.1/oidc_login.tar.gz",
-    "version": "3.3.0",
+    "version": "3.3.1",
     "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication\n- Optional removal of special characters in UID\n- Mapping of multiple names to a single display name\n- Mapping for birthdate",
     "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect",
     "licenses": [
@@ -300,9 +300,9 @@
     ]
   },
   "polls": {
-    "hash": "sha256-u+/MGjmFX5xRCcECDlqkM2C0xPY4QiCVj7GXgD3iNXo=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.6.3/polls-v8.6.3.tar.gz",
-    "version": "8.6.3",
+    "hash": "sha256-ujl6c9teLVQQ7WWlN9Yw0+9bf04Y1UZ1zc9OdZZ9hTA=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v9.0.1/polls-v9.0.1.tar.gz",
+    "version": "9.0.1",
     "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
@@ -350,9 +350,9 @@
     ]
   },
   "repod": {
-    "hash": "sha256-FFTRr6RH2t5Z/pV4+Sh621SSIzwzxlvRJWxP+DRgXRo=",
-    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/4.0.0/repod.tar.gz",
-    "version": "4.0.0",
+    "hash": "sha256-Nvu90dlcLp4HpVwTcxGmVIIpdiV0G3ZUVj0eYYrFg4s=",
+    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/4.1.0/repod.tar.gz",
+    "version": "4.1.0",
     "description": "## Features\n- 🔍 Browse and subscribe huge collection of podcasts\n- 🔊 Listen to episodes directly in Nextcloud\n- 🌐 Sync your activity with [AntennaPod](https://antennapod.org/) and [other apps](https://git.crystalyx.net/Xefir/repod#clients-supporting-sync-of-gpoddersync)\n- 📱 Mobile friendly interface\n- 📡 Import and export your subscriptions\n- ➡️ Full features comparison [here](https://git.crystalyx.net/Xefir/repod#comparaison-with-similar-apps-for-nextcloud)\n\n## Requirements\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!",
     "homepage": "https://git.crystalyx.net/Xefir/repod",
     "licenses": [
@@ -370,9 +370,9 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-aulwXYz4D2qEHG3FBmY20xqrsK0mbGA8TWqP3s1g00I=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.4.1/release.tar.gz",
-    "version": "6.4.1",
+    "hash": "sha256-aWYPpqrrEj2SgJIGoyP7nL/HjM5yQItozmQ9b+Iu3NM=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.4.2/release.tar.gz",
+    "version": "6.4.2",
     "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
@@ -390,9 +390,9 @@
     ]
   },
   "tables": {
-    "hash": "sha256-8TA8HIQjdYcIzRoEIBAAR6T83sylZ9ysRbwwsWHrLqA=",
-    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.5/tables-v1.0.5.tar.gz",
-    "version": "1.0.5",
+    "hash": "sha256-7D7xskgcu6XgeNh+JCccVMSpC4SSDGwWa0tLY5jf1AU=",
+    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.6/tables-v1.0.6.tar.gz",
+    "version": "1.0.6",
     "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
     "homepage": "https://github.com/nextcloud/tables",
     "licenses": [
@@ -450,8 +450,8 @@
     ]
   },
   "uppush": {
-    "hash": "sha256-QMLrv44uCNPm+ko3u0XP6p5BZuJthtDFBsT07w0XW/c=",
-    "url": "https://codeberg.org/NextPush/uppush/archive/2.4.0.tar.gz",
+    "hash": "sha256-MFOZqCQRyzICFPMyJGJIr366QpF47GZM/SpzqiY0HWQ=",
+    "url": "https://codeberg.org/NextPush/uppush/archive/2.4.1.tar.gz",
     "version": "2.4.0",
     "description": "Once the mobile phone is connected with NextPush, push notifications can be forwarded to applications implementing UnifiedPush.\n\nMore information about UnifiedPush at https://unifiedpush.org",
     "homepage": "",
@@ -460,9 +460,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-G8dxIpI4k3mlCtqYIwOUwHeJiMP08XOp9zM+BY/EWSo=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.8.0/user_oidc-v8.8.0.tar.gz",
-    "version": "8.8.0",
+    "hash": "sha256-Sc7R/hkjAvRUC4aUOLbMucoNabcXt27XB1pwqlz2Zv0=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.10.1/user_oidc-v8.10.1.tar.gz",
+    "version": "8.10.1",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -470,10 +470,10 @@
     ]
   },
   "user_saml": {
-    "hash": "sha256-A4e4LYCcrt+LcyrSK9vQoNGG/a+bZU6K4umajrgDBIM=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.1.4/user_saml-v7.1.4.tar.gz",
-    "version": "7.1.4",
-    "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
+    "hash": "sha256-5Unzid91ztnShRqblmQ/Prd/6jfAUU7hMwqKE6gkgKI=",
+    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.0.0/user_saml-v8.0.0.tar.gz",
+    "version": "8.0.0",
+    "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\t* Authentik\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
     "homepage": "https://github.com/nextcloud/user_saml",
     "licenses": [
       "agpl"
diff --git a/pkgs/servers/nextcloud/packages/33.json b/pkgs/servers/nextcloud/packages/33.json
index 68536082a8af..d42e5a57051e 100644
--- a/pkgs/servers/nextcloud/packages/33.json
+++ b/pkgs/servers/nextcloud/packages/33.json
@@ -1,8 +1,8 @@
 {
   "bookmarks": {
-    "hash": "sha256-2v+lm1VBHcSdptKehpe8F+u9CiV3wC7zrx0UGdbKAek=",
-    "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.1.3/bookmarks-16.1.3.tar.gz",
-    "version": "16.1.3",
+    "hash": "sha256-Q4NwDrCuex5e2sGEG4Gu00Ne3UeojrSRlGPKQ8R2+/0=",
+    "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.1.4/bookmarks-16.1.4.tar.gz",
+    "version": "16.1.4",
     "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n   - intl: *\n   - mbstring: *\n - when using MySQL, use at least v8.0",
     "homepage": "https://github.com/nextcloud/bookmarks",
     "licenses": [
@@ -20,9 +20,9 @@
     ]
   },
   "checksum": {
-    "hash": "sha256-xA+BdtbAJVtM6YO5vdW7lfOGlyAkEhHlaCMvHmoHYX4=",
-    "url": "https://github.com/westberliner/checksum/releases/download/v2.0.3/checksum.tar.gz",
-    "version": "2.0.3",
+    "hash": "sha256-hOxl6JySlNzBIbBItAoYsx2sGqF5nm1mryv/jZkrWzk=",
+    "url": "https://github.com/westberliner/checksum/releases/download/v2.1.1/checksum.tar.gz",
+    "version": "2.1.1",
     "description": "Allows users to create a hash checksum of a file.\n        Possible algorithms are md5, sha1, sha256, sha384, sha512, sha3-256, sha3-512 and crc32.\n\n        Just open the details view of the file (Sidebar). There should be a new tab called \"Checksum\".\n        Select a algorithm and it will try to generate a hash.\n        If you want an other algorithm, just click on the reload button.",
     "homepage": "https://github.com/westberliner/checksum/",
     "licenses": [
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-h6Krtrm9YLZ0TEfsInN2bmY+/2v4Gyef5x0TIo9n/Ns=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v4.2.0/collectives-4.2.0.tar.gz",
-    "version": "4.2.0",
+    "hash": "sha256-hCH/P5at2pKCdBhCWoqaT0wrGkeRXcyNvno/b44+2DA=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v4.3.0/collectives-4.3.0.tar.gz",
+    "version": "4.3.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-2ptmc9Om0wELHVlqjqjZtY3dLCe5RbyxrylNeOa1CGA=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.4.3/contacts-v8.4.3.tar.gz",
-    "version": "8.4.3",
+    "hash": "sha256-ufDXVN3jKLb0FMVTS6CW3ZhShGPOOvJVGi356qtTfZE=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.4.4/contacts-v8.4.4.tar.gz",
+    "version": "8.4.4",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -80,9 +80,9 @@
     ]
   },
   "deck": {
-    "hash": "sha256-AG4Ef7Jhl8OV7Ddd6heHeEzay62DXEd86lOk9co/tXc=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.17.0/deck-v1.17.0.tar.gz",
-    "version": "1.17.0",
+    "hash": "sha256-5ayXPoq2E8eIQqL74p/dytqmjAN3vkAZvrgQIqxf7Zo=",
+    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.17.1/deck-v1.17.1.tar.gz",
+    "version": "1.17.1",
     "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
     "homepage": "https://github.com/nextcloud/deck",
     "licenses": [
@@ -90,9 +90,9 @@
     ]
   },
   "end_to_end_encryption": {
-    "hash": "sha256-ZlvEXob0CaoCEsmSKBK1EEVUMIWdtkP/hSrCmzUhidA=",
-    "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v2.0.2/end_to_end_encryption-v2.0.2.tar.gz",
-    "version": "2.0.2",
+    "hash": "sha256-OA0N0zvKRe/S1MuvmvoFG1UZZHfKiacQp0Alrlg6EFw=",
+    "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v2.1.0/end_to_end_encryption-v2.1.0.tar.gz",
+    "version": "2.1.0",
     "description": "## **End-to-End Encryption**\n\n### For End Users\n\n**Protect your most sensitive files with strong encryption.**\n\nThe End-to-End Encryption app gives you complete control over your data privacy.\nWith this app, you can encrypt specific folders so that only you (and those you trust) can access their contents.\nYour files are encrypted on your device before they reach the server, ensuring that no one—not even the server administrator—can read them.\n\n**Benefits:**\n- 🔒 **True privacy**: Files are encrypted on your device and can only be decrypted by you\n- 📱 **Works across all platforms**: Fully supported on desktop, Android, iOS clients, and as you wish even in the browser\n- 🎯 **Selective encryption**: Choose which folders to encrypt\n- 🛡️ **Secure sharing**: Share encrypted files with other users or even secure public upload using the encrypted file drop\n\n---\n\n### For Administrators\n\n**Enterprise-ready end-to-end encryption infrastructure for your Nextcloud instance.**\n\nThis app provides all the necessary server-side APIs and infrastructure to enable End-to-End encryption (E2EE) for your users.\nIt ensures that encrypted data remains secure throughout its lifecycle on your server.\n\n**Technical highlights:**\n- 🔐 **Complete API suite**: Provides all client-side APIs needed for E2EE implementation\n- 🔒 **Secure FileDrop integration**: Enables secure file sharing with encryption\n- 🛡️ **Zero-knowledge architecture**: Server never has access to encryption keys\n- ⚙️ **Group restrictions**: Limit app usage to specific user groups if needed\n- 🔄 **Background job management**: Automatic rollback handling for failed operations\n\n### Setup\nThis application provides the server-side infrastructure for end-to-end encryption, but it requires client support to function.\nTo enable end-to-end encryption, users will need to install the corresponding client-side app on their devices (desktop, Android, iOS) or use the web client.\n\nUsing the web interface, after enabling it in the personal settings, allows you to encrypt files and folders directly in the browser,\nproviding a seamless experience without needing additional software. But also requires some kind of trust in the server as the code is delivered by the server and could be manipulated.\n\nOnce enable through clients or the web interface, you can create encrypted folders and upload or move files into them.\nThe clients and the web interface will handle the encryption and decryption processes automatically.\n\n⚠️ This comes with some limitations and caveats, as only normal file operations can be handled.\nMeaning that some apps in the web interface do not work with encrypted files.",
     "homepage": "https://github.com/nextcloud/end_to_end_encryption",
     "licenses": [
@@ -130,9 +130,9 @@
     ]
   },
   "forms": {
-    "hash": "sha256-hiDhtnWtscpI+ICOk1nulJoCLovnBv8YBtso/CtJjH4=",
-    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.5/forms-v5.2.5.tar.gz",
-    "version": "5.2.5",
+    "hash": "sha256-N5OoSJj69RFmAX2g59r4j5EOUKeXbqwtScYo5Iv3y20=",
+    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.7/forms-v5.2.7.tar.gz",
+    "version": "5.2.7",
     "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API_v3.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!",
     "homepage": "https://github.com/nextcloud/forms",
     "licenses": [
@@ -150,9 +150,9 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-5V0gBRz6Q8HS3MxbsU+O7bRwv+765dS2SIbOnFVVERE=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v21.0.6/groupfolders-v21.0.6.tar.gz",
-    "version": "21.0.6",
+    "hash": "sha256-yLcyZCI3IHEiZJDAH/vb7uqi5UmNMHFsRedK2pN88mc=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v21.0.7/groupfolders-v21.0.7.tar.gz",
+    "version": "21.0.7",
     "description": "Team Folders (formerly \"Group Folders\") allows administrators to create and manage shared folders that are accessible\n\t\t\tto selected teams within Nextcloud.\n\n\t\t\tAdmins can configure folders from the Team Folders section in the admin settings, where they can grant access to one\n\t\t\tor more teams, set custom permissions (such as read, write, and sharing rights), and assign storage quotas to each\n\t\t\tfolder.\n\n\t\t\tAs of Hub 10/Nextcloud 31, admins must be members of a team to assign it a Team Folder. The app supports advanced\n\t\t\tfeatures such as quota management, granular access control, and integration with Nextcloud’s trash and versioning\n\t\t\tsystems.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
@@ -180,9 +180,9 @@
     ]
   },
   "integration_deepl": {
-    "hash": "sha256-o50BZEMtN81UuemxP4+lJt1uI/40EwXiHfaf8FtvkbM=",
-    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.1.0/integration_deepl-v2.1.0.tar.gz",
-    "version": "2.1.0",
+    "hash": "sha256-RHYxxZw/2/uDdZdf8kGYgGBlBi1rfgXUtTtr9lgr/20=",
+    "url": "https://github.com/nextcloud-releases/integration_deepl/releases/download/v2.2.0/integration_deepl-v2.2.0.tar.gz",
+    "version": "2.2.0",
     "description": "Deepl integration providing an translations through deepl.com with Nextcloud\n\nThis app integrates with [Nextcloud Assistant](https://apps.nextcloud.com/apps/assistant) to offer translation services We recommend to install Assistant additionally and activate Deepl as translation provider in the Artifical Intelligence admin settings.\n\nThis app also integrates with the translation API of Nextcloud server to offer translation services without Assistant. Currently this is available in Text and Talk.\n\nTo run translations and any other Task Processing tasks synchronously, run the following command in a background process (10 is the interval in seconds when the process should relaunch to use the latest php changes):\n\n```sh\nset -e; while true; do occ background-job:worker -v -t 10 \"OC\\TaskProcessing\\SynchronousBackgroundJob\"; done\n```\n\n## Ethical AI Rating\n### Rating: 🔴\n\nNegative:\n* the software for training and inferencing of this model is proprietary, limiting running it locally or training by yourself\n* the trained model is not freely available, so the model can not be ran on-premises\n* the training data is not freely available, limiting the ability of external parties to check and correct for bias or optimise the model’s performance and CO2 usage.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/integration_deepl",
     "licenses": [
@@ -210,9 +210,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-aaGl57K99xzO53zUTZDWvIdoR0SwWnaqaljVeZQOgBU=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.6/mail-v5.7.6.tar.gz",
-    "version": "5.7.6",
+    "hash": "sha256-IqsrI3Wt2eOMmb04VMFJytjwURu7otcIhcykdio+MHg=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.7.12/mail-v5.7.12.tar.gz",
+    "version": "5.7.12",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-KsHV3zN6kB391wIngALJLCgqcYLRw0PnU9JTDBM/lxo=",
-    "url": "https://github.com/nextcloud/news/releases/download/28.1.0/news.tar.gz",
-    "version": "28.1.0",
+    "hash": "sha256-5KVKrtCQ3Nt7E8/vjYebAcpI0U6QzgvdqFqRk9MPEgo=",
+    "url": "https://github.com/nextcloud/news/releases/download/28.2.0/news.tar.gz",
+    "version": "28.2.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -250,9 +250,9 @@
     ]
   },
   "notes": {
-    "hash": "sha256-iZmmdiwqBnDquPM+bUyzhiAbiI8Q67JR+pjDDRQW4sI=",
-    "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.13.1/notes-v4.13.1.tar.gz",
-    "version": "4.13.1",
+    "hash": "sha256-NCBDtNO6jsqws4BE8sGOnox2xUuODleYodQ5vv6jqEs=",
+    "url": "https://github.com/nextcloud-releases/notes/releases/download/v5.0.0/notes-v5.0.0.tar.gz",
+    "version": "5.0.0",
     "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into apps ([Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios), as well as [3rd-party apps](https://github.com/nextcloud/notes/wiki#3rd-party-clients) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.",
     "homepage": "https://github.com/nextcloud/notes",
     "licenses": [
@@ -260,9 +260,9 @@
     ]
   },
   "oidc": {
-    "hash": "sha256-vWpugR+BoHUnAiAk8vEUzIm8UGgFTcNGAIGhyG4mTws=",
-    "url": "https://github.com/H2CK/oidc/releases/download/1.16.3/oidc-1.16.3.tar.gz",
-    "version": "1.16.3",
+    "hash": "sha256-81bCSHh3+kTFYIeOm8HdqnursJIheL1X2o5M4g8/Flw=",
+    "url": "https://github.com/H2CK/oidc/releases/download/1.16.5/oidc-1.16.5.tar.gz",
+    "version": "1.16.5",
     "description": "Nextcloud as OpenID Connect Identity Provider\n\nWith this app you can use Nextcloud as OpenID Connect Identity Provider. If other services\nare configured correctly, you are able to access those services with your Nextcloud login.\n\nFull documentation can be found at:\n\n- [User Documentation](https://github.com/H2CK/oidc/wiki#user-documentation)\n- [Developer Documentation](https://github.com/H2CK/oidc/wiki#developer-documentation)",
     "homepage": "https://github.com/H2CK/oidc",
     "licenses": [
@@ -270,9 +270,9 @@
     ]
   },
   "oidc_login": {
-    "hash": "sha256-gv/VzxDNpp0AGmpsiV6E5De9pwZTtiRVZv1LdfH659M=",
+    "hash": "sha256-KBa8A7aC0uS6FQoOSa7nIkaaYe+A2KeAtzfqoKw0Gn4=",
     "url": "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.3.1/oidc_login.tar.gz",
-    "version": "3.3.0",
+    "version": "3.3.1",
     "description": "# OpenID Connect Login\n\nProvides user creation and login via one single OpenID Connect provider. Even though this is a fork of [nextcloud-social-login](https://github.com/zorn-v/nextcloud-social-login), it fundamentally differs in two ways - aims for simplistic, single provider login (and hence is very minimalistic), and it supports having LDAP as the primary user backend. This way, you can use OpenID Connect to login to Nextcloud while maintaining an LDAP backend with attributes with the LDAP plugin.\n\n### Features\n\n- Automatic [Identity provider endpoints discovery](https://openid.net/specs/openid-connect-discovery-1_0.html)\n- User creation at first login\n- User profile update at login (name, email, avatar, groups etc.)\n- Group creation\n- Automatic redirection from the nextcloud login page to the Identity Provider login page\n- WebDAV endpoints `Bearer` and `Basic` authentication\n- Optional removal of special characters in UID\n- Mapping of multiple names to a single display name\n- Mapping for birthdate",
     "homepage": "https://github.com/pulsejet/nextcloud-single-openid-connect",
     "licenses": [
@@ -300,9 +300,9 @@
     ]
   },
   "polls": {
-    "hash": "sha256-u+/MGjmFX5xRCcECDlqkM2C0xPY4QiCVj7GXgD3iNXo=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.6.3/polls-v8.6.3.tar.gz",
-    "version": "8.6.3",
+    "hash": "sha256-ujl6c9teLVQQ7WWlN9Yw0+9bf04Y1UZ1zc9OdZZ9hTA=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v9.0.1/polls-v9.0.1.tar.gz",
+    "version": "9.0.1",
     "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
     "homepage": "https://github.com/nextcloud/polls",
     "licenses": [
@@ -350,9 +350,9 @@
     ]
   },
   "repod": {
-    "hash": "sha256-FFTRr6RH2t5Z/pV4+Sh621SSIzwzxlvRJWxP+DRgXRo=",
-    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/4.0.0/repod.tar.gz",
-    "version": "4.0.0",
+    "hash": "sha256-Nvu90dlcLp4HpVwTcxGmVIIpdiV0G3ZUVj0eYYrFg4s=",
+    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/4.1.0/repod.tar.gz",
+    "version": "4.1.0",
     "description": "## Features\n- 🔍 Browse and subscribe huge collection of podcasts\n- 🔊 Listen to episodes directly in Nextcloud\n- 🌐 Sync your activity with [AntennaPod](https://antennapod.org/) and [other apps](https://git.crystalyx.net/Xefir/repod#clients-supporting-sync-of-gpoddersync)\n- 📱 Mobile friendly interface\n- 📡 Import and export your subscriptions\n- ➡️ Full features comparison [here](https://git.crystalyx.net/Xefir/repod#comparaison-with-similar-apps-for-nextcloud)\n\n## Requirements\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!",
     "homepage": "https://git.crystalyx.net/Xefir/repod",
     "licenses": [
@@ -370,9 +370,9 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-aulwXYz4D2qEHG3FBmY20xqrsK0mbGA8TWqP3s1g00I=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.4.1/release.tar.gz",
-    "version": "6.4.1",
+    "hash": "sha256-aWYPpqrrEj2SgJIGoyP7nL/HjM5yQItozmQ9b+Iu3NM=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.4.2/release.tar.gz",
+    "version": "6.4.2",
     "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
@@ -450,8 +450,8 @@
     ]
   },
   "uppush": {
-    "hash": "sha256-QMLrv44uCNPm+ko3u0XP6p5BZuJthtDFBsT07w0XW/c=",
-    "url": "https://codeberg.org/NextPush/uppush/archive/2.4.0.tar.gz",
+    "hash": "sha256-MFOZqCQRyzICFPMyJGJIr366QpF47GZM/SpzqiY0HWQ=",
+    "url": "https://codeberg.org/NextPush/uppush/archive/2.4.1.tar.gz",
     "version": "2.4.0",
     "description": "Once the mobile phone is connected with NextPush, push notifications can be forwarded to applications implementing UnifiedPush.\n\nMore information about UnifiedPush at https://unifiedpush.org",
     "homepage": "",
@@ -460,9 +460,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-G8dxIpI4k3mlCtqYIwOUwHeJiMP08XOp9zM+BY/EWSo=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.8.0/user_oidc-v8.8.0.tar.gz",
-    "version": "8.8.0",
+    "hash": "sha256-Sc7R/hkjAvRUC4aUOLbMucoNabcXt27XB1pwqlz2Zv0=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.10.1/user_oidc-v8.10.1.tar.gz",
+    "version": "8.10.1",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -470,10 +470,10 @@
     ]
   },
   "user_saml": {
-    "hash": "sha256-A4e4LYCcrt+LcyrSK9vQoNGG/a+bZU6K4umajrgDBIM=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v7.1.4/user_saml-v7.1.4.tar.gz",
-    "version": "7.1.4",
-    "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
+    "hash": "sha256-5Unzid91ztnShRqblmQ/Prd/6jfAUU7hMwqKE6gkgKI=",
+    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.0.0/user_saml-v8.0.0.tar.gz",
+    "version": "8.0.0",
+    "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\t* Authentik\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
     "homepage": "https://github.com/nextcloud/user_saml",
     "licenses": [
       "agpl"
diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix
index b3cee0fa68a2..dbcd455fb4fc 100644
--- a/pkgs/servers/sql/mssql/jdbc/default.nix
+++ b/pkgs/servers/sql/mssql/jdbc/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mssql-jdbc";
-  version = "13.2.1";
+  version = "13.4.0";
 
   src = fetchurl {
     url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar";
-    sha256 = "sha256-dgOW6pYXDM7p60FoQjFBdbZUoUhDmjSmH+0Ud2SFsBk=";
+    sha256 = "sha256-gba5hgxxO1PCN70x9tZQJRUXgYqD2T5emf3/JQol+NM=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index 4cc2eb58e73d..d4b297ce0717 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -10,7 +10,7 @@ postgresqlBuildExtension (finalAttrs: {
   version = "2.2";
 
   src = fetchFromGitHub {
-    owner = "citusdata";
+    owner = "hapostgres";
     repo = "pg_auto_failover";
     tag = "v${finalAttrs.version}";
     hash = "sha256-lsnVry+5n08kLOun8u0B7XFvI5ijTKJtFJ84fixMHe4=";
@@ -26,8 +26,8 @@ postgresqlBuildExtension (finalAttrs: {
         (lib.versionAtLeast postgresql.version "18");
     description = "PostgreSQL extension and service for automated failover and high-availability";
     mainProgram = "pg_autoctl";
-    homepage = "https://github.com/citusdata/pg_auto_failover";
-    changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://github.com/hapostgres/pg_auto_failover";
+    changelog = "https://github.com/hapostgres/pg_auto_failover/blob/v${finalAttrs.version}/CHANGELOG.md";
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
     license = lib.licenses.postgresql;
diff --git a/pkgs/servers/sql/postgresql/ext/pg_background.nix b/pkgs/servers/sql/postgresql/ext/pg_background.nix
index 5d310ba278ec..3e1562ecd21b 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_background.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_background.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_background";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "vibhorkum";
     repo = "pg_background";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-R78lB/58/dfZPg4XZ5xGuQ/Ftv+SQzU4aeJop6tslK8=";
+    hash = "sha256-m5mdXTmml6iX4UKcHeN6uMjypLvHasjD5AXzUhvEHdI=";
   };
 
   buildInputs = postgresql.buildInputs;
diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix
index 174b4887d9c1..c3a9eedb7ca0 100644
--- a/pkgs/servers/sql/postgresql/ext/pgmq.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgmq";
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
-    owner = "tembo-io";
+    owner = "pgmq";
     repo = "pgmq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fJWINP7Dvc79blpfYbGfTEKZtcA/S8KAjmX5uPhmXBM=";
+    hash = "sha256-BPOrQ7HcgTaTJIRzWUCG3iJN3mUjwIxa/wPxvJ1l4o4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/pgmq-extension";
@@ -23,7 +23,7 @@ postgresqlBuildExtension (finalAttrs: {
   meta = {
     description = "Lightweight message queue like AWS SQS and RSMQ but on Postgres";
     homepage = "https://tembo.io/pgmq";
-    changelog = "https://github.com/tembo-io/pgmq/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/pgmq/pgmq/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ takeda ];
     platforms = postgresql.meta.platforms;
     license = lib.licenses.postgresql;
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index a0adcd2f3bd0..8dcca959985a 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -6,7 +6,7 @@
   pkg-config,
   postgresql,
   postgresqlBuildExtension,
-  xxHash,
+  xxhash,
 }:
 
 postgresqlBuildExtension (finalAttrs: {
@@ -24,7 +24,7 @@ postgresqlBuildExtension (finalAttrs: {
   buildInputs = [
     msgpack-c
     groonga
-    xxHash
+    xxhash
   ];
 
   makeFlags = [
diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix
index 2bae99603e03..08052a5cf20f 100644
--- a/pkgs/servers/sql/postgresql/ext/pgtap.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix
@@ -35,7 +35,6 @@ postgresqlBuildExtension (finalAttrs: {
       postgresqlTestHook
       (postgresql.withPackages (_: [ finalAttrs.finalPackage ]))
     ];
-    passAsFile = [ "sql" ];
     sql = ''
       CREATE EXTENSION pgtap;
 
@@ -47,10 +46,13 @@ postgresqlBuildExtension (finalAttrs: {
     '';
     checkPhase = ''
       runHook preCheck
+      sqlPath=$TMPDIR/test.sql
+      printf "%s" "$sql" > $sqlPath
       psql -a -v ON_ERROR_STOP=1 -f $sqlPath
       runHook postCheck
     '';
     installPhase = "touch $out";
+    __structuredAttrs = true;
   };
 
   meta = {
diff --git a/pkgs/servers/sql/postgresql/ext/pointcloud/package.nix b/pkgs/servers/sql/postgresql/ext/pointcloud/package.nix
index 7e2f75da868d..021f4041b4dd 100644
--- a/pkgs/servers/sql/postgresql/ext/pointcloud/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/pointcloud/package.nix
@@ -67,6 +67,7 @@ postgresqlBuildExtension (finalAttrs: {
 
   configureFlags = [
     (lib.withFeatureAs true "xml2config" (lib.getExe' (lib.getDev libxml2) "xml2-config"))
+    "CFLAGS=-std=gnu17"
   ];
 
   postInstall = ''
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 1dcbf858aa89..9e931d62aca2 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -13,13 +13,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
-  version = "2.26.3";
+  version = "2.26.4";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = "timescaledb";
     tag = finalAttrs.version;
-    hash = "sha256-2ZBra4GumVvbr2GQIM2BQ87X6TeX4LdSIUqpj203L/0=";
+    hash = "sha256-fCaB0LSffjmen1zDjsR/4V3FgH05gkLDHYmLqVpyTLQ=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix b/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix
index 0143ce3150ef..734e7b4e3f90 100644
--- a/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix
+++ b/pkgs/servers/sql/postgresql/postgresqlTestExtension.nix
@@ -22,7 +22,6 @@ stdenvNoCC.mkDerivation (
       (postgresql.withPackages (ps: [ finalPackage ] ++ (map (p: ps."${p}") withPackages)))
     ];
     postgresqlTestUserOptions = "LOGIN SUPERUSER";
-    passAsFile = [ "sql" ];
     sql =
       sql
       + lib.concatMapStrings (
@@ -39,10 +38,13 @@ stdenvNoCC.mkDerivation (
       ) asserts;
     checkPhase = ''
       runHook preCheck
+      sqlPath=$TMPDIR/test.sql
+      printf "%s" "$sql" > $sqlPath
       psql -a -v ON_ERROR_STOP=1 -f "$sqlPath"
       runHook postCheck
     '';
     installPhase = "touch $out";
+    __structuredAttrs = true;
   }
   // lib.removeAttrs extraArgs [
     "asserts"
diff --git a/pkgs/servers/vinyl-cache/default.nix b/pkgs/servers/vinyl-cache/default.nix
new file mode 100644
index 000000000000..11f4438ea787
--- /dev/null
+++ b/pkgs/servers/vinyl-cache/default.nix
@@ -0,0 +1,133 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  buildPackages,
+  pcre2,
+  jemalloc,
+  libunwind,
+  libxslt,
+  groff,
+  ncurses,
+  pkg-config,
+  readline,
+  libedit,
+  coreutils,
+  python3,
+  makeWrapper,
+  nixosTests,
+}:
+
+let
+  generic =
+    {
+      version,
+      hash,
+    }:
+    stdenv.mkDerivation (finalAttrs: {
+      pname = "vinyl-cache";
+      inherit version;
+
+      src = fetchurl {
+        url = "https://vinyl-cache.org/downloads/${finalAttrs.pname}-${version}.tgz";
+        inherit hash;
+      };
+
+      __structuredAttrs = true;
+      strictDeps = true;
+
+      nativeBuildInputs = [
+        pkg-config
+        python3.pkgs.docutils
+        python3.pkgs.sphinx
+        makeWrapper
+      ];
+
+      buildInputs = [
+        libxslt
+        groff
+        ncurses
+        readline
+        libedit
+        pcre2
+        python3
+      ]
+      ++ lib.optional stdenv.hostPlatform.isDarwin libunwind
+      ++ lib.optional stdenv.hostPlatform.isLinux jemalloc;
+
+      configureFlags = [
+        # the checks behind those to not work when doing cross but for simplicity we always define them
+        "ac_cv_have_tcp_fastopen=yes"
+        "ac_cv_have_tcp_keep=yes"
+        "ac_cv_have_working_close_range=yes"
+        "PYTHON=${buildPackages.python3.interpreter}"
+      ];
+
+      buildFlags = [ "localstatedir=/var/run" ];
+
+      postPatch = ''
+        substituteInPlace bin/vinyltest/vtest2/src/vtc_main.c --replace-fail /bin/rm "${coreutils}/bin/rm"
+      '';
+
+      postConfigure = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+        # prevent cache invalidation
+        substituteInPlace bin/vinyld/Makefile \
+          --replace-fail "vhp_hufdec.h: vhp_gen_hufdec" "vhp_hufdec.h:"
+
+        ln -s "${buildPackages.vinyl.vhp_hufdec_h}" bin/vinyld/vhp_hufdec.h
+
+        substituteInPlace bin/vinylstat/Makefile \
+          --replace-fail "vinylstat_curses_help.c: vinylstat_help_gen" "vinylstat_curses_help.c:" \
+          --replace-fail "./vinylstat_help_gen" "${buildPackages.vinyl}/bin/vinylstat_help_gen"
+
+        # the docs execute lots of commands to gather options and flags
+        substituteInPlace doc/Makefile \
+          --replace-fail "SUBDIRS = graphviz sphinx" "SUBDIRS = graphviz"
+        substituteInPlace Makefile \
+          --replace-fail "include lib bin vmod etc doc man contrib" "include lib bin vmod etc doc contrib"
+      '';
+
+      postInstall = ''
+        wrapProgram "$out/sbin/vinyld" --prefix PATH : "${lib.makeBinPath [ stdenv.cc ]}"
+      ''
+      + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+        cp bin/vinyld/vhp_hufdec.h $vhp_hufdec_h
+      '';
+
+      # https://github.com/varnishcache/varnish-cache/issues/1875
+      env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-fexcess-precision=standard";
+
+      outputs = [
+        "out"
+        "dev"
+      ]
+      ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+        "man"
+        "vhp_hufdec_h" # only used for cross compilation
+      ];
+
+      passthru = {
+        python = python3;
+        tests = nixosTests."vinyl-cache_${lib.versions.major version}";
+      };
+
+      meta = {
+        description = "Web application accelerator also known as a caching HTTP reverse proxy";
+        homepage = "https://vinyl-cache.org";
+        license = lib.licenses.bsd2;
+        maintainers = [
+          lib.maintainers.leona
+          lib.maintainers.osnyx
+        ];
+        platforms = lib.platforms.unix;
+        broken = stdenv.hostPlatform.isDarwin;
+      };
+    });
+in
+{
+  # EOL 2027-03-16
+  vinyl-cache_9 = generic {
+    version = "9.0.0";
+    hash = "sha256-l0DCEMKndifVD9CtbHWdw8oJT8tOZVW6VfynHPSDvRc=";
+  };
+}
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 061a2fe543c3..5c572d71511d 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -305,8 +305,8 @@ let
       pname = "discourse-assets";
       inherit version src;
       pnpm = pnpm;
-      fetcherVersion = 1;
-      hash = "sha256-/vPNHEB/ZuHWnSLqfz2NM/scSRH9wzotzjunDAw5Imc=";
+      fetcherVersion = 3;
+      hash = "sha256-xft/2x0iti0yJ53uI9q2+FSvKgWWfKQzlMlPFz3RZsE=";
     };
 
     nativeBuildInputs = runtimeDeps ++ [
diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json
index d5884cd6ea52..faa9a5e851fb 100644
--- a/pkgs/servers/web-apps/lemmy/pin.json
+++ b/pkgs/servers/web-apps/lemmy/pin.json
@@ -1,8 +1,8 @@
 {
-  "serverVersion": "0.19.17",
-  "uiVersion": "0.19.17",
-  "serverHash": "sha256-zEqKuOHmbftN1LGW+yP/Uo6nZ7Q2RoDIPVWkoj5HnXk=",
-  "serverCargoHash": "sha256-1z9CasnGqhaowzmY3nC2IZUI6vI8i9Zh5ZA+SEtI09c=",
-  "uiHash": "sha256-Gysv3VlLL0pwu/JUbK2ViD4wC+rrnEo4lU9HloRSQMw=",
+  "serverVersion": "0.19.18",
+  "uiVersion": "0.19.18",
+  "serverHash": "sha256-NUr96dsH3Gd+1ouOAgPheU0hnDI37a87EN642u482Sg=",
+  "serverCargoHash": "sha256-oI8o+29kqjkAP2DIoSopPMQb5YlZNja1hV1bVmfMIvU=",
+  "uiHash": "sha256-7WcPujev7VrkoX5vvGUvS0hUVJnCZjsceO5zK36jPbw=",
   "uiPNPMDepsHash": "sha256-dRUD/R7Qtlfy2saX7grfdi5qBDP8gc3L3+C2m7ro1CU="
 }
diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix
index 105f90f6bdd3..f21eb8c2d5f2 100644
--- a/pkgs/shells/fish/plugins/forgit.nix
+++ b/pkgs/shells/fish/plugins/forgit.nix
@@ -6,13 +6,13 @@
 
 buildFishPlugin rec {
   pname = "forgit";
-  version = "26.04.2";
+  version = "26.05.0";
 
   src = fetchFromGitHub {
     owner = "wfxr";
     repo = "forgit";
     rev = version;
-    hash = "sha256-/zFws4/QkAuoV2edtxW3jK1HbftigYNZzTkSg5Y4Phg=";
+    hash = "sha256-EFbzrVgLfVO+dEEQ1vZUcZkIszZFCktYjQjwkBVrHQI=";
   };
 
   postInstall = ''
diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/shells/fish/plugins/hydro.nix
index dc33038c5545..d9fbc2fec351 100644
--- a/pkgs/shells/fish/plugins/hydro.nix
+++ b/pkgs/shells/fish/plugins/hydro.nix
@@ -6,13 +6,13 @@
 
 buildFishPlugin {
   pname = "hydro";
-  version = "0-unstable-2024-11-02";
+  version = "0-unstable-2025-12-31";
 
   src = fetchFromGitHub {
     owner = "jorgebucaran";
     repo = "hydro";
-    rev = "9c93b89573bd722f766f2190a862ae55e728f6ba";
-    hash = "sha256-QYq4sU41/iKvDUczWLYRGqDQpVASF/+6brJJ8IxypjE=";
+    rev = "24bb2375e3cb29c71ab790c8cfe98b9069de80c3";
+    hash = "sha256-8ixve1ws80q5jNdKoooL25Lk7qopVitCMVTucW490fU=";
   };
 
   meta = {
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 403e2d1e9894..639a383a4524 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -92,16 +92,22 @@ rec {
             (mkDerivationSuper args).overrideAttrs (
               args:
               (
-                if (args.__structuredAttrs or false) || (args ? env.NIX_CFLAGS_LINK) then
+                if (args ? NIX_CFLAGS_LINK) then
+                  lib.warn
+                    (
+                      "NIX_CFLAGS_LINK is an environment variable and should be defined inside `env`"
+                      + lib.optionalString (args ? pname) " for package ${args.pname}"
+                      + lib.optionalString (args ? version) "-${args.version}"
+                    )
+                    {
+                      NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static";
+                    }
+                else
                   {
                     env = (args.env or { }) // {
                       NIX_CFLAGS_LINK = toString (args.env.NIX_CFLAGS_LINK or "") + " -static";
                     };
                   }
-                else
-                  {
-                    NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static";
-                  }
               )
               // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) {
                 configureFlags = (args.configureFlags or [ ]) ++ [
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 74c64f080c2d..8d7f00032bfd 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -162,10 +162,23 @@ let
 
     // {
 
-      meta = {
-        description = "The default build environment for Unix packages in Nixpkgs";
-        platforms = lib.platforms.all;
-      };
+      meta =
+        let
+          pos = builtins.unsafeGetAttrPos "name" argsStdenv;
+        in
+        {
+          description = "The default build environment for Unix packages in Nixpkgs";
+          platforms = lib.platforms.all;
+          position = "${pos.file}:${toString pos.line}";
+          teams = [ lib.teams.stdenv ];
+          license = lib.licenses.mit;
+          identifiers.cpeParts = {
+            part = "a";
+            vendor = "nixos";
+            product = argsStdenv.name;
+            inherit version;
+          };
+        };
 
       inherit buildPlatform hostPlatform targetPlatform;
 
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 4406bef8f908..12a6dffb426f 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -20,13 +20,12 @@ let
     concatMapStrings
     concatStringsSep
     elem
-    elemAt
     extendDerivation
     filter
     filterAttrs
     getDev
     head
-    imap1
+    foldl'
     isAttrs
     isBool
     isDerivation
@@ -45,6 +44,8 @@ let
     toFunction
     unique
     zipAttrsWith
+    isPath
+    seq
     ;
 
   inherit (import ../../build-support/lib/cmake.nix { inherit lib stdenv; }) makeCMakeFlags;
@@ -95,51 +96,46 @@ let
       # NOTE: the above documentation had to be duplicated in `lib/customisation.nix`: `makeOverridable`.
       overrideAttrs =
         f0:
-        let
-          extends' =
-            overlay: f:
+        makeDerivationExtensible (
+          final:
+          let
+            prev = rattrs final;
+            thisOverlay = lib.toExtension f0 final prev;
+            pos = builtins.unsafeGetAttrPos "version" thisOverlay;
+          in
+          lib.warnIf
             (
-              final:
-              let
-                prev = f final;
-                thisOverlay = overlay final prev;
-                warnForBadVersionOverride = (
-                  prev ? src
-                  && thisOverlay ? version
-                  && prev ? version
-                  # We could check that the version is actually distinct, but that
-                  # would probably just delay the inevitable, or preserve tech debt.
-                  # && prev.version != thisOverlay.version
-                  && !(thisOverlay ? src)
-                  && !(thisOverlay.__intentionallyOverridingVersion or false)
-                );
-                pname = args.pname or "<unknown name>";
-                version = args.version or "<unknown version>";
-                pos = builtins.unsafeGetAttrPos "version" thisOverlay;
-              in
-              lib.warnIf warnForBadVersionOverride ''
-                ${
-                  args.name or "${pname}-${version}"
-                } was overridden with `version` but not `src` at ${pos.file or "<unknown file>"}:${
-                  toString pos.line or "<unknown line>"
-                }:${toString pos.column or "<unknown column>"}.
+              prev ? src
+              && thisOverlay ? version
+              && prev ? version
+              # We could check that the version is actually distinct, but that
+              # would probably just delay the inevitable, or preserve tech debt.
+              # && prev.version != thisOverlay.version
+              && !(thisOverlay ? src)
+              && !(thisOverlay.__intentionallyOverridingVersion or false)
+            )
+            ''
+              ${
+                args.name or "${args.pname or "<unknown name>"}-${args.version or "<unknown version>"}"
+              } was overridden with `version` but not `src` at ${pos.file or "<unknown file>"}:${
+                toString pos.line or "<unknown line>"
+              }:${toString pos.column or "<unknown column>"}.
 
-                This is most likely not what you want. In order to properly change the version of a package, override
-                both the `version` and `src` attributes:
+              This is most likely not what you want. In order to properly change the version of a package, override
+              both the `version` and `src` attributes:
 
-                hello.overrideAttrs (oldAttrs: rec {
-                  version = "1.0.0";
-                  src = pkgs.fetchurl {
-                    url = "mirror://gnu/hello/hello-''${version}.tar.gz";
-                    hash = "...";
-                  };
-                })
+              hello.overrideAttrs (oldAttrs: rec {
+                version = "1.0.0";
+                src = pkgs.fetchurl {
+                  url = "mirror://gnu/hello/hello-''${version}.tar.gz";
+                  hash = "...";
+                };
+              })
 
-                (To silence this warning, set `__intentionallyOverridingVersion = true` in your `overrideAttrs` call.)
-              '' (prev // (removeAttrs thisOverlay [ "__intentionallyOverridingVersion" ]))
-            );
-        in
-        makeDerivationExtensible (extends' (lib.toExtension f0) rattrs);
+              (To silence this warning, set `__intentionallyOverridingVersion = true` in your `overrideAttrs` call.)
+            ''
+            (prev // (removeAttrs thisOverlay [ "__intentionallyOverridingVersion" ]))
+        );
 
       finalPackage = mkDerivationSimple overrideAttrs args;
 
@@ -375,17 +371,6 @@ let
 
       ...
     }@attrs:
-
-    # Policy on acceptable hash types in nixpkgs
-    assert
-      attrs ? outputHash
-      -> (
-        let
-          algo = attrs.outputHashAlgo or (head (splitString "-" attrs.outputHash));
-        in
-        if algo == "md5" then throw "Rejected insecure ${algo} hash '${attrs.outputHash}'" else true
-      );
-
     let
       # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
       # no package has `doCheck = true`.
@@ -395,13 +380,17 @@ let
       separateDebugInfo' =
         let
           actualValue = separateDebugInfo && isLinux;
-          conflictingOption =
+        in
+        if
+          actualValue
+          && (
             attrs ? "disallowedReferences"
             || attrs ? "disallowedRequisites"
             || attrs ? "allowedRequisites"
-            || attrs ? "allowedReferences";
-        in
-        if actualValue && conflictingOption && !__structuredAttrs then
+            || attrs ? "allowedReferences"
+          )
+          && !__structuredAttrs
+        then
           throw "separateDebugInfo = true in ${
             attrs.pname or "mkDerivation argument"
           } requires __structuredAttrs if {dis,}allowedRequisites or {dis,}allowedReferences is set"
@@ -410,7 +399,7 @@ let
       outputs' = outputs ++ optional separateDebugInfo' "debug";
 
       noNonNativeDeps =
-        builtins.length (
+        (
           depsBuildTarget
           ++ depsBuildTargetPropagated
           ++ depsHostHost
@@ -419,12 +408,12 @@ let
           ++ propagatedBuildInputs
           ++ depsTargetTarget
           ++ depsTargetTargetPropagated
-        ) == 0;
+        ) == [ ];
       dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenvHasCC;
 
       concretizeFlagImplications =
         flag: impliesFlags: list:
-        if builtins.elem flag list then (list ++ impliesFlags) else list;
+        if elem flag list then (list ++ impliesFlags) else list;
 
       hardeningDisable' = unique (
         pipe hardeningDisable [
@@ -437,31 +426,31 @@ let
         ]
       );
       enabledHardeningOptions =
-        if builtins.elem "all" hardeningDisable' then
+        if elem "all" hardeningDisable' then
           [ ]
         else
           subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable);
       # hardeningDisable additionally supports "all".
-      erroneousHardeningFlags = subtractLists (knownHardeningFlags ++ [ "pie" ]) (
+      erroneousHardeningFlags = subtractLists knownHardeningFlags (
         hardeningEnable ++ remove "all" hardeningDisable
       );
 
       checkDependencyList = checkDependencyList' [ ];
       checkDependencyList' =
         positions: name: deps:
-        imap1 (
+        seq (foldl' (
           index: dep:
-          if dep == null || isDerivation dep || builtins.isString dep || builtins.isPath dep then
-            dep
+          if dep == null || isDerivation dep || isString dep || isPath dep then
+            index + 1
           else if isList dep then
-            checkDependencyList' ([ index ] ++ positions) name dep
+            seq (checkDependencyList' ([ index ] ++ positions) name dep) (index + 1)
           else
             throw "Dependency is not of a valid type: ${
               concatMapStrings (ix: "element ${toString ix} of ") ([ index ] ++ positions)
             }${name} for ${attrs.name or attrs.pname}"
-        ) deps;
+        ) 1 deps) deps;
     in
-    if builtins.length erroneousHardeningFlags != 0 then
+    if erroneousHardeningFlags != [ ] then
       abort (
         "mkDerivation was called with unsupported hardening flags: "
         + lib.generators.toPretty { } {
@@ -488,53 +477,58 @@ let
 
         outputs = outputs';
 
-        dependencies = [
-          [
-            (map (drv: getDev drv.__spliced.buildBuild or drv) (
-              checkDependencyList "depsBuildBuild" depsBuildBuild
-            ))
-            (map (drv: getDev drv.__spliced.buildHost or drv) (
-              checkDependencyList "nativeBuildInputs" nativeBuildInputs'
-            ))
-            (map (drv: getDev drv.__spliced.buildTarget or drv) (
-              checkDependencyList "depsBuildTarget" depsBuildTarget
-            ))
-          ]
-          [
-            (map (drv: getDev drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHost" depsHostHost))
-            (map (drv: getDev drv.__spliced.hostTarget or drv) (checkDependencyList "buildInputs" buildInputs'))
-          ]
-          [
-            (map (drv: getDev drv.__spliced.targetTarget or drv) (
-              checkDependencyList "depsTargetTarget" depsTargetTarget
-            ))
-          ]
+        buildBuildOutputs = map (drv: getDev drv.__spliced.buildBuild or drv) (
+          checkDependencyList "depsBuildBuild" depsBuildBuild
+        );
+        buildHostOutputs = map (drv: getDev drv.__spliced.buildHost or drv) (
+          checkDependencyList "nativeBuildInputs" nativeBuildInputs'
+        );
+        buildTargetOutputs = map (drv: getDev drv.__spliced.buildTarget or drv) (
+          checkDependencyList "depsBuildTarget" depsBuildTarget
+        );
+        hostHostOutputs = map (drv: getDev drv.__spliced.hostHost or drv) (
+          checkDependencyList "depsHostHost" depsHostHost
+        );
+        hostTargetOutputs = map (drv: getDev drv.__spliced.hostTarget or drv) (
+          checkDependencyList "buildInputs" buildInputs'
+        );
+        targetTargetOutputs = map (drv: getDev drv.__spliced.targetTarget or drv) (
+          checkDependencyList "depsTargetTarget" depsTargetTarget
+        );
+        allDependencies = concatLists [
+          buildBuildOutputs
+          buildHostOutputs
+          buildTargetOutputs
+          hostHostOutputs
+          hostTargetOutputs
+          targetTargetOutputs
         ];
-        propagatedDependencies = [
-          [
-            (map (drv: getDev drv.__spliced.buildBuild or drv) (
-              checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated
-            ))
-            (map (drv: getDev drv.__spliced.buildHost or drv) (
-              checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs
-            ))
-            (map (drv: getDev drv.__spliced.buildTarget or drv) (
-              checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated
-            ))
-          ]
-          [
-            (map (drv: getDev drv.__spliced.hostHost or drv) (
-              checkDependencyList "depsHostHostPropagated" depsHostHostPropagated
-            ))
-            (map (drv: getDev drv.__spliced.hostTarget or drv) (
-              checkDependencyList "propagatedBuildInputs" propagatedBuildInputs
-            ))
-          ]
-          [
-            (map (drv: getDev drv.__spliced.targetTarget or drv) (
-              checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated
-            ))
-          ]
+
+        propagatedBuildBuildOutputs = map (drv: getDev drv.__spliced.buildBuild or drv) (
+          checkDependencyList "depsBuildBuildPropagated" depsBuildBuildPropagated
+        );
+        propagatedBuildHostOutputs = map (drv: getDev drv.__spliced.buildHost or drv) (
+          checkDependencyList "propagatedNativeBuildInputs" propagatedNativeBuildInputs
+        );
+        propagatedBuildTargetOutputs = map (drv: getDev drv.__spliced.buildTarget or drv) (
+          checkDependencyList "depsBuildTargetPropagated" depsBuildTargetPropagated
+        );
+        propagatedHostHostOutputs = map (drv: getDev drv.__spliced.hostHost or drv) (
+          checkDependencyList "depsHostHostPropagated" depsHostHostPropagated
+        );
+        propagatedHostTargetOutputs = map (drv: getDev drv.__spliced.hostTarget or drv) (
+          checkDependencyList "propagatedBuildInputs" propagatedBuildInputs
+        );
+        propagatedTargetTargetOutputs = map (drv: getDev drv.__spliced.targetTarget or drv) (
+          checkDependencyList "depsTargetTargetPropagated" depsTargetTargetPropagated
+        );
+        allPropagatedDependencies = concatLists [
+          propagatedBuildBuildOutputs
+          propagatedBuildHostOutputs
+          propagatedBuildTargetOutputs
+          propagatedHostHostOutputs
+          propagatedHostTargetOutputs
+          propagatedTargetTargetOutputs
         ];
 
         derivationArg = removeAttrs attrs removedOrReplacedAttrNames // {
@@ -586,19 +580,19 @@ let
           __ignoreNulls = true;
           inherit __structuredAttrs strictDeps;
 
-          depsBuildBuild = elemAt (elemAt dependencies 0) 0;
-          nativeBuildInputs = elemAt (elemAt dependencies 0) 1;
-          depsBuildTarget = elemAt (elemAt dependencies 0) 2;
-          depsHostHost = elemAt (elemAt dependencies 1) 0;
-          buildInputs = elemAt (elemAt dependencies 1) 1;
-          depsTargetTarget = elemAt (elemAt dependencies 2) 0;
+          depsBuildBuild = buildBuildOutputs;
+          nativeBuildInputs = buildHostOutputs;
+          depsBuildTarget = buildTargetOutputs;
+          depsHostHost = hostHostOutputs;
+          buildInputs = hostTargetOutputs;
+          depsTargetTarget = targetTargetOutputs;
 
-          depsBuildBuildPropagated = elemAt (elemAt propagatedDependencies 0) 0;
-          propagatedNativeBuildInputs = elemAt (elemAt propagatedDependencies 0) 1;
-          depsBuildTargetPropagated = elemAt (elemAt propagatedDependencies 0) 2;
-          depsHostHostPropagated = elemAt (elemAt propagatedDependencies 1) 0;
-          propagatedBuildInputs = elemAt (elemAt propagatedDependencies 1) 1;
-          depsTargetTargetPropagated = elemAt (elemAt propagatedDependencies 2) 0;
+          depsBuildBuildPropagated = propagatedBuildBuildOutputs;
+          propagatedNativeBuildInputs = propagatedBuildHostOutputs;
+          depsBuildTargetPropagated = propagatedBuildTargetOutputs;
+          depsHostHostPropagated = propagatedHostHostOutputs;
+          propagatedBuildInputs = propagatedHostTargetOutputs;
+          depsTargetTargetPropagated = propagatedTargetTargetOutputs;
 
           # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
           configureFlags =
@@ -637,9 +631,7 @@ let
             else
               null
           } =
-            lib.warnIf ((builtins.elem "pie" hardeningEnable) || (builtins.elem "pie" hardeningDisable))
-              "The 'pie' hardening flag has been removed in favor of enabling PIE by default in compilers and should no longer be used. PIE can be disabled with the -no-pie compiler flag, but this is usually not necessary as most build systems pass this if needed. Usage of the 'pie' hardening flag will become an error in future."
-              (builtins.concatStringsSep " " enabledHardeningOptions);
+            concatStringsSep " " enabledHardeningOptions;
 
           # TODO: remove platform condition
           # Enabling this check could be a breaking change as it requires to edit nix.conf
@@ -651,8 +643,6 @@ let
           ${if buildIsDarwin then "__darwinAllowLocalNetworking" else null} = __darwinAllowLocalNetworking;
           ${if buildIsDarwin then "__sandboxProfile" else null} =
             let
-              allDependencies = concatLists (concatLists dependencies);
-              allPropagatedDependencies = concatLists (concatLists propagatedDependencies);
               computedSandboxProfile = concatMap (input: input.__propagatedSandboxProfile or [ ]) (
                 extraNativeBuildInputs ++ extraBuildInputs ++ allDependencies
               );
@@ -673,7 +663,6 @@ let
             concatStringsSep "\n" (filter (x: x != "") (unique profiles));
           ${if buildIsDarwin then "__propagatedSandboxProfile" else null} =
             let
-              allPropagatedDependencies = concatLists (concatLists propagatedDependencies);
               computedPropagatedSandboxProfile = concatMap (
                 input: input.__propagatedSandboxProfile or [ ]
               ) allPropagatedDependencies;
@@ -681,8 +670,6 @@ let
             unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]);
           ${if buildIsDarwin then "__impureHostDeps" else null} =
             let
-              allDependencies = concatLists (concatLists dependencies);
-              allPropagatedDependencies = concatLists (concatLists propagatedDependencies);
               computedImpureHostDeps = unique (
                 concatMap (input: input.__propagatedImpureHostDeps or [ ]) (
                   extraNativeBuildInputs ++ extraBuildInputs ++ allDependencies
@@ -705,7 +692,6 @@ let
             ];
           ${if buildIsDarwin then "__propagatedImpureHostDeps" else null} =
             let
-              allPropagatedDependencies = concatLists (concatLists propagatedDependencies);
               computedPropagatedImpureHostDeps = unique (
                 concatMap (input: input.__propagatedImpureHostDeps or [ ]) allPropagatedDependencies
               );
@@ -715,7 +701,7 @@ let
           # -- Windows/Cygwin-specific attrs --
           ${if isWindows || isCygwin then "allowedImpureDLLs" else null} =
             allowedImpureDLLs
-            ++ lib.optionals isCygwin [
+            ++ optionals isCygwin [
               "KERNEL32.dll"
             ];
 
@@ -738,7 +724,7 @@ let
                 inherit name;
                 value =
                   let
-                    raw = zipAttrsWith (_: builtins.concatLists) [
+                    raw = zipAttrsWith (_: concatLists) [
                       attrsOutputChecksFiltered
                       (makeOutputChecks attrs.outputChecks.${name} or { })
                     ];
@@ -820,9 +806,8 @@ let
       );
 
     let
-      mainProgram = meta.mainProgram or null;
       env' = env // {
-        ${if mainProgram != null then "NIX_MAIN_PROGRAM" else null} = mainProgram;
+        ${if meta ? mainProgram then "NIX_MAIN_PROGRAM" else null} = meta.mainProgram;
       };
 
       derivationArg = makeDerivationArgument (
@@ -852,13 +837,12 @@ let
       checkedEnv =
         let
           overlappingNames = attrNames (builtins.intersectAttrs env' derivationArg);
-          prettyPrint = lib.generators.toPretty { };
-          makeError =
+          errors = lib.concatMapStringsSep "\n" (
             name:
-            "  - ${name}: in `env`: ${prettyPrint env'.${name}}; in derivation arguments: ${
-                prettyPrint derivationArg.${name}
-              }";
-          errors = lib.concatMapStringsSep "\n" makeError overlappingNames;
+            "  - ${name}: in `env`: ${lib.generators.toPretty { } env'.${name}}; in derivation arguments: ${
+                lib.generators.toPretty { } derivationArg.${name}
+              }"
+          ) overlappingNames;
         in
         assert assertMsg (isAttrs env && !isDerivation env)
           "`env` must be an attribute set of environment variables. Set `env.env` or pick a more specific name.";
@@ -871,20 +855,18 @@ let
           v
         ) env';
 
-      # Fixed-output derivations may not reference other paths, which means that
-      # for a fixed-output derivation, the corresponding inputDerivation should
-      # *not* be fixed-output. To achieve this we simply delete the attributes that
-      # would make it fixed-output.
-      fixedOutputRelatedAttrs = [
+      attrsToRemove = [
+        # Fixed-output derivations may not reference other paths, which means that
+        # for a fixed-output derivation, the corresponding inputDerivation should
+        # *not* be fixed-output. To achieve this we simply delete the attributes that
+        # would make it fixed-output.
         "outputHashAlgo"
         "outputHash"
         "outputHashMode"
-      ];
 
-      # inputDerivation produces the inputs; not the outputs, so any
-      # restrictions on what used to be the outputs don't serve a purpose
-      # anymore.
-      outputCheckAttrs = [
+        # inputDerivation produces the inputs; not the outputs, so any
+        # restrictions on what used to be the outputs don't serve a purpose
+        # anymore.
         "allowedReferences"
         "allowedRequisites"
         "disallowedReferences"
@@ -902,10 +884,10 @@ let
         # needed to enter a nix-shell with
         #   nix-build shell.nix -A inputDerivation
         inputDerivation = derivation (
-          removeAttrs derivationArg (fixedOutputRelatedAttrs ++ outputCheckAttrs)
+          removeAttrs derivationArg attrsToRemove
           // {
             # Add a name in case the original drv didn't have one
-            name = "inputDerivation" + lib.optionalString (derivationArg ? name) "-${derivationArg.name}";
+            name = "inputDerivation" + optionalString (derivationArg ? name) "-${derivationArg.name}";
             # This always only has one output
             outputs = [ "out" ];
             # This doesn’t require any system features even if the original
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index a6115d05440c..e2c2131eb762 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -847,7 +847,6 @@ in
               findutils
               gawk
               gnused
-              gnutar
               gnugrep
               gnupatch
               patchelf
diff --git a/pkgs/test/buildenv.nix b/pkgs/test/buildenv.nix
new file mode 100644
index 000000000000..f47abe246446
--- /dev/null
+++ b/pkgs/test/buildenv.nix
@@ -0,0 +1,381 @@
+{
+  lib,
+  pkgs,
+  stdenvNoCC,
+}:
+
+let
+  inherit (pkgs) buildEnv;
+
+  testingThrow = expr: {
+    expr = (builtins.tryEval (builtins.seq expr "didn't throw"));
+    expected = {
+      success = false;
+      value = false;
+    };
+  };
+
+  tests-name = {
+    testNameFromNameArg = {
+      expr =
+        (buildEnv {
+          name = "test-env";
+          paths = [ ];
+        }).name;
+      expected = "test-env";
+    };
+
+    testNameFromPnameVersion = {
+      expr =
+        (buildEnv {
+          pname = "test-env";
+          version = "1.0";
+          paths = [ ];
+        }).name;
+      expected = "test-env-1.0";
+    };
+  };
+
+  tests-passthru-paths = {
+    testPathsInPassthru = {
+      expr =
+        let
+          env = buildEnv {
+            name = "test-env";
+            paths = [ pkgs.hello ];
+          };
+        in
+        builtins.length env.paths > 0;
+      expected = true;
+    };
+
+    testPassthruPathsOverridable = {
+      expr =
+        let
+          env = buildEnv {
+            name = "test-env";
+            paths = [ pkgs.hello ];
+          };
+          overridden = env.overrideAttrs {
+            passthru.paths = [ pkgs.figlet ];
+          };
+        in
+        builtins.length overridden.paths == 1;
+      expected = true;
+    };
+  };
+
+  tests-finalAttrs = {
+    testFinalAttrsSelfReference = {
+      expr =
+        let
+          env = buildEnv (finalAttrs: {
+            name = "test-env";
+            paths = [ ];
+            passthru.description = "An env named ${finalAttrs.name}";
+          });
+        in
+        env.description;
+      expected = "An env named test-env";
+    };
+  };
+
+  tests-overrideAttrs =
+    let
+      base = buildEnv {
+        name = "test-env";
+        paths = [ pkgs.hello ];
+        passthru.custom = "original";
+      };
+      overridden = base.overrideAttrs (
+        finalAttrs: prev: {
+          passthru = prev.passthru // {
+            custom = "modified";
+          };
+        }
+      );
+    in
+    {
+      testOverrideAttrsChangesPassthru = {
+        expr = overridden.custom;
+        expected = "modified";
+      };
+
+      testOverrideAttrsPreservesName = {
+        expr = overridden.name;
+        expected = "test-env";
+      };
+
+      testOverrideAttrsAffectsDrv = {
+        expr =
+          let
+            withPostBuild = base.overrideAttrs { postBuild = "echo overridden"; };
+          in
+          base.drvPath != withPostBuild.drvPath;
+        expected = true;
+      };
+    };
+
+  tests-passthru-merging =
+    let
+      env = buildEnv {
+        name = "test-env";
+        paths = [ pkgs.hello ];
+        derivationArgs.passthru.fromDerivationArgs = "a";
+        passthru.fromPassthru = "b";
+      };
+    in
+    {
+      testPassthruMergingAutoPathsPresent = {
+        expr = env ? paths;
+        expected = true;
+      };
+
+      testPassthruMergingDerivationArgs = {
+        expr = env.fromDerivationArgs;
+        expected = "a";
+      };
+
+      testPassthruMergingDirectPassthru = {
+        expr = env.fromPassthru;
+        expected = "b";
+      };
+
+      # Direct passthru takes precedence over derivationArgs.passthru
+      testPassthruMergingPrecedence = {
+        expr =
+          let
+            env' = buildEnv {
+              name = "test-env";
+              paths = [ ];
+              derivationArgs.passthru.key = "from-derivationArgs";
+              passthru.key = "from-passthru";
+            };
+          in
+          env'.key;
+        expected = "from-passthru";
+      };
+    };
+
+  tests-derivationArgs =
+    let
+      env = buildEnv {
+        name = "test-env";
+        paths = [ ];
+        derivationArgs.allowSubstitutes = true;
+      };
+    in
+    {
+      # derivationArgs.allowSubstitutes overrides the default (false)
+      testDerivationArgsForwarded = {
+        expr = env.allowSubstitutes;
+        expected = true;
+      };
+
+      # Backward compat: top-level nativeBuildInputs still works
+      testCompatNativeBuildInputs = {
+        expr =
+          let
+            env' = buildEnv {
+              name = "test-env";
+              paths = [ ];
+              nativeBuildInputs = [ pkgs.hello ];
+            };
+          in
+          builtins.length env'.nativeBuildInputs > 0;
+        expected = true;
+      };
+    };
+
+  # Build tests: derivations that build a buildEnv and verify its output.
+  # These are exposed via passthru.buildTests and checked in buildCommand.
+  buildTests = {
+    basic-symlinking =
+      pkgs.runCommand "test-buildenv-basic-symlinking"
+        {
+          testEnv = buildEnv {
+            name = "test-env";
+            paths = [ pkgs.hello ];
+          };
+        }
+        ''
+          # With a single package, buildEnv symlinks the directory itself
+          test -L "$testEnv/bin" || { echo "FAIL: $testEnv/bin is not a symlink"; exit 1; }
+
+          # The symlink should point into the store
+          target=$(readlink "$testEnv/bin")
+          case "$target" in
+            /nix/store/*) ;;
+            *) echo "FAIL: symlink target '$target' is not a store path"; exit 1 ;;
+          esac
+
+          # The binary should be accessible and executable through the symlink
+          test -x "$testEnv/bin/hello" || { echo "FAIL: hello binary not executable"; exit 1; }
+          "$testEnv/bin/hello" > /dev/null || { echo "FAIL: hello binary did not run"; exit 1; }
+
+          touch $out
+        '';
+
+    pathsToLink =
+      pkgs.runCommand "test-buildenv-pathsToLink"
+        {
+          testEnv = buildEnv {
+            name = "test-env";
+            paths = [ pkgs.hello ];
+            pathsToLink = [ "/bin" ];
+          };
+        }
+        ''
+          # /bin should exist
+          test -d "$testEnv/bin" || { echo "FAIL: $testEnv/bin missing"; exit 1; }
+
+          # Other directories from hello (like /share) should NOT exist
+          test ! -e "$testEnv/share" || { echo "FAIL: $testEnv/share should not exist with pathsToLink = [\"/bin\"]"; exit 1; }
+
+          touch $out
+        '';
+
+    extraPrefix =
+      pkgs.runCommand "test-buildenv-extraPrefix"
+        {
+          testEnv = buildEnv {
+            name = "test-env";
+            paths = [ pkgs.hello ];
+            extraPrefix = "/myprefix";
+          };
+        }
+        ''
+          # Content should be under the extra prefix
+          test -e "$testEnv/myprefix/bin/hello" || { echo "FAIL: $testEnv/myprefix/bin/hello missing"; exit 1; }
+          test -x "$testEnv/myprefix/bin/hello" || { echo "FAIL: $testEnv/myprefix/bin/hello not executable"; exit 1; }
+
+          # Content should NOT be at the top level
+          test ! -e "$testEnv/bin" || { echo "FAIL: $testEnv/bin should not exist at top level with extraPrefix"; exit 1; }
+
+          touch $out
+        '';
+
+    postBuild =
+      pkgs.runCommand "test-buildenv-postBuild"
+        {
+          testEnv = buildEnv {
+            name = "test-env";
+            paths = [ ];
+            postBuild = ''
+              echo "postBuild was here" > $out/marker
+            '';
+          };
+        }
+        ''
+          # postBuild should have created the marker file
+          test -f "$testEnv/marker" || { echo "FAIL: $testEnv/marker missing; postBuild did not run"; exit 1; }
+          content=$(cat "$testEnv/marker")
+          test "$content" = "postBuild was here" || { echo "FAIL: marker content wrong: $content"; exit 1; }
+
+          touch $out
+        '';
+
+    # buildEnv explicitly sets __structuredAttrs = true because builder.pl
+    # reads all inputs from `$NIX_ATTRS_JSON_FILE`.
+    # Verify the build succeeds even when derivationArgs tries to disable structuredAttrs.
+    structuredAttrs-overridden =
+      pkgs.runCommand "test-buildenv-structuredAttrs-overridden"
+        {
+          testEnv = buildEnv {
+            name = "test-env-structuredAttrs";
+            paths = [ pkgs.hello ];
+            derivationArgs.__structuredAttrs = false;
+          };
+        }
+        ''
+          test -x "$testEnv/bin/hello" || { echo "FAIL: hello not present after structuredAttrs override"; exit 1; }
+          touch $out
+        '';
+
+    ignoreCollisions =
+      pkgs.runCommand "test-buildenv-ignoreCollisions"
+        {
+          # Two copies of hello with different priorities that collide
+          testEnv = buildEnv {
+            name = "test-env-ignore";
+            paths = [
+              pkgs.hello
+              (lib.meta.setPrio 1 pkgs.hello)
+            ];
+            ignoreCollisions = true;
+          };
+        }
+        ''
+          # Should succeed because ignoreCollisions = true
+          test -x "$testEnv/bin/hello" || { echo "FAIL: hello not present with ignoreCollisions"; exit 1; }
+
+          touch $out
+        '';
+  };
+
+  # buildEnv's builder.pl reads all inputs from `$NIX_ATTRS_JSON_FILE`,
+  # which requires __structuredAttrs = true.
+  # buildEnv explicitly forces __structuredAttrs = true.
+  tests-structuredAttrs = {
+    testStructuredAttrsExplicitlyFalse = {
+      expr =
+        (buildEnv {
+          name = "test-env";
+          paths = [ ];
+        }).__structuredAttrs;
+      expected = true;
+    };
+
+    testStructuredAttrsCantBeOverriddenViaDerivationArgs = {
+      expr =
+        (buildEnv {
+          name = "test-env";
+          paths = [ ];
+          derivationArgs.__structuredAttrs = false;
+        }).__structuredAttrs;
+      expected = true;
+    };
+  };
+
+  tests =
+    tests-name
+    // tests-passthru-paths
+    // tests-finalAttrs
+    // tests-overrideAttrs
+    // tests-passthru-merging
+    // tests-derivationArgs
+    // tests-structuredAttrs;
+in
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  name = "test-buildenv";
+  passthru = {
+    inherit tests buildTests;
+    failures = lib.runTests finalAttrs.passthru.tests;
+  };
+  testResults = lib.mapAttrs (_: test: test.expr == test.expected) finalAttrs.passthru.tests;
+  buildCommand = ''
+    touch $out
+    for testName in "''${!testResults[@]}"; do
+      if [[ -n "''${testResults[$testName]}" ]]; then
+        echo "$testName success"
+      else
+        echo "$testName fail"
+      fi
+    done
+  ''
+  + lib.optionalString (lib.any (v: !v) (lib.attrValues finalAttrs.testResults)) ''
+    {
+      echo "ERROR: tests.buildenv: Encountering failed tests."
+      for testName in "''${!testResults[@]}"; do
+        if [[ -z "''${testResults[$testName]}" ]]; then
+          echo "- $testName"
+        fi
+      done
+      echo "To inspect the expected and actual result, "
+      echo '  evaluate `tests.buildenv.tests.''${testName}`.'
+    } >&2
+    exit 1
+  '';
+})
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 9815aad94992..63e8e2b32aae 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -170,6 +170,8 @@ in
 
   php = recurseIntoAttrs (callPackages ./php { });
 
+  pnpm = recurseIntoAttrs (callPackages ./pnpm { });
+
   go = recurseIntoAttrs (callPackage ../build-support/go/tests.nix { });
 
   lake = callPackage ../build-support/lake/test { };
@@ -185,6 +187,8 @@ in
 
   nixosOptionsDoc = recurseIntoAttrs (callPackage ../../nixos/lib/make-options-doc/tests.nix { });
 
+  buildenv = callPackage ./buildenv.nix { };
+
   overriding = callPackage ./overriding.nix { };
 
   texlive = recurseIntoAttrs (callPackage ./texlive { });
diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index e207e8280545..5e6fe09b7890 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -434,6 +434,14 @@ let
         p.overridePythonAttrs (previousAttrs: {
           overridePythonAttrsFlag = previousAttrs.overridePythonAttrsFlag or 0 + 1;
         });
+      applyOverridePythonAttrsFP =
+        p:
+        p.overridePythonAttrs (
+          finalAttrs: previousAttrs: {
+            overridePythonAttrsFlag = previousAttrs.overridePythonAttrsFlag or 0 + 1;
+            overridePythonAttrsFlagP1 = finalAttrs.overridePythonAttrsFlag + 1;
+          }
+        );
       overrideAttrsFooBar =
         drv:
         drv.overrideAttrs (
@@ -465,6 +473,22 @@ let
         expr = (applyOverridePythonAttrs (applyOverridePythonAttrs package-stub)).overridePythonAttrsFlag;
         expected = 2;
       };
+      overridePythonAttrs-plain = {
+        expr = (package-stub.overridePythonAttrs { overridePythonAttrsFlag = 0; }).overridePythonAttrsFlag;
+        expected = 0;
+      };
+      overridePythonAttrs-finalAttrs = {
+        expr = {
+          inherit (applyOverridePythonAttrsFP package-stub)
+            overridePythonAttrsFlag
+            overridePythonAttrsFlagP1
+            ;
+        };
+        expected = {
+          overridePythonAttrsFlag = 1;
+          overridePythonAttrsFlagP1 = 2;
+        };
+      };
       overrideAttrs-overridePythonAttrs-test-overrideAttrs = {
         expr = {
           inherit (applyOverridePythonAttrs (overrideAttrsFooBar package-stub))
diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix
new file mode 100644
index 000000000000..1e7d882ce295
--- /dev/null
+++ b/pkgs/test/pnpm/default.nix
@@ -0,0 +1,4 @@
+{ callPackage }:
+{
+  pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { };
+}
diff --git a/pkgs/test/pnpm/pnpm-empty-lockfile/default.nix b/pkgs/test/pnpm/pnpm-empty-lockfile/default.nix
new file mode 100644
index 000000000000..bb40b0aa749a
--- /dev/null
+++ b/pkgs/test/pnpm/pnpm-empty-lockfile/default.nix
@@ -0,0 +1,32 @@
+{
+  pkgs,
+  stdenv,
+  fetchPnpmDeps,
+  nodejs,
+  pnpm_10,
+  pnpmConfigHook,
+}:
+stdenv.mkDerivation {
+  name = "pnpm-empty-lockfile";
+
+  src = ./.;
+
+  nativeBuildInputs = [
+    pnpm_10
+    pnpmConfigHook
+  ];
+
+  pnpmDeps = fetchPnpmDeps {
+    pname = "pnpm-empty-lockfile";
+    fetcherVersion = 3;
+    pnpm = pnpm_10;
+    src = ./.;
+    hash = "sha256-u0GOAX5B1f2ANWbOezScp/eKQRRZA/JoYfQ5zLrNip4=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+    touch $out
+    runHook postBuild
+  '';
+}
diff --git a/pkgs/test/pnpm/pnpm-empty-lockfile/main.mjs b/pkgs/test/pnpm/pnpm-empty-lockfile/main.mjs
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/pkgs/test/pnpm/pnpm-empty-lockfile/package.json b/pkgs/test/pnpm/pnpm-empty-lockfile/package.json
new file mode 100644
index 000000000000..5fde86ab7086
--- /dev/null
+++ b/pkgs/test/pnpm/pnpm-empty-lockfile/package.json
@@ -0,0 +1,6 @@
+{
+    "name": "pnpm-empty-lockfile",
+    "main": "main.mjs",
+    "dependencies": {
+    }
+}
diff --git a/pkgs/test/pnpm/pnpm-empty-lockfile/pnpm-lock.yaml b/pkgs/test/pnpm/pnpm-empty-lockfile/pnpm-lock.yaml
new file mode 100644
index 000000000000..9b60ae1782d6
--- /dev/null
+++ b/pkgs/test/pnpm/pnpm-empty-lockfile/pnpm-lock.yaml
@@ -0,0 +1,9 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .: {}
diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix
index 6088819081f9..cfa7dbeb5542 100644
--- a/pkgs/test/texlive/default.nix
+++ b/pkgs/test/texlive/default.nix
@@ -670,6 +670,7 @@ rec {
         "explcheck"
         "extractbb"
         "fontinst"
+        "git-latexdiff"
         "ht*"
         "installfont-tl"
         "kanji-config-updmap-sys"
@@ -685,7 +686,6 @@ rec {
         "runtexfile"
         "texconfig"
         "texconfig-sys"
-        "texexec"
         "texlinks"
         "texmfstart"
         "typeoutfileinfo"
@@ -706,6 +706,7 @@ rec {
         "luatools"
         "make4ht"
         "pmxchords"
+        "runtexfile"
         "tex4ebook"
         "texblend"
         "texdoc"
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 76df636416ac..d57a98eb4e20 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xz";
-  version = "5.8.2";
+  version = "5.8.3";
 
   src = fetchurl {
     url =
       with finalAttrs;
       "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.xz";
-    hash = "sha256-iQlm7D9dXMFRB3h54VfAWTUApSL0E6xQuibSKpoUUhQ=";
+    hash = "sha256-//H/zysNqE0wihTeUToaoj1OmqNGTRfmS5cUv90Lv7Y=";
   };
 
   strictDeps = true;
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 7308ee9a479f..1172173dd326 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitLab,
   autoreconfHook,
   pkg-config,
+  buildPackages,
   cairo,
   expat,
   flex,
@@ -15,6 +16,7 @@
   libtool,
   makeWrapper,
   pango,
+  runCommand,
   bash,
   bison,
   libxrender,
@@ -35,14 +37,14 @@ let
     optionalAttrs
     ;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "graphviz";
   version = "12.2.1";
 
   src = fetchFromGitLab {
     owner = "graphviz";
     repo = "graphviz";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-Uxqg/7+LpSGX4lGH12uRBxukVw0IswFPfpb2EkLsaiI=";
   };
 
@@ -72,11 +74,11 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-ltdl-lib=${libtool.lib}/lib"
     "--with-ltdl-include=${libtool}/include"
-  ]
-  # TODO: this should probably be !withXorg instead of false, however it causes 17k rebuilds
-  ++ optional false "--without-x";
+    (lib.withFeature withXorg "x")
+  ];
 
   enableParallelBuilding = true;
+  strictDeps = true;
 
   env = optionalAttrs (withXorg && stdenv.hostPlatform.isDarwin) {
     CPPFLAGS = "-I${cairo.dev}/include/cairo";
@@ -88,6 +90,19 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
+  # Invoke `dot -c` even while cross compiling else lib/graphviz/config6 will not load at runtime.
+  postPatch = ''
+    substituteInPlace cmd/dot/Makefile.am --replace-fail \
+      'if test "x$(DESTDIR)" = "x" -a "x$(build)" = "x$(host)"; then if test -x $(bindir)/dot$(EXEEXT); then if test -x /sbin/ldconfig; then /sbin/ldconfig 2>/dev/null; fi; cd $(bindir); ./dot$(EXEEXT) -c; else cd $(bindir); ./dot_static$(EXEEXT) -c; fi; fi' \
+      '${lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ''
+        if test -x $(bindir)/dot$(EXEEXT); then \
+          cd $(bindir); ${stdenv.hostPlatform.emulator buildPackages} ./dot$(EXEEXT) -c; \
+        else \
+          cd $(bindir); ${stdenv.hostPlatform.emulator buildPackages} ./dot_static$(EXEEXT) -c; \
+        fi
+      ''}'
+  '';
+
   postFixup = optionalString withXorg ''
     substituteInPlace $out/bin/vimdot \
       --replace-warn '"/usr/bin/vi"' '"$(command -v vi)"' \
@@ -109,6 +124,14 @@ stdenv.mkDerivation rec {
       fltk
       graphicsmagick
       ;
+    dot-can-load-plugins =
+      runCommand "dot-can-load-plugins"
+        {
+          nativeBuildInputs = [ finalAttrs.finalPackage ];
+        }
+        ''
+          dot -P -o $out
+        '';
   };
 
   meta = {
@@ -121,4 +144,4 @@ stdenv.mkDerivation rec {
       raskin
     ];
   };
-}
+})
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 40d3cb9d60d6..062232079e61 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-table";
-  version = "1.17.17";
+  version = "1.17.18";
 
   src = fetchFromGitHub {
     owner = "kaio";
     repo = "ibus-table";
     rev = version;
-    sha256 = "sha256-Y8tZBcRlND4DsBE0YQXrulgT0kn8WrGUAOEg0j1Nvc8=";
+    sha256 = "sha256-NU+lZcuCJs1k0BNnPyxR6aiFNc8mmcNxM9k9yrg0Q/M=";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index 4bfcca6fd1d0..75c247b72c2e 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "ibus-typing-booster";
-  version = "2.30.4";
+  version = "2.30.6";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    hash = "sha256-hai4f3kdFLagPSdOMQFCMgfovrcDxZBVaHbIeo3/53o=";
+    hash = "sha256-3Pld7Jz1foCRzjCLOw8P8RnBgL2Q8AUdmhrFOVxj2OE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
index e4aaeedbd12b..9779438c460f 100644
--- a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
+++ b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
@@ -16,12 +16,18 @@ let
     "name"
     "dependencies"
     "meta"
+    "shellInit"
   ];
 in
 {
   name,
   dependencies,
   meta ? { },
+  # Config for the `shellInit` passthru (a `shell -> string`
+  # function returning the shell-specific init snippet for the bat-extras
+  # package). Specified as an attrset with a 'flags' string list argument.
+  # If null, there is no shell init for the package.
+  shellInit ? null,
   ...
 }@args:
 stdenv.mkDerivation (
@@ -76,6 +82,36 @@ stdenv.mkDerivation (
     # We have already patched
     dontPatchShebangs = true;
 
+    passthru =
+      let
+        initScript =
+          {
+            program,
+            shell,
+            flags ? [ ],
+          }:
+          if (shell != "fish") then
+            ''
+              eval "$(${lib.getExe program} ${toString flags})"
+            ''
+          else
+            ''
+              ${lib.getExe program} ${toString flags} | source
+            '';
+      in
+      {
+        shellInit =
+          shell:
+          if shellInit == null then
+            ""
+          else
+            initScript {
+              program = finalAttrs.finalPackage;
+              inherit shell;
+              flags = shellInit.flags or [ ];
+            };
+      };
+
     meta = core.meta // { mainProgram = name; } // meta;
   }
 )
diff --git a/pkgs/tools/misc/bat-extras/modules/batman.nix b/pkgs/tools/misc/bat-extras/modules/batman.nix
index a08067f7df5e..bf518657c6a9 100644
--- a/pkgs/tools/misc/bat-extras/modules/batman.nix
+++ b/pkgs/tools/misc/bat-extras/modules/batman.nix
@@ -7,5 +7,8 @@
 buildBatExtrasPkg {
   name = "batman";
   dependencies = lib.optional stdenv.targetPlatform.isLinux util-linux;
+  shellInit = {
+    flags = [ "--export-env" ];
+  };
   meta.description = "Read system manual pages (man) using bat as the manual page formatter";
 }
diff --git a/pkgs/tools/misc/bat-extras/modules/batpipe.nix b/pkgs/tools/misc/bat-extras/modules/batpipe.nix
index c8c9a754923d..c9cfdc7253a9 100644
--- a/pkgs/tools/misc/bat-extras/modules/batpipe.nix
+++ b/pkgs/tools/misc/bat-extras/modules/batpipe.nix
@@ -11,6 +11,9 @@ buildBatExtrasPkg {
     less
     procps
   ];
+  shellInit = {
+    flags = [ ];
+  };
 
   patches = [
     ../patches/batpipe-skip-outdated-test.patch
diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix
deleted file mode 100644
index cc470829875f..000000000000
--- a/pkgs/tools/networking/globalprotect-openconnect/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  cmake,
-  qtwebsockets,
-  qtwebengine,
-  qtkeychain,
-  wrapQtAppsHook,
-  openconnect,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "globalprotect-openconnect";
-  version = "1.4.9";
-
-  src = fetchurl {
-    url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz";
-    hash = "sha256-vhvVKESLbqHx3XumxbIWOXIreDkW3yONDMXMHxhjsvk=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    wrapQtAppsHook
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.16")
-  ];
-
-  buildInputs = [
-    openconnect
-    qtwebsockets
-    qtwebengine
-    qtkeychain
-  ];
-
-  patchPhase = ''
-    substituteInPlace GPService/gpservice.h \
-      --replace-fail /usr/local/bin/openconnect ${openconnect}/bin/openconnect;
-    substituteInPlace GPService/CMakeLists.txt \
-      --replace-fail /etc/gpservice $out/etc/gpservice;
-    # Force minimum CMake version to 3.16 to avoid policy warnings
-    find . -name "CMakeLists.txt" -exec sed -i 's/cmake_minimum_required(VERSION [^)]*)/cmake_minimum_required(VERSION 3.16)/g' {} \;
-  '';
-
-  meta = {
-    description = "GlobalProtect VPN client (GUI) for Linux based on OpenConnect that supports SAML auth mode";
-    homepage = "https://github.com/yuezk/GlobalProtect-openconnect";
-    license = lib.licenses.gpl3Only;
-    maintainers = [ lib.maintainers.jerith666 ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/networking/iroh/default.nix b/pkgs/tools/networking/iroh/default.nix
index 748d54e1e0de..0d1bbbed9bf0 100644
--- a/pkgs/tools/networking/iroh/default.nix
+++ b/pkgs/tools/networking/iroh/default.nix
@@ -12,16 +12,16 @@ let
     }:
     rustPlatform.buildRustPackage rec {
       pname = name;
-      version = "0.98.0";
+      version = "0.98.1";
 
       src = fetchFromGitHub {
         owner = "n0-computer";
         repo = "iroh";
         rev = "v${version}";
-        hash = "sha256-s6+XobcFGw7JquIuUQinmHggxmxQ1iKMpDVe49LpSbI=";
+        hash = "sha256-rxEkFx2dAEA01CE8zqpCqM2PzxmyRhhSSl3d909pJKQ=";
       };
 
-      cargoHash = "sha256-GoBG4bI5hufklEC3uoVFE+NURTEHhb4ZtXFYd9nsCls=";
+      cargoHash = "sha256-zg15Vq9Abzia5GlmSMLcWN/P7lk9ekyhPyPfAbuu8Vs=";
 
       buildFeatures = cargoFeatures;
       cargoBuildFlags = [
diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix
index be972bf2636b..b9ff4d68382e 100644
--- a/pkgs/tools/networking/openconnect/common.nix
+++ b/pkgs/tools/networking/openconnect/common.nix
@@ -38,6 +38,11 @@ stdenv.mkDerivation {
     "--without-openssl-version-check"
   ];
 
+  # Not finding iconv on Darwin
+  env = {
+    am_cv_func_iconv_works = "yes";
+  };
+
   buildInputs = [
     gmp
     libxml2
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index fc59d8773bdd..deeab329d6cd 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -71,7 +71,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
     ./dont_create_privsep_path.patch
-
+  ]
+  ++ lib.optionals (lib.versionOlder finalAttrs.version "10.3") [
     # See discussion in https://github.com/NixOS/nixpkgs/issues/466049 and
     # https://gitlab.archlinux.org/archlinux/packaging/packages/openssh/-/issues/23
     (fetchpatch {
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 29bdb80eebf1..6c9f80ea429c 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -14,11 +14,11 @@ in
 {
   openssh = common rec {
     pname = "openssh";
-    version = "10.2p1";
+    version = "10.3p1";
 
     src = fetchurl {
       url = urlFor version;
-      hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI=";
+      hash = "sha256-VmgqNruS3PS08Bb9jsjnQFm3mo3iXBXWcNcx59GORfQ=";
     };
 
     extraPatches = [
@@ -96,8 +96,8 @@ in
 
       (fetchpatch {
         name = "openssh-gssapi.patch";
-        url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%2510.1p1-1/debian/patches/gssapi.patch";
-        hash = "sha256-/wJ3AA+RscHjFRSeL0LENviKlCglpOi7HNuCxidpQV8=";
+        url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%2510.2p1-6/debian/patches/gssapi.patch";
+        hash = "sha256-mYrJJrE6l0r/VYLWlOTGkKLzj9Dj4wOLgJyW/NLGaeo=";
       })
     ];
 
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 8ebcd187f4a3..dc16f7ab3cd4 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -20,9 +20,11 @@
   nixpkgs-reviewFull,
   nil,
   nix-direnv,
+  nix-du,
   nix-fast-build,
   haskell,
   nix-serve-ng,
+  nixos-rebuild-ng,
   colmena,
   nix-update,
   nix-init,
@@ -127,6 +129,10 @@ let
             nix = self.lix;
           };
 
+          nix-du = nix-du.override {
+            nix = self.lix;
+          };
+
           nix-eval-jobs = self.callPackage (callPackage ./common-nix-eval-jobs.nix nix-eval-jobs-args) {
             stdenv = lixStdenv;
           };
@@ -143,6 +149,10 @@ let
             }))
           ];
 
+          nixos-rebuild-ng = nixos-rebuild-ng.override {
+            nix = self.lix;
+          };
+
           colmena = colmena.override {
             nix = self.lix;
             inherit (self) nix-eval-jobs;
@@ -175,73 +185,6 @@ lib.makeExtensible (
   {
     inherit makeLixScope;
 
-    lix_2_93 = self.makeLixScope {
-      attrName = "lix_2_93";
-
-      lix-args = rec {
-        version = "2.93.3";
-
-        src = fetchFromGitea {
-          domain = "git.lix.systems";
-          owner = "lix-project";
-          repo = "lix";
-          rev = version;
-          hash = "sha256-Oqw04eboDM8rrUgAXiT7w5F2uGrQdt8sGX+Mk6mVXZQ=";
-        };
-
-        cargoDeps = rustPlatform.fetchCargoVendor {
-          name = "lix-${version}";
-          inherit src;
-          hash = "sha256-YMyNOXdlx0I30SkcmdW/6DU0BYc3ZOa2FMJSKMkr7I8=";
-        };
-
-        patches = [
-          # Support for lowdown >= 1.4, https://gerrit.lix.systems/c/lix/+/3731
-          (fetchpatch2 {
-            name = "lix-lowdown-1.4.0.patch";
-            url = "https://git.lix.systems/lix-project/lix/commit/858de5f47a1bfd33835ec97794ece339a88490f1.patch";
-            hash = "sha256-FfLO2dFSWV1qwcupIg8dYEhCHir2XX6/Hs89eLwd+SY=";
-          })
-
-          # Support for toml11 >= 4.0, https://gerrit.lix.systems/c/lix/+/3953
-          (fetchpatch {
-            name = "lix-2.93-toml11-4-1.patch";
-            url = "https://git.lix.systems/lix-project/lix/commit/96a39dc464165a3e503a6dc7bd44518a116fe846.patch";
-            hash = "sha256-j1DOScY2IFvcouhoap9CQwIZf99MZ92HtY7CjInF/s4=";
-          })
-          (fetchpatch {
-            name = "lix-2.93-toml11-4-2.patch";
-            url = "https://git.lix.systems/lix-project/lix/commit/699d3a63a6351edfdbc8c05f814cc93d6c3637ca.patch";
-            hash = "sha256-2iUynAdimxhe5ZSDB7DlzFG3tu1yWhq+lTvjf6+M0pM=";
-          })
-          (fetchpatch {
-            name = "lix-2.93-toml11-4-3.patch";
-            url = "https://git.lix.systems/lix-project/lix/commit/ad52cbde2faa677b711ec950dae74e4aede965a4.patch";
-            hash = "sha256-ajQwafL3yZDJMVrR+D9eTGh7L0xbDbqhAUagRur4HDE=";
-          })
-          (fetchpatch {
-            name = "lix-2.93-toml11-4-4.patch";
-            url = "https://git.lix.systems/lix-project/lix/commit/e29a1ccf0af2e2890ec7b7fde82f0e53a1d0aad9.patch";
-            hash = "sha256-sXqZxCUtZsO7uEVk2AZx3IkP8b8EPVghYboetcQTp2A=";
-          })
-          (fetchpatch {
-            name = "lix-2.93-toml11-4-5.patch";
-            url = "https://git.lix.systems/lix-project/lix/commit/176b834464b7285b74a72d35df7470a46362ce60.patch";
-            hash = "sha256-/KIszfHf2XoB+GeVvXad2AV8pazffYdQRDtIXb9tbj8=";
-          })
-          (fetchpatch {
-            name = "lix-2.93-toml11-4-6.patch";
-            url = "https://git.lix.systems/lix-project/lix/commit/b6d5670bcffebdd43352ea79b36135e35a8148d9.patch";
-            hash = "sha256-f4s0TR5MhNMNM5TYLOR7K2/1rtZ389KDjTCKFVK0OcE=";
-          })
-
-          lixMdbookPatch
-
-          lixLowdown30Patch
-        ];
-      };
-    };
-
     lix_2_94 = self.makeLixScope {
       attrName = "lix_2_94";
 
@@ -295,14 +238,14 @@ lib.makeExtensible (
       attrName = "git";
 
       lix-args = rec {
-        version = "2.96.0-pre-20260318_${builtins.substring 0 12 src.rev}";
+        version = "2.96.0-pre-20260408_${builtins.substring 0 12 src.rev}";
 
         src = fetchFromGitea {
           domain = "git.lix.systems";
           owner = "lix-project";
           repo = "lix";
-          rev = "8294cd534b2f01ee967b28aa73fcab1535d62b3d";
-          hash = "sha256-BFijbNDCrfzpDdW+gNauP25QsTvEZ39dygWEI/RYeyY=";
+          rev = "bc9fb560ac2d36cd317a856ee96785ea2055fbff";
+          hash = "sha256-bONRPjhk5OZdnkQZexZNJzlvwIPg31Gy7fNiwGoX3BQ=";
         };
 
         cargoDeps = rustPlatform.fetchCargoVendor {
@@ -344,5 +287,6 @@ lib.makeExtensible (
     lix_2_90 = throw (removedMessage "2.90"); # added in 2025-09-11
     lix_2_91 = throw (removedMessage "2.91"); # added in 2025-09-11
     lix_2_92 = throw (removedMessage "2.92"); # added in 2025-09-11
+    lix_2_93 = throw (removedMessage "2.93"); # added in 2026-04-19
   }
 )
diff --git a/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix
index 5bd2fd66542e..33880fc37e4f 100644
--- a/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libutil-tests/package.nix
@@ -35,6 +35,10 @@ mkMesonExecutable (finalAttrs: {
   mesonFlags = [
   ];
 
+  excludedTestPatterns = lib.optionals (lib.versions.majorMinor version == "2.34") [
+    "fchmodatTryNoFollow.fallbackWithoutProc"
+  ];
+
   passthru = {
     tests = {
       run =
@@ -49,7 +53,8 @@ mkMesonExecutable (finalAttrs: {
             ''
             + ''
               export _NIX_TEST_UNIT_DATA=${resolvePath ./data}
-              ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}
+              ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} \
+                --gtest_filter=-${lib.concatStringsSep ":" finalAttrs.excludedTestPatterns}
               touch $out
             ''
           );
diff --git a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix
index e1afd7fa0133..b8bf89d99f7f 100644
--- a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix
+++ b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix
@@ -15,7 +15,6 @@
   nix-store,
   nix-expr,
   nix-cli,
-  toml11,
 
   busybox-sandbox-shell ? null,
 
@@ -74,11 +73,12 @@ mkMesonDerivation (finalAttrs: {
       echo $PWD | grep tests/functional
     '';
 
-  # `toml11` upgrade causes these to fail in 2.32+: https://github.com/NixOS/nixpkgs/pull/442682
-  # Remove when that PR lands in master.
-  ${if lib.versionAtLeast (lib.versions.majorMinor version) "2.32" then "preCheck" else null} =
-    lib.optionalString (lib.versionOlder toml11.version "4.0") ''
-      rm -f ../lang/eval-fail-fromTOML-{over,under}flow*
+  # Test contains invocation of `script` broken by util-linux regression:
+  # https://github.com/util-linux/util-linux/commit/70507ab9eaed10b8dd77b77d4ea25c11ee726bed
+  preCheck =
+    assert util-linux.version == "2.42";
+    ''
+      echo "exit 77" > ../json.sh
     '';
 
   mesonCheckFlags = [
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 8839deada685..45a37d4762ca 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -10,6 +10,8 @@
   sqlite,
   gobject-introspection,
   vala,
+  jansson,
+  docbook_xsl_ns,
   gtk-doc,
   boost,
   meson,
@@ -30,7 +32,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "packagekit";
-  version = "1.3.3";
+  version = "1.3.5";
 
   outputs = [
     "out"
@@ -42,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "PackageKit";
     repo = "PackageKit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-BgVfM2EtuvV9qTFSy+WW5Ny1QrHIj3t2Royrn7ZHAA8=";
+    hash = "sha256-aKucwqwNyZWyHfNu9ntzSwD+eQy8KjCt6RVMjjjZmZg=";
   };
 
   buildInputs = [
@@ -52,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
     gtk3
+    jansson
     sqlite
     boost
   ]
@@ -97,6 +100,9 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "install_dir: join_paths(get_option('sysconfdir'), 'PackageKit')" "install_dir: join_paths('$out', 'etc', 'PackageKit')"
     substituteInPlace data/meson.build \
       --replace-fail "install_dir: join_paths(get_option('localstatedir'), 'lib', 'PackageKit')," "install_dir: join_paths('$out', 'var', 'lib', 'PackageKit'),"
+    substituteInPlace client/meson.build \
+      --replace-fail http://docbook.sourceforge.net/release/xsl-ns/current ${docbook_xsl_ns}/share/xml/docbook-xsl-ns
+
   '';
 
   passthru.tests = {
diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix
index b3e2e5e3fbb1..9e92be083985 100644
--- a/pkgs/tools/security/aflplusplus/default.nix
+++ b/pkgs/tools/security/aflplusplus/default.nix
@@ -17,6 +17,7 @@
   wine ? null,
   cmocka,
   llvmPackages,
+  withNyx ? false,
 }:
 
 # wine fuzzing is only known to work for win32 binaries, and using a mixture of
@@ -24,6 +25,10 @@
 # a full 32bit version of this package if you want to do wine fuzzing
 assert (wine != null) -> (stdenv.targetPlatform.system == "i686-linux");
 
+# nyx mode is only available on x86_64-linux,
+# see nyx_mode/build_nyx_support.sh in source code of aflplusplus
+assert withNyx -> (stdenv.targetPlatform.system == "x86_64-linux");
+
 let
   aflplusplus-qemu = callPackage ./qemu.nix { };
   qemu-exe-name =
@@ -35,6 +40,17 @@ let
       throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!";
   libdislocator = callPackage ./libdislocator.nix { inherit aflplusplus; };
   libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; };
+
+  libnyx =
+    if withNyx then callPackage ./nyx_mode/libnyx/libnyx.nix { inherit aflplusplus; } else null;
+  qemu-nyx =
+    if withNyx then callPackage ./nyx_mode/QEMU-Nyx/qemu-nyx.nix { inherit aflplusplus; } else null;
+  nyx-packer =
+    if withNyx then
+      callPackage ./nyx_mode/packer/packer.nix { inherit aflplusplus qemu-nyx; }
+    else
+      null;
+
   aflplusplus = stdenvNoCC.mkDerivation rec {
     pname = "aflplusplus";
     version = "4.35c";
@@ -43,7 +59,12 @@ let
       owner = "AFLplusplus";
       repo = "AFLplusplus";
       tag = "v${version}";
-      hash = "sha256-j5YH39JKcjYuDqyl+KRMtgn3UoeWEW1z7m4ysf2uilc=";
+      hash =
+        if withNyx then
+          "sha256-srHrYPEb0UAP/G9cOxJOZ9D6v9pxqez28suPsa70E2M="
+        else
+          "sha256-j5YH39JKcjYuDqyl+KRMtgn3UoeWEW1z7m4ysf2uilc=";
+      fetchSubmodules = withNyx;
     };
 
     enableParallelBuilding = true;
@@ -68,6 +89,10 @@ let
     # warning: "_FORTIFY_SOURCE" redefined
     hardeningDisable = [ "fortify" ];
 
+    # We build nyx mode dependencies ourselves, so this patch skips
+    # build_nyx_support.sh in the aflplusplus source code. It also skips
+    # test-nyx-mode.sh because we can't test nyx mode in the sandbox.
+    patches = lib.optional withNyx ./nyx_mode/nyx_mode.patch;
     postPatch = ''
       # Don't care about this.
       rm Android.bp
@@ -94,6 +119,9 @@ let
 
       substituteInPlace GNUmakefile.llvm \
         --replace-fail "\$(LLVM_BINDIR)/clang" "${clang}/bin/clang"
+    ''
+    + lib.optionalString withNyx ''
+      patchShebangs nyx_mode/build_nyx_support.sh
     '';
 
     env.NIX_CFLAGS_COMPILE = toString [
@@ -145,7 +173,15 @@ let
         --replace-fail "cgdelete" "${libcgroup}/bin/cgdelete"
 
       patchShebangs $out/bin
-
+    ''
+    + lib.optionalString withNyx ''
+      # Use same FHS as if built from source using build_nyx_support.sh. This
+      # means libnyx.so must be next to afl binaries and nyx_mode dependencies
+      # are in nyx_mode/.
+      cp ${libnyx}/lib/libnyx.so $out/bin
+      mkdir $out/nyx_mode
+      ln -s ${nyx-packer} $out/nyx_mode/packer
+      ln -s ${qemu-nyx} $out/nyx_mode/QEMU-Nyx
     ''
     + lib.optionalString (wine != null) ''
       substitute afl-wine-trace $out/bin/afl-wine-trace \
@@ -166,6 +202,7 @@ let
       file
       cmocka
     ];
+
     doInstallCheck = true;
     installCheckPhase = ''
       runHook preInstallCheck
@@ -191,7 +228,13 @@ let
     '';
 
     passthru = {
-      inherit libdislocator libtokencap;
+      inherit
+        libdislocator
+        libtokencap
+        libnyx
+        nyx-packer
+        qemu-nyx
+        ;
       qemu = aflplusplus-qemu;
     };
 
diff --git a/pkgs/tools/security/aflplusplus/nyx_mode/QEMU-Nyx/qemu-nyx.nix b/pkgs/tools/security/aflplusplus/nyx_mode/QEMU-Nyx/qemu-nyx.nix
new file mode 100644
index 000000000000..ee4e9bcb1ba6
--- /dev/null
+++ b/pkgs/tools/security/aflplusplus/nyx_mode/QEMU-Nyx/qemu-nyx.nix
@@ -0,0 +1,77 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  python3,
+  pkg-config,
+  flex,
+  bison,
+  glib,
+  pixman,
+  aflplusplus,
+}:
+
+# this derivation assumes x86_64-linux
+assert stdenv.targetPlatform.system == "x86_64-linux";
+
+stdenv.mkDerivation {
+  version = builtins.readFile (aflplusplus.src + "/nyx_mode/QEMU_NYX_VERSION");
+  pname = "QEMU-Nyx";
+
+  src = aflplusplus.src;
+  postUnpack = ''
+    sourceRoot="$sourceRoot/nyx_mode/QEMU-Nyx"
+  '';
+
+  # same flags for ./configure as ./compile_qemu_nyx.sh static would set
+  configureFlags = [
+    "--target-list=x86_64-softmmu"
+    "--disable-docs"
+    "--disable-gtk"
+    "--disable-werror"
+    "--disable-capstone"
+    "--disable-libssh"
+    "--disable-tools"
+    "--enable-nyx"
+    "--enable-nyx-static"
+  ];
+
+  nativeBuildInputs = [
+    python3
+    pkg-config
+    flex
+    bison
+  ];
+
+  buildInputs = [
+    glib
+    pixman
+  ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    CAPSTONE_ROOT=$PWD/capstone_v4
+    LIBXDC_ROOT=$PWD/libxdc
+
+    make -C $CAPSTONE_ROOT -j$(nproc)
+    make -C $LIBXDC_ROOT -j$(nproc) clean
+
+    # For some reason the Makefile of libxdc clears LDFLAGS; we remove that line
+    # so ld can find libcapstone.so.4
+    sed -i '3d' $LIBXDC_ROOT/Makefile
+
+    NO_LTO=1 LDFLAGS="-L$CAPSTONE_ROOT -L$LIBXDC_ROOT" CFLAGS="-I$CAPSTONE_ROOT/include/" make -C $LIBXDC_ROOT -j$(nproc)
+
+    export LIBS="-L$CAPSTONE_ROOT -L$LIBXDC_ROOT/"
+    export QEMU_CFLAGS="-I$CAPSTONE_ROOT/include/ -I$LIBXDC_ROOT/ $QEMU_CFLAGS"
+  '';
+
+  meta = {
+    homepage = "https://github.com/nyx-fuzz/QEMU-Nyx";
+    description = "Nyx's fork of QEMU";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.x86_64;
+    maintainers = with lib.maintainers; [ ekzyis ];
+  };
+}
diff --git a/pkgs/tools/security/aflplusplus/nyx_mode/libnyx/Cargo.lock b/pkgs/tools/security/aflplusplus/nyx_mode/libnyx/Cargo.lock
new file mode 100644
index 000000000000..bb830117fea8
--- /dev/null
+++ b/pkgs/tools/security/aflplusplus/nyx_mode/libnyx/Cargo.lock
@@ -0,0 +1,1242 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "anstream"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
+
+[[package]]
+name = "anstyle-parse"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "base-x"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+
+[[package]]
+name = "bumpalo"
+version = "3.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cbindgen"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff"
+dependencies = [
+ "clap",
+ "heck 0.4.1",
+ "indexmap",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn 2.0.117",
+ "tempfile",
+ "toml",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "clap"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_lex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
+
+[[package]]
+name = "colored"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
+dependencies = [
+ "lazy_static",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "config"
+version = "0.1.0"
+dependencies = [
+ "libc",
+ "ron",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "const_fn"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413d67b29ef1021b4d60f4aa1e925ca031751e213832b4b1d588fae623c05c60"
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
+
+[[package]]
+name = "doc-comment"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9"
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "fs4"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cef5c93884e5cef757f63446122c2f420713c3e03f85540d09485b9415983b4a"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "fuzz_runner"
+version = "0.1.0"
+dependencies = [
+ "byteorder",
+ "colored",
+ "config",
+ "derivative",
+ "fs4",
+ "glob",
+ "libc",
+ "nix",
+ "quick-error",
+ "rand",
+ "serde",
+ "serde_derive",
+ "snafu",
+ "subprocess",
+ "time",
+ "timeout-readwrite",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+ "wasip3",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
+[[package]]
+name = "indexmap"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.16.1",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
+[[package]]
+name = "libc"
+version = "0.2.183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
+
+[[package]]
+name = "libnyx"
+version = "0.1.0"
+dependencies = [
+ "cbindgen",
+ "config",
+ "fuzz_runner",
+ "libc",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "log"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+
+[[package]]
+name = "memchr"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "ron"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4"
+dependencies = [
+ "base64",
+ "bitflags 1.3.2",
+ "serde",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags 2.11.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
+
+[[package]]
+name = "snafu"
+version = "0.6.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7"
+dependencies = [
+ "doc-comment",
+ "snafu-derive",
+]
+
+[[package]]
+name = "snafu-derive"
+version = "0.6.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "standback"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "stdweb"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
+dependencies = [
+ "discard",
+ "rustc_version",
+ "stdweb-derive",
+ "stdweb-internal-macros",
+ "stdweb-internal-runtime",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "stdweb-derive"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_derive",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "stdweb-internal-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
+dependencies = [
+ "base-x",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha1",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "stdweb-internal-runtime"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subprocess"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c56e8662b206b9892d7a5a3f2ecdbcb455d3d6b259111373b7e08b8055158a8"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
+dependencies = [
+ "fastrand",
+ "getrandom 0.4.2",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "time"
+version = "0.2.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
+dependencies = [
+ "const_fn",
+ "libc",
+ "standback",
+ "stdweb",
+ "time-macros",
+ "version_check",
+ "winapi",
+]
+
+[[package]]
+name = "time-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
+dependencies = [
+ "proc-macro-hack",
+ "time-macros-impl",
+]
+
+[[package]]
+name = "time-macros-impl"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
+dependencies = [
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "standback",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "timeout-readwrite"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37312ddc0adbd0f112618a4250ac586448151ff6d69241ff061b29b883349f3e"
+dependencies = [
+ "nix",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_write",
+ "winnow",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasip2"
+version = "1.0.2+wasi-0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags 2.11.0",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver 1.0.27",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "indexmap",
+ "prettyplease",
+ "syn 2.0.117",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags 2.11.0",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver 1.0.27",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/pkgs/tools/security/aflplusplus/nyx_mode/libnyx/libnyx.nix b/pkgs/tools/security/aflplusplus/nyx_mode/libnyx/libnyx.nix
new file mode 100644
index 000000000000..5a7649691575
--- /dev/null
+++ b/pkgs/tools/security/aflplusplus/nyx_mode/libnyx/libnyx.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  aflplusplus,
+  python3,
+}:
+
+rustPlatform.buildRustPackage {
+  version = builtins.readFile (aflplusplus.src + "/nyx_mode/LIBNYX_VERSION");
+  pname = "libnyx";
+
+  src = aflplusplus.src;
+  postUnpack = ''
+    sourceRoot="$sourceRoot/nyx_mode/libnyx/libnyx"
+    cp ${./Cargo.lock} "$sourceRoot/Cargo.lock"
+  '';
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+  };
+
+  doCheck = false;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/lib
+    cp "target/${stdenv.hostPlatform.rust.rustcTarget}/release/liblibnyx.so" $out/lib/libnyx.so
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/nyx-fuzz/libnyx";
+    description = "Rust library to build hypervisor-based snapshot fuzzers";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ekzyis ];
+  };
+}
diff --git a/pkgs/tools/security/aflplusplus/nyx_mode/nyx_mode.patch b/pkgs/tools/security/aflplusplus/nyx_mode/nyx_mode.patch
new file mode 100644
index 000000000000..9e47fb8fa380
--- /dev/null
+++ b/pkgs/tools/security/aflplusplus/nyx_mode/nyx_mode.patch
@@ -0,0 +1,98 @@
+diff --git a/nyx_mode/build_nyx_support.sh b/nyx_mode/build_nyx_support.sh
+index 9b75b7bf..b7ec92e8 100755
+--- a/nyx_mode/build_nyx_support.sh
++++ b/nyx_mode/build_nyx_support.sh
+@@ -7,7 +7,8 @@ echo "           Nyx build script"
+ echo "================================================="
+ echo
+ 
+-echo "[*] Performing basic sanity checks..."
++echo "[+] Nyx mode dependencies are built in other derivations, skipping ..."
++exit 1
+ 
+ if [ "$CI" = "true" ]; then
+ 
+diff --git a/test/test-nyx-mode.sh b/test/test-nyx-mode.sh
+index 7aaa8c5b..5f624ada 100755
+--- a/test/test-nyx-mode.sh
++++ b/test/test-nyx-mode.sh
+@@ -4,78 +4,7 @@
+ 
+ $ECHO "$BLUE[*] Testing: nyx_mode"
+ 
+-test "$CI" = "true" && {
+-  $ECHO "$YELLOW[-] nyx_mode cannot be tested in the Github CI, skipping ..."
+-} || {
+-
+- unset AFL_CC
+-
+- test -e ../libnyx.so && {
+-  ../afl-cc -o test-instr ../test-instr.c > errors 2>&1
+-  test -e test-instr && {
+-    {
+-      rm -rf nyx-test in out
+-      $ECHO "$GREY[*] running nyx_packer"
+-      python3 ../nyx_mode/packer/packer/nyx_packer.py \
+-        ./test-instr \
+-        nyx-test \
+-        afl \
+-        instrumentation \
+-        --fast_reload_mode \
+-        --purge > /dev/null 2>&1
+-
+-      test -e nyx-test/test-instr && {
+-
+-        $ECHO "$GREY[*] running nyx_config_gen"
+-        python3 ../nyx_mode/packer/packer/nyx_config_gen.py nyx-test Kernel > /dev/null 2>&1
+-        
+-        test -e nyx-test/config.ron && {
+-          sudo modprobe -r kvm-intel
+-          sudo modprobe -r kvm
+-          sudo modprobe  kvm enable_vmware_backdoor=y
+-          sudo modprobe  kvm-intel
+-          #cat /sys/module/kvm/parameters/enable_vmware_backdoor 
+-
+-          mkdir -p in
+-          echo 00000 > in/in
+-          $ECHO "$GREY[*] running afl-fuzz for nyx_mode, this will take approx 10 seconds"
+-          {
+-            AFL_DEBUG=1 ../afl-fuzz -i in -o out -V05 -X -- ./nyx-test >>errors 2>&1
+-          } >>errors 2>&1
+-          test -n "$( ls out/default/queue/id:000002* 2>/dev/null )" && {
+-            $ECHO "$GREEN[+] afl-fuzz is working correctly with nyx_mode"
+-            RUNTIME=`grep execs_done out/default/fuzzer_stats | awk '{print$3}'`
+-            rm -rf errors nyx-test test-instr in out
+-          } || {
+-            echo CUT------------------------------------------------------------------CUT
+-            cat errors
+-            echo CUT------------------------------------------------------------------CUT
+-            $ECHO "$RED[!] afl-fuzz is not working correctly with nyx_mode"
+-            CODE=1
+-          }
+-        } || {
+-          $ECHO "$RED[!] nyx_packer failed, likely install requirements not met."
+-          CODE=1
+-        }
+-      } || {
+-       $ECHO "$RED[!] nyx_packer failed, likely install requirements not met."
+-       CODE=1
+-      }
+-      #rm -rf test-instr in out errors nyx-test
+-    }
+-  } || {
+-    echo CUT------------------------------------------------------------------CUT
+-    cat errors
+-    echo CUT------------------------------------------------------------------CUT
+-    $ECHO "$RED[!] afl-cc compilation of test targets failed - what is going on??"
+-    CODE=1
+-  }
+- } || {
+-  $ECHO "$YELLOW[-] nyx_mode is not compiled, cannot test"
+-  INCOMPLETE=1
+- }
+-
+-}
++$ECHO "$GREY[-] nyx_mode cannot be tested inside the sandbox"
+ 
+ . ./test-post.sh
+ 
diff --git a/pkgs/tools/security/aflplusplus/nyx_mode/packer/packer.nix b/pkgs/tools/security/aflplusplus/nyx_mode/packer/packer.nix
new file mode 100644
index 000000000000..a91a24b0cc28
--- /dev/null
+++ b/pkgs/tools/security/aflplusplus/nyx_mode/packer/packer.nix
@@ -0,0 +1,156 @@
+{
+  stdenv,
+  lib,
+  callPackage,
+  fetchFromGitHub,
+  cpio,
+  gzip,
+  glibc,
+  pkgsi686Linux,
+  pax-utils,
+  makeWrapper,
+  python3,
+  aflplusplus,
+  qemu-nyx,
+}:
+
+# this derivation assumes x86_64-linux
+assert stdenv.targetPlatform.system == "x86_64-linux";
+
+let
+  python3WithPkgs = python3.withPackages (ps: [
+    ps.msgpack
+    ps.jinja2
+  ]);
+in
+stdenv.mkDerivation {
+  version = builtins.readFile (aflplusplus.src + "/nyx_mode/PACKER_VERSION");
+  pname = "nyx-packer";
+
+  src = aflplusplus.src;
+  postUnpack = ''
+    sourceRoot="$sourceRoot/nyx_mode/packer"
+  '';
+
+  patches = [
+    # this patch does following things:
+    #   * write default config to ~/.nyx/nyx.ini because nix store is read-only
+    #   * fix https://github.com/nyx-fuzz/packer/issues/35
+    #   * apply Matt Morehouse's patch (https://github.com/nyx-fuzz/packer/pull/34)
+    ./packer.patch
+  ];
+
+  strictDeps = true;
+
+  # compile_64.sh / compile_loader use -O0; _FORTIFY_SOURCE needs optimization
+  hardeningDisable = [ "fortify" ];
+
+  nativeBuildInputs = [
+    cpio
+    gzip
+    makeWrapper
+  ];
+
+  buildInputs = [
+    glibc
+    glibc.static
+    pkgsi686Linux.glibc
+  ];
+
+  dontConfigure = true;
+
+  postPatch = ''
+    substituteInPlace packer/common/config.py \
+      --replace-fail \
+        '"QEMU-PT_PATH": "../../QEMU-Nyx/x86_64-softmmu/qemu-system-x86_64"' \
+        '"QEMU-PT_PATH": "${qemu-nyx}/bin/qemu-system-x86_64"'
+
+    # fix paths to shared libraries that assume debian FHS
+    substituteInPlace linux_initramfs/pack.sh \
+      --replace-fail \
+        'cp -L /lib/ld-linux.so.2' \
+        'cp -L ${pkgsi686Linux.glibc}/lib/ld-linux.so.2' \
+      --replace-fail \
+        'cp -L /lib/x86_64-linux-gnu/libdl.so.2' \
+        'cp -L ${glibc}/lib/libdl.so.2' \
+      --replace-fail \
+        'cp -L /lib/x86_64-linux-gnu/libc.so.6' \
+        'cp -L ${glibc}/lib/libc.so.6' \
+      --replace-fail \
+        'cp -L /lib64/ld-linux-x86-64.so.2' \
+        'cp -L ${glibc}/lib/ld-linux-x86-64.so.2' \
+      --replace-fail \
+        'cp -L /lib64/libdl.so.2' \
+        'cp -L ${glibc}/lib/libdl.so.2' \
+      --replace-fail \
+        'cp -L /lib64/libc.so.6' \
+        'cp -L ${glibc}/lib/libc.so.6' \
+      --replace-fail \
+        'cp -L /lib32/libc.so.6' \
+        'cp -L ${pkgsi686Linux.glibc}/lib/libc.so.6' \
+      --replace-fail \
+        'cp -L /lib32/libdl.so.2' \
+        'cp -L ${pkgsi686Linux.glibc}/lib/libdl.so.2' \
+      --replace-fail \
+        'cp /lib/x86_64-linux-gnu/libnss_compat.so.2' \
+        'cp -L ${glibc}/lib/libnss_compat.so.2' \
+      --replace-fail \
+        'cp /lib64/libnss_compat.so.2' \
+        'cp ${glibc}/lib/libnss_compat.so.2'
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    pushd packer/linux_x86_64-userspace
+    echo "+ bash -e compile_64.sh"
+    bash -e compile_64.sh
+    popd
+
+    pushd linux_initramfs
+    echo "+ bash -e pack.sh"
+    bash -e pack.sh
+    popd
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # copy build tree so python scripts can assume regular relative paths
+    cp -r . "$out" && chmod -R u+w "$out"
+
+    PATH="${python3WithPkgs}/bin:$PATH" patchShebangs --build $out/packer
+    wrapProgram $out/packer/nyx_packer.py \
+      --suffix PATH : ${
+        lib.makeBinPath [
+          pax-utils
+          qemu-nyx
+        ]
+      }
+    wrapProgram $out/packer/nyx_config_gen.py \
+      --suffix PATH : ${
+        lib.makeBinPath [
+          pax-utils
+          qemu-nyx
+        ]
+      }
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    # packer binaries are meant to run inside the vm
+    find "$out/packer/linux_x86_64-userspace/bin64" -type f \
+      -exec patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 {} \;
+  '';
+
+  meta = {
+    homepage = "https://github.com/nyx-fuzz/packer";
+    description = "image packer for Nyx VMs";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.x86_64;
+    maintainers = with lib.maintainers; [ ekzyis ];
+  };
+}
diff --git a/pkgs/tools/security/aflplusplus/nyx_mode/packer/packer.patch b/pkgs/tools/security/aflplusplus/nyx_mode/packer/packer.patch
new file mode 100644
index 000000000000..b91ee31dc30c
--- /dev/null
+++ b/pkgs/tools/security/aflplusplus/nyx_mode/packer/packer.patch
@@ -0,0 +1,103 @@
+diff --git a/linux_initramfs/pack.sh b/linux_initramfs/pack.sh
+index e042bb5..f04c0a1 100644
+--- a/linux_initramfs/pack.sh
++++ b/linux_initramfs/pack.sh
+@@ -40,15 +40,17 @@ mkdir rootTemplate/lib/i386-linux-gnu/
+ mkdir rootTemplate/lib/x86_64-linux-gnu/
+ 
+ cp -L /lib/ld-linux.so.2 rootTemplate/lib/ld-linux.so.2
+-cp -L /lib64/ld-linux-x86-64.so.2 rootTemplate/lib64/ld-linux-x86-64.so.2
+ cp -L /lib/x86_64-linux-gnu/libdl.so.2 rootTemplate/lib/x86_64-linux-gnu/libdl.so.2
+ cp -L /lib/x86_64-linux-gnu/libc.so.6 rootTemplate//lib/x86_64-linux-gnu/libc.so.6
++cp -L /lib64/ld-linux-x86-64.so.2 rootTemplate/lib64/ld-linux-x86-64.so.2
++cp -L /lib64/libdl.so.2 rootTemplate/lib64/libdl.so.2
++cp -L /lib64/libc.so.6 rootTemplate/lib64/libc.so.6
+ cp -L /lib32/libc.so.6  rootTemplate//lib32/libc.so.6
+-cp -L /lib/ld-linux.so.2 rootTemplate/lib/ld-linux.so.2
+ cp -L /lib32/libdl.so.2 rootTemplate/lib32/libdl.so.2
+ 
+ # fix nasty nss bugs (getpwnam_r, ...)
+ cp /lib/x86_64-linux-gnu/libnss_compat.so.2 rootTemplate//lib/x86_64-linux-gnu/
++cp /lib64/libnss_compat.so.2 rootTemplate/lib64/
+ 
+ cp -r "rootTemplate" "init"
+ sed '/START/c\./loader' init/init_template > init/init
+diff --git a/linux_initramfs/rootTemplate/init_template b/linux_initramfs/rootTemplate/init_template
+index 0d29602..f555082 100755
+--- a/linux_initramfs/rootTemplate/init_template
++++ b/linux_initramfs/rootTemplate/init_template
+@@ -19,7 +19,7 @@ adduser --gecos "ubuntu" --disabled-password --ingroup ubuntu ubuntu
+ echo "ubuntu:ubuntu" | chpasswd
+ 
+ # multiarch support
+-export LD_LIBRARY_PATH=/lib32
++export LD_LIBRARY_PATH=/lib64:/lib32
+ 
+ START
+ #./loader
+diff --git a/packer/common/config.py b/packer/common/config.py
+index 74f2b2e..e0fcf3a 100644
+--- a/packer/common/config.py
++++ b/packer/common/config.py
+@@ -39,7 +39,7 @@ default_config = {
+                   "QEMU-PT_PATH": "../../QEMU-Nyx/x86_64-softmmu/qemu-system-x86_64",
+                   "KERNEL": "../linux_initramfs/bzImage-linux-4.15-rc7",
+                   "INIT_RAMFS": "../linux_initramfs/init.cpio.gz",
+-                  "DEFAULT_FUZZER_CONFIG_FOLDER": "./fuzzer_configs/",
++                  "DEFAULT_FUZZER_CONFIG_FOLDER": os.path.expanduser("~/.nyx/fuzzer_configs/"),
+                   "DEFAULT_VM_HDA": "",
+                   "DEFAULT_VM_PRESNAPSHOT": "",
+                   }
+@@ -149,6 +149,9 @@ class ConfigReader(object):
+     def __init_config(self, config_file):    
+         if not os.path.exists(config_file):
+             print("Configuration \"%s\" not found -> Creating..."%(os.path.realpath(config_file)))
++            config_dir = os.path.dirname(os.path.abspath(config_file))
++            os.makedirs(config_dir, exist_ok=True)
++            os.makedirs(config_dir+"/fuzzer_configs/", exist_ok=True)
+             f = open(config_file, "w")
+             config = configparser.ConfigParser()
+             config["Packer"] = {}
+@@ -261,7 +264,7 @@ class PackerConfiguration:
+             self.load_old_state = False
+ 
+     def __load_config(self):
+-        self.config_values = ConfigReader(os.path.dirname(os.path.realpath(__file__))+"/../nyx.ini", self.__config_section, self.__config_default).get_values()
++        self.config_values = ConfigReader(os.path.expanduser("~/.nyx/nyx.ini"), self.__config_section, self.__config_default).get_values()
+ 
+     def __load_arguments(self):
+         modes = ["afl", "spec"]
+@@ -344,7 +347,7 @@ class ConfigGeneratorConfiguration:
+             self.load_old_state = False
+ 
+     def __load_config(self):
+-        self.config_values = ConfigReader(os.path.dirname(os.path.realpath(__file__)) +"/../nyx.ini", self.__config_section, self.__config_default).get_values()
++        self.config_values = ConfigReader(os.path.expanduser("~/.nyx/nyx.ini"), self.__config_section, self.__config_default).get_values()
+ 
+     def __load_arguments(self):
+ 
+diff --git a/packer/common/self_check.py b/packer/common/self_check.py
+index 10f2405..e16ac37 100644
+--- a/packer/common/self_check.py
++++ b/packer/common/self_check.py
+@@ -170,12 +170,14 @@ def check_apple_ignore_msrs(config):
+ 
+ 
+ def check_nyx_ini():
+-    if not os.path.exists(os.path.dirname(sys.argv[0])+"/nyx.ini") and not os.path.exists("nyx.ini"):
+-        from common.config import FuzzerConfiguration
+-        FuzzerConfiguration(skip_args=True).create_initial_config()
+-        print(WARNING + WARNING_PREFIX + "nyx.ini file does not exist. Creating..." + ENDC)
+-        return False
+-    return True
++    # comment this code out because FuzzerConfiguration does not exist
++    # see https://github.com/nyx-fuzz/packer/issues/35
++    # if not os.path.exists(os.path.dirname(sys.argv[0])+"/nyx.ini") and not os.path.exists("nyx.ini"):
++    #     from common.config import FuzzerConfiguration
++    #     FuzzerConfiguration(skip_args=True).create_initial_config()
++    #     print(WARNING + WARNING_PREFIX + "nyx.ini file does not exist. Creating..." + ENDC)
++    #     return False
++    return os.path.exists(os.path.expanduser("~/.nyx/nyx.ini"))
+ 
+ 
+ def check_qemu_version(config):
diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix
index 8b081f53525c..695fcd2cedec 100644
--- a/pkgs/tools/security/bitwarden-directory-connector/default.nix
+++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix
@@ -19,14 +19,14 @@ let
     }:
     buildNpmPackage rec {
       pname = name;
-      version = "2026.3.0";
+      version = "2026.4.0";
       nodejs = nodejs_22;
 
       src = fetchFromGitHub {
         owner = "bitwarden";
         repo = "directory-connector";
         rev = "v${version}";
-        hash = "sha256-MfYFxcK0pqwIGBJFMVbmSUaGyrwLhMzdSoO6q46F9l8=";
+        hash = "sha256-FcT+rZkSqlDjSXjmNTHWoNXzW8WPo8LTED8Do5sDvwE=";
       };
 
       postPatch = ''
@@ -38,7 +38,7 @@ let
           --replace-fail "AppImage" "dir"
       '';
 
-      npmDepsHash = "sha256-c3Q+b+ZS6nXPuSPq8CZliDYfpN/HIH49tIcGj3bVmLg=";
+      npmDepsHash = "sha256-kFuSCcIWAEJ0KNVqEabjqqSZ8CVBbPyxkAxhrbRBqVc=";
 
       env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix
index 2efbf33f0390..07ca4a07e60c 100644
--- a/pkgs/tools/security/cve-bin-tool/default.nix
+++ b/pkgs/tools/security/cve-bin-tool/default.nix
@@ -45,7 +45,7 @@ buildPythonApplication rec {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "intel";
+    owner = "ossf";
     repo = "cve-bin-tool";
     tag = "v${version}";
     hash = "sha256-pv8XjKjZBUw5FmmUn1dakGeS1uw2xzF3wSIZOYQ2/3c=";
@@ -109,8 +109,8 @@ buildPythonApplication rec {
 
   meta = {
     description = "CVE Binary Checker Tool";
-    homepage = "https://github.com/intel/cve-bin-tool";
-    changelog = "https://github.com/intel/cve-bin-tool/releases/tag/${src.tag}";
+    homepage = "https://github.com/ossf/cve-bin-tool";
+    changelog = "https://github.com/ossf/cve-bin-tool/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Plus;
     maintainers = [ ];
   };
diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index ae02e66fd7aa..a55b41a6d08c 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.106"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.128"
 
 gem "syslog", "~> 0.3.0"
 gem 'mini_portile2', '~> 2.8.0'
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 67d02785acca..43f865684095 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: a8698e72f54049c520b47322b7d5e4df59110abc
-  ref: refs/tags/6.4.106
+  revision: 7ea8df5679ba6cb46799115c0090511e448c7cd4
+  ref: refs/tags/6.4.128
   specs:
-    metasploit-framework (6.4.106)
+    metasploit-framework (6.4.128)
       aarch64
       abbrev
       actionpack (~> 7.2.0)
@@ -46,11 +46,11 @@ GIT
       lru_redux
       metasm
       metasploit-concern
-      metasploit-credential
+      metasploit-credential (>= 6.0.21)
       metasploit-model
-      metasploit-payloads (= 2.0.237)
-      metasploit_data_models (>= 6.0.7)
-      metasploit_payloads-mettle (= 1.0.45)
+      metasploit-payloads (= 2.0.245)
+      metasploit_data_models (>= 6.0.15)
+      metasploit_payloads-mettle (= 1.0.46)
       mqtt
       msgpack (~> 1.6.0)
       mutex_m
@@ -104,7 +104,7 @@ GIT
       rinda
       ruby-macho
       ruby-mysql
-      ruby_smb (~> 3.3.15)
+      ruby_smb (~> 3.3.17)
       rubyntlm
       rubyzip
       sinatra (~> 3.2)
@@ -129,12 +129,11 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (2.0.1)
-    aarch64 (2.1.0)
-      racc (~> 1.6)
+    aarch64 (3.0.0)
     abbrev (0.1.2)
-    actionpack (7.2.3)
-      actionview (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionpack (7.2.3.1)
+      actionview (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       cgi
       nokogiri (>= 1.8.5)
       racc
@@ -144,20 +143,20 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.3)
-      activesupport (= 7.2.3)
+    actionview (7.2.3.1)
+      activesupport (= 7.2.3.1)
       builder (~> 3.1)
       cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activemodel (7.2.3)
-      activesupport (= 7.2.3)
-    activerecord (7.2.3)
-      activemodel (= 7.2.3)
-      activesupport (= 7.2.3)
+    activemodel (7.2.3.1)
+      activesupport (= 7.2.3.1)
+    activerecord (7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       timeout (>= 0.4.0)
-    activesupport (7.2.3)
+    activesupport (7.2.3.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -166,17 +165,17 @@ GEM
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.8)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     afm (1.0.0)
     arel-helpers (2.17.0)
       activerecord (>= 3.1.0)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1201.0)
-    aws-sdk-core (3.241.2)
+    aws-partitions (1.1240.0)
+    aws-sdk-core (3.245.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -184,34 +183,34 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.588.0)
-      aws-sdk-core (~> 3, >= 3.241.0)
+    aws-sdk-ec2 (1.612.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ec2instanceconnect (1.67.0)
-      aws-sdk-core (~> 3, >= 3.241.0)
+    aws-sdk-ec2instanceconnect (1.70.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-iam (1.138.0)
-      aws-sdk-core (~> 3, >= 3.241.0)
+    aws-sdk-iam (1.142.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-kms (1.119.0)
-      aws-sdk-core (~> 3, >= 3.241.0)
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.210.1)
-      aws-sdk-core (~> 3, >= 3.241.0)
+    aws-sdk-s3 (1.219.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ssm (1.208.0)
-      aws-sdk-core (~> 3, >= 3.241.0)
+    aws-sdk-ssm (1.212.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.3.0)
-    bcrypt (3.1.21)
+    bcrypt (3.1.22)
     bcrypt_pbkdf (1.1.2)
     benchmark (0.5.0)
-    bigdecimal (4.0.1)
+    bigdecimal (4.1.2)
     bindata (2.4.15)
-    bootsnap (1.20.1)
+    bootsnap (1.23.0)
       msgpack (~> 1.2)
     bson (5.2.0)
     builder (3.3.0)
@@ -242,12 +241,12 @@ GEM
     em-socksify (0.3.3)
       base64
       eventmachine (>= 1.0.0.beta.4)
-    erb (6.0.1)
+    erb (6.0.4)
     erubi (1.13.1)
     eventmachine (1.2.7)
-    faker (3.5.3)
+    faker (3.8.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.0)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -274,7 +273,7 @@ GEM
       ed25519 (~> 1.2)
       hrr_rb_ssh (>= 0.4)
     http-accept (1.7.0)
-    http-cookie (1.1.0)
+    http-cookie (1.1.6)
       domain_name (~> 0.5)
     http_parser.rb (0.8.1)
     httpclient (2.9.0)
@@ -283,32 +282,33 @@ GEM
       concurrent-ruby (~> 1.0)
     io-console (0.8.2)
     ipaddr (1.2.8)
-    irb (1.16.0)
+    irb (1.18.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
     jsobfu (0.4.2)
       rkelly-remix
-    json (2.18.0)
+    json (2.19.4)
     little-plugger (1.1.4)
     logger (1.7.0)
     logging (2.4.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    loofah (2.25.0)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lru_redux (1.1.0)
     metasm (1.0.5)
-    metasploit-concern (5.0.5)
-      activemodel (~> 7.0)
-      activesupport (~> 7.0)
+    metasploit-concern (5.0.6)
+      activemodel (>= 7.0, < 8.1)
+      activesupport (>= 7.0, < 8.1)
       drb
       mutex_m
-      railties (~> 7.0)
+      railties (>= 7.0, < 8.1)
       zeitwerk
-    metasploit-credential (6.0.16)
+    metasploit-credential (6.0.23)
       bigdecimal
       csv
       drb
@@ -321,47 +321,45 @@ GEM
       railties
       rex-socket
       rubyntlm
-      rubyzip
-    metasploit-model (5.0.4)
-      activemodel (~> 7.0)
-      activesupport (~> 7.0)
+      rubyzip (< 3.0.0)
+    metasploit-model (5.0.5)
+      activemodel (>= 7.0, < 8.1)
+      activesupport (>= 7.0, < 8.1)
       bigdecimal
       drb
       mutex_m
-      railties (~> 7.0)
-    metasploit-payloads (2.0.237)
-    metasploit_data_models (6.0.11)
-      activerecord (~> 7.0)
-      activesupport (~> 7.0)
+      railties (>= 7.0, < 8.1)
+    metasploit-payloads (2.0.245)
+    metasploit_data_models (6.0.18)
+      activerecord (>= 7.0, < 8.1)
+      activesupport (>= 7.0, < 8.1)
       arel-helpers
       bigdecimal
       drb
       metasploit-concern
-      metasploit-model (>= 3.1)
+      metasploit-model (>= 5.0.4)
       mutex_m
       pg
-      railties (~> 7.0)
+      railties (>= 7.0, < 8.1)
       recog
       webrick
-    metasploit_payloads-mettle (1.0.45)
+    metasploit_payloads-mettle (1.0.46)
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0924)
+    mime-types-data (3.2026.0414)
     mini_portile2 (2.8.9)
-    minitest (6.0.1)
-      prism (~> 1.5)
+    minitest (5.27.0)
     mqtt (0.7.0)
       logger
     msgpack (1.6.1)
-    multi_json (1.19.1)
-    mustermann (3.0.4)
-      ruby2_keywords (~> 0.0.1)
+    multi_json (1.20.1)
+    mustermann (3.1.1)
     mutex_m (0.3.0)
     nessus_rest (0.1.6)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.2)
+    net-imap (0.6.3)
       date
       net-protocol
     net-ldap (0.20.0)
@@ -373,12 +371,12 @@ GEM
       net-ssh (>= 5.0.0, < 8.0.0)
     net-smtp (0.5.1)
       net-protocol
-    net-ssh (7.3.0)
+    net-ssh (7.3.2)
     netrc (0.11.0)
     network_interface (0.0.4)
     nexpose (7.3.0)
     nio4r (2.7.5)
-    nokogiri (1.19.0)
+    nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nori (2.7.1)
@@ -395,7 +393,7 @@ GEM
     ostruct (0.6.3)
     packetfu (2.0.0)
       pcaprub (~> 0.13.1)
-    parallel (1.27.0)
+    parallel (2.0.1)
     patch_finder (1.0.2)
     pcaprub (0.13.3)
     pdf-reader (2.15.1)
@@ -408,15 +406,15 @@ GEM
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.7.0)
+    prism (1.9.0)
     psych (5.3.1)
       date
       stringio
-    public_suffix (7.0.2)
-    puma (7.1.0)
+    public_suffix (7.0.5)
+    puma (8.0.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.21)
+    rack (2.2.23)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
@@ -431,12 +429,12 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
+    railties (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       cgi
       irb (~> 1.13)
       rackup (>= 1.0.0)
@@ -444,15 +442,15 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
-    rake (13.3.1)
+    rake (13.4.2)
     rasn1 (0.14.0)
       strptime (~> 0.2.5)
     rb-readline (0.5.5)
-    rdoc (7.0.3)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
-    recog (3.1.25)
+    recog (3.1.26)
       nokogiri
     redcarpet (3.6.1)
     reline (0.6.3)
@@ -462,16 +460,16 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rex-arch (0.1.18)
+    rex-arch (0.1.19)
       rex-text
-    rex-bin_tools (0.1.12)
+    rex-bin_tools (0.1.16)
       metasm
       rex-arch
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.35)
-    rex-encoder (0.1.8)
+    rex-core (0.1.36)
+    rex-encoder (0.1.10)
       metasm
       rex-arch
       rex-text
@@ -505,7 +503,7 @@ GEM
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.64)
+    rex-socket (0.1.66)
       dnsruby
       rex-core
     rex-sslscan (0.1.13)
@@ -513,7 +511,7 @@ GEM
       rex-socket
       rex-text
     rex-struct2 (0.1.5)
-    rex-text (0.2.61)
+    rex-text (0.2.62)
       bigdecimal
     rex-zip (0.1.6)
       rex-text
@@ -523,11 +521,10 @@ GEM
       forwardable
       ipaddr
     rkelly-remix (0.0.7)
-    ruby-macho (4.1.0)
+    ruby-macho (5.0.0)
     ruby-mysql (4.2.1)
     ruby-rc4 (0.1.5)
-    ruby2_keywords (0.0.5)
-    ruby_smb (3.3.16)
+    ruby_smb (3.3.17)
       bindata (= 2.4.15)
       openssl-ccm
       openssl-cmac
@@ -535,7 +532,7 @@ GEM
       windows_error (>= 0.1.4)
     rubyntlm (0.6.5)
       base64
-    rubyzip (3.2.2)
+    rubyzip (2.4.1)
     sawyer (0.9.3)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
@@ -559,15 +556,15 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (1.5.0)
-    tilt (2.6.1)
-    timeout (0.6.0)
+    tilt (2.7.0)
+    timeout (0.6.1)
     tsort (0.2.0)
     ttfunk (1.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2025.3)
+    tzinfo-data (1.2026.1)
       tzinfo (>= 1.0.0)
-    unix-crypt (1.3.1)
+    unix-crypt (1.3.2)
     uri (1.1.1)
     useragent (0.16.11)
     warden (1.2.9)
@@ -592,9 +589,10 @@ GEM
     xdr (3.0.3)
       activemodel (>= 4.2, < 8.0)
       activesupport (>= 4.2, < 8.0)
-    xmlrpc (0.3.3)
+    xmlrpc (0.3.4)
+      rexml
       webrick
-    zeitwerk (2.7.4)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   ruby
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 9e9110eb0b6c..736f42d94d45 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "metasploit-framework";
-  version = "6.4.106";
+  version = "6.4.128";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     tag = finalAttrs.version;
-    hash = "sha256-FpSx6CuVa2fOCoJesQcK+Nft+6k8iPDKyGvTec8TMbo=";
+    hash = "sha256-rIWk5lkPtwIrCF/JmyvZgkeX6vM81Rl4edJWAloOksU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index c8bf5e9f4538..5a85fc491773 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -4,10 +4,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1c0hkbm94prkw0nb76l0il7fhz1xz5dkgzh6wwyrs88lwggv9avh";
+      sha256 = "0986jw4b3g4z841lz8svi4fn2bhy0mkcxw211z0b33ldgf53bdj4";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "3.0.0";
   };
   abbrev = {
     groups = [ "default" ];
@@ -24,60 +24,60 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kq7fbgb5yfsjd1na2ghc7assk18ca24kbvsx90p0xwm8v3f851a";
+      sha256 = "1jp4w493wvfh9246wxk7g00m1a3vmzkvs0rznq62fwvjjdzzwsmn";
       type = "gem";
     };
-    version = "7.2.3";
+    version = "7.2.3.1";
   };
   actionview = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cpc91crvavdgvc3jqj1nqr9q6s581bm64894pbh8f5l85x7shhz";
+      sha256 = "0z7zy6ibfpsdj9jbdm54bx3ws4dszcq7qa564jn645rr8dlbh6fy";
       type = "gem";
     };
-    version = "7.2.3";
+    version = "7.2.3.1";
   };
   activemodel = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nrr8w3hxkssgx13bcph8lb876hg57w01fbapy7fj4ijp6p6dbxv";
+      sha256 = "1l60a6mqx1wgp15ki1cp68djci0czgrikpydii5bd877hndqdq9r";
       type = "gem";
     };
-    version = "7.2.3";
+    version = "7.2.3.1";
   };
   activerecord = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mx087zngip62400z44p969l6fja1fjxliq6kym6npzbii3vgb3g";
+      sha256 = "0pd0f1hy6rvyanmrklqir33xq0jb2my4jajz7hc38nysfpi175dq";
       type = "gem";
     };
-    version = "7.2.3";
+    version = "7.2.3.1";
   };
   activesupport = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "043vbilaw855c91n5l7g0k0wxj63kngj911685qy74xc1mvwjxan";
+      sha256 = "0d6bhg9cim83g8cypjd7cms45ng4p9ga69v26i3vp823d98yvsqi";
       type = "gem";
     };
-    version = "7.2.3";
+    version = "7.2.3.1";
   };
   addressable = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw";
+      sha256 = "1by7h2lwziiblizpd5yx87jsq8ppdhzvwf08ga34wzqgcv1nmpvz";
       type = "gem";
     };
-    version = "2.8.8";
+    version = "2.9.0";
   };
   afm = {
     groups = [ "default" ];
@@ -124,80 +124,80 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00c7qzr1dnv82ajyaz6hjhn9qvk5yryi9wbwhdw9ck8af56hjxja";
+      sha256 = "19z43maygafxjq3k4cbjn24i6zyjdrsk9152asf6kbgx28bv51dq";
       type = "gem";
     };
-    version = "1.1201.0";
+    version = "1.1240.0";
   };
   aws-sdk-core = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17qwgdnnvkc97f249q2i7sqvffkpmph5704gyaqrylhpfflz8v4z";
+      sha256 = "1bdl9hlb2wy4ndglvq9dr5kvchaq3j0izlxk4lb6yd4ca103px4l";
       type = "gem";
     };
-    version = "3.241.2";
+    version = "3.245.0";
   };
   aws-sdk-ec2 = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z94vvvy10fg459a3kkmr4r767rp81inyx722lp04s5vp519yxlw";
+      sha256 = "0dm0qbcqadgbza4919d7m9bhrj8ami41rgv0p9pqnb8s8ppk1789";
       type = "gem";
     };
-    version = "1.588.0";
+    version = "1.612.0";
   };
   aws-sdk-ec2instanceconnect = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cl1ajpdlsnwh4g88bmp1i3l323l0zvvzlygm5pj9x5bmpn35ji2";
+      sha256 = "0ln5gqbni3z635k5fxvajn05mbx9j1i6qd20x7dblkxcryy7dmyi";
       type = "gem";
     };
-    version = "1.67.0";
+    version = "1.70.0";
   };
   aws-sdk-iam = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07akwflj7zmpbyywsp94bwlxbvk46h5pxxk3xavbk802id7dnzvd";
+      sha256 = "0jx5xrpw40nv5pfv8rvz7y8xhvxm756igcn4nr08agxd6byv7jk1";
       type = "gem";
     };
-    version = "1.138.0";
+    version = "1.142.0";
   };
   aws-sdk-kms = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0wikgvniig4m84frj86h52fc7507ss3b3q9sis53v50qmwzwk6gm";
+      sha256 = "080zh4g1lcjl0bz2l0gjm8vmpd60cvi0p658bh235ypqh9zg61fl";
       type = "gem";
     };
-    version = "1.119.0";
+    version = "1.123.0";
   };
   aws-sdk-s3 = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "018h0hq7k1r2i2mf0gdx0l9cmz82sixcfmbvqfb0difli1rygq2g";
+      sha256 = "1iziq88dwja5gjimqm875g72h0d1lrf1ha9widsjb1cpfxrmsxba";
       type = "gem";
     };
-    version = "1.210.1";
+    version = "1.219.0";
   };
   aws-sdk-ssm = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "197jfhw70n2qlzigj091byh7ivfq7aswri6ic8vxgwb5x7zmcxjj";
+      sha256 = "1nkv1vz1ziw7myj20cdvha0bw36ax3bw98bj8v8jkqzqhkkpq4w9";
       type = "gem";
     };
-    version = "1.208.0";
+    version = "1.212.0";
   };
   aws-sigv4 = {
     groups = [ "default" ];
@@ -224,10 +224,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1krd99p9828n07rcjjms56jaqv7v6s9pn7y6bppcfhhaflyn2r2r";
+      sha256 = "0clhya4p8lhjj7hp31inp321wgzb0b5wbwppmya5sw1dikl7400z";
       type = "gem";
     };
-    version = "3.1.21";
+    version = "3.1.22";
   };
   bcrypt_pbkdf = {
     groups = [ "default" ];
@@ -254,10 +254,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19y406nx17arzsbc515mjmr6k5p59afprspa1k423yd9cp8d61wb";
+      sha256 = "1g9zi8c4i7g8zz0c3hxrw6mblrjvgn7akys60clb9si7c1k1gljk";
       type = "gem";
     };
-    version = "4.0.1";
+    version = "4.1.2";
   };
   bindata = {
     groups = [ "default" ];
@@ -274,10 +274,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14qb2gy6ypnqri92v9x8szbq7fzw27pc1z5cl367n5f5cpd2rmks";
+      sha256 = "057jsch213i42qgdsz2vg1b190n2xvvbi3hgprc8nmaqim2ly9f1";
       type = "gem";
     };
-    version = "1.20.1";
+    version = "1.23.0";
   };
   bson = {
     groups = [ "default" ];
@@ -464,10 +464,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rcpq49pyaiclpjp3c3qjl25r95hqvin2q2dczaynaj7qncxvv18";
+      sha256 = "1ncmbdjf2bwmk0jf5cxywns9zbxyfiy4h4p3pzi7yddyjhv81qrq";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "6.0.4";
   };
   erubi = {
     groups = [ "default" ];
@@ -494,20 +494,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rfp6y0pc2slv83vcnayiypfjsanja5qg9wfm6wwq5dvq0nlhqdr";
+      sha256 = "1z1yfmqwml3gr1hjnjx6qbchmvr29j6z317wlhkhzabkvw4b6iy1";
       type = "gem";
     };
-    version = "3.5.3";
+    version = "3.8.0";
   };
   faraday = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ka175ci0q9ylpcy651pjj580diplkaskycn4n7jcmbyv7jwz6c6";
+      sha256 = "077n5ss3z3ds4vj54w201kd12smai853dp9c9n7ii7g3q7nwwg54";
       type = "gem";
     };
-    version = "2.14.0";
+    version = "2.14.1";
   };
   faraday-net_http = {
     groups = [ "default" ];
@@ -654,10 +654,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q";
+      sha256 = "1aga7z4p0dka4zcqw9i05wa4ab1q7h7cgnj328ldqqfycjz84jxs";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.6";
   };
   "http_parser.rb" = {
     groups = [ "default" ];
@@ -714,10 +714,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01h8bdksg0cr8bw5dhlhr29ix33rp822jmshy6rdqz4lmk4mdgia";
+      sha256 = "1qs8a9vprg7s8krgq4s0pygr91hclqqyz98ik15p0m1sf2h5956y";
       type = "gem";
     };
-    version = "1.16.0";
+    version = "1.18.0";
   };
   jmespath = {
     groups = [ "default" ];
@@ -744,10 +744,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01fmiz052cvnxgdnhb3qwcy88xbv7l3liz0fkvs5qgqqwjp0c1di";
+      sha256 = "1b1rabz30grash5wh0lcv109w2ggggmmbclwnajqrcdk7wrps2k7";
       type = "gem";
     };
-    version = "2.18.0";
+    version = "2.19.4";
   };
   little-plugger = {
     groups = [ "default" ];
@@ -784,10 +784,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rk0n13c9nmk8di2x5gqk5r04vf8bkp7ff6z0b44wsmc7fndfpnz";
+      sha256 = "011fdngxzr1p9dq2hxqz7qq1glj2g44xnhaadjqlf48cplywfdnl";
       type = "gem";
     };
-    version = "2.25.0";
+    version = "2.25.1";
   };
   lru_redux = {
     groups = [ "default" ];
@@ -814,72 +814,72 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15ffx2xm9rvdpzx866z0cz6qig5knjdvndynwavdb804kd51pjpz";
+      sha256 = "11frhqg5vh9dqk3q3lv5grdd3r8yhxz2qpq87wrr3cl31569bg1p";
       type = "gem";
     };
-    version = "5.0.5";
+    version = "5.0.6";
   };
   metasploit-credential = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fn91ylz0ji7yb7c8flgzxbfpjmvwz3a3gnp5c731l7klmzzgpjd";
+      sha256 = "1czk0s3nrf0a2f72l1jg81fdi9a91bfw88m6y11xsm2g1wpw8x1f";
       type = "gem";
     };
-    version = "6.0.16";
+    version = "6.0.23";
   };
   metasploit-framework = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       fetchSubmodules = false;
-      rev = "a8698e72f54049c520b47322b7d5e4df59110abc";
-      sha256 = "1fii2g7pklvbr35g121wm7xyvmzq183v2pl21b76fswm5glb350n";
+      rev = "7ea8df5679ba6cb46799115c0090511e448c7cd4";
+      sha256 = "1icj1rd04mnjg5w1km9wygm9fiw2v4mrpjaz10mh5dqgb7ka91dc";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.4.106";
+    version = "6.4.128";
   };
   metasploit-model = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rlp50vg4gwxm9vj6abln4837j40ynmbpkqaipwjscmkbk2pdjk7";
+      sha256 = "0b6d18pd56ghcvkkzxdda9g0m3ydmppv8fjjpppzplnx18ccs1sj";
       type = "gem";
     };
-    version = "5.0.4";
+    version = "5.0.5";
   };
   metasploit-payloads = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07kr41hz8hiwqrysmql0vds0s503w7dykxbri4b6svyjfr9wmhr5";
+      sha256 = "1cry73lkmg5p32ah7kn7scfawmgxc78i24nm559yzrrm1dqr2brx";
       type = "gem";
     };
-    version = "2.0.237";
+    version = "2.0.245";
   };
   metasploit_data_models = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dqvv58w47jbwrm1zmqgmm7z144afxv7s7jvgqkmzym5jz21pmbl";
+      sha256 = "13f5kn8q6p7wvxyi1pxdlf9v0nmfh2fc93n4fwms6g83xc30sdmh";
       type = "gem";
     };
-    version = "6.0.11";
+    version = "6.0.18";
   };
   metasploit_payloads-mettle = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1cf4253l2225yika6av9pds5q2gl4ycvi6ddh07xzqcc1d7gm7iy";
+      sha256 = "0i179sc2acy1d6kh24yry4sdg23gllzwc3kkbwsm41fdhqhkd10y";
       type = "gem";
     };
-    version = "1.0.45";
+    version = "1.0.46";
   };
   mime-types = {
     groups = [ "default" ];
@@ -896,10 +896,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj";
+      sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726";
       type = "gem";
     };
-    version = "3.2025.0924";
+    version = "3.2026.0414";
   };
   mini_portile2 = {
     groups = [ "default" ];
@@ -916,10 +916,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fslin1vyh60snwygx8jnaj4kwhk83f3m0v2j2b7bsg2917wfm3q";
+      sha256 = "1mbpz92ml19rcxxfjrj91gmkif9khb1xpzyw38f81rvglgw1ffrd";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "5.27.0";
   };
   mqtt = {
     groups = [ "default" ];
@@ -946,20 +946,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1drisvysgvnjlz49a0qcbs294id6mvj3i8iik5rvym68ybwfzvvs";
+      sha256 = "0vfaab23d85617ps412ydb8ap4ci1sfzi8ainn8yyifc0pl38f9g";
       type = "gem";
     };
-    version = "1.19.1";
+    version = "1.20.1";
   };
   mustermann = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08ma2fmxlm6i7lih4mc3har2fzsbj1pl4hhva65kljf6nfvdryl5";
+      sha256 = "163i29mdcr1h0nximk3d51a1fgp7vz3sfasn8p1rjm2d4g3p0qac";
       type = "gem";
     };
-    version = "3.0.4";
+    version = "3.1.1";
   };
   mutex_m = {
     groups = [ "default" ];
@@ -996,10 +996,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1imc50a9ic3ynsl3k0japhmb0ggrgp2c186cfqbcclv892nsrjh8";
+      sha256 = "1bgjhb65r1bl52wdym6wpbb0r3j7va8s44grggp0jvarfvw7bawv";
       type = "gem";
     };
-    version = "0.6.2";
+    version = "0.6.3";
   };
   net-ldap = {
     groups = [ "default" ];
@@ -1046,10 +1046,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p";
+      sha256 = "1m1d6rs40rjvdb6df34fi3za1c2ajdiydv4jzpjj03iq7hhrw0k5";
       type = "gem";
     };
-    version = "7.3.0";
+    version = "7.3.2";
   };
   netrc = {
     groups = [ "default" ];
@@ -1100,10 +1100,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15anyh2ir3kdji93kw770xxwm5rspn9rzx9b9zh1h9gnclcd4173";
+      sha256 = "0mhp90nf3g3yy5vgjnwd34czi6rbi0p7057vgngfmmdkknsxiz9q";
       type = "gem";
     };
-    version = "1.19.0";
+    version = "1.19.2";
   };
   nori = {
     groups = [ "default" ];
@@ -1190,10 +1190,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
+      sha256 = "0z9cbfdfr83k8xhrh1nr4f4z8ryfivfr3gv3fpk22hczwg9q4xrk";
       type = "gem";
     };
-    version = "1.27.0";
+    version = "2.0.1";
   };
   patch_finder = {
     groups = [ "default" ];
@@ -1260,10 +1260,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00silqnlzzm97gn21lm39q95hjn058waqky44j25r67p9drjy1hh";
+      sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "1.9.0";
   };
   psych = {
     groups = [ "default" ];
@@ -1280,20 +1280,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mx84s7gn3xabb320hw8060v7amg6gmcyyhfzp0kawafiq60j54i";
+      sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs";
       type = "gem";
     };
-    version = "7.0.2";
+    version = "7.0.5";
   };
   puma = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pa9zpr51kqnsq549p6apvnr95s9flx6bnwqii24s8jg2b5i0p74";
+      sha256 = "122b6vwqpjsb43wccgz4cg84rimfnrcanm9j0g9v3yk0ic5hb08n";
       type = "gem";
     };
-    version = "7.1.0";
+    version = "8.0.0";
   };
   racc = {
     groups = [ "default" ];
@@ -1310,10 +1310,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fgpa9qm5qgza69fjnagg2alxs2wmj41aq7z4kj5yib50wpzgqhl";
+      sha256 = "175ni9qsai9x2ykwvdbd5dzfyncaxpyn6dhjxjw70iq60xz9vzm8";
       type = "gem";
     };
-    version = "2.2.21";
+    version = "2.2.23";
   };
   rack-protection = {
     groups = [ "default" ];
@@ -1370,30 +1370,30 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0q55i6mpad20m2x1lg5pkqfpbmmapk0sjsrvr1sqgnj2hb5f5z1m";
+      sha256 = "128y5g3fyi8fds41jasrr4va1jrs7hcamzklk1523k7rxb64bc98";
       type = "gem";
     };
-    version = "1.6.2";
+    version = "1.7.0";
   };
   railties = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08h44mkf91861agp7xw778gqpf5mppydsfgphgkj7wp6pyk11c3f";
+      sha256 = "0np1m8xqb4wbzwpg66yjnqjban0di92lbjzcrgnwwhq2w4z3k8xf";
       type = "gem";
     };
-    version = "7.2.3";
+    version = "7.2.3.1";
   };
   rake = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "175iisqb211n0qbfyqd8jz2g01q6xj038zjf4q0nm8k6kz88k7lc";
+      sha256 = "009p524zl0p0kfa65nii8wdmaigkmawv9pbvlcffky7islmmp0nb";
       type = "gem";
     };
-    version = "13.3.1";
+    version = "13.4.2";
   };
   rasn1 = {
     groups = [ "default" ];
@@ -1420,20 +1420,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yc1xa3wckwwan518qii22jagqzlr5bypflx3nkvpdqr3ncd1qyz";
+      sha256 = "14iiyb4yi1chdzrynrk74xbhmikml3ixgdayjma3p700singfl46";
       type = "gem";
     };
-    version = "7.0.3";
+    version = "7.2.0";
   };
   recog = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1s99rxjfd52yvnpna85b1yv7f7wcgr8ffirc3m19n5v4mi04da8i";
+      sha256 = "1b7kx4d9gmifph452fflx0ddp1bns53sb4p3xp4qnaw0ix4s6wm7";
       type = "gem";
     };
-    version = "3.1.25";
+    version = "3.1.26";
   };
   redcarpet = {
     groups = [ "default" ];
@@ -1470,40 +1470,40 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1b0sa6p171zm5c8axzliipmkk7yq73g3dz8kq1zmqj7v3birbiaf";
+      sha256 = "080avj9lqd7pr3g3cfrs4sh22c2fadhzc4q72plfsh13cfgchflz";
       type = "gem";
     };
-    version = "0.1.18";
+    version = "0.1.19";
   };
   rex-bin_tools = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ih0n4cd44jj8n939rxbfsjfa9z62xj9risvvnki910gzv7mgx4j";
+      sha256 = "0b755sz6h9hn3f7qbx033h4j7pwx1r2ykyzqil8alpp8983li0h0";
       type = "gem";
     };
-    version = "0.1.12";
+    version = "0.1.16";
   };
   rex-core = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09px9sp412qr226ngm7gik9nnd1m9bg9wbsanr7xhn80w71wn5b4";
+      sha256 = "0pqcxrx09lbbachpdhzwlfcrnnzspighysqslz3slfhcskygqq3s";
       type = "gem";
     };
-    version = "0.1.35";
+    version = "0.1.36";
   };
   rex-encoder = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1b1m0qmjv62npd1m8q8p9w0857pix11mwbl8wxgylc43b03m2klx";
+      sha256 = "0sqxbmm2yj009ihiy3a1iyy2f1576idix7v3r2sy66575q0f45la";
       type = "gem";
     };
-    version = "0.1.8";
+    version = "0.1.10";
   };
   rex-exploitation = {
     groups = [ "default" ];
@@ -1600,10 +1600,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11cwgr4nr6jm62as4qkmhgq7wf9v1s5r9g92hkf6586i5xalwz9k";
+      sha256 = "0qjvlk214vm2nj5kxw47iy595vai0pp9x4c5vns2nlllij21734x";
       type = "gem";
     };
-    version = "0.1.64";
+    version = "0.1.66";
   };
   rex-sslscan = {
     groups = [ "default" ];
@@ -1630,10 +1630,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1z5cawbl959hf9ll9m2dm5zj2cra0isgl82d7vrih38ja31zwpdh";
+      sha256 = "0b3pr6v6b376ca40xsixbsg5qvnzkjsr3yqn9693gl0543dx2gp7";
       type = "gem";
     };
-    version = "0.2.61";
+    version = "0.2.62";
   };
   rex-zip = {
     groups = [ "default" ];
@@ -1680,10 +1680,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0859xi0shidwb9cfbczxsk8qrbi3qkmkp9xzyca1xzp0gmzv7ni3";
+      sha256 = "09x31652m0nfic91riab0wah6gj9gvjs1lxi7jhbq6pvx3cw755q";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "5.0.0";
   };
   ruby-mysql = {
     groups = [ "default" ];
@@ -1705,25 +1705,15 @@
     };
     version = "0.1.5";
   };
-  ruby2_keywords = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
-      type = "gem";
-    };
-    version = "0.0.5";
-  };
   ruby_smb = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vx0aky54jpjx21yngrprxib0dyyfnax4j526amva5ha7vjw9fyy";
+      sha256 = "0xv1s1b7xv5r2q2bclpqwf41cks128n5vipzzlci5w3r49zry8dh";
       type = "gem";
     };
-    version = "3.3.16";
+    version = "3.3.17";
   };
   rubyntlm = {
     groups = [ "default" ];
@@ -1740,10 +1730,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0";
+      sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
       type = "gem";
     };
-    version = "3.2.2";
+    version = "2.4.1";
   };
   sawyer = {
     groups = [ "default" ];
@@ -1870,20 +1860,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0w27v04d7rnxjr3f65w1m7xyvr6ch6szjj2v5wv1wz6z5ax9pa9m";
+      sha256 = "1cvaikq1dcbfl008i16c1pi1gmdax7vfkvmhch64jdkakyk9nnqd";
       type = "gem";
     };
-    version = "2.6.1";
+    version = "2.7.0";
   };
   timeout = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bz11pq7n1g51f50jqmgyf5b1v64p1pfqmy5l21y6vpr37b2lwkd";
+      sha256 = "1jxcji88mh6xsqz0mfzwnxczpg7cyniph7wpavnavfz7lxl77xbq";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.6.1";
   };
   tsort = {
     groups = [ "default" ];
@@ -1920,20 +1910,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qlm97fqcwhvfa7jg2gnq8la3mnk617b5bwsc460mi75wpqy4imm";
+      sha256 = "1z896q8kzig9x6g3bcp38apns05y36jhf4j7ml7wzqjsmqcnb8sf";
       type = "gem";
     };
-    version = "1.2025.3";
+    version = "1.2026.1";
   };
   unix-crypt = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11p5ij6iasr46fbzz0z3jibaiwf242bq8xwav33rljwcwh85sy5y";
+      sha256 = "08scg2kq184jjip3ynywj43jlynchj86jh2psxh4ms4rfykb46sw";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.3.2";
   };
   uri = {
     groups = [ "default" ];
@@ -2040,19 +2030,19 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fwfnccagsjrbvrav5nbk3zracj9zncr7i375nn20jd4cfy4cggc";
+      sha256 = "0hjlvq952c80khrj084a3csawrwlshd1v3n8abv5hbpqry6y18jk";
       type = "gem";
     };
-    version = "0.3.3";
+    version = "0.3.4";
   };
   zeitwerk = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "12zcvhzfnlghzw03czy2ifdlyfpq0kcbqcmxqakfkbxxavrr1vrb";
+      sha256 = "1pbkiwwla5gldgb3saamn91058nl1sq1344l5k36xsh9ih995nnq";
       type = "gem";
     };
-    version = "2.7.4";
+    version = "2.7.5";
   };
 }
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 962bbbf1fc17..9efc93c89390 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -108,14 +108,12 @@ stdenv.mkDerivation rec {
     cp "contrib/dmenu/passmenu" "$out/bin/"
   '';
 
-  wrapperPath = lib.makeBinPath (
+  wrapperPathPrefix = lib.makeBinPath (
     [
       coreutils
       findutils
       getopt
-      git
       gnugrep
-      gnupg
       gnused
       tree
       which
@@ -136,6 +134,11 @@ stdenv.mkDerivation rec {
     ]
   );
 
+  wrapperPathSuffix = lib.makeBinPath [
+    git
+    gnupg
+  ];
+
   postFixup = ''
     # Fix program name in --help
     substituteInPlace $out/bin/pass \
@@ -143,13 +146,15 @@ stdenv.mkDerivation rec {
 
     # Ensure all dependencies are in PATH
     wrapProgram $out/bin/pass \
-      --prefix PATH : "${wrapperPath}"
+      --prefix PATH : "${wrapperPathPrefix}" \
+      --suffix PATH : "${wrapperPathSuffix}"
   ''
   + lib.optionalString dmenuSupport ''
     # We just wrap passmenu with the same PATH as pass. It doesn't
     # need all the tools in there but it doesn't hurt either.
     wrapProgram $out/bin/passmenu \
-      --prefix PATH : "$out/bin:${wrapperPath}"
+      --prefix PATH : "$out/bin:${wrapperPathPrefix}" \
+      --suffix PATH : "${wrapperPathSuffix}"
   '';
 
   # Turn "check" into "installcheck", since we want to test our pass,
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index bf9b9b3fba52..2cbdfd2fa593 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -25,11 +25,11 @@ assert (doCheck && stdenv.hostPlatform.isLinux) -> glibcLocales != null;
 
 stdenv.mkDerivation rec {
   pname = "gawk" + lib.optionalString interactive "-interactive";
-  version = "5.3.2";
+  version = "5.4.0";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/gawk-${version}.tar.xz";
-    hash = "sha256-+MNIZQnecFGSE4sA7ywAu73Q6Eww1cB9I/xzqdxMycw=";
+    hash = "sha256-PdQw8M07RCjGw/avwCG5zTwfjJP3pojcJoykKKkLSsE=";
   };
 
   # When we do build separate interactive version, it makes sense to always include man.
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index bd0c4c8d175d..371f34a3bd0c 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchurl,
-  fetchzip,
   fetchFromGitHub,
   fetchpatch,
+  unzip,
   buildPackages,
   texlive,
   zlib,
@@ -42,7 +42,7 @@
   clisp,
   biber,
   woff2,
-  xxHash,
+  xxhash,
   makeWrapper,
   useFixedHashes ? true,
   asymptote,
@@ -139,12 +139,19 @@ let
   binPackages = lib.getAttrs (corePackages ++ coreBigPackages) tlpdb;
 
   common = {
+    # initial TeX Live 2025 release
+    # src = fetchurl {
+    #   urls = [
+    #     "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
+    #     "ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
+    #   ];
+    #   hash = "sha256-//2xo9FDwXekOYoiKaQNaojxgJjl9tz9V2SMnyQXSQ8=";
+    # };
+
+    # 2025.2 update
     src = fetchurl {
-      urls = [
-        "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
-        "ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
-      ];
-      hash = "sha256-//2xo9FDwXekOYoiKaQNaojxgJjl9tz9V2SMnyQXSQ8=";
+      url = "https://github.com/TeX-Live/texlive-source/archive/refs/tags/svn74917.tar.gz";
+      hash = "sha256-QgUN5LOFeD6Jt0ENF6Uwi516D8PH+TXZ+MCO8bCTHqE=";
     };
 
     prePatch = ''
@@ -537,25 +544,21 @@ rec {
   # https://github.com/gucci-on-fleek/context-packaging
   context =
     let
-      # The latest release of the context-packaging repo before the CTAN version in tlpdb.nix
-      # https://github.com/gucci-on-fleek/context-packaging
-      context_packaging_release = "2026-01-08-23-30-A";
+      version = "2.11.08";
+      level = "20260217";
     in
     stdenv.mkDerivation {
       pname = "luametatex";
-      version = "2.11.08";
+      version = "${version}-${level}";
 
-      src = fetchzip {
-        name = "luametatex.src.zip";
-        url = "https://github.com/gucci-on-fleek/context-packaging/releases/download/${context_packaging_release}/luametatex.src.zip";
-        hash = "sha256-PY1rrgLFAXR7YRcJMx1ob9dQc1PFoBSpi1xLQGM4Lko=";
-        stripRoot = false;
-      };
+      src = texlive.pkgs.context.texsource + "/source/context/base/luametatex-${level}.src.zip";
+      sourceRoot = ".";
 
       enableParallelBuilding = true;
       nativeBuildInputs = [
         cmake
         ninja
+        unzip
       ];
 
       meta = {
@@ -602,7 +605,7 @@ rec {
       ttfautohint
       woff2
       potrace
-      xxHash
+      xxhash
       mupdf-headless
     ];
 
@@ -685,24 +688,32 @@ rec {
     };
   };
 
-  asymptote = args.asymptote.overrideAttrs (
-    finalAttrs: prevAttrs: {
-      version = texlive.pkgs.asymptote.version;
+  asymptote =
+    let
+      version = "3.09";
+    in
+    args.asymptote.overrideAttrs (
+      finalAttrs: prevAttrs: {
+        version =
+          assert lib.assertMsg (version == texlive.pkgs.asymptote.version)
+            "asymptote: TeX Live version (${texlive.pkgs.asymptote.version}) different from source in bin.nix (${version}), please update it";
+          version;
 
-      # keep local src and patches even if duplicated in the top level asymptote
-      # so that top level updates do not break texlive
-      src = fetchurl {
-        url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
-        hash = "sha256-NcFtCjvdhppW5O//Rjj4HDqIsva2ZNGWRxAV2/TGmoc=";
-      };
+        # keep local src and patches even if duplicated in the top level asymptote
+        # so that top level updates do not break texlive
+        src = fetchurl {
+          url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
+          hash = "sha256-unM6mfyq8MCajo8wtG/ksr4E6mQNK/A03gGIa9Fxeuc=";
+        };
 
-      texContainer = texlive.pkgs.asymptote.tex;
-      texdocContainer = texlive.pkgs.asymptote.texdoc;
+        texContainer = texlive.pkgs.asymptote.tex;
+        texdocContainer = texlive.pkgs.asymptote.texdoc;
 
-      # build issue with asymptote 2.95 has been fixed
-      postConfigure = "";
-    }
-  );
+        preConfigure = prevAttrs.preConfigure + ''
+          substituteInPlace Makefile.in --replace-fail '/bin/ls' 'ls'
+        '';
+      }
+    );
 
   inherit biber;
   inherit biber-ms;
diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
index 021bcd119e91..7d00099ece85 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
@@ -44,28 +44,6 @@ lib.fix (
   }@args:
 
   let
-    ### buildEnv with custom attributes
-    buildEnv' =
-      args:
-      (buildEnv (
-        {
-          inherit pname version;
-
-          inherit (args) paths;
-        }
-        // lib.optionalAttrs (args ? extraOutputsToInstall) { inherit (args) extraOutputsToInstall; }
-        // lib.optionalAttrs (args ? pathsToLink) { inherit (args) pathsToLink; }
-      )).overrideAttrs
-        (
-          removeAttrs args [
-            "extraOutputsToInstall"
-            "pathsToLink"
-            "name"
-            "paths"
-            "pkgs"
-          ]
-        );
-
     ### texlive.combine backward compatibility
     # if necessary, convert old style { pkgs = [ ... ]; } packages to attribute sets
     isOldPkgList = p: !p.outputSpecified or false && p ? pkgs && builtins.all (p: p ? tlType) p.pkgs;
@@ -230,7 +208,7 @@ lib.fix (
 
     name = "${pname}-${version}";
 
-    texmfdist = buildEnv' {
+    texmfdist = buildEnv {
       name = "${name}-texmfdist";
 
       # remove fake derivations (without 'outPath') to avoid undesired build dependencies
@@ -299,19 +277,21 @@ lib.fix (
     # other outputs
     nonEnvOutputs = lib.genAttrs pkgList.nonEnvOutputs (
       outName:
-      buildEnv' {
+      buildEnv {
         inherit name;
-        outputs = [ outName ];
         paths = builtins.catAttrs "outPath" (
           pkgList.otherOutputs.${outName} or [ ] ++ pkgList.specifiedOutputs.${outName} or [ ]
         );
-        # force the output to be ${outName} or nix-env will not work
-        nativeBuildInputs = [
-          (writeShellScript "force-output.sh" ''
-            export out="''${${outName}-}"
-          '')
-        ];
-        inherit meta passthru;
+        derivationArgs = {
+          outputs = [ outName ];
+          nativeBuildInputs = [
+            # force the output to be ${outName} or nix-env will not work
+            (writeShellScript "force-output.sh" ''
+              export out="''${${outName}-}"
+            '')
+          ];
+          inherit meta passthru;
+        };
       }
     );
 
@@ -429,79 +409,80 @@ lib.fix (
 
     updmapLines = { pname, fontMaps, ... }: [ "# from ${pname}:" ] ++ fontMaps;
 
-    out =
-      # no indent for git diff purposes
-      buildEnv' {
-
-        inherit name;
-
-        # use attrNames, attrValues to ensure the two lists are sorted in the same way
-        outputs = [
-          "out"
-        ]
-        ++ lib.optionals (!__combine && __formatsOf == null) (builtins.attrNames nonEnvOutputs);
-        otherOutputs = lib.optionals (!__combine && __formatsOf == null) (
-          builtins.attrValues nonEnvOutputs
-        );
-
-        # remove fake derivations (without 'outPath') to avoid undesired build dependencies
-        paths =
-          builtins.catAttrs "outPath" pkgList.bin
-          ++ lib.optionals (!__combine && __formatsOf == null) pkgList.formats
-          ++ lib.optional __combine doc;
-        pathsToLink = [
-          "/"
-          "/share/texmf-var/scripts"
-          "/share/texmf-var/tex/generic/config"
-          "/share/texmf-var/web2c"
-          "/share/texmf-config"
-          "/bin" # ensure these are writeable directories
-        ];
-
-        nativeBuildInputs = [
-          makeWrapper
-          libfaketime
-          tl."texlive.infra" # mktexlsr
-          tl.texlive-scripts # fmtutil, updmap
-          tl.texlive-scripts-extra # texlinks
-          perl
-        ];
-
-        buildInputs = [
-          coreutils
-          gawk
-          gnugrep
-          gnused
-        ]
-        ++ lib.optional needsGhostscript ghostscript;
-
-        inherit meta passthru __combine;
-        __formatsOf = __formatsOf.pname or null;
-
-        inherit texmfdist texmfroot;
-
-        fontconfigFile = makeFontsConf { fontDirectories = [ "${texmfroot}/texmf-dist/fonts" ]; };
-
-        fmtutilCnf = assembleConfigLines fmtutilLines pkgList.sortedFormatPkgs;
-        updmapCfg = assembleConfigLines updmapLines pkgList.sortedFontMaps;
-
-        languageDat = assembleConfigLines langDatLines pkgList.sortedHyphenPatterns;
-        languageDef = assembleConfigLines langDefLines pkgList.sortedHyphenPatterns;
-        languageLua = assembleConfigLines langLuaLines pkgList.sortedHyphenPatterns;
-
-        postactionScripts = builtins.catAttrs "postactionScript" pkgList.tlpkg;
-
-        postBuild = ''
-          . "${./build-tex-env.sh}"
-        '';
-
-        allowSubstitutes = true;
-        preferLocalBuild = false;
-      };
   in
-  # outputsToInstall must be set *after* overrideAttrs (used in buildEnv') or it fails the checkMeta tests
-  if __combine || __formatsOf != null then
-    out
-  else
-    lib.addMetaAttrs { inherit (pkgList) outputsToInstall; } out
+  buildEnv {
+
+    inherit name;
+
+    # remove fake derivations (without 'outPath') to avoid undesired build dependencies
+    paths =
+      builtins.catAttrs "outPath" pkgList.bin
+      ++ lib.optionals (!__combine && __formatsOf == null) pkgList.formats
+      ++ lib.optional __combine doc;
+    pathsToLink = [
+      "/"
+      "/share/texmf-var/scripts"
+      "/share/texmf-var/tex/generic/config"
+      "/share/texmf-var/web2c"
+      "/share/texmf-config"
+      "/bin" # ensure these are writeable directories
+    ];
+
+    postBuild = ''
+      . "${./build-tex-env.sh}"
+    '';
+
+    derivationArgs = {
+      # use attrNames, attrValues to ensure the two lists are sorted in the same way
+      outputs = [
+        "out"
+      ]
+      ++ lib.optionals (!__combine && __formatsOf == null) (builtins.attrNames nonEnvOutputs);
+      otherOutputs = lib.optionals (!__combine && __formatsOf == null) (
+        builtins.attrValues nonEnvOutputs
+      );
+
+      nativeBuildInputs = [
+        makeWrapper
+        libfaketime
+        tl."texlive.infra" # mktexlsr
+        tl.texlive-scripts # fmtutil, updmap
+        tl.texlive-scripts-extra # texlinks
+        perl
+      ];
+
+      buildInputs = [
+        coreutils
+        gawk
+        gnugrep
+        gnused
+      ]
+      ++ lib.optional needsGhostscript ghostscript;
+
+      inherit passthru __combine;
+      __formatsOf = __formatsOf.pname or null;
+
+      inherit texmfdist texmfroot;
+
+      fontconfigFile = makeFontsConf { fontDirectories = [ "${texmfroot}/texmf-dist/fonts" ]; };
+
+      fmtutilCnf = assembleConfigLines fmtutilLines pkgList.sortedFormatPkgs;
+      updmapCfg = assembleConfigLines updmapLines pkgList.sortedFontMaps;
+
+      languageDat = assembleConfigLines langDatLines pkgList.sortedHyphenPatterns;
+      languageDef = assembleConfigLines langDefLines pkgList.sortedHyphenPatterns;
+      languageLua = assembleConfigLines langLuaLines pkgList.sortedHyphenPatterns;
+
+      postactionScripts = builtins.catAttrs "postactionScript" pkgList.tlpkg;
+
+      allowSubstitutes = true;
+      preferLocalBuild = false;
+
+      meta =
+        meta
+        // lib.optionalAttrs (!__combine && __formatsOf == null) {
+          inherit (pkgList) outputsToInstall;
+        };
+    };
+  }
 )
diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.sh b/pkgs/tools/typesetting/tex/texlive/build-tex-env.sh
index ec755554b80d..7a2f8c6efa9d 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.sh
+++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.sh
@@ -123,15 +123,13 @@ installtl_do_path_adjustments () {
     ln -s "$texmfdist" "$out"/share/texmf
 
     # generate other outputs
-    local otherOutput otherOutputName
-    local otherOutputs="$otherOutputs"
-    for otherOutputName in $outputs ; do
+    local otherOutputIdx=0 otherOutputName
+    for otherOutputName in "${!outputs[@]}" ; do
         if [[ $otherOutputName == out ]] ; then
             continue
         fi
-        otherOutput="${otherOutputs%% *}"
-        otherOutputs="${otherOutputs#* }"
-        ln -s "$otherOutput" "${!otherOutputName}"
+        ln -s "${otherOutputs[$otherOutputIdx]}" "${outputs[$otherOutputName]}"
+        ((otherOutputIdx++)) || true
     done
 }
 
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index dc2a87b59e14..c1b23064f3ed 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -67,8 +67,8 @@
   clisp,
   biber,
   woff2,
-  xxHash,
-  fetchzip,
+  xxhash,
+  unzip,
   fetchFromGitHub,
   buildPackages,
   texlive,
@@ -134,12 +134,12 @@ let
   version = {
     # day of the snapshot being taken
     year = "2026";
-    month = "02";
-    day = "02";
+    month = "03";
+    day = "01";
     # TeX Live version
     texliveYear = 2025;
     # final (historic) release or snapshot
-    final = false;
+    final = true;
   };
 
   # The tarballs on CTAN mirrors for the current release are constantly
@@ -177,7 +177,7 @@ let
         # use last mirror for daily snapshots as texlive.tlpdb.xz changes every day
         # TODO make this less hacky
         (if version.final then mirrors else [ (lib.last mirrors) ]);
-    hash = "sha256-GxJXqY6plT3wngKiuqiZUst4eTZIylUdhN2ojUApIpU=";
+    hash = "sha256-Vt8DjpBwo9WH7s613vPxVLLKzM7zbUKVu0ngYYl3w0o=";
   };
 
   tlpdbNix =
diff --git a/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix b/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix
index b0603f388e7f..aa98202ecc35 100644
--- a/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix
+++ b/pkgs/tools/typesetting/tex/texlive/fixed-hashes.nix
@@ -16,7 +16,7 @@
     run = "1h9i49m7v83ppifkcr4cncjfkrpx0hs8b11qyjn9s9y4mi8ra0w0";
     doc = "0yxs2va1v4s6picfqkq2k9l7295np46lc35yx1dcmddy2667k3kl";
   };
-  a4wide-20943 = {
+  a4wide-77677 = {
     run = "0jw1d021vrr4f2sv94mw1jk7ma72m84idmq62imwqy23x8nfccy1";
     doc = "03g0vwfdcczgkpbrri3wfhfbrq6r6iljpz5j9rllr2z5svlrjf4d";
   };
@@ -61,11 +61,11 @@
     run = "08yyf9dwhgqrl38d5djkh3mbiqrw2pf7970247hmq3lr80fp2xjc";
     doc = "04ylzv8k251wxn06gvqxbvf0sfdk5s6w4cx3jjrm13rlw172f519";
   };
-  aboensis-62977 = {
+  aboensis-77677 = {
     run = "171586kjnfg1qb4wi50mrc9jd8h2ybg6r68kwyhgc5y0gyhyg08c";
     doc = "0qc74wvq6ibxgil36wp0b5s66d7m7axbn0y1qpzy9hyrh8v8jpav";
   };
-  abraces-71955 = {
+  abraces-77677 = {
     run = "0afy64vj5rj27s9nfdf4cl17sf4946mli0khmxr5lfnkjihkws57";
     doc = "01c6d2wgbiz6wxqjlmqrndjvk2fp44izg3wwj3lsm1iyb1hd9g0q";
   };
@@ -74,7 +74,7 @@
     doc = "1a3li91yvvw2r62dvp87zzzxni3xllrzp38zg6qxfsn6xbwry9zf";
     source = "10dx92msh53z7sn603vsg740wvbhz8hr6bcn1sjs60snl47f4yf5";
   };
-  abstract-15878 = {
+  abstract-77677 = {
     run = "173bimxd0923191xfjjk7x29j8xs5kxy7ih55l1k6dbj0iwlb9g7";
     doc = "166lhh2vi36qbhc5gm3xx96sigksslzb17bpzncycf0zgkh7j0gi";
     source = "14f2s393nd8q5kb909rj8r15apf48rg6na8yc45z2hl9ksfwx172";
@@ -83,15 +83,15 @@
     run = "0v4wwf9w542scqx298gcvvngl0ncal0wds5m8h96x9cz7p9wjlph";
     doc = "0zxygi2wfrwlgv9dj69m3v5ily0av65f3qiy9vfpbjlradak48yy";
   };
-  academicons-76366 = {
+  academicons-77677 = {
     run = "14qic5fvx5k4vnbkkd33f53y21bips4l4ndyqnhzqjs87ys4amyh";
     doc = "0z99vxn5xr9qbw8j0n19jqbdz0ia7sy8v82x9whdh9gs93q1bmar";
   };
-  accanthis-64844 = {
+  accanthis-77677 = {
     run = "05194iwavl83dqivxahrsb4a952knr7ih0rbzd4d34a6qqf20w62";
     doc = "0jibkv1gv94xzciidm5h7hrslj8qfikjihw3rfzzk6n42a6xbp5a";
   };
-  accents-51497 = {
+  accents-77677 = {
     run = "1xl7fkm5gc36mm0bhx7rm9v4g2d9j22gr5fjxjbzmr6byjfgw71k";
     doc = "0il1ccxa2ndnfxn2caz9d4mv39y21rh360lynra7q2v5j1cyqrw5";
   };
@@ -124,11 +124,11 @@
     doc = "1vyhkwqg0v3pxjnlwzwnmiffh6b3d9nrwnpaqjm24j9d2sc6cxcx";
     source = "1n8cf6n2fdb88xmnj2m5r3cjz3jlp9n7bn1yr717fsp2ks81pr3f";
   };
-  acro-76924 = {
+  acro-77677 = {
     run = "1hzavaicandq6sqz3sy8hj5n3kvkbic34p8id2mslizcw3rmlhhz";
     doc = "05iwf21y45l61fsask04pphxzzjn7h1al8n2wv59jkxyh8vy8dbv";
   };
-  acronym-73491 = {
+  acronym-78116 = {
     run = "1zz4hhrpmrr0yqrc0j7w3ihadk2am63nsl3nl80qhl918b7d5xh3";
     doc = "07r7h17zalw3gcsyfzsp90l8aps9w45p4vag5pyc4lsiv1h374cf";
     source = "0q6h09wk9qdhwyyg2np9x3va34km6x02a77cyy5p8csh831k6hdz";
@@ -161,7 +161,7 @@
     run = "1w9wv0wbv8acc7qvcc5pb5kjxmy2nz95cb990mmgc2lxvvsaw2rl";
     doc = "0q41i3cd16ahpklr1ddmzmfs741x5k30vaz7gz7k8jrf0579nv7w";
   };
-  addlines-49326 = {
+  addlines-77677 = {
     run = "1rkcpk1c8in0g6dgyc1m6pyz01jbx19gv98jmaiybxgvsa3z11jc";
     doc = "1gaf9ljzkdhwjg460hl79hlwdwi0mrvgs51si8k8gvialng8b1fv";
     source = "1m3l2s1l671n9j7jdsxfljjhrsvh81bayw40v81dm0f68g5hslnf";
@@ -175,15 +175,15 @@
     doc = "0c6k4xsy0jg95qg45bqk9527kb3k3azyxwpl2zrkw0ld6k47sswz";
     source = "17irbcz9wjnc6rj9f736i2hw4qrjwa1gz5z6w7gvq26b68pkxrw4";
   };
-  adforn-74834 = {
-    run = "1p8i5xzcs373r0vkwsr8j52rwnk052yny60r7gnffskhhc5k7kl1";
-    doc = "0b8jmc6ac5rydhk9jxqbpmcx98gjqhcq1hgf7jjfhzr84aahp698";
-    source = "0nz7ip5ds42fx4rd0slia948gsncbpcwifbnhmlgrlcil78jghrc";
+  adforn-78143 = {
+    run = "1i41nf0xa0k8v31hr5vap9dm5r9wh19m5rvyxlqqmzhnjp8gdj0m";
+    doc = "1mrsrikfq6pjnfqribvngv135lxq619jfzl5hpq47bffp6fkgygh";
+    source = "13i45m0sqr197kc0ahmgimvc71hp6vmd5ni5g5ghvv4skmn018h1";
   };
-  adfsymbols-74819 = {
-    run = "0grsypwhkmzy42blrcp5cw6fmqif2k0lsq45pcafdhghavj69h6m";
-    doc = "0s7k6wxpl6fmv75w34hwwxsrx7l9xc9v9pydfbkpdlay0wsnfw5a";
-    source = "14g62hdvxbkn192bbs125k8zaf0952bca0pa5jga3rlr960n0zsw";
+  adfsymbols-78144 = {
+    run = "0zyyjf7br6l52z6c198h4lag2d572pavc3g2wvrnbhk027i7svkf";
+    doc = "06irr3zf92n8qw9g58ap7fcarda0r8cyr8nzgfiqy3nhcvfgjwh9";
+    source = "12wv0iqij3q0kdw7lh8rr3gsxqmhx3lz7imqc57pqgykwawf2ll8";
   };
   adhocfilelist-29349 = {
     run = "08fnrvnbrp7534b56hn8w0nm8pbgjli62v34mkalp4qkfb559kh7";
@@ -194,12 +194,12 @@
     run = "19wzsa84y7a5jbgbyj69frfqd0ahi9ha7sszppsr5bmh88gbnfby";
     doc = "0rr6sbb34d9nd1ni86s5mll5bjx0hinwm52gqiqrwqwkr068djcn";
   };
-  adjmulticol-63320 = {
+  adjmulticol-77677 = {
     run = "0wjqjg46gbf44f2x0xf58b3f9bxfkrh21m85mh1xsd5pxdy116fl";
     doc = "01r00mf8skd54xgzqjicl4djjzgnf5fdw5hcbf9p5ixx1zw1jq7l";
     source = "1zyq1r0y3amkqch1lif0dygif0sgwhypscqdsqml6ik2ziv2alzi";
   };
-  adjustbox-74309 = {
+  adjustbox-78116 = {
     run = "0d52f259gznbzxl3452ar8zx2r06nxrqjaqpi78bl0d93nwncyih";
     doc = "1mrpyfmmdmx6qsfs8cm5zj63m7fb0qxk64h54xz43dmwbqcx24k6";
     source = "0xp5qbbpn9931xal7n1b5gj2gx5jwrnvhdwdgkdi1gl3jsynwj77";
@@ -216,7 +216,7 @@
     run = "1j38apxxk3klabxrm9kpdf6zbmiqb17is5yqgg1a4576n8paqg4y";
     doc = "1851rqb9gs1wf8wl8f7pqbnxgpikzxzw1n5mg5w0kcwd889g17yc";
   };
-  advdate-20538 = {
+  advdate-77677 = {
     run = "0wgr84y3k10g6622sm11c4m4wxj73vpklf5i5gnp14yamwi19cn8";
     doc = "0hyq7kn10ajqabmz2r363wfpdi71a9zkv6yr30s9lda0vy5vz4k8";
   };
@@ -301,7 +301,7 @@
     run = "14gd0gb86p247bz2x2kcqqj2b0r2lz12gpssfz84kgvrwx5nxkvr";
     doc = "0d8kirmkd1shkbckv32i8yxdrpwzss7qgdn2i06b6mwakisy93v1";
   };
-  alegreya-75301 = {
+  alegreya-77677 = {
     run = "06hrvi0dssva2r253k9ma1vd6ij3bi2d0wsrk2n6fnxvxbl5xc02";
     doc = "04wx39xdvhq0rfl4mz8k70kfv74w6kpyhja5879g0hp3pjfzxbcl";
   };
@@ -313,7 +313,7 @@
     doc = "1ga46r20zyb1bq7pvhq4348d2prdshy5m3yx6d00v5zzis1dmx1r";
     source = "0n36cfjgh1byik8zn997lmyz2w4wmz48f5bzqrhcps7bg3kmp4zz";
   };
-  alfaslabone-57452 = {
+  alfaslabone-77677 = {
     run = "11va28ww6qk97wx8fh0iqbm8b5s14vf923ydpglx4gann4w9bkiz";
     doc = "0wfhd5pi1p5xnkq8lgpp3fhqn8y76h5jp3h5qhlaqygal70fw9kw";
   };
@@ -327,19 +327,19 @@
     doc = "1bp5b0zr6shhaifkqdliw9qa18ym4s68xfk6k2njjnwdqyrxyd01";
     source = "13cwnl7nxxrs0jsvfrvcy7a5pg8a92qnhxjsbarcx3jmg43d4zp5";
   };
-  algolrevived-71368 = {
+  algolrevived-77677 = {
     run = "0b6lx8hbxyrb9gjbv1dx4ysjszv7rch510wpy3c785ps4717rmii";
     doc = "1p5sp9hn94iijy5nvxcpvjrdm26zka3rcqnjyv6wdvh467ijncaz";
   };
-  algorithm2e-44846 = {
+  algorithm2e-77677 = {
     run = "1iw3yhdk9nk1y41hw1qcpqiqaxadjc0nf6cgb23kd75ah2cpd53n";
     doc = "19xsi1dgxfi06wxls70pvnys20i2na2y7m2hq8y6v947pc5kbb1b";
   };
-  algorithmicx-15878 = {
+  algorithmicx-78116 = {
     run = "111iyi2j8qnzha97r1grxpcbnfkpvcwndczx043c4gw5wqmrknbj";
     doc = "1rb46zi4islfbykhr68rnrkj4q966papin0c5m752gh6kzx5r57p";
   };
-  algorithms-76389 = {
+  algorithms-78116 = {
     run = "1va2ic75nf0dfh0dr576lpgqhzqv5203frr37079q648871zqav5";
     doc = "0fqif0nb9ypd4sw2i9qsxl81h3g4h0gm0yqq67d5n9wrpic8dnjg";
     source = "14jgc7vnww5xhnd76cwix5c599sfdjil2i916cfpmsd5yn5qqdx3";
@@ -352,7 +352,7 @@
     run = "19kf1ajiqzyg3xjm232h0cljy1l0445hqaf2j8cvnxi0mm4nilh5";
     doc = "0g3z30zp1vx03wfrwhmwy1rgsx3wnmr56wz7nwbxsw9z4sxqfhmz";
   };
-  aligned-overset-47290 = {
+  aligned-overset-77677 = {
     run = "04gjl08y9wbv5qls9z2plxx5n4abi4nzd8qik88via4xghhqiy7i";
     doc = "0il97kycqgqqimqjvjhnhc2mxy2nja20vlspsqrl9zaah71p1b3d";
     source = "0zbaa3m06kfkj7kkv6iy71d20n0kqq1dwy63dwfj4l49wv427z08";
@@ -366,7 +366,7 @@
     doc = "0dki14g1607a432549kly1wcy1p6j63lrxfd3m5nyz868kg3hjmc";
     source = "1d49w7lybkn7sfig7i27mfwaccr9vjs7ab2ds27jmhp5wjl7w02w";
   };
-  almendra-64539 = {
+  almendra-77677 = {
     run = "1zij84q0ml0zf0dig3hqlmznwygcp8vbmwl3xc5qii7hs94hnjr5";
     doc = "19j6vi1z04j2zbab39934mflx5qnqdjl4gz9n8hbjwlhiq0wb82y";
   };
@@ -374,7 +374,7 @@
     run = "0qrai75pdkf4py7nhggvwzaarv4jlh04dqsy1b593jabq7ngaap1";
     doc = "0arhvv7z8yf8kcikzybhbsgsj6m9zy4is5ryr6hcf6a6incnkp1d";
   };
-  alnumsec-15878 = {
+  alnumsec-77677 = {
     run = "08i891g4b3k1qqicbsgd3h3sy98cpk6g1cfn17g9ysws8k20a0sy";
     doc = "0fanq66cm0r2dgpdrblrhqkchxpy2dxykq1g8zrk5ddx27v6r9pd";
     source = "1ssw0pi7hn3s7pqcqkm36jjgmd5g2x5rqyf2khhdscfwrsjh07a7";
@@ -383,7 +383,7 @@
     run = "0673i0l6vq1h37g9jqcp7am5kl4dfbcrfqp42c7cr6a10zhvfqyr";
     doc = "0cfl47cqpwxn1k87h19a0ggayf6c52sl60sdrmpa7sfydhg9w4qg";
   };
-  alphalph-53087 = {
+  alphalph-77677 = {
     run = "10gkh6nnhsrlqx8b6k3dylings3q97ky4qsv03nk7hn41zkqsyq0";
     doc = "0v36l765s4lc5r2xfi8a3i7vxf79yxy29xy52cbhx4ps0av4dxpi";
     source = "08yagdxgqvhvq50cc7rvb2629g4n2qjga86dpa43x2vjnmmz08vm";
@@ -414,17 +414,17 @@
     doc = "0p0jmg2mdkc5ada3wsnkbm15an20lgfh27g205q2acr08c0d2zwz";
     source = "0plydqkmzdjyjid35az71baym73zhkyj14514p7n1jh3hmpkvbif";
   };
-  amsaddr-77542 = {
+  amsaddr-77677 = {
     run = "1as4h1yn7jl205sl4nmnsspykahcd15bhza7g3gci65mm5l64bis";
     doc = "1nk229h070v2niknw6ya5zxfdw5xsbzr94345zq0z9xxjcyjkjha";
     source = "18cc6xhym40jf4z6v0kdc4ls0prdn6hranv60jq3crzpm8jckys7";
   };
-  amscdx-51532 = {
+  amscdx-77677 = {
     run = "0ncbf7ss4iwyjzp6lgzgzn3azy5iasl03565kgsm1pcbgprqibgy";
     doc = "0nfpbma3cawyy7gw6v0w81maz1jgicb2r4cm5gmlipzxwzl747if";
     source = "0jg2qk0a9y15hl4w753yhjff28w9wc2vbmd564lkikvg60b9yiqi";
   };
-  amscls-55378 = {
+  amscls-77677 = {
     run = "0k3di45cn0g6v5j7ccgl0nys6ni1h17dkhmkz5b5lsz4zzbi05fi";
     doc = "1lb1q967zwgqn21ix4gxbzw8a8649p9hky4ckd61l0bxxil3mhjd";
     source = "0g1i4nj0y32sihf7hnb8jwyh3d3qmff394xgw8v8x5jp8q0rh2bh";
@@ -432,7 +432,7 @@
   amscls-doc-46110 = {
     doc = "0allim05cp20zhn480df2mivd3p9gnc069d7hbjlzv660bw7mapx";
   };
-  amsfonts-61937 = {
+  amsfonts-77677 = {
     run = "0l3ypclhv5qdpcpy29xwda2m3cjfn5l996agas6yhpdr2m58q211";
     doc = "1v7chx5rvvqmcf7j35qi55wxwxkbfkbv34b15yrgn6bflniziicm";
     source = "064gndy9lnmsq2srw5hh97sbdk8gk0qv9zzki00ms3c6rzhd9sjl";
@@ -446,7 +446,7 @@
   amsldoc-vn-21855 = {
     doc = "1iz0zjn1v7izwbsq0zb6cvpnkbvk0nxw1b24j7dzqwk3m9j43i6x";
   };
-  amsmath-76708 = {
+  amsmath-78116 = {
     run = "1lc0y4mmxl4dflhnyxlm7vh2r1qmxl6w0flgnd3kdwcyc5c4scq8";
     doc = "1jdmwa9jv4dkl6i1hb43icnxg9a027gf5p30l50cagkchv1nxzqm";
     source = "0l6n9hhkci4ga93j81z80sxcgg5b5w2d99vbg5kvqifgca7gnxnx";
@@ -454,7 +454,7 @@
   amsmath-it-22930 = {
     doc = "0xcwsk8q9q3nsz8wbklgpbw0vzjw7iw0chffzcbp2zsk6rypqf7w";
   };
-  amsrefs-61937 = {
+  amsrefs-78116 = {
     run = "015spycf9ycxav8r046yn7lrc892nhkkrf1say1yy9karsji6dnw";
     doc = "11fc87kbdm440v4qyhxnv654mh0m6rpz42zji38qspcqj19rck71";
     source = "02q2x8zpwxkyrh9v7xqw35vdjx0b4fzz95xcv6vfjmynm8cpklxf";
@@ -466,7 +466,7 @@
   amsthdoc-it-45662 = {
     doc = "0ic88gs89m3d9ys40c4k7sgx6wy82c8isg2qkmd4snw5yms6fpaz";
   };
-  andika-64540 = {
+  andika-77677 = {
     run = "1bbqdw8r2l53q9870mnsyaiq0gfy1ac808qqmyrzqqz4ai41zzgg";
     doc = "0ajjaqdfxlvsmpr9bjmdkzwbdbz6ahxfw1sj1sw26r33npy0c5bs";
   };
@@ -492,7 +492,7 @@
     run = "0lqi4b3fkx9bijs2ddq479bkdf147rr7j4zwinygs2k1fh07yjma";
     doc = "10b54pcdjl4ca36wrqc1pcxa7vp02f1v5i05a40iawfc884wpcvq";
   };
-  anonchap-17049 = {
+  anonchap-77677 = {
     run = "0nz53v74sigvlb4dhgk5qcalw7nrc1vafbjx754j3gfyp2ilaf1j";
     doc = "06khbq6p3drxsbjwgkm1sd163f7nl8hc52pjsm55g2vknib5caa9";
   };
@@ -505,7 +505,7 @@
     doc = "0ijsn9cbkg1f29x0pj6a4p5d4q14rqrh2mjid57cb9qjhvgvqrm8";
     source = "0fl9sd9adhjx49hja3k4iy9pcx3hal0wjzxg10kjmi4j6qvz829s";
   };
-  answers-35032 = {
+  answers-77677 = {
     run = "18s0c7hdk5qnj3svni93m9lpj81dhla9v7nsmcgh0jabhwy8n3v2";
     doc = "02pfg28dz10w21ap4pi2csvy32pcvmp0baiciavp354ky4avjbdd";
     source = "0mcczai8da24jvmakc7glr2c56yhq2jv58y1xqv6ny9hg4ph8v61";
@@ -527,18 +527,18 @@
     doc = "1mrr1vqkyic5nyzyxkw7zq67yz4njx9x68cqr3vjd9d77qv85i00";
     source = "0s0dzmb00hqbp71nhl94w0ns1dqj5fmfqw63z789iihqznyxkii0";
   };
-  antt-18651 = {
+  antt-77677 = {
     run = "1clzmvpglsirsvm8nsc3m4dkz2va90877gmsrm7jfkhm62xv9mpi";
     doc = "0kpiba7awkrjr2rdgxilni1yi8p4ycmqyy09c1p9j1ld82idsjcm";
   };
   anufinalexam-26053 = {
     doc = "1v1k74vxidgxn5zzqz6v9zga468kcf7hwdrnvw44cd318221y396";
   };
-  anyfontsize-17050 = {
+  anyfontsize-78116 = {
     run = "08dnpzjajn0k6hrf12l1p3ncsqjiwafzssa205k2zgsz61m3sis6";
     doc = "0zmiklc2adbx5klyyjdivicd5j19i35b51ddm3nhfrcqrfvjrxwg";
   };
-  anysize-15878 = {
+  anysize-77677 = {
     run = "0kkjzsk03bvnap54gdf0i797zqq6bdz39yh4dn810l5hyfqxbhwc";
     doc = "15z3sa1zj1hbi7cy9q9wn4mcrf0pb3n39q2lhkx0ijhzaxn0rmvy";
   };
@@ -571,7 +571,7 @@
     doc = "0z8jfr76r9rvqanljhq0fnx5z2w59lxk2mc9if6z7kkid1m8qx8m";
     source = "0xx3yvjknqsk36mb336hlvvsldhmp21vblgzl2zccp347g5530z1";
   };
-  apacite-76790 = {
+  apacite-77677 = {
     run = "013769hi9alyizx08a0v1hbl03h5vkwi6a6ar3ghw8m6l445xb8m";
     doc = "0d49bmdiiriklmh99kavvm48zh29bgiw7zr5jbcwk5bw42qarlqa";
     source = "0hsrhw50sb8lphxib4jmjgplfrmy95m56a1phiac4kwxphlj9di2";
@@ -591,12 +591,12 @@
     run = "0qqm8np0jr2q3dyxapd49g35vk6ch3k9ar43yq740cfa7gs23ss7";
     doc = "1jjk8a2aif4f7gmbj5laph0q60xpb0yv26j22z4ay2p6yf6a4fy5";
   };
-  appendix-53718 = {
+  appendix-78116 = {
     run = "1xcnin7414mb1jvgs7f1x27zkl73sabmqb31i79n88gi245bp5lz";
     doc = "144hblxkrfp8g040yiw1k7nr3anqb80pd9c2g15m88gbb1xzyay7";
     source = "10gnkpwvm08zqwi83s4xiqshp93v5ai0qg22n7zcwgaq86mzs44w";
   };
-  appendixnumberbeamer-46317 = {
+  appendixnumberbeamer-77677 = {
     run = "198sc0fmnx7b31j2mgzjbjyjjfsn0imw2j8pkg8m0r2rlphqx72x";
     doc = "1b1rwcxrs8cm3zfadi9jpxgzcgai36rlnfragc9l5wcbdsaw1qp2";
   };
@@ -606,7 +606,7 @@
   apprends-latex-19306 = {
     doc = "1xzy7svb2xz6bdfg0f1r3whwda118pl7qdwygx1l7h4d1vqm2rcq";
   };
-  apptools-28400 = {
+  apptools-77677 = {
     run = "0b6yzpk2d79qg2irgfhns0w05i54z5z22ik5yyx4w6wg45v0j389";
     doc = "1n8ak9cw66780zkk384vpjkxm9j8f9dzlqzshy48q7hhprsg4p9a";
     source = "1ba08rixibjcpi420blw8a0v4c4zi2byll7dqlvwb7azqr6dz720";
@@ -616,7 +616,7 @@
     doc = "0v8m60a79d1m0z1lsi7grqa4dmmv8f2367w014krnr2m82drryba";
     source = "1x0l8d6z815i9m292wa39jify1jx6i6bbnzg20v7gd3f5358l9ay";
   };
-  arabi-44662 = {
+  arabi-77677 = {
     run = "0jmx0xsb3hz5i25mmqnxgg3bikyr1w26i3364cqrp50x9sqvkgfm";
     doc = "1yipdaiai9fbmrxkacqwnbibdiaa5vskzj40d1hxv6wnkxvj2qkw";
   };
@@ -628,7 +628,7 @@
     run = "0s7hnmz67hzfmfzc0mniiqfi6i8c8qzslbm92z1wc3a2hr38ihk2";
     doc = "1j5h788vsmrcag9bighp6kz6zx40ppjzwfa070ic140lqzz2b024";
   };
-  arabicfront-51474 = {
+  arabicfront-77677 = {
     run = "16426cyvrk461z9jb728w6glfm0ahss82kkq6fqkhajjc0cflhwi";
     doc = "0ck7nl7v6kvibiahh3szf3nbibwajg2pjwrbcz06frpfwhizsnp4";
   };
@@ -637,11 +637,11 @@
     doc = "1rfwl55la33ag9plqwssjvgq47mab2h7ljrw5w6l96vq965c2csa";
     source = "1g84xxm5fvp6dzdrkyxcjn4wlih0iydrdyxn93dffx1a9n1c3yyg";
   };
-  arabtex-64260 = {
+  arabtex-78116 = {
     run = "0xd2apd35zn1c4narj2gyla154nzd9ghhgc3fkk6y06d8dzgawv3";
     doc = "1zyyk778384mhma5q7ra75fwykk23i63q4jzamq4zard0y7gp4k0";
   };
-  arabxetex-38299 = {
+  arabxetex-77677 = {
     run = "15c8nmmv87x87dbjwm1q0acf7pbbh8w9gpiw77fs2i51gab592xy";
     doc = "1ns1y2lf87gspaablh4lm3kj33ggpfp7hcxbdv4vxf8hhfc4pp7d";
     source = "077r71723zlzfjmc471a8hbxs1v2g6j2xpiim3g2klxsj589bxfn";
@@ -674,7 +674,7 @@
     doc = "05wgq5pkzxg3vj9anlzjq1jvwj7b6wvsp7a02syca6n4qvy1v5a7";
     source = "0jnvkhhcqv7qgs4knwx1kz38x305a19kh13wn47zqlqn65991bpp";
   };
-  arev-15878 = {
+  arev-78116 = {
     run = "1nx33blp0nfqfmv2akj7w79qg1rhds40k7b58v5yvyrkx0hpn0hm";
     doc = "1vscwahxzdcb6879pbrxdlfpgapc0bia2fl3jwilrm1has0ffjz3";
     source = "1k524nfr5zb0nmhhq8dfaha4kv9f2ika192scllnn1bywhbpn2x5";
@@ -683,7 +683,7 @@
     run = "058lvkmdb849hpw4gn05jmv27145bsmb1f1fhpsgvcal29gdvnp2";
     doc = "0dyyamxg2b59nc2ndinqlcdfyid7c2dry8i87zdhfdw63wmbqv60";
   };
-  arimo-68950 = {
+  arimo-77677 = {
     run = "0idfg33qcggv0cmh1hzpvzz690yikpmi76xpfh19py168my01mnm";
     doc = "1yx6lp3w6s6zz31cd8hvhk4vdg2whzh62cdlhyglnb90a8hjyis4";
   };
@@ -720,12 +720,12 @@
     run = "13fql9q89zkdhid841hwxyrdbj6bd692lnc52d0yiibrd9gd9f4a";
     doc = "13cqb49296wzph7msrhpzswlyknvhrjaa81509l4j4mx1snxyk4b";
   };
-  arsenal-77099 = {
+  arsenal-77677 = {
     run = "1a3s53279i96sr1iizn1cwxcsqf0lbrgfdqsgd9ac26rasagz9j7";
     doc = "0zwac963sf8jkmkwjk1vy8x66npyip04chwf3bsjvykznc6yr80n";
     source = "0dlzva0zv6fv72vm1nqzsls6bibc4pnp11zlky47nn7sbdmgilcz";
   };
-  arsenal-math-77272 = {
+  arsenal-math-77677 = {
     run = "1v25h1c7hrkhgvq0nv0fq6kpqixjni6ikh68bqn2ii34bw08k3lq";
     doc = "0q6dqg7gsszrm0p0jn6wwrxkxjsf46vg3hxz1h3nykdb3cm9yy0a";
   };
@@ -738,7 +738,7 @@
     run = "0i9x668hjr2b6brdysl35rxgjji1zdsn6wbf21ql0xmn53frk4ic";
     doc = "0g4lpx8mra2qk9c1qwijilscq48n5n252m6s0hxfraj5rshrhc1j";
   };
-  arydshln-50084 = {
+  arydshln-77677 = {
     run = "1f2y02l7fkhrc005ib1s94z0yxgql2m515zy3mlx6ba4mqadh9c8";
     doc = "0xw13bdw67n2nsahi85bvh5p1xrd8fpb1aj79vss9zgdslzb6j4s";
     source = "1xhnh7jw0sxy6vkw31gcxyxg06dm7bgw0njsfkailbxgndwcp6zs";
@@ -763,12 +763,12 @@
   ascii-chart-20536 = {
     doc = "1m2x7iwz80plq6hbhp9xia6bp8wbi03iifs0pkr7ji3gn8hqgh1r";
   };
-  ascii-font-29989 = {
+  ascii-font-77677 = {
     run = "190ma5qhshn71vhsjzjb2gxb54qjabili5m9v98vwj173sdj9cjv";
     doc = "0nrnfvrcgwmv46x8f9ybk1gv6vgv8jgzhc8480fl7y17dii3jl9a";
     source = "0xcv04inym8230k2ljb16g4ajj73gggg13w6zkxxq8a1fa9lwrw7";
   };
-  asciilist-49060 = {
+  asciilist-77677 = {
     run = "0ni7182xwr3ns1dk8i75kf1cw9wpfagrf1y7w20hk8fpfymx2669";
     doc = "11gyi8mcqvfpn07f4cypv05f77vhzr44zn6y1idlbz4mgzjw3kp6";
     source = "07k13s9y5nvbp7w1ylyj3mlpn80682yhxgf27hz9aayk3hs77d58";
@@ -778,7 +778,7 @@
     doc = "0xzwc7kw7hqpcmisw5wm3n508n4zr4s207pizdhfm2q9mjij0jvr";
     source = "1rd5qmy9miximwv1n96h6djjmd3mdgn4b0955marf2k457bb71d2";
   };
-  askinclude-54725 = {
+  askinclude-77677 = {
     run = "0s1938harm9sgna3cggllpa1g85yl9jv2wy4b4c5v6fksiivxzs1";
     doc = "0gkbk6j2wv05kgfbjd4mqx5k7rc22bmqn47vk7pvr5z60dr4nay5";
     source = "067dpl3v0ipspfm5f2fmcmg5cb6lhqg6n8216id9j1blir1ys3mg";
@@ -787,11 +787,11 @@
     run = "1r6lk9szs7jm57b4hl9w4ngb9dqcsi6pvp37rcnwnznj5m2daj50";
     doc = "1ryw8yy59mfi13rrwgrfg5y5dy3cafz2a3f8zmq5fbl7zhbylq6p";
   };
-  asmeconf-77335 = {
+  asmeconf-77677 = {
     run = "0cqxkrlbkfsn1wgync3c3d3s8z8jy1ph9f1a8l99qgrm8z9mhncj";
     doc = "015ind6p8cnzw02b4d9lmbx6qdrwbkz7bgfdkih6di39ldzhxsfa";
   };
-  asmejour-76996 = {
+  asmejour-77677 = {
     run = "1rcrkgw31717scbqnvz1xdii32vd1fs0xpdlbv7rk0nhlrcvsaa6";
     doc = "10kakp7p2z8sazjfzmb51chggmgvjanqsj5wja17qia4sllldazl";
   };
@@ -799,9 +799,9 @@
     run = "17y22131b9nzzq1skfdyr7cfcq823nqn3ssqrbc3bglggdfibf2p";
     doc = "0mw7v1m9afyk462rjcimvwwikdpj0f4gjw5pbw2g9c60vbjhz61j";
   };
-  aspen-77554 = {
-    run = "031s16g2izrjfr874vf4174lksypa2l0rw4pdpqbp4aqm3cnciqr";
-    doc = "1cdrz60cz4p8l4ljb12gr6qrc8q80skpydapy8fjp4cpxp0w61a5";
+  aspen-78116 = {
+    run = "0a2xfzl0fnszb88qfiajw0ffac6ns9yg05l5gxnqrvk665vip8n9";
+    doc = "0iw22hz26pnzp3qkc65rbp9fvniqj9pmxljx7z8n6i1qrc5vdl31";
   };
   assignment-20431 = {
     run = "1nxgpadadzf3d30ydc9rndwm4v53s4v10a6sbqf6yfqds7ry13vz";
@@ -831,7 +831,7 @@
     doc = "03nby6d7cjczj3irqql5wpxs4fx9z77bb03lys5j1kg63ccq5msp";
     source = "1rzicq0w7byrxqvv8pympxkwq575zqs01s02z205azaqdgrzdhss";
   };
-  asymptote-75712 = {
+  asymptote-78222 = {
     run = "1l3i7kld11llmrv4hzwqf312p1hggrczx9497pb3hk21bdp8gnca";
     doc = "1g6p3s5p88pqfaryx269vzzph1kphl4kdx1y39g88vfxs8zc552d";
   };
@@ -853,12 +853,12 @@
     run = "0vcjxqa3gvsy7idm4x7kmashfw779g53xnqb9bxnc4gjri4jn47l";
     doc = "1andshmaxsrzql1yvmj2vf7p8wg9xnngniz25hn08likn3ww5ppg";
   };
-  atbegshi-53051 = {
+  atbegshi-77677 = {
     run = "00r3ayn5qa2p2j4hyxbp2mm1aqhbkjpwk15gan1b4szmm2wk54h5";
     doc = "1pjfmnrssaw20sdq801x9jb9qh7s8l2mnhcvla4bxglckgwz2na9";
     source = "0b0sxs3jpc6a9pw1z44iv2bwvyxm02yfl8j0mc5qw0asdp773vrg";
   };
-  atenddvi-56922 = {
+  atenddvi-78116 = {
     run = "1lw42kgkviwh5gl0fnc4kp8x578bss6fj4d3jqp3jh0iqj53wwf4";
     doc = "1f4210s4llsbgnnf6s91j7gpdajclscnqlkrmrsmiphhvgjihcws";
     source = "11sxy0c5vmbf17w1h46dc033lisp4aa8sjqfi1zdzlp7ha4c6rr3";
@@ -868,21 +868,21 @@
     doc = "15s783gvnj5vd7vhgvzvvxpszsy065x20ag5i3kmhd20rdm8sy6y";
     source = "1j1z580b9v2w8b1zqjan8fi5smnyyagnhak262cx5fi212dzivnl";
   };
-  atkinson-77391 = {
+  atkinson-77677 = {
     run = "1ng3fl191ccw4nk25bmcazjfgn35s07bsskdfhsy7g2h8qc61ps0";
     doc = "07dy6hkc9akh1gz8giddyy5gcgx8ykjybw9hb9fm8pkgpkb87sz9";
   };
-  attachfile-42099 = {
+  attachfile-77677 = {
     run = "0akvm9al5rz67b81bsl0k92gjqwxjrd6dwxj9qmwrb9c6pd311n8";
     doc = "169kh9zrf5ykal633zn8n3i41dqbyv7jdrm905a7q47icvd4ar03";
     source = "1b9s69vvclpvdm02gi9x7zv5mf77q68xv7zd784cldns8h1a553l";
   };
-  attachfile2-69505 = {
+  attachfile2-77677 = {
     run = "0gljjngawrnb2825490clcvj84gx0vlxk3g7i6qxnrafbzx4b8g3";
     doc = "0kcn77x16pa0kchcygviy3if7qqzqx5w6qq3p91b3zz39cxcxn09";
     source = "0rhh83mjva074c3q2rqjc67r6z1any4ffxkd1y0mbhx879j9wn78";
   };
-  atveryend-72507 = {
+  atveryend-77677 = {
     run = "06zl4zrn1s6bvpwnv1is8xybf0zxbnb3glpxnzsfp82wz54s0qgg";
     doc = "00088v6hh2ya70bqsgns6p5pj3qs2kflshh9l648i46clifza336";
     source = "0swycq2cmvaxhz052k5ppd2ip1vbhba429nyg9idi50y19qs3hkq";
@@ -900,7 +900,7 @@
     doc = "1dw0gbhk3hwfapdzysf12kz5g3dfsr5pxpnga9s1ksqicck26b5w";
     source = "1gyilj1ldx6c5lfn8vrzsbss4gl77grr2mw4v6xhimv2vsyp29a1";
   };
-  aurical-15878 = {
+  aurical-77677 = {
     run = "1ffl7fji5r74k80hl3d62qj7f0h439jb7zmsv4f21w7b6cfyj74i";
     doc = "0l19hfh5g2dc3digkbjvrh90h3vwx6zsbadjl7zzzlnhsaq44nlf";
   };
@@ -916,7 +916,7 @@
     run = "14ffdgwdylqvipsgchwamqf323i5y29mnj90q0z1fsl2i6n7lcjd";
     doc = "1k0935fly37rn6zadn9b96r4kf2krnlx3bmqnzfb0qyq5fld60j0";
   };
-  authordate-76790 = {
+  authordate-77677 = {
     run = "0caz9s2ra7qqlzdnahhv50z050iyp62ypyrfpbj1p9ih7zmcdg23";
     doc = "14wxjyrighkhg51m9jpdyjdwz2ipz4zr1rfgmdnxbpg31rbg2x7s";
   };
@@ -924,16 +924,16 @@
     run = "0dhdd84hdf4iz67acyarzf0asb7c8dmp09s286rq0ylgn7lb9xx6";
     doc = "0hhffkmldhhm46xi8d1bvjp5v15cg5kid383g7s1dbjxqyd9vbvd";
   };
-  auto-pst-pdf-56596 = {
+  auto-pst-pdf-77677 = {
     run = "0f212m856rdfzflq1bw3vfpy38d8qylaa3vqnfs595h3x5r0dsx3";
     doc = "1f7kj4rga7x14w8v3cjn7lh95inliy2ms0q9vnfnv95jvp5a7kh8";
     source = "10l3ld4jvpg1982f2a80ssl4hkdzi9szxv3y8l1i13pdfdhirv91";
   };
-  auto-pst-pdf-lua-66637 = {
+  auto-pst-pdf-lua-77677 = {
     run = "0h17431shl7g0hza9vf20v86vfpy7w9wdyc09ir3s0mi5izhh4hq";
     doc = "07bpl01v2f14csvqqvyvjja79z3x34q6mkb6qck44s66ii5dld0h";
   };
-  autoaligne-66655 = {
+  autoaligne-77677 = {
     run = "1y4xlxgcj82g3cvy23wyacm91kx1fnc8b9y0r8vhf6pwvj4fk6h1";
     doc = "0srhzzycrh9awp39cgfqzc3z12vxj33qgbnpprx06y6bx94956wv";
   };
@@ -941,7 +941,7 @@
     run = "07fi6gdnl9srrhmj5v28kfvjs3skf8g693hbdrfzjkyw76iji46x";
     doc = "1nyrgpvkj2bplf0psd66mcrhz5j4bggvdmr93p77ix4vb2fgh239";
   };
-  autobreak-43337 = {
+  autobreak-77677 = {
     run = "0dzr4wbwy018f97kzmfvza9i7m9mbpn97mjzi336sgq440v01hrd";
     doc = "099vqvdh2djk7fm6y4x5m7cma71b2anpqkc3lfzjazpv15kpnlq6";
     source = "03kqdrwznx3k65nf5z3p2z6d80rki7w4v5lhdfk8rin3112gn68r";
@@ -954,7 +954,7 @@
     run = "0jqsvxn561fwz44gd0rwxyjwh1nanpmfsvd3kslw87h54hzlizf0";
     doc = "1w428b0wyxf0v7bf1yr9dfm4x8q3xas9fgv1q9sxbhgri8daj8px";
   };
-  autonum-36084 = {
+  autonum-77677 = {
     run = "0y1x4j7fyssmhlqf9974yprqxvplxihbs879qiwa13x0zmwhnp55";
     doc = "1a73xg2csfq051lnjnxkplnpfvl9vhfm05qvgxz4i79qmgs7a3b6";
     source = "1q58d514bdm0mbqkmyngxh0nzzg7kxxc0z7bllnlkqb99h3x3xb4";
@@ -975,7 +975,7 @@
     run = "1mvy4szbj2bms7wsbxk5abaw41zi97lk21k8j59z1dkrrbzzq69z";
     doc = "1s3c3zpl88rlcxrlmbmpgl4f6dyyryfs7gy9pkm3q2ayva3d4bwr";
   };
-  auxhook-53173 = {
+  auxhook-77677 = {
     run = "0c92za082vzi47m5dlwq8bss4jjgfzmbbaaz5j1yb4ngli9qj08y";
     doc = "0l6xga3hr1lvhgli259ma78rq394jplnkn5j8fgrfapvzrhsh2kp";
     source = "18q0lawz00fbv9mgcbp21zk6fm1hsprmrkvhnl34ac1qj1rx6x3p";
@@ -996,12 +996,12 @@
     run = "0bjnvgqj4g1i6djzzzdjdrnlvli3dm1v2w2mi59s5s8pyc5pag60";
     doc = "1m1cjic1dqf2zvym1ma83xy66b5irqma2fb6fy0qnl31f9bfg6x2";
   };
-  axessibility-57105 = {
+  axessibility-77677 = {
     run = "001z3ra1zgsrvhlnvg9lmvc56s72b3kip71c1cnpl6qzqcc2y6s1";
     doc = "0s77mr42dli8vfc9h6gslq5g103rp5vk94hx9cw3w3shxazib73r";
     source = "1bh92wig3grw2bkkdd3fxwlky7rrfabzis1rwwdzgk3bmmrl9554";
   };
-  axodraw2-74430 = {
+  axodraw2-77677 = {
     run = "0dcls4qqm7pl0iyg7mkflqa2rd86wsafshx41xlg62din6fmybwa";
     doc = "1l1kwxd8zq5xxhw7zyig0b8nna4fwr6615h4jjwpywcaqsnms6if";
   };
@@ -1010,12 +1010,12 @@
     doc = "0sdr25vv9svm3r6yqyalqza4awr8k26g7fmh8078bbxkddycchkm";
     source = "0mbzrasvppl17965dmkp2f9cbi03539p83989d40kl5p11ih6dgy";
   };
-  babel-77491 = {
-    run = "16r7v96gynykizshsqbmj1qhlbzscjazycy69slhp38ig2algw6k";
-    doc = "0cgg3zgc3gfhflf3klnddrlvb341mg3mbdgrwkzsk6sgvaair0mx";
-    source = "09zpkg02ddcm10w8kmy0irirzfx1r1ql6kv8n4aa2flfba6daxdb";
+  babel-77821 = {
+    run = "17044n27d2a11zw41y1baq0klz33199vpnipqd6lfkmnz0vbl2q3";
+    doc = "13x1rjmwwpmf4ikbcb9vlz3hmyrxvc8bskv5a15bn926f1z4ridk";
+    source = "1krbk5jv5wpycrlxk4bqvad5aai4y1r30cylxi9b3809clv8vqxv";
   };
-  babel-albanian-57005 = {
+  babel-albanian-77677 = {
     run = "170mxpwnnsc1g9s7qnlhjcryw79cy72d8c4m8bhr36i5c78my0zg";
     doc = "0x5z4gfi6m9h5gml6wxq3531i1k0sfqrd4hxrzbz68ijzyjnzk5j";
     source = "1w8bassqn35bxyhpw6cg65ya64x1dn9h35p4fxclcjjhmv53xgg8";
@@ -1025,7 +1025,7 @@
     doc = "0dncpgvjqqa41rk80n6wif8nzdqw7vkxp2056l6sblzxgh87fvz0";
     source = "176r483598gd2dfmfc2qhmknj913n3k6rk58mpfq69af72jq5rjw";
   };
-  babel-basque-30256 = {
+  babel-basque-77677 = {
     run = "11a26db60bwfhbx6zj42yrzzvf8nn8a96nq5mpw29xhxlpbhrcp0";
     doc = "04jf1brw3ljipdyxv3d001slc0iggjmq6hkr4b5jsa3z8gcivzvw";
     source = "17mz3bqi50ayia4nb2ikf60vgpnwl3i90gfbaq4692y354yvlnfy";
@@ -1035,7 +1035,7 @@
     doc = "08lb1909wm2r4psppcbn1sf3zg4a8qp5y4i0b6kksfp0n7v1nckn";
     source = "018jayyq2mzb89l60h7f9vzx2zgy2skklbqqx9zs3krg23xy2i6g";
   };
-  babel-bosnian-38174 = {
+  babel-bosnian-77677 = {
     run = "1q9nplgxfyv877y5q5hm4g6i5dla5c3a9s5cax27pr1riccgh5dh";
     doc = "127g44ww87gaizsak6lbmbr9yhjhy8k32zkah3189yi21w7ncs4q";
     source = "0mlllv7k35vyqpa9r4yz6y23cgfarqbyk47blfc5b3dill1imx6b";
@@ -1055,7 +1055,7 @@
     doc = "06lb6gkmidlps7vs7ihqg94jqnpxyih2dkypbr0j46whs5nb80cv";
     source = "0l4c6wxszawd0a7dd7fpljkngmmh1p7i7imyhgfsjyli6fpxmah0";
   };
-  babel-croatian-35198 = {
+  babel-croatian-77677 = {
     run = "1d6xi12v3qr7gsknkfcb77q0wx5hyqpp0cyqq1spq44yf507nnlk";
     doc = "1h15dzgmm5230ypaznk44607naj611n0mrhp9mjabjdqbsb71qdb";
     source = "05zhbrvq0iwg7vbccq59rx2yfbaznixgr5nfh37k3584iwaqipwi";
@@ -1065,22 +1065,22 @@
     doc = "1hvp785ly718fd1f0ig092rldcqglpb3mrygarww5bnl6fpp2ffm";
     source = "1274pzgdya7gkvxjmdm3v5rb7hc0sj6mqn9pd8y9418yx5449spg";
   };
-  babel-danish-57642 = {
+  babel-danish-77677 = {
     run = "1q5gl9dxl5qky0g263yfa4gwb992ngd7vwsb24cw9fd513j50b9h";
     doc = "1xmp93khcz4my2i1wrnzcb13bnxd9mnjm50s2jhbh8qaiywls7m7";
     source = "00dryb078fqckqjnxa2riq478j6d5i28j5cclv4bw7dn5naa3lz7";
   };
-  babel-dutch-60362 = {
+  babel-dutch-77677 = {
     run = "195d71rs9raadkqb0c1v3i5pm8aw37gxfnk7c6ic59ib0fvgs9j0";
     doc = "193gln8qydvjwsj8pwayfv87zyg3wja99izbf4l7gvhh3b54jwjg";
     source = "1mvmis59s94j1p98nqp07paxzviq6sgnqjwda7w63j4fnhhsqc3k";
   };
-  babel-english-70799 = {
+  babel-english-77677 = {
     run = "1nb3c0yikcfhlpfsqgx2c6549ra7wcbcjs614d7gvk5fyh0cds8y";
     doc = "0jfjdsiqkg0sfy326nz6rncq9sk1ssjzb0w2frybkp348gif3rv4";
     source = "1q9bgs6mdgjlg3pv2ddrwbnfb628dr6rhdsgkf7rnwm5m6ncxkxh";
   };
-  babel-esperanto-75781 = {
+  babel-esperanto-77677 = {
     run = "0sk18pg1yp0av899a4yj2ll92a1s81xi3qrq1ndws0g2g8gbi30h";
     doc = "0n5bbv4iacrh2n13zsh8c6s0ad0b4kqjgnk367s6k6dvgd47sg4y";
     source = "16cnkvr5d59i4ixhjffr5vx7ikf3k0qiv2mk4cxm012sik93002f";
@@ -1090,17 +1090,17 @@
     doc = "1nmjvvms0zijpc15rs0fkzli3pmidc4v4kzfp9sswvh43622p1b1";
     source = "0x2a379m1b1ll16dr62dg5ai353p362dw9js4n0dn3x2wjbndmzg";
   };
-  babel-finnish-57643 = {
+  babel-finnish-77677 = {
     run = "1z49ix8w96walkq5p915amii7n73ahzhy4ijxa1b2bb0wzz4b1l7";
     doc = "00aij1bdybgcg69995mjrdddzlr3hqbhmg8q9nq86cd29y1gx029";
     source = "1930zxk4l6k5q4wcbvpvijv4s0gxp2mkxvblczn4gcbar10vfd4x";
   };
-  babel-french-76067 = {
+  babel-french-77677 = {
     run = "1hrxs06v1dm4j8b7a6jikjyn95dzknliscbjq0xggryrjawm6i5a";
     doc = "0rapk3ssmw9k1fqyjq8fgrya8fpanx17x9jfidnn5difwiy7byc2";
     source = "10f5ryi509hjh44x5ha7x7phq77qbcigxjw8fz3pmkyk80jyk73y";
   };
-  babel-friulan-39861 = {
+  babel-friulan-77677 = {
     run = "0gfq4gyi720kp45vcbial0yrn9i2jyx1lzh39lci0ga77y01j3mp";
     doc = "0hnj5scfsvisf9k6iwh4awzqccm96apxrbwzlknpxn7x3zv93l0k";
     source = "09bzwmc1jnal4ikxciwas8y342rix0xksd7qcp39nwajyg8njdmc";
@@ -1114,41 +1114,41 @@
     run = "1mdsi9mq6ka6ahrgnasik0sxkhq97qa223q5iy4fkfccan30kb07";
     doc = "1iw1hbn5i0c7xhvcmap4hgiaar9rznr76h2mrgya8xj0czppxwv0";
   };
-  babel-german-77543 = {
-    run = "1dlml56bgz80gcxd7sdh7am7nvswsgslaw5kawxy3351zh5pkcqb";
-    doc = "00rfr0yyzpahvri0f0j29l1l6kvy16lg8i1mr1p330afb4d2xwdp";
-    source = "1dvxzw2q5sh96jpcacfdqj664l1dmln5fb579ipzw2xs8cwc0l3a";
+  babel-german-77819 = {
+    run = "117gx8lb42mmrcc5ny5g1m1xjgwl7w499hmmf897b0fyga2kw0gs";
+    doc = "1l5j8cy5373bx58w2n7li03liaxfkvjhgmq92c7d1dk2lmg3pqmc";
+    source = "0sb0pywycnffn6pp50dfqh36skpvb1kpgklwkn6vrcswgdjn4ihy";
   };
-  babel-greek-68532 = {
+  babel-greek-78116 = {
     run = "1gii2nbgnixdysn2li0xw5acsvimq2r04rpkyhy16hnz50cm4shz";
     doc = "07l23ycdm79ci76zkfijpdz5mlcgd8qcbq5s4rl041c8d4nnfi5n";
     source = "17n58ldkgsqadbd1agsaf0bwv0pg73ybfql5bkw3ky9k9ck9z24c";
   };
-  babel-hebrew-68016 = {
-    run = "112c7lk1xihspknd146hgp9nbc7wfxz36d3b887f6q0mq6hf03qq";
-    doc = "0w80r70w90szg4rlzzj2132yfx8wbhxranq8zk49far863sn658i";
-    source = "1srid6v4s1r5w02148wgfzhs9jmmwzj23fhx9zn606rxxkgakajf";
+  babel-hebrew-77921 = {
+    run = "0my2818vhldzsv2czbd607qcx7q7chil16081jwvqppb8hv3rapj";
+    doc = "038gw1hw347vpjax93zd48j29ywfq75x3i091spvn3n0s9q5kn9g";
+    source = "08s388aw5g1shqbybyk9lmq7jpzc3pjbjzlg0zaf0qhdfwalmy69";
   };
-  babel-hungarian-75084 = {
-    run = "0z359a1flgpl24vm1bpp06c8m7mghqwik3svw37sc62jkgx3nxam";
-    doc = "0my3iryx5dg2a41h1hn8dxx5pqvvnnk63msis94kfjb3friaix85";
+  babel-hungarian-77586 = {
+    run = "032kzwmv58yc84n2pyq7ai2aaijxqps8xl5k600hhm17qg2v5zra";
+    doc = "1ik9f3njymqnv6mdlpsn38ddg9mdwg14i9kmp2zcfcw6w7qq92r6";
   };
   babel-icelandic-51551 = {
     run = "12v78k2l9vmc07mx0wy8g0mjwryp1jf6ij06502h7jr55my6y5s5";
     doc = "1mbgan8gv7hld0jym7qks13yph9lz0clkgpb199x3cdxmbvawpb7";
     source = "09wz6pfk3vb4c0az1lgq35vmzf8v49iz9cd1ys7rhdssbcz6flv3";
   };
-  babel-indonesian-75372 = {
+  babel-indonesian-77677 = {
     run = "0jwin5lvpqx3118ijlm86zzg6cx8bqxgykfcqwmvh5j773cs94sw";
     doc = "1slxjb0lqkfflpssb48zmpy1djfph1fahr90yyhpx3qg0lz2iljl";
     source = "1wk6cw50h7mlq5rc00ab0v6mw0241gq87fibdryn7xqfl260swzl";
   };
-  babel-interlingua-30276 = {
+  babel-interlingua-77677 = {
     run = "0zbyfhfs222i1wdsfbik33m1asdaa71rg700s9vfbvfdvjcikciv";
     doc = "1z7j47zmp5y3406da831kwxqq30mgxh2wwxsrkdjycnsswsywgv7";
     source = "1y3xsscz9zxaih3752sk6jhh77ljnllmikiwgqb3xsvzj7b5fs8v";
   };
-  babel-irish-30277 = {
+  babel-irish-77677 = {
     run = "0ih96jfa66jn1s8c3dpr0631pa17r9sch1lv1qqwpmsridp8dl8q";
     doc = "19k6gps25d8i28vcpbp59k47mxdzjn9d89amccr5si5hvg1c2qnp";
     source = "043ias6pyv22g8ywv5krlzj5ma98wpi0r44lmi4gfpqllkay5g1a";
@@ -1188,12 +1188,12 @@
     doc = "0nsvnmjx8397xb02h2l00nd7ynz11f9qiqrpim2f18r55qmr0hb3";
     source = "08z4ca7kja5kb2azf3whgh0w7fabxs3jcijihm0vnzhb1809napi";
   };
-  babel-malay-43234 = {
+  babel-malay-77677 = {
     run = "1h4n9m38s560iw86cr88xzflizkd37nhgyl51xvniyvkz6nkhrxr";
     doc = "0c0jriwwkrll6sknd1c90bhipcjr3inc7vdn6cd2szlbx72ir12a";
     source = "0r1gzyi40yx8ikxkrdqa1hg33vciz1qbvibd8dv3qbia7mm11hqv";
   };
-  babel-norsk-70691 = {
+  babel-norsk-77677 = {
     run = "0r62x250jy9c3nvq96z98f6fnlcfn3xlwy20d83fdnfwhz2zys5r";
     doc = "13n49sahq5swa4s3r10rc1jjm99h1lncig0nxy7d3iaq3xh7vlqz";
     source = "1m9jxi843dib2xwjgnkxr6yjx49fyscd8qhizwyid46gsrr4yvdi";
@@ -1208,22 +1208,22 @@
     doc = "0c6ql4g2i43zxx2ffnvg2rwac5hshvwngj7999g371fndhfzs31n";
     source = "1xqfd8s659plyijsc13014zjhd9ndpi82jwgd597lw5d9jzwxf6a";
   };
-  babel-polish-62680 = {
+  babel-polish-77677 = {
     run = "1n1cz0jixlyw2zbcgz2ik03s5qarsh4bl12krsqjk2knqk1r456n";
     doc = "1yydj18aiaa90n7g7c6widczi5kpslhcy3l1bxnq1dpx0g8wi94p";
     source = "0wjkcbs2ghwg8x6mp6blihfrygc4ssy7nb1adj4vz3wx63li5j04";
   };
-  babel-portuges-77468 = {
+  babel-portuges-77677 = {
     run = "0vmzzzbvz58v3l981bj20ydnkahx1v0syhnk9z9y8cgs1bvvln5i";
     doc = "12dx0bcvi7cagcqjalpdihkid0gif78g7p3qkb8m3l91zc975cag";
     source = "1f65nvcia5zisy3fwwg4bppp67w2hk281vp1s7bvnyc5jbc9dzwk";
   };
-  babel-romanian-58776 = {
+  babel-romanian-77677 = {
     run = "0pmjpy2p30299a10njvnpl954kdazir149b3aggcljaq0j4zdnzz";
     doc = "1wgimmy2vwg66kjm0kx0lcx3zvvhdczxc19nnwqfbwchbpfhflyb";
     source = "1qq1j0hb6vp8cdiigc425m6k8wpf7rxzdcgq14p064xlxnmqrbp1";
   };
-  babel-romansh-30286 = {
+  babel-romansh-77677 = {
     run = "1hh4ashx2fban828gj37y46rm0q7w2j18785in1fwpir3cjcab8b";
     doc = "0w4x7c9vws6k799ilw2w1p5d4qv2z9wb3bkaixb0p4gxmp6khamb";
     source = "08v3db9g43pviw7fi87gcgj5xb5b2f07sll1slcvy94ffnmwlpww";
@@ -1233,12 +1233,12 @@
     doc = "1bs2q9xxqyjvpqxr3zfbmk0lkf58jg1ksi5a9mp07vznzplz01i2";
     source = "12ik2dwkih2g0gqpbg83j0kcfwsb5grccx27grgi0wjazk0nicq6";
   };
-  babel-samin-69604 = {
+  babel-samin-77677 = {
     run = "0sm3288n25a5fvz05h5n39vvbpfp3kzwsw23qc3ijxj68y6xfbyq";
     doc = "15v9732002svqd2s63wxf00wsn390xh683v0kzi7fyw5xnh8s9yv";
     source = "16i3icn2kbkpyhij67mqdnqrx64jcjg75gkyrjgqj8kdg9kysx6q";
   };
-  babel-scottish-69610 = {
+  babel-scottish-77677 = {
     run = "17xqq3526a7f0xkzdyp8phvf3a39b0pxzsxvxjm84b4yh28yfhyg";
     doc = "07krdfp181jhc7vn3w15qny38vnhhbkkmygdkh0kv6xdycd9096d";
     source = "0i26k9qlpv0qgzkxjs87k9ph91gbkqnm2w2wiyqaai77adp15dlp";
@@ -1258,22 +1258,22 @@
     doc = "15v2hdmpbivcdwrm3mlyb3bb3p1298swq7vwxqb9b5ylv8907sd9";
     source = "1k4w34wq8n06ck9z81wa490fy52a1dcgi98pcvdmfggkalwr7ml2";
   };
-  babel-slovenian-75181 = {
+  babel-slovenian-77677 = {
     run = "0zqa2jdw3xw6s4mhf2ip3d89hsq00gibb2rdnk9vnwd6ivkipy7b";
     doc = "080i6nq4v6sp8s9xf8353a0y28vgchm0hl1py7mfvc18s0rw6ksp";
     source = "1ycx9lyc51s1hi59n8n2anlad8307aqkr6nb9b90zjpi05gq1swf";
   };
-  babel-sorbian-60975 = {
+  babel-sorbian-77677 = {
     run = "1g2m2ydy6rlb6bv1p3myfwnyr8kk1l7jpq60m655x8hqk32119fv";
     doc = "010v5sxqjx15nvgsycacx0lwf4py7frqppr897a89wzmj0fv4svd";
     source = "06vyg6dh3yxqmvy02ps4b5kgxlcg1225llc6mqbrnwm54548xwrr";
   };
-  babel-spanish-59367 = {
+  babel-spanish-77677 = {
     run = "1d38lmr5wiv03w6hzpfzyq2pdl845mcx0db5wcvwm6132vmnh6dp";
     doc = "1wphssp001lg7blrv6wh11ppv5c18pan2kb49s8s94w2jh4jmwy6";
     source = "0vgyqldgji8fraj5c7na6zplip4c6bc41x346rvzjj3l76q6xzvd";
   };
-  babel-swedish-57647 = {
+  babel-swedish-77677 = {
     run = "0h6p32rjvsqzy8kdhr0f1zi301xnrsvb8l9k7g6gfwv26fpdcnzr";
     doc = "11kshqcqn2187q8h1hc7ifjnf8cz774wdnd9m2ncfvhf52h2l6mj";
     source = "03rp4n9wkqyckman765r8v8j2pg5fg9frbfxsnhq0i2mr0yhbr6v";
@@ -1298,7 +1298,7 @@
     doc = "12cj6335qj5igap6hff1qrfz4ms4s94xv7vlwdcv1hs5gabqylaw";
     source = "1xdkjigwmmkbihczgd0hawszzmnn3j7fypsv3sx634ham8j02zzx";
   };
-  babel-welsh-73855 = {
+  babel-welsh-77677 = {
     run = "13s553ww42ywh2i716hqskrvqprr3q0dr8vs9qr7an038la6p0il";
     doc = "0kl9fchd4sm0g83bdry7p4sw88y66bgjy7y1y3kw3kwhcnbri9km";
     source = "1f16n7065aigld88v5wfx0m2wjpmxjn5cb9l57mlrw8b0mwgai47";
@@ -1368,7 +1368,7 @@
     run = "0qil0n2f1qcz2yrnb6g6w0g6ankwpb76hjybsn12ij75ihbiy9m7";
     doc = "0sknnb78wbiysvz537i8cay2la499y6xnvn5q5xb5my5pxadjwdq";
   };
-  bartel-chess-fonts-20619 = {
+  bartel-chess-fonts-78116 = {
     run = "0xd51ighrn01kwb4n20dsvrjhh7a0y31py2mfl1dq34v8l6yvn9l";
     doc = "1sjwli00iffizzwaiszwyd42aya7c4vz5as8k21lmk054x9afjpc";
   };
@@ -1381,7 +1381,7 @@
     doc = "0qm4qnxp3n42zvkxyzanl4psiph9z9dxz5b2i32fpn7p3jhn2qh4";
     source = "1my6sp0mvbmpn2bakr93qwasqh7rwmzy8lhl608lssnxk33h8x8j";
   };
-  baskervaldadf-72484 = {
+  baskervaldadf-77677 = {
     run = "1vcmjbsf51jb52iqhnqx7bz5v74zxipli8ncdv8qc8h39p3r3f56";
     doc = "0b5hrc16djjn9qp3ws1isbh5fw9arj052wzgs1h3jfmsrkzf3rdm";
     source = "1mfpcrmhfjbmjmpzlp59qaav7d0wi1afpd39h4w3l17yy58ln0cm";
@@ -1390,7 +1390,7 @@
     run = "0hw6cgp15y3ak8qk6hxajx6d3f90z6f72vc60xv2c4b44d5q1p1g";
     doc = "182lj71x8rcfv15psyjnagq53zc8mvkm9k8vkslihhlqffk6nx02";
   };
-  baskervillef-73381 = {
+  baskervillef-77677 = {
     run = "128l3wc3vav5fc35dnnqs53d0r8yp9rr9q4ibj2nflfd26dymmnj";
     doc = "1965s7cw4qjvf00z6cnf31wdv5h5x90z55qhlrm928pnw7an8ma8";
   };
@@ -1413,12 +1413,12 @@
     run = "0snfsyslxnz84a6lgwi21rg0f5vbs6h8yfyywih18vmlbjpba3zx";
     doc = "0rbx7mpns7pgidx3g5pi0r7d638lwykjw0inpldb5g3dz1ipnpvc";
   };
-  bbding-17186 = {
+  bbding-77677 = {
     run = "17na9lw0yaqn7i5dnlvbfg2yn74j8kr4w526z10bzp4kpynnpnlp";
     doc = "0pg135sdbs1zbsyv1cp69akk7kazr5937ysik38dyhhc8f7vj49d";
     source = "1kgz94yy0gm19x59vh24f9zv95gy53ayc1906r28s067mknmc46q";
   };
-  bbm-15878 = {
+  bbm-77677 = {
     run = "1l1yyiqy3izbzbrpz55dgd46szkj55g8wkjr5xh7g3jc59y5kq13";
     doc = "053jc17hvq8vphm6jqr929hf45xkb3rk7yplq4i55x57vkf8bvdq";
   };
@@ -1427,7 +1427,7 @@
     doc = "0pxrzpbwpfzk9jhb544zmya41vzdzyn0s5dcyynajnf8lii3kivr";
     source = "0wc6wf1qi6kxbd5a30n926gkagyjsk7mji9g9nzv3jwrshqihspw";
   };
-  bbold-17187 = {
+  bbold-77677 = {
     run = "14dz70qh8kawzlb1h8lrm0a4dpqkn9b03czd51s74z01a3cdmn7z";
     doc = "0pfrhps4yirpg244lcpf10ilz53714ic1fvpk3nkp2ihjbaxbzy1";
     source = "0qhfqg6kynfq6jzx93mili9kpgikq39wmlhgiav3bdzqhp6v0q3a";
@@ -1436,7 +1436,7 @@
     run = "0zvkzp43awkf5vbnrvhibkw185zg7h1rcfqav38z720cls2vgd7w";
     doc = "1dj0vqnhmk8n383y426ma1y89r8y69y1lc2vkg58gaffjfrpxwxs";
   };
-  bboldx-65424 = {
+  bboldx-77677 = {
     run = "0r6ds8wkf1qrv4mank08pzkwz4qk2pfyb6pvqazbf4jn4a46bjcl";
     doc = "1b79xnpss9s1c7lmqlpznk4vvxzgp7dd248ipkq6n4dlpv0s2y4n";
   };
@@ -1444,11 +1444,11 @@
     run = "0knv4byfxfalyhmsqiq4wjcin0q0hyj9gs7f167cddjyzcg4z23i";
     doc = "0zyiw3f37i3shf8ihhzxagvzwnsdaymbkpcizdm2ryziglahh1jy";
   };
-  bclogo-69578 = {
+  bclogo-77677 = {
     run = "1rx0z4f23l22vs9lk246kff3cqznp7rzc2k6xn0nwphqxfap6965";
     doc = "0xcq3ypmsjzbkxivak1j48mzmiixxfgf6v5fnwk22z09c5x67j6i";
   };
-  beamer-77450 = {
+  beamer-78116 = {
     run = "0f0b63shgp6340n72c1as5fsvfsp9f24j9n70318q8zyslcyvbw7";
     doc = "1xkch1vdy7vw61bzfyz0hqcg145312a5cn2hvch4wwiqfgj47gp8";
   };
@@ -1456,10 +1456,10 @@
     run = "0w4asfzmjrzqqc8dsan461fvmkjn21181lij46rhissz273d9vph";
     doc = "0hw0cp32k2gqv9y1ai733sj8f08hdn3pj60qh2ykmcqg818q4clv";
   };
-  beamer-reveal-77553 = {
-    run = "028riy73cf64ymzvklncwnmz1d492ljk07r96z07sqw76zrlmy3y";
-    doc = "0nwns1qgnj4pbrs455q0kfb7byvsn6sb67dgmy4bqqv5nfsx52xq";
-    source = "082qaad2104z07x0mx8lqg8dx0rac1ska8wbvpfjp2y2859yzjl9";
+  beamer-reveal-77678 = {
+    run = "158nx29xkgk313x76jj9w993qwlplf9bwbkw3fyhw15aiskdc3lh";
+    doc = "0nhywn9zmjqf7ww15cz8b00ldydzaacvkcnzhx3cxl1yh0s3k3h4";
+    source = "15367f88zyn0j8cbl4xpacyjpmc6mw1pbnj9jiyjpv0wbz9px93z";
   };
   beamer-rl-76587 = {
     run = "0hfyqknivxbxll0s48by8qdcsc9csq7w6xwrp826q6lqmf82lnl2";
@@ -1507,7 +1507,7 @@
     run = "07zg346brdpckcfr1vnmvqcahjmp87cb2sizvyx4jvxv19qqwpkb";
     doc = "08zkfvjvrjh8wffv7qjqmv6p0997kriz6lxz06dnsp7l5j3p675j";
   };
-  beamerposter-54512 = {
+  beamerposter-77677 = {
     run = "19h0zh583chawpzm59xv7243vzkz597df68yy0zmn3r6ha8k0qz7";
     doc = "0xspyywk813ndrd5xps7fxwggkmdl078fmn1cvxfx3cxpnmdf822";
   };
@@ -1546,6 +1546,10 @@
     run = "149ya5raar4xfkb910lk85pqpm6mrc5n5ghh6350knbmaa6bdwg3";
     doc = "1wfq3wc7b3516s81sbp6md6mx9szbzq5ycqvsr50y3s2wfvvj2lv";
   };
+  beamertheme-durham-78116 = {
+    run = "083m7xbhf8iqn3rs20kf1zhwx4d5bmsh7w9dcbk4v3rwy8kflxvh";
+    doc = "0fqmbzw7ajjvj5vzqxxqrmyz09s1z6wh6vylkfkf55r667s5l19n";
+  };
   beamertheme-epyt-41404 = {
     run = "07pjgzgkjmr4hdf16m7kx2cf1448253jwgc522akfvvnmx9fi26p";
     doc = "1a987h1cg48bw05zjh79ga23qb37s82dkqhhgvp7gsnwz10pax2j";
@@ -1601,9 +1605,9 @@
     run = "1qf1hf6nk3m6f289y7ms29aa5bp4qsm9qiarip9mac4way75ni6a";
     doc = "0llfz5xsyxhxy9bgdif82l1rknwwr8i6208b64ljc069pgig4m90";
   };
-  beamertheme-spectrum-76816 = {
-    run = "064x2bjwmb8x6393kkvf0lmm1y1sicqi8dz6v15hv2859f79apns";
-    doc = "0spfvwdgxx2l3g41p5xdwvhd8jqzmg3xchsy8vjr6bcid9a2pgic";
+  beamertheme-spectrum-77777 = {
+    run = "0mdanwkzjv9nd6m9g8ssa06zb43dfz8kmpvyadybpgnx9nfax8lk";
+    doc = "0dhx3wfdvgxqv6r1wplvpk32qkrwnvc5n5h3x57l75ppgf86a0bx";
   };
   beamertheme-tcolorbox-77380 = {
     run = "0qf9cdjy2sz2v01mj85c8j2vngd6j58851xksgfa2q125xxh3bg3";
@@ -1622,9 +1626,9 @@
     run = "1ghhmr1b5riskhqyr7x8kqjg76kqshmykw4iji95ibhnz2ywj43w";
     doc = "1s4zb71fp3lss2wj72f92w1gzj4wlb1161cp7s1cc76nzacl00ya";
   };
-  beamerthemecelestia-76804 = {
-    run = "17xi551ij884jjkwdvk3h7ljqlyvp1i1p6nca9npjsjbl8ysky6b";
-    doc = "1ys7nl2sibkwgrgh94l2cpk4xk020lmq6pzmamfpwynwmv5k1lpm";
+  beamerthemecelestia-78058 = {
+    run = "0s0rs0c5af08hgzv92w470k8dn3v5lmf695y83f95l02gjfjcnp2";
+    doc = "1yvswn96ja75bc6wwpn0207h4i5cqvmfibl2vq00cn17hpn0p0wy";
   };
   beamerthemeconcrete-69528 = {
     run = "0661r339w4473i6d1dj1wyg2pc6b0539pqpq5zwqq7sk2c1y5dmi";
@@ -1667,8 +1671,8 @@
     run = "1xg2y2x69ghz8dy5mr1wqpdbjv7hsg2801ln9yr17zd7wgcip5lz";
     doc = "13b2bblzg7bfyxv7agc31ijgaifjxn1hx2jhfg9gzg8d2qk5h1pm";
   };
-  beebe-77546 = {
-    run = "0l3x7g1ywns3xri7vbl62mmq659z63851cvn3xjl81dlx16iyjci";
+  beebe-77590 = {
+    run = "1z42i7ci9a5wl6pfvqm51nb86mkl8s56ps2lq30qs7q5mf289zn8";
   };
   begingreek-63255 = {
     run = "0dl4ap6r3xdwi0kypp6mq171jp4hl9hrjlhfrw9i6pd31qh2bp85";
@@ -1694,11 +1698,11 @@
     doc = "1zxczyil1izzj9pnz9c6my76mggg8maxdign07qn4kzf8c0fq8jp";
     source = "0b4v7jrngga8znbfiafazxq6z333wa98prp7hwzzhpv3nxj6kbl8";
   };
-  bera-20031 = {
+  bera-77677 = {
     run = "1i3mahkkb858i6a3wyrilcbswdp8mhclvixdxgc0wpkqvxa6qwya";
     doc = "0llhr464l0akf2dx1avnm3d7adzcz7ml3x95glafpk0nfgb98qgd";
   };
-  berenisadf-72484 = {
+  berenisadf-77677 = {
     run = "074qfizb18x45s6b7lwjq79bj98iv5h5mr5m5z9555dsb8dnbnrc";
     doc = "1lvqmb7mwpmpdl2mzfgvf5vj5l166c9x6jiklqzcfs50zj97gssv";
     source = "17s2zqx947cwxqp8icv8753frqwwgfw4dhsi3496hqalxfxrvidd";
@@ -1715,7 +1719,7 @@
     run = "0m2m3m59a2ma30zkyqjc3h076dp74m4igks0dvrlpgx4sfqg90zb";
     doc = "1zi2yxvxhyazjncfjv6dv8c733hb0g5sxr9x7wqqrkxlxgp549wz";
   };
-  beton-15878 = {
+  beton-77677 = {
     run = "1rjj64wnd9xvh940rl9scidhv9ridqz38n8ndzs35hyjm8n2lx5f";
     doc = "0i8lg2iyjkzpxjzz9ym61v4zkqczkhvs6qjb7zf5xw557l2i55gw";
     source = "1l82y1fz86qsnv58gjq9rm58zf3ki80xmcqkwlmgfp334j9jqz8y";
@@ -1729,7 +1733,7 @@
     doc = "0ny8ps46wxkbsd5g5yxyrh2jd74b204r35lggy9r7ckk4jab2wj9";
     source = "0y79pmsbjzpykldic1a41l188wmkmn9izhvg5p77i7phx35s9qjz";
   };
-  bez123-15878 = {
+  bez123-77677 = {
     run = "13l8qvnhfq575pg1nvcpbrwyv5wvq3bhpkmh2306mds784hvcib2";
     doc = "0qrskibmq7sv07g60gzd5cp34p21ragr6yn9g6384gib8vx60nqf";
     source = "0ab153h8i8nmc6v5g9xwvpymjvpp605mbj9dmxdyl3ic49cpnl08";
@@ -1738,9 +1742,9 @@
     run = "0wzci9virsb7dav917v1b8ks7dg6r8wiid09l6b95lrszhwqzwp7";
     doc = "1rh127y9jjcg6k8i3mscshy5vj0grqhz2p1ba3mqwrg6914lyl0i";
   };
-  bfh-ci-76924 = {
-    run = "0ph944ala4yrj5sp09ca6mkjy0m9w91l01jcw33z1vh15brb8j30";
-    doc = "07zvdvlzm7ga4q6dvz8fnkr28kl3ks4hfvkvak5wdj89skjbfd0l";
+  bfh-ci-77886 = {
+    run = "0g2hd91ackgbbf29jx6fm9pdgxja9yk472kad3ynjw2wak6j7i6v";
+    doc = "15y5d07h8ksaassyfqfank4r368sc9mqz8n5h3b58capa8zph9dh";
   };
   bgteubner-54080 = {
     run = "0a8zhnl1nxzg5r525sn8sz44crjdm5fmy09glp8cjj7nic5xj32g";
@@ -1801,7 +1805,7 @@
     run = "1sg9x0jrgh2jng9b1pd08i0f8kzhy94sq0mf33as91gr43dzws88";
     doc = "0is3q2m1xg52h5s9n9403c85yfmpjaqqbh8lgyfqfwhl5qqmgrf9";
   };
-  biblatex-76924 = {
+  biblatex-77677 = {
     run = "1606h5mky20wz878hybxicfl5j39w39czqzvb695v7a3mlrqi0hd";
     doc = "154bhz1ay5wfn1mllwyds1smd2kdl666cya14j42b1igd2hbkiyg";
   };
@@ -1867,7 +1871,7 @@
     run = "1mlgycbg51n62aa7ixjfian6p0jn1j15ijjpwry9z858kshww6fk";
     doc = "08wxlmr58x93fm9v8r0h5pp21cp1q7pb74irvm6qmm8phqcvjjwv";
   };
-  biblatex-chicago-70955 = {
+  biblatex-chicago-77677 = {
     run = "183329qdra4qk2r027axy880vlr5cz75jvr94npkmnsmahrrngrh";
     doc = "07mwx03l2wqg93faam8fbw76pr1w3i4fdv7pxr3kba5z1is2p3gm";
   };
@@ -1883,7 +1887,7 @@
     run = "0k3bbbjvykc52y4557nm7kqna89mjq6g5j5hpblrcdlmvd5anq2l";
     doc = "1xbd71vpm6vfyjaszn7jlxr084mqxw558rqyqr8x848hbyh6f888";
   };
-  biblatex-dw-66579 = {
+  biblatex-dw-77677 = {
     run = "1kjvqx9yqqzhwin4zwkp9qcgh6nk7bad5nlhx63mkwp37izwlcrc";
     doc = "0a91cra76s2134anv2jinwcpp0jkd0pn7vybbin3pgyamhr469lk";
   };
@@ -1891,7 +1895,7 @@
     run = "0iccl9rqf876rmn635yjb5n38q6d7lyyrpf452i924bg1dawlphk";
     doc = "1msv5fyqbrv3wdqlvpn694nla2412lj1hi2j0k8cykfrqvws75v9";
   };
-  biblatex-ext-75609 = {
+  biblatex-ext-77677 = {
     run = "1ywsv5w5cfq129v5jbg3bh9w9s0k0jadv5ldb3nsny2fpfyhlgs8";
     doc = "0ljcwk169g47n8llj23vw7rwmi72dyqr0yfhaml795vjcvk2i77z";
   };
@@ -1931,7 +1935,7 @@
     run = "0lq0dllah3drjijlscwy3nvzmimh9zc0in10vld516lmd88i7vdq";
     doc = "14l5sf5xmfi27izkds3cv933397s4fn1ah4k7jgkj7vw424bwh55";
   };
-  biblatex-juradiss-56502 = {
+  biblatex-juradiss-77677 = {
     run = "0zi9b67y0p9zdz2n4j1lr5qgd54p3l13c132wjz749mlrv6njfx3";
     doc = "0a6d7awx49cy86ndwfkfq280dwh846ssjkkkrgbq4vxlbmbh2zpx";
   };
@@ -2006,7 +2010,7 @@
     run = "0nhm5sc9b4xwq5zwjrwa72ax007g0fpcb9hrc2qzc79wyyd109m0";
     doc = "19b4bsi7a9h1jrv4xnyqnva6i510vwwkd1d32g7g2qk9drz1hjfd";
   };
-  biblatex-publist-77020 = {
+  biblatex-publist-77677 = {
     run = "1342vksl9rv0i3k0a2izcijajfq8wipiv6832xrd8l0pbb7hrn2q";
     doc = "0l3lqhs1wwgdb6wl57jsgm5pw6phbaz462vyc9gim7p6nrh31dwq";
   };
@@ -2051,11 +2055,11 @@
     run = "1c92azsgrp1cmq82ga3cvnca5s4j902hcncp64g9psgl9fm74nwx";
     doc = "0ri6vvzcpcm2hz73dkam0fgbnfm7i650x983qcngkr0jqa43xr41";
   };
-  biblatex-swiss-legal-77463 = {
+  biblatex-swiss-legal-78222 = {
     run = "1sqskc93a3vdxvycmdz494kddxvzpf6rgw6l184lizwnrz9mr8v0";
     doc = "1k0xgd5gi421zvh8bvyvq5naapb6v7216k2sn5aqhca93sifgvqm";
   };
-  biblatex-trad-58169 = {
+  biblatex-trad-77677 = {
     run = "1000rdnm9jqk89snffsf4ldl47wry8k5akm75aqhd9r7qbn73car";
     doc = "1m32xykdgms8i4aqny35w0happr6vbkkra9m4nasxp1vzykf0n63";
   };
@@ -2071,7 +2075,7 @@
     run = "19ymkk94c4l5sav1lb66f2lxjyfzzi1s78qd2a8drjp9q1c6i0j8";
     doc = "0wn26kl4nli220lfs663rdqmv49xgi76kjgnlwh99yljx7v47n09";
   };
-  biblatex2bibitem-67201 = {
+  biblatex2bibitem-77677 = {
     run = "1l3j9v225f9g2zmishkfvimd08di89p39g0sqffdwx0psj99dw5k";
     doc = "0bpbsaasi6kq5ggs3cpkmwlakdlymd99rfr028q5xj42ir8cba3h";
   };
@@ -2107,11 +2111,11 @@
     run = "1p2cz95815vkvvc9fsa1qm3sc5grkxzdsyw30qkilff1nivb3cd9";
     doc = "0czz3l0m314a25i242kixy9f9spcj72h3bibfdib55gg05iw102c";
   };
-  biblist-17116 = {
+  biblist-77677 = {
     run = "0z69a5x3czy0hb59c93jrkmmg6i66vc7rw6szvchsbsj1c6gwjfb";
     doc = "0wp7x8qj7bh1pgcy01jmq35r2i1f8yvrv6bcr8p68d70sr1jqspn";
   };
-  bibtex-76790 = {
+  bibtex-77677 = {
     run = "1w7vpf0kw6vi3hgmlmk0dpzk82kns7a77appx8yg76xcip2xid51";
     doc = "1aghrxjbii8kf0rymq6c6pxvrc1b5b2kxqyjb8lm8xhdsqd9ckkh";
   };
@@ -2131,7 +2135,7 @@
     run = "0s0mz84w97854gwsz843gvlqlgk4bs5bpd195m8xv8g9qljpwfvc";
     source = "0s69lggqnppqlyfc5r2k9jix7zpjy0nvljjimqhks250rjbgg0hi";
   };
-  bibtopic-15878 = {
+  bibtopic-77677 = {
     run = "0rzz1c1c6vgjm2r0gv65rwvbcv0asc5049agv75yyvqihvn51018";
     doc = "0hzy6353n1rzirfdjd8dgjhnp496i14b0z0n2x7gnisf3qksr0wx";
     source = "0abpdz3ir7l9dvc6vy5zi9ay103ga7i92vg3z69agd758xnz0v3y";
@@ -2141,12 +2145,12 @@
     doc = "070shh1cg3hdk097v9jr37f06q0qaaxji3vjdv8v24a1rg3rrpdr";
     source = "1v35hawmsgm12sv80wq2ld0rzz5l4shvky44l8wkxxh7i7vy43sx";
   };
-  bibunits-15878 = {
+  bibunits-77677 = {
     run = "0znv09kqrwvmsjsw3lx9d3mp6fm8444zbn317q5yn5hzg2dyj61f";
     doc = "1zgj4jpl0fpmsrcp3h4qlkilflmy8zqhjamghidwzkkg1i9jsfz1";
     source = "04lswyalfivh01hp1wj3fq1q8960dmsvnbi8k856v3dhz0pv0whz";
   };
-  bidi-77301 = {
+  bidi-77677 = {
     run = "1xwaj74lhmml5rc7ajp3i8jrspxw7g8qk7mq7qzml86p4wgf7ri0";
     doc = "16dsvrynpmm82c31ss7vh707g19irfiwnpvbbbfkjijsdw978agc";
     source = "0404p0s1a92g5n92yq0l2y8wqh9sc9xx2kyrrln2fbc3lnddzr8l";
@@ -2155,15 +2159,15 @@
     run = "0wpwp2fr233f0pac6llb5gmhz2ca41yjcmkqdil6qhpxscfpqizg";
     doc = "1nzg4cgdhjjsalwml50xl7ac25w0qfd5q18cs8viicj7bbjp13wr";
   };
-  bidicontour-34631 = {
+  bidicontour-77677 = {
     run = "1yj7vl5z4xh8i420y1ycz21rw0yy83z0v9nlvi8k3ph2qis7lp8m";
     doc = "085xfi5w350vbp4vnq8kgbilnz3jxwf4g0incvziy5hxh4isqirz";
   };
-  bidihl-37795 = {
+  bidihl-77677 = {
     run = "09wrzqlldxy3lcxp21rdqi9bnjzza9wvdgssqynynjdmfggahd34";
     doc = "1k67d2zd16ash4krnkwvmwx4wl668r0pdg720vr9xq6q3b139y9d";
   };
-  bidipagegrid-34632 = {
+  bidipagegrid-77677 = {
     run = "1nh14lla3xv9zikqqpnw7nb26kshjd186ijlz9snz19nkgddq28x";
     doc = "0jgd9mfwar486gl7imm1m87a167c06cdhxg9qqp8m8nk6xdys8f9";
   };
@@ -2171,21 +2175,21 @@
     run = "0kpwhs3dvmjhpv2n6kjly5cpj56gnwv3iyhiiwffd4bphzyrnyjb";
     doc = "0hp0zbr5mpwsrd4rh3rc8qmy4srp93838k38phmsm6dwgqkda2z3";
   };
-  bidishadowtext-34633 = {
+  bidishadowtext-77677 = {
     run = "0jpz5a5q9c9c569ssyzk48y77msvfkd5csdvv0cd0r62ivrai5jh";
     doc = "1bcbz6fiydj6dx8xzkrdsrm2vgcvn1jj4fk2jh1333la6rygvvav";
   };
-  bigfoot-38248 = {
+  bigfoot-77677 = {
     run = "1md91jivqvgf5kvwizc30wns9y9krk5pzvaihxkn9qs41j907wx8";
     doc = "1lj6lv7iizbsaj00hvrcrdk9w0iak3wmx6mdpfb77jkzgp9dgg1d";
     source = "112kj1669xl7qd2vrpgbi19cw00rkhj64ik6rrr885qr7bq5w79v";
   };
-  bigintcalc-53172 = {
+  bigintcalc-77677 = {
     run = "01vz3qrhxb28v86np3a0spq9yxxc7faav32m136nax2vkm5ff8f3";
     doc = "1wa6750qyggvx7nlwq9n7s1rfdm1h6i5hv91y1aq6mn26sw68l1s";
     source = "00gnanfnw66bfrd5gk072z9rn6nhmqnjwf2dwnamvy3dpxgg86jn";
   };
-  bigints-29803 = {
+  bigints-77677 = {
     run = "10lsfqfzg0klg59s9zkrrxv4qjhnk74x90rkk2w5pi8zn83k6xac";
     doc = "0xj6vnqfd5rb8ahxbjaqz7jd5kpvihr4dx88avrfvdfr0qhg3zlm";
   };
@@ -2230,12 +2234,12 @@
     doc = "0a9120z9rsq8pqi33iv7f4j79gimjgxfqf5jhnrnmz0hgqdpl2mi";
     source = "16bjmxm11kh0ww6ymk82qs947zgavm100nsfnjl60hxwjl3yknzn";
   };
-  bitset-53837 = {
+  bitset-77677 = {
     run = "0ynyw8fyb5cidlz00f42cf21gakm2ir9ilddaaz12s7qq99lhj65";
     doc = "135dcx0b51br6lf9dxd66jq2xa21bpb1mi4y4kk5z6ngsd1imdag";
     source = "0yds3rhgq52sxvwn5kc32iizapbs5g21cw6avbppiip0s5x0b538";
   };
-  bitter-67598 = {
+  bitter-77677 = {
     run = "0x3xnz8fvhwhixabr05rmxw8j0l03v2j5ylj7jq4gni519n3g60q";
     doc = "1x8zzl2890c44jqk69ncsgj7xhchysbwkf66nnw0dsk2qfahc6xx";
   };
@@ -2253,12 +2257,12 @@
     doc = "1m6qp3bkwl77khvanw498bfrydmyvf1qx5a9sp66x7l7xgjnndlc";
     source = "1c38hmva1ffzani4mjg7zad0mr6lphncspn57m55n28hwfq7x8i5";
   };
-  blindtext-25039 = {
+  blindtext-77677 = {
     run = "0nwxq33ffivn2ywxwx2w4y7ny5nv4af9p5cwn6c21jadrdj1rysp";
     doc = "0gg45ayj3bibxvlghnz3vs0yj29zyr50bf6la0m26ma8ff0pw40c";
     source = "09ppqs9mdkmax1s20m43hdi6yfcnpy0ylwdi9h9lw676gr65cn0m";
   };
-  blkarray-36406 = {
+  blkarray-77677 = {
     run = "096mlldfyi6hxsnp3flkr1gfqhvhxm2vzk81zw6dl64xihkvl6aa";
     doc = "1km35jnmh1iwya05s3ilhikzvz5yspxf18jh3f4v6iv5g8rxf9gd";
   };
@@ -2283,7 +2287,7 @@
     run = "1gr3521mxmabcwvkqxn7f0wcpcmzy5jdpypyafyklmnhc2ij6zqj";
     doc = "1jmvan6ja2zf01lm0dmh3dg4rf1cagfniqjfrmzpxc062khf97w3";
   };
-  blowup-67640 = {
+  blowup-77677 = {
     run = "0ijgwims5gklp37j8zlc0vdr6y2l0gf3nv2jnjhbbc49yv4n8gim";
     doc = "01an3fbg94bg3wspadjil9npbx108g5x7kg8ga7c1nza0wygsdd9";
     source = "1b53khyhzjy9mww925crpjmfgk9cjsmcz5hxjpl8wghrc4qqahjl";
@@ -2301,7 +2305,7 @@
     run = "069a431lbg777h5jnh3ah8f2rk39c7ww15zdspas5r2l1mbpkhh4";
     doc = "1vm34n1xs1i4p0r2hjhibca59hs6xcvzgv0vvagh3dc1lmz6aciv";
   };
-  bnumexpr-76420 = {
+  bnumexpr-77677 = {
     run = "18iig0xsc2skyw4f9ldiwvfvwssbap0pk7knvp6njh3pnblk57lx";
     doc = "11r7vya8yzzdb6gr8k2qayyg6y4a50ps1i9518g8ax5jcbi4bjnp";
     source = "01kmcyw1dalgzqxzf5rrf35gd3d25adjsjl9kjjymxzz9c7jv3ra";
@@ -2328,7 +2332,7 @@
     doc = "0visqy0qg18sa4mxszdl601yy0ilfgglv872dhzy8bnqqs8x7zzp";
     source = "1zirqghkw8kk8fa3xahd27dh60phxg3blp98iavh6bdhj0rm7iar";
   };
-  bold-extra-17076 = {
+  bold-extra-78116 = {
     run = "0samckbdgi91y5ay98h6jcaywcqfbmzcdb90kksjxv160nsvf5ca";
     doc = "1101922s78y5d9rjf5immfir46vf0i1ig20wp360zcal571csgjl";
   };
@@ -2345,7 +2349,7 @@
     doc = "1wnjhyr6r7jkmxzry9my2mw8i7q2nwq26zqyfi9mh6cv3x2p8siy";
     source = "0qqs868saap9zsl70bwzfpmq8rnyvq2k45nc31ddzq3563djhfi7";
   };
-  bonum-otf-76342 = {
+  bonum-otf-77677 = {
     run = "11p46fmpgl14i2h4smzpwyadxyrd29lgfgchfk9r0rri684544v5";
     doc = "1hsvq7qmik3r2hwv8ifywbx31ha7rl0zg47hngmfc9mjw0sxvvyy";
   };
@@ -2371,7 +2375,7 @@
     doc = "1z0rir98r4fm8vhx26hw7l22p2z7swj5b2i3jdfy3c6cj0pi4g0g";
     source = "17clfn8g2f48v944jlvwl3jsz9ixkw7x1xjxqkpaqnng0wsm6fyj";
   };
-  booklet-15878 = {
+  booklet-77677 = {
     run = "093kp4ryfp8q1hg8ddmvaxxsw75wplgz4rrmmwmzcj3hcgyynr1f";
     doc = "0cd1mvkv29r2aqdy4bs02m3ck90rdv0nz01cq2x5xvqk0i8j5dhx";
     source = "1c67lj35yh0w9bfgiba9ank6wk9zqq3l3vvgwn8f3v6kygyqha63";
@@ -2379,7 +2383,7 @@
   bookman-77161 = {
     run = "12wkjwpzxn1a1k3bb41gpnky1jjsh7gzj4xahsjd087fpmrsj9p9";
   };
-  bookmark-69084 = {
+  bookmark-77677 = {
     run = "0wax84d0wyy1z4a78j62nnmkgn7f9ww6703qmnhyj9x9206dlh31";
     doc = "0adm4hcf92xqxsb4cl01mnf5f6mvpblr3b8phxaz02xwxx3203vk";
     source = "1w48rx66n77l7fpqpqcn8337qylp09v2pnxphhnl36sws5yw6nqq";
@@ -2388,7 +2392,7 @@
     run = "0dhfm6vy9kbsrs2bzxzr4a1zvghli3bjk958mj8l73j5r2ikgwi8";
     doc = "0kv3fzhy5wkvg5qp7c6jnhlcvkdls1l1cahb2nw41l6lyv7k0ran";
   };
-  booktabs-53402 = {
+  booktabs-77677 = {
     run = "04bfbj0v47hiww6z8xlzphm2yh4vidf9gcp3rvh81j66s7wybffj";
     doc = "1hp3fbvg2v2hk1bns9b28hdjb2bcvn5d83apkr503ahln6rigf8a";
     source = "0p0hym0xn4zcmq8q5v93z1zi8n7hxz9kg58fq53y96hf6isigdb5";
@@ -2404,7 +2408,7 @@
     doc = "1cwj9473nazkz0acz4x7j1xp50139xs1ifqck40f2vb1gvhasly1";
     source = "03kaz41353m40rbmars31pkbrrj6zwiajbv6fkabq0gsd9gy7bq0";
   };
-  boondox-54512 = {
+  boondox-77677 = {
     run = "1x8xd0q0yg1w1y06gx9fq25jakf7s3nz5lf2vryh5zlan2fz0ic9";
     doc = "1sc5bwpvgz28q2ym65vccyr5pdg8fn680kd83zgcbcwd85n8nhrf";
   };
@@ -2426,7 +2430,7 @@
     doc = "1a0vyxnhbbdm2hi8gydz0vyasvzzh3k2scyv2kxx4qbwvv4liyk4";
     source = "12f99cgcf4mphvbqi2ffh7nwj627c5cxc9v8xrcg8nwfxr81h7hv";
   };
-  boxedminipage-54827 = {
+  boxedminipage-77677 = {
     run = "1sn8liypm113jvmxsb0bl07cprrvdgq4rhbnp85lb5671djr63gr";
     doc = "06wan6b11z6g2nbw73z5l27mb42cd417bq2vmmmxla2fyksjqqa3";
     source = "17lk6ns0zl83nhdi8g6sgij4ajghksblqx2aac1gx6fmq60p7pn6";
@@ -2449,7 +2453,7 @@
     run = "0pdhzadajg5vx5da6ildn9k2nfvf1ks4pxjgm32ajpcpfxbjpwk3";
     doc = "001822zh0f18zvf6b51qdh4ykkv6ywqa5pm8q2vsmjv8rayjralg";
   };
-  bracealign-76924 = {
+  bracealign-77677 = {
     run = "1r4xp6jppg3qlvaszlsr8wa1g9ma5ww5n61h5c1ix3zx5in80cdy";
     doc = "1rgm9i6334ms0iwvxj0zx3jyvlhs5qwmf9h8j4hlwh4a9nirqni8";
     source = "13x2msw6iakczjw0md2irdrqsignsf689xib3x8ry0ylsx6yaj0m";
@@ -2467,7 +2471,7 @@
     run = "0cy4bxpg284blfpmpgh1v9vyh5bczdyz9zdsc1almc51nv6c6zgf";
     doc = "1ygyzvyz4am70n57hs8xhrkdd8hpn2mvg7hg3rdr5b6dvis2ibj7";
   };
-  braket-17127 = {
+  braket-77677 = {
     run = "1ml5xz6pyj66kc2jby0bg02m79vfv9z3r91da808n1zb22mmnjkf";
     doc = "09vqvl0v1qkrhv65bh9ym1zm254iigl21d4c98df8ayvffjf6bx8";
   };
@@ -2485,11 +2489,11 @@
     doc = "19acaxmg5r46kjk54z6gm59rf3pcbc7wlgqr7j5rbbp390c7kchj";
     source = "0j85pasvrblbvsi9npnfmx9mc6gnxj9128d3zc6iym9fx3vfcqra";
   };
-  breakcites-21014 = {
+  breakcites-78116 = {
     run = "0f3zhwrk0wapckz83304anlp2ssii7nvzjdakbxfdj51cd6schpg";
     doc = "1f8x16qy5v27asch2jhbgh080vmv7mza4z5w63h31gdglbkwdp11";
   };
-  breakurl-29901 = {
+  breakurl-77677 = {
     run = "0a3np519c1knm8i60z1d6rmmzdhfl340gkf6c4m1yss68didq0cn";
     doc = "0dk4hgl3411q0k9dz9f9p5f7r5a59rpjcicz9h7ynpc4g3nhn019";
     source = "1hx73iw3n5wgvaz2niqargiw36p068pjl8x65cajn081831syzfc";
@@ -2498,7 +2502,7 @@
     run = "1mcl52mlbbw0yxbs53x9a7kh3xlaka9c7nszfajlhpvj4s3jr1pd";
     doc = "1zgmhhyqf2bwlf0mi509nrnzqqa5g4qxr3zj46rsa8jz0giaig44";
   };
-  breqn-60881 = {
+  breqn-77677 = {
     run = "0dm9r7zjdwcdv8hq0l08k49lq4pvvf78hrlib16rk9s03rz2v4g6";
     doc = "131y7g7hia9dgzf890xd5g4wfw23zr753kk78ajrdyn0jq1ipshs";
     source = "1hja619zcayr2gxsxhsfpv3gp9x0bx8y56mjcpb9ykwlxax4zfpz";
@@ -2544,7 +2548,7 @@
     run = "0xv56yqqj8y4270955srbiw7qy8bm9r3ih0zazlkrxnrxyh82jlk";
     doc = "0nfvak5730q4ci88dyqln97ljhjbwxn3gk34rq2b5rk5cy2inabi";
   };
-  bussproofs-54080 = {
+  bussproofs-77677 = {
     run = "0d783i6srwanhm806hk0y5igbw99rf5x9anl7ib29pijrqvg8kjx";
     doc = "10mn4g6dap1rksl5jnsp8pv3n0hhfrb9imldjyrmiika2d0prfp9";
   };
@@ -2569,7 +2573,7 @@
     run = "1awhcn56jiwym35gxlhw4m32y4va9qh1skjjhk455plfmbydk71p";
     doc = "1d9v4al9hyimw0bbndd7d8jjc8pngj5xrds1a8j7mgcjhkyyjin7";
   };
-  bxcoloremoji-74806 = {
+  bxcoloremoji-77677 = {
     run = "0qra5rkqfwgjq6b068slm2yw8dcg07apl13rbq2896ybz4hpscgb";
     doc = "02wf5j52xqf7jjgyab6v153qgcm03fy61gx2xpfbpir4rmgpsa7r";
   };
@@ -2581,7 +2585,7 @@
     run = "06rw5wwp5ky30s31f23gl4hpyzakn5b3vvgna8iw2iyy6rw5cl7a";
     doc = "1qwxy88fnfsx9na6c8r56n6zhs13d8apkjq7hhydsfs7qy54q4vn";
   };
-  bxeepic-30559 = {
+  bxeepic-77677 = {
     run = "18by54j2rg04n19whsb2zjkksrdh6f6i54fq257i2mvcp0qpxwr5";
     doc = "0117dzkqs1sy8si4dbal9p5p6csskcby2swmf2911c0vbpdl51zm";
   };
@@ -2647,7 +2651,7 @@
     run = "0dzvv5ly1n6iwnkqf37gf0yzxskgw6gcfh38cxi6yqbcmi74naxy";
     doc = "1y0bcvghfcl89czkjlyci92irp3mw1prdlx9f7kypgmcad2iqapc";
   };
-  bytefield-74416 = {
+  bytefield-77677 = {
     run = "0cg2lv1vr4nxjqp7gmfj4k8kjcah4zwd3zvazg5pcf20f4zlqfjb";
     doc = "0nc7zx6q97p156npi0h84qpxl31lia235l3d2wjmx3mkdy9li25r";
     source = "1igdyxlrzwsrxcv52r77znzzrkgpbr44m1ii781fkm8fg2icxmxh";
@@ -2661,7 +2665,7 @@
     doc = "0bwbqi9kg39rm63vzngrswsg7vnibrfxlz8fhsqb947j20mrj6l5";
     source = "1pif2g8ihgxf3qznhhc52gi9bih5ai8a986c6l1zxlmgrh678wxh";
   };
-  cabin-68373 = {
+  cabin-77677 = {
     run = "0wlhsfhi6f5wvnvi0k0h9j8xiqy5dp7fxks2ipw2ap9yv3r34pfr";
     doc = "0h57p06mh7drx3klgkgj6w6k7x4kc8h2yi0sya1ygi94kwp5x1lr";
   };
@@ -2673,7 +2677,7 @@
     run = "0q4bj64d9gi33vp13hq1m7q2jxvhzfkjp1wlpqjbgyi4haasy9a1";
     doc = "0kr02ks88s3s040c2b3ivv5hk3q17k4g6v5mkrcbccbc6360kr37";
   };
-  caladea-64549 = {
+  caladea-77677 = {
     run = "1xvpf4ly47vn8askincn7wl8k5skhn5ir2wj1nba6mgf84z106v9";
     doc = "13j961b3q42vpa7xlyzlsrl6f7ndnlw1m1zqi39j5qsb7nhpy7cw";
   };
@@ -2695,7 +2699,7 @@
     doc = "1bk9yqx607vp65ifdawaldcsxm065hmyrgzwyy90wkn4kmyq1snq";
     source = "1y5a2n2asfhwm8jylfg5zm5dy4v5s8gjl5ndizwk1ywwl0am2dxx";
   };
-  calculator-64424 = {
+  calculator-77677 = {
     run = "0ha62j2mdg6f0h9rc03xaniq3kgfccihwjh8lbf6r6v609kqncwd";
     doc = "0ilnsnlzxh8zd51h7lj0rr6c4fz9yb8dff87yjnm73ndkvia0ky7";
     source = "1k5vbywm427cx1xvvh2fv2g79nikspwrp7sk9qcvaf69g8acs93h";
@@ -2721,7 +2725,7 @@
     doc = "0ann10g67frd81anjawpddg40d6052br829r5pcrbxfhga1vsfjh";
     source = "019c19lk4nx9c4bw0ic2mayqqx0sw9dwciqyby1wxx3s3xvvs3pi";
   };
-  calrsfs-17125 = {
+  calrsfs-77677 = {
     run = "12b13dhwdxr5dc37l7imlhn4sparyrnz0d3vagjxlsiinm7hakf9";
     doc = "1295qb7s41y2abs2ip87ipcvq15pzza0bwvj6pwpwxkxq5yrr83q";
   };
@@ -2734,7 +2738,7 @@
     run = "1z0zhrfdka4di7sv90h7d37xrbbs71f9w3mhmj8spc1121yxq649";
     doc = "1017s4acasj6nm9q425cs5h0jjgf5ny8qidgzq09axxyxk3k7aj3";
   };
-  cancel-32508 = {
+  cancel-77677 = {
     run = "18bkqkdf888nd6j187kd39g0vgfhfh118bky8r5wwzy2aq843061";
     doc = "1x6dhr2xyx66i8qwk98li3vp40rlalfrf5lk8ah4gq03ndhmygfk";
   };
@@ -2743,25 +2747,25 @@
     doc = "03vn4k8yp4l195k2716a110b8lad3zympsphp3cp8xx0cbfb86ab";
     source = "134arh3nmd39zr1b0ybmz3y0jfyvwzwcrzd59iik6bzbp601nk8k";
   };
-  cantarell-54512 = {
+  cantarell-77677 = {
     run = "1p5idl8vqp84g7vw3q6ybwnddv8q7a0ijy6vny8jfd6583bjx6pb";
     doc = "1r6mlr4qq61cclliz4h86bc86zkb5kr5r9bixwnj88pbvbalayff";
   };
-  capt-of-29803 = {
+  capt-of-77677 = {
     run = "1b89cznanql6vmcn1jyr1nqkva40i61lsgjswsqjgdqnlbmvsm43";
     doc = "091qchrgwikiissyrbb5i14634130vn08rkj2v7cnqzsb9c44f2k";
     source = "0dlgrkl1vcvf8qck0pn20ic7cmsvxqkmvgp04f9hn3dmk0yrzc3r";
   };
-  captcont-15878 = {
+  captcont-77677 = {
     run = "00zp59ypp753b17wcn9212gxk0w11g2a7rn9gi2mn4k5c3djc10w";
     doc = "02n200ziiq4lbfa3mc8yk7icayl7l5ci3kpl8mlkdyg9r0a14j1d";
     source = "04wilkx7vd5bn05cww36lywb10xq6b2nbhlxnjq5xbmdrdf9ckyv";
   };
-  captdef-17353 = {
+  captdef-77677 = {
     run = "0gjbxdn70qskb3xl6gmags3gjq4pks44k8c48lxljx3avpvxnfp5";
     doc = "1wl56hjc0204d6xrpvypgra7md18db4bz7657m49893m2pmc2x7x";
   };
-  caption-68425 = {
+  caption-77677 = {
     run = "0d7z8vb5d26n6n8yan37820qsq46capr41vasvi4pcb2g2smkzlm";
     doc = "1zkscfajy1biv61vcgh7gka33dm7z6zqf0ypps49kpgx4q01ppwg";
     source = "1k8llr5bm3pi7bd6224a0nzc7d6d63wrwabm8wygdxj2slcixw5p";
@@ -2775,7 +2779,7 @@
     doc = "04l137nyh94qrli4qzsan6i1ag4j5j1s0qp8mb1m8a8aj0bw0i7i";
     source = "1b1ikyj585mpg7wkijlb2ppai4shcz6xad9ks52lnkdjd0h7r9lm";
   };
-  carlito-76790 = {
+  carlito-77677 = {
     run = "1xcq8y0psxyh2dw9wqybb67q9ihqp2p0klf98rni24x0xn7c2l8q";
     doc = "0sv5kmnkvpj60xnrldkp3gnhhslk9ksf6qpnzj12v00gcyxfs7gi";
   };
@@ -2793,11 +2797,11 @@
     doc = "0d2fkdrrbh5lj6jmvixgj7v4g3adg6s6rrrj8wxilr65vd1d8p6k";
     source = "1vh912sp0ngr4mq391m8cdggxwpjdm42d2qwv5m4mlqhsadald7w";
   };
-  cascadia-code-68485 = {
+  cascadia-code-77677 = {
     run = "1gdy5rx4dk2722xhnl1f8p0y5xhvpscfaycks217g1j7k4yyk41p";
     doc = "0yadwjksqxia4k6f8w0ng7rxzp1lggqxk8q6n1gmnwqqph08y4i7";
   };
-  cascadiamono-otf-76343 = {
+  cascadiamono-otf-77677 = {
     run = "1dz171dn9v6kn7kbdi6b2rdmrf4smg5n83jyz1jyq8vkjvvfmww5";
     doc = "1m2grhp25lbdkx7kwa29vvjw10sj77ihrbci7f6vdx7q9galysky";
   };
@@ -2805,7 +2809,7 @@
     run = "013x6his54n8q3qp2xx12c0s2fbjca1ffmcb1kjy0yr0qy0y698z";
     doc = "1l8xpfmdp2sc54qxx0ywh7im342nd3kbmgkx2pfzwmqz3xhpybfd";
   };
-  cases-54682 = {
+  cases-77677 = {
     run = "15f3mngrmvd0h6yy3jiifyzfrgi014g4dsqz9c5g1mw65yyssl8s";
     doc = "1vq4x3lc7zrxsh3b7dy6w53aikx5vfzx26fi288b44g99f3h37jy";
   };
@@ -2813,7 +2817,7 @@
     run = "1cmz40n2h7nckjw9x8wjrj0kkig4xhjslqjachsdgidd151m65c8";
     doc = "1y1gc2a1fw8fmrs4milnqvn0i099khhjq8pmsycj4bxpbsbpwqva";
   };
-  catchfile-53084 = {
+  catchfile-77677 = {
     run = "0dx2smqpw2jmzbsfl1g1zpa790qaxas4cz1xb5r905pvpca4q9h7";
     doc = "1xhzw6ahzn8fgv2rxn30xszzpdjqgr97njvx7fz9bs9z7xr8f3si";
     source = "1gbcl7bfr1zdvn69zzhsbfa808qdfq10c11qc3qgihpzz8s99fr9";
@@ -2863,17 +2867,17 @@
     run = "0cvyi72p74qx82qqw6cwn6kdrrsfw83ngwwkjrgywqr08q65v1an";
     doc = "07s3lnrl1n7pjbm81bqg6n6q6lnv5r04df0xjc6v6dqbdq08s51d";
   };
-  ccaption-23443 = {
+  ccaption-77677 = {
     run = "06xbcnwyh6s417dc5kdf9h2qhi557fp0w5ikjdwkzsdq8q3ybd00";
     doc = "1319qx3dz57f9hs21lxicwr8ql8131yk97zdps9rpnr5c6b0pgdy";
     source = "0is0wzbqijcyi703k3va7icjxmf3v2rmrlhdlbhs1wzfyz1cmd2h";
   };
-  ccfonts-61431 = {
+  ccfonts-77677 = {
     run = "1rwzpbv0vaf4p77k4hf9ac14l9sw8hsvvqx5diq9dirsfq2js0rb";
     doc = "1pbc945s3xjhccjm83y721xx1zrpqjbrirbf469anq9r892g33av";
     source = "0avnik79dw3p1wvrg5rlqcaxr3w06mr5jvyms54ha18l2d63yw7q";
   };
-  ccicons-54512 = {
+  ccicons-77677 = {
     run = "0xqq8dk5czaazzjlf601fs4d2z81yn02ama07js7wrxb21vvjz2r";
     doc = "15hlqk9rir37m45ajfwfpw2w2ngsc6nfyh8g76vmbc6j48zmc4mg";
     source = "091ayhgprp5w5g59c0zfy51lhas4gf3spya77k9fbr9gxp3phl4c";
@@ -2917,7 +2921,7 @@
     doc = "15f1mbagh41qvzkqf1bdzlvchfn4dibsa2qj7zwaqszc6smscl1c";
     source = "0yb9gjglaqfivifxi6n1al6w1nm0ah3r4d9y8bc7xnfxikhx3sym";
   };
-  cellspace-77482 = {
+  cellspace-77677 = {
     run = "1a2iw5g3w8mijj1nbjzadg50zvj9n354ayf03mic4r9xvpagv2iy";
     doc = "16rd8s9wljxvmqxcbbj2x8kh08imx8ppb08cn4p77akpvywjjgq0";
   };
@@ -2930,7 +2934,7 @@
     run = "1ddzj6b7aaavd7pj6zx4s89pkf0n6wdl9fiysmznnxx8vj5sx2rw";
     doc = "0y2sfak9z0pblr3s21500v6lx6c9ffs8ia12xqghkmgdgsrm1h3z";
   };
-  centeredline-64672 = {
+  centeredline-77677 = {
     run = "1xrh8r00wrr29wiijpal0n6k48zzl5493zbfzfgwq115lxsvhp37";
     doc = "07jvl42qmwlm2qv895f66cin58xzin21czdd0xpa13lgmpsccv2f";
   };
@@ -2948,12 +2952,12 @@
     run = "1wf5lcqh3jysn0fbzpmh429gmicqhh1kvz26jfl37f1z53g07shs";
     doc = "1akblgsix6a59as4z5z6hhsncnsfxqh78s8gw0m3xqv6wrbv417k";
   };
-  cfr-lm-76924 = {
+  cfr-lm-77677 = {
     run = "1vw8ynqfh5lyy9p34a97fkfl3hwr8vi0k88gzjdmhgaj51pygm50";
     doc = "16ilcw4m2zs256sipxb1p2k9pkgj5yw9lkrdxqk5n6qb30h9r2z7";
     source = "0ywp3gwrzdnqp08sh6k8qnx6iwiz4idz8ql9prnyqhgkyysp6qdr";
   };
-  changebar-71847 = {
+  changebar-77677 = {
     run = "1cnqflpjsw3wim21ld1qdxm44qv5yc21pz9raw4sn9zllakr1mcj";
     doc = "1cql656jwcf7skb8gqxwlkkwibrr2lk88igwgnd30qwamvd156lv";
     source = "16k1319idcd7c2mw16sjcinl160lr13wimzwrf3k1kql4amav362";
@@ -2962,21 +2966,21 @@
     run = "08bapli8zvv8p15bv3sj7l646fagzbj44dbq81apb8lhqanvlf0i";
     doc = "1s304gpjg30kpygvg4r8r2j4bk9fg8vlb331lypd3dfd6slphm60";
   };
-  changelog-76924 = {
+  changelog-77677 = {
     run = "019148i0zs4mp3w72kgryrj3dzkrmm4vpr7d3v44aqa9rjmxjsmv";
     doc = "1xshvsq8drh1lk8w13n5s54l42kj4ziqczr06x5q49fr3smflxg7";
   };
-  changepage-15878 = {
+  changepage-77677 = {
     run = "070rd3drhaaw6z386v9z5rs7dmf15ci05lmlxsaay3s1ry1425bc";
     doc = "1149csn0iphkxj7p1bhkza8v6xj39k49rylp84d1ilckf1q4imng";
     source = "1slacsdfrjyy7hmhj4ssjkh0ln846b2ds11g446hmdvckyvz4363";
   };
-  changes-67201 = {
+  changes-77677 = {
     run = "1cqdis0b9k20nvfc912xm99h6l36jzssszqrgcshl6m2kd722if1";
     doc = "1r03j3g11nh23misg9prjrbl3jvf45761jzbxjjn4pajynfdpm63";
     source = "1dzmdnwh8bbg3ysfxqq9x9nw44bz55f4gl79nn2z2c80f99sqvx1";
   };
-  chappg-15878 = {
+  chappg-77677 = {
     run = "1lx2yw7xyvbhvmcaj5qk2bjfmgyr4dn7q0v8q3xfkrnbzbzmcajm";
     doc = "1c9qkc2m4rcixnif8y1zvcc0mzwjhzsbrbmy1cqv598cysc2yaig";
     source = "0fzy53whj61n52k1ashphabpa076244dqjy1v7icrb27gd1y86mg";
@@ -3012,7 +3016,7 @@
     run = "1nqfmvi9kwqh9zrfywm1clljnp0wsvm1f3nl237q6lynar1d4pp9";
     doc = "0q1yk08b0fiicq03j6q5rkxhmiz3s6zhlgkg4kzml4r26vx7qcr1";
   };
-  checkend-51475 = {
+  checkend-78116 = {
     run = "1g4kx83kkpdd4fbd70b29hv82gbf19avd04b3bcxy8d0r7zyyyad";
     doc = "1hzllxf7pnp7kg2623i5yhl2xq6phifc4jc57f2zfgfvvw0hqihy";
   };
@@ -3047,11 +3051,11 @@
     run = "0yj6sygdzs247fpajjl8gk3c6yhk52npbjahgngchqmblhmhlkc0";
     doc = "0pqksv69yk7vf622x2p2ah735p0a93agfnfyg8hm2jadwjmhzikj";
   };
-  chemfig-76701 = {
+  chemfig-77677 = {
     run = "0nvwq7k5018awyycx5dbnmh0dhr056z6hwbv03dl7vfcq63jx1lv";
     doc = "119nmkpl3q68mrff3iv16c49q9lyq5q3apavs6xzgk83g1v8a962";
   };
-  chemformula-76924 = {
+  chemformula-77677 = {
     run = "0q0vrz2agxw3g7cy5clya5hfsdv8s8qf18szhway3inzg5mfr895";
     doc = "0h1nbyhj463zxj4d15cx88h9pwb2wxpq3r9dsbzdi63fb1mnr4bz";
   };
@@ -3059,7 +3063,7 @@
     run = "0hawyh2lfj82hl1p7hyvdd8cs82hw04xz58552ad6yzwim2bajr1";
     doc = "0myschbgz7rrl6b70bil5gdlwds32rlf7fx8wmp9xj874mbsxfkp";
   };
-  chemgreek-53437 = {
+  chemgreek-77677 = {
     run = "0di3w4yqnjs49im28g2a2qk31d6cqhrbwpq1jcxykk8am7g2sn1c";
     doc = "065mwb7ah9h4qwqp36n0sdlkjv435bwrljz3yzsgym7a4xqvhfwh";
   };
@@ -3067,7 +3071,7 @@
     run = "1phw4kgp7h5mcrr66vb4kazzi3kw6abmxqhybn3amd4ishgbzd8q";
     doc = "1rz1a7nc2c0cf78axch98zsaxah84hzr7h8rpvz3zz1vfa4bmk5s";
   };
-  chemnum-76924 = {
+  chemnum-77677 = {
     run = "05z6i3cva4cq45z280ls3y5hrqk9m3a1v5yq51rdj1ilk3yh1a4g";
     doc = "0g0q6a845xgpfwkhi31dg6w2rrza8cgxj925rm5m6mg026rd7v03";
   };
@@ -3099,21 +3103,21 @@
     run = "1h8q9ysfnwdc29kfc6yj4545xk8cyncl9ns5a465kh6li01zw5i0";
     doc = "0ijq61im5wsv64qibwcllc2mi69d72915c5qjk0dcnsn7k823si5";
   };
-  chess-20582 = {
+  chess-78116 = {
     run = "0r1danvrc979bbpcka5fdbnmxwiv54inxyd4rcsjkz6z03srbwvg";
     doc = "0h6zcs8g6gg4fq0sp2s6gihbyrs9kkvrbqr6pdpb7j3fkb2jr9m2";
   };
-  chess-problem-diagrams-74591 = {
+  chess-problem-diagrams-78116 = {
     run = "14i61vjf9ifgrbf0cqz9kd1shv08lxyry2x52344jb0zi5ahj7lg";
     doc = "0732gkv1b3a0cp6s78fab7d4wfi94j605gdasd5pgb4x7ahgi9ra";
     source = "0rqhqa42kn8yji883ycx56jq8xnb5z9vrs8ykhcfl3494ipvvfic";
   };
-  chessboard-72795 = {
+  chessboard-78116 = {
     run = "0ycg5plbpc97yyrd9pgaszk8jml3sfph21mm55fv02nhznip47g5";
     doc = "0q2w1rcbf247w6pi2f7h55bb871r2hwlgbiddplqzdn21zpa9bpj";
     source = "02443qhgipzp7iqkbdb19x0h4gbfqxy8lh8c8apfafw6cnvg3lli";
   };
-  chessfss-19440 = {
+  chessfss-78116 = {
     run = "1bi0lzxr3lr8nbrxj8189ycadm16l66isgslqjh1mfqyggz65gkz";
     doc = "1xrdlw5z6dal81pdkhx8lwg18fzyfy1v4agq93bw09i94045cvih";
     source = "0ryd536x30rv71pqvji805f9fm8ix6g6b5jravshrrksk9q8qw9j";
@@ -3132,7 +3136,7 @@
     doc = "032qz2d0zflyj8aslhpq4n7mzr7rpl8kpdzrp9ahl3dxqzcrnwj5";
     source = "0ld5zwwzznvc8a8n9l01i0236a9zw9n5jbiinxkhf8fk0gis1kb2";
   };
-  chicago-76790 = {
+  chicago-77677 = {
     run = "0mwrphf2g7v5yc0qij76dkzalgm3fhcm8zs7akgaypyk98cvxw8k";
   };
   chicago-annote-76790 = {
@@ -3164,7 +3168,7 @@
     run = "0lgpg27qnc59i1lkbis5jr3z4fy2cl86x1dm320q5kfjm6z06vla";
     doc = "0bpl9vkjvn3bq1dmrgm4f0kgmbvxrxxhd1alfd4yw30xib24aq31";
   };
-  chinesechess-76924 = {
+  chinesechess-78116 = {
     run = "09ylm4dnn4ag7yd0ck66wbibm8m782fb4bmfmf34wyrnif66sbzv";
     doc = "0m1q0bw1a4kf2jdm8kcp3xg0y448d407awwaf5r0lazycy64ycqk";
   };
@@ -3173,7 +3177,7 @@
     doc = "127l1ll89b61yczjkm36jly09y72xli8lybfjf8fq5pm621hzsj3";
     source = "1b9gval665vsjghj9yy0lb15v4h0ysjc3l47jln55qxfd56vxiir";
   };
-  chkfloat-27473 = {
+  chkfloat-77677 = {
     run = "1bv0gfqa1bhrwq7vmjn0ih49lzb5g3sxv1fdnp25lxp5fxck31k5";
     doc = "02s4m1ngjcw8w0ywyqislxs6cb5vj5zgczg3dnfpqsypvxg2xr12";
   };
@@ -3181,7 +3185,7 @@
     run = "1045jsyhp39js54xmyr1wxh7qp3z5hzasyqi33nvrc4g7rb9126j";
     doc = "0pmgdkdn930lzyn8j3diwwam8c7ikm4fga3fh1vpigqddykj7hqy";
   };
-  chktex-73776 = {
+  chktex-78222 = {
     run = "0nylnlw6fha9bl5pp9qrblcd98npad1c2ic2s25axizmzrm5na85";
     doc = "06fa4icb96x85k4fcx4iqw7fyv4g8d6jqpp7sv79c0lfidn6x9wa";
   };
@@ -3190,7 +3194,7 @@
     doc = "0mc8nlph24bh90l4x5bfc9dyldd4jjn46y08xgf194482dz2q8gy";
     source = "03s40qmlbnlslcv8na5vwz67fad1chagal1pjq6lk0glhn5211dq";
   };
-  chngcntr-47577 = {
+  chngcntr-77677 = {
     run = "1a61sdmfbbryqd2gj87bm4qsva0xjmf9mkxhxnjixpqmr4gixq8r";
     doc = "1rrkyvwbgfxxrnsdjybjqxqg15xyzr4s7qydx1ky2k7d2yxhiy41";
   };
@@ -3237,7 +3241,7 @@
     doc = "01r547l09fjhzrm19gi7xwrvhfglf9a0cl2v1ikncfhciy6dvjcs";
     source = "1v9qsmqhb96b8p27bim3s71ybarygksifanwgl55vha0408s3zd0";
   };
-  cinzel-64550 = {
+  cinzel-77677 = {
     run = "1v29lilvh6l5iynf1810p67qx2znxbm04wavj31w5q7rvnar81xs";
     doc = "1j7i2bdbrfadw25ajkgkygkii3prybhp4qh5k8azbn7zpxl78q5s";
   };
@@ -3246,11 +3250,11 @@
     doc = "1zmyxc0iz7ljrkklqdmpiax9alk56pf1i4dm6ljpyisd95blcys2";
     source = "1vdj8qzym1ihkhm628zz99w6xwzhav8ci0vlckqpz3y91nkkpxaz";
   };
-  circledsteps-67889 = {
+  circledsteps-77677 = {
     run = "0ybaz7hl9v8g0kx8v7j8llgxvvhaj40afk5fi9733iv8m0w3mz47";
     doc = "03426fkcxcjszpm852qv1y4kb581gdkk109cyfy7bjyx8ihrxq0g";
   };
-  circledtext-76924 = {
+  circledtext-77677 = {
     run = "02wfbwa35fk2gvwxl75bbvpswfarrlz1labv6ca58rakasq3zs9g";
     doc = "0fr70nilxfah0mrqld2a2j4yw89d0y589ijmy85q268348bcsnra";
   };
@@ -3258,27 +3262,27 @@
     run = "07cbpxyawy44ds1vy6kpp9cxgv2mlh78i1wakzw30q0bj4rksw7b";
     doc = "192kcaa3pwxf0bi5gw2kl728lbqhg4picji9fk7mhm7s1mhx2c3b";
   };
-  circuitikz-77296 = {
-    run = "17ygcwg7dh0zp2wgrwg3ls8m83mpz5jvm3vcsqdaca3yl7qnag4n";
-    doc = "1671kccxkll6cd7m0bl3js1s35w8fmghr9s08y8m1srjfsrigvni";
+  circuitikz-77600 = {
+    run = "0fgrmn8sqagy143a819hi1w0lvss7q6bdiy5agpvvg257dlaa6r7";
+    doc = "0jdmnmc2sw833746wzq9r28j9v9dwy0c8fvwjgzznmp0ryldqaz7";
   };
   circularglyphs-73069 = {
     run = "0d8hr1lns0973y61qmmz1hg9pc99j3w4x3iaqi0f0jlyzxc5j1m8";
     doc = "12s7fkjlbbiica7svrha74zh3va390ay87bajjs0lgx6smqfx85n";
   };
-  cistercian-76924 = {
+  cistercian-77677 = {
     run = "0sk6nf2ad80djdkysjxw8a9x3rn87dz2q9zsg6j1qs9jrkifj563";
     doc = "03rk8vybhmbciqhrxlk63hq4csn0krsll4hhqzjivyxrllwjsvrz";
   };
-  citation-style-language-76981 = {
+  citation-style-language-77677 = {
     run = "0x7gskb89mzy66x78m5pcr3aqfh2gprwlnhgz7r3df2skf3spxbs";
     doc = "0aqmnw7b3wkpa65q6rnz6xrgaxxzrnw9a55i3azdja0icc9ca3rv";
   };
-  cite-36428 = {
+  cite-77677 = {
     run = "07nw7axvgir19ayi3zy0b2sp8bb9pq1nl36x0wv3nrqjilvgrwr5";
     doc = "0pg5fc41iwqc1y9m9b47nh48fqp5dpnjbx14ny7ch9irxblg5d31";
   };
-  citeall-45975 = {
+  citeall-77677 = {
     run = "05nb6pywcrhqi1c9xfzkv46j2fq9y1lqmqawi75v3z56h2v6c136";
     doc = "1p54cr0khq72z396r3vl0p9qqn2k82pmx4pjaszlzhni5v54hbdr";
   };
@@ -3326,7 +3330,7 @@
     doc = "1i94ql8n9dfxmag259fr2zbiml83pmzbh30xzkcwa1dpggpvm6wc";
     source = "1jkx6vzzsv8332dn2b9aknjmb3sxncvgidjs3a28fnlmp9igc93l";
   };
-  clara-75301 = {
+  clara-77677 = {
     run = "19g2vpxwjjc3y88ghw8yv0abkm69x6lnjj4p1cqbdjiyy4n83677";
     doc = "0dkqqps72wws7dhynan243wf86gxn4chn1v5iiishkar33xvvlzp";
   };
@@ -3356,7 +3360,7 @@
     doc = "1d1pw87hszspsfrl5c14q3c2iy1fkbh77dzldhajx71iqjfza634";
     source = "1x7dvg6q0hy6pg05qpi2qaxw7y7a2dcfa4khddvbfcngp1dirrzi";
   };
-  cleveref-76924 = {
+  cleveref-77677 = {
     run = "1d4qp3jl9mgv4afgdgcns5rr7agn5smiwqkmrasqchj4hqzwxhwd";
     doc = "10wy2zndm51fy3d80cqnwsjxyczqjjffx61ir6ky3nkmiikiyypn";
     source = "1qyyvn226dj4yq25cf5f7yzc3gx9qmxmnlnjijydgmmwam71s3xl";
@@ -3375,7 +3379,7 @@
     doc = "1j5g6lx6m359cgjpn65n0a5k8cxbw1ky47yh0ahrbpqdg99ll4qh";
     source = "1nc0y935dx89q8wcdhhcd6y5cj0xwc660bn10m2gzcvsz09bzyax";
   };
-  clipboard-47747 = {
+  clipboard-78116 = {
     run = "1i9facsdigll3rzl8xv1i85cqyvlc54xhia69cv5cv0gly00p1dl";
     doc = "1b6wvadihwglj0653bn8fnnq18whx2hymigvyknw00fyn3xjgvgk";
   };
@@ -3388,7 +3392,7 @@
     run = "0w5z1ffi25nabsaqh91glby7ifn40c9rhzxlz2kbyvbrdg6a3and";
     doc = "1wp9hglx1vw8zfa182m2103xb0rhg9hmp51rc7bzm6fh3iyz52is";
   };
-  clojure-pamphlet-77161 = {
+  clojure-pamphlet-77677 = {
     run = "15q1hx198bxr5ip9ssfyf9wbccqrgwknijcbnqsm9mp082d0vc1x";
     doc = "1fi2yxxnqlwsq3m66b75a16hpx4vs3imij175dwvjq1nvfg5y8cn";
     source = "096whv58b2g15m6mzg689d0mp6p9yvj8z83w431zbg204h0kx0w5";
@@ -3410,7 +3414,7 @@
     run = "1f7p04gaccyynqm0wzfz8jinsrrwn6i4amc51s835gxkjv2d8gwv";
     doc = "1kryc0ay3bx1maydfha6wm4qw2l9xprnhs3901qbz904l21yawhg";
   };
-  clrstrip-60363 = {
+  clrstrip-77677 = {
     run = "18ln2mlc8bhhf96kqawba5dqi38f5j5s23qmp5dmpgdm7fdanlqn";
     doc = "1mf6bcc17ivcdvy36ash33bmhh9fcry0w30bfi96swjq17740cla";
     source = "1dc29n1m6bq5rbpf66q07nss8iw9mcav8s1gzc56j12ik1r2sa9y";
@@ -3438,7 +3442,7 @@
     run = "1y71gdk369hs2yzbfnj5i6yy2xjzv4n65vcfb8z7x596kpjm5jz7";
     doc = "0zc7fv9p1m7dgi3vwkra2d8x18c4gkqzkd06gp9c18jgf0m6ahm5";
   };
-  cmap-57640 = {
+  cmap-77677 = {
     run = "11ki3gqlk6hjbpffmi2zdlj0rg5z5drcx8zw9nc480mxz931h273";
     doc = "1ykxc5bg6s1c2p52fyl2dkmkg25ylngsfrhsw05yzskj1l8v32yh";
   };
@@ -3450,7 +3454,7 @@
     run = "03da7ak8q3qyvwnk52mn2a79q2mfbfk0bfrkvmjpqnlagw35qmbi";
     doc = "1i54xpnvygfmwbvdnj5wwd2fwfl1y4f99afvs283lz1ki2857aj0";
   };
-  cmbright-75712 = {
+  cmbright-77677 = {
     run = "1ypjv6wfj1nm6wj6laniv304zri75q9gaik95sxbz0wh5cxzwgr8";
     doc = "05cwyxmh6mqj0xf4awhif1vvms0j1lmadd1fgil7b14l46mcd99c";
     source = "1y5is2678czhhkw4y5nrg05qqfi3n7fbric9m6pszfkh4iw0ml6c";
@@ -3463,7 +3467,7 @@
     run = "08wyaqfyjp482gwkwfq2xw3skazfzlv0nn59qri9728rmgykd3wn";
     doc = "0236d4ngq70xrgsaxg0b0yqgcnq55blkq7d4hgw3sx6s6hkxfkn5";
   };
-  cmdtrack-28910 = {
+  cmdtrack-78116 = {
     run = "0ygl30hj8rczxj8sxis9cfq419rscvndj5fwyrls3c1d2mnscizd";
     doc = "03gp5n28lg10h6amf4vxamvnsr7hvrkhmscfcdf4jyp3kkkvnv4w";
     source = "1m8kfxys9nh3xml6inyn4qyhqmw3h572lvlbh7g4z0zzqgiah3qx";
@@ -3475,7 +3479,7 @@
   cmextra-57866 = {
     run = "00my52lh3cn8bn211fpn7373b7khaylx4fgkrd2m72xgaymil308";
   };
-  cmll-17964 = {
+  cmll-77677 = {
     run = "1mv2npq85fmm8ff3n2czs1mfjqcqpy5rx6dwy9c5ra1nybx0a5ak";
     doc = "0ps62xbzac6k9hk0s7wlk14iq70h922sxgagy5m8an9vqp94mjzi";
     source = "1vhh0ds96n1yy3nby8np7v4i747cana8acvcnik1zz9h4xnf4brj";
@@ -3524,7 +3528,7 @@
     run = "0g7211nljimm9a5fvry89ch4nf49xhad9ka7prdmlpj87h9ygas4";
     doc = "1fmq2r8ssvp99ykil3aak8w301qvh4nldsph389m7qar2pviy1sk";
   };
-  cochineal-70528 = {
+  cochineal-77677 = {
     run = "09bhgl11ps6zw62y0jvh2pfddxcgdc92scv9irpxf2nvjlyy3wg4";
     doc = "1lg1z4nlw3w5hw1ivhbbk44qg42m8s9470d64pgzgbgfsalyx4fp";
   };
@@ -3537,15 +3541,15 @@
     run = "0s0145rdpqbbagc2klx2w5h6mlx4ns0qlllws31qbvy6byh65ngk";
     doc = "1pj5qnzfa7725v6cixkznrs7yybc2v0ik9q2pxa4d25rpfxap524";
   };
-  codedescribe-77215 = {
-    run = "0mk39vwdp3vm3cg5xnr99aam41rsx9kclyaf8qqgd1l1g3mn6881";
-    doc = "0pp558myd7r3awg4vvx1yi6ydcj47ka15d1g9510wx75ky5na10f";
+  codedescribe-77818 = {
+    run = "1ld2vy2icgx27inz7lyfnpqscxx7vpc6fngb4cqcqpvywqc7bgyc";
+    doc = "1h8dz525ljfb2ca31svj314vz39kpzifd5c5ijhayyknf8k9br8h";
   };
   codedoc-17630 = {
     run = "1zz70vp8ssblnacrqdsq9nwvf1lw69mlk9d94cfjc818szcgi9v6";
     doc = "1f3i3vw1cmdvgp05xckr748kzbairhvdpfvr844y7wnmxzr4rfzg";
   };
-  codehigh-76924 = {
+  codehigh-77677 = {
     run = "0jd7fqb58hlin8zn1xyyfqqjm9f92nclkqlcy9qhn5x0c10scxdq";
     doc = "0adk0248s9ncm1vkrlw3d7d0c3ajl735af5lpilzsbj1b8yqzzvj";
   };
@@ -3564,7 +3568,7 @@
     doc = "068234c0shvblzkcgl67a9s9whcbyjy3mjw60i8ljhs5z5wjrnc2";
     source = "1vsb7dk4mlaacl9ls17lm4xdw27xzdgvng02gkfjvja1ja3cq4zr";
   };
-  coelacanth-64558 = {
+  coelacanth-77677 = {
     run = "07y3hgw3apkkncch9qcl71l5xaff8zqpgcwf8is7wz1wx173hafs";
     doc = "0ylnvl6ya87aivb10z8sq2rw02q3kljdiddjfarx70mr1jzr2hma";
   };
@@ -3577,22 +3581,22 @@
     doc = "0hnf25h5bzlj3ba18h5rr21br0cra55s9qrcksips571d5fv0363";
     source = "086y5m4n9fsd5cp485vqjxyyq6bf671j570lhq350bb0ynid6llc";
   };
-  collcell-74187 = {
+  collcell-77677 = {
     run = "0d88sziljrzdzxq95lw3sr0y3pqz8mwdfn93y1nls13acqy54lvz";
     doc = "0cn5c90l19d5x543ncncnb9kvn6kll1pyim37fxvxgrl9q9k1gxy";
     source = "0z9lxlnk5ff1w1r6hg4mrkk667c41v3kkxs3hb4pfa1syv2l0yi1";
   };
-  collectbox-64967 = {
+  collectbox-77677 = {
     run = "17bz2nh141yw4cffv1w6cdnxkgi6ilsr5fkzkp6h5glfibmzhi62";
     doc = "0j9hs1q8bzm4p7rwiikc805khkar23722ylf00yb7mp5mvky8996";
     source = "12llsyfksri5hlncmj3bba779jhwxxdr9zcck02jmrvx61d1znvh";
   };
-  collref-74757 = {
+  collref-77677 = {
     run = "0c4xpg5lgl7vxrx1my5ghaqldmipdc2n51i8h8j7rxqayzc8br2a";
     doc = "1lpbfri1a5wdc6cb51rj41lwys1y0wjc9w0wdnglnnp5b2x9l7pp";
     source = "0mxpn7aqzdkqrihc9sqnqdysa52y15aw7liva0dbj2yzcm151p79";
   };
-  colophon-47913 = {
+  colophon-77677 = {
     run = "0v8q22qxjrbc1mpsmfvdp13iwkjxp11cxs86h2b7b9rjs0cjxy6s";
     doc = "0s2kz7q6nkwc19jyl32rzcbbcm7ykhkglanx010xfz08vgirk1pz";
     source = "1z2dihgwd4vbk87n0hzpipm2359fwl1z13fjs4g9r5ys7iv36wsq";
@@ -3611,15 +3615,15 @@
     doc = "14bw1g3dna2ykyv4fl32gvqjs0n75vlfpc9icdk09l7zhdspsvfn";
     source = "1bssn8rjrp34nm6qhmzcrcn6a0ah9lv5n94d1jxqhhaj4pmimd2j";
   };
-  coloredbelts-76924 = {
-    run = "0ldfqnf673fbh5gd00zlm5d0in1wlrzgnagg09xplic4glw7cfhs";
-    doc = "1qrp1mn8mvvrn4qwqcw0zvz8yj3l21svxrw2vsqppjp1isbacrxd";
+  coloredbelts-78042 = {
+    run = "1r7q89345mn2v18k6pzs5rvl1yjp94i4qdj09lv7zx73dliqbsqs";
+    doc = "0cnkjkhwmnrg4057024g1fzlimpybnnq4ri13rgmizwhkbj6rvpa";
   };
   coloredtheorem-74812 = {
     run = "1akvgwz3vgk0skblbpxi4js6icb5rmcvcdf6hzbkpgr0w67cq0zb";
     doc = "1masfrqzqfix5as9myf2l8v73mxjzlgcgw2pak8byimdgmm7jard";
   };
-  colorframed-76924 = {
+  colorframed-77677 = {
     run = "1kys1kcq1j3c4d8mv22fgdw5l2c9ar3il8cc65w0lx4avbldw28r";
     doc = "1xg0gbyh0ay38yk00in78q7mysnmlr4maxzv5lw3s88l0adykr8h";
   };
@@ -3631,9 +3635,9 @@
     run = "1ld6gknb8a59pkz50wlil5p11mnv6ss0zsjbajbw63dg0zlwaglb";
     doc = "18y8apbkh7yqzxrzpraqhd76k93xnvgq5rana8lq4xh5z3f7skjq";
   };
-  colorist-76924 = {
-    run = "1p5m9i449714k6jnqh2ms4llms1nifnzmg9sfams0ng8pranlhgr";
-    doc = "0wbzik5805f5pg0w8grfdaacgii56dcyhfldkf5xgfbn0s35xm1k";
+  colorist-78012 = {
+    run = "0j7z4y7i5m6lqmmms46fw6imjcw988xkaspcj4aakr8hzr5wx3m1";
+    doc = "1jfyxjivc7b84f7v13ly67m67w2zkv3m2pmwmf65vbvk79x37wnv";
   };
   colorprofiles-49086 = {
     run = "05nf7y425f8ric57c3afq7ymc7ndxcdahbx9n32jnaz9j3qq2ypl";
@@ -3650,7 +3654,7 @@
     run = "0hiq8wgqiwxnw1gsrymshkldspdnizcci56ihn22h0hcwz76hgzv";
     doc = "1cj84k7cl6cww25yy2lynjrbicn0qy4y09rh6dx2zq19972fggi3";
   };
-  colortbl-75287 = {
+  colortbl-77677 = {
     run = "01p79xgwyvidrycrqq2daqzv1xls5lc3snpxcydbd5l6xxi0cnl4";
     doc = "0kds9hs3nmpvw2zchkfw72igv89l8gmx83ksgad9m4fj3y37dq7m";
     source = "13414gh7wca7j0bwvjwm4hrq2if8azwi1nanb5pfbrfqg6nv9z5m";
@@ -3687,11 +3691,11 @@
     run = "051xpkjszw281gcpacc5s6wpbvwx66hkbr5fpg72205raa454bjf";
     doc = "076niz8w1i6zwq1938iplhcv41qfasqhw8darlr84fr08d3hjwl9";
   };
-  comfortaa-54512 = {
+  comfortaa-77677 = {
     run = "1kfxl806y2g6axx8csnd7njyd0skxx1gpw7fm3paz8yrzvyyw89g";
     doc = "0irfhf9qw81m9x03nybk7br1nrsk4gx1dccd8ay7wd3sgw00kg0a";
   };
-  comicneue-54891 = {
+  comicneue-77677 = {
     run = "0w2jbwfzfhbm5375852zv9rqih3p7grvi0s79sxr6gpzh7iyvlxr";
     doc = "0wr71zjk337h9p38nm67ga8js60vqyqfslwn7dqvzg06p0741bfk";
   };
@@ -3704,9 +3708,9 @@
     doc = "0mk7k9gyv2xxd3l7m58dsirk32cn7wbmdy9c0nc6i1jyfpsfhmq4";
     source = "0719a7bp07vf5jgx00cjdgvzfnv7wbxrxna2bdjjsfyvipyr4z8a";
   };
-  commalists-tools-76924 = {
-    run = "0yrcd65zr19740pikh16isclhkc5gzc70yknjym2qaqhdbxg5kzv";
-    doc = "1rcdkksv8mzmglgpcg33nnzl7gxdq15gsgpmpgvfm1rnn0yf5lkd";
+  commalists-tools-78016 = {
+    run = "0llzn8yvqbkwlw907k7plaakzzw6kv9nabqsc1d0ifrdh45paziv";
+    doc = "1737r26dlnxbrlddlwjrqzz3wbrirx0ln3b14v5hm4x7l0vif8d3";
   };
   commath-15878 = {
     run = "0k3s00r4l8bypv1166p8jkdj1wrx4ar4w0y1fggmpzivqicc02g3";
@@ -3717,7 +3721,7 @@
     doc = "0vvnkp8r0xbsyvzps4a20fr43cj2559cs6mq7jhja6jzvqqc6mic";
     source = "1kzc8i6nmvw7xwz9fbfanabypissbm7hnmmgp2m8r462ywzpa79c";
   };
-  comment-75712 = {
+  comment-77677 = {
     run = "14k4y4abv5mlhn1i8f90bxfymp9vz0aha4p2gql148wj2hh7h96m";
     doc = "1589g0dah13lw4p18cqprhfnh1184m79ddrgvc2l22bq6vb1dsb6";
   };
@@ -3773,15 +3777,15 @@
     run = "061kfzds7clbxyq62ilxwcrdkfghi2lx8afik7vi9gg0hysbki7y";
     doc = "1x6wb92k4da01sv8b35p3bly9hj46hh8k9wr22m7lj3rxnndnpcq";
   };
-  concmath-otf-76683 = {
-    run = "1bpglz1l91yp6lg6p0r5plkilavakhclvdyaqxjx1f6mbqgi7wxq";
-    doc = "1fbqc3522csq0lrby0s350jii54hrfdr1nk2xfkf0hw7vs16nrwn";
+  concmath-otf-78182 = {
+    run = "0nfb3faghmq4i6yvpbf7lz028x96z3bqb9rwcqw0pw253r3v8kvy";
+    doc = "07zl38cil283fdzharr38rz7knglc3kacgbcffsmiyg0kk0bhwwh";
   };
   concprog-18791 = {
     run = "08yr8yk9gp35d0nvh54ysgv61s062vj446fyb87n8jipfm49mj2x";
     doc = "197p2bdn1rqmxva56sagvb1z7kc8gwxr9zf612r6g8yb07xg5riq";
   };
-  concrete-57963 = {
+  concrete-77677 = {
     run = "06m8d6z5z3dpj9i0nvp50g6pn9j0m4n0n1j3w94nml137qghawyg";
     doc = "06z5hh9ksr9jpkfchyh2zp8b827klb4v282ipizrm1dvlv2r1603";
   };
@@ -3804,10 +3808,10 @@
     doc = "0kgdggc8gpd1h7kdbh3ala5kz8rs56bgmwgv9wvxsqx4sn19q2fy";
     source = "1y0g7sj696d6qhcw8vrpxr8gwik54slp7lijbxz64ksqbw5xjqv8";
   };
-  context-77320 = {
-    run = "1s20c5h9sf1q91c9ad2cicj15b4xdgj0sgdfrg4x54x8ja1s5fca";
-    doc = "1z62ncir8n6kmjk1dbf6z9cr8db5cyclj2cv4ba8if624l8v2mvy";
-    source = "046qrcm9kdhcg9ijh39k6girhsg2s3gy5dj6gxsa7rxhxg2vzhbw";
+  context-78011 = {
+    run = "0xq3krsh9sgawwd1wjjvz8jdvpdjizg1z8fj9y5bacn89y7vkhb6";
+    doc = "1c3fzicn516hgbl6d0kq542pxzjnx88c0bvsc2pppiw0xa53nz1h";
+    source = "19y8kdqkaz4f08fdxxflza44qxwkdxvkn902m65pyys2djrx831a";
   };
   context-animation-75386 = {
     run = "1cy0jc6wk9kfxahndf82wwns4dhn1nbrxqx8v5bfb57m23id8vff";
@@ -3841,13 +3845,13 @@
     run = "05g9p85jgdsv54wgbm3ygs44r49mgkdsm1r0b8l4s7ahbzfvfivw";
     doc = "002mznma23iclh5kgxy4k08ypvfac8ahrxpb05rdrfz6qs7rzrsc";
   };
-  context-legacy-77320 = {
-    run = "1fr7qzj0f27fdg9jvavp25fdxfkjwyasw54vmal1r2nn7vj39b1r";
-    doc = "013czblji32dprcw1dw7cqs2n8q0np7z7wc8smxkzpnas6d7y1ci";
+  context-legacy-78011 = {
+    run = "166a1fx6109vcn3pxmajkvmbj1vg04106hkwgd1drsc4wxvanypg";
+    doc = "06n82lkjrwgc3q618fm0rjl6aa3pm1g8as8m98add6axv8m7cil4";
   };
-  context-letter-60787 = {
-    run = "0bnd56v120h3c235n9v2h6mzvmd6fy1g837gjim5fkkqd7jyzp2q";
-    doc = "0l4vgrpha5kx2990kdk4pdfljznlczlji0fxqsxs292yb3yy5a4m";
+  context-letter-77850 = {
+    run = "1s4z972l86ivf0gavf5301yazw5f88q689mv6jr0n9qaqmj7mn9a";
+    doc = "07nkkg4l6psfp4iyf5i7w42fj6bk4j86y1klwxncabhmw9hzsf7f";
   };
   context-mathsets-47085 = {
     run = "11r30c6lpcvkx7awgm70cb5darl90fvpnf37hj2mb7h69d281hv6";
@@ -3864,13 +3868,13 @@
     run = "0dgmix9w576vxmffbm4digcp00vvdgmdxmxwjzrrkici4rq31w79";
     doc = "17djxi04rhg61fjcmsz4yjp7mnc7g1fbfb9mmkcf7gk8dwzrvigf";
   };
-  context-squares-70128 = {
-    run = "0l56p7zf7f9ywb66v6cppnqh4k6zlsvwj37vxcwshwjwl9z3cfmj";
-    doc = "1qxcy1qhk77p63h97qad3jvvfcmsgjm6b81cn10aakvl3sniy7g3";
+  context-squares-77884 = {
+    run = "05fihb100hmnz6nfjg6ny0zc25fcira9fssrvl906hfqvffmhl4y";
+    doc = "1l6zlhvac8bxb9rhdi7m7mj4bwap5wv2y7ykhv9ha9hss19z719s";
   };
-  context-sudoku-76924 = {
-    run = "0fnzvzpn2d24hdi5g18f1mpaqkyrcf8kvkprqdz1jvlkqld82kd7";
-    doc = "0dqzxcljl1mn7qs7hk2pahvc5791m4c911j5dv85fwaladhjv9xb";
+  context-sudoku-77885 = {
+    run = "06m8jqr587w5wz5vj9gw0lpic1n9kpf8g62djdr2psl5529gz1p3";
+    doc = "18236p98af8yrjv5hpy2v313x7pigy71bl2blar7ny96aca7llvq";
   };
   context-transliterator-61127 = {
     run = "137wjy0whfbwp95h4grypwxld7kxlx9h6l3bkd5bpfnqhg70j05d";
@@ -3889,12 +3893,12 @@
     doc = "18ncq5d4chmnmxmhazbjh9ypsm4c3577vgcmnx0y1pmzgb2g8pn9";
     source = "18yyv9974cxzpw45rzw6ia2jamrb07bzw6gqchdprdjs0xmhz308";
   };
-  continue-49449 = {
+  continue-77677 = {
     run = "0vwz01gmbid6b2aj32qnz1xrlk9h0nicjv9ix1rvqdad20m1i4wa";
     doc = "1mzsj70v9f6srmc8ja62pph9j67p644hl54fx6nyahvr2h9vdik2";
     source = "1q835904qai3r49yi8hrfxkh4bjf6913qs5fd2dv7myp1w93j5ir";
   };
-  contour-18950 = {
+  contour-77677 = {
     run = "0xb8a0y3jazrq5gxfnxjl7qkyaqjnmyhjshgngqcsrw2sq4j4li5";
     doc = "03rxkl9vhhqa7gpigar8w2h78qvx4k68chhf0881ws3bm6lg15sy";
     source = "17sfl4npipzgc7jwqx740nny7fnd8bv8k4vav9ds765ky1xcs521";
@@ -4019,7 +4023,7 @@
     doc = "102axl32lgrdlav3fyzsahkcikmapivydbfwm3wkib624i1f1h95";
     source = "0f8gspf0m2b78fr0jq7n4s3y0f80l1pc3qr1rzjfs6xdrg1nv633";
   };
-  countriesofeurope-54512 = {
+  countriesofeurope-77677 = {
     run = "0387czqiyawxcjqh22czyd8f7y55kcrscxmp28rcm8wqqdh2ra0z";
     doc = "0h06f5rpizsdqddqdvvvh5p3nhm4y5aixjnxl8s0b90wpcldwrpg";
   };
@@ -4031,11 +4035,11 @@
   courier-77161 = {
     run = "08g6lm12b0k6333pxcaqdf67v87fz5mrqp3jgal8qhrls5ym8q6r";
   };
-  courier-scaled-24940 = {
+  courier-scaled-77677 = {
     run = "0gfqc90fq1nk7w5rvy3fqd5799aaxh48ia4wxcf01bhs4l7nrl1i";
     doc = "17zr8bdv5dv8hybbjfvkrn1skn6xpl41yfrb4q1nq491nwbppb14";
   };
-  courierten-55436 = {
+  courierten-77677 = {
     run = "1maxj7wsjqh2ni75pjpzsbwh1f9abndka1ilaiwik1c21kgb44g6";
     doc = "1lq4clwd38f8l4722khgnldjfk11mn1m4m82ppb1qk04qyh1v8sp";
   };
@@ -4056,7 +4060,7 @@
     run = "06dhy5bnvk3c08rdgnhi1rbql0fz0ppfmr8hihyshc9ghjry6qkq";
     doc = "1y903d0xbimavg5r5l8v39l9mikrl3316p4rds7vbi04k09a09z6";
   };
-  cprotect-21209 = {
+  cprotect-77677 = {
     run = "016z5zz8njkk2cra768jlh2s9l3r4wmn50nk3psmk3v0i0cy0197";
     doc = "1wjyrb0z85yighkw9a1pxxwilp31c5fjra7y07y0v1z20q6g3rlm";
     source = "0lrf75hvlp6jpwfppkj0dwv7a9q51n897bwrf3gzwswb7icvqnf2";
@@ -4065,6 +4069,10 @@
     run = "021581zdl2c4j6crp9cnrnvxpwdx0jhhx5ab2ax7016hzsxff8la";
     doc = "0m7hhy2wlagymkq0ckr6yhiav02y7b623gd47wkk75f48rm0lbdc";
   };
+  cqjtuthesis-77776 = {
+    run = "0y73i04l0bjz5p95ynh09r51w4p1r3mgh0061k2k7pw4mbzpimy1";
+    doc = "1v0p8sy6rqrvy2lr5gyy3igxa0nbw12ajgajs0krldfsvl1wjxvl";
+  };
   cqubeamer-54512 = {
     run = "1r63ahd6m6ll0phqaxc02hnbrf3f6xjdghrhn7wdqxnf8n9k34ff";
     doc = "0rgfjw69is9i06blv1dr2ki6d8lgfwg3w57r3620r7yffj7z9hpy";
@@ -4082,9 +4090,9 @@
     run = "17frsrll9bl5p4qhqw9vc0ff9sxvksb21qhdahjm8qw796q0mbqc";
     doc = "1waxkpbvp3ghxb98hhyp56wby65s72lj01055br1av3j4xz3rsiy";
   };
-  creationboites-77191 = {
-    run = "00ibqwxgyzqzk80hhrf6rcfcfwd8dxb7xbraszz3zanqn1qzmx55";
-    doc = "035s4vb3qzv1km04lgfagz50vizfhb3xi266rafm7vbv2afilv1y";
+  creationboites-77775 = {
+    run = "1ng15n1w6aa04nlr5q1qylmpg276c61a6b5kchyafjwy9xhfp7w4";
+    doc = "0xh1vwwdi9hjy2qidvbal02kn6ibbn5x3zw258py08q7bcg8dh2p";
   };
   crefthe-76924 = {
     run = "1kwl01gnfr8xwk2zra14faqq4in4wijc03g5sdvgh2c7a9j3zm00";
@@ -4098,7 +4106,7 @@
     run = "16jz8i749gk7s87h2b78nz6cclmgvfn35kh3869rsf299y4dbkx2";
     doc = "1y8qngb1v6paqr643kh8sdipnp57lkbqwbk62r8nrxps2cvw06g0";
   };
-  crop-55424 = {
+  crop-77677 = {
     run = "1hnf65q6mg5fq75l4g81zvp4qqdb092zb41m6nl3zw2cvp8gal23";
     doc = "1w6ql3bnghj633ar1zwbv580py4f1fmdm4vk7pa3q7vpnrwrgh5n";
     source = "15fxivp8d1xww6j5nbfkmsb0b2c2ldmkdy3ikw3m6jjk269nwy4h";
@@ -4112,7 +4120,7 @@
     doc = "1iahzjwns9zapa5y7z6yy2wjdcy6qiqrqvp9q9v4ky2zgsf7n5pi";
     source = "0yajk2dxnsfy74r6a50zs4lc064aha0lzfqp26gpgnsx2h0bvpix";
   };
-  crossreftools-55879 = {
+  crossreftools-77677 = {
     run = "0pdhi9yij4n6bwcwbk077sdvwi1v8ww51g2r9ssfnmvmxs4zjw27";
     doc = "0q80k648b967q9gcy7c3lb8ywk257zbsw04kc2gazlc61scviy49";
   };
@@ -4120,10 +4128,10 @@
     run = "1jw4wspjvr9f9ff3xfh5yy7hszca67g7jx7988xyvd5anffywxcv";
     doc = "1gcknabbbijh1yi99fl16ikqjhyhd0mg3i78iyi0bb6a2nil8f4k";
   };
-  crossword-73579 = {
-    run = "1r1yl87rra7g922bmij4xwh1prm0k368lxhay0hs7w11jklmnmvi";
-    doc = "1x58s971hbhi9rqlnqyp293fcm4sr5gbppwzikqlfnwgb21ll45d";
-    source = "1lxsv01waq5v8zyrm02j05hwczky696nm9agqq3hqcndx2jj15sd";
+  crossword-78222 = {
+    run = "1j7w2kxbc93yl5i5k2c24wsgs40nxh6scq6dv2c507y432clk8xy";
+    doc = "0vnsqpxdpsnhpmzg8253ndcyn7ws524ihir94bixcynvmysx3d0p";
+    source = "0fqn8gxqfan4yzss57ga5yn22s6ypa51l8mz2cz200mm594fbwk6";
   };
   crosswrd-16896 = {
     run = "1c85733q3x56s1fvag4kw39r6lnx4hr1wmhsrjs0jnyf5j6lf38w";
@@ -4147,10 +4155,10 @@
   cs-41553 = {
     run = "0nzzcg1yvbslhqm5lsfcpqh6sbzkmnmmgyakg9l8855qpa8g9bf3";
   };
-  cs-techrep-77506 = {
-    run = "0li69clkm904f6m64qnqzh5jxzcr2q8zva4nw6lnhj9md0nl0qka";
-    doc = "1wdfxyfkvyjq9b51fsmr2w000ixfw3m24qmlwx321dlmwh2dgb4l";
-    source = "0bdcrvn03imsy920pd7r2nvf4k95i7dkyfxjp1k1xpjp8p23y1mp";
+  cs-techrep-78146 = {
+    run = "0305r52l60f3vqf2ys3ld53kclq84b6nr6yvz7fsmb7yjmladis9";
+    doc = "0n1jh74ckj5h9gfmvyhg8y7izsfsysnpkljh6v1mf1nylfd8mkzj";
+    source = "0k9kvz07pwwvc0li89s3r3ps5a3r95dx6nvdwj5b63fynaj3za37";
   };
   csassignments-77161 = {
     run = "1mwaaf1ap05mp0lalyk89lyhqs26x4w1sx91vfsjxf697lndadda";
@@ -4168,7 +4176,7 @@
   csplain-76924 = {
     run = "14z479gkiwgw17pdghrxh5q0rlxnij7ccj49kgf3macwgmh5lm0r";
   };
-  csquotes-71053 = {
+  csquotes-77677 = {
     run = "1c9h0n86fgxzrkna5vr05g91gv1h45b9fjsm94hkz7xnp6h07fhl";
     doc = "0zrfbqv744s4k9agkh0a004w7ywc4ha8gq7ai7ckdwn2q9dins95";
   };
@@ -4196,16 +4204,16 @@
     doc = "18pmc5h44jmlh583cg0hjr24k2pj369l6ya4hqm9kwka0bhg29nm";
     source = "0mggp5xankhif93firc5g01c6b160bkwqwbhc04wcm4ndlamvip1";
   };
-  csvsimple-76924 = {
+  csvsimple-77677 = {
     run = "0wvcksc2lfnl3635nmpjfzzlvb734wjzcnbyrhcqv94z7knyk6lx";
     doc = "19f4bkl32p5ak4zb5p1zxs7jmiap20lwwyq84n92mflnhzs5i4r9";
   };
-  ctable-76639 = {
+  ctable-77677 = {
     run = "1cxhm38bgg14ryyq4amj42yqkcbr6p1sj5wplzcxh7sd7nxvjlr3";
     doc = "04grq8z1biwlcj4hs3s1l4zhdaggm9b26dk8rxfbn22bkwzlai6a";
     source = "0ra01dn5hg453a3kyzipqbl6zz1s37cf6smffmvix0k41fmsq587";
   };
-  ctablestack-38514 = {
+  ctablestack-78116 = {
     run = "0b739h1ndkisr49d8y4q0vnbl9j3diqwl9r1ah8wk2za1ww2mi54";
     doc = "0qmshnvbyfjhi8bb989hbffwn3447r91jp46z1yhhmcbjpr7clk9";
     source = "0133xxb7470lyfssi1kp81yr1zsz4d8ai3qjy72wki0p7ijkypw9";
@@ -4229,7 +4237,7 @@
     run = "1dvqr96ir3gakxrf4fk0dka80inl6aj3kydcf0128vlq168zgvsg";
     doc = "1gzfib72lfbgzcp5r8130k1n2d00v2kds0x8zdkqnikn22fq4jxm";
   };
-  ctex-71527 = {
+  ctex-77677 = {
     run = "0mk0iix0wygznqhzqd1wzi7hiabr751i0q5xrr3k1nmns68y98vd";
     doc = "19z979xk8mylch56d2gxvln0w7vrwfizcf4apy4kpbm1nhb90gaq";
     source = "09y03idznj0qw2ik0hq3xy1v87sl3xzgqfln1cnvk3c6mmfz9j7v";
@@ -4255,7 +4263,7 @@
     doc = "18a8h3lgdldazj4mslszmqzpglf0vqpa617pfqa1ga1yf7qnh1fh";
     source = "1mzijc30dcymm2lnzzfci1f99rsxwb8a50p6fd2qnynm3ixrvw6s";
   };
-  cuprum-49909 = {
+  cuprum-77677 = {
     run = "0gqrwdh2gpxgc74zq97zm728ykadkrl066v77hjllmw7x6cjxrng";
     doc = "1126yz6ks0rk92jcsbg2m3ibvv64xznrii9kxf6ss36hm1qwkgbi";
   };
@@ -4264,7 +4272,7 @@
     doc = "0v8sfvj7g65r7iyjijimbg855rbbg5d1zdkp7vc58q14y8f34a8c";
     source = "00p52nbdv0x1v71fb0ln63wb9mxdhy7zgagbpmcn2ca3xb83m16k";
   };
-  currfile-70650 = {
+  currfile-77677 = {
     run = "0z2fkxq642kayj10z69xyqy9mla0fc0dr1yiq39mzs6m0zns4jy6";
     doc = "1did5h93my3i49n4dnjn43zzq4w8b965x8b9qrjiiy7jmkw0wadl";
     source = "1dsw2zk618idaz74i2cwjjv2v73c1464i7y8rc9mm68g418cys11";
@@ -4286,7 +4294,7 @@
     doc = "1jv8f3izp9pvzh5qs3sh33c95v0z3wn88f278qxi0f1bc1k8990m";
     source = "0l9cq8aji7z8qh0p45af8rnz0iw9m1hgc118482x699iqrvg96y2";
   };
-  curve2e-72842 = {
+  curve2e-77677 = {
     run = "112ggc53i9hqmh31fgqy47lbpjpvh9g42fgzqs41ssvnc75k879j";
     doc = "1pyyygpyp33kkc4ixdrga9bcs66g427vnfznvy4nyx098841bqsj";
     source = "0bc5r3nfw7prgvdb2226xpm1zwgc8siy3gkm6jzqkjjmqs5nglp6";
@@ -4310,7 +4318,7 @@
     run = "1r74fr7xy5j2iyz4k9wn721hv4y64fwammkyyqy15bpqz8fx5ybg";
     doc = "0ky8vcv88dfg80hykvbdqy8y9w3a7ip2hn1zfws7va65hbinqfw7";
   };
-  cutwin-60901 = {
+  cutwin-77677 = {
     run = "0camjay52m2fbg4df7rrswfn30an4s40bvyvssdcmhmqlbvsh46f";
     doc = "16wmnp2p3hnl8aanm29sxflqcz03qc5vlk9ziq38qxsksisxkl5d";
     source = "0lqjiqlfndqmjmhj5p4flhly69cyg175s8wg2gah1fcfv0dayrn9";
@@ -4349,7 +4357,7 @@
     doc = "1nman70rpgd0wqhgw84qg8acm243y45nhxd32dmh9y8ywabynvc1";
     source = "12pbrk2bmgv25fa0llpk6pfgmz5jljmy1w5b6j0md0ni46ldjxpb";
   };
-  cyklop-77161 = {
+  cyklop-77677 = {
     run = "1krjgk4a920bpgb7c6qw6jx5b7gv97raxpaby1vx1lh5zvbybfn0";
     doc = "1fnsd0p8wp58imrn22zbswk8bdjgp0w9v4hcv8f7x5ks1czcas8x";
   };
@@ -4385,12 +4393,12 @@
     doc = "0as8lm21znzpfdhf7880fsvna1ivprd5q7jc5mlyva6gny6zf3vq";
     source = "0yy8i2qxk7ms53mw05lk8lq1wal1rx3431wqfw4w2v74xy3jpmcx";
   };
-  dashbox-23425 = {
+  dashbox-77677 = {
     run = "034nwqqbd4q99mzdd6958w6a3jcvvpvamdycda5blh7in1gwm1b5";
     doc = "01zb6bc407282xhfc6ccrm38jjz2vyl96h552435b6cap68jv48m";
     source = "1lgpiyfizg0vgfgz51wk3mhhc344gwra79k1xp95c2p6w32bgf5y";
   };
-  dashrule-29579 = {
+  dashrule-77677 = {
     run = "050scy57rjz5pvwd8bbl4h32w1paigyyy7dazr33v28061yap9b2";
     doc = "1ryclmf2l90n20qf516p4qz02znnp5rgjx6pfw4p3wrkamnh6xwr";
     source = "1f05m420qbbk25pc5snh3nb4dx7bd38nwfix1p8ndngn7l9dfkcs";
@@ -4399,7 +4407,7 @@
     run = "0m6vqpa0aj3s98krzxyhpr3wcaycf0k0iz5abb7fqa2rkxfj1bya";
     doc = "0pkq2178hls1q86062i1fxf3lbph28krdbvkbgbiym9v497ihcra";
   };
-  dashundergaps-58150 = {
+  dashundergaps-77677 = {
     run = "000fzv5a00nap8ybzyijz7kx1ky4qx418jmkmyz5nm2rpnz8ckg9";
     doc = "0zj18ikjshyd9jdrn4a8h1l8d9kypr38kx2cfsd9gllppp27m4c4";
     source = "0n43mz7bnf05j31p99dmxr26rl6xzkc4maxra1aavg8s19x9pmd8";
@@ -4433,7 +4441,7 @@
     doc = "1gxjc45zim6vykmskmhrhnkviw9i7la56d2zfyi89c5nyjbry5a2";
     source = "0ks8aka4km6z6xcn6sihsff935z8kg74cyf3czk31wmr9qay4yq0";
   };
-  datenumber-61761 = {
+  datenumber-78116 = {
     run = "0jcpzz01g8n8gxl12pahhbl0wi91in08vmpwf3lnwz9cdsm2n53s";
     doc = "1h7nm009as764cwkdxy64zh27qwwsqlchzfd2qd4wx9gpvg3dg20";
     source = "0qsbqqh4lm075gfv9bjmb795z2awf78nr66lrsj72p6z8wa01scv";
@@ -4448,7 +4456,7 @@
     doc = "1j8zlxbyqpdrwm3z4pgdv3gz2firffk8wwr3ih1vcgn7nqxkcd78";
     source = "0f644wc3c6zx6dgdam4wh6ap4gzzf5qn02krp90hkqmbrg080zxz";
   };
-  datetime2-63102 = {
+  datetime2-77677 = {
     run = "12854by3m3pr6j7s6zm8inj2panr7c9h3ngm19gzybwy7cdb34nq";
     doc = "1pk1k3rsd9h5csnmnhlwi73i6dbwhlpqmf5z7kxgy9czmarbfg56";
     source = "1n60n0i9iwh8qyhv78z4d2afsfk04k912ixjciblgnik1gnd4xjh";
@@ -4663,7 +4671,7 @@
     doc = "0rkibaqirq4xgy6r7a1aws6awyamllg5z5zixb3imapj3x6c8p1h";
     source = "0d21jimjq8sipg1qh4fxwb9cmq3sga0wjlrcqapjpy559bnfgmrx";
   };
-  dblfloatfix-28983 = {
+  dblfloatfix-77677 = {
     run = "1r8s36il4bmqvvvlrsdbhdp4nanbyd1lh71dac4f774bf5pkhzi3";
     doc = "0znp5j2v20q7bsic5j7cjqxmbi1dannffl0b14g2w0jp3p6hpfxn";
   };
@@ -4709,7 +4717,7 @@
     doc = "1gpz0g8s61aryz5y8f2v35v0p8cbwpvsq1x4f45hrhd3hpk96hbj";
     source = "1d40h7vcyaxdf8yrvbx2lns0hg3d0xy9mv9rmqpy8hkqxavzd389";
   };
-  decorule-55230 = {
+  decorule-77677 = {
     run = "0r5pxcpx29l8x1bw4hj4xp66zgkjgm0qn2ryvxy1d30dyjgp34zb";
     doc = "0a3qvnknhcx0jx8x9gk7bh4sbnzv1mnqvdr8l03nzjcbmysvc3hy";
     source = "1lj47s4k44pjnr0n06xdcb37625hkjclrsj4ccmkgcr61d85vkwk";
@@ -4726,11 +4734,11 @@
     run = "04sp0k95yppmw8xdma4p7xryapq3k2rjckvqa1q198lg50183sdr";
     doc = "0klzw3fx6rl4azwq85n9kxyg82hal75cgdck8v5vq70m15c26ha6";
   };
-  dejavu-31771 = {
+  dejavu-77677 = {
     run = "1pxcrv98xgy9hkqhclyp0q5dgpgc80bvjzs378f0dqzc1037lghn";
     doc = "1f42z94n6dpdq481n5wmsx5hx000klmbklghz77x8pc9shgvlka8";
   };
-  dejavu-otf-75301 = {
+  dejavu-otf-77677 = {
     run = "1kflyvkl89d9magxqddgyshfb9zaznv4qr1m9i3vw9vz16459jgc";
     doc = "0rrznsiamk7d25w9i7ya1c76pavja68rkjsd4pg80s1d3hdh6jjp";
   };
@@ -4743,7 +4751,7 @@
     run = "013r0cgz7ivrjfhmpcf5rdfl2573q35qmw0bhprnamij2jpvggzr";
     doc = "02s406bh59qy6g8ckpxhgl0b4xxyr4zf91a6prhzlmbbhf96xbp1";
   };
-  delimset-74779 = {
+  delimset-77677 = {
     run = "0mqlppl9igvvwx9084r1a96gnxm2i9nszi3byq7zmi6canj7r00b";
     doc = "071cmhr0xdgj48h5sn16dw7kgqmjapm33ra4ykaxwfqq76y8y7p4";
     source = "19r6m2s402j4ywgqaxm3z0gvm3bg2w9s4zbjqv756qvc51y7kh99";
@@ -4757,18 +4765,23 @@
     run = "0lk0c5j364mypic6wq8g8nk0gjsvw6y17nv9rkzyrrnsb1zaaayd";
     doc = "1382n265f57c4p4z7c7dmazjydq9fis2b0p1603nw18vbb05djib";
   };
-  denisbdoc-70592 = {
-    run = "04y9dwkap94nyfn4cfcpm9jk2y0891dg7jg21c0ca9b3kckrcgjg";
-    doc = "11m50x8lc0694wjx06p9raj871gr9hmssblm3gnx3phl0vfrmyd7";
-    source = "0gipwjskg2p78r2z4j839yxfar227mvv294bjnl0j16w33d8k4cy";
+  denisbdoc-77983 = {
+    run = "1r0p5dcdfj9y1n040d8sf3xjd396jkhi3lwr3m5ixlgam465qrgn";
+    doc = "0qjzms4rviq83hznqk1qjnxyn14nkld1bzg3jdirbghdvskxzqdy";
+    source = "0l8127yvgb3l99zcsa2v89w7xrq5lv9j0fjhrvf09vfridsvddb5";
   };
-  derivative-76924 = {
+  derivative-77677 = {
     run = "0n29fjh59wkpigk1759b0m231zcmli6rcsplj0zhhaf4jwxk2apj";
     doc = "09mv84hz56l3ihccl5cln8avw4137c8kwykh9s0j3y1r19iw7x1v";
   };
   detex-70015 = {
     doc = "1vs9agbdyhq9wm1c9nd7wwnhnpvdzjh5msbmhn3xyyq45ylqvbwf";
   };
+  deutschesmuseum-77887 = {
+    run = "1kzzrzjl5aczn0qiayydhardbksb0qg6hy91mac1nfk6qr0ig6wy";
+    doc = "00y5z0v3cc6xx8m67c9gckwd03jzivnnrrhb1ylp799dk63j2pa0";
+    source = "01qpdl4xsf1fr46c8yrxn8473bnfn4mkbjkz0fn20iwnszqisx7v";
+  };
   dhua-24035 = {
     run = "16gq48zlsfk9llafs8379797v908khv954q8lw2dvzk0v69d0qki";
     doc = "16l76rvba4fz3vfw8mzkmks7b7206h2dva5dgw3m0j30ds8d6vm2";
@@ -4782,7 +4795,7 @@
     run = "0gygfg9vs4gbp3r0h9v6dqc18np331c0hjfmc5rbh29i74jcm8jh";
     doc = "0bm0sb3fjj73mcdmrsvan9pdla2ki7j1wwpjpc4kpfc116a9lzy2";
   };
-  diagbox-54080 = {
+  diagbox-77677 = {
     run = "1p7wfkhdcgdc1gifr4im390w039609j6mg99sixgpq8f0mqqnlsf";
     doc = "04i03qdy9gfzf14w1vz8nqqgw4hn191w423jf2ck5ibljwlwa214";
     source = "1x1ixmmixi2sal1iajwnf0wvg97kj08hi5vv4swdiwqpd14g1i53";
@@ -4811,7 +4824,7 @@
   dickimaw-32925 = {
     doc = "1mxjqn4lblnpbmad3jk453lyx1qzcmrddis59j3jsgc5sp929w4k";
   };
-  dictsym-69720 = {
+  dictsym-77677 = {
     run = "1n55cpkm687y6p6fs98d81ivvryr06fahh9nf5bvg3vvmd3rq0v7";
     doc = "00l1ivnslfhlvyyd070d4vk2s7h9qn3vp6z49rm6g05zrx52954q";
   };
@@ -4820,11 +4833,11 @@
     doc = "0nalqfdvyfqzqqdjwqgwqhb1jrw99s7fjsmapa077y4bpxzcbpmw";
     source = "10mbglsq9qlywaqr2jhy6jy7ssyvz385b3n09b9w72r8dc4gh1k9";
   };
-  didec-76924 = {
-    run = "1fqcc7jb45w4x13689llhm2rcqfjclrw5inp770q4sj2xsdgfsnb";
-    doc = "1vldv0j555zyk27n37y8p8n9l4xzp0fv060xbnq1hjsy8sjjwm57";
+  didec-78118 = {
+    run = "09ap77n1if0f9a0qbdq0300g8g1x6kas5wfg0ah70wfkvc4ncp72";
+    doc = "16k7ni0b02y7lamr5hz8v0r7l82n48p85g0l9f2dgzsm83vlqyrp";
   };
-  diffcoeff-77136 = {
+  diffcoeff-77677 = {
     run = "0a4808bm1qqs0h78p9j0wfr8qzzns5x2pl96976089ga7bqp49ka";
     doc = "149cq9r6ja65ws7l3p5yqpca0l7nd4v6wrhy4zfap90zfiavdimh";
   };
@@ -4858,7 +4871,7 @@
     doc = "1m3dvm2d0s7xbnvywwwcnjcl3hr8sczp1lmpcdx8m6gyjspllbfn";
     source = "13dcia7rzw0djajb71b9gq2isgys63zs6g89rnwxfvn41a0nkgh3";
   };
-  dingbat-27918 = {
+  dingbat-77677 = {
     run = "18yzigyd9s0c7qs34x1km0am9ii7xywvyd9miicbdr6s4bjrjdz2";
     doc = "0fxbmx6nz2ib6qfka1qsb9ky9r3xw5hvss532hn89yx40gb6qx5r";
     source = "130qj3fs12j3sj93xlnqxch9lgywgwk3qchlil72dgmh24kg6ij8";
@@ -4867,7 +4880,7 @@
     run = "0z2kczyvd4h3751ndfywzfvxl16xrjl3alvqxpscjsplrrrq53l4";
     doc = "0w5rhczldn9p28dys7pjn3lgs0a6dq4yr59n1969qbffbcyv2m5q";
   };
-  dirtree-42428 = {
+  dirtree-77677 = {
     run = "1j91nhdnf4zvqpn6a3jqrcvfpfb0ml18n2g474n5d2k1017mdz4n";
     doc = "05yd1fkkgyspqxi2ddmq3s0nwnyh1xk55lbzzk6pwxjx1s1cd5k5";
     source = "1pl4s67bwf5vbf0ccfhd05yrmfss59kng0ys871yq74rxm4abing";
@@ -4918,7 +4931,7 @@
     run = "19f8kxa8pb7ai7npxxavcw8hbsskmnchi7vynzkbd0imcjvay476";
     doc = "0q3by29jmymrf4pirwmfqxr6bdglh936yb1phficxlpm07ibp8mz";
   };
-  doclicense-68441 = {
+  doclicense-77677 = {
     run = "1qb8r4lwjqzwv46fsqjff8l5zb1scjkq34pwnsxbymz1sl3iw1ls";
     doc = "0isk98wcs93labxiygbf6hg2794l7m2wr8ck71jafd6by8x7l1mb";
     source = "04sq9wrsfgg3s51k853yy7vn5yp292d2ii0ww3msrqnlpknvim7j";
@@ -4928,7 +4941,7 @@
     doc = "1j2b530wcpr8252lcpmy0c5w83kqbi9xzsrfbdngi1jmkfy4nlgv";
     source = "1w8g6m2whza3w62ngsaslv7h2x7asijznwb9glx6g2vjv456sgf8";
   };
-  docmute-75878 = {
+  docmute-78116 = {
     run = "15ad8274dwgzk7fzs7i5g3ss02ld8in8f86339rb314zmraj5kv3";
     doc = "1mrwispvif8nwjbq12jgzpwjn9xf7mr91pwg5bfdcnpwwy8l1bh3";
     source = "1nfv31h23mp7alrm9saz5abakjsvs7rqva3q9zvxlczix7yn63qw";
@@ -4955,7 +4968,7 @@
     run = "1pxswkjs901clnd8l3n13ghqypv6l8gxr3pnwn9i0zakvxz6gdh3";
     doc = "11fzx9kyxgxr20hnyqy9nvl5rczdfyb43j1bjwxnim68kmy5bjyz";
   };
-  doi-48634 = {
+  doi-77677 = {
     run = "0rxsgmqmkpabw1qw7k0ssxjmzkia323dl0p73zw7qbwdpgs4xx5v";
     doc = "0h6k3bg9wg4wa4shyijr0xsx935s8s8igad0zzyk57q5g7lhhka4";
   };
@@ -4973,7 +4986,7 @@
     run = "10awbxxwzf08fx1m4qglnycdf21zd3n0f0l0d5f2gqhpykbbywg5";
     doc = "03mamxlcmgqf6zy89da55s8bi9krfkg1lz8hhm1b3snzniirbc1z";
   };
-  domitian-55286 = {
+  domitian-77677 = {
     run = "0rcyfp46ar0qd2jiir3vmwqmkcj8zrhnrivr0xsi7nf9xbl0xj1v";
     doc = "0q7lbpc0lh2i6jw6dwr26d9kxpwqxcrv6szsqfk73h8bpv123ghz";
   };
@@ -4991,11 +5004,11 @@
     doc = "18d9y7mzfwsmy9c14ihj2blmikiwcwp2y462wjnmm8hb6gm58cpc";
     source = "0f8dmgsrd2wbcmxipj0p40d09sgcl8i5indbzsmkfz7fxvnpr15d";
   };
-  dotlessi-51476 = {
+  dotlessi-77677 = {
     run = "1ii8ilc2hqdwck9z1lpbyjsgh47pkfh62r1yv6kdkafqqrxzpxxb";
     doc = "1vc8bpzzad2k222ghdcqmkbd7541b88wccc108avzj9v85wfpjbk";
   };
-  dotseqn-17195 = {
+  dotseqn-77677 = {
     run = "0n0hgp5saipf42kwx4hxxgx66irmy91pdzcznc8vmnnlayly8s61";
     doc = "1an4s3v47f08z7v5gmz49g4bbz26xcvadn74052nhrbmj8xm8fav";
     source = "05zxrzpm7mcms2skh9mpv4nga9ysqwin8qjc7yy9prcaban00y33";
@@ -5005,7 +5018,7 @@
     doc = "0vk0qgwvmny4fpa9d0gwg4s8z68aaiw1bn135d5msgikbkhbbmw7";
     source = "1ph52wyv7fqri6pxsi289s7svy4p4zap1bdzbwqpbsrp6v4ngjqa";
   };
-  doublestroke-15878 = {
+  doublestroke-77677 = {
     run = "1nfbbh7kid345jkcqdhh72q3fg2fh39fzchcbhfkvisvqmqs3cgp";
     doc = "1vs6gkv9bzya3hnclqbwx44nf5s8vir0hs499dsya2q64qrmcp2p";
   };
@@ -5037,7 +5050,7 @@
     run = "11qhxh5pgjyc98hnlbq8hfsb77bavs0z3yjx4809z6aypah5cd92";
     doc = "1qrx0pnk1p046mx6nzjwgrfxaq1hmdgalqsp3cr6d6zgqwzsnms1";
   };
-  dpfloat-17196 = {
+  dpfloat-77677 = {
     run = "00agcljhzafzhbcfk1jbxaxyc3znwxd1j1sdhr982m3s1nd8733g";
     doc = "1nydmlbk1p4gywq0hh7jnvd9hs9lxl73khbpi4zn5j4blzkb31x9";
   };
@@ -5060,7 +5073,7 @@
     run = "0dhjlykc6p6jm6p0s0h0d74097ny29w84ns1pxbb7f8iwr8hhkvf";
     doc = "0gnazf3bmbgnygn3pv0lzrlrcic3j2yfqxq1kaijkkhsr9w57jy9";
   };
-  draftwatermark-70393 = {
+  draftwatermark-77677 = {
     run = "1v0100dlj6y6kbcyvnslsi7a688jdm813w6752bxbv6xsxrgrvkg";
     doc = "040xj41s6xgbxz1gnd11m58dv7q30qdki4sn88vjg00n2i0afxqj";
     source = "10lm27jk24p2d5pg964l9mwj4gkn1xfqxw301lyyibq6wz921qcx";
@@ -5091,7 +5104,7 @@
     doc = "04i8mw2lsirvzf3n8xgddd2jr2s45fbg6m6wiwjdz4d2i1pi98cs";
     source = "0l3j52ypvsc8ma06a2z2dkqsa3vd7afqkmyrd6b3z6w3dgjlnz3v";
   };
-  droid-54512 = {
+  droid-77677 = {
     run = "1fmm1k3sxdn2h6v56hqdn0l84rz1cgxmj586wd4ff41vfzbdnn5z";
     doc = "14inm79ljwnr36dz97356iz4257vbvkwmbbaq7wdza1yf07gijs6";
   };
@@ -5111,7 +5124,7 @@
     run = "13hvyb7qapfby45z2cikqwaj4bcf6lvhaf3b6gq7d9831gxfwjhk";
     doc = "0jjwa6rh39qp2659ijb3fg3cqz0lbpjpwmvj6zpxv0xhnjzrnidm";
   };
-  dsserif-60898 = {
+  dsserif-77677 = {
     run = "0w1kihzrmk48hpl36a20fkz4nwp9z27in9xsi0fc3d6mhgdx35db";
     doc = "0bwnnxypyc97jfcam0vdvpyxphd1zn31mc6lvl661jy10cpqf6b4";
     source = "00hf5icf1n0rwxr2ms34z7r62g98dqkx5v26m3k7w1wd1jfnjzi6";
@@ -5147,7 +5160,7 @@
     doc = "1rjf4nic7jkq56zmbkz51mqxsj90x247v0g6a79a9v3jcxfs66yc";
     source = "1hv8bb556vz1l35i5y5bndkksph3yvj94myw2pvllvcf0qbhp2ga";
   };
-  duckuments-52271 = {
+  duckuments-77677 = {
     run = "17fz5mkr812ig337m2q40dcsj98qpczw53vjrsqk1skmknk0q4g8";
     doc = "1pbq66k699v3b6c02qx89dvzsh45knr4y9s6a45gkm4a7mkk5nkx";
     source = "0xcdlvm247d3hl7bvb981fv07nb5g24c0n0171vsk3hacxpshcsk";
@@ -5164,7 +5177,7 @@
     run = "0p9gq8i6xcfg4pxdnqfswjcnc17x7pzsp4iya9b3fjq4kplqv28s";
     doc = "1bc1pycds7r45c2bzmjhxs2wv0f2wqyxbycfrl6g4fycr341h8gi";
   };
-  dutchcal-54080 = {
+  dutchcal-77677 = {
     run = "0j49mha6lif07hnfn2wdfl949kfal4hbmzg6zal4w5rgw366szrm";
     doc = "110rbvidl53naa31ndgh6nx19i3rkawbipz9rpxyasqk61kvv6mi";
   };
@@ -5277,7 +5290,7 @@
     run = "155ppc62vynrb54d050kn8pxav627y4yprd0bsnpng9kcq6pk8zq";
     doc = "0cfh472msddfs499qlv5860vmsl67vddrzvn9g7asw72lh15yi4a";
   };
-  easyfig-64967 = {
+  easyfig-77677 = {
     run = "164ncaq1l6hdrjp0zinynf825hwsky1xam2yqxphhk90438n5hzk";
     doc = "0hc63z5456f00a2x70ckvf3r54zld4d3r63a8d4ra7502kk8s9n6";
     source = "18f4bb9yf3f7q96w79rhx8h4svlxnv0xc6xwcawav63zsk40mk7q";
@@ -5291,7 +5304,7 @@
     run = "181x0sycxhwcfna2wblvijjs32zvqs6xl2am4hz8204mk321rjsb";
     doc = "0fg7y02717rk6ikw32qxn6iw7l59h5vc22aif6hs9xjnbm3nhhfr";
   };
-  easylist-32661 = {
+  easylist-77677 = {
     run = "1ghjps30fa1jvfkxrzaxqvy5ilacdyms6dl8bf2qg6195w2sgm33";
     doc = "13wgq2pz9jw761p2yipf23k6lrx66bp25l50446rp1xz47yk386g";
   };
@@ -5305,11 +5318,11 @@
     doc = "03afnc0nw7yzv03n4gq38js3y6x5v0kaxi5psmnzpf2lj0kfa7l5";
     source = "0492q2l7yrv1h51x4swqzfp74k9kb989m0lxbgvgffh4gl7zhi5w";
   };
-  ebgaramond-71069 = {
+  ebgaramond-77677 = {
     run = "0y2x796l2xxbrdkzialacnvqyf0pbb267v5imv6jja04ii61bdgv";
     doc = "1m47a1lkm68gnj6blf6mplwx7qyc24144pr334i9g4cqadxcl3a9";
   };
-  ebgaramond-maths-74169 = {
+  ebgaramond-maths-77677 = {
     run = "0dd1jfnv9sq9lyv2h2fdq0mzvg58gihm9yxcl4d2p2vwk39r21fa";
     doc = "0446q1g4gxyg8p6g3p5cn7akgrgli54d66722h3bhlgavz636miw";
     source = "1dzk91lpl2hvjrflslsj96baryha1pmpkpkv5zlqlv488gfmcz9p";
@@ -5322,7 +5335,7 @@
     run = "1jy79jrf8cd1rljg9f3g0hzkihxkpybvbgjnkzd5y6cfz7zaynp4";
     doc = "13cj8a88qqgi6kl1d7kb0cizl4i2pjm51hqnz9q03249av3z377q";
   };
-  ebproof-76924 = {
+  ebproof-77677 = {
     run = "12dqzyi84jlzm75d77crxbwv2nzyw8raypdj60bjrn6kifav7v0m";
     doc = "1d6g3v3hskgd9wrddkhf7qxg160n6qrfgzxfswajswk0kg2w3675";
     source = "130d3af0n0gjvnm0ad3g6pm8dy1w8zp0q7im3gv1kqbm7k5h0hny";
@@ -5367,7 +5380,7 @@
     run = "1d09753fy86qc90wvddnrgan4nwxv9rvvgrcqknf0lz6x86lbpwj";
     doc = "1ixabvi4954j0ik35c3jp49v7dgdaf9gcldjgl5n2jv0n8ncrb49";
   };
-  econlipsum-77161 = {
+  econlipsum-77677 = {
     run = "0xca6dhbz49zxn58g5bc2yis2zci9v5iypfh3h53rxhlkbfbcqln";
     doc = "1pb6z051r40wp8rv5makhaxbf23aq5j5gm6pw1khvhk806rdig4w";
     source = "0j26l888qx5q5j39875iab4106fkn3ign9fmbcmcvf42yzx7mav9";
@@ -5424,11 +5437,11 @@
     doc = "1s576bk99sw867ywkq1qhk31yycc19zqr34ry2zix25cs3hk4pia";
     source = "01z6p0ndp3nc3pbbwchchfn9nlk86kp35qvb5hkqb3ha59wlfyzs";
   };
-  eepic-15878 = {
+  eepic-77677 = {
     run = "07hg546cp5ab7x4zq25m7z184mvg7hyql7dsbwvgpq6hyz5pqzyq";
     doc = "13v8n27iw1b7qvs3baqqyls9cp2mqbycrbax7jnr8mfvp83jmpkz";
   };
-  efbox-33236 = {
+  efbox-77677 = {
     run = "1jss3bkgyl365rkgzil7xp4pab8k00w57p60s2sh8wrdy10qjsda";
     doc = "051s9yc05ai0yipwm5f5kdqxgiyiyzmzyxf8rbfwl9ir90k84fq8";
     source = "0fcrnrfk6yrdhj25xmchlaimc5qqyhri287b9pwdwsxlr58wgx9c";
@@ -5459,16 +5472,16 @@
     doc = "1h4cm5b0mllqflsgfcjdh97zn3nn3d9gwa55w5kyimmxgz516mng";
     source = "1bpy6f6d81n95x81rgpz2r1vzg9gw04309shnx8a9jsx17fnm4nk";
   };
-  eigo-76251 = {
+  eigo-78116 = {
     run = "004wk7dd5g86kmqa9r1523rpy0xv3sqkr1nkjr3b3k04d061cyfg";
     doc = "11kdz3j21wiz6q9rxb81d1lbn1r1ijryv67774vj151g1rdagqkq";
   };
   eijkhout-15878 = {
     run = "00y3y01jpgzww1x6zjh748hpvizlrbgrv04p8aq3cm2pzs0g17qk";
   };
-  einfart-76924 = {
-    run = "0nkp5ixkdcl46mnr4kny7cnwrpy3zi1hmiaqymcgxgg368dx88cd";
-    doc = "0bvfhvxy4jlx2f4nzy5a7civ8qkbk57h3fskhnczyyxq4ricvhin";
+  einfart-78012 = {
+    run = "1vqwxziw6j3hna0lbrr0pvqq37cwskggbhgd0cmpd6pm24yjpn2l";
+    doc = "1wwpf0bqvllzi5p0xizvcp2m5gg7yqwz52jdqzg0pmb57zz4xk0k";
   };
   ejpecp-60950 = {
     run = "111sr2lnp3b8hh0hyvdf3zv6nr3m2ghl8j2zklq0fdimm7ndmqcw";
@@ -5494,7 +5507,7 @@
     doc = "066g7g84fna6wy1slyh2sp9hmwjhp57hc3qf59gj5mwqvaaym8bc";
     source = "1ysvjlmik0kclmcdf738vhl7xigsq8c6lqpgl3z2daarlqx6b8c1";
   };
-  electrumadf-72484 = {
+  electrumadf-77677 = {
     run = "1mwhwyw9m5rphwca62rjq817jb7jlsjfr35gypa8k5h10gvzjrhy";
     doc = "08fh02hb75lhncp0g1r8ylq6wcxmss1rg9jb77k8agwhnbk7lgah";
     source = "0lxgfngp1cqskk785rrxbihxb0yswgi1mddv1iw67sb3kg009m6w";
@@ -5509,6 +5522,18 @@
     doc = "0x2h38mlixff4yacqrvz7k4q57cwigal3x10f3k4qdr91q9frd24";
     source = "00pkybywz4j1qcki9gv9mfxqvm6q3m60b4lj2ms44c4mric77wk7";
   };
+  elegantbook-78198 = {
+    run = "02183409icxn47r4hhhs3vi6jssgfbdqyas7zbns107lslmgwpqx";
+    doc = "0wvf5z99shh80iavq5bai49h72xvp5g3a1w4mnzg80v7k0g09rr4";
+  };
+  elegantnote-78198 = {
+    run = "19d98dfzy4ys3z8qs5gpg876bpyyqpxxrmbvhcs42wxjmfzknpfb";
+    doc = "0gqz0pc9q8j7p5vy000ld0cmkybqq4p2lrnh0hq8ax449dxldhaz";
+  };
+  elegantpaper-78198 = {
+    run = "15abc7f6mq5cd8c462378rzx5i0g7phlxwfwij28q7gcvb1dh9b9";
+    doc = "1yqqc88qpgbab8f6yy4dgwgxmfvvzjzfk29v7k78jrkj8ss9kwlk";
+  };
   elements-61792 = {
     run = "0a3dzg3d1wz1zni57k8gibrxczjg0k16vqqkbwcd509blwxgps4r";
     doc = "174467pvz1q4d72z215pni50084ywddfvf8c36ibagijpdvrym08";
@@ -5518,7 +5543,7 @@
     doc = "0invkczwak9b89n6w8ny9bh1mg7amk418cf6b0552pb5rpkbby8m";
     source = "0143mncfyss0cyzq0aim8lvzxhq5q8a0cpsh92llqjl19s30d3fd";
   };
-  ellipsis-55418 = {
+  ellipsis-77677 = {
     run = "1zbasvm792cghiji6gkg27ixjx7ms46rgqbi3wphpm9dix9296ap";
     doc = "1w9hp2k4qvhg5275iq5kq79ws5z6i7jb1536h0qrznm0lkw33c4y";
     source = "1z8f3x734nc364gybhslxzvvv4502a29dmb4nlz39hm0kzgqq3h9";
@@ -5577,12 +5602,12 @@
     doc = "1c17d4bpzxws6j9z5p7x97zfggyzyadfjygbhi7ykfiy55qywhdd";
     source = "02vdmjb6vqvqmfq7fhn5gb09x2lzpmrfhx6dspv33wmwzv99kzr0";
   };
-  embedfile-76664 = {
+  embedfile-77677 = {
     run = "130q0b6i3akrvm443fn3knaz7ls1nr8ycsrb06g4xd7n8il23hj2";
     doc = "1lvayvyg1r83z5wzqmz3z429p1qlkpicd893mzd8p4p4wplfn0nh";
     source = "1vxwd712f9n1gr3w4ckdi0nh8wgi64l4wq3bk2bsjfnggawalkzj";
   };
-  embrac-76924 = {
+  embrac-77677 = {
     run = "0n2ll7mxgw228qb3j0x111yyiaa4ikq4797g5k8xyakjmv0w3sv0";
     doc = "1lqapcz7iv8z7df7cyddg6ylh2b61ndgbfhnfa8abzgsqz1h8sjy";
   };
@@ -5595,12 +5620,12 @@
     doc = "132h5m80s24w51px615di388r7wkkqp8ihwapdz770p5pywk3c2r";
     source = "1pspisyb3pxj2nfkpzzxc7pghackbl1p9dwbr5iqzwwv37bxjgli";
   };
-  emo-66944 = {
+  emo-77677 = {
     run = "07df21ziq1ajpmff74w5vcsvh0kd2dx7vc7q61syqr2yqvj635cq";
     doc = "130zqvzv94hi0h5m742kn7vc8110cwjd3b59dxdpihm76gqpa9zh";
     source = "0hy6pvyxg0k478lpdfirb92mx28w27dxzms5al3pjq1mhr04bmf7";
   };
-  emoji-76924 = {
+  emoji-77677 = {
     run = "1pzx221zrczj26pdw6ijai6m73zgbz6z14d5wlhv7albrh4ppxgs";
     doc = "1531y2a3dfmv2y2xa7xi0dpdkh61skk5makiyzs8mz3zl19n8nkg";
   };
@@ -5617,7 +5642,7 @@
     doc = "148l1xq42avnf5gz1sqjcdprnkcbgsii3fm1jiamx18175zygsdc";
     source = "023jc6v2l580x2d480x11z6rlknjjvx8g3qkcrvdi778h5m5bb94";
   };
-  emptypage-18064 = {
+  emptypage-78116 = {
     run = "10h1mlhk0841wgc70hp51jnah14si7rf2mwpkp8lfc1xr7jwwvi8";
     doc = "00l43lhrr246hiwa717b72rc4ignqd3kljkw6ka3l8z1nzbcbni6";
     source = "16nzgkvl9gqsnhx38dp71c3cz5rrgm73n99g2vg7rapg0vb623xi";
@@ -5634,7 +5659,7 @@
     run = "165xjggnbpc9baj9xbdkxzxsb9gdsxffmakffw0gzp82acxgfwsv";
     doc = "0jc0wlhmc7f1vrabzk6ql62iian2n8s32r2crq34w2cjglmf69xj";
   };
-  endfloat-57090 = {
+  endfloat-77677 = {
     run = "1vqy4ii3dz79ffpjc5n234z9v0lqpkq93vla0lbq0791h71gv53d";
     doc = "0y3hkihs6pc0g835nk21qj8v3g27f6rrvadwmvqkhchvgh02bwnl";
     source = "0mdr1ga2p1ikbcs0zzznb1c89n8shrha87qm49sgzbj4d0f2gdbx";
@@ -5648,7 +5673,7 @@
     run = "0vgyl6rbgrq0jslb5k1796hlnzxjpavl5ab6vj6zizinr2rvh0dc";
     doc = "1gz8ri82sx9nn2adb7sv434im46cb0ld9r4j9fz07kqn6gxzzr2j";
   };
-  endnotes-53319 = {
+  endnotes-77677 = {
     run = "0hm5mwxdvxhj9v51y88g6mm5fs9p2kaksmhps032cbc1inn5asj6";
     doc = "0354v4klgz5yn1v9hkk3zpvv3x1l4b6jzla7iwxpnk9qb0bvfh4g";
   };
@@ -5657,7 +5682,7 @@
     doc = "1mj4lfvn86676s3sv0v3hx07cjb4mm3j3i3swwzxg0i48acpch52";
     source = "1qhf4zzhk7kf0wcpacl82przkcf7g8z6jwirrzlwd39876jmhbwk";
   };
-  endnotesj-47703 = {
+  endnotesj-77677 = {
     run = "1rjraz5m7zqyj1j7c640ngxv7i73d03xh5wsmcaakc10h36n3pyr";
     doc = "1sss0shcnz2knzghjqw41s17v0bs7dfcmg6x566fdwdm4mdg4dkv";
   };
@@ -5683,7 +5708,7 @@
     run = "0cl7a0xh9y1lg55wdkj03n3ayyb0853nad04fpgjla6z9c9l1lrm";
     doc = "1cnbi0n8pw2m8xvxk51j4rlyvj112cdz5zjhc9n8znj25iva8in1";
   };
-  enotez-76924 = {
+  enotez-77677 = {
     run = "1nxn52jbgxp2r1zlyp3hmr0k5kwilmf8fkr46scnh9w1ijxxmmp8";
     doc = "1jw2mbyz3xnshrb031b6xzycqckpn422rc1ddrdj7r2j5lzy7l2n";
   };
@@ -5697,7 +5722,7 @@
     doc = "1sldfqh2hlcqzvw09yyvn5fjbrgspp1sivb5i80x2380xh94bqf2";
     source = "1nly7vyp5py9qsc94pjdbjgz2kqyxas6nx478inamqmidm40fma9";
   };
-  enumitem-76924 = {
+  enumitem-77677 = {
     run = "1p3md46gbg2q1ic1d3zhvvprngcc4n911rsxmb11r24yd41gm9lf";
     doc = "1gv9q2wy9jpd6a4figzdqarazsgngmdifcy9w1mr8f2pgxvzvm1h";
   };
@@ -5724,7 +5749,7 @@
     doc = "1gq75salpmgd2g47zr6nd7aw1r8xpz0sxi6vhl8adypp35x8zi3d";
     source = "0dkqfb39llxs9z6c07fjmfbkhy00b04f8sk2jbcpx0qwr01bnchm";
   };
-  environ-56615 = {
+  environ-77677 = {
     run = "0in2a7ar0c6ji7qhrbgp4bglcr2cmb9imxch8fcrwkims4g3vjp3";
     doc = "1pb6nmprhz3j9dx2h7sw0y66y1qlvhkjl3ip28bxa133fgqab148";
     source = "1jkbi2g2s13rngwqvr435i9n94ycnzp9xa8szik0nnmj482ah2hn";
@@ -5755,7 +5780,7 @@
   epigram-20513 = {
     run = "1zps5067mgi7xq3fpjvjln8i0rz53j7qn660khraq8ribv4glnpf";
   };
-  epigraph-54857 = {
+  epigraph-77677 = {
     run = "1lb4wzjcag59dcfvizvng9s47v3x2af6v62hc1x3ck3fqzx9haa4";
     doc = "1h13sgi2bxknx2m5kxxlv9p4fxf1pxh1zdwm98h3kamzb4a4gm81";
     source = "0kqfrmx732m0a6k21iiq1ar47ff50ri3f5wy8ib6ssbbvd9agx4l";
@@ -5779,7 +5804,7 @@
     doc = "1cxrwbnrfg161ddc707msjya678fvvmvgsrrigdzmqrngpi7vh61";
     source = "0nj3d8nqc8x41lmqmicqf67wc4wirg0q0djzi0nbk77g2m1qjs0l";
   };
-  epsf-21461 = {
+  epsf-77677 = {
     run = "1i973a2hp5ms1lzgf3g2b73j34xymak9f8wz88fqczcvdfnnag2g";
     doc = "0d6jhhvw882kq9l2a4vrfrnxxvkidfjkmp3zm7kj1ir8mk9qvva2";
   };
@@ -5806,7 +5831,7 @@
     run = "110fdqfvdnp5szsfcf659hznf9a1w9h86hnin9qna3hpya90n0js";
     doc = "1ag14b4r6b5q6r8i8vazp663ihfy21dlh8jlbykgffi9ghcxwf5s";
   };
-  epstopdf-pkg-71084 = {
+  epstopdf-pkg-77677 = {
     run = "1bd7bkkk5hbp0bfzrvjpmfrrvil9i2pzmzl7aaa324q7w4f1w67k";
     doc = "1lwv6av0b4v4vzzk3i27diw42hcdqzgvis1fk4fclkyqz7w0ai4d";
     source = "1qmvc299bzgfrf31sa4027rgkq3yjg57318mbx4gl4cwznxr7zh0";
@@ -5824,7 +5849,7 @@
     run = "0d97dysvgyk2cr2w9xaq5ipgkx3i33jq5x4mak8pq65bgbpl5dhx";
     doc = "1nkg2qp7lg282rpf1ds5gm43gnnylwf4df3ziikssjf9pnamp7pw";
   };
-  eqlist-32257 = {
+  eqlist-77677 = {
     run = "1cxas8g683y4i22rdakgji1r282mivmnap2l0b80rv3adg3ccvrl";
     doc = "11lbz2s5v35w13vvcf2bs4y59hsdd0haai1244jqswyfxgamybgg";
     source = "1lw20i1iqb0lxqpv2g7dw62ff4xd8w8k4y2ccpqmsb987sk223d0";
@@ -5837,21 +5862,21 @@
   eqname-20678 = {
     run = "1qryjgmn2cw2indmmybgzrcrakqi6a3crvdcyvj769mciz8lsdwy";
   };
-  eqnarray-20641 = {
+  eqnarray-77677 = {
     run = "13vm2xqfm36a1fpljchnmjnl6m4fia8x5bia0h0yxh7yw740vbzv";
     doc = "05vh8d0yyqhn7d45ykrql4dbn07f8yh4jmr6qmx1mkhyiz44c9x6";
     source = "109ds6zn3nl17kb4z6m1xpa5ds2iwqaxqbf5jmw54547wv34havy";
   };
-  eqnlines-77544 = {
-    run = "11z95zi2qs9pdcn3abw7wxx7pigldqx3sp38m15krbxc6204iz6z";
-    doc = "09idvxalc2jcbg6pkf1agkz4gv3dsv50mb10n2cc45wfsrgk7mip";
-    source = "0y3526zg27kdnmfqwn3f2g2sklafp2fi52rf6yq1rj4aa5iy67md";
+  eqnlines-77888 = {
+    run = "16ga8zq688zgz7x2bllk60d3gi1f6jmfd9wair97zlcagm5ypshh";
+    doc = "1qp22d9qkf3qbj28yc6ncrsvli7396xla462kv5skgjfbg8p7cn7";
+    source = "1mmbgcbw4s155wjb3112v68jksdbs22hkvc4zq8gm4hjyjpi88xi";
   };
   eqnnumwarn-75878 = {
     run = "1mv50r9g43si8kmdmf3kgcjmw10kzipq67ssd3vllja4pn9yzmz6";
     doc = "1ypvd357npccz8vbbq8ss92cmxphq16isvw4ax0ppgxp2bh7cr4g";
   };
-  eqparbox-45215 = {
+  eqparbox-77677 = {
     run = "1bg49m7nzw20g2g51g07d7sgq0sjiisrbaq4ca31qbybr2rxcp12";
     doc = "0z86nwj06zn55gk32wwlxbqfb12a1fcgqizrpagm7yp0xr99b8wm";
     source = "1ny9mcnb76yds4l7q35wdm0x2vzia80aaqr12idybkzi75a7b2yp";
@@ -5861,20 +5886,20 @@
     doc = "0nv1yqxjmp4mfksmxm373pmy3zzbfcfvi683dalpslzq2qyz20yv";
     source = "1vpghcpm9a2pvi3plh7pjki7sna3hkzvq2xj9gzmhqxcpw3jskwx";
   };
-  erewhon-75452 = {
+  erewhon-77677 = {
     run = "01x58bx32m1xmlkvbp5npyby9yq81z39g66l53gilz37316707vg";
     doc = "0f0gdm9czqhw9809bfbrx84k7darwval6h5d7f49zgldvk9sixcd";
   };
-  erewhon-math-76878 = {
-    run = "1qgzkwbw1ccv76925fszih49h2r9sbv7nkixds2w8vab3wpkzkxs";
-    doc = "1pzw1q035rfjw6la9v5jysqj9pzkh598g0p4j6yx4x9pjmapkq0h";
+  erewhon-math-78173 = {
+    run = "0jcdrkfxygrc9mjj86mdlmmkyzhfbhf23kx9nzd7mxcclmfqpajb";
+    doc = "1sishibbfp0rbqj3wj69xiz8qdblx5ivk3q4p3yaqcm6kxxwzhvk";
   };
   errata-42428 = {
     run = "0hp8pls350swslim7m3cpnw23v94vnqj9avfvx9hq0bgl99szc5c";
     doc = "0h30iip57km31074cya5fyhlmyamix8anpk19rqbsfb43h3988g8";
     source = "00bdq20dwwmq0nw3c271ah0bclzkzkwbr5ak4y9asnab1g6fl5yw";
   };
-  erw-l3-76924 = {
+  erw-l3-78116 = {
     run = "0klwkq6x58bhqgc849yv68vg7w8ivvzib8rl84ipf3gl1hk42761";
     doc = "0qkg31gi4jhgvc3i42cbj00ccavwrxfmygngn8qxfgmsphx3a41z";
     source = "08lh56xzj3wjh1dp72ky8ckga8k73d3alf0vxjkwb6b6krzz4gm9";
@@ -5900,7 +5925,7 @@
     run = "1g2wmrqyvdvf9w6k23250sl3asp3jwv3h952xc5lzvy8y3kbjh6l";
     doc = "19v6158xgkjpz8das8nwzj7cd3gk73k6ac09h87l2b8sgzdnagqd";
   };
-  esint-52240 = {
+  esint-77677 = {
     run = "1i9bmx7sk3fzzdb1ny4a9b3sq9mjjk2x78gk18y77rxq16d2bjnr";
     doc = "1sdklwvw46yj8xbli4yl6qqp5jdm9a32fkspk72p5186swwkwnc9";
     source = "0j4ms51a3qzk7mrc9vh5psk83jxnlh5xa8vq36y9iihha0d6rz6x";
@@ -5923,7 +5948,7 @@
     run = "0h11378qh1y4c4ac3vd9pcl93a09kpsh0vyqcg7mfn01dgmqfam1";
     doc = "19bcl4szagigbd2jrlz60vhhphm86667chciwlk05k6hkflg595w";
   };
-  eso-pic-77066 = {
+  eso-pic-77677 = {
     run = "1qf9wrllwi8bzw0ymzjim7sqr2hkvslgj5dizwbnycf526g58i69";
     doc = "05cgjp9z66zlqg2yr4rckdw11g3kafdvx59ds7n818ln4waw5xb5";
     source = "1gngyn5h54ncwlf33nqz5j7mz1r7lmgy84s190yfxynyl0wbpklc";
@@ -5938,7 +5963,7 @@
     doc = "1nqgy3dhgfpkmvlc9y1hv0qn07jxncd3bmy8z4ygmjksal6gb9bc";
     source = "1bdi2q2ragvgrbgw9binhndhnsj0mzz89qaxjwngsrj2aylipw26";
   };
-  esstix-22426 = {
+  esstix-77677 = {
     run = "1qqs88wpabdx0y92md1w8klmk7ncbpm2jqmi0j5sj1c2cn82mp1a";
     doc = "1zzbwvv8lbd27cxafj6qc5sml4r44ymrdvaqn2h966alzga9ify2";
   };
@@ -5947,12 +5972,12 @@
     doc = "03q3z9if5hswrr086zi907xmjaijh266l5g9a140q0fivjai4hcx";
     source = "1qb1v30ijky1xhh5dahgprp3fhxfm6kvlxgb059429idvm5ap90g";
   };
-  esvect-32098 = {
+  esvect-77677 = {
     run = "0fgcy91ypllj3i706znwwzri36ja2ca2inx838q08zbs8gqq4zah";
     doc = "00xpfzzhyrh5p563faa7ks0vrrc08ndcpn72a72jmlhk8y8bn7sb";
     source = "1han75c642d3qmr47ppn11f7q1lnz8lcwj3q39nh1f81vi2w6li8";
   };
-  etaremune-15878 = {
+  etaremune-77677 = {
     run = "1l3xz9zh5f3wj3v3mvq9xk4q6vc7k01pq3ivsvm0qlkni4bffyja";
     doc = "16v4vsd7dzihnx72bdz99994kpw6r5im659hm51w5wyh8gf8mp29";
     source = "18rcvjpyks01d6qkq61rmngmwwyxksh4i5dmnvq8ihx4vj3zlgqx";
@@ -5968,11 +5993,11 @@
     run = "1zk4dp55r1yjwy1bpigyzbfm9nh3np544hfmzzfhdg4i4yps87k8";
     doc = "1cb9z8h7n5acvr83w1qgqkrhdm1xfn92n97wkfq3rq0sr507wjby";
   };
-  etex-pkg-41784 = {
+  etex-pkg-77677 = {
     run = "01aa6bn8d46ql8aw8kg9k2c3x611jpd5hx3h6g2fqb2lvjqnr1zp";
     doc = "1hcir648vyypvqa8r710mj9qldir9yp2lq7biv3s9w1vl2ssw18d";
   };
-  etexcmds-53171 = {
+  etexcmds-78116 = {
     run = "0m0kf57wcmy50qcca2v5jb8z4h7z82pja82igmf6gsm7fksm3wrb";
     doc = "0grl3svqzjh5bdg4jwzmqaxz7chkqka0vn0hnjwpyvm52ngmckyk";
     source = "1s7avnnlr4g8xjdfmkm82aanz0k0cnhv2dyar30439x2indyw68c";
@@ -5982,7 +6007,7 @@
     doc = "0z04a5f4c1xygqsgkss4bh0s41aqv0i61sh6x9h0isrqlhbvrzs5";
     source = "1f0jr38lbsrdjxhihxks57y6xw37ghgmydcq48ll14nywx07qa2l";
   };
-  ethiop-15878 = {
+  ethiop-77677 = {
     run = "0h1h286nq6f2bplxxkpdg8mr70ip92c7mkj9lakxzcwacsj849xy";
     doc = "1aqgl8hvapg3p0f3knpirlgnifpkpw4jb22zncp1s26jqjc9wdcr";
     source = "1cc66b7ad2kfs4whzbnqdzfswn32y8h19bj3ad20ia24dggir5mv";
@@ -5996,12 +6021,12 @@
     doc = "0jqpybirslqyk7g9g27qbbvz3k02m2k352fxl2w1p0h7hhgk12a2";
     source = "1z244p46j7hkzry4n1xdbzcszjgwrlxd2jmjblbrldj2ba9sq9nd";
   };
-  etoc-69343 = {
+  etoc-77677 = {
     run = "1kvwyy0wxwwfkbmsh7v5kdvcb9sx7ywzcv5cx5nmv0sh92ah5dgh";
     doc = "1lh8pfcj2iixm9r31cawfs7vpg8gd4kgjcj9yyqx0i2fksd1gs0g";
     source = "0clv4cllb4nfchvc4zb8k25wzlhl4k5hnijl3071sq8aldiaqj7b";
   };
-  etoolbox-76474 = {
+  etoolbox-77677 = {
     run = "0hbb32cisbwq4pc3bhcbrrwa8j9n5wxzcjmmahwy121nbdck5ana";
     doc = "1y87lqnskcpm35d9gjg855rg3dnniyzfs1swqqf6m744fk0iy5dl";
   };
@@ -6041,20 +6066,20 @@
     doc = "0071bi5m6v5ak6g5pxjxzq5y5353mpdjx4f2dbznkmfd23wp8j7d";
     source = "1p6vg8nj8qipj59jwvp4izf2dv0l8490773h6j87wlclnnnlh2gq";
   };
-  euler-42428 = {
+  euler-77677 = {
     run = "0f63sy9zs0myb76wqgzww48g7clq6ni9kwnrfjkyyc4lacvd36in";
     doc = "1rl4bxzlmw95pgcf7va9gsrgz89602a9pqvhiym15b5hdwc5cb07";
     source = "0fy3dx3bf8idddxsj29yqd7bsv7cyyg8q9njmb3p0mw7laqrkjxl";
   };
-  euler-math-76681 = {
-    run = "1nfarzbbva07himawzbh7hsjd3a59ip40rd6vjyj5rqrm51sqv87";
-    doc = "019hv37w1v7mj2zl4wjcw7aang6397a1kxpi56ja6ql5m8c12blw";
+  euler-math-77957 = {
+    run = "1lf9nnm2sahcghcnp1q9r3gn6pgf3kmywpvz0p6mrihh5q4kryna";
+    doc = "072h0kh6hh2i0qqid43qqss79f0z69nf4jrblxbhqgkblyr4q131";
   };
   eulerpx-63967 = {
     run = "1ls9b076rc73cbc160ms7df3w5m0x840y7s2mg3wk22vgc461ail";
     doc = "0qwhb6wxm8fviqi5kdy1lcplarijhca0ymrqnxfnrz38z3v4xycs";
   };
-  eulervm-76924 = {
+  eulervm-77677 = {
     run = "1x0zgqw15r5z9mf4pcpnf1bdbwbpwbc49ij7gjrhf9jzzlkwraf8";
     doc = "1bbd7f4dz3xp7ylgpi2wh9jf8nz4z6i2cvphfx53xvg555ln5v1m";
     source = "1if22m5h8ma3bvrlp4jzzhjm410r5r7r2ij17prycj3cpj4r2nl7";
@@ -6080,7 +6105,7 @@
     run = "0x3j0mk59rl4ppmrrylzaiz5q4cji8xirz64a1yjfq4nbxj0raax";
     doc = "1qqrfvzp81fa89n5k4bwacnz2xhdizzxg9g7mrn04q1vlx1zj192";
   };
-  eurosym-17265 = {
+  eurosym-78116 = {
     run = "1bf4vwygyakr999k95ki53fykknizakz9npz2i1h3r5ci805l7z4";
     doc = "0vmh23f3ksc3b3hym7iv7m8rsddk8vdbqr5ib49bjqylppvxrsnz";
   };
@@ -6097,7 +6122,7 @@
     doc = "1g9p36ki26vqdfiwnr77jxk1bna7733dml5k4s8nxq1drsklwqwn";
     source = "0hv04cn2j7sf6032jxv18py368zbpp4ya15wv18qymbk6yv5najs";
   };
-  everypage-56694 = {
+  everypage-77677 = {
     run = "1i8fjcbk3flywzd55y0cbsdmzymvkynvgc5cvv6yh5y6nr514rjd";
     doc = "13drphjv7gzgdzzwd6fxlngm2rprhls60gj4lz1v69sqifymnn4h";
     source = "0vdi8yd0r33ajnym0f3j42ajkc2xs8b5yn3kmklmgx19kpc93ln5";
@@ -6107,12 +6132,12 @@
     doc = "0bhqpzw5dpgq3842jbba9y21yj1808nxrg50339lx7b8vc5d2i8y";
     source = "0aibvqmg2n26dici3adi849a5k20ck68v25vx1bz2f15q4gggd6g";
   };
-  everyshi-57001 = {
+  everyshi-77677 = {
     run = "0y738zcqy85ww3mhwgrj1qh0vgpwfh2ib676wlr514xglvmp9l3n";
     doc = "0ynjq4ibx6rr0qh5lajb5n9skqa3j4zyi533mxc10axp5zpxsjkx";
     source = "0iqxf73n3l1jf32x571rw5wqwvz7nj3bvyqzgizvfpbnavqhrxfb";
   };
-  exam-67600 = {
+  exam-77677 = {
     run = "027v4pscys8rmrrrz7m2plc9blf0bif3rjykfhw597rmnmgmhxcz";
     doc = "1cwcz5c0lcil552ryqnwsm9p278nd172p7d8s4jwg3xdzbbgmni6";
   };
@@ -6200,7 +6225,7 @@
     doc = "1qgwn2ignri6wh67wwjsqpbk28jch01m8fn0nw6lpc6kfa4a9g6v";
     source = "1m8dww4i5w0hivs904v8ls1dhs35vp3qpbb44ihwha0zsbvghabk";
   };
-  expex-44499 = {
+  expex-77677 = {
     run = "1vdbsxn85gkg24rx3qhkwcc658zjyhkymfspysxkxmmb8rn42y8n";
     doc = "1mgq1knfx1lf0vr32wa2r6v0sr49m0xjnsdy0y42zngfi1mizp20";
   };
@@ -6218,9 +6243,9 @@
     doc = "0a5kdxgkzlf5rm4k71qg66n013pfmhd453pdy3s4dkf3b88p6vrf";
     source = "01wm7aly8fsrxw8psnhg7kp53qjyrz3sasiziv0qgs4qllp8ywz3";
   };
-  expltools-77501 = {
-    run = "10k08qya4qwgrnwkkdd8n0y6mpdv22zvi5b0n8w8iwlq3m5n4p7s";
-    doc = "1ziabgxyxdpsv3zxb30wxx3l1q0742w870n539qjx8l0lvpiwznk";
+  expltools-77605 = {
+    run = "079kgrm39ilhv2qim56bblncc39pnjmhjxy85j7rnp7hnlm3qyiq";
+    doc = "1gl1vmip71nx3fp1scp0f8czw1vak1qv8pqzmn6rk7x2j43vjmad";
   };
   export-27206 = {
     run = "0la9v2m3n15hgds8mmp1c56dz0a7iqygjk2qnd99n5924n187wyd";
@@ -6244,7 +6269,7 @@
     doc = "0863vvw2a8zvqfhccszjc9lxgd4b4m2x16fkf6rvgdjnkmgkp6nk";
     source = "09xdhhszy2mmpj18mcjqqapjrkvhs5cwmavv6w7h2xb4jc4nxwml";
   };
-  extarrows-54400 = {
+  extarrows-77677 = {
     run = "151qmfsqqj516ky9j4wbzh1618r769b1bqn4rc5fh51p1s28k8f7";
     doc = "1iw3750iikf6dc6kyid86r7kdzkpi1z4la4zlj63z26fczivif91";
   };
@@ -6252,7 +6277,7 @@
     run = "1pmipr1444l1yai8d9hhrncvimzb5scn80pqij2g90lz160962r0";
     doc = "0ymkwhbl6r64pxhr95wdw10dvn6q95mkz1pwa1nb42sdcljizrsg";
   };
-  extpfeil-16243 = {
+  extpfeil-77677 = {
     run = "0n2j976a2607zsgf2cda5vljl497c1562rn7cih11h6vpx76jx9k";
     doc = "0irjpxz1zk30myk0h1wjhzcxdpyqjfzxj0lx1nz56v4f157myn50";
     source = "1yf2kcx73zp24wrjb59zd1f35809k52cdwym9xlf5fy32rh69y08";
@@ -6266,7 +6291,7 @@
     run = "1ws8df1qdxibl0i4pq05xmhmvfrw27pb96wkii0vwfd6iif4min8";
     doc = "1k4p7s8pxls2p3c4lfx918i104c3b2qnh8k6rpmiy4rdd7i0iazs";
   };
-  extsizes-17263 = {
+  extsizes-78116 = {
     run = "1249x8lklry9ibil9crfvy2x3hk5afnc3g3khixqf54jcb29zpg8";
     doc = "06a01bmilk7hqr2k9237i6x53f6wz4z4vhr8n0qc0i3j09n5i0ps";
   };
@@ -6302,7 +6327,7 @@
     doc = "15qydfbhbdvkzrys4x3g3k2zpzjzah8yx7q1xxnc9p90rmlj6ch8";
     source = "0ybn1365n7mkaf73sc667pw826n1pndrizn5svnx89ckzhni6s3h";
   };
-  faktor-15878 = {
+  faktor-77677 = {
     run = "078fxihxiy9bnszy2nj5ca8ys9hhhazkawwi7x2hzwfh3n4dyqz0";
     doc = "1hj13l2g7za8n3bkxmg04npi5fnp4jv8viyym1076wify7hrwc73";
     source = "1r8wksjr0q1nm118fzkn527lak31j3sjrbsahpdmvxfir7936njx";
@@ -6312,7 +6337,7 @@
     doc = "05m6n4lzz0fc2hm011kyvnxnv93gl39jd1lx404xz0kjs0l94cp8";
     source = "0g6i47agywjpqi2if893jpm045kwda3bhlm2afd6gpjynybpmhmp";
   };
-  fancybox-18304 = {
+  fancybox-77677 = {
     run = "077xd75n1lpy5a4gdgk88p0ai2is5aj4lf2cfxn7nsyhdvc1y6gv";
     doc = "1giimlw8zfksar2hwarpnhy2sd0jsdlxzfw6gz1lmdb8xmwkx2nz";
   };
@@ -6320,7 +6345,7 @@
     run = "0fgyvrww1h79bvwf77h83p2lwff5b564gk8cjjnkp26zjpphah22";
     doc = "0r5wzyw7z8gsm2k1y06h9gj5cfxnclawicxdjpq50dnb6233ac08";
   };
-  fancyhdr-73783 = {
+  fancyhdr-78116 = {
     run = "1xsf1qk8qa837s19qzvqniv9ymd7lf2nskvc7wgqbnaybkx98nkq";
     doc = "0xf108vx7c5kf390p5bcxkm5xshypmdgqxq4jwa1m39ds81rc7dv";
     source = "0zwz5nq04g093cd0xhkf0vci4g4biy8iig975d9lq4kg83kxby7n";
@@ -6343,16 +6368,16 @@
     doc = "01f7d3him9gcm7p8567ljamwrg2jl25xs7w6jm05l89dkcb34fdh";
     source = "0cfm5da0gk4y8plad5khzhf9gjyayxmca67qpvdj296p86xxdi32";
   };
-  fancypar-58895 = {
+  fancypar-77677 = {
     run = "1znfj0zw15g4n7rf3za61ixfy7k8vyv9nikkran9bvd0jmx6v4js";
     doc = "1qdqw4283qv1i8njlvnds87pd1ssx239ycd985rbkkxyd0brrqa8";
     source = "1y35cm7q0qa2szmkldv46203gagzxwz4cam7yzm13s78wyig6mcd";
   };
-  fancyqr-72986 = {
-    run = "01l0mh2v7p90h145hi7gg103vf8ixb2p8vx4ifxhspjy1kn8ij8x";
-    doc = "02xh9w1h5i21madcrn01b0lk61dfkxc1ciicbmd4is0zm965qyyx";
+  fancyqr-78197 = {
+    run = "1rcnw8qi8dr9av16w5agj1wmsqjqfs5rj86rpjwmr1w0gz5llwg7";
+    doc = "19m552kd8db0cyvakkpksp3sx5xyigfx4swk8v4d9sdrnaa7bfc2";
   };
-  fancyref-15878 = {
+  fancyref-77677 = {
     run = "1ns9b3viqg45w3pmnh69fdrjc9p39pfnqwwsfl9nnx04pf8b0p8i";
     doc = "07g7ynr4qjv5l8v71ymbhx3vf000g5qq63c4i8q0iq35gird9yac";
     source = "1p5xd5a6lwv71hp1sx490qwqbjn720gc1fpkk2inmmq6h6vwgpdy";
@@ -6371,7 +6396,7 @@
     doc = "1l6mp725xjmy6azgx2zwcqlp3vfvk7gvyhr0wwrnnklfcscyr1rz";
     source = "0nhmjrivw8a2xhblhxnjbyvmz4hp68sjxnnfzmqyrf1agjgwz8m0";
   };
-  fancyvrb-75920 = {
+  fancyvrb-77677 = {
     run = "0dhymyzpjbi70w76d0n6cbmwqdfva15vflma95scv0yj24mlgd69";
     doc = "16sh5q6qgvwhpql82cl50lhi0i4lsqr5hp8qv6qcdmh2sf8rg3rf";
   };
@@ -6389,6 +6414,10 @@
     run = "0yyyyz97i2klm5wh2527mm91i37rkk5p6m9mwf28sb9arcy6wh0h";
     doc = "1jgffgj4rivjycr61cmxa3gglyxcs64j064mx381g5a6shcskxlj";
   };
+  fariscovernew-78046 = {
+    run = "0zwmcy3jb3gmrr9r584n26z4mcfz1jvbvbzklid1y24dkyj3zxnd";
+    doc = "0y4v1l8xlnxgsk092i8wcwhag44a1dkpfkhr1vwah015f44k8mwf";
+  };
   fascicules-54080 = {
     run = "0zlkjn8kg6vb58xp2xh7jwjk6dmk6knzqh8v7lrdbmzhw9j28vwb";
     doc = "1jkhj04gpwcckp9zqanaa9zhplgs2a5xqnn2xf6ir6qifiv3403y";
@@ -6398,7 +6427,7 @@
     run = "13c2r5prb7dg05j0r4lkdz36v51zj6v5p2c7q22gfkbz1lj1s6s2";
     doc = "1f3ghs0l6mj2q3iw74rjjb12y8151cccvhww13h4kzc30vacr3r2";
   };
-  fbb-55728 = {
+  fbb-77677 = {
     run = "101yfs3np0mlwgfhiz74jh2jngxnb395wkcm9fvpmrs4rp7wxx4l";
     doc = "0b48vqwyhmygv70gsbiknmmysd8pz8m27pfj52zqzzb0kphibynl";
   };
@@ -6407,7 +6436,7 @@
     doc = "0wvnm716qi0y54h95zlqr7m1q9dgmjnl9f0ghvjgm886hljq752z";
     source = "02zmk6yx4v47ngd6ba6mjn1rnhm2w6p330rfz6nkq8shcky7sy72";
   };
-  fbox-69041 = {
+  fbox-77677 = {
     run = "1v7ycqbqlk80lbf5wag8vmyhwr1v4jjs8j7bzni4pm8yp4m0yjis";
     doc = "075mws8pivd2nc045przgf5lmf5mpaw8gdyjlj3haqvpq0rf5mk9";
   };
@@ -6427,12 +6456,12 @@
     doc = "0dvr57jz38v5wflcjjp19rwjbisbzkdc91fji9s1yrv27drawijp";
     source = "0k54q30f7qp40fh3clxyaa40xhsa28qyavn13km65s1hwvg4hg9g";
   };
-  fcolumn-77386 = {
+  fcolumn-77677 = {
     run = "19jgl5spn3i300lwjwi27dlidg7qgpci5sfx88gwdy3sipd1ghb2";
     doc = "1xwy8ds7ivswaxlsi913nixfm67nch6jfzfxcscbfjkkjxskzlcj";
     source = "1izp574jj651gzmdzcb81bcbfixrvq99ak527dxn3slgkqk8zwzb";
   };
-  fdsymbol-74247 = {
+  fdsymbol-77677 = {
     run = "1862n70svn61kdmfhr4xpgh7zsrymzj21n052dfy1c83vdrp2s53";
     doc = "0n4n6id4ypxmflkz8prlqv1ahahk3rd2pr4q4q4y8jz9mln02x8g";
     source = "1naz9986wrg9h14v452n8xj9jps7jbsbixarcfi771gvd00az9dd";
@@ -6459,7 +6488,7 @@
     run = "1l79py58dih05c4kjb8cngzs3bzpbhc72f4hnz2r7nfwmjp86c56";
     doc = "0fbx9wms2n0ff1cdpfavqhjg56przd7hr515vh81g8jgnz68s24l";
   };
-  fetamont-43812 = {
+  fetamont-77677 = {
     run = "08c8xjgam1fx3aa4ikx62jfh3f4bws0ngk428bqzbrd8q445c3jz";
     doc = "1zlhg0wgchgkk6j8v23wd29hklpzb8q4p690pfswg3zakc0dcbgp";
     source = "024bwgb36iz2ylwsfzz4wfgsyr9djdd0p23phadzmc8qzxqsslph";
@@ -6473,7 +6502,7 @@
     run = "0sgg5wi5iylsz0y2495cajqdp8nzlsps3x7lzalx0qpjid91lij3";
     doc = "0ish03jv00i0crfzhjh2l32cspk2r5ifysz5prd6fwhdrmwmvm93";
   };
-  fewerfloatpages-58058 = {
+  fewerfloatpages-77677 = {
     run = "04903zr0lk50i88vywpbzpg908zkmy0w8vcfks55cmbfb2ja37qd";
     doc = "16hb3xm2aszwlagzq9w3bi2hyanbss3s4f09sypg07dkilifdnv8";
     source = "17rcaydy16vqnlgn76ijhjlv2jcnw962wrsssca8z8y6dfvy0aqs";
@@ -6483,12 +6512,12 @@
     doc = "1dkfi17i6lz464bwmr5r5295y1avvsn5rpdw4cv80rd20lvhnyyp";
     source = "1vh6kz22gpmch2rdlvhplvqqd03vd0mn5m0a123i3xfbka1myza7";
   };
-  feynmf-17259 = {
+  feynmf-77677 = {
     run = "14bl9c8yz1z596281kysyyjbf727pi6mdnwag6gfqs1nsinq0a2i";
     doc = "1ql099wrlddb4fyfrsirx0vnhcbh0wgwp9yixhvgxfk5pbah8v8n";
     source = "0f9ghmp0hcmzadsfljfq7pinn69251dwhcdk4n62jrd07qdgqsyl";
   };
-  feynmp-auto-30223 = {
+  feynmp-auto-77677 = {
     run = "1yhvcxiq6ajjmlsvnznzvp35sap1qsnj54zv70dwpl29rkrgrmsp";
     doc = "1y1pwlplkz2z7lqz84ay7ch1lw4plh4n69isqzsvhilnr31fkf0a";
     source = "0ja5yqs9szyk4s2mk9cbjf6p98dagwk7pycma84y48kinkl96s0s";
@@ -6502,7 +6531,7 @@
     run = "1mpfpawdhh16rl6pnvxnkj95gf9hjs49gj7cwfyngmqkjc2idi8j";
     doc = "0z5kpim798zxj20p70dpcgmwg4vx9mb0zrmq620sprxxdr2gd059";
   };
-  fge-71737 = {
+  fge-77677 = {
     run = "1f6ibw87kbhpf3qxjh17jr1lsh9kk9ynf1rngzyjwbq2rk2id94f";
     doc = "1c8nnpdvkxcm6218mrs18ipjf9mrl1cqyvv3p31x41ii8wxkvjm3";
     source = "119d70668gw3za0mksr93wcq9gpzjn4gyv8vmizlabi0ip1ycgy8";
@@ -6512,10 +6541,10 @@
     doc = "1vvpmfb5ain3j95h5sdn07jp9qxqy5gihc5mxj92s7warvz5gg3a";
     source = "1dj717lg1380va9j86qwi3pr9b94fszm1k980vhl1xi68m0fpd2h";
   };
-  fhj-script-77111 = {
-    run = "1g26gkwis94wcj4a8dh46ccfgy0a030m7n09nrldzfmbihhba6zg";
-    doc = "0g55z1snp9m26l2kk33k5savw0d3wqm4ndarf0w51zcyrhgckrpa";
-    source = "118dxd54kk51f2086fwmz0lm36w73wnlpafw9yqjydygjjp8mbil";
+  fhj-script-78176 = {
+    run = "0wlgifwc6bsjy4r82hfs4rkm2jcmb0prq79vbrmhj43wjkygcyip";
+    doc = "0d0k461xsm1lk7mn5nhga4qlr2xy30x3vwsar84mbf9va37jhf16";
+    source = "0z0dl41icjis44g03mvbrbhw9pqjf4xa6shgdkf3i4nkzdwgjvw1";
   };
   fifinddo-info-29349 = {
     doc = "15zp4xvszy07cy1b5r3k5x256lbalr5acrrdj1gx33llfmvm469a";
@@ -6559,12 +6588,12 @@
     doc = "1pyb6spf1y6j4zrjgqryp4xaxgjh3iczv36v0n3bnj72kn1bg4i8";
     source = "07mjgl2fw0sszy3f2zlklc5ysxw81i80zn6lnrs9lbn60gz98gsg";
   };
-  filecontents-66740 = {
+  filecontents-77677 = {
     run = "051s23ymbjkv8z2d7sv8jsjljy5w2sh1mgvynlbkib390gpgybh3";
     doc = "13fwkv2fvdfl1jgyfg4pn9il6w6pn3islc9zsaqs3bwzj25y16rs";
     source = "1x5ahz0fsmnjx7bvbr83316r6w80gnp83yznnhxnj0zg42s2gfxa";
   };
-  filecontentsdef-52208 = {
+  filecontentsdef-77677 = {
     run = "0lrdmz5fnmrlzga1w2hr3ksydnz52lmqlnnmix7xrcp81qv9xmx0";
     doc = "1nxb4wm4wd223f9wn7x8j805ybximrk0v6n1l56xysz4k30jxcba";
     source = "0n7zq8plqn1yki6azmncgdlg2lxcprfpdq5dv0qnxvpvw5dawdvp";
@@ -6574,7 +6603,7 @@
     doc = "1dywknjhl2p9590nvcpg1vi8r0iaj52dv7sn8c2y8337w37c6ny9";
     source = "0fwqs6wqw93ih2icg9b5zxgya1zbaj2sn0jd3dc8b8dm59cwggk1";
   };
-  filehook-64822 = {
+  filehook-77677 = {
     run = "0h0k0fgdwzm50jz0ibj7zsv1sk355q13x1djc3pk4fg1f3czhfh2";
     doc = "00l8hx1sn4sn1mqpyiz9isl5a25a4a64nifq6q2jlw09df9gmf9m";
     source = "0bd6fhrzy6bh42yb44y4bh01zpx92crca8zia4lyjmc95rlv6gfa";
@@ -6584,7 +6613,7 @@
     doc = "0rw1pdrqghgdwzyfrc0y44cj1989lrvpab4n42qxbbb9srhmary4";
     source = "0kssla41sryd278w12syrhsi5aalld94vjcmddldcc0l8l71sz5f";
   };
-  filemod-64967 = {
+  filemod-77677 = {
     run = "05lipahmxgd7cy76rz1j3p2z4k31gj4q7ihvb0zbi44g4n26hz6v";
     doc = "138481q84a436a9ns587qcmmsv7p9fb5wzz1gwla25jigx8fb4fr";
   };
@@ -6614,7 +6643,7 @@
     doc = "1jrxyksw0bldvf5faykbpcngjfx06y83q81rs3k3m6vldm3rw23d";
     source = "179640qn5swml0wrc1glvbf94ia5y6s1qlyf3hf2vmr3vih7k2mh";
   };
-  fira-64422 = {
+  fira-77677 = {
     run = "182wpm6dkhs41y6kr4bjc4rpy0b62d17r0j60a23znfgglpriy3f";
     doc = "07wm5kca97r39shhymnwiarsxn0i5ykycyd28shqyqmmmk6f2j33";
   };
@@ -6622,7 +6651,7 @@
     run = "1d9l5nsx0qswn1hcalzsrxkvc7mvpdqk3h72bfk50h91lfm2i567";
     doc = "1w6zlskvs54x192nyxa83qnlqhvq98g64k5fv6ch406nkivifmgz";
   };
-  firamath-otf-68233 = {
+  firamath-otf-77677 = {
     run = "0680qh4drixmrvhv3klkflz0jml06x8k9inl2c8ym6a8adqx43nj";
     doc = "10ynw2ckqc7vsv5hq9kv78cvn6yd23qfbyv5060sjxl91w6qxs63";
   };
@@ -6639,12 +6668,12 @@
     doc = "029w914wk0g3kbi1i8zr63m0nmfm3nsaamksr47jnv5iyiyv55g5";
     source = "048g8x5q882668lbzz0ji1hndfkd2bd777s2zyyq59bcw0gmavbl";
   };
-  fitbox-50088 = {
+  fitbox-77677 = {
     run = "0jk46rrq01bbqkwfqf1rdrzwv475mdmz4hqvbffkivnbwj1vz18g";
     doc = "0gb5gpdrdagilxsklq1aijr5zfl5n82nwal1h9qls0iqzjvgizka";
     source = "039q5as7939zc5nby6m6piz5h0zphm19hqjkdyrgzw1q4r9ypzc6";
   };
-  fitch-69160 = {
+  fitch-77677 = {
     run = "1c6myhpv9ix6cr6snn5f9ky2z5caam1sqjgg0bq1bj8df3acdv80";
     doc = "1gdgmviy8pqqwwsvinrb8qsgsd4gw6bx6xci56w4nmfal729r6g4";
   };
@@ -6668,11 +6697,11 @@
     doc = "06f5mkpp6aar6c569pwd9952xgzjdy3zx8n8y6y9a6wfflyh3cis";
     source = "166zj8nmapwqkd06ksvjbjajq649amjrfji9z9j9mbcg865pgwa2";
   };
-  fixfoot-17131 = {
+  fixfoot-77677 = {
     run = "1zszczpwcggczq428ha84g71rvgml2zrx2v74nmk1damcp35pzlv";
     doc = "07zdbq43l9yddc9gi4i2qqpvz0xxmkhxgg3wl329j25p4h58amra";
   };
-  fixjfm-63967 = {
+  fixjfm-77677 = {
     run = "1v4gn6bwlb294sxrqgy6j9vx2dp7plbagkvmw7vbvp6wk8dkza72";
     doc = "0wiihlpjzvmh8dynf0nbhmn8raxflqxmzpk97s1qv7kkvpc79sy9";
   };
@@ -6691,7 +6720,7 @@
     doc = "17y6wwiq3b8l2p3nsfwm50g7lzip8aqls5ysgr4gvz1l8aydl26z";
     source = "0pzyg8k41rlj5gvqq86i9jnys9plqbxb3qvas8fv7k5kvqc43riq";
   };
-  fixme-63708 = {
+  fixme-77677 = {
     run = "167003w7a4xhy35fj6xm7mx1hvqn1bh1b563sih3adrwyrdnqjbd";
     doc = "03qddrr56q77h8qhrx9kryx1d0cab6lzcngsbmyzaj1g81hvwsxl";
     source = "01rpq9xd8rhy4fz8g1l6354pyibjsl90h591w7l7cz7v0yxldy17";
@@ -6704,6 +6733,11 @@
   fixpdfmag-15878 = {
     run = "0s5ilsmnhvi57x9cqwp7nwpagfribmgkbl0z1ci55aw2a6bff9hn";
   };
+  fixtounicode-78119 = {
+    run = "0a93ajjjxgmmkz4b9cr7cl0a7fmq0gg6i551clidfvwp3kdfpyl9";
+    doc = "02kpvrrjqvv4ijb6w55qhgc7g8a77s7ii7c9yzkvahi68i9lnhq6";
+    source = "073nhpx5w1dy3ix771fywvwrjyk15x14ndk34qz4jcaray6734gp";
+  };
   fiziko-61944 = {
     run = "16r25wagw155fnz5lngc3jqxaf5sy1f2mbyzdklnizaazh2vbfdf";
     doc = "0pdnd0h3hkdw32m4yjmqj14ijg3qix8ajjxkhvi88h3pbwd0wjiy";
@@ -6744,12 +6778,12 @@
     run = "15b2nzhpgj6018769ggajya6qmhq9rnyzha0sic9fff24jwdq62x";
     doc = "0lf04giwsgjq0fsk6wrms4c3dg53v1lq3n0q1ij5pw4390llsqd3";
   };
-  flippdf-56782 = {
+  flippdf-77677 = {
     run = "114xvv7sv9fhqxgfz5ckydn95mrg4049ml3kg6vjjiwbilmszr2h";
     doc = "1fgk3g74arazrmw6swfyq38s5gdw8knnwwf5ij0dl566cwmcfvmj";
     source = "0hbw3wgdva8vkic4sz0349mdyx8dpz3k5kk0fn80m0yqpldwgkid";
   };
-  float-15878 = {
+  float-77677 = {
     run = "08jb0v6lsyff09hid3whah0i0fk5znsik5rigl4l7vflnvc6km8y";
     doc = "0pqj9qq5yprg0xfxga8ck1s2wyjzz4ymhpqgzhzbxbdslh475vg4";
     source = "0774d7gmb8c7fc3f8yzarlx1m8nld1vg4gpd3dfyw5b39ra4aq4h";
@@ -6759,12 +6793,12 @@
     doc = "12yyyc456v4i5dj7g3cnv03zgvwvsv6c24vfz7wn9jk5gv90vrwf";
     source = "1gkq5v8z77cncqqz5cvzi78jf66v1kcni3yphzhykvd2mgpb917v";
   };
-  floatflt-25540 = {
+  floatflt-77677 = {
     run = "15v2m2mchki2gcz0fcp3myyr806fqyy77nv9g6rqm11aqp6212bw";
     doc = "1d7v1m23p47rl9lln02c6bsi5mkqi7c03dhmnjhg8bqp6xfkfmaj";
     source = "1j53lkr1j3fp5wlb41x2vimncv2l1pc8qm7qy74i0r1xf7kfibzz";
   };
-  floatrow-15878 = {
+  floatrow-77677 = {
     run = "177knmgpv583xajihdd5q5spaainn8h35kgydq2sfi6ch6cadirh";
     doc = "0py5a36gdbsd91679k4chfxy6ykj2wkjqlg4zkp5xsww6fxglskx";
     source = "1mpskdqhghmgh7i3425xb985pwrcqcbfw3hlfhbyx3bhwwx5pnqx";
@@ -6779,10 +6813,10 @@
     doc = "06i32gmsqgvqgy0l0qbdjybnp4rmz2cn1c7zw76w3mhd9z220d77";
     source = "14ikpr9fga193y2vgr5sisvzc5scf04b1xc9hcv6zmkcph8dvnnk";
   };
-  flowfram-76931 = {
-    run = "067fwsjkmk73j6zd2gdg4rxdmbv8ifl92p28v60phxzkzm7v3v8x";
-    doc = "0wn5jh4yqq1snwwwk24bb7splzmqgalciphf78as2v0lj5m2hl0i";
-    source = "16lmpgvkc22pjjkwaqf0nq455p9cl13lmrz3g58jrkxvk8zh4cy0";
+  flowfram-78116 = {
+    run = "16hcyn9lgjasbxgp0a42j8rk457iiccsmpv6qz541r9ln2iysqf3";
+    doc = "1r119zpcdkv1fp6ympan3cxvz4pdq0lny0lm8zh6h8gmcpls5vxn";
+    source = "0lvac2917fwaczl0viihr3fdb616999rl1ngmd7b6ljramqrgq3h";
   };
   fltpoint-56594 = {
     run = "13zin0r1hcfihji2h33q039mpcf86lw2q017ss8848xpqs41fb0p";
@@ -6794,7 +6828,7 @@
     doc = "13i7axi1s8qqgdvdky20dckmsa95q2q54z7cf6zgd0znzjy6d4mp";
     source = "1fd8h6dndrc7hphs87y1lfplmkrwgn1pxgmvf00gfhgkg1zf127b";
   };
-  fmtcount-77004 = {
+  fmtcount-77677 = {
     run = "0vp0k3gwsh0jivjkxbqqsx6sl68vl07d5zrwk0am85s2n4qx6mcv";
     doc = "0bh1dz9if8pnl78f68hs5mpmsh8akggd58r2yql9h4wflcpq7jzp";
     source = "150kb0dzidc9my77r91n6l53minwa54b5r34l85866fpfabi20g1";
@@ -6803,16 +6837,16 @@
     run = "0cj26s7555q49fi382pbvy65xa0yp0wbihk3y0magblyxjn72wdx";
     doc = "1kafhgr4c9d4pjpydd27ha1pdbxk364qv8dmcr7k3l7xlv31jv4f";
   };
-  fnbreak-66615 = {
+  fnbreak-77677 = {
     run = "143wpqpcqaamjvg466cwpggcayxfqnf2vjvfvy7xwgky9sfql05q";
     doc = "07h1xr1xgih5j8mmqvv6v5kavnb9yzrh94g0m42rjqdzg5c25fb6";
     source = "0rxbjgb758x82gvjrmap30q4jsfq0424r3xszbm1f9b4wb48xqxd";
   };
-  fncychap-20710 = {
+  fncychap-77677 = {
     run = "0x3sjslvz1gsrr8607q9r6k8683p9zcz7p0kxvr92j9ls1prl5c4";
     doc = "0is37brbbdqb1szx3rwgmaqbl8vlqr82sy8svam39yrbnzd9v1k3";
   };
-  fncylab-52090 = {
+  fncylab-77677 = {
     run = "13l9jmcwabifc7m9klgwl2gqypwlizy1mb7glsvp3jslpkhfj267";
     doc = "11w7z5q433lnzfm4c72697f82yb7rljk9zq41dl5bdb7l9wd7325";
   };
@@ -6820,7 +6854,7 @@
     run = "0rn4yk1zd4h2r5xhghv7v0ph0raspq4r6mw812hn80bn8rhjjrlq";
     doc = "1w0pkqqgkq379nnqk0wx419z961l3g81ldkh8ivfhn9q5vk04p0s";
   };
-  fnpct-76924 = {
+  fnpct-77677 = {
     run = "127n7966vy4rdwypbsczi1aksrf6pxl8xdywssviivkk3npmhwvs";
     doc = "0qixawqmjn2b1yy0fs140a5wfq0py5bi58gpz8c8564vx29yva5q";
   };
@@ -6832,7 +6866,7 @@
     run = "1gq483namx453zg5yv7acvhy9hb93z68fyfb54ayqkka2n35q80h";
     doc = "1qzxky8jjvnlznm11rjzgxmhib0psv7lfk3nfb8ys2wl0zjcrg2w";
   };
-  fnumprint-29173 = {
+  fnumprint-77677 = {
     run = "1i04c2j1jnw9qkbv92nd4rr0zzvwwdwwk0ya5f4g4rarvw9h4z5q";
     doc = "1cwc4jv9jxxinradairp45rlr97h52vxghfxin6dwszw51ac8p7n";
     source = "15d3jpxs8zgsj40xipg3mfgir41p46c3ppwh4629a1dv4skxg2nj";
@@ -6870,11 +6904,11 @@
     run = "1s1lkmpmb9fj4qmdhll2mn1hz8xk89z9rwga5zqpjb9was4vrg1y";
     doc = "19xjkzn9vgx2sgv5sypwcmwyx9f7rg4q58f913rjwrh8gvncv07m";
   };
-  fontawesome5-63207 = {
+  fontawesome5-77677 = {
     run = "02ip5czslh9120nrby3k9qn0niy8bryr4190yyhibnwkr9yaqj4k";
     doc = "0mbqzjfdm9hpds1fragbhds1zzyk91xzfy4azzn8bmb6xr3ix3ai";
   };
-  fontawesome6-76339 = {
+  fontawesome6-77677 = {
     run = "1pm4w3qrlk2484pwnk61p5p34zrd5v0z2smf61bbmcpzzvrzdpvh";
     doc = "1x3dg6z5w8x0rsl2y87azvb4mgk8wbzr9mcb2rc2m4qv40qkab8k";
   };
@@ -6886,7 +6920,7 @@
     run = "1gv1006alg1i90zfh042p2hb9j8z89lbkyp11yqjn74jkz5q1rzy";
     doc = "15k5dcr9h4cmqmq0b91a56q2sc340112bbvacp1lkpnchaxxgmjy";
   };
-  fontaxes-77306 = {
+  fontaxes-77677 = {
     run = "1cpgkpygmzvia6d46am82x4084a7k4m8a713y723k7kl0fnbghml";
     doc = "1prz1dbmpang23wzrrx7i16a9sa5hqnkkw85zcs7qvbdx8w7hki8";
     source = "03mln26yz55m06sah6s6gkgz4ar53zfz0mcxfbczp6chmjl5kiy8";
@@ -6916,9 +6950,9 @@
     run = "1mkfjhhck9i2yiwlrxz9prqfsnrgggzqgs8p878kf13aiyhvlcz0";
     doc = "1hwzqsr7wqd31z0n2brbk65wh6a48qqf6xwwzzz4r8vx76hrg4cx";
   };
-  fontools-76266 = {
-    run = "11gf2fx19rqc1sp4kyy88a4cc42ahk7glvqvknlk832aig9hryvj";
-    doc = "0i8hxdibsdjbpml39f859v2mwg5hngrccywl32bhj74r2xykdkki";
+  fontools-77724 = {
+    run = "1kqbj40biahrbysyz6kpzrvwzvsyv74faall8x2196w7x8yjxqgh";
+    doc = "07v90fv8phcnva6z5ar1493js5yvj9vplayj7rdffx6b94cmvhda";
   };
   fonts-churchslavonic-67473 = {
     run = "1s8y5kri1sjhsbz2mdszwy12vz8k0b5ad0rp383jrgcd710n3949";
@@ -6929,35 +6963,35 @@
     doc = "0l4p30am56bblp120lcs81idahw3wrgmbrvi0jzfnvzsyd7xh068";
     source = "06zw6amxdkmb9cdjvkvwgah5x33ksa9iigb4dcw6b9d3a0q8c8ya";
   };
-  fontscale-76924 = {
-    run = "1sipiakslqz0fgbip8w2xbpqxkqyzcilw6k6ba98rjlccls1nz1s";
-    doc = "131r8k6v0qgdqig7nx1j3x0cyn2lbgailgmrmh2ahpdqayffgn83";
+  fontscale-77923 = {
+    run = "1cwqq85cghfayv6nqcmi5f0qkxfla96251i7k1qnf90hgghlz87q";
+    doc = "0smvry3w6mda485c9f7k1sjpnds5q65vbxr07if7lbs3d47fhksr";
   };
   fontscripts-74247 = {
     run = "1c2nldjh5x42ysg81b3jcaaydxsrl1idnvj0si1lxyqk7aji23sm";
     doc = "0dbr5qf7pr932hjbn5s9lcvi97s0p7lpqkx19xyrkcln5nd75i79";
     source = "1l833wacmvail9fvz07da58r2waa9b85h6yhl94r26gyr79zb4kq";
   };
-  fontsetup-72734 = {
+  fontsetup-77677 = {
     run = "0506w69vc5x5ls9r276hvw5cgr22sz9333w7ji2h8mkmd2swsc4a";
     doc = "1c7g6r1g83h9rrd29mcllg9ar57zmwn4q4r1666wrliih6jim52h";
   };
-  fontsize-73038 = {
+  fontsize-78116 = {
     run = "1wrjv0p81by85zr6mldlkd1qrg45wfpbqhfvd1nwwf2zbqd9di5j";
     doc = "055dva4k677ck11klk3dzqmz0h3vnqp804yv6h44chk8b53j759q";
     source = "0d2di14p2jzm55l9gmxf28jran7p53xkf4899h1lwk7fwarkr0s1";
   };
-  fontspec-76430 = {
+  fontspec-77677 = {
     run = "0i56p9ijc802r52x9xgxh7xk77plf122ivd96zgvr0773znwnyfv";
     doc = "0qc6f6156n2fyan5qw1h3p1vxi8wf78dy5kh0g2zmr6ybaa3b45m";
     source = "1p5cnxf42272kkkxvk7wy6k66dszpw77lvg1lpzj1vwz9l1x0wr7";
   };
-  fonttable-74608 = {
+  fonttable-77677 = {
     run = "0wwzl9jzib0dw1343f794bqsn10z5si7iqwabknay2h3v8hq6np6";
     doc = "1c6qp15yya2nxkyhgv0h0cswbkcnngvz7gjpjx8mmpixvbsw0h0d";
     source = "09lgv2fy7yj3v2ibqf3mny3wgl37srdd0ip23cyxfmqyhvcmlkrj";
   };
-  fontware-73848 = {
+  fontware-77677 = {
     doc = "0wssx0r26y2dgnhdzhxi2fcnrlyysc0zfy2xbjp2vg88fyy1j13c";
   };
   fontwrap-15878 = {
@@ -6969,7 +7003,7 @@
     doc = "1xyq88jcg6p7lc44n2ky7538r23d4n0nhfkq25q7xg0dh8whbm34";
     source = "0ps56l6ah0i398f38bxy4yg2i1p0ajcwczxq222hl5176g2z28jb";
   };
-  footmisc-75164 = {
+  footmisc-77677 = {
     run = "1w0yr4i4zw8rb030j4lsgz9rqgq1zvsr9f5y11gisc99d01qip2w";
     doc = "1jr329mjbh9l0qvyl535grxpf3bpzgj521kmdhl3hcx07gzvgm7y";
     source = "1xi0k5jk9kilqxrwjpryzxjnj8isp3a1n38xdkakrvwb3lpyghpr";
@@ -6979,49 +7013,49 @@
     doc = "1962sivh4jipsxd0z0cpzpd0jdw8v4afbpzfinklivnla2c9hp4g";
     source = "09w5bfx94533q36z3k0a1sf9jx6acz85qgqypgn6b0b5mkhjsmar";
   };
-  footnotebackref-76924 = {
+  footnotebackref-77677 = {
     run = "12vxch1i8x0k8d760vgq61i7j3kkylgbcxj6ggdv8wzd20h4izyc";
     doc = "09dvvnjvika3617zx438ca8z3fmdkqbxx9y73pdhn6gaggfmzr72";
   };
-  footnotehyper-76871 = {
+  footnotehyper-77677 = {
     run = "12g1b8png4mricicvswbkz6jl2lzmhsilqdv4cba0rxszil4k3as";
     doc = "1bciisjrcvwd2cmrw0r7b35wj3qf0sgw180wxxmpdfjwk93nqls9";
     source = "017pvx2kg3nw255anpbs5da06sghhydjigpmci9yv8m8jjpgdx99";
   };
-  footnoterange-77409 = {
+  footnoterange-77677 = {
     run = "0kpvc4vzdzdx7v4qwkg8l9f7fp96gg1p0slnxgq256mk7p6im376";
     doc = "0k3mcpsyaa1mj59q6zdi5phrdf2v180iblj8480jhvfgwylalima";
     source = "0n1xhsyc061zbvqg262l95q7yhf65g27xwcclbmm15vym43c852b";
   };
-  footnpag-15878 = {
+  footnpag-77677 = {
     run = "1qdl7lpfy5nn6qx026b9aqz8nfs958grh443lkqyxnrnws0n2nww";
     doc = "006w2w6aga9zazlk8sv8maqi4s1rdzqyphp0lpa8qv5q23vcdhl6";
     source = "1hh2754as2yrmfz4hiyyl8nlshsfdhpgpg3ifhs6h5s0xz947rw0";
   };
-  forarray-15878 = {
+  forarray-78116 = {
     run = "0cn062f805lgy5m45q6flxj5w6gjfa4w1ip7zmhxd2z09s962jf8";
     doc = "1d6m425lfg1g8arjyz4j3q9253rdmfaabaasbpd2ynhjr1abfh3c";
     source = "0dpqr0hff33ddfw6vs0pnk8yhaa4gxkxgn43qgx06mx1srv6rz1i";
   };
-  foreign-27819 = {
+  foreign-78116 = {
     run = "1hqmhy3l2hsjf2hkxhrsdc3z1mn3zx8718w90g8152x9k84bf7jw";
     doc = "1gnaazl1ds76sqdpbj773k80isyf5hmjxh22p3hs9zxcpnvdhng7";
     source = "1ziafjxcncsba0gbn1qjf2w2gn2g9z55bpcff71hr9axhp8xgpgf";
   };
-  forest-57398 = {
+  forest-77677 = {
     run = "0q1xd07z1ccqrrfl3x0fg35sdv2kcyl6vgps7f6gpk5yp8j7d392";
     doc = "1s9i1kxd5zhdqv5xx29kh8i5fis642hcw76ya5bh94qffhwwg7j3";
     source = "1i6r6i8zh70zxz6sk0c9b07345vcfr9aapw8q5kzd3k76fzcqfdl";
   };
-  forest-ext-77412 = {
-    run = "1ljwazmiwzj55i8spg4mfxjyhna5pdcnv6irpi7phnlj70lngdbc";
-    doc = "00mvws27bgrgn19xd4qq31m2akwppdkqx73ba1slpkr6l67i06jv";
-    source = "0mwx951mdffmd53krn91zzy6km4pk4kzr094qc728kxzjgnlmrk9";
+  forest-ext-78040 = {
+    run = "0zfividwqi0nlamz7gwgqwrpbcxcf77qpvdjidgbmjn09n0qd7zm";
+    doc = "038l5jgsf9cr0jy7djdzgz0jpcl7p73v1v89ihpk1b4vyv9d5psk";
+    source = "1cy9ax4bilyaqijwj37wmclfvrh7cfsixbgmbfws5j7mq8lgjbfj";
   };
   forest-quickstart-55688 = {
     doc = "1bjy0bfkb90nv2dbdw8hdrm3dvm1v0r0m7a0l44ckw48vnc6amvk";
   };
-  forloop-67017 = {
+  forloop-77677 = {
     run = "0mqlc65g0khj1izxpgm7yya2klazsqggz2xx61ni38z7kqhqs58s";
     doc = "11y7afy69dkp9rabj1186aw1d8vfwk3vp9raj0brknka6wlgcijc";
     source = "0k0skv10m7z44d20v17yfdvg6vpn6m9ajn973d6da9cshxvszyiz";
@@ -7049,24 +7083,24 @@
     doc = "19aq7sbghvrif72x7vzvabrhwj7lgsddsbdqbkv9vhmp82452vyy";
     source = "1s8ngbw6s163dzj9mi629yd4fisxr1gl8w8i618my426szc1vrcx";
   };
-  forum-64566 = {
+  forum-77677 = {
     run = "1jvw5w58v5npajvhs7dq0srgdqha9yqs6xy56fbk3lm8y0cgsx22";
     doc = "0cihnv5c2if9dr5mz9iw12g1bfh118ib2an0sgigqcq6f4zp4nxh";
   };
-  fouridx-32214 = {
+  fouridx-77677 = {
     run = "033f2yhslmm70byg4pkw64g976vgssc6yiizmh2f1chlfhsz1qhz";
     doc = "1k6zirff9bqbz7assfrlq0r83bjqgzblgxix7697lmp6ww2rj4l8";
     source = "0il905sqxqvqk0fgsns3yb9hjh740h69imykxd84p92fndaha5mn";
   };
-  fourier-72243 = {
+  fourier-77677 = {
     run = "1bbz6c5cz6xbfn93zz5ixxdlh6rili9bsf42q2704jmgdyfi0y4i";
     doc = "0k6p2nmnjcnjm7c81jdp68xciabjnl0pxqsib2xqd9f234mkz1jm";
   };
-  fouriernc-29646 = {
+  fouriernc-77677 = {
     run = "1vv4whd3axfacbmm8nksdc37d5zras4gwa6ykgw1svplqgg3zjk3";
     doc = "128n1cnv9h1hr4s6bp3xs1v9p7skhxlfy8afslpay2bm0ixf0cs3";
   };
-  fp-49719 = {
+  fp-77677 = {
     run = "07qzdfrk2y499cz9jbpnj024r43japqdngbxg4mbapw9cp8066d3";
     doc = "1y1xwqf6mskg10h31ws2pvn5y6g9asflc7l9r24fp2fi4254mvhq";
   };
@@ -7091,7 +7125,7 @@
     run = "17r35x914f3h72drsszy74ir5phcxmkrcvwlrfd11li0lsmiyj62";
     doc = "0888jcccsnlpzkynpg8mvxy2mnb2d3xz41bi341q9fdbbzs5lmnn";
   };
-  framed-26789 = {
+  framed-77677 = {
     run = "0fp0zbq3bjfqx87zb01m5ffn8kw8044vkz8b9cfndz1ki64d9x4r";
     doc = "1pjnqy8zl5zkadpkvwa35khwjk1nxg9pq0h1wqwgrdvqk6gj0cbi";
   };
@@ -7110,7 +7144,7 @@
     doc = "0x1fp5xc2qlx0pac2vqm8567fdh8i97k25ixr28w7fzwl9xnm91x";
     source = "0ag37z3klcy0jvcvvj7v14clx2dvv6q43lh6gw83rpsx51v9wza4";
   };
-  frcursive-76924 = {
+  frcursive-77677 = {
     run = "063909r7iga0cirxq8qx538407qly4p2a440xq7c603fmgcb8n6k";
     doc = "147sa2wcixanwrhdh3ns8fg447zh5f42z8x0aw41xhk7pxncqrml";
   };
@@ -7153,7 +7187,7 @@
     doc = "0mwdqry0h2f65vrki3kvqpjnf1nm5n9v3ljmn77nlvkarqp2kb57";
     source = "1p2c8sdrm0ay9nz0dqrcjigzsjki15fry6mmhqcm3gqrcscsk5x2";
   };
-  froufrou-67201 = {
+  froufrou-77677 = {
     run = "0pincrfmb51qwn9bcfyqb6rdc0n08lwxf2gr8l74kfmqh2mg5mxs";
     doc = "1jl6glh4pjm870wlb4in3v5vph55fnvykjziqnq702gx5va52jmh";
     source = "0wng7skd5zyk0s2vgnilndi8p9b3h672pk00mwv97h2qb4lk848i";
@@ -7170,7 +7204,7 @@
     run = "0dbrhynslppw5nrdvikzdkfvilzr909ypc9v8nxpa3yh4zln182d";
     doc = "0iq7lq25gzyc85wpmr93a8ivgc9038rs80mvhm46zdrrixh5ry21";
   };
-  ftnxtra-29652 = {
+  ftnxtra-77677 = {
     run = "07fazshsyqng62sfbnjhxglscw707jmn5lz1ws6avq8c5chs70pb";
     doc = "0a100iy3imy2x6rgv8pgkid75ah21684ddm6vda58gv8yzfz9fyd";
     source = "1ips0zm2cka9wh4474sc283102s6r9hvr4if7lhd04c92f40r3my";
@@ -7198,7 +7232,7 @@
     run = "1011vk784cw12az1wl0dmpwd4pwajj8lw7i8g800f927pgcp045q";
     doc = "15n97b65hb5v7504ky378h4ahjys8c4dac6aa48n6r7nzss8902v";
   };
-  fundus-calligra-26018 = {
+  fundus-calligra-77677 = {
     run = "1rnrqblg06qkwcy7f460pd1hnh4bwl47zyswa1iv4iknx00rd8a2";
     doc = "0jvbvalqyj0kyf6cwr6zf18ylckh3fwpshwhmnv7ldg5r1ylia9j";
     source = "14a0d7d8mlsw7qwpspqc2rmcdyhnfy6l7f57bk9v9jc8pg9fxb6m";
@@ -7215,12 +7249,12 @@
     run = "0iq3pjzqqyqblv22v625r5m29az7crmx735ar2fqs46xaasb8bz7";
     doc = "154hvp4f15lr7h6fwi2ml419w2rsl0zp896yqm8i26rl6ms21z1b";
   };
-  fvextra-75355 = {
-    run = "0yba9lh8d9nbnw3545cgnaf2589g510nkj2zfln92b56qk2lfn3c";
-    doc = "0k8pr21h6px7x2crvrfs4s1a519k3zzlzpi1a36986v36cmqp35l";
-    source = "0qi2cl091g45cwnpxjppa1srgk878nn2kdhgw864m0qhgpy89ls1";
+  fvextra-78177 = {
+    run = "0m97y71yib1d371bm03p2pl058j17b8kqsm1yvazdlz32iii97is";
+    doc = "1y2mbzyha4xpwlqn5r6a8jvd54cbhn5qcmww1cmnis7qf5kb9hdg";
+    source = "0ip7jl42y3c7y9mavkf8imszscckrpmhg341ndy31zs20sif4vi7";
   };
-  fwlw-29803 = {
+  fwlw-77677 = {
     run = "1qwlknaljj8f1cpnln328az913cdwypr7w8m8iqbqiqhsl49siap";
     doc = "1cib3id21xblai43gkn78ypz6n99vwzhzmpdifdm8wv001x7wb82";
   };
@@ -7252,7 +7286,7 @@
     run = "1wcvzihv3xh52s3ydni4gs3lcp9icmxinqj6znwyy680izmw67ba";
     doc = "1al5rvpfavkc1p7ayknxnrs4r7jzx7f7dbm3hayqwg0d7jdanp8r";
   };
-  garamond-libre-71058 = {
+  garamond-libre-77677 = {
     run = "12h5zlxh63c47l2kd25b94y92p12n75gqdvy3jnnhgbbiqh11p2z";
     doc = "1jlpczavvwyw2rm88habsm2hc349wrbhqqpsn0rmqrb74pv2adpd";
   };
@@ -7285,7 +7319,7 @@
     run = "0jsbvm7sh7bhs5yfl17fj1gbdqgpm7qchf07y3p7k0rxxg0f482z";
     doc = "1f6ycdq3lpylkdwja4f89plz7wpnz73wzgjz74far6r9wr026443";
   };
-  gb4e-19216 = {
+  gb4e-77677 = {
     run = "1mi8nwxa418wqp9w64ya1i0ag0pdm4cx08fkmaa302bkhym92bal";
     doc = "0nzmhjqdhl0x29c70iqb8b96pjnx2vm94nk3xgid942pmx44skxb";
   };
@@ -7315,11 +7349,11 @@
     run = "0nb6q62ngimkyc2xr8xsxazj2jjqs9ysz8jnq7ihzaw9fj44krpb";
     doc = "0qyryw5zxi7ihd1l6nvgx2l1b40k4bb612fjmjzbynjhhfsrm9xr";
   };
-  gelasio-71047 = {
+  gelasio-77677 = {
     run = "0mb66kbagilmm189y3i9dp4alh2csq5ch14g163pgs595d6a24q2";
     doc = "1yqw2j0wfj76zzam8jd06kpb2xxcrqcsb53rh93r7x8hd1dva2p6";
   };
-  gelasiomath-73362 = {
+  gelasiomath-77677 = {
     run = "1qgkw2jn83w1mh4fccdlhxrfs1ybcqmwn29vn18748k11f08giq7";
     doc = "119fnv79h8zpzmhr8wqadli7m3302in7g6mbwfzjgndpn6cf6mfa";
   };
@@ -7349,12 +7383,12 @@
     doc = "12fxwrz5gpswyf523wm1pg99zilkgrpq8z3ls5gw9j7bdb71nj1l";
     source = "0q7acjs7g1xh5kcmrg20k9jayaf5vxz5p5amjjd4xj4rnb1wdlj1";
   };
-  gensymb-64740 = {
+  gensymb-77677 = {
     run = "0rsck4ysx86d4gfr5a1w9kam98zzclb78v5hgdmhag74a0qs1n0l";
     doc = "0826rq87q35knzmwkhz6ipigx3s3hkzcypy977qa0r3ibcbdr7ap";
     source = "1na3aqqjfp9p9zb7hyzz6wdd0biiigih9fq6bxygcwflbwbhks6z";
   };
-  gentium-otf-75790 = {
+  gentium-otf-77677 = {
     run = "0fy78km27ad0g402wi260w08klv8zd66q5gdmy62wfib0lwfxgh9";
     doc = "0ncy4rd7vspc41nfwdv8rshlx1c7rgv0n730rg0ng3c9rypdwag0";
   };
@@ -7365,11 +7399,11 @@
   gentle-15878 = {
     doc = "1l5fyfdbkpqlgpgi1hrnn2sz8hchlnp7z5s5584czafvs10jg6vx";
   };
-  gentombow-64333 = {
+  gentombow-77677 = {
     run = "0r3aziqnq1pm2pfangv4238rpihaarndi3xhvpvfj7mc31b3mygr";
     doc = "0vqfamrsy4r1wqly1196cq2w69wydzzw09y3jg5llvyh95a6dp0i";
   };
-  geometry-61719 = {
+  geometry-77677 = {
     run = "0wv4c77fvaz8qg1ffjg3y06r3q4xjfxkh3m7a5s9ynwmfchcirgi";
     doc = "1npbvp9g9b4mp8w768gzx1vxsdsi9zlrlfgc65xmb0rqx7z19zvy";
     source = "0dm5zakrp71rxfa8xgj7ks0gfvmrm93sqi6f8m4hw7ls7yqm3y9f";
@@ -7414,7 +7448,7 @@
     run = "0rh7b66fn37nkcy2y6q8h3j7i8njwdmizn68iy1bg2l080ns1nw4";
     doc = "0dmjwgv0qghhs7fa0a9jvk2mqbg4m3br1dk2x7q5mxyjzk9878da";
   };
-  gettitlestring-53170 = {
+  gettitlestring-77677 = {
     run = "0kg2p7ys50ms0li3vnrabywnrjjgllpyr8sf9cz3rnv8zsab4b68";
     doc = "0xkk16ncsyv2s3klv316fprld0d5aqaldh3g10p5gcicmccd9061";
     source = "153bkg899ikkg5zhfw1nc48nzk3c0x5iycxspxcrrj52dpgq22kx";
@@ -7428,23 +7462,23 @@
     run = "0n2g1kjig7rg9bkry1hyq9jap95jb9crzxh4yd9jylgrygva6wr4";
     doc = "0lfdm66xrvkphqnzmymym0s79bwap5x4h57q6ndb7h97p5pxhfby";
   };
-  gfsartemisia-19469 = {
+  gfsartemisia-77677 = {
     run = "0b200snkvdkrywgn3j613zxyx16prqczw106hfh7pzpr7w717lyr";
     doc = "03gi2v0vfcdar6qsp7xff9s5pd023i3kh4b8asxh9lah998qm3z7";
   };
-  gfsbaskerville-19440 = {
+  gfsbaskerville-77677 = {
     run = "0n68mfx7026ymxlyhdyg9ppylh5g4bkwj95c9bfmp5bmym0q6dfi";
     doc = "0v0widjs2w65ppvzm04wzinrcyp8hcicgxp6brydjmx9d32yrzcq";
   };
-  gfsbodoni-28484 = {
+  gfsbodoni-77677 = {
     run = "00r9b46m6h4vac788vfz6jixrd4wbmscblhqi1pxhg76id33xdgd";
     doc = "1s0lq3ac01zcaqyvswn12fxhvqarq2b3lni1xza3yyk2p6y95g1s";
   };
-  gfscomplutum-19469 = {
+  gfscomplutum-77677 = {
     run = "02c0zs2xl2hy5wrrj25w22q1fj6q8w4qjbvlpx05pzzh3y63n3ip";
     doc = "0h9i4v3sag4fmvlnkk0wjxmgsq4kbiikzv0rzfrhzfwaifpznkcf";
   };
-  gfsdidot-69112 = {
+  gfsdidot-77677 = {
     run = "0m75xf0x7y3mxhhnvs22f1fz4gr8m86g8z9nfqxvwijjzm6xgm1l";
     doc = "1jaxayp4z0ih0cr795as9bmp87h24z41ijhrfwwrbpbmjkkm77qx";
   };
@@ -7452,19 +7486,19 @@
     run = "03p2w06s9kca35jdby74q4x8if5gs39gb387rjgqbv3vdn7zxi4s";
     doc = "0qnkxqr8r9spg3xl2ifr2sb32hbvmka979c4f8aw4z1i810bs0kx";
   };
-  gfsneohellenic-63944 = {
+  gfsneohellenic-77677 = {
     run = "0ycqh6fn1y4czslajdwnj8fga6f2riw0pd4az10qmrxayi5hil23";
     doc = "0zp7rba0mhbhjsnjwm3ldy1frz75grxgnkfl1gvzm4psxm3c9yjy";
   };
-  gfsneohellenicmath-63928 = {
+  gfsneohellenicmath-77677 = {
     run = "1caa8w1jzwk77djhycahr3dd6n8823vc513gl7sgx2jid4gidz6j";
     doc = "1fk5rn7jxqlwhzv7v9fvpadhlr07fr4pfjlqh7zx5wl720xb3yif";
   };
-  gfsporson-18651 = {
+  gfsporson-77677 = {
     run = "0h2zy85jalpx2vyjszw0kkrav82zv549c82qik9iylgfwfk1amx8";
     doc = "1zy50pqr9bzfncs03fg98ws41v0v5c9y36rnjm5d9i7q2zljapy9";
   };
-  gfssolomos-18651 = {
+  gfssolomos-77677 = {
     run = "1hn8k9majggqcis32nw2krnqpqdgy3y0dk777i8fqn28517ygxcx";
     doc = "01cw6sq180cjjzwgi7p2qr9pf6rq0r5zmnb39bch2g0n0rjxqwgl";
   };
@@ -7472,7 +7506,7 @@
     run = "0skiyyxr8l6a6n34lic42lf0rnv4jm5rpmzm08gv0qqq4ha67zki";
     doc = "15vpkpbpnj1w3nlc5wzy2k4fh8jw1a21asc24lj0j6dpb4mzja1n";
   };
-  ghsystem-76924 = {
+  ghsystem-77677 = {
     run = "02hvpf3idwmm4hjkbvcz0w9n6sb6iy1xcj0iiqa51fzg8kimpkzj";
     doc = "1lld29kqvfgl4fmj70z52l1b5sqcb3fr8d2aim5l88grnypn9gb5";
   };
@@ -7480,11 +7514,11 @@
     run = "11aph8kbrsjl4ax5hbpirsgc4aznj0nkk76v1ax6d52f8bxjsgjx";
     doc = "1qbhq72bip77lsa5pk05g676c08wc0y1ix3c2iw1h5g5fk20i5y9";
   };
-  gillius-64865 = {
+  gillius-77677 = {
     run = "1z49x03rvpdgx7k3ry6wkz4vm707ms7mf0c120gr5dl0ggk16x8z";
     doc = "01vidppjs8nwsf0pnj5b6g7ky95ayjiklkr2fybi4arvc4lhswgp";
   };
-  gincltex-64967 = {
+  gincltex-77677 = {
     run = "0w1pk80idhws2yva3zvlbnwy2xbrqa0dckhwj8d9sdqxn5j2va4a";
     doc = "0zdv33r7r6x39p80jwjxk4k2yi4rqyv9w3nzkn7si5ckw223gz4a";
     source = "0m1yd9b6qlbmrxqnyk7kgxx7227zy6v10sf1vw856gpx1r6xbc22";
@@ -7515,7 +7549,7 @@
     run = "1n8xbs2xp69gciz2qg1wvc7mnwgz5klnam30kd45zmssvaqlblbz";
     doc = "15fj5d6wqqr09c3mcnlpmp6fva8rbc2c5216jl013jc1shlpybbp";
   };
-  gitinfo2-38913 = {
+  gitinfo2-77677 = {
     run = "0k3vw12yh13q1v21bz7i3m32s1w49pk13rg3c0d0l1pcx0wwz20i";
     doc = "0586h9c1kp5cg7gk67xhy5fbshpskrmfb81m4xncaxg6ajaljk7n";
   };
@@ -7664,7 +7698,7 @@
     run = "1b7gbvkhscb2p4yhcwd8mlh3fsvgfq8g6876s1brygnp9lsz7cxn";
     doc = "189srmaykk4pmm3p65p0i00ycisr2bdvb51r6ddn4rjbliv6i9gd";
   };
-  gmp-21691 = {
+  gmp-77677 = {
     run = "1c98y5fhnq5w9b6kkpnrag364269s90kccgbqwr33bn9ixhsf0dq";
     doc = "0wir24czbym76b9fcbzd29m0749lbh26n44yfl48k5pxy6pkqjcb";
     source = "1qg01aaf4s939ixzl7wdariaxxg1d5z4s76cz50rpw0p7rgdqbay";
@@ -7691,7 +7725,7 @@
     doc = "198g23i6k5f353w2aa9f9cw6cj8b4f93nsk7iq2hvhvk6ia876vx";
     source = "0iz43zdvzfs7spc6zvgclyh0vjnzkwcixgk5mg2a3wrig8r4q6fq";
   };
-  go-28628 = {
+  go-78116 = {
     run = "0lqgz9r0vxjbq1nyg77zjfsglwbd44zdpwz56smalb6lp2ra3r5z";
     doc = "1mf49wywa32chr8q4c0s4fdkmzd88a1fj3hxcf3zx7bnsi5r4gl9";
     source = "0vslzmpj94qlh5g2jirwj8b4w93vx33j8xdadyc32s6b9rrdwnyl";
@@ -7701,7 +7735,7 @@
     doc = "0a2rd4m38mgyfpjaf9na75w5cmn32lxbbqhqyfr145hf2nf08c1x";
     source = "0k42x8ni36gq51aw55ywy36jl89brhsc0177kn56zpvv2zmghqiw";
   };
-  gofonts-64358 = {
+  gofonts-78116 = {
     run = "1283jyz641bxsq6vxgaaa3hjrjw101p84nqv2jb7vixpd0yw6qwx";
     doc = "1bq0db6xak2mj6m5q2z85f7j7iw29hh2ch4767lyi5s496csbysp";
   };
@@ -7757,7 +7791,7 @@
     doc = "02kx45b2c9d3f0f5h8xw2mnqn1mrp7v8975y2gqx1ln2x61xmjpm";
     source = "1lm6531f5s5j1l2fasz0fk0adask83b2w1plkqmk3zxrn4rcchw8";
   };
-  graphbox-74754 = {
+  graphbox-77677 = {
     run = "1wh225dqyd7qchp6nj6pizy6yaylhngj4sgzqx95mvl0zsssc9kg";
     doc = "0xp94p5h602w4jaw2z3bf33nmlqvqa0v74b41y6hpn9phzjjxcgq";
     source = "14nh33pcbz2a2b99x8jy9mbw0izlfsnxmhpfsfan0j0d2203hlxs";
@@ -7817,7 +7851,7 @@
     doc = "07qpkj60rrl1pc651qa8kpym3bzcc0qkfwaggcyin9a65a5snnhf";
     source = "1g32xq2f1ncq124j2j8xm3vdkhv4sxynxc3wzx7x6s9i91p5l59y";
   };
-  greek-fontenc-68877 = {
+  greek-fontenc-77677 = {
     run = "1lsyx2g792b2m7rjlihqj26dkz9kaskbrbwzvkjd0x0rzvf9g3a8";
     doc = "1qrn41ly963nnpwchs1s1l3mfsi49af1x0q9vk4zms4wcd9w34wh";
   };
@@ -7847,12 +7881,12 @@
     doc = "0winvlmy3s7hrmcffd3szlywi798kijlzya9x3s7dndnyihzi3zf";
     source = "1ln0ncz59vcw5w18m5d762iqq6g12y476iahcnmbpi3gsfk47ln8";
   };
-  grfext-53024 = {
+  grfext-77677 = {
     run = "03ff5n3yc3fxrayhyapm9qhd665r15v57vri6ajb5xb4m18rkfqw";
     doc = "1f5kvnnv604qllqim8qv40cfpx0xaxanigqnqwmjfwf0n44akcfp";
     source = "0i5pkqrc4jm3cgwzyhw1r3kh6b0b7sb352bnzid7h8msiwx32y8k";
   };
-  grffile-52756 = {
+  grffile-78116 = {
     run = "02cmm9q14h87dv5h5ci7ny7v4plrry54mz15jddx1zkfx4myykww";
     doc = "119xqz1n57mghhp7db19ffrv1cdk1fgpznlyrn3qgvg2926mx104";
     source = "0pmg9140plqv27mp936ca0193ihggd243mmprj3l0d6rf5dajm8j";
@@ -7875,7 +7909,7 @@
     doc = "0z3vns6jk1ihiqf12i46n8yhfyjmnkb4l5wyc18phbh9l6879b7q";
     source = "1bnb38mgi6pzm6gvxf0k60z1dal3kgi2rjgwfrcg2h5vmb5rpdk0";
   };
-  gridset-72056 = {
+  gridset-77677 = {
     run = "192xnbl3xrv37qm5k2yq2d0wl35q614dqa9i6j5clqsgaxhyw65q";
     doc = "0h7dmjvsganvj54y3fb08cji7f7xgqrssy2hc4prgwr3s33d4kyj";
     source = "0v93jcg7p016154ycbr6baaphdym1kiybm96zjli7xp7pqjb1bpi";
@@ -7983,7 +8017,7 @@
     run = "03d2hknh1fisxw4dv3gsjakg56bqs2qi21rj0al5nwi3p3njbv8m";
     doc = "0wx17v0cg9f5j4r9mqgvzdac94a0afwkvnl3ci7njbajsjpg5nwa";
   };
-  halloweenmath-52602 = {
+  halloweenmath-77677 = {
     run = "0sfcggpqhai8xzpnbyz1vlvh7cfl3n2m7z0av4drd7wqzas0mcw2";
     doc = "0k7qfv036aa691902chj1rgcf3z2xd58xfb2r0b5z80g6944xjrk";
     source = "0ir0xr3aiyjiashy6jl39f401ccgx3dhlyiqx4h2myiwq45ay2ka";
@@ -8013,7 +8047,7 @@
     run = "097qbqwbib8gj53qlydflff7sqp5ghcg5812hjnav9a0rgklpw8y";
     doc = "19falj7rm7diwr24q5rpab3rp39awnyg0hdxfhhalkpdmjwqk2iy";
   };
-  hanging-76924 = {
+  hanging-77677 = {
     run = "0s86yaxyfv9zxf4svwg9s13by9vrw38apfg0hsfchsimsdd6gsbb";
     doc = "086lzvx4g6bj04xdqnadmb8832klmq362k9lqh4pz7ym34mzh5c7";
     source = "0wwfnkb66m7r77723kkkdp7yxkl789g310m5lhllwx33fbhm8vhj";
@@ -8021,7 +8055,7 @@
   hanoi-25019 = {
     run = "09a7cv76naxzdach5507wdqnjp12amvlia7kw0jh224ydmkzfx9x";
   };
-  hanzibox-76924 = {
+  hanzibox-77677 = {
     run = "0pww3xzi9r52cr0bggpw7wlddm6gzf5vs5xi7v03ynlpn45wz3x2";
     doc = "0x18yvhnywhdl68jz4v5llkqqpiz1l48nv77g0x2x2svzwrxrw3w";
     source = "0dblzzg2gkg1blx8rh3rs3jb5pq1qjcn9nq0n0rz7a7dph5f10j9";
@@ -8029,7 +8063,7 @@
   happy4th-25020 = {
     doc = "1x950scxbvcgwycpakflpklc775pknjab620g099dnsfrpb76f4a";
   };
-  har2nat-54080 = {
+  har2nat-77677 = {
     run = "0zaqsnvg46pdf98gzlxa8l6z8v9l3fd7jmf60nbrfba7jrzpy1bh";
     doc = "00n5qcljlpw2rq8x921vhsk7xvz8z43gxiq41qfzin696ysn7xj5";
   };
@@ -8042,7 +8076,7 @@
     run = "18xlj1c6h7mbrdr6982rw7qc7rzpjl0j26i4g928h3iml5qfcfgb";
     doc = "0f6zl3f1mdrn643anfsrhmjfpmv31b25xsjjnqkz8bixzcv1pb21";
   };
-  hardwrap-76790 = {
+  hardwrap-77677 = {
     run = "1kwsns5vg5pkplcl5nhmvpm2ccdv0f9431qxjxq1k6zfsknpy60v";
     doc = "0h1n80c9l34isgyzl36hf4nigxcsykfgqv6i9jjdf6dqpp23bpw9";
     source = "0hiqsj0vpfkmi8z048ymlnxrxaam8raq2f48wlyk67x4w2gv72k8";
@@ -8059,7 +8093,7 @@
     run = "18p0xqjxix4ka9a9ja513il0wrpqrqh8v9v13cc89kh8qfjlf9m7";
     doc = "0l2y9l8wn55dg06fbxjnv16bkhgbg9rpfclawfh4p7m2cf2h1k44";
   };
-  harvard-77050 = {
+  harvard-77677 = {
     run = "0jpxqyrw9skg7jpw2d46f8nrh7jaa3r9lviv848nfnn6h35vs61n";
     doc = "10vxj1cna040i520wj7c0flbk0d4hr22jyxqrv88616xqqkg3b6g";
     source = "1j754jjwdil45pr032xjmwhf1i2phspv2swnjbyxgnssl6i370r7";
@@ -8210,7 +8244,7 @@
     doc = "031260nmrnjyqxnxcx7sjfwvjvsmrbac14j6vrxywb1241d1wb4z";
     source = "193blhv0q5bx4523spdd926yab4y6frh7bm2rz0cs1bmrzisn1vw";
   };
-  heros-otf-64695 = {
+  heros-otf-77677 = {
     run = "10q1g30vma4fnqyga8279hqy2aq5wq6fv8d8nw22i9mm8ms2wwga";
     doc = "07k4k2rrkj4wx8i018jfccs4gf2pvx8grcmz88lmw52im9ga002q";
   };
@@ -8218,7 +8252,7 @@
     run = "1mnqsqsc99by1r80b6y4rfb3kzb0r10jsfpfgy7yragr8rr9xzjj";
     doc = "0xh4a41lfds3yrj1am613c4629kvgvd9dfdfzmss9li3j5pa6jwp";
   };
-  heuristica-69649 = {
+  heuristica-77677 = {
     run = "0k2ii054dq1hh8xj3n28mn0lg54r3xxcyzq7s3g782c11dg9l5kg";
     doc = "1ccivk54m07h744dzl2162x82bbvz0vjvrnbxmmvrc3sk26fh2s5";
   };
@@ -8344,7 +8378,7 @@
     run = "11j0fxsxmyd93px9j5fdarz1231nczdkfpf1qf33kcdpyb44jrs3";
     doc = "0hdidvz42acsgy021c1dzlvshcmw6fz3pkqrwpk66qk2nnh30dal";
   };
-  hologo-76851 = {
+  hologo-77677 = {
     run = "0rn7x8vy66ljlgmah7kkscjzni90wbhky5rw72m1asqs7cnbibwn";
     doc = "15a234bpkismrgfqi8fi5vy6qma4psn0ggmb131vfp7zpziayrkk";
     source = "0jxkx284ry3ywmzznr5qg54glszblpn1wcxmgvvbrxzdbi8xas7v";
@@ -8396,9 +8430,9 @@
     doc = "0wrvq4k9j7nz363irhqagf5sc6bj3lagyz0jql4mhxihr477wfp4";
     source = "14p4s617q3sdf2fmvz9mj0b3bfsgd7fyqbq1qd8hlsjkvddraw2l";
   };
-  huaz-77345 = {
-    run = "0i9hgdv7kkhjqs2p9yqf22h6s47g564j1k7b270p6yxadxqrjw7g";
-    doc = "0k9gvmg1wgnv033mqh1fxwanbkv8whji3sg81b6lpj0f203iiby7";
+  huaz-77576 = {
+    run = "1rf5rsc55whiwn660m2g00j8avqmjzv10kdd2p9fzd1payjwp38v";
+    doc = "066h8jy3z623kwql0b6xy4196dzvy4jyhcp13m83qr6fp7f92kx5";
   };
   huffman-67071 = {
     run = "17pgzpbhah5m0gljhkqymv5lxpl5bxxgif9m7rnad20x4nmyzz68";
@@ -8427,15 +8461,15 @@
     run = "0k1vm1dxpv3m48nxlp9mx53w84lagqw7i26c465hinxy4k7fn2b8";
     doc = "0hnzf8ksgly0zmzjkj0jnlnynv7rcz08fjkamnfisgb0xa03kpx5";
   };
-  hvfloat-77209 = {
+  hvfloat-77677 = {
     run = "18h8qgr3h48f6r2d09ly02phchk7bycza2d1ldhxnpvk4n8vp3l3";
     doc = "0v3arz7ljfb4s1ci931ydnh7m0h2mflq7h5c32kvyhlhm1rvh0fq";
   };
-  hvindex-73580 = {
+  hvindex-77677 = {
     run = "0541mrkfhzgv4mqw98i9fp3w0l9sawargjc686q2ins0slr06775";
     doc = "05djjp38i2n2bbl7wv99cqf8znyxr3nr6nl8354n5qj92hj7dav6";
   };
-  hvlogos-76699 = {
+  hvlogos-77677 = {
     run = "08vfbikgqax8bv0x1axbh9a0kdvwy21nzwgznyah4yz7rdlj1nwc";
     doc = "044jwphzkyzh7sahi292sln4mrqv6wq7ff8dv2pr5gsm8jlifhip";
   };
@@ -8451,17 +8485,17 @@
     run = "1vkflwxx8c0ckx7kz9mkh2qkpyxjjx9zmp940p9w93x4c09bs6l2";
     doc = "0i18fcfbvyv4k578bn00w7ngk5lxp29n1j1i52vjwc4cp25lfgys";
   };
-  hycolor-53584 = {
+  hycolor-77677 = {
     run = "1dfd149g2k8cq3lw95z6r4knyq1mgirdqnk9c4lmd7ip4rcs0vi5";
     doc = "1pc12vbn1yak6l6c1fgpnj0s88fg94nagj4b95mvclad6b546g71";
     source = "1f5jv91vsib5vk4byr0481a8j5pvbwmhfqz2qd14ck2vw8laz4ap";
   };
-  hypcap-71912 = {
+  hypcap-77677 = {
     run = "17si5zrfy47zn3imxnqjmx4kfvlziri9y41g3jnif4nkahxaajbx";
     doc = "1rg3rikk0393c4bzz3gzrm99g34pb4w921cm2n3a3nllfyr46bmz";
     source = "13drx7mgynwmzjzg2mnwyfvn3hhvnmkw21sl6frkd575916k6z45";
   };
-  hypdestopt-75593 = {
+  hypdestopt-77677 = {
     run = "14y9az5748mbsiaq2g1vwga32di71crq0aa4yxsi02icvm8a2z4z";
     doc = "0llvmpqlsdjfjfbi75jcb8fcki6xrybas8qahplwyg57vrqh6ydp";
   };
@@ -8470,7 +8504,7 @@
     doc = "03bcsfydm4yzm1g9ijz1r2r0f5llc0i3pf318aa5rfy6j896nvvw";
     source = "10yvzay1g3nk2kpv2l41vd2dqxqh5x03dd23xcpd4lk09rbddcpx";
   };
-  hypdvips-53197 = {
+  hypdvips-77677 = {
     run = "0ax6n7ki47jyzp5g8781c7rv54hwrl0fg7d1bwzbj9bmqi39df4v";
     doc = "15vnypyl6g50d4mycz3s41h8ccpmknr0vh9bwacr6nxbzlyyykrk";
   };
@@ -8488,12 +8522,12 @@
     run = "09lnsw7ycwkk71fyjk8zwgzdjv8ff3k028q7hr27dqsiyg4hjg7a";
     doc = "150ayv12ym9h68a09h1xakdfzccpix1pff9blkzjq6iz5imzzpr1";
   };
-  hyperref-77528 = {
+  hyperref-77677 = {
     run = "1n6qyzmb92dbw7kf64av5zvi1qhr7ksl13lkywd969kid7wh3bs6";
     doc = "1f02l7fv6lw629kvcphn7yayaglj39m34rzqj7qqxqnjk0a7gn38";
     source = "0hscvdz8r429v9r9jky212m864zmrzxdnach8w8a1i2mrb6pybbz";
   };
-  hyperxmp-70694 = {
+  hyperxmp-77677 = {
     run = "15ikvw9kfarpkqymwz8cvmfkz23zrx8iqd50kdhl4r0rv1cn5ly6";
     doc = "1gy961am7w7di3nw4kkq78v2ailjbak0lzr8d91mc2hvj8givv5j";
     source = "166761v3lm5kyflaw3j74h8j15ha60j2fsx0jkyiwqh1pj1vylhl";
@@ -8706,7 +8740,7 @@
   hyphen-welsh-73410 = {
     run = "0yrv0qccyaps3735g0hs89v3az5bzr492gdbzjm3qka2ghvnqamb";
   };
-  hyphenat-76924 = {
+  hyphenat-77677 = {
     run = "0ckfvjxdv4rb8156x2vmwl15mk9057i2lyg9xhqkmvqh1ani4lc4";
     doc = "1lzpdz05dw5m8ljxf5f846m1x4nv5yrqbg3sixf7dgyhsmpfxnls";
     source = "1ddwv26nfl4jwz8vxs4fwc9qw8gds1sg275g2bg9ci8dfflk16k7";
@@ -8719,17 +8753,21 @@
     run = "1kpaxdya6m7x4dmrxqzrs6k6agxsg8lcg5yqqdlips887lf609cl";
     doc = "1q5dh42gpv4n9ps0yqyhcscjn47qz4zf35jlg56xgq2w5229k742";
   };
-  iaria-77504 = {
-    run = "02njymdg2y894nglb75f7mxzjmiryfaraggwbwp932a4pa75yfv0";
-    doc = "0pla5qp3iq9ir4ry3lp135q8d9c9mkpn65bwzz1k757lspawbnpp";
-    source = "16ib409jynns6m3f2yi0xlcar3sx795c73ay3fyj2ivh7m79kf58";
+  iacrj-77823 = {
+    run = "026y69zw6xnwbiabfyajf6lqvng626x2v05nnap1ll42xbwsk89k";
+    doc = "0w3gmi7gvp1ny4591lp638cn2zhb2370pqar0mb0cswjl79wyd88";
   };
-  iaria-lite-77505 = {
-    run = "13kzkcna308x6s0sca7jgm8jk8ca7ayd3izwj6wlz69h5famhg62";
-    doc = "1q8jdx6icq1iggdip3xmxxqk2zznimvadla3a6dsdga30pmndjrk";
-    source = "1qq0630zbnbkmw67jxvqhjahsqz17z1b42cy5kllqfyzd8540k81";
+  iaria-78148 = {
+    run = "0lxmvzjwdd8jv3dxgjnr5aipqjjifbhkp7m92axkp3w7cryd5dyp";
+    doc = "0c3i79lxlrkzz01dj4crphq5a6qip4xrqhvzk972vymir8pbp85m";
+    source = "063q35nrz626ws20wp74z4sj5hwh30mdcjhknpagy0xacg8p8834";
   };
-  ibarra-71059 = {
+  iaria-lite-78147 = {
+    run = "1xwfjgbds86zarim0nqnz1n2fmr2mjrh4qaalrnv1p27bn4mbirl";
+    doc = "1xxqia4vig3fdqdrbrjfgiddn4n19py5isl2hrhnvzbww09l9d7d";
+    source = "1haqbpgk8lzi1p0hfph62caa1i6qas1s1nks7562vby7dnwh28a9";
+  };
+  ibarra-77677 = {
     run = "1zgbfy74np8v81rbmgki2igbb5pisrv3vi51rsf7bk05kjppk96z";
     doc = "13skgs8zw737mqiaznffn1bqy60blc3jv2npvf0j9zsdhi6acv3g";
   };
@@ -8817,7 +8855,7 @@
     run = "1n4dmmslpsx9fv9wqiipcg04lasym2fbgsqkvvffqmx5rszgdpha";
     doc = "0n7hsymjs1zfjc5gbn26z2wdl5qicc7pd251s0h4qnfigq3nhr08";
   };
-  ifmtarg-47544 = {
+  ifmtarg-77677 = {
     run = "0wxhdmd2h7rs3fck9yq1g48kyd33m7xzz3g7ixg046azai8f90m0";
     doc = "0h8li5c5lxccf2a325p4vg7xgalzwryk8czdzcf637sbbkfhd53d";
     source = "1yh0c42glrw5cgqk22h8lrc12lriz436wz9vrc4145gjcxm6p09s";
@@ -8827,25 +8865,25 @@
     doc = "11r5zrs467h3rv5j8c7b5iav19v9hbcxbspgfdbd061g871xxd5y";
     source = "047pc422qhh9d80rjgmjgmn5xsapf9azvqrl0cjn28qw4m5ccs12";
   };
-  ifoddpage-64967 = {
+  ifoddpage-77677 = {
     run = "14gi24l4m9zmyhckjq3j1svr9858rm2idr1wwjwmp561wp7vr6yz";
     doc = "0gv1j0swzc4imahk9s96nga1l42qzc0xkznas0jzkbi27s2lik4x";
     source = "0wz7iaxf26qz1v8sc0kbrz1wy0kzd4zbd0qiscdhmhmw2xr077zf";
   };
-  ifplatform-45533 = {
+  ifplatform-77677 = {
     run = "0abhpfw3w1mvpg52xaw3cngl55sszk5ji9a38yab8vhknh3d3jby";
     doc = "1b41nzn666askfc1kkm1lwf05ggf2ml8gz3rrki4yw6ch52sl2sc";
     source = "0g0qvbvv4j87rxps9yypair00z6il5hfjczkrmf4fkycw714sdqa";
   };
-  ifptex-66803 = {
+  ifptex-77677 = {
     run = "0yw0dphc2pdx2jrm5khzrnp6rg3fbcfc8z6ppwmyid8iqxszpdg3";
     doc = "1mbdhxl2fgbwjbsk8jqk3709bv8k3whqagls1vqm5386lbcycvkv";
   };
-  ifsym-24868 = {
+  ifsym-77677 = {
     run = "1bs3974l1jdv0b2wwa94861hnb05kb69bsyhvsgh6k9xgmgwfrla";
     doc = "11k9jfqrfmshwpmni6bm0324zj7c939k6shvi2l69k4w0kx6phlb";
   };
-  iftex-73115 = {
+  iftex-77677 = {
     run = "04q7hz4mx8b6r8dq1sm4hq6cvhiicav85panlidkbvqsxyn7r9x3";
     doc = "1y3wmv0bmhpc2hx64wp7v0cfyl09lvl5a8iw1svvz46wmxskhh1f";
   };
@@ -8883,7 +8921,7 @@
     run = "097brbh3xf2xi4s151iy8g6abnf0ba4yar78jz607f9dfni95i8c";
     doc = "0f8a7jzj6w25al9c13mxd04bg2c701s0ynsd1rvnqdik6d98s0l0";
   };
-  imakeidx-42287 = {
+  imakeidx-77677 = {
     run = "0w0q18bxpbsqrj97309b9lyfcf4has5ldjvs0dwn45lciav8a7rr";
     doc = "0h2wqdg6navbpzjq38ks2b9lz3hkmgi7v1y8ihbbv3aisyvp5r93";
     source = "0l7q94z5a3lsy4kh7vxyr6mmywc43p681p1vjry1f9vi0s6ljwpy";
@@ -8906,7 +8944,7 @@
     doc = "1cgk3wk3flpmlw3wa4sg1s9ry6bz9vjanzw8kpyhj3d8yl7cnzbn";
     source = "0qc5wz5a4rgvrzv361gq3i6h4hp3v176klgn6fhiwshk84zqccn4";
   };
-  import-54683 = {
+  import-77677 = {
     run = "0if5vrbx6456ydarw57p1jpkcj2d7csmiffgll6fgxf2kllqga6v";
     doc = "11hi1yk9xhqks4i3rhc4s8bbaakxbbmddb7j5sym780y45qm79c3";
   };
@@ -8927,16 +8965,16 @@
     run = "1w51v1v8x7wzibcy40ss7ldra83wbil8w1p978yvs5kzbky3vw2f";
     doc = "1zl5fsgzb7nm1wi6ddc3cngqj3apmjwn1wkmsz785nss56vk9f7w";
   };
-  inconsolata-54512 = {
+  inconsolata-77677 = {
     run = "1mbf4m3ll3r4nhxnmd3ridq7kdqlcjcm3g2q2s6qxgn4b6j9ikvn";
     doc = "1rh7kisvs33v91r19lnqgma705dc3gari0g153ws8bd1px3ivsdm";
   };
-  inconsolata-nerd-font-76924 = {
+  inconsolata-nerd-font-77677 = {
     run = "1nizfnhy5dzksdsjfxz9cj57cnj2rk6b3qhxhgrzz0ci727nbw5m";
     doc = "10niby7zw5d78pgy6zzy8mmhss951lrw6yfb2qm7850mqi3b5skf";
     source = "1p7q26swxl78rfbnsya4c9ljl3khvzi06lhm777ai6fyx3x85rw4";
   };
-  index-73880 = {
+  index-77677 = {
     run = "12hmpvvwavgxznpsj3f6vrdyyxw47jhsj4c7m9mf3wfa76v949v0";
     doc = "0jgk1lriz9kvs87gr6bssxpcy4glf0ksp1f5lmfcgy0d941mkq1k";
     source = "1zaq93d8hvwd3iqb56in9h7mj2x6ibzwbidch3ld1sv8x6vsm02n";
@@ -8951,7 +8989,7 @@
     doc = "1bz8vg8q00p7asyhw09v5rm32b2b7hnazfmbzwn6dsgh67zlj1xq";
     source = "1sr4zszxng4shnvm2qwsavrsggkxa8b1pkv5li1w1a7z0gzqy4dp";
   };
-  infwarerr-53023 = {
+  infwarerr-77677 = {
     run = "19nlrbfmqbkjrrx9x75s9nd6crg1lzimb2fr3hfblaivj6lx8p4r";
     doc = "0p1s0v6p7ygkvz5f3vgarcrl85clfrj3ivzrka62djqyzn4bb3yb";
     source = "1x2mkqyx7gz0bz31na6mcdyrlj11mxpjlzc6gb9pk51sdqjj0bbv";
@@ -8977,9 +9015,9 @@
     doc = "0gz9m7fwcdxs6q5a33v7n32x5jr4hbxsy4j2shwv39j1j2amr1vl";
     source = "007648wrb4ar04g0851yw663cvlmdyifidp854y87yzh536hfwi1";
   };
-  inlinegraphicx-76924 = {
-    run = "0c0bhj474kxbx27j8xzv6h2kqd4jlp1yn0fzgf4bppaksyid12q8";
-    doc = "11x6sfzak4k3k7idwncsv9yz5a4vsyaya2i990yqkp3d3xrkp71h";
+  inlinegraphicx-78043 = {
+    run = "1vgngn4d3l9hhiw8k20crpihl5yh9n42z52bd84a8vnwbmiiyrb0";
+    doc = "1jdv4d84z80zwrqbnham9y4nz9cprgnarpjh0w6my3xqbmjhwlky";
   };
   inlinelabel-63853 = {
     run = "05qv0j8gvdqsdc0bg51n7mskbx88gv2yny1zffr409x8pvccnhlj";
@@ -8990,12 +9028,12 @@
     doc = "17n55d42b9fqrsdnwar1k35jzbnzr9by44r2aziwqsri7i6swxb6";
     source = "1256q4vidnb0m1y16dcj2y0ci7fjbz0x440dn31ixvwc3ysb66f9";
   };
-  inputenx-52986 = {
+  inputenx-77677 = {
     run = "0jjf29lj8ha99r2x0vz85swkr2aq6v2jwis27irsi79syfq8bpbc";
     doc = "1kkblvi4dhfxsij5lmbdvmnapskvd5yahha5im2nlllh8crypwv5";
     source = "1681djxj8c43i93ip864bi1p1fpn2dngkvh18zs0234ls0gkwiy1";
   };
-  inputnormalization-59850 = {
+  inputnormalization-78116 = {
     run = "017dxyy2lykvcsigpq5vfklb2gqg1aprk0xk21sxa8bdsn3hd2gg";
     doc = "13yvyh5g4a1k6bcqwgmgspp8gkgzvgcx5f0wy5ajp577cxsk5ir5";
     source = "0wz9hw5qs3i3iah63fqhkdcijhv30k828a2a19268am4803m1pxh";
@@ -9005,7 +9043,7 @@
     doc = "0fcxac4jsvhnc85p9nwpp44ij0yq4q1lxlw42dzhg88fdkl57srg";
     source = "0b6kl9a6ilv0i5xnlcfjgia40ynl28dbz1rvcvak3637fva07ghk";
   };
-  inriafonts-54512 = {
+  inriafonts-77677 = {
     run = "0kbf9rvrml10qk5pckz21ag217wimqhdxjfk35ll0a17hc9yzj68";
     doc = "1hbhfhmnjya1cmj1wzhvbny7maw9m2dr7sv74g2ka6gnl1n4rx1x";
   };
@@ -9013,19 +9051,19 @@
     run = "0ylnp3l21zx4y1bwrr33v8d79vlgz5frna9dkg62gz1bhjbw7f7i";
     doc = "07iw7py0p0jfq5np89dx9fdvia3yk5mi0py77xrgb8v4gx7k5g3k";
   };
-  install-latex-guide-zh-cn-77231 = {
-    doc = "1pngjy4xr93x8vr511diygbvpqy4grqk1q19azdzlz8q0pwaqhvi";
+  install-latex-guide-zh-cn-78232 = {
+    doc = "09l1pva1m68lv12gz1wc956ncn5aib10j3xik7p5pp5ymslx6n07";
   };
   installfont-31205 = {
     run = "0lszqj128c3f4wbcrvzzlvj25jl5rm0n5qfj8rsn65ycxvymbf91";
     doc = "15x8jzcd7bwvbjid0hr56h7dw39n2rg6wbfz4b02y7shp1pn7hgp";
   };
-  intcalc-53168 = {
+  intcalc-77677 = {
     run = "0llrnayqwdqxi91yh7panbbiljina3bynv2hxhi6sssaw3pyd92l";
     doc = "1vav25plm639410p59bi7bsihsyys9yaddz0bcawxn72zi9b96r4";
     source = "059pqs3f821javya7brxvl9v2mifdyw1vg18hr1zgzhj7bmlxh14";
   };
-  inter-68966 = {
+  inter-77677 = {
     run = "0f7s4mfj1phliv0dddkhsf4gpzi6xmyxhwv26bsvgvs8saf7qsha";
     doc = "1i12ppl2fmjv4nxvslqqrn4ygrvmf9aa1lf5wlsrwn238343nkps";
   };
@@ -9033,7 +9071,7 @@
     run = "0dibc16gdam4yxil37y2zsz4cnfiq2grm6qqj512nng4zqnwcdj0";
     doc = "0nh4zm37xipvmv5h6yxy1ir2gkjy23h22j8dnz7m04w021sgx7i2";
   };
-  interchar-36312 = {
+  interchar-77677 = {
     run = "040zhi6rq7l8s04zcq2vfxricbvakkxnx0bzihbj1ss21pmyrv82";
     doc = "18lpyq26zc9b2ypcb98k578wyg2fp1fllsfyrp67b4v9lnz1m7q6";
   };
@@ -9050,7 +9088,7 @@
     run = "1an61a9gdja2h19m13i4024d4x4f741x4yxk983phl97nfadv900";
     doc = "1vgdgriiwv3lbdwp72pdc7yz5f702xxykqdp4ih1ssx1sl9pcw05";
   };
-  interval-50265 = {
+  interval-77677 = {
     run = "04rj730lnkgj4xfm3mldyyf6bb6rr1f3dhms0rnaiq2pzv77cqyw";
     doc = "01ngbaw0lbh4dn8kk1vnv49isd7wk8gjh2qvzw6x9yk9nl46gzla";
   };
@@ -9059,7 +9097,7 @@
     doc = "0mm75ql3bxrk8azmkfzz2hwr821w8yym4dlkg427xbglc40c3xri";
     source = "1yisjrl54li63v84bcnzhz5m2401wiyb0psfvz9rjnq84wmyavxl";
   };
-  intopdf-63987 = {
+  intopdf-77677 = {
     run = "0nfjwarkzi972vqn20wz5ava3hq87bpl2kvfig91ybz3chd1111c";
     doc = "1sjlbdrn9ajbkl18lqx8lmxdlb0dyh7cjvj0vizhnsjgpwp5f0dp";
     source = "1cz2y4x17smkjp6b7g6r3qg3whdgcj4cla315wfp2z9nzpgmy7fs";
@@ -9067,7 +9105,7 @@
   intro-scientific-15878 = {
     doc = "0bzgi3zg0lm6zwjnac90ihaqwcvhindfdphjijv7mh11ii0qxlmf";
   };
-  inversepath-15878 = {
+  inversepath-77677 = {
     run = "08xivnvbyhaihb24w14b908927fr73kbk66x82nv9j332lpmfgmd";
     doc = "097fyhn6dj9d8hq26xads2s7vz7hvixwl27psqrqqvhdlq3bvj7n";
     source = "09d3dzckxrg9vdxh84nx3xzwj3rfarvf0bpda4qib179bgnqrf7d";
@@ -9132,7 +9170,7 @@
     doc = "12m0rri6l538iyphsh2abcvllckg566aj1487sa9jc4m56armvj7";
     source = "1nnfz5r5hk0rf1gvwrgp4m7jb5lln1cf9pnb46x9l9hyiagq5din";
   };
-  isodate-16613 = {
+  isodate-78116 = {
     run = "0xw8356im72iqi67nspwkhafrwl46gb3i41yapnj0hqb672gk4lj";
     doc = "06m8ic0nsiy5bsymzfhpia9i47kbpwqmnbrvmsp44mw5g2ccjk41";
     source = "14b1ymqd6qbcksnim642py5qs5n6g2sy207apkx9mnhhbqa15an8";
@@ -9187,11 +9225,11 @@
     doc = "14273y8zl42gkqm915271n15pc6srsjvfbnc3jhp5xcjcqnq3yfk";
     source = "1wg714a0ipv9g81wgmjdrm4l4yar0z2nqxr5khiwihk9nrg26yc2";
   };
-  iwona-19611 = {
+  iwona-77677 = {
     run = "1gf8kmpmp2cjz5sg0lx8j0kr67a5xshjkghpiy70jnaz7k8fbrgb";
     doc = "1skk4p2pblh8h37rz2pjx18h8pgbagvr9w8h9d83299byvjggpi3";
   };
-  iwonamath-76924 = {
+  iwonamath-77677 = {
     run = "0504icgp2061kd0hf5r4jzwyd2p7h7v7wxj7fmqzq3j3bnc9flcs";
     doc = "04l8sradmfhwfsc37vc1ii8fj8sn9g5vcn30mmcd73d5y412kcga";
     source = "1ig6my451i4wp98qq7whbyy8m5n8wphbzhjhbdy8p8gpkjsv2yfk";
@@ -9217,7 +9255,7 @@
     run = "0x9k23g95j4wqf02ibj4zpfgxa3vlhgckax80lwm5flvr34bbgdv";
     doc = "1iy8q3906bl7j2ciw8l3162pjw067qkbkdadj9v727x3lg29aay2";
   };
-  japanese-otf-77048 = {
+  japanese-otf-77677 = {
     run = "0gyzyl02yn8575gwrpnqx3ma4scjg0601lsmk3bp8c3vrz4b4ybx";
     doc = "1sfndbhb243sx3fvdp1ri5iwsdhwzcn9rczplz7kzrncf9mnira5";
     source = "0sk7ppm79zhzzwkarmwfjf9gfm0wvcd7i74l94k14h1940krs6db";
@@ -9225,7 +9263,7 @@
   jbact-76790 = {
     run = "0z0x6jrxaayp3w441r1zwlqirvv23g0b8h9xgy6r3ppi71glzqvp";
   };
-  jetbrainsmono-otf-73401 = {
+  jetbrainsmono-otf-77677 = {
     run = "1yhfj8ndlj9y6y3n1jc61k7hbg8sj3rmgrwgfdpbbdzwnvda33zp";
     doc = "1220jdib21vkg42jwpfgzkhpz3rinjinxd7fd7wsxbylzbgc55yk";
   };
@@ -9257,7 +9295,7 @@
     run = "03fpym9q84g1b0pns6sdsb4jx78aq7sclr5fkm05ckvkk4v3wmsj";
     doc = "09qa8y6axg9pvma507b9w63dwd2jrxnmd64f5rfd7wpznamhbc0w";
   };
-  jlreq-76924 = {
+  jlreq-77677 = {
     run = "1cgp4kihqsh8sfhddqz4fqfpva46jiaz1s47mpkdflmka15dkmcb";
     doc = "03rgnx4psaa69ciwd27w50hd51hwxl3wm6420mk6dc2czpsjz3m5";
     source = "0mhayih7cxbmzylr5nj8b87y1hdwvljfyhc58zyfn93dlfq7ifq6";
@@ -9266,7 +9304,7 @@
     run = "0sshiy8iqhmsjp9srg24lkqpzyy49wglacy1qjg1czq7al27p8hp";
     doc = "0bp2yh9996dr289azjhyj16syjp3h1p47cb57qdgqmig0s4xiwyj";
   };
-  jmb-76790 = {
+  jmb-77677 = {
     run = "1a5nz825jppq3pl1263w2sbm0a48kmmndppfpp7vi69n5j2248dy";
   };
   jmlr-61957 = {
@@ -9298,7 +9336,7 @@
     run = "066vlyvx8kc5kiz1laliy1p3hzgfbi2bxbn3mjli7mkapsqk4vzk";
     doc = "10w1m451nzjnx0lv0xfr71f7xrfd9vid1faqfn4xng1ddm5qf7lj";
   };
-  josefin-64569 = {
+  josefin-77677 = {
     run = "1f93l4f6gvsnnzr0f3gpvl9y9i034rhxcdz8c282bn5jdzg93j7r";
     doc = "04sva62hzfphzcmk4jhmp4yiahg7kzjcskviq31lhy83d3600aa2";
   };
@@ -9326,16 +9364,16 @@
     run = "1b26v330702mbd9bviq6sr7pg0338hddzc84z55fsqjd85fp7zcz";
     doc = "0bs30a1m8cbv2824xhj6k3jiv6dmdp6jjzsinhfdwiizc2kzriwv";
   };
-  jsclasses-75174 = {
+  jsclasses-77677 = {
     run = "1j0b9xf59p17cw8hj2j80ni1rbw8m4wjh05kpfxcsj4a6rwqf0zx";
     doc = "12xqcdbkdizh3167frl05s0abwj6j5xh3k1h2rzv35cgld0n2p4j";
     source = "1dpimgfw1g2wab58w9b0snzyj5mcjgkmrm37ipl84hmzx49pnwjx";
   };
-  jslectureplanner-76924 = {
+  jslectureplanner-77677 = {
     run = "1rlngnjl4mb399indbcfmfl3k47788c5b9dqff489nwjqhw26v9v";
     doc = "12ns6r8x8zbfdzjwly6i5q1chw6mvc0prxv1i57jx53wdqgaj358";
   };
-  jsonparse-77545 = {
+  jsonparse-77677 = {
     run = "1550w2pzsczdaanpbiv0cnrmhsxx1pj7xmzy5yr9bci7l48bhaxm";
     doc = "0nsc7f6wvxq92ixkm4msgz0rrmfgmg2gk2ap5g4qg3f0r987l1qq";
   };
@@ -9343,7 +9381,7 @@
     run = "16zzjzr6p6i2czsnkbdnfnpfpa7qakm52f88ldyj4vy36yl63vgs";
     doc = "1iqv2xqfnwnp835vjrcqw46p9k57px7m8iqyw281ivwx2afcjv7p";
   };
-  juliamono-76734 = {
+  juliamono-77677 = {
     run = "024si57hmdvgnnlp68gd4f85028dadrdyyqhdqrj70lyrx4xhp8d";
     doc = "0yn4jfczkw4djp4ng06n223j6z3das7w30lafyvrjg7kkfnnk0j4";
   };
@@ -9351,11 +9389,11 @@
     run = "1d5w5nh0pkmhjjjq9x2n4r72ygjh2mrbdr23vsrh8cyvj3xym4w1";
     doc = "1q0mzjyfj8vfp42f8m11g6fyx60mb33g5n4i7pw9r0dfx8y4jvpd";
   };
-  junicode-76210 = {
+  junicode-77677 = {
     run = "1q7462nfixayqq5n4gldgh3v5pxxq3r9hg37fgmk7ip58244fqlr";
     doc = "1k8kqbc12kbd2rmzp9rib9fj70vqqpd15136zzgqnf021bnmy6af";
   };
-  junicodevf-76209 = {
+  junicodevf-77677 = {
     run = "0dfj6h59l6wyjj6ragbxvkx3khnsx8191d29ajg4zvv4w712c2bd";
     doc = "15qcw1ghn3q83yyrv3wawfxdxiknsml0qr6gil6yqkx9bpb30q38";
   };
@@ -9373,7 +9411,7 @@
     doc = "1708lfrryhlj2d3in4gvhfl8c6yvhhgi0lb3yz63h0n7flsb4a6m";
     source = "0i5xhmx4j6ry4plcgdn8sc9vvbai9vzk9jr0mc54dhqaby2slyxa";
   };
-  jurabib-76524 = {
+  jurabib-77677 = {
     run = "18s5jsi5wp0cac968ysqajwrway4sv1scf6m1g2l86jkp8gl6jm8";
     doc = "0klv7f8rbcw9qlqgpylyh64ir0zayf5ralpjd26g85w1pyi1c8m6";
     source = "07s3z6lxhkizgv0wrz0iiv1443dfyz29x9wssxa6y5lg72w279fj";
@@ -9396,6 +9434,10 @@
     run = "0796fk3yh84kgr17rwrs5pzmxsxx02wfwgg0dh2p1cjv13q9lqjm";
     doc = "1py0n9sw11qzlqsfx9syxmn4j0rki1wg1xg4zm15q2pxbjla1isf";
   };
+  jyu-chem-thesis-77889 = {
+    run = "1znqfp8qbm6yiwanriplsj2z25jk26q24fy0i4x8yg6j958wk3hq";
+    doc = "1lcydwkq0232yzvzzi0ffizfv898qxfqbwfa8kpxzablnvkjkpfd";
+  };
   kalendarium-48744 = {
     run = "11f8zkjfxbk5w4y49vy712ivfqx66m86jdddygfjskp47gxcxby2";
     doc = "0rbac32h90cnp318a0chj1wfzfrvz2y140siqv5slld90f7d5546";
@@ -9405,11 +9447,11 @@
     run = "1cwik91vx5bzq5jn8xjgr4ffz7n9d2qpx9v9xr298afmadg65h0x";
     doc = "0y7j8qp9j33hw80dypc10nr28x2zn174sq1rbbbr8gc7vsvz5pyw";
   };
-  kanbun-76924 = {
+  kanbun-77677 = {
     run = "1ckq0ks1kx4x1b4fl34wp2kybzp5700ki1xs3pzrvc02r32rzs2m";
     doc = "0s1m8jaj8s1m6ahvlfqma8cgkz7z4dzpv8ysb05790s2k4kgjcx4";
   };
-  kantlipsum-76924 = {
+  kantlipsum-77677 = {
     run = "0aa0nz2a357fggcd44wkh1fkc6cwx6kqhm7aj4jhb8p4j2ch5mhx";
     doc = "04nlyjfmqrvm0q64hdrrx81jc0f17p3l25v22q6kgsm29nlgxi22";
     source = "0akpmgj54cipxl3yg4afq0bdws3m3100i1hm9nc4xrzipw8cdvx5";
@@ -9467,12 +9509,12 @@
     run = "0v3sz01qwd2pnnqbf4v8g0xwhs3zqxc9qihfa13df43rw644m65v";
     doc = "0ch1zjmg04pdz96dhyl2iy380hyjqcscxn0kafj94aldin20256w";
   };
-  keycommand-18042 = {
+  keycommand-78116 = {
     run = "062i4fr9h2sc1zy3ybyqrq5hw4g3g54gx708rrznkl4zmpf93ppr";
     doc = "0ls9fbm0815aar19hg40p91n1iyyfhn68ndhvapmwfsxhi6f2d9j";
     source = "11blfbqdn1a00bfdv3nwd7501pd5qrkk7pqn2ffir1461xivz26f";
   };
-  keyfloat-69399 = {
+  keyfloat-77677 = {
     run = "0qwdi5gvv3fmhp2j9mwgbfrbr8awf6bj3fpajhrznfk8fy5zflnp";
     doc = "02cv38dpq0jh1iyp67ybd8kxq0aiy6sxkz2jg9jy7vs1ksjkx74q";
     source = "1dq8w5vsnl7kcv6q62ik2d0vy5bkbxaqn679ifbffgxiqihbpb3g";
@@ -9491,19 +9533,19 @@
     run = "17cfxcn374q0pgf7bbqwc0yrk6r15d79h39hzbvf7yrgj4r3880y";
     doc = "0fp2hv3azi287gz129gqlsirw4dr1d5lqhzxliyzfy8dd9b2cqb7";
   };
-  keystroke-17992 = {
+  keystroke-77677 = {
     run = "0h0ci8pslybspsnpmv73qml22592vp5lr50qqppyhw8qkng22gsg";
     doc = "1ig565mxjnji3ng8vsc2wa3jyp6mrhma4hnb3shwnrj9g2kvj84w";
   };
-  keytheorems-77073 = {
-    run = "0bcgwczkj8wy2m8k2qyr22h23npapklapdz17djsxsrxc06l8rpi";
-    doc = "1skfxv57rhiy3jg8b22cj6fm6scykd2ymlph46zc8ba7w0gw363j";
+  keytheorems-78044 = {
+    run = "0cyy4mvdxmalq9r6xfqx1xbhpd3s5ig3ys5ymgpvs7njfiylv3rx";
+    doc = "1qfq8s2lyjbssnrcpglkrb30xdwhrmf0z0yv90dnckgk18fbm6rc";
   };
   keyval2e-23698 = {
     run = "05ssgrl08d55in1wkam99bfdfkjhjrda6j96b6nmj61sp97yg3ig";
     doc = "02ajr27zgfjk5hwmqm05gdapkg3d3rk1k9k3nqm4nbvwhx5sahg5";
   };
-  keyvaltable-65416 = {
+  keyvaltable-77677 = {
     run = "0r8y69sbis65hdalck66n5hxww7nk5z2psb5qzx13dx6qhnqknz8";
     doc = "1lhk840aj1sxj6pwybrpg9gd3lm9gs06q1dhz399my6cds1b9bk9";
     source = "1k749a0smf6wdcsb6cswm0adq98ylg7cq9yir410wkxyxdfwj413";
@@ -9533,13 +9575,13 @@
     run = "1hnvzqw0x99z8zr5dr8kqvp6yg8mvrwczdlvz2ipnlfzw7v9h0yj";
     doc = "1xhw0bs4v18mgi2bigihmby1gbwsiwplf340im5916hgnqz25j8h";
   };
-  kkran-77172 = {
-    run = "0kbs9835iadi0qfsikbq7y67shj7d61lbzypb38qza25v7m8r0m3";
-    doc = "0xi4vnnq7373afh8735zzgia08hfp37d7gfs7f2php866ly3zcsj";
+  kkran-78196 = {
+    run = "070003199l6p891lp11j35pv08j6fhghh8lp6ighfm8p42x792g8";
+    doc = "0rqpajhjbv5qwh0ww9a603155sszma2csinwyii01ylj3f4kl6i7";
   };
-  kksymbols-77427 = {
-    run = "0alhhyg7nbqya041r1z1xgn8iiqqwfssdhzm543m7nrj8ic3gcx7";
-    doc = "0wk6ln0qaxwva8083ywzrnnb1m0q6xr6shimw4hhgfic33qrjifc";
+  kksymbols-78145 = {
+    run = "1dqc9nnq16flq6hk7d8w99isqqdwznbfg4fwr506bks480398bn7";
+    doc = "19pm09ng2xj0fnipfg9lrh1my93wc1jph68xxinyy9c27fr605gm";
   };
   kluwer-54074 = {
     run = "15av38sb3pzffxvrxlbwxzgvhnxhsjhkr3qwrlqswwq1sy4a2ssc";
@@ -9578,8 +9620,8 @@
     run = "0kgsbg4is158j1ssjwabicw38mh2cd4n1ggxinflb8i18xsmlgh0";
     doc = "0f070dxww75g36il70gmrx9bn0f0d3mmh26fmzqb5zmf93hyhcsf";
   };
-  koma-script-77527 = {
-    run = "1kqww64gyrd99qy2s4m2lxf8c4lyalpx5pj5dhyn2pi5xhd3f5j1";
+  koma-script-77575 = {
+    run = "09kg62vx18375vzsdj4yk8yxcscn8pi3x7zixhzj4lvpszcxacfi";
   };
   koma-script-examples-63833 = {
     doc = "1s95a3vgjxrn34cpcinkyr1yw2rj8s2973np71yxrwzi9dqdjpn1";
@@ -9602,9 +9644,9 @@
     run = "0napq587a4j4z0fw0ddhal0h02aymjj92cbxmqrrw19j8k8g0b2f";
     doc = "1lxkyaqcan6jxbvi1zavbavlycp8amz6qmah258y87yl08m8c475";
   };
-  kotex-oblivoir-76503 = {
-    run = "02zp2bddpw9bx4ggkzx2dpmqnd463db9ahvdi3swkhmgy8f70dg1";
-    doc = "0vv8iznzn8iwbvr2i1wnqzpnpz76xq2mzlhhvlvgbmaqs9qkszwa";
+  kotex-oblivoir-78116 = {
+    run = "0p58ybmhxs2ab9gx6j6p6iy8x4fxaxw57sjf0xj11vyhq86xpipx";
+    doc = "0na3rpjzcm54y272j3mvskw3a9wxhlzi1bsw0yhqbp3aqgpxq67z";
   };
   kotex-plain-63689 = {
     run = "0nri3fagwj6mgkcx97750khsyqf94dx5kxkf5ny0jiswnv192v0j";
@@ -9622,13 +9664,13 @@
     run = "1yaiqx9zrhw0m464hr4slr5zk758h927mjsaa7f9vvrag5j1ax0r";
     doc = "10xbkrzv6d7d10m09sdg811488601lkmilc6n7p2if1pfmmbmj3y";
   };
-  kpfonts-72680 = {
+  kpfonts-77677 = {
     run = "00yvnz9x25sfd5bvb0s308gfndyxr7ar9mr69k8136px3q8dgzj2";
     doc = "1mb16i25ah5z4il4mkbfigg5bgsfbmz2nynabj20a59cjcs1zp9r";
   };
-  kpfonts-otf-76746 = {
-    run = "1mb12j8vbw7v1wxilzanhafipflwcargw1kc2diyzbgxy37p7kc7";
-    doc = "113akrjjiix8l2lr5pd6969f0cx5jh41ibp7fybgb8pv7d3p7r8a";
+  kpfonts-otf-77918 = {
+    run = "074y4lnblghnjccisxnfg8d7722gl13y5aml655c00ni2cxrbgn6";
+    doc = "1ly482wbc59nfz29p79xpr73xf7ndfgyxmvr2fv5v323fb2ml9ks";
   };
   ksfh_nat-76790 = {
     run = "1qzn0n19lslf2qg8fvm844xx5k7s8a275a77z2ynbb0vs1w4prpw";
@@ -9650,15 +9692,15 @@
     run = "1f45rknbzb3d3h72vznfzspg7vx9im59w5s5lwv4z0b4sk7n1d18";
     doc = "04gpy6a0mpjhbl9h2rnflvhxsj5b7x7fwll8z211fl10cnvalcxv";
   };
-  kurdishlipsum-47518 = {
+  kurdishlipsum-77677 = {
     run = "0b5x438l4m396pmd427zcnl7jyy5ag5c004gyn0n1zzwbz5lcnfk";
     doc = "0kw9664fm4gzv7cspj2psczyn7m09qz95agn4j953q39l0qyz6ls";
   };
-  kurier-19612 = {
+  kurier-77677 = {
     run = "0x9270xgsk28i5dxp29r0awf72l5p0786mbx7gb5d4vppkf0v9gx";
     doc = "1d3lfxixhcrkk94m7ljfcb90yvdwjbp2axjnpr2bbh32xv9zzsnk";
   };
-  kvdefinekeys-53193 = {
+  kvdefinekeys-77677 = {
     run = "12nn74skhwiszbdhawqds31caz6d59a5pjmwar0r8lmk4f1jr3xh";
     doc = "0x3h28xqgsmngs51m666mvxb8jg9vwk0wyhijcw84v1szyd0m7d6";
     source = "13cb0xvqhz5w1hv6hamr7rh1q1cp6abqfsdqzd0xw0my9mxvwk97";
@@ -9668,12 +9710,12 @@
     doc = "0n0ls3c5w662f95yam6q6rh9gv0vdyzf7rmnkd6dgz5gl1z99q1a";
     source = "0y6mcxixqyqmkk1iq0ys2i174ki4ygss62fx435lwm56xff7mvp3";
   };
-  kvoptions-63622 = {
+  kvoptions-77677 = {
     run = "19sj7pds5km2y284vhsvdddvchr2zcnzkki0h48ymd258afcvswk";
     doc = "0yym68kqbmhkw15rvmz6bc96h17yiabx3lip4lq2qjq254j7ql0w";
     source = "0ngbpkryyjf8l2gq0p750z96id32hl8gir9cxz7hybzk2vnpyxln";
   };
-  kvsetkeys-64632 = {
+  kvsetkeys-77677 = {
     run = "1gnc2b1fiapk6fjmgh1rfrwd04k6s30qgdfn2ppyf6fw440sx4b8";
     doc = "0qhncqjx310clasz23bx9mq8p3kdmpz5cicx84a3afh008qylgsj";
     source = "0l0g3v7n7sqfhpbf3289k9nh98cfz4w5xn0hbkr4i056yqj8dcmw";
@@ -9701,10 +9743,10 @@
     doc = "08zs7mkz9paqmzygvwlpxx7lzmls21s8gbzapp23a4a0hbgh33kf";
     source = "10s2l28pv0vs2lb36av543ndn6sylkrz0qvypdch9wkymm1mjsxd";
   };
-  l3backend-dev-76924 = {
-    run = "1vandrgydvlfpd51r3nil6bv4zgqgcqjf69gfvhh2kajsbp51lzc";
-    doc = "05qxzid3asx3vk3c40qlda6ab8m3b5ynw5ny7bg0pg3fhyxsybzj";
-    source = "1xqx5yyzv7lnh077inwvzfncnzgfbl7yvib3ch6bsx36gishq8g6";
+  l3backend-dev-77955 = {
+    run = "0h9dn4wpn9d1wi715ijynvs87zc0xn5kba1pfj2g7abx8mac5hwa";
+    doc = "00ymmli7pd5p7z395g23zc7x621p7274n6qy319qdrq6d0nfsmvc";
+    source = "12np4gmh0y5cg66ijb96kfbdq49d38rg485nql5q0n6pgn42apnc";
   };
   l3build-77170 = {
     run = "0f3qfgm4whm1p8alx8gwca2glgx86c48w04d62zkpzgpadkyhzbq";
@@ -9721,17 +9763,17 @@
     doc = "1nhm6h7xwcadjbgws712fhxnlkalnyhv2d2jrrnaxscbr61rfyia";
     source = "1x4c2xmp1283r46dy53kjm3ng7yzfiyfrcydci4kjmamw1rila2x";
   };
-  l3kernel-dev-77413 = {
-    run = "0z6lzgkb0gs8y72g4bzb6rwc946lbfvnk0a3d6ym8a86vinlwkly";
-    doc = "0v04x8h1sav7mgq44n6kzb29fggqd0jyh0gify591a8kqg7zbw0w";
-    source = "08anbym234zc4ap4vspsb79654yzj8367w64xnabiac5qiwgms7f";
+  l3kernel-dev-77956 = {
+    run = "1cqypabr6axaf5l5951453b9af2l5a6f89d18gzjyalilmx766hb";
+    doc = "1ndj76w48agl516v5l0afpi27xrm6rjbn712vfs50p8qn7igaiar";
+    source = "0ggrr30qq04rl7z225swbhvin6n5myhil56g9gqd1gmd80bskfwi";
   };
   l3packages-76637 = {
     run = "02pxbgb0nfymhmrm9qsxmfp0rd93bnik90rjpq6d15cf0d0i34sv";
     doc = "17bl48i6wzxkxir2ki1bn7kfw9xiz45fk8gbl3qxdjadchnzbsfi";
     source = "0yrrylgdr0lpn5w0h4nggmwg8lkp5s0l469pc6fk17gj6fj7x4rd";
   };
-  l3sys-query-70889 = {
+  l3sys-query-77677 = {
     run = "15l8agxmgnkjkb5dqjariysb37hlpx8vnkg18qrhr985mnp27pgx";
     doc = "0fch557piy82k9813r4v3jih48bl3r5b6lmcs3arxy8l9lfydcbm";
   };
@@ -9749,7 +9791,7 @@
     run = "10pfzxw0d856ki2krsdpidnfsk27mg4k0vj3jx7pry5cfirx6m0m";
     doc = "145n7vy3d0vk3cq3qd44l3a6hjmazipm7wmr4aa2knxvs4nyvw2l";
   };
-  labelschanged-69400 = {
+  labelschanged-77677 = {
     run = "1fhmxc85w0jgcvbf3kbn6hpkyfl70q6kx7d06laxzafizga069pr";
     doc = "1fbkiz4rqch0sa7xpw0i3x9dwm7vpvfyax9jvp520xh66sn46wh5";
     source = "0ppwzy9p9zh0hyzh9kgvjav9h7pk3c7dp44aqj87vaq33bwkss38";
@@ -9809,7 +9851,7 @@
     doc = "1123lz0ki4kww93952wqrhrw9l2cnk4wrrwyi0dxc5w1yfn2gg87";
     source = "176fk84mbb6w5ql94381kz05lh8q8im7ri6rfjff7f4ymfjnh2jk";
   };
-  lastpage-76056 = {
+  lastpage-77677 = {
     run = "1fnrmdqpailv5r6p0v4y57r3ks1k8r5ndskb1rw2afn195jhdjyj";
     doc = "1m9j626xhr4ccrmmvfrcf420y25k6rnmp330a7qcd7325irknp4r";
     source = "0q5926dj6b7i3hpkqqw2bv3nj4csw0jswr07ka13q3k2hwws6d2f";
@@ -9900,9 +9942,9 @@
   latex-refsheet-45076 = {
     doc = "169h1syday30qiw032k14fhxikdwszggvqz8b9ga4i9wwxf1vh4m";
   };
-  latex-tagging-status-77526 = {
-    run = "01hrjc8j0lh8nccr2280cdiskrbhldjfjz5bsmrw8bjlsa001ryq";
-    doc = "09zl41ywc9ncs27367460xwd1hqr4vbn51b3i9pvb5m619007s8q";
+  latex-tagging-status-77801 = {
+    run = "1lccs0872pa9dc0xcyg0is69wii661f6cxy8lq0h91yhas7xlihv";
+    doc = "0garmpracjvwpa51sxc2kcjna3q8h03yhrd59cpcz82f86x619p3";
   };
   latex-tools-dev-77483 = {
     run = "0kg2yj7ny3qdbz7m1czml26ngj4hqlcybnlq50gb38yd2gndw7ip";
@@ -9939,10 +9981,10 @@
     run = "16fd74x6bz4zfj2zlvbfw160684ff1fn1rkpx4y34avkp0ivs9bq";
     doc = "0f50qxbwcas2gpazlq0ja4m6lcbwkkwlp19qb2v1lflfgian39c6";
   };
-  latex2pydata-74766 = {
-    run = "0g2m8vny1nrnhq5kfpvajvi6wk1p165qx8xw2a19h1rqp0g7z0i5";
-    doc = "1zwcpy6ar81h3vylmk8frc8wbj3awnlr6n8jw7gjwgbyd55sb8bb";
-    source = "1hynnbnvrvz2ny62ambaszafvnm5n3hq4bggjvm6cnb59q2z3mn8";
+  latex2pydata-78178 = {
+    run = "1fsbazpir9sxi1xgan9id9m741mkj3wyxncamkv4m3lc6fd6w5qk";
+    doc = "1vzjkgmva04wx9r1jnzzzq83wgbi7hipn04ag82plbzsq575qlfn";
+    source = "0jz1nfdhz2acwcvbv8ylsnj7a8wswdfrqac72v11b2g346njzjpn";
   };
   latex4musicians-49759 = {
     doc = "1zvy2pa93kyn056d5n0irzdq5xmzki6d35zxacxfy19r0g9rwq6f";
@@ -9957,7 +9999,7 @@
     run = "0jh2x97r6j8lrl5kq5m4bvk139229fwf7r8g8xq7n0qywnfdr9zh";
     doc = "0hgcqd8vqq67zzdn7mq4bps3q56ad3nmaq71mkcyricgrkn5xxmb";
   };
-  latexbug-77050 = {
+  latexbug-78116 = {
     run = "0m8l7vra9ppgydqn09ji7c7p1cgf0v7r1c9qzwkhp2mn3vcnmj22";
     doc = "0fmmkcqiq3011dw0ksj3nyj7phq6mfgfv3994xydfk0wmnfj73ab";
     source = "1q74vhnys7yr4cq7iwcz8h0m62kjpk3qfj415vmpqqamqpjrvr3m";
@@ -10028,7 +10070,7 @@
     run = "1k8inj0rl7mhsjyzc39w789jlafqshh9sgy99szxqbs0jilgfb78";
     doc = "1wccb0ksrrysqjp68l3wnf6l4n3s64ny3cvxiqgalrf0mlfipxmi";
   };
-  lato-54512 = {
+  lato-77677 = {
     run = "1w70dgmvcwm9jff2ap7s78qgqs9ip4a6dx5wz8iyd7hn2mwf1v80";
     doc = "1fj4n1y16x7hxyd63myk902iwm6lr074rkdybv03qwxl12p9ykxs";
   };
@@ -10037,7 +10079,7 @@
     doc = "0vxa87pk0fq67zlnbzbpnig221isp1fy6qp30fphk7igvnjw8v70";
     source = "0mdibdz7hawfmc6bzvk3qfhs22pnmsnvkvvag31p3b4n25zshmry";
   };
-  layouts-42428 = {
+  layouts-77677 = {
     run = "1ab9azs06k1p0s3n5zjhrykpqac9fi3kr3w31xmh698zpsg3jq4c";
     doc = "0ydpj4mbjyg6qy2wmj90rqfpkcq30pws5d11kdr1gcwbzqqkgbbh";
     source = "10mfwi1wv5v0qdwqj1mh5q8izgavlhclnz2aj8h02ijy4kzgfg5w";
@@ -10059,7 +10101,7 @@
   lcdftypetools-70015 = {
     doc = "1gb8k5w6lg9fdxhs36caxlvq96s7np35yq9y78165igyf6y3ig70";
   };
-  lcg-31474 = {
+  lcg-77677 = {
     run = "1zgpbj9zim5dcc5c2lf6hy33hzzk8cmirqh8kv60bsvha4hwvzi6";
     doc = "0fnpj3mdxd0v1lrkp2ywb184bay0j6vc5m50jlnipjfjhry68n15";
     source = "1al9wmw475g30jw8lwx709r0p4lq6p2p9n1ky69ncyy42zp79ld7";
@@ -10069,7 +10111,7 @@
     doc = "02h21pl11ax04q5psazgxpm6xpb8lljm4b08bbmivpwbm0z1namn";
     source = "0zf06l74fzlici5dzm3ggvz3h66dx3yjxmb7qz8xlsk5fppyhcb4";
   };
-  leading-15878 = {
+  leading-77677 = {
     run = "1ky6c51dcx0gsj8f6zrwb242d940cjml0gb258ags5xi5iaq40yk";
     doc = "1l31zpglr1bz0gif3w7kqzhd37zpcgjig2ly84fcyk805sf7nncd";
     source = "0f4ayaz2m0y87ifddl4622rpf858zmh13xafp53nh96b8pyvcip0";
@@ -10078,7 +10120,7 @@
     run = "07w8h1wv322dy0b69d13b9k59m6iid53rlpn20ps5ss2j20b62z3";
     doc = "17xbqxhmxc39gxd5ckvzsmhiabsi2afh2r2jv91im8inqfqi8j1l";
   };
-  leaflet-70652 = {
+  leaflet-77677 = {
     run = "0wql7sgbqvbb27mxzapbzy2cnmz2payy5g3cv5yqrlxqpd5fqfwl";
     doc = "1z1vil7mraxpcw2addsjkj9dqgcsx2v47533dkf0xnz7b0q7sbrh";
     source = "0cwhrqmfz1z14jk8shdzp93r8clxzxpj4jhmmcfbvax0m2p7ks76";
@@ -10108,12 +10150,12 @@
     doc = "0pgkv08nsq0rmcpck9vq1hfb4gnfqh274hclq4grk182fpn4ggiv";
     source = "07fl3lypnxz7sa4kjf3xllwqakhrwgx8z8r7l6x8id96n48zri9n";
   };
-  leftidx-15878 = {
+  leftidx-77677 = {
     run = "05fi4rp3s0s9ank7pphdwxnlnanc2r88dxhyxbz64fb26sja25gy";
     doc = "047a5clwf0r43r1j87k2zfv0pa3nrii213y0zhv5r3zkmwvm1qky";
     source = "0a8rzkycppx8qayqw3s7ndzz2xp4zqgx3qd8dp9s5ynlm10020nv";
   };
-  leftindex-76924 = {
+  leftindex-77677 = {
     run = "1hc88b88fs7247n9q36idpdsh1jb39d92sp5qr2dky27fgvnz2mr";
     doc = "13lfzvsai75nyb1xykvd8bd0q7dpwb5na4afb7bikqw6iz3dyhwa";
   };
@@ -10131,16 +10173,16 @@
     run = "0h031rnbjhlpn54w80vldmzisx1h6lfvhml7fwvba3f9qmppi675";
     doc = "07vjbr04a0csjsmm03mxfsqbyk0458a2lkqrjw7vw2m53s9y39qh";
   };
-  lete-sans-math-76200 = {
+  lete-sans-math-77677 = {
     run = "10qixgi7ypnbfz1si95f3nssym8kzyv9lsj0669h5pqck8bajgpd";
     doc = "0cdl8yk68gh3wqq2bi6xi7lbhrqyymmc85bv7c9bby7x7hdy7zwj";
   };
-  letgut-76652 = {
-    run = "1nbzwmnc5pwmg3g19mpxnfq6dhnklyp26jffz18m2z6gqhpl30y7";
-    doc = "012g8f3mvzlcwa7cggfwr8bnwnx97sfg16vh99f1xp8i9m39ay4r";
-    source = "08wljq411vywzqb18hz22mq9nn859dbrmiznvvzkv8s96100wc73";
+  letgut-77962 = {
+    run = "0h2xz3rd6bm5rdfhaigh7g5m3asrvgyx853xd2ygv9icnb6j59zr";
+    doc = "1sv0vp4hf9f12k8ffixvvylx801kw09vlrg2ga2hrr0bbir9q2r3";
+    source = "000k9p7qrxmwy4mw2f2gkn10fmrqxhigrdrnms547z14642j92zw";
   };
-  letltxmacro-53022 = {
+  letltxmacro-77677 = {
     run = "0p16zmxngzzp9hbg7bxrh087gxj7hg4avf4a9akjkg56834hna5h";
     doc = "1gxldiflxvhy6ca87f8z3a3zzisrwz6f9vrx2r9gsfw72jyfa99y";
     source = "00ykjx412119jxwf1zaz5bismfr0i52psf5fagdiybbshs5ac88x";
@@ -10148,7 +10190,7 @@
   letterspacing-54266 = {
     run = "0ry7rri76dgbrkzr6na2kkh7bn0jpwkhh9b5qw0cl5xwyp81rddg";
   };
-  letterswitharrows-76924 = {
+  letterswitharrows-77677 = {
     run = "1q6jbbphhjmn95dzxy1rl841a6m31ly553zp5g46ix3lr6dki791";
     doc = "1776djp02cq2nqadmjga7dirf87rnw36igl6fri668i2ybzi5pjd";
     source = "0z6pr5dqla78g39xaxrx0pblsahj6lkci4zhbrn7k39jr0bkrs5s";
@@ -10170,7 +10212,7 @@
     run = "0ws9vk38j3m0sprl9lak2sjlq13nalcysk95gv68h90x04jj5zdl";
     doc = "043kmzddal693kl6fds0xl2wwmyzvd9cqs8dmy1jzp0mdi6qw6vn";
   };
-  lexend-57564 = {
+  lexend-77677 = {
     run = "1lqqn007dpp24jcgpn9fdf7ysb99lgrz9zxjw27qm2439wrzhc1w";
     doc = "1h7s17x7grhdb1hxxg6wql3pwy1w08iywpynymrqn8748s93yy4m";
   };
@@ -10209,7 +10251,7 @@
     doc = "1is5s8iqyb41fr2hr1kxf68xrlb8hqw3v1fifl8645dcgp8lac33";
     source = "0iyp664cy3n04nn4499ryzx00sr1iip1qmdlpvjx010r7hq4dyb7";
   };
-  libertine-73037 = {
+  libertine-77677 = {
     run = "16hjdl8cdjyni8cy3n63gp8gx6sdy40yqwg4h1wxfkjjvk2w7jwg";
     doc = "1msipdjj79awvd1kra3vicps38fkf2nj9279aq2v7wg7jw0m2k65";
   };
@@ -10217,7 +10259,7 @@
     run = "14fdpxgsmq9dhgl2065rdsp0fnh9h0xcr0jzg4k5gka9irazxrzx";
     doc = "0isvl0ghjji427p1fd1w0yy04c6zjmp058k5gkpsa3xkhq3ijvv0";
   };
-  libertinus-76924 = {
+  libertinus-77677 = {
     run = "00f4wjqqz4hqh2ic8g162mnn95s0p2v1qshbm0zrnzjy2gr51hi6";
     doc = "0zkv3fgkirq6jcz7ywb1sjnnw8vfwfgd3y41lm4ds547ra8zp2q6";
   };
@@ -10225,7 +10267,7 @@
     run = "181v0g43g18ciqqba3h8ii0knh7dnfjdwn7y8a82rx31asilgfnl";
     doc = "1lkgg1xwp5ngd10r7gyr5jngif1xpfb67p2r1f37jzlh7ni4fbmb";
   };
-  libertinus-otf-77115 = {
+  libertinus-otf-77677 = {
     run = "1x3pdf751h9mid5hmrk66lsnv0v7v3llpipwqij3r9158qncmcqy";
     doc = "1qzv3b8c8m9rzz6kqckr81cbd0mw01h9s2mmbz1ryh79nv1a56iz";
   };
@@ -10233,7 +10275,7 @@
     run = "1995rpd8qkb8n0ydgzn6289fk81634p870qsxhdaspqmz6fn9mb1";
     doc = "0i0gr4xzg37n16l3mxih9yd99y8f9ksg1023lm07wpdnw8fylv9a";
   };
-  libertinust1math-71428 = {
+  libertinust1math-77677 = {
     run = "01hbblhzzzwrzrcfk5a1lpz3k52zfzlmfsg4srckkp64i1dw4qps";
     doc = "117xnybd9v8biphxkwqs6k7brpmayplv00wr05h16frmr649d4ps";
   };
@@ -10246,7 +10288,7 @@
     run = "1rri0fb9ssj413w1g8c7p79hn72gqzncihhhg3ws3ldl9s3nm54d";
     doc = "1i4m0gp38f64y59zcsyg2j7bb6zycyf9z5yr5wf86l6kh40cc2fq";
   };
-  librebaskerville-64421 = {
+  librebaskerville-77677 = {
     run = "1d98h5gyymci1vny8877pdq7nr0vvv8878kcbahvkijyn5gwwdx3";
     doc = "08rds9g231kqmka2dzv03sj9dwnrh89rhsbfqffpzrwsfc4fqld8";
   };
@@ -10254,15 +10296,15 @@
     run = "0w630a8xgw6qs0d8gw8g13slxcslyizi0mmk3phyvhiiw9km40jp";
     doc = "16ncr4c7w0hjkrss4y23qd2rmd9c1zv1pyqgqqc1rdi7w1kjhinq";
   };
-  librecaslon-64432 = {
+  librecaslon-77677 = {
     run = "0jwxqjic9p2k55g7f8j75s78rf5bfpcgbjsmg36qk7m9zig2v9im";
     doc = "0rj21fkpajmc4gyr5bixf4v644kiw2iq1fzxs6fn91fcfkwdd2dh";
   };
-  librefranklin-64441 = {
+  librefranklin-77677 = {
     run = "0g6vlivwlwb56mm9a509xfssp11ir60cvrd9cp2hv9ym93yqkcgs";
     doc = "1gvsanhdlbn3wnx2yq7brvzh7wj4nwyvdjybkmazlb6ih8ribab3";
   };
-  libris-72484 = {
+  libris-77677 = {
     run = "136aph3s7hnwqhngvwpb9n4hiyw5by56i0iiljkdhf7931h4a187";
     doc = "1bxwb4zv8f38z7vpgwbl7ii3khb8l6sh3df879wc5pj43x3higqp";
     source = "1kfgkzczvmhvh9n5v8319ffgsgspwnfcp8ay1pdldl4ha5cs6n4h";
@@ -10312,7 +10354,7 @@
     doc = "0nqli6rs8nn9af94ghyxs24cccscyg0i6j28x4fglf9mxfdc12mk";
     source = "0daq1s83b74dfkciwfvxag1z5v3zwr2y6rl7z2hxslwfldkc05b3";
   };
-  linebreaker-76924 = {
+  linebreaker-77677 = {
     run = "1v23krvl4nf8pz1p2hl7d9pj23c6c8zw7hgcacyjvzd8sc22jsi4";
     doc = "0prq9r6acl95w8cjrmzxlg3hxiq1qmivl0sgdcva6992smmls68p";
   };
@@ -10321,26 +10363,26 @@
     doc = "0mjpbkf6vw0n4ddd9abrah7rxf51gmgayspy6jpnai1wrzv0aby5";
     source = "18v5r4hj2jpqay98njcyijwvrbc067c49jrhja6i52ddj6h9q4wz";
   };
-  lineno-75200 = {
-    run = "0hlqfjch7iaf3w8h3askqbr60ngshrkwbgvglkpxmpkxag7j13id";
-    doc = "0dmxg5dlw89qb2x8abahl8xyyrb2w7m8xv63blvb16mnyz2c86k0";
+  lineno-77890 = {
+    run = "19kxldzi8nz5qs1qwgmkdqgxgkhq6kaa480lvrxyy2jy4v77hqwv";
+    doc = "021lgm8p44nw7p5chxrxksjb2x8qmyvirahyf7nga1li4rwvvbrq";
   };
   ling-macros-42268 = {
     run = "1qr7bpa2wcp1hqx3ckid8h41lp8idhqqnnbdv42j2nhcy6f409wf";
     doc = "0lk4whkamzsf9mriiz06ynpp962w5473ppf4n36q3bb13amyp5vk";
   };
-  linguex-30815 = {
+  linguex-77677 = {
     run = "16rqzqipzng4xd7yz3i6416231cfphqbwq8n6pfal83awzd660jk";
     doc = "1l0m6k9adq0zr88zbqrj4jl286mwarr6fiy4181bwxm9w9kkxs04";
   };
-  linguisticspro-64858 = {
+  linguisticspro-77677 = {
     run = "1aq5sz202hipjbimm2n8krb78q54ybjyxbymmv1nxdpjxk0hixz7";
     doc = "08pbwqz6rqqmw814c54g124h6ni6bpb39gpd2ibp5gxn21agqa2y";
   };
-  linguistix-77463 = {
-    run = "0xbbr69gavxcj9q55z63vkl1dk964ja7ps2jk01c5i9gas39497z";
-    doc = "0g5alykbwvqczrhkwx3ndh8yc41zvjy2ym865y8ncymnwzjsxzwp";
-    source = "0iz42mqm6srv77z5z42hmxw346hsl376q0wck1qnp5gd198fmy5p";
+  linguistix-77571 = {
+    run = "0315a02abaqyff8bg6g0grsby8hcf0a0022xknk74djgnqqnlgqb";
+    doc = "0m4njdvqfwkar9d5pcmvshmjy0mfapbjkcp8mk291937k80sfhsr";
+    source = "04scwz2dp8yv9drz6k8jkb58vw7ls8lbqj2mh9hv5szhdi0cldnw";
   };
   linkedthm-75860 = {
     run = "1zmnlyigxp5yfn6qwfwszh0467z2chy6sb2v3iajvrnfrwd93n5x";
@@ -10354,7 +10396,7 @@
     run = "1yhd15nv9gmnq8gn0yy9y596dnawjky0nc20qhmcbyz2fd239ysq";
     doc = "0d11xn9b00j8zp14bzzw5lgk33nhdn8xpjg6z7z2xdvfa25xxrwn";
   };
-  lipsum-76924 = {
+  lipsum-77677 = {
     run = "1rfz9f6gaha6ccx1s5kij2zkwdkm6i2laxv5r9jyjvsawqwr0lam";
     doc = "07wwbyj7i8cdnq8g364c8pjfkc0l739932n3jcmkj6vs7qbmkikq";
     source = "0349nqaglq7cnwi54p35anv7ycsd7a92jd86l6l2n9pmvh7z6py6";
@@ -10372,7 +10414,7 @@
     run = "0kpf5svycd71r8p61y83wx1k99fwxm95qz5fbnqkfrq3c0113h3p";
     doc = "1zd0mxh0gxlvqrwxvycqr5yzs5fns0hrkn6g6b4m1v6njv2f9lna";
   };
-  listings-76899 = {
+  listings-77677 = {
     run = "17m6wjc089ldwn50lssfq6q7q2ggqzpy5cxdx52rj1s7imfyf59y";
     doc = "1b9yf2fc4v2iiz3q7140c21shs5a34pa9gh1pl7bh3l5sw3524i6";
     source = "1n8vr2zm8zbgszcbgvd1fnk38vivdx74nvm8i1yrpbk0dfx18cs7";
@@ -10387,17 +10429,17 @@
     doc = "1s7k2gr69xlxln2yi5wyvd69l2qa8v33d92b6ahgxxpid3437prz";
     source = "1bq197100f74sal26w0r4iv6ys2qa1ylbwbyw3hm9dlpb6kmdmgq";
   };
-  listlbls-67215 = {
+  listlbls-77677 = {
     run = "0r5ns594dxmq7r9pkk2hk482caapfdar1gwbdi6fw396pcnpw8p7";
     doc = "0gnc00jv99rvf892q0sncr7l5pxpndrmw6qsxfbnyb38yr675fk7";
     source = "0s77rh3480i9w06a0nnc7l8gm3w1s6bik4nl15idb27h5a5fq302";
   };
-  listliketab-15878 = {
+  listliketab-77677 = {
     run = "088f2lm5lfbns7hd1m06f3zn1cjcbaw427z7zl5n47ahrvcz9p94";
     doc = "1llrdgxp9mghs51sz4jjhbdllzlr1xgnfskask532zwn1cm6f4vd";
     source = "04xfgaqpcskx5m8byysvd2rji31km9c6cbkfzf3ybj4a5bmbnq58";
   };
-  listofitems-70579 = {
+  listofitems-77677 = {
     run = "0kpq0ac0v5yk4gvwrzdkp262npralqbdvsx0ln3zqgis025z4kzb";
     doc = "0dgmc69d5wxj5dx7liq08vkw58fm3vg41j261xxw49hlacjl43z0";
   };
@@ -10411,10 +10453,10 @@
     doc = "1rrmq2q8adkjwyhp6b08d4s3bzj9p0p1ljlngkndxhl20ik8kxdm";
     source = "13jydlarq6vpq3aad9i2j0vx41v0qxdqyaydpg7p54qgvz875v99";
   };
-  litetable-76865 = {
-    run = "07wjanvlqhj1sv5rs9mwfbfsngxbvpa5g5p3kxxm733jlfa70kbf";
-    doc = "0qgvgappjwcd63ig9l1q2aksbb49vfry32l5gdx9x4li47g9jnky";
-    source = "0ysxjpifzdnz3lvcyvb1i2k7v5px84jfj90zyyarkamb44yrb3sj";
+  litetable-77677 = {
+    run = "0an4dgdkb43vdwhqqpb3ayfh21q3b52gm1f1hg672iw3xpqdvj2s";
+    doc = "0avcf61g5qrxgphmf4b59pi3147mj3adr9pd1pdzh0dwjv74m92q";
+    source = "1dxz3crk5imzv4q7bl44yilya8qzrbbj4p03h44ba8bimrrgki0c";
   };
   lithuanian-66461 = {
     run = "1jjbj39d4idfsx86lmpj0w1k6gr6mwr7sxvcm8wag47rgd05czcf";
@@ -10434,7 +10476,7 @@
     run = "12bj60lfqlqvyk020lv1l6iinvqx4cvd6lfz4vhblfx3gs3xmcqf";
     doc = "05sppy6q0c2iangbzmxv5qxla8slc2k0fx62f6n2fg1ncgvfl7qh";
   };
-  llncs-74287 = {
+  llncs-77677 = {
     run = "0k9z5a777qf459vri4vcsq4i87cj98f7kh4cvjg9igjk4lhbk6vi";
     doc = "081kxb139xjjh7ggn88s4q15kp3islj23gr4926ss3s5d84qdcl5";
   };
@@ -10442,7 +10484,7 @@
     run = "17x1sjs86vl03dxcz3qbwm7r21hmzvsvsr9qa0xii8fvp1yb5pxz";
     doc = "1dq0v5wczbhk1ir8fl97c53sinpqnvv9v1hff1hzc3rhbwh5smh2";
   };
-  lm-67718 = {
+  lm-77677 = {
     run = "1b4lc6ipij5iws4rgpv3sjjwrdbaxnwiqdbyyj62jzc3yk999m4y";
     doc = "0wdnpnsbg4gvahqq8lv8ny36xwxgph04sjn64pl34srn2pk1jsxd";
   };
@@ -10455,12 +10497,12 @@
     doc = "19yqngjn320sng4pg835rffk6d2g3c5wyma46x1jr0bccv8s1990";
     source = "1p002ywz3pxip5v4cd346nmpg0gi7wamlcl7bc6f4zvzqp0cg41g";
   };
-  lni-73766 = {
+  lni-77677 = {
     run = "0k8v3qzkzrc9n17gkr9zmh4k96w4vn1b9hgfsibgyy9ib7ya1da1";
     doc = "1jwrdgm931zr4ibpdhbzdhfvsg433rmjbkdck5zc0b38zz991whm";
     source = "0k5si6wfnwlmr315q3y21f4iswpqk14ppw9ivkfh4kkwfvy6ngwg";
   };
-  lobster2-64442 = {
+  lobster2-77677 = {
     run = "11kx0xhhklgrj3rhc5q3c5hi61444vr4936fpq1nma1yxn7mbyfz";
     doc = "0l51mwqiq34v22pa4rjj4c6q7w2x9acdfy02hb8gmn80i91fijpw";
   };
@@ -10488,7 +10530,7 @@
     doc = "119zgxwx0q6c4ghpb30mvpdwrpr0xvk54hmj6qfpih0kxj0zp1az";
     source = "19j00a28pz5dp29sx61dnrpqyl24sx9apf2ck334ap5sw7awnc70";
   };
-  logicpuzzle-34491 = {
+  logicpuzzle-78116 = {
     run = "0zsg11lw5x28sik6ifj2v1zjvm3pcv4vf7w2pfxcr395vmw33qm9";
     doc = "08vgi2s2cy09dhqdmvmq1ijlw83dgjd7xjfdhj28vm9ny16zmydz";
   };
@@ -10517,7 +10559,7 @@
     run = "170q59wqy0x5zhziaycmfglv1wnc5kf252ni1r4vgrrs3rlwiirr";
     doc = "1wj858kqp27amx3jpndsqma152r40agfymh9ah8s42pn6kfl4dkq";
   };
-  longdivision-76924 = {
+  longdivision-77677 = {
     run = "1rnbw3y9vzs0nqyjw1qdj7mbiy1mk9l3ccygnn65495smgg7h7b2";
     doc = "091b1v1hwbifv426w1gglg273c9ck0n3bzj3xl9hhl27x1qzxjcy";
   };
@@ -10534,7 +10576,7 @@
     run = "1zy9vvnkbhamcn5y0388yci0mlnh0w5nkww4qgf7540xhr2jj72q";
     doc = "0ah55higfvcf0b48daxq4f68fwihm9nsbr2lyj0yib37v50lfqdi";
   };
-  longnamefilelist-27889 = {
+  longnamefilelist-77677 = {
     run = "1nz5n1g65fs7xxd4l0c9xdr2z46mxhb0fkmf5id4hrifrbl3jxbw";
     doc = "1v8i6ax2qwz7d7mi0bnpyllbqyksdd749s8pr95jfw1fhi07i5fj";
     source = "1615gzf3rjfr1nlmpgcrvmlzhif13g3kn210xq8p0vsv20irnqa3";
@@ -10548,7 +10590,7 @@
     run = "0hml4j8l5gdz1c2qfpsqdpha5dqjqx545am8x4vzs57ga7j2va4h";
     doc = "1jf63snh8bnyi1j16mjs14nyqr4bj4rjbwd3bs1xd30i54d5584s";
   };
-  lparse-75712 = {
+  lparse-78116 = {
     run = "0klbnc9yl8f2rjx75xswykrf09wj88v3sgx955w34xhkjh8bv5w5";
     doc = "1cxj23x23mvlyqb9pjbrl18l09jprjl6jrmm3i8s4ylv7aa91dxx";
   };
@@ -10684,7 +10726,7 @@
     doc = "00l496344la7q8jz0nr895cxir6zn5pcjsn16mc3cd7lpiclxs69";
     source = "005iwxrraxmirspq3881mc2pb8iikc71p4g0dwxbqp38c8v8djb0";
   };
-  ltablex-34923 = {
+  ltablex-77677 = {
     run = "11gazci0c064iav6124v4szdbj38anqwnfgh8pfpdq9zff0h9g5n";
     doc = "0jjd5f3r67lrbl4vyxjakm8l8pdrw9vm1dzhl5305ga8vvwb7gn2";
   };
@@ -10697,12 +10739,12 @@
     doc = "0j1p6bcwwgz00n3wyv3vm02z295sj9xf93v946k1xrv5jc6pg6lf";
     source = "0g05r6b662jx2s2kal26b3lv0dd6r54fb8m09yv5d021y1fm2nqg";
   };
-  ltx-talk-77540 = {
-    run = "08hn2xa4d090i2lda535vf4ram64wln6jvp78j6d8hxmzlrcngdg";
-    doc = "1m6giixbafh8vmasy06wcjrf9j45jximiijdyzja6bh8jjp3nrjs";
-    source = "1slyf4p2m73l2y5lg6sq46byqcz712894cd782wvigc2a1dqimnb";
+  ltx-talk-77959 = {
+    run = "0x9di5a5syhjqq3gy77zqqh978d2fmjn2bnp8vp9zn78c5f65kd3";
+    doc = "15wrl4lqb4bb9yiiznza7021wm5zfwghlv8ardjd9q03ji002112";
+    source = "16yr350i7kiif48xskrzqhfas75d6ghml2sra70babkx0ccy2vvq";
   };
-  ltxcmds-69032 = {
+  ltxcmds-77677 = {
     run = "05wvxr5bsrfgyy5aa0mrxqw0vi8m1ks5ma6fzlf8ngnbpihr2ggh";
     doc = "0jnqvpc40mazy5ka1451w5rdcsl5q6rza3dqkhqpf79lgiswxgc5";
     source = "1p7gzrhyiaiid1mpqfqlm6jfamdd8bvxx149lsnvhnxh3mbxlydm";
@@ -10743,7 +10785,7 @@
     run = "17czrz46xlbj3xkh4jwdq269mqaq7165kpkhhqa498hrkcgdgaak";
     doc = "1zfwvs979c7s16vpv2k9l81mcmm9y4qdjk46l8ik3123dalchv6f";
   };
-  lua-check-hyphen-47527 = {
+  lua-check-hyphen-77677 = {
     run = "01q4j9bb19lf838pd7l26rkz1xr7mxcx4fsgf5xd4sdif18h56qk";
     doc = "0iaihbrppn1ap7bqvn37rk8b6m4lwdi8w4zkshiqya1mphhsfjg2";
   };
@@ -10759,7 +10801,7 @@
     run = "0lbdq92nccnj09mqvk8izw2198jmrk7n8v5wfjkw05b2mxwbh3mj";
     doc = "0fh221h3jbmiy8dscx8xq4vacghxz5018v7ra8s25lz4zj6fawyb";
   };
-  lua-tikz3dtools-77460 = {
+  lua-tikz3dtools-77677 = {
     run = "0swhrg9322qq2pndmhyrkqiyd1iwa0mmr0xnyjfayaqyg2dkqgc3";
     doc = "00942plf6ldz3nv0r6fizil2cj2madpj3aa7m9by0pzvdhdzb1pa";
   };
@@ -10767,7 +10809,7 @@
     run = "1j18v5ijgfjgb193k45k46zdxz72dwdb73vb9b95fx47xn2dak4y";
     doc = "1wlx3r9x6ixqvcisg8l1s9ym2qkw9asq6nrrj5kyhdmh4gahzfxx";
   };
-  lua-typo-77296 = {
+  lua-typo-77677 = {
     run = "0ina2rc851d565jsh34783mpd4ab7m263yfshflj0192dwjrc9fc";
     doc = "0px0ik1qm4cjilk1pm6dlbl7b9l02p5g5cvgl6r2drakpg3pbvi9";
     source = "0c7zd1xn4rw9m1yfkzn2m6r3d2nmdgha50ksnq3djwisjy5qvrwk";
@@ -10777,7 +10819,7 @@
     doc = "1l48q7wc2wqf4177vrkawkbw0afdzwnklk5p8b2anv9ghli88a7c";
     source = "179zsipslbbxzi64gdsxnc14cn7n7gafmykf7i37zbwyk09yg44x";
   };
-  lua-ul-76924 = {
+  lua-ul-77677 = {
     run = "1w4prgdq4xmx85gq3hgklxhsxq69spvsqnl4g51wxs2l1pi3dk4w";
     doc = "08kjlrjicm93cp32kssvcjp2j23k0wgcly88xxpkzl6x67nw8qw4";
     source = "1hfld2d2qppvbk0w7cjj9ng888jwi3jqlak4cbnngcijvwaw3hj4";
@@ -10786,16 +10828,16 @@
     run = "07ffnzqwxsh4x96ka1bblngnzlxc4pw6m59129gb3km4zl96v39l";
     doc = "0dadg4754dicj020lsrycy04627qx6dv226ipi00v7vn8rk9fswf";
   };
-  lua-unicode-math-77378 = {
-    run = "0gsqq9a5nyscxsywh3g8gy1qf2pp0acp84k3bjdy10vqs9gs2j7n";
-    doc = "1rycq81jch0ak2y9rfqi16glrfljpx00gxaidz6fzp8wkjmlssn0";
-    source = "13xy46lcnlmn047kcangcbyzkpj88rpvpy3cb772afn2xnqfahr4";
+  lua-unicode-math-77677 = {
+    run = "032xc76xm9ac67glwxvzndq847hw529xmv5mii40s4627qv7dfaq";
+    doc = "0ya06hwb9aiip8lm75n75wl8g5nk8n8zr9fg4gkjwf8b49hqiyv4";
+    source = "1kqxsjwm4yg42hyvnhkq9lpq4pfy9nfkfvhxgg145df1ysgb5yc8";
   };
   lua-visual-debug-77207 = {
     run = "0cmrjcw7sdxz81yps4k3l4c3cwc75n36ijpc29szcha6z3g5lhbl";
     doc = "1lxsglj04dahyhqvshj1fd0704348zbb3hw7xk304gi6962bc3rz";
   };
-  lua-widow-control-76924 = {
+  lua-widow-control-77677 = {
     run = "1qagxphvc273asxvg77sxrcfv51kzcc6dkz1bszbzzy9sv2f3xs6";
     doc = "1zr31yn7xrxgzj2lnvw8f3sb784xcis63ggd1wylxfnar62mawr7";
     source = "0w7b34afjik8ka9njdh7lfjn565gs8ns9n90phgyj8xpafy09jdk";
@@ -10822,12 +10864,12 @@
     run = "0yvsn5fg0rk11syy22pmmrph6kgkxwf8q92lr9i2wrimr4mxsqa0";
     doc = "03s0qnx1p1mq3vsg1f24fkk9jjm60i8ns2iyqxcy7rj9nd0b8wa1";
   };
-  luacode-25193 = {
+  luacode-77677 = {
     run = "0qk8vadwymhcm7yw3sffdh9i171hl8vg07j1b5gbsl1sa70cpam1";
     doc = "11d6ak1dvdx64k0i12k4c5kh24f5vqy0ihvj9a5lxa9gqypflrga";
     source = "1fafh2nq66cz01jsbkb0mk907sppahlswsbb35pa3q5j7iqjzyav";
   };
-  luacolor-67987 = {
+  luacolor-77677 = {
     run = "1mbiwswai0sq8wi4vmyrracygdd3a1g45m3qanpams683ik1syal";
     doc = "0aqwjckc7cq8z80bjyl6fz2gqzrwwdvrlilpcf710wlrqc5c023r";
     source = "07dwvksaxidr4b7z7fx68q2kcclhmpilvy1xk1xjjp07s5vgqkkh";
@@ -10851,7 +10893,7 @@
     run = "0nrk066mdzlw8z55qy8w3clpfdiy411mqni3kmn17adp5iswc9sn";
     doc = "1xinhsfcl4xz3xziv0ch0rhgrqqzmrr3hs5h23hdyadayxk4wxhl";
   };
-  luahyphenrules-56200 = {
+  luahyphenrules-78116 = {
     run = "0msfn7s35xhpacx745w0zbr6g5pbhhm4pccd5cmqdhq6dh0fjw2w";
     doc = "0y2rxs5mqyw6cyrmgsqqibsw45qjlzsrcwpd74m9l9d4731nyn37";
   };
@@ -10864,7 +10906,7 @@
     doc = "02w8s71qdkxznkmqv7c62dhar2x6ia9zsiwd29qxjf51dpwj3mg2";
     source = "1v09zszin9f4k3gczrfs86zv019l42d6khacjdb3qjp2gg8w9qn6";
   };
-  luainputenc-75712 = {
+  luainputenc-77677 = {
     run = "1wsz8aw4dyhiw5p7gyf26lcixk1a8czr06akd1h6dwj6s5vq4vka";
     doc = "0h6wjb0kjdqfrmzikvbddq4w31d55mxlcl5n3phr56fa9i49qmgm";
     source = "1yps04v6fvqspq3rip0c6pw5a5y3annwfaij7w27i53419h83lbd";
@@ -10872,7 +10914,7 @@
   luajittex-73848 = {
     doc = "0x2rc02wn2cvpw82g1ig7bvacxbclk78vsgskg84390sxwnhpx79";
   };
-  luakeys-75824 = {
+  luakeys-78116 = {
     run = "1z9231a7ahl3gm12wfxi8l04s9y0q28i2hm6g7bl9mj3jsjvxvqz";
     doc = "1n5g2r30znv1258q6gd6qx151cz79rsd7dzjkyak5h2msamaw274";
   };
@@ -10883,7 +10925,7 @@
   lualatex-doc-de-30474 = {
     doc = "0vnmgs475bzbqi14m9sm45cwjfsbvbk45wkb8m73j1bnk7wg7hh4";
   };
-  lualatex-math-76924 = {
+  lualatex-math-77677 = {
     run = "18m4jab4yy3fvwkn6fyb1qajsq4nl45v06l1kdjimcws5vj0wbv4";
     doc = "0di41c5rk5raf88hpz59syhg330can3gb5s25n2y5c47qj0aph1w";
     source = "0v470ky6shgcfy44b6a1b987cylqiz6rk0dk9qfhiqd6b93p3axd";
@@ -10902,7 +10944,11 @@
     run = "0ma2na0ms6k07aavahnpfz1wddrjw2zqq0znxfmib50m3nqh3r5y";
     doc = "05lpj7b9bg6w6d3hc20cnqd50m4g0lfbgj65lywnk52klkggiyd8";
   };
-  luamathalign-76790 = {
+  lualineno-77773 = {
+    run = "0my7fq6shqnyg6j8zbxvpj5cp7kwwq35qr73cr8q8wpfp2a0zfga";
+    doc = "108qksqvdxjaxcqg9xqif1ljh28vlwcg5gvm6j5bm4inhaf8l6z0";
+  };
+  luamathalign-77677 = {
     run = "00j2vngg8sqbagyhmjv8lr8kzfsllllmm2gijhxbm8xgf8r7f01y";
     doc = "0b2zkyzy0rq2cfbk205nixvflqcxgc1sfxiqbiqhz2yhai5y87i7";
     source = "1svawaz0lj4zilykjg46av8sky18pwzqfnyli8qldpby4zmnqgvi";
@@ -10911,29 +10957,29 @@
     run = "0gcri65p0y9rmq19rgf79jw98i855cl30al9cpq3znp3jjyikfrr";
     doc = "1sv4ygd6ypf0hhcbhydcr1ap7ig26z476i8z0gs5mzfs08rdq5mm";
   };
-  luamesh-63875 = {
+  luamesh-77677 = {
     run = "09ldwjfa0dfhgqv2clyqzd8nzq596h9fz72b1jh7vqjwkn5774y7";
     doc = "0xnk2mcw24v6002v523m7amj6qc4w3h655l1ss4rpwvv6virp3kj";
   };
-  luamml-76924 = {
-    run = "1n9knrq336s9wqy70l8pjp6w64gn07dk40sy638vii6ypyywvnmc";
-    doc = "1qpk1y13785dcz4gzwx3v4x61549fy7pq5m1yhnvcgs88bw7lp0d";
-    source = "1zl72xir6cjrwyp54jwq10kr8n20wqlif9ayphbxpzs6lc6n8s5h";
+  luamml-78222 = {
+    run = "1pjx7agwdqsm3mjdh1w7b2jg6l5y7f286w2x3m0js7h53p371zq8";
+    doc = "1q15l5yirlk7qklkzps2cfik1ik3mk6hb3ir010wb8c8z7sj38af";
+    source = "0y2pcmcm7jn0cd5cx8d75qakl0ibi5y5f13jjvzha4ji2pkiqsv9";
   };
   luamodulartables-68893 = {
     run = "1f250s8836j4kgdzii56c0248j5sp64f5wbqkpd6p69wjz7pbrmx";
     doc = "0pdk7x09gmdv0lnwkvdv3scmbgfgpyv069fa4s5hbyvwskbj7fmy";
   };
-  luamplib-77524 = {
-    run = "1qdv4vj5kz1g5azw9d7nm27wxni63dv3a0xaac5dl64f6w26ld06";
-    doc = "16vp4knkp6y5kkyy79r8ka374454nbqkxlfz4jjz9a89a4iaijkg";
-    source = "0iys09vngh1az986g9i6s16p0b6y9i61knvnbb3f8cs2cdirj60m";
+  luamplib-77703 = {
+    run = "1n3hlvdvlavk02raldagzqsda8qg0mdcg3b35gg3rvkg2g1jmn6l";
+    doc = "0xi1r728fzpmmd6cmi6ia3vb02imgw3hdn90dgv9pg49kmq5ay59";
+    source = "07jc1k13krag0402rfnvhjmvdgbgnzc2wx8lrlsn2my70nvybg56";
   };
   luanumint-68918 = {
     run = "14z8vvxxivi2i61r1ydq1csbxlm3621y4j9hx3p0m9s1ngcy4ryv";
     doc = "1iss948y9rhg7j6am6vyc5y0s1cmn43k1g8vgcjlzbp8x88mwlwx";
   };
-  luaoptions-64870 = {
+  luaoptions-78116 = {
     run = "1lkx7ynl6xci7klgi2h7qbyxny65nca74xz2bhnhch6zm38rgsa5";
     doc = "02w3623ix7g67bz21262i95gn1m4gzvlvn08f7v0x0q5lm7x1f3x";
   };
@@ -10962,7 +11008,7 @@
     run = "0cjikz6739jiqadp28zll72i58s20dm1i0q9kbd3q2y69l3l727r";
     doc = "19597kvgz6ggjfzbdkg9f5rg9qag9mrq83v0xk2w6f2k0n179d5f";
   };
-  luarandom-68847 = {
+  luarandom-78116 = {
     run = "1qg41y50fmqq623wdc7rj17az8k2x0fwgjynq0f6213swx3nz3hd";
     doc = "0lzrcg3vywprj6jksnwr2abd9qj1vcqqqk0fz9nrsrg3hphn6v0x";
   };
@@ -10983,34 +11029,34 @@
     run = "0m1lv6in7wdq6rgq5s3952rx5nbgbxkr3mvzd0a9w017af9jv3la";
     doc = "1cs6zygjxny4gria2jp2n46hy2idmrxnsbfvg2f1z9n8y6cimwm1";
   };
-  luatex-cn-77432 = {
-    run = "013nsydc395r0wm8smkdk5qxk3bx33w83y0ks5hil6kx0ixhm7q2";
-    doc = "07ljh4bc58lx9b407vs1kvik90q87lz0a8dmbxd2ync441b883cb";
+  luatex-cn-78200 = {
+    run = "0hzf0wxsjn2r416581b52yqyz4bypkmhkbsj6nv8l58nfph198qx";
+    doc = "06v005s37g8fw25masiaahg4bmp4xnnq2f5c14wq213c0hwl666k";
   };
   luatex-type-definitions-75890 = {
     run = "1z4fw9n813d7dvxwihxvb0s1dlggmvblg677xnfwygzlf3xsn9ac";
     doc = "0v9dny9w820gg5yn21hx7dk4lp5xq481mwa6781za4bk4r4dd8bm";
   };
-  luatex85-41456 = {
+  luatex85-77677 = {
     run = "0ss7c5x0x7sx6lsn1iq6lyyp6w0xb1iy01s1f7zf7mlb9n1yzffi";
     doc = "126y3priwz6anp8sj0296bnxd53lz20nchpxw74zphfpwrv4hzih";
     source = "15bc8g0pgrkqpb8q2dhb6zml2d4jwrripih9898mmalsjixy62x7";
   };
-  luatexbase-52663 = {
+  luatexbase-77677 = {
     run = "1zrwz661gilr4iizcfsxwmfr9dgx7v28lypaslmvp3zaf52zl2q1";
     doc = "118azb2x20gyaj42r5w0749dx8rzhhri1nz3szy9vv64h0fig603";
     source = "0vsg8q5k8l66sy3d0bskr6cv1f95lnhap3b9yl754x7ynv272xcd";
   };
-  luatexja-77538 = {
+  luatexja-78116 = {
     run = "1xw267c6i0dphh5rpq3f7z9xprj3rcvlh2id87gr46shlvfwnyv8";
     doc = "0kv8hk90hcbsjg1fwsdkpg8z6bkvind6s9k5905jz9rgcsin8gi8";
     source = "0z9j0br8a5kmis62hrc96da5pz9swcnmvsa0h4n7iba8r9sq2cj6";
   };
-  luatexko-77490 = {
-    run = "1m4bb5p06lr0xg7xf42hhdkqgllk1dwls1ydgsnjvlzccxcidqbc";
-    doc = "1j1salxy9mp5vas3hp88gyq8j2q6fp02xmwp196i8izlk3d01zf2";
+  luatexko-78013 = {
+    run = "19im1jiry5704ibgx7cgmm4s8xxz6mvg88a925qxgvc3mr9g1k30";
+    doc = "118mal1abma9g5r5992y1gws2ayk3592ix2vmd6qlzxhxb6g7m8v";
   };
-  luatextra-20747 = {
+  luatextra-77677 = {
     run = "1dx2hc1md8csvb37lckxj4987zaldfd73c86y0ni8fzd4zg55s7z";
     doc = "02dl0skcr30hh9wgm7bkdv5zvx3czcdkxv3zdqnasdk0b7r7mqh7";
     source = "1yq5i4v2dxayhfzn1yw987i3zjm6gy4fqckx5kybzh8f6jr9167b";
@@ -11019,7 +11065,7 @@
     run = "1kpp6dilffhn0gsimdbf6bx32j384yjpcwl2khkknvnsfmswciqj";
     doc = "1xd62y2wx65ih39nks7q2zb7qmy4ha373512pn45lzzv11s6qvln";
   };
-  luatodonotes-76032 = {
+  luatodonotes-77677 = {
     run = "19hisbvpln92pfsy1b2bicxpxwj4bc41bcyrzy1dppbxg1vfdf5r";
     doc = "0lkwsg1vr8ywk8027lbrpkvhqj768yj5sj6c9nbav7zr5av44avs";
     source = "0qqvl38b60nj9snmz510wc0rgd4jqa8djf2s10yb5ljv6wydxvy9";
@@ -11028,11 +11074,11 @@
     run = "0pkw1q5jw8id57mcz2sr1mb1lwafara5kzvq3yrkmqp8s9ml5ns4";
     doc = "1i6nplzr640dik1rg668pai86vip0qgsfgizgbd7v4v7sjs24s76";
   };
-  luavlna-76687 = {
+  luavlna-77677 = {
     run = "0ahq2kagz5sm1aypjdw7n882dn222d4wyq7fnpv4yiv3dxgw3qmy";
     doc = "0r47isdmispx4mzgbharax1skhaqvdg92143c0a3lng7wzhpkysi";
   };
-  luaxml-77537 = {
+  luaxml-78116 = {
     run = "1jgsqilpi7j86abi2i0idsrj5hpx67vcv4r4fzcdm37rhpb5rsrw";
     doc = "0wkp4l718vjkz31l8hhr3gi2xh2g8192zss0lgvz4k4bn26cczdl";
   };
@@ -11040,7 +11086,7 @@
     run = "0klp6sblmpzvibjl9j6mpqb9swvg0rl9j966cy89pcgm2laa94k0";
     doc = "1mv1yq7vw3fj8jbn472mkhmlzw69yzfp3xy4xrfq0chjyrf9608b";
   };
-  luciole-76679 = {
+  luciole-77677 = {
     run = "1wfrhl5rici1mnln230jfkmki5akq6db5wr6vashvp07yrx9cri5";
     doc = "0bmr08wxivfqi5lpynv1fcfjjznjlayhdnvvik944s8j9w3sn5bg";
   };
@@ -11048,28 +11094,28 @@
     run = "0m196jgk6g09ch15z74v5vnwvqcklz1gfrb4gndvv72kx003wdrm";
     doc = "185dgh7qaspxac7fr2p2gxfrxkf9n2z87x998ayl3d5gwkw5fwi1";
   };
-  luwa-ul-77260 = {
-    run = "0ps7ijdahxihj38xdj78h91qk9psry4jwiw92jbwwaf34hmzcjgy";
-    doc = "1hjwrm65a0iqn7sj832kfdgf8rpk9hfc978jh3xjy8f6diqa2731";
+  luwa-ul-77595 = {
+    run = "12whrdh3ky8zanhznm7yci4ic1x1b7wr2rch23nnfwgqijpgrwyp";
+    doc = "14w72ij1gl7yf7v7k7kmzpavx6591i83ds5c0i345jmr1qvn4acl";
   };
   luwiantype-73719 = {
     run = "1v42h8iqjlan3hvvw1j0xmci5gjmxhv6s0g0sws45k4cp5lg6cvg";
     doc = "1x3bnynzmki1hbkbs7fxj685x2g7idddlbb512c1d9mxakq9nrnf";
   };
-  lwarp-77064 = {
-    run = "08xydz83m72jy5yxk8rnlva5b36k6r9205w2i6h9alwrrzhp4hmf";
-    doc = "0vj37wirvmyjzbqw3k9h55myfcjd52jz1r4ikibvbb12pw4x5fx1";
-    source = "0g40x8danl5fh402sn9d8mrwv7s2v7cb4fvkfsbxcmwkw21rghq9";
+  lwarp-78120 = {
+    run = "16m8brpjnn791nxx5pifw6c6d5m4vky0hjdsxy21shynxz7kk1wv";
+    doc = "14va65yd4ks190n2zn1gi1wg86m235ndn83gwwacwxvz7rylwpg4";
+    source = "12q18imii1w5scn9vv3nwwph874rl3198gcqd891pxz0wq7n51fq";
   };
-  lxfonts-73728 = {
+  lxfonts-77677 = {
     run = "0cpb0q9wycbhis8bjrvm6fya930mxvxcy3x2md4xq96k3y1ximdx";
     doc = "0y3i916hl0q4zrzvnvycga0ccw5xhdv4cybhcf8v0a7i3a50g2yz";
     source = "0fkb3ah1r3zzlixl99s3kn02w7zvwks3avdcjhp3zc87qc63bmy4";
   };
-  lxgw-fonts-77400 = {
-    run = "1ivimkm36pkan8ba7idcgvhb6b2amymrnpiacwsrn6zx0p13l09g";
-    doc = "18jccddvsh8887331dmdk0m4hlgmrw36ldjw6f3fhnrj5lj569wb";
-    source = "039j1caz5lyzxm6lyl18z7rmizppbr9rbs5ipsglr2nryji9m380";
+  lxgw-fonts-77677 = {
+    run = "1hnhvbv15addkw4dykk9fqdninc4v35s3h04b7d8myykzm094pjc";
+    doc = "1xf21gi75z9xcg92n0432s503zrx6gxbn2kh1rypwsj174cwy895";
+    source = "0q57r3xwxiby2xry0s9c8xvbrwdsy4gnk3vxv8yzkalibdl32laq";
   };
   ly1-63565 = {
     run = "04g9labqzn9c10asy6nn5s6clqq2cnbhps9jf683qx5di1pabgp1";
@@ -11105,11 +11151,11 @@
     run = "117qd3a06lpiqimizj12lxd0vba82lsc211b46ags0mwgrqhcyz9";
     doc = "1m6y9mpsp4w9cnbln8pv1pn86vqj9piki4kg2q2rq5m9q0g57vsd";
   };
-  magaz-24694 = {
+  magaz-77677 = {
     run = "0ah5blj8qfjqgnmygn35r38nj20sjyi6yjci4j9b90d8pz9w7d6n";
     doc = "041cb5rqk5ldvbcqr8w7jnfi4krlc7g72ygq5j7pi9gy04d98mm0";
   };
-  magicnum-52983 = {
+  magicnum-77677 = {
     run = "1bl7lhjk9glvbcn4lqanb3zprqigvxj07f5nm8zn9vpja90fyn6n";
     doc = "1as8l73v9bamajin552xb4xqs08ik8sq22kqdc3psisv4f874kk6";
     source = "1kp0d8wgphbh4mkv1qf9h2c1f2nkzqn9q8fln4v35yx2cay679qs";
@@ -11142,9 +11188,9 @@
     doc = "0c7arj71hn9k3ksa9ryqxh1r30m1dz0rbw2bh3cv1kr3zd9gbpya";
     source = "00k8iqj85vhixnqpy7idh378zxnlyvdpkbg6bwlqrf7cg24mg87i";
   };
-  make4ht-74940 = {
-    run = "1axggpijd9b1bdz2rkr5ad2cpxvs80qsr6ykkx3r9z8xpzhd1fws";
-    doc = "13zwi9yia6dgw1jfjpihh2668r7px8fc4jfasf7rgcapiyhfz5za";
+  make4ht-78152 = {
+    run = "1x0i32bpkjp3rcv53xqyvlg0y683r3njykwl457y4q558gsb6v9g";
+    doc = "1i0ykhlz3c0y0hpmi1cg8fkdfwywy6f4km8lnbzg101lq6zpf8f5";
   };
   makebarcode-15878 = {
     run = "1ixhl4k89mng2dqfc0wa0fq52xpafp15gghnyx28d9j1163wxr7d";
@@ -11155,12 +11201,12 @@
     doc = "1vxwgjk3dj853qbvy2fyqzni2qkkjhslf17xvxskq97w8fcqr13j";
     source = "1f8aliax01b9ir5wzk0bjhqzicl26xa63khx84s9haplh183qk2m";
   };
-  makebox-15878 = {
+  makebox-77677 = {
     run = "1v2xpiabjcgyi1d0ifpvzcll8y01lzs48bs19nalv37jw7hkrr4m";
     doc = "078bz2pism9harcyb9lq8kkrkq984zx2ya47yhpqxnrd85kgcxfb";
     source = "11gjpqmc6dzccv3yc539ki64hzpn8ns0zzjvanw7afbn5bkyrs91";
   };
-  makecell-15878 = {
+  makecell-78116 = {
     run = "0238il37zzshzl3qn50hav3wa6rd25k7rp5l93lb9g7r476sgvrj";
     doc = "0mf4jc9rv66qjnm3ldrpx5lbfw1yfqy0jsvg8d3wdcwvlxpcrvwf";
     source = "1vkfkfgjnhx5byipkrzb202w9jvmnjc2z3zjih6y61yizccwm543";
@@ -11169,7 +11215,7 @@
     run = "17y2hm6p280azgjvskyig34jyj90zngswcgxc7xa2h8pljh1fqka";
     doc = "035l3s20mvy61rnmsxy62k6iid8lxzwhbkyxa1hblfnmya7rs0xf";
   };
-  makecmds-15878 = {
+  makecmds-77677 = {
     run = "1z4m1kg7zy5q8l0a5d0fr7jl46wrw0rbwkxq1d0lm2s13xdn71dm";
     doc = "1hqwvilvx61w47schnchlbgrj5snlp0lahsq5a1g2c1grmzpirnc";
     source = "17c66isk18ch47syhsihj96yzi1jpr84946gck7r8ivpmk3cmmza";
@@ -11177,19 +11223,19 @@
   makecookbook-49311 = {
     doc = "1abzwzsm2jh11qj2qr31bznfc344ynjrdagqayrcgifg4725fa0f";
   };
-  makedtx-46702 = {
-    run = "0yir2j268vdaa44flps15l739ngv97lws6n6yk3w4pz4jn5gylyd";
-    doc = "02ir7wf6v6znly9c36z8k0djrzpkd74ssphkggmp8fj338fk41cj";
-    source = "0jwdsfx2l8sz8y90bz3gfi51vswyzmwdvfmnlaa2gplhcjjbv4yy";
+  makedtx-77894 = {
+    run = "0w8rj2skvca9lpm5qa226zzik78ivad697f9zyf2dlxs7510yf65";
+    doc = "0c0xqi8pj0bsbv51cjz52n8kw9ywi3b6ma8fkvrnw8inpakrfmhk";
+    source = "1z3245q31brxws1jjwvbds3syhyxbv5mcql7812vasz1a8fk2rr9";
   };
   makeglos-15878 = {
     run = "0jp0207q1p0znw1w86g6m8ifkpgh3hi1yhkzq117kwl5ybswq8w9";
     doc = "18zl45jdpsvvldxvfx79ijldh3g03acw254m6i8a3dxgxj2p76hb";
   };
-  makegobbler-77564 = {
-    run = "0gd8q3wyfsff8hb9lkg1lfpahp3xqiym2lgmi7b9rdkhypnafz1v";
-    doc = "0qzqiqcshdqlbgk7k6kxhk4pz5nyc84z47zpwwknc8palz8akn8b";
-    source = "0palfajk1wx9k8hqlrw2jl4lj2ycgnm83hhsi0qb6bx8c5plaqqf";
+  makegobbler-78194 = {
+    run = "0pfmcskz0n6zh7gr84xl7dhmx1fy9sdi567jxndvb2f4wjm04r96";
+    doc = "1hikpilgd77rgx3qjgzbzgfwps8r1qay2kij6srbsi039c736869";
+    source = "15jy4khyaj6zjidvs25pgsxdxl6b2cl1rsysmdnkzjm25lfv3ddk";
   };
   makeindex-75712 = {
     run = "0lpqnw6nr19p08pf52rcx1xvvsywkpf1rqrkjdsgrv55d1afsd36";
@@ -11209,7 +11255,7 @@
     run = "1fymg22y0w2kghmqh5pgxkrncdcbbmhhxappc72g5q337hcky0xa";
     doc = "1yz72c1ghqjs06nagngpp2q62gh67c3klwm73bcbc090vdfkw7mf";
   };
-  makerobust-52811 = {
+  makerobust-78116 = {
     run = "0nm751w11p7cqg8ihckn338i6908kcn513644c6a1qc9rg847hlp";
     doc = "0bidk4f0q6486vgwqvifzchkn0xi1l9j65yqwgcdnl3yg6vamqzw";
   };
@@ -11223,7 +11269,7 @@
     doc = "0cvk0sx0dy4pnyh8r8rz83v95jkjx141kxmspkdyy9nxf9jixn6c";
     source = "0nz6nmlrgwj99qsshcblx4rjb64gwdn4anjp85gvk5hc07vf2q9b";
   };
-  manfnt-54684 = {
+  manfnt-77677 = {
     run = "1fzfcvifh013xs6dm6xq2gpvmf3v0qn8scrbjj3yak2ba98bcy18";
     doc = "15rs74sfnyq2k27bs3dvjiachwamima3q4vp0dp0ic95as2n61gp";
     source = "1v3j47xa7k66dadz8dyy9gm3k4s6465zgqpzb320isjpb77p7r48";
@@ -11245,7 +11291,7 @@
     doc = "0ybafny55hvpv4kia7jybybjn4vq8f2g7h770xzq2b1mimyn7dkc";
     source = "1ja8kbhsbhkcm0ig6954l6k5absdfppikzwawifp33dwpjkk6w0h";
   };
-  marcellus-64451 = {
+  marcellus-77677 = {
     run = "13blr2k1vk0kwac3chplddaplsjacablkky68yq0wccdrxhbxvdr";
     doc = "0sgcjmkgailx7nvav1gs370ywi61ysmm1snz1f976ppdbmhh1v3s";
   };
@@ -11259,17 +11305,17 @@
     doc = "0nid2c44sq30i8m3qk115vvfswffssnvp1iik90pkhfyb24wvjqa";
     source = "1gx4dfwa02k32rm82fwwh6qigfvyfgf9j1lcjk4bv92q6yah9f7d";
   };
-  marginfit-48281 = {
+  marginfit-77677 = {
     run = "0x8ias8bv1zaavin929782cjvp7aw94r18lqvv10v3vgq20n7kjw";
     doc = "1cj1fidjvvhhzn9fxbvyh75dfb78wxi83bdxnwbpc6rf3ax5bl03";
     source = "0rrn2lrqg3a1yz6l88qkh8sljr18p1wx1vxyrzg04pzj21lw8kkh";
   };
-  marginfix-55064 = {
+  marginfix-77677 = {
     run = "0arldbc20d1sncwanx3szam53yv1d5wxgihj8lm4jmda1858bmgy";
     doc = "0kk9cghi0y1zfk6ya3pfs08npdy7v95i4db5a89v2177cd6z7a78";
     source = "1k1384nxhiywlvyndnvhj6a35q433ddc019ckf8al2b1ngg13y0w";
   };
-  marginnote-77271 = {
+  marginnote-77677 = {
     run = "04qz8kbqfbzmbar963i5vixahzi2wwghk2knps27a6z4i1ayqhdq";
     doc = "1q85y3a34k92j85fggfhnccspx5qw59k21bmi75jsmc5swk29zzy";
     source = "028ll3hpbzybaayphyckp4msm9w3mvs08lr5rvga6ihss97hg8cm";
@@ -11283,7 +11329,7 @@
     doc = "1i12c7d73c0qi6a51xn1a25qfdyvb1i4ck28am14hjlv97vwpf7q";
     source = "167ypkqlabifbxh35zsyqzv5f4pf4mgrcwz15xk8fpjk86mk2xy8";
   };
-  marvosym-29349 = {
+  marvosym-77677 = {
     run = "14i2alqxpz0imgdlx03gyg2nn56wrhlc0rziyx93h4ya9nz6xzbl";
     doc = "0qyfyz8qfcchnf78r71fp5p16hmsrq6xf54g5mnwjb4p5ipbd9np";
     source = "0vbiq807pazw2c1ck799w8sy3q8wcpb6smmq5qqw4nqcxzwsxk78";
@@ -11314,7 +11360,7 @@
     doc = "1hnk7bm1yv4gib4kb7m35hr4yjrl4kaxcz66msvcsq2mrnkp7qd6";
     source = "1adz7shd8i9rfrczd8kchh0xchafsnl3wsv4db3c508nwak79wdk";
   };
-  mathabx-15878 = {
+  mathabx-77677 = {
     run = "0x0amwdxr6mh6j1m1q6wawljzjf1683xp1fxfqyxmsk0spx032mn";
     doc = "107fimmxvfmdjdi1rlk0h0m88q1dbc9q1qwqhx1fwfjwdn62kvsi";
   };
@@ -11326,11 +11372,11 @@
     run = "1kdhfdki7bsvwlxbybilklrhlpw2niqx4i1bini2jr8wrmzsimmg";
     doc = "1znmyhshc8cf6p00paa2s68v3vkfqpb0998hq6p286nm1ygkd1ss";
   };
-  mathalpha-73505 = {
+  mathalpha-77677 = {
     run = "14qi0ida4x0diajh8ynwifg53n92s05gpd2dh1ardirm6nndw38c";
     doc = "15zzpi0hagi0cwh9sid4acllxd0j70ri4w9818gd58irsfiwwqv1";
   };
-  mathastext-75447 = {
+  mathastext-77677 = {
     run = "1bkdwyfmsv34m58rgncz45vkr7sdjq56bl3nwyn62ic02ym83sn0";
     doc = "15spad734n0c97bv77haxhah1i27abkfc0fvmwsypxv7xr1bjff7";
     source = "0rpv6azh1676qg2f415wpmli6x9v49qw9crh2aqi3s7dvgmnic85";
@@ -11349,7 +11395,7 @@
     run = "0jd7xfwavfn4dsss35splcxrqj6qwk18jw7qgkwshpifp7m79l2v";
     doc = "02fsi2hinjfcf4pb0r1d0r82s50734srpkk0i9c566zx3m52v2vf";
   };
-  mathdots-34301 = {
+  mathdots-77677 = {
     run = "1wbxvraw5lp77chgzslrrz022zgqn2fhmzk85cn7ggafip1hr9s1";
     doc = "1ldl9l92y893dg2ksqn6n82w43a2l8pylz3iq4glcphalhggydcb";
     source = "0dkpj8cychzl7gg4bp41qqi3y50x0dyz2pxanfli4a2anh2dy06q";
@@ -11368,10 +11414,10 @@
     doc = "01s81z5zk4dylmki6c95nzv8p38hmn10nqcx5g7hahr8kkg1yryc";
     source = "0xip7hpjppkihk0fh92wngnpnfnmsp0hla35f088f3cl5cghyack";
   };
-  mathfont-77458 = {
-    run = "1qjr2awrz1v8njq9k9l9sh5vb6h8dj22f6j0f063j1na35ganw29";
-    doc = "13z7ah1jm47dkgazq27cz2z9bc4r50j6y39s4v5wmhq00f1mfikd";
-    source = "1znyqqxb2lr3ww1xv5w7q9hc5yl9i5kzg26bavcs0n0w4vl0h48f";
+  mathfont-77677 = {
+    run = "0jn19iksvn3ng8crdw9fw9m21q6rf6vf5g8rybyvw6h0q58x9v0y";
+    doc = "1vlnxqpblkj2mbyc71nkn3j9xw6mbgb6dby1qmcg3lsk8mhgy20d";
+    source = "1c5piyyciia6kzb7hl5blvp58k2rzn053p8difggqb939z8rzz4f";
   };
   mathgreeks-71248 = {
     run = "0407xgzx5wrc1iqw0wpxicyispbx8c33mlfp9clqxvhsdsia416z";
@@ -11381,12 +11427,12 @@
   mathlig-54244 = {
     run = "0pyaqwr2h9knxf1axi55vm6wr9xj15d5j5pagb2011k3b830f91b";
   };
-  mathpartir-76924 = {
+  mathpartir-77677 = {
     run = "1a934cglbiahnmqxjg2695rmp8fxlg3m19zka8ayc743ckv92prd";
     doc = "1aw9sbhgca7hnshkd2vyzf5lrq2xql25mwp9qyishkzq9ayv7p13";
     source = "0bn3zragwja3hh32fbrsdsswlf07a8i6qrpnv2c1c47m86xk3764";
   };
-  mathpazo-52663 = {
+  mathpazo-77677 = {
     run = "05j5qgq8fralghp5wkx6bha1cm59vha29ppq96nllq2k2nqhpi3d";
     doc = "1z76cb473nb6r0vjjxjwiymnk9wsf7pnycc3ad3ba4vd3yl1827g";
     source = "0lmyc1q7jswlhlzz4fd6ia407jj4pzi7wvmrcgfyw20j2nghfcgp";
@@ -11402,7 +11448,7 @@
     run = "0vw14g42f9jhnb4k75qlighsngdl9kkwp921iblafs39zlx0fh7w";
     doc = "1lkm8gysyim4kjggwm1dqc9158agxng3nd9kdksyxlna89xrgq96";
   };
-  mathspec-42773 = {
+  mathspec-77677 = {
     run = "0gspy6kjnx7bs5dxap8ym8s0k9i8hczi6s4s97y7av7vc8j1fb5w";
     doc = "07mmfcd0fvhrhafsfk4sb4dvs5x8x1rjk1a2xl20kwpfpp8l1rb6";
   };
@@ -11410,7 +11456,7 @@
     run = "104vf0cbxhfbgabxjpypyx16fbpyi05k14dhw5ynmlh4rv3ck7li";
     doc = "10j7z7yb5fjqlldf8w5sm5kic6v842dijd7f4v0b2q5h1gbhwyim";
   };
-  mathtools-72487 = {
+  mathtools-77677 = {
     run = "0hqnsnm4vnznvnbxq4xqaqjwx16v6iqwnmf63dih4h42149nb3zp";
     doc = "0bmcx8iz2xc7w5za8dhpzzkqhkq6py5cvpzqh99wza4fmycx0dp7";
     source = "0ndmf9i3aqh8hzymx2nd49asp15dpaqy1k9nkpqw1bv24636hm9f";
@@ -11424,7 +11470,7 @@
     run = "1ihjvzsxaj5282xc15a4fw6cqj159m9hpj4hblfmjgjra5p597gs";
     doc = "0109ify7qqbdrgrw0a8svdaqk1amm0njvawgh1ch8z7qszlpg4c4";
   };
-  mattens-62326 = {
+  mattens-77677 = {
     run = "1az5ld75djha5949bl1wiqbm5mzff77cvcyyk11qjvg7pjwa3h1z";
     doc = "0mqsr5a2bhgrllvcqp03aacvsp7wymqnvsk1zswwscsrjl9dh5ka";
     source = "15ww1gl01yfaw7gcm66z8zd2yhhnj15pw53crj6ma6j94akn1zff";
@@ -11437,7 +11483,7 @@
     run = "139hjw2asv21p0m7qrpi5liikgf68kmk9v214njh107gi3cjl59w";
     doc = "0h1lcq6xipzsw15cycraqjf4vckzqprv7kccls640y4jd38g3g4d";
   };
-  mcaption-15878 = {
+  mcaption-77677 = {
     run = "0bfcl1swwgz83y4f80a1kydmxhdyqxld0d5cjfgxfhnn9dxp3wc9";
     doc = "1afldwg6dghvkwd8gik8dmag4g2pb6ag3aks26qi0ygph05j9cwz";
     source = "0i6sd9vm1pn9h570am4lkr2br81bhmqqwwvymb8r37xpmmp9yvsk";
@@ -11454,12 +11500,12 @@
     run = "13fk8dwx9gjagwhrviib32dr1h4is5asa96wn25ljzwj60iixf02";
     doc = "1gvq4d97mdkbaivym07l4haz67p7izkfc47v9s7arrn8h49vfqcj";
   };
-  mcite-18173 = {
+  mcite-77677 = {
     run = "18did9achsp32k7wq4q75a9q43jxdm8k40q41j242gndnkn8axw1";
     doc = "1gdsa91a4snk3f22mh06mr811b1kb0vpi30ss84d3mrnsvd1p0ha";
     source = "0q1bv5nx9xf6r1fvgnxb1x720dm0xqrqg3kya0504q8qb0kgxqfj";
   };
-  mciteplus-31648 = {
+  mciteplus-77677 = {
     run = "0xbk5zrd9mbk4xid03j7a0c96s311rb1vjawhvk5waqw9y6dn476";
     doc = "15aldir7viryb2f8vi0a83vgbdwbp5gcdg0slhp6j6ka6xv7ayhs";
   };
@@ -11468,7 +11514,7 @@
     doc = "1mzfhkpahw0gc1q3b9yr4p4ya82y0y57ij3n12i1sqk7h4m3m1vq";
     source = "1g7i751plyf1v4561z827xkk586zn8f364xapcfvky54lyw7v9ny";
   };
-  mdframed-31075 = {
+  mdframed-77677 = {
     run = "073gcxy2s8mskf4mvvs1jr8fkijci1ayg0b5r5xzcjw0s5azny1m";
     doc = "0m8k7h5c0h1fdrpdf2a4vhgr8saqspk81c0cdjm2cmbsfm8zlc3s";
     source = "0p96sl69p5342yy9fgw5cnkfi2xabdwb74mw7i1gbxvj0vx1f2q6";
@@ -11477,7 +11523,7 @@
     run = "1ihwhdcmk3gd081yn4wimg7yadvxkygybr3bypqrvllwa92lay3j";
     doc = "1hsd74svpxxmjps3fng679hq7dm35mz9glcwwhk1carzafmm2ppm";
   };
-  mdsymbol-28399 = {
+  mdsymbol-77677 = {
     run = "1rckczggrdd977n7dr223zfvp7dl683p7d6wfija8ln4d1ll3lz8";
     doc = "0v8d92kpka138yzy4a8hg5yf6zrz267hhsakpm2f0bamdzqkp4kc";
     source = "0xh9d4xpdyacmb3kxmqh71qfx0b5qbrgxrw3fj2nh2rzh35smsy8";
@@ -11528,7 +11574,7 @@
     run = "0h3n1bnvyxr0ylg05fm819lzhzd7kbip5p5mr9kc5af8pd6yci9k";
     doc = "04zwmw6varldbg5cxzk4bv8mbh80i9gdysfxpn1i4xb1la38b0bf";
   };
-  memoir-76756 = {
+  memoir-77677 = {
     run = "0435jhgbmi74a9vwbv70w0sknqdq94f3i6aj63j224249s8zk2wg";
     doc = "16jnd61rwgqckwzsbx2cd5zqwqqzzpl4ic13hpwg5m8x0jb63d2g";
     source = "16rzyf1c18ak0wbl59avk5q1mnc5yrmc8qafgxpgzx19z4s0mbhc";
@@ -11541,6 +11587,11 @@
     doc = "0lw00d33nv1hrjqllnx1qkwwk8v4qpc71vgw7mdj62jaw44alaq3";
     source = "09229j002qyrv3hsmd0m6j0k03l9pvydi72rrhjw704bl1fs1bkb";
   };
+  memoize-ext-78222 = {
+    run = "1n6f110j3xsbnm1xlj71izra72hhi8pdvgyd0kchsxdvs0ps5d91";
+    doc = "16a6b6xax8fw3182df6r80y4p65bnhx09max3l4xp7am2yl6cw5i";
+    source = "0crlskdk39kdwq27p577k5lwm7g2w8z5ahp6xkyw9j7rff7vgdpd";
+  };
   memory-30452 = {
     run = "1zgfjz995jbji8hycizbp614dn0g13rimh9csgrga86f1ivgcpmx";
     doc = "164nnsi25jk25p3kh54w2l8zk0rri50p0s9g4r5f50c3wzxi1g4h";
@@ -11574,16 +11625,16 @@
     doc = "0sbgrk1l2b9mdhiymwvp6zci4nb86rn2r06chdbhgy9lzija4wdv";
     source = "1pg4c26pij7p218a0r6mcwbmnsgdj7i63z8z7gq71i8jqpfcmlrg";
   };
-  menukeys-64314 = {
+  menukeys-77677 = {
     run = "0039xx0qilmji8ch0i488hx5rnhf1brk6n5k0c7vg7jjs4xylq7v";
     doc = "0a6fnclh6gd1n0f11dg23gykhsr399qmplq3a43wqqgichsn2k2l";
     source = "1na3y08blykp1bs4bqrjx1lmmbiykfly00n5in8x6h0282q031i6";
   };
-  mercatormap-76924 = {
-    run = "0bcnnnz6xdh2hshzfsfqiy49wmiyamj4mai5hz49kjmr83776s2m";
-    doc = "1723qid37md5msv0ig7kkzl3mfwmqw60c1c7q9sjx32jzqr1b64v";
+  mercatormap-77984 = {
+    run = "0jjwcxr5s4fs6blx7wrpmjkbjq2rpdxwbmjnkjk152c56fgm1dqr";
+    doc = "1nzgpa29q0r5rw8l4d9fxgfpc6x2fndw3ywl77l3a8w46hb5yq9c";
   };
-  merriweather-75301 = {
+  merriweather-77677 = {
     run = "00sy3iyqigbmjz7v6lf47f88mpjwgkbhrnp59x9xpaqwming9fp7";
     doc = "0z3k1w905vlawv5lrmc55q637bfz17cjndlk4gh868gqv5j288v5";
   };
@@ -11592,6 +11643,10 @@
     doc = "0vicxdrd51gmk8627k7a1n83ldj0kgrzaxmwmg5y99n619pagxr3";
     source = "1im9h7n2dpqdc8hlwf65m4ss8y9k28iaw29nf0pnlh6qabzqgl7x";
   };
+  metacapture-77822 = {
+    run = "093ij5q3gzahs91rhv8fxlvydjz4i7xisg569q9aqm7ilni9i8ah";
+    doc = "0q3iiv1rnzalzxyxr4741ic6164af0lbs19hqx25afx8wlnzdzfm";
+  };
   metafont-73848 = {
     run = "1kw37drhnk7qajmivvjwdrh5awns571wclv8b354zk71axf6cr35";
     doc = "1z40vkg7vr16k3mr3hidh0k8nlfv4la7j48h7wrbj399r9hxlhkr";
@@ -11599,16 +11654,16 @@
   metafont-beginners-29803 = {
     doc = "12hhvlnvh8dj1396242m6yi0341cina7sxrv7pwzqxzzahwdvmgm";
   };
-  metago-15878 = {
+  metago-78116 = {
     run = "0km18bf69rf3rs42b0azc7i8bypy14201vk13yf5ahsypcjcgqns";
     doc = "1bx240q75pq9v23gz82i26vrp7z4cb00f9nb3cvvknbndk8y7hy2";
   };
-  metalogo-18611 = {
+  metalogo-77677 = {
     run = "03crm3sswv7mz5akghqvkq1zpiy9jdpy32ivwwmf14sfrrri2cz7";
     doc = "08vgbmjhynb4ramaj68i27hpgijg51j80lm0qf1jrfpapz7lrzij";
     source = "1ak8qbcbqgirljfwhq7ylxk1w2frxfkjvadjq00cclj007idr3x8";
   };
-  metalogox-73571 = {
+  metalogox-77677 = {
     run = "1a0bm3w75mmjm7zmqf97qs1zibrxhgllfh1gpdqpykwqphm451my";
     doc = "15hkprc5grdvz2chh1garmdp138lc67qa12zpdf9k0jkzcl7d502";
     source = "09bmjci70bdk7r2v51pivhs5xia24y3b94vknas5j462mippaj2n";
@@ -11681,16 +11736,16 @@
     run = "0baknvpv4a3z7yhx2n453cg2fvxjz95dhbrxn6afr0fqp50h24sv";
     doc = "068rmzwcrz53w66a0vqb9bwsfdqxyqjc2rc4r9kfdjd09iv6anw7";
   };
-  mfb-oldstyle-71982 = {
+  mfb-oldstyle-77677 = {
     run = "0aycq72l545bj0vfxjqq6vqkr04b7a990rl85gg32z4yy1ldxk0g";
     doc = "0vssqh43rfdb93m3i0ij0yhd2c5j6803r64bfkvyfsmsd2f2silf";
   };
-  mfirstuc-74838 = {
+  mfirstuc-77677 = {
     run = "07pa2wdkcwspj2x0gbsl54wm1ljffdj4iij2qvir5lnbnwydl9n1";
     doc = "0bk2fhr46782l9gnwxk0gw057d77c9c9qdj3d5my780921l932l2";
     source = "1z77wm704qzkcqwhiqmwzzxs6pkgnf72vq9bwmmwmpzx6nzpjhwj";
   };
-  mflogo-42428 = {
+  mflogo-77677 = {
     run = "0swy70pm0pyqzy1i5wf5hc6cbzn91ihw8hwh9kavdfawb4qzjxxw";
     doc = "1xqk3nwpi3drkzrnr172i660yx541lxxw3wps0jqbqficqn4fiw4";
     source = "145hmbxr5x5pj2whra9yify9lyx0ak1az31gvwr3gp5klcmna8p0";
@@ -11703,7 +11758,7 @@
     run = "0ngbhdh8hgpjfqnrjlnp27x3qziks3yf2zp1qq7r4bjfa5jx9gr6";
     doc = "0f15nmvnayfi1sm5p6pvqd258b153p7rib298lbag1an88wjq03s";
   };
-  mfnfss-46036 = {
+  mfnfss-77677 = {
     run = "1m0yza8nw5r3ph8k5nihgf93vf54cb0cnw4c5gkqy0rsd23hk4dd";
     doc = "1ppjjma5dc5i9ly5y7h91647nw9c2y9w65k0dn1ks92xsvnzf1mv";
     source = "0qjz8dz76abwqspab89z3a50nndh6gflanr8hn31z5fra3kzfp90";
@@ -11723,7 +11778,7 @@
     doc = "0yxpbp501d6vwsxpm83zjhypvz3xz51f91q414zxjvsy1cvvprr1";
     source = "1zamx3658d8vaik5w30hvia5y0hp119vhvqhj4h5kkwnwmz8hs45";
   };
-  mfware-76790 = {
+  mfware-77677 = {
     run = "0kcz1gy17819w77sf0l9m5f6rw8dcapkdbvwaknnrmy50v0jfs1n";
     doc = "0qs3hpydp332j3x4hrkqijdx6c8qvq3p4nwbdihvi8kvhdvcbhnv";
   };
@@ -11745,15 +11800,15 @@
     doc = "1byfb723572whq315zwybwm1bcvcn49km80gn5bi081gy81r75hw";
     source = "12xrddxlrngjnk0yk35spk886yd9p3nnz6jrp51dfzw1xz6pkivr";
   };
-  miama-73481 = {
+  miama-77677 = {
     run = "132ryciiqrjc0kxkx9hm4wblrbnf6v17lwx35jmzkpxhmw7rljb3";
     doc = "14ar5fr392lnbcsdf433n74sfnm2yzply7a0yawyninjwfi2l67z";
     source = "0nd06fky39j5prhj76nzsv4s4crvjkbzvpz78qphgxqi8shxh1ky";
   };
-  microtype-75729 = {
-    run = "1diw2rmgnc6svhla3kh8m5fxnkmp1dhqjw1lywrs18ibfcvrwngw";
-    doc = "1w4lrh675wpx75ya30fgz5aqbbwrj64dmh4pj5kph02s5djasr8l";
-    source = "0iqfiis8viaw0m5bgz0258pxil81fbmbs62qnys9z4s700mpplk9";
+  microtype-78231 = {
+    run = "1qbp1w62mapvzlmsk47s2s2zc2l7nlxzqj3vhaii8rprqvw3yvgl";
+    doc = "0www86364c99m5savvhrzkdm2my3ak22yc8dcy5rmljav6nbnjnq";
+    source = "1ib38xjxxl3lha46g536bv3ycnkic58b94gc7f9mlcp4kym05ck9";
   };
   microtype-de-54080 = {
     doc = "069d2f0jcg9m4fv8dli2dr9ags9gz6mkwy6fzz37ns4jzrqfsvwi";
@@ -11762,10 +11817,15 @@
     run = "05hzxlzr19snz16sddzpyh5f7vvs6jcdsqyqvqga17rr8y04sdwz";
     doc = "1ky8k2ys88n6hn2q9v9gr71g772gm5zvxlbzmibvajq0hhqm41l8";
   };
-  midpage-17484 = {
+  midpage-77677 = {
     run = "0hh4r2sgdgzm0nryzqymd66a7hr74rvcsn58y7dc7di6mhikrysn";
     doc = "0jfw5wd6qbxhf90mpi8fmv0nbazkbg9h65z91613j1ynqqf0087y";
   };
+  milestonetimeline-78179 = {
+    run = "1i1h7j7xvzjhjmd6j4dgz9hidb89rnlxdq36svfcirykz421hid1";
+    doc = "15cirvlpzwc09al3x5dfv1vnjbxhm2jw28pjczrl4s6628d1pz49";
+    source = "1x54rw2364xl9wzkzzxjc2amyac8blnrc3k8inslhacna89j5gls";
+  };
   miller-18789 = {
     run = "1nk31l9g231c3dk70fqph444z9x5rdjy6g7wazy4ygl3q4gfh6fj";
     doc = "1vvxnbbjn325y9s5h7qp6v2z1xy6wwppwqv6iwdak7mf47gww2gf";
@@ -11775,7 +11835,7 @@
     run = "0v5rxsa182n28dzd3l3y4qdsz6rinv3r6p94iy73r26j7jgsqd5d";
     doc = "04z8ya5gba7f5q86ch57zqbiz81s62hpdbn7b8jmkyy953g5l8vb";
   };
-  milsymb-77463 = {
+  milsymb-78222 = {
     run = "0m2rgn3am1idrpmjply52v2s8frxgbdr80gxiy69fdk2psqh6lcf";
     doc = "0cvy530713p15r8kd8rb34rvmryk5mkz7f519b9jzgl2i5kcsadx";
   };
@@ -11784,7 +11844,7 @@
     doc = "13qpcy8bwywvn0yv8qsi1wmwzlhw3yawg5dnb97mkj607cj7bzhz";
     source = "02amv0fn4jk7k4x7ammi1n5y8c7b18hjs93mm6zs1pxsvxzc0j6f";
   };
-  minibox-30914 = {
+  minibox-77677 = {
     run = "0r94l5sy4n97p895xk33ir3dli1ngy3p67w2d3i7f6hi6czvykm2";
     doc = "0bzd55wkdxw8spw4706nj0sk478zbnvq9cnkpid638cwb6csb21c";
     source = "1dm8p6rjivm0xxa7px5dvsnrqs48zwn2kiq3vr6gdqmiy0ld1v93";
@@ -11815,7 +11875,7 @@
     run = "19hgfv4ww13zrav3i2vk0qvhdzhdq51chdmdq04prc0yfwr0r7pd";
     doc = "168g34n5xhs1nnn7hgqwz130ky8fdrwr38ldpxnvzh88kz4hfrqy";
   };
-  minim-pdf-74207 = {
+  minim-pdf-77677 = {
     run = "0r057wzsjy6p3r3hfv8wkac2y70mki20y187dxbd60yaygxx1ijy";
     doc = "0rd3x2ck86nknq76xk8qh9vysfymmanksjsb09l5hl6ikrh30z3p";
   };
@@ -11823,9 +11883,9 @@
     run = "0jin8mwkgl6wkl0yr72vdafk07r53arakaqqswa661v1k83znya3";
     doc = "0i1an0xcfbxhqa7njyqg0ax3nzrz6xrq6kpmf47l1wyxrbby5dsb";
   };
-  minimalist-76924 = {
-    run = "05874cpbkmnl855xpbwcqnnjff7h2xl6r5x0jrswyh0icp9kfdd4";
-    doc = "154pcbg1nq17wwlff0kpysj1i0xpy58v97bymx7i4hcq71dszfjd";
+  minimalist-78012 = {
+    run = "16pyn3gjb9s4fw4p79q1g231ksgdr53yddq46nr313jd9xjbl34w";
+    doc = "11iy2c22q681hymzjxmiz38lpmqpjs4r7wy62n5wy3wf9g0fzvb2";
   };
   minipage-marginpar-15878 = {
     run = "1qpymibkrwdbyf2rlvfjj0g8agxisd2ym3xi7lzx3g953g5whg5r";
@@ -11836,7 +11896,7 @@
     run = "1hl5nd6p9c1xhm1kpw9sh1s81ymdy8lxfn7wh1sdvildcvclvd4q";
     doc = "068s76gnva6rsnd7gfwswxfam56dbiw9s9ymqr2hcqx7i4dl87x4";
   };
-  minitoc-61719 = {
+  minitoc-77677 = {
     run = "0v80ga66rg4cgifmyfa5vq52v5wz48lj4js0ym9197x2w98ra6ry";
     doc = "07dah8lz54ccvrgigrvgcmbj76ppxaismbllfwyxcgkrkvqzxqkj";
   };
@@ -11844,7 +11904,7 @@
     run = "1mcgql832xmgpcwha6l0d282mhyva6xmyf75gbb6inwbgg6qkv9m";
     doc = "0x9lw8xzmnn015n9hyzajnl9gicafj06gr2msk6vxwk136ayqfiy";
   };
-  minted-75223 = {
+  minted-77677 = {
     run = "1fgnn18znd4ll7z3h1vy87qdzaa8krrdaiyvb6i2284yx1yj0q5y";
     doc = "16sicsid8fpgyvdw9jp2bv85gqgfs0pr03mwzsyrxjljbaidkcwp";
     source = "0f3siiladbj1mj2qr1siyia06qpzbgf57bhx6c39byvqyi54rmhp";
@@ -11853,7 +11913,7 @@
     run = "0fr5vk322rwm23243cgyrs4wd49mklbaykww2k0i4laqgc7fhzpj";
     doc = "0kwvaizbbpszfc7jwsgvxgrch4lwijmrah2dk9dr3rgc424k704d";
   };
-  mintspirit-64461 = {
+  mintspirit-77677 = {
     run = "19jvqcydiwwq3kv5bq6524wsynj52b8mqm3j3wn108z7rhnampg5";
     doc = "0mwrnf6q3h82qnxk9gy9ns12k9lr61z92vmlyx2x745i8ra7b551";
   };
@@ -11871,7 +11931,7 @@
     run = "13y2dm6phd9c77j3rajvz4qma2h2k4nwhb520j3mm98bgmbkphf7";
     doc = "16487s0ijkk6va22rhhyhxdqik863n1i25p0f67gcb8xp1s5l1wk";
   };
-  mitthesis-77563 = {
+  mitthesis-77677 = {
     run = "1icia7ijs9jljkzkdh1x2jkz6hm7h7ipaqmdpf4gbd4v5vy9yczk";
     doc = "1sj1h3jp55iy65cb0gndphbl2523gpkky1qncskwc246zwrpm532";
   };
@@ -11905,17 +11965,17 @@
     run = "188kwakrn0ca1njpkgyq6z1x97ky8imxqgpyy9axcsm2wmzhmf4v";
     doc = "0h1302wyl24ilvba68f8pjwhndmqn9n0h3nxr5ifhk01m8359nr1";
   };
-  mleftright-53021 = {
+  mleftright-77677 = {
     run = "14lvlhhjj50v31lgf7ywk5dx7d5gbnivssl15qzpa6s619q2h6l7";
     doc = "13vvfx4wxvf5liv641lwdm3hdba31rfrwsmirl36qwbrqsrl8xic";
     source = "004ficd5chakwcklbdx83qp3985s1imlz5knc7f3m51zxgr4lmw5";
   };
-  mlist-15878 = {
+  mlist-77677 = {
     run = "044pjvbyabzqashbzag37ymqa9mr0c1qg3p7rb1j91r0y5s8ra8d";
     doc = "1vlxzzg6f3jmcmp8fjn58gciywc2qgw9v1kxpm7qr3vlv40pdb13";
     source = "0jim2g5qc9cdks4r3yi67hhszx3kkh26hhc0zgm2kx9syhdjv057";
   };
-  mlmodern-57458 = {
+  mlmodern-77677 = {
     run = "16f5cpczawzx4p44svpzy205l9m9g06w8r0554cgdpqdbwr139fx";
     doc = "1rqb0g16wj7jg65xm0rk68cfz9r00zwy4r73wbkn0fqrchg08yn8";
   };
@@ -11928,7 +11988,7 @@
     doc = "0xcifm779nln96bmx0kvkmnzc9yk2314yc6nn98wm7gqdw2bf21s";
     source = "0mq8fa0vd762q2h981mj6is4d5vry2qgggbbmffvmfb4h76z5gh2";
   };
-  mmap-15878 = {
+  mmap-77677 = {
     run = "19hnkczxhxcr7pa7880mfgjfhjwiyl2yxhfz67dsrljqsfpi19nl";
     doc = "1f861w6clfn3k8gc6piil6bq6admbyr4kxqnkw8hh29s63rdn76j";
   };
@@ -11966,9 +12026,9 @@
     run = "1qc422hbqiyy6b539r7kyrshcja58mifdvs3bva1ikdxanxhnaq1";
     doc = "1z9b3fanm97c3ik1q6v06qfwrgqcqwyi79h5dlhcnpwsm5dxqj0s";
   };
-  modernruler-77481 = {
-    run = "0lr1h289y1p3wbmpank8sr64k5igggq85xmlkk0z40b8lgkqj6qh";
-    doc = "1m6nplwayx2j1gvx46zz68b8j4n12nz5x05vmxclm0dhfya7rcq6";
+  modernruler-77700 = {
+    run = "1akjyw5i0838azxmb05qwdgx96v8yg451hjwnfis7x7g1kbb45d5";
+    doc = "1mcmkgjxa7a73kiw4gwzgx8yh80gmdk53fzdv3v9mprkg4f5nff5";
   };
   moderntimeline-55518 = {
     run = "10alhs944akmqfslqzi09436mmnjz8nm85r8jpjwpfcx28vfdwnh";
@@ -12006,12 +12066,12 @@
     run = "05z4pygj3qx26x4gnc4gl7fvs0lx5k0i48495ixwy5j1yl5q9c8y";
     doc = "0l7r4imyy0zx92dyj9m6sg1h5ccvvdj0yf83hvax04hv0823vhk1";
   };
-  moloch-77137 = {
-    run = "1a6bkcs5591z35fraa4439wb9fg1bcr0iapwiig77q2vpys4c5x1";
-    doc = "0l2pd2r5gakfrajgsihj3n0dm6jba0swv53nfrw18jz0s8xwq2mm";
-    source = "1rix96vr3l434b00yfg6449mfvg5hr6qby3qr0a5ijm9672pn007";
+  moloch-77922 = {
+    run = "0cgcyklfcl9chd14qpmhh0l180zq82sr17gvqb2n45yj22l5j4kv";
+    doc = "13dia5y4ddgylqdjvkgn9qj7zm8vmq7jagb5vjan067sj3899idk";
+    source = "0bbg73ffl1a031smzyvpqh72vfbl5anmj5p2kkdhv8plp2ya21my";
   };
-  monaspace-otf-77006 = {
+  monaspace-otf-77677 = {
     run = "0c7kfm3w6wl9l0g69i6g7bspvgy39n7nv8s58g3fkqjh0g1mn02j";
     doc = "0hxjim5r5gmbzizpmvw6f4fcxhdn24gmkyssv3ibbaapfr7kka83";
   };
@@ -12029,7 +12089,7 @@
     run = "0rgf1rflrf98jayyhj1gxz0mkw74qhd88b4i2ccf3mm0kzwlvw0a";
     doc = "0w9izkjmb90d4x5j1azhlskhgfmxh67jq1awsdv2s52psgscpfm9";
   };
-  montserrat-54512 = {
+  montserrat-77677 = {
     run = "1blgdkfjjjhzk41myfp7bb7x5wf3arwapas4mm1770d46nab1wwr";
     doc = "0blk6jxz1xrascrdalssqd9pdrvpai3k9bqbvgkyngqhp4rzndv9";
   };
@@ -12038,11 +12098,11 @@
     doc = "166489dmj7ysl0z7f6whnkk8ndv5bmb9hh7pjmp6lprvr9vvqxm6";
     source = "00n02k6hskbj8rb6krcv7b681lx24sfyxy8i28rf4c78x4ds0420";
   };
-  moreenum-24479 = {
+  moreenum-77677 = {
     run = "0cjq1a222c813l93yzf9757dcai55vh24r17cv6awv0d1xf6jggf";
     doc = "1g71dcnbcjb2x8ilhyfbkbb55x8740pz6n9gzdd8h6kyxm879zvl";
   };
-  morefloats-73637 = {
+  morefloats-77677 = {
     run = "0jb1ljp86cn9yddg9inv24i8zzhw0kyp8f8y0797yr8nd8ijrbd1";
     doc = "0fsgjqqqan7rs6bav2a34r1z59n4dackx5h59i9l02zwp4fa3gjk";
     source = "1qvza7xd7pich4mlrrq878f8fxdg3pyi6aakzg912kcd8zdqnrv6";
@@ -12057,22 +12117,22 @@
     doc = "1y3vyk6lz73frik5779wx5ppa16vinxgzg9v2jkp8bximcq94s06";
     source = "1zmsigxswqhv2v6lf0h62rmmrqna47a2y9qf77asrd3k4s1qsbg6";
   };
-  moresize-17513 = {
+  moresize-78116 = {
     run = "07vq0wf250ixhrg70vdvaz7zh33zaq5sm32ka8qh1ab590c8w7h8";
     doc = "1qa9y7q1wi7f9klziwgj6dw9c7bh453srljsx9m106nbyd1cvnpr";
     source = "1gzj5bh16afgl8dg5z44h7d4m79i5naj4wl09m17x6snvfz7ifah";
   };
-  moreverb-22126 = {
+  moreverb-77677 = {
     run = "14srw73gbfr0c3miizzs1rml2ms504hkv970p4dhp1wpk8ywc5f3";
     doc = "0bp2lmzbd3zxqhijfqc7im10476xc50yc8amh0vf017ll7prcmjh";
     source = "1snpyn7bc4qbmamxybv1j1h407fp597m26v2jq6yzijszfanh3rq";
   };
-  morewrites-76924 = {
+  morewrites-77677 = {
     run = "18r8ja3xw77kn4jhhyyrcrfqhqwa7bzbsvmkllvlfpmrfziaxq3j";
     doc = "08syrckx97a9y4ybmk85pn98ign1smqifj1p348s8rlam52r9sin";
     source = "1vdnzzvxg13m1kpz08l3npsp68b0rjjy8w4y1d7laj1qxq69ph88";
   };
-  morisawa-46946 = {
+  morisawa-77677 = {
     run = "19b8nzkwdnqk61p1fc7yygjlrdimawmbam18akphcm70qx2h01dj";
     doc = "1y218bablhn06njs5zqmsl6jvvsgyihm4il1x9722pqvvyxxf9q0";
     source = "1flrf2c2jxpq33g26i0m2h63yd5jfy9bdh80idpx1m6bi6hhq7ac";
@@ -12097,7 +12157,7 @@
     run = "18wgwwvh2vj1adbvbl1q6lh0wy0cynfvrx6cgq0m5nqps7b3idra";
     doc = "032ywwjrv21ypnlidvn95dcnq179pdiail86s4nxxllkjrryc2db";
   };
-  mparhack-59066 = {
+  mparhack-77677 = {
     run = "068wp9vk6ablq8mhj165k2r6lg1llk1i8gyj71ha2kcsq62v4a0x";
     doc = "1cs2ypwz4wkb3rs71wichmd8zc89vj4r58srqzmriwkjplhaw3p3";
     source = "17c1pq9mqn0gaffawg66wwd2n9cd31gghlvmrpn9m9z6xcdm0ipa";
@@ -12110,7 +12170,7 @@
     run = "045sji1qqwalvmiinqkfm3x4rk2jc7m9nya48brcc0rc5icq7xqn";
     doc = "05b9pr86yy3hl14jymk4g4mf6f5v85b4nv2bc68m02dflvm4wnsj";
   };
-  mpchess-73149 = {
+  mpchess-78116 = {
     run = "1sxivq1wchihy83s420j33qmgj5xip0gxcyi6w1cc8gkhiimbr1p";
     doc = "0wkxmmhcihcki7xbpjk20vwvl91v40qvrg5mm6kjyc9a3cg57qjl";
   };
@@ -12140,9 +12200,9 @@
     doc = "1lbb1g7l63vv5b7jf1xv0b9n29mzkhfmn4jchfpmy5svb482mk5z";
     source = "07api0l7s93bimq55m8dypvq090rk4li178ydhw7dkaxzqr4r1hr";
   };
-  mptopdf-77320 = {
+  mptopdf-78011 = {
     run = "1l2182idlbzci9kjpii0zg3c7fpmzf02dz5kg2zcv529mjwwv91f";
-    doc = "11n9kb26jm98s25lfgmkkg3pfrhf2dmflw4kv0792jzyinr7dfq4";
+    doc = "0ji7mahq0f395g5700dkzjpa9ipn6ja8xm2zfjar8j5qb0gs2vla";
   };
   mptrees-70887 = {
     run = "0x8k147fm7hsx5vhs1y8r6q78bdylh3248n5fhsa7lbah060ci4q";
@@ -12185,15 +12245,15 @@
     doc = "1fpsblzyxy0kf5vs4lnxdq11nkj7d9vw6a3vzyas6dqrlb370vzx";
     source = "1m1yawp0wm3zafjwlpv6m010ih0gb24q8v2h94d5l2w2ymkyx2sb";
   };
-  multenum-21775 = {
+  multenum-77677 = {
     run = "1jn6xqrc31zzaj9yk244g3sbi8fj2klswbg24fkclgj0cjr1xi5j";
     doc = "1pnjjbfwgy6ksdl76n9iiqla2wl0qa4370n49h4xy3rmrnbjmdqs";
   };
-  multi-sudoku-75941 = {
+  multi-sudoku-78116 = {
     run = "08kzmmbskhirnm7xr39sza8kas1kwyl7k0z7gj9rbrsd3qqa6nk8";
     doc = "1qcnai56xqii3w6rwn8wwf5hnn48a08bcm1rxy950276lj2in7vc";
   };
-  multiaudience-60688 = {
+  multiaudience-77677 = {
     run = "1pc03jhvlq35zzjsx6sq6bgzsp2mh861wqbazrgp7ilni1bqhqsx";
     doc = "1ja9zphh154n7wwhqgl4xj4as17ag8mnr65k0wf2npjrir7rfqgf";
     source = "04hpd3zsf24vwas726jq231p462dlb9fq01gx4z8wg3zcczn0agd";
@@ -12203,12 +12263,12 @@
     doc = "0r4hnp4sgpx9x0hmrl3qlw55xlchav3r8sym2vnv4sqjnx4dc740";
     source = "1c7cvjabssssy8wq6x6lr909zq4f0bkhdzx1x37n3rxm2ngdqpbs";
   };
-  multibib-15878 = {
+  multibib-77677 = {
     run = "0ma2fwy3p9b6ijf727iw2xqsadk1jvh1g27snqvyrzhz7702b6xd";
     doc = "1mwl9yziadzflq29nwv7bnbdb07d8bsxl16agj7ydmiw59ykv1xg";
     source = "1g4d3hf8s1df57yhpw04j6bgc8n7hc16dc6qz8jcyj264vfv6fgp";
   };
-  multibibliography-30939 = {
+  multibibliography-77677 = {
     run = "1pmvlk1rvr98ig2zj2mgq91a61l0hib9aaly2irfzl28m092r3fg";
     doc = "067wp2cmmrcgwkaxy2ngmhkfbiykr1lr0zii3i6xyyd6z2aidrfg";
     source = "1p25yixvajkyksrbl8zax1jrb292prpjm97b6vh74v478bk21kgv";
@@ -12218,7 +12278,7 @@
     doc = "15zkw0sh0lf5vdi219h32nw0icq88cj0vnz9g9j7zb7xqq31f5g9";
     source = "0d3gyjr7kwx25gzsl4j5z887c952zxrsh3qk2j0cbs6yahzscxim";
   };
-  multicolrule-76924 = {
+  multicolrule-78116 = {
     run = "01k425dsahhikw9n03dfarnlqc1irz33rm9am6w3gx8pd2d2q6zx";
     doc = "0h5is5lmqqybyp9c8kr0d12x27lgm761dcjhi63i7pv37hk0kylj";
     source = "0blj75rh7vqy8s8c87dqpbz7d279hngzl99272cyskmj8m4y6jpa";
@@ -12228,7 +12288,7 @@
     doc = "1jcm11pjx3d8105k12r120nqjjyk0ncmbry8pvkcpwf8kpxcqgp7";
     source = "14y2vk3y8f35wxka65fmj1i235hbb4sviq8g0j300d24nlp32xsz";
   };
-  multido-18302 = {
+  multido-77677 = {
     run = "0rb320bxzg83nq66dx4d2jy3cmz83zdmv7xfw5n1chcswpi6l39p";
     doc = "1s8jhzznsqq8kjw19l6gdr12x1p63v3fyzfdrgmd9z66a45d6hsa";
     source = "1ypcg93f9n9cv3y6rj92l46b61zaj8wm9cfps1c86w675xs76zaf";
@@ -12238,7 +12298,7 @@
     doc = "02j3gripplimgh9qj3mjy9nlifdi6frj6cawxnjsm35r19m9ia5q";
     source = "1s28zxxvbi5yg6iigdixc5kmn5w7h4hss3xrv04hr2838xpma3wc";
   };
-  multiexpand-45943 = {
+  multiexpand-77677 = {
     run = "04v8qz91w4fayy3llr20dqwvdx835wl9fmxpcg45sd3yrik2s4nf";
     doc = "0pw7kqc1r0mvnb03fp5l3gpy5m5zvrynaqkg4xsdrhw4gqxlpfy9";
     source = "1n1bngipr1sjjqnzsdgyyy08hnk53f81j0fqffjlr5siy4by1p6b";
@@ -12247,7 +12307,7 @@
     run = "00bcpp3cnvf98qyvdb2514zr7s4bndg6anay5p6syszxbijhlbdw";
     doc = "1qw4c0jm07z195m5m4drd95k2485virzmha7iw1l3vkc2adlk9bi";
   };
-  multilang-49065 = {
+  multilang-77677 = {
     run = "0zkkfvkybq5hxbdwkwy5n7gal1ir7ixg8342wynk3ga9z6lb9shw";
     doc = "026d5yxli87f2svfyqmfzbhydwd4c929n2v11wk5prg4zc3vp08k";
     source = "1v4ql5jxlmpc6458qcqvbsrb9pf3dss60z3i3ylmyp6mx0kjmchr";
@@ -12266,12 +12326,12 @@
     run = "17w8sc4gki7zlwkg1vqrmqrd9id6hdjf3kcvyavbmnrisri95hl5";
     doc = "1cjvs2zwcgj7w34p3w9cvv4dln0q0468cz0j4vdchqjdmhqkwxhp";
   };
-  multirow-72833 = {
+  multirow-77677 = {
     run = "1ck0jwkf5vvgxc2mc0yskl8dwjvjh1ywvhq9sy7mdb8f8g3x8djb";
     doc = "06mbh16bjqnwfrn4dqb4ab2yjw6mg7b071gpgh6px912m758n4rr";
     source = "06sw23wqldvpk2ipnqxr8x9xdh0c5cqlwrl57vxvsvpndrkklxsq";
   };
-  multitoc-71520 = {
+  multitoc-77677 = {
     run = "0yl6jmkalw2sfs4mz70w1za42xi97qrwl86jq2ik2ggmcz7cywh2";
     doc = "1k91hfzg3qx1damxy121d32sibqrdy8k2gsbcz3y8ml2lyrgkcn8";
     source = "0zmhvbv76hzdizvspgva2ln4l6npm29nwj7nkqbk834ykdvgs1bm";
@@ -12284,7 +12344,7 @@
     run = "0rn4b1m1c58phyj9zzvyxdxbilma1bnncscwmxc8sdgb9iiwmlzm";
     doc = "022s1z7d5ins4gpklg9hadlp1gqxpr6862i1g4wp036db0457l78";
   };
-  musicography-68220 = {
+  musicography-77677 = {
     run = "04vwhhd6mlk79bk5nblrdb6vlv2n2r1s9dfx752p3vj584w2mdmr";
     doc = "1144kbjzybzfcxqbwlcfnk4wvqm7kw01slf9pzpb5jqagwrq12sv";
   };
@@ -12296,7 +12356,7 @@
     run = "02cz225x5s3spj0wf9c51ka0i1ysmcrvlpa2b8vxd59f4pwz36am";
     doc = "1g8hay5rdkpa4pjj0lj5gfs7xmqwzmzxnc8k023ahlz38gdczgnz";
   };
-  musixtex-76876 = {
+  musixtex-77677 = {
     run = "1d3rdw8v3lrxqjsvwwrf0x7ygq7aakcbln76p3r89r7jm147hm9g";
     doc = "0lfc1l8kgaj2bfv459y19kvbl7nlcll60yh5sv7is0s61pl84vyj";
     source = "0ari7nwxlyj0lnqhzcpq4vh9xn0kdzqn9c1a5ih5hp1q2zwx2m7l";
@@ -12328,12 +12388,12 @@
     doc = "08cqbpisycga17iwc2wfk3x5l7ns86i20vjap2hkpl0fp5g0f1l9";
     source = "0jjwhq8iwf7vsvbnbrggghrf1hxi02il553npcx423lnybknj6ql";
   };
-  mwe-64967 = {
+  mwe-77677 = {
     run = "1rk5530j3cnmf46i3gb6wc198ay99pwlbb80ynj33dypfiwsvhcb";
     doc = "0bnw57l8bb6x4k8i4icc8g215bxrccmn39vyhj888ijygdw2hgmv";
     source = "1fl2xlmqdas5rijzrail9yqlqz1s75z9fzkip5zjb8s0gfnbg3qa";
   };
-  mweights-53520 = {
+  mweights-77677 = {
     run = "1i4jp9yy9yy1miyzcq25nwm4zqd3936v4mi2acv4g1rgzvai86vs";
     doc = "11114i98f0qscg9796df1vwkf2m6ycbaimk4qfwv47mrxhvwq5qg";
   };
@@ -12368,7 +12428,7 @@
     run = "1amvifgadhq73avh1dq9mj2v4s5r3hlr6a3z4wcbhw32jd31ncbx";
     doc = "0pcn0r0p0z7lxyfsvcnl9skm5aa5xi6362vydpx9kv8m11gl7pjb";
   };
-  nag-24741 = {
+  nag-77677 = {
     run = "1l31y7mr00s6md7a68cz51yv0qfd26xaj04ax1ph6dqc97r3fv1w";
     doc = "0gc56zgva7kziny3ridswnp8rscqi1mg51d8x580pidb11mp7dw2";
     source = "1fh9nfjbkvw907ra1crqfhm7hl4k703g80w3c8qvd18r86wmn2i4";
@@ -12383,7 +12443,7 @@
     doc = "0lckpf0wr58nsh7r3gmm3l41vk689b6fdw5ixd9fyq7g0dkv9sk2";
     source = "06d22n12sf4wjzi8hlb2ja7f42rgp2g8kjbj5ias0261q1abdksh";
   };
-  namedef-76924 = {
+  namedef-77677 = {
     run = "06nr8bwymbc3ps7whpxnsnbnl1fayz36hlgcy5isg0gcx8bdspfh";
     doc = "080m0d24cish4an6p4q7rcrqpr2r1yvwvzk431nszhm39h7d8z80";
     source = "03kg4zv07ch01n0nc7qwk99n32ifwf89z2976wg5k12yq51prplh";
@@ -12405,10 +12465,10 @@
     run = "1izx9cjsd46ydhrl0ixsjz23nbk7mfv3swfk5ada0d4adcm7b73h";
     doc = "1sxap924dzf17vslp3n71r4mj4f98m9cmchq603c7ara1cyjk2mp";
   };
-  nar-76790 = {
+  nar-77677 = {
     run = "1nwk71qirapkg3h6jwlv53fm6zwb2vq0fvmc4xcanf19sm3331mk";
   };
-  natbib-20668 = {
+  natbib-77677 = {
     run = "1wxpcyr1b6k1rzizbz2g452klrmr6xh98csqr6pawlnx2zy3sx5x";
     doc = "1hai95c7ah61rqrsvzvn0ppvr7pn10830dp7wn7fc0j678z9r3js";
     source = "1qaxwivq95pf014w39igh070cnbs7n0k5am4waxvdwkzql1fafpy";
@@ -12417,7 +12477,7 @@
     run = "1vxqyyfrmrkwyzil0a3xvlrmfzyfxdkfl10rlfzgwdwd63bb99kk";
     doc = "1anh6k76h573yci4lcw5wyf552zfqdrf75vpg19vrr3nijhj9k8v";
   };
-  nath-15878 = {
+  nath-77677 = {
     run = "13j02zq77fv4c5f45qn3hgb7v20xi0d0dpj0m2pfdc7fj74k8ib3";
     doc = "1ppyrz9y2hkv6pq18w4chm90f9x9d3qscw679281si2phmnkl1mn";
   };
@@ -12464,14 +12524,14 @@
     run = "0zirxqals86gkjm4429m672a7k9n9nl2hx264javqhmhngcybhcx";
     doc = "0jf3gdjfm1ycbnkp775b7hzr4rqd0alciqjaignrfqhwgdr96gh1";
   };
-  needspace-74631 = {
+  needspace-77677 = {
     run = "0nsz72xxzm1zcmcgkx71jihnq4k59vjyc3z2jclcypjwgknkfwqb";
     doc = "11w3l0rwgxf7yrwz45nrwn6p0zrs6k98hsr8sb0ja212rmz5bzv1";
     source = "1iyd9l2cp3594yb16jrl8bxd5wni0bpkd2cyvr2ws7h47jj2kq4d";
   };
-  neoschool-77050 = {
-    run = "1r3wh3a4f637crs9ks9lpq1z4w0z30rxlzqywxf4mg3whd31z8gm";
-    doc = "0pxjfx57hr6jbrv4d8mi3gb2kagh0l23n49qv8zwa3mq4h0z91d1";
+  neoschool-78059 = {
+    run = "1md4mv1wifyhbhd7hvis2pw52q39q4rf62v38xjnkqnnl26fgr0h";
+    doc = "1w95z56xy6gag0fs0s4sllwzv5mfasfdhlrwrg17qzcry6ifylir";
   };
   nestquot-27323 = {
     run = "0l2glc6aykd492rspxphgscx0ykc8cakvqkm8z99jq7xxi80l1x8";
@@ -12492,7 +12552,7 @@
   newcommand-18704 = {
     doc = "1vlxm26393psl4kjfh533q03sb4klnfq84nld9ggs8l5x08dks58";
   };
-  newcomputermodern-77296 = {
+  newcomputermodern-77677 = {
     run = "1qhhz8b6pf8f83pjazbr5liba6v7a6vhz4d7hsy5d190b0lng8j0";
     doc = "0699zlf6z0nlnznsdv1dpi9xv1bhdbhvgzdql3xn1lzmm1z6420p";
   };
@@ -12505,7 +12565,7 @@
     doc = "0vqlij71kfjzbl08sh38rzs9k714xigjc1cdvvpj2m6bhimazp76";
     source = "0sw9cqids994lscbjif8h7npp4cmzrhrcvccspag2aa78gsvz04i";
   };
-  newfloat-76924 = {
+  newfloat-77677 = {
     run = "1jhaccf7ppi5m5jycz77s5nldbmscydzbd2db8bmb0qx3z858m48";
     doc = "11712zqy292xs7i4xvrrv948i6l1bwjxsgax7hph9hjfqs086rmq";
     source = "018msda5vgamyn1lmq63rwv58h9z49q4rd09l7slij14djxwgdb6";
@@ -12520,7 +12580,7 @@
     doc = "10p8hq5xywvix3mi71d92wbh96b4lg63f4xdbs3imgc2i8qd6jnw";
     source = "03q16nbxn5r8phjk8kmc5zzki58rakj67lmkvl85j4chxipci0dp";
   };
-  newpx-76713 = {
+  newpx-77677 = {
     run = "02prki68s1gqbsxpgminzaqm607rrd0qqi35imhmljaxnc16zc8y";
     doc = "0ld6lx9xdn25p0wb7ig2726ykah095dkpfknf38qgdmb8yzlq8kj";
     source = "0larcp5lk303p8bryaihfdvzacbkzmx4kldira7k42sg31p5hlbj";
@@ -12534,19 +12594,19 @@
     doc = "12hlji06sd7bvw7r664cg8ijxabc2q1rb7z516ph18ayjl5vca82";
     source = "1h8abnmiai3c66cjndm6xawz00z1pfmgwlp6w43amjrk1rm4r5vm";
   };
-  newtx-73393 = {
+  newtx-78116 = {
     run = "180hrj0z6ag1igzm1ffgq2vs04ppn3rfsxcxj7500flj896rpcmy";
     doc = "0vqi5xdcw3szfbhniy87xzhrz8cc8lk36d3nc07dkvwiklkj67ai";
   };
-  newtxsf-69597 = {
+  newtxsf-77677 = {
     run = "0nwsbpmw7c96797bxvlmfrqibgnjsy9m8b8mzrbvasj3nlhfdxwf";
     doc = "0zxkhsf5r9kffk2vz1n1nklk48i6x445dzs4swdz9hv6xkhrbmnq";
   };
-  newtxtt-70620 = {
+  newtxtt-77677 = {
     run = "0d5lxf2pscxhah26rhbjbzhsclwinyxfyf5xd0va72hsgrp98gv0";
     doc = "07iy6xbschb6f2vq9406fikphp032xp3qx54gb32asag327cc1lg";
   };
-  newunicodechar-47382 = {
+  newunicodechar-77677 = {
     run = "1zr5w047xqg9bi6drl2rw414m9bzpa5r7n5270zr8k8jj74xcv7x";
     doc = "11vk77c83xy40i9vclw4v1h5wnr03mb77fa8s2lhi0p4sq0c3vgr";
     source = "060kbd07al8cwns5877ap7irpf3r3bkw0w62cwvl67y03gcmgr70";
@@ -12556,25 +12616,25 @@
     doc = "0k6j4xpvjwwvz8cipgrqvrs2dj66n7yzlr9mcfsgd5w6rm1p1h4i";
     source = "1p3g9qyq4x0ffv68501zlpf1w0ffm816pa0wqjpqf8pz2jmgcg5y";
   };
-  newverbs-64833 = {
+  newverbs-77677 = {
     run = "06m58n02lx0cw6f9689863yqvlmzpaiarzhpslnywhvgfnks7aks";
     doc = "1wny3zhid4981rlxm684p4pn315jdjmkwc002dbj9aq7lhax0dg7";
     source = "15qivriqxgk1cfff6li172lxghcpgy9i1vjskki96pn68q2p0nw9";
   };
-  nextpage-15878 = {
+  nextpage-77677 = {
     run = "1p9dvw7fqspkg6hk6rdmsb5k5m9mkj0kz5a47wg5dgfqgrqpixf8";
   };
-  nfssext-cfr-76924 = {
+  nfssext-cfr-77677 = {
     run = "03fkji0axbys5fhrsyix6hbwwwb3yqvsc4ap67jsqn7swk8m9n6s";
     doc = "13mz114csb0pnhr2aa7k1vl6r14xw8v6cpc5fq2kj6bg3ijyvcmx";
     source = "0bz3jkxacms40zg8iy6wwkr08f5bk31y0qmvq82w8y664w3a8ww4";
   };
-  nicefilelist-74999 = {
+  nicefilelist-77677 = {
     run = "0hll2mqas23za35fzqqxi6p6rziqzhjkqrc6gd263hpy4x9j7k6z";
     doc = "1zk9c4avbv31kc74pf95wjxwf209vm8dz802y8j6n585wc2kmva5";
     source = "10gl0d2bbvhxf5kqzs8lri5nfvlhgcgnlcw00garxj6pmjj9q6rk";
   };
-  niceframe-36086 = {
+  niceframe-77677 = {
     run = "047y9dh0p51lyrrq5fkvp4dpiszvf2nmx53hccl8hzgr2bs3kbwi";
     doc = "14fapa38pffkj1hs58b7r1zkjn3dql9d98jzh13cybyfynd5crjp";
     source = "095frb90nryk4m2iia4sq3kfrcfg2k3nq079770xlp720zqy07rc";
@@ -12583,17 +12643,17 @@
     run = "153vw1af4p2zxp2r4l3f2pkw6r19mzyf9c80w2p3zd5vb3xi6wan";
     doc = "08dgjdcm294hlpfdnfyjchvyhgwx5kfjp968p7rdi00a7jjnfk6r";
   };
-  nicematrix-77562 = {
-    run = "1yk2gcsdhqn3jzbwm900137vrl7cb9vha80v08i0mhcxhih84mzn";
-    doc = "0jgvaiany5lrp8zl30bdzip3snkhhc4mr9c1y9l1r3j7jn0yii4j";
-    source = "1s1j1a6yanzjaanjsdx7zbmwiyv51ydibys3lqylx65s050pxvrx";
+  nicematrix-78222 = {
+    run = "1rc0ji8wgc5hn74j463q6jwadmcf5yl9ixraf733an3a1lm2ssn4";
+    doc = "06k02knn80x3z6yi2drgcdqabpbqffiy7xnvzfk60ga7g77qg0xq";
+    source = "0ncl2hjplby3ksx88s7pc6pyhj5m59373qzy7gj4j4lr9fv0qv14";
   };
   nicetext-38914 = {
     run = "0aqfg8phvhlgvyy71flqsaqwmmc6lsl9vsxpxd61v69hp2qhvggh";
     doc = "0c078pfiw1nz11krcgwbdlp2brdy2xmq6rda9yahfjjg54xgdbg5";
     source = "112ji0zwy54nqswil8lvvcrq0ai7jsmdagvf2786zg9n14h5kr75";
   };
-  nidanfloat-48295 = {
+  nidanfloat-77677 = {
     run = "15l4rdj7bk1279xjjkgh9a7scfmm6w88civ48shh7gwx8gsvcscb";
     doc = "06ccf5yhrqvshj3d8ic3pbnvmdpjxq54i57y3141wgqcj5h062dp";
     source = "04q480lddynb2gqz8azmyik8170vl056fhfjsnq8ydqj0rchnnqi";
@@ -12652,7 +12712,7 @@
     run = "06im7nqba775w8kz1qsgh3k5h3a6xp80p8ay7hcxwjfdg98whc2l";
     doc = "046386zpz67wnr3s5xmj06z24h7mzcfiz50njr45rcm6s7q0jlgc";
   };
-  nmbib-71138 = {
+  nmbib-77677 = {
     run = "08364yvynjayn0mmvwr83al032hzmnz6nsv2jlm97vhqs578pndd";
     doc = "1gycy261lw14x89nrv8r3h5ngdxmak74srg57ccrn8d39x5pxf8q";
     source = "10acy9656gk6pgiac3dv77fmdk7n8430r5sp4izbwk30a3f387hw";
@@ -12685,16 +12745,16 @@
     doc = "0is88wpryqdd179fvhjkvq6qy4inz0sp8a7j1i90iziadkf4rchx";
     source = "145bfg8qz8m64x6p2kzkz6skzkdi9jc82q77zr50xms9565bhf4l";
   };
-  noitcrul-15878 = {
+  noitcrul-77677 = {
     run = "1whs120vlg4cdjmb1x363g92ira9nc8j2h65qnvwv8qrmh2hrwnp";
     doc = "0y3j12rb8ks8sjs1ikw3sccq7p7zmixc10nhdy9yg9rzwcgmicva";
     source = "1dsjxs73xf79sjq9xynnv78jws1j39l240lvcvpir1k8vnzwfa13";
   };
-  nolbreaks-26786 = {
+  nolbreaks-77677 = {
     run = "15qa4nf5c9gl3ha4prajqxl2p1ks6fpql03d52prm9vqkwphzgyy";
     doc = "1h9n7ki3iznbzq519cliw03fcn2k40f2rldjkhnp5vlzma81inh3";
   };
-  nomencl-61029 = {
+  nomencl-77677 = {
     run = "14225s3b27dmdgkjqyh4fqcwyyaahva0sk3k6nvffl6jjqdwsgkp";
     doc = "0vqxxjlvgaa31mjfl6jv0azfh7qv0g341i27s6k9zz35a7dwqaq3";
     source = "0fxfan0s0y1i30rg2mwxl21ymfknh4cnw8za13mx34wvaxmc4l9l";
@@ -12708,17 +12768,17 @@
     run = "133cvqh4vxdsx35dr6vi0sqil75zv3dlrf977dwy5r1fvf14br2k";
     doc = "0qwqzl7p6j9mynlqj2zvwdqrcr75ms4bn3v58jikvywqc0y61aib";
   };
-  nonfloat-17598 = {
+  nonfloat-77677 = {
     run = "1ay9s9xrf27sgan2gan86g68i91rwa8spmmj2l13pb3zl5qikw66";
     doc = "0jjil5rbxzcpkyid8y5dahab2ca9r77sw2scgrc4mf2h4nhrjfyz";
     source = "0vyvpxyrqjqmlw2fj4b9avy7sn79m4q8gcbgzdkzzp8d0rng5i8s";
   };
-  nonumonpart-22114 = {
+  nonumonpart-77677 = {
     run = "0dyf0nl16j7vp955g64rbvvjyqq31x5iv7dbkh8cikwvgn9g85s5";
     doc = "06j6sc8q18mnnnpbj57ykays69n78z0iz1r3vink7qaw4a8fbyba";
     source = "0p3gicf0fzmk0f7lblydf31pi9x0f6x0k5rvdd2ia8hrjdaqv1dz";
   };
-  nopageno-18128 = {
+  nopageno-77677 = {
     run = "098q0visa9g5lh3vp6bp484fglrq8g21v4cb71cnc30f7avkg1v7";
     doc = "0n7p2f039vmd060ncc81yi2hnn7qyk6b7z2hpxh9pp78dwklgx98";
   };
@@ -12726,7 +12786,7 @@
     run = "1bsx31al77ci58p1zavp5q9dl8msdjqilb19fglnkhgg8bjbqh7d";
     source = "1bsivm5im913x336v6qrv31b926lfr8821pzqshq600k4fgk3rj3";
   };
-  normalcolor-40125 = {
+  normalcolor-77677 = {
     run = "1yvbqc6px76phjgy9cwpqwy035nb61nvcxy32v9xa9wfcp36nw7g";
     doc = "0919aan1qxp5lfqm902ijn6sflkzv1dgxi12hjfixd8d1d7rlfgs";
     source = "13lqp3zjnhm1wmf5id1bbr86l5qi13xgij455l38l55is468sv8j";
@@ -12736,17 +12796,17 @@
     doc = "0s06svy9gjvvpjqni59qfzzlwplx12dbgcvpkdi4zj7r9wyh4v3v";
     source = "1vd8r7viglzi00vfxq4wnjdciamhl9yprham3mg0mmrvmp30l52f";
   };
-  notebeamer-76864 = {
-    run = "037fql07ms6jfn1cgkl7jdy3fahhk3q70fnxc425is5pqhvk0h9s";
-    doc = "08hrrfhs06xzz9bb6qvd3gxcl2n9wn75kszl2cx9caqjyi3gkwn8";
-    source = "0p4j1hdhdafskjiw2mny47sgzpzrld1j14smgvjah3lcyj8mfrcx";
+  notebeamer-77677 = {
+    run = "0dlngli9ancp9dq8ny7fmii0n2qwgln4wqac6fr0qqbkg57xsaxj";
+    doc = "1vsgjfipnqkb8bbjm8dkqklrs3q1m1v5fj87bvzrs0cfcafr3s8h";
+    source = "1qp4jq9qkggaxrim80mbvklngazkvn4m9yw4bmk4y35n7y6x9lpb";
   };
   notes-42428 = {
     run = "058316ialcra7m56ww7imzqqhk318abwscw5g60hr73x3x7d9dgq";
     doc = "1zq11rygqkbx85cf79ixwcv1w971w4hx8zfsv7z16am4mlxcdz5j";
     source = "1ycxa3m2l13z6a3a4a88wpznvwdb78qyxkh879cvg85apb11rffq";
   };
-  notes2bib-76924 = {
+  notes2bib-77677 = {
     run = "02iwnpiq918izkssa8j7fiz2jbfjn87xdjh9spwys98q2cvvxd53";
     doc = "1md7zvcnlb2sf8zw0vlnsnia1l22gr69jgksy5yg30jis3zm2gjp";
     source = "1fb70w9y6gj1a0y4w3zd7yfmk5gygx10y8xjmdj06ky7k0r87qlx";
@@ -12763,7 +12823,7 @@
   notex-bst-76790 = {
     run = "14r3q4z35k5n0rl2igjs4lj5ic4yd14xksg1qam5klb6raaf1jkh";
   };
-  noto-64351 = {
+  noto-77677 = {
     run = "1bq1ysvd9bxcbfql6lwcbx2878n3bjwb3akawm7z025igi7hnml8";
     doc = "1pz1flyv3js1wfw9p57cz9qb10dd64i978z76ngmfg5k1hp0w7l2";
   };
@@ -12771,11 +12831,11 @@
     run = "1d1mxl32brfyn3a8jpkby0kwv69gimj9wcl8y61jd2qdlfd0mx9z";
     doc = "05rch3ybas6gds53g35gda10gia61v49kgxi3gzcxvn92595zv9a";
   };
-  notoccite-75878 = {
+  notoccite-77677 = {
     run = "0cbvwvgh3rkms6akamnrmzwm6796ly5fa93qsb30bqafgmx56il9";
     doc = "1h14fkdn5kvxagkjx8h6f6a06v7y9z48s87x52cblwykgfm70qxz";
   };
-  notomath-71429 = {
+  notomath-77677 = {
     run = "1wqxfr4ni3vg0fvxw8smwnqnh7a1dcc3cnxza40adgn4wjyc5d05";
     doc = "04yynw3a4bsvim4ijl63p2kivw8jiby4b9qkc8afhpks5j02gabm";
   };
@@ -12783,11 +12843,11 @@
     run = "08ps6z7x19hbqik6vqaqps7b3zh0zbwkpds2i5c56mygv1558ai3";
     doc = "1kxjdkdgggm9hhajrxlid5rdrymxzs4nki4myw71xaxz866bgcrs";
   };
-  novel-71113 = {
+  novel-77677 = {
     run = "0xcyk5ljj3621x7325vvpa30bjslg2vys27wifzgxbjdkjm69h8d";
     doc = "0r61ssiypjz95k17wbijr8lwcx77sljisi94rw29fll6shj2d1iv";
   };
-  nowidow-24066 = {
+  nowidow-77677 = {
     run = "1w18i36ynsyldb9gs0yhv6plyrjs4762y7bglncv7bhqjmyy7y3g";
     doc = "1l2zq2ain8nhkaa8aagpm22nvg8p1vk2cdgs6pmrydk0hhmjh01h";
     source = "01qjfpps7ahmrwvg142mspj8gsyx21l3nr75g0v7qsqxbfjjy6gk";
@@ -12811,10 +12871,10 @@
     doc = "12yx62lfm6261jkl2a5rzb3lhms83bhsl29ljr90fcvy6njqp8b7";
     source = "0ghkkrkymrnrgpcpxnpw73iy1k90sf9mcjxkzjbw5l5wmf8k5fi4";
   };
-  nth-54252 = {
+  nth-77677 = {
     run = "0716sd99xjdkplm7jdmg4lx8lpfnnx6mxjp1l1sp2bfqcg73p4hm";
   };
-  ntheorem-27609 = {
+  ntheorem-77677 = {
     run = "1mbrpw822ibb7wpzbl3fhnxg4djwy32knn9hqcvw1kpahgfbks66";
     doc = "1f1cridxgv2rwv3f305hsd5pm59im1ik8qmpqhq4rpvwph8ny140";
     source = "1pkrhkl9iq0giyvk6lqjxx5x681rjl9zmc0kmcypwgbqww59hp0i";
@@ -12844,7 +12904,7 @@
     run = "1hjnwrn6651c0j83fdfvqnrn911l4z5w4lc45w1xgkcjlrx2vpw3";
     doc = "14x5c1cf2bsx5km0xphfh17hbjprnh7bn1yjlbf31rd9jcm9a6d4";
   };
-  numerica-76924 = {
+  numerica-77677 = {
     run = "0x4nx06ppb1blp4012pb6l3fkp3ikw94xy9g3653cam3p6pwlviv";
     doc = "0dhsfbysxrm91hxhgs842yv6cxx0agsj486sibzwsxajbmwxc36g";
   };
@@ -12852,7 +12912,7 @@
     run = "1x4dmzxb4m11kdscmp8n7jd1ihd21h0nh6dx3gx8nmxghzq20160";
     doc = "0h3y8nxw4zdbxzwkfkffkc8p0pjmxd0lh8zcn5cisdjzk2dsjjyq";
   };
-  numerica-tables-76924 = {
+  numerica-tables-77677 = {
     run = "11f7x9ljwifahiaim8pixiicqxkln94xsmiqrxy9c5yzbjfgkzyy";
     doc = "14wg3kyv9sn0yap8w740s3m9s5cvdj5lpr7pmdbr8651zpfga00b";
   };
@@ -12868,16 +12928,16 @@
     run = "151c13r8arj094jw3zaymz6i7invgpyqr95p0qnwhj22z418pj1m";
     doc = "1rrargznsmgq1h6a2ixxr9bg57zcrs9zwhxgz0ssbscdyvjqik8n";
   };
-  numprint-27498 = {
+  numprint-77677 = {
     run = "0wkijyxl1zzay8vqvsyhk6kf5247qr8k55rz91dn1ph7b597d952";
     doc = "1jra448iyyvc8qgc9z49brb6j9c89fzf5zhgz48k9959bv8izs8r";
     source = "1svwh456nbswkrmj98s91vr2x05fvs58chkr5d5slq14wg1cpa0q";
   };
-  numspell-77303 = {
-    run = "13khv18br06av9ds157k59c0vz513aclniqsjrigww2kck6vlbzg";
-    doc = "01d29675m1p0dp036rdq7cidx8lgww59z9igcajr13rfphr3vxnf";
+  numspell-77677 = {
+    run = "0syhw093lz85skggc1pgv1ywfq0xbgl1k6zybwyh322i42fg2q1n";
+    doc = "1jdngm9jc38dhv0yh97a8gggbc6k0ilzw9s0hyr9ysar4zik3c42";
   };
-  nunito-57429 = {
+  nunito-77677 = {
     run = "08hnxivx7ixmvp7l6kxfr0vxy7c78i9jqkam0xxg5mkxs9ip481k";
     doc = "0xhv3rws4kp5s4q4c10ykkf3yyl9i9ndxjavjx9xxxwm1iap9m3f";
   };
@@ -12886,10 +12946,10 @@
     doc = "10sln765phsv6rpxjhn6z431nwwkch3qbq0s3wjk0mc34302qykx";
     source = "1xk78d8zaqbn82lsw0fi428ac9ybs0xnnva2lkb9k8zyijz5w04r";
   };
-  nwejm-70597 = {
-    run = "1x96p32bb8xpcjr4831fc3217cr0is3lm81fpyhjp23kcdzjk56r";
-    doc = "02ii5nrj00mv7wvkn2bgzy9w2f5l11bxs9cllxz0wvbz17xflb6i";
-    source = "0rwm5c34ycklp031w42kbwjf75nibv7y1wa0vcl9av1xwi017nnq";
+  nwejm-77985 = {
+    run = "0pakk194gqm3aa14wlr6zl5njhi1jcrls1qnwfn1bh7laf4m5zs5";
+    doc = "1mqkxp6ga6bp356zkf9qkvhayx5rx164hpybjb3sq8hka6fxnx0a";
+    source = "1k02flr8406hy20av2mp06i0hljpz27xwwdflx37qcl3qyxwy2r8";
   };
   nxuthesis-74831 = {
     run = "13qqakip12bvjlnw41q0133p05k0bg97s4d9975826zz5x8c2c31";
@@ -12953,7 +13013,7 @@
     doc = "0l5fbi2r9g0nbs36bgh3c8fnc54qa24xy44yyw1bzdsnxgq80glk";
     source = "17ffq9wg976f5dmny63zxzic58sldmnv2hvf4zm33lb3jgf67crc";
   };
-  odsfile-76707 = {
+  odsfile-77677 = {
     run = "0w7smc9ym2c5w0xhz1y181hr84qwkfz80m922k56vbkcrs9g7hza";
     doc = "0jhi94j5jl7ry90jqi7g26w5rq2c18nf79ilzsr34bhdsjv7da6j";
   };
@@ -12970,7 +13030,7 @@
     doc = "1919kmp5sxd9q49m6dd8zrnjx0cqgav1i87gag1rffd5hz9w4fys";
     source = "1mymvxv4721nhmfdlbl9bgc76dainzykggf93jx6xfwlld0krgis";
   };
-  old-arrows-42872 = {
+  old-arrows-77677 = {
     run = "1immbai327l7vkq67nz6mcnyqmx3ajg3blrhbmffkbl92482bv4d";
     doc = "01kdfgiqp5n74lipiviv2alzallba37gyzfp1sqrvwwvrp3a3z63";
   };
@@ -13042,7 +13102,7 @@
     run = "1ysjfjgi7ha43lf2ny8j5ahngvijv758jx9lf16xzqns5c9b7lny";
     doc = "1iagml7jvwn1592p4rp4nyjp184b2n3knhsfdk6cbkkbgy8qkg92";
   };
-  opensans-54512 = {
+  opensans-77677 = {
     run = "0xj7v9lv1ni7mq175l29a039a2ifmdsy1wnv1h0gfni5c34knm1w";
     doc = "178pa2kjvp15la857iblh9qc195z3byd1wxxyn7c5bzmndvypgxn";
   };
@@ -13054,9 +13114,9 @@
     run = "07a6dja6s7c1759i9afgacx4v0fli98s6mcq5zig689hpkw841fg";
     doc = "1125aj55p7n6b03mn6p6845yvx2jbjkwwldgwiixypklndqsf6cm";
   };
-  optex-75314 = {
-    run = "1wn25six49js9ibx3b35c0my6p8mbhybqrqvb0rz0salfwcvjhi2";
-    doc = "0prwyzqbfkdm8kpfypjhf663yj9xcv5rg3z9xjk84pj8nzrhxwzm";
+  optex-78183 = {
+    run = "0i46mpclvz3yl180n50l0cf403xfmp9i462ivv18pl2iyy9xqixv";
+    doc = "1qcmf9mq2f2zrs7vx6vj7f9dj979rbyvchkk4ffqck70apk28akp";
   };
   optexcount-59817 = {
     run = "15i48ly8mbhhk0mq4gxwpwbvhpgvk1pb8bfbmfk83sp1liq7xijc";
@@ -13067,11 +13127,11 @@
     run = "1jvalzi2gid20wn253swvhil05m273x6685n0b5wbrz5kbvzk212";
     doc = "0sdd6rsdfx1fcw1493b12ww5llww6mv0rij3f1ik290c6qbmyr3w";
   };
-  optikz-75922 = {
-    run = "1ajfzfhniks2gznw90qvlfgh4xl7kh25jw79qqm0s5an8pahgyiq";
-    doc = "1jyirxardis3d9cbkpm9gk4px6c3hg5zldkk2rpm2aprg15sy8p3";
+  optikz-77919 = {
+    run = "14320ab3yn4i55qlz017ms670i65fcix4gbj0q1f509g5xm2wg4k";
+    doc = "1nhyk1rkifbywm3cz17p87zd4cc62in8kv2awy1a3jkkhvzc8fii";
   };
-  optional-18131 = {
+  optional-77677 = {
     run = "1mv65cqcrjhykpl565z96s57z05635q513qr440crbh61rp93chs";
     doc = "1ks001q2b1yw87q0frhqq6yv77mskng6v1sm6kd8r22cv5g49xbx";
   };
@@ -13079,7 +13139,7 @@
     run = "1v2j59zcv5cplh3czd6r7cs4n79yvw3448492bxk446j4lx2mfcx";
     doc = "1za038prpjb3s74ryr25q7hmz881gr8abmf68h7xdjq6bdk73da5";
   };
-  orcidlink-71633 = {
+  orcidlink-77677 = {
     run = "1sq4wrckwnn6w6wrh77mihqsa34f9b8k7916h57ghnjzzsr42nqb";
     doc = "12wm3xpcpgr1i73k7z8172rqamy491ilk4b412qi3p5r3pfymqp9";
     source = "13yimrs51rknhgh4kawhkifhynzrm6cgm5pcarjlz0nn03fwscv8";
@@ -13097,7 +13157,7 @@
     run = "0x78b5d70cxy7binl5iq2jwgsjh9rzs87wc8ib18jxscqick5jgk";
     doc = "0q9hwwf80hq6wffyvd26kq2053vs5czly9zlsclh93hsmzg3vj9g";
   };
-  oscola-54328 = {
+  oscola-77677 = {
     run = "06jgk12q9hmbqcmwb837n8l96f3bafc7mgnv4v9amnh4ajlg6i5x";
     doc = "0qzn7d70vl0lxyql152pzzhi72ivdslmxvfwr70186lh6fjxr4nb";
   };
@@ -13132,11 +13192,11 @@
     doc = "0hs8w03xgj01wmir0jzyc72ig0w5yb3zfh5bjbkymar6v4v7pi0p";
     source = "0wgd8qs2qgbzw5jaccpym7xbhgl7apm1kdz7djdfa23nbsp6lwc7";
   };
-  oubraces-21833 = {
+  oubraces-77677 = {
     run = "1rhavggv1c50krafvh7lwnvarh7lh59x7lwkipw24qakq7l2a6mg";
     doc = "1bw3b54cn5dk0j4diq8qxfba0w3p0f78h4kycb2bqd2gq7258vyq";
   };
-  oup-authoring-template-77463 = {
+  oup-authoring-template-78222 = {
     run = "13b5ql0v1b8504imqd8b08yd2aak9clqfbn917mdx4fmnc06dpyi";
     doc = "1rwgrh49rrvbjjcl8jrxck11sl7gi3j846rg24la399y7gd2vkrh";
   };
@@ -13155,7 +13215,7 @@
     run = "03j0mshhrchrgpa2z7j7q6n783va5v0w16gp401rzbvvdn0l2qni";
     doc = "0vi80qhq10yy051sfzh6pmn34laghhvx6plnggrwvcmpp4fcw14h";
   };
-  outlines-25192 = {
+  outlines-77677 = {
     run = "0wzrf2fkf9kh0d3jjbc3kxvsmkynwzg622ghwcabaps097r9z45i";
     doc = "1avkpx77sis4hrrs9dqizq2sz4vjzvn19ks8q7l32qyz6lnxwk2b";
   };
@@ -13178,16 +13238,16 @@
     run = "1xfbb4953ab25dbccfsp9ban67vrq79j443mlglnzqmg1njrckk9";
     doc = "1nm0d47vclan46q0zvigxri5zqmfpv0qkk0arsg836vnv7l53q0g";
   };
-  overlock-64495 = {
+  overlock-77677 = {
     run = "01h1fcgplfbfbkb1wp0gnf6xrqn8l8y1hxrd8gxpjqbg53wr278p";
     doc = "0gl3n6h41fbzi4lcsdra5z3vafh7drm6g04ilmbb5cbkpnsyl3nz";
   };
-  overpic-77296 = {
+  overpic-77677 = {
     run = "0wyvq1i35wxchg593cdnqf28liajfk1ql0nigs8g1aqgv3xlxiam";
     doc = "1gh5wcqd8cq2d81g5razwqkqazd6qc17329gsd28m4rrasqqz367";
     source = "0hmhnhspxvf436klchyzyamflvdaldamgsbbbihvdfwrd407wbp9";
   };
-  pacioli-24947 = {
+  pacioli-77677 = {
     run = "1fc15ygzkdbv5mykgrmzb6filkl3aipk7i9k1syh2ssr37ldxcjz";
     doc = "0pknnd02q244pxyc2vapdx04adz7gwf41swda2xi3039x82pm8fd";
     source = "0zl6l5yc7v5w1xjd83prvfmy8jf3jyblallphyglgb4vkqq6mxxr";
@@ -13201,7 +13261,7 @@
     doc = "1crpv27a9rfmh4dcliqvi7aa4h4lvkv48k5zk0kx6ahhxa2zkzaa";
     source = "0vkk0c7gvzihlmw3f8ni4awj9r6xrysj9rrsbqk6dkngrg02x4xz";
   };
-  pagecolor-73636 = {
+  pagecolor-77677 = {
     run = "0vmj4wyvlwa5i08gri94q1xi1a3nha1308z5997lnj03dyvag448";
     doc = "1gksliiyb0mvvhi6c3nyblg2xg5sbhvjxfwfipndcr9rw5fb22pz";
     source = "0h5i94v2xnhfdaypjwnhg6cp1ai7xx682rrml0h720v2bkmh9b7m";
@@ -13211,7 +13271,7 @@
     doc = "1vrcr5l1facyyf9p8977q0i5m7cn7y40dbmiv99314iyawa3rr1g";
     source = "1qc105f5v0jiahk8gpgr77lqfaladba4hmqnfizbblzbjhhgg05p";
   };
-  pagegrid-64470 = {
+  pagegrid-77677 = {
     run = "054yaxr2q8x82dii8bpy3y1nhc1drvwm98cd3asaddh4lzrpl9vl";
     doc = "10rsrkdl9bp04kxxl2g3rfscf0hcw122py25x2jbq6lgz76780jm";
     source = "0fbzd20z106cgzknj98ryzmwiixmbpvnx5p8v3ns6yjrwrcng3lj";
@@ -13220,11 +13280,11 @@
     run = "1gqbc202awmdh5n9mg9jmsf1i9lqpwf8s0lq61dhcw7gdxrjwp6b";
     doc = "0rqwpl40517ybvsl0zrh2cijv57iykjz4lls4y35hyg6vy352rnw";
   };
-  pagella-otf-64705 = {
+  pagella-otf-77677 = {
     run = "1vrzz63la6i270bjqb1nd4rsqqgl13nrqrbmr0l58bmjj7qh95d1";
     doc = "1dffy7z3cfyq2kzyvbarlqivfv4rs70qa7drii2arv2m1609ylz4";
   };
-  pagenote-63708 = {
+  pagenote-77677 = {
     run = "0jd80dz0jl2gmfr74lw6jy1x2hj6zlji9az956gkj8bxxc6zir54";
     doc = "1s7imj4fi08487xmcsicsa4cknpsgd10dbcyn6vkggm95qn6119w";
     source = "07ngnfinv2mki203in54l4gx7r4qx9rm8k4x7856gr7jy1wkw16f";
@@ -13233,7 +13293,7 @@
     run = "1nixc1dn9cbdi3pa5yxajii6c9ljgc2jrnknsa7wb66kj5j1lqch";
     doc = "1vy3c498j95miksm254a1sh7d8bp3g5p7lvncc1xad4g388q6hak";
   };
-  pagesel-75712 = {
+  pagesel-77677 = {
     run = "1j6rg25mhaiamlff4j4lw8pbp6x3mcg00biqz2apsbi6kmbiljw8";
     doc = "09s7r6dzv95689ysdw442gyqsd2jpdyr8hkrigmn9c4sx32alq5n";
     source = "177j2s6chsdhhw63q9g6ryc06vn6rsi29n4prrn2w14fgr3wnhcc";
@@ -13251,9 +13311,9 @@
     doc = "1dp867fydnxdw82z4gxp1sbz5w5q9jfnls6r9izylrzy242rd52l";
     source = "0iic125v6j1ljgnm7d0qicckxwmgdg7cz568556257js942ldyxx";
   };
-  panda-76538 = {
-    run = "13px96gnfm726lphk0bmavlq69hh0hnm4x74rdvyslk8h27yl13z";
-    doc = "1ldqh1nmn61mpmsdzjazxn5h78904nzrjh4mipfbgvj558rp1qxg";
+  panda-78116 = {
+    run = "1ssvqhhxshhkimbk8khrv5zf2pacrhh318i4fv3mpxkmyr6xyn29";
+    doc = "1pj13y5g47rjs8rmrjh986x6g5gs03gz3zwwbqybamml6aa6v62k";
   };
   pangram-76924 = {
     run = "1x8jdn8j3dgzkm7zv23529gr1jdmh15wkwkljzsc1dnviz0ppacg";
@@ -13288,7 +13348,7 @@
     run = "1gyf1liq3lv8dbfdpv2ilbwks4k88m2ywnv3qxpbrg3v2l010c75";
     doc = "1mw0sc6svi8rci96wl2273bgn2f3w44gdczaldfflxc7az4mhmvb";
   };
-  paracol-76924 = {
+  paracol-77677 = {
     run = "0kb9i6ji6ax0c9wsprjjqpwmws4dgh9ai4cz83bla160ijhfyszr";
     doc = "042jl6d9clpg3w20bci7r8ij2m84iz35mqmpmnw0hadgwz3k28yy";
     source = "0lfpsyag60xl9n01q3m81vxkxwc4fazcwssjjhvzpiy3zvcd3a4k";
@@ -13297,12 +13357,12 @@
     run = "1vmjda4cvajsqai47wvl0byi552gdcy0j4m36p58gjn3d9bc8818";
     doc = "1lz9dsy94x5cvv55nk975fw7dlg4bm6d8ls0p6gy5b58sjd6vcp8";
   };
-  paralist-43021 = {
+  paralist-77677 = {
     run = "19m0ddw80vjzm8p0z5rrd3jf9kqzq653h3jdqlnjw4g81r0z730p";
     doc = "03kv1n9m1b6r0r5drp81hv2i8dgnlcsz81rhi4h6a3xyxnyhw6bj";
     source = "069mn3mk34rxxhl1c1878zs61pk7asa21iwwk6r2v88yziczkhlm";
   };
-  parallel-15878 = {
+  parallel-77677 = {
     run = "0hja3k53n8v8qzj1vym1j2b4pj7hqszda82s83kw1v5av6kcy4da";
     doc = "1i0ls71ib0l3igd52cgn5z0cjz0j17hsj0qc5y4sqg2nvivvw7gy";
     source = "1slmdxldvxrvf61aa1b7m09cxpv6jsaw5lvbgqsby6jvgfp4r4g8";
@@ -13312,7 +13372,7 @@
     doc = "1q5d9ldkvd44pwv7s968sv0d2nydxzb7h9fri8qr4yggcf6206cv";
     source = "1vv8yhw887jpsd3anx7gr9javp3fp7wjnfd4h3lgm78fidlfmq2h";
   };
-  paratype-68624 = {
+  paratype-77677 = {
     run = "1cwcw13xdarisjslsp8aayb984fk4qhx1ihg887fzli0wn7kpvvr";
     doc = "0kz4nzz3v6a4qk2svgqyx02j0pni92qpm5agb6k0vwylmvx6yyzi";
   };
@@ -13321,7 +13381,7 @@
     doc = "1qmqki6fm316bixxjispq92dc1b3zhrnh4ad64wdlsr3fpja6g1q";
     source = "0dc0hblq764q23xnz7yj1nawdr5m55526l0dw7b49p5rdb0zhcg3";
   };
-  parnotes-71505 = {
+  parnotes-77677 = {
     run = "178hl1422jd27albyaiarnjdjj8jb323c1xwnm59qh7bghsbdw5m";
     doc = "10b1w15wa523p773jhnasnzsbb5fhrnrq87i10q3pgjhj9yp4nmz";
   };
@@ -13347,7 +13407,7 @@
     run = "1vllqp8hxbn9cf0flsxn5pl2lz0219kc3y439rj2bz4knx4f3g78";
     doc = "13xfix5lf5n5ywd8b8sdy03zidj1rp27dfwvxhylr7p4h3ddjngr";
   };
-  parskip-58358 = {
+  parskip-77677 = {
     run = "037404fa7flsznyidn6vpp5r5rw6wpzrg6sc8zppj9hqciqlbd52";
     doc = "1pw9mgg04lxmrin7vplqyfhxa2bb73yf7qj8l3bwc9yiw78v5h4m";
     source = "1ysz2jfdi49qjyrfkx5k1vjcykk4774i581d7kynw7q9r25lyq9g";
@@ -13386,7 +13446,7 @@
   patch-42428 = {
     source = "02xfy1fs30nha0l03lqwl8xrpd81855kb5nb660ks83aj187dghy";
   };
-  patchcmd-41379 = {
+  patchcmd-78116 = {
     run = "0v0033zpp4w75lbxk8w2byhgy3s6qvm9281xc2c75bryp0ar5pfq";
     doc = "0vw698r5q5ai4lx4vrb24x8j9dc7iwaml8scsh9c22cpqn2sn26s";
     source = "1cb90y0i5k9s4jj3f9vnj6rhxphjc14p5nm6hllibww3h1khnrxr";
@@ -13397,7 +13457,7 @@
   patgen2-tutorial-58841 = {
     doc = "016bx1rp8kpvlywg0yafhbbhlzw4zxdcbdrd5525vffn6fyp9fi3";
   };
-  path-22045 = {
+  path-77677 = {
     run = "14k9dqvcc2nazjysff0s1jrass14d2r9i9cgfx46ss09cw53h71s";
     doc = "0kacibdjhmz39klvxr244n42c5vlaz1z71a8vnssmwmdzzwfzs5x";
   };
@@ -13436,7 +13496,7 @@
   pbibtex-manual-66181 = {
     doc = "030rhhb4xcijvjc0x1ylyk6xz5mn90wrlp5ss4yr6qlpzmq21b50";
   };
-  pbox-24807 = {
+  pbox-77677 = {
     run = "1b6xli52wbqlhxf2sk4ryighd6jaj6znvpfv6n9s1iq40ag943dc";
     doc = "1qa0h3ahh8q990wbwyrp4glwhdhbcgzz9yp436083w8c9ang0lg4";
     source = "15gqbvrsigqqyzcf8rda0z0kcw5h6cnk1l9pxjh7apz7i3k00i5c";
@@ -13472,7 +13532,7 @@
     doc = "1qrd28c9z0x2jcvcp5041s6qbkcvham8m06xmjsd31kwnpr4f4df";
     source = "1bgpg70150ifvrviwwbhzr1fa03fhnfa4agnhyfyp6y393i6dcc6";
   };
-  pdfcolfoot-75712 = {
+  pdfcolfoot-77677 = {
     run = "0i99z6niw3ryb7akzxxwhh0nkrajlfig6a2ixwsr8k5l4ga037cs";
     doc = "06y6bcm8kfvfkrnvwn0s14hvp6ad3785fs9cc70w85v2lnk5qfm7";
     source = "0ws6hwnfybvl0g7kpb7qj0akpnwsq9s5ddq27l9c05564lmgxcph";
@@ -13481,7 +13541,7 @@
     run = "09rqw5csr4c63w5z5c019rm8h4plqzwy0icxbzgap048a7x02kqh";
     doc = "1nslm2frwxqcrm3spr601p2r6ga2b91d7v1v0rbi7h06h14mvxa6";
   };
-  pdfcomment-75447 = {
+  pdfcomment-77677 = {
     run = "13cknk58kksg605m2jjkvmkfm47sdk56irj8xa3p0alx8c4cn67m";
     doc = "011l19b3lhc8zn3dn071gnlg2300174xaqkdn83r631zz45yriv7";
   };
@@ -13494,7 +13554,7 @@
     run = "099j54qmjd40q9mws11sadhzdmi70y27mjy8rpkw2ijhqgfhbiml";
     doc = "1wnx4ci4p77cz7l6yihdbx62w65zd18smqqkb3vniqwr11232nqx";
   };
-  pdfescape-53082 = {
+  pdfescape-77677 = {
     run = "1vbdjmm9bi9ngzz2z1b8jnf6nzf9xsaj5pvyswg13y4dr00mnz6n";
     doc = "1v81nw121acyv6mvpykgrcdvsgqmby8acpby5lj75ih4zya9gs4d";
     source = "0jk7rnf3z1hlrqlrcx0bzic46v57d8vpm4w5fn4c37q1f4v5zmpi";
@@ -13511,7 +13571,7 @@
     run = "0hicwwhgaq9dja4fj3a4s0lfx4iy2bar26bpi6zf4vdxpy0wax1r";
     doc = "1gyyskfy9xgm1r66wm9h0klmc9n4ji3wrpdxsk1q3mpz8ykrkflr";
   };
-  pdflscape-75593 = {
+  pdflscape-77677 = {
     run = "0pahx9s0711ay1b5ry8l0jxyb04zai6f3i24d0yx3llfxzsqkgcw";
     doc = "137mwic8bms7s2k1mbl974k3xws2q21z6adllb1ks4a7jm3c5kdh";
     source = "1ffqabflvm9vqpnn50n8w4yg08xzrdllx5qjq7hk2g25hp8lh510";
@@ -13521,7 +13581,7 @@
     doc = "05i0y3y9j9124v9q9z2092gvl0zdi8isnwlbgpqmj4a5g3fk8j8x";
     source = "1xq9bpkczb2qbncnj254d0g1gn3pswz8xmkdnxsdmrlayq2905bi";
   };
-  pdfmarginpar-23492 = {
+  pdfmarginpar-77677 = {
     run = "0mhf21dcz4ndhbh1g0h3kcqza4ni6iigrkif0iryyzg1zcx60d19";
     doc = "0arfch7gb07grg0n8ij0wfzbfzc8bv5izvhp3vjz8hl8ha3wyzgd";
   };
@@ -13529,7 +13589,7 @@
     run = "056w6dq5ymm0x71bcya5nq4iiflcmgw4fh6zv3yb8ihpjj3h00y5";
     doc = "1vrgfpg21bzg8xcw6cf43bjc3gh0m3r0s0y8lqh2nmdl00pmybad";
   };
-  pdfoverlay-76924 = {
+  pdfoverlay-77677 = {
     run = "03cc0088b0iwjmx5wkcs48nnmygsg7w1xlvbi0pawgmhfvfivis9";
     doc = "0702k1ckh9akj21xvbvn5s18x8s4nwk0m7jybkcl8f481qyhhv26";
     source = "1z8n2a0kwp13iyja45l014jyl8aaw1hhnxgxfib6q8i0qd97xw73";
@@ -13538,7 +13598,7 @@
     run = "1a4qmaypz1indb2pw4vz0hv8ihanhf9z0azs3zkv2ya6qkc0kphp";
     doc = "12di5a3976bkilcyfg0imx3w8771ky0acgrag7xp9rpcggbi3r08";
   };
-  pdfpages-75881 = {
+  pdfpages-77677 = {
     run = "1pq15qy136gddy4iak0mz0blmgb53fn9nxsiqqmqi3d2r26zj6x3";
     doc = "1aq3zj94zn2i2598b85q363hz7z2r5j9kyqkkzd7px7w1h84dl64";
     source = "1bqd3l3bqg70wvkf8gglikj46iiwh0zwsy186fjxvypbiyglp9bj";
@@ -13557,7 +13617,7 @@
     doc = "15w8jwhksfiv0h2iixk07xvvmk1g2j322xqid753bcyks48xffjz";
     source = "1nqjj51h0pcrjnybj3cqb8zwi0r1ipzzw8ic2clnf3in88pjzjhs";
   };
-  pdfrender-69058 = {
+  pdfrender-77677 = {
     run = "02zipdaymsrrryfn1cqmj5hmcg9r62mzrjil6fm8d4jgk8ihykm6";
     doc = "0m1cdx7gh5w5a5g9n27a2amlkmy0ixi06w2a4b145sxy41acai50";
     source = "11y3vy8709m5cz5r6zh3lnw451mn6l0674p63fcgqlircs0j7vr6";
@@ -13586,7 +13646,7 @@
     run = "00df842vapzylgavkk2c0j8yg562n2jawwznvyf3qq6dznwf1chn";
     doc = "0sa2gs440h3jd5i51hhbfvpqjpfwvzz5m32x3ld5q9k6zi88b395";
   };
-  pdftexcmds-55777 = {
+  pdftexcmds-77677 = {
     run = "1fpijk36lx5czl6bpbawlm8f34zp264l1fli095wha41fil25hks";
     doc = "00xzyvl66fds400dm5zryrv3m5s42mv6658zx7fnx2wbd0jxs738";
     source = "11516wkglckyrz41pz9cqj0xa2bd6v2l234k28ynnmfjsg56vph9";
@@ -13610,7 +13670,7 @@
     run = "1mxfvchz2h9wrybvb0ri4iygwn1ljs2jzsr9hi7j7ych0sjq1c3j";
     doc = "14i9y2p683d9rgw599yjllgyy5gdb5z560pbb4l5hlfj0mxzj2ja";
   };
-  pdfx-71681 = {
+  pdfx-77677 = {
     run = "0szalr9a0r6ghdg6i6qn7bc49xrkmvyw30wgq646nbi9qm0vz2ip";
     doc = "1aim7ajrhs5vs8j81gk1x6xg4gfaihcw5wf8nmh5yrnxbdhr9d97";
     source = "03pb1h1bgymm5v83n5yml2yi76nd8p33470fddfnbdbgwkcmgqlv";
@@ -13640,7 +13700,7 @@
     run = "0jk8jmybjamsk351hpb05jmac74l9kh0rqfasf6c1y3b16xbpzhm";
     doc = "1zjjysr6cg208x590c3vva2qq4mcldzyx7cqda4wnjr9jpnx1mix";
   };
-  pennstander-otf-77285 = {
+  pennstander-otf-77677 = {
     run = "1m76f8chma0fi8vcbj13adyg5wsclxp7i1wika8c1kx2zp3sq9c9";
     doc = "1v8xp65c6jpl6inlf6b2y0lh8w6ywn1slfp34pg24x2cvnqsb3s4";
   };
@@ -13679,11 +13739,11 @@
     doc = "0v54c02fmsxzwc8i3050mlll9z1qgmk6vvkdgjmph735q2bmlfsj";
     source = "0inlfabzb1q94bq2zw2416vaxbgwr4nw2yfax491dg5hqpglyl6x";
   };
-  pfdicons-60089 = {
-    run = "1pxw1mhm2lmggs67ql176f6csajabhylmlxaxp47irk6mlihiavk";
-    doc = "1czd4z8rfnfp241lq3v6ri4hnij4b8pg2h9lcs3qa31r7zmx4hkk";
+  pfdicons-77778 = {
+    run = "19mm9bvbzjlhfp7z21vv92zvxh5cyywy5zg5i53cgjpl1cb8ixmh";
+    doc = "00f55bk702ayzvz74jfjpj79iy3k3hxxr3av5lwdc05x9d3cb6cd";
   };
-  pgf-76180 = {
+  pgf-78116 = {
     run = "09vp18krfr18jxvxbs818hksmaplxlcf2klbq64p4k15bmd2pbax";
     doc = "1n9x2zayn53hix3nj8ssx4r46lkyfi3msjma2xc00q3mf76mzkk1";
   };
@@ -13692,7 +13752,7 @@
     doc = "0fq1w85wqqrml9jzi7s2n888165pg4ds8ysvgh56kbkd2zzahnw3";
     source = "1pc8x23l6qcq356s843si16yc6yfrvdxg7v821271dndkg7d2vvh";
   };
-  pgf-go-74578 = {
+  pgf-go-78116 = {
     run = "1hrly3cin2mk86504z8knq3xvil4q1b9q7fvl4l7cchybajdqi67";
     doc = "1wcahnldxn7hl6w70pi12lvgrh6xb3wsi9icmbq730j5b63kyyp4";
   };
@@ -13751,7 +13811,7 @@
     run = "0xarflkdk2xvfmmsafv1hhpdrfyddjxlqjjwps9yzzcwblpjnali";
     doc = "1wsa6iqyrcjq7zyanjgaq6a1i5d7lm1bk9y07mz0bjwc2yv359zi";
   };
-  pgfopts-56615 = {
+  pgfopts-77677 = {
     run = "0g7a22d0ppdzcazrif8yjic19lvz143p6vwflz16p6zh88yhcdm7";
     doc = "17q1mlaql7f510pz86n64sm4m97nii72jghf75qs5yr9h9lqrq6v";
     source = "1mz5nzbhmbgzjkpkglz2w3s9s8kzrigg3wrd91dmdhjsm4d4kczi";
@@ -13764,7 +13824,7 @@
     run = "0kzpnj8f236a4xs5zlzy81a1gw8f9wyp8m70iq3abhwffxgfqas1";
     doc = "0jxkc7h7hjrh4g33bn2ihbdmk3qmapp5pygkvgn4vnyrdgi6zl1w";
   };
-  pgfplots-76111 = {
+  pgfplots-77677 = {
     run = "1w0axkyv7fmg4b13yd173pjsyknnzwp9ns6x46jpjb52yk18x8p4";
     doc = "08r332a2h2kzglhma2axz52jl6d41c4jszhwk84bmb01s5wkxmb6";
     source = "1r5r2zq65hqm83xynx4jj0jnmgq8klj8frcfhjhs2kjh923kpn33";
@@ -13842,7 +13902,7 @@
     doc = "0qqfd2ayy4n49il8lh8ivbvzmvwlbyw83zwqlnncbb8fzv8j55y3";
     source = "0k6b75gk3c4dzcbsxxw8vbwfj98blx2zz2f2263xgc64gi5b2sdd";
   };
-  phonenumbers-76924 = {
+  phonenumbers-77677 = {
     run = "066vddwim9gr7i6alrm89ylkhbh2hz3mrcy6w1m2ykhc9vq4dvrk";
     doc = "0zn2942qz62zba3f8v69qm6xvr35xvpyk7yvp8rkdf7vy9h1jm6i";
   };
@@ -13881,25 +13941,25 @@
     doc = "0lwn61jdpzljwlgy1yzllflziwqchq3fwanj6c2yy02rfyi0lxp9";
     source = "1g1psidas3yjknj8nlhrvgjiy6b1b6z42d8260szq8wmmmybi13c";
   };
-  physics3-77503 = {
-    run = "1jpldj8q62p4kccwj79an0lba1k9rvak335qi3d0w27bj0ngpafs";
-    doc = "13hzn6bcij00pv2dmdj305szi9ipk300lsgmpif6w2490zd1lks5";
-    source = "1xad8rijnzsmcgfmm3g9zncj3wnds3bh1y3hlssicy5bmsxr9pw4";
+  physics3-77677 = {
+    run = "1d8ilbrks691dqwj1mcnqj29mbj5i1204pfpi86q6gf6fk0xrsi4";
+    doc = "167nrq0i28ns7if2zjkv57fh1fm5m1l6h2izncsnkkr40npbldj9";
+    source = "0ym072y3cs4lzlfrqzq3zb3p4kq0cavx9ywwhjw95pqb9msx1x7r";
   };
   physunits-58728 = {
     run = "0fzx8c7sgd6incgwdbzyd3pb9dmdajb3qdfd3mj8sascilr0c2h4";
     doc = "0ha1zp0lzx2q10m0wp492sf45pw5cfd98s9pnzn2wxx3k970agf8";
     source = "00p7p4hh49i9xwnfd8y7nsgxajjcpdlxw1asyxb8q20x1w1wy2cs";
   };
-  piano-21574 = {
+  piano-77677 = {
     run = "10gfxklfwf60p54wcbs4l1jpwasxvvbnkjhjpiygnk6mvzjx7dyl";
     doc = "0czqrjlfx1i6k02aa1r1crvkw7k2fl17vzqzrkc97msprrymxwgk";
   };
-  picinpar-76726 = {
+  picinpar-77677 = {
     run = "0dfar2g8bqabbi37mg5i1wd9zfxhywm8y7gn3i6z45vqvqfgdll9";
     doc = "1cqfsbf3izrscvh01q677cz3i69rz2hcq7gi7hx9qxh01258736z";
   };
-  pict2e-56504 = {
+  pict2e-77677 = {
     run = "02rhm6a26vgpscasrbz25vjimlnkh9s18pq6a9025k65iwp5f08z";
     doc = "15k5w2l4c9mxay416bgj745g45pqyaw749mn69dchg2pqh77yz1j";
     source = "007yb70j4ay0qdls8kqb4wxf1g3672yasjjlqc10zsywc005f0nw";
@@ -13918,7 +13978,7 @@
     run = "1dayddzbiicj3qcccn3lxn0fnsxbyccqss139xrx7hsqws702kbb";
     doc = "12hjwklzfpi8c0dl9k8v0y532nkx0nd19qg8w628xir9s20zirmc";
   };
-  picture-54867 = {
+  picture-77677 = {
     run = "1i2775x39n5vxspy555rwn86384yyapl70kcfir96prp1846rfjd";
     doc = "09gid4bb2wbmaqday94qj4r44cpk57rxpzg6grdcjg4y1dkjph0b";
     source = "150wv3jb6hspwhkjnbxff5izskvqfvhvqxbw773qikjjxsaidqgb";
@@ -13931,7 +13991,7 @@
     run = "1q0xdl6ip1706wxprpd85vycyksbnn1ws091gvmpdhn6as4fxg9i";
     doc = "1sa2l82yndb9pl8bfmnna20ackv9rxp7y6ljjyix3bpksqp20rwq";
   };
-  pigpen-69687 = {
+  pigpen-77677 = {
     run = "1mij57v2cfj9v1mfhxlpb857ipydzffbdbzfw00qmh6iqc36cfn3";
     doc = "0db3m9vv02d261kinx2hj70cqw7gpywr662amrmxznhhq3990wwk";
   };
@@ -13947,7 +14007,7 @@
     run = "1g91l1z71481hlwz8vmdac0g4vm5d6940gy1ly44qny626k9j079";
     doc = "070qn9b6bq4szqa9wqfmb3qbfxcgif79dzbb3qqhvs7fh9bivqdv";
   };
-  piton-77302 = {
+  piton-77677 = {
     run = "1gilqk5ghcb7vxf1i09sy8cqdrhi2kidibqwgr95fsijr1bdj1iq";
     doc = "1iyd7lnwnsvdnzz8s9d7l0298mi1fhw4lx8iyqz4j32bk1fdkw1d";
     source = "1jlcabd97n35g9047grshkm9inlhawf846q5qiph7rlzy24383s3";
@@ -13994,7 +14054,7 @@
     doc = "0j9xm75xv0lqkqzm4g8aqxy6cs8vxydmm50vsjj4g4aah7n8jygk";
     source = "0118s2p8vfam65fwynf3vabqj4kz0kkw9kbq49k7akwwj1wpyd7f";
   };
-  placeins-19848 = {
+  placeins-77677 = {
     run = "1mlx2wlm5j7qhhz8q1fvxd4zvjmjpzhk2aajql3wqvamrawba6k4";
     doc = "0libqvl13md069fjbx3gl17fyzpn6v4jk4vk5086szbi93dr692m";
   };
@@ -14036,7 +14096,7 @@
     run = "1238w5267spw6liidzxd550hjdjxsg3d1231l9vf5fmcifllsnmg";
     doc = "0w1jn22gd938zqifhbiikgggbly2fjhiwjdh2jq66yax7p76pjc3";
   };
-  platex-73848 = {
+  platex-77677 = {
     run = "1qddfffw7w3l0zgf1dq4376fx5m76jys8c95wwibxdh20vydf0bk";
     doc = "02hb0s2ryjq49pp4nqxggm9x1wqbjx8w5diz37zwxkkkw2lfvmpg";
     source = "1pa7yg6369fh72y1wxj635kv63ba3c0bdhlg3ws202r6zl7ffmab";
@@ -14048,7 +14108,7 @@
   platexcheat-49557 = {
     doc = "04hvm19x4z7vq2md3p3r2wwa7iqkgkxnvvj1xx3s9145m6fjib5a";
   };
-  plautopatch-64072 = {
+  plautopatch-77677 = {
     run = "16m2dsqws4z0i04wfman4m7d5p9y5dij8rl6bs0vphq4n0hcqhh1";
     doc = "04npb7xbhibvjjxh32m1g2c0r3q5j5jhjgc7hn1nyzj2hzz415sr";
   };
@@ -14061,15 +14121,15 @@
     run = "1bqk76g9mg86rkhjl12g41dph95zrdby9pddp7lac6bjwvyjg6rg";
     doc = "0m9yvn6bxz3w6l0vfn9ycllj50az3631v5xabk3cjrnlhdq97qcz";
   };
-  playfair-64857 = {
+  playfair-77677 = {
     run = "1yy8c8aks9c37a18ynilrag254ffcx8fj1xydsi1a58gnifmhi0f";
     doc = "18axmajlbgll8cdjw7v13n0rq9dsbpnm4sa13mf46dq4fhy1i8s0";
   };
-  plex-77018 = {
+  plex-77677 = {
     run = "0pyrcrxlvahmc8ms8xwwhmpgir3s4fwqf27b2f5kc5xhhx2gm610";
     doc = "0a7zls7bmh0mmpvcynkwzik3cm7k5jfl7jx8cnr0av2frs8vha47";
   };
-  plex-otf-74719 = {
+  plex-otf-77677 = {
     run = "14q7qc5sjmzcykvgrz4w8bsjymzfd74g8w5nznbx2q33bniy4xqn";
     doc = "0v9j80dj3vk1a60ild78ja9s42kj01myb1aqf9hmzjp2g1n4hy5n";
   };
@@ -14100,7 +14160,7 @@
     doc = "0glkk1l2gkqzkjg4vwi9qd3yfv3xsm4ssi03jizy9dxrxbgl60z7";
     source = "1ly3bh0b1xl5wf3gxvzrwwg2kglvqmaj3mb7alq5x8q2wn1sxyrz";
   };
-  pmboxdraw-53046 = {
+  pmboxdraw-77677 = {
     run = "0a1mp38f2562yq3nzv39ffwhnzwpamy74pvqnigg7hv2v7blkijh";
     doc = "07f1n2wpfqrd62agh0ddw67fnl5qczw16640h3v5x7yw31dx4n29";
     source = "0mqg8xkhqy18m2sbp2i2sv58n2hxf05qr215kbmh0b53lbp16pzc";
@@ -14113,9 +14173,9 @@
     run = "0mrvf2r4bv4qa9pzv90ardy5ncq2kgy3y89pgr1acsm5cspgryr5";
     doc = "1pizlqyb0n20apwb6rvh6yfncyxnh6vfhnvc10il9j4894rii6mw";
   };
-  pmhanguljamo-76924 = {
-    run = "0ph0p4mgz04d4sbiprpnss4dswav00brnmzpyb2gsbqr0gpqyz5j";
-    doc = "1gl20i359v3pqixxyr42mzm6rg2i0ikw5m023raybss2n472zd6d";
+  pmhanguljamo-78117 = {
+    run = "0prfj5ilb9bsj3n023gsflb332kvsivav8517p05q6wa207dr5mm";
+    doc = "12wpjg6whcr9q9jpchq001p2yrykbfdjhq0497jhbaqk46qx0b55";
   };
   pmx-75301 = {
     run = "0brg4xinn6sg8c9jvh3cvznqhlg0l8hfqv5whsh3yaajc5pn40rc";
@@ -14133,7 +14193,7 @@
     doc = "1cdbv1ls20p764vkllgw710fm4v8nbkw8ryw2546lqa21v9ki4sx";
     source = "1l6zsi6x6akb4z37iyllg99schd90bny8r3pz8vddqjyacnf1j7q";
   };
-  poetry-53129 = {
+  poetry-77677 = {
     run = "1z36zzm75zidsb8zixmsdgngvg1gyasxdz4lcw4ikdwvjmswqzqr";
     doc = "03cal4780m1r6i1g86d2gil5h6n0h8dkiv8phfjcp890y9vdw2y3";
     source = "0y93c9fvjhfs70qvnk9ff7hwq7zyq8hw8h65bwgr3f26b6skfxyj";
@@ -14147,16 +14207,16 @@
     run = "0dc8ll3xk7yrf3irrgl5bh4dwvi6mvgp3iqvzfi26jv12m3fwr8f";
     doc = "0l1ndiwxpva5r7zdgcmn4hghi31w2v6vd0bvmvmywhx82ra8spsx";
   };
-  polexpr-63337 = {
+  polexpr-77677 = {
     run = "1dml5b7zb2w4cawqgvqld63wlny45vnz7p8y2pc7b5h86p51a0cr";
     doc = "198dhv2wlclrs5sqdiqk26llyhjk4l4zr0hlcr1cw56dnhdh2j75";
   };
-  polski-60322 = {
+  polski-78116 = {
     run = "0y66zqxb87i8wymryd19hjws7y9snks73030r287lbifb77kyx4c";
     doc = "169z3y419d3afhmhk22d0h045pysdrkhyvsgrs951ah3vgf8n5cv";
     source = "1m8pysaiynxb64n81b8zj3cly6g81w2fa1nrknqnxm27bjzn2jrf";
   };
-  poltawski-67718 = {
+  poltawski-77677 = {
     run = "018iqwz4apkj8pwc3ws7k00zldnz4k02h1hv0ry9d83z34xswfsn";
     doc = "1kx83mgwkxd0sv2xjzvn6wdsbdng6skw71z2xc3xk16lk356q8hc";
   };
@@ -14168,7 +14228,7 @@
     run = "034zv3j4ga0xqkqn504fdwrcbzjh63v8zzfchjwcsbb2qn1x2rix";
     doc = "1a01r85nliax7zll3qz212pkz2yix2xzh15hlbpqgqslh564fkxr";
   };
-  polynom-44832 = {
+  polynom-77677 = {
     run = "0vn9k3vci15lq0f6r2354ag4bs55jcq6571wvz3k4daym5ka57s1";
     doc = "1cxsw0b5vxy191xy5clf15hb2cpyyqj5ipvgcw9n0hm8ka3g9l1i";
     source = "0qh4w6q9qch3r41ps38yzlv850wcqvf6b0b6vqirk9lq978k387i";
@@ -14182,12 +14242,12 @@
     run = "14c38jigpaynb6h885xbwpprv56dliamc8lnaw7mb1aih8fybj81";
     doc = "1nxssj2sgm7m587d42y2cih0sh4iclnk1nvmblkkrkn3rpzqq2hr";
   };
-  polytable-55837 = {
+  polytable-77677 = {
     run = "02gsan2wakxsw1niq6l82ag2rkkasi1nclf5yad2kl6c5654gp47";
     doc = "03k3qz08bfqjyw4ymmibabbaciqz3srd2hll9np7xdphjhf4d2i2";
     source = "1sh5wsb5i1f60sqdych0b3zjcli2h4g46znb0q6n68r4ma7xqixm";
   };
-  poormanlog-63400 = {
+  poormanlog-77677 = {
     run = "134qh7xsn7yxa9zx98gpd2hqx3lkd6sqc4rzcandvzi6prsjkip8";
     doc = "0gsd83g26cafmd2alc2acqxcd79zyxkmpyiq2bw3qsasndkyfrl5";
   };
@@ -14208,12 +14268,12 @@
     run = "1xs6a8dsm2azlq8wsmgiz7wwmsv1qyjc9x1a5bsbz7j9fq2m2xy4";
     doc = "1q1kfcm2pnykwf6ayzrgbnw3yvs1vcfwx15413qz9b89baxhq5a5";
   };
-  postnotes-76924 = {
+  postnotes-77677 = {
     run = "01zfbs9n19n5gdlpizbc747i91r6c9rzc3rl316kcj661y7sdjfc";
     doc = "1p08xb95h45aajr8ss3h8b8b6vq7qhvcm18wd379nk16lzr045yq";
     source = "00bbskic0ns80n7lcjsqip1l9ivjxm0kw03pya3ril7wgp9aqif5";
   };
-  powerdot-59272 = {
+  powerdot-77677 = {
     run = "18ii2qxz7c0wal5xqddyzd2j933lg4z7xglxsxn3vgp8ffq5kr3n";
     doc = "0zpwjmvlckp46ycdldf049s7qvgbpx8cx5zlvzh81qhgdlgximhl";
     source = "1v7pxr134kndndk542f7bs34c5kj85xy0cwvwlhnav89ff2mh5hg";
@@ -14253,7 +14313,7 @@
     run = "1lq5f5fx93a79q144980balnmnkvcn92gi85df14iyj96c1zpiij";
     doc = "12gmnd4fafkgrffh9smd8grv2bsq1dajajh3s6rqnf2l8xr1wqkx";
   };
-  prelim2e-57000 = {
+  prelim2e-77677 = {
     run = "0fws0ssw09yzmzlvkz4sl571yi6yvynnr91s76vsfxk9xrzvkb98";
     doc = "0madkchnll3aymjfk002ika9awnxqwglwa30mrvbdd3rvghqnm53";
     source = "1bbcnrlhvqldvacxms4jclk5khh618wqkkyyib1fz2c93maxmz6g";
@@ -14276,7 +14336,7 @@
     doc = "05spvrh6dfq16z9jlswzqrwnscnywp482cv3bhak4vavbxs8bf35";
     source = "1c7nhvaxs4xlycsx2n6bkyy6rhnzc9ddcnw6cccpgilds546ns4v";
   };
-  prettyref-15878 = {
+  prettyref-77677 = {
     run = "0akbp6wsxn4swk0kwxw27x3lpf5anwk49bb8pvssaj4xy68hyq1h";
     doc = "1wmvvsz7y0idwfki553qkfhg8j7k5h79nlhmaz6ln448x8gym8y8";
     source = "1w9qckaw403a8nyqyx8qyqdn3zfkxzgfzj1hdw5vwi2805bbfy1f";
@@ -14290,7 +14350,7 @@
     doc = "1pc97s354cbd629y0nlhwikbz79nq582p8i10x1qvc8ja22fa1qh";
     source = "1mg22abhgrjv9fffcgn8kn15phsvd559n1z64ggi85v13phb592q";
   };
-  prftree-54080 = {
+  prftree-77677 = {
     run = "1sdb56cvlfrys3f884hg6qpv1nwd6ywfyiq8168bs78g4q2ah4by";
     doc = "137f5nbcm6p428an3v20j5cx5djvdri12ph07czj13877pjy9ccf";
   };
@@ -14298,7 +14358,7 @@
     run = "0d268n4f6f62r7pb8nc0kiqscpl79rfpgpk5vzy1amxracnyv04m";
     doc = "1yvgir1blj72inq130jlc9xn1gb8ybf87alg8i34d0m4yg2ai89n";
   };
-  printlen-19847 = {
+  printlen-77677 = {
     run = "1h6q95dvpldmrfbpdv9v19p34iwq3jzz7vs0z7b6fnijyybjxnpm";
     doc = "08p9zwkgjpkh7ip3i54qjdazgnwq79v15hvz4j4y2dvh294nmrgn";
   };
@@ -14338,9 +14398,9 @@
     run = "0rj7x6s9afn5yid3pqd2vz9qn21z6n6m5cahq92ygn1ix5xbw3dg";
     doc = "0z56g41bw3lwi32z0imja6a4nls406ck3ic4pibyi5ajcb8317w4";
   };
-  proflycee-77424 = {
-    run = "1f10xfwhnnz8qk9780zb1jbs1a9q8b07cpwxcs9jd1fy7a4vp7pl";
-    doc = "1vgrmq8yk5a6wp59kad1wlc4fn9mh9c5gj9sydvgaysf25hfhxbh";
+  proflycee-77891 = {
+    run = "0phkljkydifxx45aij62y6dihyzdkmnnnbcifnfjj9a5cxq8s65p";
+    doc = "14yc46zbcz6a769pqv83ng3qpfhfb6akkvd4ncchamfcc4l5f925";
   };
   profmaquette-77282 = {
     run = "1l3pkc4c5bzln9zhpyrvrklbz2bpclk9vwmr7q567601zf8prcqp";
@@ -14381,10 +14441,10 @@
     doc = "05g3k77vczdqk19gigs9b6w8rccvcr0d382ysqn0yg6cgd70bi43";
     source = "1mggrm4cfji364ylra3ffdhwbx6phcxwfzw2mwls00msk7jdzpsg";
   };
-  prooftrees-77411 = {
-    run = "0md5chi3ikjl4jz8izw3iivp10kfxx27i94xk6sisc2yd0aik2rr";
-    doc = "1vjv5a7c6xqv1b8b4cr8lv8i9rw9m7cvc5xs7998s2nasdwgj129";
-    source = "07vf1xvglb9ly3gfj015r55527w59axy7v59sj94vjyh3gpj8xn8";
+  prooftrees-78041 = {
+    run = "06dwrdx1dgbzmhqhr7y4n14fp2xz01ws2x2bgyd3b7wip6nbikmg";
+    doc = "1z07plhmc5w34qd9cbx241sm125sh2r5x8a30igjalzphrz6zczq";
+    source = "17grz0lb6dz9g6716cpfl0finmnrpc9wah025b32pal1ak5q64kb";
   };
   properties-15878 = {
     run = "1pxl101mc318ivzszyycwb79rqghx4x8xr9fvq216ambs7gq4sji";
@@ -14395,7 +14455,7 @@
     doc = "1haa55hhz11j9m3lxp84yzlpyalrc3hlb7wxvmngqhn2j2mi0b3c";
     source = "1n3z0rvhnc76grih3jy5h5ax7rffxjwmafd92fnp10jinr9riapx";
   };
-  prosper-33033 = {
+  prosper-77677 = {
     run = "1vsjb2r4xnlwwdjbnkpvl42c86rkzs2imsq762n2w6x41i591ics";
     doc = "1f5w1vb4d7z990mz6iicjakqhszcwirphwv966c66j2jc3yvalfn";
   };
@@ -14448,7 +14508,7 @@
     doc = "110n7a7jgfmzps5ng4gibxigmm3dpkqlz6jpbnphrw1pnlskwjsv";
     source = "180yrq0rnsb9cd8j70jym06k543q211fzzswzg0dq8fzn3hk2wwh";
   };
-  psgo-15878 = {
+  psgo-78116 = {
     run = "18h614dasdg19jnwwl5swih2dxp4wis66fkscq8jjmpvjnckpck2";
     doc = "0naza2kxcgm9wdcyibs36qnwwgwpsbj2m9qkk3l9d54kml3wiznp";
   };
@@ -14461,7 +14521,7 @@
     run = "1wfk27qb4x8aafph0lgnkq3bkz5fy4cmaiivd924mk92l1wfg6dp";
     source = "11gykawqw4fi453s1bp2r0pfm0az2k8gr3rcrygzfqqzgrhxvi8f";
   };
-  psnfss-54694 = {
+  psnfss-77677 = {
     run = "0ng5pkk6m2l8yqd58wggbakbs4hp4400r4ihyi9akf8j4kmq2s5y";
     doc = "0vfv9x1qsivwi6c6hi23vw0jcjz9dclx0vxnifslyzlrh7592dzc";
     source = "0cqpzra8jwdn9d6w4mhmfrfw2zia2nbpyxjfrcz8m1disd10lhsf";
@@ -14475,7 +14535,7 @@
     run = "00y967mflrd0y38mqyv8r7h489jrl38rgaiq871wf9k3cbmf0f1g";
     doc = "0j1c2kxc63nf33gi1f146pa6hw7fm5x9h4yc30dqg8hsd2v0bni6";
   };
-  pst-3d-17257 = {
+  pst-3d-77677 = {
     run = "0mh6xbrvwxx7nxp4yqm71hhpqjb41g4kinxkj2vmspw9wrwclbj4";
     doc = "1dp9l6vwhb306j998hydb07c6ig10ibn7h0wwiaisgabn0s69xqh";
     source = "0m9lvgmjzzc2lmp63vnly30j9886qabgbhqwpbbyl035cy6k684n";
@@ -14510,7 +14570,7 @@
     run = "0w3h9xpikkl4ilvgp398m78f7k5b0j0w8z1zsmv57mkwf8fisk6x";
     doc = "0v7cqj05haz0gfjrvy0ppcfphwizxavznbqakkr7b51krh2c9grv";
   };
-  pst-barcode-77091 = {
+  pst-barcode-77677 = {
     run = "0nnr57n71x2fn7gyffl7028ya46hzxj8mi4xpm3g8phlxk2iamin";
     doc = "06q8sc8d8g3hyfzhxgin2k5la2h4mwsamn0jarn062wk9snkib2k";
   };
@@ -14527,7 +14587,7 @@
     run = "05ys29amaikrm31avlz0kcra9j48nwvqwr5fwl75ljydjf6drdaw";
     doc = "1czq6932fmx76c82ylrbh92qs2nnipll8piah0c7f35xl9y5xgls";
   };
-  pst-calculate-49817 = {
+  pst-calculate-77677 = {
     run = "1knbqbysc6f3csy1y2vf413cw2jpf722l0hhs20yzm8mi8x279yw";
     doc = "1jyxfqc18whihn8jkp041bvpp1b4f7jwi2zdj8abnmx45d16i6jc";
   };
@@ -14543,7 +14603,7 @@
     run = "14c5blwypcjry37gsav2gy33iaxjr0jrlnfyzh46xjhqnh2d1zzr";
     doc = "1zcyjhwf4l5y6iq6yyhg6dnidpwlbfakcd9v8ybdh2dkr2nja3d1";
   };
-  pst-coil-75878 = {
+  pst-coil-77677 = {
     run = "1x3x5hzydgv2bl1f31gijw3ih5cpgr5wpybibzjyp3mznj6q6681";
     doc = "03l3kiv7bs9a32sabvx4x7wzadxfwrz0bn1knk5r0h8h9ks6d5zf";
   };
@@ -14573,12 +14633,12 @@
     doc = "0zx7x15p6vxj1f9v8id7ba49878xjmbqzh762v1sy1bxygj9yb21";
     source = "0n1rxq6jx331b0qlnpjy7mh84m9vdlrs8ckr2b3slwcwp63cs0sz";
   };
-  pst-eps-15878 = {
+  pst-eps-77677 = {
     run = "14grlhaxxhwmpw3xi3xv7n3bq3zx3qwd9rh707wfgz87iaj7jzvw";
     doc = "0dz6543q5g4wsqcwcwablr7w7w5l6dk19m9qpgrhb1w8sg7hgc31";
     source = "1cn9yl1prwzjvxwgyzs5jdywyirg9hy8g76cnl62gkk9ndmcpryq";
   };
-  pst-eucl-76924 = {
+  pst-eucl-77677 = {
     run = "0fr742cx9fcllwzmh4w9690h2yq2ch6zkf8m39iksdsfx82x6sah";
     doc = "0jxn56qsma852nvb3m9qipxyhl39r3wslwwbiggax0jwqzrnbbia";
   };
@@ -14593,7 +14653,7 @@
     run = "0qi5zll29rfc7jkmz4hs0y22if5qjn13whaf7a62rdfvbdp1l87x";
     doc = "184d371rhqn549a9vgvdh92ikzphmdsbskny0dnh0pcgxzwdabzz";
   };
-  pst-fill-60671 = {
+  pst-fill-77677 = {
     run = "0h748amhh9mhpg1m3l5maq75k22jhk2xnml0ncm2dl2fay06mlin";
     doc = "0p3c86vmlx8h504vb603yg321dcf1lwfyfvlc7qmlzmh1c2flqvl";
   };
@@ -14623,7 +14683,7 @@
     doc = "1gb9rz3kz13xzflr7r00dalqri10lbn830v3xcpmb4n29a2bf0qv";
     source = "07kpm9irvp7dn0hd1wh08p7lfbgn78jj63yqzzxn1jb4wrb4qkx3";
   };
-  pst-func-70822 = {
+  pst-func-77677 = {
     run = "05jklcckixdv3yal7ihzsacf2mha20a7z6xnjajkh98mm9wnglyv";
     doc = "1sy62sny0znas7vcnkd6ch6amsid0hc6sfd2xc80p98dilxc9a19";
   };
@@ -14648,7 +14708,7 @@
     doc = "0985ydi7jfsvlynjs5ddjhyhbh11nficfphy6qnvbv0jj367rabq";
     source = "1z981d54aclpbq9ggy28qgnsspgwkavalm0j68pj69jxbcfxrpby";
   };
-  pst-grad-15878 = {
+  pst-grad-77677 = {
     run = "0bzq77vj333dsgilfw9k7lslhpmk67id6p1z14aw7nfrhyc80082";
     doc = "03v585i28dc65xrydsp5jj9nd6kfpmhrjkwm3w89dv0p32xyzh11";
   };
@@ -14715,7 +14775,7 @@
     run = "12mhgnzysg2bwizbhwzf74nx53i6g7vg1pw7m8lvkc0f30m2jacn";
     doc = "10gfvzwkb3cmv3kzjvzrc3951pqp4fmx1yp5358lrr3an65qhpr4";
   };
-  pst-math-67535 = {
+  pst-math-77677 = {
     run = "070vvvcynfaa7mmfmqkkn7va3jvpmwxphm2w8j4k74indii282ry";
     doc = "1w5rhcaggrjn9hmkx4h2h31470fpj8d3v3gk4w8ph35zhds5vl9c";
   };
@@ -14727,7 +14787,7 @@
     run = "16zhb6gqrpdn56cggm80q67yp175dkbvyj5iy6zr5bxwj6qj8px3";
     doc = "05g9hsxfcm5yl6afrlpba7hc7hd1kr0k00m9zj0jcqp1ggsqnb6a";
   };
-  pst-node-71773 = {
+  pst-node-77677 = {
     run = "0v7vnmxy1jjw7p3ij35zvnkfpy9x8xzczvfz636jsjvmj46kqd0k";
     doc = "1g63a18fngxsx30vi9cr7s6na5bagrlzqznydqn0kwghsrs6xqix";
   };
@@ -14757,7 +14817,7 @@
     run = "1frp9pmwngklkwyicr04aph29ljjpgcgagnk5r6dxb0c8bp3209k";
     doc = "1669300lfawksl65nx7x7g3kzzhf8qpj08isxcba40ac6lwkfkp8";
   };
-  pst-ovl-54963 = {
+  pst-ovl-77677 = {
     run = "0p4yyrvagfjamwd1f81qyfhz6wwjpqi6nfazyl8ml1fd7qjv1g18";
     doc = "0pqh9sz0l0j0bzvsva6kba6gm7cssy36i17px2zrr3lc9k6yajf4";
   };
@@ -14766,7 +14826,7 @@
     doc = "1c597riwdggb0fli4w4ay2iwkqhaiwxy3mcl9diz8lijy0h4fpk8";
     source = "0b2w0pgp8njbndx6x3hq0rwxsr1gwf848l6gk3vrkksq419j2506";
   };
-  pst-pdf-56622 = {
+  pst-pdf-77677 = {
     run = "1klgwqpc3m5k5ciiqb070h48r9mp4hmssp4s82k79n6kq45ar33m";
     doc = "06b1kpazsfn7gv2npfrnrmxlky5mhw6dfyzip2lwd243m08jdagq";
     source = "04b0kpxmzi42116pxmkdjl87bm6j22wr62w7bka9qww2ifj18na8";
@@ -14785,7 +14845,7 @@
     doc = "08d0g6mwkqrc81g5dhk016bi2dvr3jz389f32kx89w6n11iw5pqr";
     source = "1c4pmwrfk9yxg8jshhy5y4bwvlwwm6xn39lgr3xdvsl9bn5pfz2b";
   };
-  pst-plot-65346 = {
+  pst-plot-77677 = {
     run = "1xq4l3psjh3vb5ilhjwrwyjil0i4bdy4pc0k0kqkpbab76p9i0wi";
     doc = "1h016y4gfy9kpd33ahwlqvi93c3z5gsxg1b2jayiazzd6fi376gb";
   };
@@ -14860,7 +14920,7 @@
   pst-support-15878 = {
     doc = "1470n03zanpw35dnfzyjqm7d5lgddrimypz28x0zsk9nqpamnqnv";
   };
-  pst-text-49542 = {
+  pst-text-77677 = {
     run = "1s0dqi2mpzlk8069piv4z7jg370navi4r5z8aysy9vx8n0vm27zf";
     doc = "0ia6h49lfi9394sfr29wmafbhvgdm5zj7q13zll4d1agakn48j27";
   };
@@ -14873,7 +14933,7 @@
     run = "1ip2cm5wa8m9b7mb44lphkdjbqascchw8c1s7yxd5zc81xnapjwk";
     doc = "1c5z1jxs720aczn7mjn9lz8kw37k32qrngaa9d8338ls2q47g88p";
   };
-  pst-tree-60421 = {
+  pst-tree-77677 = {
     run = "1hvjna16bncizkja6hac8q4snirlrkm0c5ybi9c8b8zjb4i6gynd";
     doc = "1fp2wx2xwhrmimq5axmpswnw62f39q4rqqi8zxklhkr75ccnxrfp";
   };
@@ -14890,9 +14950,9 @@
     doc = "1c0pna78alfhi8i7bqr9zwcxx7sksi3idin5wyqa9dr95a2pwd80";
     source = "0q5x7m84qdv8sy7x2nqfbhwp1lryr5vkji4hf74a0ialc617nfvd";
   };
-  pst-vectorian-60488 = {
-    run = "0q4yzrn6rk488awv2g7qlba08w6807p12dlk1pydp42sba3a3sll";
-    doc = "0wws88bwd9zmlhqv4xw6v31cl5dj64hzvqgw944gpjcgxpz19215";
+  pst-vectorian-78116 = {
+    run = "1jrydfjyyh8p8jl3hpylixnliiip778yf4q692fs8x00i8fcd4fk";
+    doc = "0q5a6ga8zda15cka3x9ir02mlcsf2l6xsick8rsd23kb42pd08zi";
   };
   pst-vehicle-61438 = {
     run = "0a8809rs553n79zvpi8vcg92lly643n1ss53pfkvk2jki5nszzwl";
@@ -14914,11 +14974,11 @@
     run = "1g8pmd13f73v8bsrcpf4a6hh00pww6isz00gj8cxnj0xnd4p9xwf";
     doc = "0vwxrcm29w8fiw4mmr5jcxrlc122k4s1wg1sqvmzqypwpvyls59c";
   };
-  pstricks-77093 = {
+  pstricks-78116 = {
     run = "0xk3ia5skvpw83g0fp3ff0y4qhr081781wvacmc5bllzh76479x2";
     doc = "00k0a8ha0xf1s2h1jkazzdscr17c8h3v2phmmgq5xlrh5xnpz06m";
   };
-  pstricks-add-66887 = {
+  pstricks-add-77677 = {
     run = "1h1y2r0y3vypygcczkqi8xpxc0mdcgqm1xfscspqw9ifndx0rwrm";
     doc = "0bd3rwcdmxnazq86c6wwbjkajzd75knja1fc7s3svhn0hxy4jcza";
   };
@@ -14958,7 +15018,7 @@
     doc = "0ky2zh6a5d6w2aq8k9wg7p3cvp8l4wihfjlz3sir3ggj1rx2x6j4";
     tlpkg = "1rikx19qn1av7hrihjviqi1jgla1ncw3fyv7mjav490813nk92ah";
   };
-  ptext-76924 = {
+  ptext-77677 = {
     run = "137amhihk598rhaf0qmbahd9spqivzqrmi53y6q3mlzhlrxg0p1r";
     doc = "12crg85znvmpr5yhvr4yr6riw037zwcpwpavp1vb1nnd9zy99ya5";
   };
@@ -15000,19 +15060,19 @@
     run = "0rydi3bfq8dgmyxpd9fwry9k2fw5pmbcgm5hlh6v0s91z64hvq8x";
     doc = "0a18y1nx3ii6654lmxifji8cvkyb62y3sc1c0j3i40n5qk1jvqhm";
   };
-  pxbase-66187 = {
+  pxbase-77677 = {
     run = "0nlnlzpbd2dd397lxxg97pgaagfyb00ygrd6dz0v3gkmpwllnkvf";
     doc = "1kjkqsbrsiwzz6szjm2irz6ijy9q5xnjimdhhv52xk0j46hyiphf";
   };
-  pxchfon-72097 = {
+  pxchfon-77677 = {
     run = "17jdngs0mx78mqg2kkx6aihfd4jk7yp40l5fvmvdgyzf7nvpbd69";
     doc = "1pxlfdpn1bdk8hs4v3hhadcrkhw0zxb6dgnxw9y7v38jjx3wk7qh";
   };
-  pxcjkcat-74144 = {
+  pxcjkcat-77677 = {
     run = "1ysgjf0zdm3b1jnkwp36sdyf1n37gy4gr6639k2wwilr8n2g4nsm";
     doc = "0bhgsiyyks752icicplv4zwv8fkqqfhljlxrr46djjccq04yr311";
   };
-  pxfonts-15878 = {
+  pxfonts-77677 = {
     run = "0vkhx82ywv17rflmq119jxs3ib08rfw6lkjgr3mp9vf6vplgqzki";
     doc = "1afcy7c1n63zi5czbpnajrrgwfp9xdymkgwf5h9865adjbb3lm82";
   };
@@ -15021,19 +15081,19 @@
     doc = "1md7q2q0b2lhffjm39cxzxf86rw8759zxwj5sbgavzdhyc70ssli";
     source = "04vdi4wf7lw15v05jqycm66j1iiy6g13qrc1ynrnq0df8b0zfs1g";
   };
-  pxjahyper-72114 = {
+  pxjahyper-77677 = {
     run = "1ka0s7gdg2csz9jxh4ynsd8l6bniaslnc8hs5145iza4g5cghqry";
     doc = "0zdlzp0pw1xa0dispqm9idywhrrcdwn83rr368v56pg7lz427k4p";
   };
-  pxjodel-76323 = {
+  pxjodel-77677 = {
     run = "074v9jq2zkikir93hr2rbvj8jiaqdddqzgd8lkbjn42z1vgc3hqg";
     doc = "0lqrfy2xn76azdg1kis5vy2rafwl3xqmd8g8mmvglcl7mqdkrp7m";
   };
-  pxpgfmark-30212 = {
+  pxpgfmark-77677 = {
     run = "0mkcc99fwi8n63fghw3mz2alhgpakc3hqyd40s2fpwisvh15rbbr";
     doc = "16sapygswd6mr0pr04c86jzngw6gdf62bgv2xlrfzfpq7cnjafxb";
   };
-  pxpic-67955 = {
+  pxpic-77677 = {
     run = "0zy1f7584bmmn00nwzl8w17hwrc4c5i798763p81sl784hm2vpw4";
     doc = "0yw22zb82scd1c4n0niyc69n7xhjgadabxgbh7jjkxrjbzp6j18y";
     source = "053yqnrc5xfj2gifnn94lxhawbnlfw3dhlzz3jnn4pvry7vnqhvc";
@@ -15043,15 +15103,15 @@
     doc = "0cbx00q2bwnrhjwfgwdj4q09ix208037774az77cg6i2qz9xmagb";
     source = "0x592j0vbp8pw0r1wd2mmplksyyl6wnwns8smf0b8s4y3k96n71l";
   };
-  pxtatescale-63967 = {
+  pxtatescale-77677 = {
     run = "15swkjxfxznb101hvlqcxpplxngfaf0nbpkw7j2fgccyqjs5fhfn";
     doc = "1j6yrpyfhn75qkv03bnwj9i3s4lmsh47sw696y13cflvdmsgs8n6";
   };
-  pxtxalfa-60847 = {
+  pxtxalfa-77677 = {
     run = "0fanfh1gb1fmp7binmhks4l90s6925pki6gwyzlaa7vy7za1l3ck";
     doc = "0jc51zsbqbjnp7zqbbl1cpqjf7rwvsxvfzfzm9wsbkfzd16c9817";
   };
-  pxufont-67573 = {
+  pxufont-77677 = {
     run = "0vvnhghcdlyqhl8244c76wd411cd9cjmjsrhic47rjs9sis1ilci";
     doc = "088a02dfk2n6lgyfri74p2lnbp7mp4vn96qqkby0qjfnj6956hb7";
   };
@@ -15059,7 +15119,7 @@
     run = "1kd9jqmbxhkd7gijghd8wi0q5sxqf5dpf22z96wwr29kvv7jxm64";
     doc = "1ppayblsdpmrd9sxfpf0kqhbsxfd1fgq69g48zj9jzbhncwx0lhp";
   };
-  pyluatex-76924 = {
+  pyluatex-77677 = {
     run = "171ahvh5ii2gimcx0a2g0dn7s87a58yff7g2dwbw5hi8vyqksfi5";
     doc = "14sxmfsk3lrzcv0k8rkrq7d5dirxmy58i3km6bkahigk5iryq38p";
   };
@@ -15079,10 +15139,10 @@
     run = "1raqyynzvc9nggjr304xgcrfxiwbkabwwr258qp2nqkmdi989bnz";
     doc = "02v9szss2qhlyppww8ic28ccc4fpj75l8v90jj7kjbw7zlpkxs3b";
   };
-  pythontex-59514 = {
-    run = "0hgbhdrzxvkc8szvkq2vi8v4xxn9k05zpa95vrmdlgw76ms33wvi";
-    doc = "0pxafbrr7mclvn2zdwirqbfa0b03cm4l4wbcgh1ag75skghmh745";
-    source = "03a3qj72hzczf4dz282vqq6w263zk1zhgm69h1rk5ibdyasmv8xh";
+  pythontex-77892 = {
+    run = "0haqg0mq1qhwn12dvx8g7kq6g441fgkrgj6nvq6nvsxwasq0w492";
+    doc = "070bp9h5ld6gyilbw167x61892xp7g9qakajyhq2qj6gwcvlmz2s";
+    source = "1cpabdwa3kq6hwxqgd2r26ha240l5m3qcfby1lx6ifhpciv6jw7f";
   };
   q-and-a-76924 = {
     run = "15gmr65sq78id1l8nljgppbv85q3pjswwfgylc2msa7pk7vyiwzp";
@@ -15110,7 +15170,7 @@
     doc = "14hfgxl7rl026cmbh2cxnj51fslm1zzfnc5pv33gqzd3nzmbs1mr";
     source = "0g3aii3fdjp3ps788b108jj7ggks4ndzhg071jqca0q5xhydnvph";
   };
-  qrcode-36065 = {
+  qrcode-77677 = {
     run = "0vs5sg5hch0c2rxy27yiy1c543l2fnqinr8nvsyr288fja0pfrig";
     doc = "1rmwz89yxlgrypmki8xanqc3xxm10m9zc2shh5r0fzwmsfssri9r";
     source = "115wlgvpxx0vkb9d4gfwbqamk7sfmcfd11hxbfr8khd5hv8asvpi";
@@ -15159,7 +15219,7 @@
     run = "1cj7hs19rz10njgjgkwwc90jz849b356nih9kcbcagyd1jmaasji";
     doc = "0f29ci7011bpqlghb5sd9x8nhkxigk0lygh7n1qmxqr5z38mwkqz";
   };
-  quattrocento-64372 = {
+  quattrocento-77677 = {
     run = "1jn29sl616p97vf81krg8g94zqsgvw40p1mh664i3sfkglxlag2v";
     doc = "1v63bbn4yd799cy55w7j6isl53ngzngq9jlzi63nd5bmk4lqcq3m";
   };
@@ -15171,9 +15231,9 @@
     run = "16qy6rxxkdkkli1knibhbm28jg80l0qjsn9lsb36b7z5xwxj9f21";
     doc = "0ic0lkhj3rdpwfsrysm5qidw0gby11kmfnzbh5k2fpkfarwfhxxb";
   };
-  quiver-75606 = {
-    run = "06hfvh2rsv9z3zk1zgxj47yjbn0wpd4z97jaf9j80vvqhg2zg1yr";
-    doc = "0vxbaghlnyllifg5430na9bqa99xx851a6rzz29a00rbgsps45k8";
+  quiver-77817 = {
+    run = "0l7s7si7h7nk6z3j83xy0ihbh7qkik9l2qa4p1vhrif99szma0z9";
+    doc = "0i6di24mrhd3a3j1sfwb181w4fjqcf5wk4ih28yxddlr6gqv9z2h";
   };
   quiz2socrative-52276 = {
     run = "1s6g0svlkg503r5mqn3iw90qyw5lwpv7dj92yck7ymziv9p59qkz";
@@ -15183,12 +15243,12 @@
     run = "0xpb8cyfhwwsxr2ghikxsa7rmw98jpjic0c3lhzlfhw0742gyhd5";
     doc = "13m0fs69dbmas2y0lwhcsflgrkaq00ki50l3rxdm1iw0xnng90nx";
   };
-  quotchap-56926 = {
+  quotchap-77677 = {
     run = "1284ldj6pfqq6mz2a62pi81k1jca8xkc6wa1wbrv3kqwfdcc8cwa";
     doc = "1bnhvp91adi4bhzwddzl16qw6d74in94jq2h16lk06aakcwr72hd";
     source = "1g2cfb5j1qjqads2m9ad9a8n0j7ihrvd55q9b56jd141a23layb6";
   };
-  quoting-32818 = {
+  quoting-77677 = {
     run = "1sghajwgfdc1p0gifii8wz1rvzsiy38f4jpfmh5pys9w6nr9a8bj";
     doc = "0aknicilv5rn3claf77l5br5mr21yg1dhdc1j1yxigz9k8pljzm6";
     source = "1h01p11ahr4ykqnhgl0kwc5i68mw9wznswrxy9ab5rpma1agjkzp";
@@ -15238,7 +15298,7 @@
     run = "04icw2n2vz98bk48kbqybb6x3wgzz8fr045133vinybx49nk8xxa";
     doc = "16ksw9wid0sr9gjhjkxk3696fcy19gky3cp9ia6rsfh20f9f2yw2";
   };
-  ragged2e-67441 = {
+  ragged2e-77677 = {
     run = "0wvvlhbmj1j4gp66l9p1hq526r3izywyf8ddggj316q2pg4db53d";
     doc = "048f04kd8rzi3cnqwa8gw4cvx2q5k5qpnph2idvkvjy3lw3jr9nj";
     source = "0zj8nphii46xwc4gp6h6l65zz9lx3s0741x9gkz9ghq2x8m7qphz";
@@ -15247,7 +15307,7 @@
     run = "0ppw3hd9bzxfjansb8pvz32ps6brznqwshri8ha7qfdjh0ygd3h2";
     doc = "139sx9sw296lkrny4c71ddd09n5q4inpzlk0l3iws9gx04b131cm";
   };
-  raleway-74901 = {
+  raleway-77677 = {
     run = "0iafrh4ippkgkzihnljanxwpr4gy53nkmmdbk2pcv2smzygri517";
     doc = "1j60ynvqn9l1qbrxfh7kmb4754p8h9w9wgnbnh737pfxanrkiw49";
   };
@@ -15265,9 +15325,9 @@
     run = "080381hzibayh4xjsvf3g4yw82s1rsag2vls21g31lmp2kn5y4p4";
     doc = "1rn6byn896p3l5pb8yjyrhc6x3m34bn0llqb5x6whdsd35g5j7ib";
   };
-  randintlist-76924 = {
-    run = "00zl650wrr4xq3g86192al6v36w49zg286mx815x4hj0rq0lcnql";
-    doc = "1zim38z2ypq1s5dm3b2hmf7xgnm0mxbm06w6ldsqbbgrlriggksi";
+  randintlist-78015 = {
+    run = "1lhqq6b1yanh1bl1yy17kbdf8dhn8f6h5xpjqv100jy8cjal2z67";
+    doc = "107zi1nlwy18qhx9i4d12rgsgczzbqi9f0lj8p5pvvd0jvzfkiys";
   };
   random-54723 = {
     run = "1y4dn1i3kmd99b5br7a2j6ppf0ikzp744si5p6m5rmvg4vh1jh69";
@@ -15295,7 +15355,7 @@
     run = "0mrk5p7h2y1kaaj45fcr56smzi7ny6808k53s5442gf538id9jmb";
     doc = "1ysaqvli3gy777a5g1d7q5brc245qqfr1fhzj0a4dwrj1gcnw4x1";
   };
-  rccol-15878 = {
+  rccol-77677 = {
     run = "04nw4h7z4k4rnvqh5s602l8h05n85iri3p3cpic4ss71ccn8c2dw";
     doc = "0q3qb0sbhnbqwgc0i9bw27s317rbz05k6pmvhad3m8mvlsbgh285";
     source = "0ss2436k5fbd25cynhw13lq4ns4payl8fi8lc96vi0kvn6jmkwrq";
@@ -15323,7 +15383,7 @@
     run = "1hx39j04h7y14qrp75q9f5x3nnii62pvi43ww48nk02glxs9y5kq";
     doc = "1v0f93nhylqs5rz2bxrkfpzlvwajsz6znlyvdnc0gxcbwg330j1q";
   };
-  realboxes-64967 = {
+  realboxes-77677 = {
     run = "0xyp6w8kbycaqmrkkrl8701c7shvd9i16vvgs28cvr61nkv3mv4s";
     doc = "0xd95j7wgv3yzrzq9lvdxpzvvvki2an8kg0zm29yz01m397vmys1";
     source = "0r0phiq8v15ra9a429j63kyjv3w2p96myr8czijfcb9g4920jvmm";
@@ -15333,7 +15393,7 @@
     doc = "085nfwsfvmbwv7zlfg849ywyqswi011278gmws01sv3q5y6ypfxq";
     source = "0rp15pryn8zyq668pxapwg0imbn76m9fclwh6qd2jj48bqrlsq06";
   };
-  realscripts-56594 = {
+  realscripts-77677 = {
     run = "0ph678nf5k03xl63z66gkmg5f8agxy201y6bvabhdnb1zhvfrfmm";
     doc = "1kmlaym3vxb9mx0jp7wvmsk13i30wyyazhny5zzk14bwx8rk3kf4";
     source = "1qzqr2q2bkq4pchin1xivg8gwx5qkgip4kq74rswfz5a5iimyh0n";
@@ -15378,11 +15438,11 @@
     run = "0pj6xvdd30b4y1fa01vmhczinw48d6psfd8iy0rpzpaq89rbjrvq";
     doc = "0sylgv7viy4qgl0krhsf8q1gkxiz91wpn0l5jyq5y1zg92x8jk1b";
   };
-  refcheck-75629 = {
+  refcheck-77677 = {
     run = "0cw0ycdc7h616qspnlkqps86xlgwa29cvyvib84mv6ir20rhdyvp";
     doc = "178q47rlyir828qc3p4qnlsg5gjaxmwgnqs4y9bva4b9zb1glz8y";
   };
-  refcount-53164 = {
+  refcount-77677 = {
     run = "1r4lv6yhybqb8wkqyaysimb79kbdgvv393kn7dkjqr46b5w4fzcf";
     doc = "10vn481rkdwv63z4n67gch55w8x44v125kf3v7299j92fm8fdznk";
     source = "1rf8yk9xc1qhiiq30jhvjqmg5773g5d33fpcpih4i9c1l7kad3sy";
@@ -15401,7 +15461,7 @@
     doc = "1jpx3yka29lpssvhjl12h1bxj0k996x7a7rf1742wph6w1n5ymmy";
     source = "134hq9c9kdr7rgzmp5jkjccqgfw10zwv33zmj25b91xljn5afc6w";
   };
-  refstyle-69680 = {
+  refstyle-77677 = {
     run = "1jfnb5vcsdj5wxbl8cpiv0bym8n62pqhqz96vy6hd7cnib85k3c5";
     doc = "077h83hngpdv7bk5cvbw9w351dfkiwbbinalp7xgw2x0p240d9lh";
     source = "0c4ip2pri9y5hziwr3p7xlrv6dnj6g2h7cjnlff77zq1bvyzj70y";
@@ -15411,7 +15471,7 @@
     doc = "0qnxcyh2vhkylaav056lc2vg24y5h11svzy6hrk6rr3sza9k6z2k";
     source = "1xfk7qs4x302lfi93a1n8nzpsmzmypyb34d8hd7h8y6nm7q2g4y3";
   };
-  regexpatch-58668 = {
+  regexpatch-77677 = {
     run = "0i8dfsr32f4w3lfh88z45sdhvwzqgh52xqfqgj53fvynblpz9msw";
     doc = "0qh2g9sdj971a75dv3jfxi3ga3mf6fmb4azphkdgxmm690dblx35";
     source = "1iq45q093v1n421r37w42815yxjb7iby426a48mvgzyc1c82rd37";
@@ -15421,7 +15481,7 @@
     doc = "0zi950xii9qbscbv5030aw02arc77c8inwxmzkslcmapdqxq5wr4";
     source = "1jz02c2c5xpinxninb1a2bkgan21gijs48rks4xv17y7k6z9h00v";
   };
-  regstats-73635 = {
+  regstats-78116 = {
     run = "1g6r24jlcddziccbwcilmcg6jlr3whb6qvi6v695ijf5f9jfpr9x";
     doc = "1yzbn42rx5c4rljs9ivya5g08mm53xdnzg9z63218bryigj4s9ai";
     source = "0f4xwgqacnl6sqlmsnjrk86q9ymjnl2w3ikmhs75p3rssxjmzmmc";
@@ -15430,17 +15490,17 @@
     run = "0lwlkrsvx7iry83044nkfl017qzcnk6my66i0lvd5zs2z7i9fir3";
     doc = "0sd99jb28jivk723b7qrlwxzx7bjgh1s2xhnxy3w4sq102r7pk6d";
   };
-  reledmac-77517 = {
-    run = "1d5ff0j96vxx2amrssqscd4k1kpr47l5wfn2j43z6vnpmfv80qny";
-    doc = "0avjf8f5f8li386s0rpm2x04mn9ka7560mhhr8q9ml8l6kw73hnq";
-    source = "1993l78cyqcmc0lay8dbzw0lyl931609sqmrm053k75ixbnbh78l";
+  reledmac-78116 = {
+    run = "10ilwww3c6975fvhdqqxy644al3xfdra6qj8axsx0s40xsjln4ky";
+    doc = "11ik20ywrfz5k01b39257mq4jdbzfv1fr7597vlq8gaz12d6mggf";
+    source = "0kqvxj4kvfmbb28iw6wkmyn5fvhkxdnbjyxng7d8n0ifgfa51d7n";
   };
   relenc-22050 = {
     run = "13ym795q37rmxhmr0d8834y272si11f0qh7lmhffrpsf4d3bhf74";
     doc = "1hb2sdm9lgzfkj2kkbrlb3alnfjq4rw3islgdzkqbcgqp9s06f67";
     source = "1gk7nbczw9b897idmsgqx6i8xdmi7wizhb3dyc0hir7qmivaqv6s";
   };
-  relsize-30707 = {
+  relsize-77677 = {
     run = "06sy6v0jscrj2qs7axm770xv8fkiivvj5lwb8mkf58gd5jwc5bgb";
     doc = "1sgv3x3dky3i7xivh6pzqh3lrqjhb62g0ji0hdgmy9blfrdf3api";
   };
@@ -15448,7 +15508,7 @@
     run = "113nfw6md0v4522n54q63smd2g2iwm89qsqld237f32r3rdkbcl0";
     doc = "0lapzgfp019a7qihfhf1cp2szwq98j8kmcy80c3gf1fa1x0c3x1q";
   };
-  repeatindex-24305 = {
+  repeatindex-77677 = {
     run = "1z4z6bpfjmgn8mkpcl1rsd9m1jxdx6lx2kz83r43d1ks5zjc6wn7";
     doc = "1vcq9vbfw4dwif9q5ki0bq378yd4sg5g2yxr24bjav97shd9iaxk";
   };
@@ -15456,7 +15516,7 @@
     run = "0kjpf1ywcphgmkxsr70mzqlx3mid4af7699hz3fqgs307iswj0di";
     doc = "1fhx74lsy7wsh84p2g9chdqy94vh6sq4wi1rny9pr9cmnfxb09m8";
   };
-  repltext-56433 = {
+  repltext-77677 = {
     run = "19h9qfzz9idywv1bi4qpl8yqv73lwj6s6aqxqhb8jlh3b2scp4y7";
     doc = "0nhr1lpbb5nvi7mfzrjxfq7ii2kib8klzcsqg99b4pj3hcwhv93v";
     source = "1phbwgyvdm6a616wzvlc24jm40k4hbyjsnim5g5jr15phlsa6r2f";
@@ -15466,7 +15526,7 @@
     doc = "1s66yc51javcxilqw2wnawpmxn9c5sybyvc7zy9w3320mnmqj1qn";
     source = "0i5acxhykwna08yj8zv0y7xqqn4gxvv65s63v9zkr1r0vynwcnpw";
   };
-  rerunfilecheck-75559 = {
+  rerunfilecheck-77677 = {
     run = "0gbbbvkzffbb6jnd28pp4f9rvakqdvc4zrg2pdr8idrfk5c7l2mb";
     doc = "024g8q7c4f8adr5dv11fdlm17acvshi81vvfricbbfbflqglsyph";
     source = "0hvz2gxh1cxmik34cv3ip9i0ynbbhnlvlg57rsy89s3wgwk6138a";
@@ -15581,7 +15641,7 @@
     doc = "00qwsv5vxidjzkm31v21sbzd6rp1pvz2vrs66gmlm1xbfsv4kd0p";
     source = "18zffnyyhc3mp8xpw7bc52q29z3skqfxg6h6x4b18mi9jpyd2x6q";
   };
-  roboto-64350 = {
+  roboto-77677 = {
     run = "05ynyzlrnhn7q95ld1midxdccc7kv209p4x53bi2n8rsjmp9sp39";
     doc = "13aqrvxs9vhy8bpm42fx1i47m0q80pc4zm5gh2bllrpgpqn9hbry";
   };
@@ -15606,7 +15666,7 @@
     run = "1cmpg4w2pqwvr624kc4rv7kvnf45c2ffqrryh0i7kbqgc22xly08";
     doc = "12y4cph62b8rag4dxajpzy7y29kvnb3n0z99s2vcq1hfscyijn12";
   };
-  romanbar-73634 = {
+  romanbar-77677 = {
     run = "0wzc25x8bskkpakdd2y8spmgr2mgaz0jms3l3cw4w07g0wswcga2";
     doc = "03nrjdprcrpcwy2r7qj7782r60h07fli4xpkv1zsh0vv754cg7mx";
     source = "168fkzd7d9f4sny9h41drx3c1c2yz4xxmdwdswf3vgracjfv70n0";
@@ -15616,7 +15676,7 @@
     doc = "0mj7kh8jvhscc4clf2199594994xdx557q0nnsk95srwmncq8f50";
     source = "0hq151qq6wb0q1xhbq6jqzxfh3zss9iyya5wxv883a8pd79rancj";
   };
-  romandeadf-72484 = {
+  romandeadf-77677 = {
     run = "1l4w14rbpp2s9znwyxnyqfbbllywcsmw9aan4nqqh07vx3fagp9y";
     doc = "1821fqp9w4qsjfpqyc4284xb72dis2d5nv78fkzzgb1bzdmckg8x";
     source = "1jpf4cvgpynkw64sjjakasgvvj73025prvhw0jzggywicgqhml1r";
@@ -15625,7 +15685,7 @@
     run = "0y9nlxbjyiwivw9jkc0vz0lj3b0nvj9dcd4sj0gxgxa1dg853rlp";
     doc = "0bi3b9991x1pvh8s8yrw5031jkvvwkrwah78qfd5rlywh2ylnrr4";
   };
-  romannum-15878 = {
+  romannum-77677 = {
     run = "15zjf8wbjif83vnib3y6vqxc138aplb93nfkh95wl2rmahaigmw5";
     doc = "0a8zsbh28jl761ir6is1l05n9jyvzr31y86qwaa714yxwpzak0s4";
     source = "1gnvnj1l88l66mrhvd50cx44wws4a45708jmrncb5mnf0i6v7ci5";
@@ -15640,12 +15700,12 @@
     doc = "050yna9vb9cz026cyi44f1qc596svxvf6fgyxlby2isl1jqy89zx";
     source = "1bzcpxygwsmcg91nxx8lxc9skm5cr8hbz47qmydwznkkzldkdbh6";
   };
-  rotfloat-18292 = {
+  rotfloat-77677 = {
     run = "01ycgag2ip0kxdsaymfcndmbhfcc95ppkmwhm3imryibm9112bv3";
     doc = "17x7jdnrnm333cq706cdkgzcyscq1k162l0rg3qgvknig6991v64";
     source = "0ymb6xbsqqj91b9vkfzdab1ip0xqqj72zm1kd812gjgkpgxc3jfv";
   };
-  rotpages-18740 = {
+  rotpages-77677 = {
     run = "1pqfkyqs8ymfqsvq35cpv438g8a3az6sajh2bszxncl7m3rqa10d";
     doc = "069jlj27xa7vnl83bx5m4k79lky0ayvcl13gqxlk8an5kdwmdr3j";
   };
@@ -15662,9 +15722,9 @@
     doc = "0sg1ck97k8pbg2fjf99mhpvd251plphr5pk1dywmjniy9vmhv1ih";
     source = "02kk3h77drvkqanc04bjlfzg0scprcs78z3m2zf8gs6q8w95k7pv";
   };
-  rpgicons-77525 = {
-    run = "09kv25varyapkjs7l2bb2j1frcwm0fqn1argpsdi33q2n5b885ms";
-    doc = "0a31q990qkz1fa3pnb2a5wvplf81kxizcih0k7z86xdkj6knlwrb";
+  rpgicons-78149 = {
+    run = "1p0q6cqzy9dymanfavj8ph0cgbr6sa1b3ib4bfyd7n799w1rla8h";
+    doc = "1sdqw145817qm0hlr0m20id1dclfsk0s01zhykpisx3kwmai9pnb";
   };
   rrgtrees-27322 = {
     run = "0jihs23929pzbgpgnb2v9i16fcil9kxkggdv1dvg6xq9f2fh21md";
@@ -15680,7 +15740,7 @@
     run = "0q1iqlkq6swy905jh73y42ya9zb55xvg9w991x7lsmdxc0bzdf8z";
     doc = "069cpd747d6bk7jmmn1im7jvfb00bd597l34p87vdjcwbk3bzfvh";
   };
-  rsfso-60849 = {
+  rsfso-78116 = {
     run = "1h1hzsf74jll793qs51pq03b2l9szbqagn2p03bcg0f3lgx0cxx2";
     doc = "11vjx0l2dx6cflvypgv4vnaavnmkgznkkw9zizic879vihdzrzf2";
   };
@@ -15757,10 +15817,10 @@
     run = "0gb5j3hn1s28ar9d30g158xfc2vaavhm8cbmivr1ba32njdmmqcq";
     doc = "09n9p9q4pjil70ydk9cjh2gqxdslnhrg9avfhj0vvfacknbmh312";
   };
-  rwth-ci-77480 = {
-    run = "14479lg6nbyvqk7wlkkjmshk18g0dwkhi7xwsv914mpax9j55inn";
-    doc = "06qcjz3fc8m83qr5wsyxsv1pqs1bd3nl2g9svhkw3d5h89hmwild";
-    source = "1b6r7c1p5i6y2v6snv5iry88c1yydivf2b76mz7vmgphc80zpi2v";
+  rwth-ci-77893 = {
+    run = "0yl13cyfq2jazh97f7xmxcys55hfvlzrd540qaqn8w0bxpwlhlch";
+    doc = "0z30708vwv6vsz44hgwb374dy4a0i5m7p9dq4jwl82q291ff2dgb";
+    source = "06ch4a9mkrrb0x62afbgzpjds7cdwbyzzdvb1g68i0dy4gcxkkp3";
   };
   ryersonsgsthesis-50119 = {
     run = "0zn3hp9ipjq3624h1kdz1r55wxhawylxkmh6fi7v6cz37cnn36wx";
@@ -15784,9 +15844,9 @@
     doc = "0z2n1511lr2m39vn4bdamw8xbxlw92p5hrsxzrnjlrg39ysymsyd";
     source = "19547avrh6yv2v86w8f7b0pbvh8xvwa5z8q69bxcvhwj0jqjicps";
   };
-  sanitize-umlaut-67126 = {
-    run = "1hif269aigbfg3j1f579c6ipvlqqgs0swlzamxdmplbdxc55i9b9";
-    doc = "0nh23n1yhjyf21l9sr8y6yw7v1mil403idqa08prvrmnqhp1d215";
+  sanitize-umlaut-77726 = {
+    run = "175bjb94xy2fdahs28ri2wa7782139la0mg633l4733671l43kk3";
+    doc = "1d6p75872vj4ask0ib4q466p0xjwfwx98p3ivwn3a6cd9zk593g1";
   };
   sankey-73396 = {
     run = "05gpdv1di6wkyz4kwbc8vnzs9i2ij9azgwcqiyyrmqz5h710r258";
@@ -15802,17 +15862,17 @@
     run = "17mqm0iapkf04z5wlj3qpk9qlz8nnq50bfbibikacdanv3852m8i";
     doc = "14g53969gw2azpn7z81kdwc1m1hz8mafrz15kzrfiw9w6hh7s6jk";
   };
-  sansmath-17997 = {
+  sansmath-77677 = {
     run = "09zi9xps6pv6pjwp8pjiz6w4zqa9d3rwqn38167k2dlwnc3ij6g8";
     doc = "103h78a075lh094slfwlh2yk4dbl0wryzmsksvbp80gbv8w7llpv";
   };
-  sansmathaccent-53628 = {
+  sansmathaccent-77677 = {
     run = "0653qd7c2lb63lbgjrbac7kwl2lzygz694li1clwxlkrf0bnv1q7";
     doc = "1r7dqwn7vxgg51jlsgx82kv79fxskcdz6cyhkdbwgd2f3rmkcm5x";
   };
-  sansmathfonts-72563 = {
-    run = "0rnb1k0ianc4wfdj73fkz0rdm7w9m53azwlhsz0j5b38p9fvhi55";
-    doc = "1nvbd4ykf7cfdxpp34n810iawialcicm8841iqm44dd0sk2cpc4y";
+  sansmathfonts-77728 = {
+    run = "0fgdalqzd6jdihf3ir7iq51jl4s0d08mm8p20hh9q2p0gmxw972h";
+    doc = "0lm6kqgj4vyz1chabda8plgfpby3vw4i3sh5nn82gq52sr2q526p";
   };
   sapthesis-63810 = {
     run = "18dfh9msd4w3gml1h187sdzirm8g44dzvdgsnh4d21nnvbbxzhnk";
@@ -15844,10 +15904,10 @@
     doc = "07w3im9nz2s72p502gzryyrccj4g980axvihrk5b5b3w0qzlpn4b";
     source = "0wdb9xsrfddi3sw3g4gppv7vn70f3czjplgbr7pj1hna8grig5p8";
   };
-  savesym-31565 = {
+  savesym-78116 = {
     run = "18z0xwarbkb6cm7n29wasa04d92g2pirlzsr0icnzfip2f4j7524";
   };
-  savetrees-40525 = {
+  savetrees-77677 = {
     run = "0bzr06y314xa1r105vrc9nd37akqcsq58j0qxzlyhc8jvbji9ajc";
     doc = "0c00z409by0qp0if8ccrah81601w8njlsdylj42achqr1f9q8rvg";
     source = "101p1q1in7qp2nrkz48c7wqfdrg6mj7iqxwg44aqaib1wb27g5ak";
@@ -15862,13 +15922,13 @@
     doc = "042xgbjlibp1273400sg7p6fzdzbnv344dgnrs3y93gk6g7vf8k6";
     source = "088k5a86279b7iwci0wzxv5wnqifqiwc5kc85701987x5qiaajhm";
   };
-  scalerel-42809 = {
+  scalerel-77677 = {
     run = "0b4ppffs7zcg3y6i3c6dnjb2rl1xm5rz7k5mxm08qj4dpdhyjfpi";
     doc = "1js1z2fkxy7ixh069hmg5cxm33xjwwg002y64m32wj4ldb7shfk8";
   };
-  scaletextbullet-76924 = {
-    run = "06xadrr36j1v59pm1z28g7vn7rhx2bh28zi75yhdsk8pjvkd1106";
-    doc = "1zp5iq1ypqld7bfnml868pqbnyz9hx64jnrdbaq9w1ddgp322kik";
+  scaletextbullet-77960 = {
+    run = "0rwsbslhfw541rxvk8j08cbcyld1y1j2ibp0nf8d66qs4wls775p";
+    doc = "0maprjh8sddjr25vhnx59lggi2mn5k93kvm6a2ag2rrhsnc4rlpx";
   };
   scanpages-42633 = {
     run = "15q22kfwbw6scnx8q9dj3p0hr0m86lj2asy9fp9s0a15xsbhq1is";
@@ -15888,11 +15948,11 @@
     doc = "1qirgvpdi3qx6zq46alcw9asknr4rs43j1686ciqfdz06d3znavb";
     source = "14ndkpzw17d9v3kjrsj5w6mrfw9jbxnfxwd28bymrnybzj6xpld9";
   };
-  schola-otf-64734 = {
+  schola-otf-77677 = {
     run = "01i19k0xhha76zz34ccpq83lgnjw4x7p511ssrbdqmfgrx5q0gbq";
     doc = "1znflqa3myy4x0m7ayg3sk4z7pja5df1jm7lkashrcrr1gjqcdbf";
   };
-  scholax-61836 = {
+  scholax-77677 = {
     run = "0is3py7zig7whp0hzga4d4a7kfs4h32w1irw4gmrjb3cqndg8w8s";
     doc = "0m73qqh86cpgrrxw8v2nz5al0x850danniqyw8359bl26r8cj6wl";
   };
@@ -15913,7 +15973,7 @@
     run = "08dsnba3p8nz3hnzh1sd5cd09ngg73vl8yq1h5l8qcnynwwbrcdc";
     doc = "0vaqj4m0yxbbmqf51s107k28l2wms68w3km801lph4nfz8khaybs";
   };
-  schwalbe-chess-73582 = {
+  schwalbe-chess-78116 = {
     run = "1s4dbcrny1qc0r1i43s7frjfd5i4j6cb554v0mmghzmqch48nqrp";
     doc = "1qsz9lin27qpv6dadsszycr09wrnq7m01qyg2n5ypsl6ip4viwa6";
     source = "0sidlm4qba6sq552yhj8zxqrg94hg75dy7dsa98q7aa1hkcajpih";
@@ -15936,7 +15996,7 @@
     doc = "07s0y5dfmp26j0ayz2bhksdybpqb4cn439cvyifxillkq277dqk2";
     source = "1y67y73f2whg663hw56fwrn6jhhpdpm81w32kzwc7r6sk79bnq3a";
   };
-  scontents-76900 = {
+  scontents-77677 = {
     run = "0l479acrnhf3yfqvyppvw6v774596hk0cm33ld38nfjmhdj5dmvg";
     doc = "0qvj02kz4pzd210896fkgz7q23b09zcw0ja1v4zwr75fmcabjxnw";
     source = "16hwcbijk1cjgi1ivnzjk5jcl8fhi3szrd1m3qlg2a6amshr3wgv";
@@ -15995,7 +16055,7 @@
     run = "1as8ipxhssfx4hqa4s246gfim09nl35dx1wanfc6p0yk79nm5lz1";
     doc = "0hsyiicb359blk6m4kj5gddlzwphxr12hbrwbp34cjfzkbh5ib5m";
   };
-  scrwfile-66872 = {
+  scrwfile-77677 = {
     run = "0mvrg5vqhswmvnpf74ifld6fk2dyczknjf21hwmy7lyca6vn9fak";
     doc = "0jhagc6ab9rfnb3shkn17dhfgklwmz6lg2ln77vskngxia5g9wzr";
     source = "08dv79i1cm699rxpv2h2acnq53ghngc3cf98r7rcgmxvszgqlm8f";
@@ -16027,7 +16087,7 @@
     run = "1z7wbdha5bch954chgpxjbkv20l01dnxmc59j8lb1fw5j5brdq6y";
     doc = "124g6zyngafl8crjz8ffn96nw12qbjk7b56s21lcmmmblhhc8njx";
   };
-  secdot-20208 = {
+  secdot-77677 = {
     run = "0pnimi0vfgp5zsp0iwak0r0j562w59cl1fn3pnp1gwjz65q2229i";
     doc = "1v8j3l2bh055b18zxl3287ardn0ns5qjgbqkj08qxz5ls912y2br";
   };
@@ -16049,11 +16109,11 @@
     run = "178z63iys35al6g5lavqgdd1lcadha9rp25bzm41gyg84f2hpljk";
     doc = "0mk0ijbrvmvky4awh03y2q14ks4x9hr2pa84ia0380xfx56849kp";
   };
-  sectionbreak-50339 = {
+  sectionbreak-77677 = {
     run = "097mwp2iqg6rk1xxlppqnks0j1k45b0hlrg84x12y0cgrkd7cdbn";
     doc = "0kmfpgcga24kpzm9kwc066a6m4kzw2sfkhr815yc0y2a1agj3zfw";
   };
-  sectsty-15878 = {
+  sectsty-77677 = {
     run = "03ixlxxs2ss5lrmkcwilrzi7r46krh21rli07y2j79p8l23n7vrh";
     doc = "12xkczxiw3spyljn1ay9z0xrxdg9ziidnyryri4pkmsh5k60wxw8";
     source = "0h94wh43pf8bphafhcmpsjzj26592c30pih0x3p7csv8dwbv6js4";
@@ -16066,16 +16126,16 @@
   seetexk-57972 = {
     doc = "1bhv5xgv8jpam5apdybd0cggnvcizk2r6zs7lim1hmhzafpqqlcx";
   };
-  selectp-20185 = {
+  selectp-77677 = {
     run = "16kcbpvjsdc1ndhhflfmnz0igjyjc5k62gcfly447w7d13qsg2s6";
     doc = "1frpv5dbxfg708xp03hs4vkgqsxjihn3yk3qvcpns6awjlfi2n9d";
   };
-  selinput-53098 = {
+  selinput-77677 = {
     run = "13pxqr1mzkblniv9rcrr5aslx887xjahjj9f27h7hpx6r4g7hk17";
     doc = "0pbqch586hfwfjbm68g7i56d0jcgg6w26k6g2qlfdbk8mjpc4r4v";
     source = "0na8byym8s2y2jyi1691cnw46izri0y6ybf3g0pmil2hpxy544ry";
   };
-  selnolig-68747 = {
+  selnolig-77677 = {
     run = "1xrndff5if1jbk5vzycj2alj72r123xjwmyr1lrsjkpkp6jqjg0y";
     doc = "14ppr67fbhsqi6d5x0f40awac7j3i90kk7mwrjm1ch1572im5dhc";
   };
@@ -16106,7 +16166,7 @@
     doc = "09kkjcx0id6zkvjabw5xf9yx74vm4idj46a8jgywyrx85cfaxlzi";
     source = "08i6mzncvms49ysabcp2sp9wfpd64fwxhv1m54fwp3nk51if7qbx";
   };
-  seminar-59801 = {
+  seminar-77677 = {
     run = "0a9sg439ahhhbyb3gp83hvnj4ap0f67xhnfj3p2i3k5ch7chkdd2";
     doc = "1jlrrqasp1rf1kb2bjqlhs61l81h89y7bhi7x2liiwa0vyfva7s7";
   };
@@ -16124,7 +16184,7 @@
     run = "151sfla597g5n0nv676sbv5m4kfpmjli7ddhd1yzsiqa3axw7vhm";
     doc = "1mm9ya9ls0ryfxzkss3lfmslw9wrbcq9d5abf022ifbs5184rgnr";
   };
-  sepfootnotes-71883 = {
+  sepfootnotes-77677 = {
     run = "1rqdzawlcxshyq99wfy58jm34ah6vkcsljv8shrvk4lpp7mm68v7";
     doc = "0n8n858bnca0x1pp9yxy5n3n9cvgh01m13f5a8x40rgjdff0x65v";
   };
@@ -16136,7 +16196,7 @@
     run = "1d6f72kk6c20k72ndq1dgp27acib6l51ikvhcnpqbhqbmkw9q38v";
     doc = "0m4kq89vr5dfi6g3q05vdnkmykfnfsnaamj38jxhsly41y3g29xj";
   };
-  seqsplit-15878 = {
+  seqsplit-77677 = {
     run = "0m1vlslfac4n7fwhrmcl0swx1rf80ks2p3psrszwd8rz79q6xlc8";
     doc = "1wbmr7hayx3kzwmbr1w1hlhyyzz84skbahd03bw0akbgk0qziz1p";
     source = "1ibiys9lfj92mklzf4lvdzn192wv843zxkv91grjjba8cvn12w5d";
@@ -16171,7 +16231,7 @@
     run = "149m9s33isx98vkl3498ywjy6f9q31jkw8schc16hxxm1z0jadnh";
     doc = "1rp64i0nrrxn7l2g6dlcmfvwbq3rg62h2ifxrzfp3k5ifnlkhpz1";
   };
-  setspace-65206 = {
+  setspace-77677 = {
     run = "1h2cwbh7kb2hf3s399x78ij2mxj4b9pjyxrc7jjsr4ldx8hvf2by";
     doc = "01v5nwbkap93zf90vx4a2whwxa0hbnscqqgcd8r865xfnzgc8a49";
   };
@@ -16217,7 +16277,7 @@
     run = "0ldw6c8aqqd7m4ahziqv857zkjk3ap12xnnl5k43dcg8n7apb3ix";
     doc = "1d627ks3av63b142f8kd7g0fi1f4xzq0yg219fj8qxja4mm5jrv6";
   };
-  sfmath-15878 = {
+  sfmath-77677 = {
     run = "05m3whw5xkml48yx93j9h46qmspnr5hwsfszb59l4wy4jfj66zk4";
   };
   sgame-30959 = {
@@ -16228,19 +16288,19 @@
     run = "1dcpvvk5216znr2i0nn302da6vjixkih5nwix9m3hlmrd69z6hcm";
     doc = "0xs86yjd9f6wlgz0dlc89iryh4rba3752blz07zrxzrm89fdq22c";
   };
-  shadethm-53350 = {
+  shadethm-77677 = {
     run = "1miq7szfh1nya53vcn9kv3m8jb1sx8p1v7z5m3829ynbyiwr7z9v";
     doc = "1gbjisy9miqp0mrciz793vvhj0a04vaai1ixi6vzplhlx9gknv6i";
   };
-  shadow-20312 = {
+  shadow-77677 = {
     run = "1avy8291hmmvbrqdn4yza9w8w7a7hbwlh38sl7288c6gh1hkyibr";
     doc = "0rjfdi2hm07j418q3fvrf5pxflh1nfkhrk58nsa23fixxzaw5nlk";
   };
-  shadowtext-26522 = {
+  shadowtext-78116 = {
     run = "1pnnskcw1nq6m3rlvsa69dxq828dx0bgggg8n2p2bxnr9gmnba3c";
     doc = "0lfvn68d48yh8smf4w8c1is67chsfnipxc82fx6mal1czlyn73hf";
   };
-  shapepar-69343 = {
+  shapepar-77677 = {
     run = "0siq7d3d5gr91s3bc5873540b1ia73ggkf1y1bs47zb3mh4z9g0b";
     doc = "08bwm9a4rq70swqibj9s0i4042fnribqz93jx02xd0638wa51pph";
   };
@@ -16269,16 +16329,16 @@
     run = "19rscnl84f9x6r7kajj6wjh80di5y1mc4g4nybafnisap76r3c06";
     doc = "1kzzbkv36hj2wc9kz1wjr5dlgx3r21vlyj7sy8m8i72yfnmajgbx";
   };
-  shorttoc-15878 = {
+  shorttoc-77677 = {
     run = "0y1sa1l5g19arc5wdnqp0jzvqn51m4gb07acpcp3ajqq7n7yaf3y";
     doc = "13nlpmb1asrx8vi08kb6kcqg6szhnzb6667crj9xchbk3zm9iyil";
     source = "0a3hl98rl5qadx1mqqla9hw6i1s3324i4la2kwdazhxhvi6nxm0q";
   };
-  show-pdf-tags-76606 = {
-    run = "103pmkjv6wa0mmdwkf5pnpkyvlwy8fhwbk55ylqn0vipg5i5sc43";
-    doc = "1llb4srpv65pjiydwmb7qwsiml70vcyllfzfrs2gskv47jab69n8";
+  show-pdf-tags-77604 = {
+    run = "1f0gyj60sinic9dyw7k4q5iy8chga445wr7j2lh0r9y3fx3x18ny";
+    doc = "15s3byacli9s09rzqpyqznk2fr8d9w76zzzfvr2mv5r5z3sg03gp";
   };
-  show2e-15878 = {
+  show2e-78116 = {
     run = "0mhpxhvgfnzwwzd9ahyzdhqxzqz9sj6vldrnbjy4n0r4fv6c67pi";
     doc = "0zfir9yzh3mgpkldcak7hzal0mwls90h1m5vxiax6h2izfkrixfm";
     source = "1lnhqxazyz2gfgkgbj7l2140x81bgsxb71y8dagcqazjzdmqgcdl";
@@ -16288,16 +16348,16 @@
     doc = "1zdxvlj1jspgkws4xmwa8yy7aaxqwr33lmzkicg6ayy465jmfk9b";
     source = "0b8hq68lbd0xjyd1cj3qsw1rd4rvjsihd6s9ab5v3a0q1sm5kaw3";
   };
-  showdim-28918 = {
+  showdim-78116 = {
     run = "1pb5qddnvv4kl79fcp20zkcfgxm8p4zix82g9431db3bbavvmkri";
     doc = "1hc208xi8c4ihxb9nsk6y5p6p43yyylqh7jgy8lai2a526xm2hgw";
   };
-  showexpl-57414 = {
+  showexpl-77677 = {
     run = "0gg8bp3pddkp3z79z8wkh9263gnxhcn6vxhgp2mq7w8i166rrsyc";
     doc = "0dv60pc2p19bzr1fj2hqkgyjry9j8ykcgsi0v3xpvzh91ic9v5q9";
     source = "002v6m0gzzx4kr8vnw75czn58cmzjnyyfyzi2hvfx9ykh7nmibng";
   };
-  showhyphenation-67602 = {
+  showhyphenation-77677 = {
     run = "1qbgbs9jc2i2r572187p925wjyw6zi1h3pgpyr1ixz84ykdjc2n1";
     doc = "0qrvpapyby3bbaxh84529fvhgpsvsd8xv1020q832ad5fay6rm10";
   };
@@ -16305,12 +16365,12 @@
     run = "05jfqr88hcx4mq1fq9hv47921d54947qqa3jdgvk529d0487lcqf";
     doc = "0ggkfgf7zb4jn6icnn43w4jzlklkdw7f0pqyksf00mgxcx041fh6";
   };
-  showlabels-76188 = {
+  showlabels-77677 = {
     run = "0nqh0a4q1hpv64isgyv0m2cnxji6kq4d8v9a40d9g1a6is2mqjna";
     doc = "0fpc45zz6nm3qsicba7h746wn6piq1kdzbi2nlgmf2dsidzlngj9";
     source = "1jbzwjxwh7izdw2hrqwr5is2dwrbjdwhani6fmj2lap5h3ii7x9q";
   };
-  showtags-20336 = {
+  showtags-77677 = {
     run = "04m7f6i3992p93xz9rlfa0vnil6h9dyk7gy1v7ih47f1m2awjak8";
     doc = "0i0iaz4hlgf52g68znl5a3q366hd8ygad2khjs3y7hk1fwqpz45h";
   };
@@ -16318,17 +16378,17 @@
     run = "09g79h7dwc0v06h06svj3h43q1xf31fli33xxlqnckz28i1a4y95";
     doc = "14fqspd33n3r642mvmiamswjl4qjda2g7p62amxs69s64cqfliv2";
   };
-  shuffle-15878 = {
+  shuffle-78116 = {
     run = "0laiw8v6izp53c8y0jf4k1nb8brvs36gd937nz2i2cvnpghz98if";
     doc = "1wd46l86h8vlxpasvhnvjimsfrhrbs56i767v2h7bdl8yp751ycl";
     source = "13qz2jc0f084acxdsf99fj22kbsjkr6i3y7pqzh1g2jd4d8bbw8m";
   };
-  sidecap-65618 = {
+  sidecap-77677 = {
     run = "0g6j4mh0nxvdvqyaz0b0756y1xx55zxwrn761xz39mmw3sca3yzz";
     doc = "0yynp2qmq6df47fzns8jq5hkbhkj8p3il3prq4l7pg1129278my0";
     source = "0h0s7hpmx4ha318zkz6caxq2ckvwxxv2fbkjy7a3pfs7q2x9fal4";
   };
-  sidenotes-72264 = {
+  sidenotes-77677 = {
     run = "0zvbzghm2g6a91n5w7x831g8qml2cym3vlfggic0xi67jlirwlgj";
     doc = "1nj2lm33vn7y86kzmirzqppydka5lfnsdkksjmqk527zdab24vbg";
     source = "1qm87llv4hwn43sf3297pik7azpwqw7ibdg2lzqcscqh6ah5lmzd";
@@ -16347,12 +16407,12 @@
     doc = "0scpaw7l26fcqylcqspd0g5va331yf88a8wc69diw78haywwgp4f";
     source = "1lx77qldn3d23dvs11giircs2pafm54094h6ipxlc4g39g7xc0zl";
   };
-  silence-27028 = {
+  silence-77677 = {
     run = "1zixww8d87jymdvxjzjhvhjjr5f8fxhbjwqyzivki2rhw6dpsp2v";
     doc = "01qb2z62da0ji751i3wbhq10rfin23q20r7wr0fzvqv163niy93v";
     source = "1m5xiy5j8l0xy9731mf0jvk4f6bh7d22vbsgpjpvy5r0vxafgxwv";
   };
-  sillypage-71889 = {
+  sillypage-77677 = {
     run = "1nh5lch6h502vcmf0xvb2kaf8wgkjk05kgzybc74w73jlzqzfnnd";
     doc = "0qvvg8jn40nxb7qdlnx29q07g3yda83czw3p5fr45x5yr54b62l7";
     source = "1ircfzngyi7bwgbsvdwv66xz695gni9fyivsn9p7qq9ai9606g5w";
@@ -16383,15 +16443,15 @@
     doc = "02x3nwmxdk9spx5crlaw1xdqlwah04m88zrrw4wdg0qjnhvv4mvr";
     source = "05ikxmvflqz5m3qallwgyncda49dzq4fibllgc1j77pdh99cy3vq";
   };
-  simpleicons-77541 = {
-    run = "15hb50lszrwh86da7lvcywck8bl4qryhckg6sbablla7a6gx0riv";
-    doc = "12xxk4w2nmy2ad72jwq0z5p7w96r81038vf92j71hvf6li8nilh4";
+  simpleicons-78017 = {
+    run = "1gwl485lg85h0ayjrjnrqfdshmyahramwp0yhjfiqccissaj7rx7";
+    doc = "1xizg0anv1b6mw7nx1pzzyyha7raiwml4n1mfasai8hm20c2w4gd";
   };
   simpleinvoice-45673 = {
     run = "1mdc6aij1id1jxlbkwfdvdv87yh55v5qyazfciffpbf91qm87z0s";
     doc = "0lvk87l3xafl4s303rhmksfajnw77qd90yvzhdk126dp1prh7i6p";
   };
-  simplekv-75515 = {
+  simplekv-77677 = {
     run = "0lx6hms937ybjvia0cly8lg62y1jpxsnmfm9rv1d0kml8yv40p3r";
     doc = "1r3mrmmak86cyv4xhf079abacd1r9bkz5bcag0r5vnwa08rsp7v7";
   };
@@ -16420,9 +16480,9 @@
   simplified-latex-20620 = {
     doc = "1cgf1p7p2ikda1nb0c2vhhx7ai6rd973pz6a00pr9yanxsvghp6d";
   };
-  simplivre-76924 = {
-    run = "0wqzc5ab1pcv7vvs7n3ch5bcbpmgi791hr11axc94daglmjbprgw";
-    doc = "0isjnr5xqf5phv9ysqnr4mxc983k4vhgikb7gl1c6084b7kcnbc1";
+  simplivre-78012 = {
+    run = "1b5bmn42zvkk30nqpmjk9bqc0cviql1c6zq0q3v78m8ybqzl2nx8";
+    doc = "01gy4n9wjyky6ajksgi9svw8zkaympdzfim2sqlgr5yx06v3lis0";
   };
   simurgh-31719 = {
     run = "1nhdmdi6qbvx1nd92hxl8vkly82a9nxi7ghj0zpm31c15z5pb7rq";
@@ -16443,21 +16503,21 @@
     doc = "06saapj9rh5gbrj0npb9rm60xrww8rl1y5brvx97gj4qvc3i2pic";
     source = "1clhfsmydg2xjajak0ssa9v5sd3id957si5zvyq3njgl9cpjwi9r";
   };
-  siunitx-76924 = {
+  siunitx-77677 = {
     run = "18c6ibd1ijnjslvj569dfcgkw6hkyzw3wd7c6vmnnmxb3pip0jz8";
     doc = "1rfd8rx2qar6md95rqw8nd8xw5yc57ms9sw5pkn3289nadsi3fr2";
     source = "1caaw2j33jg4xgm53w995zkgs8db3r928v2gq7hx673rcshh8ipw";
   };
-  sjtutex-76924 = {
-    run = "1ng9ymjxs4ix9mw3y9ggscj8hk72q8k89jdlff1q38kya6m854gh";
-    doc = "0amsqm75l0nblx9r1yl8002hmlcb5lg9idvcs4d54r62a80b893r";
-    source = "01njyhyjjkq79fhpjm49xlq6jlgr8nlvjvmk0j4mxqbi89vnfc8l";
+  sjtutex-78180 = {
+    run = "1cccdx16kva7ihcdysdy89rjwi90q3i761qkp6jcj964fz02ic8l";
+    doc = "1chrlq4dfdmkrwaifwr2f8mjqzjs3jjla5cvfw6b9naa51akcszz";
+    source = "081gcjprg1k15p1ixza00gqkia3azy40q90d7p75jlyh4rqi77h4";
   };
-  skak-61719 = {
+  skak-78116 = {
     run = "1lh97kc1hmz3ybb67zr7vr74z1zngwl2cppkhmp9cagm48j24am1";
     doc = "0abiardppn7hx6l5h4zh92b9m2yf3w16y15rcvsspv1cb9sf4lfw";
   };
-  skaknew-20031 = {
+  skaknew-78116 = {
     run = "14j42hifh60p6glfp24c2f5k9k34vcm0l3alqfqhvv68l31i05rx";
     doc = "0i144akq7sgs6kwayl8c2yir0kc7czjs49vj6l5lwdcwbyryhh21";
   };
@@ -16501,7 +16561,7 @@
     run = "0v3kvrk5aqsfna30z920k237jql1byy12qkb5i8zlr73z4cy1ll3";
     source = "17iby2rcnqakykglv9k1q5zmcj0h4gj4h2vadihvyyz6m6bvcx0c";
   };
-  slantsc-25007 = {
+  slantsc-77677 = {
     run = "1a05zrd8bqiqgh2bwlll2wspmd4xnvl7p8mz3g4j7nkvx8bp4844";
     doc = "196sqfqgxc7pfyi75d0nqy151if55k3wlvpq8ai7647rmapn17np";
     source = "1jw70y8052qvjkr796sz9w0c6kdyammi3gy5v8iq0wwmf38jl8qf";
@@ -16528,7 +16588,7 @@
     doc = "1gkgpgnsyxv9nmhnpalshf23g0iz7bcp4agkh7l368j2h48d5xmm";
     source = "0chpnchdqvljj7h44ybpkln3b7kjzr7b18cj2qhj66ng9cwpywwd";
   };
-  smartref-20311 = {
+  smartref-77677 = {
     run = "0g8dy72b8q65pw2zmcs2yipclpx3g445v9snjnyxbb3q82asqy5v";
     doc = "1nwl85jj0d97djdqkczdw3544vhazy57fx8psdcvfdncbvpk84jy";
   };
@@ -16541,7 +16601,7 @@
     doc = "17pffyp6d7blwz0a2yjdwa84lim9b7jbg54q5gknmwi02sqdqsb0";
     source = "0xd02c6zzvx9av0xjmv8navff8ik9ibanmid9kls10jancp47waz";
   };
-  snapshot-56735 = {
+  snapshot-77677 = {
     run = "0598yminjxp01imxrbzydqjli0i2ws1f9hw6f3qhs7xykfacbaml";
     doc = "0j614bp2fydpzr2lx9xamn36fn4x0wwi5a58013ds2a8iiha6k1l";
     source = "0bh7gy9inl30h8y9v072fh2malc07cjwizgxc6wvm07n2x3vidfh";
@@ -16550,7 +16610,7 @@
     run = "1ap05k43ndq5apibyghkvs0041yi2m3hi8ll66v2yvlnk5xlbk5m";
     doc = "0ak9f9mrww694vvq2s80d13cpb1nwvd027j2w0j8m1440lmhl54f";
   };
-  snotez-61992 = {
+  snotez-77677 = {
     run = "1nq3ggbdpkpydaqzpfawvvny8azgbmnbwpl00wsl4rhi7jbqsfwc";
     doc = "1v82nn2y2kk8h34j8gidrzlx8nwah5wmdk3qigw8aa1q7vrkj5h6";
   };
@@ -16577,12 +16637,12 @@
     run = "03vldli7z2bsvznmqw5y6gi81ln5v54jbiqm53z464v76kp9w29f";
     doc = "1i7b5i8vv88cjxvcm1adlxikqwvbzpzkiiksdn36in8msj23vjkm";
   };
-  soul-67365 = {
+  soul-77677 = {
     run = "0hkxhwqmss7lsh600ggs8q7qx0dlgw63q482m8piwx0jmh4p29xy";
     doc = "146ji413205b7igjscv9wfybs60wyn47d9q6gkzn8l23wamrzxwm";
     source = "0lplpmk05y85r2rjzjh24p6slmq8319kn7ixxb3zjbzjp1lc44j7";
   };
-  soulpos-60772 = {
+  soulpos-77677 = {
     run = "033c0arpqhrypwy5grpc8c6dnlc7k86iq5wglm6r02bdk4mcw7hk";
     doc = "1g99lgnl1m7nffwdfhmmb4zgjwpaiq3pggbgmi19p24z7qc1sjlz";
   };
@@ -16591,15 +16651,15 @@
     doc = "0470i396sk8a6lnx189zcazns280qgyw3yvwiyxc1gs2wd812qr1";
     source = "09db050wsnmpqxmba7w23h3g92xyzg0sqv57yhns5nwxb2cmbr2g";
   };
-  sourcecodepro-74885 = {
+  sourcecodepro-77677 = {
     run = "1gda06ghylk4r7s7jxllpjgi75blayl1wimbm82ms8194q1xcyab";
     doc = "092sp3g7127slr8yw89wv3dxf04v8cxv2vh1ci27y6z6rh05mbz3";
   };
-  sourcesanspro-54892 = {
+  sourcesanspro-77677 = {
     run = "0j0qgb04yvwf265hwiiv581fy39cpr6i9f21k38xdgdi0dl7ghzl";
     doc = "1lg7jxxcymnvbrhgdf6ddj0nahbr6g5vnz7ahav8v8zfyfw87z6z";
   };
-  sourceserifpro-54512 = {
+  sourceserifpro-77677 = {
     run = "1zwvz4yqvs5pcqwsig4sjkp4chsc089j0dl9mn8ah047nhr2d7z1";
     doc = "11q4ppkw8m56bpn8s08w0zkiilfz6s5jv0rkqjnqbzn47nm3dqij";
   };
@@ -16612,12 +16672,12 @@
     doc = "122xkp4s2wqqza5nxlibxyfsxs21n20xn3y5i9lym0hakpj7112m";
     source = "1mbb835yyrzpk1qlqci0zbvwd64amxqav0z3vnwaxxi14hqr9laf";
   };
-  spalign-42225 = {
+  spalign-77677 = {
     run = "0wy2kliv3mrcqvandk3qbbqjbri6xq69d5jsi80l7qdiij86z3g2";
     doc = "0jp34h19q4588rli6k0v5kg47j6i1gjpjgk772fkb7l0f5wln7k3";
     source = "02qzd21qzb8s2jsip2fr1jgf11xd7xmiyi7fv0s9ylyfr259c5b1";
   };
-  spark-otf-62481 = {
+  spark-otf-77677 = {
     run = "1z9k0dnahkq2nfqs3plpyb3fdj48x8vcav0ahykd554fygv5h4x3";
     doc = "07pq90xx911rdjdyr0sxg4zqfg1yb5kn43xc5l6hn0y81m9j151d";
   };
@@ -16634,7 +16694,7 @@
     run = "1p503r3q3cpqs2502m376816snp8rxc5hd1rkdsz3ljdkap0nd9h";
     doc = "1dfb47scc9nxwhzbhikz62ilgqivb30cfq5lkhihb45lf2w3p3gm";
   };
-  spectral-64528 = {
+  spectral-77677 = {
     run = "1qjvxyjxm81j3cyajki6jv59k6y2m8nv9kzhj45d7i56za9klkf2";
     doc = "1x6sixvjk4sk5r6x3pgppynsgp139jm3cc7bv83bk55757jjd8j5";
   };
@@ -16667,7 +16727,7 @@
     run = "16cw2sv43nh6qsrc1681cw1035gj78fvgpwj79jb91sph80wd4kf";
     doc = "0z5b25wv1pcyjc97w1qd1lx1l1rj471nm9yxx0rkd7qyabqflyj7";
   };
-  splentinex-76841 = {
+  splentinex-77677 = {
     run = "1x3zznwpd1xrz79b0vj0k72rq1zi1lm1gkmhw10w7jl02cnfjdy4";
     doc = "048k9bqsgkinp1gl2v9inzypv900k65hkmg2lsdqifcddvbj2mn3";
   };
@@ -16676,12 +16736,12 @@
     doc = "0lyg56rnhrq620f083bayssdm36h6wl05d8wld67lf42056kxy8j";
     source = "05b9dwykc91q4d7xmvq5hg6vznsy4axpi4w6awr6l6qrrqh6wz71";
   };
-  splitbib-15878 = {
+  splitbib-77677 = {
     run = "0z2vnb51ksqp3i11903mvgaknvxl1azwqsch5aaq14y7fp9kcrah";
     doc = "1vb7snjy518hcv3x0cvr40bzlxr0nqb1ssqagqncyzzpg55nv9gl";
     source = "1sgl95vwqrp6k4y355d9mwkqm6zpw0g69p87hnsmdbd9bqkjvsv4";
   };
-  splitindex-39766 = {
+  splitindex-77677 = {
     run = "03x58nb9bqd1fn3k9fqq5rdafsna9rbxjhp44dwzig8kp81f0g0i";
     doc = "1v2wwls8fgb1rhk91hrjsabxj6plx2bq7h07fyqxvl3982am9wm5";
     source = "06ksmac3dxacfq7j4ad7vy9kls2rnay1hww3kgbp2sgadqvwmz0z";
@@ -16695,11 +16755,11 @@
     run = "19xicma97v309pbwgdyizrjwwnlas95wq0d2qlyw7m9wrq295lpb";
     doc = "1qsdgagx45z4gha0y7z37687jxrc121pr592b1xcy8bhf86nimhm";
   };
-  spreadtab-74630 = {
+  spreadtab-77677 = {
     run = "17hiyj4iw4h4cjic9xxm2fgsp6jlifs4x336knzkfzbspy6d0ir7";
     doc = "1ahjk4dfz2l3ri91nnk311p3bynjvs0c6if21hih5p91ay1w2p4n";
   };
-  spverbatim-15878 = {
+  spverbatim-77677 = {
     run = "0s7042ln9l7jvb0vyrmg4h4fdgzy6vaabr62n7zlkr8pf7zd8nvh";
     doc = "1rb6gyq7j5m14d8707gkqv1n5ifk1y497mwflhigqgyi9lgcvgxc";
     source = "0f3spbpb6icwm84v4lq0skkx53nw3i0b90ik0svd9dhg31y24c43";
@@ -16762,7 +16822,7 @@
     doc = "1jamw0i9nwmk50j5xiq4pznyjiqc2px2s5993gyjs6hwxb28c423";
     source = "18mw8338ls16klvx7zbdr1qc0z64xgnilr79zfldvsw10fp73apg";
   };
-  standalone-74247 = {
+  standalone-77677 = {
     run = "0pdhvg0f34f8r3inphn2czymq5zna92y5p5yx45byly64daa56z0";
     doc = "1g7dl0bw0zwmb4z4jskgrh2bcvhl01f1nzgyr527rvac30rd5ys6";
     source = "1pckjcvqp1ygx10vghlrib2wd0h2qkkgr96wjg1d1i12cc5nwh67";
@@ -16780,9 +16840,9 @@
     run = "1bf89j0qqyzih5w9ban03k85v8ih0d16sil1sf7smzmqk3nhmrz8";
     doc = "0rjx4wj021ri26zxdlhkh71q3d0ygf3hvcqghq9fwkbi0gnig1r1";
   };
-  starray-77052 = {
-    run = "10jg92mz5mxxxgg5njrphy9w34pb17z4wax03plbak5ic1g775s9";
-    doc = "1b3zr4419hrlp6jw2k1w1rs5pbzgi8m298ph5vph5cfszf28mlzm";
+  starray-78121 = {
+    run = "00fxgnmmnp041pkbzb3ljfygwk2ihk22ga959jdws0r55z0g63yq";
+    doc = "1r21qd22vs4715r36xd0gmjs06v9ywl44hk8dcilzyc1gpq3112a";
   };
   startex-69742 = {
     run = "1d6c54hm9jdi882srj87drkcxm7lldb4g60lbic9wwzn9kpa0ynk";
@@ -16832,7 +16892,7 @@
     doc = "0djb508nm3l88p33736kwv7z309nalblb1zfijib7ksqq03515di";
     source = "12krgi4wm37q2jcag29mflql1fpry8zhzxn3bfbmwh6cna8i6042";
   };
-  steinmetz-15878 = {
+  steinmetz-77677 = {
     run = "0g9ll1hsf82wll1ng5lc2v6il3l6pdy3dppz7k7piqqmifzc8ifz";
     doc = "0gyyqmllgp6dg2g4nh5q5ycnixlyzc6xfmi3szypmr1rai1dvx2s";
     source = "07fj431nraf7f9qcmm5bvk03cblmj15xcsbnhgish4rxqbf7clsj";
@@ -16847,7 +16907,7 @@
     doc = "1v7drgjgiyjp4q714lanybp34pkxjn73w4s20lch49mpq0qfnfqn";
     source = "1ha1ps4cdf6kr6dix9wnhf2672ic31n04vhzqjal12lcrf00pzi3";
   };
-  step-57307 = {
+  step-77677 = {
     run = "1r2mf2qlcksllpaakrycmcrpxfq9c4g7n18ip13ykp92fmrbcz4h";
     doc = "0f0hph5cjwhwdn2yyfzvn1jbkh8xm71jw10zagbncapfqfgx5h62";
   };
@@ -16860,11 +16920,11 @@
     doc = "1yf2xylzkm4rricivv3s9jlcaq8inddmf4f5iq7cg8d1mxnl73yv";
     source = "0q2k276hzpkavwgjmaa7m3x222zknzzd99b3px25pphj8y6xrw7n";
   };
-  stickstoo-72368 = {
+  stickstoo-77677 = {
     run = "0y2b7kdk620lwdzj050zqwbfjnqcvdwq10xzbzwbyk7k32n26vhz";
     doc = "0sdvh8v47vlmvpmfz3ljy1ijivhzq7l8zf5hrpg6k916cp9y6nbb";
   };
-  stix-54512 = {
+  stix-78116 = {
     run = "1jqrvkx444hvfh7246g22k02jm00m2cnc6ffj36k8qdi1s5m9dkj";
     doc = "0vmiariam5zd37zq2ni9560kjgia89p52cm1phxqp6gp7avfyl7q";
     source = "0jjxifyrkdwgbv6xvgpk9ji6qwn4wr91lkdprcdjpmw9b2mwflj2";
@@ -16873,12 +16933,12 @@
     run = "03ilzmkskp2fj3jwyvlwz8b2ryvb1rfj08ciqhkhi9ddygzjk8xx";
     doc = "18cqnpabka16kfq09rspzgwmyh0fva77i8676myf4wg805953zgh";
   };
-  stix2-type1-57448 = {
+  stix2-type1-77677 = {
     run = "0xrpb3y7wbpxdc627gn9h6s3sjymczbhxqqi0dbicrcrd4065kp7";
     doc = "0kqh52jkqgsfdwj83wks80h9v326hxz1zqh2ls346kc6gz0r2p9n";
     source = "0ajs9ri4v4jw3hp64hflxwqd9sw75sk2a56lv57qjzzjzkc51243";
   };
-  stmaryrd-22027 = {
+  stmaryrd-77677 = {
     run = "1vvnhyk7fq6kh1jb2zd19r6qq1j8zzp14gyrqvw7yqm5amjff7fp";
     doc = "0dvcn4yw7qlb7gh3b3z9vk4rx12b1086glkk0x21cks87kphdxib";
     source = "1wmn7bwahn28lwipkpsla74wn3a018808rmh7yvxdkbxfbzcwqcz";
@@ -16887,7 +16947,7 @@
     run = "03p7d1zshmnsb6vhjh8zwiqaxm4hi9pmnx5vf6cdl7amp7zax9vd";
     doc = "03p0jdl603jsspd8gn2jr9fi9nc7nfh7arxracp0rwmbac1yiwhf";
   };
-  storebox-64967 = {
+  storebox-77677 = {
     run = "0vy7iavq6qqxpmwhm9cz4gxp67nriq230kcf1mr1gq2w0ncy7kjc";
     doc = "1crb1bkra0y2gjzf9wndr5c3nvc83v57lkdglxb8v1pzpy7halmx";
     source = "1ybpjfrria57fwvr9kriiw6y76ivwvsyb6ayp0bi750smsv8k5n1";
@@ -16914,12 +16974,12 @@
     doc = "1nccy5d95ada03lh1sfk7rv2r3qba8rd2g61wavw1p9cq40r97lx";
     source = "02mzpys2xw7hd7mfn4z5z7cdlcafkwhiibxnkwya9h578g20ji1a";
   };
-  stringenc-52982 = {
+  stringenc-77677 = {
     run = "01xnfg0mcp94dh33rfzphk50kjb68bw76kf7jnbsnjwlqf2cr5pq";
     doc = "00hbmjwhas4fpcx1yg016ggqv324hdc2aklr2nx5m5x0i68xq6qa";
     source = "1ir6041286fiz8c5zpsbl4cq62gzdrdpj50aqv5p6b1lqd8bsfp6";
   };
-  stringstrings-57097 = {
+  stringstrings-77677 = {
     run = "178qqf3ii5kaw5rpjazvf78mjb0aw4vnqzxpsv9ahbqfxpa16894";
     doc = "0x6hcdp3hlfnd0vn3inq92nja4hirvhg9m37zmsh9ilnnz7dk8lp";
     source = "1aryr9b5d4jrj6mc9cmbpc11l2mqxlxsc16c5h68ql0i6z0bpsz1";
@@ -16933,7 +16993,7 @@
     doc = "191661pf9znl9yw70vd5pnycb9bz45h9f9gl2szlap6a2f56rr6g";
     source = "0mx9cy3pav9a9hqgqdcb1gsvykvhs9plvgivqg98kg8znmd4nzwa";
   };
-  sttools-77316 = {
+  sttools-77677 = {
     run = "1b7c9q124wvzv1blqnapd8056a737wnypwjalimyclh03simn294";
     doc = "0fymrxa6x6b99ip0c8ky7ivw5ww5xfg7mivzbbgylgwp9zspqd3f";
     source = "0gxx9bgn84896mss5z7fs9il13v26jd64jswhr69pk6ajjzhgsz4";
@@ -16963,7 +17023,7 @@
     run = "14drbny66k6c220zink92nixrlcavbw8jfva8p4rh8cdhwq164wz";
     doc = "0cmzng1zba4l85jiskp7m7fd71798p6s5iachwx24syqbmq8h6m1";
   };
-  subdepth-15878 = {
+  subdepth-77677 = {
     run = "1l79nf05yrvpzsbsjyrvyhsc4kx7dfbvx57qc1ymzk2zphnfw4fl";
     doc = "0g8apcawmna380iwys0dvshrdi51k50gavh8wgwybcvfjib82h4w";
     source = "0ac0l63sisx6ry7m3qlf0f98dn7gml3pfxlyiab8664cv43df2s7";
@@ -16972,17 +17032,17 @@
     run = "1mc1zqvqpw5ln494c6afx88gigkby4zlb5i4gbizs75irgyrs01y";
     doc = "05m9pcg8dhk8rayald2mnzl0wa7z3w8znwzw2b9ifbxz3cp5k4d8";
   };
-  subeqn-77264 = {
+  subeqn-77677 = {
     run = "1m9gr0iq9pmajfaqjd6njbbq7ay60kn4f7zxwdzkfi748gr9bbcz";
     doc = "0ai1zinn6f870lvmwn3v0n6s5vy7r6ayk05k1x02d3n2nr7b6xqn";
     source = "09m2rda23l60s86c09l5q6627bm2n4r3pgcw3yf3blw1qvyqprkn";
   };
-  subeqnarray-77237 = {
+  subeqnarray-77677 = {
     run = "1fda0qxhadznv941q0v1girgr2i41lqjr032r93afcrrwd26r9vc";
     doc = "1g5jsgj6n1ddn9nkqv3l8bpsnsj0jnxawxbn96gfxz2qi0mqz459";
     source = "1gm4xn4l22bpddvl0iyh88p640rl2qj4cx68wp0g3qczq078ig5d";
   };
-  subfig-15878 = {
+  subfig-77677 = {
     run = "16fs6ax4rjnv446x56jydx59ahw9ylkpq22a1dfnnyf8s4jm7a08";
     doc = "0jm594akhy2b1w8i7ccv23z4z94lbd6rwpmr62mg1h80af806biq";
     source = "1aprv7xqcwnl6076w71x5x8kspa1sb5hlpbcdrws3slfzm40skcw";
@@ -16996,12 +17056,12 @@
     doc = "0lhpw3ayq5p15blz7pwkg2z44g300fd2k42lvyf7zii67x2rgjh9";
     source = "1mvp7i150kxin5819cvyfwwzgwmiq1r89m2ywjhv87rgg1v31kx3";
   };
-  subfiles-56977 = {
+  subfiles-77677 = {
     run = "10nslhm56kp5bmzr2nlbm40rlp3i02zj4z6vxj8w6cj1vv7jrd9j";
     doc = "08r52aci5ab4cv70kbrqq1ak4ny627ks43nhqk6kn649pcahjqlw";
     source = "1hmli1qvgpnn2bmllf1w53wjh63zk92dv2wvvi6fzjpq0q6lqhwg";
   };
-  subfloat-29349 = {
+  subfloat-77677 = {
     run = "1ibpaj98ibx67x4kff1p0cnzpxmhs4yyqs2y4vj6as5jx43qnwj9";
     doc = "18ps2xbqdf7pgyhj848zw1sbk36drwkpa0g1s9mw882ynz16gl9g";
     source = "01c11mbfyynpa1yi0arlqcaklikr4sr83j69piznabj5jhb45nci";
@@ -17010,7 +17070,7 @@
     run = "13nl4xc0spsg4bq3ld0fv0612kac2z017zp8hwck2d8413jwkj8y";
     doc = "0xbrs7qpbs5314j79nzcv408ghhayqxj2n0nfify6isxh85r1ks5";
   };
-  substr-16117 = {
+  substr-77677 = {
     run = "1qialx52sccay00z85z001xsm62ajvbfxqxc9ps0bpmjkcvvgad4";
     doc = "0zfcggj17bf26dxihkmqwn80pdir4n216x0nhkb3v17q889q903n";
   };
@@ -17022,12 +17082,12 @@
     run = "030f7sq37qjn99l1z6nx7qbivhczpzhjm7drxhhhsssw4n3mci7k";
     doc = "1m6zyy09a3193w0p91y8g66n8bnm80awzg2g8l195n4p41l8vnkw";
   };
-  sudoku-67189 = {
+  sudoku-78116 = {
     run = "1nyh5rv8fgs0lgmsjgkfx24s3lh8pph6jcp7dx8nb8q2ij8ia4pi";
     doc = "0hdvzb1vcrlbis4xsgzdnbidapqp7kdaqdskdha5szjw53xz77ys";
     source = "1rwwqpqvmwvq26ycj2glk0k4m1vlbjrxjp0l20qnh5vad98a1x7p";
   };
-  sudokubundle-15878 = {
+  sudokubundle-78116 = {
     run = "18y4x1g050ircqh3nd95m45scb8zgjzi03cj3n7whn207dvapsdw";
     doc = "17mdxysiwjp3ii1qhknrxw07dcds57qbm986583xh69bhq08c4sr";
     source = "17g96rhis66gvgbm1857ck4ri8nz3isdlqshfx9rdbpgs8x58i0h";
@@ -17046,11 +17106,11 @@
     doc = "1574qpqf2bc2jzr9dcjqrm5hc6p59cpp3i7yqa648wi9ns9c657y";
     source = "0hm4drchfwrydxr28wlpv0hx5xbycdgsnqcdishqzdy4kxidc6cq";
   };
-  superiors-69387 = {
+  superiors-77677 = {
     run = "1kj12xhd0psdz08mx7k2kz2maaaam29s3lway19gcawr156jp60m";
     doc = "0vg6sk9ad181y4g53shj1j0mdrcqny4hjdfv3kdn5csm7h5kqq72";
   };
-  supertabular-77236 = {
+  supertabular-77677 = {
     run = "1hi6yav7kw6ba9c4wsk3mgxpn83a4khlp57qxzggjvik0iarvaj7";
     doc = "1nfwr44cxvkrshn3f9d6wwwdyhp5iv6305wp02spdr7171hn93xm";
     source = "0qcfbgbxaj82qykja3phqw0is39j8k2kv9k5pj70p3vslmz7c5s2";
@@ -17063,7 +17123,7 @@
     run = "06q7nw6bh9dkknj1jzvy1wljh9vn49z7mbhr5d0ydv10mp9y9zlv";
     doc = "0dsr3yd5v6i240f7fgpbdlp0dig4dl0376ssd7nbg86scl63k9iy";
   };
-  svg-70626 = {
+  svg-77677 = {
     run = "0h7ciy6qc3awr2317npp2xi958s4rz8kfr137s2rwpabmkriypsg";
     doc = "0c2ibjsnjffp6rr4fk6b74j1vm6vfi0awvhbpz4yc5cvgjw733nc";
     source = "1dh1857r254hiyi0sjdm3271h26wah74b67fvhmkwwr0wxz7w7vr";
@@ -17085,7 +17145,7 @@
     doc = "1fwagcrmfhz8qwajrpj3bh4r64hm1637kxsqrwfxjnxfrk95v9d9";
     source = "1799jhirlv8gvnnfdh4mwsclcsrr8919wl7wn8y88xwdamiib282";
   };
-  svn-prov-64967 = {
+  svn-prov-77677 = {
     run = "0r4s76i89wh1fjrmf9imf6y2sf96xznznyjfcivi3sp8dvf5ln5v";
     doc = "1al7qiwd5ajjpvs2f90p7frlkd389p1ama019yl0nnxc1l45m067";
     source = "0cg7qwgv20jvvw6bibkskj3p8jc5l2mhgzwq6x0wzy1ds7x1f6b7";
@@ -17174,14 +17234,14 @@
     doc = "0rnghg1459nlliwbcy8r60rc9si3ya35c7sl5zqh67sfwla2ixps";
     source = "022b2sn42mfdnska1cvqjsafakah9a908rvyw0d326d7lxx8wrx3";
   };
-  systeme-77138 = {
+  systeme-77677 = {
     run = "07r7njdk2kbyy8scd09vakkpsnx7ys281vs8cl52dlcbq433khik";
     doc = "00nrdbalsps12vsr12cyvgz5lxaddnjbyqsp48gif5635yq0iza0";
   };
-  sysuthesis-76945 = {
-    run = "1yisgd29ykghilyxnakih9b8dyzlr1pm1qxcgvw6lppwi45x5jrl";
-    doc = "1i1fi1mgvpx5r15wyqc5j5jn0jwbnbgyg4m5bgg5x7h1npz1yb6s";
-    source = "07npbg55s9akaaninyqzz1mp39hydcbyz6285h982vc6c3wyz8yb";
+  sysuthesis-77677 = {
+    run = "0glg4hc74sfjbyd9yprnyh8iqbh6bl7kxl0511ks4mw36pscmdf1";
+    doc = "0ny77qkgvg9qhmm4c81haxan6rpn1mpdhqc66nqr8dkvkfr9jbrf";
+    source = "0s7w7hximgsxvglgkf57vj609ya31yg0glsp3vshk82c4c0s9cyb";
   };
   t-angles-71991 = {
     run = "1p1h0gz1k4lr7rmadhdgb7l3gp55w12m3p88hy9d4d0ryzld299q";
@@ -17212,12 +17272,12 @@
     run = "09pi8sm17m1v4h362al448ayhj1h5n0krdaa7zsys00l0w55qm3h";
     doc = "06173sm4yx2a3mfadax16nqj6ggn6yak85l63jiaqdczwyb09kxi";
   };
-  tablefootnote-32804 = {
+  tablefootnote-77677 = {
     run = "0i1mj9bq2hj4d7y7za2zj64p5dfdvsfi51147as5kfb6ci90rc56";
     doc = "071xk16ck9r0jip847ikb2qjyv3ghf1m73w4s619zilvm752c0ak";
     source = "14vrh8c322skk3rpjpr03fgzbm03khmhf3ifh2fm72yb5cqgbbqr";
   };
-  tableof-72313 = {
+  tableof-77677 = {
     run = "1armfxwch206q8vnggw5q5f8r9d5qm7l2alp9bffwr5zns5aqd28";
     doc = "01hhayhnq48azlkiwmns0nsy3hmr78h6ahicbmh24ky677f83kfg";
     source = "14myamdxyxb14b54sn9yk30ff123zcc8cb66m44wg16d73m9xax5";
@@ -17235,7 +17295,7 @@
     run = "15xinskbqjj1dmi1fpvb6slg8kk3g66dm70z9f7dx8bzb1v65zwz";
     doc = "0lmi8mn5k7b5i0n7bqhagjkkzs2niy9852r8r0vv2c8qfbpm4hpm";
   };
-  tabls-17255 = {
+  tabls-77677 = {
     run = "17bg083653km6v92hifll78vs0p9zwfnj5rbw1pcl2siizf3pfj6";
     doc = "1gnk4blwfikqshqjv4zd4cykp1k6k025h7vnbjrvia11l6kcnavn";
   };
@@ -17255,11 +17315,11 @@
   tabto-generic-15878 = {
     run = "0i65jflbnhqpqf1w7pkagicic1s39gcl319z7g9zr1g80f9532dv";
   };
-  tabto-ltx-54080 = {
+  tabto-ltx-78116 = {
     run = "1ayysa2dfm6q6wli0ldk45mfw9jvj79mdx5kcpiay69xjl96j89v";
     doc = "0rgk0znx33lk2gafzjbwwvl61xl4kw36h9f66kay0y91cy9ra9n8";
   };
-  tabu-61719 = {
+  tabu-77677 = {
     run = "1x22myjp1rpg0in3jgjj4wy0xyva8xd5hsy5c1rqqpy67wy83k0a";
     doc = "076ivdvaac2snb4dgkf4hzpnbjqli28hll6s4r6z609c5v34mf1j";
     source = "1pb4kibjcmwn8snfhcm49jjp38i979dac06p471w9bjnsp0khs85";
@@ -17274,7 +17334,7 @@
     doc = "0rd6k4b00aj398hy247x84jj9c3d0dm00xnaw69p7wvlprzricwc";
     source = "1lrvp6128j70fzwqr61nnwiivgllbbkw7pd53l11sqzqwzxppgi5";
   };
-  tabularcalc-15878 = {
+  tabularcalc-77677 = {
     run = "057720z8l7ss0kpkg7l16fc2v82xr0wqlxzxbcak5m3hl5k03g7a";
     doc = "0539rar83mprammyilmclcbjxr657z6q2xmmwmlik990imf78lqc";
   };
@@ -17283,7 +17343,7 @@
     doc = "1ff62dxvnhi4q1gy8f7qhc0zz1jiayl6f8j96dp0rz38l2is7m86";
     source = "0sfpx5w61xrmmgip0c746mghhj06r2mn2jmj56zingymm2djiad1";
   };
-  tabularray-76953 = {
+  tabularray-77677 = {
     run = "1ba1yvz1l4kvrqs9fwnrb6vg8ll17kjn7y1j5sw3hip6b85fj1ga";
     doc = "1hkwbzacwwzgzw5z2g11q80qxa54qhamd0pvpa3lwl4lffyzqpdl";
   };
@@ -17291,7 +17351,7 @@
     run = "14c54z2k7k58v0vbnlpszc758m00m8znppxlmjdypi8k0f0lshvz";
     doc = "0f71rqjgcb6396n86k2qkgbaayzzhdb9brjm020ylrpz1ml5vqm4";
   };
-  tabulary-71463 = {
+  tabulary-77677 = {
     run = "0l0iibf5ycpds4j47ad1zhvywqpjaljsbiqqj49xqi6n2a6wlshv";
     doc = "1bslhgd6iq5d8w2gp75x3a6098mv5vk4pxvmqqrb1b5q9zfvcbz6";
     source = "14a9xxkpsxdrf5sraqpc4pw44wa0az153jk0jl7l0lq4906l8yzd";
@@ -17301,7 +17361,7 @@
     doc = "0iv8w8jvq05f6a1z7n29c9cldk499fd9igryv3c93g6bgq2hkzks";
     source = "0bw2a9rgij2xvz3lhz6gya4vfsjn41cn7mg9mkg728q4vbhg19ms";
   };
-  tagging-52064 = {
+  tagging-77677 = {
     run = "0sws4x1h52cd313apfzydqpj6c8xrb8x5881cfhwir000n48crb6";
     doc = "1pv7savkzm6jhaliw5ilb7qmhlj3iyiz2w6kxchanwrg4pnqabx7";
   };
@@ -17351,7 +17411,7 @@
     run = "0ad1qkbvvswq7msx9889sz8n7wf8iszigd0vmk2yycykbf0axzii";
     doc = "1m5g6bsijqris8r7z2dw3cj74ajcny2wjysq8ql26531z61hj9ss";
   };
-  tasks-76924 = {
+  tasks-77677 = {
     run = "1gwl8g4a2x3sbvqg91ry577hmpxdc4dgcj9ixhsla25h23jl414b";
     doc = "1pavbpzm6z6najh72z52j089mdg6gqzsa8sb9qyfsql7mndnxznz";
   };
@@ -17364,7 +17424,7 @@
     doc = "1vy7k0f6ri4kbjrhby0napsas9wwlq5by2q1dakbz7r80zr7dc3k";
     source = "150p69vd9465icda6p0wp37gg9vl8y3c2ys3b8f9ij9a88x5775j";
   };
-  tcolorbox-77161 = {
+  tcolorbox-77677 = {
     run = "1yhpp3rma1giasf9gs0rv4jb5zryf68xagjhajrx4i1lri0vmqf1";
     doc = "1hjfxwvs6xm0qbipfk9x1ngjxr8mj2cj2l9k62rrqpgxbk03r8pj";
   };
@@ -17393,7 +17453,7 @@
     doc = "08yjlfrblhralk4b9ji4g47cr9r1zj8dp6sjha0169395wn4820l";
     source = "1cifrswbfk6714m63kvmrsyvz3q29wd1bgl48f5d9ay7pz07wjyq";
   };
-  telprint-71914 = {
+  telprint-77677 = {
     run = "1lsa51z7cg98np1yx62hgs7vp8hxgrlf1y9ssnlj5lbi3awvkivr";
     doc = "1zapfv2v4xpmaxyga62cpqjbnn2zlhqq4xdr5s8y798m871jh19k";
     source = "1w0d0wp5vd595r297p51sqgblsvfqfcavzfji4cqzl1xjhx5r00b";
@@ -17409,7 +17469,7 @@
     doc = "0irpqbcf51dx4rcsa0y3r4x00y7p0fanspyhia6vhk2wsipbgk0x";
     source = "0z1nm6jp8za0dlrj8s7zfcy099c7zr6lsxa48v7gppabh7i96gqq";
   };
-  tempora-39596 = {
+  tempora-77677 = {
     run = "025smp68d941hqdxqsd4qpaxvk4z8ybg14xwc47i36k04244rarh";
     doc = "14k350dyiqjcfg5fx09i2i9cqsdw4mh1qcrv8cglf1gf2d0b3jl8";
   };
@@ -17423,11 +17483,11 @@
     doc = "0225gpdqbbmcpgxmpjcj2blbpzxcnr7vmm38jkkpyan3gfw52n2w";
     source = "0jzzn01c5gwkc8n6naaddm793sm8vs67vsjd30lj4ls7djpnixkc";
   };
-  tensind-51481 = {
+  tensind-77677 = {
     run = "05vgqn5wcynyp8gy80icnkrdrgb0wsr3h0db033yx4yk3c8lhwaf";
     doc = "1vns4k813ffccps5vrrpfmb7rm4fmfs8zgs7cnw2hqg08dmzijfn";
   };
-  tensor-76924 = {
+  tensor-77677 = {
     run = "0712frfli31jnxndk2fac6fln2538pmb7k16jlvskkifgzwrsf99";
     doc = "0cgwilixdvg1ak90m1bv50rvzhlyd17d3h28mw5bj1myqxr8ybbj";
     source = "1g03dgvnj7j8n7z482fyxpa40daj6rllvz4vnli78i8kyp2b3m3v";
@@ -17446,7 +17506,7 @@
     doc = "0krnv111d82razivjks8ip9m6z1bllqhx47yzjw6b5af9ps1k6a5";
     source = "0nn9vgxv5awzqx1zndl7zvgd5nhllw7kp8zj7snd1nqvz3wgc5n6";
   };
-  termes-otf-64733 = {
+  termes-otf-77677 = {
     run = "0vwm8qrbp9r3bbz2a5sbkkpmkmhb4zh4hbxd37hngx1pd576lasj";
     doc = "0pxck3jbnw7wk7j0p18as2i7cffwj2bf4zjx258dqxg2yjg82i7y";
   };
@@ -17517,7 +17577,7 @@
     doc = "1ppvdq0cj62zk3b0i76lc35r9pizzli7mm4j2zvdabysn0prlyyb";
     source = "0ysjsk73ksninqk2dyrw06arl692x66rsrr8vb4l2ri3m0lyivlf";
   };
-  tex-locale-48500 = {
+  tex-locale-77677 = {
     run = "05l4frsxpdmsrbn50q87db878bwpi076wagj5r8kdnmdwmcanr6l";
     doc = "0j9m67n83f4h5yhfh3a51s9yhqh6kpjz8y5vlxhyabyf7rcpybd3";
     source = "1x0wmqsrbgdgy67gln4jd0518cbd2cxp36gqrjrqgn574qsl5cx9";
@@ -17538,14 +17598,14 @@
   tex-vpat-72067 = {
     doc = "0f747dc6qb6bia3jalr0wf0g51aqqf7jwix7wnn207nks6kh69bp";
   };
-  tex4ebook-75774 = {
-    run = "1gyihbgsif7wjl436vs4p47nvdb1prm9l2azdvggw9wqk94c655w";
-    doc = "0vqnwjyz0yldf4pvpbhssrhl2izvnb5q7lv7c684y59ayg82clnm";
+  tex4ebook-78153 = {
+    run = "1awhmkmvswn5583avfd226qzwj09i5pjnlfm97al5l4ql0hqh2rb";
+    doc = "0np84cifjrc9ls39gvnf0pfmyr2azbmkjng68wf22mpbbax0vblj";
   };
-  tex4ht-77565 = {
-    run = "14l74yd3a1iwykzh4xhznny8klylg6j2g5y2ch06dac4k41la84q";
+  tex4ht-77991 = {
+    run = "1brpxgcxrn8x45rnxd2mi9fjjlifafrd5d9naghxd12h36i5xz50";
     doc = "04z1bsgy3lisx7ifskxzna5jcbjkbwwjlqfwbfppnmjp5rwphxdv";
-    source = "18ga6yz6b2g8mrgrkv95x1nikg4s74yik9cpfnap4pwa53xmsxzw";
+    source = "1fvgpz4r686f86hf8mjj31724dcr1l9s02nirfn01fjlxq9fkpkm";
   };
   texaccents-64447 = {
     run = "0kq5432kl59pb0q1way09d527afjx5bh2y7jmv82f9y5cz7n3kyi";
@@ -17580,7 +17640,7 @@
     run = "1jjzd4grr3ip6gd8xmhlawhdcjfj1sqfsa06rxrpziklwirw6bq4";
     doc = "0f7q7cszy6ca6fmwzi7fn6p72szgzyj9fldvzz1rk3ywkhsnpakr";
   };
-  texdimens-61070 = {
+  texdimens-77677 = {
     run = "0fny36zd88qkcz7k3hdxq2qr41dmk9j88skihls4vwf350fy8j98";
     doc = "1qls1hqs6ypmsg4rqa26dp98m6h7zq18wdg9n6g6895jrmj10qdz";
   };
@@ -17588,8 +17648,8 @@
     run = "0q2m138gpk9cvfp19jvsw746mkxa613c2204qfxw1bxw8b454d7m";
     doc = "19iiznql82a34d2yhzqcp339zszbhfz9fh0h4mb11696mj8rx3v7";
   };
-  texdoc-73876-tlpdb77567 = {
-    run = "18ci08vy1nxbyn5xa38w4j6sqzr8hdmd6l316mplzhxblkfmz20z";
+  texdoc-73876-tlpdb78234 = {
+    run = "0lw55pf74bpqj8c921ranmk0df1vr1w09dvz3ijqwdqyazj1wqav";
     doc = "001cx48nlipnrz3c3fkhq1rwf0blmgjmyqd5jx2awcp787rs8mjz";
   };
   texdoctk-62186 = {
@@ -17642,8 +17702,8 @@
   texlive-ja-74739 = {
     doc = "177pi6ih64qmpx6zg0ps75w7k8nzdpamj3s9nv8fazs64fkrnig7";
   };
-  texlive-msg-translations-77513 = {
-    tlpkg = "1yk7dylndwrwa4pqd6bmkzs7dbkbkz48ad3fp7p6m8h8w3ldhzsp";
+  texlive-msg-translations-77642 = {
+    tlpkg = "12h5z91zgfwfabvvy7477h96pd8h894myi73qyp5zdga80g9zd6c";
   };
   texlive-pl-74803 = {
     doc = "1a8n0afgbryz72y6fg88n7b3hk3afmw2l7z1lqfbl300lja55py9";
@@ -17651,10 +17711,10 @@
   texlive-ru-58426 = {
     doc = "0c77yyfj87fajran8jppj0x8krk6b5195iscpn8z2n94spz2fcc9";
   };
-  texlive-scripts-77567 = {
+  texlive-scripts-78221 = {
     run = "1szbylbyf81w3vkhyv1bryzygdpzxgmax3darp4vdcq72gnrvfsq";
     doc = "0r2pm5nxz252f0z2xfrm4700lxhi31w7dgzd29b17f30h5i5vr05";
-    tlpkg = "195krdxa4mbicyqg9vazlbq3rx6r9ds09w4vkmvdaphhqa2kcqcp";
+    tlpkg = "16p09772dwpzr6cdqj3nmk4maavix2x8v2r3vpspsv2ra557zv80";
   };
   texlive-scripts-extra-76585 = {
     run = "0b1bdhk2i45m8b17r2w7zawx496jln3w4wh54f2a597cm9d7lcjb";
@@ -17666,10 +17726,10 @@
   texlive-zh-cn-74098 = {
     doc = "1jx3zhrclf8nf1pv56xh9ffgi5dlcggcxgagxp1xnwm3fm3q0mh7";
   };
-  "texlive.infra-76780.tlpdb77567" = {
+  "texlive.infra-76780.tlpdb78234" = {
     run = "10cpzqchjzdbl1f35sn6wg5g1xa606mrqcx6i6nd21s5aqxss9sm";
     doc = "0cl21xinysxjp8fhhk81n9yriaa7xm80zzmzh501ck7fvrlf8l2s";
-    tlpkg = "14w73wbnl8n1mg155gcmrqj8a5y0mmi0frfn7i89pvgd0wx6gbgk";
+    tlpkg = "0qlfab069q41n9yvcscp6jpfyfhn7xwhv7skdn999c9kb5yhz8ms";
   };
   texliveonfly-76924 = {
     run = "03i9pzqv2dz4z9nlq60kzwiyfvzhhaalhczqa9146jp4wvcib9l3";
@@ -17690,7 +17750,7 @@
     run = "1lwngp6q5mvhzvf7plkriy9nj8kfa79hghsz8aasykqr5a97v2cn";
     doc = "0kysi3959kys05xkbx2sj6id2a7cvx21aahhqv127cq1qmhbbj60";
   };
-  texmate-15878 = {
+  texmate-78116 = {
     run = "06hnwj11ify60gx92zqky28spdhppgai5v08l73kiabrryzdn8w5";
     doc = "13d6rlazx3qx9zwbb60z1f6dk64n6rph610s97hha5kpc0v2vkm9";
     source = "0faabcm8lyfvzn5jb7vbpkpa31gjb1czkr0g391vbdmx9lrllxar";
@@ -17708,7 +17768,7 @@
   texonly-76924 = {
     doc = "0h40f8hj03ha0ilpj2fx5kzzvdv0yplmr4528s2rmmy62l9kgdkd";
   };
-  texosquery-53676 = {
+  texosquery-77677 = {
     run = "0jszy2f076hrc29kk8qcr9616hyk2cvys3kg2qfhvblxf07ziw62";
     doc = "11rz21m720pp97vb457pxaq5yxf3j4v8vfcd77w0bjpc632lh1xx";
     source = "1q7spgr1xk2lnx2xqksjh979n7r2v1n1441fkrc479zyi69ncn33";
@@ -17739,7 +17799,7 @@
     run = "1f2m8b4xjq38j6q86pfa4m8f7z4sqyfblxpkkljppiz66cq9gnpy";
     doc = "1zpilg11flz7z6pk7zhpm5ck39avh24na2jpl4asnnznaf5bzfjz";
   };
-  textcase-75878 = {
+  textcase-77677 = {
     run = "19jg174pjclhaj7wr5r40bddflypfc489wkl56bliz0fd8hcpidk";
     doc = "0775mi8v7i7w94y08qvck7bblfw9lf4zw4dyfkjh0i71wz7da1yg";
     source = "1zbxf88w6b6bipyp76k7qmlhav3yypk696c664s63g5id6jrzhzi";
@@ -17758,7 +17818,7 @@
     doc = "1c88my4j07b7ihn07bcii9xxckdv04g3c6jycm0ffhjffw4p7609";
     source = "19hc7lalmbr85pbz3pd3dm696fsbdl7y8v9g1c4l2k7b0i5mc8zf";
   };
-  textgreek-44192 = {
+  textgreek-77677 = {
     run = "0r7jcv38749xndr6sigy8zw96kwqw63k4m33c09hikawf2728jzd";
     doc = "12pwr5b8269hrwgpr9g4chw273wv81cfa52wvp3nhkd2cvbhfcp4";
     source = "0wq69l55462snrkpbpnlg03mrn2yxvibw38lkplgfc65gzaa07sw";
@@ -17777,7 +17837,7 @@
     run = "12f8qn2ncw0drx5r48ddb0xcc6fdm7jpmv5i1n0ihfcqaqa1l8xb";
     doc = "0qhyflskr978qp01apai5r3qjhsj5q4mrvwck60jr79yasxa109k";
   };
-  textpos-75712 = {
+  textpos-77677 = {
     run = "1mhbsyil3ldw4xq40739pm7995d7fcv050ra4xjnaqdf93cqr2gm";
     doc = "06ya6i8qkp823pnh1jzq30wi3pnww00jw48lbk6rzvxzyhwxrzdh";
     source = "0vhyr1ljhi5dxyj90zhpr8x7h8rjn84pddaa09al69awlgkihclf";
@@ -17792,7 +17852,7 @@
     doc = "0xbfpdp571i1fbzwjw8cbk077rp6x9fiqic49zfcp4f8d0rxdd5s";
     source = "1ii3xfn4bm9c29fjqkwm50nkxd7jgzaqnhpzh40vxgxb689pyqjq";
   };
-  texware-77463 = {
+  texware-77677 = {
     doc = "11i0kv92nwfqzgkxks8li5382wfip4iidz1l10aca6fs6sll39mb";
   };
   texworks-71515 = {
@@ -17807,7 +17867,7 @@
     run = "16awnv395nhgm8s3n7w1x7x0h32033258bb0jp81v5nrnmn344wi";
     doc = "0jvggbnxinc81bn8glmyli746asqcpclgmvyl8gzbdarrnabij3b";
   };
-  thaispec-58019 = {
+  thaispec-77677 = {
     run = "1inic6cpbf1kf1hi6brhq5fj3fkwn95cvgjqwh7bxk9dxk1rzsh8";
     doc = "0ki2jl9spv70f5hkzr762nkcylplb9z70c8gdp97whqg9l9mb8bs";
     source = "0j69dwrn3qk82xgnwabq30ab1pf4xs3sfnxgnrksgmhd0ly4lpjv";
@@ -17835,7 +17895,7 @@
     run = "1idrh46xfs4x0xwynkp8zknj8i81zf0x62681rnmwqzaxwpmdjd7";
     doc = "1hplqlflqvgxdahh0s37zkx1i5dwcrzixjbk8sndgjbxdsgzjspj";
   };
-  theoremref-54512 = {
+  theoremref-77677 = {
     run = "1dfv3pz7pjkazp0czzpzhga9j201gwvx785v3qvqasrvpa0vwyyq";
     doc = "0zs8q0xzinp2ih68c75yj9mbjh1pmpqc77xg9hmj8n3gpf1kmmi5";
   };
@@ -17866,12 +17926,12 @@
     run = "19d23nm17nybk0dda4l05dsbs1695fk0kl86vc713l19mzw4l7fw";
     doc = "139v4dmnbhsd3nqlp9qknml0glfmh1f9dg0nnixggf19lsayn27p";
   };
-  thmbox-15878 = {
+  thmbox-77677 = {
     run = "16c6p3n4zc2726adj8z131h03gbzyhmh5bj8hzc286p96131swdw";
     doc = "15mkfzmy0141k5wgspngbwnnldf0i1rvbmq2bkzcpb72v9vcj8fd";
     source = "0lv5mr23wwhig6r9fyy7rlv2cqxlr35y3g89i938w35s9q25xx08";
   };
-  thmtools-67018 = {
+  thmtools-77677 = {
     run = "0msngnpdpqpw0skchd629v72wnd9pn8s1jijcyvqzwy88k8i8f2m";
     doc = "1lyc17i46x1v7xhxl7qf8hpjn3y9r7da4lycpsfijmlscp9q3c3y";
     source = "13zd5sx1nh9f61jwr2raxkli2y42w2dr23j5yjjfwfk65pd8bfq9";
@@ -17885,11 +17945,11 @@
     run = "1r5cssaj6qxv17n04pgvib12a7b7fnxfk3qbf87mhs1xpxsh6v1s";
     doc = "0w7f2dfy6sbircp8dbw8s28s4bxbqnmz469c71v3qcaw6hgw3y2y";
   };
-  threeparttable-17383 = {
+  threeparttable-77677 = {
     run = "043vgdllz4k8fcclyw49515rcwl03albnmszbqi7sbsskmxnzck4";
     doc = "1mlhxgv9q1gnkp383vinybzh95fd49dgz4x14jnjilhjabvhgyid";
   };
-  threeparttablex-34206 = {
+  threeparttablex-77677 = {
     run = "0ipmhy0jpx38sy1jyyw3ab953cyh95ix4qwrz1ywhi54dn6ahygs";
     doc = "19mk0y6nn6bn7gmn7vvlbijqdcjp2br0s632lmhnyhwz0d4xz6mi";
   };
@@ -17916,7 +17976,7 @@
     run = "1zj2733wnq4zydf22qhza9j0nywh6fmn8xd3dc6nwfzm68pdn9ic";
     doc = "1fpbfz855cgs9gdvwqbg9pb3i3yl2xagmxbf25mra08ii17v3pf3";
   };
-  thumbs-77398 = {
+  thumbs-77677 = {
     run = "0v4iq8j01vfhqph0llzsy876msha892c4gn9h56cmwbkmhpim0yr";
     doc = "00zcijv2fm674hvzdm6wffbdfczpxpkr40ycv9gl9s7z4nj9lli0";
     source = "1r37iw0ybkf719llsgdhyiqdh6dh959p8zw49n3b417l9ihakl4a";
@@ -17947,7 +18007,7 @@
     run = "1lnymwa3hbfabxigxfqkhmczigswqn84wdw8jdzj7khsv4zm47rk";
     doc = "0gb1aayki8i14i9zl450jmy4ybbcdnv54l5s1b34ma7vw9nbng5g";
   };
-  tie-73848 = {
+  tie-77677 = {
     doc = "0ydwh377n4if7vmgdlb7c2dsj6d5xn2pvz8vl4j8809jbipxy2lx";
   };
   tiet-question-paper-71601 = {
@@ -17978,7 +18038,7 @@
     run = "1wwd6ig6hcpi3749nmia8xzjzifcgz3d9lrwyfw7fb1i1h95cnq8";
     doc = "0gyp1kz7r5sl8c19g4baad7bhk0mf1mzqhhn4qx70xnic0hizlmr";
   };
-  tikz-cd-76924 = {
+  tikz-cd-77677 = {
     run = "0xv75gvwlhax08mp1nlyy2kgi0br7wy7aahbaf9rfbj0idpcl5ip";
     doc = "0dxsixn2n0irfqrgcp63h74fss1ldqlcvfv6d9v61asxsjdrzf0v";
   };
@@ -18019,9 +18079,9 @@
     run = "02xbywhzzkiica13d2dzingz9qm2v1w3fjrj9kbjn9q9fmw2xw64";
     doc = "15mvq4gpd22nah4p84dazld4ncdshygmffz7sx42s2zqyjwrm6wi";
   };
-  tikz-kalender-77508 = {
-    run = "0w4wa1p4k9d5xkdx27dzsbwpqsnx66cvaz42q8x6121fjaad5p4f";
-    doc = "0dsy7sp70b8ivwad13a3l4r8a3kw4f7vp5gg80gg4yf87dv9m7n8";
+  tikz-kalender-77920 = {
+    run = "1appnrkjkjqfij131wvrqspjm2z994maz0cwnfzvcc9gbv0g61n8";
+    doc = "0wxnzm2xw641phyzxks3js0l7h3pxxp53nvq4rgbf1hrsv6vh0wk";
   };
   tikz-karnaugh-62040 = {
     run = "0bhnh37ydzfrkvjwfyzih59sadfzw9y02y337wym3gqaa0m6w7gh";
@@ -18146,7 +18206,7 @@
     run = "14525h2mky7m1a8lsqnq8c8y6y5mh5jg9i69zc5s88wpzvc1c2dm";
     doc = "1982s67r3cyvizfk6lx4xnxrwm94cq72mpkyvixxdbjfvsb2grhf";
   };
-  tikzducks-77080 = {
+  tikzducks-77677 = {
     run = "1705j8zmqjhdl2gj1yyh1vsk40x4jd4b9b9763gqxlp5rin7ivvi";
     doc = "121dpi3z44ygwalj78s5z32qnh3d919cyz8pqlqfj1651xjgbywz";
   };
@@ -18163,7 +18223,7 @@
     doc = "11jj75nnzw9m3i6nndbfscllfxzn5bd636s85q17gds03jbqkhfc";
     source = "1v1bvpfqhvn3hp3zjx3sqv4kg288aviy1b9zl3s8r64zmai86bfy";
   };
-  tikzlings-77079 = {
+  tikzlings-77677 = {
     run = "13v4v8zf9iganl52n47xciczyzgrxj1pbr6n41sd61mc0iccw6gh";
     doc = "132w2yffadnwiqsxi41cz9kzjdwwn1pya74yari15lhqyglld15a";
   };
@@ -18198,9 +18258,9 @@
     doc = "1530vkp14lpv0hnv8qcxalibsi1pkcj9xp1pa87lisrillxs7kwb";
     source = "180cp8vp26shmnjxg9qs9n28v4xy0qhqgm1bvbkqrpagykzzhsrf";
   };
-  tikzpingus-75543 = {
-    run = "1mciqlzjz6fjn24915jsvn1hvkswm4jd80a9h1nppz675rh2bvyf";
-    doc = "1xf09v1h1cvmd97ynx2fkq8lx8h58py1aqmsr77zw5gr7l9km8fw";
+  tikzpingus-78222 = {
+    run = "0raiwvpw65ng72hgmwrwafclynpwww6avicrpfgqf5rajk0z3fhq";
+    doc = "1zj4s8xdhls0g9vy6kf9dhrka4a019qk0ckyhrdhhjlm5k2kjh8d";
   };
   tikzposter-32732 = {
     run = "1r6pia3sjl9xcixnsr5pk8cma4f18mvpn60dxmpzpn2nn1sk4p26";
@@ -18267,11 +18327,11 @@
     run = "04yal5fdbwwdq5i7frmvxm0z7zy379gpwbc5383xn0nfdyzrq91b";
     doc = "1w3qzl1j3viaj6qi50qcyx51w2ms23j27p17h526iz11x39w0gw7";
   };
-  tinos-68950 = {
+  tinos-77677 = {
     run = "0czfddyibqn7g62j3kqqvswwfdm1z6xwv0k0m43g30n8r61a0qa5";
     doc = "0mg2rjy5kk7gd05lp00zh41sxapmm0bvl950r404wy1snl17d23d";
   };
-  tipa-29349 = {
+  tipa-77677 = {
     run = "1vax0padc42ks1b4rvl0ikfqmb5i04ii27k1711vfdbzmg87j217";
     doc = "0wwnbarpvjcq8ibbn8sr0zqrlg3clplc9nyh46r5gsr06qgd1prf";
   };
@@ -18291,11 +18351,11 @@
     run = "143c2w00f4s24qli3wbnhps6b5pbrvrhaddpgpgn52pmy20f5z85";
     doc = "0l0qs27bm0hy835zljyapyhs7iwvkpn85vnd0z02wy8l0nb11ly8";
   };
-  titlecaps-63020 = {
+  titlecaps-77677 = {
     run = "08cy0cmrp27iqa081q1y3ibif6lv2c83lmvn9d7r920f13dpmy7k";
     doc = "0gmajngp9cgi10b9kgc4ra020drmm58f00vh1yv5qj3x8bx5hihf";
   };
-  titlefoot-15878 = {
+  titlefoot-77677 = {
     run = "0c0nhhxhb3hmvg3a64lr5npbqsmrmprqqj9pic91j007k4s1in4y";
   };
   titlepages-19457 = {
@@ -18305,15 +18365,15 @@
     run = "1pj4mavc06r5ghcvyjjhvn7x2xrccgdfjr3961al7420ymaqb726";
     doc = "06s1r8xy54129y7fvzaym2vkfbyw2x31r91i8cyxyra0chzh8ngl";
   };
-  titleref-18729 = {
+  titleref-77677 = {
     run = "1y2aw2m7jg7l9vcr35nd2qpbafyff1bc8acy2cm9k7fcjm4rcr17";
     doc = "0rv9hsx5p460pa3ry50fnrcb0kf08rzdl7bq47n5nhm8frpmczad";
   };
-  titlesec-73302 = {
+  titlesec-77677 = {
     run = "0k5593mc0899v8q1kcr17817py24b7bvqfz7iy0krb5gl7d88ymi";
     doc = "15yyh7pxqmkvl9xirkw84691sp35l4wabw4392y63add6hjzx5vc";
   };
-  titling-15878 = {
+  titling-77677 = {
     run = "15iw3giwxg658pzb6basjkp4v92m3qvzk1fcarnzikc649bjcbch";
     doc = "1r75nwakbkwf32qva6icp3pq3y8bgfl6cqw304lcw8p6bih74y5j";
     source = "1jdgyn9zyf5rwbaz004g85rr2jpd5gi5iyn111s0r22ml41ci3hk";
@@ -18334,9 +18394,9 @@
     run = "0gf3zjnqng90kn9341xdchm1diav93qlv2910mrl1cc7vqfp47wf";
     doc = "10p4i3xnbpyhzj32j3mi59pzaisjhj066m9np4ankzizgwv9x5in";
   };
-  tkz-elements-77479 = {
-    run = "0lgp3nki81dwsw2p6cz9bic8p76qc5pj8w8fdxhqn13qnb5443az";
-    doc = "008hqpq714i5q5plm4p6m3197pans92h9q4dw2v8akvdksdwbng9";
+  tkz-elements-78014 = {
+    run = "1013p6jrr10jj2gvsh75wkvcpfd5klxmnsihw0azdh2sjy628cyk";
+    doc = "1di07zp16nl1ba3yyv5kpcd646902xb85x9rq3wzm63s0gy26lx9";
   };
   tkz-euclide-77515 = {
     run = "086mjm4qyq450q87wnb6f49yjz5a2r6m26w11sc5m8gwxxpvg1k8";
@@ -18350,9 +18410,9 @@
     run = "08kfjaniwrlw23vmz24yq9gbdks9fwcf0g4jyy98ikfqh9phhhs9";
     doc = "1drk9va3bgq62qfkcvp5z30gvnscl7mbjz66m27wmgagb2ki2f0q";
   };
-  tkz-grapheur-77346 = {
-    run = "0lm79q6lbjvxhrpwi4lhkvw25ry7qv9hya3nf4140xh9f246jm62";
-    doc = "0k1b153nysxp1nmdj3kaf5y0c5xrshxv2camv77ygcfr4b3nsf6c";
+  tkz-grapheur-78175 = {
+    run = "13i3w7g6rl1087jignb86gavrxc0k9z37r1jnv6b5zxmfggf3rsv";
+    doc = "1z1y94rxrbjgqzhkgrilhn5mpyyh3rqd821d2lja6z454pmfy11i";
   };
   tkz-interval-76924 = {
     run = "1gmdbmw4ad81p1zfk3wbn9cmg8q8zrs655p8an8pqpas6lqkgg20";
@@ -18401,22 +18461,22 @@
     doc = "1wf7zzl2s13bqkpfkcpj984fk4glmkpjwyb1pwlmw11vsb7n5g18";
     source = "08x1fbgg7vkxq1j3jvkkx8aqg2r2371i1kg1brks0w1m1rdgabqg";
   };
-  tocbibind-20085 = {
+  tocbibind-77677 = {
     run = "1swxyai6gqlz8zjah2qnz9c5dkd1smpk163b56rba0kx7zcmvzc5";
     doc = "189qi2qyp1nasg9w902ydk7rlzxl2qww9w3p5s3p9ywchvm1l9cf";
     source = "08sr335sgs7hrhd6cbdc4dh3f8m9fpplv72fk54y57rx59l8wxbs";
   };
-  tocdata-69512 = {
+  tocdata-77677 = {
     run = "0vj012pdzwbss6h96l8a539vdwihm9f58d6yazsfc74ia4k0x3yk";
     doc = "14hy1z419gb6n4zw27xv1qi3gc3krg83xpnr5lw40yd92i99i8q2";
     source = "0wg9d1nay4cr52g4ird3cgb7lndlyvmx6hcf6d29j5hfdaafkdg2";
   };
-  tocloft-75878 = {
+  tocloft-77677 = {
     run = "1vp3s7q0fcyfj2ksk61gxdjjnwhd62dzfd94yp7y3qfy7x8hyqxq";
     doc = "0zjs0ldib6hm3b9msb5x7r64ddknqwf6kkc9cc82hbla9wshq4qq";
     source = "1764cq3d9ad5gy3qag6f6wxgnna0dhk3rx186jqjpqyqli8b4lgh";
   };
-  tocvsec2-33146 = {
+  tocvsec2-77677 = {
     run = "157m17r777cfqjn5p4j1rbj10ysbyms87jrhk0wjkahag9rgny1b";
     doc = "0dvzcynpfn9fvfkks5idncgbdqbhxj0vp1d3mfzymhiw4sds31xk";
     source = "0gjpdjkl73ip3jkhr9sx94mwxz3rvxaacn553xwa9gvk3xh5rav9";
@@ -18426,7 +18486,7 @@
     doc = "0n6dy738cj08laf4cg4y0sadzzzrz9wa9m87hwkya6c95znl0091";
     source = "06xpbraybhf1wbl979653waznvgq697jq61xcpz29gn159li0pdb";
   };
-  todonotes-69319 = {
+  todonotes-77677 = {
     run = "130szqdm8xx7bqqqlx01wgrj6x2wfqzynmf7pjsn953rvyd2da4d";
     doc = "0920zvilbcjsl707vyvvdcw27qg1hjlrmjfbr3229rv9n4zd4fqy";
     source = "1xx14nww9nh8iv0nxvnj2iwj1wm70iqfclgg39q7jlywdzpp7h0y";
@@ -18439,6 +18499,14 @@
     run = "04b3jy76qdvbq9c6yc0lmq99jqcprmcfd602zm6xsr0lwmxrp1cd";
     doc = "0lpbfdvmib9ykdcwrcd5inpibgkm99avqyn94zadbasr54k62gna";
   };
+  tokglobalstack-77964 = {
+    run = "1drm9jybyidax6fs1vgr35wd4k6wh96varc9qzmv80gy2zf8shz9";
+    doc = "19wc0g67nsh7v7hasc16zcaw8rgikl8aly7sw17qz3vyyy28klan";
+  };
+  tokgroupmark-77963 = {
+    run = "18xgk986zc1gplaz89kiy520cwf2k2r7a0bfb26l2idvvklwkcbc";
+    doc = "0r7wlg0pjs4h89l6zjp6qh76kqsy4l310mmja12igzqrdk9rdx0b";
+  };
   tokmap-75599 = {
     run = "0dzxdgmkzqwq9mwjz9k7fblk9nhp4h0ljp8zg07zavih1j2lrcww";
     doc = "0cid3ciny2d66xyi9n45igxs9psa4wy6zz7njwqxn5wnzagv91hk";
@@ -18475,17 +18543,17 @@
     doc = "01ybb6hjbqkzyfhrhq1qhjz97lmwdiz6s7q2rqn4bjjz22mkvd89";
     source = "0wvdm5lp90713rirqbchvzi99kz6mjp9wzni3nc9ynrbz2nkxzqv";
   };
-  totalcount-67201 = {
+  totalcount-77677 = {
     run = "0zd8h2sanc98qzhgkzgaxjyzfh969lb2935778c80n0w8g53ipn7";
     doc = "1cwk1dnpin4zz0zc4rbf7a1spz5wzvza3nc9d4jrpxqbzgs36nb9";
     source = "1cp1fkvs1gbif9brdwxd1dyx81ylshayq6gad4fw6npzqynppk6f";
   };
-  totcount-21178 = {
+  totcount-77677 = {
     run = "1mj04hqxi81i1pwjrn10ipm6b0xwv2081paa4kvq7yma8g2kmi9p";
     doc = "1c1941vfi2pf0wsbfhhzpahyxjzb4jx4lr85k7g6r8vk64qahy9i";
     source = "1f6r2ci4dqri4fxd5mwmfmqmw2k5jfr5vzf2mazynixxp809mjwq";
   };
-  totpages-15878 = {
+  totpages-77677 = {
     run = "1z6brrn4kb6w6an8iz6das0yykwj2cbaswa9wy2p3rfc0w95x0ms";
     doc = "0nm7x3rv5rxg40k0xls5d3s5dqrpc8vw9g93sa3jkdn18xkxh2zs";
     source = "1b0glns220jsmn1607d5f44k2lijjp95cd0dkxabdc3p576ipmmv";
@@ -18503,7 +18571,7 @@
     doc = "0mzmdfbrrwl2v6mvhcirb7b6lvipvxsi4d49a9x5abixqibjh4d8";
     source = "17969haz7fambbwiv1cr8ndxqjsgi550qjxszcvw9v812adll5w0";
   };
-  tracklang-74576 = {
+  tracklang-77677 = {
     run = "1ph85rhwqn477hk6w6n6vdn5y81vvb2xski1mf1ynp9kr47k72l9";
     doc = "09a0xdfjdldqh7p1dfskc4hv905h838phngvqly92shlrswb63da";
     source = "1j4gc6b4fpy3vqd1gwjp9kw8189g2ymv47xf47pm5swqbsb0rrr0";
@@ -18513,7 +18581,7 @@
     doc = "0sl8xzswss89ifxzxx0msvhpihk7992rlrmhzwhrhc9ip66y6qrz";
     source = "1lah6a5vcycnglvc5qsy6mm6fmwcgzpsrkkb9rzwa02igpgq8hbi";
   };
-  trajan-15878 = {
+  trajan-77677 = {
     run = "1hnk1qb46hihc3ga6klxghqf7yvn6zschp6w36a08mz1hfsdb8sj";
     doc = "017v3bmngyh8wydjl7hmxqh2rz61dg2imcl0gabsfs98l8fnwsfb";
     source = "01qgax96y0sklbbb8mdfv5yc0i2k90i23yg75vhjmb7xlwx60q7k";
@@ -18562,15 +18630,15 @@
   translation-tabbing-fr-24228 = {
     doc = "1cih442gp6zf8nwb2lbgjn7a64aglyrcw3aciqy5pkdw09pwn0an";
   };
-  translations-61896 = {
+  translations-77677 = {
     run = "0cs8wvvcgmzsnx2bv1qhmcmcswpj6kbk79573yr9vmiws43djng2";
     doc = "02z9ggyi83hiqmvc53wgvkxw7q3jn8sb5vd1pzxmw5kvhdgkzy2p";
   };
-  translator-59412 = {
+  translator-77677 = {
     run = "1cpr6znw0nkavqxr6bv8fkb72ygnjhl1ap0wbim75f1gmwn7k4ki";
     doc = "0yk617bp6c4wcr6mqmyfsh9lirjjzlg6fiay3fp3g9146p567w4s";
   };
-  transparent-76924 = {
+  transparent-77677 = {
     run = "15n7n3k2zy6cyi9sgbq95g365a4zw89cnj6kg58g4znmmc9p22gy";
     doc = "0xnfgf87qxsrf1zgcl7y93rbprd65kzm9qbp8accynx07n8wp5dz";
     source = "0dmvwjc6jwivahvrqbyn07dbj1r70kr93i3lrkaskzv424glr7qx";
@@ -18599,12 +18667,12 @@
     run = "1z4sk50nzdplwarbv7ha3gi5v6g2sh2nf85ipdz2rbj3cnz0j53n";
     doc = "12pm2720vyk1c79qbgk935nridg3z48cbzmzbx9ak66araz9y901";
   };
-  trimspaces-15878 = {
+  trimspaces-77677 = {
     run = "10rx6pcvwn1lzyivn312j76lsrw3lb40jgzyj861gl3r3pcls0nw";
     doc = "13zf5bz4pp0lwp44kxdj1zw44h978bdpaiskbma752603jlznaqs";
     source = "0nfwqm4a7c1ks5sqypkwmffqasjaw008pxjb5spr49h3sv7sp04w";
   };
-  trivfloat-15878 = {
+  trivfloat-77677 = {
     run = "0s74sisq1bg9n593az435chspj55ysx9b0vqywl30mk60hray6zm";
     doc = "09szjgdcy2fc4ddkw09vsa2am5m98mgm606i6s2nrkjgldm0x4ap";
     source = "067ab9d2vc3m950587iqcfismjnl8fp0jxw0ssdsz3gqxys6vgz8";
@@ -18618,7 +18686,7 @@
     doc = "1pd0r5j26xj63qvj7mrifcxjrzazdi702ang8k6npq0cc8v29iar";
     source = "06aavqqczg63yc0s1mwry4nd2ml94424a2qxswcz60y57m68yq61";
   };
-  truncate-18921 = {
+  truncate-77677 = {
     run = "13hzrndx2myazl7f30i736zs8vk12203hv9rskwncl77hxrqqqpm";
     doc = "0l5hgx3207h54s4n5193zc6ssj6l49xwx2hd9jfpqh1f73kpn6hf";
   };
@@ -18652,11 +18720,11 @@
     doc = "06g1h7l2bbabg87y97zifxn6401hf0j7ia86scgjkpjbx7p2dj2w";
     source = "1s4y8cvn1iw77b2qklbbnpm1jkjc0sjnkvsa3savvcb7zhw4asa0";
   };
-  tufte-latex-37649 = {
+  tufte-latex-77677 = {
     run = "1azsqa3qa1w2k0r4sp83xp9b7g1xjw47wv9l0sk065zq0bdjr9yy";
     doc = "10h41jbfmjg7p8k3m98l2jyhl7365qym844y8f38g0f9sr1pyxvn";
   };
-  tugboat-77362 = {
+  tugboat-77677 = {
     run = "1f294q0dvji0bk0bb6acc3w8gym8q8vsiiw72w4mw2xxxjncg459";
     doc = "1pcv6zkrajfqcfgkx548di812g72hx6hm0z1nf9s5sbax9nkdv9x";
     source = "1ff24l9jbsv8094pzy7l8avx90hrk11r1agwvjzjhnhxhallpyij";
@@ -18669,7 +18737,7 @@
     run = "0liczx2jcdks6r5040r7dqcyrcj225xq0035ccdb9kjmp0rmc90b";
     doc = "1m73fc2nj7qsy144fmbqhld3hx431ry64jv5p7h0r4p0giadwxgc";
   };
-  tuple-77463 = {
+  tuple-78222 = {
     run = "0yfrvwbjp6g234zibhapiicw0nm3cig6sd81cljmfkhmnhjqwbkm";
     doc = "0yyjm4yamn1b5bh0kwf4grg0m5bbvx2gwc7dxc6vv7b1p03yqfh5";
   };
@@ -18681,17 +18749,17 @@
     run = "0bfl9fgj0adpcm405a9b1819463nrzqplzzdlvwy6yanyqfqcp3i";
     doc = "1dam5fm94hdyzi4ai0wq03pkarb6lbrykych3ixcsz8r2z04g7nx";
   };
-  turkmen-17748 = {
+  turkmen-77677 = {
     run = "0jhg6nd47y8igsn10m3bcsn61zydlwk3g1qfqpy8snz80rkyn9d7";
     doc = "1rs4jmqy5zrgk2awvvw8lsvdkzjwbfq65bm3m9c02158q63bw2i9";
     source = "1kz5qhyjax82mv74qxhsiwj83jijnfhgijdl2w8ic8lwc31q5ihl";
   };
-  turnstile-64967 = {
+  turnstile-77677 = {
     run = "1br0ny72qsv5fpfw4x0v7q3dqy2jgicyd97ibzpxc04mp967njjr";
     doc = "1iv8ysamcqzc7lavhskf8kwi29jn9xcda0am0ak9s1c7nz7pb3ly";
     source = "0aadq0w193hl3rlb1d8xv60yy0fam4aprz4j96dphnanbb9g27ll";
   };
-  turnthepage-72902 = {
+  turnthepage-77677 = {
     run = "0z8blhvgay38q2rck23yjzxjl7q90s3yq3xq87cdibyxsaak7di4";
     doc = "1z6y7vgwh3jy06f2a0892zln6vbwdckdi1dpvjnz3cld52s82fjh";
   };
@@ -18708,7 +18776,7 @@
     run = "10k7gl7jp9l41mj6jamz26wndf3casx1qyy1dz1rscgqyvgjgh9w";
     doc = "1d0kaq2k3svm7609x3nfm8lcd1d41rzp8vcr3wxwrl1dadjv180c";
   };
-  twemojis-62930 = {
+  twemojis-77677 = {
     run = "1k58rnl12pj54g5r9rc7dcf1n33p0hw233wckrpn0dh287gf5ffy";
     doc = "022i152bp2r8fnkwb0mpz1nhs54qxpy57f51j1mkb5rc1dqgcxqh";
     source = "08jxkcjb95yb7pc7jlf2rcz9b2yibpi5ygi48d2ni79i5382mizh";
@@ -18726,7 +18794,7 @@
     run = "1gr6wgvpzb9d07a416fngf499hk4pxvqpnq040jspnz9lsfnyd7v";
     doc = "0d55npjzwpjm2bgsm6dc44n2mkycqglqy4nvkd9jqfajddk6l9nx";
   };
-  txfonts-15878 = {
+  txfonts-77677 = {
     run = "1dfrd8dzrzj9y5qnz9c554xn2g9931slhj9ylan2i71k5asxmkiv";
     doc = "13v5hhk0nzj38nfgyz9ijmz9gb9703izrgb617z274d744qwqx73";
   };
@@ -18740,16 +18808,16 @@
     doc = "1gswhcdlf8n4wpnzy0fx4maxvy3n4dcbag9r0igrcvcbqnp9sfcm";
     source = "0n4r3zn19z62qkd2njxqj74k60jr59704mnhrlvmmxi9x3b5g5sv";
   };
-  txuprcal-76924 = {
+  txuprcal-77677 = {
     run = "1l1khap1kpgjsjrbsa3d9hgd61lw4x7pi771mchszkaklqx8qarn";
     doc = "1j2y6scl5pa25yk00zf64nqgngrvvb4hbig3qi50rzf5kpq56pxp";
   };
-  type1cm-21820 = {
+  type1cm-78116 = {
     run = "0xdbj0yivyb7advckx6k2iwbn8xqkxrlapjrqrx51jcqhzqshknp";
     doc = "1zw172nb8jym439sz8fb2nnfxmazbnr5mjpmffwkfnasi2f7b4in";
     source = "114wlrzzvlnd1la16mgdp88f7a6h6v8l5ddq72is0hcddw80g2g8";
   };
-  typed-checklist-63445 = {
+  typed-checklist-77677 = {
     run = "0yrl1vlsly2k71svaziblbnd3jl9jpnpvpg942gg31dsj9vvsb2q";
     doc = "165h7yh2w6n64g2165wbxhpyghwgxww7lasy1qi2qmzkxyf3zi4n";
     source = "0f942k6pjy821851sxhff7idp8w9n8wgf8v9dfrx7mgyb2yqwwqb";
@@ -18772,7 +18840,7 @@
     run = "1d77d910w52qjif43f65fjppglnz6mjw3593c88dgs0wjxgs9svw";
     doc = "0cddn90jdlnhqn9j661s8inqhh56q0wkcjyakzz4nkqzlbmadk4j";
   };
-  typicons-37623 = {
+  typicons-77677 = {
     run = "0acmp2zpg1734c6719jpmcccyq4325h2023bc87xmj7jxqq0xlp6";
     doc = "1r9wabmkqvzdj6dcxl9syymp0rzz8kj0lfmqn9j4njghclndkfdf";
   };
@@ -18806,7 +18874,7 @@
     run = "0fj2rfdzldav8m1ac7wv8n1k8pcgj4yy4zxx0g8sg1mb5i7if0k6";
     doc = "0g096y6dvxfzbjrvvwpb92z4hrxp1p9jvbgkap5gra61msacqawq";
   };
-  ualberta-77463 = {
+  ualberta-78222 = {
     run = "13ksa5ln0pcglr222ijrd6qcbgvqvq496igpf9ay9apjq4g298av";
     doc = "0fcdb40m0s79s2z64wjy5n4m41mmpafcq049lmgbaavbyziv6xx2";
   };
@@ -18837,7 +18905,7 @@
     doc = "0k1aqic1ljafdk8xralygdyjapkqa0qiainrbf982233kjqclpvd";
     source = "08xxmm2rrpyi9a601bzxka226fnhmyqfv8cfbc1qdivn8658785y";
   };
-  ucharclasses-64782 = {
+  ucharclasses-77677 = {
     run = "0d5rr5w322pr4bsmcp09vsldydxxm69mcpvpaf9j7z5rwhic9biv";
     doc = "1l6pv743lzdhnxpd8bv1y40xhfg82421jyri2c5h7j4ahlcnnvic";
   };
@@ -18846,7 +18914,7 @@
     doc = "1sid5k2j678x9rk5vcm0x3grqxhrskwavq04awbmz99gd2s2lv8b";
     source = "1mz82vr62ck1aa63ikxkzxaxz33lp7nqr590fis10x9slbb89adh";
   };
-  ucs-68759 = {
+  ucs-78116 = {
     run = "07xgqkjhks344r0d9c8rvw2gvy0kwhx5kvyzkf2ymw1hiix8w48s";
     doc = "0icaq9irpb67mipfpv55kfbdy5m7dw83h5qqq98f5d1x14h3gxbn";
     source = "07pasmgx62jjdq8wgqgk10wkykzljj7v52xhl1ncma4idmd7l97q";
@@ -18922,7 +18990,7 @@
     run = "1fnh98jcbn9l09mi952qrdw0dq0pjykwgwi35zz2lz8h8r750ihw";
     doc = "0bbj125zb494g9x160n3lsivims28w0drhfmp0c2920cwhk4m0xh";
   };
-  ulem-53365 = {
+  ulem-77677 = {
     run = "0v6p4hj3hij0qvq7vpsbnk11rhwwlx80p3g575jy4sn2vfw5zzsm";
     doc = "18ny9kfv3w2ag97czcj2gaqqy1gj2f7rd8r72vd7wsdihgqd5wzb";
   };
@@ -19000,15 +19068,15 @@
     doc = "1rvryx13hyif7hw2wgb88n95qycip95xh92jdy1jm2l6pl3c5q3i";
     source = "1mczvxrhlipisffdi9jv5m3d2i7h34jpm6vi4dbl58cg9sasc4a4";
   };
-  underoverlap-76790 = {
+  underoverlap-77677 = {
     run = "14cknh021b4qsymflf0mnv8q2vvhgsf2088s1g6pm8ckpx7diq0r";
     doc = "1h1qvk9m04sp0nm4acj7kfib5cfpch1mkpvs55mnqqsgasgnymjn";
   };
-  underscore-18261 = {
+  underscore-77677 = {
     run = "0a93sgddm7xy8iby50yficparkr6hnzj46w70madbwpjkpnfya78";
     doc = "1lqg7j0hnnhqnfzdv0zzgpnmbysypdind3fmr6axkw0czix1pz5n";
   };
-  undolabl-73633 = {
+  undolabl-77677 = {
     run = "12s54rq1w137y91xq5wzlpdkdzw18c5y65w9hh4yqxhk94hrmb55";
     doc = "0ccqp046q5h81qhxd13777pdzkj1lp07jkgdz2h3jhgyqla3kd08";
     source = "00bgqn5ykbc3ym35ijfgkp9wnnl9i6w3xdzcbb9n49zpjxjp054g";
@@ -19042,7 +19110,7 @@
     run = "10zmjmbrlxsvq7snzm3p89afj4xy4ad0ni06fi9dkqjmi9l5nph4";
     doc = "18l3zd0q5ixwpvbcx2glldp75anqkgm3ifnf3lha2iqapk03jsm8";
   };
-  unicode-bidi-42482 = {
+  unicode-bidi-77677 = {
     run = "1prl0i2a9dg5yc2yl1x1k0zmz9lww051w1zwy8cbyvk3rd765a72";
     doc = "0ab0gym9sjllmqdclkjfbc4fh9n20999mv7z2gylfybirm0n7i7c";
   };
@@ -19050,7 +19118,7 @@
     run = "016i4a5kqimag8j3yia7p7w2v7wjl91fnd1b4fd2fp77kxny5pil";
     doc = "0h6x3qb726qwzci3mk9h7z5vfhx39y5cslw6ry8dsk5lndawx947";
   };
-  unicode-math-75152 = {
+  unicode-math-77677 = {
     run = "12xc969s6x742a3aay28354cpvam2x9ack1396q2hk1wdhg846fl";
     doc = "0y0sacc4rd4ilzjfw10v058wv626wlva1kzrbrbqxsclq3xcm2fy";
     source = "1wr1hrxd63z5iisdw6k95qjknl3i917y2dmnrflyn0afvl2pxjg8";
@@ -19059,7 +19127,7 @@
     run = "1bz4f905r178kkdbbx9c56d0l63a3gzaqia20qj0q0zhqvakln18";
     doc = "1lh4qx0lz50j2j69m62330snq5wsg7vw5847z3jk4kpliqa9ybm9";
   };
-  unicodefonttable-76924 = {
+  unicodefonttable-77677 = {
     run = "0ndzdd611awxfh3g4f8vl2al0xgxbjsfcqbmlhxp51djgw26c9yb";
     doc = "0cv89cm7zk8cpkwmf54pnakmnqz16f70ikdz54x20swgf17pcz4w";
     source = "1rdn1ahbvx89yw0cybppjkg1zap8cpp1d8igx2p97jlcznxkfaa1";
@@ -19081,11 +19149,11 @@
     run = "0h81w9pzy11mnq63401m6a8nbmz11xxvjfawqmnyzzgpx0v0n7r5";
     doc = "0npb532n5c9mhpcfl2d0bdx32a4xgk3x9fxzqr6fml9c3zh47msp";
   };
-  uninormalize-57257 = {
+  uninormalize-78116 = {
     run = "0ai1w8n010sq2fmwvp7625dfmmlvzx9d67ji34zwxdl2cyjlgsw3";
     doc = "1dksyk07zjmwbzgc7c2d5lz7fkvrllbj1nrpb34vd54yxl4azgip";
   };
-  uniquecounter-53162 = {
+  uniquecounter-77677 = {
     run = "1g7ix0pnd52dsykq5na5d4kfi49zm8gmampf5yn281mn901p3wjc";
     doc = "099clvqs76hiwl8i2gqj2hdmj2m77v03pc82sls2xpwvrs1dqd4s";
     source = "0cgpfgv4yybrq1ryhjrzwfwf97805dw6if2s1qivhry94lb96vn2";
@@ -19122,11 +19190,11 @@
     doc = "0acfyvdbqagda11730d5bmr5qlfq7hiqw7dajq143i54k9ln8mvi";
     source = "1ydba7wjiqnjc8drv5j8skv5q8hjrliwd38s6xj2jd12i0zp3gyc";
   };
-  universalis-64505 = {
+  universalis-77677 = {
     run = "19v4kl6xbqj5lpxlpjghnnhs2dnljzzr71pvw90z71n6wncza5gh";
     doc = "0nw6c17jvpyp5lvarj2hf1ir2hwc54ns9nflw4zpgz2ifr5kr1ci";
   };
-  univie-ling-72484 = {
+  univie-ling-77677 = {
     run = "059n2q9iq5zrj6wxx4xpxkwjnp39xphdsqxmmbz28mp4ib60hza9";
     doc = "0k31ji9w878s6iir70rbxxqxzpqmmylf98xiga9bliqy3k2q6myg";
   };
@@ -19134,7 +19202,7 @@
     run = "0clwxzngdy6n7iwk9zrn21i1frmahdf0s9qq2nqlhk4h6rxwb8jb";
     doc = "1q7q2fpgpjdsmbfj9zijccqpl2m6n0dch72wl05a64hxg117jbl4";
   };
-  unravel-76924 = {
+  unravel-77677 = {
     run = "0n440qrni1qnbhjajj2kd7zwgv8sk73bv4arasha05xfic0g3arf";
     doc = "1smf996jz3iy82p34b0qjmjnpipxdakp0b9yk5qxv0rbkiwkhymc";
     source = "0hb343svdnjx8czl4x1wlhpmzhrzsslykpnx9aywpsgn2xabncnd";
@@ -19169,12 +19237,12 @@
     run = "11nmmpfm5kv7kjlygiq7gglsa1l9639qfpbbrwvbp9c1cakfvhzj";
     doc = "1vjhk2zdllvyhx94wcsxyxb74qz3x4y2zsw7scm0gzmf1jbwxj0i";
   };
-  uplatex-73848 = {
+  uplatex-77677 = {
     run = "0kmw51xvg44jrzn6r1w2biz2d0m3j533qadi4bfjhf2dzi4jdg61";
     doc = "09x7aqy05pgfkfggkb1dxnsvw0by18lfpbsivmipqinawb0mjkva";
     source = "01gpwxp81hz8824y1hffq6b035l0pxa8wyfkjm9kh5m58j52s50w";
   };
-  upmendex-75593 = {
+  upmendex-78116 = {
     doc = "0fi6ndcvmx5vn1cyc59nq9jry9f1ym62jx8rjzqzckcdic8d983c";
   };
   upmethodology-75054 = {
@@ -19185,7 +19253,7 @@
     run = "1a71nsc5dnaa8gb4xmnlhvdsvid2h9gwmxr0xa8blh4xd0vwi2d9";
     doc = "0d1qs7krblmnf9r2afvzx5ir94aqgxv8p2d9sf9p18nlz9f5h06q";
   };
-  upquote-76924 = {
+  upquote-77677 = {
     run = "1zglh6pb1fq0ipsivhj0knhcwcg04mjkxca5s2adbbfk2xs1iqgy";
     doc = "125756iaikya3v0wk9a712klp39ndw7i68bybnrif2klm4c695lm";
     source = "137lbzacpmkm1fdmp548m6r83mnhclsrcyqk1s0rkp558fpnqpp1";
@@ -19209,12 +19277,12 @@
     run = "15hnqy2fxqblr9db4h2r38v1h4iwhk5kcm8qm9war1c1pgwg2a6l";
     doc = "0axb3cpbqbksrixhksdhbjyqyic0176lyxxk5di268jbr58203xp";
   };
-  uri-48602 = {
+  uri-77677 = {
     run = "1mmxhxm4y7qsvq4kgdnq2vhid360gcgq0yxbcgw46k56hxd61kln";
     doc = "1zadcddyfrgfbrsyl4461zwz8g3rjwypixvmi5ny8f80z4igal6a";
     source = "1w5hbpzc5xka2z834hnzx16ky0kdx3x4y0xxs61l9gx0ygqkzbpa";
   };
-  url-32528 = {
+  url-77677 = {
     run = "189lixyamvrcpds2i7nlh4w83mk5lnk73158kcw3qjanpncnnn1f";
     doc = "1xragd7gak0vzj14f7dcx5hxg8plh47ncqdb1m5liaibrdlhgpql";
   };
@@ -19227,7 +19295,7 @@
     run = "0hlaimb12imiv0h7khcaar4xi5dma11bqcrb2b6imd4srgg9b50g";
     doc = "1mzfmfwny5mzag8wf1h3k4xbmbzphwqv6r74sql8wyqw53s337jf";
   };
-  usebib-25969 = {
+  usebib-77677 = {
     run = "1q38qzz87nh2hbmml3b0a4919dgk6d5rn0z5bhrc4ip27dscvw07";
     doc = "0byl3xhiz3b4hqqmq2wi5fdbshh5prvqfnhjcgjk619bn99cijxm";
     source = "0asby43xsd35aazh2sncg639x91f91shs25f6f1127rskx5fd7vp";
@@ -19250,7 +19318,7 @@
     run = "043az1c7bs194w7frr768pwaliiaikfibxh6zqiznc85ax6q3d94";
     doc = "1q04i3q9693ykpgsx1fl11w0y0kxffqyljns1qy04935s5b8vskv";
   };
-  ut-thesis-77463 = {
+  ut-thesis-78222 = {
     run = "1yh0b52rp6dk271mg7s6xnrby7hk1bp94b1q1215c31yyywz4nc7";
     doc = "0h1hgsia2jy0qhxf3ylg07vm50jb2jwqz45zyq84m5zvvg7sq88z";
     source = "1njrsa8hrd37y9yxxwysda88lsc0kjf6hikyqswg5rarldvysg50";
@@ -19271,7 +19339,7 @@
     run = "0w72bcx656rdkbgndmshzd6ackh1r6x6m2f6bjrc3rxkmhvf2awc";
     doc = "17m89pxzhfrcg8b3pai9bpivypmzfm0ck0pbcp38nabbnwk7bmbl";
   };
-  utopia-15878 = {
+  utopia-77677 = {
     run = "1hsvl3la37nbb0b2q9995w1hlgvrc0gkyjkgqbsp99rk0ry392v6";
     doc = "0yyxzyg38z6kip43gxlj3j55rdabqjrzl33yp1z043rblfw5b9mc";
   };
@@ -19284,17 +19352,17 @@
     doc = "0pa7a1ic7am0w1chl6cx778gv86pf38m12s0xdpz3hp2krkrjxwx";
     source = "0h59r1sxqsgsl79jvm8q015mck28z89c595lkpilymahfn3aqi88";
   };
-  uwa-letterhead-77463 = {
+  uwa-letterhead-78222 = {
     run = "0y59djz26f6br8gpdaxbzx0sm6p4gjyvfdi3g5w2rhvzv92w81is";
     doc = "1kj991b6w3f6svzf130g4zb58k1n1fq18jvvradrqygvgrj8lg0w";
     source = "1ysgg1idxm0h3rslw94ih10jmb85n445rr2cfzx9x1fhl2zclj3n";
   };
-  uwa-pcf-77463 = {
+  uwa-pcf-78222 = {
     run = "0bgg42n0sbp1hslwrrc8xclxpj87sggicxhmcijiijfdb88g5cl8";
     doc = "0r8cmhy9laq7j40vkgp9v35xsq27xn5akkj97qysi844n4dia9kb";
     source = "0sm6zx16yyi4p3wwfsyzgp4w7p53mqi5gbl4qcjj7iz373mmy3lj";
   };
-  uwa-pif-77463 = {
+  uwa-pif-78222 = {
     run = "1ia1yv0mfxqrd61jy5qqf8cgpk3jxq7simpd74m7zy27sx2ywyg7";
     doc = "1kl9scqzc4yyvi4b1rghr6lvpvq5587bfjl207675jps4gwcqhny";
     source = "04zs8241iaslw7a43d9pk6scb9gd65dcjmv2cd29jf98ybimy1m2";
@@ -19336,7 +19404,7 @@
     run = "11ms8li154spr53ql2f62cz6xvaswjy5wdcjdaac40q90zb777ng";
     doc = "081gyd5lhkqismi80m1nbh3n0hwczsc559c4zsz24fsq6xhsmfr6";
   };
-  varwidth-24104 = {
+  varwidth-77677 = {
     run = "032izb0vpcwiydg7lli6hnawij95s5ygkwdp4bfk1c9j17d749cr";
     doc = "1ysrbpv2mmi8fcyhdabvs2jiqj2mkajapjvsf10c8rw6i3yaplnx";
   };
@@ -19344,7 +19412,7 @@
     run = "10dk1ff3swbnx6l6c30s1ryn2dbyx9harmrcg7whmqdys1mahsbq";
     doc = "1dlf50f0hpislqkcbr685y5xg7iz2y6zvlzjdkjq3af4qv7ncf5n";
   };
-  vcell-59039 = {
+  vcell-77677 = {
     run = "0m9r0wldir0g8y32aikm2il8qsygsc3zyv2zkg4wn7jqlidk6f2i";
     doc = "1zrhf70s70zxm5ck22vbi88vpdjn6ba6iay88f41x21f11l536q5";
   };
@@ -19369,7 +19437,7 @@
     doc = "0as35w7fd9xjqhrr3v3nzld9bnhz6xg7rqgs2hyzx150xndy6cb9";
     source = "0ci3ajx316b6iin315z1xkdfmxbbflnj8sf2ww7gkxf853qakwlc";
   };
-  venturisadf-72484 = {
+  venturisadf-77677 = {
     run = "0fs736rxmvi2js5zcx8qsag6psf0qdvpvd8fwm3ahz5q9bg40ib7";
     doc = "18h4rwhdcdqhxam0jhswc6dki0cvccgdr5x4adrwj7lkv2sw43yr";
     source = "0flbf98pwbbkpwwl84vfyflx2dzp901wxyk4zyxlnaxyaj17lbk3";
@@ -19378,7 +19446,7 @@
     run = "1bb1ddwlix4v6knmz68yy7i2jsismqdz189p1664q78h12rxcpx3";
     doc = "1rd4mhi7w3nsvvx0zxv43nd4ldw7if1zadh0xxbzbjaljypmshi4";
   };
-  verbatimbox-67865 = {
+  verbatimbox-77677 = {
     run = "0pgim93ifd9mnrx7fkl9fprgf33wp7m5anms8qgzny0lxsm1fafz";
     doc = "1v32x3j5zc8yl7rgxn3j40p53x4f1y8abr9w5fj0bwhs8qawv2xh";
   };
@@ -19386,7 +19454,7 @@
     run = "07syldn58zwnwxwdsmq63qgr2nb0bkl9di09knska9jk0c50ql1j";
     doc = "06awpisb1y773xsijrifh0121pq6fdzp2ai0snxny5vrpmyp412n";
   };
-  verbdef-17177 = {
+  verbdef-77677 = {
     run = "1dy1h0vcknnizm2f3zggga85slga5p77aw3ll5ca3kx5qxp1xqhl";
     doc = "06zh9v72ywrg84wlb96p0y28sn9919pn2xjgqhaii6irdf3hmlma";
   };
@@ -19409,12 +19477,12 @@
     doc = "11xyfymms3bhqm5smb3i8j411iy7byr9jxcxjciq916wyi4xgsyv";
     source = "1v1z51sji2adrq9mpf01chw3kj4lcdkrg87ln2205khk2h9133y3";
   };
-  verse-69835 = {
+  verse-77677 = {
     run = "108qi1600f5q9im9vdbhnh0yalpjcx7qy90x7xqxnjyqh7116c3m";
     doc = "0zqw1zrpm3hzv21gmscm9b3bfyxadw9svd6hxp0gf1virb5nlyhv";
     source = "09rj2vkc7l4l79w97iycyw31lqwr946rdcrvwzv8nargpp0ynw8m";
   };
-  version-21920 = {
+  version-77677 = {
     run = "19b4h22lqvgzqqm0pivjjhmpxmijrr5rfy0xc9g9y7czsrp810hb";
     doc = "17bsgyjvnna790nz3x94wbwslxkkz3958vj2l3jbyphm5vv92fxz";
   };
@@ -19422,12 +19490,12 @@
     run = "07bxhbpsqgdbpwph2w7gam699605m181xmj8jhpcsf4rwcpnjik7";
     doc = "0pjz8nk7dnf2jp6yixhi55zbrlmhv477qsx6p52dwkf74vxgv5ki";
   };
-  versonotes-69249 = {
+  versonotes-77677 = {
     run = "0kcfa9j99jpw521sz1q0w9qfjs76138l1rdy9ha4gb61m5r95008";
     doc = "0z0mpqrz3n8lp3wf1kfzfmm39n7rwv2xxfvy4x76a67qdjg2glbk";
     source = "1h0qkcpps65a8qcbzskbghsdnqvhgg62yk7ihmv487a8lid68js0";
   };
-  vertbars-49429 = {
+  vertbars-77677 = {
     run = "0a5fc0a4z482fcxx27wrn20fsdvx9xclsy36623h80pxnfw49aji";
     doc = "0y8vfa23ld199r45pqd56rv7b0iskskpaqc08lix2zss6a082iy1";
   };
@@ -19490,7 +19558,7 @@
     run = "1w2pxz5dg3q42cdydj10fzf9hmwbc1xy8655s7ngzhnj0vljrj1l";
     doc = "00n8almyx5g71gwxcn05vpfvvisqpr4k1lp123ys810p5n25s31z";
   };
-  vruler-21598 = {
+  vruler-78116 = {
     run = "1di4a3czay9gj5dbps78iik9r5p0n5vxk9dagc2ak6gdbc3rz1ls";
     doc = "1885iaxgfbc08ldwrzv50jpmczhnjjvhq460vspdp33f3z5i7ifq";
   };
@@ -19502,7 +19570,7 @@
     run = "1bdf5h2nsw76y2w4gw1ap0ncg9ibydaqdhlpynj4qyy2c9qkb55q";
     doc = "1w144as1s1kfd9a8z92kl8v2qm6il09k5myz9siq5dqxdfs3k9hk";
   };
-  vwcol-36254 = {
+  vwcol-77677 = {
     run = "1wfqcin8xmxrby5mxn9s5j32zmr4ka4k0h9ps4kdddpq238db89n";
     doc = "1zyndap37lq6jk9pafpzd3q5bib2x7yrnz6wk7wlgmgiyb6smj1b";
     source = "17apnly4vihdn7dzh6hibgairrnvzadxlv724cgb5lqaci74gnqh";
@@ -19515,7 +19583,7 @@
     run = "04rck2mzvzpm2f934iz4nni9s5w9g7a0qcp3kvp3bsqa6nhhcf6v";
     doc = "0v0hnpfavnacm104xwgpy1m5zh63w0lv7i82f75mr3b6wc8qidny";
   };
-  wallpaper-15878 = {
+  wallpaper-77677 = {
     run = "00cixdnwr4vpfpqfdcbra4gwz0i36kddak8ywv8l4q4d4yd567c9";
     doc = "0ngsn8an7gqzkw96sdxb4q24h7bvbjw0gsqk6dzrdphclvsjy8w4";
   };
@@ -19528,7 +19596,7 @@
     run = "17gdvknlxs61vgsbbgl367nbs9q0g66gfz7mdmccjjbwdc8b7r8r";
     doc = "17c32c5k2ybshdc7ih1l22x1sn0jlpmwv9alfl2yin3z4lxqw6bx";
   };
-  warpcol-15878 = {
+  warpcol-77677 = {
     run = "1dr0ic0pskvw6397q1yy1ibbpl1c1kndqaw5y72zzzy52x4l4j71";
     doc = "1jc7rilhf61irh8kgc437mp45ryz0yr63z11r9ixbsj04dmfk2xr";
     source = "1lnd9b42xyzfnrz94x10vxrmfy6r2l4wlxbfc1c02fmnchj2wq6c";
@@ -19546,7 +19614,7 @@
     run = "1zkhqyh72q1w6lr94a7164myp5qfmj119qim58cal1h48n3wypcw";
     doc = "0rhkbkmn7xg044aw1cm44vbwiqfpcixpdpcdvz8yq6in8kmgs0lv";
   };
-  wasysym-54080 = {
+  wasysym-77677 = {
     run = "1i8pvf5yfw5j0rkcpy6v8czvr85p1yk18c8h18iljgsdvfj786h7";
     doc = "07lhw9ss609gjlhv9f0bbyv3z327v3jqblfwhcspwg2sjvazzx8l";
     source = "1i7y0si6mbd6kxbbyvcfak46hrcf95xv8x6nc29nc6adqjbygkiw";
@@ -19561,7 +19629,7 @@
     run = "1bl334im0jvsyx78g6jq9m8623xyr4xz0avzfaymhs39dv17wsyr";
     doc = "0lwc3r3w2d7lzz39ilncbckmvx536z3wvz84jlnv3flm2dll2z7s";
   };
-  weiqi-76924 = {
+  weiqi-78116 = {
     run = "0rwysz41acvsw8hjsxa5rb3nhq9cd096kgc05rf3zk6rdiy0smhr";
     doc = "0s3g2ymfqz8acrqgb1d375bvxmb21sxw16j9a25xaap7wz27xry4";
     source = "0fzj1cyxj505vf82kzjg7jy6ifk3m5pwsvmh5m6jvr2s7d2m079d";
@@ -19571,16 +19639,16 @@
     doc = "1r81y1sdw0irbxsaqw67hbzd72p0d7xq4xiycnsa6h0jp15dlgi5";
     source = "0i6limbwxy0rn0722s7l3vfslsf18ai8ddqpjynh1k17c6yam9pa";
   };
-  wheelchart-76924 = {
+  wheelchart-78222 = {
     run = "1nrdpi7pdss38iqj4r89n7a7cmaxm9f5w72lcaga5gx3jz998mqk";
     doc = "1spjrn9avyw9qnjchhhqrw3jlfylp75jlpgjvyf6q59qc0fk61z4";
   };
-  widetable-53409 = {
+  widetable-77677 = {
     run = "1k1jnl3jbrbcc55cl34wj3znfay2wnf8k8sgdslicvnan2j717zm";
     doc = "1giy0gvhngsmfwc87j9k2p820j6bm2mc2r1kbcl4ci0c3383mify";
     source = "0krkcnxzjrn7lqd0qh8lgjixfpd3c5glvj1ilqhak9ifd3lq8r4s";
   };
-  widows-and-orphans-76924 = {
+  widows-and-orphans-77677 = {
     run = "189ch6wprsw4xsyk79pm03kkn19h5rkqpfs0g0p6kj5jg39x78xv";
     doc = "0vzcyzcf8fh83llravv0iz739ilr15qpjkgyjmb95r0a9zwx044i";
     source = "0sf8picg17x58baw36s0z41p7ck26439wjra4mbc6kl6gh11jqmz";
@@ -19601,7 +19669,7 @@
     run = "1b49fag0ivb5srlsxcbmy8ssqsrcbgadkvcxd6xn9l9bk28wpfwr";
     doc = "12n87c9181kskqvx7bzvqjimg7agcm8n2z7rxnh1g4kh9bjr57ms";
   };
-  witharrows-76924 = {
+  witharrows-77677 = {
     run = "11sr50r522gk5jvxnzr1qwbz21i507kli2m7avxfdwg4md7j68z3";
     doc = "1qbdm1ixkzmgr04viif8ny4qs83zhf2wrhdszc33s9698rhrk35h";
     source = "1dvxh4n3qg9zzqp2wg5k9ma94gxldh0p4pfn6npbzyhmlqcf5nm8";
@@ -19615,7 +19683,7 @@
     doc = "15d9mcvdhs1jd574gm6a9ppxyy7avclvq54ikcmlf4vn20lygidx";
     source = "02x8fdavhkxfnxhvr891adpn93yhqccs31w05h8f9hyg34jlnb30";
   };
-  wordcloud-76890 = {
+  wordcloud-77677 = {
     run = "14wc51j54614r6fy5izjdl8c4dik3br6vah4g9h6015mqwyhs77z";
     doc = "0fdv04h0rzy6jlpsp6jaiwks682r7s3r1sd95szy4djjcnxwb33b";
   };
@@ -19640,16 +19708,16 @@
     run = "170wypqn7mmfj4s8gbm363l4hqmmjhsziv22z9hyfhrdh0lprip6";
     doc = "165ny43vh389qqi7rzw7mhfyn04awr397i67kkc20jiqxl6v64r9";
   };
-  wrapfig-61719 = {
+  wrapfig-77677 = {
     run = "1axad52pzzsx9d32rivasl5d49dj51adk5kcnb1rr8mz59421rk3";
     doc = "1c3xd0ja4063qzag0v07mxkk52yczlcwdbwn84gsfp5hdmd5cibr";
   };
-  wrapfig2-76924 = {
+  wrapfig2-77677 = {
     run = "0x5lpa8jri4ggn48hdx4m5jd4pjd54drfgclds59hsmcd1ywi581";
     doc = "080i8yp4z5mf11g13x5jbjzck7458l14xnzqh19a44ypj6y3p7mv";
     source = "0nnyy9xmr3l78spwcnk3wwm3y1588ygc0qmzrbgv6kdig52837q6";
   };
-  wrapstuff-76924 = {
+  wrapstuff-77677 = {
     run = "1w5bnl5w2shar2qg2lm7768n8h4qvgzhxaacphjhqbx9zb1r20w3";
     doc = "14npfsqr8wp1bgq9az4x23rmkkgpn37w4cr6c43wyqs7cvizz0yl";
     source = "1x34kkbv8n8c89x21ikv2lyzlk24qbwcpcxwgv13lqqlcqxfz2ix";
@@ -19674,7 +19742,7 @@
     run = "05zfj6b59m0ic977w31fi4i86l7214xixws7yidvnr35fa7wm75z";
     doc = "0g4fsbhhsvszvpnf1vn701c8kr8lpq01lcd2g8nnmknvrpd56v5z";
   };
-  xargs-15878 = {
+  xargs-77677 = {
     run = "1r4giz5gp4pcnxw12lr8hnsa45yv1lm1ddq6g33rkgs1qjzkhv02";
     doc = "06kfclbfr2kc95c431hn54g0c6vcv7vscsskg9myrp94ilq1qglk";
     source = "0k58hqv0jmk3v2jmx212idnfrs9rxqz93zq34f5kqx8dwhnss9pp";
@@ -19692,11 +19760,11 @@
     run = "1abg7lvplcaxmqdf76w1lyzqb842ak348l0mni7h9z6ibdpn5ldx";
     doc = "19gwk10pj3hfi35dk2wxr3dadd1713232x9r4xywdr5vng05sz5l";
   };
-  xcharter-math-76745 = {
-    run = "0f0m6alp0p23c2kjw99dfz4sgphklvb5p3bqdmfkwwibp78vz9hd";
-    doc = "1mnr6s7rgad6cfys297z4dcc03a4pwv2rdb9miiidxrnxcgd2npa";
+  xcharter-math-78174 = {
+    run = "11rfmc333x5dhwvahbfcykd5fsr26dv7zw734hgr7m72r4v24n1i";
+    doc = "0583di0hlndnlqknkd6zrpnhw19alvls4nxq4kpb25c01h55vijq";
   };
-  xcite-53486 = {
+  xcite-77677 = {
     run = "0zsfyaxs0w2xy6fa1s6hlrcnzw1q9n4n676bv6j80cwp5cw7nnhg";
     doc = "1sfziwn05dii3gviiahvmg67kb04hzhz4cd1cwjsrrvnjii0dqb5";
     source = "0j5blcycs86vgmi54z0b06il06zzyjp4v15lmdwfnx0amb9y8jr9";
@@ -19710,7 +19778,7 @@
     run = "0hqagjlxphvfqmslg91fpxngbm15i3kmawglszj8z585i0j570di";
     doc = "0yf5ak4xr07jzlh8s087c7g8rfa71isziy1z13qy8ifv2882p9qa";
   };
-  xcolor-72484 = {
+  xcolor-77677 = {
     run = "0n6khjw6lsy2hbpxy4rqa5ac79b6zrs4nb24cxparsf1wikdphf4";
     doc = "1rg6gm3517ixgmir6zmc7fm056rlaqbbay42x9p7si7qgprfhfln";
     source = "1zj0zx1mx889pn3k4gdnidar6w5cklc4chggzlp71jzq3lc22pz4";
@@ -19725,7 +19793,7 @@
     doc = "1vmr5y6c5mi7hgkb33daamag2y4j6vpiyxnh0cpya824l6miichq";
     source = "06f2x0w9k87wd75vm6gjxg2pdrcv3g6406nraq2mnlf9sial9mnh";
   };
-  xcomment-72759 = {
+  xcomment-77677 = {
     run = "18hgrrva0702xsw6kgg5a1bl18il0vf0lpqdkkvmvivn7r2rmv0p";
     doc = "1pfd7fly2l2vbc0sy48p2fawq5l90a9hn298gmv2njdr81mig8b9";
   };
@@ -19762,20 +19830,20 @@
     run = "0g30ld6qanzn7hvgy63arlx8fa69f1l2k286s078a5n7rmsx55ps";
     doc = "11055kx6dclcabviw9vwlklgjc1k7jlq7d8f9a9kv304yrlydm8a";
   };
-  xechangebar-54080 = {
+  xechangebar-77677 = {
     run = "03d1wmvldpfk6y52sd2pvw3ipglbl8cc851rqlz5jgk82c2frxg0";
     doc = "0cnc62nff1vljwkk6gb6r0cwxq17b2yl4v9ilb7kxapaa6apbp14";
   };
-  xecjk-76924 = {
+  xecjk-77677 = {
     run = "0m93s5m9m9xy8wjjm03wajcwi05as0y5bv305dzryh5qcfv1ncri";
     doc = "0ghbgk2a89davasn3si5jbszafknrg4gpvkgnq9hmndsfzfaihsx";
     source = "120zadcyidw8cbybb8gz9qbf7r1h8m5cadqxnn8xs5a84czgriry";
   };
-  xecolor-29660 = {
+  xecolor-77677 = {
     run = "0ws34zr158nkpghiwlvigb44zzi5qymfqxzsnayw78i6zpqal55x";
     doc = "0hz9kk36ap7szbsd0jp6a59lnaxgnmwl0jg8gmz8s1pjf77jf5ww";
   };
-  xecyr-54308 = {
+  xecyr-77677 = {
     run = "1qqfdi6pxlkx6pxi2q61i0diwmsy9n95x4bvj9r3pgaf851p7cjx";
     doc = "08b2xahg1agfczvqpdkvi3641g3pd2w2yc245bnyk0nccfcnf3k1";
   };
@@ -19784,7 +19852,7 @@
     doc = "0kiyjcqlajmpj80n8wkk0ziri83811ivl380i3cyz7rxmsh1hqhg";
     source = "0dj2191iqcm9qpi45h45r3cp4nz5gdviw6xf9iz261b3pn515prp";
   };
-  xeindex-35756 = {
+  xeindex-77677 = {
     run = "06ipq7m9mnal497j3awdspqim3fs7v695pf2x7v4l92vqz3hh1sa";
     doc = "1pa1fa8vjgbzmgphx3fmm93dd5wr3adxrrld5xibk2qrp7fgkbsr";
   };
@@ -19793,21 +19861,21 @@
     doc = "1jlndanic0xc16ba1hg1lswcxa2b20hibd25bs65wyag04rbh8lb";
     source = "0768vqhmxgra190g0k3k4hhzgkhkxwwnvwmdpymphsqm9lvxbl95";
   };
-  xepersian-77228 = {
+  xepersian-77677 = {
     run = "0lvjpppmiajq37414bhyh1mhbb7l0yhai3k3m69va72655m3xb3g";
     doc = "056jx3jpw7ajh7xzhdxrn8hddq6vzfiss5lkwc152v05qqf1p8m3";
     source = "0m4kcisi7vhy0fwzcnfs2jlcfvcc03c33j9rvgd2jnqzzyi8nqxv";
   };
-  xepersian-hm-76924 = {
+  xepersian-hm-77677 = {
     run = "0qj98xrbnh9bam0a6c6vy7ffaia3iqsx5s71bjlmbnyl6y2h8lwp";
     doc = "16f5x8jv8mqf5a32gvrzqwh1xz4s5nxwqsq4q8sg1za6micqniyg";
     source = "0zcq75xzkr0bgpf1xdsphrkcv70q17vs8jkhzxvjrfzilh9h3iqr";
   };
-  xesearch-51908 = {
+  xesearch-77677 = {
     run = "1rszh3svj87vw5lskxv8bvnkzzj6k9rbikl6rr87ry9apmymsklg";
     doc = "0cb73d981aa0s0hg2ynrg3zybsaw28f5b29zmqgvzqidi8vxfbhl";
   };
-  xespotcolor-58212 = {
+  xespotcolor-77677 = {
     run = "0w7nns136gfz1dvq6iplk0jbza85lpzlpvsxf1bzjhqw5sk6v4p9";
     doc = "1fai2v8x4g9cmda5m6nvf6g8w6qg64qfdq1rvjlz1qiqmy71c8jy";
     source = "14yachqawnmpldkwc3f3q4krj2sr1kad7wzy1lfxwqggvpbdcjkh";
@@ -19840,41 +19908,41 @@
     run = "1sc0lm5w94320f5abv2hw2bzqprhk73fjv2lkv380fgkpdfi7pdv";
     doc = "14mc9snykdwzcmq013bs8vzn5w80lblpg05jk57g7fl2z9x6xl38";
   };
-  xetexko-76133 = {
+  xetexko-77677 = {
     run = "1qnyvd29pv8abhlxxfma8jrgmmix063k16wgyn2z2hc08h8pcjyr";
     doc = "05684gyz1fby4f8qcci87zxdzlfn3nwrnbzykrksrvm14qlc8gsi";
   };
   xetexref-73885 = {
     doc = "06rhmrclbqqnnh7vjcc85c0m4gannfv4135bjy9rwv3y5vdqmhb7";
   };
-  xevlna-76790 = {
+  xevlna-77677 = {
     run = "16ayk70kxk2s23r6nxva1hkb1z7aw7zz1zhmcis1bsijx657kw25";
     doc = "09aaf3mpbh07mix5xvr20zybbbrbgbwcmkd5q0rfsd0ac8cm72fh";
   };
-  xfakebold-75712 = {
+  xfakebold-77677 = {
     run = "1xmw5mm5r2r0bvqga95lvcyf5y0jf7hc40sgzdnc2dx9n8sizwgf";
     doc = "06a3znvv53c3ymfh53f37anlgj8878n5mzcw0mdjszlg8q4bl914";
   };
-  xfor-15878 = {
+  xfor-77677 = {
     run = "0m4y0caa22fps0r6735kb9pr2f89z5a8wflzrvpbms4nh3a61zgc";
     doc = "0c0qg60h631d3m9rqr0nwj9772zjv3ch0d2p1ksnqnjf30idydl1";
     source = "16xp7hziirlnd507g9bjvszm90wk9iv6ankq8bx27qkyk1shhjfq";
   };
-  xfrac-71430 = {
+  xfrac-77677 = {
     run = "1rq20zj8z2cg1q9ia0dzhrr3ylpd7cb3zw5dx736skgp61caxmkl";
     doc = "0l6qs8qsd36ipnabihzks2k5bi5spgpsycvd5srhc78b7m2ynlbi";
     source = "0b6r3mwpk2lm3bgxs9w0rjjzyfkxxq2qdj6j9mis5l4sbpa820sc";
   };
-  xgreek-73620 = {
+  xgreek-77677 = {
     run = "1jwpx3s4i1jcpk80swf1dgmrdgg5irl4d1nj42zqmcj2v4ng9znw";
     doc = "1jifkzd1631a72mnl3bda89b4vf9lfrplp3kphk0ghjgp13fhnrk";
     source = "1g23q8x57f916vq39fvyr50gx2gy0g1p5mi6rmxy77j116xxw7zy";
   };
-  xhfill-22575 = {
+  xhfill-77677 = {
     run = "00lb01b27h1bg8h37rcm7wmqh5pc3gz7rkw0l6xrfai0mb8ypq2k";
     doc = "0alaqaiz2dfk4sh4xgrxfrwxgisv2p0bfdz7ppiqmli10al1h2gd";
   };
-  xifthen-38929 = {
+  xifthen-77677 = {
     run = "0ys8yq13vhval5jg9a4n4pv7b3v11w1yh63ssvyx3pnr767ay5r8";
     doc = "1miqc1bfwi2ssl6yp9aqw7ygnars27vks0grpyfns494yimy8nc0";
   };
@@ -19889,9 +19957,9 @@
     doc = "18157hsjjigq53f05akh40y389n8jmazn5wl3pr6a8w071a4vdz3";
     source = "0wghff88xg218q3f6xfwqgz4kqa88qj35p785a7d1rarjc0fa69m";
   };
-  xindex-75954 = {
-    run = "08gaympcvxa3kz8960sx0v6flq7apw7bd35aph27mlvbw1ya9jnr";
-    doc = "18pazxvirzmmm93y70xiw90dnc382s91m186qa8z93jif89jm9qx";
+  xindex-77848 = {
+    run = "1kzwja27zzxgrfjvq2gfg5ycpzl8wnx6hwqf7vqk23sad04667la";
+    doc = "0lr3q9gzwscanq3k7qkjiq6b15s70axvvwfzwcibaavnpyggffq3";
   };
   xindy-65958 = {
     run = "1jm8gi2pq4rw60p8bh7hp5xw1kyhy9r02zy5s2p2xyqh5c6di7jn";
@@ -19905,15 +19973,15 @@
     doc = "1msmh4kvhiav6sm609fhcx0brvpzgbvb4rf4ma8isa1z62jkpp4k";
     source = "12xqray1ai09yb8x5l398pnkmp792pjc82q04a5amqq2vssh9rqc";
   };
-  xint-regression-76947 = {
-    run = "0m4j741c9cw6wdlrl895f5ppj48w8mskkpxzrcladxsm32h003gp";
-    doc = "0h292ikhla6w49iw2yj9wpvldapa3vq6b9z57fkwb1akb80fl9qm";
+  xint-regression-77926 = {
+    run = "0ihch3lkfgha1r4xwvb4p3ivzkyjb69csgyxx28k5v05dpdbnzxl";
+    doc = "0ixmr6xfsnykg5ai1mrxgafqc0mkzcwpyns6lxnbb4maif8yahh9";
   };
   xintsession-60926 = {
     run = "0p28r81qa93r9hwsaib9jbg252q76xz1hxlaf6q0r2bs3i8a4hbr";
     doc = "1fzyqf14fdk6mjvgfxg43mx2gncj1c7m0h4fid88z7ffsa6rq1g5";
   };
-  xistercian-76924 = {
+  xistercian-77677 = {
     run = "1gx06nnwy9vqnv0c8g75w6379q692z3wqa7hxd22a3nvv85s6xf1";
     doc = "12rayjzjz50vsm99syd6v7hp7zrsc9ibv04j412k1dkibmqjhqsv";
     source = "0x1j342wg2i5q9pk63g38ad92imxswj53q0p6phmr55k21ym0al6";
@@ -19930,20 +19998,20 @@
     run = "14ll2mzc3sa1271yvq417a03g4ky4fvmb8zhmb9bqvw15vz7v53l";
     doc = "0a9n4l2ffd358cvyc2xqvvmrd3zjq6nz7d99b490ap2734y21q1k";
   };
-  xkeyval-76763 = {
+  xkeyval-77677 = {
     run = "0gbhdvbbjac8xg4rvqhh5l6g14mm56x0b80mvcgsjnlzghgm4v73";
     doc = "1k5qah184777y4sd2a0mccxfhhd1qvx0hdba0i6gb7sdndjjqgq9";
     source = "1b0wwxv6kqh0z52i5w3yqjclpkwi797wkxghx64bslqjnm133lxz";
   };
-  xlop-56910 = {
+  xlop-77677 = {
     run = "1clpl22vxgqjpzs0ypgak0d6z0sr6hw3gj18r7sgs2q0jf5m6715";
     doc = "1acnr4yfcakpnr8pb8g26qh7z9xr4dms4nfy50ig7r7azmdpz9py";
   };
-  xltabular-74350 = {
+  xltabular-77677 = {
     run = "1x7v5hzx0zddjr3vicid7ba3ydvbgby5i8821la128hcg8v65fvc";
     doc = "07r9408x5g42lwlyzdzvhf65g8r6n1qkkjvbryvsdyanxpr38gls";
   };
-  xltxtra-56594 = {
+  xltxtra-77677 = {
     run = "0zpvlsdsrn6pnlfd3aa23hcrjfnnrjivi7r61g25j9sqcx7cmkym";
     doc = "12wp6zwqa5mi5i5ridd2amnr48xrkqmi92xdhh95ydijpzyslhli";
     source = "0vwlj6f7z7fh1vx257v0gnxj29rp3xqjpxlnn156xp9i8i29v0hn";
@@ -19978,7 +20046,7 @@
     run = "1ykc3mdg45hhyk5x8lv06zggfv88kyrr1zqnv8s9j8cb5c4r71jj";
     doc = "1g42s8mgr7yqdziwza1g241vjgygzddk6ly8md6c22kj8g0sq9jg";
   };
-  xpatch-69768 = {
+  xpatch-77677 = {
     run = "1almf1wif49mi3yqr4qsdffd6m3q8xcma8x9v737ffczsffhs923";
     doc = "1lxsqxzajkcfw4b9i89bk0gmhrsprkmgqqbj5v34bgvkvh0n5pm0";
     source = "1cf161h6g6m3q8bq38imvmja7ral7lpyb26byb8nn26lgixkprad";
@@ -19995,7 +20063,7 @@
     run = "0436w2hx5iqjc2vvhbwnwhywlw5l6yza2xnhsf0ax2v45zbhn0m5";
     doc = "1irzzvk27k63181dkicd84rjvkp62lcskv055xzay0f79b7ms80a";
   };
-  xpiano-61719 = {
+  xpiano-77677 = {
     run = "11vk7k3n3np2wxx7gv9rvlgfmipmh1x0bjq5b2yvgsfxii65kwz3";
     doc = "0hq4v45nacdxygxpjby6s8smlfkkp63yg83zfmwcl3dgxzayb2s3";
     source = "00xnkxm6ijk1i0h3q0yadklc7f2np19bx3yzq4dzrfavdkxjz8f0";
@@ -20005,7 +20073,7 @@
     doc = "0ymdwdspdhrhgyxw7h7f8nal6h0kjw6i8zicmll5vj8vbmi44dv6";
     source = "1yjvqrpp7a0d3nldqidqrk2xk1lp5vbla865l3lxw1xd5b08y40r";
   };
-  xpinyin-76924 = {
+  xpinyin-77677 = {
     run = "1bavg69s0hin8phlgpmz53vkjlh039mancih71amw8bbvh077ynh";
     doc = "0rnqq2hy7wzip9nij6bv0jvahrnsyqdmkvr23fvm7f90s07d1ay3";
     source = "0yj7qh7qp3c1n17vplwywcsjwwy982gp5smxqq110syk6w2hppj5";
@@ -20019,7 +20087,7 @@
     doc = "02vzwbrqj1dzd46xj49mldkw6rqppvq917bj8216argr5dc4dfk4";
     source = "0lrgdnfv9zlnlyyyybr76a458sp8bayrbl0vw6jzzs0psy1lskq0";
   };
-  xq-35211 = {
+  xq-78116 = {
     run = "165zyviwxybpgfx9ycngv9nml482faz766q1skgmligx05qzkhyl";
     doc = "01yhk07lrcbl7ppkqvks5j7wjpwyy0zc69q46wh42gbp65vp24a4";
   };
@@ -20027,7 +20095,7 @@
     run = "18h444dlm7hh518pj14sv6wxqkwf24ffiwm50i36kp3p6r4i2nc9";
     doc = "0dzkz6dk6nr898ya1p4nnpj3q44q3yavmpl9hrbcvbh8zj3cjqh6";
   };
-  xsavebox-76924 = {
+  xsavebox-77677 = {
     run = "1zsv2yf8hp3yfdz2hwlqdzhk40xbcm8bhxwq0dzzkdqi73pfay6d";
     doc = "0ad4gm6mxayrsvbc38nmn20jiv72g177r8vdnv04f8z8i02h7im5";
     source = "1x3rm695vs3nh01nal4qyk164kfjx7pjx3sfmv90cj2jkyi4clwf";
@@ -20040,20 +20108,24 @@
     run = "02mv1772xy0vzhdm3sj565bayzw2lr5qnr0qb6c9qg6gqx8zxh4g";
     doc = "0z0ryc1vp37i1shscxhbijvijkqqgjqlaxw7mr3aggpi6ij2wyn7";
   };
-  xskak-51432 = {
+  xskak-78116 = {
     run = "1hirv11b76xl7jx4swpa7imhjncfn81i9qc118qfrn26n890dgr4";
     doc = "0hzyv8gy91avmpf2fgjwpqfkkbi8255gy86xzn5cz3y948l3m5vl";
     source = "1gw6xqbpcsgdi5s7d239j0ds18w674z4zfibsvbgqjb70lixnyv6";
   };
-  xstacks-77269 = {
-    run = "072chqfmjpf6p5agl6x30haj9r4f52p1kscbjl9l9viq9gyvj115";
-    doc = "1wwbh89brf9x5y6cikc0680wkldfgf3aqmlxza5683cynn3fy0dz";
+  xstacks-77986 = {
+    run = "1qq7la0flq4r91p381r30f2rwi15205bgdjkzcaq8qc519qid1jm";
+    doc = "1szrdmv71l5z1n5csgagaa13ibd71bah3y00xfvyii0by19n4ws9";
   };
-  xstring-68015 = {
+  xstix2-78230 = {
+    run = "1lbadva10kpkvs3l2fjf3vwv45azgf4ja3qnbn4d3a2zii0qkmg6";
+    doc = "1c6bazn4pqbbawkxcmqavlbd5idd64iwf2gbv3a57ffvd2qhhbc0";
+  };
+  xstring-77677 = {
     run = "131y1vly79iga9yi9lva4bizxs00p4gyx44f7gcgqnd35biqpy00";
     doc = "0sn9djwkb06n917f1zly6gy81j1gixvp0w28a0f4i3whk3va0yac";
   };
-  xtab-23347 = {
+  xtab-77677 = {
     run = "1cpcs7k8liapv68cghfwj5fw80rz71qrld7l9lsnli50h7ph42sz";
     doc = "1z3wp3hqy98a4l34kgm604zajdyv0b2vq0jipywmdc12115cw63f";
     source = "1im5cv88g6n88rxzx8lqcxfmhkihywrv2h9gclmv0jx2mmwvwafv";
@@ -20066,11 +20138,11 @@
     run = "1d68hx38gwwscshdm07rcg75zjbsvk5kyliy5rx6z5jp75k0fra4";
     doc = "1fdr5k60zxjb75vv4m6mj1kalka1kg7cw3k5j9a53n01m2w7q6r5";
   };
-  xunicode-30466 = {
+  xunicode-77677 = {
     run = "1h8ixz9zy9izv5j7555094jiwfp5js5y8mp4bh993gn9xn1rb6b2";
     doc = "0jrxnpas07np9a30cybk6jqv4ng96vjqpyyadbl55szkiylzwwfi";
   };
-  xurl-61553 = {
+  xurl-77677 = {
     run = "1qbys9b3zd3rlabdmbpndf65fzmvkz24d6v3k7cml2bmdzzqv2cc";
     doc = "1q6npbv8iy1bgl2fjs3ngjw6wb78y51nmjbc2pndas7klbvdixc1";
   };
@@ -20087,7 +20159,7 @@
     doc = "0bx00qsgnndw8kq59nbihlzlnwvdf6gncdl3ljckcdn07i4mhl7i";
     source = "0gxi985kgkfyybg90f14y2w068ysy5vk4irc8lfvdgil3y8jwi4l";
   };
-  xypic-61719 = {
+  xypic-78116 = {
     run = "1srvrq5biqczvyi7k0ilbray7ilzi6gsmvk3b2hmf5qmv8hk0cs1";
     doc = "1js0fkhn60fnxgbgviri58c4q63a0ycq37r4hynxhyix17h51kff";
   };
@@ -20148,15 +20220,15 @@
     doc = "1dpjwv7m10413dxvhqgxsw2rp9n2gw8s0jghshgmbfm6x46a4db6";
     source = "0y7cc2sl9yia5ldp2la1wy4d53jgxgcpi0v5wkc4m554jl9am4z9";
   };
-  yet-another-guide-latex2e-73469 = {
-    doc = "1zsj22fwvs1xin5hh3jqq83dhl8ira87lb5xy2lzxq68bbjpbccr";
+  yet-another-guide-latex2e-77849 = {
+    doc = "0cg3g4lsmgfknakmkj89m74zhscxbd0szfs3vjj8b846ljfrc93g";
   };
-  yfonts-50755 = {
+  yfonts-77677 = {
     run = "1k7b78fr6x8kp6354viqfni3k77d96qmx9r76249m5j140hi6fk1";
     doc = "0a7fy4z790fr6q4z5qnzv578x48kqs128wl5znd5bn3mbg0n0cq0";
     source = "1ph8vc09vg0zxc9x1xydrm9wn6q5vml2bc3wln15v69p8nm52d7z";
   };
-  yfonts-otf-76885 = {
+  yfonts-otf-77677 = {
     run = "0ljj3py8day5ngk6inqqv51cgvxz5jz5zwxfw56w9iw8cigi7z7b";
     doc = "1z0v3dzl9p6hgdnlh4yff6v0y4174dc43f4dcbashdnyw7jzbzl0";
   };
@@ -20164,7 +20236,7 @@
     run = "08fbdd97n2h649kvks6q03zrsjvb1f7qwys3955g6iznf4y8pyv6";
     doc = "0h0gi1j5fcn1nkvf0abf2aimj2q3h6bw4rx7kzg5xra735fqpl4n";
   };
-  yhmath-54377 = {
+  yhmath-77677 = {
     run = "02p5rzh9n92pjznrqia9b6jnlwmn14189m7fiabvinjakaxmwxwn";
     doc = "024p61b5i55m6n8fmk4j9r3q7dprp3lcyzkhag0wch6vgjkrajzq";
     source = "0y74zwc1pkw3dp56jnzzy4zx1ilw5qx9msm1bf55mvdfc045a17s";
@@ -20178,7 +20250,7 @@
     doc = "0zp6pfr3giqm4nbsidg06q0c3x9gr4bk3g8qq7wxl9a2pgk3z45p";
     source = "0105amrybkm78pwb9hrd7n8r69sj6lkh1zm7c9sskibb13lqrk9p";
   };
-  youngtab-73766 = {
+  youngtab-77677 = {
     run = "18h6a4b4psbm0hjxq2xnk4bkmsa1wd2fvarrzfkhcj01hgn8bz17";
     doc = "00jkdw02iary6s5szh7hf4qjlr7r8y9lfmvlnrpqkhh6pdhsy3jh";
     source = "1hjqkj12jx9imfqm7y1mqdvp1knhf69kbixr88varbh09d6r9p66";
@@ -20191,11 +20263,11 @@
     run = "1i58grc9hn4q67kgh6z2n3jfcbplq689jcplwa7il1vmxmjr8pvz";
     doc = "0p928pkmbp3l1hnk15ynpylvpl7wk704v9ixdkdsjadq9mfha2yp";
   };
-  ysabeau-77373 = {
+  ysabeau-77677 = {
     run = "1dpi60ljyxh0d4g6lp05a1s80v4pjl8ssxy4hh22cs41lbg4y7f3";
     doc = "1x2js1pxmznscl6q0pypxcvh8gw8g1kvry7rmnv3wvj7w077zbwp";
   };
-  ytableau-73766 = {
+  ytableau-77677 = {
     run = "0gfpxbvar3m21pj74j19qnj8qakbknhvssyvfyw61jwdd8ygdxkd";
     doc = "00k10759qihk3330bwfpzmrm9bfb8513w3sak9jlfy5inay59rbd";
     source = "05pxlbj3rdgr15cqfdxviyp2698b7l44rzgssx18yv2a8qnaxylh";
@@ -20210,12 +20282,12 @@
     run = "1zyll0lpd3d2cjizq6f2zxnb1pmdl2qkhd1fcm9f9l6i5fqmjk15";
     doc = "0ymvngll5znvw0i4y65imidy21fzfzsdcz22i2i8369k1n15x6yh";
   };
-  zebra-goodies-66630 = {
-    run = "03m5npbrbcmxw9csl2hg1jgzjg96rr2r3yix3sajkxzmf2bcm3my";
-    doc = "107wr1pjqc9yswd52gflan10007p7i072gysnwdpcxk880f1n29l";
-    source = "15sw808cqfjvwmdnnkds9n1m29c7dzdm3id4hkm2cl92jxiygb0f";
+  zebra-goodies-78181 = {
+    run = "09hk3jv2f2issqy1djp7bglha5rxdiwcdr62pl90vyljbxlw4hwz";
+    doc = "10c0rympybdi56ykv620wxffmhln4xxyyxh07m8gkzzydbxvvy4i";
+    source = "1216kvnfrwg06bh6z764jlqljy3wph6m8fqs0xigj6rr8hrc377x";
   };
-  zeckendorf-76884 = {
+  zeckendorf-77677 = {
     run = "1s6fjfi45n03c1kv0689m1vp9dsrwa649435kid5kg4cvclva58i";
     doc = "0y9jamnx48fk2j0j3r4cypb5cjh8dvkvzp70lxg9zwj0406iw3b3";
     source = "1lalsb8rvmz7b1idhr0hbv5x3d6hj6dmcb9wyhxwxdpn1gz15mdr";
@@ -20246,7 +20318,7 @@
     run = "06g61qm3ryy6mvvaq4whk7084hjp544dig57mwcxlgp6cfs0fq8l";
     doc = "0ybijj2hjm4byli3yh8q9lgb40bdpq16d9273nrmiyy8szxa20qc";
   };
-  zhnumber-66115 = {
+  zhnumber-77677 = {
     run = "1iryx2mdk0fkvwnvw8z71bscy0kk41nx85flw88kwmsv5bd3aqxz";
     doc = "07hkrlf3gycv0clmr13c6xxp36yy5wrcmzr39ms3ql205qz94qcq";
     source = "01b6l05j6mkx2c8lbj2kmkl7cr5l9cwj2z26v85mmki1z3fkqmrw";
@@ -20259,11 +20331,11 @@
     run = "0nalr6i8yqd1iq713gigafnh1k0h8kgiml1zwpk8rjyya606capw";
     doc = "1cr63lkqi9kpkbpnrwmbppipsmw6wy732wsaha0y9y5ia2934nck";
   };
-  zitie-76924 = {
+  zitie-77677 = {
     run = "131kiycj7q9javr3xs7maa2qjczmva7vj98bw36pv7znwchspcca";
     doc = "00daf6p699y5204lrdg7hfcnmqh3ah764fpjymblvm8hy5f1w5g2";
   };
-  zlmtt-64076 = {
+  zlmtt-77677 = {
     run = "1krv8frabpvnx00xwdx058f9y2mip3bblpix05yxpfspx6aarhcw";
     doc = "1xiirzbgh1x34zih8xbf7whl5f994lx9bc4qrirc58rlccnqgbgr";
   };
@@ -20271,22 +20343,22 @@
     run = "0lwin7dfd3nk0r3drznmhkqd7fhfvizxqy3z2xv616spg1jh9sgj";
     doc = "1s4v9azi1pvvh1fizp2azkbwh35xvqh8qcnnn1xwi0g1xhcp38pa";
   };
-  zref-75450 = {
+  zref-78116 = {
     run = "1fzybkl72hrxcniwxcl7f3jn9sywfzxf19pbzq161y2hync70qrj";
     doc = "13s9lvlj3xvyxy48d1qj90mgf3f6bmppxp7w0dh6zmg4m6pmwvrx";
     source = "1cpdj25s3qy85mxf20xr2c6mllqzx5y7y1sz4avamk4s056cadhp";
   };
-  zref-check-76924 = {
+  zref-check-78116 = {
     run = "16h8k4b97m5rvi5y9dsx81mj0qlpk35dz7qjkqii8wld7mpmkjvg";
     doc = "0jna8w0mv7ycjmpa8m0p69mw2lpxzsgq0b85n009h4sawrjjr77l";
     source = "0ha4dxnp7i8zf8alr3jwavlw0rhsn4wz2dvw0dlglp5d8dm0xkp2";
   };
-  zref-clever-76924 = {
+  zref-clever-77677 = {
     run = "1jm7arz7kgap0zmsqlfqanhi0qs0h7i6khk1fmhlfx7sppg4f7qm";
     doc = "1xnck9mnhjyshkgkmsyvfphgy539sjc5j09hzcc1cw1ybkhscb4j";
     source = "016aawjxjr6a5v443yyq9csm8nr35z5smq9rgckym2crpim2gkmp";
   };
-  zref-vario-76924 = {
+  zref-vario-77677 = {
     run = "1dv1grn02mr6j14mhqxbdqdydhw9xkbr9yf3mlp3rfkyrlbv21k8";
     doc = "0vzvrgirkasqcxax9jqjz2pkxn9qykps89nbf28z35pqcydwgykz";
     source = "0b77m4qki4qzq6cvl2lxcpc23vzlb3zjn3p7rd8l0xq119z3q3wg";
@@ -20308,15 +20380,15 @@
     run = "18da90bhdmfbjalnm1qvc5vy0ajkgiwzrll55108p74pcxdcdpfj";
     doc = "0mnwarf3ls8w3jj9p6piyl3z9kci8a5sabq5m6dq8xvm58f2h14s";
   };
-  zxjafbfont-28539 = {
+  zxjafbfont-77677 = {
     run = "1zcyvwsqn2w9x9w79lvi736r2zwrsk2xdk6nrrmkiaq3cakd81p9";
     doc = "0dfh592niw8s6zxmxj1sf8h02s2vz8s2ywd291946bb72xidb4gq";
   };
-  zxjafont-62864 = {
+  zxjafont-77677 = {
     run = "0p1zmf0bwd5fpyyz8cwdwc8pnxcqk31570p4722lzwqiplm0azfc";
     doc = "16w7iqlb5zwz8qqyyscmyd0zdzb55n38gf10qd5cra6c161fi7b3";
   };
-  zxjatype-53500 = {
+  zxjatype-77677 = {
     run = "1ap4f0yq4cmkz5djy7mpgp32l24jr7xbxd9zc0nv1fvnywxpxfcq";
     doc = "005rr69f433bllggj997rhbwlbmsglaywi55az5j02x0036aj2dd";
   };
diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
index 3bf70ba00dc1..f2321c21cbc5 100644
--- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
+++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix
@@ -61,6 +61,7 @@ lib.recursiveUpdate orig rec {
   #### overrides of texlive.tlpdb
 
   #### nonstandard script folders
+  context-legacy.scriptsFolder = "context/ruby";
   cyrillic-bin.scriptsFolder = "texlive-extra";
   fontinst.scriptsFolder = "texlive-extra";
   mptopdf.scriptsFolder = "context/perl";
@@ -257,11 +258,6 @@ lib.recursiveUpdate orig rec {
     "mtxrun.lua" = tl.context.tex + "/scripts/context/lua/mtxrun.lua";
   };
 
-  context-legacy.binlinks = {
-    texexec = tl.context-legacy.tex + "/scripts/context/ruby/texexec.rb";
-    texmfstart = tl.context-legacy.tex + "/scripts/context/ruby/texmfstart.rb";
-  };
-
   dvipdfmx.binlinks = {
     # even though 'ebb' was removed from the Makefile, this symlink is still
     # part of the binary container of dvipdfmx
@@ -312,6 +308,10 @@ lib.recursiveUpdate orig rec {
     sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath cjk-gs-integrate.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/cjk-gs-integrate
   '';
 
+  context-legacy.postFixup = ''
+    sed -i 's!File.dirname(\$0)!'"'"'${tl.context-legacy.tex}/scripts/context/ruby'"'"'!' "$out"/bin/*
+  '';
+
   cyrillic-bin.postFixup = ''
     sed -i '2iPATH="${lib.makeBinPath cyrillic-bin.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/rumakeindex
   '';
diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix
index d06cc1ca8fa9..9dd50dc26da5 100644
--- a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix
+++ b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix
@@ -1,9 +1,9 @@
 {
   # no indentation
   "00texlive.config" = {
-    frozen = false;
+    frozen = true;
     year = 2025;
-    revision = 77567;
+    revision = 78234;
   };
   "12many" = {
     revision = 15878;
@@ -48,12 +48,12 @@
     "a2ping"
   ];
   a4wide = {
-    revision = 20943;
+    revision = 77677;
     shortdesc = "\"Wide\" a4 layout";
     stripPrefix = 0;
-    sha512.doc = "bf059462ec7e28ba782d5842d090c93f4e911bdf44eb3d4f184a7324b454105295460a52414ffcb9fc71dceeba902b1d78ba208d0998f71727ad41299eb1138f";
+    sha512.doc = "2b3972e25b24ea471b331fdcf2bc9daf5c2c1ec15b91783debf27adfb6dfd735dc4d77fb23890dda6856430c4ff22d0d28a4f2f1c0f02b1d5526875de32268da";
     license = [ "lppl1" ];
-    sha512.run = "e0f1f95bf660760683d6c5a917d75e537a0347837eb4388eded8194c6ca5371b2ad9be9829fcaaff1e24b7d8baefd287db6add752c19a57a6cf0737017e311e3";
+    sha512.run = "6a1b2f610e6685079f7e5a830ce4e278d77c62a680461297fbf181ad31d2b45682be7155d2afd6fcd825365e9ce440512b39f4e078c0fadac1ead36bc5c5d311";
   };
   a5comb = {
     revision = 76924;
@@ -148,26 +148,26 @@
     sha512.run = "e04074504224c4840cf547c1609795703a0f1271d57ebe37c5cabb05c386fa8e1ed59f097584d3a327f8cca5c5eeca2e4974dc9849e7f12c3476a64dc8c6e9d1";
   };
   aboensis = {
-    revision = 62977;
+    revision = 77677;
     shortdesc = "A late medieval OpenType cursive font";
     stripPrefix = 0;
-    sha512.doc = "84317ef83e712296819b25926adb7522531482b9d17d807cdfd3897f712aae8a8f161a242bffdbe7511478a3e5ec2c1e76fcf51c14661b3465aabbc6b95bbaf2";
+    sha512.doc = "73c2a31eb4ec0146e9d68783459809cda249f71354f2fec596c9fc7287bb412c5d5643e16e8fc668a85949ada8f6c1b1ff1641f4bc8388124cd393e668a7ec9b";
     license = [
       "ofl"
       "lppl13c"
       "cc-by-40"
       "publicDomain"
     ];
-    sha512.run = "74f569d7f8b942087285964f350e97b15de05a69a09b1aa21d3bee09a017381d4b18b449a55aafcd0009a5941f0bea198b04947a81b331541af6617d5a58ad73";
+    sha512.run = "7b776e3f2e26bafdbdcde43d1c045ab69dc4303c153351e0e3850e1075a0e4407f07c0d36fb21ced9cfd796ea2199ce5bc3076216b3d8ace64a06e2c05c8eafd";
   };
   abraces = {
-    revision = 71955;
+    revision = 77677;
     shortdesc = "Asymmetric over-/underbraces in maths";
     stripPrefix = 0;
-    sha512.doc = "edd65924114b76bfc65beaa12ae6bf5e0164dccc3273eb472e5be537b9dd8f3bd46e188b4efcf44a3533a6e2a033bd1473207c61a0f8867e442bcd15e3aa3a7a";
+    sha512.doc = "f83ab368c8578efff3438d971063716a4eff9eea5965ead0094ce72c871d247606659f7dbfe44835bdf5d3581246a8d067a4d54dda2d0d203a9a443a92c29b8b";
     license = [ "lppl13c" ];
     version = "2.2";
-    sha512.run = "b32204970bb51dbe2fd16c49e0a8c9957c1c4ee45ec5f90dd19e70f85d9a924add4042d61a9f054a797ce966b1fe953369fae6eb04d2eaf1c68941945e0e2253";
+    sha512.run = "c1167b36513a1fc3d19c48fee8ad53f47fcfb79ec524eb4ddb6be78dc463451dbe454c71d3163642da41720df9b872560ab3422b829c45c238982dc79183479a";
   };
   abspos = {
     revision = 76924;
@@ -180,14 +180,14 @@
     sha512.run = "46185984b766c859533dbe0097fed1af6a28de97e98003381630aa4341afee07e0b4a7abab6f576e6d1056fcb4328524ee016800019b2c4fb8d51e76cc83c6a4";
   };
   abstract = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Control the typesetting of the abstract environment";
     stripPrefix = 0;
-    sha512.doc = "4feae7e22d9f8c6866a9b873359a3060ff75ebcd833e1ea5f82e833933b5beb36260833675775cdeb83f1cfde4dbae3421434890aa9f0f7539c999acd2e0405b";
-    sha512.source = "e68a030e56dc15481335dfb1ba566f9b68e92933f27d296d72e20b4d3541790b739b945fc1b39415baadf045164158618da98b63be567c1aa263336579986e8f";
+    sha512.doc = "f100b2e7be27373dec75577e70704dc4ef6c6a610df561f949bae8e08b22bbac739d8177ff3df6e1789632af68f62594f75d44f0a3afd113042a0184bc515d57";
+    sha512.source = "89246cca335f58a066dfd50d95545d923bf666648bfc8ca5a88a445f888662b2ebe0d0cb86aaa0beed5fd7990422287874bdc7bde4cf3c1c1850c7e51364e7c1";
     license = [ "lppl13c" ];
     version = "1.2a";
-    sha512.run = "2d805c2cc322cd802d612213ce525765d49d06bfb371a4ac5d1434a3c752af0ba0182093b0b6e4ee28a80ab926ad0f3a0403c03f871d3e003f6eb5a60ae39c34";
+    sha512.run = "fd3c3fb63068358e4b5ea39cb2faf8e173cb4f9bb3a2a777d95d41df2a8e7f892f80defe07727459bbbd7c9537a9f2e7a97d7ada7179d2e0ebfe741e32a6784d";
   };
   abstyles = {
     revision = 76790;
@@ -199,42 +199,42 @@
     sha512.run = "438c0e0d52eecfd67b80b85c9d6d43ead0d497e50c3e4b2dd709a3be92a0654ed181eb169818519dc1502d99b9c64985a57e0f12e65649e7658863857af2b0f4";
   };
   academicons = {
-    revision = 76366;
+    revision = 77677;
     shortdesc = "Font containing high quality icons of online academic profiles";
     stripPrefix = 0;
     fontMaps = [
       "Map academicons.map"
     ];
-    sha512.doc = "8c66fb8cf0d62393bb5f8c746bfa3c74cf67728aecbdcfb5112c7c5edb9bd3f0139a1eba633165ad84ed14a931ad378f7f74c3a57317c953e2631086883ab91a";
+    sha512.doc = "b46686ce29b2e0e42a5fb5961fbc840848c50854588a605ed4375c67f50cb5c88f8de0a01354e325d0a5e3fd195b305aa345364cc00ef1c5bafe9221fd3c3ead";
     license = [
       "lppl13c"
       "ofl"
     ];
     version = "1.9.6-2";
-    sha512.run = "fbe7717f97221ce5030b663364ccaf9f05888594ff06a5bf901bc5a831dab0b9583adb6e64cfc2f32ac8c3a83c9654ba7e9f897b59b956b34a0fc7395799fc3e";
+    sha512.run = "9e56b978c2d120cc1499be0fa40c3ddaa1b790c35a990d88025c585fe315d85dcee054fb3d751689ec91f0dd39ed5dfa16cb6433b74f9dcf143121970f28cabe";
   };
   accanthis = {
-    revision = 64844;
+    revision = 77677;
     shortdesc = "Accanthis fonts, with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map accanthis.map"
     ];
-    sha512.doc = "6789c3c330d1e6a0d20364e4e98ef72fd1c6294655f704366b0e6c1fd081d1aea312dc9e6767fb3e076b3cd91ea5a67606e8bf62f7f92af097ba766c99ab0cff";
+    sha512.doc = "dd021420aa0a5f6c7ccbd3202682af72e0342da82b5bcb0c44f9c48f33d62a10e4d9b145826e1e8ad59d6065be5791703f4078d0f9add23ff2647b1534d863c5";
     license = [
       "gpl2Plus"
       "lppl13c"
     ];
-    sha512.run = "5727125c85e06501f009267bab8c1eff674a76db618c6155fd9c6b41bb2407a3a201a008c7f5aa6d73ecf100a3fc917961d20f547c2f6040fe72760a4dcd9a44";
+    sha512.run = "8547b7179e1bba76172e2c723c9acf4de0bd500bffd0c2138749161535041dde99fbae17a4f7b523dacefa7e3b9d4d25a1518dccdf22884f3213f2c804832712";
   };
   accents = {
-    revision = 51497;
+    revision = 77677;
     shortdesc = "Multiple mathematical accents";
     stripPrefix = 0;
-    sha512.doc = "50e5cd01da80113ef3247c4a7c7da703d4a9c3df68822b31ff734da2d755f5fd2bf9f5f8982d84e3628e96905276dfe6cc6699bb625ff1dadbe810b11bf5a35b";
+    sha512.doc = "ab83ae27f90a9fe40a63c7e7e9722e1b588f6e4554067257cdd21f551a6d5106145ba15ad08783c94059eb64bcbb7149320e0a7e5d205355d95bbac594c311fe";
     license = [ "mit" ];
     version = "1.4";
-    sha512.run = "738e8299148365c0441495664cd97b408b181d192adb718adeacc93d4c63b7e81c12541746777571f3fd0da37348905269b5d7ecfc2d58f88174cd53edbe56b3";
+    sha512.run = "d59694845af30b37c124646b617c40845a41af25b1c8cde9a922019333356dd58aa6c1e6cece2274ffa5a11a6a94e25ad4eee378425bdcf943c1857dcfb33e4e";
   };
   accessibility = {
     revision = 55777;
@@ -303,7 +303,7 @@
     sha512.run = "9363127ba5d59bee9d41e800a0e11d12bc4493e5a79a94be8efe23a44278ea097a58fb53cd334fef0f2ab32c9350196c46ee1aec8347a4aa5554b317c15249ba";
   };
   acro = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Typeset acronyms";
     stripPrefix = 0;
     deps = [
@@ -311,20 +311,20 @@
       "l3kernel"
       "l3packages"
     ];
-    sha512.doc = "fdafb7438cba3181532d833c3218f9e69e96fb84e131bc314e6e57c3e49b8bf3e5a7d0605fe557ab216b56dce2d9bc281286c316adcdb31f7d13c5806af59cc6";
+    sha512.doc = "5b888077a541baa646fde9b53b55950e0e83a5095a9631b71c1157a0ab146ad58f8bb09012e77eac528c8a6167c547080d0d05385376357ace89491f798caecb";
     license = [ "lppl13c" ];
     version = "3.8";
-    sha512.run = "fdfd2660b5520dd2789bb0b4ff7c3ffae7a94e7e1230740b36570cc9bcddcb281208627cc3d957176cf3e5fd2185fd69fa69221a97dc2463e0f149b40e71e76f";
+    sha512.run = "4eded89440112e93c1ff56fbd3e539c83c48044b8d2bc8b6a80d8b63349c2f27fd3af2051ef7fcd27db47d0fe5031077a1a64396c3c5958ffb04e1f62a0d4021";
   };
   acronym = {
-    revision = 73491;
+    revision = 78116;
     shortdesc = "Expand acronyms at least once";
     stripPrefix = 0;
-    sha512.doc = "1a2d3bbe59a81125561266b2ba5350f814ee5d8d01f0fbf1aed4be85bff05039bad754125f09a56d179fa9dc6263ef5950ab6774fc54e60b700b6baa320cd58f";
-    sha512.source = "ace6d2c8ba88b10b2d33e199f9b3f1e22e5154977160e1c5df7054c19a69dbc6cfd3f2e040c102e99f8f6c0321ddf1a9457772c241fe67c78f21ee0e92add4f7";
+    sha512.doc = "52a6089f099f64b2ed1cd44ee8c93e8a6fcefc0a3dec82902730a251385d66aa2171b6d83c140b7cfab7f0393873492da6ab89d74ea19af416ec21172697a025";
+    sha512.source = "83b9f758b6317ec229414332c61e6d787d221c14dfa9b447483387f1b805609b7b9adea7ceb6ce7d89ef92d20ea488d634fdf9bd59cfcf8f45d4acd42d2596f4";
     license = [ "lppl13c" ];
     version = "1.50";
-    sha512.run = "98c527da3bdae829915562332f48b2a2e082d62bdce836dc0a7f379363eafb8e48fe1b09655969f126fa292f112f92e0c40f4547ee54869e48570c08524a0ea1";
+    sha512.run = "543a75b19a5a8c3b3480ec275d0a8b7bbaeb7504dbdaf3b5ec752b4bb15526eaa2fd76fa148753f09b0c1ab2c9d4777ca41b1d30fadcfc92f3978eeb9e38326b";
   };
   acroterm = {
     revision = 61719;
@@ -385,14 +385,14 @@
     sha512.run = "b54db5b075c2ba2f632e40a1ae2d840b0a61cc940512027effa2b2b3cadfd6dfa2407e2580a462b98f48cafed94281d39613397ed34ad76f54d6a7e8b614ecb8";
   };
   addlines = {
-    revision = 49326;
+    revision = 77677;
     shortdesc = "A user-friendly wrapper around \\enlargethispage";
     stripPrefix = 0;
-    sha512.doc = "2993c6caae1d2f230d144c9f93f7694adcb2e17d9bcd60eb3aa3144806a522258fd4c44a314d40cc767b3b069c4c929b8e458e74bebc746771b975b77bba34d2";
-    sha512.source = "6de10a1ddcb65be76594e7389d47316e066aec3a747ef7a61e15fa0e670d914dae3d2ef777c9574e8b85c5d9628784df7f4dc61f589917dbae571f31416bad08";
+    sha512.doc = "e242da63f7347527267e1389ca5898d48900ac68683d57f79179518d674acf01222714e1d3e04e662e7fee282ea65175f2129a86fa26e5d9a36575a18182680b";
+    sha512.source = "f63c1201fbcd02970e74b3b5724022bbc50dc37d893cbe5e5eb0f8319d4090c808fe88c864bc85f59fba8217317beb5ee53855ba3635d5ed0f65fc5080a7a5a7";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "5d0a438fceef1481633f37824b686422e5000cf232b7dd24bba0f30c8d62b583daf01a67242283f2e4fe971438c061acad2860f50ce1438ca32677d497db8b2a";
+    sha512.run = "af17c135e7df4ecb73eb8bca2cbb195fc53ce23362b4253465e5f68996f21cc5465812b6049064abbe490f42498989a8a995878f21d51a6ed02629a06004c392";
   };
   addtoluatexpath = {
     revision = 73424;
@@ -413,36 +413,36 @@
     sha512.run = "4eb7fda01fa1961d213eadd2f0bc9b1cf102de664dae1f37588e161af22d043319e12ca704c3223e78e963411c3f0533c845b17f7d0744b020ef2dca35b2c7b0";
   };
   adforn = {
-    revision = 74834;
+    revision = 78143;
     shortdesc = "OrnementsADF font with TeX/LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map adforn.map"
     ];
-    sha512.doc = "516e8f9a324fbaedd8a4f992fc1dba91ed33a2dcf26664798fd835cc2e9ea88460c246551e92f02892b3928871ad513bf4d84b75687b0f8d558c741b896ebc69";
-    sha512.source = "d92e127428e76ff6f2a99539e0fe4218155533157d3bb59c15cd6ea4c9eff8dbdff94942f4a5eecc3303065b1632fa6b877eba7ee5643de864f516b5d28519db";
+    sha512.doc = "50130cccabb98d3efa5b715f3bdc398d97c081ea72dc7c6f408352238b9df8a14a5c7da3471ec87c0d8f9cc405375d8b118f82947c8c9693d7ed19c3efbaf2e3";
+    sha512.source = "05a5c15b330c2856c7e874dc12af52df80c10a4f867d17b939fd5a7ffae9e3a29a180f29cd22a472213057d01a06078fba7eb869de07ed767b0d2bb8a31914b1";
     license = [
       "lppl13c"
       "gpl2Only"
     ];
-    version = "1.3";
-    sha512.run = "0270367ce67adbb2b30772f002c4c536548732f1c03af9c672169a62ba7330abda06375026b6fdd07548104771728e40fe7bc0ede594aea723db682facbaab9e";
+    version = "1.4";
+    sha512.run = "288767f401c4cc8ee33735efff4c9a05975bf9228a39556d1907e8005fe7573256b56f08b249d8deaa7bf43cc65089aaad3bc4f18e25abd10ead3aedfc818c1b";
   };
   adfsymbols = {
-    revision = 74819;
+    revision = 78144;
     shortdesc = "SymbolsADF with TeX/LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map adfsymbols.map"
     ];
-    sha512.doc = "9612ee5a4c2584effda9892068096de0035890fdbaac4e324b848f291e98d363ccd78d351aa9d617c344e3f15f15230108774594cd8977f550a82379428d7b5b";
-    sha512.source = "d32ef078292ee16e4909343b00126d9aff182e091a5be31ec25c95908fef704ca4356cf15e2fdfae9b265074f26768fc741334e1736d4e9d448ac6a183b86cc3";
+    sha512.doc = "bd77e9b6c786dc40fe2fa1b012bb4ec3fed13781d95ad40098c8c16a2e3129c45e7493bec0fc5f54df99891d58a4fbfcb2b09d217f00d122161742483486bd9c";
+    sha512.source = "2276462ba621cd073434fe05bb3a0958ff324ba6e41755ab2b7131ac2ef7efe06aef14a5086bab36a28b7628efe086f46a8805fbc9a1a5187d30dfc6ce56e310";
     license = [
       "lppl13c"
       "gpl2Plus"
     ];
-    version = "1.4";
-    sha512.run = "eacbf3d48c4bb7ad01668eeb674e93385099eecc71a0d4858bbe2f04c1e1a11ae71bbfe7f473f114e07b11c38da5172c3531b091ae78c650e6f07b4d8a3e9a86";
+    version = "1.5";
+    sha512.run = "a46bc0a13bbd9883e82b2d0d865f943e66172e2c8afc5a0faeced8dc6b2ba25f412d524336cc1024b972fa19dda84f681202c8ef85640e7567f79976949da2c8";
   };
   adhocfilelist = {
     revision = 29349;
@@ -465,17 +465,17 @@
     sha512.run = "a556d38f280f96dfc3d3ef466c59e6316e374d3ba765f2e5810864e791969adbdfeb45eb6727d44f4e26199db35ae312dc5e60f9912d6a10d348814416108dd8";
   };
   adjmulticol = {
-    revision = 63320;
+    revision = 77677;
     shortdesc = "Adjusting margins for multicolumn and single column output";
     stripPrefix = 0;
-    sha512.doc = "393cd068816ef77104ccf294921d6e9213497ce52e8507044783b05859c54ceea208fad8a7af2efcc6b42ac74abac142f883eacd455b0e3f6227c3222d2a5db0";
-    sha512.source = "400b8e4a5a65c49094a127c43d002b93ce38f04eaad154e5edaa1418d9186abc8b14c74570da79953fc44863de2f98748c23d66abfb9b4d03b5024aef9e2082c";
+    sha512.doc = "bcd9d73ae77d092c50fc7c73252ffa78e0a514205ce57411c1ee69176c1f8ea8d4c5bc398a5884bd31383b707ed3603ddaf31b8a2b83a86ca79de0ffe61e3638";
+    sha512.source = "e265683b9643df034956527205dd7674effa09e5261e4fedaf37ed6857fa5ad996e19a316bb0ad34fc9fff190f02d553a77f375af775e05a692aa9b202a8b260";
     license = [ "lppl13c" ];
     version = "1.5";
-    sha512.run = "aa3a350cc284bb52e5dd519155d9e74dcf96171e12acfd092ab3be502f09100a37cfb98c4ea99c6db7f7efc4b1edadfea86b29460dcdae212fd38cbb0b0062e0";
+    sha512.run = "329a1fd1f81a8515f932d25c05a36c668cef99b15e5fdb9fef53664b19acecf39fa4ae21d6fac1ff3e861f9e90374fdfafc5f89863838462604fc3d0a661b193";
   };
   adjustbox = {
-    revision = 74309;
+    revision = 78116;
     shortdesc = "Graphics package-alike macros for \"general\" boxes";
     stripPrefix = 0;
     deps = [
@@ -483,11 +483,11 @@
       "graphics"
       "xkeyval"
     ];
-    sha512.doc = "7bed759f4fd7deee643fd4c3efa55ff8c40b350343b8da49b99a20690f0dacfb6959201730f13684819cd8c5eac4046fbdd0e494e85894e8100cfffd1263093c";
-    sha512.source = "864adb48f8a611ae64a490ef2f733792fd0424284514003df53092e19df7d27eaf90ef85d9762363a6d7c15a97d247e33d41e8762e3d4155e4ca1d82a046a112";
+    sha512.doc = "5c5b394e411404596e834a917334b9cb782137e40fa8704698537670886cbdbcbb2ddbadbbb8c263d91153b2121498b7e8d0398f2ef40228218a96764826774d";
+    sha512.source = "6e2ef2db223e0b89350c74c50942d57d2c62974bb26a9170c171833855e63db9b64d9d2ba6823b25113f9b0c7ec7835e49487931785a8d5ddc91a6f0845ff944";
     license = [ "lppl13c" ];
     version = "1.3c";
-    sha512.run = "d7744fcfd98a180646e40874e0fd8b728b079d8662fb2efd6ab04215ea284101b0665d7f4c2cfa0dc28e19531e073d7ec8ca041c5fe607fab07a23daf5b3839d";
+    sha512.run = "ebfbf036c4d6b29ace3fba5bf7962c33134d0a3bf0b5fbd9008eb14e2bb8fb6076cf72460c81053b8e1c09d66a9187776f34eb38e76efdc65c95067c9d0585e7";
   };
   adobemapping = {
     revision = 66552;
@@ -516,12 +516,12 @@
     sha512.run = "1e06f07576666fb7b54c78d930f66fef78571469bffc3ef448687c8bbb0d23d41761e17c8ec1293bb6527e31fc70413df1b7de5c9a06514e6aa8242ed90deb09";
   };
   advdate = {
-    revision = 20538;
+    revision = 77677;
     shortdesc = "Print a date relative to \"today\"";
     stripPrefix = 0;
-    sha512.doc = "acfcbd6a40630da2cf9024cbf3ed378c1f7f8a16c8f8395b69c12f9693e903ba54b9b051c364c5cb4de957876bbd41f0b480c4f4b320e22f2c6df7b08502873a";
+    sha512.doc = "ad120cabda058e1c785ecd74ceefa15940dd700ef0f69155de24b9778105bd02c46c911d7018d82363fb4d371bd86bcecbb0f55dec707a3f451939f80a5f3b9b";
     license = [ "lppl13c" ];
-    sha512.run = "80075aa6efb4125bdce79e9b2ec6951caf1a753c8915201767de230acdd1adc2eef31400574effadf6287be159236422840751bf5ea24cd3cab8a01e82a0185c";
+    sha512.run = "fca217ef6604a450328ad449679ec91e6e2fc8cc39258cb2ffa6205a435249fd3c2d301fa21c51b3a19584614e754ea431160ff6a4c85c14c1c72657dd5fd7b4";
   };
   advice = {
     revision = 70688;
@@ -720,18 +720,18 @@
     sha512.run = "3e4c4902c70deb8f380d3ff5e1a621f595ea1dc47cde3579bcfc12bd0a066d5d1d6773ffb1d1f98aef336c8cfdbe7770e1d48f5b89fabb98308f54df5dc75fcf";
   };
   alegreya = {
-    revision = 75301;
+    revision = 77677;
     shortdesc = "Alegreya fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map Alegreya.map"
     ];
-    sha512.doc = "0d4b3d375194f5c6b1d70d66a74e8c9e562356ff5b39bda14082313ffd8b18432e01a1cd98bb3dc57089661c86b621b437580a739c2c9e07aae1a3f65db4f2d2";
+    sha512.doc = "cea6470886c4ca9baa33d16988d036a8c38be03f57ef05e9512c445545641fd259a3a6ee21191e1c58efb3b87d203ffc525696b05487ea9093c442c181b9d2e3";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "9a15f61560756de4f87f92e7c8f069a31afb7495d77b293ae0ac0f55042bbe2204e57ca728869fe7d546784f7547a5956ed6ca09da2fa5170792e005ec9cc9bf";
+    sha512.run = "daf6feeeabcb748bb5b59acfb395ccf37b63aec79240e0d2ae6cad836bdfdb34a270bdc5061c9512d43a4d94ed3f2fbcee5cf98853181928da1a3e135d2d2503";
   };
   aleph = {
     revision = 73850;
@@ -775,16 +775,16 @@
     sha512.run = "c1dd6b93f74db3aeffa75726423149c2701872674050e67f957bbee6c355090da6280473a51c404694434cdf8bb83b9db3e623b5c3f2d89d4d5d3b485c99eee4";
   };
   alfaslabone = {
-    revision = 57452;
+    revision = 77677;
     shortdesc = "The Alfa Slab One font face with support for LaTeX and pdfLaTeX";
     stripPrefix = 0;
     fontMaps = [
       "Map AlphaSlabOne.map"
     ];
-    sha512.doc = "375ca21d23599fe365f53f461264351982340d151ebdd2ce143189d8fd3c22d191501520d571f207a1f956f433ae6491e171c7ebb3c9c5421e30b358cc79f9fa";
+    sha512.doc = "57176c3065ef7038b224ddf3fd5b43edb0f2e29411a7acb8d43bd15864a33d757de8210bc6eedd262ee17d10ceb278e541b9163d22b309f4f01f89937989e345";
     license = [ "ofl" ];
     version = "0.0.1";
-    sha512.run = "b958ac7987363fcefa3d8b7016f13851b91446a2a252e9561fd1a15df78b867b928f3e45a6fa1556abffa0de03b2b70543266ef9627b7474167c5672ac98d9ed";
+    sha512.run = "777c2ee8389c86bacc0e6dbb47fa87584ca548afc13a49296d2006f53b034ea9e3fbd207945660d67800ecd0c61427a602b205d9cddf2338024685410af85e49";
   };
   alg = {
     revision = 15878;
@@ -806,46 +806,46 @@
     sha512.run = "42192835e3dd2aedf96ae3602b3009af09512425cad0ee3dc859a972ea5b8ec46bbed35456b17f0ff7a31faead6df06c01734211bb0f206eba80fb05e66d2663";
   };
   algolrevived = {
-    revision = 71368;
+    revision = 77677;
     shortdesc = "A revival of Frutiger's Algol alphabet";
     stripPrefix = 0;
     fontMaps = [
       "Map AlgolRevived.map"
     ];
-    sha512.doc = "2b502f5997a885934546f17cd548c9f15105500bff5fe769c3099326eebbef049e3e963ad0fdf9000cb91f74152b7be9fd2e60ac88ae671ff2d454525becc175";
+    sha512.doc = "0fa479c3ccec22fc5334d0253857b79506cd45b8682fcb44226ddf89d354de8f6bb4b3e50c3006764c495eaf4884933334b2ddbe2d4d07c7e79fd9dc5285a82a";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.054";
-    sha512.run = "977b36722ffd28447f165d7e50207d2afddc2f7526b3158d654c015342994033cfeceaf0cc28144d067e063c5de1bcebd1dcecf715af27693156beaa1a07e711";
+    sha512.run = "c7c3407314ac01d1423e7b3b89886567cabf598928c1bb856362ec8f75d50463344f082b2ddc66930ca66b621c2bf49c8594acec09cabdab8c00261206650202";
   };
   algorithm2e = {
-    revision = 44846;
+    revision = 77677;
     shortdesc = "Floating algorithm environment with algorithmic keywords";
     stripPrefix = 0;
-    sha512.doc = "ae737056adb53f943ae8c92d8e7bfffe52a107cca4a7a3151932a581744f1396f43e134a55e9894de0ae1fb5418983ba4643e1e07487b690478a6979555d8768";
+    sha512.doc = "acbfd0ecef0e9601a0cd8cd85a2bf69d86d659b1a052635432228bb6d1e1dde5c86d499b8a57d18c77d32b1bb4c5d9eea3bd63bb33ea62aa6315abce63b85591";
     license = [ "lppl13c" ];
     version = "5.2";
-    sha512.run = "0203f337518811a04f255a1ea65045f487dbb4813fb848e0ba1b52d3e5fba96b784852d7e900a82f4c047c2943098e3b37cbca27322d115c341fef6d262c60cf";
+    sha512.run = "0e1e6c608a3be6f038dda052559ba6143bbac8387e2108dad4fb8bbe4cb4af1b230c58311fcd1c02dccc7c7d34f92c20bd3b2ff81218a290c8802d12ab2a1867";
   };
   algorithmicx = {
-    revision = 15878;
+    revision = 78116;
     shortdesc = "The algorithmic style you always wanted";
     stripPrefix = 0;
-    sha512.doc = "cda9c4082faeaaf504194d75c014fda9cda20fe85ab9dd8c4f5a3c9e39fc2c8c8428ef20b921790f36c8abae2ecd8ea089353db540477909039575bc65ed5228";
+    sha512.doc = "62ee6bb201f4863b7ca37178b114435dcd815013c2f9ce64eb8dcbe1b105db06e71d8a1b345d9006e031d51c78851312cf3c785140f4075cce79a8881330d29d";
     license = [ "lppl13c" ];
-    sha512.run = "b6cccb7bc391ad11a8996d3e6a3a48f79e50e3e685a4b7670a3399d5d400435616794100b38e73d32633fc16cdd1795c2dcd57bc79279266dc6509bb14d08804";
+    sha512.run = "a6c3f4c17720f95b8138769a010844180cb49d494d4ae24067d8abf05740172860c4f955c1ad22b1905284c6adcbdda4116bdbad995dfee1eecd46d816231c78";
   };
   algorithms = {
-    revision = 76389;
+    revision = 78116;
     shortdesc = "A suite of tools for typesetting algorithms in pseudo-code";
     stripPrefix = 0;
-    sha512.doc = "a4317724af6fb2a869451527335e05dc5d587620e374ea5d121adf427ed941ece1c080d9612e90e054e74370ee32121bad60f4235330befa0c11a668ef709c48";
-    sha512.source = "a37ee4e7ef7960fe26e0d967ec52ec7daef6624c1df8866c33ab5d6cf14c04889516278da84c807ec4789f257497e9b7a4998a0d09c28b4bb32789ca9933c521";
+    sha512.doc = "545268f45887ba9de8a04b29235f40d602714c9fc3b41ddc9c19000a698c55c14cd720a8a6d0ef9c864d6b7fdd5778d8ec58b28d83599dc4dfd109f1d6ee4cba";
+    sha512.source = "00cc321f912cd4b0c74afcbf8474916ef6963a42b714c87dfd8e68e5cf60490f44287d610ad4b923a912740220f2044b6b6bf70c8b4fde4a33bb279ad87e96d5";
     license = [ "lgpl21" ];
     version = "0.1";
-    sha512.run = "332875ecc8fc35b6180a45a0db0198bcd3825fb049d978bbe8ce267cfb9c4f25d23315a0f767a7ff4c254f428d1c38df4b3650293a9913399e2e9655f98f2036";
+    sha512.run = "74c07d44eea44c9f4915e63f6093ee4a92bcebafeece086c5e08a2a7c1415403f0fea81dac855c8ab93bf750df65196f0825a6a1e2ef27a5c4825d8f29089462";
   };
   algpseudocodex = {
     revision = 74973;
@@ -876,14 +876,14 @@
     sha512.run = "3b5affc20359e53f7991957d09daa1584b95674cbe7c5e9aea1089069a1232a43cff004a640f4114425bf5fddd5a2d2f353159447ab8c8621ab05b8b22232805";
   };
   aligned-overset = {
-    revision = 47290;
+    revision = 77677;
     shortdesc = "Fix alignment at \\overset or \\underset";
     stripPrefix = 0;
-    sha512.doc = "d44ff38fe36352e1498e12eb56652e935cfeeb9ce6af5711bebe7844b1b7ba16864c8dac3c3b5f2e2bd6fee86de38c7555d5796940b834ce1ad396f5d2cb536e";
-    sha512.source = "56584744fe5700505608c6ced57fed83fa189c9e755b63521f466f40e1080a35032b007831316e4b080cf93ef36958873924246a4cdfe2b0f129effda75380b6";
+    sha512.doc = "c03ed112dbf25d85a6782c1126b27e19f5f5a6d8bf9db7365927c9f26c6b5e78e0a503a67ec08f47973dbe2ad9783fe81074401209aabd30c52132854eeac5bc";
+    sha512.source = "9acc0cbee2928ecf4b631869e6cad9a47f96eb44abab8cadc6b5e26a9468a23cdd313d173b01f671631397290857dd062a31480ad64bfac856b7ee7c7324b94a";
     license = [ "lppl13c" ];
     version = "0.1.0";
-    sha512.run = "3998cd5515ad43e559da91bd1f25b835743299ec13fcf22ee9cb3aadc44c285f428ee701f5b27141c4d03c97b31a31e8620a2911854a1781ee5543a99073fed4";
+    sha512.run = "91143bc55d0a0b34c889991270f2a601f8f0440a0dca5ef9d4a2d04c28b014452933047b2fb96fc5ca0cecf7e32efb0daefa3961757f944a3d4c99609db25108";
   };
   alkalami = {
     revision = 44497;
@@ -908,18 +908,18 @@
     sha512.run = "d05513d484f11a9fcb5d202d02e7ea586cc82c44abe0488294e58c6f31185b083026bad3f17186ff03456481200e05e2ec4a7a7348f6b8fa4e952702b15274eb";
   };
   almendra = {
-    revision = 64539;
+    revision = 77677;
     shortdesc = "Almendra fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map almendra.map"
     ];
-    sha512.doc = "477d5d068353d06e591af13e7e970cccd3d5229765f89150e4d9bb5f1de2b0283e4212bc475fdd6771f4e33f046a3e64dd4ca794c3691af95f7e36f77c7eed76";
+    sha512.doc = "4a9dddf791b7e08dad44b9292ce29ec7bbed3c1a47cbcd23a1eb3dfa0243812da2ab25b90e433152df61b037b0c9a574aa3d499b66caba0ae32d656e3ccb34c0";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "9bfdffc9a634df297dc9b5c406c0681ad78b81619900126110b978bc5a7a2ec0f91a1e351100281c794972d87f33c7088725f55928e120a743001080887ad4b3";
+    sha512.run = "a52179e9f11294de6c1bc5d9ca0f3bc0bef1d012c8534d51d9cca90369747117ce8ffce3f29d88953950ad3c87ec5aa5e9befab00a7f8fbca0d6e4c3815b64a2";
   };
   almfixed = {
     revision = 35065;
@@ -931,14 +931,14 @@
     sha512.run = "1a5e41cac48a33c4336fe03576c49165b47a0bec606b0a15a3563922b964a9a3c2de735cd88cf10423b054b5131193441fbcd64fb2edc47d4944ff33cf6367ef";
   };
   alnumsec = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Alphanumeric section numbering";
     stripPrefix = 0;
-    sha512.doc = "ab07f751332fa0ad974e6ea84b10a0249e5bbb69e591d1319a8c5d743f88d63ad9a7c72fc08fbac95e3cf950d090313dd758ed8f604e209206f873c5f0f70880";
-    sha512.source = "2c978d1dc9dc7f6a0f91d90102a37a2c8bdb78a19d7211d179b04ea448bb56baa451e09f945daaf3f219187d39f5938a7c003988fbc905b692931c9cffe465ee";
+    sha512.doc = "5c708ab82b8d3ff7273d9fe53155985ad64926b8ef676920ac7c23a9eeafa7aaf6d1f50904b51ff9da022717387b97f547434a903af2af8d2a5ed5e2cd3550ac";
+    sha512.source = "9341f21f0a0e2bba4c90a4cd79634d2fb658b8de61834df1582df2ba9f1c2f519acaee0fa3f6d07daea657abe02d2eded75e71b6af3308780154fd40dcdc5a29";
     license = [ "lppl13c" ];
     version = "0.03";
-    sha512.run = "d61adf9c03ef9f0b5d68325b435d5145297d85fa04a5bf106de50f58c04c9507eb63fb17070e955e7f476158419a802f0f18d2cd97ca93baa7997c2d57def479";
+    sha512.run = "1adbe0081648be04e479269229a246fc41f3e9002a5465adafe15ca096e36840c0c3debed53afb487faa5b622d763ef85ef3068225b3d6e879bc8f46692b4581";
   };
   alpha-persian = {
     revision = 76790;
@@ -950,14 +950,14 @@
     sha512.run = "ec15167282f06e7a980e7fcb1e7195ae4a792b52beacf20b6306cf3f98233d5fcc42f3644baf18af39415dc7491c8809d98054e49ef4df28118e490a52d74290";
   };
   alphalph = {
-    revision = 53087;
+    revision = 77677;
     shortdesc = "Convert numbers to letters";
     stripPrefix = 0;
-    sha512.doc = "a098159842a9bd47e6da930af94cf365629c72f539fc3d045fb33b4bbe2004468fc690564850b67549b3eeb2265134c92aecef65b47d16da732bcc5aa93d26dd";
-    sha512.source = "34e3c847a63de5a6e6dbea406e79fe0715a46c746f7113a5e8651838499c1d8b0a636c0bf138a1030c957e2e7cd17f848bf2285109642686f56ef95d18354717";
+    sha512.doc = "750a5a106ebca8aec546f7b6c2d8a8cb1540a11350daf73cd97182d10f0e9a19fcc36d58228c500d330abfc8773de3fe5ed7709b559c58a14af7966f7bac4c45";
+    sha512.source = "5a31300be06a77b019f200b4e5d72dd8576a7bc6526e3e1a23b09c707c8038dedbcc2412ec519716125e55f017eba7320b8b6f30ba560bd1558648fce5cac71c";
     license = [ "lppl13c" ];
     version = "2.6";
-    sha512.run = "de17ab4278afc9fb308abc23c19d4d1ce117ef3b66a21b748c102b95722d3395016682e9508e135e2b01bf4ff274964df0fb723ba2f92c81873dd58d73a3a733";
+    sha512.run = "eea6447a1e3aeabef536ca13de8514eac56df1bcc081c7c4bf11997e69d251b451dbfeb477e92ad7905991e2bc2f4ec717873c3ed1dd2486b3a4344dacbc7266";
   };
   alterqcm = {
     revision = 59265;
@@ -1016,34 +1016,34 @@
     sha512.run = "9fb76037c976d48259609295b876a256e5b72e611c7ece52cbc39b7df607d58a90ce2b0a0ff33d816c08f869e911a2cf979b8635a044697af8331d8769382be5";
   };
   amsaddr = {
-    revision = 77542;
+    revision = 77677;
     shortdesc = "Alter the position of affiliations in amsart";
     stripPrefix = 0;
-    sha512.doc = "555f8ce0a08389d33f56906bc4499723c4c422ccd7d89fac66f63943246a162bf0038b0a420e6ca02ab9ee91c8fb2187054c1be9f84c442fb3e6c263fea8d69a";
-    sha512.source = "8c96b74f7d98dc0f21280b6ab0b20495008de0e6ffaa5402e090bb7fb768b568b4faa12efd98797da50331eacac492af08f545162b67c163e78621a13c57faae";
+    sha512.doc = "126a63d9549e860c19f487d8b01df3bbdee6d1ffb3afe76a31dad02dbfd6243c42c90f8c81883c9c89e9991e516b89bc0afe9a3771addb3e3b4938add1916523";
+    sha512.source = "68f2108de1a96ba98a522dc81b5c1e28814195b327ac7bb21bf564537a38b036124341afe0f1bc196f45ad23e7de218fcf823ae09c3a2dc4604769c953b644aa";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "75e4aacad792acc8d0fda3bf01b39999075000f21e81d2c2595408e85e80c9046b5c61f761423cd796123c10cf756f3782ad2a7524687d1e9a3b69803cb59f89";
+    sha512.run = "289bfe3665b4eedbf5b366471900b687df037d84feaeb5354662c8801be3087aae36f0fe24df64e500a763061a12a36c3bd6c8e60df1132683474c1e221b4a2d";
   };
   amscdx = {
-    revision = 51532;
+    revision = 77677;
     shortdesc = "Enhanced commutative diagrams";
     stripPrefix = 0;
-    sha512.doc = "65d6ea09c1bec56e5082d3521e1eabdd513013b0606f6cfbd0f7c7566795b8963dab6e9f3a46cbb6d008311e7ee3701efa345ef5dc780a3b18f6f4842d97594e";
-    sha512.source = "94751d2c3f617710b50807de584cf4c4d7c8f1ff82a1ab14a5bbd8b41fb5828b0a208e20c131a0aa023a1c8afcdc3d4b5e36b2df99f76b260ec2d9509a941f76";
+    sha512.doc = "5219f905796e3a273f566013057d6528f44347ef4699149e4372373ff18395d0a76fd6265ba4ce823f47bc399c78f8fd1c797dc14b64a170a660ff63b7918888";
+    sha512.source = "5b3da1be64910284c179614514c3af37f225f70a987721be7c8059f3e397015c4787bcfa3e062560f0927efeda5b2d6073fb042c9fb05529585a198dd8c1b571";
     license = [ "lppl13c" ];
     version = "2.2x";
-    sha512.run = "6bdebfbe4985eea23ce24db5e0e14162310d81efab18a7a820fe819bd51f839b9deca35b94740f038ae80084f355e5e800fd6e681d859cb7bc9bb8886993c33e";
+    sha512.run = "eacc870d8ce05ed88bbc05023e74a9cb027c93c9395c001d1eb0db269914e6e88ce3c824d0f453aab448d0bece3581901225ec495f9d7194301fbf0d3dad9245";
   };
   amscls = {
-    revision = 55378;
+    revision = 77677;
     shortdesc = "AMS document classes for LaTeX";
     stripPrefix = 0;
-    sha512.doc = "c2e563bd239f36b0db3bdbfe1ccb4a0adec0c22af25b557ed748897a99672f05f36f2bba6e51827c6fdd60b351079809b15c0367d075566c5e48682c23108fe2";
-    sha512.source = "7a96a464f9826a515191174b6e33016c7161c7547ed70ca78cac256cac68b4340a2b3bd9608f79df106c3eb2383b8d6895012a2cc6dee0c76d53d116679f4c6b";
+    sha512.doc = "3be0c3e29d3f0407602b65be73ac34fbccaabb1885dd0d58eeb7b092edcd5dbfba0944eededa78c306ec798b3aa653fa389126d8ae391d69855fa6d0cbac05d6";
+    sha512.source = "7d989ee4c11b6945f395c08452b9e184c834fdf9a8e8114130ea85eb92b0953654f62f947838b750859a298384387875668bcdac5e9b46af16092c5dcb319fe5";
     license = [ "lppl13c" ];
     version = "2.20.6";
-    sha512.run = "eb39dc97a860047d764884663a1f541aa95a2d559dd55cb25f6b7c6c46617e6c33fe55a9fdc37b211c613333911df6e260768f43ae9630a208ecc7fb774891e5";
+    sha512.run = "4cdddd807a88957f9c22eec97c05414ae3841eabbeb23e7aa6e059d4e168454051031cd23870fc17739fb8fe7acdd0199668d12cbda6ba24af3b5e79f3b77b48";
   };
   amscls-doc = {
     revision = 46110;
@@ -1053,7 +1053,7 @@
     license = [ "lppl13c" ];
   };
   amsfonts = {
-    revision = 61937;
+    revision = 77677;
     shortdesc = "TeX fonts from the American Mathematical Society";
     stripPrefix = 0;
     fontMaps = [
@@ -1064,11 +1064,11 @@
       "MixedMap latxfont.map"
       "MixedMap symbols.map"
     ];
-    sha512.doc = "fe0917bf9d65d15155f287626edb17d692db7ef2e888fce30b867bb0c873b0166949b3b5f3965f70b6b237d7b874a7fd3411e53b87368acc7447dc0e8bda55f1";
-    sha512.source = "4145ce58620f84133e8d7a7639fe376631c92398161283c69c9d1119c14e4d404ed067f2aff2fab7cc0c2249d1fcdea81591b45a1cc72bc08835b99ac8a5a6f7";
+    sha512.doc = "3ce2372888b1fba3db400de9cf9b3073b75825bad1c9040cd692ca99e343335f00a989ee41b083a079a0f75f8f9d22510df028813a7c69de141a4b390c1e2871";
+    sha512.source = "52a2105cc7e1ea442fc2c35d185b73c585b67766950fcbfe722091c89b74c6e7ffbbce30870ac99bacdb8d829bd882ef89a150affb63e00440df337eb9705e36";
     license = [ "ofl" ];
     version = "3.04";
-    sha512.run = "6a9f80bc8b6b2afc3ff6ad151a290743d37e10ddeaf7efa969f3fec40cab0492860496c7bf0abeb410124aeaaa15a53640017c8d12b630e68c59dfe186519e52";
+    sha512.run = "6f60ae687e26b34e0335565453246a8850fd1a254213ca2adfdc281ef2496cf291f04ebfde2966b01e9e57d98e13dffac4122ad1b3c9a48d381f918eb52f9336";
   };
   amslatex-primer = {
     revision = 28980;
@@ -1095,14 +1095,14 @@
     version = "2.0";
   };
   amsmath = {
-    revision = 76708;
+    revision = 78116;
     catalogue = "latex-amsmath";
     shortdesc = "AMS mathematical facilities for LaTeX";
     stripPrefix = 0;
-    sha512.doc = "7d666764ad95b80508cae41f561296f17fb05b4347641f39e442f1632b046866c8f14833a33c3fa59039fc9b6980f9f9ca08ce0e2405b97749cf5232212d387d";
-    sha512.source = "3bae51759ae9b67448b64bdfd5d3ec5be62845d444942454d86b2f4b8e23a31244c7b5807270d29ed73ec21c6e805601dbb2ea71c23f0ebd64937170b73ba185";
+    sha512.doc = "c5b648ed376420b2e2e3db67f1da26d6fa1621fac55c4d3abe68b51537a10cecc4187fe19defde39e7eb9d23aa7c580ddf5307e20e698949de06b75493e47673";
+    sha512.source = "13ee38fcffb961cff50da9966a752ddc8741900cfdda382ea6cdf0a9d2e6b39f39bda37eb450f92c16415fcd06aa03ca04a943dd9f94517bbed37bc5e55c20e7";
     license = [ "lppl13c" ];
-    sha512.run = "55d4a96451734db81262232cd1a897b0f5ac608e3f815766b31f1b294de3b8e33f2b083eb5cb1eb1c1f664a1632d5dd25dba95e934f4a31abf8c2e1888fd0d48";
+    sha512.run = "45d5b1dfb9e80394c331b727117d84fc12bb1a4a9c0b934f2dff29bdf84d9d0ff30557e0cbdde479461c579a3accb86c47c44661108871a744191291fdf7df1d";
   };
   amsmath-it = {
     revision = 22930;
@@ -1112,14 +1112,14 @@
     license = [ "lppl13c" ];
   };
   amsrefs = {
-    revision = 61937;
+    revision = 78116;
     shortdesc = "A LaTeX-based replacement for BibTeX";
     stripPrefix = 0;
-    sha512.doc = "b704ccb7bf8a49c141277b240e08ed7d22c71bdb91d625997a726b25ffb2e8f494637cd9ac7cee031f9b45476006441190ba95331e32c4ad3af4e25ecdcc6f6e";
-    sha512.source = "81b8aa65cc79f08133a6390915ed7753db3439448b608ce04330e23c849f876ff2242403b9bb3e08b9642cb0362732adbcefcab9640e75260548dce3938baa25";
+    sha512.doc = "3d3059b9803d416aa8efce585aa907660a996cd53f5485e6b3abd2aa2c570d8c2e394d2d0684872207b78d6b91bcc3188e6fe3f457434e51be507d8cae47edc8";
+    sha512.source = "451f136f693aa7a99a15ef14322ba6a739fd097cd3ee9d20e1042838bfa517a29fde3bc09e3eaea67f85eb08bdf5b1eb76b8e851c2c0084da70757aa88f3a2ba";
     license = [ "lppl13c" ];
     version = "2.14";
-    sha512.run = "01416fea668e3717b14086199280582d7547cc7c555e19d2f88b7ee94dfb6863719375a140feaa5ecf7461c6d6c6f0ef52bffb544ff132b34771f11556ecdf09";
+    sha512.run = "1cccdf756c4cb3ead572ddb8b3490a03c6baf2f6c26f49b3f8822c004b3c0e87ec0b6af857327bc809d87f99739107ca579d0463018fc96c525a4fc1c8a628a4";
   };
   amstex = {
     revision = 73848;
@@ -1164,19 +1164,19 @@
     hasCatalogue = false;
   };
   andika = {
-    revision = 64540;
+    revision = 77677;
     shortdesc = "andika fonts with support for all LaTeX engines";
     stripPrefix = 0;
     fontMaps = [
       "Map andika.map"
     ];
-    sha512.doc = "50684857dc25ad942aff18eedec04c9e27e4e408f748c208f8527c5096e600d26769ec6f82e2f02e72ab472dfb662f12bb009156293a12daa2dc0676d63ed446";
+    sha512.doc = "69d129d9dba71bdad4560f209d35c719ce75911a265ef6a42ade70ac9f76465665e17877802543c6e22f822b266f6bc58e95c880e1074e670b349f799f8aeff8";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "6.101";
-    sha512.run = "4da9904459345033aa87deeb0019c8c4a39fbafcd59d973717ed2c4a410ece528944c69669b6a5ecf6ef8bb790f60bba909468e001485c405e7cf8775b7533e5";
+    sha512.run = "dc16cd14a8792432ba0851e5b9a1e0f3b9a573c8d010c95ef1b2422c169e303e0b057220ff869ae525458786f6e9a845c73ac2b263290518aa5310e1dc12b159";
   };
   anima = {
     revision = 73126;
@@ -1224,13 +1224,13 @@
     sha512.run = "4d4f64f6346eaee14dfe509857d2a592da825eed9ccaaa1a9c2cbf3a4d4f750441392d703c9c9665c88316125bc37192c0d6869f3e2f5274e7f80699f8c553c6";
   };
   anonchap = {
-    revision = 17049;
+    revision = 77677;
     shortdesc = "Make chapters be typeset like sections";
     stripPrefix = 0;
-    sha512.doc = "087db509e1d9649176614296f84fefe9b726dceb3ac8cb6eeecdd8a6fdb03dc97433c31478638eeb6f5f7cde85b8a8a693fce55ed0b3f5aae35a075a43e5652c";
+    sha512.doc = "3eac7a81b95270069be3e1f1561812abcd900b422f103fc276def4aa49f39e922813ee8c7a74b31aa09dcee359ee1465a8327be40e4aca37cf40538878fba027";
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "4b84d5260c0986191fb4f2b560c386a806c8f93c76360a8d93aa7f9b55dcf089d7d03ca946143b52923130ee751fd47f1ff59908314297fd752ff5fbb17ec0cf";
+    sha512.run = "ebf9e7ad8015cce657aa507df19640142ad619293a08adc5f16a56bbbcb2e178a70a99a9769f75a49d83ab541a27113e80cbb4fa35c8a865ef656dd38e05cbd5";
   };
   anonymous-acm = {
     revision = 55121;
@@ -1255,14 +1255,14 @@
     sha512.run = "105334748bce7fa8a78edd599d6a8466729937f0008c479213a4d3d4b6b3e24b91bd1e124d0e3c1354fd68f99fdf621538696ba9b32ecbf09f5c7202b0b34997";
   };
   answers = {
-    revision = 35032;
+    revision = 77677;
     shortdesc = "Setting questions (or exercises) and answers";
     stripPrefix = 0;
-    sha512.doc = "616569a8d972150c0a1da86625b580baaca642bfad773e9e2240f74d33ddfea203b4c7349660b996adbf8208a92b11861d3f1a42ff88c68f39efba0af97ffa19";
-    sha512.source = "ab865ba5abd9be86d4056cc33ec9436c14cbc0c308cc68d9a6768c094b84dc1bf785bc78c84e1f286e9371c2118ae3c21b8f57d0b4406ba6c2130f633ee6ef09";
+    sha512.doc = "10f9e52fa210828921986a68599564e865a80a89b6063cc58f016bee4f965324060e4f391f5fbdb60651554472e8375a5188cb937b80efa654252805504dabbb";
+    sha512.source = "a36242d3cd77d7d347781c3f2294a938d271a0ff4533c43706cbb95f100a0b70d79c842659fd450e364adf449ab7f4c39a9c312cab5c41b8ebe42ef46a549040";
     license = [ "lppl13c" ];
     version = "2.16";
-    sha512.run = "89f7fa19dad8e94b57a66b53b72578c277037c0c3a9fe008d0802dcdedaea03f01c6554f4c6b80fd038ebc4f18e21bad3fc176f4c4acedae07d9acad2a90700e";
+    sha512.run = "cb026f102945f12543c687ed342a9faef202cb92fa6c19e25279bb18c6e1264ed48c5f9cc4248f07ea522da5f6ce2649baaccabc69033aab76b1f67973a551f0";
   };
   antanilipsum = {
     revision = 77161;
@@ -1309,16 +1309,16 @@
     sha512.run = "af2cbe945ac3495e94fbf69797c05d9a7cd8c3874148c54c602a4a152c669638cf7a861949a3cc2d08aa21f378b57beffddf2d13e3afc1157c74472c348f5405";
   };
   antt = {
-    revision = 18651;
+    revision = 77677;
     shortdesc = "Antykwa Torunska: a Type 1 family of a Polish traditional type";
     stripPrefix = 0;
     fontMaps = [
       "Map antt.map"
     ];
-    sha512.doc = "00533390612e68b48dbbe9c1ba11e46a0e48f8b87cea8f6623267d53795ee9170daa1f34adc8cde12356ef779990fcd7fe7a10b601bfc11c9a0f590b5a25f3b2";
+    sha512.doc = "9ffce8d8a435687cf818a073ef4084dd46d7491d27318e84d048e0597b92066652e192ff52b22b881a25f37557dedcd4abb173d5bc4119fb5ac57055797a8b06";
     license = [ "gfsl" ];
     version = "2.08";
-    sha512.run = "c31e92701d14e0559ca1807389d3f1d95a166e9dee918fc7218ee671227381e3c37a991756e9c19c7e7d3681597c3c012037a74249c7c8eaaefc7c8a3bc2fc36";
+    sha512.run = "0d630e41593f4a3d6cd2db37b68d3e458cc668e98547d7784c56ca8177e3b0545e1f305204cbd9cb15c14b1483a619c4b8580869cc03197f5ca3521201e6852d";
   };
   anufinalexam = {
     revision = 26053;
@@ -1328,20 +1328,20 @@
     license = [ "gpl1Only" ];
   };
   anyfontsize = {
-    revision = 17050;
+    revision = 78116;
     shortdesc = "Select any font size in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "9003fdbf712448de70c858eba74f7de79e0cb83e8f9fe72d9c1b71869161d5a63099473c4f9ec670b28b356ceccd9b56110a1724dcde3062ae209a678f5b0e16";
+    sha512.doc = "705b8204df92c1e2b17f77b8eda9929461f1aa22211388f4e53d895b910daa5d0c86b262b69f42c536df16cd29541684a95b66e3a4525bb8a290e265a32a4796";
     license = [ "lppl13c" ];
-    sha512.run = "31d1c235d011998043663bc1f5729bd40c5b90996627038be612115daef2b3526c9e616b16c251d6b653d5bad82beee62a7dcfc3b8c10feec0850729afb294ea";
+    sha512.run = "48bd003812e0f45cdc2427fde75372661ab093081fcaa4fe5c16c357dcf897497e76123aeaa1bbfddca98976e9d51c6eedce021d50f9d15979da13dc72d04d4f";
   };
   anysize = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "A simple package to set up document margins";
     stripPrefix = 0;
-    sha512.doc = "96591bba808fc91a876dd49a6e1ede3b679c18952244f14b07e992b40d20f6c4a0f4b4dad00a409c766c5f2e883fc4923c501e65b06ad93193719001c2629f08";
+    sha512.doc = "42a73400f2c1e859f77382f8842d9858617b966f1c6e2e9c22d0f01c55271e67955e2b04b5e18f56f571630af04722be097bd2678e42c068ada96999d71c78ef";
     license = [ "publicDomain" ];
-    sha512.run = "4439be91f8dd82cdc051c519b5bc36fdfb632cf09941f4e6ec92fa77c2b5f4d767c162018fc9451d48ece17e9cbd5d7d4c574eacea78b8f92b6e07d40d7b590b";
+    sha512.run = "c417b548b64d7e4a6285d6a0790bfb6402e73720a59c53c73963ce939def24f7a268f2fdf1a8d89d807fa32644d2f105fe21fca351309a7cb1937a2544dde0f2";
   };
   aobs-tikz = {
     revision = 70952;
@@ -1406,14 +1406,14 @@
     sha512.run = "48765b391fc91c657666a94c4e903b3e3f93f0620ab561e6e7a29ce1c03ec52674f33dc314136a0ed35e2cec427e94b6365cfe64b1d50625f443dab6f20eddaf";
   };
   apacite = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "Citation style following the rules of the APA";
     stripPrefix = 0;
-    sha512.doc = "6cceebe06e75f890d9bd51c8b68fc30362dd8fcd1113d2806dc94b7b6f88d25db55db3bcac31c0fc6f3143359c30924668df1e4b8e26cd3e808beb63bceb152a";
-    sha512.source = "5b045c4d6862f1fd965bdac5269d82e0621a28e90032cfac1c060b96985ad1a143ae0463bd85b225ca140a1e9b8981227fcd9ab43e655e89d7c58d19489999cc";
+    sha512.doc = "ca347c1d0b1b73fc76a728afabbd1e2ae042ca9cd1f1c8c3be3b15d8f41234b513bd76dd19687d23a6e9bd36e7a232f874cdbfdb4f35524162fc04c3f76da383";
+    sha512.source = "8cff510dc45fa6cdfbc0a5dee27ce0834a44d2bd10cc47141a9e4c2d11622c542b1e927cee2088361b19fa4337d31b24fc6f5a8e26c931e209f531d5e61c68b4";
     license = [ "lppl13c" ];
     version = "6.03";
-    sha512.run = "24a1bf0bf4465e5e77bc34b734ca6e4b4e7a47696942d20b33f77a1caf74d25b78fb9ff6f48041f71f7e9e36acb1a440bacdacb2c9f667bf989cbcf70a035536";
+    sha512.run = "0a5beed819bf20ef0dd479cfbf778a5fb0994302bf91c3a9dced6356d3b46c6f471b1e76cc9fc80c354abce9021bc55bb2727992b3365cd39d51663fa9577edb";
   };
   apalike-ejor = {
     revision = 76790;
@@ -1449,23 +1449,23 @@
     sha512.run = "2e155193dfdd3c88cf336cece23bc6b393a81529c31ac2535840a7c4f4a97530d35d0f4ae964e8f92856eea0d54c356e8bc15427918ba0891730827a3ba561c6";
   };
   appendix = {
-    revision = 53718;
+    revision = 78116;
     shortdesc = "Extra control of appendices";
     stripPrefix = 0;
-    sha512.doc = "f4e90fc9fa5ca89a9a20ceb56cce788984f3ce5e55f92c99de966a54afca7145d9e3602c4e514ee6b7887b3ae9f8facc9b3191ada19514aae7c7886ae2984b0c";
-    sha512.source = "7e7222abea6401b749f2019fb205956c99bc3ce48134138862caead25aadce25410ac4fdf9ce10e34dbb802c07e5fadf8e4facaf846047ea654f2605b4f3743d";
+    sha512.doc = "80e6436ea111ac8b2b97344563ca58ba04a3c07f67631b5d25ea68efd7895e9793ccfa68cb458ac744be7f0e04ca9df37040a0bd41bed9e827ceb138d2ff8e09";
+    sha512.source = "995726c6df437c8da6000176c37591c29bf7e71e2296132ee0a9cd792648e4cfac1624422bc6dcfa1b3d63c32e41d61eeade9eea599504ce0ec7044253de1df1";
     license = [ "lppl13c" ];
     version = "1.2c";
-    sha512.run = "efaf48867a45f8365755224123b9259f80f49417c409698420d67670baa969d5d354df1429fe7abbd87c29a8e89a9e084cd75384310a44d61e1f2fb7a2650977";
+    sha512.run = "4deeb6d4cef0b92b2f527ed009eed93ab8f8fb7daf8cd0698fb5ecc73006249ef04d72f5d8a9f0dcdf21181350d4de8501b2833a10c7b69cb5cadbdd3c7de355";
   };
   appendixnumberbeamer = {
-    revision = 46317;
+    revision = 77677;
     shortdesc = "Manage frame numbering in appendixes in beamer";
     stripPrefix = 0;
-    sha512.doc = "58b32eacfbcd8e024a4cf3dcea0c1d057010dd454c1e54b6752b970a3fa1a9e10eb15d8cee9dbb9ae032aaa8b6c070079b112f5a91b1c9617df40877a4a3454b";
+    sha512.doc = "1b1b90cc5711af72e519cb6ca34a442d8f10757e3b87b8569c418c7e42da4549efba15de5458582220fa80ae58bece73e8af44a7b579133125c18ce5ba385063";
     license = [ "gpl3Only" ];
     version = "1.2";
-    sha512.run = "d5f4573a0f6c31be7e910512d86ee0443e713abea11e71694b58f1d1d65f4249f967aa5b873941e1d8b7686d408f411aad1a76009a3bbcb528693ae14dc60e63";
+    sha512.run = "cdae0bac6e930b124bbee3ccf111f89be74689077fbd0ab614c9ae7ffd0e9e83da45081ad6958bf2d342d40887e74f1e98b54564bb4b47e31c76c5429b74a480";
   };
   apprendre-a-programmer-en-tex = {
     revision = 76790;
@@ -1483,14 +1483,14 @@
     version = "4.02";
   };
   apptools = {
-    revision = 28400;
+    revision = 77677;
     shortdesc = "Tools for customising appendices";
     stripPrefix = 0;
-    sha512.doc = "74ce416ef14978e0418754e3d2e2874ed07a8fbc6be90a1bf7dc492f191546407d7a967efb1306481d1b88ad296faa1194dc4da8975f7ac0c4e4053ccaa1444a";
-    sha512.source = "ffbce0419baaf512bbf8aafae3a8bdae5456f9ea1699cb48b6ce215fd8c4d84dbee84399e8799fa5ca161a1e98375acd16d196c9ca6c505c7923aa7fab49e0e0";
+    sha512.doc = "37dc31b21274d6dc4a4d98d449dc86bfecfbc1e68b914b598f123a43aab9dc854ad815684b8af1c8639760947b0d440dc9ecfb6f099ee69d2533b61f5e61f211";
+    sha512.source = "d42e70f57577a42cd6775d9485cad8350e375705b2b8c2728818c7284e44b18089c8448483a92660b92f8f3a402a73f257ab71d2bbd0b9d66c5072735b019fa8";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "05d243100c9fc575b7828e0084822fdb2c655f5d2d7c51b42aa3c5ee4d127f62f714affd1fa8e94b7c0c322b57a9fe1728d1829ed7f18d75b5287a673d580cc4";
+    sha512.run = "01834f822276262a1131c1e8f15103098d731f1bf3ebed7e0bff6aaf08b7b930c337285ee4ecd27a4ece360c91bdddfa3500365028c93d7e5464454691ac0b13";
   };
   apxproof = {
     revision = 76507;
@@ -1503,16 +1503,16 @@
     sha512.run = "88768ce45319a5778a93ca6f5e35cc26e1f6f57122d40cf0d2ebeefb6d2253b67cfcc35fd14594ece0048a6a772818ff5d00dfd122f0940cad0f65f29998cf00";
   };
   arabi = {
-    revision = 44662;
+    revision = 77677;
     shortdesc = "(La)TeX support for Arabic and Farsi, compliant with Babel";
     stripPrefix = 0;
     fontMaps = [
       "Map arabi.map"
     ];
-    sha512.doc = "c851b0cca46b11d7297a03488cc72adafb6409e0406de809a1a18d4993068702f03e17cbeda1399914005c9885108d747c844719764145c746b2a0ae45d9121f";
+    sha512.doc = "80da9a5ba4dc0c9b9e165e7af71c79794b75589c6ee142fefb3afdedafd2f2f4767834a6b5e0bf504c282b08d2ca1b4e039fcb2a660173b409f544c8b56ec19e";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "6f59ea8c986078f388f4c8f067b12863422728cb1a56464ece4d793189bf0e6dcded476a3b86317c2bd5f9b4b3cbc475fd748c2ab9bbf60b3d8c8cd4c162ea62";
+    sha512.run = "a0ad47b8c0072aea344759a9e6e8f3d0c9810078e47a081e95a20d06b43128db208736086637b5af882a4a5e43a07dad8170ed52e46a644c6bbebcf7980862c6";
   };
   arabi-add = {
     revision = 67573;
@@ -1533,13 +1533,13 @@
     sha512.run = "ac60431be9ebb42e2329c954805ecaef988bb6724eba7638ace659a973de3de9dbffc9ee85b2847531c3fca44e97e7099b1d9412ec754d9d27bde1432480f133";
   };
   arabicfront = {
-    revision = 51474;
+    revision = 77677;
     shortdesc = "Frontmatter with arabic page numbers";
     stripPrefix = 0;
-    sha512.doc = "64eb067784cdb56915b45e80f1666347bcdde06e3711a18cef16ae92450377aed236cc32c8c10d467d50e77de31a3f599abe900f411a510574378e63eb923862";
+    sha512.doc = "25d5cd45c5b69bc23e31a50114fa717986d28198df528951dcfa912c998d3700c0d98493926687ef111476e69540cc227044596de6dfde4a9552ce1451dd1f59";
     license = [ "mit" ];
     version = "1.1";
-    sha512.run = "efdd3769bedf8ececd7f71f6a918ed19f66caa78b348238b34e554698a5af6ae5616bad5cc494c970cd8e12073f1c27ccd1cfb7ab19ea263b5cf98061c42ccf6";
+    sha512.run = "f668ff1495be4542b34c17c365220ee4d10588187653d216dee52adf2b72ff9000508f6b532977026a8b177faf3c54eec9db00891d2dea5d7a3a4c005b4b4d20";
   };
   arabluatex = {
     revision = 67201;
@@ -1555,26 +1555,26 @@
     sha512.run = "c235430d724495035832ca32fe838ab5d75d48d2d68c6c84965f5fb7e5c65098356513241c82e95b6c6d806328c0272b775c1aca963df02ce2540052d62b312e";
   };
   arabtex = {
-    revision = 64260;
+    revision = 78116;
     shortdesc = "Macros and fonts for typesetting Arabic";
     stripPrefix = 0;
     fontMaps = [
       "MixedMap arabtex.map"
     ];
-    sha512.doc = "a73aed53cc1cf4f5600312f58e0ae8a29c57fb04ebc87b91f13526c780567a5ba076a0b63b0abed791880efccffcfc52bb0f43131da4b8e2a60b48184d2f66de";
+    sha512.doc = "f150cb03e376c4bd9a3284eecdbaa98eb39588d509fdc65480dd3132e8f4d785fdc9539714c132a0c3ff664b832f73a09ac313b5d39eae538966bf344f615033";
     license = [ "lppl13c" ];
     version = "3.17";
-    sha512.run = "df47df09eaf935bd8921d8ad475190fe6651f1cbf198473ee82099242b6f4cd63ae5873a2b2fbd7a75a4f9ae77f5ce3f56ffec0e668fdd649c4d3fe051b2ac68";
+    sha512.run = "6bc8f1f2e82cd5f76f86a4b85ca7bd38ac2812066cd8443e3fa82654321776154dafede287395dc2aae8f63d8393023ee1be2a1d6bf94745ebff6589443cdfc4";
   };
   arabxetex = {
-    revision = 38299;
+    revision = 77677;
     shortdesc = "An ArabTeX-like interface for XeLaTeX";
     stripPrefix = 0;
-    sha512.doc = "0dff3162a710b458b367bb4ca587d525b68ac79d2d3182e8b9d2ca90ff72f89bf69153960400c344511449c52346c329b8a34eb788e11ed9a5319bb6bca89418";
-    sha512.source = "fb29b38d69d39f4c7ed04a3ebb114e49512abbf444f36fcd02dcccfdda22aa3800521c9819696c2828c46983f8266fc00aa59cafb35e26574a3403319d364d64";
+    sha512.doc = "cb910fa658efe1f13d282e891eb00a73d71494d1bae5b232c99c0164b0ce3cd5ddb2bed472880b5d2f9593a6d445185f89322371f76c05a3748904691caa9fb7";
+    sha512.source = "b4bab7ebd19b8ac5af7eacd9fe3b043d4ecc42d37b3439102236b613c5c4b545c121412b51d18dc3f6f779124a5484e9d24a62acf0e8b53ef6d0bc3e2028aae8";
     license = [ "lppl13c" ];
     version = "1.2.1";
-    sha512.run = "7c58bd94b780abc5bc17b4218229d289797a155a8e98cae8e22825dc7d9b12c5514de01b12bf2f645047dafb13b4d519d463f4ced60f7ac53a65c6aa38cbec86";
+    sha512.run = "cacaf33240c87b68ded201172829500618b93327df7b76e3894625872462b216c5524d03a098049743451ffa7ab2d5dae8df35bdc1d0aeb46205f725c555d4ef";
   };
   aramaic-serto = {
     revision = 74548;
@@ -1652,16 +1652,16 @@
     sha512.run = "65737905ba0a6ede74d8cb211b46a2e62b640d1b655f895095ad4bdecefde496368707142143e2f2e48849faa89d86a9e90a0bde64fe84b3c828e14462f30406";
   };
   arev = {
-    revision = 15878;
+    revision = 78116;
     shortdesc = "Fonts and LaTeX support files for Arev Sans";
     stripPrefix = 0;
     fontMaps = [
       "Map arev.map"
     ];
-    sha512.doc = "a8dcb8bf0fff3be9c99550623f12651df09b151d6e28bee03d7aa80c7b0eb8c86603b4d8037232e4998bc5603ab3dd368ff7a262b7c7f62f2903338774a9b8aa";
-    sha512.source = "6c92c2f3ef59dcb93207ea90643d11aa8cf81850e2696414f489c40cef97737d00ee4444893669f12d4592c6573a71cb229c232b62f10db38195aabbe83fe523";
+    sha512.doc = "85e5357b5ed46c00447a941dfe50783878a495cc7a36b16325e670520424c9b0c5f67c64d231852a11b3e1a174666882a615e7ced5f475c1ecab79b972379d7b";
+    sha512.source = "850949aaf416933935b5023a0f3d08dcb07d826385d2ab1e84267449e361244aa5633b3d83b4e3b73ee35d9ea4fab67ee995448e636485059e65279bb77e8966";
     license = [ "lppl13c" ];
-    sha512.run = "8b6e88a41052740831fdfa03299f665fad9eaa0e45d1d235392aa0b849bd6ca03f1e18892c879d3a5289430a5d236b9544d617ea2c3af62a59b38b4d7ff8ce90";
+    sha512.run = "3091e504ef0e6177ad1c33b362f1d90a088cc44d4e6d9d44a2dc189a00ca613e3a446cefd59dbbdbf797e429b702c92d87f618bb544e92b175874866a0968d0a";
   };
   argumentation = {
     revision = 75931;
@@ -1673,15 +1673,15 @@
     sha512.run = "c27b4112e8f01750c4da70a68ca2391b6cd89122d77cbe9e7c21a61a2948ba485d073080dd80e1447818ce5ac0cc9f447f632132ef07d31dd01fdc8d3b596a63";
   };
   arimo = {
-    revision = 68950;
+    revision = 77677;
     shortdesc = "Arimo sans serif fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map arimo.map"
     ];
-    sha512.doc = "dc70491f5b2b5a900f3d6f9bd543974b81976907a7c3dd53fd7530e3d0a6d83fc44a61607b27d9644eeca6f6228faa171916e67fc7517c35d466d9c50a186808";
+    sha512.doc = "60547ee738dfaa30220a18b92ddb39626b138acf1e8780ba4076c9b2b5ca2002dc1cdd9c198a2b639b2bfe30a6fb2b3745c6b3b45ac5e52608d62015685a4ae5";
     license = [ "asl20" ];
-    sha512.run = "3c84fc274ebd29dfa65a8db214ef2ea74bb22da21827844be3b5648b7f10cba81a73772ccffe758b19ac16e58a75b1eb578a0ec8e85957f9693858065665a085";
+    sha512.run = "e654dc251d8c3cfb376bc3c5664819801620a00bccd9808c65df89cd16dd8bb16218a2250fba7ab0377f1bdcb67c72f7f72476434760d14bbaf02a15d603354a";
   };
   armtex = {
     revision = 69418;
@@ -1763,26 +1763,26 @@
     sha512.run = "9c6b32e43ff86bd6f28d23b9aab5dd90a423610b2f3c842462e88985c2ee88eec2e78e05cf3e0b91397009bdd370880df6db642816d7de3bb10a96faf4fa34b2";
   };
   arsenal = {
-    revision = 77099;
+    revision = 77677;
     shortdesc = "Open Type font by Andrij Shevchenko";
     stripPrefix = 0;
-    sha512.doc = "7758f158eee17e5e11c63dfd864903d79c975af4beb0742bcdf8a5b2cacc6a2ef76479f9965fc1604a7615a9a3549a2c565afd45c24c71b5e46897fb955c9a9b";
-    sha512.source = "48136ffab3ca784c7517ea2426551009cf8a4cbb969d9ccf43168692f3d48dd9c23312d03567c2607dfeb7c8fd44cf347c0ae48ea6559dbf216e4bf705334ad3";
+    sha512.doc = "a0162e10558f5e5c7934e48effc1d786055b0c38c7bbf47d7cdc155ca31ffeaea268f09d6410221076712b0c4580cf196bb794eb1b8f6cac62775b41e5e63879";
+    sha512.source = "2d634d30557fcc2411f6887184691fbf45d53fcb2ad9032fdad37b38ff0d9c0c709795ee0fe99ee10f2d22303b673547993ceaeed9ff34297e6c2dc119b27904";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.1";
-    sha512.run = "fd330fba57ed5933bbdfc4e4ee895df1e99f060f685f1ed011a8041dbc3740f5fa1d4db6b6be67ba962971fec734a1b1f0c90ed6448124b9684233ef93ead8be";
+    sha512.run = "4c14f28d07dcf1767e7f329cdf7cdae46bfb630209332d4c641a44af743db83a5528a33e0331852057258eeabf3dbec1e72819647c119c6b35b08429204e8a17";
   };
   arsenal-math = {
-    revision = 77272;
+    revision = 77677;
     shortdesc = "Arsenal Math OpenType fonts";
     stripPrefix = 0;
-    sha512.doc = "271ee2cd71d50c9f5842609f222d54826a70cae93d0e72dbfcc2ec571b78650496852c4828f7dd74e5ab6e47050630d37d1d29bb7df4212efa5f81db4fe4662a";
+    sha512.doc = "924fc153a3ac758bde7fe1a5d7639e67805c5678d0938939ebe7ea9d88f48fd2df05d840918129555e69b65177992d53146d29a19e9656ef1c9e2e76c98997a3";
     license = [ "ofl" ];
     version = "0.9.3";
-    sha512.run = "daa4d4c47d183e6f5022ff39b7565ea66bcbffb393030e38938c5f85d51e2247db6baac7fb0b9050691936be83d72cd4e2b54adc978f1620427e87778795f3cd";
+    sha512.run = "7e39b82fe2bd52b76075826a02a59a08c3b90d4be7cb28de6ea25d8b51936172e86cd2f03ca9f7045f9cde2084d447c717781c513aa0f52559caba95dc950a44";
   };
   articleingud = {
     revision = 38741;
@@ -1809,14 +1809,14 @@
     sha512.run = "3a6236c3f5e07f3ad709c6a5e0f7d2c90574cc897f6f5d470aa1523b537370587b5942e1a8c581fd96e43e80189fb1c7c4a2475823077feeb929ec594a90ffa9";
   };
   arydshln = {
-    revision = 50084;
+    revision = 77677;
     shortdesc = "Draw dash-lines in array/tabular";
     stripPrefix = 0;
-    sha512.doc = "a809e2abfd26b11edaf8a5b23ddf01901f84bbd63b8fed7b6050a4947654ffada95bb697e13250038c6fb93db80dee4faad6d4493f05bb7f4ebb86dc7e9b9698";
-    sha512.source = "0be560bb0dac65951b177a34ba45c8199cbe75b64958b71649f09e5e7be73fe091bef6097a9502be80e26bd415f193e00579925b0be0d12bf43adfc0e3963578";
+    sha512.doc = "35c94ee64bf4f46546bba1e225e89a8710568c4e47eba64875207ed59de9aaaa3dc25d2c3d941e0d7e8d39a885bcd7a58aa746893a505d436b003c42bfb1f048";
+    sha512.source = "dcc3f0034223792b63307d13d5a26406530159d5c7c2fd7483c41e230a4654b8398970b9c1185456de04fd5b5fbd4a5822c34038b90a041e02997fc6262b241b";
     license = [ "lppl1" ];
     version = "1.76";
-    sha512.run = "fd676917ccedc39b90b48b531ea4ec5098b70ca854583a3266d4080dc78f59e37a743e63b738be370cb0ca650594d0878ab1f807eb6f55daec17ecead73aa4dd";
+    sha512.run = "d1bc506d10a366154e54a43a3bbe0fc68b27a8a5928ffae7a991dfcd3a6d4bf1945a662fe59068e793164aaccbc20257fcd6db3573714da8f8578ddd2a6bd75f";
   };
   asaetr = {
     revision = 15878;
@@ -1863,27 +1863,27 @@
     license = [ "lppl13c" ];
   };
   ascii-font = {
-    revision = 29989;
+    revision = 77677;
     shortdesc = "Use the ASCII \"font\" in LaTeX";
     stripPrefix = 0;
     fontMaps = [
       "Map ascii.map"
     ];
-    sha512.doc = "2d681a41d213fe260e3491a3b410239fa2e025ba19894d133a27e47b417ccf27648aa13ae431b4c42549c1692cbe517f2595c2de675b14d9ea0460d469e4f036";
-    sha512.source = "1bbadf44599ad29f843ef17d1b437f951f5b167e9bf84a73600a0a9dc5633d94d76c91ec23493250ac894d9114c1b2d1d1f182690aef5dea92c9ec51c96e69a9";
+    sha512.doc = "17a9d677e182253727fc0555c7a7fa4c28359fbf883f3148432a4b40d5c6d345ccf60854461baeea28b63bff5288c710cb5844d773837f52fa95c94cfb88403f";
+    sha512.source = "245a8669d91ac9e1c8fc2128d7104eb406dff2f4f0158d7c7744933e25653e80749d8d79296508ac2e1671cbed31b1157a059cba5c5a95a7ca4221b6ad4e1a41";
     license = [ "lppl13c" ];
     version = "2.0";
-    sha512.run = "e92e312e38432a7294c71a76604e5a3c2aa6b65937d39933fcbc9fc9b61e00a1e2f35ba739f64c29a3ebf6d2e388cd29da384a2a6456f71576101a1f12e36f0d";
+    sha512.run = "b4f8f444253f6d5daac7037c40b7b5bdc81f6ba058040043565bf050d8184c5dd1273c3a5f3e1dc561bc90ae608f7c8342448cde50088c14e4698e41ad9f9a72";
   };
   asciilist = {
-    revision = 49060;
+    revision = 77677;
     shortdesc = "Environments AsciiList and AsciiDocList for prototyping nested lists in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "8602a9f8e5dc04a6d4a914f603e04ced8f5cef55c5a335087b8f0953d19d4641d43ef732ce299ea18590de89e2360a8dddb44f8ae76be6498ccfd29e4a680746";
-    sha512.source = "562efdf7665916bc124f8d2ada2d7087ffebb23885df6c3baa652ef24b8fb7ba7e2f4a5880922066b9f5c44bdb9c70ea67537c79676c9fb7004d2ce1f6c0d6b9";
+    sha512.doc = "b3b237515fae7891d048dd140fd76226f74fe6a74330950221904ec572b2829c127770009ba33b77ea8478d962a5be5619f1334bef1e5f3c5bf0bd380a69031c";
+    sha512.source = "f7fe25db5bc2c389c89250d56086c18bc93e8b9adb38e4050560323022e27b6d185da2be31aacc49c367f052f3b283c9a99c11be85a4d0ee6189e6443ac76ce9";
     license = [ "lppl12" ];
     version = "2.2b";
-    sha512.run = "5c2e7938a9d2df31477cc976cfb549103c8f378a8d38a3624d3449229861fd834d462163df6e2e1f1fec686f513c6a194ccae9fcd0991820b357e12a1c32af28";
+    sha512.run = "608cc57a540dea4d805556481271e110b0f5aafd191c2a5730cd06936e61bdc007c161411e4d8a1f202c8d5533876803cfae6de32a5dd1bd3c6d35ed83e47da7";
   };
   ascmac = {
     revision = 53411;
@@ -1899,14 +1899,14 @@
     sha512.run = "f03ff628aced70ac2406863aa4b23eac26cf47fa09ee377ba78a8df3af633ac1f3fad8d005022c1555d957ec9d84f98eebf2dc97b296713a2edf5f0060d4180e";
   };
   askinclude = {
-    revision = 54725;
+    revision = 77677;
     shortdesc = "Interactive use of \\includeonly";
     stripPrefix = 0;
-    sha512.doc = "a06a9170ad1637c35a25c9a0d89f3721ec350a0053cb5b85374fdb5cc67e7d4653e75c2a5f9b47d19700e3e9ab2d70e5c0c419f68715e664185bd30759dc0291";
-    sha512.source = "909effe3b7569cdd4a4a1fd7db12cfafab6c1ddc0987709199a051696b447f9b57ea0bece52efc28f41f49e2b81611e14e975cf93a2d5e4b1c202f84b9702569";
+    sha512.doc = "bd29a9eb74a96bea45aeb5156de1f7e1a128227870bcbf3df4d391794421a1a4b3964b64093af0c9ca38011ef248f26b54668df7121f19ab2be3165c78a275ed";
+    sha512.source = "9b5559b81974ec433a5330d22ec4dbcbe138621c2276980dc3d9e5870fdbcc07d7a3d51e87fc24c7ceb6c644903d3a5d48eb285ae855c8de1f4afc119e433723";
     license = [ "lppl13c" ];
     version = "2.7";
-    sha512.run = "828a18ff7c2d997f25b46b9ce8626a749ce1a18989a292f7f44e9eff0c28d5819e6e017398e76a6872da6498a4ff8306d8f8e701b87b80f57f455d28389f7aa8";
+    sha512.run = "e1d7016848c82f437ac288b497dffb87063039b8bd2f6e1ff2dbd20feedf1ff675d014491fc6d33871e5208cf0d16136631ab4353b717462fc3963ba200cdf95";
   };
   askmaps = {
     revision = 56730;
@@ -1918,22 +1918,22 @@
     sha512.run = "0f4d91a15053d40d329744c429540075c33e2098f6d9d07eccc5ad16c5696233dd01de89c61a7090dc127c3730ef04e24f8d56845919cd268ec8c0bc68d9c09f";
   };
   asmeconf = {
-    revision = 77335;
+    revision = 77677;
     shortdesc = "A LaTeX template for ASME conference papers";
     stripPrefix = 0;
-    sha512.doc = "70e3c9ff6590678eaf8c45f99fbc438623a5ce787384817a990021cf2351308b592b4eddb512c303c1747c166ea05a6320ee913fdef3186d1c511bc6184faeed";
+    sha512.doc = "6f414b060a7e4eff91b128266704e841d9dbdcc59cd77f7435ce8e3c5ec0de972bd326f4aef9ae67d38314bacd91f17814a601b0c05ae2ea53b2f664db85c9ab";
     license = [ "mit" ];
     version = "1.46";
-    sha512.run = "6acd5817d32346604a0fcf6224a9c0834622976589a4e78b0fdfd1742ea66012db2c52e12cb7e92443fd39a72ed3dace78a3e8a37b3875a59f915ed5488433bb";
+    sha512.run = "3d3d058f1e9be188bb0e8cae839e2ede900d7ccd29eb27823e7940ffa0d05d05f6404c2fa08c69235ff3cf3d640be335e2cfa74188abb0cea8e3e80b90ea9b25";
   };
   asmejour = {
-    revision = 76996;
+    revision = 77677;
     shortdesc = "A template for ASME journal papers";
     stripPrefix = 0;
-    sha512.doc = "39cfd7b46f046da1f86578bc02a113f07f9e7a6f42b65d5ff7da11da901f903c6fdddb546165cfe9019ea55dcf78d05d900f4ef4c9707e0e08c6222bd716f680";
+    sha512.doc = "aecea1c0500666f2bb4322657f0b9f80d1584a230adae8bf1f4659419e4b35681ead1990a747972c1b3f41c6b40a9b3b54f8442788e8660650413d39af45feeb";
     license = [ "mit" ];
     version = "1.27";
-    sha512.run = "96b43fb96d32bbb21817f5d0f340d3bdffd4cae143c0a938ff41be11c43ce9c714188d77ceae2a4478bfdc6ae8e570cc7387809aba3db13dec8f061974863e39";
+    sha512.run = "48d9b03e54b3cdfeb4f1023b46031fc3b94e7e8a85d12c20cb02da1ebd90691f3fa6a3b56a3091b694523c6bc9e9819c65b675951e7ccf9b5a3cafa02b96cebd";
   };
   aspectratio = {
     revision = 25243;
@@ -1948,13 +1948,13 @@
     sha512.run = "1447c3037f5477aeadfe3e5fe18a004ffa1b8c5c18b7c68295b8065e32c5a3e6a044e7f9868bafe3d8b81e391b2c614e2153302ef34e1e4aabe84c92ada2f129";
   };
   aspen = {
-    revision = 77554;
+    revision = 78116;
     shortdesc = "Simple crypto notation in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "673c833f19cc5f1696b4cd1d0e4cb40c8b19704659b0805af6863a73a88919fe78aee132faef079551f79d1e1b3eab2d0af74ef11df811e7b5124c1f18f70a6f";
+    sha512.doc = "a3bba6dbec8b24c84c0e21e8172a82e439b226b56eba5216b9555dba577ace51561a439997e16539554e34c0762f26f5343d062e9e595950d3836dbfb62704a2";
     license = [ "lppl13c" ];
-    version = "1.25";
-    sha512.run = "10c1548b76a5443b0476d4b40bc317cdc9a5944e8e4cc0dffcdb63191ec1cb7246e1d9e3dd329426ceeb3f580b85ac217cf5acaeae90f7566c88117afff03d05";
+    version = "1.27";
+    sha512.run = "095bfa59ee22f2ef2dd93185529aa3775ec8cf40aad2342f05dfc5a419c0d618010835816ae4e3ad766b0d3407231f4befcd314828876640ac1e63ea906195a8";
   };
   assignment = {
     revision = 20431;
@@ -2018,14 +2018,14 @@
     sha512.run = "f067e6aa1f3cb481e07f59781fb7d4c671a0b21a392ca7830d7fa19ed7a198fefd5ad5104ed3644eed484100871f9a8d36d1ae6e31d55487e4ff2846df618e9b";
   };
   asymptote = {
-    revision = 75712;
+    revision = 78222;
     shortdesc = "2D and 3D TeX-Aware Vector Graphics Language";
-    sha512.doc = "010b8d2647136a7e066d28ccb6fdc83986a9da95692c616cefb234c9e498c8ea53d2758b630cdde1ba0a6eb4e817779da6917ce4ed6dbfb9169ed5dc9c3a276e";
+    sha512.doc = "ea90831f981bb06427c532dd3de099388f40c93158eb6cb72f7a7a4733b8e6c2a0e9bf247fbe0181c3856032c0a86dad0ee82886270d02c89d7e151b2fd8f4db";
     hasManpages = true;
     hasInfo = true;
     license = [ "lgpl3" ];
-    version = "3.05";
-    sha512.run = "4bf16a808fa41bd2b98ffaad632e0554909174d96e4f802617a42317947b2259d6014031ca502d5201f51836675be316f8973f7f39b66780f7377c4819263243";
+    version = "3.09";
+    sha512.run = "cf55453c8f2380c669a4424341b31fc8df375f32cec732a0c7aa72a1e13d6987c1eae134cbae202a521a17aaba8b5a64fa77a2ea8a0d69345b49bb7b565fc4b5";
   };
   asymptote-by-example-zh-cn = {
     revision = 15878;
@@ -2072,24 +2072,24 @@
     sha512.run = "1b3c1a6205308a2e71d39252f1affc1db80b9f17600ffd765b9d8c8a38d5dbbee9edf2ccb78db0fe2ed92cbe047d134b1825256c6725088083b5cf51b871015f";
   };
   atbegshi = {
-    revision = 53051;
+    revision = 77677;
     shortdesc = "Execute stuff at \\shipout time";
     stripPrefix = 0;
-    sha512.doc = "8f6402dd0f36d4cc4a4674c0d0b37f012a7d6e557174ca3b58a7a2b33d89475d1e47028cc39d2b77c496bfae0751275369c5f4f49cf53b8c36fb60fce47a6bd3";
-    sha512.source = "8eee629abbe71332a00a7ffd41f8def262baef4bdfe9e314a4afa90015b30c77e291634f3e83d904646cdbe4820e3c6e0e6398383892ea26f62ad348ac2f3409";
+    sha512.doc = "1a19c2c25145dc074538d018e60074147fd93e637473aa654f7d988da3d231fd29648c498205744881ec9ce70f466310f9d11995fef59cad3f35fdbedff19c5c";
+    sha512.source = "fed07bc139e863b76dcabecfdc3aae8426269a42a28f69fcacb1364fed776eca8605ee425c0bee1e57d52de238da661551656aed335a86f0f624699e2a1f3c9d";
     license = [ "lppl13c" ];
     version = "1.19";
-    sha512.run = "7e03a9a73d8790f6603d53c11aacd01fb7108546e2d3b6ddbd5fce1e42d68ed9c23dfe41794b943eeea67ce0c598851132dd23faa95289789911cd059a8caad8";
+    sha512.run = "2896f2100b4acd735c5333e130ff85a4be52c26746b920ef5900be303bf15994ec04ff94bf17a15008ce46a24556bf1119364d6026a272b119875462247949ef";
   };
   atenddvi = {
-    revision = 56922;
+    revision = 78116;
     shortdesc = "Provides the \\AtEndDvi command";
     stripPrefix = 0;
-    sha512.doc = "d60dae681800be4495c2690f78513475d98a4480364306eb26c16c551b0e984f135aefccdcff549e6702b2b62bb185ccbdacd85dd3c12e5b20c128d9397c0e8c";
-    sha512.source = "a2c6321e825629a75d745f0bd03cab168fb51b5c33d5d256a621847f27ec2010f0331c37644e95b2ee40604d68cf34772a3dde59b6c6fe340713c0e593fc318c";
+    sha512.doc = "9de171ee3edcc6fda465715318a6de8e5bd10d0f1164febf15ce071b58cc97881fd08c2ddf33866e27afc542ec623eafc13e6607716987117fe48b806fc09339";
+    sha512.source = "7433e880aeb024d36045ae6653f0b6f17d7f594c850dd89a2830871e5e66a2e64afc6eca262225cd1f0f680b2bd8da6e84009cd8e584a2d2f51f7aa2aa942ab1";
     license = [ "lppl13c" ];
     version = "1.5";
-    sha512.run = "49b0a69eb308e19e3ed97406fc1ded6e80f15d7787031e2b71cc41ca2e1c74c19d3f3832ae13c5f1af70abf9f2f201c9a7ef669ed2e58349a584ddc767059c54";
+    sha512.run = "9e7b55618385f3353255f7053ab3a624ae4ebd183281531b6273abc597d4dd8bf5fd354449821dfa48de97d53a1c282c889d8c3adbb52084ab50b93a173fb882";
   };
   atendofenv = {
     revision = 62164;
@@ -2102,51 +2102,51 @@
     sha512.run = "04a6c644b9235dce6495c46e2bcc093c03dfadf279d354c8b43b81a0b4a14daae71e7105642bcc95025c55ce92094c01292be2fc379e6c0c720aaa9b5a21ca9b";
   };
   atkinson = {
-    revision = 77391;
+    revision = 77677;
     shortdesc = "Support for the Atkinson Hyperlegible family of fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map atkinson.map"
     ];
-    sha512.doc = "4904a131649a749b09c64073cef0e7c08a81bd3461c84c4363915ed4c1856d724cdc9a502bdd1cd50b6d6bdfe80993b986ed23fdc3b1c5d732fbfc58bd8a83fa";
+    sha512.doc = "399a67546936d3187c6327f97818c9bc660fedb59b1f111af799d4ed4326c463f09feb292e6a403cf841230b378777164f0801e977552c312a4ac1a669a7b54d";
     license = [
       "lppl13c"
       "free"
     ];
-    sha512.run = "24642a75e185b42a8a8cb51d3f09a0f838ba835b5e976441c20aa6ee334f2aee89d4dcce6f4731830c2650618272016bf26fbba064a59a25661feb4f63426468";
+    sha512.run = "798f887139f67d370245c5e53d94404956abf27d16d7317d70f1718f6ec7b3411fdd61a44faab65fdfa7fb86804ddbb0ff448f506eb95414fbb41e882cf0e181";
   };
   attachfile = {
-    revision = 42099;
+    revision = 77677;
     shortdesc = "Attach arbitrary files to a PDF document";
     stripPrefix = 0;
-    sha512.doc = "9f9e6572e70d348e1db71254a0c6a80cfe76b767801a3c18ad4517577b793b5388367b24f311f491f0dde8df38684b3de4a2ec7e6db67f1fc1ca7b4a9ce5ce78";
-    sha512.source = "a4bf69ed370f495f190abaaed8616b4a3ca14184987c6c4882451ec4dd6961b827d3c38d8c049ebe73954f5fe205f727124e447d2e3cf17abe1d95336371b9a1";
+    sha512.doc = "14f4fe4f93c37eb133bb8274eaa462bd1e9454ddad9bec9a471e25529dea0b26504915e175b33992e794d421b5459da2299577efa9e0723d22fc8423ffc775ea";
+    sha512.source = "0631c5bc1c43a094ebd59b4da5080564cc929c07cd6d41ecf06aebbca20336a4abc26b0ae0b31431b9655bd2a465cf890e04b79fc1c0be2d54b63547892d6849";
     license = [ "lppl13c" ];
     version = "1.9";
-    sha512.run = "526a279f3fcb309cb117327f4206e7dce8c49d39b85a846799bdfea5bf453d2f00e14e854a74d544e49fa92ce056cd8ccc7e03f56856a8e8562b7105d5fd19fa";
+    sha512.run = "3a921395523d00dac5a49080eb8a2f15bf479ba8f38d1274498405a99e63baf9fd5a09ed1c211d904256e044dfcd994a8249cb5b487195005a71d0989973a51c";
   };
   attachfile2 = {
-    revision = 69505;
+    revision = 77677;
     shortdesc = "Attach files into PDF";
-    sha512.doc = "423718fc61b589d83da1cc0188667c8253b19d9a255f867a8c8a56e812d2fd04046aa5859657a0af88d5c377dc0b0f0fcb2ae8058e7e69ad9ef2099d0c8a7d5a";
+    sha512.doc = "ae32e1210a8d4a18bead91259570b6922caa9dcf417f61da8d38be3de949dd22a47e895126f10b36f3958e5232bd04e765e2a9133e2fdc94f9531874a21c32b3";
     hasManpages = true;
-    sha512.source = "72f0f9292fe0588d4bb9577e42002576442d3ab19b3ba8eadadb6c874dbace9065a3e74a7818af1055bfa09bc9cd74d734152c95710e3951166eec385414aebf";
+    sha512.source = "9f53b0c4f30257f5675aa64b9b6b73423e3b4e45029787a3ea6629dff6e2bfc02452a03b605439c560d74f9996078fe2d04920ca0ef9d25e01da1cf2f197acd7";
     license = [ "lppl13c" ];
     version = "2.12";
-    sha512.run = "d741265618d75ab69a28983338276abb51382d797664bb9aae5876e054307e438b854b1981245a49b3b00052dfe6144993a465e56f1e9e1abc142d9dc78512de";
+    sha512.run = "ddfd070982d5efd905a9dc3598620ba00ffe0810c5a2fb6ddc1f00baf6713f1bf25f2c0b097f63a821242fa04b84794ea7a9e7b94fd4a9d5e94ab7d4d5a204a0";
   };
   attachfile2.binfiles = [
     "pdfatfi"
   ];
   atveryend = {
-    revision = 72507;
+    revision = 77677;
     shortdesc = "Hooks at the very end of a document";
     stripPrefix = 0;
-    sha512.doc = "4f46e3894fbce05d613cc6cf6f21444eda50bbd13da1b44324ac52dd34d059deba274fd6b0ad6ce993dcd070843972683096675da5069cebdbfa09028ecb7803";
-    sha512.source = "3aebbf9320286c207248ed9c54c8b2082b59f98d9245622c40026e248d7f5d4478bc4ce223b4f2d5b1233e5d99f1d8368d9f04f3e615dc752b398e5c47e459c8";
+    sha512.doc = "96c7c8ed0fedabb3257cab15847b7a1feeb53267ce0ec06927ddfe092cd54161a1f56b62fe2c739bfdd593baf9e047c815fd607e254ac61bf2f6406f767073e9";
+    sha512.source = "67d66faa2362adeed99d46a8a53d3491484c07a19a7a2ed11cb9fe0d3b728c6d6e4a2521c64d744d0beddceca96b06c3109c2a8178851c162f5913c9052a8521";
     license = [ "lppl13c" ];
     version = "1.12";
-    sha512.run = "7ed1e0c2480b592b4b8350274b57bc2b5549f2e971f9d3e33fb2352c5ca7f0461a6fd74facd67b1e48cb4a5fcba5e6e41fe02595b057dc4d1ca76be50554e16e";
+    sha512.run = "d9290c3cd0481d3c22c7c9e6584bafa980d0466d89535694048f89d243cf3cbe029ef75d51f3734efa165cc7150c307542d11f8ca3288ac84bfea52b8c8741dc";
   };
   aucklandthesis = {
     revision = 51323;
@@ -2181,16 +2181,16 @@
     sha512.run = "625ddb6342c2ed4e5491e63ae13619b18892bc5d2cc005aac489cf1b6d193a28acdff9404f51b4cc76e8950ac182a4f8d5845bad85fd4c4afbdf33e7b8c225b3";
   };
   aurical = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Calligraphic fonts for use with LaTeX in T1 encoding";
     stripPrefix = 0;
     fontMaps = [
       "Map aurical.map"
     ];
-    sha512.doc = "89de4991373a50d673f569e72f4727bd66a2b40b385006c3c7e4605812e7f8d3d346e3b08be55241f9926a58b40126d123d6ecea912d09db3973985d0cf9e90c";
+    sha512.doc = "f29b76a31ceef9ef125e5b553f7f3e76b650cc3b41cd8d9e4047c45b9950243378162e5ea3aa6393723181b0e7095496abddf06a72a4511fab88cb4017fe4a60";
     license = [ "lppl13c" ];
     version = "1.5";
-    sha512.run = "1c48c36d6121005c123018cfe1266783288572c0ce8a9ea4b9b47ac28f46206de61b7a73804121f9a57c056c871c547c97ff10a529fedaca57bcb3ab78f3bea0";
+    sha512.run = "6f76710dd82940486956acd8c80930e7f2cd52681092f40a41e0cc09fcab625b98c667ff3bb82a282825261cecca4854e521ed6eb47c8f86906110ba496cd6aa";
   };
   aurl = {
     revision = 75878;
@@ -2222,12 +2222,12 @@
     sha512.run = "7fbe6be346cff4a54e6a3a5418475fb6074bf554dd9c0925c541e8378ea1bd60fbb00f8a9a5fb467694e5f84355d2ff47dbf708b798d91336d609709f10c6266";
   };
   authordate = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "Author/date style citation styles";
     stripPrefix = 0;
-    sha512.doc = "6cd1e8b6572e81d25226ce0819b68a5ab723d111eb23ff5b4795a1ab42350e9222018985a938f9b7fb89ba9660c84e2b21f68eeff68bc41fc42e60d1aa4f4162";
+    sha512.doc = "87e541219971f8e91e1faf614f55631a5ede6c5c5f9987c055ea2c25df1f58b919854913c52ef142f126983e79edfc225cf38bb588e4db9776e41cd75bddc530";
     license = [ "knuth" ];
-    sha512.run = "4913d9cf8cf140915389be3d9284de2690197673581851019fbcb06d7a04fb4063cc03db74a10e25b67e07f5b279b449d6e9db8439e1a69f8426ab1c6f7f8542";
+    sha512.run = "e61569df0fc55448b1990d139c021c97c170172b3fa229d116cc55120605d6c9339218e31ae2bfd773718a9fbe67799c9121008542978aa729594830d878a4b6";
   };
   authorindex = {
     revision = 51757;
@@ -2240,7 +2240,7 @@
     "authorindex"
   ];
   auto-pst-pdf = {
-    revision = 56596;
+    revision = 77677;
     shortdesc = "Wrapper for pst-pdf (with some psfrag features)";
     stripPrefix = 0;
     deps = [
@@ -2248,32 +2248,32 @@
       "iftex"
       "xkeyval"
     ];
-    sha512.doc = "73d6f4b2e298eedc537a46c1e69bce9e160eb28e6bc2f631596a4fd3aa658d8b51d6dfddb6748b7e629fe564a2ced5e55bcd766650616d936a4197e368b2fcd7";
-    sha512.source = "199e9fefcb2f96f1ad9e33abeecedcff9c72f20614c48951197703ff65901763ef88f425af08021b1843f30c3ee8e3a9756095ad4b165772b829a29c6e5515f2";
+    sha512.doc = "0fa9b51cc6cae89c27ed2819118525c372cb095b54cc7fc43fda74214b9a0895bce09c9803920401a251d40e0a5417feeafb47ce1a0e006bcba5d66404f7f191";
+    sha512.source = "8fb0f83ec0171162c7f0a2948a9b6d2eed28dac3f63d5ba93f2236ebdd8ffdfaaf7e62f2450b94c7ec7849f7cd4118b2039637b0cec99b94f5a53a4fd12c5057";
     license = [ "lppl13c" ];
     version = "0.7";
-    sha512.run = "5c1f85a0ec5aa4173181b087a1f5f8e30be6d8c21c3461999a85b42032d45292aa6f8aae4922a5e97d073fff5b2c9d114cd30f5d5bb73ef523718e891ce59473";
+    sha512.run = "06ea72250f1723997f2587dbd27c14cb76baa54d709593142f84e6b05a2a47218093e4725b2c3693523e22a89af5be64bf3d19aafdc5dcfe4832e55c1c557634";
   };
   auto-pst-pdf-lua = {
-    revision = 66637;
+    revision = 77677;
     shortdesc = "Using LuaLaTeX together with PostScript code";
     stripPrefix = 0;
     deps = [
       "iftex"
     ];
-    sha512.doc = "ab6cc1b954ff26f5d7b44f12cffc7aa2d5ac1aa64e37a68a5952616debeecab0e34dd2bcb6e06a3f49e90d45e9b5f60955d8b62cb8d124ae35625b398e97fd44";
+    sha512.doc = "1791422d5e90b01be2c3da4b6838ea60c5704061261c2ddabdc37af4ee13a34e66cdace7c04e2973e75f42f6e0fddcc04b4182309fb1153fc29e3dd677f3d30b";
     license = [ "lppl13c" ];
     version = "0.03a";
-    sha512.run = "7d9882f2c80021409602f343e99dca9613f060056614f2fa8445b4f427f53287c4eb95af0a252ee3cddb2d6b47e1ecbc0ee3032dd55c209eb946b686f8037023";
+    sha512.run = "7acc6d4d3067f547a1a8ddcd5cf5df7d76c7adcf970b9109c44ac6226b498b607a1da04379df888dd19dcd7effb5c9c44a0f304565d628dad7571216d65b12d5";
   };
   autoaligne = {
-    revision = 66655;
+    revision = 77677;
     shortdesc = "Align terms and members in math expressions";
     stripPrefix = 0;
-    sha512.doc = "d043ed183b3e30d35f7d4e6a5b5f094ae5bddb4e2265294c02c0888cf2e78fceb16b14cabb5b5d759b5397f58da1111d5fa590aab89a59ce13e3e13fb2e3dc91";
+    sha512.doc = "c8d66449363daceb324148acf774c147a027eb912d42b08faf98ad532f88c6d540eb84e442c9656e0117e9969a848197d9cfafc782cce0b6a25f1233dfb0b1e8";
     license = [ "lppl13c" ];
     version = "1.5";
-    sha512.run = "b590b6f43bf17d54595c3adcc6de0e5c6780efd8ee68efaa5c2990f3e9e79ad6844397d6c7695d3ab66d72d4eb592c1455e4234f7a40efdbf4c788bc45216442";
+    sha512.run = "61c3311c0f44cad6817a3c11899a7f84b980b1dd67f681bc5f2c6c006d697401cf92edd19bcb25c002359eacfd4adbc30354f2793b09407346ed91913fb598ee";
   };
   autoarea = {
     revision = 59552;
@@ -2286,14 +2286,14 @@
     sha512.run = "dadd69326335b6fe6e425a867e2e62a0b1df2f3179801bcc726c6ceebc15c24e3a7c9ecb3034209e25e503be47a9ad8639addfb628f720bd0c0d64c15177043d";
   };
   autobreak = {
-    revision = 43337;
+    revision = 77677;
     shortdesc = "Simple line breaking of long formulae";
     stripPrefix = 0;
-    sha512.doc = "0d06f75e6f4fb254463ee2a075d106c14a06c5f7fc25b5047fbeec0e48ca9faf6e136f098312811329db1da5f9fffb6dfd45abe6eea9ecf682f4fe99f0384178";
-    sha512.source = "7120382c7974acccf1a49548ad8e654b945ae2ecfb858b37ca871fb7b5b054d8554c971a86c511d03e2ffa91e5cbc6d61cc743da51b0a9de705f74c0b9c2c7c1";
+    sha512.doc = "9191697210f36583129e09ebc2d1fd698d5c08572af0adc2398e372e244d1eb533cc087ac31e2aa45566b01922f56d8eace7ac4b7f82f28413f53dae1ed8d20e";
+    sha512.source = "f069eea7a93889f759d58cbb83f4c26002a24ec7298fabaaa43ccc064d38131fc839ca3e072cf22bf9f9eec1ea450c4f8e11fc60fb15371cf63398290297c6a2";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "91cc17692654270bba9536ea9186ffea2e7e9a6e9dbf0ffcd9821c8b3ec470ea3222af2a1df05d85e47d65fc1737cf2dbeba150641355bf826e5ad2da90db059";
+    sha512.run = "c0a4efa8834d5ac5a18e361a7dfbd2222ad220bb93cd26d4f9cf5ca8239de9df0f958338c84e6b8ec8486a3e60ee1e005213b7967a337e6896e1db9faa894047";
   };
   autofancyhdr = {
     revision = 54049;
@@ -2314,14 +2314,14 @@
     sha512.run = "09026f967084d5f1804a32166e854ac410a768f6b4654d9ea9bb69dd29acb8a3199919daa1fd6dd48963ea5d6454b9b9d8263939e5af81a8f07f66f08b5f4835";
   };
   autonum = {
-    revision = 36084;
+    revision = 77677;
     shortdesc = "Automatic equation references";
     stripPrefix = 0;
-    sha512.doc = "2d0c515fac8afb219aaa1ee270b30bac09bcc310afcad71ff6ad2a3448187733718c03c304c09a0d631595d36043dc3eb0b6849fce0e4c3bf7f5d249b15c99c2";
-    sha512.source = "5c20017e3008ea726979ca70272923d9c62a5c36367fdcdf9d62e141f4822201e2cd36a9b4c58a6591568669daca65d17cbb78e5382c01ad4d624da7074f4010";
+    sha512.doc = "e910aa9268257d96a2a1b6a8541fb350759e326b349b14c4a8d72f68560f518da16b2e068c864e74989c63e6ae74e063549433e9d2c06590ca5d101b948de5b6";
+    sha512.source = "4aec359f2419f5daf5a6efe7105915d7180bba568bf61a9204b2c63c1e7c1e54114379c24f87c21fc4d825267f74212d7f363a55cc2b36f9670e43c47e46f817";
     license = [ "lppl13c" ];
     version = "0.3.11";
-    sha512.run = "3a663a53b4b4b53515978460dae1ac275cc4e3e6981b008c78b875e3e47af8abd950cb35f6e416ab02507e498bd75d6f4a775e2b429d668d02ebaa4bfdd03f25";
+    sha512.run = "f80a50c91dbfb0217386f467be4ccb4ab7d17b9d4e7d0b7a2bc4c0c4b49891d071faac179426746cb95a1382fe6536b91a7bb3b257450f2de07d94ce7c8edb0a";
   };
   autopdf = {
     revision = 32377;
@@ -2366,14 +2366,14 @@
     sha512.run = "7687b84959f337ff1485cc649c42453b186b8aa850b25ba8343afc250380699cec956e77ee4ba4175203f1651b0b3e6a838436e0667a18435f84d61a86a98197";
   };
   auxhook = {
-    revision = 53173;
+    revision = 77677;
     shortdesc = "Hooks for auxiliary files";
     stripPrefix = 0;
-    sha512.doc = "7c4f850d93f8a6d25a35e762bdb2df26384c75ba1cbaba06806964737badb2f7c8ba3192c62df7e7f3de12c6fa117ebc525c735e696a9cafdad943a8cfeedabd";
-    sha512.source = "f378f365c8fdee267224d092b35cd2bde971302cba003edd24b3f0a06bbd59e077096580e65480cb66adc6488aefb688ea423d74334976dfc92168688514e0b4";
+    sha512.doc = "eecabb4bd9447b6bd952cb2d80bad8d3495a399ebe0241f61179a94854c23e932f1fc1ae691bf78016af0f7a1b306317e995e7133e5e09cd68169356654ce294";
+    sha512.source = "c6196c9e0201dd50b4755e997da466f1cc23e0d826692efff327cbe1ff3393b8691c8b9ee63bc2c453e76e7e1d0a5e11d53e22ce0f3ddf4e412725f327aa8b05";
     license = [ "lppl13c" ];
     version = "1.6";
-    sha512.run = "8ea845a19818df2df7939031e7b251b4b4d99a17c0d1b8177a592275bed6efdc660266964e0639222b86cfdd897bcf13302f1477b997ea1a06179cdd44aff0d1";
+    sha512.run = "c37a70820ea2b2cea1b59b4dc54cc29d8b197e97c6cc420cafe89d3d29ac7e1597b5dee0ea7beb93a2304516df45f75056a91c2b1ca82c07640126fa262354f3";
   };
   avantgar = {
     revision = 77161;
@@ -2415,23 +2415,23 @@
     sha512.run = "4984d58669576137746518b68988fd9837b5ef133eb8da948f67bb0d5f775ad961055871bb46084e420ef0564b6a4796ba81a093be93f667f959a45ffc0c6174";
   };
   axessibility = {
-    revision = 57105;
+    revision = 77677;
     shortdesc = "Access to formulas in PDF files by assistive technologies";
     stripPrefix = 0;
-    sha512.doc = "f3255c9d6b1eb75a501e5c36cece49cb72767e467c0853465d2b8a39f011138d7154eab2fa5287f9223b4f535aad5c2db25d2f76c286376499c71d0ffd120699";
-    sha512.source = "c5ef10d286eccf16b270c8b487e91270cafb09ba10a88a8e0c925485a380c18002d399857f7dd42978aee72f7b1889c5dcde7ffdf2f5626424f31fd99a452ff0";
+    sha512.doc = "70040a90fa76d13b6ee6bcf7cbc3fb9a9eb11d270464fe8e23ace3f148f4c372c02e0e4cfd20394125c7ac174db527d87c55a3f9c9c5b6e8dce72959afd3c487";
+    sha512.source = "eb4944ed9c2c7c1a87142d348265427d4c0da61b01f26cf9e9d3aebb0e20ba8f0997c8cda5c13d77337313137333baca1814a96ffbcd84b7eb47402532f2799c";
     license = [ "lppl13c" ];
     version = "3.0";
-    sha512.run = "9b42a40556f3432e045ef35b23fb7fcb6ff295064645e5b9331d0ce99a8f2bd232d0926b46eacb5598da112dfcf3673225efd655573523dd504767a06a42686c";
+    sha512.run = "f039322edeead93f8e9e5de6f662a6e617756962c3823a03cf1beea7c76a26113bdd8d2b7f695cb477a035d7e34e038895991ca8dda54c90cb749ca0d06a30c9";
   };
   axodraw2 = {
-    revision = 74430;
+    revision = 77677;
     shortdesc = "Feynman diagrams in a LaTeX document";
-    sha512.doc = "40b37aee257a5dc7303c0652e96a522ab2a1627006e26bf3e84913ab3171e9aab792a870073c58e7bc3f38b71f479e1feadb1bb402f4fb73784aa74d891611ac";
+    sha512.doc = "fe9bcb78772bd5f64c8db83e63a0defd4291a2760361541d80d0bc15dae8211bce5e528616d3fea9e8f51ac9380eddd6d2abc4ee7bb319df3407bc5db34be163";
     hasManpages = true;
     license = [ "gpl3Plus" ];
     version = "2.1.1c";
-    sha512.run = "e8c7ccce7845a9bf14ab687318c96487aeecf4ad220b7d189faafb89222550a3cf360724f5e239e152892d72392c75b89ddb02da736985dda836c20a087ab708";
+    sha512.run = "e5be4dd74bb82585597158d2bed95fac90d2d1ddd5a0683d5a5180847b431ad9bdd2f2f3da103a19e9991392229f6f04079ff5151dff202677b42c12a0cf292c";
   };
   axodraw2.binfiles = [
     "axohelp"
@@ -2447,24 +2447,24 @@
     sha512.run = "b33280f64e37f300c92f9bad4372c13dd34e3dbe5fe47f2dc9fe0e270f33eaf5bedf9485293a74a6e0eb87b65f44fb66a286fb279a3d2c390c463e6aecfacb57";
   };
   babel = {
-    revision = 77491;
+    revision = 77821;
     shortdesc = "Multilingual support for LaTeX, LuaLaTeX, XeLaTeX, and Plain TeX";
     stripPrefix = 0;
-    sha512.doc = "dc8baccf3f330c0be56a01db23d67904004dd6aab8694e254ea0e6ebb2e69025650e054d6e2a7893df02ca20b66e151e08820e2ac481f5a9cb02d30e421539a6";
-    sha512.source = "7fe850a05f0fa01aabbf70153b2faff957f965ce27023e1fbc5961f8e0cee7f68195863bbf81c5f076a97c544be049034a2341311cc5c3c7d7b16ad6614103f4";
+    sha512.doc = "70cbfc1f0c5b4e5772af9954bac975f28bbf70321a3758d5798f613fef883b58be65488774c286882d96b65567f7dc72351ed5f0bfed82ef7b52e5d06e03c099";
+    sha512.source = "6653e236972a65588487ac487c8c8c1ce2527f54cc9b81c0b72b2a3a1c2831f917a7aa95fee565964c2d524d2618cfd2274e50087d9c46038da755c85b29307b";
     license = [ "lppl13c" ];
-    version = "26.2";
-    sha512.run = "621d205e74ee8917a685007c396a9f27afb6196d94b50c4a9b424721a8f6bec1e22334b877d42ae46f9648d46067bfa81b3776835201dfbb8edf296d8d7a7b57";
+    version = "26.3";
+    sha512.run = "3b85869a0ab1c1ff541d795a5219c65413e0224ef7b858c383fda15d6d9618b6a8bad1095af6708c86e12bf65d92cec6dc698bc30be6c239bed53ec6f130045e";
   };
   babel-albanian = {
-    revision = 57005;
+    revision = 77677;
     shortdesc = "Support for Albanian within babel";
     stripPrefix = 0;
-    sha512.doc = "d26b9d933bbf0225f79bd8180f9dcc2961ea481fef7b535267034296062f8879b53ca47ed6b512fc724b261276be6d92ce045ba0c8bbdba0149cca6f117be8ea";
-    sha512.source = "74212f36288599d730fafd00dc50839cf0f12283ed8653303471d2cb64a57217b4792f1000cb44411c7d5031e4597db67368964ad318e896987103af8e21f838";
+    sha512.doc = "e7be4276b446f7d04f5903bb54c426be8f9f91762787cc4de5457bbaff99659e2a9871d8a6d87ac2ac4de537e97f172a9883e088850e0c0b1a3d657be4e3f9b2";
+    sha512.source = "722951485746eeaf863fe74c86a3503b0f8fe8d8c9b8715f7df52e8ea839abe168041bb927ce5a29ee6ab86f23386bbd02b05e640ac2e3413c2d50fc102acae4";
     license = [ "lppl13c" ];
     version = "1.0d";
-    sha512.run = "8a98ba1dc08bc2bdbba0793bda2a07a6c248543fdee56cbb047229d1cfe77cdf616c0ef023b0a74f877d9863768065f0e256ba35a1071e0dd3f2bbf2b47b7ebe";
+    sha512.run = "5a21758ede89616c465fe24025b779a51f6c7891b99a8f327f7ba86b434e5827b335911b9465a8f499d03e363dd807b01f3cd135ecf63b323edd03dd66254c02";
   };
   babel-azerbaijani = {
     revision = 44197;
@@ -2477,14 +2477,14 @@
     sha512.run = "3f20954607195d4804b4bd90d7fe5baa209d5ffac6dfbe5f758306bb7c8aedd1c4c92675f5dce7f634e7ceb2b65e9c3ead0ebfef730bfe2dbd8c0ba17d3079b0";
   };
   babel-basque = {
-    revision = 30256;
+    revision = 77677;
     shortdesc = "Babel contributed support for Basque";
     stripPrefix = 0;
-    sha512.doc = "e6342328d62cb0232d38e10b3b38cd4d75c55a5d31d702c167099a2bd4122e40c5e3cac8a9c2940a9f9893d7aa2594b8322cf469924b97e903cab970dee81c6c";
-    sha512.source = "1c924232920a969fa48e6d61bcdfc5150cd1afcef6d98cdd27fbe2e0acb5b7749d2b2dea77db88125128b380f2b4ccca4d49d1d140f2e96880e0daf2d09c2d50";
+    sha512.doc = "66eb9def7a6d000686b7843a9d127fb58b893faf996456ae7ab52f9b6f9d94c0503843ed174f23e7969600b022893e1d2fc673463e7a12c59dd340479389a0d3";
+    sha512.source = "989cef86f5d4cc5e053908f68484a8ae83749ab7b825a991e277f4f55713d39c5bdeb01fc62b12127ba81fc1f68b0ed2fde1e15d5d57aef5ba931ae7acea0fb6";
     license = [ "lppl13c" ];
     version = "1.0f";
-    sha512.run = "40079f02225f81c8838aee6179548f3fcb773fa8e031e07f30df761f298b9980e3a4357a8013bd7802c688a192cd9ef2102be1b6e8e1f3efcd68769a9e5a5a2a";
+    sha512.run = "1951bcc41769f9cc33a4898ac052af6adb38ba8ce4a5e77b5cf65f44ddac845fe173c1ace245300492291210a0788bd2a1ab8c3eee488eb8a3735c2564ddd8e2";
   };
   babel-belarusian = {
     revision = 49022;
@@ -2497,14 +2497,14 @@
     sha512.run = "5856582f8bf6a98a4fbd560bfca82ccb226267e249f0caf8afc775875d50ec204ea613320534a63062dffd0e050905adb24763a95fec2ef4e8faed70a400d976";
   };
   babel-bosnian = {
-    revision = 38174;
+    revision = 77677;
     shortdesc = "Babel contrib support for Bosnian";
     stripPrefix = 0;
-    sha512.doc = "84238e6b38021582de93e9fe934bf608e647c9b4cc0a066b4fbdd2ba98c8e6531b653907f9bcfb79e6afc9074b4a079b5e419db25625d40a76a8ca8e55e81ab1";
-    sha512.source = "dfc18e55b30620e27cb8809259a6b4790b94cb98b334a69cd48f66c25696e2df8d38dc5a1d402ae8464ced727752d96d8b5abf18522c8bbde4ce1f6f8ad73c92";
+    sha512.doc = "393eb5dd6c543333e8541cbbbffd2087a4b773a5f9dc0c42f84bee4f68c86200f8973098bb4d9a1f9b76e0e0bb22176970a8c51c79c2fa1e17cfa5b2702537b3";
+    sha512.source = "f7b7cf65ea9a75d2dd7ac0bc8457deed70f15f6f7f4f3483807bb2fb33394af3659e704e4498fd889479b5a6915142c93b957437c673106e826b493f2ae4d90a";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "bef1defaacf5232bf9cce6c1a9956c9a42d35a2c2b6ddccbcca3938386f4f4a61a0cbcba74b930dfad18ed211374c3667120c6706ebf097c56ec3c5915ccdff2";
+    sha512.run = "7e46a199dbd97a40c79f5942213f6bb99057d2636a06c486006ba6e4d2ad9de3116c9fdfc3fdec7ab254706e4bcde5642f8f547f0b00598c2e316b968fec45a6";
   };
   babel-breton = {
     revision = 77470;
@@ -2537,14 +2537,14 @@
     sha512.run = "728d847331f1a00766cfc2818691516234b153182f31ad2da024ec3194cc384a41ca89cc67ce66447191188dfe088d1dc4c8af3b2e6952931ec7eb58737c4bca";
   };
   babel-croatian = {
-    revision = 35198;
+    revision = 77677;
     shortdesc = "Babel contributed support for Croatian";
     stripPrefix = 0;
-    sha512.doc = "d5e40e95037c3035589b093037c563b3737e061369f27ff5c51d620e0655dd075f413b91434591e2130849d641c1ac59469db46be1d8b0761075424c468668d2";
-    sha512.source = "fdd4efb6d24bc9560e14f9e02d231ac636f2f69249d7dea9c07b337f0d5617c754bbc9087bda5cf1f2da6178807e46f015658b3fc2d04ddd5749dc2643ef4ed0";
+    sha512.doc = "3ae344fb198bddda47c8f91c316abbec3449bf42bb655f6ebbd3a77d1a8af737654e430982be222b8fccc78788161b5de35a85183e6a024e187e177952c520ad";
+    sha512.source = "5c1466f997f9cf0053e0f204ca2abb8d9b0a9b9eae8b1ce9a2269095e3aa97130278ffec0cceb23995ae9dca18450cd25027606c1e7f2ff60a2d6fb0c597b5a7";
     license = [ "lppl13c" ];
     version = "1.3l";
-    sha512.run = "b5724a84cd180e9de79136ced8bd38717dcb4e932dbba4e20fc071ba9f50fb35cebe83d4a95ec6e8ef0e09a02732cbdc8b1a71715c8a5967393f54087ba4a807";
+    sha512.run = "d1b651e918e8fe022abb750a0e197e3f5b9f7f664e9eb13cd68c7e095fefc2d5d5050bca54a1bf0d49b7130e855ebbca7cd4686dd1c7b4c06407a3c4c027e391";
   };
   babel-czech = {
     revision = 30261;
@@ -2557,47 +2557,47 @@
     sha512.run = "0cc0f07fafefa6d7ea1ae1b2ce143dbec124fe96b36221f1b5a847fd0b789d1974b5990ebd93b8ac0607f63956948bede25c7e690784ca7e9638f48139585a32";
   };
   babel-danish = {
-    revision = 57642;
+    revision = 77677;
     shortdesc = "Babel contributed support for Danish";
     stripPrefix = 0;
-    sha512.doc = "5ed050c01207e110c475abe825e5299df0f7927476141d81cb31fcc8c6dae1076e855d3590aea0812bc2a15949231163c24f0039620f3a8f41cd43bd6a8a0840";
-    sha512.source = "5c9bc598da8e782acf3a4e3ae5e93acafdad34fd68962436ee7a5acfcd7c234863db5faf9a3c2e2b87814d235883e3e85688fd0b3f514a7d57977d1872896884";
+    sha512.doc = "729d01d6c079ca8e75abd36836f6f39fc5fd8824ab9c8c5bab1900133542db7c8ca2c617263b8d3e830d52d5398f9fbaf4583799df157c831bd45d9d01fdfc5f";
+    sha512.source = "2b86d091506a5914dd813f86a3533312cd6590436badbeec94f25498e4d8a63c144fc87fca902754662484241b3a5d2c2e5c6d9d7c75b6c7a749e370417ad182";
     license = [ "lppl13c" ];
     version = "1.3s";
-    sha512.run = "201afcbdb9b8d9128cece15ac8876e8d9bc261ab6c90745e52a95bb58fefea0b478a623027b097875d831fe5671f8f1f16a2370dc0dfd92ec3e603436e366e1e";
+    sha512.run = "72a90b9344a527ad5bdc9ebb3b86c27d80b6483db1f9ceab246455d80f5cf85c07ca5b9cf5670a0b35f1ff0572fd2f0bcfed6146b0abe15b5d181b599db40a40";
   };
   babel-dutch = {
-    revision = 60362;
+    revision = 77677;
     shortdesc = "Babel contributed support for Dutch";
     stripPrefix = 0;
-    sha512.doc = "a78535f95bbbf6228014471a473a7e38b2cfa2da0160adb906b8f75c803b3e9396ca52322100102bebc179ec1e863a78c1b102ae932ea324ea58fd57bf9e9b06";
-    sha512.source = "724746e2e05c5de5184125068b2637c14c58c83f86fc92d75521089298a26290ecebbb6f0c61f7452da659dbcbfa1c36789e428aba500fa2211e354747fb017c";
+    sha512.doc = "2283ecc54c8de2f510a76f6a3930a74e6b544f4e0e8c4e6ba7f252328f82c6096d013aa0bafa220f5f09a2bbf198b2470af2778878fc393b29be0480ac7484ff";
+    sha512.source = "c9598941498f194aa14c2b9afa590a6edba604938035fe7c1c4ad408f9d637905b8656f7c49b00ab2e6e2fdf6f733e7d2db597f3a6230f5391ea7780e03efe5b";
     license = [ "lppl13c" ];
     version = "3.8l";
-    sha512.run = "bef13adf26cbbd16604af041fc7af866c82e88cd9d7d05318abd10f7d6f0ae718e1186f5527b4b38f1f099ba5da3d85b5e2f6d1ac0dfe8fe64ea52fcf6f06df1";
+    sha512.run = "cf411805f007b3c7dd90b3188ff629b60de46b3b9e0e5ac5d571096025e6e086c8a1280a34b87ccc86fe838f67d9bbd238465dc8967077f432eda6a04efadaa2";
   };
   babel-english = {
-    revision = 70799;
+    revision = 77677;
     shortdesc = "Babel support for English";
     stripPrefix = 0;
     deps = [
       "hyphen-english"
     ];
-    sha512.doc = "f3bfbe5b72b535985b20ac191cca4df7bfceeafc78bc00963fe51c4fc087ed33b7138f66296eb86bb61e08eed1fd69d86f7cf2eb095ffcb84cd0459266e29d32";
-    sha512.source = "533737228779cc363f8d3a0bc44e64ffd7cc0d5a18bf14c1bcf831445652de15425816ca5e6025a282eaf4ed5ec76f216a69d7549ccef38d1fe58ddf63c2ce6a";
+    sha512.doc = "a322ef9ae33f933a2dadd551cc9b673b77048dbebe778f1ea287b88074742841314e319d29386b49fa865b01f46419c3ca94e31b2609b8312de4d553493a0d5c";
+    sha512.source = "b624d227b51010531673cd764332d11b3defa16d1f321e6e3973615cb1aa623de2b4001f3b15602411e8743ceaa43cfc06b9efda1a425307540b7534e0dde13a";
     license = [ "lppl13c" ];
     version = "3.3r";
-    sha512.run = "7e49d8e22659d0ddca946f4dba4ff29e5beacec15afdeadccf37c7b4e65a9cb64b827213d7be2cb4839dbb30390fef8d5991753c73bf7ae38e4dbfeeed1e8656";
+    sha512.run = "503c2741a17ceae727c3e784d6b0020001025d135b24ad9a550316ab20b55f94341136e6d9ba6b9c384b1a272a16ac97b9d9678915f82d5809bef59a66eed466";
   };
   babel-esperanto = {
-    revision = 75781;
+    revision = 77677;
     shortdesc = "Babel support for Esperanto";
     stripPrefix = 0;
-    sha512.doc = "86b54b43c17922222ad8f9496c6dde23a41540e05790e700fb6a15a850ba0359335025b409ac3df9ffe9a0fd33fdd89ff424a2eebc66e2c507691f29794b38e8";
-    sha512.source = "ee6540a0ca403365b1acf2546c89d1bcb78608dbc71a4c70e792c6d10fc91da4999ecae59d84858550daafc8983e6bbd030f64ffb828c55f1119d29ed539c48d";
+    sha512.doc = "81663e88b6dcf24b34b2a6d6b5f6fadaab9a6c9cfbf49a75359c43f54ddc81f98146448b7fc6cb936f6d94a8240e76b760f6df98ddd0cdcc8d98e5bf32efa1e7";
+    sha512.source = "1e0642bd8c2d1ef88fa067304e06c0cdd0a7e52580436825246f3c20ca412ffbedf20e084c873a1148d99884bf9895c19072145b2a30a67484b3942922711602";
     license = [ "lppl13c" ];
     version = "1.5a";
-    sha512.run = "91f510b90190df2baa0c402db991397e60177ee3d9ce1aac599514a61912c6841346c9ddbc250cdfb39379d841e45cc9d515b66fb7a8d53881cdc28f2ea1aac8";
+    sha512.run = "09d4e073ac59448afd3f0f2d325afa2ccecfc42aef359f2bb1c483c2c9a06c2b86996d65ed554089f9c48f8ec5ec2adbdb7a0dff2596a1b8c53e546970c3e8f3";
   };
   babel-estonian = {
     revision = 38064;
@@ -2610,34 +2610,34 @@
     sha512.run = "03357f8b0c101e5e186fa4211a971e625f6970a3129a2594a611c74b77b36a27a288d2da518d21e6e2e5d98bb82802b2115d47e31e6258f01c003be854090baf";
   };
   babel-finnish = {
-    revision = 57643;
+    revision = 77677;
     shortdesc = "Babel support for Finnish";
     stripPrefix = 0;
-    sha512.doc = "c96212780651c9c0c831e295c26f678c80724e5b923d69fc73bc1be39e369a19243b42e5252dd4c0a049fa0c4d25dd611bd470b12a4b55dec4520d016c21a5f1";
-    sha512.source = "11bb4bd731c27af0e11718a55793f7a22957b65e2ddc988e6e3ddb5cb6def8fb1d9ea9f235bf400beeb026f220a628effd612d04d416abeec2e1c39a001281f0";
+    sha512.doc = "7daed713494c7cba0f3b787142d9bd810944bf5b5f2904a9ab5bc3cc5b1e4a389ebb3e5390bd05b490668f56eb6179866e79dd52e9682e907fb267fb19ab1c6e";
+    sha512.source = "15640dd2cc80fe5d1e064825a5fd31b9cd69ccd3ef11d5ad167c07f5f5cd14a02eb0d8b2b70c2c12ba2883e248d7ecdbdbbd61014bc4e18d29570b44064cb5c9";
     license = [ "lppl13c" ];
     version = "1.3s";
-    sha512.run = "ed0dc79fbf6cd992bb5ff3df46f93203ffcb3ade34c6a613b5b22bf5effb98f78fa85d9b915130b304df71629c5a8bd68a4bab23ee772a1068f7184fa27051e3";
+    sha512.run = "67fb8e01db035dd0cdd8855a170aa6d078709e00e0af1c3f940fa46067e494384d224746ab80aa05e017b9e72edd449b5f00fdad75d4a86de29a6cbfcadc4a63";
   };
   babel-french = {
-    revision = 76067;
+    revision = 77677;
     shortdesc = "Babel contributed support for French";
     stripPrefix = 0;
-    sha512.doc = "6dc16f4da79dda8add046c9134b4bd391405f76f4687dd946e8f583b229683f12e7f01be6356ad2e280d6a6469e8dfc64d514c20474059d900e3f030d71b5ec9";
-    sha512.source = "698c360cf184c4166ab59a9dc04f762fdbf248d89ad705a13bf806e516f5a9975d2200c2ea748ab60e6c301d195196eceb3c04adec8d02111188b90e48265193";
+    sha512.doc = "f15c844678cf2826b95dad8ae2eff698a8b571081dea5e3150d43eabc8f014b24945fb2f2d83b20878e55ef0c9573301823db126b380ac018ecf849b729ff480";
+    sha512.source = "eb72e89045b1d69aa3221a48eab3bd030a7aa73a17d11b0991a214fb9c7bdef07b90c3baa2a04e5da9ea3e7ae099046df92ed6215b251dee789c983d66f751fb";
     license = [ "lppl13c" ];
     version = "4.0e";
-    sha512.run = "d41a046e9d618a8c6c214b0a51379b5a3f70a845371dc7f50b08f98ec899acd4a212d2df73268d84579fa6ca093039f1e680c88398565048a6a933f54b88f9cd";
+    sha512.run = "df94b259c34bfc4360c5b716ac9181d869c36e3b0ea69ad6803cab0de8eae158fa02a34913fafe1c041ed89834de3b3afd745cd698345570e37853787d1083c1";
   };
   babel-friulan = {
-    revision = 39861;
+    revision = 77677;
     shortdesc = "Babel/Polyglossia support for Friulan(Furlan)";
     stripPrefix = 0;
-    sha512.doc = "0ce539cb0b6cc7af830c7413545f411e1291491fb26ad0451e7caf1346da9ab188a457e3292efe9724070e77f67e46e06293dbfb40b78a1328112b04d4a1fd77";
-    sha512.source = "1e7e241350d499bd0bf28b1c190b3c73e20d02be12612905305ad53cead422e8ea1b6b0dd633190170d7ab2ac2802559693597a8c6ae8527a7fe83af7cc61463";
+    sha512.doc = "955d12458b405bda6a61d52411615e3c18061281d9776f07340991b7d2634e7baab1c53b13fbe672ec78a9613744cb1454ab24964403b33822dfb9a8d271f9f8";
+    sha512.source = "41197975205d5a3fc7abc67b0886ac0947623762da92730115a6d715e373062cc2124619e4ebf20ed22df31f00a167e80a8ce88e9bbaf665aaca982788daeec2";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "e6210dc473c3d71759f2faf1558df2d6a7c646485d85cf0113074fb68eaef23b2e44eb88c9fd35a7a7929b408d6574f7230852643366bccd29afee744e0b2d07";
+    sha512.run = "d4dc7eb4bcdcdcb4ec28bf81de11dd6481e8674d11d8663fe265ec95612adfbfb7382ed02be037b1baf2778eb0703f3da620e02d30d65fa7c831a9989749ab1b";
   };
   babel-galician = {
     revision = 30270;
@@ -2659,46 +2659,43 @@
     sha512.run = "07adf0a76fb15951db5dd01a0a1595aa9c8119d6e39e94eb36ac340932f763975abe284d738a52a1fa2a938a14f87fe7ede10758529c3f68c6d573dbccbcbc82";
   };
   babel-german = {
-    revision = 77543;
+    revision = 77819;
     shortdesc = "Babel support for documents written in German";
     stripPrefix = 0;
-    sha512.doc = "76a79131b294eb0a4008a8b8f9bdf64e7a9b26981dd2c3d276dc5adce45198c9eae30b7aba495de5b9cfd32ba53927d25bd2a00baea4408b2e9168bc868fcf73";
-    sha512.source = "012bded548bec9b9512f5650455045d2d5ce6074aaf75717cc09e0b7362912e7bce61885dbdb645cfef6e0477d78f59dcf2aaa6ff9686cf6b9863f8957b1f354";
+    sha512.doc = "82449b647ad7e3e22461b0f7eddba26bf807814d8a5dfbd2b8cdbe87e8d7f9abfe9307eae96ebb8e7fcc818e98bd4e9fbdbc59223ed4a1a8bf147a88f48843b8";
+    sha512.source = "6e068f7b5fc00be779325eca57297b23c92e8bcac860e1b5c12ca98d12c9a5393f0004205a8715451e7e5d86ee1db0429ce0de511cacab51da16c4eca286cfd9";
     license = [ "lppl13c" ];
-    version = "2.99b";
-    sha512.run = "d42620bb48c1c64443e59454bb8f34289639777af9f02d6a3482da2178be8fe16d347389d37f375b011905865b7f61a9f13b2aceabc59c8cd2f36e1a870378c6";
+    version = "2.99c";
+    sha512.run = "f8dc445725b1dd2c34e12adb6a87c9c8762de7e72993baa180a84c639eda1faca79812bfa00f98a043b5473f64248bd2521054ce002629f2d96233670947233d";
   };
   babel-greek = {
-    revision = 68532;
+    revision = 78116;
     shortdesc = "Babel support for the Greek language and script";
     stripPrefix = 0;
-    sha512.doc = "deb5a889b55a93101ee4c8571dabf00f8f971a6a27c2531c9e71a74e4b972ac1fe3efc6a336a6f0a38bb746316ba38881fcb2b4a90b64fdb5fa1fed51a7d90a0";
-    sha512.source = "aa891867efbcd19359dc6fa93334e43858ec9c4f7b0ae2d26c5d770fa2210fbfa16afe2ee8ca49fa3db1cd6b8680c8f06dc1069d760b65ebfbdcef0e54fc7da8";
+    sha512.doc = "86da37613c1d3388f770f7d6ef45cb27976d05a53a4e730126a641a89a015b1c4d01edb48d4bd548f3d57bd3ed430d207e8277e97134305d38b9ce9df83e433e";
+    sha512.source = "21f600d587b190a2e32d5f99273de111afeb1a714188b56cb11ec751a6c7f62534f0e23a885e52499e67387b13428239ba252de2a5b5eab4cbf650d40230be30";
     license = [ "lppl13c" ];
     version = "1.15";
-    sha512.run = "f81c220447f77f207dee02a5611edb3dfe68fb775abe932efc560de9a268570e688b3abe4eb3dcc094ac0c967360d52be02bc85c82daedcf173bcda269065938";
+    sha512.run = "849731be047086a2053bae2bade826f2a56ecf7199b8a51b597bdf68637f8371c10c21dbc354c05cb7e3f97a49360f38a204cd8e050b133cb9e1a44781e1cffa";
   };
   babel-hebrew = {
-    revision = 68016;
+    revision = 77921;
     shortdesc = "Babel support for Hebrew";
     stripPrefix = 0;
-    sha512.doc = "849c598ce07421613bb7dbdcb1893efe5facd807e5ad54a507d62054119113f349e60186258b7a60bdc695d7fae757ae65d64e7bec68710046a4247e52510523";
-    sha512.source = "cbe6c2798fcd9edf4f98520172cc56725081158d2968f961a6ad59436455bead4553070ba5ff52aee705464d261d0880c032850e51ff1514e631362f64ba0dab";
+    sha512.doc = "e46fe920bcf12e2e7a55f315a9859c57962dde4e3f703c9672fead92cecfd1737eec0fa60b6c0c0e0fe0f8ff113244b476716525b972877adc43cd59057dfb1e";
+    sha512.source = "6e4f812dfeb291829f146d298dbc28b4d3ebbd15b6e55dba0f36dbe9020c302a99e55729e6719807361df3149eb27a370eaebb7069182aac6683d9f978696531";
     license = [ "lppl13c" ];
-    version = "2.4a";
-    sha512.run = "7feecb0fecb5ba203e494c9ca8810c7e58df692617c7ef1e15128bc3d2c947fda90267c21b0dcb2743b18fbcc120da2a0f1ca0ba76cb74cb2e53b3039dfb1c5d";
+    version = "2.5";
+    sha512.run = "117b185f31c7dcc7d3807b173cd7bee41f2f67b9f37c4013590efbb40dc0d0f29d294a7dc9bef618fb5574a0ff81cf89ee8685eb59ee48689bcbf1419cf964d3";
   };
   babel-hungarian = {
-    revision = 75084;
+    revision = 77586;
     shortdesc = "Babel support for Hungarian";
     stripPrefix = 0;
-    sha512.doc = "2b473490af8f29703b029720e147f62988c0b8ae457d58d49026b3db74129491d4a63054d99bb6f6cfc8e899677bcb418da111b05b115b8ee0513d8bbfb2eb50";
-    license = [
-      "lppl13c"
-      "gpl1Only"
-    ];
-    version = "1.5d";
-    sha512.run = "797c3a6ed7876ff8ab662929aa21810f2173d880135752af3739d1e30fcd013277986de052d7a7a39b30af0125df80af1abbb73042e68faef9065de284d46bdf";
+    sha512.doc = "5f83599644aea358cc9cb63757a0536da48d9fb8df0057d5cba46daf32ee8d335d3465d7f079818e00ab51049d8b80903d7a06ac20c251baa20b9cb569ca9b95";
+    license = [ "lppl13c" ];
+    version = "1.6a";
+    sha512.run = "6d990980aa3fc1dde3602f4c5aabf58cda96aa7d62f30aa3e6d41a81254c29e43193c1511309beedb7141ab370a4f11673298ff48b90d2d19d3703b4f1be41d2";
   };
   babel-icelandic = {
     revision = 51551;
@@ -2711,34 +2708,34 @@
     sha512.run = "46aca093e061948272d2a54ff9f95b94b101582f0ec9d795668983c37b518be3c3d76d2c8e6901126d3dd7342db003589bacce9a40cfd573263a953bbedbfc48";
   };
   babel-indonesian = {
-    revision = 75372;
+    revision = 77677;
     shortdesc = "Support for Indonesian within babel";
     stripPrefix = 0;
-    sha512.doc = "76ec7d22dbe764b6c383c7a1931e3827893dca2f8e9f6fef6018637cd33fd2050d6b354bea28f48a912a73297c7da8aad9effd1ffae465b8151789008b580f4f";
-    sha512.source = "e2550eec2594168b90a508baf70bcabb07fe9e7ebaf653ea6f59a54129e8374ede03f8d1f444fdf0cfb76e85ef87c4579811862342c08c8fa76e8a05262513d9";
+    sha512.doc = "0514087f4d3113b6bb5f08557c13ecaa42872982948619611cce95bddf1e5da47284528e2751422674368fa668522dfa2baf2d460391ee18859768bdc3155e4e";
+    sha512.source = "a106fa18169486f0b86efc989c4c069de0f97f8dca5f9379caaac4913203e9c303305212532e8b36d51082f4dd73322b4b5891bf0746dd25513a7761eabc518a";
     license = [ "lppl13c" ];
     version = "1.0n";
-    sha512.run = "373001987699ae97c150a68c02a43a8abf9518394fd05aaef8c2ed7e2ab4398937aa3e880de4593a7e29e44a5235c49682cd32499c421d9839a772e7e5e98893";
+    sha512.run = "6d4b4fefcacb0ee4b1823f9865095f385d7fe5fa0f7b7276afcba32378ff4224e11b30dcd85887205ea00a8804814cb8b4ff4635fff3cb8f85824232bdcdaa3f";
   };
   babel-interlingua = {
-    revision = 30276;
+    revision = 77677;
     shortdesc = "Babel support for Interlingua";
     stripPrefix = 0;
-    sha512.doc = "f2f86fcb4a132a9c1f5c65007c8f1662a8498a53f265cc778ad3ba33120a97317aac890c1ff72cc6b94727d215937352ae268cf51344053bec6e0ee5687d0f69";
-    sha512.source = "260b2b01ec451d2a37e00e83c79a09f359a3e4a7c34b1396892259442a3f9d2df683e74e6f14a5cbb9b797f8cdc24d0bfdc7f9c3dbe124eb901f43d393f5e1bf";
+    sha512.doc = "9b3f6b5e4df7274b79729c1636b690d8343efcface0de8c178e770dd689826f6d18643f9f7ecc815f7c7866af65333f0ddddbf25e381a89648040af957e8047e";
+    sha512.source = "15e1aa4992da143cbdf0e48642eb12d5f45b248a92fe056c3a19dcb22212106e978c1182f674417d6a2f4ed8420801ca9e8beaaf7cb96214c250d272314bad76";
     license = [ "lppl13c" ];
     version = "1.6";
-    sha512.run = "e562cdb5b7cc35d14f4696cd3b85c6578a4daaf7899bf684026e50ade2113ee2314405756dd5f6ab91b6faea4da59a3546e30a18ba77037eab581ae3c98b044d";
+    sha512.run = "5827a208d65aa6d9f42dadeddad88f075277e95bd5b9826a8678a07ba663c35638ad35eebd1ec04e24881d9a0b3403d1e228fd905e5af90ef4588868b3c28042";
   };
   babel-irish = {
-    revision = 30277;
+    revision = 77677;
     shortdesc = "Babel support for Irish";
     stripPrefix = 0;
-    sha512.doc = "f5dd55c6a527cf19eebe492271d1404be3c995cac004d41160522c6c71e4a4636c32547fd64b93beae41b60d8a48184ff9b498f82ca0453bc72b601de3d66cee";
-    sha512.source = "df023dd1a4b04e022f46f7202b616e6329b4673084876c1afaadd41faf4414e908411deda1ab909246ea7e1922c46b0a70b5e3e3fbc6c4855e060d47e45ca21e";
+    sha512.doc = "37fcf8bc00d2ad867bc1e5d439b1ee5f0e660048c400f093f6916eb12bd6f6031e52a1febcd639bf011c02c388d3365494bc509c0c8d0177e9caa9f415e2cbd0";
+    sha512.source = "8113bd38293c968701b7fa44c749ee37f76dea0c4e468b96b941ad9e68253aee3c9f9bbc8194c18a8c7109bae367ba669e6bb7cb83022d3b46372d9df29aeed1";
     license = [ "lppl13c" ];
     version = "1.0h";
-    sha512.run = "d9b1486da57f9685e136e14adc61773ec0b3a58ade370da8383476862ad798f26609329d445ee6dd0c6419c98342b720a6880939324d19f67e1528fe99ea3692";
+    sha512.run = "8677c7efd72f4cb5f0d4298902a9921317b95361a6213836661339566f0ef1e6b93bc4f01f8b4971972024d0b34178c363df37f777ef50b7d3ef562ea9ef1bb0";
   };
   babel-italian = {
     revision = 77371;
@@ -2809,24 +2806,24 @@
     sha512.run = "c061ca1ec358e4d8df05e0adadd5d87695cf3b9f86cab52eaa0e08b1f5b1fedb66febe32107e74c1926fa4d697b056d7d3f119db525b90ff7e7bde30fd015508";
   };
   babel-malay = {
-    revision = 43234;
+    revision = 77677;
     shortdesc = "Support for Malay within babel";
     stripPrefix = 0;
-    sha512.doc = "b06395639e743571870dee10e029e4622c55683d7a9d728fff381bcabe4bf694511230795c79da4080299938acf66d03cc55fd45cb8426b484e19e0fb0f73b10";
-    sha512.source = "4e7e47a29802a7369f7bdcf29ac0fec13afd69f42c9b01060ffadb2cd8d1f1656f7f6ae8fe5ced67d9ce6438c26a07743a18bd38c561fbe8357e8ea3c685a5dc";
+    sha512.doc = "b2e3387026ba9d4efcca606fcd71a878dae0d551cf405f0ef3c4d46ff674188e1b8cd93c583d5c28596acd928b1b70eeb9b965f6356dbb5d236d47a42054ed19";
+    sha512.source = "6e744fbd20fab9d0bf4c68b80f24075de734304e49120da617777f5adab64e01ae46aabd17ababdb547bb122d6275ec8268008e950fb1ee94aa398b2922bf993";
     license = [ "lppl13c" ];
     version = "1.0m";
-    sha512.run = "6e2f95eb95a7ffe0b21789a65e74936139d92381867e507ce56bd8eb39b4061b177c10fed0a0226e9091b963370d3c001115473625910f03b699d5517350f2da";
+    sha512.run = "c5c606251cae8e2ab35e6db8a6776cb0663bc707f1e0e8e0f46a031844e88ae957c91a63e1771a53c1cf83752773baef76afeb1d328ef202d4cd19f38e9a29b2";
   };
   babel-norsk = {
-    revision = 70691;
+    revision = 77677;
     shortdesc = "Babel support for Norwegian";
     stripPrefix = 0;
-    sha512.doc = "9584525d44a01a097f8b9dda87249701391e3e4872d67e846571b105cc67f5a6756016883f5836fc82fa897f5373b9f2c8f7653e11ec16e0be9049e089750743";
-    sha512.source = "30af09d4030dffb887294607eef5642a83e78ae4ffa1e59a446b37f8b941f76c76ee0f45fa356046d09f804a49fbe3b63686aca45accd7a31b7372f8981eef5f";
+    sha512.doc = "723f8cf22b64427e6470fdf2ff3d4db320410433d68d72eeab535a696fcda5250da50d74b609010dae8beabec6588cb6dc4ad057d86fffab56667d5a6f1f787c";
+    sha512.source = "2c5a4f74256646ac294b6ad415555a7b88a2f823a6d2794fa1ff6fbe4c4378bfd638f7bc0ede537d50fc5756658eeed75c5f63cfbdd281c114ac7abebc46ee31";
     license = [ "lppl13c" ];
     version = "2.0k";
-    sha512.run = "f19a996d1705af3435079b480246b696a79427fb0f6976cff8e1c77ae99d810ac5483b4ccd3e5956609f7f757683bf04cf0b2930551dadbfb58a65180bda441c";
+    sha512.run = "bf0d610cd025ab8b7ad66712263f99055479dff0efcab97c4faaa7ff2489d18c79945120b986ac73b1346bab133458ac44a452e5f5c20a66f8700cd516ec6307";
   };
   babel-occitan = {
     revision = 39608;
@@ -2849,43 +2846,43 @@
     sha512.run = "72fe6338ef6f172a23790402a632881906689117e7227b6f2f2fb6129fca9a7d44c42ddd48e8286252f3b5fce9dc34439594882c1f80f33557ef5ef70afe4993";
   };
   babel-polish = {
-    revision = 62680;
+    revision = 77677;
     shortdesc = "Babel support for Polish";
     stripPrefix = 0;
-    sha512.doc = "536b3ea736a9e876f2e7e942e56841c97de27b94d00e58656e9d7ed3b27aaa43947deed1d04fc54530c082095ce46737f05969afa85fd5de57baecf5718815bf";
-    sha512.source = "21d9f5a3f4a6e9f7595b8e38af5758f0eb06d8f390448a39c164b5c4e7a83089e3a254931a1c23e8dc088eaa6874d5f1451b78f14b7b8dee863daec62f78a490";
+    sha512.doc = "5d724bf9ccd0ac427b3d6aca0d137322c4756817dbadf0dc182f3289f0b437fb0f42c9bef33adf1938ce2a65e59bc929230a7822ae43a61503dcb0ac24edfaa3";
+    sha512.source = "eb12a066d025f1eb1dc39304588eed38aa45ed1d0a35d89852cf3cfb8102f8c0d0be6e26c7da10f3a80a7d46f11b34857d496b7bdccadb24c0720fd663732aa4";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "0088388d0dd6459e5ac3062cbd5eeac7ae0d858b93ff278b6bc7a95e8fc4846d8c12530eb41ed972f5009ab745857a5599d9ce25860efa06a3a1dddbf396b4dd";
+    sha512.run = "2ee576d9d3ff0c6932508b96972121b876dcba6071b59964386e33e4199b6021eef12951675ab03b40b70d511c9667af7a656b82c9306a3328d1597f52208f8e";
   };
   babel-portuges = {
-    revision = 77468;
+    revision = 77677;
     shortdesc = "Babel support for Portuges";
     stripPrefix = 0;
-    sha512.doc = "2e2315f7b54436492b36c48033ca2e59744e49bbc194eb61315efe49c6c804269f314466e58828ad256728c73d23610f29f0ad97ad12c24355cd5df29a2f4f27";
-    sha512.source = "21e4de1b2267e94a8414bb257c3c3f417f9f1c131ea39dec5059e9252edbe27e3ff8c0ff2d1718ebc6745c68dea13731567dab79f80426ee85408d167a15e104";
+    sha512.doc = "454d2258150fe56d342f02c6ac9e8991a540ecae2d737a609186f52d965ffa17a50a44a194ef6a48860820fe573d2affa8e3b9fe41188b1b164cde5f4554e242";
+    sha512.source = "5acd223f2cac6f9b52f041fa3147bddefdd0ace3a0bc17ac72cad1393b5cada0348ea157fce4d59e426af3ff7ade4dce138c8de8caf2990cfd29a5ccf6922a96";
     license = [ "lppl13c" ];
     version = "1.2u";
-    sha512.run = "7d982157758f74af40080eae1bfaa8d47cb47d20b7cec7c85ebea30564d22fb24f9e5195dcee4c8969431a813e3a07e36aafbf9d9863a287ad2ea0d33c7edf13";
+    sha512.run = "96100816833dad45d19c1a85acfd912d9ccd4c29450acab3566c5ab71a178c326bb5c34063752cbfaa247ba34309940ee2f0a4a5ba1e59b7c04efdd30d820473";
   };
   babel-romanian = {
-    revision = 58776;
+    revision = 77677;
     shortdesc = "Babel support for Romanian";
     stripPrefix = 0;
-    sha512.doc = "73ff361e7e03499427529824b83ea584a5ca190aae3d1ef9a5f4a5adf52cc8ab02f5652c92c1464a702f581e29626fa9cd14d4ee84f6cdde69b38af9d10b20ee";
-    sha512.source = "0e4aef9bf20e6602dd946e2ad2856c7ee7849b492d4b66334450b450faed146eef83d2b7f13506eac6f34507bfec4ae735ae9845d3a21c36d98105bb353166c8";
+    sha512.doc = "9f6c573fd3ef99c364f44f827fa40e0387878c83db1f25fe9c1231bd80d980bd870e81413dd2c80c692cd65fea11d654f8921e57ef2718871cd469979a5fa73b";
+    sha512.source = "f084e48ed1b8392661adb6f4511e851052afc52e130580f470df965c3300cc9857f89589618ae659744a76e325e522bc2294172f00fbed62f8af48ac9af5da66";
     license = [ "lppl13c" ];
     version = "1.2m";
-    sha512.run = "ca6318ca8453dae2286b305766c6ced299f18f390c0d0f44e77ddf8eb4b05c31c7a2b01ed52e271f68acd6b127650b370d15ea9bcb3b591fd01e5d3a50b17db5";
+    sha512.run = "f4755b0937a9df27f37ebfd0580ec3a9c2ce1d6aafb2165162a37a89043142f184703f2decfb043a5e6e4b0dc7504da632c8c792a0d46757d9ecbb39890a714a";
   };
   babel-romansh = {
-    revision = 30286;
+    revision = 77677;
     shortdesc = "Babel/Polyglossia support for the Romansh language";
     stripPrefix = 0;
-    sha512.doc = "42f9b63d92e522b596839d10c1b90ee9052cac86cdd54ac408063c24456b2a7b5adbfc8208a0a388fcffbb19b98ae0810f7da9d6bc517ddeeab78c8389bdd5a7";
-    sha512.source = "e26e9ec260d7f01550799f90c6bb76c0c29cd200896c4634085627599f5c3d7438159ea9f72df416e334200a7e1aa3f063dfe9bac5817f55c8f6cc83fe906a63";
+    sha512.doc = "9f9f4d85d9cfa5fbd35197d535605de27c80a4305466a0348a610ec02f9631b1a14611c6ca3689b4f35967de13b8c8e477334008bbe65fcc758a884baa62f2b1";
+    sha512.source = "9e2408a8f2b899744eca20cfc030773205515e7c3081e515d0cd4ce8fe8a936477d51371a6747c615f7e3b76d74670ce6c84af1b5448402fd85fe62bc4e8ca5a";
     license = [ "lppl13c" ];
-    sha512.run = "db28e78ce4e028ead2f31fc84d0e7d8997a18dff3bf6aed0301b79bfc7bdc52a8741f9975766d36ca9ca2af9908e7e0bda9e454abf268a1eebf4693c30f5a5e8";
+    sha512.run = "5cd290e6bfc567a01408dbd3ad3bd5ae44a2a30855289eafad98d265a04d3b45bfdb7403b1451abcf20ca278d1e9935bdd626b8ed22874f4fc12668a5069850e";
   };
   babel-russian = {
     revision = 57376;
@@ -2898,24 +2895,24 @@
     sha512.run = "5acec3460294e71e6def384a7863a849e8a5d431dde49c77a4a7803af5373b56fcd376f6e73b237dd230728ab5b536f903b6a1bb19fc478dd5e742293a6e6ca8";
   };
   babel-samin = {
-    revision = 69604;
+    revision = 77677;
     shortdesc = "Babel support for Samin";
     stripPrefix = 0;
-    sha512.doc = "cf8a3c56fdc0474fbb3080743fa852dc22ea4f1c791f7d9b4779faa232442a22b46662c92e61bf84953c8312ae9fbea859282799b393701b0c176e4d23edfec9";
-    sha512.source = "85b57da2d3bf5dba4c9f02d10dedd4400696ba1827793e81f83343fbecc15e5d2fe507138c3c309c5c8b02f0e868606e344c05db9dc9c84b032e4132c65996b3";
+    sha512.doc = "3d07a9f9192db5d8224726fc88564bf4338020fac47733d0541e89f298b1ce7bbb48913a17079916e04a70f5fd5c4a3219f8856c1d6f27efde2e85d686a1a480";
+    sha512.source = "ec8cdb4767402ab449f4bd96f7b0b9e689ddab0e055b2910b2ea658d40d751b94d562e08e7d9cb67c25ebf16c751b83e5ef65d2938ee93bfb2fb42e45c165dab";
     license = [ "lppl13c" ];
     version = "1.0d";
-    sha512.run = "bee2cb83522430ff8bc8e65513d2268a529a041b85b10315c4902749d840ee1716db45df56f259a7db726a94147fdebfa573e99b9e654c7ed4df87f5d574877e";
+    sha512.run = "e49dc84e7d1bfb62b24aed129086deef77671306b034cecf7f3912132137f7bcd4d3b21e6465821528a30fa39812323f8e0b835983db7bd3a2d17adea8503bbf";
   };
   babel-scottish = {
-    revision = 69610;
+    revision = 77677;
     shortdesc = "Babel support for Scottish Gaelic";
     stripPrefix = 0;
-    sha512.doc = "725a988893fa1cd3064136376de3475fc8da63993a40c0c63165b5c13fb4ae15a1ab856e2075e05d3a4e492d95d1aa12288b808ac3a1a15ce539a35edb289aed";
-    sha512.source = "cb640792dbfbe7733238aa67283b9ba954456246ad7ebfe0ba65bab08060e06a5dba7441fb2e6cb7c421584f8377273469477a5d1b6dbbe2c593f844aca80ae1";
+    sha512.doc = "0b74d73202be9fc9d1bdc1385d471243a29651500b617a45e1410346e7607ff0c9dd62f7fc866e3dcdc207d157c924a3179ed5df31c9bc7598963128af5d6edf";
+    sha512.source = "683dcc0187445e7df5c097660cd4d62408a6281c7891614fb68790797a597da60f72da7d46d8e05620bc9416830dca87c8b2cef382332e45e461a495ff711533";
     license = [ "lppl13c" ];
     version = "1.0h";
-    sha512.run = "16632367173512a1ff0d678334071893efc91d9ca16279075a63b84acabaeaa8cd35263f56e6e3251cd57a77bdc9f0613c34e60f0acc8de14f4e0fafde751d81";
+    sha512.run = "5147eeb6396ce13c563b410503b995f4fdb4010df9ab2ef1c15fe06a121e24c2b28b34a94e732c3230bc38a40810dcf1ae2589a2da3591048744f5f9903d6331";
   };
   babel-serbian = {
     revision = 64571;
@@ -2948,44 +2945,44 @@
     sha512.run = "b14b98d2cb66a3f8f5d8a313d9208a700d1c3664a5bd23f5baf0d9aa2e3acf3891a0536871988e7579020570999ea05a9dcd60a404cd6670e3c1cf8110d9094e";
   };
   babel-slovenian = {
-    revision = 75181;
+    revision = 77677;
     shortdesc = "Babel support for typesetting Slovenian";
     stripPrefix = 0;
-    sha512.doc = "e61b8eb1c3a0525eff7ea90d815c399ac1752d4a813391a8e32c56b8e417dabfbff1a1a001e1e98a53d3221e11a2c1879350419250d3d5ca59ca390ac3e005a6";
-    sha512.source = "185489f459e3aedb8eb514459b5d1eedd0be37f6de24b9bd0cbef7b8befe5735afda9e70e36dc316e2670e16eb6662e0a3428f26ac6eeebdfeebcdc6529e3c54";
+    sha512.doc = "451c821aed922c0f691d971c734b2eb26fee0cdc6acd238f93e3e5c07fea55cff121babbfde489e88c0c14f36a8c4677cd8b9ba249af2eee5ac0eb4a9e21b4a6";
+    sha512.source = "4d0d8f96091181b799b021720858d1935617f6682e95a6795db5425c17f8b1332a0d789cfdf3b2bc2f44a5ff3cc8fdad18425d489013879bab3286c7fae6b715";
     license = [ "lppl13c" ];
     version = "1.2p";
-    sha512.run = "11a4e8a93be8e1a683e0e39048fb10e8092748ac5e23c6b3fa1a0ac2454e3123e768de7f0f0bb3b6e14ae88d59b2a696f9d703267c92eb6c516ee680a16fed9f";
+    sha512.run = "9906940bf338c9957f7e09bfa76983cd9bf05b2080e363d6bbd028655435bf3e1a2a891759ab0ccdb8156b3fad2f03e33f93c462dce87f0e1d4077b710c2be7f";
   };
   babel-sorbian = {
-    revision = 60975;
+    revision = 77677;
     shortdesc = "Babel support for Upper and Lower Sorbian";
     stripPrefix = 0;
-    sha512.doc = "ebb371730cafbd37a4c54dd0ccfe9d6e187aae747d1b6de9202fd09a85b5b38f8814e0bd27cd86e51c5aa62e6816ac725e28eff9117d6dc474a9e32f3b6fdaa3";
-    sha512.source = "57d29eb253398abf3210acf390cc80e97b444c370718bda75108fd1d70c1c7d2fbfb43f6387751cfc90b9cb9020eb4222fca0821d10c4d52750bfde05a2557e1";
+    sha512.doc = "0afd0677ff3d8ac4872267a99746820b65c71b00afff78c5aa89fb52376eef03616d88f3115fe74073a1da5f1a47d2179c851d6f3fd15b02f0ba6ebd04603cc4";
+    sha512.source = "969552c1695bdde77635cd0b378dafbd9f45c3d2207125f7084093894bb5f9fad9adb25b061b89b0ea5dbba27842fa1e9f912df737108a9d397fa2d175eb6fcd";
     license = [ "lppl13c" ];
     version = "1.0j";
-    sha512.run = "629a4f09de7ba1a444af0fc4e6db9f53635b0e000d375296697096c2debd782496d7b36f7745af42a8a19f6cc24c6a832595bc6c89ae20d79701c7181d1a5d68";
+    sha512.run = "56f8dcca30e1374a11161911cbfefdc00577ad3fdc7b96e559eadeb59ff2909b1021c9c32720c46df6945b14cd72b69eb9561269dbb9ee945e087efbd64d38cf";
   };
   babel-spanish = {
-    revision = 59367;
+    revision = 77677;
     shortdesc = "Babel support for Spanish";
     stripPrefix = 0;
-    sha512.doc = "9c3e87e7de6fa46b0c6b9da65d4c23e31640628fd6fce844b53d896ad85813e9b804fe4a36c7c2c1cf26550a51551b39150a12467e26fad4f9bb9094dc0af817";
-    sha512.source = "48e4293f6c7aafed829e273e0e5ac2709a082e648988bb40e5bd0b36aba6d84aa036d07108a2bc76c65b4ca029a9652ab38268b7e7a87abddc03f00ad55a7fec";
+    sha512.doc = "6896ef81968bdc7e13264d556f16f05c13ad3fbc55b1b4a3496093b29ca85e0593309cee08b87cdd61242755d1749c62b8a770b973d1213334c9e4315155eaa5";
+    sha512.source = "021f793394540cf17ae07709d28fe48dbf9ccbfdf4e102517853a7800d4366129635f14c6c9f6d3ce78ea0185e0c2f618c56ccc49fbbea9caf704b1f3d9b06bc";
     license = [ "lppl13c" ];
     version = "5.0q";
-    sha512.run = "2da1b62772f462c8e058edac7d305804be6234a720446288fbcbe2e574a1cd9f905e4220b4008dad64c0e59b15194e2627cd1e295003c1bcbdd523c8498fa26b";
+    sha512.run = "c455cd28b5c532369f398eadd552b83eb9028c359681a2aabf3692a73036aa015ab46188bc335d28268de86090f529c981f77f84b388f38f6525850b5d730122";
   };
   babel-swedish = {
-    revision = 57647;
+    revision = 77677;
     shortdesc = "Babel support for typesetting Swedish";
     stripPrefix = 0;
-    sha512.doc = "33a59fb66617ee8ff66643e57b0146940060d04bb7bf2764bce97a062a955ddfd80338072434f86d86c414a22d5ce6f120be4f21523a3d81e6e88947e9c2e57f";
-    sha512.source = "fe6e091f5cf7b0946a6be154af2907288dbc5ca58a003e7009740b2c85ed22075afb424f805427a5838e3729a35cbdfcd8934f860a32eda0523f141f3c9a9952";
+    sha512.doc = "61f2e139e58cf83dc5e655de525879981aeb5cc2c0cc6a80b97c9c8b8e4ab7c21fd544b68ba37ee86a0227fe5b0bb4469ee907dca1c888540ca0dfdc2ac0b3b2";
+    sha512.source = "c0c397ca51374f92d0006bbc95f103737d66cac6d9ffc713d7865d200ab2b983deacb9a50f9270a33900de1fbe4aed15292021514ddaff62442b81683ec9e833";
     license = [ "lppl13c" ];
     version = "2.3e";
-    sha512.run = "d3ccb281b9a5405866b0a4621cf0ea4fb75a085041de5d52ef0eb6db370cafacab05d1eebfef21f9558f4110e19b739e6c5cc424709e06640e8290a9c01722d6";
+    sha512.run = "ff77b36d20b68072883f30760c323f5da51028d29d017ea887b5338eb55df3529e6a2d62708fae2f770d8a460ff53c39ea885d3209f6dba3cee46f86bb665638";
   };
   babel-thai = {
     revision = 30564;
@@ -3028,14 +3025,14 @@
     sha512.run = "ddb75c37017c1b0b6af2cfbdf574526cdfdce2099d599a23cc8ac819f6ebe5ea7a2eda4bd743af93d78835ca5dccb3d7fa55db22b3154862aa4affe83c28185f";
   };
   babel-welsh = {
-    revision = 73855;
+    revision = 77677;
     shortdesc = "Babel support for Welsh";
     stripPrefix = 0;
-    sha512.doc = "1237e185482c8e88aeea3dd9a008e8f007d36d639755649e442f72585b13d32e43dd06c25522974887a103b7f369e5d55e0665709605aba367ae4c9d99501ba7";
-    sha512.source = "da556844d9827b20462847de40c6bb098d3e92c38311f06dc9421e40adc73faefaef511e3bc23b04f0b2e7c27e22e22d4ca896cfac43df4221204acde6b2e9da";
+    sha512.doc = "458b14e7ee7718792fd600d5265b9f07b96ce0520ee47204b79116ccae6f6e883227bd24ac0d984870457b306ee78a5695531c589c85b7df76bd3227fea07434";
+    sha512.source = "55c938c41350bfdfb286f3c5ade5d254e050509421aa493e950ea7bfc76d9ffacef19922ba3c7a5230a6d878e90ce9e1afc45f5cb3c7176244fb83399d923753";
     license = [ "lppl13c" ];
     version = "1.1c";
-    sha512.run = "afac45ab8e483d08fd192559a58d642150bc402663b528d8235515f7086ce0f9420d44b061580509dc658cf46549b079345194eb4c7c772ec127e5df5018247c";
+    sha512.run = "423ae7f6c0ada5583336d314fa810ee8c71c0c414fb4cd30916ae624d91a4cc4e71ad328455a094b21792fb727d159ebe0f3992b71e513c6beffdc27e990a1b5";
   };
   babelbib = {
     revision = 76790;
@@ -3183,12 +3180,12 @@
     sha512.run = "8081a9b253c77cc5e68efeb8c66beffc189898cc6ba80cd96be88c57d3117b2c270e439fbe47983309625c90def14f3b2d2c50b567f4f461e4c0ef591c7ba63a";
   };
   bartel-chess-fonts = {
-    revision = 20619;
+    revision = 78116;
     shortdesc = "A set of fonts supporting chess diagrams";
     stripPrefix = 0;
-    sha512.doc = "e61232eed7f345e28796192d836af9de29bda257fb85460f67a89bbdfd7dce01b8361962b7cccf314311c0e772e69367f2921ad898c106389195164b6c925ffc";
+    sha512.doc = "bfb3378ec85c7dfb7dc01bed75a5b9721ef41e970b9b5c1d7fc890e6ea24e410a006460cce7ca75f7bbbc634f54ce49dd69ae9c94411423dc630b47fc36420d4";
     license = [ "gpl1Only" ];
-    sha512.run = "33c52620d32f5e79a702bb664cfcb47409faa049dbf7f34cc5816005b4667267810fab130e3aee1ff7a7e3292af37c2d376c01dd2bbf17be199a22cc36ba751f";
+    sha512.run = "c877a4e57c48e2f62dbbb3416f46f4cd1979352a0cbda8ae17a8622399d9a0a3db931a4ef24032595fc973a034e76116147dc37137da5392667274cae0fff05f";
   };
   bashful = {
     revision = 25597;
@@ -3210,20 +3207,20 @@
     sha512.run = "346edf1704ed621a326e4f945b8f5341dfbd2d46af095691c7b853a9683dfb2254d443ae04bf235f192a57dd55336dd50249b0963bde041120468499e61012b7";
   };
   baskervaldadf = {
-    revision = 72484;
+    revision = 77677;
     shortdesc = "Baskervald ADF fonts collection with TeX/LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map ybv.map"
     ];
-    sha512.doc = "cd6ae17f9140ecdf535c403931d0e2dc7f706f6101991a05d0ec4d65cda5e687b930348097c335f00a5edf1ec9ef44fe580bf74e736736645c96eba4b6bc9cc3";
-    sha512.source = "1a58429737a368c802307ff5bd7b55faac86b523bb300d8fb0e659ff1b755a1a23c56e0352c1125989a7b532aeb171e7b8f84bd0fc2fcec505bc3d783e05526e";
+    sha512.doc = "ba666bfe5e1f177b8c0625718e794224e6727eef1b58c7c8854d50d5668d0967a0434c4e93d9966f4967f20e42abeb2ba2d3d6954fc7b5b1f063b7e49cf02e20";
+    sha512.source = "6bf662619301460ca36166a230294093aa094d1654af33611c6f2d930881b5daf07ed76efe5419eda781f9336986bd6b3ea4a1c8c59e52559788bb3357d562ab";
     license = [
       "lppl13c"
       "gpl2Only"
     ];
     version = "1.1";
-    sha512.run = "4bff5a91dd051b5b1468e192a0139357699e3c690c791ef8e9ffaff4a0534622d75b3d731b27c2501f6f0cd38ecaaa735ef4a7263e1a0e482eaa300ad39d0abd";
+    sha512.run = "8ca75b8ef27d27b070dae1c8ae752f82e0186f34166fff5ca8ac2d3b7c1e89244869a672268b161d07b2edbfecf5a181df2e19823efd849e74852d9a680347a7";
   };
   baskervaldx = {
     revision = 73362;
@@ -3241,19 +3238,19 @@
     sha512.run = "5ac42bc7b97b210aa2c2ef9b64e1ef5a8baf6a194108cc4aab522183eb1ae438843116cba991d1439540dbf8927e484c966ee984cc70ad83e5a3de5ddb230be4";
   };
   baskervillef = {
-    revision = 73381;
+    revision = 77677;
     shortdesc = "Fry's Baskerville look-alike, with math support";
     stripPrefix = 0;
     fontMaps = [
       "Map BaskervilleF.map"
     ];
-    sha512.doc = "4682a2702b1dda06c8bfe8f72995018c5bd9e69381f40ad76b7048dc88a4974d851d039ab99a2cf7a131c25d974e6a58c0018725b4543850a28ccef5a09ddebc";
+    sha512.doc = "b5485eb41a47550295ae8037b5ca70b5000fb7317c33a2f8226873f30aeca4046c4c4fb031d12c4de56823f90151df54bd7fe924ccb3fcc4a70c68c2ccca5dfb";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.052";
-    sha512.run = "2a2dcd99017a64aca8d9ba4d2e26972e444787b2100e96e49ac807e15f7cfb6900db0249bde47ef2bdfdec1fa9d22d1c1db8cb37c11e9115c3d1de300af0be5b";
+    sha512.run = "4edc7be5183741a38c0d765df0d4d1805a8266537773cce826a360df46a78e7a57a01c251c91d59e8d954355d77d9d8342e46d354ec64d63b1910934e87fb99f";
   };
   basque-book = {
     revision = 32924;
@@ -3294,22 +3291,22 @@
     sha512.run = "ac7fff708b3e25312460a740241ed003ee471f84dd4d30388d9cde8380ec9a6b6fa6fd6aba69b170c464a25bec44f1669fabc4ac2d7d3e216885b7e683f88af6";
   };
   bbding = {
-    revision = 17186;
+    revision = 77677;
     shortdesc = "A symbol (dingbat) font and LaTeX macros for its use";
     stripPrefix = 0;
-    sha512.doc = "a1425b521b1c8178bd6c9b059acf034080be6f3f312decb575b7541d34a6e1de926965cde8701061ffcb57147052b1495b21142f0eac645596a783820eb6200a";
-    sha512.source = "be0e2b1332835920a3c93ec69ae53fe83df4918db9d3080716d7b77edf999a87f54a4c87ccbe4d48b008403539a514810f35c6b2a59d8be0ed6968f6a91ba129";
+    sha512.doc = "2846147e10e397e12802dc24a7d462083f3c32b943e35dd142470f49942b298c4ae861709d2ec0cbc360062bec65123e24c076928e1471aec40f3ee87889b366";
+    sha512.source = "626277b93df4cfaa3e6af54b06ac14862e36823afde37d336d8bdc09b4fc6e106571a22e333869d1f9072ffdf515ad213040f879b5ffef87b77a775698c16384";
     license = [ "lppl13c" ];
     version = "1.01";
-    sha512.run = "d5505fd7aaffead426a873844112e11fba47694ab07d0f5c88be31188fbf4a09ed4b8f8bce75221b2b2efb3ff81fc132fe54c2634f32679e2e2041944ec92f7d";
+    sha512.run = "6ed359e801c37cca5952705c4d76e55d8967c9aa3a019a3edff54f86ab1f05bf9f0b47c2ae04828c78d2132522d7719603f47c5a3500c98c3693abb50043409d";
   };
   bbm = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "\"Blackboard-style\" cm fonts";
     stripPrefix = 0;
-    sha512.doc = "034d880588fa88d97045d73dd651a0b3573c624dbbf1d2f9fee046c59f007b9e3e2121d5d773b34aa7b0bc8c72daa540447981bf60731e64d99cde49b5f6e911";
+    sha512.doc = "9ff8ffceda2b38d250b3e5520d61441c9880bc58cf1d38904d52cccae145213e3c392dcff3d91fb3eb4b559d8ef76f0fa71f8f5624077f5d152e3d1275110f87";
     license = [ "free" ];
-    sha512.run = "d795fb56f2ba57dea55a546244c5d07bb20c104cb9d1e6f9b6c229df9e5fa4244f8bb883bcddc150e1072453cb518d31c110bb85d157b4fbfeb47195da939619";
+    sha512.run = "d9d77c1ef2ee1bd88a113da65bac0dafb58f4293c87c4f34a022010cf191acedbe049ba70d7a2c05db5c4cddb711f12ad6182360c9dd9972f518ee76fe92b6ba";
   };
   bbm-macros = {
     revision = 17224;
@@ -3321,14 +3318,14 @@
     sha512.run = "06f59837d585c721da77f289119bd4b45a91e3d72543ed3e4de76f84a2916431a733baa379b83a3e299d166e27bc0350df6f053d1ec744c52dcd0297d416fdf1";
   };
   bbold = {
-    revision = 17187;
+    revision = 77677;
     shortdesc = "Sans serif blackboard bold";
     stripPrefix = 0;
-    sha512.doc = "c754e81f83a53c4a1cacbd2638d550ad178e0e26d7feb592585579a27b780e11733a7dc68fd374ac575cc7866a1e5417d3df0d2b973e7278d1012657bf340390";
-    sha512.source = "a7a61bb796d3ee618ddc39d471bb29d1b7350a40bd7a97d44d4a1c7cd5e4eb5d5783d2ea46313344468406d1d25c71ac322ac4bbbf7b06aac35bc03651e7ccbb";
+    sha512.doc = "30d435e216473a4773b8daf8f8910312de4bcf9d1c25304008c26274a80cbf73b2cea617058d3587692d8edaf818cea5b21d313ce834125a2e1dd2a037d57c34";
+    sha512.source = "ec9a731f127f03691ee1fb848bc30e1724db2117285adf6d6fbf6e8b4f1daf29283800f160b1c438f9b041ec3c7296a76f7fe7332411d020a98200e6063efc5c";
     license = [ "bsd3" ];
     version = "1.01";
-    sha512.run = "1b123e9135179244050ed6f97f17efa2a43c42018b2fa3b01c956a99886ae6696c83df2a0d61ce95cba925c2bb4c734d77253aab165fe9f622695f557fcb0abe";
+    sha512.run = "ba2c4d3d9311c0b02736ee31013007cca203f1dadb06bf595ce58097aa4a6a607d71f6dd05378d9bf4462ba0db542df863704e7b89185505b38a4b3e22154f6e";
   };
   bbold-type1 = {
     revision = 33143;
@@ -3342,16 +3339,16 @@
     sha512.run = "86631e16388a447db7c521087eccbb666612933f6fee8eace091e00b20b5070d38ebc2d4d0a754536eacef9e9e6470f237d184e00cc4419bff85087f54b81566";
   };
   bboldx = {
-    revision = 65424;
+    revision = 77677;
     shortdesc = "Extension of the bbold package with a Blackboard Bold alphabet";
     stripPrefix = 0;
     fontMaps = [
       "Map bboldx.map"
     ];
-    sha512.doc = "671259c208ea744654b82f25fddc3589fdda650c2121c71763ca4fb4c0ebe3a99906763c5adc354f49edec4beec59897445f5864a37640f67e47c8df6473f2fe";
+    sha512.doc = "44ebbcb4fbe6e99095fd16221437f731c67aa396bb731a737653c3e6b3cf408196fac7adf37d0248d88d63ad712acc175a0e0babe9a9af7653b84c736cc01e51";
     license = [ "free" ];
     version = "1.032";
-    sha512.run = "b75c9f544bc0c6d1c046d614a6e0ba52a9cf920d73e8066e2d5e656e1a8774d42677c5a5bc9848e45bd4892e3ed19f6c3c281333f437b541d30d3410be2618a8";
+    sha512.run = "a5a0463fa2ec9b0991a0c9edd8a52208f18ee5c630bc11125db55adeb60665a1c820ac9b785283b20bb872621e2af240fe43ef4dbf69b83dd0ab66b36d392707";
   };
   bchart = {
     revision = 43928;
@@ -3363,16 +3360,16 @@
     sha512.run = "b78e4017d0355107e1e73670c20457c2dc314dd0537bb3e699df3118231b5b3c0b2acbf50ca07f71216d56c81acbb031d38dea7b42099165a03a8049f62021a0";
   };
   bclogo = {
-    revision = 69578;
+    revision = 77677;
     shortdesc = "Creating colourful boxes with logos";
     stripPrefix = 0;
-    sha512.doc = "e8ec77512bfbfa00de03585ac9b0b47a03d60ab27f7a10303efa3e37bd285c8c0d959f3a5a013a300022121da6bf4c07d603df63faaf0fb44013313f8369aa5f";
+    sha512.doc = "67e817f0121ef6a54b04c122311f8f39dac5d13b17454dcb583ea930889f9495cb18788954acb0134522357694842aebd579cf1c0e6be0e7b14f7a298eb59a0f";
     license = [ "lppl13c" ];
     version = "3.15";
-    sha512.run = "d3f060c91f1ec7f8c836e22b21dd735895055873807690c4d8fd3b90652a7f6f1648decc23f66a6d51c4970a27817642ea6e66b74b2affcf5c938c4707568018";
+    sha512.run = "fe06ff073a2b662d462d5daf8eb6f08e34cc01f5899fa52cc86d36d0b7349582c48eb4c0e53266195d243d6e8f5bc21a71ed6212915979eb04fac0122a60ccfc";
   };
   beamer = {
-    revision = 77450;
+    revision = 78116;
     shortdesc = "A LaTeX class for producing presentations and slides";
     stripPrefix = 0;
     deps = [
@@ -3388,14 +3385,14 @@
       "translator"
       "xcolor"
     ];
-    sha512.doc = "21b58653225141f77b09f3bafa121516b2bc7727b05f3fa0af5aa2150a7fe05dbaa435deb2fe2d9752582b69a69c780037b07350290f1e08ebf881d97953c115";
+    sha512.doc = "9acbbceb70c3f223a0f945f6cde4729366bc09f5e332b17997992e965da9b90a7e2debfe095f5ad5dcec28f09bad047dc89c74df9cceb2da9b62c2cde53d058c";
     license = [
       "lppl13c"
       "gpl2Plus"
       "fdl13Only"
     ];
     version = "3.77";
-    sha512.run = "ec279ec55f751cf3129a1571c54ae83cc6d662922c469441793b346e281fec8bb1abbd3db72cf288607bd06f27291daea9f8760aebd9f6f04a3f9cb8a9ab37c4";
+    sha512.run = "177aae4a136095910bbda8bd4802167efd3a6fca40ef4b4b3c6445837c2bb19be6883f91705ae82413d9f7d3c69f1d7a43a70d4b20db61c869aaca3865bf39d7";
   };
   beamer-fuberlin = {
     revision = 63161;
@@ -3407,14 +3404,14 @@
     sha512.run = "6638fee0c05b9901935204bbcbd79baa1cd0213c0aba6c8eecf1a9f4b2b44aa9403f42078e84e437e7e14d36a991afd0446ae9ffd2ee3260814944fe7b52e92d";
   };
   beamer-reveal = {
-    revision = 77553;
+    revision = 77678;
     shortdesc = "Convert beamer slides to reveal.js HTML presentations";
     stripPrefix = 0;
-    sha512.doc = "e0e38224ba4e5dc2163e7ee30eb56d9b6d3b4e798bd98386f19129f1bfae7b463a87e1c315ddce91c9134a13600612d1ef8023308fa5765626f7ad451de42cf2";
-    sha512.source = "9ea3eec52b41aeba015043d95329df3e2ec36188aaa0df8a4d5f37a9b3600a60d95650af942223eb69d8786091edbb411e99c78c259441c937585ae91f5e22b6";
+    sha512.doc = "acb49e4aa8affa69dfc02de3078dafb59bd0993e168beb1a3e437e71ea0828c5b685b808fc03c2cd89e6c5a21746d766859845487ad513ba84e0fcef90269a2d";
+    sha512.source = "8423425fd08d59c5d78b0dea07d91fa34192eeabb800bc576fcae0a6e936143e1be7c7d25216270fc4740147bde8648a8a499f31e82dc40a5bc8af191cc16f07";
     license = [ "lppl13c" ];
-    version = "1.07";
-    sha512.run = "43a286a9c04f61577a3d945de4c60f930ac4e0d94a7e7ffbd24bc92e76fc45524a792c717cfd034119ac53335de886a00ae7584b5d9b6772bbec643d9f7461b7";
+    version = "1.09";
+    sha512.run = "178cfa41192fbfe7d2c71d6a8da88ddb7827ad3e246566444780bc640b73587e920d664e2f059eb8610e68465c2eb048504cc62dd40821b167b4562c7ea10264";
   };
   beamer-rl = {
     revision = 76587;
@@ -3522,16 +3519,16 @@
     sha512.run = "ced5c093d0c4e3c23fcf774bfcc768b8a3adb20287e0677e1a2474d5ad1eeea1f5f979f988c0f0ae6a484ec1953b95c044b0803df9f76f289e999ec50889433a";
   };
   beamerposter = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "Extend beamer and a0poster for custom sized posters";
     stripPrefix = 0;
-    sha512.doc = "f597797340286e4a87b62696fa167af07a1717a175646d11836e1f347601551fe0aec5ad4362c135d0f6bbf6b45e217a91bdb5053ba1331828fbc352583d3697";
+    sha512.doc = "81246d587e8a52efd28e6d866ea443c9681bdb72df642724b046c93b659e0266b2e4a292c8680c0da4bcb0df70b48eb1bce0fbc6b6906a03efa1658d13bd3ae9";
     license = [
       "lppl13c"
       "gpl1Only"
     ];
     version = "1.13";
-    sha512.run = "7483f14a3008997c0c39c351e0f8b9a01dc42331ae990575ab33ab29c18cea648e0e6ab328a2c1fde404bc10eec78d7c7b8352bb02636e00d5d6e8689f1c717f";
+    sha512.run = "c7bc67f9d31a5c72df1803f7c59c90a33967cf3f555f29b7ca1e17f070a1eba6e19a0685515e3eba593638993327b3c1ce548feb5276420d003188f9e4224786";
   };
   beamersubframe = {
     revision = 23510;
@@ -3607,6 +3604,15 @@
     version = "1.02";
     sha512.run = "cab4d390d7469056f2235c493b9383a4374c4a686810db428cfe622a4c2513f7176df489d22f7e37ae1f8a2d3303443b60c12c577764be2258b345fe9c3dc543";
   };
+  beamertheme-durham = {
+    revision = 78116;
+    shortdesc = "A content-first Beamer theme for teaching, research, and long-form academic presentations";
+    stripPrefix = 0;
+    sha512.doc = "5cce721e22bd13fa00526005f2dc679f273067fbd613832ca2850ccb1ee3bc4af6c5ef0538f16febaa476fa42775412fa579bb5bf8bd9e30d1d8ab2e15ad07ca";
+    license = [ "lppl13c" ];
+    version = "1.1.0";
+    sha512.run = "ba0d7171891e16b3ce63977a47ed76ef2d5c911871b083dc4ec308fb7230fdae62e13323ce2b99f7b2ad9e6134ad4434d33fc72a422e6ae3b93bbd7887452548";
+  };
   beamertheme-epyt = {
     revision = 41404;
     shortdesc = "A simple and clean theme for LaTeX beamer class";
@@ -3737,7 +3743,7 @@
     sha512.run = "8281d86145ab16d00c4c2042406ac94627e642aac35979022d178afae155e78f5b95c443cb097e40e22a7b77475ddebb35c3d74f54e949a7aa2f0da7dfbb2708";
   };
   beamertheme-spectrum = {
-    revision = 76816;
+    revision = 77777;
     shortdesc = "A clean beamer/ltx-talk theme with a big title graphic";
     stripPrefix = 0;
     deps = [
@@ -3745,10 +3751,10 @@
       "pgf"
       "tools"
     ];
-    sha512.doc = "d1347ef91d605bdd8f4e635e5bf34e1f5ff3e884621f12067ef08d4dc9792199f16cb170e5a929e9020feb0c3003e606b461e27fd65d466f18948ad8ced1754e";
+    sha512.doc = "88ba4536f49b65a1a9d7cb6b783c90326047585ced905fd928d7bdf8b1199f58dcab8c72ebe5c0141766639d1ead5ab8b84a37a50c72320a42f5bbce6fb5aa9a";
     license = [ "lppl13c" ];
-    version = "0.5";
-    sha512.run = "451c241c02a7906b97f3adddd2b173e9356a6e586984ee72c338ae974e6cb1d8ed51eb895bd624dbf36b45e3d86df0227af99feaf28cd32d6c22b7411ccaf337";
+    version = "0.6";
+    sha512.run = "e81e7a1aebf5b6b58df48f1fa268c0bf2e2bd74b98de238fdc4c7e3815fce98458e2aa7757e507d7de20af43ece360cd6c6371ca3e13a5f23fb3f027a34effd2";
   };
   beamertheme-tcolorbox = {
     revision = 77380;
@@ -3794,13 +3800,13 @@
     sha512.run = "c325ebeec7588caaf8966e9b8a71069f1613d694537298afeeb8d01c6c83c7991e874bc5bd070e722e15ac83eb339581897a501dd187ea5ee4919ba9c14fb541";
   };
   beamerthemecelestia = {
-    revision = 76804;
+    revision = 78058;
     shortdesc = "A modern and elegant Beamer theme";
     stripPrefix = 0;
-    sha512.doc = "bda87a6c93d6c0d1b25686b492f454b552d7496da381b519f2f4c92373d6fc10bca2876a45379491db61f393ad3fea86384e0b295f740c0a30a62d2c822eb7a5";
+    sha512.doc = "e3f948e34618b907a566cf73e7bdc6cdbe583be69910a8c2dc4f98bf1e48054944d97a1226104bb9c69599a3a94e2ad54e0908ed9a2a72ecb5778f51776eb392";
     license = [ "lppl13c" ];
-    version = "1.1.1";
-    sha512.run = "3fc497b3718b3d453462d80c57c8ba381203437ea53016f7b0620a1ba6c9119b3f7a6a3757b91eed5a87c3e3800e31d35d3be5a5eff5595c51e55232127b2980";
+    version = "1.2.0";
+    sha512.run = "5ebe2f6ef67a5643a26aff85d424e8d7b6ca5821b74acc0ae1319c8c6bae63f84c4050ab98a08baf2cd1cc4465c2d3a930438c1f94d605ec83f7f6197112edcc";
   };
   beamerthemeconcrete = {
     revision = 69528;
@@ -3894,12 +3900,12 @@
     sha512.run = "0d2bee06194b84ae81757230bbb3794cd983e75b4e33974d60a4b0d82618399746801fa48d41aa56823585268b22f4f1c653ed5a3b8cbf9c4003ee6e21c10168";
   };
   beebe = {
-    revision = 77546;
+    revision = 77590;
     catalogue = "biblio";
     shortdesc = "A collection of bibliographies";
     stripPrefix = 0;
     license = [ "publicDomain" ];
-    sha512.run = "e5ccaf624b8777d32a6d4fc114c3faa4c488bca845ef9562358fabb95884a9221ef50b72f84a17535bc03299565bb2e31234133215416b069fe0e4a66c257992";
+    sha512.run = "6d9d156f70c9203a7bb1c0449bd9bf72405d0259da94c8aaf6b0670edcd3eb5507882d0565f6bb78a05890fe9fff051e47f1b76c78da13676b33f17b3fb0ed63";
   };
   begingreek = {
     revision = 63255;
@@ -3953,31 +3959,31 @@
     sha512.run = "2ace635791a4c7a8af0843a5a92d518d0e93fc09a94929a277002a3e4426f199e207238766b07ff3f1e1bf0e3c0cf8b83897b30ba105ee7239d6ce1d591289fe";
   };
   bera = {
-    revision = 20031;
+    revision = 77677;
     shortdesc = "Bera fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map bera.map"
     ];
-    sha512.doc = "2606c87871d6f6ed27b2a5e49117c50f00573bc6b9ce249d1433da214764b220eb00c73e59be43e32e8a4827c397c53504103e00b7e5602de5df5bb817e2145d";
+    sha512.doc = "947675035310096057951024a3181f0f7579e5eb28ca2b497a81d42a8a9a102686d435249bbc4975411b2e7c1289541e6142e002005104a52516b599e11874c1";
     license = [ "free" ];
-    sha512.run = "103b2db8f7bccf6a9729faae793246d2933667295ba404fdaa7b61cfbce0f1209ea27e7a2a63846c6550b41214ff496a62598bbb9b731c087b8bba9e0abade80";
+    sha512.run = "d0ddb8c83dbc48480e0f70cf0023a1de06ef2781ecb72e0912a659843867c05c55a3cf5f34ee397a040d26d7ddf266987ece1e85b353e54cd1826bdb8fadd512";
   };
   berenisadf = {
-    revision = 72484;
+    revision = 77677;
     shortdesc = "Berenis ADF fonts and TeX/LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map ybd.map"
     ];
-    sha512.doc = "16abd183b2adf7f8612cf97775d22a972e72bbb4f66fd3616b58c9094aad4de46cb455e41cc45331a483bfd6913561cbe963c02256333353760c35925e140561";
-    sha512.source = "268f6930ecc1cde52a0003e158882d1a0437971ca2d85c15f61dbd8e16a70bacc7f0c6c3180548dca419c864571e854bf16980cf7be3e3b1dc5f4abe04c54a1e";
+    sha512.doc = "46f9d8f54b6415a1389d883aa911630dde7da995ec23d18352a2e5b764147d06a652fccbceda8bf13cfc6d86d3a081af4694e53fe0e6914db184f3cc138dd27a";
+    sha512.source = "95238ea72e0b11e6e1be0c32bacd1ca41900aaa22163c4fb6b0fdfdb9523de398eef5c16ce7281367b8ea6dcda645ad5c8c11c5b4a629d0773b18205b2b16db7";
     license = [
       "lppl13c"
       "gpl2Only"
     ];
     version = "2.1";
-    sha512.run = "92bf6b7aa9e78f38006c55dcfd905c828338fcb0c6e570d7850003b9d755fe522166722e8c2ee026f14734046c1b3010a4c24b5ea2801577e30ddaf6298b20fe";
+    sha512.run = "3e5a40b8113ff5034e04b873ab537b997391767db8c53467e991751fb5e6affe113c46d2e19439508691f401e2ea821007ddacf3a418cf174e18b909d4b5e083";
   };
   besjournals = {
     revision = 76790;
@@ -4007,13 +4013,13 @@
     sha512.run = "db2a590e8ed5e946652cc54d5c01bd540b87f77253278f9211c8720229992275f80edc26d0c94b4f68237d84a5bf7b56bd93a40e2a0ce8df5ffdeb124c81d219";
   };
   beton = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Use Concrete fonts";
     stripPrefix = 0;
-    sha512.doc = "fa579427c97f930455bc548d5b438f32aa291d98f9d8b391dae686b270e135605cb3ddd6cfb9076cb248a17eabb4e62bcf4f720b2daf829b3d12d6ebc294f832";
-    sha512.source = "79e129919c06ef083e4f8fdcd88a60339591b3f95776feb9cc076e46fb379b5ab10f9b48f3b8a948e9a120412f818dd3d99cc24957d3eaa812bbefb388d91049";
+    sha512.doc = "db5a9aefaf21a4eaf215f12cf369364e7f1d5dabae0d0e03bcaa8c6c1e164634622d1cc60a9df5a08a644110f0fc0802d9d3ef557a42b5bf8ed009aa332bc253";
+    sha512.source = "dc2b97106eb8b92654a01ea2c84625286dd5e971ef32678ed93b907a021f5f7a24c0c707dc449574d32252424765684a34ef74f037e3b89bd3afa6bc5a8323f9";
     license = [ "lppl13c" ];
-    sha512.run = "23d243f15a79246aa590a7ec65249724a4460ac6e3ac01dba2aeddfc169875dd8392c1374cb8459ff84210d51822430fab9d75a87f0ece20323cd20709de0c14";
+    sha512.run = "ccb015bb90adb4c41a6a584a04f5c4b932db4ea58d461071da6a4d4adaf851891977c8a139377c2b98ff01ed018cf34d9885632cc49f8caccf4a833a38777df3";
   };
   beuron = {
     revision = 46374;
@@ -4038,14 +4044,14 @@
     sha512.run = "1a5f652ce8e7ad60f22b7c3c5cc46c3963e5511965445fdacef01aecb157ecc4fbd3eed07140d64716b90a11db96f1b7dab8b4568aa41f7049f8a3a1ed0e290c";
   };
   bez123 = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Support for Bezier curves";
     stripPrefix = 0;
-    sha512.doc = "91ae5e35394e5bf3a6bbcc6aa7d7180ba546b58e84683c569bc34f5b0f9dcc6ea30153305fd83fe28e3bcd8eccb6179d277d28e1ff56538fc6980a7c3ec8f444";
-    sha512.source = "fc329c0c99ecd10c42bdffde10918239874367e7b54a75c4de4882e520ea82e87188070775174a11621dca9bc5949a850207f02af7c08d1b6768ea87fba7e10c";
+    sha512.doc = "3c70acc70a144bfb0a7077a8d5893c42e5585985d0bc71d6f42cb6bb6918b1f51b9856ab889b7cfad271ed76c1d039f7cbca05623f3948951bee01cc001f4718";
+    sha512.source = "42dc07a2559c8123582e295a25f0f2083f3786cb9769e4f4a5e973fff61a652d13bd8a0d262ebec1be1b4aae366459ee679574ba533e0d2bbf663f3e9a7be2ca";
     license = [ "lppl13c" ];
     version = "1.1b";
-    sha512.run = "e70a0889ceab74fcff4994568a97f31ac93165353ac207ee683b28aee2ad3cb8f770d8e3b450e3237537e97312a0995fa8c17196ead0fce55fd76a49c77de72b";
+    sha512.run = "b8ee76987a05a774b20934fa4e7a7e27b1d843fd10776ac722bca74c68ca60c686c93d056036253047746be6157f2b9d7f9db9c3a501db6244451faefbe543b1";
   };
   bezierplot = {
     revision = 72750;
@@ -4057,7 +4063,7 @@
     sha512.run = "43509dc0f0f5146dbd5e7b77d80c37a4f344dd054c0c367f8061155e7fa5b75adad6981651180d5e4a2db9a3403920e3a76bebb43bfcb1556a9326f92e57ad53";
   };
   bfh-ci = {
-    revision = 76924;
+    revision = 77886;
     shortdesc = "Corporate Design for Bern University of Applied Sciences";
     stripPrefix = 0;
     deps = [
@@ -4088,10 +4094,10 @@
       "xcolor"
       "zref"
     ];
-    sha512.doc = "75c90e4667c115b37c29a02566d68ecca7971f483d1248e43d05568fb984ef89a49a5ba4ad3f88008bb7e4162cda5a74753f6ba3774386472b7948c953038616";
+    sha512.doc = "efb7df4fea8b71523bca60f918b2f226fa1070abb5b54475bb8830cc280d866290268af4ed10a5ad0dc8bda7b3ea5ec10be61cfe62b1b24a88b13a1e6705366b";
     license = [ "lppl13c" ];
-    version = "2.2.3";
-    sha512.run = "331cacc3cc9ffde6809bb395a2c08139a36f5fbfbbc59308d7a3c938e39c180647d2a8f732b7f1a27ef8d6427e3335d86eb851a975d1eb89375cac56b4af12a5";
+    version = "2.2.6";
+    sha512.run = "cc944f33c22986f95bf9c1ca5375d8b70840132cba0aee8e780edf02678233373b6ef8da18e7a88c8f0c2b013bb1723f39317f8dc030634f127791479cdf1c21";
   };
   bgteubner = {
     revision = 54080;
@@ -4245,7 +4251,7 @@
     sha512.run = "c7245cce245740f0d930518cfee66dc513bd4b43c8b5804e1012fb95f401dbca2321be44ba6251de573723ec2e6da85fc77b9a9192004ac2144bfbeb3225d27c";
   };
   biblatex = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Sophisticated Bibliographies in LaTeX";
     stripPrefix = 0;
     deps = [
@@ -4255,10 +4261,10 @@
       "pdftexcmds"
       "url"
     ];
-    sha512.doc = "3f25f637380cdf6d396d2510b27388a9e7628d088df286a1db0cbc9049629b4aabbec29125f965f4e5637c07b068c5083344091bff646f333cb25c463211b8c7";
+    sha512.doc = "1b005127db9018ac3c1598047010cb812d043d2c1d36cb64bf1e7995d30b1668d5b49c2e2d24f18a33112e133d0db67bc5028c80908f191299e56278b277abe7";
     license = [ "lppl13c" ];
     version = "3.21";
-    sha512.run = "e30eed065d2a35b6adb99f7cc106fb52ba450722218bfa46d777242604898548f793a8557982616d339b8bbb4e9aac6490a4a6d8ce0eb926e3eff2f2ad8de9a5";
+    sha512.run = "cba8c79581bfdf1ace1942d90c3f667e4444f1afbb38e99b44abde2dc04bd798a91c2a1cf67440d98d8f46d53c24209d1392233a59416817acd9e65e8b51ca51";
   };
   biblatex-abnt = {
     revision = 72565;
@@ -4397,13 +4403,13 @@
     sha512.run = "38e3340e926d7c8aa25b65f910c902d3fd3c758245046d31e31429ee52196cf8a42145e91c4524761544ea15bafa30990f4f29457fd946853f0d3e29e84a68f8";
   };
   biblatex-chicago = {
-    revision = 70955;
+    revision = 77677;
     shortdesc = "Chicago style files for BibLaTeX";
     stripPrefix = 0;
-    sha512.doc = "aae4fdaf5aac6c7ecc382c13f71632a9e4d58bbbab96752779de384d762334f1eb70d6e010669cbc67632cf8a6af92bab44d9ce794f5fe2456b0f9e6e9472618";
+    sha512.doc = "6da4054d565064b7a36aa2b7f16481fe2cc82fe4cc102a027be962b4fd5820ebd8f0edddd273e6552e45727f1265ada4f6c8b0218ce8b59b0cbcc63fb78cc652";
     license = [ "lppl13c" ];
     version = "2.3b";
-    sha512.run = "913b333d86424c38cba11c78104de2feca956ae3d345eee2b0befaa92bebc1884434090a882b4f2220fa2bef1746b75b83ac1421a613c018b6673155efb0340a";
+    sha512.run = "49120b719ba5e4d886ffa1a3c0404fcedc2a3aff96d8118391f05f46b1ec7f430c56c0bea771a3f65e5e29cdbefb765b23747b8b9ae5c25b48f0708a5ba06a69";
   };
   biblatex-claves = {
     revision = 76924;
@@ -4433,13 +4439,13 @@
     sha512.run = "d034400abf6c0342a37e6e5de09d5eed252e80cfb93b4707f6e879edf6e190180046d28830fe382a6240d6000bcfb9277a66bf2e21b92ce9fe9deff0596f1c03";
   };
   biblatex-dw = {
-    revision = 66579;
+    revision = 77677;
     shortdesc = "Humanities styles for BibLaTeX";
     stripPrefix = 0;
-    sha512.doc = "54699b3f4e89bafa89cec29ed14a0ac32269bd52a68dda7916961b50032fba9ad3acadebb1737d8bdffcfa07f99fd104ad3fe19f0a1f569258fb4ceacefcd1ba";
+    sha512.doc = "3c5dd467a183e28f8b2f8a69119e895a4eb68010dd48ed61489ebef869c85ed1ecaeca248c208f692c7be50e81923c5eaa1bbcf639c5757c50e3927571b9648f";
     license = [ "lppl13c" ];
     version = "1.7b";
-    sha512.run = "bcfc88a15950bce48844dfdfcaa8cc946d553c9fc31b3820dd52a9f4588c55e253cc593d13b1dda0b38153a21b93a3d9a868398296546f54b5b804c58eebaa1b";
+    sha512.run = "698f21bee7faa67072e7121344171f5e6b23d9d913d2be9bd7cb8ecc5f24c2eba945c99c611477bb2ff2c3cad6e9498fa93bc47d17e08c6bce39a937aa8c7c4e";
   };
   biblatex-enc = {
     revision = 73019;
@@ -4451,13 +4457,13 @@
     sha512.run = "ad7a289752d0efbd551f61b4ddf34f61b212e2083285e748ee545837b7a4d2ca2d555f6e74ac891a25294b19bece6b0c7c6acd4439c4ac0d663154bb623fcc7b";
   };
   biblatex-ext = {
-    revision = 75609;
+    revision = 77677;
     shortdesc = "Extended BibLaTeX standard styles";
     stripPrefix = 0;
-    sha512.doc = "4dc01e77ff351c324dbf49e87b7f55bb581722325ac3695c7f85c705cb1d738de6a88e9098b2e8a0cfe326841ba177a6388e9393dc236cc9a13ec1141a3cb112";
+    sha512.doc = "07fd955a1da4b79264497ac0fd5479817afc72a60c15952707be6472ae7086ac2fc2cec68f011097ce4debda42453ac4a53e5cc77baffcea41374a4d5fe4fae6";
     license = [ "lppl13c" ];
     version = "0.20";
-    sha512.run = "bb78b35ec220c333d644530ff16fee528593520be9fecad18832da6fa96378131e8aa0af0f497e609c5edac817e7c7c6d90a6896341400e0c006d5d81fc14628";
+    sha512.run = "65bdd4878923f8ede71890df65c96e751e7cfd7c33b7cf2b83449f522a4eb49466d8ea2909fea8d23bf5def11c2d05378526cb3d50e18addb8370d535f819b08";
   };
   biblatex-fiwi = {
     revision = 45876;
@@ -4541,13 +4547,13 @@
     sha512.run = "5fa0044f2a91cbdf550949829ccbec0a11fde1576c6f84f861f1899dbf2ebf4124a63a489f77e487194e61bf4c629772cc77aae6cb35260e8bf92e64552eeb7e";
   };
   biblatex-juradiss = {
-    revision = 56502;
+    revision = 77677;
     shortdesc = "BibLaTeX stylefiles for German law theses";
     stripPrefix = 0;
-    sha512.doc = "94bbebfa29a491fa6e502e55236605b5a589c24920d235cbecb8c9372d1e580d586f643537a5ed6afbe6d1656f0d5ee8610cd09e3112a9e2fcd00581937016c8";
+    sha512.doc = "b7056b4474f06206e41bfac8c33adc2ea4a4608964985a66ab24cf48c359b8fdcb604ff902fe3abb93fa40a0b441834986c14acaeca61809494012f2cf88b191";
     license = [ "lppl13c" ];
     version = "0.23";
-    sha512.run = "6f78c1da8426508af972a27b6a23439a3b84c402e6df2494b333111cfddcebbbce639a49c8e900cf52b0e63724a41031b4fee82e0a17f07b479584bb66c809d8";
+    sha512.run = "1d489c71410174a1e0b2650c614ae7f28a715f1d4bed9905b8f99da5b20343595044313cf2f394fc7445d05ad4cff5627c015f64f2bcd886c07fd84863475997";
   };
   biblatex-license = {
     revision = 58437;
@@ -4713,13 +4719,13 @@
     sha512.run = "dac9c0452ab5671f998cdf1128e70335000c9e335bc82dab6fb0223fd38ab237406905d63fce4c2ac38d9598e7e38472778794f660c126c600833b8d000ca422";
   };
   biblatex-publist = {
-    revision = 77020;
+    revision = 77677;
     shortdesc = "BibLaTeX bibliography support for publication lists";
     stripPrefix = 0;
-    sha512.doc = "e6589a52468cc582c40e8192c646e20208b01583ed690abc39169193012be917ed8daf1e319cc3a58884a8b68ee2472ac5033fe0bc68c12aad369f6351972862";
+    sha512.doc = "ad4d0676d150a6724670bf477717661fafd1977b0696381a0116f9d52861376620a3305e3ad8e16a463f49fd5c71b7ec70b33597e939c7313d8e3e32fdf56ce1";
     license = [ "lppl13c" ];
     version = "2.16";
-    sha512.run = "f5a07506ecae16350490a2a2bae9e8dab67128d3ab4a17695d2c6fff3e12c8edf03d7c4a902d01b4a1ede2d49889230f6e36c0956c720ace19f70a6477b81db5";
+    sha512.run = "b9c502757d33ba36d1ff26695332aecfe966f84848f376a3da006ce445cedd86c0aba67b6a23591904aadb9dad94d9534d2ec590c990abbdbe535184b0a6c19a";
   };
   biblatex-readbbl = {
     revision = 61549;
@@ -4813,22 +4819,22 @@
     sha512.run = "ef79e30ef2e6ec5466de19461e3ac087098a49e5d778a50788770e4f1eea357b8146b4e19ddf72431111c8c9629bd7bfe87b868351f286a745d20a4d1af9af84";
   };
   biblatex-swiss-legal = {
-    revision = 77463;
+    revision = 78222;
     shortdesc = "Bibliography and citation styles following Swiss legal practice";
     stripPrefix = 0;
-    sha512.doc = "76cf227b2775168f41cd573a7d15215f76f2e7c8d0b10da4b66f29a631aaa9ce6faa0571ca8606d2478a4109b2ff5ce3f389ac518a0d9149a0e479a87d11d0c3";
+    sha512.doc = "811446f9ddba3643b4832c1c3fc4c68adb2991dfd01247186ea0acfc72fd61a9fe8918e65f64587feea033ad7e00df30c0a97c1d5749b95aeaa2172c2d2089d4";
     license = [ "lppl13c" ];
     version = "1.1.2a";
-    sha512.run = "37137100d658d7ba222a2d847a46749110100fbf5b3e4d5df2cf7c85fd6d24bc78254b62d3fa7b057eb53e6826f96f958177f8f08828cdadadf260d457931f46";
+    sha512.run = "e99333dd53ee933bc71eb1c5e6bdc4972cd9087d21a3c6453cd5600c5fbaff43418a0b95e5fcb26473eacbf21bdb53b152331a00fcd9d1ba3e5e4f8a95e2c0ae";
   };
   biblatex-trad = {
-    revision = 58169;
+    revision = 77677;
     shortdesc = "\"Traditional\" BibTeX styles with BibLaTeX";
     stripPrefix = 0;
-    sha512.doc = "32d6fa6369359e15717257be6e89f77081dbd352654d4c60d55f4de9c5f522f7d222b51bfb5a1eedd7f6378343d041380c5e97e559e681bcf7647e0695ca13fc";
+    sha512.doc = "dd3f49b5b64401ddaf82c99aaca6298c5e1224f4c8c0fee274f98fbdc3a0980a3c082b289c406615b763758d716e80175c5f3255889ddfe32fe13891a7af3945";
     license = [ "lppl13c" ];
     version = "0.5";
-    sha512.run = "e14b9326eb05af2a89eac072d6c71f61527a53a813605bbb399703d2a23cf7ddcfaeb2cc77f6f7b8959e05833ae3eb343224bf126907193af557d09fc1746552";
+    sha512.run = "f0466e8bcebb45476b23173d26c23d1d4363713f681fde4c870c324ef9a1a55d6ba38d957ff2d81aff892be39d5428295701fbc81fa96b43c98ad94a07e53fde";
   };
   biblatex-true-citepages-omit = {
     revision = 76790;
@@ -4858,13 +4864,13 @@
     sha512.run = "961a1f144362346ce5bc701e01203df77d2b84c4295bbc1561fa204cdde1da91786fa89fa3a8454fc7c3be714d4616ebfad5d670278ebff306eef990148bd1a7";
   };
   biblatex2bibitem = {
-    revision = 67201;
+    revision = 77677;
     shortdesc = "Convert BibLaTeX-generated bibliography to bibitems";
     stripPrefix = 0;
-    sha512.doc = "21a53b0f4612fc18cb43f12cd6b1d1f72db896d0c55f73928fd11399598c04973595895d7cfafa546507e19cb25811118de9d07a8e9e1e242e22bb8d17e3486a";
+    sha512.doc = "1cd4dc454441ba43646a19696f28eda918d22245cd9ca499172a3d82f3c88780f3be541c38fa327d35d8022a671ade7cd1e37916a832452d6f987c15097b654c";
     license = [ "lppl13c" ];
     version = "0.2.2";
-    sha512.run = "ff86dc4068b0b3065e19af6447a71396337d9e7e5394777c1c385b714d01f2ce983c45923b460c60784024a8068ad68f05ee8dfd14039b65c2d9d9a61ef584a5";
+    sha512.run = "1d5c5848504b2f7a589bea45fac23420cf3c80889abd6115aac10345d97f005bd542a9d558311170703a1ad5d46a015ceae079f01a08301aef41668233699993";
   };
   bibleref = {
     revision = 75257;
@@ -4934,24 +4940,24 @@
     sha512.run = "3c5170b747c6426099c021390f7ac226ebf9dbe42ff586c698b3489d47639fcd4198a4cf49261bba9335caebf8f39488d65fe851d60d9f3c2cc2127539ef080a";
   };
   biblist = {
-    revision = 17116;
+    revision = 77677;
     shortdesc = "Print a BibTeX database";
     stripPrefix = 0;
-    sha512.doc = "b5bdd51d7acb738569671f13dbd25fc7b98a8e2e03e324e9501a20ac34cf1ae3578fcd622be73a80467e47a64a81f4d897c4e167b07a5ff5d06635b09dbec51d";
+    sha512.doc = "2b21ddf2d5e4a8d0080f5a2f3f6c1e4471e7eaccb1e0533609f1c17f78439bfcec977504028c8f49feab2a1eb88079189cd43a9a629b24819d77a13e3e612e28";
     license = [ "gpl1Only" ];
-    sha512.run = "02f006139b475cb5d4ec2bf85ec098de78f5bed7242ec693317ad4e01acb62a8c5479f295a8a1409fccd41b327daa75a2639b67d9838777b8355e6bd40af478c";
+    sha512.run = "2312e79b05e76c496187f3643270eecf18ab8d2d568f9fc4e22bc907c8152a8626c34176a03b1ea10109edde8a88ca7ade798608078f5a064e64de55c0e25aa0";
   };
   bibtex = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "Process bibliographies (bib files) for LaTeX or other formats";
     deps = [
       "kpathsea"
     ];
-    sha512.doc = "d6c8f6e9bd0ce4701355593defbc31f593147026c92c268ceb1d1fe15ea12e6d1d3f7f1b121532159f4caaa3eea8adb7c17ff89585b1f84f773721178d0aaeca";
+    sha512.doc = "85c3627d2fd7a53b0d5ddc10b2b3117c771c852e5520962bae362919c3d842a07a13b250e799033ee63a80539cd22431c3dd193a66dd095fa0ae97ff8e92a03f";
     hasManpages = true;
     license = [ "knuth" ];
     version = "0.99e";
-    sha512.run = "0ce7dca227ba69b46224c7412237c3eeda1c43c432839c26f7c1aeb9cf7a32d31f0275d0c7346f31dd38ca58899c273607931e0850a1b46d10ee945670e12f6a";
+    sha512.run = "cc81600961153f15b213a0de9482e744990598ea0861fc5a05127ac0bad68738ca57dedb2309b65739ec5ac709c6b22c97b2db53b25d91ab9306ae1753493c52";
   };
   bibtex.binfiles = [
     "bibtex"
@@ -5004,14 +5010,14 @@
     sha512.run = "7ee329ca8c7a5d93a82ba38acdba176187ffa5d8025f882ff7ce746d60c805d85fcb9ccfbb93d9c880a2e699613cf3190e552cdce998bd89f0ff31187147e2d2";
   };
   bibtopic = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Include multiple bibliographies in a document";
     stripPrefix = 0;
-    sha512.doc = "5849fd57abb9bd847833993e660e342a537562bea9fba76376f3885d3bd09360c5783e4f04828137b43c076b635a2d566d908be48287c3fe6645c2abcba06652";
-    sha512.source = "2b6d11221e625b6d568874d12cbc7b45d074ebe2bb973d63fcbb9d85689a4c27824f3eec68fcaa46f0de707767baa516c3925ff0fc4d6a90518584847844ede9";
+    sha512.doc = "31c3956554ae6eb5a83db3e8f1aacfcc294b43e4074802bd7ca0526a94d8d9a007dd6c7db0274f21818389b823e94f52d9b5886e74786c53829b628d25bb6742";
+    sha512.source = "3179c9a26746f2263f863c10e47c06249a57c3315a014f2a3c80b2c13950c33266ff7606ff50d84669823479f41a3ede6d2f405224799ec2106e27f4f1ea2f79";
     license = [ "gpl1Only" ];
     version = "1.1a";
-    sha512.run = "34e2a644cc4472f415522e6e798bcb1e2d623afd4783b07f4904405c63296ec912fb6c1d03f80d51c37ab81944cddb5b4f3678a22a7151d89376ed9aa343e9d7";
+    sha512.run = "3e77e36686233f6fb3e528de58bf0e08de9a854d42850782a7664eb00351b788638feffda2bcb6890fa30eea6209fcd3f719b74cc98a7f1e40e34ad3e092864c";
   };
   bibtopicprefix = {
     revision = 15878;
@@ -5024,24 +5030,24 @@
     sha512.run = "1df7d78498b6de233aea92cb1b18f73893b8cab723fb614a9fe895e5131639c1b4f4318cbe103ea4d9308e383627873576664f0af3ac6fd26aebd5b8b0036379";
   };
   bibunits = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Multiple bibliographies in one document";
     stripPrefix = 0;
-    sha512.doc = "888e5a4c1863c15112ece5763b01525a1a74f97ae1270495a41d598e73c4583ce2b9e28030b3054dcfebd60b038fb2d32938d6be947477fca93014fac70676af";
-    sha512.source = "37cbb8ff6443757982a97bf6efa90881807712ebd7f0ce2975ef4960ef74e0541cea9fbffd64f765b6631378f3d21e2ac308ea1554709b6c2582b7cf7485398e";
+    sha512.doc = "0715c575becd4a4b3a27d4d30b8f8529a1076c5c3cc2b8ce598d8dc5fe7298ed9b0b875517b0fd157ccb574bf78ffb2cdd4b2ac418177c393c3f11c8c4fcad6f";
+    sha512.source = "d976bcbb43d449d70a5d7221d603d667779ffea4e10d1c6aa9f1c5e46d8d400f7f57d12f3bf788eb87e7a9724f7b0df3aac3fa677bd0bfe78d24cf89c6d24273";
     license = [ "lppl13c" ];
     version = "2.2";
-    sha512.run = "5658d508b876a88f3916a190a9090d66f2dbee98260af8d23c8358d0708f27fc80d4cf6c348b1f6e1ff196e7de6d5567e371ada640a9a602185611fb09e64ddd";
+    sha512.run = "0c8bbc54c6613043fa14c2e307032920db55d29b71dab27d016bfd2a815e5953b6842d9df39112e505fec6bee0f445c1c0bffb47501b7d2b68b7ec7394cb46a3";
   };
   bidi = {
-    revision = 77301;
+    revision = 77677;
     shortdesc = "Bidirectional typesetting in plain TeX and LaTeX, using XeTeX or LuaTeX";
     stripPrefix = 0;
-    sha512.doc = "ea683bddf362de1bd4a5820b61537eeacbcfc22b231d33522b7469856f91a3375d2341e6dbcab6278c560e1d42ef58f528970940963875c01bc1748528a75d37";
-    sha512.source = "04e8800107b9282927214e11cc05748c6d9e6712e742f3ed06c5731f9eac8fed94aa6ac00015b01e7db4996d563405f5e0324b1dd3d81dbf832dcf6862b6cb6f";
+    sha512.doc = "9b9a9313d4537529e5991c7ea7305c51b05269e68621e1fd75182da06acfa8dfaa219da33652f29a5ac090e3f7eb66d8ca7b4bd1b68f5e95a0bcf52914956a35";
+    sha512.source = "cd95a35f30993d8bbe882dedc432564d1dd772c2c045c11d6958a08a89c9bbb6c61eca38e14f1f4ad8af20326455a6545bfb49b61b0d229a75d55911b9660302";
     license = [ "lppl13c" ];
     version = "26.01.08";
-    sha512.run = "1f0d00257655f5955cf49a084b2ed12256702af715e55c78a40b2b05b94b4ef15ee6f1df66e8ce65395baf0624912f5b0482f268fdbe74e2f1dc40702ce9507e";
+    sha512.run = "4af1bd0943b4fca0502b562eda9a2226c496a90b7c7860cbf6d2b6beb3186b95ed9654a33f78c9a34c35e97720d22d5dde2fda5d44e0df3191a0d118d795d505";
   };
   bidi-atbegshi = {
     revision = 62009;
@@ -5053,31 +5059,31 @@
     sha512.run = "5b16cfee9c71927cff133db3b967dc835634553d0980f74164fe8996ef86c3529439e85e00678219879cab41bde2027f3258b2862906b58634713e4b7d16c515";
   };
   bidicontour = {
-    revision = 34631;
+    revision = 77677;
     shortdesc = "Bidi-aware coloured contour around text";
     stripPrefix = 0;
-    sha512.doc = "a1a3f9692ea2e462305f8c6db432586eb76d78cef5fa0e9057cbe5766ad99e25c560ad658569a92d1885e373fb6215fe2f9bcbc1c69b46c3088d36eb92e1aae9";
+    sha512.doc = "b4657e66943e35e90a3d790d00a77449b4fa91b813dc4d15bf481985ad064a33f684f58b77490cb378278d57e7095f984149f519615e387b3b857979fbcc6b26";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "10364edc592375f69912888945e6d555df30627498aaae409b727392c64cd4aac386433119578a7a01a48bd0cff84aae33079593219b282feb9d96a68bdde78f";
+    sha512.run = "b5b712a88cd685696ff0c7a7fccbb1b1845f44259c96edd37cbceea1329c2570c471772a04f71843100aa090f266737b40ebb907f6b131031fc5d951eb16d081";
   };
   bidihl = {
-    revision = 37795;
+    revision = 77677;
     shortdesc = "Experimental bidi-aware text highlighting";
     stripPrefix = 0;
-    sha512.doc = "c9d0503857f2cfa960e36872757afcab17b2631caa8a33112ff2361694939774052a5249db62d21831e19c17826f422853a78c5522094706bd4208d4c5223019";
+    sha512.doc = "a5a0dec44a6d444cc05cbeefa71c18b00fb2ef984f8811682134bfcbea8bc16a72b882f16779f009d07cc72c7ffab1478bf5e89963831b50c9972b0e16b4a08e";
     license = [ "lppl13c" ];
     version = "0.1c";
-    sha512.run = "fd82ad18b96cdd782fddab8739e09978d08fc37e8c65a177bde930671e102c9ffefe7465fc766860068188f6b9f8222119ac791f07223f79e9840f25659ea3ea";
+    sha512.run = "90d9865f5f473559209e6b441410bb128a007ccce236705c395ef0aac7984afa939b7b3cd5939687f6b3e5e1906020d0ff836f15b422e4235f79238017991941";
   };
   bidipagegrid = {
-    revision = 34632;
+    revision = 77677;
     shortdesc = "Bidi-aware page grid in background";
     stripPrefix = 0;
-    sha512.doc = "615d87ca4c29e0a30cf1eee08819b10419a2f399a88f2bfed5bfb6eaf7b1adc8b64a2ccac5da7bedab4e4b951e80488b97203b9960980ca5919f653cc4218996";
+    sha512.doc = "fceb5c814efee1520feaa4ca271593c58ba6d46990d0155ae2c58e3d980566e58ee812ffbb5c5d712b5aa5e4ab2eabda5643636938bbef890558251bea7699e9";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "b823a646d97c15ad9beb3aebeb7b2156aefc3ffd7bdec813e9cb2481e137cd661936c57bacc3b8c42509151205dbd4096329b5cbec25bd06698b698c59739551";
+    sha512.run = "d6502db5e3223901cb1948ee26246cc7a77c2b0ba5efb771e91f36cb0e317b44d0d066d70149e7bbc072ed48c1bbabc461597db4414d64d8ccc5044b6713a841";
   };
   bidipresentation = {
     revision = 35267;
@@ -5089,41 +5095,41 @@
     sha512.run = "a41f98c3f009f7f8de8a41e386cc829c55650e603ccaa8e7e381fae45be2872e0b20e66b68e4d7ef8110abf7c9f6661865d49f7c0cf3ca4ae6f781c3ef5bc0ac";
   };
   bidishadowtext = {
-    revision = 34633;
+    revision = 77677;
     shortdesc = "Bidi-aware shadow text";
     stripPrefix = 0;
-    sha512.doc = "ac2f47ed1a5535ff1f0030c38bc210b2e3905bd46ce7024d5237387faf87be6a408ea35648f83a2ad7697ec09a91a4cce1aebd32c3446756adf1955bfa97f7c3";
+    sha512.doc = "fd3d94c555f69eaa8b179996e2971e80533566100eb34ccdf7e6216bc0778b3aa7e814c6dbfa31b7854cc45dee0c3ce0d4535d37822e94623e80662e3a61ce43";
     license = [ "lppl13c" ];
     version = "0.1";
-    sha512.run = "bf9a75be6d1f37055c793a16b0a4d019579adcbe14a93b64cec5495e4d7c8bcd8b8c6d86906714f8aa47be5789209a1ce78d19e8023b44b9d52409b281797310";
+    sha512.run = "7cd07e0c3d8c0331e2670678a6a4154cfef39758daf590e10fe11a8eeeac2109dd070524e640073179429842dd87fbdf78bc39007e1358b55b360a3d6423a391";
   };
   bigfoot = {
-    revision = 38248;
+    revision = 77677;
     shortdesc = "Footnotes for critical editions";
     stripPrefix = 0;
-    sha512.doc = "f5935a5ede836798f3eab1ff61d528870a07be712047a64aa5af5576a1c6032e9d88fb5c42cf216e0f9812266f9a8562b5290301446c654dcb46146d7b60a16e";
-    sha512.source = "75316aff3c594fd904adec7cadd0b24aff9d527479d0c59f3fc654772e29cdb4cca938fe5fef6e14b9928fb25f37fdd3f7a894a81f95810813875c4fd419dff6";
+    sha512.doc = "44251228ca0e281d6b9ed8bb9dd086022cfef539b7378cd26baf0de7272f18aeb8e6897783077dc3c5c4e56bedc788ed287dd485cdf250cb26c918eee22beff4";
+    sha512.source = "9171c5786b04e448df0f6483088e7573fe8585bfc66f187353b92bfc4d43bba969bc198d2a96ce928b801ac3a6401e11525b83ffc78cea00e6398a1121eb6678";
     license = [ "gpl2Only" ];
     version = "2.1";
-    sha512.run = "f56fb1545e0a044a143d1a257b9784b5f5dcc56d68bbeb52f909eb928e9d749729135f0c76b3af6dd0306add550b440d32aee21c33e70b9b48a5a82220623702";
+    sha512.run = "9a700f7a0cfb4fdf7afd622b3e6e1afaad9bed39c6ef0cc956a37aa200cf88b902d73b65704dc61743d750c60339d51d2dc41085997f356b3ee87bdc8638be48";
   };
   bigintcalc = {
-    revision = 53172;
+    revision = 77677;
     shortdesc = "Integer calculations on very large numbers";
     stripPrefix = 0;
-    sha512.doc = "f5e7cc163157e429906489cb3cb94d8694c01be3c720e03b85bb24c7bd757391cf09e08f3d88df4ae7485978042e9d408fc5af0d93e016c82912479d40457079";
-    sha512.source = "e829ad1e3a118e8fd0ea0e632740ed49db65603d6fdcc7d40126a048db5cc0f73c9f4aa64d81902794ed308ca31a153044a56ef37ac179918b24be71ae168f64";
+    sha512.doc = "2db1f78acbd4b8c5c69841f261356a0b012ee7901da916eed27b7141de52cb0c867f03275b9b88b06eddadd526e2d4c4527b55bc110663247dd645bb090cfd39";
+    sha512.source = "4a7bf006ae642de1993811ff151e15e084053b9f9f4af5dd79e843db002d314e708f721ea93bd56442745c2d27d8c88f53ba9e557e398dd61f6d88de55c6b562";
     license = [ "lppl13c" ];
     version = "1.5";
-    sha512.run = "c801e5953008e8cd8521886496238f4f7a86a6c65a160255beb3fd6a41a48dd7bfa2da438f8e1ae4c79b51f769f0e07bcaa7c3c8aa6e1204ea656aca3d1f4620";
+    sha512.run = "e95f15ab3515e45d2d40d96f56ba29b942b27533af900899de1c109e780a16b4edde1b1e78d45b03d47712b72cfe040b66ef9f6f6165295b642940538f393699";
   };
   bigints = {
-    revision = 29803;
+    revision = 77677;
     shortdesc = "Writing big integrals";
     stripPrefix = 0;
-    sha512.doc = "46799d5c6758657eadca7fb30d214baf47c237b63655a71ad19e188fd54b664397babbbc5cf6d9897e81decd027dea1e0d1a6fea97384461ec8976fc19c7fd8d";
+    sha512.doc = "6d80febbb0792dfaca5e0cd998f3353008137c5e032a0a0f34a8230d148d6b42cd96e3dd990bc05f6e9986c9da10da27bfdd683c07c9f50b77063cf0ec38e375";
     license = [ "lppl13c" ];
-    sha512.run = "23f9a529af214771f74c6921baf8582b6a3c5e170d0fa511c260f5dd3fb6cb6194ef4082ed299dc0a3ff8e413981a36b594b440e7bc5512c7d2732fed9eb7a8e";
+    sha512.run = "5233be06a987f2db50dd1b2826ed378f680994d837748d6b193ca43ee530476029a6eba62c173ff323cfd546c993ee2768126b1c705e898ee75948d0dc32b323";
   };
   bilingualpages = {
     revision = 59643;
@@ -5212,31 +5218,31 @@
     sha512.run = "34a0ade2d1110a15618b2ecc7f46a413519a0864a2e5cd1e25eacb9dd76cc66b35565b4b8c015780fa1d3dc88e2237ae7de33c77e29fd5428758a526959625af";
   };
   bitset = {
-    revision = 53837;
+    revision = 77677;
     shortdesc = "Handle bit-vector datatype";
     stripPrefix = 0;
     deps = [
       "bigintcalc"
     ];
-    sha512.doc = "a5a3ba9d27dc3d9658c1d261f798fdc5e6dc4cedd85287ef77d2a0341048d71f8575d4fbd711e499233e0991c51765953931d87d40dd22fa2a4e8ecb9f2a8dab";
-    sha512.source = "40580c17ac81137d533eb013ed14bc092281b354ce42883c0a3c33ee7843be7ebed0ce642746ba9e173bedf8ee6f6c243b65e692ef2a50654ada23e323166c89";
+    sha512.doc = "314b206ba81c3dd84db97f7bc6f9a59fc6041ca29e9bcb5e913eb576dcfa4279376c4580333f6f15fee15bf3cc496a75f8059bfc88f1a06928a043fd1406b0de";
+    sha512.source = "dd3383ad0731d045ccd28e59f8d7f0295927f15144a6a111c5de2be19d906e3cdcac93fe7ba7e5bb57edf80f7b134facc210e42ddf848f969c5a5347410d9633";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "b1c9121312404d3daf6907623972c35e0f36cfb4197e589bd937c145506cb5a2d9d8c1f665ae3b4d3ec093e55bb146c0b67cd0858425b704fe29989b9924ccb7";
+    sha512.run = "d9115bfcaee29b7517d38d9187b44c026e099519eab7122346c16e9ce8f0e38be1a4b3444b14a7fc1424c23e4b73086ffff1982109c6b5913ab10864468a51c4";
   };
   bitter = {
-    revision = 67598;
+    revision = 77677;
     shortdesc = "The Bitter family of fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map bitter.map"
     ];
-    sha512.doc = "2bff9fef75632fb43c59cba04ea531eba8420c3841a0343cbb1d56995a8c322beff036da61d494112e9c89f82d367ec3bcc9e39ecbe153c99dc012cbc8c15bea";
+    sha512.doc = "243919554b7c8ed0b562e5e841b78910f69c2e2347cc270260d5a7821ea0bc0c7a1b4fa32d6532b18c2a0011a123c7630967790018ea1ed1a1fc38145c90553b";
     license = [
       "lppl13c"
       "ofl"
     ];
-    sha512.run = "217870554e509c3bbfb70d3da9e3ccc4fb1013db4508034ace728ff114e31eb9f56511b1e89c702d21cf1b522ae799601a0908ffe70a3856aee29c595a22483e";
+    sha512.run = "db665ed63ff21e20714a65b83f134db026b36b77b4a04bb61a48966552d16a41b874a96f4614b79d2ed2569f5eab7674fa83d22bf546add6392fc37e5f90cce2";
   };
   bizcard = {
     revision = 15878;
@@ -5267,23 +5273,23 @@
     sha512.run = "eb7d531fd91c6d46145c76a08678033e20097805b3a911fa85194217104e071c56d3842cee83c275a11cd4cdee162aee4630d86025cab76806f20e19c975076d";
   };
   blindtext = {
-    revision = 25039;
+    revision = 77677;
     shortdesc = "Producing 'blind' text for testing";
     stripPrefix = 0;
-    sha512.doc = "290a4c76fbeb8003c6972933baaa95e62b37310594e459e27083326977d370c1408de95eae44d05d848c61eb22b555792e5e38f4a0b70267d6a87c0314268501";
-    sha512.source = "2ca8cbd44a56c36ea66fbad415524697009af4c7e39164bb43d9c689743666c05aded6042393bba6d658a0be1df3ca5ac64a6e8da2e9c726fbcd1500239c4532";
+    sha512.doc = "4ef19b5ebfed8be5658f74b3c8d753ae1a00986fd4d3249daaede1757f15ff32d0bb8ba92ef042c98c4aebe26716a75d40f4ab66efd14fb7a046fd3b5fa0ef09";
+    sha512.source = "660f6bd3ebdd2efc22b9234731cb7383e150833954af276beb85d9950166b0d14e56003ab765f5158f43b78c7351d29a4c8cce1bc1cffa5ea113dc214ab96c3e";
     license = [ "lppl13c" ];
     version = "2.0";
-    sha512.run = "3baf7b9db502824ebf1cf8892cafb189654ad0a91a8cfba399e103b417a91e4f137918b73201fb5988c8dcecabc557865e190cdf77af35e634d0519d52715795";
+    sha512.run = "5de452cc27096908f9a09bb09a3a5a60c52ac28de9201513ef99ff045d0dc94a18e2813bbf139996dee9931a338b8e3370b444d837a68d3edbce28382b2ceb9f";
   };
   blkarray = {
-    revision = 36406;
+    revision = 77677;
     shortdesc = "Extended array and tabular";
     stripPrefix = 0;
-    sha512.doc = "81f1d5b5609531deda3475eb906b841d33a6e01ee49c54102474d852856172954d943ee02648fd1ce74d5bf4030db8d36c7b6786c9fe3105f3be08fea36fe207";
+    sha512.doc = "90d85f6d12d274d0d7abc07720408fde22d941e8ff24e9cecdb1c05b6d52d54c64300e668788bf5a9ca5b17f33db43d0823f211b177d3ba61a47a7e6dd7d9c68";
     license = [ "lppl13c" ];
     version = "0.07";
-    sha512.run = "5ed66db84619cd9130e68e05acf617ed0007db9ea35895e31ad96b543f7d6a01fddf00304f05b0fb71ec9484556326ebad1d895b81b821b9f19fe6ae9f3ee12e";
+    sha512.run = "547459c8e37b238e1017121d2e95bdefd0a0f87efcc4019641bf8586f7144e7a1ff710b317299584b8632fcff6af97f5f9da60882f63999c5009d7d30642674e";
   };
   blochsphere = {
     revision = 38388;
@@ -5338,14 +5344,14 @@
     sha512.run = "06b18467956f6782de7e0dad41f66a79e1c7dc5c3ff007a8970f24740dd5edfae0e375288c3510a8acfcdfda7b568f2316827cad1b6a006789afe8a31f829f4f";
   };
   blowup = {
-    revision = 67640;
+    revision = 77677;
     shortdesc = "Upscale or downscale all pages of a document";
     stripPrefix = 0;
-    sha512.doc = "c038502451d1952927f9b9e1648fed009452d00a5d9db06429f8968ec453cb7863444ee0e41073dce5c0c4990c2487ebd818ad51bf72d1e7a91257ab76684729";
-    sha512.source = "632342966fb59de8f7ccda1fc7062c691fa2829462c67d4edc7cbfbed3dafe4888979baa60a502793f0db88343c1b8bcbb5e8cf18727e854b4a8443ff06f564a";
+    sha512.doc = "64ae6fbb8f1a712b0171a10626bf81a735256e49aa824f69ce44b8ff2880eca995eaad43a8e8b717fdd7213fad3094fbf22d04a65438cd5115b7d7e29e7a1aab";
+    sha512.source = "9515195155e917304a1d1a72dc89e1591e2bb7927b0851292628a43035efb58b4b5324aa206f5100919477afec30b72279ed5c4c356fc3f05fe9f395d362eacd";
     license = [ "lppl13c" ];
     version = "2.2.0";
-    sha512.run = "52cb1cbef8c97f265114decec953472b2a8804659d60ce3227aa5904827dacb1cd6156c189a6e75aacb2051d8237298690c6ce6816ce9425fc293c8e32962236";
+    sha512.run = "b55ff41ed94c37138061793ce5f9db1e0d9d60b93f33cdccb7f95632818a48378bb0e00da602c10a06623c56bb9a9ddbe31e1de8a417bbfc1a82568fab5a7ec4";
   };
   blox = {
     revision = 57949;
@@ -5419,14 +5425,14 @@
     sha512.run = "ac3c17f2c689f144ccf928df9b7dccec1a43b6828e6d762ce86dd563c9328148ea03de5a2f6af4d55cdbbb81012fc663ee293e474cc5e958ee585d2e50e9cb95";
   };
   bnumexpr = {
-    revision = 76420;
+    revision = 77677;
     shortdesc = "Extends eTeX's \\numexpr...\\relax construct to big integers";
     stripPrefix = 0;
-    sha512.doc = "18f65089ecc7579baae274852a4b5b24f5be21935799a3a27741222db57d4915b0ebb9ba833c89a048f047924925fd485b1346d8b8692fd65940f72c3bee0d85";
-    sha512.source = "f3a343665d68f6d2c7e688560edaf57d319cd61b4b36994d69dbf4135a1616cecbe0f35391eef7ab127b421fcebe083c44e990ff2dad7b27364a4e5ff015683b";
+    sha512.doc = "e70df8939dcc11ab34761af65c816d45e57c4e15db94720ba11f34b84a1fddfe3213056259ccdc459361fd7bc2c865cbbedbb95191391a3354c12018fc410f7e";
+    sha512.source = "9e5e1d97beac13f0c4b4401d5530a9624772346f77591edc11b6a4e7e7d6100d99f17a8b91ea028bb834a80b4a6dc944305030bc72e34136a6e6f3f7b988c911";
     license = [ "lppl13c" ];
     version = "1.7b";
-    sha512.run = "ce72935a019f8e55bd8f469f1a6b5c3bebebb9a965087c3d6093cb3fa83052dd1ef64ecff84967cebb59f2ee4fa4a2c549693bfbcf2ff2a984265b3bd9547651";
+    sha512.run = "3c6d696b065a7d8b326a994d26034fcd645edc63cdc24c859bd99633d395d5fdce8d9c0c5545eb51da5c2e9d6f5eda697d3d305639fba356a720d0d365703e59";
   };
   bodegraph = {
     revision = 72949;
@@ -5476,13 +5482,13 @@
     sha512.run = "894f6d2484e9b72a24816c34e1254ae8a6d011610770e40590fdc3ed22a24b6f655418694de256a6522e4024f4df033c017f294743113256583ffb8445a63bec";
   };
   bold-extra = {
-    revision = 17076;
+    revision = 78116;
     shortdesc = "Use bold small caps and typewriter fonts";
     stripPrefix = 0;
-    sha512.doc = "4bb27a63f711421437385c2a76f26d74cbfcf6ac5bd8811bf4ca5a0da354608dbc6ff295c3943edae1701fefece397ec356361176a9713f607c9677b8222b7af";
+    sha512.doc = "1f59e7079ad895392333f6c8ebc0caf22bea9270216dc78952f020e1820fcd800b05ffc58b998a25623ce5b37e8e63d32cc0886471a6f969c431df35b231b072";
     license = [ "lppl13c" ];
     version = "0.1";
-    sha512.run = "cc12de98493fc01b9a59993ad32e646102751c3023e64f66255a1b66505d3cc2f82d71ac53b4f6691e083bcce3037e521a35feb09cd5019d662a6ce56cc55032";
+    sha512.run = "f2945b391bb849cc0e409b89e586bae93f1beff7316dae4c98829f7582605337568d4de2b02dfa9bf5d824d34114a1041db097d28a6bae24ab85af4ef2d5d225";
   };
   boldtensors = {
     revision = 15878;
@@ -5512,13 +5518,13 @@
     sha512.run = "61ed449d8fcee24f383762eeac54949d709fe3fbcf06598acb8849613c68ce2f445dfb4cfc7871bb6c61bec65ed45e8888dadf036f299a4d5c0bad13db0e16ba";
   };
   bonum-otf = {
-    revision = 76342;
+    revision = 77677;
     shortdesc = "Support for the OpenType font Bonum";
     stripPrefix = 0;
-    sha512.doc = "55abcd5ebd9c029bf487ec6c8072171cc343c29230f7403f0293fbf2fcd068b2754c015fdee0da8a5653358db9ea204b7f1de9cb78d843742f6f5089d8f87707";
+    sha512.doc = "965b14595f575b27b58cbf68b695227e67ebdd5bd59b842cb912dc15d583124c31fae6930b981b7b45086f897bc8ea7c10718ec4f1c8de6c4a4982b75f36d7a2";
     license = [ "lppl13c" ];
     version = "0.01";
-    sha512.run = "2fb3e6e1d6d63319926b5a329f0fccc5a22e20db3fff915b2fe59c328f9fa0c92114c383771fcc6a6836aa88a1bf2015c1250a68f0773f8ae31e4ee33b2f7f79";
+    sha512.run = "ec8eac5a7da72b0b6c9a258e8d7f6653ea8fdd0f31558d138cee58aa6ff5e9d5ab4dbecac03356307b481530cc1015b782da45dad1c0f30aac916866b0bfe180";
   };
   book-of-common-prayer = {
     revision = 62240;
@@ -5570,14 +5576,14 @@
     sha512.run = "80dfd315561158d712602b39da4bcf624f3fee34b368533531e65986b65eef96113e984b2df4a07d9daa30830425b69197eaa569c25916bbd44d221bd770399a";
   };
   booklet = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Aids for printing simple booklets";
     stripPrefix = 0;
-    sha512.doc = "fb6d74ee03f303433e61fe1afe297cf5e343f95e3834fbdee483522a183d403fb6bac8bfd1d0ca687c448d522d370f5216caba2b52b066ac1657b8dc2fc3df1a";
-    sha512.source = "7b63195d047c6d05cec02af6d44c77e9fbc0a198717a5ed3383f6d662946cb8de9b7659916ab6d7951eeeedfe00abcd68eb006012de3e083d767acffdc0f3cbe";
+    sha512.doc = "81be4998093b4ddd91fd71ae940bb70add7c8ca34f7c8e71e309f4a776c8ab6820a03b009a21f4485013d49e1e52920342dd859f62aeb9486826b22268eb5000";
+    sha512.source = "dbb374a861600f737bc5acc279b3b3a842c898e123546dfbcabc2e43e7402e41b40505aec9d1a66a495f5c37994483abd2164d3247d4d7bd9e9012c0ecd79ab2";
     license = [ "lppl13c" ];
     version = "0.7b";
-    sha512.run = "be6bc46fa76c0a1ecbfe199b1a1a6f0cedf14a8d583e9ab8ffd75d4cf8ae22e404b289224ed8fa6cd9e143119760d50131e97228cfe75ea56d5ab2f540e8ea8b";
+    sha512.run = "b6337da44f99e7fb11a87ab97a085bd597b76c2aaeae4b6786737148bd6a58e6430a996ccde45dd6491d462863d470e907ad95d1cfd25f8a5f7a005f5329f563";
   };
   bookman = {
     revision = 77161;
@@ -5591,14 +5597,14 @@
     sha512.run = "8dbe04378d624c95348ecc051a2e37ba10efa1a16fc960418a8459e18e48158a388c1b7d677c6490e990b28d98a73a45fc64830f1f8bed9ef498680226eb834c";
   };
   bookmark = {
-    revision = 69084;
+    revision = 77677;
     shortdesc = "A new bookmark (outline) organization for hyperref";
     stripPrefix = 0;
-    sha512.doc = "1c6a24efbee2e8734955b40b9908a8f5af95d6d4b8aa330c72ae7dde5c9fa374af6bbe7651f46c87bdc11f69a38b5d81d03152eb10d0eddc334b87276fddf252";
-    sha512.source = "d9087686dad4b3d68e8520888fd1787ab707c0bb196777144865e2a9419112a3e3cd25064ed4c0d0d5a31a195c84d4793d0063e17037c74ce3eff20e03def946";
+    sha512.doc = "cd6c7988eb2878f7cd1174125d12c8642786400e2bb3adf20237ad27acd1a367b11a14aa793972939a3dbd35f7a8aa8bcc36f450f105115ca27e1e776679a784";
+    sha512.source = "fc418a778371582e1e85c5c6506050301f7714acb7cda862e3a2cb46dc3bf6c6d0d94f04c9dd6a5632c28d17c449dea077ea06515be883b9f0d6a7bba780683d";
     license = [ "lppl13c" ];
     version = "1.31";
-    sha512.run = "0a95a2839415393f430eac43a0cac3ac1c4397d68b037167d0e66595e82cda6ef11078bee63855ed1de66191f2f241418705ff819dbe02ac4e3c68ba88eec52d";
+    sha512.run = "4fc2080a53725707ffeed9d6bae7f7585fe1543925a479fc261be46901e9abf580001cb4ffdbd4c4dd7ff5f6bede1cfc81a900880f9426d165a72f5bb36664ad";
   };
   bookshelf = {
     revision = 72521;
@@ -5614,14 +5620,14 @@
     "bookshelf-mkfontsel"
   ];
   booktabs = {
-    revision = 53402;
+    revision = 77677;
     shortdesc = "Publication quality tables in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "952ff0f30cf7679c09020cf2bca542e11e3a64c88956e87db6289acfb03879609f66c8beb019a6639716462aa088bdff7df3330d60a5d864f25de164affa4c51";
-    sha512.source = "cdca8f3e7f7dd99b87da76f60b1279de6efa8af666fc99e11749c21e59b77148a40aa197c0682ac1085a4d971a26b8cb59a9d2794fef81063006a220caf91ba4";
+    sha512.doc = "369d83c00e823b9b1724ae7df11bf4ae8b10f3f0a5a400cae677a28c011728c0969e67ef484e39a34ab65579395aa540b6cc8fff9e4e74ed70735a6dfb7013bc";
+    sha512.source = "1d07fc33d79b0b98fd5f50a1545d664715312ed8aeaa0c910be688786d758c5734cf2229ae6034d6080872bbd6d6ffa215931d680483ad1c242c6fbf010ffcd3";
     license = [ "lppl13c" ];
     version = "1.61803398";
-    sha512.run = "8d7e46297d19f2e683f5c16a13577fc582cba391cdc8a15ad395a6b44072a5b50216ec9e9a8c727c1b2a36b9275ba9bed10baec3aba9d726505955af01d48c3e";
+    sha512.run = "e8e69f00b08f3177ae91d2d3c1750a296caef7baaa087410e0b425765e3a8f7a26222f97563621951d557e3ab5cace465cf620fd63c4a2a610af87e6ebb75748";
   };
   booktabs-de = {
     revision = 21907;
@@ -5650,19 +5656,19 @@
     sha512.run = "677a397363b80126e45609d125ec2cf22b3ef144216e19183bcd48c1f0ccd6e2e079fbb0a2e7ac03f094470c8c0bc64ae652863aed970ee9fc75a9a69b60c618";
   };
   boondox = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "Mathematical alphabets derived from the STIX fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map boondox.map"
     ];
-    sha512.doc = "72e77b36b79bdad663db8c707daaca8d324fd3f50edc8cb7780a641f5d0217d3fe4c2b758c1775de0ce5fea3d44e9ea08e745df51485b4d1e3de11e2a98c74f0";
+    sha512.doc = "78aaff3335ec1d57c8e7a3d00694f88545313d4adebc9d0e0dcb48ffa9432c477b65dcc825cb68a484e2527f315dc81c79f3e7c0af5d7a1b7a17188dccce1525";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.02d";
-    sha512.run = "0e1cbb6ec227a2cd17852e71f16b4972de18a076fdd4c4416ffef1416f3332fd351036fead4d82a69b5aecdf392bc7e1af85ca5bb1e44c153d25cc86ccfc631c";
+    sha512.run = "4f7c5180cb30e2ffef43a9e38d20503edb79034c965d625c15aec4030042fefa59db5d3159c188e8f65d7be4731422326c6064f0c3b321a04437f993d951f268";
   };
   bootstrapicons = {
     revision = 76502;
@@ -5701,14 +5707,14 @@
     sha512.run = "659cd163c28a52fc12651b35b8018d0df7e4fb706739b090167689a7199a8f9ca3bc3376ed3a5b6c076e9242f4f8132dbec6cbeead499453fa5c9cbd2aecce38";
   };
   boxedminipage = {
-    revision = 54827;
+    revision = 77677;
     shortdesc = "Framed minipages of a specified total width (text and frame combined)";
     stripPrefix = 0;
-    sha512.doc = "54209e9e5fb8da8db65901c729b78aa3c9b536c3bca4d40437848287d8a07d955a84ea0f13d93e7e702c47c6bf8bece3b6d3f3026d5f78568205746c9009b968";
-    sha512.source = "718499cb248fb8a98a9650a78ae377f9aaed9318b91c4417c7690201504366e073e80615106156087686273f9f86adb58f854cc758c2329ad99103f788ba0164";
+    sha512.doc = "73991517b7e8361ed2272942790c8b826bb249bf598a5dd9c499fd91179f0f088aa12da76d94e16102d59c160f145f3551c8a4a5b82b4704331af4e35870bd7a";
+    sha512.source = "3c626ffdb84794cd7996b29f5b841c1a96d80bb5122a2ec5df96a23821d3a3dc324b7f3f294d6d416307ea9346736ae622c7eaa1b42c86b1499cbfbf7a2c2d8b";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "697cc00b10468f515b5ebae838d623eec58085269c98897a5c2c4ea932ec52ae819110612feb84b6951ff391bff9309655abf6a41e13da156e5ecc52c015431b";
+    sha512.run = "a8962245c08dd086ac27353f6c7116732ae387602925eca2f40286c61a09535bbb2db71a20c10f52dae61fe69a6881231708017a5859339cd60e8b33ac79f42c";
   };
   boxhandler = {
     revision = 76790;
@@ -5748,14 +5754,14 @@
     sha512.run = "e4eede34a086ab025a9918798feea2c6b8b19d86782a6d93745aa82d40258e1619433eb445d0b3c1335dcb195689bb76ac8142e6c65618cea6392e243dadd915";
   };
   bracealign = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Align braces under and over math expressions";
     stripPrefix = 0;
-    sha512.doc = "85286e7c4e4e26bba32b976b62618e4ad3123f6e928d139c5e6492036689f3e7636472b8205105d94147e62045be801904f75ca61679e2e79a375cd1daec5eef";
-    sha512.source = "ea2978a49d6fb7fee210fee834e10f0e99efcb1229c1cc989eb49e7b95de52c3f9e3fbf27a0c57ff1a9e0203e5cebe162c2d6d880fe07eea1499fe73e5ab157f";
+    sha512.doc = "2f59d439a07a425cb0df7470ee2ffcf2c035690a869b0cd13f6e3d7cc7d642a13222760201eeedb22a3c68280469ac48be8d4f75def292624fb596990227a637";
+    sha512.source = "c4c1b400aa94359c257bbf31fb36e2f34b1f426d8695b0a44a2026fd41f5968a52a47d4e80d5de37cf2ef1b8c9fbcaa63a2fa21dc9c81811be0f37f4e004f575";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "fdc927d05c9c9032ce62f36dd6861547e9b4eddbaa0fd9f0f8877f776d1328aa56ed9cf837d037993400cbcf7639b5d30247c9b2b580cbee0f14443ff201f2a3";
+    sha512.run = "ca92e747c48439b0751c548e689e7e95b95eaf6af78bb81ce7d9db68af373a481de0093dc2e2d717da003995177f1fcbf6692d4bc947ebcac9f6146d2f620f59";
   };
   bracketkey = {
     revision = 17129;
@@ -5785,12 +5791,12 @@
     sha512.run = "04893a3664b10fa1d5b912751e51b6d4a596821535da87aa1f2c2c5632e1fc60278435fe9deae4b0fba8296f2e46015b27b592721dde26dcc4acf7e3bd672a4c";
   };
   braket = {
-    revision = 17127;
+    revision = 77677;
     shortdesc = "Dirac bra-ket and set notations";
     stripPrefix = 0;
-    sha512.doc = "9bdd3cec0da91ffd13d556b9620e9c502a658374657e2821141191000a2321bf030edc9c32641b5ae6c52acfc7266c377a8f4dfe4891cb616f8d4f6a377d9ee0";
+    sha512.doc = "f0d0a6a088046d5ab6953cb8b439837367bf1c27c72a51cd0a607f8faa39458e99aeb4da6a5da78b75bea42c96ee04d1b4aa90bdb8f4c2cb1c6fb95e500a3161";
     license = [ "publicDomain" ];
-    sha512.run = "dc5f931ce9adbb3e8398cfab83402776d92018945172c7c17f04772f3253942c6ebecd5ca0f3d23f0befa87327dea4a3a9b90528bb7409963f04d9b856186562";
+    sha512.run = "88ea20f70da761bea36e4ff02b9b50100befb8a050f0b46f5cd9cd2927d157f4cab0bcc1515b61dd0f3c805735a3fabfe7d38281d0cece7ee9a6c5130eebbcd4";
   };
   brandeis-dissertation = {
     revision = 67935;
@@ -5822,22 +5828,22 @@
     sha512.run = "8d2c00167dc8c755d5d29f66c36d7d70d4fcb8fc1ca66e5c4008d702b38eee9c8bbb4bf9e7129a69649f57f31b25b532d44f3bb7628421aeff90e89afd9ba2e7";
   };
   breakcites = {
-    revision = 21014;
+    revision = 78116;
     shortdesc = "Ensure that multiple citations may break at line end";
     stripPrefix = 0;
-    sha512.doc = "2184e40db7f4a01113ba1040a62f8213f43bf34202a57a33abfc6291e84b01cf27298442f0f636289892d02764f1000ff3542f2ca6e490e0eaf6d5bab247b3f4";
+    sha512.doc = "7ea306a5f1fee8f5908824e2cc166e28736ac8d7ec75243c93876449dc4779412da32f2d787a5ed48342b27221ee874e599c90792a51ff08d1dab589f2974cdc";
     license = [ "free" ];
-    sha512.run = "13fdad42586a361b4e01999476f4d92ccc0fbcca4ee2663153b9eabbb08ad571dae6631306e9fc590d94f3f02af79519de30a78ed35f737004d86bd62b76786a";
+    sha512.run = "0f06a42752696b857d005f710d67b7c3f9e8158ab5a5599b23902e148e6ea7e7c82801ac6c0c5624f6fb44c941889dfeb241cb5c447e8e0b21beefce494a1e91";
   };
   breakurl = {
-    revision = 29901;
+    revision = 77677;
     shortdesc = "Line-breakable \\url-like links in hyperref when compiling via dvips/ps2pdf";
     stripPrefix = 0;
-    sha512.doc = "38f7847274cbee0a6e7c536a982d0110670cf6af54bfa99718a862e1974fdd839f6ef6871cbe2c40bcd0b2a9036c806eb2b57c8adaee583ef316da367ed854f5";
-    sha512.source = "9ecbae9c483331d636a522f67e5da197e4f647daff0a0fe81f4542c7248934c662046c8e61bd10fadb44144918cd508f09c57880b9c1e0c6515cb2dfd35e52cc";
+    sha512.doc = "97ed9c16a82f34d3e04ce7c8e796e137f8e0954a1d4be1f4160ef919ae3cb12285b0e2c8ebcf6cd797391d8c4c0e45637ce0594c58de379ce9111f9d308f3300";
+    sha512.source = "02aa5f4363c70801c116ec19c3160742ae54cc14b1c32604c00c0871cee7bfb97e0665610e6a3af87c9d6fc2befd75a519742caab970c874d784b28e918e6ca9";
     license = [ "lppl13c" ];
     version = "1.40";
-    sha512.run = "fa1fa9e3ac50f305ae5b82eb63997d1674b3f640f36d502a1000b439dd52dcaf6b539d153a2c7022f3a00fc0042bcfe341e850ed6b01f7058b1f8f6fd92b4d9b";
+    sha512.run = "4c812c7c4004314320550fd48e8954b1fd299403ca325a477aebbc85c24214946ac52e90168e2fcac40bed88d3a5c7b487f57cc965f867f3b9af2ba37fe8f0d6";
   };
   bredzenie = {
     revision = 44371;
@@ -5849,14 +5855,14 @@
     sha512.run = "1e5629a2e6e6099a319d8b8a1efec83262780c70a57c482f66a33a48722bcdb18fb891a96b6b6f29c54d71ce581dd1c82decdd22ad74d6ef61765fec3f8c3614";
   };
   breqn = {
-    revision = 60881;
+    revision = 77677;
     shortdesc = "Automatic line breaking of displayed equations";
     stripPrefix = 0;
-    sha512.doc = "70ab6500b714c0e91c597b43d934942c39c23cfc9993702b6eefa19b8c9027aa0e7eaa55cb48413e2cb42e468167492e7a401380c1cb4a711daae364ae01283b";
-    sha512.source = "aa4922ba1ebcbfe00716b02b567da4b17ab1b0d22cd5fe8332d147496f93dbe0a94e9e38964b13b6b4944ccfb2ce49bfb32ed5602ca1f147fc99163eaedadf46";
+    sha512.doc = "a2f572c54674a0327fa705c4721309aee78737885f9a395ad457d83cb5ad11412166dbbf77dff976a6223e2434e0fba0aee2411a365787e6a201bd0fd7770d99";
+    sha512.source = "36cff45290cc0d323631c690f15ad4e16f42df78a89b69c56302474e15974cac8cf0e5067afc8449bd22810592593cbcd45b41038db25685c060785589ed4625";
     license = [ "lppl13c" ];
     version = "0.98l";
-    sha512.run = "c280871916bf0689794cba9640a7666a0f7b295635b85d99d08f04cc0c4cb7ac82552360b0c8b3d677b138779239c4ac4a2583db26fe194870c0c97a9a53395f";
+    sha512.run = "99fd52230549050c702c870b8dd0ff19790f5d2744426d8bf638d08da9f348f0b7874a24755a0a24ab8e1960526eea6c68b66303ece8af2c762db30c963e6312";
   };
   bropd = {
     revision = 35383;
@@ -5953,13 +5959,13 @@
     sha512.run = "6caffce46534c70e200777e4b4432488418db3da3e1cfafe9fb1f816400bb8eef38c4e796aa5099f98d545807b055b1d756bedc9a6e6b39497877097f105a8d4";
   };
   bussproofs = {
-    revision = 54080;
+    revision = 77677;
     shortdesc = "Proof trees in the style of the sequent calculus";
     stripPrefix = 0;
-    sha512.doc = "b3fec7f142210ee5051b3b3a45ef26724d95c538978c4904c9723113adcd2164e6385a9949473a8b9d29109b016c24f25a4088fe3728d675fd0023a043ca6262";
+    sha512.doc = "6ed2a78acd8ee35f3b864e6e4761fe213c9bc85d1c703e845e68e19254bb9af76e6d04851fa0219e483575d287ae6c25ab15dfa9fd07e272f81f626a8929ffc6";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "042e01990554b7ffcbd70c9a281d87ee98d9b25d7071f24d114e097e536ae1d7fb565854399eeee547ad2cf97bdd6d4fd0755169ba7548f01ed0d736e031a383";
+    sha512.run = "768b2885a69e68d25368bde27308bdee723882f0dd8b857875a36321b69a2597ca4221b4dcdaea4ab28f1bbae38ecebba4ffcc4315a36810f921f5e3ff207dc5";
   };
   bussproofs-colorful = {
     revision = 77507;
@@ -6008,16 +6014,16 @@
     sha512.run = "72d3a88c117ea971faf8bc836bfe32ddc52e96c1fe1546ceeb8a9b298b7a28fdfc8aa4b0f43bdb3fd27126383b289ad293b2ca6c4ad95873948be0651de4ea18";
   };
   bxcoloremoji = {
-    revision = 74806;
+    revision = 77677;
     shortdesc = "Use color emojis more conveniently";
     stripPrefix = 0;
     deps = [
       "twemojis"
     ];
-    sha512.doc = "fa8ec92fbb279430e827418449162687ad2181edc25826bc8a352df4f1860453549f9c3391b404d687dba0b6d11b5d9f148f753ffa0b32ae87781f38c1d7f4aa";
+    sha512.doc = "b4bd56e17770aa2d0df7ded823aec9ddbc0269c43273997aea49454a1d003c911f9461947157ad9f2ad14511f8f8fce69e50f24ec3a1deeb4d63f414d7fb79eb";
     license = [ "mit" ];
     version = "1.0a";
-    sha512.run = "fb1f2869d1ab1d339dcc55535ab4251e15d4dbb9ff1fc60ea1ef1e2d67a60e108d64f5877ea5c4682d37a418ce7349f182683f6ccecc47899aaeeaa9f26576da";
+    sha512.run = "8b5f430a6158e068bf4f547ac47f6cc245ba7584ec2613e3b3dd5a3cb35febf2541d4385c261610760ef918862982a5e60bf7944fc5d476ecee616d33d56ad86";
   };
   bxdpx-beamer = {
     revision = 41813;
@@ -6038,13 +6044,13 @@
     sha512.run = "dc37ee5237e6eb02fca173b8b0501795604930b56c3e9101c6b653ad6df12cb5ae82ad81e66aac5c1ce4ff0aa8d7f05658f4b41057ede286715c25d290682182";
   };
   bxeepic = {
-    revision = 30559;
+    revision = 77677;
     shortdesc = "Eepic facilities using pict2e";
     stripPrefix = 0;
-    sha512.doc = "25789b297ba2fcfb81e74637cb2270d41eff858e747b841cfbf5d29791fe6697d3a9cfd4abbbbc4ed0a5c5b274f8b5a7cdeaccc995f6ae623d2a6e2d831b7e55";
+    sha512.doc = "d640bf20d343e179217e76a61db41c8c906a7dfe7e504eccb682e3d159c92d5b0034aecaa943434b47a3e3bd14f2965b2fd19f763b8e512b0e15378ff17f0fdc";
     license = [ "free" ];
     version = "0.2";
-    sha512.run = "a0436e9dc7dffa9c7a7b2a41662a41db934aa4242c953f480400b7a2c8a71bb526ebe8eefa46b02db03364efdf14fd88c1dcd267ebd59f594d72540ddd3048c2";
+    sha512.run = "22cedbf62e5d96fb0deb693e25041baf44b1ab6c0e97a02e97c61d9cb2c928f3838e159c393d55462dacc1896ea98277cfb4a228f4c4469bc395dfe8e21e1af3";
   };
   bxenclose = {
     revision = 40213;
@@ -6187,14 +6193,14 @@
     sha512.run = "b4ca9a454d03635a6aa07c5666e0e7d32eafc494ec1a06c6ac7b50143761adec76069a47bb3b4871942b2857446e56e2ccc5d3c64bc22a060001a8680d0498f1";
   };
   bytefield = {
-    revision = 74416;
+    revision = 77677;
     shortdesc = "Create illustrations for network protocol specifications";
     stripPrefix = 0;
-    sha512.doc = "a54f781529750f089f87dc1e344285ec9b0020485b7953697aae32af13eb5e4f49f7b8cde291bab825bb8058c5f2a996acb2f0bfa47dca2458b7b47cff2494e4";
-    sha512.source = "9dd67e83109dd8ac4c5477237176226f436928a807f802c27dfaae4114ca1549a9f6cfe872fd1618b7066f1b904d06bc1368130234102b7982e146dfbb48350e";
+    sha512.doc = "577c564b1761c05fbe77263a08c1b122806d32c856bc30d5e251aacae63db9a969f17224ce80639232fb10695aeb1da8b3d721eed3ad3dd57da3eb5e7ed5710b";
+    sha512.source = "a7d71f6839d19736a25c2d00443be96fb8fb796598e3461958ddd44c58fd3120ebee543264f3cda810f920b16de8dc200bf9998e1ae42db898044d7dd59bb3e0";
     license = [ "lppl13a" ];
     version = "2.9";
-    sha512.run = "f50964a1917bc8c6a3b7e49b481e9c5080e1782a6ed14c0fddbc350bb097cc8b54cb7dea2c99297084cda5bad672850738a6114e054c0a3efd1b7b8d24066744";
+    sha512.run = "ed2fe3bc6fb990ecdf4ceef31726c7996f8ed49a976cade761531f1e56d86a03446b581dc63f25d0b07366f30c45d2a4c693a82524ada3db58d8a60a8142fe1c";
   };
   c-pascal = {
     revision = 18337;
@@ -6215,18 +6221,18 @@
     sha512.run = "2350e99bfd047ea514586894d20bd37dc778c74fd4c1848063ba7d53cb59ed5df36cd20fd51140ede8af7f32ed7efc44e1d4f3db4a0baaa7d1439941ed5297a9";
   };
   cabin = {
-    revision = 68373;
+    revision = 77677;
     shortdesc = "A humanist Sans Serif font, with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map cabin.map"
     ];
-    sha512.doc = "95353266181cfda03973d68472ad564185abac4d828141e339183f69380f99151e0a3165f099235db54be8a3ee35ffe069512240633972f4b7dbf14ca1e06126";
+    sha512.doc = "eda76e7739dd89dd3c4acbf9a46d89481e8e41ff0195705d73a1514db9ceaac94a6f613c66fa6da4c48d5edc7d58d9c5d437f1e870d3f60ba306f766797d25a6";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "8227929382396ece0ddac74095387ee0c96d2102fffe5121f89182836792933a6ad66ded538229c5bd12f65fe7518d00a333835c17537761f309db578e81bd3b";
+    sha512.run = "1a4bf2439a04f0af767221cdf531f37bea713840bbbc57b7341925be5d16c4460825075174a45faa8462cfa5f67a96ff6fe4619f7038208fc899403b367387ef";
   };
   cachepic = {
     revision = 26313;
@@ -6252,18 +6258,18 @@
     sha512.run = "d8e9e0449af1ac2d24fb4bcff4d1843e4a365c16c8f7a90b763b683c93bf054f9237ddcbca07b2d4682fbe755dec7197fc2df34617ba54f2c0b55d2d08a6b4d8";
   };
   caladea = {
-    revision = 64549;
+    revision = 77677;
     shortdesc = "Support for the Caladea family of fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map caladea.map"
     ];
-    sha512.doc = "e3f84460394d1a806a06836535c8f9110715608e2110743863e4c9d37abe696a3169e904a4ef507105d54790af4165d3a5a7559b28568b86b73761975b8c0b3e";
+    sha512.doc = "31f6a14630f755924046865509daa2fa5ad6ff064c0fc0ccd302393aa6acb4b273e4e71df586a5683d1a20903e9706ae55418b7d7ec688ecd4729e25e97e4d16";
     license = [
       "asl20"
       "lppl13c"
     ];
-    sha512.run = "d5dccec03c75e7ae315067527ae4d88515d6bbfb6d9b1336420ea78daaa7718497e8040f75a0a531c91c2b0eae728cfddc824e623bd5c73471192c809550dbf1";
+    sha512.run = "88883897e490103deda03d3b49c4a5c066a8a4b6b96ead6bb272109af3864bdea422b6ccf20f527841e5fcdb89601fa55a4d13c915c33fcd93529cd59b257d16";
   };
   calcage = {
     revision = 27725;
@@ -6304,14 +6310,14 @@
     sha512.run = "d60f9face95cdf6944363ce66b842b2a695b468e77193785564d1697244e193cc0dcf462e7a13c8a22eee173d5d4cd192ae59bbc68e086ac27c92d2dbaf6f156";
   };
   calculator = {
-    revision = 64424;
+    revision = 77677;
     shortdesc = "Use LaTeX as a scientific calculator";
     stripPrefix = 0;
-    sha512.doc = "d699c74a2b5a7932f454f121582ab4f03482022aef0b145f21ce04bf500f01a6504a39989fe22170fedb27206274285abff54a1fe59e2804a91d05c923c88e86";
-    sha512.source = "819c7159200ceca98ab34302951af308233a12a18daebced97370eda15e41490c83b577c3f3a0bd375601f1ef4f380ef3f3cc3e4f6df84b4c3a0d9ab9fcc7a03";
+    sha512.doc = "ef4c34fd01011dc56d8fe4fd585c65d8bc4e8790c5897fa776b56426dcce92d4b2df4cf3577bd47466988362b9666d475b26e589c25346f7d5e8e0d8786e09ac";
+    sha512.source = "1c832cd0220fe46ec2029029af3acba79f3d9d3d944dc543d89be8fdc2b38424f7a8fd759bd71117fb621055f85dfb3775899f02fc78c39b2a68481854ec1e1a";
     license = [ "lppl13c" ];
     version = "2.1";
-    sha512.run = "de62244340b27b1b62c7cfabc8da5acac3da0440f3190c392ae86f6160544d3b8e44dbcf5b5c95526b87cb7a0272c63fb19c06181c2b996e6de2affcddfa797e";
+    sha512.run = "ecf242652576c74ac8241833ece6252cfd52cdb79d7e67b9ac0d7f9da65490b42f3262a147f5f0dac3cac8d511f76fc56458864022169d33058f5dbb7e1ef946";
   };
   calculatoritems = {
     revision = 76037;
@@ -6361,12 +6367,12 @@
     sha512.run = "4097c7e9552ffd4a761d2d52593cc8958f434418fbb2e92d8581517a3681beb743d05dd1aac8770a5e3c3635e7255242462396391553c5e4f1350e1d70b13658";
   };
   calrsfs = {
-    revision = 17125;
+    revision = 77677;
     shortdesc = "Copperplate calligraphic letters in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "2378c004fe888bd2d60d0830ec98e805a2bdea3a5a6f4161dd3d4cb56c437dabdb579f3293845a10e316cd868725abd304ecb8eab55fb4c728ed5bc0d2073673";
+    sha512.doc = "cca7442b4a853b78cc3d9d2d1e6ebd5a38de95c9d38b47a34315d2f9a189b5b0469e3823ca24a165f65f8e85d63e3671d0674f4fa4e84045c4d2644fda2c6933";
     license = [ "publicDomain" ];
-    sha512.run = "34b5315e9e5e0ca532733f7b7ebe66e77d935fedf0e042aec63fb7cae257a423db5e93e288b9e1dacb26b0b75784eddffa8b565acfa537a7d970297f71e63a2e";
+    sha512.run = "9c3bddb8f3a06d2c9336c9665f70c6186aeeb4c3d1d57eebc96a5fd09c5d235801d2286acef26c934981ce44a953dd43a45d5cb58c5f66924682444a9868454c";
   };
   cals = {
     revision = 43003;
@@ -6388,13 +6394,13 @@
     sha512.run = "e35d31139a1d8ad7f761d6384042c2f67312e056c42f3b2e218f8385cbbc433044b25cb4e975d567f9f1c3e985a716a7c76b8ad9b978350feee8cfb9f617ae1b";
   };
   cancel = {
-    revision = 32508;
+    revision = 77677;
     shortdesc = "Place lines through maths formulae";
     stripPrefix = 0;
-    sha512.doc = "5af252a521c1976166db248c4c19d4fcadd32ec9801e0cd42b73e0a3a0adc461b88d765b90dec1af859474fc64bc00cbc8be44450cb4da6b43944c8fc46ba670";
+    sha512.doc = "053c6a2184ac9854cc3f3ffe8babd0120edb68e3e21f0843e00451047fbd01eaeddb7f5cf7399c7a68a0915eaf11174a23fd13a4103268af6c1db626c515ee8a";
     license = [ "publicDomain" ];
     version = "2.2";
-    sha512.run = "ac6e6b642dde29e32e45d7a0e967370c1f7a6ce604075cd43c57b1ee002e75adbe4fbc81de30e8d252cd58f2ac091503595a433c5de898deb3bfbdbb6f2d2e62";
+    sha512.run = "86b74ded876118e76ec651b6b2060511dbff5a63328ce8f7b1cc52fde2827d5ed373f02c8ad55583a06acf61778e16ceb6b8d911705bc5d51e6bb9989f74aa9e";
   };
   canoniclayout = {
     revision = 64889;
@@ -6407,55 +6413,55 @@
     sha512.run = "850e180dad92a7082a314535fedf7e45e3bc3db48db0e7948287bf7782c2b1fd13924e666ca0edecc5fdd7b00fb55cfb0c5c17bd51019a21fd10c7116796b6d7";
   };
   cantarell = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "LaTeX support for the Cantarell font family";
     stripPrefix = 0;
     fontMaps = [
       "Map cantarell.map"
     ];
-    sha512.doc = "17c118e49fb173158f7c5cfc31c1bee1063cd38bd1ba976e2629a648c795295e3796e845b735cab07de99296088d09ed9d87ed92c22af3e1dd1ec1a7a90a04d4";
+    sha512.doc = "fb251bf8c244bfe7c355f96fcd920e383293571305d581804808364bba87e0bbb43fcdcad26791d887a939ef728b31768b3958db3769473da2cb0f69940d57d4";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "3.2";
-    sha512.run = "37fd0c1986f76d823be6feecdb76bdfdc8222872355d0cd66c340950ed0ad90e057acee0f90ad0e41fc77b61a682f8bd390d98c8ed559015f9a0a65014b11b2f";
+    sha512.run = "c97123d42baa24cb671753eea4226aa7e1b13f0fa51e4fbcf0097bb247520fec59d640a492d579a2725654e426a3ddd8b300dface3628e87be4b17b62b85ac84";
   };
   capt-of = {
-    revision = 29803;
+    revision = 77677;
     shortdesc = "Captions on more than floats";
     stripPrefix = 0;
-    sha512.doc = "a8fa6b2a0787a3e52f3a9a22482ba9f9217ae97b985b4975c690d240ae040f4f1e17c3ea7439d53337e5a0815a66754d0e6c528417c04d7c6684d28e869f71d0";
-    sha512.source = "87d4bb47226cef478ada2482605b925a3ebb3c1ee1fc624f39e724a857101b113856d99bf659ec5e01ce6773e0f695e424c41ba0640f23a76e9721d06a1d4f56";
+    sha512.doc = "6cba223b7c570111a86813f4fb6fddead3f53328b95a7ef02d0e434898aa2a02cfdd2e2e6781074ad2235e477a1b1956622af3a20d66ce76af8612d47430ba6f";
+    sha512.source = "f739c5045e1179e95fe8a4f29074cf10c5ba50d247af81e9a90f16ebae95d8270cf3bf19b9b284dd32283f7dc2f500b5db4f015885a47bde51b52bd0570948ba";
     license = [ "lppl13c" ];
-    sha512.run = "f3b1b81aa5a8c2ed9d5ab94e2e242442674af957d3f987b0db459ff8ca920abaab43d46db234b92ab588bb5f7d4c587eccf586a87fd492659f5b088760859c62";
+    sha512.run = "8d537bc2a51616fd7d26cfd6e3bb809c51e8c081916bd23407c10576e4f1f3e18cc305aa85804d98197d490c6c301e02091a8c6637a40a86dc1671ca13a888b1";
   };
   captcont = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Retain float number across several floats";
     stripPrefix = 0;
-    sha512.doc = "91bdb436163ff745f3aecc67eec747ef5a1853035d86258bbe23a080a92b3393f72b4029bad719765663c94e79217df4edf753be930a3e4b62f0b999c296ea86";
-    sha512.source = "9c9f8b2785ce2620db8e5c373cd2eee4d9aa3cd8eb47c648625ca7250e7ace861d9dbc31432a7dd7d0f6c7ccd48b43aba74df519d72e3fa1a3c9546de946e591";
+    sha512.doc = "59c0bd5e0facea94690ed48eb125a57b9ceab19061c8d873307e102fb0253e621ebb189fb4508e8576f01fd9187bc8826ae6baa65e8cec0255abc9e84a859c2b";
+    sha512.source = "b617de79fd552eba7961388b8e10fa5ef5fea7d82101b625c991d511d036007f922fb9b6afa063eace8288bb4f88440113b8c2aad84a39eacc8d1e45476ca921";
     license = [ "lppl13c" ];
     version = "2.0";
-    sha512.run = "b5002e8ea4fc8ca1840190e8a2d40540576dc5e17110da473a8981198e3f24c858644b181545be3bed6275cd0e0bb9848a6058adfc8dbef26956e0754c4e4699";
+    sha512.run = "84bf6c879914962ba6fbfe479e9424bad87aece517a377b42cd37874532e8af6f6d408303b6567ac030c15812a4ac958baff8dbe39188d1c207622af8268db37";
   };
   captdef = {
-    revision = 17353;
+    revision = 77677;
     shortdesc = "Declare free-standing \\caption commands";
     stripPrefix = 0;
-    sha512.doc = "c0a1a4584d0802eda39812d2c293fabed2487b0cedb57df622519d5857c2ef10e54e66032e9e9ee9ab81c757fb827eabf422b1bf2ab0ae6f7c22ab3aecb49a8f";
+    sha512.doc = "759c61eca921236e068c471151966fd59b530ec07d261810871348822236d89de9e1b74bf37a19885861fbd0a4f032d9cac2825a787891d28f73308bde0f84e6";
     license = [ "lppl13c" ];
-    sha512.run = "c24a7d66c1daa3a9c336a8555286876aea9e969a4107c42c258f0f4c9a88070316df70e0f2a860adb6335a33e49cdd7a9ba8391255f1e1fb283bd2f6a7e7b343";
+    sha512.run = "fe9dfb17aeb1ea243e727c1ef6c7e0589decd460ce8b5c81ec9ff4e9ecae17748588e29bead64c79ed17603549a420a1cd5b6a25bf5137d66fbdbde3ebb383d2";
   };
   caption = {
-    revision = 68425;
+    revision = 77677;
     shortdesc = "Customising captions in floating environments";
     stripPrefix = 0;
-    sha512.doc = "3a13af008ba73516f8d4be8ccdeda4b18fda2bf9462fed32aca7917efca3e5185f77810900945ed518fef5d81e2629f89cacad5564462f40bc0defe79451a415";
-    sha512.source = "160a286e1145f2669dcd1abd651cf2fd725ceb95c87506d0844e95393be85624fe53b2f549b7006d8470449ee9305aeed2e81d1a7f2c69cd2f38a26aaf4fecb5";
+    sha512.doc = "8941a8cc7d65aebc42d7e8e4d476ac464513d697b0c15624e763c1675af19b380f76582b23966796c89d099cd827a9113afb37545ce6a890445bb6043ed3fcba";
+    sha512.source = "b04df49ff667d23e489ddbbb2c75975788657817da9c39954d68576c316e44668187ed0fe4ea71e930c0356d6f37670ced3e15026c560bac40c08cfc5736db4c";
     license = [ "lppl13c" ];
-    sha512.run = "21a36ab8ece42716032a15f3c105ba32c5697c4c88fc8b383c66bc6fe7ddd4969e12721e94d79df0817b02b43e498ba5211ef844e320bd91ccd9ae24e6f28fec";
+    sha512.run = "1f960fc7a98f1aa23fda9d8845b56b96414539343a49d907905d491ae8476d8a0dd78b72b30ed28de5e74ee1bcfe9572d5723f34f490f60908e567998e395fc7";
   };
   carbohydrates = {
     revision = 39000;
@@ -6476,15 +6482,15 @@
     sha512.run = "345c61b7eb6637e73a66b5f9183ec39188d4e2ffdd418f12d8ae70394f447eaf8a5d8c62e1adfa515ab7879e1afac4163957ae0b6facafd9ae6ad6f300acbe03";
   };
   carlito = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "Support for Carlito sans-serif fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map carlito.map"
     ];
-    sha512.doc = "3491e08e6b6ee6d2726979d2693110b3fa137ca950dd44c7540e1e01d887ab4ab1af1c357e579dd323ef8f94aaab4da84c9021626bdb64c00ea44fd1b8547c3b";
+    sha512.doc = "9d42827bdf94d554df03ece1d4e17189cb19849735de58cd4288483c64097c6aa846e086d4c1e6bcfac411ee5206ac2d1437132dec96741600fea5425d882254";
     license = [ "ofl" ];
-    sha512.run = "de78fc4989444b0ff083dcad5d61c92f746648ee1cd44aec12d7c3e9679bff14d1f97127b52d82c6300966f3faf1d132c7dc993082e70cd942f7ef2c8885ca62";
+    sha512.run = "4ef26725fdaad9ae16760d282aff30098978a9ae6b10a8e1082f5ce03f70cea5c1569d4568d9367714a7f7401f3fea7076fab323d20340d8a70524f9e91f1908";
   };
   carolmin-ps = {
     revision = 15878;
@@ -6519,28 +6525,28 @@
     sha512.run = "4ee48ff6f4cb4ab63fedb1d2fb74186140488f31eeb75415fbf588b5d1a128903506c0cb72dc66a57c5e6c60b948e2a67f29370115ad9b9d84dbbc07e7acc366";
   };
   cascadia-code = {
-    revision = 68485;
+    revision = 77677;
     shortdesc = "The Cascadia Code font with support for LaTeX and pdfLaTeX";
     stripPrefix = 0;
     fontMaps = [
       "Map CascadiaCode.map"
     ];
-    sha512.doc = "c84b14187b080c744a33319a4ef791be09b4517d8cd0e9ed2dbedfbb37a09785dd6244a4e4dd1cf67cc8f6ff608b6ba8d2299c7074921f6443d6208c702feac7";
+    sha512.doc = "d60c0017effb5b2c1431ca5a2cc11c18f1788abfa395e749e6ea17bbab51ea5d7c0d012a40d60adc82242e89493d08194397cde6d1d88f0ec9b88abf61015661";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "0.0.2";
-    sha512.run = "3164663a54bc3ffe39aee9cbe9501a3d405fd8879059081ee2f0f66bb523686e25f3a7fdb69e61cb623a17ed21f21b0d6752f8c05b09590672d04315d5d6594a";
+    sha512.run = "595191062a4351dcae96dc5d822f62944ddddcbab19c21ea832cacbc39a2d17a47f5aedd5d7b6e2bf36c1e34045b5bd2d8dd35a7e4e39201a3ddcb8ec1b71d2f";
   };
   cascadiamono-otf = {
-    revision = 76343;
+    revision = 77677;
     shortdesc = "Fontspec support for the OpenType font CascadiaMono";
     stripPrefix = 0;
-    sha512.doc = "a043f79a8165b3d58cbb577e3d396ada8ea878687680ba539406f66b4bdfc7a5dda8b6688969a4b7aadff486d72957ecfee2be240a0d3026e5dd2776460c4e14";
+    sha512.doc = "28d1371cb41357ddcaa8ad707017e4235f85e30c3c578cc7c68b1d21cdc00ca0ff6c3ef44cbf38883acf51ae32412b1bdff96cc694d77078aff0c45f8e311f78";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "7ee4cb46b5e8dd5e727961b11ec9fffeaa1085861806a69b571e6a6043038db9c2ee28ef98891c399aa903975ef1dbc933b99c6724c9d75ef2c7e7a161f22bdb";
+    sha512.run = "990902faa9fed7c64cd338e11a08e25afedd5fb67e1b1899d9059353f18bc0544731a3186e7dd723386d4bad9696885a2ef415fe18708cadb3e643a77923a116";
   };
   cascadilla = {
     revision = 25144;
@@ -6552,13 +6558,13 @@
     sha512.run = "df66bd91562f3678e2ef42f16a4a0c4af95209fb28b1176b5b63968632b3235391180b06431a42afdc73a9e4f97f47c8c954ed1ef2ccb746cdbf1d65058ad919";
   };
   cases = {
-    revision = 54682;
+    revision = 77677;
     shortdesc = "Numbered cases environment";
     stripPrefix = 0;
-    sha512.doc = "89aa9005cbdecc26e0b2489b544cf3f504e952eddd9a28dedd2a2f555d3e0c5f8378ce1ef21dd78fbc5ebac616cdb7559f2147e143f3cef12286a3e33d9b5616";
+    sha512.doc = "001b8006f21e5ec00464f03b23dddde9bd97308a6598941a028a36dc3db195954bb84bd0d94121c5d936f068ef16ab1d5ea0caaca85bb0e3d756cf68eaba4366";
     license = [ "free" ];
     version = "3.2";
-    sha512.run = "281f9d13741f16fa07f93bbd2628f4da34db07d5005b6c1d7994ec7713aa100f152efd066bf712417bf6dc3fafb496d0a80f65cd2127c4640ab28cca6a4ee1d5";
+    sha512.run = "bb33156b5bf1f4cb9ed9c3c3a2267dc3182d520dff3d80550fbace13a40c492278590a4856b4ada4f1932f693653ddc0eaf07ed520522c5e6cd4b9b9572544b9";
   };
   casyl = {
     revision = 15878;
@@ -6570,14 +6576,14 @@
     sha512.run = "1536d4fe6c0cc647def47d3686ac73757da8b4ebbb99a5188e78944d59350c0da731f2e51a40c94a1e05b225a793f292766de4221792804887b4350631c8a24b";
   };
   catchfile = {
-    revision = 53084;
+    revision = 77677;
     shortdesc = "Catch an external file into a macro";
     stripPrefix = 0;
-    sha512.doc = "ad0d938e0bb4fe3d307dff1afc5ff93cd4b76948a88f88a65e3d036fe679cddc91c52e64febbf887c766d423fa5d94371869793c93138eeb919188b9b44234a7";
-    sha512.source = "e254709b62517cbb717c43e894c17a72277465504bcbfdcacb2bf7423173e0476cce8355acb9772ca74fb267abd43faf0470ebf92139dd7847c756244efbc3fb";
+    sha512.doc = "cb0f793b5f22d7e60801b87c2d60e748fc5492c0d19a52fd953929ab6cf6d63cca781f766e048fd349c88e62440b246d3d0bed2e164e6ecd760159c3516bd645";
+    sha512.source = "b15515e1bc785f77f5fc6f49d386c40ce3d6106ede0e923292c8b22ae0f9bc67bf519674bfc3c0235eb06f2e7bc7b54d1ecbaba47be35cb955304e7a36ebbb29";
     license = [ "lppl13c" ];
     version = "1.8";
-    sha512.run = "6e01a91913a2a81224a533eb7f119283c267682efaa2a6cec11e9db7fc593b0d7a6830b83e482f22e96df208dba598b1c6596a78ae5d4cd17aa4c9a50eeaddea";
+    sha512.run = "5a2249b73e610e03ad19dc65289ef32d482645b04f9d0691f362f4cfad257503a679dc1151bb053676b8e762503bb418116dd4153c848f3f445d2a758befb4bb";
   };
   catchfilebetweentags = {
     revision = 21476;
@@ -6684,39 +6690,39 @@
     sha512.run = "3d0bef5ca5c37f1cae98bd0555d714ed4408b6fde4ffcfa78cf2512114c9aa09b81b23bc6d76705f64dd08ea493add2027e7af997357ff5c4cc360deae11ba92";
   };
   ccaption = {
-    revision = 23443;
+    revision = 77677;
     shortdesc = "Continuation headings and legends for floats";
     stripPrefix = 0;
-    sha512.doc = "a3d2f92700e3421c37a666093944ae297ed39a35d99d6971978f5707619046603fad06b84aad55f41d3af08725535470ccec6d6bde3ab8f1ce4f0a53038e9ca8";
-    sha512.source = "83a8ab7b7b72c156ea07bf7d19c759d342187440574dc82dc0f5e683abe490c3b408d672464d142922229593a1f8363881a48475da0884920484c6057a40358a";
+    sha512.doc = "ce94434c1439f65564d294971e94447d89e74f0abbcf87a202e22d4749507937ec73f37017b2813c7d867f676821cbb0d31ebfeefc5d1505722025bcc3a015d5";
+    sha512.source = "278311bd78d5bbb99269d5afd4cb6be9b973d5a4ca2420ea317c035e886c2a1ec933f25548799b53087960b1002a9018ae0acd3f69a84489015ca95f6aa19ec6";
     license = [ "lppl13c" ];
     version = "3.2c";
-    sha512.run = "f002efbd7af71c108e041daaa182a4432d1886a058cbfda2da7fcf6c0f75a217d04bbb8498deed29c7f03a8d22d4d2e24327e6a3b284d38c7b37200431f17918";
+    sha512.run = "22c4d2e22e89a4f150edf5c13730835d5dbc1ff7815dc71f8ccb680d3097c547a55085767f11b8261a23680e6c3d5d20017b8d7097dba8dbc6830a765bebb398";
   };
   ccfonts = {
-    revision = 61431;
+    revision = 77677;
     shortdesc = "Support for Concrete text and math fonts in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "b0e9b5ce6010b03afc52b6f4f7a978e8d5a8f1a382750bdbde0b758209e7f8dc57f84d950163e64381c2d7a8366a50a34c02286cc2011b9cde3e0d40810e01a4";
-    sha512.source = "30a301941132ba7b85c59b7e806d2b28ff314bcaae30c228337344f09846cc1051a73df1e4a2b76e36d499095c5a21000f250ec13f967a6080280ea120dbecc7";
+    sha512.doc = "cc09b3741636671de502407828df25e72e0003f09ff3549b84aafc856b25267c21179b26a77214e2f1ef3c8f99da9818d2a307ee24e55c72ab6afb653672ab10";
+    sha512.source = "343842cb0e999a18bee5b51c64d904ddf90affbc0f6beebb28a10d8cd520a80786c16f266a9490cb09efe1748e8d92a9097ee3143d676e2a536ffe24248f2bed";
     license = [ "lppl13c" ];
-    sha512.run = "fb111cd33ec70fa672e759c9fc2894f6b0338e40bef7d1b2fda2c37a437fb1a5ad87ec87169ec389d9eb21068c890c960a5cc24efd6e443b5995d5001f4f7115";
+    sha512.run = "55dae1465022b1ed48fc8a96f214c70c61fb5883eb7d40e9318ca93c97dd1ee2044ae11a369af23f2d096b8f74323b1be4450ea8d4b593556c6b9b09fb0a5228";
   };
   ccicons = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "LaTeX support for Creative Commons icons";
     stripPrefix = 0;
     fontMaps = [
       "Map ccicons.map"
     ];
-    sha512.doc = "0e4216adcbe01d8feb95d31e2df143ad739f66c2239196f9f5c58638a87d320949256baee32703663d6116bd13b4af607dd38d16d4ccae218af55f5402308c03";
-    sha512.source = "af84fa01272028018fbcb4fa9e04971b9580b1e6fd63f0e07419a088005b75e852a122a5ee0416afb7391ff165ae39549f8931a157aae1ea272d97be05132e8d";
+    sha512.doc = "a2c4a14ef0180756d1213c394c8ce9c80713ecad91bdf16971948423078eaf1a08598fed354dd06a49723d8c2978b57fb282d0641b80b707869cb90bf5ea3a2d";
+    sha512.source = "d0260623526603a50afaf091cbe58296b9f14da28bb05836a61853516e371d3c20ba5bab98482817c8dfe3757d0fac7fd692b185aae6b0cc9eb7de7d64af3a14";
     license = [
       "lppl13c"
       "ofl"
     ];
     version = "1.6";
-    sha512.run = "4e755538440c87c2bc1f8d57d41ce78ddaeae9a0e3c1c85aeed172c2a25e952963b26245cd1ddc3222285c883ed4574ac4228d17f1263db31cc330bdb1f345a4";
+    sha512.run = "9c84995008a125448eafb343806840da7db52da9f906be60229c79aa419aaa84ffa9dfbcd25dff461cbdac32967faa06c8e9f66c0e7795c3b8925068356b1c76";
   };
   cclicenses = {
     revision = 15878;
@@ -6797,13 +6803,13 @@
     sha512.run = "eaded996889f84b0da67e482d6356affa3a3729e7eb0388294d620ec90d245d0c6127b44766d2a90c036a8f69c91892a5fc17cbb881da266f9b2686ef9f11555";
   };
   cellspace = {
-    revision = 77482;
+    revision = 77677;
     shortdesc = "Ensure minimal spacing of table cells";
     stripPrefix = 0;
-    sha512.doc = "ae3ddf54914ddeea4727ed079352645de96842e69ed0bf30dfd92353ad0360d649cfc1704d0e21cc94fc649407fe8fa6d67e2240d98671094a3b84f7089d0a24";
+    sha512.doc = "ac681d37376d6cd7e06bd45a19f212f57331557c555d051b9b340d58794f2e3b729ee5743593003c75726093e75539abae29b22d13422ed4b6817bb4f3665886";
     license = [ "lppl13c" ];
     version = "1.9.1a";
-    sha512.run = "4f2b4cb9157f171324eba4e5660b536d63135f3d47f2e327c316198674e776f56d71fd815306483ecadd407b67ce53630ad1ef0b21f17e59b442603416e91b73";
+    sha512.run = "77cd50122e24f424f44a5daa9ba3c86cbb3120ed8807ba6e1ce3fe2cb2876f808645388b3c46af4c5d9596a9209985f9a76a1567898baf4ca27f2c068792ae24";
   };
   celtic = {
     revision = 39797;
@@ -6825,13 +6831,13 @@
     sha512.run = "a5be357cd6bb15494b982982e4234bb7f0b6e5f54f4b71892efbe9af74005adf6fe994a8066a89ede026d45406b2e4ce4618620138b97cdf4b70a50346fa2b59";
   };
   centeredline = {
-    revision = 64672;
+    revision = 77677;
     shortdesc = "A macro for centering lines";
     stripPrefix = 0;
-    sha512.doc = "023be77780a79180deae33a27b25c333f4499b302d026e5ddc34a2d1b7d45496dc0940027e7982816be0f398837ceb7b0de27ffabe0d1096c9fcab096784659a";
+    sha512.doc = "83306894f1493b5f99295f43587e348266a9d2968284ca691d9ff5bf82b07fdf7b2962b7b62a0f7833d66cd1e6967e4dc4a896428f9614538721ffccab838743";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "b9db432378f6b24ab52c20e1189734dc7b1285792e5fc392808a04f98ce784d00ed9b87459017f1f798c5e6ff769639f650c3d3abe2cd5975306b6875e1fc067";
+    sha512.run = "4a6fe9dd896be841a738072662a2e5561972c7e0653f7f196ef639e4d0be5268415c55ebba48490791040b5eb01994ac6bea72a6db9bf4d26db7f25310a44ef9";
   };
   centerlastline = {
     revision = 56644;
@@ -6863,27 +6869,27 @@
     sha512.run = "4a38e0bb1d14463423bdbbb20c642f1f0e9df3fed016226d6e8ea48a21ea1d1325a7741b7b25ed2f0230c05a28896b172f4334e2d7494ed3f727627cb85f2482";
   };
   cfr-lm = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Enhanced support for the Latin Modern fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map clm.map"
     ];
-    sha512.doc = "11f689c3b824bfc912cbf3c45a7acb751bade5f4a84715b9f6006bd61e83728a83759bc6c4ec44cc1ceb6eb4cc8c297db7bc1faceae2f4c6ca8571c273249fb1";
-    sha512.source = "5bfd67d7e7fc6efcf15bd6892e3a87be79600ae8a0d1b5ca16963acb5900eedc360e9df45abb4f6cb8232f8f8d2709178481a4b9a2ed7f2ba938e4a233dd9f65";
+    sha512.doc = "df3c173139fea8d07770134e7989c24eb010df934dbce5fad1f90ea8373b8050cb34754fb49185ecad756d6730e55953cd18379a100f30d28ab6395af65673c2";
+    sha512.source = "844ebe7b6b1fb79c419e37e997175418fb5da9c7bb9df894d6b337c239e54e399fbef08e9f7d601e44a097ac9353fb17fa7b2b6675f7ba8f48f0ebc6f0f98ec9";
     license = [ "lppl13c" ];
     version = "1.9";
-    sha512.run = "25f96f10e7ff30437f0d70e4bed016c676f4ed7ec11d812b23e9a11d46591e5c07e94511f1aa1c7473843b1de9adff67d114244307010441dd5471f58c4ffb5f";
+    sha512.run = "57c6e50c5fb93a7ce0064cf26454c7bc82b4bb3456c341fafdbbef6954be0309da4afc4d89efe869880b775d3a1c8976a0d8f96bb29e79a00fec1d5edb503d3a";
   };
   changebar = {
-    revision = 71847;
+    revision = 77677;
     shortdesc = "Generate changebars in LaTeX documents";
     stripPrefix = 0;
-    sha512.doc = "e3cc8f3966f459ceddce695949aa41edc853f39988632aecce37d834fa0fcd1675e64d79400d81711190511b48c9d9363fcf05b1d96faae796169cc2d7f86911";
-    sha512.source = "eb75317139de9298dee9d70a22f1c19e57a9fefd854237f90dd59c06bc36f63f31f8377f41658df1981b9b1522065f31db68da8ed41f4a005981c5c5fb9bf0db";
+    sha512.doc = "fa438323b9c655cfa10929adc33158d99ab6183695f835911d0fd6df47e384167a9ed0df6113d9e4add49e7635fca0664270ac516aa5c4e32f34254661c2b6cc";
+    sha512.source = "1e0a235a812c4fa1ef1676aa91b3a044ebce82ef0c1c2e50aa7ce47e82f5cab320abc87a268c83b47fcfd0819d89ba19cca10036d98bfa0bb1fddcc107ab3c04";
     license = [ "lppl13c" ];
     version = "3.7e";
-    sha512.run = "f8dadbd0ab0c5c49d1b140aa13d0e3a95d0baf1a8c78a9a26e15feac1e2e866f1e45b9f0571a581f9a6a84365656b3e634dac09d9cfdd9d286a13259de11d04d";
+    sha512.run = "7392bbc8615dbb6a23cfae50a82a374700159a49cde779aa4feeb7056bd2956fd0005df1f8d05c510b0d040e4f42d968cd9947eecef1f09233193ea1a6f75b3f";
   };
   changelayout = {
     revision = 16094;
@@ -6895,43 +6901,43 @@
     sha512.run = "c6852a40bc8415656b8137cfb90a79cff8f8e9938979eba4e02dadb3c5d1ffef60966f9e5779696402f2b9344026ebc1e22ddeb9dba856d779317ca801f26e7e";
   };
   changelog = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Typesetting keepachangelog.com style changelogs";
     stripPrefix = 0;
-    sha512.doc = "df414c088260ec08480cfb5e3c93b0530bf3cb15c64d9cbebc69948d50ef45b8f9f95ed4b386edb49a594e547caed36611dd1bdb5593f3b15d4ee0bb3c09ea0e";
+    sha512.doc = "ec54c1b3d7fb80f8d99fda4018d1f4b3b9d61ee5bf05d15142e1e350b0d3e6eb76949abd5ef24fdb3d2e755201a0b5fa9e3c2911ae02083ec131906566001e08";
     license = [ "lppl13c" ];
     version = "2.6.1";
-    sha512.run = "c89b1d46394b7d4674c7b0c6e315518b5ea42a4398e5c6d72befffed882bbed7d193321f072e9f3119148a49dcae01c06cc1f454e0620210ccf8267476376aec";
+    sha512.run = "bb6a6713f0f5c22089151ac096e3633ec7d34406c25282593d093a1dc75b6af63bb995e5375695be20c116452bf6c01badadcfe351557c0ae09cce2157d45a08";
   };
   changepage = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Margin adjustment and detection of odd/even pages";
     stripPrefix = 0;
-    sha512.doc = "e3894d3a475f132e2242a6402899e8b9b6045681ce1fdb05fc5b0570e4d6b8b6980c2b5f5953602690250826db0e7dc9bab2f235d39fa5bda0e1161fd781478f";
-    sha512.source = "45ba09248231ad1bf14dfa553b11172e610ae8f46948451437ce3a88521f84791ae149a83c1ff104dd0f00ea6a1a029e816ab7dbe1e38b9eb97902c4a9b9b312";
+    sha512.doc = "046ff9c3199a9db75aaf210ea0256fa497fb3aaa369ecfbbe72adf7b75799d4d947cb084425abecea709f4220d971a6fa273ea74debd4766ed4e9df09dc13255";
+    sha512.source = "c4babcedd8003886c0e5e5d15c4ca62dd14dda4872a0d7a3a73693ff2c2d5b18ae541c0566749f2ef9c43d3a4811e05b7767659b44c687d60725bfa779edf800";
     license = [ "lppl13c" ];
     version = "1.0c";
-    sha512.run = "0ef1d3370affd4ffc2ef77031a8713b5c663263802d67142b10fa7fc025569b3914dbbaa5e71e2c643718940a0cb89194d79ec83a83b93fcf5d57e0bfbbdbb46";
+    sha512.run = "54e6be7cf046d856c5392a10a77cfe9bf2b37ece0da4980fc2efb12f78f2d3e94d60d5c8662ce9b2971372e1ddf6b0d338fd6afc0dd92a79a92aabfa9a562f80";
   };
   changes = {
-    revision = 67201;
+    revision = 77677;
     shortdesc = "Manual change markup";
     stripPrefix = 0;
-    sha512.doc = "26796990ee809dd953fc8f5ead93517faa1bdddf3639d9d51fc2f0ab00a620fdc1950ca78a6a77cb58a5977f702a1d93738312451900ffb0a745282e777f7daa";
-    sha512.source = "35fc09ca71c5a7baac4d4bd69ea38f507927ba0c82c2ad7318d11ac22d3e319f70522cedea14f2d36f780bb2c7ea0cb852a111dac3b07273df53291956e9c716";
+    sha512.doc = "01c536e97816fcba9aa27ad4f3ebe8d794ecd784feaabcc0a4ab81778562f72c77963d3c11515228f34b1785d91c1c50bbef98879a6370ed13c11a7427891c61";
+    sha512.source = "c33dccfd5a8b3ae6a6e7f40aacd086801455c861d6595c174092da32c00f4e36476e0c1b6094a11aaa93aa2a654312bdef866fed20832ff32747f15cdb4669af";
     license = [ "lppl13c" ];
     version = "4.2.1";
-    sha512.run = "c7c8f65cc8a6f94403a1c85b01eece41561eaaef39b39977d02b146ef8dfa49aeca27345eb96ad5f6ee05d3a6625aa0dec9a34def564fb2b25dceaa528d230f7";
+    sha512.run = "706faa8ba59e0eb4bfa7e2ceca8d7f0687cd68fd3f08bf1e17312610644fd7fd91e0663a5a41b752cce6dab7d6dd63f272497097a2380ccc8be2d7241056e8f5";
   };
   chappg = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Page numbering by chapter";
     stripPrefix = 0;
-    sha512.doc = "c0d42e7a9cbae3fc7386e9734492cd3f879ecf69551d17483c4f4516c2ea09d0b9b76914decb987f850af362e54c638af190de6d0d6414d09c49cf48c0635f59";
-    sha512.source = "371b6630fc12563694db35e8e086f7659e60f49a6b881281bd3bf2c081c6ccc2af74b630b6a53ac9d8b447635f2700f3d15643a02f7d873b5451c9b43a331b5d";
+    sha512.doc = "96e0fedd16d2cb1726d2f31ad292efbd875fb403c5b9405c64c1100ec5a186e2a82b404333985395171c369725662008f939971a0866578f87685dfbea74c5b4";
+    sha512.source = "ad7585ca02f67dfc6d21d55958c61158866f35fed44a303e414ad9aebbccacd01700a52928a4d6be9833b4a8666589d28a91618fa97cfed033ec4990ec84b909";
     license = [ "lppl13c" ];
     version = "2.1b";
-    sha512.run = "8286a7b7664f7634bc5dd16ae1888cc4b70e2880c8749fe2e894d209384da7a8513b2daa318a4154f9b443f89b7eb2e3c6d620b81e1bbfa1ed64c243ad57e47d";
+    sha512.run = "8e9ee39c93c12a2c13639351e7a4f56c4a14ceb542fda58bb7e7c4018103b143b0de7e66fda2931664e35c6f583ced3c3ff5057c258772897f881cbaea22a875";
   };
   chapterfolder = {
     revision = 15878;
@@ -7010,13 +7016,13 @@
     "checkcites"
   ];
   checkend = {
-    revision = 51475;
+    revision = 78116;
     shortdesc = "Extend \"improperly closed environment\" messages";
     stripPrefix = 0;
-    sha512.doc = "0527c3c080f502baaaaa14a398ecbdfa714cec872f6cf8391ef8a766aa24b497a0fc00012433409904ea11d7fec425dd7c7116a52e8d983bddb2633248d2b090";
+    sha512.doc = "2507b82adff23e2c30f65529c16283588b9a26944bad01e390dda4aeb4c65af2fea2ef22bc2f44f4956b7480a80768f0881afb37087a3acb31ae57155905f9bb";
     license = [ "mit" ];
     version = "1.0";
-    sha512.run = "40af84a5510dc3038c536c4b0aae0176651f01953650c1e6ec8b5d76459e7000246205d55f2b13ef566930649daf1eafc38e6d2d822787d1fa462e99837b6ba7";
+    sha512.run = "4b3d75480700d5b450d8fdca8fd084bdd958d3fcf3be0e4289b0a7bea9de6508da023ee5d93d48f376332dd6bf098050cc0bfa7e55cdaef8c893de0c76226794";
   };
   checklistings = {
     revision = 38300;
@@ -7088,25 +7094,25 @@
     sha512.run = "62f374a57c799873aa4d1db52c56fcaf2f15dd813e3bd9295044499defa29a88567034e39b20af1e8a7e4208dcc35aa422c0ea8e1e0925fb1ae3e02a1a8cb482";
   };
   chemfig = {
-    revision = 76701;
+    revision = 77677;
     shortdesc = "Draw molecules with easy syntax";
     stripPrefix = 0;
-    sha512.doc = "32818aa8bdbf3e2ad4e30de67783196291f75249beb15df26aa06836b403c55dc7a33f33ebe7bcc21f44154f4fb795f48fcfb16bd79ca93149aeb66e983d1832";
+    sha512.doc = "e8803af9ff00a414c5df9b36e616b762a3e8901980aaa9dabc4ceaffddf61bbba197aa8ad03912430f22bcb8690345ffb1226c7f2566f9c96af1b0d46f9706e7";
     license = [ "lppl13c" ];
     version = "1.71";
-    sha512.run = "6db4796f4d0a8f09b9590efdcb7e0259c94a19478d6a986e736b9a3d6773537dcb51ec0ee5d30c08149179a160b70fa0684d6146d758be41fac4a21a7a12541f";
+    sha512.run = "f1370f9d35e01d36297b7292ea3998028a240f579e3cf50a32e427c46b7464485df32812d03a1f6ff82cb29ed5bf8defe429417a1a6da8c7dfe8a89124bf1947";
   };
   chemformula = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Command for typesetting chemical formulas and reactions";
     stripPrefix = 0;
     deps = [
       "units"
     ];
-    sha512.doc = "750a2fb6166ebddc2691e15b73c77e0c9f346c08c5426843aca3fc9f0284bfdaf0e10b7c2d89916c9cc28f1fc60b15aed0a127f003a9dd7a8942f5dca3e0f879";
+    sha512.doc = "166453b4fb6f3ad74d87356828f012736c3cb161d1fd7f96384280f6dbb8a072b1ae0b23cb4b6e23d6ac3ec5043fe266e403830903c4e89b4856ce616d65dcae";
     license = [ "lppl13c" ];
     version = "4.17";
-    sha512.run = "aa603aeba797ab1792f7f00b808f83adff18769a85d143f7fd5d0960c1e1ccf67b94cc5a14d7d7d980188721c85ad088235f83d1fbbeddcb486c7f6e6e9ab3dc";
+    sha512.run = "93d34c7b5a47794e5cc7f920294f1996191ba002241c4bc7d82961dbd96cad6a22e26269a213bb3f1f80aff3989f1fcd63e676c3cd4c530947ab2a39a9485046";
   };
   chemformula-ru = {
     revision = 71883;
@@ -7117,13 +7123,13 @@
     sha512.run = "fd03f5fadbabf6ab209ac9fdcc037fd7d2876d163fa94f4654a13d4e06d28564bb85689293961f33402f723fbd3bddc1326c8418b87a408418c5564a7ce2d4fc";
   };
   chemgreek = {
-    revision = 53437;
+    revision = 77677;
     shortdesc = "Upright Greek letters in chemistry";
     stripPrefix = 0;
-    sha512.doc = "69ef091ed42bb40826af81c9a4ce5536873a5debd971d70d30804f75a3240bc1aea037817cdc42346537cd025306c928fa347938785af9e69022ef51fba20d2d";
+    sha512.doc = "bc6822274b0f75dd78e719e188dbfca83ae9c1e99aa1c177e246ce1022d060dc691e74b1c53edd69197b12c34e3d9932929f2717ec4a282c28c5de6ccb0236fe";
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "8e70154271fb921ad9edf6ab5f8a21ce7c229723f88d7e37fe17aedb189c67a5749ea9e622c2dcebeedd614efbf18b9138e0219aea998f7a8ab3087348afa788";
+    sha512.run = "248d6e5912bfd63aa3956f6d2f9c9807713f588c90c1738e159e9ff2363155562ae5e18d21487a42c98b92099e0ec981d5fc20d6eea4456bed5846cc8dd52be7";
   };
   chemmacros = {
     revision = 76924;
@@ -7135,13 +7141,13 @@
     sha512.run = "8ec2cf58352fa50278987a0c8bece5929466566b7637e951493f7e0eb371ed21057470495220bf55bc4c0caeef139068393fc44ba5d9ab26d557eebad68f3c4c";
   };
   chemnum = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "A method for numbering chemical compounds";
     stripPrefix = 0;
-    sha512.doc = "151bbab7e7123d35cc430b97d8b0f278d541c862f0492767104ec61cf4740b583de97f4be51714b65e7256fe675ec5f0872a1bbb888441941392a96ccecc5e30";
+    sha512.doc = "f4de388200da8e32728e9f7ec57859050a700541ac3703f52387060351fd4dd6e4f3d287efecf9edaaa2ab919eb109ca3064cfb27b66295105fff8292a921d29";
     license = [ "lppl13c" ];
     version = "1.3a";
-    sha512.run = "2bfdffe4a4c981eab7e5e791e7b55b69cef215b2897fd1ff3160f919256e2ef2bc9ce1ee90d3979e703414466405c1b4323dac229af243baedab3fb4a311d70e";
+    sha512.run = "ce424b2a93d34608eebdd5efb64ee2c14121bd66a39fe9717c913c55ae917f7a19a72fab6a4b7bdb1732a7b66af9bbe0c953c1724280afde0f5dc887f8fbc58d";
   };
   chemobabel = {
     revision = 64778;
@@ -7201,43 +7207,43 @@
     sha512.run = "731fb10454a9d359d91abf927a27215e72283a9635cbd853a6738ddbd5047d81fdb8d547b891f29836d0b604d97749074e9f2676c5ad122522d987ac9bb46105";
   };
   chess = {
-    revision = 20582;
+    revision = 78116;
     shortdesc = "Fonts for typesetting chess boards";
     stripPrefix = 0;
-    sha512.doc = "95d3b598f63231abb6cdccddc970d6ccb29bec7e9fa29efcf1391bca70b610e9c0bc65754061a4b955548a854bcbbdd8cdf05f8f93fe52bea400b7c281ccc0da";
+    sha512.doc = "73e1be7013d86288f0fd7b4ad8644e00b8c4358bf105ad4979d4c34bfbe3363aae2adcfa5711b29a22e5fe3c36d589dd50ebb6bf20ad4331f11f3faa02d5a6b9";
     license = [ "publicDomain" ];
     version = "1.2";
-    sha512.run = "236e195febc213825fbb5569d8eddd1967fbce1c6e9d550a1c52729be43674e063161adcd5dcb1f6293d9ecf8809518d40064fee08ab64ffe444affe3282224b";
+    sha512.run = "c1037baa29d176bd780775efc53fad1479f61344322e1fcf9a1bd25cd6d66dbd4bad55bb07b7f374ab8cacb68a519ce4a027c253b9556c941fd8f303219ef4af";
   };
   chess-problem-diagrams = {
-    revision = 74591;
+    revision = 78116;
     shortdesc = "A package for typesetting chess problem diagrams";
     stripPrefix = 0;
-    sha512.doc = "b727539cbb324e869a980bee5d31dbc11e072ed00fd379f8fae855172711a01a2f8d9349e39b10b9013c75afa5b5791279237feef65cf04bbcea4ef9f0dd6843";
-    sha512.source = "8de49267eff7b3920aac77da9672e616f1907c3a9d4c5e23c1ef644df0e828a1c2e5da17fc7b1c9b9aa87eb790a5e937963a36b362326ab5396741844cd50c9e";
+    sha512.doc = "549f638b3cf62b1130af52232d40f42ce5d3c42614cc95173787e4e9c9d4eb0d3a35fa15da0d1f054201fff993f4e6d920553d1a16aa9062356f66540dfda623";
+    sha512.source = "05a079cf5ad3aff9a4f8f0d8f66c67c108a9e6d27871fcedf4b6b81525e378ef50ba9250b8337f46e23bea93b93685cfebfdc18addade85feffb7b0c827bbfae";
     license = [ "lppl12" ];
     version = "1.23";
-    sha512.run = "eefa676064fdddc9956a64308b3521d92634b7a8f2e1ca9eb3c9a10274712c5d450f862d2670b8ffbdeed02831cf14b202ae77c223a053747658bdd5af06f93b";
+    sha512.run = "ea2053c27a11f2074feb76667ff2cfa68118f47056d3b33d9affeb78a63e4f4366132ece1dffdb5704750841f145627ee80fb8a819148c16ea233f4ff99414d2";
   };
   chessboard = {
-    revision = 72795;
+    revision = 78116;
     shortdesc = "Print chess boards";
     stripPrefix = 0;
-    sha512.doc = "c5ae4db442e578293ed9e09f44d4c392291cb3b7c20c15bf1b08e216e948c8897a8201c6fc1dfbd1671dc3f8a21c6a78a12a5f81ca0d79ab260c8c2ad58d1f82";
-    sha512.source = "c078a3ffd706eb626d88e00d2af0216119fe5fe6d5ff39caa93ec7b7cf7fcf0af61789f9267e47d087c6056cfea32f5e3faa92b1ba22b9f209202bb375ec005b";
+    sha512.doc = "a205a8717400191285141d053a0403ce9b9fdcc890a96e99c93c00527d5416844f81c1618b4a790b2a18677c51c9ff22ac34c5729c197c093d8abf832f23ec41";
+    sha512.source = "aaf5933ddb12517e7b34b2e537185dffe5e6cc135885017321107259cf0c4a2f10514ca938a59f8aa87602fe885f459ebbd50fe6d9031bd51bc45cb5a3a298ad";
     license = [ "lppl13c" ];
     version = "2.0";
-    sha512.run = "6d23ee4e644d58deb6fff5b9d0bd9ee1808ad9aa30e0718c2d9920a35eaf86aa10c3eb773595971a8530793d91282059754e0efa26bb2c66c7e764a919d4bef5";
+    sha512.run = "43c2c33824a9444b2b8a7e7d95766f2fb1d0295dda025b4b1ebfc79659fc4d01bd4a869ca442cdf85b591cddc141cf7b73814e58fe74a3c0d19723ce1507e3e1";
   };
   chessfss = {
-    revision = 19440;
+    revision = 78116;
     shortdesc = "A package to handle chess fonts";
     stripPrefix = 0;
-    sha512.doc = "1f9e625cb7765450fde23f5666af3b43ddb9ba2e67e7d04b98ef19446117cf26eaec3c2586be7c683286dedc37f8d628e4142bae834af716f2c068ac28beef58";
-    sha512.source = "8745f5c712df2da39a61aa3d7ec3b6b4917c4905e3a0c4ac25ea6484555f25db6fd31b49a9c86566f69a660108683b4749abeb17f512ece9af54ffd7806c1d79";
+    sha512.doc = "b1b12391a94476560b4d8c0c23ffbc43a7d123f20d8e876d86fcafc7ebc0e7b58065e3e033ca8bff9cd7a77faedf974127c81fb777bc299fcb70094920bfa560";
+    sha512.source = "56c7c28162f62a67d1788bc7fe0e2cb32a8175436b7f44799b2891296702fbccdd18f1aad127eba86764cfd5c34d112e480e5077ce3929b4f69e8d773593bd7d";
     license = [ "lppl13c" ];
     version = "1.2a";
-    sha512.run = "8250d4b470a74877c44093888657b0a3c6ce71abc2a23780e71590d0398fc08943ef77ffafcfdabdc6bfd739f7d5b4ca15f2436df103271de029e5ff6102f579";
+    sha512.run = "674101dfc0688bee9342cf9510c07bec20e2919226446ff7db4d9d9e8055e41eb8c2d429acb6b4bda1d824760fddde7d80e43d50420fa68204f22127f93ec2b3";
   };
   chet = {
     revision = 45081;
@@ -7273,11 +7279,11 @@
     sha512.run = "c8174ee6bbb8a57448caee6cd23bf7e41790dd1ff40cf496360548fadf1e7161b2e08b2ef53abb51b1410b406689267ce2d4a8668d052754e323a1d836670ba0";
   };
   chicago = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "A \"Chicago\" bibliography style";
     stripPrefix = 0;
     license = [ "free" ];
-    sha512.run = "07db3016436428e7a6924569e0f90f7bd6cb564b5c9858082997a6a8189d82f9d673f4d761d81de272ea2bd6fde03046432f75d33d6e9590822ef9020b0ef319";
+    sha512.run = "b7e13e6f3cc52f7ea701569dbf0188da88863f5edb06f07b8225c5a183c973063232ad1871020f77f912c924992541a50fba403169607cd688259545366f6e30";
   };
   chicago-annote = {
     revision = 76790;
@@ -7342,13 +7348,13 @@
     sha512.run = "28dc8b70bf5e97a4e31defe09a16805a57054a019fa7908f6dda7ecededd8a37bff3f782d04a7c2fb72ec17ee1695d5a5a68daf3a159092080e5a7d667b4c9e1";
   };
   chinesechess = {
-    revision = 76924;
+    revision = 78116;
     shortdesc = "Typeset Chinese chess with l3draw";
     stripPrefix = 0;
-    sha512.doc = "25eb73cee75216ecc958c92472651149ab0aab45588272865a3302bc56910e039aa78e5973dea8fde59a341ee872b429eeef06a0742596dfb2a88f3bd770728e";
+    sha512.doc = "b33c392d69ffcbd25e26a3fd5c1559cb63289d62b2afb0d40f6fa1fa8198d8db2842a0a844dc946e76946855c9f8980417e637aee40a0142e5c4e590814dc17e";
     license = [ "lppl13c" ];
     version = "1.2.0";
-    sha512.run = "7e915fbd063dea6fecb8480ed3e0addd9ee73a36e25b68c2a85f549438a9fcb2f05e763f8d7ca0e0f3594562af435d449de9a281a714fda3cea5c917da3e46e3";
+    sha512.run = "df52675f452c9891668b400ef6e6fcdab0941662b036a11587fabb868ba750cc960c870036813af1487ba2c2ea2bfee15c0b9c2f323d330b32f7c28327387df7";
   };
   chivo = {
     revision = 65029;
@@ -7367,13 +7373,13 @@
     sha512.run = "ef91cfbaa46c34bdfd891c3bb752e203d1cf495d5a9f12523b3c59fc591c7abd78ad943d3f4da8abb46fea9f25cfbd280785c721cde155851fa34f3f3a71afdb";
   };
   chkfloat = {
-    revision = 27473;
+    revision = 77677;
     shortdesc = "Warn whenever a float is placed \"to far away\"";
     stripPrefix = 0;
-    sha512.doc = "b79b6bd6943dcd07656bb46d44bf50ca2c0148bdb6ae711d17a49e78f3bbf2b95781cd6f3d0b2f7625b131f7485d3db608c963367dd91dc91070501b367471b3";
+    sha512.doc = "64532dbc9042c4c38b9f85c8245df2d89b81fc79aa5bf70b0a18581873645728710db2697d994c88a53d51dfa1b9ddd61f8491b57beaeae77d6d405d3037d013";
     license = [ "lppl13c" ];
     version = "0.1";
-    sha512.run = "2a08b71c204709846bbf26ec3883e9037af6ff22e9bdf13b27319ceda55381eb9e3816ead4e444eba4b8a050a188e58d14f0d9153a813953f587c6cabb3932b8";
+    sha512.run = "e7860ca46c9277f3101805c5a59bdd035c79ca0c21966c0138bc3505cb6eae559a5af3ffb7748c7217c4671588452afacba522eb2fc842a0e302589b49d8032b";
   };
   chklref = {
     revision = 52649;
@@ -7388,13 +7394,13 @@
     "chklref"
   ];
   chktex = {
-    revision = 73776;
+    revision = 78222;
     shortdesc = "Check for errors in LaTeX documents";
-    sha512.doc = "bd335ce7e0bab9b333a275f1e645a2c135443265e778f8fa4f11aadbc1b1f53b5db113f0b249c048242066f90c2654a492c65eb1efd56f40d49c18f5ace7f859";
+    sha512.doc = "a03ef8f94a39f28c503e5f25183633bc4a88ff3943a2f00ae25a4e2c75ba2d7dafb0205c0818ebd2de083dd04323242f023e460365ac4ebb00d6d6e09b7001ca";
     hasManpages = true;
     license = [ "gpl2Plus" ];
-    version = "1.7.9";
-    sha512.run = "e897d7c8d88cdaa8c7643803b891028d14c1150c299bfd50fc36db8000df231e346d8df4123f53edc75ee6da3a9e3a7c6d7d6b6f8ed136bb20980704d1e60cf7";
+    version = "1.7.10";
+    sha512.run = "e215a7de0434209dc953d8ddde242e14a0b3b950460645623eede84b02d5b83ba941e48e89846ab579375015c977dc825c7be206206f4936e6f1686f20d10031";
   };
   chktex.binfiles = [
     "chktex"
@@ -7412,13 +7418,13 @@
     sha512.run = "a32f71d89ee69ad60de6173f415d0a3aca7563107cfed71aab0ae99972a2ead442bc75f848ddf07c26c5d464b2224afed5ce976bf037049764f722396e9666d9";
   };
   chngcntr = {
-    revision = 47577;
+    revision = 77677;
     shortdesc = "Change the resetting of counters";
     stripPrefix = 0;
-    sha512.doc = "3b63e4676232c05516bb12c189873e4af39b8b34df2690c897c4733203c9f19a30759850979c47b05e5fea0bd1c277a5c1ea0624709cda6a3a4ab0196231afb9";
+    sha512.doc = "45f21bc6b8c28d0a3f2d34f73fad22b15e66e9cf52f322ef52848697353b1ed136500fb931703ade4555a875843d9cc3345723231b1dcd50a9fa91d427f38390";
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "0fc94f91911c623578912ed43526d18f85a003f797e94ef5610aab8477154078efae7000256892cc3d3103843ac8065c27d56a10c6f57c16d9ff13693930b0b0";
+    sha512.run = "1ba53b9c8a045f8c5a4ed26b942f7ac42f89a14b5ab70fdc3b413d40db322b7586e525db30ff07e6515e49fe13bfaeb3347de33905524050f9529a556f8328eb";
   };
   chordbars = {
     revision = 70392;
@@ -7523,18 +7529,18 @@
     sha512.run = "1dd802c60fade71ee873cac25440e52b9cfa45293019cba6c22a16a6861eeeea1e15ad4f945dc9eafd95873efc112110b4ec14550f8bf8cdf57bec6fb6e54ade";
   };
   cinzel = {
-    revision = 64550;
+    revision = 77677;
     shortdesc = "LaTeX support for Cinzel and Cinzel Decorative fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map cinzel.map"
     ];
-    sha512.doc = "7edcb9894dfbae936ef6dbde1645890feb50ba5914ffdcfd4539a44f8c8ce24f150662fec06663de54e8bfa69479c8ce006038f063f6587bf70f7c3449623a4e";
+    sha512.doc = "16afa87ea09f7c14c4eb00d0da3e34629e37078a5c6f95112f0f780a394b8a0a3155af82eb2b5350c72508ca6d402047c8dbf4fce30f4aa56fbea93019437ed7";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "5e02892250c5b787e4c6288beae9be2b9a2a2929a31a18c40ab3bb7609a23741e829747aaaa639f8579f229005a2171070853ca79e23b7185ee5edfa090bcf13";
+    sha512.run = "fa0d1b322d3162a611c1bbb5d3b179231aeb5d27de69de8ed2f9792e5bb08306759cb9ffe5c113e6a22c865abd38abbdd40436c321c88919c45016d25d990343";
   };
   circ = {
     revision = 62977;
@@ -7547,22 +7553,22 @@
     sha512.run = "12f50efbbb07593485120d0e0b428ff2035a44c668025eb4a6ac78ecb3c733c5975f9f7ab4685c71488e7480a3a280fb90f618d03d79f1afed278bfd67810573";
   };
   circledsteps = {
-    revision = 67889;
+    revision = 77677;
     shortdesc = "Typeset circled numbers";
     stripPrefix = 0;
-    sha512.doc = "815af1f69253625528fda78b1794eae1ddb5cdce357f5af5db5a68385d7ae90386611335fb8c429de8dc13a908ab5253ca2e99ed019590434ab6d087c2dbcbd4";
+    sha512.doc = "7bcd563bd1c342be7e2202ec85927c2a6de6c0a3b3d8be8fe1012cff844711e35c91ed5e8c987261c32af3e2cc33fab4f92cb77b9ab6f656c4c0d79e5fc774b4";
     license = [ "lppl13c" ];
     version = "1.3.3";
-    sha512.run = "41f96e112cba5f15bb36afaccff8852917383269c7ccf8f163972759615d5e5b87c3acbb54e4d14db6572cb0330154e1117f3159d851fcc9d3c5c3efd3c17d88";
+    sha512.run = "a86d912abfc86065946ae611d9400351fa671ae80cf407a1f547cf413c6ad3f306ea7a5923286753a119cd63e53f3b0227275ba6257ca9df00fbcbc027053cc8";
   };
   circledtext = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Create circled text";
     stripPrefix = 0;
-    sha512.doc = "3c857b42cb9d9e903cb5e4a987d95cdb2ed31cec5bef5463866c5956421374d308160f1836d943bce68590c2b458933127d193fa363ceef3c8d53fbcf12c7f3c";
+    sha512.doc = "70b7bcfbf546d2976619469fd7c1749b24fa2c276f1030649bbd58b268761b98cb83feda918e68424dc16f5a3f19700baf6fa72e22b7460efb319e8e5c06b36d";
     license = [ "lppl13c" ];
     version = "1.1.2";
-    sha512.run = "646d9285a8b858dac62406a4590f6576b49806a8e9f703344e4e3ac8bb7b3059ce55542af3de9279fe885d2fb25e319c5119d14f96350e9ba24687d208159dc5";
+    sha512.run = "eed168e5dec89e66a3722ca577004d38498c766a43c89d2a7a65246448be87543efe09c2ce84011114c27e784c91937ae25bdcd2aa183f5758d6b0157208eebd";
   };
   circuit-macros = {
     revision = 76218;
@@ -7574,16 +7580,16 @@
     sha512.run = "e88aab0a891fc38f46c51954266586990e22c993f2da93b142c3d309f35abe23fde9d80e6c29e75b787b6303ed5c97e5248177ae4b59be4bb802aa5e8c1c04be";
   };
   circuitikz = {
-    revision = 77296;
+    revision = 77600;
     shortdesc = "Draw electrical networks with TikZ";
     stripPrefix = 0;
-    sha512.doc = "69e3696d477784b025689d1c36c436754e8342b4a4d84e00ba11cd9927630e9eaa2c9820eef23d7f18fc5c22a6226b4d56c514d639b9645caefe8fc307a281cf";
+    sha512.doc = "8bb28479eef804eecb4dd6f1fa6eb0d1c050307ff8517b7ce7b99b07de4caeb1a8bc5e5a1df365358fdd2440190b442b3319179239454480829b0bc8cea23528";
     license = [
       "lppl13c"
       "gpl1Only"
     ];
-    version = "1.8.4";
-    sha512.run = "a97b6a1c3b5dd392a64da50de8793f66bc39288f163a7f20dd5d99f28e9d9b441e535db3d74c3b01df02852dbb056d95d72fedc56cc2c56bb6dbeb207494fb47";
+    version = "1.8.5";
+    sha512.run = "fb5d0d95e258ec3487b4a98055da1865ea87fd807ba837ca4b0780c172f818431e30d30a1d4f915ed0c534a974925ee8a86f91ae34692006fb98ce40742fac86";
   };
   circularglyphs = {
     revision = 73069;
@@ -7598,7 +7604,7 @@
     sha512.run = "4765517f2f4dc207d2d606d1ad17aa4473ab026a84900fe496a601b2d997dc854cf3eaea813e6d4f3f99cb102cb0aa019056a53c94ef877f47ae06020ea5d835";
   };
   cistercian = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Display cistercian numerals";
     stripPrefix = 0;
     deps = [
@@ -7606,13 +7612,13 @@
       "iftex"
       "pgf"
     ];
-    sha512.doc = "47e3d61d604d323fffcbf72df254fa8882ed34d8ce848a6a92bc19040ff4e1c80f94c2fad33627baaefdb20fa35dcd491244be67086f6e9a7f0e690812fa2e53";
+    sha512.doc = "53b0191466fb85eb85cc8d721e9cc010077dd31fa1a6c81b3d4dd88fdffb31337f073e6a63b802a07843df865321d2b5f4db9e08c3f76f1cba5b1afd6cc047d2";
     license = [ "lppl13c" ];
     version = "0.6";
-    sha512.run = "602f494a52594aabdfa9890baa8f85cc0d6ca6c738b2c09ed62e8614a8501931b3ec7c135747f03b3c87843da34cbe99f3f129f07719d909b7a1f7b9c7d603f8";
+    sha512.run = "55cad778744022e9374c5f033e010cd72f89ef19b070b6a572cfc32c34a20c4ebd311b6a2dca028658f4603a1332639f1308b6a6ec42adafa321fc068942f942";
   };
   citation-style-language = {
-    revision = 76981;
+    revision = 77677;
     shortdesc = "Bibliography formatting with Citation Style Language";
     deps = [
       "l3kernel"
@@ -7624,7 +7630,7 @@
       "luaxml"
       "url"
     ];
-    sha512.doc = "0c66184975adbc095d004f9967d2d1fb10104f84cbf1215117324f20ecf68405a0db788ac1ef7eb19e70337fd4551f2f049d84f53271dfe6672b4cb99ac900aa";
+    sha512.doc = "4df3b42628ee0a726b503c327e96517a6889d46340f7c9412fb13b2e352552cafa8a8be2dde22437de5093dd6f425bfb1f1fcd55c7071ed78fdbede4a3bb9065";
     hasManpages = true;
     scriptExts = [
       "lua"
@@ -7635,28 +7641,28 @@
       "cc-by-sa-30"
     ];
     version = "0.9.1";
-    sha512.run = "bec84bd6c535f2a9fce0e533be87a24f0702d6d6c9d959aff4e13a60f44cc7144b3a7b0134fb325449ed2034795d3c499968e7d4e60907a249b86026c75476b9";
+    sha512.run = "a7a050dd15235e26d30e6686b4c763d3ae0a74966762c8a0c98d4ded1a0d43166e2224dc0f3d88b7917972a01f948537f31d3af85f341a88ee089f99f813ff01";
   };
   citation-style-language.binfiles = [
     "citeproc-lua"
   ];
   cite = {
-    revision = 36428;
+    revision = 77677;
     shortdesc = "Improved citation handling in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "f9ccc0e1975064ec792c6138907cd3dc8080ff2fd02a2925d1a1334cebbb2289797b234b46d92be0ba45d460c31359b5c143f20e28cd1aa1827489d04b88d300";
+    sha512.doc = "427d8bc2ca969d0e0cfe2edcd7b5936dbff111df03d315a0af36b7067395cf81d52cdd793b4fbfdaa2d3f3c100f66b8d25084fe2638ea2d5e40e0ca25eef0be1";
     license = [ "free" ];
     version = "5.5";
-    sha512.run = "39196b799273a2da29591b1b59c0a504f0e0971a6fb12a21bed5ac45d94eb017f1e7c64691fcd46f5c151d867c1ffac706f050fe2e08bf3c58aec8867fa185d3";
+    sha512.run = "52945420372837c8797c8204536f4af365a170b5d166a4cf4dbe2bd383ceb79b02d7a19882e1a56e52eeca34d541524d623cc2dda3132d69b02529630a0c7b18";
   };
   citeall = {
-    revision = 45975;
+    revision = 77677;
     shortdesc = "Cite all entries of a bbl created with BibLaTeX";
     stripPrefix = 0;
-    sha512.doc = "f1eaf5ed48bf3fd2bc336b7d91dde09b5cfa9a1901bd6315d4abf032439571a89f1d7c4794ed0256ef1aff0456d275e68326e81627f164652c84de2900165a98";
+    sha512.doc = "091d070d4e8e2a0c11e8c72cf2bafcc56c976af973ab4020d70d8585f612a56c74d83f851ffbc81432e5a4c4e4dd519433489b12388634a5ce6d0e0d3b6391b2";
     license = [ "lppl13c" ];
     version = "1.4";
-    sha512.run = "2549b398c98f82833849a45716d55a776ab3b7927fdc400c2e6d43c45fb0cf628bd66bdade7ca63bcaa2e98807914f7adb958c6a06c27762fb0ee70452d4d280";
+    sha512.run = "99b5f71ab28ad07ca58cbfe1929232f1749d2b84d7f8be08b28845530989d777a198517e0fc31f7ffdbc10342c9d039908525114dff62ec3a8bd6b8b6f361e16";
   };
   citeref = {
     revision = 47407;
@@ -7800,18 +7806,18 @@
     sha512.run = "2d55bb97b43fd087a539456fc80a9fcd2b6860f88159ffe05abc02085fc40ee2e068a642e06fe1aab3423b4b63d91af9f96b918ae3f67b510c68774a71a05d23";
   };
   clara = {
-    revision = 75301;
+    revision = 77677;
     shortdesc = "A serif font family";
     stripPrefix = 0;
     fontMaps = [
       "Map Clara.map"
     ];
-    sha512.doc = "77a90c3cfdb697172c2a338ce282ce79fc01ca7e6c86a550a65320cafcfc2dba2ce444388b9a540b6503ba25329eadce5f166a250dc5a2ec64d09dd3fcca0ff9";
+    sha512.doc = "bf202dea85f728b35756eba23c3ef838e5edc91a38c90185d3ab0026e4b3305d111d1a837fa882a3738747b756531e7dc963087c2fed000898d81961a87d2fa4";
     license = [
       "ofl"
       "gpl2Plus"
     ];
-    sha512.run = "dc80c7e148919c850d413ccb0fd0097858e2ba8a708ca28b583296c7e23f74b1ca6f7a94755509b47de25cdd7485b218df37528a820708a2ed04ed9629275f56";
+    sha512.run = "12418675881e304e2afd095766b9db6d1ec8e32e817720cb0741f8f4e6bc5e48dfafe5f9162dc273609fea5e49cd6f5603922b7ff01352723f049caa8f5ff7fd";
   };
   classics = {
     revision = 76924;
@@ -7875,14 +7881,14 @@
     sha512.run = "1d92e279264970ca6d7612c3850fd46d4f3deb74df8a9149d6e63ac19eb665e5affeb1ab9bfea44d07825b80245b0a3b951d3ec08af0834c228a21270bc45437";
   };
   cleveref = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Intelligent cross-referencing";
     stripPrefix = 0;
-    sha512.doc = "54c8a55f3af82fdf9a5f391e6c5a94c27e7ab42b003ddcbabed501d97858f04491593fc8e607ab2765d71f72c731406cdc6e091229293d56ac73c76888934899";
-    sha512.source = "1825bdadc5b395ac3d9e4b1a2aa94626f9e8df99a72e5a1cf4807d42a48dd0b1f5bb1a35536c8ae9aacfae7efc35edecdf11d6bc8e9b409cd074a16ab86232c9";
+    sha512.doc = "0b59e337d22e0245bb34d1b92854a504648fc6f6a6230418e7aa5c3a6558ce5fe49d2be1cab25f154fe59b6da42ae7ef4524012923fc76120d23011969e46f9c";
+    sha512.source = "75ac1b463283e2af964b174d3b410bc23937daf500ab88ca4404dae78380237fb2e0972868e7ae0f1eecee0959a3f47e0c5b3b543760583552ae62ef68bc4a26";
     license = [ "lppl12" ];
     version = "0.21.4";
-    sha512.run = "3fffeda826456ae3a8af09a67d816ea30915e8902f9b0d449830c4f20cb685c405a56670bf24babe93b0d784cfce45bd9963811ca09e0de191936e079b691760";
+    sha512.run = "6712d137fc4f362197e76f377b5e5655db7dedebd7edcb518e9d546c825d64a06c77993b7a8b3626e84bc8b4ac1a1980ba33c78dd5e8b70c45f5c44a4cc47475";
   };
   cleveref-forward = {
     revision = 76924;
@@ -7917,13 +7923,13 @@
     sha512.run = "c6846fd17ede59a78cfdf2dda3c7a51b10e12846452aaf60a1fdc6977dbd34c80034fe7f3b17919b83e2363d9543317cfae6d78b0be92af6cbe4804039ce48dc";
   };
   clipboard = {
-    revision = 47747;
+    revision = 78116;
     shortdesc = "Copy and paste into and across documents";
     stripPrefix = 0;
-    sha512.doc = "50e7447b35c1d73c1d36bab165a8bb476764ffcc4ed7994e1bc63c6759baad0dd6c2c1f6a95334c7bf649dd13c8e79d17ec536120f1112d621e833b6f9f80578";
+    sha512.doc = "5ddb3212c9fe77f858fea84bac623a33218f98412db3337674085717ddc19d51aca6a13cecb7596a145c4be70e2cf45535b23bcd1e82aa662f9890a2679c46c9";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "19aed32c2dc229852133a44fe5ed692a0d3194d374cc77e2301314b3fff929b834fd4df82e811095049e64ba127180eddb77fcc4211aecd2db40e8124a38d55c";
+    sha512.run = "8eaea2a40f4fbbe5948b530a83fba0e3bbb8efdad014414ecf1d3bca1ec9ea68126328627982d560cc5a40478048208efe440a595e2245a45ef42c9b97c2233d";
   };
   clistmap = {
     revision = 76924;
@@ -7944,14 +7950,14 @@
     sha512.run = "ba378fe241cd2e51b641f0edc4bdd1403477b392e0a22363bcf540b513c1c15b1c0e3ab37020aa77ec147ce59cc7ad6f09c86cadcc0a77892a1a798c36c411aa";
   };
   clojure-pamphlet = {
-    revision = 77161;
+    revision = 77677;
     shortdesc = "A simple literate programming tool based on clojure's pamphlet system";
-    sha512.doc = "2858b58bec0cc6417d6260244086187ca81d2891a6484623c9a23c57ee4eefb9b85fcf4027edce24b6926c32b8da2f89f2c5eb8b8131da863b4eaad0c265334d";
+    sha512.doc = "e50f0b075979436c021fad692f5536a12de5dfe2baf115bd99dcb5807885b6c929991fe6068d840b5cb42ff93f98588643db74cdffefce8e1783e7523d64ca14";
     hasManpages = true;
-    sha512.source = "b60982241c541443e26410c2ff523f45e994e2eca181ff403d62b33da11d7d9cba892193091f1990ae0eb684aa2f7f1a18366127d291b22568a085ff3c0a8e63";
+    sha512.source = "1b96de0f843c7958952913199a040f6a32004f7a8951049084ed3539af4c4f47f88302f9dffcebc7702e30d6b596ee739719a65bbf961f5fb02c3b11654c8217";
     license = [ "gpl3Plus" ];
     version = "1.3";
-    sha512.run = "e6056487d94eeb79e796e174f19d5075a357f41e2e43eff4f616db3d1737b75076c807a000df7cc3cc925699d09d1e17b15c3e1631fb71eea0c88b2df698a8df";
+    sha512.run = "74436143eb935740f854ce9b0c27c3ec4576c11b681bf65416f6767a995c3ed617844e55fd68d540d8101c4f1ef7c62f2b2f9e106ad1ac6944b7be6240d9bb3b";
   };
   clojure-pamphlet.binfiles = [
     "pamphletangler"
@@ -7993,13 +7999,13 @@
     sha512.run = "eb609d4204f9292b387fb8ecac13eaaad77e1d32870cd29f4996771acc5f8e82560e3fb9dcd2c8284888ed55d2b7bfbf931b50e01b0e4b8790c2ce5ce4445588";
   };
   clrstrip = {
-    revision = 60363;
+    revision = 77677;
     shortdesc = "Place contents into a full width colour strip";
     stripPrefix = 0;
-    sha512.doc = "9d52efc5bec01766d81240bc4087d76b08b1a07c1b89c3a197291e7f7b9e1d4e10214ba7640b591cc82c67406c487c39b571ddcc89adbdf377a3e3fb4063b21a";
-    sha512.source = "db0be0ba5c5686846abc9eabfffcbe24c1b3f0e62554328c254126f7b0450ad0f066f7b3da20aabd83c80545e3400d0d52b639cc23b55a64e6b5735be79ea21f";
+    sha512.doc = "7fc001f27b4b237b464d2f7665fa52fb5bfcb4da3e5054af6c5d8ec797e3d0a20a45bee8e4e21674bd2277c035bc09ba8685d9642875c06e306fbb51ba1225da";
+    sha512.source = "5afa18f74974a3b7dfd7f53229b4d2b783a3a09fa7e86b9cc75eb977f900e5bf6b3fdbe35b74987f99a118c08532c2414b788086d97ae6c9e1925970b71ca7b4";
     license = [ "lppl13c" ];
-    sha512.run = "5a26232ede7efdd9ebb4ca89adaa2f0c507cb4eb883fc59662abca448a9bd09894cf52e850a0f57af101fd22ebf239ef82d4fb4a761b11448b846a82858fee96";
+    sha512.run = "451d645ce234c4e116c2905cc03fb3574719f94d36ea3b35690405baf3da643d0b94c1ab06b564fef1856ebefdf38b67b908082867e8fc63d530d50860f98578";
   };
   cluttex = {
     revision = 74655;
@@ -8077,13 +8083,13 @@
     sha512.run = "5d6cce2e396ffa0dc887e839f4ef57865db9eda3dcdf6a62737008b53837c40ee1498d97ab06eab8f0802e745787fa5c107c0738a8dedd4e65f6996aee555c48";
   };
   cmap = {
-    revision = 57640;
+    revision = 77677;
     shortdesc = "Make PDF files searchable and copyable";
     stripPrefix = 0;
-    sha512.doc = "5a8b1bd0c47bd5b4a3df3d0270c15c0d3c8691c96f2e5ee272ab97362463c2cfc7d1e2a9a19f5aa7ab8b145e9ae63390b1ded80b48dec52f8bf62118dabd6cd3";
+    sha512.doc = "cf71e810bccc2de5efb6243ed6ec686377f426c760a2c2f4417a76425fcbb7fd13b112eb778992f26ab4d694a3e9221382d8d5ac2afb276b423980fa9e3b7ee3";
     license = [ "lppl13c" ];
     version = "1.0j";
-    sha512.run = "4857f7ab9719a2b6828582599c98715c61731288899494aed96026dd6ad8bac92028586cb6b008ebaf3fb516d918861f79f544ecd64bca1e6a6183bd8bc398c1";
+    sha512.run = "0bfe443e46321a8f7ac0ce90bee7ced6d39ba24ffc3e56da7b2d39e991c16e03f15871e95519c47492cc731208ab0ef24428b1a8bc5ed6f3a966d0bd367f2c10";
   };
   cmarrows = {
     revision = 24378;
@@ -8107,14 +8113,14 @@
     sha512.run = "8e720662ac4d00557b143c883e9d410da8593cdfa056b5320e0ff348c2c0e37f9c0045341c28e583aa544790e576d9b7db8c80f93cffd8c4da699e46e35f73e0";
   };
   cmbright = {
-    revision = 75712;
+    revision = 77677;
     shortdesc = "Computer Modern Bright fonts";
     stripPrefix = 0;
-    sha512.doc = "4c4b75ebc584b8dfcb1e250149f0a512e359b92d8af8a6075f3fb76a793079bb01f1dfb90a0a1ad024099d43068ddb2901632e67b4295963976a2c48077ef745";
-    sha512.source = "b2cc4a5c14109b4cd2234b5ce8dbe3167d0f1074980990a73b0af5d760321ecaf011a7a5075c2bc1a21afd7e5eaf393cb63b15b009a871a41f62d1c787382214";
+    sha512.doc = "6dffa81ffd65f84db8f1e016574d3c42f4cb0fdf2d20dbde4b88acb12e49947207057a26f965fddcd876a6ed54df0670108934123c5237eb04478d45b3cfea79";
+    sha512.source = "6093eb359ed6a1a9a1cd8f841a62f5d1a912a47fef312623eb8d2bc10caf224e9a99ac007cc7a67d1fa04f286c81eaf95ad1779b099eb9c1d3643e0bd6d3bc05";
     license = [ "lppl13c" ];
     version = "8.1";
-    sha512.run = "0f90e7e0a0f2b6bdfc6b4150a669ee1508ac9a8c34738620645d59ff9f44bd32b5c7fc283e478148756c5fc8558c0cede37e8337fa34068603158c23a1176af9";
+    sha512.run = "3ac664a9935e8752fe439053fec89aca6e758c6abc0753bca1436f0bcbaa344de2c4e4de54a4340b5f0d3e5371884a9130811c37a52e77c01c1abb18e0492836";
   };
   cmcyr = {
     revision = 68681;
@@ -8137,13 +8143,13 @@
     sha512.run = "b05a8f8d326a6546b7c865e4cbc1afdfb0fa50993f4ad5e3b3a1e1781be9ed7590e1dd17b18d58f8a96c83aa2fe6218328b2df3e193e2dc7923d051374ebc9ba";
   };
   cmdtrack = {
-    revision = 28910;
+    revision = 78116;
     shortdesc = "Check used commands";
     stripPrefix = 0;
-    sha512.doc = "2a69b054e1de07b31426e653af45125824bd037cf5a24fcde1f0fe1b6aa3eb925688959aa84094ecc65954b92030e1b78545db18f08a39990c4412d487ce2284";
-    sha512.source = "c6b02dd165bfb3ab40ee05aa3ac9df74faff8167de021495fb08e0d173b83f75453915a634d81d260d4739166b2e5a519b8cecfc7807d25f396c27c5b65f58f3";
+    sha512.doc = "9a34ebe3c955a173fbce1b1def51d22148f90bf4f24df97a7747cf2108f3b816a347c6e030eb1b4e6120fc7f83c51a092bd9346c1f74bf6b99dbc0f8c9d77811";
+    sha512.source = "9f43e4bcae7dfb50804b3e62bccfc2b318ac2b9ce80ba5e1595335cb7fa578efe28e685bf993d02615b7a362b788a1d0020a91f1a59bc1cc7823f306b898fb1a";
     license = [ "lppl1" ];
-    sha512.run = "22de643d5b45f3898a1aeee44ae88594b545af34bb5bdac937753c13d31071872a78935dc2c73fb22c0e591d164f618549a2bd67a00550f3fb70753a951ad4cc";
+    sha512.run = "c4283364be629c495634fc5d7b21dcebbe836637fcc46013df56f82d232ec6cd1a533c2a5309fe6856ab5e09441a0e11b8682c9d906b96ca7ed90c1b631ca560";
   };
   cmexb = {
     revision = 54074;
@@ -8165,16 +8171,16 @@
     sha512.run = "fa6bd1e79ca96500080405e01a7524a6fd13358335d34b3e2983a7f33f7b7a50ff4106ee5f2f483f3e040a3a7135b4133d727c6a7cb0c90f63be40e5410e3b48";
   };
   cmll = {
-    revision = 17964;
+    revision = 77677;
     shortdesc = "Symbols for linear logic";
     stripPrefix = 0;
     fontMaps = [
       "MixedMap cmll.map"
     ];
-    sha512.doc = "71a7cd27a2744e8e3ab09b8fbbc514eb2e38d9740349139212f0861c67948fa1a98728acb1d22a4397fe95d8efd5c6fcb87a1843a1f9dbd0d161e2e835e1ac11";
-    sha512.source = "de17c8e0627408358ae3de41a5bf557d99abf76bb480ab28ef9df424d8b7ae1f73ca2e30f4eeb26ac9eb2dd36ddafa143cd49ce6618b2ca36fcfc6e22e83d217";
+    sha512.doc = "8e2bab2b5965653fc4bec4be00f3056eaa5358c3ac38af3560ffb906207ea2d7af2a06eefd8ff95e41af2270b583109e41ccaf0ccb0596d330d86143aca130b8";
+    sha512.source = "5b3fb74e2126c6a821dc6446a7cef5fa1f8427bceba2ed71db33ea2c473c8d8c70a7747d5a735fe519ca90567eaaec9feb92d717cfa7f6f228c9a831a8609a8e";
     license = [ "lppl13c" ];
-    sha512.run = "8470819c5a37b3d8d1d44aae53b62ff020087e1125f381e51ef4a639fd6b2394c3d6f15a3a86fe70e61a4545213059bde6fc3e9d06cd054e46218e90e64c0543";
+    sha512.run = "24850c5f71dcd7d91e452772e2ff8812d1d9c7db70e28f81862f25f735620904ac261e163a273488f0f5d5a52fc4685cb1dd3f20b2fe3404dbfef8cd311cd96b";
   };
   cmpica = {
     revision = 15878;
@@ -8281,19 +8287,19 @@
     sha512.run = "ade4e6bbb00d619d52cb65549cb50f4ff9275d20a9e871ddee99064fb2ae0e02ba7d403bd6c7d658fdc6d542d7a32244ce8ff7fbe023b4fe292697584aed966a";
   };
   cochineal = {
-    revision = 70528;
+    revision = 77677;
     shortdesc = "Cochineal fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map Cochineal.map"
     ];
-    sha512.doc = "f76599d36e9c3650cd20b678ae699942de3380141018e9db74b342ac8fca6b50f4ae75abf4957727b37cdacd24a5a4df4b728aa9b2eb2886a3049e002e548032";
+    sha512.doc = "27d65699218f5cb9049134c4c9b042146270257b0003ddbf9094bda39a79e8a5ff27ee8e6cde3a1b4b8bc0d032cc7a2f62a5280df2ced63bcea6dfedec595165";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.085";
-    sha512.run = "41af2ebf59705b60c9713bf814b15f1d0b9613d2ee04d8b45764d06ccd479ea9a5050858c9a5c536bfe85595ec4c7f7dd186624436bbcb388a37c7f9ee35111a";
+    sha512.run = "856d70f45776fea877cc3ba79ad49a581ea67441b2f928dc935daae001e8acdc70e8c3178d3a882bd293c8f0e38ea22411530f6db38c30a200be6f01762f50f4";
   };
   codeanatomy = {
     revision = 76924;
@@ -8315,16 +8321,16 @@
     sha512.run = "582fdce35d70015e53a210517888fcb0a502ca8f0fae1bb7ce4219246101a77607ef6b1e1b721e5090998fb49d83781834fa8fe7256addf461e6ec7455f41d8e";
   };
   codedescribe = {
-    revision = 77215;
+    revision = 77818;
     shortdesc = "LaTeX code description and documentation";
     stripPrefix = 0;
-    sha512.doc = "0d168f2e42d2cf1666b953f526d68a5f09dd09e454ec426d3fdebf4b500cf0f3a529b660ed68c260751adb06e2081520eeea3c3b9aa9c52412286c29dc32a1ba";
+    sha512.doc = "4570751813a06de4bca533e78ee0373cd3c9e46c91832c86d623a8291c2ebf9727185132dd893bcfa7a242b26185e1bf2ddfa6826a6394f2772811a9187ef7f1";
     license = [
       "lppl13c"
       "agpl3Only"
     ];
-    version = "1.23";
-    sha512.run = "054b9775b59f05572cbfaad8da09f49f773dbc5e0dee27f1f501fa589d77c8409a56eecdcb1d9ff84efbe66f213ae22797a8361599e59de0542bb7ad7ed0a270";
+    version = "1.24a";
+    sha512.run = "2d8d0fa1b93c12b1b3cc67e9c4ac3b4701afe0292d964f918f5a3fbb5e84e3043eef11e16475612c122eb665f6dbd471a176640cd63d99622866d74856a4930c";
   };
   codedoc = {
     revision = 17630;
@@ -8336,13 +8342,13 @@
     sha512.run = "8dc006776f2a3f0f28aeed0450e2d7b714402de1939a92d1e7f1e0174a8de7e9f7099e7ae9a5de34df03613ff16800bde17f7cc90fa82798f30c775c10c655ff";
   };
   codehigh = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Highlight code and demos with l3regex and lpeg";
     stripPrefix = 0;
-    sha512.doc = "a236deae30deca7f1d9d355f45ca5f9d6075991fe1761c60fa426e38a978d8567c3d92cb9b7cd6ce4bd3a420f33e2eb15256364f432adca56ac6097d2689532a";
+    sha512.doc = "f571ad07fb51f922ffa3306d159586fe33d0e4dfa4561a1eacfee5ed510951234a2557394eb5c3e83488d0168e0de63b94431bb34d27ef1c990d8cdaceb0c948";
     license = [ "lppl13c" ];
     version = "2025C";
-    sha512.run = "1ee32ae78ecb16ee8fd1591d7212c3a8e9d95a36b2214d2ebb1556ac4216e537530e180c1e31c539f1f80c4f418c06573b6fea9c5aaa8f8fc377734a54cde85a";
+    sha512.run = "4a0c90b2251455e6a8c19c8822b53f15016cd37ca929bc7de49741375ad1d9bdf9bbe6989a21d1fead931d2c571142d5ce3e2a3d35e64ce5edb2248299506525";
   };
   codepage = {
     revision = 51502;
@@ -8374,19 +8380,19 @@
     sha512.run = "7c93841ceadbb7bbfc9846d281fdbd84b7f284117344e1c4fd984e746186403e9be3e2048cfca53f6690a1e20b7471224b8d30ed1358959053111c22d3f15191";
   };
   coelacanth = {
-    revision = 64558;
+    revision = 77677;
     shortdesc = "Coelacanth fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map Coelacanth.map"
     ];
-    sha512.doc = "ae548dfea88ab4315674caca7e0531bf52512b6ac8198853e0c70661e91061e3fdc15c82be7d6f1ee5c92a7cf340e65b0ce99665da82507b9d9f9b119722c2b7";
+    sha512.doc = "ab5804c5e05d6b56fecc98a173dbdd395fbd3ed3e70593b1d5e65d8b74f246127500903c178d748a69671ed41bc39ca41580364bed86c743941cf378d3091623";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "0.005";
-    sha512.run = "279faeb81ba3169bc72848c691ab42729c670bed5c41a2add3e338bec0c109ff15ffcb492e19834d0ab2293040a659e3994f374b5a6028d505823e372eab7f48";
+    sha512.run = "b895ff5c385afa580111d5f61742c9382e9422111b4045f7a89f60fb7182668a64adbee97dad524dfa823f0746345626537c845fb4f4abfd38bef4d6385d0ca5";
   };
   coffeestains = {
     revision = 59703;
@@ -8408,24 +8414,24 @@
     sha512.run = "b55c95585cc2486ea69e83689322ca6e5842a2c285ead5a88f23d42df108c6698de7f2a897fd0f2be34865b8329ae0d35a3437a30eb880919ce58dffebc1e9c2";
   };
   collcell = {
-    revision = 74187;
+    revision = 77677;
     shortdesc = "Collect contents of a tabular cell as argument to a macro";
     stripPrefix = 0;
-    sha512.doc = "eb77e7953163f9d9d0091b9a547a63d9cf29d9a4e34f139e031f600e760474e9753340d1edb7aa5d89aa84b5d38572fa202cb258c6387c83f0436f0e6de4db09";
-    sha512.source = "77fe99c340319c394b70fdc5c0b30525d60c9746db80d5e9e1d5a1d0e882f2dc7aacbf14b12b46b951e7b2ec7b2fb5d9a6c976d7e99d15f6c81d2265ced984d5";
+    sha512.doc = "8a9574fa9cc5def7ce90d8ddab3bbb58ea1679239c00763d4cbe12c55d1662c9e025e46c8d5df4b904e003d1122d2645aa43412d5d52fb25542910bd1dae2d14";
+    sha512.source = "035171a9373b45acbba59a6c4a757096d376b8e7ab8ed982314fd089ced3348029c08fea5864c3523846ee9d5deabfb3a0ad617328a37d32724520c22c72d220";
     license = [ "lppl13c" ];
     version = "0.6";
-    sha512.run = "883e1a4504f53c97ddfe4f1c70daec15d7b12d9bac903cd07250d6253761977f53cc31634578fc19e29ce40aca669a23a1a87f3c3ff26ad03398f18ba0d52fd9";
+    sha512.run = "857cf249dc24da0ab3e412d9b82228746667de828b835b17180525cddd2f4ef71aeaba9a9b83aa077acf9dc42662b5bafcefedc4cb3a86067491334d478b9601";
   };
   collectbox = {
-    revision = 64967;
+    revision = 77677;
     shortdesc = "Collect and process macro arguments as boxes";
     stripPrefix = 0;
-    sha512.doc = "db2d2066072a3619913df6fbdfb19ec3afc50495d51ccf1339312bcff1bf7841902f412932205cb4ae2f94acd33b9fe2b250d67ae02c22d6efa25c251a182c00";
-    sha512.source = "b54a9a9215639eba3c0c052676122a3c25efacda695b34c56317d809e69e6859bb52c7fb8845e08ece9d1a2ffa399f3800737b56eca7e6c4a2f7ced14b10a2ce";
+    sha512.doc = "b41f009d2e31eb2c25e09717b441ef3878d75b94def7f268f4aa41533a79050500d22aa8ae95e908af7a6cdf6bb3cdd58cbd7583d55b949ab31ae21b2a5e5c79";
+    sha512.source = "eda531908382e9a7d70535f56e825b172c071481dd042e42a66c7ab37d3890545f32c1f769113cbfcc62f7179e925ad2938afcad1b7f49af1391078f73a7f33f";
     license = [ "lppl13c" ];
     version = "0.4c";
-    sha512.run = "59316a336010c03bbe288ecaf20953666d084500165befe465ac87210795f2ef68693e5fe155b45a461a690d918d83aad247dcd52eb40cd0bf80f6c68fcd8071";
+    sha512.run = "d85ed9d5287f2270f4e41bc7f3e79a2363b8069c2acdd1376280f137acd07300912eeb97a131ec5271580fd932f021131f0b54872f5655943f49aeb46f788094";
   };
   collection-basic = {
     revision = 72890;
@@ -9430,7 +9436,7 @@
     hasCatalogue = false;
   };
   collection-langarabic = {
-    revision = 76980;
+    revision = 78046;
     shortdesc = "Arabic";
     stripPrefix = 0;
     deps = [
@@ -9447,6 +9453,7 @@
       "bidihl"
       "collection-basic"
       "dad"
+      "fariscovernew"
       "ghab"
       "hvarabic"
       "hyphen-arabic"
@@ -10276,7 +10283,7 @@
     hasCatalogue = false;
   };
   collection-latexextra = {
-    revision = 77564;
+    revision = 78212;
     shortdesc = "LaTeX additional packages";
     stripPrefix = 0;
     deps = [
@@ -10370,6 +10377,7 @@
       "beamertheme-csh"
       "beamertheme-cuerna"
       "beamertheme-detlevcm"
+      "beamertheme-durham"
       "beamertheme-epyt"
       "beamertheme-focus"
       "beamertheme-gotham"
@@ -10723,6 +10731,9 @@
       "egplot"
       "ehhline"
       "einfart"
+      "elegantbook"
+      "elegantnote"
+      "elegantpaper"
       "elements"
       "ellipsis"
       "elmath"
@@ -10845,6 +10856,7 @@
       "fixfoot"
       "fixme"
       "fixmetodonotes"
+      "fixtounicode"
       "fjodor"
       "flabels"
       "flacards"
@@ -11219,11 +11231,13 @@
       "medstarbeamer"
       "meetingmins"
       "memexsupp"
+      "memoize-ext"
       "memory"
       "mensa-tex"
       "menu"
       "menucard"
       "menukeys"
+      "metacapture"
       "metalogox"
       "metanorma"
       "metastr"
@@ -11233,6 +11247,7 @@
       "mftinc"
       "mi-solns"
       "midpage"
+      "milestonetimeline"
       "mindflow"
       "minibox"
       "minidocument"
@@ -11763,6 +11778,8 @@
       "todonotes"
       "tokcycle"
       "tokenizer"
+      "tokglobalstack"
+      "tokgroupmark"
       "toolbox"
       "topfloat"
       "topiclongtable"
@@ -11897,6 +11914,7 @@
       "xsim"
       "xsipa"
       "xstacks"
+      "xstix2"
       "xstring"
       "xtab"
       "xtufte"
@@ -12005,7 +12023,7 @@
     hasCatalogue = false;
   };
   collection-luatex = {
-    revision = 77516;
+    revision = 77773;
     shortdesc = "LuaTeX packages";
     stripPrefix = 0;
     deps = [
@@ -12068,6 +12086,7 @@
       "lualatex-truncate"
       "lualibs"
       "lualinalg"
+      "lualineno"
       "luamathalign"
       "luamaths"
       "luamml"
@@ -13102,7 +13121,7 @@
     hasCatalogue = false;
   };
   collection-publishers = {
-    revision = 77395;
+    revision = 77889;
     shortdesc = "Publisher styles, theses, etc.";
     stripPrefix = 0;
     deps = [
@@ -13164,8 +13183,10 @@
       "collection-latex"
       "confproc"
       "contract"
+      "cqjtuthesis"
       "cquthesis"
       "dccpaper"
+      "deutschesmuseum"
       "dithesis"
       "dlrg-templates"
       "ebook"
@@ -13214,6 +13235,7 @@
       "hu-berlin-bundle"
       "hustthesis"
       "hustvisual"
+      "iacrj"
       "iaria"
       "iaria-lite"
       "icsv"
@@ -13235,6 +13257,7 @@
       "jpsj"
       "jsonresume"
       "jwjournal"
+      "jyu-chem-thesis"
       "kdgdocs"
       "kdpcover"
       "kfupm-math-exam"
@@ -13493,24 +13516,24 @@
     hasCatalogue = false;
   };
   collref = {
-    revision = 74757;
+    revision = 77677;
     shortdesc = "Collect blocks of references into a single reference";
     stripPrefix = 0;
-    sha512.doc = "13281b226e2444fb4e18a40e8cf193cd6da5139c58ece5a0c0002b3c3e98280e5e177de18361dbc0bef8cdc77f2f049e35e98f5f6712965ae15576d05b4e1ad6";
-    sha512.source = "401784d0decebaf7acee57185e3ba0f38d3aa3df16aa9ad0a216191ecdc7b6860713fe489518e32f01c1704cbb6d1f6f626e52b55dcd0d57a47cd224f82d0a7d";
+    sha512.doc = "08de787a38e9b945611e2ab6955ff5d20a0551b1a0bdec32cac81b7df39394c34872c0b7ee2858e42bbf3dd11acadd0bb51a186ea952cf0d177948d770c13550";
+    sha512.source = "b7b4c9294a1f713e98e9a24c7d676a24e26d778d17e87643e34e5803b85e22d77391ccd6486865f221d0148a03430ab593edf2c2c36c85a37289f237420912b1";
     license = [ "lppl13c" ];
     version = "2.0.4";
-    sha512.run = "7c6d1bf032c7b057304ab5a4a814ea659de2e6b197653ea0110d6cc00a452392e4edfd0b8ac5385f8f2a5373c46217ff537b857349e3a690213192e67e6a2920";
+    sha512.run = "9d75864623ffcbb7fed8f6d84b03c055384333f9230f942cc58830a668f7b5a51f3ccd335c6045977a867ecdd7fd23bdf406382b7494ea4b36fe80956957d727";
   };
   colophon = {
-    revision = 47913;
+    revision = 77677;
     shortdesc = "Provides commands for producing a colophon";
     stripPrefix = 0;
-    sha512.doc = "aba1badf34551d8340f733bb9e365a99c56c473f96ed69deadda917232ea8313df800579cb347e074ff0836553bdeb49f60330883581fb3cc7a3eeedc736d1ba";
-    sha512.source = "8764595f95806d0aa8cd956bdfbec118f16376c936ae457d3d28c072eb8e2d6f0e7028fdb91ab301dfb587a721cc40fae13f56f5245b418413187f8776624855";
+    sha512.doc = "b7a822de8c1352213a21f6a13da86d9125524e22845593c55d48f2013ada5e23872df8fc350a52143cc8f6506a5c4d94bc72a6e599c78d16386ecdb66720390e";
+    sha512.source = "7cb5253eb26615a82680da7a338056ef56918a87189f4bdcd21a3f926d72034967f1a351638d237ae357f7c057e3aa8705332785fc93f5b4fa7204e9fef5d8cb";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "e85dfdef7eefa2fedd6af7c0b6eb71200485b5190268de3a89cbec8dd15f8e66b3260430660f6cb860e2712d3e20e5a8d0b874592a71b116dc07de6e28161474";
+    sha512.run = "ca061b3c4904b2c74ca67e60a40847981a6f35bde0df06e6f4d01c37d62b476a5702aa50d8ef3c7e8830e3cf4f326a93b225c1884804c84ffd0a34e68527eeb1";
   };
   color-edits = {
     revision = 56707;
@@ -13541,16 +13564,16 @@
     sha512.run = "a4d87deccae89f844a6251887e4d20817837fff4eef9cbd2874bef8890d41e0ab930a3ee55fae9ee46685c6b3b2b3324b54ce8507f1cb10eef332b7a480b94a8";
   };
   coloredbelts = {
-    revision = 76924;
+    revision = 78042;
     shortdesc = "Insert colored belts in documents (to present skills, for example)";
     stripPrefix = 0;
-    sha512.doc = "5bccf3c35519b0702320df97aba8b62359ba715b5dc74edfe4264b4546fb1e0d8411e6be4ecb960acfa4ff5f290ce88cca59e0517e37a9a1c83e24697110bdc7";
+    sha512.doc = "447fec4a40262e98308d940ffbc2032376fec2ed62281e17fe81a93ab55b4b8757e2b198d385baf58b75b5fb43172be1509ea50ecbd4bf3073da58174c5745a0";
     license = [
       "lppl13c"
       "cc-by-sa-30"
     ];
-    version = "0.1.6";
-    sha512.run = "e9420eaca2701de9ac81862f04055d2fe7c7e66ddfc2fe7ddb9096ec5de4a942a0a17697281401cc1e88997d2bf956ee58d9df1c4651d7de62daa74516a4ff9e";
+    version = "0.20a";
+    sha512.run = "d619d06b412e1c55d35b90eaa789ba5fb64ae946523c44698d97020f53d83ba4f7efc7843cd260fdfd66b2f99338488cab746987e06e189215761a0d6782594f";
   };
   coloredtheorem = {
     revision = 74812;
@@ -13562,13 +13585,13 @@
     sha512.run = "d65d33e14f64a7efc21e175ec61747d2389e84a514d641059bc46af683c55cfbbc3fcebf97b99c38f7b62d8c56611500ac103ba813de07a310137787a5d524de";
   };
   colorframed = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Fix color problems with the package \"framed\"";
     stripPrefix = 0;
-    sha512.doc = "2b44d3ddd744131dd5ebca331cdefd1a6c0ad7e112f1da445009cbf34b470649be6c8f78cdc132885630381212bc08ac9049da69a6759dee2fe58c27a6f80171";
+    sha512.doc = "7d5be70fb905422b0060f766ce202e0d61e62b606e9082350bf66c784374a0fc65862c939163f51b5d926399fb6df08f17f70b0c57818d40f9dd5d32657399b6";
     license = [ "lppl13c" ];
     version = "0.9b";
-    sha512.run = "e137d3a542e7561781a6a130ad17fa7f2f380fe78c4e460326776975c7a4e9c3d222f8486c919cf740bd8ad9e3ed5c3e09dca142e996fd7bcb015e9973e0e8b1";
+    sha512.run = "be0d47dba7ff6016a623e5ee3a355cb3099b4e7a2a7a07550bb2bf5a0d8cf123cbbb84c075857c95554dfa7504de3f7e36eece087e290ea55c4e6d2828e7c11b";
   };
   colorinfo = {
     revision = 15878;
@@ -13589,15 +13612,15 @@
     sha512.run = "7c89a6c53212beaa06d54dc091021c5fd57cc30fccc917ea413d23b0790ec637b6b8e69a3bf1b44d0a9ed24fa1c0dd21608b174c0230a0a94a2e5aed221be033";
   };
   colorist = {
-    revision = 76924;
+    revision = 78012;
     shortdesc = "Write your articles or books in a colorful way";
     stripPrefix = 0;
     deps = [
       "projlib"
     ];
-    sha512.doc = "24e81faf158033976322b5e7703a84001c9dbe9dba764d09b964b444df681c0c56e9a8e470fac4f4a0f5e7b089ecdd45db1e22c17628917e1dce404fd02c083d";
+    sha512.doc = "5597b91c48c675d1d2e8e3d2a214bbdf1bf45885936817926dba533020b49b49f5f2a3f8293528aa8287442b1f4372024f789091ddfec945f0f171f82d47b114";
     license = [ "lppl13c" ];
-    sha512.run = "cd543e23127ea8d39b38d495212450510595f26eac02abc03509c2b8f41b42ffacd0012403a079f86c13ced3d0b5a328afc9e5c3915a972ca02056cbf9aefd28";
+    sha512.run = "87a3f841a655a36540f2ff9e2ffc6e9ab10479160a31eee6c00a82faa974c2757cb85c78feab28fac384e6fb80fd4a0bdece5d1f359515079505d37c4ab7951f";
   };
   colorprofiles = {
     revision = 49086;
@@ -13634,14 +13657,14 @@
     sha512.run = "460225705cfa914efc689df2d3f0c0ef7f5883082195e3d8e29e124726589fb5e9b7fc4679541b685439de097b6b297b803cf08e104ec13b849dbb26cffeaa04";
   };
   colortbl = {
-    revision = 75287;
+    revision = 77677;
     shortdesc = "Add colour to LaTeX tables";
     stripPrefix = 0;
-    sha512.doc = "8c2ba97d0e2d6cc432e7d83966b7f546f0268f66ae5946334e8a1787d079ca2ab2becee6aadd6e43077841527ff8139792e80934e006ed151337015e11f813e6";
-    sha512.source = "5e04dc253c881982afc7e3fcd55f6690dbab5d4ab50de1168d1561a0425924008c3315dadfc8fac7f7413baf92057016f687c4a35de54a01a07b2c436090f12a";
+    sha512.doc = "cbe8f95793ef7e6154b7272e8d72e37aded77789395c7623b27ac267f15bda55a1e16277948f162121e1554ebf0c930686567b56760115d7c0314087968fa81c";
+    sha512.source = "1e593711f2584dff6cc5456d8d9beebbe7de19f75909952fd9b1968fd4e9a7bab46429aa494a512e889f90d5b723fad0e84dd85967104f3bbbcc5293e98e2a5a";
     license = [ "lppl13c" ];
     version = "1.0k";
-    sha512.run = "22e031d1793439f040f528c47a5a8f6855b38a33a229760d10502cde4ece9936eaa8c7a1dba589e27884d56a9db1cfbc05519958f70a42da26ce81c386b841e7";
+    sha512.run = "4bcd1ccf3c3000e30f4004855b8f80f2295f93376a39d294abba623acdbc507f550a330fa8fa91dae1612187d4b8ba9de75122568136a8356eab0e15b84e1311";
   };
   colorwav = {
     revision = 67012;
@@ -13711,32 +13734,32 @@
     sha512.run = "838f10474c2e89f317df4592443deaec3d1a3310f7bb2b458c2a1b29a03013c4274912020ddd9b5807bb6018b6564c11df7b14b8a6db556e8db58dd98049c002";
   };
   comfortaa = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "Sans serif font, with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map comfortaa.map"
     ];
-    sha512.doc = "b1b4efa42012646538316af9bdd5c724f285aa784e18e85a1239376dc02cf1b79bf43bb0ce07a822995a82811eb6562e6943aca0b903f9241bda088ac0675fce";
+    sha512.doc = "0afe6cfd45da275d50a0446634194e63134865ebaf13342116eb2f30d31340428805c3c9af8cfc0e63d5fe077017fa1f7e987016ad27b7c01e0d789fade65bc5";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "3.2";
-    sha512.run = "6b851b6c56ef5b6ae6e59c5a3606238671af34963c5dfb8a39a9bd6b84597f673d12963abdd687013f11edade4fb9ae37794a4789650c38c29f64bea1d41dea5";
+    sha512.run = "a12760605afc793d4316f98dc371230ce382f0adcb270d73b6de0eed25b335528262b0a458cd14050a8acfe727d1b6449f1db363c5d375274780ac8919250f56";
   };
   comicneue = {
-    revision = 54891;
+    revision = 77677;
     shortdesc = "Use Comic Neue with TeX(-alike) systems";
     stripPrefix = 0;
     fontMaps = [
       "Map ComicNeue.map"
       "Map ComicNeueAngular.map"
     ];
-    sha512.doc = "24baee44951d9dc6fd70b6b6092112a1d7d13c394eeb495162c3f80444ebd799b526acf7b7c86b7590afc9f5f6efa97c10b661ddead6ca11a168325c7c840650";
+    sha512.doc = "4b9cbe3a65cad7bc602f5ca2ffc70084d66231192f4110dc8fb538d3a4871cb90588fa68b0005fc97173483aa0f5b14efa8de4317a68c967408a97e0766f5b65";
     license = [ "ofl" ];
     version = "1.2";
-    sha512.run = "5dc900d215fef53fe69ffda6e9120f1230173f40d220c71eaaa3d7eb21610b214591bdc043f27f0fe5259daf2a800b695167d2deee1810a67045997aff7c2a76";
+    sha512.run = "56ba2ed529c3e0e546a8520c1bd5d5d10a63e00c60f95c718dc83bbf7e77336772af7fb22b2ebde0872504d08e81e3480cc62c7e3c62a6cdf416dea2b68c70ce";
   };
   comma = {
     revision = 18259;
@@ -13758,13 +13781,13 @@
     sha512.run = "c5e48910b5e685c792b9dfe191cd8666472e24e7ef6d6c2fdb3bfb05b2f39f4d4ca68cc7b859d07f50e5d596250e36e1664e1ca48666b0e3126eb8c91d27c384";
   };
   commalists-tools = {
-    revision = 76924;
+    revision = 78016;
     shortdesc = "Manipulate numeral comma separated lists";
     stripPrefix = 0;
-    sha512.doc = "240ccb8bd9fa8cbe246fabe0800e9f16872bc950947dc6fc99608b266e7896b7f9306983a2c1d8f7ddf70c75e1cd95e5e089b3c4340e8ac99c58e61a222140c9";
+    sha512.doc = "819991d4c1af5ae0cf5dcfe5cca79a8aba1c4381385c98a13c55a9b264b2460ac76f573882b0f8ae415f4b3aebed0b12d862f450ad22a456d478ba38ea396fc2";
     license = [ "lppl13c" ];
-    version = "0.1.7";
-    sha512.run = "e38b09513faca58018a4eee583581ac6dd986a02fcdb55c2d5c63b973a636b6613250af8c4b290adbd27866dee1cf3dc39bf9604ce2bad995ac951283fa4050b";
+    version = "0.20a";
+    sha512.run = "507875d1741115ad5e67c87da7a8136eef1dc4e23c864709bac4ded89edf4860cafcc3d3d4f0b8ac43178031f2bef5b114306a9d75a47c48ae6daae99997d58b";
   };
   commath = {
     revision = 15878;
@@ -13786,13 +13809,13 @@
     sha512.run = "7a2248fc7c3de4755a68dfb769c0862332f41945a5efdac8f0b9911c3479bc45cf72ef0176d8d2ed2abe127aaf388c17c90d1f58cfea4aec8bd9e488f2d96c5f";
   };
   comment = {
-    revision = 75712;
+    revision = 77677;
     shortdesc = "Selectively include/exclude portions of text";
     stripPrefix = 0;
-    sha512.doc = "b0bca460b8cbce934128875328ec88ca3371508dddee464dcc2d5d78bc8ac514a17682dbdb8689b17ab79f8408ac8acfc41c05bad7f694a12edc2cbb0a4b1784";
+    sha512.doc = "5b98d927c8e372134c8d0b1815c15ddb76aaf7ac13cde504e438179ef4498eab883e6a692d33528fe77ff871f9746d927b79fd763d2545eb3f6b5ab15ca051c4";
     license = [ "gpl2Only" ];
     version = "3.8";
-    sha512.run = "cbcab3d411387ba45671158b8027d1ce7e3b185b63413a5202c46c1b044a078fc25771f8831715cd87de78efca65dac29320c47a7cf17ec56a36d21923e4cbba";
+    sha512.run = "5db2af6c82a4f2f4c8883c1749964e8cdbd1110ee32da1c04e93a968aead82fca408250a14074e4e21868990c372b67bd45ed500c985366a0684b0366cc090e9";
   };
   commonunicode = {
     revision = 62901;
@@ -13908,16 +13931,16 @@
     sha512.run = "65b3f7003b8aaaf6565bea6a65da11f42dca2283f1d53710f4b476a48ab39ae6fffc1d0f9206e23b66047b572c28e793e1a75d047f1c1a892fb4e7c17c854741";
   };
   concmath-otf = {
-    revision = 76683;
+    revision = 78182;
     shortdesc = "Concrete based OpenType Math font";
     stripPrefix = 0;
-    sha512.doc = "9178910e18924d5c5fe8d1b0f39912aaa01f8b036724479348d18f5d6cd77cb35a97078ea3fe22e3e0150cc8137e3ec78351303f197ee28b5c1ca7295917caa2";
+    sha512.doc = "a31ac8bd0af657dbf4dbb97de750b6d9c91e77e3a91fd28a1db6cc59d24446555af737b531bd70316a5a07becd6f5945a905cda3d372bddf7e61d398df9e610b";
     license = [
       "ofl"
       "lppl13c"
     ];
-    version = "0.70";
-    sha512.run = "ecbf93fbd96015a870619a55977029192423ed47cb313cd27e925426cca7699c604c0ebb0bd00fdf3812a1d1480d2e65f3b50e066723d63c58f12a91452a856b";
+    version = "0.73";
+    sha512.run = "7699a4b2400ca0cb57b24cd7ed4e54bbf6a4c0062d2a898704277ef56fea19f0cf364612ec1a92e51b71811c70a480a3a32535c4d23b85bc34267b2331b5e9f9";
   };
   concprog = {
     revision = 18791;
@@ -13928,12 +13951,12 @@
     sha512.run = "f650acafa4ffa424451f338d6432d665ff679396ed367650d360adf699d3b1e7d8d23f5b3fd070440cb4d6578d07978bfd02960c1219eed6c8594f110708e5cc";
   };
   concrete = {
-    revision = 57963;
+    revision = 77677;
     shortdesc = "Concrete Roman fonts";
     stripPrefix = 0;
-    sha512.doc = "c70e9c299e69daa29e9471293b59ed4bf375b8314729381c1973c5390ec5d73b3cffa16db8864e8d84466dbd078179e98b2ffa3e6466d67441e30efcd02676fb";
+    sha512.doc = "81094ce7475117219ca1f6027f2f26c874f10a8565c4bc20b477e6d4365902eb272388c103bbc21cbc9fb9f4a724885efaa55998d9635fbfc2c9892b4eadeb93";
     license = [ "knuth" ];
-    sha512.run = "9bf9621c120f831110f71cf8d53ee5d4d42869da8c9b2c653125dd6cb6eb9b8d264116645753ee34dce1076204e008d9e74bd0596b46ffac596cc7726b0c75a9";
+    sha512.run = "9bd39c3047c58a3c158335fc12288824df789e71aaae7ef28e2ce08b98f7d2622d550ee06e452d94597534f6945198fa0a0963c3252cbda5fe586308b337ac2a";
   };
   conditext = {
     revision = 55387;
@@ -13975,22 +13998,22 @@
     sha512.run = "ee0f344ed0eab872aca3c54422f83a6f8bbed2462a22cbd54dde075ceae79dc5a01ef13947327ec726d5eeb64eee5519e4074c138f4d172bbf2b4024eb88ceff";
   };
   context = {
-    revision = 77320;
+    revision = 78011;
     shortdesc = "The ConTeXt macro package";
     deps = [
       "dejavu"
       "lm"
       "lm-math"
     ];
-    sha512.doc = "b6ac276b725ef84bfbdd59a47dc79bd88c696c47ef5ed755a18c8999670a8ce62ca34a99c7da98419ccb9e8a092f5967f559321b3f28aa04f9601894bb239f97";
+    sha512.doc = "945f52a793fd8fafd7bde064ba26fafd6e160a963323a15846a5585c7bd8ce5500f309789bdeb607d0bbf54c92513d8b88368464cf698599c96f63aba8c2150d";
     hasManpages = true;
-    sha512.source = "b66138c744fa2b1b05066cef66349ff095e043e2a5457234de795b2b9ff46fc70684d202d0c366efb5cb5005c5c9f56519db86abab828b507d62eaba312ebd89";
+    sha512.source = "b4145227629500578b05e5632645f389b05a88cb3b2777c8364b1ef1851eb4de551b081e1f2bcfe1a23839bd0991180bbce739e679dc26df43a530b9bcaa7ecf";
     scriptExts = [
       "lua"
     ];
     license = [ "free" ];
-    version = "2026-01-08_2330_A";
-    sha512.run = "2b75304b42e2379965bae517ad9d333eeaa5323ab5f11945c16b8da764f3890cc2ba66a31dd9f4034afb1935c2e28022d90da107c8dcc7184034a68f3efee84c";
+    version = "2026-02-19_1149_A";
+    sha512.run = "28bc8ac82dfa3f316ddcaef64305bef74666abe286c3bfb1c2bf5b7f801c46a9e538517180013cb77e2f4f2a5b572a0788dee5aace77191997d7b96efef51cc0";
   };
   context-animation = {
     revision = 75386;
@@ -14080,7 +14103,7 @@
     sha512.run = "cb761c8c0b2201be37c4612483047732a249ead5f3c86720ec88a696e48f42e1b003ca3490275f26df6b2f4d08d2a3dab17b818f0c5a98945b06a3ed70b18c9f";
   };
   context-legacy = {
-    revision = 77320;
+    revision = 78011;
     shortdesc = "The ConTeXt macro package, MkII";
     deps = [
       "amsfonts"
@@ -14108,28 +14131,28 @@
     fontMaps = [
       "Map original-context-symbol.map"
     ];
-    sha512.doc = "b52195b7b3efe7380228f645384b54d66e845ca3d743fc88240be83ee7998653ba7e5925b4813b5a51039af8ee0ba8009c67be933654cc4e4e2af4e45cffb76a";
+    sha512.doc = "9b571dcbbb1ef0b3b9f0f8a214a8ccff8ebdba0eeebdd1c8564757b9b4fbaaf654a2f5fa3f9a4739dea40d6fe35e14897926445892dec32d20d5aa249c1fe2de";
     hasManpages = true;
     scriptExts = [
       "rb"
     ];
     hasCatalogue = false;
-    sha512.run = "060dedcdf17516d91a778680f6e38df3880cfcb750d4c2421b78b1fff6a81bb74ebea380330461a7eb2b152133a67d76281a5314d7e367731e49e851f97bd6fd";
+    sha512.run = "9ab66b8fb4ef3f9bef2a4875bea2f769f96291837629f9d0a7ac988ffbfda837b7dd48b0acb4e821c8461a982dc10d183fbe5495f5f7a57f54eb9071ba3f486f";
   };
   context-legacy.binfiles = [
     "texexec"
     "texmfstart"
   ];
   context-letter = {
-    revision = 60787;
+    revision = 77850;
     shortdesc = "ConTeXt package for writing letters";
     stripPrefix = 0;
     deps = [
       "context"
     ];
-    sha512.doc = "94e1bf68371f3e8c426cfff5c471f93c86ce51fdd92dfad59669d32cc73d86de606113ece55d13a0f25ac4a26f16916407de9175b84acc79ba107156c20cd20a";
+    sha512.doc = "797986683f6e263af0d04e2a3d2ae20bd584dc92849ceab581e991bf5ad9b85f97736cd381185c72b02e69100f034da35878e82a511c5d93188a140102212cc6";
     license = [ "gpl1Only" ];
-    sha512.run = "558836a8c95743270f627a18dfe7a29ffc7a2eaeb4cf663d589ef5c07eab4dad6f09db31511379c90a41d1e9e7da5766e8dc3c8bb0902fa06bda4fb33caa97c9";
+    sha512.run = "382e459eb62d03ca16e731d196de5e1c43f279fa0e7e133a2694a3bd7535bfe165c2efee7e70805f326db454eb8feb38f649a4cfdca8242fa26f600527c43384";
   };
   context-mathsets = {
     revision = 47085;
@@ -14175,26 +14198,26 @@
     sha512.run = "083b1f0b70a74a3648501314fa993632534f476376fb80eb4444b0273866bf4a4d562e4bfffbd14ed79be0020361ab6cc5c40fde1f99544b76d6f33939781f19";
   };
   context-squares = {
-    revision = 70128;
+    revision = 77884;
     shortdesc = "Typesetting Magic and Latin squares";
     stripPrefix = 0;
     deps = [
       "context"
     ];
-    sha512.doc = "dcc3aa45d04a4e2cdb6719d7fdea1f0d761814a232a027ea97fd2cae12bc510bf1b66bdabe0c31752060db91e62ec2b16b6faaf714ac42ee181adff2a94cb9c4";
+    sha512.doc = "047763a0cce59caa9792475822ffe85a4bc2b47a166c60684d0cb4b2504b32222b515a69a84ecbc4fca36a3f793b39fb7ae1d8afba55814b2cf18eb68035c81a";
     license = [ "mit" ];
-    sha512.run = "fdb194b57a51d1ff127b23a45fc07f43844b4bf5c8ae5cd7a2dd73cf7b75ecc2bb842a26f88c23fcbaaf060c8f496e11fa6967553944fd46939936eeef29e22c";
+    sha512.run = "f6520a239e3f7b4a2f19fb5aaf11525af86ab322023b359bbfb4dbfc6522f4719962d0fdab2c9e2e00719fa00ca1968bec4c8c1e301917d3dbb0b0d38d697cd6";
   };
   context-sudoku = {
-    revision = 76924;
+    revision = 77885;
     shortdesc = "Sudokus for ConTeXt";
     stripPrefix = 0;
     deps = [
       "context"
     ];
-    sha512.doc = "3f6cfe5a1df7541529e65e2a9329441a54ee576c5e0938f95f6d2aa07335d47e5180f4a415827c11d6c4a8d385c233263fafa845315a89301d545ff8499bc489";
+    sha512.doc = "b624a3443ee97f95f5f14aab066faf22671a58810e37556770aaa974cbee6903897557a97658eeea5a57af600f844e1d5d192aa197c22952c96823eb7a8acec1";
     license = [ "mit" ];
-    sha512.run = "960cb0be180c46d86294a246a2584add9c53e33212df72db9076f82a1cfd8ab1178c3ba0f6dbfc709adabe276b0f6a79782bfffb171715391979b9e6f2cb0d8f";
+    sha512.run = "606994ad52f3c533a13f8b4be7fe6428181eab21173f3b49adaf3ba02e18680814e60d25bd727a666ed69847e9ed568d2756099bbcfd42bd1b4ed9e744d64f2d";
   };
   context-transliterator = {
     revision = 61127;
@@ -14250,24 +14273,24 @@
     "mtxrun.lua"
   ];
   continue = {
-    revision = 49449;
+    revision = 77677;
     shortdesc = "Prints 'continuation' marks on pages of multipage documents";
     stripPrefix = 0;
-    sha512.doc = "0b6bbf7c3123b7e741255bd3ff9e020ec61bcb81a236ddec41e709f14de514057d9b902ad783f48e5c04ba1ca6daee31a38f130649cb0e5b2d548ca9689d5dca";
-    sha512.source = "790671ec666983e4ff5ff594b7df54cdf7c9d136d57f9004f5400857c3001ffbd3a13a5fc559f3ab75a168c66fc5aa2ee3b5702e5ec417c9a31a1e65d18b801f";
+    sha512.doc = "3dd8a38a996f099eee9b73e6f76b38f677648f7e368dc3a0a6060b29ceafe16fc6151586b35818517d6443ca6d6c3ad472d5b1f1091921b3cd1802bf8c89455d";
+    sha512.source = "5f69e60e9d33e59479d736ccd5c0aa0ee213b533730ad9b5f97e02742d0bccc3049d6145681a322e8c04f0d4954c3a727666523e770f47db7f16e85cac94e12f";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "42cda9a2796e9006263320163777df7046a79e38cb2c0ffb53f23c27cc03c686e00e39b066228b09ca99a6e5c2bf4a6cb32d5d7c49b40cf614c542e258968ab9";
+    sha512.run = "5b92d207ed9ccafdef22a5c4f1c84d32a99a3d0878f9ec7a1bb427527cd4b64a369903cc0293be2dce769166b3d945a2a33fdc3e42eac91684eb361194fb9569";
   };
   contour = {
-    revision = 18950;
+    revision = 77677;
     shortdesc = "Print a coloured contour around text";
     stripPrefix = 0;
-    sha512.doc = "af1c649d2e5666ee3973395babce4802da2154ba95fa7fc08e378c261a8ea1c5be44053c40c5cc1bd0c74e2c54b659470c3d45063fbbd4330cdc5e664f19bff0";
-    sha512.source = "377b4a92031cd957b15d232cda9e4c2e7488a4c71624eed06dc2edf9dca37afc11e18691650ea377da2dd78b5f636272eeb6d94bebd99ad5ec1ec477f7b65784";
+    sha512.doc = "239751f2861769b060fc71cfd096d177e3e4ca9b4b146ba9f045cf659205380e4e7e91b147f16647e013c69bb9a8a97d68bd3c8fb162ff358d99ed508bb1acbe";
+    sha512.source = "bbb1df023c7a523be481f9c879162b8b8846b492f3ed98a717fc8e721140e8eb1cbe19511ec683af53636633e4f91a29b1e689d88aca1cacc9f103ababe830c2";
     license = [ "lppl13c" ];
     version = "2.14";
-    sha512.run = "0dd4a28f97efcfd0459595776cbab019168fca48984d78f9ec17e0f3af9dbebd378adc6649bce6a9a999651c75316f3ff44e0f10e208465dda2d904d080c41d3";
+    sha512.run = "134c694f32745159faaa329f495817f57c79418bd232bb5c0db5ef07ad1e71f86cfbe29674f334bba47a4ff6a914ab0f1f9155284f13ce3def4182684b376e5a";
   };
   contracard = {
     revision = 67201;
@@ -14534,19 +14557,19 @@
     sha512.run = "5fcc21ea49e222cbb205998172ca4184f4daa3efcf92c48278b3e7c5bce6669594b02f5fe54af76f94ee19ba63b9701e66d24c2ce85262748c1fd2c9b6e18b3a";
   };
   countriesofeurope = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "A font with the images of the countries of Europe";
     stripPrefix = 0;
     fontMaps = [
       "Map countriesofeurope.map"
     ];
-    sha512.doc = "e99ac6f4b57a2aed80cfd1214da7625ae94336677f0cfa0306125b06054835c2c3b23ac901cc3f421d56e4d021dd468db12e21acd6b3883c8b937919dbda056a";
+    sha512.doc = "2972b80403419b7660cc7591b003d38c1b8480f2b4f89de7b9c26935f07b9659a00016950f1fbe275c4716a67b6c59b756296b635e9bb5eb5010abb11753b014";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "0.23";
-    sha512.run = "fa0faa88db3e7c1baf73d5fad1fa196915c752e15dc024cef051127581f1e8a3d218d5f2f815b44bbedc9bd6fce6292825929471b595771e9ecd0b5131b11d26";
+    sha512.run = "3c395a9a99c7d91727643044ae98d06a96bdc0b13253d3fbb90b43b59875af55420fc541cc344b08bedefe7b68a608b7c984300e2041ea4ba4d2d1309d7aa9d5";
   };
   counttexruns = {
     revision = 27576;
@@ -14570,23 +14593,23 @@
     sha512.run = "ee1362c4cfc812f733caa3e110703da940b2baeaa64e9d55592d281b1d45c028f16dbd34d763eb34c3cc5c0468db80ae32ce0c70fe129f06bdc0f2c6e00c2586";
   };
   courier-scaled = {
-    revision = 24940;
+    revision = 77677;
     shortdesc = "Provides a scaled Courier font";
     stripPrefix = 0;
-    sha512.doc = "59c5cec8491e678b084afb4c6e63ed07ca179b5f17be8fe581ff341c80b3cee8016601799ada090e1fcde9eeb72197986f3d4aeffa7c7a9d10a014e34282f52a";
+    sha512.doc = "c4a36d0335db8bf7c6cd7d57c8da82c74909fbedd24299f1c087eef865056719863e2f878568c2246d5910e63a0e1f5f524d493b288601373e2c970e0bd3095f";
     license = [ "lppl12" ];
-    sha512.run = "570256a4353163cba169ac5d649458d363edc5c2836efccff1e7df83c12d9b552978b3531f2ab026430b3222b3dfc00be0e4700031e6bc50bdb60a739a68c9aa";
+    sha512.run = "57f4af4c26587de194ea1133353d080070ebee2ab59abfd418aec519c0a5708096cbe0d3c0f107279df96186e05b8688280369f90ae53a4e533a22f2702c4e71";
   };
   courierten = {
-    revision = 55436;
+    revision = 77677;
     shortdesc = "Courier 10 Pitch BT with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map CourierOneZeroPitch.map"
     ];
-    sha512.doc = "737818c02e35e5502eca7bd80427fb814f54d495bd1315b124ad32a033da0ba0b9b4a2cc5a1f8c19b0f8d91f8534a783253742728ad1c8499d97e14fc3a67938";
+    sha512.doc = "fa89e77a72f0f10faa2f6dcdd32f8792844d1e3f79aab5412c4ac208fb5c3fbf04594394bddabb33340f0bc58de1ce986b65043e20527548e968e5a73b8932d4";
     license = [ "free" ];
-    sha512.run = "06343c68149c28b8808a38d5d7f2a57e9bff996d836c90a352ed77da4637fff150a18c13b8807f401e3d9cc9e7ecc773275f8ca18e2dc8d315ec5647c3f6b55c";
+    sha512.run = "2ced2fa56d7c0c933d0c15ad4b26b062ce4d860481c6b4981170ba388312f7943d6962b726b81e38294230a26d6aff914c21798d8e56e3339158bd5ac7ed5745";
   };
   courseoutline = {
     revision = 15878;
@@ -14626,14 +14649,14 @@
     sha512.run = "148a4c17ce567327825b8a846b7e5972493c7b661f51f71ba55bbb4979c90ffefddeccfa2a324b88386ba66527757f2deb62381a0e1291a7eb1df381e19d11d3";
   };
   cprotect = {
-    revision = 21209;
+    revision = 77677;
     shortdesc = "Allow verbatim, etc., in macro arguments";
     stripPrefix = 0;
-    sha512.doc = "e8a5000eb9a538f95bf6df4e2d68ecd8769974192e8181b6eb40e5f48b2cc3a9b9d405d1c7b611e35c41dac5ca5165a503efb7584ee94289ed3255a9482b2b2e";
-    sha512.source = "a9c10d5437f4a9f55680fc3a9841e9dc665b7b642e2831c0bb6239d73ea08312eeae372cf95591d002fa7dd51ae45e7413d9651ea5d60e5837903adf565364e0";
+    sha512.doc = "2e721b13bb06207e418cfa9cd31645cffe217fd09cdf7ad2478c1b804ecc6c82387af4bf75be2fb34aafa69111f032d6bbb6d935d71acc378583b90c19bd2ff0";
+    sha512.source = "6bfd59c745efc653f009ca90b785e0f0f5169cfd824e9fd6922b39aa85c2444c63ea87a4794b5108b75585c92c1248b04c78942e0b498841bdd5844077110582";
     license = [ "lppl13c" ];
     version = "1.0e";
-    sha512.run = "f4795674aa97744b0d6ed70bcae83a1ce3b41670a1bff2e67d12825154bcfd7eac2a740996bcb4aa0445697a3e4c17ef3d8606b308b7db3aea263269a7e2eb51";
+    sha512.run = "0f4e212c339c8273adac7391fde6ed4ebc005c0a1296e79b8c7e58495e92824fc80a05e07bf35cb51af9474cdca1973c0ca0d05a72d764d6b3c81ad9ed83f21e";
   };
   cprotectinside = {
     revision = 76924;
@@ -14644,6 +14667,15 @@
     version = "0.0.0";
     sha512.run = "e8c29b11869f326847e9a0487e7d73b5ad98a397206035b33095fcadb654209cd141b77a36af6b161e028072947f5fbde23062fdec3b531d594fddee639d48d2";
   };
+  cqjtuthesis = {
+    revision = 77776;
+    shortdesc = "Thesis template for Chongqing Jiaotong University (CQJTU)";
+    stripPrefix = 0;
+    sha512.doc = "197123a7a5fcccdbbc5415600b2a35a7b0227baf83c1986fa1e4d3f2b4b6d4391bff27401fee64ed956684161fbb9d34f24cc854a0c69932ec1b2e873e87cd2f";
+    license = [ "lppl13c" ];
+    version = "1.0.2";
+    sha512.run = "854fd591afdee81ca087d5be783daf7f938ef0db00e160d984d5be5781c9ee6fc9e3f7cfba872860a62eb61902d565506f168befcf82455d99a05bbe3b6aea68";
+  };
   cqubeamer = {
     revision = 54512;
     shortdesc = "LaTeX Beamer Template for Chongqing University";
@@ -14687,13 +14719,13 @@
     sha512.run = "2c1c1743869240b2df8a4e5fa77886c771e4b77a0ae64910f7ad2e1e595b74b8c482ddf1c41482e8aafa405cce076b8470873b10217989ba516cc130cdbb998b";
   };
   creationboites = {
-    revision = 77191;
+    revision = 77775;
     shortdesc = "Macros to create simple tcolorbox with some customizations";
     stripPrefix = 0;
-    sha512.doc = "fa3404f1dc8316face40e35c29f67f3b9913c7a5ac23ff3544b2b0287f2a83c7e5450c76389d1558d1c90e1aa56ce18e4ba8e9afcda9a6235ab80bd76c006c09";
+    sha512.doc = "389560cce2f1bee55166c2cbe79d6c6510df51b0ee90b48b4cef6dbf2196bdd0e69ac582802cd13bb475ed02a9f8fefd0aed7c4b8dcf2074ba00a114c863f6ac";
     license = [ "lppl13c" ];
-    version = "0.1.8";
-    sha512.run = "eba56ccf6813669bb4235e74e7b295808d2bd8123e7256432ad7b277e8a274c8bb7ad9d20defb20f4c5f745a12dd8d304e5f38e86e30ecf614b13d3d167d2988";
+    version = "0.20a";
+    sha512.run = "45710d2c03f46da8868bbddccf19b35173884e83993b82ee30958874dfb83fd3bca71bd14bf380925909cac7394a55ae061917b018869b0e56b4a81c0df955ad";
   };
   crefthe = {
     revision = 76924;
@@ -14732,14 +14764,14 @@
     sha512.run = "e119ee9df715d799231eece3e5c5c0c125077b9ca526d1293f943dd2700b45da0bbbac90a964248415bf9cb1a51923bef26995acf25397216edca531594d321d";
   };
   crop = {
-    revision = 55424;
+    revision = 77677;
     shortdesc = "Support for cropmarks";
     stripPrefix = 0;
-    sha512.doc = "770ab2977a4ddfdfdbac5f1107e01b8bd5858a31747d44bf0186565dc79becbefde2f34a9514dcf214b8eb781390e98d5f5383f2e70e393ddc22043d4a0eacfc";
-    sha512.source = "1b1f0e6a309d1657a12f9760ce2a01ab370de1d34bd628bc066768eded3d7126cbd1f8c38d315fc120c58d73cee48fbf2515492c218a6510306766dd83861b15";
+    sha512.doc = "e3dc466125ebcd6631cb556c712906459fd89e74c81553a828aa187d588d0ac676ea132184d9b0e25d6a640681b3e3c29eb659c50af0f4175acfa9d9101d1199";
+    sha512.source = "bd59ac5c9ee90c6904d3febc54140e4489ed666bdc7c54436ff753a6238192d0543e6be094ce0d8109a6baadb2fe5dac7bda732f32e4b191bf4741d8749de909";
     license = [ "lppl13c" ];
     version = "1.10.2";
-    sha512.run = "f6161e7688d8853d2d9041cfe26360b71a920028df673d04ba38f258c810021752bb7282757ceb98b2e62f7ae52a5f4abcdc61333081d77b205d5431ca62a569";
+    sha512.run = "c66804c7ecd072405999c1d7679b995d9a27d2bc0111d7bcf4c0f99239cbc88236f56b7d1e385c78c7f5559e127c0b8de47b456dfab3a812a9c4f5f39a114536";
   };
   crossrefenum = {
     revision = 76004;
@@ -14763,13 +14795,13 @@
     sha512.run = "e34b4d383b8398880b962cdddf248c95f2bc7187b5ed4f0caf84655a94f92b915906b150ef904c696f49f22ef23c039ee66427a03b1430f7a3d5f619f2a80d01";
   };
   crossreftools = {
-    revision = 55879;
+    revision = 77677;
     shortdesc = "Expandable extraction of cleveref data";
     stripPrefix = 0;
-    sha512.doc = "0edf43d8b68decea7d83cf5eaf2f92f86635f19041680be4a511a57a7751dd40efe4b4ede05a898c2e00f91076caeb3f4b39c444d1ab8b05a4f0471913e4b475";
+    sha512.doc = "e9a6b0858646a8a192e14d2f4eb28588bcf1d89eb9cbc5c52bfb89730d1966aa598c22dda42f8f7cb3cc7c6d028e880b51817bc843eefdb4a9ae4fd18cded20e";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "50b8ce01e9bbfc1f3b4ec9093fe0b091780edbc197a9c637b98a025926600459c5f0b22f5683427bd0a4f0a6ddacadf77833f3171d2dbd45ce43dd6e1d80d813";
+    sha512.run = "b15756efc387d2fe23a20adc922181fff75fdee646088c035df56c1451039b3d05d9eff58871a9ebd451da6dbcadbb66016ef109689a9d16a824e7621974854f";
   };
   crossrefware = {
     revision = 76407;
@@ -14788,14 +14820,14 @@
     "ltx2crossrefxml"
   ];
   crossword = {
-    revision = 73579;
+    revision = 78222;
     shortdesc = "Typeset crossword puzzles";
     stripPrefix = 0;
-    sha512.doc = "d509661a9fa998431a7ba7ae6cce4d1382a33a8b437f1d0c69e6ca86174bc9b0a1e0133b5e9e436206c5054fe8fcf76a7029f3110fa33920dd2d9c5a054c2192";
-    sha512.source = "be2889c79b03d933340aaae35ba4c042a664f37249791fe1291511203ddd01ca2abecbf98b617141b94cf9841328a5b0c1ef0f3b5dfd047d962ea8c3363c9f49";
+    sha512.doc = "158332adde26c82bbed2ae45fd36181abd95c19146c75dd74c6a6117015c4f3cc9f14eab7ddbdcdf5e5986a624bf92a42e914f7893e9d8c0d956c4e089eafd88";
+    sha512.source = "02be4922b95af045372a244ad3eafcceaaeb56dfb1e1c67c911bcf89409c9bcf5a19a09631dda09b512fc1a2b3499c359a4a78d02dccbc06769e445ed537a710";
     license = [ "free" ];
-    version = "1.13";
-    sha512.run = "78462d7bb8329a11a406dfb33ec53c24f5cdefd338c14a7212dd3e83a574cff85cb0dd6f41c8bf868071542b46946518e315c9c107ac11adfb81c4f0225ac17e";
+    version = "1.15";
+    sha512.run = "9b9ed9bb1a8313abaeebca8d7f42f820ac7321e7a01b0241c6f2532f2d273b890905f95eedfd88529dea93411ad42e725187e8f7158f0ddc4a14d7ca38513ccd";
   };
   crosswrd = {
     revision = 16896;
@@ -14856,14 +14888,14 @@
     sha512.run = "bc956c595d4460f35c64c92e7730a7cc9cd3af95301afba56c49bcf8415666863de926733409ce1afd99ba767fe3a3fa45c68f2dcc912b69c6f72b618289fb30";
   };
   cs-techrep = {
-    revision = 77506;
+    revision = 78146;
     shortdesc = "Technical Reports in Computer Science and Software Engineering";
     stripPrefix = 0;
-    sha512.doc = "aec796fcb2809d07d4b7bfb5ab1435f577b88a31d5a905bcc6de9bdff387ab6a3d885dc60d0653f1206e160ab505f46b1f0b116d91b2940a0a38cd7bbb46abb8";
-    sha512.source = "9c3e7b7750a961cef7cd2da3a7c358c518fb0b4c097c029960822d2859eaa6a89ff6c9a271297d89d90a2616f5a83385c242efef14fc0a0d12fb94361dcb7d2c";
+    sha512.doc = "5397d3fd79f2d8cf65a13eaf3691db86cc43bfc0022a4647424b27f1597ff0218ff5663df7769383181dc7310ff11f0ca0fe116c5448469876b29349a100c621";
+    sha512.source = "0e3f2ff8f0ab6e36c9958b688a57348a69f63781abb78dacfeb7628c1643d145f264fa5ab524ae92ed54e004f7ff040e8af21d89599efcfeef10d71405aa921f";
     license = [ "lppl13c" ];
-    version = "0.9";
-    sha512.run = "03fcedb348a44d6b6a24373eca31ad0dca2d2994c5c14b0e39a126998e5ea3f5dc53ad610c0bb3fdf9407a8b181f24ab54bf700953d0934164922532da0c584f";
+    version = "0.9.1";
+    sha512.run = "740308f15c1c0678d6f6466b38847b0f2236a4c8bf7fbacec1f910d7a5249ebb086313d14497e9d86e38c292a2a78b7b811de86df8533361e02716dec0aa1431";
   };
   csassignments = {
     revision = 77161;
@@ -15044,16 +15076,16 @@
     "pdfcsplain"
   ];
   csquotes = {
-    revision = 71053;
+    revision = 77677;
     shortdesc = "Context sensitive quotation facilities";
     stripPrefix = 0;
     deps = [
       "etoolbox"
     ];
-    sha512.doc = "a04e7e2b031a5a1c336310a249e909e2a6cd8d7f67f4eeff7fe9d17f25ad0340961b3b8917bb7052aedffabf727f9b328bedd598ae0bb2804ae87b2e43de1d92";
+    sha512.doc = "edd0ae3c8e979d157ebd0bf852b96a5549437174a013e49aceb0113a9cbc1680b61850905d85dff302d0a6fa417569d395146d1a761b4becd3ec69d7ca525c68";
     license = [ "lppl13c" ];
     version = "5.2o";
-    sha512.run = "237c2c7034b1c676e17ef1dacf70462c7c6e995adff22f59bd4d17125de47a13ee7ad84f6fbf83a659e226b88ae13c6333977f3acf0fab6bf0cc11d091b9055e";
+    sha512.run = "409b8ed3aa3e220e6e6c02abff9891825d5fb17d9262516badca2b55830d133c4a10d56ab10000d1ff2838153091d468f6dd3cc65a4bb48f3ce56b98aeb48f15";
   };
   csquotes-de = {
     revision = 23371;
@@ -15112,33 +15144,33 @@
     sha512.run = "f3f679127d912a8df32893f0afec13b21a272b6e5ed2d2c147e1bcbea5698e043d88d5dcadc0c772f5640945fdbbf4ff43655d6d4450b48966740cd3cb936829";
   };
   csvsimple = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Simple CSV file processing";
     stripPrefix = 0;
-    sha512.doc = "9b9e4f0693014b26d8fe76937d2a3edfb9c6c86b1ae677ff38b1d23dc2b073ec487b13014ade4803e4845ace6bfd9f0f02c98190c0974461062be6749d97de23";
+    sha512.doc = "04e5e1f633cf8ec52655727817c63c6d9bafa545be126230f0b4be7df4f1013634989d6b4ab2df5f90112cb2a874ca92ba183fb6c252d782cd92215e3b3c5eeb";
     license = [ "lppl13c" ];
     version = "2.7.0";
-    sha512.run = "ad92fa6b8785ad5ad6efda4762cc805b4beb9da8c1f244f4f4f498c626211f457a32356344c78e8876d63862ca902420eb52c94ffe1b0b2f5e2add4b3157924f";
+    sha512.run = "06a87ecaf4b4f6218caf187a68473e2e531a6dc658ae4d9d5cdd6a2769abcd35f165466e66701099c8335dc2e258503210072210735ad6de8ff9d0dac839df66";
   };
   ctable = {
-    revision = 76639;
+    revision = 77677;
     shortdesc = "Flexible typesetting of table and figure floats using key/value directives";
     stripPrefix = 0;
-    sha512.doc = "2c752d047579b63849b1feef1526842756a451b60aaddb9e889bc0f9fd57ee7375dc4edcf2cc9e4163e6307ffc18400de1fa51abfc0fd331cbca6868ea12625f";
-    sha512.source = "2d89c4eda10e81983617f85178ce91a3fc200ced5da9bab612a5f6571473bb19ab63a3f43f52d60815e741dc97c2f845f789f98cb875137c14d9e28798833d61";
+    sha512.doc = "0709bb7862ba7a70ec9e6f6dfefd94b05e30367a1f34fe824b4e5a6eae0176a937e1d2f35b62df41912352d278493c317896ef7871bc82ef0ff30b0799670a8a";
+    sha512.source = "e34594ecfcca10590606a6cd1c16e3102bac3bbdb4aaf6219520f3494f8dfa8b2d28b9a24bf0e70d4d7c8aed69585b15245ea2ac4d88447df3abbe089d6cfa2b";
     license = [ "lppl13c" ];
     version = "1.33";
-    sha512.run = "9f0f60c05c33b7c7553ab0e4b76b72c663e758fc45b9d5abb7ef65a530c83468d057b54c44f89b841945f9100d89613609e9095a1d1fdf1ef09e7b6a152738bf";
+    sha512.run = "2d4e0dfbb24d6198732e0667cf7f2ecf8c0252d9fdfc7e1bcf85b0acc2fb7ee21ce82795f793ee22f054e70d71fcfdcb93fabfe5645871f300c34cc41cd94dae";
   };
   ctablestack = {
-    revision = 38514;
+    revision = 78116;
     shortdesc = "Catcode table stable support";
     stripPrefix = 0;
-    sha512.doc = "2c74b9d2aa44b25952307e4593b4a792cb5d98b78619efef82ddfb134ee3da64de87973db30f3e5d5788ce5e6ef138fca2cabc4ed412c97cfa7b3dc6c3ed1060";
-    sha512.source = "c39356d4d78cc8121b20e572fe59879541ab533ceab64e68f17a346723aad4f73103df79b1711feb12337e5e2dcb56222b00a9b36ddcbc04fb5e946831340d6d";
+    sha512.doc = "653a8d7e0004bed22e8fd2de3fabc1c5afd43db4a2941155337d54cc21f740f3b7b650bf2200f63c6017f882570f090114dc0aeaf812bd8e31632f03d6156cae";
+    sha512.source = "d1f019610afc2334bf55fbdd64253ad2e603fe03c3e12952f5e7f4bf78004e03594327cf60708c39aee054d6a81db6ec4ce62f01f9b593e4652c3b8bfea64ad1";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "3485fbd1bebf80814645c1be3e7358a959637439fa17cbbf7c2478ca73c4312cab82eed2aedb5403dfe94b0cfc09ee3e9c8182c08d3708608a267da235ab30a0";
+    sha512.run = "36c5c4f53c621de1dc97755f48fb8726c144bbab85fb8c6ba9818db8bfa4685a4cde7c58da64af33894671108cb610292c20ac776febd468fb35a0b1dc2e8ddf";
   };
   ctan-o-mat = {
     revision = 51578;
@@ -15196,7 +15228,7 @@
     "ctanupload"
   ];
   ctex = {
-    revision = 71527;
+    revision = 77677;
     shortdesc = "LaTeX classes and packages for Chinese typesetting";
     stripPrefix = 0;
     deps = [
@@ -15237,11 +15269,11 @@
       "zhmetrics-uptex"
       "zhnumber"
     ];
-    sha512.doc = "bd390e8716fd3df9a5bb856ba1a943cc2495e7614370da388f0f423562033a6ebb0720ecbcbaecb2f7a4e6a4c9b392b3425b1cb590e71de120b62aa27facd6e5";
-    sha512.source = "0c41dc6a86ab4393bdb67c0fd5b609f97529c09a93c069efaa947b478e5d81c581aafd8122dcf50d7e1a44a28d19aebd3263ed7fa39f8373496b49310342ba97";
+    sha512.doc = "cb50a6ff7dec95361f482802d212ef0680259a5be1c71a135bbf87e39599d0ae35e613fad69e08541629cb56fef684c50bb070f04a7bc7931d2b7cb5a07947ed";
+    sha512.source = "4c4cf4d002628b798a955fe705f875954152b1792364d0edec5fa859a4522193e17b2bdcf69e100d1433814c14f7d2873377c6e48c552ae24d39d2fb8ef629a9";
     license = [ "lppl13c" ];
     version = "2.5.10";
-    sha512.run = "25865dfdf0142d564d92d04f408df5477acc9a70da5a795c4c25c5af1d6f77d8c6077cc598304b9a49509d20cd0fcbb1d8f84628caad6db9bd252d5c562815dc";
+    sha512.run = "6138fd734f7926d8938310d2f854bc7c2fc8e2eb0c48701c48fc8622878066b43f9ff4373d68b95d790de5523aed3d33a47e48b3de6c3251573a63af948141db";
   };
   ctex-faq = {
     revision = 15878;
@@ -15302,15 +15334,15 @@
     sha512.run = "72b0d55477aad038dfbeb83f759d81e63fbd62bd78bbdc062009ae1c8a17ec27daf6877a362beac07390d56adc66792d6a0c3afa85b9a12c4f4007116c0a2dbb";
   };
   cuprum = {
-    revision = 49909;
+    revision = 77677;
     shortdesc = "Cuprum font family support for LaTeX";
     stripPrefix = 0;
     fontMaps = [
       "Map cuprum.map"
     ];
-    sha512.doc = "b9a9bda8eab6087a134b3b0660282998c7c3fa7fda8890e61ba107b9f7576d85ca01b59664c1c198679151e01cef6ebce5b8de29644a2e249a6ca2100f526fe2";
+    sha512.doc = "3c1567bd9f77490a539ef705b111c1728468f6d788cc4b0c436574e29d1a5a161d2e093133487b24f64b5a224ad641c42cf245b13e7e4e786601d016b8154db1";
     license = [ "ofl" ];
-    sha512.run = "578ce2e5af01e81ba80c0cfcc0225985722c1515e8f98460a1cb5d71d8ee4630d400f28dee04bb505c429b13f5cb604364d26503af0b5d9bf98164b218b09413";
+    sha512.run = "638336c4303ced02ebeab23d96d0aadd46f6055ec5d863979dec54bb8bc1098b8fd5f00b1b38c174a8335e4b3270bb42728d95e5c3cd0f70b941121c4c8f33cc";
   };
   currency = {
     revision = 48990;
@@ -15323,14 +15355,14 @@
     sha512.run = "d975cbe846ad5708a3558252094f4568c3ea4c5bc840dea7ade74eb8f6d90f4527b417a875a7bc286010473078d895cf510560f1287013e70498c983c896750b";
   };
   currfile = {
-    revision = 70650;
+    revision = 77677;
     shortdesc = "Provide file name and path of input files";
     stripPrefix = 0;
-    sha512.doc = "85fd31ea536cc5f246a4c10f5b210b453787a2a8fa3057981a34438bbc1e0c970a40b7bcc08695243f50f0c976f2f10954791c8ad7d502be762b9259c36755c2";
-    sha512.source = "b64d81c83899e027196b3edaae17ec3d39d6010fee40b07a1c0b5b3cd34737072b9ab087f0484f22b4f01a4b85a3806b02a501a3b157e221895508965a1f9f81";
+    sha512.doc = "32a544d5833f3231eeba4a1eac0f08d13d9bd7a10a7165b930fd1b05963132c4836d75a4f5adf5f88413c2deef91262f6c5e605eaba653b29f726ed70adacfd1";
+    sha512.source = "009ef7a9b1a38158b493197108ee44806889c53fdc3583c189e75f8cfc7498e476557b93da7f4023eccae6483b986a727d94e7b0fb60bac5a659a1b02a23ee7b";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "58506cd2ce8d9bf2081ff1a7924a2ea9900f4d49bb9166c9e8d1c2c2f44c961d0667bf7e099c21ab32c34ef1b6fe51fc016dfa62df32bb2ceafa19c2a9c0bedd";
+    sha512.run = "cd74bc4e5c4598c38db070b4f888c5c56b50780df96f1dfaa70a905e01ab65027f6fc9cc13014df1a57f93a7d542c6e184e31cf1cb565b2f08da2e6f5f9332c3";
   };
   curriculum-vitae = {
     revision = 75698;
@@ -15368,14 +15400,14 @@
     sha512.run = "9d318d35ef04d171da1c36ab4646465d4aa0feebd90fd3e97db5f1cf09c28c174d0c3be288c369215812f51ca83b341abbfdf3fa44458d1994cf68dfaeef0615";
   };
   curve2e = {
-    revision = 72842;
+    revision = 77677;
     shortdesc = "Extensions for package pict2e";
     stripPrefix = 0;
-    sha512.doc = "6405f408e4963d24cec6de5a129152c1a1a28fff4e0d030b3f63180d05178e34607abab9333223694a1be3148d6b9113fdf3375565080efde5e295c27621d418";
-    sha512.source = "42f19f79942c996e140c57ad42f3f3c448ae796ac5158399825d235adffc1568d5d3e5849fe4962ce140f5df5140c6b12fb8a6032becc685496dd7535d2767fd";
+    sha512.doc = "8428a4ab81aad1af89b223d826b5f899ad41b92b91d8f6a513bec7926821fc618aea84f1a9c0cdf6a9daa0e86cfdd4810ed68a6bd9d0889ee3267a65935e4293";
+    sha512.source = "f389b85f18182c5d884d35dd6c5d0b93d6a257f33071b5ee77608ee2c8e97d6068c19006f4bed764170f8882d4176d8558fe46f37fe4879e2212ccd2d7c328a5";
     license = [ "lppl13c" ];
     version = "2.6.0";
-    sha512.run = "c2371efb065491fe30d7dcc16b6ed4ad0771c13baf41bece04a440d35881f5c50e704a50e7e1c45be66c116c47d067f3ca29342bc605c6202dd4382b0c3258b4";
+    sha512.run = "59e96cd3a0513f57b5dc2b8022339d990c31ff6c2b0f48fa10d4c97f3e4711058eb026876a8a143f8f85644620a24506b9299a24d7ba864d50171733bead948a";
   };
   curves = {
     revision = 45255;
@@ -15423,14 +15455,14 @@
     sha512.run = "bce5c2b8bc6d96f497cbc507506e62f5b505e1d2677aefc31ff5fe09aa8e3c6b33bf641712b3d01fb3007d269b9e7a16c8ae61a55caa78abeabfcbba189da84f";
   };
   cutwin = {
-    revision = 60901;
+    revision = 77677;
     shortdesc = "Cut a window in a paragraph, typeset material in it";
     stripPrefix = 0;
-    sha512.doc = "f37bc538e4affa716aa315535fad7fdb2bb0e5188844d028b8bda4935339965e3f375439ab0abc62d63f2f57c3d439a25888f29cdf3be484092a57ff86c86c72";
-    sha512.source = "d3a544d356d4afb5599379a1c767d2aed9ace420d4540a1c62b617cb8f542fbcb225ec4e42ab65f7ddebf91df3c77a6b9bf0f59de9e6a11e06ae68fddd5b21ad";
+    sha512.doc = "1ec4258678702510791aa100f17fbe6155752afb888c083721e33b31b3180dd2a03d2c604180352fd10738d9f421dd8c667cbb83f0bc837d953c91e3f793249f";
+    sha512.source = "cc57bf0a7dc5415b1bfbcf4feb788f4b162fffe89ae2c72010777c0d85bad39dc8c551684c635c762f34ad0e2afc921edf0abfa95798e0f1c2e9b0650fdd83c1";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "922ab4c0f1158fa699c883e0fd8ed942a077c3b3109b048087756895d0ab6ead05182fbe17ab19310b78691fd77444d1460c7e021689c2eab092ed82974ed6d7";
+    sha512.run = "e26dca3fc6299d686244bc9f8a38bbdb08cec79c04c981fdb95aaa4e3365fd1779e1c3487f4a8653fcdad54b00aec678bd9ca95bfdadb2899cf2fe15279f8ccf";
   };
   cv = {
     revision = 15878;
@@ -15517,16 +15549,16 @@
     sha512.run = "f3bfbece973cb3b9a3077c160b0212561056cbf7733e1c011b39fa1dbf94395937f4858964acd0874f1cd3ba283df9797cdf19e8e71e7363a7619c5ae653881c";
   };
   cyklop = {
-    revision = 77161;
+    revision = 77677;
     shortdesc = "The Cyclop typeface";
     stripPrefix = 0;
     fontMaps = [
       "Map cyklop.map"
     ];
-    sha512.doc = "1e537ca60e11d5406c1e106800f054d663f80edd8bd59c208d97a05af457d4dc75f7e4b23b05489017537b0377d543f7c34cf8d3be9d2e04b80b47112a99c7ac";
+    sha512.doc = "547abc1404bd1b7d16d738554f8594c21a5c7a838ab0107bdc5ee9f900e2f3aff51c8e172e485ad0011b3ba03d166bbad4d7a0b37ff6e06d637f1443ed5b0075";
     license = [ "gfl" ];
     version = "0.915";
-    sha512.run = "0565a82cfa56e27d8780469af713502eb8668139af2c9de146b5e9338f20cfdd6a74f522463d6a18118ac5eaf9ea85ce108bbce784818eac31c37aa0bd337f65";
+    sha512.run = "9043b05db99d8013f423b2224fe0f289a675d3a103e8e9b685f9440e5d2bbe19a6611b62c1436408ace651c6d47b0e639dd4eb7a4bd9c7e049398f5fa4455c72";
   };
   cyrillic = {
     revision = 71408;
@@ -15615,24 +15647,24 @@
     sha512.run = "578200381f685c3e0c8c43999de9cf38b341ad9009fcdf1ca8ba386d6f76403bdd4b1f12b9e13f591aeb00d649e79691ffa12530e38d46cb5785edafafd8e61a";
   };
   dashbox = {
-    revision = 23425;
+    revision = 77677;
     shortdesc = "Draw dashed boxes";
     stripPrefix = 0;
-    sha512.doc = "26672278ffdbdaee64b82f4e7554b5664ca3410ce8009454cfc229e3590439b4a4e212b77568605adda885761f5ad456bca022f198e259ff9a33b8e0abc1ea6d";
-    sha512.source = "833bcc8f98e6fbf3e205b54311dddb9377026234132e5f988abd25e3ace36b9f3b54a95e98a5c4cc40ef1f049536093b0f779517c6f5a63a08459bf0a7ace741";
+    sha512.doc = "f7dc7a48f16e21fa27215c51b26469cda6473a46e681dbc1e024160d31ab27bb8a403a013218ba37936d3c54752905a8c708f16777009fa3591b38b6a3c59762";
+    sha512.source = "357d47d22c10ef2a3f61756ade5c8fc31da36504b99d60e0e45ed7005bcc29e139215435be6e6328a641ef448d30e305bc9f3d2f3e6e0428fee022ac4a42c4d9";
     license = [ "lppl13c" ];
     version = "1.14";
-    sha512.run = "a52bac248fa26031db34686e57cd3c9be90bc18b41339d7e2dc85a68de1de23a627648599e5fdb207d3364b2b4e3651aaf9c2d90e6c3bd0f0fdcaa30fbc8932d";
+    sha512.run = "72bd703f0205fcf6ce603a4197af3430fcfc4a6dc51c21d48ca7c685e005dbca1f8c2dd150d9b0fb4a7d5095dfe802056ba049afcd413d63c041785c7f600071";
   };
   dashrule = {
-    revision = 29579;
+    revision = 77677;
     shortdesc = "Draw dashed rules";
     stripPrefix = 0;
-    sha512.doc = "f45e0785d7c6522683e724ca27f7505e3da6bf5923d5a8c71a75ef8c67ffba8a4e4711b91b64f25dca95566448cbf74b5937dcecc73f5ec0aeff7ace8d0e4c1f";
-    sha512.source = "0cf95a6d5fe3e80e9f77266033d64186300676d74a7cc39dd6f907784d1a6f7c9f83ff5a50198eec8bfc075ef5adecf58d226063f3f0e02f55dd7cc0daf691a4";
+    sha512.doc = "665e8bdd7f92f164f7f7dad0b754b1a432ee526569a89f7622eeb3bb7cd9d882160d6613578c0cb7158c875af3b7cd605ad2b2816252164888bb0d49157779c0";
+    sha512.source = "a2b23ae6b705832f6a82b6182720dad6bd34e6681de5a55b9952190f1802d7eb6c170cb1824cb30ea03d136c7ef2351e117bcf70395ad53a881736eb38df68e1";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "4b1b993e9044eb2ed4bf6bde0c114b0cd1fe7daed38f8bc5d3e25a2705d55cb41b8a372cce84b0d61093044d970003a4317de98cb468978c8cb1a8315f980940";
+    sha512.run = "d3e6509af2ea74e598483a72bae82cc3c5466acea490047511a1362cf0b7f7fa200b7836322e2b2d929ad61dc6230fec606742973cdcff48348ed2ac6608a645";
   };
   dashrulex = {
     revision = 76924;
@@ -15644,14 +15676,14 @@
     sha512.run = "e7484498a4af229ba4d7722af8f259bd21601132703cfc9887f3bd9696f52dd969da58f7250be00aa6a3bb08f5f6e7660e5f0c383ede2df5aceacf70b7f07693";
   };
   dashundergaps = {
-    revision = 58150;
+    revision = 77677;
     shortdesc = "Produce gaps that are underlined, dotted or dashed";
     stripPrefix = 0;
-    sha512.doc = "88ca6be34c5d68ee4f983b9385bd83047e59bbeb94af12d2bd16105bc8afb99b8e6db9d0e25717fe5bd517d7e834d8795bed30ba24455d8f09760d1ad2c47803";
-    sha512.source = "1fce3d4ccecef6c2f5775792162a9cf21951f0006e168df236884f89a4bcc662c1ab9028e856805ebdf19dd410c109ca3de993c088aa9c0611ec98565be06be4";
+    sha512.doc = "e5f88cbd17bb448d5481888766e61c76ae1475fb2603b798e024e7129cde5f3ef43ea69b41638332ce8467e9fae61ad4ee6d041db81386a0f0cefbfe8d3ad24f";
+    sha512.source = "69f55774629fc3728f3ae8305a08f7989c412c948c2a20c50b2d0b7156cc8f3ffdc86facc41768a0ede4a3025d8d106196a5bb6fcb00d0ad6ff5585cb26d8751";
     license = [ "lppl13c" ];
     version = "2.0h";
-    sha512.run = "c3ecf5c63fad14f82228913e0b12c6596a9aee24b6de3419a4e95de8de94e40e3d43c2b163a30cf221602ad9c1aa1c3ba42429ac2adac9d13888d74ee1f4e900";
+    sha512.run = "18637c5329e24a1da04033d4cf1b93fc54edf6e7e315e0d35b75c33fd498a8a8046a19389514b4b353dc9214c9679bf7be08406a9c8be0aae5351fb886dce974";
   };
   dataref = {
     revision = 62942;
@@ -15725,14 +15757,14 @@
     sha512.run = "6da6a802994a06e040d43ac7fc9db0515d9273ba9d4cac061e04b05922f9eb9fecaf138eb641b3149be7b98f9139c428084b6470bc177a020386e0dc053427b6";
   };
   datenumber = {
-    revision = 61761;
+    revision = 78116;
     shortdesc = "Convert a date into a number and vice versa";
     stripPrefix = 0;
-    sha512.doc = "18f2573f8c02685d20085c31384b75dd1ab5a47a5bb2b9dcda036a7cd1ecec80db175a674c1f148cd51a078721ed88a3c9b7a0915acd7c023c02ea9a16e2a1f2";
-    sha512.source = "7835857f1c4f3e59918fe9ecc903dc09139191b050b1b0166e4e1fbe4a5d0c95f33b8591f30012ef5d69af324e8a71cf24b39893029519c13e13d8044b191261";
+    sha512.doc = "c8ef22572dc8e412da3bf6ce6b13d6365098f1a7e21c53fb0532bfe7565bd1c3b399e939ac9e5ce0d599c43c61c8855f0f4497861d45434dd2dedbe8e4a8b466";
+    sha512.source = "2863d60ff81d0e12e01e1feb28e84cd2103371e978d218d0e79c2a003677e2ad6a8b1c9b1168de1cb6eb798c035fb681ca18fa0dd0df513e2f02386af82ba799";
     license = [ "lppl12" ];
     version = "0.03";
-    sha512.run = "5c7d23f949684000d0e38855e11e4869433c33f82fc42da0568d4b74fb0e69fe3fbcd5f72516222059ee446938144c18b10552290e24e077f2e624286e729d28";
+    sha512.run = "b4ae8efbd107bfbdc8371339b6d170bcab270f638b66a0f9db5fad62b86dfdab5bcdf6aa6133fd564e50716e24aba91cdb8ade4e5fc445f566c65340fd18c319";
   };
   datestamp = {
     revision = 61719;
@@ -15758,7 +15790,7 @@
     sha512.run = "3d033ee164d52f7085bffdc12f2062be7e94a644d9ed731b4d1b97a3a46838dabadcf6687063e165c65fc938a51a4adf8078339b720a305175d6cd6a3b889f07";
   };
   datetime2 = {
-    revision = 63102;
+    revision = 77677;
     shortdesc = "Formats for dates, times and time zones";
     stripPrefix = 0;
     deps = [
@@ -15766,11 +15798,11 @@
       "tracklang"
       "xkeyval"
     ];
-    sha512.doc = "d43970aea6c7971ed6a3564a6681caea0e0f5606607496d9ec51d6c2fa741dd6c28754c9e9f06cde0ad1a79280b53629eb427faf820d00549468a650cbd0eac8";
-    sha512.source = "511c10e67c7d77ee10d8d75704628313a1598636ce82a5ce114942854b3a9d2da237ed12fdab986f13b04ce3c2123933db91b850360b309aa52305575a7cf2d4";
+    sha512.doc = "ebd01ea3ccda9d965d6632dd6974ef977e6fdff41e7cb3e35ec2ecf990cada84170fdc88fb30f3ba95a5632c12a5844ce588f345b88b4517577080dd8e660752";
+    sha512.source = "978099c6643a7c570958632761df8761c38b458ef5cd103c85fc4f734b0a1023c3611c84deb3f3a758142ba772466e16a8ca8dd0c790f2999c1364c7df30fac3";
     license = [ "lppl13c" ];
     version = "1.5.7";
-    sha512.run = "7f2ad65f95e3881e5016647bff85b10138faaa7d26d097bdce0ec7b30cc0d913a43c2a45b0caa69a6669e54725122cf1a86117d0d4f543caba67058423af7f62";
+    sha512.run = "de0ea2b32985b3498f7fb87bab7cb351b00cb07f643ff83c8c833e25ef4bdf80736705ed03edb508c131d79338e6ee2bc39512d103569b21c9b0eb8914146cb8";
   };
   datetime2-bahasai = {
     revision = 46287;
@@ -16196,13 +16228,13 @@
     sha512.run = "2c3b56f2e2796840fec8a60b4f75800743a4d71128cb900ed7419a7a01acd306a9ef86c2b1587e661833f8de48ef89e22c11589af21c9abfa2cedbf709c4c340";
   };
   dblfloatfix = {
-    revision = 28983;
+    revision = 77677;
     shortdesc = "Fixes for twocolumn floats";
     stripPrefix = 0;
-    sha512.doc = "5790850d01d9f3734cb89146c23077bc852d84242352718ee655f1410ee84b77366bef133d8df49fd46ad976aa007fe2c4039a08035122f93e719c5f0f7563f7";
+    sha512.doc = "fd4799d565b631b38ad001678d45778def75366765655a69c564bbe3ee7bb9c5603bc1f27c4944aac3d831c3b6ed2cee68f744ae19ecb46fa6c3dd30444913c3";
     license = [ "lppl13c" ];
     version = "1.0a";
-    sha512.run = "05931528012077b92702926856b1e0d1aa6472188f9b1fbff74e5534a41a3260e53b82bcdd0684ff045aafaf4b427dab6d8e06fc7a5d11cb42a545949bc6bfc8";
+    sha512.run = "217a633d2b24c9a9b7893d0a1bf94f0273ec9bf1493c2c07a6aff660d96ac10ee3040b5c3db2539ac6dc475ba02e06658969bf80c2edd83a81c9eb592a9237a1";
   };
   dbshow = {
     revision = 76924;
@@ -16304,14 +16336,14 @@
     sha512.run = "c1b4f3851e859cf1a564d4dbc4a61363583e86c1903628de7e349d8ce4b009c47319315a49a2c75e3914dfd98e76e04029a8756d582a79f2a9ebd94764712f7e";
   };
   decorule = {
-    revision = 55230;
+    revision = 77677;
     shortdesc = "Decorative swelled rule using font character";
     stripPrefix = 0;
-    sha512.doc = "0c13e2ff2744ca2d0e32446a85cbec06d832ce1fc8af5a719f3c73ed59e1a85461d5f51d33fe5a51a89b209f80196ad52609e83adbf7cc41336f5bfae8c4389f";
-    sha512.source = "84ab7801ab7b0772ffa3520a42e132007e05152e206072fc1ebb43d8d9675ac4929ad1abb30d8111db7d825f05d37b038ecc923267c5095ed62a34cf3955dc20";
+    sha512.doc = "60f38f292b2dfab29c25204b5a11dacb9a7831e33e3a70b2a365113b3ba555a3b718d6e317bf45fc73e27d6e94d50da28c3a3c1f05e5d5c00cfdc0af3fec130c";
+    sha512.source = "f57655cd14d8e7886017bdccfc390366851df3f2c1a4f93572c410bfb162c4cc9263ca0a1244b26d05f6131ef0160cf703ac098a0610e3d942941b9eddf2286c";
     license = [ "lppl13c" ];
     version = "0.7";
-    sha512.run = "783f09b3810616b14f04dace838ed1ed2faf32ea4df84dd0973df375928e16fb129ddf6429fc54560a317da0a9422630becc92543e1a1da76809c4962c423fc7";
+    sha512.run = "be017364823222f47d13d089507a4470eb8dd50bbb82d9f5a2599e78e283f74c7f6f8f26f4c3bf4e0da6452706c13e0153c0f4434038f519fb2a4741e8ac922f";
   };
   defoldfonts = {
     revision = 76435;
@@ -16367,25 +16399,25 @@
     sha512.run = "2b1f6bdd423ececfef4519c2bdb9bc000d88ac3589c2135602c52e2217ecca73bb136844a7e950610692b7eeb1c43eced6f9a4812a736eaa31041d1d264d6b42";
   };
   dejavu = {
-    revision = 31771;
+    revision = 77677;
     shortdesc = "LaTeX support for the DejaVu fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map dejavu-type1.map"
     ];
-    sha512.doc = "7e3364a3e0863c63f2a66057780fa922cb53f4da2f81e42ce9e200d5a034854216f4d4b833756a6d4d6837385e48aa8d03f608846f2f95caa84a7ebffe3257b0";
+    sha512.doc = "1c07b84d744932c78672f210307cc6be31b2256d6c5ee35d86dd47631ab3935060c78d7b37f82c5db113e3ebd4cc0e6b6c859bea1fe02a8b268ff0a5c2ef0fb1";
     license = [ "lppl13c" ];
     version = "2.34";
-    sha512.run = "a26a57bd02b14c6e67d328c2c00174730b819f7da37ac147ec7f34f37195b6aa17e3223ac4d03617f5239700b1dfa45ca1741eed7b4488d2e604f02ac34ef2a3";
+    sha512.run = "40ec3fc1fd156a5f8bfa9e9f86aba655f113c2db62241d740a7efce9576ede3b6041bc78e5c4b160f5d447d1c83c207b2914f53e6b0d06619ee289778abfe8ad";
   };
   dejavu-otf = {
-    revision = 75301;
+    revision = 77677;
     shortdesc = "Support for the ttf and otf DejaVu fonts";
     stripPrefix = 0;
-    sha512.doc = "cc929319502c88e3f7e900feca018ffd95c12ed468ebdc1b720b89cc496bc5804cbdccad0c86b799db65f64f5fdb89275cb00c181093af9ae183fd4f4e0c540f";
+    sha512.doc = "817fe67cc35c1b0ec56afea3cdba7da292a86c15e9ba5104c56b82481448586e9c4751251e55b382714c63f51cbe57e4242473827d6bdeee78f0b64a7bde3cac";
     license = [ "lppl13c" ];
     version = "0.07";
-    sha512.run = "158d78190cc3986b22a31f329dba3b3e3a23488cd86a774065d46d9e781a170f9d64bc4c894d9c7aa5f3cdbfb7d7f57104f66f44e2c3833b87c2fd0eec89b455";
+    sha512.run = "f49a146a67e1b221ae901d16f98b933d86f04947150e0204b01077231b43191a74fa9820909a391487ffec24109387ca02bb554b79fd3b6bbc2a75b4c6775940";
   };
   delim = {
     revision = 23974;
@@ -16407,14 +16439,14 @@
     sha512.run = "248f2385a2f464232609fcc3c968e79e04bc3d72ed99e2aba421f28cfa88ba2c94f76294bb1eecbf2d8263a03dee1f86c50ff4cfd25a7c59c260284597eb7ab4";
   };
   delimset = {
-    revision = 74779;
+    revision = 77677;
     shortdesc = "Typeset and declare sets of delimiters with convenient size control";
     stripPrefix = 0;
-    sha512.doc = "ef5d4adadd20cf5c88ff52d7df22aab9e8bb2a523dfc46a0601af35817c2aecca398ebdc94a41f99def42dfe2832d202096a80e159271e86eaf4707be1b7b76b";
-    sha512.source = "1190ef21b4663d30f8531f6c801d64c89d675083609e7730a60a63b9dc049b313be50bff030e4d9d15afaaa16ff812b5eba8bef944a65bf9f264ae07c1c0776d";
+    sha512.doc = "468a21a9c5058e65466f4fc031407d67bc6eb355d06830d701033c878f6488a9b9af598d732bbdfcfd16c7a9be3a6e3202f0553cd9e92270f97f7827d3e71c20";
+    sha512.source = "31f00eb824c1bb543895b7d3147e97d5c17c525904f10910e457b08fba176b12613c30d8ee9543e4822dfd771ab3f651084ee5be73647b0b613e669452785e2b";
     license = [ "lppl13c" ];
     version = "2.2.2";
-    sha512.run = "b0814a6724e07075bc46f334e869552c3ec838b5cb5d7c48647ee2b4a1d63935db679fc76b54d3046602df0b750061b1d9c4809955aa69450f4ee5ebe23ec09b";
+    sha512.run = "d38ff844b6286a8a401103b6e246df6eb8a4c37255c3d63e6d5b4a0a3ab49858f7fa220bf5eae8195b5656814013504025cf0fcdd23d8e8d6ccc03a064e26888";
   };
   delimtxt = {
     revision = 16549;
@@ -16438,23 +16470,23 @@
     sha512.run = "baf744301a4c0df8b7e26b17f7187d80434714e00cd118de3f6742e6b084b026c7bf356b48d75c6b7a15d78ea85ceb4985983f71d43c2d3b8d805f9bb1214fd1";
   };
   denisbdoc = {
-    revision = 70592;
+    revision = 77983;
     shortdesc = "A personal dirty package for documenting packages";
     stripPrefix = 0;
-    sha512.doc = "d5fd445862e08a95f4d4cad1e0f3a4ddf65b82b0119039c9642848b8be524b54a1d0264f1e6c9f46643791bcd5272aeb443075e9de5247e96557bb4d09c86f2f";
-    sha512.source = "9454c052f589ba17f10e1e6698399f78bcf5f042e30b970c72e92de1a03f891ccb3a08e5e8920c6092c2aba1a60257f2c18154eaa1de4728d8742ac9702a2144";
+    sha512.doc = "6a739b3dd5dc2e013569940f6fd79a043afbbb28f02323e872af57287763c107b26f25b27127451dfa32ad8e1d7e3ab6d05afa92f8b2d1eac407131f0f91308f";
+    sha512.source = "956be5c157e845ca1ac8e71e3cbdaa1646683d31ebac5d4892b6a2669608d1bb13c92279dd7ef5043fc12d655506e27c88ddf57b3a8f16f0845a5c6ac118464d";
     license = [ "lppl13c" ];
-    version = "0.9.5";
-    sha512.run = "760e5ad1a11a2fcc9249611a4c24e1abc640e87ed928dfc3db7234ed95f499cedfd6aad42f6c3aeb5cd099e08396e167feb74e0000454350b42e4067f25854c5";
+    version = "0.9.6";
+    sha512.run = "1e6fb9a4be78aff1bd46c73aa63a251ce75799761321661e12cca379fe678504a47bad5bf79b69ce95d6a6b23b994b08eacdcd8d5c289f0e7c80b6ee00b3b1a7";
   };
   derivative = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Nice and easy derivatives";
     stripPrefix = 0;
-    sha512.doc = "a2678f10bf87f2781d0d565bf04856bc6a5f96c8223e1c192ecc602ed603d1ffb18c776e45b59e4d878f31a7df9689d1e6fd9989ce167ac83d6af5508dd64f3a";
+    sha512.doc = "fb9c253aaee21d3fb1f1d792cbbb07c30d002b294028bac606694c5e753c8d843ed76051487d9845fa1b9b2bc6a4941443db5a64b9a3d0443b78d0c35aaf17fb";
     license = [ "lppl13c" ];
     version = "1.4";
-    sha512.run = "18a1dfd491cf70943e909eab9b5d7a4a80e696f175983fc06aca0b012da2ae6e7c911810385e4c061bf978af7ebaf5d9f59c92dae450574ef3d1520a81d95dda";
+    sha512.run = "52f06c8898103d88dbe41ad8a2d284b18ba60e66db4620fd91dd5179e051f1bacb5ee59ab9f177de9f1d6ead03be5849e2d265cd51a2a9e6f839951ad7defb05";
   };
   detex = {
     revision = 70015;
@@ -16466,6 +16498,16 @@
   detex.binfiles = [
     "detex"
   ];
+  deutschesmuseum = {
+    revision = 77887;
+    shortdesc = "A LaTeX class for contributions to Deutsches Museum publications";
+    stripPrefix = 0;
+    sha512.doc = "27a4aede9c9ad5116b172fe292202a7a5a9fc231b5cc9b34024cf2992566e2981456ce02412acc4941c3dc39137fca560ca0dea130cd7de6930497e76a197d9f";
+    sha512.source = "c45a2a57bc7a4898cc25863572c84a3bcab00804118433db023689d99e72f458975d6d0b8b0cbc313f0b6ebc529f1e1c30e9bbdec88fe68c660232c2d8a87dd4";
+    license = [ "lppl13c" ];
+    version = "1.7";
+    sha512.run = "243f790d18f41036445c6d71ab498cbe92c7fd7ff2f590e72c97b52b8ad3cd08aa01458e48d7d169d802a4aba32bb5fce4a67330bc637352107cad42fb14eb78";
+  };
   dhua = {
     revision = 24035;
     shortdesc = "German abbreviations using thin space";
@@ -16499,14 +16541,14 @@
     "diadia"
   ];
   diagbox = {
-    revision = 54080;
+    revision = 77677;
     shortdesc = "Table heads with diagonal lines";
     stripPrefix = 0;
-    sha512.doc = "96310db4878e417f09e6202e5ca86f29524af5c1292ad8fed2563f1872e094be1249c4753eac5129c68492a5fe9ea87857783e2ca9af1ab77dfd1ca9b3309b2f";
-    sha512.source = "65ac012205c309099ca2f1a23f6446abb434a1a9c66a36d75d15021eead74feeb70c21024386fc11b223386100404b35a0ec3571d24aeec13b5513e60b11b3c4";
+    sha512.doc = "40a969771f7fd69322070addfada4e14e81f4d7507ea1353147afd3f5028a26574dda1e65174dd66e23f4cc478b2a8bcd3ef129c6bab3651435b5dda1ff07fdc";
+    sha512.source = "220c3c7b502999bf8abdc3a6816ae56e15201df24b3ec454f77e8ea50d7b909cde4ff9061686d56030c9d1821bac9cea9b0f7c0c8bdf6348b83fc26aca7397c4";
     license = [ "lppl13c" ];
     version = "2.4";
-    sha512.run = "34d2530343877efebe9ee53027253ddce0e59df3cd70900bf0f040905f34a8ad9d41328aa3c6ecbb622f7731f3bc9c4fce289caa58e2c1db46a6ec1bafefe6ca";
+    sha512.run = "b0b9d6940ebeaf0c8ed2656107561c0c3d0eaa62b7d3eefad877c8e52e57ec912cddeeba1b546707a22998ba41cea4dea66b03531bfc961c5c366e5715e2a738";
   };
   diagmac2 = {
     revision = 15878;
@@ -16559,15 +16601,15 @@
     license = [ "fdl13Only" ];
   };
   dictsym = {
-    revision = 69720;
+    revision = 77677;
     shortdesc = "DictSym font and macro package";
     stripPrefix = 0;
     fontMaps = [
       "Map dictsym.map"
     ];
-    sha512.doc = "787f3d06b1239c95022c8dd64f07d98cca654250f9846e70f2e7571def724b0e316d66d60289ebbcef204088d6f603d7702af36b985cc640a4f963adb7d347aa";
+    sha512.doc = "dbb5519107af13d3eebcff0af3dfafd22b8ff1ebb49e945a7dec21b3b57e6ae5e2fd3a1ff85749222964a27ed3d8305e03c79686e96a1d9926ac98be53c1c3b0";
     license = [ "lppl13c" ];
-    sha512.run = "1f1c145c9231616b8fd603604b252903938ced0d0a85f4ce2bf6775f123d47a153d0f1231fc78e965da56befd94b71901c5ae441253d0266fc984d47e9b113b3";
+    sha512.run = "a78d74e51149796ead89b9c0f101a8c6ac691175739ab404a6d6c276f15ed9c7179a9f5fc558a876fd307017e667bcd641cd075992c1b3ece901f708ecedb815";
   };
   didactic = {
     revision = 70901;
@@ -16580,22 +16622,22 @@
     sha512.run = "1fc88b96231c47d2cf8426f7ba81eb82bd3bba84ba2e5f9b03313f39d11ac75ea7b3950b7b4ae9bbbe122de09c998dcaf9d7d0967ff5a7ed125867057e6e3a7c";
   };
   didec = {
-    revision = 76924;
+    revision = 78118;
     shortdesc = "Fixed-point arithmetic with two decimal places";
     stripPrefix = 0;
-    sha512.doc = "1998ea299c2e958a7b07a9f926c2ab74fdc3c0511550d81e60137c5e9f3e8a29df9fcb7fcaf98591dc074f67da25e7ac92a134f323908d0e12c4d61739c82b5c";
+    sha512.doc = "1c286848049536ea3d5becce84bb0a669675da074bd29eb8c0efed1ee8134ca17e8ab2fbe4c6234de979ab7410bc259353ef383dca5ee043a8a7d401420f8e63";
     license = [ "lppl13c" ];
-    version = "1.0.0";
-    sha512.run = "fbe4bcf01d6f7aba03190f8d9290d273ac1fb5d3f4e26c4ca1d9b6edd42a8d77a27e5eb498afba8b8f61e8f903b1aec765f3963ea91b7b6e77901baf66108bed";
+    version = "1.1.1";
+    sha512.run = "d777d0e78afe042cffe488f0de5e8e588db6144640b295d2271858501065e8d54b9aafa955f40550c6b330e473953dfe63ef0471ff094fda2a064c57ca26bf5c";
   };
   diffcoeff = {
-    revision = 77136;
+    revision = 77677;
     shortdesc = "Write differential coefficients easily and consistently";
     stripPrefix = 0;
-    sha512.doc = "952edf2dac655ace8ed8eeb861f88f200e5f8c4780ca58bae2737fb963399c05a375fc0b148c8148335623a57a0d69f8eb6d06c37a0f0622509095d4006b58a1";
+    sha512.doc = "21515b3efb702384db4a4c2772a3585ad892ee39808e3e56177412b1e9ee9b1666e43049c6866996b897310622db3dd50c1e742da93f9e795b3bba8baf4826b7";
     license = [ "lppl13c" ];
     version = "5.6";
-    sha512.run = "3f58827234a61b616bc0b75487b36a1c73c232cc0f70ef52ba7e1c5f9939c60285f78ba8d3a918f36bf70a35a22eb445ab1f5ac4f2932e49707326711cf375cc";
+    sha512.run = "85c0809b4a806abf65fd9f17ff93928bb49131c7f562d0089baaa9134f74c31777cb466bfbe51102ab2b2ff859a54ac814e3d5eed5d3c912d9f3b74dd48d4878";
   };
   digestif = {
     revision = 72163;
@@ -16670,14 +16712,14 @@
     sha512.run = "0c2679265417acb042f81300895be7dc7d6b8d8f0bfa2ff8853b9c1adbb6bae78598c7eb4b7c2c91a9f95959ff7a7945f846e1f262f923d741e6fc77458be9f0";
   };
   dingbat = {
-    revision = 27918;
+    revision = 77677;
     shortdesc = "Two dingbat symbol fonts";
     stripPrefix = 0;
-    sha512.doc = "993ef5169759d86641e2a3185064f94df858d81d9b7ba4b0516b22abc51eab887b5d02ca487ad85b007e7ee3117563a257d80b803a361ea1d32857921e794b9f";
-    sha512.source = "01e935a99ff83496cd1e5c9e297d316f879fa8e54808c33a2daa54c78e1afc5048d3fabbf93450d15d6fed09eb59389348da266c751782cf017f383a97214d2a";
+    sha512.doc = "5c380f4eeeb41bced8a0c956166f35450b68498ade1c161cc4eeafcad679d41349cdbbdf5cb988a5a251c88f1bb0ee7d32bb12100db7392e231342af4ae486ed";
+    sha512.source = "361d582baf5a98c4f8b9990f5a98844212e2cc1fbf5f0d65fd2c99319b59ad3d12e03974b4beba7ebb3ec6a7806459e294e14a37db9d877607a0b4dd50177886";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "d6bdfc62eff8816e03eaea41ffbabf2d3af7194edbb2f9073c8d8b3d333c75f0b587a74556b916efb40afe41c88a8029f0dd764d7dc5894aa50e66e06fccb77a";
+    sha512.run = "8c50cd5179990183fdf6be6bb5336ee204ccf54e3b3a12c365403c6b1c489853730e2764505f89c139f662bfcff4e633126aad7b9b52b18cabc149d65cc5841d";
   };
   directory = {
     revision = 15878;
@@ -16689,14 +16731,14 @@
     sha512.run = "c07947f06fb08da461391cf6101a7a2e55875179c5d19b41007b0d11ff1881623e353b813dcca1da1f09e55beb80bf412f85ea6c9f7e3dd6e52a875770a5ffdd";
   };
   dirtree = {
-    revision = 42428;
+    revision = 77677;
     shortdesc = "Display trees in the style of windows explorer";
     stripPrefix = 0;
-    sha512.doc = "9edfb6fbcf4278c2b24599b58e10f64918d901bdd19dc0e9e8c8bd77756f2f3ba5dc13e31fefd2bd5f1467a0fb0dc0e765fe4e0515781103bdb1b81f687def7b";
-    sha512.source = "4939918ace772a76142674410f9a1e91c698e02c113517385814346399cc94e031384905dc2719d717ac1dc65ff04d1d5a7049408ec55e20b4c0000f4b8a7049";
+    sha512.doc = "559d3183da53b61c9a32d60fa2028f313223de58c154dd8f069b40ca3d252aa7241893eb7db41974acdc6762a11fd35de747538d696f3e366914c619c04c516e";
+    sha512.source = "3bb584d0020603291fe0485a6002348e1326fa430b5001eeadaaa21b77eb724a52ac0d03d00e277ccbf8c2df4b12527cbb67cb71eea6105159d4f8041413e0ce";
     license = [ "lppl13c" ];
     version = "0.32";
-    sha512.run = "5faecc2a6d79ae79929481c283b01e69df482267635957c5eb11c264d924ce299021d95baaf8cf6f9cb10e57f5fe14820c6b3506021b4d0213494bdeff5746a2";
+    sha512.run = "9576f06c260c516f71b82367e93a68bb6822c2d9ff6b15d54dcc800bacaeca0d929979a1ec682fc0d163f567384602a605cae113be9fca21e89bef570f3a39c7";
   };
   dirtytalk = {
     revision = 20520;
@@ -16796,17 +16838,17 @@
     sha512.run = "0b212fe2131eb4070e08efad7f1e0745d0538b2173b274a41c113ae6dfce46d7d1fc8ebd22f16b3a956570865df9cad668866fc2038687ad6c0b7b72e76a79d8";
   };
   doclicense = {
-    revision = 68441;
+    revision = 77677;
     shortdesc = "Support for putting documents under a license";
     stripPrefix = 0;
-    sha512.doc = "162af038ac645790412ea0e07771c39bbc3706ee3ccd6b8a496b166e7ef51e7802a225b00f1cceb0bdb0c8661ab51a79d4eb40a52c0348f1565fc83dc7efed9f";
-    sha512.source = "2002418b83eb7117195e60a6f0211a395febe6455b210068db7fe1d99738820ba111e14fd6f61bf53020a78ce1bb7d0bd12b57294cf5081d37d5002dcf641253";
+    sha512.doc = "e52bba42aaca355c6486e5fc974342d3fa2d214fc5d25d039fbd9cffc7db5644a7baa5cdb86662c67c45e67a1d5d5af7823796b4cf6ecfa4428aec9a2d2efd19";
+    sha512.source = "80e4cd6d24519ebe69434771408aca47225b90b1b0e230f5407a0ee610c7c9906fc713529a7ed7460eef61f1f07bcd185109e245137f4381bce8f84fb98a717c";
     license = [
       "cc0"
       "lppl13c"
     ];
     version = "3.3.0";
-    sha512.run = "f312fe38842267c1a35ab506354717a0ffc3d4b2684769965b7b94ca5fd6b137d0b13fdc98943b1fe0f635bd673c331ccc53faf5667b75d1192d786972008dc3";
+    sha512.run = "48328ad45ce7a071b79c8831d907977f5d3ea242befe5e18b46fbef4343f01dcb5f9983ce0a1dadbf1b3aa17da08b19ac90d64f4255ee4811b766fc60c0e2aa3";
   };
   docmfp = {
     revision = 15878;
@@ -16819,14 +16861,14 @@
     sha512.run = "55f68d7affd8d82631eb0e67c6232330bdff97ea908259a5e14255058d88f9f745afe55bd4a15eb91bff959b7cfc31835fa22196d3d0edcafa40da521b3105b6";
   };
   docmute = {
-    revision = 75878;
+    revision = 78116;
     shortdesc = "Input files ignoring LaTeX preamble, etc.";
     stripPrefix = 0;
-    sha512.doc = "92a657cbbcc99cc9e25c72c98006fa0469c4d66eab9f63c3262d8eb2704e660d53d218f311cac6b0695a88285e3969ff56483c89567e7c21a29420f659243e9c";
-    sha512.source = "524c16d3471e1156a7c11f370af4523e66373c640940056d4d95a11c5996d53f464f9dcaaf346b6de6a11dd9bc70097e04d7bbd2b4143921edfb9f7beacd7cc9";
+    sha512.doc = "2365165bdd587fefd66063260400e73031c6a84b5999018092280ef3b5a68321ced86753293cbc121758a0ac6c1a6fb48557e527a869962dad274ea2cd45ade4";
+    sha512.source = "0e9ff026490ebb46f5a82331ceee40e1a21e4936f6bfa9f8feda0a03cebb91ee31647a35bb5a1ea962024e9c62b2444088bb9f4b8d27fc7d9bc24bfc9b7ad3d4";
     license = [ "lppl13c" ];
     version = "1.4";
-    sha512.run = "195bf838e9cb27a769e03f5103bbf374af2401cfe1741ff3e93f08c366d8d3a36f196b749b08776d884821f1b1b2898cb1e849775849f70cf0d3f1af190e1666";
+    sha512.run = "fbe7debc8f1cbde8d8083a87e9343a9035406d60e721cee361130bf964299da7681d2a6e8add39d70849b2fc0ad066262182e873cfdc3fc8a3b07afb6a212d51";
   };
   docshots = {
     revision = 69676;
@@ -16881,12 +16923,12 @@
     sha512.run = "13a31f6925efd5cb0e0ccc632d7b8ff80e15a2e95399779ba33ee6e0f1d3c1a3f4a397dcb7fe33455471ec65e6fbb18d681349a43b24a083882c23aed5a0b036";
   };
   doi = {
-    revision = 48634;
+    revision = 77677;
     shortdesc = "Create correct hyperlinks for DOI numbers";
     stripPrefix = 0;
-    sha512.doc = "3dd77559fbcb32d8bee7121f62bc37ca14c14c8e62f8d2ba44978438920dcdd54605a543135a6294e2ea9742f5fde4862a2efe3eeb6bf22b6d7418b4b01a2ebd";
+    sha512.doc = "3ab00cf4e568631010957221fc55a39059bc8e24fd6f53bfc5ce13f9ccbfc4ba7cddd4da59a73930b79ecf0b658fdb59f43ca027ba3c1c43d1cc9a326de6cc5a";
     license = [ "lppl13c" ];
-    sha512.run = "7a041a56ecc0f88d5200d39d7611c74f955e79e5f5f887d26a70c76624c334b6229f7b937426cbbabfd7de7ae0f9cd2aee70c502981c46fcc3f18fddd62261bc";
+    sha512.run = "1beef909bf4f5310f0be49b433b4c8e89be1d06c3ea7c0e77a536745f01d28cbc74527f7a5d13a1de2bb972886bb2e757d9b55c21352a57dfe0adceced0161e1";
   };
   doibanner = {
     revision = 71919;
@@ -16918,20 +16960,20 @@
     sha512.run = "ce1b0f8fe35a76e05a6ff4e1744d25ad4ac5fe766926bc22db4d785558aa296bb7a845a1309cddcb29986785de36f99c0fad113ce9fc48fff154ad39c5ceb44e";
   };
   domitian = {
-    revision = 55286;
+    revision = 77677;
     shortdesc = "Drop-in replacement for Palatino";
     stripPrefix = 0;
     fontMaps = [
       "Map Domitian.map"
     ];
-    sha512.doc = "81af6be4f2707ec5d46d5f78d459f42d81e0cf62a17a8e695e42b666076637183447a9f1888b3f4c84e4832362eefe01b8d8dc5d748a640eb8e20c72bdfc1f3e";
+    sha512.doc = "e8c6aa0ceab528095b4bdfdf59e52cfca7c7d350175fefb2c127196868d58da524af8e19676930f1202b928bfe8f2e020b005488d9df91abf499ecd072153164";
     license = [
       "lppl13c"
       "ofl"
       "free"
     ];
     version = "1.0.1";
-    sha512.run = "f228d1670e7904b08ba6064d0d1e8c23432fa826d52229d575bc2067e27adc904c3684d76889a8beb4885c3c9de5cd4a5004b9afd3f7140ae5e90d36b4961b9a";
+    sha512.run = "8b348fad97a85d99aa8d1521c3d12f217dbaadaa3f4c4941465437766ea3fed11ac32f255c235c46690c4bbea1890a4f34f768f204444bc0d1d1bb4d63b1dcbd";
   };
   dosepsbin = {
     revision = 29752;
@@ -16966,23 +17008,23 @@
     sha512.run = "43ff7e4e163764e703673312a1213c50f0a77da98f3f36b726e87042d082f3d2433e35156e1c963d1c6287aa4cea5ccc64f140f89b82569b0552f406b29813c9";
   };
   dotlessi = {
-    revision = 51476;
+    revision = 77677;
     shortdesc = "Provides dotless i's and j's for use in any math font";
     stripPrefix = 0;
-    sha512.doc = "c77fed1f0b8ddbd6ed141fe8c9f914cbd5592820ffe3e457ecf35952817149d1315598f449dfe0e15e0e50328e45b408d3f1ef91fe83154f5374bcc62041ba77";
+    sha512.doc = "c32d64c0b586d0d71805ff428170ed735394047559d9a7aaba1ae63bcd0a2eb84f6f5581b4fc6ff4138523d3dca0c9d3f5345fc1341e6d3c85eb02fee5c68204";
     license = [ "mit" ];
     version = "1.1";
-    sha512.run = "348be296d710fe22d8122b45437d91027913b90ef36fa7aa365ad49dbdea566506c80072623ccc95170227e77ee2fc2fb3f711772afe4e7e7b83195eb3110b61";
+    sha512.run = "eca4a46c2aa0277775048f474940bac6fb0c4cd1626ce50b55082e2996ff270a8f8b190cb6a89ce5f522114d3973eba2a8f9e3347582f7286ace5c8f40d34a62";
   };
   dotseqn = {
-    revision = 17195;
+    revision = 77677;
     shortdesc = "Flush left equations with dotted leaders to the numbers";
     stripPrefix = 0;
-    sha512.doc = "aeb026d83497b78725d623b52223877d4d5a0a745312511f007d69395b87ba5362904cfa26bb24f2f2c7d0e0ae14bb82699d6108533260d736c0e85bc29ceff2";
-    sha512.source = "7cd2a4a2001a38e999e0632222116f32b559d8f004c9e378493d84486028e5c1cd5268f63a0eb93f9d1402b2c2e11b2db2429547f300809cca3d9f39efd6b17e";
+    sha512.doc = "e82c7e81647077dba29bab49b35fd84deb9bc2057355f7abf3efe4417f877f10b8878c377f7b859dd8446d6e0474f9a5a6529c4ee3ee42f11b0a0bc278f00eda";
+    sha512.source = "175d131d039f332587edd8d7c25ffacad54b327231497913781dab14657bd007153206bc46d0889a22ca64401d49febf9db46790bea9361ae71194ddf5d4c27f";
     license = [ "free" ];
     version = "1.1";
-    sha512.run = "794be5110d50ff9134471aedec8adaf7267f112012d962ee6e1cd7ddaa36cc37d993517cf4663686c90df891fe2e912d260cc9c9945aaee25925c2915afcc45f";
+    sha512.run = "311fd0e9c9e75ba759d8fc315b3c71a04bf616402ee207d60f001878a0db1229d02edda62ad9d51b0799fa59a1f63afe92fb6f9154f2ba695afd6d1ecb9dab46";
   };
   dottex = {
     revision = 15878;
@@ -16995,16 +17037,16 @@
     sha512.run = "037586577425d8a38a2170bc4bb9a7fa28a7886ad852d1c85483f7c3b625321c41a204b613479382ff5fb9e8cc3f8f9d8ff6e0a07c14b71ce6fdc68280515e33";
   };
   doublestroke = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Typeset mathematical double stroke symbols";
     stripPrefix = 0;
     fontMaps = [
       "Map dstroke.map"
     ];
-    sha512.doc = "2cf0cc8936393be2b01ed06158b250a43514098aeec4007bf493bd9232fda911f4a59f45716fba5837e475bdc39a86cf6e1180d4220e6aef26ff9e0315389200";
+    sha512.doc = "21fe7b96a83017dd33a523c11bd0094546943a2323f34db06207b304b533d97814fc48305b2f60a65a31a0014cfa9dc231a6901545d5997bde6893e9e50ec1ee";
     license = [ "free" ];
     version = "1.111";
-    sha512.run = "ff1be47939d9a2e8ec4fe8e6852d9fa31c2776511de158611ef8b853ac73291d1aa4ffe81985bed60c75a16e3cfc963a3a8ce3fb9494dcf6664cd6d92a549e73";
+    sha512.run = "6841b23e6c2faaa45acbb578ec578f4762f12be8462842d1b27db19371194813e191c955a837bbd726d4e424693c1339e77bb2ce78143e1099483c97f751a6ae";
   };
   doulossil = {
     revision = 63255;
@@ -17065,12 +17107,12 @@
     sha512.run = "d102312ce1c70eeb9cfb279b065197ebd3ec6d3f54a47de55a5cb9828e76b2e690823a2ea19a935151c972f791783fa41a55adde03aefa54eb2b3fe3da0ea677";
   };
   dpfloat = {
-    revision = 17196;
+    revision = 77677;
     shortdesc = "Support for double-page floats";
     stripPrefix = 0;
-    sha512.doc = "2cbdb8711556580d14a01b9daf03b1a1095387c077413b2815bfaef1af2781fc8bc56fa7a6a36abee60d6ce6928f920c9d9c3deecc2e071e8e99d51c1421508c";
+    sha512.doc = "317b59ada5c59617a600f171f9993603d017551b9d55b9806209757edb15e64bbdb4478f0a7987340c9d083e21947dba724112c5081ce6b20b4c7d30a27e4b05";
     license = [ "lppl13c" ];
-    sha512.run = "df136498f7ba41b1335ac109667d07dd9584e6682e1d75fc82a80839bf0f6d7a4de1f5750aa738eefb96d14d2adea20a3ec9fbc92130481d9bce0abb6c6f175e";
+    sha512.run = "5220f0d0032682ed3f7d6eb23d664a83f3b34e27b88cea3af318c71ed1199ee1668b66c7da3d5f1f0eeadda1563d712b85d9ce583a36438a50a82ca1c25c5153";
   };
   dprogress = {
     revision = 15878;
@@ -17112,14 +17154,14 @@
     sha512.run = "6b89aaa2511bda8bcf9649fd5a69f01474c48f26ff4cb56f0745b1de7e69a5daacb0e7bb3af8d71123bb77211f405affb8f1c7adf3904c33c566952e5e55f33f";
   };
   draftwatermark = {
-    revision = 70393;
+    revision = 77677;
     shortdesc = "Put a grey textual watermark on document pages";
     stripPrefix = 0;
-    sha512.doc = "61dcb253a71bb10206120be8ee5d4309b651438a2c78748e19faabbe8bf59a95118107da36e197928cce632673af1c3332bb5e1e77d40d63a6dd34f3d7054366";
-    sha512.source = "b06c64e358db6627bc4afff503b941238a8b1301a9db0673e6b4feaaf42c3f52c76798322ce104a6c7cc3ec851cfd158eba802b8b4d001ab8042a75fb26ee91f";
+    sha512.doc = "e34bbf0f8d6a60270f03b820ddfa3fcf52ce90934aedb408a99ab75c40e01e4471add96181ba4e74787f75a9517c9fe430c9bc2bb4f1efa4669250133f0c84f7";
+    sha512.source = "5dd7c6a6a2d8553d36ea80f0f36046ac3dc198e2e2d44b63151a83957cd33c5e1a7b166878eae86b80634068564f8cace2c14c2f2433d7b0e3beb480fef7dfc0";
     license = [ "lppl13c" ];
     version = "3.3";
-    sha512.run = "b71db5f292b57de2d6149a5ce7ddbdf281b3d7304e2eb59575a3be6ac302f79aef4430c39df89115c0b72d66cb4de6c68a4253acb1b474c75a4d78586fdb358b";
+    sha512.run = "355dcf447a1edec82d2bd471cae447d8ac061c9570de18e51a8a6a38cdbc7e267bb4ae60b524265ba6638b97ca03ed8b3588a165154340afcfe7e0c03960a18c";
   };
   dramatist = {
     revision = 35866;
@@ -17176,7 +17218,7 @@
     sha512.run = "662a2593713dc02debd4702b5184586736f12200aba4079154e6890b49d581810e1a7a94f0d3b6750ecd241dc03cd5a638a3ea5bd4792f13829e7812f5620b36";
   };
   droid = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "LaTeX support for the Droid font families";
     stripPrefix = 0;
     fontMaps = [
@@ -17184,13 +17226,13 @@
       "Map droidsansmono.map"
       "Map droidserif.map"
     ];
-    sha512.doc = "d1f86ef4fd82d955e5f6560b1eb56805bbea621358c3e708f5c07d6539d278a4e61fed680afba425a212eb7383bcdc1d663d492b4cd716ba2c1872f9006350c8";
+    sha512.doc = "bb8ae2287b9ca00bb8251b4dbcbb9d7cc118553fd8007b79b2bb95b254b78559a9b666a99c61ce5fe598a2af60550a4ef88e9d2c7a68830ed476b3cc732c95b3";
     license = [
       "lppl13c"
       "asl20"
     ];
     version = "3.2";
-    sha512.run = "e57eba23d2b7a84ca36be4b0a2988870a89b69a5c2f423d8961c8fe38c074cead0760c0061a545518959145ead02a13e321c5719cfcd7d6a575b7050cd74ef2d";
+    sha512.run = "bd98e336824b6b3ba52de1d4b85b3c1d8acf4a7b96cb84c32541b892baaa3dbe2c0b42b8b7c93406c5771eecf118423be87a5f4ccad92b73041712c171db4aff";
   };
   droit-fr = {
     revision = 39802;
@@ -17229,20 +17271,20 @@
     sha512.run = "f51353329034141f52c38563f79de526b7b47de3435e14dcbf91f658a0f64a7b23075e8cef98d0f948ab54b57681c7d9fcec417b59871ff908c00e12d1711b6e";
   };
   dsserif = {
-    revision = 60898;
+    revision = 77677;
     shortdesc = "A double-struck serifed font for mathematical use";
     stripPrefix = 0;
     fontMaps = [
       "Map DSSerif.map"
     ];
-    sha512.doc = "e831d9ba6233cd260cd6f212f4f8b3adb360f6d701d121d26f0de95360dd56ccf7e3a5fb6fde990d875e60ca20f7632a4badaa9df8e3b98f16bfa5b176308761";
-    sha512.source = "dcdf454c0d970338951b5b458df039ecc0287020fbf13c3ef46d2effc4aace39cdb424937d506783f572ccfd7cc136e9059e9894d4339b53f4b1be4b52d93579";
+    sha512.doc = "3fffb8ffb19e851fa059c9d36c4c8f6a82a9606c7888868cdbf7a6ff9b622fea11f0195af9730a1b50c6dec701f098e62e69603884b92297eff0e3109edacd48";
+    sha512.source = "3fa54ad5328ca9d10850c2ac0640aa3bae2812a19efbc72189a27c88cd81faeab276f04d6ea6a76a61d17597b762d10ac288853a5d636e12f2ba1e3c8ed2969c";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.031";
-    sha512.run = "7fa159e85b370a1327a8cace1a20ed54b37f2413e553dbcd42c6e75cd224da35b47402d89d39971873e888cc9f89117fe5403887299ad8c43e6bf2f706df357d";
+    sha512.run = "b7fcd72260fba84da48dde14736eb836774249a811bf2a338d37ec80395156ec19c2e7bcf6dafee253d646b9af301ca64fd726b79dbd71643a54c43fbc0aeb66";
   };
   dtk = {
     revision = 71776;
@@ -17323,14 +17365,14 @@
     sha512.run = "d38c13ed307b814009fbb2a1d47b59ebed0a96df056768eff11ca024703ed3054721b6c11943700610d5b05f74745c88456acd90ef8248b5530ba508d0cbaf11";
   };
   duckuments = {
-    revision = 52271;
+    revision = 77677;
     shortdesc = "Create duckified dummy content";
     stripPrefix = 0;
-    sha512.doc = "0c9e24cc988b9350d188878dd8b463428133fe30c00218eed3d67917ace24412e55c396422890fc6c02030378b560b3d374970e879e3a331db7d8e34b3302421";
-    sha512.source = "528db05e9c1c0232fae271aff911f35cd55f85bfcdc931820f5a74d6f490fa3fada99c274b36fdddc6163cad6f779183b0056b1a6e003c4c2737282fed608497";
+    sha512.doc = "d0c8a79d774f88b3c84175d084c204d796d9d76f2740d72a8aba50275ad11c4166937e6bdf5b939ea3535d57000152947f32bf5fe1a6134234c0c03f0f4e601e";
+    sha512.source = "3658624a8a7277f1a1de44909fe8ec3974b3b1e6b495495ea3cb6adec3b2100fb76ab8f9bac1fa047cc0eed58790fd7909bae742106a70a4b7b738aa74187968";
     license = [ "lppl13c" ];
     version = "0.5";
-    sha512.run = "77c975ea3e42faee4db5d99d692220884b24ccce2d69a30ce484d113cd261ddf5cf5a13ee04d9e8a95572e98c8c4bedfd901db34379af6a567777f9358e4bad5";
+    sha512.run = "8e63b1b5c15b2aaa72e601235bea8e6b7302e93d304b35aa8f21b5d5a0631f1e28d5f3c08dfffa119c119c1098da683c5af77a5f8f99e717fa48b0db02d2a59e";
   };
   duerer = {
     revision = 20741;
@@ -17359,16 +17401,16 @@
     sha512.run = "9f640f757d9e3fac6a048e632b525df2338563f69185c6fc07f221ed527000aaa641a9cf11874c94fd7fb5ae6dcda685e3d404c09ad6c58205111046a998492e";
   };
   dutchcal = {
-    revision = 54080;
+    revision = 77677;
     shortdesc = "A reworking of ESSTIX13, adding a bold version";
     stripPrefix = 0;
     fontMaps = [
       "Map dutchcal.map"
     ];
-    sha512.doc = "1ac89d2c4ef090edc8c354a3f869485d3af9c374da012fb51edfd22f0644d63a5c380aad115b6dbe83e70846904b722b69fe4093f4a7ac8a4a3eb1c1c97f25b1";
+    sha512.doc = "ad177bcfe701a27a75aebb01a77799e5050fe558ece18e01b7d638055030b04b5a00815e409921546c8d75b42709a59450ef6cbe493a280c54915e9fdfcde4d7";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "308253e2b148cab892ef0ea5004cce0c3e3fbea4c0555b67f49e554734b16bc5be9baa08119fd0a2186360cef20e165b5133ce85c793eceaa9955673ec4594ec";
+    sha512.run = "f7a717ef36b06acac4a74675279bc4814c97eec02b4a0d7e02233f0b22896fad4d3c35e9add69c53c7bcc05a94491f8e07330a84a10f36a593059c8bb851d757";
   };
   dvdcoll = {
     revision = 15878;
@@ -17671,14 +17713,14 @@
     "edtx2dtx"
   ];
   easyfig = {
-    revision = 64967;
+    revision = 77677;
     shortdesc = "Simplifying the use of common figures";
     stripPrefix = 0;
-    sha512.doc = "1a197fa61d347919b34bd8735f5265d058e5a932a638ca91d34f43ceecaa155b9277db8ea40178b37bd2bbcaec4f0853c2d42ebdaf16d37e223da45f305c330a";
-    sha512.source = "7fc5ad4208c6f1da261180edbe2cb1c11c8a34f87479199c7701986e516be43f05be6a226f75828aa2045a7fff0ad735b192e02e9739e381e8c64c66dba33310";
+    sha512.doc = "afdb6d1cf5bd569f1ef1de4904ef59fdd21e2192c1d0e65668b8f2f465e9c736c984f84f191df3bbd350642c7b79f5dff2fccf9008a7ca09e4f4fc215a04cae5";
+    sha512.source = "443e3d43b11736f32d940a074cc539c5359da141ea94c548c19e0bf0333ee222c634261f7953c5386c85d54bb10e83ab378efb8424e6d26bd758d151b99eb5a8";
     license = [ "lppl13c" ];
     version = "1.2a";
-    sha512.run = "37a8654ee9f53ed35003d7d78fdae32ef195aaebc0530310e7f00829cec431d7df4f9bd807da8dae844731650a79a7cb9f7a7ca20c5dd540bafdca7975237503";
+    sha512.run = "1f3cb3e0cbf5e569f62f4a08eb75004baab6131724645c84aa6ef08120b00bff8946b9ae17205714dece415abf0352b530afd2720fe9f9d63e5d6fd45e426fea";
   };
   easyfloats = {
     revision = 72699;
@@ -17707,13 +17749,13 @@
     sha512.run = "f952227a7b0e579d2bf432b3a72e80a45e8adc22ddd9e7af380de54c12f04acf6c4a88dde5a8e7027d11fb820448fdbcc6a343500ae493fa20341634fc64aed5";
   };
   easylist = {
-    revision = 32661;
+    revision = 77677;
     shortdesc = "Lists using a single active character";
     stripPrefix = 0;
-    sha512.doc = "518258b7d24763477376657e128ef3504d2c8e0f71187edf9edd34825d567f9cdcdb09d61a37d99655959d7c76edfbe550bd08ebd7760735e46fff33bddfbf0a";
+    sha512.doc = "b5b3b856592c96a52c4a3d88289b417b6f9e191b1d8d4d500763617ca1ad2a5693590782bd33f067e541c00af8165d125e56afd632c48220c22dd62e9ae1f612";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "b1ddb6242b9ad2e40785602f942d4381a5d72a7d35784bbc2a1732ead1fbd9d730b580226452e9f56fda873b174c56f9b433f1193e0e3424efba4821f7b714ad";
+    sha512.run = "563eb0ff1dbe8101e8ad4e6968ea1ca7053e6c63a0189f74998b4e837e04fd3a309682ee3b146678c945666e8c718aedfc5851133c217878914931d4fb98c767";
   };
   easyreview = {
     revision = 38352;
@@ -17736,31 +17778,31 @@
     sha512.run = "589e7748b11335c8b074bc136aef21e5f7026c0413dd89dca62a3bc51bae947d63ba2e699170e614213b6b08b03ea5233f1e1cfbdecbeadb2b3457d54ef948af";
   };
   ebgaramond = {
-    revision = 71069;
+    revision = 77677;
     shortdesc = "LaTeX support for EBGaramond fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map EBGaramond.map"
     ];
-    sha512.doc = "3f1a6164310b9104fc9753681fbb55a54417a1902a62cd5337e011f1d3fa9d7af11757ea5eaf5ecbddba34b7e7c6ed54ddc0b834bd9b9fdb601eb92e612ff460";
+    sha512.doc = "70bdb6756b6a707c6c15109f18539c60d5c3c577f93c2677c82eb59a548f03620bc10d0af08d10db109b51efb6fb9de7ab52c789c858e94f0e687b7e879b7fba";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "d02ac16a7ccb8ded53a42c002824791376357db9909c197f1fec6ce62f55d136833c995120e7a077e51b802c8cc2e1c18234d0e7833222fabd1f6bd04933578d";
+    sha512.run = "ff94feb8686797d604b78c2aba8f681482083c7cb48c3cfdea6364f9d036eff7b439bfacac3d55689a4f6e2a30b082df1371ccd6948be705a328ebc6e5120f81";
   };
   ebgaramond-maths = {
-    revision = 74169;
+    revision = 77677;
     shortdesc = "Limited LaTeX support for ebgaramond in maths";
     stripPrefix = 0;
     fontMaps = [
       "Map EBGaramond-Maths.map"
     ];
-    sha512.doc = "494e30a8e5e1e68c23d68198543244e119abcc1878b70a5388ac6c7db4c92ec534632bad4ed54a60ff465b90c82b1260ccaaf45c4458c70db023aa321ebadf5e";
-    sha512.source = "31b144be4cdb3ef3de760762fa511d1ead0270324ac5bd31b5f2b56ed9e7cdd327739b14a955d294ecc31c7ac901430e2688ab78ed65f5c1df45ab98428144bd";
+    sha512.doc = "6d683f682b9a0d28599d4cd432a76903f313697fc41dd0fdccd97cd8b94f70f5bd0f44869a34a5adeb5150ae5886c82864149cb6b401e74b6d5413ceb059d20c";
+    sha512.source = "1aacc4c7cda83f4fa6f1c42def2aad1582f640113150007668e2658a87707bc1ac4d467fc2ef3f787014e79a0043289f8d16f858a72217e33e44a69004ce2a50";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "acc38da7394bba712bced8036bb2df50c778b935d84e875051028003018f9962ec732f035a06056751bef0ca6cc08c07af48b7ec7af6e0977aa2ff05729a7f52";
+    sha512.run = "403d37afbc59af1df85320566309f1dccf42c77aa2739e41c1c3c4a3cef9648a8c968d2608d15eea41cd3f640cbe9fc1ec21a5da1e54bc46cfd8c98d53370cfc";
   };
   ebong = {
     revision = 76924;
@@ -17784,14 +17826,14 @@
     sha512.run = "3345ec303d77965800fb78a1a6b0645c206534bdf84e5b5287d23fb273a720025ec770527d662a5a535e98fb6cb9a6d37d50569963ca24225af8d626ea7d4dfd";
   };
   ebproof = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Formal proofs in the style of sequent calculus";
     stripPrefix = 0;
-    sha512.doc = "b45378cb5cb9236f1855ccdae66612ea9419be3c13fff3b7a0a5cfd05ee37f76d8b8ee9ce8dfc380a33ad0d3e64795be7039686597e3410c5e3631e0a24fe4b3";
-    sha512.source = "0373fdb4d0eb21ad8e317ea2bdc3ef2559b23f77ddc32b2d6c377ac43fb71dc4c526be66edba9f9092d354d974d500218725af26b82931e014bc888bb48b4479";
+    sha512.doc = "4c03e5beb656f6649e87f83592463be89a69077376917bce3d1678d1286434094479796c8a343b6b203d02e60c199a3d7a0956e5bfa0bdd4c442db13d9771b01";
+    sha512.source = "188994daa62a46880e4a2ed33a462735dd8b89aaf5457cb7a88bb1f8a544bc86959a64adea85d86a14758442e17a661c696e7a209532e5e8f8ef49c7fd6cdc44";
     license = [ "lppl13c" ];
     version = "2.1.1";
-    sha512.run = "a71c3736cd9906800d80e58714e9e5f0b1ed4f7f57e5b96989321270225d7c458b95f886b35e93628dd7aa3e8469039530dfd4eb03dd57273b00157bbe0b42be";
+    sha512.run = "2a4761daf0f0c660fe4b702b9f3072e391222b8729735aebbd5678c64562c958e5bbaece6101487f094afdbe6e5dff06c7127fa665405ef8be9c7f3c31c36d1f";
   };
   ebsthesis = {
     revision = 15878;
@@ -17878,14 +17920,14 @@
     sha512.run = "ffa08ca87f6666e7b184e72fd866b1d1567b17847040e9f593a6f16d51a08932cee68124fc8b278426f07c9327d5dee356af42bf997c7eb94e80d15b2e7c9077";
   };
   econlipsum = {
-    revision = 77161;
+    revision = 77677;
     shortdesc = "Generate sentences from economic articles";
     stripPrefix = 0;
-    sha512.doc = "6f2acc40781e12bd0e40abf70d042fc671ddfd4ddd459572d75065be1f4507c0ff1cca7068b569a96588ba646910f51fbc15e183e0e34824c3366478eeaef5a1";
-    sha512.source = "46adac208e24e78c5f0debd94dfb17b5c22e7ab455b083c44fbe7c7666d8dc181ed7be625431f9c7d19e3ef4fee8b9a6a79d8c498faaf977af6a33cf436d7738";
+    sha512.doc = "d4f0ec09c628dfc14e9e95756ca609653631fc6ba24ca7a69ae2655b4532ab1fd080e313eae72be3e8ae0bfc1c8fef84fa3e3ed81d9858b35879deca0232f00a";
+    sha512.source = "0837be43d9b807bdbc991a7bbee2380eb2b1fece964014e99132ee3b80928c39f622957814dddc319c57a30fefb34dc24eb5e1d4e2b5ab52152d71160492bbb7";
     license = [ "lppl13c" ];
     version = "0.8.2";
-    sha512.run = "8842d0878987207e0b60d5049b24e76e899882fe0ab2f486af945ab93e10d88755fdc898f9215e26e74c878ed8c74f03c1bbf4d6b3055c6c5b3aa2781838697f";
+    sha512.run = "9907ddb87dbbb391b905c0dae43a027f782a9761a9bce6d27661fb7f1da4556f520107e296d9df836e5ce3c3a60a57f46a5befe061fcd54d28668970a09d96d0";
   };
   econometrics = {
     revision = 39396;
@@ -18002,23 +18044,23 @@
     sha512.run = "81679a08a320275221058cf0a73d71489621bfa4322a4b90759f67253df06e5c98c1325846966924c145092d9f63d9ba51544d0640c7f0827c7ebc42fddf9f3a";
   };
   eepic = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Extensions to epic and the LaTeX drawing tools";
     stripPrefix = 0;
-    sha512.doc = "02efd8775f6d0db35fa4682c6bc715fe619037a6531de60a2955fbd7fca01d97a8e6dee0109a8cd7cc8237bd694c64797392991e5c203baab49dd9857b0ccb4c";
+    sha512.doc = "1ec63efc994aa91ff196ffb854648a66b2ad8d2a2031adef439ed9c5c74acdff24427178643e04965edc2fa140847f619d273511e18c0b16fcbb8b55c9524f8b";
     license = [ "publicDomain" ];
     version = "1.1e";
-    sha512.run = "37930ecdebd43ac8ac1dcb42da4d4eb4b5ff371605b9bfe4675ea861f4edff7cb19703669c8356c3d69e7ccc09789bc536714114397c3bca74fcb4a22b6f4d9b";
+    sha512.run = "7b8dcf338f6cfb7b44a7bfb8a896014dab2d23860ad0d8ecc7eabbee757aa940551ffac13385d18f6f9d18f57ba10f624e4ad086c434facf6685c90535118504";
   };
   efbox = {
-    revision = 33236;
+    revision = 77677;
     shortdesc = "Extension of \\fbox, with controllable frames and colours";
     stripPrefix = 0;
-    sha512.doc = "394387e09ecb0d497014a62fc1caedcb3e00148f6e0a9a16ae1b53efbb4d5cf749e154e4c905d197280e4ecd9bc88ea07ab7e0c004b8c30eadbe7f9f414c1345";
-    sha512.source = "4739cf6bbe23b69605079bdd8c39eddd6b44e192c5c335001c9612598f2a005e98b853bc02ff67996b63a971b200996f35de2331f230d9c43ed73ad9a8a98a7a";
+    sha512.doc = "ae804fb753090a415a8ae6cc8ba3c56dc20522924877c2f7fd97b08d39bf5bebe9169a5b90abf7b7aff50ca8a44c5e6a32cfe1f67cde730c3082d02014c827f2";
+    sha512.source = "7478d7657fe8cce7ba4daffc6abea63087322bd94353fa2af2e9553408ee565b2a9092e227ddf10cd7a90220c8b76a83e74994feaea2c8da5c3dab3d2783196e";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "5091324e7f5c05385296d570027a8546db4220a24da330ab85ef5d1185772f51b4f200f63eaad0cfa3eaeafd3d055509f4ffbdf798c1139a60c5e572ea46926e";
+    sha512.run = "3de692f506d9b18159c548b111b1263721f718b425b131d36b462c5b2157cf1ddbc1528f44298462a8936efd1509f4b82febae0a8f7bfcc36d3fab2274078de2";
   };
   egameps = {
     revision = 15878;
@@ -18076,13 +18118,13 @@
     sha512.run = "e052333d39e72562e8e84d0e7f6af7066c2068a782422f612a26bd2903d8143874cd4dcc556d7406f3601a6b3a28506a3c0edc92e4029d124f02fe91edf0163c";
   };
   eigo = {
-    revision = 76251;
+    revision = 78116;
     shortdesc = "Comprehensive tools for creating Go (Weiqi/Baduk) game diagrams in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "f8817a6cfde919e39f1d2ae3ef7d153590e2a32b3ba9b60acced9036cdd05df5618a6bcbb350ca612573ab7934c779be7d4cf6a00623210272ceab0f3b45e8b5";
+    sha512.doc = "3533e4539c78fa560f10f88c85160e87ff7b8c76551ba6bed5a3416fa8068f71bae7624d42de36c31d21749fcad7877d61e9ae643aac016a4c259c80469173b4";
     license = [ "lppl13c" ];
     version = "1";
-    sha512.run = "5ced4c25851d341392bed677becb15e39e994e92e1f8504ebeb0bc28f2df19549e9d19f5ce3c1ed078faf38c184bc18bebd2a41b661da0c98f1580a4a2ed4372";
+    sha512.run = "bf5b5af1d882adcac3e69088439d03f2b0d18ca8d1cb6373abdfd7bcc5dac50054d6cfb9a866294f63baf91439425453859d1a38a4f64fcb2e552918529ab823";
   };
   eijkhout = {
     revision = 15878;
@@ -18092,15 +18134,15 @@
     sha512.run = "448f3b51c984a1ec81428c1840ba01d072cef4d1110b85f8d4f4d786d02e8d08e702e0b33e757035aecef1f43b604746c7b6f492905fbb201fc1a34ca6fb859e";
   };
   einfart = {
-    revision = 76924;
+    revision = 78012;
     shortdesc = "Write your articles in a simple and clear way";
     stripPrefix = 0;
     deps = [
       "minimalist"
     ];
-    sha512.doc = "3207d9a723458ed6c75ab7bb048d2c1257475fc4dea8e57f5ef9d18d9d889c1045cceac1612142a16149699d588f87579290607709e51da7df8cf562a37b4b90";
+    sha512.doc = "925e3545311002b35b0c8f260b85fbfe217d0e23eb96dd37c72720af9bf55ac8ce7ac2d00749f1feea92961f433e3bf0470ca1abd21e8f285cf53b58a1075079";
     license = [ "lppl13c" ];
-    sha512.run = "29807179a9d2f0418bdacbf871d94c3845f6fe5658aa6d3f936543ffbb10509474fa961e1e033182bcef3c95e89722f913cafce8f58d27da1dfe7753e0c77177";
+    sha512.run = "f1cd6565449dcb9b04b858a627919fa5f43d710db8c306f63ba31cabfad9b13c9c37e1c2cce63de0f2a6e14e1ffc025aed57d367e51e7293e92b2b56a9601727";
   };
   ejpecp = {
     revision = 60950;
@@ -18155,20 +18197,20 @@
     sha512.run = "4db2b191fdb73854bfe605efed30c4835a77180fc865eaf201f8405fccaf880e02ac9ef7802c2d215df8ad77d01fff611114c391a6c43190f95dc2b40cabd596";
   };
   electrumadf = {
-    revision = 72484;
+    revision = 77677;
     shortdesc = "Electrum ADF fonts collection";
     stripPrefix = 0;
     fontMaps = [
       "Map yes.map"
     ];
-    sha512.doc = "be0a4c7c2bc4cc7ee6543803e6d30a44a1d80e6f22d62061a9384a7b147cf485925a24c6a993808dd44e817c5cedae19fa7b40008bdad35bbab7b909ae3f6f1a";
-    sha512.source = "edc8da7849d7d12154cca83fb436660189e99dfe6285d88854b4d6233c6fcfe1e1f4fcaad5df17bbff8d2b9b41d278ac15c98774ecdb1ca00f59833423c5f343";
+    sha512.doc = "7b376920c839feb0a7acc28d7d7d5624304610eeb4e44776794eba2406a9bf5dc825ce2516210d8d286c13a3d333dc7d550ab3dfe9c425b9d256c3e8aa3c5e4b";
+    sha512.source = "babbddbc1bfb8c27806359845eb9dc20afd0edb51746ff901938ab61d8021ba8706d15d3fbaf2ba5c82f565866857d32b47d4966b8d74f267fbc9312239be80c";
     license = [
       "lppl13c"
       "gpl2Only"
     ];
     version = "1.1";
-    sha512.run = "875ff39b9d507bf8551bc0307ab62ffbaaa32da05e0df4d493ef90b3bda6c831c310ae6c285ec4c67740e3f8a120b146cbfd8a9e47d6492ccbb90a55041e2aeb";
+    sha512.run = "115a50557f6a47a740213590a83da2596083a8799aabd9b319d669b8a1b0997decbcc67dc4347dc51eb2c0e1afc82194ac14fed86b78fbb024795a277c859993";
   };
   eledform = {
     revision = 38114;
@@ -18190,6 +18232,33 @@
     version = "1.24.12";
     sha512.run = "644df002adf2f39acd9a6704a5c2e18e02f30d17c8e04173fb0f68e9daf5469bb6290c7e98ca181ebd45b40d54dbdf4a14fbbbe7dbe8f945b226ee086efc3972";
   };
+  elegantbook = {
+    revision = 78198;
+    shortdesc = "An Elegant LaTeX Template for Books";
+    stripPrefix = 0;
+    sha512.doc = "a25107a5cb777fc6eca0769ed00e1c2e2ac418c31011ffe2fee05662ce949aa9ae2cec5120f16fb685941daace6196f1c375a042fffa013e3b009978e23210c7";
+    license = [ "lppl13c" ];
+    version = "4.6";
+    sha512.run = "099d3f2bd4c5cdca9c9f7e768bdc3d8a7a66c4945578160c93914b17fc187e168ecb8565bf54d9d31bf7643c499783b9cf20eeea6609dc4700c91ac02d490864";
+  };
+  elegantnote = {
+    revision = 78198;
+    shortdesc = "Elegant LaTeX Template for Notes";
+    stripPrefix = 0;
+    sha512.doc = "ab4b06bb8677a32c28e769215a779e5cd6624264ed3a2d55c5fccbe12d2d6e43a141e77dfe5e2f25e41cd63e729b651fd220e4e504ccbb70620943baf608cd3c";
+    license = [ "lppl13c" ];
+    version = "2.60";
+    sha512.run = "95878778bae25b567a6e32c4afe7409cfe798ea244584097bd483be59dce7aa0c59a4e353e43e88dd820f7ce835c3670dd07dfbee52dddd84d0be78d8eb1a760";
+  };
+  elegantpaper = {
+    revision = 78198;
+    shortdesc = "An Elegant LaTeX Template for Working Papers";
+    stripPrefix = 0;
+    sha512.doc = "233b3b3751fa384a31075f4f71b44ad0910f3f2ede8ffe7424f6f7971f4f665ea99bfd41bcfc647802659db877e1a9e1e38c6f6b9a33f16bd74dc97d9f1e149a";
+    license = [ "lppl13c" ];
+    version = "0.12";
+    sha512.run = "43b140e859c3196879506b9642ddc5c5fbba8147813f6d7e763d4980d2c58902ccdf8f4a42836e6e0c375bbd563bb0272d191d9a416500eeeb812f5b92f62bdd";
+  };
   elements = {
     revision = 61792;
     shortdesc = "Provides properties of chemical elements";
@@ -18210,14 +18279,14 @@
     sha512.run = "edcbca8843239eae7bd927d9bc6b5095d1b9a4d8db213e22c77ab4a7c5bf7a09781aa225af26f1e4127f263d5322c8138cf38ad1a7b19688468ba2ba56f840f9";
   };
   ellipsis = {
-    revision = 55418;
+    revision = 77677;
     shortdesc = "Fix uneven spacing around ellipses in LaTeX text mode";
     stripPrefix = 0;
-    sha512.doc = "7d0b4c51008203729df1bd50d2c2a2568f2426b7284f0d58eae4720a032e4ab469a5db6cf5656e57ceb0cc9062a7bfe1f3cfe20c51a3d08c85d55c110ce7ddcb";
-    sha512.source = "65b536bdd6d5b429e2f1832b3d466bfe055be6074b43b60305b79ae9ea09172e3e7e82bf7cf3b4dfbf73507135ec4caa3d713c5cfe060fbc925ba7d2a8c09dea";
+    sha512.doc = "e4da83a2375303a8da27e7dc250c95c8e1e72eaed66f066d01e89fda2d2897824ae30546e55e118cca364814841b09ba22ed7eab6f86cf3997242e81da350fea";
+    sha512.source = "e6f8040e69bd539750d4e88baf2e1a1a4af012d2a55a9ad3b055230c3b3beb380ed4f675f74e03d85d53a1592fc9fc617ce070774a05b00e02aaf239b9f4aaff";
     license = [ "lppl13c" ];
     version = "1.8";
-    sha512.run = "009bc55dac8eab88e27124317acbf9f3101959cefa4419b507ab74f49453f72f272db2b4826424f3d8c76efb50163c11d6eed63e1219cae2a2632bb629fba96a";
+    sha512.run = "06b598309b0850a1268544bfae65a08c3858a942e9fc4fe57612bf122402dddf0fc3be5e45da3d3b48c03b7a27763d16b616fac536536acf91b0f48e4aaaf9bb";
   };
   elmath = {
     revision = 15878;
@@ -18333,23 +18402,23 @@
     sha512.run = "c531feeb7557cfca45127d9c37c93bf5835e35efa7c8aab65d58594c30d6864deaa22b64ba90cebcb1e9dcb139b00ad64ff96238835b8e059169278fb602ff2a";
   };
   embedfile = {
-    revision = 76664;
+    revision = 77677;
     shortdesc = "Embed files into PDF";
     stripPrefix = 0;
-    sha512.doc = "4964bf812c23c59871c1b75de95ec06176da9d76f3d4453a36599ba49db50bdac1fdc6da266b3d2d5f8fd0c5d8e5815868a1db241815e3c0ffb05c2dd2c85fca";
-    sha512.source = "3f8ed84ea92e552012bfdf231747f3006e2e66e387ceb0952cb206a4496ec94e807259b3849cd70f7644ee6037ad9ba3a72a96a1b1cc268e26edea4d0a8ff102";
+    sha512.doc = "126de69f1176a97e7b7f087413c3038c56477365d5b75d649e404eec58efe835c2d29157d91087edddc3c9efa147ab5d036df781c43b8aa74367779bde83d016";
+    sha512.source = "cfb2cc12d9f6a72068d2656f6fc641dbedf551ecd77907883154cbcce9ab743f513f1d6ab5c533d82bc895bd74899f26f877a85a53d7bd0bb20fe99bf7c03823";
     license = [ "lppl13c" ];
     version = "2.13";
-    sha512.run = "80ee4b24ae1baa0d5ef3d168b071d49b89dadb0df5e65883730b0cc53dee291f270a424948547e73507cca31e7260fb7e1f78203eed6270df4f3195f88479363";
+    sha512.run = "91f108dd3f1e8069ffb782858323328783a5e7f58de0ece7e4fea2efe255fd7f1fa51292da32a6aa53cba497982569e47c00b4f395ad81977a3fe76d45f26b6e";
   };
   embrac = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Upright brackets in emphasised text";
     stripPrefix = 0;
-    sha512.doc = "a2836b1a7edcfc4c222d462b167cc1ba6d4dc134beaa454c870e340e2255b72c1984bdc0081b4b5b94a00e7dfba1f001e1ff008e80ee5a6c00c4c695c8ff300b";
+    sha512.doc = "0cfceb7371041e3b76857b0e72b068b78d5c78fbb7041ce3cf94be7c869d6924a8fc52d81c3b777d2b117e7093e0f55480bbc74915d2ad660dae9caf76ab210a";
     license = [ "lppl13c" ];
     version = "0.9a";
-    sha512.run = "8c820a21ba3b3cdc541792c8cd2af6c8dc106ebedcb7154aab3435d0eba5e494f3e8f7cc0ef0f3380cfa2ba64cd9540b7b362fcaf6ea4969b8b400a503e72feb";
+    sha512.run = "262fae527e954dceca200b96e5fcb87b5f1209e120b6ffcd97557979ec1c77d1483432df749858ab6a5824e24c17e8f79f8e18c9b00a843c6e171aa5c23390d0";
   };
   emf = {
     revision = 76790;
@@ -18371,11 +18440,11 @@
     sha512.run = "98d1aa993446090fd2f441cb3854cb88ddf3411df745036677844c0f8e351b16bd12d2268160fb5b704f07159059ecc089596b9b1e9857f02d774092ccf34232";
   };
   emo = {
-    revision = 66944;
+    revision = 77677;
     shortdesc = "Emoji for all (LaTeX engines)";
     stripPrefix = 0;
-    sha512.doc = "e60b38c75c23bb4ec5d453d76fd2c815abe712d1c602eac6897eb1ec9b51f1d6a964fd5aae5c7ecf17956eb9d39104708e887b0efab0830b72b9ad37c8c79af2";
-    sha512.source = "79cdc96d441c82b4f59b6f2bec0fb82b047d1b9540b0f29946c2d41f355118e3a9cdad2da2463ea4c9a0e26ca832a98db5b88f4445baf6ac41abff8b443ad1d5";
+    sha512.doc = "c55271b01cd5b43c0ab132fbc3cba0e23df71ed13d43b103195671dd457023929ef5ad34daa06605ee5b6ea3c57b267c67c0da383b2bef1dea22702a6698f408";
+    sha512.source = "b0fb68133c12047d6fcb2213f940fc9b29bb3a06dd1f1fa666ca474f323ddef6c1987b6f1c9b56c01bbdf3db4874b259fe7df0af51aa365d014b1de5a103b376";
     license = [
       "lppl13c"
       "asl20"
@@ -18383,16 +18452,16 @@
       "ofl"
     ];
     version = "0.4";
-    sha512.run = "633c92dde16b5170d5ea27fbb5e72e865300abf27054cd167652ebe598b90a8788d129c950e5a230f75201648b25aaacfb6b47aa44e994d05549c31a82600da5";
+    sha512.run = "1a72808f8aef6e7316f675cfe2cd56fedb4b8040053598c6a8cc30e6ac5a9b01ff299cfdd9e94bbf748a070491376dbd065f2d2537215ef204441dc9b883d8b9";
   };
   emoji = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Emoji support in (Lua)LaTeX";
     stripPrefix = 0;
-    sha512.doc = "851096a0bfa748f939546fbe4a705e3720de84035b3d48f4b70fea4b8a75eb73efafeb8fb2287b9f3ced4828390f66472f3693f41310f765d90b14bf1590fb76";
+    sha512.doc = "805fa507d42dab94e1aa90f1314d597ab4a6f76f3fbef3b8c29e6726f742978ef9112eac91869cf1199840fdb2a66ba77e8e7990dbe9ea88b7a135201cd5a188";
     license = [ "lppl13c" ];
     version = "0.2.2";
-    sha512.run = "66ddc87e5d03e56226321f852d51b5d2831b5dd7330ca4bdbd3ebb98f15f49e736d0f1bc6cd0cd47fdb4c46e7a878fb1a7f16367625198f7baf4e650d704a905";
+    sha512.run = "975335c9f0e1d52eb5746d692d4e3078db453e460d4719db8398f73fe1cacfd8f0e35cb667dd0ea018096d3d4e45ee444b2ef379d368ba7acfba0d3b00837f04";
   };
   emojicite = {
     revision = 76924;
@@ -18422,14 +18491,14 @@
     sha512.run = "5028360a2b412232b06b0bc53352c7a0a379943c14781b49b45cb75aef044df5bda24449dbf13601d1a574e5349bd0f2d2f7b7969f10bf72b3aeebe9e81b6ecb";
   };
   emptypage = {
-    revision = 18064;
+    revision = 78116;
     shortdesc = "Make empty pages really empty";
     stripPrefix = 0;
-    sha512.doc = "11681a155df95f913c3d25cceb32b54ace35bfa5aa7541916c15473b951b02a7417380dfa5c30f5dc3de1259d6cad99859c31bad4c2f2056ffb4608c614a2e14";
-    sha512.source = "1bdfdd32ed844651a109b54c65e7297222cb065a122269bd5c10cf77c6ae0e38b717fe182dad6bd0432b5eafb38b3d8631218599a46bb61a598eef4093a8ce1c";
+    sha512.doc = "ad32f3b980d9b33d4fda1c7a9b2403bd5ec2c48c3981284f20611be4d9e7bcfe0b1160299d1e1f8f174d9c6947a1a65214219986f9a40fece92d86a2aa8d8ba5";
+    sha512.source = "69630e27d7538a1831999c2712805a7844dc678437ea7e24a8f8d52764e2b9a8a754f9355cb5dccbf093489b9ba4ae8ed4030ea209c64e6e878ae4e7c24f5253";
     license = [ "lppl12" ];
     version = "1.2";
-    sha512.run = "6379cbd0983ca7b58d2c94ce02a76e054faab1afb2942227469dcf2c4d572d9946921b6d24e9c7d2b5a82cc45e7e380a8ffae671f165ad0e2a3a611b95841352";
+    sha512.run = "e2c68ce685a47597eaf5fb82ed5bd4c183fa2886717a6092c42a5230c7ac47d6c8d64f3e77c6bba54815e8fefc77bfb3db23d428e3fd52545704de0dfd0db5a4";
   };
   emulateapj = {
     revision = 74166;
@@ -18457,14 +18526,14 @@
     sha512.run = "f6aa0a954affda9152f5b15958ea453e3c2979205f25a5d9f15e3fb189b2352a87256a345d382a3c7dc401eeb55360afa9cf942cc4779406b97cc8f8c47eba81";
   };
   endfloat = {
-    revision = 57090;
+    revision = 77677;
     shortdesc = "Move floats to the end, leaving markers where they belong";
     stripPrefix = 0;
-    sha512.doc = "0004d60fe959415670b5173bbab6d37733ed82b537d714c7357dae85ff8f7204e316c48d2651b1b53cc9b6ad0206a47c9cde1acdeb6aae676a25e50f363238c2";
-    sha512.source = "bc5150716b23d3aa1e3a66e29fca3e8f9703199feb05b4bf76834e79654c39b0f6790ef1f0c193abeb0acfd0b2717076d4e2c89069221e1bc45716e0de314e85";
+    sha512.doc = "cab0710eaf464371426ef26e76974ae9ffe89aa0e9c5896d9a613fcae979c9908a01f10d60625bcf598b42da9d8c9ad9b7033061dda76af09976e732cd66445f";
+    sha512.source = "946bf18d495de242478aaff37d69aae12b9cf4141ec3220196757cd62f0d4c63e45d81a4b4c74dfaf43ab246e27c0371c6602302d0f06f08d9b600b58e0082db";
     license = [ "gpl1Only" ];
     version = "2.7";
-    sha512.run = "9c3820ddd36934dcfd049ab766ed037119459d02e9c049401b910b1c14ae2aed93d94110db66f0cdd2149451e152b5bcac14866c7844ba4a47f8c0a27756f733";
+    sha512.run = "15ed19c301c33ac05d29f640c40c3646de7d1043e911543deefeb635ee7f1fbd5b3a163c85863e447eac60a1eb3444cfef763048ff09220ec5625102a908345a";
   };
   endheads = {
     revision = 73959;
@@ -18486,12 +18555,12 @@
     sha512.run = "db8055a4925fa8f223b783e517ec398e6cd400a7051ab871f75d1e3bc2e9cb5d93f33d828a28b6fe8cb9191b53b9c922e1dd5a4e3ee8b8d75d2a5f6c66df06c1";
   };
   endnotes = {
-    revision = 53319;
+    revision = 77677;
     shortdesc = "Place footnotes at the end";
     stripPrefix = 0;
-    sha512.doc = "e4de81d6cf0d7bc686d84420dff1e390ad18747ebc9381c6df006f871f9d5e000aae5cd43a3648dfdab2806da83efc6b375ceb4a9110137ed6b373538a7a8b57";
+    sha512.doc = "5bf2a4b33aec911f91629ed117cd518e22681be1769e6d78d849a042b5d054d4319944d128bde2bf90d086d133b2bfae565681c39a5bb7e8afb65967e0e95623";
     license = [ "lppl12" ];
-    sha512.run = "3b4d5b55dd1ef844b96d30c7d40d5ea56ea3082a9e6740e3bffb837b864823a2c5545a13fa79eb49f79b47ee86aaa28e15c64f676bd27e4987aaaaca76bb2f31";
+    sha512.run = "c6fc0f49a01e30da92a53aeec793910141b2076fa400fe827b62aa1ebddc6ed814968c1579b7954e3d69cc63ba51df15b726ff28b8ea9d0cf22efa6791f5c0e8";
   };
   endnotes-hy = {
     revision = 54758;
@@ -18503,13 +18572,13 @@
     sha512.run = "abd177ac968efce6749d8bb80c327bd8c3617e14045d124e036f2e503eed7bc33c72112d46acebe84d8a0a2f25cf3d99fd02a514d3673f38ada9e7fef879e3f5";
   };
   endnotesj = {
-    revision = 47703;
+    revision = 77677;
     shortdesc = "Japanese-style endnotes";
     stripPrefix = 0;
-    sha512.doc = "71e52552f4a432b8743e448142fdc8e49b9e1ff1d290b6d20731c083f62bb5be823db76720fcfa40cbb8bf75968b80875926aea8a7f67808555fdec160de1911";
+    sha512.doc = "7858d8d4b5f4c2f025e2e17f767e7026a0466b5362539e7e382e39cd3d56a69c66e551d71f9b0384d25af6f8135793eac55740d335f0eaab4570a07a4dbd5731";
     license = [ "bsd3" ];
     version = "3.0";
-    sha512.run = "acc3ecb055add319d5cbfc4e542c1be490c00187153990dd42d5b9a23adfd19795bebe4648129bc1cd8aa8cc243111602b287183803db8b5962b23b6c60487e3";
+    sha512.run = "8c7d73dc03d667226b7edb849465b56e3fb072d39fbb43f0aa359e066d7424c2c5ee75f10c479c87701c34b87fc4222cf38ddc2c89569df3873272ff9aae560c";
   };
   endofproofwd = {
     revision = 55643;
@@ -18558,13 +18627,13 @@
     sha512.run = "70cf80101d3fe9a75e750f5b3df4db79f30f5ef76ed65f4bfb40f36e5c8c5f0d22468396fe3a531508dd484ed5929cd14d4e22734a92814a4eae9ae2ec3e2b07";
   };
   enotez = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Support for end-notes";
     stripPrefix = 0;
-    sha512.doc = "e88045f9580a2aa1a9e6f6eba8d5242dc9ee8b09a6f8a6bbcb13ac0f8e07bf0ae8c0a2d9595f1321a406365da7ff6d6ec65e7fd7799ea1ef66df73e4e694e97c";
+    sha512.doc = "7159813dfa7b80d0bbcbe0967268dd6ff91022a936b4e38b72cdde2b22d9f28fd03c2c237d8cfb41e91779bec100e4a06fd61b069fcc7827ca206a54ea6d270c";
     license = [ "lppl13c" ];
     version = "0.10d";
-    sha512.run = "126a18500311514b4b89b233d65f66b7bf56d0c9a7d343b3e114dc82938e066c2c49a083541ad41fe1339411563e309112091fe512b993fffdf6f2a1b2e8bbed";
+    sha512.run = "01e7ff5199e8406aa5cbe7691b3784b586395963aa56cec1df36397d981bea349efcb67351f4b80eda972995a88072348b98430e279547f6a3565a379f2b3e23";
   };
   ensps-colorscheme = {
     revision = 71431;
@@ -18587,13 +18656,13 @@
     sha512.run = "7124ee739127a806fdb4f6caf8571d7515350586cb96b29a5bec3876e4d500547e59622a0a36b7b0f9879f1b02227c2cfcdcbe682a7c4c83e1ccefa8496b9489";
   };
   enumitem = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Control layout of itemize, enumerate, description";
     stripPrefix = 0;
-    sha512.doc = "ae39f90ca102ba678fcee0296d9bdbc2101b38c81aa9c8c42412575c506b6ed0998cd042339aa8ec2a284b9bd4b4316f2482b95f7978ec90a4cf8563fdab7dde";
+    sha512.doc = "757eeb61cf92a091f3e6073437f6820161ec1e1fde7e679cbc5d95a82ff8138726f3b566229a61a484c5cf36725231ea6305b8bd1dde59a525a0773fde18d19d";
     license = [ "mit" ];
     version = "3.11";
-    sha512.run = "20be89296bc39d909deab25764366beebcd1b039ba985f4c284aa9f2d35215ff2adfd7d84ba015ae414dc71e0a883b83ddf64ec4c4d644356e258785a02ee8b3";
+    sha512.run = "c7d8009aa2ee242b5697dc4488ffd6b94daf8a6973a0ba9a7cd3d7391a5c60ff3535b9a2f790d684d9e7769fda498c3da353220971d7cfeedd286225ab3e045b";
   };
   enumitem-zref = {
     revision = 75712;
@@ -18643,17 +18712,17 @@
     sha512.run = "070aaddbfbabe5f2c472df41f2821df1e38fb3438e52405e038c1bf3b8fcc39357bf6910c947cb144421d8b6375f0d6d87eef1b64d33da079b3c443eb8d6146f";
   };
   environ = {
-    revision = 56615;
+    revision = 77677;
     shortdesc = "A new interface for environments in LaTeX";
     stripPrefix = 0;
     deps = [
       "trimspaces"
     ];
-    sha512.doc = "78d4d3f570470619c938687a6c9a6925aad901d781e3e893bd731a49bb8eca62bf1870e68d84f7125e10d91d7bec02a323ae42278ff59c04d7e33eefa2261496";
-    sha512.source = "b30607d21bbf5ddf1c7d36bd9173a16d91bdfcfa004782be50e50f17bf54d94e943d5e524e2331b75f3ce65e81193ba98e69ab56c38959d632007f5b0a87bd6a";
+    sha512.doc = "d7c89e3ace9155acf6a4b078b836ddc7f2ec8ca1f7092d2d66b4e9b76384a1e33ae02c24ee1771c2642cdf769effe81caeb5ea86868c3d2d379ea891e597933e";
+    sha512.source = "1aa7a3124b10ae21fb580f4829cb277518e96e49ac5b5f1d9a5f52afd82ff7edadf733a18aa98c1fe1d730e12cdcdeca411ac1fc86ec4b3157e82e3d3b0d8d48";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "c8dec70e56651a89ae8da15abc0ad81cc2edb4487837469238e2adc0e7c58cae4c5da82b637a3336839b50103e3d846c5cee8c73141488f644469a0f3e9d363f";
+    sha512.run = "f561c2725afb0ad3994cae7ab29e229a5429c62cdcfecd80c5b5a5f1b571128309af4eb8c4d0002286dab3e9c093200f51dedae432f9d1356be58143c819bee3";
   };
   envlab = {
     revision = 61937;
@@ -18731,14 +18800,14 @@
     sha512.run = "8952dbb6f7c573028b1f9621cd9c947a264847e59e1ead9547d386d71c2c15ab5f9c26088568b023030645b02191c9b72d827a80706ca1570785876c6acac6f0";
   };
   epigraph = {
-    revision = 54857;
+    revision = 77677;
     shortdesc = "A package for typesetting epigraphs";
     stripPrefix = 0;
-    sha512.doc = "d8d2ac763e6bdcbcc200fa21995ea5044b4adad11f147b3d7e9f212274c1678cbba7661cc93df8cd013470a5397ca257690d85b8fe55704800284805abac7c62";
-    sha512.source = "566c5d132b17c806ee51d60122c9c89f7e1d3e6b6df1444bac715c5e77e2522513a2971f86c495b7fc654c684b07dc53982436aefa0544955e0bae30479b42b0";
+    sha512.doc = "0baac581ce46b5edeec7531ffb94c07c133456ee9f17f274253779d7c655793723fffb7856bfa36fef92b665a5aa10746cefeb5859757040b84a308b2232054c";
+    sha512.source = "ebbafd67ee2348224afef85759c70ba9a5f2b62c20fd4710cd815bfc1159a4d3f446732390edf0a430befb5442f4a8e910fb9f57df9d9ee8717d86254351cc11";
     license = [ "lppl13c" ];
     version = "1.5e";
-    sha512.run = "bfcc661316dadf02c8bc1c4378b04c588ef612f030c764af3119e5c9eb42df667f7da9ad71b90fc2b5dbe7adf4094b05d792ca2fb2292c96035384ce65578293";
+    sha512.run = "b623904c23d46a2fda18020700410c9de4ba50b5bd2241e0cc8e5dec18563e59bc9cefa3305983a275c63ef6bea47688b93cd526931a38a226df4fac51aad319";
   };
   epigraph-keys = {
     revision = 75301;
@@ -18813,13 +18882,13 @@
     sha512.run = "acc0ceb408f320570a93a52132d3e37d43d4be65a31a038187edd6de9899427f08d7859dbc383b7b27e9d9b5a635ae94ea97f0be4ab8386b5991089a1435c350";
   };
   epsf = {
-    revision = 21461;
+    revision = 77677;
     shortdesc = "Simple macros for EPS inclusion";
     stripPrefix = 0;
-    sha512.doc = "52be704eec6159e70d99ae2a4823c1da0790f41da9e6de130c84cc77e0d8d29aae145ccb9b416ddc5c9641100821f5099b5c597a350438652381be903e7681bb";
+    sha512.doc = "c87f422b19d90a923fc08eab177f3bb417104adbbb95533a4d5728f8ef29c86f9dd8edd9dc71a18cda1f3ed030926f1c284729be827c79d9f755edef6ac40e50";
     license = [ "publicDomain" ];
     version = "2.7.4";
-    sha512.run = "4c3698edc9ef386b08a2ed7c360d926be6ca5a8284e3e53e0dcf5f222eeb27d4d33b4547b42dd2e5544ab381397aafcd58899376d26a4d9d47beee00ad1e9bda";
+    sha512.run = "a1fffaef4248d0f5485e0e8c027bd8e9ffdf8a58db225b949424c1b18f09cae65197d0a9f9ccb142a09417e02d92831ff512e826020d9ccf4c87f34eef393d9a";
   };
   epsf-dvipdfmx = {
     revision = 35575;
@@ -18883,17 +18952,17 @@
     sha512.run = "323b20d556be6e076303045a1484190c08deac0da6a9d31a0a4f24ec96da2f0fd159260b3a5e456500ee15727fff19d1dbc7e8c893adf88571f5ecf656d5afbd";
   };
   epstopdf-pkg = {
-    revision = 71084;
+    revision = 77677;
     shortdesc = "Call epstopdf \"on the fly\"";
     stripPrefix = 0;
     deps = [
       "epstopdf"
     ];
-    sha512.doc = "36688e2f193d128183def792ccd67b5493d79d80656efbf6603538228358dde2bdfd495c7c45a56b260ac3afe2e66f8f9dec3e5d6692bb7ab04a55e714f5ee8c";
-    sha512.source = "a2e6cf4ecd3691e3db77e6f8a79cf36b3959a27f0d3be7a322d897975ad01864c04c1aba56427f32a78d8bf07c7218cf027342a239fa9a7fc2205f8c4c815448";
+    sha512.doc = "68808179f66980b4b772d44e5189cfb4b0db2d472cd3edfa06513469355004f10e8cebec56387d89fce5aa9639d4e9e0df83522094a8b7dfa9f0b38fc69644e4";
+    sha512.source = "dfeb3c04cec4fbbb93ef86b8db7316717a94b9e0a6944d8a6168c94ccc496616924f5411774ef54dc7298f2f5aba3620e93cf99850521065ac4faaae748c6c18";
     license = [ "lppl13c" ];
     version = "2.11";
-    sha512.run = "2d22c7a5a869d3b9590dfe5e776e0ec65bcaeba339704b0fdf4ed4cda9032e307e7a5ad01fd0e7da4ead7aa014b29d12c41dd3c99932f11e665a6ed47da25523";
+    sha512.run = "e9f159b536cfe01b49e724bb4d0c05a631d0ec4da64139887ae3a9ebc589375caaa2a7a6bc03ad5c71f0ac7c3cefdd2928e58c7ead8eb74e80fdd9581a74c4be";
   };
   epstopdf.binfiles = [
     "epstopdf"
@@ -18926,14 +18995,14 @@
     sha512.run = "75f328b6b1e729b76b9be92ec7ad9844e5a41d8b6776700175af98ec217ef93df6dc56b92b49892090523e9308afa069ba3e6beaef8ca6712aa2fc3995417103";
   };
   eqlist = {
-    revision = 32257;
+    revision = 77677;
     shortdesc = "Description lists with equal indentation";
     stripPrefix = 0;
-    sha512.doc = "a5b22b8e9300064d77d02ca6f5652659293c6fedb792be2f0664a2383b3167ed7bf8796af26edfabfdcab8d75ddf30f3815be36e8f38fda30f1609b56c16ac61";
-    sha512.source = "15817915c95c5f609c3def3bce324e6ca362408aa862e7b3548a67225bc1c33bf8a5c8f924dcbb1951958beaccbf86071b4e866f0e7a4d55a09456412fe70223";
+    sha512.doc = "eb220798a6a13026fb8da014749827954c0e821c5b208914b7eccfa7ff5b3691ff0517db795b4ba4a24be1f3ccd7ece07758e1b106eccf405c6d1107b8c6a0ee";
+    sha512.source = "40367cc473c0d8bb5b87669320b5a520ca6886ba31d4f886392f92bcba9a91ba537077212699f14cf76e36f88923f0c2a5966ad3dd672664718da74a1c8877f5";
     license = [ "lppl13c" ];
     version = "2.1";
-    sha512.run = "1af830f51ce25946ac8bc6a4cca323dffeff20389ec998b74afd49a8edab5ad7a453818d4799e55ca564153a87b85e2a6b03ed67e53cc5ae6fa74c45edf3aeae";
+    sha512.run = "d89469f48d11793dc219b58253099d862b4c08639761d3aa6cb02d9473c607559bb6ec6b6781438132a9b70184f9168c7e7b3dd96037971bd5bf4411bd6c5a0a";
   };
   eqnalign = {
     revision = 43278;
@@ -18953,24 +19022,24 @@
     sha512.run = "1717aa83439019ba2c07ced56ca5dc969a68b78c9a711d97d0a168d432c6e26b53f30b2a3f6f8d241acf465fe8817d7e4fc4238982a68bf2ae143c5fdc2ca72e";
   };
   eqnarray = {
-    revision = 20641;
+    revision = 77677;
     shortdesc = "More generalised equation arrays with numbering";
     stripPrefix = 0;
-    sha512.doc = "7ea3d87f81eca28dd52f9e9cf4f7df1ce4f7b9cd82cc40d0a7fff234415b2a3e033fa1c8a11594b2c08e5edf87ae265e5f7a65eb92a79cd523568f37853de30a";
-    sha512.source = "9dd02c43fca4f6e8dba0bd44292c8f97aef4cbf39d521b9df10206a2309e82492f344fb65c35ac0509532e9efb2571aecb2a5894e639de5efa1444bba9916587";
+    sha512.doc = "7bb1f173f699aa41f80739119c7e3f3a78ff2d2d3fb2b7894515a1ac15fb46fbca1f2a8224262f41d4cd30262b46f538018271aff4860e6e4649dee862ce1a38";
+    sha512.source = "b5354399074e09af2be8071b66e0b4392a6ab280bf8b6622fd7d68cce2b7dece30a0ffc76c5e8e5ea2c74acdb22a00bd5ba5f9ca72acf2daf347305f77134f55";
     license = [ "gpl3Only" ];
     version = "1.3";
-    sha512.run = "f5abd20910152cf65d92c7e44930729c1052f72441f162de2f4ad869f0ff37b669066f43089a1369298e9ebdb536ed62d437b3f34be5b3e417d8b0bf34d9c870";
+    sha512.run = "ea9d6115b5e9612493351f2cbb1403e049c46628acf0189db4a4a5c72f60678fd6401ffca44d2d1bb4619875e7abaac03c32dd7fc15a104f84f45849f865b0d9";
   };
   eqnlines = {
-    revision = 77544;
+    revision = 77888;
     shortdesc = "Single- and multiline equations";
     stripPrefix = 0;
-    sha512.doc = "aa44252fd429c6c9b631b3c7bd7dfe7d95bf6653efe55d43c0adbd639013f3988c96283111b40958874994cbbef70cb2d158c4f7f3ef1abd54336f1bd92743ce";
-    sha512.source = "b746f50d896d75efe0f8c8dd55048b30744d439fbc57bb13f099de2359bfec5a9f588dce5fa29880d21d0ec579feb33f24c7e0b9c9858f13ab7f0fcb2dbe6fdd";
+    sha512.doc = "47962393c3977e26c85d07e3fc919f3ab08d2da1d8b7e930cad0707e03f318b213c849435f50bea73804d58e3b627ccd83f8de014ce60e63066c7d2d5ed6a0e4";
+    sha512.source = "f6a174546b07f54b530b23872fb8406650598cd351f9d5c2398928d9b207fcbfc31af7c2b521a57e8b4b52a7ec25a6834d6696fc2a3a7ac8e856959b03042d7e";
     license = [ "lppl13c" ];
-    version = "0.14.1";
-    sha512.run = "091a40af18954b162f8b2fba2c6647634f1229808510d1c14e22c32fbe7cbca82e2a40d808e7e7c66c3dfc2c1f29d99a10bc0c2600106fb681da4b7c00373548";
+    version = "1.0";
+    sha512.run = "7feb5202cd1a47086ee2c73ce639f4326c625efec78613f2d34de976dff71aa605f7815372e4bb8672167617b2d000ccb2098b10d6360b851c3aeacd5091784f";
   };
   eqnnumwarn = {
     revision = 75878;
@@ -18982,14 +19051,14 @@
     sha512.run = "f1172eca47318dcbc8ad57828c9c6891ba90906367981ddcb2803bd9a7cd17a6bddfc8cdbf048208230ffeb3c20b84677bfee8663f3b528cb750045bef53f3b0";
   };
   eqparbox = {
-    revision = 45215;
+    revision = 77677;
     shortdesc = "Create equal-widthed parboxes";
     stripPrefix = 0;
-    sha512.doc = "1b0f7e6249e114bb6371d19f941cd2308f70ac4f1c831ce5a1c15551bbd65a4289b0b0e718580cc7df97bf4732ad3a76b3f22ea12f7caeaa2ea6362fabab2074";
-    sha512.source = "2998b3fce2cce05512a41b4700905adb78d421302ed0275e7f263f891a0d8e9d5d8793ce2fb80cf1ca3e8f5f148e530a48c3c701f72729e6f4667382ad9247b1";
+    sha512.doc = "4c64f454f032d9279a4af7044c4b96cb7e538dc4e98a97f402528f214af468c186702c57e655147447e100c64a28a93e936e640b7f176e76f114ab3ef0e87d81";
+    sha512.source = "39814b13cbd450da792fe65cb96c96477d19c493638b8bf6a54d82e466cb0f31d7b268d3060ae1255a54248eb347da5b5191a79d61db4235f057baed5818e304";
     license = [ "lppl13c" ];
     version = "4.1";
-    sha512.run = "b6e64a4d30840933614a42b16ffec215d1e01138c42805ed20bfab6ec03e232f87fcc2c20decb2e7e75234b7bd5fc2ebe5477808756ec92e6e724acb3482afca";
+    sha512.run = "555da2d051f3346415c8a364e8be89865d65dcdeadcf02da2c46a5e05d04fc738651e4f94eee820d2d4c260e2e625ea646e1b062aadf7901e8c4457b30ff71c9";
   };
   erdc = {
     revision = 15878;
@@ -19002,31 +19071,31 @@
     sha512.run = "56754f7ca1872837a362b1f5cc929fe5ed8bbd59a1a45eb2fe20b071f7c44362b0d98764c6d2870d275d0f0216a9543cc1e9f671f92de1b6b02136f9076f5f95";
   };
   erewhon = {
-    revision = 75452;
+    revision = 77677;
     shortdesc = "Font package derived from Heuristica and Utopia";
     stripPrefix = 0;
     fontMaps = [
       "Map erewhon.map"
     ];
-    sha512.doc = "e796a610674bfd231a99a7351446ec0e574f447652beacd7f3e303a2490b65686f7dd9b246c4f8ffaec2df007b129658b67c22afa3765b97112f4ebbd93e17ea";
+    sha512.doc = "7af5fa9d050bef4ca6b47fb6ae54925b70f04206b79b1a9be6e1b9732c61deafdc6fab281a7a8ddce6f4afbf3197eed6a361c7124d2e9a8ac92b0482d6ad94e8";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.123";
-    sha512.run = "f3396c52ef9f15923563e188088686fb939b82fbc728f63bf3556d2e2cb141241925d18297ff132564e9dcb0ff851d76830f84657986fda915f0035eb339bcd5";
+    sha512.run = "41ae5f87330418b2adaf95e87acd3e50ba095844d19e0a31097f307e9fb4e385b2f9fb3d61a9aff7127c07af373680c77fc10e107c25805131fafda444d01688";
   };
   erewhon-math = {
-    revision = 76878;
+    revision = 78173;
     shortdesc = "Utopia based OpenType Math font";
     stripPrefix = 0;
-    sha512.doc = "8e010cbeb033514cc785e75cd703718b9ba9ce6dffd424d0783287aba22fbafa338adc5cd93837ea132f9703582c7061675077f11131947b6f5c801324beb800";
+    sha512.doc = "1421d451b895704d100bf97f6dee00ec3cf3e0259f612ef758d3f64ef7c47b7ceec5a7e327cc9d4243128f41fac5c10911d0ad9a43da38e7772da965cc1a9b6c";
     license = [
       "ofl"
       "lppl13c"
     ];
-    version = "0.72";
-    sha512.run = "2a1e27fc4d6e9495d40f568d777e223829fc9f256908a5f5f3919e92f481b0457f0aac96662bbe370a051c7d6a6c5e4d3b7b9c34dd10a4fc5bbc9d4c101b4369";
+    version = "0.73";
+    sha512.run = "76de41a14a4addf6081ebf82e3ada8ed5ea87f60cab46e98c32f6372b3e2f2d2d5983a2b4a9dd2ddc18d221f86bc9f5066923e57611a6e97f33586bdc894d7c5";
   };
   errata = {
     revision = 42428;
@@ -19039,14 +19108,14 @@
     sha512.run = "ac3b99ef6e120a5b488cf79f3e942c10a47ee92e84a04d3667f99810ef365aac66598908c491897ef7a99df268a0bbc7185d49aed2313487712e300383356ec5";
   };
   erw-l3 = {
-    revision = 76924;
+    revision = 78116;
     shortdesc = "Utilities based on LaTeX3";
     stripPrefix = 0;
-    sha512.doc = "d616b440f29fd9aeb0e2c22bf8fbda661cebcaeaf35981cf4cf9e33fe71ec4347cf2e8e9d09125581359b6b07e712984c7ccc10344411ea707ee8bd28ead8d9f";
-    sha512.source = "377996b8732aae9f41b58508e19a17b431bd295ea969474a910623cf5c7c9d95f1f299f7196561c015b9d6858fb318c7bd6fb10092e50ddf39a4a7561c5b1ca6";
+    sha512.doc = "bc993b523a87f7f59697554720f5d684f47935a21d8ab2ff312b7187a6abb4864bb5505924fdd438b1f7f6ef43493f0fb60ba0a68650f089aeeddf8664150ba1";
+    sha512.source = "d74432eed7e5989aa31258ab9eca642b52f7a1459dbd528cb099db3151086a44f000e5a635caacf486d570de5617d4e5003262cafa0c8c00b0ea69ef90d8b722";
     license = [ "lppl13c" ];
     version = "4.2";
-    sha512.run = "efb77cc700f5ab0c54408b3637756b132acf06374c1762cdd0bf71363848d7023e48f7656a76c5168bd092626c991db3c06a9dd0cda062be79aad7b13923b880";
+    sha512.run = "e64bdf1a48d8d2b403e5ea732a90dd09c554f9b3c37c39ca040be6ac3a8c157ddce6acd3b617ab7ff2afa55b7e75869a46d9c1564df224fa11fdc400bb56e9f5";
   };
   es-tex-faq = {
     revision = 15878;
@@ -19095,14 +19164,14 @@
     sha512.run = "18354257ba774a5988100730a63411715330a0a18cb8f63d52076859394305c15c44aac307c9c4c26b195583456d3219c35f8e5caf4f480bdfd2f13ec087cad8";
   };
   esint = {
-    revision = 52240;
+    revision = 77677;
     shortdesc = "Extended set of integrals for Computer Modern";
     stripPrefix = 0;
-    sha512.doc = "aeeaafe3746b8fd75ba80fc36b1610a3e4f7c7f26044ca82c2c8091139e0294275a1dde9dd73fb3e5b013ff04e4d0f26422e8c2a44a88beab167353e7686b3fe";
-    sha512.source = "242e864b822f5deac76740d7a00edab9b6ff77e260b3e1adb6676dda009a8c200b9352e87998b76ac3047f0eacb9bd5ef87ac554c7c20ae649e91f1fcad889b2";
+    sha512.doc = "47299e50c8afab1279aff6ee64cada5c255c962322c637a8cb91079ecefbae8cada456e3c1527253eafcda159ef804d5ba45df5929e07456c6221e6be97ddca8";
+    sha512.source = "4951d35c7040d279421882487345a137bde13cc2f9437a50f83be5b8940b36d402f712c8016aa6292d66c8a85d103fb4f3a89ee3554f82ccf55dd839ca28b8d6";
     license = [ "lppl13c" ];
     version = "1.2d";
-    sha512.run = "d0eda90d6a890b7813648516f21e3a88213b1374df0c418895301354de402b9634492a1fd89193f34c6db6b9fcc0cdd0f8f46472e0e3a210234c7d8cab1bbed8";
+    sha512.run = "055c14dc00f5f90074574dc8a6a11ab15fc1bafec9dea36e3a7683e31dbe388530ad72ddaea8f3bee53a129db330b0d69fac43276133f53c1daa2f58ca173d81";
   };
   esint-type1 = {
     revision = 15878;
@@ -19147,14 +19216,14 @@
     sha512.run = "e5ef11cba6b0251844200093445f5183de60e0c0198da9c7000ef5c05a2a9a4303a15dc77ed03e9874e452ffdd283016cedb8901e78cd0312ea5bbcc529b74d5";
   };
   eso-pic = {
-    revision = 77066;
+    revision = 77677;
     shortdesc = "Add picture commands (or backgrounds) to every page";
     stripPrefix = 0;
-    sha512.doc = "2a25733b70f03bbb122f12f876f5ad34ed0f99e6336ea55a4b222234a9fbc93ceeb4e2a557f49b434253db0eae4f2dd892e421c8fda4a4c32169bac535dc37ea";
-    sha512.source = "6f8d04b06ab7954165c6a7e96b12f8435d420600a91d18978fb5c7aae70756e303b13f9b09637d57d8dbc9243ec0c62c3084153cfbb40dc6d82ca32d525049b4";
+    sha512.doc = "95ce621745727d7f857d9545934914417900ca7aa03eb511222af31d73308e7755a369124e3692d672f09e652278a2decd7a88a9a2a07e5f146a7744c0400eb5";
+    sha512.source = "25eb83cd78701529cbd066af73be68de3f06d528120275f7065f27e32713ec4629d2dc8a48cccd9cf9808c9a178f20d7d87846438ffbde236b0ea0e670db6463";
     license = [ "lppl12" ];
     version = "3.0d";
-    sha512.run = "fc9dfa71e0cda6a38e064c2e087b5b44d596b5acccf5e4c369da639ad0066ca8e989a7a78ffee134f01af8d27852f37167327621b0e51c1fc93056ff7c983959";
+    sha512.run = "5b2f99519e9ce7ca0135976ba043009057d506a76a8b690563717e5e357a1f6d5ab00edb461d37ea106635141efb03a7c79ebd23106506d7101f9e3aa788f526";
   };
   esrelation = {
     revision = 76924;
@@ -19179,16 +19248,16 @@
     sha512.run = "a1cf979d0b20c091db6893a800958d51f841c6921f3a5b946cbcedd3715bfff17d542c7be384258868b1131190f7e926d0da5835a8f2700b50be4ea6db62f555";
   };
   esstix = {
-    revision = 22426;
+    revision = 77677;
     shortdesc = "PostScript versions of the ESSTIX, with macro support";
     stripPrefix = 0;
     fontMaps = [
       "Map ESSTIX.map"
     ];
-    sha512.doc = "1233a284b88e5c8bfb29350b3b534e7a4c81b5692a9ac7aff5d69f77210e026dede300b511bc45efd18d6a96f6df9be2add166c80f0ee5d17c93732c0c242bf0";
+    sha512.doc = "1062feb2b49f0fc63fdab700b024e6bd750fe2d875e244c2d25529e5ebabb5d09b818e12483659ceb9de7204ae40706f3c44b1e7280f0ffbb8a6638b879895c7";
     license = [ "ofl" ];
     version = "1.0";
-    sha512.run = "e503f25cb713918329f297a4ed088b63967eb06828fb753653aaf60ef99c5fb7db6507d6f0f74080b9fad2050ca1917f7ab873be2fb0bd3fcd126f29a43eb775";
+    sha512.run = "c9551ae7adf7e2a286b34e5a7945cfb4bd59b44306957171c10d3cc4a8b7aaae11f7d90a6581d1a46d092d4a1de991e3a6f778e7b012b5b8076de014142adc51";
   };
   estcpmm = {
     revision = 17335;
@@ -19201,27 +19270,27 @@
     sha512.run = "20213ddd795e862dc924ddd71df08752f6adda4be7a06237507cec84abf6a6ccd664fa9676cb9b275ca9de8647011da0bc731fef9344945404f885b56b75aea1";
   };
   esvect = {
-    revision = 32098;
+    revision = 77677;
     shortdesc = "Vector arrows";
     stripPrefix = 0;
     fontMaps = [
       "Map esvect.map"
     ];
-    sha512.doc = "502d2cce629280d7c192ad11764c0c12e65f9f1318286d1acdc3e08c9d7d36b07fc3e5939c053aa57ad59ee91e73b4035c9bd1aafee3672ddeed4a64bf3cd7ad";
-    sha512.source = "658e98e4c97dfdfcb34b396ff644fda060a645d15760bd975ad1397ca73f4ed24331a77bfd914bfe6f8f218aec9ab3fcc0a2a48efc19a0c6adc1024943584a47";
+    sha512.doc = "4d2eeff0e3865b662b2089bae2e42bd9bcb97ce2da00641ab8400c6a93edbf5005bb3b3ee2fbdcf6c351267c642ce44529559883256ce969d89ad5e6ca32a56a";
+    sha512.source = "3bd6231f627faa20941425566f06558a0789ee89353a42ac6b79b970f3c688c27a55658dacf4e09bbd2d056786184f07d51bfc63c10b95fd1178643cb07df8aa";
     license = [ "gpl1Only" ];
     version = "1.3";
-    sha512.run = "1a6940862940d8ca29bcb19c69817b84a7f71f7a8762d3a63829fb0e0e88eccd940f3e2973d8d05dbe9323aa1f80dc9045b531e3509239eab399f02a55e7988c";
+    sha512.run = "abc39ddf927cc8119463ed1590a7f5866512efc60f65ea1596f7d9fe00299c64945c42f4ebf88238d71f8ba802f72bb61c51124395addf92f967a91ba79e1249";
   };
   etaremune = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Reverse-counting enumerate environment";
     stripPrefix = 0;
-    sha512.doc = "4d7728be13e1454b2456e543ffb89a19fc5204e8025f949dcda7ce3b8a8b898dd9a6d96e44477cd158baad4d462afbcc17b6df6ddd9982232891e7b4ccb112b7";
-    sha512.source = "17c0b9d705cd5ea494428bbfacf73d12f0f40d5eb4be2a3b1a4e2aeb97af61d184ae6a471505d6dd604174cdf34976f9e64de5366be7877da26141720f542953";
+    sha512.doc = "e786848dae2dec22f53b8f01e3397b0f441dc2ddafeb2392177061b1a3d803d89f0fdca558019ec7d6a178edc791d8b72b5ccb16a3ad026137e8592992393cee";
+    sha512.source = "dbb29086838694c710b2962d777eb6625a7ba026d63b0319f99058ddb0a5608dccd4037a70549b92e22a81ab1e3d51b4a4a322c1427f4bb0a4084534d7cab906";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "511f84d8cb951caaea65cbe839fe83c9c2dcd7dbe0e0c3db3611d914dea475b60de029d4dbe482616e9d219929c50b2a87f6c33451d0d880e3b368fbc9f7f612";
+    sha512.run = "13c03d7d0cbee1e6c0113574fe2085dd561bd5f91a2edfea2b62bd794d61baee5e544d0c0cfa78cfb6c276486be9eed411233e1ae73854bd644420ff7634eca7";
   };
   etbb = {
     revision = 69098;
@@ -19256,23 +19325,23 @@
     sha512.run = "78bec7371541769eeb3e9d8dda666be6557091f824cb93960e7ad083ce54a90012524b16c0294cfcdadf475b2707db0e32437f70b085270359232267f184b1d3";
   };
   etex-pkg = {
-    revision = 41784;
+    revision = 77677;
     shortdesc = "E-TeX support package";
     stripPrefix = 0;
-    sha512.doc = "2ef9984629ffdafdc799041127e31360c8eee80726d8c410130d61f12de306e7b4c2cc892e8012029827e8ed470f9191eebcf758830cd34b8d01593ff78cef1d";
+    sha512.doc = "5af6d306af284f4c28b2303377f86fdee4a01e53defbd4cc57eb4b2ca0258efdf5f63d12dbe60989ac015f2ca28ee2f41afc2bf72dfdbf5934f3c1dad2b5764b";
     license = [ "lppl13c" ];
     version = "2.7";
-    sha512.run = "e2afebc530bdab4d5384170dd807d6e39c96d5a18af0defa534106103243b0e52d926e09f3ba62378452ef643bfa8f0e4d92a3c0256847c91e561707410052f4";
+    sha512.run = "c826f2e8678600344f4e760616180454e0a91f02e192d7315bc742b5fc00ca617b6d990e4597df39d8c0374e7439265cd65cf0c4efd791c7a57a53794163212f";
   };
   etexcmds = {
-    revision = 53171;
+    revision = 78116;
     shortdesc = "Avoid name clashes with e-TeX commands";
     stripPrefix = 0;
-    sha512.doc = "841ff47f9cefecefb241cb81602b825c07d4d0eaf143343eb9bf6c35ca66194c98f851e4aa27a369d60927fe96968bf7a1c1d8dfc7bb5be092e77330ad8ac6f2";
-    sha512.source = "057bd48b4c4455f3641c961b6337127c6f84c72dd89615197c095b13846599f1fd8016ffb7fe22be820f16f7b012ee0991d8e959e59a3393694239c1abd610e7";
+    sha512.doc = "643cfabaf800b8261224e4438d1db96addfbdecdd4a5de4b82b6dbf66f818212ccd9cda1192e1cbe087a03cd72539b935cce7eada5fc04fdbe585ac81995a182";
+    sha512.source = "e6f0f22463eb20eaf9651e21c89f06b930b11c95ed183fc60f01dba0c31e012b0b01b061c5a17a777f86fd2358a9b8e0bf7c0d88da107c7bf48353bb5ac52796";
     license = [ "lppl13c" ];
     version = "1.7";
-    sha512.run = "b0be75d3c8eb92407f21111e6c9d397ab5de39b96b99403a149a9554eff523e99cdacc9c1c37ef47cd190487511c6fc6b7c91b617e889eac1d6d8b6aa61c0c6b";
+    sha512.run = "910672e62cab056995203ec1f7528ce80150b768b663bfa0e3f027ecae21a8ac24270c05780f71e5fbbca7bc123e37f1014469a17975d05841a8a19154dec71b";
   };
   etextools = {
     revision = 20694;
@@ -19285,14 +19354,14 @@
     sha512.run = "ed7e514441de2fd296c372d9c56dd71ebd5318bd67eb4611c4bf784b16b045a08338ca4456899739dc023e5bc4695a6fd1784e592e542cac6a0564a68307a983";
   };
   ethiop = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "LaTeX macros and fonts for typesetting Amharic";
     stripPrefix = 0;
-    sha512.doc = "13e9149433cee0c44d8eddbcc6f738cf113581e4890a8728aff08a6f3f26a62617e1770b4875668dcd75a3714925db9cf5c5d9fb58a9870292bc0d22005c844a";
-    sha512.source = "46bedb27b22953ee6aab0b372581fc58186f3208c985a88006846a1f7917d998b5b8abfe463c3f415100f27aae20ae1d1648044850e6e7d095afa480adbe5837";
+    sha512.doc = "49f49dedc708f997b0fc7ea79e9d20d1a23cad58aa2f35c5cf845507c88afff843561b05fa716ef0ffefbaad24fde4f3cf62f4d6ac6f314b2c8bfd0eb21c3479";
+    sha512.source = "816839d823c07c7e892740324d10a9b75c524e8aa63f65601c3a04dfa724738db1376e34ff4b0cdca1b467ced7e1ad8457faf6cafdb3bfa854c20be92478ffe0";
     license = [ "gpl1Only" ];
     version = "0.7";
-    sha512.run = "ad9da81e2a9af7f93c3a9677a72b80335562677d552511463c20b73df25adb0a6765463273306486e295b8c5994af03fa1df8f1e70cc48ed7df44698637f8459";
+    sha512.run = "dc13716a65c19b62d458f176b7b10d6863c44445108d77824771d9b3491276c5ebf2a68a650029a55c8638c8b2015fee434cc5046e094428c9ac92be128f4bb3";
   };
   ethiop-t1 = {
     revision = 15878;
@@ -19316,23 +19385,23 @@
     sha512.run = "2f8259c81c8f4b47c34850d38cf04a3703c25fedf8d65a716550f152690a5d095ec892a0486a81e9add60d6d6db6672b9a953736d9f2c64b274f247e4e813897";
   };
   etoc = {
-    revision = 69343;
+    revision = 77677;
     shortdesc = "Completely customisable TOCs";
     stripPrefix = 0;
-    sha512.doc = "693a6589f33a93e9086342d093b8801235d9e7d8e1729400e4e1069d0bd9457bf8b96c0a946110f12e2cf6ae646dfea81fcb9a795724558f73e53bb87b300957";
-    sha512.source = "0311468458efe4ba2b12bb0917dcc4bc763a1f7e1e6f2621843358afea9edc5a96373f5beb74224df33be1276b36cf53f7d45fd7183574acc38057b31c51f01a";
+    sha512.doc = "9706df4db365b1d63f26cdd80472b17a5222cb91374c04adaaee30224a8944d810a72cffd244699217f6062cd3410549ca2c036e6a5d2e25175c32375c03eb13";
+    sha512.source = "bc1be245ae29c51e1c1d90c4b4416a0e0483634d0a6b520d9c4ee0472d134662adb59d2b51e2fef51c802be99af68eb2650148bda9ba024a4cbb8e1e76a35f11";
     license = [ "lppl13c" ];
     version = "1.2d";
-    sha512.run = "ee9e46861d53c0cf3f0807f55a78b2e9c24ed6d5b37037b87f162a297421548561728dbe268927e7155a16da256e61b24c74ee9b1c18addbca937b8c85ce21e9";
+    sha512.run = "2a3bcb1c163a13f8f396610fe9b0be4545a1fcb250366da34f1282ac0323cd397514af9b6f35b04761a3ff3519bf107af5d5ad9a8212c5de4c7e845c5f0dd2b9";
   };
   etoolbox = {
-    revision = 76474;
+    revision = 77677;
     shortdesc = "e-TeX tools for LaTeX";
     stripPrefix = 0;
-    sha512.doc = "e6f12134179696237aed2c2ca8c2758ecd8ae4cf82e7af4062a106812c652a8c32c96a6b3c37686a8241005681ca116ba33f127a6dcad265059aee0a9a54ea6f";
+    sha512.doc = "b84b656fbe259414fabb77da0ed0f8837bd6262cdfcb06165990e4739bd39ef3da60e7f2232bdea00cf997c90e264d13bb1ce97e515e38d96014c11473800f07";
     license = [ "lppl13c" ];
     version = "2.5m";
-    sha512.run = "f99e449c87808311df117cb988d086b74d7cf80b84dcebc9cbc0d385566f9700b3cde8c0e69f86872e75bb93df8b24cfba43bdb0bf5d14edd73b22bdd633bf5b";
+    sha512.run = "b2b3c5b29498553088b7a86a9e088c0f1a66daf354680beb30e0c4730b17a0917764d583c1b2af2f3a06c734a49de60b2087b9d7ea0e931e888d73f74e515e78";
   };
   etoolbox-de = {
     revision = 21906;
@@ -19411,26 +19480,26 @@
     sha512.run = "4f64df42384897fca09574330d919704bfac2115f330f8ef085c9be60b51c64a9f1f46c10b863e989b9eda6559a3e2cb2388a59a997afad73632d83b02177b3e";
   };
   euler = {
-    revision = 42428;
+    revision = 77677;
     shortdesc = "Use AMS Euler fonts for math";
     stripPrefix = 0;
-    sha512.doc = "789c0b35257ad74dcddea589eed36f0a3b86eae3b201fc708c13cb11dbedc5b489d1495c218f9e10558b8977658b72c345a5622c10b8b1d7ceb3065a6c8fb9a0";
-    sha512.source = "59e262e4ebd3eee88828fb2cbc91b55ffe962e2bfe662df5c052075cf4fe4b9b8580ce217e38e4709789a0e77c810f9681ed3cef95f10709c54da5f1dbebd73b";
+    sha512.doc = "bf3393861d584493ca986e611abc1e08038ca1a7fbb7a9f67f0d4d8f7614704d35c351e216d9a1a9d8ba3f152adac5797ca6f23f022a67b2b00c1293e9ef44ad";
+    sha512.source = "80cd0431f94f183433fecfb7fde319c40493f55ea80015cda5805b297deab150974d6133fd4184f70eafba38e4223469de9c9878356ecb31c5e1efabc72f0011";
     license = [ "lppl13c" ];
     version = "2.5";
-    sha512.run = "3b3d383a2f715f14dba0ab926d3df9d10ab63c06d203c59e551732a7f6af4ff8965750404a37863c91d3fc3db7d44d1a279d03839162fde9d8d9fd849f0047c3";
+    sha512.run = "2d24e0554d930da48d509fdedf4fee558444fc0ec5b5098bcbcc8ee81c03966698d24ef9a8d4f8b60669a5d92aec2027cb622ae34855a83190311450d3493823";
   };
   euler-math = {
-    revision = 76681;
+    revision = 77957;
     shortdesc = "OpenType version of Hermann Zapf's Euler maths font";
     stripPrefix = 0;
-    sha512.doc = "b94aec37b78b72f89a23c8e0a5058e9f24da756acda470a93c51e2f04264bdc35760268506ccf0b27611e23397cad84bf3e5245531663a993f8c1df7efb4afa5";
+    sha512.doc = "08cd54d1375b4aa62d6ec7f6f813fb6bf1e5c03ab5327bd2ef75654425e03655c4a29c6119906185a63fb89dfe29239d3d569fe41bacbb70dc4c124bcadc2792";
     license = [
       "ofl"
       "lppl13c"
     ];
-    version = "0.70";
-    sha512.run = "d6efb88928d9cf30f0f2a35adb0daf272ff249f341c85ecdd9a3738ef079ad9de3884b0ea1eb29359c6dfebebf6ad5449f4148bc5b4c8e6eeb9ee2fe4de6b24b";
+    version = "0.75";
+    sha512.run = "661265022e09e636354766fc563eb2a1b8438656a1ccbdaee228986dfaa07ef4862355ddfe04b8f590c7f2c754bc6d98fa6d330c2b6b01fb7635f711889efdc7";
   };
   eulerpx = {
     revision = 63967;
@@ -19442,14 +19511,14 @@
     sha512.run = "86f23cf10d19427876caa9e21bdce3adcfa7ca06578e7ae05f20529333e36b7135695c1c3990c6700e0ad365fed41634de5d152813ccde20cf642d7e2b282455";
   };
   eulervm = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Euler virtual math fonts";
     stripPrefix = 0;
-    sha512.doc = "cd800f27965aefbd2ce411db45e1ccbdc2837a337b5986d77d052fbdf9ac9d8713a70b5b3f379011f4a2be70fa91111fcee3ab73bbad75daa135743f2a92b0ef";
-    sha512.source = "45f5eeeb134e321b902b8c5d949c751ad459641bfb4dd53b6f5ad8b6c1f744e1cb27d68e98047d460074f6c8308ef8e2addcc916ebe4fa91815e873abdad967f";
+    sha512.doc = "8beec86f0bb9b2785a8ece2e1b297073336bab2506b6157845106f9b988fb92faa28081a65169d799b3f16fc09ab3b9d20aff755d6565a2b7dcfdcea037bcb74";
+    sha512.source = "9619b6b9b22fe05eade887566dbb447f41d3d6c7915c09e9385c646a171389e6a93e23998de395c7d3f7d56beafc0d7a374e1df6d89705cd1708004ee438df31";
     license = [ "lppl13c" ];
     version = "4.0";
-    sha512.run = "52006ada6488eee0add2e25bd98d500a96f0c8c6dd9980dc4d331649a2ac4dcbabeeeadb4311cce173bc5c123798402e3505bae14d1e3e26a84d183a8290615c";
+    sha512.run = "621db7024a87ba6a7a963e59ab801ea46bc4368cdb354ebf9fc028c3ff59f406da1181a136b463ac4bc7e94d44c558b0d8b190b5a67a3d5fb664c83da62eb6f6";
   };
   euro = {
     revision = 22191;
@@ -19499,16 +19568,16 @@
     sha512.run = "657f3b082416281d13a74abe0ac631b3d5c76ba218f35e41bae567c48e19114f37ee368e93604fd177bd85208b2871cd42f9edc2e69663e0d50f40b315acb999";
   };
   eurosym = {
-    revision = 17265;
+    revision = 78116;
     shortdesc = "Metafont and macros for Euro sign";
     stripPrefix = 0;
     fontMaps = [
       "MixedMap eurosym.map"
     ];
-    sha512.doc = "db226757ec82087da3e67fe69b5e9c2429e3cc2addb126bc528dda8bc421a4e9da2a367e64f119eb109e8898409a4e50177b81f9035ed1e0672bb902836bb61f";
+    sha512.doc = "8f07ffe860c0a2db8e045910773e0f11f871b6def4fa69c2c50b8291fe0b23ce1e02a5ea5988d1369191a886aa2ff1cdda2417e6a2012c2d29f4104d52bd8b77";
     license = [ "free" ];
     version = "1.4-subrfix";
-    sha512.run = "9624b0a91a8491d4178051e8e8264e506725ace0eb1b4e4ee9f3cf38cf7868d392f0f4fae92947c74182a6cdf7d4cfb46319a269e4e3aac686ecf4a4cd2f7b3d";
+    sha512.run = "15516d58ef64fd88276e5806dc240aa1f649e700ed791cc48b9ddabc889d666b1c98af77e5480682220efaa07e9703c249e92ff21fac05ca9052ab9a75b886b7";
   };
   euxm = {
     revision = 54074;
@@ -19538,14 +19607,14 @@
     sha512.run = "56547973d184de21ff5d6d3eaf1baf9b8cdbcf93307c31fbbcf658350ef0d441509ce359266ea6f962ef9b40b1680b47e4c14a822aa043ab8174ab0610df1665";
   };
   everypage = {
-    revision = 56694;
+    revision = 77677;
     shortdesc = "Provide hooks to be run on every page of a document";
     stripPrefix = 0;
-    sha512.doc = "4c19f905b5a16674980da2569b2994382a2eb108fd20bfdd29a6ef4220e00aa390c197dd86ecd093a9acb83b9a2d64521f732083e3c2828478a8c8c45463d180";
-    sha512.source = "f01679f5ac00d3c75a0595496b489a008c664d7197af6d267226498b821ca83d34ae842c212756ccef81aae40f4447ddae2146b5651084dc55081f75c1ec04f8";
+    sha512.doc = "c555bf5b6774290bd6ca8968183549effad877e62f65c3dbe1621b311b0af9f773e8ebb8531e3fadadd4726bb66ff0c48557629dec263c3e64898674b7dd4469";
+    sha512.source = "be8192da2fff651c0ff84fb75884c55fb51b8b3a9622cc2e8f24fb32536dc78cacf9e2009613470b27ba731d54a966c6e826d7368425267e571d08e4c339d0e4";
     license = [ "lppl13c" ];
     version = "2.0b";
-    sha512.run = "032713896e2704667582aa03e8d542062a5eb26188d41b08968955fbd8535aacc8288559112aa264c542e3523f452dd9b2acdd1dc3f66450cdc5c5c902e38b80";
+    sha512.run = "7ec0679d9d127a9e074bb63683de3ade675bce6e0358aa028133787521e13c563d3be098bd28493e30bd24bde74b861bef53e8e53241ca764a5ce3ee76891f09";
   };
   everysel = {
     revision = 57489;
@@ -19558,23 +19627,23 @@
     sha512.run = "79b83d48e3e6eedcf1673a30c28fc06eb2ed8e3bd292d6cf914faf5ce2929795e6dd11baae3a207c796abb67ced2a2442af11c2618fd7d565696f8bfd121a0a2";
   };
   everyshi = {
-    revision = 57001;
+    revision = 77677;
     shortdesc = "Take action at every \\shipout";
     stripPrefix = 0;
-    sha512.doc = "2a05f4b42c1a85b4af8fb3881d1e32d0cb8fad7070bd8eb83632b50e387083a5c8fd264b61b70416451f56a97e1c0702507bd50c534ab7baf975372d854a97a5";
-    sha512.source = "4ae653fe3cf9dcfa51f461ca72954eeef666a6324321cb5e6416d7e2baa5320115818a26f1970bf7654acec9454e5174262578fc4d28f251d3476d27d6d4d9d5";
+    sha512.doc = "dbde99da6e135438a4830e277eb258928519291f5e15ae172d84bef3dfc40fc812b9418bb0387457bed6daab824330095725239f99fc3ff7477e021351c761d3";
+    sha512.source = "daf5c782151d1f6392882abadeb02d454a4c4a7c83d3f71375f245507894eed23c60bbd6170cb9af3f2de968d39292a8eb43b6a2967f7e5a3028bf1cf26af462";
     license = [ "lppl13c" ];
     version = "4.00";
-    sha512.run = "b6219fdc669847a30ad2359d6b0888eec0980114d5385c018e9ddfd0876dc52390e1e8ffae5d2850cfa140833365c30024456bfacde6615bdbe5101e7059d52f";
+    sha512.run = "3495dc2aabbc4e6a8934f4325cc800dc47855126fb2137589567d4ed4da3adc0b6214d1d4df94b763db815463cf3eb03a0fd3411ed5f82777c893a22bff2440e";
   };
   exam = {
-    revision = 67600;
+    revision = 77677;
     shortdesc = "Package for typesetting exam scripts";
     stripPrefix = 0;
-    sha512.doc = "abcc7ead3c7d4847537476969bb708f61430940e7572e078e26baaeb6f2493309dcb996bac0796870825d4badb7bcabc81fc49aa7f4e71c0c816fd7e1ec875a3";
+    sha512.doc = "5c6d7aff1c078cfc09d7c7ae311a410aadafb4fc9beaa9bffe26366e3c650ea2a3564553f2fdfea05a980db253bb0f6cdbb106ec645e20fc8a1d2d07231759cf";
     license = [ "lppl13c" ];
     version = "2.704";
-    sha512.run = "99621f442f2a36e661f98e2722776e2e9dc394abc39cd20d45bb6bcff3ed362a942dc79d386ebf45efe053fc6abe2524d95fc85c4c766d241385970fa00e5f65";
+    sha512.run = "fb8461154f94a74f7c47340dcbb706e44ad9440075683739f366d7eefadb160991efac060fe8fe79a522343b1ee60d3b1f85c8edbd2663faa375c57b1beab29e";
   };
   exam-lite = {
     revision = 65754;
@@ -19756,13 +19825,13 @@
     sha512.run = "4bab7478a9d70dcf64673a8fd97f2a7e133708d31cb0af06ce16d0b7158e834434acb90e038a4b4e7695cb4429d54077cb46c2112fa79a626d3d2e886495346c";
   };
   expex = {
-    revision = 44499;
+    revision = 77677;
     shortdesc = "Linguistic examples and glosses, with reference capabilities";
     stripPrefix = 0;
-    sha512.doc = "b0dce6401ccdef7fbfebbcdef9d68f073058f935eabc95fa45619f4d4d85e6b53e15091d845593255c000c3e672dabadb1cef024b2b0c79765f4f6a231de86e6";
+    sha512.doc = "af19435f632e1dd7047d633a561850a30719ddaaa8c9d7bdfd34d5398cf6d2cd3929c63bbc55e44da9d41aa18fa8177d281b61732aa75920f4175a3dae96f46f";
     license = [ "lppl13c" ];
     version = "5.1b";
-    sha512.run = "b447a885d65a000f0b79b4c9b050bc89bb32b71426a29261d282fad72428fcf64dc6c660d9142114094bba32040c8e723190e553260c3899a1c1923ebb9f765e";
+    sha512.run = "58f7f2fa1b2688e957c64b4536297345803ba9ce05cc346c3c4bf0d18881b7ca585a16c5077f97eec7a209e90547baaee9022cb5208848055f0b54449392b09f";
   };
   expex-acro = {
     revision = 68046;
@@ -19793,9 +19862,9 @@
     sha512.run = "864f43e90542762c5db2d0f38a91638fc7eef2606c9914eb0d448991cd17705771f0e967a3353161bdaeb43d4b0e9ba0008e601506123c56c713f307f21a755b";
   };
   expltools = {
-    revision = 77501;
+    revision = 77605;
     shortdesc = "Development tools for expl3 programmers";
-    sha512.doc = "3ab3d99723d7b037f764d9e45c65affb4194f1005b03c7956bf060a1db0fb3b66954a4c3e7c3a2c8d667ab8a2fd2be83b3a7cd6413f8aa0e4a93209dbd8c1b58";
+    sha512.doc = "8f00fbe40fee8ec69627442efb9af91b77629bac018029bcf1f936b61c9572c6b2f18642b98910062b1fad3354fb7e3a4859ee8c0dcee378506995398538315a";
     scriptExts = [
       "lua"
     ];
@@ -19803,7 +19872,7 @@
       "lppl13c"
       "gpl2Plus"
     ];
-    sha512.run = "242e013e2ad245907fa563bc431b4f5a8971fb484f8221ec4ddabfe1adb2689bc9981589936bd1336bb55d5c2b9a6439c23c3d6a06c0f683ef1c3b5e9b87814d";
+    sha512.run = "ba6c4677d0b1ef73ac0371e2c37c2923625c466e1ac427d74cb749dd1813c9347ef18faac78f36590ed166363ca2a2def5587ba31462167bac593a420546d43c";
   };
   expltools.binfiles = [
     "explcheck"
@@ -19856,13 +19925,13 @@
     sha512.run = "384bcd5c1482713c33a083fef654cead5935bd98cef3a047f13d9835e529412bacd525f45d8aade19c83910f5ef54f1a0686b2cdc43540a82b9c469aa5aef3f2";
   };
   extarrows = {
-    revision = 54400;
+    revision = 77677;
     shortdesc = "Extra Arrows beyond those provided in amsmath";
     stripPrefix = 0;
-    sha512.doc = "c51c13205ebb78eabf181b4a927bf92ccfe6756d732162407d1e98961c6b50fc20143de05c992feab2b6622a80ad7556eb173d87264e4c0059cddd10eaf8506d";
+    sha512.doc = "19a9d432fe202371770aed8d6ff1f71741f39f26d372b76b8fb4348f1c158da80ab17a9421feb0e288c03a31b27590485574cfe9737474d33402f7252f16b6e6";
     license = [ "lgpl2" ];
     version = "1.2.0";
-    sha512.run = "ebaceefc82c42bd0b0e341d6d2cc589f9369fceec0a71dd7da40f0228b0ef1fbdcc9ba95ee0990b47b4a202d15c87630e46867afd8e9d69fe02fa721bfd590c5";
+    sha512.run = "c8aa5613606b8170d8650fe34dbdd52879fba5b3146a15b0afa60b97ab723351d3edd0c05085ad83d969fff9846d2b837337d23b6ca0f80edcc7a73b319a3d1a";
   };
   exteps = {
     revision = 19859;
@@ -19874,14 +19943,14 @@
     sha512.run = "1991bc0b471276ca3db68a8ba7611becc4557de4335a321b5c3e92c1fefbe34dc0488ab44850835b5ceb1684ce429e7756fb86d885e2da2177e0d9081797aa0c";
   };
   extpfeil = {
-    revision = 16243;
+    revision = 77677;
     shortdesc = "Extensible arrows in mathematics";
     stripPrefix = 0;
-    sha512.doc = "8c2983b2e777e21e95d6ce1b9b4732491ad8a931205adb071877bf966fbbdc4306b88b35db87db4c3fa0bc52cfd333f721de2e1e7d233ba3c91d192a3574171a";
-    sha512.source = "6dfefa85e111b39bd46b2f39ae52e94a053569fbb0b263bdf02996bcb122913cbb999ed6c060e00a12a88e0ea9b187fe2e33a990bd75fd1f6f78082d8859071a";
+    sha512.doc = "5bb9c3dae06f9214ed7660999a49217e376e4c83473953e0c16a36b6027e586bddf89f2975ce342b2973c6b1382d20ed52dbb1f72c5a1945260826f6b9cf7d42";
+    sha512.source = "4d782d407df54d9fad31701d571b263c064fef54ddf900fe2501e669ef7ba7613a4d56c7f04a10b55188bafda59dffc2e33b24be87ce7af7af8ffea9d7ac151c";
     license = [ "lppl13c" ];
     version = "0.4";
-    sha512.run = "5cfe0172ad420c3ca53c57be33fc56b205ba05a11876e4d14c6d86387788c73370bc0708bee46e43a02f10ce9db4b3611b4ee337ace44fe8fbcb2ca82f88b2f7";
+    sha512.run = "181ea5fc0123d4187a62fd3ca4d5a849364119448639dc1e49f269664ef31a95faec1e237fbf09e225719401cb4c4073b7a27cbec43060836d24036374617ee9";
   };
   extract = {
     revision = 52117;
@@ -19912,13 +19981,13 @@
     "extractbb"
   ];
   extsizes = {
-    revision = 17263;
+    revision = 78116;
     shortdesc = "Extend the standard classes' size options";
     stripPrefix = 0;
-    sha512.doc = "9bfa898f7eab416beaee2938902fc0f3a5ddcf1ce972f30d18a683756fb53bc8f66ef1220bd3bbe6ca6a473959a67c55c18a7996eb095ef301da8b594f42d3ae";
+    sha512.doc = "7bae3f950094466295ade68983a8b68346d389b958184477ec9e4de8e32caa20eff58894d3a1df57cc66fe936f9f660c72e858f7cdc8739dc23bb562532216e2";
     license = [ "lppl13c" ];
     version = "1.4a";
-    sha512.run = "5b000d25ff594af2895408f0d83eeb0e7d6dd5604c53d5acd835898197e44fb88ed2469039489b75b45678f28182dc88a0af56ed1b1730be2ce41e6e81f13b7c";
+    sha512.run = "11035103e1fcfaadebdda3d494ce4590e2985119ca1a868b8b92fd8bcfa841dda92dc091d5a21bf69b3c299452d0dc9ad89085df617122761dcc59e1c318a337";
   };
   ezedits = {
     revision = 72849;
@@ -19988,14 +20057,14 @@
     sha512.run = "dbe4eed6fd1b3bd3c2d48ab4590043c2bf95871350bc1b56f47bb4dc27ef3010097741920ce0a935aaa03fe9e2e8de49db7906dace3be314fca49e816c7451b3";
   };
   faktor = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Typeset quotient structures with LaTeX";
     stripPrefix = 0;
-    sha512.doc = "57934606287afaf1471f1207af5d0e97533a504aa83324069154e88e70f10779d2eb19ed2a9e177c5a4b2cce4203b576272fd2513d989d4ee276330305597034";
-    sha512.source = "01f22e60260621a41e4efd6681b6fa226f7461f47348a79dbd75f214d606c6af2fa54d904792e653d1accc22298385d4cd658c204e653e4320e2932d742da28e";
+    sha512.doc = "71d918f97a13d5a5c9c5eefc8f5bb4020a1c1e4119c851f5575ebad2160ad0be73d9d1797252c9d25f27fcbd750b508e2987c0c24f97ab492430464914079af8";
+    sha512.source = "222125be287e4c5cad30ba07130a01b3663afcc9fa255c65b904f55ee08fb36229b8d6ddd5a656ec526c4d0ddc10abd8162fe73981a8b5f10f5700f36a6873f2";
     license = [ "lppl13c" ];
     version = "0.1b";
-    sha512.run = "5c598fbb40d7b37ee5b66bc1bfa8b0b2a0b45f7e22c992e6d0c85ed952a79a120803d41f9b4a13bcbbd6424c555c8b9ba6adb4eb79d1056fbf759008f9b741af";
+    sha512.run = "99298deeff33dbdc943cca1376b17209806220cfa739f7335c2cd8fdadb568a98c625404bcd9e7883f09eb46608c19b03a15bc4baf9d82ceb190d3b7ffc63f83";
   };
   familytree = {
     revision = 63739;
@@ -20008,13 +20077,13 @@
     sha512.run = "2f3cbff39c42d0d6414b372c165bbbf3a4dbafa28bf16ca47a89445066480317caedc9b371f9deb348ba986de2c14b71b1820aa731e74d72a4b0b39a413bf9a5";
   };
   fancybox = {
-    revision = 18304;
+    revision = 77677;
     shortdesc = "Variants of \\fbox and other games with boxes";
     stripPrefix = 0;
-    sha512.doc = "2c3e0466198d392af57b2bda16f80589a9aa9db992272980a2e7ab9d7d1842d7e8f2980003b3b09648cfe0b9a1977562534ca54fae120bd7e4d950d25a83c0c2";
+    sha512.doc = "1376aea2fde99bd1ba228d4895b5b93a5281aff387f6a104c2474fa919b4f7e263ea5daade3cc8aeed4af22dc025ff92e51cd43410d2d7f1d93c675a638a0820";
     license = [ "lppl12" ];
     version = "1.4";
-    sha512.run = "752e26abee96dd2bbf77b30a6d98d48a1673632d5601d28bba5799e845a015357b96302f3f1d8977f0458003d3456df4694884a05ccb6124b76ca8f7fc84fcbf";
+    sha512.run = "6507310c718171fd9f1d96d97b551ded642162b59ddbfd7dc8a0cea5bc582819952f696859aba6d52a79288c32e23f3ee4d55ba6dd6302f6d71ed070eaa51422";
   };
   fancyhandout = {
     revision = 46411;
@@ -20025,14 +20094,14 @@
     sha512.run = "0091703483cab573f9c9202603d31e310baafe932f929ad852c23d2ca97f21681637bb3ae34fd3d916f3e50f553b42ab1682b437f5a63b67c6dc4b7b7f202c80";
   };
   fancyhdr = {
-    revision = 73783;
+    revision = 78116;
     shortdesc = "Extensive control of page headers and footers in LaTeX2e";
     stripPrefix = 0;
-    sha512.doc = "5a712052ba0dae89c21110d5fdb3282b6166cfc78894f758b7465e38f0470e922866b619b92d37c0806b48cd793fc75add5845475efd56f1505141842107d001";
-    sha512.source = "689d90083ad67111368bed56c3e0deacc0df5e95077ecca44f20d671339a1e3ad3dac3950bd3fdd73d74f75985ced0f74114bd20225d99e0d9a680c86732d1c9";
+    sha512.doc = "e13aa76a13675e10c86b02b6cdac981e4fec04fe5b5d51fbd9aa9f792328305732b47fe560cd3d94097624aca2d9f38c199f8f05881b1137710596abf5df2e9d";
+    sha512.source = "877d1b4614201950c60182b37b927f240dd8fe0767f7194982b9ceed2b8a5ea4db189a9bf72cb76a384b16a57aacb70bcd3d3964a19cf4aa67fb6261b3c6d4fd";
     license = [ "lppl13c" ];
     version = "5.2";
-    sha512.run = "039699b212da70f870d33b8f778cab3130e086c866d0ad23301bc7bba763f509cdfeabab4d04c18210182724518d737feb205f0d9d3de6bfe686c4c4d1c99cbb";
+    sha512.run = "232aae9c526e548bd73f43a2f6b887be3641967445159208c9b4b0f5769c06d68c549a5a73dc48345eb391192ebd24e470e8004b431a7f38fe207471b8834835";
   };
   fancyhdr-it = {
     revision = 21912;
@@ -20075,33 +20144,33 @@
     sha512.run = "93e1b88ca722b4169a572285443fad53b66ac59a3c0b6465aad54bd8d416046bfd79897db3d8f318f9d6e004c958b94bbcab16b1183d66197e1078840934689c";
   };
   fancypar = {
-    revision = 58895;
+    revision = 77677;
     shortdesc = "Decoration of individual paragraphs";
     stripPrefix = 0;
-    sha512.doc = "1d972212b86e56eb692cbcca5d7d47b9454a6c0900803818c286b6cc071df93c5444d36eb29a8035e53c65fc9c30582686a6b9203af8e142e1cf1c31a6e4d58d";
-    sha512.source = "3f88c040637b50d49981474b38d50cb5c3ba7baa5b6390b53f98e3315d1f17f0b0c48780f4c719583f3e452041ddaeb36fdfa367a616ce07a2758b11db152d39";
+    sha512.doc = "9206d5c7f91ecb5cf11b5873bcbcafcbf0620d261aa8e80a4626af114e3a90c429e81b42daae665885e64310a6f2d2727201355c5d09f26fe63ca5a74e85f706";
+    sha512.source = "485ddd1c0d124a55673fc6398a6b9072f5e148db5afa389d0d42152fbae6bda136bd755f266d51037f43e156e55d8dc9cb4991558cdca86bec0b432d614285cd";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "2f4e242eabb151834c6014a15d0ae012949e5e35f87bc32374e12f032bbb0fa21d6562b207ba855afaa28c36497cda3ca51eaefa579956f51283c84be8cefbba";
+    sha512.run = "62391ebefe943457254d483e7ccfe784959b7f64e219d21a7d251830dc73902551a43c71af5eac7414221d3533aa4cc1ce2c68aaea7ec6170797016bec87eedc";
   };
   fancyqr = {
-    revision = 72986;
+    revision = 78197;
     shortdesc = "Fancy QR-Codes with TikZ";
     stripPrefix = 0;
-    sha512.doc = "2adfbe599dd9596effb24857dd3a8c77e6baceb122c13838ca17b779025d78350a58951223419a65a91fe64ad67f9e1295614a51c6502b6ada6ae66588acaf0d";
-    license = [ "gpl3Only" ];
-    version = "2.2";
-    sha512.run = "5946be9b708b6964d8f861a6e227a8f31a54919427efcd39801a2e844105952bfbf6078cd17c6ba17babb7826b2edfdf32cc2b217b6d1d6bfaaa3c985cfed63a";
+    sha512.doc = "d2d0764e89a4c463f6bf7a879ce190c0e63f1b42abb7a28b2eb62b3b7c852d8918e4a9cc1cb7b6d11ca7c01f09d17b9d6b5a61a2b523cf25c97032b3e5698156";
+    license = [ "lppl13c" ];
+    version = "2.3";
+    sha512.run = "37698b7a9947a7d7ed3480c5a7f20beb3ca590588f33e81ad60c1a5e7d7db9e7fd022ac2983247afa8a8f1ef0843667069ca4474656bbefb50db8cfbd4d6b0a8";
   };
   fancyref = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "A LaTeX package for fancy cross-referencing";
     stripPrefix = 0;
-    sha512.doc = "2231f5fd45d45cb7b538852c95b90db35fde9b66629d17ec9288de6ecf5339359c17fdc8931019fd4acce61ec2927a0cd494cc7462cab0df13d7660106b6a142";
-    sha512.source = "65de000487a8d317f0d05ff6d35574cf0bca521e4ab029637fd459b34f8640c53fed78bb9a54c21e4f5cc7c03dab221995810057350c46690c948a9e436c74f3";
+    sha512.doc = "5bda5efef9fb9a84391ab173938c9f47adb53d15dfb6b252f1e7a45747fe888d76229f7f8554f8076250fe9ebd47ec1074e46c9482b8f7caaab1673d6d1a5a90";
+    sha512.source = "9382bd9e75077a06a9bfd2556f7dd11e3cea5316d08a2353f49568a8f40a2895c12b8e96fa038b1e08dcb4fb4f55a1c06acf0754a71b9c35e4df9713a0c31ac4";
     license = [ "gpl1Only" ];
     version = "0.9c";
-    sha512.run = "8f4ea5f16bfdbd06bdbaad76da724a1aad82263f4db2c24cf5f2e9f2db9f2afd9d4004d629098f936e0c2d4dcfa5fba8bd278746b90542f87b547e20abb0bcba";
+    sha512.run = "4fd9359fb0c4b6a98ade8d72dcb2a43db38798c64d5e5c9114af57bd47821523ada2eddca060846ad9002c2a61bf3368ee7bc1e3397246c4004d5d685b567d17";
   };
   fancyslides = {
     revision = 36263;
@@ -20133,13 +20202,13 @@
     sha512.run = "b24e747d4ad811002cf742f6c74855a85b69745661de1cd1d4bcf41ec18ff62d34b39adf56393f79214a1cd4e54f72c54796b00d573e29414825b8c1a3cff317";
   };
   fancyvrb = {
-    revision = 75920;
+    revision = 77677;
     shortdesc = "Sophisticated verbatim text";
     stripPrefix = 0;
-    sha512.doc = "93666eade622c9bde73874c9a19d0a8812849ab8f6d1d3c1000c6a539c05cc7054bb47b556f69f9351ffe7e6eda205bda3e538cd1119af18a52988ff6ff36fd1";
+    sha512.doc = "92c104100d0e040cbaf9ab7fa90ee06d237625eb817b1f095788a54fc69d2a4a2acb44d842a06c6e3f9019424f09cabc39b5eecd212e98a01354e2bc35e3c51c";
     license = [ "lppl13c" ];
     version = "4.6";
-    sha512.run = "9d3cd87f3ca9c5a72ca2c7f93464e0a7a36740d72eee6cac81a5cef873c9ebdd6020d746abf5262c262deeb680ff2cc88e7be33eb2321a0d66659ccee5a8bc82";
+    sha512.run = "3c804822eef0c6ac57f1b27bb3b62bec1719eb53fa7eec730c01fd6cdd0bb8f55d41ba2cf6b71c7c08b3e91a2ffa5aa2cde0f358f5083930b51387482e6d4322";
   };
   fandol = {
     revision = 37889;
@@ -20173,6 +20242,15 @@
     version = "0.2.0";
     sha512.run = "87c89056df0d06f37559e8f5ba07a30edb944abb1565a3ffe4f4cb36b331de39c1b1d815547f64ef28b5b509b5ff346152e643f7a87dd60aa4e946eccc396fa1";
   };
+  fariscovernew = {
+    revision = 78046;
+    shortdesc = "Create elegant Arabic and English title (cover) pages";
+    stripPrefix = 0;
+    sha512.doc = "833cbfee3126cbf37413b5d7f78fd3995513a80ac2309015dcf6aa6ebeb674145582ca509b8f556611c8ec07db392bcd996812cdabf9c50e7728ac329d381075";
+    license = [ "lppl13c" ];
+    version = "1.0";
+    sha512.run = "b5925561b1b541b33a5bd87980a7895215187991347ae72ac24bb21a56245b548e0c9e552ba6944a6418058bf7674c1d43a1369b508405d2517a73755030a29b";
+  };
   fascicules = {
     revision = 54080;
     shortdesc = "Create mathematical manuals for schools";
@@ -20193,19 +20271,19 @@
     sha512.run = "cedc8305ba0a7b1d22274d869629a1872a80a4001b443c8baa93e44198a5dd88e39c16c28bb5edf9fedf4f8f2f68c6964f009cbf6feb21c7c14974c4b598acbb";
   };
   fbb = {
-    revision = 55728;
+    revision = 77677;
     shortdesc = "A free Bembo-like font";
     stripPrefix = 0;
     fontMaps = [
       "Map fbb.map"
     ];
-    sha512.doc = "c63214ea5a91ea6bab66a866a65c2ee43c64f49afbc3235e2f55cc0de89fb3a269bea45fb7d67ccbcda4bac3249b2f2ab14f780fde7cbd112231b16e58eac67c";
+    sha512.doc = "55ff485581889972245273f7b5eb83d684c1ad0a9b86a73777cff65de115959dc6118b0ce1e5992bf97ad58eb946b120ed18f21f9e154bdc949b93bf27bb7828";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.16";
-    sha512.run = "d63e140b60941f114b7aa7c82888c224715d6d173b88ca85aacdb3f7635aa928846e804e807830674d3bec0fc801435eb9e07406270c156d40e8c1994f50aa3c";
+    sha512.run = "929f4caa6c24da5402853e6013da01e15eceba54e36f90d734a20394804ce6154bce0b0e6abb17d8617b399cadfde37c6a494fd51c459edf580644f4de4b4240";
   };
   fbithesis = {
     revision = 21340;
@@ -20218,13 +20296,13 @@
     sha512.run = "3e593e312ac8efbbdd294e6a00ec020678dcb12259ae778ddaed4d43a800aa19ba16f8eb15b5122ab22f44c5e23c77e4fe733c7772929ef55589d387985db694";
   };
   fbox = {
-    revision = 69041;
+    revision = 77677;
     shortdesc = "Extended \\fbox macro from standard LaTeX";
     stripPrefix = 0;
-    sha512.doc = "19a61ddc64c3c5108ec05089e988a07f0e10d772bed810898bf82046922eab58a389c3816b15055b5c2e8a4d1392305a351802eaf3f1e72799c9c192eb8c1484";
+    sha512.doc = "e8a97f2a7ce5ef00db2e58b968227d01db0e1614acefd09b22e229cf432cc365bac1461379fc577d27611861b98020414444d87fc309d3ba098ab7df1526afb3";
     license = [ "lppl13c" ];
     version = "0.07";
-    sha512.run = "705a0f1f6d5009f0ac2fa1059f3029ef7bf7e8fdab6e85bddba822eb50dfcc049f94b7ff43afc97234d44f42505e1cd4e6caac1f22178949dcaea0a60e572281";
+    sha512.run = "7cc918f29988203082bfcffdce53dc856d85c92003dd8291651be563699579bc96de0d98f1ee7947df53f2a836b2241cfc018beea2c7ace6af39ff716933829e";
   };
   fbs = {
     revision = 76790;
@@ -20262,30 +20340,30 @@
     sha512.run = "c14db194a73247122e589024824a53125ff10e15f8bec2475530aa41e78d74993f73474ff9b3899bc499c0cd8dd3e1ea034ea821d233c2a512f8c4d4d06d095c";
   };
   fcolumn = {
-    revision = 77386;
+    revision = 77677;
     shortdesc = "Typesetting financial tables";
     stripPrefix = 0;
-    sha512.doc = "269dc7f4234df31a47eb9cda9c08c129d8e4683e63a05ed1263fc581dec22b4d87b9c197bb995dd5ef305f081d4da0f27a4c8e3c8cb30e83cbeaa6269329c092";
-    sha512.source = "e0d72580e7316d8195e6dba7ae37cf6c3f00ff5514aaa83bff86957609768a0c8c016cc901b703bdf082a438be84b9975354f7dba0823a683fde33a88186a32a";
+    sha512.doc = "733e5522133c3f0f7b544f80dc61f38b46d191ad0ea8e5d6caad471ea51382eeb88cb2073a930f1ecc1cf1ef8e3e269b01fe4b553c670c1907fcb95f21b2dbfb";
+    sha512.source = "d904b88116035ed31b07ed23e361d0714285bd45044ce02ca8e125a75d51d177b69b7c89d57e2c38e3ae01a15b07e693e05923dcbd5764edb1afe38492d2782d";
     license = [ "lppl13c" ];
     version = "1.4.4";
-    sha512.run = "0ba8c6cd3b7bbf1a461e7edc5845a39c53950ac74a68406c2acf4716302a04eb40119e43dbc1022a5ef1ae27840d30f27e88a2e18929da03adb33ef55145db9e";
+    sha512.run = "a0f6d4dc3935760816e7ee6cf958725f498252b5ecbfe898f7b3c6d2278d8914ce90ccf34ab2d57c6307cc672e27b7222bca81d14b310434748776320ee73707";
   };
   fdsymbol = {
-    revision = 74247;
+    revision = 77677;
     shortdesc = "A maths symbol font";
     stripPrefix = 0;
     fontMaps = [
       "Map fdsymbol.map"
     ];
-    sha512.doc = "779796c81bc4569b16979a9cd476bab4c59d43bff14b43079388000397cde7daabde422f02ab3c46b1c59ee1819e9c9e72ed49e130d5017e9b4cc01b16481d0e";
-    sha512.source = "4fd6b2bd37acb1c52113e24ee0e6b1ee60ead1b61408fcd970d473f57b58d603b19205381d6691ee6f024d21f7580be28549f9b56b86a759b6bab46a94fef454";
+    sha512.doc = "c3ec504ea21842a05c89f41874269689756f96084d4974e3dbba363d0dd83fdd5886706a202fe55551fd604ddea8eabd1370c774c8448e99acdeca65c19e3f43";
+    sha512.source = "6e81a3ca5ac691411c0c9db4a8aab672338663bff1a69d9e2a706f6abf5a6ef0db1af7bd3951723e7ca156a358443e622a81e6f5d8b28a3db3553c3b50af75bb";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.0";
-    sha512.run = "bedc1dc7e597570dd6602ccc9aa6df3d97d7c079a6fb5aa23d85c7211c597410f24eca6ceff9b1238fadb54f6f214f025c58e58c977049dbc5f61ed121969ce3";
+    sha512.run = "c7923e087850233958d0ffdec7aa5f2be4dce88d8088536ff93e07b726f593f532972c91070fe7740b37a434f43b7805219e69fa202fc1c450bdd0de02d5c2d3";
   };
   fduthesis = {
     revision = 67231;
@@ -20335,16 +20413,16 @@
     sha512.run = "1b09294b430bb9ab6a4eae11549500b224514e55bb99329a4ee3d9d72ab906128063537302f672a772c02ff4372d46649656a88c4a303a9301976fc7a804387e";
   };
   fetamont = {
-    revision = 43812;
+    revision = 77677;
     shortdesc = "Extended version of Knuth's logo typeface";
     stripPrefix = 0;
     fontMaps = [
       "Map fetamont.map"
     ];
-    sha512.doc = "16cfb520cf8b3030d546e1c7f7cd41772fc9d16ea55db6920a50945a7aa3034050d873d3d5da05c108ee303dc1c77217c8a1f014c2e9beaf36d932e33aefeb93";
-    sha512.source = "de4a25f0a86f29d10fd1cf799ac6c8efc58633a7ba0c48bb33716c46e6b0e1c9d5be6ee4e8e4955739ddb324270e44d6fa658c360d03123c18cc275ba6abff06";
+    sha512.doc = "5c5333e5aee74570f6a386ee96dcae21f206aa2f16b0b990fd0eae7c9d043e64cf1574900edc9762bedcb1d7b3ecae179f9ef84170e55623c43884e7db31dfb1";
+    sha512.source = "371c03a89f1861c46335f653b2f1a9f8b4f50263753e1e32135f0cc590d82eb1526ee4f78a4933fc025f907dbd432be3d6e563cf0f9cff5b4d87f9d0970648e2";
     license = [ "lppl13c" ];
-    sha512.run = "20c5c83119d70a94e66aeec0bbb9a0494525deaf9addb9b91d8d5595397ab5a1195eb9d72056a5fd1c3ca490aef66b43558f5c5b86688e7d164360a697c331a2";
+    sha512.run = "2e58089e785c6720610722ab9f1fe17eb64d7d8f30ccfcf4dfd0f73790a17c32f55ec896f7368b341f8610ee888e8bbc20e72cb8f0f3817b62b08c6e8df3e370";
   };
   fetchcls = {
     revision = 45245;
@@ -20366,14 +20444,14 @@
     sha512.run = "b4d4285b33f314720cd07eea903bb2fc6092f96033f75d4b06cf315fd24d1a34722aa73db4cb6410a847e1d23a131ae329f8ebe75fca15dcaffb99097768f55e";
   };
   fewerfloatpages = {
-    revision = 58058;
+    revision = 77677;
     shortdesc = "Reduce the number of unnecessary float pages";
     stripPrefix = 0;
-    sha512.doc = "a18d15933e6efbbe3428f366bcc5ba5ec0b254dcf77f7ac2e72c19bba00e78b44c98df34f57468902101f547fe9e88b2033430a02098805c6f0072e68ac82513";
-    sha512.source = "e98684d4cb79477c66e4a831c8571729b3da021bf9945bdecfe8a9ff57fb1e2948c42c3481adea0fb702ce4d56ac533b14f76e78c182500431af7f3671491d7c";
+    sha512.doc = "cb414f4840ea9e011c81bfa130c3fd85b0032f6ddc5c3e091e74564c05d129c3c9bcead246ed0a5f365bcdccb9a0d0465fbf50ccaa6862567222bf7c19d7eb40";
+    sha512.source = "f59be6fabcf626d3067f223cecdb768d7c7cd35b00e0be1eeccb6b02fe6173f178db082b51787849d026faf628074a9a4c03371729a76397e915b63819a1db02";
     license = [ "lppl13c" ];
     version = "1.0b";
-    sha512.run = "4f5637bf431b54590e8c2a8ec27e3da3d801205b8cba053c8c1294ba0882bf8aef17a0e291c149799cfc3530a415202014570460a6e2e8986ef71bd2cc05567c";
+    sha512.run = "86bce82e3a751261eac12fc469fa20d56d842b928b9c89fa3d00de640b9930562f5f19ca004b0430739c1fd0365b9b636f4912a6dbbe443ab863d16110069e68";
   };
   feyn = {
     revision = 63945;
@@ -20386,24 +20464,24 @@
     sha512.run = "30e3ca5e633d040fe2eaa88463a8c9fa6004b86c4ae264af9b8a9a3bf55f71f7e1eb21e656f2fa194ebc751648f411a094fe40fc6a2cade1fc31aa586da1317c";
   };
   feynmf = {
-    revision = 17259;
+    revision = 77677;
     shortdesc = "Macros and fonts for creating Feynman (and other) diagrams";
     stripPrefix = 0;
-    sha512.doc = "933edaceff112f7442f7c662fda43f343b0e7e41f65aae4f1a45bfd2de18c1e4bda505a235eebc4daf2451846dab376449242217ec803f2932a4a1584038f4ee";
-    sha512.source = "bdc4dbbc449c911c0d516b10da18c1d541645ec57fd95c163d571a039c70ad46e6111717ffc86c802123c272509c85ce1d71d90f49578b2e228a9229f4d40f02";
+    sha512.doc = "d5e37f498c0649206fd1089c2bc1e7dbb9c5e57e9d583a6d2820bc94da3234286201981791963a25690a659f004dce1c5bf9fdcc55ba9cb74a9100ee6ba06c44";
+    sha512.source = "04039a149032b42b095a99a77559b1f19439e109446025e1d7dc897514d122fb9c5eda867b52caa6c902b7bfc26e4fb4c824b86e0ab91b2f8b019278797fe956";
     license = [ "gpl1Only" ];
     version = "1.08";
-    sha512.run = "d4eb87e3f086f2d39c87eba057fc490ce5d39e9c5ae39aa1c04ee8c3be9c4a188ef123f860fe74d31e0e9e9182909c39df3434ddcc618632723f00627f66397f";
+    sha512.run = "1a3b46622952ba3ac92399bf29b85e189bda64865f7a1839e5173d101a206bf08a931c02534891e7382121941cdcc46f37eb3211562a0d415c642d431af65ba2";
   };
   feynmp-auto = {
-    revision = 30223;
+    revision = 77677;
     shortdesc = "Automatic processing of feynmp graphics";
     stripPrefix = 0;
-    sha512.doc = "3dd88f5af739013ace4fd8eea70ce247b997e887c0f7067040ff9bf4e0300126aff53845ecefafa7bb52dfc4d05d181a1e96847e6a534c718c5a7447231539ba";
-    sha512.source = "ea29f32f9f1c628d63b81c958f7c8064e884ba1764953dd62fbe5d90506547846f52fe378f813a09090ef6991c9b7d2905095b04fdc0e26aea4c8cbcb5e2b2b1";
+    sha512.doc = "720e105bf2451dad9713f49a52d634e3959946a731a901c86029228f0d677e3d8e540a62b2571e3546ba4477b3239d05f145ae56de6f0b14f75476c8b8c84e78";
+    sha512.source = "0b34605ac37be34ddc81be6e586611b709f531956aedb943fac521245df355544d5266f96646fd0c3687d8515b82a0adc63f64bd16d4207d92aca3db5368d1a7";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "64ca275292b12847d823322ced9dbad615a34089c8cbe43262e676b34db205ed56509f641e18e949523bd252ed1ea73eeb5f019e2cd052274c02b1df67860a25";
+    sha512.run = "9febaf6091e91518d2715a0fdfbd720db59c8e34a8ef3706efc124262574c4ecd6c781a52609e2b70e76aa358aa2361a29a13098cdf8d6fc7d8f866bce726555";
   };
   ffcode = {
     revision = 75716;
@@ -20429,17 +20507,17 @@
     sha512.run = "393903c180f2fd554178c909bf9a4c060707d8f2fac44022b4811526c7b505a0354afed77f8ae0fa3fbcebed3918a6b46f9e81206be78d7ed6b1c959cd3473a2";
   };
   fge = {
-    revision = 71737;
+    revision = 77677;
     shortdesc = "A font for Frege's Grundgesetze der Arithmetik";
     stripPrefix = 0;
     fontMaps = [
       "Map fge.map"
     ];
-    sha512.doc = "31832d251ad4b72531f8721796465505af851cbef009d5550220f574d8acf512a11e9b33ed3d6c9bae5854c55e97086a1b646d8c10778bd3edcfad71ed908985";
-    sha512.source = "5e0637a5c98ad74f0d4056c6fa66656940d256d814e63559de1b0d771285be485cc3afe2db31aa0327a43b11369d70322952991360d28f9f308e32b9af45b5a7";
+    sha512.doc = "e682c238545df3c181eb72a707bb93ce42d8ba04064997d7c66ec01023bfb5b4d4664f3be44e32412bdad21d933e826cce01bfc698c7e12dbfb09a200f4324aa";
+    sha512.source = "c330e0744e0d54c09750c4142cab6bdeb88a074acfff60433ef30412f1cc1994149a3cba2fb13a65df0ffd97f56c8ace07cb3ee643aab08df8d60aeb387578a6";
     license = [ "lppl13c" ];
     version = "1.25";
-    sha512.run = "c17589957d2ce61a4c92e0dc6ceaad553c4843dbb31392955027916bf1f4b81209aa641a3a6f98c1a3dff3f053b3b67ba19208ac67b05e7d58d5887e6ac500b5";
+    sha512.run = "2ac316591ed753a96029a75913170e9e805f8d62573fdd2bf92dcf7cfb6c462c201f1949fd2faa3e012eb781930da0a44be5065958b3fdf8ba8415a4feea6a22";
   };
   fgruler = {
     revision = 77333;
@@ -20452,14 +20530,14 @@
     sha512.run = "33990faa94383078c3fbe5a2cb5b9f9079d45249510707336763122e86c71e0372651040f18119041703c361a09a172f9b3f1ced9e082b960e3d116e3b68cf41";
   };
   fhj-script = {
-    revision = 77111;
+    revision = 78176;
     shortdesc = "Classes and packages for formatting documents for FH JOANNEUM";
     stripPrefix = 0;
-    sha512.doc = "dc2576b09b33258ddcbb224d828daaf1cc823fccf8257d9d19ddd1488aab3ac18b3e671bfa8f005241e5cd12a25facf50e4369cb102b60393bcfa65e392aaaea";
-    sha512.source = "1654f657d6042a251770fe528a3519db3356613f0e893e5c3f79a0a58862ccd64c8d43decae39986e19c75111fdc93f961ae6601fdfc4d239d5ce09acc4bc46e";
+    sha512.doc = "69f8387e74c7f844b0d9f692d23697357a3fe7ff5bc5e84435fa1ade65399b88ba1aa1500a9625429d6efff25f5e1f168376e738b6076e5ae4d885b5f21a01dd";
+    sha512.source = "fbdf3bc6b4e1cce74e026a09feb76dbf41e107d748cd9df6c4c72fca05f787913e5586adae378eabcbf39d551806c0d2aaaeb74d77aa5ed26598e2f5cc055a59";
     license = [ "lppl13c" ];
-    version = "4.2b";
-    sha512.run = "ebe99084adbb68d1baf0e1024f17e2ac9459864dde21d0273661c7484d73375fa261bc3f1719b13b70985e538a0dd2c0c978a3c05186f14133882e4369a2808d";
+    version = "4.2c";
+    sha512.run = "6d4664be9c224d0364f54f35fb86ff43d00e5dc4e462d4aa3ab62df14add5c757cbc90a8990cfb794f2d48969f2b9bfe1e0fb419cde539b105e0350cb96e63f8";
   };
   fifinddo-info = {
     revision = 29349;
@@ -20554,24 +20632,24 @@
     sha512.run = "d42dbf2280390b40873e7ad58801694bf6c22adff386664975528c698c2ae49f39503c717682d77af0a960779cb572bc36d272ecfb241565a673ccf01ec4730c";
   };
   filecontents = {
-    revision = 66740;
+    revision = 77677;
     shortdesc = "Create an external file from within a LaTeX document";
     stripPrefix = 0;
-    sha512.doc = "15f34d023a498c733810ddb4b04c1672507d97d731a579246fcfc3f29afcb47da73429807c4fff018708ddbac76851ab8357dc274cb6c2506cd37d075d2dbb44";
-    sha512.source = "8b93ff5a1cce54150c67bc607e67a40788dd0af08bd55163380756ce6979f3862b4cf1d70888b7b4ddd7accf078a387bf8540cb97af491b4d67bce31600fb8f0";
+    sha512.doc = "21ec46f98893a88bfd77714e04000f00ff10bc3aaca22bd4a30238a6f218045b17375344aa0f2dabfc70090afce53efda54e3fe150d9bf4bef46c033a5ebc3c6";
+    sha512.source = "17a8032ec4cd1cd82f6d58ca40374b86197b29207a134fd05ba04926d9e3e0425c655d8c1d6b0f6eb490c8e08c3767e0bcf7cea474c1ff5a6b4b8b346c40cf1d";
     license = [ "lppl13c" ];
     version = "1.5a";
-    sha512.run = "bc51c03ea84130753cf4c6a6e6efe39403bc48a47b4c40f177d3ae17808c63a346a2b361ef61b0e0421094b6b64e20a972c6bcad305228ce0991818a62344296";
+    sha512.run = "1194a8c2a27926db7ec4fd4591986c3837a4aed3a88a66990b573d28391afbe7e5d3e74a19d69c2a8f3ec87c3db7eb1c84b0e2c6dd18de53fb3f4c1d6316518a";
   };
   filecontentsdef = {
-    revision = 52208;
+    revision = 77677;
     shortdesc = "filecontents + macro + verbatim";
     stripPrefix = 0;
-    sha512.doc = "26e7ca9971a0683325b62e2feeeb0db6ecdd3a732f07ae93515f2300ed58e97a44ff8a7504d194119c1e27d1d9bc4f367f29c17458c0e7f0b6a0a61fe18ea0ca";
-    sha512.source = "f6e822a28e074fece05b911f0bf9d262e2b925c2a73559764e1eb5131d9081b48ace0ead5f46bb250bf648eac204eb1d5d7b362be508f58b40a50f70577de534";
+    sha512.doc = "54fc4a044958c31c062dda86ea73e1bc76d79ca19522a2f697ccc019b84af9828ba378631d38087e5afa17d51ac6a2febf341c7ed0244a2088c29b812c471df2";
+    sha512.source = "8748c7986dad1471e718d752c02eaa953073e59fae42812ba9ecb100a1518b0f758ec0630ed845cb683661430034e4d4d045509239d826bb7ff1bc7ecc1a93c5";
     license = [ "lppl13c" ];
     version = "1.5";
-    sha512.run = "63b399a5e21d2d4946c195f380a0d5f269f8c978c0b504cda80c0796604dfcb66df38ca79d31078efa03c7475967bc0ebfb856e933bce6b21d12836368780e2a";
+    sha512.run = "52eba7c096b6ce67a6d8bd7d188a2cd7d50e8d1ba9d081642605271bc1720a36ace8742cd6bce1a0332744e4e2570de5c839fc6f66ea4d606ad763ffd51f8e28";
   };
   filedate = {
     revision = 29529;
@@ -20583,14 +20661,14 @@
     sha512.run = "5e2789c065459e82f073599c4d5f04c626fedae7e02c8dc58d6595d81ec8281c9c362592eee9547369b7a8e9cd2aed1ec526d69a8ae22f35771d5494e3109032";
   };
   filehook = {
-    revision = 64822;
+    revision = 77677;
     shortdesc = "Hooks for input files";
     stripPrefix = 0;
-    sha512.doc = "7c86e322cbdade28c03b65580c992adff2fa112ae65b28c1485419c457a7f930614337eee70bb6cc2e9c386dab866e4e657c0b8d394c975c6af3a8b2fe651cec";
-    sha512.source = "c9683da993eb365559e7d47e6c81235065e9ac74c9c334e9e1d9c040c9cde0ae135301b83e49c27307a6f3bc529c24d8f597dbdf377256d03c8d149e69c03bfd";
+    sha512.doc = "53b1722c6004bc3da0c893f0243fde77b235cb6ccae920a866a7f777b10c6724499ffa8d03e32c9590819e0cfc19f052e8c4436d261405d3d15c91e77308072c";
+    sha512.source = "ad08d491298c01202f5fa7f4034978a468fcd89cefe98b220112c4b542ec0625321d65378ecc7ee26c840d8378dfa46572cec2bda9f4e9b0a71ec777b9058ac8";
     license = [ "lppl13c" ];
     version = "0.8b";
-    sha512.run = "caa1f239fc8300f2925e94e860df3ac76637e337d57f599446c6b5f059fbba026fa9e440f4272b7e37ca9921731cddcbdd403c16e42b9c49e302452dc940fa27";
+    sha512.run = "1d787079085a8f7ac358ba0d93460cc28a1736bf1c73157fbbde15372e60292dca54c05f25a920303c7a3d29f4cb98200f49b3df3bc9ba880cf56da311b248b8";
   };
   fileinfo = {
     revision = 28421;
@@ -20603,13 +20681,13 @@
     sha512.run = "2e5914e32af48db731aa83c3e51e6d9128dc969891bce21e1e2f859cab79130c9f5caa0f591765fa8a9b48c38eed8d19305f4be598430ab1e2cb3276b6faf191";
   };
   filemod = {
-    revision = 64967;
+    revision = 77677;
     shortdesc = "Provide file modification times, and compare them";
     stripPrefix = 0;
-    sha512.doc = "3e8c5a26b5c2fc8a6f713f006d091c0be719bde7bbe237e49d2496032289d67624fbad1319db421a0471a60aa8c11c97bbc60127053904725e53e75a2ae6fd7a";
+    sha512.doc = "701e107a4910e8008cc515e9c212fed58755096f2ad4bd05467ea5521f16ebcbc16008ed68465cb1fa990d702d049561354b674571fe838f9ac1c327f2f2a329";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "e346e795df32a3b0cec0232da9c2b190bede65d905035a758b949c9cf01219e0880ec2ce2e83201f8dd9dcc77a98b29df2b463edf8c44cb1c220a7efe7c9f24a";
+    sha512.run = "fe565f64bbdd3921463e52b1b17519524234fbc783486f79e404e1c4ba2c108138197c972bd6484cf6d97f0923aa188410d69e5b5933d772ceb3ac1f24e8c8b5";
   };
   fillpages = {
     revision = 73550;
@@ -20671,19 +20749,19 @@
     sha512.run = "8b360a3426056b61e58e577cc68ba9e2f55b63a3b4a0a2eb76ebee53e9ff327da9235e9da5cbb85e3cf369cd48354c00a79cd46110ba4adb4b64192b7ff7b603";
   };
   fira = {
-    revision = 64422;
+    revision = 77677;
     shortdesc = "Fira fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map fira.map"
     ];
-    sha512.doc = "b97fa7ebaefc3a057eae0a3fd14f43fad1a9789af0b2c43ca8a0c6969610b1786e24508b1367002527841a8095486d6eea180c59d95b1df904df846c943b88f2";
+    sha512.doc = "0828aefde4cb18a88c26181f54c76c4a444c3c3e31594fa2ba1a9e83a5490a94ded012060f8342abf1c34a753ca441af2cbaf29158f8b59a7299481c80936c11";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "4.3";
-    sha512.run = "5faf4cdf1690f9d6c690cddbef813c8973517309144495016ef5d61ff5e5df9ce73f70b262d1c36ba72fa92f93c7a1d550b96acc4965d7ab88efce21ee20d682";
+    sha512.run = "ebc56c024c781713addf897204c94b747ed0d7e3e27989b0a10227a7e989405e27a0003181aba500a4d59220ee6723a3f0d9c7c475949e31a00eb2f1cf8f211a";
   };
   firamath = {
     revision = 56672;
@@ -20695,16 +20773,16 @@
     sha512.run = "c18ab8b2e12b947144528b196c9b1de7f1930f3a38338bd114bb61205d7f910fbf1e3b20ce48ad8228fc24b14d734ae68c3c8542218a058120a62783b007461c";
   };
   firamath-otf = {
-    revision = 68233;
+    revision = 77677;
     shortdesc = "Use OpenType math font Fira Math";
     stripPrefix = 0;
     deps = [
       "firamath"
     ];
-    sha512.doc = "39c2eab4cf1dc638194d81effa1b442b87e96b1ebb2efc72d0ce26041bb04fc3cee8f44b939f904b07cc0332708d8ae8cd7a1f41087d363888306c0f0583274d";
+    sha512.doc = "908b2eba91da42e7eb5f4b2b995f95d6819c43bb60f54f5cf311fe2fa10e81ff8d41519a72e1a3068634a07c6b6fbd31a8603357f5dc34017e67e15e40d3c463";
     license = [ "lppl13c" ];
     version = "0.03b";
-    sha512.run = "6c713fe81dd006707b987930e8c8835c21122607d9488ce997bd9b76cbe85bb91fe7017f4282fa91c11ab41827ce70de62d0baccc78a543d56b0d873ad153c12";
+    sha512.run = "030939367fe6c7cf4f8a05f5cda82a091644b5342803bafd970201490a8b45978bd8016bce84314a639a86ca676deb4b6a2f12b7930793697505cdde494a413f";
   };
   first-latex-doc = {
     revision = 15878;
@@ -20735,23 +20813,23 @@
     sha512.run = "6a1defde39108d8c08c01a2b59c20b8342c553c24fcd56e94daa4ed0b233553ffc2abac7311a9c639cb458cb633c31b2901dc726f0d8f09c2dd0e15093523202";
   };
   fitbox = {
-    revision = 50088;
+    revision = 77677;
     shortdesc = "Fit graphics on a page";
     stripPrefix = 0;
-    sha512.doc = "71d77dd1879a2b9b20f9c4934af8bd696de567b5c0187e7a5bccc9e225fec5793bff6bc670ce0bbe1065cb67de73f518942ae48aa0a27e46c2aa47dcad6856e8";
-    sha512.source = "406ae04d838114e9cb7205c9e704b95e8ea8c4747827bb82fbc53891ca552042e5742f7e524361f2a797a77d8b7286dca3512ce7099ec8fa23101668d4bad5b2";
+    sha512.doc = "e761c90fd3225ab75f48c5b6b964223a53aa67122d1cb74adabd71b84bb31aa02150c2e9b8d0d00778c3d8a3508b77a3caed9784c9ad1e01f3ffd59823a87125";
+    sha512.source = "ebaa8b1e30b4fde2c3cfdbfeefe55e753ec084a8324bfdcb174009be1c2996840bdb4548c43fd6b069bad1ff8a393533ed8de5b7dc8183e0d17ec4ad88d17925";
     license = [ "lppl13c" ];
     version = "1.02";
-    sha512.run = "5244567062493fcb5300048be6786f1ac48c72c363220b894a2695e78646f461584e189f227d04f55e9127a66ab966dc04cbd762fd08277774fe1c0fcc7d3c96";
+    sha512.run = "c4f84aee29bf8a8f8bc1145fe7ff65f4acd5111f2d9892abf1d49d63b2f56d47610e404e3c64b1daf05a95f81aed7f851b5b9f3daf7d08cef9cec304ec695cec";
   };
   fitch = {
-    revision = 69160;
+    revision = 77677;
     shortdesc = "LaTeX macros for Fitch-style natural deduction";
     stripPrefix = 0;
-    sha512.doc = "3a32fa5657e0042588c82ffd7d32f11dfc8e9d29ba268700092d26d32d24afdb3baa1f02b8ca4e248a19413aba0421d991809cac5db0d5d38aba8389b43709b0";
+    sha512.doc = "7fd0e0db7d1250da02efcdc00a86b346115dde0ecf37674aa3396c42209cdbcbdc57659585a9747bcf05056ff375aa4577ed2799f14bc5c365730b8741ca9af0";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "ec44706fa5f5fc258666e343569f695db0d26f6628aac1ac6eaae12377f23138c49ce29d03dc5b08cb1f5427cb5ad612cbbf9aad5a9270f4b31f43679023e73a";
+    sha512.run = "f1f9e24df9193ab8c39a237fbe90e20bb95c6b0c5b860173f67459128a96715d892cd7e4dd62a6c0a91fd918c5826cde50c387a5edb3dce2eef241059742e348";
   };
   fithesis = {
     revision = 76028;
@@ -20794,22 +20872,22 @@
     sha512.run = "655c9733d727189d7b2aaef2b629e67cf5c7401ec2a8ffd179fb450cdf1746a40571e0b8be56f4202e31d752c35c7255fe01cf0b36917c582f24415e8e842273";
   };
   fixfoot = {
-    revision = 17131;
+    revision = 77677;
     shortdesc = "Multiple use of the same footnote text";
     stripPrefix = 0;
-    sha512.doc = "bfe0e39165be8f9a56e2cbd4b91c0b7b7448d0b9d8a4a0b62d6c0d45e542a9964af3d34233ec777b69f0666a0945513a8475629f0b084f72a0b349682e8ad6f4";
+    sha512.doc = "7d9c63980743f5ca34d68900d858aa4a157ff6692c751422d2191df0614e1e1f38be53b28d2c32bd4405545535b34d220e1324e3c230fc7fd659cdefcab05799";
     license = [ "lppl13c" ];
     version = "0.3a";
-    sha512.run = "52c25b4d5bb9e34fe3f8d2b122e68352ad572ff9ecf1011f3e9fbd67319d0781a48ca08ab03ad3201f1d1d2bd6d4e35fa3818e695a741a8ab440ce81f7724039";
+    sha512.run = "a0e82370d8d77419f934bb3fb5f414e214d42b763446e51fadc4db8237cc2300043b9ae6614bca8bdfc4a8869102eafc31875bda4605b0a2a7d7928d8d8de0b6";
   };
   fixjfm = {
-    revision = 63967;
+    revision = 77677;
     shortdesc = "Fix JFM (for *pTeX)";
     stripPrefix = 0;
-    sha512.doc = "d1c39e4d0dcc1a8eb5510e3306d68f0bae6067d358bfb458127ff8f5d5223576f270cf628bf8ca2c3e8322d6cf1b52b936db0c2a431e4258591057a7f50513d9";
+    sha512.doc = "2ae327041dc72a4bd4d94b33f40c06f42303c8b557cfa927394cd6f492d364b0bf2e80ac6842fbac0b2895d14d42decf514fd693d6a7f949d39f30a90825a097";
     license = [ "knuth" ];
     version = "0.8";
-    sha512.run = "afa050087607d8eb5f36923d6ec72daff7f1bab0154edd08900486fee152068ebbfe97d87ae29cca7d8f4048e0c6091933d0b71d4a0266950828881b55aa6b59";
+    sha512.run = "756266e4a9abccc3fbfddbe96927d3ac30e01ebb6d2a47327e8a16385aacc9b4d05b51b5a9004bf95a36526585e80026e4a883df72d9267e0f1e6f31a25be680";
   };
   fixlatvian = {
     revision = 21631;
@@ -20842,14 +20920,14 @@
     sha512.run = "5bca8abe93c61ae7e6a71f65889664a4bbff105b0ba654c60038372bcb1b6291f87d1bf7d0d8c60f08b500e70da51db2bd1c88a3717a99e6ed081fb3ed2f7d3e";
   };
   fixme = {
-    revision = 63708;
+    revision = 77677;
     shortdesc = "Collaborative annotation tool for LaTeX";
     stripPrefix = 0;
-    sha512.doc = "89036e19b4c7ce8d9266ce6dcc5bb449c5de11ec74ce13b5208eaeb81054330ba53a0b01370b7e21d1d3d7486ddb7343f4cab946e1c3cb1387965b5e434e5b08";
-    sha512.source = "061d7bc9a8813accf165c98f9d386b3ead721a7a893ae55ee0bc895f6623e4fbc52988c5933ca71223094fdbfc6f7ab71ab18a2df00715299158d58668117e22";
+    sha512.doc = "8828a2c28d6167ee41a186fd60c5f37759c14ed2ea55ee1795fb3440fb441cf41db9c6d33c4e0cd253db336a5bc1442e0f92aad99694c16fdde057bb46bb67a1";
+    sha512.source = "6073675392d7c8b1dbc0db73dc910f1a783ade6cf82f3d90b833dad816c110ab2f17b7f934b8b6331b7b7a9a0036907d3a44c8aa12a23596f7e60707e7ce785e";
     license = [ "lppl13c" ];
     version = "4.5";
-    sha512.run = "a5fc18a3560f5908521fdaec0f3e20f25f124e7ded9de72b36d81ad573726af7399d223c70dd11a8ea50e47e05e3549b785ee5c64215fcc1bf6a5a9ab2e5769e";
+    sha512.run = "954b3eb3126b0274128080534fe6067e088725fe328b6fee6c49957e32582316f5c4772d4f5d8853ddc1228802a7723a9f431753f5ed7e637d358be6479257f4";
   };
   fixmetodonotes = {
     revision = 30168;
@@ -20868,6 +20946,16 @@
     license = [ "publicDomain" ];
     sha512.run = "733995ec82df92bea5a674fc25a3a6af2102739c3c73eeed7c9f40cd54bc4c5d65cafb35366b70641ff0661dc83700071054f7af274487474c3893ce5a44c9ad";
   };
+  fixtounicode = {
+    revision = 78119;
+    shortdesc = "Utility functions for setting tounicode mappings for 7/8 bit fonts";
+    stripPrefix = 0;
+    sha512.doc = "a0e656d127f684496d0d2db057c5454cfcedcd0f590ca622939f6020821c03f04344b14c17b901efce0594c1b2f9f86abd9e98bb0379e599de483153968a2a53";
+    sha512.source = "3e9e5330690bc060468c041af2cd153f63bc12fe5b4f60750322d8a51764cc31fe3167c053e23baf03483a2e341ff33539ce4478e44f6b4ea63d7973aae9e704";
+    license = [ "lppl13c" ];
+    version = "0.1.1";
+    sha512.run = "518abaf712af559bfc391243ee5775cd031b114fed1ea19f0dcbd6e827032b10595019eb546fe457def43b4c368b2c7d88884b66bb397a7e9f9ab893f8d0400f";
+  };
   fiziko = {
     revision = 61944;
     shortdesc = "A MetaPost library for physics textbook illustrations";
@@ -20956,24 +21044,24 @@
     sha512.run = "b0c18e5c9aed70b65cf432003e949f7dd4c3b201745e0973d15b7c196341bd9d4fda8124ceaea2ff232f6582ab8ed424afa882b53b28df7be82466dd9e48d02e";
   };
   flippdf = {
-    revision = 56782;
+    revision = 77677;
     shortdesc = "Horizontal flipping of pages with pdfLaTeX";
     stripPrefix = 0;
-    sha512.doc = "d5191d079641c9a06336498c396cbcc7585c983924a646bcd3b26889ca51a08eb166ced560f45f834281fae9abaa47d02fdd4ddadd3348cef704dd9b818e7675";
-    sha512.source = "95e86fe1e8ce5cbba8745123dbf6c352545d0a75f3ce679e2cf132e46184efa28123f9f9ecf805939c10f59af5bbde84bd2a75eba8f0aae3628b41226059bdfd";
+    sha512.doc = "effec24e9761db0e5c11d63abcfe158890819f4fbf459f17468800312750a01f8758447e29a3386294bd49a783f83fd5d5788c1c07ef18903ec7e74d13efe3b4";
+    sha512.source = "112d13640eb08ef93e7e1cf8afb01db56fbfa2c9e4a659374e2ee2ed43bf7620f841859797d3536bbfbc425dbe63baec15316cfe1f31704ab78c987f0dce2a01";
     license = [ "lppl13c" ];
     version = "2.0b";
-    sha512.run = "17773b1ba5f40d694cddb3d2e2742650bde889d53302e6fa6ef0686ea4cd3fe393ca2e5b31842e93e5588631ee53ebb668cb035b2843fc5bd57911167074edaf";
+    sha512.run = "5ba6d182cd3de52193885aa1617863bd0863f3d9d3939510f241e9e82d07dca58c50a8852b243028effb50a16c4da9820ec9225de7a243ce3e3e15d437084df5";
   };
   float = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Improved interface for floating objects";
     stripPrefix = 0;
-    sha512.doc = "6f713c71361c1536bb086e7638b770ffe58e97aa01bd59bbab779f71cb485b9c06322d7d89e7d87cc8f77a0c7f18f4174fd4ec47b62556faa32d82fead0b7377";
-    sha512.source = "9e577ba84dcac612e4105e597ca2385da3dafb39327189caf30e5728b85a380b5a90363b8bf9070a0464aca2130bcf9419d030bd6c39d51f9a17b0a7dd578d5f";
+    sha512.doc = "1fb5123b122f45379cd47f533ffc6dbd8b64628252cd302b1b115c5d82861738b31c7c29d396bdebe1faa2706309637358b7f179944a2efbae07309db69231fb";
+    sha512.source = "d795c41be1dd39fb0fd736b4db83b84d659e59fed912eb3d178e796b37d271cc6627b081b8ae728bd2702f25071afc7e78ddf4de4d65561b50cd1bf436a580e9";
     license = [ "lppl13c" ];
     version = "1.3d";
-    sha512.run = "4a5270ca2945915464ba25b7996dfbd4771ca5f477e4bf248183bc340b7051c042d9566908acac881782af74a59154f4163bc7879a21e042e1c31d67237fc6a8";
+    sha512.run = "b22b088b5fe9adef968201437f74ab026f9189e0e3a0a2f2c7b0c3bfa671ab9cc5088c3c968dae1824c563cbb0bd2637a58a2c181c5d5035d418ed51b859f2db";
   };
   floatbytocbasic = {
     revision = 67945;
@@ -20986,24 +21074,24 @@
     sha512.run = "01f45baf2f0713a229bf6b6d59e02c8a05f0478331c3c6c7ca7dae050db94d7497a87acccda1cd7c022b79b54ef5088f6af181429e60154ac8e1ada081062dfc";
   };
   floatflt = {
-    revision = 25540;
+    revision = 77677;
     shortdesc = "Wrap text around floats";
     stripPrefix = 0;
-    sha512.doc = "7ca1c6ed832bb3d697685cad5575e02b531c0469095468fd40eb3131d89b68dfa0fcb9c882965aa7a9cc9c60292f64bdbf6264d3d990bd697dc27b23a46fae47";
-    sha512.source = "6d243fd8c9a2fb7bbc242ececd19d94916de97fd3583095e8342d8e7c56decdcaceac8038eee9a774950d9261979150035e8c9175175ad7346b0eb1fbea6c5bb";
+    sha512.doc = "3496494148f27417cfe96b123f42be7e5313507aa5d74e8755431f3d1d75b70c805344944214f0217cc027e76f3aae20f7b9ca39156d3e7e783507dfefc0de17";
+    sha512.source = "85c63727a25f969a90658fb7127b97d3e1eb6164f9758b1b569d84d3191b3400b2a731e88463966e2acfbdab0272af7df91b70ff1a88f320eae4fc46dac67815";
     license = [ "lppl13c" ];
     version = "1.31";
-    sha512.run = "1f7de96ac5e82cc4bbfab3fdb665a18d20413cceea097e1407dee2073109ee1b82d7d3ea82c80630d9aaf445f14a8497aee7e3824458dea8b40b270135052ef5";
+    sha512.run = "7ec4332843b4433b017635240a867a53e8924857668e141ab36fbd52de3f1ac596ad942300894879d0b043249d488f891369eb09c9656b4a206870a4c6315349";
   };
   floatrow = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Modifying the layout of floats";
     stripPrefix = 0;
-    sha512.doc = "b721ebbf59ca3744f1834c130da1a859cd4a98e9f5f977f5d35eef77b420deee303c109439fa70f89757cb9f57114bc74c5d527cafacc1daf2125b975621b525";
-    sha512.source = "033c5c65c9676054e209c64dd065f86631c9765b1582e4042e72bfd247a49602dd97ba4dcd5afa1fe2f7e3d252e4b6ef2ff1a2b00eec3156937fc214d7cf0c3f";
+    sha512.doc = "7d774eefc8dc8252fdd0ba5abf27503b101d6ede38c7bac6e9dfc31e4b103203c1fd7369336b34fef90d7f3e832e634bcb8561ba326fdf40f7ef7dcd79aa42de";
+    sha512.source = "f0d93cba383a98ce36b2ee296c6e4493729fe81c8ff3640100fdf209c91014e4693ead6ddcc9bd228b8eb6f284fbbdb2d68b71060dbf605873c346803ba11d8f";
     license = [ "lppl13c" ];
     version = "0.3b";
-    sha512.run = "c650b5c856bd625ad192901f3c056171f790c549748d5de5675f14cedca5cf32931ece537ce2280c0e4895895a8eff0cf140c3408dffc2b081ebc8c62d2ae1e3";
+    sha512.run = "9608e3ce944868e4c30bd5ac79c87e21e5fd7c219fb3bb151a62670855a9c089afc66207d18e1a4af0675df9937f8c9dfc081ecbec87b00c83e278cb247ec426";
   };
   floatrowbytocbasic = {
     revision = 67946;
@@ -21026,14 +21114,14 @@
     sha512.run = "9adc1f823378fcfaed58e99727b68389b97bc489ba38995e5e7451608cb712dd7fe02b2686f692328b73d1bc8011131017b8edcebcda5e886f3bb4a0f6aed65a";
   };
   flowfram = {
-    revision = 76931;
+    revision = 78116;
     shortdesc = "Create text frames for posters, brochures or magazines";
     stripPrefix = 0;
-    sha512.doc = "9126e9c7361dced9fc7137862c09a23ccb476f78a8a848d6900a4f30aaa5cdfa5468ea68e7f4eff1f289b857520b0a507d6f85eb84f36cfc8e7ea0f6ca134e7f";
-    sha512.source = "d437cb8194d7fa460e825663e1463ca63058221fa672d220388929de79128a379c8f1333985c38a048e8d836f2acd57033c808c4d36c89d0b936d08d18c0bba6";
+    sha512.doc = "96adf6c41840634dbb230850e923f3c07a7d4018527e8fa00423e7e2d3a75d6ab8d00e2a7a22a5d84ae0e6fa5675dcb4b7222ccffc7fa7cc4d009a138136d040";
+    sha512.source = "a6c45ff639509d928b486c70988eb68572e8d752103df9b96885f5afb13ae3496ca95921e5f720f47149aba216eb1861ef82db001a9faf5a31a0baaf3dafbd0a";
     license = [ "lppl13c" ];
-    version = "2.0";
-    sha512.run = "79256c45ab3634f904ed3ae3049ed566c08258d0f52c99200163df13fd8e572a3b027b02d9fad341f5773c2b4e7a7bc911fe593c0fc6d415dd27bf09f25326ef";
+    version = "2.1";
+    sha512.run = "c976a94f5b4af00f0121a874dac2493706e7fdafbc4b24bc776635ce20015d8b9a9e6bae0e38c891afdc38cb4ef46df56e3084b574bd00d656ab2381952cb101";
   };
   fltpoint = {
     revision = 56594;
@@ -21055,14 +21143,14 @@
     sha512.run = "b87a361454199c16e1fbf97bd2b82f8b5569bbd71b7beaa780a6d88357e9262f77c9c3ce17d2ab0ad9b043ed7a1dd721e533c516e1b927f0439e13ced6598a30";
   };
   fmtcount = {
-    revision = 77004;
+    revision = 77677;
     shortdesc = "Display the value of a LaTeX counter in a variety of formats";
     stripPrefix = 0;
-    sha512.doc = "16f7518ee71264d063960a5dc77c5abee6a39f1ddcb3f57887a16b3ffadfbb045972015d1b1fb18d7d6365dbd8ab0e19e00bc17c6d33002aba31787ba79951ff";
-    sha512.source = "131bac87aa9bfd7116356d515bc30616ba263b21a849e16195acccc4482ddd0ef45ece41d879156da681b04f2b203200e41e00bc25a2b17943386b5a2fbb1fe3";
+    sha512.doc = "db15c41a3de41ef693be98ceabf7d11a2c2ec78ab41cfa8035db444f97a4c7b7cdd43eddee54bab146b73e9d9aef114bc020232f1a8d495d282c56cd1790ee06";
+    sha512.source = "9775734534755ff7e2138ef626bb41e11b77a01bc975f07c0cff09e5ce8da3c72fd38fa9b4ba210a7ed9052424b1dce13f21e20e398e582dde5f54238aaf7d66";
     license = [ "lppl13c" ];
     version = "3.12";
-    sha512.run = "582ff922160374d02a06c5fb0174e091f667bfc43cfbb56e47c118111f52f233d6028d1cded590e2e400d9711cf5e3531c0b78b5558b35ec4368b2cd38adde23";
+    sha512.run = "1d096c606242ac3b7494ec8cba3e9e5463076337804fc8810b88444103c3d243cd6a56ba100c69fda74907cab6be766c13f90420194f34ca662ba12a0bd172f4";
   };
   fn2end = {
     revision = 15878;
@@ -21074,32 +21162,32 @@
     sha512.run = "6be5c07123cf2470ca88b7c28c068c6dd308824138fd2f645a1a7c04c69fe84953468733ca2994faa42389b5889990941c8e09dc543b66a1589f3cf22df1e017";
   };
   fnbreak = {
-    revision = 66615;
+    revision = 77677;
     shortdesc = "Warn for split footnotes";
     stripPrefix = 0;
-    sha512.doc = "44837191d22ac8185b7748fbf32769a1d2299b92a313da918e6a03d78f56206e76d73990cfb1f94d956835f369adb4008df4da117a20984afc48289b1291fa4d";
-    sha512.source = "7ebefbbe46d0c4db1244ef699e454c0b393285a489bc20b0fd78bdd5da0ddd00982f063c25dbe78c4aa1661402a6ca8ea492774e9aeb5aed3d7fbd460ae2f58f";
+    sha512.doc = "fd2fd18761df6d071e2503415ecfed49594470c85ff22587504cb875e30bb14c5c64857a7f87c326ed57de061ce7311b65225cd9ded95a77efd9e72f9e356f9f";
+    sha512.source = "042cabd670cac33e37e0663d7141c08c596974efff153bdadc09d37e9d7070f3d3f25fd22e67be863cb2091b2ad167090715d2518d4f96c49d3c0c48533434a2";
     license = [ "lppl13c" ];
     version = "1.40";
-    sha512.run = "15d3ba5ef30d8ebc23be3f0c412f7457960a7032f3c78ccdeba6342852a3b7db699b8792b6f981659268fb28c74e5cd93bfabde2b584f7eade98e6b422127d9e";
+    sha512.run = "ba2fe571ac46471749f4cc54faf5555db1f26072a9147a722f81ee20da1bb24141215d2fc8fd5b9733a540f7a3351a6664c841f7f28a1b27bb454e33a7cc10bb";
   };
   fncychap = {
-    revision = 20710;
+    revision = 77677;
     shortdesc = "Seven predefined chapter heading styles";
     stripPrefix = 0;
-    sha512.doc = "6a8c6910f0790457c71cd55c8d30d07df81c97f80a8b6b7930c067966c76c47848142cdcb7454c4b63a154c5c653933bf71acbd792c06eafdc496c92e4bc5806";
+    sha512.doc = "43de5e54c53e77adaed8b89b0dc7546c9c51ddc81530cf554adf6e2021151485ba2bea47bf4278a1558667ae0d03b361be61aa588d5174220c28011c1f3fa245";
     license = [ "lppl13c" ];
     version = "1.34";
-    sha512.run = "83d74f4bcd8fa90cdf5d0b6e03e9e8e36ab09884998f9955647928ed0a33924735d236a82cc730412edbf54485ec8c357ba3954a264965f67752e397908ba295";
+    sha512.run = "e9aaee2bda248a1be4a47b4aef124ca0bd6f65592d1852d5a5a4110a8bb9abb27241d292f0ccca8a569710bafa4a3b85e31a8a650a35f2e3b57b7c7153f6b68e";
   };
   fncylab = {
-    revision = 52090;
+    revision = 77677;
     shortdesc = "Alter the format of \\label references";
     stripPrefix = 0;
-    sha512.doc = "a987a6efd0964bd5ab5328658e011b5c8da56b404d233c55d96541ec2f37cc72faacd934908c7346041ec8bab3866dd1f171e1c5de5eb528b0f0e80969c0bba6";
+    sha512.doc = "53b14b891dedb928ae94d850444a764db2f82e6ceedda4f0f06ee4a33dd905a457d50a92cfe9053a8a876be3a84623416df18d58392b5e5d29568fb0c76490d7";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "47aafab923d6455da7e63eb24e0fefa8b869efa5a04bb301000cb2eb658893927dd9f9aeb8e6919ea29e0caeca235b1883106228f6acddc667117a3ba1136974";
+    sha512.run = "6b3fd8e888c8905fa25be79775036e64ea80e8f15e3ed781ac698fedf38d2a98f2836c8402b3c663e5d80f79b24c808ed45a20b9b5290a6258fececa5f408278";
   };
   fnpara = {
     revision = 25607;
@@ -21110,13 +21198,13 @@
     sha512.run = "620aafcef4ec7fdaf5cd732551fddbfce53222cb7540dd370f2cda425e1782c907e59868953f50acfff993a8fd8a84d108da7992f1c1565cbfa889a5ca0ef5d0";
   };
   fnpct = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Manage footnote marks' interaction with punctuation";
     stripPrefix = 0;
-    sha512.doc = "08e5753f878d2fd6acf97ffb7e668a87b8b0f348ed16884570517cb2b087712bf664a56169d154e06f8a8b17ec421f1ee2e5116c2cab217ff2af94451dd099b4";
+    sha512.doc = "427951ad2708dd427082281c24c79a285e4084f37a4666cec1219cef646eb198837f36aded7b3eeabd2a2b10449a28d3719485acef8c6a9ba9bff347a8120080";
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "55ad959031a30798449dec5c83d306222eda42642e842eea50532e8f1a956e147f6b6ade6290ab51581990bffa75f7b1fee6d9e96e0dadb87cb5e22e3815b5c5";
+    sha512.run = "89ed104f0522cc49920bd187f16e3635248487adfd35f2eab53ccf8f231f8ffee4c1a6439c985cdca2c49f275357009bb4b0f1e92d0b6e2cb5d5c4105622c07a";
   };
   fnspe = {
     revision = 45360;
@@ -21136,14 +21224,14 @@
     sha512.run = "c1cdc018808a2b9fb5b91c54b55eddf3d517b8dc6062db1ffda3db154efe6f3abb91e61ce90a68743ce411ec614785974b4362f20f03ae398488ac1f816b3ba6";
   };
   fnumprint = {
-    revision = 29173;
+    revision = 77677;
     shortdesc = "Print a number in 'appropriate' format";
     stripPrefix = 0;
-    sha512.doc = "44d6fdf74bf6c231a57b3fad63efa7eb1bdf5b4342cdb38e0d504c4c09190130d37534769e17c3f60bbad668d50aab064bc5c0a1ad99808a6d084dd1921769a9";
-    sha512.source = "3f6465877aa1dbf5ab021e8397725ec83217bd774ee0623e71cf15d746d7d0edeb2f78ce76dfd607568be75b67f4cfa8d3e1ddd29c0ada6d376f7b4fdfad86a9";
+    sha512.doc = "0702b00bad20489a65099ad143a0ff2ea2a01453cf91ef8decc322f8e7d94e974f1cc9514016532b38a4060943ac068084a58e1d43ac291711da70d596968bcf";
+    sha512.source = "a3043393c4a76229999c0308bcf366e94c6c06aa4b6dfb70cd8403c231d545a40d098556536602365c228a4ee574fe6de2a9dd0fa7200c1c6b03ef50c5c96c91";
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "7f43363ff861fd4f887df68dd6daae6c97940d4cdd60b19563a966dc7c08cb88356a150eab0cb5b91bd4c3d5d47e324dbbfd43cf45872a5738c5f9b70766e047";
+    sha512.run = "ed97b556bc0ba2b442a6dbe84a443ab0ac93b94cf9e7fba2e12742bc22f95ad54b8bc7e0914499341e9abc7a62515ced9d5189a25be4a27702c2ad823022e582";
   };
   fodot = {
     revision = 76255;
@@ -21226,34 +21314,34 @@
     sha512.run = "e08643104006c9e14c40bb965b4401a8fe296f43e5f39b285cd19d5aa0ed33602cc0eb6ffcc996e1d6e5aaa57dd906903324626ee40facdcb3cedc5216a3deb6";
   };
   fontawesome5 = {
-    revision = 63207;
+    revision = 77677;
     shortdesc = "Font Awesome 5 with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map fontawesome5.map"
     ];
-    sha512.doc = "1727133ca0e1713c356a647e08a7e22af50ad6a67e66c54f3d9e9a0601bd4a693c365cda625b37be83cb4ece42aba8312488f4ba5e885cc44f68f7930dfd7add";
+    sha512.doc = "042da439d27660803f735b3f4bcab728f2aaab18fcfe82b56cd7a2d14fa634ec1073ea694f516e8f49f9c6555631bf9b59d22b7cb01df0b38bebdeb5933e216b";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "5.15.4";
-    sha512.run = "d7f6a40797b2968c31b28f1bf273af9d27b7a87e7c2953748f354db2e760b027feb5a8fd52c8f367649fba24cd629d71c1b1368b8864d42eb84269e0b22b59d4";
+    sha512.run = "98fcccc849a02841d798d2ac5326a7e8288f3911492da3e6c407095df40ea5d4f47b25db8cc43f558ba0456a6d62925bb58ff5fc1f7b688d01088b9308238125";
   };
   fontawesome6 = {
-    revision = 76339;
+    revision = 77677;
     shortdesc = "Font Awesome 6 with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map fontawesome6.map"
     ];
-    sha512.doc = "07ccf870c63e09a982f4e53c4e4b3adc7044abde23920fcb5015740631c22efe154bb13f52f216b9b86782c7921c8e1b1d2e75e8d731aa8e449eaf02e3e8fda2";
+    sha512.doc = "d9b0f9faac1f76013baeb58aa4cfdbf08b998c37b209dcba69ff8895845c823a7c9a7945240f0d260fbe267c235aa6714400e894391b64299aafec9eb4644e66";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "6.7.2-3";
-    sha512.run = "518ce5572043257176d3f58a61db77c2bcd17d9d2bedcf2320afdc4c6d3e4c1336f48358dda3e4580999f947b242ee0364c118215e1c6c8ff65c62205e6c22a8";
+    sha512.run = "11842cc74ef0bc46e24dec73dc444ea5d0db0a87411428e2162346299b02dbeed320c81b7c8f9188bb6905eea91b13516310d39a6181d5bde4724e8f621159bf";
   };
   fontawesome7 = {
     revision = 76735;
@@ -21280,14 +21368,14 @@
     sha512.run = "780c5218b0535198d2298e75a9134021c2b0131c69f5ed07c783f11cdb44c2ee5863a21db0e77bb5ba76e8c6e7cacb6b44e734ff8fbeada7cdcaee509196e9c3";
   };
   fontaxes = {
-    revision = 77306;
+    revision = 77677;
     shortdesc = "Additional font selection axes for LaTeX";
     stripPrefix = 0;
-    sha512.doc = "bdddba24afeedce04343eb307b5c67ac5818f356f616b8e3dfe8aaa3d89446e3b67db8957d41b2e50df20b792b83e06e772c7800d17330e4ea8684c8fc3441fa";
-    sha512.source = "a9e607b88529a44587c3bf245ab6ac115c96cd563c5febde10f9adc0d7465a8577dfffb4106f10b663623d107ab7b1e9eff4ad6b04ae5968b55be6e975b4d1db";
+    sha512.doc = "acd782e20e0226a465731cc1643481b2ff4da2decd3b4237173c996eda027ae85483731798ecb1684bf2fa9939710d20e7b2a6f342ce4d0c85b62b5cb04c26b5";
+    sha512.source = "8a33e6adf948e3b2b80936255bbf4de57aff797820e438dd85f034355135354febc414efff000c094cd109055bedbb496af337e21dceb0681fab2f9668bc40d8";
     license = [ "lppl13c" ];
     version = "2.0.2";
-    sha512.run = "5c86e90d8e0afc41a9150dc220fcbdb6dbeb798e208c16393cf0c2d77f2fae811f6b9c669e8b461d86ff5d0e0c0f444171cd0d2ae7ccb7e84ef680858589fe71";
+    sha512.run = "6ea09d1b0f3fabae0decd534da6ee5dbbb90fa701e33aff8d26b76268ef654f06bc7a147fe1b2870f54b50383ecb53f0463f4ee5d70b0a70e98b28c5a2b00f13";
   };
   fontbook = {
     revision = 23608;
@@ -21347,12 +21435,12 @@
     sha512.run = "318eaa7cdc310bb651d8dd0df92adcfc0e20fd5e98a670314075ba1241287a5f14021c27acf253b2930c1c0d677c8fcd6ce4f53dfc409c4d36c34c51672a8043";
   };
   fontools = {
-    revision = 76266;
+    revision = 77724;
     shortdesc = "Tools to simplify using fonts (especially TT/OTF ones)";
-    sha512.doc = "5a08c85af67dff5aad3f11de89659e2a0d0a9f5961268b07364c1afe6a452fcc4829b815785fa217cb4f6d8bff47e0669a21a1a4824379af32b4659045d7d76a";
+    sha512.doc = "293126b43089556fd70e14c5fc0dc9023797dc960f8dd1cd42e84ca2fb3773f862b2504cbda69e83383463b7feec54b01701551cf90447465dd64d928267ddae";
     hasManpages = true;
     license = [ "gpl2Only" ];
-    sha512.run = "155fbf7d9aadc71ca2fe56ba68f17241e1987aa0ef3a1d65375572dee37dd44b683d469ffb6edb5a186e7f90902e668c3db050faca3a0da7be676a9fd400308b";
+    sha512.run = "604d35a0cb4057add96f72acb1add359389d2253683bee7fbeaafdb90a9cc9396e9bfd0910fa44887b989498670a778443fac56bbf38f9e92f182fa40a2d9ad4";
   };
   fontools.binfiles = [
     "afm2afm"
@@ -21389,13 +21477,13 @@
     sha512.run = "3b1894d677b63c88010fe583381ff7c0c8a7c5c6753e62e166ffa8ae7f18d6a521b12a4e57f16634855f3b807605407cfad110eb405a3ad334f8a14bfacb6338";
   };
   fontscale = {
-    revision = 76924;
+    revision = 77923;
     shortdesc = "A flexible interface for setting font sizes";
     stripPrefix = 0;
-    sha512.doc = "8ee053541aa6521ea011bc89859ba184c5bb8055755cca0a78d0787b9d5ecef5d5d4fe29316fb4db25c1dcbfb56822e5d122fa663856be7236bd0771a91c7e6c";
+    sha512.doc = "56733cf4a95bfed6492ad1d1373561354f6f1a901cec9a67f5ee09437d08eddea4f9890e6a1455468443d53a14fc17255c6153fdde4ce07c119a8d350a5786ac";
     license = [ "lppl13c" ];
-    version = "4.2.0";
-    sha512.run = "9a76a1ebec4a55e51883c2d57b32fb0b120dbd2423da1af47ea68e9f7851dc1a00032fd7f8983ffba386a08946efe04f3d135e3b7528a4aac16f75a4083a756e";
+    version = "5.0.0";
+    sha512.run = "2291006fbd46275772306a870d38d5002a6009a79b271dbc3da54542537b0a0f523e26e0cf90124f245c7eab5d39a1b2e8228968cd93523897e40eeed644c4f2";
   };
   fontscripts = {
     revision = 74247;
@@ -21408,26 +21496,26 @@
     sha512.run = "bd708a2169165f476a250688b169f1912d93c3b3dc0ca294594610c05b08309d0bb0e6e7a9cc119b8b8e164f12c7ea5bf1b5f781223c16d8356c29e2cac64249";
   };
   fontsetup = {
-    revision = 72734;
+    revision = 77677;
     shortdesc = "A front-end to fontspec, for selected fonts with math support";
     stripPrefix = 0;
-    sha512.doc = "5e95747772d41d7ae8e87a4a1c9fa7b82d190919208001da764f468c986e7d0e824e15732f8a1703d1b31cce484cb14bf3b496a9344bd80742d1abbd11b965b5";
+    sha512.doc = "39671c525f25c8a2523856dc55b3692463811343d3133b291423b3b843eb952b169004ceb8948fba6784d1f51921334806f08d6a4fc10467825038b84f97ec98";
     license = [ "gpl3Only" ];
     version = "2.3.0";
-    sha512.run = "b06f8644a96abbbfebc47254f7384a6f365342b0ccf9b60a2f8e2bece56deac3f2330348b6bd6d8695507040cd148e0e7e8f1ad751147343b15b2d66ebb2c7d2";
+    sha512.run = "eff74da490d8c71bc4e237c22f3a82bb6889219d633a67fa8fb78236562aad4ac46310df88d812b392ab4da6f821053b84ccd154406ccc11220b87fe374d0809";
   };
   fontsize = {
-    revision = 73038;
+    revision = 78116;
     shortdesc = "A small package to set arbitrary sizes for the main font of the document";
     stripPrefix = 0;
-    sha512.doc = "a51c5eec61721daf4c74a38e917c83d7498bc413bef1c6089e28143eb545c9d4f434cc275f4ee22c5308ce7207aec1dfbaac66622d7ca3d3cbe9e022a226a70b";
-    sha512.source = "aacb3570993c18336dd6c5d057c8e07eae374b7184cca3b4356041aba60eb5a07e2cb63711c75c803977a9d90fac1518c58690bbcda96f5748690b1c990734c0";
+    sha512.doc = "6b7ba795d536e17663932e08ba72e1260dc94e5283325b3e4687d2f7efa6021beea9de976ce2c1460d4b43e571287250845341d50a46646da5ea0b0d521d8e5d";
+    sha512.source = "00844e9b0e1df26b68d7db0258cd77af816986c898ac1ee118cf7a2f8910b705e7bb51bc6fc276487b88c658897aea3ca9fdde46b6357f33463afa7075719a2d";
     license = [ "lppl13c" ];
     version = "0.9";
-    sha512.run = "1e87cb92122c972473909fd952a08e75d1ba3bf10897fee2caf870d4f8394d5a11114d77cf3ddf85a9f6bd1f05a607e62812566e450678b8eac98bcbcc53a819";
+    sha512.run = "aa023a8ec1703d6b9ac0cec3b5fdf7b0846847ca332ab38ec1752172f1a9bf55e391e12b571df0bdb1733d1a02418cd4c5983b171b4e33d00e91f533e1ee6e81";
   };
   fontspec = {
-    revision = 76430;
+    revision = 77677;
     shortdesc = "Advanced font selection in XeLaTeX and LuaLaTeX";
     stripPrefix = 0;
     deps = [
@@ -21438,27 +21526,27 @@
       "lm"
       "xunicode"
     ];
-    sha512.doc = "150c255f976b8d85df8d91c5dff74564df5256908ab7f33fe1ab049a982f24b808728758b2f5b7e7776e09f12342060ed8090f5e02eb0b159e1b230a4eef3668";
-    sha512.source = "5f2f9e8d1e29da4520f3fa5b8f5140572b1737bac0f9c8e30ccd68982596836654d9a60dd8a1e1c3dc4e75c76799bc6bb9fdc736f3a25a42bbfd3cc4c12b8724";
+    sha512.doc = "b4e151afd88774b55441e0870cf94ad79a22292302505dafe1bff5569c19ffd187df0b6c0763fab65a28c05670109a81b2347ee98aff9c7b427c252ba6a18747";
+    sha512.source = "fe506c37b8b857d2cc29956304c815a7486f07e98203cb05bc1187e2eb701c21db49e9911ed5d154663012066ce038ad3a23e4dbc0dc5955f92492338eb59f02";
     license = [ "lppl13c" ];
     version = "2.9g";
-    sha512.run = "714b18b9d6c7a5aa9a132948440b36a222908b2c22ff356c7b17287e1c21e6d322fa85a299ff90f0c90ca4ca0a112ff595af258e8c50281a495a5375ca93e7d2";
+    sha512.run = "a6007af931f20381b9d09e11a845279985b61515b0dea14872130299710cdf7b17ac9042e8328fdbaf5c97ad63d80b7e90358200639706c966975f58868ae9e0";
   };
   fonttable = {
-    revision = 74608;
+    revision = 77677;
     shortdesc = "Print font tables from a LaTeX document";
     stripPrefix = 0;
-    sha512.doc = "bd0afd6c725b4eb4a8404a0ac50ac4d13bd7b7b0286691fcd69dd3a4bd7f5d30ab04e51ad9c0d20efab80b804ad202e1ea1907df3d48fcb5edb80963f31995eb";
-    sha512.source = "f39e868c9319382bd26217ea9685835ab3eac93eec653235dbe66d88ccc6c9416b6bf45559dda42e5ad2909feab8bc0df927d2ecd7e9876a50a5276a15382118";
+    sha512.doc = "c11ba816fe0e6d71e67bb39ced64e2b01dc22379f7143019fed80617b6fc778f4817a8d06c8c9466b4bc668c3e77249fbd111ca1680917f50673232d7c72d904";
+    sha512.source = "8f447b54bf95a3422018cf509cd4bff6757fb34a25a4d4e746ad9e864eb6d0fd159d973a64e544269a94c012690845091eb381e0d3a64193389dab2508441364";
     license = [ "lppl13c" ];
     version = "1.6d";
-    sha512.run = "7982e402b245486afdf0c98217b554f4eef19b6156bf6a7b6d351f78ffeb51cf91f7bfbf1f68920b8716ba0b1d302e8ee69f2a3f3afecfe8b134601cf66cb7ac";
+    sha512.run = "f57bab499509b1e11f621da2dc277971d6ac634ad41d89e502a9113fed4c02ff78707bc915ef63e386e899313b9aec4c520ca21d86dcfcd58ef01fd9ca56be8a";
   };
   fontware = {
-    revision = 73848;
+    revision = 77677;
     catalogue = "vfware";
     shortdesc = "Tools for virtual font metrics";
-    sha512.doc = "d8f9ea88d167141d8d5bd19b8fa0e114d9d1e9e7d8812bfc7f7b8fc23dc62450cffe28c22b7cbb11f70c13105c017831105266ac331709e91d67acacba40ba53";
+    sha512.doc = "48c55fbd3e19d7920f9ddefe347d556255ebf80b8518501fa7826df69baa6919790cbc0549d98ada348cb11ccd4c0c5f172abe9d24dcdf04d67b50172f1f7fb8";
     hasManpages = true;
     license = [ "knuth" ];
   };
@@ -21487,14 +21575,14 @@
     sha512.run = "0cadef58331d5d51aeba1f69d0c9ceae99104f7c31ea79e0f5dee33c8612bc52cd0c8551abc6da1799705c879cc88535b46e4ef15232d3c4a0f7136e0fe46e05";
   };
   footmisc = {
-    revision = 75164;
+    revision = 77677;
     shortdesc = "A range of footnote options";
     stripPrefix = 0;
-    sha512.doc = "792f011181849363b8982ed42458bc8e65342fd7b952bed6c8583d62a3e638531fcc7b117f84af3303619a9e8c2b769a395806c90009970e7fbb4d91aca50fd0";
-    sha512.source = "a2987531a7ea559b12c22d2bf5b9132a1d1c15e8b55f6bd76c8c9111549e8e48f5b054f58c45143fc110e63862f503fa27bcd38c0b87afdd589028fc8ec941bf";
+    sha512.doc = "fce22e36c83512e41ebaa0de32a02714bb2b9537148909eb048d9a780db67467e5d9bc6088027709a10e2ce2c0a8ddf224f94c001104a1cfadbd30b5cfece158";
+    sha512.source = "45f39afde4652926a4eff0441ddd68d2aa77d7236b0b8628b7fdc51a477c62a33e5e83da6d23ec7e6e3ccafc0595ff2cc66bd4d823adc466a5ee77b435ea5b41";
     license = [ "lppl13c" ];
     version = "7.0b";
-    sha512.run = "f242c9ad088c5fdba7692efd967ab14f4799e1d76b920cb52641461ff08e83f874bca5ddaf906840e758c5ea45b85cf67c8e8ea7167a30226ea1f94cd594fea6";
+    sha512.run = "5411f4ba7ba8dbb77af9a2c064bb76aa79dfed1829a00bd8899e7974d75f35454f86fe49fee3d3398caf8be3d283ba9b33eb463d74ee92203b9a17471a581be9";
   };
   footmisx = {
     revision = 42621;
@@ -21507,65 +21595,65 @@
     sha512.run = "591f181c8103ebd7a86440b27992df9eaea91d5998caa0f52dbfa48b7afc4791ef8c1f5a95d85b7cafd56113726beb74268b7498ec489d7b3142dcdf7f07adba";
   };
   footnotebackref = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Back-references from footnotes";
     stripPrefix = 0;
-    sha512.doc = "694742c7a77c04a6b4c02817d38a4fdaa50e7cdfeec64acb1d7a9c8bb4728c31ba9a54468aa950ebabc91e62d8976ea55ce8ec4e653a344dbb47bffb39ab986a";
+    sha512.doc = "e4eae13e7a0e3af5960ec93e8c8d5d650c2387554de1ec816d00494c899770aee3f4c4cf47f90ef3e2143504c9a799f0e0b64ff35ade164c573efcc60e245baa";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "d6edef0287e7a84464a878f833a17ff8bbd4e7d7ea30db5318d8f1f44935b826382a411e1c914f6d063a21a5cf6178f4212e3059f98b86a9713ee9b01283695c";
+    sha512.run = "88a2029afd652e0e98b0cc0b4ac8b5903d087faed71332f45ac4ef1ba69f0372add57855676f9205c862d0e7f99295d6365a0e5c1074687037dd5330c7876c18";
   };
   footnotehyper = {
-    revision = 76871;
+    revision = 77677;
     shortdesc = "A hyperref aware footnote environment";
     stripPrefix = 0;
-    sha512.doc = "a4b4e9dcdda14ecd15a04da394773e11b97c75d8bda5128de48d44dff47bccadfae87c1c27492fcf9267b6743efd54cd8ac95c8808cfc2830463fab20dddc892";
-    sha512.source = "6583e7f851d84399a52edabef2faaf9588ce1436f6206118f21eceab290c5074ea051d89e073c4a8ebcb86fd9ae3e285853cf596d3d16d3a9981a2c9d4e277a3";
+    sha512.doc = "bba0ffc60d14dc41a85bd9ef86b07aadfc9034811347090c17d2bb514f9bedca3410e0efc92cdbd2370fc460e5e9201230ef3e9eefce2af64e0d126b4ea8cf49";
+    sha512.source = "32bc23b110875945105eca4957589cd8e869329e089ad986ef43b0a529a77b14306acdc0384bfabfc465e9691d9e367202f31efcf451321d9f9cace9b7d6783f";
     license = [ "lppl13c" ];
     version = "1.1f";
-    sha512.run = "a34c161df57b28cafff9c175b66769ae78599bebdc4c6c70e5a2943e95bdae275e58a0b798dfb9786005cb1e534f4b96b541b96560992a8d0cfa33c78e0bdb26";
+    sha512.run = "d495b5dfc5e0276b202dbf07c6ae2f3ad07f854b8005f268525929054ef98a7d5469609e190f8c0f7a95b3ae96744157e9540318cea203194afab7537784c2c0";
   };
   footnoterange = {
-    revision = 77409;
+    revision = 77677;
     shortdesc = "References to ranges of footnotes";
     stripPrefix = 0;
-    sha512.doc = "fa226a05a0674617f2581998ca94ed698f60ce9655fe9999ec2508c0e4fcedbf70200df5725bf0b778177115a35a2f38f774eb3c8eea038a3837dd84495185dc";
-    sha512.source = "2998a2112fc18585cafd5637221626b5e55ea17a36533bf709530c85da1cb1381c105b2643c6cea7932bec424abeba25041406660bcb3f0cfb60d215c4df472d";
+    sha512.doc = "8649eb0994169c3c18624b0320b506f9a77146c2195006c8e576e23f8f14453510ab70f5470d39d5df3bce4c6eb5e86f061532ba717f50b311567af4d27337de";
+    sha512.source = "d5458b76cdda2cc74119a162d6e477583fbeb40681a29aad404cf7c35e295d14a373c9e0ff5cf6e0e4314857e6e610e5b28068a6c0fac8f8fbbb809432534e2c";
     license = [ "lppl13c" ];
     version = "1.1c";
-    sha512.run = "dc0c2dfbd422ed649814806d0ed8b1a4e2fb5c5fe0077168659609d460216291b517a798dacccfef051de6a0c18638b8d5909cf75eed3eb4e70c76e232ee8ebf";
+    sha512.run = "ed0f552c4ab9f8cb66f149d98f06405a3f112aec63faabedae2ec198a1ac3ab57228724de85c1457440f531ecdd4c23e99fef9f60260cb16e1c1e99b6c2baeea";
   };
   footnpag = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Per-page numbering of footnotes";
     stripPrefix = 0;
-    sha512.doc = "f83c9cc0701c63dbd5d3b7dd6038e1bb2c427e6edaca05b814778592587b066af3c4f7f12646f7b2ff7cc1c2ab8d2ffd99480dbfe72e50c9bce907e8e2d4c509";
-    sha512.source = "a44b0ba4ef7b6328d6d307eca25c34d494000a238c69fec3686a55057ff56ae1ada7cacc763ff1cd26aaa83962257442060fbd795c76d61f92761bd66be81378";
+    sha512.doc = "a56c214da547e23cad230b1144aab4d24d4ce9415f8faed91aa9b4aefdbdabfbf65f404f73184af509529f8686ac79df15a9381628e7b133dd5112f101795e5d";
+    sha512.source = "ef9d422a169dbe9a6bb5e3a35c6ee4796e13b840bf7270bff95998cfcc49e660bb8e2784d1f8b56b2862d08e87121dc753b6f9c579792832f862c2980f544909";
     license = [ "gpl1Only" ];
-    sha512.run = "a1ce9661f0f6a69d1709ea053fd548aed428a9cc8ef0445b9c4b897eeef349bb9767c219f5d860ab4d7d264982c1f4404d33619c80dec8411350bb965b19d709";
+    sha512.run = "b31d94a907c7b960ae824ef4e917f63d83befa1dadc1f7ef4ce7502a4b3e62ef3ebb7123e5464934d9c9956ce142a937f72ec36ec99f39b6db9e43807ee618b6";
   };
   forarray = {
-    revision = 15878;
+    revision = 78116;
     shortdesc = "Using array structures in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "e292418f60b290bf0567ea70169d66557a8408b2933221e0658d6d8e807b6495258a6ea33d65d14e13129ff8e58dc9cb50115459b014ec00e0b084f3d3fd55fd";
-    sha512.source = "4a9574868753faa19d0e80bd08c524445a015bcafe241a85d59832fb308981d12dd133fa64e65804ac5c3d86617046f06a17a4667e8cb382676dfbadd6f012a0";
+    sha512.doc = "717193eb67517bf149b8db05d2030333accce8b0e38be8b29da58fb64d8bb1bda8299fafcdddb976cd26c98abfa74bf7ca9084f6abd662f4543f857f56157d00";
+    sha512.source = "01cffbb8dc5ce0440a0549d6a816b85ddf7e653ca388de225d59d0516d4bfac3adaaf171aae8d6e86de5620eb9b1593f3f1aef38aa7d24c34b5b0578db749a6f";
     license = [ "lppl13c" ];
     version = "1.01";
-    sha512.run = "f818d0899fcba2d61ad119698d3633a28d5300098a4bd56a82b7b1c9cfc12c47a9457efed7cbdf8aee3ba9ba4143eefbdd54bc995c84c9bbe99dd5717030bef5";
+    sha512.run = "67d86a54265a0dba4e91fb11c400a7294abb76a0fe9f07e5d370dda218a2399bb8650b2ccfd9f3283a9af9b17f5f3c002e9599f4dba0c3dbbabc7d5c7fd525fd";
   };
   foreign = {
-    revision = 27819;
+    revision = 78116;
     shortdesc = "Systematic treatment of 'foreign' words in documents";
     stripPrefix = 0;
-    sha512.doc = "d3804dd1b83ba173e4098696656c814629ff099699f332c3b81136c4519bd577aaabd4d2601893f88a58009f00e8c8ba44fcf2c4a3b72ce90af4d4febb510ec6";
-    sha512.source = "d91bd89508318df931629678cdd0415da8baed9efcb55f965d71e26a61db705acc6abe14c6f7c17b61f54e32ae123ecd48cd018920b1f43626559e2b0b4a3c16";
+    sha512.doc = "9bbde45d32e39caeecc292536d6e42c22530c73ee29b8f0d272a726cb1e6c4531c1fd7c1684c20e9744ffc5f4adf13b0a3bb4f5baa64ef77feb751f55bfe4bfc";
+    sha512.source = "e85ef544ef87703efba61c8a64a46e59ba2c90e0383d349b8b97e691c8b5f90a50d8c23d2afe045bd34a96fbe30c52ebce7c23f360655284ec54d103e45c6fee";
     license = [ "lppl13c" ];
     version = "2.7";
-    sha512.run = "e886be0cbbb64b11b6c54d6b62d6b38db1bb7e65b7a3a9cc951ad71d4cc1a93c323d8a1e17ba863daa6535c747c9801b06bc4d3c664bfb8da38518a9c93d45b0";
+    sha512.run = "b5f9aff9d4d0313be927e0fc0e555ba86fd0b433a079e4a4a480f755f804c4a04bd85ec7453b8a489a069125012493af1bb7c52de338a9ea6690e8b56ce588fa";
   };
   forest = {
-    revision = 57398;
+    revision = 77677;
     shortdesc = "Drawing (linguistic) trees";
     stripPrefix = 0;
     deps = [
@@ -21577,21 +21665,21 @@
       "pgf"
       "pgfopts"
     ];
-    sha512.doc = "fdaec77023176fc2f7510a9e3b4dcc587898e1f96886340222f932c0d93b1002ad35fba8a38a036f713e41814f3dc6b3f75a5657ae485b15ffea43089895bcae";
-    sha512.source = "45f912d17d29568e6ee267814d63bc14c20bb0d91c62b39c21301dd611c50db3b5f7de5f16b519da0f2b4d15609727144c34b16a620abb85114a42344cdaf24f";
+    sha512.doc = "4eb346df9e679af7c4f8d2a4f4b2f30ce46ef5fdccd4b2ec3a43ba737659651958be87c315da011a94a5975820623576fdcbb79735f3c1493461f5a642478081";
+    sha512.source = "7395fe5e324d50b3dab76ddd852928eb8d93620494e19f4d9ab471691e50b5e2cac2622cd77b8d71a5d5f12cc5a74c53e59ac1b70eb59c88c5b1bf9f85d5b623";
     license = [ "lppl13c" ];
     version = "2.1.5";
-    sha512.run = "edc3341b84e7e89fba3bb76004562c0bc889f944ed33474ba9cf5ed5e63a690202e851a30f44158caa8351b874b8e91659bd91c50d59ec43de9460869e4213f1";
+    sha512.run = "3a160daa2a6f3b4c8e2a9f54688bc3faf939b7d5823679ac151da7f9142337f179d73d41f0f0a1cca6240becde7124c4e637d8de2877d73fb0dea9f0b85716ed";
   };
   forest-ext = {
-    revision = 77412;
+    revision = 78040;
     shortdesc = "Additional Forest libraries providing bug fixes, extensions and support for tagging";
     stripPrefix = 0;
-    sha512.doc = "05d6b0b46a5a1d3b54d2ac2677d8abcc6e7b146b7284052717bc6c2208e6260902c29e33516dcd83fdcf0b3d85cdf6fa93974f0da9dabba948c5b97adfc82de2";
-    sha512.source = "7f2d9b4b241d980203b5024811e2ec896acabb59b875ddd311a1026501405b76837d860732858e35778efa9f1bbb41af2b42a4f9d29ca5f45ceb8d66c50c20f6";
+    sha512.doc = "09c7a5c38ed61b316c88ad120728e37d16e6100c3c7b83f8b8fdf836a95df8b2b2e4dd0b1ccb5df55c8fbf0b8f28c535826fd3fd281ecaeafdbb58527f4b4f11";
+    sha512.source = "abe5adc7710bdbea958c1d0ce60a930195482c1445c42e8fab5cefd09ab07d27e77b8d66a1bfcf645e62d2b8fa730740885280579e15920e787ba7472828cb58";
     license = [ "lppl13c" ];
-    version = "0.2";
-    sha512.run = "4b7895b8ede3519bfe5af6f4cce499b053c48c4d1c4e797eff96f338f26d82dc4f3e374d1a8e8ed062460c562f135257cfc3a4c8d12da611ea61235fd9c70450";
+    version = "0.3";
+    sha512.run = "3f7b5388dcb17374946ff73e5bcbbb81d3471d88ba70e1c3f94f3c3a793d64c8e636c1be01c17cdb0892773b2f443f156b752ef7eccf21f705182ad05d5e5b7f";
   };
   forest-quickstart = {
     revision = 55688;
@@ -21601,14 +21689,14 @@
     license = [ "fdl13Only" ];
   };
   forloop = {
-    revision = 67017;
+    revision = 77677;
     shortdesc = "Iteration in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "7315a8e90a83bbb73cb82525fec32c750d97f62fadcf1cd1faa816aeb2c54b5183c8fe659a19f213764979d495d7774df7aab7c950fa9886c6911e526712f0ff";
-    sha512.source = "fe9aa2c7836a17debbfc392b44bcccb09de5b978224b2ec81e17daa07eef3eaf508206f1d54cc9dc7897122ceffb9d1b8d5957c26f2b4bcaed4ee93ebe3436df";
+    sha512.doc = "5f882d0aa50c50a42bb226c14d78e207f0462f173be29828691e653f220814eef92700ebe765b60e7bf9eec777657f965ec3faa336c3f53e77a35d37b5a1d7ce";
+    sha512.source = "9d8e27a5441bd3119e548b13587b9d5cc8beaff9410b76c7a92f8a8114c960925d377d8e5c32504526c2b853c0bfa8dcfc61c24ab5f0c36dadf187d9c1609c19";
     license = [ "lgpl2" ];
     version = "3.0";
-    sha512.run = "e4cf4d9fdf01b753b40d4fb2c5edac94756ccf60a7e0b1bf0da8b5b0c433eff5669858fcc35096967f9a53e6a365880e6677956ebb86764cd68ba3093fa4be91";
+    sha512.run = "0d1c2ec111991918e52de92fd833a43214458922d5cc486385cb876467234bb13bdb5c7a6c026000583f3adadcb736d2548a21abfc17b605879f91dcbcacf444";
   };
   formal-grammar = {
     revision = 61955;
@@ -21659,58 +21747,58 @@
     sha512.run = "0be09e33fc3cf97552dc9e960979447de61c53bea46205a52b37094f7ce39f10309f559dc99c0037392d4924bb688e27bc8d26e5f6fc69dfbc3d3c41736223ab";
   };
   forum = {
-    revision = 64566;
+    revision = 77677;
     shortdesc = "Forum fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map forum.map"
     ];
-    sha512.doc = "6598777d072ce157440923c767ec77f710ef38bfb019b7134d0ef8ee216d1a66af185a63a54a6af0c17d537a4027c7fa322ebdad07466787e400b6ff4fd77d99";
+    sha512.doc = "217b05026d3d05973392b5b0349433bd177821d56e7903867f1b3ae90f115bfec18eab737145187d125dc6db0096495c7af30fa983ac2a83f46cf83162504dd2";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "17336de3385fe31437577e541a63fe10a9ff6f972e02776448a2012337499633eb118d86f7c1995cfbfd5b84360370c614a3687b18880e24a7e4ce06c1874117";
+    sha512.run = "8af782204ccae753316483eb9afdb48ad6905a9e78b19e510ff08d24a787365cdd7af6ec0ba47017aa1c7d17ed1635bcb611691e58c67ac54b720ab5cc26b1a2";
   };
   fouridx = {
-    revision = 32214;
+    revision = 77677;
     shortdesc = "Left sub- and superscripts in maths mode";
     stripPrefix = 0;
-    sha512.doc = "8bc55b8e191b83ea42e228b47621780f4aaeec65248f5b3e9aad94443eeba08b1bf1bf44b7cf252f66466e5b0170260ad202c13abf2d76d4576833224212ae44";
-    sha512.source = "c29e1c93e31da33a3ba3914ea2992a53b52bc18a4da0d20cdfec712037f98058be5113dc65d731253aff8c4e1b0fcac4afe3da36b972f1fb23ce45a795c546a3";
+    sha512.doc = "65355bdc2c466acc61af75d40182dc081a8a585dcf72625c8950430927510732ae54dde675eb21a6037f8ee937db1ea7fe61d6cbac13a3309530379c8b4a6081";
+    sha512.source = "0a463f9f79c955260fe4ccd16768bf3c61eba6df0ad5b28864f3efc8ed7fe2b1eb0aff52386fdee6c3ecf38ca0328cf32848adb4e1a43b239369a2d1e0d1a736";
     license = [ "lppl13c" ];
     version = "2.00";
-    sha512.run = "01a2cc941482972cb8ca3f5402bef75f53d5e7db2b42f8bdf614c34faab3805c3548d3786c3e7cd9d8d8f7691cd5e8e71e056ad8afc24d52444c6969c11eaa14";
+    sha512.run = "838a7e7f1219473a591dbc7e290228ca5dc5d7da3156a9e927c09e4af79e78a7120400c6787da9e34449d2dc6756a70206710b9206adb77c2931bfc16eae2fd8";
   };
   fourier = {
-    revision = 72243;
+    revision = 77677;
     shortdesc = "Using Utopia fonts in LaTeX documents";
     stripPrefix = 0;
     fontMaps = [
       "Map fourier-utopia-expert.map"
       "Map fourier.map"
     ];
-    sha512.doc = "2c1ccc9bcbb92287aa431aa803e3fa91bf9838bc82692bc264bc71669f7fa948662c020c03f8b9f31496263df293cd0953d1a0be05cf44d24f7c6185b5372f54";
+    sha512.doc = "772b365d29d75f6754a644c80520cb78c7fb7302c6a5943420827f2e34b2907f3a4cc5f32eb922d1097ccb46d1d2ec2450f7c8da41f359d618e6c36f6b065b6d";
     license = [ "lppl13c" ];
     version = "2.4";
-    sha512.run = "0002ec5f93658e1e7d44c61595be3ee49ea278d556c4333ee999117299668a367b9259143e800efa60f759a90a2e83539cbf461bb96e4fe8c4b4ca12fe51cbb1";
+    sha512.run = "ab47d5b9884c4d1e76eb88934a9012a19c0ea1e81cbadc469c43a717d39a68f3990d20fe68048a21f8300dddb2d3f73d5b654a3a9d9770d50e4468307aae771c";
   };
   fouriernc = {
-    revision = 29646;
+    revision = 77677;
     shortdesc = "Use New Century Schoolbook text with Fourier maths fonts";
     stripPrefix = 0;
-    sha512.doc = "039ce79d06bd1fb55b257f1c65c53412b15c26d4eafb9d3abe9bb7a7fa836c8b545718f70d935f1449fa235f33d07c81ad8f228608de20ffdfa99b9f532e059d";
+    sha512.doc = "d7373bafd50d8a9e048631e999a5d8a5c139b3ace48b64f04201215078c139f9cd6c5ef92c9946c341dc2416965bf10e6461a5606f97c57c915de788e1a3f6ad";
     license = [ "lppl13c" ];
-    sha512.run = "904b464fb9066100512cfd8a8998bb089113b443e2df1fb77100f9b5a26d48a5b3512931c00292d19764eb4f068f207eb38dab78798f217f2533a65229411df9";
+    sha512.run = "5df45cde7acafd36a1176f672782d24c76c5eef75c17bd6be22b03b1113a76d8eac18b38573f1241a97929dc10ce2b6e83365c6dabadf5183bf24114819119b5";
   };
   fp = {
-    revision = 49719;
+    revision = 77677;
     shortdesc = "Fixed point arithmetic";
     stripPrefix = 0;
-    sha512.doc = "79b62424943f725ffc6c1698cadb9ba2fa6d9f0694741a951bbed23c43f870b930d966f110bbe722c17249c7211f08a3a95a5ce7e9da69b7487aec37e99e5152";
+    sha512.doc = "d8c64ea47cb071a163608d25e037e6b7a654bf8680c39f9d8ca22320bcff393f8b8c7605a84001973f9df145e3dee9cf3e20333acf5b72d9d9d49a2338676ac9";
     license = [ "lppl13c" ];
     version = "2.1d";
-    sha512.run = "27e60a78da80caf0e50d1fc83d227d19982e30950650845df710949f4d88db67dad96212331182561c43d37cdeabd3b68f9af55763f30175ab27a6b5f089870e";
+    sha512.run = "2dc4c5e22cf835322eab7f972f66676948e988594e13779773e717a3699d67fb21b4de188ce4ca70fc211de9a592493419f35b2f51b1ec9f04fc76d5b18dbadf";
   };
   fpl = {
     revision = 54512;
@@ -21763,13 +21851,13 @@
     sha512.run = "b66df0a91a8605aaeef2452236b5169cd363689a40f4a35ab9006ac18c21d4ae2a070407f84beff7de0be246f2f1e55c8b06f234921c4d7153fea9a7f2df1679";
   };
   framed = {
-    revision = 26789;
+    revision = 77677;
     shortdesc = "Framed or shaded regions that can break across pages";
     stripPrefix = 0;
-    sha512.doc = "1f48ac19f74f5003df88700ff85c072c8a655d4623b82bc3b7c6570a548c0a7b7e97fe292f8557a72188c0047fc28e280bc3ab65f58559804fa78e89317fd67e";
+    sha512.doc = "9ef85729faa8bb1ff81d623040fdd9fe95f2271a24d8c82b0282fdf7520849f5ab984f4592b2a5f1cad196d21d0270f67e50e4857346180b87e8a89e24c78ffb";
     license = [ "free" ];
     version = "0.96";
-    sha512.run = "06f0da36c24ba42959b2176066d3e95f23dfed41753f4e4b07c1f92c4789e68d1b246c61cbdeacbb9c00b6eb990ea2b3ec75dff8ac57845102a867dfdf2c72c7";
+    sha512.run = "8019ecff9b706d381a307efadfdb373345c70a51eec16ac5f71c400c14e4e6984a1d64216c4bfc776c9013b57bcbfca8d02adef25c70266ef3fcb0370faee304";
   };
   framedsyntax = {
     revision = 76790;
@@ -21801,15 +21889,15 @@
     sha512.run = "1d94962185391dc1fa9edcadd67a60d9a4b59592442ffdd45badea6279db8dea101b418ab3e03284e6e88c247fd213887f06e72fb6c4a002a66acaee82d8d4bf";
   };
   frcursive = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "French cursive hand fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map frcursive.map"
     ];
-    sha512.doc = "f3cc6b6a5c4c09c177f1c7c85a10a5af6ca0505bcd92749809083df496b71c6731c8da0eca842fc6ee68ca7b204bbb0809b3b2b6844a30daf01d134cfe2e45e5";
+    sha512.doc = "02e1ad0b7e1dcbe717d65091efee4e2629e6051b5f20cbb7f3a1ae67f94b2bd1d7b5636abc97486216d1931e31feeb4db73ccf424013b2726fe23f07c62b2d88";
     license = [ "lppl12" ];
-    sha512.run = "0a1a0fed2c25702c192bb1cae566ea75b1add34815763829d180751dfe950b8916cf0ef26563982416a7d7495c53f446a803b3ac02814d22a5eae70c22e2253f";
+    sha512.run = "e4912621eba438c7e4fff240117b31e233685bf98218d94475cd751de21d64483d99d20e3fd85d7dfb102dff7c66e1274f4c275505f8300180c2fb1c2f86567e";
   };
   frederika2016 = {
     revision = 42157;
@@ -21895,14 +21983,14 @@
     sha512.run = "6045214cc6a8325d8c828c2591fb43995f098803b031adf50bf8b4dddfa0047ce110dd25e5db71b068376893b7ee83a70806713a83b90a26c4d1c8553e4f00f2";
   };
   froufrou = {
-    revision = 67201;
+    revision = 77677;
     shortdesc = "Fancy section separators";
     stripPrefix = 0;
-    sha512.doc = "fd49cc43d8479aa952b68b42bdc58a1e6256048027eed2d50ee80d2312f375956d6936f91b7a1d0d6ea2cdf5414b09f987e4bbd0f7ba279ecaccd8cfc9f6dd48";
-    sha512.source = "bab0baff37c117b842d341045b3bc01ca9722f92c5b0b18c8e777dcbd06a8e6bb8a13432f44b561ef5857a8f8538e2ef47a9bc5a1f012addaa2accc1cffe971a";
+    sha512.doc = "252b92a550a6384b56b71245d851c7155535574dee6aaba49f18f70ff06554a5c83bdb76975259867c8777f7d31c47cd9b449ba6c872aca8b64597c3480c9613";
+    sha512.source = "1e2d4ee6c13200d60b2f4243e34229143d113f7cf6ae0fd9b6535a8c92262345918d2b11bff3bb1ee991d6a26fc677d863757bb9c924975668c1e175ac49180f";
     license = [ "lppl13c" ];
     version = "1.4.0";
-    sha512.run = "06c13998e051544b8fad8c65dad787b670beed1ec177262d3076b77d805423196b1b9092c0c2acf383450ebfefc4e670406dd7ab4413217c492759335a2d8310";
+    sha512.run = "ee27e4994de9194c9862bd258833b7e79d97bfb75f18afa2603bf8fccc7824a7141da1f676bc1be1b30a974c86ea5cc54d6cc5f84a01ce5052cc873e4746b508";
   };
   frpseudocode = {
     revision = 56088;
@@ -21932,14 +22020,14 @@
     sha512.run = "1287e0bd63fc92ef3e3c77ae3a6113cfcca38dd63f4a90948baadd2a365c07b38631d916230baeaf550b1aeff07f9cac3a26a07301838716d8d70fcf0843953e";
   };
   ftnxtra = {
-    revision = 29652;
+    revision = 77677;
     shortdesc = "Extend the applicability of the \\footnote command";
     stripPrefix = 0;
-    sha512.doc = "fc16ff992e3339480a4154169665be49f51e56f361d0b1f97842c555be59485fd7edf3cf815e32642826224e188c5377fdb2ab36746cdaef7f552399a4b7119c";
-    sha512.source = "87e580467312c6198fd7106b6fdfdac994c5f9fae3d131b793da60ebc9d852141ed6630aa0d4273e50e7311b6e10499a3e4e2cf141ff197d5ed72822f0c15be6";
+    sha512.doc = "a8d45d957f3a5488df2ecb9ea1fca665c04a19d2ae96ac51ca2c0df44d5b8dcb576be628ee2b13760ec1c6ac6efba813c2eef7248c0634eb8fa09baeb5d1e8cb";
+    sha512.source = "fc6e8d6275f4c48ec1b37c24c9b6f7f86362f939c85def44b822216cd3302d5423a7b821f3044ced772265fdaed17266347e91f6af00da33ba5b2ee146b59f56";
     license = [ "lppl13c" ];
     version = "0.1";
-    sha512.run = "df8395b996f96ed72505ef1ef7f0e8e6101d4b26059831b227344023514d377eb189961a240e83ba42ac4ef7e8086b8ffcda347290014fbb1cf1531371c20eff";
+    sha512.run = "718200400be4130b87abb71cef7d6d072336532e4ded7be38bfc5f84967c8ff3449d2b7c8c8d28dab2b97b4454bf9f2aac131fc9bf093a10645ec807badc9609";
   };
   fullblck = {
     revision = 25434;
@@ -21989,14 +22077,14 @@
     sha512.run = "46c3d9ceffddb984f809180c51f0da05137ce2c65c672fdeb0fd7d171da42c494899429048933537e13628409844bbcebba41bfc7f8bc7d1a2d0633e6ec76d5c";
   };
   fundus-calligra = {
-    revision = 26018;
+    revision = 77677;
     shortdesc = "Support for the calligra font in LaTeX documents";
     stripPrefix = 0;
-    sha512.doc = "93aa54f12ade2eab798bd84596ec3b366db0a15eb05b5279261af8bc13bc1ce782077de36465e8e29d11ea1b89456ab207c33ab907e5c31af95e63d5d897da88";
-    sha512.source = "bc5cfc694592c7a0fb469f752a6ec854d11d9f69588fa6e42390080e88cca3da2fbe888b826ae7a3c07505bc418129237faa791dbf4f3dd9a31cb8e06ad1a9af";
+    sha512.doc = "5adcc9129b8304714be57d47f2a48e28a3789859d870b0005fe71428c48a5503634321b7cda6909ae76d5b675b2bdbab349047386b5e505d1ba1685fe02493b7";
+    sha512.source = "4578849bc5101e39bab797e7a490f28be2eeec465bfd7233b030ff9db7431a614fa323b8aa12ffd426923a518469a29446a21513de8fc9b8c5a12b0507bcc37e";
     license = [ "free" ];
     version = "1.2";
-    sha512.run = "a999f372ef266e66a199935a0783d99293141aa08586a38d65a3748c1a239eca7b0faa74d537085852e79520343ca937943b30ce38820fdc925d75b1a334aabd";
+    sha512.run = "95d19a5661ff94e488356ffd70dc284a4fade61029d067141a69528849154df37b26c4540206c30db95ffe19a60f552b53e7ba59e6f2f86a06bb77f2232544da";
   };
   fundus-cyr = {
     revision = 26019;
@@ -22025,25 +22113,25 @@
     sha512.run = "7fa952cc5b27501854dfde94d2d36feee41bd6b47c4c8cfb1e3547bc25716b851d37bb8c3dc88c252e192210ffdeafddc13cbec7ad6fc36a50ac384d5a763bd2";
   };
   fvextra = {
-    revision = 75355;
+    revision = 78177;
     shortdesc = "Extensions and patches for fancyvrb";
     stripPrefix = 0;
     deps = [
       "fancyvrb"
     ];
-    sha512.doc = "bb8f9c48deec4edb4ab2711be1e8cb9916c36848744e6986641da3959721d1b7fde1bee1a41ce6fc57c5c51357efc1483ec87e08c8f1fadcf846aa6497971c1e";
-    sha512.source = "5a7b4084d511f06661c978b8d9eb965afd8f602b8acad7de92ed54a0a5b6806791c2ef8f463c99ccea4730c0a45a8951bd2ecbca42baac2800fd344544b737fc";
+    sha512.doc = "bdf31004058dc2ee354fa889c0abb73ec9a459093fa7a2a7a0f64394f567dc0e6c349d27bff0ecf2d98192e0f4003cb26599fb9df71c757367e9b73de9333ac4";
+    sha512.source = "48cc4b1a9667578b8b91d215ccdaf30ad489340252db0f6eb3246580a7e12589567c4fbf4263445c84e81360834221240a3bbceb0710f6e89a36a8090361704d";
     license = [ "lppl13c" ];
-    version = "1.13.2";
-    sha512.run = "10d0cfc279ae39764e082a880fdbd9e9ce93ff4e45f5e7ddfafd59ea95046b16ff1dc194554e9c3fffff60dbb5951fa935f55d483838b8903239ec5b06961c00";
+    version = "1.14.0";
+    sha512.run = "d99ebfdbdd336dd901fdff3fbb6eea9b7fa30b7c019f6e9a550ae65a03fe92eb3461e06ee65f07a7fb9e4d7a7d5a274756fbcee69518de70aa9cc865d68cfa38";
   };
   fwlw = {
-    revision = 29803;
+    revision = 77677;
     shortdesc = "Get first and last words of a page";
     stripPrefix = 0;
-    sha512.doc = "bb55ca044aafb5b11b89b3c817066c4fb20facba8812667398ecf945bd8ed4b11bec2dfd21455db9cfa5e81e5f865655a3e6f4d3724bf40e47ad1db708896902";
+    sha512.doc = "87adf0f173063fabcc542f32c533d94def89a77e062b1e7ffd79a7d959a1afd720fb6bc24792400ffa02f1f83f022991a51261d353401f9ede27444a5d4cc17e";
     license = [ "free" ];
-    sha512.run = "ac2c981bcc4da92a7f91c3ac17d66c4e0e7c94ff1bdb3bf3c7f6a4eef19fad1ecbbc6048a5c74627126c7e1190ee18c2c9373e80d52130a2d272c58ef70de6fc";
+    sha512.run = "b4651c4946c6f4d07f6d6b36a9e76060a39586a308fbb2d23725894c8efc6c784814d4d2af5eedad86ea217c5b228050129e1ceb5dce646c9b520916f0482da2";
   };
   g-brief = {
     revision = 77050;
@@ -22104,19 +22192,19 @@
     sha512.run = "8ecc1d5209ee6492e032b30e217dbbd0ae4c1ad9ab5a42e7e042eee63809aa257c8cc5d720f54be5553c8999f78334b8057bdac1134d4788144a3cafade7154e";
   };
   garamond-libre = {
-    revision = 71058;
+    revision = 77677;
     shortdesc = "The Garamond Libre font face";
     stripPrefix = 0;
     fontMaps = [
       "Map GaramondLibre.map"
     ];
-    sha512.doc = "fea2680d1a649bb605ee2ac6de3626369fb86d3d638c1baface12812f1d35bb6852482996018f81558811e29b3c768c610190b4c686bc62ac0f47638fdde2f44";
+    sha512.doc = "75a930ce9a0f0f63c8ce9e77d867b1729afc13f99993b03dfa49cd09035e8a45d219d286e9549af7528bde23f4d3dcf03aa4fc7f8519d45742284c992ee127e0";
     license = [
       "mit"
       "lppl13c"
     ];
     version = "1.4";
-    sha512.run = "53ad88338f2f1ec960d58956c165446208ffe213af3a37a15d33f6e794956fb754bc34bd2389e86552fb88351be827ffa098254231c72bdfdb3925844fe51587";
+    sha512.run = "25fde4cb3ad61e1a5aedcbed555cf291f1fb0cfc53b34796e015f40c6decc75a722ca6336190671254ad88ba1cda2d9b91e53e37376fc3cc4d0d8ee1a4c85312";
   };
   garamond-math = {
     revision = 61481;
@@ -22185,12 +22273,12 @@
     sha512.run = "9dd3f7685a8b7bbdfbee1fbe5dcc5d2819091c7c20df7979b1b0fb7971e613e45b6321a18674e88bb0d6222f050f0ab3959b087be70b90b5bfefaeffacc733f9";
   };
   gb4e = {
-    revision = 19216;
+    revision = 77677;
     shortdesc = "Linguistic tools";
     stripPrefix = 0;
-    sha512.doc = "9b8c8e2590a1a515aa84e11a4028aadeff9e4acb7d3ce99b0d21009e17443db3d2feee85d888a333595e144244efbf978239e6dbf48c68a43bd5709d9489c203";
+    sha512.doc = "52ca2d3ff37b0875ddbf072837721eacf3a2a7b0dae9a16d6f097d847ccec30146b482fd79a69b7cffe7c1cbefb881b3badc64a0f7138f88b94a74cc4efcc971";
     license = [ "lppl12" ];
-    sha512.run = "1ec519ad5f22e6d61d16a0233a73065b45e8628549bfecd109f968b8749c362cd04f358d67e96b1311577f94f6152e7de7a9e3264ffcff5c5769662b52df7e29";
+    sha512.run = "1db2c69fca0c0a12d3eb896ae03fcff5ee327c01b44c7082f6ee915e94e0da8f6d212536d87a260d2753668427d0c7190694a6879efff8f9017c2cfd85eaa462";
   };
   gb4e-next = {
     revision = 72692;
@@ -22253,33 +22341,33 @@
     sha512.run = "7b0dd69247f3421885f47a81f00317f4e10dccc508a6d1a5c5c5b040af80cb554e936e43ea131adf3aaa5a31a85532240dc4ddc7a55b1e425bfb89ae71509596";
   };
   gelasio = {
-    revision = 71047;
+    revision = 77677;
     shortdesc = "LaTeX support for the Gelasio family of fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map gelasio.map"
     ];
-    sha512.doc = "ab2237c8e1a551df95cf620652d648ce1fb08354e49e71cd885be721993ed4be74f8afedb67d7b2d56aad7241984af81d1bc07d6cfef31b439c7fdf79ea0a18b";
+    sha512.doc = "b2ae238c19ea14a20e7cd4230c8097e88f8442e161e6358a10fc967253dc1f6f991cbb9fb05d1b858f3edf46417ba064b047a944f0a427e02e40fffab8808220";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "bd24dd793aa45dfdb7073333f20ace9b14844a177b9958f29fbbe68a64148b757aa813bdbce389c796aba14127269525ee163017d0ffa4a311c7a741a207806a";
+    sha512.run = "a65530c3ed95539766ff0e16a74b4f1dcf19c08ec0e93366fb5872f779576da2f6b089de7150a53801044ff0d0e624bdd7474c66d4bbee7c528fa611d9223e51";
   };
   gelasiomath = {
-    revision = 73362;
+    revision = 77677;
     shortdesc = "Math and small cap additions to Gelasio fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map GelasioMath.map"
     ];
-    sha512.doc = "030a16a6cc30894330275c21850600b5dd933d937f1445a429c653f85a25709a83dc4ec20d26091fa227bfd74f601677e149a88d7b7c55cbe6b1551002216737";
+    sha512.doc = "daf2603850a6c847fb1b16342e31b428b817e9b3d97a12be3a651a531d1a38f79846ac2a57bcc716b5b0261c8abc02701e2763d97a02ac185fbfdc83b3155c17";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.01";
-    sha512.run = "7628b162c683bcdc8dee987eb43b5d8f477c0a8f5ec76051c93863ab065f34448dea73a8a577ff0325f18ec477e498e0239adbf156a833a4a3eb2e3b7df74c64";
+    sha512.run = "a935a062608a1202818dd239643bc936e5260f71be1c375bac572879d65b72e074d4026a1d36f0d208866926db99211101a08cbbb01aa8666358ecb517c06de6";
   };
   gender = {
     revision = 36464;
@@ -22336,23 +22424,23 @@
     sha512.run = "b2618005fc0f00a636e3a307ba1038f8dd39798e2ee2afa4d9169eb45ed4b38a67a57bfb516e9dd8d93ea0210a7fcde21b26c0564b974442e18021d83f905265";
   };
   gensymb = {
-    revision = 64740;
+    revision = 77677;
     shortdesc = "Generic symbols for both text and math mode";
     stripPrefix = 0;
-    sha512.doc = "4175231e5b998f26e913374ad20b2718d4c566e5b220bfe4de9f89ffc4422b2aa4c941acc067d392eb43a725d93457b1c10d8568f5ad0eb7c1aecd4fa83e9746";
-    sha512.source = "56cc850ce5a2fb0d84b2232f591d3f1e3ed18d1924d365fdb6349237d98ac655b0881febaaed414f4903eeed7889385b4cf985eb3cf72c3fbb37392e8586f848";
+    sha512.doc = "e0362b8c477f1d65024926d1de90864e152a27d2777b1ebf2d02c4cdf463b57b0c424f9584cc3e283fc0c15723673d7dcba9167239b87f65c35d6bd1fbcc8a05";
+    sha512.source = "425d51d474749289dfc7c224dbb3871150cd0be99885a1322903e7cbb16ede447c01e8f42355af84cc575617695939325874cb8dcfda145c415887c178cf045a";
     license = [ "lppl13c" ];
     version = "1.0.2";
-    sha512.run = "311de4fa6c68b21cdc8c655a7092d98772398e82bd9790e0bf00898a6575e234da44534635dfdd500eb7815d302a4487162f528452caf373ed11b7994682a43b";
+    sha512.run = "eada8166cd888fc2fc0587b502a8d0a146ed01565f8563cfd5b9f92abdf28d8c5951dc9e06bc7a3ac727023da814d739b9ee72530842c009357affec6406abee";
   };
   gentium-otf = {
-    revision = 75790;
+    revision = 77677;
     shortdesc = "Support Gentium fonts for LuaLaTeX and XeLaTeX";
     stripPrefix = 0;
-    sha512.doc = "a45e2ca2e8b39acf22fef3240d41b0b98230ee02dd637c7af9522e6bd170fdab025e44198b6db85a0896384a14e2beff18598dd0f2a4b878b968b9ea19dfea55";
+    sha512.doc = "0c8f5b6329180302ad7ff32dc03c8b4b308aca9743744c8e56ec2a752d53bacf33cd640e153eecc6c9b968dfcf3a93ffb678ded2aead37d956a5b55fcaa79e0e";
     license = [ "lppl13c" ];
     version = "1.01";
-    sha512.run = "7d5f701f8fc0caf28d0276f298887f27ebd2eb44fd3478a83a61bb3664fbb4b6afdeda2bbb8fb26692c006442899d3645442875a0d8e4d444100320ff0eb9986";
+    sha512.run = "24dcc67b9e93813710bff137edfcc198a4feb90c2d9f2e4e1a7a25c7ab0a7ce86acd1de0ec3dc1c0eb02d2ae2ac3decfb45b1da1089c0f004ace48eb5a70d459";
   };
   gentium-sil = {
     revision = 75783;
@@ -22371,26 +22459,26 @@
     license = [ "free" ];
   };
   gentombow = {
-    revision = 64333;
+    revision = 77677;
     shortdesc = "Generate Japanese-style crop marks";
     stripPrefix = 0;
-    sha512.doc = "af1d418f108bb050d8380223548d7fd77681e942a1a48aff8b7fb2c7e7a4d79b288e47099382e6ab9218bca78dc5406a57a42de00c2029f080285d6f11183a5c";
+    sha512.doc = "4aa93efdfa506847802e76b7593d046bea458e4dd7c7ff97b89b6263db4573d71192bd6de96ee13359508aafc13801311ff58c102f56ec83726ebfd1a8cb9949";
     license = [ "bsd3" ];
-    sha512.run = "4aa08751c2fc9c6709031d53637e0c2dc734926160f357df53bed6e4c33c4340e33f9dbb92d3ec2bf5dcc7b552c9508622986edc3c30d6fe15cc8334a0773779";
+    sha512.run = "672ae8553509813f613a3f234de714a306af38dbd95fc79f5a6da4dc8d9bf69e6012ee7c95d06893c168999bd25b8dad9bbd2f38c13bf1aee303b7895e1d36b8";
   };
   geometry = {
-    revision = 61719;
+    revision = 77677;
     shortdesc = "Flexible and complete interface to document dimensions";
     stripPrefix = 0;
     deps = [
       "graphics"
       "iftex"
     ];
-    sha512.doc = "a58ab22ae6df349d81b5ddf18a4e9b7dbb5804a497bbaff42acde18ca59fe8a19bfee34293debc23e44c690456e6a1b1d87614fbb85dc6cb3b3b7d330fc866d7";
-    sha512.source = "f4e1e8c0f5b8f443c8f5e6ad948cb1736ed944384daec20e9402c871872e86248b3167c72e07fc94fe32ef6ab36c17d2f177135ccf99f68d1c892af0a695bcbf";
+    sha512.doc = "52966e1a56db260febf88af0737fcbcd3778aa95977474e52b10c17e97dd4491cc825ec20ea8f1ba7e0070b3a3039d09944539add8e765696fac702e559e7508";
+    sha512.source = "5a3f03c22044e98205532531ae0276b70198c4f3580a99d9664790607ca0ffa3b20b6fbc440d1265c508bb6b9876b39d2617fe1a3fe7feb337a7c237828e004c";
     license = [ "lppl13c" ];
     version = "5.9";
-    sha512.run = "ed64996404299bd8379197b293baed752ff064e04eec87ffafdfd55cf21c2c48174560eb1c3bcdb0b06190badb9d9cc699aaa7a2ac8a5c537b0c818a423770fc";
+    sha512.run = "83ab6691fa711f70c8dfb57a3042e555e3658ee95014a5e2ef7e5be130ce544817b89194d623e2b258d1d24942591e7d3f06e751698ba5ca62b3f2542f888d36";
   };
   geradwp = {
     revision = 63134;
@@ -22482,14 +22570,14 @@
     sha512.run = "6a2e543d0997c52155807d0d2641af9714cb09531286a58bcb2d5fec0e70c694edb7d603a250281a641610d1c39495d5f93417da5cfea7a86da1fd53a98ef77f";
   };
   gettitlestring = {
-    revision = 53170;
+    revision = 77677;
     shortdesc = "Clean up title references";
     stripPrefix = 0;
-    sha512.doc = "f9e33fbe89df368c4c5dfd855f2fc0fa8c4d1eec5c0ab925b0a28b9f021fd2d88521895233d12783a023e40d70b05a0e849d4551f79fd4b8d0af72fb60a1af32";
-    sha512.source = "9bddc79e0f839a21ebb76e21e20ba5a26971f4192ebc2209468a780a15e5e5f61a328df5f033c115452751a31d1e6dc2e6e238097d2cbdbffa33f56ca420b602";
+    sha512.doc = "48f65336bbf530b4279924ca8c478c0d44160e31287cd90ee93340ee1e7b7f3b9a53d4805d22112d2c652c5d35a5e8df0d7ef3b0103848042e150efa508ad740";
+    sha512.source = "953fa253659719274a2a7245d9c65c7a8749f396e0434a544525d8de3cfc0bb845a19b943c0391662fde1952f709f64b763ccc681ca6a42b537179797b13c1ad";
     license = [ "lppl13c" ];
     version = "1.6";
-    sha512.run = "101ad92c2fba5c43321d8e12754190e09b0442508799dbb6bac23d5cbe96c470425a4cc10a28441408ac5a1c406e18aab7567f2464e48c2692fa38af1e23a16f";
+    sha512.run = "ff35c71d4d742d1e4d727e3447ca43857a944aec9b7301f68bcf3ea01d0eaab2458f8f4f76437d55d98a10a2c1bad68ff4fd8ba3330baeb0f7ef9792ab224815";
   };
   gfdl = {
     revision = 75712;
@@ -22514,63 +22602,63 @@
     sha512.run = "4f99442eacf28ea13cd98ee4bbe981b95ae9d849e6bf2682cac2305fd793f6e9f5e4211362385890956fdb24ef03748e9cb0184c7ba9ed89e7985b2caa3e2da2";
   };
   gfsartemisia = {
-    revision = 19469;
+    revision = 77677;
     shortdesc = "A modern Greek font design";
     stripPrefix = 0;
     fontMaps = [
       "Map gfsartemisia.map"
     ];
-    sha512.doc = "9f2efd76c243177240f237f7232fc87eb33d7ea1177a7bfdf7d506077e19c40d3fd923a960595c46f50fa19979598bd06a1865cae8794d45f91da1d6a9a60a7b";
+    sha512.doc = "00676512a5c921cb6158ca565346d4e1c06a21f6f6837b456a2d1c992990bc86aa13c1697cec6cd2734c57474605a48c1729572ebe632b8b6559cb52615d7f51";
     license = [ "free" ];
     version = "1.0";
-    sha512.run = "28cb811a30c06bd6390b9268dd2a7a4dadcb2fa9d426d9461af1ba5593b2c419ed1c7886c3aef9bdbb0f1fea3d6bf127ff6088a6b2c2048dcccfb21c2a06a5ee";
+    sha512.run = "6e6ce0744d85f7698bf4f0e614f2156066caa3836d585ede5c45c8d33da6178a2d17b993cf1174fe25f5f713c6566f7d2e013d2e77dde3f3854f7bcd59e017f5";
   };
   gfsbaskerville = {
-    revision = 19440;
+    revision = 77677;
     shortdesc = "A Greek font, from one such by Baskerville";
     stripPrefix = 0;
     fontMaps = [
       "Map gfsbaskerville.map"
     ];
-    sha512.doc = "a45ed2b35774755a6558431f784faad4bbd63aa81ad5d80c3cfe3f7726604aea3e4de2baa72bb27a4e2271e9bfe180c8963d06b880a0efd2dc5f7789dcabb51b";
+    sha512.doc = "d2fe22f18a5b61fcc748e6c191944176b8be108ed804ecd8c42bbcb7f0ea5c1ac321e6cbef92f5b545c1de2a36757267927be1d1da88418ed502f8680ff559a0";
     license = [ "free" ];
     version = "1.0";
-    sha512.run = "b545ec586b3bdfe3da2cabaa959ceeeb4ff513b48024575b1b5e3c57bb2d10a0b4e2cd7507726275eed0826dabf03d05c20eb9d5ec341aaedc0313264214ef78";
+    sha512.run = "bd87456fe9e1dba5c218f482ef5068f6fa417cc7ce206810f81f71111368c426429ce643fa4759523073ea2ea5b9b274b24057beb3e005883254e4861517d1f8";
   };
   gfsbodoni = {
-    revision = 28484;
+    revision = 77677;
     shortdesc = "A Greek and Latin font based on Bodoni";
     stripPrefix = 0;
     fontMaps = [
       "Map gfsbodoni.map"
     ];
-    sha512.doc = "c70b1a32e945d82e50b8a37319ee2bf63d4800b381f317168fd945311485cf6c41c7a3112e89457f4ee40bd29736accf681bd61494120e3d41f0c8fb28ad466a";
+    sha512.doc = "e7314a9a06f9a3025f18f9ef88d27fc5ea1480e8249c53eec15258b4792592f71590af6731217a122b7eaebcc32af300745a1d8aa92ab7f0ab5d38e172aa6d6e";
     license = [ "ofl" ];
     version = "1.01";
-    sha512.run = "e01cca38176330bdc0a4b523bd2bd4f73a497d90a34682d29920e145d11ea099f163fa08470c79e10a27a137a5901d7da9db54e461667af61c687adca1960249";
+    sha512.run = "301136a9d4e70fcac785fb046c93814cea282bb2b1acdb2ef878150d82aa227915ca773c0ce184da32ec593ee693f670fd4f1b4ff3539d043591a89fbcd61a43";
   };
   gfscomplutum = {
-    revision = 19469;
+    revision = 77677;
     shortdesc = "A Greek font with a long history";
     stripPrefix = 0;
     fontMaps = [
       "Map gfscomplutum.map"
     ];
-    sha512.doc = "5854b000522120f6a1b065300943fd8aebcd75f57da15d667616a3706d35ffa35cac0422712d0b008dc2abf2b9deceb0248fc044be68f893f6ad0eefcd50b316";
+    sha512.doc = "ab50904468b5b44a4f444e4d0fa02875f6cb37af03bca96f88a3dae6789042761e092d63eb81df9a4de26847f31fe38b45d747dab1b06cf902d34ca1378a87fe";
     license = [ "ofl" ];
     version = "1.0";
-    sha512.run = "4013ef92910c3c1145708afa5a9ff13cfb0aae05e6b225c56c98090ea7cd223799e73212982312a14cf504a355dddce08e3364df8c046dfe462d07429cfa617d";
+    sha512.run = "9fe7df20b0282e4f9037e05cf5f9623decddfb4693dc8ecf6f721d94d97b1bad78c8625add976197653a3e91ae308292c55eef125da614a8e4c4ff9937b5a4c4";
   };
   gfsdidot = {
-    revision = 69112;
+    revision = 77677;
     shortdesc = "A Greek font based on Didot's work";
     stripPrefix = 0;
     fontMaps = [
       "Map gfsdidot.map"
     ];
-    sha512.doc = "29b49271f62496e6537e84301b361d372b24cf208365d97f3ac1d6d5b82fae84ff82954ad45e87201eee0df9dfc58f3486049e219480d20add06e9eef934f17e";
+    sha512.doc = "b39460b50b5adb024465d7e55c097b883bf71167f0d449851e41af39d418d0aca9a0630c6531001515859c7f78060b90bf61182d0fb9508fe2814951d6387780";
     license = [ "free" ];
-    sha512.run = "436a8cb4ea88663ff3358d6991fce9364f197027797903eb1b5c74ec0a857059579f0a58597ca6427c1651bf89440d7b7c8965e79fc668ecf444dbcc9f7ed4a3";
+    sha512.run = "d1bc5616434bb3402d1b59e50f47fd2e9aa7c721fc6afbb5ba254647b614e0dc33db6fe4c2b24c17123242cb80c22fb1743051256ab8cbf0c54d0a2239829b51";
   };
   gfsdidotclassic = {
     revision = 52778;
@@ -22582,49 +22670,49 @@
     sha512.run = "7b07a974f5447917d0a10a964011f2ed57db2dc9155384117310eadbe1dd05067dea6d617a598545713fb9250bda4241b0b2d5bdd84be4fb8c994d8d8c4e5ac4";
   };
   gfsneohellenic = {
-    revision = 63944;
+    revision = 77677;
     shortdesc = "A font in the Neo-Hellenic style";
     stripPrefix = 0;
     fontMaps = [
       "Map gfsneohellenic.map"
     ];
-    sha512.doc = "231ea0eb57834e5b781cc3e8f49a85e2564756abe3812a432212fa7e85468117a1d80d6af5db8cec754eb1996d3b9716c12c403b1865d60b18660f454a2323b8";
+    sha512.doc = "410455f6174728558a63c356e0e551d2362dabb90fdb8007d70e0ed4a314f0d181593fc2b7b1535d323482f3c740548ed6a1e5e9bcaf48658afd2d70717b54c4";
     license = [ "free" ];
     version = "1.02";
-    sha512.run = "7290de85142975c61b28cc8d3e5919805590e2be5f5b442f0c371c393f92012ef6b00997bbac1aa1fb63914578e99eb5e6b26f6af8f51cb5ec7f4c53ede51fd6";
+    sha512.run = "754f36accb692ca2132c71792b8555e43b8c37f98141f05f1951889868eb1607cf7094dec3045631ec7ad192c199de8ba74290ea29c25eefed193d58cc6cad41";
   };
   gfsneohellenicmath = {
-    revision = 63928;
+    revision = 77677;
     shortdesc = "A math font in the Neo-Hellenic style";
     stripPrefix = 0;
-    sha512.doc = "efb0faa6617a402b6d840d9f20303a8acaf4140c60b8de285dbbb9794dc6212715cec6d1fd2cdee65aaf348ed1184ad66c480e00843801203f47fd3a4058250a";
+    sha512.doc = "9a6f16d3e3a70b6398585bf02ec27f75cb2c055e9c94585140dce20571b40056da32f2b489edd64045ac0e0f8783ab84fa5ff0919138fdca0272329ea2d59492";
     license = [ "ofl" ];
     version = "1.02";
-    sha512.run = "17e81da77241b3dcf6727ee8e954d9ea24a59a235d8e454b77204f99bec343d020803790ce6ce82a22226ef48ff29e65d84b6ec90e44286addd3ca727e8fbf1c";
+    sha512.run = "1822b30bf7e0d0da00cf714909a78e9b0f5df50d6c8b2411d01611c7de9a253208d6d13fbb249ab3cd4ec5afd74d26fc442e01ffab825cdf0501de6bd893ea80";
   };
   gfsporson = {
-    revision = 18651;
+    revision = 77677;
     shortdesc = "A Greek font, originally from Porson";
     stripPrefix = 0;
     fontMaps = [
       "Map gfsporson.map"
     ];
-    sha512.doc = "3dbcafd00a88537db9e27aece276df08da805b59076d5e65395a4752d8ce57a794f23508238e96ec26b8d7e6d25e11992c2a567e44ca2f930bc44b9dc980202c";
+    sha512.doc = "1a7b9dd68ce7348ad9554e4758a97ac237ed9cde07c03eb92de0e72ca94f375119a5e8e3d48d10e12faccf030efa549c35cab4a3607c0b42385bc5fa84015688";
     license = [ "free" ];
     version = "1.01";
-    sha512.run = "f52d6cd8d0b674771dd56a5d2974fd3edd8b4685bb201489e578c62d1e31b5dcb6f2cb2e9b05702ec439ec7f0b35740e291d3a92de53b75870fd791858f8a474";
+    sha512.run = "7d4313ca0d3d78ad4ff367be6aa418d30cd754b9a91ccf7db59fe117a913af446f6542a9785970404eee994daa4bff95047e45f4849a32a65cd81e0a4cccc5ab";
   };
   gfssolomos = {
-    revision = 18651;
+    revision = 77677;
     shortdesc = "A Greek-alphabet font";
     stripPrefix = 0;
     fontMaps = [
       "Map gfssolomos.map"
     ];
-    sha512.doc = "67640d1a95ad7ec43d7df407916cde264c5460cf400011cf0cdb3dc4caffabba370f2fc15ae945e20b6a9bb6623645f6ffe80034a781cdeb11c400bd23985e3b";
+    sha512.doc = "07adf09fdffcb48741e6265cca6d1b92fc9deea33f311d65b1184365c3627e6dcf6004efc98246eb9d3a95c21c96639876f102888d5fbd98b2e1724a5e20dda0";
     license = [ "ofl" ];
     version = "1.0";
-    sha512.run = "6e6ac03cf7ee20accfb67855b3dce136e3caa2466fce760adef0a2c1633e0a170543cf861a6a07a0c80344ab026dc2f74a35c5543ea92a53f7ce8a1042f778b7";
+    sha512.run = "256ff3a46f55f4fa60d7829c61557c089de919385893c81074f1d3c369aaa19011bfbafe083b7ffba8cfdba5d9fbaacfbe9a7e94bdcfb8e67c01a6271080b60f";
   };
   ghab = {
     revision = 29803;
@@ -22636,13 +22724,13 @@
     sha512.run = "7e919cbb0c84fe337dd05c749a3288990e750ff0aeaf119736108463a1684a18a66be94811a31156f951c871b2f073627914629756b06e747f3220d2ce08950f";
   };
   ghsystem = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Globally harmonised system of chemical (etc) naming";
     stripPrefix = 0;
-    sha512.doc = "5a71b5680861293a03a8858cbc4f826efe4c64bd4ba5e55c347d97c0e55960507a32a8a47fbcb1ff25d2e5d027bc44b5fec2309e7a267e9e6b2d8b0a9f0b73a7";
+    sha512.doc = "107444ef6c35814e3cd015f1a9d9f4f8afc73e6d0c4b48fab36cc43dc3d426ce28f50eeeaddaeef0610390703ae59ed12bfb353647d228aead6bded96826409c";
     license = [ "lppl13c" ];
     version = "4.8c";
-    sha512.run = "c487291dd947e3416e4c17c1bfd046616a228444a7277c48544f1d2a7e2dbc682b87025402bd1febbbfaad7d80ab534a219bfe2a7b420df811d7bab63fa8b01d";
+    sha512.run = "050ef5191e3f589002f51aa7441df5cd11ddac74c4219557ab92868cab4bfb37b3c2eeb6a09e2dcdde6f544e130957444146f6f8f5dd17124ee79c604b3422f1";
   };
   gillcm = {
     revision = 19878;
@@ -22654,28 +22742,28 @@
     sha512.run = "37c8141eac6b1636292479299f7df6b3dc128addf8f7ba680cef2c75d2f7ab04686134b243a86168c54052d4dcbc33f13c13a6629d7c98d3908e4cce5fb53f06";
   };
   gillius = {
-    revision = 64865;
+    revision = 77677;
     shortdesc = "Gillius fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map gillius.map"
     ];
-    sha512.doc = "df8f143a6a80e9e5038744744b649fc26d042672eca7080fc8493a965ef4e3bcfb714735e83ae9a3bb500e3a298bc9bc9d940ff343caaed4ebfb8bf8d8101fb8";
+    sha512.doc = "c2e41028477ad121211f0b18598bc08014c7942cc1fa13d06f0e61c5be5b276f3c07f5ef63a3d764e9a06cdc5d15d223c776fdf6f81b48f68261d1f8de9eb26c";
     license = [
       "gpl2Plus"
       "lppl13c"
     ];
-    sha512.run = "f2ce20c1650588af9f446ffc6d69835e4e970def915e3912ef36ed8d065d717ccbeb125a783768c360328ba6d44e15f954348957d774dec8eb3b84f4b8e00406";
+    sha512.run = "cf60149cdff3691c3fe90159e433591837c997a226ba1540bf3328da9b6774eb6b68aa4d6627c19b31cca864854535874b850b9d48c78b089007a63287f2f2a9";
   };
   gincltex = {
-    revision = 64967;
+    revision = 77677;
     shortdesc = "Include TeX files as graphics (.tex support for \\includegraphics)";
     stripPrefix = 0;
-    sha512.doc = "86ee14069c5522d7c0713a532627bf29e8cf71ec4c86184377cdcd8a73dcf0f034be9e92b8ff7c2caef8310f968c956d712f3281eb6e4d36e83a3464149489b9";
-    sha512.source = "ea7bb92e9f71606b39374bf43704187bd627ffa20e686d2ca09a8ea4c825e5cc363cf7cfb2a6811df7c82ff8773aa058362b9103052646e7ef5febf690abad22";
+    sha512.doc = "729d9687187037e3078edb86cc3d34e7284848f0c7f4ac5b678be2ec608ca6e26f55ecd8c9012013767acd7658396cfe850693e5dd946b6b72eb341c95185167";
+    sha512.source = "25e0c8ab9dc26b193c77a17d2a60e68a6b6e0127f218a569178ccf26d3a4d77698cb06ad7dd91cf777e401311accead93889c2ffe0e41aea0d9913aac792a621";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "2137967697765b1167f36a858d2eda778b43ff1d681ec0d8af7963d2ab4a92448c6c1ad6933975afcc211d301cf168528e7ded7c3114c4b5ec580f42d8a7b664";
+    sha512.run = "999131828398d5f8aed4e1c55d4e51a9f8fcd41dfa72954541dea5c483ea0ef0ae97595981b080164ded8d78890dac4e5f7b81d32b8d986c69e1fee981a4ef4c";
   };
   gindex = {
     revision = 52311;
@@ -22737,13 +22825,13 @@
     sha512.run = "6af523c00e053b35ea86eb6defcf0688d1aa559d18ae4d62dcb7de446a1d57f4e7acc27c1ab2fc616100dfa687400e1a8ee8be48d6cddb7ca1744c6b812f193d";
   };
   gitinfo2 = {
-    revision = 38913;
+    revision = 77677;
     shortdesc = "Access metadata from the git distributed version control system";
     stripPrefix = 0;
-    sha512.doc = "872b7fa8e0c97e4f6e0e1989b7c45507773b4f96cd56f7aa7064376b520d8f2beb4acfe71a21e295a8a457b86fcf7521809fa59ad02875466cf426fa09bd8aa9";
+    sha512.doc = "39360e933b5bdf4ca1bfe44c334ba72d7bc29f8dc30ceabfacc71bd237db3609028abe011bcaccc33f19d57b391f07e82cb2154177736b4c7922c976d2fd807d";
     license = [ "lppl13c" ];
     version = "2.0.7";
-    sha512.run = "7dd68c7b1d5ea49dcaae8ba1a1582676617bcfc6f5c6ba34eb1c62e60ea5b8ac3a50841a93394b640e8a79c3cfe447858fdd1630e4095683958f8d36439a84ca";
+    sha512.run = "8c0f282921ecbb05d83337c4e6ca594e789db11c303b43c3437e064740b7a8ef5e138c2a118b1115c20d13ae2470d304c741b4983bcf9869e7379b738f46b0df";
   };
   gitlog = {
     revision = 38932;
@@ -23064,14 +23152,14 @@
     sha512.run = "768353fee03e36d5f13e5ea8ca2cf0925fb5dc3c847680325a0961b78a3ed6c30859bc57de7b927cd9e782f85539c97183687755c31738e1da3cc27a08f52387";
   };
   gmp = {
-    revision = 21691;
+    revision = 77677;
     shortdesc = "Enable integration between MetaPost pictures and LaTeX";
     stripPrefix = 0;
-    sha512.doc = "d3d4bdbc5b1c4618820247ec101e43c1c28b9e023e7613d5256456424fa95a54f23463ff1336f2586359a6078aa733de77cd7ccb892b367cdd00215ac7b67512";
-    sha512.source = "13c602f735e86066e87231dd299680739af8ab526d55897c8a972b177ddda6a92277c3455208a11184281332d94f924b59dc845b51d7288c7c6ed750c45a3fc0";
+    sha512.doc = "372f4992ac4568ed2051aae4dbccade5f1419a2a548f0927addfa1dcbb897c5cdeaa00f524b7314cd86528b7b1ccfeb3be62f8441de55c93d845487c07b79532";
+    sha512.source = "e8f79f960697e34f32697d1e182ea5dd4ec4f9efb1d091b9042cf1f70bb9b119d2cd40e7b67072b901870f5c3f5fbe703ae75c378822ba4ad7eb1fd6da514aed";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "79ec2dd12610086eb5e7b582f5296fe7f1101c20b6d4edf10d47c5dbcdd506ff7c5f326af7600287a148031be060b3e8319d20d8267933b94b6c8a53e7753bf8";
+    sha512.run = "2cebea052c67cde68fd0c10dbff46b9c409dcd605c05f836249de9065be0a3f4dc0b7bf657e17637d3f594b589494a11657d17a9e666d9d91fc5047b88cc3156";
   };
   gmutils = {
     revision = 24287;
@@ -23120,13 +23208,13 @@
     sha512.run = "5bc237b3bfa3b31eb4d6d2fb63280ab89fa929b531ec83dec362947f49ad0316b9107abe3a876f79e4c5b283134c859e4908b300a592aa69fc7ea20b80af7fa9";
   };
   go = {
-    revision = 28628;
+    revision = 78116;
     shortdesc = "Fonts and macros for typesetting go games";
     stripPrefix = 0;
-    sha512.doc = "c65516b11156d4fef5104a36cb361bf59be244555233cb5d9692892da06d3bdecd0b09866db136aec177a2bcbacfae6bb41c606f6b9da0329a00c614055905d0";
-    sha512.source = "54cbaf16bd4a1a9bdd02b7811120cc82269be40e97853d94b1d526eef98e7df8e7ab8de2e7abcdd7e7db4c1f7fdf3d7355d511ed57c44c09643ea291e5b1c6d0";
+    sha512.doc = "38020e076df85ffa1c57e1a6f91008811b35322fec95fe2b7897d0720de5973cf965b448378c112568c09b27b271d8e06815ce4f9f6dd1ca70322ca92ce37b5a";
+    sha512.source = "5be7e610b68e6e13eefe5257edfe83e67ced97ff8569830cb9648bb0702d33dc12c6f5894d0f696e9da94292ba5dcae304ca9ba3095b218e7c510197e22e9842";
     license = [ "publicDomain" ];
-    sha512.run = "772772146ad95f2ebff85a2f3064615c26300a6a4050c1a6c7207d53e12b41477b0936b1c3d182f1c5db0aebd8499de19e0c23283c2bccf753addb2623dfd1be";
+    sha512.run = "73b9c8c3b0d228312415394dc9a8b018dd2865415bfcef177235cf5acf9649fa147cb8724f3f4a18781eaeccb74cc36eefe580cdaea72e0b670579ab88519baa";
   };
   gobble = {
     revision = 64967;
@@ -23139,18 +23227,18 @@
     sha512.run = "a3490d91422940763da75ce023ae032a3d3dffc7114c02edab40399a1ef11e5fb2c3f8f3bcf27ba5fc089b4d961bc3b99f45351f43eb2f4b31d6a425a9df40e5";
   };
   gofonts = {
-    revision = 64358;
+    revision = 78116;
     shortdesc = "GoSans and GoMono fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map go.map"
     ];
-    sha512.doc = "6a9d31a1d55f65d05922b71d9651198f9f9a8c6df754cdc93c4605fb6bc241b5c7cb56d0313a2681f60f4d92c45cbc42a9f61eba0c1eb1ba447a0363ff72593a";
+    sha512.doc = "541fc3035583a56dd71e73362ecccdb5a56fe7fa9f5b936dfd41543a6027b5f744ed2586db200a5ec092a05d93e83aa4198e86cf6a47b97a8f18111972e434ad";
     license = [
       "free"
       "lppl13c"
     ];
-    sha512.run = "c30a0fa1e76d0d287ed9296bb379bbb284873593f8136aa567e2573ec9d20310ad5d2ff993b00714fc472b6d365e2556c488278216c95898ca44f1f5b5c681f2";
+    sha512.run = "6a4cc27ef3781e3660140e42feb9cf0e9c6feac692f0aeba95a25030e3ec6a376f869f480be3f061faeed16556f81f61b181e849a2f1f75edbda98a41326f28c";
   };
   gost = {
     revision = 76790;
@@ -23258,14 +23346,14 @@
     sha512.run = "6449e4a42b8de0556d9ab46b3c5f4e0da94fe015b289877e1e9a5ca6f5e84d2f0d621e8f02bf4cf3959807f830f2671124e725147fa033d25444eb14048fd77e";
   };
   graphbox = {
-    revision = 74754;
+    revision = 77677;
     shortdesc = "Extend graphicx to improve placement of graphics";
     stripPrefix = 0;
-    sha512.doc = "ac49817438f528f48d0f47ad54efa53a14689fbe48d310915bc670453afcb0a6e73a12519a26d46eb77ebec8c25b2463362c3ad5fda7ec0119a9ccd0b4cab7ee";
-    sha512.source = "d932cd7e45272e2dfa238fbb44db21f78c738a1c93997409da754abbfc599b60c37ffc400685eb4116e217b0e64cdb8dc8577681e1fb51c826087d670b7d3c43";
+    sha512.doc = "ebea80a758a04831ed2d13b6d07b942c22518e30112b46282cb96f2a2ea1251991c0e73f5045a0b2a55dc672045949b55dda5dca473698353f86e7e59fdbaa88";
+    sha512.source = "890959d9fd79e7e81e482b37da639dee9ae6272811c3a1e33a29c03265088324e530ad483146bbfd38398a95166de27d98ac8ac2012a5da9ff65ccf652a3975e";
     license = [ "lppl13c" ];
     version = "1.1.1";
-    sha512.run = "5a64ebc3e6779811efb71dba07fdeb142856c342780efec79c87a6b8bead7f1eda8ec22d16ce491dcb2870148b8107b1afebf4fb3a1f76bdd2eb2e66ecf16408";
+    sha512.run = "b6a9b25911f99f13dd18356184d32ffd7bb09436c1faf945c76fd291ffb52ee00ee9031d21a292ce88ee707a8123481113c6c7771f76a4369c7dfc5253cc6215";
   };
   graphics = {
     revision = 75374;
@@ -23383,16 +23471,16 @@
     sha512.run = "45d0736b5b600aa3ae524e0ff2471846cf48105464710fc7bb7f8d27326275d1accc63b5a0726c5d43e5af487207eba105e1d5e4f59913a1b27d33e950122574";
   };
   greek-fontenc = {
-    revision = 68877;
+    revision = 77677;
     shortdesc = "LICR macros and encoding definition files for Greek";
     stripPrefix = 0;
-    sha512.doc = "67f22594152f543a1b59e91a49168b92d6e9870f0c362a69746c6d3ac9fa4918980df4708bf1a6697fedcfd519153b9a29d92114b6567a2ec03e65210eba3d7a";
+    sha512.doc = "def26fbbbe938ddcc0b9a54102a6886e6b01d4af848befd4663050cfa039c76ca9e62d396c228005791ec86fc7fb2b04f95c2aaf30e747e6de376f7dce6577c2";
     license = [
       "lppl13c"
       "bsd2"
     ];
     version = "2.6";
-    sha512.run = "24aded84aee9dbe4674a019fb3ffbe0d48fb51d88908e532cbfbafbebd8dda63ac6d2d47c907d32063bd57c3c9d90d51b1e8f1f59ee4fecb451f20002d4a1115";
+    sha512.run = "d6d3595b37d7fda5bcfdf75dffa317aa389e306ff910e2ed2ca200518180db254433abeffa3753304ec353c99d7bc26caae60715d1f04eb441da51ea4f3f978e";
   };
   greek-inputenc = {
     revision = 66634;
@@ -23453,24 +23541,24 @@
     "gregorio"
   ];
   grfext = {
-    revision = 53024;
+    revision = 77677;
     shortdesc = "Manipulate the graphics package's list of extensions";
     stripPrefix = 0;
-    sha512.doc = "4337ae578d9e524e2da8564a1b736eac1dd50c1e4495d027c44f3841eb65c6c494527109e32f00844c17a5973a94572569a429ceb95beec98d2b19e84735eaaa";
-    sha512.source = "cb7dcf9b3860b90bc8618c6d964fb7e9f5e056882bd5e6739a57564224f970ab9cf0ba136ebd88072541b8d169245ccaae90f714392a30f83c73e82281a07359";
+    sha512.doc = "89934571eaaa5687b131f119b4e15a5fd30f7a80830f7ced45d9086f689ebecdb26d89c72c134ea15f30723b34dcdbe46f6f0f9449ec20742637cf6751f08dff";
+    sha512.source = "9a5038caa89f81043661bcc72af752598f3aabbc8fa6b9f8b593418577c0b3fb082e7b7bebb307473f8e15a2073e7d135a9c62b1b57368a9b3677da195a81ca2";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "a5f68f2bb2ea26d4b8f963a1b8fb8adfb3bd32e3a139dca57e6b45d80fcdd94c5e846549b1292224b9d845fd6a4d0ee56d4c2d2fbfc12c24806eca8551b9dc96";
+    sha512.run = "9b008a2fa836c6e6bce517bb0b768a9df5e76069c52d360f16458cf57182e40f4cd084fd6ecd8a10a7697981111989190b7d55859688d8f32ae618823b5bfd69";
   };
   grffile = {
-    revision = 52756;
+    revision = 78116;
     shortdesc = "Extended file name support for graphics (legacy package)";
     stripPrefix = 0;
-    sha512.doc = "2f2285ad44d0c585cd02b85359eb31f885f7c704f6da5f906240c1094ef8d347d33ba6beb31cf34e09a5e39e618a27a7ea263a63d6a887638d8f761e3cd4b61b";
-    sha512.source = "6538e5cf13f8212b5b231637a4abb68bc97330e123432922e403ae7321439bef910a0d1839abf394518ad274ed232c4c2e19671c8e6aaa55e2525708f305c679";
+    sha512.doc = "d3266ec874f8c8cca0a509e3d79b1db2a898c37b1465c05d6205bfd3523ce46d4d83f6179306fb8449ae019201983cab5680ba72d81d52906d3857edff6b1af4";
+    sha512.source = "6ee655c238349f2086fadfb982e07a0e3388942b49bc8ab99743e245a4af1a7fa34b810546dcc2703b8a9143a4bcdb1a85b5c41d050aa832a73966ab1bcf9772";
     license = [ "lppl13c" ];
     version = "2.1";
-    sha512.run = "3f1f5e4f258e4ab1f51fdb44fa0b49e80df21a6c35dccad16a6b70ad76489cb4fdfff7e6c4dd07821c54543fdaeecae32cfd8037d4920ce60db02be9a2f8fa07";
+    sha512.run = "881200bcbf8fe10f5227fde79ced27539f230ac6d7424c92d6bf63670d8ce3c209ee38d722ce341bf896e1d18c52c5db8949bde7c665a0cdf17322faaff1f62d";
   };
   grfpaste = {
     revision = 17354;
@@ -23511,14 +23599,14 @@
     sha512.run = "17f9b6b16a0d2f45648b131623c243e0b62f5e2d2fb1c1997af921a1307d941ffb07729d5e4787b4627961160a75de98165e97a42331b07a3259e91c987f27e0";
   };
   gridset = {
-    revision = 72056;
+    revision = 77677;
     shortdesc = "Grid, a.k.a. in-register, setting";
     stripPrefix = 0;
-    sha512.doc = "cc4d4259c076189efa0f1d401394d4fb4401adadfffd507fe812c33a48b39f1778954dc87dbf5c992a7c47a2b9b2c6985a84e637eb3550ce43d7a246d1cad8fc";
-    sha512.source = "34ba184f1ea04285c4d5fcace2d73a8fb0f596b3a79996124d7d1cb74f2ce474596ccb08c3a1572039f6375e9ac8d74f845302d3fcf6cb6aee5f74f073984a57";
+    sha512.doc = "8af1271308351d9e9eed2be38cf1b0ab82cc28cff7fd5f52f222f05481fdccf4bd1a316cbafd8e936ebfeb853e80ca0a4d3cf3d69b06cd08e41f7236efd1a545";
+    sha512.source = "0b7086e4709cf49f42edf2d73141f0a2b3e70a3465ce25e91ad5e62c1528053cb15ea0a167481f09d08eb876f9e0b7e662f66eda6c1e1e02481a269d88a7b0ab";
     license = [ "lppl13c" ];
     version = "0.4";
-    sha512.run = "873edb6345dbe2c88d5cec26531050e28193b3a6e2b8861bddd9ec75511be463a48e3944966957f62b892b126da86841f9d5335a64014720a04778238ef5ba1a";
+    sha512.run = "d0d410e4f9540d5b21c16d1f925621f887538df2ad954beb53ddf44f9c79b3dd70fc305f6d6f2ead3c78b6b8a209d472f0ba2cf8e3d251e33b48ddd30460ff7a";
   };
   gridslides = {
     revision = 54512;
@@ -23755,14 +23843,14 @@
     sha512.run = "40a83e69fdcbd0458127fc8a8f6884f6860d725a01cceaf64c36d317dafa9515fba604ab73ff84f64b1f974a9976f621e898e351f28c3224ca65bd128eb874a3";
   };
   halloweenmath = {
-    revision = 52602;
+    revision = 77677;
     shortdesc = "Scary and creepy math symbols with AMS-LaTeX integration";
     stripPrefix = 0;
-    sha512.doc = "aea1397af446f64f4d8bacb03f0f2d211a44f0f85d93612db840f198a1ed894e1b0a3680005a002808fbe5b8b367f8a8d79b9b99908a4be0891c0d5b43c730e2";
-    sha512.source = "dcefec44ecf9cd8488b756c70624e3cce53ea6cb2c98acd09948d08fa0f4292ea20fd19156189329f30b47a0a3f7f7fee96e633125eb55eee066ee87b09981cf";
+    sha512.doc = "325731a10e64e17e5194b9ab4efb3dca3290e3aa6efc5192bd456b3898841a54326ffab04fa95bac024eb7ba67636f5db4630c2b8b1c36177f9150763352c835";
+    sha512.source = "67cafe55d3cf2b14fddfd6ad600a533a5723c3ad96b3e9a783230a4127331cf4764e206eaeb8a31960c39de37bc3cc9dbf66d6fd0afff2f125f665faea961783";
     license = [ "lppl13c" ];
     version = "0.11";
-    sha512.run = "1c897f5582e26a42799065d9b105bde3ab7823e9320912eba72654d00624a3796f468d9138fcd47c32e021b31bffb1a618f3ce0024ce753005236a9e08ed05d1";
+    sha512.run = "ae7baa0baa3c3c7789b5f5f0734921338f102bdf4ecb3617db3cf15f98f2583c1d64067a0be60a324b314609d911aaccd04a6e839499b0226e3499a49eacf6f3";
   };
   hamnosys = {
     revision = 61941;
@@ -23819,14 +23907,14 @@
     sha512.run = "4a8227707b6878ab010b595296dbc96f0b31489dfc0abf0116e00d6b0acf54e91bad1ec182169357e4a2e1f14ee27afcaa23bd35db1fed7e4e972e66eebee042";
   };
   hanging = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Hanging paragraphs";
     stripPrefix = 0;
-    sha512.doc = "6fedeede0cb988c8f0e5745600e9f122d2383196d3038b3fb562fe712e0e3f4de701da50d7f086e66eeda2f04695a4eca5232075cb3eccdf43621935eb1e9b6a";
-    sha512.source = "03506cf7181b3acb14d0a3a81bb97b3ea8f9ded8237fef8f38c9a52e27d29da76655284a87b0d7066de141d75930273f3c7cb57b84e90a1be0e849375989ccdb";
+    sha512.doc = "18d72609f112f8ab8d3be58f7ea8e4016cfb97baf1b53cdbe63ac213272bec27772dd2263a7f0f018b10cc6a90b08cf3c6fa55df7f6d9504c99c9af10059e10f";
+    sha512.source = "9501dc0e7f373c8c979f72d07e70cad06bc5aafeb7512247c24e4bc9c35db7a90ddd51e1d06528d6b410d3bac954fd279ee58736fd90c3b5d2565deaf02ec469";
     license = [ "lppl13c" ];
     version = "1.2b";
-    sha512.run = "52aea5b9f05b91f7348d67882616f8f49eb863fc81eed833bf80e4115e760e4b3de1edf223e2aec0a25f81c8c2649ba4c484ee757bd62b5f8d7e410a00fa169a";
+    sha512.run = "aea4fcbda3d60809ce5ea9d0cde73a14aabe141ae09139f034dc8970f2bad335ae083c7914dede9fe8e39308e510eff04164bf4ce8af18fcfcb281f14535dfe4";
   };
   hanoi = {
     revision = 25019;
@@ -23837,14 +23925,14 @@
     sha512.run = "efc8c4892ea4cc8ae395907fc428fe74d535d689a68b3b21422c5c944d4defd57747e519dbca9bd2df2dd010b99e3132afceadee36d547fc11b04480147626c4";
   };
   hanzibox = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Boxed Chinese characters with Pinyin above and translation below";
     stripPrefix = 0;
-    sha512.doc = "a864afc434fbf13bd8a97e754a28a475d9e19b7d26bd2aa8c31bd9ff12a5709e13f541f670c050afa8410705977347573480b3150d875f27dd40749370b0f5e4";
-    sha512.source = "1e565e05d05dd6ee21fc2bb4093f542fe060d9c3d8083533c0ab94c6daf6f4595e0181f9b51930897ec7f67bb38026fa10589b20f065cfd8456df59b4294d01a";
+    sha512.doc = "93a14eaaa9b63233473ccc0cc5f99ae11762b35bbcb19372dce31f2be1bf36d98198bb6d795450f8d39c2a37372c979fcff1907d0f5e4ed1448ab2ec52c1c461";
+    sha512.source = "f9b4d651075649d1fc9491fcd7b87e7be0e124354989ebf53750a1cc2d96c089c5ac6c20402163edf0b1fa74e42351641bbac7572da4161e7e38678d150f4927";
     license = [ "lppl13c" ];
     version = "2.3.0";
-    sha512.run = "c07608c47d895f5befdda3f729129b16dab6a3ad8b3477a3afc108fe8ddee5ef75db2bb28e6061fdd38b7e582dd34ad7ce16b1e06ee02fab3ce34f1727ed48be";
+    sha512.run = "90d77ef8ee4d53479d4db9dddbee091a940e6ca3c8b49d5f6c172e5a7bf66b088f7d864fe901723ef93a28754be523399b4dc48111c77fa76c8984b13e3a99f6";
   };
   happy4th = {
     revision = 25020;
@@ -23855,13 +23943,13 @@
     version = "20120102";
   };
   har2nat = {
-    revision = 54080;
+    revision = 77677;
     shortdesc = "Replace the harvard package with natbib";
     stripPrefix = 0;
-    sha512.doc = "de971a2f65481fda590a1ecb254663778a9260e65d26efdd67c739f02099baddd4937edd1bdadbce5020fbd9ad227cd525ad524dc4ea5fc1e563369313f5ae22";
+    sha512.doc = "c3c3015f0641a93fa855b1abd19da3f67b47c7fe67d70bc0789fc54a207ce409508a7cc905797fbe26c555a26045c0e512b8610ea65bb1de5251378c717a5d64";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "b88cc102c09fc86a762da6c16802241af705a0a7da8707d072f051dea7b5836af9bd5cd46e7c80922877dfa389aace6b7713b10c4f1da75cd0d03c7bb3e68745";
+    sha512.run = "3197996e73e22201abf06508caa0a2633308b8bb46f44e0133068d566ba7f3a6f3139dfb0302797fe0fd158943afe29eeb7fd7e60315b7d276077a896db7eaa7";
   };
   haranoaji = {
     revision = 76078;
@@ -23883,14 +23971,14 @@
     sha512.run = "735987e66fb9ef3f3def1257f670b17e9e8065d9a11d9cc541cdfa6ef2a3dfbacc7fad593b3b51fc9e0000a4d87f8429f977d7838833797e2f36ed7810179b52";
   };
   hardwrap = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "Hard wrap text to a certain character length";
     stripPrefix = 0;
-    sha512.doc = "bdeeb9f80d0013001ce7b53414bc54e0e9f94d5e044c7e7e92d3e3123b26818bfd308aedd866df8c23712cb9889d1e1ddfffd83e166143c933983f3f34354b97";
-    sha512.source = "aaa931467d3a4ee6917c4f969f00dd90151c0a59b71e7fc810028734cf7e7cbdc3fda91b45b4237988a0d225068533c46ed5a55270a9651ef1283ba47626c6d0";
+    sha512.doc = "1e0f376489730f5b25ab8df4d4336fb6f715238eebd34c7819b981f5fca9ea8ddbbd30c2fc5519b68f29dc19552f01fff187b9860fbd3d49e184c5c53f6619b8";
+    sha512.source = "7ece11aa12136c6aaf825404599a02f1c40dd51353533bc62cf7a9d45d762bf3c3bf534e08bf1ddd78e6f88626402e3458aa397bde4457c0522a0d18679c13a7";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "838349e6bdc2217281e3e412dbc06ebcfc22ab2f0e054077d7ce7c8660371ce0122a935b596f24bb83cd39a838a1fc9e7397c4222ce50dc5f47e92c6d7800173";
+    sha512.run = "4badabdf44838b87271e6816ddcd15e70e870d43e20c370457d2279de0a2b23bf24a21d9b272bc322a01d1c1fca31c85952cdfdf0df4a55e920d68ddc4f8de13";
   };
   harmony = {
     revision = 72045;
@@ -23919,14 +24007,14 @@
     sha512.run = "1894f54ff9eb98975f4eec9250a382534a0ede5312b4b540223d298a0fe5d7d8d24abe2018d07b30773e14bacdd97b60039a458fd274bb446aeb2e26b91bf96f";
   };
   harvard = {
-    revision = 77050;
+    revision = 77677;
     shortdesc = "Harvard citation package for use with LaTeX2e";
     stripPrefix = 0;
-    sha512.doc = "42ce106bcf52c9b5ac536503bdc8235551db9ad73d3d6c17ff29d6f7abf4f255c82047c74128c83885c2b9b6a5938d4b4819f999902f6ee6d5d3e2458b9f5962";
-    sha512.source = "95795d2856014e6a1796f4a675f3d41e8a8a5c515b7eb15b92a1e8328d0c5d2ae95430d2bc05acf02678e6e01a8a0512f94b1cd9a90e77c4d9414f795bbec766";
+    sha512.doc = "b9f70f8d7c707e4b50696ae14a8ff2f7f128898348242dd9b152fa28fee086943f704a236c8708401c3e49c5c822db1090de92e858b0b71e0d572985e0829cac";
+    sha512.source = "5bc34cd5e34d0dd26ce57ff0e05511256fd01b853e2cf9edecd7bec4d8c34bce84c9b3ac53e0030954c35fce74da64ad7616b849c14d7706b428f9b4fff05bb0";
     license = [ "lppl13c" ];
     version = "2.0.5";
-    sha512.run = "028c4513d66ab206704eecd95418a09628dfd6edd479849793aa57845f5b258641945368fc522944c51795c7c2758248606b66be512388d6371ecd28726aac41";
+    sha512.run = "75cf452b31146814ebeeb986a3226dc2336dacc64c3e7c0f2b28137802b413faf935c0a10cdd1f7a3b23030172ad101ef6d29e10bfc4dd80bcc63fce0b8f6b04";
   };
   harveyballs = {
     revision = 32003;
@@ -24234,13 +24322,13 @@
     sha512.run = "b5eea028d7a9aeff485bdf2d093773b90725fa5d927c26ddb3b3820c29a671d99f843415e704bec42d6f0958174fe45aea3d27ed8c7dc2861c61ed4c1e0ddd19";
   };
   heros-otf = {
-    revision = 64695;
+    revision = 77677;
     shortdesc = "Using the OpenType fonts TeX Gyre Heros>";
     stripPrefix = 0;
-    sha512.doc = "fb99aa73c128cfb184a097b0d9a32a007ffd9e135d74b543cd23689bf5284176642c1f7a635b1a24ee167b5ee44daec090f7f78dfe9636fbe88351aef125d8ec";
+    sha512.doc = "f0847d23000316492eca4cc9d5e4fe26e552c335fd984f8059f2cfe2e7477d26b629fbe62ff13a693b25a89266b69b683c4842def5545de2a7ac7ebf6027f544";
     license = [ "lppl13c" ];
     version = "0.01";
-    sha512.run = "370ee21398ddc2f3bf285a7c6c545e998a192d4dbb5790a7d2a9b6835d9076871a349001901764761fbdcac0e29d5c0fae8800dab4a34918998b54b7a83275af";
+    sha512.run = "c698451dfed696902f016372b60d2755d56de042aa3eb018735f1a4086954836442e82898531e4bc2efaaf6c64e6467be32ab01dd4d1f5a524ce4bb35c1e81eb";
   };
   hershey-mp = {
     revision = 70885;
@@ -24252,19 +24340,19 @@
     sha512.run = "a660377614522f159698d0577ec2fbb210e639787ed2267530d40e45c12f72f188f1e5000c7bd7865a7d1cb74627b5dcdcb8a44c3b17a1c7ff62b0c9ce0e430f";
   };
   heuristica = {
-    revision = 69649;
+    revision = 77677;
     shortdesc = "Fonts extending Utopia, with LaTeX support files";
     stripPrefix = 0;
     fontMaps = [
       "Map Heuristica.map"
     ];
-    sha512.doc = "406d07cc807454c429e644b7572456b2d9f49d2f48093007c43cbd3087d108beec1806f810508a849bfced690c97141ab34a2daec7ec641c8bdc71cbb55a43cc";
+    sha512.doc = "4d898d7d6a403da10c138e690f95b38d3fb3b901133285a0df4eed97cb9b3f2d8a9cd202117cef9a603fae6089bff43c99c5b9d42b8d39bfb9754f1a9f5449a9";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.093";
-    sha512.run = "de0cae8f801f690e2d07ef7b63ad4c91d91ddafb8c3044441acb9d6a8e943f1c1667e17c0d2d9e4677b3a1a562b072747bebeeb01ded4bbd713b4e6103221a4f";
+    sha512.run = "275301dc747bc068f708f3707ff25a4a4d1ad1e55c088d45b57c9b9fdb47f7f7ea37f1fe5106afb1c8e2fa9a423130eeb7d48962dc1eaf486c9845da6756a669";
   };
   hexboard = {
     revision = 62102;
@@ -24593,14 +24681,14 @@
     sha512.run = "586189051038582c9303935c70bed67975f51472d28b533e4b72ef341d4d93ad8f313774a5c585baf4b72d607101941f01176892499c7ecc5cec3ede2e28a693";
   };
   hologo = {
-    revision = 76851;
+    revision = 77677;
     shortdesc = "A collection of logos with bookmark support";
     stripPrefix = 0;
-    sha512.doc = "f0dea44b94f4f86928d9cd1b716d0f288717ae9499d1a665f5bfae18e4c0997f4a8c85e3ef8987554855a1034f0a8aab17f9f1099ea9621b32c1116204cef0c1";
-    sha512.source = "d9477d02f54d13f34b8d104d55008cbbf5dfafa0f8091ea0ee748bf2f3a9a891e1235328ca5f019e8b1662346931c1cacd8d542452dd02979b2174511c0ad3b5";
+    sha512.doc = "ae2737c9f548c9d3d87e21d7440fe0a6fa3e51a107a96d0b45bbfacddb680b655bb599e60cc17f4dd33b75d558312f5dbdb97824c544daebcc44b8c00caad746";
+    sha512.source = "f6eea78d619930a84a842c933a3640e0b72fc9ffdc39ad00a5f19906c8081fbf0d0eccce34d49a5830b251345f10b79c4f4f1d146115a32f61e11d6a1b5153b5";
     license = [ "lppl13c" ];
     version = "1.16";
-    sha512.run = "06b586c65c5e3746afbd8165d69cd397eeba35d6476ace4167e923036f42632c1e4dbb4ed433c61b0842a3ad5d21830bedc691b7f8ae4714d675a55befa9d197";
+    sha512.run = "fc1a2d7f82be7fe90077af6b5e80e8494f8e1eb15630cbcd1162c4a605d31613767713db264478e2d03aa32a49e92a0990b669fc78c09a0fc6eaabdd49ea1a86";
   };
   homework = {
     revision = 76924;
@@ -24751,13 +24839,13 @@
     sha512.run = "8fc53e6a51f41755f2992296711a252ec4eebec1a758da16fd1bc0a46fb813046272cf23b6a7293a81055f0a943fbecb3842caf0a45918944f4f4ebdd2b22f28";
   };
   huaz = {
-    revision = 77345;
-    shortdesc = "Automatic definite articles for Hungarian";
+    revision = 77576;
+    shortdesc = "Automatic Hungarian definite articles and suffixes";
     stripPrefix = 0;
-    sha512.doc = "d2cb86b47fd1f0e149830973c3784dd443bb98312837842cd9d86580b973a8d1c2714e9f8b8ae0d3a0fb51fa4316c38fbeaf0ca62788932f03d104122f2208a0";
+    sha512.doc = "ac3d7d67fc68a3aa63c90b4bc625eb2dacb47d804d59c54a52f0fb973f25c5e9f16f343ae052bad34a7fdcc7eef8ffcc62dbe538c09a4d852845489684a20aa3";
     license = [ "lppl13c" ];
-    version = "2.4";
-    sha512.run = "424c0523faa2bf14f8ab38673aad0c42aebaa12d542b750d321f3eff2c93eae820eb7a82b5469d88f9a92a0c628932ef5d3b101b0b066500bbb5a48a62d86548";
+    version = "3.0";
+    sha512.run = "88d6372772fc53762fa727fe53db7367433acca5a60af0b1997a161221937f08d216afcadad4fd965e7b775a07b68ea55aab6fa583f072c9fd64180b6b5927b7";
   };
   huffman = {
     revision = 67071;
@@ -24817,31 +24905,31 @@
     sha512.run = "6f01671b8a1fe12bcb7199648ac70e67e9f8b590f0498ff18da23b00dc1c74354e9372824cb477ecf0756bcdb9515446a658f6568775000f33a6f99c8bd94830";
   };
   hvfloat = {
-    revision = 77209;
+    revision = 77677;
     shortdesc = "Controlling captions, fullpage and doublepage floats";
     stripPrefix = 0;
-    sha512.doc = "9de19c00122f3874e6d42000c740701104009514a32dc4c9c41797686dd30f038ff39a4500c67db23f376b219fe01124ad0b3c8223306da470399ce4a733f6ff";
+    sha512.doc = "1d69fe0104ba18cb3520809d54ee08f361a9608fc64cf7175e74675ef82db89d62ad1e0c72bca3fbcb95edf54ca0e1732791d3b15582b2595f1bdde576602cfb";
     license = [ "lppl13c" ];
     version = "2.56";
-    sha512.run = "0e62963e567caed28d905890214d9bc10e8a818ca48cfba09c29a5c2a892f1affb0a850bdf9f9c4f828abaf268a922dfc5fe3dd217ee903aec5e6fc38a5afd68";
+    sha512.run = "21303c0ff24575abc4df8bf5d90d0cbdc2af870f905353ee061c24ea70c4924f0bc90275a22b166ea154995fb44aaaf2fb70531094a6f48f07bf31486028cd67";
   };
   hvindex = {
-    revision = 73580;
+    revision = 77677;
     shortdesc = "Support for indexing";
     stripPrefix = 0;
-    sha512.doc = "a1b3a54e11ebac6f5b8ac2f3a3d106c42fa546d14825429010f9e2d9a24707cbae46bf563514abc59e8f1744810d0d816da89befb15d100737d8f3403c052e86";
+    sha512.doc = "6c0a93d926657ba0e4550c7a8e4c976d64d7e75a7e4915c30530eb1190b7b4c94b362a7eb41a7d3e355865347520e38269beb4b00e63374ed0cc1cdf83ddfe06";
     license = [ "lppl13c" ];
     version = "0.04a";
-    sha512.run = "fa458819ea3bc61fcfa64190fde0cb867d0b264aac0ddaac084da3f3e407b6e13584e1f16a835fecfaf31c258b36804dc1beba7a53bdb3c11a30cede820d6201";
+    sha512.run = "fe8cc874accb87bf394f5c75f2761119b75001d2da050043b9f77fdc661e827c086fb6a421c021b55838150a54bc32b2845f044ff76735a0217e5b639db7a670";
   };
   hvlogos = {
-    revision = 76699;
+    revision = 77677;
     shortdesc = "Print TeX-related names as logo";
     stripPrefix = 0;
-    sha512.doc = "e50026559633f28494ccfff6841b3c0c06a170eff5e3fddc7b918db4c9c3a16cc0bd5107011c3c5bcf0525bf6c06529a38b3c95e490cb02eeeece410c58f42b7";
+    sha512.doc = "1ae670bc32898fadb5ff1415063989296a24dbad55159f8dbb751d3b633b2b516533301c29c9446e47703e5d7f3edd55a32f47411f23c68157ef15c22c02b13a";
     license = [ "lppl13c" ];
     version = "0.16";
-    sha512.run = "853bbefeaad03dd9322d6d7e2bc6e82ac74c53cae45080952f5925117b3a227e655e1e5def58573e92b4d54b4c9429d515550d30030c39b98f9cc1f39f8e72bc";
+    sha512.run = "ac121744ff5c58070b6f5775f9700bd2d22a4c3b56c74630b45045222dbd75ce87181d16b0ae0e14d9c50ea50ce606c83c719122dade190da2f88ed5b9023984";
   };
   hvpygmentex = {
     revision = 62405;
@@ -24874,33 +24962,33 @@
     sha512.run = "fb29647b4b81c5c4cc389fe4957400e01dd408f9b915fa4062218af3b2a8eb852315399251c257ed1220ff48359940c59ab9a09dc7a67fa8f0817e39636a1312";
   };
   hycolor = {
-    revision = 53584;
+    revision = 77677;
     shortdesc = "Implements colour for packages hyperref and bookmark";
     stripPrefix = 0;
-    sha512.doc = "79e4c83b952182ea89b2ae7a1abdafd771359baadd34fce8d573d7449b24908a5bbf515d16d73fd088e7add82c143a458b2c196c125e5b492033cb36da63eb6d";
-    sha512.source = "587ca9470aaa935119d142a970931d89444d2d64ec311ba74a697fa4cd982be999e7e62ee9924dd6028f2b9411657d6b1cf4b6cb9887d08cdb0b969e8a334fd7";
+    sha512.doc = "38f032ff8df4f1b34598bc59a76333be83f733827bb90a86b9d0777f27eba7890cbd1965f382456b1314566e31662afae1a8f26dadc10e77ac2f41765637ba91";
+    sha512.source = "d81bc4fc901cd6fc96a64da9c230b6b455f011f0c1978ce7c47f7ad98cc8fb1baa9a30b68e88b9d117e2646a5cf636ad59402b9344fd6720e6d7ce3eee9617af";
     license = [ "lppl13c" ];
     version = "1.10";
-    sha512.run = "5269044c5b462f13c78e80d28f7237f2d6e353da98db50267a5c4f01b22d565b0300c689470f6eb1ef9af7b66c1068c1d40d7a30ae01f30e7b3649189a7e7fbd";
+    sha512.run = "5f4b8730e468da55c792a41520c434685b38beaa74314da9db8c4ad284f2fb62f960435b48e3684a78dd822de82bb15ec78cd1364974275c365ce9364c820405";
   };
   hypcap = {
-    revision = 71912;
+    revision = 77677;
     shortdesc = "Adjusting the anchors of captions";
     stripPrefix = 0;
-    sha512.doc = "24cf7adb17e9cafe2ab0009feab695ea359167823e7bfd71806ab7b989187fd8752b55d1cbb96fa9eb180d87c736f9823e20e622519f9fe9ded162fb1758b694";
-    sha512.source = "a258899e82696a2314a5ef7a30bb0a2ba7cdf2cfccc17ba7c0d55c2546a9a46010428012d6bbb821c9ea2a96c62e1f10db2905de6464405f87ed7074ccce4b26";
+    sha512.doc = "0d1666f64f1daa436958e39681130daab8b208528e5e4d42a2e09f78b0c98f7119bb3a87e1eb8a8e7175da24481a266c98f9a79173bdd564f27192a74ddd2310";
+    sha512.source = "322990e69189cf04ae5f38914371b91074ef07d26b77382679b47b77291e68737493e62493b609930290fa19dba4211c8244b2b0db5577f143eb552a1d34f0c1";
     license = [ "lppl13c" ];
     version = "1.13";
-    sha512.run = "addf9ef94f61eb1516b6a3ef1bc7653b83133f2d4df5eb9d178f859a411d0dd8bc3c1b14b5657396860813069b32d78e78a6b26d88e546c011628e47a878ff5e";
+    sha512.run = "f8a83ec6ed374c881277872900b7a59eb68263dd7cfb68f781217346c0fceec862c7c5500c1b54532a2405af2c799434dae75caedff54de2b7ac97606c0661c4";
   };
   hypdestopt = {
-    revision = 75593;
+    revision = 77677;
     shortdesc = "Hyperref destination optimizer";
     stripPrefix = 0;
-    sha512.doc = "a53d1077baf8d7596e1fa43b4d06762c92f3ceaee18b0a11a1420f9d7f8731d3542da84ad9abc2803521158f8f0e5fe551dcaedd02c255a5f83974ee3b1a51c9";
+    sha512.doc = "0e1ae68a8384b5a4164c40fca59d008ca77f94738713f0f74ddcb982597c9b400c4aa8076a9829858a5b35713a896ff782fd1dd9c990869360609a882927f81b";
     license = [ "lppl13c" ];
     version = "2.9";
-    sha512.run = "3e35e2581c86acb640a81a97f165bf64b4e23d416fc71ea2f993cb4f719f2285a115851bb09fe62b8daec7fcdd1d0dc5c484d32d9dc885111f05437e46ee4603";
+    sha512.run = "fe331d987872a78dc935becdc4604a32c70e85a5747a9ba14803583e644237f6ecbd7ed5005671f78b3fceb2d2256925ec6bcddca2fe26bdbc9cdf2ef47bd249";
   };
   hypdoc = {
     revision = 68661;
@@ -24913,13 +25001,13 @@
     sha512.run = "bdd5a75f53b714976f54f0fea68093d79dc0d781a708dabbd3cb90e49d77f282ee15cbf8c1082cd5746bbe6b701e58e71bde38141db56cab5042d7556771d286";
   };
   hypdvips = {
-    revision = 53197;
+    revision = 77677;
     shortdesc = "Hyperref extensions for use with dvips";
     stripPrefix = 0;
-    sha512.doc = "ef485ca27145ffc614c78547f68d574a0b27cd1a7cd5abd5752681e20ad6612e280f34f85c3e1c753bc6cfea976c9801da1768bda1dcea377c19b138ec9f2777";
+    sha512.doc = "ac9770d122c3ba1594882a840fe9fe4cec546f525857aa190bad8759a6315c06a25a240943c3b7b873f99d45895c101e448acfedb52d89e09dbeb13b6138863c";
     license = [ "lppl13c" ];
     version = "3.03";
-    sha512.run = "515089c437413d6d21c8d2987b8917aca7c046e42c0dc9212b39be1c9119bcc867f70c37087f9f3709db8c9f824ffe16d1b261f34d06d66e12857db9854892f7";
+    sha512.run = "247ad2b41978cf300b0c762b3408585d1514187d1b7ba42420031760bd54b8ab143b9c1bfa7713a1decb9df04c0f8f521330ccb18044b5b9955522b903bbcd7f";
   };
   hyper = {
     revision = 17357;
@@ -24951,7 +25039,7 @@
     sha512.run = "0a803b9e7d23d364122869a89a6f181132f00b54d39f677a9d9471c336c933ba0e743fa4100636a6d3e929714a8896ce964e7614800c675ab9df7cce7e6d732c";
   };
   hyperref = {
-    revision = 77528;
+    revision = 77677;
     shortdesc = "Extensive support for hypertext in LaTeX";
     stripPrefix = 0;
     deps = [
@@ -24977,21 +25065,21 @@
       "url"
       "zapfding"
     ];
-    sha512.doc = "dc03e0852da5cd9374d67c509f7020664df208bba9b11e1188d6984fb5933205259e38badbedf2ab395d2c90716ed90fbb82de4d3ae071935b5673214f30fbf7";
-    sha512.source = "d69bb43a5f34bc77fb3508f374f47a5b368d60fdd74f455d96e8a090318de073b20187e900172f48b4734e5a2932dc4435fbd8766529bb5ae8a5b288a489191b";
+    sha512.doc = "6de28a34c3965703111455c48583975bee8b6cfbf5d993b1cf57605a2ba6d2c297c1ad712afd4bccb222140a73bee674944a4db8dd0d0ead2f7d89aa7a17f3f0";
+    sha512.source = "a27cf42c9b96e1409239e30c161e30296797b86ce44641d89b02b7c911e8f32278643253598199d6c5910c676f7919fa1055d984822111959e1ec74fded1b71f";
     license = [ "lppl13c" ];
     version = "7.01p";
-    sha512.run = "1d59e07d0aa5798fd8735639b7e46bda18af0961255e1f00e7ef891ddd02dcd56578d07b4d5429541c12f1b326faa394e93b55b77b9a437afc666a9fb7f934bc";
+    sha512.run = "2396dbbf8b1d15359af6bed98b72e4962155d822886e08652f9464e99bbd2592f6f53e8a246d1bcd0042311341eff2aefc7dfeac8288745e0de9c5bbbfcfe7f8";
   };
   hyperxmp = {
-    revision = 70694;
+    revision = 77677;
     shortdesc = "Embed XMP metadata within a LaTeX document";
-    sha512.doc = "51549221d2c14fe16b77f4fea19d10ad09db9a29ce8217210b90f55171e4013dab7336d115a0f31ef0bcfc4327c27a2950c1c2eedeb9d1f03e03957b842d8f7a";
+    sha512.doc = "bcdf885d2eeb0ae861ad24360010517624eadbeef9b6e60e20055bb79c3eb54f62227817b2a415c8986f9ab3af0212b641630d0a73ce684b175d90747fac8f2e";
     hasManpages = true;
-    sha512.source = "68c71a154f1e7e1a2fb2eb9279263d6ae24dda4d117da8c4e9bb409602c62044ebda34725985b9bd14a04257dedde516cbe6f4f7032108fe8d360baab6582953";
+    sha512.source = "b83446548015be52e150694e741f6ec188e813f2583919e64e4b5928ced76921a8be47d56bb7d317d6c0f0dc6026e649652e4dcb96cabe221a07021e46c39432";
     license = [ "lppl13c" ];
     version = "5.13";
-    sha512.run = "63c21dbef4c22d352e77df1aed8bbd37d1a6a3cafe3576dc03f88e3a22e7c181625d83162849e6eba5977c7c3b7cce176dc0c3aea9dc3db4bebcd601cb4bcede";
+    sha512.run = "2fb520ab1d556878d2a9bedf949fc8ead04daa38477f1227e951651fc4bc2e923e216f78850bc77fbf67a5047b5173049fd3f7ecb7775c1e3ef7e1376d8a0c18";
   };
   hyperxmp.binfiles = [
     "hyperxmp-add-bytecount"
@@ -26557,14 +26645,14 @@
     sha512.run = "8a8a83b7596db194c6e12389f467c5013dfba45a18dbbf4ec53c6200ff180d09f826dad90d17784ead0c325d3df1531636f6ef5b1570c4b257d89b628dafb271";
   };
   hyphenat = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Disable/enable hyphenation";
     stripPrefix = 0;
-    sha512.doc = "9979f771600eeaa96329a415cc96848e6b221dc176648ae202d49ec07593670ee68f9b8c4bcaf7a89430fbfb0f61e616a3d5de94c2e42c040ef37fffb53fb8f9";
-    sha512.source = "79e88db385a1c9406d9491e734f89462c0578ee12f2dba12e0963fcd0917c7fc9dff05ac3d26752bd348030c078a39758cdc3ead788ae30839b2d674ab1570a3";
+    sha512.doc = "f3bcb9878d0183c4f0c3059d86529f7a2dfb1965238c691cb7b4589ace769fc197239b153655a5e9fe2ba0f0f95015b2d4da3ef347d42790dff71c8ef2426f57";
+    sha512.source = "8834f8f394252aeffce49971cd6ef9210c47ee91353606017205e544913edbbddd16e09311f54b4072b6a90016f2f773d79724a3cf3e96847369cc86234fc5ba";
     license = [ "lppl13c" ];
     version = "2.3c";
-    sha512.run = "003aeb02f6ec704c0cc0ad5e9d53be90892112d4238ed928c23642334c0428ed872b97d663e82063741d20b2060690d14b2e807a39a6167289e29e30153d77d5";
+    sha512.run = "0fa5a0f0aa53d85819214d7829f4e0c544a38b4116c4fbbd7b970f63868eea01993d0fbef8a2b5d93315c4c490053343b8b10ced09d6d84541e45fba710a413e";
   };
   hyphenex = {
     revision = 57387;
@@ -26583,39 +26671,48 @@
     version = "1.0";
     sha512.run = "f2968e8baf048329d8c78934770aa5d0a364ac7b3f77dc00a163e085e4fe45420c180acd05b281016aefdfa6523bed234e75ca07da0d133438798c1e51330d83";
   };
+  iacrj = {
+    revision = 77823;
+    shortdesc = "A document class for IACR journal publications";
+    stripPrefix = 0;
+    sha512.doc = "9121ca7e0a3818cfebdf4721aea90cb6f2e3b11775f0c166d1fdfa741fb54cf1c46191877631c398274b17c74383d047a100cbab49ec99c271a7e9b28e8c364e";
+    license = [ "lppl13c" ];
+    version = "0.9.1";
+    sha512.run = "a305a083ca04826fdf1b2e5cf798baedd2fe07a1f2cc79a2274c5e86ee2a27e08c1d580ad06b1e8ad42fced96758115d35df8e5b7e413fcf7b50781c24ebc1a6";
+  };
   iaria = {
-    revision = 77504;
+    revision = 78148;
     shortdesc = "Write documents for the IARIA publications";
     stripPrefix = 0;
-    sha512.doc = "6d32612b41c3ea6d716bc14ca831713fec74edba79fdb055ceb7dc32da16c5a1e2a0d9ad99a4ed65b78f1e8a03ae2397ffe98b829d9740fbb5b53b7c1788c84e";
-    sha512.source = "b974c5bb33fb0ef74d9f29ce02ddb433d2856568b347903fed56ff26d02b0c230090379c889b245237ead3e0662f495aa41691d419eb9ca14829f493d68f722e";
+    sha512.doc = "1c10b30134e446bba20be754a097098bb6d6f6eccc9ddcf291eb1f2f7d9d7b27e8dc19e8afc8a3b490c1b8813f7676b37e35466efa7a2f80b559af0ac332ea17";
+    sha512.source = "119da17fcb131f02f3f0f962d6dd71c54306576918fe1fb8d9977716308c4a0f85eac96e0d4d4941626c241f4c6f50b2bcb340bd6bcdcc1b807b8eac8b01d057";
     license = [ "lppl13c" ];
-    version = "0.9";
-    sha512.run = "e3a3cde7bed6f7f2d2f277b4ffa9ac97d6f6b06f22c6bcef1819afdaab7cd9a80687390501f9963a8b2a188c41281dd26abaa5b4ffebad0127c29056d6221ba3";
+    version = "0.9.1";
+    sha512.run = "3d1f712bbd9e6d4ac9954d11fcb1226310e66a4273aeab91cdc0df8f91916d2e7b8232172d5505c708049e38945a392ff1e8790443605fa00026ba850232215a";
   };
   iaria-lite = {
-    revision = 77505;
+    revision = 78147;
     shortdesc = "Write documents for the IARIA publications";
     stripPrefix = 0;
-    sha512.doc = "fa6b02369e76585ab1501c0e188552f01891ba972c60181bdde70dd575b22ef599d64d8207dc97e583f82acbd59e2ecb4e47750860fd7907c12bdc93b917f057";
-    sha512.source = "bd642c7c41b642348f0392ea178868bf661ff48e0955c087d681568340b738fadd114c01048aeba226866da9999b285e4ff383e0e2ce02f7c70f2f7fdd0153bd";
+    sha512.doc = "666de467d42bb55a1f8e09d79a5a9515c4881e815a39361b59837bb10b5d668fcbcaf7e2ea675b8b92730d6c2d71ab1634387da56fbcd79b9bf57f89e1077346";
+    sha512.source = "37c1eabb1cc3e8afd0728c2410b4e5c9ed5e20fd42af2e9c2df1a4a0227a0b1e6ee590abedf01e84e42a2631f6642ca5fcc668074d4b3932032bf48b040d6276";
     license = [ "lppl13c" ];
-    version = "0.9";
-    sha512.run = "8e035faa378b5445db3e2c7103ed607a0c97018481a74eba2a274d0b77d891d446ec95b174f905d38361d309f111b5d9df3333ecf682062d6414a012fba9249a";
+    version = "0.9.1";
+    sha512.run = "2aeb7feddad7f5e53c2428fa48d0372a0578e6ebfb48dfde4fbfc0c08f7455ecea557e0873d62d063af80f2908ac734d6db90ed34b28127d2b9b06b3becc76fa";
   };
   ibarra = {
-    revision = 71059;
+    revision = 77677;
     shortdesc = "LaTeX support for the Ibarra Real Nova family of fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map ibarra.map"
     ];
-    sha512.doc = "a163ee666360ef3c389b911fb3dd0ef491c234f8e4097def2143f4d4273d01ed3385f3c35edad13b1b018a46963bdbc124be6cd056d6a95aa477041d171b9cc6";
+    sha512.doc = "8d20cc10cab96132bf3bdaf1aaebc949353fbbe037d0157bb4aa1893ab014b6012faf9a4923364f88695e21c3c23a32cd722b9fb19679416c629934fe256fc1b";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "2b302cc5c97d546fb0f47d209ed1fa36e019bf5dd204b9b6c3325ce039860e44019ffd5c3482f6986bd894d73689300f8537fd3598f39dd3987811b741602a1e";
+    sha512.run = "8ee4e854f9fc2eea663d6b52f3dd588e740de1bb91c1cae68a81cb88ef7599953f6e197a6ef95730a331a93c02f9ac78aac8b26de1dbce0b0ee7fa1db10e6381";
   };
   ibrackets = {
     revision = 67736;
@@ -26806,14 +26903,14 @@
     sha512.run = "c9027b8bb34f15e667e530a8b8d57b793ed16a7ea33feabe58f22cd71230945905054e01853561f4cbaf5fe22f4aa140cbc95072f375d567f57bcce3c4d07d09";
   };
   ifmtarg = {
-    revision = 47544;
+    revision = 77677;
     shortdesc = "If-then-else command for processing potentially empty arguments";
     stripPrefix = 0;
-    sha512.doc = "8f456c15ecd5090d2124a85b02c1ad100dc999064b258678cad3c444acae3e88b95e38f7ad1785bfc91f385d6bc1664c0b58282d5ef36e6cff9857b81176ab7b";
-    sha512.source = "e30806ba6fa85737f67dbfbf7cc1556781bd4cb2179672e5b9980e7f625366d5627c69411dae34a9e1c0fc29c16acaf302c344d9d93b9dd4afdf23bea020cc63";
+    sha512.doc = "010f17060026dc1715c7119fe0840484b204936bc81aee790cf149d0e27ecf0669866c99f10535d8b8ffa638c91388a64fb5843ab36f3adc5ef1a4d296761da1";
+    sha512.source = "ce8e49cecf849bc343e19d0aabc8f1f9d62e22c8284d399662f3dbea0b2a26eb961205cb29191b810f4fc198b5bbab97f0d79b7f17aa3aa7e1618e8dab86b026";
     license = [ "lppl13c" ];
     version = "1.2b";
-    sha512.run = "b04aebac5acfe90a149f417cdf0d45b3a7cbe53d53d4d9f39d5badddfcb894e07f397933199bca702f3f0e66458133ba17feb5ace2ebda4a25bb24bf1af5d259";
+    sha512.run = "c26d5b3b5945b2908a1ed9e97fdf5ad8ee43dda7f63d72969f9fa9ec020bd341e7da385b9e9feeb0f822554d6b0b05b225bb3bf8c164d9b11164265af465afdf";
   };
   ifnextok = {
     revision = 23379;
@@ -26826,50 +26923,50 @@
     sha512.run = "a56c703e1830fa64432d1b3aa72d3dff52b17c0e5b90b2cb34f7dff974e51331f5d9daa2b5aba578a8bc4a73b693c9a3dd811c6d7e32379165cc7ec1349c541b";
   };
   ifoddpage = {
-    revision = 64967;
+    revision = 77677;
     shortdesc = "Determine if the current page is odd or even";
     stripPrefix = 0;
-    sha512.doc = "924f08c94634f1149f8873c626c4b73cbbd2a6fba0ed28f1199b6688fd8940720643ba672d781b28f6802c1fc5dfed5928784a70436d492f4bc51c6d43006119";
-    sha512.source = "1a77f0234475293f72afad4b2db4e5b861236b30a80172460be7a4bf0b734a4a06a2f69018415b80bba11bd68bf4a36a953eaccaf11efc93698f1f779f80f071";
+    sha512.doc = "95df91af084f4ea145ac9a03ea3b5a733b071caa20839a5df4c37d7e65c5f6d9a99d5bd1abbac8d79a2ac5ee1957695385240202d3f003d393caf32984a5c9b4";
+    sha512.source = "e55a2a018385f659904063660cb8cd4fcc786ee841ff497d81cfc6218a3189fcf48a18dc75f5fad98935c7d2ba28c03baf889dedd5d0aacf27e62e83a2673dce";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "2a750da3db6bcc2c08f4240874d57c4aee1df4fa42e695156ad08ea5c1e187061c8071f621d3cae9365f28853c44e53a94d7702ccb4972656d096ed4d1272524";
+    sha512.run = "b40721f6c426b0899c79a16feaf2b3cc75b617fb39a1c5a6e1aa8794383b4261d26a8b0b96546804dae5d66c024fa1c8537172a10e839edf30c4a64487b3eca5";
   };
   ifplatform = {
-    revision = 45533;
+    revision = 77677;
     shortdesc = "Conditionals to test which platform is being used";
     stripPrefix = 0;
-    sha512.doc = "520004cfa412c2a24ece0e00b11d457405e71a446e554a1d930e60ea7dbd00f61b2b6a7ecbe89b62610316fd3b6fad685d7013042fa71fd7fb270b40748dee56";
-    sha512.source = "a3c33b16decd5fb443d9b5bb13f3a5e0ed56705d353b0260772d81f963460ff7e914fb1d7f4ee24e249bf15af77368ddc6fea49014202389baaf035f2165e17f";
+    sha512.doc = "4406e4bd2692bade1e2f6c5d6bc4a821c09516951d2ed029ee0fb3b1fc20b21114967cdce37d51c8cda19a3faa09d50f855c966ca17b5a7b219d54cc39fe0298";
+    sha512.source = "1dadce942d50cd36d9daf1ab6934943e47bab49504eda69a901bc7f280f426b9f7614c22ad19b0708cb59077c89679dfb39522d8a61e48546cfe7507b8ef69c7";
     license = [ "lppl13c" ];
     version = "0.4a";
-    sha512.run = "952f87877c058c1e8ba3df227ed7332501e7861bdfd2a29878dc4b14e6b95a1b116459bef7f65c5bf277c95d08120c7e9fa9576a7654739e4a26125ca4d5c724";
+    sha512.run = "efa7dd7a7bdf685c7557e594524fc015c4fc080dd95ce3f008a4894187e1496b029d0da9fad57edb48dd73a7da6e54a78ab68483df8e581c0ac978111585f813";
   };
   ifptex = {
-    revision = 66803;
+    revision = 77677;
     shortdesc = "Check if the engine is pTeX or one of its derivatives";
     stripPrefix = 0;
-    sha512.doc = "a65a583b033509fc0a41fb65c6ec17357c0e095cf09d6f5d2b9b1f8e5fa323f368cd381941e8850bc1fe81a213dd2bbcc3d9877c08d50a5a78efedca05a7897e";
+    sha512.doc = "99619f76ac44f500aec7c6a653362caa3cd4c9144d7c8a91b8310d5ec54b7290db54989324a0969e0cac3a6014334ec700c293fa122730d5befde02acd6b4207";
     license = [ "mit" ];
     version = "2.2c";
-    sha512.run = "9b0588af312fc3627687703f030f40ae421d9949d696891e9a60aca3c7582f0a534099685e8b8d5535df0d2f9dcd452f4219092d70c285d0fa65af6d140b7afa";
+    sha512.run = "73bab9ce25233bc2d07457d1afd7c2ffe730b4aafc8c82b73e9857d89cd58ab595a68601e64ba911622cc43378636d1f6d19f842ea5922ace86ce722640c2965";
   };
   ifsym = {
-    revision = 24868;
+    revision = 77677;
     shortdesc = "A collection of symbols";
     stripPrefix = 0;
-    sha512.doc = "10dca0c00a52d9d9775bd2ae35b50d7d56294da9b8eb21f2bc35f7863cbf1ab357cf8f3e1d949570ebf4908a60d9ccfe604e69fe779780c8e7527172f3f0e999";
+    sha512.doc = "ea042196b4d6383b0b623c59ca2ac8f04fe3d91c040769079e316ba7d7082f6c2477198024abdaf2d18ab38e0ff9737c3a6d71933e770748b9f3e1be3e109ef6";
     license = [ "free" ];
-    sha512.run = "ef6615a3768f87009d22c3feeaa074a0589b17efc8585a509e21692195a100e5b11e2d0849fa2eaf8f80cbe0d96ea12e773aee0be28e7120ee80a86dcfa6f8e2";
+    sha512.run = "87833057534a19df6902b442f1ed85ba9da5961b8bb97a9350d9d52a9a7aecf2ec85260495be4135f7de03d4fd0e694c97e46c4412a8d02f37e2a43b6c536cb3";
   };
   iftex = {
-    revision = 73115;
+    revision = 77677;
     shortdesc = "Am I running under pdfTeX, XeTeX or LuaTeX?";
     stripPrefix = 0;
-    sha512.doc = "ca80b5babff8f78624e2908b55c3f9b9cf4e9f3f3ffa777c965e20f00e8bc71840c694cd50c94042c1cd0037b88e3260f29a57a3b39abbe0b6e498245e86ae5e";
+    sha512.doc = "73354f3a0b12a708cec94676f9a5cf7d9e32b60f49791f95a21034589933943ba4a4708f8dd868db65ec4ab0679ad8ba60d78e2293f6f2b10707fc941a1fb362";
     license = [ "lppl13c" ];
     version = "1.0g";
-    sha512.run = "39761a9fe27652d444f3ff119c891c25af859b1dc8e8e21419cc44a45443bc8cebd631168b46dbd70853d2b84c88586972c7f471bd0a504d0b6afeec13ad6b7b";
+    sha512.run = "b958d8285b1ce12010034fbea4c3155a7f44c8aecefd16559581e24cace453dc6b25ab5a40a2340940fa9e540da5a5a8e46ab5a726cd1b7aad8f0996afea1553";
   };
   ifthenx = {
     revision = 25819;
@@ -26945,14 +27042,14 @@
     sha512.run = "0435d5011bdaac97c6f36202a03cbe52cb45f83d7dcf37111b9c68706e4cc971b5b13ab5fe0b29cb296f7af4b217a64b5507ea00dfe63e8496e10b5adefeed8b";
   };
   imakeidx = {
-    revision = 42287;
+    revision = 77677;
     shortdesc = "A package for producing multiple indexes";
     stripPrefix = 0;
-    sha512.doc = "a07d9461013045274f03145e97d286d930055c4573e917a78e8913841cae30fb61b99e66d098b4ba014cf44e92982301c7d72414e3ce1df176bfd35ecd26ddf0";
-    sha512.source = "f3fd8e1a5057cbbfea56a0d21f16bb310fb815ad7363e284083f2c313ac055b1b335fc1c43bbddd1b1beae64ec42e29bb4a194056be658cfd3ee24e49d5e5804";
+    sha512.doc = "026e25c293862398aace7dbeb665fb4d72149eb99203c448e637003cfcaa08c4785f8c422c462d561a57ad7d7ef2d2cbc235f2d67f5fff99c71271885a916fbe";
+    sha512.source = "662021f3f74ffbf6b12e426e329d50cc7db6f51e6e6c2db7f6d7817a0709de803877b6940eda1656a63235412670bd5b8c8978c71c7d7a3e84ee2fdf6b92043c";
     license = [ "lppl13c" ];
     version = "1.3e";
-    sha512.run = "6ca0680f29daf88dfbd26fa87d47a65c8b2c2d534321b814ff78d77d0b97d7fc5654b4dc0b91d12eb0c9373cfaff5fac59f24def8d0f50d97da34fda6f839d84";
+    sha512.run = "97ef4a7dcb7431c0e5afa921ac8e5e79e170c374e7878556ec5a4f5cde0c0855392ffc3394a57937524abe922279b86d31e35194b6b5b7d123bee2e59ff95cb1";
   };
   imfellenglish = {
     revision = 64568;
@@ -27002,13 +27099,13 @@
     sha512.run = "7afd6cf1fc2738bda4f390fe7f2f9d5e1bdd33c2e6bd32b4dda5b232005589f38436813d9e5effb6feae6371896be453b608ed61c64b9bf38fd25ec400c4b101";
   };
   import = {
-    revision = 54683;
+    revision = 77677;
     shortdesc = "Establish input relative to a directory";
     stripPrefix = 0;
-    sha512.doc = "967d456dd18c8838db7d2ed64016fa0f77f2ed475e5cbe36389414849786d7e7850ea43e8bb00d8aa06e3ba06f62970a6525ee1b5a5109f8cbc77a0baf894b50";
+    sha512.doc = "2393bf43b7a3d27401401a87c7269624b835bb2f3d9efa89a2e3d6997f68feb3a21b1481f3033ca449bfee120195bd5ea99648113de0d1cc5364830e414e2f06";
     license = [ "publicDomain" ];
     version = "6.2";
-    sha512.run = "96a92584b4ff4a4bd3b345b446f2802e34d59ebf8c14469a5b5331e6d2f92b63f42d8f5799bdcefc9ae3f74e5e6f93aad7d5371dbe7d21e84ced3890a76c7a19";
+    sha512.run = "bc87f8ae75d44b7b44cb51e1617e8ff10b227b5d639ed423ed67525cdd0c58541f10140abeb4d7c4032d733f287e57c9f485fc58f5778e0ed3f7d8b8733d3569";
   };
   imsproc = {
     revision = 29803;
@@ -27048,43 +27145,43 @@
     sha512.run = "a2b43d658ed62ff3a301a1b190cc46f04a4a46f413ed4af3e0f84f1873efc6841cd23fc07d68a90cca50b6ed00ccf654aef9dcb6a8b4863277b06c7e8c666e6b";
   };
   inconsolata = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "A monospaced font, with support files for use with TeX";
     stripPrefix = 0;
     fontMaps = [
       "Map zi4.map"
     ];
-    sha512.doc = "9139f7769536398c2822c41fe1fd0850a81fb54d70524904b266c8e231c95e344e27468187f474d51a9ab8c4028d6e5f9cc4513d1b38e306b739a1572c387e88";
+    sha512.doc = "5262ecb372dc1e5b238e10a693b35480a0c048497c636d33183d3a27e228247c7b3c09a86108ce6a990b42d59a8a6cdc4f5db73e609a4ff6f3450e109d10c21b";
     license = [
       "ofl"
       "asl20"
       "lppl13c"
     ];
     version = "1.121";
-    sha512.run = "3b33a1627083b50019e0c66ad49319d3ae699943f217daa21f57b19dd2733d29c6f1e9fbaddc1e3e39ea96623581b1d6a388f1a0009e84e4c3f381887b05d4c7";
+    sha512.run = "be94f1b500430765601a5f2decb8a4e0bbcdcf819c1bc010847fc42bed7b8e5b6d09e6323ec836d3d588dab889a4d80c74f8d3a7b9c535d7cd4377dbf0843191";
   };
   inconsolata-nerd-font = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Inconsolata Nerd Font with support for XeLaTeX or LuaLaTeX";
     stripPrefix = 0;
-    sha512.doc = "5dfff3372cc69793845fdfb4b7dd768899afdcf876b4ce412b827a0ec3a19ba12a286928bf50537a18ad3c1b9ff0ac088f760f3cc32516a5dce307fe722bf8eb";
-    sha512.source = "3c1aa35801fe0d5465fa1aa11864a6934fafc4d41e0b08f73a1ce52bdd5871eb69a69998be2514f481647a4b3060b9a4fc9da9ccc1496400142a29ce3833f20a";
+    sha512.doc = "f3121715ca11d0ad35bcd23e0d109e31c7344c83cae3825c16c1c64661c16305b25bfdb12241c0dc0db40c234255bf5b34783c4f384d85ba403cd586b2785507";
+    sha512.source = "517f3fe3809aec30019f871620650cc36b45e5738f5e9eb76391b4e7603cbfb648df7ce53bc09d025e736c16155e52b18d1a53a207de472fabbed44b140ebbda";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "0.5";
-    sha512.run = "d03900f00c371f19f23e5624d409d24ea21b7c8d9aceef4fb384eb812406e8ba93c6144b7a9fb7259d2691dc2a7962c1ce9b314f97f88cc853239e4044d02fbd";
+    sha512.run = "dbab4fbe905939580a05496093318c8691b1286496551aaf55317a19cddf34796be437c26f745e456d86a1809eaf023403f59a28e4760e34eaad4db9a5e30ab2";
   };
   index = {
-    revision = 73880;
+    revision = 77677;
     shortdesc = "Extended index for LaTeX including multiple indexes";
     stripPrefix = 0;
-    sha512.doc = "74d48d40a1e888350f5f5d054f01fcf82d84b503c979dd45a14b960254e5a83b00a639799e632a85d35e28197da74065272f1b0fda67de2db13604d00959e260";
-    sha512.source = "35a7a6c6eb17a1ccfd834b912dfe3a253d4ec63890b772dfe7e8800bac0aa3eb80d4b1a3b39492c312b566676ac09629eccdb84c8253e43f1fc1eb8042d56f58";
+    sha512.doc = "0971796b17a267ebe62e515865399c1b6a81bf0392e7862851f7a5682ce6711c24cf9be85773ff3c8a8722d281f1ce0eb6d0300514148fd4528633f81645cd07";
+    sha512.source = "1267ef771accd08bbba8b91272e6d41d6478d7972dd4ae28c2b6ce37d4e424c0f5c5d9fd3c1b8d23857414e09a984b9706db09786e1b47b78c38495f401ad06d";
     license = [ "lppl13c" ];
     version = "4.04";
-    sha512.run = "9e40509ab8e3446968dba2d7523b091c206a51d290ec9ce5b9d5d555914373dd0818bebd25549c4306b54705ca076c6680f6e886459233827bdac3b8e58db101";
+    sha512.run = "10c5552990b888ca49378e6368c7df4ed9992910a7ef27dca20c2e43cfe1509e4b102e6f8f58127db1ff7e25824d184ff2be8995156d5022e05462c22fc4b733";
   };
   indextools = {
     revision = 68555;
@@ -27107,14 +27204,14 @@
     sha512.run = "1d8a98b6f49bb81dd7a1f3f2b589f0b8b0cc58f4f5df01d2a1d3067d641ac5a86adbf63eb4d939d155cbe46681cd9cd6fb7aed3d61e17bd25de5b3b88a690712";
   };
   infwarerr = {
-    revision = 53023;
+    revision = 77677;
     shortdesc = "Complete set of information/warning/error message macros";
     stripPrefix = 0;
-    sha512.doc = "2830f622e2ea8e5b3427a9d924dd5f45f0c63a8a6de82e261102ca2c3f3afd7b781a7e0d50903dc8d8c1bee0674503f3ab935fe81dd9490d4310650097c4ffa6";
-    sha512.source = "ccc6e1f7a63c10fed449c390b2283ac44b94c33a453f1146658082c888723ad8223bea01b71545d7f57f89fb8c8373f1a8329aab7255b7d17fd36853456cfbe9";
+    sha512.doc = "f88aa1d841097e7616bffb96af9bcadbb2c7fd198fc9f4f1c083af14fb3a5d7ba266172b1d00b5f749c3e156a110345251f4200848735c9fdb0c5468472a31cd";
+    sha512.source = "6f2a8d43572eb688bec1ed736aa80073c9a5acce8f401efed07823979c67716b2a2d58f113f2f4fe25d9d837232c1a511c76cf6eb3043453a706d0c42a97daa1";
     license = [ "lppl13c" ];
     version = "1.5";
-    sha512.run = "a41fd6f2ee199e460950fdd31484be7e949a5e36ca740daaf3a1ffa01103d865f573c8ffe0859a8629456786cabf2f1751dbd828cb5d26356b1973960c854261";
+    sha512.run = "eb441377de3ad2055b61a5170391209ce669f3dc345bdf86efa9de8b2936db6e13e73a83b26e925e3a492219261dec2c0dc35397b4de2533846a39d5804e5876";
   };
   initials = {
     revision = 54080;
@@ -27186,13 +27283,13 @@
     sha512.run = "b98b83ff26b5ecc9826f111d9faef5aa0f51ebcec7978881da2a61287af7aee022dc1b7812ee457885c7813eee0d2200d250ef45648619f3d105e2df54cd21d0";
   };
   inlinegraphicx = {
-    revision = 76924;
+    revision = 78043;
     shortdesc = "Insert inline images, with automatic size/positioning";
     stripPrefix = 0;
-    sha512.doc = "c02b75a9a66bb98324f851b3be049d7f333dfd70f243ae253320fdd62a8903618f095dce07a5ba4fef7f6203d7e8804b7a9b3e6326e0f7e161df5d165206a27e";
+    sha512.doc = "ca53c30ac2f1f2c32da1357579037832e85d8ac351647ee0e08e6d0c0725d3716c88a697d305d9f86a9ab683c63c48615682e69576f3400d2033b85b30b947ae";
     license = [ "lppl13c" ];
-    version = "0.2.0";
-    sha512.run = "47dec9eba400a8c376ee9902b004d2ccabe079b9f840aa8d3cf2deaa7bd87a9c0fd77780641b6e59f93103244519a9dc478de33d7e4c6ff8247f5d5a40749c7d";
+    version = "0.20a";
+    sha512.run = "bffa62e5ea720631be86c95a3cc010da0c880af883d26fbfc3d567bdc0d7ed9892cb6abeeceb8a0aff07cfa3ebad58a4c7492f81a0c060aed031a9bdc57aa875";
   };
   inlinelabel = {
     revision = 63853;
@@ -27214,24 +27311,24 @@
     sha512.run = "91abb86ac221d0cec84890fae7ccaeb0d49858be5bde4d5037f17cad4d7adcc8addb46b79029cd995b15c5ee388eb1c3b027054750e64582a43cfa790f0a1ba5";
   };
   inputenx = {
-    revision = 52986;
+    revision = 77677;
     shortdesc = "Enhanced input encoding handling";
     stripPrefix = 0;
-    sha512.doc = "087bca2b38a73530b19dba7343cc488b39ab505ce00b4c622f56f9d40c448e6349052e12358cc8fe6d8db7039c6af4f06910784795a2cb1e69b85eed423d1314";
-    sha512.source = "a633d0ba777e0342fe99d1ee8d9c955fe159c4a881f31c46fa205078c3b1786edc2025f58ac88b7dccce0c6bed50e8f44025ebd43b28871db953a34e54b3aad7";
+    sha512.doc = "1e6d9a4bb0d19e73c18d71f70b797bbf217a9988cceece9dd255294528a6fe8f92fa6e95a976b0ddeb51a9ef9fe893f96a3185019a8be617649774d02c825bcf";
+    sha512.source = "e4ff0f3911efc2a2a16def3d4102d94327c7ecbc043e6dc45cc87c8944ffd07c9a3fe665fdfd8cd879309665db10e3bc59941c86cdd3d6246f64aff88298adaa";
     license = [ "lppl13c" ];
     version = "1.12";
-    sha512.run = "5550c1d76a0906f47ac3e2303fc57ef9ad1c8442e12e3522826dbe7fa8c971c7ca4241e0a1707f6e10336855eded20e94130a6db212b787383282326aee8886b";
+    sha512.run = "0df35ebd1114484250721bd75d0f4a60a07241552b0944b24a01e6558dba1513ce187fb8d121203d84c5000d4ca3e8cc6dcf820a93be022395971061bd475b39";
   };
   inputnormalization = {
-    revision = 59850;
+    revision = 78116;
     shortdesc = "Wrapper for XeTeX's and LuaTeX's input normalization";
     stripPrefix = 0;
-    sha512.doc = "ade22bfe8534389f117f0f99dfefd7e27f84ad653419929ab86ab045ff08c1d08952178c6c8d42b3b22d575e371ad4b77c2efda436e4b8ff89dad2bcb67c7d65";
-    sha512.source = "048bcdc198cb028863f2f3f30366ab209f18fa2d3f76cf42ebd795cf34d92734e617fdd7412c3f5e43127a4853f1f2b3fe928c8cd554b5e5fde430b5c9170d47";
+    sha512.doc = "8b72fea0fe31b6ae3a93e15eb92e3c05691b55529a6e2da3a465eebdcb1b80271cc26968bf5d0e21172fc54cb4879d3ae7d98851de5296e0ed141eaa1a385b88";
+    sha512.source = "5cc002541f8e7e8b59522f54c7c537043c333be719a6b31ef5682089d118b240138d4f5d09ee7932512df761a566c99bc353beba8e56dbccdfea27976d8af295";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "ea1b93d71757875867fb9d899399ad5cf95d2a0560b3caf2569d08480f4d65dcf4a963632dd27b1e28674a9b5c6496f769c17ae08494a6c37ca2d0e6a8fd8f04";
+    sha512.run = "c58c3c4b1125f6bff28b1f6651461c10f582b058847da459a4dc984167d2c8388e8b7e3ff00d98d4cb14431ae4be9dd75f274222d6fe510c8f3c296f6cf32865";
   };
   inputtrc = {
     revision = 28019;
@@ -27244,20 +27341,20 @@
     sha512.run = "e6450fbeb0f9033b0bcc586c34f5bb8e9c3a6aae102c15912be315d14fe883b8bea62a59a4a65d0ebbfa9cebcc518b9dedf59297f026423ef14aed2c0a2004ab";
   };
   inriafonts = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "Inria fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map InriaSans.map"
       "Map InriaSerif.map"
     ];
-    sha512.doc = "352e35b1b748f502db20c76f670c8eb6d02f672ee743518113a7b7807678ab45f2a628980229d8dae67df0dcd3581a5a28492adce8752a1a5f914fe550bab01a";
+    sha512.doc = "179c1caf15001d26788fb83a6abe478f71178669501f3942fd4b618f587b8c40292ec1f64a51b9b3529e90f8add5c7f6525ad00c4f66fb243f287a1943a39813";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.0";
-    sha512.run = "9c960dca72d433a5ee20b2afe843b92fa98060e67638676a8e92ce9c7dde872be4bfdda6be7a76ea90db97e51784db4487ce22c79cd110ba0214ba54bc8fbe18";
+    sha512.run = "e0ae2c6ef7a5aeb42f9ec1bcca2173cdcdb60815715cd8f59eda1f563aee7f6d6887fcb8fa49f3ccf31db30113fd0372d8c7bcef1e641e69ce7261689d4b99f3";
   };
   insbox = {
     revision = 34299;
@@ -27269,12 +27366,12 @@
     sha512.run = "98398c838689cfe22ba859e2983f374ecf94b21bcf46de362056821af31285754717f7b2169f8bfb6fbbbee849449a1f3caf52d1397a901133d0364b392654ce";
   };
   install-latex-guide-zh-cn = {
-    revision = 77231;
+    revision = 78232;
     shortdesc = "A short introduction to LaTeX installation written in Chinese";
     stripPrefix = 0;
-    sha512.doc = "e164eb3064b5bcb6d5b9ac070c15d18e1bbc6b224e47e17fb5e924caae5812cba3c376aa0140689c2a8c5e34ffa5117a38aa5c6e0912c180702665121056c505";
+    sha512.doc = "583438c2aec15e2878a777ce4a3c81490990e56af40a134a11f10d9ec766264f941ad2f369df6ce15e7071b742165f3b5b0d8538c77482b1cfdacfe8852104be";
     license = [ "lppl13c" ];
-    version = "2026.1.1";
+    version = "2026.3.1";
   };
   installfont = {
     revision = 31205;
@@ -27288,28 +27385,28 @@
     "installfont-tl"
   ];
   intcalc = {
-    revision = 53168;
+    revision = 77677;
     shortdesc = "Expandable arithmetic operations with integers";
     stripPrefix = 0;
-    sha512.doc = "f3cc5dba031957d77cdf39d902eeda96c8405efef52352109a7bfb187e363321d31120b4c66ed4b2e990fbd7085b927599a0956749e4303611cdbec5d9d7179e";
-    sha512.source = "c3fc56d3ece265756a6c19684e7c2f9717df7f65176a640bcf6fede941468c8a426abb610ebf9955de920adaf2c96165f91f7314f48701121dfc4381f921d42b";
+    sha512.doc = "0a12aafdcdd557bc2427e0c183013daec943e3a774dda68dfc1a89b721e7fd794f11a4ab917eb8bf72c8d3f637cc4f7a86cf1f997b94e0de4f28bdb1cdef2761";
+    sha512.source = "a363d77d17d1bf8dac3103253f6af782ad55a50a55a92f710581560c859b5e82a06e0b4e16b0a27c404afe332324f6b71a0cf2ca8a488742f55180245f2b4a6e";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "e1087a7ab3f1d695bc20435ef0bb2b806d1cca71eb792fcf46e6c2fc6d819de2ff623a65593b65d5bf228309e3e3d5210ae1fb1452356f97a5ecb45921a7ce0f";
+    sha512.run = "35cc89fb58761ae3afe91c11cbb4e4694b48baa80f06dfb00fb347b0252238d18c10d7ce2db8f0cce761d655e62da88c3fdc73dd4d5890784f8a69604fe5669f";
   };
   inter = {
-    revision = 68966;
+    revision = 77677;
     shortdesc = "The inter font face with support for LaTeX, XeLaTeX, and LuaLaTeX";
     stripPrefix = 0;
     fontMaps = [
       "Map Inter.map"
     ];
-    sha512.doc = "64260a91b781bc0ca36a73e1b44ffc34847b26b977a950cefa27649d7382e9cb9d34f70f982831912489d86e343d4abfc81ae0d91302d3276aaa5c8567c3ba42";
+    sha512.doc = "52dd4bbca9f4e5f7957113ab317f20a803c50d4bb785242f5df9d243bb7f8d030b8f1d71cf81fdfaadc5c3aed1592edcff312bf88f593ee3d53b3e0e6908afb0";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "3e2799fdcbb3648912d99ae0fee49b3e34098204e742ffd8bac5fda212f3e452606124e5503f99a52f7f647b54c31858256e7e1dcee4a566f3ca8e9d5aab5eb8";
+    sha512.run = "b1f929a0cbb168d03b7c28bb1f00a06c2ced17222c0b1881eb64c790f4f9e026ab1246bc2510c4993e5308188551def6b842fa20a857afc666cff06ef059b60d";
   };
   interactiveworkbook = {
     revision = 15878;
@@ -27320,13 +27417,13 @@
     sha512.run = "2afca3ee8051065d4014cae8ee751f085abe6e62ea0af7d6c036bfd9ae6c3f38a295857d67c7e8f75a049fd618c82ad8b28a66f5c83a387969549cbf20ef159b";
   };
   interchar = {
-    revision = 36312;
+    revision = 77677;
     shortdesc = "Managing character class schemes in XeTeX";
     stripPrefix = 0;
-    sha512.doc = "c36dfea3f3f62660cae4f4653136269247bd109931b2eb6478eba29af089d42b6ea9f8afaf0c345c9364a68c1645e288d289345e13c8582e1639edaea20a26be";
+    sha512.doc = "53f8a3002fe0f86b5dc8e9998c47a68bbf47fa72256227052f7cb73a1e35a3aea47b1b2ef1354b74a480ecf2d593f2ae9b2b827ee3aa892258b4f8ce05e6b274";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "8beb2e016e1a6af0199708355b8f13aa1accc614135cdf1d6dd534eceb6fd5a8d9e611e4d6fe0d72da9effdef446549b01d5ea2aad043f3fe94b81fd3d4aa188";
+    sha512.run = "d00108f2eb7976baf3614754a6345b943912a5f248e2a2183e3adfefb55c2bc575c58826f22ffbf57b9c68ee545704374fcf31fd2d96bbbb123fffb4ee07ff42";
   };
   interfaces = {
     revision = 21474;
@@ -27365,13 +27462,13 @@
     sha512.run = "6dbbf39f9f0f357f45ae275458f03abfee625720b5f2dd3bbb5a78f60f4c0e8972d153c8d1647f147403f7c665e25147fd0c576cccb226a74630348a9f0a7381";
   };
   interval = {
-    revision = 50265;
+    revision = 77677;
     shortdesc = "Format mathematical intervals, ensuring proper spacing";
     stripPrefix = 0;
-    sha512.doc = "22dcf2288d7f888e76967209ef1fd31bef66dcb9784a45126a945c4a0ea302c67ab4a35bd864355b29679131cf2cf36fc6172017599ccf3025c4ae1537362b9b";
+    sha512.doc = "ab8ca89221fb4dd7e48d6a5c189d75de5970fd3b3fd534ccbad73de6192ef9742d56649d32abb7daf537a2308c9a369c6da9df6b6d04d108125265a9b7387619";
     license = [ "lppl13c" ];
     version = "0.4";
-    sha512.run = "2a2fe0ebdc4754ca74962270ec48c69e6574c13e446628f34604b13584e7b14ff33add55744f03a1d28443b5ae87ba79926816bf44781951a729913ceeb4d6c9";
+    sha512.run = "1c09f48ca501e8147d8e1fb4621fd914f0982af0e8f301104186ce0a3a888ef09a265cf5ef1f2833133933819c7db7ad4331a96a3d5ccf1326bd2adf49bcb42f";
   };
   intexgral = {
     revision = 77252;
@@ -27384,14 +27481,14 @@
     sha512.run = "954af096491174ad50a516f4dff62b0e102941df4291d123c5c8e4820f4b15e7dc6e348082b68fff1f9e8745d9932b6fe43086dceccabdef0a50311261d283b7";
   };
   intopdf = {
-    revision = 63987;
+    revision = 77677;
     shortdesc = "Embed non-PDF files into PDF with hyperlink";
     stripPrefix = 0;
-    sha512.doc = "07abc35842c8170da6763d070180f63505ce5fcc98ec9966b3e0b7502191ad267b4b6b0a9bbc6fe1fe037b0eb6e249c9ba9080669abeaaadfaa6be26ea86e5f7";
-    sha512.source = "ab22656c6f47d03fd416e7340438a1c57e9ec1bcf360ec3224aa7c37859b1210807c3ba7b94d9fcf7e4a6878c9874332d3bd030cb7e1baf3f05f10077169d75b";
+    sha512.doc = "c9e40435e446d20fa9cbc2d4203d3b7fb24fabdb4b018d233d27907bd3d28817dd74ca8a99c17cab5db8b3033de1b0bc2f11972227cf90349c7a05f405af4c6d";
+    sha512.source = "e6951f28a669a89f1eb20428735715659d9715ffe0b82d1e26c731c444a46dc2cc5b4d37632dbf32181c6e4844505bfc5e777fab5b5645f87f4bda8071b5ec59";
     license = [ "lppl13c" ];
     version = "0.4.1";
-    sha512.run = "77477057b8c49400059eb2ec0ed1ec6ab8c5b80ad661871c5b179af60abd0a5904ccd1faf045951d83e29aec560a77188c8468cb9f854ed28676ce52c3bbbd83";
+    sha512.run = "54a72b77ece6ce6f68cba856e76ae97aae5eebe0803e6ab3b0dc1739544a800d5764c94e9843207e4589348bc5e60465c7ed8f5bfdf188515c899c6ea8e38dfe";
   };
   intro-scientific = {
     revision = 15878;
@@ -27402,14 +27499,14 @@
     version = "5th_edition";
   };
   inversepath = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Calculate inverse file paths";
     stripPrefix = 0;
-    sha512.doc = "a9dba77a8aa851a5e915e368c5090fc83fd894c22efedffce97ee0915b4ec50fa72efc30f377891b5efc0749c12018228ce400cd4024369cfb81ff3fe62567b8";
-    sha512.source = "de5bfe7ac5967f4ab02dd0931c5799c6c68c5c7a57d8b6c40a205e76546d8a23a6ac6be292c6a1cd4c8475bbf0eb229b6d198eabc66a17b2ea4b0ffd0c798323";
+    sha512.doc = "e7f703cf2354d67104875d2410e5f9443d35ebca6f539488dc75e1fe5abeae385a7700f51ff690968ae9e8bf9914aa77d8f17e36c09ddb6a75500c55a2eeef93";
+    sha512.source = "261e1f2cc9995ff8e1b6280e7c9eeae40ce6c5b1e50b71c7f2ddc85465f640d59a8e78cdb37ee71125a6743740342b99681fa547300ae16177329eb330b70e26";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "d0d95399067922172799d17cc9b9b4fa7a79cf2928630c63441114c479bc60e72b3e5133b54f8f7925cbf90f5b419c89e07699ecf8e8269b43f969e584698043";
+    sha512.run = "a562731ab4c0d5a3ec0b7c0d274eb842e322affe74f00e83c4b43249b5c7c16be7a0d6649d19167ab55b54260e810da9fb20bf66b3a06080a3aca4721dfa5e36";
   };
   invoice = {
     revision = 48359;
@@ -27551,14 +27648,14 @@
     sha512.run = "40a36335c15b453d2e5b5abc29b2ec1891c6f1502ee2f8ffdebd2f9a159cea3aa28eba7c661c12a0445a4f713b77079d8b965ac955123fc81225cfd4491e5317";
   };
   isodate = {
-    revision = 16613;
+    revision = 78116;
     shortdesc = "Tune the output format of dates according to language";
     stripPrefix = 0;
-    sha512.doc = "75118f62de8568c9826dcc11b753511f57b7fd237cac6aab1c75377121fad2179c81ae5ec5f64ec127a299beb88abc209727d17b1ded623718c7594bb7ca5da0";
-    sha512.source = "43bfcc11aefd2c68ec96cf05f7609cab4009f960b5220bc15d982ad384e062bc42a791f269d5480bb1582ceda68f8c7d36e1308129aaa3df41d25d35cbbb96d2";
+    sha512.doc = "050b3df06bd67989a3d0f38af5e225559abacd0753075a94c7b1d07080d3ddb9e09d1f9c637e90e8b0b4af9c682665d3dfb3d9db3852e60059f947fe253bab48";
+    sha512.source = "4a9dd07daf5b39ecfeb9ef4ed78a3f57ae00c63dfd110d8028ddd0e338b41d9dfa8feb0008dd29c2c95029539c143a164f7e30f719336e778b17e6d1ff2a7e3a";
     license = [ "lppl13c" ];
     version = "2.28";
-    sha512.run = "5fa145cde64155e9a4ca7236cf41449169ce0d1aa88381b46935641ed94d166429c1b139c852f96526dda270fb85736ca54e8864c32452996109b0061003639d";
+    sha512.run = "f354a1884be636bbdb5912733a3f0bed2318e47caeb3a123c78c229d4993b0e5e9423568a747906d6d521fbd3b8654efac1b21ee70cec3395a79aac830b89157";
   };
   isodoc = {
     revision = 75787;
@@ -27665,26 +27762,26 @@
     sha512.run = "73770854d45bf404e874aeda0d0bc95dac7ba266cb012fe4af7c4e7686c078b1314500ddaa767b1652e9b05b02691c93cd24b34d6b145fc30c0a3f56693f6a17";
   };
   iwona = {
-    revision = 19611;
+    revision = 77677;
     shortdesc = "A two-element sans-serif font";
     stripPrefix = 0;
     fontMaps = [
       "Map iwona.map"
     ];
-    sha512.doc = "87128ca46f7f2f13f8f886fc1c3da11f17636637632c0d39ebae07dfe70ec92024e1136da7a736a3fc8d494e856b86407ef9c01cd54a56fc2e41372bc0f1c4fe";
+    sha512.doc = "650a01e7432380eb2124547c0e00b63e5a38cd52fa6f4242894cfe30132ebedb853403290dda4ed62664a86aac922a5d1c26a98c51d8c96661113a8b71c3bcb8";
     license = [ "gfl" ];
     version = "0.995b";
-    sha512.run = "2a125919a015c82e00bff575407f02a6c9a176f83a6017df682b98af55473e7e36ca0a94ff27091a3a4279d42fea9c49f0d8ae6da7e852ae9c44389dd5d8f7fe";
+    sha512.run = "354e4d877a493b45ee48382bc12ce0da96cce046c2a5b7e7d76c1de39fae434f2ea63325f9fce9400b033b5ca0327047ce35812d825c26d4cea7a664e5e37b75";
   };
   iwonamath = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "LaTeX support for scaled Iwona math fonts";
     stripPrefix = 0;
-    sha512.doc = "03f63a1972c10e2f808a9af4ec177f61e8da49442f11d3ce05aa47153d0b3a102ca500bcb716cb7121f12f044907ee77fb128e0d7fbf782184ad94d722ab7428";
-    sha512.source = "b0fdc11080b959e478f7ac054182be547020887e830049158318652bfbc36dcdcaad16e37143596f915685c1565a9a2df38c57bcef124238b9938b756d734ace";
+    sha512.doc = "b465b40f0799485648fdf34259fec4f28aba7ab1d9badf57e606c6cb0d83b076496cfd080ea7f08941033dbd4f7a0260ef9229a167d01344156580198a16f599";
+    sha512.source = "b1b77014215a50454d15ca2216be214dd7cb5c8c3748159b500d528b06e42ea8c277415056ec6b72f79778f2fde42aed39a05cb58632e5dd74c92bafefe82894";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "c09a22b94fd960c7105a8c2f974082890ea42c83b2f101f80ebd87469dc4f63001ed186d349e5611f5ca19dfa8c0586d22e28b8c187571a8989180344c4f6276";
+    sha512.run = "08098e6055bee879142d2eddfdbff528b7dace397670f0c8145b0f1f96a5eafc036b2f6da229693240fecc1809b3fa741ed5d074c0fa49dcf6b952083effd2f4";
   };
   jablantile = {
     revision = 16364;
@@ -27911,7 +28008,7 @@
     sha512.run = "35245333f0ad08ba0772aff54e5ed1b252ad1b1d298c55934ade4a0e33dec29fc67adfebcce22f10b61b9469a2a2d208c4b9977519271457f1538c4bba8bce24";
   };
   japanese-otf = {
-    revision = 77048;
+    revision = 77677;
     shortdesc = "Advanced font selection for platex and its friends";
     stripPrefix = 0;
     fontMaps = [
@@ -27921,10 +28018,10 @@
       "KanjiMap otf-tc-@tcEmbed@.map"
       "KanjiMap otf-up-@jaEmbed@.map"
     ];
-    sha512.doc = "a00865214ef7b2da61506ce9ba0302e0cba6f0f895eb80bf0e851b1c7204afa719da69ae2acdd010a59132298385d741de061fa99841c21eefa6b2fcd74b85a0";
-    sha512.source = "d8577ea35bdfc1eea6b3a7c9e31140a172fcace7b25ada40946f3cf4f58692d67fc9c7fc1e2364b0ef3bea01773a35ab47609fc4c9e314e8ba80adea7f7a9759";
+    sha512.doc = "18acc7a28a5a3be81cefee56ac8845b54aa01e599b21dbe082c8c93e281788106961df4148b218072a0d92745225e3005f459108e73aa93fee0dc8adf7564118";
+    sha512.source = "667eba2e40aad82b212853aa513080403f8af0242471b46505895209b8de7dbdbd72cb0ea79dbaa3ec75802f0eeac5715ffb0c40644e358cd72bfc5656fa7fc6";
     license = [ "bsd3" ];
-    sha512.run = "b74f9556b8a5f8d568849152a8fd891b8134a72ee3796b84f77fb2cc3fc8182fb9de98b57010bc282bc658a1d882eac2c2076fe95bb86e8e149fe5cdb389df64";
+    sha512.run = "a725b1ca28c5d50a61b798725255f872d19978b4877a4fb43e9db143fb079d0f5e915837673fe989095d4e71b88f6d52be1a477cb2ef9401adb4cde628a533d4";
   };
   jbact = {
     revision = 76790;
@@ -27935,16 +28032,16 @@
     sha512.run = "4dc89f69b09e35492c1d461b4e4a2869c42168aaa038d34c75ed639cc5ddd7ac815848637e21c9697042c69fc7bf35eabcb0d378dcd6c52f796a83e0769104d5";
   };
   jetbrainsmono-otf = {
-    revision = 73401;
+    revision = 77677;
     shortdesc = "Package (or only fontspec config files) support for the OpenType font JetBrains";
     stripPrefix = 0;
-    sha512.doc = "bd3938003fefa2ede545e93ecd80d8391d683a492fd57703ab1008b5172c7a7406dec934eea2c9af663ffb391229e4e6603c4939188a335b959f54775c80d8ac";
+    sha512.doc = "65c474a1859794cbc625d1a8e9ac10063393e087a31a4928182867323716feee22846bcebc2a11d85b4db038a15e3d05b9e3f715fbee378060b525db8e8a5f90";
     license = [
       "lppl13c"
       "ofl"
     ];
     version = "0.1";
-    sha512.run = "1929e57cddc67a96d5a125b322ac40d3d6fec54b5361b0866a84115566785b11001fd27171c470291dd0601d2d03a105320a470f11de8d16ca68cb0a32b1bef3";
+    sha512.run = "f2f8d85b641e34bd956e2cce2bee1873e1ea37ff6ec16189b97a3ccf2c1976b753da0a1efbcad70c14ab7c0aa1e2d883caab43f54c008e8545909ddc8271e8ec";
   };
   jeuxcartes = {
     revision = 76966;
@@ -28023,13 +28120,13 @@
     sha512.run = "5077471a09df4090e087a465e9d1823668ab80f088a7d5fea7d14559e9ea8906dae029a2093038ce5e9f013bbe3a9bcd74d8626e6ccbcaf7ebedd5c2f1e3521e";
   };
   jlreq = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Japanese document class based on requirements for Japanese text layout";
     stripPrefix = 0;
-    sha512.doc = "13dcfd5095cb28c4fd23b41360b14b0390a443a4307b5b8d49eca5d8813ad9e6b1bd7d593b7828428f22590c22304a52a670dd9190ca0c395d88d9715ded6260";
-    sha512.source = "2949ed5e62e5dd85c5d2d7790e534f893617f2cb8cf8bb9da1b72cd7dd6d14f290a53c0e540516ddf5d326729e5cd1743e3ee409017c5f8c6367f788d2437e10";
+    sha512.doc = "15782c4f7fe6ab669a65dfed62862c9b3dd9095e35e64835263b61a49ca52ff7207d2637a15e2759d2b312373b3a3e8c9ba8e687dfea07f193bb952508d9b837";
+    sha512.source = "91f88aea52565b5684a9f22cbfa3e7c886aaca798cfbb0c4a7c22fd039fc984392699addd886f467f88b2f55e58e59898e00003cce9cd86ed88dd0bb2cbe5e6b";
     license = [ "bsd2" ];
-    sha512.run = "63c83123f60dcf68a6daa38c92b91b4b0576773a9831af728863cbbfdd710a72e6477fbb1be09653cb095d3036f131db91d07c20ddeef884d45a3e22d2acfaf5";
+    sha512.run = "32b41a8c72332dadffba1d432d45cc635e7e8fa9c37e5fb348a2f47eddbbe0e10d79fbfc7e49d43efac611e7e6f65a4698a36cc8bbdde69fa28b8ef5fa90e08c";
   };
   jlreq-deluxe = {
     revision = 76924;
@@ -28041,12 +28138,12 @@
     sha512.run = "9b9b1898d6ec389ba5055f68eb3c3b5f13e3a72299d9bce087838e3fbc1214af855928c6f0c3386966b0b0b7407747a8506e80a266908d9552595ec96f2ee1b4";
   };
   jmb = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "BibTeX style for the Journal of Theoretical Biology";
     stripPrefix = 0;
     license = [ "free" ];
     version = "1.21";
-    sha512.run = "9781e0b452ec977a07a8f4dd48fa176f5b35188fb5bb92573cf4a7f661b1ee9c58ad5fe5a2dc0bcabeb3d8ba2743aed33681befbe44ebcb912f48fc0f1111e79";
+    sha512.run = "4436738387ee604d8e1e5f9fd6e5320d26c8b11827a8b77ea00c9e13a9b5e77df3d0786f2dde9105eb311dca0266c376fe306c28be2d4e9916c62f83817fd525";
   };
   jmlr = {
     revision = 61957;
@@ -28112,18 +28209,18 @@
     sha512.run = "d98becdda331e1ba15e967bcd7eb79d1e3ba60e8ae2746b89ecddeaa45dbe35019de0d6207c4cc4c85944ea84b3cf3b77811d1fa7a5f96ac50d521fc317c5b8d";
   };
   josefin = {
-    revision = 64569;
+    revision = 77677;
     shortdesc = "Josefin fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map josefin.map"
     ];
-    sha512.doc = "cc41ce980515708238256db38ff05c74a22f78ee5a8f4dc63d68339a064799e1beacab7be71ec15b2c97a6d9aecc7a39064fcadf4d7c67ff172eb9b8f7a939db";
+    sha512.doc = "dc5a420cecd81ddf60ab9e4a22a224f8642c065f8159e31741c5a7e1a63d14c84c9be716c3ce3a2846d340f3869c1a6b141d21f2deb9be4dd7f0fce2e1d518f0";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "6be43db9172d51a84374aa836cf9e2baf02f087336685a37c321449ba06461f08b08a8d98c12cb3aba0dbc9c0e2e8b3316362f65c7393b9286ab50b11f70174d";
+    sha512.run = "347dcd9a202c3ad30bd724602bc2a190fe3e53e2e694bd0f80066ca3198f65fdc30c87c5e615f5b88a6f4090d8985fc3972f135fb9b0e52fbfe2e6406bafac98";
   };
   jourcl = {
     revision = 65290;
@@ -28177,31 +28274,31 @@
     sha512.run = "6dd7920204cc66ff28c78f54bd6432a71d77ae2f4463bd997d2a4170465053eb86d61bc35d8da66377b47cb1eba88c6ed0918142910a5bdd4e44aec41d3ec4d0";
   };
   jsclasses = {
-    revision = 75174;
+    revision = 77677;
     shortdesc = "Classes tailored for use with Japanese";
     stripPrefix = 0;
-    sha512.doc = "4d64c9cf68221436d9c5d6f4310a619327d8ff223c3e8a63729e501ee092345d4106e8d74aca9f84ef1729f2a040965916bf0196d32511851a4e4483f93b6f43";
-    sha512.source = "a01e4706ea5d947c653ad73a030dda12e605c766c1744a746a1bb15f715dfabaaef0834eaf8304ab7048932217d2738658a7de20a9eb6d2195f48e5a7e451e68";
+    sha512.doc = "5499186b0260b8f9bddd6a02cf10961734173fa98984b16f7acc28d7630c72336362e642792b617e61318a47c84e3e31177173117851ade3e5d87e4015c76305";
+    sha512.source = "73793cf36466b626a2bcf5ccc8631a69456d36a1614f9e08db5cd748e6ddfbbde010ebe2d400e17a08283c1f7e01dd434428c9b4001df2e539f1b37e9451d8ca";
     license = [ "bsd3" ];
-    sha512.run = "1cfc8fbe88731a098e83f2107d4a7d719de134b49844037d82a894f534f4b5f0ab60d2e613ed30ae2137ac82a6d281fd10e7352ee7eff51915817639edffe8ed";
+    sha512.run = "56952087cfc51a7485ecf6f4ea079772620a89cf9cad1d2712941ebdc68c947881b573b41c3ded441683ee972722824281f7130a916b56f9e1015f61f635c6bf";
   };
   jslectureplanner = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Creation and management of university course material";
     stripPrefix = 0;
-    sha512.doc = "f93b097c6c6028d7e8d321f69cb3a4d40884a75a355ddb3306a01f82903b43e407ba2aa0d65679989e65f5c0cd36183f6a86c1e0f9c4152f8c2ef60527c628eb";
+    sha512.doc = "b9f87d4469e0cf6297343783b6d64127c13dc907f083e2508ba9a0bb0d874c5543a0cbc6fbbaa65251b474ba693aca976f9a4abf0b0f20eb2cd2116bf9e40ff9";
     license = [ "lppl13c" ];
     version = "1.15";
-    sha512.run = "db3a7c59513ee527bdbbbef69f665d7bea67bb6aa1616e71df3ac93da2d0e09cbc3e02b291fee7b41945c421b3cb53699296e8538ed789065efed441e2f7f2ba";
+    sha512.run = "4923bcededecd78583a1a0024a5610645e58a9aa1617f000b2dbce00d78e1ccf55b5e22395e98f2bb7faabbc5d38bd943b07fba051b70568383ad87c8bdd42af";
   };
   jsonparse = {
-    revision = 77545;
+    revision = 77677;
     shortdesc = "Parse, store and access JSON data in LaTeX documents";
     stripPrefix = 0;
-    sha512.doc = "0b5a603c9a0c2b9106dc018d9cc39a96a16e614d8f40f0c30f1d5819ca3084e87467ab3bcfe41585d88894645c3e30f16f66306f10531bac5dff5346782368f1";
+    sha512.doc = "5fa3c7ec8153e15ef23b1702d6f572c1e19d83a7866e3de526c7da71fec173f4aca5cee15e81b95e5ec21d9e1af107cbe94cab957cf6ba99f163a3f0a2f3b1c3";
     license = [ "lppl13c" ];
     version = "1.7.1";
-    sha512.run = "a7a3e9356567ec93b504ac308f36a608493fb6551fc092b58f1e56aeda97b02994f38481046839bb10c6c65078e4b624b6a042bf70046eb83a8604f8ca3121ca";
+    sha512.run = "db57dcc5e79072bf1e4cd838acdef540a36812db7a8fd50bfc7782cf7ee4a2cf45be9f55e53f905cd80a6495ee52de5b5de6684e99443dd39a68fafc74432535";
   };
   jsonresume = {
     revision = 77560;
@@ -28213,16 +28310,16 @@
     sha512.run = "43d403ca9436709b1e3ffb95abb80fd82ae5cadd010cea80f55200ee60ce88540d9be3a4be7111f784f8feb93e8cac360564e2aa69b17571f0d3c9feec8194a5";
   };
   juliamono = {
-    revision = 76734;
+    revision = 77677;
     shortdesc = "Support for the TrueType font JuliaMono";
     stripPrefix = 0;
-    sha512.doc = "2028be1e5804a4251e345c28919495039ee234bde0a7b4bbb82d9abc96850059bd1a7ec203ae5c80626cd2a3e94bc8aea1ebe418993c6d92075e9914c6c91d87";
+    sha512.doc = "ff05c723fd15fd23896d0b77127380968227f2349bcb7806ac8b38dfd03de3c36168d07d17a25729585604e79cb0d69e804cd46c69e9638c7b916e57cde70066";
     license = [
       "lppl13c"
       "ofl"
     ];
     version = "0.06";
-    sha512.run = "e31c754931eabadf35437353db89ed71dd29bafbc55564e2cdf79a32cb613b674d571916a671ebcb625d7bf91d083fb75a9bc42bb6dab1871d8f00dc6af50a08";
+    sha512.run = "57dc0417932d8295c0be8f42e824d10cfb52b6825f755d69a618d6093d0f1765e19486bdca3531344433675bedc3b3aff165f413b778ba67a2e7ed674ad6c06a";
   };
   jumplines = {
     revision = 37553;
@@ -28234,31 +28331,31 @@
     sha512.run = "e09ee044fe7d5692fe4f1098406e33481ebdf81698168223235e735637499053c66f278a1f7e27585aaa1a586ccf85b4f5afdccfa3ac35950475f56e46324103";
   };
   junicode = {
-    revision = 76210;
+    revision = 77677;
     shortdesc = "A TrueType and OpenType font family for mediaevalists";
     stripPrefix = 0;
     fontMaps = [
       "Map Junicode.map"
     ];
-    sha512.doc = "5a8fdd745ea94c8fe656080ff6d59a3c3eab3f9a0c6073e52f84980c67945c96816ba53b4c27209810591e1a7728cd8bc0eafae913269352af05bfac275cc362";
+    sha512.doc = "e4787d8ec7133e68f4aa5712b82c7744eceea0ee688ceb6f1406284c7d59383493cdbeafee538b387bee4d770d792e6d3b20fb1bcd698baf3c6443a63f84ac3f";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "2.218";
-    sha512.run = "00978589d7d0cf1027493fe13e2f14626f7f3d2c2bbf76d427a4bd854f9315e11dc71bc63e660eed34c9e92179e5abefbb55f3464c3eac7ed975a3dda6838480";
+    sha512.run = "143ee084f0962b320c194ca99cbc89e63b280f1d663f7877ba9998670456f57b5d9367fc9283c13aeb4813e3e95e2bec12b2cd27bb8af548e740c263666dcb8a";
   };
   junicodevf = {
-    revision = 76209;
+    revision = 77677;
     shortdesc = "A TrueType variable font family for mediaevalists";
     stripPrefix = 0;
-    sha512.doc = "00772727c71b2989a60bcf9eb2530d763727e799ac5610fc8fe99529046fa5ece835fe7a9c9908944f406b2ef178ab5430e8c2bf7fc49b796e61757fd2bd0b48";
+    sha512.doc = "8813093c83f7ffc80739ef3cf662c8580d41c6db13c207959d797360cc83bd9434e415639fe99a09acc575091c368c22ed956b8125abf0d4cac73f3e394426c6";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "2.218";
-    sha512.run = "d03c5ba94ebc295785c78f4526f12a52066f0293cf82981f2ff9947e43cba1db99b8292aeb92dee260210bb9473d66f5f4163c7565f56db4b432cb1174939f7e";
+    sha512.run = "6b38ba4179a14fa90ee03e6ead1d7598b43b892a8cc02be50df73f453cc67395f79fb30f93ac106bf0785d459d3bf9f3cee68e57a9a3941c4f17ef8060f1ea9e";
   };
   jupynotex = {
     revision = 75037;
@@ -28289,14 +28386,14 @@
     sha512.run = "4d6fd00247c6c915956679674dd029048cb96ac3bc97606c0a299bbaff24a4cbb9440d557eb2945151720265ecb27bf15c638c003e1039dafee56471dfa03945";
   };
   jurabib = {
-    revision = 76524;
+    revision = 77677;
     shortdesc = "Extended BibTeX citation support for the humanities and legal texts";
     stripPrefix = 0;
-    sha512.doc = "1162e9f6a922db7bd143f18affb8b120e9fec175ddfa63e0a4a27230d507cb8bfd08b50cb69b7ed1adf554b76ec48be5a80f28a958b005acd007cbc831bc3994";
-    sha512.source = "9dd8498f3fa43a0ac25a395717b326f1341ea8c79b2448ef3873e26ee8314b4256904f3b7db25ae42cffb5963c3b8549276e0f2181302f1e1221bafc7191882c";
+    sha512.doc = "b7737f7e1662815b96f704d128a8ae8207b1e42e6c49d53de1cadcf6afa316b6a05d31a2723c049388ceba596dcb257bfe9afcbb3682d88a97bb8c8b39c1b751";
+    sha512.source = "e8d330d7aa0aaa1ae043f7f4c1b891cdf5c73fd22473d598917202fb726a737d809271c78a466269a1445d3e1f035e5b40b8df2eb9bbe64d63ecc25182c85440";
     license = [ "gpl1Only" ];
     version = "0.6";
-    sha512.run = "e8516857cac9bf522f2ec3b91fbeda326c2abfab0de953e7b76d8121e69faf63f8f2c71299720e119b4996f9ae30cfee197420de2a123584d660ba954fd58224";
+    sha512.run = "073a993de6fdda9bc5a7d5126b47f6d09c74cbb72be1a7c1d63e96ee09a49b218098b280e49fae3784977b3b9d7163ab2a8c06f25d3eb490430e0db44c783350";
   };
   juramisc = {
     revision = 15878;
@@ -28338,6 +28435,15 @@
     license = [ "lppl13c" ];
     sha512.run = "7def0555cf3038030dee37bc9a6c195ce4ed0a775f314263631487fe7496dce84eb3067efc87f091186a00bfe8c2be9eea12a19f29784c525ad8c0ad5317e52f";
   };
+  jyu-chem-thesis = {
+    revision = 77889;
+    shortdesc = "Template for theses at the Department of Chemistry, University of Jyvaskyla";
+    stripPrefix = 0;
+    sha512.doc = "86453d555c34bb1c96f1a285a3886594c0fdf664bd8b6968cb926e120d3d1b15f66b33a00169933c90eb0784c173dbd619c11b87d97e367bc4772b02e7be3978";
+    license = [ "lppl13c" ];
+    version = "1.0";
+    sha512.run = "fec59084fc399f73ecb49b9740b3dea899f17b5406ea73bca196845677c2f81d361d3aa8819e547a39b8c2d31907198754353116b403bbd5d8b8aa1ff99f3a12";
+  };
   kalendarium = {
     revision = 48744;
     shortdesc = "Print dates according to the classical Latin calendar";
@@ -28358,23 +28464,23 @@
     sha512.run = "a9db1fc66330bafc5fc26ed600f1779dce328d6234ebe930aaff65a02a0d740188e73c5f73a9c75d69926323a610dca4b37044e7357a141eae9bb3231fd3e272";
   };
   kanbun = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Typeset kanbun-kundoku with support for kanbun annotation";
     stripPrefix = 0;
-    sha512.doc = "c048f843ecdd4e81fc46718c344a48bf02c5b2034f42d82cd8d5ca54532bb39f7f52289aab520d9569c42bbb65a9d6e2e2f4208aefb3fdb50c9f5a1d9920b653";
+    sha512.doc = "a5758177bcc720416569391b75b2e649e583d6ac2816cfed74812d76a8948b39b2c0a0b1414889fecdedda083342b88f59b8e0e57afaece3c324c74743e7747f";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "0bbd98cd5731a952b1afa55494fadad904bbca95d9a88c37a811fce2868e1bcdb5e3edd7566c2bf1ca99e48b4e0cfbf5dde32215d27ff49c89384da3e24fc7a2";
+    sha512.run = "eb108429549a9170c888e5a723930427675d202097616efcf5393050bc1d2fd1dababf91b6778fd975e7d787c87c0366679e48d79bb747c6409455c5744e5f93";
   };
   kantlipsum = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Generate sentences in Kant's style";
     stripPrefix = 0;
-    sha512.doc = "e2ccc44ef4f27adc5f099531407883bd5f1259bac691fb1a979091c55175a4089f8c14045fa1564e252b7af3d44fe017c14da32405371d6d080f34bc67853ea3";
-    sha512.source = "c972df3ca20bab5dfc3c4cb1807d58c62973071806d5952dac5c914f5af811a9cbdaa0f09ce9b7adfb0de6a747c39d4317a2e288935ec952ca1c61e94d0fda3b";
+    sha512.doc = "3122e15583e84a911c9d5d808142ed9e141b1fe3b5eac89d7c59dd47fcf59bfeb7414a727fc1a21c33bc2cd6235e8545493dd8f184c4755f4a6dbf530f34b168";
+    sha512.source = "158a382119a2c0bda9def992239ddd790713870a857dcdb5ac8cfe902333ffc1d8583404c371d3ab61a90528d1f61476e9733f8f23a10460f05da4cc4039f8d0";
     license = [ "lppl13c" ];
     version = "0.8c";
-    sha512.run = "82f3e92c25272dd8065e013393888099b298ac56ad0a26e0705f127093cd073b209b3a2971285210ffa12c1967d01f4a194b449494009bb4babd205f97942583";
+    sha512.run = "ca5aab67fcae9b15bc611a0cdca52755db70efb9edd49af1170414a08d137f693850dcf291df7ad0227401c2de967478b428485e4407d1e87204639b14b71678";
   };
   karnaugh = {
     revision = 21338;
@@ -28509,24 +28615,24 @@
     "ketcindy"
   ];
   keycommand = {
-    revision = 18042;
+    revision = 78116;
     shortdesc = "Simple creation of commands with key-value arguments";
     stripPrefix = 0;
-    sha512.doc = "b99b58407f5d93fb868bf525ab199c41e07fcf5f31c7a6a14cf68622ef3a34e44d1014e4d34594441144af5c7d9a9853cef1505311928b32a9fcbd41c7bf4284";
-    sha512.source = "44b63a11f08c3bd47ab337ccfa1b0b2737624f77228ca1d745020e2c1ca1b1616c1bfadda1b99c362c0b372bfbdf37d839f0d0457082922a54a66608c82aa928";
+    sha512.doc = "1b9ed1525e18fe5df531c663ba379b46c6c3e9a3a76455936ef85876e8016f6841bf9a67415228ef1a3f73a59dbefea003d49ae91a7c07d370f401ef8194990b";
+    sha512.source = "85b08a69a34a8c1c8641d27e5720d8fec0c759c2346a0e2bf48aba7e78a5a3742272bd0e36d802bda36823eb4841c54b48e9aea17554992a8dd8c4ccaf2f82ea";
     license = [ "lppl13c" ];
     version = "3.1415";
-    sha512.run = "90c2246edbfd199d98a05df336ee228c65f26073f3c95c5ae55c3201cf59453bb5afb95ad367ab4af6b36dc4e0c52a25bb10f80fba265003c701122247be50d9";
+    sha512.run = "c246477c4ecb02a6ed82c8525c4130d83fa307343fd1e91284d756dddcf62218528e5487895eb72f2d2e7ac5122716cce8a65c20921844ccb3e880ef23e16dea";
   };
   keyfloat = {
-    revision = 69399;
+    revision = 77677;
     shortdesc = "Provides a key/value interface for generating floats";
     stripPrefix = 0;
-    sha512.doc = "43771371d9f81311e29be4b7ad2b1876299d6ff4ea740e9cd759a01701665bb6bd37983828238e13141e39c253b6d3d92b566fc97ba2944d7967cf55e492913a";
-    sha512.source = "89f10c6c68e6941de535abfc4e86a0e019a1bcbd2cf10f0fa542adc208f5ee8c1c7884f679d87186c2103b4b1f69b36b50e3c73512fd9209db1be4f5c87f05c9";
+    sha512.doc = "9204b46bdf93113d21815811b0b5a3e4d8bea20346abea29f76b3157202d704a307e1440dda91825aa6e2332865ecb002ae940c145d14f5dc1744b727f9ca267";
+    sha512.source = "1b17d30b4206654f2859bc05fe4959dfacd2d99812983e77df1a476434405d17d93d9da3d422864fb0acebcf155bb04342f318af6f5b2e2fb313ec90a0572ca2";
     license = [ "lppl13c" ];
     version = "2.09";
-    sha512.run = "b3bbbe74c5db4eeb1a74d49e0fe9608df347921caa0814faca8eb62cad674fc3977c7af1cd58849fe6abab5a1231b4ac3999d5af7aceb7655f12d883e41148bd";
+    sha512.run = "0b039bac20469cd0430ca69a56fd7fd856e5525b7771ee14442c8e887fc84bc186e10d399b479ff1666cef8c6dbc871fff5e8a6e36f44cadfd27b809d2e0203c";
   };
   keyindex = {
     revision = 50828;
@@ -28558,22 +28664,22 @@
     sha512.run = "d1786b07a3dc87f94248043f0bd941dcd8dccce29132e67118d3fedc0fe207a2df846d850851217fa87ed2219915719e70fa73ec284ed420072654c578ee0b3c";
   };
   keystroke = {
-    revision = 17992;
+    revision = 77677;
     shortdesc = "Graphical representation of keys on keyboard";
     stripPrefix = 0;
-    sha512.doc = "bac7f2e879796c0ccd5ee28c47aa79e9208ce0d01456de9ada6cd00d822c098cfa318615311c43b1815de0e6968252f6005a3dfd9d0475ee7dec25f7d24d1d86";
+    sha512.doc = "8260d8530c1405a61982f9b9bdcd893d34be0f398cdbd7ff45189bb33252fb56485a415c37126f61f78b485c9b134d26824a5ee58f0cff999e5d0448687debe7";
     license = [ "gpl1Only" ];
     version = "1.6";
-    sha512.run = "e04e13e23b3342686078c2278d3b6f7c8678d99acda197f50296ade3dd91bc4316323a669efd7238fd246c60f169c694677252601a81d9e23b49a1e37049c93a";
+    sha512.run = "0c2e77c43b3716617df3323b8ff96c52d7f7804790f50b7238b8cf4bf0abf2219f9e8ac05037c20ea8007bed19dd61039013745e864e2fa68a316233a41464f4";
   };
   keytheorems = {
-    revision = 77073;
+    revision = 78044;
     shortdesc = "An l3keys interface to amsthm";
     stripPrefix = 0;
-    sha512.doc = "d7b931852f93b5106aa32f5c14402486ab89df1c5294cf12adc65462ad4e6efab10f889453ddd81d8e5297ddade2e70c1c5b0741c726bc74538ab72685c4bc28";
+    sha512.doc = "112607b2eae62355308eddb3ad6b24c456cc453cc0a5e68955a15f6f59cdc07f4797c8e9df9d95ca9e105be0e0fdde76bb89f4c8813b53514be6249913945770";
     license = [ "lppl13c" ];
-    version = "0.3.3";
-    sha512.run = "cb974dc04462dba5816cad7de42bc7156ea26461aca41e0b48b18658f8b17064db46bd7db43918e3321d9f1ac7a208748328885b43137df6aff57465aba8849a";
+    version = "0.3.5";
+    sha512.run = "bd4c1d398177d29247c9d9361469e4f7849379deea10da631bf76bf02207dda4ef81c7b72ecfbc41f4fe2af5c51b64d4fc714c87c80a7c20f9fde442d05b49b1";
   };
   keyval2e = {
     revision = 23698;
@@ -28585,14 +28691,14 @@
     sha512.run = "08495711a9b509707ce6da359f9743b267baaa6ba6e18e41c965ce016c4c51e1bb7353769ecc9596e9bc415976449612f602e291608d306ee5baa69a4e823160";
   };
   keyvaltable = {
-    revision = 65416;
+    revision = 77677;
     shortdesc = "Re-usable table layouts separating content and presentation";
     stripPrefix = 0;
-    sha512.doc = "7b3cf84548c2a8d997b8cb5ff3cdf77a40ff309220fb6d109fcb8215e78c8b93f44e495f3da7d92a3e144c1635473fe8780cc45acd9e978f12faa7dcbbff9893";
-    sha512.source = "0bed97c004ebb8aa8af13d226c10fa01e00459534a061d5bb9500e7d5376fd379f67310cb169e2c1fbcc0e07f4e5c35d096ef1ab65b92a1b78481fbd7e90e1b0";
+    sha512.doc = "dfc814c5579fa4869fd5cb49ad001850f8e02da7214d917ff632b9bccf2acb382d0eae76836e9938ac30ec676977b03c9762190cf0d37ff2e85a47bcf1178fb0";
+    sha512.source = "449996494a05883d4934db7ec7d5c2f4e07140177f5d047102fd4f0a4258721da4b25ffe129e5221afd0f74c75daade59b6b08b2acb456ce24dfb5602f3133f2";
     license = [ "lppl12" ];
     version = "2.3";
-    sha512.run = "733d7e2f07b07b1b7f0538f54c0dce33a706210203c9aaeb203c7c4129859d025d20a1afc973f5320102c89bcac78547213707802726367311625ab89566492b";
+    sha512.run = "23bb7a0bd2dfc312c664a54d873d8e1e806e25c817bc5160f9cfc2f5f898d94b324a448b5dcd3410186b5c66d3b7518713dc8d287d46fb819bdf6797ed1635d2";
   };
   kfupm-math-exam = {
     revision = 63977;
@@ -28651,22 +28757,22 @@
     sha512.run = "c1f6435e02e1388ebddf58444122b27811c14b864f6d686fb22fcfd1e2888abb7f85c7cde5a7689301555596a2309f25aa092d4c517ea884dc38cbc0f57f484d";
   };
   kkran = {
-    revision = 77172;
+    revision = 78196;
     shortdesc = "Generate answer fields in tests and exams";
     stripPrefix = 0;
-    sha512.doc = "04071450763744c8419e548c8c4127422805e7d1c54d0033e6779daef62266f1fd3f11faac0f62a6b8a89c80c96e0b08c6b93cbb25be791efb9f4a2f16350f27";
+    sha512.doc = "a9dfa3e22e2955de9a5dfcb9a70b3bfa070fd84cd81c8381cc1c583d2442d6fee883359d88df36a63a756f97075bd0f324942203df139a4f9a5f8684d909c1b6";
     license = [ "mit" ];
-    version = "1.1.0";
-    sha512.run = "a4750e1411d40d0e0db1f238a0e0f9ae8feb6005e362d8e6d78cd2125fd99fc1864ba41448d01d35a293efffefbbecaa4e4b5e01fb32760eb6bc1cef4cac505c";
+    version = "1.1.6";
+    sha512.run = "75de54ba4627660f923783ee9800aaedbe8344e80ec03f978cb92de476159bd5877ab538645bcd110f9526b3e98cb976e7a87adc984d21fe62f84f7e3a039455";
   };
   kksymbols = {
-    revision = 77427;
+    revision = 78145;
     shortdesc = "LaTeX commands for enclosing characters in circles, squares, diamonds, or brackets";
     stripPrefix = 0;
-    sha512.doc = "f334887417d9fface980aad3c662d67078af5c600d8a6aa17c7e14ce1ecee6716e6e084622f65a551427c937b6cd5556c775570b43c72c9e232fdc95f17919fa";
+    sha512.doc = "703b702e7bb90db5a44c1668ad5375200470d26e16da413ed2f7ca02378bcfddd670899fc2e3eb4593b78412eb4d9ea4646cab9a554f02f6b59f71b9e0b135d1";
     license = [ "mit" ];
-    version = "2.0.2";
-    sha512.run = "feeeaa44e122c251886ec2df2ce46e10179df7166ab677da7a708b822e2ce167c5359b4933ba3ecef5445cf4030eba25fd950fb248c5d3bc19f3f242fc73bd97";
+    version = "2.1.2";
+    sha512.run = "a7d39d9de6d72a66fc01a842cd6b216fa3ff0aa7482722ff22f128a91749ad24acc58fa5fc773603e437f29c1c4cb9a0a68acc74930e98e7bce1c1cbd9a3ece1";
   };
   kluwer = {
     revision = 54074;
@@ -28757,7 +28863,7 @@
     sha512.run = "68aa7ea875f46a4c1d1bbf29d4abb77f4ec729242fab41f3e79caf95a925a076ec3d37ce7d98b44aecaaf9edce541d1673780238786b36cee0621acf4212a1ef";
   };
   koma-script = {
-    revision = 77527;
+    revision = 77575;
     shortdesc = "A bundle of versatile classes and packages";
     stripPrefix = 0;
     deps = [
@@ -28765,8 +28871,8 @@
       "xpatch"
     ];
     license = [ "lppl13c" ];
-    version = "3.49.1";
-    sha512.run = "806a9e01c1d2e8d5ee616db465394d58c90308c8313cb02fb9a805b40c6826df36e47f6feeee976bd77ef23abaa5adb8c9080ffe85ad69b456594cccea241bf7";
+    version = "3.49.2";
+    sha512.run = "aee13d29a7d7c386f9baa5bb2d39ff9ccbde011c6a321f07de09926c88959e3f3ae28d17eae3f7d75d548e5c84771ce2aedfd680781dfc5087d5a51c89cfbdc3";
   };
   koma-script-examples = {
     revision = 63833;
@@ -28814,17 +28920,17 @@
     sha512.run = "4021b99d8ac5f554cb8faf2028adede6ffc49e37aee96a65dd6eaf6496f7190a437bb1d165263fd08e906d8f9079658f07887b3e5155a54dddd12c2637c2018f";
   };
   kotex-oblivoir = {
-    revision = 76503;
+    revision = 78116;
     shortdesc = "A LaTeX document class for typesetting Korean documents";
     stripPrefix = 0;
     deps = [
       "kotex-utf"
       "memoir"
     ];
-    sha512.doc = "46ef2945383d565a0de4c91acea42117145e2f24758351a0d566fbd9824d69dd3f910e29df13789337d9ad27f129b9ecce8da793a21be3b32a908515ab52b4a3";
+    sha512.doc = "51ef78b6ed7445dcc5b13b4bb9652147fc94bba4ea251c57db7d55e5eff151f00101148df25ea6415b23f6aad341d8d853640b5b792ceff5aa9871368fc44496";
     license = [ "lppl13c" ];
-    version = "3.4.4";
-    sha512.run = "3c91308d1604b5fbfabe2c0e1ee3745b5c13bd6d6b4e0a03f5928cdd713b8af06e0d418058ea5b9e2d919ebf61ff1f63452f274f09040606a6e98c5846104b56";
+    version = "3.5";
+    sha512.run = "f8177afed848e018df53528bddafeefcc18e6829d548ef43a90f4369a1fb9760faf86cd83efeda20f0a5449028ff066a5d4ec358ef13cca2149d43b6ae7046f3";
   };
   kotex-plain = {
     revision = 63689;
@@ -28879,31 +28985,31 @@
     "kpsewhich"
   ];
   kpfonts = {
-    revision = 72680;
+    revision = 77677;
     shortdesc = "A complete set of fonts for text and mathematics";
     stripPrefix = 0;
     fontMaps = [
       "Map kpfonts.map"
     ];
-    sha512.doc = "274b5a6a9012eee0168dfe0449ff4445eac55c2baa6f87ef36d81d842dab42347613edd06821b5f7bc070558106b7b0cbf1f52abf8681c2116ed8f8364e009eb";
+    sha512.doc = "c55ca442b8f31986139053edf2dd6ad767d3990eb12b603fa20ddf9962b71d6e1795eaebf61e1a21c72f5a1eb9baa3c2d9d1ad485fb9a064d65c2b25ae05df3d";
     license = [
       "lppl13c"
       "gpl1Only"
     ];
     version = "3.36";
-    sha512.run = "bfe0c56318a5d4c9a314e2562429cc3b71c2ae03a830b7a5ebe0af57b3dff3e65b7f57b73e3e4c8dcd1a0d04f4d226796e6b8e0dd8861390ddd1743d9e9e443c";
+    sha512.run = "41fc3704605ffd3fbe1548aa1fcfaaeb8f760f88305b1d7e9202bece1536c2f3c803f84c76a0e6fe79342b9ead590694d86aaaf5df5e9e6362c383b8704189cd";
   };
   kpfonts-otf = {
-    revision = 76746;
+    revision = 77918;
     shortdesc = "OpenType versions of the kpfonts (Type1) designed by Christophe Caignaert";
     stripPrefix = 0;
-    sha512.doc = "eee0766266aec0f8e68832a693ecfbefed228b744e3ef812515eda595a8f9aec297501f18e07625a6dd383de7607cd8153eb5fcec024858df857449252ddb173";
+    sha512.doc = "ee1c8243c1b8284f096e61f7e6d3965697844d5c1abbef4bdb10aa2c0b884d61a1408947e3354c0e47b6a9c1a96eb255dcd86d1d3340ff7c2e43b7cbbba934ea";
     license = [
       "ofl"
       "lppl13c"
     ];
-    version = "0.71";
-    sha512.run = "1657dabe6f48b4df11990457db665b48effdb04d1036cae129a15f46b915617e08179e61a1d1de65a06202c09df34f8a268e292c0bd9a4aedfa51e8fbf4d8c9a";
+    version = "0.72";
+    sha512.run = "85e1286369f8b84072bd1df466927a091acfa04d58bfc6ace8e4e7b6517468f5a429c1309997bd037e6710191ee9624d02dd5db15b0a2a62d3d68d5c7fae0e56";
   };
   ksfh_nat = {
     revision = 76790;
@@ -28952,35 +29058,35 @@
     sha512.run = "4603e59129f749b0eb065283bff9cddcafcd1096627f196749be09c19a4a79848564ee9343f14f31dddb2e37a01e222bf08531d5b3237bb906cf88efb427fdb9";
   };
   kurdishlipsum = {
-    revision = 47518;
+    revision = 77677;
     shortdesc = "A 'lipsum' package for the Kurdish language";
     stripPrefix = 0;
-    sha512.doc = "6af516595f4cc5b090398078977bb37e97a5aa4b28a578c068931eff7d34fa2cac379b53e70c8bcf270c998fa6fbcbe354b56d0299657fcce9a4e076a87b36d9";
+    sha512.doc = "ebd36ec019f48dd3075bce4859ab071962bdcc8bd677600f7ca581bb0edbc066d5e012c77f993f010f59c1077ce88ff81687790509eebed7764d1d045922a9e3";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "d7160d78d7f0d8d7771740f030cf1c76b57aa9ec2d179887fe4065337e35bef528b522c666eca0974aea6696033678dec5446a9a198fb139f2d2469c8cd47eff";
+    sha512.run = "e903196e1712e1751ed59e96860f24908f2742042c86062a23f0ee29cb8c21955b3a3271cd64c535ec6e091fb1e80725619d2973407f86378cba1c9eaf7423a1";
   };
   kurier = {
-    revision = 19612;
+    revision = 77677;
     shortdesc = "A two-element sans-serif typeface";
     stripPrefix = 0;
     fontMaps = [
       "Map kurier.map"
     ];
-    sha512.doc = "7fda14c05f105d341a31561e761517ce12b3e5ceabc01e0c5c8552ddaf55be1863a22545b268026c844b23f03e8700350f0dede79ca8fda62e7a2672fa510407";
+    sha512.doc = "3ae2d3f1192c36be372090ebbf76ace680e52e6eb24f274a2550dc11487ddee22e3360e18afd0d59a6955421806d59cd00007ca30c73961bf9db17f4c37911f5";
     license = [ "gfl" ];
     version = "0.995b";
-    sha512.run = "4f727e8733824e8c516e3ab1286cf0c834413a6ab52bccb5519c9a14a526cd3397a6d0a264679dc8b7d80cfc1d75ab11dcd2c02734ea63d5a2a5cebd3ea3c24c";
+    sha512.run = "66bd4a620cd3e6d7b59390df07a95afd6d720657c3f3aad93f00c5a185eeeaada5d82008e9d34bd927ef1d570872091dae9e04a6b4782ace2f2b9d1f56b6f268";
   };
   kvdefinekeys = {
-    revision = 53193;
+    revision = 77677;
     shortdesc = "Define keys for use in the kvsetkeys package";
     stripPrefix = 0;
-    sha512.doc = "c540045ec1c8bd7fea3000dd0ebc8adac64da7ccc24b0becb9b9c32c9dda6e5e11a77b57bee667bd2ddbddf347bd8af069907e087d543898a92ebaedf3fa4b7c";
-    sha512.source = "0944a3f6f8e8cd8c189767944a74d5dbf09fcccd94cfdd2e67018f4a3542ce2ca4b8b7e3cb440345eb299584707962ed903f2fd8c832fad6cb850b29c7a99af6";
+    sha512.doc = "3c34d92ceee36ea5cce0cb0164f222412c0f570bfdf6df66c3dcb099614af3bfc96bfc800cf8182e88253d830103f1faa94366eb5a9b0ea868e5641b6578840b";
+    sha512.source = "c35c8e170b66b7fac777d6bce48978bdc896aaa306867d9d57567aaa1a2d372b0623c48a2f8d096db32ee823b365c7ea936ed38ec373cddeb56b4558c5b3772f";
     license = [ "lppl13c" ];
     version = "1.6";
-    sha512.run = "2a03840307805bd6fe30be9c108982bc472912c11c8cec25737ebc4042e48af8fe4f1a76124536874bea8c554f003a9c52b8a72d2f6900bc6872ffef8649c40e";
+    sha512.run = "d4e75bb8f4662243f33b78fbcc42f595e84e26c915e69c3c4bc1502ad270410eee8602e32cb9efa19c3fa6af5f2067b4a2dae32ff876093ff16ff1cf35092096";
   };
   kvmap = {
     revision = 67201;
@@ -28998,24 +29104,24 @@
     sha512.run = "ea3659bf10ca08945ade08c52b4eba46fa01e28443bffd672a1614f917fe71f68a63d98568e23266d7becf6f6a4fed48f2d2367256a39e956bd2f1d40aff6f71";
   };
   kvoptions = {
-    revision = 63622;
+    revision = 77677;
     shortdesc = "Key value format for package options";
     stripPrefix = 0;
-    sha512.doc = "864fd685912d7bdac610c16508efdfadf82c9c2efb8ae3c9b5a0d16c1dffd91822a1389109b3de1ce63dd74bb1aff5efa534c134ee06f1e61df9c867aeea608d";
-    sha512.source = "38168cf3c486866ae79eac1708ed93f117187cd7404d852020cd9b70b3a518ca50d641db564d5d1d36b7e2a2c9beaab27e45abce93d01db4c37de7d9ad36bdf9";
+    sha512.doc = "5520f8a2ee4b0c3f534d42f59473b078a198f451bf17745e73013bbe3977f62c7ef3e9a16d98d6838d181f0db54ef8a57568d9be79b0fc560e3a91cf85708e73";
+    sha512.source = "641ab5bff7027420f00972bc774ba640e3876be894c798b232cb4209176057c0ada05d6c14ed8a0f4ee1522a70c9202834a6bb9f248e66518bccc0834d20310c";
     license = [ "lppl13c" ];
     version = "3.15";
-    sha512.run = "8e4189334b66ed38279ec0deebb12769453db802b1538e8ef47598de08123006a5f65b4b86c144aba5c7ef21abb95c65196e314e4b80e9b513103354e4b29619";
+    sha512.run = "a86e9948dca5cfd6ea06844b453a2e622af79d319837484bded0e5875fca8c990c09ded664149d6d0a4a9f9803670eb39dd5acea35e33314fdb282a159efb898";
   };
   kvsetkeys = {
-    revision = 64632;
+    revision = 77677;
     shortdesc = "Key value parser with default handler support";
     stripPrefix = 0;
-    sha512.doc = "127d4a03b26c9adb92254b08f0aac6039e39ff961539e253bccfdc1ee3598dd5e10608b8c8909708c041f5134c549f9af550bd1371a1e7b90003f77ef53bbf33";
-    sha512.source = "696e78c295f0ac2a4d4c69e0d855925d46fee487da25ff238546033cae5e3b9042f66b924d1535ee41afc6142234fbef63ecf4df5b0c6c191b395109244e19e4";
+    sha512.doc = "67898958916b95cbca1f8ac034aa2aef0eb0da90199c036f55ee605abc616973674aea8b4432c4e213bfaf8c425d8fe5765b016b0b82a3d95eff86cf74e8b5a0";
+    sha512.source = "7ce96901a6e0e61f8f9b3fbb3b0195a86aec10c0465af152e7e19d84050259f6076b0a90d3c4f21c86057fa4bdc99831155b0632121d5936c9b6109c57640958";
     license = [ "lppl13c" ];
     version = "1.19";
-    sha512.run = "8acc4b9069c3baadf9a9802546d636fe8268afb97416b47d79b0a0306d90104fbb86b8ec1b4492f3134357564bb81eba1ae0e84a38f5b94a556de45525777431";
+    sha512.run = "dacc4c995caaea57f78e0563ad9d54ecc1bf933e24680ba6a4a7b1b410e5cd619ae600570bb0ba8554ba4edc13fa2cc33675ef84401d391792d15b3a2f1a77f6";
   };
   l2picfaq = {
     revision = 19601;
@@ -29075,13 +29181,13 @@
     sha512.run = "dbc3f7b699ca69504c61b207286daeffe0da699ad2a6439fa271691b5b825b156a4a3e1e67b423daaa86a011bd671d56259ca7e285e2bd9d15131b5a88ee6865";
   };
   l3backend-dev = {
-    revision = 76924;
+    revision = 77955;
     shortdesc = "LaTeX3 backend drivers (dev)";
     stripPrefix = 0;
-    sha512.doc = "511e0bb300eb0d81a7a5237dbcb14c7a49bf099ce843f88879f79a79a3d83b67ae67b03df4a88477e2ab8930daf014afd8159ea85410bbe19ae0a37d43226cb9";
-    sha512.source = "d03fce10bb5806ae4f3d3a05e334ebf814a07d231d378ce9802a43a58ef5395659eca37daa2499de096d32ec93b25953a6eff8bc965294f730fc6a834f1fbd26";
+    sha512.doc = "3a965e5859bd98e5dacc5d0fc6e94594f2b61626793b54c671b4739214de3dd830700cf58000f69e8aeeb3644a0906119bffcf1c4a0fde9ac1db253b45af024b";
+    sha512.source = "08fd750ad5529c7a7bf4ae9e9527667af6ae17c5affb114afc4c71abe245b98c40bdafe760bc126ba498a94671caba4b199f292f00694ae2d191bf267420b9d9";
     license = [ "lppl13c" ];
-    sha512.run = "01681620d4c9668b0b4f4720d02c83dc28656ad1c39c0599a3bad15753e06d8206a585b677307109d1aec8301c1d00c41d13d4a8ede200c38fdf3ce9e03ca9fd";
+    sha512.run = "a4130aa9a6f2d17c2690e5fe155e563f08d8a2c17925e9b8ea5ae2c1ba71ffbdc696fdebe396711d6a6e270883f51020da9a7ae858750ab4ac8687c34a9b4ccb";
   };
   l3build = {
     revision = 77170;
@@ -29127,17 +29233,17 @@
     sha512.run = "def3bb6f94a0b78d8e27d7d6ca1cddf2cb480164c32a84dae5c5d05f79d7ebecd9ca5a4f4554c55a32092a342c6341a9e618c246ff0a1bcffba33565c09d8669";
   };
   l3kernel-dev = {
-    revision = 77413;
+    revision = 77956;
     shortdesc = "Development pre-release of l3kernel";
     stripPrefix = 0;
     deps = [
       "l3backend-dev"
       "lua-uni-algos"
     ];
-    sha512.doc = "851bffdc5c788b3e40a4f6094a1500feec1b0f797c8c9a63a790e1441f03a1c045c46c0ef107bd006dd43e32dd190dd2c7668614e798315ad30e1b4cb81f5ef0";
-    sha512.source = "fbfe060e0cb70c476ea6bd458490122c4d5866d5ab84a8fd43fdccce23dd545d6229e63a31dce31decc55137bc2765d32ea149f6f90e1a8ce74fd328a9e0b5f8";
+    sha512.doc = "da76aa51a3bde73b54584c0a908556f99f66a6adc68ade35acbf32d1be24ec8d77f72a38411b38389b95d4b255e8d111bb7dcd9ea96ccab35a88ef0654e480f1";
+    sha512.source = "f46e4daec3fe0c2f448f97d435addbd7be71144a927320b7cf15a8db1bd14762ce48168c9f7cd4734bb2815a536e1c589ca9e85f1248c8b89631ad3ca8ad4942";
     license = [ "lppl13c" ];
-    sha512.run = "a1f8bd890babd5e466b43bc5fba83a53c057686959579340122d5468eccab35d65bd523752e8786e81832534fac04ce1fff8b119a0aad854dec66363ddc4fd58";
+    sha512.run = "b8dda20fa3a861f5d8317b0f8d9e5e9c95c16c843e614e1f9d092ed6eb849e2839d20a6c8525d423d5730301bcc0d720251107a7599758893f70be04ed56badf";
   };
   l3packages = {
     revision = 76637;
@@ -29152,18 +29258,18 @@
     sha512.run = "47a7365cb7d3c00ccc6a88917d7500d45cc5c1eb5faa6a6ea9b263dfe43426284fa6f2091a7f20b6a8cc82313ec8248f6137f97853c0a36049ca0f20a13cdc8c";
   };
   l3sys-query = {
-    revision = 70889;
+    revision = 77677;
     shortdesc = "System queries for LaTeX using Lua";
     deps = [
       "luatex"
     ];
-    sha512.doc = "ef8e3bab156c7aecec8c77bae0ab4f73a9426d799d57373584230216a4c061772cf8085db9e5c32bba42896072951949b9ac3d5942c20c009ede7b6b38555b42";
+    sha512.doc = "36b7cf7d9bb609d25bdc10ef60d3bbbbdeb47b8776e1fc80726e447bc44fcd7c1faf68326475f2762a9f14cb071d7a2815ed205871d46027a810cc1c7a775281";
     hasManpages = true;
     scriptExts = [
       "lua"
     ];
     license = [ "mit" ];
-    sha512.run = "6bf0f78f704c3d5511d8e54eb3fb89a1d0ee6870c7fe60d20d286c83a86fb18529d7dd717c76e9a30051ec099b154014f1243e7d3e214ad026537a188dc916e7";
+    sha512.run = "352dc3c6470da423bbe5d83752c2b691d8379cd9320bb7036f7e4d81d6b453077431fd24edcb432aea55a203eaa01f19d61b36a2a1210207ac4cdbe8b4415a50";
   };
   l3sys-query.binfiles = [
     "l3sys-query"
@@ -29197,14 +29303,14 @@
     sha512.run = "1f792dfc8c3d51cbb3ec4370e4ea36612d503a9a92d088f0d8b03ccc78c480118308aa48e4dba66dcfd55c8a3442950242742eddd557bd6b44c925e01e361163";
   };
   labelschanged = {
-    revision = 69400;
+    revision = 77677;
     shortdesc = "Identify labels which cause endless \"may have changed\" warnings";
     stripPrefix = 0;
-    sha512.doc = "ca1f6dd7d4be5c9b130a17c75cfe927e354ffd5756bd893ef99c2f67dfef69a585e139d9d3b44e0828cf0928197bfcc8a909e5a32ca386380ca2a203a8ad0fee";
-    sha512.source = "e3e5187658e31d0391910a1d4610cdb5572ddf13006423aa673475e165b04bcca56f6d324f0b383a6e7faf0a3263e68f5727c39eef38e903ee2950981c5b290c";
+    sha512.doc = "c153b0e4ff9d133b4c0ea976842ea4e403f722e08d25c256d9407dd08c1553285332d6cb2bc34bd57f3c9aaf4bd6831890aa965d326b5695a3e77920c0afa275";
+    sha512.source = "11917a09521a80638a61fd138416d5b7bc4225b0c542746483da781b6e63897333b81b7c08d6413ee1555cfb2f87fd9a84ad07a23208147730d3d3bf25f51766";
     license = [ "publicDomain" ];
     version = "1.01";
-    sha512.run = "9d40f477089880f8e0c61f95af1e94848dbac11a8ea5ee3a0c0c33a5883a8aba4c0471d2e23319667aa0dbf0699599372c8267588247809f316304e868ebaaf5";
+    sha512.run = "a5b7d4795634f9e5fd379d2f33533449cbbe488104921cb65d444db3e89b9b483d2efa50b0523224a00f44066612249e557f83203686113ea74825e037023230";
   };
   labyrinth = {
     revision = 33454;
@@ -29325,14 +29431,14 @@
     sha512.run = "f4d30e327704b32afe1bcb81023a247095203a9b47357f9a6dc4b631f4bb669255ba899cf1c8378b42ebd16f2608d8a649a0999f26e3d05c963eced1cc955ee2";
   };
   lastpage = {
-    revision = 76056;
+    revision = 77677;
     shortdesc = "Reference last page for Page N of M type footers";
     stripPrefix = 0;
-    sha512.doc = "6d2cc03fedc5924794cc6742e918b5b4323a537adabc48f744ffd47579697be04b846678dbeed96417f86c762a4ce4566ae057a011f1a8664f4e5f67f18fae96";
-    sha512.source = "25b5e8881f5168e4445e1ed72fae083fcb76bdc68e7e36185a4a840c0c2bea36be1f56dae3ae62390c3b95a4680cccfdfcb06145d24413fbc9db0f819786bbed";
+    sha512.doc = "56e2e4aa30e033c378e21127d39d2e83a75729b817d10de5ae8631233a222b154983be14dfe6952f05f0b977a99838ea0bc8797c26f1bb03a7c82cfef3408c19";
+    sha512.source = "e9081f4d84d14eb3d9dc9239657bfa10de2196abb3778bb073abca9854619f8e407155f8398752616749ee7624d5e5434e636fe780801c98491169d4f4a38b3d";
     license = [ "lppl13c" ];
     version = "2.1h";
-    sha512.run = "500d23f93d9de0620a388937d738bee8fbf6669091f13d66c4d66d8d9231b77578be8382561f3159fdf194b3489296589efc42a29158e30123487b436639d830";
+    sha512.run = "22076d4a297c1013305031d87fd8d3d843de45e9e0337f7c2f621007465f6680d4c7fef67110f19dc227979a292f91e1c61959ddf366f605ed3bc6b72758c7c8";
   };
   latex = {
     revision = 76924;
@@ -29780,12 +29886,12 @@
     version = "1.2";
   };
   latex-tagging-status = {
-    revision = 77526;
+    revision = 77801;
     shortdesc = "The LaTeX Tagging Status data";
     stripPrefix = 0;
-    sha512.doc = "7cf5458636be7cc907ffa4be83c198b4342fbc6212ef2286f09f4502e6a6db57a45764fb4b42b51cc937e13c4ad82875e50ae0b1c1337a6a6995009d33614065";
+    sha512.doc = "2c20173b87c55dab1a72c9c39a48d1b0e54c1c089ef7c840c16328c69cce1f0cff7a5e924d1f3a51093b67da643009b5229fd7042cfff94b4b00874590b9b96e";
     license = [ "lppl13c" ];
-    sha512.run = "f4c410f6985bd6d28269c3fc65c8b2deacdc37dc71d7380158a71b3faf9a2f2f443c0c8e54aad191997ecaa0e843fbce60855a03929c6f6aaafb383f4d695813";
+    sha512.run = "850b8f3898cacf223dd9d759cd3e6b835b9bc9bc80b1fb1c0cbefba10c055fb600380a4cc48601b782086cfafecbbe668d4b67b13e07da895fe01cda53a31c6b";
   };
   latex-tools-dev = {
     revision = 77483;
@@ -29882,14 +29988,14 @@
     "latex2nemeth"
   ];
   latex2pydata = {
-    revision = 74766;
+    revision = 78178;
     shortdesc = "Write data to file in Python literal format";
     stripPrefix = 0;
-    sha512.doc = "bfe850ae46ad3bb4582dd84728dea2f42c5004daddc042b56ed1aa3cae0c30e3ca00e548449b674b766c87535a65215dac921fa1b4d40c0fedc08e61fe8a624f";
-    sha512.source = "4b869ad747d6d0e52fb8c3ddfa157b4ec7faa268a71068883bf92d9d576dd08846f0ab7885e8ccb42ec93eedd1a4a98bd727795c94948fe1051ee2185a51ca94";
+    sha512.doc = "e68a07d1f76b123aa9b7f5e60def300cf52c4e2f18cdae5b9adcf1dda6cf827d5835acdec025bf57cf96c27759fb1d7b47393239753bdab19a45ebfd23be73d4";
+    sha512.source = "379f488623d792d069a75ba9346048a870099e28c4dacb6c539fbbd4ba3167dfd372675e60f213856205f1806c7c2651ba9be32804b99d7e72bf456919009dfb";
     license = [ "lppl13c" ];
-    version = "0.6.0";
-    sha512.run = "24133a63ade62244221a5456b6e56e648511e4a1f4c2aba1797a359c8bd5dff9a0880d8eed6ab9e6359c9195a932193de59cb30ce1b5883da980810f7c392941";
+    version = "0.7.0";
+    sha512.run = "66411cb0091e424cd3fde40e338efd8d4e5180ed401d086fec1b6460c9962767c2717acb31c057e551cc84eecc063bff7a2032d89a192aa78caec2691fe217fa";
   };
   latex4musicians = {
     revision = 49759;
@@ -29925,14 +30031,14 @@
     sha512.run = "8b61b8aee0e95339b356fa85b9bb7ad3833ccf410267eb31a84a811c25c4e34ac350952fa26ed6461468bfeca37121e809ba560fbed7a0d8e747613708ff7795";
   };
   latexbug = {
-    revision = 77050;
+    revision = 78116;
     shortdesc = "Bug classification for LaTeX related bugs";
     stripPrefix = 0;
-    sha512.doc = "66b59bae78254290c9269d5b453eb8226ee4969aa811091bc3930a1dfe06f88f41216543aa50d07678d0ed0d9a966d38fb7340c7ed1caaf8e8157aa1f896c82d";
-    sha512.source = "5ae594eeca802e0441b8b51cd8b0d0a1e8440b86c5fc85f895176009cdc653007e7e3d8828582f9e0b67e43ac1191edf0d379a343343bf27f403f24907a7b911";
+    sha512.doc = "c1eec0084a8bedac4924513cb9c5c9c809fdcdff8f5058bba26ee789903d0ca2889a1b6057012394ed690f8c8b4531899340cf16d54fa7633ceb04f3619bf3fc";
+    sha512.source = "6db4c32334fa90c0cb3775fe0bff01546725822bd5dc55f10e86a4cf9212508c6794aa0f4936c014b9e1fb7baf10ddd50b7d1488eba055197a40a6c530891ecd";
     license = [ "lppl13c" ];
     version = "1.0q";
-    sha512.run = "13fe8210da70a44e88149ba591518b53575bd2c08a46bc23df4741ce84d5063a4da364006b2222c7977a508788f75a5efe7ae2a54320cd5a5f3a57e953a83e42";
+    sha512.run = "b28f6b3daf89d91ad4bfda749be84d7b2f57412d7371d0da1c00322710f7ce7fb2cd7fbe31083e933f1b6289a51dbe185a06016578a074989740a584091653d0";
   };
   latexcheat = {
     revision = 15878;
@@ -30096,19 +30202,19 @@
     sha512.run = "e498d5ec469420db789dac92e314f9ac0355b4afa2c43d4dce2de3eb23481db2687283f9ccce2ffd6edfd7b8f2d7ca3bf7425f0ff43ed46d7ca2dc9e3bc16797";
   };
   lato = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "Lato font family and LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map lato.map"
     ];
-    sha512.doc = "0965bdda9b3c106bc49d8156f497c4c85a80d76a4740964b2d24c58155e8afed57989166bc5ac3eb44daf377b7e8985b406a0955dc419ced4a7011f328ce0c62";
+    sha512.doc = "ce444ff259cc97ada69e171c7d87b8370953cc23479179e8fbf867e19a6ef6a1d1be2ba33670d90f9dfeb58dbaf5f7e8ef01e4e9a972e0e19c0fd3c0d5ffaabf";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "3.3";
-    sha512.run = "2f8454888913ec6a024c53cf157509b8b769f948ac2c92d0683e80ff8e22865545a6a65864876be35569bf4a5d56ed871c8112b216561e3ce585136bd062c9ce";
+    sha512.run = "ebad3da6f803a473d53dada18f9b83ed5b73f32a8903c12aaf4ac16ba436ddc832f8d68f90ab033ac8770d01345f99fb3808935bd9ee4c2f44780a79304907a0";
   };
   layaureo = {
     revision = 19087;
@@ -30121,14 +30227,14 @@
     sha512.run = "849b0e0fbd15b45cb31ed4856b0eaa190c26437a1965da2c860af62b65cbb000b590320611e96c5a6c4cc63c029c31fb352ec44d96e0704eb52c70ee460abcd3";
   };
   layouts = {
-    revision = 42428;
+    revision = 77677;
     shortdesc = "Display various elements of a document's layout";
     stripPrefix = 0;
-    sha512.doc = "aa6639c5ca0029efda9af523a0a075ef2b60ae9e031bd68232ee03792bb2f7452e2201e7223735e83b7979f2c057674fcedde4ed416254ab4b5b8a6cd9bb002e";
-    sha512.source = "1abb95aa76cb3dc55d7426b8f98923662b48fa91ae8e5e2c3c01fb14dc28c8ceae90c01c9a22b1f59103e56d1818675d6da6223be6771083562ebc50ceff07b6";
+    sha512.doc = "947967afe525a5101a89cdfb9b33bce249b0ca862b058bd434825630564b4f9633cca4970bb83442307d74bcd1935e242cd8fcd1deae6cae021473f17683d176";
+    sha512.source = "1c977bbb933e3b04032f1571acdc35fd866bbc9129ccf3dae33a11fabe7ae4fc3e2ef14aed78e8b09f42fce812f3c5a709abb33a5dd949a3f7ff8d4bd44a1d64";
     license = [ "lppl13c" ];
     version = "2.6d";
-    sha512.run = "9db14862ac1bea22096130ddac071a9b058e4cc1309917d2f8e8c536f280d2f4efc9a8dad9a5dbec0824b94f92c290e82820ec1628f0e4b72aa8fa617b72d981";
+    sha512.run = "8a1e39d97021a88bc4fe02b30132512bd4f1c52bc2d9a2defa18c979b6dd05f610c2d80a48421ecf2ef28b7ef786ca6525ff2ca93ca4c49c5f7e9da75caa81ef";
   };
   lazylist = {
     revision = 17691;
@@ -30184,14 +30290,14 @@
     "ttftotype42"
   ];
   lcg = {
-    revision = 31474;
+    revision = 77677;
     shortdesc = "Generate random integers";
     stripPrefix = 0;
-    sha512.doc = "5674612693481265f72420ae10914329029f9af2f526e6b59ba2614d4d2994a0033cb3393d2751064987698f819cca8e0fa3783555db3fa6cc5849f337b1cfd5";
-    sha512.source = "b26dc9e706b14c304a282d2b5abc2d0fdb81799238c3951badb6152f8c83f6a2ace579ea0c2fb782bdfe0d02448cf716e77c3114ff0be594b12bcabbe138b17a";
+    sha512.doc = "32fce30b37b1e0536ea8dd590811692d176ac8d623568ff581f6bc84f93472bf82d9a54c330cbcfcc5433df6035c7a296ae4d60339c8e1d2a3222c905dca9209";
+    sha512.source = "7e7d858eb101ab52e61d464b73f70506fa102b5d0374ae9937952e1876d30078a61bc4d4c2daf553aa635748cd37a41e64173fcfbf980c919be072edd922203a";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "6ca6f347b6ca4104ec376554ff7ba5d19002b2b4174fa491f3fec87d6c75c3ed11c1d13b9e7d30e6c086b2a12dc3013f21ee10b482c95b177f0eaff02d953fee";
+    sha512.run = "89f18fddf8ae1eb7e5bcd46acfab28d817f38502dc4c5a971562836df535936ed3d6bf97e2ede750a3fe7f9f8291613ed37d53fa268c0a29a75d6b6e6f38313d";
   };
   lcyw = {
     revision = 15878;
@@ -30204,14 +30310,14 @@
     sha512.run = "324a9eb8f1a68124888ad7d4f35dd0446c917e643e2cdcfa041ca26b719ccdc541b9b89857aa05dea2d599912c506561c762d288ccc86d637fd927cc70bf910d";
   };
   leading = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Define leading with a length";
     stripPrefix = 0;
-    sha512.doc = "3ede6910ccb0a30c3ae9c78b86cf00cd7e2c5d8905b648861d2113d0af6225b2ffdc30509a72a5f69dd9e1164525c3225cd4ecaa04471ddf5c346a862fe097e4";
-    sha512.source = "b42b230efc2508f4b3901de791424251c6e0ff003bb342fa11ea282f46b2dfd5c68a63c95fbb9aee146839944586218a3cec0ef182575a9760d3ed3f5924d78f";
+    sha512.doc = "3ed03099472dcc5c55c13994d8d720ae589c8ac6fea6698e51a7ee2274f8f186d558f674affce19895796d828c9b08582fc7358167ce6486a7697f36ca7e998d";
+    sha512.source = "62a952bf3528121a2e317e6e1811dad4a4aa7f1cf24b2fed5649075acfacad02208b736f4b7ccade75f9464b3845ae4e30a57ac49d267c55115fbbc819feb740";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "c326950e6c4b07782148ee4c9ac5b22f7e42512e0bc6e5e1f75be6ed757ca90ebf2bb6b30b91ceaac32c761d595ba5799f0f40ca15954f150d481ea366f1c72d";
+    sha512.run = "e2b68cb881f520276558ea050c2404af3cf714a4145a87cd1a5c17e445b12d6625abf37fae71b9b8d123b6fef8f366e6d2a5a18f412b34ac443b7487f13e396e";
   };
   leadsheets = {
     revision = 61504;
@@ -30223,14 +30329,14 @@
     sha512.run = "026e310ee9617108ac60fca69b0f08b2031d9c9dc583a400095765458bc72681c5c39332602994fd8a7dd4757b5214924d4f5d75bc5861365ef65e8e33b6e143";
   };
   leaflet = {
-    revision = 70652;
+    revision = 77677;
     shortdesc = "Create small handouts (flyers)";
     stripPrefix = 0;
-    sha512.doc = "e2a80eda19cf0d18aa4d2b8e25d984cb37fc9bb18765ce343cfd587fb2ebedd6495d7d5f467400f3f9d09caa07a4cacc0f8a358456d543b15a62b5f18235f391";
-    sha512.source = "ecf09ef8c1321ecf0a2b9a16c4580d93055887b616e077ca7aaf42024288d665e39c5ff6e4272f45ce2d2006ff204aaf9313d0a57bf9d75eeba27ca069245d5c";
+    sha512.doc = "2492784a9796abd76aaa457876478da899a255bca8082afe265bf95ebd815e82329a117099a024b52aa4d7d7c7f94d0c346b1d72370298b4d760acf2b43a7c91";
+    sha512.source = "2f77c5f083cd158416c4207fa398069230df0668c383eee2080d639ec86ac70974b693e02e04e0878b879a6fd2afbd785226d8919cade4e0169d96b26899b7b9";
     license = [ "lppl13c" ];
     version = "2.1c";
-    sha512.run = "1ed3bd2dca1caa150f217e1eaf41fdceaad8f9e488f72c46a56a1d24e533789a08c4a5a2e587d67076aaea8cef6d7a50eebddeaf53e09ccb3b29b1a395a68d01";
+    sha512.run = "2005170a2d5250fb30dda0c513e96c715f37be0607ab2ad0a9deae24b246782d9ff72424e7688482ce00b8c823d2bfc4300a9ea23a24424f32d89b524b1dff01";
   };
   lebhart = {
     revision = 76924;
@@ -30289,22 +30395,22 @@
     sha512.run = "b465117d5634dc4eeaefbc2c12a4d0fb892f4a27ed66057938701fe51e4dedfb5b7f28d796145d89a59b2667cf61c7175803f72e5970cf81244329130d173136";
   };
   leftidx = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Left and right subscripts and superscripts in math mode";
     stripPrefix = 0;
-    sha512.doc = "1e372c7d307b4bae8fc5673c9654785db1fc7c510e188e7e0945e01dd502580479b7910e19132c7b8b169acf7d9de84504de2aa9fb580c9a526a5700114f009e";
-    sha512.source = "3339968b569bf6fba6d7332399d0727148add95c1c0dc2ae06626269c156a4e365dbbf672b652d3c5d097d0570b0955e6cb34255e3f8383f05ea52fa2c12e375";
+    sha512.doc = "8d7123c28604171b4ae02f493d6ed0c89a162522139a9ebe35628c8f7010aadb5d94e51b3bdb93e3da4585b9117df31e9d4dddc6dffa2e5644a9378ceb66d5ee";
+    sha512.source = "ec62370c0e8a46633175b97db48dc85eb8bdbd7e2a36d98be9812821df55ee1cb5b4a71604a55008017a9c94f88f62552e70a5fb2e4b6a63ab82d0e7e0686c6f";
     license = [ "lppl13c" ];
-    sha512.run = "a01d085af4ac4048b5659e7f2f1692dd787b7c4cc9a0c06acf9852ad9d5aaa9790bdad6db7a76ec2f1a268af520ac35975a7fc55ef0d6373f244c85b8b6e116c";
+    sha512.run = "540491eb727099a9be41b871ae656e5593142cbcf4c22dfc80cf9f69041ac67e7a3dab30009b9f0392fea85b01208a05be634a98185b758fbdcbe502f2ec93c5";
   };
   leftindex = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Left indices with better spacing";
     stripPrefix = 0;
-    sha512.doc = "cedde248cd34c13baa1ba73385571c4ca1d7457cf69a77161f61e93ad27be220c6706988c220bbc8ce8483e0443f5ac49eae94710edff06ca2dc9690d4e89aff";
+    sha512.doc = "cf1b202b83c12ff6425ed9efc405f854d69d47c0bdec0a612c1183a35f28ff4750c7d02435f46e5f41168961cc482b9555645b3f27ad794390a59d07d5dd9e34";
     license = [ "lppl13c" ];
     version = "0.2beta";
-    sha512.run = "bcac969601833715b21777de21635e6b622b7a01e9330f43d17e50b6f2691b36e47a3240421c4775463cb250936e6a4f261152536a7c3eddd5f9de859cc61a80";
+    sha512.run = "6f578c4e2e00d218c0752157d0dfc009025fcbe97a3585e07f781d5248d410d0c16d747d357aba41bac51af7cbbb264b547dad53ef7f4e031105207c0d637613";
   };
   leipzig = {
     revision = 52450;
@@ -30336,36 +30442,36 @@
     sha512.run = "75c5664c428011ef69ad6372bae945ab99ed827d0a49201afe65ef1364ab81df12b54fb9358c56ee65c4b5d993cb5f5c6e96831383397e5447ce2dd3ecd6b3c4";
   };
   lete-sans-math = {
-    revision = 76200;
+    revision = 77677;
     shortdesc = "Lato-based OpenType Math font for LuaTeX and XeTeX";
     stripPrefix = 0;
-    sha512.doc = "b797b5819a1b07dafb80d4e033f7e6b1c5fe31dae34e9813920f19a69fb8278003d81635581d7f23cb49f6ab46b6274002cc5cefb2e11aa1c136481f249d1fab";
+    sha512.doc = "8e394ebbcb3b1c7492183dc275527cb2bf5d6a3b325741d543edca6c73dacbbde9f70fae4a37f2d17a23ad9581f03f365de21ece4e0adfbf8fcfb3b734f610b5";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "0.50";
-    sha512.run = "21f1b6159a5f2d21914baf395879ce0fd50cf79294836398aca6afd609b0b75dac3574d84287304121546e4a440e8f4e59543885d685c1f5bb05728527df6150";
+    sha512.run = "112eaf378ca6add793e7611be099efd76393c678d4e1608dd1ef25aa05a06bbd9dbb4473f4b3186280bc9fa184efa77080589ddd1ab4234d4a3b60d6973f1912";
   };
   letgut = {
-    revision = 76652;
+    revision = 77962;
     shortdesc = "Class for the newsletter \"La Lettre GUTenberg\" of the French TeX User Group GUTenberg";
     stripPrefix = 0;
-    sha512.doc = "af4a06656f4e7634fee4ec3d6a9ec949bb750c6dc129e26f49f484d564e95fbdbb81c0f3c476309915d78e73ca5d35bdce29dfa49bc6fb1fefc1dc239893acd8";
-    sha512.source = "5f81765900eac1e1c0ca4f8439ff6e4cdf3b70cacd136f00b9eff839e32280b285ce9e4538e6fc5876182e0b291d5047d3db537909e8c205fb9f078789bfa49f";
+    sha512.doc = "48fe7addd6d039f3bf2eb6b80d6ce879e25c67bb3538788a263338b406144da18746d410b8f3e5367ac903ee7e308da14cd307e2292ae466f1e9f3e3801d37ed";
+    sha512.source = "ee4b88e78ab20348c3394d4b872efca0af0ce7b73874c58954991e5623b658500faef51db50faf3f0a3af08cdc8dbdb74440d32a33c24429c7f0f3a805b08b95";
     license = [ "lppl13c" ];
-    version = "0.9.13";
-    sha512.run = "cb578394d5dbdf3213fc82cd852f822abe9940164c66b029e6ce3ebcd65d8c0c4f835028d8eaaea26f345f1a3b715ca4a14bea3f340f85c200779a1ea84e474e";
+    version = "0.9.14";
+    sha512.run = "65db5e1959b7ef9e627c696a90f5f1c9a28ec98e0421044fd98f109a3163839cddcecc698a77d6eae33a792bbeb36294fb7d5a41925908370f8920d63a04add9";
   };
   letltxmacro = {
-    revision = 53022;
+    revision = 77677;
     shortdesc = "Let assignment for LaTeX macros";
     stripPrefix = 0;
-    sha512.doc = "8be12930acfaa79dbf3d7d3e0a60a518b12392c094e1dc531bfbcd8d9517d4744e99d339b3b7bcfb1e156d0ccbd17ca464126d8530e9f9c13e29d19a6aaeea99";
-    sha512.source = "86863fc9935ac5044f2e3b3013b0df39cfe95f54fff5c6b1af0297b828fc88353243b117caf79cafb7f8c17d9fa90b2e0e8ca753573baa06db7acb26a978f30d";
+    sha512.doc = "74f11de4ac65e4a40820a07a2fc4f8c57febf93a8de72a35b1bcd34bb4ff22193400edee2d5bcb984bf3e47188d455ecb8bb3672a1c94f8c7cc52533d57c447c";
+    sha512.source = "f441c61caf8f409ac8c039fee9801bd643327517717b29df9f795eef6e95e18a9f3bf0ea8a91ea59f698b41c27a07607a51bfcc82607d292adee530893346693";
     license = [ "lppl13c" ];
     version = "1.6";
-    sha512.run = "c9c1f5c3b9aab6b31750011cd45c42bdb32ecd712ced8f8cdafe1aeca532159051d1cff1449b06e3d35fbefdd44f2332805cb1618ff1da022d405a88d600083b";
+    sha512.run = "ba4c7d6422153428336a861dad72be6d261da55b6859c4a0eca7ad150a60723b2a195f83d72780e992aaa4412a8455c4c310d72830b9b23a969edeead7af9562";
   };
   letterspacing = {
     revision = 54266;
@@ -30375,13 +30481,13 @@
     sha512.run = "30fdc0f87976feb698b9736e9deb6726746e4c25e4ed4a4637ff26699e171738be6447e8e2d02d154cf57944aa988208ee97859c0a7fac784d55fa6ef889b86c";
   };
   letterswitharrows = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Draw arrows over math letters";
     stripPrefix = 0;
-    sha512.doc = "619b9aa40a1ce4a0d2e4e69ce563fa5ff49d758144ab164a6f93fd0d7c697fa06085276eda7063c159a87c4dd71736db3eb95a0bb41c9eb76ccebcafa1d0cf63";
-    sha512.source = "6807843ef4c1e45c2899c2781add8cb275920bcab6061bd5176ead5470af4f38d2c8208a7d05df647f29f36e15974879fcbacfb04af1416a23f2941ea02612a7";
+    sha512.doc = "987d8b1ae1553ffb41dab16153267a49eee941db250b11af7e36fc33a7df68be6a0a817aba6b85af43ed0f83bf8cbaf2e070b4e46013bc77c62cbff7fe04ed50";
+    sha512.source = "8b992affdcbfe5a648da7e12f5cad3bda7364ac8ac9788db948b07eb12ddf174e75f08ba4bc0d338ce0bc176b1247a29e98560c6082d9741ed4c6533ac6b1bbb";
     license = [ "lppl13c" ];
-    sha512.run = "906c4c64d85c04e66392a4bf57f9ce2e5de2c29677d16c9d72771b018b20e786ab2df44c3b34c611e02ce53d78957c5cfe95bc39fae0de7af2e8b0a70edef6c3";
+    sha512.run = "10de87612b1f3d7fe1fe4d6cc62c7aa57c7e5d9f1cc6116afa652256894ef46cdece7bc1b361989badd8e23e395b05ed7fdec88385d42f1f1fc246bbc1f2359a";
   };
   lettre = {
     revision = 54722;
@@ -30421,16 +30527,16 @@
     sha512.run = "7dbe24061df0d0bb4762e7d308c895c99d8f9a9105137bce8c4e589c7fdc80f989aa8c3ebbe40708a8b6fa2a2df5542ce25fb16f528344ca46d50c47724e006a";
   };
   lexend = {
-    revision = 57564;
+    revision = 77677;
     shortdesc = "The Lexend fonts for XeLaTeX and LuaLaTeX through fontspec";
     stripPrefix = 0;
-    sha512.doc = "fa21e0311899513ca5f7031471189ce0269fcb35b5bb38d2e3d2e8015dab11ab2a10cc086ba6d41f24c25d99b32f91750371e3297c505ef4a522d61aaa24e5bd";
+    sha512.doc = "d6dc3d8936042dcfe3a479561e27cf5a65831a57cb3fb73247621ce2ad6ab586c97b8cd1c649b9392e8e1ca4478d459dcc666225ce93b115ea5c62ed7e19e5c9";
     license = [
       "lppl13c"
       "ofl"
     ];
     version = "1.1.0.70";
-    sha512.run = "6a9e4ab844e5189e996b73ee95d5ea5bda0d5d9f7b00a707d5bf9b7ceb97eb2f37baef9310252227701d6fc280a14a8a79ff524b5cdee3610c4dc48968f6b3b5";
+    sha512.run = "9d66ef119c032847ff53e4db43f80246e0b070f720145c8559dc7053d076158915401e25c60c69fdf8efcbd668d49e82f991a4f8dbc6fc2c70808dc0ed75f1e0";
   };
   lexikon = {
     revision = 17364;
@@ -30509,7 +30615,7 @@
     sha512.run = "1ef4832c34beb921e1848423b30db4fae8dd272db60c3d0528b8343810a59356b4ede8ea2adb3a87df83328dc1900fc6478ad9eb0d369e8aed728f37a1d8f187";
   };
   libertine = {
-    revision = 73037;
+    revision = 77677;
     shortdesc = "Use of Linux Libertine and Biolinum fonts with LaTeX";
     stripPrefix = 0;
     deps = [
@@ -30521,14 +30627,14 @@
     fontMaps = [
       "Map libertine.map"
     ];
-    sha512.doc = "4df41358232a62ad8895b8c6916650063e84fb7ec2fedc0969c0e7e7b638fb77b7b1a0dd507e5f5dd601eb41c78c73497b7062f5c462586458f9745338395cde";
+    sha512.doc = "97d1f73dc6cfc28718e2d673226ce749b7233640113340729a38785399d88dacb99ce9a37c5b2bde73402daeafea10940c69265289b214d3a14c18465be5d9ce";
     license = [
       "gpl1Only"
       "ofl"
       "lppl13c"
     ];
     version = "5.3.0";
-    sha512.run = "0587264c060334f7850b3ef99e374d404072eaae03e420e9736d82419e5e81c9438b627223bddc746e2f7d477f0245b3cea14e84bea6ec38a2f0e5ec3f284e59";
+    sha512.run = "c141d41a3c0746434dadaf9bb7179642fddc8300e1c6921e077e1d3dd62f301b25f76107713eb622c2c18d07dd64d3306e0f2bdcd62f90dc25e821769b43c682";
   };
   libertinegc = {
     revision = 44616;
@@ -30543,13 +30649,13 @@
     sha512.run = "0af71c5bd17a2c89d85c2df056e76e4f8ff98b24de40dd306a9c4207c15dbe9dfd08864736a3a45f1c82f51717396ea843082f6798b89f7e9ea8c316453a707f";
   };
   libertinus = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Wrapper to use the correct libertinus package according to the used TeX engine";
     stripPrefix = 0;
-    sha512.doc = "6eaf0b2c77dcdf8d3085140c22054e039814b2ec4a2ebf9d805177cbefcb46837e4a5a12e501ad7f18526aa0a3bd8258c5a10100d881e621a10e9c2434f8e5f1";
+    sha512.doc = "7e2dbeafa3924365c28fda93334c8dc1af7f7b2f522708b2964952a6b25fdfec053e22da0591aba996cc34bc6bc37ee4a36ba9e5931535f1d72692b3fd95f57b";
     license = [ "lppl13c" ];
     version = "0.02";
-    sha512.run = "b8cf7105a5d5ab8ba65515f04de7fad34bbadfbc03e4ce8bc828bfd4d6b154a6cfecea3417ed3df3f214940dd01d7f3786716ff2402b85f57992ec91363f778d";
+    sha512.run = "7a1f0ad40d4a43deed00b2492724fd889a389dcfa66c87665e167cfe18c4baaa7e558889033fbc9a14bdd21aea780013aa994782fe96cfb0b7b1e48eb395c698";
   };
   libertinus-fonts = {
     revision = 72484;
@@ -30561,13 +30667,13 @@
     sha512.run = "234dc32fa5b1f1c7a974444b264a1c258b7a12e1658f45146135d3f75ea8e94b4860282da79b5cdeb587c65f12d7476006d8546505c2842c306be72f51ee21df";
   };
   libertinus-otf = {
-    revision = 77115;
+    revision = 77677;
     shortdesc = "Support for Libertinus OpenType";
     stripPrefix = 0;
-    sha512.doc = "fa00ed8bf6dbbcea64158287e00da3aabf1cae93d902c7c7762d4f939b6285956f2ba5a2730cd2cf625aa4a1648c0cb540bc90362ec7ee048aaa9d37e5423765";
+    sha512.doc = "017eae776a1d583a691c33145dc5eafc8cd1f79aff3effed6e7fb900a01d2507743da657f0c590836d21b5509e35b271362e6bb84050abf2a2beb0e23cc14a5c";
     license = [ "lppl13c" ];
     version = "0.34";
-    sha512.run = "f1bb7552e8919bb7553335bbb2d229669b74fd148e7db59d3f41497251150c0825a9d5f34eab71b9d48d16c59597294556e6a60a528b70e5a51d6e58359f3391";
+    sha512.run = "e2ad962fc5438e3df5c3ebb0360893c466042f8793137a0dcec41c0a73a5fe55a61581a7e9d47746712ac063c3c852c3ea923bb118511a479c9a6f7566a68284";
   };
   libertinus-type1 = {
     revision = 76891;
@@ -30585,19 +30691,19 @@
     sha512.run = "4e55cf0d226d81a289a72d9905f4e836abb7c7235ae4ef80349f8eff0d9833a2b49f86dd92d4fb1ae4d96106fa6f75c118a125a2d91d6f22a688e4e38d17e477";
   };
   libertinust1math = {
-    revision = 71428;
+    revision = 77677;
     shortdesc = "A Type 1 font and LaTeX support for Libertinus Math";
     stripPrefix = 0;
     fontMaps = [
       "Map libertinust1math.map"
     ];
-    sha512.doc = "379f532d6370142295075a447a896bee803b0fccf0f43202fded27a806b0bdecee6ebdf0b8b1d8b261633914749551a21e1e48ffed6b3a920269292411793c1a";
+    sha512.doc = "936213b71d9eee48478a46ae871ab05b8a699e353a28bf146d8f639c45ca089be9e0b7320762c0948005796f697bfd4d7828da1e3763e7bb2dd36ba871f8cc2d";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "2.0.6";
-    sha512.run = "214589d198031ea0d9cc71b509f9c1e5f6b19984176d1d7952d57346f67a4ba88aed932e5838a57d874d8bbbff0daa296af875969b5c0ffd2c7a6f3830121d5a";
+    sha512.run = "206cba4e6ef72c67e0d10edcf2be2e18569da8a1d344c36533d620d7ea2fd4f36d7146353c72182016512078a196c4a9a826f482ceab0d0263f74de44b87b6b6";
   };
   libgreek = {
     revision = 75712;
@@ -30619,18 +30725,18 @@
     sha512.run = "2a01755bec49fa8c78680b0599b58649b803694f339383ad168bdc06554dabeab3047d1b17d63f7487860a5d0102dd8f68a78d5ad5ba94a2f8b29db7329e1ebb";
   };
   librebaskerville = {
-    revision = 64421;
+    revision = 77677;
     shortdesc = "The Libre Baskerville family of fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map LibreBaskerville.map"
     ];
-    sha512.doc = "9cfecbbfea90ff99af78bac088674061c7123ea046aa42da806fc09d6fe5e88c94fbaa3053bf87b563e55f514eda5cda108d5bf6b096253e79fa0d09567221ee";
+    sha512.doc = "dbc52ec0060fef4410337db52366b6943881d100e58ba1e497143df052f9fe5d752992cd6ac508a3dbfacd12516219449f2fe7d9164900e25a25424c03356f23";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "671894db7ebd325e35efba47a8b84dc9afbeb213358503f65e246e97af090be03f6591fe124d4f5b4c53ae99bdc7a56bf84d385597ed7564fa63f7fad5265e4e";
+    sha512.run = "b2c74baaac6e9d4f8f0aa62092a63d8006932d58e04ac670dae8d04b870e3febcb625d0d3bd9cb1fc568393b8a3b0bd8a7d375e6e042a21e415e0db33d6e62bf";
   };
   librebodoni = {
     revision = 64431;
@@ -30647,48 +30753,48 @@
     sha512.run = "e1bc9e0560febac6f6e56737ddc070fb9642ca6e701699dd3546e63fa681ce28a995e61b4190edaf4d9b9f9a4131b77436d69cbce47e601b11b63caa25bccc7a";
   };
   librecaslon = {
-    revision = 64432;
+    revision = 77677;
     shortdesc = "Libre Caslon fonts, with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map LibreCaslon.map"
     ];
-    sha512.doc = "9f7c6662af462f0c73b97de098cc4bbff5a3060e44a72ce294b175c5d5a3f520a93026b1bab17bdaf5c48d2de55c4045730386f7f8f046b3ff797c4d715acb8f";
+    sha512.doc = "aa21f3ddf33784f3c9b1d24f96489bbcca0a58854e41478959401a7744fc4b8100fcc08d4dd790f014f804f95c929acff4f994797b1106d95d8adca3666d81d6";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "96c3193cfc16b5cb312ff67303825c7e9733642108a601ee2b8dccc6e8d6aaa0db28e2da7c84faf71eaa1576ddab230bb6f385972d95f4aaba547e57a82b1e54";
+    sha512.run = "b5461c6c06940d025df290f3555c07e67ed82dd18bd88fb2901a1d3327b880bd956a572a88ba0940ea70e2c190ff74a3270932a506c6d6389876fa272d75c26b";
   };
   librefranklin = {
-    revision = 64441;
+    revision = 77677;
     shortdesc = "LaTeX support for the Libre-Franklin family of fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map LibreFranklin.map"
     ];
-    sha512.doc = "092dfd68010c10942f030828552e4609ded2b27bbd13d213556ad301629893748ace3380aefda1adc8ad23261b2de253599f6784b461fac8a1bf49cd6e1370d8";
+    sha512.doc = "9415664f73771915100d509cedd618878eddc88e69ea873c2fd8dfeee46974c883d2e4a9bc15f830eac842bb57a665ed2805feae55772ec9b5d5d1beabe28871";
     license = [
       "lppl13c"
       "ofl"
     ];
-    sha512.run = "35b304ca5b24ea88fc6a5227361db7f825a99eeba4b1ddcc31e5e71bda3f6ec911b00e2ec7ae9f54022748f39a26baa61aecff267628343dceae8eb8cb07bfd2";
+    sha512.run = "5637e573b01964e40bbfbc846efdb37c601cb24b82472034b491182b843458514a3a54bfda8c1ce5debbb2eea2bda9a017d4932d25576353faa7bf76e272205b";
   };
   libris = {
-    revision = 72484;
+    revision = 77677;
     shortdesc = "Libris ADF fonts, with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map yly.map"
     ];
-    sha512.doc = "47d57f85f73c20f5e855d940d07bf8a259fad143617b3623d52e1f9f8eef190d1768c4500a7f62fd392ef5d1d58dd1fe393057b03b676c14c6c2b0ef215f1572";
-    sha512.source = "7b375ba45cbe2984c401a127904ee5bd2b10de89465550acb90c28e9814c5be10915b74699dba4d7d08f84ee490ed909655e07599dcb7fa7b54ce0eaeb749e23";
+    sha512.doc = "b935bd1ef225eae640424186207b753c58346c0db5fd2839f5dcef8889d70681064f4fbb6860185b1f55a0a31de74198d73afd7eb351c74581d37953a4d3e263";
+    sha512.source = "260f21f55a663de22f61ebf984d28051f8125e470093252b9fd96401d8fd6db609670f5679ce81ce89c7687ee88de57d1a19f32c1e18ba31984e97c46d718b61";
     license = [
       "lppl13c"
       "gpl2Only"
     ];
     version = "1.1";
-    sha512.run = "e8f6c2df02d9eb9c3560c0098d13d7222887d97873c5e5264bfae15dd7bb238b8b2258c6a650863f7c8402799883f4ce9416732e0240625f2658a9d4d76c9270";
+    sha512.run = "668981b905ebb8e296004c4d3d56a15257b8a2799fd06d2b6550eb37bd2c790a5f8623fc7afd4a963b394b2c26fa1751e68911828fbadaf001654ac3a4a58d2d";
   };
   lie-hasse = {
     revision = 75301;
@@ -30800,13 +30906,13 @@
     sha512.run = "351256b573ac4999e5e203deb11c6762c917001eae2b9d7c8561070826cc55cc0ad669b9261062f7fdfbe2b3f3e9448083122a6f176cc5b14875a307a18613a5";
   };
   linebreaker = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Prevent overflow boxes with LuaLaTeX";
     stripPrefix = 0;
-    sha512.doc = "2eaadb2c67b1835e6d3c92220a9da0c9ea17d60bc7c55354b3462bb35e81fcce2c2ddda76c9633068d3e604082ec3b2a1f63d45a9a952bd28cb426b6b053b367";
+    sha512.doc = "f3a430961f778f7e07ec121c1b12c57d6671c90145575cd5cd07c091479b857692a8c9dff2159859b6bf7ffcc00518fdbfa3429ab3e6834a538a02204efc99c1";
     license = [ "lppl13c" ];
     version = "0.1c";
-    sha512.run = "143b0ffbd9567b70ea4cd42d03fbac19ae0c7fb61ca31fa6069095151c5344eb0cd443abc8a049a6cc6adc79eeec9ca92734a4f9f9ee3f9ac76983ce282ebf06";
+    sha512.run = "d384cb9c817e3d34d0aebca0f89f5c58ce6b10fcb2697b988f46c972a6c8feb3d32ae2e8ac4a7107f3d3c954a8a85c9b9bb7aa21ae9dbf0e8a28e0c679cbbbfc";
   };
   linegoal = {
     revision = 21523;
@@ -30819,13 +30925,13 @@
     sha512.run = "87a062513ff7674f315472cc46e13fbce99057c3b7083a2b9c93b92f09d538af29f5d1e3664dd5273080b9037ac232dc0d7491753b83136d2d3558ada1b81976";
   };
   lineno = {
-    revision = 75200;
+    revision = 77890;
     shortdesc = "Line numbers on paragraphs";
     stripPrefix = 0;
-    sha512.doc = "fa69de2f1ace9095f71fff88aaa865341863b0cd73f6291e68b78e8c4d1c069369cebe36bc099659d193c63263258c05960494a6ed53463d2a5d30ddec7f5d3f";
+    sha512.doc = "adee410431d65e83ed8622f0d6c114d53af77b747b510b562607b0f8bb08bf7e40042ef4d35e58ce3400cf33db9b001d2757e4e87d74a668aa80913062c7d0df";
     license = [ "lppl13c" ];
-    version = "5.5";
-    sha512.run = "a508e408223987d0cc093d80880b522c1cfcef0c377c17b364ad02072aa6ab8b2ea426bfcd001ed933c9befaca02c8021f4f91bd85e614d79ce0a4b6028ceb8a";
+    version = "5.7";
+    sha512.run = "e6dcfd3d3a4d073c5b877afc0faf5434899b68f70c51f618314a403abc8815d335a7621acca33ed578f607073a2ab765d4781c9e25b9fbe9b05e29618a1cea23";
   };
   ling-macros = {
     revision = 42268;
@@ -30836,37 +30942,37 @@
     sha512.run = "686dbb33df2670af909a80863943a8870ecef128679ab679f3d90d1747042b752c9aea15660c962b0f02418233d4d152e64357d5b57884a2fc2371acb3d90a52";
   };
   linguex = {
-    revision = 30815;
+    revision = 77677;
     shortdesc = "Format linguists' examples";
     stripPrefix = 0;
-    sha512.doc = "7a5d84d5425031d341deea8f37f1d8a9f6eaee820ef66661e8e38eafad2b20a5e9b04b81b1a0db0b11ab70fb0adc9c81cef886978626008eba6aa3c32bc0c848";
+    sha512.doc = "5a2ef447672cbbaef8fb83792f29a3ae5ec259b86fc2e54aac7fad309609ec61e3ce83d9b62b48d92754222e8da61e675f7dad8e3e2f114d2d1088a8f12ff799";
     license = [ "lppl13c" ];
     version = "4.3";
-    sha512.run = "36fab316a894029feba86bf771d4e600b3e7f5d766deb9d844605979b066483500c8fa0a425718d22e9a2bc14d74aada16ca8deb7ee744a81e18fee8c77a7b50";
+    sha512.run = "c68c56c96100f0cfeb4f79a0a89f0976c8e32aa8d36a02197a1f8a611051ec2087880bf0446a575e2df4a493875199aec0e5acaf3326f66239a8fc53e751590f";
   };
   linguisticspro = {
-    revision = 64858;
+    revision = 77677;
     shortdesc = "LinguisticsPro fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map LinguisticsPro.map"
     ];
-    sha512.doc = "8f0c8937cacdec2e2ea4999dd1bb45af96a99a3707ef22b54a2bf1e0c745d663550ff0b68d80cf895e8bdfa1f279873c4725c7851af547f06155589d8e5bfde5";
+    sha512.doc = "431217763414d3ffa9d6ccce9e63fd86f860960242404b711b0e8805831fcf50fd0627236f07248f46d1060fc6a3c41e827d4316629454779465366a96cbd116";
     license = [
       "lppl13c"
       "ofl"
     ];
-    sha512.run = "6bf94e8910ae03314a3ff55157e52586b5f2550c2aaca1a8989b1f02400c87363c74e00658ee953c13a44dd69cb253bda6128e66a96b865e6169310165a7f9e4";
+    sha512.run = "f14bdf9d08f1d936e496e374a2e82335f710778f9c64b280d5d9a9b8abb8a31d496ba0eab63154d7819187c1846ec7f4002a4b84a226d7f978ce9aaf4d69ff5b";
   };
   linguistix = {
-    revision = 77463;
+    revision = 77571;
     shortdesc = "Enhanced support for linguistics";
     stripPrefix = 0;
-    sha512.doc = "2371af1ab07748a89306eadf7a80afc1c25d6cbfb0dda544e90501e582ff8593c0f7d57fe3377212e0a85fe982f4ddc14be898ee5bec5fd294c5e749d5225fe6";
-    sha512.source = "cf92d2fe93c9b07c5cd4b77cfb42bb6f8263e95af6fcd83f21a1350e5b1cb9b42cb253567553c90aa32ffe6da53918a5a541c6f0d60658083639655ea943f43c";
+    sha512.doc = "f6800fc42060ecfd55b3bda9857aeb1aee60e6c18b27f124365771e4c9d907d6f13bfaaddf8ff2f0082fdd40f77334af0473e913f4fa8dc54bdfc340421867be";
+    sha512.source = "848b9bba2011b80d927666536f4010a94ef89f24708202ffa501aaa3e4a71aa633e8c145598f82f13ec684bfaabd35da6d96513a8b210e7c5a24b52556ef59b4";
     license = [ "gpl3Plus" ];
-    version = "0.7";
-    sha512.run = "24e0408fd563cec990c6a05b0c472b6528b6d762789063137b0272853389a784803ca0cbf38da2d71c24a49dfa1eb1d462353503bed2e6064514ea46b286a476";
+    version = "0.8";
+    sha512.run = "8b9ec866594e6e4896214998d0cd726f074dd9227746f5badd6eb0a23794494c429981b89650c3b9be8d7e704a01558f41d2a9f6a8e304aec3857a3e4794622c";
   };
   linkedthm = {
     revision = 75860;
@@ -30896,14 +31002,14 @@
     sha512.run = "3236f5f8f77248480f14566353f6ce197931325d9fca4a9b946da769c54a768716cfa92ec9c3d27da296b001768d915b07c076a27e795c57602c24768828936c";
   };
   lipsum = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Easy access to the Lorem Ipsum and other dummy texts";
     stripPrefix = 0;
-    sha512.doc = "1476a1a0edeba39caba0e0ed6cb23deb9cb3712112e6392f1cc339ccd06f8b69759b343ca5c9b709793d587819583ec22f977980e59f4dec197666d1f60540d8";
-    sha512.source = "a17b4d501847da66e5df25e12ec7916b0aba1da03abb4cb16577cf13b112dabddb71e10d16091cba4046e070d7dfb79f3ae165bb63df6cf99a010e517941f3ad";
+    sha512.doc = "a93f10bb78295199b54b22fea875cef2b05480f0e2582b399f08d0f707d13a45e69f63479fae37f25ed98de1855f2bd0229689192f1426e6625e096a3e8d43d9";
+    sha512.source = "13e1071e3d084c0aba682ab15ac61d5026a424e9358b242991ca5979193f8a132db135c4216b78b9cd71252d9b94aaeae8b79d9499abb5065c713c2188193a5b";
     license = [ "lppl13c" ];
     version = "2.7";
-    sha512.run = "ef835fdb20487bc50f7c1713e9eaab1324fa8968d436d910d16bf4246c75ffa4f9050476337938bdf687115f7a6df69078f125f0669cd67a5202b7f17f7f6d14";
+    sha512.run = "f8259a7bbd868ab2d53d784ad35c5bf3b7099c089b1996801b08192cfdb599366878d4f04c59cb8e6eb81e9dafe1a16a0b8693d1ccf6b9609fc137bdf9de92ee";
   };
   lisp-on-tex = {
     revision = 73165;
@@ -30936,14 +31042,14 @@
     sha512.run = "154a9eb9da19d4a1d9f6ed421bc13f1f83279cd456b95ab8b7d84f9c48d6aae5548b7357e46041580d4b457758aa090e6352aca9d9e20f1739dc589d4fa24bdd";
   };
   listings = {
-    revision = 76899;
+    revision = 77677;
     shortdesc = "Typeset source code listings using LaTeX";
     stripPrefix = 0;
-    sha512.doc = "0e9c8a4b49f608873058cd0a63fb59bcd83f99ac253c5e47f2b268174b800ff3c85af44466524792e33c4ac9216248a91f4e143f86d464bc4efc9bcf38522f2a";
-    sha512.source = "c6fa409d200044d2b7363266bbd5abc620d5dabd1ee86306ac11acb4327f4b7fdb32468e2c8a484afb4367a9d849d568a3038643cb130ae15fd8b2d2c8b62bf6";
+    sha512.doc = "f88dc94e3b9184ba5d70bc774f2af1e23a29914459aff1f24bc876c0c09043667d2a5297ff940839ac6a001a628bc1d9fac58961363ef61c5e84dc42b40814b4";
+    sha512.source = "68ee1c42d02c63bac9065bcd2658891f3453d5b255a4e50be1c459fa76d6736a89bd50ff6a9d244816ade9bede9d13bbef91317942c72fcac605121ea2b860b8";
     license = [ "lppl13c" ];
     version = "1.11b";
-    sha512.run = "6c631ef300bd8b925e4c0a346136da2ed19d19001c72ea32cbe194ad14446cdf6fc159c4d6bb22de9523a25cdfd90d8de278785f53722e7c18592cc897dd9e5e";
+    sha512.run = "658111819c55fafe23dc06215f72fac7fb5b0ce6203221ec8d01bdedda76ce2f99872adc1fd54ee634b77ef7a7386f9e990a5ee9f5d02d4b58c1b3bb99119b3b";
   };
   listings-ext = {
     revision = 29349;
@@ -30968,32 +31074,32 @@
     sha512.run = "846cc046ced340cafd98f009a55e891bfa6bd5715c94c0dbd5b124599c8e3aed1f248f56592795184fa040285001b0d967dfb26b0fb764bdfadcc2eabe8c3122";
   };
   listlbls = {
-    revision = 67215;
+    revision = 77677;
     shortdesc = "Creates a list of all labels used throughout a document";
     stripPrefix = 0;
-    sha512.doc = "773bb3996ee16ca65ef8a91e42e6d1641d42ae50de7fbe4b8324ad9e70d326d0fbca85e245d48bfea137a65f33ffc6e81add6208d239992012ac1851ca12d4a8";
-    sha512.source = "441fa4a8ac0e618a997078368794800f57e25545134533b81121718bcec912c1c367b193bf7cb3756102ffad4f75497e63c9cef611319aa478fee955c9cea780";
+    sha512.doc = "890c23243310246cda5895c78ecc562424b31839acffebd336a44f84305dca6a6797632c42bf25089d9b4b0f10993fb329a3f31d42bbb4a473a0ba4b512e55a5";
+    sha512.source = "39ec790515768c2a26a11f87bfdd648e1b009cd34e4292457d3eb64983fbc008fb3283f0014591e63a5a4fc939a36f23dda7e10425e9be4be456aec17cf165e9";
     license = [ "lppl13c" ];
     version = "1.04";
-    sha512.run = "bb0391bd671c306bb34abc336f74e203141fb0b2ae131dc36820e24716ddb5b7a1bfe9650baa5ba4cb4078e6f9d097a9a464aba1022b36f76c3257e25e583979";
+    sha512.run = "fbfef42f3bdb3c9bdb6d2b36ca0b52bd5be8921560ebc37194344bd2e8e81830a33591071c63c3654398cac678a3d8a729cd2519fe16be7e29fa7a28d3b10aa4";
   };
   listliketab = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Typeset lists as tables";
     stripPrefix = 0;
-    sha512.doc = "70ceddb9c59981319ec33fba05c663ecaf549b5dab56f29fa07f9c314d97d999c762ee1efff0d20b5e35b39e89b031458fdde4c5c708e0a1c2dbfdf17d710c2e";
-    sha512.source = "68b75e9dcce30acb59d928f4ff95732cd7e37061d31625f8c1835ef6b8da85ef39f4d8ee86b50e299e71cace2ca5307c25641042f325a93a93bd04bf804ec5b4";
+    sha512.doc = "f7e2b18fe856cecfd14ab6c5420ee138de5d6d80683afdec71d5d0285a37bbb99fcfa6d1ae045e86ed1537d1e4060bd2b194f0f72137ee8da9aeae2a6f9162cf";
+    sha512.source = "1e51f58885a06d84689b9367cbe9682db217efc4120b53c512f7decd5de7b232bc7602300211cd4acca2ad9adf1f3e91bbd39296a434605ea3cb3e3f689d5311";
     license = [ "lppl13c" ];
-    sha512.run = "0aead2b70e314639aeb98c199d051fb0701570df0263f452bb2e65408678d437c7eb071c41d8674971e42a0961da30754696a58eaaa41dc32d33ded58a833153";
+    sha512.run = "0b4ce941631b7c430ce5287dd9a8c1c094544999aaf65778c35261909cce475e675d0bba1314a8b4ecc0bd13ffebed2032c88eb79ada11d72c26c84402606e57";
   };
   listofitems = {
-    revision = 70579;
+    revision = 77677;
     shortdesc = "Grab items in lists using user-specified sep char";
     stripPrefix = 0;
-    sha512.doc = "57cbb93175df4f4766d3a00ffdd6701ed4c14efe8d33ce831412f93fd5fb025ae4cca4e1ec16ec6172da12dff830c61c9d888450f9b84197d45566309ba6eac3";
+    sha512.doc = "34fc37f9c65ebae4a381ebe3f441513dc3fb5c9f82604307a8ca88afebd0e332404ff752a0b034258261015882b0d002bc20ba20164a0feebe85509df08cb788";
     license = [ "lppl13c" ];
     version = "1.65";
-    sha512.run = "808395fdb8c7b9ec738e26eb582fbcf4555291695dff70558d415b34c640cbc4362be358ec35582be18066ff419718f70ca2be65ee30aee85d2fd57d7cd7b6a0";
+    sha512.run = "8d9643f502ba7b142d459b4f3c7160798eeb036e0f10ae551665347e0a65f173bcd514d07b454218b82c8099e0f8fb483d9ba73aaa61ba1758a508904ad0edb7";
   };
   listofsymbols = {
     revision = 16134;
@@ -31016,14 +31122,14 @@
     sha512.run = "7d718507fbddc6b35bc4d0e3a5674cce8b29f5a932ec01e6727955b7edcdb0dfa5531ee5433564098a85c641d56485db1fcb142e02d5e7ec22b70dc3ec873d24";
   };
   litetable = {
-    revision = 76865;
+    revision = 77677;
     shortdesc = "Class schedules with colorful course blocks";
     stripPrefix = 0;
-    sha512.doc = "cab363741fd943eedbe29a3e91fa8105856f45e49ccfdb598b29ca3d936392fecc46d55552d2ce3eab8d9366eba38e596abe8442a2b33dfbe2ccfe9c03b6e733";
-    sha512.source = "216ab6c244b4f5c8636c48782187514ac9071b4a703fc658937a9ec3e52e55e114acf3cb6e1d4235d97c2648625e0f18151cb692a145b3923489b3ba2702efbb";
+    sha512.doc = "91dcca664557ac45bcd1c4fe5f5f1462591b273377cedf208a9f7b4d03e8d90c82981e6fbffda3b6a1be82bb62aadcca97e23c9c224bd8619abc67d159455d28";
+    sha512.source = "eee609fcc6528688a673e7d9bb38b1b106651bf5de417709ea1c3f144cf5a5353f25d6bfea7c96039ca32d559a70cb6f0e6c67bbff055d4f980f69d86115da4f";
     license = [ "lppl13c" ];
-    version = "3.8C";
-    sha512.run = "2e5283ab01b8b5dd81ae0733f7dc0928f4b223d07a6060c93beeb251cdb58b451bdbd56a8634bc98fb38926c4b8d46bcb3b33fee390675b9ab20b7837261343e";
+    version = "3.9A";
+    sha512.run = "f8bc31ad5aba56774ff3bd5ee08c4d7aa772a3e7608f584bf60a091cea3089bd39e862f6ef1232c359de9eec4de8bc232d4e9e153de726b5e963c8568474d0f6";
   };
   lithuanian = {
     revision = 66461;
@@ -31066,13 +31172,13 @@
     sha512.run = "58c211cf1ed20b36e69ceffc8568fc1cbdb51cb812af79d16a64cbe8a8e7e672a2d49e672501b2cb23ef72c4a04c59017e17e538061159c8b9e797624f8334ca";
   };
   llncs = {
-    revision = 74287;
+    revision = 77677;
     shortdesc = "Document class and bibliography style for Lecture Notes in Computer Science (LNCS)";
     stripPrefix = 0;
-    sha512.doc = "829a2538b4ec538045f770eeeb8d13f4cd6665a29204f97f40307a0a5a929126977aed8d4a7b01db31adabf2876d455cbc5bf7966c221d6e83b135a48226d85b";
+    sha512.doc = "6df363151319812a118daaec16ec0f781ed3255b6a9e9c50ce884b3aff4d9155b8cb938780433ba411665108c9dc9c2e2876e56743bd507482e542543a480dbe";
     license = [ "cc-by-40" ];
     version = "2.26";
-    sha512.run = "730e2019befdb52dc3581325fa185dd06c36cbbb644613af8a111b48ff2715258baca4d63be22cf38452ffce3b56fdaa79f29c06b1459993ec0eb94f99fd81da";
+    sha512.run = "36d03a90ca228a4f9210d0c723c6e2e67cae7a8e6e49cf394bd3155b5c1bd60360f1c761f7336d6c64625a446414a4749ae30dc8eff714c3dc3fa75cf7c64d80";
   };
   llncsconf = {
     revision = 63136;
@@ -31084,16 +31190,16 @@
     sha512.run = "ded1d0ad62120e6665653575e6641a9bacb1fdd18b168f7c4389e2d8bbca6afa8cf15bbb7cf087f2ba502f85bb492dfd5d79862e03d909227666af7d8860d47f";
   };
   lm = {
-    revision = 67718;
+    revision = 77677;
     shortdesc = "Latin modern fonts in outline formats";
     stripPrefix = 0;
     fontMaps = [
       "Map lm.map"
     ];
-    sha512.doc = "d15569c1f55553b068b8d3a73efdbdb74137d02fdda5db5d57f29203dcd92dea7746b73a3f30293b2932f046e60697ea015b83d2587cde2783300fa41967c5b0";
+    sha512.doc = "232d070d59563d339a5c59e6dac93d7662280f6186cc591f5b520322a879a97214af2fee3a006c85660864635773355b357f6aa1eb48b9a10a50bfa4702208e6";
     license = [ "gfl" ];
     version = "2.005";
-    sha512.run = "9e05642ab07ebe05c13d5fa98f3212527aa66a9d049f8eade506cbd9f0652315363a01ae20a9df873055e5283bba7574d51251c7dd86e56ebc37055b92379421";
+    sha512.run = "bacdb541c99bcf1b25fdfd87094a98ce48642e534e0017676fccdc81843f9f1e64af271180589a96513915dfa15a782458e151c760ddb26929a29ba0b9e141ef";
   };
   lm-math = {
     revision = 67718;
@@ -31115,28 +31221,28 @@
     sha512.run = "3613e9d53808b2d1e326175c28acb672c1f244b2e00ea1d544e1e05c73e2a93e49b5e8b187a8a73e87ffbb00c22235781983a2c0a733a6ae5598db12c278a763";
   };
   lni = {
-    revision = 73766;
+    revision = 77677;
     shortdesc = "Official class for the \"Lecture Notes in Informatics\"";
     stripPrefix = 0;
-    sha512.doc = "4ef203245669693a80a841133e36a4a9333a1101eb003972b2b178204d4f0ef3d30e07ee06c685edb403be4f52ea613d751ad0152ca20e9561b0a733ab1adb81";
-    sha512.source = "74e22fb74be37ca0ec0b77e41287b6b0823f298db1f4d62fc892fa5d0d055a0ea42004a8cb3a43a29dd8b73c54f8558b4d36960936fe00944572ea3ea5fa2c63";
+    sha512.doc = "7ed40acc4e68601d27bf787764ced4bf33529a63aed1a0c16f857732d0d8a7ca9b9c59295b61bce9b5e77eda9e7cc65dbbf4162d4eaa9f578408644095ddfa97";
+    sha512.source = "aab76d86a9262d197dfa0cca2f4c8cddc4b3eee8a97f5d28bc36b5fafecb279ae16bd0e7f2b083278aa96ff898d09731569bab42e05fda010ba76dc2f690a5ba";
     license = [ "lppl13c" ];
     version = "2.0";
-    sha512.run = "f4e797b744457908b9f7aae074d56af30e0fbee0ae0913945b545d4c6266052dbdb7c73ee38e9260c50b1fe4b352afe1d8a1aa05fca0562b557ead6e80901172";
+    sha512.run = "9273cc2ccebf62bafdf227805d6ba5226c8ba0bffec7476eb6a1000057a19b4ec9e316f645e6128f6969ff7816850d10d1edfe042eac7fdf98d90f07d94e8894";
   };
   lobster2 = {
-    revision = 64442;
+    revision = 77677;
     shortdesc = "Lobster Two fonts, with support for all LaTeX engines";
     stripPrefix = 0;
     fontMaps = [
       "Map LobsterTwo.map"
     ];
-    sha512.doc = "a02034161dcd7d09ab14d907fde0b4cbc570ee7e13fc1945e18c71eaffe90e5dc039266f0ac83dd7887fa1e298add0d2be9e4259cb58f6dbfe13b7bce228ab8c";
+    sha512.doc = "061ab3a8cd7a2da9781b7f6ce6541ed95721b71be0cc69d3220e279239828122f2512512e35d6b920705a90cd755ea99d6f21e10d01878f652c40b0c4a831b1c";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "ff9a64e40eb1e8d19ed353e4c6e46472f48eaa057a1283e8203eafd895cc622c031a849cf2cd941a664b07c4acc0e9fa18ca65acf6420cb3d40ce09c6ab6f391";
+    sha512.run = "68bab862fc752ca47975ca24463fe8f9a1b1bd513b678173c303bbb7f4da807756beeaeeab7fdf35250692cfe4fe4f0a15cb273bbad60a08f6f1abf45c0a4858";
   };
   locality = {
     revision = 20422;
@@ -31185,13 +31291,13 @@
     sha512.run = "d5b15ee5f35a9ef94618f8b092e97ccc4f1959a617c2e604b99ba56eef14c4a1a078d66f2c77d02239289e30878293ea6c9ff4134bd003331fc41fd3db19cec5";
   };
   logicpuzzle = {
-    revision = 34491;
+    revision = 78116;
     shortdesc = "Typeset (grid-based) logic puzzles";
     stripPrefix = 0;
-    sha512.doc = "872a72ed13f7dcb43df3bd2f2b7bd504e3e430030115faadf0a130d2fd94331a335c4853e37c78e4b8aa7c59a44bfd87ad2a484b1b836c2a7526b97ef26ddd56";
+    sha512.doc = "205572060e55202dd8c3166279b9b38601a7978075bf78abcc42bff2cde743a46e51840921dbe4e8faf283afe52f23377832b62ac71f6e912cf8fe7d9e66d1f3";
     license = [ "lppl13c" ];
     version = "2.5";
-    sha512.run = "2c642c7aa6d6f12e51228432f8bd9fab906ff4dd3354a49f636582a065bff0f534222161ce11306ff6bf3e354a9ca6f6394cf9826b321ac94e9ef5ee8c0621ff";
+    sha512.run = "a7962796690b6ced3d6730e059bf134db6c9d7adef256ceba64f304aa54a29aab851eda748b5e97d2920a9565d1223dbf79e1c917d59c487f81d18fe79c5929d";
   };
   logictools = {
     revision = 76924;
@@ -31276,13 +31382,13 @@
     "lollipop"
   ];
   longdivision = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Typesets long division";
     stripPrefix = 0;
-    sha512.doc = "15ba756d5aa0ecea90e35de978db1526f2cdbb73b0ab7215fc2ac7d7e4ba5edaff16555e016d2c4a9dc8184d4f4d17424e22f809504a1bd48697a46698beba3e";
+    sha512.doc = "6df6a002a79ef785a210a25e86859c6f8e91604b948bef5efeb0350d57c974fe1757771f1e2e1b6f00cac5f25642b46ec7c40fcfc0f404234576c3d7af6f45ba";
     license = [ "lppl13c" ];
     version = "1.2.2";
-    sha512.run = "2b070ac24dd1d5108b7c02fd2da90f9c9fa32a5293771a8812e8066e40a4d9d506b0c35baed23d4d8b722714607dd54be846deb7e2a006fb55f975b4d0ebc9fc";
+    sha512.run = "99647835db853873a9662799d0171c7aa04daeffbd087c2d9c26c31ba9abfeee9d116931bffd1a1573ca1743e3b2f8be53c16a3d81175d3c1e5b6a53d73292cc";
   };
   longfbox = {
     revision = 39028;
@@ -31313,14 +31419,14 @@
     sha512.run = "56ef12e34556b5d64b2cab1aa2578868bbe8144fa276d3771732aa732271239a3242b2ca5884c5d2eaf31c9f86d30185e3f5fd96a07d4bab9dd2c3b0ba7b5058";
   };
   longnamefilelist = {
-    revision = 27889;
+    revision = 77677;
     shortdesc = "Tidy \\listfiles with long file names";
     stripPrefix = 0;
-    sha512.doc = "d909908d763342790b8ab56d333e60d7047894472f3922a2554581a5455539845af72d3867d0a55f5a27e982aa8128ae1a948f40e106fa127f2d01156b55ccf6";
-    sha512.source = "af1383755b422a3bdbf7af7437b732a39aaf666c7244e75d498b1252d3644e58a18115a744c4b4c7fe1433f415b40886868faeb064b13647452d444f64fd6f9b";
+    sha512.doc = "2d986023fe05fdfded10ea0d7c4625c702e4a2d9ab6c0f5939289ea4738db424fca507c2bc0c1767526b7f08752a8320197fa3d69b8006b01715372e615bde43";
+    sha512.source = "2332dc237aab30f395b7580ac88b4b96de207288df40d657056868b8ca0727015d6172b432d44d84b936100c8e07a99550e97ba12487d817a6e9b1f326bfa2eb";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "1d16ee9c76784c5124de3abe62b6e916d0f65e979a18a721ef688a960e5d20382dc976de0b68d95c47e9651ad71a67ca97a828f1bdfba8e4a77ac084d7561386";
+    sha512.run = "8bf3bb0423c664d2cb5df9fb6775ad74670befa6a2f4f11ae6a3bc3be84b7317d71d56ff43bd9b486596b5f4fbb04384e7c8270ad8f6971f6624d0dca5ce382f";
   };
   longtwocolumn = {
     revision = 75852;
@@ -31342,13 +31448,13 @@
     sha512.run = "60ee6999e43ba9082c5a283dac5a930c9075b24f6bc7cd3f719b0336b01dfcb17fb2d5e3c82b9f1636c9bb3e6c923607a3d9237d08fbaf17bbfc1196d0a75281";
   };
   lparse = {
-    revision = 75712;
+    revision = 78116;
     shortdesc = "Parse macro arguments with Lua using xparse-like specification";
     stripPrefix = 0;
-    sha512.doc = "2a63997dcb656a3802ee5136369799b4bd9c01706a19e1350f71c5ea061c1358b8835b72bd7ffc1a34d4341bd00b3bf45280f92940ba7d7fd32bc239214b0ed6";
+    sha512.doc = "15e87a4a9facf2934afad626e3347b8523187a85ed73630a170e04f8a197233cfd7c32c59e4129614be25ade38b9f048fdb06f4ac21b644f978c925d5b899162";
     license = [ "lppl13c" ];
     version = "0.3.0";
-    sha512.run = "ccc024329c0871ef8d0378b1678291983efb129e7792bb09ee17856ac56951d636b19de914fa29f5635c91a42a8fe9d479574a22fb64f059e82c3430e956e624";
+    sha512.run = "7b5ac29ddce8ada5f217ca956855e9bbc8de7fca7009933488eb3437dfcaa9be205c4aaf968b61334690776e44944141a3a70f94e14ba92da1e5e4421e0e8d6e";
   };
   lpform = {
     revision = 36918;
@@ -31660,13 +31766,13 @@
     sha512.run = "90b11706bb0a60f75a588c45cd2c62a0972f273feaf2f3900e46d413a0456a8e0c43078ca3c3711f290571482f405230bbb9e1542dc01159b3a66c7d8ceec372";
   };
   ltablex = {
-    revision = 34923;
+    revision = 77677;
     shortdesc = "Table package extensions";
     stripPrefix = 0;
-    sha512.doc = "c3ab3559880077f63523c84cfc5cf363cf9f1d2c4d8aa9cb173b4a2dd07e5afbbdc9b1ea1b29cb50b64c68d65f4470dd9c1656703e0a1ac8955b72b87e33e804";
+    sha512.doc = "28dac525a06ac9f7d837f93c44f35d155796359946729362941fa4fa5e3deeb2bff4f80008b13b16e1b92cae4bea3644a49453ea0c0797d87dd4227ad11ff4f2";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "5a64bd2904338fc45d6150c6be6497d56cf2e190c41018527a59ef075db41f94378f8981d4b92e211f60f2d641408144c546f2de0bbe4a8e94b0a3cadf4311a8";
+    sha512.run = "d3725fc0c2264375e1dd142094fd4a764bae90bb0c307a36f68726e9e2d61611f823737688c32150d5ed1ada9a7985d2906e297297315e2d99df89a60f7f9605";
   };
   ltabptch = {
     revision = 17533;
@@ -31688,24 +31794,24 @@
     sha512.run = "42e634e7c3018b87825e2bae40513eeb757520e1dba1b1b20244bee2d0fadc4663cbfa0dfdf74fa71f7821f47c41bb7c873a64cc68e153f9b7207f6a8bf3f8a9";
   };
   ltx-talk = {
-    revision = 77540;
+    revision = 77959;
     shortdesc = "A class for typesetting presentations";
     stripPrefix = 0;
-    sha512.doc = "2f10a1f8bbcdd127cb6f332b734f390bec5791623d79846f7fc8b86dfe0288a75423f55703728cf9b88fca1136e77501dcd312a5003e8bd04b9d34c2376bea3a";
-    sha512.source = "ae060e30e0c77cd3cca9649ec43f50daea387be7d3c9c98c2415939d9476b4cc1fb8cfd63e67d06533d710c0bcec0f72ca775db27e6bc685c7236a5836c12ac2";
+    sha512.doc = "9a99fbaa7ff0c48289d45af0cfce52bcbd64004e50dcca6e6eec8e609fb8fbaddd95bcb089aadbc1d8ae4610d5352b602cf5fafaf44cba25eb9420e69e23fbd2";
+    sha512.source = "9dd3522875bd422f7285cbf20cd437fd00081dc4dd4bff43bf7426b2aec93baa2de0a65219feaedc610a2fa1be209cafe5548943680ae023965e0fe845a7cfcc";
     license = [ "lppl13c" ];
-    version = "0.4.0";
-    sha512.run = "845e6c603109499ada78a6a1c136d7cfb4abaf40184fcaef5b9629705ce0f740d17114a17f1869392b7564bfb284ce6ae5219b5e951f303c2f4538062b69ca99";
+    version = "0.4.6";
+    sha512.run = "440e82f6938646f21079b94930bf37827cdf03c16f55c683a3d532bc35d5f880662315b41d04d2f091e7accdef40e8757ee8f01a28995244763147e2ca14ccf4";
   };
   ltxcmds = {
-    revision = 69032;
+    revision = 77677;
     shortdesc = "Some LaTeX kernel commands for general use";
     stripPrefix = 0;
-    sha512.doc = "21be07f4f98531621f90b7ed23c06fa4b39fafa12a83c45784b83b5f9728817657b5c2ac2c09e4988ce0c6df0918a7c93d29d7ab89159cca5ce5fc9e0eb017dd";
-    sha512.source = "becad978f8b2303a44057f165cdc6d22ddec03e58a26a0d6350bfbaf6d681ba43b105b65492c5be2382ee1e4f814129f86abc2ce376d2d42ddb0fdbdd2671d01";
+    sha512.doc = "ae8cdbf52757a4254bf61d9182338ddd93cfe42269d3eedcdf47659f70b4bcdec594b8f434b3b57d4612a8f9f91ca2b76ac2487e606b79fa1df2f29a4ba86e47";
+    sha512.source = "854712fb7c42aa0f8e645732d74b4279a37f104b7a4371f1d8e688d2f7b80b65ada7cabd724dbc24e9ca17fc72c1e08650fb34832ac187884f5f5f4370b0b68c";
     license = [ "lppl13c" ];
     version = "1.26";
-    sha512.run = "9d9a9835f4547200b160b42c07e918fb8b2cdf9eba91c30647c6fb1c74cb6f9ba60ab40bed63514ecbf334d527148b31fb1ec90af60075d19e28d10d675ded68";
+    sha512.run = "9206308fed3c14f21ced9c5ed7873943201e42217cedeb8fa5b14bddcc5e6720e36a1b63db340b1afccaf500c1406c7c5891c8e3d8e687f85ea4ea52dd80dc66";
   };
   ltxdockit = {
     revision = 21869;
@@ -31793,13 +31899,13 @@
     sha512.run = "60ad4731ac61f9b5c4360bb3d0c6475e2abd358418e20bed29cc94761fdfb97fcf02829b9785e559ca6052a1e82ee7f0b104b166592b9fd87237679ac3caa2e6";
   };
   lua-check-hyphen = {
-    revision = 47527;
+    revision = 77677;
     shortdesc = "Mark hyphenations in a document, for checking";
     stripPrefix = 0;
-    sha512.doc = "cd756e0356b36ccd26d1d78c67026f5a27272ac383bdfc6f44ddb630f58d067c05fb9152f1ed9793d71a63af6607107b8d4b5af311563e2c3d966079b2d3e0c1";
+    sha512.doc = "90cccb9a5da40b3775348e13bab8d68d806ad317560bb0bbb510de27a7d90678f9b8c31f658aec37e6e50724bd2ba94102a4d918dabdae5f087706e895234a46";
     license = [ "mit" ];
     version = "0.7a";
-    sha512.run = "89cd0a13578d386bbf584f3c74c6c3ee1a45a7c0bf40480e5396f86b2af29b26abe3ab8aac69be0f1fe23cceb6da33237ea38384854fdfc7be6939832a8cad08";
+    sha512.run = "43eb55ae227e66e15fffd48749136ae1681866b7a9f9028ab69922ff6715a0db4c3f5576288870105103e25a9aaac78a598fbbf56c9551e18e994084cfb66519";
   };
   lua-physical = {
     revision = 59138;
@@ -31829,13 +31935,13 @@
     sha512.run = "10c384eb08fa4019543c9947e13ca23fafc0f0b5ece2e9974c118b0e09982c54601234f17a3d2fd179630b4f67e6cd32091c6e5e18e58ed0cdb11ec7c75eff1c";
   };
   lua-tikz3dtools = {
-    revision = 77460;
+    revision = 77677;
     shortdesc = "Not-so-experimental LuaLaTeX package for 3D illustrations in TikZ";
     stripPrefix = 0;
-    sha512.doc = "b71beb348fcd5da2b8dd7e54ff860873876186b44e83ca905578d8bfe1a12f30a68513df22979f6c59237a2c4cfa7ffe73322e5692ddcb8bc9e8eedebcdc183c";
+    sha512.doc = "ca0cb8fe6e378aaf65054c0a63538c6b2f562bae20f5991d7b8c08eab07621294c8c81bddd93e6d20d81752ff23ee6ec5eae4f56b946a3e448f0f38256776b43";
     license = [ "lppl13c" ];
-    version = "2.2.0";
-    sha512.run = "edb43ca42b124125fc016ae3770fae345c355b2febdda0bd2778aa523493751b0d5fbe9dafb9f477eb3e1ca590667bb8c24f2b252984edb49cc111c719c88978";
+    version = "2.3.0";
+    sha512.run = "0a5d8f515829849d5056b9633de12b508334f0b74babbe2d83d8cecc465d98e649a8313c694afa001cf4a2c1cf3536a470a5c877c62dd7de59623338c5b67f13";
   };
   lua-tinyyaml = {
     revision = 73671;
@@ -31847,14 +31953,14 @@
     sha512.run = "8dc998562742e65727a8053c6b42e1ffd6bc6f618d873145b8d71b6243adfce41afebd8dfe68733b9977eb3def7ec837c3c264ec2350b40bf917d013ce7a1960";
   };
   lua-typo = {
-    revision = 77296;
+    revision = 77677;
     shortdesc = "Highlighting typographical flaws with LuaLaTeX";
     stripPrefix = 0;
-    sha512.doc = "2024f703cfa0f74ee7ea760be61c51ddc6a32a9c5ce46d5d6715857be4376b4c431fb5f34d28c2626aaebac14e1a26fcb51e2fb5af1448fdebfe57b0a5a0c08a";
-    sha512.source = "b75a26b0d0a3cbbe602a76fdae1e9e7ff5e316372bae54834c7f98bb0693db26af916919462c5c0b2e077ce398167b9b1893fa7468bc3d87135b090cd8e5c4b4";
+    sha512.doc = "b694d28948fade1d71233b4b7cc3a00743e1453f2e90c9c6b3b01caea159596d71e1afcd560bb658453a8281a2053b78b487822211474499712cc800515e1af4";
+    sha512.source = "d859d549be295a5ba4b426e8e15f2da3ce10cd9b628360ad89777a4ea7cf8bd13cd73779cc4b1f0375a71b731ce9e6f274e2faac4af5c16a98acdb1c5cbe6266";
     license = [ "lppl13c" ];
     version = "0.88";
-    sha512.run = "13ccea4075f5f41ea8b167669c3546d671a8b32ff5cc7de698eb93cc37259cff7a68ef48c6ab983bd8754e301b36fb2531a72d455334f849299bc1ad77c01d58";
+    sha512.run = "8839bc1fe58953781d2b8edb2ba3a6c0ae2c982a4f0527f3c2ca1f0e822547d1335c143f8160273b978f41d83e7221b1d0853f1161a5322631cd797d34ef5ec2";
   };
   lua-uca = {
     revision = 74807;
@@ -31867,14 +31973,14 @@
     sha512.run = "560eca39769ca188ff42299bacfed8900d4b77380891b12a8ba9eed8451b153359e783fa09a9df05d224d205dfb4fc627f9c2a6d89312ab45660b0037ecc0396";
   };
   lua-ul = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Underlining for LuaLaTeX";
     stripPrefix = 0;
-    sha512.doc = "d4412b1c8bb3b5f1240bb17b41e61137961591aa4cc133cd2033969b26272b5c24a843d73baf09a24e750af2bd20426397cf39d89061197345df6d0ec1be3021";
-    sha512.source = "9f366c054c84b23e6aabb07aa3c8d43ccf185a6f554ab95c51d9b0e29f1179c8b61808fc8afc578b4aec474c7150a3f9375db22c300b0bb2a24cc08a6b388996";
+    sha512.doc = "182aa8223c9ecff991142600dc345c399ae89e0379f7f19cbda595b3a3bce929ff09b891c373c91ed058fd78a4d395674b7fe960eb4bf0a22ea7e62a6b2a73c2";
+    sha512.source = "30cd71b27d3d6cf8a203d497110e0f489cf541d86c1719399347688e072e6e8071c42ad30a4243a4507fb1a556d5e398dd49b924e44b28ee6743bffb37828cc7";
     license = [ "lppl13c" ];
     version = "0.2.1";
-    sha512.run = "445e96ae500cb30ef0ce97c0567a67ed832cbe955e5af0373d847c0ad5531bf6ecd405ca0e6fe27e4a3edf52eb1732708a39d85b617f2d61e8c9d222a21564ba";
+    sha512.run = "090f4a12883c65fa67c4109334527b83442de46cd1e531f5dcbacbeb7dc2ddd0320e79dd16619d2774bc997158eae3f97e6b91a8e63ec309eccf2dae7b90a833";
   };
   lua-uni-algos = {
     revision = 76195;
@@ -31886,14 +31992,14 @@
     sha512.run = "50022083eb3659c994e571d9bd9c9a916b9b47e34c2776e73515afdff0361b49fac8da59c1532a578a5518c70236983be4bbb2412845a30064d421ba3c85bf66";
   };
   lua-unicode-math = {
-    revision = 77378;
+    revision = 77677;
     shortdesc = "OpenType Math font support for LuaLaTeX";
     stripPrefix = 0;
-    sha512.doc = "f6842241b4da72f6b7f3d1bc93d68f84d4fb6467c82fe1c3002a1ee6fb854aaf30163122133611128c72ae9d0f580d91dff4022e83059fd1036d2e91f3df8b9b";
-    sha512.source = "0ac212bdd190209483c1efb924dbdb51480ad837c2953ddad400c81a0e9ea2329ec79003221e7a5cc3f1434d50a8b74d7381721bc7cb750e392212c21b3d14ad";
+    sha512.doc = "5e20056d8e27b3b77287fddcb0ecbd4e5b65e3a0e8b3e91bbb9e5238fb0449ccc7e63ed92479383919eae568d974c02c1d162371203a467c492c2d4f6dcf8a14";
+    sha512.source = "16b2f7e8069c5e795aeb9c47836aaf692f3b6883d6168b7bfc79ea99576309238d155c62df1f21610e1e4744f05cc7d7258ff75ae8e2efa9a7189b8ac06f5baa";
     license = [ "lppl13c" ];
-    version = "0.6";
-    sha512.run = "1aa290701f160b5a4e944202b2b9008f41f1bb6d7c788a97cbe5db9c4166fbf0ccdbae2349c3870330a34791c73ed9f063bd9d73c52dde57a3d3db357081995f";
+    version = "0.7";
+    sha512.run = "0e37ac06473731856985e6197b0c9f77bb09235c7dc1c18d5b1c4870d39d17f278b9495165ae23126f49e56ab5404aa51c0c1395e4094e1698ca1f92a58800d6";
   };
   lua-visual-debug = {
     revision = 77207;
@@ -31905,17 +32011,17 @@
     sha512.run = "ef0178f84e30b1a6498721699955b5f67a77d306e957c26f9acf19b96fd3282cc50ae919112d3b01ee75be5f55b9ee0714cec54c5a23c502f341ae8d6a0ab1a8";
   };
   lua-widow-control = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Automatically remove widows and orphans from any document";
     stripPrefix = 0;
-    sha512.doc = "ff8b0522dfef092715b8beaa4f8921c40bb44b810cd61ccf460a853399a8f7ce97f6b61b3aa436388282cb67da88ff328e0f3ed7b2399ea770e511a9841b8eb2";
-    sha512.source = "0360a011e3dc38347dfc90abfe44c61a9992adbf7ba31c52b7387df353b7574009c2bbed355e40486dd8622584f65da12207f0e58db3d393565368df2ce6660a";
+    sha512.doc = "6147fdea550b97290456d7419a4bcb5b0e6535f5cf7c71a6bd7c485e4b016943ca4c9455e73909d2f2b1e25e474dae9d0b86e56309bcf96c6788a582b533ea83";
+    sha512.source = "8bf25480090b6ba82cbe832a48e1be629c362dbb6e6bcc61906c49a9003922b0acc22cd602ca4921fc048850b1bebb5f48364fd52b617c4ce61354155b758b9d";
     license = [
       "free"
       "cc-by-sa-40"
     ];
     version = "3.0.1";
-    sha512.run = "2cd761b365c1b6bc26472a497ccf68a4efa76fb92306205e563808930db1b90146d2969fdd14289442eb9d3cbd132f17580fd32849491b593435ecf37fa7a03b";
+    sha512.run = "b278d662f5ac42cc84c0404ee4af408077e652898d75b845934c4f67190b838d8a7fab5ba936889824c9d1cc04297861e6b97db49e8fa3f14ec5de2eba7e0636";
   };
   luaaddplot = {
     revision = 72350;
@@ -31971,24 +32077,24 @@
     sha512.run = "ba7d901acdde27026a02dee4574980a1a2d7ecde818b6ea903154565511d0ce021db11c1d27ac8e7480f309b362476dda274cda8ff71e1a71b557f611cdc6dc7";
   };
   luacode = {
-    revision = 25193;
+    revision = 77677;
     shortdesc = "Helper for executing lua code from within TeX";
     stripPrefix = 0;
-    sha512.doc = "622a2417490fb818d5021bb519ea7ac8d886df5002534c4d269268ca4d2119ccc15b029111edb42d04a546e7a46a60bc8eaa6a0a108e9231cc49fc2141ed8ec7";
-    sha512.source = "fe53aa46157e24f7f637584faa0c18de62ce3857d9841598f51e09a03354e9cd44bb8fc150e91d5b9ad6d1ca150a065fb1507847cc385ca67bf67679669d7ef0";
+    sha512.doc = "0fc5441c3156c22191aa68904c9a760185559379002ed60038685a2c7a64c81de67bb10e810a9b0a2ce616f1f9dcaa2891adb5db1e8e2da563f94fa4eec71fa3";
+    sha512.source = "36e9bc2ae4746ae3e817d3dffe3750684051004989489e8f78ce488c5d04d5c0fda7e7800e5a419c63b180be37e0eeb03d8fd7878494d26b5a5d56aecf0282c1";
     license = [ "lppl13c" ];
     version = "1.2a";
-    sha512.run = "b107c9cf774608782c1ba1ce3ebea8d330ff9762046eaa9b9de112b704df1d0da1bd7e33b15e9d847f232b7594d53fb2678cdb78b23d87aaac73cc2517ac8e1e";
+    sha512.run = "506b17d790554a3292d5e87df1f8874725db019a025d73640416f6e74fd33468cd1a0c0c64d758a934bc4e148ee80962fca7d9d9c7d19185ded0bddf894c4ea9";
   };
   luacolor = {
-    revision = 67987;
+    revision = 77677;
     shortdesc = "Color support based on LuaTeX's node attributes";
     stripPrefix = 0;
-    sha512.doc = "d6654c3ac1ca1c18cc60cea463cc3b4b4ed902ba6c29521883079123b9906f089ed25e2268e7a1f92800d9b1158225b50c0b019ea28c68b846e73bcb350dee6a";
-    sha512.source = "8b29907f0e0d865704e5de710ac2dd37607330d66a4282ff1f4673306be40ce366a0c2eccdf4dd25c3592e804cd6fa1e2a35044c494c4a3c73e64bd0c264d102";
+    sha512.doc = "faa5353b0287bc804912aeb49750023f0628afeafed8431f39a6ca7956918eb555fa9a1bf5be5587b31abb663600311eb795158f10a340c520bf1b8cdd6da700";
+    sha512.source = "748b4d15017351cb5835457d271a3235d4be9dad6bce45c39e3bce59eef8b2b9c59b29fa8b91b3c6270bf9a97b6e049ab7294ef8807c2f70937028d0a52f2779";
     license = [ "lppl13c" ];
     version = "1.18";
-    sha512.run = "142376345f25de68236e56fd334d8f24af90f510abc0d2314049bb03142df76988cd5451e22cf98df4443348f7686bbf9c269e311d5036cf8ae621200ae585ba";
+    sha512.run = "73dfc7a9886217f000959d274af3e7fc7a5e99bcbefa85feb625c109894db5353d6d055834f8ee01060cceafc92cd593aa104f6236a7fe328d741ba6fb1997b7";
   };
   luacomplex = {
     revision = 68883;
@@ -32075,13 +32181,13 @@
     sha512.run = "ec1ce2020efcfa3288c70d79756fd221a2cbcfc873b4f7f77d23bb18ce16764873c30a6d24a36dfd86af5ffbd8563c0c9e863cbeb78b8487725fac7f6c153bc9";
   };
   luahyphenrules = {
-    revision = 56200;
+    revision = 78116;
     shortdesc = "Loading patterns in LuaLaTeX with language.dat";
     stripPrefix = 0;
-    sha512.doc = "1487269c78bdef7aa626bee1c339358aea03af7df17cf92d48e56a1530b5e4bb7a5dd56fd7e094512fc3c149343e35e9e1683ffcdb8634042f26e86083f3ca69";
+    sha512.doc = "b2e5c6a0cec5801a339433e13df7bbe3e0c2e4ca6f4ae76971ac422f25d521212d4a5b6fd5028a468041df3c8201770858c23ecea532bb787506d089b787f965";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "01025f1aa9abf7fb0c06045e8bebba3572b1aad06bb6edafd916e721c8ecb295fc680bc4da968e4fb059173ed9ba8e8de72ed42923b458a8dc42de4424b6ef9c";
+    sha512.run = "01d45380b5b0d03316cf68d83843d712bbf0ee326b4e5a0abf293c15e5dcd14eb4115860e22a2e6ee8f7fcc98e08a2739a7a14f42c10fa87f4f62c84ef78d2dc";
   };
   luaimageembed = {
     revision = 50788;
@@ -32103,14 +32209,14 @@
     sha512.run = "baafe2dbcfcc07293ec04f775becef7b59a2349ed5c98333c5a4e680fb3f8561f8749a6abadc6901cfbeae1b6e9a47cca05e8ae76064372585b7d7f4978dc844";
   };
   luainputenc = {
-    revision = 75712;
+    revision = 77677;
     shortdesc = "Replacing inputenc for use in LuaTeX";
     stripPrefix = 0;
-    sha512.doc = "c937b80960bb8994e7aa0a522783743a71ab56f72ac9d652da38ade49932988a70872e10295d487b512ed2b80158727b28be25fe79b6a8e944765e47fe915c36";
-    sha512.source = "38a0017e67cd3501d1fefecc7d2c6c08b8dd3f69c79c28d7c2f206e8bc9211e06d668ea8eed41dc21ea4369bd9b81d663ac384cfa26a6f0ade362e22f542b9e7";
+    sha512.doc = "a58d39394c0e3869edb9d54cec24eb0ec3514a92d7bc7f0f249b4cc9b3d185c92da0c34dee89f281ba6eca5cc159e04b02ad55bff62b5559d9a6bf4ee5931707";
+    sha512.source = "681a2491ea3f01f2d62b4acdb642a6e7d75ca744f1f43657e9871fa8e4e8bdfa95284bb3edb0bc579eeb08137b80d889bfa787a29deb34b28e1b06352b4988d0";
     license = [ "publicDomain" ];
     version = "0.973";
-    sha512.run = "ab67143ac84212f0b46f1bb9233fbed019dfdac7b7633312fa90b2af23b49a4a697b7627d4ea521ee613dc6172b62eabcb10757dd11d479ad8dff87aff70b19e";
+    sha512.run = "87e9cfe5ba3f0eb5205235982e625b38157f4cf06f13ebde4badd1c89d9e878b52439ee8bdec3cb1865bbea97c8fac3e3f5216f6c087108b2918d6ebe62299f4";
   };
   luajittex = {
     revision = 73848;
@@ -32179,13 +32285,13 @@
     "texluajitc"
   ];
   luakeys = {
-    revision = 75824;
+    revision = 78116;
     shortdesc = "A Lua module for parsing key-value options";
     stripPrefix = 0;
-    sha512.doc = "d155b47865dcdd45e7bde944c0cf479341cb1a6ee4d9f86a2d662355155758729fd5daed65929db3a320b13e023a1fe4c609335371b41b450aa51627e9cccfcc";
+    sha512.doc = "f4eae0e2bcdc0cdd183d0fa37e6b430b2370cf6351d00744e1f24191c19c20b92dda234ca9b1f9680c2e0836f5c3cd164deb038eaa333488b796fbe430a61554";
     license = [ "lppl13c" ];
     version = "0.17.0";
-    sha512.run = "1d856fb410b95b5ef29fa94df91fc0428d3e9d9f9ba100b306608e1c52387272113d75ed583ee8671cd901b5bf0c26e299f9eb528c7382b655023d9ffa0b9266";
+    sha512.run = "3089b2c3b2e3d1f3421fc2250838edc2541e356f3cf60de923c3200a59512a7b0f69562f45f89d84505f0eb39ebd798fcc5970defcf2dab8363a82f55c12e62f";
   };
   luakeyval = {
     revision = 76992;
@@ -32205,18 +32311,18 @@
     version = "1.0";
   };
   lualatex-math = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Fixes for mathematics-related LuaLaTeX issues";
     stripPrefix = 0;
     deps = [
       "etoolbox"
       "filehook"
     ];
-    sha512.doc = "b83f6a945608c58ff47a5ebff0174cd8d7277e9e4ac83045acbbf9fa36ad475ba06076ad25e58e97da3f26286205c3052fe3647eb40e13d214aeeef0066c2c98";
-    sha512.source = "7a5de86a09500d7e46dc59cd44d2c6987c5f4421a3ee576fdf14489f7c4c5fe3c7f39398144c85f776ed3e1df9aba62f4e38647cb0776d84b065f3ee0350ecb2";
+    sha512.doc = "68bd59fb0d62f4f9bc83894017720cc73a92b4ccfa5da87deebd7a4ad444807324d4ce8fc3723aa3f275437a78e899524f08d6221684bdfe63837d73e5248c66";
+    sha512.source = "6b5136f4bf2fcff75c0c0507774df8a45e26280d056e388eb3397f9a19464b7719c7b68214c65cd97d709571d70c80b49e933d223ee3845a03efb57fc242eb6e";
     license = [ "lppl13c" ];
     version = "1.12";
-    sha512.run = "9a3de2da4165a38190bdb90f55ea15200891bfa000c4388d73afa7d9ce2a7d20356442c6c5bdaa14779f126397b504de45a8903d599f380ff196e5e952d67db9";
+    sha512.run = "b1c5d7fc8f170568613df00745ac7ddeb9db1b3cb70320e479d9e0579c68a30fb44d02c70740f446fd62045b42d303f72e67982e7537c62d1c678b6b8c4915e0";
   };
   lualatex-truncate = {
     revision = 67201;
@@ -32247,15 +32353,24 @@
     version = "1.9";
     sha512.run = "f8edc734cf07add523d783841cdea8090574120b9c69af68acf8626981d8e6f60cc9f7ad4d159e0217d52091652ee930157cdcebab0ae52a70c7730f2a17e962";
   };
+  lualineno = {
+    revision = 77773;
+    shortdesc = "Line numbering in LuaTeX-based formats";
+    stripPrefix = 0;
+    sha512.doc = "c63f572f2415f150130cd1532b0d902fe866dcfdd04b5c4c7559984a07c7eae8c11a864839bff8440e9ec157ec669141f14ce38a42ee8b9221a713edd29bc880";
+    license = [ "bsd0" ];
+    version = "0.1";
+    sha512.run = "46fdc086a0bca2cee31f1ccba5f6278e31bc28a6d1c811892ebf9f339e3319d919e46d6e2285ea0a0973e6093565996d461a97b591e0b0a35dc2c40ced9073ad";
+  };
   luamathalign = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "More flexible alignment in amsmath environments";
     stripPrefix = 0;
-    sha512.doc = "6962a593d988d6c67b11a0d04f05cf94cc156c03fb1ba47d7bb88960ea65bcf0287ef99dd50e6e0f630c06f6b96f98ac39cba36aae97189e009f2c8605e5b0b9";
-    sha512.source = "e4d50b5cef37dd6300853614143cf5cccfed3a60f516ea845ed309345623504c21a31804424889b486981efda070b4f7669eeae5224b92462f8dabb5ac4d7753";
+    sha512.doc = "ac8837df08eefdc4eab21dced0d44cb836d86dba203f8e2260a224e75edcc08e47feee88352f21a2d740a2efde6c0c92ebd1a84b038e5bdaf68ced3fd8425d1b";
+    sha512.source = "502d56e90a282dd5e18473592f3ead02454ef303b6c770bccf14447c784374c71d4cc75b78ad1d17bf371ac558a815b0101a32058282067cb392626ddb49e3a5";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "1b38fd1c326956aa287de0edace4ec25789b05b61a60d2a063aa3142e475bade43380c939c7c9a629f4d36655539940cdc0aeac8adcac7c9d04c7dd05babc6b8";
+    sha512.run = "e38d65d59fd5212092a8860642b602ec6b1feba618bbb78980a3a1dcc773d06cfc31e6d4ee7fce44c6475f63e74b3c4deafcf88d2eaad239a7803d89057f1a00";
   };
   luamaths = {
     revision = 76924;
@@ -32267,23 +32382,23 @@
     sha512.run = "79c44d9cc054b70ce6d5efee4693296b1ce0a4e4afb79aac46a7970ca4cf3e94e051227604afff63b7a5515310932e6d44fdfe8f6982d87c90698bbc9b77ab45";
   };
   luamesh = {
-    revision = 63875;
+    revision = 77677;
     shortdesc = "Computes and draws 2D Delaunay triangulation";
     stripPrefix = 0;
-    sha512.doc = "286dc5fb713f06fccf7195f317791a8c775ddcaeb8cea4004fb7a77882bec36c60679ed9ef725128ff354c7230becdcc623683fb78eac9b24cf044f9cc97af1d";
+    sha512.doc = "e551552fd8460421f4c328f45fbbb6ff56ddf5f5edcb53a5db4172edf8829d3a582f911a7d14a879e691b3706c9b682262bd95febb01509acdc4656bb9046e64";
     license = [ "lppl13c" ];
     version = "0.7";
-    sha512.run = "e30e6f2bef6958c2f76df6aae5ca5899b91f41fc35afdce24840e2d028222c31a0613ba3c7eef27629686137f15eac24d3b97b7e0fc33b5d91adb7b766c0279a";
+    sha512.run = "16ff47e42d176b36080cc4bb824fd5d2a3b612eebd9c9eb150c43563972139a75abb968e8738bf32f4a6c29f7d840f528e807d0f1ac1563212e8621244895aa9";
   };
   luamml = {
-    revision = 76924;
+    revision = 78222;
     shortdesc = "Automatically generate MathML from LuaLaTeX math mode material";
     stripPrefix = 0;
-    sha512.doc = "8ff420dcfe22d64c1d066622275eed95a3400e7279a470bf164683716288e877dcffa6908e1a0f96211936c2a5fdd54dc64d3cebc2c15616c913ed44e75fd49d";
-    sha512.source = "c4a8e90441102aa4c2a87f6626c07b3b8b6219039743e11d052320ce5811cba9185e1887a7699660bb15720dcc10d94c18726162a35090b7f8f8bdb13e4cbe8b";
+    sha512.doc = "7e21d25dd69ed6694e11ea24f769a026bfd46bb04aac13351e8e1aca980500d245d1373959e20e0d778dcf9f7f2c91d585561045bbbea2c70bc0080acc152904";
+    sha512.source = "b5d8964d3c82df4d93f76522b6554da4d311b3fc561470f99b752f8a1c2dc7b5ea29f0034d934393098b2a8e551f1e779e852c74deb3e7925fa94139fcc9e751";
     license = [ "lppl13c" ];
-    version = "0.7.0";
-    sha512.run = "43582181d40954ac550e45d18a4107263ed67c706bef1966f4c9b59cf5e18df2ceb613c074b75952e412062f3b2992b23dc9f8e4e0dc89845cf1bd204ba899d1";
+    version = "0.8.0";
+    sha512.run = "26c6da252bbdbe0eb0e150ecb53996686cdcad6305e0864ed8c8a388e1b864ac96424b3756db42d21aadc88cceca804e0578e2bbec14e03705ee56a8430239e2";
   };
   luamodulartables = {
     revision = 68893;
@@ -32295,14 +32410,14 @@
     sha512.run = "0b390717c538a8c44cc7e8214908149c3705d5cb453d7776015eed27638ed0c0d16ea0b5be5abf2b6bec6e410b849f35796f574923303ebc883c75f7221f7634";
   };
   luamplib = {
-    revision = 77524;
+    revision = 77703;
     shortdesc = "Use LuaTeX's built-in MetaPost interpreter";
     stripPrefix = 0;
-    sha512.doc = "7e5ca710461ef85522855a25f5bf1904624536909dec8ba23f4d4fdbf879c7e22861b71dc42b8afc3bb29d98dc4dab495b4004b0268d03840ee0ef75a8ab4403";
-    sha512.source = "62acdfff55d0b2c704eb5b5ced71608bb69584ad5c1c9abf5972637a7479701ffe845da786d030a4ba8377b95b65448274687427ccda04bb031659864f638e0e";
+    sha512.doc = "f0e7b9eb75427c3de085d8f9c087c69e61df49716fe695a15bea677f4911c0ec00403b85fd54782f588818d7ed8505b59fee4e4d3ece8d47bde883cc82323ad4";
+    sha512.source = "b58dc2cbbaf333c4e4c926be6d984ee368313096cfee137a6166d6b187dcd6b3059bddbd235df4d22700a44f854b9d5d51ed056fa0cb3ea4b61e3f4fa351a206";
     license = [ "gpl2Only" ];
-    version = "2.38.4";
-    sha512.run = "92421997eea94ba925d28f891d638968bd15af0aeda9834df50394a32fc8476d929d0c588d634f2ea0d26477782a022db3fff3723f0052586df6afa683d5bf3b";
+    version = "2.39.0";
+    sha512.run = "931068acb2425708d07a7f586820b92cd9aa4c4fe7eaabace3adde173f4f75c8fce628cd3eed3604c59fc5bc824a0afdb6cf2f3a22e10643716b9998dd868355";
   };
   luanumint = {
     revision = 68918;
@@ -32314,13 +32429,13 @@
     sha512.run = "f34fdf0308fe4c9aa36d59e11862958ee1824761e5aa8ee62e6df81b335ec8dacb203a64ce5e26395ab612583126093dcddbc42dbeb927c90bd3bec73c1b5485";
   };
   luaoptions = {
-    revision = 64870;
+    revision = 78116;
     shortdesc = "Option handling for LuaLaTeX packages";
     stripPrefix = 0;
-    sha512.doc = "8731eb75ed8dd7089a6825350c2cf335049ce80c1ff378ec26dfe32423e4278737abadf7c83bc100837b2676866d38fdff50024845dc78c1625e64f8748e140a";
+    sha512.doc = "6c2400d95edbb8dafd5409d38af76c45e7677e01bfb398a0800f6c6f472d2d483d96bf8b879b7b45f6b8477dc268160d27e589605f2ffe2a465a5f03c815f432";
     license = [ "mit" ];
     version = "0.8";
-    sha512.run = "0169029e4eefcb746f48b266d590c7d9f3d4d376070c762139accf27adb8e48badce38769d22250519b3482b4752c55f66a165f4a6c59b20c3048738dcd65a72";
+    sha512.run = "2f189e703f8de95eb3bab743733708a45c3c6afa2988d3af2ef00e36c9f560e5e2bc0f2bedb57dfe82fc09d8bdd78816a3f352fb97b4bc6334012affcd045fdf";
   };
   luaotfload = {
     revision = 74324;
@@ -32396,13 +32511,13 @@
     sha512.run = "20c0c02ec0a89e37d82d6ba10cdd9fce632189c442950f325ebc09f5cc2a1e798238ac9d3e31245e113d4909dd0b37e3a145b471f7facacb285a2a2450bc8998";
   };
   luarandom = {
-    revision = 68847;
+    revision = 78116;
     shortdesc = "Create lists of random numbers";
     stripPrefix = 0;
-    sha512.doc = "4be8b8d72bdd6d4eb33999d662e06a60c8971d5a990b649e37c990dcc6f708856ee61a59ad1dddb6c083eab09e809ddfb65a1730a8e76bb6aadb1a240c809a26";
+    sha512.doc = "f1c5d111a0997b505c023f61ae6b9d5cf7ab17798f2649721c99ccad0266947fc1d0fe7cc715b64b574ceb7131962d96504a8a9d5223988cf6bb00b4302b7a32";
     license = [ "lppl13c" ];
     version = "0.02";
-    sha512.run = "1b5f4f420fe5acd552e7ff34459184319337a586b19f3b53111940fa648b09924f03ce7ce4da7463cbc894e65ef87647ada660922ab252b560dfe99295255097";
+    sha512.run = "dd801635e8ebcbacb1dfdec8cb2e1e6aed62c45054631fa71b3b0db8cf7c19a6f008bc2dd678b67ca354d7717db19962c6efc62628f8e2c9162b6f92e3aa0617";
   };
   luaset = {
     revision = 76924;
@@ -32489,13 +32604,13 @@
     sha512.run = "5a502ea42eb0d23c9575e3e9f6e46e0ebb8bb8034ea912deaa16616f23ae81a34d9372537c3099058ce1a65af4df0d39e20fa81b59bba68ffc75ebfded7a6d25";
   };
   luatex-cn = {
-    revision = 77432;
+    revision = 78200;
     shortdesc = "A LuaTeX based package to handle Chinese text typesetting";
     stripPrefix = 0;
-    sha512.doc = "02398b76946f344fd87f0528c1b20abbd1cf0e6eb9b2c4ad55a84b55091c18f7b3a46c30b824cfab3df61e669dc8589457781cb3d253fed9c4d12eadb1ee8186";
+    sha512.doc = "25288cf3742f9295d02b796c546b789bc83177345fdf9f643a1f270b1c0196dda19bdb7d23ed80119e221acfe244325ca8f7ad8ab5c079a841fbb7f36ad79652";
     license = [ "asl20" ];
-    version = "0.1.1";
-    sha512.run = "33a1d1ef39e6e5c3d798ac52de0c7c28efa4326f8df14cc1b8703e8b6681f03a4c930a7419cb45385016bed5d7b28e2c798a9f5bcd1059393ebf2d89d3abc4dd";
+    version = "0.3.1";
+    sha512.run = "fcf2c5032b359c29eb8b41fab0371178e6b73c55df49ef3deaa1cc4a6cf434dc89a071892cd499960717f792ec520513d4efd412cff17c4f952b4e1e97baa926";
   };
   luatex-type-definitions = {
     revision = 75890;
@@ -32513,59 +32628,59 @@
     "texluac"
   ];
   luatex85 = {
-    revision = 41456;
+    revision = 77677;
     shortdesc = "pdfTeX aliases for LuaTeX";
     stripPrefix = 0;
-    sha512.doc = "4bf353f60c305ea76e66848920e521dec0c66c80f71ebdfb0593acfc9e2914eac272eba3d69f63f43fe8be903cfbb2da7edd82cbc3d38a897934d91f1ac276b7";
-    sha512.source = "40f2732ba0eea372d084c7a9096e12de76a6f7c4ee2c8c9c042ae51696ca46fb527aa73dfb37b7c6a1a75f9753ed32b28fb9d3f2474cfd54528336b4a3cc95e6";
+    sha512.doc = "c61bcf8cfe550aac2823ff01ea22574623529953ea641c6cdd6ecd890dc5a41dafbe76e7a89d183cc6fbcf766054476918c89b3f0688f1ae8458ea7df087152c";
+    sha512.source = "f48f22e2796a9620f63c18c9db4623d387328ffaa1043fe437237cc5cfd9135c81f45dc379053e7a3f9ccbad69a810fa9ce1e9fb3daf93f64ea5ef0eeddbc300";
     license = [ "lppl13c" ];
     version = "1.4";
-    sha512.run = "fbc1306d40e1c329a106d7ec4ef79ebb99b2869ce72c45212b87fa03f66a18b1636324dafc739a33500be77bee2c71ebeff02c97c42f85716f5bded4dcebc021";
+    sha512.run = "821ae821b494ca70cc74576a3db9546fb69146ebae654ddabf74a74712785afe374bffd96f186b3202bafe33fe4b69c298fd1a57ab8dfc56addca000b10134d8";
   };
   luatexbase = {
-    revision = 52663;
+    revision = 77677;
     shortdesc = "Basic resource management for LuaTeX code";
     stripPrefix = 0;
     deps = [
       "ctablestack"
     ];
-    sha512.doc = "5dc696009e84662fc56443d7a5d61b3f30adbfeae3cf7176e81e676087d0fe580cb0575add49999ea8d5651850b7562c775b0727de01934465f3613ab7344be3";
-    sha512.source = "ebb46d5d4c3f6ccfdbc758f9dab64d7e83c2fe988f7da6852dfd5e786bc757f2438f86010a695eb2e780a02830f15dea941de7fb5bdd6e6561df0774b476dd5a";
+    sha512.doc = "dd0c615fc734e6aa00c66e966db5f1863bce1af10a9bb28e8af5118de9a8aaca6d250d1d5c919ffd9e501479c35f88abb53b148d50c2194a10a0bd13e7b1ede3";
+    sha512.source = "8a0c3974cca9e708df059886c634a0966d0ea440a1c50ce69947b8bbc57ba704efb565ce19174dc60b85b8e972cfb7c5680276f73a3c21e2898aa303ae82a64e";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "cb187dcd0f9e454a3b9d021b802ac6f7d09c3eee68adb5da31035f5b7bb36d2938ca940505ee08c8410ee0e5e5c81ffdd21617ea5ba0e9ca7b58abb6ede3defb";
+    sha512.run = "2fec1ccc7feff1f5abb77fa4705cf74e6318324d102f31ba2b733328bc2bc6895f4c1320b43f57cc56883160f81155a76e43071895559f6b9e1431132b43a0c4";
   };
   luatexja = {
-    revision = 77538;
+    revision = 78116;
     shortdesc = "Typeset Japanese with Lua(La)TeX";
     stripPrefix = 0;
     deps = [
       "luatexbase"
     ];
-    sha512.doc = "843884188e01878b998b1b873132a5dea8b902943f80b4fc101aa623a142429755fae01a4010cb56c05ccdafd51da7dfd2a1cefcde7729fa328d78f5397ba819";
-    sha512.source = "54e67238d625f37af3f3415f8c95aba3e4877c34ee96e2faf2412a0516a49649081589f788983692df8856c91204ceb2fc6d73f96a23a33fadee1cf3ae5bafe4";
+    sha512.doc = "17de91f22dae1ce52272224d86c8b3ecd8095e42f31b5d5a5015ce5ae4f96d5fb32458742e7f3b6f442cebdebabaa2a69f9762a664795ce768ffbfbde013c8f7";
+    sha512.source = "f7fa7fdae79db7c7fd09ce3f0950eea86f0b54d5acfe9b36181158d426f12b603a801671fc1ed04bd4f72a08f27b3e756fe5ce1d6f0f969d818ec52729b2d9e1";
     license = [ "bsd3" ];
     version = "20260130.1";
-    sha512.run = "d5f9e6ada6b4bfd790266a6b44ab2c4c46e7c2a9bdaa9cb79cf172d3a6d4de1243f73ab4da00e0f1a416cd13c2d631abc6054f7d1b65f2915ca62c2042cd681b";
+    sha512.run = "a23b72c73a6149db24a6a1ce4f0a988f2e4d3d1d9504eb7dcef1bff437e3c4be53d8481c5c28820409106140ba5fd21b9ab6caf54bb0671ccbf256dc0b91f1bc";
   };
   luatexko = {
-    revision = 77490;
+    revision = 78013;
     shortdesc = "Typeset Korean with Lua(La)TeX";
     stripPrefix = 0;
-    sha512.doc = "e94d5f2ff6e7b113808caeac7b89db7d1304418ecc4033590106447bd2e43580d07518e35cfc59c7d0b0fdf6d06fec2c80fdb4b25adcd9e4a305175af1a3ac80";
+    sha512.doc = "1022c0dd86f537c72f3adb9455b562d2a769cb7be83a20cffafeedb5936eee8533a8908d5cff81166024beee973214531c7462daac0af1fee6e7cbbde43cf3f5";
     license = [ "lppl13c" ];
-    version = "5.5";
-    sha512.run = "ceff3bdacef8eed9c71e103521b921ca182af99eceda8d86c1178618393b63e97d0d4f3b525622c1f1b4036dcdd979bb4ca8ab01c5169bb3c18f90850be7ed8e";
+    version = "5.7";
+    sha512.run = "ac9f3eccc281368d4669716299894cffbb055124040cd42d2b1eacb01c20f830a2fdcdccacb5f6b333bffc529f4674200236af73de1e8e7460fa08911912a872";
   };
   luatextra = {
-    revision = 20747;
+    revision = 77677;
     shortdesc = "Additional macros for Plain TeX and LaTeX in LuaTeX";
     stripPrefix = 0;
-    sha512.doc = "f1c0d31fbd66f4e78eb638a9bb336f49de3d19b29bf276fb6fd0d976ba2f33599c1536ec82f7887af1c1ee359b48b1048d400b7faf0cd8016b914f4c5318c849";
-    sha512.source = "2050bf6c907f6f4e210b400cc93b1786a7ea8407eb64e90054b2ac8408d31689fdb1ffcf4859f1bf6c24c298e5d07fcbd201574b9b397de192609dda504502e0";
+    sha512.doc = "e7014bc501729f130d1ea7620fea812d613509b661229681d15737e8bf6cf1c42703df1225ecfaf6db3b5af4399005137a7d2438d5a86a0447b84ebcc4afcb08";
+    sha512.source = "4a13fdace4f7af8a195a31cf15f0e8e4a4634bbf22d09cbf8120ba7a4ac4bda6073a0f61bcadbeafb9e5fe1296a355543c5926bc2a31c014a81b8910a9b2da54";
     license = [ "publicDomain" ];
     version = "1.0.1";
-    sha512.run = "03c95a5e42d8fc0ed88704799a36624ebb48b9c7606acbc09de29e5da845ede3f239a6dda43cbfb4377971cecb55b1f5280cf0ea1aae5057f3ab8df2e0870745";
+    sha512.run = "fed004ae9657b4b515db86d8d871b63176917848c19d53f788a7d3f3b01e120327d565e269d7a709c3cf8a9e8bde4ba3cd11afa57e691709c1c64459ff34154d";
   };
   luatikz = {
     revision = 73087;
@@ -32580,14 +32695,14 @@
     sha512.run = "843df874ba2cb6d1b6ae11f6660db32e6c2ec8ed975fae506cfb2587c1a82312108dabef39886ad35ea51abe84e5d25ebfa841d70f399fc6d8caa52614d41699";
   };
   luatodonotes = {
-    revision = 76032;
+    revision = 77677;
     shortdesc = "Add editing annotations in a LuaLaTeX document";
     stripPrefix = 0;
-    sha512.doc = "87ce4b9c025c8d2ec787b23232f6accedc0c7b4a6cf841e05ede9405a9d178419ba002855a82fb2ec64c55494136ff2cb3580e02b0003c07c42fca28956679d4";
-    sha512.source = "f312aec4c57c4f9dd4dbac1574817403240cfe16aa9fa5269f57c635deffec755999d85aff98640e0deae4deeaa40e2b648d42df4667af332752cc3f84f66114";
+    sha512.doc = "fc6ef3a1c68a0b569c1dd0ddbdd4ebc44d32700d8d47317b9b7ee09e799e23f578a1c6e4531233c44384463f1fb8a7c56cb2078ec368d26b39783f7fc55ad8b1";
+    sha512.source = "4ae2cf7cce2e93cd2854687b51338e16217026d88608cfcb31ff96543c05fd6e059c1ba62ace6ca441bbff195e6bb920190999ffae51e3a19c86d6d68a1ff0be";
     license = [ "lppl12" ];
     version = "0.5a";
-    sha512.run = "18042f7bbfa2fd7b4b29b174152279ed0f826489f9d129c2171ca829e0b120a274a11862e0c86fcd2945e71aa44e4624c24f32453842796694fa236373eeb9cb";
+    sha512.run = "f0cf69c3f26f74cefae3874d4caa281c45d0ff99836ea982dfddd2d4ed57373428e7ae352441cc20b51435a4eaaaad9fcfcbed78bb44a01601a46fdd67a7084c";
   };
   luatruthtable = {
     revision = 76924;
@@ -32599,22 +32714,22 @@
     sha512.run = "ff22139c570c370b6968b0e9ce99632d1c99faf15b81235a2cea5420e6f519da00b56ac99f9733dfbe2e72974352e4d808a15a6e84effe6ac9f0068652ab6915";
   };
   luavlna = {
-    revision = 76687;
+    revision = 77677;
     shortdesc = "Prevent line breaks after single letter words, units, or academic titles";
     stripPrefix = 0;
-    sha512.doc = "6f7fe914b71d9a9bd7bb71ea41dc4a70ec97791b9c24b6f3fbd7e411f8571294adb88a5447e7d1cbb58d1beba885fae35daedf1d0b55cde5f4ee82f37ca77245";
+    sha512.doc = "716daff0f04243e579fc864482aa8633e8592c949283b45daf6d494ed3e837d2488f1665457e16f6881583a51a0092a265cdf963d8a566d613f52e4dd3a9abbc";
     license = [ "lppl13c" ];
     version = "0.1n";
-    sha512.run = "506deb1b01dfdfe79ab375fe19cbf7ba0050519c0f40b88d9ceea2d4d600073b45fc480cac4e77ca3adc94e01c76b79b6f11775b0ac22b93eb8e847aac5dd597";
+    sha512.run = "b3da006e8aadd793c94d89d40c0bdb716e9f398c730aa2705b0c858b50d46595c55635604c94473a0715dc91336e67ee1510215ae7657cf6c224e6bc949e9b77";
   };
   luaxml = {
-    revision = 77537;
+    revision = 78116;
     shortdesc = "Lua library for reading and serialising XML files";
     stripPrefix = 0;
-    sha512.doc = "40c26d0c666755ec3811fae32f95f37eee6a4d0ee62248adbbf6b856c624190bb00750b4350bfbda435d740964580b9890463dc118c683223d4961b2fb7294bd";
+    sha512.doc = "adf29fc3da4df734cbfe794c9c69b81012cd229e06e42234fd3237620b9eeea23c69a1ba893a0b13dada0b5dd65668dfef82d749e8e2b96eb876c5d10384b266";
     license = [ "free" ];
     version = "0.2c";
-    sha512.run = "f863877d782c3d42cb320a4ff081406ccda675e5c1e30402a4f85fabe37e80612b8a4758c2310d55560edf42bbb5020dc6f8f3c2197709ddef4b5a770a372d02";
+    sha512.run = "aac35fbd8008e54eeb9c0a97adfd7e79de0ce1f8aa03636cb803db53d2cc5ac0631dcd5e0939ccc6d5daccf0c04720e840151e3acf2ca2ea811860392fd20fef";
   };
   lucide-icons = {
     revision = 77188;
@@ -32629,17 +32744,17 @@
     sha512.run = "28f962efa337f5eaab9c295be32f2248c8e69deb8233fffb43ac5b297f6d26f3de3f586392cd7a93810f5e9c4e07a8133c5b2e980360add68dd4cf3bc71f7ca5";
   };
   luciole = {
-    revision = 76679;
+    revision = 77677;
     shortdesc = "Luciole OpenType fonts for LuaTeX and XeTeX";
     stripPrefix = 0;
-    sha512.doc = "859cda9f03f027dcf3a4507f1c5760e4857747b1c1b123b108561bf14288c13ecf0b5b998f9572f86484abd15b8fa1e926e4b09efb58a026250a506342b0f935";
+    sha512.doc = "fc9d29f0afc36e0724c998176c65cdcc3f83419296e67e262600581ac3168907bf315c97e710b4bb3d99bf2446f96220bf4924b53b1cce43cf2053dc4c03e76b";
     license = [
       "cc-by-40"
       "ofl"
       "lppl13c"
     ];
     version = "0.60";
-    sha512.run = "331f0791019dd1101e8847b8e80dc42c47393917a7e38b92551d5f9702f1d8db6a0aea6196295de9a5d75018349c9fa0a86d29897990be17314851b16dba8591";
+    sha512.run = "c96be818a45b9d8d53b2c2de6f5ff4cb6f9df645f2909ee85bb98948c3c73450ca94c016e44ebc1748c0169d8cf7aa6e2221b6ae79de9271946b97c14d7de5d4";
   };
   lutabulartools = {
     revision = 73345;
@@ -32650,13 +32765,13 @@
     sha512.run = "592eae01b2a30093f8c593d0670ac6efdac35574dbec4f67faf2cc66628fb273b67b8ff021626eff1ec6091fd9410e9f5140d6b4037ee17982333ad9866239f8";
   };
   luwa-ul = {
-    revision = 77260;
+    revision = 77595;
     shortdesc = "Provides underlines and other highlighting which can be used in vertical mode";
     stripPrefix = 0;
-    sha512.doc = "ab28b5fb212873e5781fda9dfb4b44a09c44af5abcd5563f69664857c378d3a345fe90ef782e0b1a471aad48725aa508cfb92711ff93ec40333fef6bae4f6807";
+    sha512.doc = "44e4e4a8b61f3cca373606f30e28cddfcd6c01c9eb7572db4a17cfb6176215013264c7e52120e4c8b6eead0496c059fa5dde0c3d5dce93b7fb8e04e19dbeafb1";
     license = [ "mit" ];
-    version = "1.2.1";
-    sha512.run = "4b8172c85bf193232978f485875c898804004a2899ac3d817d743ea42cfab3699377042b6d96998cf00a05cab3ea4e0e750a3438d322dffb8cd6d2c217e021f9";
+    version = "1.2.5";
+    sha512.run = "3c62ce192b2af77f947c25a2bca3115acbabcbb455b80397a47afbfa2a97ea3bb24e9582ed300d41505a1d170497726e8aa8b1628d2cca2b089bc4cb5ca1a26e";
   };
   luwiantype = {
     revision = 73719;
@@ -32671,42 +32786,42 @@
     sha512.run = "7a771b8e3340cbbf2666457b9b6226cb05121dc36d672896bc44fbb4222fdc73e437a0c50de521256651e9621cbf3a0690937142819d2fb9d07ebf4385da776d";
   };
   lwarp = {
-    revision = 77064;
+    revision = 78120;
     shortdesc = "Converts LaTeX to HTML";
-    sha512.doc = "b1ca6aefe8e72527af99977fd8459429171b6ff9e61cd9a8aa6b348e9d08def011a38615b4fdb3e58e1bf2c79e2dd9a5b6f8a4c19f137b7405dc417f9db6033a";
-    sha512.source = "36d37d2f84c3eed006a1dd626fa7c0cf60dd4e691193c02acb40d4216488d9c1e9b4d6d30765d45d6d930013301e42a71c07a70430b9e5d7b488d205458b16da";
+    sha512.doc = "e72299d76344fc640d457ab4567ceca7c8d47fad9ed2d462f993193e181ee36ce342934d3eb1fed5630192b45852b426761896ad8f5b3d413ee59fd6d9f45645";
+    sha512.source = "7986cba90853e6361190c0dd317a5fa5eda67b01ad8ff6e089e51b5d7768aa2f77c0132909d9b29b901f82f4319ec0b485ec912520dfe5bc01d79f383a71f047";
     scriptExts = [
       "lua"
     ];
     license = [ "lppl13c" ];
-    version = "0.920";
-    sha512.run = "cb8894fd1b52ef06164739a092e1399522192be5c28033e56379341eb72386d5fab53ee913e77db18fa18255c5ae33364bd8d34f6abcf0c3848eb0e31d256111";
+    version = "0.921";
+    sha512.run = "4ecfbb6bb7d85578efdb6fee5ffbe15e421edb1d87cbf4865e67dcce04eeb77199ae0fbfc2f144ee0dbc764af49653dfb3284c5d03c06f3561e7670e4268c09b";
   };
   lwarp.binfiles = [
     "lwarpmk"
   ];
   lxfonts = {
-    revision = 73728;
+    revision = 77677;
     shortdesc = "Set of slide fonts based on CM";
     stripPrefix = 0;
     fontMaps = [
       "MixedMap lxfonts.map"
     ];
-    sha512.doc = "6fd2d9c44914bff51dc3d745219d3361b3f681e1aa2e95eca36ce98de5e603cc63a029684f5961de01db90ed54c52214e13c9bc9c97f4e593f4954a376770632";
-    sha512.source = "b90293678d5fb3f0ed69fb3de63b87617f318e1dc44cbf28dc4714dfea5b47b9691d0347f97c3a7263546e06d6c7084482b8fc066313a95be906e5e7e12f46de";
+    sha512.doc = "95aa207bbd48d815b0189647fa931381056a62c5d14c1533a7b1f575e364d865fa26a0fd16e67c137e7ed83190f413b78406a4c68cdd8fbcd6aa6dd4fba92d0b";
+    sha512.source = "032e08d1493437096a5d8224959b18b3e5185174a4f8a4be2774fa316632c1b6d5fe16767bdc065cb147d4362fabacaa6f093685fbcd966b26435942694bc9f8";
     license = [ "lppl13c" ];
     version = "3.0";
-    sha512.run = "a816d0f6fde8d3941b808065dc7f9bea6e6735c08e14eb9ca7247575d506043d8863c500590a95444a3828fcc46419aefc0559c5117fec8bb26a4244f5bfacd2";
+    sha512.run = "a83a3d12795a95ff8b64c25538f1d60fdbd242eaf5120cd609024efe986dd5303afb2954deb1e0dc17ea48343545b398af27233fae174758b1f8ea6b22097211";
   };
   lxgw-fonts = {
-    revision = 77400;
+    revision = 77677;
     shortdesc = "A CJK font family with a comprehensive character set";
     stripPrefix = 0;
-    sha512.doc = "1fca0e6894648a5057a944054d017003bb0b5b753c51b51c882c3f9f0d52b3a22218218a0dbc57af7d88e9aba6a644deef5af02d93d77ff1635352506e221743";
-    sha512.source = "93379575deea1e42dbd9f882057c357f0ede096123a581bee6fe6c137a1fede710766c38bd2d90fb630a3292cfc86d49ec7f2e4c2bd854e7d7ec2f8cd653784a";
+    sha512.doc = "846dfea1cce54acda50e17c2ab1d5d2903767820d7bc70c148108d955b4120e50c883b570409cde0a4d31826d39756a0fece27e62018734bcbf4c7845f8d9777";
+    sha512.source = "83a6326f6fe7b906fba6405b2e82b7bad3e0a88f4eebe3bd909f6ea2f55630086df48f0129378fe135657a891580e090957cbdb3f99a52ba00a5179c56fbb579";
     license = [ "ofl" ];
-    version = "1.521M";
-    sha512.run = "c439f70fd7698ed6d870698e7630dc97c31fc670aeb06532a9ad64f4237ea3b5723db1b628efb9039f27113c563f12c32cbde434d9068d78118c888ed34e6d0c";
+    version = "1.521N";
+    sha512.run = "d27f5553980daaee9380576da3aea78e0e4a7559d31a975378b70aa0e90536dc72f14e7ef23098ffa48dba0f2fada6f6abb2641dc623a5f1d4be72eba22926c1";
   };
   ly1 = {
     revision = 63565;
@@ -32792,23 +32907,23 @@
     sha512.run = "802d108e7deaaa1a42b7f1eca5059f9547f0f4edb2eb5f8f3f0b68d03c05662f37d2bf7b25844dcec6b89d6d1f0babe93614cbc87fe1e2ca0ac2153602c0cad7";
   };
   magaz = {
-    revision = 24694;
+    revision = 77677;
     shortdesc = "Magazine layout";
     stripPrefix = 0;
-    sha512.doc = "78c9163951f269a489f6e8a48cce7d9ca46aa5c7f2f2567f8e50627ddc32920a8a5b54bf141ae881c2863de6bad4f7a954588fef9469291f18e65b7fadbf051b";
+    sha512.doc = "dea4eacfb58ebb9520715865c5bec304b8d2f89714a43a47a1b1adf8f1d2792dd200aa1f8c882303415167d0107bd2c4d7387e3548e5b27c2a5873a046a08746";
     license = [ "free" ];
     version = "0.4";
-    sha512.run = "5c35baa39a8b26911b2c2dd875576a0f875f5edc37fb497dbd403720855861219fdced11ee3fbbdee8e63f0817b6c2ee6a20e6ec3bcc9a5183465c22caf7735d";
+    sha512.run = "e2bdea8146c9b4c0a52a24fda83662b20d6df73754197611e2e615d7b390ce29618c1569dfde1036e4c5cf6a643dbd870e60bf28920bff6fccce8b77ca3ea974";
   };
   magicnum = {
-    revision = 52983;
+    revision = 77677;
     shortdesc = "Access TeX systems' \"magic numbers\"";
     stripPrefix = 0;
-    sha512.doc = "084bdeb7d422a5e79f4a53864ea0c94b09962e159e103fe3ea77163a9a549605f7139bb2ba9d1a57877b3453162a99470f48a691ff78289a1caa5389b2a7f67d";
-    sha512.source = "3bc74965fdc7ecfe7481e426e3cd2c9a27c8752fec3248e707c1f0ee1fcd03205540d6cbde05b82c9313c567b7e689acc9b1146f53962eadfef22d7006c896fb";
+    sha512.doc = "f6eb54704d9d7ba3f83db7887f57aa747fdc8a810ffb2a010b0d9469d7b017367866d257427864d554b334c8429607643168e0bd44a5af964b47405dcfdaaf73";
+    sha512.source = "84782ff4d43bc6cfaf26408f9885a9760ceaf104f7afd48419756ced52866065097810037cac8327706a4d2d0ffce69ed04047ce515f8d9c18e5d7efa458d976";
     license = [ "lppl13c" ];
     version = "1.7";
-    sha512.run = "305d94ec07468511e7ada667ded30a1c3ba68835d5bdd03a9a32c7bb7c0d274d5ddc77a5ad02712faf10aba5eca73c6708cb2bf497bea0b73b3f99b10923a8bd";
+    sha512.run = "28bf8578536c6427320e66a38e0ec3e137d8f9f1da080c4fd9c284e02308e9d9b4dc57a0b8fe6175bd8fa5f1ba4a170576d034c40f69aee47e92271b786bb62a";
   };
   magicwatermark = {
     revision = 76924;
@@ -32878,18 +32993,18 @@
     sha512.run = "3e7c307a474a0ae8ce199eda385017510f1df316301684c0c982985ba455a1d0fac7f4b868998cfc791f7ad5737c1b96a05472ef7603c7c543676c00a0e92e5f";
   };
   make4ht = {
-    revision = 74940;
+    revision = 78152;
     shortdesc = "A build system for tex4ht";
     deps = [
       "tex4ht"
     ];
-    sha512.doc = "bc3f887eecd59fc9eb5f31cb296d2532ce99f82941d046dcefb322a62f71a72311e374ea4e8e847814cb466eaa9f12ce00175dced0c48ea99ff058f8713de55e";
+    sha512.doc = "715b080c46b272c5c3fda4cb662fcd8d5053c6185f5439153ec02132e622ec142997b34b4dd1d3b9d914f15ecff49f413c6ababb0d361db3446b73d43df8bd29";
     scriptExts = [
       "lua"
     ];
     license = [ "lppl13c" ];
-    version = "0.4d";
-    sha512.run = "5803764b37ee5ed6761db68ac75c109942f47246d6f3d1ea6473af5cc544e25805c3fbf28ae32cb3817065dc3f392136bcdc5e3b3a683b42fff2ac53e6fcc905";
+    version = "0.4e";
+    sha512.run = "5883ae41f984d35bb0ab65c85d6d88919beebb92646c0e1b2fd96007739fcc1b54c921f357229965da70868f7e0444eff1f4b4029fa82e74d9e8943e07307a9b";
   };
   make4ht.binfiles = [
     "make4ht"
@@ -32914,24 +33029,24 @@
     sha512.run = "cf36d0bad24180f48a7cddae8fa19c6260ceb5076b21f05e48360a30ec259b342e6a17f1c5d299ce5fe02a8dc5ed7934dd55c5529118bb24dd13cd36242b0d6a";
   };
   makebox = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Defines a \\makebox* command";
     stripPrefix = 0;
-    sha512.doc = "807d495fdef601fff666acb79c7f3fa43d1aeebf8aed77bebc02f90dca4fb9c36ae1bc911a9af1009538f3d3e2c4c7f9ceb0111d091dd4c1691a1520e089a697";
-    sha512.source = "04ab9a02882a505f4393288ae8e5d6be374bdd6aa8a4472da1fb7e2c9e3b4bfc58132921a3287a4c8fe4d8d3fb91ddc33496a088431862407988ade1f716ee85";
+    sha512.doc = "f26562d83c851f59d0a9f30a8d67d7974a32ade850b1ad273f145251e188d95a58d17aac1510841f998bb3d2782e67cafa9fcc6e1e891f33581aa456ae2741ca";
+    sha512.source = "77b83606eb2275dc72ed8d06b3bc3aaeb3ba5e1072a462cff54c6183bbf2bab3eadee70a4d8b33db264bee788e4c00dc63920cad52f53530d43c10eb0e00323c";
     license = [ "lppl13c" ];
     version = "0.1";
-    sha512.run = "918052ed5c358e12ac7ca7c93f25a43fcfa8f7ba261fdf652d7ccbbcc27e3e0f822813d8297d3b75450c443687bd97e93416624b51da61572557d6a337638bc7";
+    sha512.run = "43c18300261d0f5ff451806b180999702d01a9ef4fe7bafc70c9447ee8565c5ced5145a28db295de208545f8a3dc5e8c3084b5fe4ace57e3f9f19960ebe95fc3";
   };
   makecell = {
-    revision = 15878;
+    revision = 78116;
     shortdesc = "Tabular column heads and multilined cells";
     stripPrefix = 0;
-    sha512.doc = "7c762852f1c7b4609fa823117e765d2b42ad857e2ffa1ca84aa3df74497c88dfc0a2cf05747f11f14453873ee70c4b0f2f890112c567d04ad0d61ada37e14335";
-    sha512.source = "bb2d33b674b612e67bbbc1bf04a68f3804fc37b9e22e19c9af05746efa869ef52db48c5828724b88de130b15120e9ae003f49ea6389f7add98c712550af87d4e";
+    sha512.doc = "48aab8e45f54a274110b5ea0b8b8eb60710bef2ddbb52494f2d9bd8c7c91a4e33e589bc64caa9af84ad78f4671d12d51462c14fb603eee562f660b533f297662";
+    sha512.source = "917e9675733e09ae9ca6f900d0e9a6722406e8062271e4c6905c11209afabcb3861c3904d445d0b198bb1a42251333aea13e98b3546966f6085424813cdc51b0";
     license = [ "lppl13c" ];
     version = "0.1e";
-    sha512.run = "ba32b6a68b0a4cd6df36d460832e5cd9664a9c305c24dbca93a4fce69e97b6db3d86e3f219a0511c7d70378ddd9424d3685d60cabbc8554077c6bfbd8847789b";
+    sha512.run = "b361474362d1f80b5c5807ff5864337eba24f97b93cca88630644ded3fbc4401236140f96984780b33327e64491246a1ea84ca98cf0525db8e25d7564c8c31c7";
   };
   makecirc = {
     revision = 15878;
@@ -32942,13 +33057,13 @@
     sha512.run = "9bba91e5139b90201e232aa3fa21254c5bf8d989aedaec8310209ae6b772d24d7b8c3be379909f04c2c7ff079cca10f43a1f74091a77bb1b8ca637a0743a2ef2";
   };
   makecmds = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "The new \\makecommand command always (re)defines a command";
     stripPrefix = 0;
-    sha512.doc = "f69dbf682df7e3089727570417be3624b496b5ad7db627b344d32b106606cab5299dd23497e137770fdfb9f940503a65e1074e06dd67e0561b36729ab6c3d428";
-    sha512.source = "380eca4f5fed0ae72cded8f6d3a201cacb05a57851c4c207f086dd17762689cd53a6b27daa23d8043c311adc9baed32808d2c7eb1855892f8113ec7f13c02946";
+    sha512.doc = "27d8c3415c74d2d98b7267712c419b6a832e3a95dd417e965223745d6f9abd2ca14989ea7d18e6948da28135b484d6be376368d837294b627769a65c0c8cf3fe";
+    sha512.source = "eae7dab6fedd1ac2975b29f7397d8feb4a26e20dcc7d44e4aa5b250d1e3bb2f2a975bcae142f546dd6e21af401e831905bcdd28c16b1552d51c5711dcadbaef9";
     license = [ "lppl13c" ];
-    sha512.run = "fb63fdc9cc0aaa531b25417f0c23348971c306b1a93d99e7efdbbfd7c3907b50f28c67f36a88bb2a94154bcbde937e63246ece577ee2440ad4f5c2935eb25b99";
+    sha512.run = "6a62e2986a8cca549617295e765c737ee605b9e5961d142c76a7666dc01ba956d13fba10e3c1b1336d99e720527e0d96da2cfe7febb904d4f073b2efc787c146";
   };
   makecookbook = {
     revision = 49311;
@@ -32959,13 +33074,13 @@
     version = "0.85";
   };
   makedtx = {
-    revision = 46702;
+    revision = 77894;
     shortdesc = "Perl script to help generate dtx and ins files";
-    sha512.doc = "913f6f02ff478ab5edeed4792846ee6bc06d28c16fd3d7396d394f4a964d6f39a12c8163d66a50a5bf53add151317184b09a712dfd32f9ff783bda7f520c7eef";
-    sha512.source = "84e12e7798c37a598a2d37fa7faa206ffb6f5c1f9c21af7130a9f05bebf9857f2a4fb7988be55a9936199694a0d74595ff75a1261187d81fd06beda5e0628931";
+    sha512.doc = "af861c9336ce876821cc0bcefa2b3be0878034749df1acd1e9bf4269846dc830e9d744714f40e31247055e4101da5844a1278bace4fa08f69b64397b4e103e06";
+    sha512.source = "3f356e226357b1be6f15bd70339b26db0cbf08c67939158230c038ce4169b85919366ee21fc4712ba4fdfcfdbf0ac16aadbab198fa5077378975df26173e65b4";
     license = [ "lppl13c" ];
-    version = "1.2";
-    sha512.run = "e083fa791975cef84b2e2ba3472984e354d5ced50ae7fb96dd8239cfffd379e7a25fdab80abcb721e63dfb10d9557bce69e97c5624d1635f894bcd26e22b5f4d";
+    version = "1.3";
+    sha512.run = "6b1d909824e65312ba5c694a50ba89018babd19bb2501af7d5bc1389883721650afda955616dc23736c376c02e0af10827d12df83cb210f1f5edbf0c6b7b9ca1";
   };
   makedtx.binfiles = [
     "makedtx"
@@ -32979,17 +33094,17 @@
     sha512.run = "477523d4663e1e4a1fd6bb830e4574d6d116180b06a3199d6ba27f7cf704a1906a2812496e9a7ba8063690a2095fbd5022a5eb8c2448b1e0341c8a961cf05794";
   };
   makegobbler = {
-    revision = 77564;
+    revision = 78194;
     shortdesc = "Keep or drop some part of LaTeX source code";
     stripPrefix = 0;
-    sha512.doc = "ad0c1b5c10eb97f538c0ff61461c6a8f617847a10135a7d1e3286ad94084c5f93a8c2788d34310c46ff4cd5d7371878d7c5db3cdb1f4b9bb2131eaafaad10190";
-    sha512.source = "c1f09888e8babb4b0b9974bec4eee979b9a7836b51ebf2eeb846a6591849dbd536e7c31334bc9f204c30137c8e04af751a114893a982c87d8d1606ba8b59d884";
+    sha512.doc = "8e656d51b917c25fdcec63d63c9f42b84bbc8aa8e3665215a5ec8472c8c4f8dbafd4bc3f60a39900844252aec786a6877207b34513c4db46ed1966719b218478";
+    sha512.source = "6859ead43342b347d0d08fbdb2adca2d85b32cd7d9248e0845dc775daa6b862f5726e8cb1097755db46ae40062866e7671f2ffaaf2e21b496b70805801fbbd25";
     license = [
       "lppl13c"
       "free"
     ];
-    version = "0.3";
-    sha512.run = "38cc6486aeb164acd4e74110ebe6fe04f4c72a92c70c41eae07b10bd729f131b649263da6e8c04eecaee4357d98ac2bf323cb1ecdbd8985292d9b3ca60345cef";
+    version = "0.3.2";
+    sha512.run = "a8f48b7b73be8541e60e784823a456d8cb91658dca3831fb7e60e929ba7e50b9321043d678b23d1c3690e45efba20216786399e1fb891c5b3dc65859e73f4412";
   };
   makeindex = {
     revision = 75712;
@@ -33034,13 +33149,13 @@
     sha512.run = "330b31ddb2eece9f910f65501ecc48041f8890d6d2e8b02b4b2e085e9432b6bb2be502427799c64509a21e143aa94b5107ea37238a7259b601f7f902be6b01d6";
   };
   makerobust = {
-    revision = 52811;
+    revision = 78116;
     shortdesc = "Making a macro robust (legacy package)";
     stripPrefix = 0;
-    sha512.doc = "4503551b0085c7c829d41042083209bc02dfd2391f99cf0fabafb363e288a455e51273bf0f9d4ff5a5fe17050fb5288a7835742e06865407b8400c88244f4e6e";
+    sha512.doc = "c5e715b4e569925abc8281a21d68eaf00504b38658acdaefddf9659c75fe9b08ab1a8c838fd657189b47d7163e64bde0af6c82f6d5d88effb16919100c3ab83d";
     license = [ "lppl13c" ];
     version = "2.0";
-    sha512.run = "502b4dd65ae3535a2519c696b8b2ef73b3eb8f19d20af7dce94e24c8f718f827e55ddf7ff229bfc0810ab8747c94720cc7a66335a7d44065d0a0ac6b156a683e";
+    sha512.run = "17e5120519b8c1177d75ae2c170fa4df23d126d5be023f235154a7f4c2c85ad0e46cebbe774f554bbeded04531975202f0334e96e60eda8826b33c1b6091e86f";
   };
   makeshape = {
     revision = 28973;
@@ -33063,13 +33178,13 @@
     sha512.run = "8993840f04712d44b5a4dc12d303d05cfaee3a10064a25864975b8d156f624a5e1cc7c174f290a00cbdb2b2b28b28654ab6cd04e9622a6089199e1ee2663e267";
   };
   manfnt = {
-    revision = 54684;
+    revision = 77677;
     shortdesc = "LaTeX support for the TeX book symbols";
     stripPrefix = 0;
-    sha512.doc = "469280a4576d3b8396f310ba627f5a69f8fe47604f39562321d9b3b7d2f3e81f8d2c0ff7cd18ae4a93d9125df0fba79744edf0b30d036916a8259dc39adbdddc";
-    sha512.source = "c90ac97080e2c0c767673f7128e1850427218bb4b05024401fe37aae71ae65f1feae2e11301055dbe6b74fe56e7b16bee4ba1fe0f1a1defbc07763fc5f5cdeb0";
+    sha512.doc = "d9e25aefc2a7c7795ae6c5cca60233fb6056bbbc2d5c7353ddafa54451184c1959d4a9d2e4d827d3defd86c0b570a22cb50eca168fa83f3aa5451e5b97738480";
+    sha512.source = "38469684bec801d6be9c3ab5f0c68857b7068eb6ba97f52fd0eaa5b19a8aaa9d39971b7ee9f939a0a9f3aa6f829dbf415045646c1dd645de5b33d232bab229e0";
     license = [ "lppl13c" ];
-    sha512.run = "492dff2a46b9c0e89b8e29149546dfc736195f7f264b156fd91f4e8d1396f43b149948df656c7b148a2d54064fba89e033179b31eeaf03d0037875e36e9b4244";
+    sha512.run = "7766d2a597d250d945ecc35ab9190774fbb949d5e77b906709742f738a73314d140183ee64824f48484eadab3d9852c6b53ac7a94919792fcc709d80d2cdd1dd";
   };
   manfnt-font = {
     revision = 45777;
@@ -33115,18 +33230,18 @@
     sha512.run = "5ff1e45d4434c68f09fd011fb0d0bf7652002a9ef6c36035e953a5bb9871baec4dc1998b0c0ec1749ef93cbca8bd40512457d962bf0e9f3bb4c0d36fbeb6f301";
   };
   marcellus = {
-    revision = 64451;
+    revision = 77677;
     shortdesc = "Marcellus fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map marcellus.map"
     ];
-    sha512.doc = "5267a43751ac7a0aadfba28ec4427da7c1afbafac2425f09582a736520ab4bbd769e08ef02b86816225cd76bedcbb23f6cfd3e77352c9e4008f9443b826b48e9";
+    sha512.doc = "fffa4d24299ca1c295a10ed197d753cf15f758548e9947f9ad3d6dd18250fad49298418d1e013b1096da73245d0cc58b0178453aaeeaca63a56d57c737698cf5";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "b6ba86cea7e275ae2cb6f35468300035fec789b85280307e65784bca9844aa8c834aa23e9f7e59de75d53879dbc609e64c084adcb1c38811483eeab15543f95f";
+    sha512.run = "26c06d58a76772dfaff108819b05bef9e5511c32cd730cf6f21fa3bef70d439baa967cc354855190e8a622b74297e6c44a8e6dbf5c791f1bf2d5559c62328998";
   };
   margbib = {
     revision = 15878;
@@ -33149,34 +33264,34 @@
     sha512.run = "b6c16c5c0d4bee09aef9475f51a01ffcd90def3ab466c564c88c9665d33e9533fd897487da6b4cf5f15693aa4a548da3cd4598958bc96e3594ae7f9cb0ea1937";
   };
   marginfit = {
-    revision = 48281;
+    revision = 77677;
     shortdesc = "Improved margin notes";
     stripPrefix = 0;
-    sha512.doc = "fba2ff6febb4acd0dad443221c6146fc2b3818c4948827b827fe2ff2df82f4e2843520f1f4cd41fd64900012d64d973d9b649e65b1c5ee4e74757344ab423dc0";
-    sha512.source = "89892d83570cad7c46b5fafcf8a7d87b660d898afde97c2fed03f82d3cbdcea9bd11baecd19d3aa958305cac0d9f7163e00fe262a0738e7f89b62f7d1bdf0df8";
+    sha512.doc = "05e0620a1ca74584f70a770d9dc8d665b7a03696fc8b79cb0716caa4f3611ddc04d38fd04acd6997a5a061393c15c8e137f33ef5b6d12cc84bbebeae1c01d060";
+    sha512.source = "82f0b3a36e79bbf0b8ff464e01ef1187866cba3757af1ab64bcf5016b136d1817c3de90e72961860c36d4f885eb64ffd4f5251cd97e7d6437c1c894d4cb44c35";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "dafe223cc6120beac7ce419c5f5eb72ece9be2a21992e829a8015f7e05ca22c40d5196d26d21d8febf3459bfa58c7defc797ce7bd4ee1e3dda28761594240b3e";
+    sha512.run = "c7b366480511964bdfd5e3f6625d8fcf7db07b4127068751462d5cb75b72763c9335ce36a46e136533b7d0189ee50bbd34f1bde61ed9dfc80e76c3133cc062e4";
   };
   marginfix = {
-    revision = 55064;
+    revision = 77677;
     shortdesc = "Patch \\marginpar to avoid overfull margins";
     stripPrefix = 0;
-    sha512.doc = "16ab654dd8957bcf37351b7c766b787f27baddd4e73a6a4c3a07f5b1486f5ea73c9028675b5830b8dc1224eae29f50d61bb579aeecd9af4aaafaf78259bca900";
-    sha512.source = "5e94ffc102902ff040162f5d9fa39f1d812801d0413befa5db7cc2c23d91ce24d47317f411e64f2fb2e22fb782c9cf1f87780c2cf2eccc50214b502402032eb3";
+    sha512.doc = "e47474483ac07acd027be930c5dee52548b52ab7874df70394543fde33c0de8e7b058902167fa91532885f1088fb08a3d074f34b342047d3d613a647b94a6344";
+    sha512.source = "4306cce67278f00656b0a48be7c5cc119096be4131f8de64e302775253a7226972aa842d0d7739bb972a2fe49d377bc9dd97227e7256fe24751ab46a2953eb3d";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "70dc40b9823cd82a52a7e55e5af47e5b2373fd7cf16567f6eca2bb886d3612473141435444b538f81ab9467d1b3e5ba04424b1ca47d95cc0869dea02faf82b03";
+    sha512.run = "1c34df3a29440f175d384e307fe1024c3028f94e79622924310abcd30678963633cf89864497d3315bd8ef9c0136e51068c27c135b934b2d1a6b0d28a948c59a";
   };
   marginnote = {
-    revision = 77271;
+    revision = 77677;
     shortdesc = "Notes in the margin, even where \\marginpar fails";
     stripPrefix = 0;
-    sha512.doc = "61ce9ebdf45daade83ed932d3567cdadc8d6f7663ad365ef057bec010f7cca996d01518837c623e7a278ad82f8b33ce67ae269d6554ddcbae0b5cc072a7a769f";
-    sha512.source = "0fe1e4dde2caa65fb88fe648711b233742033cb58ac3492fc323866e6dc066d2627e586439c94abf4fbd5628b52ea3180e13b26e96f8b4529ca3346b13380116";
+    sha512.doc = "212cb561fd5bf97b481a13a1900f11d70b5b7fa4e0275468cb7e1c087071f578bb2e6ed09a5891ca98884aca40f1a7b080db2e29b4b5f5fe5db321069284ae56";
+    sha512.source = "de9ccbb9ee72ba863358dc2807a6d249078b2d405c0a0e463dbb06381f03e94f9d76aa1539e3242f9332919aa5e19e7e22ef08af145dbf63d904201cdd33dce2";
     license = [ "lppl13c" ];
     version = "1.4d";
-    sha512.run = "1aa9b66dcab556da45f7ee716b00c38caabe058f6ef8ea1049e49b313fb84a9f4a3e86579197404ac2482a1dbc3a99f30b36c52013f70cc0a5d2034ad9af1886";
+    sha512.run = "14d803a0071ebf75c7944b043c35f70d5f1ded3bb293220902631f64d168b9f6d45183f185f0e8bf9419ef336b3b60acffc00a049fd282cfa8000e3a4e58f389";
   };
   maritime = {
     revision = 74037;
@@ -33209,17 +33324,17 @@
     "markdown2tex"
   ];
   marvosym = {
-    revision = 29349;
+    revision = 77677;
     shortdesc = "Martin Vogel's Symbols (marvosym) font";
     stripPrefix = 0;
     fontMaps = [
       "Map marvosym.map"
     ];
-    sha512.doc = "d6f72ee7ed64404acce5c37c216a7e23193f2053c18910d80fc6d5fde73ba86c07045102488f17f4cbeb9e1d148567973713bb4d9ce2cdd3cb166936ba5623e1";
-    sha512.source = "c28a69567c593160c7d04b4fc0fe7f0106db12ab588d3f02139e55ad99a1b4e33f1bba92f5af103b6f2a7e720d243b919d1f39f28031ad95dde3ae7e723f6e36";
+    sha512.doc = "4c85a35097f571201f0d5dad5f0c51f606a3b06d13e9e8da80b549993b931a3fbdb27d7f72a660731c10dd635fd41f3acf57df07d5ae9cc46cb2f2d39ec0af01";
+    sha512.source = "ae9658149b671f0d75638137b3ffa15f759129680e918d53cf9f7d9d9d69e363ef520a9e50f4fec4e1e68fec7bb94222c54cf09104d7af203678af6aca481227";
     license = [ "ofl" ];
     version = "2.2a";
-    sha512.run = "64093dc5de012c6a50762ef34001ff2305e6b59b667ac7b1ef72cc53f8b0ed3852b4d307a8d421ece996e78f2e32c8871038b6b66659b0866dbdc536445dc7a3";
+    sha512.run = "92e5448544275bfdb07411a43d67d490b29ff0e07c9470076f651fe7f439c548da483c624dedaadca52e7ca8805a554fd8a50da9c46d73b131c07888671a50ac";
   };
   matapli = {
     revision = 76924;
@@ -33280,12 +33395,12 @@
     sha512.run = "255d8b4c53895ddedb2777926855ca2f04f53dc73f139b21d2ca0556b7936938ee6cce2f0723761025826442288a1d21ed923448724c124c50013dd0665dfe29";
   };
   mathabx = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Three series of mathematical symbols";
     stripPrefix = 0;
-    sha512.doc = "e1f9f96794f6d20dd75bd7ceabd40993e56d5315848bbea8a6812a16f74c0fb92ddc6356c71aaa1367c47b1dc26a3711793ec88cf0b90d391f8157fe20f77196";
+    sha512.doc = "170056cf17153b7f0633b4ad47dbc0f2520e39b6183c663784e81a40dda648909fc9f259809465abb34bfab2df386bab96e16ad86e798faec7d89dd8d323392e";
     license = [ "lppl13c" ];
-    sha512.run = "400bb43207c43192321cfe1b658c85a07410778e7694ab1604b992025d69300bb2d4c2cb7866a255dc4988c843dd3b92c33e527c12f087bb560cba4520115643";
+    sha512.run = "a3ce2e7f5ef4dbc0b6ea91a4b75599177bcd880679a1ceea08520f03e9b51d74e4b2d377800469af0f481763c94eab09681afffcf4bf05de71b9d57144176360";
   };
   mathabx-type1 = {
     revision = 21129;
@@ -33314,26 +33429,26 @@
     sha512.run = "b995003ff03bef5d3da4267ec3104270c1a97d31a1b5380dbdbc418dd64d03383051328e4431f1bb6ff97055ef51bdeeeb74e071c5d57e8a81c8ed245aa7f251";
   };
   mathalpha = {
-    revision = 73505;
+    revision = 77677;
     shortdesc = "General package for loading maths alphabets in LaTeX";
     stripPrefix = 0;
     fontMaps = [
       "Map mathalpha.map"
     ];
-    sha512.doc = "1fdde4c427a2dfeeadd7df93b447d946e7f1f415ddddee8b34325b4e2de7300990093265cca4dfbfcecacfac34f067152bbe32141fb690f438a271f74af8105a";
+    sha512.doc = "964999c45b4862504c346ab9a24525e14f58c3f50d9727fc1df14b70ced17a489cad4ef074b0438d11d06f9e703a30d5f5428e64994b0067a9b07c173349fed9";
     license = [ "lppl13c" ];
     version = "1.145";
-    sha512.run = "a906a548fa4277f51fb92a79a85dd87a063ca69df99031fe3bcaef1bd6a3a95421712754c697b9e9a2fb29c32375f698734258cafbab3c8bcc8cee4bfb5cdd39";
+    sha512.run = "0432dba7a535096277d6184d633c0f41b41d4d669b2e0ac98039475fba69ea5b1e51d479a93cd3e2add1d0cdd5bcd616211fe2aa04df4648157129c93398ca78";
   };
   mathastext = {
-    revision = 75447;
+    revision = 77677;
     shortdesc = "Use the text font in maths mode";
     stripPrefix = 0;
-    sha512.doc = "d24ab6e127db714066eca142f29c5b8728bf1ce0a54d6ddbd4b768f079fc0f96cad5bf14ec37df9a40c9e6cda2f7b14e424b8adaeaade1037136114182e23be3";
-    sha512.source = "7678b18461b996cc89ea179c974351506250f8132616e412e99baebab6c85a0da93d609db54f0bc7813a6748f48533cd9078e153d46745606d95bded2c17fa18";
+    sha512.doc = "89737f3affe5ca995edff17ba3e6139f1960d3bda5a81fd00e35d0b17b476b2b5935935bcfb4f418a2928f4ef39935fa5516a691a4196960db1cc7d669362185";
+    sha512.source = "bea35656673854714bb8febddaff17d53bc70970d1693a28b9567406ae480bb15e559b5875e6dcd38af21be9dc516f7d0b7bccd9251b0232b535a263a9318d2b";
     license = [ "lppl13c" ];
     version = "1.4e";
-    sha512.run = "0e63d628d1310bb7031e6d157b9df20ee37ee589469ff26588026808e1424909727bb94052eee246b54ba2dfd7c0bf22a48c7a89b5301ce3f85e4315a19bfe7d";
+    sha512.run = "df93dbda9bfa96401b4f0af18560cecb478cc1adf26b837c91e30f0d3394e8cbd19ce29d42cb25fac6648705eccb80255c9e64c3dddfa12ded3447d1c24f9025";
   };
   mathcommand = {
     revision = 76924;
@@ -33374,14 +33489,14 @@
     sha512.run = "cc8a1c58348f8f81417178434c9bc3d9edea79dc5d300753f41870734f8fca8f43325d56f73e3113aee8e9f38be1fbc6abd3cefe4458af1e1e22900ce889c315";
   };
   mathdots = {
-    revision = 34301;
+    revision = 77677;
     shortdesc = "Commands to produce dots in math that respect font size";
     stripPrefix = 0;
-    sha512.doc = "b1ce238b3abb3397b0085983e752dbb9eb9d9c1026046726360498d089304f7f4deecd656dceee27b63934092568f0ca46620231f03e0952c43f28ae73e97dc0";
-    sha512.source = "dd590187fadbf0eb788eade245d4198a4c1075433db1a0df00ce2d5cf2b6f332e09ce995292d21ad46f13ba68284808cfea6c7818a47bf99a61ae44e5381fe55";
+    sha512.doc = "8e6986fd841441648d657159c36f5f5cfaead1c4268a157009385e14f25d388d8f80e81ff56d0a4f32ce4626f1e980c0f9859ca09e6d45b9cc50745fcadd22b0";
+    sha512.source = "004ff5fd4e36a9af1d3efdc84b949c7f673677aaedccb67f14958cc81fb16f0c14199b92cf8cdd6bb467853d9faa653aeb27c4651894f0cbdfc61e85f9f905be";
     license = [ "lppl13c" ];
     version = "0.9";
-    sha512.run = "1235583223f831852458d53e1e8cb767495987829d4930387f4dccf7ab060b9f0af8722d6c1aaa820c1a371f8ce1c0222633e6feb064e0344e639eedbaa4129d";
+    sha512.run = "3b24ca6de1d97030a85e03396e6fc856061f54c2d805b533d47295ea66771f529320bab928fdd2bea3814855b45e8c615e7952546d4991ce151794b3acb016ae";
   };
   mathexam = {
     revision = 15878;
@@ -33413,14 +33528,14 @@
     sha512.run = "1cdde593399642bdebedba3bf943d5816f2d3fb457679f511c44360f34d808607b2c8c0d9418ab7f586347dce4078465cd631297b180360852ae621a1213deca";
   };
   mathfont = {
-    revision = 77458;
+    revision = 77677;
     shortdesc = "Use TrueType and OpenType fonts in math mode";
     stripPrefix = 0;
-    sha512.doc = "bd997d43105f35e58f8bbc7bdea2365d07b242402a4dd178e62c4cc59bcf45b7337c2ce9c6f9020f79fbcafd308c00b6a896a27ac12971fb1544f234da4a9879";
-    sha512.source = "cf0a99992a92841e0ad9f3b470b83c65239157b5b9fa144e85760c168dccfe121661fad5b64d5589c15803c29ec48541ca21b2a69794209883bb125d6c587d4c";
+    sha512.doc = "1684c46b335aca07e7588bd7712e6afd1979369a7787be6ede2a3c99377dbea0af20ccc1f4154f5722032ed42f82d1a31eb2ddc071c9bf95c99064dbf82a4792";
+    sha512.source = "f0ef9fd09c74a05af0dea4274cdf1ae56ef2a12268999e08720d58327df2136b45fbc1244eae6988b175eb305878b6df211e75b911e6a85de5bdbe60dc22f482";
     license = [ "lppl13c" ];
-    version = "2.4a";
-    sha512.run = "dd4b217e459ddea61029426c9cc36cc7500a9a995541196a87f8e586a9a73d4a8651a7d1d58608c01f602539e0dba20826f4f80a477b5268c75d6c2fbe85b72d";
+    version = "3.0a";
+    sha512.run = "2105879163f5321bc7ec71620c690951c7ab732fe3bd98417ba4358e826178cd7d1f3a75a67bc470e3584af9935b5cdde385351ea0802439d6fdd04136be9b83";
   };
   mathgreeks = {
     revision = 71248;
@@ -33441,28 +33556,28 @@
     sha512.run = "1ec5761aded23b8ebd4b9afece00ab1f3f9a18886edd12ffd2a2e0b5b9fe9adc9a4ee6fb629933f36f6a161c76e85b54e3d9855871c3387cb0f70f90194b2615";
   };
   mathpartir = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Typesetting sequences of math formulas, e.g. type inference rules";
     stripPrefix = 0;
-    sha512.doc = "9b67179d9a261af202a961f77d2a36b065455de574b803073cc5226535053e679284340e03a88d4048fca6c49a07a10c27a6f9b6916026d818591d8c83f70acc";
-    sha512.source = "8b8fcf25d5506fb8e725f4645b0921086875afb8007d405016a880a19670a206e34ca01aaa310e937ea6c56103b25fe824d3097142425d9bb7fa26a787942e5a";
+    sha512.doc = "6508ba61396cbc08a64f5d29018edccb97c6c572072350ac15d911ede0afbbfe631d6b0d037bd055a223fd2a1dcaa1c3fb3eed20511f71ac2c0accd4dcdb9ef3";
+    sha512.source = "cf6e32dc0bbe33ceba1ef74d55e2f7e4cf703a7fa7c18863cc2241e86ddcb551117af8bd0a56779459ccd823f191e70a612cd4b41ee1bd19f9af276046489186";
     license = [ "gpl2Only" ];
     version = "1.3.2";
-    sha512.run = "2ca8f06abfb1e94e38b3f961c0c9468cc54413fb401a09862138189879c09816f0f6370755ab8a006e9106e0d2d72d13c31f153c5a04ba05358044bf693f41ad";
+    sha512.run = "5629722a16fb66f47847d11fd988f512acea8b0d1edfec6b47c0083a8dd93fbbd96c8a1a429dbadbfd7eaab1603cf80646e6a4407aedffb949c1fbe8d7d08d2b";
   };
   mathpazo = {
-    revision = 52663;
+    revision = 77677;
     shortdesc = "Fonts to typeset mathematics to match Palatino";
     stripPrefix = 0;
     deps = [
       "fpl"
       "palatino"
     ];
-    sha512.doc = "94e624f2cea50bf3534300d3332dd61e1bc5b4c834603356831d0f9bf4c6bdc34af5d31df002c10430d4945c2c71dbf7c156b7b05ba08c657cc2d960839c2a35";
-    sha512.source = "bd6aba477ca38c9778d7d23460420f485ac5658e9514ac2260475a50b6ee7e2ff736bac81a4548fb4aebae952a406a0de1bef01bd7d8fe4984080ab835d328d4";
+    sha512.doc = "7d83f7857520d2ff512074d658b7941a9b88746f4550f67445246299825fcded81eee5910a90d4224c9301db8a8d0db7b510bb791aa5ba131d674c31833299ce";
+    sha512.source = "b4df9998a8629ce76fe75b1089cda3a65fac2c0da5aa14ffd8378a1964e3ecc5632e014901b6b28534b6f63785b6e3c4c8c5da4fb1225ba68274f81a09f883f9";
     license = [ "gpl1Only" ];
     version = "1.003";
-    sha512.run = "72bfba52e37abd933cb7b1b19dd813c3c76438591c94f9c407cabb8a44c8c67f78fae04442027287e5bf30b7239c3703ece4271194716882773eeb50d4cb2f47";
+    sha512.run = "6f23a466f105087a361d127cfc45b8bb27bd082f6c9cddfdc6e23c108449b3d56f1eef4f7b8b4c24b2c7ec0a7520a6aecad94606048735671c0b7b19cf089bc0";
   };
   mathpunctspace = {
     revision = 46754;
@@ -33491,13 +33606,13 @@
     sha512.run = "e8cd9b91b758317d310265c41f565481a9a18c9a345ea3c8b3f771de637f0a144d131cda93b7771ee7b28563fe1e6d42a410cbc7c9fe08532a5821ca84d5a101";
   };
   mathspec = {
-    revision = 42773;
+    revision = 77677;
     shortdesc = "Specify arbitrary fonts for mathematics in XeTeX";
     stripPrefix = 0;
-    sha512.doc = "d22c19bd2114bc48f438d820177006170d52d1a261f3cfe69452148f4e11a0ddeb1bb25e1c1fa22ef8d2284c7f34f7ef41bcf9d8e90a89705b3a7515a679a922";
+    sha512.doc = "9337dd4ac2ce39fdd3ec7fdcf05b1e85f4e2b21cb9c834d287682a2394f719244c9d61f4e05f23a41e48930eda455f2656432751e612cddfec9dcfeb1ae717f9";
     license = [ "lppl13c" ];
     version = "0.2b";
-    sha512.run = "7e9838ad2f212354b103b9beb61d60f124d2f47e52a04e2fad61de01e2e8220ca5f19f5b2188cbfefb379f94dc4b76573355dbde563f887beec29c57b3648ae9";
+    sha512.run = "0b5bc1131e8c5a355a5cfc36a6dbb72d3be964078d8e00eeaebf438a9a073470ea46d2243b7a9ce2a4639b070f4fda30cbc8ae0bfe9c039906bb9b7b1928e390";
   };
   mathspic = {
     revision = 31957;
@@ -33512,17 +33627,17 @@
     "mathspic"
   ];
   mathtools = {
-    revision = 72487;
+    revision = 77677;
     shortdesc = "Mathematical tools to use with amsmath";
     stripPrefix = 0;
     deps = [
       "amsmath"
     ];
-    sha512.doc = "acf94100b66853f2d518ea72047701e635ab745537980215efb551ee2dd54b8dae9605d252997a2061b6abb76e6bc17db8042413727b7c72bf150c788a31a561";
-    sha512.source = "bc83fbf369560b23508e9ada5d878e93d4e06f963991cbf764242dc3fef5d65fb65916212599f31f87c6d4159b64f13b4be20ba044c47e8d13013b2b39e56255";
+    sha512.doc = "da791648ed0bee1dc5aa1e10db89ca879a73820fd7248845770fb616910205b88d5bf458adcf1936dad1c4f144a8e9af6d4fc2cd72b6619154e2eb0645cc1ef8";
+    sha512.source = "62253ec980dc40d2f9baec8640c2faa5cc97e299987339adde41ee78918015f5063b7e95cbe6eddb62eca61bea5ac6e8ecc92a1ee96862a7f252a6dbdf0e6d2d";
     license = [ "lppl13c" ];
     version = "1.31";
-    sha512.run = "a5702e835e8885082d38504c9ac0afbb271fb1dbdb0593c4a6008c85368388c71d1794a5cd87bca67b5d1415c8fb9becaf7f7ca942927714e6b78a29e74f02c8";
+    sha512.run = "b114e58ad2b6fac7a608cce5160db22d75bc27ca983b7ab7b6f05c5e62444426e2b38580b846043777c202fac677ee6fa038bcbf73836646bdb1701d6f434993";
   };
   matlab-prettifier = {
     revision = 34323;
@@ -33544,14 +33659,14 @@
     sha512.run = "55a7bc16ea6afd1e9e623b2fe9e8eea8e7db2a98be58432a296500a246dba7556bb5f79c062b72c0ae957822760ee2494cc3bb2ceba7ab54860f96e87dea53ec";
   };
   mattens = {
-    revision = 62326;
+    revision = 77677;
     shortdesc = "Matrices/tensor typesetting";
     stripPrefix = 0;
-    sha512.doc = "6139624ff7f8b5063e69c07738e07ae8a1bd1dd48c155b73d17466d4ee5aae25d377e7b7c0726e84e89010d99731d337187ea017f934889843360533c7218c77";
-    sha512.source = "d8b01f5c5d7c730e412eb1fc9beb7ffdc60b4b6021968803f24362cf558660074e3d94050878f09513221b6d670ab195b1c2020109e03c9c53c9d485355fe740";
+    sha512.doc = "461b8dc468573fdde14657ed0aaf94ed4382e47007d8f928dbb20f6187c375110b9e7b2e16e7a9fbb3004590c2327781e5fcf3a4d8d3499061033366de5eb738";
+    sha512.source = "4ffda8430ddc33d4835a73627f5d4fc18a29e26e9c3bb759f69b5cc9b676696f64e2fae869f8c10597c51f6f043ce3ba79bd6cc61c34ee90a5ce5ce6c32e3b57";
     license = [ "lppl13c" ];
     version = "1.3b";
-    sha512.run = "3b58af4da3a0c8abb4499a28e993dc3bf128fc24188bc906d3bed69ba3040aca66d341122cb0e57adb18ccb4320736d7b27423ec8f6f6dacce4fb7bf4bfc5d08";
+    sha512.run = "670c8f902745b859ebedaba0e938f37303745d4492e985111fe9859ada634a9c3ee6c64bd1fe245a6be65dab87ad5a8d12d6edb6903ea79740ec2a2f81fbd43b";
   };
   maybemath = {
     revision = 15878;
@@ -33571,14 +33686,14 @@
     sha512.run = "cc9d41627ae2568c6c881de951a8f106e35b8bf5b80faf0231f9953adcf9846a2e9a113fe77520475345a9948cc2efcc21ec1c2c492a756e02de7bd2865908c6";
   };
   mcaption = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Put captions in the margin";
     stripPrefix = 0;
-    sha512.doc = "e803f5731e6ac1c299bc3a42666acb81a75a3f110be729639357a15633e0e7b8ad0a244820b96ae9f8b435d9d1fea54a0b7f14c5db02799b3a632b2f0c5cb4b9";
-    sha512.source = "e859c83efb88fa03790b2ddbe18cea57ee489dd59679559f8d7f3b93a0804d93478412414e131f39bece090ed5b3433e2784facbff9b3ad705a81d1adc542e77";
+    sha512.doc = "e27a4b2ff6012bc1c9d97fac9c5022b3e8561a413a85d9fe8fd1eb0e7fbfc7601814f360b3152d925382cc1f890472b6e793da086e93192840966fcf7f22871f";
+    sha512.source = "b2e1220dfd49f543d324a408dec90937984f2af93cc6478bc5a5c87ce1248955b71697e3fe285b25c0da45ca503d017eb4810716d84ac95ef6804cc4afdb0302";
     license = [ "lppl13c" ];
     version = "3.0";
-    sha512.run = "c3e1c2948e2687bf720dc05dfa1ed6140a1ea55de3cad7ebcfe518d720ed96793b6bde32fb0882cae773f986b11150482fdfb382391650a8c513131b7041555a";
+    sha512.run = "3f4bf056232a4bfb1403d2571a90bcf50a6a236f21a23d9a1d3f37f571e698f932c45010c86135da3520016665480e22361a44d2d36820030ccf86f35078b016";
   };
   mceinleger = {
     revision = 15878;
@@ -33607,23 +33722,23 @@
     sha512.run = "5918dd5e86cb8afbd4fc4def93847f42101825fdc77276d5f22f697ba4257bf35276bcb348d6f0aa1886a847b297cd8919f69cbb2c8cb8558c563074bdaec205";
   };
   mcite = {
-    revision = 18173;
+    revision = 77677;
     shortdesc = "Multiple items in a single citation";
     stripPrefix = 0;
-    sha512.doc = "8c5ae4b1beb334ecba3294108345bd616746ee651f03d39a7bd5f5cac97f671a861fb046e29ae7565863aecf4b043ebe25bf9a4180889c39e48735251e430004";
-    sha512.source = "9f6e6edf49906bf3300123f8fe265ac8f8580c6838d59f7147e9337e67bff71325ee41a3993b3d1cdc9c036b5d519834261fb0a2a9cfe4d3afdbe070b454af8f";
+    sha512.doc = "50a8b6419fd76a33aba5e3c079cf6df5bfc5154c0f2c37f66f2c31b07c6ec4da79e2b2db759520a88a662ef38cb3fa0add8ce0449de9b1fed0d1a4b681c3ffda";
+    sha512.source = "297b267835046cd4306154b3eba33cdebe87d37ada827d35c131a71279f3b470eaaac54315b4dd548f3dc5c400ff0e26458ab4eb9406795618d1e9a4b5b46189";
     license = [ "gpl1Only" ];
     version = "1.6";
-    sha512.run = "71276681ec29d3d77450a8c343d64a1ea734bb48de0d693a4e9ca795e4a4c9a3d5f4103b5641c8684d49b5c95f56bfd08bd12e1d7e37d06f9170008b51804897";
+    sha512.run = "61a77397a57d032e2e5d94cc58970820c77da2c07e9b1802a0b032aa689da7ddb0e496b56724a7a2fea366f68274294f6720f9c816a69996457e33d79996da39";
   };
   mciteplus = {
-    revision = 31648;
+    revision = 77677;
     shortdesc = "Enhanced multiple citations";
     stripPrefix = 0;
-    sha512.doc = "5e720fc2b32ca00d71ade77fd0a47c6ef44d9b7692a8160ddc55a5f60495a40272a7a0c6c2f5bed923ea10703654f155701d4571d72805c1ef900780a209a0a4";
+    sha512.doc = "77a95012d761018138d0e1fa2a390746604d166e3240eb85e2aec306bfdc52f2cf9a4970982a1f2908062cf84731605d3d6d8937821a59d1cddc8cddf1f742e0";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "5be1980964ea8342321964f0db1c750c33fee9f21724608a260ebed22500d1fcfb0fcb7e588a0dd030a6c534b0da904b8bfc3eb0da7b2df34c0b3f2b1b8fb637";
+    sha512.run = "6754c0c1cabd04bad0698fe736b9a33fd774d86d98a2301e84b4d7fd4a1f0d6913b6fb5a499beace5c2873f6bcd6f9e9af5538761b86b9dcd4d8e494965433a3";
   };
   mcmthesis = {
     revision = 69538;
@@ -33636,14 +33751,14 @@
     sha512.run = "8730424989cd18392214aa59d34b0885fc7966d3b2728fe8a4c05ddd042ce3a0fe54bf0ec6e602a9a7a6ead6df67b653b09c6cc360a14a9bf17bf3dcec3fc2b8";
   };
   mdframed = {
-    revision = 31075;
+    revision = 77677;
     shortdesc = "Framed environments that can split at page boundaries";
     stripPrefix = 0;
-    sha512.doc = "06822404872899d6f509fa94f69cdcb81dd69866fbc5a82fd54ca361aaf27133140290cec2d08800dbb39c896ebb7cc19dc4cce38d2a0e45de9c658bbadf3352";
-    sha512.source = "04fa6379f9840676b4fbc31029f091d9112524f8450747ce31687c9ba77a02e41c25ff51676424e97b788c48bf0bbab690459b6b84e128514cda8efd459255d4";
+    sha512.doc = "f4bd5cb1dfec5ea6181989fe3be0d20501a7499283e7e4f9cab7e2ea9afc0d736df6e002ee95af9e13ce22e4127fb5bc28172617b771a53616b104e1921d39a3";
+    sha512.source = "af5c66c123fd0b511878e844ba8554d30bcc3c4bf645cc11e17ad898504bc51dc1ae4418d1326d2c9556d6387df69c420a2e9e34f6eca31b2475096a9d7ce6e6";
     license = [ "lppl13c" ];
     version = "1.9b";
-    sha512.run = "0cff0945adc04102e0b0a154cac1f78e9ea903b29e3f880156b888abeb4ca23565d39a7b66d8097c35534baebdf6af152c5b3830d08e1287e8e8d18e8f6344d0";
+    sha512.run = "1146a5e61716d0c6567b7485915963215ddbf9bc649d22136aa3ddca4a8391d1ef7742c91c213305432a1eb3d2c24a60e5c4f426068c356bff4ff03261c56ff0";
   };
   mdputu = {
     revision = 20298;
@@ -33655,17 +33770,17 @@
     sha512.run = "2720c63845939d2befea3af157eae95d2550a216cd22634ab0a923a06d50b48e7133e914d210c5d3aaae6fd620312d23d2e55a015c2a24ee1881bc7ed4868778";
   };
   mdsymbol = {
-    revision = 28399;
+    revision = 77677;
     shortdesc = "Symbol fonts to match Adobe Myriad Pro";
     stripPrefix = 0;
     fontMaps = [
       "Map mdsymbol.map"
     ];
-    sha512.doc = "ea4ddd0fd65204ec0ed980108d86e97be267ba46c1cf45711c36721bfab9302766ec1d0849b38de75003af564a797f8566def377d8d947d464367bfa40b91399";
-    sha512.source = "0b649eba13871f6da834bbfb2c6523db6d50bd6a491b042a19f0e061ce9794d2ca03c39d277669b6698b48806fd0b705f322a69743c4fc50233559fd10406280";
+    sha512.doc = "d93c12ef5b779decc3496a33e6f027aac101a3487dd0a9569c23b381d244e73279abe96d97fff81726c2d3d45810c4d3c730a94acf8d2ed4fbb909c9316f8258";
+    sha512.source = "0ccbc635441a81faebcc8921b363fe873fd0f72b708ba66621bf012afad175a69faf62add9a3ce9b4bea11f2f4b0552b8713f1fff4f9055ed8ba99228ddbb652";
     license = [ "ofl" ];
     version = "0.5";
-    sha512.run = "49b52141928fedfdf5fdd63251de182761825a6cdcbf423bff562a863df159ac0d1c001239f777e7aef68ddce23c52407758c70f7da42f066775e204ac8c841d";
+    sha512.run = "4bc789e7accdab681bd93f96514a705c0c341225b6b31961281621fadf6fce58b20265610db2b188542d464297e16b1a05d4e2e7cbcc349214b244588d0c400e";
   };
   mdwtools = {
     revision = 15878;
@@ -33767,14 +33882,14 @@
     sha512.run = "74931ebb1a146edadcde19d8c404ff8df750c4eb8f2f59fa83e6da9f8dc6567005d51f58e4b7bd2cdfa6b960adb072e9fee7b1842142076df88887c3c2b41051";
   };
   memoir = {
-    revision = 76756;
+    revision = 77677;
     shortdesc = "Typeset fiction, non-fiction and mathematical books";
     stripPrefix = 0;
-    sha512.doc = "5d74547fb673e362341efbfdd88558cef5e02bb8361fb595d5423574a1b8b6222f5231f54bf218c21d73498feb0424d804143be5bc42dad031e6bd5347dde6b9";
-    sha512.source = "7372a1ec0e1fd4ca55cb080cbd5dd3b655eddc05353ec574187b532356c3f5270ee0fe9a87085a5b391569e35cf4f96ca08341bb22aafd246e5c075adf3084c7";
+    sha512.doc = "e57f4aaf4e093b0889ba13f8cd9febd932cb8f46a6cd1df9815f1b34e9b4e6c31e9cd7dbf061addd5683aa39de2023e0802be2d4fc20a51d9332b8f87842a503";
+    sha512.source = "4abd2799bd45d46f9050fb7534260419c8aff5a1e61d9ed395234a4c06a835c9db004c99cdf58ec536c002f2bf03d1f5822d54792fe8f3b39e0510c09013659a";
     license = [ "lppl13c" ];
     version = "3.8.4b";
-    sha512.run = "f85d4c9ed9d76cb3519366daef63480d5e197411a4e4740ed531236a2ba5f6983bbe3f178aab6050d24e9e5c31fdf903f94ace7bbbc8379e9b22abd12c366ffc";
+    sha512.run = "eb811c7aa69d2254599fe8cdc9dff10d43cd247ff32f24966477fc5b6ca2f7b921e439c290378f4efdbfa45afa1ec13d63dd98ddd1aac5cc00759947009cce62";
   };
   memoirchapterstyles = {
     revision = 59766;
@@ -33797,6 +33912,16 @@
     version = "1.4.1";
     sha512.run = "6183a9bbe0078fa5714383dfde12c907aa79fd2d736dfe25a866b8d2d4ec65d8307066dc393b2a78a9ed2a1dc8693862811490c2f318a390582061609e2439ee";
   };
+  memoize-ext = {
+    revision = 78222;
+    shortdesc = "Extended support for memoization with Memoize";
+    stripPrefix = 0;
+    sha512.doc = "35f1e2122c132bb178245bd2e4e3f8161c197529219008aafdde27b11096d04a2e77e34f5c8af4d61b11b6e0326631b33011ca3f7315cc92b5296b0afe2e2924";
+    sha512.source = "91cfe97f769b1dae91f62c1f4acab430a09c7023744f0a76e75f22df2f5257e85ab46cd2f5560312cd01c8b9ad5a45838154e633aaeb3e89f74ed42aa1495235";
+    license = [ "lppl13c" ];
+    version = "0.2";
+    sha512.run = "3a0d8ab666bf4c516da4e506c9a231b501672123b95b3d5fd6e607ab16bc92d22e8ca52aef7503224c3985856db8d1c6d227ccb5d757d0fce98c744138fd9225";
+  };
   memoize.binfiles = [
     "memoize-clean.pl"
     "memoize-clean.py"
@@ -33870,37 +33995,37 @@
     sha512.run = "2cdbe2b8acdc12e4fc0b7d8a93afacd30ea2a8bef6a3f1766d219227e77cf06d26f1fe24206f15dbfd6d0a7507780955060df1056f14cc546e9a3c781c36f307";
   };
   menukeys = {
-    revision = 64314;
+    revision = 77677;
     shortdesc = "Format menu sequences, paths and keystrokes from lists";
     stripPrefix = 0;
-    sha512.doc = "5edf9b9e2accb846aa352046e37af630d997480a3483c53796e56066c1df00798b7615d13bf69d822ed9caa300f6abf624174cf7136caff8fd14c5d23ce2b68c";
-    sha512.source = "724478484b110022c6bb591d92829042299226595fe9974a41efe9c6fa9b67c4a1c617690a2518e6bacd1f903bb020c1f815f4c3186ba2ceb185f624a869fabe";
+    sha512.doc = "95057dd2cbd887b7e48367bbc5afc9e6bfdafbde4ae8202603645289a52fcc8c69344d4952fd8c5f05e8b2eef6fd90a4d4af560c36e69d93dda4eba5eb86f818";
+    sha512.source = "eba166e9cf6c92718082d2b3242ca5b202721b2e008ca9559b2fc0b60aeb9017a7abd3e2adb88fec5a6a9d418f0a0c86a7098c5d5f8380de97bc6824a6e6a509";
     license = [ "lppl13c" ];
     version = "1.6.2";
-    sha512.run = "624bc3f2c0cbcf4cceacd555619b5e3932c7c8623e44f4b313390af47143908d019fa7e83d28f8ce94a5e44df40aa73d6823edc931bf8b289d20fc2bf42616b6";
+    sha512.run = "095df23e6269994f0eea8265336d749ae636fbc66b0531a2d3e2f4745d4e0d64aa523d755633d30be4264f383b72fce6963dfd977f4ab1b32c0821afa0c40587";
   };
   mercatormap = {
-    revision = 76924;
+    revision = 77984;
     shortdesc = "Spherical Mercator coordinate systems and Web Mercator tile integration";
     stripPrefix = 0;
-    sha512.doc = "26b1a51a13669e67196103a0519793b2c36eddb1624a83267b78ad859fc5be45ed1161000757a9e86899e53661030b9b887bdca22e22a9d15951cd81da93cb92";
+    sha512.doc = "f663f3782facdb182e09ea70a2ee18285280edee3588166cfc4585208e6c97b271f230a494753fa3de4d79fc50390a559724e50a8873a0a770934e022aa89338";
     license = [ "lppl13c" ];
-    version = "1.2.0";
-    sha512.run = "1576e5af93e298601262252f72f9e26beee1ec97682f00251603f04952a29622ea2e85493fe6bcbfc6c66255299ebec76d4c0a94b39a3221eb2d6a7128180552";
+    version = "1.3.0";
+    sha512.run = "29aee227bf656732abc458ae68fc4396ee776d85ef41c61ae4fae789feaf53b66c273b6ca777608fedc361aecaf55b157fb57400d944f5c4ebf1478e4d0d2eac";
   };
   merriweather = {
-    revision = 75301;
+    revision = 77677;
     shortdesc = "Merriweather and MerriweatherSans fonts, with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map merriweather.map"
     ];
-    sha512.doc = "e4ed908c8e267518edf7be5fd9a59b08855312f2350c26b3759e0f3654b4ebb9e8f9be39373202a14d0d833541f6dbae49160d56a7d74ef09fa41fb2b25ce1f4";
+    sha512.doc = "6dda4e04ea680ce0bb0977356871f32d3735695c4c3653446b017fbd4a72fef9efb903244da27f23c82f67b64c703331c4a09663c0587790356e097c95bb6d41";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "10762ddac60a7e624bdc2284fd33df2d23e71e7a137c29ed67a54f648ea97d10dc3413284f393bc099d807ad7eb1e2a45368e3fdb6ff42efb7bec799fba27581";
+    sha512.run = "963f87a0d68ae87d35850f7f15e8447ef21aa529a6b78e58fc3cf9edad537f27705586073c5ed1ce148a8d15a8ef7a9ba19d9cf4a67d4dda02f4f76029a03934";
   };
   messagepassing = {
     revision = 69123;
@@ -33912,6 +34037,15 @@
     version = "1.2";
     sha512.run = "8a2243bb9b788a4dbb1caf14368fdd4df3919d9d407b65f2d4f49af16a341a030bd9114f86078623760dc3ee5db060060c58c6f675f4e8bdbc3c1c7c9b7a1d3e";
   };
+  metacapture = {
+    revision = 77822;
+    shortdesc = "A package for the capture of author-supplied metadata";
+    stripPrefix = 0;
+    sha512.doc = "e5a51e88354a0bc4c114ec2648f1e33b52e992e3dc8352c223e5db5c30d0a799cdfbb5c07a521b0aaf799c0633bdb60e2cd4c958383fa5655ec9b43e5a70cd62";
+    license = [ "lppl13c" ];
+    version = "0.9.1";
+    sha512.run = "bc3150d5bd60968c85f432efe726d047312367c9b0862fa26a82a80fb5cfa1ce87e7caf075e40d3948c3c397233cdc5223cddef3e3788abd0a3222046c7a0c0c";
+  };
   metafont = {
     revision = 73848;
     shortdesc = "A system for specifying fonts";
@@ -33946,33 +34080,33 @@
     "mf-nowin"
   ];
   metago = {
-    revision = 15878;
+    revision = 78116;
     shortdesc = "MetaPost output of Go positions";
     stripPrefix = 0;
-    sha512.doc = "8396725c0afc87c63d16256d5ab0d575a19f05d78ed245099a60785f0810a012e8c0026cf13d03781d09d7c0007bb9ed9b87072ed732ba706c893e5465461052";
+    sha512.doc = "d5a9d0bef0ec3434b0c45b0ee9d84d10206e6663fdfde27ef4f18b8cffc4d5cf57e912d0fcce0c699186eb2a4409f8441f013fe466e39bab5cfee93f4164fd70";
     license = [ "lppl13c" ];
     version = "0.9";
-    sha512.run = "e7b3661d99ea50f7b20fe3af370e59e960fc0599409b5c11bfc9618c12c38e44b89e4e81d69ae7ba5e2565e46078ee52ed0bef46aa619408b386bb73926caeb7";
+    sha512.run = "690deda13da37d635eb2b84984d9f64e54a751a64c808e9c8c0f04b14a2f1d31464cdb85df7320ad264c3ef7cb7220201e2e22053ad9f35ff95ffb71e723374f";
   };
   metalogo = {
-    revision = 18611;
+    revision = 77677;
     shortdesc = "Extended TeX logo macros";
     stripPrefix = 0;
-    sha512.doc = "48318b396e4e227dc1b80e21474a296ba4dfd37e81b95f9669dd8c96ca7318abd8a1e21ceb95e0ca7832ed64a85ede985fae7e2e52b3aa742c64b86e54fc563c";
-    sha512.source = "bf240b77ef00d5351218674baf851b0eabcb22257fd6ce9dbd6b66afec5323a730df7b27d522f5130830ecf92af377edb3ec7906be206e760971dbe8f6266942";
+    sha512.doc = "62a2316537051106a4918c13b8b79a5e26dd2c14f08596be2e5e39080b595ff84324e1586126e13f4160ba3c603df8982adb739ac725f1b3166f4edce8b2c5b9";
+    sha512.source = "df744716c5b15352df7c4a24d18b5c9744592de01e2f5524d389298d81a6e69e67e5bf94f4c28e79d21c6cb6916fa1408b71832321d25ab57c0f9fc3b469093e";
     license = [ "lppl13c" ];
     version = "0.12";
-    sha512.run = "20d5a9b8454166535aa3aa80da7d2931937fc6a4d730c1ab70c856311c223d466e9fce2ed6e3b2fbf4b4fc75778d7d4c2649111df5f92dd58b6fc42b3ec72696";
+    sha512.run = "9255d03bfc928ebbbaa18116a1658ab807d7c737e93beac44c0c8bf109a27fc30ab8c212b884cec007bbe916a8fb3784018ad03edd832eb805dcb954a77902be";
   };
   metalogox = {
-    revision = 73571;
+    revision = 77677;
     shortdesc = "Adjust TeX logos, with font detection";
     stripPrefix = 0;
-    sha512.doc = "1f2ae6412827a2208c73107f4973baaa1cf0492663b98a5586fc16e45a6ec5000193a95354a6ea08fcc776863c54e58931dde988313af8365f4ac2f27f43c1ca";
-    sha512.source = "83b12a872afec951004818eab0df7d4c0a9e1a3e1e63cc4d3a334a31b408956efe1899bfc26647d5039ac04b2871174e7e0562060d06c554017d9ca85219c8d2";
+    sha512.doc = "a4d15cd77f938b1eb045922298030131e6c720639e43fd18a1729fe0146e3f80773aa2452a7a1e5c5d7f33ae810067da1aa9b294261a5b67194c04a70e9228c4";
+    sha512.source = "3ef877ce48faad00875da9a27628ef5673e6b937dea0e9513da95b3fd82ed1eccacbcfbb8a8932dda1703231265e3a5ee2d3c6df03169405791a426f34d5fd6d";
     license = [ "lppl13c" ];
     version = "1.07";
-    sha512.run = "0f383ea1652af002516b9c1eafca6c344fc038fd9ef25363c720f720ab7334f5d443858b557a780b05607e783095ce2880883d09cdf60cdb7ed51825f0a9a19a";
+    sha512.run = "a6cc6f50b851e66bce9647b610c269f24c242d6dadb209e0ee41890d3dffde7cf914c31878416f2e15708f13c4b055d7e874f5731753d1381b78086b620e8ad9";
   };
   metanorma = {
     revision = 55010;
@@ -34204,36 +34338,36 @@
     "mf2pt1"
   ];
   mfb-oldstyle = {
-    revision = 71982;
+    revision = 77677;
     shortdesc = "MFB Oldstyle serif fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map MFBOldstyle.map"
     ];
-    sha512.doc = "a2eab7888bd03bed5ff215cca3c15cd6b05f8e7922cb5eceef4a96c0ae2afe45bd78edca4e61ed1dbd6fa15ac4812d126f01012921e86fd825b878dabfa927fd";
+    sha512.doc = "909cd170bc339edeeb120ca25f94db5963381d79ef28c2255278490cae598fe4b4d9754097bcdc27a26d7b24bfebdd38beb780eed0d34893943533a8d287724c";
     license = [ "cc0" ];
     version = "1.0";
-    sha512.run = "76130d3b7dbb6bb1851bba0412a64272b5fda62d034b765473b84d4f90fa66d0ff536c4717af475df30e1a7735c9a3eb249818a0b30d410174beb110052b8973";
+    sha512.run = "db35bb8bfbebcbcc3dc15ac6241898c16d77fab647b31f25fa364e356cfd1e6c8e629938286a0ea6ed0d61a33496b3c242db87825674dfc81858c6b8c0d30a9d";
   };
   mfirstuc = {
-    revision = 74838;
+    revision = 77677;
     shortdesc = "Uppercase the first letter of a word";
     stripPrefix = 0;
-    sha512.doc = "b0c2b40d466bc04e3e79446bb4df90f15b7ca4385f54b10909d14bc1feeb5de6a4ef32d91820ece375671d4829ff113deeba385a51e5c468a74eb1f252f49e6e";
-    sha512.source = "75c23659bb13730bc09e29b4d872ed7b5be6c8e61639500626ced26f5381638476bfcb62bf4f32b69c7eaf25480744a6cd603740474313bc88383db5c5d2dd51";
+    sha512.doc = "03053a4e1a776091017b87670e980d3c7cfd2e5d008bb7a0c9f5e1b09fb6e768cbbe5fe94a68d7c5357f557e3511d7623c738b1d3122759c467133282a452447";
+    sha512.source = "9698eb67b780848d61b850cbdf87cea208e04454fa0d43dd3057c2384c2f1e1918079e26c9e89a5dfb8e8a74ee51257a4e87751954c78e3f10fcda5ad8153b3b";
     license = [ "lppl13c" ];
     version = "2.09";
-    sha512.run = "fafac3a301e567bb428ba178b8c853e6c8a1e7ca40a6945b8191a996fe41c7d52dc2e00358381ae986b532fc4d7293028ddeebf9e6e932f14801093136d83482";
+    sha512.run = "d5c0db3ab760476dba580f80718c2ab1a7afc1b516f14543d03e32c637cce79b31787870c74048b43dd85baa4dae7fa6bd5c21f36196611a6a79993c17546e06";
   };
   mflogo = {
-    revision = 42428;
+    revision = 77677;
     shortdesc = "LaTeX support for Metafont logo fonts";
     stripPrefix = 0;
-    sha512.doc = "6d1dabc636d22c824838a82da83a4676b20bb8a55dd1ab5628d00b4543096f91d234a51a312eb83544891910d923650f09e8911ec9db668f411735de6ef5bf3f";
-    sha512.source = "7078092cdbcba668ebb440ca6214eb155221427ceaf4d1f574d1055d2f1f52d288cfc0f1d2212f2a62903e447c4aeb378fade068ab901833ab9c251b1890e15a";
+    sha512.doc = "16ab6043332129f894159a72606721a79bb0253524bc5efa292cc26e586e9ecf30ca1bea9d3168f9cb7186c5cb9da838e439a853dc0b90d4191c86f3453805a3";
+    sha512.source = "f289e0f657e01ebd1d126f197ddc478b26b5ce1a5edd5c719d5eaaa806d7e1173d27ba751cb6c53c0d8af31e64334d63d53caa8e91937d5db655b6e845a2e4ff";
     license = [ "lppl13c" ];
     version = "2.0";
-    sha512.run = "a1c5168e37fd9cbe5fc2714ee43143f36cec662441a7a9d33085652a5d6f769838d351faf416df6fda78529b5f8712f1a056afa47577fe925dcca5249f1fda38";
+    sha512.run = "ab1776dffb38d9db87ae4b5026cdb98beba74ce3aba8633b04702bc6d90ec3544fb04ef6843a74bc98cd272b39a290d1797ab479fab1558ad12a31abb12e3416";
   };
   mflogo-font = {
     revision = 54512;
@@ -34281,13 +34415,13 @@
     "mfluajit-nowin"
   ];
   mfnfss = {
-    revision = 46036;
+    revision = 77677;
     shortdesc = "Packages to typeset oldgerman and pandora fonts in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "f8421e58ede77c8817679fcdcb43fecfc519427b3cb93ed2594fef5c8ac8124e0563a2182803a2a6bc417982df298abc7fe092f1cae5ed7583e2fa6fe94c8345";
-    sha512.source = "2bd5aee80abf38884cc4a3ad6d6226243a6ffe0d2e879101aee56168a10cd0c7293eec7ccf53c7a7e8087ca94398e3f4ef38d71ccbbfe48677ffee3f8b813bc9";
+    sha512.doc = "7a65843b827e48e5d17b9286c1e735b1575d984eb2958eb9fd3b1b86d23459437974dd97bb8f86982e361c68191caefab8ad7d6ac350108a1a1ce433feef86ed";
+    sha512.source = "a4d09d483b80a5917c298f1c09c763ea49b7369e150e8e5849cd2ade19b365560b3d798c4c210c8844ce4b3f63720531936afcc9ba7e560dd3abf89dfeec9742";
     license = [ "lppl13c" ];
-    sha512.run = "33206fb4cb7ce8f18050d713be415abb95323599270b2b91c886e2ac3f24a58786a480e5d4d1ad6ad2083456231eacf94dc769b26e6cae7288e996c6e14bea29";
+    sha512.run = "05f6f0d8cfd5413718a9a3149a0fa351b39bb4b3a4f39acde9ae6c8d568d7740b7b7abcca86941cefd09bf147d1b28e88fb2980fc3c46fff0977f45afd652eb6";
   };
   mfpic = {
     revision = 28444;
@@ -34320,12 +34454,12 @@
     sha512.run = "64fa5f38398a626d5a351be7ad866c75feb4549f836932dc936cb99f921e7b8abe5b3d6fc1e1e6c427344606ee5dacaf067d8678e7b199fa1ff8d5c94cbffa49";
   };
   mfware = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "Supporting tools for Metafont: gftodvi, gftopk, gftype, mft";
-    sha512.doc = "87485dc5163196d2a3e7bad62a7d7e648ddc1e35738e9f8cad092e3a6e54390bf94c4ffd427729ec974faf009fc368e2cf97d12aac8f9ed48526dbbd3b908609";
+    sha512.doc = "697b1be96c4611977968958ab019fae516891d33b3adf7bbeb11ca1a7a48da96047692b3232ee972cdd22c9a4e4791abbeb19ae52ef1c70aceff7f65d6a291ed";
     hasManpages = true;
     license = [ "publicDomain" ];
-    sha512.run = "76924f5d24abda97c9c757c7b0c979688aea5763c740d67e7d4305bc91b5eb75ecf76a7f6b66ae5e977177cd32381f8481e61ee11f4081f9d8c0b1d40b8fc32c";
+    sha512.run = "1b401513eb655edfb59cb05ce50271078efd326b2ecd11c04b8fc0d12ded2fd41d19145d5f9452c18b2d583d157d05c83f618c6bf02e4bde518eb57bb49053f8";
   };
   mfware.binfiles = [
     "gftodvi"
@@ -34384,33 +34518,33 @@
     sha512.run = "ac5beb872c78675bc9df379f8a2afe533647a1c39781c57fed2cec6e610cafbbb45a4fdcbd9826cb123a584e121ff752633d6c990109bb1f619b1d9fac6906de";
   };
   miama = {
-    revision = 73481;
+    revision = 77677;
     shortdesc = "The Miama Nueva handwriting font with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map miama.map"
     ];
-    sha512.doc = "be11511170f0c860a9ba2d148d33a9a32297ad5e4c14786a1ef2fe37628419a9a37441b203a0a6465e9b0371d239cece138d559f28a12d9a84e583b0f0b29a15";
-    sha512.source = "d32bc3a0e51ff27a618cf9a072649967ce6d218ee78429d9c09546ccab49c02433be62ec512bcf9b0980b92c144a7ad168b8c783f608c736a91f421bc8380f51";
+    sha512.doc = "4ebc4ff51f17594c295cdf95402ae59cbc701021476a743b4bd7f8089bdab0d9a6007e6f8f79d9f9ae5dd58d41d2c0c38f68294f9637b549ee73f02ab376ba82";
+    sha512.source = "5100833cf4ea58d9ba6ab07fefe4319127d45e01221e8a5e7487e56bb930355db5977163cf1ae89b19c6462925afe2bec146b9f6aa1319ab3a33cf2faf904c0a";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.2";
-    sha512.run = "d0bff2752fc7e59b98caba1ef01f566203619871bbff5a630044f47cda34a0e8cf70190bbd092ec2da35594ed23150baf688c2107e80d1cd933035630e189102";
+    sha512.run = "18323b731950ea61db62afe9cec9640a82d56a70e318c88f67b404fb2b4fb31660c5b39363e0b66fd04a12d1231b6bfdfe91206f5bd0df07179f1fdb6212b94c";
   };
   microtype = {
-    revision = 75729;
+    revision = 78231;
     shortdesc = "Subliminal refinements towards typographical perfection";
     stripPrefix = 0;
     deps = [
       "etoolbox"
     ];
-    sha512.doc = "23e9d64dd1c0a8238d57da7cf173450945f64b9b9fbdb0004fc852614f540c0ce122331a54882a556c9b90cab0a98ac6b4e41b86644146cf140e922f7780adaf";
-    sha512.source = "3d4ae62dfa37e538f438bcdfdf032539520751196058dc066771ab56f4f5f541d043f7c00453528f8e220bbc91bb9a11eb196e344b62be3a4899b8a9f70ac48c";
+    sha512.doc = "2db9e34eff1b6603e940fdd39d8e2cd27f0e081638d0d3418741442affc640a35088c1208790c964c4856df6ec47d3a396fc3a606b5764cf22d43902498dde80";
+    sha512.source = "d8fb5d4dd316c5a0a99f6d94fd656d03bf6a660aba1de847a2b21210b4d9941743d2a1c4bb9a516d40097058d5f5b576cab998f5735392d5128e773b521b313c";
     license = [ "lppl13c" ];
-    version = "3.2b";
-    sha512.run = "e8f80e4f9312a15f587671914571f19fb795c73658813b628f6baaf639b9f6ccb833b291f40a5c39b56b335ddbb322eee81caa92992010c883b80eba363c6212";
+    version = "3.2d";
+    sha512.run = "d1b93de8e9b96322e07266f973ce4a30a117202241f3b3a8b687ad2e93376e6e5fe69275c4bd1f14c8aa791058d2983ac17a0a1bfc037b386b5010b0196c456b";
   };
   microtype-de = {
     revision = 54080;
@@ -34429,13 +34563,23 @@
     sha512.run = "8f8bf1d8d3c5c12147dd61a4d65d311552877a9f5eb7ebcce71602dc69ed5459187134d3a1e346a15255f2c4ba57f054c3d020817df0d5d89c7fc2f216b19cc3";
   };
   midpage = {
-    revision = 17484;
+    revision = 77677;
     shortdesc = "Environment for vertical centring";
     stripPrefix = 0;
-    sha512.doc = "25f41bb8cb12c6d310da66d36032eb4933248f0c84a67216cd0981fda7e61343c0dee03e96f522bddf969e925e6cf495754e52e863672f1cab4e94ae3b0400cd";
+    sha512.doc = "336e068d36d46007d7c1e80a9207c1ac64a1fee7cf0685655cd08dc0f01170d37a525976bee0bb3eb0504e79541f49a78a5656025ec4156e242b6f236c5f6e4c";
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "9a13760b776cdce28cf3eb1e28e957265d7d4e83b23234f1590285bc83409f1d5b09040fc6cacd3b9f7a5ec2f61a4e5431fea92a5fcf20032c7bb919ed59612b";
+    sha512.run = "977e19e14e51acb9c4f02a7d5c43f6c63a62fdfc250b7e494bbcf9a97e1dcbf625f565325cc04b07ad2295aad4a05ce72d85ffc2b2f6fbfd7cc892f0aaf8b77d";
+  };
+  milestonetimeline = {
+    revision = 78179;
+    shortdesc = "Horizontal milestone timeline";
+    stripPrefix = 0;
+    sha512.doc = "b78172ac7786e19d531c0b68c9307f12b1523dc0dac01d81edc74a9c44c5feb348fdd086516e6d5d9098a45490f49e23c4954d6d22347d539aaabea18a6c15c6";
+    sha512.source = "787445b5cf1f00e9f14bbd47da03e1953f2be8344cd08712b7aedfa5142b48f5b4e104993f5d1d82a4666215f95b95b0e56a5ea2ae4c6e3a792f2f825cfe59c2";
+    license = [ "gpl3Only" ];
+    version = "1.0";
+    sha512.run = "79b472d89cbf8f2be01d45cde12b755875ad7198c4af1f941290912f1a8ee00a7e8719e93640a9b8745d560d9d00ff498bca41fe4fbf0ca2dcf75cc49f9841ed";
   };
   miller = {
     revision = 18789;
@@ -34457,13 +34601,13 @@
     sha512.run = "7f03784d9f5593b7baacb1723e9b12792c2b6decd2b3aa1f0773af3d2bc7320120b351ca24f26b1a23d0871942c02cc66f9fd51d636f1e0415ef79bee499aa27";
   };
   milsymb = {
-    revision = 77463;
+    revision = 78222;
     shortdesc = "LaTeX package for TikZ based drawing of military symbols as per NATO APP-6(C)";
     stripPrefix = 0;
-    sha512.doc = "ae0bead229af221dbf71dac9945e670ac38e0f3f7518bbb8377de01bbe4fe4937bb62be9e5e8f4e90d641cab4690a2b8f3c76eff0c976834d8c738d1739ca993";
+    sha512.doc = "28d40ceb558aab73ff044462d2b197848c030b3f8e547e89599dcaa7f58f757f548f06e5ee1740499c9742bf2d6095aee871710a772ba32befaeaec8a76e4276";
     license = [ "cc-by-sa-40" ];
     version = "1.03";
-    sha512.run = "c29f2c659cbc36fbcc5624977d6709e580c42855d038a804939532418f533f5196aab215425f7fe6d06fb6d014b7d11ece05586a34f1fe0d15805b3fb1ea5d39";
+    sha512.run = "7834bda6253c1a15b5c0bf43ea13f671548dc1f08621086305300df1204c4ab763462213a4db7f57107ad0862166ed0faf03b2bf4a03cd2fb50afb62c1986a23";
   };
   mindflow = {
     revision = 65236;
@@ -34475,14 +34619,14 @@
     sha512.run = "35d1b4fd39bb64fb1e9c89ebaf33d54051f0f550967362dee15294aeac0066f92b0437e688b5065795dc19a680a9f26c99cb1647c3ddacbe0054ecf553c2f9eb";
   };
   minibox = {
-    revision = 30914;
+    revision = 77677;
     shortdesc = "A simple type of box for LaTeX";
     stripPrefix = 0;
-    sha512.doc = "0404b375fb0ef258d0e5acb8e7a78a60a55d08ce7339b9b63b1711dcc6d40b6f302b0f35f7d1fc8bfbf431b66bb5aaa2c94e92ee8e788a5f2156031425c0c4a3";
-    sha512.source = "6aafb14003afb2ee18390391e15fb00f73a16f568158d72fea348e7052bf1ec5f25cd446569bb3c6dd815577fca7b2522d4474681b560ee3ea65b6053509df92";
+    sha512.doc = "f07c2b43b5889edb64737e4c1ca67012ab55e203cb818c52084cbcd95b68f21e4a71e22399cb17baf437f672ba908a465c816e25dc987b9b86dd436cb387d4f5";
+    sha512.source = "f5e6dee889890d7b2e5e784df2eac4b8b6c8cfc8854909706e9fdca06f2288b0dec79288f616689649ed2e61137e133b52b7ba71b747f8ee2c8a3455de68cfca";
     license = [ "lppl13c" ];
     version = "0.2a";
-    sha512.run = "18d409728f57cc2e423b5c74ad7ff4a9e93f2405497a96024769fb01f7604e019d914365f82fa5908bb679ce4a48cab64fd4435b531ef72235067481b8dbc96b";
+    sha512.run = "e7d2b5081a8c015d72b70344e624e46915ed5f96460aa25083a8871c0d6bdbc96192dee43502a6e544eade978a260d317db8fa5e3c413284cf72a9c6c2cdcce0";
   };
   minidocument = {
     revision = 43752;
@@ -34541,13 +34685,13 @@
     sha512.run = "0b8058805fdabaa16271294403ee521d14e59b092b399cfe9ef09ca69828e295c7df3253cab84b485cd1e5c1d8e51b7681b05b1d11dc58d6033dc534fba19e07";
   };
   minim-pdf = {
-    revision = 74207;
+    revision = 77677;
     shortdesc = "Low-level PDF integration for LuaTeX";
     stripPrefix = 0;
-    sha512.doc = "b2e2320929d1115ffcb01dbd9bb140f20997924b181396150ce45cc69cf8c932b7624bb9a5dc3c26b1618549f95ea5d5a2c9be730741be144947cdb76e7c4108";
+    sha512.doc = "878bb51fff59f0793e911e34ceee39b92a54db0b2f65304c14a26329152995d84e28388a613318602c9443033a95a6e7cf2ea02c0dbed588861da70e5b78e31c";
     license = [ "eupl12" ];
     version = "2025-1.7";
-    sha512.run = "2d109cfde75ad542c053b6ae583f153faa02218ae4c9af0b0c16b729f916379bd85a28417869baf8c21b4c9b7f83f0217bc84641472a06cc29f1ff9ef56d041a";
+    sha512.run = "5e9fae94f25bdafe2d99b8da53dcf12875bdc32c23c9fac260ed343627797d4f0a7a50b0a8b5d6c34599c4ca32a0048b6e19b8b2c93b87cd3532687ee2fd144b";
   };
   minim-xmp = {
     revision = 73816;
@@ -34559,15 +34703,15 @@
     sha512.run = "811a473fcf2f206ed68ca0ac603706a7f73199a8de97e7678334dc262977d75b8af9c720984570e865cd523665e74556cffb765744ec5721b46abaf104898686";
   };
   minimalist = {
-    revision = 76924;
+    revision = 78012;
     shortdesc = "Write your articles or books in a simple and clear way";
     stripPrefix = 0;
     deps = [
       "projlib"
     ];
-    sha512.doc = "fd91713a76baca0231f87004b5ef170111efe0763c96fc193ca2c1644cf8622eb0a8812e687061b60742f86b249454b3080b2a106f3b91367dd605e7139cdfdf";
+    sha512.doc = "fdaeb1cc647b3d688a9b81a72f854b9b841d7f584314de12f3a00462684a4ab2759a95c8715f59352eaf2d4d2e868fab6e208b2dfcc2ea7b62fab1d42dadac73";
     license = [ "lppl13c" ];
-    sha512.run = "ed6b9d60b21bcf333201c612cd86fbcfe8035e69421f9961e8d5ee6883dbc29e19947db2240837d1c2473763634d28b839b56d5af9127b9c683bf96e484b97f6";
+    sha512.run = "f5c841768e4dbbf72ff3451852dbb37d6e20b2e48a481a41dea7f91f4bed2873ef6a5ceae98ef5616edb47349c184a98a8c5e8755867f0e0f92540b218e20103";
   };
   minipage-marginpar = {
     revision = 15878;
@@ -34588,13 +34732,13 @@
     sha512.run = "2c5d08c2476871dd182bb320c50ec96f202ef65a417e65d1de8aec391fb60dc66c1e9e4642ad2207f7f4bfdd12e83bfe2cf75e9fa4f0fff0f4ee72769f7ca84f";
   };
   minitoc = {
-    revision = 61719;
+    revision = 77677;
     shortdesc = "Produce a table of contents for each chapter, part or section";
     stripPrefix = 0;
-    sha512.doc = "15955f17dfe2916081156e1464299b598f1bba780518516f6bee7da55cd1c45e2fc90c27402ba9d8ab4a994ba5ea1675ca9593699792a08407cda5b3a2230908";
+    sha512.doc = "57cfb13a8bf8042536b4b23b98d114cd002393150400497ab30a81d20228049666066d98920022cf4c435c7e186195792cbf97616b3417c391fba51885455b61";
     license = [ "lppl13c" ];
     version = "62";
-    sha512.run = "e2d2503ac4888198c56e9007b20f489a04e31fcd29c946c5504b7d193506fb58e2577c6085be5d9d17c6f5b21ff77208810385c73688468f3988f0b651fb81a4";
+    sha512.run = "b4705180f46079b6ca5282659b85919b53be307ea06f6d99377049607415a904debb94e0047702a097ef36f97b66e65cdcaa065e4a3ce882e15e840b8835b1c4";
   };
   minorrevision = {
     revision = 32165;
@@ -34606,7 +34750,7 @@
     sha512.run = "d76224254aa18dd80f9bab56f055fde5bb7ee6b5c3dd88e6ce19667c939fb2dbd1e5cb987522a3f1c50082f46ee20cf918f1e01fb00f588ce11d30d300fcf574";
   };
   minted = {
-    revision = 75223;
+    revision = 77677;
     shortdesc = "Highlighted source code for LaTeX";
     deps = [
       "catchfile"
@@ -34621,9 +34765,9 @@
       "tools"
       "xcolor"
     ];
-    sha512.doc = "f3f9e4f74624646ab6a65ee9b48b8e9ad5e41e94c1301afdefa29d297cf758efc960cb1de2f0794d7367eb8a48f37e59bc1c4dc56ff0ae2a123f73369e2aeba9";
+    sha512.doc = "7e00fd8fe98341a45364f720f956d932ae7da41a77fb71e441bbf60fdf357309fd3e5fb3d1756304ffd79d9b7e5086575a79c2e0614792af0a41f8d97aed4c8b";
     hasManpages = true;
-    sha512.source = "99ba48c573a69587f665f193dd6bb7e553a0a9dee62f55e0362b28657c0e7f6ee098c77c3cb329086cb8b1ad674c2f419fb68efb7f77ce5d683d2567346682f8";
+    sha512.source = "976ac974a3cd0d5709480642605d996270fd904e52f4f0a17de14f7379682e286ad73624456283146558100cc80795ed6d5c80c6bd8346e6cd3f1c71293893c3";
     scriptExts = [
       "py"
     ];
@@ -34633,7 +34777,7 @@
       "bsd3"
     ];
     version = "3.7.0";
-    sha512.run = "e57998ad8e22caee3cb7ce394754681eeb9b7ae641b670267f24a91a5c00e437ba205ed1fdb4c838458510bb455f2dae41da46643e1ddf610a42b9724ba2beb4";
+    sha512.run = "0b0bc3c2c414b5c6f1c466e1f7c0e16a901745ef53bac1dc600b8a29561031b03e23d120af4770766a085d34fe515cae588044aa48937503ee259fd9e64c02fb";
   };
   minted-code = {
     revision = 76529;
@@ -34648,18 +34792,18 @@
     "latexminted"
   ];
   mintspirit = {
-    revision = 64461;
+    revision = 77677;
     shortdesc = "LaTeX support for MintSpirit font families";
     stripPrefix = 0;
     fontMaps = [
       "Map mintspirit.map"
     ];
-    sha512.doc = "8a7855b5cd117a5a11eda118b8a4b08eff4183a427655c501c5e3c40e1e9617397d58e6622058187a48d04948fad9164b866e58c76080404d7bdf4ff9fbc4d9b";
+    sha512.doc = "75177f82794cfa1d676e53a3bd19ace21bdbdad8ec5ece82d24454d763816dbc878fa28ebf84c02caa18253276a73ea4f71cf604134e4cb6aa859193c939e48d";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "18167b9d0b5c167e2679cfb135812e3cbc20a90a182acb3eef15a54f4029298ebb39f6db626b5cbd8368389c9f0656f7575eb4f1970fd242d77d976762ca8d5b";
+    sha512.run = "d6a9ad9adcc83814e7fde9c1a47eb0e0e30695b10008e2bedb9e957aa6925c0b97cd90f46a2f9d08637e4f3021fa841bdded87cd66168902f34128a41e8311ce";
   };
   minutes = {
     revision = 42186;
@@ -34694,13 +34838,13 @@
     sha512.run = "552f53302060b3f4c764a669feea4fe1dbadfa3abf53c226f9fde2d0e876bc8992ff2dbd4be6cd3e261ab0e01ed4d1ad2b5a38c2cfb780c4fc099a79ae52b46f";
   };
   mitthesis = {
-    revision = 77563;
+    revision = 77677;
     shortdesc = "A LaTeX template for an MIT thesis";
     stripPrefix = 0;
-    sha512.doc = "f3df52c502a8aca301e31434db483f0765487431ebb3f1cc5f35d28af0e0a26cf060b7a3159ab45887fc1cf635edde949e3aba60619f38e1c638ceff3dc35004";
+    sha512.doc = "05a03f3f5a36c2d33e0cf197259f3de3a9c66f606df1dcbbef19bbdb433b4032508d90689e2f4a7711e2650fe4ec6cfc3ec6a2e748fd533c1e36abef9fca973b";
     license = [ "mit" ];
     version = "1.22";
-    sha512.run = "2214b74adfaa507d5d0f5a1f75dc2d80e0b60fd90362eb31a8660616fc7838901e206eeeb36f779a5e15984687d9995f41d310f3c904e37e7b09adede8818670";
+    sha512.run = "d66a254e9dd5156dfbc60012c8ec9171d56a23c7cd05b993068bea5e0c892c8280d969946e407aaedf0ba8ad5c7023cba437bf08be7d8cb5da6d4b5cc9bb10b1";
   };
   mkgrkindex = {
     revision = 26313;
@@ -34776,36 +34920,36 @@
     sha512.run = "67e9de777a464cf7ecdff6c821ff31d73f31f5f69cc5e6800d740ed6df296b5fc3a584b34e60be025f91b96a609e392198b67d386b60fd24deefb11746ecd439";
   };
   mleftright = {
-    revision = 53021;
+    revision = 77677;
     shortdesc = "Variants of delimiters that act as maths open/close";
     stripPrefix = 0;
-    sha512.doc = "193d3fa473d136c11ad8a1b4f707d286cb0243bd32c020c1c5343c23a5d6347c2ba2ccc5c11e5bf835b4666c8e4a0ca2d234661e155c0f5fdc32e7b85cf2d253";
-    sha512.source = "365cdce5350ecad7f1ea2fe478ac4c7414c9e8c5053c480229cfed7a478f135cb033e67070f327956cb5aadf862762e270726bbeaf8e511b10fc96e996e06d64";
+    sha512.doc = "614d5ec57c4f99373b41ab3acee540d7631dca73c5ccdf55d1b5ca307dcbbb89ad23ccb5c43f3ae1b24a6d34cf276d96dc1e452524f20ef1c3fc959978ae1217";
+    sha512.source = "36e70d5218252844541dd8ca2ded11ca3fe0238d812e90f5daff5c75f22a595091f5440664933857aaf15b70a1c4d9e6a319cd1c3c0768d29aa8e1d162847189";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "d1423d7e794ff011e6bf436d85bc3d2d933263bee059cac910e1a3375140d0eb0f1682e38c675afe17607d71d253b656a81cc927d22f54a8add2df01571a5e95";
+    sha512.run = "ca44f7d84a4f341fb46023aa5bd8f667417714d316f5616b27963edbe95f20b3cd88120eb8c4029e40d5e1581777def256baee034e3cfaa2365a0c3dc77054f8";
   };
   mlist = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Logical markup for lists";
     stripPrefix = 0;
-    sha512.doc = "771f51f52e47aceb7da064a0bf8ba4b19f0255fbd14d3b6d301457ad0dea80836f3e4c449611f5574c12e87185ab5ac9668404c5f1f97100971293425c7ecd13";
-    sha512.source = "6112422b62304d0dafb8e4fa43239dd0899327dc952db6d1179af684049b46482a30675b8c44be534213d9b2fd9ff6bab267997bb0b08102e35e1ebdeca9956b";
+    sha512.doc = "ae630411e20e0a00f7476905a14473db749ead452e84271154fc0f26f9bd5cba497e826798b0a405629bf9bd3d52cb5d178a0acd11851852153d722f0e9fe80e";
+    sha512.source = "3851c22a30a2d607b987250bab0d8a15e11a34431d53f1968d9ff54c98664905a642810532dc1cad7ad861fe318499cdfa3595832b37c134401af9bc15fe118d";
     license = [ "lppl13c" ];
     version = "0.6a";
-    sha512.run = "23466ef3b73d8476c69632fe0c701f3ec675250b534fb4451cb0dcaf93c30a649ca07bb58cfbac89054cc31cc1219daaa1e7f746e6689927573175d42f78bfc0";
+    sha512.run = "9201db3f3e255f663106c4521caff2931ca2567684ce5693e28a86da8752acd101cb58fa40097ce82a2fbc366d8a0ae2cfdf7ef3f50a5323a96cb8017b6c58ad";
   };
   mlmodern = {
-    revision = 57458;
+    revision = 77677;
     shortdesc = "A blacker Type 1 version of Computer Modern, with multilingual support";
     stripPrefix = 0;
     fontMaps = [
       "Map mlm.map"
     ];
-    sha512.doc = "bd5ac414d3b3ff53b059543d25cf0296d59365dc219748d849f89a085225d864361923b4220a0a989585d99e9dc221f9a4209b622be5f279e0f02e5e1cc2d966";
+    sha512.doc = "91296f5449edd3b44b09e8851f4af2d10cec39d2af9e928d809f4c643f9138d76861894bb6ecaac6785ed0d52a5e89d312178757942f487542c9ff642954b959";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "6fe8c67f768cde92e38741885c336786f65f9793fce0027b0476a8e45366e33c4a559c3bb6367014646e89f0ac39bd92219bc59921c3b3e0fa3a9c4314f2a632";
+    sha512.run = "9dc7af4457fd21d95192fcfcfca83c855e1c46c02eca4b245c0479b6f032d5eb9a0982d4b3983c97d42ac0d62ab9f33768dde30436eda3a9faf4908fcb89c487";
   };
   mltex = {
     revision = 71363;
@@ -34882,13 +35026,13 @@
     sha512.run = "9af80a432fdcafefdabe9697cdfc16dcdee9f6a15d85d3e15774860e94bd579ad523c370b289e823f82372dfaead086ae0ed175fcdc51cafa53bd98076a8664c";
   };
   mmap = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Include CMap resources in PDF files from pdfTeX";
     stripPrefix = 0;
-    sha512.doc = "95a71c9a9b9cd46c1723c986ba41c29a7204fada2cd7bdd14ebfe5e0c4e1b06106f9c13469edd9caf0b94615bfbea9cc8a1f56a4f83cec37de481b39d2b4bd91";
+    sha512.doc = "9d10f0fa376d635ad1f57578f6cca97e6fa6586025dac088346cc840af9a16ee1fe55762a73bc2f9b4270ede9a192e8d2304a8574f6b8711d29e19447ce0adf4";
     license = [ "lppl13c" ];
     version = "1.03";
-    sha512.run = "a2427b9863ef37385507783dba7bdfd65bf022d1c7322e7560b78222c3d4e0ddfccfc70aa927196e64ca1a520e985eea8cb78a4129a39e73a8410bc210b801bb";
+    sha512.run = "ed50de59d53be6f6f0f54fa7f098fdfce09c300c72cf43b86854c161c6a4349aa4c7ae9de2e50e0dcdf935cb3cacb484b375f97341a0b3d50f986ce139e393c8";
   };
   mnhyphn = {
     revision = 69727;
@@ -34985,13 +35129,13 @@
     sha512.run = "d631f058a0a17a841d4026c43fd086cbefd50d0ece85563ee81e34440650bdd7d3db6dd6f49d5e74278872961300bbd443b896586f5c7ea00a9ff816ef20b7a9";
   };
   modernruler = {
-    revision = 77481;
+    revision = 77700;
     shortdesc = "Flexible ruler and annotation commands with key-value support and vertical writing compatibility";
     stripPrefix = 0;
-    sha512.doc = "041a2b887960ed06592b6b5f3e7c902188b3aaac4eb3cd8b20ed0fea68e6c2eac6529e8ef8eefb25c869abca6d0ffa01564819f6e29ca0183387de5bb903ddf9";
+    sha512.doc = "e6aa3c75fd10b61e8d100faae76e0b0b0940afbc88ebd7581ae4093ef1151c8bfd6183e7830035ef15ab6e55ba204538f6798ecee39a8ccd39636a3009c4785c";
     license = [ "mit" ];
-    version = "1.3.1";
-    sha512.run = "0c2dac809fbd0b7d6b61ef0351be3336ffe480e7bf54261680c6df5f0e9c0430937655109e5214b8034db9fcc696c18eab0199420b24a1b1930126bb7024c060";
+    version = "2.1.6";
+    sha512.run = "d4b46a4e94113ad417ec4b920ac157bcbb52aed0f7b4083dba318edfaf15bcd52e94b6e2a89a78d63ffbab3c92eb4058f62483970886785a9fa1863da3b840a3";
   };
   moderntimeline = {
     revision = 55518;
@@ -35069,26 +35213,26 @@
     sha512.run = "ff51838f4e16b1082ed5488b56136a9998fd448e0c727da6d91baa91e318a144ffbe6c96a249d1372994a0b5556ba776af048d6c0f14561e171e0a51f0ac471b";
   };
   moloch = {
-    revision = 77137;
+    revision = 77922;
     shortdesc = "Beamer theme based on Metropolis";
     stripPrefix = 0;
-    sha512.doc = "f6859cae3f5cd030d63dd11f7c6f78dd34c3ba9f2e6e8925de8665ffa783dcfd98f43d1b16183811fdd51b469e6f18e968642b3d888dffb06008a27ee226de4d";
-    sha512.source = "f52d15bdb0a47c06a1ad0e4651b956bb969fafeec21355058cc8e24155ac5fa97295e1d242e51bd8ca97d66012c6d4cb2f9a39a86af480a61c29b7695a1c2568";
+    sha512.doc = "4655c077c0c23775fb13c59275c8a0fca5c07fdb42c94da471a42037f0e0831a47030bfd74baa4c8b5a19fc6171796fd2a9e5c6f1ff10284a22d0a70d6bc0e96";
+    sha512.source = "869e0d300e24d9ab473c27ac2a80c6edb15a42bf66aa5dfef8eca6069d58baf7bb82cfb7d9ee1d09e671a508af40b09f7b82818c6cd212f124fefdc1c6b1d203";
     license = [ "cc-by-sa-40" ];
-    version = "2.1.0";
-    sha512.run = "4e2a79241e933798c0336484f1a021759a973cdbcafabeedf606cfc6d37f24622b0383a29bfbc2ab62d8d2137512f7b960438ad384b6090d03fad67a26c55bf5";
+    version = "2.2.0";
+    sha512.run = "c234d8551d3d4dda065c87543e25cdba9c4f3dadff0317a67d97f552fd29630bbe53a576271f1cb5a3bf1427a071843e312a6ad049dc830c01a3cd5c4e53bf5e";
   };
   monaspace-otf = {
-    revision = 77006;
+    revision = 77677;
     shortdesc = "OpenType MonaSpace fonts with fontspec support";
     stripPrefix = 0;
-    sha512.doc = "2793c5ee4038a8a14074a7ee7a9deb094ee99198ba6cf67b9aa9aa7c706e2bd9fe79ec5d9b4c61db7ec23aa5e30771e1113bc1651ac04ce13e0fb0ae6bb7fc63";
+    sha512.doc = "2e0425d0b97d3be3c2c781e6bc38cd7f2b11c7eb7113884d8e0cde5662f2ea256f873c440b975101878ddc13f63f40ca4b7ca188cd7ecde52fbf1a12d4990edb";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "0.1";
-    sha512.run = "44ee6bc62c1faac43171cab842072a6505357e2e83ab2eede4ce55afb9a07bc11f31ac65e3a8df29eb99634564455d5861ce5a6098a85d872e13df6e8a52b392";
+    sha512.run = "9b007c0301aeb04df598f2b70ced4de88bbb4165810882babd086fe42db902dea9909fb1738c5e29992dfc78d3be1e88b8f3d89aefe57694340a454819237af6";
   };
   mongolian-babel = {
     revision = 15878;
@@ -35126,19 +35270,19 @@
     sha512.run = "9676cef9e0fbe7a0196b1ea0fb3ea4f0399a3ee8ed76ef06e824848a57922dc4f7cc1f50a1fcea47fc265465407653447ab80e80dbac3c4bc00488d0929f87bc";
   };
   montserrat = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "Montserrat sans serif, otf and pfb, with LaTeX support files";
     stripPrefix = 0;
     fontMaps = [
       "Map Montserrat.map"
     ];
-    sha512.doc = "694ee7f51b0fe1622981bfa636263bbe18f89ec481071af587a683648f4ee900d9100864e51669d65b9952e6acf64794b5610989d2bd86f6e4701e1e41193242";
+    sha512.doc = "887d1fa0614d3654ed70248e24b39ed84018c403edb893e8225261550cfcb43058d14a7e8a8c616d9fb4942872bc398215890334ea92154c14cca56580148abc";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.03";
-    sha512.run = "58c8b4a1f6eceb10c7fef8e6dd951985ae6108cb3f93eedf20949923237cb8af6a834674dcea48b1c68b51284ef37fe2d4120d52fee82753fd873f60b585e685";
+    sha512.run = "047b18cb825b0675135ca5554bc46102c9614392d3f7a4af4b260e05d627894e8f624a2bb12056ed94431342411545c66ca4649a526095e23a19bd09f7dbb6e9";
   };
   moodle = {
     revision = 65672;
@@ -35151,23 +35295,23 @@
     sha512.run = "0a297097f864ed3dc8c9d263a6a3aa8930732679a585aa34e2e5b31852bdfc3cff40118d3b67566816dfeda0f74282a476ad8b5ad793d2c433cf44f41f7c91bf";
   };
   moreenum = {
-    revision = 24479;
+    revision = 77677;
     shortdesc = "More enumeration options";
     stripPrefix = 0;
-    sha512.doc = "987a1dd96669b9202846fc604fbcfb935b68c79d13bbe4599f32fab9e869ca5b60f3b4bdfcf78d3b3f5102db9ab16955ec13958c4cf3df7ec64649268c226d1c";
+    sha512.doc = "eb952f2ddec4ab87f443e331e6ae95d36649f9bc2e37d5be25bbfb9610792aa53434deecf13031f987d2a2cffda0c8b13b18a19140c37ccd06d9b388c235856d";
     license = [ "lppl13c" ];
     version = "1.03";
-    sha512.run = "069ef44faaa8847a07ad00dae31c1b63278d59a560ed90823100cd601850a798f574d8210c07854a8b1a90165efb3bba852e100e53aee496f78395e3d6defade";
+    sha512.run = "cfef15ad6621b9c3f96bc1bb16ce6c21322a1d0ec06805ad3c48c47e16802ab3e85a3d2651396fa6e377e9f2bf7b2ef0523c43b5611ba74cbab1ab9de14863f0";
   };
   morefloats = {
-    revision = 73637;
+    revision = 77677;
     shortdesc = "Increase the number of simultaneous LaTeX floats";
     stripPrefix = 0;
-    sha512.doc = "f31b88209d9c816c37dbb3f8f0f09ffc4c400e549309cfcbf56c84421fa34e4a5a582cbb500a76cd00628b3713a980f2962391d53038500e60cb2bda08750bbe";
-    sha512.source = "4c7739f39b933b0c301c2bce9651d0415e7cb4b8c4b4805fece9edb777893e82b3c69844fd9b59249508dc3e26444f56bb0b22862d5f99419758e4608059ad64";
+    sha512.doc = "5fc80928599aa27da63a0bc21bad85ad25e4928795b1ebda6ba8dd175009302d8b138bc7bc8ca7739b500bcb32b7f8bb0dc8a943e55aafabb9f196db9c6d8977";
+    sha512.source = "d9bd81e5be762827338c718ed94b31e13a6bd4182bec9457e3e7fbfd58bca9ca644fbf1546f76cfdd249e30d4db0b8328cea1884b0611bb6e87e0f79f25ddeee";
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "9ea43da0116605b850c57da9758c1b664c65e9e0a101d4e5265596677f857181759b355aa1fdbd326a1ab7fa9ff3644e4c90811872268f3d7ed9765d59bdf85e";
+    sha512.run = "a4c47a269533fb9db3ffe28dac2d26ee037c57f57a0aefed98a94dab99947cbeebb487613d89d8344d8cfcfe0f45c4f1f2acf5f96deb20e980cc543911c08222";
   };
   morehype = {
     revision = 38815;
@@ -35190,45 +35334,45 @@
     sha512.run = "31163e7d7a5d5d4bcb25caa1efbba920939509cf557b4b60ed44b6e2aad230682623eebffa16be2c5772db6a73faf101e2344ccbcf2f7c99e31e1f64e7fde999";
   };
   moresize = {
-    revision = 17513;
+    revision = 78116;
     shortdesc = "Allows font sizes up to 35.83pt";
     stripPrefix = 0;
-    sha512.doc = "3c1ed984163e2adbdaa7e94439e160327515f1c6999e40114819d8e5250e090c932909217d37d1d07fcb108c56ec50f294324c32523995f68f57fd918983a412";
-    sha512.source = "701a2ba72c22bed8397350f92023b0b1d1587b837c4fd247dabe5860cc32e58499e8803a0286aa9f9e3831faff8b9ce0e74ac1a0f82d798a2f7f461b015b5809";
+    sha512.doc = "18a28aa7494cef9a55692ed2b213baa845073d06a1e80f0db492d490199bb2f0a6c278ad6c445d03ba857656a7bd85ee30eb68add690683c9e053820c73f5727";
+    sha512.source = "a8f814b4870a348c6e34c19476fc85f4ce1fedf3299d12f6cb82eba0869ee8dcaefbfa45380acbf3a96675313a2825d8471fed9ac004467b40214b2797d33b01";
     license = [ "lppl13c" ];
     version = "1.9";
-    sha512.run = "92f67234dd9c0429798f9e8001a2d4b7004e11f2fa90130b738670e6228f45ebca3ba26ed98616e3af5c86148992f9915e3e6a1cfeb4c875fbd20fd818743525";
+    sha512.run = "d20b7c26b2f80963791d17555283f179941637520310b7118ee6cb4adb5ccea725928eb35db3c40358e93a3f99285a4204018cde579644846c681b3633b01872";
   };
   moreverb = {
-    revision = 22126;
+    revision = 77677;
     shortdesc = "Extended verbatim";
     stripPrefix = 0;
-    sha512.doc = "27e4f361f5d7193c97629debec048168045bc38e353f677829677cb5ce5c0a9ad8f5b2576bd9f870da8dfbf16d745e489ba79e3dfe6aa1da8a9cab1ad72ace06";
-    sha512.source = "55ec67b5b9616459a776b0ca386be19cb6ae57fa2a7bde1f6a1896233f4f303277474d629c884e40bcd8d076522ab4e41fbe8850304dbd33469a1f21750c81ef";
+    sha512.doc = "f63f77a0124b6ffe61562bdde3313fbe3cc52069f0dc5eec6d886673b672c9e9b73375969ac26b1f3e4a3f3a4813cf00aafcbd7d908ade7c3b716d8097f014f4";
+    sha512.source = "cdec39aa249a4331a055792d063e83dd4ac6297f436d0d9d5a9d55345bc8d361d9494291ae61f8d986ee870d4f2cce5c7cb0006ecadfc4738f8b57abfecc88c6";
     license = [ "lppl13c" ];
     version = "2.3a";
-    sha512.run = "673b7ab5951e418fe10622fb1a4b4a420c4c436684afbb1474c58b7aa7b235f7063555a220133257b351b5847be5e880714e44ca49bd9198a4306c0e821dcdde";
+    sha512.run = "9dea36736d93b954d0a9aac13d522a157dd4d2ea82b7872f5bef5c2fcf6cc1bfa65bb856926eff276434f4dd047cf3a741617ce5d4233692efc58a7fcde9f44c";
   };
   morewrites = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Always room for a new write stream";
     stripPrefix = 0;
-    sha512.doc = "5941ba7f9d861fa70a146fd53c41254df66cdd856eea915814b35f995c65b8697c00aac0f12e33749ec136afe27165d7127312a0ce66f3007a08b44dc98c5e34";
-    sha512.source = "8689867e9e3b6f6deb812fad767e346ae64099733c970aef90c824564ddbada0bed6ff304b7f24f03438c8c18dccbbdb4ad3b2a736f544b10d8cf86929692d9d";
+    sha512.doc = "f14ccec723705d2e0aac40c03d9d3572149804e091f8c227d6745f662df99415298c7bfeb6595b1bc09296087ee6e22c2374b6ff553c098544ec88835dff5b5c";
+    sha512.source = "341ca6615513bd174754d5925930720cfa838c28eb6831030697fd7f1cfaa2886f2db20fde4e93fb7886f82ff8259f75774de1a421d6bf60839c5ab95955694f";
     license = [ "lppl13c" ];
-    sha512.run = "f7e1a5fe9226789e4f2e568e3422b9e5fc0921bf7c864dd3f23f40b02e853bc01c9c89b90c321ed8d296a01a71c74a510f854e6aa241e9c31ff5048937ec1d7d";
+    sha512.run = "ea9f854f5832bb9517ebc915225b989f8a6a8e07fb8203d786c241242026d47f99d2686f7367fd49e520d90a98658a8b5f3027021bca78495b8f572eee502307";
   };
   morisawa = {
-    revision = 46946;
+    revision = 77677;
     shortdesc = "Enables selection of 5 standard Japanese fonts for pLaTeX + dvips";
     stripPrefix = 0;
     fontMaps = [
       "KanjiMap morisawa5.map"
     ];
-    sha512.doc = "7af68b3a8233cec22efb49e8131c65e33db4076ed4f254f2d62f629c03d0122e8dddc3ba68d283affb5ca663d3b1f744780dc98c14eadfa1a69028df281e5bb2";
-    sha512.source = "7e3821bc1f5dad076307ebf00cacb68cdeb9e18a060c9c024c0fea85c558f7373f214f16952fa643f8b832376101ec8c8bb839a902e6e8213912a4cbc10862ad";
+    sha512.doc = "5b848c8b49b7ae41970e35f7cd452e111a8d148c2b236905c7a589a1c13c10eb2a39eba08fb8678d5f45b3a6a714baec28d7a5199ac9dd7c5092c32771466b6f";
+    sha512.source = "92cbe51360be3553f9aaf625205fbb4ef389932c73093c7d4beae947fd4e3bdf056b5b1a076e29e91a79e42b122c1dc0733cad81da135ad39d059d1642eb0b8f";
     license = [ "bsd3" ];
-    sha512.run = "7f149fab67905d6b21670becb1c3e3afbc8fb4c45fa3c376960e5a87d7fe17abe091af63930a8385b5bcb63e550fc0b9bb16d522f50f90b911b09599dc5ccafa";
+    sha512.run = "3941abaa6961bd4682885a1731e8e266afe57ecf8a23ce712cc0302ab5c7ccac0feb6e049219cb41b2efab2a8ea3286c31d72dae650545b052bb9f5ed3ba2f5d";
   };
   movement-arrows = {
     revision = 67270;
@@ -35275,14 +35419,14 @@
     sha512.run = "e5899aace25cef3a690150cf09e76bddc008f426800588ef7d21361229b0040dff74af7b43d563b05d8c3d16166e34b5a21e8e25ae3e97ca80e5ffe5c4925392";
   };
   mparhack = {
-    revision = 59066;
+    revision = 77677;
     shortdesc = "Work around a LaTeX bug in marginpars";
     stripPrefix = 0;
-    sha512.doc = "fc4cff80bbf20460e28f8d5a142e8994cea7e017391b147a47332b444fad0ff8cde1e7bb29159e39f8c14f4c9881ab91dcc0e2f108cca1534d4335f5b6b32a1a";
-    sha512.source = "1eda2d1f370141d0a5b0bc15f68dd40b9dd72017e8cfc75c71b19e2fa2ccfef7b1652d5c035c8ab6120e12089bf469b6e6edadd7997329da6409e6248bccc5a2";
+    sha512.doc = "247677943326429930c6faf749bb15c08cc5b036d586a2489dace13d6f9302afb48c6770bb6f707b8c67d64cf657af8d7ad63bcb43b9cba18ff0c9fbcb08058c";
+    sha512.source = "cb974276e8a21b8d6512714c056fa6698bee1ef726e161a8e556fe18a3d748f512f82322236828caf7133997286f627dd9eaf4b0c95587b3e4e59e2049f3e71f";
     license = [ "gpl2Plus" ];
     version = "1.5";
-    sha512.run = "9a4e5a08320095095538eea8c5c5db5dc6d6c99ca3e3a3f5568228b8b52a4b1de98c1118b09626b58ef897f6810d2b43d2b5b416b3687e1bfd3a01506460bce5";
+    sha512.run = "da45078bbe629893088945bafb7fadbd0f177efa5a098669ec367648b58b19eb0c2744ef53c389c5aa3ad25b6cd15b5c9ec02f5ada1ca56ae71a91918fb608e5";
   };
   mparrows = {
     revision = 39729;
@@ -35302,16 +35446,16 @@
     sha512.run = "1efc3f1f1c93456a3038ae5037ad5dcc4b177c57852f7db475a7ce6d2002559b370ba22dcc6d312c68ba75c03523cdf0df8546fff8dab032832d3ff3148b5d65";
   };
   mpchess = {
-    revision = 73149;
+    revision = 78116;
     shortdesc = "Drawing chess boards and positions with MetaPost";
     stripPrefix = 0;
-    sha512.doc = "35fddb3f0336b3cb3d858c78b00bb1e604b79cffe6668a6eb327bee771955618b917d83cb866810c45573068a6a6b8adedaa4d1b8e023372d6e87ef4244bd2e2";
+    sha512.doc = "cae0a66e22c35d1773732ff2f84fa2f7ee7414e0f6d9696fad7b25e10c85251c589a2c61373051dc76ac7b14ddd349883db2dc848ecd908e68ce32bce8fcdfaa";
     license = [
       "lppl13c"
       "gpl2Plus"
     ];
     version = "0.9";
-    sha512.run = "ca2d0551f1bc1d8c8a4e6e93e699742b63e048dc92cabebe24c64efb495a2a8d2a9eed73324d92d8d2e6cc4b807ff99115bf909f4943cd3c575d3b64bc2b3356";
+    sha512.run = "b06d6ddab87afd064d2d785a224d06d67be8a3efe065da7239e8fc13a4e9d1ff9e7bdaf2c3644763ed0d5d8494805271a4d2d6044794f3b52d12ce1afbf9712d";
   };
   mpcolornames = {
     revision = 23252;
@@ -35375,7 +35519,7 @@
     sha512.run = "c655a3cd9759e3f221d1a9d753bcc1778e3f405430d2498d98d4d9f44312abb038ac870e0332f8e0271c493a680e17ddce48fdf05cea6ef4c6df52662e83d8dc";
   };
   mptopdf = {
-    revision = 77320;
+    revision = 78011;
     shortdesc = "mpost to PDF, native MetaPost graphics inclusion";
     deps = [
       "pdftex"
@@ -35389,10 +35533,10 @@
         fmttriggers = [ "plain" ];
       }
     ];
-    sha512.doc = "2e6356c16ac5f79e7502eba8e91e0e95048b5688998d3de450023ceb3eb81fc1ab4e426e2fed7d944ce996dfb0daad79b7297005dcef87848bb103131ef7c1ee";
+    sha512.doc = "f036a4a53661c7da0e863b0ede86e817a9702ab3e002cfaf52c3df212a9a30a3084fcdb327da6826b75b3f46149d5ed6c300d8e7bf42ff7370aedc2ec4365374";
     hasManpages = true;
     license = [ "gpl1Only" ];
-    sha512.run = "7c53c42c2315ccd6823ced7a6de9a2ba605217cafd0d2c326bb3cb79f4f821207d9af2ceb3991a357d89c4f29c7644b12f0d3bbb623d686902f38513924bf793";
+    sha512.run = "76e75d8658d6ffcb09148aff95f0469f94b65cb8452a497af5ceb86fda14499c6b4e5f0f4f8c81b6f384cb3541a105d73ef2e6ec201331718bf36947cd0e8e40";
   };
   mptopdf.binfiles = [
     "mptopdf"
@@ -35486,31 +35630,31 @@
     sha512.run = "5a955e229ffe00e276c4ee4590473ba9d137d668c63294735ecefb031f2a01b310723dd2a5cf37b4c9613793df39146d08c01e2109ca37fe1d9136903cd6aaa2";
   };
   multenum = {
-    revision = 21775;
+    revision = 77677;
     shortdesc = "Multi-column enumerated lists";
     stripPrefix = 0;
-    sha512.doc = "889ffbce149b1f0a98e22a1ebcafc60e29858d08b57e2e567956830c679515759a6c8209901641e3d77ded31238e8fe93f7e4cdff95d1be925e3972c9005f4a7";
+    sha512.doc = "4fc9a6731840cb99707f744cba76775cee4c91e39f0bcdac6701a425c8649babfce47f5a794afc8fd579f671d1eee92347df6bb74fa632dd9c8b2d23297fa387";
     license = [ "lppl1" ];
-    sha512.run = "e73e2d3fe45f562398de752520628032fea310e5345a247472a2807618b72467b245995f32f21474dcb5702106bf32d6394508a96c4aeae4dbeaf6fdda7bdf4e";
+    sha512.run = "55a90c95a022ecd5a95007a37a8a89bd2e12cdec04821e860aef385eea2560c8b512682eaa4b1e07509fda663d146ce858717fd334eadc4e1e2245cdf7e2c34d";
   };
   multi-sudoku = {
-    revision = 75941;
+    revision = 78116;
     shortdesc = "Create and customise Sudoku grids of various sizes";
     stripPrefix = 0;
-    sha512.doc = "023712b50a0b14f772efe1e0a99b1299570adf68536a678ca65c67e411dd8e6c57f3e0b0c8af19b7f6a47dd7ac7574fa2e595878a305e44c89b964983423bdf6";
+    sha512.doc = "08d86c8804b2f0a4c32ecc1b4dc4279a09d75f581f4a84ffd1c0c4d2ac95adc24201409249032b88bee30f3bef290328a422c2fe051f1315d8e1da3973389cec";
     license = [ "lppl13c" ];
     version = "1.00";
-    sha512.run = "0e911858260ce5a0d0248739844dd6f09c6f7a84dbae714ce1e068a0def3b2b3b592914ac32410ad491b954991f5d71e3b5b7d3b27fe19ff03ccd53574302cb0";
+    sha512.run = "ebcd82eecd6de447c022d24f836dfddd7bc146aaa9dcb6a377662a0f309211e3a3f7e63fb600c197737bfeee4dbcfd4d469d86be3b29d606e1da2129dca43192";
   };
   multiaudience = {
-    revision = 60688;
+    revision = 77677;
     shortdesc = "Several versions of output from the same source";
     stripPrefix = 0;
-    sha512.doc = "b6023873f5843ec7db13e551417ef4c31a2f622372f32b4ad7af1ab155e3902185b06d6f2fdd432bf582f3da8a5e32e985fde93ae88b7916062db25021a641a1";
-    sha512.source = "8d528b7e27f8883846386374cc936118a9537f0dfabc71c3b993f105dee381f0cd2b40e16d5c48df01b9709f902479ba87c6b94278f6e8be98beafbf9dd3e4ad";
+    sha512.doc = "548c0d3967f8ecfcd9d1822d302c557cc3d5b64f450567879c932dbd8266bdb27b63fcfd770dc445fea0a78122aa03f30774a65172904df00a2ee86e97dfac61";
+    sha512.source = "c08a09d9ccd018cbd9fed8cbb1c8918ff34e30fff3db91ae2fb6900387432b5f7de63235599d1e8998d39235b6110ba1f7e89f3f95eab8b9cee50bba31e5021c";
     license = [ "lppl13c" ];
     version = "1.04";
-    sha512.run = "a7d89874dbe314ab37cf42d8d520e234764bfc3fbbb6c89e47be95ef83bacd170c290bae005830286e206da25a68939ed8ee60cf11ad3f5ff9d994d568638b86";
+    sha512.run = "db96d37764aeff0dba2d8bac2b8b2299e99ffc08447ec81a2675a78545d22c43792aee0c8178da7a11893aa604dda57fcc2c1c34644ca1c1a487e89ee57d4abc";
   };
   multibbl = {
     revision = 15878;
@@ -35523,23 +35667,23 @@
     sha512.run = "419f7bcf8f2226cf8c60119e30da278bf6138f4e1903dc322da33ca2b22120e50b205dc0bb01b46cab0c93fdaacc37b823a812121a731fdea4cf03354d1b0690";
   };
   multibib = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Multiple bibliographies within one document";
     stripPrefix = 0;
-    sha512.doc = "1d4536094c09755fc91b2657cc0eb0b0b2fd8d1c5ca37bf2f046b62a4b0be6f83a93debac8be3c5481651dc75cac2066962556370bd84face6b03aaba24bbcc6";
-    sha512.source = "c7777e3c32833538893ae463d8396f894b390f642fa697b8ba237cd7183e2bc7cb86a9773530962f41372e4ec016eb96c7a060dc63081b2faf29248a65f14a1f";
+    sha512.doc = "c52817e2a9abd8beb02f8808e15a03c46bab6808d9fb63e01d93ef7a562bd30458dd950f0c087e816d379b6ef4a9fa35ea55973d8681592bdd0f6c7e8f81dbb3";
+    sha512.source = "0bfa2043ed0ce00f3af2b547feeaf8e7916e26ef04b2ed8c2a523204858ed2fdde1e70c206fd3c41bbc12c0cf92dd3735633af6ac5cfec23be9831a99ba78b77";
     license = [ "lppl13c" ];
     version = "1.4";
-    sha512.run = "82cd48cf9097b36664d4dcfb5d73dbd6e961c2f0a8bf7816d1bc59a33cb6d2c65e0f63a9d1d596dc9faa4339536746089e34bd1b510e1b2c0ea272df5840e396";
+    sha512.run = "351fe887124d5d9d6a1d9a725086c0827d0bc25bc39b3dc718457d8f6f62920fc37d7a1e0f6c23823276d18af29856c9017cec71921056e111fd183063b2da80";
   };
   multibibliography = {
-    revision = 30939;
+    revision = 77677;
     shortdesc = "Multiple versions of a bibliography, with different sort orders";
-    sha512.doc = "3e13c8c60ab8091a363b63a63259e53e3c5076feb224a6f426e55a351141f007ea8bf7526b0f80684c83e4e97b43f5f05217e254f978e8b69665c736efbe8512";
-    sha512.source = "544b3778bd0a51e99e89e18e606d37551576d655a01b46523786d6f910cf84b3886a8b29c72b9e0c25b3ae629045470b24e2741d7894f867437ca069cd692cb4";
+    sha512.doc = "0763751160570e25e04090555e70d9cf64cbeda17f9e2dbaf9e9e09407437e5aabefb10fca33d7c4f404395a51796ccdc836a06ed88b83fbb179d8309a2c48df";
+    sha512.source = "e31a77899fc22e8e8f019679defcd9232be8eecd364efcb5f1ec96bc242620fdaabddaa8c6c602e9f60b2f4054b5747c02f959cf9d8c684961d3eaea690d83b5";
     license = [ "lppl13c" ];
     version = "1.03";
-    sha512.run = "faa2e16b8bdb9309e2f16cdb2c717b59c8ecd5d73e4819d72ee3226a80fe0c0ff6b4d686d0f1d009601e0d6dea140cd4812c2f4cb94f37b5bd9cc1bd19137965";
+    sha512.run = "1d099cfd0dee2e46301955744dc1d40f0fbe2ebc8748326c959f662ae1e55ad49a0af21b6eaa1555a5082e790db517a15965176b64082b3411cf2519bf4bf3a5";
   };
   multibibliography.binfiles = [
     "multibibliography"
@@ -35554,14 +35698,14 @@
     sha512.run = "5e4a4eebd7560d4aebdaf7035b9bc14116a32cb2e043aa93afb9f95eaf271fdd75fe7d2b6296d36327d7aa5b14b52046b0c941ae949584ad27a2b89ebe54b6de";
   };
   multicolrule = {
-    revision = 76924;
+    revision = 78116;
     shortdesc = "Decorative rules between columns";
     stripPrefix = 0;
-    sha512.doc = "7db8aa784db2253fcd98700e758a903fe9a5a70c2b73e0976066c6f73a1171b92e03f5ffbfec0920b001d9b4fbbd3f9ba281aabadb49debea3a80257526e48b0";
-    sha512.source = "162c26408da53f196f3e222597002c5c23fd0379401ade4bb0850a9c3953359cb9a4f1b37ce7f4d3401a04380f93558083db09bd22a26ec69bfd005581010c08";
+    sha512.doc = "76fb57eb8949699e8b850f7a1eeb059b1fb228c2fe61149fc63c63aa01ca4588bab0fb7743b4620d461715fff7e0e69caa4942c7105bfe61b87699b28b77c4cb";
+    sha512.source = "0979e6694343971198971c6a28ccafd074b3453b295d86a5406859c27e0768e733bdebeb18541c1981ae163388cef3deb8d6d8bcd2929e396ab1443ffb4922fe";
     license = [ "lppl13c" ];
     version = "1.3a";
-    sha512.run = "1acfac91ec70afe1baada22a3f1e8cbf346efde91bf853c22742aad9d80eecc5b9c854076a40a355bb71790bf37367568b751f1db95e0ee120b8f50900334c64";
+    sha512.run = "5e18d3d4e317040d08cce0229d99110cad0df1aab9cbf2990ffaf3a639a8ba565ec8d46106677b8247469b4281d619f5436da6f90af2f49f099bb2f31aba3c7e";
   };
   multidef = {
     revision = 40637;
@@ -35574,14 +35718,14 @@
     sha512.run = "2d15975c8a191cc08925cc8cd74b982af909a7488a68e4b6f5eb4c2ba0dc94dbcb40c4347c5c4774fda24f98efff52131f6a243e1e6bdcb4dde7e683e408d6a9";
   };
   multido = {
-    revision = 18302;
+    revision = 77677;
     shortdesc = "A loop facility for Generic TeX";
     stripPrefix = 0;
-    sha512.doc = "8cef36438fbe57c54f625b178331f7a6ca19854abcddb475283fc0cb4a362764c443de05989245e962dba9e2e4f17734533502fbd4b2ef4fc8e8c36b96bc68ab";
-    sha512.source = "3f3f6f5813ab1da542ebc9c4837da72339804866875bf225292d8a36ebf54b33f12d3e84de9d0b5027d3e8889e10180649a19e25c7ec6bb532296e9e204e25e5";
+    sha512.doc = "65f973485c82aaf5c06b363ed754b36ddc0824e9d130eb11f5f12f966304397674d91a907c8852cd39d5e8bc51087c7f1db17026ce672c483151215592fe4d82";
+    sha512.source = "b3927a349ad68b01814247b744e63205e9ee88ba8020207b0e74ea504a37a2da18da6e5703a8202ff86c02ce878e85072d3d29b3ceb6b6f808e3e4688959969e";
     license = [ "lppl13c" ];
     version = "1.42";
-    sha512.run = "5c861bddcb8b2bdb654dc4438621834a68b2bca102799317c9a220f9bc9bc4c9d70775375302a85736f8706bb7fbfc1a4c24fae2f850237e8f54ad521b1cef83";
+    sha512.run = "ba0c5c573e6021097f61c0e495892e1b99c73f712c2f4f1b2018ef3ce8d658709a7f018639e0cf00d449e93f85b9ca9218aa4264410045ecc7f62e6105d443c2";
   };
   multienv = {
     revision = 64967;
@@ -35594,14 +35738,14 @@
     sha512.run = "04090331e44ac252dcc6929ec995cb0e6d38922729a6af99ba103a833d1ac93f7553d9314359cc5b1ad16d16757828e57059a6f1f8bf2892abc41b2d901fb15d";
   };
   multiexpand = {
-    revision = 45943;
+    revision = 77677;
     shortdesc = "Variations on the primitive command \\expandafter";
     stripPrefix = 0;
-    sha512.doc = "6b8a727aae2d314877df551ca5804e84be0bc530b4f09d8bfe6a9c1a4c1eb98647257beeb1813a183f0aa5422b0041443e817ce11b6db70e4129e3edc664e788";
-    sha512.source = "197ad74e02212405fee0c79ea03021172e7ac5a99222e0c0d300da6a141bc694a2957c544bd357fb67fcac24acbbb4059041bd37f607b29f5f763b59b70613f9";
+    sha512.doc = "ba90c1efd4fd655cc8622b951a00e6f7984480172232fb427ee747a80b2ba48ed67c22e5da11640650253c09aa1c2cade57b15b71c13e971f9892ccfdb69af34";
+    sha512.source = "64f55d95cf050052541c168182263cb9d1a7d8e5b0169ff602bb8b6fecd19359f095b868cbefc27f7dc156b4f588d378f0cfe911f3cddb3b6b802cd50521a117";
     license = [ "lppl13c" ];
     version = "1.5";
-    sha512.run = "63f512ca5b9649c86a6936cc2407737e41afd6c6a3b4810fe81155a5b4127aecc538303e26b91f53decee900fba7946e90a46a545b3c9caafb3e0863940e0009";
+    sha512.run = "68e72d5c5f06d7c631fe5416dddf520b33163f9a4394db088c9f7bb5eb589573caa3dfd5b1e5ade747d83df4670bf10d47da6c8fc0f470edc78a171393f8ae3e";
   };
   multifootnote = {
     revision = 70745;
@@ -35612,14 +35756,14 @@
     sha512.run = "a29a5f1688d7c8765e8e8460991c2f50e33319be110b59e12bd5678416c8ae594d75b0644ebb64868b3bea2fa1cf8ec6e9dd62a6514f4e86dc0625602be2e93a";
   };
   multilang = {
-    revision = 49065;
+    revision = 77677;
     shortdesc = "A LaTeX package for maintaining multiple translations of a document";
     stripPrefix = 0;
-    sha512.doc = "e611f2195fc4f7083d6343eb3554a2e786fd6522383456544e45346481cd57d54b0899cdc6ffd9edc4b75567b1e092ecc597bff660d849e0ce2b3e2d1bd55507";
-    sha512.source = "1e52e9c740d0eae4f89eb4a65e1d12b3d5f159cd6c938f729bdd019ccb8bcf98300a544fa7131fe214cde9b7b58f9b64a771a49513f45943c681893fbfc78b6e";
+    sha512.doc = "c70959d82b35b27d19f1ee92edeb774afe27836c29cb5755ce80e39294a65a293fd30d7443b894da71f43f6024c01292f5497ba1f2ddb94fd677666e637a3e16";
+    sha512.source = "5b5a2c8e27283d6194fbc0ca06bba242de50c18a69f8b184ec8342483f6ebf2073f0b68ec4d7c770967c4e98dfc10dd952c0cf096aab5248740e389dad0a2be4";
     license = [ "lppl12" ];
     version = "0.9b";
-    sha512.run = "57f9829b100068a84feb8a09a94066b93ec5fe70daf831ea99604089a4fc2f67af76f79505a2eab6dbc8f2b025feed6d908a1f24630e27e0f7606c4a3ebb71ca";
+    sha512.run = "a365f2225577be7e7c942ca53b31dff2597fce1e0f1dc211c5277c646885e34d6935299a5b959fd77ec3c30e931d1be6a0226774f0ce9e42845bcc4010ff43dd";
   };
   multinotes = {
     revision = 75610;
@@ -35651,24 +35795,24 @@
     sha512.run = "975e7ba809ff551faacfeb8c40f0965da34068b4d4d2d0d14d9334996a245682e74ee05a4ef99fab064263c14c0ee4e7fc50372184c2db7ea90572eb9f4beaeb";
   };
   multirow = {
-    revision = 72833;
+    revision = 77677;
     shortdesc = "Create tabular cells spanning multiple rows";
     stripPrefix = 0;
-    sha512.doc = "f3435790c6eea975dd01114f66afbcbe99774ab40f5f772fdf47e5224f527ea338823f6e3ffd42d73abc01378b91e6d8e40467feb538f49f0311b7f1d307dc3c";
-    sha512.source = "dc264415391c4e5412fe2ff6834c03b24fa255360e0b1b5ebfa05082b2d64d3e288b116083fd0480e041d04232587d41eacce877abffbb778e72f3e98916ec17";
+    sha512.doc = "c8f45cf8e799f9a4f19dca910ec29640d78b1af4b890b9035dffd8708e1573edeb8a3b89f668e74b7d6c0a201e90f1f216c6dce84b861583ad9a5c67567f7bf0";
+    sha512.source = "2c00ac38430b5aadc2daebc95c5643d6adce26befab0043603fb1b34d7b1d6742021c99f18fb2e49ff91d33bc1ee4887bd0974cd5c0911ed5c51a2f5a3239920";
     license = [ "lppl13c" ];
     version = "2.9";
-    sha512.run = "f9b987023756805c8c982d42c40a1f77211364c3591b0ce521c9538e959d3171ea97b1549136d3b1aa28504940531d8996bad655074d3ed058d34d40776b0397";
+    sha512.run = "28ee4cc5168a5b981e78c0eff8f4483d0c36538f8e6fe8fa724c0b5e04f02a0c8fe5246148ff2d6d13cbc7d6251726fac4307b056a4332fb4715600933e3928c";
   };
   multitoc = {
-    revision = 71520;
+    revision = 77677;
     shortdesc = "Set table of contents in multiple columns";
     stripPrefix = 0;
-    sha512.doc = "63fcd924150e77dab725df52f492b7b76eb7b0c94fe47a2ad2ea0a626cb0c7e4b87f81334ea7337c64d2b7c63a89f04b07ef04e7961cf7a92837126a1c376fb3";
-    sha512.source = "f95825c853d669087ca3eda798e9177f0892e5dd138e30e256660e754b4719c1f817318ac425f98f87cd2faac0ce128f11bd09f2266e7ffe8dfa401980765cac";
+    sha512.doc = "50c5303453cecd99155e1049693e37a9f0a3a6631f9ccd95397acfa798eb2b1b3b0c4a2989ad742e09da5d42d229bb046264ccbe58b8fd143d3339427f568be0";
+    sha512.source = "cb5b04cf1299c6bbfceb72a4dce52c1731acdfd95574547735aae7d0ea5b6d40a1d9d63f3f29ea1ee128a9a00a9f3419914a56ea79094a3b6d0dcb0d60327ee5";
     license = [ "lppl13c" ];
     version = "2.02";
-    sha512.run = "261e265bdd4528092168be95ad071bb379c4b8d5f98dfd7a277ffb87f0e6e30f68e0ba97cc9860e6efebfc0ed4a4a68602845f1e008b5405263a3449cc9e163a";
+    sha512.run = "d4fc531a7062a7aff7087214fc68fed8d20255d9d1d0f1e530e84a605bdb0e5fd0d9efe04352d70a9c7f5e7da2931d4f4b38e4ba6aee196a7f00d66b6882525e";
   };
   munich = {
     revision = 76790;
@@ -35688,12 +35832,12 @@
     sha512.run = "4bb8bd0781cd49950f2a80ed9527de1b0e49ef6eefea5787d1d13efa3893d57b48a9b69ddf0f62bd2695a61d9b785cfa1dfad2217f8cd97929e1dfefac9333c6";
   };
   musicography = {
-    revision = 68220;
+    revision = 77677;
     shortdesc = "Accessing symbols for music writing with pdfLaTeX";
     stripPrefix = 0;
-    sha512.doc = "52dc06ba9b0394c0ea66fc02094174b45733002a3a492784b1e67670614caf57a162d5ab74cd51bbe6d884fbf0f04458d6eeafa2faf637ccfde4fbbfa435cb7f";
+    sha512.doc = "38721b5f0adbcf2cc526bd5b88b5ddff442ecb3881ef922cd337b9d7f23b164123db08b756932377826b55efd604e222de80473c190ab4d71b5a3088428eca58";
     license = [ "lppl13c" ];
-    sha512.run = "310c10402a269d7bf44a811b841be8a8058ef8eefdfa4440fa64ac27983fe1212134e4a616b3979ffa4f63c8ee86a7ccc5568d49c195dc1683b326a501cd83fe";
+    sha512.run = "ff5349700b6f7e921bbcdac7d51a6c9d7a6bee15241da788698210ad52c5760e0fd65999ae177eb70e2d9170de3ba11f4f4dd102d880c8f757e27b3c16dcb2af";
   };
   musikui = {
     revision = 47472;
@@ -35714,17 +35858,17 @@
     sha512.run = "6262e1b447f517680ddfd9e5e076ea384dfa7fc8d219e7a2613a80ba66a0f0435d9dc31502f6abbfc150fa1e2de001afbdec25dd5778e3ffe559ea389d57208a";
   };
   musixtex = {
-    revision = 76876;
+    revision = 77677;
     shortdesc = "Sophisticated music typesetting";
-    sha512.doc = "b0aeef7977cb51faf732fa21ea352398889d6445acf2ab0cb9c645801a960843f9b257f9f27fcf9fdcc9e6531708cf05cd3df63ccc56131bb7dedf0f2319ba38";
+    sha512.doc = "e079671a99645021197349877fecf8ed07ac48577eb1ed3face6eac064950329378704abe8d8cc8d3c330cb7994ef95c3718f9cf9b38392f368da3cb42dca400";
     hasManpages = true;
-    sha512.source = "70ca35b0266e85be59943513f8da42e1283517061c35232cec5eef5a029795ba1fd9c21b53eed5fb10cf3f961f10c07bc4794b88dbb0eec5f0788ebf02d660c0";
+    sha512.source = "cca791ca8fa51426391652a1928cf701b66c3763eb9c7767f831aafa25ce488b6f9c5187e5ccaba12be1ee9a466a1c48ef5bdf6a9f2fe399dc08b123f272e1ea";
     scriptExts = [
       "lua"
     ];
     license = [ "gpl2Plus" ];
     version = "1.41";
-    sha512.run = "97171ffdce8fa6c7578fb53fcc1e70ed3dfde9f0a0d71041d2bde5fe5ebf9da1950fbc5a0caf277cb1aa2c31f68aad357aafbe7f994919408a4dc8c394ecf9ce";
+    sha512.run = "5996a87f620af90cba55a807bcc24efc830e41663b8fda83456a5bea580d6f74b9095d9efe86cb4f213fba9fbf78553e7d1421057fe92c08e3e038acf1610f5e";
   };
   musixtex-fonts = {
     revision = 65517;
@@ -35794,22 +35938,22 @@
     sha512.run = "dfcd842a6ca4d628848b1c705f6f0cf21f3358d303eef745ef822bb3f4d3c402a5477242483f938a3e9e1ed004346dcfc95cb262c5d32af1f2f5d3e174f1c8fc";
   };
   mwe = {
-    revision = 64967;
+    revision = 77677;
     shortdesc = "Packages and image files for MWEs";
     stripPrefix = 0;
-    sha512.doc = "d6cb1e619dfa4e99128e4fbb95605eaeee694c59636f6759055f3ffa7ff13f12fa1a6d73a26e72baf63bcdb9737ebb41795b79367498e2c1122ca2b15c4fbee0";
-    sha512.source = "aebd949d303f0de76079b78fa94f6c9d941c2cde5f35b25dd8a9b3db9dafbd4fffa73e5edc216d1b68ce15daee383794a0553b905ce29977c56b03d4cc6136ba";
+    sha512.doc = "af1707fee327c05b4177a3df81f07b5bbd942f3202d2956dea94ad1c00982fe59ced10551f6db1f769e42107cb3d8e864ffbb43e3f7f9e8da12644974a8a3f94";
+    sha512.source = "aaa4a28b12707942c5afb2de383c9766ec9ad7f393f3ab15665d262227e36762be8ed1385794199ec95de76527b7afcc5c73d61b0e742103b76dd6f54f17f754";
     license = [ "lppl13c" ];
     version = "0.5";
-    sha512.run = "707e5fbc793f608432e0c565311964a8b92ce55dfae43649cab61b767b22d35029a781fe9cf5997505afae4ff75a48d82acff95cd18b27b72033616ab06e22e0";
+    sha512.run = "fba6fb8f0b79013766bf51f4e833f30a68870e65a55a8bf30209448ec564df2a38dbc81d576a6d8ec7676f802697aab565aaa7fa599f057323b05bece2e114ae";
   };
   mweights = {
-    revision = 53520;
+    revision = 77677;
     shortdesc = "Support for multiple-weight font packages";
     stripPrefix = 0;
-    sha512.doc = "b103ae1a7e4072e646aa70ccd660cef52b6954deec6425fe2007c15a1f56fb45d43d276449e436f188e52192609766237ec22b69c7782af5c0e3f15081989dc1";
+    sha512.doc = "93d8b5b5990b682c83fb1b251bbf197f5581fb9550dfbc65ca767759a2b37873043170bca4c41294315f7db3714b171e368738b6e1cd3c99572fa867b5f20f2b";
     license = [ "lppl13c" ];
-    sha512.run = "50d675bdee00625b5fbdcc1ef923a48abc19af890faab90ddde4893081dd2a5de6b5ce9165a4bece512c885ba3f3990d8dc300a873177c725a5aa16b434d4e77";
+    sha512.run = "f1f07deb886f3b5076fabab677f325f53b88b78840c9cf92f6085ffd5cc40ddc75f8758ba962d8da7b36ef53e7386eb887bdc869f2155c59cbde4cc6531322cb";
   };
   mxedruli = {
     revision = 71991;
@@ -35880,14 +36024,14 @@
     sha512.run = "fb88693c5d626331b9deab494bdb0fececfcb3d6f76e91f76f467ab8f152fe857e4ef41f87b38092118646961c0f64f82501f0f75f5610d793b8158d77bbbf9e";
   };
   nag = {
-    revision = 24741;
+    revision = 77677;
     shortdesc = "Detecting and warning about obsolete LaTeX commands";
     stripPrefix = 0;
-    sha512.doc = "9a4859b67182b40428f720e2e955b591fd3fdf30acbe7c3214548766312833b3ebd5a046d1ca2e2b824e3bad95bde635a1cd112e8023395333cdcdb9cdf55ba9";
-    sha512.source = "969b7e463e6e8eca51af114ba51d538d0a1f7b9ed3cb5dfecab92ec7eb913a872b740b2f434e854a7c11b31c7b3364120379a5732220833235912e73ee202878";
+    sha512.doc = "ec1b8199aadc5ab34f51dec78564245a7c53deded3815def93d3c65868157482126b1b95c12d596a94caec3ed1d3d19b576f15df9be44b9f2185c435836b682e";
+    sha512.source = "60caada20e6249058200ed1f905955aa7dbc55a79bff16a853fea52d255830324ae3669260119c1817f130b5431d2029837a3750aad19412bec9e6c234f52690";
     license = [ "lppl13c" ];
     version = "0.7";
-    sha512.run = "a2d239ed1e12fd1b082c8df5531c9b83cf55c39b13781aa01848f3fd06136a9522598abf9e63580a93fb12ad7c392061b14d5e96b4d4f4dcf8180180280224a0";
+    sha512.run = "e30eb2977e55378dafa44c45a7bd6082783306533d50e7b2f47b3a0fa758f3b411f5524e22fefe82658f9af9faefb52aec46a48ee40057f35997ea764f694209";
   };
   naive-ebnf = {
     revision = 72843;
@@ -35915,17 +36059,17 @@
     sha512.run = "e850ab5086e5c5a21c9b4bdbf44c44c3edc6e7cd5196ea84737f943e814e45ce50424437575fbe99b8abdb8532bc1385ba158b18e4582e701efbf21389ea6e3d";
   };
   namedef = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "TeX definitions with named parameters";
     stripPrefix = 0;
     deps = [
       "l3kernel"
     ];
-    sha512.doc = "3e2c27365556515d098c6d613ba678b921543fa5b913b352b31df1dc09163dbff297f4b05925a40afe76f582899156893b216add690d0fea68297d062c0cdf31";
-    sha512.source = "effd5a81de93be195de401ad2077cd07b394250adb6590021051a0c46d5fea32373a424f030bd13959dce77a999fc4836812e9bfd40ceb59f0aca9e869bb3b71";
+    sha512.doc = "cb2ef385c697415d92864133c8a14cf33b2ad927d4bc9606d55d98c48d8ae7e6bcf74af7fda3202a99566f23fb882d98aade60b120d306bc51106bf92a5cc6c0";
+    sha512.source = "aa5850bc20b2131d95ce48c464750c6c7c03538c7bac4a03c4be45afb9d99f3b1f0616d069dc565325d384ad4ea3c487cf3bceea6b3dc69e64495eb8aa4f68b0";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "3fab5d263be19db83403b5801290c597cd0962ae29bae06d812dde784e06df8166979983ea732f3412d5f91ac1ae448ad2f1515c1c07e85279fd166eaff043cb";
+    sha512.run = "3345b5d18318ef038746e484eff73ba0a10ea291c82bb62965c879bd8cd4039ddc711d029d66c8ea3d3db45793f53c1ca14903048146d5bce5fc205a89ddd821";
   };
   namedtensor = {
     revision = 65346;
@@ -35967,22 +36111,22 @@
     sha512.run = "fc775dae204d8f1ca7e05005ccba0bd568f00819519d34b2282028d7f2b89b9c1f9a091ed192def7281de97ea97c75b9327727489e8ff88585bb97cf5e8b8f10";
   };
   nar = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "BibTeX style for Nucleic Acid Research";
     stripPrefix = 0;
     license = [ "free" ];
     version = "3.19";
-    sha512.run = "4bec2f9fe44cdf48356a71ee72a5470bb79eb2b053c04d591a77ef6d19e79c5d4d3a54934bde550656698e353e41fec4c10d6157f908b16ad2ee1899a29aaa8c";
+    sha512.run = "01cb83a05d62c1a262ee221adc04680e190b9f3110703b7bbba5837899b1902a17123d1750992258092f26392b066483fceadd779424e118fbc6debefdb0bbf3";
   };
   natbib = {
-    revision = 20668;
+    revision = 77677;
     shortdesc = "Flexible bibliography support";
     stripPrefix = 0;
-    sha512.doc = "afe78103a6ba2d58c6f6ba6927101cb481abb1b028c4cc09dca59296d30978c636e837c248eb4f8fa44aa8fa7f6db1e1b6855afac9d99b0cfa030dbad6e59edc";
-    sha512.source = "ac850d6b92e7cf538f564d052593319ec1b1366d74dbf86e55f0c59ab3a01ad79b780378e816289aedf9b645774cbde56b7d186abafa8d1ddaa6c32d676141eb";
+    sha512.doc = "ba28f41ae243363556b928b2ae740ae69bb307ee4d44b147e9d0b3e39bc76783aef8553cc1f8f0156776f5e92c084c2873925675d2372efc8d67975eba2cff02";
+    sha512.source = "008b63533f4226ef33570a61a84cc02c260a04c5df8c1f037c8973da34875cfb226f45d174d2621b9b081bbb513e394384d46ab0a9ce70352433a06f12e76b2f";
     license = [ "lppl13c" ];
     version = "8.31b";
-    sha512.run = "7e78ab76bd86a864eeccef86a64fb28b6b063d5a12210da80f0c5a5608df429fc2939580b88263dc50fd68d841580a12358617e20a0048ccbc9e148ba04d5f26";
+    sha512.run = "c8704de4bbf6981070c9a8cf15aa2d95f6a3571673864e75740079de5dedf6afa87a6eef7ee4704fadb3f6edfabdc765bcd2fd58466dd4a5f86665fa231a1100";
   };
   natded = {
     revision = 32693;
@@ -35994,12 +36138,12 @@
     sha512.run = "85568d2bd3b729cda5e4512a2e3309353e7abdcd6a02ee3f86e07bf65cd74ca9581d7b2746d582b704a116313b77cc5ea94f19fe0d233a3b41c4ae88a8704f12";
   };
   nath = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Natural mathematics notation";
     stripPrefix = 0;
-    sha512.doc = "ea75b3f282f81963484b2f6b29513a99f3153f222931dfa811deca40cc79a814a225a0a79e67237f53e3aabd33f7749095d3c7fb8f374ec802ee054ebca291d4";
+    sha512.doc = "fb4605b6a241e3243c6c3266818997c48e6f3f1a5461812832b5094babd69e26b48621c4ae787e227c5e7454e4ab0beab863f9d5558b4752fe2860df02a9bb0d";
     license = [ "gpl1Only" ];
-    sha512.run = "2eed9bc55d9d994df8710703c5acee9fb07d8c9732288740cc3c20740bd8db1e3d22617886818ceffb0346110dcd0dbfafaf192878500b2865523d00c6e02bf0";
+    sha512.run = "a4e25d7c21c0b6d2d9692ebddbefeb5b5ab0be658b595368b764ed67ae8941c836ee2827bfdf301b3bf8f566a33be169e8e49069dcbb2c81f83c84b5bed101da";
   };
   nature = {
     revision = 21819;
@@ -36096,23 +36240,23 @@
     sha512.run = "98f01d4d37fc1661c117027c7dd83e4c74001cc7d03adc854c6f869503e5700512186585b15d1b7dd7a40ec6a526f1e6eaeed1332ba9531850e6506ce2feaf47";
   };
   needspace = {
-    revision = 74631;
+    revision = 77677;
     shortdesc = "Insert pagebreak if not enough space";
     stripPrefix = 0;
-    sha512.doc = "780bf65aed55d1f1feb000f9cba888a16c2e2e9b61a2a4161893447ec92d7e168cf8579fad62f4d0ebb8faeda6c196a9b9dd53f45992fa3d129e6e3f3783dcfa";
-    sha512.source = "b938ba0010ca713acacb95a17ef1e8a86c6a418e970cffc3a4b9cba277ab8a2004b86460dc3686b024ea399c98d88fbd4b9a411344b5a90eb3731acf6e816d3b";
+    sha512.doc = "12770030472eda99ab0360659a3359b888ccce681d2ab171d9525050f24f0b4182c9caac55c46a600ef05cb56a788c52e77710d640ed5a5fc04b31e58bde0637";
+    sha512.source = "96b7b07047f65cfdb1ecc80f2713f73bf78b69ed56a553899e8cca2d5e6b7be3133f79cb2bcff963d4fa16b0c8ed8b49db46ea23fe83a822a34dc66820e05948";
     license = [ "lppl13c" ];
     version = "1.3e";
-    sha512.run = "7278612bc6fe35f7e91caf0e78afd32511ad31f6f31cb90f102a1e4c4babfb7b77d3e1c324df5c8b14bc2daac058550e6cb9b1a4de0a2cd63368efbc05a68152";
+    sha512.run = "d9bcae6707d6b533d3031cda6692729897c64a0f51320805dda0fe710f17b0f4d51c3f32871742a67d2c06f9f1f8ba95fd563e0f923e53060da02b4a09e6f062";
   };
   neoschool = {
-    revision = 77050;
+    revision = 78059;
     shortdesc = "LaTeX class for teachers";
     stripPrefix = 0;
-    sha512.doc = "ce3d0643ab56f830167924deef6e8529e20e8a24e4911708f25742d628c216b2dd458da9ac1cfa135d8e98cb0d24772a92fca77b491aa3e854d746880af9ec32";
+    sha512.doc = "b113c470dd1756c83651c9cc864ce0beed8b0a22297404509278a8af051ce02b7095ccc9c8c8ebcb84831789d0b20d992417ccd08ba14daf60b384469f694850";
     license = [ "lppl13c" ];
-    version = "1.2.0";
-    sha512.run = "b5f4ffc7a6b103e3783cc2307253270ef05bb2354d75295bcf42148ebccf17f9db2dc20a8cfd9a74a5ce270ce91771872a4a55805391a5e7a9f1256dc4353c73";
+    version = "1.3.1";
+    sha512.run = "2f347b1eae506d675f1abef26140d1800f0b5c82c5a06a5cc602773f6ec37996d0451b3c3049bf1da11232d292c264c035c6c971ce2674257d22d7450ee0d2d4";
   };
   nestquot = {
     revision = 27323;
@@ -36158,13 +36302,13 @@
     version = "2.0";
   };
   newcomputermodern = {
-    revision = 77296;
+    revision = 77677;
     shortdesc = "Computer Modern fonts including matching non-latin alphabets";
     stripPrefix = 0;
-    sha512.doc = "3a7c4f2073fa80e0cb716f4a875f2a4d0808331e208b30d4bcc25647873080aacd01dd3d923c7b1761e65e16ebba8a19a6d770dad94b110845109adc88ea65c4";
+    sha512.doc = "53c08c7ed1e48259bf4d2795aece253081b1e3fc1920d670ee905a1ee5bd0a8724dd716cc7e2837813d6550ddedf84db8a67ea3411ad5e2eef6374ece0a172fe";
     license = [ "gfl" ];
     version = "7.1.1";
-    sha512.run = "9d0152dc2b8e06a34f2dc38e1d70ffef0b8d4c604b27cb345cc5cef5d1cc50f7aa3e0b94da8fea7b8e36c2e85a654b74783cf50020eb06d051e20d80777d27ce";
+    sha512.run = "897ca5aa04f2517482db7a0c6b7b657b2b3f8bf1592768163d46ab64fbe267b182e55fc301b18ca3f33d160b9bff2df59992cfa1a1417c9aa5ffb8978c59ef64";
   };
   newenviron = {
     revision = 29331;
@@ -36186,14 +36330,14 @@
     sha512.run = "b949934073af1aaaada73c93e493fd39ca01ad625d72bcfa5df915b2c2f759a39d77b7c2a0a952711c8c3e0af5e6cca59eb7f333fcd27e7232c3780ad5400ec8";
   };
   newfloat = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Define new floating environments";
     stripPrefix = 0;
-    sha512.doc = "3dc798fbb3cd6438ac3c6aeea75ced592bd7c8b0fdf2bcc34e2697fc1762f065bc4779a8caf9b33204648d42d3b93c9ef02e58bbd240693b13f2d878fd975f2b";
-    sha512.source = "faff248d17a229d12691e509bdea2a321960147bf5979aefabfcf41fc683d1aad88c78d276217ebf9ebbc76a44cf3e97cdda4798adaf74d8c60aea7a67573cf4";
+    sha512.doc = "5b3694d785533aac063432cd2e3fb5acfedc124a8fadcfef8005a23a42de705b693aaf08e894732ad56f52a5411353af3dd78f77279b6e29230da27f020f456f";
+    sha512.source = "1d63a915f425a77f7c0764b69ee1df443e191dd86d77f345e7203ed8d482f0dcc37fe9f3e4fe3032ee967fb259bb94b3bf3135d15f0cba9a171b13498d7dd1a0";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "eb91f455e1b74175c285ec29b944096de424a4e67e173a17d937e223a7f18ed55573e3787bff053330872216c0382724a7b3d87af5c2637e2bace707170e9641";
+    sha512.run = "19c7e5f2cab0f1b507c8f1c1983e922fba3b2b4f73ad94b5a14ffca8418b9f98c284234977ddfd13e3ddc7f85f4ccb6b2a79e6756fa73ef295fef966afdaabf3";
   };
   newlfm = {
     revision = 15878;
@@ -36216,20 +36360,20 @@
     sha512.run = "13a7d5812fa80a9c1b63d8a35da9fe93af95065e090a84a0f42a94ce96732341544a410527c2659db87c43817e5f9b1b9b96b8a9bab55303ce366ceb0b4a1fa1";
   };
   newpx = {
-    revision = 76713;
+    revision = 77677;
     shortdesc = "Alternative uses of the PX fonts, with improved metrics";
     stripPrefix = 0;
     fontMaps = [
       "Map newpx.map"
     ];
-    sha512.doc = "ffadf03ebfeee1d058743b739830bc19e6327fab00fc06cef16a88fd2f23b6c35956ddcc3558065cc70ee91b62edf0e43a58294f489f9615f2fc49bd1b8b78e7";
-    sha512.source = "a27c6b78934cbd95537c7370ed29eeb3f5dc56e4535b5b4cb00a07c29304f742de23084af08fc2e8cc2eae4346d5adc7d90c894d05d17fabca53bc8184f66755";
+    sha512.doc = "b07a50dd09058c482dd6a045f11fd2e8b20a713df9c3204473e6aa7216f7a21aa1ed7abf0b50717d7be8953c8aea8cb783cd921ecf545f43aee8de1e1382878b";
+    sha512.source = "2280bc1acd7b0b5a091cb2fc9dea593f9c14249af05f2949a81474ef98e1c2c03411f5e63658e0e5dcdb006bb4c3821bc46c1c6828b218498a4c1782c11fec3a";
     license = [
       "lppl13c"
       "gfl"
     ];
     version = "1.551";
-    sha512.run = "80641c5fe565e52ec4102f835c7988b7c271ea2b4fc2bdb18c87759adf1c903aa58e98a3f8a20b694e6e5ac59e91c2ed2e449683a04e7f27de30784f435692a8";
+    sha512.run = "b30fc096da4b1a8b377a8f6a78f86c497228237b103c4788a95112f9aee3f3a13872cefb68edb9d447f9f9e95789c167825b5787b38d7c3a2b588536bdcdd575";
   };
   newsletr = {
     revision = 15878;
@@ -36250,7 +36394,7 @@
     sha512.run = "227fd249bba9deea4f191c59060c49d2d1cb8e367bb3007d3b123c17dd4328206962946ce3f637c8e6ae079a9c95244ce9027b0c9f83e0901801dde066a0405a";
   };
   newtx = {
-    revision = 73393;
+    revision = 78116;
     shortdesc = "Alternative uses of the TX fonts, with improved metrics";
     stripPrefix = 0;
     deps = [
@@ -36259,50 +36403,50 @@
     fontMaps = [
       "Map newtx.map"
     ];
-    sha512.doc = "84f5dacf0357abd9e2b98538608fd6430eff2fd51fae2bbb497277e3fe9c6c86b72ff347bc3d82c61a560b942692fe523c77b4615d7b55ad44fcb56b9b0a0a4d";
+    sha512.doc = "b58a9aec709bfc291af72176edcd5411664d7b01ea4199b7d4cb2c39ef45ae1e703137707c6e82c6a28e1f99abc1c3bb379e67478da894c55a172dca7c2d0930";
     license = [ "lppl13c" ];
     version = "1.756";
-    sha512.run = "c506b1f9320d1a377f3c84f2a56dca250e76037eea57e188dc5477c5197b2a16c25cb0c265b985ae423365d8fd87caec9897ad41bb8cae0b568c0d5dc80cb173";
+    sha512.run = "df2f3bec88e32c8aed5c0cf49a960fd3c6b6cedcb5de2866a6a69763fa9d7ce38778a6ad21299d8fa3c64b77bf26e4a6dbabb6adb971f849c653c2d5f6aea975";
   };
   newtxsf = {
-    revision = 69597;
+    revision = 77677;
     shortdesc = "Sans-math fonts for use with newtx";
     stripPrefix = 0;
     fontMaps = [
       "Map newtxsf.map"
     ];
-    sha512.doc = "992123b7b5f30b827b4cb49b933cdaa323a007c1d41632993a2a8d52588b5f5d97612808dcb48423dba309f025d851cf15aeb892c8bfe10d0929cb5744515b7c";
+    sha512.doc = "09330d1ccc6cc56be0ab6a38dfdc12a4db0b53227188b228ff60f8ddbd3d9cf00cac342dd017a367d8bbe7cf4d07d2afbb87d1daa5244a740a5f71099fd967f2";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.056";
-    sha512.run = "4d44962a7bc466faa60d39791f18be3b5d3bc5a1eb2b22e233c80a81ad3280b0a89c03717881ee858e327b67040f5859fcde7d465420e43df547ee56f00f5b93";
+    sha512.run = "16d02b34924305ae0f34cfd08a1318ef50b84a99cbecbf35f2c3d2bd73d177854bab90ea9b25906105400d0e4b9c03b6cf0f42acccc06124e0edf12993cf905e";
   };
   newtxtt = {
-    revision = 70620;
+    revision = 77677;
     shortdesc = "Enhancement of typewriter fonts from newtx";
     stripPrefix = 0;
     fontMaps = [
       "Map newtxtt.map"
     ];
-    sha512.doc = "adca4f1811f74e114dc7d4ffbe097a54492427371d1cd0cffa9a526c409025cc644e5fde7bbe494ef660b46018cb9057cfbd57e3c69b0180d40ac885fd89fe9c";
+    sha512.doc = "921df5ebf5994e1a101a3aab45f3f17d17b4c40de8f31abf40cba4ce5feed18f208a262d08f17af4778ae766135c032913f93d588c64e1c7c497ffa1b40fa8ef";
     license = [
       "gpl3Only"
       "lppl13c"
     ];
     version = "1.059";
-    sha512.run = "7f7f4742a08266028434c4282f1e7f539cf471e54f968ee2c1573097024f94bad1d4b987c3821b33e4a546fe0f8ddad32d090e66d305ac6394cba8a82325ce40";
+    sha512.run = "529d80e979957cb8ab75000e1669f35419a4a3711104bf5638165eaec43b0cde9a2448fd7b5ac74dc3a5f04787f083d2bb4accdef28608df5e696a584a6158fe";
   };
   newunicodechar = {
-    revision = 47382;
+    revision = 77677;
     shortdesc = "Definitions of the meaning of Unicode characters";
     stripPrefix = 0;
-    sha512.doc = "9ec3bdc81587e8b2553dd4ff45ca4ba0bb504ded0726aa44d1e88423cdf425124334d04ebfbdbbe57b576b0fa52cfe1771c97308f146ea19d89d41eb4475eb9e";
-    sha512.source = "0464584e516c8f5d9c7ab4db114fbe3ea9e07d33c1544109ebd0d3b25e4e3ddac222dd69b6a8222e290ae2b6a7d7166a76b54ff9fbe7ffd5225368986e2af6d4";
+    sha512.doc = "6849f2ff7d24284cb1528e390163bb26743a5d035cd20f643025eaffcc0c9f31217e840657c955648222bc2d386defdb175b7274857361c0e6b0544d5b936260";
+    sha512.source = "fee86726794f97da2e8412ab8f6d9f3b3a21437e2051f707dd212ecdb3358ce89af77b97f052e19bd3de5efde532cf8b3b3f433b9f652b9e0af805478e3a89f6";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "8e1748abc585f51033a857db126c4b18f0c42e015d7193f8bc7b69493fb13a218db38da97f3a6733df01dbc247093beb544651a050c5a690f3cd5479c4ad9e6a";
+    sha512.run = "edbbff958b6c0c17e8e0591c6f28d3e7224f21791168e5272063742ab6bf1271b926012c055ff719906da509b9d05c878a638f1983270b264df23317195ee1b7";
   };
   newvbtm = {
     revision = 23996;
@@ -36315,52 +36459,52 @@
     sha512.run = "029829b1da07d7e2fcc5950c32021707058f3d7228f6ff82404aeb962663277ed107934f04a93e7f43bd7b67f7034821437f3a8116f21028b7c9a154449ea53e";
   };
   newverbs = {
-    revision = 64833;
+    revision = 77677;
     shortdesc = "Define new versions of \\verb, including short verb versions";
     stripPrefix = 0;
-    sha512.doc = "7524a6e767edc5f55d96026f947e17e42f54138157bfd1851832dd139617939661ba5a4e759b4cf313990077dc9ed240c032cfe706b595af4d9a4197e519fd1f";
-    sha512.source = "ddb1f40238ca2f622180ea640a86abf993add81c44ea3a459c54b1c114c0b78d4940536b712ab444e93495492b5c0deb02c211b06e00f8fbbdc69ebc4097f786";
+    sha512.doc = "cd26937af0edb22f7a42a435dd39e5046d71bc0c11fc456f6edb2267733a337bc24160749e1e99daf35e570fe1191dd75e68c466fffd2b98767e0c61a7614084";
+    sha512.source = "ade98cb4c7f00c7135982402109a2cc623a3b81b8efabba4fd3a499fb7e4e48d991772666fa2afba2ebe919d478451f8a05d071aad374a2947dc3a60c966e12f";
     license = [ "lppl13c" ];
     version = "1.6a";
-    sha512.run = "f2e2cd3fd2712d3333c7caa9e74a16300d7f08327b9bc7f44362570377feed31a206e6b09df15c524dcbfe39ffc54388de4fca90e180e38d28cf9cfbba79ab2e";
+    sha512.run = "1a2011676c01bfdbc5b244fdb5838f6aa35291f3a04feec15d71936f483664902654a5e9f9e0881b51faded850005c6ffa1964544f658b59bbe3e8e4ad676d2a";
   };
   nextpage = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Generalisations of the page advance commands";
     stripPrefix = 0;
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "fca0aec60c5c7277dcadb0f86d757617484d700575fae13df8b386775e153ea89c52935ffdb2448c52e351593b396fdf3394f5b97e23a0d2d40dac339e584f59";
+    sha512.run = "8ddcb6b2f331baec14df716187117fbee32b50c96d444200c1399722c26e02cde26bc49a1b8db191d193d8444af5e82da5d37f7a01ac523c08f31ee382519335";
   };
   nfssext-cfr = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Extensions to the LaTeX NFSS";
     stripPrefix = 0;
-    sha512.doc = "4ab2bdbff81772c37381a1dd4fbf67a3edd573ab35a3ef8fedeecec201ddf69fdb4af7ace197467173d7b4dec7f56ca1d1c07b7126595f4b6811f96cf004eb8a";
-    sha512.source = "482f6f9af8a25cab5d8b0ba887065b3288fa87e57ca5ee9617f11dfae0db2fc95105de23f92cea03a1dd4e929660a52aa648a9a117a52975f48f8cd6aed21a4b";
+    sha512.doc = "49b96bcde8fbfd5ec96293065da4f9060a73e6304c1992100ddd2bf7dd2dd536aa4aba900f8484f3c1ed5eebc4408dedd8bbcbd9f96e336f27f8c8ec5a804fe6";
+    sha512.source = "91cd80381a070ee21c1c08dbb460caf6973608092b131990536546daa4edd9b373651b20904e6cd5601925df53fecd62f6874c546f93a6a59144a6e0885c8c31";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "303a21715678c3e9d2880816f0b9b0fa18b03d7c0769271631019bcf3cccc733703febcddea8e9fc38e0f004dbb342d5311e36ce37a4d4e19d7a8fd58625e86b";
+    sha512.run = "1a2ff54abb72acc2b1414c0bb6d86fff7b7e931b496bce266e2d67fd50de579fd6b9f2a2743d2445f8c0bf185fc89be6af256d81c4bc7f0a0123bffcdc35c14b";
   };
   nicefilelist = {
-    revision = 74999;
+    revision = 77677;
     shortdesc = "Provide \\listfiles alignment";
     stripPrefix = 0;
-    sha512.doc = "07422148be7dbae255d1336ff2602abafe7ae7a9e3dc5aa7510a6fc3efedd5c20edec726d586d4d82af93d0d94f53cb97aa45a63b39ecbbd948eb78d87df8f5c";
-    sha512.source = "fdfeb1f3815c0ec77bc9c92f970fdd24039f80230c6e65a8138aff120e9159be08026b97b5de2365109e1df9d5fff16203f078e0874a14b099c47a653e7d0620";
+    sha512.doc = "b431daabaeefff45fc9e2a1f29817b86b9cafc034b0d35d429a2838c45dc5d430c9b7e7ffc865dee743e155b2fcd0cf1552604a6979f009bad272b33bf5d51d1";
+    sha512.source = "fc5648cb38c27e12cab72a17ae7bc30aefdbebdacf3a43fc0c720214913d8d2c8dd9e2ff668d5ffb317b24d34df620683ded5f9870d13ac2ef1dd0511b5937cc";
     license = [ "lppl13c" ];
     version = "0.9c";
-    sha512.run = "5b6b06466dfda6e1d13600480738a5a700d2d0e74a8e3e769377cd0a9fc8e49f77fe188dc729531d0343f1f7414133887e1dc0cc6a952934b4dc201f93fa9172";
+    sha512.run = "ee3577c3be56ec50b5dd683fcd4c1a03408f6b7204bb77e314882d5982654c8d8fe41f7561bfc50fc87903713dc88dbf610eeffd8ee3e60fc966d28de09a65bf";
   };
   niceframe = {
-    revision = 36086;
+    revision = 77677;
     shortdesc = "Support for fancy frames";
     stripPrefix = 0;
-    sha512.doc = "aaf777520d300b5e8c9a17c2dfb5b12406f5e6926b17c4244feaa8d6c5bc28d87277f23fd814304a7efb91dab8a42e1ed88f6568b96f13f30c831e81201ff4f7";
-    sha512.source = "fb0106ee32e36d34767c6200be1d2415e11c275e5540dbd54777a6876474424f1c82ba52bcc0fd76da9ecf3b37671d37c762834b3e6ef714028c1917dee45235";
+    sha512.doc = "9f0381639dfc23b18165ee3b68f91a3d20a31ebb82bcf9e9a2a85dbe0b9433160f1e9af195901d9757a92f101d501c270ccffdb9d623a55bfeef7303eb4ecd65";
+    sha512.source = "5fd4189bd528b45d442158ef0eb594c2a9c23dd156859e928fbad23abe82e8d7fed6886cc9c01a7ff5040fec10148ee2ca3766e4459ece3ab1bc3869670c5e85";
     license = [ "lppl13c" ];
     version = "1.1c";
-    sha512.run = "539d4a6f3a192188064fafd94366ad2f8a9146175d9e04b08cd83d1386bccc730a0e3be4a9fd45e4f47152f10710191b063138ba504fca95e4226fc179f70a29";
+    sha512.run = "f08e40612af6ef4dfdd6790973bae39d52d990e365069612d7201a1e1c6a1e6104496ed9ab31cca44951a5e5b3e520b9db396cff0657f3327c43517ded3137d0";
   };
   niceframe-type1 = {
     revision = 71849;
@@ -36374,14 +36518,14 @@
     sha512.run = "58f4595ad99b3d3558cb3d16afd4e76b9f9ccb736377997befe22f8ec30a0f0ad9364261c2db984a488da477c1727c2e872eb2126a62254830df2470cc9f0932";
   };
   nicematrix = {
-    revision = 77562;
-    shortdesc = "Improve the typesetting of mathematical matrices with PGF";
+    revision = 78222;
+    shortdesc = "Improve the typesetting of matrices and tabulars with PGF";
     stripPrefix = 0;
-    sha512.doc = "2d0b3e57ed097b1d3719862a18b67e591f4dbe371a96df5c87b9d8161a768b8f9bfc7305b88718674b257f83a8515a85f48c8f600d110122c33abb733bd529a0";
-    sha512.source = "f8869bf7920cc642721b1301e9207dce9438cad4cf2960243ae903784986c86dec6da8ff17a5e1a45419a6c0b716fbdfa4c3f3017287d2df59e096f099856be0";
+    sha512.doc = "8280381a184224e560add6aebb113013a9d0ce2b255247ad04ffb4f6c43ab83c0d706c2a786cf3f20a1e298a1bfcc8c61d85ed92392d93122a77ab9820f8a470";
+    sha512.source = "e1640aaeed5bcd36c6ff6ed0c39bc8d9105dde87af964c775baf16e4222a739e993062df95e96054aa35d1e238366c4c32f11eb2a7fe0b7a044477fa8f4befea";
     license = [ "lppl13c" ];
-    version = "7.6";
-    sha512.run = "6ca2eaa1e381c6f1ab472ecb82d922b05661da3b173927f8018ab162414c11a1863343ce5b6f6ccbe3fe4b008cc789494b7ade0854ceb4e941d9b9f67000cef0";
+    version = "7.7";
+    sha512.run = "3698a358bb91cd87475d0c9e3f8e8d510ee9d958d987ae35d8bfd16ba1f6b91bfaf2a41c764ce142c5369d06985ce36d47e38fb46ec08cfbc54f4ddfdf86aabc";
   };
   nicetext = {
     revision = 38914;
@@ -36394,13 +36538,13 @@
     sha512.run = "04a555a82287a39249cf6b0e18d890329098a1d0d6957fe9a1c535024b63a5f50b6487dc1fe4fd69d87908abd385b0366474ebe3af0b31f41f6a35c519a6ba9c";
   };
   nidanfloat = {
-    revision = 48295;
+    revision = 77677;
     shortdesc = "Bottom placement option for double float in two column mode (nidan-kumi)";
     stripPrefix = 0;
-    sha512.doc = "2be76c8e243de71698ae5264a8e3af4da8dcfcd130b0554d1547a0a238e55ee71ec57d8757648b162a6ebd17ce1047206979cf139003a02921a4308a852f0030";
-    sha512.source = "8a778b33036445dbe375af746244433470e5d10a963ebbfbc397c0376d5c4f7c23cdbc2ff3ff6455e274e83b465a64d8bac5023e8537d5b949fff038098d862e";
+    sha512.doc = "4c657485f4710bc9296a83069c85cf9510496977d63a3a799f24a9afa883835b1a52d253de7a723ec21cc6d3bbc8585cd6378efd68ee4e1410b1b28a836b9c44";
+    sha512.source = "4676a04a04180e472cca68b388f35ba9187ab0d727f9d9970d68f8808093ab371bd9341837e538acf23568b9f5d4eb949713ff1341681759bc95c863d79ce635";
     license = [ "bsd3" ];
-    sha512.run = "42ef65277deaf474a619e5ffd570309db8c8349f32e9bcfdf216251e81136a3da87a745b3dcea5212f636396179210c6acaa96a957ffd9588d1f414d6a59bded";
+    sha512.run = "e8b57ae05b11a4d524876dbc13b8137a56b379ce866c7ea301144551a88735763c83f6bd73e0e4a406a9472322d2d3a6f1f59fd4d3c2e9c46c6d9f07c9a37458";
   };
   nih = {
     revision = 15878;
@@ -36524,14 +36668,14 @@
     sha512.run = "288535b4dc1bbb7abf4625c7dfcf55864a6c71542f05e3c51eb366402edd7c98e4a0ca9cfd2128b33467b0a9444842da055e5153eda7e3d5a2ae719e6193a361";
   };
   nmbib = {
-    revision = 71138;
+    revision = 77677;
     shortdesc = "Multiple versions of a bibliography, with different sort orders";
     stripPrefix = 0;
-    sha512.doc = "ceb4be2b194651e1f48b46502e090dfec31eca20bfe758355b45b532646e1ef9b620176b2b9c35bd00309175af6d500a49f6352095abeb6ba5f31f82e13abe37";
-    sha512.source = "7794444806fa60c2841ebc6da2617d91fc763dfeb3080c3091806418a7fc10ca4a91292308d7535107a332e957004db8e21c6cc30e58c46ccdc975c463a23330";
+    sha512.doc = "836b3011ce70d3064252162d4196c07789b0ccc632dff2b6a7391e306adace1fbe7aa56a0077defcc042c07480629795f666b50935e856d85cdda7ce111939c7";
+    sha512.source = "a5ea5f207d04c78fe766c1597f6168fb9ad250a45bd7b7365c50d476df29dc92d4513013c02c36adb17f0b7d36aeba830e2c2e85b9bdfb77733e8a670e0db50d";
     license = [ "lppl13c" ];
     version = "1.05";
-    sha512.run = "4f8d6b7690f0cfb9b907f98d337ecce2d812764d4e484d2b592eff52970db4378e557d747a6965892a3f0d5c256b2de54be83d50438cbf2c7fad43959d15c5ce";
+    sha512.run = "259d23b7148516ec293342d263407b5698271c8cc95205acb40ef515f7fdd0a0cfcd706117b934b3415c9dad91396bd2f6af9bd87c11c3e5e13fba2aa281c733";
   };
   nndraw = {
     revision = 59674;
@@ -36592,33 +36736,33 @@
     sha512.run = "8445839068a264cc57df9b0e9cce4562b3e70ef208baf32fb2aaabf7ce95804a31f0f8b65c8ce2f2f0fc809a07cb864ff977af31d8162cf10560c39f9d2b78a8";
   };
   noitcrul = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Improved underlines in mathematics";
     stripPrefix = 0;
-    sha512.doc = "c9c3adf9742b329ddbfdcfc41126c22039e89642f0c0d93ad064ff2160f7708b62ab28994a81860aa08d83f11a111bc11a2a54bbab88bf3713f3f6ee4aa2e641";
-    sha512.source = "5be6bf65ca4dc0c5819a1bc870f704b595b25e5ed6900beb8a53fa8167680929a7fe038e80fef120e77d5b8731c13f92f7907469ce7aa4825ee4e207c09268a3";
+    sha512.doc = "7bfa6ede80d2c2c33dc8c738bc34b8c5afcc7ae7dcf495ee27c4c116a69590fcae948c9e09ce619d4e5c0516badf4b9724f45c6792ee452d8bed608887e6d550";
+    sha512.source = "39b9e2d712f72dd11e9c12013cf999c3dd5203c3f4d37ab9d5e1dc415508a90f03ea09994d3fc21af33c0a4ac437e4f48c8562ed16f0e2c4990e61ae051faa2c";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "1629f5c0f832927093283cd5cb534cfb7ee35bd74f306fdf6cc18cfca3c72d5c1501139c180b7cf3fe71ef7131dd6a42465ee666c7bbb5c83a86f2a69a5a3c8a";
+    sha512.run = "c08f1b6098c23649ceb4ee96db29cc1dfd98e15fb6a0e0c80f3a234e75d74d6dca51d79730d86169dbb3d97dd1a30d67b0a179c7abbba172d1b420f86ec776ac";
   };
   nolbreaks = {
-    revision = 26786;
+    revision = 77677;
     shortdesc = "No line breaks in text";
     stripPrefix = 0;
-    sha512.doc = "8cd5d7336097abd2d873af36b2ba6ebc8cd1c405c9a715c67e6c04d02dbdea067c0b7a8603418005ce223e0f1bff161a3dcb669da7c07c30b2ccdccc7f953fa0";
+    sha512.doc = "d8916efc3f8abc5c50944a33b7e6bf43316706bab6da8a976b6e1d18eb4f920b5c5d40b75cd981778a7eba8de3f66cf84f2d9e0b7f052e8d9ecb5ab6b87ffd34";
     license = [ "publicDomain" ];
     version = "1.2";
-    sha512.run = "4057a988b0357e2256eea6ae47c560d8535528e63b93d648c45d65ac44c4894104015e3411b7046606b9a68afc44033d037229d684f0c5427d9dd2ff5b272279";
+    sha512.run = "cea541a41200250cb392dcc317ef49ef71fa196f2afa1559885fab84364032fa239b85b90c0b2119ec47482cca275716bafdd49be5b5d532e7e6b81bb402ee9f";
   };
   nomencl = {
-    revision = 61029;
+    revision = 77677;
     shortdesc = "Produce lists of symbols as in nomenclature";
     stripPrefix = 0;
-    sha512.doc = "1caa5bcde6c1a3ac5de024f513793c52011285e70e32664d6c5d1a103027c74d45c716d01aaf849726b5b7ffac511ebe6cd16ba669bfeb5fdf37addc59e24a6e";
-    sha512.source = "0fda8a0c5e46933cf991bb4120e4bdf98a8ba05e1ca96600fc9e6abd5d3a5c78ce50ae9e625fdda956c90a8f9f569f18d9ebd96b6de4e0e5bb0fbd2b5b00889b";
+    sha512.doc = "39f46439ac22713c021aee745984a39a309c7b175b4a09767f032e7addad0e4e6e9163abced6d73abf77427c79a8686b6bc0b20d5c0e0835db2830b66687778a";
+    sha512.source = "f04e151020aeffa4598ba77a11b3baf8297992f8f89806e1c3d94e460f7e05f1aae4dc4c26ca255b0c138d04b08ec310b01e23c3989d2e9013fcd773375a475e";
     license = [ "lppl13c" ];
     version = "5.6";
-    sha512.run = "ee20b8a21b03cb02ed2ef37d38c219841d4a07e17ff781c067906ecbb8f5383d8558c20164f7db79af0c8cd11c5ad8d76142b15ea74674593bb52a5a5993b6c3";
+    sha512.run = "0c6c99bc6e18534b0dca037db86323f0152b4efb09c4a00aea4e26ad0b47b9ae79e89a722aa7888cf54cbeb261677c40bb4c45c023179f97b9307cf837bf7da9";
   };
   nomentbl = {
     revision = 16549;
@@ -36639,32 +36783,32 @@
     sha512.run = "4dd4831f27adc3e50b42b44475ff319ae8926e020d896e71db4663b46f7d568f357e57debc10675c0788b22021d9aaa217cd254616e6880b442fb87181319bb0";
   };
   nonfloat = {
-    revision = 17598;
+    revision = 77677;
     shortdesc = "Non-floating table and figure captions";
     stripPrefix = 0;
-    sha512.doc = "2d090fa397a385cb32c26957b5c4c05ba8443fb1bb7ce7e3eda777ddc2d3af11ec3ae6297bf014f40e71d4668044ab729a6dedd74e8802ce9089b59d57663374";
-    sha512.source = "be5e0b078adb8c530d8255bcc72daf50ad8cbb48343fa76f132e1b75fd64d033c7caf287b6901f1bc49422956f6901dec0f7e7b7639dd71c10c1a76ec958aaf6";
+    sha512.doc = "6c30ea0c6544c75be6ce2a2b120ba8250af8267d77eb984979e8dd121aed8d386beeaa682f0458ac05f7dec7a3d08770827271a6b6982b1284b4bf9a8c0b1182";
+    sha512.source = "3fc34da2adc9f2c76767d8b08da2af2f10ec291a55d65f0a5de795eaa04a0ba0aa189948c22a9489dda90769af0db5f1035fd2181034e61c8f7841dba32e0268";
     license = [ "publicDomain" ];
     version = "1.0";
-    sha512.run = "39f8f0a4d9ef1cf8f1dc02c63612980f25cee80cb545bf405d9d2a080256ba6799ff3030c98c26e6f2aaa10ac71015e58e4233bf84703b290220b12db45c70c0";
+    sha512.run = "4fc6803ae80689ae80fbffe96533709726dac05635ad46b0f436a6ebc4feef4de84df86397aa6919aacae629db6db8091eb3fc4f656ce1fa7de8188aaab906c4";
   };
   nonumonpart = {
-    revision = 22114;
+    revision = 77677;
     shortdesc = "Prevent page numbers on part pages";
     stripPrefix = 0;
-    sha512.doc = "0cd6b115638c3151e5983845dd2964ed90f24bd35a06e904a005755696d6faccd90bbf88c7bbb5a0282ffcd266cb55e9eb1d058fd78432ba062fb4fd723348f3";
-    sha512.source = "46130f9c35465685dc690096405791f82d70e73091f6654b5bbdaebc71b5fa3703a013461aedbe2cfe59975dd6233668f0c204e817ed65fc83c30be59be52505";
+    sha512.doc = "eed1c5a4de1f3745b6b3dc24d5c684ba4d152f200974c9188b3e190cc470eb973790fefa45f200f6146ac5f99090115e3c0df2b4126aee78d21ccd259523e103";
+    sha512.source = "9ff7d12a5a878e6bf6e24ac1b473f9665859426ebcf8749d588be28f93161cfc0b7dc89e3d5d086e603dba0e3b7d9dbcc138816757d9999643c29dee68240278";
     license = [ "lppl12" ];
     version = "1";
-    sha512.run = "e97fcc36af3e86c1a432d0e425dd86308429e764c976a2f7f8106c3433ae5a148bf3abc45706bcc3090089911e2dfe175156eccaba7d97f544154ad0b288e58b";
+    sha512.run = "d5cb9814ab7a9a6a14939095c3adbc2a641b0c11d01af64bb96f4ca1dcd5a7779d4b730ea93325f9d6fe8ed6010c56de2ad29a08619b36b9c2709ed3d2b0f386";
   };
   nopageno = {
-    revision = 18128;
+    revision = 77677;
     shortdesc = "No page numbers in LaTeX documents";
     stripPrefix = 0;
-    sha512.doc = "5988c42840efc02f816ca0f9ff7ad2d731c66563c0c4de21b857de975bbec08962cef4ed1dad096abc39ecd8489d3a34a66809e98f49b0a280c186d03e6540a2";
+    sha512.doc = "065c2c2ba4415ea09dd292a73b9b6adb17cd4a0fc7eaa1c4b15a809b12b53653996805cb0b72f5e230855e350a2b3262ce8b735c41c308992654eacf017f9a2a";
     license = [ "lppl13c" ];
-    sha512.run = "0e152caa8b8df06444f50e2f9ca93f18088a0c58e2d5936f612a770b90cdb8f4bb0142064f56573d8569eee274adbc2703037ce4d7477c24d23c7c8de8748a62";
+    sha512.run = "9725c1e9f116c2629a099480fddd53b759e9364c282185c87c4f3881b1845a003aca0f51b4fe0879247c620bd7ff6162870c2c7ffb5531efa0381e421e233ee0";
   };
   norasi-c90 = {
     revision = 60831;
@@ -36681,14 +36825,14 @@
     sha512.run = "5f65927546348815b07c93003a2b0922403d274bfa3d1665d4649c9dbc737df924958c2fd61c1d06cd5e7c1862aff392c8d1e9d827f4ae79e70d9b76467f651d";
   };
   normalcolor = {
-    revision = 40125;
+    revision = 77677;
     shortdesc = "Changing \\normalcolor";
     stripPrefix = 0;
-    sha512.doc = "ca7a9c008f72aa1287092f881f9ffcbe58ed45bfc97ec3231fbeceeb007f6248629d9cf49598afe604ac8cc30a4e8117f54fe517fcbf52548add2f6ac6fdb662";
-    sha512.source = "ac6fcbd939d13714f21106c6b0786a9ede4ae6a3023348678ce22bca59343d7379fce9ef12bde91fd05b4912c70c8b4eb64b95f2869f4a30c03c4443640b9d80";
+    sha512.doc = "100298ecd7ecbec39defcd85e4becf8fc387a4f4cd7e567934bd8a662d674bbac63bd792a2124868e311a7c0671b75ccc3ade31510bc5dbebcad5983f10457be";
+    sha512.source = "f29b1905794f1dbbb8fe21d9d1937ab90c56188698aca684e9b8f0469af56667d4c4789975054700f146e64e710ddcce5f82dd8f21b507bf5884ec5d765b619b";
     license = [ "lppl13c" ];
     version = "r11";
-    sha512.run = "013354a5f7514f6267d57d098ca93eb48970df0ce1cb2db0c60ecf664cbcea177b934ab8f252cfb9dd4c0979417937462ef55e51502bca7f32a7de1a0e820e32";
+    sha512.run = "c66e3a39dd845b98da7c11b44f5732dc11564fb8bb992114b5c8623cf6dcfe4db158702fcbb794d53c041afe2ae971ec3a3bf2929f689e1638b0e5a6a075bd02";
   };
   nostarch = {
     revision = 67683;
@@ -36701,14 +36845,14 @@
     sha512.run = "3646dcc196a2b0fc4389d8c7ddbce263126ec88f33749e7b290bdd5ef1800cc8142c35fd87635c7df2b0768c3be03a25bf4e3b84162119c859f278d70bfd4fa4";
   };
   notebeamer = {
-    revision = 76864;
+    revision = 77677;
     shortdesc = "A template for printing presentations on notepaper";
     stripPrefix = 0;
-    sha512.doc = "970f2f8dffa77dbd5b8a15cf260a40258b53b0c11e44718b6f4e57951fe01338a669661dc757bc2dcb56591c589b7328961c28ba063583715e2ad6f73bb69fa9";
-    sha512.source = "548dd71da96e17763e10575b9745ef14b76dff2712460e6f26e84dd7f780d8dc0d8a85898f7ee3a3651ba14d3245f1c8acc9dc528beb333e3543f26b6f98b65d";
+    sha512.doc = "398ca4b9dd8fe16c3503a341b88d7b254bef7d5423c9309cd719a4a957064c62f79de6ce3b09ece1519533a706ad428e7ff00909a8eeffee996b4e1254a6cc76";
+    sha512.source = "88bf1a9514bd696542fad987015a04f937dda1114ce38f300dfb77daf74d1345029aef7efb3c49fe12509c1aea930181a7c4896e2ddfd3ee3e56e289e944bfbe";
     license = [ "lppl13c" ];
-    version = "4.5B";
-    sha512.run = "689492246982a3956b45050e939207caf628bf40cd90ee807f5bdd37031066799ef2f5dd59d0db22f1f01e10fa7916acb4dd69c9b6484ca76b6afeaff033819d";
+    version = "4.6A";
+    sha512.run = "2941445272d1498a9f7c881b14c9687779bf26702e2713d7b77d3202858fe70d1df32b60b0847caab9fd430ba66b1c272a96ce234024886c622cf4adca88017a";
   };
   notes = {
     revision = 42428;
@@ -36721,14 +36865,14 @@
     sha512.run = "7b569f27ec34c103c5808036a6ffd7f97f9171287883f38c048b8eabbd979559fbf15b20c7002dc9b8b0577889482c4347e4986e076079809a4a5656aed46101";
   };
   notes2bib = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Integrating notes into the bibliography";
     stripPrefix = 0;
-    sha512.doc = "7a1ed8f17b0e782463f2854b5892250f40a7532b8e3691b9921e0a5fbe9438f9083a5ba7cf2d13592d490594f2ce1fdbd1370294dcda524f797572c55a7fc6a5";
-    sha512.source = "81320f78402c12c02c0f1ed7363c669c84c3bcc6afca2db493fd1d025e57b6beb320d9511c6c022f8c38cf882443d6c24142af5c09ce0c27c1544212f5c95a22";
+    sha512.doc = "de703d9ff94a6fa7cdda8ab8e36964f3c3ceb168f3978aef443fd36220d43173be0bb957e46331b4361f596455b96eb9025b8473e50e5db72f55fd2c3e9c524a";
+    sha512.source = "981d410ff16f9a3914c3b307d0927eb0beed863b9ca3cf6941a1c65e69c343df77d16ff7548e266710efd4fc09b8ce65d53d3e207e2e4a2de371be65de748368";
     license = [ "lppl13c" ];
     version = "2.0m";
-    sha512.run = "f2eb6b08182272cdd6c50b8587f77c6a9797b9ab2c8f577acb762d2fed95c1ad1daca9f097cd1471f4ef1d4cfa7ec250661b1e775ab0da4c486199a3fe2d98e7";
+    sha512.run = "cca7cf6d7bce3d3e1fdc2163575e9c03cb609783a315f52fbdcc7e03657c7aaac9f6b0349a75774b29e97b494c0ee09598c0aa8e5520dc2c894ea84c81e73439";
   };
   notespages = {
     revision = 76790;
@@ -36757,18 +36901,18 @@
     sha512.run = "73966b5bdb87d93b4bb3c138db6563683645a1878ed0d0502b045ebc8dffcdcf15b8fcebedae1b8bc822b5f05cff5565e90c6193a8634fa3b3a41683c9350882";
   };
   noto = {
-    revision = 64351;
+    revision = 77677;
     shortdesc = "Support for Noto fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map noto.map"
     ];
-    sha512.doc = "20b8371eec90440f2a491e1f34a0fce79b700e7b2f0aea2a808baaaf4e3275dd253b65d32429a78be6ed2b31b576f4291cc1f3cc2f625a675cd7a317bab90759";
+    sha512.doc = "4d1f5243975a4f15e8f63be228bd1896fd456fc72b7f7ccafa66d8dac95959810cf803d1ffeabd009be469a7aab3bf857c67e0a82be97df4acc30b0226a3710c";
     license = [
       "lppl13c"
       "ofl"
     ];
-    sha512.run = "6b1c2961ca9199ec9f0c9eb6e8c2ce61eda6d4eb0157ef292a176831df2df83bf09c3aea23825818ef5ed03128ba838f4377e42b53409c96d388422ce9dfd467";
+    sha512.run = "2e94b1490e1682391f66fe03ca46a70d2fa697eb71ae02b6d675a7b71b42c94e449f846fe459f3fd873450b1de5fd022bde96d8a96bb82e14db545800ccee5a6";
   };
   noto-emoji = {
     revision = 62950;
@@ -36780,27 +36924,27 @@
     sha512.run = "68400eedc7540f11c0d3649558ce14ac1bb0bf7f2ed56dfda355fa08c7bf37e947a4c48040075e52b4f4205250df2688a7de22fcbde8285ae4549deb5e02e263";
   };
   notoccite = {
-    revision = 75878;
+    revision = 77677;
     shortdesc = "Prevent trouble from citations in table of contents, etc.";
     stripPrefix = 0;
-    sha512.doc = "ef52f20f4f7594eb2840a321dd9a1a45bb51b59d0a60219e2902e5f0c3ddc5553d77ffc4fc76911b7038fe031568aab570236217d6e4b29d9f8553dbdb40e534";
+    sha512.doc = "b6b99f279f318245ce76cdd66d6388a9b941109079439fa5ce8b1019dc667cb43e39791d6c62620e2a7cf48c6c5ef745dc821fd9310671c5b51469097a793599";
     license = [ "publicDomain" ];
-    sha512.run = "d3fa20d048a34783c5956456567fb0717b9926cb3cbe719a70e9ebd230f8defdd1c9599e242ad30c5991f360c68986d1edb7a65d925ba6164d12cb9bd5ce85d6";
+    sha512.run = "a8e25c1206ee6fdc27a7c7bf34cc98bd92d9af706a7cc3c79f30aae22b5d2215009e0cf4fdc5ac123caec2ebb005a3ff27a2a128cc09e67b19940b9c1ae17bbe";
   };
   notomath = {
-    revision = 71429;
+    revision = 77677;
     shortdesc = "Math support for Noto fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map NotoMath.map"
     ];
-    sha512.doc = "0b17156c119b4e95292ec95e548be4ad5935cf1221b5481fa101a5bae97fca4143497926009f29a38f2ea6fbdd790b59efc281a46b9ae0a6e27e7ab22c8c099e";
+    sha512.doc = "fad7213d9592e6d9046e3a062a1c18c66085b8421ca5faf539f8eae0b9baf3099ac652d7367460eff83441364af289e0b231c0ee188cb788c1840f0882a786a9";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.031";
-    sha512.run = "a0f7c8aca592227a3f74dae79b935283524e69bd39f80c43ac13ed26f1b61e5c458d1057b70a41e3b80f0512995e0cb58dd2d7d9c51eb4cb9517bc0aa4d4ee14";
+    sha512.run = "d3c55306fe702457feb776800086a1d4d22a67d61a4d49a429c2ca5123e98422e875ffc4b45848df3824d2f4e93b7915bfe9cb8f4006408d9d2f2f4e4e8a8df9";
   };
   novabeamer-theme = {
     revision = 76924;
@@ -36812,26 +36956,26 @@
     sha512.run = "b4d8291085f11cf6998e60d37ced4f89da5b3c254b0b1ab897d16f73bf3c5c7565a2b95c3b70441224cb5bc87aa8b3712bd4a9bc9e3349a9a6768b55000e6364";
   };
   novel = {
-    revision = 71113;
+    revision = 77677;
     shortdesc = "Class for printing fiction, such as novels";
     stripPrefix = 0;
-    sha512.doc = "fcf975b3f241cbf783506fdef9cd635b35d9ef69336c9bb6179b27991f5e1dc77815c76020703412bafbc75102d43e4bbc437fe5e18513f8aebcfa5aa505c45e";
+    sha512.doc = "3221beeacd3f17b5ec846183cfffc8bce165e2b235c54f2e0ddc6dfeb6905c4d47ac1fbbc8e0f36301a31cbf3de52385035fa2915cf7b0b1e7babb2680cae2f9";
     license = [
       "lppl13c"
       "ofl"
     ];
     version = "2.2";
-    sha512.run = "0dfde92b5dc629cb39d1a6314a3aac29675667150db32f959215d344a538ac30a75e9d0ea5b81caad7d051944cb151c8fbf48d6ed523dd1a4f233647c32d6624";
+    sha512.run = "a59ae3ec24228ac7610c2827a30fc884dd8965943249d1c6515bdae25b3bb6e9fec8dcd08e79bc25c8add6008a9b4cd75a92c239799f56f0f5b25037373b7185";
   };
   nowidow = {
-    revision = 24066;
+    revision = 77677;
     shortdesc = "Avoid widows";
     stripPrefix = 0;
-    sha512.doc = "b11e2051543215f3f19c4d1e3398564093202be07771b7b3711e9ba5359e750bd8f73118b099f82fc3bb1e9a5f202027b168c371ca6587703d82f853ced4d538";
-    sha512.source = "862f3fcfb0a165473657d8e8616fa200a017c410e162bc8ce95376028fa4f2c0959e7d116152e73ba6c6cf4d39ad34d1c57f2320dc20f637e1d3a0e2cb2ec7b6";
+    sha512.doc = "ed6a4bd8fd632d94ce463947c397c3a6121b787d9afcbf7886f49a0abf07448ff6cdf5a3da581f1730d811e67209bb2ab28819bce6a9a80bbaa148838a1f1c32";
+    sha512.source = "e2d70903ab9b0a460ceb2e93ec2868eda6d9df0e12d8d5c5b5182315b09730eb4a11eaf301186560737a5ee8331be8db09c18bb3548488124843fb26de3d7faa";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "2dff380964c5c487a015073ade0cef996f5786b204657ec5c8948748f485c03b457f6d8caa5bce8148cdbba2623489a01b5370bcd38eb73469d07da4afb8a216";
+    sha512.run = "5100de802436f75bca9c4f2a2b4dce290a06af5ab6fcb0e4f997110cbc433b28bdebdad3d3a67633592ad79d2d8ad4b347609d86dffddfbd0d735934ccd498da";
   };
   nox = {
     revision = 30991;
@@ -36873,21 +37017,21 @@
     sha512.run = "745a44b97bf9aba75f1053bd2f146124c679cc3cbfd3ce8b74572269bb48b2acf208eec7c619516a622bf20d977a0abc78d3982c441541d911fe9c9b26328ac7";
   };
   nth = {
-    revision = 54252;
+    revision = 77677;
     shortdesc = "Generate English ordinal numbers";
     stripPrefix = 0;
     license = [ "publicDomain" ];
-    sha512.run = "e94365bee89f78b13ec22d8d34ac78aaf50f060f9282c0529d98518ce1e5b7f7995bd2da1d17654ed795f7555e7dcfd9d51399f4a83affc059eb3a760a76bf97";
+    sha512.run = "708a1dd7d78751eeafb1df8f6eff2348b53522b4754ed70f33bb90dd968cd1433f32639743a216e75d05d81807b95ae839d2b4d64b83576a7520efe789cf6a70";
   };
   ntheorem = {
-    revision = 27609;
+    revision = 77677;
     shortdesc = "Enhanced theorem environment";
     stripPrefix = 0;
-    sha512.doc = "fdea81cedc9ceca6ee29ee006867a05f018f210db2cb59c763adc4bc15db65a7e96ffc93bcd576a4c1a50e7e55d4b199132371686538216eba6fed65dce77ba1";
-    sha512.source = "bb0eb98e3344c4be782d113a0e5f1c91d615a5530e1c0a786938b1cf608fe8828d59d365c0d1011e62517f0f76139ea13bad1857f2e1315a2b919af1de3335d2";
+    sha512.doc = "292520347ff5045860048669bb66e2c5515d21f0401075b3471f2ead581f00fe6df877f2a6d21188c093986926dc7767f7dc45052baa11e009f1342df95a28a4";
+    sha512.source = "b6b73913cd97e8ae44e49c04585344f8a243f49a35281c9053422aa332bc01b0e78d3807e9307f5d9fe0aaf6c75f59cf4046a7f0841e6cdf8c396a8b89ed6913";
     license = [ "lppl13c" ];
     version = "1.33";
-    sha512.run = "aabab9d6f1a5d9e9bd2ee2ec4b9ca8200098a8f3dc786b9c06d4b0e00431dd66f32a254d452bce7e1bb595454e178dcdd71d724b8d835b6f1c9ad9de41107295";
+    sha512.run = "221f18caa52a26b6b720c775b78b842bf35b1ee4dca8e6f8b749d6a0414fe15678de971047024ccb25cb504ef2db83fefca0c89ba8de3a08752fa7b58c2477fa";
   };
   ntheorem-vn = {
     revision = 15878;
@@ -36945,13 +37089,13 @@
     sha512.run = "2b706bc56edf2d1c4e69e3d1bb4d0270f9b9208000b6d8158de1a28aa4c855a9e21699b33063fc05452921549b064bc036bf6b1367b6cf47fe17dea564274e7f";
   };
   numerica = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Numerically evaluate mathematical expressions in LaTeX form";
     stripPrefix = 0;
-    sha512.doc = "fef1894c0d393c8c49175863fbb1680b0ab43e36cddf426307c129fe489143dfb2e258a58a06d792744ce7ea0e1d1f4ff9d934cfd87935bb1b638b7570a295e4";
+    sha512.doc = "5d8e4e92ab7d4331337076f1ead7dbdad082d51f6e15c7856d864cb8c7d5d36ecddb5cace9c423bb9ed58fdd2d275e6c639629e0c7629b493242562cb0ccde91";
     license = [ "lppl13c" ];
     version = "3.0.0";
-    sha512.run = "30204e0ba5453c45e4af12c20a8d09d51e4e729033f68a9a4d87a9b06c87ae5e8add4684ed52f678fa200921b8e1fd49b4a6e7d54dde9b247fc7d46e28974f93";
+    sha512.run = "90c3bc45019ba0e3c0b86a837ff13d6afb5f7c9ba2923af90055c056108b0097a2dff93ac48ce5af61fe8a49b03ee9636f41b788f704264d88fbd010d959be0a";
   };
   numerica-plus = {
     revision = 76924;
@@ -36963,13 +37107,13 @@
     sha512.run = "590ec58c80a5c3862e50145bfaee832e081f92e6a5e370457c11479a7e62fd886b250ef5932b752667f60288700dd2b437364121b61583037576981c95ca1987";
   };
   numerica-tables = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Create multi-column tables of mathematical functions";
     stripPrefix = 0;
-    sha512.doc = "cfb29fb84d03af87e68f9819a6a7ab638296d1a6d5affba9f23591fdbb28dd5d3c69f9c84dfa6be5269791a6f7e9ccd7755d1b79b5cb8872e71b81ea581231a7";
+    sha512.doc = "0e467db25ccaeee8749576d74b4d4c9a48630786585fec4804151d67cd720b98f336048651e353c3437bb4a7fbd2b58dc0ae796a66065b1f2c615b13f76a5f0e";
     license = [ "lppl13c" ];
     version = "3.2.0";
-    sha512.run = "846f8c339f3e7f282441b6c5b09f3a1f289d442158747610b5d13645a89f2337721c454248cb685f8691b31d36071ea138c4dbba79e6779f76b5d3234a56c9fb";
+    sha512.run = "7e547dc66c0df61971dcb0abe2c16de53f8e30e370d4146cd022e4d24075074b6359427e119955f0cb5cebb44e7f3f9881130f03df63276ea29952958c579033";
   };
   numericplots = {
     revision = 31729;
@@ -36997,38 +37141,38 @@
     sha512.run = "c6f92a720fc5baf6f55c3bc18e22113de0f7cad8a051c2019360f5f3c64eaa450bb12d6c361c52a5a802f558ff8d2cbfaa35897682d6ad218e9adbbc788f3c57";
   };
   numprint = {
-    revision = 27498;
+    revision = 77677;
     shortdesc = "Print numbers with separators and exponent if necessary";
     stripPrefix = 0;
-    sha512.doc = "b821566e6fc532425c8f1b901b5613c763eb392461644850428707105626b6eb1a53784d6a693e7f9fe2aa612b72b4d5a38ddf65f22a0d022981771b2b303d04";
-    sha512.source = "d4af01527564c9818840a87d9c876ec8d8cf6e7712913ea3deae4012fd0d4f0dae19e4016fc205814620d1cf97f3c12b98f1003fc6fc81857101d2ecd90fbe83";
+    sha512.doc = "c99336eb1490c64f36c48fa348f1a080cecb0ae652ab91d17694bf622621d5994d8a639ef5018e00ead4c313e97c8a808bb8ead5a7455fa01c5141972b20d4f5";
+    sha512.source = "49c22c7b8c4acf947547ab0612ffa42148f48c8a3323a25d493551094806cdb3eb32c69bbfecc89234db0fdc95bae491a7a5dc93f704f2c9be69abdab080b465";
     license = [ "lppl13c" ];
     version = "1.39";
-    sha512.run = "cdebfa502a461292b02186b146ad8086f46447b5d8a0292fd7943d93a39796eff1710563866506679e903b7a4d415af9a8d863fa81a62395c7bdeec2cd68e66f";
+    sha512.run = "82e45a9dcecf5a53bc45998f4af0e2300a67a0d1b9e8be0c1003934f4a5bbc23541accc5b721db75bdc5c21de74990d41b5d251406349199002e155b14454640";
   };
   numspell = {
-    revision = 77303;
+    revision = 77677;
     shortdesc = "Spelling cardinal and ordinal numbers";
     stripPrefix = 0;
-    sha512.doc = "5cd20cfa469140d1205c2b6d07f644189c6ac32b4609276467e30a087be3792a2dfecf8e2b00307776b871d66637f71f42d93f921a28592fa70165be841a01a7";
+    sha512.doc = "46fc65673f3c3439704ddf53efb1e5a9b327420a3f85d1588321afac77ac264bc9f6a7ba1a0ef91a5a2446c1b457513d4cbfa36334a31670a839e3fd47c3f150";
     license = [ "lppl13c" ];
-    version = "1.8";
-    sha512.run = "bd53aae04e367d454114d8914a1d40f08d179d167d845a06bb9b850800d3c4c7a62dbb54fe6966b1e00b75e4ee4eb4c9344de5d206dd0278593d9cc9b6333f9a";
+    version = "1.9";
+    sha512.run = "15598df984d98a1d108dbdf7467176e9404c1567a9a7068c0e2726a95919e98fe61c1d75e002b610a900703cbeeaa61f74c934955edf7d440ec730db1c865aa6";
   };
   nunito = {
-    revision = 57429;
+    revision = 77677;
     shortdesc = "The Nunito font face with support for LaTeX and pdfLaTeX";
     stripPrefix = 0;
     fontMaps = [
       "Map Nunito.map"
     ];
-    sha512.doc = "e0de75f22da96d229a6465a4d47baa8e4c3199567f8d2e3255893e5b2a2d16ab73eabec1a103b355518c4cb98ea3146ff067af54938c21a910aa65aee3f429db";
+    sha512.doc = "aa2d35ec8f43c04686daed86f799b05ee8686af3ad406202924bb91cb7a6536131e77f693774432645e70f6e77ac2cf17fdf6eda7bfa66827d8d8ec0d0e1ac6a";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "0.0.1";
-    sha512.run = "920e074987e7e75fa6db92e3c05d76f7aad3e7d9b4f0166a8a8ca79bc5183549299b56a10f1cb6c7fdaa63f7f55aa6b9c1b2bcb4cbf03567b26e9fcb0240472e";
+    sha512.run = "2b77cedaba1be69c830d5622a972b999cc8e887ab22629c25544008b5abf1f5df304d24f1d572ee3cd4950e48514727647997a2350ad6258c8af5a19a8a3fc24";
   };
   nwafuthesis = {
     revision = 76924;
@@ -37041,14 +37185,14 @@
     sha512.run = "18afb43ca372821ab8c7026d68482426c161b5d7c271c26c3eb50a843eec7b52c4f0b772ce853a1d5ffcaf0223cf2a171237d33a6529018724e1cde1a71e6642";
   };
   nwejm = {
-    revision = 70597;
+    revision = 77985;
     shortdesc = "Support for the journal \"North-Western European Journal of Mathematics\"";
     stripPrefix = 0;
-    sha512.doc = "ba2e0269477698255ef53cbf23cf75e367c5e83dd5aa4d2ddc314813066691c2abd0b4fde044ff94ad281131152667e3530faf72eacde7ee4daca4944bd37e84";
-    sha512.source = "1c2940abd94c7b7d8ddc7990861dd52c00f03b6cd4690c1fb914bd01457e386c4e5a355fcc2d62509ccbdf760df17ff77b38a1996fedd3af2cc6bbecdf162f1e";
+    sha512.doc = "b56c5e511cf280ffd89c28a2f5fdf84c50264fba737af179e4e35ebf04e2b71adbb4690b841a4e6a2fe6e5531dda0cc49480e89a915d064ee4f1aaecdbae1e79";
+    sha512.source = "808abcd175bdcaa7db721313f95a632bd1f0825e453c63a5ebc961642fcf26c404b592e1e56594d7e553084cb2ac1e51d40b706f5b8d5821bb2705c860bf9e51";
     license = [ "lppl13c" ];
-    version = "1.0.6";
-    sha512.run = "a85cfb3be68ea38bedf7a21ee2b72c1274598e98d208958b884622b43cf2d3310b89b3b265a1a988b56903d8e954a971675d2cce3539cfd65b4d2079978e8442";
+    version = "2.1";
+    sha512.run = "337c673794a1f1f59bd06dbceba1f2869810843018a4985d454ff704948866136517b39bf8ab80dd663de45fb0fa99505c1c97557d6da3efb956b313cfaed47d";
   };
   nxuthesis = {
     revision = 74831;
@@ -37194,13 +37338,13 @@
     sha512.run = "57a0af92aea846e23c0dd05b896af1eb7538f0bc20e957ad3a528212101adf2a1e03bf661b0af2881320e4363edba32c0653a533c74b536d91e86e27666e14ed";
   };
   odsfile = {
-    revision = 76707;
+    revision = 77677;
     shortdesc = "Read OpenDocument Spreadsheet documents as LaTeX tables";
     stripPrefix = 0;
-    sha512.doc = "e14938a934f61fea31ab93ce69ca420887f3eb57e02f79c880323a86750c482e9e92fe32ef2b154f56dedf0d128d9fc0601dd094411383b7c5c1956b9638e763";
+    sha512.doc = "d526bbfa968c37c250670da712611bff2aa1a6309cae24047433e32cee73c6fb61749bfd22a5c38b550918af5362f2acd7a4371a5a5d219ee9d42ddc155ec3e6";
     license = [ "lppl13c" ];
     version = "0.10";
-    sha512.run = "86950b311b7faf43d068b7b5f5ea0561bd1f857203d1f45c80620312422ec4994243950fd51873c9a21e864d6ee9a9210be3e677a75c0f2804ac202f1ea8f139";
+    sha512.run = "fd237969928672e402a41837fb21ba82fa743423e9e17c8c88933ccc0cc2a0b5ee5854cf479335451e1e578afef08f985871723333601ce7f69cf9f13c32e8d4";
   };
   ofs = {
     revision = 16991;
@@ -37231,16 +37375,16 @@
     sha512.run = "4d6b72ce539766a3453f7edb24c243a2a495f3916ee9fd650917c510a0e8fe36e12399843c1de3dc0b0de704bf5362ea20e9bd0d6c3100e659c5641395d658dc";
   };
   old-arrows = {
-    revision = 42872;
+    revision = 77677;
     shortdesc = "Computer Modern old-style arrows with smaller arrowheads";
     stripPrefix = 0;
     fontMaps = [
       "Map oasy.map"
     ];
-    sha512.doc = "d142a95119386f85d1e6ff0f6a24bcf09b9bf7ec83a581ca43be67376cd4a44453d090e4eedf97bcba1026827eff29f97add3a6ed676833b02b718da4811a3ef";
+    sha512.doc = "e8301dae6065f11d57430652fcef56b5201ca6dc6fba74e30c32bd45b5cfe1cfbbddc5b4722df1c002c9098a2c3929c7ed6dd62a7ba31a286392ecdfd916c3b3";
     license = [ "lppl13c" ];
     version = "2.0";
-    sha512.run = "2b67317d41349c6d601d8ddcba6ba58cf503756f5bb2f4343c1447cbe4e24c8949a4de58e7cf3863a730bfa809dd09f5f1ce9944e3dc5d4de104e4817d6add17";
+    sha512.run = "fb74605fbc0fab28f7b4f3b531f45ef815f0adcfec2c537ca9e4b3c9bf74923ca22912c0790de8ac026dc05f1cbd78db17752b12f4f25de59c42e5ff9848a020";
   };
   oldlatin = {
     revision = 17932;
@@ -37419,19 +37563,19 @@
     sha512.run = "49801316886e654974d1a44c94f32f444ef513751192142cf013584d68cdb7054b0483113066e7cd31decd52f51b547ae29a11edd92f617aa8f190638adc9ff9";
   };
   opensans = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "The Open Sans font family, and LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map opensans.map"
     ];
-    sha512.doc = "00e5243e465d948b6bd63bfd161d4e549cc6e5b008a8cf8aff1ea5a31bc7a1406858c045cf6fb52c254d61869f1bcd5ef8c6a43ea66164e842fe3fcff2b26540";
+    sha512.doc = "ab577469d900aa5a78a45a9168536ec3898a99dfb73e9e98c190309c3d2d2b2ea569ff39259ff39c97906b1b91935290a9e3f4a224568a1a53ae76a99254e7b9";
     license = [
       "asl20"
       "lppl13c"
     ];
     version = "2.2";
-    sha512.run = "d92d10da8d6d8adfa62d440767ed1fa9abf413a575b122dff275eb2e46d501436edd90c215611cd943308f32a197c72b8fcdf56b72268f76237c2227cc9dd5ff";
+    sha512.run = "d0a7a5e7779659a739b693ed7d595ed21e7f5839df69be686f6a4e4713b7d5eeb8f268a6f6c479696313deb621f41f07b727912ec8aa2efe739817d75d9b972e";
   };
   oplotsymbl = {
     revision = 44951;
@@ -37452,7 +37596,7 @@
     sha512.run = "1af8edfbde5ac2abae770765a437bb42d5852877438d283d8021493c621e94d09bd62d9012556024ddecbeaddd838b37ae9abd0486d73e2698956ef49ab585e9";
   };
   optex = {
-    revision = 75314;
+    revision = 78183;
     shortdesc = "LuaTeX format based on Plain TeX and OPmac";
     deps = [
       "amsfonts"
@@ -37482,11 +37626,11 @@
         ];
       }
     ];
-    sha512.doc = "c08e1d769e2aed3b24b49f82fe28a7419d4f9fcd22ea678e6c37c07e3592a20c27e1c65bfd2b630d05b74cfab80a99957fcc66cb765f703b913dc15e0e5a9ff7";
+    sha512.doc = "17b507128ec95f7483d0bd5e971d1704fac68c50582a600dc3f0d6d88609ebc366fa4c4b86b138ed85f1dacaec2daa632f67d83edea1b75b18f8e6c8077fd10b";
     hasManpages = true;
     license = [ "publicDomain" ];
-    version = "1.18";
-    sha512.run = "495c6ce39878184a4b15fc95da0643e9d6768c1a6f1e457dddd18e2d5b1a3a6d660df6cef1fe2e083f6ed63b3f96f6cb212d4ea6535cd2ca25980dffbaad0b9c";
+    version = "1.19";
+    sha512.run = "9c3073d62445b3e655425bdd1b6aac28791d90a022d337f0898f0d69e42a315e8f071ae5cb59334390fe9b1bbffa15929c441ac65af083cfc7a8bf5242b561a5";
   };
   optex.binfiles = [
     "optex"
@@ -37513,22 +37657,22 @@
     sha512.run = "dfd704e585df8d01b279e67ea3a2baba6e86ddb9f38bc9747e370580a5f218e7ae4446d2429fc6bffc605ef0ea56c8077a8f41f3ca6a8e857df29d0e3f328143";
   };
   optikz = {
-    revision = 75922;
+    revision = 77919;
     shortdesc = "Customizable optical components for drawing laser setups and optical systems using TikZ";
     stripPrefix = 0;
-    sha512.doc = "225bc5d5826ad889d4df093be1ace357be8bdcf80cfff15eba104d950e895afb6836c0c4e43906ef8a1e86bfd999a28c7c0f2373946b85576dc43e80f5127055";
+    sha512.doc = "8c8ceec258e217d91f7359c7e47b257846674b25c7ad2ade5c39a4c3bab5f98c6c50a971bbec5d4036f856ae995b2928beac5f46edf007a841ec21f8618cf7f8";
     license = [ "lppl13c" ];
-    version = "1.0.0";
-    sha512.run = "9ebbcaad23df4368e98aac8990ce7e616057ba1c2959cd73a03cb8c5e255836a2d1189fb308fd581920c8efe8bea57ba12673b96dd0519ed8b179d99965772a1";
+    version = "1.1.0";
+    sha512.run = "6b2cc6008e8c5c5f5864535203968c58f566576666707e9c1d0cf3584610bc21beccda4164f6a8569b0affa047d253d1c409f697491d9c36f8b37781843658e4";
   };
   optional = {
-    revision = 18131;
+    revision = 77677;
     shortdesc = "Facilitate optional printing of parts of a document";
     stripPrefix = 0;
-    sha512.doc = "d975e4f1b31e2335e55a41b317096be36161fc36fd589255a461772eb701376ce3fe714d727c4de9663ed8e4300bf0b570855b6b3ccb6b55fccd56206ac69692";
+    sha512.doc = "6d05e9e88c4d13186408dc94394bb2c6c663e2b2d630c332186f72f2f8d68f6067f45768e6513b6dd1314300c082ac5f2a5a60821984e327e1ebeae544b11990";
     license = [ "lppl13c" ];
     version = "2.2b";
-    sha512.run = "3f6d031b4bf863a339a80c3a05b101393f88dcefb67c61a67e01d9647e74def1fbf30f3d018158a83c8a171b875959bf57d7a3e90dc724c32868f9aafcd5cabd";
+    sha512.run = "2e01a0f70aec9e482fe40b579edd948e0e4f3d53e1db369b3b2a1568bdd2f0c8aa9d927cce287842f1711830f2b8079aaa1249d90b86efcf338e65de5a545553";
   };
   options = {
     revision = 39030;
@@ -37540,14 +37684,14 @@
     sha512.run = "3cdcd07f3c279a601da49a843169f0cb44aea573ac6c1c67a347712e5a087df4b21c6481168407ac6383e8fd5cdc511ea29fd7ec944edd2d514ac88b560633a3";
   };
   orcidlink = {
-    revision = 71633;
+    revision = 77677;
     shortdesc = "Insert hyperlinked ORCiD logo";
     stripPrefix = 0;
-    sha512.doc = "bb5e127d32ab2a8392cc834dabbc626875f18b3e1360b9a34e5d350099c50c7cd9cb3eb937e5d9179473ac1f0889e05208a47d10087077ee7e29183a2b1b43a0";
-    sha512.source = "58963d56fe61a65da81c2b6071449d558d6683cd67370bd8580ada44ba0b3cc207ae538f9a41d172350fd4d7670c3341f736f23a4039f8920aa502f23c286cb2";
+    sha512.doc = "6847f26211913e61dfd30233ca7352527c172ed873b7428d3985ac27f37eba494a331af91f19e6556fd8d6a970722423b0b2f3cf5b7663cbd8debb58f014a4b2";
+    sha512.source = "5958011c9a99aa86ec0b409391631f87deae33c2d75c2d6fb318f2644a78a063f0d3ced73d5d49dfdd47a97b054dc368aebe09f306b4a99fa6bd703b759c42b6";
     license = [ "lppl13c" ];
     version = "1.1.0";
-    sha512.run = "08b3830095edaac2e4b7f97f188212ac86ab8aeedcac251540a90a5d360e01aa383a6c6e7c96c5dc0fb192090f2022a0641e876843c2b0cc158393420f3cee8c";
+    sha512.run = "bf32ed49958259a818afa46f3ec5a2861639435ab769c370d0d63f8a222f7b3c7dc8d2b1302259192a6ca76bab8eb0c2515e528181d5778367a3d5b73b763183";
   };
   ordinalpt = {
     revision = 15878;
@@ -37577,13 +37721,13 @@
     sha512.run = "c1e52283e54e4de7caccfe605438e2775ebacc9c3fd21c143e29d7966c591ccc3fba77019e4f9ed9850762a0c80475edb6c9142d7ac2e3ba54007f3dac8b056f";
   };
   oscola = {
-    revision = 54328;
+    revision = 77677;
     shortdesc = "BibLaTeX style for the Oxford Standard for the Citation of Legal Authorities";
     stripPrefix = 0;
-    sha512.doc = "6024d48e3b6f68037a68dc04051451be2ea7a952e5d8f55b9bd1160d11900751b5a58cc8662e5c38940bee01a442f3691a8cd8329ee4bd5749cf7698adf72cef";
+    sha512.doc = "1b7934be28d13dfc57e6394ac280d9b240551f79bcfff7490b9114d06879aa1731aa94dde89124fcdf4d46b0f8d01b604282573a5b4a5ad9392ed9bacd7bbaad";
     license = [ "lppl13c" ];
     version = "1.7";
-    sha512.run = "831e450ea6fa77f521eca76aaf281a0f7425e28d889c7bc919cd04c52a78c3a0665abf011ec4ef722f47e737c1dfb48f8aac231aa3f370d594cf5300d84c2456";
+    sha512.run = "16fea328fb068ed6ecb2d9e93fb2fde6539cf682bbb68e00723d6fbb7b1600d0d4fb1793090dbe22fbdc4dab83db6ed1104ef16bb5dbc7268cb3d603f8c8a8e4";
   };
   oststud = {
     revision = 67217;
@@ -37654,21 +37798,21 @@
     sha512.run = "18afb57a2b853545c7fbbf86421dd7cffa94d8d57b8c6a445b164f33f15c486a84a24ab89d5289d31fe8b872d09121714275f748f510cc476806156dcf5d3c4c";
   };
   oubraces = {
-    revision = 21833;
+    revision = 77677;
     shortdesc = "Braces over and under a formula";
     stripPrefix = 0;
-    sha512.doc = "c97f91df77f64d824605c56669136585b94d95031ed5a4a67f3404c54b2c96f32bafaecc06d114755d0e65c3fcd0379d63f28f94aa32ccb8d23730f5f3eaf63c";
+    sha512.doc = "fd4d982a7253e9d35116b25d375df179f0a064568003cc6df08b9a971c3deae27088936528f6f2b66c2a617d9715b82ef86b0a30102c65f29fadeb6466205a9d";
     license = [ "free" ];
-    sha512.run = "8a0a6e0648cc3dd9a342a960dec6512fc9153a083c8fc74eb08c4e0f46d091e5f2c71bdb69bae80fc13a857175ec6bab4b18cc81a0963d794028f4faedd0def3";
+    sha512.run = "52fe4b628a5f0537379ca85b18a4975eb9ec7d1e25c4348eb4dd4eefba2a6711f7c043d1e195ddf919f3c40254bf7b88ef9fbca6abb7906e0df8241bd7374cca";
   };
   oup-authoring-template = {
-    revision = 77463;
+    revision = 78222;
     shortdesc = "A general template for journals published by Oxford University Press (OUP)";
     stripPrefix = 0;
-    sha512.doc = "c944684d05bce213eec9dd89c627cfddc02ca9bc66720ca7bd275d99db9af3960d929d7ad5aae4d8bf2b3333b66fab4e84779b40b21c5c8cdad53dd9cc44cb54";
+    sha512.doc = "17a7bc076ceefe05f6fdb26a36b9f8bc58a4865acb732a9e4003f5b9f2370e337aae754556856e34d3b66e9792cf90c1032e65fd732469700e3ea381b9fe3f60";
     license = [ "lppl12" ];
     version = "1.2";
-    sha512.run = "7ee01c110318c71aaadf22b9ad6ae37c9d290dfa616255d008888298d603917167e75b998d680f3c6f9310b8ee46d9a1bebcd1ba2bd249e1c8d2ef90d2c8ae22";
+    sha512.run = "1e9ca9fa5a070a3818e27f04b299e1b69bfc62d8a67e233a74fd21965b911550d45ca44c1e062d44236a220c09b8ef6d2d0f2010983eb3659d4440d710ffd357";
   };
   outerhbox = {
     revision = 54254;
@@ -37705,13 +37849,13 @@
     sha512.run = "9251cb4154042c7620f545b2fb305cb996af9ff51c44259287a1f5ec490cd83bfb82321c4d8512ca2d22e5d2a7409ac5dad9f7a7d51f38a76bfe77faf2ca4af2";
   };
   outlines = {
-    revision = 25192;
+    revision = 77677;
     shortdesc = "Produce \"outline\" lists";
     stripPrefix = 0;
-    sha512.doc = "bdc507a3f3cb966d03df37d9385145811c5750bce6341935231ae987b0a30dd65424a1bbb772920586721e25711caa429cd6d8b8149088f753f36b9dd69ddaac";
+    sha512.doc = "dc45c7b923a72dec402e57dfe2d621fbfa096c8533f4035bce7c52e38320f77d01ecc20935b5448eacc554459d1f34c4a6b944eb831523019d6140ac6dbb263a";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "1611e4ba3b8fe21db83a542da9d7e0c3431330bc24e3733d28c8c5b3172ce3e4b46ff5b7dda41f95b4edb6502236f6d558608487ac47f8726420a2afafed75db";
+    sha512.run = "b46827aa0f9463a297d2e1df5e82d67fe45906b7e07ff7a76f0e871987e0d2f07171f876d45560ecb63f1ecbbcfdc492d98dc448662f6099f9c85878b0f0968b";
   };
   outlining = {
     revision = 45601;
@@ -37756,34 +37900,34 @@
     sha512.run = "93d1b7bff165da32f509e820cf88c08e8dc17ae688814a6913357ad9884ecf9fe94334be82e54c4e902935fcc38a6dab5687a3f5d4e333268d03df8e977611b6";
   };
   overlock = {
-    revision = 64495;
+    revision = 77677;
     shortdesc = "Overlock sans fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map overlock.map"
     ];
-    sha512.doc = "44aec04d96e2867a074ca1ac85fb3449cd276d6a14c893c8cd73dfaa91e60ef5f98ec7ed3859cc57efe746ae1454a5fcd01b44ac580369a87f69bf5cff3e3b22";
+    sha512.doc = "4b2fdf8a3f7686d1a9775fdfed783e06baba656c3f9cb0bc888b488545d320afc0e7ee7c73335e06d176677cf90796dd3d6d2f8cce78c12f7ad02a745ad32291";
     license = [ "ofl" ];
-    sha512.run = "0c934c6f34922772336f39dae801a83c705197d7a7dbcf95cb890c25b8209697b3cfacc6899c57016ff32066979b665198d30ae45caf60748599e4c6ac052ad2";
+    sha512.run = "36a01a585455c231b083cac5dac6d942722a9873e1a7215ea8d7a0aa5c8bdf52a84efb51ed2ea02585bb54b8a68a114ac316383861d673ac92f6e022da403b73";
   };
   overpic = {
-    revision = 77296;
+    revision = 77677;
     shortdesc = "Combine LaTeX commands over included graphics";
     stripPrefix = 0;
-    sha512.doc = "55fc3964dad79cf50f060bd7cd6e95de12e3ccdb2dc4f05e01fb59588454953e75be9de91a192b845ffbb9ec27ead55833317b447ed4640cad3688a1dd2df282";
-    sha512.source = "633908124407b5fb351af9d818b3ccc29a0d4916a980839779373d68e80f7e77170d5c391099d18b215be9cc1a87666762a53c1fb36835c8e536a5775cc89f84";
+    sha512.doc = "99a7c3b7d056f50bcf98170f23eb92e0faf23fe0e1cf77ee9642bebc860183158a4f7995abc8c4e1cf1ce80b87154e89a3759ee4e8d63e0fa65c1254f9968514";
+    sha512.source = "694550fa266174e50432b2e7785c35ba93bdd1e872af01d1d164605c97a3161192c0454a76076e3ad38e0e1c946079a96a9632cfa224769fa9c7a327dd44cd75";
     license = [ "lppl13c" ];
     version = "2.2";
-    sha512.run = "fa4ff14c528acec40ebc51431c788e39ee3ef9cc58ad8fce3595840f0af92b6d04d0176abbcb08c4e07afa25fb8849af3bd3a4fce0ddd903e64371ad152bc10b";
+    sha512.run = "4a7628d5f04a2afdd38636dbd001ced31b898f49ceff4e998c7a5535cdad0311588e4cf4685ac4f7df4840ae872a4ca1f4b7626f83b954495cd169687fd25c28";
   };
   pacioli = {
-    revision = 24947;
+    revision = 77677;
     shortdesc = "Fonts designed by Fra Luca de Pacioli in 1497";
     stripPrefix = 0;
-    sha512.doc = "fa911ec25c0d6cfa62a2d5396aedf893b9078604611ae5d34b06f24740f65fd62895e4d53a10931071d19ddd24244e3c7ee9893f4eff03efd0920fd1c1626610";
-    sha512.source = "d9347b85cd548f5861b83ef2f213760805c3cb76fe0313f02935bf28baae72caf2d548459aed2acb7ad5061e49c6e6694e46e88bccc1164e83f63a6f97045d04";
+    sha512.doc = "63f854e0a15baac4a0fb629127cc52d9159e47c1de8eb001572d7e100674f69e23f54c45bf7fa33132079b4074008d3b71a564d1d7eb54079c441b7e96a7c812";
+    sha512.source = "e864eaa8e3c5cabb8de4a0a7495dcccd72c3407276899429de516a1dff3c5642c985c9a774720a003b65eab4d3f6e4b09b041126cedd87fcb6967845c5360161";
     license = [ "lppl13c" ];
-    sha512.run = "a82b391630b5f572d8ded331ae98f480fb0cf7f3eaefdcab3100bc839e2b026f012320e334e82d04e01a27657f36927a4d1570086899ad637f8c47ddd0f22b2f";
+    sha512.run = "d7217a4291dd59f39e61ad3fff41df6d29152de5ff06a0ae91386dea4e2afe298e23f4b207843dec9b8651ec70e94a4a142b72938bfa75e7aabb179e98f67ed2";
   };
   packdoc = {
     revision = 73661;
@@ -37819,14 +37963,14 @@
     sha512.run = "9378dbaa1d3a569a3cb4bd70fa1b5a6dcdb0fe089d3a2c3eecef4cfdb776607f42b7fb018461c00781f8b022dd962e790146297f5df29889db13794e25c1cbb0";
   };
   pagecolor = {
-    revision = 73636;
+    revision = 77677;
     shortdesc = "Interrogate page color";
     stripPrefix = 0;
-    sha512.doc = "b47938c8ea0250ab39a731956756c481645f48d22b3236f743a38c70a86c892079376be1a5d40e2d1a85c13f9b71f85fc1a02d8206cc1aa7ff134e87b7a50e1b";
-    sha512.source = "dbb2444d545ac42c69ec64bf5e54b184e657faf8c2d86d255f91da61c99242075e528d55339867bfb73dfebcbeb6a57e7632aa360ad763dce95d154eda25bb2b";
+    sha512.doc = "25e74dca1adaba1d5a0b9cfedc6c3ca7d9914ca404ffc3411e9006c5d6cc6d182ba87e3e2aeaa6b84da75ae955a796323786ee8ed8ca2a22c72b8ee3797d3e00";
+    sha512.source = "7c9c3fa1af71526317d1127568b130cc8293c6f71f3e8a2f5a8bed7ee97e6357c4b39fd8ee8b696fc554f462a5fd583a5dfe11a79bfb83b68d7c30783369effa";
     license = [ "lppl13c" ];
     version = "1.2d";
-    sha512.run = "f300b2c0a56e48427f0291e63c3aecdc96fcf8b01438d9b5b97aaea33364515549e4478b41c3527a977db81002ad0a7bbe6718fe2a54acf9a18688f173a7a41c";
+    sha512.run = "cd674a42da709f0dc5bdbe766aa96cd8e8e620ef1910dd5fc264d74f1cfda3bf9d29d3b34a04d7d1ede9f5d36648bfc20c71d52a3ff1b1063e8d75efc1dc23e2";
   };
   pagecont = {
     revision = 15878;
@@ -37839,14 +37983,14 @@
     sha512.run = "53b0f558c6198181349a66b39f0b54108a931279766882bfb713390e79ad0f62218ed841416e143c6909161ffec548592ffccb337505eba61f643a05d49f1fa6";
   };
   pagegrid = {
-    revision = 64470;
+    revision = 77677;
     shortdesc = "Print page grid in background";
     stripPrefix = 0;
-    sha512.doc = "3c5d05229ac51f2013017372cbe1df54709b604e170bc4aefdf26a1a017ded6124fba4922ec7609f72c059e45e1ebf1a1eb838c89f4c1564c518469333afb5ba";
-    sha512.source = "f9f5f7ef9f3b0509ae0f52fbb9afaafd96396777862c2976550ceefb88d10feb7eeabec2dca561f5a55ce5f4ae6034be4db94da07209652bc6a85f5b4f2b4a56";
+    sha512.doc = "1a880610af5ba80c787f7ab460a8aced17f159460e836fa0090589144b1aee1cfb826674df3f08fd2ebae8bf9c16ddf24ae83dedda3c2f4ddf51c6fa2ad6878e";
+    sha512.source = "49050ea1c54baa89ea9adfb4c4e8a06bdddc63b1e5a91c561e84b43ce559eccd6e1d2173f32cd60c2b97bad1ba25260ffa2208c14db023b890492c4f21aac3d7";
     license = [ "lppl13c" ];
     version = "1.6";
-    sha512.run = "587c09867ebe999b3490d2b6dbd541acf4631a3d40ce1c0dd102b3ca4801ba5774f60ae86f27cd34bf32f324d54bef305f365cc1a8565ab54d84925861082b8e";
+    sha512.run = "a86ca6a3c2746e5561a9c3db8dca269030d1b4e1bcbe81397e6a771e4f9e5f9b6823d9ae0cad62188ea3c583484b643cc9f9599a2bf7c6523c6e746f95f32382";
   };
   pagelayout = {
     revision = 71937;
@@ -37862,23 +38006,23 @@
     "textestvis"
   ];
   pagella-otf = {
-    revision = 64705;
+    revision = 77677;
     shortdesc = "Using the OpenType fonts TeX Gyre Pagella";
     stripPrefix = 0;
-    sha512.doc = "6cc07f42d696c04156c0da6610ceb562174dd5e00d1eba96c7b1813e86b53081245e45f835309db257cb1d157d6a77a3d453ea1f689400cab9fc08cbda21b8ef";
+    sha512.doc = "cea8d72fed511d9ea9924502e930d0151aac63181b90a2c4524aa69dfd16159da879bf0854bf6e301eb460afa71dc8d99186dfcc893a1bfe534518051c5202af";
     license = [ "lppl13c" ];
     version = "0.02";
-    sha512.run = "feec3cb6db5c10b2ae3d4d4e58cd21b1e425be368e3002914823120b1396622fd2e6de09bf0a892759f3e9629deaa1c419da59bb858dc1263cc271fb33d46564";
+    sha512.run = "5b7dda75f9a1fa0f9d31136d2191e249c85de6ffcaf75adeef60ed27c31f9f2ceac1fe3a44061995c70d2c70e91e688eb198720fd28df84d3f7abf078d966a8b";
   };
   pagenote = {
-    revision = 63708;
+    revision = 77677;
     shortdesc = "Notes at end of document";
     stripPrefix = 0;
-    sha512.doc = "20ac52f56753f0166829aea56e2b1514a34f67eea08ac8f2fbc505dcb046d2cc4168156b8db8691b426e35bbc83295454eb299a443e44d236fd31b695bb8bb44";
-    sha512.source = "1926eca304ce92b3ec5fe2e06fc62a2bd8a7bdb45038050b5cf0871b35265f7149803ab32a28af057b7c3c1ff0deecdf0ae6cd4afb950d45679624a317b68651";
+    sha512.doc = "51814f8bfcd2d1bf2bd24934c080b18a4b0fc4df72ad6fc8d1bd63b0261e0259d828c72dcdc7b72fbcfc27bce24bdc3e17af097cc386cdd18377b1bedc5851cc";
+    sha512.source = "1ab6d5a16a919c8a64d8a3dfeb6ea1ee53c84f8ef4bff60a779541cc6a0d189633afe90efaaecf0cb9843ccfa44c1d62a445c3aad80d35d12a3e762b56687dc8";
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "085f824f879091e479635e2da9d375f51217f00dca5cc51f6b3dfa43e8a54197e4f2bb0f1748e7fa5dfdb522afcf177c67c9e47f4a9e756ba71ba6394fcd56da";
+    sha512.run = "932c7534954ff550eeeb7e033b5296b30628183e7a095481a43923c08512243c6440f70b135a42c07fac127cce63ed5310961a5192e6031c969186b7de8070cf";
   };
   pagerange = {
     revision = 16915;
@@ -37890,14 +38034,14 @@
     sha512.run = "9216d443f44deba5cfc4ce04174031cae55f2adffa0f3400bf3f315c3b9003d1ee015fb6df69cb2cba23eb117f2ed191b7033ad46a51bc718260a44778783c47";
   };
   pagesel = {
-    revision = 75712;
+    revision = 77677;
     shortdesc = "Select pages of a document for output";
     stripPrefix = 0;
-    sha512.doc = "320f133e0dd94b9ec89b04c84b56d0e1e7344f4971a9b19946438a5bbc061820d472e3155c0d630b5c08ad7fb7ad11f7ce2f6bcc81978cdd6c9d3f1351b16723";
-    sha512.source = "e41ceb7adafbd767056dc1fa36aa7829ce031b743242528ae15c151c8bacb2f2019d9c51f7f81749c6a10be0de0cfafb15b57afea4c26e8183ea9f7d9a47820d";
+    sha512.doc = "f44140f124e9d53a04ba8686a841494f08b0ef6f504032bc369c5f1770ee7ea83becd59a738f0fcf0f0db39fdd30be1bd6def392f8c0c253e57edebf938ad54f";
+    sha512.source = "efb116fcc46195ae417ecc97d1b2ba785a4292b59380fc1a3f9db6c805ea42d788ba1e0dade6121289af722e5162f8c3ab76d4e1e229e928b45929ebed5f0ac6";
     license = [ "lppl13c" ];
     version = "1.10";
-    sha512.run = "095ccf2d8d01c48865e6cef5941693e2d0ef8d514a16f57acca685139aaef3d8243e04b9cc2a904e0b06da7916e00867c74a806e229a2be65f115ac4759739f0";
+    sha512.run = "ff37ebccebdea4807b177dabdc48c86696d59becda4bfcdccc8f69ea10bb6c6ba51ab757223041efb22b43419c62de9db21480a3701058b380fa8d30518963b1";
   };
   pageslts = {
     revision = 76054;
@@ -37931,13 +38075,13 @@
     sha512.run = "0583223e81139040de67fa9a1fd93479dd2024c19d34e775a71b9fc03d7b01799c2dd58736d431307cb067d2d3130fb495aaa002425a8c0c80ddbc3e33679693";
   };
   panda = {
-    revision = 76538;
+    revision = 78116;
     shortdesc = "A package to estimate the blackness of fonts";
     stripPrefix = 0;
-    sha512.doc = "9cb921dd13bf3bc56206da51d43c3323e4bbfb70ba775e563d4fab00c7cb14f633e193f785ee5c30f2ee37205034be7d51ce857ced63e87cf29bcf985a25ca49";
+    sha512.doc = "05ee9869421f842bd3f151d13dec8dd2b317623257330a6b47a32bf533870814f9436a9c5ddbcb04ed42d7c2f56cd7c09f99a70c1306b8ad12ebc1db51dda1a4";
     license = [ "lppl13c" ];
-    version = "0.2";
-    sha512.run = "13e06d47f40ed5d0962496889d3829e9c08cf4449ef51021d6b4b2a12ab923498712024d537e850917180bdd4d541cc56573c32b308468d4302bc428eaad5e26";
+    version = "0.3";
+    sha512.run = "8c00a4ab2c584b261d6b3a28e8bd1639ccfc7468dda75732b3971d5f4e08ab38f5122a6716963acfe0442d4f8f34ca4a3a0647e7b296a2fd1c3f0d7c4c0d6b1c";
   };
   pangram = {
     revision = 76924;
@@ -38010,14 +38154,14 @@
     sha512.run = "1ae608c0c0f0273bcb95e6ddaf39bf482c69d40d25945530ae4fdd7d5c4cba5b61046f7a28b5b93727f6a0ca62c302a51dc58d5d02b47f23d28bbb1c30f95b2f";
   };
   paracol = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Multiple columns with texts \"in parallel\"";
     stripPrefix = 0;
-    sha512.doc = "ebafca1cae08d594b214157f2c358eb474d3dc7ee8f92bcead5926293ff85db7f18dc3ee80147f2c16e9d4068d70e7ce360d2cb46819970675b47e32f00d168c";
-    sha512.source = "193386ef92a28a4ff7a3c4a11860b22738f6500901fd536181361dfc9c5ad193ad3483c9269fee2e12271fac7ddf168a14e33e55a2ff0925fbbe6145127a18e3";
+    sha512.doc = "d7cdf0171bc947cd2a0de105f3944f3ac0f7198c5101cf12717b14b52f42d93932f173aee060c04939938a4fe4ec88b318a11c30a5690b9e8183ac378b334921";
+    sha512.source = "a58fa1721ab2666113aad1646cb7de40141e2d2ef3e8062be442a0315f7d86129e4486cd42e067d0f4fa4f2885ab6d2d28976abb592632e8f09ea75f729705e9";
     license = [ "lppl13c" ];
     version = "1.37";
-    sha512.run = "6a5b20bb8fcecf2a29948438bfabf7852908e997db50ff7fab76be1fea5d98c03e88885e7cc5ed488db12a7bd89cb47dcccb4618b401a20242f1cdc858412c59";
+    sha512.run = "ad69cebe2ef6a436d7809e925f029ab151e5321c9f24a7dca35bbb1f37f07e182eda84ac95dd933c6a4a90c6adb7869ba25e23c13d51ed67780d36be9b52df45";
   };
   parades = {
     revision = 40042;
@@ -38028,23 +38172,23 @@
     sha512.run = "6eda005756083b1ca0c1ee09efe44830874d8090c25aaddb8d6631284a057130d2f03ca7f88b460fbeb7bea90ad31da8242028a70b07f6a66bfb978cd7390e26";
   };
   paralist = {
-    revision = 43021;
+    revision = 77677;
     shortdesc = "Enumerate and itemize within paragraphs";
     stripPrefix = 0;
-    sha512.doc = "5f103c629d1c0bb94aaf6c86f7baefe3e99a854e764306cd21e256011ae5ed95601416e33677f73f6471bf4ce2a375b6dc98b8aaf35b8dab1c41ca91b7ec3ec5";
-    sha512.source = "1cb11b8e7792df9be259e1a5ef3b2efdc85b5454265deb66e2a527c4696d7e9297e2022d5191b1d666996f1be1f638517ce4441d0bb696f6b33ae490f4138e78";
+    sha512.doc = "9e6430fa1abadedb11c24bbf62e7961edfb2db951443d0671464a9b5307f25a7bd9bddaf7a7462eb87fe3b110e690251564d84adfab4d8d175a57d07aa75e98f";
+    sha512.source = "b24ead648e289fafcf7326f84b6995bc6a54cc04502093af4d071fcb1629272364236e011bec40489fcca2ccf2dea491656f15762b24113a07f525402d7879f1";
     license = [ "lppl13c" ];
     version = "2.7";
-    sha512.run = "e05bbd65ae7146515dd5dcc6ad7e40fc8437fae29ee26861aa9c2b4b6da0015fc00974f0a2328a72e6487660794a822bb64b35ea3282eac980c3e7fd23f4b899";
+    sha512.run = "6605adaf1f816b05de863ef2439dc9b473a813006d9d9bf6a449f03a2aa053b83cb5989098ca925ef50298faf058971ec40b0b9276a797d5b5d5d8e5ac468692";
   };
   parallel = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Typeset parallel texts";
     stripPrefix = 0;
-    sha512.doc = "ab4c283176cf1fd3d524151cc647c1da360a1772e57b282a91007edb1269d6bade379775d0efe6731fee18b3f3bc02292057d67795475a291a4dadc748d5b185";
-    sha512.source = "6dde2ae1a2ee65decf5c1ba547d2683948d58a7955b75e5a3bd74d0b6705e7c6a75f2fe4dbed01562211b670d455a0360d0fff3ac0f24e3e77b4bb01a65577b5";
+    sha512.doc = "f8d9697d7360205c4603d24d2e355977a29f907040da077ac4ea48682bcb896d16c3af8cd18dd64de6088924b7a59da8dd95ef7c8b99ab77211e624ff59cb9c3";
+    sha512.source = "edfceeb74866ccbbb2965e471f699cd0a66978af4280c1d08686286d365aedc70813549ede4779e93f7fad6708b32af327cae0ff7090eed21f5040e8cbf6e506";
     license = [ "lppl13c" ];
-    sha512.run = "975bb869ea0df9236f0e86cbfe880e9bd59ab2d6aeb98f0a399f5bfc7e4367b3f14eb64e707e4e7ba8bd3e0ee641765b9ddfd79ee1abac61f96414f215fa5cbf";
+    sha512.run = "3a082d59f0b1694cbae2d90ba2ad7c0651bb19c7888c08899c47d7a06c3531e26fd8779f2fecddc78fad92e24d870afd7200dbd07cf898d4e05b4f6e3b9c5286";
   };
   paramcalc = {
     revision = 77518;
@@ -38057,15 +38201,15 @@
     sha512.run = "2f450e00371bf416dea1488a3fdc44840215cc6bca41ccdbb15ff6521503ed32906bda20c0f39bff5ab393c2d880aa256416d20e73493353e032128cfa0ae0c9";
   };
   paratype = {
-    revision = 68624;
+    revision = 77677;
     shortdesc = "LaTeX support for free fonts by ParaType";
     stripPrefix = 0;
     fontMaps = [
       "Map paratype-type1.map"
     ];
-    sha512.doc = "ba91b90030c703dc35a77b9a51a23d90e5cd6f0a6490f74e151023248b05a6a0ea5bcf188e3c8e69611b9b7d5f72b4569538a9da02193ca737e94e744c83c107";
+    sha512.doc = "8fc25f79703005d294966e882ecc201313256842a0fc2c9d829efef620620204bfa5004e632fe0c939158be07bac17effbad196374d3cfb58557aefef1c053c7";
     license = [ "lppl13c" ];
-    sha512.run = "b6f50e5c3063357e04e94a9454cc34b17e522c54effe14696d3d81e6de1f4732953b608c0c0d13965dde5c9c95e125d967afc888ecc9396001c1deb89e9b70ef";
+    sha512.run = "57a47875e048c25e4f18a7be793725f319ee7f4f0a212f0819bcb84fed0659209e1cc43038ea31a08e1f707709c495c655b0b7197e9fdcdf8d03689386d1b36e";
   };
   paresse = {
     revision = 76924;
@@ -38078,13 +38222,13 @@
     sha512.run = "f6a7c3fa0c83421a56d93c2136c9e3bb1ed5e571c3cff2633a8a27250f8068500fee7bf9145c4ca73bae7b8fa8cd1574cbc74c9d256609e128cf0e177c680343";
   };
   parnotes = {
-    revision = 71505;
+    revision = 77677;
     shortdesc = "Notes after every paragraph (or elsewhere)";
     stripPrefix = 0;
-    sha512.doc = "469080a30bf2ada203045fa535f004b8d88ab44c43def6316189220c1ab2c7e150b35df6936be991098d715f0118b59a06b21c09c5d34f5f9a6d55eb2e86b9d9";
+    sha512.doc = "58ade3aa82075dd419227592099331840c8a1acbcbe5c6a95ddd7068af45441332be6c000a6b4d8bce85f61921dbf9bff095d7177d6d88010669bf30a432500c";
     license = [ "lppl13c" ];
     version = "3c";
-    sha512.run = "0d05b1317feb0264a861ba9a6ca81d839fd51c8f7a5e77221368578618ac2ecc5f393bf0669c25d4bd81f415ae1bb7f0a29c85054fc63160f38902b97f8f9ee7";
+    sha512.run = "93778c8631cef83555f3592f8173f960506022dd15e5ab5912666ffb8342456e60165dc93b0c66f15dd03adb548d9f7c65678b0a28ecc1763acb425fc2f2caa3";
   };
   parrun = {
     revision = 15878;
@@ -38133,14 +38277,14 @@
     sha512.run = "43a80f0359b6cf22c00338901dd71e843fd57d154981fd33673c4d0f97118e63e39079bd3576fea7bceec7b1a58f67ae28a32b077a73303256c8f1abe9b1c46f";
   };
   parskip = {
-    revision = 58358;
+    revision = 77677;
     shortdesc = "Layout with zero \\parindent, non-zero \\parskip";
     stripPrefix = 0;
-    sha512.doc = "759e9e8d698f8ad77ce388ec127f158a7280586338c6e56e1f9188a9a2e8106cb482f8ebc4e252749331e65ac2a771884124b16e3ea5e9ac76005439ca85876b";
-    sha512.source = "4783fdc97f269963e4d5998b2d8066a676f371f5034bf5204bc9e5935928f153dc0a4aaaeb11a403baa0631d545a18a1cc19dec4ee42314e1f33b239a9cbeeaf";
+    sha512.doc = "461dea69f181ae33de83c2bec3817526efb546441142fa4c6834ade771e8218ce9c3573334930e7efb565dacb54889f795c78535f0c53be43cb2dc1913e29d01";
+    sha512.source = "a397194d8e0c3676a9cad1fc901eb325bfadc1304fc3725b1c7c8d7f3547b7d5c8d61cb97402082ad91101afcbca9b5fa696aa6c2af710a15e105693b442b583";
     license = [ "lppl13c" ];
     version = "2.0h";
-    sha512.run = "2d64232f41b2607712bc67ce77ebc987502924ebaad4f799b6ae2163862a8b833a9c1a7c8871a33b4ed9fdeb74c8368897e1b831c485ab82e084fe3ff0552af3";
+    sha512.run = "1cead340c0f513cef0869fbf8f5a8a159b2e844cc57e2d53efbfcd8daec544d417b147b6da78303dfd8a19404b4f180801a4188c6c5fd16af9c96f1db2e3b882";
   };
   parstat = {
     revision = 77123;
@@ -38220,14 +38364,14 @@
     license = [ "lppl13c" ];
   };
   patchcmd = {
-    revision = 41379;
+    revision = 78116;
     shortdesc = "Change the definition of an existing command";
     stripPrefix = 0;
-    sha512.doc = "3c65e6b1fe2b25efb45853deb5b3111dbfa03de7c0b154fcd86719a81bbf725e1872a6e6b5a9955e63f410ff3c05bce5de336f4ab1e612ea0d82b8d44d5fe960";
-    sha512.source = "d3effea39c2dd33c9b40dd12304973d2d96457bea7b7f233f196c2ad0ca9819e57b38ab7b44e9532350b6c1cb519b184882ea924dc198dbaadf185ac177bea63";
+    sha512.doc = "d97b133ef5e53f854fed6a170306c246bdc2e6cdf0e0c7741b18a5535d2bada8111e7f9da8f2f584e1d9963296a6b54148828053a4570aa78aeb35c6b37276a6";
+    sha512.source = "5781e2118f4b7078bdf7622eadb8cd3e29bc0150440558e1998749c3990ee5c083aabea63dab0695af8b29aa53df958169794903e9534ca30a548f2f43bbf64b";
     license = [ "lppl13c" ];
     version = "1.05";
-    sha512.run = "a98085cb274c189644fa1307cf4ab5949a9eda76936fd6b74a7ba366b04d58b2a213c1a5ede53f644bdb76d44eeccd919176fb1934b8eda55489fee16f0c349b";
+    sha512.run = "d100bc9f4f4aedea121c6f3013489558b9e30f614cee5528c05614cc683cd328b81dcd00c04043edb1474bf8874d9034e1d4fe023f07a421da38ec8671d024ee";
   };
   patgen = {
     revision = 73848;
@@ -38252,13 +38396,13 @@
     version = "1.1";
   };
   path = {
-    revision = 22045;
+    revision = 77677;
     shortdesc = "Typeset paths, making them breakable";
     stripPrefix = 0;
-    sha512.doc = "e52367b81b9042af70e940aab99fa13140c31d58768ce94fb86df74ec9b52fb365168e7e325d8b2e304094e5a35fbd9fd687305062b5b606bb9e5748f143ac2f";
+    sha512.doc = "4d810f52fc26e3179344d222dce4fd29b58defc06653ab387a801edc4c0900ace903a1e59bde6a11f6d8dfab9a3cf0a042d76fbbe9f48860de06552186fbcaa8";
     license = [ "free" ];
     version = "3.05";
-    sha512.run = "6a1fad600e4683476206385504ab5fb916caecc1101ac903d23042c25e055c6d4a73b85a57a3293929b1effd7d4af6db26c36ff994d76efd1c4f81073cee785a";
+    sha512.run = "fdd074bed839d6ef53ff8cb6c9fefd9993d6b6ca5697b93c377036c91f75ec9292b5b0dc4f043e6ffffe3040708a22bf87e29da1940979293f55ea8c99df29ef";
   };
   pats-resume = {
     revision = 74532;
@@ -38340,14 +38484,14 @@
     license = [ "bsd3" ];
   };
   pbox = {
-    revision = 24807;
+    revision = 77677;
     shortdesc = "A variable-width \\parbox command";
     stripPrefix = 0;
-    sha512.doc = "1955a1cd5336a7d71483f49bbc8c65426485fd38447282262b58b4633398cda0753c5574455421b19d92d5c88c599f9c227b54a7c340a35daf233a4f48a1c276";
-    sha512.source = "67cf5bae9494a81b97738ca8ed5877c009d631cb8ac681915559bc4919f536c657fe4e3ade36b8e4a0ee3b614ca4a23bde8a9cae19f3a9aca12cb2e3926160b1";
+    sha512.doc = "f4e83d4f4466ac432e14b33c9b329370c6d7d2b8a8552e861ce572391c9fcf371e3dd4b1568f48c32d09547df2ff7b11b504bcd10974c761279b4d7124807cfa";
+    sha512.source = "e77307ccbdc2d8fca34e0a04d69c683e81e75f9c8d5434aad4291bac75b46a63c4478dc53ac080e2d342abbc56a975ad4728932153f9259bc68eaea6a6f1e163";
     license = [ "gpl2Only" ];
     version = "1.2";
-    sha512.run = "cf2ea3781aac3d0b8619c46513bf9894c4b4efd8ba89eefe2e5fbe4e8f82fedd3b17f64467598080a577c65cc21713671c68763ff2600ce24fb6f6ddfae83a3e";
+    sha512.run = "640b5b864eea85afc6902b19c01e4a7bede9033d725139f0be860d1da8393c18d8fe9d95a7901e0064b3afe7bc021a913988a1cab514a019e8764444ca2a6f55";
   };
   pbsheet = {
     revision = 24830;
@@ -38419,14 +38563,14 @@
     sha512.run = "c9d9350a68513b9c7fd1d99138cf93aad74b76ebac4e5a55de483501bc5a6ac42a366e60e15a6d7e81149355dd6ea87b968bb070e05f04848e4a167422f645c1";
   };
   pdfcolfoot = {
-    revision = 75712;
+    revision = 77677;
     shortdesc = "Separate color stack for footnotes with pdfTeX";
     stripPrefix = 0;
-    sha512.doc = "e884f4c95ebc0517b59ec22c2f5ecafea0091f3cfa1b4fbf779c6ce2f9ff1dd532575bd1dc2a95acd5dcee9dcb6236f2b54e12cc047a9fba63617d2b9055c47b";
-    sha512.source = "7cffeb5d9cc41d011bff8af54f3e82a9bb04a1634bc2b790a4d82115b1a68875e331db9f6c7cc873af620f60415a3a43760a2aef9836e7b9278472ca63b451a6";
+    sha512.doc = "d678eb8c5935792891073ca2671bcfd43a5fd354e9ed95f18cee40073dd8960324f16afc1115fc5db2a03c02f163dbaa32254a52d5c3aa04c949af5bf89d7469";
+    sha512.source = "e7252877b540b7ad5bb5222562d6954d724de03067ffd17d3abc11ddc9aa56b8b9b9bc776839385b843f01a35836728f1c2f83e82bdc882901975b9fc990cc45";
     license = [ "lppl13c" ];
     version = "1.4";
-    sha512.run = "47051a6c8b821166b5404474c2ae46a2a4a2ba7e75d4bafbfa716947f682bdf0f94997afb0924936c223c023d6266ea793d4160a3edd9f300482ffff939baf86";
+    sha512.run = "ae0d09f79d1cb0a0db748552cb76bba6ea282161e5748ef70b6d4618229b07e6cef8c24b3ff5e356ebf63cd517339de1274d906116d5b230449814553bc98ebf";
   };
   pdfcolmk = {
     revision = 52912;
@@ -38438,13 +38582,13 @@
     sha512.run = "ddcc125c608eea472c06981c9f5a901a431da978fecaa2a5ecdd08e2f6499ad25632e4de86f7e92445a8e276403ee92bca636b80e5216e78b21ce355910ead67";
   };
   pdfcomment = {
-    revision = 75447;
+    revision = 77677;
     shortdesc = "A user-friendly interface to pdf annotations";
     stripPrefix = 0;
-    sha512.doc = "5344a407a8438ddaa08a7e44bf9e8fe22bfe89fb15e0b09512471b74aba18071ed9db96a90c0c15b28b35f9754854341f60ec22e8bc245a6349360a6f1147096";
+    sha512.doc = "5fdfd7d682ec86ed67b421eb44ad8da21270813c5309e8b026a294f7a192df104148233bd4c2d8c97f530ee9e475506b88dee4555729d3e2e25cd8d230a95719";
     license = [ "lppl13c" ];
     version = "2.4a";
-    sha512.run = "47b655dd925dc319b5e5e8c2664a02951a86a697ed3774037b71b7362bdca90260ef826035795fc272f4ab197cd85f2790aa85e3947656afe59ba11218a4fc32";
+    sha512.run = "b13617d22ba95b969bcd37ecdf8f77d5d05ca0c06b9444c90fcf7ae3f9741f2e9426f32f6777855653b5ef4e883df57aec67a2a0853ebbdbebf6a439a72cc00a";
   };
   pdfcprot = {
     revision = 18735;
@@ -38469,14 +38613,14 @@
     "rpdfcrop"
   ];
   pdfescape = {
-    revision = 53082;
+    revision = 77677;
     shortdesc = "Implements pdfTeX's escape features using TeX or e-TeX";
     stripPrefix = 0;
-    sha512.doc = "d95aa97463b20c178a04f9f2cb71011985eb5242ec620adb9911bb5f1103f71e9fb0feca5704a9339b9490a71ed67c8c038efcf6cf43e16fcd20ba2eaeff8161";
-    sha512.source = "b6edb668b4803c91288b0f149e2700213ecab7725310d7d4bf499cf557590cd4356d9c79a6bfaf17a50ce85f4951a1e996ccf6725ea6da000f0c316f5a0466d4";
+    sha512.doc = "a40d6dad7875d9db28fe5c098188e74a0ecd3aaf785a03465569eefbb54b7cc38882b10dee809dc2e69aa5614105df6c256bd6ad6c4a03f05c37e7c9d6ec824a";
+    sha512.source = "f0751d5c7537816da052b5bcf741937fccfc34fb1ed9ccc84b891d95193f1db659ba184243dbe25d28dfe0fb51482d318a61d3813c56adaabc0166fdc62ae2a0";
     license = [ "lppl13c" ];
     version = "1.15";
-    sha512.run = "ca908d58a9a0c0094fcd9bad550bf493a0dbea9e90702534a7418f9a5f506f5cedd42663f154bd227349e4e57e223b6360871bdc995eaea221c07cccaa780327";
+    sha512.run = "c539bed6b18cb6f710d4b2928613d2ea37ce995119455106fd72b1a2803c0cbf869660a8ee5f0ee2063a2fbd85ae9b3e22ba4f55e48a541cab073e98b35bd4e4";
   };
   pdfextra = {
     revision = 65184;
@@ -38511,14 +38655,14 @@
     "pdflatexpicscale"
   ];
   pdflscape = {
-    revision = 75593;
+    revision = 77677;
     shortdesc = "Make landscape pages display as landscape";
     stripPrefix = 0;
-    sha512.doc = "ce69b45147b3d1dd34b981d2fe370787f94d16edd634a879082a604b763836052a45db917c13ca2c006f1c5ebbd5d0b09aad0536633918a1cdac4f43f42ada17";
-    sha512.source = "ab509858ed6c298f75ce834125955a9542da4a49976174b98fd6468a83e7e9d0f43bde9bcf81b1c89bc26e1c60d5d8017119e0f19d28618e5efac6702fe8e6a0";
+    sha512.doc = "38267878e284bea94ee6340f45c4c6e48719467b1bee0ff8a897928e437e307830301c59177f85993a0b9a26e01a0438f941112e6a71ba8f1c6c0ccaaedac1db";
+    sha512.source = "10df0522966af374d9856befce1bb5456a133a113e55da39a74fdaada1ef0ad6a5f6afd3f12b73e06045efb0cafb1c09b33bad95cbb59b663bcf96c235e2cc51";
     license = [ "lppl13c" ];
     version = "0.14";
-    sha512.run = "e830c5844381859a661192ec8e6c93688752f6884f5d40be45edebc17e9cc3422a8a79fffaa23d99121515eea8d75d0bc705ae54be46a769e5fa4e46b3f957d5";
+    sha512.run = "5a42b6045371ff78720e98be706d067f3d21c6ecbd6bdbc073d0ada79af215449cec1f671aeae49072040c5f32e96a87179b3bbe1e9b8f7b59d189d4d0ea0d9c";
   };
   pdfmanagement-testphase = {
     revision = 77467;
@@ -38531,13 +38675,13 @@
     sha512.run = "ca39d8aff81909cab6d86ab67e4542b8e8eb24811d0197477b5ae7696e18c811a51079b1505fb3fd3ba22a43540b68e51d4b872e5a854a7fa5ad84c10f6c1a92";
   };
   pdfmarginpar = {
-    revision = 23492;
+    revision = 77677;
     shortdesc = "Generate marginpar-equivalent PDF annotations";
     stripPrefix = 0;
-    sha512.doc = "24f2fe0616b0e6872da321bc7878f423df54057c9ed7b62eac4e3de36df4ba9a5f0c4481392902130038c8f2da098d2fc48be34056a03d6e764a01b66c2649db";
+    sha512.doc = "6fdcd933b7d5df5a9ba8a84ac882d9ae6dbf31ad4d8d8d163a00dba49335129e55b51ed736775e0216b58d0af0a2d5747925b0dfa1e0b107c6cbc7d2327c2ffa";
     license = [ "gpl1Only" ];
     version = "0.92";
-    sha512.run = "1cfb39ec9982fce753e3c0040123fc0faf39d94a41cac95dd0d189f2f5dd21f0a03c2f7e26de999097905b2bb32ec8d73e6dfa808c8ed2a49610da436639767c";
+    sha512.run = "7bbb4bb2039f4bf09c2e91819310664c664270b49171a7f6dcd7f9e108e1a5b9ea722896974a92f354076af848619db9048bd13a25ffdb22c9d51896124cece0";
   };
   pdfmsym = {
     revision = 66618;
@@ -38549,14 +38693,14 @@
     sha512.run = "f424a0fcaaf484f919b1e6646c63eff6550711e23cf938886b9cdbcef8719defd1d23efe949916cdf27dda54a87a8eb5448d4c9e8234ffc043dd295937ea5365";
   };
   pdfoverlay = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "A LaTeX style for overlaying text on a PDF";
     stripPrefix = 0;
-    sha512.doc = "606d4f4eb000c0162721efa5dd4ef2122a936e813bea34cc9a4986a6678b68ae1063f31d561d1ef05e4b44d6bd2e4b2254216fe419995bf87396ccd6f406e5af";
-    sha512.source = "5aa5f9cf47d1d47d783ec6234d6726494d9b999632ccd94bdb5da78d7ea6805e2fc9dbd21ed8c083357cadbc7b67b7813008de3ce6d719a6fa1f3348c85088a6";
+    sha512.doc = "1e2ef440f25cb7d6b61a5407914f84436ad756100276a4348d2e3f6f277ecc98d9fcc08c491924a1a25d6190c83ab826286981f05433c582595d20adfe097dd7";
+    sha512.source = "7c9f027f2ddf9dd0e6da5fbb705d454ad6114c6ef318d3d6a1dc06ddd234e72fb3c62f1beea642aabb0f8f9d575fbc3b215a6f0377a6a77d6f0ae7770e0e4f28";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "bff8f9e495b9665dc4eee6d26c9319d0c0180f6884bc0ea3ba7726c0f16d8051db03cbb3fc814b0ba8715163d2f2bbdf102a6288f28449369f104c9ddf78fdd5";
+    sha512.run = "c244009a42767ba875949304a8617254b47abd7bf65c3915da46cb4bbf1f26755b0ff1c37fbc328d38ee28d362ded2aa6ddb84a2b7f415bd9b05041c8d0ade1a";
   };
   pdfpagediff = {
     revision = 37946;
@@ -38568,7 +38712,7 @@
     sha512.run = "ce28e8160b14d0833b57445392237dceab536108a9d96942dcc0adf5305c149ba08269d697ab8508d8ba05dbc59dd972dd242cf7c4cd12e3d3e857eb885e5277";
   };
   pdfpages = {
-    revision = 75881;
+    revision = 77677;
     shortdesc = "Include PDF documents in LaTeX";
     stripPrefix = 0;
     deps = [
@@ -38577,11 +38721,11 @@
       "oberdiek"
       "tools"
     ];
-    sha512.doc = "9275fb2b7085743ffe53f2f127550417d41ceba51b4f52c4d4ac834a7eafe4ef0e37cd889460b5ed7b03ddc16578afa1b2aab5cb7d51d98c31fc56a6a710dfb0";
-    sha512.source = "8b17498553ec78777204e5614e76213c9b4a7bb27a0a881a90087e11a647d23dae5c7bbea9bd9a57005410e3c567326b4d79fc0d3cc9c762c3e73ee06498d938";
+    sha512.doc = "b6ba76538ec0003b08e08bcb887f3cace25b46aecdb45d2efd36a55a5bdab866422498b6b2ef7b759cf437348b3d0977248e9e90be8aacda02a9a4c8e06ee376";
+    sha512.source = "d9c24c351371a52e2f0e9a74842c436eb837078291101f4fb71df26da1c8633270c7bd4d60bd8b0aa47988729893945be952d3942ccf3ce5a29eab6cde5eca30";
     license = [ "lppl13c" ];
     version = "0.6g";
-    sha512.run = "84c51a1b9923cf43bfcc9651f9050638e0421e3b57b6c353ed3870c5ad48fbb3c46d7526d756ceeb16ae4b1733cc212280bba23ea27a22748b2a06eed81e53e3";
+    sha512.run = "431b97bdc9f609e1ed987d79fb282d1827f297b695d183f89b047c6be103965c9a6ad725d3755943120a81d154912b4203d35d813fb5093bd0594c7fc8e44a6e";
   };
   pdfpc = {
     revision = 68610;
@@ -38613,14 +38757,14 @@
     sha512.run = "8ec360bcfa5056b240091f1b2b5e6562656b15379bcf74b161899ddce41cb70d08cfdfb73b9497efd48e192fde11bfb4ffc59ed99059e1b6f6619e34b7f39bcd";
   };
   pdfrender = {
-    revision = 69058;
+    revision = 77677;
     shortdesc = "Control rendering parameters";
     stripPrefix = 0;
-    sha512.doc = "447336df8ed6b0f026e9b99a5a45481fb04da0dfe009e091727d99ef536c5e073ca90bb9e4268104146908f5bd6588dbb8d294cceb0acb3f46763e0f835b6803";
-    sha512.source = "83e6d5dcb7aabd6bc3e84d273687b91326209dd78b8c91acb256e5c42566a4e441e526de9b64fd8d5310a6f393ee7e66c6f561f87721959fe2cc9e41aca02fc1";
+    sha512.doc = "f676388caa948d03c7c424889b3be7410585f97accadcdc4f086e965881c8ccd304f059f737ca4119801e7c5b22833fd10f37c23edbeb2918496fc3778d246d3";
+    sha512.source = "fb3a915881ffb01d413ada7359e752835b54284fc31c03a550181810789c2ece962693952e3c4534ab4484f8ba3e47d67f7ac18434f5bbda1cf0e32eef26fad2";
     license = [ "lppl13c" ];
     version = "1.8";
-    sha512.run = "507450ada31750d833e46a74ab38570bab964c4d36224482d0aa14b2f846a10c34c21735cbf7c4a8bd7f6c10dab5932830ceeef8198b98f72a716aed27a0714f";
+    sha512.run = "154be637335406a9591b38e3afcf9cc45d64e1ee92cf65ec2fd863e93a04518353c7d457c803a35a8159c3176a6bd1962796be4d700fb50aa1520e27f54b0d09";
   };
   pdfreview = {
     revision = 50100;
@@ -38745,14 +38889,14 @@
     "simpdftex"
   ];
   pdftexcmds = {
-    revision = 55777;
+    revision = 77677;
     shortdesc = "LuaTeX support for pdfTeX utility functions";
     stripPrefix = 0;
-    sha512.doc = "a16db56366e80b1694b78919a245336c37690ea9a1305a606a3bfa85a73c854e92d1cd8b9ddb0bdfdea82f1ef684d06d8b4649e4111c39f24f321dbcb01aa036";
-    sha512.source = "f3e62a5f9029f71c652105b137048cef4f5562dd0848bb7a94d251e2af579c394322a70f40aadbed3ac56312005d59124ef3fd5a2436127a72c430d344ecede1";
+    sha512.doc = "2ea902c258be512aa584c255fa726551bb7601b43d95ccf42fdc694c5b5b3cf0a4b3c689e96e8c6e45fd7344de9b58e4c3cc5c63de40f109fa4608546062b616";
+    sha512.source = "a9fe99b14d938815b38d45f900c06aed2bd69336dcff0619eb19fb4e4d2acc399b6eba168d01171c2e064646cece8250a43dc8bda49676bda8ee0dbe61ed3644";
     license = [ "lppl13c" ];
     version = "0.33";
-    sha512.run = "91054b61b76382813d80e873d908cc07f8571b7651f49a3dc3e87063507af43bf31107c34187b703b0c4462eafe0cd605159803c72cbf2821cf6ab3afb78fc6d";
+    sha512.run = "36778bf7472189a6b78bf2627571210f319b6201ac80e2f5d2f3d29fc93e35dcab5402e50436218cbc48c8be7706da876ad64f7795a31ee8172de51b308be3d4";
   };
   pdftoolbox = {
     revision = 74832;
@@ -38800,14 +38944,14 @@
     sha512.run = "1064e81793884565568f6bde33072dc007c9b9a07c010be602111ea4429ccb803c18a3af13c85bc1367279624266063756bc59c72e6190e70090eadc8857b8b1";
   };
   pdfx = {
-    revision = 71681;
+    revision = 77677;
     shortdesc = "PDF/X and PDF/A support for pdfTeX, LuaTeX and XeTeX";
     stripPrefix = 0;
-    sha512.doc = "ce5931ec7cd9d836a23cacff24c13b7cf8332174735ac20644e83ac963dfd586434f154e17acfb66d9b5733827a4ffbbc9b51060fe026c3468f82d321b83e191";
-    sha512.source = "363eb39fbaff70796a98c679bccec71ef005286b54d86be4f17878550f2a7e4449bf19f808c0e04755818fd73f10014057f104730112957a31e9d000efa52d81";
+    sha512.doc = "7c06cd71ec3b92dd5ef57cb15529367f9afb7c2fb171afc8a96b14b89945d8813b16c6177ccb901ad73a510bbbbb1b49790236b4f4a82ea9beae177fcf0c1d90";
+    sha512.source = "d6990ca94b403443fb88e1b9597e69dbd125601e06e4206b655c626303bc328de5c384bf520e11bdc9392b0ccd4b7fdf8d022f86124ef9e67a29ca1ab9951303";
     license = [ "lppl13c" ];
     version = "1.6.5f";
-    sha512.run = "3a186a9dc416d6e3aad2ed915aded0b98fe227d6829d1381fdbea3244429258b043441fed67eccf677ab4dd59d15378f9bddc9544847c2770d1e8544ce38227f";
+    sha512.run = "1dda49ad109009c01b55ddf99380cac8b4d4b36243f2e8e4c45bcd30e037b2a9bf6fb0339b9fdae8404c9cc9388731faa934b95c0550495b7ded156fb4938655";
   };
   pdfxup = {
     revision = 71513;
@@ -38869,16 +39013,16 @@
     sha512.run = "f9bb13ce722cc896a2be1c5c13bbe588db13973cd9d530cdf7e0e9216f35b5e1c82871a35dddce31dc7a252dc85611c38437a135efe211b7ee58a500903229ef";
   };
   pennstander-otf = {
-    revision = 77285;
+    revision = 77677;
     shortdesc = "OpenType versions of the pennstander fonts (with math support)";
     stripPrefix = 0;
-    sha512.doc = "033cd5d9f3e01b3ae2b8146f1d11eb0eb749e79b7741e8d67b5d399aac564c6ccbbd1f7b237adba09742d454391d7678f8a30bcf77882ffcb4d6e40b0d52d976";
+    sha512.doc = "1d1a02bcebb5a118279af9bb6cca0dc4cdfa0132719e782c9a287e308df9cc7280964651c730f81c1bea6f1c89c4d1c58ef3bda19099e0f822fba6bfb5b005a7";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "0.3a";
-    sha512.run = "465b5ff3b197e4d9d3863c43afc35b8cb8c3aab54012d5d362bd947f6468323a2c045cda299a85ae51a90d83b55369536d7f52c94519f621836752664ec114f2";
+    sha512.run = "62c932c7648e099b57e7557de90a9dfc45822490ab8629f5aa8125bc628f504b327fe3182d705f9e94d8e9028a4a37fca0ad789c256826a6741c1ef3837b0768";
   };
   perception = {
     revision = 76790;
@@ -38964,16 +39108,16 @@
     "pfarrei"
   ];
   pfdicons = {
-    revision = 60089;
+    revision = 77778;
     shortdesc = "Draw process flow diagrams in chemical engineering";
     stripPrefix = 0;
-    sha512.doc = "cb9f0ae2a1b7a3c8cbb12f859c9cd9d33e447652ceacec2642e45c7db7a96ec6cfb9bf63ac8f711c1661557308ebc3c6c04604412d09cf16d232e23c805e395c";
+    sha512.doc = "cf0c8f14faacd7bbe179f68d00d41d74c6de197dc6d2397444b3f2a6c05c851ad5c0382bfdd1b12901983c4d4d5b701b3aad2a7cc9106341fbc6411620dedd8e";
     license = [ "lppl13c" ];
-    version = "1.0a";
-    sha512.run = "cd09de584483a1493648e9f842b743c43d7712b35f9d315ab34871a964b6ea7e8bcb0ff4b8d4399f5ce7d5ebadf41c94e8b88772b15155d4c21e17e4c62ecd2d";
+    version = "1.1";
+    sha512.run = "b675f4ebd8c2c588a5e0c34c93df91bf9d1833c8c173c87e9100051d0af7054ed830ed1e3010c38af4e9977c10ba5356421319ee99266cbf08838ba93a292093";
   };
   pgf = {
-    revision = 76180;
+    revision = 78116;
     shortdesc = "Create PostScript and PDF graphics in TeX";
     stripPrefix = 0;
     deps = [
@@ -38983,14 +39127,14 @@
       "pdftexcmds"
       "xcolor"
     ];
-    sha512.doc = "c7aeb723417b316c3178a021bed2089af5a71295b6e5a4dfe965b02c1cf6ce0e8868675fd9b44f1d0c2fb3a98cb59f5e94ba0235cab62668b2405fae6cdb8cd2";
+    sha512.doc = "267dea4eb097ba684547c7feeaea16a02e75e9961dc6919fbdbcdd23f3def11612aa80eb6125fbd4252ba30bf56dac0159151d2f753c40d8b6970bd62cc3a3b3";
     license = [
       "lppl13c"
       "gpl2Only"
       "fdl13Only"
     ];
     version = "3.1.11a";
-    sha512.run = "7fc3a36422d158ce2cf48eeb75fafbb125fe4f6b3424e34172e61f4013374663136021cfb71a946e9ac688a2f19b3c6733c1c66d4872c30a6721d886f66b0ea9";
+    sha512.run = "872356a53a4089f3aa7398b2b2d0165835efd4eb4850827ace4118cf7ac24546592bd2dd854168df2084a3deef90493b69b37a8c238176431a50c725f6607c1a";
   };
   pgf-blur = {
     revision = 54512;
@@ -39006,13 +39150,13 @@
     sha512.run = "95093365a79d7f8a2df134decbac172a080711bcf8e8f77267ea4520ccc9aa398f5fbedaaa5500fa189b3873d8897350dc2c99f142b6bed1a6e7705293a3b8b7";
   };
   pgf-go = {
-    revision = 74578;
+    revision = 78116;
     shortdesc = "Diagramming and commenting on Go games";
     stripPrefix = 0;
-    sha512.doc = "efaf14f4d2f5fd762f155adfdae29f3e5b5ebd4ae1efc13d8acff25a07276f58a50884d8e56087dedce491865ca1454637fc1786181d11177f94f4bfa0218683";
+    sha512.doc = "7b5899b3b23c182eac09c120ec7a26c71c9de22ab28ffde2443c6fbb19a6c56dcfc68e5509f38eeb8065754d53dc1701032c634e68cb22d33178f9cb71260d44";
     license = [ "lppl13c" ];
     version = "0.2025.03.10";
-    sha512.run = "91d7088df139999fadf2b37e8d8315b27adbc0c44704dd044832d713f5a230e50ee28163523fe83782e264dcbce3e1284bac9f58659b3f4a35cf30dd2ef6d07b";
+    sha512.run = "5259fdfe7cd45703a33920edd6cfc29e9365618b6599d1f560680f017eaea50e1fd333942c21363933c0472e335fce2670953a243d8ba783839b2091fd6835a8";
   };
   pgf-interference = {
     revision = 76924;
@@ -39160,17 +39304,17 @@
     sha512.run = "9a4fd2f42276cb72cd39dfe3cb5b6c43855e1d7f01f47c53b23c8aae7bee98c89e8a8f784a917c0c4ebc35f9dcaec18b8d4f6bbeb05ec5a80647ff7ca23c02ab";
   };
   pgfopts = {
-    revision = 56615;
+    revision = 77677;
     shortdesc = "LaTeX package options with pgfkeys";
     stripPrefix = 0;
     deps = [
       "pgf"
     ];
-    sha512.doc = "ff82e0502fdeefe6afe90aad4e7615de9be4ef8e2e6a69e7a537202af77aed00c0895269ceed3d38e0f34345efbdd771d22b0c8759fcb46ff8e91ce639dcd21d";
-    sha512.source = "758da1f3daa0ef888b484ea657fdd4384102868e4eee543bc97e73f103b67c367277f5c00efd06a2080f9ac3fb82c909cd30f641363120e70357450179dab6c5";
+    sha512.doc = "e2d93d9a0fdab3d301ee9a117f6ce7a2dd10532ee073dcbd11ee27b84cd995f14c86ebfeb96a73e436032e7375f43d3ef14cc918c2f2bad0f410a7ebfade3763";
+    sha512.source = "3ff43ffe5b521e07e907b40b97379ecfe2b24dd047de1707374295f809975b14cfb822c6b0c5f7ca74c96e2f1f9e1e7c3957a46cab910a93f602b4338b44c1c2";
     license = [ "lppl13c" ];
     version = "2.1a";
-    sha512.run = "7d672d626428c37fa749a810c57be43c6102e1325a6d3e16c57bc560b6d65a57bae94e619a73f3e0efb46ce7b4783d05a6e98c64b1e90c6e0f94f1dd9acd676f";
+    sha512.run = "eefed8f9903ec7c68e7e4c09867ca394f45b9e900aa3a2617f2f454a9d8bfbed52018c9bb83707f922d6ab2748d4fc97050a4fd5ca7590dc1e1585fba04bf0c3";
   };
   pgfornament = {
     revision = 72029;
@@ -39190,17 +39334,17 @@
     sha512.run = "5cd220d0d25f11dcbd50b0762a3f5e6f0c7e5f9455190e5fbf5e302522c978076f75b726d27530c3510cd996c4bf495bc9ec0ee1790c1bdcfd766ac5ba9741d1";
   };
   pgfplots = {
-    revision = 76111;
+    revision = 77677;
     shortdesc = "Create normal/logarithmic plots in two and three dimensions";
     stripPrefix = 0;
     deps = [
       "pgf"
     ];
-    sha512.doc = "e943279f7d434b5dd5977548194de9a46863411ea723cd112b49cea7251fe083d5103bd8b35a9f89856ecd9d337111c36e4847c7bb5eb15fc802d3746aa3a189";
-    sha512.source = "844b56498b500386947f81ac7fb2e86e0f485f2bd93f2c5ed3d5a9ceb2b9a763f0040292129f0c631f7bc88edd73287b79a15b3aac2f006efe431cb8aeed76aa";
+    sha512.doc = "f777d7158045945d50c68bdb07a2836b9023a24f87ebe97fff1ab52d4de0183496434ad31f85601ce5b8ab2187a0491d2f5e8da1bda779688d4faccc75ed7571";
+    sha512.source = "da445151220946e6ed13ca4c58d7e6b26dd2e27873e339823aa240fea2664fe49301e5e60fb2e275e6465a6a67bd4ce983b831e62524ef69bc83f97ececef45d";
     license = [ "gpl3Plus" ];
     version = "1.18.2";
-    sha512.run = "485d04ab94f2f947ec42d43e4907fc8ad91997139e26f3fe2eaf2084b9471d56027dfe3dc92c2ce22035b57f06c757e96e5233b749ba54e6c9c1a6a36a2c5f8f";
+    sha512.run = "05a956780ebc1b42997f140834481176170104a87f0eb7255d2e947dd263d08029f9dbb83ec9f3a3be201ba92a263300a53db5ef3306c01d7c8aa0c637d45bba";
   };
   pgfplotsthemebeamer = {
     revision = 71954;
@@ -39360,13 +39504,13 @@
     sha512.run = "c0af90030012e8e2c0872769f484213b3235f0ab0c0b0538d2eae438261ab9d3687ce63645dd1e5511c734e80596208d70df1183a178fb52b8b3096b6bd48460";
   };
   phonenumbers = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Typesetting telephone numbers with LaTeX";
     stripPrefix = 0;
-    sha512.doc = "65e75dd9a823c4460199073d0dd03162767d9b4fd3d0ed0a0723646c83e8a89a7630984f7deb0750f9b83b8a0270f59c4a130c1619993e5bc9b4ae5abf2ef293";
+    sha512.doc = "5a062520f992608c1e73d98d9b32b22153548a0848e26c9838c1a90d6bcb5e28533ee98d00575b82aaaf220c7b24a52f90788c90af422b146bd45b9415524916";
     license = [ "lppl13c" ];
     version = "2.6";
-    sha512.run = "f7abcfda230a6a9ff36e9ee1432eaf5668ba78d0898d5f8bc5116e18b39b840024bc9dff4f9137f2aa9caf3ffb79223d91e9a82fe141a6f95fd044da81caa6b2";
+    sha512.run = "f0d41e8e330500ed4f870e8bddf8ea331cf9ef3c82306c1c9b57cc209b84ce43a4465c0dee70d0dcfb93e03d6bc433478a5979eabc0b57a2f16f275fdc444759";
   };
   phonetic = {
     revision = 56468;
@@ -39471,14 +39615,14 @@
     sha512.run = "1a598dac27ac5e1fa163493c307e48ff2e8c31d9c1c51a676a1b05bfde7af2a558fce4bf410a2c70837d128121331d6aaa393c6e7a84d8b98f9e271184e78a50";
   };
   physics3 = {
-    revision = 77503;
+    revision = 77677;
     shortdesc = "Modularized package for easy setting of physical formulas";
     stripPrefix = 0;
-    sha512.doc = "197a355ce39d85bdf6360707767380b7762ea584a4e6239fb712f21aec74eeaa08cf4ba4e80bf32a01260072384bc7b56655c6db9ec4d1b90ba88ce8bcd7ec5a";
-    sha512.source = "ff88643d6c96e456c0f29157ecfa520c7e1fd4820f3cf86bc14f4237e8b3b5e4686bf2f7322cfee69e89841fc99f991b7fc2d8f3b838b0d2c9ed810e80dac152";
+    sha512.doc = "98c78b3520f6a08ef726ab0b13740904379d24919a7210f7b4cdd5f94580dfb9e9945ddf395fa09dc422f84cb0bb3121e6a07f817aa3271d4655a69c33570afb";
+    sha512.source = "4fe59ddb6bd3d71d5803757ea7468ffb16a127547ed8f9816246cd3928b659396516d4b8d0ca785f91eeef4f7d0348752651c182909bc942e1df0fdce2345f2a";
     license = [ "lppl13c" ];
-    version = "0.1A";
-    sha512.run = "10de696abacfeef82885d55f1b0be4ef0751589fb6a9c1d764adc8a002619fd82ca9a7a4173755fccac92cfa38213b556cd00743c1816b698fa0f0d6f3594495";
+    version = "0.2A";
+    sha512.run = "2c20988fd3f6fb6b550508f8b22769a76e297c52f6d6f0b7fc6cd5aad0cf796b4477e1e5fbe22a6df6a7ef05b67a19c393c5e4f22c1a291907307b661092174f";
   };
   physunits = {
     revision = 58728;
@@ -39491,32 +39635,32 @@
     sha512.run = "96f700e6dd103f768383a78645cb32e363b83c459a0c764a77d127bbf2aa7c143105752ef9910a2d9d6e659547931b01a2bb0683b41d8870c0fd850d7e01de3f";
   };
   piano = {
-    revision = 21574;
+    revision = 77677;
     shortdesc = "Typeset a basic 2-octave piano diagram";
     stripPrefix = 0;
-    sha512.doc = "50609a17b51de85d5f9df4da91c0c1c421a86ff222d08268fd0145e248eea740c68445724fee425a2adbdab85e0cf5b4a9bb4ee5cf3bfcb4a3d5cf4f1868df47";
+    sha512.doc = "85fac24aab0a235cf5d4c2c5d6c1c3137ae530d97dbc26c493d495b768cbb9b7d4b8096a17459cb4a7d3a5889f9b5451ac2ea2ef20e337bd17b3b9eed3583f2d";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "49c3b29f48211ac6ca04ef8f9df74cd3f4673a84e9d84c2a9b06bbc958abd640116673abd751be40adb470907bcf65a42756c22996f0adc4e2c0dbf3d6afeca4";
+    sha512.run = "8e8531a8c883da64b21536bbdcb48a26c1c40554a1c9a53123db6764a1478183dd2de35c7a3a57731a150b2915b2585600902cc380bccf7fa4d64246fb723388";
   };
   picinpar = {
-    revision = 76726;
+    revision = 77677;
     shortdesc = "Insert pictures into paragraphs";
     stripPrefix = 0;
-    sha512.doc = "07a4c61928a7557e61fefe5e0e088c39cf3b9ffe0c993d776698f9f3633ba3fae797a173fc5091d79f3ccfbcc81305d65c457466220602c382fcfc7858668d9f";
+    sha512.doc = "d780eb362c937d029472b1dab35593fda8b1e9c16476d5542b9e488479b5b23eea2c57c8a4be62c2b59bee9b8f09caa5ba4a8b8dcf87997fb76260632263f27d";
     license = [ "gpl2Plus" ];
     version = "1.3a";
-    sha512.run = "15d7e998d0c325b7ed466a3cf0c3cd239ad0bbcfd197aad908f70c6f3a3c2d99fec746e2bd9caa48bcac7e727d5a545f964ca3404f1c1fbcfa4adfc4b78ee496";
+    sha512.run = "ee2d74a135f462b83a040333c8b3c7d9f6946f745383b59430ecd8e97a7fd3aafb234224bf90213098ebc036fa39e56b4d8b2dbfd26a52673fad428b29ed5cb2";
   };
   pict2e = {
-    revision = 56504;
+    revision = 77677;
     shortdesc = "New implementation of picture commands";
     stripPrefix = 0;
-    sha512.doc = "90fe6e6d6fce7d2a679bb511e2b0bbca2edc42f332886962aa227536558083897e1e3425b6c7efadaee6aa46d1e404ab5d4c18e21db52e723be8d4f0566eb5c5";
-    sha512.source = "0c637f9979672267e73dd762b43c3339f41ed8965c12fff1141c757572ff7cef7d7f2d8faf50d855cd22a3810b9ead5318b6c20c3e5218f01fc32252f93d29e7";
+    sha512.doc = "076f544c1e720739f7bdeb843af57fe075f1e5deee0b803ca125fb0fe8395df7de75cc3f162c4ff4ec992678148fba4516542d84a1374c904f8683ac183b39d3";
+    sha512.source = "142cff2877ef35cfd9eeeb22e8560370ed8d6606e375d83abef115fb6e8bc4c80611ffbf59f40a91456d87306c77913203414b077a925a1b71d3577911c8ae3f";
     license = [ "lppl13c" ];
     version = "0.4b";
-    sha512.run = "04c4fc0ea9647c0a434be2ba709f539392685233adc92da262fee4d081b6d31bfe88d8c537c19a102bc7200e2adffac4f7a4cbb3a7a47ca47c26e93e96772e6e";
+    sha512.run = "f37d83ea038fd5d4a69febcd394f14ec6a3cc52fccc79daefff7762e37dbd34e841277bba2fd4a5e5b233e4538d74e5b778dc3db0d4a61c8ebc0b625579199d3";
   };
   pictex = {
     revision = 59551;
@@ -39551,14 +39695,14 @@
     sha512.run = "43e840d6374614a406f12fe89eb9a24f8d484e72aad062f2f95bc05c2e44b6f76f951038de70cf83bd916461ae48c4f924540c6b6005311a482119f1c5e9c7bd";
   };
   picture = {
-    revision = 54867;
+    revision = 77677;
     shortdesc = "Dimens for picture macros";
     stripPrefix = 0;
-    sha512.doc = "ce60fbc915b3c07db6ebf4bccbd0e2e8ed6f38fe0c07075af2c433b2bd7f82cd191c314ef3ae1fe9b4a02c2c27d75e97a5831c45b833a33373d545a977a162d8";
-    sha512.source = "599ad9e192d2ee50b7037d93c3a8541014ada30c13a9a8b637ee33ee9dec476a46779b06a44f56288e6fc08b29408af30310fbf0ec951aef3a8b0d8dd776aa2b";
+    sha512.doc = "0a1d2ac9bbd0e4711c2465594786af06c2388c19d43abd2880289e413596caf4c03da498720d90d92ef598b74512ee9db68d2f26c388dd27e38f04240d19df8c";
+    sha512.source = "67e01267e33394ed44e38346d2805d0a14ae9cd3a3f92d13b33b0369c1a1a32c4041bec8e505526c510b9f3113ae288df85374fa5b56585bc4a4a04fb41080a7";
     license = [ "lppl13c" ];
     version = "1.6";
-    sha512.run = "9dbb4e17b455a6a18bae6309864412b975d07a1a11e908e1023ab8e990ded0956ccf3826e72d9878f3597eaa4d185c8b147d2c7d2149618bdb0b09fce8e20e90";
+    sha512.run = "5b31d405d22d4f6e79f46db7eb5c41880270201e6aa9e23679eab631ce4e48826884bd36804c05805e7bc6916c57b852b3417d148ff6e216349507bb371c76ad";
   };
   piechartmp = {
     revision = 19440;
@@ -39578,16 +39722,16 @@
     sha512.run = "79b804dfdbb12b8d2e854341062f2a149f9b0e061385a30650c39b877cce72d1af4ad1644d73fb3ca733a171aa61d1b533295818dc10a92eacbce2ca60722de7";
   };
   pigpen = {
-    revision = 69687;
+    revision = 77677;
     shortdesc = "A font for the pigpen (or masonic) cipher";
     stripPrefix = 0;
     fontMaps = [
       "MixedMap pigpen.map"
     ];
-    sha512.doc = "94be29262f4d00ff65c1679029bc76b33ebc10051862cdbd4da08ef9802975378efda5c2b2cbf85877382d093bb408feda0d53d3458337bdff5239cc851c1dc6";
+    sha512.doc = "2f55888c1869d541395c7db43129ad1e68d725f909d84e6d690d8670145612dfa308748b63e0218d079ffeab63a2d57650647afe2d6b60450194a61998c18e75";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "54e472281b1ad2f98b8f49df945fc89ea2e28bbec4088c15b4b73a411ad42936f408926a006e46656eb70b90172f39dec376b2eace6fd22923dd4881e1659618";
+    sha512.run = "5f68583cf88c749d3ad5bf2fffddfae3a3a392fb5fe981efdb5712a5e1b762aa91707becc67508c1494d3ea8709cd3dee8f07e3230e6f4bae345c5c4234224e5";
   };
   pinlabel = {
     revision = 24769;
@@ -39616,14 +39760,14 @@
     sha512.run = "dcc4280ef914ba66210ce471dc276042070b3246bc95ecb93b3d8af55393f49921a1d5e6851223299831344503dfc77fc2893f4cf1b78351dad40058979c20aa";
   };
   piton = {
-    revision = 77302;
+    revision = 77677;
     shortdesc = "Typeset computer listings with LPEG of LuaLaTeX";
     stripPrefix = 0;
-    sha512.doc = "d7ae6b2c19168563904c3727bd70c9d0f687595b2e45ebaf048c186b2e558202cfeb246609a04ba4db732f9fbd62aabe1a6de16e23ccc803ac09d1ded5a390cb";
-    sha512.source = "89ba1a5fb8e9e719a68ee566c90127aa6cf097b8dab0929768a60307ce321cd2a51804cb11fc15d167c35a703cffa7975099c3c496c304515c0a8adb46cbb0af";
+    sha512.doc = "5959169dec24bce209ec1bd40f5b3c5fa42db6cbf7abc8078281260a0d84e8423e6274feae58300139680c0b814f793139c77348e14d669b227f5f3399d4aa33";
+    sha512.source = "bd7813fd33252e23d113044dfeccbd1bbb59cb0296cab65069a21770af0bb513e91c54858807e9e00fc19e56a24353dadd67ac84a03c2e22f92fe29e60c5d291";
     license = [ "lppl13c" ];
     version = "4.11";
-    sha512.run = "4cc370d19a07b5ed66f60e94fd805dab02d89bd2dcf3143ed73f0320cd83c83d9ca4e76f116733684d68ba9bff2e7b6814d34093ecef5352213a2f6196b9fd41";
+    sha512.run = "2d3b7125ac4cdd8ccb513e837b371e001ba4226d36360e004c1788f34282d3be11acb0bd06c1f219f0057ce9f5f8f9131cd9246226bba680cbc5dcf3aab8079a";
   };
   pittetd = {
     revision = 15878;
@@ -39735,13 +39879,13 @@
     sha512.run = "476dac5b149811659c663751478f9f224e209dd63954cb88baadcc94c70a4861673512e01c4a5f30097d242f56f1a6edbf4fc225f8b561e49a4e60b02020488e";
   };
   placeins = {
-    revision = 19848;
+    revision = 77677;
     shortdesc = "Control float placement";
     stripPrefix = 0;
-    sha512.doc = "2ac2312083ae8abd3fe3f85da7dc65032a4c6bed4d1778c058120b48292f459d1b77d40e4eb6f0afaf88a5160d4fb0eb7f353ba1d93b7ec672f054e58de4d6f5";
+    sha512.doc = "77688bc564c5996ec49f69329b73aa5f122ce2da71aad7fc352117a380d304d12a3013d88208e2bd8019444f6720a1e741e38cec55fe6a7370795e7a57a54504";
     license = [ "publicDomain" ];
     version = "2.2";
-    sha512.run = "618eb33f1fce0b089fe111b083b0153c146e0d8abbcfc235a86dc6a698a2fad080f8ac38e04037e06b0e1e2782291ca6d01ae69922d181b26b4c809d6aba262a";
+    sha512.run = "ab7be2b63c1777991007bc5399920c61fb2ee704903c85064dc483836c114f3544bd571ccc5694228f48cfd46f1604065276999a1e1fedbf6f0126f2057ccb96";
   };
   placeins-plain = {
     revision = 15878;
@@ -39830,7 +39974,7 @@
     sha512.run = "f662191f6a053585bbcf5a71635b6f63ee5d713086bd24f3c879f73868b5ab42b6434860b68408fcade7b7ba448845d1dd6a5be12b10bc25be8032b9dcef9615";
   };
   platex = {
-    revision = 73848;
+    revision = 77677;
     shortdesc = "pLaTeX2e and miscellaneous macros for pTeX";
     deps = [
       "babel"
@@ -39894,11 +40038,11 @@
         ];
       }
     ];
-    sha512.doc = "4ad333feb0123a77db86604f897f97fe9622036d31b800c6a7f65b6150dd5677e12784f220cd4dccb7e93e997269cf7939fa904baf0a25dbe4cf9d3af98dca46";
+    sha512.doc = "bb6d44fa24aa29390705113608366231fba108e5b22bd34785e8c78aa645d05963cb24a6f8ad8f66e83fb349481e67549afb74fb1a632ba6df99045912c66735";
     hasManpages = true;
-    sha512.source = "0a302e5fce728e1177a1f93cce5e447a25faed2f4c2411336e08c49343269bba48e38febf71e423e3970250b51ac49e4b9fb370a2c96952190f4ff18b503a147";
+    sha512.source = "32ddc799307c2bb099a6dbf3f82fa82deaccddf07084f62c5e405ae3d49e7725442d8e08183a2e25b49e44f5d86d924f0dcb0a93bf1a84abd117569d8141e5b4";
     license = [ "bsd3" ];
-    sha512.run = "25735e799ee351d37835dda2f3005fe2e4110c6d6e0efced86e0976124d2a1c9554655f6580308b51ecc39bd28c1bea9b06d4c7d630b6c0669f37b2a6dc08a58";
+    sha512.run = "a59fa663d19777c3c7f772f9ccae4115a7f2997e42fa09c16f4e276b18f1a5ebc381c6b91832c49b7ccc0c8ea68629aa7c274725a2afddfc97082d16c09d3037";
   };
   platex-tools = {
     revision = 72097;
@@ -39921,13 +40065,13 @@
     version = "3.1";
   };
   plautopatch = {
-    revision = 64072;
+    revision = 77677;
     shortdesc = "Automated patches for pLaTeX/upLaTeX";
     stripPrefix = 0;
-    sha512.doc = "e4bcfbe263cd17dcefdc239f06f1287ff8d936f0a6b5ea89f914d7a4254e08040c076be0317f4e3cf2aa96542878e1c93fd3ad5b9633f4c3c3d85ee9d719f4d2";
+    sha512.doc = "2f73db9a72c164ac04c73b9223d896fbb7c0a5a3388e314a7185fb35b40021103aff6e3ba8fddea505f123884a07d82ceaf9969087349cf1165a55abef084cfe";
     license = [ "bsd3" ];
     version = "0.9q";
-    sha512.run = "1313cf815568dc385d5d1691bba7e57e246c45e71242acb94904ca0fe796940afb59bd3d07f728a9e407a9a0914b3890a7e7dc3c8bde3ddab7b36c3ed9ffcefd";
+    sha512.run = "dac0a32223f1de80368aa21a57404fd09735ed27a6c4fe8bcd0632b85988ce1281b93e56174cb3a6fa916f508bac2932b74a541512d41d60ad6cc42733ab834f";
   };
   play = {
     revision = 15878;
@@ -39948,41 +40092,41 @@
     sha512.run = "3c7b076044328ceed3005de84d628d6d926f93c1d759982c2e37c8831093aa12c0dbff71f8b8bfdbd171dc545f313729c7c11086a3e529858086896bb64899f2";
   };
   playfair = {
-    revision = 64857;
+    revision = 77677;
     shortdesc = "Playfair Display fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map PlayfairDisplay.map"
     ];
-    sha512.doc = "006319162a3a7035955064d7ab99e704bf828cc7441a9c930cfccf4cb7e70ac52ff672de3ce8b415fbfb20f29a0b4c09703fe0e3715d15e38c1293973bd3a86a";
+    sha512.doc = "bbb55f9693b089d4efd81e41ea922089523d417d1179fa5a7bf347706a7a5bff1f03939534546d3a5017e3c8c0294450903020d38b92c8c1b91b663bd4beaa52";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "2c75ccda034c607fa67993922e498347cf8a708c31360ac63d8304ebcf538e2012529864c6c3102a63b0320db68101fddae021ec396efaf0396d4d609cd0d711";
+    sha512.run = "20a959cfa3c7f7b9e98e4831d3c02bed46bbdd5f09690314727c3efda8eaf3e0df45ad2c7bf0df0617f169c1b37b24f4644808c1e20345d9e10c75296e535017";
   };
   plex = {
-    revision = 77018;
+    revision = 77677;
     shortdesc = "Support for IBM Plex fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map plex.map"
     ];
-    sha512.doc = "7baa11e8a67242557700a4c96c6b1c868b0a5b74639022082370a448fafbc5330c107b6ed525593f93acc3b74c8a6f07e5121c157c629fcc2d2393db137f05de";
+    sha512.doc = "0c023c78057a1b2afc135840d248f263a25f05824d849438f6ef28f9a651f1a90fa31f726f10fec126dceefd7fdf9bdf1346f6b9c90012c8f82476b8e02e5a46";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "e45410dce2afdfd804c0c2ebfaf58547706846077b3d9083cfe73252f030523a3417cc8dc756e6c4cd914257474f38a12bad35611e0ea4a5d2b4e47fecee368a";
+    sha512.run = "ace127bab93cbf79348813c4c364783ce086e364fe4226ded6a39f4a5e13f4eab0397bdcfb1642d4cbb08b6102ea6c8ed9619ace08a26c27cf1debb0fe4745e4";
   };
   plex-otf = {
-    revision = 74719;
+    revision = 77677;
     shortdesc = "Support for the OpenType font IBM Plex";
     stripPrefix = 0;
-    sha512.doc = "37da022721bcad704b97533fa22c2a28b2c68de20eeb755ea11ce0e562f3d552ed8b0770d62522e51cbf318da9a88df0c79e46b66b93f7ad6e3dc2303448bf18";
+    sha512.doc = "fb84c6570d37a309a6d7d6cddc23c0876c5fd8163a082d8f18b5c9974fcb29c713ac794474b4114cf19ca8b92bc0f51f85ac1bc66434628ae34110629477d690";
     license = [ "lppl13c" ];
     version = "0.11a";
-    sha512.run = "deb1565d4be296ca61ca3d145563a2ba5116723adbd44b28259b4bd6b1c71154531ed863bab6128add05be7316efa7aecd7746cc32b830168efeb992a1b1aef4";
+    sha512.run = "10ce1ba74bf0c75894000ab7d515c36c79cc802f4e9a3befc66e9a2f8c292d9879c2da6f48e42b9171e8fa645f771f9f3ebcd9c5a5e70f0e86c86e732ccade5f";
   };
   plimsoll = {
     revision = 56605;
@@ -40046,14 +40190,14 @@
     sha512.run = "675fa1fd973451783e84dbd7f62f9637e16ca3fe4bbea4c35f94c7796ba940384082d6ec642f522e41c8e2184141a4e364db41661dad78b5343ce8d9c3cd8dee";
   };
   pmboxdraw = {
-    revision = 53046;
+    revision = 77677;
     shortdesc = "Poor man's box drawing characters";
     stripPrefix = 0;
-    sha512.doc = "42a439f2f88235faf7302400432d49166861476cdc43708f84780d153bdcbcb55dea1a6b31cde2045d0b99d48c2a4f51ddae8bdee08937308c5de02e9b16a523";
-    sha512.source = "77220cba1cb61836f0be161566d1f177f2c503901b0fd4c0052dae81b457f59364596eaa4a32071b5c90623509f646ef3140f67e29a558b4910beb3a1d63cca6";
+    sha512.doc = "0eb15d124c4cf76c8dab9ed202cf5151de2925771168c2d3b9aadc82269b41bd2c42bc0313d3fca99f0f980684e81a84003b85f90d2a02079baa87699b9c5851";
+    sha512.source = "8136c328d2382d5f86ec889dc1c0c1a258c18454e9595a8a579bcbf53e2c707cbedc6a63ce09049e3238e36b5153db3b1942f93a7163e42b03c7519ec8ab6e82";
     license = [ "lppl13c" ];
     version = "1.4";
-    sha512.run = "d229b15e57fa76a9e8e9b903b5fbbb99d81d3c8a2b1818d71c103df7f2a1e9bcf79aa8396b6ab7a2ce054371d212375b968a4a5d572fa8686223baa8dccf4eff";
+    sha512.run = "30945acfa28645e3021d09510b112bccbc0735dda5ac6b8f2358be28bf4e848cdb87b75d9b294d43d6ae44b1d13937aa596dfbb3ed96d65bb76cdc0106541762";
   };
   pmdraw = {
     revision = 77509;
@@ -40074,13 +40218,13 @@
     sha512.run = "b6e9f00789ad102b6cdcfb0fe48e5ca4f6976a7c207088c0c3e8b0c2d4fa376bbb932500d42133571a6e18747615c77eb6df2b4872ba86f853e3069ef198a671";
   };
   pmhanguljamo = {
-    revision = 76924;
+    revision = 78117;
     shortdesc = "Poor man's Hangul Jamo input method";
     stripPrefix = 0;
-    sha512.doc = "436d99959074cfbb8c8c3e3194d264aca95037c872e32013e2f67e31f9fa65f4ef8e3642cf8be39abed1f3308db819a0b04ed6a7293147567a759885310a3703";
+    sha512.doc = "f18b8470b88edf9cf8417d159114b20ed5835dd9fe0787bbfaf4b2048b0f5b07b048beb097f0dc3c84e682caa588e16dde5a7f64a6af18309d989841c6898f73";
     license = [ "lppl13c" ];
-    version = "1.2";
-    sha512.run = "7846e7b528e6ece8735a67ef23e35594a9569984133f6a6aa9a6de6d8d851081f5c0bca2a81b15159af7c52074770074ea5d1f16977ea1f51ac73a91e77a5e00";
+    version = "1.3";
+    sha512.run = "9116bbf281d0bb5374ca86a17af08921c82b24880db3a99dd651affacca41b70ebef7b85b1f0c8492a5780c145fa02e9a5d07bf652f23d9550486a2cc01aebad";
   };
   pmx = {
     revision = 75301;
@@ -40129,14 +40273,14 @@
     sha512.run = "e9bba80cd6fcd7b1e7b0e46fe594b3e25986dac5fe39d329ed4b8e15bc6b542e033a392abcad4e0c67d5401066703a1a89658ebc612d2adcf846de81b34fb78f";
   };
   poetry = {
-    revision = 53129;
+    revision = 77677;
     shortdesc = "Facilities for typesetting poetry and poetical structure";
     stripPrefix = 0;
-    sha512.doc = "540a209251cebb31bdc87143fc8b60627a9296f488f58a81faaefb3c3cb66517e8a670e81b4363840cfa1220697d26517fc1bebedf43f62a4f1c18e3e14a8d65";
-    sha512.source = "59132d5d5deb62236ebdb4ec0335f3557cb4a99d4a5871ec40669801338f5f1b72fe3023a09160feabe2e0e1d2e1a78c8b803dc4d21c63cd3efafd4040224f9d";
+    sha512.doc = "57ede8c0f26e2e04a90695c278d7b3f044411cffa00f4d6f2cd5c194f51a4ac5af4684e8cf4b75c9ac16343783b8d438022fc2c5351fc3f12785635ed1068ee0";
+    sha512.source = "89ffd84b8ff53d35bf14171cc1e61a490894aa5af77ec91feb376571190eaf10ddae78343dd6b2fbfe0eb1739ce986e73c152050b2792be1cd8a1f61dadfb24c";
     license = [ "lppl13c" ];
     version = "2.2";
-    sha512.run = "1f618b339fecd44d21029ff9ecfb95a97e47fd5d20089a2115d70c8336738c794e1c639c78a16b5756d591fbe3ad52576e3923f6f86245fcc9f7501008382eb6";
+    sha512.run = "91a01b8f089243a9d8b314101963cdc1bf16cfdcd6bcde86d4366872b6282d3092a283ec1b4aef30950c1b214d815b8ec732dffd5cebca0baf6b7a90288bac12";
   };
   poetrytex = {
     revision = 76924;
@@ -40163,39 +40307,39 @@
     sha512.run = "07e1479df1d89b568388a855236d997580cb76ca6ea8f45b55622425d10584037cec5e17a734c24a0eb0a9746966e94137026c37d4696b475e641806d07a7ef5";
   };
   polexpr = {
-    revision = 63337;
+    revision = 77677;
     shortdesc = "A parser for polynomial expressions";
     stripPrefix = 0;
-    sha512.doc = "d2477a275477b6e47461e769fbf43abfc746769582cc916eab153fb7ee19e85285561601169dea0335d0c525b79c5435ee2d44ba931739eb9d903a3f2e3b670f";
+    sha512.doc = "d5e3a4c41ba731d6b5687ac14056ca544a81af6874f5241af88872dd84cb607761fca540d09c0c496bd7edee6cc478bfcd05a1fdce6704ff1378d20e14f7c592";
     license = [ "lppl13c" ];
     version = "0.8.7a";
-    sha512.run = "4d04a0a61b5f50c61eef41360aaec305b727e6d8686e8ef1742098a7980a6508e3455a8282a9cb0b4549d7dcd49cf065c49bbb7e710ca5120cb32567fd58fb8b";
+    sha512.run = "dd542f45eccb4ddfb2d7a29eeb0dfc0c63249625409d78b85b10e08d2ac6a5244a5e0f68b232eb3803514423fd5c8b79c8aa5f5c5e96ddda6cc2dcc42203c3bb";
   };
   polski = {
-    revision = 60322;
+    revision = 78116;
     shortdesc = "Typeset Polish documents with LaTeX and Polish fonts";
     stripPrefix = 0;
     deps = [
       "hyphen-polish"
       "pl"
     ];
-    sha512.doc = "755e7625d5ee1e4457e7ee518469d585c9c1e566c57bf147c62195555ae91dadb68f469127cb18a7c30cda1468129db09cb09b1974f5273d41c9491a6e1d5ffc";
-    sha512.source = "8e216956a95df02134cf411d170a75309c3f167a5bf7d78f77c4e47950c8a5da52e523e367f5ce60492fc0ab7cb205e9b57835b883225752731ca094d7c507b8";
+    sha512.doc = "67c834e2978005b556459fcbbfc21f75171a607163b7e2708b0a03645fe7b543427cd511a433dc276bdafea96194d187085502b2c6baff4bf0aa874b04d0f7f7";
+    sha512.source = "c66b9e5ed5dc769bee97861b6b829d4d826377a73f045941f3457da35cf3feeb7c7cb59d5bb1fbea0cd79c0e2a719977cc862a63cd8a5294cece7c8fa673ddee";
     license = [ "lppl12" ];
     version = "1.3.6";
-    sha512.run = "24bdb98990f66e89085056e6ad3e0930dd16d0f4bbd07a2c9a49931796e143505276d2025fee21b2b52d927c3b2992d31f4edae4668cdb549f6f00ef43dc1c69";
+    sha512.run = "2ef3fdc8dbe225e57a9423f95757fef194216026d202fbdd7379a6409b91a740fbe813e9b346b1aeeaf8ed0a9ee312e5352397b82dc2a0a1325a6dae38bd4ab5";
   };
   poltawski = {
-    revision = 67718;
+    revision = 77677;
     shortdesc = "Antykwa Poltawskiego Family of Fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map ap.map"
     ];
-    sha512.doc = "51067d3e930f9cae71d5cdf11d6ac83738e23539c020c93e6f4d8b460e63b04e77caaa41927ed8658056d96ff4fdcfc087e591be991e10c7e95a6b58d56ee368";
+    sha512.doc = "0e1506e25c75d7da08d0f35f50bb5b6b8a9cde365b6ad9a19cdb90a71c4b086189b59474961e499625fa19f33173279a2dabdf58259a1151d81eff721b5c9a96";
     license = [ "gfl" ];
     version = "1.101";
-    sha512.run = "620708dd3f1d2d8b2601377486631c2bdc779d06d2016e1c9ab5869afe00cb88dcb1ebd055b6859ad3e3dd25200c1079b723613283f048c7cd7354977b66b8b9";
+    sha512.run = "ee05ea8e1e992b9f08b62ee02da4090d2bc965445e6357cda3c9b5cded34387c290aed7d6119e7a73731ba99547ebdfb276a0b7e9ba8917218e8d9cdeb011c5b";
   };
   polyglossia = {
     revision = 76990;
@@ -40228,14 +40372,14 @@
     sha512.run = "26169961ab8e21114a4c44470da03fa510822b495f36afaad745c0324d45d5bd64e4e5587b7601fbb97156ba02ff18a2c253e175296f15f2fb3915f7bc15e060";
   };
   polynom = {
-    revision = 44832;
+    revision = 77677;
     shortdesc = "Macros for manipulating polynomials";
     stripPrefix = 0;
-    sha512.doc = "b0fdee90082414d88469ba5067f1c16279ddfc8c13627098bb3c2adfaded3c355cbb161193160fc5b9682d45a10216c56fe2613855528f9f4965479c681e6355";
-    sha512.source = "cf9dc9f13290bfd84e2956630eed115a132bcedfd34e6da076b2fa0fd4840fc5fabaf995b44f2a8f3c3d9ba9de851683a306271b272a83331a92fac367d82a57";
+    sha512.doc = "55edb0aa9af2b8aa3ce9e903cbf1876a2dd882411379118fc8a50985838a67589958f92795c733fa1246e136c09363b4fed7a6b58afbaed8795c5043dce55bcc";
+    sha512.source = "caf4e1bceafaf313cc078dc40f6de1b4ff576c8e86532aff523b9bbbe616e0dd1da8a11d6bcb2cef43eb789596ea754abdf65bab84edea6427831b8b4cae0fe0";
     license = [ "lppl13c" ];
     version = "0.19";
-    sha512.run = "bbff103f5828757f9c58c768ba46dcd9197629273b12d997e80e299dc1cf6a34e851fa4ebe088d131781eb6efc1fbd39cab602ba23b791c68fdb0e12f69440aa";
+    sha512.run = "1d863bbcb5e770c3a0568e99de74fa68102375cb98191900d202d6764b8a3dbb32ee2f6a7823ba9a364d953a000cc896557dc8f2292a3af1be3aa76587ede2cf";
   };
   polynomial = {
     revision = 15878;
@@ -40257,23 +40401,23 @@
     sha512.run = "f825a3d4fc6d0ebbaef5dc9efa70dac407b50d851ceb61cd78ba7ebaeb6d3df134dfd497fec440d4cc52c41f3fdfa2733c359cc3a7ec578716ae98d89efb7ad9";
   };
   polytable = {
-    revision = 55837;
+    revision = 77677;
     shortdesc = "Tabular-like environments with named columns";
     stripPrefix = 0;
-    sha512.doc = "5bdc4a4c8f95255343fccb6db79da434a6b883e0e2a769eac5c8accbb6343d3f5b8de2fd465c5e229ca0ac3e9964fbd96c50062440970921ebf70f01a3097943";
-    sha512.source = "dc5c2c007012a4a57a20b569adf784afef0db7b22ae88ac91f54bcab5f8a25a3dbde48a118ff5090d806d42954ea28276ed2adbddfd974972012a645805d9fc3";
+    sha512.doc = "2e852559d021859fbc898f23fce4fb0500850fdc6fa39929ed437be4f038c6a1261734889a135e2844ff110763af16e89256d4edb59d0ee5b12aede571508d06";
+    sha512.source = "adff076491689cc90961cbbbe0b067f45e380ed84abde8c00e788105bc08d0179eca2b80fdf958f5d490cd8c61f0f55018d52e192045c1ed4741f4ce63cb75a8";
     license = [ "lppl13c" ];
     version = "0.8.6";
-    sha512.run = "2ff55bb460357dc11b274ad3233e5ddd67fbfe05e60d25bcc69f1d06f9b0f247831cb5db4123b7ff859dfa88bd56fd5bdfc24aa992e98f5a17d0f883b40fcd2e";
+    sha512.run = "2cb0ef8944b97600dfe5658e060d8412c97480cfc23f9f4cc8ca0b09c2d67c93235ee78fa130606d3f1d0868fa8495f9d0f504923e2c6afffdb9428e65813be9";
   };
   poormanlog = {
-    revision = 63400;
+    revision = 77677;
     shortdesc = "Logarithms and powers with (almost) 9 digits";
     stripPrefix = 0;
-    sha512.doc = "7d99c4036411bd892bc0a520a42c5e2a1c1077c89e58e1be8a9fc991b87da3d22871e75669c814358701d17add447a7e6546a33a8ada55f55ce0814296273f91";
+    sha512.doc = "fc73feac2552120ad4292eec40855aa4b0dbdad67905956d7ad132e239f4120e995bb1fc8d3d6c009a652db05ee769ffd89c18048852be1e51cd768973e2c38a";
     license = [ "lppl13c" ];
     version = "0.07";
-    sha512.run = "e67561e7818e8ff9e02a43c02b8b992a26bef477176ce36eebaea37f56ea182bc9bedcfa56ffd8581b5d696698718d87f5319ac93d79032c4c27780ceb964851";
+    sha512.run = "91c4dfcdbc1ac04ad9718946457a0fc3f8938bdb043050bde9aba85a8c7adbe742c21f3bec7f160c72e99a9ea45e377c8768c4009611345252872cb2b927f45b";
   };
   postage = {
     revision = 55920;
@@ -40312,24 +40456,24 @@
     sha512.run = "15c239b578fc3993798c257656d47cb1282135f30407b696d0ea4114ad6d83f41b395b4731fde5e5d49fec7683843702def74f9d1aab0769b1f669cf3c1abae4";
   };
   postnotes = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Endnotes for LaTeX";
     stripPrefix = 0;
-    sha512.doc = "194bc6623d5d9fc88068de1f980c2e1cadcd2b3449e46096981ccf48a9c0ee91606c8d56354193b2a49bbd16032e350a25a9dbea51d316bef5daf48df849e32b";
-    sha512.source = "f1ba3c007de95cb60fbeedbfd566c05bbf1ea9784bf0d7b8d7bc5eb0f20aa88f0b96923ad697f504aed18052c50f0f3452f9ef78e855c6af9db5b52de306841c";
+    sha512.doc = "80572e3d930764e9b91dad917a890bcebafe16e51db2f15fc9887b9b3296af16fdea9034e5a9718a4423b7a1a4c8cc0701626cdf98fde39d498789d47fe09934";
+    sha512.source = "05775ccc40dc0263c4fabc8ee56ad5c8f0beaf19cdb8b2fe9bccf49fc843e2fb71683ec343ca73d783a0f5182bcac64297f9649ff5d7eb0d66845fd3a68666c2";
     license = [ "lppl13c" ];
     version = "0.5.1";
-    sha512.run = "8a6cb7ba06e87584a17a5e9acfb10a21178fa24d1bcb156c8a454d501e51e3edfd856a61a01372ecde2a725edcc1140b3b092e0e14744980b46fea27d3257d8d";
+    sha512.run = "a77aae84eb546b2e3a3819af0366703cabe29122e1a382933e589f522ea812bcf27968de05fee59f24cd17b7db5213d1fd925ba02d62531d2203264bad1fce0f";
   };
   powerdot = {
-    revision = 59272;
+    revision = 77677;
     shortdesc = "A presentation class";
     stripPrefix = 0;
-    sha512.doc = "99e602f4f96d6b805a8cb255d72f49c62e75543df2348471e31952a2588125724dfac07cd82865e9559220ef98a7b8847ab9ebd1ab803d5e155804f3669abe3b";
-    sha512.source = "cc32d07b304d6214fca1244823154290c68131111c2144592fb1b4134c59dcd0ab110542bcb64e7462c6959bff1bc9d1e2706bea66b0bed2abfde9c80255af4a";
+    sha512.doc = "99f7482eb8f5315325f6b076c7bcb80241056cef9b3dbd0e3ec27a051edac12cddaa4f4d245513411e3e1f0eebb7da8f2da53e8ba7021df282e42e7b37eb0f16";
+    sha512.source = "856cfc63cbcf5cb3987c7029ce815739b7bc1705fec8686cd58fc3610899ac3b14b38d9ff393495fe305d2fbe4d06b99ccd849bc8018c2e7e3f7e49901ed5c6c";
     license = [ "lppl13c" ];
     version = "1.7";
-    sha512.run = "c8ab1d65e2ac0695cac0e8a0a683fe712ba51e8aa028316901e1ab6e31b0be68348066fcf290b03321c0bacbf5c0b16265b28022ef38137a3d89bd25aac58dd7";
+    sha512.run = "5b14d3ce11758cde7f9584fbd942647be219bdff28032950d717d021e6a0f15a710055c9c2dc43fc28874acc90f1db8e57474593fda476e6f08ef07facc1fa2a";
   };
   powerdot-fuberlin = {
     revision = 52922;
@@ -40436,14 +40580,14 @@
     sha512.run = "51b709f5c9bce0b7e45613bfade25f4486f232896ed1badd27124abde088f5c9ea39ee95006f62d153894192663c887c323f1c64e190aeceae4267da728be012";
   };
   prelim2e = {
-    revision = 57000;
+    revision = 77677;
     shortdesc = "Allows the marking of preliminary versions of a document";
     stripPrefix = 0;
-    sha512.doc = "196640bfbf73f3f269f5b27f024f4c1e677b61b6cc452d796f025196786c166f60bd2f41ad83ac6cc6b9eca56778a07b77af05fc68f05330f14c92cf391bbbc2";
-    sha512.source = "1f2629a45183a026fe7bb3c83baa96ccf437846f902b5075fc210e47b6e3b99e81e5983bdcf617ba7bcdea60851154cb70bee3abe227420b5cc3c5a65e631973";
+    sha512.doc = "acde2cb257ecf43265a05ac96ba935dbea1e298b7abdc782eca5ef43ea43f71bf040dba907cac4ec67ecc2e2f33ce1511a589a057e6fa670df87b0a0dc7d89e0";
+    sha512.source = "28d2ba74f2010852c9c064e5eabc542ed8109b5a47fcd186ce66e10b4b431c38271cd9c83be51ac905192ed7c30d2ebf7346ed3a9ebba0c6f6044a81ec33129a";
     license = [ "lppl13c" ];
     version = "2.00";
-    sha512.run = "9f9fa79056db5be108c3b34b2ad61d964ba35fc1b6f7e9375c9e2ccbf66cd2028ef9e6689751c90c9ca236719ed1a001ae26753305fa3454bd88650cb12ae82c";
+    sha512.run = "78650ae09f97d742c15d010e994d5243bfd6c4a78d49277bad39d1dc62d0a1cb0f1c0802e29f573ee43e9922a046fc68f4e4679e47c6a5487f7a0f6a7b110102";
   };
   preprint = {
     revision = 30447;
@@ -40487,14 +40631,14 @@
     sha512.run = "0f983d4f836c03ede4ed6bd8c2c41dc69ad75a28d9006ff7ab534c6e483e84e2151bfd93fefa43ca327fbeec14787b43205457a9cf1e733f8a4c3a7c561498fc";
   };
   prettyref = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Make label references \"self-identify\"";
     stripPrefix = 0;
-    sha512.doc = "abcd8cb7e7ab78511d953d95699060581844dda67b3489317057782d97388f7cba990735b395e9563e15fd1fee137a86e8198d2d545f437a2d105bfd3e95bc12";
-    sha512.source = "d4793c0cec0e56a74d05c08547b68a83e5af33464b3c29a50189696c4d000ffff370422192a289a734e42cb4ef6bf2b95866523f3d6257961608e95f13dfb87e";
+    sha512.doc = "17fe3cdd599b8eee8e32dd1329250febd5e7d18d4418996eb36db53548ee61ecf8e9add666bfbf8b7e1c5676ce105d5cbd01eb41c429ce6d9d91ed9ca806a5c0";
+    sha512.source = "ede6a6f41ea8969e9bc3e3f8936f19125e57a79e44a812ce43eb7fe8d1769988a3dd38ac1ab859e96eb32e984579db24876a7f6873174cd4d13b87d43e252370";
     license = [ "publicDomain" ];
     version = "3.0";
-    sha512.run = "06e3ee942b9a30ff866abf8f6a46b6960321c0aaf2516ce48f587a55ffcb66f158887cbb9a476bc6323e90edd22766fec19d0cfcc2be8805eedd175fdf08ef42";
+    sha512.run = "a5370442942182afd2348b38a1bd99e89815ea7a1ecb0c51512bfcb77232498c6cf724d0c145bcaa5e3d3ef290b0a165adf5928033eacf5742893648ff48747b";
   };
   prettytok = {
     revision = 76924;
@@ -40521,13 +40665,13 @@
     sha512.run = "4473785d21e7729fccc9b523b0d31572e2d437126ba585d8e74266af4a098a2b3f329331ccd188438edc573d540d31905a74fbbb723c472344e6e3e5c42ae1a9";
   };
   prftree = {
-    revision = 54080;
+    revision = 77677;
     shortdesc = "Macros for building proof trees";
     stripPrefix = 0;
-    sha512.doc = "3b4d81db24039d15e76e0b237ecae6454d54b452b542e26ba8e0c45faf4f512124f0c1d1f5fef3ca6e6dcb3c7cc09eead3003a53a59a689e5e917583585c045e";
+    sha512.doc = "6108669f87c055a12666be782f3000941550194d79abe3074e0b19b76dbf676e5dc392a2f4b4b5f5e4c65a14e7f43e3d247cc7ad7db28925e708a66695a20c5f";
     license = [ "gpl1Only" ];
     version = "1.6";
-    sha512.run = "d73717b68ce3d12108a76a3850f3a09b9e1100969e79c745b7b08340175ea9599f10f928809fcdbf8ffbece3a60baa41d84dae182ace8b85ff511082f1db70d4";
+    sha512.run = "49e7080eeb73c3896a405932ea38cb19520d4ea52138d8980af7d7f514afb8107166e848a0cb7e1dd6b4d0e0dad83df138772c6dc73910359daf5ac59059c869";
   };
   principia = {
     revision = 74710;
@@ -40539,13 +40683,13 @@
     sha512.run = "dce8a85d65eddcb5f52896faeba703e1fd47f6286c0f2f45cfe130822e219eb85f6f2c2359cdbff77062976387c7e7f0c468147e6a742739b5897ec94c86dc1a";
   };
   printlen = {
-    revision = 19847;
+    revision = 77677;
     shortdesc = "Print lengths using specified units";
     stripPrefix = 0;
-    sha512.doc = "25d00eec6c6bd069675cf7d980886b12444e41d18a83ed8e650923d839da8dca21dff65b110105458767b95c50b52a0143b2f7d88b6567ab3aa9953f4ec32a88";
+    sha512.doc = "6db866b40b5324014526d20b293ac2261e81c6d177ef17107746570770e2b824ff708b9553fa872c8d30204326695c44cd3404c4a2ad0faaec2cc21ec4ca59c1";
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "bbb48c169f31a1f93024195056c323ce67afa1fcc00f309ef1b820dd40e0b86ca98d05f6cd4af66379682813a3807f24295a803fdc91d8b9f19972e1520d5eaf";
+    sha512.run = "3e8504119edd8c33d1f377a2f0999553a349baee5aa906088b24f658c9cd7fc6303688f8cb35d8c0ea8143b9e7715f95bba1229ab57af6b0e22f21d4f5c108d7";
   };
   prisma-flow-diagram = {
     revision = 74874;
@@ -40624,18 +40768,18 @@
     sha512.run = "7270b65b821c303e84eec760126ad421dd65fbb5ff81309142690f8820c4865c3b1ff39b22b2cf700a10920b973e18085a1e73ea3f6c9d90da984d48a19bbca7";
   };
   proflycee = {
-    revision = 77424;
+    revision = 77891;
     shortdesc = "A LaTeX package for French maths teachers in high school";
     stripPrefix = 0;
-    sha512.doc = "5e528eb4d398293c4c1f533af352b2ff654c3b2d2acc1c3615d057cfb32e0c7772e69c71cc23c151d7dbb91320017d3fdcdda36ffb2cf2a53660da72e19b8c6d";
+    sha512.doc = "225bcd74a0d385e2c595595850c20f70d2e07ca69d5f6945d0743c6d082ab4e92afbf86994bdd9c8b20570c310de1ed1c5d02fed9c713deb7da78c4d9c6b3e3d";
     license = [
       "lppl13c"
       "cc0"
       "mit"
       "cc-by-sa-30"
     ];
-    version = "4.00c";
-    sha512.run = "202093c173d79dbaca32504ee4e7f32d50abe63ad62a140f79ff396738c4f32baf50fa74c8684919c8142e1265b6be112332d7643a2ca5f4b76d267a5f67c544";
+    version = "4.00d";
+    sha512.run = "203dd9dee54642bb07cabf72d76bc9ee6042b5fcc8a40b9a4c4555831c8a8315355f5592ce63a55d1a9df92f9929391242a564e5594c846b69706d2f11bea5a6";
   };
   profmaquette = {
     revision = 77282;
@@ -40723,14 +40867,14 @@
     sha512.run = "79787978d7888ba127b9b72ea38f0f3e7ef9d427cf8e493120849cf7c2852ffe79b5fbf349160bac419be0725a9d79f33a00c13d6b3eded2cf0600b7d0994513";
   };
   prooftrees = {
-    revision = 77411;
+    revision = 78041;
     shortdesc = "Forest-based proof trees (symbolic logic)";
     stripPrefix = 0;
-    sha512.doc = "d42221646ea773e80abf5df3d38d4fdbbe0fc89b79d3be2e18071366676c10ca2d96ed1e3410a454c8b987c9f2c3d5d90780ad60004e224ddedc727a602bb13b";
-    sha512.source = "d620bcf04edb38511a558af9bd0a2d678a925a72ecde17c7c2e1c55b05a92cafd680bcc0f7d2bde31062e5ae94f51f948d1fc2021edc5d822febabba7375ede9";
+    sha512.doc = "e0da78b3b60f6b09a54588ff8b985bd7616a7959ceefd3f298eab1bfbe9e515a904afdd744136c601c9659e6016e32107fc46e29023e26c59648115a8e69119e";
+    sha512.source = "3072b992b06495d428c576dadd477657040cf2332ed3e01d776f01ec6514141e40b6814a2229cce88b684966b0b89f0ae92efd760703eee221c8d7d8dece4c9a";
     license = [ "lppl13c" ];
-    version = "0.9.2";
-    sha512.run = "9fa4e5897fbddfc946a31025c8b29230ee1ab7360305f0805485d598304796cb1d0febaa85d16c6eee29b7479f5ee5028576ec00081a6a5fc92560d5f683c06c";
+    version = "0.9.3";
+    sha512.run = "df3e6970cf70ac3585d50f276aa542e9ab4eb72e0af041316b7aa6a27f0170cc3875d3a3a00241d6467fe584cb8996b8e8219e1e13a68347260154f0633ace2c";
   };
   properties = {
     revision = 15878;
@@ -40751,13 +40895,13 @@
     sha512.run = "d9a352995030efd57ecd46028147a6326ede0695545194a01846d4a3e2d29096ace9e6f69900766906f3ecfa05ce566ebd1c2c5f76a3b2b2646c1e0f865093ba";
   };
   prosper = {
-    revision = 33033;
+    revision = 77677;
     shortdesc = "LaTeX class for high quality slides";
     stripPrefix = 0;
-    sha512.doc = "21593ccdc8231e37f0b2938d3978205ab3ed61f74a6e8a4b1dd2cf82da552bd920a7711c025964fdab5661207cbea1aee04244c93552e20d10df338c7dc5c138";
+    sha512.doc = "9a3c5d8eb8e397fd2bd7aad75b69ade040c0218b353f7e53a98ccf4ccb03c018be25e08990cb8f2e56d527904fa1134076987f0f2051d224ff5713d6996bd226";
     license = [ "lppl12" ];
     version = "1.0h";
-    sha512.run = "bf2285803a71b00c67a9e64ca5e51bdd880856338b0bf3e95bfb2ff2e78d5cdd0617424ed95918b5982d5befa71476b89567b2107eb0c206f9a9f53966a983b6";
+    sha512.run = "75d073c82533fb7918587c6e59df5b3a772677936ea026473b10291f0bc3b31c95e006dd8ccd24e81e66a75fe474e1a32737e0ab6193a8b4004eca04af0d0230";
   };
   protex = {
     revision = 41633;
@@ -40874,13 +41018,13 @@
     sha512.run = "b02063b8c1df58133b951eb10763d3b9099376a473dc980fef801ab565326ac1c5539be3ee94ee5c79837c1e6265cf41d6554f66e8900df2663d5d7e727e0df6";
   };
   psgo = {
-    revision = 15878;
+    revision = 78116;
     shortdesc = "Typeset go diagrams with PSTricks";
     stripPrefix = 0;
-    sha512.doc = "9d061c884f76eb87e86cb441ebb693a9c64daca024c35dd631d660f3d1f8b1541c40e285d5f4115b36e2b02b7640ea7be70f4527e7ae92c6d6173625b215b7cc";
+    sha512.doc = "6df1251fac6609ec5602a4c8f4cb3356a0ec6d0ad7141fd49ba2936fcf0c079b87b42640275b76f2bb025bcd526179c31193daa3bed2bb96be68647062c0b63d";
     license = [ "lppl13c" ];
     version = "0.17";
-    sha512.run = "75791ac8c340cd72139c50b2e2a05f6001edf2b79bbb9fcb4c9118f2acbc67643469c8f6da34122bf001e85af60b5b0050bf3c7b5bcce7c393e7930e3cfe7eaf";
+    sha512.run = "ed8664980dca074b2241aba324d25ad58616e5dd5d6a39a210a4de81ef2aba1f62cfbc7ce89142a72e58b4eb25eea58bbbeaa1c34f257907f467bf5837ba68b4";
   };
   psizzl = {
     revision = 69742;
@@ -40902,7 +41046,7 @@
     sha512.run = "b08cbb8ed7a4b89b9018b5b31bbaaf8ae9c520ffbf47b54d239b30ca67a26e138206c1f2f9951f8cc5da49357c0eca9a3df9eda4f02119355cf2be0a85c3a825";
   };
   psnfss = {
-    revision = 54694;
+    revision = 77677;
     shortdesc = "Font support for common PostScript fonts";
     stripPrefix = 0;
     deps = [
@@ -40916,11 +41060,11 @@
       "Map pazo.map"
       "Map utopia.map"
     ];
-    sha512.doc = "d1c14edccdf43ed2c786394bc04e9fd683b683532a9dc18d592f918ee8899234d23feb738128aa1418f441288cdbf0c6de832f8c4d98023926baeace36365a1d";
-    sha512.source = "6862a7e74be6a575996e6f45a2236db810f1c030d3a0c53b2b97c2e803fc7e29010108e4597d637b8abedd63b1f956da268f62ca2c609accaa4d035be7bfd8ed";
+    sha512.doc = "c1dc45b0d214982e4309f44a66d8cd86d60e954a8fc2fd9e00cbafcdc0b24e3477dbdcd12646ee6cd99a23e60eac0f1b7bb22dc29a885e8173b0f5b7069f5a76";
+    sha512.source = "6a31b018c5536487f650f8fa42d2939449540c46891a384a04ead9e52fa705b1097a0aecaf189a4ae2108168da12bea08a50e9be0c08835c6905fcee262b60d4";
     license = [ "lppl13c" ];
     version = "9.3";
-    sha512.run = "f7d1acebcd1d32a691221f396220358f3bb15dff2e2cebec4b537b1b790b68d8ce1164711983a52b4f04d6e470df2e3e5fec63bb1d3bf39fe205d5f0351299de";
+    sha512.run = "dd1dc8477e1e530b2e91be931066729520f9cc2543afaaf53031fdaf9f0d63f8c78a04f421df5e18090185bbb69e4757ba489b744bb1b654fac461fab0d05e72";
   };
   pspicture = {
     revision = 15878;
@@ -40941,14 +41085,14 @@
     sha512.run = "3109c2709323906ec39bd1be6e7c9151b7b07f9d2dafd5f7af61d3facd3e37ae35bd8bd923968102fc702f35fa4a903e9a50d3a7a85a1c088017aababd16d969";
   };
   pst-3d = {
-    revision = 17257;
+    revision = 77677;
     shortdesc = "A PSTricks package for tilting and other pseudo-3D tricks";
     stripPrefix = 0;
-    sha512.doc = "e8355b936fbc1685edf205e88f2793ab298aac4e4c06de10dddbe1587b5401ba8cc4d2a01dbad3ad56da5eddb27bd6049a41e6da8c139727d36fcc94d93ac554";
-    sha512.source = "fc50cff8bb86571d3827a03f3c64cb62a9fdab25e2595ccf9465e4ad39539ebc0a55da92519ef203da65da3a44e01ee28b39ef27a5af24d26463b215f96be313";
+    sha512.doc = "293eaa1ed1a97b4d24e693fb7f31509eef5af695d30585f8a8d87eeb93205554bcdb9e9cda017843da846b2ac47040e47008a324c6eaf210a5e9f1e5f0dfbe5b";
+    sha512.source = "2ed66b1e8f3dafe976865ef2be8f650d09de7ba1681207180bacfc29f18f3ac304e9a11fe0c047990d0461beea57e03bc0386f144165a090c2035e769d71e087";
     license = [ "lppl13c" ];
     version = "1.10";
-    sha512.run = "dfd8a2b79d308cf4ae3bdcd438b967446f8601509fd4afb3f090d946df0cc2d66e9b7071ce33e51ad4cd53b7e62dbc02d861d46a302bfe2c901d1d8c82ab0649";
+    sha512.run = "cc47056998806ad4d0cf1635762c736fd32acdb9d6d0d7ea9f4ea1d1f5a31a7f4f7d20fdb92bb21c487ad712c14e00502cba1b16b4acbbc697a10e6916a4be0a";
   };
   pst-3dplot = {
     revision = 68727;
@@ -41016,13 +41160,13 @@
     sha512.run = "a4ca273cf21aade2adb15a8fae3d7aae9b24f4cc4a81002cfe0471aed7b5cc7be516aae26151a8bd2d98171f5524686105f3576df8cb0ecc6e16d690907f7156";
   };
   pst-barcode = {
-    revision = 77091;
+    revision = 77677;
     shortdesc = "Print barcodes using PostScript";
     stripPrefix = 0;
-    sha512.doc = "66eb64c7f1efe3cf39da5381afd282990f9d8dd9e10b03690145687cc1eb10398a8b75fd8b01c87bd0e48e103e898eba81882ab8f95814afd6a38cca01942118";
+    sha512.doc = "12a1d73ae037a0623a480537b8dbcea85214749c80302adc321bea301a1a9b425ad0a607e04a681de43e8c71a1b7958221ed1dff0917b1bed6f8149be800b812";
     license = [ "lppl13c" ];
     version = "0.20";
-    sha512.run = "35f0e09f0688ee1bcf4b4c8cfde39a8d4eab2fb167cf438c192982ce1c27c34b258cd8befd18eb2103acd2ee237a1ffde6bcac09fffb5cdfa338590e5a042091";
+    sha512.run = "df09469a08f59ccf690fd3211fccc6f5fa0a0092a8ea1e8915de5f1189de27d1c7d3ab2820286b4ef4481f2f7d0f97f05bdd965108e8b7edc6338b446c0a7703";
   };
   pst-bezier = {
     revision = 41981;
@@ -41053,13 +41197,13 @@
     sha512.run = "1f39a02cb0d56b4fcb8ed3a3768b59a9d14ac14769783dfde7108d86a8c6d68d79342df501c60efcfb8aca4c7f97fffecfe4cd0ea0f4fb76e528f696180b6dfc";
   };
   pst-calculate = {
-    revision = 49817;
+    revision = 77677;
     shortdesc = "Support for floating point operations at LaTeX level";
     stripPrefix = 0;
-    sha512.doc = "d6e936e7bc53ae3296812b1d33ecf6ae890599cbb9fa6afac719d8ebcca4516772ff6c18f27e8d825ab959d430cbfe8876b2bb97e480bf6464690b28cedfc2bb";
+    sha512.doc = "d04e335d0f79f7197349e3218af22c1f8be8346ec78cbe4bf4263e3e2abe8bf4609e113d0cbebf44fe219feebf8c44a9405df6c06f4e8d9f4e44854277dd4019";
     license = [ "lppl13c" ];
     version = "0.02";
-    sha512.run = "b40a89c1e0152459e9dde468379b1a848955d40b9d9e05223544347d6057affac092a503e6307904e485a81de781eb9455abd948bef7f343359d44abf37f93ea";
+    sha512.run = "26b70adb6857ddb82a31162995cacb77f1f5133a75789f71623247f5815e48e8926b15b96f3213934e343ae013c6948c3133dd0cf0fe7ae95dffb3731073208d";
   };
   pst-calendar = {
     revision = 60480;
@@ -41089,13 +41233,13 @@
     sha512.run = "dab99cf50c712a350a629256a946f067b6ad91a3fed95174724ca36d381292b3d08b7246d145151b117039ed48de482471f7ad09813fbb545525f5b7509eeb3b";
   };
   pst-coil = {
-    revision = 75878;
+    revision = 77677;
     shortdesc = "A PSTricks package for coils, etc.";
     stripPrefix = 0;
-    sha512.doc = "28448330f17c274df993fad0c24c5e0a9f62e476a3fd1f6ff1be7156c00537be78465f55a4c634b2deba30b6980cfee3d760957a67b401b4827bb802b96ee919";
+    sha512.doc = "d3a4d6c7d1fdb26266a2679303b3978a220f7750366b12d6c7c7bc5e90cfd7d72899c6a44449cb204e87299a9c1511b9ea4e35ba6dd6ad75c1cd6cd68a98fabe";
     license = [ "lppl13c" ];
     version = "1.08";
-    sha512.run = "6909d022269986e1c6b17b06de9d6dae42074a5f6ccc1da9617553305975d3b3ab79ee70491e95f224514730a30ae8a65e2955da3b4b2fad5d51e3dcffea5f8e";
+    sha512.run = "95334a485a4d9241c7a55943cc150aaf1aa6fdbf610c9ff78a96d8c612c8bbd74ece579495b6bd26f7711377c66ae258b5eb87dec9c936efb22a4ee6e0173feb";
   };
   pst-contourplot = {
     revision = 48230;
@@ -41154,23 +41298,23 @@
     sha512.run = "db9f7474d8290640d960f411574b6dad9f9b705eaf68644e001ebfc5050328673f0c1c31f925c6a2cd2279b9bb7ff89cf8d21e71a99e4b937137af404d046df0";
   };
   pst-eps = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Create EPS files from PSTricks figures";
     stripPrefix = 0;
-    sha512.doc = "70542680c550bc11bef851cfcd12010e17f35dd75adfa390ffadc7b920c2b357594ca514fcdeaafcf1bfcf1b9e622b23c680adbc64ae4787fa96ff94f9a62add";
-    sha512.source = "97e2adee4ce93de77d4d46946795565dfa0e0da188fd686bf96917b1220661510c1777fb7d025ac6dfca816bb8575487d45b180e4e35cade21353dcf4a8e5540";
+    sha512.doc = "f5c8e4bdac237537adbe973353e1d0c281cb049a345db798c16eab47026d6c25c50240027e0154bbb8f142ef6fb68f9315678a575f79d8c9d0c0fc70cf3166da";
+    sha512.source = "fb4722aad2a69a587aab61a296ba70dba2d0dbded7613932e67ccf32b437542c2ef32866b812bc9e8df38ab230ebd1ecdebeec06bf32204fe8d1580e048da508";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "90be1124bd22958b0a9cbb45a3b76513e514131c416c98d7f70ca101e7841980c33bd8380e888054cedb873143aad168b0dc25918d9e241f763b9be3ea1a76d6";
+    sha512.run = "464b10031d71ee0585d8d7ab9ca8a3c2c66a1a9779bad62478c58b59e7b3b11bcc12ef92d649b4104fd4599e5d903186a196d4b5ada09cad369a16df7f4b0e84";
   };
   pst-eucl = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Euclidean geometry with PSTricks";
     stripPrefix = 0;
-    sha512.doc = "fcb30d6c38ef9d90fcb3c93c023bce33556785cc923c8ae9fd307f66f39aa895caffb6fe82c5b97211bee2bb1641685afbeb310646681f345cda4ca6f2491dae";
+    sha512.doc = "21d4b93b331866da87f1c5456f575e33a4301cc2e596ed6c7b6a4cafc6d167466d1b5f94a8add3105994a7714b50dad70d64dec74473a7552920ae9e2f9b2474";
     license = [ "lppl13c" ];
     version = "1.77";
-    sha512.run = "e03770e6f254d20c3f59f65117e6f5c0fad16127eed50a96d7dbc1d7fd26e0325ddb1650e21d6160930b7788809876a8bc7615b908dd3894ae05ac19e5299e27";
+    sha512.run = "f7ca39e4278c245c922b01aa9063f099c79856a0b7596dd2f49daa4c2cb13209c3fa8a8e5d3aa9e0a7eebfaf7686f7de7379c406de769f7be0a34b2745f83e0a";
   };
   pst-eucl-translation-bg = {
     revision = 19296;
@@ -41199,13 +41343,13 @@
     sha512.run = "c1ac123bac3f92fd92321387be28f519963ab196fde7ead8ed6b4c93ff9fe5cdf07bfee65bef67b9cd70d020adfa99c72592df9be376d69c5dadcb8bd0d6963b";
   };
   pst-fill = {
-    revision = 60671;
+    revision = 77677;
     shortdesc = "Fill or tile areas with PSTricks";
     stripPrefix = 0;
-    sha512.doc = "ad51d3aba8d9ee19b4a53081a5956e8cf26f2673faf521af088076c6a356e321ca2fb9a0b504e61529c5a2ae49480b3918bd12235a66ad5c45035ce92e2eae92";
+    sha512.doc = "408fbbb8c2aa1b6bf4b2bd865f9082c9ab57fe2d98837472a480ec1e443b03d9bf1d397bc766d0be3ff47574496d05c2f5020ee9c8951a00083e1c8e2f44b96a";
     license = [ "lppl13c" ];
     version = "1.02";
-    sha512.run = "5fa4ae2e862a9297073bf0559dc46d44109d1153571eb8538650410c96f5c43a9a8c85a379690820f63a5198ac1983fdeb514bf4b1342349352f1a16ef3ee375";
+    sha512.run = "91fa2a0a13cd08552b3949edd2851edd548c6ad6f3cbb522c3ff444df2afd62a160361a372ca9ad4dbc77585aa481e06b5be9398e81cdceb7dfffbc0feb18c4e";
   };
   pst-fit = {
     revision = 70686;
@@ -41263,13 +41407,13 @@
     sha512.run = "68d0c52bb40354a72b2eb14d2c10a18266badedd452a57e4c2a9aaad343b94f5c13f89853962e85c94ebed9274e87c44cc4ac1fd0203ec54097f71e5c4a15fdb";
   };
   pst-func = {
-    revision = 70822;
+    revision = 77677;
     shortdesc = "PSTricks package for plotting mathematical functions";
     stripPrefix = 0;
-    sha512.doc = "29fee5fee9fc2cc3b0fbeb04864c7a1c0a2697b81e9dcb9dd6a98115f18b83a902e0c1331fafb9cacc81c933c1c0e7f926932b434c368bdf31914dd028e80edc";
+    sha512.doc = "6f1c5d2ddd2220587bba8cc205c41c5edb1efce36d010ae13f379f9a0a3e6afe422a0d82851f8eaa4ff044d6526c22ee8e265c163e9693dd1f9dbaee05e95793";
     license = [ "lppl13c" ];
     version = "1.02a";
-    sha512.run = "4c009fe09b0cffc4d7d33102013593392d8c53d87adb951f01b0c543c33763d3c9f55ba76bc4cb9dc2ed3ef000d96f6d9cc0ae90a83db8d030ca38822524b174";
+    sha512.run = "972d3d41c5a5d7c37fe0b18159109a6ba28c141d69b2a6808e8dbd85259d146b624366f7b80eb613d0a6d5014038f878c2cd342238e191af43cb5868f5ee0a4c";
   };
   pst-gantt = {
     revision = 35832;
@@ -41318,13 +41462,13 @@
     sha512.run = "85cbaa41c3cce49aeda36ef55a89122370fc23dc91c5e5e63790aff2b8b748eb6a13a9a921836b2a471ab2deb9577ecf59be0bc6dfa4d2f1ddcf17bc33ca4264";
   };
   pst-grad = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Filling with colour gradients, using PSTricks";
     stripPrefix = 0;
-    sha512.doc = "11f4a4de67f92bb2ba77457b5940e2b848985de111e3307215981e6d39617b8590316de5cb6e5002748d9e951be405e3f938d1708c28a7970be53808688c10ef";
+    sha512.doc = "fa723de4d790c0a2d9eeed478179e1911132c2a160f0a74e78d491f850794fd8b5603a58a7d15aad195889bc31252a25675b73b6a96943f0affcbb1b5f241a24";
     license = [ "lppl13c" ];
     version = "1.06";
-    sha512.run = "f98fe4e4996e20947d90ef24d6825d72a8ceb6bbd586b0de9b90d5d73208816395e5b195dcda2816c8e709fa4c408f3b814c02911488c83a207039d28654b9e3";
+    sha512.run = "899879d011f737397829c1f49d94ff37e5fbbf9cffe456a632e32b1b55ca3394717cc51eacd653c9efeaaead66287f0df79cfaaeae4d35cd6ff5a1d0c43ad4fd";
   };
   pst-graphicx = {
     revision = 21717;
@@ -41465,13 +41609,13 @@
     sha512.run = "9fc35c7dadd8950e5613a1fb37dbec26547d74d3e1c9ccc8bc97cb20fc73a4c08ba6e710bd9f39c46fcdebf4a5447692028a5f96c17945244cf110038943ff0e";
   };
   pst-math = {
-    revision = 67535;
+    revision = 77677;
     shortdesc = "Enhancement of PostScript math operators to use with PSTricks";
     stripPrefix = 0;
-    sha512.doc = "1b07b3086fa3e1d12f255632ceddf5b30c219472763cc43c0649b669a6014bb76e3a0fe7c182d0ea24c54fee8d2efe8399867321992e20f7f418d28198661bd2";
+    sha512.doc = "f8680eaede3735417dca9123aaaffce89870d48ee74a88cc3f092936aa7c4142dba4f1d0ab76fe6e57275746d990ffb7fdd0237b37079e89d09a3dc9d0f0f3e7";
     license = [ "lppl13c" ];
     version = "0.67";
-    sha512.run = "12bd81bed4fc5de91cd4db49cb97a9911848c347a9a9325cb61637368bda4e0f35f9c5c348bd385d46907b61aa06682ae1a9d70616d4c5c81659550064d4cc0c";
+    sha512.run = "ec79858f14bffa2611104b4bea2eaba24da05671d47a603c537392b33b4990b74055b0a969825b8e395adf85383c1d825912d21cfac047270acbcbe04c75f41f";
   };
   pst-mirror = {
     revision = 71294;
@@ -41492,13 +41636,13 @@
     sha512.run = "60fb7e65170ec16f08f4109794afd657436fbb42a18feaff2997fdef20e18376810c3b34e0e341a5e577a6d08d6bf6314adfa51611d83a4e66245f112581d678";
   };
   pst-node = {
-    revision = 71773;
+    revision = 77677;
     shortdesc = "Nodes and node connections in PSTricks";
     stripPrefix = 0;
-    sha512.doc = "0fc13af7073a64f033a89fd2cc8ecb3609e2a8f9680c23da6ba0352fe4cc3d90ca6ed0cc2f48a2461ab3f6afecead9c00bec2c05b58dbda667370ce142b1f41b";
+    sha512.doc = "378d50bce9a9273e10fe57c7ddb2e559f1c6706a7c292fca1d6ce88514e7f9fc9bdb9ed96af0dfd3e87a11cda46524a0c00f3cdcb9ff81890b585c014a5e1f53";
     license = [ "lppl13c" ];
     version = "1.45";
-    sha512.run = "a994b81b4b863bcd60df2c0a061e31a060530f55650421904406cd3717ac15d195e0003486a9d087d333c5467793b6a25dc2e23e41cd46be37cab6e79ef5a66d";
+    sha512.run = "988083ac33dea4ff24f75dca74efcf5855f9c513a45d93418fdd0d0142046b769e9e053e46857f78ab72284a9230d26ef1cc6d50ec84c55a9a3e2627eb8c9d03";
   };
   pst-nutation = {
     revision = 77145;
@@ -41557,13 +41701,13 @@
     sha512.run = "c888d41f7e14cf311b359fd37aa0557fc9fc639b76dd5db782099f6d307c4e5e3214df2a670fcdd3625818e461c34ccc0e50ba617714e58aced1c71b484b63d8";
   };
   pst-ovl = {
-    revision = 54963;
+    revision = 77677;
     shortdesc = "Create and manage graphical overlays";
     stripPrefix = 0;
-    sha512.doc = "755c786cec204ad3dd41043d8dd1bebb33ebbd889580a0a85390ca8efc318076ec9300a8e38b99788bf348a49dbda8ba5f3c758ace788bd9de47c251dd4e0407";
+    sha512.doc = "c8b21de1c246f3b3448a9ba8804fc79f7de6a96bec653a1553ab20eca299f8a6788a60863fb4565dacb1430f26a6ba26061a7ee17bb32b2f376f0159fc933b7b";
     license = [ "lppl13c" ];
     version = "0.07b";
-    sha512.run = "e3349edf9643e5d9e370b5dbf1c4dc3078ec82520c943a81ae353e1ccd0e2476105813b0cbbbeb707de5419035edcc39748c7e86a69cb90f8bc0d61d70f553c5";
+    sha512.run = "eded4d116bc906e5dd28d8da6a4bc2aa4c3758869a74c8a081f2e043d72cd71a2714f7319ad895e162a2030ef52e65d13ffa140e7d50d5a56f7e79fc6e6ac125";
   };
   pst-pad = {
     revision = 15878;
@@ -41576,13 +41720,13 @@
     sha512.run = "cf519f69dfd1003ab17a4a67f309336442bf35497cd0102e346ab8537865540c314666fbf01cf6e3e106ce922fd8922ac4bbb5b20ee90a7ce24a7a98ee974006";
   };
   pst-pdf = {
-    revision = 56622;
+    revision = 77677;
     shortdesc = "Make PDF versions of graphics by processing between runs";
-    sha512.doc = "eb5013040f3774e81d019c0010e8fb507d22cb2fb9c74e75f2c14aa0e4edd20245ddaaa3744fec7204c607b5f6329425f8f2b6e09bd153e6df6a3ae39d1e1625";
-    sha512.source = "1c353ad8d3b62fd5e5bb8746f69f00b8df2c7b53dd558ec8b24d571b1fe84fdab02daa4d7193f67a258c7390d50f25cd5270578d742b085634980eefc744b09e";
+    sha512.doc = "c9b0c7a039ecac2bb14e89278deb474a93a3948b6023d9c8aab05df44c15dc1bd72f26a6108f2f2b01406dd95283737e19f6fe14bc04d4d9f3cde186a5143e11";
+    sha512.source = "4e107bf3300a573be2d8d8d0fa87dd650ba5d8d02e2b2d0e6750feed52a64cd67efd975dd4ee6ee5b6ae2ec5b3b4acb9670fd9098deea939eaace611c1a7db62";
     license = [ "lppl12" ];
     version = "1.2f";
-    sha512.run = "5f5850f0e908bf6b10977bf616aa82ce05d1f0afd4127b5db14379a510ca62614a3552cc85ec0136805fb479201c817442872f9d1074fa6cc1367f41403476e1";
+    sha512.run = "fa058f89c424244f57c177a96d2230d7b2d24212c97ae8a4328c34d1b44ecc6b832b15ba1f9b8f43252e5a2e89818539c1acadbe78855f192674b005df7e85be";
   };
   pst-pdf.binfiles = [
     "ps4pdf"
@@ -41617,13 +41761,13 @@
     sha512.run = "8eade14982b0ffa2c5e7d5c68a91d4159ee6f3317b20836c3f470ed68940a522459bdce54b1e1dd4068173e50b0c611531d1210b1651d805602f952a1696626c";
   };
   pst-plot = {
-    revision = 65346;
+    revision = 77677;
     shortdesc = "Plot data using PSTricks";
     stripPrefix = 0;
-    sha512.doc = "870ef12eaebc4078ac0906cdfc225991714a55dd674cf7b757ab7b7925728ab771bc63612c61e26a997d900f8c03ec4d439d767b0a83fa54b8a65517399fbd7e";
+    sha512.doc = "e159038685873b3c92967b4b80123b86e3dbddd93116f79f4a6455a781ae71bf48602c8eecafa7a88fc0f37de6fceac60122b51bb125b9276b4a66334d0dd78b";
     license = [ "lppl13c" ];
     version = "1.94";
-    sha512.run = "a273a0999f14697ffec4165c8f6013821f9a3439bb7822963e79d4b362a89334090af54d591f7cbff1f59d0e15e9b18dbc3ed9d711ba90162913098dcec67684";
+    sha512.run = "40357b7b4471f40c2f5ea177c35ebb6bb8ee48f45bbdab0873877958764e9ff8c164071913a40fdc8bc7e814dff5fb497c65421767389aecda1a80caf1ed34aa";
   };
   pst-poker = {
     revision = 75726;
@@ -41780,13 +41924,13 @@
     license = [ "lppl13c" ];
   };
   pst-text = {
-    revision = 49542;
+    revision = 77677;
     shortdesc = "Text and character manipulation in PSTricks";
     stripPrefix = 0;
-    sha512.doc = "87f213f037227c05ceefbcee7ab8a316b88ee6f9ddc366c40cfa7676a714ec6802f3781db8357224769216241feb9171668184534572ebe5c5776c1553c1b62d";
+    sha512.doc = "3235364b48f2431756fab5092dedc2c47618c05c2897f3867cb4e7d130f344957c46d607cb85d9d6cda5ead05c40c039a9ceff64b5d8998f8682b7ed38c3f74f";
     license = [ "lppl13c" ];
     version = "1.02";
-    sha512.run = "6cf40d3dffb7803959a187f6a19b137b824d46ea73bd31430e983abec0b828d49c6d404287382242ad224e2f51feae74b3bee374443e9f421ae70d1ea2c0c3b6";
+    sha512.run = "347cb8410f7e103ee536ebb0787028df72c8c5e91e9b75c8e0e996dacf88d9f7fda4b28c001c6c8bb7631cbab1772246f022eeb9dc4391c1a13361b342383c17";
   };
   pst-thick = {
     revision = 16369;
@@ -41808,13 +41952,13 @@
     sha512.run = "591dbff503faef5316eda8364a422d8810524775e6c6b59569d24928c8702c54463e4433a3c28953d2f36c873aa6a6e52c71dd9cdcce5bb0c362ab2231f5a165";
   };
   pst-tree = {
-    revision = 60421;
+    revision = 77677;
     shortdesc = "Trees, using PSTricks";
     stripPrefix = 0;
-    sha512.doc = "6ac862eff40eaa1a8cacc5c1a1d4886e82dee53046d3fbf631ec23bfb59490fe89bdde5f2767cba35e8d0439fa7b7688669b50ba3ce81698c34bcfc9d010a7e6";
+    sha512.doc = "2446cb95dd8aef2d4f93935d46c2504368ae539d4d363f030ccf4a96df28b31f7c440a45f7164c67f9754ba9b138ed668f02adc97ac3ebe0c1f2066dbee2ffab";
     license = [ "lppl13c" ];
     version = "1.14";
-    sha512.run = "39d6f88d9b0dd4280cd08cad6524fa693cf727bdbacf16063d76e100e16f957602124ee71421e88f389a7ba5070a932d779a2abbb64d791bbc071398f09a8708";
+    sha512.run = "04c8efaa0c2bfa705d95cd8032028a3d585de8dfc2d8fb697992dc0b83c0d7aa933bf351dafb704a7aec7891efab5172808a87313beceae003187b800d59b189";
   };
   pst-turtle = {
     revision = 52261;
@@ -41848,13 +41992,13 @@
     sha512.run = "e4ff8ea9b7fb9f530e33280de3e9eb20d653c0c062fa80611a544daf74da0b1dd2481b43d8f5258f9ebc1d1bf95b393b32c7152ab8464a9e980cefa105c45ceb";
   };
   pst-vectorian = {
-    revision = 60488;
+    revision = 78116;
     shortdesc = "Printing ornaments";
     stripPrefix = 0;
-    sha512.doc = "6bdc368c391d12e6fb54740867631c7ba62b66a889e11dd40668dc7bcf5f9846e4414f84b706010505d3032b132735a9247e25193b952bd3272590d47d59172b";
+    sha512.doc = "c2fd287d0482bd482c288077a005d86158d1d97a50bdd7f847d8c6cf37730b30115518fc6e26d20ee272dd654725cf22abf22e7f3f666f92b54a4aa03c63852e";
     license = [ "lppl13c" ];
-    version = "0.41";
-    sha512.run = "e3898a6b489afe685bfc657760702bd5e2e44fce2ecf6e4af28c1a6eb36173fc653e003af7b7879fbd3a342adfb89b8cf47168b1f1868815fa44050495d15f54";
+    version = "0.42";
+    sha512.run = "fdd455f34cd1da19702cb790d0d0b09a1c6afd7939411810922be8b998a038e10b334803f755a077b32958714a6b40b62ad1bf5fd62fa1763260792e130b17c4";
   };
   pst-vehicle = {
     revision = 61438;
@@ -41904,23 +42048,23 @@
     sha512.run = "a97af35dfce4a137af97071b49e58c31739e6f271afc62a455db473e573148d25fc27937ce680c6f400a200151ffd73867d5dd8781b12a63c68b7bf256cff5d1";
   };
   pstricks = {
-    revision = 77093;
+    revision = 78116;
     catalogue = "pstricks-base";
     shortdesc = "PostScript macros for TeX";
     stripPrefix = 0;
-    sha512.doc = "f25b223770e955011bd091b831d82211e299a51bbbc362e61344c0c57acda1048b111a127b7d29f9e1040c1b5dcde65d7fa8d3400e0ae7ab9da89856372a1ccf";
+    sha512.doc = "c0cd2c7774bf9f204b54c0124f458c4428cf7e4a39808d41a5c49ca5127948367407131ea8cae8d9770536fcf3ee3cb96ff6f3f3fdc895cacc7449cb94a5c302";
     license = [ "lppl13c" ];
     version = "3.22a";
-    sha512.run = "bc3005c09c24f0e6da339d374853bac291ed71acb799567a42cee8e862f4a85e5e2753a9981974b960c295a7c425bdcd238d21293e5d4087e733e45248ea0710";
+    sha512.run = "3eab0ff16da78877d0ad5bca8cf89660abbfe0443be6668fa37338add6074a2892a1b354b3fcbc5bf085748004526e13d5de64a096514035e046aa4f7ab046e5";
   };
   pstricks-add = {
-    revision = 66887;
+    revision = 77677;
     shortdesc = "A collection of add-ons and bugfixes for PSTricks";
     stripPrefix = 0;
-    sha512.doc = "552fcc2f0d448bd1d7f643a5c9f2521f72fd61a653363eab3bf6f31bae306a9c6694ca8d64ad5a5997adea9b92978aa366ece8bd7966c9d129942f8f487b99f3";
+    sha512.doc = "5e530425517a1671df8e6391d51547c445313926bf1ec64cf43e374b283c7fc1d5342051830e7ad9b6dd9aa48312cdff6d6bfb2b3f7a62ee28915a09c6f4b45c";
     license = [ "lppl13c" ];
     version = "3.94";
-    sha512.run = "073ce9b5f97c4432d87f51a3b239c758e2840ec894847c334dcd206433e6c0a45575ed2214c00bd013f9ddc0945a696a8eb45b2efc62d8425d1c9607da658850";
+    sha512.run = "1f9d4c6dc4f018cae1af9e62abe97531f0199b896ef80f7ed77c7748332f7844201cf57cc8ab1c017d55a9ba28416f27ff48ba3a693ad8b8448537e76ab91014";
   };
   pstricks_calcnotes = {
     revision = 34363;
@@ -42083,13 +42227,13 @@
     "ptex2pdf"
   ];
   ptext = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "A 'lipsum' for Persian";
     stripPrefix = 0;
-    sha512.doc = "e7221bd196e718c2f7d9b41901a5bed36fc9ad5e914745e4ac9fb75f7376a870b3acb2afcd9c3676cfcaf10f1eedf7611abb648e6c538270221bc546f12b927b";
+    sha512.doc = "1af32db932afbe9e84dcc58d7126447ce804af55e18fc6bd54c3bd7377f8ab0685ffcf4c532023c5c60c5e0692001b127893f5ff955f0f5d41e95060913f1575";
     license = [ "lppl12" ];
     version = "1.1";
-    sha512.run = "86bdb7566b9c31abc107a7d7a94bcd63814dfc8047328244ead3cb6702670dd8bf7758d1292ecb318f7478016b2bef18da098f8fc5618c97287f566beb7dfa4d";
+    sha512.run = "6372bf6cf8c402ecc469371e5fac2dff88215939ee1b8af49ca106a396074d99f77ed73101a4b86dd3fbceb9b453fccc5a7db82f451cfcc0eb0aebe0d21206c9";
   };
   ptlatexcommands = {
     revision = 67125;
@@ -42177,42 +42321,42 @@
     sha512.run = "bb918ae0e67fad3d58430f7b0354125c0294ce4e6ebf6b9f2b4c5949b37347d6aac8532638831b1ceeb8d13ae5453d671fb58406015c2b13614fa591ba0d9510";
   };
   pxbase = {
-    revision = 66187;
+    revision = 77677;
     shortdesc = "Tools for use with (u)pLaTeX";
     stripPrefix = 0;
-    sha512.doc = "4e1fd7e88d8e17dbc4f65a7dab0f3c4bbcccf3b24b55085fafc9f393cd99a653ec2c4fa41ca85760436a1c7c6121848c57912ff649c302db6966a5c907dc0209";
+    sha512.doc = "055fef46d0c910a8cafa6c7f577943a3d9c335426c578ae3d7654da0a5e24b8ff58675e7df30387369b64675c957a1e46a6bba6d4241f42c735c06618294ef3f";
     license = [ "mit" ];
     version = "1.4";
-    sha512.run = "34fef6f30f53ea2c67394f931168025f7dae7f6e12904b862ef821040a15eb3eac0949ebfab7b1b3dfae8e9944fdb85b99294fc6214df0ce8c1b82eac2702ed2";
+    sha512.run = "35b7e08c54e63de97ee7c36ecf2a8b9c0cd3966dd048634e19ad8cf642bc01bc2a9c504fca7cf70c276fc8d07caa7b00ffe755ebff972532d6760265c72c2cbd";
   };
   pxchfon = {
-    revision = 72097;
+    revision = 77677;
     shortdesc = "Japanese font setup for pLaTeX and upLaTeX";
     stripPrefix = 0;
-    sha512.doc = "9ed045647dde763c2b234b470738578d2d284e73c9720451d994a2248ef51bb95a16117e49232f49cbda83f005448fbb643313dc56c71b8dd30c196001ec5f6e";
+    sha512.doc = "660f6b7ba3db2c3b0d8363ba4d54ebd5d58c7883421e871e40c9794448f034e9acd33260fbddd6333bc9e53ccd8cc3f946a38ba51056f2831d63fa509ef8241b";
     license = [ "mit" ];
     version = "2.2";
-    sha512.run = "73c9660dbba04d86615e135d18c35d02299114f28474bc1d3ed7c6cb89a06564422651981d57684f71494b6a2e44e0bd47521f8b3edacb2aab8d1295860b0e28";
+    sha512.run = "52c10c1da3ce26954ba341ad0da2e25849239e170665a573b4c1577b845b8674241675e45c9558f0af8ea61188b9c437f304afe9cfdc92e2bde930b02ba0467f";
   };
   pxcjkcat = {
-    revision = 74144;
+    revision = 77677;
     shortdesc = "LaTeX interface for the CJK category codes of upTeX";
     stripPrefix = 0;
-    sha512.doc = "e30f393200f2db26c4b7d082a83927e5adbb7ebc46c1127298234c99ad5988c7d3a47768ae8d56105a8eb53c19fdc88115d1da197c8df8dc52ab76c7d7e9ab46";
+    sha512.doc = "051c2796ec035a5f665eb28c032ebea4de9a7ecb567644591a017ce57d023393bf63b38855492a0985f4026d4ab785ebb93ce0be7f870c5decf0561feb75e31a";
     license = [ "mit" ];
     version = "1.6";
-    sha512.run = "658da215d725fc6254515359f5b705c0f8361bcce4eef2a4119d243be1ce59f18c82068a7b9d5b6816cba7274d6ae85e72ca685384165debea68e45ed671620a";
+    sha512.run = "e2c69f056ee388b093e0883804b40e05262ebaf470be6018fb44bff662c7bf0762e23e45e51fb641a07958341b238d29685d95324c66e9d2937f29a7820c0add";
   };
   pxfonts = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Palatino-like fonts in support of mathematics";
     stripPrefix = 0;
     fontMaps = [
       "Map pxfonts.map"
     ];
-    sha512.doc = "71898d307cabff64078bbb98bee9417c79504fd56f1cfc1427b9e4ccc9448b5e2e8436fa085a63d6fa6601e591673ef52eb2225ddfad5e34943456a2239206a5";
+    sha512.doc = "ff660e48f410e339946b5956b40f9810e880d5b325309f9efcd86a408241ef08949a5f7c8f316129d2cd2f2052473bdde94fb2ae5f0dbcc40cde7014b5871c44";
     license = [ "gpl1Only" ];
-    sha512.run = "3b50d3f04c00cd080495c71d9387fe9c810ade7d83ead1178d661a618374a3a67c0fc70ae2a809d2b91db4afaf352b1596a588f6998a4eda220a6f181390b6d1";
+    sha512.run = "95e35f92c23eb08e8fed15560321ac7292bebd0b7a45bfe504135a3aadb9c3ae98cd2dea85799c9dc109fabbbe54416fc61f208df0149f11dccb545953909ca0";
   };
   pxgreeks = {
     revision = 21838;
@@ -42225,41 +42369,41 @@
     sha512.run = "d3f8ff3c975643d74dd92e749397d01f8d3fd0087a838271a491791fa4bb2d65c852ff5989f79952d40547a601c97fe0274ab4407a8e73aa047221934b9b2e9d";
   };
   pxjahyper = {
-    revision = 72114;
+    revision = 77677;
     shortdesc = "Hyperref support for pLaTeX";
     stripPrefix = 0;
-    sha512.doc = "8b1c79c97a047433866833bdd8eac54edca46e4eac16db73f7808353d9855feb5acba4c3e39bfb6294e25c282ebc5109ff456398e1ebdbb326b5d9627bdfab0f";
+    sha512.doc = "ccba68172c3d6e4c7b7fd1d6cb26b5ba50e5d1bba446274c8d8bf8afcec35a0cbf5e069156bb5e828505c7df1ec50225ace363548658fa8ccc9deee5958b91fd";
     license = [ "mit" ];
     version = "1.5";
-    sha512.run = "56d40a085e2960cb0f0a4f4bdc2b8fbec7460e02abb0960ad4e0f565e9605abb6ed77c54b207ea3ccfb27c252d0d426d1274b10b230433faa37bff319e0bcad3";
+    sha512.run = "b26c99921aa0703461d52cfc6ab46cd7c2f24189784d19cef808b8f279ccf7ce710288f80d802c5880e6bc36984f24d346dc6053121dbcb03525689019b4b6d2";
   };
   pxjodel = {
-    revision = 76323;
+    revision = 77677;
     shortdesc = "Help change metrics of fonts from japanese-otf";
     stripPrefix = 0;
-    sha512.doc = "6a98ab12c3081876e5cd240f03e6f9df7dd51cbb77f879d946776d9b5347d4e46dfd55fca7ed12761b9d7c05cbff2a1d8e2db0e03407390429003cc78dd4a864";
+    sha512.doc = "690cc6b85d2e08356fd291e7dbb2ee18dcfcb34aff491021463bb5fac9e6ce4b681fbed7ee5423cb7c3e30453319e2abf07dea450f7906c4271ec8ab5892f0fc";
     license = [ "mit" ];
     version = "0.3a";
-    sha512.run = "4d89f538c961cb52984f66dd79aea204c8213e40abfda41c780f1de2682f755cecbd34e63090285b813d58ad042b7455013111eb86ad974dd4bc6652add0a1e5";
+    sha512.run = "0df280b17f6fbe26553ef42c00c5aef7ad6477307834b9c505a61e2c228b2f95db35f85da896dc51630922254fec5041e5cff3877fd1e39bd4964482927a080d";
   };
   pxpgfmark = {
-    revision = 30212;
+    revision = 77677;
     shortdesc = "e-pTeX driver for PGF inter-picture connections";
     stripPrefix = 0;
-    sha512.doc = "8a80eade76fa7b5e5b919136e499eddb5ff534042fc56eb8223e80124bde97a39a65d31370037cf425042a1ae516e5888c8751388899ae65a8b561f091693c97";
+    sha512.doc = "cbc0bbbe56023ac06ce72fd6884019e3ca64b13e69bfd1cb3cd14af11acb680919ac04feb7866579db28085030169e9043be8c0f43941c3d2525eff55f78b36f";
     license = [ "mit" ];
     version = "0.2";
-    sha512.run = "eb341eaebbe2fca860c2592c0d24f6b5c4ef0f1e6b2bd731d48c1994ded7afa01bd5cb365d3f30147f68855777defc3384038aa652240178fc948b5225cb4c08";
+    sha512.run = "90c05a7e9ea5ffa4bf36e86613f70f65b24520a443617210e1ef90197d17e317704ac3a51a521e551c19d204506776687efb1639f27bec9db8086f7f1bbbdf72";
   };
   pxpic = {
-    revision = 67955;
+    revision = 77677;
     shortdesc = "Draw pixel pictures";
     stripPrefix = 0;
-    sha512.doc = "28151cfd56136ef07c9402fb8f4e0da4a2694164a38e7eaeb5045845731b0b204813b9c0f2b07f9998619feea24effd049cb42a0057841a6a3b3bd998dbc0124";
-    sha512.source = "f5281b971ee70e963cb308a1906bfe8ef96939005f8b5972680db8565c1d0c9697d674426b0833064a07dbb086163c621d764125b3432af3d960a3e466b250b5";
+    sha512.doc = "2494ff16c20312ac495fbdc78acd1e8e5a438eae6b7e3141aea9aa8e5931802795c23e88d65dae2e9f506f316428883fc8f4e1f9e5a3b6feea98642d00636f45";
+    sha512.source = "a652a613afe613c454f99a12accbc5ab81c0437367ffcdc799d6ada3bff7f9452b67c0c2f3b78b91e2dd44dda865aa40751e2a9759d4afbcb6c50dc40f930c9b";
     license = [ "lppl13c" ];
     version = "1.5";
-    sha512.run = "4eade52198c6ed8a9e04380cab15098435b2e158f8662d32c88599e02e49a2f7f6257bbd6fab8d3c660e61ff679aefb38d29b4787fcef0a3510776a21707526a";
+    sha512.run = "f3ba3eba6df8b4b6aee859c4b0f8204c33cf632e1588312c5c185e0fdae076e3472ff8ba0e81a2c4832e13b5c57e1368e511c75832703eab439c668873065873";
   };
   pxrubrica = {
     revision = 66298;
@@ -42272,31 +42416,31 @@
     sha512.run = "0ffdde0f17b1bcb90a858d6dd6ca204eea552b49e91cdc797e6364e8b59cca4808a293154426f9c3f52dd2bdc27e93c091bbddbe6c15862fec144b9e4cd6ea9e";
   };
   pxtatescale = {
-    revision = 63967;
+    revision = 77677;
     shortdesc = "Patch to graphics driver for scaling in vertical direction of pTeX";
     stripPrefix = 0;
-    sha512.doc = "e3e3cf332727476e80c65118da7e7ad55f9f1c1f6658d2919aa37622bdbbc082858eef4ab718e0632752032e0f4e315c28ab8a218902509b3dbcc32377a02994";
+    sha512.doc = "5fe80c523e31dcbea235a5e9adbd7af5f0a427bd6c34caf90a01f3291829825eee86f6670e554670d707b43d05dbf232a7f5fd60c3d3cf3463daa65c25ed8c16";
     license = [ "mit" ];
     version = "0.4";
-    sha512.run = "5198b276ba052495662e7adfba51b039bfc355edc01c206b6b5745338dc43e977ce7a48cd11fab3a71f6e8683f554920bfa41a427d587742d2f64f18e058c5b5";
+    sha512.run = "154e18c81248b1cac0ab0894d1cc2ce6bd52e0e1d5c396f8aa25408654f5c45bd6fbb65b7d9be73457e5bced0233a1c5eddd0529f6df92dc319f3786d9ed6625";
   };
   pxtxalfa = {
-    revision = 60847;
+    revision = 77677;
     shortdesc = "Virtual maths alphabets based on pxfonts and txfonts";
     stripPrefix = 0;
-    sha512.doc = "f547cbd3cc4a0e09034e98a27bfedf41e2e2ab9b6561e441d7656b99b6b883bb51f9fa24d731d403133358917428c53489eacf8c7ede08a963ff06c3d0404c1a";
+    sha512.doc = "964d083b9b24a9939929a4516bcef300a4ed6651914ba1fded9c8ea133f684347d812c9e14b836890e1a78866bcd9c976a90a98030ccc706e73e2dbf5077412c";
     license = [ "lppl13c" ];
     version = "2";
-    sha512.run = "33dfd01f714a662f351fbd3a0e0f36c413360adac666ca5665c628bf5d3acf732cb61e18190d340d144e146fa04116373259403b9eca314f48dba5ea4e6aa032";
+    sha512.run = "611be33cbe87734acb50f512e40fb8b496f9709a04dc5ec2f67c0e7dcf4e7757433bc4ed1f820f80748a2f6121675e7523948cf334cc2ce5023531fa80e25bce";
   };
   pxufont = {
-    revision = 67573;
+    revision = 77677;
     shortdesc = "Emulate non-Unicode Japanese fonts using Unicode fonts";
     stripPrefix = 0;
-    sha512.doc = "551f14e0603c0ebd59c1c250a1f9e894683f69d22de748ee6cca05ee78c75899aec8671fdc784ebc5219163068dad7a98cf94c831d81091892a72e7777bba5dd";
+    sha512.doc = "eab91b3ca26f0586c080eb9bcb2e5a487c0f627ef8ff0a81010f01c805ceedc745db63110124c8203ffec843afefa10791fddf1b0155b137af75022c7771d26b";
     license = [ "mit" ];
     version = "0.7";
-    sha512.run = "370d82da425014bc4464415b4f0fe6fa1cb3375979734731ea829942ead4289e1ac6fc47c1b5c42185c97b9013da2e779c90c10454ea2e4b6e5d65540ce4179a";
+    sha512.run = "26d5f5dee286f4c70f959b15726f76cf4bdbffd6c69db876fda6143ba3f64d222ba2cf5668481ddca56dcf09beed0e062c0c3d163a5347105869f7f0da7185f1";
   };
   pygmentex = {
     revision = 64131;
@@ -42313,16 +42457,16 @@
     "pygmentex"
   ];
   pyluatex = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Execute Python code on the fly in your LaTeX documents";
     stripPrefix = 0;
-    sha512.doc = "83c7e6e1d2149146fab41ff63ed2928f4c6696c6174fe09bc6296008ba4f1c26f77220a73d8311887ff2d77ad75a653a861547f52f49dcfe6b3d830439f38a2a";
+    sha512.doc = "cfb71ac7a1d596f7b93f44c766d6e29710da48f9e4d76dcf51747d3609f884733562d26e8ab2707558d049c44ac585da971b4466c9d3bc74b568ebf870859cdd";
     license = [
       "mit"
       "lppl13c"
     ];
     version = "0.6.3";
-    sha512.run = "87ae649470b6379ac4ec344b850940aef65580b42bfca37c89fd41ca82c4a0c90cb70d96ab3838b360e2028f1c5f33627c0ebe5a6b62847e95dc44be974df08d";
+    sha512.run = "87da0ee2fdeeab99f02ec7b7b490b84f3983dea57f56f9ee31222cf82bf2110d6d682288371a2d5e3fc187a7aab19b13b56d2bd6dc9c2e5ae264f078528a4c58";
   };
   pynotebook = {
     revision = 75593;
@@ -42366,16 +42510,19 @@
     sha512.run = "99dfa7ea641a8c63713c8ba746b07f8555ee1c1cfaf38181c177308f354f2ac83c5b0e6fd4d5fc93502d861d037319838bd4d1396bf1306a5c481bc8386495ca";
   };
   pythontex = {
-    revision = 59514;
+    revision = 77892;
     shortdesc = "Run Python from within a document, typesetting the results";
-    sha512.doc = "3ec2fe0f095384734575c2c9fd1bc9d485b628485c8ee75cd8fb9ebd6d1f56edbec6f378c7c9e1d5ba9c10c4bbcc3934ddb957dc47a258ac81ca89b5ce3a2e92";
-    sha512.source = "8a3cf562716df588d4ada0273c3340b73e16a01524e02a9c83c4ca781b8dd1763a1deb9e303635878721831e0d57b780c0666b694629106650f639061d2f32f4";
+    sha512.doc = "ec7c52f0ad03298103dadb7177d08ede604d812129ef71c7a7e4f97a63df613879bfb0bd05bbecbe4216472dfbae92db166a98672c8ff4ee2aa4efa62bade100";
+    sha512.source = "cd5f25559231e7c1f6bf676fded44cd0caa51791a951106e90dc21e7f684d24faa0c4063d4a4d72e54fe902f9a6df892d2289b0943d742fe60a0b67569b9a1a1";
     scriptExts = [
       "py"
     ];
-    license = [ "lppl13c" ];
-    version = "0.18";
-    sha512.run = "2e67beb9974eb9a567726d8a68f7d565aeca97d20484ef6e36312100411eef9d9de937297399a98f367a756f6679314cc1a25201ff11936b8a61f8f1f148830b";
+    license = [
+      "lppl13c"
+      "bsd3"
+    ];
+    version = "0.19";
+    sha512.run = "6be7072a604b5d038d5db855e9431479d3e7e4dde2e2bbb60d5f7571416d0143cf44786747b48b0e4cf6106e5a586764c2c99f89f5a4c938044897447d816d96";
   };
   pythontex.binfiles = [
     "depythontex"
@@ -42441,14 +42588,14 @@
     sha512.run = "1fe0abfc1a05d8e86c92d36ab69346df18ed72a3d7927348420a7c6f7dd63fbe7ea55e08f051e140eeef9895dd5cb1a91734ec371198ce3de922ca53b39d10f8";
   };
   qrcode = {
-    revision = 36065;
+    revision = 77677;
     shortdesc = "Generate QR codes in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "406d1cf238b397412a57ed695a39af0ef32de007b94e8650cf591c63882d05d7df18061fbd2b350347c052091202a38de1ceef19f61fa58de38c2e73de6b01b2";
-    sha512.source = "3e344af4bcd4e0d2b49638c33177f600f1e3ff24416ad503f55b3376fe7323ab381c7ee695351923cfc06b54c9ba8b3d1f4705f5377164f2b43ee04ccc565955";
+    sha512.doc = "72ed7631b0c70b204c1079322b786ca12deb844b81fd5d26ee9a2ba61f072cea63e30eb26b51c48b06adfc8895592675c891d42b719a4381a3d640e6592dcd59";
+    sha512.source = "0a4ea71410041a38d7f54180212b243e29b0c00918d52375533132e7e715438bccfed4d90fbc067747577710b326c14a51c7fcdc98f3766a45a66a0de39c21d8";
     license = [ "lppl13c" ];
     version = "1.51";
-    sha512.run = "65ecc00d46d06f8a36cb1f170c12692cf7ef8c0cf9e68bbdc6a7da6b0a7f5fcda6a2e065b8a474609556518ab07c2d12f19a9fdaa0b6339aba94cf35184e26f9";
+    sha512.run = "cf745ea4869ae5dee7330dc0e78b978206c07bf234d877ccf247ed7758fa91efc03d791da3eb17bec668f75034c0032db55fe0617eed2551e94978172baa7f4a";
   };
   qrcodetikz = {
     revision = 76924;
@@ -42545,18 +42692,18 @@
     sha512.run = "4eea603398616810022773ca1ab019d74bc43f6c82f4eecad33365dd7c8972302b3ea5b82750a8de31b063a931092669e93135ff3e087e442c0ccff9bdd61af6";
   };
   quattrocento = {
-    revision = 64372;
+    revision = 77677;
     shortdesc = "Quattrocento and Quattrocento Sans fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map quattrocento.map"
     ];
-    sha512.doc = "f3881de285a603b1fb11c470f0c16698cdb4a4b165750a2bcc17fd4deaf44d5d94a7af531ddb1135d12556317731639ea779d25663a81bd25b578241ae3fab1d";
+    sha512.doc = "5e52cc79bfb48409426d10fe2c3889f6aad6839eb0fcc2f56cfda903c1825821e8cc5bb5af4bc305d9bb6a469686d5988b71da5f2b35e9a574657ae0401b3463";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "cc6819b03992528b4a564757caf4767c92a00b8ecdd6053595c5561483287be88014b6cfe60c1eedde75160669981baaef1e71cc293d1585e9a7c54e0186fe35";
+    sha512.run = "799aacfbf70b759e85e1eb29b8ff0fc013959ff4681712e2a86ad9058e98946ab2721306f0457c5c0ee27808be5fc1a12e7bbab186a86689b95fe7eac968e342";
   };
   quickreaction = {
     revision = 66867;
@@ -42577,13 +42724,13 @@
     sha512.run = "4950c1c7a4536cb64d70fe8c08a69fd9336825973a7c8a669ba48bd66476888775d1ad288d34d4b83a9d674624960e3d17de1c972f52bd7f329eff971ec0f185";
   };
   quiver = {
-    revision = 75606;
+    revision = 77817;
     shortdesc = "Draw commutative diagrams exported from https://q.uiver.app";
     stripPrefix = 0;
-    sha512.doc = "638a87e56e3a0e936e0c652922f354efa930cfddb836d9957a3cbd6b9dfea4c8fd067146b84c492639d02cfd05643dbd84d1a4b10254cbf5a2a723e0c0f535b8";
+    sha512.doc = "7f564f2920b500705ee2be8ab23a1fbcc0ef796b291cf4eb3fe383fc6241ca1eefd6119612c7874dfeaead293e739c08176af9d48f3a9399ae3a9377bc1e1091";
     license = [ "mit" ];
-    version = "1.5.5";
-    sha512.run = "d06e975e15cb33f2f395546b57d75cd26d5401d2e732c44defae27e77f3564e8ab51d12d78705edecf73d5686c41843a6645b7ca6443c20f04b7b1a4a7771460";
+    version = "1.6.0";
+    sha512.run = "f20ad616b4475f8197a4dccc5ba95f02c288aa6bff6d99e33645b49f0dcbe4d550dbbe5952022ac92881906f9d81cd4361eaffa4867c899ebf8501ca77cfbff4";
   };
   quiz2socrative = {
     revision = 52276;
@@ -42604,24 +42751,24 @@
     sha512.run = "7a2c61f9ff7894e472cb07ccaf2e60be3ac1fcd9c2053935d27c8e197dbf7746f663a3c35be4663710fc8b08a8ed932422b3e37e89203548903d12a4415a29b2";
   };
   quotchap = {
-    revision = 56926;
+    revision = 77677;
     shortdesc = "Decorative chapter headings";
     stripPrefix = 0;
-    sha512.doc = "e2fa71ee21ad019ef785a3c74ddab5f232d3a6d1e9fcdcedb34c216eb5e6d44abbafcaae5d1c4557bc1e4aae92561a75ba2c3723707328a12cdb6ff4c1b72dbf";
-    sha512.source = "eed36464f1b04852e8af08c5fd91c42ccccbbaeccad565e6f338ed5c87b003b2dd1704e1dad0ce0e49651461b637e8ed613399a0ae8122081e9084e47704665a";
+    sha512.doc = "ba5efd2270268a0d3582850ca17df5be73bc875d2c6b7d182db1621b9f3ee22375d52f6809a9b82bb08746d3b4b2bb0c1fa1505ff2dfb9da2f21227cc873ac51";
+    sha512.source = "9e6bf915f1809ced8c7cf05f6a9479fd8034ff72ff5cd9878db308ea3566b30de712184254b098b645735b310f344faada458a946b0551b79d941ef1e1554bd7";
     license = [ "gpl2Only" ];
     version = "1.3";
-    sha512.run = "7d94162630e53133b79e33b60abb7c4664d3e486da611e37d48593757f39b0526831cedd0c236ce9b4d8ffc85b35734acadc98236435345180b999d7ea68c1f9";
+    sha512.run = "642d14c3ea353bf8ef6eafe8c3d5fc62bf47d5d37c337823c13741c63c3ac2bf351863c0ee92cb395142c64ed3976a8954066651c59b7f40640934adcd51c33b";
   };
   quoting = {
-    revision = 32818;
+    revision = 77677;
     shortdesc = "Consolidated environment for displayed text";
     stripPrefix = 0;
-    sha512.doc = "b3990965effff7529a7c18cdd3a08af337be3766ffe535feaf54db504a47b0f054af41511a635c3e70c34d3025df419af702d319240ee673f7462d2cf4ccbbc2";
-    sha512.source = "a50186cf1b8b0f55ffe4b2e8447b1232c14c6b36aaa4635bba464de1648ed01adbfa13d8a184bdda8398573b2b9132948577e47e252bcb1014761f4318a76ede";
+    sha512.doc = "1e1821b27b1dae2562d22d84ebc8b90192a77bbee11fd3a713a9910137752d4a933720cb4137d8f2c57873e378837930c0e6dc076aebce5d62c72f2714ce61d9";
+    sha512.source = "87949583b2e25a6ec1ca51a122b29852e1ccd0f0a02582afe9bc286d1730fc52910b631c1870e04507eba028a7a7481d36f3d59fa72d70737f4e7ad54f6a3f59";
     license = [ "lppl13c" ];
     version = "0.1c";
-    sha512.run = "44a9c726a5a9158fcd13fd93785101d2a9a940f34da3d52efd5be1a0467cd76aeaf4706b945a8de0b4e0b4a90740567cfad87f08aaa92e7d4eeae8eb9f7bbc73";
+    sha512.run = "e68cb9fc3862c81f0743494f3dfab131bcf02ff48c099749d3f09c30ac1c5eb33aaf73ccfa653f07fda804edcaaef2d2628da07da1d0bbd0a67d049f5e297046";
   };
   quotmark = {
     revision = 15878;
@@ -42725,14 +42872,14 @@
     sha512.run = "86b219305e4e085af2a22d34bc586253b5674abb18e257fa96bab1d45695f841020c0004f1da51fcfca0fd0b325e4043f2e368740841a5a2e8db774711ac6348";
   };
   ragged2e = {
-    revision = 67441;
+    revision = 77677;
     shortdesc = "Alternative versions of \"ragged\"-type commands";
     stripPrefix = 0;
-    sha512.doc = "be65fa8afee57fb8044ad9ec3ae1ee05ebaf0d8b40388f9876de7c25f6bc6b3a78221b393442e1c3bfe69450eb3c98b276b569540ea8a154a5297560f8a972c4";
-    sha512.source = "56482d060b48c8433214b352efc1b2d6499aeb97a689fffd7e2ae5175f92033714aeb61250f79eb847ed3dc63db8e873ae8efab2aa8dd6d8824902a4c00517e2";
+    sha512.doc = "83e21e8b94ea7a26c87ffa934b8ae194018fa1577d0c2cd424260bc759bde0a7e1fc3b212bd3d74bad18205cf2f26dbd195660c6d389e510e69a3e7bb609b022";
+    sha512.source = "5c15f36fd5cbbbf78bd2b0c2689e2d077531966e587dcfc11d9727c0276371aad0268ff4306f5b9067b56053ca27aac292e85145c5c64d259ab14358a6daafda";
     license = [ "lppl13c" ];
     version = "3.6";
-    sha512.run = "363d952daecbd0c4d57e7d2aa5bd28e32bd04efd1b26f5ab65c4874fc65948fb4258eb430560bb8d294406cf314778047b0027a45c21cf99f77119519878e368";
+    sha512.run = "7774d1dbc9a4833b9ac9d26d69a427cd34c221c44d784115083e5f27390817cdbc59ac8e2fd4035e1912d48794d85b7656ad6a995ca558fcf6b908856f896224";
   };
   rainbowbrackets = {
     revision = 75976;
@@ -42744,19 +42891,19 @@
     sha512.run = "ef31d3af4ecda95c497331a0a3417bb23f3d6611b91565c6f9706f302b57178938d68236b32c9ae840ec6c8a74595b097129ce55fc9b18aa69774ad871c46862";
   };
   raleway = {
-    revision = 74901;
+    revision = 77677;
     shortdesc = "Use Raleway with TeX(-alike) systems";
     stripPrefix = 0;
     fontMaps = [
       "Map Raleway.map"
     ];
-    sha512.doc = "3b1240b3d53ab3a0a905bed3f1360a6c542b9a5f433c8375a18f1a1d9b8226678deef28c3aaae6e71217ee1e30e9c8636224bfc2e2d86939fc8ca8e1a1bea3a5";
+    sha512.doc = "dd1fe71ab379c2fb2d03f102c460b1bacd38347c03adab0e36e9b5131a552e3dd516a1c33e39c6cf7198c535698cc6ae01b33fd48aed1e0c3c090cd6c6c26960";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.6";
-    sha512.run = "a2cb94bc3bb3f6b98aec02cb0bffba2786b72b82eb58d2c329372e8974e69fa5b236795207cf297d08886c9c6606d6e1aae57270f9a6b839b5f7d578edae6538";
+    sha512.run = "bd046f19af0ba8017eb55b82f2f7c5fb3bc2392a6319c40c55165691d9bdca4df697774b2de966ceaf77f8b4735f26a32ae55ea960d6742e5c43f02fdc4432d2";
   };
   ran_toks = {
     revision = 59515;
@@ -42787,13 +42934,13 @@
     sha512.run = "213cd729017cf53e23699081e6583a3016c2782192f79eb14947f89d330e3775b35c264cd64fe5117964b040ae98c9835fa9a7c8c7af2979502190fac85bbe9c";
   };
   randintlist = {
-    revision = 76924;
+    revision = 78015;
     shortdesc = "Creating random integer number lists, with repeating and sorting options";
     stripPrefix = 0;
-    sha512.doc = "9c2a5659f97729c13f727f3a4383db77da343844312dfcce9142846362276bb2845c633aee8752b2bc8c0d58cd6dc7dca3b6328cc512652c85cb99a1757fedc9";
+    sha512.doc = "28bac10fe382255d226cb02c04142a5f1c88e01e9b909d5be48e221961a78b6ae86cdab6ee1e5df630d4bdb47165ded2fda2c58c3f87174be1b587093303e6b6";
     license = [ "lppl13c" ];
-    version = "0.1.6";
-    sha512.run = "8ddc6387185495bf655e9c9d8108cb4876c67018bcf76883667b21646e42d4ccb4e213b75f676e3588f80f78bd3e6b8b951c4641b8bc0c2272cf419a7d983c2d";
+    version = "0.20a";
+    sha512.run = "10f7d92f93d4d14c553353053451c2a5d65c8b842b13366af959cf4d9b6182588f9a39910a10a18b0ddbe380e1c642482fd86961760c3ad97764e03b1b3d26c0";
   };
   random = {
     revision = 54723;
@@ -42851,14 +42998,14 @@
     sha512.run = "210ebc0d7ae10663d66318e02eec0d0fb9932f35a327511b02beb9f20a8299e091d03dbc43de331fd15bf5e0606384b1e22add6f7bbe6c69fa703979db08a8b6";
   };
   rccol = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Decimal-centered optionally rounded numbers in tabular";
     stripPrefix = 0;
-    sha512.doc = "56c43ee9f49764ce50da6b1b4fd736cfff16a1cf3907fc7189807e5c946f1c25c593ddc1aa22c2ce2e0799f7057efe2df35bfb9aef0fa1c31724110a352fe4cd";
-    sha512.source = "bc0f7ee1a6fec9adf6d8ae77fb174fb0334030fcc504af46bb2cb88516c05b4b9539748b381a029b657f22d7ce6313b0f19471ef85b1064139e6cb7862c726e9";
+    sha512.doc = "907ebc1bfaeebc0a65250919d7d4fd1d03894a9d62da0f8b45a9e947898b49474c4122764f1eef562225196d47c7a3e11fc0d836fee9e163badb9a7f5f364df9";
+    sha512.source = "5d4b2e0e776377d77fe5ee9f82f7fe64a5265e08060ee3cfba4e56e4108743db6ec74c65eb4d857c6808a7d3f9697ea3a7b585c51ab25a64e6f452b8286f871e";
     license = [ "lppl12" ];
     version = "1.2c";
-    sha512.run = "0a712f0918b4c0e4cf8cc2a0d442a681c6cd4d00b50478751512ed4588f070566f005717196f694c8d07e79f8ab6a49be6ddbda8db71af65e30cfbbceeab6d2e";
+    sha512.run = "03eed3f70b727d631c28dcc0c96e434819bb2681ae55f3c8c61b217546383d98fd1c9c0d166629a5f468ae54eff0e7f14a404b5aa6fa9f00b2b57d1a68515f23";
   };
   rcs = {
     revision = 15878;
@@ -42908,14 +43055,14 @@
     sha512.run = "615f0be7efb7cd6954d36ad1dafc9f0f0a1632159247e7d6feb064e272c5753b26c5e07af709240a6e5f8bd7ceb7ca2c2c29842a5bd6e9e9efae2470f7a94107";
   };
   realboxes = {
-    revision = 64967;
+    revision = 77677;
     shortdesc = "Variants of common box-commands that read their content as real box and not as macro argument";
     stripPrefix = 0;
-    sha512.doc = "aa3d6f25505cf1dba7c5ae5c364524cbed6c6a588073fb29e7d9b14706b8ffbe5998dca4f17e1039aa242ad4bbc29871c72686f920610d8662491e1c91e339f5";
-    sha512.source = "096371da7866350529304b9be81460a2e081d4725c29ad423070253b7623069ee0d7ef7af6b2a88dba650231d972dceb74a70254765753f4227e39946245cef2";
+    sha512.doc = "bb1b684073c2f72d8fa5a7ca7068b6e295657e54e998802bebbb3a5b683176ec91ab4a745e0eb8cbc356822d1b051ffda21f947e71a39f9397e57217d5a0c40a";
+    sha512.source = "4e70e24b432d8c61986ff69c21ff79f90c598dfe1d1058f00a3038c06f3b52895d5adb3df5331fe271fc61001260cd1c7f2c9cb5c28ab029fdbd6eee8f6593aa";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "2705000ece0e4bdc9b96929e853733eb594d6d12b1bbee97b3068f46ba2c6c3b2d06ed0f0eb5e34bd3e26e331722e51c1fd98ff36fa5c53473e99a7fb1610c22";
+    sha512.run = "bab218a93c188455278c15d3de7c53080c7c252e054897475806305d0fad0819861ed81d1d7d937faabe34ad156c06339d201bd4e3a3627f8e526d1ecc51bc73";
   };
   realhats = {
     revision = 66924;
@@ -42928,14 +43075,14 @@
     sha512.run = "9cd41126ccfdffe1322e0b49af113b65761a34fd8bffb96390f7c50d78739be06605fa2e16347a226bb7fba47bb832b1bfd19c8d836dd557fb41ae5dd0281d5c";
   };
   realscripts = {
-    revision = 56594;
+    revision = 77677;
     shortdesc = "Access OpenType subscript and superscript glyphs";
     stripPrefix = 0;
-    sha512.doc = "bddc4958f2c57e5e05fa31912a6c19ee123be463527f2e1121405194ac47b6a806790c204268bcf590785c927808b75305079ed44537ec84284c594d691c906d";
-    sha512.source = "117c3dadf6aaf7a46a3290f6c49d23f62af1206e512bde7098068071e9edf00bc7da0fb34392b0911a4ae525eb0a99b946317d31d12d3312879debdfbb345a84";
+    sha512.doc = "195e78954ae05526c72304c8a934f84683add00e8f526901f42e57e9e4799ce106648a83f33d28a5474ec0cc3401358ae4156ceee9794043b0b5cafe689d11fe";
+    sha512.source = "45357e673d4dbe5678b9a4a939aebbce8d7a2fa448e7cc12040ffa88a4e53d2f59604b436fe004167e8c4dd31d840cd5d98f39ad4de91511d44f9e2e0d69257f";
     license = [ "lppl13c" ];
     version = "0.3d";
-    sha512.run = "fc0c686971c536b3490438e74322aec06371857a987bd70a6def7310441229fc4813d2080c5aa9b5e22cf78dc8ab1c3ed75b301acd987117d3e6f1f589f78981";
+    sha512.run = "995af3ac0170274c2c82c9ee523c286b4ca160d61ef83f0b7b60200d5a2f9177aebc1012bd7e874c1fc65c0f29f5220ee39d68123ad01d13873a86230731ee69";
   };
   realtranspose = {
     revision = 76924;
@@ -43023,23 +43170,23 @@
     sha512.run = "3bc28ed41a8205534d34593429429768bdfa64e61cc212017ba4be32f7a985e8d65ab296137cffbb7ad5be4dec90bbfd30d675ab314bb79ec0ea10b277c33d66";
   };
   refcheck = {
-    revision = 75629;
+    revision = 77677;
     shortdesc = "Check references (in figures, table, equations, etc)";
     stripPrefix = 0;
-    sha512.doc = "38dd62b9afa002ac0435f9b677b4278745321de8b630a0eedd0d9bfd33160335dc67da7ca2db7fbb697b5bf9ca51f3cb5a3668c96c1d3559b4f495b908c72f63";
+    sha512.doc = "3017fb3438a19e427fa512e9e9f23403654521624a6ae80f0219762299b6e3720141647a5cad09ecdf9214a0f080a4874fe5e1cd8baafabbfdc5b239626e1a87";
     license = [ "gpl1Only" ];
     version = "1.9.2";
-    sha512.run = "94f81e733268b735d5ff028e5ad8588ae3b6a39f17aee2d46d3e5942a547383e1220017e6292672e31f62266ad67df5f3843ad94dc7c36b650d360a368e44c31";
+    sha512.run = "f1d4df71c7e6421efd14936fff3d25303c3be2772a11950a26fd1bb8759c65f87327a31ca475462c96f9e2bdc71f0f49f3e5cd79241b90374faa858895ccf351";
   };
   refcount = {
-    revision = 53164;
+    revision = 77677;
     shortdesc = "Counter operations with label references";
     stripPrefix = 0;
-    sha512.doc = "5324828978e3c8c14e9a28b86cbf87de175b9908f460ce6090bf19944557cfe82b112c6543d2878b54f4a16b1a9f3f3ffc66eddf1234c04b8852dbfa3ebaf27e";
-    sha512.source = "26c03363bd65be818d05792fc1c7e3a2e7e747a49382562eeebaefac35d5b4143b86bd46fce97fd4aa0f162ce7a1399e200f2593b3920091159bcfa08f0f8781";
+    sha512.doc = "b12b38ba1473e32ed769b1e7e2f22f060bd33d2662b90ec35fab397c21f378942a26bdc27194950df4fa666c7c114d77a768ba942d42e693260aa312ab6d2158";
+    sha512.source = "3d9a68d0ae85f663652fd7fc7324f0b963ce2fa11ec4b3cd74dde4d86382a28f9665cf22e05dfcf84cd834240b35fab14ce86552ff0ab4083747b9d0d743ce61";
     license = [ "lppl13c" ];
     version = "3.6";
-    sha512.run = "da914e64de5b70e124d9eb62148f5650c9445d2fdb94272ce622478b9aa50a4c7625be9c2152fffe9ff9fd87ee19319a0bc31ec5fd82839a479faec687de4af4";
+    sha512.run = "ed3b4cd4df204e3b34743b4e469ea97a19fe17c35083a89f4d84f6fccce0064d8d2786799d28d0052b9d5c4a5b0c2f1e48c46d0212de214e5af68afa17f5f2f5";
   };
   refenums = {
     revision = 44131;
@@ -43071,14 +43218,14 @@
     sha512.run = "45f51a654703a7e749e7dbb08fd0ccedc86b5f264ce08b504ed11827799202583f81a4f3fe32dae0794e20cefe2e6bbd0ff8563955c3a85eac2642c307aaf332";
   };
   refstyle = {
-    revision = 69680;
+    revision = 77677;
     shortdesc = "Advanced formatting of cross references";
     stripPrefix = 0;
-    sha512.doc = "6b71671a5a7b472823e805f5559acdfbab76bbc06a063c7efec468122b3884dbe5a6229c5ed7ab4c0e1aecd304c3333a58fc5c75c22a66739fe0ca16b5c686b9";
-    sha512.source = "60064112f68bf18d55c328da986c852b23fd2a9e8082221d4b4b29d901fe37de8c2ab5b9b21701e0db8ca2189945c25bd661ab9ae5a425351a3197bc0a528c27";
+    sha512.doc = "6c6ac1108bad1d29790bde196289f85eb73c4a399769a9f46ccd5e6bc6129d87e1d9af05d132f55dfa42eede0d3e25d0b377910fc9f3b334b24f954318909ca9";
+    sha512.source = "b4627bb50a805361898d9062e2bec9257cde7d9ac8e9ec901ff2f9aa1a82b44c39809aa3fb6031ca2113e9f57b53af6fb2106c97fc4f232c30db530deb9f9d4d";
     license = [ "lppl13c" ];
     version = "0.6b";
-    sha512.run = "05e95688dfa1e8a8a3be6937cf5c36c315371b66c14d5dc0e51862db7a5aa0307bda55848806c259b68be64bf2b36e6cdf6c328b41b84f839ec67abf2fa949dd";
+    sha512.run = "9f5664aa9b78a0ad85136cbaff738f5f6a57d6c7f9395a966aef34806be44d8a8e6c743a02cf49c87d4ba79180d5eb8c1d82ef1f6007e786435f35e7a4c46dbd";
   };
   regcount = {
     revision = 19979;
@@ -43091,14 +43238,14 @@
     sha512.run = "6481e37b45ec26aa270637b465d9fabef010c6717c0a402f0bc2afaf5dfcd877e46fd8699ff8fa39d80218e6f319e09acec1417a47fedefe6da5d90a81b2928d";
   };
   regexpatch = {
-    revision = 58668;
+    revision = 77677;
     shortdesc = "High level patching of commands";
     stripPrefix = 0;
-    sha512.doc = "7cb6eaa1ba3e7ffcb80001b2380171204059907fa5345c3c684eb84861340f70590a8b5f1f3fb30a84516ccb2d49b3245a6a697b328157f7ed09bf9caa80982d";
-    sha512.source = "bbe6ee9178c3f7d3272fd585f50f0ab66a86d38bbc65ba40a7deb8e22c6d300299c8f4203d3849b5f3c068f2194bc2ef0206ed0c0e5ebb3b235d8a83cd367d08";
+    sha512.doc = "80e5de9741075d3a79b6137d6c6b4302ad559ffbd7bdfcebd8c104332ae64060ae66cd5e814abb0fd752c7252b1068eee914c0379d821ad5030f489ece840493";
+    sha512.source = "bed666ab0999a59ce3584a1b922d2ea5142a2483804d37c6509718c1a906d9c2a5efe41bbcc81683a0fde9b1c8da19420cc0d533431ca7c97c7fac9dfbaed135";
     license = [ "lppl13c" ];
     version = "0.2f";
-    sha512.run = "80b3be47155c8cd654d1b3ff7a1e261da826d97237b15733e6f63f6e3e9f1e40fb8f1cfbff48b38c4ca3acabdd3209147664aa8aa408b4601751f58d596c0f38";
+    sha512.run = "93d9f7ddaae46bcd98c1b92b684fc29c77e2f46b56afb903bf71ea99022e3e7c261a373cbe4e4aa726092d73f821f3da735fa11f59d9f7f9ba82656ecc1a8bf3";
   };
   register = {
     revision = 54485;
@@ -43111,14 +43258,14 @@
     sha512.run = "709694065b22e33c9d3f8d859ba8632672bd5e3fcf6102d0915c203b4fa6773e0e78f02b1af537b3ff2eabab5dffdae40e0dce63232037c37d4e50ff325e8116";
   };
   regstats = {
-    revision = 73635;
+    revision = 78116;
     shortdesc = "Information about register use";
     stripPrefix = 0;
-    sha512.doc = "427139d31fd56877da7dbc2a08dc99946d4a5fd0746995c473bf021b8228ed95966054726221c0914e9fca05bd928fd89d5516760fdf154d3279a6b2a93a0b5c";
-    sha512.source = "3197829335cb10e8cfc621f087714cc3eef1feb4a4b24a6cbbf4e631f2e85d811516189b1515c57c46e845073b64694007aa62cc8ced4de8b2b6b20668a92f15";
+    sha512.doc = "a1e4b51720c56aed4b9b97648ed610a17aa5289e5c12db68e24d69a633807faa5e806b1faf0b28a3678e5796b84eeca164f48049addeb750f8287ea7d3530038";
+    sha512.source = "1fd67d59ff004b1af17a6bd43af3bd15f566482dfe9cdae1602f03330f8b246fa2c7eb5cd534c2106505173633c563fa37c027cefde0ed3c089532f4df20ed2d";
     license = [ "lppl13c" ];
     version = "1.1b";
-    sha512.run = "3475a9d025bac5d33c1be800ded7ec859d10a15e2755521173060a737ba215352eda4c0a87d9c1093fcf3dd405a73a68477fbc5144cbd6e1d45149c604bdf99b";
+    sha512.run = "e2c4fa459243fb4cf545031f7df3c3b39d05e1725280f8f26f07593c5177fe1bdb40af1a07ab14535feb10aa758267af2bce7a39ee891d4e24d3bb6229629657";
   };
   regulatory = {
     revision = 72197;
@@ -43130,14 +43277,14 @@
     sha512.run = "48e1ada8d74bbd1fa8b3cf4071f26fb5019c03663186df2fb8fc7b1642c2c27157250ed8f785dcaeed210ef887267182d81b1098fd236a7db731ae11c0a513bd";
   };
   reledmac = {
-    revision = 77517;
+    revision = 78116;
     shortdesc = "Typeset scholarly editions";
     stripPrefix = 0;
-    sha512.doc = "2bf89b8d645ee198df9a341f587f42b76a40744462ba5bd39be7541fdbaba1e0103d6649d32c6f8d94871ced8bebbe3c6c6f5aa5e7ac80bb570abb0b50190fa9";
-    sha512.source = "0df960eaf7dfc7916270a66375d302027f7fe79b8144982ac6f8de33ad34ad035210825f672c8c6f5d64367b7650f5e3254d1596762378fc4f086726f5f1091e";
+    sha512.doc = "3ca2358de134175560275c4988c0ef88b3e7bcc39ba538e6965479d75e3f273002d3c3caad25f25b6b20aacf78bb4c7bfc89ef6200b1cae3d61529ada962f7f3";
+    sha512.source = "a9f46da3b67f0b07ecf8e222a1b33c106b2a4a36654f2bbf29dc76675a9f5bb4ea1be9c3c5825714031eb2e150b4d15a44121679e9e5580b7ce87a1a07239811";
     license = [ "lppl13c" ];
-    version = "2.44.1";
-    sha512.run = "1892a875591702b4223038911c378b82a58353be81195644a7f6b2bbd016e766d22a8022e2bafcf9869ce4af5566f6033f3a16f2fb48869892f24df44db050ef";
+    version = "2.44.3";
+    sha512.run = "1c0dadaaeea6be1d54c3b96a66aca31f661725f3d54f6ec9a1bf1a9c28e0a466f095c90bc08b8bda04db51f056620e9534f5388d9715b267f5bff770e09be18f";
   };
   relenc = {
     revision = 22050;
@@ -43149,13 +43296,13 @@
     sha512.run = "d638db869698a6b564f1482c3ffbda561bac0da00e008b5b3ddcbe267587813042bd3d578ea871f5ef48a27309baf8e290413b65f99daa26ba7a8b2a1dc62050";
   };
   relsize = {
-    revision = 30707;
+    revision = 77677;
     shortdesc = "Set the font size relative to the current font size";
     stripPrefix = 0;
-    sha512.doc = "45b6e38a14c31d7387a99d78c395fd0cdab5ee8bbbe72f840d511d14f6af73f749649b48977e8a995c2ee375358677b31a97646c8162c5fe2ee6c286a05a20b8";
+    sha512.doc = "2f807316e8b96d1d5338c4992b1a4d0056daaf13165c8fa6fabfbe1e7ae634d0b2a59edc5139d61a5208d62e8039b887d2b519908d5e9f09b8ecbde8309d88a9";
     license = [ "publicDomain" ];
     version = "4.1";
-    sha512.run = "90a4829b63d86214c44cadab6b9c9c114d6abfbd72dd4cd8bddb18add9b7fede2867f39d57b03ac9e7762950db71664767554b515b5409cc873d8b31aebb2c1c";
+    sha512.run = "c7ca5ce5dc2f120ed237af06a930e744f12a0d7f2736feacea412b5b946b8ebb100bac060cb63978e8731b97525bc9218f0a92e8a4e3dc4aa3b24d1f34563a64";
   };
   reotex = {
     revision = 34924;
@@ -43167,13 +43314,13 @@
     sha512.run = "e97663d414291b3d0a009143ea370676bdc69b1897492ef86bd2092e47fcead566151f175676b4a19e196054ecd4a41706a74e9d4e6ba353d9e346786d04a2d9";
   };
   repeatindex = {
-    revision = 24305;
+    revision = 77677;
     shortdesc = "Repeat items in an index after a page or column break";
     stripPrefix = 0;
-    sha512.doc = "031a5113799f662b88b2275f2f82467e2fd84ae58d18f4cb69e090aad7f2c8cb44eefc4c43f3fcda9e92de0c0027fd4ecaf9f152d33b73ebb69f06e6b4c8c1ae";
+    sha512.doc = "b2844cbbf8060d33b2213f2f031b5052c65c1944e39d2a9368342b987885cef12c9f8d9e54b88337661227e8ab8628fa0cec4db9b912e1784ef82ae1ad7a10c6";
     license = [ "lppl13c" ];
     version = "0.01";
-    sha512.run = "f700f201ff05d25fafde3eafd63ddb5aeba81dfe8be0dc4522a08459f35b3ab78cd06d215477ef5bd59c1dd6d1a05361ddfdc21159f3b6347f5a8271c4193192";
+    sha512.run = "545da71a1c857d7ae62869b3f2bebff893e228798111ea80d40ac32c5679dd078c5d6dfe8078cf1aefaf23db652d0032e01a8ea20d962a1e8613734110df6619";
   };
   repere = {
     revision = 66998;
@@ -43185,14 +43332,14 @@
     sha512.run = "502e1948f22a70003eb5ff4b6eed2790e28cd5acdadcaabcf1f0be699026fbb1cb7144bbb15f230a25f85abf00dc1de075ec44fcc6fa10e26550f85b50a272d2";
   };
   repltext = {
-    revision = 56433;
+    revision = 77677;
     shortdesc = "Control how text gets copied from a PDF file";
     stripPrefix = 0;
-    sha512.doc = "0694a76754c98bcfb6999ddb96c368701556eb1de025af1ae32ab8e39361d18405fbd2c1438c1ebafd2cb06f2d9884afc08e1c94f57eaa89313f54d58a289808";
-    sha512.source = "79a4c693599b0f20e4e1b2210f65dab3b1cc276bf3a661f385a2ec70c703846e881bebd2d6ae8913a007b832206e033f178c4017fc69ef099c3ff87f4b40f651";
+    sha512.doc = "9a371c52d54745fb1773d882bb422dabcb8fb516420b59ba5c6eea538352b04f514c161039c4f21c9ddce7eb14db8038aff1eef3b16830391ab781474849fd0a";
+    sha512.source = "4eac2b8c356b0d0d587176356bd3d06f1817afd9586b34f5518515081c72332d8eec220b6852ed43a065cb062e16830f333be5062de81bd0bc0e2b5c7887f619";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "a5deadeab45a6a2ab4732e91c26da32f276e2d5b35ff357faeb3361c917c3b47c81e59cb6934d052d3525df2a810510e6fa7a8b9e9d6d272c91b4b558de7132d";
+    sha512.run = "6f25f1ee482a75ab815c406b49c379860a7f3f2e0b8fce86cd39f7f16081728eec48082b49fce78757350293063c44aa08b39f8456cf5eb7f7cd065b6943f0ac";
   };
   reptheorem = {
     revision = 76224;
@@ -43205,18 +43352,18 @@
     sha512.run = "84ad69cac04c94499df40df3d1861d09da0afd09282aac5923291ccddc51fbbbf0ef5977248c3a3d34edf5567bcf0e27558ff7c693ac468cade95888c97a330b";
   };
   rerunfilecheck = {
-    revision = 75559;
+    revision = 77677;
     shortdesc = "Checksum based rerun checks on auxiliary files";
     stripPrefix = 0;
     deps = [
       "atveryend"
       "uniquecounter"
     ];
-    sha512.doc = "4db181dc2f12fb779dd17c25c3ddf97743842cb35e241f0277e2e44453572c459e31ae34d541c865fd03abe625b00d1b481373f20c9e2017a85d8f666f1d765c";
-    sha512.source = "552f01424c772ab03580ea75c56b9505febe7912b2e51afec0105f5fc5a207568caa36182fc89feffbdb7be5e8e1851b3404f0ba9f7ef1152edc7da53b69b6a4";
+    sha512.doc = "9f0a7446b20e7624cb7a5ad0c1ba0fa172b0446c165b820a9b5bd2b3782b7ab13d9e1c02378c327892d3782a15fb986209e97843cadeaacbf738f189d40f290e";
+    sha512.source = "34ee50480ed9b9fd853134142b870faf95f2bc7093c0929e98009c0b11dbbc1c718805869c55a8039fb7ec09dcbff17be0f7a32597d55bac29daa052e978897c";
     license = [ "lppl13c" ];
     version = "1.11";
-    sha512.run = "ca028efba24ad60e33ff1f01e649694054c3e084d028d469f35cfea20874771a094091fff6ea2cad7e8c10314bc5bedd36efae9a27f62718412b5f9b5c6eeb6e";
+    sha512.run = "c70f019cc5aed5cb83c6861517f51956cd5203fe330fb2590c9ce948e038028ecb086cf29fc4b80948f581a2c873f2e11850e33d86e714a3ba1c606160e7f986";
   };
   rescansync = {
     revision = 76924;
@@ -43454,19 +43601,19 @@
     sha512.run = "fa60eb073a9a47690935403a13da3570a4aa44e9ee13c12c5a4ff93a1f02509ab35b5f64a03a67be74190420d0b174fbb4b9a34070a646ea557f03a584fd354e";
   };
   roboto = {
-    revision = 64350;
+    revision = 77677;
     shortdesc = "Support for the Roboto family of fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map roboto.map"
     ];
-    sha512.doc = "2ceaedd2b273c252e8510a98cb05d581dad8aff94f3c8be1dc47fbbc9b52a0546ba8025c6bf0c51d97d0573d208af2f8a635c0cf405a980ae8cf8e4a1f13e499";
+    sha512.doc = "98709bb881591a2bf8f5d0ec5d20d221b04c06d91e325ff40484d26536099a3ab43a356099d790961a43192b8f4acded294b12f0a7e311e2ad855bc91b44423e";
     license = [
       "asl20"
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "d82d9ce9480bf0c9d7f6559e7bcbb5fe8f22179adc44113121f67fc0daadd66c938b9fcf9a41073843e1cc981162972a79f15fe6162f68ba7a01b74732b0f01a";
+    sha512.run = "e3d0f5ca5a6386886523f6cecc8986719a56b733f4780f853002665cbe6789a4d09a9c18cdf650a41fc57feb5ae059d87d11cb6b4ad92f648edf861b39c889dc";
   };
   robust-externalize = {
     revision = 76924;
@@ -43517,14 +43664,14 @@
     sha512.run = "cd7065dc6a916941a0fd05ea342d29499b6f7496d1934e06c49e7ea1a99c5be5cd515bbcbc2b5935ff8132adcc7b94e653d55de967700410ace55697f6fc156e";
   };
   romanbar = {
-    revision = 73634;
+    revision = 77677;
     shortdesc = "Write roman number with \"bars\"";
     stripPrefix = 0;
-    sha512.doc = "3ee6d97e1ed978852c6001b51a1cde49c37f9b95e4bcc85b2f3606724870b960618e5b1d683bc4a3943b1d8cf0618ccfcfb7dc5033127a716b0cd897428b77e5";
-    sha512.source = "738b964758a224bde6c3e06b2e8e4b3c35a93f580edaf5388769288339cc85feaf7341d3cb35b4e7f5baf6accbe4ae709a084b788cfe9e004dd41514dd559674";
+    sha512.doc = "f3fc06b6365500613862cd3ce8392c6aced5d59cf5127057789842a6cad3a73f81bb91d1052a7e259351c061e72615b8c660e887bdcd33618a5034279974f03d";
+    sha512.source = "c824b5faa0dce1129ace457a28001726ed45b32cf6a24fee2b58b40b65bb10d88b1b3a45af0c79fcbeb59e7906f3ac08553fd50afb70538175ca3a45e1c4a403";
     license = [ "lppl13c" ];
     version = "1.0g";
-    sha512.run = "434e463bdecf30fb880a61e1428f8046495afd96489ba4c502328497fdd993c1f8e5fd0f5ca9c6c755640742316313bc845c4dfe5fe7ffe8c2532cfe5b5d9cc7";
+    sha512.run = "26c25a22f3a89313c66651420b495f7835f9baf2ac21844af1deba26626c0c44e66aeabae79ac0262df46c3047580afe238b45d2d2664e56a347937b52c0cbc1";
   };
   romanbarpagenumber = {
     revision = 36236;
@@ -43537,20 +43684,20 @@
     sha512.run = "7c8fbfcd5e9ec9e306e7ac836fb4c82db3bc42179bf77502b5299c17c4d3ad515b9397016d600011eb24c5d9f2eda23a485634c5aca3a765653cce32d7bf82c5";
   };
   romandeadf = {
-    revision = 72484;
+    revision = 77677;
     shortdesc = "Romande ADF fonts and LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map yrd.map"
     ];
-    sha512.doc = "57a57f16bfa680e27cdd6f29bb9ac254fbdfeb137da2b14396c25c1a1653434cab7c2f13f58cc1f6295b7886ff73632d463da717319c00bd0257ea93949150ca";
-    sha512.source = "f576966089affe195181619ea6fb983bb057f1d252dbbd9eb02b42993a819349377ab5aef810de0b86f3c06e6c9368b681ea6f0f25b40d3c473cdb08d58739e5";
+    sha512.doc = "8a7743b19841c70edbaa1128fa88087720ed1b2af97a25f36020def62a68f4a9a6e2191b008b01fb762e22d0d5f18466f2c18363848af790c551a35484c277e7";
+    sha512.source = "91342ec650cf6266df7077cf5f7d74be3f22cd6145f4924814eebc20b49db0a5775dfe3b68dd03c1a455858669339748402a3abdde9034f325eeb5628fbbbfea";
     license = [
       "lppl13c"
       "gpl2Only"
     ];
     version = "2.1";
-    sha512.run = "c7562b20f641b961a8b65d3bd54c5347668bd510172238d7f1465e4ef8d391fe5ed4eaf0d8e4882d0b971869b97d7218a323d2950876efec70e5b53e3e1ce71a";
+    sha512.run = "d11cbca4de037680bb6ef7706a0f13f5c468afe9be74d2730e48f0b12038dd160da0ccc60dff3c3ec928cc0fd7b8a763fe794084a2e85fbf5fb0303cdd5f8762";
   };
   romanneg = {
     revision = 20087;
@@ -43561,14 +43708,14 @@
     sha512.run = "4195303ca32b46d722bb148ce4079bbea7cec08fc74a7b0cb6232dcce517b7b5a10753be22fbaab62ec11d894955e1368f3a6dc2a2474cf9b9450e035bb73c11";
   };
   romannum = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Generate roman numerals instead of arabic digits";
     stripPrefix = 0;
-    sha512.doc = "60caceb87b6d866c905685cd180f0deb73f400b33007e0589e1aa5a0b42ed948d88c672a620ebdd4d78bbf92aa81c1094e4d4d6afcb981747e65596711e112be";
-    sha512.source = "dd1a19bdb63aad8f3c3458bc000933b9c0d04a3b331c37d84a9e7de4a7027b6cbed113038129a789f43d1049dd72acc432e6cebbce365277026d5e6b5cde328b";
+    sha512.doc = "105493a68b541fbe2d3eb9795cf8359d79df976f4a559d4805ef2d5bde4553f49499d8c3b318f32e4be5470b944aa923f7e58effd7de965172f000b95c227e51";
+    sha512.source = "e8b93da89876eac821e5b6ee5ec85d408dcbf0c59584af695e64e98dbafba03cb0caaeea01631430d590615838c007c35da38142cdf1877ac0793a783803f34f";
     license = [ "lppl13c" ];
     version = "1.0b";
-    sha512.run = "06fb28ffcf6c8212ba3bea5e3fd93fe4a5394ce1cd3977556bdebb982888c2c0f7e45dc751f94b1ecf921c701fe6783166e73a595d5da55e874359b7a4065182";
+    sha512.run = "bfea14fce5c30d2fdd5556c6910b56f7f321ed7af72f874ab98758682b82dbe0ee2b4efa1a8d6a1b95180150e2c165d8b78a55a811312b9aa46c3baa73ebf1a5";
   };
   rorlink = {
     revision = 76790;
@@ -43594,23 +43741,23 @@
     sha512.run = "e1e200c49ba98fb1d2bd5cd927ff209a1f72b9681b1cf3b49baa263985790f7d4854ac1cd9fedd464e2076488b3042456c7fede5648dd8ef23d1ba6701705437";
   };
   rotfloat = {
-    revision = 18292;
+    revision = 77677;
     shortdesc = "Rotate floats";
     stripPrefix = 0;
-    sha512.doc = "020e080e047f20db45bf83ff32c267f5a10b7790adb64495d09ebb3795a55d953154b8afedcfa0214a77f11c35287b18949b8f1fb89b6ee51aac12a04832e922";
-    sha512.source = "b3b986dc11e30b68f75bfa371c85eded713f759f6fa0229857cc05172edd70caafd9124098813cdafd1f060fe57a6667326ee84445fade50bb6acf9d1cb6a95f";
+    sha512.doc = "8e14287001bca5460f67eb99bb69c7cb0cab0a7f730a5760f0c816c4f44553a1bbe0a94835b75c361f233b2d5c4ff4b3c47dbac781d645f4e5bcea90e1f3f589";
+    sha512.source = "b99c6722acd29952c05e9ee7f37ccb183303b0b7a057449a67bd64aa015ac8c7635d0720962b02f522f29269381e8b695a05bc53f1b963bdd9ac513954204e8a";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "2976812ba6d6bdb304d56c9f10f08c02aa8acceeeef6eb05ccd0ac7b3e3b86984794017627d8f939994ea0228bef5e9d6cab0b08843e87a840ee5c2390dd0bb7";
+    sha512.run = "1961498afe88e4eb3c2889536abfc3965f154a09281381e9208e72f7f41d39f894c23d3ea9df8cca3f5bbdcdbbf3c5191862117f74d93372a7b39e87cc1c9d71";
   };
   rotpages = {
-    revision = 18740;
+    revision = 77677;
     shortdesc = "Typeset sets of pages upside-down and backwards";
     stripPrefix = 0;
-    sha512.doc = "2723d32029abfc773de8f26a1f08cb3535c5878f63effcb94fcc6a2f98f1a0f9ff3c53df8a4d9c1ce1f99b52b9fd7b2f5c919dd9cc915ea8266835aa85ddbda2";
+    sha512.doc = "8874ed352d4a6ee699783b4fac39d5e2b93eb6ae813b2c097c9beb21312bdba590df5ad797125149091a5e90f4cab839ece7c73b3d31ddf52b4123a306cc9e46";
     license = [ "lppl13c" ];
     version = "3.0";
-    sha512.run = "a206e4147a68ad0ae750e18ee6a360d6ed2ac91785b75f8fecda4b63db695a36a9602da8dbec1310feed4072f952dc49f4d2c5d2817fe74477759aa55246177f";
+    sha512.run = "e3d986531ef5c9ebe8a73480b7624fcde54037769305efc7add973ee1704e0bd8ade691067ec81cc123b192823c2628a32961a30b6544c235dd3930294d81923";
   };
   rouequestions = {
     revision = 67670;
@@ -43641,13 +43788,13 @@
     sha512.run = "01cdc4c8443c50a91dd408c52122e8ae65257344176227a508cb082f92d61bc02756d47e27f75d7862d3c87c26add2003604956ad00b448f63b4f6417c520ba6";
   };
   rpgicons = {
-    revision = 77525;
+    revision = 78149;
     shortdesc = "Icons for tabletop role-playing games";
     stripPrefix = 0;
-    sha512.doc = "8d6edb47227dc3b8aab15b0cab13fb5b5801e98e9dc50ab21b0e607e3ae311ddc7c5b84d090c6434dae8853c2dbbc3b13cf9e46efe6bfc58074796c6a3937d0d";
+    sha512.doc = "5c171410cf84c7ed0dfc86ef06f6acacae90e75452eda683f1ab1772e18f2d3cd6f5735ac9a363d650330abbd908308dd92fb19defb7a912772d7a3fe79ac152";
     license = [ "lppl13c" ];
-    version = "2.5.0";
-    sha512.run = "bdc12eff6d889c1f6bc660494dc9be2ec6bb30271200d3690feaddc957f251268c277fe263193839f31a36ad342b5e75bc37fe3c41a680f3a42c8383196bde82";
+    version = "2.6.0";
+    sha512.run = "c964ceadb93b2e6a2c430268a6a768e4d5c34e0aa98e125e8fa727920dc409ce0b77f9dce001f965a010e88af9d9fd3dc3bd4a2c11cd59cf731e267bcd97852f";
   };
   rrgtrees = {
     revision = 27322;
@@ -43681,16 +43828,16 @@
     sha512.run = "f5d52f49ead227b058841bb88571ae0d6fb40b95dd652536887acf13c0a5dc5b61e3813faaef2effc26539125c2776e113937a1612e7bc7146e7d5517b02aeb6";
   };
   rsfso = {
-    revision = 60849;
+    revision = 78116;
     shortdesc = "A mathematical calligraphic font based on rsfs";
     stripPrefix = 0;
     fontMaps = [
       "Map rsfso.map"
     ];
-    sha512.doc = "ccb3ce73add1f2a4f269728b8189569637327d85cd1a4d29a03904872cff10ce3057bd01a9d74a94373c3aaa52afe74a98d07bcad248fd18943efb0bace6db36";
+    sha512.doc = "a158ebbc871d64f3e07296069375223a6b4711c7115dd366e414468bedc3194e1e0a27a4c705312321e65ebe8d9cb16664d9b8c76af26d6c1d737722e742f332";
     license = [ "lppl13c" ];
     version = "1.03";
-    sha512.run = "7632b0cafcb0d28f5f4b742f8c457634a9cd1ec7fd59e61e01fd5f3da3964ae941fdf2fbaba94b0d0934270ba56a2224352e11075970e28bcf16bd9b6f97f236";
+    sha512.run = "eee2f5b5bbaa38aff7bd646b3f3bba2be1452f96227fdbb0fa644c8d8bb1c7def7dee26ad29dec825ce6ed4f998d937089e6f92bd78d3aee6d9781b0681a662c";
   };
   rterface = {
     revision = 30084;
@@ -43863,14 +44010,14 @@
     sha512.run = "c187dcb7e1c72b727cfd0827a55d721c6a094679c1dae27438ed030209042b49c646af20e158900543369ca8ceee9896a9f36de76607f8514004df80e3be15fb";
   };
   rwth-ci = {
-    revision = 77480;
+    revision = 77893;
     shortdesc = "LaTeX templates using CI of RWTH Aachen University";
     stripPrefix = 0;
-    sha512.doc = "105c21b52cd8fc376e101fc6a8721656600762d8f7b070b29da22ab5b67101d2d35599429d342fd4794c400ab6fce93d6da113f938f69f5e90ac7afd9b7437d5";
-    sha512.source = "b45eef051a285bd46aaa6c6a7ddcfbbb5028e80fd1689b808a9ae7611ef4186b9b6ea1ea11e520cce9b01fb074af49b8293e267e99d21c28d93753d0f40c1e6b";
+    sha512.doc = "3d926389c52041114f437a1088c30b2b11539d45d9ed2317d69234534c7529ac9804ad97b43dd43d6a925b2ca918ea406ae08beba6c1ff1d7ae29bc25bc50e1a";
+    sha512.source = "03a3f36791679364e18eff7566c7f274603ca29d1a6f70ec45417922814c886c2cc81653e34f0a5b6bf0514319f8be21fb2c37d19d5398f914d9f43ef3a05ce4";
     license = [ "lppl13c" ];
-    version = "1.0b";
-    sha512.run = "85e01999b8cfcb1f30a59b4c2077e436bd638a5e6c075e9e15554bb74196d7ca628b59f1696574b38059a78335f6b58e2122d4d381df1de43fd23b994ad4fcb3";
+    version = "1.1";
+    sha512.run = "67d9d32dfe17abeec643d6b4e6dbbcc1566bde72dfd77f15a4ca5c174afb02c02c504a7afb051471d30205b14c6aa58c0ef4a17f0f663eba68510250b19d2dd2";
   };
   ryersonsgsthesis = {
     revision = 50119;
@@ -43919,13 +44066,13 @@
     sha512.run = "d8e107109129636cf68d88c96a36de87b95dcfc4e154dae51a1145d7a0c58a17ca12e95b1b2fa1312c6c50c5cc02be35b23168d8eca69a7643695c38c5d0bcd6";
   };
   sanitize-umlaut = {
-    revision = 67126;
+    revision = 77726;
     shortdesc = "Sanitize umlauts for MakeIndex and pdfLaTeX";
     stripPrefix = 0;
-    sha512.doc = "2de8f2935de490e127f19b50f10698ad323e823ae4bcb7b357b6cfe084c9f6a48d2314889a54974a4b58275667da4eac89cebfac5c25e570c0172ecf9ca44af5";
+    sha512.doc = "9065eea7cc2997456ffb4e52d3db5de8464c0a712eca2f6c1c3559b98bcfbb9e314bd0ec264318201fc23889284a0c35c1915befd580e5e9d86e0ccd716712b0";
     license = [ "lppl13c" ];
-    version = "1.3.0";
-    sha512.run = "2f9514b9424a72762c9b4bfbe2bceca10dfe4e75a42e9fe2e26d6808d14fa2aab62a03f26becec8e80b00c658d4452e95c3b84bf692d64cc287693b2542ec3b5";
+    version = "1.4.0";
+    sha512.run = "418b1f402dab15656e6d586169a0cd994edace33019b138003b2b37ea59ea1060817b6df3bb71922e0a8ee5a6743924cd04f91428a28eff0f2abd8cd96e67602";
   };
   sankey = {
     revision = 73396;
@@ -43962,35 +44109,35 @@
     sha512.run = "50f7a12443730bb017334ed1bad840dd2086a0225586eeae02f1386f410ae802fd043b1ce8a90e495aac7bdb20e2a8532c4cf98d48f0fc32b96da24f28de26bc";
   };
   sansmath = {
-    revision = 17997;
+    revision = 77677;
     shortdesc = "Maths in a sans font";
     stripPrefix = 0;
-    sha512.doc = "7923dcfcf20c945dc61af747000694c59c61982417307356ef2ee335f7a3eac7e44974a334072125ed4a3ec3b29caf342f15dfda1fdbc348a5e2cfb8a4dc2469";
+    sha512.doc = "88b8e62fff12be9c0b1c2888aab62ef6cf0377933b7cd05a96a602507e298af0f5be3662c689e90477aa7540b27c3a08431e06019010befaf4c919a9a325bf8c";
     license = [ "publicDomain" ];
     version = "1.1";
-    sha512.run = "075b9a32512f191767bfc739b833497eed371c2078fc8511ba507b19e2744675bfb3caeda40da484ae559aaff44aa4f6b2f7f5baaeb0c30076654593216fa5e4";
+    sha512.run = "2e7de59fd5a6e88fc3f68b86e2790042172b9e7500b4e72fe9bc3755e319f30a3cd9e597e744c8343402059f3fcda8d7d7c7ee36de991cd929c35dc2f30ff147";
   };
   sansmathaccent = {
-    revision = 53628;
+    revision = 77677;
     shortdesc = "Correct placement of accents in sans-serif maths";
     stripPrefix = 0;
     fontMaps = [
       "Map sansmathaccent.map"
     ];
-    sha512.doc = "c9bf7d65a232d668243df9867b2eca64e0288fd733c6b39ce200f64fc5b0a07c98ea6a971446f67f1766998e169c14a80eda71104c1653ed54d3865e6e145fc0";
+    sha512.doc = "157b98681881da917443b30999a485685e4f003f8437b4b52717ea52fc96bb4660d88dd8c9030b0c95a258829929ede2060dc8f21e34e69603e331d467640c29";
     license = [ "lppl13c" ];
-    sha512.run = "685b0c604978aac45efd75c37652471aa165bfbbf12dfa686320a6a9ef926f9043382333ecc26db6d2ff4d12732d135947145ba937eb6d01d4a4e9aa17784315";
+    sha512.run = "749c1c7c2cb3b48579384872883526dacd9636b15424eeaa67f877ad4eed92e1b1efc197bc30f4542a026420acf8a8655467648f5eb87236da7f402e038fc49b";
   };
   sansmathfonts = {
-    revision = 72563;
+    revision = 77728;
     shortdesc = "Extended Computer Modern sans serif fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map sansmathfonts.map"
     ];
-    sha512.doc = "f117ca97a15e70c820d830d3f49bd112fe17c36795345e2aae09064015df32325c50e2b62f16f9204cc4333310a1aef3a5af443c6eb49e0fa8696ddc04236060";
+    sha512.doc = "7bfba8ce23943cd40a1c50944cd18d2c904015db9d7c9ab040c24009839913897bf157f20564a44bea0dda7426b579d117d365fb55202e1d49cd6c30563bf52c";
     license = [ "lppl13c" ];
-    sha512.run = "b5391b80ea6bcbdab20b4aefd4fec005b8809147a285747bb1634b1dea52ea906cae562442b421ac85672eb0ea5f2f653e010eaf02f1beb5ab2546ea873f5cf0";
+    sha512.run = "b41bec028bf15dfaedf40aca0d6bc173efd346d8be11c4fd9e595d93b251e04d56993061ec25da3a62b68a28a65013c6ae239eeee0d5b6721fc987862d10f6a4";
   };
   sapthesis = {
     revision = 63810;
@@ -44059,22 +44206,22 @@
     sha512.run = "2d39c1246bc9c5c28222a6ce96b93bc0c1e93c3155f68f44843b5560b548191ad3b608f24b5c444b834fc441238a0d2174a9a8ec006f01b160f77159decfeeb0";
   };
   savesym = {
-    revision = 31565;
+    revision = 78116;
     shortdesc = "Redefine symbols where names conflict";
     stripPrefix = 0;
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "212ea18ebb424f9b64ca9c75a783dee9ceebac09adcd6ff6c721d90796bf4121aa8710935529451e6f9a4de9c3cb5910b6c07d6fd6b7093c4b9904348f43a1fb";
+    sha512.run = "2dee641862c3b80688c584f22f1500bccba3b51b00017ee026b34a395c880fe087e4063e5fdbdb2cd80e74ecce612b724f7693042ebbafee8981d81724433c05";
   };
   savetrees = {
-    revision = 40525;
+    revision = 77677;
     shortdesc = "Optimise the use of each page of a LaTeX document";
     stripPrefix = 0;
-    sha512.doc = "3e5cfb62d4020d32d9bab01b3df2ea1cb485240aea5eda3541d29cbe38487ed8b242a1eb2b9d15d08bd742390a8d8a25b584e110145dab330580e69e2287f181";
-    sha512.source = "2dcc671cae73824a2e4cf10682f0ad7d6236f5e856267663f14864804587e1394fe12de5e3e54e5a64abb798c16014fab07a462584eac3a561f971496c58b5b0";
+    sha512.doc = "ca848ad947a6aa3023e255673df15678e23182c527e99f734bf758512e874ef2e131c2bbeba272cafc549bd744239cb348a7701b51fdf54406892ac5e51e0b6d";
+    sha512.source = "190c1c7754902de7688ed464c53d86ca6f97ef2a0db468679d5bddfb504ece853920bec3c582e814c0b5f3b1151856b0629506d38c2c606f81e29d86233d0712";
     license = [ "lppl13c" ];
     version = "2.4";
-    sha512.run = "f31ac72f12ecbe2ab05bde14de907707988d6b9ba20414543b9176b71d2a0d5358a34348177857c56b961301678b612ee6f767d1b9cb671b9bab344bb8230e6d";
+    sha512.run = "a09a4581325ecc01d20113380214babe55381e63e0e094e8c2605dc9581bfe877384c548170657a4e672c0253814fe3a8d51eb648a612c6b6540d425b819f16a";
   };
   scale = {
     revision = 15878;
@@ -44097,22 +44244,22 @@
     sha512.run = "1e367f025943a56b6592238e2961f967beb1d5ff5b68ee83565b3926a392214557237e482ba0b174ddb2e6861e4690e636edef1a5fe0473c465a0deaa1e1bd0a";
   };
   scalerel = {
-    revision = 42809;
+    revision = 77677;
     shortdesc = "Constrained scaling and stretching of objects";
     stripPrefix = 0;
-    sha512.doc = "1533997bed3ce5499a1285a6db03be20f28fe70b1ebbac5d117e692c53068ecbe7f8082cd5f93c753bbfc1eb4fb3b78372c7b14f5e2c636398f37dbc17972d97";
+    sha512.doc = "43fb0b1d7fae597618695f046732caa1bc75c316a4d73c614f9dd3a57584c4d1c0aa1c0ad36721de02762984d5d3d7c708f229538242c01b3fa28adbaf112e4f";
     license = [ "lppl13c" ];
     version = "1.8";
-    sha512.run = "0b0a996bbed0fc185714f84e32c76e5a9277137d3d8dcc6b12b516afa97f3c80b2684c3c22af8717bb3e6acca267a3862c1244df7cb71eca61b10074fe1c3a89";
+    sha512.run = "50ad5da129ae5009894bb074448ae0e854530ef50c16a1b4528cf9ed393e18fd91a9195f6bc4b5e1a0e6daa5ca32ecb072ee05f06878eacb02858f21e37f5538";
   };
   scaletextbullet = {
-    revision = 76924;
+    revision = 77960;
     shortdesc = "Resize the \\textbullet without changing its vertical center";
     stripPrefix = 0;
-    sha512.doc = "54a0626b8eda086cfec391cfe244f68b252ac9284c17f95a3f0510b6a38e4b2144027d93603dbd8aa87c263422d6856ae3305f1586c0b4b301b2a33d3b480824";
+    sha512.doc = "4f223edc1d673bff4be495f233bddf7a628fcef6e8d1c7013657f67811ba33bd3fd105d8c9985af0aadfae9ae1f3c6d8d2dce22279d35f20d117f00143f2108b";
     license = [ "lppl13c" ];
-    version = "2.0.4";
-    sha512.run = "783b48130521d53eebc0be37ce810da57b789a8f6e3c5944bec3dde009d628bc32bb45480cf57dec7e8a49e27f77f95ef0ccc3d00a856cfb5fc0002f9803fb96";
+    version = "2.0.5";
+    sha512.run = "457cc689169e2a5b46d33fc7583227837f54118d67822ff8ac5e04f52e7cddb6b087c882d392734f9807f1754f17dd475358fefee61dd2485fcc6be6de53c67d";
   };
   scanpages = {
     revision = 42633;
@@ -44540,25 +44687,25 @@
     hasCatalogue = false;
   };
   schola-otf = {
-    revision = 64734;
+    revision = 77677;
     shortdesc = "Using the OpenType fonts TeX Gyre schola";
     stripPrefix = 0;
-    sha512.doc = "14f9cc49ae04ec2f9d5ccb48d5267ef3843bf66a288e0dbc4e7cfd00b52331216e7ab179b506acd799b4031ef11feb7c333faebdafe9a3a94bf31da442bb4129";
+    sha512.doc = "7a1e82577ed6a7f08450ccfa037947966563ce6cd7afe667b1fdb8db32679ced124bbbc44a3c6f7610e66f3baaee5dbd1be0b58586092f8e83628661db180908";
     license = [ "lppl13c" ];
     version = "0.01";
-    sha512.run = "3a59203e6586f2cdfed6d5a948e5c150da934a809c12ef7d55f04ba8a8b95b0f1365fe7e0d802d8097f48dbad753ae481c3e27d580eb050f75956d4d04ad10d2";
+    sha512.run = "0cbd5d44e3bb6b643b28811012bfc8414836909b763d6e611ced292a7874deb08557520d9a9c922114276cc383c1cb4c63332b7baf786a17e9aac5a7f0558832";
   };
   scholax = {
-    revision = 61836;
+    revision = 77677;
     shortdesc = "Extension of TeXGyreSchola (New Century Schoolbook) with math support";
     stripPrefix = 0;
     fontMaps = [
       "Map ScholaX.map"
     ];
-    sha512.doc = "7c64a884165087b72f052e7d3fe8c57857d62b92532bdfc6bcd46e66b12f8b12112bd71ab88d4a9603237b612d1eab5ad10e7de0c14e69ccabeefafcfd380302";
+    sha512.doc = "2e8bcaee96a9dea6f65f5fee82bf7e61c4216d1336f4c111852a28266d38fa829a84edbaccb9aeef6def741fab63798ddd53528befaedcef4fafa57ce6934524";
     license = [ "lppl13c" ];
     version = "1.033";
-    sha512.run = "f7062ca975c2801c220c6c34844d87e410e501442313974c77281aaa0927b27fdfbd2328676405cd1820c809e0354edd332e9fba0d04fa1e9a8d28f91543905c";
+    sha512.run = "f129a052139eacd4f38a27a85a9416a022f1712155df796e0b0fd8151b13f34a44177462243c101117a53fd1c01e6647da73622b96374707c690caeb2e2e7f89";
   };
   schooldocs = {
     revision = 73466;
@@ -44598,14 +44745,14 @@
     sha512.run = "d24778c0ae93d06b42bc8d7eb8d84ab6e0f42b33352f2dbd79586a4ed9bb21fe99a61dc0eab375e56a20624fa5ad63ade3446d685dcf063d46c0f60264c431f3";
   };
   schwalbe-chess = {
-    revision = 73582;
+    revision = 78116;
     shortdesc = "Typeset the German chess magazine \"Die Schwalbe\"";
     stripPrefix = 0;
-    sha512.doc = "79a10ef61dfd4ec0438e5b22498c2c62ce7958a06de7facbf5afce563852877adcf042f8eca38e922830e49b444da95a9c2b5bf21f5e647aacca328250fbf185";
-    sha512.source = "7feb75513ca35da1d30029512e02f46a81ceed935259d3cecbdcd58c4d1906ac41cedc85118804ee8dc90f97ba96d0fa28634a20baa1c66d993fd41addb813fa";
+    sha512.doc = "56fb14d3d164fd17ffda62ae17ebe50a60fafa46068e5542e590b0d605e0e995e0dc47cdc5975ae1349693abb29348de86d62425cc382bca94dd509268ec98ef";
+    sha512.source = "6108a1ed44b0e9638d2691604664192e57087109b477f1c6c23a70b69a8488fe9ce8ddd690e2861e3cc5dd1241e52f679f74f71a5ed904c7d88aea9ba4ff5207";
     license = [ "lppl13c" ];
     version = "2.13";
-    sha512.run = "df2f41445eef6fa9a64787d9e7464be5b53276a7ade01802d81cc324ef62f9e140414ea168fe69fbf494eee068c84ace1ed567399612a3476b12ee56ee5e908d";
+    sha512.run = "315e25cdfd2c85304e943f17d39f738a284dbd3352d70c41b9a9c45c9363bf256cc5346cf331e04a36269f5dabd65be1a9a5c1d6fe09f075c0ea55b3b913216f";
   };
   scientific-thesis-cover = {
     revision = 47923;
@@ -44646,14 +44793,14 @@
     sha512.run = "77f8909b870fbaa4f1a0414f75f08ac602051d26c0c935be8661be8820a0b77734b614b9f5c8333b1f1fd12f57a6ee3c4c403f151bc60300e454673a2a4235c2";
   };
   scontents = {
-    revision = 76900;
+    revision = 77677;
     shortdesc = "Stores LaTeX contents in memory or files";
     stripPrefix = 0;
-    sha512.doc = "d29b6e9bce919f609361a2c9a9f905cea19bc2510dad5def283648fc07e7cd9590f7faaeabf5acd9fd508fa0ba10ae6b2641148e26c47d55ccbb074b8ad763c9";
-    sha512.source = "16f4e66eb68572ef17e2f33a911ce003b49402fccad1ce2b5637ab9b3bcc5b8608e7560297f959976270befb629aff1f20bab59677fa765fcc86d01b022d3a87";
+    sha512.doc = "5280c8dafcc06262d322cbf23bd553501260af92ecf4a65b4b4eb815bccf82065c3df6ab01caee9807ff117124e9110f51105bbe8a253bb3c3e6dee586c9a6ab";
+    sha512.source = "47f0b24a19bf9b4b276482a13d0ca0d9f03558adfdccb8b2d2a68e9aef83a5c572fbe4770626ead83487939e9a3b4f00f86c1ee644b1077f577d72356a51501f";
     license = [ "lppl13c" ];
     version = "2.6";
-    sha512.run = "6a2ac2bc4be8c05e677ea25c88b362d85603c7268f9783955fbb0ccf3ad4a068e696f2519005ca02ce1f23fc68e336bf49e3942cf83585c6056a2850b323f3b5";
+    sha512.run = "3a8c8d4a224747eae8732c60121c61689e927fd79d5523c31db741541035aba70c9ae7fe3def5d09731358105c4a78d9394855c37b92c4756194ff017f6a9bff";
   };
   scrabble = {
     revision = 77114;
@@ -44770,14 +44917,14 @@
     sha512.run = "5b2f1c1c86a8b3df5bb4d5edfc002ff80449d2cdcf6ec7aea3732d0ba8e6bcaa105675f9f37dd5280d3b9061400d8edc0c67460ac9f1541159484aa51b851fc2";
   };
   scrwfile = {
-    revision = 66872;
+    revision = 77677;
     shortdesc = "Use LaTeX .aux file in place of \\newrite files";
     stripPrefix = 0;
-    sha512.doc = "6aab0a6af0c3f989788673c44bb8a885ddb259f0be3f69f0a32b0bdebdc8e607b32c8f8530cb99d59b1c7739b2c33446f8b7c832384d07158c90bd347704a1a3";
-    sha512.source = "abd536d76460165077ca7dbdcd1801b018cae2d16c783e72502bcaf5ecb34562f273ca37cedb044a50e7d53fab84412bf9a5e804be064951ebf753aaa764526b";
+    sha512.doc = "8cfb856d0a995b7afc08f53168ba2f3d3bf5dbc647caba78ff409e2d4ac7162e18ccea4a5eabcffdc6409808f76d931a8c7c91e32135cce67445dd58f8e58c99";
+    sha512.source = "5d940bca57a8174956ab7a089ebbcd6479864a571242ac364ad4216692f3f4c23c581f7245a271d771c3fab843b36f2cdffb502a5b7ff5ab1dfdebd47012892c";
     license = [ "lppl13c" ];
     version = "0.1.99";
-    sha512.run = "b4d306af1e0d3dcfa59ef14250f14125bfc4a0b9b0f3e6ab32b809f2e729cfa45e27549c8cb9c2dde2819d328c1a032eb6aae6f123f1c71efeba4c9d16611a34";
+    sha512.run = "3702d98c5e9d737f484a9ca680cbf754e51cb127fb1d0f37615433faf195d3ff5f2ed33e0a570b412ea8d1ffafc06ae7fd0dc861a1deb08102206cc47d385e4b";
   };
   scsnowman = {
     revision = 66115;
@@ -44845,13 +44992,13 @@
     sha512.run = "51586595f696187a5d43d21dd7c66a35547a2e0ad184b47e45c7686474d008c01ef525d64d91a0a0ef0172ed5515190cc8a5d8d22ba1297ae70a4c4f5556e3fa";
   };
   secdot = {
-    revision = 20208;
+    revision = 77677;
     shortdesc = "Section numbers with trailing dots";
     stripPrefix = 0;
-    sha512.doc = "7ca1b4102c6f92bfc6dd0571c489852dc5c1df4a58530aea490098192ee256a4df7e0bbee20adff78c2b35dfe39b8cd3f821c5e45dc6d78ab4865b6f08ad8488";
+    sha512.doc = "9ca343cd8dd4e0142e3ac64c2edd2571b2dd57cdda180747c837ef9384283aebd1d8cf3e0ff4bded61a967c9f5adbf4d68582f0b15ab2c80496d43f0bb7d8d0a";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "7fb101dcd377cb5e3d1dca352d266af419c6fd83e4f2d1701a3d598e69e8e7f70afc9791a76337f4833da612cf07989ef244af1b24eb62ee59dd5f76225aa037";
+    sha512.run = "e27d654b1160dabf5858dc973e73f1192b19e71e61c194af95d17a943b34f8e1a02ac287693641ef307c26706c3014f0e57be1406be5cfb57a8f40c620459053";
   };
   secnum = {
     revision = 76924;
@@ -44890,23 +45037,23 @@
     sha512.run = "d1a4da6a59c0411baaa785c58350c1d5be9c1081e0344d8a61fc009f49a1b751a09f358ba1baa3b645de4eff7d69e3781d8b44d90738105c0f56723da36efdb3";
   };
   sectionbreak = {
-    revision = 50339;
+    revision = 77677;
     shortdesc = "LaTeX support for section breaks";
     stripPrefix = 0;
-    sha512.doc = "a98eede394708bf612f593e00c58b5500a35b5173381c1f149d0be29b49fe95f5162602177b7d4f23c5b5312d7cdf47ea6ced8bc285853d2b7d77926a6ca66b0";
+    sha512.doc = "fa361c7b6f49bd7cfa857ad4a628168cc2ed4ce073a7894cec3edeb9c6d765a2c5d4676d4638c6c3176e7949b2e65c4e8cc97edd9efca044a891aa4266e8461a";
     license = [ "lppl13c" ];
     version = "0.1d";
-    sha512.run = "4b2c26642ba346acce5aff9678bf94f76d85005464f80eaae862a522bcbfa34c1671af79671982a91208ef104a21a532d851dcc785b5c40de4fe462d12488832";
+    sha512.run = "2300f38b8501c29acadbacf6071870360906fda7bef487b32b11fb4677904f20a77133bcb678f8bb1b11c65b90c264d3271c506c9aa4c5008d54be1dcbf9ce58";
   };
   sectsty = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Control sectional headers";
     stripPrefix = 0;
-    sha512.doc = "69d7fc032c06d015d7a6e6d2273c5240b146062565882fca0ddf5b7b795b788207bc9b478366a0a40e4acf223b07482f5cf41a65dd9b37047bcbf12566f6a826";
-    sha512.source = "fc79d4c7c437d9c5ff7d8dc62439242cb772f250527ca099cd1180e58742a9ff42e7c63776c24fa5563c95b5d2bccd97df0e1c086869bbcf5ff2ed8ff5297bf4";
+    sha512.doc = "9cdca73ce5e2bed97f704ba1763e4c2698634355806e615dda24eac36e3bf91387f7133c015b28daaacd79379826479a7f96307fa36e15d4fa6938581bfd0cff";
+    sha512.source = "3e822736f73a3a13766bfffab0cf437a491c57168c42707e01da9258e536bd8b0fb7f8eb7e252d0f79b0f6a1560de68e1fc898adcb7521616e54e2bc3581e237";
     license = [ "lppl13c" ];
     version = "2.0.2";
-    sha512.run = "7e164b14f29a385f8a97e09ad124c347a154e316ac2eb41e0bf9f161d44f2782995fe271b5472ef90dfa4ffdd5495de81090b44f5777243ea76c9f75fcbde2b4";
+    sha512.run = "b83677c03660bbfb5f08a9fd8e8e08808f0ab310ef951b936c89b472b750c6d3d7c0fa56bc33579d6b4ff8bfbb87239f22e3a9cb58570b867a953ee3cd3ff429";
   };
   seealso = {
     revision = 76924;
@@ -44933,32 +45080,32 @@
     "dvitodvi"
   ];
   selectp = {
-    revision = 20185;
+    revision = 77677;
     shortdesc = "Select pages to be output";
     stripPrefix = 0;
-    sha512.doc = "7c99f0400841cb1d88af4c239f43eaec7c0b2358c2e581866d4361cd86b9eff413bc9e07d8df630ddff8d4f37193896bd430f4c357d9cc04591295f18ebd09aa";
+    sha512.doc = "0b11004bc002eea233f2a5f03b114816538406182f550d531ceedbfc259539d86564da3ee1674519414bab73463f78ca366e1618b591aa5194851a2fb445efb9";
     license = [ "publicDomain" ];
     version = "1.0";
-    sha512.run = "1674c9c9d7afbc851f8c4fad1b46a1ec18161eb48375d892c947416ee97791addf92f75a69090c95a0f08bbaac1a7a745af93a7bcf91e2e0f8117ed3f3106dc9";
+    sha512.run = "373cc55c975221bdb3ed55bbb7a0247846e4a371aad2203b482c228555b49cf2b6777fb15017076161bd5da6c9e9132c3998ef6fe3c8cc25229af67e6af492ef";
   };
   selinput = {
-    revision = 53098;
+    revision = 77677;
     shortdesc = "Semi-automatic detection of input encoding";
     stripPrefix = 0;
-    sha512.doc = "918b0b2bbb8230a482418c56de8081bb455980e178843b0ea84b18435c1fbfcd50a71cd0491b89c5797a374479060175219333bbde2ab28b5147cb5c3fd65ff3";
-    sha512.source = "c6b2c23826216a5c479c3cb3de1685dd4d695422ec67fa7109e7a1adb46dd7ad8cd21138a480e8e13bce1c4184fea0153114f338a5754778b22dc173d6f9445d";
+    sha512.doc = "898b7d7aed6668f1be72bf8bb63d2ea8ecb12788d1e449930e4f9b67ab96f77aa7f6494c54b160582e9980435fbf42622d203a39a19e27050efd4cbfc902b237";
+    sha512.source = "7aef9bffb9d06ceaa48dc020a500f72ee7a2f844e377da28981ea15e5cc2237584bb052ce4473a3de94cac2b159bb9049261b7cefac7e604fe575354841ed9df";
     license = [ "lppl13c" ];
     version = "1.6";
-    sha512.run = "41888a394e4c9adc60242e4c689b272a7b4e2a2db2e4824e0068a305cdae59c1edd46b0a9e45909cf29381f240693234330fb3488be68831136f8f04a72faca6";
+    sha512.run = "39b852cfdd5732c283d11e7c48e12b9f29c8dc0c7d37aa751819666a7dc2b475eabd59c1cf4c67f946e64ba1c6bb9511ea4af9cda20a49923e0bcd6874dff244";
   };
   selnolig = {
-    revision = 68747;
+    revision = 77677;
     shortdesc = "Selectively disable typographic ligatures";
     stripPrefix = 0;
-    sha512.doc = "c36e55066eadd959f625fcb72fb89ab2ca51f3411ba9bc81c38d2ac3f18ffd792fd95c33178c0607e3958cdbd81c031193d1b6c712906a2c9cdac4178ace6ceb";
+    sha512.doc = "26c891c46f740e9a83f2882e2bd0681205679ceb5950de5e1a9bbe9b8c4ab11676a47465cd5f8d954adffd1c5e8b31b9feaec84c61ed41492d65e86e00a87ade";
     license = [ "lppl13c" ];
     version = "0.302";
-    sha512.run = "8dd7baa476f72549830f2571615af2374b9d74da69c16f2999708201b7404c46118e7a6046ef8dff39935d3b94373140819497508b2a8982cc928a5dbfc6eaac";
+    sha512.run = "96033d26c3dba814a42216c6e0a1792cd71c2bdd54bd8fd3dd3ce6d86779f1f9c3d4def94f3371d3f884fc520d604222205e6708f047f7deb803d3c7d9a494ce";
   };
   semantex = {
     revision = 76924;
@@ -45022,13 +45169,13 @@
     sha512.run = "b3772d5a21355cafaee3962aca108f8719a1ced2c109ec796fa2fd8002ef4f927a22f97a28f08dfe295a2b663fc8bd75d76259bb0a994818655d8a3c889a07fa";
   };
   seminar = {
-    revision = 59801;
+    revision = 77677;
     shortdesc = "Make overhead slides";
     stripPrefix = 0;
-    sha512.doc = "8b7364dc568d1fd78cce21ff1846a6369fe3fccf07bf16ece8383c941492404d6fdf3be1607aa2279a10d670803536474d7cc318b9b3dda24142fbcc69fe69e0";
+    sha512.doc = "79b1bdaae42af8a2d54bf84d61a1deb385e94c2bf8ae99699ef67ce0060aa4c8ad78933b7e52f6fc14a51a1498386e417c714f2fbcb3422c35593c0f5d46c4c9";
     license = [ "lppl12" ];
     version = "1.63a";
-    sha512.run = "28795c64e4af5296e228986c28115305cb76087d241e91312cfff351f7e51833a0d76b2acd667fc5f7616dcb1685cd02b2d9352ef7f0e36d5bffdaa5f421e6eb";
+    sha512.run = "bffe73a1ef3f56bc0d9027e153a8a5e1e9d6746ceab337c27f927ca6053f5613baa7d8942bc61d90da21a1100cca5908a859baadccf4df86a137914548be9bef";
   };
   semioneside = {
     revision = 15878;
@@ -45060,13 +45207,13 @@
     sha512.run = "87e53484509bd412692d126a6018c5ea3a635df11296d84ba2cff4599d0af284f2c9738761e3ff33ed2d8b73fa03e33cafcdc43ba75df8936be0e1d2ffb594ef";
   };
   sepfootnotes = {
-    revision = 71883;
+    revision = 77677;
     shortdesc = "Support footnotes and endnotes from separate files";
     stripPrefix = 0;
-    sha512.doc = "1552bfe7f02b80ce4708ed1b808e0df2ed00a7f0258e9e338d040badbfc7b46c29f97f02febe0d5a8daed576da6152fd09a5a15396d1a3cfc9a80a685bdca433";
+    sha512.doc = "67e9af126f1c5c775e62c81e55bf2c4be9793e0ed482bf58e9267a1a25d2b2596b69e92f756f729fb3731ad101696da518ee68ecda21afbbdb2cda813897e71b";
     license = [ "lppl13c" ];
     version = "0.3d";
-    sha512.run = "b6815525f7ebac29e206776e0178c916e8aacda739485f3e1d5c2a30069e4da2b43b03b366e9cc1a875f5a1379a28c8d74a9bb81cd866fba8d7a9b0317c2ec6a";
+    sha512.run = "d5016d447fca7416452d7e6d45562b532ce7ef97bf68d2fe45254f0c597a740f6259430d0efeedcba41c80808cf6e50f35ae54fcdeb5dfa3c4a33e3da094d794";
   };
   sepnum = {
     revision = 20186;
@@ -45087,14 +45234,14 @@
     sha512.run = "5e01c1bbf9abb40087d5620eb3cbc06b8ee918d71f4175862b03430ed7711b54c63560187ed42a1bf1c3ded8f359711adbd0c720dafd5bc1e127c29c3f12a75e";
   };
   seqsplit = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Split long sequences of characters in a neutral way";
     stripPrefix = 0;
-    sha512.doc = "0c49425b619ac62da4eb2392c51cb7726d9bab008910a88ec36b866717c8ac341be0903e3014ed36a30ac701fafc453a0e319470f2f65eb6775d6ff52b9f07e9";
-    sha512.source = "7349cf842e7142c5c13e46d16acc35535cf34be8a4985f9a581a4338ca54beffbd80fe2820123652f3ffc868bcfe1c995200ab918c99b19d6c2ee339b61354e3";
+    sha512.doc = "f4e51ae4c9509a69da77f038f49d67ee7f2457cc7e1bcd49558b009d9d0e586eeebf75f661397e8d2c2bf6b91f670a36e7696bb591aeae325a7d456823d57e6c";
+    sha512.source = "03dfe376f02ec5853c14fcb7eb6e626e189185d67083202504a430a85e096c71ccd7edbba9af9e617b1c92cccb05e50ab7b8501c921c6b428a4115491f025c9c";
     license = [ "lppl13c" ];
     version = "0.1";
-    sha512.run = "02413d104e12aad40f093731e2d28d0354216d3d57e6f811609f398b8122bdbf906f78cef38f355562efb4e7df6dca314f8548d8d8c03a2a9404addc42f0e1f3";
+    sha512.run = "8da79cbc41d56453bbb8e5b5f41f94d28fe016d0faa5219ac308d4b6e5db07814db4180ad64f6b92b36ab5b42fe5026204faea21d856155fa2ce9208a67d4bc3";
   };
   serbian-apostrophe = {
     revision = 23799;
@@ -45158,13 +45305,13 @@
     sha512.run = "817474bc928883f4bbe97391a477bf492a4e339879fc85d7aec3ca932f9b46c310f8fec5b732deb2196c705c2bd3a22721376ea8289a1bbdc12555447f12f757";
   };
   setspace = {
-    revision = 65206;
+    revision = 77677;
     shortdesc = "Set space between lines";
     stripPrefix = 0;
-    sha512.doc = "0ff85289fb5ed620f208e3ba84e82efacc91da32611e95a4a99aa5c939c0400ddd3a118d460ef65d77b483678e5ce8c71b901ed0ee1f711cfaa29f26141089fd";
+    sha512.doc = "fa47ee661f8085d7fc3aca48cdbc59c9f8f7bf02b537103592ba3f3247dd96d9a17ccab094ad5a3f1bb132ee1c38291a99b9cd4fae732b0c146a8e2209b1c1bb";
     license = [ "lppl13c" ];
     version = "6.7b";
-    sha512.run = "9462cb011a2a13a962c08d7d962c120f2b459630f8ec1f96704c2878facf01a37118e9c94ff9cefcc9ac0e0e3c1bbedc158aaca24dcf13cad0973a6544e79651";
+    sha512.run = "c5c1d1f65cc316f75f942a087e943d2ddbe9062f8e45f10ad1793055dbe718d6d1ce0364d28e007d27d1c5de591cd21da3f10c079905ca3ff35b6928b4a0e491";
   };
   setspaceenhanced = {
     revision = 76924;
@@ -45254,12 +45401,12 @@
     sha512.run = "d90305b5fbac3e06bc3195b802b4ef78f7c6cfb4f0592dfd300839dd608150e1ad08fc7479fe6d8df4f2429ad6b7f81692d9723dde198991fc9626565cb38578";
   };
   sfmath = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Sans-serif mathematics";
     stripPrefix = 0;
     license = [ "lppl13c" ];
     version = "0.8";
-    sha512.run = "7ba73610785c9270e8741ba0137701677575e38cac79976d89e2f5768804ff52117c5fcbaab9b260be522f174458a18d2d70d82c2da201e7fd6a91fe4bbdf6fb";
+    sha512.run = "1cbf5471a5c0fb3efda5eab9aef83705f3e1b66249a6cfc8699295ce4ee0bd1ab2e41f6778f4db913ad496ff30c05cb396f6509de875ee094118a90f1a7fe2c3";
   };
   sgame = {
     revision = 30959;
@@ -45280,38 +45427,38 @@
     sha512.run = "968be382e1f82029e7e06f5ed34473fc20fd38dc758b97fec6dbf015ca13c3604dd6b7638dcad2f80be474ad001c47ec86e75e8d9947bde26053873376e9e068";
   };
   shadethm = {
-    revision = 53350;
+    revision = 77677;
     shortdesc = "Theorem environments that are shaded";
     stripPrefix = 0;
-    sha512.doc = "c24f37f7f864283f9ced1da1728dd7ae137395ecda3010aeff8ad778b96723224df77755f8f71f7672f5870ad6832a22bce47bec88ae51d0992e39c0a00c8caa";
+    sha512.doc = "7381b444de01e2dc8effffda766ad8f1aa49cbb66a7c2783da3f05e19c8e2b83a3ea112e8519add4f141de16aad340287059dfdc2e18a31123328a7aac44068e";
     license = [ "lppl13c" ];
-    sha512.run = "b9e15e017332eeadd3324afb858ab15a820e23da59f5bf7ea57dac719b9864304effd092c3cb2f25a6f29f22dd2b6f2585279edab4d77c62256582c66be550c3";
+    sha512.run = "8f7deb374785b10b5e6a4804f5731db3b9490333bfe78f76663b21897e7949ca81cf6c4f82ce52208e96df7a768a35c653c8c7284196b4ac9fcc8104d584332d";
   };
   shadow = {
-    revision = 20312;
+    revision = 77677;
     shortdesc = "Shadow boxes";
     stripPrefix = 0;
-    sha512.doc = "402e64195e247cd2c5106e3bd621705b80c006b2f6cf0b1da14ea459acb7dd97e2ebeda87ec118be3e73bf76edebe3067330498a2875c52c4248add70d7a0a25";
+    sha512.doc = "6ee020b266d2d5d7eadc5747cc4082772df06c054e82e78eae2a87f2956a93757b09506b214b581368104601f3648efd56e6d224e2c9814e3ed01c5097cb1b88";
     license = [ "lppl13c" ];
-    sha512.run = "885bca1090b93545f59b387e952998f65dee0931fb5b680d06667c3bb8172e2aad37e840942b9495134b421bb40b871633eb5de941b3a257618751e789128ca6";
+    sha512.run = "093c13fe9b068c13c96e0223cd8ae7d42733c0a4819c3fc163a838f32aef47fe48084bd225ac142ec512ed7e652190e367de586766bd8471bef8e9e1d54aec12";
   };
   shadowtext = {
-    revision = 26522;
+    revision = 78116;
     shortdesc = "Produce text with a shadow behind it";
     stripPrefix = 0;
-    sha512.doc = "a89bd6ab160e364af06e26d9bbb88988c286befb5dfe4e4bdfc7c511811ef4a1ef630708d4a7ff32cb0ab6831dbee54d49a84376ee9366bd422d5689d86db404";
+    sha512.doc = "09eeb8fa4214d2df32c8ce6ddcefadec97d8f989669a8496ed842cdc9526d96037d27192e2ef9e6652d9e892aebbbbfde3b2e18cb65764b5202accf93ff14eae";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "59ab708b0f8987838cafe864cdcd68aad5aceb7cb4b3ab2b479ec4fbd15e268ba4fdd1b0143b7c247cc186a825d99ad810839221a391eafd5146f0a46865e23d";
+    sha512.run = "992cbbda3ce188ab54457ff70fc1508b8b84e5a248883c83336e066872cadeb4777fcf4d2c93be19e2357faf7ad16e9e32e4565e3bab03201b7a2074d468325d";
   };
   shapepar = {
-    revision = 69343;
+    revision = 77677;
     shortdesc = "A macro to typeset paragraphs in specific shapes";
     stripPrefix = 0;
-    sha512.doc = "69a5f9dba1683ed0302a3dc4edede537986ea473357c0c8c454c26eeceb2c51d31d87d139bc3eed39ef1862c2a6feef0e570e9fb12bf88f15ee7f34280f7daf2";
+    sha512.doc = "445d07de41c5e1ffc2468d2910e17dfbf14fdfba9ca27966a3304e3e5f630c7af4070c28b5113d4e1e234e8baac87ad531324807f89b370dc49463fe37bbb3c0";
     license = [ "free" ];
     version = "2.2";
-    sha512.run = "24975c53f9b29ae8302dc4e169d7d176c4825a0033764c8a08aa610c184e79d249e849e2ac3ddbeccb3bb80a4a5e29ae1c474331de68000de1a63951079acb4d";
+    sha512.run = "c57231f078430262191a2584cf0499d0ea08e19f9a133d2f25fea97e9dc4e33521b30ca29ebcb8516a420713343644f942664b82bff0dc07ce7db2b5bfd01f8a";
   };
   shapes = {
     revision = 42428;
@@ -45369,39 +45516,39 @@
     sha512.run = "629f4edf17b4e1506a7011be17b2d842671bd21f923713d1c7394f2b7749d8dde051d04ccf0e47a1f6dde9f4538e3c9a9c87f96ab1775ffc08139840ebfeb4d3";
   };
   shorttoc = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Table of contents with different depths";
     stripPrefix = 0;
-    sha512.doc = "03090924cdde619877b271fbd70761035b5da1f2278a3642b471a86e83559da316558a752d85716242001f40ca403a985d036750218e78d873a4920905c5a652";
-    sha512.source = "2841e846e2e691864e3412c52c3cb2130462b2b94f01ab9ccfba7cad05392db2b63ce3cd3ce60896a7861969ea20fdd3b1918a69e122316149af3fddf1b9c492";
+    sha512.doc = "3cb666757e66050b27700cfd3bb5ea58330c2041e925f438d40e8edfd41911c4ffa54ee51b2c8a2db25e315aaca764f5e2bda5da32003f89396f6c3a9aaaf368";
+    sha512.source = "b7dfe55856c746910a716133feb22f6482c2cb0c6357b9a3a21421b19bbc4f5447bdfc621de6e2b16c4cf66a66b583fdb817331c23452e9c7eeb0c84b9f0d12d";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "6e78bca7425e0b23d7520af19494d9de303b86fae7a013ef85b2d512ee86be1f478ede2293650b435ab579811e444b570995e2ae8720afc60b42c0c26d7489a6";
+    sha512.run = "a86e1430ede2544cd62131cc397df94844532ea8c6903137e53fbbd8c6985ee63fd1110560c26acc16cb160d823a3f40b8a5ea59000faea29b7caf060af149c3";
   };
   show-pdf-tags = {
-    revision = 76606;
+    revision = 77604;
     shortdesc = "Extract PDF tags from tagged PDF files";
-    sha512.doc = "ca3895e8c864815d7c5eaaab9cb39afda4443299951651ea282c0028b61920443c7c9ffb18b200d9eb1e7fb83637508f1fa200b6493d7c939e1e10a67718b777";
+    sha512.doc = "08efefa78d1fbfdbefa5efbe6912a8bfaf30617fa639a2032bf8250cd3175192d6a4edff3624c90a7fd3b9ec0336ef38af9782f2e1725207b545ca0df537a71e";
     hasManpages = true;
     scriptExts = [
       "lua"
     ];
     license = [ "mit" ];
-    version = "1.3";
-    sha512.run = "85ed3baec83394f5e6e8bf660fb2bb6beee76eb916023199c274909aa29828a6e9443dca8ff1ca8ebb069704a4a041dbd4caef9a46c246ddd5db5cd9e85124c7";
+    version = "1.5";
+    sha512.run = "ec0dcddb068b2fa8a7d17488fe1f118ad46962ae27dbb3cf935ae122cf87961f37eecfd0568bd59cc43f78100fdb5e77e45d4cbab3ae984e7ef69c5703ff8287";
   };
   show-pdf-tags.binfiles = [
     "show-pdf-tags"
   ];
   show2e = {
-    revision = 15878;
+    revision = 78116;
     shortdesc = "Variants of \\show for LaTeX2e";
     stripPrefix = 0;
-    sha512.doc = "a427f7126ded4251c255fcaf2c381f7c00d0d0e55253804cbe631ac59be1bd51e7ba2ee51110af86bcee27d73698bb7baa323fef8e23a41000928b242b0be282";
-    sha512.source = "3a6bb6fbc35b5f6b1cae00d5c63c16ea13af270cbf90f57761f71076b26130272924154b8b0aac60cda41d27b75db4f1edfc82101f38b29e9641a4e02cb6c2a2";
+    sha512.doc = "6ae92e5a2bc71fb377f05146c7ee0b4ae4a1df456119a67ffdac62869c2cd5e4517c8959a698563afb5f3c2b61901107eb87c2a37c5070d2e4e1e821750b7de7";
+    sha512.source = "0e0abff7679d41d39871855de203d8eecff8056f25454ebf27524a0b1e75fdac31ced1f5dd9b9b58a667d130b5b81afa2f1ecdc36b62cc4a71ca67b5221f9f9d";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "702d0913a299b68bedec15c697868a70f058957dbd3a2dd2c503bc21c8a250dc7601e6348080bb394a38108bcd2f5ee67796a888183aa181c9f88a72e7666580";
+    sha512.run = "f19672bae4b99f054dd920b8f4f031dda9326b046e2630a747ca33f8840d7a046d3afc02debadebbcecbb7b55066192a743e57515a69edf2b589be446a7ee9f2";
   };
   showcharinbox = {
     revision = 29803;
@@ -45414,32 +45561,32 @@
     sha512.run = "9cb18e80701d22e167b026767068e0fc0a7b6c4cdbc9014991f10ecd76d37614983591c931972584c50e0d6e35abee70ae3079f7dd8c855d33d1e4ea06693d25";
   };
   showdim = {
-    revision = 28918;
+    revision = 78116;
     shortdesc = "Variants on printing dimensions";
     stripPrefix = 0;
-    sha512.doc = "ba76568009149bec7484b4dbe7bede8e516a2c2ad20c77c70f0357e865c66751aa4f3d8c92c59effa1ac12e03b3b8c500c65708547ddf52458b0ce90def8fc98";
+    sha512.doc = "02dd0a3ce8b8adc851c3931ead214fc8eaf4927c67c2a3775c585d64aeba6ab4f4b3bbc5910f3907ee4bf8dde87fc05e37edc6ec277279d3f946c62f318c1588";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "07c409f3d30def6894a787d9c2f7366abf6ee4248386e9d5b2e4f7858d692c7cd3e72871ff02c73a39a190ac36ccbaf5fe16e8e1b7b328be80a9ba041d12feb7";
+    sha512.run = "9ed14a5a235803bea1844e4ada980f45786f7b016b35dcb96a4fe9ab1da7d9177b422a5c533be7a10cf18116cbd18c0c9b74c0372781cb08a09df7c5602e90d4";
   };
   showexpl = {
-    revision = 57414;
+    revision = 77677;
     shortdesc = "Typesetting LaTeX source code";
     stripPrefix = 0;
-    sha512.doc = "a3f12a43edc3ffa5556bec25b8527fdb039aaa704b2ea37c723cff367d453b0ac53b14c1eff41bf6d3961cf1d4f11b70349c03d253336421031ef0ba81b56561";
-    sha512.source = "52ff44163115b6ffa5a8e181739df2c8c5619a32af0aa7bfc773d84b12c0e85a67bf87823ae0dd47f7d40d9e12fb8bde039b935555a1cc220dcbf49d182f6da3";
+    sha512.doc = "2c127f4cacc01e0838e5e4497f1a539d953c0f372c62244049338051644bb6a0e12112458ec2424331f7ff63b0c74383e17b438a1d643a8aafcda0b0eee579af";
+    sha512.source = "4529a191175e90cf1d5da368ce12f648bc14da24b336eb9534a155143974ea17c6d40d231a84509695fcb49cd83938262ef04795a2b42c7a0afd5d7a4b763dc9";
     license = [ "lppl12" ];
     version = "0.3s";
-    sha512.run = "d42f5d3570f252295a25c130c9ec9a94abaf9f28038fca163423a0aa44afee4f354aa2dced3ccd173e698a5da6ccfaa8284096742ba04b03f5aebf8fc502426c";
+    sha512.run = "6d1665ea64ca6a3a5e406c4e797b79b2d13e04369f3f70056c0583ca17c4e7f3411103bed60d2b14ddc776ffe036e5a925cb1da3268d256c951b6fb217cbb95e";
   };
   showhyphenation = {
-    revision = 67602;
+    revision = 77677;
     shortdesc = "Marking of hyphenation points";
     stripPrefix = 0;
-    sha512.doc = "9d7263e5f285f5d29738c7ff578a0bf9256d67e56b882e41f0578bf9b594225a6e0711d9fd05bbc89a03cc0bb56b1ea8c3ccb1f4bc4f91ad40dbe55849b20c99";
+    sha512.doc = "27374571d496deebab664ca247b9a2ce489819cf527a3111caa02112d088eb3515886ddb8ec71eda0a87e28a9fb90e86b73e2de04de6acf7575bcf33e41ba54b";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "0a3ca7d966edf0f4221dea2c084b428c9e248b3d223b57f3f210258918593d93518a5ebdce7d9de6b88ab040c0f2b632039e23f3339a729d1fe1391f8a51d4eb";
+    sha512.run = "01d53627042c0b5fd000e4af965b0df064e824f796599379e3c01f3a111c303c71319acb6eff9ad52979bfcbf34ea11f2811d1cef4f03dbdcac633cd9185d655";
   };
   showkerning = {
     revision = 67603;
@@ -45451,23 +45598,23 @@
     sha512.run = "37a913fa403c9760fd150cac3fb88e349e8c1109f51768ee202194e72232d6e16d8dac529872dd1df7896a40a79ddb72d65c9191f72337c806de307808d80532";
   };
   showlabels = {
-    revision = 76188;
+    revision = 77677;
     shortdesc = "Show label commands in the margin";
     stripPrefix = 0;
-    sha512.doc = "1ff038856e0499fe23d9949a128ef99ea6757b966b768ff4e98d56653267ccd0e9d316502e9f10f83d158e5b7032fc2be4db5a2830f0484695c58550137157ea";
-    sha512.source = "13307dbca871dad5943711085941a605a515600413bfe656f8e909ad13abdd226d2f516a897ad15922c80fc710fa7338c2ddfdf33ab732c064d0d58ae93d96b4";
+    sha512.doc = "ffa394ecce83a761885dd22fc3eedf952f748abd6d3024ea5ede41c29cbe636e62209a9da41ea061082afadfdabc437a0f69d70e3a33337a6c26f857617e20f1";
+    sha512.source = "615aca1e372129f09eb335c6d8e91e082fb3f76360c180c947e6fc77b0aec6afa9f2cf4115d7d021792ae28d69774f5725aab0eb16c727c28e325284a6898832";
     license = [ "lppl13c" ];
     version = "1.9.3";
-    sha512.run = "d7cdc512764df4ae9fb68d15d2b659245120ab0f4d69b7397d746d4d6805abff7005271fed8f0b5125ada3939ae8e3e9e006b024c3d93f7d7557abb206c8db7b";
+    sha512.run = "bc38497e6884013fb20c83d0a81f6ed1c22a28359a2ab1ba17170ca67c81c36ab14b7ce116cd7c58867bdf9fa074ae73713474f7443327ec2476ba64efa8fb46";
   };
   showtags = {
-    revision = 20336;
+    revision = 77677;
     shortdesc = "Print the tags of bibliography entries";
     stripPrefix = 0;
-    sha512.doc = "3e1efebe8edd469e66b18aea9d9a3614b753a43ac61f5a31b57fccc1b45047aaaee8f80d156932671f9ae7457fc627732f1f72c65fca42946280c1182d8960de";
+    sha512.doc = "65643c1ec0c71d0e4b372b9094319117b7494470a84a4f6ec39ba7687d1a18ac7b5bd06001840d0bc8e614c393a43d3889a34163c1484b38eff8f2b3ae7cdebf";
     license = [ "publicDomain" ];
     version = "1.05";
-    sha512.run = "b70dc03f22838dab65631d39d8690897d4a5c71b5451775e85cdc3ff600d63afc29bd28e49aa64a5a2467143f4a84d62f5a2a9af4a8365e0a867d6a46e9de93b";
+    sha512.run = "e304fb671002a7d763812a043f77b088ac20ecfcd14a75f8e113b62bcc1a6a9042f87826e95b23487e7f7c2229e1faa311ae8b6a5db25413c6f51a081ca0af0c";
   };
   shtthesis = {
     revision = 62441;
@@ -45507,34 +45654,34 @@
     sha512.run = "da3b02cc3558a337d7d35018fad00faf6d9183f3f4bc5b5b31e168a11dcfa705a77cad6c42f3fe3d98ce67f50d94ca1f75a82999d5a27837ea8fba6c01602594";
   };
   shuffle = {
-    revision = 15878;
+    revision = 78116;
     shortdesc = "A symbol for the shuffle product";
     stripPrefix = 0;
-    sha512.doc = "1b6427fa0cf98651a219f1cf6f15a400c09ea924bf0dcea7d48ce0665a5f1828ad64513f87089ea48d02d489d8020c90c661bac60c069601be437c77364813d4";
-    sha512.source = "250729a95e91eef9c1f9b5364aa3b0a1f03a75805845c773f82b26c3782764d6f866f33391aed2f0cbb167d016b06593c015e6fb2aa9b7ababf33f215fb92647";
+    sha512.doc = "35ceb385613e897941287e70ebb6746d3871b3d38c674fee8724a1d02a54c9ac256b3e15f408b8c1626e5f5d3381b04afdd12b404469936246b4bb005e2d19a9";
+    sha512.source = "dd8bc287b79f325100968ce5bb44e87bd5c492ad603e87d48c69883440b8b4c3b28aa3d8bb0abec539916368980b36a4a7eb63cdc30b34d1dc237353f7af6f7f";
     license = [ "publicDomain" ];
     version = "1.0";
-    sha512.run = "62b456ae961d34908fc25cc085bfa04d39e70f2641d65dc8e0eda419ec96a328798cc258162ebe065285f3ee1088e6076525ccbd8c0f7c0800024f371bdee65d";
+    sha512.run = "86376aad6c11577fa9da33988422bd45f19664c1299217005387e4d874ec9f835a1f728b57c3881e470efce859d627539b060abc9d3ab4044cf7dc80b4bed1f5";
   };
   sidecap = {
-    revision = 65618;
+    revision = 77677;
     shortdesc = "Typeset captions sideways";
     stripPrefix = 0;
-    sha512.doc = "2ecf3e41c8840ab87b49f771d590f8ba0d05d205bd435571dd71f2ad1d1aa727f7151b9bd913c4d33ec16ccb5cbf513bb170e59e600bf64b7c69a08273580eef";
-    sha512.source = "e961f8965d2f28da04a8c5369370ae6d07e54c1091ec28da87639c6ca737f028010b85d93943fa84a0472f6f42d52d0254fa3e916acada22358e06c420a60d57";
+    sha512.doc = "2579fedf2f9ce29a5ef8a0c7194bfe37b297d2380175b7fb54c586a01af20fc697ae61eef691b25ffdbcb4cef0dbdee3c48cc2f8372b6528ba1254400aa44344";
+    sha512.source = "a7dbfaea6d35b60b161b51e6dc9b8636e17636211f683802ce745c8443d38d48954a1d9c9fa662820a526c32ee2dfbab89c5b976e3aff7347a1601b901609057";
     license = [ "lppl13c" ];
     version = "1.7a";
-    sha512.run = "3133ceaf7db89d57e7dbdabc016491795b2dd67ecd614fc4125f41dfd08ba0a03371c446d1fd7e22d1c491ac3ba6ced2856c6c3c9497304f4c041c21c0c7f558";
+    sha512.run = "70d0cfc2305ef6b78095461f359bdcd322520490f5aeacaf3fde982192c6aa54d1397a7ba4d2ee6389565afcad5b862c852a013a06a585af6bd6dc5075bab68a";
   };
   sidenotes = {
-    revision = 72264;
+    revision = 77677;
     shortdesc = "Typeset notes containing rich content, in the margin";
     stripPrefix = 0;
-    sha512.doc = "7ca005419b8b2acdaa800b52ad753a1923e7dd510ef51c6db38b860cfba54569c323eb4f389014ecfd92fa41c9686222e4e302f720a0bcffaf1acf5ed5323721";
-    sha512.source = "11d773ce407322d707c428b6e1ebe735c3345fc759982b5336cba0806381083bdc14a525cebebe160505916058052be0307ff29ad8611323a96c37c2a4ed6701";
+    sha512.doc = "67c78567ee725214acc5afe047134c627df8c91d5ff294fa327a20da6aab1807b54db1d15b30cd689bbe57aa007c91d4f65dbcb306c103cbe1af55e3e94347e5";
+    sha512.source = "16e4a14f4e5aa17bca4fe08da4f21d5c86329984d7c3a95680a26120eb1fca714b9bcee5139ef2c55dbd10891b2425adfe24ef729e2a9baf8eaa454a5475c5cd";
     license = [ "lppl13c" ];
     version = "1.20";
-    sha512.run = "9833a4e34171bcad549d47dbba77b9b2546adf3518c88389414d71781c17f00a7c02c390bbdae2467ea93dca07f1e38622f5874e3fe494751e453094d2025fd4";
+    sha512.run = "0feca217bb10b56be2fcdb5c6d66e84375851c72e26cf9d3421150e2721ce60262c2b132937fcea7680ddca750fa7a22a9b31ef37f7f3ea02a49221e5d333e48";
   };
   sidenotesplus = {
     revision = 74143;
@@ -45565,27 +45712,27 @@
     sha512.run = "d379bb1a9fecc06f4e48419d0f4f49e50b6b276e15e64992ee7e154154eefc24e71c060066de3bf9e97da6c8e62b78208f3a01918150cd2ef51231b5abaee44e";
   };
   silence = {
-    revision = 27028;
+    revision = 77677;
     shortdesc = "Selective filtering of error messages and warnings";
     stripPrefix = 0;
-    sha512.doc = "988df943eaf9337145d081de38ac22389bbffd3e94408b1cbb5de7605cccb47e2fa837813d4647c339d978b5b9b3e82e6d9859b840e89c09c95dd9572db0601b";
-    sha512.source = "7a628ca9efcc34863f064783a1e65e7bfee2a735a2457413d5b938e50b823fdfc6137f56041885e2c4910119ac756a5d6eecff91d9e99eb2bb85d2cd73f273b3";
+    sha512.doc = "4551bd28e53ced5ce44aeac1560e041e1c2c48ddd7a1ee0f161696f8fe9763657d3f5292e0fef95610b6e129ba63140d5abd6beb8d450eb9d946cea4ae8d6fbb";
+    sha512.source = "4e349c3b8be4aa086a529243e82f66549b217ed5a1a13bfc6e66842df604d70ae12dbdb6df474dfd3b107933ed40a5f1afece5a0d925e45e138f488e9b7c9390";
     license = [ "lppl13c" ];
     version = "1.5b";
-    sha512.run = "95f4f095e0f70dcd11482be4f6d52c5ea7a06ad820c08386ad956b9bb9ad593410e59fe9bb5904c3242594d466c495e7793718d4cb707ed3edd1d17ac3c1c1a8";
+    sha512.run = "515e0946f1b6bb7c0313eb0cfeaba42b3235e52101a4769a808f852db7b68d16e5f7d2b28c83de2e6a83a62796f9433ebdf771ccd31da9b5f8c275557db2cbd2";
   };
   sillypage = {
-    revision = 71889;
+    revision = 77677;
     shortdesc = "John Cleese's Silly Walk as page numbering style";
     stripPrefix = 0;
-    sha512.doc = "56dbaab770d0ef7facc598fd323403ce5617c0582a6d19f6b055ea859c778e40a1bd0cbea5da10495df34bdde35b40cef5fa9832f6ca577c0275edd39e04d176";
-    sha512.source = "c902470511a3c08fe87a0394afba2e1f858bfdada2fcf17e64eaf99211f4a1d102d1bd9773164dd5adc063a2dbe6ec96577f279d3c51beb9ed27ed1b142c983c";
+    sha512.doc = "e35361116b40d75652316392d3f9d8876a7e50a73b535caea469e50a49a2ca1f83741a08594ed9ef473e1f76f01edc3037c7016544edec285d7381a00406cdb2";
+    sha512.source = "513779159e75889f7b9cbc74320e3a3764d55d0014551d280500cd7174a313bc616db6b0d3f4a2a80300c6c6b484a747ded1dd119ea4c901d3fb42b300bd6ce3";
     license = [
       "cc-by-sa-40"
       "lppl13c"
     ];
     version = "1.7";
-    sha512.run = "6be568f3e8f73903849837975e659df5238e4bbc47c26e3f54d628e06186b0fed2db3fc165fcafe69bd6a78903d99011930a243249a8f7fd124885277f2d242d";
+    sha512.run = "cbceb8d876447624fd80f377d976773456ed0012ff57126a08d72a32fa86bb4e5da36891c3739dfb285ee96caaf11196d2925b848537ba85e2abddac31381231";
   };
   sim-os-menus = {
     revision = 75975;
@@ -45642,16 +45789,16 @@
     sha512.run = "c67e9200925ac86386efaab35a8edbf20f0fda700c00c3b0350eadbe62f39fc02f502493a73acc768a4727ad1162561d7baf38193d57d1fefb4c8083ebe38c35";
   };
   simpleicons = {
-    revision = 77541;
+    revision = 78017;
     shortdesc = "Simple Icons for LaTeX";
     stripPrefix = 0;
     fontMaps = [
       "Map simpleicons.map"
     ];
-    sha512.doc = "6013c3b93ed1844840a6764a035c8ccae2f3b76f83fca235da3eb1a03ab15b9cea89bddf7748379cd7c5c7896f42fc798c51e7892ae1d4f9cfa77932f6794670";
+    sha512.doc = "005b9202ba31d7669fb2bd0a0a19f7c3251b409931bdba64f6e6180d4bca83b391cdccf1dcee505e000770a6c89c0b72377934fcf6e670b80394089681dfe480";
     license = [ "cc0" ];
-    version = "16.6.1";
-    sha512.run = "03d63235c0fc7b89204175a4ac0618b718a48195698552fa1d7f374ea631f868473d7f5547ac3682802b949c5390a6bff8dcbdb0388d46a248c1518dbab5d3df";
+    version = "16.9.0";
+    sha512.run = "317bed7b32fd6ec75469cf0277279172ffcbd39db0a118ac888ac4fd82671296eb8574b39e639c4c8e5ec82c2786a4cb512f7e7400a371fe591273db5ab08ce4";
   };
   simpleinvoice = {
     revision = 45673;
@@ -45662,13 +45809,13 @@
     sha512.run = "8d3d905dd9dc418503bde7cd51c90ff6fc6f688502ff871040f9eb6bf96b6c1ef999d3dd98b16c8739ce9518a22a8e99a23b5cc66c437504b3837c30ea19cca1";
   };
   simplekv = {
-    revision = 75515;
+    revision = 77677;
     shortdesc = "A simple key/value system for TeX and LaTeX";
     stripPrefix = 0;
-    sha512.doc = "f7857c39418a380bef8483ee424c7b07acde0a172752f830e2b96b19f72eb5215c05cd60d011d2a73ccf4609bae595d78c17fead6b26bb65023b7af619db1c45";
+    sha512.doc = "49b84081ac012c0ef6c4fbb6366fe6efcdc8191e595fc052ca0993e5154189b4a5084863b2587b45776b7fd7beb0dc9fd62e0de51f0424ea8c667f0bb8e78a2e";
     license = [ "lppl13c" ];
     version = "0.32";
-    sha512.run = "14f8e0beb91aa97e941a313bef26fdadae72f6006263bf736e6183d02bc358c3b7528791e278ec644b627330a0b0fefd0c3499b34009d9c4cc6bf508e602786f";
+    sha512.run = "55bac0197e9c6ecb8655e06d2ffdff0290df138dd83dc5f690b8fb494f4d326d046996698a8568ad29ceca5f5009374104cda96f384f23a46936cb01502cd491";
   };
   simplenodes = {
     revision = 62888;
@@ -45724,15 +45871,15 @@
     license = [ "lppl13c" ];
   };
   simplivre = {
-    revision = 76924;
+    revision = 78012;
     shortdesc = "Write your books in a simple and clear way";
     stripPrefix = 0;
     deps = [
       "minimalist"
     ];
-    sha512.doc = "ca85201f6fb5b000467432dd627b8161c73d731d199bc08b2d9947eb689c449c96e7719c560ec00cc56f44b187dde31fbac1580ba28a7228b527268ca2fa0c5e";
+    sha512.doc = "de9848f08006920de0ae58a3e228845fa932633a44f18f1b4bd3bfb710c00d894d1a3363b69dd3dd367872b3dbe7bb2f4a9efb95cd9f5c01f8dbaa38929f80da";
     license = [ "lppl13c" ];
-    sha512.run = "96ae425533414aa73d3071232e474a40e916a2a5bfecc9a12495f7f6b6dbe70a1345d8e71aec1bbb3562cfb6138170204873386c6ef3cab19ba67217aab68d1e";
+    sha512.run = "8809ae89542d084e60a373bf75f777c3bdc82a9ea89d80801e35ec1ed872f4798bbd4194ac72b54cfb6a8d02026725d25420c8f978de80e736b6e6e1760836f2";
   };
   simurgh = {
     revision = 31719;
@@ -45774,44 +45921,44 @@
     sha512.run = "01b2b83edba4482a6d0434efd4590b3b0fbbb596da6075632a215d60a16cc48d66f0f47d3ca61a0e73290e933952cac15fa2048f6ac12112dc603956f123f5b2";
   };
   siunitx = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "A comprehensive (SI) units package";
     stripPrefix = 0;
-    sha512.doc = "fc88b46adce296faa3fff9ffa2f69c76ff48971cbb3f64be6db9e5ecb81b31a81d3d422e5d292c593df26c6db9383e7cfff60af1f55ffdfd82b3fbc7dca7eb6d";
-    sha512.source = "a13dd1d809b7a6f555c53e84d7fd46245b8c98c97515489cc3aa537ca13898d1eb92d43996ee21cedc2697b5aa9d09c3a6075addf0825d98f1391160d7ce2835";
+    sha512.doc = "ca14ceb97a5ca2e3ee6162fbf5a2f50432bbd572fca4a7848166b17d2227c132038b376a3623f967e39c7963b0408d16b3dfb0606a9aaf13a0019a51c11f9c92";
+    sha512.source = "cd28af76bb2ec5620977c7e350c6d2ffd9435e98c956009a0a660e895195d1ea644f07aa466aea9c1115180b7129b1f71ffef380048ceb3bde357b4a539a8017";
     license = [ "lppl13c" ];
     version = "3.4.14";
-    sha512.run = "23a171edd3b412f8230cfe465463d1bcee9dcaa6e0c835d0a189f0c992529554441bf8ea1bf56c3a019bb8ca87c62788fbd547e987c6772b5e3ea42bca9155fe";
+    sha512.run = "afe4f4b3158ef486d60fabac498a12318df5eb11c9e98c8ff680e432717794fd67649ef5c15eea0cf09c011a5e910ed1520fe8ef4051b71b91bd85c53d809a92";
   };
   sjtutex = {
-    revision = 76924;
+    revision = 78180;
     shortdesc = "LaTeX classes for Shanghai Jiao Tong University";
     stripPrefix = 0;
-    sha512.doc = "5b2a1ac4a8383451b2fcbb95f595799fd52514216aac4cf495aa1ae82b9e85ee910dcc86d3643d1c9ffd95e895c0bc4f7076a11ce06fdc77560f7b777677ae6d";
-    sha512.source = "20c82c74b0b7ade16a5ccac9e9abd40a731630c5714117151cff8201c47dcf55cc6237be62802a4b91506bc6353f03ca94851fcbc2a14067737fd4832db1b201";
+    sha512.doc = "d3d9f0d4e5919695201d0c22c205c159222068180f1b39f1b9c3cc4c0cfd2d1988e98d6003a7db925b6cc81efbcbe243c6ab0f6ea1cf245b25c894da559d484a";
+    sha512.source = "987cbb625a5c7b99422fc6af527b716b6ffad45ca23af0a3720704465655200de8fae393b2a3e75bb89f5599bd5c13945e41f75ad9acf08a90b7ad9f75a5b788";
     license = [ "lppl13c" ];
-    version = "2.2.1";
-    sha512.run = "e19ebcc91575bdf726a6e97f3b7f464edf857715108f08cb5418543b32969a62cdf16e950035bbcfdc90fc7617e103a0c2ad5b1d802c6d05f7b8e87a529e986c";
+    version = "2.3.1";
+    sha512.run = "ef551b4a2544c77c85e89d95f1ecc6f9894fe90f38e46a419c4134a57982c008fab2adf388475b10dc93671d43210ec8918e4fe2199aba34e16d0205bce2b1b8";
   };
   skak = {
-    revision = 61719;
+    revision = 78116;
     shortdesc = "Fonts and macros for typesetting chess games";
     stripPrefix = 0;
-    sha512.doc = "ffcb56dfae0a0ea91e716b99d1d91d4f20fedab8eb7b637f62630dbc4a8fad0562120cc02a754df475dc16c4b1a09fb2da48b8a9e22112d0c69550016026f76f";
+    sha512.doc = "34264c9dba9f41d20250843a394b4bb79d89e9552bf0292b449c5909e6030a32ef111ce8fd3ddb76d72d6e65f979f86670d47894b679728eb0083620b1a9e35b";
     license = [ "lppl13c" ];
     version = "1.5.3";
-    sha512.run = "df1a6adea32b01c8ad8ad7509c68e025ad2e1005d9aaf26cc35c67f82d21f510d1e414831f5df0a2f0703e295fb4c187d359ef7dbfe8afd76a8ce75a90f3b4bb";
+    sha512.run = "60db6fb33d720b495fc0753800b369c71ead3d4e0ca1a69727fba661ddd30da08cee6ccc35bab60b005edd2cd2fb98a991cb989298552b8889d2806394ce78e5";
   };
   skaknew = {
-    revision = 20031;
+    revision = 78116;
     shortdesc = "The skak chess fonts redone in Adobe Type 1";
     stripPrefix = 0;
     fontMaps = [
       "Map SkakNew.map"
     ];
-    sha512.doc = "8c26115910f2e9a9ae28e1b6c0933db3308c9f59eb151bb37b23de3f0f790b9726aef895def0826e00928b75753d925c5c9db0a6b91ebf7035fad5a4e473a315";
+    sha512.doc = "311a2f66dc73fb9a1878713ab82de8b6c9192c2eda2a061a1d672ef1e0f678b701b049a2700751626325a39abe61247fa28ece528f5896f3a0f3fec08b99613e";
     license = [ "lppl13c" ];
-    sha512.run = "879107f0bb96441082ccc4afb560e4fd0f625e7fb7cab84ebbd642af1ef180bc27540eb9ff26c689039dd6abb11e9b88bcea30d5b1e75b40f0e3499c981ae6e2";
+    sha512.run = "46e98f2bac2b27a549b5398f28434508e281c682cacff1d944e2c048eb91713e482fb2995cc14d1b46f32f8909ed8f1fc544e186eba9e08b9c5707dcb706b575";
   };
   skb = {
     revision = 22781;
@@ -45899,14 +46046,14 @@
     sha512.run = "261ba31f30fa26e25f82dfe60ff7600c71db51f1dee68a5c094fa8a746995ee9031e41c0f24a4e83aec52c603cbea71a0773cae63481f167b81abdfb0ac3f782";
   };
   slantsc = {
-    revision = 25007;
+    revision = 77677;
     shortdesc = "Access different-shaped small-caps fonts";
     stripPrefix = 0;
-    sha512.doc = "8f856a45e3088d2047157bc87d60a16b6c6e481334f4ee81a23e4cb8ecf53d1113849877ffb24ee4516dfba228c10c9974b0b0a148020d64e3069ed7a2d12750";
-    sha512.source = "7e2af37c07b8ccae052c84ade3ad49fb4d93fb5fd97a5387b1ea8af523167f21d48e3961df58c7a93dfbd07f09ed1140839e48a57b3149dfa713e5945081f200";
+    sha512.doc = "03b524774bc22cbc41f1f76cd8f09cdeaac764887df68f2b3c19cc1d95442cae63fe7b826d7591e3b0dfea0170b5e98659dc4264479b9d2f6c1453a9fd54fe74";
+    sha512.source = "a7d7f2d15005694e2d2f891f6b6fe5008a80b9731f4169e32292ef44e37cf3e2c344385385b696ad9be87873b5cf6556633976b59dd6b0ed2ca237ea6dc8e1f6";
     license = [ "lppl13c" ];
     version = "2.11";
-    sha512.run = "45d92cb8f2a5aeaecc9945ce2778f2fa330b703ea0efb2deb4407ac17d30ad3a3e1ae7966474af28a7816dee18254422fe7c72c50f11f47cd52a54522f05fec3";
+    sha512.run = "d7cdecc6ee0f2262068375a04fdc4fdeec452554f91a39a5e38da7b4f62eb204292c8158b993d5f619b467acf8b05bf2978bb33f815762170e4fcb2471abfbbb";
   };
   slideshow = {
     revision = 15878;
@@ -45954,13 +46101,13 @@
     sha512.run = "322589506d1cdaa30dd9f97b419347fba0d617a3ad35fd15fe91611b10382c595598ce1111a287f5b1aef617595cba77b53490da7744b23942f072f522a68ef1";
   };
   smartref = {
-    revision = 20311;
+    revision = 77677;
     shortdesc = "Extend LaTeX's \\ref capability";
     stripPrefix = 0;
-    sha512.doc = "07eaecd9e924e5912e8e3a3ba6479412282e1408cbb59699b9e83006768c4042b173d38da2e8dd2c707b392cb48d99e4be25985023db4de80d69450fe95a338b";
+    sha512.doc = "7f9461105a54493c446ec6f29fab43fdcea29a4b59fcde35f09598f84e0a5555fe39c8bc9fd9e4230890f10aa314de98aa6cf3992e563dec76961d8bc24d45ac";
     license = [ "lppl13c" ];
     version = "1.9";
-    sha512.run = "149dd95ca0677a4e273df64a589d1424b8dd89983adf3a3ef81f8236d1b594d35b851b4255fd9f0d05b4feb82db59d816408e3ca59f2b86b73a5724a8e937367";
+    sha512.run = "52a7279a4e3da50d6a299b08b21e778e5e3db18dadf5f8299a52e1b56fe8d6ba8bfca089676cf5ebac6879978cc119147e364d6940b56619b85d7368cec79b89";
   };
   smartunits = {
     revision = 39592;
@@ -45982,14 +46129,14 @@
     sha512.run = "3723047537c97c42f23eaf15dd95941092300a86a5072cf261c2d9a4fdc09d17e3c09cefc6a1f632996b45300cfc5e3266dba4130decf4f6d33063b0b7f45d0f";
   };
   snapshot = {
-    revision = 56735;
+    revision = 77677;
     shortdesc = "List the external dependencies of a LaTeX document";
     stripPrefix = 0;
-    sha512.doc = "b1dda7b3fa9195e5d0e425a4b7facc75f8737446b65b29cd5f3c954dad348055c8544968b3c68f9b2256e8d827ae73b54b765d23b958abc383bef072d9eacfe7";
-    sha512.source = "ae57330c3c69e82c638e07ca7d2d011838a85ae79f3f16fcb8909076f375da51f2b1d3487aadf55cf93306c035099397fa826a7bd9654e6756cde66d2138b15b";
+    sha512.doc = "a5849496f524a89e25534f66d89630d5e18c4f46abe4c73aae07bf426202c32c736a40eb28ff1ec0951114734c8f97e0f4383cf899869f8f81e52ae6154edcdf";
+    sha512.source = "b818e026ef8709a0289dd1f0bf0f04a00d8544dcfa2eb593fa81c2b5b03caf2e0734ec350ddabdb54a246976dd98dea3d8af74262dff9de7c571e8b14f60bc8c";
     license = [ "lppl13c" ];
     version = "2.14";
-    sha512.run = "2b9bba924070f81319758c4b8a8e85533ff5099e901598248d5a645aba249e7158587e7d90072d3e8fa4d544d09f800b94aa415117683a8bb8c6d7ff642c313d";
+    sha512.run = "644fc4b200e51534bd34fe3729fc8fe6f5efd540dabb883fb03340881b79dac2ae8561c7ae6a91f3c8864dcdbe62f6cba7c42ce15309f1fab167f695c8baa9a0";
   };
   snaptodo = {
     revision = 70676;
@@ -46000,13 +46147,13 @@
     sha512.run = "cfb875322a02c13424aba61c3b7a273afb0de378709289390d9d77476c8e0080353ff0572b6fe41569a551d5ada76dac5d816b896e60db418c85b1d71e6e6829";
   };
   snotez = {
-    revision = 61992;
+    revision = 77677;
     shortdesc = "Typeset notes, in the margin";
     stripPrefix = 0;
-    sha512.doc = "230cd4f3f8922fe520c7b476f8f7b31e3965029e72e58828107e5f7c761b87a64f5c5df9faadb610277d45ff95052878c070e690932759850da34fd82fb028d0";
+    sha512.doc = "ceaf9defaafe3f5e27fea7d53d8177699388ef9a91c0e39209edd701d6d9734ecd6caa0383ee5485b47f6573fef02de1702cf00742b1909f744dc375337b5dd7";
     license = [ "lppl13c" ];
     version = "0.7";
-    sha512.run = "8e827171eb8ae6281d0be97bddd251db57349f935ac6309eace72396be37c33e8bd79d792701f56a5e338eccfae452411de520bdab5f5747e6fb741e5215c1bd";
+    sha512.run = "988055871cdfea3c26e15d296f60e6dd25f9223ec1b51441cb2af6c29da5ab98d3b9f7a71b16ea8fbda3a16dddf839ff164b2af57d2bba4d085358a11e918cc4";
   };
   songbook = {
     revision = 18136;
@@ -46056,27 +46203,27 @@
     sha512.run = "59e9e0bd127e44e1a80ff7dccf1fecb18b34a54c379a46632b13f82d80648229daa54c4655575c52ee718b02277c4e2b264451f8d3fe58abd60e593d0826c97b";
   };
   soul = {
-    revision = 67365;
+    revision = 77677;
     shortdesc = "Hyphenation for letterspacing, underlining, and more";
     stripPrefix = 0;
-    sha512.doc = "c734b198050f5fda61e0477e7cadbb6f6f9257a0fa41babed664621d7b64c4971412d831b350879a5405976d4e35a11caa0519fb67f308bcd622f0c72f431b4e";
-    sha512.source = "6a50fd644f99214a71f96994d52fdfd5f353a584ad73dca3b66829ee6094976eee8d4fec3f691149f634f27423ef5490bd4c1b781fb743bcf228e4b1e52e5d33";
+    sha512.doc = "6f07adfdefc18010b11bf18a7a07f652e5b8187935a00ecb237843e4292bc70c1da77822ee5bc01116351df69cc84b6543f1bf322953c436e0049ac6612d3c72";
+    sha512.source = "8c7937b3c98997d3b3fdcea53ee7118ab0694d138d28221f8d7f43f0b529ed9171e30420cf3aa7b64c612950871ae4f0db4711858c79ef5c8f737b08570ea8f0";
     license = [ "lppl13c" ];
     version = "3.1";
-    sha512.run = "233f1178521296d5cccc7db50c98425995b8708c97d750a5c24f698bd0de2e54ed5c57f9641f402bb8a42721e348355e6f7e9092b4056999b032d001c8203aba";
+    sha512.run = "015c9f215e031e9aebce8bc80c2df6d9178da88209f572d4ff0dc2242d21a4e71898dd49e57e48d5c9fab2ae0da48522d5e362ff5c329d8eb0d03bdc82ccf035";
   };
   soulpos = {
-    revision = 60772;
+    revision = 77677;
     shortdesc = "A fancy means of underlining";
     stripPrefix = 0;
     deps = [
       "oberdiek"
       "soul"
     ];
-    sha512.doc = "9577aa2c77e9cafea54eee0ee032acd7c1343d6eb66b76fc25d694b524630bd2f41043187671cd444c9cdd0ccc8b9064e6c71365492cbdbd46517a061efc87cc";
+    sha512.doc = "215b82ba831b472b4e4a3ebf6bea07bdd56e2af88ceb32b08d867908ad8ede923db93db6d9e2da58976542ade50bb5a48fc4d5811c83abbbecd74c5a717c0066";
     license = [ "mit" ];
     version = "1.2";
-    sha512.run = "2b4d2fcaa687ff7d229706e563f739356a450a8ef02180f3c98432b11d027cd097fa895c3c971a944329b8657c74b4d2cf566110919e511e6883706561332678";
+    sha512.run = "8c8af54dfaf3022df58547dd467de9081b6c98af2314e3dd0a55a214e2be255a2b46605dbe78b08b6c9087ac9289c25c5181456b1cb5e746542bb28fac689fea";
   };
   soup = {
     revision = 50815;
@@ -46089,49 +46236,49 @@
     sha512.run = "478c8cba8623b184db1c9237b7a805219bf1ffb7ef45280fecf7cd75a1720ca0ea2e1e1ad73465ee20dbc2bbaf14667d4707524edbc073dd4fbd0537dbeca8c2";
   };
   sourcecodepro = {
-    revision = 74885;
+    revision = 77677;
     shortdesc = "Use SourceCodePro with TeX(-alike) systems";
     stripPrefix = 0;
     fontMaps = [
       "Map SourceCodePro.map"
     ];
-    sha512.doc = "fb1249dfe011eed32b005c679f2851f5c1aba938114dc6af528d5b1b2afdd3ac8a0052ca6be955b739c6fbf82edb99388f890177fe968121f30f9ae793f19eba";
+    sha512.doc = "a5602f839597b29d1a3672cf9c3d50bda97e03d14b4b9b903d8cca4803feb5a8f76b7ce4d63264b67a1bc201f423cc25393a428d1bf148f84abd0d3e8a55af88";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "2.8";
-    sha512.run = "3f011303b0ba7b7e5db5c143aa452d6cd25a0d4e454f89702e37013e67bb75d16a1efe3536e5e6e594fd91a8a65bf9ccb0c770181126633965c2ec8cc5d182be";
+    sha512.run = "6d897bc41cccad86fc67a9c29032ce836d8c1fb81b49fd73a67499be9ca4b8466c3cd830cfdf69aff2ee26e01ec0c8ecb61655ef60345c138577ceb0a4d64d7a";
   };
   sourcesanspro = {
-    revision = 54892;
+    revision = 77677;
     shortdesc = "Use SourceSansPro with TeX(-alike) systems";
     stripPrefix = 0;
     fontMaps = [
       "Map SourceSansPro.map"
     ];
-    sha512.doc = "174def8872588c27b8f90b3c384ee356aec43e4e42014bb1c02d648d8b309dfa8fb9cea03f65fa9bd86dc3ff1e64483f1312dbaca6e212f65d2d379a1d9935e3";
+    sha512.doc = "8854b488083cbf94f1d8836ee19c0953f8e08cd886657e4c7363541c70509f0d5fc07712b8aa81ead2450eca08262b40dc92e2d140d6aa7a47af989792c08c01";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "2.8";
-    sha512.run = "0511dcf736273d80f7143c9dad96dd9f631b016183b4078243ed061d35889fea62e50c5f48e9842ffae7b654fd2e08a21d1c46403e56349c0b515ff2eb62e164";
+    sha512.run = "e5bb130db933e3b058bebf1de8e388286852f076759b8bb02ac49e3efb0be62df0f4d3a313fdca47d6bcb0d04d1c81f2c30912bd6d8892b13de9a1da51986b02";
   };
   sourceserifpro = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "Use SourceSerifPro with TeX(-alike) systems";
     stripPrefix = 0;
     fontMaps = [
       "Map SourceSerifPro.map"
     ];
-    sha512.doc = "c469f7beb0e99c8a9891c4222171525004c63e9feeaea9be57e663541ba4e2f259d2a3674f3029e4609fc08292d749f005f971bfcc542115d53e1845a02680f8";
+    sha512.doc = "705ec24cdd2388cad9509dc5b2e4e50737444ae6d8a91c2d32a351028b149787ab6beb1f9d0196e9b65475ef8ca2eb6ee84da2e2a68f6aaff2ee0be58f35257e";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.4";
-    sha512.run = "5125dc5b72d960fefffcc4c8651f3d176c18c32d111440a16a0319f90b8dc973a4af0e20fc3b571578184e31749312c0c1f0ec3bba36b3715a3c59fc03768d65";
+    sha512.run = "4f9c6880aea557d107b18ea6a9d81ec95bd6b2c04c4730e71a1a56b52d54e65a672791a9a7fe6454d8f697932f5a211ce688cd9968771224e8178e9835b1bb57";
   };
   spacekern = {
     revision = 67604;
@@ -46153,25 +46300,25 @@
     sha512.run = "df9b7518565ee8f619aaedc82384497dfbad69911c66dd68f306010cee603ab307c3af89cc3f9901585de03e1796da3d8b96380e454ab0d3d24171187e39872a";
   };
   spalign = {
-    revision = 42225;
+    revision = 77677;
     shortdesc = "Typeset matrices and arrays with spaces and semicolons as delimiters";
     stripPrefix = 0;
-    sha512.doc = "534f2c39076a6ff243a8e4cffe353a569b493b90fc1bdcc3db43229dda3955f013de15ce1db7beb38bc9b8d972c7430a24d64c263041c82e84c799f446faab0a";
-    sha512.source = "3a12b34469bbefd61112b7338c8b5d440de46837632a695b52ae18e4f297d6ac0cde7ae71db7bb0a7bd3db0aeaa83e78f33a60e4dd496cf9c0ccda1a297b4ae9";
+    sha512.doc = "1ada96ed0bde699fee987a6cf70981cf18c9c9415709ad8a1b4c397c94606d2d62aa24c64999ac27522e0d5fcad329a4c8f509e214bbc7946f5c2123e68a3e7f";
+    sha512.source = "ca0eadb9aa7169a1a32fe848d0ed5ec4d838ae1a8a8fa94e42edd91e80667be398787ce6c0f571b8460bf01c099d06566cd7bc80b74279075334131050f84ad0";
     license = [ "lppl13c" ];
-    sha512.run = "6e00399e0940778a6ed8326abce14f15836bcb69f8e7c67d06cdf8567330ce0482a213c7b65c2662e0fddc47ce7b684a640e133017eca314b59eefc278eb6425";
+    sha512.run = "2d11f004e1b3a99f3498c71e00d37cd02b21de52b9f44d03ac2c2ed043e2209796d01f4d090f629d235fba0cb2192a21a96a385a8184fd063e0bf901e21a052f";
   };
   spark-otf = {
-    revision = 62481;
+    revision = 77677;
     shortdesc = "Support OpenType Spark fonts";
     stripPrefix = 0;
-    sha512.doc = "69fa7131b247a93b26fb98a8a4fc69b11fc8f9f05905948f530d78abebea76852baf4535768ea925839b0e3332fe9ac61e94ef7b10762afd61024bfa934f243d";
+    sha512.doc = "e11a50685e29704a6f0e01c562fd92d99207609fb244dbbfa07af690f7e24ecdcb7707224a334a93209ded2561365940d29a4904e573fa8b95d3a277fefd5766";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "0.05a";
-    sha512.run = "787774aebfb3834f1477a8afc61d2f81c32fca5f69e5828b403b58a60c2047a5afb79d50f33be0376cee57fd30ee1c3af2a6428c08abc9a058e6a3b04b8fee0b";
+    sha512.run = "8a6c8307527f850f557241e8ab3073448104012156a7175d2623a6dad400cf5296c9abe82cc21b42161894bf04e0916344402a921c159e5be06e2befbe5a7afc";
   };
   sparklines = {
     revision = 42821;
@@ -46202,18 +46349,18 @@
     sha512.run = "6f981529a0d4a75d1e46717c7fb71ff2eeab13b58265afbde7bd29d6664c199da4a3deb2234e65bf8530054a9b494b547cf04860c4756bd1634800ecd5f9d369";
   };
   spectral = {
-    revision = 64528;
+    revision = 77677;
     shortdesc = "Spectral fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map spectral.map"
     ];
-    sha512.doc = "4fba6fa0576a84b05d0a0bc3520ac6e08dbedb7f37e5af5a0cc961c80deb98d53065be3c645c0eb0dc08a495d113e72f4474de32dad5d080ce67b000aaf4042d";
+    sha512.doc = "fb4b12ddf9d2753a2bcd67fe5b357a8958b4feef6c06857f0abfab7cc496e9a287902591382f930948579af59a6663200daaabeb6599dbb89a16a1fd6984a394";
     license = [
       "ofl"
       "lppl13c"
     ];
-    sha512.run = "e260d7605cb89a7ff33f530c5f6448f2ae512e9ac1b22880f3d76147701ae458fa5acb3525d49cae3973c24b51858ad687b76f5a00ca8d914edf4e329f3dabc7";
+    sha512.run = "409fad78c4c49b3981a83004991fd42134944f2e5904618c59ca830b31eb5d0305943e0859dfef6093c23246b96f2419aa268d93959c36fcbe6c72d211ffc4a9";
   };
   spectralsequences = {
     revision = 65667;
@@ -46285,16 +46432,16 @@
     "spix"
   ];
   splentinex = {
-    revision = 76841;
+    revision = 77677;
     shortdesc = "Splentinex fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map Splentinex.map"
     ];
-    sha512.doc = "4c87567815660edbd2ff6ed1a115184c126016dce2784f3f623cd534bad636e54539238a21d1552aa9cba01ef3b7bf530b8bbe0ef77f078d979e9f8afb7cb5a0";
+    sha512.doc = "81d49724f4e2fe7049054334bdeb38d586d26614756121b99c0bdb1a8624ea1b125d509b6788b3a73e1dbac811b8f6f05975b6555bd708fef3eb2b817d83956d";
     license = [ "ofl" ];
     version = "1.0";
-    sha512.run = "e641fc89c84445ac00510cca5ff1e5986c6e557f44b0e8a89cdad680f9122b98588a50f8b09efa6797bb9112b85b9f6d3bd949849dab6c5bfd6b8b7802e86f1b";
+    sha512.run = "71ef4a500a0654de64a94cf4f651de303d8f3bd6a78ccca8d7ca65db4cecaf762984f1b98a4395697b109210ebf36ec19571ce065b91c0d56930e04a9ca30c2b";
   };
   splines = {
     revision = 15878;
@@ -46307,27 +46454,27 @@
     sha512.run = "f040046978cf51bbaf3347406e224fe60a85f449c1fac1703e7a2d936140b099c14ffd488ebe4c3d932b35a8380f943250734a054ea5165ed26b2be712ad577c";
   };
   splitbib = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Split and reorder your bibliography";
     stripPrefix = 0;
-    sha512.doc = "df266ae77aaccf91b08931c57b01a9eefffe6a469c4cc549ce41640dc9c9041676539e1302aecfed88d19baef277f507ede8ba6f794dae6ea4745b1338459d14";
-    sha512.source = "72a8da016f943df7f5e2d7cb05cd1a64e222ec0c3be784ac21e6aa5f571c9e76cc3e8a5716444aa1033d5127af8d82df5cd632a884fe17f08c55e08d38956e3c";
+    sha512.doc = "645118326ab4f069f310c9a03cf4d6a62a0268ccc2d0e26b8e4bfa9147ef3b13de90a954e682ef563692bb00c0c596a8706e7e67f3d1d7aeb4f52dd949f38763";
+    sha512.source = "b7fc44b20e2e158eae0923bd7bf879901dcfd193b1d1c2f94f379389fc3301bb7f5fa701f81ba0f1ee16db19c38834e896106fe86753e73c6653bf66da2a3d78";
     license = [ "lppl13c" ];
     version = "1.17";
-    sha512.run = "2936732fdcebff683e240e139ba6e1e4268dc72e427bd30af0590cc3dd7dcc8dd49eaf6f007e549efc5c429fbcea2b37f9e68040d1ffb023162c571341abdb40";
+    sha512.run = "492d0f069ffbbc375d0e6d1de2027fc6cfa02901bc70c1edd9ca489452a51a659c3aa62e6c8bdbce8e8817f61610a26149b429d221c3b30f6f560e589b3926b7";
   };
   splitindex = {
-    revision = 39766;
+    revision = 77677;
     shortdesc = "Unlimited number of indexes";
-    sha512.doc = "c8dd92e955fcccf71b412d9750fff7b6f214e929ddf194a6496a79a146f4837af3d773ed3f2303546727cc4a8fb9d5366dd75b64d3877e6121ce20315f71997a";
+    sha512.doc = "028a53304247841c11f8a27ab25747e609873355c49aad67da754576f42504e5b668ac1cb5b8c0fe9cfcc7610594cbb63b02fa36051a24fa1714b4ec3f21525e";
     hasManpages = true;
-    sha512.source = "8aa928bdf6f2e8fb6274c1fe8d0b4567d03a1c6ffbd078726bf6a36ff1bdab981d5150cf0250602a64d2a0a9be92695fdd399c04d041b7a9579a7d3a71910151";
+    sha512.source = "97380c54ab0dc147d32fdc77aa7908c58ac7f523a447b5b8368a1922c6af640fd07752875e0b6ec38ff82e6bd5374209be2f26c03f8f12fe498f95b75a1eaaa2";
     scriptExts = [
       "tlu"
     ];
     license = [ "lppl13c" ];
     version = "1.2c";
-    sha512.run = "858033eadfa82b4e40a388356f64002370a5f4fc2c95565eae90c68373f708a3c9827fc4e0ba8094659382aba4e5925cba86632733b15d85ea6a82f73ace8737";
+    sha512.run = "4781ce7a74d5204214f5ca4b9802c1c1972fe555e56254d38beb5f062f819e6dd033b4f89e67a51b730218908e7a401004895725b1b5b62baac540f3770d6222";
   };
   splitindex.binfiles = [
     "splitindex"
@@ -46352,23 +46499,23 @@
     sha512.run = "6748982e7007323414dd8ca5f1ede105bb2bfd0b0f8d2f83c8731926628c094c8c08f0cf4ddadbaa209e182f8af83ed6fb761142ecbb97371752473b33c44ffa";
   };
   spreadtab = {
-    revision = 74630;
+    revision = 77677;
     shortdesc = "Spreadsheet features for LaTeX tabular environments";
     stripPrefix = 0;
-    sha512.doc = "41e4a043098a0aeba7aeb4ff1521793852d2d0ae09db4a5bb71540bd38acc8723dfea464c5d0425d25b7df6ba83e3c29a60244ef3fbabd5f171f8dd3d47b65ac";
+    sha512.doc = "803ac2749484a1eb55ce2a07c27ef27c8c41ed9dad6e9c52a3ef11d6b04891faec57535d8379221ddaef3a9b0ac7de43282ad5bd188fbbb086ad9113992ca4bd";
     license = [ "lppl13c" ];
     version = "0.61";
-    sha512.run = "95fb388527dcf34b29c0f01e83a6d0a908f9521449a0072f0c986af3f143f6715b8dd86ae42081173b1c858739f05112006005aece65b031f58c2c9f796f9bb0";
+    sha512.run = "323f2782c9f168434ef1f815c16ed1e31a2a54117fb29ecfd1bc5fd7b4c6f6fc39717662498be2d54eb68f0339a589043d9e5c05ae07c8ac11127c73101b618f";
   };
   spverbatim = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Allow line breaks within \\verb and verbatim output";
     stripPrefix = 0;
-    sha512.doc = "245825f18ae835b984eb6474b927a579f80b6c6feefbfe02a53f8b7ea5a48023e1bdb43b39f090afe4ae42937d053cbebfec6ff97d7732d754287401a95fc641";
-    sha512.source = "23f8eb04b0debee1c9babc4ee6720740a4e64a28969365c27c96113cd777e0565b19d8f6db233470cc600733b1831463881d86eaf4b4119cf60bd3fbbf3d0597";
+    sha512.doc = "b9fb6eb2a08a8b1f131802736fcc1a779bad6c1e931329390c7602ffb46174dc48304395442080cbbd0793eb49cf6f576db7fc7b05bb493860f281678c02ef81";
+    sha512.source = "e71a574c7b18f5100b71ddcb990b0ffab62418b4b3460a165fef2b2c98703ce9ee26d97938c4abbc4c5362b626667312c350e0f920ada47574f29b8be078e364";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "0b26e941f77264ae2db7cdcf2c4459c26601f6079e0bad24a3ea0edbd22157c324bbf50426a794655dc1aee710092cd9b662bb401838186e42657fcef5c1121f";
+    sha512.run = "9476baa851bb39f4c9b512b242364c9d3ad190c8fac86df5f5487d591ef6b31ab84bf7546317d3ee628f1b70a96928d8c9184a09d6f36a707b519064933c337d";
   };
   sqltex = {
     revision = 72396;
@@ -46507,7 +46654,7 @@
     sha512.run = "8472bc96265ea7fd3be748f147238b6852079ba002f9c7548f5a5e8cb0f34a8155a799635ee5e31b22bb30554795a6fd08e62312b25ce83e727e10f6ccd13f37";
   };
   standalone = {
-    revision = 74247;
+    revision = 77677;
     shortdesc = "Compile TeX pictures stand-alone or as part of a document";
     stripPrefix = 0;
     deps = [
@@ -46517,11 +46664,11 @@
       "gincltex"
       "xkeyval"
     ];
-    sha512.doc = "46b3562069a7a934faab651dc1271240c926a85b66193935d930a78171db999424dd8cc9a87114f72f0a92deecf97230b527a3902640a5c5adf6ebaec42dd3d0";
-    sha512.source = "d52ab20ab08c0b54471487ffd63f4a96c00ba9d86a8235b3b587734e727eef6e32698500a378253c3d3ae8897c7b749edd1e18f90735f0664310bd38f30fb8b2";
+    sha512.doc = "49b22ee01449c68cc8fd3b9cfd6fd6da827e5f82402aa66fafd54e5d85766c2c839d436c80a26237a6abaf0026217dd870673fc468971f97588a03c47bc9125d";
+    sha512.source = "df1070536f5cf3e360264578f2e9f403a057b3fe2bc2b32207e7bf6b2482dbfafca56471371e9ae417db89a870046d739034f416f1b27b3fb0b8c7d9fb2880c9";
     license = [ "lppl13c" ];
     version = "1.5a";
-    sha512.run = "008eb29578af704a0a31cb5817cf14ab39fafc2dbaa7c2a8631e1664ea6b6975f586b9c5327770a5c2ea8b777d11f480e959bd102263a2cb4bc6978485f685d4";
+    sha512.run = "9edc10baba1416d0602c6858bc9ee91f8b10c992079126ce179c8bab479f07bb6ef49e0d29346dc2a0e26eaf7d5931734da7d291c3ca1700c93e8d8bb7e2fdbe";
   };
   standardsectioning = {
     revision = 76431;
@@ -46558,16 +46705,16 @@
     sha512.run = "1f45f97813f5e51b45e1cbd3246b877aad823895a4b087294d0754c560db5796d8b4f9d09972b5c90c4c569db82a2d70bd1c39a9dfe6e1fcc4e0deeceb44f876";
   };
   starray = {
-    revision = 77052;
+    revision = 78121;
     shortdesc = "A structured array (of properties) based on expl3";
     stripPrefix = 0;
-    sha512.doc = "5841bffeb5766ac7e89c3185c41310efea98900d271f453c3afa732dd371682ca0838aa1d5a2b1b0c690cad779217e5284cc5df7a6f7be59af6ec79d7ede6344";
+    sha512.doc = "b5ec40d4ff09bfb6dc6f3b7e4b5912564d0655b8a10326df54aad635cdc79efafd65b115b212332ef6dcbb0c1450cc0fea185895cc07a1d890fb233b5b4bd299";
     license = [
       "lppl13c"
       "agpl3Only"
     ];
-    version = "1.12a";
-    sha512.run = "578e3d85b480350351cb5835755e4bd56f34f8ad79b1d99b2fac130d6b2fbb29f0c35c36a6521ba639a3d240e8ab336cf14ca9c0a6dd3ac2d54205d5d5d00f9b";
+    version = "2.1";
+    sha512.run = "9b5fa964eef1b450a47eff126fa426d285990921a9552f2bfef2ed144d10168b30cef34c948f61e4c62275a94f6f0fff5b67e3fc8c39fcf0a4470b38cb82e50a";
   };
   startex = {
     revision = 69742;
@@ -46670,14 +46817,14 @@
     sha512.run = "483580c347831e7623c75dd087fd6ce57f3af84d0bc28afb5a95f5193ac4e4594f8d9b6a45b8b62e988519208510e0acc7e32f720df3e1f90065e90d06b33900";
   };
   steinmetz = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Print Steinmetz notation";
     stripPrefix = 0;
-    sha512.doc = "e409db74c366c5f49011a6e21355150e3e97d16c1e3a7fcbf06cc8aa0db2c01288dfc60b3c79e539936077e452c40dd601490be8976c57d01f9a5a88a3798093";
-    sha512.source = "c18fde06e32eb4155921bdd7e4dca7ca108139859545c638f562f82deb6feec904a53870c929482504ddf28858ce5ad3c5abf4148b3bfec0193f260af432ebe9";
+    sha512.doc = "1e52a97724a359638fcabfef23eabbf660f37b46df552bee97e6f3b4d1af23f37c2f7661f8fd31b45f8dbd4b134adfdf083db8f1212365a8af743de5dffb3bb3";
+    sha512.source = "96938cece9194ff328795be806314c7a900065eb1d2089b90ded3e978d0b61080d9b46dc1395dc6f2af7607c3615b34c0004ede442968889f527babacbc7d9e0";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "8ff095645447f9349d2b35ab5ccde72109eddcd85ad3c9de262833320ffcbe94c2fb08df5323c69fc64cdf173ee7193ce2ce887f1c033997455a33f290cf1884";
+    sha512.run = "4c40cbe70939666ebf492058f7dc4b9a5d2b50f35f1dab42098015a16c8ca37e3d6de368997faa5a6e0d54483c437a8e4d2aaf13985baa29710e69884f7f8b0d";
   };
   stellenbosch = {
     revision = 68039;
@@ -46700,16 +46847,16 @@
     sha512.run = "ff82ad0faba3b5742d1f31d22820cb4998e88630067dbfbdaa7bc01fe4927fc0d8f10afa1713551759048a9166bc6d86cf52561f72bb743197b7e5fbf911cecf";
   };
   step = {
-    revision = 57307;
+    revision = 77677;
     shortdesc = "A free Times-like font";
     stripPrefix = 0;
     fontMaps = [
       "Map STEP.map"
     ];
-    sha512.doc = "bbf49f36bf7588c83e237d58d49ff7453c368cbe7e3a32c431944a2249c0dd75c2c1081d10bc2279e0836384602268ad163ffa3eb7108cd28a6c510a18f001c5";
+    sha512.doc = "254e8bc19aa709e91c66d64412c51aa3b2ab7eefe7ddce426a84d1f1533854a0fed93332d2e45939bed394577697f8fe622910039c72c18799002098f6ea6c91";
     license = [ "ofl" ];
     version = "2.0.5";
-    sha512.run = "d1f19415ceeefb879a3b4017fa286e5e5806e193fc75159b515fe21a9a6093c6a95d04e2e2e3c7ee457edb8ad717b88043c58727fb3924cb192e05aec12c5c07";
+    sha512.run = "56ff241667a4d15600b756e1d9add8799e2804b1a0815b9649de535a08d0ecd913cbf9b2f1be35d656e0bd2f509422a6020efd66536f6e435fd5f544dd4b3219";
   };
   stepgreek = {
     revision = 57074;
@@ -46734,35 +46881,35 @@
     sha512.run = "59551636895f0b63a8b593910eb025b5d06a50ef15ecbebd80b9fb5d158e826e3f9b56fe11d2fedc82fb2e9bfe7d423a0e72ca4cef5e3e0178170bc01dddd126";
   };
   stickstoo = {
-    revision = 72368;
+    revision = 77677;
     shortdesc = "A reworking of STIX2";
     stripPrefix = 0;
     fontMaps = [
       "Map SticksTooText.map"
     ];
-    sha512.doc = "ab57aab09d6eeb5c5ac3d80d8ad5b89035a5ca4b78a3bad30a2ff3ea0541529c0532c567c7e4e242766321d878b195ec76444f1dbf98e09de9c6428e3e7018e3";
+    sha512.doc = "3d065b2b695aef7485e86930d4ce3a122b996cb1b9bdf94ea6874d5dccc0d84fa045e6fb49f1275d32b19501bcdeb92d85555f2d4dcc112adf3c66998fb00135";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.036";
-    sha512.run = "7bcb5babdfc5f355d49b78edd8cea7332a8f70959b7fbfa991b0a42f32d6895a99c176bcb5f14f27f79feaac0ae3a0338881a882a6d81084e086b20050837db5";
+    sha512.run = "70f844cdf39f39feca64de182133fcb7b03fa2534b27c680b41adce2b22eecd58e4fff540b587791f0dcde732f89d8747ea0d917b192b03aff4dfc0080880506";
   };
   stix = {
-    revision = 54512;
+    revision = 78116;
     shortdesc = "OpenType Unicode maths fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map stix.map"
     ];
-    sha512.doc = "b01c3dfaa96a6bbcaa83e803514c8090546dcdd54595d7c66a1ac280286f5baa98947fe9d513da3d8baa1e83cdd174443751fc79c07cf66093af4e9044fd9010";
-    sha512.source = "594af38fdb72d632c36cf6ae6165518553b10127281ef8a6ec71f4ced16481f2582a13f1f6f0ee98e900c3147c574647c508f7c9e51afdc57ce68614a394d007";
+    sha512.doc = "7404d5dc8bacf71ea657d70832697c4eaa5b89224438dbc9dfd80cd55eb842f22d85229506439e9221f4debe50246dea524c93f2820855f16e0f97bf0702e671";
+    sha512.source = "4cd249bcaf28fc7b1d392720c785fcf8367b840f38988aff5d9eefd98ceab282cc42023bbb28dd064168d89b764af7c59f908be62edeeb5aa94880736d69feae";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "1.1.3";
-    sha512.run = "7e639f7a534e24afd9d009e224d87c9c2a502cbc77ff882c6dcc9ca0bff512f849d1f3e658dff8badab3843a658171b88ab66d8e731392dc456f9c5f4e032318";
+    sha512.run = "95cfed6b96c4770e9160eb97056ae98a5b950a7a90b8c474158ae2e118e71d7a8afc07e46ea20df25873122fcade2a5d006993b11325b4820c7229732109fe83";
   };
   stix2-otf = {
     revision = 58735;
@@ -46774,32 +46921,32 @@
     sha512.run = "b966a7d18a471f13b5eb85115566ef4aa7c894b142561a46144e5cda6a0198dfcd83b776d19d605cffe482d07a4ac9d80acde7879892381e1a266e7af4f9f72e";
   };
   stix2-type1 = {
-    revision = 57448;
+    revision = 77677;
     shortdesc = "Type1 versions of the STIX Two OpenType fonts";
     stripPrefix = 0;
     fontMaps = [
       "Map stix2.map"
     ];
-    sha512.doc = "b4f1e6e8962fd77ecaf0df94b156783d9f77c07231e6cc258e04c26a8190dcd0a3175c71bd3a1187ad6cc083595ee80925712f12e0f838c474ac93701b47401e";
-    sha512.source = "5963bee636210eb89d31ea8d5954468fe9959429d516fb988c8ceab3c591f53b47a5a77df8f10d8e20f136adbf2fe23f546fa62b1768db7164ed74fcf706a228";
+    sha512.doc = "9ae25bcdb7a9488c20dc52ba369a19dcc51e69ed53f8adfb08d9dc28947dda5a2f78b277310a76ef6d27791eaed943f6d8f887c67b18463801a4dfaf6209d1c6";
+    sha512.source = "c36c8b708e88dc69d1865ab419f334dc09e1c018dd96d23e2fefd1f1dbe784caed1db2661bac68602961a10088d79ef0b5beacab2c99a4f34643e0a0be3c2fff";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "2.0.2";
-    sha512.run = "802ea99ccb3b8e2e727537113843846dd6629f722508219be88cddd9e7f1e6f67a1bf48ae3a61c51991ec91ba5c543467d3aaba64116e4be08707def58c70f34";
+    sha512.run = "5ef40974c5c6a9b5f9ef18f6292c144efc018be050e14a4b02304b65b475dd29950a8b604b3852dc9b67160388c68a48f356dbb192846de6314c54db67948208";
   };
   stmaryrd = {
-    revision = 22027;
+    revision = 77677;
     shortdesc = "St Mary Road symbols for theoretical computer science";
     stripPrefix = 0;
     fontMaps = [
       "MixedMap stmaryrd.map"
     ];
-    sha512.doc = "caf883d1c5021b52d6471c4c2145e708ac3c05c8944eaae621a3ea7b602b683ba2ef2bc0052f9caf67adc1415e7db02b5b55d3642ed82727a926ec193dd984f4";
-    sha512.source = "ebefe2836daed0dd4db99517af0f40c73f0a7b19453d5415c80ae6cf723f4ec4e4ae6f9700a21722b4c0d9b8507c58a596697017893716111b46222f54676aa2";
+    sha512.doc = "e44d6840a8aff2f43383df2c54dcc95f4fe556f6ce6898bc4729b6993a6715c543e69f879b5f2b90c18c2f9ceb9ab67ed19f3070c4070f813c7cc8912dd6288c";
+    sha512.source = "7971f80feba617033d9bea9a1460f90405c74dd8b58f729a9b20b25d2ad95074d1e087e105d53451c9d2dbd7c8863ca5d47a685962e0d93f2545c68aef9e718e";
     license = [ "lppl13c" ];
-    sha512.run = "8abe58b84fff2f4fd6846b6c267f3b245fb1dfc2f38d0db54ce7cd9d456abd07627247613073f09dcf7e11e3e9c5940d8ff657327232ce638abc6babcc5b3d77";
+    sha512.run = "dce12a6cc8f809c857b9e97a358c0df56028ffa8939f989430dc5823ab6b803427eba9a69591ec991151a74365a0bd114474f7eae16d3fde65d9765cbc94b951";
   };
   stocksize = {
     revision = 77230;
@@ -46811,14 +46958,14 @@
     sha512.run = "7b8937275c2ab779c0f5258b111bed2426358d3fa465f3263b46b1a2cf4d6f22e7004176b8efc0bd7b903d4cd8047cb6ad30551d0147ef38f1fe4bab8a6dee8d";
   };
   storebox = {
-    revision = 64967;
+    revision = 77677;
     shortdesc = "Storing information for reuse";
     stripPrefix = 0;
-    sha512.doc = "09b0b2914d8cd87b6cf070d012a5e9581a399cdee4cf73e38b5f53dae613b3957a8fb8e0a2df6ec2953038ca984e3800b7ebe839ca01af556c655ec5e27f3065";
-    sha512.source = "a48bd8d8d3fcca367265706cccf14e5b8e90a9d74528754ce96436ac1925457a78e5d1fbd73a6ebae998121b6da27595b573f15a46c573f1aae06168e0100836";
+    sha512.doc = "6ebc5793ba36d86011d67a9ed8e49d90dbbc093413f094a3c434760ea055c11f40c571b8567d09bdaeeccc8a562070f690ba743ddc73712e00477368cf8e508e";
+    sha512.source = "232ed2b3daec672c6f2e64303241495b68b2bfce70a2b8356c21dfac60e554145a8953a2637f617e7f4f040664cf24a0d8f10ec077e527c6441d90415fe149c4";
     license = [ "lppl13c" ];
     version = "1.3a";
-    sha512.run = "8f414a7bef1e3b2be8c526e67dcec5a5878430891323ad5c4820e0b304fde35e9eb8ca69e2d1c6dca623387220114f7371ff54d2ba4297b8e7d923354d6e5ea5";
+    sha512.run = "582918036525d3ca8ecc754b8c0b394f52a5be1901c9fef46d76e9149b2d0b33bc7a351052d5f1b073fa32d8fc9b56caddf4e69cfbb36e1a283c4116b894e69f";
   };
   storecmd = {
     revision = 24431;
@@ -46868,24 +47015,24 @@
     sha512.run = "9f05bf09bb74ab07ecf1a4e6aa1bb16db06961b1caf87c73f48fe33e8174081c38eab30b0249e219a936499a533d441b092e642c88a996193900fb0000708c35";
   };
   stringenc = {
-    revision = 52982;
+    revision = 77677;
     shortdesc = "Converting a string between different encodings";
     stripPrefix = 0;
-    sha512.doc = "a4f182559d37e45ca8b6c50656d2d520e3f0bf1ab63dc6477cd6e3abe6cbb5c4b89d779c380997b167019aae6fb12ae68d5fe37ea0c08945e3383f5d9905bf31";
-    sha512.source = "3febbaa990eb691af640df745f36e289a7f2bfe6f52259d6693c6c9991d719e79edbd14b35c1eba5a9033b203531fceb4164303bd6a3dbab7238b814bdb5eda6";
+    sha512.doc = "a34896be828927c7b31789248b876119ba3cd4da5535bf80e70812ac7cccf50b6ce4ec298eb6a56a8e774eb0ee664ef3b225622d32b292263224b6d54da77a6d";
+    sha512.source = "b9e0dcec38178044d072cbca2d6fe0c4680b8836d3d3d5b4ea52624da724761522f94f5152207edd6ee2a5e9ffee52ed887bf9e0f264631b648bd44e4a397c41";
     license = [ "lppl13c" ];
     version = "1.12";
-    sha512.run = "a776ddb2378bea0880d7c17e1a87db5f66645c5856243e49de1c56bc427213098afbca34773a44ad955a0014b969c59454d3a0c0ec371d213481668f5f784ca4";
+    sha512.run = "02b88c695d02cb777d107cd3a230af438cb566c0c427928fc0be261ca0f606a738538a72696383217a201568b19510b12536cdeb0dc372870db326d4b33cbcc1";
   };
   stringstrings = {
-    revision = 57097;
+    revision = 77677;
     shortdesc = "String manipulation for cosmetic and programming application";
     stripPrefix = 0;
-    sha512.doc = "1779de4af914b69ab258bc1f69a807c12f750e5919936c78ace4496f86200bfc4c3146dffbb27ac5977c2e8d41ec8d0139cf2a2560ba7c627dacd70b34cc69ea";
-    sha512.source = "94cf26d431d3638f769166c999e3dff156bd37e02a7099129f1259b7259be95896b694a64fea657aefce22f3a1e98ec2bbbf0f6f85171ccf977068ddafbb8078";
+    sha512.doc = "e45f783b42e16f70dfe8234a906f8255ed6ec80ab414de94ff922d110220dd5e401e056acc98059499ecd1f94028a84b9a774e6719b87eeac53c1c14f7f0b771";
+    sha512.source = "8fc3c57a07b45c32310451d7d9f3213e8074eb1736b781ab60a05a4d7680d28f8685c8dea454357b7834fc151ca98c653a860b6f8fabac468981add8c54d06db";
     license = [ "lppl13c" ];
     version = "1.24";
-    sha512.run = "fbc29bbf65e7d4a1fd367b03490f73bf44349427f6c1a7e826135ee9092c9b592a4cf23454919e0bcc74dc59d3a6ad072dea16096e4850780ff295dc3caacc48";
+    sha512.run = "e4ae9ff4c7cdbd943268845da419905546021b1ec0ad6f474e7ba9982454925ea3dc10ee80cd7974301bd7196d2b4b985063f5c766d231c73b269aa99a1f0fac";
   };
   structmech = {
     revision = 66724;
@@ -46907,14 +47054,14 @@
     sha512.run = "cd85b883d51856622d5df839ee5602393300de934af40560a60bb9ec61aa2815b26c07628a1fefe5ae88c46e9127a6e6f243919ab7371842788e6d955b7461b8";
   };
   sttools = {
-    revision = 77316;
+    revision = 77677;
     shortdesc = "Various macros";
     stripPrefix = 0;
-    sha512.doc = "3002a0c3760854791bdfba0d09c434ed69d6c98d66c9422cf4aa683d9cb5547c81300aa2140b75e34e2fa95bb4594d5790d762fd5765db22948a826ae3567ee5";
-    sha512.source = "0da97eacb31c95a545317eec1ccf370a1123f0cc7e45e659c5d0805a6017ef7a6336ddf04abc308761a0087d659176d5eb2f4ac534ade61a3a5ebad1e986748b";
+    sha512.doc = "7b4a677c28e23d14b857021838bea78f532b7823b1330cfc82917b246de5ee04c39374b691d3d9cc3a9c6a00ed9c434ee13e63c5d157f7c5501414f2c5edf12c";
+    sha512.source = "942af8ee1f3dded39b40a894216c93aa670f733e8a7ba8d84a65ab957b3bb8131585b7d2f3e681372e3fe818aaf4375d2849f6192e0f2768ac8050559a9ddeae";
     license = [ "lppl13c" ];
     version = "3.5";
-    sha512.run = "a14b3569092290b2f9ceb235980bd1f1f1f634dd2286416b0931eac2e90ed0e112636596d6e3f1e4e7915fd8ec1fc05b927584ed24c25b3925bb3ec8cdf4af8f";
+    sha512.run = "b002452f7921a1dfb563ceb331c993e3e97b89f66b0e48cf761a399e55126b955a79eb85e69f2ca70686c5e5a0cb57a983b78822079b9f578beeb5ebe62631ac";
   };
   stubs = {
     revision = 75437;
@@ -46974,14 +47121,14 @@
     sha512.run = "2b2b0d2effeca64f2c3d6c02a9e501f14c12e964a456823335f691a9f59983f855baed74deff95e3062648ed1db198cdf6c28bc9ec1092d28a324b0fa11f038e";
   };
   subdepth = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Unify maths subscript height";
     stripPrefix = 0;
-    sha512.doc = "6bda8b822a4f1ac2a181ce34f739449bfb976a4450a54589e0cb4a64a0f1ff358a469fc88a37639104f731671ec474088968ab3dc95552a2d92a073d91857668";
-    sha512.source = "6a63a2d62dbc47d41e78004792e5c9e6ae7b2f3c435e95bc9969bbce109293a8257d4913a5b1959d95163c9aaae557daad53e950c5313faafbd8fb8d0de2c367";
+    sha512.doc = "a546874009adebb8fce05b2597a945d77ed8d024a72dacd4533c6a9098723160235b0e3561c5e9747369b684a3def5a97213059f786fcb15eddd8d7fdf45d9d4";
+    sha512.source = "392a23d0c4f3aab223cda0addf95db166ea78f783daa961b1ccfac2ce3529a9e63bd53dce1740f1f903188a4bede5a8c30cd9648264aa4eab96f6a8e0a6cc4ec";
     license = [ "lppl13c" ];
     version = "0.1";
-    sha512.run = "7328742873abc42d2b9916161ca43e339e03ac1fd34479e93d9eccc98a065e95cffbc920395dd6f90d90989d29840cbdf2ca87dd1d0b293dfae66abbdc6e2d3a";
+    sha512.run = "6bbf505deb2863224ddc20ec71b0d30aa3d4a09124a245c70badd2690c6da172c831d1a629c0268b60592071d7f83c1ded9bda95d17eb692a752c41576cfe257";
   };
   subdocs = {
     revision = 51480;
@@ -46993,34 +47140,34 @@
     sha512.run = "a38c6e9bad66582914ad4acdae213e37c2bd5658d5e16482a1700f5869762b489f85b61fdb70c04578319f2772c974267b7c9a4e302c34df87f3a01128caf949";
   };
   subeqn = {
-    revision = 77264;
+    revision = 77677;
     shortdesc = "Package for subequation numbering";
     stripPrefix = 0;
-    sha512.doc = "844bc2c4d8001921bd4ae15ee719647087976f0388649ea4338eb4f36799ccb2583f0b744415c490698da448e891f0467bfc80cdc5fd2a481b54bf1772c39436";
-    sha512.source = "3365366f26924f8a8aa0744b3f197a937350a791ad54f9813f789a0c498d334c09c7f06af1d3993cea8eba3a7edcd9634203d8f165fe14b3af23b944a13df0e8";
+    sha512.doc = "ba50790c804752d868349fdc949418541d26587a9058ae3038f325d829199d0a9bc9140f36e7efd64235c61a254ccbab29e1a57477ce643208acec703d101471";
+    sha512.source = "d3358f6bc171aa1f5acf6d123e6f06b6cb590261cb06836a6b0827f5ed53efe420070908bd815237f2de46d3143471d9228550326029e8c98e69589d68f9fa8a";
     license = [ "lppl13c" ];
     version = "2.0c";
-    sha512.run = "ff742624fcb97a7c189981e4d0440e30ac594b1f4eca2352719150c9ff14d282f5849e9b659520e063b1b81cb3fdf04977c953600fc0f469674c4fcf07831402";
+    sha512.run = "de5a1d1d291897bcbb24ffa2d4bf622c9792355fb1ad83cef757a2b892f7106d84a00137883b0bd7e6e65cac8aa5297c267d09cbb97a761133bd30d381430f6a";
   };
   subeqnarray = {
-    revision = 77237;
+    revision = 77677;
     shortdesc = "Equation array with sub numbering";
     stripPrefix = 0;
-    sha512.doc = "49512431011c5e3446d5c8b81a74d4ccad45687bb46b694fcd0856bc68f4917343dd43c90303bb8187e57033c17349eabe7e19564d4590cfa6a7a9df15db9f3b";
-    sha512.source = "2985569826eb203059b9bf43ad0a291e74cc4332b2d9009f4d947f389d9b8adec893bac0c42cba2c49d970fbf74437e3e89962d50dc91184c95c41855a6687fe";
+    sha512.doc = "10ff3f181f6df2bdf357f00285fbc56580d233cdef801db6dac79c4308f0d87ee3bdd504665c0f0a2a3888e5f0cf4d542b1b4d5ba5e2c7b6602f149a525e20a5";
+    sha512.source = "3b7faa261924278159f5c37bc475b7155c5ce33262d68ad0fa65f18e52c5bc9198a80a7b05beef3f73a538385d3b7fefb9d1f911ada76832accd1e6c7587a96c";
     license = [ "lppl13c" ];
     version = "2.1f";
-    sha512.run = "0a7b974e7583f69f5e24050ca7ef5e0488ec0102a881bdad6810fd153d2d877aa6931e884f0e384e83017662eaa669b0825c72a16083d03ae51270a8089f2d8a";
+    sha512.run = "ba619b3991df60cdb1938678f85ccdd35e88b1a0261566571bfef7f9d8dd69f9cc6ec3f2790ce72047d0cfd352ee029717a4019abc378f6340312b1d21b03c50";
   };
   subfig = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Figures broken into subfigures";
     stripPrefix = 0;
-    sha512.doc = "8cb67139bc1063fc4d5482b51f1c3ad690c85d4f7e022a99059a7b20176bbdc97a44af23756fa220b3f7f7afdf039c4a7b672700012e96b98ee25ebb9e5c99b5";
-    sha512.source = "44e7113550dcac4b14ddab03ad5ba4bc86cb3a4dcb14a31f73e5caf0b02f9f3bd56fd9d18ddae002a981e9680bc6fae5850ed07ee94e60d858647136cf9243eb";
+    sha512.doc = "267a749261a3805a6d936944a648e3afb6899d811fccf6d9ec65638ad56a4918dc7478d729e05fa429f1605e1ce9b44a26036b329738acfad04178d9e2a6c4ef";
+    sha512.source = "b80ce6561461fda2501657297550fa77f4f2759a64e1053cc05f868f3fcaafe2dbfd5a3758184de102250a8e5c2d3629f2f1854e46d361b14579fda57c21359b";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "ec7ae149b99fecae3b4ee7cf600811dcec9bc44eac762b5480c6df48b725db3c08a87922edb7a524d7d2b748bf7d25482e155fd40080cea9ac62f2575bf61d15";
+    sha512.run = "e7ad1d9452fb2729b92028343e29c2b16715dfc82972187f0e46ea5a2b95713b4f2086e52c9dbc15e6fe1416a04a79811cbb84da7a90b7b0909444c30007e9a2";
   };
   subfigmat = {
     revision = 20308;
@@ -47042,27 +47189,27 @@
     sha512.run = "d4ca2ef4c52c84ddda85ee95328c9d3e97ef601db4f08ea508bc53393e3b2722224273ac63f749d6a922c7b42787e932d7f60ed3ceb03667fcf8fc591d4ac97f";
   };
   subfiles = {
-    revision = 56977;
+    revision = 77677;
     shortdesc = "Individual typesetting of subfiles of a \"main\" document";
     stripPrefix = 0;
     deps = [
       "import"
     ];
-    sha512.doc = "f54f52c5cee01b7ae8e01bff5a4d828b5c6708c31f2cf40d7e83c8a91c4c597945695dd7062b6088d3f91f7a9858e3227c850d658ae7a7bf94392e00e3eaf9c7";
-    sha512.source = "2623a0ec244722c1e3194d9ff1237305c1b7bf8c3baf6f60edd69b165bbd5ea83fb73ad23bf9aac1937b4ecf1059754e798eb2c97f7bab5d550fabbe84b752c0";
+    sha512.doc = "5dc825616dc772e77ff157ea902b8dd1a2304ac9b0de83e03fa32b1017ec81dd7e75b7b3c05c44667e297649f977fb642cafdffab5d29ea18930b12569f2dd42";
+    sha512.source = "048e3c2b90fff490ec06baa83047c0a8cc9cc28ea438860050279d3300494ac7929fbbab37303a1f27efd2a89a21f173395cb886e8606b51f66d4c95280e433e";
     license = [ "lppl13c" ];
     version = "2.2";
-    sha512.run = "8f842b0debcae3110f0a4b2f59047cd55c2726d128bf3e159f2745a4b8a645c3f8471fe218ca34c32f2b35d42d1c5023a25f09fc3bf0c1a4f0c33197776b1cec";
+    sha512.run = "deecd122de1b79e9b53dc6ce27bfe122eeb99639a42692fbedf0de844bc4a5f62be82d6c8a6fb1e7a7f6f8a1295340324e46be4f021f88f813ff96dfeb436127";
   };
   subfloat = {
-    revision = 29349;
+    revision = 77677;
     shortdesc = "Sub-numbering for figures and tables";
     stripPrefix = 0;
-    sha512.doc = "400b9b272e51cd9fa7370f1cf7cb354dc1235fc41d57fb07061dd08b44e06cfc17d38c1be3fd5bafb5ed6bd0404660c46c9bbbfd2fb852297f283be85424c088";
-    sha512.source = "e72b55996a07665b1deb038c5924e7a71c7b7aea761a1420d4c38d64c1ee98b8663b4a996ae39a869cb12b6ef99efd09c989f937bee18f05a1eba57856dc686f";
+    sha512.doc = "f1b8238841f0632350cd0e56afda7f3325185158cc4be5511da8afdee504a1e826602ab68d54b1e78e69128dc8e76953fa847f51ddf796b66ba8292963c1adf5";
+    sha512.source = "846dcb10617cd94d32e50b5751c79ad8b648163cfb069725837cebea0163ed2d71406a0d7f7d7743f57e894db84ea87004fa1fc1e201bc7eba934b8bf7cdb7ba";
     license = [ "lppl13c" ];
     version = "2.14";
-    sha512.run = "d5bd48fe7634ef6deec540595fd23aea21d95d7c68d053bc65eeebc950e35064add73e5b81e92d3a3d4a4dc938448d9c9a27bd0f1a625e4a9f425d4e2d55f237";
+    sha512.run = "3f3311b86b63288b3b70ae1a67c68083b93adc2aec814cd637c17cdb6e03161d18633a4ea903327b2b4563a368fa6fa2bac66f13674cf2625fc58c264a0af835";
   };
   substances = {
     revision = 76924;
@@ -47074,13 +47221,13 @@
     sha512.run = "72f10349a2e998192cfa3275dde62b774f9a31916f15d47eace3c431f868c1898bef0b124100cf3131a484c45b35b7adbce6c664e623d121e82cfb1c1ac5ec85";
   };
   substr = {
-    revision = 16117;
+    revision = 77677;
     shortdesc = "Deal with substrings in strings";
     stripPrefix = 0;
-    sha512.doc = "97adaaa986a8540364cd6901448eb47bfbe9d53842f412100696621c55d2209807d0d527c8126d9df7b5b38b0ba2f0598e79a467934d9069fe96a2d9125b701f";
+    sha512.doc = "2265e129ec8805c0af51347718f382a09f917b744e07c18e14d407360eafb1e25bf0172e4b320ca57740544aee0c0ce1ce0824cf17a09902766a89c9b2b289b6";
     license = [ "lppl1" ];
     version = "1.2";
-    sha512.run = "979aaff088f7bd521e2af3f008fd6fb9dc908ec7c9f3963ab7b6338ece92b2a7eebbf9b4974ab87f73cc71ecf7ba92c25d22be8d1fdd297d066da72f61ad1d4f";
+    sha512.run = "54c39f40e47971abb1950f0bd3e5395438259b43602a8c518ad404fe4845072e57fc46fbde1c074d9c9848354a0a3a646bc3a564cd5f05a36d34ae3b9de27946";
   };
   subsupscripts = {
     revision = 16080;
@@ -47101,24 +47248,24 @@
     sha512.run = "0ab32328d346bddddd37094ec086727222bd386bd24c1aa164aaa0cba85d60cf6be2aa26d64bd0bcf63f49b0188e79a7212e8b98d2d7400f828ccf10f60272f3";
   };
   sudoku = {
-    revision = 67189;
+    revision = 78116;
     shortdesc = "Create sudoku grids";
     stripPrefix = 0;
-    sha512.doc = "6b44d22aa120727f8a7a55adac7bf71eb1eb57ea1f33d597f06923bbb50d88c088d431f463951c3db27c2c1d68024b44992e47c83eddce98ffbda054cf98a4e1";
-    sha512.source = "eda0ed193fba97a2f0ee2d435d62110acbc054ca486a580fcf0a79f3c094d6e83b4a5732fffaf237978abd566794ca6f3be56f70a34a4cac05c867e9213cf1dc";
+    sha512.doc = "6475620ca18c54f88181c4ba39166d9d08347dd7cda7728dfeba28d696519f7d67beccbe0b3142722f78a509775b5e158c727e5c6727eec349ec3c47ee65160a";
+    sha512.source = "ac56ea0278605a618f0317a04c6a134204bacfbfd2f9b7393fa0d6fb8d768e33e05f9ded217ded0797db6c5f6df7759ad205a1b2c318c8132bc1d92807b0ba03";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "0cd82916142b881bc4ea7fb9885de56d3ee724fee637eab5f1bc6bdc6891360680132cb2c3d52028cc0ea9670efdaa4666d59a853ac3f850f2642954962de22a";
+    sha512.run = "6dd9f3dec0da23e6d6e232ae112f69a90724d612b0ad10e598d28e2f67af1ae892cec47909ecd332c4b2561370e2ac0d80219f0fdba62c313f3431c34f367cce";
   };
   sudokubundle = {
-    revision = 15878;
+    revision = 78116;
     shortdesc = "A set of sudoku-related packages";
     stripPrefix = 0;
-    sha512.doc = "6878ae9a2734e5efb51f04fe24cc30546a2c812ccfd5ae62cbbbc94496a081b03f7d2bfcfa6c7edd610cd6eccd741c3dcc3441a6d437eea5f310865dd13d30f9";
-    sha512.source = "00b0b27e9b97dcca17113d8f314480b2617d18603bf022631f6553f2b8a7c4e7d30e1718cfe4ce1ede7996d7ebe7905d25480c6516df4b3df65403346c050beb";
+    sha512.doc = "fffcfb2d1033fd01d9ec520b2b0d28c25257ab8a2d20298aa677bd83c63cf1d96f4a885839733a22ae2f7d68aa405ea5f623eb384bc3f85cfb4bb6436c9ff9e7";
+    sha512.source = "cc6b8e2caaa945b523dd3f2dfc8b6f7ff4d2ccbfa44194d0c187b3badecac9fbb5c2275fcc3034a1e8fb4b2e9b54f1633e74f826469abbaf5eaf83763c5fac42";
     license = [ "lppl13c" ];
     version = "1.0a";
-    sha512.run = "da5c7954dda7fb8076d9b2fbd8a379e416a162ce0039a0566799bba0ddea975f3b951b7615cf50819440b46c419277a080b6e1c3c514e73483b4f81420a4b6d4";
+    sha512.run = "b37f735d94f21ad8354625856b3143ba381819fe9d51db9f96fe89f0c6be687ba0df7363b79b28181f4b51f28dd75b4844f002644ef8eab8a01bb99485de6883";
   };
   suftesi = {
     revision = 73055;
@@ -47149,23 +47296,23 @@
     sha512.run = "b070cbbeae7c3befe3483a0205d314fca725f69d16ab2e3a9f6821a43b2a2da9754e3a4c72fa35f559f13e8f4ce46e183b9c396c14954f6c23e257656f7e18a8";
   };
   superiors = {
-    revision = 69387;
+    revision = 77677;
     shortdesc = "Attach superior figures to a font family";
     stripPrefix = 0;
-    sha512.doc = "da35e722be66689020ec2052f4e096502ad63121fcb3a55ffdb724d1b557122a401e7bfa8c4c0ea2c6881b0138bd155b1e5baa7886c2e0c7d1b693e56c9e7dc6";
+    sha512.doc = "4f2ecb0fa8799d0053425d32ab2832b985d302cba16604e164920356da9e1698f28f217b62136daa21c9b900a4c00c90e67830a9ee341175190ecd946bcfb810";
     license = [ "lppl13c" ];
     version = "2.0";
-    sha512.run = "50c352d7ee3b267ff3c25f93d5ad9d32a80f0f09cb8e802f6426e9d415ebfd8a54d3d07425c2908c75f328309e4d21173feb768c63e931658d151274ef6f953e";
+    sha512.run = "0ea071db58548063e1bf8ec72aaf3b9db980342d367eeeb4f98d50ecee54df09e87eb93e78762b88cc87301792e329529b8d3d7534ee4cbaf128c34c892d57f7";
   };
   supertabular = {
-    revision = 77236;
+    revision = 77677;
     shortdesc = "A multi-page tables package";
     stripPrefix = 0;
-    sha512.doc = "7686cb05dfe86c09941afdbcf3c1cc4bdb77ffcfa54bd9949c71e47426a50589803e139ac1570b6952e096905dbcdcc68bbd86d30e8ec2481e47bd5eec22bffa";
-    sha512.source = "78e1ee854e30757c1cb423a4b02349aa84e4660d6bb6e4605218d8c24b7a313da5b6258153019254da99d18182046e0b8dea0ece87cb391a97a61bbd463849c4";
+    sha512.doc = "8a6bd3c897b0c3f947b95a6cb1cf18ff5b42b248919acfb93f88161bd8b2709c8a8b0a2e42fa067243ffec0ff3dafbe4b020c567bc8ebee331ac906c9bbd0942";
+    sha512.source = "41a8f8e9a2eceadd94f67453c4ef46e45fa08e30832ccd15d0da8abd6cc21a99940d7c11640d749f62a896c539b88eea32fe45b9a33bc52574de695535a51321";
     license = [ "lppl13c" ];
     version = "4.2c";
-    sha512.run = "19af72076b7850d169a39ec275024eeaa36ac4f31c144fc4f7df725aa262e804b4c345a46f5617b0e4f3dd2755b763b11174b94d517d34994b712cb60cd20325";
+    sha512.run = "92c411a2658b1ed3e266b14874f7da49a865916dee62c7bbe7686f1c7dc1f2a2c3973979da38ebea34e5066ba1f71c8a125fc0e36b91d5b3322da9092d66756c";
   };
   suppose = {
     revision = 59281;
@@ -47185,7 +47332,7 @@
     sha512.run = "406a172dfb787c833d8d71e74cde627fad5dc168a1be7a71c4d0006e2f0a6625738ec11f99c9215af6973b101e17abe8eb8355206bdaa18ab3fa6328d7ea42bd";
   };
   svg = {
-    revision = 70626;
+    revision = 77677;
     shortdesc = "Include and extract SVG pictures in LaTeX documents";
     stripPrefix = 0;
     deps = [
@@ -47196,11 +47343,11 @@
       "tools"
       "trimspaces"
     ];
-    sha512.doc = "0c8611c269f9e03556dab336a3d106f07fb35620a4d876ce67658fdee00a52b00384bc787a69da2de91f570dc84edb9f3832e41ac2a644dfc110fc5663b2de99";
-    sha512.source = "9c5aca2ddb42ce49c140b8ea1e8c7baccd3e6da50a48481bc382caf99073e60eb15af2f7f5773305d23274ff053856ea42851651803577b042ef996a5135381f";
+    sha512.doc = "ecb3a3b14a4d9f023070b3cc63a2bd7065477420169aa1e77da277d7def053224d8da65958d6472b4a79df55438c052aa2764a8e92733ab44bd2a10e9850c8dd";
+    sha512.source = "fb8bbea40562da6ef461e24edf405cd3702b1132359132ad514a699dbd3a1d4e66594f88760225f08815bad51332e080637fb9c77efc02b8091e43f9b60134bf";
     license = [ "lppl13c" ];
     version = "2.02k";
-    sha512.run = "8175fea013ae1c0c3360a8e4e14044673e0eaff1ede5d7307d4a96f0265290c976662f8ab5f8ea998fe140e22d8df4f6727f8dde36c7d000d4258fc8c4579b3d";
+    sha512.run = "6589785dbc50383e06bd1c8fac6e77ad3cb41eb097753f6f7d40be2f72cfc805bce9edf6416af4916a54d6cfbe8414220f33d9705964ee0db0019d1b597408f0";
   };
   svg-inkscape = {
     revision = 32199;
@@ -47241,14 +47388,14 @@
     "svn-multi"
   ];
   svn-prov = {
-    revision = 64967;
+    revision = 77677;
     shortdesc = "Subversion variants of \\Provides... macros";
     stripPrefix = 0;
-    sha512.doc = "01cfb48533e07065f477724efe4c3fcff13691da0393a0d8a9dc9cf4b5d3e3953ce233f8331c1e5857c2259ac6dd7e4859793bb194d750f35ecf3723dd7b4b0d";
-    sha512.source = "1e0206e1506082c8ca5ece1e66b9c85650b986e92e5906a96e7156964f3004af2d008815f86c609eba48f02a0750403fa3860ef2a3bc14689140c8826cb3881b";
+    sha512.doc = "02c351ea42c5c2cb60be1efc33e49b6da018eb70c7cd586cac8368ad84cc4b29a7a8fefb5b056ad20de61a5094aa7ea7c8580e3378400b39b8f7ea5875f7db8a";
+    sha512.source = "1d01b29c5baa19b6121b9b5cd3062ea9e40b43b48772b711732fac0bb3e6e611389d629646265ae05837513781e126b73dd084f5bd841ee4e12e48733a2dee02";
     license = [ "lppl13c" ];
     version = "3.1862";
-    sha512.run = "319bd5de2870a3c8237aa5013f7807bf3c2c5ef7fa4618a400cd5ab60ec8cb88b94510b0129862c5d98a11e2241f9790f8c84473447df8e21cbe711d52268e98";
+    sha512.run = "db3e2e6028f2803a88f3c235fbf288de2820d615c0f11a89d780290581e11594e7b6c2945a609dd813b903ba23b90e4c93d37b859b8495ae817fa23634f22f72";
   };
   svninfo = {
     revision = 62157;
@@ -47443,23 +47590,23 @@
     sha512.run = "3fa23536373a41957d985e5a0aac744473459d195c1e7e00e60f2b4aeab15d8f150bc76fab05068d5ae4994ce52ba4dc35380ab042cc9917a23962b2f0a7094a";
   };
   systeme = {
-    revision = 77138;
+    revision = 77677;
     shortdesc = "Format systems of equations";
     stripPrefix = 0;
-    sha512.doc = "afb4d06b6754c02a1ac3d521094656e19e6c4747cf9ba67d916dfc78ac342236d3256992b73cba0bfa57511f1a4e9bc2868ad1d3387331f67510a9f77da841be";
+    sha512.doc = "d9811431b8b2694feee36fd7cb4588dc08cd5da6c2125d9da14968fe5e8566afd25b85ddc2c2a031e778edd623ac53149f11d38c226c59fb06614a8f3b8f4bef";
     license = [ "lppl13c" ];
     version = "0.51";
-    sha512.run = "e6d2fbb80bc69ca451f2441b3670ae36f17c4e96e6675eb2bf5074254bb8af8e42e378876a2a21deef6c499fc71800a48369c817fdfcd6fb530b14a80ca98e51";
+    sha512.run = "ab127320661eba4fe2d88d33c0aae8a09b170b6595ccf2a574a264f0bfcba5d2c6bec4dac61d7e29ee11a41eb34933f6dd9d0cc7bc0485b0edb8b6a5b4bae1bb";
   };
   sysuthesis = {
-    revision = 76945;
+    revision = 77677;
     shortdesc = "LaTeX thesis template for Sun Yat-sen University";
     stripPrefix = 0;
-    sha512.doc = "bcd2d28de82b2ef5ba6db19d283e153256c355f347fb4796aa4807934cf21bb78a606498971ec517d8cb55e7e956b63419acd994c1d3a657b298fc1a6d970158";
-    sha512.source = "9a565a3f8b7da58860841829d5ca1c315dea2cca1a1da3027868e13175f2c64ffac9d787117aa19a638282d2c1e1b60c9ddf3eb158ee97d74c89b8e1348bb7a6";
+    sha512.doc = "e480d78accd7ceb84ffbf84e3e3a4e88bb1924816ef7d72419540b7e2da3a1fac9c7d984ee9b11cff62c98ce7df514098bdf7f468d3a638ecc1c6d4224a758dd";
+    sha512.source = "25c534fcc0f7672626ac58b7907c5c85d7212e75d739cdcc6d322e27a6a41e008072e5e5201803484782ef5941f088d256d8bb460c988708f1220b3afe3f6807";
     license = [ "lppl13c" ];
-    version = "0.7.0";
-    sha512.run = "cb49bd2c06b9041359329e362d3e07deb115d28770adeaad395df6fb277af3aa9dedbe1b436ddfbef347cae9ccc447b3054358c741de4a4dacc2c58728265010";
+    version = "1.0.0";
+    sha512.run = "7833f9b95fca07f4c647a828394c79a4c8e0b376543c792557071dbb17e96385490207135e9edc32642e7bb4a0f6b180b72f29bf2130036423fb5a54945ce8c4";
   };
   t-angles = {
     revision = 71991;
@@ -47529,24 +47676,24 @@
     sha512.run = "1846fe9da749b92700be07c094556fd296d47123df3a5d6823570056e6ce2ca8ef365b70f6ab2a8577602d1be338867fd2610403f89729dd51632d404951f84f";
   };
   tablefootnote = {
-    revision = 32804;
+    revision = 77677;
     shortdesc = "Permit footnotes in tables";
     stripPrefix = 0;
-    sha512.doc = "712c1ab696f5924058f4ea6ce12e3ff14fcbf79a78328259c4b9acfdaad33e9e4dddf36dbb322598f09a8fa3ca75d68b474fe1a4bcd4d25752704e0c4e6ba5d7";
-    sha512.source = "70456471a5997592668198463d1e44af464e9c24619c09d186c952c5afe2bc5171d5c29442820b267d1782a966fbe63997694427f1c870d14ec6194ac99ded52";
+    sha512.doc = "7818f185f1d6a4e8f5fcd2ec8934ce464039c85908106edccd29c5b488c19503d4c8973aed3e518f7c9940fac90b8c8adbf0719303947a4cf24bcb842c0be098";
+    sha512.source = "7ee574406b30d87939221d4caa52e68e38dba1d5048215c84744c8a5b0514d245d94a664a1c920e405b19ca7775f352cd3cbc27a85ca639c880f93aae86d806a";
     license = [ "lppl13c" ];
     version = "1.1c";
-    sha512.run = "90812cecdbb464592b17b8faf4d81b221844a354b0a3d3ea30cb72d0b56c4ff7eee701caf113e13586315ce846d30de6ce8d5028966f2c310527e34e8ec90464";
+    sha512.run = "5c6a5c1c6a3b19eea8c13cdc5fce19e57f2bcce302fb8caeefa50fc47297862351abff8d2559fcaee5d6bfbb8105c178e1a41e5f805f152547a24b8700a44741";
   };
   tableof = {
-    revision = 72313;
+    revision = 77677;
     shortdesc = "Tagging tables of contents";
     stripPrefix = 0;
-    sha512.doc = "1de26be2899543194e2d92676a469f9a15f4de46974df6497a6da78d0bd997e5b5cf43ee9ff6eb719a07f12bcc355a8bae7c3c72268655a8e994be16b547eb6b";
-    sha512.source = "f6e8928a14ae9c053d44a7c740cb90c179b1d4112d0026103281f0237e034a190d5b96b7c6d55c096b6741bf13bd8705ce3553c2fe2fde7cb0c8afc7fc04d85e";
+    sha512.doc = "0e5abddfcbd8114482e9451e0f7b9cb4a3cca22752a4d3c560c95ec391f835bb5a770aed18f13426df3bab23cb6be23b58f7db7973670facd7c0b6b50eb9505b";
+    sha512.source = "b767233850d3540d5fb033c77bafa6745a57f04cc5cbdc3b108f09a2fc82a7b267735bed85ef5ffd3839c720a3264551a0eba1ad952fcd9c538af1f7305ca6ad";
     license = [ "lppl13c" ];
     version = "1.4d";
-    sha512.run = "66c360aa57c255c59b59b9c4af5a6a5d2d7834a72806f985a87bce1efc855fec782b5e350feed4386efe18d7d55870c0562f82fe213a0c9726a9506f8cfd11e0";
+    sha512.run = "67ef134a8563985c477a82b0a09d13791be57b9b41b33d3749f78872e15e6afc6e37b51fef940cccf2d1a5d8ddc44b54e7322ac80f4e616f1477c41d1a901c26";
   };
   tablericons = {
     revision = 77184;
@@ -47580,13 +47727,13 @@
     sha512.run = "64169a74a787f8877d41d5e32c42e5659950854a1e20cc05103b3ed58c54fb800a9af0701a40a6c5b75553b86d675fbda51948106cac464785c3d46aac77c979";
   };
   tabls = {
-    revision = 17255;
+    revision = 77677;
     shortdesc = "Better vertical spacing in tables and arrays";
     stripPrefix = 0;
-    sha512.doc = "f458058964660b2b1ff2a61ff8ff2ffcfe7ab103e9714cb1e7c307a8bd39c5a1a6990683c4ed7aa401cbe9b9dcc083dfbadd80a5aa00bcd64c0fb72638cf71f2";
+    sha512.doc = "bf732d51b4e7fa3c47d0749f3288300b30c0f0096b1fab0aa0d39c4065fba5d2f97ef4046a116d3fe57e870b870bce64841ec229e596aba52b1b1aaea39b1da7";
     license = [ "free" ];
     version = "3.5";
-    sha512.run = "1a341985ae61f047694470d19d4e192b4f4e01c0bb595d91b1f80080eed3077be4e40b431cc05b1bb482f18c30bf36e6076542f2cf37a49dd6b065b0fe044bca";
+    sha512.run = "3973b82ab29176d1297e51b16b095607e17c86c82121404f49a278b8954ae531594af9f23673070d3e207812dcb0405fc5b20ec6f58d7a576a87119ddd5c7f4b";
   };
   tablvar = {
     revision = 72007;
@@ -47624,26 +47771,26 @@
     sha512.run = "5b3bd8081ec6800c96ce4b4cbdd8091578ad1df2b625fb2792202a6c31f3f126d612f99f04802d82d490cb529e03e63f98b01c7842ec0df69b48c2fc289108fa";
   };
   tabto-ltx = {
-    revision = 54080;
+    revision = 78116;
     shortdesc = "\"Tab\" to a measured position in the line";
     stripPrefix = 0;
-    sha512.doc = "35e98681472b9d6fefa25a534385133d630f072a75a045c9adfc4b0e775095609ece27322e3fe8af451db03c0ac3b63141c3cc7272924ff758a8985389040a31";
+    sha512.doc = "3e4bda8b9248232d0d9d2c367ea7e548cec2ba33f9ef7c7a5b48089b19adcb398f14f6b395d2ff64a3688e5664d53660d281bb9f1f435a9430b8323c98a5c1ce";
     license = [ "lppl13c" ];
     version = "1.4";
-    sha512.run = "8654a7e3b49bbfe6e861a6f757d8553f78149e7187809b03f6854f2173143e10195385d9e8b35510e49a5f941b27a5796070d6db1183b58e4eb71c452d4a34e7";
+    sha512.run = "1b5da8556b8883205bd9d5435759992103654db52aa0c7d0c85ad07e861f8ff38bbd24f92903da5424184390ee4ede2c85183ab4b4ab56182a80df225020d14a";
   };
   tabu = {
-    revision = 61719;
+    revision = 77677;
     shortdesc = "Flexible LaTeX tabulars";
     stripPrefix = 0;
     deps = [
       "varwidth"
     ];
-    sha512.doc = "5ef0a71d643bf5069a622aa8c807bf87db7445caab1f17b5202ee25ddab5368e94e796eb16de4fb183f294cedc232d48cbdba68f45d2451e01a2483d6869822d";
-    sha512.source = "7c80ee8d25933e5d1c579357cffdf7177b0a419a847ca1e671cb1dda19fbde9b3680658df6b814d5d92953dd13eeee5100a5aa2fdb5fec3cbc1e213545cb3a78";
+    sha512.doc = "a18d8e01e5a15f78803e679709216019855db48e4ca561793ff8e34c45d0239999e3121835b296b8c73d112ef26da7abd64dac825c50810d19d8dadd843f7e46";
+    sha512.source = "26e3e331749fd8d8f711b5f5a8ef12e4716bb65a2a8b504e96aea2f26a5a954532379a4e26a4b46fcd49fce069bcfc90b99677b8230e299b409f54a127c07691";
     license = [ "lppl13c" ];
     version = "2.9";
-    sha512.run = "b40dc1e91084912df03175a6529223c6f24ae3c0ec77cfb8f1f8625816ea78c044c8f01f1b473e84696421d6772d9201fa4b59aa93e6f014b73598d16c09a6cd";
+    sha512.run = "e3bef0a70363083726ac9bc028df7a556e81b89d88ed578a8ce6b901852ce2ff41ab808df38aaa4b3c231cd20ec77989f3d2c0d3764bbb363348fe9b65e707e5";
   };
   tabular2 = {
     revision = 76924;
@@ -47666,13 +47813,13 @@
     sha512.run = "a30f668ea84238df674c079fea6b05878776b26b4f6465385e26b01b16181825a8cc20767fa45eda8e7870d272875bc9664aed145885dd655d15258aa072ebb7";
   };
   tabularcalc = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Calculate formulas in a tabular environment";
     stripPrefix = 0;
-    sha512.doc = "7e35cad1507cfb62117aaddae77c3faa5d19c4e320193afa0054415e84d49833ba64afdf743b6241d611dbb4d45c6a532779293924f20b6c748659a361d6f30d";
+    sha512.doc = "09b0e80b51fd9de11f85d662cefb12dfdb21230ee08373a3dde8cc53b6bacd3cad7feb300182b38830eeaaefbf2de3790df31fbf89d189898347edfabedc9bb3";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "7535398538d6802c4e70858028ce6e7414aa8a88336e71f90f7f909d015bf896eeb5e6652cc5bc5a2bb384bc25d280d8cd6506f7ba05823c20dda04fb3adf0ba";
+    sha512.run = "f7e17c38bba17f97494e504e93adc292f046fdc51d4abed7577e4ae339dc18f9887910ed8569deb786042b4a2eaa091d18ae73bbf1ed97d2f522fcb413d8938a";
   };
   tabularew = {
     revision = 15878;
@@ -47685,13 +47832,13 @@
     sha512.run = "512851ce7641e0904dd25ab8a5cd5ac0dd281154067e09c4389fa3d6f330d30099dc60b252de4ebee52a2cf28d6b7d10bcf63fe4ab1472238db35754adc1dba6";
   };
   tabularray = {
-    revision = 76953;
+    revision = 77677;
     shortdesc = "Typeset tabulars and arrays with LaTeX3";
     stripPrefix = 0;
-    sha512.doc = "f0a085ed9461f71e934390f4e0faf51117aef0bdc1901223560cbc5663bb2aed91360cbef92bb392394574e8ecff666ec932a414af2390d2f485ff5c47a816c4";
+    sha512.doc = "630ce7f11b202676fcf605d84e949265a3e5c3ba6098856db9d844aeea2f70d814006c048c645b9838f74204c5d7faae6314d13adecd0d650a42de0f3a7b6b28";
     license = [ "lppl13c" ];
     version = "2025C";
-    sha512.run = "c40f485b75246366b8322c212be94b74c8d369b646dee23a20e6ea547839cec892fe8a307f147b1c23eb3ff453f715958b2d6b6391503307d7a9b379a476c85a";
+    sha512.run = "da0276872341079d20057a44c50d1f23fa4b9a0fe954a56741665b02c96a70703f0a079995f9494cf4d34c18a8db762c45e1e99d09876e44ab0cdb89d02917ed";
   };
   tabularray-abnt = {
     revision = 76924;
@@ -47702,14 +47849,14 @@
     sha512.run = "d0f99c101be436a2017384e9cd4e2a176150d83b44079da2ecdf680873e2edfe931375daf6dde9023a268dbcf5a9df5a622968af0305034ebf1fc5d40d6ed191";
   };
   tabulary = {
-    revision = 71463;
+    revision = 77677;
     shortdesc = "Tabular with variable width columns balanced";
     stripPrefix = 0;
-    sha512.doc = "c1e8dc6c22b48ddc334e785af030c231ae09acaee723c6c493b8affa66c594a39282ea286e9774d09525dd26a701d64fbbccd5f922119ee78cebcec7819db989";
-    sha512.source = "a61b830abbf1e2ca4d27dd912f96fa852c113900207e6b0a3e4db2747b80add87ff2610656beee7cb331a0ed849174e0fcf303173313d01049cf6da73a78b972";
+    sha512.doc = "e248171217363231201b6e8c482e296e3e798450d597c6cf01625dc45f6d6dfce63816b078d2e145e8e041ce41897e4944455f7794ae6d2cc3ea114964544d4d";
+    sha512.source = "05a880bae139d79fda0665c3bd8c63bce2808a638b9fa6f71576d3244ffae8bcc3b6aa9c1bd6c8a9b24528de05190080d897c572800e76c2b9b8f4d94436fb56";
     license = [ "lppl13c" ];
     version = "0.11";
-    sha512.run = "24b394c8cd3c83c35024a50ec985393ed0fb406118783b3810f78bd6f6192c380d5846e4d4ae80a2ac119f7c3fafafbb77ac734753f824e3a224dc90b8b88615";
+    sha512.run = "afd8f17eb99fef71cd04ce2b18be151d0656e80cdfb482123bfceac5e82b7a48db74436f298690303833b649d09373cace50fa1f245d01bc372d7892bb37a00a";
   };
   tabvar = {
     revision = 63921;
@@ -47725,13 +47872,13 @@
     sha512.run = "255b93a8eda59386b798e85741422c529903acfc0d06cb77f4b128c2e32e4a68ef32097888e921397c3e22434b581de30bb79c8cc6dc8357eaef94f26e6da04f";
   };
   tagging = {
-    revision = 52064;
+    revision = 77677;
     shortdesc = "Document configuration with tags";
     stripPrefix = 0;
-    sha512.doc = "06d470576136a96edb69bf595e55f16416da552a5f4a84980ff5393689cb58246d4fbe62b979c22b85c5abc58b926d9be63cd0ec734b43c653a0d0a5c4b04d8a";
+    sha512.doc = "73078129cf853b2eb9b64ed875e523417568140b925d7541fc893f05efe7339264ff69fb5558a0194b049e77e3f72edb30978a2b0eda09e55e551d11c7dae399";
     license = [ "lppl13c" ];
     version = "1.1.0.1";
-    sha512.run = "8947ad0dc443891e0b5a395a27d2857acb5879821443ff64cb0b15b99eea7a69401ba165b26565bac1b0036032d49241504ea2e008106a85cdd896aa28abd9e4";
+    sha512.run = "5d3b6a4f673f910df4178e21187de6cb4cd4cd202a334325561632225daf9b16540b9cd2316417890176312ec682b8526c91ac4de0ea03a228c738554181ce86";
   };
   tagpair = {
     revision = 42138;
@@ -47838,13 +47985,13 @@
     sha512.run = "f3d93c9ad813008fa72cbe317d244bca9a70855c20f327d22d1720b79d70019af0f5d8aef237fc78a598a545f44a4612f1e5a7622b34247044ab230bd42eed5d";
   };
   tasks = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Horizontally columned lists";
     stripPrefix = 0;
-    sha512.doc = "78f7b113eed3401f27c2d1a50a0cef6f33b147fdca74a4709a3e9f5bb9e5f1f803249d8c500968e558d6fec849ee284055d56d835a6a48be12053fc3cfe8d9a5";
+    sha512.doc = "807b4aa8ede19250472da645f29c7def1f50b253abd192f0562a6d40bb44af3c4239bebb20d82584b01e3f0672291ae07b90a03a0a9d0abaae5a01a3182d6824";
     license = [ "lppl13c" ];
     version = "1.4a";
-    sha512.run = "b32599fe0eb45a99df9fcbcd91c25c88c84a353ef0f0e6343c255da5f6d9f3d1c75d51b88f8bd2fc1fdfbf32ea71db023bb991818f37313109e8614e521ed11c";
+    sha512.run = "e66f98686ec06c9a002402ff626229054f0a96fd2c8bd7c0018e225a1cf0fa9655b0a6bbeb2d5c65bb910a9e6cccee1b2171c429b0353e9196074ac2db3023e7";
   };
   tblr-extras = {
     revision = 76924;
@@ -47867,7 +48014,7 @@
     sha512.run = "82348df3f6dcedc17a3cd50f709d01b1f2b0e4be9345e63d40ee6ad2aff908f97c7d19d586431e3fe8399a8d076505ceaadb5afe0116093240a6e59a335934c9";
   };
   tcolorbox = {
-    revision = 77161;
+    revision = 77677;
     shortdesc = "Coloured boxes, for LaTeX examples and theorems, etc.";
     stripPrefix = 0;
     deps = [
@@ -47875,10 +48022,10 @@
       "pgf"
       "tools"
     ];
-    sha512.doc = "e32284f371007e6fdf6e7a0fd2ad9be1c076a10d84ae9b8b4c5ff4bff9cc7d37a0a9b5186d6fa8cc47165686fa2fabfeb532276fac14e25c6c11dd7311ac7901";
+    sha512.doc = "68726e629c44b6a5a238f43480ba3b40b44eeace7a1f50e7c549d39cc042c54cc9e80fd6a0f230acc0adb963c03c97acbfd32775909fcdbfb5cef10581412cf2";
     license = [ "lppl13c" ];
     version = "6.9.0";
-    sha512.run = "d4a06307ee2a3aa26c7d1797f69213c15eab173f66020c45af813d54d21370ad94fc95d9935e1bcdf8b90f0e811d1ae91e6604568a183cf0c8b64602e9521ed9";
+    sha512.run = "e31b7ea5aab5a719235e42a5fc2d129d93de7684638fbeed8f56b18ca33b3fe1a4269c2ea8d6e8caca14878c4186a5c2fdb61a4afbe9477f05e2f1458689872d";
   };
   tdclock = {
     revision = 33043;
@@ -47937,14 +48084,14 @@
     sha512.run = "685f96cc0da3ab73f141bc052a2d6409b1e24dcffdf6dc9feddb9e17c902c19a0cdee22c68b75aa2d99e5ceb6a94f38fa50fb7d829c5ba29678a511f2c110f14";
   };
   telprint = {
-    revision = 71914;
+    revision = 77677;
     shortdesc = "Format German phone numbers";
     stripPrefix = 0;
-    sha512.doc = "f0529a2aa31a7ddbc8d17225b8303a1a4e04438de1fa4ec61fcdaf29787dcb761ad5d4bca356f7bf3c39d40d64a766cc6733e037d18654795ef830dfce2be2fb";
-    sha512.source = "e00083536ec4ce41b6e9d7df2b3234d0a2a233cca59b8f58bf891cc96ca2ce3dfeea4954cb0cc0f6ed2fb237aacdec3a19e0943fc1b8789b053cdc86174db9f6";
+    sha512.doc = "beccfdd7a9cc42bf58d990b8a47e6b95baab20ac9a623e7c0b60aeca7402ba29ba1664ab592b05468809af7c97a3e952e05ca916573a41d166cd2a5159d7864b";
+    sha512.source = "d00d67e5d01b15640843d3b755ef36ea561ad61f2749c8cf51c8f316b89a37c6e5a5eff08acde76ce236bbb6fc9489d52cd3c41de186d253fc73435d3a7b655f";
     license = [ "lppl13c" ];
     version = "1.12";
-    sha512.run = "310127b6046abd4e59f1ca873912d9bcfb62489bd05866964d46a9214661bbc2ed179fe91f5dc854ae99919110381e2420e9f1a7e526e40ea95a3a27e568fcda";
+    sha512.run = "b2b89c76e629fd36e6f456b7617fa335c044c048c3cca5b1076f2c97c62f17535ee1e562de9534a6034660ee886ad3e8de90fbb4a016bd5c14986060fa8fb11c";
   };
   templates-fenn = {
     revision = 15878;
@@ -47971,16 +48118,16 @@
     sha512.run = "696727231a51c33d10ca7c18690d2f960cd01a72b4e928c581e2a7ed26770bf5ea18bdfbdfd56372fc7289b59323025ea7d30f208e991e1c6c89a659a240597a";
   };
   tempora = {
-    revision = 39596;
+    revision = 77677;
     shortdesc = "Greek and Cyrillic to accompany Times";
     stripPrefix = 0;
     fontMaps = [
       "Map tempora.map"
     ];
-    sha512.doc = "18259e25b2c9f2a9cfbce9a9303d8827af069bbe2a7ade5c14518ce2c19dc973a86fadaa99b2abc8bc65644ee5371c745abba03cca76a685382b7d8b6d20bc6e";
+    sha512.doc = "253ee44ce9ffa0ef7fbe1b4ec9cbef8717f9a0ed2e30e67b598b9686b6d0083da849d8566d4d35cb46ddfbe39591490ca7fae8a917174995c81e33402ce8ac04";
     license = [ "gpl2Only" ];
     version = "1.05";
-    sha512.run = "0e1cc1a13f7937e5497f454b15ca66e0975b784b80223a902bf12a9587abdfdb56116b100e04306b1999e053b7c3716b32e1183dd7e6624162611f3b70388df6";
+    sha512.run = "f06072ab89231606c6188737ecb2dfd92056b132ea257b4fc05172fd2491a4126f3b996a78f5b8f95e18e4a341e8384655a5fd1e7bd75913810631a41949eee4";
   };
   temporal-logic = {
     revision = 77281;
@@ -48003,23 +48150,23 @@
     sha512.run = "c6a29d928b1f25dc4b8893f9fc803f3a5deef9e8e9aa4803153fbae5cdd7170eea819eafba8a165203e48c8b2f443c55ce682df9f7e968ab621f2cf7eb082108";
   };
   tensind = {
-    revision = 51481;
+    revision = 77677;
     shortdesc = "Typeset tensors";
     stripPrefix = 0;
-    sha512.doc = "12e443e2ffe876732759ddf91c8948e9cfcebc3c1c96949c51f090e15dadfbcaf801e488c8d043855b576404207612ae91d982279cf0b29bd73d4a5d1528bb6c";
+    sha512.doc = "a2eda25a0c2ba496c6d4694987c41974311fb5020489e142f3869fc24c339396d6005378479bbaad27ccbdac560d4b04fc7d6ec71a467f1772c77c2b8f0e7487";
     license = [ "mit" ];
     version = "1.1";
-    sha512.run = "fc20b6f6b705218b82b5788582d8b017be783e42c87b3f35e7aa99a8215ab0168b7da899c73ef1ebc282bedd5c715e69ed9e1c19b94d9b6369ba8e9986b5c5d6";
+    sha512.run = "8eb1535ab4ba84157d87ab0bc46ab913bafbbcb8850628f5b24dca7536b8eef8cc89ae5c2d55433871f23dcb41a36606ef236db535a0d3221affc132b553ac8c";
   };
   tensor = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Typeset tensors";
     stripPrefix = 0;
-    sha512.doc = "47131d4637d42cdd6a06fab4d31814241b848add2cf5e7a6cc975c388dc98eb872ddf475f57eb34c77d2831296189bf3f34d30ace8eae38debfd0d7688a4f34b";
-    sha512.source = "5ae5150f14cb246e40d0df54b9367b8384a586d2b8462e370a73de9acb4203210e399d6ffdd3df5477ada6fc4c8eeb9aa227459c747e5f7d2fc8cf6170eee633";
+    sha512.doc = "c656f0ef81676d81848fa25fe0aafe3c6ad99211025023cb8833011ae1ce33e7a8103f0505434f070e2058b3a2765bfa900baf319e755dbef020ce7f3f3b7328";
+    sha512.source = "9353c47750e8364fa8c2c1989e8d2535313c74e2a9baa67326599b269fdcbfb2710fe992e3291b9261c4591c9fae2895fa49a831990611b8ef2194746c3805e7";
     license = [ "lppl13c" ];
     version = "2.2";
-    sha512.run = "4344c9a57deff5e3d05a5f4597373e7ef2012ec60e3557fe1b944b429d15ec6463e1fa1ddf9a3d4417cd3c639c7439d4c9d5035d04f727fd6daf3f8882ad8c64";
+    sha512.run = "9c10f20b022349bb427cd669a5ddf8c459fc3f74646dd4320fbeb61917c954c85a2e4b9f9506d2b93117fea86a02f9e0c49e4fd5448e627b68c2b957ce8eb873";
   };
   tensormatrix = {
     revision = 76005;
@@ -48051,13 +48198,13 @@
     sha512.run = "9d4d0be3e26dc69fa3986fbe41099330e97cdd4d3aa0b12a180657577ef839878aea9e546a5651cdd0ea45e7af3968c5b83b509ad5bb3ef210d42af5c00fd91b";
   };
   termes-otf = {
-    revision = 64733;
+    revision = 77677;
     shortdesc = "Using the OpenType fonts TeX Gyre Termes";
     stripPrefix = 0;
-    sha512.doc = "221decd0f8193912d30032544095c3f30c4d8fd3b52ab74dd167bec1de528c8c9b753681985259dba859f8fd3d06ba239665bbdcc93d80904235c6f62685dba2";
+    sha512.doc = "c38f2c685cb9ed571432d682fb907dd5aa0ef37623cba7461f76f287cbe99b89b63f5bfc4263d518203f3494d338341da666c2632552a3bc784ebe0c2e439d83";
     license = [ "lppl13c" ];
     version = "0.02";
-    sha512.run = "df52961346796914dca6c8f7c45671aa5da8c8ae4d55b951b5dcec6168c90082c02734db1133a119c951e50507ff1edf777b8976e34da1fc1cbc7ad783d4ae4c";
+    sha512.run = "95aa17189895d3be3937a50ca660374ee6d47930906409277a8e3f860315d941b45790c0f61b7a4e25459ab6c423840d8c59b89142a09e408c9823bdd72535dd";
   };
   terminalcode = {
     revision = 76729;
@@ -48227,14 +48374,14 @@
     sha512.run = "513310d4dc5240d0b290d0acc941455ba64e069d19c223670d05a632033aba8de367d5dce6acf073af4df476876d3ee414dcf9f1f579738bf9bdfe6738c19d36";
   };
   tex-locale = {
-    revision = 48500;
+    revision = 77677;
     shortdesc = "Localisation support for TeX and LaTeX documents";
     stripPrefix = 0;
-    sha512.doc = "d3898da3687603b1f1f3f2f5b203d01c985ab0c3e39eeb05dc7c855c14fad8b73649777e4a0b7844c242bc8946cab80b585987eda37a1c10e3ba75c6955fee23";
-    sha512.source = "b24a01b9845f79a86c12911e71ef179a4dd8f5a8284d067b760a8ac3cb906cbf2465ae3617e0196d9163348f3a865fea4e5869adac9921088b13d738803f87f4";
+    sha512.doc = "562090e4a9e3b96463a361ce500ee424100b538c2f4f65ad5e2bd8ce6eaa6fb79f465f76de17835e6cbe66af0c27681267b96d5710790ace806762ad116bab46";
+    sha512.source = "50ab26ebdf937cde74005109e1ecda58e9a2179bf8961d1e904e4b1305c4b48ff1dce823aaa85089c4912c6fcf7d15036770b3750bef327a25194b27deb1d7a3";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "0e3aca622bb6fb49a06a3aea1d997414add9272dd39c10c3a1d80956dece59882993b24366a1126acab80f8a7c8328a30756f727210f829f5eb838ac0b9cb1a6";
+    sha512.run = "ef48bfe27d2d60081fcf235e78e75526eb1757d39bfec9b17aec36f37d5a8d49a44f0b8e8ff7bcbdb8db066401aa38efe4b95dd59fbc70449bf23ec7d365bb93";
   };
   tex-nutshell = {
     revision = 70375;
@@ -48280,34 +48427,34 @@
     "tex"
   ];
   tex4ebook = {
-    revision = 75774;
+    revision = 78153;
     shortdesc = "Converter from LaTeX to ebook formats";
     deps = [
       "make4ht"
       "tex4ht"
     ];
-    sha512.doc = "41a1521dd2543466c95f05f50f2288b78fb8cc9593e68c4eda137d1e19353711ab6e2c7decb4f7a6347328095fe27f1cb0e0cf1ca05795d3ecbe050cd7d7f3be";
+    sha512.doc = "8251abae3e6ea04710a958f6bd5d6d70cd3dae939450c1a06d7967d136b7b801702172e69f06e20fa82563e97363dc89983c58dcbc2790275a16afedfb6756bc";
     scriptExts = [
       "lua"
     ];
     license = [ "lppl13c" ];
-    version = "0.4c";
-    sha512.run = "beca10a58514a4f4dbb559c64099415e367ac8ed9cae9776375e36292e0365a2f418b2fb6c19ce09400c2789b0c58cef8ad368cc8c468a79355200ddc1450e4f";
+    version = "0.4d";
+    sha512.run = "fc863aed49f6e59362390a16bf465525dcfa804c9a198b7b222530d40905b9e0f51efbb4557e89da2ec2d3bc31a2b991a59f99008b61789b160c305029258e03";
   };
   tex4ebook.binfiles = [
     "tex4ebook"
   ];
   tex4ht = {
-    revision = 77565;
+    revision = 77991;
     shortdesc = "Convert (La)TeX to HTML/XML";
-    sha512.doc = "f67fe77bd83be563ce7bc2c99a4a6aebacdaeb2459bcd8c707a09b8fb4d8b45fa7cffe0b6a212768a341cdf4370489a829142c5995e2f8c11ef2979a3e4c9c13";
-    sha512.source = "03fc0b125251cc2cd4662a1ebecb66aacdaa2677f2a9f6ad48eae6b4aea15e7ab6826dbb2dd8cd01ef42c648e7bcf70bb76c1b11190bf684a4fd59676f905779";
+    sha512.doc = "3a932fda55762263ae1ae1ab3695dbcef2a7e6d4995028bfcc0a9ca15de04998aefbad56110b7853489fe038eddeb1f2057a65ea28d2b78caea30ae1b69a7e1a";
+    sha512.source = "a2a6022a828a7b55a78ca72514e681951731e4ab451b54e0683e0daad6f07d243b52b056e376a6a0fa3b91652396598e819a8a8d14fdfcef65f5a8cd93e30a0f";
     scriptExts = [
       "jar"
       "lua"
     ];
     license = [ "lppl13c" ];
-    sha512.run = "749a2e954a650859085257729b327a457c89c78f1c3aa95c3e2defeac042ed5c71ad323e9e3ba6df4d98d1f5551a3897da82840fa7d6ba9608a8a83938c9bc49";
+    sha512.run = "760a199f6fde826739c94eee51bbb6424df4b4b8bc67e2f225884d7d42985d2a64560bca9623e5d71724caff484cd9a68854de80d8a6632efb5b81e645200d57";
   };
   tex4ht.binfiles = [
     "ht"
@@ -48411,13 +48558,13 @@
     "texdiff"
   ];
   texdimens = {
-    revision = 61070;
+    revision = 77677;
     shortdesc = "Conversion of TeX dimensions to decimals";
     stripPrefix = 0;
-    sha512.doc = "3ab30a8de33cedd4bdb9aa0a84104eb5b02be164de9f6fb81a51dbaa6caabe0029228c311970a3287cfbcf270a5430d6883756e9c28fc924a3286d76bb71217e";
+    sha512.doc = "69174409761d690ab00b37b225f37ab8aa66e86b108599e626d5937478934f861253e11a0ffb9bdd0d00e6040a95bf53198bbca98dfdc784e618b522a52dc661";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "737074790de5c16de0e30dd6f708d6b8ec43e8d387ced2dc6b16b64f38854fad7367884abeab71fd41eaa79dc0c5939904314deed97331f9919a1fbefb0108d3";
+    sha512.run = "86450eeed4644dd0198a6f17b3fd921ff27ffb040a5388b4a3928c0869d4858dd7b7dc4dfce226491c4a9835f5719acd83d91cb25dcc4e67507dd2bf82faf1a5";
   };
   texdirflatten = {
     revision = 55064;
@@ -48583,11 +48730,11 @@
     hasCatalogue = false;
   };
   texlive-msg-translations = {
-    revision = 77513;
+    revision = 77642;
     shortdesc = "translations of the TeX Live installer and TeX Live Manager";
     hasRunfiles = false;
     hasCatalogue = false;
-    sha512.run = "73e73008b0e1450406d9679975c650ff3b86e3fe1684b9004d8e8403a3b571f784fcd03416ec5a26c775172f57a2ceaa1b771b0a4f9be3d3f7e601e74492141c";
+    sha512.run = "977021a23d075a37f748a9a0216e804858149a81995072aa20335c3addd618368f089bb16bf9485e68a82a513b3281d748ffd980b2c332893b8ba05987d41eb4";
     hasTlpkg = true;
   };
   texlive-pl = {
@@ -48605,7 +48752,7 @@
     hasCatalogue = false;
   };
   texlive-scripts = {
-    revision = 77567;
+    revision = 78221;
     shortdesc = "TeX Live infrastructure programs";
     deps = [
       "texlive.infra"
@@ -48613,14 +48760,14 @@
     fontMaps = [
       "Map mathpple.map"
     ];
-    sha512.doc = "ba97bd61e8ec44a36757208846977438a808ebe6dfa1d6aaf9dec6523f8c0e47ea572d2e7e823c1fa59cebb8a7e8caa08393e911b04e6bbb2cd8b6058d34b799";
+    sha512.doc = "017ae67a3e682ec23e8e4876d866062f6fc0a4707b42c4653641584eb141ad528129da05084e4099c6f4188895f9ab741d68cd8100b200d4b373154f6888bf3c";
     hasManpages = true;
     scriptExts = [
       "lua"
       "tcl"
     ];
     hasCatalogue = false;
-    sha512.run = "278ef3509fa6c90bf4acf5992c5892ad4797bdb98a85c0561a8d5c1608d57deb6b040fbb74f7abca1454a010c8166d28528f81cea74c39e85b15a7d62ebdc564";
+    sha512.run = "7b3365e054384d1acd91eb50d34c43dbd7d7ea7bcc98eee91ccc62c6ede11b32c1bdebfa34593eda672b13918059e895e3aa969948d988b578a1482e2712efbb";
     hasTlpkg = true;
   };
   texlive-scripts-extra = {
@@ -48750,14 +48897,14 @@
     "texlogsieve"
   ];
   texmate = {
-    revision = 15878;
+    revision = 78116;
     shortdesc = "Comprehensive chess annotation in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "dc1ca347bfb0ba8c54403e643b4052604f98b39ced23d092808cb221e930384f49d1c34794a933b0a05c7691ef04158688653ce69eb8a4b72e9172b4254954ee";
-    sha512.source = "b75362c3b748021934052ef38b9f95ad7047804d5100b2a00bd8f9e396103d2d641f1fc5a3c636cb42ed66fa88488f6c69d3b188e3a55f715df2d19c05331889";
+    sha512.doc = "d42e83833198d8fb060053016a1e31ddce10e2e01912e96cbc8265d447f81c6decced7cc635e0336ad5d7c0e27dc5380196b4b2d0babf52e4e448cd95fc34240";
+    sha512.source = "8eaa9f97fa349b3fb5d5009c506ea61bf58a1e0bf0fa51f230b2cef834a52300dcaa50cf811a35573fa3e00975fde858336beea20d6da3df1882a682060448ca";
     license = [ "lppl13c" ];
     version = "2";
-    sha512.run = "52c35f096426385f229b7ddb66c8ec2a20539bbad6296f2bdd230c2da79edf5668fdde0fc7ebac7099a414b622b31309fa7f610564c8212602f71dca7193c597";
+    sha512.run = "74a3940a5a87f14b993f90cab8d2d061f39ba3793bd217426c4876fe0c3c673ad11439aa89da77fceffeede04d2c0e85b6023eb3cbaf1855a8c7d8992ec77731";
   };
   texments = {
     revision = 15878;
@@ -48788,16 +48935,16 @@
     version = "2";
   };
   texosquery = {
-    revision = 53676;
+    revision = 77677;
     shortdesc = "Cross-platform Java application to query OS information";
-    sha512.doc = "51bc4e5a9f62b4526198b380fa69dd2d79ff69ccf0915aef4269d890fed057c4130ccca65e0c279e58ebfb72347d627b186534138f9c4bc8d395677c73a2a0fc";
-    sha512.source = "5ed0dddadb7e8f406635d7a2cc309a030826607a76b4520b1f47a07affb603d96577118ba1fb5b9797322aa49a68616acbbcdde39bc8538c54c5d2fa1aebe510";
+    sha512.doc = "68a4dfdfcd631afebccf3527cdcb1c5acb9ddf25201ae6a3e18f2e8675ad382398bbcb8d9bb549cad27e1c42f23dea02fc7f3d84a169d57f6c2fded05426033a";
+    sha512.source = "37f0fcd4a195b9dc3a5267f7ffaec0728e6ae1324878fd4d91ccef7d6da449f919b08ce8107e45f10da4dd142a927c18286f5e569a3572e572ff028300743208";
     scriptExts = [
       "jar"
     ];
     license = [ "lppl13c" ];
     version = "1.7";
-    sha512.run = "d454a95139920c24404a501ad3bbde4ae8e809e0f0b6b7c32053d375e0cac31d81087a53d65ab067c9c6dfd988ae90429adbc5d7cd2e1b23f41f46dbf6a25056";
+    sha512.run = "fbd239be879748a38a7fe3544081b2e5ef230176e7f3a6513f1d2a11fb9d537a8c882d6af36f4226776faf84a23fea6c040246f1c7403fa018d2c6da801b5654";
   };
   texosquery.binfiles = [
     "texosquery"
@@ -48893,14 +49040,14 @@
     sha512.run = "39c270382bb228beeb9ec61f744f66805c76a7fb1522158a59daa5dbbf29b3f4151c20d7dbadf404cab8ca023456b9988d45e53f65a1396da9259832390a0980";
   };
   textcase = {
-    revision = 75878;
+    revision = 77677;
     shortdesc = "Case conversion ignoring mathematics, etc.";
     stripPrefix = 0;
-    sha512.doc = "fbec2a1c75dadc3c94efac5351648f4b79841ed8a779592a70f78d2f41bbd1e7e72ffbe0e9148c3e06b90b88d89dc8df149221e9e89d2b9159ed653f15d17906";
-    sha512.source = "920d7acc32b2a35e03c0fae00267bf81d57d9c657d889853d2a9778be10fd58bb19c66fe633449dc05474c3fedb2034a2cd24b041c4a825afd0fa85380a40605";
+    sha512.doc = "61346a782dd5f5b68015af5ec4c6f083417d0b873586b3546395959f105cc6b01f93da4ed6ff199c8b56e9822b712190dae99ee94b842a31ad8b0dc5f8ad9560";
+    sha512.source = "984c1a4a24d1974a4dc97c61350622a63472e090e2ec220c8865470a06e187336bf17feafdc9b829c3e5f16855ac8e9658b9b02effdb275075988d247aa098e9";
     license = [ "lppl13c" ];
     version = "1.05";
-    sha512.run = "0c7bb9f89b6cae9ea25bad09146b60a7c8affd2e883e2da9e6dd35a50ab921fa3d01271664b7c19ceda8002a310afa0a9cf2f1d4af57383b08ddc63382622c3a";
+    sha512.run = "bf0e4733248cd5d4d8497e4369a2660eabc81095f534ac8c3cd329bac50085cc610b398f21de451efd16f08661a21c2f745bd34c6b7d5910c70b4f3e79dd5171";
   };
   textcsc = {
     revision = 67193;
@@ -48935,17 +49082,17 @@
     sha512.run = "1652260a3e946a8847ceb7f937893bad27a24737d9b3573466f7369ce9cdbf900af0ef6c7f0bf3033200664da736e8232c3fbf6db61bb7d51acec1010d13a3e0";
   };
   textgreek = {
-    revision = 44192;
+    revision = 77677;
     shortdesc = "Upright greek letters in text";
     stripPrefix = 0;
     deps = [
       "greek-fontenc"
     ];
-    sha512.doc = "9107ca31b645977d56a3b1e37f7b12f0302b1b2531bd2a21883f7931831e70c4383beae77469aab4663253da3109cdd9c53589cbab95f7f0126389d12509127f";
-    sha512.source = "367b63cd318c1e69944444f4cab82af7a7b1dde667d6469ade4c6433960b21a6f8922280d5a46e96fc88ddf4c2d5d3f3a440b55045a67512459208ae181bda96";
+    sha512.doc = "8916d1b3d878ae41b99319eb292464ad3acc90a95341e12b5865b4f577620999fc267deec26789b8462f3d769832d0a21749b182ad2816f2afc0999d22de52a9";
+    sha512.source = "74c79e565ddde1055d68a2f2957afa1263a056bba2162e80a807c2d7f101451576c61cb28738e8589317220c577b8ff134e7ef37f88dc7797e4bc156845a183e";
     license = [ "lppl13c" ];
     version = "0.7";
-    sha512.run = "2370f666c2cef43a579e32a755675431717ccfb4bad6f30261a6c67e0617816ffc272c25e0d076d91c4047c41926c92ae375507f36f2fab01673bd7e708f5188";
+    sha512.run = "badda482240aa3966d9ccc614e73948a8434fe8a1458cd8db91218318255e8848d19b6eac26ed027c38e08c0370a918ffd225ab4785539404d5402ea7907cd1d";
   };
   textmerg = {
     revision = 76924;
@@ -48977,14 +49124,14 @@
     sha512.run = "7780972480a1355a05cbcca3c46f3e5284b120a93ed2265f0fcceb6965f55ed793756cf96df63aa8da589dd12fe1b8127bd470077b9f9dda758238ced566b3e6";
   };
   textpos = {
-    revision = 75712;
+    revision = 77677;
     shortdesc = "Place boxes at arbitrary positions on the LaTeX page";
     stripPrefix = 0;
-    sha512.doc = "4e0d8a21134e836e443f11da2c366655ed6077fb6156e756f99a64335b547762aea9e5883b6b88c6b14b615c1f337b95b4f232b25da6c2df3fb64aba72c28dd2";
-    sha512.source = "6565998519e92ca59b37d18b86ee56ee7a151dee53f748030f2da74ee314e05caef6e2952302988665e2ae6a8d56441a8355c33c9ff3eaf8cd55881f1240180b";
+    sha512.doc = "955b404c7e3da33522a752fe5158ea872434239769dcead9bdfca6c918deaf5a5435518c2e0035b153b353fee4f0ade76d6c8657482e3cbf0681875bb93794d7";
+    sha512.source = "eceaec33154e289ed92c83b326d1411f231ad22888ec34b268e69a841b4cea74189e1581ecce9a7561417f961348485645eafbadfb9f89aaa1289eb83cfd8d91";
     license = [ "lppl13c" ];
     version = "1.10.1";
-    sha512.run = "3774b7702694f479f117c77ab7b87bc2a03d8b1c7eee7d76c1de9cdefd33511e1d47b9e18f8139233bf4521f4fd8d97c87707c4657fd22de5d94fe6f4e0497ab";
+    sha512.run = "ae59345081035a2b1f6db4ebd85993b6a8915febd921cbc268b278ed5cc175a7ee4103696ae4a7d1480d46577cec64e96b714dc306db151ffcbeba414eeacd67";
   };
   textualicomma = {
     revision = 76924;
@@ -49007,9 +49154,9 @@
     sha512.run = "48a330924ecdeee6f7c6f316512e7f07d9091376f3594630a694f98aaa40dbf53cd343f4de92dbb178fbc1f09ec0e25abf818b0b347f04748f2fd47bfbbb644b";
   };
   texware = {
-    revision = 77463;
+    revision = 77677;
     shortdesc = "Basic utility programs for use with TeX";
-    sha512.doc = "0e5be2bbc5470c3e2671122d0c87d747ab45f8777e755515f646100e128422a05ec04408abc08ced8b9263d8a4951925a3d2d14a16422d4015a6e5053967a150";
+    sha512.doc = "7e10e759ca9bac79482af97375b487f12fa6a626ff62f6a3f7323f6db9ec520a0fff55248268f812c5a730e38c7c9fc8edfbd575263c8f72544f3d40f1d327dd";
     hasManpages = true;
     license = [ "publicDomain" ];
   };
@@ -49046,14 +49193,14 @@
     sha512.run = "25f6bd1e6e9586b261721b66b6b193c07f60dc074f7b7b1911b0a8ba4f33815c86945bcb3946ffe153f70f0dbaeec4dca8e5574f8369c754a6151fc271029f3b";
   };
   thaispec = {
-    revision = 58019;
+    revision = 77677;
     shortdesc = "Thai Language Typesetting in XeLaTeX";
     stripPrefix = 0;
-    sha512.doc = "26b88ea1b87d8391b8864011449116df3fccbbb978aa76e6cc51dfa893eac87851ee10b1320350de57103b80c6bfb30ca97dd1cdf13014157ea35eaff780843b";
-    sha512.source = "e79096902654f302311ab531f8ead3ab9852323ed774fd217aff94c0e1ce456c01a5d8a28854b7c5d65d0274318a22cacd4dc04a00498eaacd92f538f20f6013";
+    sha512.doc = "f4f225d768bd361e1b6185bc6aadb9a41271cefe8c822478db59e180c6f7fdd01ad648d8f41ecd8af4ab639a3f93dae30e338c4cd258fec9e163bada5eb1d3fe";
+    sha512.source = "81e9dda2a4fe6cef5b064ee0c6b7e05c9ed3f5ecd0be416dbe4aa6171e5d7d73dc0aa653bb900410360320b69565ab5af6fe5ba210422a082f40342869e8d0c2";
     license = [ "lppl13c" ];
     version = "2021.03.01";
-    sha512.run = "02434f56fcc8ab499b4f80439fe9099d5dedef00d6dd295dfc47644a7b1397486a419e1ae2b89a0aefd9cb3a093974158a72a2eb2921d25df3231a7628897968";
+    sha512.run = "a4b97e4da4848df8581db98585cc595b63aea8ea8d47705a30998ba35071237a26864a8ee938ab00899606d60a77afb7f2c8d1e4d692b228714dc4a00641e54a";
   };
   thalie = {
     revision = 65249;
@@ -49124,15 +49271,15 @@
     sha512.run = "221b2d24b947998f24c9fe543fd4fb697554ffd3b48173122552432ae45a79eb0e41fd1918ca5004421a63e624c2e17ecb2d6ab5e8fdeed182bab19773047052";
   };
   theoremref = {
-    revision = 54512;
+    revision = 77677;
     shortdesc = "References with automatic theorem names";
     stripPrefix = 0;
-    sha512.doc = "022ef42c6765c661f5828a8adcad7710d74f168b3a2dfad0e73218d1a5295b25ea24d5fa010a01151939e87989cfd6457917167e69cebf5ee5a364347eea5f2f";
+    sha512.doc = "790ecebf49b308d43f6351b9bfede2ef2421135275401678b3fabf0f66ca8592c5ce6a7f97818d96f737be0e9851a68e953f82e8924c09e6c9d08c70772db195";
     license = [
       "lppl13c"
       "gpl2Only"
     ];
-    sha512.run = "ed6990b6c7a9ec4e72770252bcd07ad5ddf4015cde0129dc0a89cb95bc96958963209fe46f0ba9a614ebc0cdb358d8125ee3eb22b9a4249367d975ec12250a3e";
+    sha512.run = "941c3c40dc243f441e7786ffddcfbe56a1eca1db298d9c00023d345d0a7294e9738620ad8c34540c94730fdc16c06161ae588484ed942078b5e66f521147d1b6";
   };
   thermodynamics = {
     revision = 77280;
@@ -49192,23 +49339,23 @@
     sha512.run = "ddc80b4de32524ce76fe34e8f88d01e2db18a8bbf60a718454a0303aea8082fc2e495c89c2ad0a7459ed3151e890e30a1263267f249581e24bac87113a5fd266";
   };
   thmbox = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Decorate theorem statements";
     stripPrefix = 0;
-    sha512.doc = "ad8e0710a15781eb3164527dd16ecc2050d3cd3317c386841ad8612a9ebc6055a1501272e3b01bcbc6a7f1ffa80455bf2ccdc0cc9ff4428c9688e9f6404a16ff";
-    sha512.source = "1b559b9286a97c3157d568982513541028d96cfd5d67ac541909586251ac3729574c23a05ebdfc42ab06a92ab2ea0cef878b1f42983d06fd48f825962de57cb6";
+    sha512.doc = "167abc4fe0df70522c797c5c1def8775d403bd7fca4a3670f96d3070a95e80d5482e08d2f30533ccaf476285ea2067b0784b001b221f6ad3ac0fefabd1b25d37";
+    sha512.source = "af82f05595d33d10f4f718af0826775ab70e72c3de0570c340ce70e43a439c45b06245f59bf1b0cb2a2872ae339d03ddcd7a2e36a9eacfa08d7375bd2a664991";
     license = [ "lppl13c" ];
-    sha512.run = "83ceeb0cf84ff75afb734f41be5a5309692c6804a5a20627c54cc8760f8ac5e205cf1a24097c8b8624823668796092d620f5ffbc488f63b87e7cbf9365279aac";
+    sha512.run = "64a0d4e9ec14062321e977a50c6883a3da95e6d1e9f61f2905e1cc5ae4f47e03bc86c581366c8a68f4680536cf356fe314d9834c8056e5e189c1c36f5b6ea122";
   };
   thmtools = {
-    revision = 67018;
+    revision = 77677;
     shortdesc = "Extensions to theorem environments";
     stripPrefix = 0;
-    sha512.doc = "939567cab1c401d0946de706105d23add703e991bf36dc58f4e1d40fa35b5b30b37a9e32bc2d252f247da1f1db654bf3aad460dd1882389c00a8e11106270840";
-    sha512.source = "a086c028394cff2fcb5c011d2a69627ce2f9651694b8e1596ece652111e88d43c1f1e358ae4c1201ddb0166180d6dec9eb14ebec8a05469636061c224c6f39e9";
+    sha512.doc = "2ab86b1cc4ebc8d9db4540b500fa49eeeff7a4d9c7a615a2a4653d098bb254c883a58272e49488c7c715678f289fe15baf005240372cf28f7bc5d62eda9a5f62";
+    sha512.source = "efbdc1fff932568d5cd098f935f92c9780c45ffe512278bd255814f0e3ee92d8e14d75c04f1b5d079121876139d53b89084485b13ff8ebf24047088bc5467c2a";
     license = [ "lppl13c" ];
     version = "76";
-    sha512.run = "7d150df3f868339c6bcccb2e881105d9eba11bab8cbbbf42d5a696a7496cfbb87f0ca848e5cf7a63239e563a75515b15d4acc4a72046ca9539c4597e077333be";
+    sha512.run = "453ea169e406fd99b5fe77fd8c8577c893ee2f9ee1c63cd78d15fb8fe548d54aaca4b1d975d7ce71d8f2f5e9040fedff5c114c6e9ded7b4f1324f7d4a0a5f4f8";
   };
   threadcol = {
     revision = 28754;
@@ -49230,21 +49377,21 @@
     sha512.run = "66e6a27aa277b45b44c156d408c764da5bee6dc540f2058a783f02bbe806c95052267a5ed79ea49b5dc356d0f03747e9b186542640b34753a693ecffa158a6a4";
   };
   threeparttable = {
-    revision = 17383;
+    revision = 77677;
     shortdesc = "Tables with captions and notes all the same width";
     stripPrefix = 0;
-    sha512.doc = "6b5eb1d6ceea740ec54ba935c45f03c2e6328140e86122a38b90d84e375382adfcfe14e2e9f56384f825c913140f01a1eb6266d2d46f6b813a34b4da652ee31d";
+    sha512.doc = "3e325f214770f87d6eaf319ca749b4c3c769fb6a96ab1f89ebf8bc75495761d713c13c925bbe8b634af2105d956fbb524439a6e24802c89e823e39655cc1e18a";
     license = [ "free" ];
-    sha512.run = "f947dd01e56f6f3db8a4ed0b8f3ec564a38486fcb27f30bb3bacdf31af8360590e7e3886cc00cfbab813213974f4b335ff06ceb521d25519e8b95e345a002692";
+    sha512.run = "5590a09a60e54c01ac629798e4c8e136e876a9986abf99a44607f36bc736b0f5cf3f5e4b817366a3665d0a307992aa9341530c25e78aab3853c108c651711bee";
   };
   threeparttablex = {
-    revision = 34206;
+    revision = 77677;
     shortdesc = "Notes in longtables";
     stripPrefix = 0;
-    sha512.doc = "3dceb0aecfa2ef09bc20250cd38dd698e35b2cd2a33fb446e78a39fa654899c4f6658a18b95b39a5bff2279a0cbeeda71bcedcdb7fa91d148290302b73e7a64c";
+    sha512.doc = "a7d7caeebc5e41ed68dc20582ec41224829d49253ad91d1c7825ae20f9273de46b63d821a9559ebd185157509227b2f2c2c3116d5a5b8a69f54b05d7f4ec956e";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "9dd33dcb7f9eebb9396a6a05ac20e9bb221260cd80f355b23f60a0466c64847ebacd8b0d19c75b3d9cecd9c522a8633468e7cc86121f7626141c066e12f977d6";
+    sha512.run = "e144e83ba94eda884006c25791e741c065007a776deecf559548e13295719b552d9df63cb2080a05c743956bf70545079d0350b9c61f6996de6087dd48303228";
   };
   thuaslogos = {
     revision = 51347;
@@ -49298,14 +49445,14 @@
     "thumbpdf"
   ];
   thumbs = {
-    revision = 77398;
+    revision = 77677;
     shortdesc = "Create thumb indexes";
     stripPrefix = 0;
-    sha512.doc = "867ba82b7055f90ff8f333b204b39621ae3621d5e8f7b8be787a037dede9731193f2339d936233ea5e64f581a17d18b427adf9afec4c6e4df59ffa8850accf07";
-    sha512.source = "605633e8a80fe96f37214fb9994db8566a6f98834990ef95cc2a61e8113f70269a73f641e8003ac5e38d994a9ec5073e2b5af89dab1f239c57b7de61660a69b6";
+    sha512.doc = "f9949205c7a688b4c04cb7ecbba6a0ed84e4ef4de4a83c95b3f8e1aea0e6308dca71470d518f034e529862b7ce99bbd0b3fec3a6a2ff6d88fb5946c91d6e04a4";
+    sha512.source = "1bded3298f31db9cabc6b78b1159a5c4773f5acf327ad917553f847b96fc4bf3069319b93ae32b213d7c9ec4f9c523831e72402a64c1f5275021dfcfc64df281";
     license = [ "lppl13c" ];
     version = "1.1d";
-    sha512.run = "fd089aa4a4ae73dbc2539efcd5306f80df3e34fa7d3d1e78823b22db09b0fb33a7c78634aacfc7baef1fd417b6b909c88ceb32cc5a3c623adc458b0c82998e49";
+    sha512.run = "3f9ec10cd653fd48134774dadd0758b098727acc4c8c283dd2d430f02130379d0c514739c6d64758cba72407129903d5783c1be4e94fca68073fadb311ff5c6f";
   };
   thumby = {
     revision = 16736;
@@ -49364,12 +49511,12 @@
     sha512.run = "6ae766645bb046c18c0ecaab4d567ed3b66800696a37e28cbc0100dd50db7d89e03b5f2bfb8073a1d819f552f81ff8ecb692889ab7e2cf28210474663d4943e4";
   };
   tie = {
-    revision = 73848;
+    revision = 77677;
     shortdesc = "Allow multiple web change files";
     deps = [
       "kpathsea"
     ];
-    sha512.doc = "65d07216a4aac3888cf413dc63fc0e9d7f2807c0bbbdd0195c020d6b2aea9c1a12b12c3efc097895507806588734a350d362def39011db765305a79ee050ea31";
+    sha512.doc = "608d6670cfc7c81ac28593d77bfbd1cc1513d00c58fb5bc3e913b5230ef6c6d7bf09892b451dbf74605b7016afd0210f67f2516a81575e8e136fdce43881d6d8";
     hasManpages = true;
     license = [ "free" ];
     version = "2.4";
@@ -49438,13 +49585,13 @@
     sha512.run = "edcb3f7fdfa6815e712fb2cdf43587941d4be0a558a29ad86b55edf1f7dd82df401fd88f28e70f2aa4cc2ab3622067412b6b4258c3b1faa855cde9c945e70ebf";
   };
   tikz-cd = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Create commutative diagrams with TikZ";
     stripPrefix = 0;
-    sha512.doc = "6e6aa226e93b604d8948d42f34277bb4504686163e18f870b4bba58689f0e78c03a6eeb3f939223d6d9da23f57777239d01221113138e3b64dc194415e42b8aa";
+    sha512.doc = "1279474e1d6f683a119ddd469ea9c07f7618867c066c2588ba0f9d713033b3c8950af8c8da8701b169e1af4b97fcb5d22feda42ca8d5de461165592e67fb7397";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "913351ec2f18813b6d660eff1508948997959ac7fc92d0aa2d1e79d2af84b5b8a2e96297e43cd3e58f5e0fc5c7fddd3ee5cad6fd9503f9f1aada8084d9c3c39f";
+    sha512.run = "d448c30c2ce96ccc519bccb7e4d2f3a9613b5b99af4a5553fcf7fa1c619c0b524f64b4fda2c0acc3bde174e6ee7fc312d596cc244322a5dfe80c228bb76a4813";
   };
   tikz-cookingsymbols = {
     revision = 75636;
@@ -49542,13 +49689,13 @@
     sha512.run = "0c4ecd55d10893ac8bca7b8ac38f2366f30cd989c5d6ab4dd501047f01c0285f8e4b78309dfce06525bf525cff77e2edd56429aa166f24b9a7e07586e3befe96";
   };
   tikz-kalender = {
-    revision = 77508;
+    revision = 77920;
     shortdesc = "A LaTeX based calendar using TikZ";
     stripPrefix = 0;
-    sha512.doc = "5627cf8c5baf394a32cec52995ba49d9e9fddf10ae5f971973833204026d6acf92e8a267cc42d414dbe6b9564aa7f29d96c5b49727d72167f70cbea35a77777c";
+    sha512.doc = "df5e7e9ab79d4e6f975bf871038f9dd7080b1e0196a1e777e5c12286dad1c80549d66cee7256d91b9e588f2e523a9ec519ebc02ddebe0804dd248620b76b4e38";
     license = [ "cc-by-sa-10" ];
-    version = "0.6a";
-    sha512.run = "61919d930633189bff555b21ccae7c3e5c2eb5bf326a6eeb3f1636063d5fd31de70032773240c47ceb740cf303adbeecff3a1ecc493dd140d4b13692bd960d1e";
+    version = "0.6b";
+    sha512.run = "af624e9dc49d5e6f404d96615e1c62a6e60a3316e891f0b62fe01b5c4d5cfe30802573a133680fc617d579c27c2d8333c3db43208368e5c427701d89465eedf6";
   };
   tikz-karnaugh = {
     revision = 62040;
@@ -49840,7 +49987,7 @@
     sha512.run = "7768e77322ba17ef8c8984340aa6e00e582e691897b0ee37bf3f17284fd4d5566ebe3cdd077e2f094e5a0e202282fea5c8f313032407a8f0f07a9780bed0cdda";
   };
   tikzducks = {
-    revision = 77080;
+    revision = 77677;
     shortdesc = "A little fun package for using rubber ducks in TikZ";
     stripPrefix = 0;
     deps = [
@@ -49848,10 +49995,10 @@
       "iftex"
       "pgf"
     ];
-    sha512.doc = "a553d9a5612c41927a43cc62e153614aebf1f90d37761da2adfe34ee54d4491bbb4ba7d31e59470c5841dbcf702995b3279ebeca698e1cbde6d70081fe6905de";
+    sha512.doc = "0dd71d03846746083373c1ce4d5d9d098c9462aa69494b0392a0fbe3903a7d392cbb803ac384fc9df50dc7bd4e90210f196df594c42ae774fa28979513875529";
     license = [ "lppl13c" ];
     version = "2.2";
-    sha512.run = "b24d1df72f215d2f018f0529c7830762ec9c27d6ab1580007150e03d4ab28b15077262000cfcaf51e2d2e66e4046dae7342ec6d9ef71a2a9807551d5e8b99263";
+    sha512.run = "873baf898b03d92c1d106fa4fd08e83c3e42ab5c04024c7e74496a5ddbe923480565f2e68a989d05a4ded65e556f072e901c0334351fbb502f085f2e0f4a5015";
   };
   tikzfill = {
     revision = 76924;
@@ -49885,7 +50032,7 @@
     sha512.run = "1559c739ee5ce26c531ed1c989a2d986ee6da05880e6dcb8f14018c71c638028517d1c2374cb452421c92f5d430d4560ae4463732926c56ff33407941e70ffc3";
   };
   tikzlings = {
-    revision = 77079;
+    revision = 77677;
     shortdesc = "A collection of cute little animals and similar creatures";
     stripPrefix = 0;
     deps = [
@@ -49894,10 +50041,10 @@
       "pgf"
       "pgf-blur"
     ];
-    sha512.doc = "10fe9e556953bd848d3604fd173dd810976efe9b447d45e64b3fba7e823ef4f4699d7e4caa9fa0b66cabb2985e60532f833e67fbf83a266520df4afb47f337c9";
+    sha512.doc = "0a56db567835e0b634e2f3f363f61b7ecd2247a7102cc5250334abbbe50ca40081095604fd32f4cea446f38ecea128351796affaca204c2bd9b9a2145649b1a7";
     license = [ "lppl13c" ];
     version = "2.5";
-    sha512.run = "3fd8a57e44003c41beb8ae664b11c0dd1d3eae35b8b631db38795659f3cddb8064cbeb00e58715bc69d1790c524c5ce4ba7f3f24e8d287366b023054e2060246";
+    sha512.run = "1293b6d880406ba844f40c0ceda0a2033d06cbfb5a32c55f3615d3f5bd0c27759fb8cf824b8b310e5a88377a44602611ef17fffe107c62fefddac7c1eac776a7";
   };
   tikzmark = {
     revision = 64819;
@@ -49968,13 +50115,13 @@
     sha512.run = "9da38e2e02c651e2f89a0e9ea917fc5147626026acc7302b7e32aa2cbee072f91311fbab73e44852a2c237290de76e560f2b45e88639936b542e6986d90a9b4d";
   };
   tikzpingus = {
-    revision = 75543;
+    revision = 78222;
     shortdesc = "Penguins with TikZ";
     stripPrefix = 0;
-    sha512.doc = "7374741baa44d8fba452492aebd7fda31a5e54a24f724164b827c0b7a8609db518076331645db2e6d6686f52ec4162d7b4f935ff3140c8b4fa70f8e2576d1747";
-    license = [ "gpl3Only" ];
-    version = "1.3";
-    sha512.run = "d145f43774944e3ccc3be6676a5a1d5fb97e65bcb6a0c9d1bf7630542ea2a3a0e84ba3f682e39447b4f20235fa80ac41cf9ef25246a9468e69db2d99361c8d81";
+    sha512.doc = "2f3ff9de2d11e2f8aa389b0030679467ab52df451068974e07c1a091636b3e559a1164353baf87b38752ba9b9d407c939dbb026f13ca2759c599229518068eaa";
+    license = [ "lppl13c" ];
+    version = "1.4";
+    sha512.run = "0aa244072877345c4401466d52756f901dc7adc0fb747943ceb07063b13a7f22d99e164467627a01ba6e22e08072d040cfd74d13088e607460b5d85660d75b3f";
   };
   tikzposter = {
     revision = 32732;
@@ -50126,30 +50273,30 @@
     sha512.run = "0c07a24aea43b0092610cda5878a7e2be95777f199c9983e0aad42d83c1a6bd96dd4ca4caddef6b61165d62e924033eb01524fc925fdc8a4fd4baf44f568eec6";
   };
   tinos = {
-    revision = 68950;
+    revision = 77677;
     shortdesc = "Tinos fonts with LaTeX support";
     stripPrefix = 0;
     fontMaps = [
       "Map tinos.map"
     ];
-    sha512.doc = "e7f6fa5253e729b602c1bde603e568d5cdcb953e2a4f1e478c52959d25f58f7678cd107466d7a99b459af70250076c5f16224e4ee549998356c1b1957aaa60cd";
+    sha512.doc = "2e2ba10eafc7606de355effe34997d92eef9a965e79d79b09db6b187ba419b362df4c7ad783021cc8b45715962adcaeaefb2348d0572d14be212c600fd99c155";
     license = [
       "asl20"
       "lppl13c"
     ];
-    sha512.run = "0212c5d1d87d1c73c66926a7bf06b2b62a0be51b3a03daec2086a15a4facd80e175ba3f4e23f486e181fb6d3910b77f7d26c28a8f76a9802b5112b010efccc2a";
+    sha512.run = "82915cdb9819adbfb9a18bb25ca236de3937351ca38ee4fa683480b7f292c2ab98e08707dfceb9a15237d26a6c4d8abde4afdfb8ae36d3d0dfd85001b0dad358";
   };
   tipa = {
-    revision = 29349;
+    revision = 77677;
     shortdesc = "Fonts and macros for IPA phonetics characters";
     stripPrefix = 0;
     fontMaps = [
       "MixedMap tipa.map"
     ];
-    sha512.doc = "213c4eb24943e655c03087dbc5a51eb3cfeff09ece1d31fd11f1734ab3b219db94cc8b5f4735f3d6381b79a5d6ee2cfe727acd17f823b21163e910c09f48e413";
+    sha512.doc = "b565dfe19dc7e105a40cf654370e8d94be66e008f8e9316af7dfb38c63157d0ea2561c22eff20f00e0bab2e60e20b1a3ece22d05e8417210be8f815d1f865d92";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "7919b8f5a416cab24c02675ee0a24c60f64e9dfb3bbacb416eb74e29badf6b4dfd8a0528cc8b38dab6395b8c74ec5c808ad84d3a8d4ae5e8212691bed9066129";
+    sha512.run = "a52a4c6862871061f5f6286c7eadd1eb6141d8ab022e69cb4e7567dcc2d0cb0c353dbc8cb207d8f70cd62d0a5d71018d2cc77edf434b5ff9503073974a8c5785";
   };
   tipa-de = {
     revision = 22005;
@@ -50190,20 +50337,20 @@
     sha512.run = "00682d70199d66b3f6a759a32a1cad6b14ef09eaa541cb0ef547d86fd512ffd525f2b53a8c1a7315462aed33148a0b769eea70c5c42213d0731a1034cd96d6d6";
   };
   titlecaps = {
-    revision = 63020;
+    revision = 77677;
     shortdesc = "Setting rich-text input into Titling Caps";
     stripPrefix = 0;
-    sha512.doc = "5b22152e9e3deedd0e6e19bff817030287b81849e76d0b926caec947e315e0ddef533cb911e0fd4f91346b0c6cd7cb87ac10f33c64e3dab6b70de09613949f1d";
+    sha512.doc = "00b4f53e157716bce50f479a7373a0b33e079723aa6f041c7779831d05fa185aeefc892bec858bd830efa772c18f550d2d41d2360de60a803b6237bd692be543";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "c9a91646115722f41a82e4010e2b95090447e66864e1b7cab57f24dd797e299568d3c5422b3974829112cd118c4e40a2b14c04eb0e141105fea7f6ef8358bf9c";
+    sha512.run = "0649fcceae50543858811df3a15f1967ea9730294b5d5941d1f11b095cc802e62b2a93c0c821f77e11be28f318ff433147ffd2ea2bff2905ae532cb7c01b4158";
   };
   titlefoot = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Add special material to footer of title page";
     stripPrefix = 0;
     license = [ "lppl13c" ];
-    sha512.run = "aee68d15213c20d9ba0ef6e3a95f111804e4438d2c80a6cd83ae67725c3174db7f38b0d4280b26f7119e9e1c6477a0aa04d3ee5877e15b05ff2742d94a720c5b";
+    sha512.run = "1791974251babcd8f241d37a4c7f289a254b038d4f2eea63a5546449564fa40c85a3c2078239f905f63a2e2f2d6c772b9675903f937c373ba988db85717e999d";
   };
   titlepages = {
     revision = 19457;
@@ -50222,32 +50369,32 @@
     sha512.run = "753ff5c116f102ebd9fe59ea0ad1e80a7fd102f55588f9454fb3ef43fd5478add2d39984638e112dfcc5421f5f79b4c34c8c15d47845273744b6960946ad1805";
   };
   titleref = {
-    revision = 18729;
+    revision = 77677;
     shortdesc = "A \"\\titleref\" command to cross-reference section titles";
     stripPrefix = 0;
-    sha512.doc = "70db133fb8a5fa38a6f0f82912d19afe84e0f68820fe62b3835a6d237582a32fe6c2ba5ad05e46f39540d52d0aafa5a88325e1050e6102164a5753fd9c68d6ad";
+    sha512.doc = "1f0f545c37b366a837807ac42e7833591549d5091cc1941f2ac97dea793c79602256bb0d6c80e3102a2a637ff174ee6a13bf46b6a55f1f334db684eea0fb2ac8";
     license = [ "publicDomain" ];
     version = "3.1";
-    sha512.run = "73905fbe96bc095f602339e0c943048d775bf2a89ef9de3b7149dae7b76aef04e5c77803555450d931f3a4dfef16f5e72597a4d06052d4a852623516edd978f5";
+    sha512.run = "7962e87c980133e5eb3b0bf85d3d6e29ab9d1b8f29c6ae28b87572cb5a32cb3f83ac553090231c51f063f499ffdecc480951398be090fe2c45d65b01f65c3249";
   };
   titlesec = {
-    revision = 73302;
+    revision = 77677;
     shortdesc = "Select alternative section titles";
     stripPrefix = 0;
-    sha512.doc = "db06c719281a91056972b04572eb560e93829bd5d62ae98a98296a5cd612d953619c62b33063fbaac422ad42fa82c3050eebadb1843e60b28715c6f11335cc2c";
+    sha512.doc = "a647eb635eb21394a61381d9d19504aaa5a8b9dd8cedbf7b28bbb70eb3ca24f2c3340e54db39127948eb11f8df7db8ac6d3bede5d3c73c5a8887ea36d326ab13";
     license = [ "mit" ];
     version = "2.17";
-    sha512.run = "40e89aec1b26b2078a4f6ab3a32366c11eca92e8ef6546be0b300d8a6aa5e3127a251bf6a9528e12298bcebce79433af7e3e935eeca5b1d5bac497daf263cc8c";
+    sha512.run = "83464dd56954f50ca9a7e4083bb7147b230ff908922b1703a6e0457267db3b746a993181965db0db2e14d342887d1f7fba46d5614c133e4bf755753324f62899";
   };
   titling = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Control over the typesetting of the \\maketitle command";
     stripPrefix = 0;
-    sha512.doc = "e69af16331da73c2a61b063ca4dc4c5f70f7958c366b06e96745a2bc92397f89210ebfe598f445ff33ce7705d0f0b56fc3a46f93bcc89145d50b92d56820f61b";
-    sha512.source = "1b32988678f184fb335c70ee59d47cc3e20a7ee0f1606495d77880aa915677ed4a885557a406cfc5f5a67878cdd0675ecad503a6457056d901b96124f7eb171a";
+    sha512.doc = "add196a20151913a2a1d0ae84f8485d6451ccc11d400dec68e131556fa76d064bb1053c2e7303d62e813ab7ea7a82b27b798cf87ee3dab6ae7b36b061df20e45";
+    sha512.source = "930335818310d789d8cb1a43624f31d2fbb35d028ff3f84436cb3cadc172cbde822cba41b768cbc6537864dfb9bb68c9471caac32b0f80cb981d3123b02ce802";
     license = [ "lppl13c" ];
     version = "2.1d";
-    sha512.run = "2a321a17b1ff74f57e7bf3f9d72d1b66a0623ed286c8aa75df6d55f1e62b214954ff38456f27f172789bc4cb500688656ab156609933faef67e62954d05d0ce2";
+    sha512.run = "0aaf1ce566e56df821ba2c6f317c1f893b25a603835dbfa09a47992aa8795366308a29ac5d37f9bb41b086e1c1ff3abde35061b316410d34e3d6d54f4012c1b1";
   };
   tkz-base = {
     revision = 69460;
@@ -50286,13 +50433,13 @@
     sha512.run = "ba4c220f4a53089f8e6cde73cbdd7e1b8eb68f4828217dd5dbd3360086bb946fbfc30a993c678bb8c6e4987579016f610875fb2edc796fd19968c3940a0f4402";
   };
   tkz-elements = {
-    revision = 77479;
+    revision = 78014;
     shortdesc = "A Lua library for drawing Euclidean geometry with TikZ or tkz-euclide";
     stripPrefix = 0;
-    sha512.doc = "c78502d6f2ce92a81fb4f258fee04fd210125dfc898550fcdcb9943ef00c29913b560cb8e9b6362d7d8e90d41f05701a1ee8025cd8263c7f5a0caee1064a6727";
+    sha512.doc = "a004a1fdfd34e17fd367459bbe8aa3c5a99a7e02add95f9a51d1e814e8a6e74347d1ea34842903c4b0b2c554e2ba3975d588fc855d046082dfaabef93bc75fda";
     license = [ "lppl13c" ];
-    version = "4.50c";
-    sha512.run = "9ecedfd05072262ef15e9e4b70e20cba9b65ec0761a839feab8f0dd804453eb9cf1d88999f28e7b5aeff42143171e42e0512c81ac9cff769b7f58d3bcd8fed79";
+    version = "5.02c";
+    sha512.run = "9655bcd862c2eb6544c37b8034cd552d8bbbe14cc8afae014521e03930d8c3c69ff2d4661590c1bee41185b118c2c57aeecc01d9c039093f12e4998a5680673e";
   };
   tkz-euclide = {
     revision = 77515;
@@ -50322,13 +50469,13 @@
     sha512.run = "04cf17f69862b2ec068dfc061fb019b54352cab3fdebb3111de3c28bf15047e06c236d979e9a9a92140c2a59ac9c0813ed7006d0411737b1f04f71c3a5916cda";
   };
   tkz-grapheur = {
-    revision = 77346;
+    revision = 78175;
     shortdesc = "A LaTeX package with tools for graph plotting (and TikZ)";
     stripPrefix = 0;
-    sha512.doc = "a24e69b61de56fe430c9a73649b0782c6c2c569322b186a1ed66431d93e0e2733057d236e3179f895c952df8decb04b1e5ca485615fc74fd0d301cbca98752d6";
+    sha512.doc = "0a52aa3312cfa0c4f9c9e4f2fab7fdf2198b1f8cc8b3c963f7d21957d51b2eb21f758296967afb6d6aa28d5096aa05b7afef8a2e9e00bb048e19c7a34b67252a";
     license = [ "lppl13c" ];
-    version = "0.2.9";
-    sha512.run = "3a12906bd2be467788a1b3b7b0df94486d870e19836e71e96c184c1b4c1c3fc3c357647d86e9b56326992d93ac13f0534db0d462bfe2d38c245624cc738dc685";
+    version = "0.30b";
+    sha512.run = "77223dc19b888a10749b1413306d8cdb630b34009ee20382535b2402504389d1b37fb9bc8766259e684d9a053c960562db42a3b478610261c312554619c24440";
   };
   tkz-interval = {
     revision = 76924;
@@ -50452,44 +50599,44 @@
     sha512.run = "1af4c036f72babbfed54534272f067721bbdebb59827cd2445911fad35a60dff470c386c110e6db8d66a95aa1f7b176ab90db61811d513b5bf8024a3fc567e9e";
   };
   tocbibind = {
-    revision = 20085;
+    revision = 77677;
     shortdesc = "Add bibliography/index/contents to Table of Contents";
     stripPrefix = 0;
-    sha512.doc = "1521eaf8a15038a2a0b6136e444ac38d6033071b305f6de6db6a5f8ae34625a5b8bf654d7a97b5ebdfcf4efeae58c41a7c9c17005552314928e315295766c441";
-    sha512.source = "fa8375bce4af25fec4743d0c0002f90dbad7240f7959ad843365b72502c8c2d2cc9047b21e01d68a6fc525fca132b3a4842481f808999cac40221af32ea7e487";
+    sha512.doc = "cc1f37f2d34886ef5f7053951d84d0ccb8fabf299a119d17e4573882474adce1cb37f6732a66aa6e97f4bf09e3566c0aa56af535094029cdca58668d0de2189a";
+    sha512.source = "1278df15d110062f51bcca1518e5936e70d46ec5fd94719d94951aeb2e91f83ea48e5b7621be571c2bfbb3f3e6b9e625fd5904cc1808bac5b7bee00a9a74d435";
     license = [ "lppl13c" ];
     version = "1.5k";
-    sha512.run = "f373d6c98730e60d06790d1a219df26e60bbddd2aaffc3aefc5877ae6b2c10c1a08e21dfef82cc591e1c6f7c014e0843ae30be948b7eb55321dc94cfb7b16aa9";
+    sha512.run = "786031b94d6fa3c469884ff3738ee202122d6224e9456c50cb7926711b943023e6eef8b3e07826f28b19224e640890cb01ce4a9de695e654382c740b1ca59d15";
   };
   tocdata = {
-    revision = 69512;
+    revision = 77677;
     shortdesc = "Adds names to chapters, sections, figures in the TOC and LOF";
     stripPrefix = 0;
-    sha512.doc = "6fe648771c02287ccacf991b7b0e106e9e3917e882993c6203314f97cb20d8e0ce873246abf7fe11d107a22cef0fdc02a7bc89278a6d0a14d48cc6838f17158a";
-    sha512.source = "c29fc710ccf0952570aa682af419d1fb2432a4825b9fc8fed5368f8004ff5355250df6deaa28d7168258914711f31b3f379fe7c9383255957092676bd36bad72";
+    sha512.doc = "4175e596e34fcbf0093ac8d1f350f370a8aa2a135c4a7a1b9ecb5444d16dc074470ca9f2875aeaebf915e0770ef561c86a68e9f5c2b37616f959b8c0b3753ea4";
+    sha512.source = "ae1d34f8d56c32dd31469a695e3e3d7304f7d2879f302d843af068328521ad97bc04a8500c3b83b47b49f61796c9430614b383572a5d327f4e6926087452485e";
     license = [ "lppl13c" ];
     version = "2.07";
-    sha512.run = "b1d8fc5f578eb9507e1271fb19d2e024b272b0c23fff4ca11177c46fc2ec69777adca4329960787bd52c8d9862010547ca8b4378ad0b8986c503576be2930cab";
+    sha512.run = "d566fe91480830da3360e95ff695162c88834d60534c14f461d3ddbfa2fc23562841ed61645d2b5392ba378e81750ed872c80c8457358d5557e4432140ceecfa";
   };
   tocloft = {
-    revision = 75878;
+    revision = 77677;
     shortdesc = "Control table of contents, figures, etc.";
     stripPrefix = 0;
-    sha512.doc = "494485e62e9846c38863bb9a257282e564e9ccc9dd65da099fd4ec99838ad859697609e72194d5b7bbc6d8fe690e2393eb347e6ba4c837a675fef2f0c9d4a6ea";
-    sha512.source = "b2d81f1e84ab597c510763d9080cdec5ca25b13cab3309424704dd1728f9427c1bc037ffab19522e267ac816b999df6f369a1a52e9408bf65b3d15c43b63e51e";
+    sha512.doc = "203a33dc2556547635f1083ec1c17d4c0639859030139722a6833f5cd0d93750fc7154166e6b15f166feee76423abc5ddbbf2642e7d46fe37d7e9255d464cff8";
+    sha512.source = "35120b4959a8f0d290e3eb4e739acc09db22c3bb5832c1ef478aeb22ead9fd48a185201c16d506d7f49b64d900c109f164d1b16369d9c5fa64e1956ea4485d2a";
     license = [ "lppl13c" ];
     version = "2.3j";
-    sha512.run = "fcec76dc748e5ec770360c1bc8628f7439d185bf380a06d223d3e4cd404d4204404a0dfb79217fce068678b2486a3df45b5baea1439608c39ad312fb27551c3c";
+    sha512.run = "f31cd551fb826dad8000b91b0759e1b5fafdb9719c178a9381e2d13b23ebbcdeebd3009059c5c31f526ad8a18a41b5a688c89bf50fa82f3cbb0833c90ba898ff";
   };
   tocvsec2 = {
-    revision = 33146;
+    revision = 77677;
     shortdesc = "Section numbering and table of contents control";
     stripPrefix = 0;
-    sha512.doc = "9247adf45a6a8f18e03d7b93ea8de8decdd9f1ba15eed7ee28c356679a6f62bd8607b9c519448bae2234cec15b76a5155ad7efe99ceb9382022988a29c2ee85c";
-    sha512.source = "c6af924f3d8e52028c7bfe7e27bab1420dec1fe6f3e948b09a131c65a37ec8e9baa594d725a4eca7b3dd10ed19ceb5f54f1ccae49706e9816c7e4e1d9f1212c0";
+    sha512.doc = "796db021ab39dbf9c6698d4e03c41b69cdc77c8979525bddfc7bed5b144d58d2582b0d491b198d9bf1f6430051a7cdf619ac32f08badf94b20ef990698f85e7b";
+    sha512.source = "1b2bf87de3eff7ec4ee584d7540a6e2baa3cbe0860b94c124821f7f4fd90cabf2fb4b1d6760abd2e6adeecdc5ad942d1fcd23865f0a36014a95ecb9df5ab6174";
     license = [ "lppl13c" ];
     version = "1.3a";
-    sha512.run = "685ff581b0cba155a763ba951b4f5b1e12a44741dc5245967cc2d2effad12127828e4d2f3adabb9fe3d126ffa1f76d43dc196b89faa39745ce85a7f96fb44017";
+    sha512.run = "f4e1d53b2b149737e71c821411f8a2ccb61a70e513f0dbf48fa912188a3245b9e4d6b9f763804bdf8ddf5ae9935b9ed3fb828c988ca7033eee6e6e1670f6c495";
   };
   todo = {
     revision = 17746;
@@ -50502,7 +50649,7 @@
     sha512.run = "e3cd06aa47c36344602a0dccfb48e43c0639cadcb91aa9e787d552c6d3ecca95da3b0f3af8d0f479caad41f657bbcc30016dfd3f80f42285fe8ab02e0a904601";
   };
   todonotes = {
-    revision = 69319;
+    revision = 77677;
     shortdesc = "Marking things to do in a LaTeX document";
     stripPrefix = 0;
     deps = [
@@ -50511,11 +50658,11 @@
       "xcolor"
       "xkeyval"
     ];
-    sha512.doc = "e5a8937624df00f9aa487d43a449c7ff6181219c4dca0ee559b0a10c6fcdf83eec55f9afec7d43721bde0f60c0e8e3eeba55d85627be3af5d20fb9ea45592c30";
-    sha512.source = "2ed0f6f85b777e49fb17df84ec97a7b4bb01000de19a578d28f5bdea038a13f360598f3e53b66d20a1584d483297e55df9b1be91ed016cadcc1e8eb9c00179ec";
+    sha512.doc = "939957efcf2de28cb924319e40edd6c6a4895784798c4a7a89f8f3c838e9d87f93a69c253b9daf48d8ead9f3b8241b211a4dd33ca4a16aadf974032624d7a1ea";
+    sha512.source = "02c05e2d26e579e7c2fa6b4d9fed2e14af013a90810262aa582c1a3b849e51fcc30a01330bba559f2b7c61596f4b9c958fc402388e6b75f53c3b8ff354c93715";
     license = [ "lppl13c" ];
     version = "1.1.7";
-    sha512.run = "6dbe5b58d44d900b7beceaf265fc0ab227e3f4a56a1f8c1ff4f186df0657a3fe0f674bd60411516e54d90627ec41ffa38d4bcda7f5dcc69632892ac2f0caf96b";
+    sha512.run = "338fa335c6be903e5c53d071a5fcf9f347e7cb016f14cb0b912f560148db815b34cf63195887bca5f220962e64d13d3c29cb4fe7c813c26dc8c606fef68d4a1a";
   };
   tokcycle = {
     revision = 74841;
@@ -50535,6 +50682,30 @@
     version = "1.1.0";
     sha512.run = "5174ea1b9c6c02fb8245db5315ccc7b65239d1343f719ee23428bd530dfd70edf26822bde25d672603d268a63360ba31b4a9fdcddf426b82eef440cd7f449d8e";
   };
+  tokglobalstack = {
+    revision = 77964;
+    shortdesc = "Dedicated global stacks implementations";
+    stripPrefix = 0;
+    sha512.doc = "5469d8228784db131c18aeaad1082a120596e9fcd7cf96491d7b3ca9c21557c5feeb44c9d0902591a7a1fed1d57a21c07f162f1db5a9346a28627d5766af068e";
+    license = [
+      "agpl3Only"
+      "lppl13c"
+    ];
+    version = "1.0";
+    sha512.run = "b95df4779ac7076559af23e85818dafa50d50b57223e9573d56aeabce43a915c06a9bbd6709861ee249323ffcb86446e9078c71022cd1630662fa0defb3f08d4";
+  };
+  tokgroupmark = {
+    revision = 77963;
+    shortdesc = "Restoring tokens after closing multiple groups";
+    stripPrefix = 0;
+    sha512.doc = "251c3aa9d7fbf94aaa20c19e0d841771f62eb2815de51f09889010aad244022d645be83f57eefaeaef8d56d77ab2e05350cfa84280d30848eb8bffe293f4248c";
+    license = [
+      "agpl3Only"
+      "lppl13c"
+    ];
+    version = "1.0";
+    sha512.run = "f7813cd69adf87037580c01d3d1889987840d34848b23cd5678f97635dcdcf54c3632b5b0fe0f5987fcf1756d2b6cb0d1fbd9cbec83ee6f18c5927f9677ccf86";
+  };
   tokmap = {
     revision = 75599;
     shortdesc = "Iterate over a token list expandably, without dropping spaces or braced groups";
@@ -50611,34 +50782,34 @@
     sha512.run = "68f194a9c3ce9fa8c21e82ffe4ce481fde9e4ae27a7e9609e9f5f2c911f4142576dfc5a6265bdd062bd3d6747e5069e4ec8affce5d6be9285c150a7854a82196";
   };
   totalcount = {
-    revision = 67201;
+    revision = 77677;
     shortdesc = "Commands for typesetting total values of counters";
     stripPrefix = 0;
-    sha512.doc = "2fb61446efe5fb3ca8c80099d19ecb7a281ea2ebfa756778e4bba8060e9331fd1b712b7b77c66ddbd3a5b60451d6007130803b6138f1eba466a5f210c1d3322d";
-    sha512.source = "be9fc65fdcc7999279b5e4c5b495fd7fbab4606fe9f6dc96a5683ef0af41ac8f4fd8c3f5d2470224304a1bc974a6a9b40a7c017049507a7b6ad8db15d2dd2724";
+    sha512.doc = "f077664e05f6988b70cdca30a7540bcbfd8e981408370a63643fe28970f3eca649ffa22f917a6eba9882a81c824942829dded2d9e5e9182e2f846e90917728fe";
+    sha512.source = "97aae2394ae02a9863fd060fd89a121486f14e7c3c452015b42f6c9766e6f19100f0b4699d5da38792331b2dadf574b07afebca9f1c26a31e086b2ef3e674e03";
     license = [ "lppl13c" ];
     version = "1.0a";
-    sha512.run = "71523dddd67c44f4ef53c14833d4ea3f70603cc76f0495e5533e68eec99b1006796796b39deb40f6b36dd9ed03102ad859a7032bc6dd65137fd19c23c4027a07";
+    sha512.run = "aeb27866175926850082c1f64bfc5566cac2aca4fd357bbbdc49d80538be6c006a9514c6157e1911badad10f5bfa250f8407ad2cd479e6c80e2a339697cf5204";
   };
   totcount = {
-    revision = 21178;
+    revision = 77677;
     shortdesc = "Find the last value of a counter";
     stripPrefix = 0;
-    sha512.doc = "46ef8cd2317108d0896b32ba9104c69fb34a6d13d1e123d6b8f1648bfdfffa6bb21f17207433dd763451b1f6c104ae3532e7aac43ef2ba73281842f0a3bcd05e";
-    sha512.source = "1820b0b44434650c072a67a4c6144beb7a34129415a4ae298b9c97efd7e81d3396ddb6e4a03081a19962001c8c01a4cdda563c20ba19bda1411e4832d5e7fd14";
+    sha512.doc = "f9e1cbc6288f6934df994ab126208a7b5d28ac114857250c417324300f486e1a1705b4dea537320d806a2cba963edba91d4fadb15440b798588a0c5bd64fea91";
+    sha512.source = "86aff6f6be3beb86058d530e7fb66df7b06597be4c25e39bb57248c57b3dbd801858e1d584fed97225ce8bfb69e748160e09d98ade58a44388276b204bc1ad69";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "03ece717c7db3820cf41192e3bad2711e159fcb8a5a5a185e1c55335364917a515d9dd691cf1890421a8c62c9e55bdc49cb13718f7d98d9df34a2470cfff0daf";
+    sha512.run = "ccd3390174fb88a6ffc71f39d987313abd9dd86cde1aa6eddaa3b7433cc6c180f64c3995258f02fa9bada11ca1271375a53b4e8033ce19fa30d4575e6b64c04b";
   };
   totpages = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Count pages in a document, and report last page number";
     stripPrefix = 0;
-    sha512.doc = "58cb9d30644402a68462e0b00b6175ec4a002135eae0bb16ad2cb5b919d1dd6b93583074a0723e1c55946e7d94dab506b8527a67d7d7b39be20608207bae5626";
-    sha512.source = "2ac7e8e8f7b79721fdbc6cfcf9d5d81d80b64f60a535435ec13335e1b6059c01001003ab87d9ab8fff4323575a0fbaf6e8a3569670eeb5411be495d9fd712a1a";
+    sha512.doc = "85b86e37876dfec48070b942ce81d68beac52e6d91d810dfd78d8e822c21af1bef66740d11d97b7cb7fedc0c777c0f826369d48a69b4d35d1f281a3aed7b6cb0";
+    sha512.source = "096e9db7c28ee63cc56d35e291fe8de0e963d4920884913894554fd46314d026b1be783a84c1120d406496af6b7e65c2209bbfe5be1d536d9cf164c741207ec7";
     license = [ "lppl13c" ];
     version = "2.00";
-    sha512.run = "8dbfcf7728690d6c2a20f661daf62e80c00d3f08fd00aee7a07cbddd31f6adf8f38e32623b2963748367ea08dd3c95919ab576b22d70214a2f5f4f07c40374f1";
+    sha512.run = "6ecf74edb33f5f3309f56fe5af9eb5d9c8dc9070020ff2f8c9dee9d3fb470bdddca92a03669d4cf26b7a960879dc3dbc41e06694d49b445f1edd16f0b154ea56";
   };
   tpic2pdftex = {
     revision = 75712;
@@ -50671,14 +50842,14 @@
     sha512.run = "a99a9627d986626ecfc1d6378214f8525f12cada984de0f8881262e92eb71d87d0932813d3a9b85a798f0fce7ced9d06416e494c15bdb49ee54f2ddf1f4f9e98";
   };
   tracklang = {
-    revision = 74576;
+    revision = 77677;
     shortdesc = "Language and dialect tracker";
     stripPrefix = 0;
-    sha512.doc = "4410db03472b5c14c8ecffdb492ebb158d06266632e3e270e68f5b7830288880b5051d4408a59837480e4348dfa123d53646911e7e70c20d2b6ca0378c525f24";
-    sha512.source = "e15564438901abeab703a3502a27084e18313366b3266eb6ee272dbe5fd429dee55b1ba8bdcf776233bec57d4dd24586732663c1e850d701b38d2cc2a9fbf4da";
+    sha512.doc = "77dfdc4c8f97f5de34d29d068a2091aa7fbf17972442f2c94c04ad1dfc78afb288d1def48dab1e35cd7170bfc9c159f6ba172201e0711cc2fce6b00c1653148d";
+    sha512.source = "b48c327a3d838e433f870fc88b8a12e863f3241ff3362a3641ba5e2e07e023abdcea0f397b135464975442008ede6b2be4d5c9153d5750d7884bce07cd09fe6f";
     license = [ "lppl13c" ];
     version = "1.6.6";
-    sha512.run = "3aece7850f88053d583d6163db549662fea03fa84410a5cd9f1e76f4e508bdfbae663f36bd87eef39059fe2bd4123c6b0bae804237029d8abcde9c02d3c873a9";
+    sha512.run = "047e75ddefccdf54ded3632b8727dfeb6daac408f7bf7e958695e26cc58c246de910033f9cfc60079cc0faa8c91643e83caafd7dc1a9b3cb743e26069e1f559d";
   };
   traffic-light-protocol = {
     revision = 76924;
@@ -50691,17 +50862,17 @@
     sha512.run = "e73f536ece311b56517f6798de462ed040c38aa2e0ac59d9e0c1c7abb44729cbe1da1f3b5179983c8a144e5e1ed64898940810de4b45d9c015268e32b962115b";
   };
   trajan = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Fonts from the Trajan column in Rome";
     stripPrefix = 0;
     fontMaps = [
       "MixedMap trajan.map"
     ];
-    sha512.doc = "c6b6137d1952660b99bf077eae0ddc0f40b4ea9ff6308e4f461fd0e34c7b4b35b4ad79f3e42e4d0077c9d2947db642d0add032f2413d580748ba786a8abbf029";
-    sha512.source = "36b85f870cd9b006f89df594193877a2188635be840636ae9300f511e5ab2a1ea60eac7f927ccb3e9832ab01972bf585460b47cf7ef30f36a6049ab0ce0fd95b";
+    sha512.doc = "cfbe9585aa07946244570d4c8ec0281f04b75b089ae83c9acd8209473a924f6af02ac84cfa46ae9671b009897fe2e0996d22c327543dbf729bce40bac380994e";
+    sha512.source = "298515ad189342ca654b56dfd10ade17e9a1a7e1123578a2e37e07aee78489029cb695a2a6633b005346a2012ab90491e0141432d96cfeccefa6a3df199f7b56";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "66fe869b94f489a3240078fa28da32fab71767d93befefca62fda3a39ae53ab975b13b7ddf84e490658e915c100f16225ea0ed8e7787b099bf4cb067a9fd4e09";
+    sha512.run = "af55a7d7b29efc37b7daaabe0d4610a5064a54342c9600d19a05423f20d7f8f6c8ea2cf723df8f452b7a070fbffd41cc02a042f957e76c9ab5727b045ae87530";
   };
   tram = {
     revision = 29803;
@@ -50810,35 +50981,35 @@
     license = [ "lppl1" ];
   };
   translations = {
-    revision = 61896;
+    revision = 77677;
     shortdesc = "Internationalisation of LaTeX2e packages";
     stripPrefix = 0;
-    sha512.doc = "ab72edcca1d3407eaef679acd3f3d2a49f559e5ca6d9d1ad7221dd76152560be307722155cd4da54215e3b7f561f39e08ae737c70ff2e7fea1ddce2561b506fb";
+    sha512.doc = "9701c698194313185a2fa003fc176f30f3f53f929df587a9b270d6d5c8b7642b21ff8b214f7189832c046293324fea29cc0f342c5da09204f19915a6c1a34fa0";
     license = [ "lppl13c" ];
     version = "1.12";
-    sha512.run = "82d2a821c42bda66658f8557d85f2c52bee6324c88cf44e5440cac4de5bf7e938a3e37f7fe2371069a923c1f3fb794f8860274765054f902eaba560ea195297f";
+    sha512.run = "1eee9284070bf286bd020e152eedd3d7492c6b91ed9d5902b2f6083def14b433aa379235daecd9f9c93977acc3cc87c56fa36c4cf4cfeb4dbac3995d8469d9b9";
   };
   translator = {
-    revision = 59412;
+    revision = 77677;
     shortdesc = "Easy translation of strings in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "abbe08cb16a39395b53d01f85172a11e339cd18f2c7f9dde8ab1d0cf353649c181f442fcb94c9add913b2b807ae9f6ba1ac54e9a6fed147cba1af335b6b73d8d";
+    sha512.doc = "3d1d651200db1cb80c2eb488beaac2178321a8c1618107968b7b12f9f5fe116392ada28b687b9e69c02d88ce3ad0133728d8fa0b9b2e088883bc7068265c90e9";
     license = [
       "lppl13c"
       "gpl1Only"
     ];
     version = "1.12d";
-    sha512.run = "5700b0b8a95b244c93f17c5e1bfc74d4defec842892eec358b308dc55f45ffd5bef050a1ed938c9100cad771ce5ccd53bfcc917083a9ba23a60a3b339d241f2f";
+    sha512.run = "8765e56040da5b5598d5c00315e2424803c9b0da3ea5999eca5238ca0b7caa26581ab33313b1fa634523fff18867f717aa037959138d3285a9859d7799ea3434";
   };
   transparent = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Using a color stack for transparency with pdfTeX";
     stripPrefix = 0;
-    sha512.doc = "08462195fdb96bc8e0273d0461d311eaedfc9bbe70aa5ac6635b4986d0c654d4cb0541956e6b2ef1a164f12e30bedf8f72a4324729ec1eaf330b2acde258dd6d";
-    sha512.source = "56f4ebd8d2c01c5d75dfec6aec12048b4f28318828a5478b4f063ce3352fe1531110266e649b7e382a10cb4d6446e7b6ea8c33cb657ae90104c381e72108131e";
+    sha512.doc = "bc50cb8136d10c3b3b655e820c5f1f4661e4665c9d5055f5bfd08afb1c323ddf472f19a1f39324fc32aadcaeefa42360b2fa310f6a190989a10bcbad9b85787f";
+    sha512.source = "432390ca4287703adcf0896124d2f504417ba71de6966b298ff1255bb7f3f20946382ec459e5a0972208895c1bbc35d95da1e62efc4d8485c884e2fcbaad1da8";
     license = [ "lppl13c" ];
     version = "1.6";
-    sha512.run = "6feaa0306ac3a7cd4c15013631e9b17cff3369e35e5299531addd1062bd0666539aed88730a99eab4947abcc9cd79000c719b4be9194e0a385e21554b0cfce4f";
+    sha512.run = "af16c68d1040058d2d176cd26687a2f7a5421ea40a2c1baa33661a5a80b23276d3a2c6aa9c525aedd4b2983dfceb9844a2d6e4ddea8051376517d2372e335158";
   };
   transparent-io = {
     revision = 64113;
@@ -50892,24 +51063,24 @@
     sha512.run = "366a5e96499bd96d2eee38b78305d9fd7368d0b70f91acecd5a5337675002808a5695a525d011a1ab7b31ff34cc14c469970a3fe55c694f003d0ba7002795297";
   };
   trimspaces = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Trim spaces around an argument or within a macro";
     stripPrefix = 0;
-    sha512.doc = "8e26064de0c14d6caa1d6cf625cbd2d598102056136dfa20d0a7ffb178c26829db0206d87893937b63f83171744a29bea3567e16e2a7a0d454734a0b72837277";
-    sha512.source = "a34429fb9b8514d25ac523f0e3bfdc880b84951ff228ede3016e2d29c001b7f8058755870fc3c63e6041ef4768290177dabc6d520157082fb077497017065b65";
+    sha512.doc = "797376363ffdbfa42ccff94a8b46ba09f8ba0a41424b5cb65a3850c66d9306ef85af2733feb16bb19cf8db4f0b7a01c40d542fb9d6375dcc2c89085bb0296fe9";
+    sha512.source = "87ad2cc6a96bb76e58a775e233b1f431209c01aef709583a6855524d65c2d83b9b281774a0a4ae88e2b96bcfd6acd296c8a140c713a7901f9f2eb5cea580df69";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "09bfe50d1b14502311aea7a20df80e70c1907b1c8443aba9453aa0a3eb76cbd34728734b81df63bd5895a4a5a55ddfe6d0feedf7d5d28d6b5922a374bc550c9e";
+    sha512.run = "6e86dc43e84f957b7522d0a6d9eaf11f0f041a02f1a8e833ee0b550592b3d6c4aba79b14d1b7d129e597440db0029bac1e869009905be63bae8197b54984f105";
   };
   trivfloat = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Quick float definitions in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "eb9fce19c495eedd728e87bf47f5d925a685a8b9e81e8de0e6c317f74af6c82352f403486f5a904849ed418722d830ae294a89eaa57bbff59eee8a03cf9b8af8";
-    sha512.source = "9537944503c1606151207e75dd7a2bad64b34f82bb23d83e0eb93292ea9ad9edd0bd72a126de588125b6b425669f657506ca602796b6e2dd2997052b70f60dc5";
+    sha512.doc = "476b850541bec61c1b4ba4060164e9c12d3417435ef86562046137764548d4c65453b8c1b32447b5c8cda4045badc817cc44aaf9eec42ccb7f5f5ca86f01eff2";
+    sha512.source = "198d6bb825e8e1f14fdc71847a07e3382e167a8d5ce14692bbd3a57fa7c017bee2d0a5b98d94a529cce1a1b1327aca2570a7477589511d8ebae6afebdf40eef6";
     license = [ "lppl13c" ];
     version = "1.3b";
-    sha512.run = "25e07373c53a6d4c92a5f2f19fa0d70c86202435863b8b3cd036f2d12f74a477a33cca6508794f67256a877117bea821a11b9bff235e1a894c90b71810bbcca4";
+    sha512.run = "dec346387f15992e07504a5c549e59fec96dea1ea3753a311dbb67e92af1a713d217c7388ac61420b23c1a34e2198071becee876d3262a9cf440158ada09bf86";
   };
   trivialpursuit = {
     revision = 76152;
@@ -50931,13 +51102,13 @@
     sha512.run = "e571d1c0c042e2fe75b992c6e0e9e07b04f0368f1e74a51ba91c34a642be148fb817027931ec35831672970725377038b5cc80d34bdb716d936f4aa59075d83a";
   };
   truncate = {
-    revision = 18921;
+    revision = 77677;
     shortdesc = "Truncate text to a specified width";
     stripPrefix = 0;
-    sha512.doc = "78e9a96fc2e635237cae9ab4d7ac30cfee8582dde13331800ac9079d1e0726c597accb598b5e679b6643d27b2a53fb367e740b76d59e9a5d27226a4c829e8518";
+    sha512.doc = "b7df5796ad81b5cd457e3a4879e7f0c586c62516ead7153d8ace625eb5cd762d78d3ee80a6b5aff6ac1f7a47b57b69da048fb23b2533149fee0dc4b491294a89";
     license = [ "publicDomain" ];
     version = "3.6";
-    sha512.run = "b676d65803577b4bce5f6240a0d05a306199f24c2b14402954f4430f07fed9a8af574c4cf9cdc233824bb1a285eee0c531aa40ae31c782a43afd678d6e44f27a";
+    sha512.run = "98559f258696671ba176e7fe8349335287b1b7d2021efaea0c54cdae055b0bb3a0a09787e73ba37beec97e6fed4a4cfb84bdc38dd89353976bde9f736581060a";
   };
   truthtable = {
     revision = 68300;
@@ -51027,7 +51198,7 @@
     sha512.run = "4e17b12a82a18bb1f4babf123f1e84681c6f9524f2113725f14ad85042dcd5b1fb2aeaa45f709c1797512b8e0f35cd0ff743b60901e75676ec321f8bc682e793";
   };
   tufte-latex = {
-    revision = 37649;
+    revision = 77677;
     shortdesc = "Document classes inspired by the work of Edward Tufte";
     stripPrefix = 0;
     deps = [
@@ -51038,20 +51209,20 @@
       "sauerj"
       "xifthen"
     ];
-    sha512.doc = "11ac57e79a05db644235b6db851473c75d1538a1261d7022a63d9ab0cc54486cc13b7cc95c44d16912952e46bc9264c1bfb831a728b51a03495d01f1963410d3";
+    sha512.doc = "02fdaab8bed92614b42b1138ba1540b5e871e04cf71f82d7d7f49e8e3bb0c0d44ea825134522f7da9df7d2718bd680caccb4048557e3602e494e0c0b68744413";
     license = [ "asl20" ];
     version = "3.5.2";
-    sha512.run = "6dd01a5a6faf37439ca9aab23534f99050b84bfac16df48545417ee03e72700344c25b2de3262e8e28406da705d50296473a815fa14b701c609b3715f01405d1";
+    sha512.run = "066b85d737af8b9b70aed79db439c676f584e5ea0887bc6b7144deb9ae5da924327744eeb3199e08e8f94c885fc76397c51b3bf5bd9efec59e356c605b822379";
   };
   tugboat = {
-    revision = 77362;
+    revision = 77677;
     shortdesc = "LaTeX macros for TUGboat articles";
     stripPrefix = 0;
-    sha512.doc = "2918c1efa99cb2e298e34e5d2d2af5812e3d1430e7c392cea75307ea18d8f08052a9825d010b8d713c185eb855a3483992449d07eaa1a0051336351cd14754c3";
-    sha512.source = "233dbc4cbe1ef0bfed6a93adb6871167a9b5bbe3b3cce2e387e56a6262e0669081adba448d28d95ada27e136c77a4384e96beaa7c8f54a45a35437dd4e7be678";
+    sha512.doc = "5d3ee95167546a303e2d8d74dc774d9255cfb075ebcad731e6b5dd7e2bff93a88657a1b903a94944c62e12304f025465964620ab8d50eae19fe7caff3917c99a";
+    sha512.source = "36485247b6d4fce49de9dded2f32f6032ff58f4823eadce7d6c5fe69e532d4057852843103d5d5960773a0457edff54f6f832f29cc44b01127942d89cd02d22c";
     license = [ "lppl13c" ];
     version = "2.36";
-    sha512.run = "fea85f1bf6d01f205a58c62a8c372576d0bdf96956a1acb383666251472f84c9ffd748be47179bb11dbcaf5b4bb0402ce4d08bdc138a9b8cd9d3c03ffd4ea277";
+    sha512.run = "66a889505909956ac7ccf861b3c49ff0bf71dcdf2a3513ca36f9cf6cf88f07fcd501909bc4708886086ef0fb835e567d0bc4a4ea0d908471d183669429d2827b";
   };
   tugboat-plain = {
     revision = 75521;
@@ -51072,13 +51243,13 @@
     sha512.run = "59e8af51c39984a42247435ad893c3b8e37eb9dc53634e0a5f30733ee0c973690b66d805079a0f5cf61762abe7fceb1f2dc91691df9be26f72a1a8edd2524ba3";
   };
   tuple = {
-    revision = 77463;
+    revision = 78222;
     shortdesc = "Expandable operations for tuples of numbers";
     stripPrefix = 0;
-    sha512.doc = "6080d76ddadf6461726d9caa3ad334ed97d8f843bcb2efcf14302a16cfe2c35b76d5add0694ee58d51b43cbec0c1c37d1a8643f8bedc9b75d1d5cd45eaa1bf1f";
+    sha512.doc = "5c35ad8942482549beb7fde14af0194b76eb4493dbc206306a47ffae8b76494e1513603324552e0dbcb92b60f531398da84b9d86d035662938ac84b66cd8813d";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "db736a880d617a484851d94aaadcdcd65b9aeaab89b8a0a700a3175b1695038bea2591182908b361b9ef2f6b506690222fefb021f5470c8d52963eb65f1f7174";
+    sha512.run = "9f308010acd66c47c7fe373baf467077a9a4185b87c8603100fa8a89ae6db17043afa6ae7494a1548091e0baad5fda97de5be3b3d6c8bd99e86158284e31085f";
   };
   turabian = {
     revision = 36298;
@@ -51098,33 +51269,33 @@
     sha512.run = "ebef1733d41cae66456e6a50c47ae0c66a7d7254a59e57f6af62e21cab73ae7a68092baa4706eb1f1e93ab152e0ab22550f0b4ce8cf9ac36eb3740530afe8499";
   };
   turkmen = {
-    revision = 17748;
+    revision = 77677;
     shortdesc = "Babel support for Turkmen";
     stripPrefix = 0;
-    sha512.doc = "39014c9049322a1966951a242152b8774b2bc914bd620b6eba8c97e8ec457a1ed3547f2c211b3bba333cab21bac98882dbc9a1e9028443e7365780cf4d78b577";
-    sha512.source = "1d69e90b8aa74db44b7b89c8a3346ffbfca2b8514205a04610b5049e50e61b19ef063d9b3e9c99bf4c141d52bb03d600ad5ce1a13494b06fb7d13d12f47b860a";
+    sha512.doc = "883bc78d0d27bbe33b5226f4f2c37143dd5def195eba0f0b141d0a24da105eb813746610faf42c0b401c9baa2d87b4955952b9d7ffe7d605559c330f8914557a";
+    sha512.source = "dde02ec459123622e7b391a28d43ab6e7c2e2d6d07e4a14bdc95c0c6767fc2922f2e9f8aeb22c34d9d6d7bd57d3d317f3188157cb955c30650979598459b05b7";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "437ff775642326f25f260280ca8d846e546f0f4b3c3082eb1ebaadcfc6ca5196967f82a00237367754b3ff307f983a828dba5c8117539d65634379567062a377";
+    sha512.run = "c151e8d2108076af5175883e1c8b3fdf49314477c3f44607c5adfb4b269eb67571bc93fc953816c6d2be27cad6f4e447df289e907fa94efdda7e2299cd6a3cf0";
   };
   turnstile = {
-    revision = 64967;
+    revision = 77677;
     shortdesc = "Typeset the (logic) turnstile notation";
     stripPrefix = 0;
-    sha512.doc = "de25995e56ac3fd556aa3c50e8b041b201e2f881d38ec2183b55c5799bc0f110e12e2daf387dc9a6d72a9a85377c6e4c1610f6b54811abe617e8698a40e659c0";
-    sha512.source = "3364a27e7d174249212280536479d2ee32ee37b22f7c942858b023d9e7069c82ba80120c7d9eaafb90312dc313fb783073f08a2dd212d5ba380a386081abbc81";
+    sha512.doc = "94fe317ecd6f3b170beb53805c0655e86ffc7c8140af2f756f3afad524db55e89e18fe0b30196053c704a1704c39fd64ed55900c088bf3038d2ae6dece11333c";
+    sha512.source = "01acaa1d432470119e8398e81ac4412a7728c3b9777dfff6e6ac2216fd0dfec981fb1784a48414251fce22b99314146b7d06ab43161e20fc9055de5a0bde8140";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "164b6b8f053b2daf93e8253df850c4aad793521848a93053f6b3879db5badc0b88b5f8f44487e5525c60e7ba7deadce53b2cecb00b7330b22b0815e01cb68338";
+    sha512.run = "9ab6beeb80a19f48c217362b20264206613e4d77806b9e841b55bbd2f43b7aed9f00eda016e2474d11c3b4758876b7a7db443ed76cf4aa3a0917e740fd733a5e";
   };
   turnthepage = {
-    revision = 72902;
+    revision = 77677;
     shortdesc = "Provide \"turn page\" instructions";
     stripPrefix = 0;
-    sha512.doc = "4033467f66fa676bdde4cb208bf183565542772794115e40fca77c80b1cf3d07acab7a757d1930443c6ab99c474465bfc66928abb1ac45bbe6d1459386174608";
+    sha512.doc = "6d7d3a9debb5b1f5ab4043c2f97484cf9ed1274b2510745e0064a2092f3d524375f0deccbb538d51220a7466516cb56bf909e0315c9ea34de805608275f59f82";
     license = [ "lppl13c" ];
     version = "2.0a";
-    sha512.run = "b8be9a4a2026969c424dee2bf484eb4030800aa960d3a77a9ae2c8dd87e51907c0b3fdf0e99267cfce98fe8a920f9504eb7a16b7d93e2ec74273148ef7f0138f";
+    sha512.run = "010d94fe32d513d8696bbb4c040e0b98bd60e6dc0de978b081d2e935f26b38f81b41c0d4b1fde79459efae258ecb76d5b2936da06c8ba462ab9ecfe67c39cfba";
   };
   tutodoc = {
     revision = 76924;
@@ -51158,17 +51329,17 @@
     sha512.run = "2c0e315884c8aefe2d67f56b749eafcb9a169daf2731d85ff1ba8c139363630ae66f7fb49cc67ec1c7a6dcf30fd771615b724c4afbaf1a0e5b4f1e5dd2fb8f23";
   };
   twemojis = {
-    revision = 62930;
+    revision = 77677;
     shortdesc = "Use Twitter's open source emojis through LaTeX commands";
     stripPrefix = 0;
-    sha512.doc = "3f2f3b13f898545a32aeccef972ed52c448f3547a6834c8cc1a5589e2ff8479b822591d20acdc41f1cfaab1e43469d75abfd0841baed7b1a1dcd4000b87d1045";
-    sha512.source = "e9c85a850603cfc49b5ab4f5c51a303dae326a3e44af547c5c9e77319422273c762facc885b76234e935c82b217e53945af524ec9e9431d834ad6645265f78bc";
+    sha512.doc = "f52e363b304541adbd978083959b105af5f905fc8c396a410e85019fe7f34b0574f7c0913d9893a604e0530ffcc5010af66a98fe5271049466db519ae8312404";
+    sha512.source = "c4f42b0c2733dc5abb1d2c163deb4a188665831a6fac888b5e3161ae600cdba8d2b279df47f2cd7b6a262ca108d4c0d0f3e2a99ca8608d13527bea0245413037";
     license = [
       "lppl13c"
       "cc-by-40"
     ];
     version = "1.3.1_twemoji_v14.0.1";
-    sha512.run = "d9204536ff2cf76cfb341bf8096ea71571663527dea945de901758032393f6e4f53c88f0d274e37da4cccf6b61149cb64f19a8712df80523c2f921354155b797";
+    sha512.run = "fb52ee4879bc04cfc343b80e180edbcd7117f44c82c5a69a44a8c641d77b3bdf469d024ca2b759885aac67bfd32f08abceddc83851125e03d249509e4552a1ea";
   };
   twoinone = {
     revision = 17024;
@@ -51202,15 +51373,15 @@
     sha512.run = "5f9689362939aa574782b8a8633eb819992d18215148bb3dccfb76b5b701906f549913b2f12f73a1412f969acbff62542cf9edb654a1a13aedb9e5f3dbfb9a83";
   };
   txfonts = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Times-like fonts in support of mathematics";
     stripPrefix = 0;
     fontMaps = [
       "Map txfonts.map"
     ];
-    sha512.doc = "f19a988305799931023026f714b63ee539ebaddcd39e9be1f1bf765cc4cc89428b626ff4d6bfc91ea2f324f08cf09b618b6a0f8db6b01dc9d8685618daa1e2d1";
+    sha512.doc = "c8b01a4e30de9b9e5a2bd7617a75c558bce84ed7d4b2d374d64626a76d244a181efe551713f4c1c9ff1c857b47c33f1cd65105d771b2b595fd2e884d997a7dbe";
     license = [ "gpl1Only" ];
-    sha512.run = "2e6a195791067ec85f4eeaea5970467c97915dfa48f59d17b5a73c90ba221de1b41ed35502c6714335cd190af05ccaefc6cd5855c5f35f49bd8e15a2b4ca0726";
+    sha512.run = "a4d536d73b48e795e41ee3506ced5e6517e7e95526e6cdd34fd28f6075b64feb23fc1e4cf1b6f96f705e3657d1b1ceba9481559dbd341ec340ec7b82fe93881e";
   };
   txfontsb = {
     revision = 54512;
@@ -51239,35 +51410,35 @@
     sha512.run = "05b24a0c9705589d2e04933a5e29b8a49de155ad0e9a4caa0c36785f7feafe475275b76c58aa50d9318df26342b800382d3c9e8164bd95fdf400f730191282f0";
   };
   txuprcal = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Upright calligraphic font based on TX calligraphic";
     stripPrefix = 0;
     fontMaps = [
       "Map TXUprCal.map"
     ];
-    sha512.doc = "e47e798fd357449d4a3a6d35f3fb1af38f8a64ba29968992a2ebedfa4429189d1aa3f6d884a19bc647c9c3873826eed74c892bb7b789686df779e12235065697";
+    sha512.doc = "8b44ca4efdb7f328cbaa9776ef4c3ebb67bd4b30da3368374b2c89e8068738c434181b0d429b23e0a06c77e1c6828b5be97ce399b3a83b48548af10782feabc3";
     license = [ "gpl3Only" ];
     version = "1.00";
-    sha512.run = "fdef75810ff9d404a7b8d8c22ceb3c64ba9c144cf2288ccb065bfb21d26b247bc9c4411f83c0ea081609fd6e3fb42daddcd8f0e7e796527d4608f798073c37a7";
+    sha512.run = "56f62ef2feb92f8eb18cca0df4135ee75b36879bb6ec78f9cad3acd897346db93ef9a133aeca7cdd8f8cdae5898bc488b1690f1cae3fa481a09a2cfac263227f";
   };
   type1cm = {
-    revision = 21820;
+    revision = 78116;
     shortdesc = "Arbitrary size font selection in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "6cd4061eced23057d860143dd7121b1e0ca1a17de1c2f08334c678c9623c0066ee77c1ab5036953ce390be7356d3fc0d155a5de1f0aa977e1e95296fe71d5199";
-    sha512.source = "6a66a866c6edbe8c914bd3b0a7568c0e23914253fcb70fd849326e42b2c32860c97756fb94f5879dead5bc3f057cba64f639038b5a125f607c3f21abe4807bf7";
+    sha512.doc = "62af233ecc74b2592d7022d4ac087445f54f67c067f3fd9d1eeb1a09c5f1d226ecf07e228b92c5a593e96571b531679cecd5863790857f0ea6102f500b20b312";
+    sha512.source = "74668f28521c5e122f40b254e32610d04cc66cd19f018ec963db291a6de53d65291fff0d85f9b46e9104dd8355ac53d64069550b9a324885bfebc657eb906200";
     license = [ "lppl13c" ];
-    sha512.run = "85a72c942e61dc0c0fd3fd7646d264ee692ecaf4e2badab4f68dbcc380a1c88a78d4ce066e23a08d1cfb29ed3af0115b08ea05a0e078283513eb14f9c6031863";
+    sha512.run = "cd1b6c6b2d246fbb14dc067c9480b04dbe6ad2d8fdfe3d783873a4013f43cbfc42cd88894136a9d3c847faece0a44c9bdb17c99b865a50f0e173f36f15943150";
   };
   typed-checklist = {
-    revision = 63445;
+    revision = 77677;
     shortdesc = "Typesetting tasks, goals, milestones, artifacts, and more in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "5fa0547034644134f207beddf56d523eaec47c1a2f9e2be5bd9d0db17b07874aa08b86a6c059d71ef6e7918dd326171955d9dfd921b28350860710b2935ed494";
-    sha512.source = "8b5de72d3200e2c75ecf442b3cacebf6de88e4dd6473b97d4bbfa3ccc3e26a0506424854485d6f81c4c779834ed439017395a72dc7af22e2fe5d72e0e0bb5282";
+    sha512.doc = "c163493eda178972aa5d765e74f62e85ef9e6f1a74010b80a87f124b14ec4435fc78fe7762ef9f4350dd53a900b164e32d26b1c8e645146b47699c97bd4c2711";
+    sha512.source = "9cf405dd066f9d640353fabc3affa77f5c8ce2d0b9ea1c647d4f6847ae950b9003bcda6481e6806ecf9a184b83c9a60cf92338aa4998d4ec3eb920db8f9f5046";
     license = [ "lppl12" ];
     version = "2.1";
-    sha512.run = "3b8cbfe59d50498fa196655596660c7cab045734e1c2f03843696c35b71ff5bd4af738a7e4fab2272c021558413adc3205efb0ff918ebfd6e46ad3cb6407905b";
+    sha512.run = "e3b7371d6ca9e14185f8541017210092b9af4b4645f09dd1a35dfec85ab0a2c09b65867ed174655b70459dc3a4f3e42f7ae427fac5f07bfde3e5dafdffb76b76";
   };
   typeface = {
     revision = 27046;
@@ -51312,13 +51483,13 @@
     sha512.run = "4790197d2e298495d5dcd58d4f9ddffc4f104ddf37d82a2ca7248a912e403bd450ee6f35702c8c430d61f713b6a7aec939c38075a8b3fc3a4a8dc012be32a945";
   };
   typicons = {
-    revision = 37623;
+    revision = 77677;
     shortdesc = "Font containing a set of web-related icons";
     stripPrefix = 0;
-    sha512.doc = "36b9517833fa6c430671fdaf0ad0775813c22ea3b3f56fad96410dd90e052b76d81f0ecd411ec19b567cd664b7ca44b9268d05ce59fb9bea0429c8f91c3a4a55";
+    sha512.doc = "ac8d25d504bdf7befc76bb66498385d0f8d614193643b7bccb1b4afb8a05761f33baca5cf50e057d806c7da9b577a530383b392279c633ec628868b77b31f7d3";
     license = [ "lppl13c" ];
     version = "2.0.7";
-    sha512.run = "38b0afff6e88635a2a27502f1abc279fd70e49f36d56bb44114895614cf80184ebf8b627bcd576d128b3557de08b3791c5c2e48f2adac9766f9a809ff0db3cba";
+    sha512.run = "3f75417f65bc24b039be0b14b7673327c7bdac7d18d5ebf7a492efc13f82d1cadfa12447280cb6d8d22ab55ed0c6db3ff9964a08a3812a5941d51df5d20a7ffb";
   };
   typoaid = {
     revision = 44238;
@@ -51388,13 +51559,13 @@
     sha512.run = "52e0fde63c966392a235239725e2db7cea70a300837cf53003f961d32f54787d8c4e70ee76577889ea543f884ed5ec281b345bc9e83872e5a131e55429f7afe0";
   };
   ualberta = {
-    revision = 77463;
+    revision = 78222;
     shortdesc = "A LaTeX template for the University of Alberta";
     stripPrefix = 0;
-    sha512.doc = "45d9a99df7c9c21dc3a89e779eb12e0b45c821c44d4b95c02f55a3d7fa1c7899265673605ff5e99d35a9e212f9eb23f8862f032c32704cb0e1c6ea694a928140";
+    sha512.doc = "393251f1d5e4be09832d5b43f0afee4e5b8ad4217b6c7261c263fef42d8ac29985cb7df20eafde2bdaab020c8fe4f4355be535856a2ef595bd1e98a6a4aa47bc";
     license = [ "mit" ];
     version = "2.0.0";
-    sha512.run = "f975da6da75fabc389b82c330ff9dc32b3bfddd3b798948f66267a284d75a4ee6ec4849e78e0074ca13241064e302313a23605771fef53fe24750a708f719cfe";
+    sha512.run = "7fdafc2429ffdd6aea0bb07b58f2faa9eef049bfd24a25f90d5734ba2eff750144d0110ee767e2074cb8faf9e03ff7c97e7d8590ce8f95a4e7954071e7ab630f";
   };
   uantwerpendocs = {
     revision = 76924;
@@ -51453,13 +51624,13 @@
     sha512.run = "333e8f92394d89bdc3492606e467d4b664c5d87eb464e1c16ff293e3f87931c3c70308aeb523fb40f2e76e5d0aa2c1635402f40fc36ecfbb7ced98d232b8bcb5";
   };
   ucharclasses = {
-    revision = 64782;
+    revision = 77677;
     shortdesc = "Font actions in XeTeX according to what is being processed";
     stripPrefix = 0;
-    sha512.doc = "52fb328befc004024d10d4222eaa7d6d3d179523bfdd48ca8453d6023c118f328a1981b69c805660ee4ddef95df3b5b71e1c85f59f3cae92ac74898f50b52206";
+    sha512.doc = "f1362aac16ef3b634e84941a698545682428b2b919ee0a496248aad1c23abab20fc7238d6e2f50439fad0efc1de8053dfcbd8ee9683a2ff732cff252f7b37555";
     license = [ "publicDomain" ];
     version = "2.6";
-    sha512.run = "41e9f5323b62d529f0b0ddd1ae9c5d613df19190a2a666e1c1b35cadd8bd5411487ecee1419b7dc7f06183181f68ecbb8bf813537c6e711f926fa99fa74f249b";
+    sha512.run = "ee1cfb4c7d28c23663c1e8b4719c0d903a471fe66ef3a1a843917c93fad17c21211d08d7022a1104fece71a746dce9262fe17f871af050113e13559fe1e41f3d";
   };
   ucph-revy = {
     revision = 74857;
@@ -51472,14 +51643,14 @@
     sha512.run = "7f223bbf2c57007df8cb4eb304171051036cbcbcc40069b3a30208b0ba23e862220d22fe4a8c5272b47cd7f9ebd56059947e488bb7b08c21ebd73ed8b5c2bb8d";
   };
   ucs = {
-    revision = 68759;
+    revision = 78116;
     shortdesc = "Extended UTF-8 input encoding support for LaTeX";
     stripPrefix = 0;
-    sha512.doc = "95dede76d97d0dce6cdaeb0acd128e89c2e98383e633925b40433c0d4e0e342fc3df94603f17370fb56b88c40effb99eacc4310e4de4231232a2be6892adbe87";
-    sha512.source = "e2f0406d59b69bac26363cabe90364aa61513e3c20da1fb414ca683e830cdbc79410fbf9f9b36e60d467c989d03e942efa2b9905dcb2339bfae9267e49cbd00b";
+    sha512.doc = "822c421169f8ca5a1756077098dc8654edd8afa562dee55347a0eee5908c617e4ca24c92835f3a43b9f6dc84b3fb6fcac20cb8f92acd312a912ab615ef667ef5";
+    sha512.source = "d10c269b262f783cc66383ff8d4e529436a8196aa7b07de51588357407685b7e0866454d07e8463352c732583b46bd02fc282b35f7760f7f190ee53b29aaf4ec";
     license = [ "lppl13c" ];
     version = "2.4";
-    sha512.run = "9adaa0a3fef64436b56d3e4e1c504b74c18dd795db15d193df0e0ced419490ab462cc61850d3bea6cde7928ddcd85cb872130d1dc9776aaf3bcd8f12cf144832";
+    sha512.run = "e163b736677232d7a2dc9099e203ee60fded879c727fbd35810daecdadf04dcc1c1103ed3c06bef23eba896337d3304ce234d2320a7564d59a2e1ac58da25587";
   };
   ucsmonograph = {
     revision = 52698;
@@ -51640,12 +51811,12 @@
     sha512.run = "043338c4e92d84bc2b7bd63610656b53b39bac225c5610089c0c8b58ce9bbe3f414129a6b043a5307ebb7b59cc062ade7bd803fb6949d06a0d0c87e2dd4a0bd3";
   };
   ulem = {
-    revision = 53365;
+    revision = 77677;
     shortdesc = "Package for underlining";
     stripPrefix = 0;
-    sha512.doc = "153dcf2057d267c2f59c7705c4997752e902aa004201f97d52a180419d7c0fea4173c0b5b1a1c8a11bc1703226e55ea55721a4d18c265b30343a5812d1f4e0e7";
+    sha512.doc = "3af9cd99dbb807bffad6c1e75aa230ef8457cb75abcd58f68109b69abb09cc4599f6730a45dccf38231ed5c79683cc572c1df467fe47028bff04f85999c63460";
     license = [ "free" ];
-    sha512.run = "bb7fc8d93d38a847431f9f62f1447520890f3904654ef6f3cdffd14537600da35d54bd0839cd8fd8d26e1e3146463cd9ced79f706df54df075292eea8a40ed4c";
+    sha512.run = "5469450d580f8fa9df1f41e881ff863ce976993f6a44b72779f41a13b848e28f4e3b03c02279e99f7849baa8487e2b418fcdacd48cd8a9e16723dbf3bed9d05a";
   };
   ullrcorners = {
     revision = 75278;
@@ -51807,31 +51978,31 @@
     sha512.run = "b3afaf4c51b3da2d082e2cc742deaabe70cfbea7425e0c57f0d1d6696cd7d8f993707a219556a5c5bca925ea63373e3f0a716a82ead647e09ef2f716535886d2";
   };
   underoverlap = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "Position decorations over and under expressions";
     stripPrefix = 0;
-    sha512.doc = "aa25093c3f9a218c0f622ede000cb142334d53f13aba1bffa6c4d280da93b62c3a0ea7f88d3e865c5123c23a654019abec637d187837d3687df518bf83b7ee0d";
+    sha512.doc = "8a1a13b0a927cd74044a797c2a854cf39331880f3ab6a88c9bf8d0a15dc23ab77a2efa20a1c68e12248fee46a7fb66ad5b4e0bdfa0ceb011897bdfc482b1432f";
     license = [ "lppl13c" ];
     version = "0.0.1-r1";
-    sha512.run = "4be55b9ad0bbbff75fd0ed8af74b20320dcbd753ba5dd366128862846ee55ee3f3f9a91e9c1e25637e098272782056f79ee13aefbed37f689a45ea7b3057a5d6";
+    sha512.run = "52cc5a2486b8455b80e13e6f129eb42a5661ff2d34b6eba3a701d51ea22611fb9c5d3ac09c4fd8cb52affcbf63b1e55d1ce6b171447668a99a826276a7556879";
   };
   underscore = {
-    revision = 18261;
+    revision = 77677;
     shortdesc = "Control the behaviour of \"_\" in text";
     stripPrefix = 0;
-    sha512.doc = "e1f0730b39a5d25cc52160e090b797ed73a5becc16b6813cd0c2f4bf78696b23aec5c82367c347d0e734f3b92761ad2090e517bb6dd2a40879639f62149fdba6";
+    sha512.doc = "b91c4ab498f4a1d96eb80b706dedfb27a55ddeee8098374c8dd977c18ee513f12b96b5a0da533f03329616d3b4a3bf280874b6b26c492e50e2fe5d8a84e5e430";
     license = [ "lppl13c" ];
-    sha512.run = "4fdc57d0a36aa5646c6b960b7579a8111441659469df32beaae06f54e6e835456810b1d9b5d36036510befd5e80b5b481b9179a6b24364bf8f858ebc97039ab2";
+    sha512.run = "e2eff2ce90dd3f76f1bb1b480da5f6e057f311821f6d473e937332e6a47cd8ef7e76bae1ca33662976897938d1baae8c3c0c0b78846f9a7b25cc6bdffa01df58";
   };
   undolabl = {
-    revision = 73633;
+    revision = 77677;
     shortdesc = "Override existing labels";
     stripPrefix = 0;
-    sha512.doc = "0d4ec06a63f87f8a1f0b4a050953cecce0ba49f8f5fa01a7f905d4184611ebf61a1f9503aaea4f3d35e2cab6bc92e1438e03bd30c9609e2cc1d51a5b5b7674ca";
-    sha512.source = "551ebff86e31e37429ace73abc53c669ae70dfbe8a738367d0521f5a4cb6437cdab8198a72ba1f9efd9e59d46fb2fbbe498c74d8be7ab1d0acb740ac91ec6d1b";
+    sha512.doc = "7a58f725dbb37e8cc9fc8b92de7d2a41a6a5ed995d07ac8ac381ea51cc82b41b04e7d1498f1897910e9d5eee479df40bdaa35c2345d41f55facc598218371626";
+    sha512.source = "4d1a9f901baa0458215dabdb56dfedb86aaa5ece424c15f4f257601881da237ab353bbd0f600825272c50eef97a6ad78b11530c433bd1cec15c577f040c6843d";
     license = [ "lppl13c" ];
     version = "1.0o";
-    sha512.run = "809321a17a3bd433f8373290fb5a78ae4cf99ce888b3cabb2874fd3fab635092224c0455805e3ccc241e6899fbede9b65f3b8044825914b273c8639dfd277929";
+    sha512.run = "03cb9dd122de8e0ab808b73a30ff3e9227e71d8dc66dd07579835500810ddb8611515eedf4a5433d64725c569b198158bc56ae4b9977812b7d7c9ccf00ba5abe";
   };
   unfonts-core = {
     revision = 56291;
@@ -51895,13 +52066,13 @@
     sha512.run = "5a4b043778811bfec1ecc847ee191dc64b3f99ae0adb8fda2b16fdfddabf195133d53acf295fb18dd70460e1c1d200d3e6889815edabcdd0bca9d007d7a309f1";
   };
   unicode-bidi = {
-    revision = 42482;
+    revision = 77677;
     shortdesc = "Experimental unicode bidi package for XeTeX";
     stripPrefix = 0;
-    sha512.doc = "44b76c810988c541c5dc6cc85a56fb81e8c2aa97afb84192477e57f59423e508e34aaa0542009ceb5ddbf74c95cd662697544af1cdda1d0c114bb3f0507493d5";
+    sha512.doc = "2caffbed13f4cd6829eb24dbf4ec5cff99e06ab0c0fe1947722af74ef3ed8ab68362dfded7c3b52080cf690d25386cdbc646483a467b239ffb31e8c453359d3b";
     license = [ "lppl13c" ];
     version = "0.01";
-    sha512.run = "35e32b9959e698ab0d32ef578376fdeaac54c1acb9abc584e742a7caafbb2cf82364d58d73ad07de4cd273a5c9c60e4468df74fc4c21fb6552ddb5be725e384d";
+    sha512.run = "a9a30e2002e48c48896d014f39d03dd9b8c71210a8f1b23095722757f5afca091df6087cd9ec5e372f01d0256e29f7ac4336d8f7e6200523c9440b00da50b209";
   };
   unicode-data = {
     revision = 76413;
@@ -51916,18 +52087,18 @@
     sha512.run = "217639c4d4dd58714db6b581cf94beb90015061ab6d20a7531845edd3765082f746c43f7e9c5607bea3ece07c46565775f1b8947ad8c19ae7fff9daeb7235a5d";
   };
   unicode-math = {
-    revision = 75152;
+    revision = 77677;
     shortdesc = "Unicode mathematics support for XeTeX and LuaTeX";
     stripPrefix = 0;
     deps = [
       "fontspec"
       "lm-math"
     ];
-    sha512.doc = "32cdf4feff085ad2a2ba00909d769e336269560b33b56b6ccaaeb429f7768863f1bff9ef1a735615f7df9e82ddaea1af05fb37ccba04e3d913a57995785d43ed";
-    sha512.source = "62f36d4ba7115370932fc5256f39cc74c4317d59fec76dfe1a15175fca53d0cf371cb55480d40fe534f64317a10b67ba35e22468fc631ad7b678e4ddda862cbc";
+    sha512.doc = "812b0254e08d67e0de4cbff809befe5d3c95e13c056335216be64cd8ed963ef9270605ddb741cdbe5d4142c3c5ffd87dd8209f63ab8649e12278e5263c99473c";
+    sha512.source = "42fef3f77768dccdb3704ff587f8432254aa46430cd654fcb68e227453d92874713e80e9929c804432ddf35166af0cb64b41acf5cb4d70c4acaa0cd57cb18685";
     license = [ "lppl13c" ];
     version = "0.8r";
-    sha512.run = "261dd713342636721115e0a84ae56041cac64ed0ec6b66e41abfa2885a4985cf8209a1a186411eac38e354fdfb846e0cbcfc539302c007511c27765eec4bf378";
+    sha512.run = "57d9bf65adf023d334bba9c40c7e297f71a81c49be92471d4f7767889ce8023c65bbaf22853e0bfa850a9fb3f2e4fecf71f878a9d6ce8b5b195df7adde48b66b";
   };
   unicode-math-input = {
     revision = 76924;
@@ -51943,14 +52114,14 @@
     sha512.run = "f8a62fbf41808a81f38cfb8accf0cebad75018d4a21030f50bd389e4ff400358733a530abce2afcf40379f63a3fe3429605279cdfbb702c281bb529ae8f78585";
   };
   unicodefonttable = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "A Unicode font table generator";
     stripPrefix = 0;
-    sha512.doc = "f4220e49ec21d630dfbd43a947d1137238bfbca8979f26c842fa95aec5bf5d066de6952584dd441986cc125400ec009bd9dd81c502762f4a4be628b0dae4a0ee";
-    sha512.source = "b2cc8658a22e3b5de71c818816dce109639f3697268ee8662a38759a57f014ec3b50f8381a1f9a1dff609906eabbb272580f6694c29a99318e31c1449f9857a7";
+    sha512.doc = "c90be45a04d281bee2190fddbab3f6d39174796dc3a47609233f6306014f66586f0b65e5f5f78d669677b89710298fb503d99cc102beaa7d329a3c4858f2f5cf";
+    sha512.source = "2912fcd4c47577edb065282f4faee8f6baa7c90159e22448b893840098e382459590e59ee2df9feeea15fc389777a6b18cbba667b8ee8a2742901b64b804a524";
     license = [ "lppl13c" ];
     version = "1.0k";
-    sha512.run = "4ca2f5988060352c26631698c2fff6eac923d7d933432d5b6cab89e09d76fdcfebc37f95094465ad51b1d28218b91d2ea98c8c9899d296836d143a6318ee3e06";
+    sha512.run = "c37f8cb7cef8f3f8f1fec5344ed71a29e3b967cae8cd31f91fecf922f1064805fcde918fb99f7428fc884a4bab46432e24b2799a07e90ac7656da53f1458096f";
   };
   unifith = {
     revision = 60698;
@@ -51990,23 +52161,23 @@
     sha512.run = "b6f42922ceda5c95019abb9e647aaf61905dddc38178eb2bc825c293496dea5b665f36169f67368d116846773d248af25bbf83917573d82308937abbd3bee3a0";
   };
   uninormalize = {
-    revision = 57257;
+    revision = 78116;
     shortdesc = "Unicode normalization support";
     stripPrefix = 0;
-    sha512.doc = "804c2e70ff09a677c30f531db5605512453506ab83dce8f9dab4bfbb5602f8605376becc8f65cf375b28c9d6d35ad9f3a92d6f185697e2e9f9d367638d58fb56";
+    sha512.doc = "f2f7fb5db2130f33a71adeaf31f78540371ec3f9ec9a74d8f9a8a290fd98fa866d35fee9d78d830d967fb41a95de54cb06a7071aee15859490ec7cb044ef147c";
     license = [ "lppl13c" ];
     version = "0.1";
-    sha512.run = "b9b0e91a61d99005be4f37d2e5aababf70729c60d959cc57295a7197b5e360ed183bb9cd80bbb287508bf584db48f061bcbb25c6a5bfd0936923b106d9962f60";
+    sha512.run = "308376c5fa4b18504ae25fb5501ee40ebf29f492a9dd4488350a957b1b5a51d33b661b1a89460f816bbbf030059148b66d7be9d9749aeea9c156c9a909a1a23e";
   };
   uniquecounter = {
-    revision = 53162;
+    revision = 77677;
     shortdesc = "Provides unlimited unique counter";
     stripPrefix = 0;
-    sha512.doc = "4dc74aabd9288ae881c4513886ff917e1e8bf08446d3b34c946bded6a6fa71ea7b6786bf432fec2661cd1db1af6b5875ab329708cc3c443499b83b0325645d0f";
-    sha512.source = "caac3c3445b2b9301d46ca94744eb600cc45b79f6946065f036f412d2d1b41716864d61e0cfb9e9d32ab8dbf870e5f4e302c96b388d680badb13c52821f7722e";
+    sha512.doc = "5d9b8acc835dfc23bd5012fa5dabc259a9fd4c7080999b032226ef5e309205fd99fb6453f9c9acd9b80173566c295985880d26c486166520742abf3ecbeb3aa8";
+    sha512.source = "e0e53d1bdfc72005a7ccdd4bd762855b99692bf260adbe687b51312420db5c076c8dd7cda63f057d84e98621b7fad4acdb4871708a3d5070f84b39b90e6f70ab";
     license = [ "lppl13c" ];
     version = "1.4";
-    sha512.run = "9769fcfd787f210e0653c971872aaad6e0ef1e5a066e392e9d599f8fc11ab9f6587d21db1100b643d09d4850cfbfbbc1d32f01fd1e86aedab8c92da4f5a7d614";
+    sha512.run = "387b4b896ce18d29534ea1aab569f344dfb627687ccb4d2e8985500b8cc999ed031e0d16d0db10cb2e4b8beafbaeeee6011316602f2a2175aeb381395a5adfcf";
   };
   unisc = {
     revision = 63178;
@@ -52078,27 +52249,27 @@
     sha512.run = "f21f9bbc0c4e730cd1b115a5dbab22df9519d4a364045e292eae6b73741dabe0117c53759b7db7696c88241800970801335f7537e19d448fda6f72569c4eba50";
   };
   universalis = {
-    revision = 64505;
+    revision = 77677;
     shortdesc = "Universalis font, with support";
     stripPrefix = 0;
     fontMaps = [
       "Map universalis.map"
     ];
-    sha512.doc = "79c500724365b3fec6f25dc49dd019ca23d0d3bfc9889f75f10a090250eb1614549c8f3ef215102fe5d5ea8c317bd1f1b60557133be0afe376cfd74d73d67fea";
+    sha512.doc = "a027cbe54894b2ee6abba0322a4dfb787dbbf4a8831a2bbdfd957fdcd5d8e64eb45e9001935f8cb8b06231d71865c29258fb74666823e13635a48c0142e045d7";
     license = [
       "gpl2Plus"
       "lppl13c"
     ];
-    sha512.run = "4fee20d63395348a021573af4e4e8897f267d69cc59dd7dd8e9fd6ec06041fbb00608dd3adc103b1886638e9783fdb010fbccdebd3ee7cf91a4b57dfd85b67b9";
+    sha512.run = "a074f0401c5b1de1e93e276d9c252edeb39dab01a5cf28c2af3a610a396ce723b72e9d40110d2d0f5e632e1779ea1dc845a1c6b0427d7f0ef9fc393b760b9903";
   };
   univie-ling = {
-    revision = 72484;
+    revision = 77677;
     shortdesc = "Papers, theses and research proposals in (Applied) Linguistics at Vienna University";
     stripPrefix = 0;
-    sha512.doc = "b709a70f88945a9a7f91b6a1937ec2f8946b45f9b7d3ecf637ec4e9264f5d487403ae37ec2d759a59adffeb04c918ea38067879dbf0b649dbe342891c786540a";
+    sha512.doc = "e2b7571a7afa8773ddaae057600ddad0d889e67a8399b3027fdd842eef876b2ae8f6d4db97459aa92a35ac5586b2fcae9cd41b3eda434ccba9be5e099af1c8e5";
     license = [ "lppl13c" ];
     version = "2.9";
-    sha512.run = "299e7316e89658bba0ee63e8f79c8605a4f5e158057aa9c31c37e272489ee3f7e4cf6efea54eee1811a9e83a47002ca48e6fa4e32c91e898f6354e41d243df83";
+    sha512.run = "cfdac723abce4e74303d09d38724da707e790774e8e5b67c36e955b1bca1c6d424e494445ba831612a853f99eaecd227eede2604caf71c5187d1856efee7ae72";
   };
   unizgklasa = {
     revision = 51647;
@@ -52110,14 +52281,14 @@
     sha512.run = "ac96ff7105cc0a6eefa7a797b325c6e3cd7a0e59d31a6ead1f715d37d326450fbb3d39d6bc5228df5861c5633ab8be027f7652426c10e0ab23a2c9ab68bcfd98";
   };
   unravel = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Watching TeX digest tokens";
     stripPrefix = 0;
-    sha512.doc = "52432bfea1e0131d72eae77a4933be9b40322787a8a705834e878d5461ded6e7b74870904de7ced6a2e23ae8b4d913d5114d3db5adab3765c09f15395466ab44";
-    sha512.source = "a3ed0b7463be957a0d6ea5fcd943d13d897f3a0502bb89c20d3b4ae17953125a614a68c82c698f749e93b3a72c26ab853dcaf83275d512ea2d2ab5390cf319eb";
+    sha512.doc = "f1d6b43fdb3eb7b9a5caee154b9e615a3a707ab40499073fc2dffbfa935d23c9119c447b5af0f8b1e6288b8e94f7635557c1e70355f893c92380426062e5c517";
+    sha512.source = "17f9100a7a6202be81509193c3adfacdfe50e8566f48f6a7b37ba4536d48b4e72edeb6921a63c38c850fec3edf1be497040fa4dd364821b8de5100899e393e8e";
     license = [ "lppl13c" ];
     version = "0.3c";
-    sha512.run = "bfe3b8b65082d5dd20696087c4ca4b8d37513290eb132ee10f2231b75a9551bc9cad70fbe247326273127afa68d92ac6e3529857c0bb28646744f0e6f8699182";
+    sha512.run = "a176db3469b5b2e9b4bfa2d4f6c4924c36a03b18e43e9eb9101fafeef6bf3a222cdded2089f611025de03716cd00118aa48ffadf00593237ff4ed9baae3bfa8b";
   };
   unswcover = {
     revision = 66115;
@@ -52187,7 +52358,7 @@
     sha512.run = "1c7d04d665422cd9f7185ca43aa5682b76f91a1389af3adae224b5045e43cd97eeff5617e7ad2bbd1b2d243d7b6c71bb5d741a71254cfcee1a1c5f08da43eb7d";
   };
   uplatex = {
-    revision = 73848;
+    revision = 77677;
     shortdesc = "pLaTeX2e and miscellaneous macros for upTeX";
     deps = [
       "babel"
@@ -52253,23 +52424,23 @@
         ];
       }
     ];
-    sha512.doc = "cdfb588796ff6e99418fccf0f408db810a46ad127319e6a916f2547e98b7a08fb4dd83fcc4fb9789c330d645e4b452c4595e96a71a2a143bf9f520b1235a43a4";
+    sha512.doc = "b8a2728c3aa08645e846e21c86c5c3bcf1966108bf78c032097290f4f0e944676a2e41ea2d1e350aaeea36a71ca7e0211738a6b0b16b8e0aa60e4842f5d14a12";
     hasManpages = true;
-    sha512.source = "4d10243d961263cfe15779341d5309d4c0b31f1ee02f17f6a8ae2ee129fde5b83dd556e73ef8594ac4829497c12789d5436388b40a186546d3431dd2de6e6b54";
+    sha512.source = "17f4713f2f703a27fa0c086d8b1d1c3369475422cb6a2bcf5d676073e6479c9e551d5055b326b45b2cb8cd969647c422d2392f4bdd39aa1f6ddd008ebd67186f";
     license = [ "bsd3" ];
-    sha512.run = "fd57a441c683c2e0078b727b34e21f90289bac185de50e827f5c4e70b8bef0b47b6ef5d4b49d6625ab3e8515b8a96aebeef0e5ba972f151636d490072f116ee9";
+    sha512.run = "47c9a37b75e823ce866d1b0e7075e85318ad674b731d535911543a0510f2638a50c867cc83f8a9fc91da80de3242314c48af354b747be4bb23a03b02ec3e74ed";
   };
   uplatex.binfiles = [
     "uplatex"
     "uplatex-dev"
   ];
   upmendex = {
-    revision = 75593;
+    revision = 78116;
     shortdesc = "Multilingual index processor";
-    sha512.doc = "5fed613d1016e644b143332cbf35b327228723a9393b0e6b937c36880117bd22a1869cceccaa5431cb62b4080107e90ec6e642ee9ec1525fac6bcb8c9dcaed0e";
+    sha512.doc = "08ceae78045654f14e77f7add6a557e5793685f0afd7560674767165b856b59b58912afab5f4753070da0ff6eaa2f928bfa59fb07126164c05f92f0625c6237a";
     hasManpages = true;
     license = [ "bsd3" ];
-    version = "1.20";
+    version = "1.22";
   };
   upmendex.binfiles = [
     "upmendex"
@@ -52293,14 +52464,14 @@
     sha512.run = "522b68bd32887ba14ecd927c49c5fd57a84a1c0f9b8a0bfad65a4d377b68a7bd449754dd411a72fd83e5736e32e2c47cb1f54155f72395c465e4e09ad1d09dea";
   };
   upquote = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Show \"realistic\" quotes in verbatim";
     stripPrefix = 0;
-    sha512.doc = "0d58be49dee2b9882ca613cbd399fd6cda25d75741b9a9d86e4c866c53386d121d1564f4b57ae97a5ceb862a948ee9d81212f5bd7c0311049bbba2bf64ec22cc";
-    sha512.source = "eb0fbab4d30a46a4c26d16c36b9b457d79cbb4355689e536e679887964113802117bac3b1241df6cab54c1c5216bc12dd2a6fd053122f6ec3974b7546903924b";
+    sha512.doc = "dc9d1d4690ff3e7d708965ceaea4c97f2a755862c9812444c8b7ac96177c56924302232e971bd3448d4fe0aa328756acf637e031d3ff0731a210bf51318e5c78";
+    sha512.source = "8ec409ba9e6b752eb1b9cdf44cc73173aff954d77c26d09be9c75ee7caec17dca7e4aab0414d287fd33bfe7e914d81b0505050a1967a70459a297232ce099203";
     license = [ "lppl12" ];
     version = "1.3";
-    sha512.run = "0b476595fdbc2623e43e94fe7578438d29095aae64dcf7f9e278689cb19ccc362cf5f30d99420b8fe5751a1936b8e129bc960e21fb5dfeba5b05a7f3ead12d21";
+    sha512.run = "c2ad2684569871b6807287532c8e4dca315f0350825a1efe945af14662d14892bc5510cbff19c6f341232af9c87adbf500360c3df959ee7daa3cb92e595a2114";
   };
   uptex = {
     revision = 73848;
@@ -52403,23 +52574,23 @@
     sha512.run = "5b8c80a756e45e5b847c3b970005b866f6c498eff7646155c73a9b86585dffd73e8dc66d91583dd691c910caccab60ee22a1e9dbe3aa450290fb17f019477172";
   };
   uri = {
-    revision = 48602;
+    revision = 77677;
     shortdesc = "Hyperlinks for a wide range of URIs";
     stripPrefix = 0;
-    sha512.doc = "b2cc8cbcbc81f0c3db349952546e60c152044aae264d4b30aadb6b90b7aa5b304c89203b6219bb5161807bf1e4649235d2f98a60339a0cb93a588852a1755e00";
-    sha512.source = "0206e0d2907f3976fd605d78284a44c909ff23f16ce9b2490556136099e56a374bd410e1c9bd5687bb791334612af1cc5a62a8b53f8c7876bf02d921c9868a68";
+    sha512.doc = "8c6b1135ad810296762d85417ad867fba1e4ad41404d83f8ecfc71eed13c4a50872ba871fc6548695fdcafcf1f47f25d1f116c02e289250505b01b05c02ee0f0";
+    sha512.source = "00c9e9993dd061446d95697eab6378928520de474d86bbd6a21f95054ce85314bdce48d6fd67bb5983f6d169c7ea3e1fca2917122f4f4580708e27d55e8c4f94";
     license = [ "lppl13c" ];
     version = "2.0b";
-    sha512.run = "402974f30df5a00118d4bd2e978f342cdcdb22119059dbd0c1b2111fd1ce94ab8a29ceff88672c80d18a669d5440bd48dfcd23fa07844f492e5f7e0eda1671a6";
+    sha512.run = "5df18d6e3f76259b90490c44e0b35c586e4e6868a368f511655a884c05509716f23e0b2d6f3e6594dea75bb150eefb4ab56520761d804d8a294ed2f8bb1fe28d";
   };
   url = {
-    revision = 32528;
+    revision = 77677;
     shortdesc = "Verbatim with URL-sensitive line breaks";
     stripPrefix = 0;
-    sha512.doc = "65596e0ce813233491959ef161be8570450c6c71c787b3253d0bce503558e63902137a6d337ad1e7cd2499feacbba4a93b7b75559750d05d7898ff2527f1240c";
+    sha512.doc = "ad0fa34873e0eb0e5d45b5e0df668779a0bd474abb069567050f5df5b4e5d69bf40ce9db1256889ce048b3818e1a886a0ab94be29ca3d4fdd1ead9f8d7286189";
     license = [ "lppl13c" ];
     version = "3.4";
-    sha512.run = "164fb94cb128e997031bfdf8c602892d78813694f39f4b95bfead8a5b7e3cd9a0d9596dbe697e012bdf84b89c2551c2f2f1c7f99d4543e357edfaf2076b9cfba";
+    sha512.run = "30da38393373578949beeff9453c294281d7549a3758b5961f2db86ec233ca2329d2ea17f7d0074cdfbf89734a2c3c5fef4632be708e78884bc1a2fbd3c81778";
   };
   urlbst = {
     revision = 76790;
@@ -52446,14 +52617,14 @@
     sha512.run = "beb82950bda88e7170c7ad753e93859f96190f30e89fbfbe1cdbe37930b07740f70da40124639c6ab14be93fe79c5e87b35296b68c702888d3e9e25100e86a9c";
   };
   usebib = {
-    revision = 25969;
+    revision = 77677;
     shortdesc = "A simple bibliography processor";
     stripPrefix = 0;
-    sha512.doc = "3b489185729ac7d93ebbfd632b77eeb865b39043b2b68d920a6ef561ac55701a44d362b84c1fb83a2f59770442a655b779c6e49287c9d2859c44140e61c543e6";
-    sha512.source = "a0c64ad5a7479da4906b848a31ceb02b047a98e8e2c505ee748f2eed4ba27dc8b6d89d8ee3a171566417315cc2b83810f514f1a0c11f1bd4a28b57cca03676df";
+    sha512.doc = "a072dba68b13742975c79b97198d91a26a2c54232335097dfec522610abe3ec98a38ff1f3b329e462285f54080e31620c16228bfb0b88816d202f41ceb781859";
+    sha512.source = "51935f8400213f2a6996ab8b816a62abf70d561eacdfed842ca453e93696b65671f7da6d8b9a2fd5d760fe609098c2787017a93cbf1f2ff453abecbb7e0bef60";
     license = [ "lppl13c" ];
     version = "1.0a";
-    sha512.run = "94e0ded0c7e7ac10f2d8ff9324afcfdd2dad8247cf31cd6b404d9c2b12e223e6f435ec9d3dfad0ab510b943050444f5206788540a948e44f44c5d011596cd34d";
+    sha512.run = "c388a2048ebbb24ed4ae481a33c9d47f8bdec9ebe2795e87c36275e754ea9a8090275e875693807c69632c85f2742684a103584e2b4c1707f085af2ac055f0e3";
   };
   useclass = {
     revision = 76924;
@@ -52494,14 +52665,14 @@
     sha512.run = "fbcce7a06cc018dfba47aa7e9d572003136d5b179e957f10e2bb42b2635ef4cdd40bbef19e8f827963d048eadb23a1aeedcebc87cf128f5b28cb1ab281408b90";
   };
   ut-thesis = {
-    revision = 77463;
+    revision = 78222;
     shortdesc = "University of Toronto thesis style";
     stripPrefix = 0;
-    sha512.doc = "77d74eb64230bb261b2b5d7899c3b094c35bfd6bfb4c008e6451047f3b7ca877135ada7232af6d72d50a53426df56499d6e1f174f26b8b8b1f7f832e5a0d3b9d";
-    sha512.source = "83475f895a845035b5df2a3a5d9f3f7d1cf9947ea2eee3340b0dbaee536e9d08fdb234639721215e6ce74a499e7eeac2f88ac3d74f89c8b7c41b3dc78384faed";
+    sha512.doc = "3d7456870557ad00d2e6020da6a830f7b8aca9df7a822f708a7fcc211e59d2fdba56822bb1978dd61a082add3a920e5217658d56f01d0e12ba24ddec896fa63d";
+    sha512.source = "4833c6be2d5f765dc8107f2f3bf9557c1e6f94e158449c739396d2ae65d301798bc3666d9ca7fb5b92dcf932227f3a1055e166117995f9ed01f87e363ec038d2";
     license = [ "lppl13c" ];
     version = "3.1.8";
-    sha512.run = "7a8cb417afa5bb68087fb7efcf924064111d963c1501e1f34f7efeb5edea753c31ca6414c9a16cc8569509ee9741684bbe0391ea92154573318b1a6387c343e8";
+    sha512.run = "abd1f5424650dfd3275452ab565ff7c175f033014c8a6e2729c6e8af9dce60cc719767dd252915b6b64d272f3a4bed4d5d45c84b65cea59cc9a1ae8703ba0639";
   };
   utexasthesis = {
     revision = 48648;
@@ -52538,12 +52709,12 @@
     sha512.run = "66dd74f22a26022eb13ff7a8807612d33a978070f86ee5e0eecd9b957684150985e6bd6bdb81c8917781926a0e8c13f9310aec36e12b0a896a353194f0a900b2";
   };
   utopia = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Adobe Utopia fonts";
     stripPrefix = 0;
-    sha512.doc = "ba60eaf55cc08378560048ebc6f735e743449a18d2822e6027a86e595a9634461713ceb37d15b9f0c8239f1935f910bbdbd9a0d0d6fa1683174739f91c16a504";
+    sha512.doc = "3032d7e6097ee8416386b34a8f94b8717350c058b876ae605f771cba68e1e048cbaf25b9ca565c4f3d5279c8252e80164ca5ae5cfe1ce1edaa774d7d13f7e894";
     license = [ "free" ];
-    sha512.run = "5f58ac6dacaddf4110b2ac2f77fc0da90d5cfdff26d888b26af06cd6dd8f483c7a6a12e0aab3f50d4188aab9ab649d993ad89e74898d54c14b3de4948451279b";
+    sha512.run = "1b65d0e681af22c3f2bd77d9c4d602dc73551d43e84a3f3892aee19cbbc39c6639301b516d04cd6c6349ff53ef701c375efd536fe1b2f18a1def048f9610abb5";
   };
   uvaletter = {
     revision = 66712;
@@ -52565,34 +52736,34 @@
     sha512.run = "c2ec752b4cbf80f35787db83a0d227306689b1ba9bee6339bb6c2940fd938ce33daa995bbad2c58ed9284143ad3f45aed6668dff88134878cf115968c6820a3c";
   };
   uwa-letterhead = {
-    revision = 77463;
+    revision = 78222;
     shortdesc = "The letterhead of the University of Western Australia";
     stripPrefix = 0;
-    sha512.doc = "94030b0bccc979ea527cff9b42a266848ef66185053ffa729ac4e4391df9dc5e3c74072295542640c8c1c13cb407efbf1299fd67b81acea164a883e657e48cc3";
-    sha512.source = "d6b6d8db4820287bf9b5e933c77ddb0f8761ddf61256b477e904902ef7595ef5edfde7739dc59e88b4588a8dddd7adf4e4858375f551a87fb76bb0ab8c1d2260";
+    sha512.doc = "0b1d7eccf5744c2aa2f3aea5a3832a3c15e974e934e251c21ec163776eb1f69c08b8ab0d8a73356b1df049dfe75e8140c637ff09ea98a934a47a8a48a162fde1";
+    sha512.source = "4076f23a0b4509ea7902fb3398e1c3ed9b80a8be0f5b2ad96a0cce48c867f9e4d895e2d198e3a47fb2f4a8ec241e1671ea4dedd478e097713c3a80aefef58628";
     license = [ "lppl13c" ];
     version = "1.0.1";
-    sha512.run = "ff8c6fcfd5c44f2d210279a5040e7db370cc398ff37e7bd9a202061d39cb799c2106e0377c4fea341b3f487583dd57acd8c14212642d156905a549429ac6eef7";
+    sha512.run = "e99d184878f9bbf4be65e81bc64b9e5585f6b6b1b972249d48fb183ec1f700e5a4e9a73b5dc419695f8d75afa950372d41b66601873a3122172594952209c501";
   };
   uwa-pcf = {
-    revision = 77463;
+    revision = 78222;
     shortdesc = "A Participant Consent Form (PCF) for a human research protocol at the University of Western Australia";
     stripPrefix = 0;
-    sha512.doc = "52300fd0a2e4341707ccdc4e93cbe41fd50f68b8f1e2fd77a8f317643544bb30c9df39e7e1330a0e49e5ef6e0614223ec2c201311b465ca98bdbe278741112d2";
-    sha512.source = "ed738b6ef447517cd03de47ae6b6c4286bf12e08b7dd663d5b66065e50515109aeac7d5f724381e747708e8d9929edc9931aa1e4086b171e960a8ff0092660df";
+    sha512.doc = "0d55d3b708453ce933443922a0c25c7603b4febb5eed016bf35c871a4b35bca8dd3d9df376d997bb3268ea0495ec90f281cec719761d5db29740c52243235ab4";
+    sha512.source = "80a5c7289cc085c16472daeabbe81bbf4f375b8ce8314faed15bd663eb4e5dd4f7bc7cd262639957f96a8d08478809b1da6a1855bdae6b5d28cf80156278a89d";
     license = [ "lppl13c" ];
     version = "1.0.1";
-    sha512.run = "6dfe525bba04fe7a6dc8915edd7d3bb5e03452784ad3ac2848732d0b3cf893dcefbdecab6be9abd900e131e62c23ca54af05d097a641cc5c3b0c89623b8233ef";
+    sha512.run = "400a6a0753e76aa4f4bca43b61c4efe7db43bc3ad96bb33ad4fec5efd51377841e26644b641c81d70eeec54b934a626deda039611308a629d913f01f3c1a2c69";
   };
   uwa-pif = {
-    revision = 77463;
+    revision = 78222;
     shortdesc = "A Participant Information Form (PIF) for a human research protocol at the University of Western Australia";
     stripPrefix = 0;
-    sha512.doc = "87416227afc57bf1a5a3b6abe50bf442d57d5fa1fb7a00818791bdbb043e995666a836c61e3fbc98e32e75199d8c8a7d3c2b83783e5104126d4314b40993a175";
-    sha512.source = "21b3b7112b69917258196e58b9bda5d26921597a9c88814fc8d975f446032526113b6ae2119bf19c4f641ae876673945fcbf6cd838fa4150a7492d96d3c2ba24";
+    sha512.doc = "f603d2cb944c67f49b7836308556f233a83608af5116538fd46d98a567ae303241d49a3c3fef89a32346e213717baa989ac04481ac1b7febc52e0431f015d60a";
+    sha512.source = "efb4a16efe83216477318353c522f13fded20dc15c596ed19deb4bd5d90e98d4462ad83f32cd664715f57085fdeb254a20a853da756b5948cf736451176f3bf7";
     license = [ "lppl13c" ];
     version = "1.0.1";
-    sha512.run = "513e8201354e68327c4b936f7530bafe31716607a65195ef1ee73fe4a4baa6c3c0c35323cdc14e434bc3091c67ec3975fa0a75f306b845e51234c62dd285d5c3";
+    sha512.run = "6a53b08d00421c9c2020deff574ce97c03f5fbdb51a92ebb4d2ad5ca636ea02288aa9782922b555539ada6f6700f5028b26dc7b2905e00f86eb83a0fa8c0fe72";
   };
   uwmslide = {
     revision = 27354;
@@ -52674,13 +52845,13 @@
     sha512.run = "a85699c3c3968d7090dc8bb8072de93d63714f88a41ab309c850f3ec19eee9d4e0569dafb227986a938f41c199be5bcaf75b14795827342dc9d3bd03bcd342b1";
   };
   varwidth = {
-    revision = 24104;
+    revision = 77677;
     shortdesc = "A variable-width minipage";
     stripPrefix = 0;
-    sha512.doc = "ba0c0d562a7c9db36637bb18fa6f0d01661b229c66b8f0d2bd7cbafe286b81485e84bcccd06c4d47561db8895cf8933ff11d08a8de0b01405d6c7dde443e86e6";
+    sha512.doc = "1981a3d6862d2185657c57e1afb3377ebe3bb86812f9293980ba4470b67efe4b43c2dc3dc5d1dcc3ddb68debcab46ba617719cbb5bde975f627e4736d337be4a";
     license = [ "lppl13c" ];
     version = "0.92";
-    sha512.run = "d44fcd1912f1751ab18f5d7d00ed47f42bed3ad2863b35781a83df9c881943c3e1916d003361b6e64640326541f43a37abdb0a3cdfe07e4d0cf7980dfc5fe1bb";
+    sha512.run = "5853575c5fd2cb348bbaff1532e765f51dd25080c57462653e32afb73fa81b687dd67744ca4702f87ef4ede9f3b1766d6f01565257a4cf3263e110387a86bff0";
   };
   vaucanson-g = {
     revision = 15878;
@@ -52692,13 +52863,13 @@
     sha512.run = "e4bf83ea01ff4162f95dd595b93635ed988ae081d0c65ada59ae64c6c64c730dbb92ae049d22dcc20d6204c5a7cbca5cd643be6c572e51a3aa17df88c6f1f700";
   };
   vcell = {
-    revision = 59039;
+    revision = 77677;
     shortdesc = "Vertical alignment of content inside table cells";
     stripPrefix = 0;
-    sha512.doc = "f13e941e7327f4369112f59387cae9c49f10197a2c7c4016cbcc5880759d89fe88535266f5f753b48b547deda24a3ad959b42f864b9ca2764cd593bacbf908b4";
+    sha512.doc = "972471002c9cb034154f5b13994873b49f2fb672953d9a54bf97de34d6fdb8075a4fc0bf54c968a3d79a95cb95e8fa833f0bde1806eb876f416d0336a7c6bab4";
     license = [ "lppl13c" ];
     version = "1.0.2";
-    sha512.run = "39d8f934a07095d21219d58fb41fd3e939391d5c68c51d8b9ec82a97522e55fc09a23195c8b5ae48cc3e9d9bb9a62a0b22123f467627784c767321140356d6b1";
+    sha512.run = "10ac35b5b319dc5e60abd0ed3c369a836489b196164971f3516fe4fefe8038786fb1f0547b13b51dc4b3627c77d53616d3a8a5c270c9cd4f1d71425e9a5c58e7";
   };
   vdmlisting = {
     revision = 56905;
@@ -52762,7 +52933,7 @@
     sha512.run = "cf57b84165067234f5be58b2300eebb77339c33b883895e47cffdbc7c4acb6d013db7ace1eb47ef491e21526cea8b3ab993fac836498bfa16a5cea700caedd5b";
   };
   venturisadf = {
-    revision = 72484;
+    revision = 77677;
     shortdesc = "Venturis ADF fonts collection";
     stripPrefix = 0;
     fontMaps = [
@@ -52772,14 +52943,14 @@
       "Map yvo.map"
       "Map yvt.map"
     ];
-    sha512.doc = "c24e18612940e7e3e1a7d32ac0aa1ee3a2563ea3db85152adfb311870151017918e56da58f66712779e27fa32d78dab96e99ee108db0dca5cc56d3b98c2a288b";
-    sha512.source = "dca828f4a68b4da06cbaafc497f4483a19f747342742f79a2e38a15e2011ac9cd1226c2f467e94ba4c029e7f39a8656b3eed8f1481f2b91dc499d62b6611b27c";
+    sha512.doc = "b96c306bfbc80a3c13a81f9915246635cb66c84d3626eace51e6ff927acf1be3d7e4f744509e2e3a20f8c313c771b988432f69e4a322ce564ed55131f0d446c2";
+    sha512.source = "7c9fbd1e62eaaacb01607d95b3b5495224dad221c3a67295a1361003458469afd4c23a5c021b6dc4bd6a9142ae3d0c505ac231a6e345922e082e9fb66a08d2be";
     license = [
       "lppl13c"
       "free"
     ];
     version = "2.0";
-    sha512.run = "4ec815c3bab663070292b182ac2dbd8259feedf485e7735171bf24fc6788adedf14533a521775178e52522ba43f6a6144d10999e469b9dc9c78aedc2f989f4b8";
+    sha512.run = "556e12f1ae87e0a185b0461e404c4f15a1fc4fb38ac82c209b76dc12c8882523b2a64498b043d597a1589fcbc5c44751f7f860150b59783cdc57cb7934006b2f";
   };
   verbasef = {
     revision = 21922;
@@ -52791,13 +52962,13 @@
     sha512.run = "483a75883ea602f674abec796199c5206420079c6ad5e4c3ac22bd836e7ce02f686cc8b9b749f806fe8e44bce8bd35fc6b17865fc076c72f2223143ee0e8a123";
   };
   verbatimbox = {
-    revision = 67865;
+    revision = 77677;
     shortdesc = "Deposit verbatim text in a box";
     stripPrefix = 0;
-    sha512.doc = "c9c4a8a720a9dd1381a128480312ee416e6332d7bb4cd6f59c3f3c13f2c4ba5e9445f5659ff4b64cb40059fb117ce79b27b62c07b70a81ad7e3fe987f7dbbc41";
+    sha512.doc = "70101a4d668c97bc3fb01b2c5491fa8bd9d2bd626ae449427300f2b08bcbf31df5f68a933e260468c83b442f34f54882521d88914a81e87987e03b3077b119a3";
     license = [ "lppl13c" ];
     version = "3.2";
-    sha512.run = "a2520d96ed713f3e82135395c7437f1bdce04f539ca924feb1468af6a9afb9a2707edba554f073175bf01d279576d7f3b96cd8a69ff7cd6b82f6fd9dde537f3e";
+    sha512.run = "8ce2fdafc731c81006d3bc088b6df7f4ea7c1d979e3fd646135ba96713f869536c2116d93ecd9f5a4a8ce4b4afecc5ed71250bfa35e1fb45b6c380c9fc9baed5";
   };
   verbatimcopy = {
     revision = 15878;
@@ -52809,13 +52980,13 @@
     sha512.run = "e415f9d74f35e28c73bec5442124b7c426aff8de013aa8a2af9c234ae3ea20c131d5ad21803c92eaaf6d0aef6584b7f9b83218f9665a959ec0d6ba3ef606b081";
   };
   verbdef = {
-    revision = 17177;
+    revision = 77677;
     shortdesc = "Define commands which expand to verbatim text";
     stripPrefix = 0;
-    sha512.doc = "e64d4bf3018de72a131e7688ebbfcbaa59914c0542d2c632a91097a77f404307f9bdfc613638badb3ccca3854313f17a7a5bfb6426f467bcc98ed235af6ba49c";
+    sha512.doc = "1f859aa4409b451c9277fe805bd5da1eaea9ce575c549d93ef16013c21d4a17e50d674da330b617501e6e61e8129813bc4328ab48430a8b4181b0f3eb3cffc5e";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "f6bcac8b35bfe707d4e39cf625987ddee6197977894e9f8ded9e3a715e0968d2d1fab07c57edf1d38150ae0c9cfc937230c9fccec431e73ae235a4cd44ed8609";
+    sha512.run = "ea9b5c749b7aa997c20afdcdcafba417f4948ca565d393d3a3b08097208373645388010310f17bc3c708868358f2aad1f61ab7404d8ed52365380e67d5f57e68";
   };
   verbments = {
     revision = 23670;
@@ -52857,23 +53028,23 @@
     sha512.run = "1cfc5d64e45ce13640b0e654350bd574f5db67a2ce4ec2bbb1952a0f177419715b865071e5d487d77850534c7f13723f7bdef8997a6181527aa7a726981bf9e2";
   };
   verse = {
-    revision = 69835;
+    revision = 77677;
     shortdesc = "Aids for typesetting simple verse";
     stripPrefix = 0;
-    sha512.doc = "05c72fc72bea82777cd4d961fd3454dafbfcd1fd28cba9c8cb6c5654770d9b1596e3657ef511980bf5213e63b220118b6f818358098bf092eaf2948f90cf2606";
-    sha512.source = "86e6ef78e53a5e273dc1798d6c1c3479d2723dbfd46e4ef0adb766134280ec18cc7e97440bb21234ea7ba9708c6ce6e7edb617f5aa24b96ad38d787fe2185b9f";
+    sha512.doc = "e6c0e9fb1ed034f65e74aeec028af84d2bbce98bba258b23a4fde3dd86051712898ffb3b93b5387beb43306bc30a5a542c79e549b8e0c4f22c0524f6921fe933";
+    sha512.source = "190d85b3f2159e3a402edbb3a39ec557d29e65783c0d8631f9913d47fbbee7ea4ad9a5697860eaa5c8cb5f8ec9cc6a66e9e04955bef0ea8c61926c6df7e4627f";
     license = [ "lppl13c" ];
     version = "2.4c";
-    sha512.run = "281d6a9c39f31799c76f078aeb06161878f856657c28cf82303e356878220eb19078dba9130ffe9bd396f38c3979db0e33750714a3ab85be74250b45cf11ccad";
+    sha512.run = "a258e5cea2261f6c6f18f3892f145b9a4357711e5c362ae358a128295bb8084f0db8cfdac1ff99f611fb4f95f0ab748bee15b23197d732ab9b8ce109759bf85a";
   };
   version = {
-    revision = 21920;
+    revision = 77677;
     shortdesc = "Conditionally include text";
     stripPrefix = 0;
-    sha512.doc = "9bada1489523eccc809d4b9654411addf31f2d63efc1f1f9d68b81e2bb3d9365e2709f55a77c53c3d2231b8da89114bd5a4217c8d18553234a980d379b1a0084";
+    sha512.doc = "84792880d39f34f69a21c66fde434bdbe6f442a318ae8c787a2e50b74b5f555aba28ad80c123e47f34f340f514d8b84df516b71e8cecdb3bf4751f389c2640fd";
     license = [ "free" ];
     version = "2.0";
-    sha512.run = "9b57997e63fab25d916630bb086b7d4372e094e64175caa761c20c3c2d426a58fdc42ef661bbc1ec47f2a8d9c617b7e4dc405499c01b84eb53ca0d10f6c9108d";
+    sha512.run = "a3e3c3f2cfa030063235b632efb561dc1908be95807591f8b79b5e96f333ccd73d8e3385ebf7aec61e6fa1ab2a80e71f9da7d6ae6c6fb90d0b0038a6c97aa4f2";
   };
   versions = {
     revision = 21921;
@@ -52885,23 +53056,23 @@
     sha512.run = "4a6474f6a014789daae358c5b73a85bcb0894eb67d09a530f3bdd8e4571552d0a3e1983b5ba40d33122caad8bd457f255b7f1bb34e9797c5137ccf461707dbbc";
   };
   versonotes = {
-    revision = 69249;
+    revision = 77677;
     shortdesc = "Display brief notes on verso pages";
     stripPrefix = 0;
-    sha512.doc = "3e4047566d0eb6ade7e78dc0ace0f540b56a6bcb157f613f6af0f7fe5c8ff9e47e526d68ec11b94f9e7ef3bce8fbbd26fc8c3ea115b2d1454e750ce7e15641ff";
-    sha512.source = "f986404efc03af8b3a58f07aefdcc678e0f4b37ce25f8772e145e08bacb1ebf330361d56bbe5710611d09b01d31b82e9c736c1a7419a0dc56f0fce3a5c797136";
+    sha512.doc = "91b0dfe170c050bb54ec0c71c17ccfffea12af23775b801f120b2b6a0a9fbc443433722ceed0f41bcfa12afdce7724a66c9dc80cd35753bed1bd83b890d7608b";
+    sha512.source = "e26cfd6eb9b00f73587b41eeb17741354ffb62851eb93ef7fff6b5393b7610acd7a6c65199da12bc145389cabed178e0285821c95262f6ee611bba9c80279175";
     license = [ "lppl13c" ];
     version = "0.5";
-    sha512.run = "c430ad5138ec17c4a5a12bb42149bf260b582f2a8b3c9fcb15356c3ed87073b68063df1ce8d821c456c0ed0e154137a2e3ed54b83b49a859a08dc1134dc6b559";
+    sha512.run = "356025ec9972a176b4425fa6a1af66fd6283d08942dd917032572739ea5ea7b3623735919b2078f8a52f40fd21e2a252fb122a7c3e3b50454751f0b1a8b4025d";
   };
   vertbars = {
-    revision = 49429;
+    revision = 77677;
     shortdesc = "Mark vertical rules in margin of text";
     stripPrefix = 0;
-    sha512.doc = "de6df3133c801e941cbb00c552cb2cdb1d556f099c402a0a66f460d5c7c1c6e28ec7d983563f20a609a5b5266420dcf8c204d1b6bc685031cc41fe2770a5ea13";
+    sha512.doc = "d858465470a2fba053287e9bd8c4d455cbd0c440b09b13df9145e8fcfc1dcec5a411b4a01c8a095713bd7fe0bd64801dceee5a3118646aef40ffe1529053c2fe";
     license = [ "lppl13c" ];
     version = "1.0c";
-    sha512.run = "3c3c905c6bcb013a36bc2eede14d84315f49075ab5f63376e9a440e4e7fb281ee5086b5bf1953782641284027dd8e7058e0accdafdc9295a19ebfc0088d8f7e1";
+    sha512.run = "a88dccc339aaa5b3713d840bbe7fba557bed78c590ce577ce967954e4f1e525451bd4b58d30d7c6a56473a2302c95c8ba2ca56cd8c5cf3479985697fb0c9a351";
   };
   vexillology = {
     revision = 77381;
@@ -53052,13 +53223,13 @@
     "vpe"
   ];
   vruler = {
-    revision = 21598;
+    revision = 78116;
     shortdesc = "Numbering text";
     stripPrefix = 0;
-    sha512.doc = "dad09087e028977501fe143ae050c57938500b8aa98bddc1afefb298444d17c37cdc5b9db2e9d01df5e9f6a47679e0659b21a2844d268f8b324a24bbf22d9492";
+    sha512.doc = "e0d73a1a12329f461698ac466c2addc2857ecc49bf763b41aa5511cb35bce96acc64e06d3f01206a4c728c8a9d6072eb4ef7056eeda6a5341d271b4ebc4c4abe";
     license = [ "lppl1" ];
     version = "2.3";
-    sha512.run = "39582bec5217d65179b4293a18697cae20b35a0ec5416497691d16dbb919d78d4463ae15f2f05d308f45c65481f611a3f699cce9f5a3c311b84bde08fdd5f234";
+    sha512.run = "e12518ef2807d27c4a3940e220be70c599d26fac441e846097aa275162b845176fbad4d55c39796ae658287b5027141f5d6b1a9c16cd414cd941bf77d31bb8ff";
   };
   vscodeicons = {
     revision = 76927;
@@ -53083,14 +53254,14 @@
     sha512.run = "ed8dee287daa32719b6650f43b963fa66cc55572526162978fc5245d3c253f027548ef5f1cbb38423c30e6cbe93b3418c373615ab92532be40d947c979f14b47";
   };
   vwcol = {
-    revision = 36254;
+    revision = 77677;
     shortdesc = "Variable-width multiple text columns";
     stripPrefix = 0;
-    sha512.doc = "a4d55b62caf4968d3e8329fd06f8857f646c5a867fbab23ea9bd7fb57c5b88b5f3a918642bc608eb1ccd936dc2e36edc50a5662667b8bb35cc59ba1739b2e7bd";
-    sha512.source = "8a605a7250f939789fd863abf6fa2b5da37b8f723460ef2e56ed93dc826363ec1bad03f5bd2af266ede11ccda04546e6174c0dd79282ba41ad6c3d9923ccd51c";
+    sha512.doc = "3e688b44a30aed838fd26676925b66c3ba4ab50eb659e4f27e1ef733628e7a409a0c406fc18abe7766e051c40a5263097421b767324a7234e0ae08226938939f";
+    sha512.source = "774183686f0f6fa664660b4ecdf5662a933332e46f955acabdb82aef472f5a3d91e1403755c1aead0f48c519eaa461e5eb9131ac64302fcc9ea3f2c76501c6af";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "3963b738e1214f7a495daff6476102e6b25e86034c552b5f4e4314af55e4af073ed94a72e969dfd1fba16baa0264577234917f7dfd074dc85f9c56c5f2409903";
+    sha512.run = "3f7b9c46786d684bc68679d6c1d0db8152525cedcfbabfd335dd899f687871735f5de33cb219ee004df5243a61340e472caa4320e88fb47b47583adfdcc87704";
   };
   wadalab = {
     revision = 42428;
@@ -53118,13 +53289,13 @@
     sha512.run = "90f91bae81b0975031ea7f349b7f55bd902303708be32af21af409a48ab2298a2c10a5fd4ce0aed8bb303916475b516e21e74f1e060eb6722d456b135132b771";
   };
   wallpaper = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Easy addition of wallpapers (background images) to LaTeX documents, including tiling";
     stripPrefix = 0;
-    sha512.doc = "46b890e0ea7bbfb3c3421f79338f5140a105bb90cbe712477e2dc956f834682f6d137e39492437d8f206fefaf07086cab7f3cdd6c27dc7136df54c5ba850b4a3";
+    sha512.doc = "e39cd2b855cafe25c5551280f5acf19fbaa30e109af01a228bd4043f5fa45d69a958b319b046f576ece10ba16b5b6428c593a3e53c6f6147dadc4b8f4976cb63";
     license = [ "lppl13c" ];
     version = "1.10";
-    sha512.run = "45647b8f8ebab9706437be2ce63f3506638fcc794839ff366210db4c35a3e16b2a39127fcacd0d97df356180770b6808e80e63ea1a50e69fc591cc0992e1787b";
+    sha512.run = "caade245def2c4c461b5c0344a28928158a99513fa74a86fcaccf1a3bd8acfc0268c0b9f20c944cd040d565f335fa1aeda16c373963b89c21a22d3a07586b115";
   };
   wargame = {
     revision = 72903;
@@ -53146,14 +53317,14 @@
     sha512.run = "21458ecf0d38d9b70b1c259591c6646d4d443b7393e5326503c9358dc263a383bb6e0aaed498d1350a68d16ce8c8e76a2854c72df5ba148516d0d59bf6100125";
   };
   warpcol = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Relative alignment of rows in numeric columns in tabulars";
     stripPrefix = 0;
-    sha512.doc = "e88082379e90edf1517579009881204bcb70df888593d7535e2b1e5b673cf116a456967b0ca5ce372efef9dc0818b9d0dc252be79819f6b346ad8619d70551f3";
-    sha512.source = "843965fdddfffe6bec9567e140b9c6db66f60d1eb90ff5830b08b17499f21782ae1842989d479e50c293a8e1d7e2a9ab886622b8375384e1238871d6872e9e52";
+    sha512.doc = "98adb9759e0d84745d2f8e9ae1220e7ffa6b838e4bd9930830209978e313916e358b29e9f7bdcbb93c201b36ee450710d06a205c864c19f665949cd7ab6ecdf2";
+    sha512.source = "c0343a0e55e173d04da078293679f690d162e6c64760c9d8571b8e52a4b023af7c37c742495073624bbc1d451577feb50afb531825ecbd009f56ebc9d5e9feaf";
     license = [ "lppl13c" ];
     version = "1.0c";
-    sha512.run = "66fd9e243339e0841576e1a1a3de05f2e69a24a7e1dd31eb38d848d06c9183f691229d8e89878b661c7f6524bd9ebd1380fcd4c9b175feb8490cd4476ac81303";
+    sha512.run = "133e0219211e8f6be7ecc6a3fe2b0d8fdb9d9173f3854a6c46479f72c9e6c0684da03df85e4b220cf6fff8cce64547ae47a19cd233317ba8b0d94ab5fc0b248f";
   };
   was = {
     revision = 64691;
@@ -53189,14 +53360,14 @@
     sha512.run = "d7131c025bd97bdaf62697feb698da97d175783e4b0502d3e85b60a663f46a0520268a6063956afaddc6308ddd21954992bf8d216049cb324133e3760ac20825";
   };
   wasysym = {
-    revision = 54080;
+    revision = 77677;
     shortdesc = "LaTeX support for the wasy fonts";
     stripPrefix = 0;
-    sha512.doc = "ffa36c6f1446c0dcdf1e1dd8b47946eb84d666714d94eac28c857170c9aa414b612486fcf107ae462c50ecafd6ff20c90c776abb5774db64a32aa07be8c58b2f";
-    sha512.source = "12dbdd1e868c3382e7ccb5a507b7f72c20e3df3105e272c00b8b6294f10c1099d3c6c7b1a2db5bc96b866e246807604b615d8278357d0214539a8f959de14667";
+    sha512.doc = "4b135faa5e2a47ec57e8f7bf1646a66c776f6fae54c28a90be78dc151b5ff4f10dc200a4c6560d2d231e92fadd3f1755dd118e8edd0875a84c6f6a3d4d0121c4";
+    sha512.source = "a0c824b16ff53e94be9533c261fe194f43b948ade9bb4a048946c2aad216f970073a3b472557d0e490230f78ad8a09b98edb174e3d23516e79962f9c4eac0d14";
     license = [ "lppl13c" ];
     version = "2.4";
-    sha512.run = "408f9c2b70d7860f7d8f7ee7f93af1351442b92aad9c8d8e4a501414058d8347e6da2408df3d5b6fe217597861eda5eda499771a7e973da03597f24b76250da0";
+    sha512.run = "a6cba48ce5297083933c64e8915a5d1f4bc895abb031aa2466f296eb9f7f22f388b611df4ba81ce807dd72871ace989806ceb781384e0345c02f292f7a272240";
   };
   web = {
     revision = 73848;
@@ -53236,14 +53407,14 @@
     "webquiz"
   ];
   weiqi = {
-    revision = 76924;
+    revision = 78116;
     shortdesc = "Use LaTeX3 to typeset Weiqi (Go)";
     stripPrefix = 0;
-    sha512.doc = "ae166125fa433b05455fba337b678a7aff1b692ed61230eae37d6d31619eb575d82c2b610f459285f4b4a9b0469bde914042ac35ea62f936f3e8a158231ddc79";
-    sha512.source = "befb829141fa01f9fa9946afb23155d02706351180cdd84f6947825e4ff13727cfc651d51c117f1216da0554ff75e9973977efa1a60cb190e43f5094dd7a9d34";
+    sha512.doc = "d45503e68860f852931fa326988a373a0771b93a67ea67de20fc2e3bff7cbb8ea8ebc9703b872b16c6aca93b5ef7dbdc3353c18c3f877736d3523f6966b0fca5";
+    sha512.source = "b042a4005d08fccdf4147752953d79a03ac369418a3ea42dbb61a6ad2d902796bcbd3558bccab3d6548ab35cca8babf1c4ac78a21105c05897abaa85d9d14057";
     license = [ "lppl13c" ];
     version = "0.1";
-    sha512.run = "49420502206972f4591cd123b7c167b3b181375d402dac714bb29701c5c70854f84dc1d7a470b8d0923158031d174e5e4d629d38d3b40638847cc43488b56726";
+    sha512.run = "03d806878fb454152cf6c0f36dc6f8689933db00f81db74ea6541c37e164269cc5a917df7d5a5c23d937945224356981c304164abd10975cf13a11bd37c5d17c";
   };
   whatsnote = {
     revision = 76836;
@@ -53256,33 +53427,33 @@
     sha512.run = "73a6e72c03b456ad8bdc90f92a4a4069f70bdea547a968b5ab189eb843d705f963be92fc0909918e57278583635aaff3bfd4e03edc0dbd900baa6570fb562acb";
   };
   wheelchart = {
-    revision = 76924;
+    revision = 78222;
     shortdesc = "Diagrams with circular or other shapes using TikZ and LaTeX3";
     stripPrefix = 0;
-    sha512.doc = "daed1cb5393d0d60d9804496c20eefefc19bd88523b342597cd37ea82562b5fd17d35154d887f4a3da929670fb5c80d99fb635f60dbe5314e541f02b90aac116";
+    sha512.doc = "9b9399897f5101a7f2bd9f534b8d2eaf1030619988434268655e18a9af62032eee53d11bbc4bef66a4ff1ced23db86c9e264b01fb572b18cd934f8a0fb35b95e";
     license = [ "lppl13c" ];
     version = "5.0";
-    sha512.run = "17a28ccea933e58052ef789aabf18e7e58aec8cb850d225352a9fff1264e7c052559e2bb052818b44ecf71da12a9692c0425f8f5e37c75e4d0c1f8756b997f09";
+    sha512.run = "650cc4b114428ad4019b83e22a2006154784b032628a58728e4cada05dbe5ea0ad746342ac8d2556258176525b6ecc717eb8f9594abf8567117d1bdf10ea11a5";
   };
   widetable = {
-    revision = 53409;
+    revision = 77677;
     shortdesc = "An environment for typesetting tables of specified width";
     stripPrefix = 0;
-    sha512.doc = "5f254468e606aa188030c95c79672a6fb0211c0b5c4df6c3fde98c43ce1fd89993d495eb750b58395175e2b6bbe3e9771895627a04bdb8839fd4d0a143c1ab69";
-    sha512.source = "31ae40849337a8c6a7872621e55ae2a53b1a7d4d1a7907e18f5aec07f94196636b99c26d46dd8c10e1494a35b86d435a014a229160edbbfccd064306fdf06598";
+    sha512.doc = "ac7017223fb4041d1432705878995a1522dabdb6ef0fda58e212a31f465cdea0db8897856375ed95ea465acdaa6ed76a3aef9ddde47ae0dd90d61f6bb2ae0d2b";
+    sha512.source = "41d6c9f29992a7b98edea17668141ddf01b94c3a865feb586750e2b83fff4e07a594e3c11e6773a5b4a08da7293f227998b7a49b33fcfd9e4118164969b2b22e";
     license = [ "lppl13c" ];
     version = "2.1";
-    sha512.run = "bd6c85eb76b1fdd4b7e81ad24ad7d282b79e4234ec029e48ed63611260b00e8b1c584ac800c45643e466ff6aefbf953246b24c1bc6453098a76b71ba01624821";
+    sha512.run = "6b85f8b233a7febc6a79b8ac4074faba0a7edb482fa289c2e14388c39921b1dc4f68ad85d6e9365269bf88eb3d06ccf7ada44959aacfcab131239214ab4ec120";
   };
   widows-and-orphans = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Identify (typographic) widows and orphans";
     stripPrefix = 0;
-    sha512.doc = "5a6b91396a2c3a28ab147b20f4d52c50f297b28aa3ba59b4358ad0033835c29e555bfb0ad93d2123ea168cbe3c05700a16b167aea4b64841ea2a7759ec65ecf4";
-    sha512.source = "0dec27642a55b56e40cc1f391d20ab943416bf220ed01bd2d11679da837b78fde2d5f3f6e54b5933f67a557bf283a262b6c2f68282cd46c0acdb17553b423fa0";
+    sha512.doc = "0212e4d7479ff9e1e6de5cf6f5826bd463c37b09a98c38b268badc788814a2aebf4113340c533b60515f1c6d0eb13ed6aa0c18f498b1e6501364e5786fde13c3";
+    sha512.source = "20b765a0b7b7e17b4bc71c33b7815c70aefc9a7af5539eb3404e7bb6dd7da9281c854a58cab873ecd69b6b3cb07535dd16b82379227c552d63706a5522db3d4d";
     license = [ "lppl13c" ];
     version = "1.0f";
-    sha512.run = "e269f4b34c46330d97362836f70fc44e81a8447d8261855bb73e8bfd94c257d270b15262372a1d6ea512529f766ac00153875d30d7f5eb2650ce7284c1f05d7d";
+    sha512.run = "851843a4936198b81dc73243c0562343b837c8c6a25bf05965084e37faa74f0aeaa0873554d205475332a922915fcd68d0fb6e9ecd8de80ddc8c58767fc7fa47";
   };
   williams = {
     revision = 15878;
@@ -53319,14 +53490,14 @@
     sha512.run = "e545a36f90a27ce327854c172449f6ecf4c6ebf8c7d51e24f3efd33df91574aece4af4282383b8111027dda5021c17876e9afd80da23a7f05f5fd9dadc65ee37";
   };
   witharrows = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "\"Aligned\" math environments with arrows for comments";
     stripPrefix = 0;
-    sha512.doc = "98513e3b7b6ec8912e9d73fbe9421f0ac664b0e7a5f1bdca63e0921d8196d40c51f66be07d933473285d69907fb2cd86566ff3d4092a3caaa3f0cab04ebdb044";
-    sha512.source = "f1e9e2e59c38ce037dc2aa5dc63536468f01eb5661ecb4f14d0335f0fa56bf9860357715fe7bfa889afa0c6de136dc4d389b2218aae18a5cb4658c98a6eb96d1";
+    sha512.doc = "6f56d779ea495ae456e10015ccd1e218c7d53106ede3c0b0979f55f67e4345de395aef0964f1211807e573b55a2aa01a761ea30ff7134385e9ebad7628c270ad";
+    sha512.source = "a326699d6c928052686771383ba58187c7262aa343aef201a77d6fed2cdb8a4877f94e11bf2c7a3ebb1fd8bcf939979333b3d95f7e65284d0f4d5ab1a7e789f6";
     license = [ "lppl13c" ];
     version = "2.9a";
-    sha512.run = "54f3bd52776278bbe534db0862a5eaf508318cc800a9e00346bf8167623c2448e67aa78da20338f73a04f2fee1b2a325c7635d94ebf321dd0bd4811e1d9d9cb2";
+    sha512.run = "bdaff353676b9c8a81ebf3aa15f23781dd9396fd56a056d0e9e7e82b460057f575ea5076b77a6394b274cea0d9f4cce9db32d84073a385e9bfce4da9c4679ed5";
   };
   wnri = {
     revision = 22459;
@@ -53347,13 +53518,13 @@
     sha512.run = "1dcecf9ac38a9099625ed6be3955af8b063ee5b5b8d0d3e3ab8c94a8215b72b86a0b5dbe930eb69680917bd3d6652b3f4f08bb377197ab6f3d2fccf2b96aa59e";
   };
   wordcloud = {
-    revision = 76890;
+    revision = 77677;
     shortdesc = "Drawing wordclouds with MetaPost and Lua";
     stripPrefix = 0;
-    sha512.doc = "3c2f5a23b621b6dfc32d90b156a0dd8b5ceb739b5974c2f19381b12a49eace1462ec8a2116c37537d730e58c5ad207f94ad44d8475cc8058f76141ed82d5b5b8";
+    sha512.doc = "20fb3009511f9294546f692ae0352ac50a2410fcbe3ed6608f911295f98a9d1626b33c95d9b7e9c48a277fad3101bd349b8d0d10ca15248b642cb4a480c7fe11";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "adfc659da7ab86c7a207ef400f28eb15dd6ba3a065e1beef0b2a1c64140a6f1914d14f3e6ceb8621f79ebab6193b3c6af0909eaaf65cc9df943dfdf0db3262c6";
+    sha512.run = "7542160c0ae2f8a4d65697c6a9c5de6edbe397d591db8dffb60c17e9d206e3611aaf19fe0163ef8b168f705041ae6d3a665986555080ae0db589f7a3f8a7d052";
   };
   wordcount = {
     revision = 46165;
@@ -53403,37 +53574,37 @@
     sha512.run = "662c7b2cafb1764a42a94707f350ffe0e4060120071d715c3c1cebd21b2c64f2ca0896ac3c9c1e629b2fe4b057bf0b890805747a668b6a8c04d501a4ac1ca1fd";
   };
   wrapfig = {
-    revision = 61719;
+    revision = 77677;
     shortdesc = "Produces figures which text can flow around";
     stripPrefix = 0;
-    sha512.doc = "27aa1cfb0641876516eefd483f5f37e25e06c24bc255fe81afadd985d9a5ea73d311184ad46120d57d8dfc584da02f99c90128c6e0cead71064d00c1bae09f7b";
+    sha512.doc = "95f0bfa7a8235981344d3b59c59b662b0cbe468f15ef94db72a6dc5e49e12eaa982017de5c764a041f685bd00628c0773def2d135dad0b2206ab6242802938a3";
     license = [ "lppl13c" ];
     version = "3.6";
-    sha512.run = "afa6eed496f63dda436a9a57c9f056ae88fb7985328d58d81fddde743a737b1ec69a5409941a76a28840d938397928925500628b2e11859713871977545278e2";
+    sha512.run = "6f851bc4b7da8f465933e342e19ef33ebb49a1b74fab7fa64d73f39d3a550af65c1f7eaa6970ff0361c882e0d53c061df5f29fa076610c214c54ef9e505376ac";
   };
   wrapfig2 = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Wrap text around figures";
     stripPrefix = 0;
     deps = [
       "float"
       "pict2e"
     ];
-    sha512.doc = "6e01dc679e8bd324a28f1e893fb959ec5ad83806502d1488bc775c93813a21f8c1de793f0b224e0383cf11133e47f3072bff90bdda08c43d6a7d46417b81294e";
-    sha512.source = "17ad565e3144d23d392b20f9cbf4a3f3ec1fba5ae750f56dd315c1a6581ea50a34669aee1da14c400a04733a50413ee66369674766bc3ae4a5d3b3319e5fc9c6";
+    sha512.doc = "a28230ee3b9fb4a7cbe18ca8d2ffdf9d204aa43563a8197879f83fb6bb2fc18c07f6f2591076b2ecbb54e350a9f3782578b97880b5dcad84c49a4eb6835dc598";
+    sha512.source = "21e8a62499196c0f19c1756df5719d99c6a8296eae088507ec33b5ca11a73b46ce8cb814a0a40a50d98ac5526571688c4380cbf7d580ff4cbce2c2796e2cd98f";
     license = [ "lppl13c" ];
     version = "7.0.2";
-    sha512.run = "8cc4b6a7b05250460681c8777781ff8fd0a37894e5535d58536742b71712e62934b1f59ae8137f23de9f22582ed1da12607cb598c6640781fe65e53de3a9e868";
+    sha512.run = "5bc739160198278d7ef2b71a101f8840bbe6d1d085e82b3171ddde4bfc237d823ea5f52a84f003368b60a8103bbdafd4fb4b501efd6e22f7aeee7ffaef0b716a";
   };
   wrapstuff = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Wrapping text around stuff";
     stripPrefix = 0;
-    sha512.doc = "13f92d21d8558fda9f6f40d64b3bd0cc014336e11c51aafcb6f56ed1667f3db7ec44548829adf8a4294598f2b3f9b8715db3b8b640582beac8291676bf69a093";
-    sha512.source = "60a4a2bff3329d236392540c8f75da40f64f927b53b886e5d77c12da32aab84dffa8d094ba1afc2fd5bb4e458b5c040c7332a633f92701296de6650499f40ab6";
+    sha512.doc = "48a4b72c649abfb6fc33a28f795aa959902e1e0f7f099d4fc2cc5655861ea61e60f64c403fd0477ff40e7978e14927e6974e3fc0dd4aa128e61a93355a3a57a9";
+    sha512.source = "402db1dca16916c4ba7bd3e97261ef935553522e860a84ea31da1eefb338873c9c8c6912ea969db364f0ad1640535fd029f4a546c6c0a6fa783e3af50c1b4558";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "786634708ccf78e06aa1dd18b975ed444a336c61621553be22b4686cb188d9faab2c15f2cb16c2e0e9dbc018ea35fd3e4c443d86615c16fd9e57c56e44fd1c53";
+    sha512.run = "cf028c717b2f9047cb22de95d4e8688a4b02d9a2ed8112211fd7afb86af381fb987e83b1d5c2674efd6f538c9f311a6f9762c5a763c86c401c36e9d121036d9b";
   };
   wrapstuff-doc-en = {
     revision = 71835;
@@ -53480,14 +53651,14 @@
     sha512.run = "abdaf96d5c4cc919fcaa5343d25243266f86dc079cf701d71f047b01874baabf20a0c7972a6aa863c7f9eb9a003eb5a516714d57fd453574e7a2c8ee2e500e7e";
   };
   xargs = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "Define commands with many optional arguments";
     stripPrefix = 0;
-    sha512.doc = "387a051eb8581b51d2042bcfae2ff9af99659d664c328c6b30b3789c75fb73687c32e2037df7a345335966671a3e3267ff4b9e0eead0e5b759bd305850ef22b6";
-    sha512.source = "e4717f476260648eb66fefeeb125606c16d302bbad32c55730a0102da355d0c828b106b25391f69bb34627f56cd7659dc185bbcd36ba7f5a8f0b77a0786a7957";
+    sha512.doc = "8e81648dc18386cf191c8ab68b2fa6299ecb9053290d7846a5e0d4c98cc247acb0d8fae083d445c38fff6efb0795f7d2a8528d4731efb9e1a8657fde45bf45c7";
+    sha512.source = "604c4522a6efb681b9ade587440a370acd125b5e502b5b77fa5b87181026ca95e0e9fbb857d3d62b918a3f19979b557859519df8bcb3a613d58b28e91673f86a";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "43b9cc5246123ef3c424614415e04db9e7a578eef348c3d580626918a4c31ac99714cf501dd54d305ed6ab9ad7e0533bf5b39250c43ad682032dd676a12173d2";
+    sha512.run = "9cb3bc5314136c9561691aff6f5b26c719b59ec65742b6a768525f002caf4f74856d2276d9919d4180a4e2384cf86fe7de6ef20474be5939dd72274a6e1ba05b";
   };
   xassoccnt = {
     revision = 61112;
@@ -53523,26 +53694,26 @@
     sha512.run = "10215b476401e94c1910272dc9873530f519f3389827d3079abed0fe58f264a721b0c96e4144594cbdbf4c96e1837b9cbeafee7ab9198d1bfdb7e04241c66599";
   };
   xcharter-math = {
-    revision = 76745;
+    revision = 78174;
     shortdesc = "XCharter-based OpenType Math font for LuaTeX and XeTeX";
     stripPrefix = 0;
-    sha512.doc = "442544b2ed4bf1c556463c9f27cee3bb8aa0307bbde3f2fea459c341bebd4eed54545b6357c7c4a7e989fbe015e016c208ea93572b61528d544eac40e87cef5f";
+    sha512.doc = "db5df242783a80b01108ceb0b4f43ea28e3327740406744aa68f81fe5eee209efe4ce41023390156f80cc75f6156ff2bcfeb7b72d2b9e2c6945535729ea7013d";
     license = [
       "ofl"
       "lppl13c"
     ];
-    version = "0.71";
-    sha512.run = "0754b31779446ef04678b2a9a9250fdc5a267a7ea1bc894e254571260463abe79a180b305007a43608f66d049d02a2710e91f286615dd9976048ceb761aaf88d";
+    version = "0.73";
+    sha512.run = "011eed780e0b316e824f27b928fed565a044a2f5f2969204ce3d0e042b4c755d3755a763f501425fe075373b2f26df85cbf9388549b6f7a53ce6b3252c6db350";
   };
   xcite = {
-    revision = 53486;
+    revision = 77677;
     shortdesc = "Use citation keys from a different document";
     stripPrefix = 0;
-    sha512.doc = "11af105ca5f1610e5cfa226cb191d1f69d257e21439c2408283572e136b183518f58631ec1b0b145a1edf50ca58e9a1eda789e5646c47b46f75a6325c90262f5";
-    sha512.source = "0f6d0e7206b59acd468dbd77ef3358d2865f48e2d59ccae2ec185759c137b9db99bf417acf71ec40cbafbf2569cd9b4a74a97b7a3959f51f1703af9a026486e4";
+    sha512.doc = "5880aba554290af129777754972636b93a4316fb2cc2292b7ab791b41806c4d3f0f04782b54a481bed4958d64aed144c88ac5e99ed3bf5bea4e4aa16c55d8255";
+    sha512.source = "6b572bc74a84adf7c09eb58d0f2565227b14a2c816aef4750b8074e1077bfb5133f36ce170d35b66f866bf4572266da4d1368849e4160afdde2818e1f71a2af2";
     license = [ "lppl13c" ];
     version = "16383.99998";
-    sha512.run = "0412a4f47a044efbd22adbbea9cda1bec44379dbc799ca83821d4650e8e40f6b5de51b80ea6a80d747639a9b840b7cff6612b6e4df0b2c09c0f3ed506d3de714";
+    sha512.run = "99cb680cae2eda96ff8a075ce21992df9a18acbd1a171de3003cb79cf6fe84b98c44478d7a39a118afc2e53e743e180b0e9ce1e73d69c1ac87aa7b5a8c9508f6";
   };
   xcjk2uni = {
     revision = 54958;
@@ -53564,14 +53735,14 @@
     sha512.run = "7be16f92de86fe67fd34857f7151f197e5ae52e9ab944e0ef3603882585dfb240b8e01072747b18092c6ff060f2f4c341b27e106ffe8864dd1879c3965435e47";
   };
   xcolor = {
-    revision = 72484;
+    revision = 77677;
     shortdesc = "Driver-independent color extensions for LaTeX and pdfLaTeX";
     stripPrefix = 0;
-    sha512.doc = "010f65991bbb53c03a7539735e7d7b58d978cfd84cbbf2be9e4f07e13c9b52c158560e5936f18fd940395262c2d886a427c272435de5302cdb306cca21feb1f3";
-    sha512.source = "e61e4dba30fdcaf8df7759e4f8a718f6c256419b05729b2009007de0dee4af2ff023277997b2693f2edf0d7a4872849a00897325385afbfc364c69966d993ca0";
+    sha512.doc = "357bd96e5d64619b3ac127adc20f4440a22ccc9ec285224bc8ae87a1e230fb46b9749be18a52837eeb934f1bc5b70d9f07925c064791fcc2dccfbcf20d4d51ca";
+    sha512.source = "4bd373c51c8a42a46495e77e5a3ec304fed1420496b4eac08241acd80b7b9feb82f9c9af069f4f74d3369341a7f95a6dc4b071096940add7c7ddabb68f0c8e8f";
     license = [ "lppl13c" ];
     version = "3.02";
-    sha512.run = "255a76dd0879aa6f5a8be38f84ba307cfa7595c7e2b4b9d92cc85867139a17951f230c10dc130dc1c10c612436adaa47a9222556e8dad126e91ef5b8b12d558a";
+    sha512.run = "dd516a3bcd38118711c37fbaa37c202e97608efe28c087e3e372167e7737be9fe6391638894f68a39dea2b41dd2ffc18d9a4b8f854225ba006f5fb4467798def";
   };
   xcolor-material = {
     revision = 42289;
@@ -53594,13 +53765,13 @@
     sha512.run = "fe743e9aa394c6a8a75f8c9e87cb7349d87df114a8c5753a157d4dd129a677af6a0381969f7719712a9abbb9fc720e0d19f8e7ffcc2bd7ba09ee8cb3df3c8d95";
   };
   xcomment = {
-    revision = 72759;
+    revision = 77677;
     shortdesc = "Allows selected environments to be included/excluded";
     stripPrefix = 0;
-    sha512.doc = "97bd8874c11f26b7c06408dd3a50d36c0be5e1e50ab52005335ddb4754e0aa0064f450057d2105b05a181c2d9f94a65dac54e71fc3aa4d83a140e3ae8c1d43bb";
+    sha512.doc = "7cf714edcaa46903223fa6b6665cc3025c53d2bb9c1523b549e7d7a083badb25e1d82f2dc95e81cb735dc10a4d73136d9781cd2b43a7395da766554d2e525b4b";
     license = [ "lppl13c" ];
     version = "1.40";
-    sha512.run = "e27b253d0ff8bd8c9eaf07c272cbb9017dab30bc1f1542f0f00e5d1f29cdca36c1fd1ea65c71310aba6395f49578385eb92b47075a371d65e89c6523ae97800c";
+    sha512.run = "c7b1725405ca02dc7df3ebbb864c2469d1cd032f3b3e957b5ca2ac3e4ecb4b443382e639da6878d2e004181b64f1d7475f0e203fbf25bff52726ee42cae30647";
   };
   xcookybooky = {
     revision = 36435;
@@ -53674,44 +53845,44 @@
     sha512.run = "524956f4eefa999e17f7e8465782d420ac18a18e58a25de73fd571c6ea03b05882bf08cb47935fb243f601b7faa0733e5ad57a2faa6108ff2de3275bed4a4d41";
   };
   xechangebar = {
-    revision = 54080;
+    revision = 77677;
     shortdesc = "An extension of package changebar that can be used with XeLaTeX";
     stripPrefix = 0;
-    sha512.doc = "6d2c385b3b826b8b97cb725ffd3e7479ec3ddd2d2bbd8c772fb0b1faa9d0edb758871003ec379d8ec349fc4e3f7de2bf3130cc0e5d9e356ad472232d16acb546";
+    sha512.doc = "ec2dd572aa6d9d6a222a769f7961eca7c2c39898a2dc88ea5b9eb89b47bea24ca82572d45866c15f68d7979daa1a4a045542685aa55ea1a0126c2c38cc0b3062";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "833f0b1cea32c0bb345d1aad5360613ee36baf17a35e13d20a4bcc75edc77b3a7c48c4406ddadd670890cb93dc0d03cf91462994271f351ebf2bc221bfbae5a3";
+    sha512.run = "f60c5c108fdc47ab56596b42b73f55c17afc1e100a7e06852d45108108e35da66dd736c2ba8d417188c6208383dd1ec5eeffd3355f60535e7e9e7567e03c3ffb";
   };
   xecjk = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Support for CJK documents in XeLaTeX";
     stripPrefix = 0;
     deps = [
       "ctex"
     ];
-    sha512.doc = "d3b21df30a9b4479a1bfc54b63d55fdbcd4b4194a8fd67bc54e684f3881095cb1ca8ba04fe8cc77aecd8f780c5b6ab6612d3e984f65b4cafc993de5879f5f977";
-    sha512.source = "ebe403f1ac327f38555c73877ab460f45bd7f0cc910ac0b3a8200bc6dde93563d2627fa5e1d8fbfa15397c6cf41b8c071368b5bafcc6291030b686ad7f4ec881";
+    sha512.doc = "91cca375efc49f5ed43e1cc5a6281eb07a141f86966249e6dc3dfe19d45c82c42034e709c206beef5a6a6558554a7d639b32dda6a21c276b198b76a709ff5e88";
+    sha512.source = "76bce11df9be77da1c737dc9891a2bbd10e3d2c7cc767e57909d1e857b8946de1a646d6516a4ecb2d710ea48e2e77745d67bd63934b6c06a873ed87af7988a42";
     license = [ "lppl13c" ];
     version = "3.9.1";
-    sha512.run = "7b8c8ce5cf21b250d2829395c7531f84d97c6213744dd280dc2f5516a29c2cc02e5b9ac5ad5d2787760d287ebb3761775616beb39fefea3daf98d92ab49034c2";
+    sha512.run = "ca64f678026b30cc798e4fd59f8a1db7115f03f2bcc74d5aeb1014a54df80b5485ec553433eed2fce4b0808e139b6c772ef1f2f6794142d05395231f6736deb9";
   };
   xecolor = {
-    revision = 29660;
+    revision = 77677;
     shortdesc = "Support for color in XeLaTeX";
     stripPrefix = 0;
-    sha512.doc = "9441eff384f57e8714cc543ade380ecc321e6c0e7dd0ae69c71337458e2607a43f793b490bfa6752c1c70bdb17be92488b89ff848ab9a3a1700907c15ed857c2";
+    sha512.doc = "c634c1be378c33aa4662dc7be909c0d7b7370606a8d308ca337505057f48e197e6dee5ca61e319d42352280aa61d4dcb35aca6cccb02863b87fa61c9224b8d2f";
     license = [ "lppl13c" ];
     version = "0.1";
-    sha512.run = "0ab23e651b36f06256fab5acb14effc93296948aecf7c7f11c81f4db89a58bfd8e038dd857a1da3a86ab573cf0ffb1d1bc188789e0d493ab0d0c1c9d96d593f3";
+    sha512.run = "ef3ec9998d11f9141af9efddc058c9a0b68f7daabfc2c265591761592b06cde85a588f4a7b2248e06774f647f357b17a2c2a2b0d768255906e1c254dda1d6495";
   };
   xecyr = {
-    revision = 54308;
+    revision = 77677;
     shortdesc = "Using Cyrillic languages in XeTeX";
     stripPrefix = 0;
-    sha512.doc = "555ef35f9e50450a796c24b87295eeac319d087a61e4fc7cedafbc398cb9a5c0add8b93318b8afadd82bbd2ca90dac9ade02dfbf286ba825c1d697b58110fe5e";
+    sha512.doc = "d873249d92127a9d9f9cee83cb9b5690acda4ce3f3f60c1d556422378aff2020c2a553e8c355df1c7f99c8840a506d91b7a987a94c15ae3d0140eb9c909c72b5";
     license = [ "lppl13c" ];
     version = "1.2";
-    sha512.run = "0429aa515115ef69811069b08567c97ce40a8be68ebe72f26b8e94947abd86394204b21bbf25ae44c616a806878fe9900f5a639bb8707106836103ec06663454";
+    sha512.run = "0bf7e7ce06d1b0a4f4e50fb6cf06ffa04e183ff82fde025d106d474934d6277ddf41bfd79b45979b0bca5d33adef63ea7e69be1045e83db775fcd2f8c41c292c";
   };
   xecyrmongolian = {
     revision = 53160;
@@ -53724,13 +53895,13 @@
     sha512.run = "2faeeadc81ca7f6fba45b6b237fb604a6eb6e8888117f759f6d369ed354b20b35dd007eb11c017e4f0ebcfa99627f519b291eecd1b41505d7f4ecbfc23307784";
   };
   xeindex = {
-    revision = 35756;
+    revision = 77677;
     shortdesc = "Automatic index generation for XeLaTeX";
     stripPrefix = 0;
-    sha512.doc = "c84682c8034c5e182bcbb2ac0411f4ba5d8065a5db1f008c6f9e7a01b94b3563c44c03fc4c1cf48b3b09d19ba93f22778d8840741737bf1a344cb0c8f66ceb49";
+    sha512.doc = "36fd95e7c62b8f682d96d8a2be0139999882d4255cba82d2a5fbd859cc068ed904442e479c4056792fbdbe56f6e49aa3f5301d12bff384847a0e1348b64db883";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "bc3f399973bd8be5b83ea6da2c39d80de8f39ac6cf2d82d689c81816cad334310081f44fb4e256e442fc47ed6640c2b8ebd185e431f0d0ddec5f75f7b535283f";
+    sha512.run = "c85ddae4219dc9938c950e666bb9aaed3a89001bc74a2b2177da704b9b9ecbe7b59037b19a21dec8490973c61d509fe72cdbe467b2d0e69e51667b1fba8ac348";
   };
   xelatex-dev = {
     revision = 71363;
@@ -53787,43 +53958,43 @@
     sha512.run = "3bff74473b4e7fdc7a349fd54e7703b77282381d9ff5eac233d5eb7cefe98f4abc5ea4fd309b8693bd7245471c565545e0ab437a5f8e5cc1b89368c914078d54";
   };
   xepersian = {
-    revision = 77228;
+    revision = 77677;
     shortdesc = "Persian for LaTeX, using LuaTeX or XeTeX";
     stripPrefix = 0;
-    sha512.doc = "b3b02defdcb0d9aa87043dd12f3273d879e9fbc3440a8dff8ecf8e0839e33c5fa0f840d1f17cfa5a4b3d6044f7ec9be8097452f89d4bb626acba7bc866146301";
-    sha512.source = "b424ca42e3952714165f1a47a392296e9e0ce133856a71b81fa60203914c9df5a9f7a1f0622b58b3b634002425de0396ba6a14aa150b75fa8c557a180c1c8783";
+    sha512.doc = "94b8b7726122d4a88849a800da8b0287a7ff26691923fcbd6d5b30624149ba3d32fea1f66ef050f8b01fc5a291d5485a069341575da36db0ac9e1c47283934f2";
+    sha512.source = "74a837146178ca3aad8c7b1d6692a8c90465f051df4b3b04a617df817fade708c07644db5ee7e946f47b19a7889667c2047d45c3c953c294db8ac4bfb5df24b5";
     license = [ "lppl13c" ];
     version = "26.01.01";
-    sha512.run = "60296f46b478f54e902ec50b85daefbbc5ea7eb4d8270cf8cc78f3525dcece629662ce093036291ae3404cdedcf9ba228ebf554c00b7e9c2187c755d05ff2910";
+    sha512.run = "b1885486e98885e9f77aceef61222a968f15dbf4a83c048553e9cdc95a9b9b180442218bd838779535cf1f2873aefcffebb022ae7f93b2a47d8fe8013ce2738c";
   };
   xepersian-hm = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Fixes kashida feature in xepersian package";
     stripPrefix = 0;
-    sha512.doc = "1e91f0aeb13d3a89e0f3c1ac6fef4d052b8c87911eb075814f41680100114d39161282cec46b4c4586091f714e7866ca5fa178ddbe427845c891b3aea3afee77";
-    sha512.source = "3cde3f8760b704bf7e1b5c7fdbc69c874468874ebcf6d888b88bddc134324bbcc7419601957c2b9053b3ba333738c5d55618a3bd548ed73f462c81e05dcdfdcd";
+    sha512.doc = "fbc8e56de145c480d4c6189269371ac29df4d97ae3c30f3380dc444ceb63545805ca77fc4d8f728914b23f58618f989e6625de81c0002ed3ce3e4e7e554e003b";
+    sha512.source = "a553d3c30d70564380f0c6bdcd17724328f3ed7b5a9fc30c977493120845d19f977bb89d7566777c7428d3a969250aadb710dafbd01d106c4c6304bc2b5ee027";
     license = [ "lppl13c" ];
     version = "1.1a";
-    sha512.run = "b3e688f49ab70ee8734b9a7ad9b448747ea7efac38b331ce0eeeed9ffaa02befe39d1d5b6104823cdfc996d19c6d185944694370a76f857b511f92ed889f9b61";
+    sha512.run = "bfb674e42ae9f67181bf3d21ee274e91c4dd3b885c405c17924e429932f370d572362ed945a1a828398bcf4b67910e5549c69fab0476c4aebbe48aaf84cdc507";
   };
   xesearch = {
-    revision = 51908;
+    revision = 77677;
     shortdesc = "A string finder for XeTeX";
     stripPrefix = 0;
-    sha512.doc = "981e6cc62a2f50815aeb875c46ab2ac83510ea535953629755700650831500410650b66ba070d8b5ddc494792e782fb75f266ffe0fb868318a4782b2f8d701f9";
+    sha512.doc = "5aa325a83c00b5b056b1f2c658a9aac8cc9edbc1861d75c1593f7b1efc9d62057ad082c16e4d48d8db738c583469fbb3bde7eb063ea0b5433340ed9673491fcd";
     license = [ "lppl13c" ];
     version = "0.2";
-    sha512.run = "4c204a8f92fe9af0ef1f0da99dfb12ac8f784800f7ef673a116a5f5167556fe49584b9457bebfd07aebace44951327f8a576cdbc8091a7aec776768384c62507";
+    sha512.run = "8327c421a7d9606d1dbf09cff0616f258341d24c732262339021f5f87e6952108527e0619aeb2478b856d2b8871f34a635c4fda2db51c368f0a56d80e95639a8";
   };
   xespotcolor = {
-    revision = 58212;
+    revision = 77677;
     shortdesc = "Spot colours support for XeLaTeX";
     stripPrefix = 0;
-    sha512.doc = "90ff1badeeb6e2d6cff9797b1af2052b4fa8474279c7b2e9916f7f02c767988d640b57f3d63be8de9f0082e50bb93c1c122b3c1f9bf74132c5c13b1b6b70122d";
-    sha512.source = "60aa75660ec567a3015bd8b4985e95aa3387cbda9b239c2d1d7e8bb29fde8d44fc414ebfb195aa3be037a3f4cbe510354e28d3ffc9d5777d054585597e2ab762";
+    sha512.doc = "fb31a9a68dd1a3cd4249bac588bab4e40d4c0cb0ad03a5ed4c89b1cdba41384210da1b08a35b4b41dac6b7d57575805e5f9bc2ebd18c62393d6c4a88f29661bc";
+    sha512.source = "b1bab06d0e93ea654695d9c2776c02840fe272889ac4b2ef8c8c8674e3dbc9635e5286ac3fc0f3f4df3d12ded52aad6a6639f43ce813cb132fa64504158b3b82";
     license = [ "lppl13c" ];
     version = "2.1";
-    sha512.run = "fcc3a800986069cf64c62b2794447650331dfc2fbefe26fc2d537ebfb520acecb6530bff7591a597fac9b108f23781f0faf7c27b97f35ff2358d62c09404a5da";
+    sha512.run = "a895844835c56916a013ad5d8c9308062f5fb89668fbb18e54cf95669f8957a5e2fa7d51f22c597b7ee914e89c639a2809384e60b094a3474a579eb652099b8b";
   };
   xetex = {
     revision = 73850;
@@ -53947,13 +54118,13 @@
     sha512.run = "8099f45c704ea74e5bbd90b1817c3ad06cffe3d6da0a997f8471e72cff364d346a3cc2e6f156b51bf7bc3ba149e5c755423418d58be89e1872f84db9c1eef039";
   };
   xetexko = {
-    revision = 76133;
+    revision = 77677;
     shortdesc = "Typeset Korean with Xe(La)TeX";
     stripPrefix = 0;
-    sha512.doc = "60a70d5a1ab2524a73b0eeed67c67c386d8c82e318618e6f77f9aaf212c6aa60552a0a7da40774817cc76ca8482bb0ca7e802a7b6763410331b3720b79d97b01";
+    sha512.doc = "fe1739126f52e604613c516c5188034cd01747993b8d4ace8e9856bd15964bb253ec7103b9400c11414838734788d51529e38de21e74561aa77d99ee1799744c";
     license = [ "lppl13c" ];
     version = "4.6";
-    sha512.run = "05a404a91c80591354fc74fc9536e81b6481b8995e0169c274fc22e4603618065c15f3d5fdab909051a6db8a1ce33b231978ce0c58ee7c616bc70c62b94788b9";
+    sha512.run = "8e13e5dfe56a3d9d9968139c13460dcf9ae64c7767dd27fcb360ef00b0740b958b39e582b468773f7c3b8d77720aa009a93cadd9a080263c1c6d37ed05480b39";
   };
   xetexref = {
     revision = 73885;
@@ -53963,72 +54134,72 @@
     license = [ "lppl13c" ];
   };
   xevlna = {
-    revision = 76790;
+    revision = 77677;
     shortdesc = "Insert non-breakable spaces using XeTeX";
     stripPrefix = 0;
-    sha512.doc = "2da3e5e56e8f33702bb0f66ae1f88b8d04abf68cb3ab8c781d3e4dcc200e74ae2c3847fdc3c018399274f5ea9b194f8b320a33a9dfc57df3852efe97f7fc3be1";
+    sha512.doc = "53bfa6115b313f0e33f2f473341a08ecb20e11f5f194197581e3e70c02f371f7ef4cd08d81597a21e43698815c419f5178c0025e11fda2ce520d724f1eb53dfc";
     license = [ "lppl13c" ];
     version = "1.1";
-    sha512.run = "8e5fa66f8bc0708ecc047fb4bbcce9aae14f01cb78f816a18b45389014c9ab723af513157eb15910ddf0cf14568e809f9fc24c3c5da713c7b266e8d303c19231";
+    sha512.run = "fb49949a46715258325ad1262687389c6aacd2bdab6b266526822e87daeddcd3148457739667cb7a5446e8af530b97ad5699c3c1210cadc6d3c219bc9d9156d3";
   };
   xfakebold = {
-    revision = 75712;
+    revision = 77677;
     shortdesc = "Fake a regular font for bold characters";
     stripPrefix = 0;
     deps = [
       "iftex"
     ];
-    sha512.doc = "5f4fb023770ed12dc3e01de071e9c9d33cba321903a88d2f5ff116d86c3112f251454fe5cce14a1b075fa70fe329be2769741410ff21a34ea2afcd3a4c549296";
+    sha512.doc = "ebcdce5890e8bd1c6bfe66907c8f29938b1bc2dde6b671f323387d7b47a277c42bb8c6d4094147e6fcd0507efc4cc8fa078aac059026cffdcd5eed9f5f788f60";
     license = [ "lppl13c" ];
     version = "0.10";
-    sha512.run = "b510e80170038853928778733792cd1983a28e612fa4aeac82114c707e823d1291c2e3e4bb552015d08515b1226591aeb93708bfde8da7a910ed0225d7b02bee";
+    sha512.run = "99cdadc73d2a6268cc19cbeee9df1b0d9bdc64ff922347245b049e7989e25a9dfb85a2c6e25ce55b99f6cd4ba16b77538e429ceb5ef1e35333ffa3600b06a50b";
   };
   xfor = {
-    revision = 15878;
+    revision = 77677;
     shortdesc = "A reimplementation of the LaTeX for-loop macro";
     stripPrefix = 0;
-    sha512.doc = "e75b3d57c09e1580282f4002b684645aa21aeed4f90626b7e439f30dd79edec9c6f23492eef83b67e9ccb885c001caca6201d43b5182632a5b38ba5f67488b52";
-    sha512.source = "508dd3c696da5287cee35fbeca12aa60667908f1f456a9d1333197e76b707902d281e83146b81e0a095c168054ec96013074f5b0bc236e35cb17732f4158e2ae";
+    sha512.doc = "5b676ee97ff5c03e606e897d806594e6201f46e0341614dd3037b1c5fd9da71315fbe33a0d35527ff0f699a34e355d1761da149a2cbdaf8c2b877e8914ecc103";
+    sha512.source = "0f1892fb3d4efca3ef51a23a58e5b5bb0ec512b2229f5062ecfe636efc06bba40068ab5d2f2bbc4ae1db9d2c3d4cc7d3d68593291506fdccbc095586e7b0dc0f";
     license = [ "lppl13c" ];
     version = "1.05";
-    sha512.run = "6e3ebe83dc39a87aa86d5f173f56893ab1678253dc18dedf16c5d4a2df864e21b9b6e84c6bda56e2c624106efb2f73c110964948e4d553848bbebae87f05bff8";
+    sha512.run = "fd1c68bfd12be769ed787fc775ec6a1e67d02d7a6b79e9326ee3463f947345bacfda8f907fa43ba343e022d37202e037c0f4921b015a1847d9338a2e2dc929fa";
   };
   xfrac = {
-    revision = 71430;
+    revision = 77677;
     shortdesc = "Split-level fractions";
     stripPrefix = 0;
-    sha512.doc = "c8b84ff6483ef64914d50ddf67b014f3e8fc7cff34896e665a4f7a694ae273179a02af725508bf57d2084cb1f1d91ba9412e9955ac136470effcf549230dfe29";
-    sha512.source = "8e2e5a0c5186e67f68d1ff900fedf7cec0219d767d44cfa35adf944ded2f2934b30e7e4b1906c96475ac07a28b5dbc60a42fb46dd4a52280aa95219d564f3723";
+    sha512.doc = "4675078f087fb4c14386e2199822a5ca60f542f72e4ebcf2affd12cef1a080f75cb394757e5e73a0f44639cd38a7417134d7b5d18b979a26a10fbec3d9809713";
+    sha512.source = "524f5186867372e2d3f27fb5c1f29c9087bbf53ba2f8eb8eb44bf7c49cad9a30f31cb2932ae81c088f21ccaa7db77a16fe65163dc34f330c7edaa355b134ee64";
     license = [ "lppl13c" ];
-    sha512.run = "bf1baf5132f29bc139f00cfe15ee7035894d57baa3fbc30978165ad2d1527d44262ffcdb3536cf3066cdd9fa1c02412f8948158cb6d603e8222e2385e5b19ce8";
+    sha512.run = "a8acc2f63b0ca21d49c8892df66965c7582ba9c1c843fd8d81d44498a5c205fc95dfc6d2b9f81104cebe673a83ad6b7ec7b8e9a5a4f4067b38b4c09e1c3742b6";
   };
   xgreek = {
-    revision = 73620;
+    revision = 77677;
     shortdesc = "Greek Language Support for XeLaTeX and LuaLaTeX";
     stripPrefix = 0;
-    sha512.doc = "7d76298e120a340ba32b4f847024cf0b9aecd82686271a8212ea7ce405bfce82225232ccd11a232e8713274c4828b97ea8d11b6edfe34dd59c1543cb2ace09ab";
-    sha512.source = "728b6805076157721c43e1d49516288a2b6a2ea7efee483ebc73d1aac8fc12923d2a2762add52819584cc2bee37f2fa085caeaedef1f426c166006ca7424081e";
+    sha512.doc = "41d4375412cae28d233d4140248efdc0728b18f8f388fa174fa27d611dcd925c48916c419867b003ddb6830e334bb809dd3465a15fa9a11116b396cf43f25fc9";
+    sha512.source = "968674324d797911cfd9a069d82cdd33c966bfb449e5da75615904a620c40c2572b4d9b1b02c9a456a99ecc4af60d7e256d18e728c0d680712981b8533d31d03";
     license = [ "lppl13c" ];
     version = "3.5.0";
-    sha512.run = "1eb617156d3792a4704b6ef61a1aeec39c589a6513482fe7dbfb12d345f0e91e18ca0a10b51244a3a2194b3f5f2550f94e76d9fc84a34d63a150fe5bbe0bf22b";
+    sha512.run = "a513fb82837b7d7453f7f91128c4e54697294b98dd2df6ba3b51e6d132929f46657d07be1ac96e5292db7d17a2e64a0a451c1a2d7cf6ef40c583f904ca48ef5d";
   };
   xhfill = {
-    revision = 22575;
+    revision = 77677;
     shortdesc = "Extending \\hrulefill";
     stripPrefix = 0;
-    sha512.doc = "027287d941c4576d7f55a3d618e13cde5348ac072f3e546dac6f8a8814efb982f9cd0c4162866403f946d07ecba0ea8cc15543cafbdf9008d60b78d0ea3d26fd";
+    sha512.doc = "2f4fb8a450cfd443dea1c186a6d624415a6891efb8d8324e7f06d79b94761e64256880a5fe57b993811455dd9a2dc892a61e79c62678ce98033550af0fe13b30";
     license = [ "lppl13c" ];
     version = "1.01";
-    sha512.run = "cc0ea9e9d40a590444801359c455716856c807eb429aa01b460fd7566797490932bd3566a5c6f95bd6723e0b05bde1aa632b83383c8bcdeba8a455cb84ea9f1b";
+    sha512.run = "7390a8609e2ae663a30f36c31b9d1adcaebf257019847868c63110bf5f279dbea56c813704a79a1954755d814f2aea99f6a4ac5041e65ebbd299f33096461df7";
   };
   xifthen = {
-    revision = 38929;
+    revision = 77677;
     shortdesc = "Extended conditional commands";
     stripPrefix = 0;
-    sha512.doc = "52ffddbfb4d0d579849b7a89d30bebe9f1d511751c89012712a8ef73ae3f4eb8799ef9b3755dc957c47fd874f1ce76b3ed54591d59f7e4d9e1851c50aff3dd4b";
+    sha512.doc = "9e7bd4efa85628975b0e6bd2b94389a582cc821deb48fb1fcca01ee412c70bcc56c6157b8648e55f08c77ce757a555a139f29999920868e3380dedca22a4d146";
     license = [ "lppl13c" ];
     version = "1.4.0";
-    sha512.run = "21c5882ffbde05c50a6536fbf19f812a3ce6381f565227f61c8062281a2472a105bf6223cdc03adebf275fa23dbc1ebbb967349c715f20d1b516f100f820af3e";
+    sha512.run = "5ee702840971f0106acb0edb6b43c9c7e8e0e85afe0f184415fb83e41bb7497580582e5510b09a2394c9215c8c1a35a350779b060f8cd140ef8595e840d546f7";
   };
   xii = {
     revision = 45804;
@@ -54055,9 +54226,9 @@
     sha512.run = "7815d213c4c1e1be5277b65c94dc24392af298eece6f841e8ae37e430c100fb191e3e11bc7b0a8e06a1df8680c8c321886dcb99019ec10d9db669500ed82737a";
   };
   xindex = {
-    revision = 75954;
+    revision = 77848;
     shortdesc = "Unicode-compatible index generation";
-    sha512.doc = "b94b2f126b1c0d3fa00e30ff3d10bdfcaee2a94e82537d3975f92c9d4daff9737bd9a6db33b4d4d400ddfead91580638ce68af4401fd6ae9fa48fe7d98def527";
+    sha512.doc = "e7d42ac20a526ddb7506f82285f47f97bb36439e19796dabb55b362272a58ba6f83b2d6c7dd810a9e00bf216aeaa10298512f6e4eeb2e92d0a136d2300f878a9";
     scriptExts = [
       "lua"
     ];
@@ -54065,8 +54236,8 @@
       "lppl13c"
       "mit"
     ];
-    version = "1.02";
-    sha512.run = "ee2a7fc17e663790570dfab4b1b3996afc184de5bb1e57eb4a6bd80e3ec7123a45a5661fb8b481ab4fefd285eaf65b931bc530fd4ee846928a0be7be1b0925c6";
+    version = "1.04";
+    sha512.run = "ce5e78d302b628455c2cea0bba3c427d93d475db5dd477f7fcc59f2d5c79f282b21bf32c0d7489dea3c753ab62c08a50d27401b0875eda15a69ba3d62ddacb42";
   };
   xindex.binfiles = [
     "xindex"
@@ -54106,13 +54277,13 @@
     sha512.run = "da0d6c71bb58350e45802620b64f032207744c82920990b2850cea747614b35bd9b776f888f9e5603b35da8d4bf6a881a89bccc9f894dab1764bbac98f94e2a2";
   };
   xint-regression = {
-    revision = 76947;
+    revision = 77926;
     shortdesc = "Classic regressions, with xint";
     stripPrefix = 0;
-    sha512.doc = "5d044e297b2c248ee118df65e392fb3ba749ace0eb68c02909c9ed60b2737d2833740f92ab7453e772044a41ee3dcb658a51b7ef5e56893a3463d88c4cc05eb8";
+    sha512.doc = "7ac85b5d1ba1d11d74a1dd87947aba5aa5f9709edacbd748581a43fcb6f56a857af9552495980cb974ce1c419569f540cde2d80a0d3f09b9e58576e90d01f9f9";
     license = [ "lppl13c" ];
-    version = "0.1.2";
-    sha512.run = "39359582c5293652bea3f51021f1630caabb4100517cc629226985f3d476dc88781279ff3856834a77ae76ce383d4017893935e9a3f4a61becd3b9ece3ab5925";
+    version = "0.1.3";
+    sha512.run = "28b6c19fe23cc78987e749701f785ff86017681773242dc4827f4b050ab16c9fddbc42d01c159668743e645837028b1f5a3783926dc4e2907a083336f687afbe";
   };
   xintsession = {
     revision = 60926;
@@ -54124,14 +54295,14 @@
     sha512.run = "d1e279e733e37d6ef163a1dc537f5c02119403710a930f409cc6cfa55f1c08d9dd30bf4aeb14b68e4080442137a7352207ca8dc9bd7f859a8d19cf9205b68c1d";
   };
   xistercian = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Cistercian numerals in LaTeX";
     stripPrefix = 0;
-    sha512.doc = "932ac1836b4376d66e6fe71af3d894842ab0b6830537a3827b765ce205187fb646d09eaf32da09692124314cde42987e2593fa0ee1eb2b13a69acae5a3c77178";
-    sha512.source = "648223c5eeeebc636b070f1d22d916e78ee20a58af2065bd713c584f8f91a24037286ef9de60f0076d98ba659f63a18d504e2b0611e91d35837d6090770484cd";
+    sha512.doc = "d0eb2e6b499a522f0c84fd301d74dfeb95c3220362434f9524bb1ae664960c6e404b224d6eddb4fd893f7e96ba92c43384bad8a72f3c54d66793969a7aebeb0f";
+    sha512.source = "5f347280af6199fa0c55b31e4b28ea327141cbc76e26ed1aab793192793e5a5310a2388b7cfe09e7b3bd0501850da8f0d71c724f3ffc9f39dd3eca420febb830";
     license = [ "lppl13c" ];
     version = "1.3";
-    sha512.run = "74e50555f09d8e71fe67c6ed0c9198e0f7cade17a153577f97d041c906088ee218281ebe6eb425e44e5b071865116acdfcfd98b637c3c40a8448482f2041448e";
+    sha512.run = "ee7336e9e97b166697d82d9ee7845bb2a7e34f3fa008cd8b7b7c5947d6539e0c5182f0a37756bb387a6cffa753fd681306107bd7becd92ec9427474604d09b93";
   };
   xits = {
     revision = 55730;
@@ -54164,45 +54335,45 @@
     sha512.run = "1502216d5f8b5b2f15317f7dd9faabd11e06232a093a74a64a7114b5f2307e7e96065810129713c679d4aa4d2e622c6a1af8dfb31719b447e9d8fc1e8026e027";
   };
   xkeyval = {
-    revision = 76763;
+    revision = 77677;
     shortdesc = "Extension of the keyval package";
     stripPrefix = 0;
-    sha512.doc = "69f1839fcf67a5dea4c132e41a8a15547a5af3a6718100bc5a131c97f96b93a11af6d09592332c55d824c571bf851c381ba2791d4fa25c9389557f14d2c6e08b";
-    sha512.source = "7dcade5468402fb758774c6356c76fc95b8c09e11622e046b755af60a83f971e91540e5e9af478256b3fcb63f49dad24bcee30e468065a9e9de87193258f3a29";
+    sha512.doc = "c1c29465a72780b0827dd074c559d34daa6817485842f18c1100311d4e60c4ed6f2aa9e237e9dbe5e8d9ae599c8db9ac4adad6ad8a594b07f71d8860a528a6d0";
+    sha512.source = "b650015f3f6c0c37e8a45e89b1eedb201b06629b6127fba0629354e2c43fd0ff6ef14a009e33a6aa23cc300bbec637e10257fa0615e6c85bc1c1898c10bec5e0";
     license = [ "lppl13c" ];
     version = "2.10";
-    sha512.run = "34cc02734c6718f184593d8ba09d1c0e46af2ef1a5ac7d0715bb2f1516db9d976801aacda9efafe96ed3c5d2a05410e4cb39f282b803b00feee06d3195483e81";
+    sha512.run = "67834736d98f9e6eeca583182e61232bb41b2199d857bc85fdf2ed6a9da45e0efca473636789b46efcaf4508fd24db4f86e93b5ccc1244f1f193c95d95e9f397";
   };
   xlop = {
-    revision = 56910;
+    revision = 77677;
     shortdesc = "Calculates and displays arithmetic operations";
     stripPrefix = 0;
-    sha512.doc = "9e1cdf96a23bd468c2e4f358ade19c509685563376d5a7ffedf5cfc122138b14d1075c7ae8c8a00261f789d4010a9df7dd5b1e6a9db5bc7efb067168e7866540";
+    sha512.doc = "a655ac58dc95000d106b0fc4b753ecba2c6ae928f1ef1d91c12fff16b8bd1b622cec8a37f686ade71ce2e620e46c296a0cc0c1c048ba525114a8d25b449fd7c5";
     license = [ "lppl13c" ];
     version = "0.28";
-    sha512.run = "6d1ebe5d3870a07175b5c07840dd2170f2309790d1b828df69b716aa83db1a35ff70d265a33d8fc0f6ebe0c4385b7fccee8445ab93b2649d3b27bb65e41f87d5";
+    sha512.run = "0bd6391fe36805c91b74083873d79cffcfa11009ea6318620e0aa3578530923b171b3ef651a2c6abc5d8ebb4e2e797387042c90b812e6e66744445c8d61243af";
   };
   xltabular = {
-    revision = 74350;
+    revision = 77677;
     shortdesc = "Longtable support with possible X-column specifier";
     stripPrefix = 0;
-    sha512.doc = "edc97b17d6acb19eae3991a4dc056105847e0dfb22bbe298718370c8ec16c4009d6f8a150f11ba9759bffc6f7dc9531214d87ea225e6b0240ff0ac27728d7982";
+    sha512.doc = "8df9a49b264ee1de490769396b436f2921b3b1755f9f8790660f16312dcd547d6f8b35f0c646980d8b4d3253cdee2893e153541540f0e3f67a4f98b2b7718588";
     license = [ "lppl13c" ];
     version = "2.0i";
-    sha512.run = "8d62160b08f9c07a1213cc565017a7bcab14c5b65ba4bf0db073ccb3660f6eb1959945771f62e3e061e5ca1084d68676ffd1f214d42dc6cdde3f76e050a835a7";
+    sha512.run = "5a0b663f37b6fb65dac099dffdeb82bfae195ef0e4099fcb2982b3e80b20e864415c5c3f28d0e1ce8c4dd64c547b1afea908e3151d3bb2c55e4fd61b344c10bb";
   };
   xltxtra = {
-    revision = 56594;
+    revision = 77677;
     shortdesc = "\"Extras\" for LaTeX users of XeTeX";
     stripPrefix = 0;
     deps = [
       "metalogo"
     ];
-    sha512.doc = "6fc84121dd3486f5f7744d757520e2b4d7baf83686e2630990be7e72ccb121e5b417779e4682e6e8a566b016a8995f80d7d4c6dfb3d6d2c9f70ed506bee99d64";
-    sha512.source = "c177b99366479f6ed5ef935be07fbfc3425b48f2c3d274e175bbde9c63cbcc93ee4bca4c3c2886fdc2894b627332ff7edffa5b1083ad86dcced56bfb0d9fe03f";
+    sha512.doc = "53c3562a87f88b451c884e5a69f971ec9f68085ba1eeea63d9d3b18cc121a07f06490a7ab190790db6fb483d2547b0f5a9f96d2da2925d92793e950dbb17a086";
+    sha512.source = "03e8b9319eaeb98f031ee000c624906c663ab4383c1c427a3d5423e7eae60e7ab8ab39321fd158e52eafb33e01648fccea93f5e7273185db18469ec59f2d24d9";
     license = [ "lppl13c" ];
     version = "0.7";
-    sha512.run = "ff75c7b2f36f0e3cdc466dde35d83ccbb76c9c95f5d191a5498831247d1d418b69a8f0df8b263eae78e4a13694e628eba64c24e7480c7dbf56948cd5b1504a76";
+    sha512.run = "d5cea708745a5dd45dd1426d020e5eaef01f8299431e3078000e58c6899c5d784f99ccb930d3c66b46d09a7829eb3ec81cb310ab9c294a99cc0aa342bf453d92";
   };
   xmeaning = {
     revision = 77128;
@@ -54336,17 +54507,17 @@
     sha512.run = "3ee6285ecac00a20781ad530a7ca1ef35a94efdcc31d29084e167cde75c51b4bdd644bfb5d25390c3deef44fa7b09e479b6c616169ab0bee1e83d4e37338e00d";
   };
   xpatch = {
-    revision = 69768;
+    revision = 77677;
     shortdesc = "Extending etoolbox patching commands";
     stripPrefix = 0;
     deps = [
       "etoolbox"
     ];
-    sha512.doc = "d67b5b258ba4941b5ad7bdc0467175b7a8ad1bd0cabd62fc1b570e9f922e3ee522798b1f893ff1ec858d2fbc6479cbf826ba4f1cb46da6cacdbadfcbb21722d4";
-    sha512.source = "f937d5a2b549086b8b134e0b9aeea425c6c99e7650da7987beea240a7000a61f6c9a187d0c68ad5f8cf81aaea1f3a11c51eedb474238407c346aa0577213c996";
+    sha512.doc = "2de52a06d5b7374cf66311b0803052343f65d674005f737113d050f69007bce74bb0170e5dce8b25f189dd8cff6d9bd9d639858f0064651f941c9700167aca6d";
+    sha512.source = "4e272e06b8672e42e15eee65145b994533173c37a3ea8ff023f98f52647db6d29169ca802fe88119ea6de94d42f68300a14030fd4aaf90a4eb34217b10d88287";
     license = [ "lppl13c" ];
     version = "0.3";
-    sha512.run = "49dbe4189b49366eefdca8c501a22bebd0e4141915f01cc6271e2f744be4ed4382ab0a8e8cedec1271da3df5cb8960650219b202df056f3d7f6009983017f0f3";
+    sha512.run = "20f41feaa93ae81784caa2a8ab0e25630fa95927682158cb5c746d38ac4113009776b71579a3118656b744771f75842ba057eae260c2c22b887dc734a02db288";
   };
   xpdfopen = {
     revision = 65952;
@@ -54383,14 +54554,14 @@
     sha512.run = "406857a5bc117186d344d788396274cd77bd405a89bdb467de95c0b2e4600cd27d915da5bd58af5e9fdc100479709f2d65a0ca9e5cf61f685f7dbe354e14cd57";
   };
   xpiano = {
-    revision = 61719;
+    revision = 77677;
     shortdesc = "An extension of the piano package";
     stripPrefix = 0;
-    sha512.doc = "467da8be6903252b1d1a9436750b8d2f0f5eb1f1f7ad1178acf0a1ddbea253ce38ddc842c89ab6a22c4bb72ec311a2ee2536dee5834ca3ead427c36592c35100";
-    sha512.source = "bfd5a1dde7e05755f3c0167f16b7af2d83881b25d31e96644d18d193f4afb8f9f359b5149fe4534e43243e9364c1ab6380576196422c79077c82c4269b7619a0";
+    sha512.doc = "466cdccc886a1561f861206ae2a9d2768333e399ed11bd3ac1c365ab2d47066aed3b913547b64f62e3b3fea01f3efc05b519d51dbd88e2b82036789248c95993";
+    sha512.source = "bbe34ac8e9b6b205638c96fcefc343ba194e485cbb82bef5e4e75c17a81c27ff05d38ad392003aac05ecb25a7a844c3f86774a7f3a37aa83113e16322aaa1aa6";
     license = [ "lppl13c" ];
     version = "1.0";
-    sha512.run = "892f018e4bcad350e4418b2724b6bf2d18aca9f74aa01eb10906b90630b36ec3497a0b96b293e44ec136eee22648b53a13d7a9b614a36c0b79f5a7b94dc37403";
+    sha512.run = "842be17952b684659db2d987ae26ed04ec6c40389a03802fcff8d3499fd299b4044466c045d9d80ddc81ef3590b6fe60d0e20fcf5b433effa2153e4e906c567e";
   };
   xpicture = {
     revision = 28770;
@@ -54403,14 +54574,14 @@
     sha512.run = "1915b8b9acb3db8d4f8ac4fbc0baab55d6b8352288852f20d066a3f0ce4f7dd0cd4d2d70ae2d2e29aadae0bdb272fcb237146379313b2900accaab2bc10ceb79";
   };
   xpinyin = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Automatically add pinyin to Chinese characters";
     stripPrefix = 0;
-    sha512.doc = "21791df27b923ed567937fdd2f826901191930b0a092515eb7873d1013bb9f824b7d90fcb204be07d03924cb26898aff85ff711641b59f7cdde32e3c88291fc5";
-    sha512.source = "e44d946a39955e14eebd6ae408553e38a602fc5560af6a08d626fd88361fe1c41eaa636cdcdb03a9393636a983f59c6c0711d6bc69c491bbf6ccbfc86bd21c16";
+    sha512.doc = "2e8287d396b371d3032e0e9086818dc314498f18a86cad3ddb8cd8c28829c3497e224b4691d793e71d3162e66982693f8f79d3b7f6e0b189ec85289562540eea";
+    sha512.source = "95b61ad34d1e8caeffbed5c9ba4890d258ea11fb0b9c851151c683801f3a09c54b005d881178bc2a441ba17bdb4fcf3caa698e90fcb5aaa4cb7bc94dd3820d68";
     license = [ "lppl13c" ];
     version = "3.1";
-    sha512.run = "86bb7edaae2f3feb543078f27420b7a20b8b43f2838e26c65d233f0d70824d0cc03d319fa28f85030babb1185ea9de9fe1c57809f45dbbf0627ddeb0cecc3119";
+    sha512.run = "f275523d499deddacba3a86ccd099d5fed548c3d443e8052d78e07e0f2023139f364ecb63ded41784de04430724db7953037902a3becc7c8884c5309206382c4";
   };
   xprintlen = {
     revision = 35928;
@@ -54432,13 +54603,13 @@
     sha512.run = "a90da49b111181c61512777e4cbccfc63710b19513309bc2a04fad0285691095c812e7b8feaa0427cd5e837bf644458229b78c2bec530b01bd772fcdb18a2bca";
   };
   xq = {
-    revision = 35211;
+    revision = 78116;
     shortdesc = "Support for writing about xiangqi";
     stripPrefix = 0;
-    sha512.doc = "cbef1b95b4db328cc29d5f4fef544459b893cea82838e9e1f2faba00dd8fc78bd12d36931dba4ebe76cbe985879c30b8606df1f2091fc8d2108311350b2ea339";
+    sha512.doc = "d26e065cf33b377a2ab2903ae2883757814ae7664d57fa7ac1828e886fc40c7b52a2c520fd22c9d01faf118593566e3905e81f70832173cc939c36f93f7e1bb4";
     license = [ "lppl13c" ];
     version = "0.4";
-    sha512.run = "f1fc2f43099e022aaac631d4ccd1e5f5b9a9f23db6f1c6c3adf59d47dca57c25728f81ead0ab62d07b9bea6219e3121874c55973b54e826b1a70c5e4fd47c853";
+    sha512.run = "48370426fc2cf7b2fb17ef5d6ba9d43c1f3c98b6ddc4651311d5b2054b284ed97c506b805606c16abbc3b7451cd055c783c7a15f2db235b6d00dc6570869ac4d";
   };
   xreview = {
     revision = 76924;
@@ -54450,14 +54621,14 @@
     sha512.run = "8cd23b5d386f9a37181f74c63b6c02cd7f5f5449f9fdeda1f1653beb088c0113800f2899cfba173e12b7c7e74ca01200b3d2c827914780af0c20ac79518bc47d";
   };
   xsavebox = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Saveboxes for repeating content without code replication, based on PDF Form XObjects";
     stripPrefix = 0;
-    sha512.doc = "9685519afb16c11464d8d8221aa562011a4ba5d265e420d604c7f413d237b1f669bb581ed3fa589ac9c8a7b4801527d263f594cac13b80016843cb1828730f51";
-    sha512.source = "ac1d0fe8724c1a7935c2cd34288e980deb133998624c40f8b738924d63200c81007559ea9a99ec4e5160b1aaed3a2335e387d4ecda8fc599a1edb13851a20b11";
+    sha512.doc = "0110cccafcf15786c44fc635fa2f612e5c9128d3ac3d49f3ddf488cfe843666d6a88a116d3a8d717d267a4f22c1fd3f52dc53d19b7995a583d35e948c00ec805";
+    sha512.source = "a8f451e7410d4a557b77ad45181b2de5528a90b07482f8cb449222091f0cd18d6acb9bfa7c76a5c0ae270ddc1cec9d9e2f9e40bab84f7004b8f8f5c8b62ef1e1";
     license = [ "lppl13c" ];
     version = "0.18";
-    sha512.run = "91de69cc454f701be3f503a0de86c29aa29e3368efbdf7fd758b73b0abb70cc9b68100b73b87feff6186344416abfa22118d82a003336aec14394e6773ff25d5";
+    sha512.run = "6fc7b4fa8b0ad8727ba010422a6f4b1d537141026ee70a017ba5f0935dd881601c22242629f2d3960e9dfb7a8a8cc78d1e7df4cc0fcdccde866c6a8d365a3a15";
   };
   xsim = {
     revision = 76924;
@@ -54484,45 +54655,54 @@
     sha512.run = "91d3b1eca713675e9937b75bae80bfe4f31977ca0c23d94dc01338ba10c5c555841b604e382529982b5144684c7d0b72f9b9cf54d5f2d04ff01c02f1fdfb624f";
   };
   xskak = {
-    revision = 51432;
+    revision = 78116;
     shortdesc = "An extension to the skak package for chess typesetting";
     stripPrefix = 0;
-    sha512.doc = "6256df468580dcee451e4a650ebab0323c92024e9bf872fd683af1f10c19221887b5bd1bed7540a517eb6716627e689759b7ceaaa2944869e18591fba5467114";
-    sha512.source = "11119e38b4f21663e36764d2b9e7da22d9493de7296590db4beefe185b2c9e89224806257d3880c78b07c3984478843b1886e37e5a33fc798920be221789de04";
+    sha512.doc = "eb18fbfb8307ef98e80b0bfed4fd25ec8174710616daff51cd8626cd7236c3d920205586973aacb469019504da4133c79db207a6764c56c8072ae111d9ebd847";
+    sha512.source = "865b8daeb886e60ad9b1f07a700487b01db3d981d5d1d61240cc606cc4476abedabfa90a63bd85bc732da74072e75be5f7345786aa37daed43359e6c154aa17c";
     license = [ "lppl13c" ];
     version = "1.5";
-    sha512.run = "202f61fffbf22346ff6ad6b2b8f411b2a8e4f58a9d53e5613810f2fe0b56b0c73867f0c1c293bb0c1f0edcd4ab73135ae33a953d3709d2d01060c1b638842dd4";
+    sha512.run = "7c968bf77110c142f6d2d44c1643f9ec11e43aae5ffb649bc38a39d376d8390f07501f5558f08f727d286a97461e659dce6231fbe7ae45a32079ac6a7bca2ee0";
   };
   xstacks = {
-    revision = 77269;
+    revision = 77986;
     shortdesc = "Dedicated global stacks implementations";
     stripPrefix = 0;
-    sha512.doc = "cc3858b667d29a7ed3420a5b24c3e1665577e43a6eda1fd1a441b3f69211b503e59587f9aa1a41f04ed5f2a978407e712bd14db27548b997302407b80eedaed4";
+    sha512.doc = "207037ea961c1e760a4e29e16865c71af3335988ed6cfd129e639c3bfb05526f373d9a81bbe340bdaab2df746ad20bd08c87f20fc2a3b274165468a3b39827ca";
     license = [
       "lppl13c"
       "agpl3Only"
     ];
-    version = "1.0a";
-    sha512.run = "76f5c23fec6228e891e7fe73ad8a6e65377e3f411cae5c44fffba6ada765ebc28c72d46f9f7597f427e96e5c80c48ad039d4ed4787fb40f1606d8171a3166d8e";
+    version = "1.1";
+    sha512.run = "1361f2b6a680effffa6e5f71c61f7c2e11bbbfe0ae26893dc493f6bf34404aefdb0bb3b999344563fec8eb13f243afb65b5107da88bb668a7ae72bf67bc27294";
+  };
+  xstix2 = {
+    revision = 78230;
+    shortdesc = "Extended support for STIXTwo fonts";
+    stripPrefix = 0;
+    sha512.doc = "b9e3ac3cad24ebe2c1324cc7fe38ceb53c2e5e8f930b9491f9ca59c01e2ee081bd332e0b18dd644bd123c31dc518a75e1f51b73d61447d6f434f1a985f4010eb";
+    license = [ "lppl13c" ];
+    version = "2026-03-01";
+    sha512.run = "4329aafe5600cce5eeb6ab3d45b49dc525dab01cab7aa31f38591f7ca87a02bd9a8e605986356f1c9cac7983a3d04f64c3c12c0a2659a8fbdcda90013a953171";
   };
   xstring = {
-    revision = 68015;
+    revision = 77677;
     shortdesc = "String manipulation for (La)TeX";
     stripPrefix = 0;
-    sha512.doc = "c9ee24a7661c7dcf4f7cd1b657269951baced39e6d40f5a6656d491120c9fd90034d9a4a226d0f714909e7a03fbc474f6f7a355d4138ba87906d950e1156c884";
+    sha512.doc = "2f7ddc646465d57c9811940f39298abafd9ca3ef80f7240e2e2e0798074c599021eb3898bc7fbb7fdab78c74114dc36e067404c34cd80675e18c293608b86ee0";
     license = [ "lppl13c" ];
     version = "1.86";
-    sha512.run = "a7373745f3ea8f75b73cd3af280743db902a683f16a9820c214b8b5a92c72314323173a966b5356d78cba667978f677f42ea10b54e98b08dec29202ba8e67b39";
+    sha512.run = "1bf166149c94f20984d1a1bdda2d80d4f0f62282dd64df601297f489e834e8155faf7d8284601638a561111bd0b927867cfde8b9851518eb15ad374213eb699e";
   };
   xtab = {
-    revision = 23347;
+    revision = 77677;
     shortdesc = "Break tables across pages";
     stripPrefix = 0;
-    sha512.doc = "10a158bf2d50fa89355654da36a179bbbc5d30ef3efa8a79537de66c50a892f540938cb364e45896dc079266d5e47bfc2c74b8cfe01ec1691cde34bc221e4ca2";
-    sha512.source = "0ae0bc4d96f8b7c4dd5bc62d56538ef5e8f5d8d8ecdb114759209dedc722a2aee1b646a27cff611bfd2ec9ac96f0633393cef9d3a13a6d54978740b28fcc09c6";
+    sha512.doc = "b360b9dc37281c6cf208011e8acfdc046aa9cdcf68728a7da3f1ceebc478c6c79d29101f841f04f06b57ed5d1fb0621e8cdcf564553e13db26b210f998c985d3";
+    sha512.source = "193b47281bed9cb5d6e0de5f3b7d6e586f19f851f7782cd1e05bc6c8d5c2b7ddeca9d4514305f039d01c354e8b53481aea2137d3d5a22d881e388489b4ad849e";
     license = [ "lppl13c" ];
     version = "2.3f";
-    sha512.run = "e308d3ae3ae32b945450b319834dfac19b6006cb0ede7f21a91999b840528927aaca7cdc330a02ebad874602d6d268fd1fe609dcb52bef2757b2e0417310e012";
+    sha512.run = "c16764550be0cb4a4113ec80fff295d3aa43105047e83c915d9209f258e51c691d41e27b8688dbc375488ce7121963c4b3e0a7714e67cd0defd109ee4b22ced9";
   };
   xtufte = {
     revision = 76952;
@@ -54543,25 +54723,25 @@
     sha512.run = "5d9081b8d197952aa5ff58b1cbd490bb529cbbc1b72956cca8dd28b1b6bc12c6248d3d04fd457349b30df7594aa1872ce9c8438feb67af1b93ff0fd33eefcb7d";
   };
   xunicode = {
-    revision = 30466;
+    revision = 77677;
     shortdesc = "Generate Unicode characters from accented glyphs";
     stripPrefix = 0;
     deps = [
       "tipa"
     ];
-    sha512.doc = "fbd368180c97649944aa23fae4f50f8a8d1aaa776f643ba520f121b9aae196dca94c11906f9d5b2f961b6d494256329670af1f4563502b44a8fc9633e29373e0";
+    sha512.doc = "05c7494fa63477b9a289387ae65426e93865b37b1bb06e27ba8b9b12836dccc0eb7d19c35712c12d9cdfe5b79aa58e43920af3ef9f21f7d31c780bbc7a00c9b9";
     license = [ "lppl13c" ];
     version = "0.981";
-    sha512.run = "f49628013bc54e82bc38a2c749ddde9426c65716f04c5c8d8264398b9595e571d380e07c045db9e7ed5d6df7d0b7b1f8e81eaa28d6b67a6756d2c5023b731176";
+    sha512.run = "b9e2d6bd4506f39b474f6c1830841fc4bb5a7aeb126cc7feda3c659e6ee6037e5490a50e7b96d075006ad602debe582ee85677fc72a9d5b7ab82d13362e4287d";
   };
   xurl = {
-    revision = 61553;
+    revision = 77677;
     shortdesc = "Allow URL breaks at any alphanumerical character";
     stripPrefix = 0;
-    sha512.doc = "e02cceecac468713453432e118dd1cbe3f872a4dc33fcbdfc769861f353ac4ff5c117f51197b297a4eadf295f75f1f0254585ef0a48909aa004f4a598d796491";
+    sha512.doc = "0e8c2e83b4ba499759a75c3f71faa04348a8a100152af0fb5b15b306b5a5f4202b73c743c30e4e945f3c3fd6e2ae5c3ff31766317d83c1ef6a7551a355574873";
     license = [ "lppl13c" ];
     version = "0.10";
-    sha512.run = "df2570d0eefb64df3a0533237ea09f00b9e22be0000134b32de40198649a6e98ee48a31d769dc750847672be7e3577fcd8eabe25e1ae8ee493d77e40ce684147";
+    sha512.run = "01ba77148eb15732418912cbae2d2e614d6f6dc75af16f90343decc4fe5dd0fa388481e7ae20215f9685b097db71293b04a362cc28fa0f5aa784d8e87752b0b0";
   };
   xwatermark = {
     revision = 61719;
@@ -54592,16 +54772,16 @@
     sha512.run = "9f0f14d1a862622ad0ef695a58f7dab554daac8d5151193a70c94ea872d16fe8eb1a763d03b226b08583db484bf576f5a41d2070d5396ac323ed00ccb0daf5e1";
   };
   xypic = {
-    revision = 61719;
+    revision = 78116;
     shortdesc = "Flexible diagramming macros";
     stripPrefix = 0;
     fontMaps = [
       "MixedMap xypic.map"
     ];
-    sha512.doc = "9664336d5bd14145603a8c3e861f8fdf062cd4587b8f739a29d93ac78a946c06a0985da4f011030df575276bd43555e55ba467eb4c640d60b2db0a07be706908";
+    sha512.doc = "c4e5dc3062877fe3703a439a28d63a76b20b0a6c7dde7af9990b6df5c39380b58429757a61304164a048c2e32cb9592624ad10560339080438c025ad3cd22d3e";
     license = [ "gpl1Only" ];
     version = "3.8.9";
-    sha512.run = "431451f2028cc87d2d22b4d6ce95ac8f216755da312301195ba7af46146382cf76c27f9964a94817e90afdcdbc7a01dbd887d45808296984fa0b3a3a1770b46d";
+    sha512.run = "30e5d0d830b45cbd708cccc18ac11d1f4c1079e4ec369183080553b330e5a8ca68bec742522697fba796f046b355e43b6fe55cd8b02738f43379889e1187cc1e";
   };
   xypic-tut-pt = {
     revision = 15878;
@@ -54775,34 +54955,34 @@
     sha512.run = "116d4be9a7ca06f90967c85a696e893a85555402acf400c0251a71f4d43a5ad244ee041518d4408b6627610ff87792f07ab51309303e442159bce46025d5a27c";
   };
   yet-another-guide-latex2e = {
-    revision = 73469;
+    revision = 77849;
     shortdesc = "A short guide to using LaTeX2e to typeset high quality documents";
     stripPrefix = 0;
-    sha512.doc = "f6c150a1fa306f2c25770a8de4de9eb2ea4dfe2ddf1d9536767e6964bb093f08bd70527b2294cba7d26c32ead41b2b392a7db0d642e570dbf0879267f75ef359";
+    sha512.doc = "44c77224c6127e7f4279529d677a7e102798a266767b18354f87304ee148d65ec860f6ffd3136088fe64b1dac3d21f4d377bc0692dd7335f15d32dacf7ca1e59";
     license = [ "fdl13Only" ];
-    version = "1.3.1";
+    version = "1.3.2";
   };
   yfonts = {
-    revision = 50755;
+    revision = 77677;
     shortdesc = "Support for old German fonts";
     stripPrefix = 0;
-    sha512.doc = "54857e6693242080c5f410ded0bb16d3df65fee2834b2b5d1232dd063a70796905771059da07e7d92358fce9da992c3e605be345ae7c5d4012d37dc37a17dc82";
-    sha512.source = "c716a8ecca03f0dbaf07146021977fd802e2089c5b99fc7adaac1e581ecbfd4f4b1a15562a54eea7c783f5b8b6165b935e484e36a456ef81729751c777266815";
+    sha512.doc = "5081d61af70ba60bd5feea2be8d152c950d00933a2b0e9d1ad2d9cb8b18d38f60d238feb5515910a49ca2246b83d80d73dd8ada071826222648dbaf3b81f7cb9";
+    sha512.source = "a866f248cdd69b0422448b197fad1526a602860c0dd9f0f6830a5442f228feb125859711b1e1ceb795b4d627011b76bf2ab7118d3e5fd05ce05e864889b44ebe";
     license = [ "lppl13c" ];
     version = "1.4";
-    sha512.run = "1caa22023c93ae1e6a2fd94676da61fd576890f991a79d6a9724a4e5f7e653a752c6af792a1b15d44aa956f5788aa995614a33c2d97e95865d6a364f833e539f";
+    sha512.run = "81b839d400c02b7c751082d7581a7e6553fbb8c492e5f9b28891313ea87122912f5a981cabde1675f834558bd949eebb1ec73f8c4ebff7e5579944e4579f84e4";
   };
   yfonts-otf = {
-    revision = 76885;
+    revision = 77677;
     shortdesc = "OpenType version of the Old German fonts designed by Yannis Haralambous";
     stripPrefix = 0;
-    sha512.doc = "225611d593767ab80a414bc5aa2ac6b9be1d36d52677e0b4fab6ee4c7cb2a75c00560523a6f6b5054c8099385b1edaf06152be35d06978a29b84a2f135fe8e30";
+    sha512.doc = "b28faa5f3f79a1586422a4ea00af33e4a83ebb46e48c10b1e907fa8df7640aafe658cbcd97e39a974ef87b4468792ade5ac1780e7d705156d6f165247dc0ba2c";
     license = [
       "ofl"
       "lppl13c"
     ];
     version = "0.61";
-    sha512.run = "d761ea6bbd5c6d90a9aed7916a95796cf869f2c1ba4be338a2fa5432243b07f1515968da1cbac7b291a6451d82481bf5cba50ec5518a09f6d21cc32e68d420b6";
+    sha512.run = "245e868265ddf91bb2eb3836a0dbd66839def38867e5c9b5c04a2e1171b1d4c358a8a5a3760b863a4c3a71b06927fd134fca7fd97337f5393318ee2c261a5d7b";
   };
   yfonts-t1 = {
     revision = 36013;
@@ -54817,17 +54997,17 @@
     sha512.run = "ec4cfa0d4f08f506b3bf7a3acc8e303ba51c7761f32498f040e062264e595bebe64a4f5adc7d6ab5aa2180c55b817d0124d5b07b276cb39c775539113a08f490";
   };
   yhmath = {
-    revision = 54377;
+    revision = 77677;
     shortdesc = "Extended maths fonts for LaTeX";
     stripPrefix = 0;
     fontMaps = [
       "MixedMap yhmath.map"
     ];
-    sha512.doc = "56fb12fcc4099f14c5746727b3c3051d84097cd8a715023545c3a2fafcc5a5abe55980a12e4384f674ef6cad2c7d6dab2beb8374e4cb3af81f711c2e8320d97b";
-    sha512.source = "57a97c1310cfefcc453d031dd3c4701bac2a36c04f435f7a823e1b83671afccadc33d213e9578f4bbf806b6c73aaf33d3816dcafa86fb4447d53659e11f83072";
+    sha512.doc = "50dcc38efde5351d1cf5b324e1fbff30f024a6cfa027bafaf7e57c879b7dc40f128dfac4c7a1cb0887f358510bd17aa04159e33150a608cd301b35f08afb617f";
+    sha512.source = "03d8c3917777c8568c62a4caae5c087eccf130ecf8b3684aba1bc4a3cdae7e199b3c270054dba22168fbe98f611d8d69a4cf52ea0a60b9b9cc6acb5bf1aa8368";
     license = [ "lppl13c" ];
     version = "1.6";
-    sha512.run = "88476f5355d041f1920c4f0f954853828bdfaf27b9d0441982a38e3dfe79b40377a83614794024ee8c8463eaf5d1c350bff033f1c53e031451ab7cd095e14948";
+    sha512.run = "53d9ffd3c30803af940e9f17ccfafc394b6f6049b6b266737049a1f11e120cd5f279a1cfbbb883ee7b0dad81a1151e1314466a5a0f0d03211fcd7d89ea081c9a";
   };
   yinit-otf = {
     revision = 40207;
@@ -54849,14 +55029,14 @@
     sha512.run = "5b5152cc315dc05164ba3502d6e7aff355d853e43a3836bda0a15a4af7a90ef9fef02c852125c7e1e4842c05d51f2be6441b5131400eb46bb6704b281711e18d";
   };
   youngtab = {
-    revision = 73766;
+    revision = 77677;
     shortdesc = "Typeset Young-Tableaux";
     stripPrefix = 0;
-    sha512.doc = "bc5a17e1d5c164fe2912c4529525e9067d7db8812a66656b8e4cfed7c5d09187e2ce62e10aead879343e6f5ce8b489e420ef945821c415121de64355a9d9ba53";
-    sha512.source = "778d4706f25820da832f7ab671cb7958cdf31f2db1deddf2c6e34ad7958b306e7012d07ed7572c506d076fcd20d32ad3a2274a6cf6f188b9f3f69abefae1995c";
+    sha512.doc = "b2907029afb066201f0dad0b681651a89a1213e5f81b7854099469884ea96839ba409a9b7bfbc25c298a25b51478a938928a60e26f0337a485f04317ec431c08";
+    sha512.source = "fac8adf1d1068c50bbf00cacc6a94efd005840d64b7a4944168cb4a8a5299db2641e3d16cdc49ad122be1e296d1b168cae0bb0dbc2d4a02fb38bfc6373231e71";
     license = [ "lppl1" ];
     version = "1.1";
-    sha512.run = "9566789779579a489fc321c525c447f50fe020031b08e93f332ce21f7e75d75c5da81760e02bb6d1a5949f984c8d2066cc37055090d0f891fc6d4a392f5fd315";
+    sha512.run = "3fe584c27e588c587b4d4ffe56882fdd468b1e4a523bd22cedf9ca5315789d8dcb33f8b99d55d9f1b532494a19145f8930d018d06a484b0919ffb81cf86205bf";
   };
   yplan = {
     revision = 34398;
@@ -54878,30 +55058,30 @@
     sha512.run = "bbe4cbf94580714f18ca034855296635e10808f382b02257b65f2b02ab49e771789caf811eff310cf26199d357deefa3e67ddc85ca7159a3a079564cef10799a";
   };
   ysabeau = {
-    revision = 77373;
+    revision = 77677;
     shortdesc = "Ysabeau fonts with LaTeX support for traditional TeX engines";
     stripPrefix = 0;
     fontMaps = [
       "Map ysabeau.map"
     ];
-    sha512.doc = "883313f77f8155c9d763de7b90005ee0693f50090b25d394a22388569cb0b146137a0719854176fd6957607222e5bf28a7a30a280ddea7e1e67e776d69300c41";
+    sha512.doc = "3eb92f45147cbcb33772e6f72bc2f9228ec1421663b891d65a51a7e3e0aaf0ed5523539e933a77b1998ac225af0c254078b2c5a994d4a128e3a8e3eedb4d5da7";
     license = [
       "ofl"
       "publicDomain"
       "free"
     ];
     version = "1.6";
-    sha512.run = "229f8fac33513ae0b410a3c86f5ccbc5d3c284f5c151f8a5fbc26913e9f222bbd3b1ea055c2285300e4989c527c772fb46f67988ee66152e81b88ea11523544f";
+    sha512.run = "6e42d27eaaf0b87da9f9bc00598800f3210ef590fff1cb0f55c49ec6b09f75b61e8de3bdd8434d91f5e6407ea9e89c7f06c257f3536c74e841ea24fe3a28bbf5";
   };
   ytableau = {
-    revision = 73766;
+    revision = 77677;
     shortdesc = "Many-featured Young tableaux and Young diagrams";
     stripPrefix = 0;
-    sha512.doc = "109cfb4529ebd9415438416d32d83f1e9583e055059c34b81a7f1e2fde72b833ffe3ee70d43fca49f3e184af8bb79a9c732b5f0f1eb34f940aa1122ba97f16e3";
-    sha512.source = "7e7c71f3652d60dd73b929832843a577061124aea055daa5ca1218082882b6aeab932d7e7f9a6b2069051c862022713737acdfbfcf0299cefab580d9daca7260";
+    sha512.doc = "05c6317ed041a02c7fef4906beed917eb340dd12128c24d1b48e9fa8c5b413e07a332f72f91430e8f072c247b307fa5cb06f79507c44019a4d7bd6af01323a56";
+    sha512.source = "c44639c43bc52fbc207dc6392d1442e326a58736db91bc575053bbb09e9f96b36ef0ed5de38c3d5efff4de9982831e5e6ba15da74f52eb0cc943ad70b02b259a";
     license = [ "lppl12" ];
     version = "1.4";
-    sha512.run = "fadb350bbea899824bb30d3027da91bc0c72a3ce0fca0ca5d162bcbddc4094284ed0c732dd2894602a2f7c76369cb0b16c932aae07766847cd43f7ba652566ba";
+    sha512.run = "1698133e754876951ea7475693be06cb808708ff0582b2a7542ec659c7008d29d173e9272ba9ad4d29b2f940dbb96964dc05eb9ff6f26653d4fdfc7ecf45fbe1";
   };
   zapfchan = {
     revision = 77161;
@@ -54938,24 +55118,24 @@
     sha512.run = "c9685b151679e7516e146f3d97f4242c7cdf084f84a7ac857a8aa27031c60950d0da07d66b7b57d7bdec384d3501c30b339231654cf845bbed2945b0ac069368";
   };
   zebra-goodies = {
-    revision = 66630;
+    revision = 78181;
     shortdesc = "A collection of handy macros for paper writing";
     stripPrefix = 0;
-    sha512.doc = "c4bdfba7e426c95599c4fe2cff06ada80345490f433eb636260ed5ce322c1c21c0b5de0c4709be415b6b98668b7c514610375f2bdf9831248be0095e1ff28dc2";
-    sha512.source = "ec961bcc2d7181450184bdddbe0f0c1d5100bd6fe2294722dda239d8979f6c8d126fd4f52cce371db8227aedb1e1da14eaf1457ed12e65d33ccce6f23148ad8f";
+    sha512.doc = "7c4d9c675967556c82668e004b927e2761f826f9df15a8107549317bdfe6073b77637a1258618d7c1885265aa2142405a3a8578b246e5c14102d665915caa40b";
+    sha512.source = "df65863d717cee646003a2a9c96ababc0b587c526226175a6ee6ea7417df2a90a72bcde04764d2bc2e884ece68bac45520a49537e2f40df6c18e886747cd6345";
     license = [ "lppl13c" ];
-    version = "0.8.1";
-    sha512.run = "c740469e5a27355fbe8c781d30434724b8c77216e88c674854dd71e73e38ba78aeeef251a25e756c4046230eccdf334abf6d5f378bad559691a29955cb0eb16c";
+    version = "0.9.1";
+    sha512.run = "f40a4023c2ba8ba0e04e0e009d3f530633dc8d100d542137bbc080b5ae88baac7fb642838343a237caf97e5da1e2b762e458c108d97834bdd7630ed343f7c298";
   };
   zeckendorf = {
-    revision = 76884;
+    revision = 77677;
     shortdesc = "Knuth Fibonacci multiplication, Zeckendorf and Bergman representations of big integers";
     stripPrefix = 0;
-    sha512.doc = "da45cd3b8d4780bad656578a7b0a8adb27fe8691acb6306589ffa9119af28e05fdda7bd1d745f60b045c8882e5617647e4e7849f646efbb87d8dca0ee34762e2";
-    sha512.source = "02e9d54355017b65657c57be58d45b86d1ec22761f7d9d28d5cf6b83ec0fdbfa7326ce68ecad0e270540307472abe57f11d20eef4fa7905613b99a065923aac9";
+    sha512.doc = "739a75631d69b3236b57f5e0e783107fc1ac622d1a196a731e5c3386eae06730cc380f64f9dc6bdb2405ecf2ed852b6159143be73ff4539ae5760e0eaebe8f86";
+    sha512.source = "a922682af2a93cfead6b43df7adc2b27b696d0f7d7016a22adab863843a40ae611b15d591b711770f19435fc25da9c73791ea6f4f2ddf15bde98ed4a93f79df0";
     license = [ "lppl13c" ];
     version = "0.9d";
-    sha512.run = "34b343f1c6c34f2be0a3cf6a745750227b27ee21d360c64411f3d8b228a239b9ab27a1df9815a76e4c55a3c97009c73711b33c3d592c43faa4b7ff3aacc223f7";
+    sha512.run = "168460bd24360be4b21d257324e6581c4e8c60ec01864953f34a3662ffbe30664be52e2e9c975e61fe31a882b2d1a6e8289d7052646a9be273cf83320309a525";
   };
   zed-csp = {
     revision = 17258;
@@ -55013,14 +55193,14 @@
     sha512.run = "1e068a0b402a5c69b44a86d797cb24266b2883c698decd8b8464c99b131d292cc5ac44249ba8e89dc0a414d6f12d73d4c069ffc3081cfa4b9926ca412bfc3dd6";
   };
   zhnumber = {
-    revision = 66115;
+    revision = 77677;
     shortdesc = "Typeset Chinese representations of numbers";
     stripPrefix = 0;
-    sha512.doc = "c8f6b76b72f7b7bc19f2e6fe64191b86c4b73fa7559d3299945359a7d2205e3685c4eee98283f361207192fc35de0a7ae9064e118e20f96f832d18eacf93bf70";
-    sha512.source = "7a79592cda187221d2832db12e45923a03f110de7ae358304048a52d2e170853421cad0a50211c0894b700c98301cf949f1def35acacc7cf2d23789ff23ca4ea";
+    sha512.doc = "bd879013eac39eda3ca985674e8bf9d149ff2433545242dccccda98f565850b8036cf58e52b4a2c338eb4db168de89b7f0c1ce45c567e9e1fed547157b81b1c0";
+    sha512.source = "e90499f7d88b2fe0a9ab15d8ddffb5061c57a45777a2e4bd7cf32d04d550c82e27e80b76fba71e2b7829734c6a05ab7d00cf2d69e52c7b982258eb078771dd8f";
     license = [ "lppl13c" ];
     version = "3.0";
-    sha512.run = "080460cafa9f1b382d5843e7863eefb36a26abcdf8ef97d9a23fe4e68d1bf85e0e6a38c7201d1dbaf2d25acc7b846d757fab9f9b850d992a576b6df67929cb55";
+    sha512.run = "64b348ff80be52a4cf499bc43188e443b583707db4c20fe07891349e88abf84b9366e77f7c661e26403b7864b0833fef6551ca33eb0c081dff8ba84ec4079620";
   };
   zhspacing = {
     revision = 41145;
@@ -55040,22 +55220,22 @@
     sha512.run = "3d29074642d8a4c63046347a36f47548557de92a64ab4d6b7d1cad87f97a9e25a09fe84cf699a3bf2129c4de00dd3ef3593f85056e8f38a9a2d1ca27c549cf96";
   };
   zitie = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Create CJK character calligraphy practicing sheets";
     stripPrefix = 0;
-    sha512.doc = "bf034be9dbaf2d6ffbbb9cffd94b81dba7c397cf9e0c519f4e3df7a38e652190ae17c0d1d6cb413b61461c9377e0f775ddcfc86bd90f4c683800765cb9cd2ab6";
+    sha512.doc = "fda6b5d51c2e0374da62d33b3f30508c2b5c4b4203b464ef1a4bc7baf310ef64d11bce580d9e6fa705b476dbe5a920ade84bc7b9f1fbb0336ccc41cd49e54b3b";
     license = [ "lppl13c" ];
     version = "1.4.0";
-    sha512.run = "5196bc1b43af977b9da47e3386e6c34e125b1a4ef1213dd9de45299addf9973117e5f09f4b8f69faaf7bd4418971e1d6a505aca3a30322dc43d487448a65a772";
+    sha512.run = "beef71c97de46ee28b90e7566a8cdd0201f60b54df1bb89950574e9d18940dc0640ca9267f74edd2648c28b0f9355456b54b29ccf31465d9422a0d1b7794f482";
   };
   zlmtt = {
-    revision = 64076;
+    revision = 77677;
     shortdesc = "Use Latin Modern Typewriter fonts";
     stripPrefix = 0;
-    sha512.doc = "2bd3ce9fde985f319bfb33ed791524bf81ce2ad3797fabdce78bbc4f4884871d5994e6fd9737ca3ae40953613aca70b9ef399ae914a40df54c91347ca98aef98";
+    sha512.doc = "7255f19936c9947529e32e89f8d23619552d48bc337a6a8810735bbaba9beaf5e2750a1666f63e4c27d4b52e52441abb31363aa1b72c6711055d316249068752";
     license = [ "lppl13c" ];
     version = "1.032";
-    sha512.run = "ecd45c407db5a78d31f6bcb7be6184531a51bbf89171c47f2e5178e65b06db4595682c713a977ece1cdbd98fb59b551baef3cca527b22f98bb45b37e73407144";
+    sha512.run = "0e0b757eb0f73958bf530b6049606a5eb6d3ef16d6eb269e440dec432c79b12de8ae343bef9284cff5ad909c7811666b5be441a48d735d05a9432b968b3a43ba";
   };
   zootaxa-bst = {
     revision = 76790;
@@ -55067,52 +55247,52 @@
     sha512.run = "681c40259bb6d67f423dc6828372ca694c6a350f227ca3c759064cb7845cb716d061919ae4552fef0a0377de3e608c0e03eeb8daf528e7953507a019f52d2ced";
   };
   zref = {
-    revision = 75450;
+    revision = 78116;
     shortdesc = "A new reference scheme for LaTeX";
     stripPrefix = 0;
-    sha512.doc = "7cc167a693f1636216c98faf70c44ea1826a0a887f02303b18204b8165138219be7ff8ca413a5af318287d1c57abd02a5b05ad2766c456a0b3001fa5ea2c415c";
-    sha512.source = "db715d495e70ae7e28d41052ccb20eb622201704308f858da553ef60b9e3cef4d7861d5288df95a9852e2f5396f0b47a56d87062cd79723ed38502f029959fb9";
+    sha512.doc = "df9dec2757d36439e880e895cccf00f21ca2e4e014e89d588f7f295f51538d833887c5df729dc5749d0fd0f8b4364466ade60264e5634ffd5691946e135efe69";
+    sha512.source = "c321fe82becaadb1092d9813bd1b4cf7b250af586391532f362476733a15dd0fd9687ded58312456785a5ffd4977981462f4ff94b21e7b7fab14cb79a93895b5";
     license = [ "lppl13c" ];
     version = "2.36";
-    sha512.run = "f5bb679efada440d14dac3fbfc590db6655e056f73edbace1f279c6d0aee320d6fb0ea156de40aaad6662defbe084e0ee126f245499776e036e635c8a146a29f";
+    sha512.run = "6a372e0a308c1130b70fb33227b3ae896cc3fb87f911a34b0c0158e671bd4f0333c6be828aff4b5f55afd9406259699064788c4de48afbc74f26d0dc7a261108";
   };
   zref-check = {
-    revision = 76924;
+    revision = 78116;
     shortdesc = "Flexible cross-references with contextual checks based on zref";
     stripPrefix = 0;
-    sha512.doc = "c558f57d0c0fe86d362582184b83017154916bd384c60b3d55468b03dc2f39d839d625cc7a63dfb666e5d293c44f2d0956ff86d8e6920f3c2225664c76458b77";
-    sha512.source = "582b92ac16d548640638ff9153c24d8d69baabeaf4348a4b2d8e08f0c0a55b6ca617e64faf19d93bad0f59f105faf0d9aeb428b81e720ab4908a9dac6f77a016";
+    sha512.doc = "4a43808d628191cb8b4602673098978cccbe34f2d8e9dd71ac7d925b3ce65fbf0f9825af445bc915b4a616733bf1b8d35ab6d67136b5d17789889a3cca14f93a";
+    sha512.source = "fea51f047b5bcc620f8218b5b40da9f0fdd3e6eb38cf893f220c9408d2689f2b3ee0b3ba151c5916ddbdaa5523c67b907c7ce9eccb125f3367d5207c007af8c4";
     license = [ "lppl13c" ];
     version = "0.3.7";
-    sha512.run = "089328f5435cf94c0c63cff1cb221a14c16d1b2d7dc0bed6cb87a789f334757a48b3744fb5b6a861c8dcb3345d504c7395c6cd6d4c55aa29002b0a54696592e1";
+    sha512.run = "a3efa95e86ff9f7ebb6e2fc1594f3603a63ac26ec90d0357abcf5c06a0fd0c4eb90a72ce081425415726ed730d442c82908c320ab9a25a8bdd87f78f60238962";
   };
   zref-clever = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Clever LaTeX cross-references based on zref";
     stripPrefix = 0;
     deps = [
       "oberdiek"
       "zref"
     ];
-    sha512.doc = "ca8eae989a34095f5b5f4526a37864ee9589f777a8f283dc3d90de1f7dfe2bbc918fe7d8d8716869c50ec51bb8390c6a7f8a33d6f91fe1f0e492e8ae1b3b4058";
-    sha512.source = "78103e757707965a916e7f5204ee2dd6a9d9ed69e11adf47a3463cfbd85602e6a537a32ab142c1e88ca139549c90a8ac10259df53e6c7fcf1c404fcd215dbefd";
+    sha512.doc = "054071b89f629f5d2c16ab1cb9367f9b9ffb2eef938aa207fba569bcefe9c43a7ae632c4a03a64b91be5e6d4146eea53107c4033876ac2d15817cf982cd66a3d";
+    sha512.source = "d51c9eaf54f65f9b5982657728546e8a6f473e3ec7664cbb88315cceec79cd023e8fe4fe3f7c12151f84f3318037e95847c41c48b6153b1672b2919d11736c9f";
     license = [ "lppl13c" ];
     version = "0.5.1";
-    sha512.run = "cf85426603542e3e18917814adbf737acf33a9685dacbad6a21e14529ef7132d295f3a7df85802cc3bf91cb3782ef3f5645010ddd9bdcaeb191a89946db6399d";
+    sha512.run = "20efdf69ea14c4587ad27ae69064f8df8cec37a3f657a18d8bedb2495c956a2e8c112408cc5e4dc6a8be76b0863ca0282a0a527fcfeef10c162c839d96ca2b4d";
   };
   zref-vario = {
-    revision = 76924;
+    revision = 77677;
     shortdesc = "Extended LaTeX page cross-references with varioref and zref-clever";
     stripPrefix = 0;
     deps = [
       "tools"
       "zref-clever"
     ];
-    sha512.doc = "1100e71aa2808848d4c63baf39f3f04a6d4c31fb9c677c0a1b509dd32f394af3d9cd724602e58fa33128e3d4577ad9d87aaa56227eb4bc12dd5d7eb9e2cdef72";
-    sha512.source = "804038c6856f0f6554957dddf844499ad81eda1aef67c3fb8db94e1295b7b709aedf3d41ea409de00192cdbfd898ea4b9a756e82c2998278776753ebae0c12c7";
+    sha512.doc = "77476da47d227a90ba4ee78bd7ad818a902dd78d2ccec4e3d50ed39dff9db8c92492c4f7e84c17c426f97fbf1185774b5d4ba96b5a21763672fa4ec020c33ef8";
+    sha512.source = "b55d232b27a6a47eb1adc30ee27f2c6f5c8a6ad15b3aaf9cb7c6b702ee28731fa715f1b32a97aea66890e13387e8bb073d93c05a66835d1689ace632b3c540e5";
     license = [ "lppl13c" ];
     version = "0.1.12";
-    sha512.run = "29c849a5363dc608af288e60a3ba5c3083c1eee5de55261450a04a34a136464473af07cce5b10a1c5de320eb84d6bbbbb1430a704b6a06077d47a6aa12c66401";
+    sha512.run = "1a2ecd840ab255fd67a3bce2bd175a56f575e4df88523207c44e02a0bb359b6bd2a70828a5ffb9d74a1488fa880fbd6cda92e74020eb962e549a73f0e69313da";
   };
   zugferd = {
     revision = 76924;
@@ -55154,31 +55334,31 @@
     sha512.run = "df85b39bf16ec098d1940554dafe0bbefd4972f1a8306804565faad060790832c8f492fab6b18a45ec057bc8b904849789b8bbc238e323cc08394f6f4ad84cbf";
   };
   zxjafbfont = {
-    revision = 28539;
+    revision = 77677;
     shortdesc = "Fallback CJK font support for xeCJK";
     stripPrefix = 0;
-    sha512.doc = "215079eeb772dc4ea55d5e00945a757c877acf9ea56aebe5a8969564a3836f54ca406d502d73e93d92b131600fc77bd2342d36fa78300adc0b4d1dd7f5d0f423";
+    sha512.doc = "625eb93381bbb7d7ae54af3f7c2edd35c3cd9a3f41a2312a3a4740b61fb9682a8fc3b105e5f51879ca1a057be4977fcf807e76d54ecf7fa1679971c6fe7749b3";
     license = [ "mit" ];
     version = "0.2";
-    sha512.run = "357b100dac7061a5e6fe91e3a708f32e99a134158393581bc717ae3e90afa5dbbff7aa1bae8c092638bca2d5c3ab65d8a8cbc39c20c3ec1ff85c967fb3849513";
+    sha512.run = "9cbffffbd1bea28c462aa3c5b0b4694df1a4a1b14636f79680d66ebd93b41de7ddf04af7c908a8c5fddd53a050cc76219925ff924585bf467907a70482a835a2";
   };
   zxjafont = {
-    revision = 62864;
+    revision = 77677;
     shortdesc = "Set up Japanese font families for XeLaTeX";
     stripPrefix = 0;
-    sha512.doc = "598a13775cac68ae6f176bd01b609373a4033583a83ed42f7914b15a01776d40b0c7200258dd68563510b2a3c11ec29a25ab3b26477650b60652e7332ef3f131";
+    sha512.doc = "de9d26b0aeef6afae7ea2b70e7d99eca57ae450b07fdd8da9f01c49dc68662a1f6608fd839ea1e027987e48fafc0bb8675d1b39cbe74d368a90b91dd986b01d0";
     license = [ "mit" ];
     version = "1.3";
-    sha512.run = "4afb6c3126c66c23a9a5b2ad1103289ab3f14c5a0d9bad7de209de3801e77f803e7a88d7440aa2f85d5aa6c23b6514585f263a95d6c3d68c232051880943a5c0";
+    sha512.run = "9762d64157e73e25bc8217395a34da69fa69159149c053ebb1e518ab5a8117e5b7a0a1bfc5fab5979f4ebd34df61a2b9e1443d634fcd460017bfd7aeccd89940";
   };
   zxjatype = {
-    revision = 53500;
+    revision = 77677;
     shortdesc = "Standard conforming typesetting of Japanese, for XeLaTeX";
     stripPrefix = 0;
-    sha512.doc = "0fccc73af66a05231cf8283920d65717600be4673329ed1f46b93a494d766aa9542deb1a56b5d23d6c0d6b93be98aa778234ddc2dcd9c0936542a45d057b6dc2";
+    sha512.doc = "bc1dc5292e25e27200b13934319bcf37d40a4159f9262f2d23ed63790d4e9207518daede01a619be97625c01743a5cae6bafe8e8332a98778057683ca11f0c5a";
     license = [ "mit" ];
     version = "0.7";
-    sha512.run = "21eaace7188c9e61f5dd65f34e26b1ca16358e7396d44188ae17e8e01a58f38ac3be9f09f8f41923c257d089210d1fb7d841eada5c9a345cec42b934d257ef94";
+    sha512.run = "64977051f6eaafc2a05a00456f1c62b75f3ea8ff9eb933acebd82cdafdd3b7284c7079a172bca1161077f8735c54b546994f5d910fd6a932366f1725c5380799";
   };
   zztex = {
     revision = 55862;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index af55e1118485..469e994257bc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -195,6 +195,8 @@ let
       neochat # Added 2025-07-04
       itinerary # Added 2025-07-04
       libquotient # Added 2025-07-04
+      qtwebengine # Added 2026-01-15
+      qtwebview # Added 2026-04-03
       ;
 
     kexi = throw ""; # Added 2025-08-21
@@ -256,6 +258,7 @@ mapAliases {
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve, reason: common typo
   fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
   uclibc = uclibc-ng; # preserve, because uclibc-ng can't be used in config string
+  utfcpp = utf8cpp; # Added 2026-04-02. preserve, reason: Upstream calls it `utfcpp`, but `utf8cpp` is as common as `utfcpp` in other distros, see https://repology.org/project/utfcpp/information
   wlroots = wlroots_0_20; # preserve, reason: wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
   wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
 
@@ -306,6 +309,7 @@ mapAliases {
   apacheAnt = throw "'apacheAnt' has been renamed to/replaced by 'ant'"; # Converted to throw 2025-10-27
   apacheKafka_3_7 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
   apacheKafka_3_8 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
+  apmplanner2 = throw "'apmplanner2' has been removed as it depends on insecure&unmaintained qtwebkit"; # Added 2026-04-26
   apple-sdk_11 = throw "apple-sdk_11 was removed as Nixpkgs no longer supports macOS 11; see the 25.11 release notes"; # Added 2025-05-10
   apple-sdk_12 = throw "apple-sdk_12 was removed as Nixpkgs no longer supports macOS 12; see the 25.11 release notes"; # Added 2025-05-10
   apple-sdk_13 = throw "apple-sdk_13 was removed as Nixpkgs no longer supports macOS 13; see the 25.11 release notes"; # Added 2025-05-10
@@ -431,6 +435,7 @@ mapAliases {
   cataract-unstable = throw "'cataract-unstable' has been removed due to a lack of maintenace"; # Added 2025-08-25
   catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21
   catnip-gtk4 = throw "'catnip-gtk4' has been removed, as it has been unmaintained upstream since June 2023, use cavasik or cavalier instead"; # Added 2026-01-01
+  cb2bib = throw "'cb2bib' has been removed as it depends on insecure&unmaintained qtwebkit"; # Added 2026-04-26
   cdktf-cli = warnAlias "'cdktf-cli' has been renamed to/replaced by 'cdktn-cli'" cdktn-cli; # Added 2026-02-18
   cdparanoiaIII = cdparanoia-iii; # Added 2026-02-08
   cdwe = throw "'cdwe' has been removed, as it has been unmaintained upstream since June 2023"; # Added 2026-01-01
@@ -467,6 +472,7 @@ mapAliases {
   chrome-gnome-shell = throw "'chrome-gnome-shell' has been renamed to/replaced by 'gnome-browser-connector'"; # Converted to throw 2025-10-27
   ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
   cinnamon-common = cinnamon; # Added 2025-08-06
+  cisco-packet-tracer_8 = throw "'cisco-packet-tracer_8' has been removed as it vendored qt5 webengine. Consider updating to 'cisco-packet-tracer_9' instead."; # Added 2026-04-26
   ciscoPacketTracer7 = throw "'ciscoPacketTracer7' has been removed in favor of 'cisco-packet-tracer_8' and 'cisco-packet-tracer_9'";
   ciscoPacketTracer8 = cisco-packet-tracer_8; # Added 2026-02-08
   ciscoPacketTracer9 = cisco-packet-tracer_9; # Added 2026-02-08
@@ -502,10 +508,12 @@ mapAliases {
   clashmi = throw "'clashmi' has been removed, as it is unmaintained in nixpkgs"; # Added 2026-01-31
   clasp = throw "'clasp' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27
   claude-code-acp = warnAlias "'claude-code-acp' has been renamed to 'claude-agent-acp'" claude-agent-acp; # Added 2026-03-31
+  claude-code-bin = warnAlias "'claude-code-bin' has been merged into 'claude-code'" claude-code; # Added 2026-04-18
   clearlyU = clearly-u; # Added 2026-02-08
   cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
   clima = throw "'clima' has been removed, as it has been unmaintained upstream since December 2024, use glow instead"; # Added 2026-01-01
   clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
+  clipgrab = throw "'clipgrab' has been removed, as it was unmaintained in nixpkgs since 2022 and depended on vulnerable qt5 webengine."; # Added 2026-02-11
   cloudlogoffline = throw "cloudlogoffline has been removed"; # Added 2025-05-18
   clucene_core = warnAlias "'clucene_core' has been renamed to 'clucene-core'" clucene-core; # Added 2026-01-12
   clucene_core_2 = warnAlias "'clucene_core_2' has been renamed to 'clucene-core_2'" clucene-core_2; # Added 2026-01-12
@@ -592,8 +600,10 @@ mapAliases {
   deco = throw "'deco' has been removed as it is unused"; # Added 2025-12-18
   deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21
   deepsea = throw "deepsea has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
+  defuddle-cli = warnAlias "defuddle-cli has been renamed to/replaced by 'defuddle'" defuddle; # Added 2026-04-16
   degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
   deltachat-cursed = throw "'deltachat-cursed' has been renamed to/replaced by 'arcanechat-tui'"; # Converted to throw 2025-10-27
+  deltatouch = throw "'deltatouch' has been removed as it depended on qt5 webengine which reached EOL"; # Added 2026-04-25
   devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
   dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
   discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29
@@ -629,6 +639,7 @@ mapAliases {
   dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27
   dune_1 = throw "'dune_1' has been removed"; # Added 2025-11-13
   e17gtk = throw "'e17gtk' has been removed because it was archived upstream."; # Added 2026-01-15
+  eagle = throw "'eagle' has been removed because official support ends 2026-06-07. It depended on qt5 webengine, which was removed for its numerous security issues. For more details, see the autodesk announcement at https://www.autodesk.com/support/technical/article/caas/sfdcarticles/sfdcarticles/Autodesk-EAGLE-Announcement-Next-steps-and-FAQ.html"; # Added 2026-04-26
   eask = throw "'eask' has been renamed to/replaced by 'eask-cli'"; # Converted to throw 2025-10-27
   easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17
   ebpf-verifier = warnAlias "'ebpf-verifier' has been renamed to 'prevail'" prevail; # Added 2026-04-01
@@ -677,7 +688,6 @@ mapAliases {
   eureka-ideas = throw "'eureka-ideas' has been removed as it has been unmaintained upstream since April 2023"; # Added 2026-02-07
   evolve-core = throw "'evolve-core' has been removed, as it hindered the removal of flutter329"; # Added 2026-01-25
   eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27
-  expidus = throw "'expidus' has been removed from nixpkgs due to it not being maintained"; # Added 2026-03-17
   f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18
   fabs = throw "'fabs' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
   fast-cli = throw "'fast-cli' has been removed because it was unmaintainable in nixpkgs"; # Added 2025-11-17
@@ -710,6 +720,7 @@ mapAliases {
   firmwareLinuxNonfree = throw "'firmwareLinuxNonfree' has been renamed to/replaced by 'linux-firmware'"; # Converted to throw 2025-10-27
   fishfight = throw "'fishfight' has been renamed to/replaced by 'jumpy'"; # Converted to throw 2025-10-27
   fit-trackee = throw "'fit-trackee' has been renamed to/replaced by 'fittrackee'"; # Converted to throw 2025-10-27
+  fixup_yarn_lock = throw "`fixup_yarn_lock` has been removed, please use `fixup-yarn-lock` instead."; # Added 2026-04-25
   flashrom-stable = throw "'flashrom-stable' has been renamed to/replaced by 'flashprog'"; # Converted to throw 2025-10-27
   flatbuffers_2_0 = throw "'flatbuffers_2_0' has been renamed to/replaced by 'flatbuffers'"; # Converted to throw 2025-10-27
   flattenReferencesGraph = warnAlias "'flattenReferencesGraph' has been renamed to 'flatten-references-graph'" flatten-references-graph; # Added 2026-02-08
@@ -752,6 +763,7 @@ mapAliases {
   fontibmtype1 = font-ibm-type1; # Added 2026-01-19
   fontisasmisc = font-isas-misc; # Added 2026-01-19
   fontjismisc = font-jis-misc; # Added 2026-01-19
+  fontmatrix = throw "'fontmatrix' has been removed as upstream was archived 2024-10-24"; # Added 2026-04-26
   fontmicromisc = font-micro-misc; # Added 2026-01-19
   fontmisccyrillic = font-misc-cyrillic; # Added 2026-01-19
   fontmiscethiopic = font-misc-ethiopic; # Added 2026-01-19
@@ -812,6 +824,7 @@ mapAliases {
   gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08
   gensgs = throw "gensgs has been removed as it was unmaintained, abandoned upstream since 2009 and relied on gtk2"; # Added 2025-10-29
   geos_3_9 = throw "geos_3_9 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2025-09-21
+  gfie = throw "'gfie' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-17
   gfn-electron = throw "gfn-electron has been removed from Nixpkgs as it's abandoned upstream"; # Added 2025-11-05
   gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
@@ -834,6 +847,7 @@ mapAliases {
   glew-egl = throw "'glew-egl' has been renamed to/replaced by 'glew'"; # Converted to throw 2025-10-27
   glfw-wayland = throw "'glfw-wayland' has been renamed to/replaced by 'glfw'"; # Converted to throw 2025-10-27
   glfw-wayland-minecraft = throw "'glfw-wayland-minecraft' has been renamed to/replaced by 'glfw3-minecraft'"; # Converted to throw 2025-10-27
+  globalprotect-openconnect = throw "'globalprotect-openconnect' was removed because it was unmaintained in Nixpkgs and needed upgrading to the Tauri rewrite, as the old version depends on the removed Qt 5 WebEngine"; # Added 2026-04-26
   glxinfo = throw "'glxinfo' has been renamed to/replaced by 'mesa-demos'"; # Converted to throw 2025-10-27
   gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
   gmu = throw "'gmu' has been removed as it was broken and unmaintained in Nixpkgs"; # Added 2026-04-04
@@ -876,12 +890,14 @@ mapAliases {
   godot_4-export-templates = throw "'godot_4-export-templates' has been renamed to/replaced by 'godot_4-export-templates-bin'"; # Converted to throw 2025-10-27
   godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27
   godot_4_4-export-templates = throw "'godot_4_4-export-templates' has been renamed to/replaced by 'godot_4_4-export-templates-bin'"; # Converted to throw 2025-10-27
+  goldendict = throw "'goldendict' has been removed as upstream goldendict/goldendict is unmaintained and depends on deprecated qtwebkit; use the actively-developed Qt6 fork 'goldendict-ng' instead"; # Added 2026-04-26
   goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
   goocanvas2 = warnAlias "'goocanvas2' has been renamed to goocanvas_2" goocanvas_2; # Added 2026-01-17
   goocanvas3 = warnAlias "'goocanvas3' has been renamed to goocanvas_3" goocanvas_3; # Added 2026-01-17
   goocanvas = warnAlias "'goocanvas' has been renamed to goocanvas_1" goocanvas_1; # Added 2026-01-17
   gphotos-sync = throw "'gphotos-sync' has been removed, as it was archived upstream due to API changes that ceased its functions"; # Added 2025-11-06
   gprbuild-boot = throw "'gprbuild-boot' has been renamed to/replaced by 'gnatPackages.gprbuild-boot'"; # Converted to throw 2025-10-27
+  gpredict-unstable = throw "'gpredict-unstable' has been removed, as it was behind 'gpredict'"; # Added 2026-04-29
   gpt-box = throw "'gpt-box' has been removed, as it is unmaintained"; # Added 2026-01-25
   gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # Added 2025-09-09
   gpxsee-qt6 = gpxsee; # Added 2025-09-09
@@ -923,8 +939,10 @@ mapAliases {
   hpp-fcl = throw "'hpp-fcl' has been renamed to/replaced by 'coal'"; # Converted to throw 2025-10-27
   hspellDicts = throw "'hspellDicts' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
   http-prompt = throw "'http-prompt' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-26
+  httplz = throw "'httplz' has been removed as it was unmaintained upstream"; # Added 2026-04-25
   hydra_unstable = throw "'hydra_unstable' has been renamed to/replaced by 'hydra'"; # Converted to throw 2025-10-27
   hydraAntLogger = warnAlias "'hydraAntLogger' has been renamed to 'hydra-ant-logger'" hydra-ant-logger; # Added 2026-02-08
+  hyprfreeze = warnAlias "'hyprfreeze' has been renamed to 'wl-freeze'" wl-freeze; # Added 2026-04-10
   i3-gaps = throw "'i3-gaps' has been renamed to/replaced by 'i3'"; # Converted to throw 2025-10-27
   i3lock-pixeled = throw "'i3lock-pixeled' has been unmaintained for several years now."; # Converted to throw 2026-01-24
   ibm-sw-tpm2 = throw "ibm-sw-tpm2 has been removed, as it was broken"; # Added 2025-08-25
@@ -987,7 +1005,7 @@ mapAliases {
   kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
   kanidm_1_5 = throw "'kanidm_1_5' has been removed as it has reached end of life"; # Added 2026-01-29
   kanidm_1_6 = throw "'kanidm_1_6' has been removed as it has reached end of life"; # Added 2026-01-29
-  kanidmWithSecretProvisioning = warnAlias "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01
+  kanidmWithSecretProvisioning = throw "'kanidmWithSecretProvisioning' was removed. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'."; # Added 2026-04-30
   kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
   kanidmWithSecretProvisioning_1_5 = throw "'kanidmWithSecretProvisioning_1_5' has been removed as it has reached end of life"; # Added 2026-01-29
   kanidmWithSecretProvisioning_1_6 = throw "'kanidmWithSecretProvisioning_1_6' has been removed as it has reached end of life"; # Added 2026-01-29
@@ -995,7 +1013,9 @@ mapAliases {
   karing = throw "'karing' has been removed, as it is unmaintained in nixpkgs"; # Added 2026-01-31
   katawa-shoujo = throw "'katawa-shoujo' has been removed, as it bundles insecure Python 2. You may install 'katawa-shoujo-re-engineered' instead, which is an updated version remade by Fleeting Heartbeat Studios."; # Added 2026-03-27
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
+  kchmviewer = throw "'kchmviewer' has been removed as it was unmaintained upstream since 2022 and depended on qt5 webengine. Consider switching to 'uchmviewer', a fork of 'kchmviewer'."; # Added 2026-02-10
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
+  kdeltacht = throw "'kdeltachat' has been removed as it depended on EOL qt5 webengine and was unmaintained"; # Added 2026-04-17
   keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27
   keydb = throw "'keydb' has been removed as it was broken, vulnerable, and unmaintained upstream"; # Added 2025-11-08
   kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27
@@ -1109,6 +1129,7 @@ mapAliases {
   libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
   libtransmission = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
   libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  libubox-wolfssl = throw "'libubox-wolfssl' has been removed, use 'libubox' or 'libubox-mbedtls'"; # Added 2026-03-29
   libuinputplus = throw "'libuinputplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
   libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   libWindowsWM = libwindowswm; # Added 2026-01-19
@@ -1277,6 +1298,7 @@ mapAliases {
   lowPrio = warnAlias "'lowPrio' has been removed from pkgs, use `lib.lowPrio` instead" lib.lowPrio; # Added 2025-10-30
   LPCNet = throw "'LPCNet' has been renamed to/replaced by 'lpcnet'"; # Converted to throw 2025-10-27
   luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27
+  luminanceHDR = throw "'luminanceHDR' has been removed as it depended on EOL qt5 webengine and was unmaintained"; # Added 2026-04-17
   lunarvim = throw "'lunarvim' has been removed since it was abandoned upstream and relied on an older version of 'neovim' to work properly"; # Added 2026-02-05
   lxd = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
@@ -1343,6 +1365,7 @@ mapAliases {
   mediastreamer = throw "'mediastreamer' has been moved to 'linphonePackages.mediastreamer2'"; # Added 2025-09-20
   mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20
   meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03
+  mellowplayer = throw "'mellowplayer' has been removed as it was discontinued upstream in 2021."; # Added 2026-02-10
   melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27
   melonDS = warnAlias "'melonDS' has been renamed to 'melonds'" melonds; # Added 2026-02-08
   meshlab-unstable = throw "meshlab-unstable has been removed, as it was behind meshlab"; # Added 2025-09-21
@@ -1358,6 +1381,7 @@ mapAliases {
   migra = throw "migra has been removed because it has transitively been marked as broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11
   mihomo-party = throw "'mihomo-party' has been removed due to upstream license violation"; # Added 2025-08-20
   mime-types = throw "'mime-types' has been renamed to/replaced by 'mailcap'"; # Converted to throw 2025-10-27
+  mindforger = throw "'mindforger' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-15
   minecraft = throw "'minecraft' has been removed because the package was broken. Consider using 'prismlauncher' instead"; # Added 2025-09-06
   minetest = throw "'minetest' has been renamed to/replaced by 'luanti'"; # Converted to throw 2025-10-27
   minetest-touch = throw "'minetest-touch' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
@@ -1368,6 +1392,8 @@ mapAliases {
   minizincide = warnAlias "'minizincide' has been renamed to 'minizinc-ide'" minizinc-ide; # Added 2026-01-03
   minizip2 = throw "'minizip2' has been renamed to/replaced by 'minizip-ng'"; # Converted to throw 2025-10-27
   miru = throw "'miru' has been removed due to lack maintenance"; # Added 2025-08-21
+  mkYarnModules = throw "'yarn2nix' and its tooling has been removed as it was unusable within nodePackages. Use the standard yarn v1 hooks available in nixpkgs instead."; # Added 2026-04-25
+  mkYarnPackage = throw "'yarn2nix' and its tooling has been removed as it was unusable within nodePackages. Use the standard yarn v1 hooks available in nixpkgs instead."; # Added 2026-04-25
   mlir_16 = throw "mlir_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   mlir_17 = throw "mlir_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   MMA = mma; # Added 2026-02-08
@@ -1485,10 +1511,12 @@ mapAliases {
     else
       nixfmt;
   nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
+  nixnote2 = throw "'nixnote2' has been removed as upstream has been unmaintained since 2017"; # Added 2026-04-26
   nixos-rebuild = nixos-rebuild-ng; # Added 2025-12-02
   nixosTest = throw "'nixosTest' has been renamed to/replaced by 'testers.nixosTest'"; # Converted to throw 2025-10-27
   nixStable = throw "'nixStable' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2025-10-27
   nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30
+  nmapsi4 = throw "'nmapsi4' has been removed as it depended on qt5 webengine, which is EOL"; # Added 2026-04-25
   node2nix = throw "node2nix has been removed because it was only used to maintain the now-removed nodePackages set. Use the newer builders in nixpkgs instead, such as buildNpmPackage"; # Added 2026-03-03
   nodePackages = throw "nodePackages has been removed. Many packages are now available at the top level (e.g. `pkgs.package-name`). Check on https://search.nixos.org to see if the package is still available."; # Added 2026-03-03
   nodePackages_latest = throw "nodePackages has been removed. Many packages are now available at the top level (e.g. `pkgs.package-name`). Check on https://search.nixos.org to see if the package is still available."; # Added 2026-03-03
@@ -1496,6 +1524,7 @@ mapAliases {
   nomacs-qt6 = nomacs; # Added 2025-08-30
   norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
   notary = throw "'notary' has been removed due to being archived upstream. Consider using 'notation' instead."; # Added 2025-11-13
+  notepadqq = throw "'notepadqq' has been removed due to upstream stopping maintenance in 2023."; # Added 2026-02-10
   notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
   notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
   noto-fonts-emoji = throw "'noto-fonts-emoji' has been renamed to/replaced by 'noto-fonts-color-emoji'"; # Converted to throw 2025-10-27
@@ -1541,6 +1570,7 @@ mapAliases {
   openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openjfx23 = throw "OpenJFX 23 was removed as it has reached its end of life"; # Added 2025-11-04
   openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04
+  openmodelica = throw "'openmodelica' has been removed as it was unmaintained in nixpkgs and depends on insecure&unmtaintained qtwebkit"; # Added 2026-04-26
   openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30
   openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27
   opensycl = throw "'opensycl' has been renamed to/replaced by 'adaptivecpp'"; # Converted to throw 2025-10-27
@@ -1585,6 +1615,7 @@ mapAliases {
   peach = throw "'peach' has been renamed to/replaced by 'asouldocs'"; # Converted to throw 2025-10-27
   pell = throw "'pell' has been removed as it is unused and unmaintained upstream"; # Added 2025-12-18
   pentablet-driver = throw "'pentablet-driver' has been renamed to/replaced by 'xp-pen-g430-driver'"; # Converted to throw 2025-10-27
+  pentobi = throw "'pentobi' has been removed as it was unmaintained in nixpkgs and still depended on qt5 webengine"; # Added 2026-04-25
   perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   percona-server_8_0 = throw "'percona-server_8_0' reaches end of life on 2026-04-30 and has been removed. Use 'percona-server_8_4'"; # Added 2026-04-09
   percona-server_innovation = throw "'percona-server_innovation' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27
@@ -1688,6 +1719,7 @@ mapAliases {
   protonvpn-gui = warnAlias "'protonvpn-gui' has been renamed to/replaced by 'proton-vpn'" proton-vpn; # Added 2026-02-23
   proxmark3-rrg = throw "'proxmark3-rrg' has been renamed to/replaced by 'proxmark3'"; # Converted to throw 2025-10-27
   pscid = throw "'pscid' has been removed because it was unmaintained upstream"; # Added 2025-12-12
+  psi = throw "'psi' has been removed as it depended on EOL qt5 webengine. Consider moving to psi-plus, a somewhat more maintained fork."; # Added 2026-04-15
   pulp = throw "'pulp' has been removed because it was unmaintained upstream"; # Added 2025-12-12
   purescript-psa = throw "'purescript-psa' has been removed because it was unmaintained within nixpkgs"; # Added 2025-12-12
   purple-discord = throw "'purple-discord' has been renamed to/replaced by 'pidginPackages.purple-discord'"; # Converted to throw 2025-10-27
@@ -1733,12 +1765,14 @@ mapAliases {
   qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01
   qtile-unwrapped = throw "'qtile-unwrapped' has been renamed to/replaced by 'python3.pkgs.qtile'"; # Converted to throw 2025-10-27
+  QuadProgpp = warnAlias "'QuadProgpp' has been renamed to 'quadprogpp'" quadprogpp; # Added 2026-02-12
   quantum-espresso-mpi = throw "'quantum-espresso-mpi' has been renamed to/replaced by 'quantum-espresso'"; # Converted to throw 2025-10-27
   quaternion-qt5 = throw "'quaternion-qt5' has been removed as quaternion dropped Qt5 support with v0.0.97.1"; # Added 2025-05-24
   quaternion-qt6 = warnAlias "'quaternion-qt6 has been renamed to quaternion" quaternion; # Added 2025-12-31
   qubes-core-vchan-xen = throw "'qubes-core-vchan-xen' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18
   quictls = throw "'quictls' has been removed. QUIC support is now available in `openssl`.";
+  quiterss = throw "'quiterss' has been removed as upstream has been unmaintained since March 2022"; # Added 2026-04-26
   quorum = throw "'quorum' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-07
   qutebrowser-qt5 = lib.warnOnInstantiate "'qutebrowser-qt5' has been removed as it depended on vulnerable and outdated qt5 webengine" qutebrowser; # Added 2026-01-14
   qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
@@ -1769,6 +1803,7 @@ mapAliases {
   rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
   rke2_1_30 = throw "'rke2_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-11-04
   rke2_1_31 = throw "'rke2_1_31' has been removed from nixpkgs as it has reached end of life"; # Added 2025-12-08
+  rke2_1_32 = throw "'rke2_1_32' has been removed from nixpkgs as it has reached end of life"; # Added 2026-04-04
   rl_json = throw "'rl_json' has been renamed to/replaced by 'tclPackages.rl_json'"; # Converted to throw 2025-10-27
   rockbox_utility = throw "'rockbox_utility' has been renamed to/replaced by 'rockbox-utility'"; # Converted to throw 2025-10-27
   rockcraft = throw "rockcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18
@@ -1809,6 +1844,7 @@ mapAliases {
   SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
+  semantik = throw "'semantik' has been removed as it depended on EOL qt5 webengine"; # Added 2026-04-17
   semiphemeral = throw "'semiphemeral' has been removed as it is archived upstream"; # Added 2025-11-06
   sequoia = throw "'sequoia' has been renamed to/replaced by 'sequoia-sq'"; # Converted to throw 2025-10-27
   sequoia-sqop = sequoia-sop; # Added 2026-01-23
@@ -1821,6 +1857,7 @@ mapAliases {
   shades-of-gray-theme = throw "'shades-of-gray-theme' has been removed because upstream is a 404"; # Added 2025-12-20
   shared_desktop_ontologies = throw "'shared_desktop_ontologies' has been removed as it had been abandoned upstream"; # Added 2025-11-09
   shipyard = throw "'shipyard' has been renamed to/replaced by 'jumppad'"; # Converted to throw 2025-10-27
+  shisho = throw "'shisho' has been removed, as it is archived upstream. Consider using 'semgrep', 'opengrep', or 'ast-grep' instead"; # Added 2026-04-28
   sic-image-cli = warnAlias "'sic-image-cli' has been renamed to 'imagineer'" imagineer; # Added 2026-03-29
   siduck76-st = throw "'siduck76-st' has been renamed to/replaced by 'st-snazzy'"; # Converted to throw 2025-10-27
   sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
@@ -1843,6 +1880,7 @@ mapAliases {
   slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11
   slurm-llnl = throw "'slurm-llnl' has been renamed to/replaced by 'slurm'"; # Converted to throw 2025-10-27
   smartgithg = throw "'smartgithg' has been renamed to/replaced by 'smartgit'"; # Converted to throw 2025-10-27
+  smtube = throw "'smtube' has been removed as it depends on insecure&unmaintained qtwebkit"; # Added 2026-04-26
   snapcraft = throw "snapcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18
   snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
   snowman = throw "snowman has been removed as it is unmaintained by upstream"; # 2025-10-12
@@ -1930,6 +1968,7 @@ mapAliases {
   swiPrologWithGui = throw "'swiPrologWithGui' has been renamed to/replaced by 'swi-prolog-gui'"; # Converted to throw 2025-10-27
   swww = warnAlias "'swww' has been renamed to 'awww'" awww; # Added 2026-03-22
   Sylk = throw "'Sylk' has been renamed to/replaced by 'sylk'"; # Converted to throw 2025-10-27
+  sylpheed = throw "'sylpheed' has been removed because it is broken and unmaintained, please use 'claws-mail' instead"; # Added 2026-04-22
   symbiyosys = throw "'symbiyosys' has been renamed to/replaced by 'sby'"; # Converted to throw 2025-10-27
   syn2mas = throw "'syn2mas' has been removed. It has been integrated into the main matrix-authentication-service CLI as a subcommand: 'mas-cli syn2mas'."; # Added 2025-07-07
   synapse-admin-etkecc = warnAlias "'synapse-admin-etkecc' has been renamed to 'ketesa'" ketesa; # Added 2026-04-03
@@ -1966,6 +2005,7 @@ mapAliases {
   tdfgo = throw "'tdfgo' has been removed because it was removed from upstream"; # Added 2025-12-18
   tdlib-purple = throw "'tdlib-purple' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
   tdom = throw "'tdom' has been renamed to/replaced by 'tclPackages.tdom'"; # Converted to throw 2025-10-27
+  teamspeak3 = throw "'teamspeak3' has been removed as it depended on qt5 webengine which is EOL"; # Added 2026-04-25
   teamspeak5_client = throw "'teamspeak5_client' has been renamed to/replaced by 'teamspeak6-client'"; # Converted to throw 2025-10-27
   teamspeak_client = throw "'teamspeak_client' has been renamed to/replaced by 'teamspeak3'"; # Converted to throw 2025-10-27
   tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10
@@ -2041,14 +2081,17 @@ mapAliases {
   unixODBCDrivers = warnAlias "'unixODBCDrivers' has been renamed to 'unixodbcDrivers'" unixodbcDrivers; # Added 2026-02-12
   unrar_6 = throw "'unrar_6' has been renamed to/replaced by 'unrar'"; # Added 2026-03-11
   unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
+  ustream-ssl-wolfssl = throw "'ustream-ssl-wolfssl' has been removed, use 'ustream-ssl' or 'ustream-ssl-mbedtls'"; # Added 2026-03-29
   usync = throw "'usync' has been removed as it is unused and unmaintained upstream"; # Added 2025-12-18
   util-linuxCurses = throw "'util-linuxCurses' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27
   utillinux = warnAlias "'utillinux' has been renamed to/replaced by 'util-linux'" util-linux; # Converted to warning 2025-10-28
   utilmacros = util-macros; # Added 2025-02-04
   vaapiIntel = throw "'vaapiIntel' has been renamed to/replaced by 'intel-vaapi-driver'"; # Converted to throw 2025-10-27
   vaapiVdpau = throw "'vaapiVdpau' has been renamed to/replaced by 'libva-vdpau-driver'"; # Converted to throw 2025-10-27
+  vacuum = throw "'vacuum' has been removed as upstream Vacuum-IM has been unmaintained since December 2021"; # Added 2026-04-26
   valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   vamp.vampSDK = throw "'vamp.vampSDK' has been renamed to/replaced by 'vamp-plugin-sdk'"; # Converted to throw 2025-10-27
+  vapoursynth-nnedi3 = throw "'vapoursynth-nnedi3' has been removed per upstream. Use vapoursynth-znedi3 instead."; # Added 2026-04-20
   vaultwarden-vault = throw "'vaultwarden-vault' has been renamed to/replaced by 'vaultwarden.webvault'"; # Converted to throw 2025-10-27
   vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
   vboot_reference = vboot-utils; # Added 2025-11-01
@@ -2090,6 +2133,7 @@ mapAliases {
   warmux = throw "'warmux' has been removed as it is unmaintained and broken"; # Added 2025-11-03
   warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
+  wasistlos = throw "'wasistlos' has been removed because it was unmaintained and archived upstream. Consider using 'karere' instead"; # Added 2026-04-13
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_117;
   wasm-strip = throw "'wasm-strip' has been removed due to upstream deprecation. Use 'wabt' instead."; # Added 2025-11-06
   wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24
@@ -2103,7 +2147,7 @@ mapAliases {
   webmacs = throw "webmacs has been removed as it was unmaintained upstream"; # Added 2026-02-03
   welkin = throw "welkin was removed as it is unmaintained upstream"; # Added 2026-01-01
   whalebird = throw "'whalebird' has been removed because it was using an EOL electron version"; # Added 2026-03-20
-  whatsapp-for-linux = throw "'whatsapp-for-linux' has been renamed to/replaced by 'wasistlos'"; # Converted to throw 2025-10-27
+  whatsapp-for-linux = throw "'whatsapp-for-linux' has been removed because it was unmaintained and archived upstream. Consider using 'karere' instead"; # Converted to throw 2025-10-27
   wifi-password = throw "'wifi-password' has been removed as it was unmaintained upstream"; # Added 2025-08-29
   win-pvdrivers = throw "'win-pvdrivers' has been removed as it was subject to the Xen build machine compromise (XSN-01) and has open security vulnerabilities (XSA-468)"; # Added 2025-08-29
   win-virtio = throw "'win-virtio' has been renamed to/replaced by 'virtio-win'"; # Converted to throw 2025-10-27
@@ -2120,6 +2164,7 @@ mapAliases {
   wlroots_0_17 = throw "'wlroots_0_17' has been removed in favor of newer versions"; # Added 2026-03-07
   wlx-overlay-s = throw "'wlx-overlay-s' and 'wayvr-dashboard' have been merged into a single application. Please switch to 'wayvr'"; # Added 2026-01-09
   wmii_hg = throw "'wmii_hg' has been renamed to/replaced by 'wmii'"; # Converted to throw 2025-10-27
+  wolfssl = throw "'wolfssl' has been removed because it has an unclear licensing situation and no remaining users in Nixpkgs"; # Added 2026-04-03
   woof = throw "'woof' has been removed as it is broken and unmaintained upstream"; # Added 2025-09-04
   worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   wpa_supplicant_ro_ssids = throw "'wpa_supplicant_ro_ssids' has been renamed to/replaced by 'wpa_supplicant'"; # Converted to throw 2025-10-27
@@ -2483,12 +2528,16 @@ mapAliases {
   xtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13
   xulrunner = throw "'xulrunner' has been renamed to/replaced by 'firefox-unwrapped'"; # Converted to throw 2025-10-27
   xxgdb = throw "'xxgdb' seems inactive and doesn't compile with glibc 2.42"; # Added 2025-09-28
+  xxHash = warnAlias "'xxHash' has been renamed to 'xxhash'" xxhash; # Added 2026-02-12
   yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
   yabar-unstable = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
+  yacas-gui = throw "'yacas-gui' has been removed, as it depended on qt5 webengine. Upstream is considering deprecation of the gui entirely, see https://github.com/grzegorzmazur/yacas/issues/361."; # Added 2026-02-11
   yafaray-core = throw "'yafaray-core' has been renamed to/replaced by 'libyafaray'"; # Converted to throw 2025-10-27
   yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
   yamlpath = throw "'yamlpath' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   yarGen = warnAlias "'yarGen' has been renamed to 'yargen'" yargen; # Added 2026-02-12
+  yarn2nix = throw "'yarn2nix' and its tooling has been removed as it was unusable within nodePackages. Use the standard yarn v1 hooks available in nixpkgs instead."; # Added 2026-04-25
+  yarn2nix-moretea = throw "'yarn2nix' and its tooling has been removed as it was unusable within nodePackages. Use the standard yarn v1 hooks available in nixpkgs instead."; # Added 2026-04-25
   yeahwm = throw "'yeahwm' has been removed, as it was broken and unmaintained upstream."; # Added 2025-06-12
   yosys-synlig = throw "yosys-synlig has been removed because it is unmaintained upstream and incompatible with current Yosys versions."; # Added 2026-01-06
   youtube-music = lib.warnOnInstantiate "'youtube-music' has been renamed to 'pear-desktop'" pear-desktop; # Added 2025-12-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f70b152c560..ee06ca3ffbb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1658,6 +1658,8 @@ with pkgs;
 
   intel-oneapi = recurseIntoAttrs (callPackage ../development/libraries/intel-oneapi { });
 
+  intelLlvmStdenv = intel-llvm.stdenv;
+
   cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };
 
   cplex = callPackage ../applications/science/math/cplex (config.cplex or { });
@@ -1814,8 +1816,6 @@ with pkgs;
 
   klipper-genconf = callPackage ../servers/klipper/klipper-genconf.nix { };
 
-  klog = qt5.callPackage ../applications/radio/klog { };
-
   lexicon = with python3Packages; toPythonApplication dns-lexicon;
 
   lgogdownloader-gui = callPackage ../by-name/lg/lgogdownloader/package.nix { enableGui = true; };
@@ -2130,7 +2130,7 @@ with pkgs;
 
   cudaPackages_12 = cudaPackages_12_9;
 
-  cudaPackages_13 = cudaPackages_13_0;
+  cudaPackages_13 = cudaPackages_13_2;
 
   cudaPackages = recurseIntoAttrs cudaPackages_12;
 
@@ -2258,30 +2258,10 @@ with pkgs;
 
   chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { };
 
-  fcitx5 = callPackage ../tools/inputmethods/fcitx5 { };
-
-  fcitx5-bamboo = callPackage ../tools/inputmethods/fcitx5/fcitx5-bamboo.nix { };
-
   fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { };
 
-  fcitx5-anthy = callPackage ../tools/inputmethods/fcitx5/fcitx5-anthy.nix { };
-
-  fcitx5-chewing = callPackage ../tools/inputmethods/fcitx5/fcitx5-chewing.nix { };
-
   fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; };
 
-  fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { };
-
-  fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { };
-
-  fcitx5-hangul = callPackage ../tools/inputmethods/fcitx5/fcitx5-hangul.nix { };
-
-  fcitx5-rime = callPackage ../tools/inputmethods/fcitx5/fcitx5-rime.nix { };
-
-  fcitx5-table-extra = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-extra.nix { };
-
-  fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { };
-
   flannel = callPackage ../tools/networking/flannel { };
   cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix { };
 
@@ -2393,8 +2373,6 @@ with pkgs;
 
   gnused = callPackage ../tools/text/gnused { };
 
-  gnutar = callPackage ../tools/archivers/gnutar { };
-
   inherit (callPackage ../development/tools/godot { })
     godot3
     godot3-export-templates
@@ -2473,32 +2451,6 @@ with pkgs;
     withXorg = false;
   };
 
-  grub2 = callPackage ../tools/misc/grub/default.nix { };
-
-  grub2_efi = grub2.override {
-    efiSupport = true;
-  };
-
-  grub2_ieee1275 = grub2.override {
-    ieee1275Support = true;
-  };
-
-  grub2_light = grub2.override {
-    zfsSupport = false;
-  };
-
-  grub2_xen = grub2.override {
-    xenSupport = true;
-  };
-
-  grub2_xen_pvh = grub2.override {
-    xenPvhSupport = true;
-  };
-
-  grub2_pvgrub_image = grub2_pvhgrub_image.override {
-    grubPlatform = "xen";
-  };
-
   gruut = with python3.pkgs; toPythonApplication gruut;
 
   gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa;
@@ -2751,8 +2703,6 @@ with pkgs;
       ;
   };
 
-  nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
-
   nodejs = nodejs_24;
   nodejs-slim = nodejs-slim_24;
 
@@ -2846,8 +2796,6 @@ with pkgs;
     eri3PureSh = false;
   };
 
-  libirc = libsForQt5.callPackage ../development/libraries/libirc { };
-
   libportal-gtk3 = libportal.override { variant = "gtk3"; };
   libportal-gtk4 = libportal.override { variant = "gtk4"; };
   libportal-qt5 = libportal.override { variant = "qt5"; };
@@ -2859,18 +2807,6 @@ with pkgs;
 
   licensee = callPackage ../tools/package-management/licensee { };
 
-  inherit
-    ({
-      limesuite = callPackage ../applications/radio/limesuite {
-      };
-      limesuiteWithGui = limesuite.override {
-        withGui = true;
-      };
-    })
-    limesuite
-    limesuiteWithGui
-    ;
-
   linux-gpib = callPackage ../applications/science/electronics/linux-gpib/user.nix { };
 
   liquidctl = with python3Packages; toPythonApplication liquidctl;
@@ -3233,7 +3169,6 @@ with pkgs;
   rtaudio = rtaudio_5;
 
   mpi = openmpi; # this attribute should used to build MPI applications
-  openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica { });
 
   qarte = libsForQt5.callPackage ../applications/video/qarte { };
 
@@ -3448,8 +3383,6 @@ with pkgs;
 
   ttp = with python3.pkgs; toPythonApplication ttp;
 
-  trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
-
   translatelocally-models = recurseIntoAttrs (callPackages ../misc/translatelocally-models { });
 
   translatepy = with python3.pkgs; toPythonApplication translatepy;
@@ -3473,8 +3406,6 @@ with pkgs;
 
   usort = with python3Packages; toPythonApplication usort;
 
-  vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum { };
-
   vimpager = callPackage ../tools/misc/vimpager { };
   vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { };
 
@@ -3493,10 +3424,6 @@ with pkgs;
 
   inherit (openconnectPackages) openconnect openconnect_openssl;
 
-  globalprotect-openconnect =
-    libsForQt5.callPackage ../tools/networking/globalprotect-openconnect
-      { };
-
   buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { };
 
   woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { };
@@ -3547,6 +3474,12 @@ with pkgs;
   varnishPackages = varnish80Packages;
   varnish = varnishPackages.varnish;
 
+  inherit (callPackages ../servers/vinyl-cache { })
+    vinyl-cache_9
+    ;
+
+  vinyl-cache = vinyl-cache_9;
+
   vncdo = with python3Packages; toPythonApplication vncdo;
 
   # An alias to work around the splicing incidents
@@ -3585,15 +3518,6 @@ with pkgs;
     yarn-berry = yarn-berry_3;
   };
 
-  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { };
-
-  inherit (yarn2nix-moretea)
-    yarn2nix
-    mkYarnPackage
-    mkYarnModules
-    fixup_yarn_lock
-    ;
-
   yamllint = with python3Packages; toPythonApplication yamllint;
 
   # To expose more packages for Yi, override the extraPackages arg.
@@ -3763,14 +3687,13 @@ with pkgs;
   flutterPackages-source = recurseIntoAttrs (
     callPackage ../development/compilers/flutter { useNixpkgsEngine = true; }
   );
-  flutterPackages =
-    if stdenv.hostPlatform.isLinux then flutterPackages-source else flutterPackages-bin;
+  flutterPackages = flutterPackages-bin;
   flutter = flutterPackages.stable;
   flutter341 = flutterPackages.v3_41;
-  flutter338 = flutterPackages-bin.v3_38;
-  flutter335 = flutterPackages-bin.v3_35;
-  flutter332 = flutterPackages-bin.v3_32;
-  flutter329 = flutterPackages-bin.v3_29;
+  flutter338 = flutterPackages.v3_38;
+  flutter335 = flutterPackages.v3_35;
+  flutter332 = flutterPackages.v3_32;
+  flutter329 = flutterPackages.v3_29;
 
   fpc = callPackage ../development/compilers/fpc { };
 
@@ -4344,8 +4267,6 @@ with pkgs;
   graalvmPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm { });
   buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image { };
 
-  openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };
-
   inherit (callPackage ../development/compilers/julia { })
     julia_110-bin
     julia_111-bin
@@ -4685,10 +4606,6 @@ with pkgs;
     stdenv = gcc14Stdenv;
   };
 
-  urweb = callPackage ../development/compilers/urweb {
-    icu = icu67;
-  };
-
   vcard = python3Packages.toPythonApplication python3Packages.vcard;
 
   inherit (callPackage ../development/compilers/vala { })
@@ -5251,8 +5168,21 @@ with pkgs;
   tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
   tcl-9_0 = callPackage ../development/interpreters/tcl/9.0.nix { };
 
-  # We don't need versioned package sets thanks to the tcl stubs mechanism
-  tclPackages = recurseIntoAttrs (callPackage ./tcl-packages.nix { });
+  tclPackages = dontRecurseIntoAttrs tcl8Packages;
+  # We don't need minor-versioned package sets thanks to the tcl stubs mechanism.
+  # Major versions have bigger incompatibilities and need package sets.
+  tcl8Packages = recurseIntoAttrs (
+    callPackage ./tcl-packages.nix {
+      tcl = tcl-8_6;
+      tk = tk-8_6;
+    }
+  );
+  tcl9Packages = recurseIntoAttrs (
+    callPackage ./tcl-packages.nix {
+      tcl = tcl-9_0;
+      tk = tk-9_0;
+    }
+  );
 
   tclreadline = tclPackages.tclreadline;
 
@@ -5931,8 +5861,6 @@ with pkgs;
 
   seer = libsForQt5.callPackage ../development/tools/misc/seer { };
 
-  semantik = libsForQt5.callPackage ../applications/office/semantik { };
-
   sbt = callPackage ../development/tools/build-managers/sbt { };
   sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
   simpleBuildTool = sbt;
@@ -5989,8 +5917,6 @@ with pkgs;
 
   tflint-plugins = recurseIntoAttrs (callPackage ../development/tools/analysis/tflint-plugins { });
 
-  tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) { };
-
   tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars;
 
   uhdMinimal = uhd.override {
@@ -6147,11 +6073,6 @@ with pkgs;
 
   ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; };
 
-  ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl {
-    ssl_implementation = wolfssl;
-    additional_buildInputs = [ openssl ];
-  };
-
   ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl {
     ssl_implementation = mbedtls_2;
   };
@@ -6574,6 +6495,8 @@ with pkgs;
     '';
   });
 
+  itgmaniaPackages = recurseIntoAttrs (callPackage ../by-name/it/itgmania/packages.nix { });
+
   itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix {
     enableRtk = false;
   };
@@ -6763,11 +6686,6 @@ with pkgs;
 
   libubox = callPackage ../development/libraries/libubox { with_ustream_ssl = true; };
 
-  libubox-wolfssl = callPackage ../development/libraries/libubox {
-    with_ustream_ssl = true;
-    ustream-ssl = ustream-ssl-wolfssl;
-  };
-
   libubox-mbedtls = callPackage ../development/libraries/libubox {
     with_ustream_ssl = true;
     ustream-ssl = ustream-ssl-mbedtls;
@@ -7339,8 +7257,6 @@ with pkgs;
   SDL = SDL_compat;
   SDL2 = sdl2-compat;
 
-  sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { };
-
   sev-snp-measure = with python3Packages; toPythonApplication sev-snp-measure;
 
   graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix { };
@@ -7385,24 +7301,6 @@ with pkgs;
     scheme = guile;
   };
 
-  soapysdr = callPackage ../applications/radio/soapysdr { };
-
-  soapysdr-with-plugins = callPackage ../applications/radio/soapysdr {
-    extraPackages = [
-      limesuite
-      soapyairspy
-      soapyaudio
-      soapybladerf
-      soapyhackrf
-      soapyplutosdr
-      soapyremote
-      soapyrtlsdr
-    ]
-    ++ (lib.optionals stdenv.hostPlatform.isLinux [
-      soapyuhd
-    ]);
-  };
-
   spandsp = callPackage ../development/libraries/spandsp { };
   spandsp3 = callPackage ../development/libraries/spandsp/3.nix { };
 
@@ -7433,8 +7331,6 @@ with pkgs;
 
   inherit (python3Packages) sphinxHook;
 
-  suwidgets = libsForQt5.callPackage ../applications/radio/suwidgets { };
-
   sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
 
   unqlite = lowPrio (callPackage ../development/libraries/unqlite { });
@@ -7763,15 +7659,6 @@ with pkgs;
     ];
   };
 
-  sbcl_2_6_0 = wrapLisp {
-    pkg = callPackage ../development/compilers/sbcl { version = "2.6.0"; };
-
-    faslExt = "fasl";
-    flags = [
-      "--dynamic-space-size"
-      "3000"
-    ];
-  };
   sbcl_2_6_1 = wrapLisp {
     pkg = callPackage ../development/compilers/sbcl { version = "2.6.1"; };
     faslExt = "fasl";
@@ -7780,7 +7667,16 @@ with pkgs;
       "3000"
     ];
   };
-  sbcl = sbcl_2_6_1;
+  sbcl_2_6_3 = wrapLisp {
+    pkg = callPackage ../development/compilers/sbcl { version = "2.6.3"; };
+
+    faslExt = "fasl";
+    flags = [
+      "--dynamic-space-size"
+      "3000"
+    ];
+  };
+  sbcl = sbcl_2_6_3;
 
   sbclPackages = recurseIntoAttrs sbcl.pkgs;
 
@@ -8005,6 +7901,7 @@ with pkgs;
   dovecot_pigeonhole_2_4 = dovecot_pigeonhole;
 
   inherit (callPackages ../servers/firebird { })
+    firebird_5
     firebird_4
     firebird_3
     firebird
@@ -8071,9 +7968,6 @@ with pkgs;
 
   inherit
     ({
-      kanidm_1_7 = callPackage ../servers/kanidm/1_7.nix {
-        kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_7;
-      };
       kanidm_1_8 = callPackage ../servers/kanidm/1_8.nix {
         kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_8;
       };
@@ -8081,14 +7975,11 @@ with pkgs;
         kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_9;
       };
 
-      kanidmWithSecretProvisioning_1_7 = kanidm_1_7.override { enableSecretProvisioning = true; };
       kanidmWithSecretProvisioning_1_8 = kanidm_1_8.override { enableSecretProvisioning = true; };
       kanidmWithSecretProvisioning_1_9 = kanidm_1_9.override { enableSecretProvisioning = true; };
     })
-    kanidm_1_7
     kanidm_1_8
     kanidm_1_9
-    kanidmWithSecretProvisioning_1_7
     kanidmWithSecretProvisioning_1_8
     kanidmWithSecretProvisioning_1_9
     ;
@@ -8146,6 +8037,7 @@ with pkgs;
   nginx = nginxStable;
 
   nginxStable = callPackage ../servers/http/nginx/stable.nix {
+    openssl = openssl_4_0;
     zlib-ng = zlib-ng.override { withZlibCompat = true; };
     withPerl = false;
     # We don't use `with` statement here on purpose!
@@ -8500,8 +8392,6 @@ with pkgs;
   iputils = hiPrio (callPackage ../os-specific/linux/iputils { });
   # hiPrio for collisions with inetutils (ping)
 
-  iptables = callPackage ../os-specific/linux/iptables { };
-  iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; };
   iptables-nftables-compat = iptables;
 
   jool-cli = callPackage ../os-specific/linux/jool/cli.nix { };
@@ -8716,11 +8606,6 @@ with pkgs;
     protobuf = protobuf_33;
   };
 
-  sinit = callPackage ../os-specific/linux/sinit {
-    rcinit = "/etc/rc.d/rc.init";
-    rcshutdown = "/etc/rc.d/rc.shutdown";
-  };
-
   sysdig = callPackage ../os-specific/linux/sysdig {
     kernel = null;
   }; # sysdig is a client, for a driver look at linuxPackagesFor
@@ -9189,8 +9074,6 @@ with pkgs;
     confd-calico
     ;
 
-  cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
-
   cbconvert-gui = cbconvert.gui;
 
   cdparanoia = cdparanoia-iii;
@@ -9199,8 +9082,6 @@ with pkgs;
 
   chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or { });
 
-  clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { };
-
   cni = callPackage ../applications/networking/cluster/cni { };
   cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix { };
 
@@ -9337,10 +9218,6 @@ with pkgs;
 
   firewalld-gui = firewalld.override { withGui = true; };
 
-  fldigi = callPackage ../applications/radio/fldigi {
-    hamlib = hamlib_4;
-  };
-
   fossil = callPackage ../applications/version-management/fossil {
     sqlite = sqlite.override { enableDeserialize = true; };
   };
@@ -9365,8 +9242,6 @@ with pkgs;
   };
   gnuradioPackages = recurseIntoAttrs gnuradio.pkgs;
 
-  goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
-
   inherit (ocamlPackages) google-drive-ocamlfuse;
 
   gqrx-portaudio = gqrx.override {
@@ -9519,13 +9394,23 @@ with pkgs;
     )
     // {
       jdk-no-jcef = callPackage ../development/compilers/jetbrains-jdk {
+        jdk = jdk25;
+        withJcef = false;
+      };
+      jdk-no-jcef-21 = callPackage ../development/compilers/jetbrains-jdk/21.nix {
         jdk = jdk21;
         withJcef = false;
       };
       jdk = callPackage ../development/compilers/jetbrains-jdk {
+        jdk = jdk25;
+      };
+      jdk-21 = callPackage ../development/compilers/jetbrains-jdk/21.nix {
         jdk = jdk21;
       };
       jcef = callPackage ../development/compilers/jetbrains-jdk/jcef.nix {
+        jdk = jdk25;
+      };
+      jcef-21 = callPackage ../development/compilers/jetbrains-jdk/jcef.nix {
         jdk = jdk21;
       };
     }
@@ -9546,8 +9431,6 @@ with pkgs;
 
   minari = python3Packages.toPythonApplication python3Packages.minari;
 
-  mindforger = libsForQt5.callPackage ../applications/editors/mindforger { };
-
   molsketch = libsForQt5.callPackage ../applications/editors/molsketch { };
 
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
@@ -9591,8 +9474,6 @@ with pkgs;
 
   hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack;
 
-  huggle = libsForQt5.callPackage ../applications/misc/huggle { };
-
   hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { };
 
   hyperglot = with python3Packages; toPythonApplication hyperglot;
@@ -9877,16 +9758,6 @@ with pkgs;
     withFonts = true;
   };
 
-  lmms = libsForQt5.callPackage ../applications/audio/lmms {
-    lame = null;
-    libsoundio = null;
-    portaudio = null;
-  };
-
-  luminanceHDR = callPackage ../applications/graphics/luminance-hdr {
-    openexr = openexr_2;
-  };
-
   luddite = with python3Packages; toPythonApplication luddite;
 
   lyx = libsForQt5.callPackage ../applications/misc/lyx { };
@@ -10048,8 +9919,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  smtube = libsForQt5.callPackage ../applications/video/smtube { };
-
   inherit
     ({
       softmaker-office = callPackage ../applications/office/softmaker/softmaker-office.nix { };
@@ -10076,8 +9945,6 @@ with pkgs;
 
   ncdu_1 = callPackage ../by-name/nc/ncdu/1.nix { };
 
-  notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
-
   notmuch = callPackage ../applications/networking/mailreaders/notmuch {
     pythonPackages = python3Packages;
   };
@@ -10165,10 +10032,6 @@ with pkgs;
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
 
-  plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
-
-  pothos = libsForQt5.callPackage ../applications/radio/pothos { };
-
   # perhaps there are better apps for this task? It's how I had configured my previous system.
   # And I don't want to rewrite all rules
   profanity = callPackage ../applications/networking/instant-messengers/profanity (
@@ -10177,10 +10040,6 @@ with pkgs;
     // (config.profanity or { })
   );
 
-  psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
-
-  psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };
-
   pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
 
   puredata-with-plugins =
@@ -10221,8 +10080,6 @@ with pkgs;
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
   qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
 
-  qsstv = qt5.callPackage ../applications/radio/qsstv { };
-
   qsudo = libsForQt5.callPackage ../applications/misc/qsudo { };
 
   qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { };
@@ -10244,8 +10101,6 @@ with pkgs;
     tag = "-daemon-qt5";
   };
 
-  quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { };
-
   quodlibet = callPackage ../applications/audio/quodlibet {
     kakasi = null;
     keybinder3 = null;
@@ -10299,7 +10154,6 @@ with pkgs;
       callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { };
 
   inherit (callPackage ../applications/networking/cluster/rke2 { })
-    rke2_1_32
     rke2_1_33
     rke2_1_34
     rke2_1_35
@@ -10612,12 +10466,19 @@ with pkgs;
         };
       };
     }).overrideAttrs
-      {
+      (old: {
         pname = "vim-darwin";
         meta = {
+          inherit (old.meta)
+            description
+            homepage
+            license
+            mainProgram
+            outputsToInstall
+            ;
           platforms = lib.platforms.darwin;
         };
-      };
+      });
 
   vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
 
@@ -10898,9 +10759,6 @@ with pkgs;
 
   bitcoin = qt6Packages.callPackage ../applications/blockchains/bitcoin {
     withGui = true;
-    sqlite = sqlite.override {
-      zlib = null;
-    };
     zeromq = zeromq.override {
       enableCurve = false;
       enableDrafts = false;
@@ -11298,6 +11156,14 @@ with pkgs;
 
   enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { });
 
+  expidus = recurseIntoAttrs (
+    callPackages ../desktops/expidus {
+      # Use the Nix built Flutter Engine for testing.
+      # Also needed when we eventually package Genesis Shell.
+      flutterPackages = flutterPackages-source;
+    }
+  );
+
   gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { });
 
   gnome = recurseIntoAttrs (callPackage ../desktops/gnome { });
@@ -11423,18 +11289,9 @@ with pkgs;
 
   notus-scanner = with python3Packages; toPythonApplication notus-scanner;
 
-  openblas =
-    callPackage
-      (
-        # FIXME: migrate everything off make.nix on mass rebuild.
-        if stdenv.system == "aarch64-darwin" then
-          ../development/libraries/science/math/openblas
-        else
-          ../development/libraries/science/math/openblas/make.nix
-      )
-      {
-        inherit (llvmPackages) openmp;
-      };
+  openblas = callPackage ../development/libraries/science/math/openblas {
+    inherit (llvmPackages) openmp;
+  };
 
   # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with
   # standard BLAS and LAPACK.
@@ -11667,8 +11524,6 @@ with pkgs;
   simulide_1_1_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.1.0"; };
   simulide_1_2_0 = callPackage ../by-name/si/simulide/package.nix { versionNum = "1.2.0"; };
 
-  eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
-
   degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
 
   geda = callPackage ../applications/science/electronics/geda {
@@ -11739,11 +11594,6 @@ with pkgs;
     lisp-compiler = ecl;
   };
 
-  yacas-gui = yacas.override {
-    enableGui = true;
-    enableJupyter = false;
-  };
-
   ### SCIENCE / MISC
 
   boinc-headless = boinc.override { headless = true; };
@@ -11786,10 +11636,6 @@ with pkgs;
     }
   );
 
-  ### SCIENCE/ROBOTICS
-
-  apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
-
   ### MISC
 
   antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
@@ -12135,7 +11981,15 @@ with pkgs;
 
   vimb = wrapFirefox vimb-unwrapped { };
 
-  vivisect = with python3Packages; toPythonApplication (vivisect.override { withGui = true; });
+  vivisect =
+    with python3Packages;
+    toPythonApplication (
+      vivisect.override {
+        # https://github.com/vivisect/vivisect/issues/683
+        # gui currently requires qt5 webengine, which has been removed
+        # withGui = true;
+      }
+    );
 
   py-wacz = with python3Packages; toPythonApplication wacz;
 
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index fc96145da851..526dd4182702 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -149,7 +149,7 @@ let
     npmRegistryOverrides = mkOption {
       type = types.attrsOf types.str;
       description = ''
-        The default NPM registry overrides for all `fetchNpmDeps` calls, as an attribute set.
+        The default npm registry overrides for all `fetchNpmDeps` calls, as an attribute set.
 
         For each attribute, all files fetched from the host corresponding to the name will instead be fetched from the host (and sub-path) specified in the value.
 
@@ -172,7 +172,7 @@ let
         lib.isAttrs j && lib.all builtins.isString (builtins.attrValues j)
       );
       description = ''
-        A string containing a string with a JSON representation of NPM registry overrides for `fetchNpmDeps`.
+        A string containing a string with a JSON representation of npm registry overrides for `fetchNpmDeps`.
 
         This overrides the [`npmRegistryOverrides`](#opt-npmRegistryOverrides) option, see its documentation for more details.
       '';
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index c9f306685b73..6056c943c7fb 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -108,7 +108,7 @@ let
     in
     mkCudaPackages {
       cublasmp = "0.6.0";
-      cuda = "13.0.2";
+      cuda = "13.0.3";
       cudnn = "9.13.0";
       cudss = "0.6.0";
       cuquantum = "25.09.0";
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index fa9b60790eff..b508524c4d61 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -162,6 +162,8 @@ makeScopeWithSplicing' {
         xcode_26_3_Apple_silicon
         xcode_26_4
         xcode_26_4_Apple_silicon
+        xcode_26_4_1
+        xcode_26_4_1_Apple_silicon
         xcode
         requireXcode
         ;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6deb331822d1..c10b82dbd6b0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -66,7 +66,7 @@ let
     ghc96 = sets.ghc967;
     ghc98 = sets.ghc984;
     ghc910 = sets.ghc9103;
-    ghc912 = sets.ghc9122;
+    ghc912 = sets.ghc9123;
     ghc914 = sets.ghc9141;
 
     microhs_0_15 = sets.microhs_0_15_4_0;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 42151b2f90bf..a2752b27a94a 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -106,14 +106,6 @@ in
           ];
         };
 
-        linux_6_19 = callPackage ../os-specific/linux/kernel/mainline.nix {
-          branch = "6.19";
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-          ];
-        };
-
         linux_7_0 = callPackage ../os-specific/linux/kernel/mainline.nix {
           branch = "7.0";
           kernelPatches = [
@@ -188,6 +180,7 @@ in
         linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream";
         linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream";
         linux_6_17 = throw "linux 6.17 was removed because it has reached its end of life upstream";
+        linux_6_19 = throw "linux 6.19 was removed because it has reached its end of life upstream";
 
         linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
         linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
@@ -684,7 +677,6 @@ in
     linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
     linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
     linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18);
-    linux_6_19 = recurseIntoAttrs (packagesFor kernels.linux_6_19);
     linux_7_0 = recurseIntoAttrs (packagesFor kernels.linux_7_0);
   }
   // lib.optionalAttrs config.allowAliases {
@@ -698,6 +690,7 @@ in
     linux_6_15 = throw "linux 6.15 was removed because it reached its end of life upstream"; # Added 2025-08-23
     linux_6_16 = throw "linux 6.16 was removed because it reached its end of life upstream"; # Added 2025-10-22
     linux_6_17 = throw "linux 6.17 was removed because it reached its end of life upstream"; # Added 2025-12-22
+    linux_6_19 = throw "linux 6.19 was removed because it reached its end of life upstream"; # Added 2026-04-23
   };
 
   rpiPackages = {
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index b8555b679339..91ba3125b977 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -113,6 +113,8 @@ rec {
 
   image-nvim = callPackage ../development/lua-modules/image-nvim { };
 
+  lua-https = callPackage ../development/lua-modules/lua-https { };
+
   lua-pam = callPackage (
     {
       fetchFromGitHub,
@@ -279,8 +281,8 @@ rec {
 
       meta = {
         description = "Modular widget library for the awesome window manager";
-        homepage = "https://vicious.rtfd.io";
-        changelog = "https://vicious.rtfd.io/en/v${version}/changelog.html";
+        homepage = "https://vicious.readthedocs.io";
+        changelog = "https://vicious.readthedocs.io/changelog.html";
         license = lib.licenses.gpl2Plus;
         maintainers = with lib.maintainers; [
           makefu
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 15f61c9736e0..4c129821501e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -70,6 +70,10 @@ let
 
         atd = callPackage ../development/ocaml-modules/atd { };
 
+        atd-jsonlike = callPackage ../development/ocaml-modules/atd/jsonlike.nix { };
+
+        atd-yamlx = callPackage ../development/ocaml-modules/atd/yamlx.nix { };
+
         atdgen = callPackage ../development/ocaml-modules/atdgen { };
 
         atdgen-codec-runtime = callPackage ../development/ocaml-modules/atdgen/codec-runtime.nix { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3eb935d80ab2..7a721c264822 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1337,10 +1337,10 @@ with self;
 
   Apppapersway = buildPerlPackage rec {
     pname = "App-papersway";
-    version = "2.001";
+    version = "3.000";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SP/SPWHITTON/App-papersway-${version}.tar.gz";
-      hash = "sha256-Jx8MJdyr/tfumMhuCofQX0r3vWcVuDzfJGpCjq2+Odw=";
+      hash = "sha256-60H7zCtVbBfYOqVKw9X1EjOM7mzjSuPj5IwcDWhC+dE=";
     };
     buildInputs = [
       AnyEvent
@@ -7933,10 +7933,10 @@ with self;
 
   CryptX = buildPerlPackage {
     pname = "CryptX";
-    version = "0.087";
+    version = "0.088";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.087.tar.gz";
-      hash = "sha256-gHDsKVFg1I83bY/xssvwvxUtqfIDOTk4LwDxP3SM030=";
+      url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.088.tar.gz";
+      hash = "sha256-kUn4t0JjRWbpgbmUn7fZs/Qa7zbvBOziG1HPNRU8SUA=";
     };
     meta = {
       description = "Cryptographic toolkit";
@@ -14831,10 +14831,10 @@ with self;
 
   GitAutofixup = buildPerlPackage {
     pname = "App-Git-Autofixup";
-    version = "0.004007";
+    version = "0.005000";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.004007.tar.gz";
-      hash = "sha256-2pe/dnKAlbO27nHaGfC/GUMBsvRd9HietU23Tt0hCjs=";
+      url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.005.tar.gz";
+      hash = "sha256-4mPAOzbD+mDZ7co5xyMyA2x1u6645pYw4Q4yHRqYUTM=";
     };
     meta = {
       description = "Create fixup commits for topic branches";
@@ -28193,10 +28193,10 @@ with self;
 
   Plack = buildPerlPackage {
     pname = "Plack";
-    version = "1.0050";
+    version = "1.0053";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0050.tar.gz";
-      hash = "sha256-0mUa3oLrv/er4KOhifyTLa3Ed5GGzolGjlbQGJ6qbtQ=";
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0053.tar.gz";
+      hash = "sha256-QPxEA0wWTpr3DdCP++5AjCQwLsDbMQ0pAd9xdTuxZ9o=";
     };
     buildInputs = [
       AuthenSimplePasswd
@@ -28226,6 +28226,7 @@ with self;
       TryTiny
     ];
     patches = [
+      ../development/perl-modules/Plack-xsendfile-disable-by-default-CVE-2026-7381.patch
       ../development/perl-modules/Plack-test-replace-DES-hash-with-bcrypt.patch
     ];
     meta = {
@@ -31355,10 +31356,10 @@ with self;
 
   Starman = buildPerlModule {
     pname = "Starman";
-    version = "0.4017";
+    version = "0.4018";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4017.tar.gz";
-      hash = "sha256-b/q5FfMj9gCJ4+v4Urm5cH1pFyZt+K/XNw+sBL/f7k4=";
+      url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4018.tar.gz";
+      hash = "sha256-bY2yl9hRFB+k/3dI3/BVG+K6j5pELtnKrGRNvMmjbt0=";
     };
     buildInputs = [
       LWP
@@ -35965,10 +35966,10 @@ with self;
 
   TextCSV_XS = buildPerlPackage {
     pname = "Text-CSV_XS";
-    version = "1.52";
+    version = "1.62";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.52.tgz";
-      hash = "sha256-5BWqcFut+Es1ncTA8MmC8b9whIHaoUdW8xNufInA5B0=";
+      url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.62.tgz";
+      hash = "sha256-FxBpPt2u/dVudNpCuqntZ25+rtKOvTA60jyYL+8rFBU=";
     };
     meta = {
       description = "Comma-Separated Values manipulation routines";
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 1a438f6400aa..d5dd6929b4e1 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -417,7 +417,10 @@ lib.makeScope pkgs.newScope (
           #
           # These will be passed as arguments to mkExtension above.
           extensionData = [
-            { name = "bcmath"; }
+            {
+              name = "bcmath";
+              env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+            }
             {
               name = "bz2";
               buildInputs = [ bzip2 ];
@@ -717,7 +720,10 @@ lib.makeScope pkgs.newScope (
             }
             { name = "sysvmsg"; }
             { name = "sysvsem"; }
-            { name = "sysvshm"; }
+            {
+              name = "sysvshm";
+              configureFlags = [ "CFLAGS=-std=gnu17" ];
+            }
             {
               name = "tidy";
               configureFlags = [ "--with-tidy=${html-tidy}" ];
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 943a5c69d63a..65758a2d5391 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -191,6 +191,7 @@ mapAliases {
   editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04
   elegy = throw "elegy has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
   email_validator = throw "'email_validator' has been renamed to/replaced by 'email-validator'"; # Converted to throw 2025-10-29
+  emailthreads = throw "'emailthreads' has been removed because the upstream repository was archived in 2024"; # Added 2026-04-09
   embreex = throw "embreex has been removed, as it required embree2"; # added 2025-09-14
   enocean = throw "'enocean' was removed because Home Assistant switched to 'enocean-async'"; # added 2026-03-31
   eris = throw "eris has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
@@ -256,7 +257,9 @@ mapAliases {
   hologram = throw "'hologram' has been removed as it was unmaintained upstream"; # Added 2026-03-22
   homeassistant-bring-api = throw "'homeassistant-bring-api' has been renamed to/replaced by 'bring-api'"; # Converted to throw 2025-10-29
   homepluscontrol = throw "'homepluscontrol' has been removed as it was unmaintained upstream"; # Added 2026-03-22
+  howdoi = throw "'howdoi' has been removed as it was unmaintained upstream"; # Added 2026-04-19
   HTSeq = throw "'HTSeq' has been renamed to/replaced by 'htseq'"; # Converted to throw 2025-10-29
+  idna-ssl = throw "'idna-ssl' has been removed as it was archived upstream"; # Added 2026-04-23
   IMAPClient = throw "'IMAPClient' has been renamed to/replaced by 'imapclient'"; # Converted to throw 2025-10-29
   inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09
   ionhash = throw "ionhash has been removed due to being unmaintained upstream"; # added 2025-07-30
@@ -338,6 +341,7 @@ mapAliases {
   mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29
   modeled = "'modeled' has been removed because it is unmaintained"; # Added 2026-01-19
   monarchmoney = throw "'monarchmoney' has been renamed to/replaced by 'monarchmoneycommunity'"; # Added 2026-03-05
+  monkeytype = throw "'monkeytype' has been removed as it was unmaintained upstream"; # Added 2026-04-19
   moretools = "'moretools' has been removed because it is unmaintained"; # Added 2026-01-19
   mpris-server = throw "mpris-server was removed because it is unused"; # added 2025-10-31
   msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06
@@ -348,6 +352,7 @@ mapAliases {
   ninja-python = throw "'ninja-python' has been renamed to/replaced by 'ninja'"; # Converted to throw 2025-10-29
   nitpick = throw "'nitpick' has been removed because it was unmaintained upstream since 2017 and using python2"; # added 2025-08-25
   nixpkgs = throw "nixpkgs has been removed as its dependency pythonix was removed"; # added 2025-07-24
+  nonbloat-db = throw "nonbloat-db has been removed because the upstream project was archived."; # added 2025-05-16
   Nuitka = throw "'Nuitka' has been renamed to/replaced by 'nuitka'"; # Converted to throw 2025-10-29
   oauth2 = throw "oauth2 has been removed as it is unmaintained"; # added 2025-05-16
   oauth = throw "oauth has been removed as it is unmaintained"; # added 2025-05-16
@@ -358,6 +363,9 @@ mapAliases {
   openai-triton-no-cuda = throw "'openai-triton-no-cuda' has been renamed to/replaced by 'triton-no-cuda'"; # Converted to throw 2025-10-29
   openbabel-bindings = openbabel; # added 2025-09-17
   opsdroid_get_image_size = throw "'opsdroid_get_image_size' has been renamed to/replaced by 'opsdroid-get-image-size'"; # Converted to throw 2025-10-29
+  orange3 = throw "'orange3' has been removed as it was unmaintained and depended on qt5 webengine"; # Added 2026-02-10
+  orange-canvas-core = throw "'orange-canvas-core' has been removed as it was unmaintained and unused outside orange3"; # Added 2026-02-10
+  orange-widgets-base = throw "'orange-widgets-base' has been removed as it was unmaintained and depended on qt5 webengine"; # Added 2026-02-10
   orderedset = throw "orderedset has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   orm = throw "orm has been removed as it is unmaintained"; # added 2025-08-27
   paho-mqtt_2 = throw "'paho-mqtt_2' has been renamed to/replaced by 'paho-mqtt'"; # Converted to throw 2025-10-29
@@ -424,9 +432,12 @@ mapAliases {
   pyownet = throw "pyownet was removed because Home Assistant switched to aio-ownet"; # added 2025-10-31
   pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
   pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
+  pyqt5-stubs = throw "'pyqt5-stubs' has been removed as it was unused and depended on vulnerable qt5 webengine"; # Added 2026-01-15
+  pyqt5-webkit = throw "'pyqt5-webkit' has been removed as it depended on insecure&unmaintained qtwebkit"; # Added 2026-04-26
   pyqt5_sip = throw "'pyqt5_sip' has been renamed to/replaced by 'pyqt5-sip'"; # Converted to throw 2025-10-29
   pyqt5_with_qtmultimedia = throw "'pyqt5_with_qtmultimedia' has been renamed to/replaced by 'pyqt5-multimedia'"; # Converted to throw 2025-10-29
-  pyqt5_with_qtwebkit = throw "'pyqt5_with_qtwebkit' has been renamed to/replaced by 'pyqt5-webkit'"; # Converted to throw 2025-10-29
+  pyqt5_with_qtwebkit = throw "'pyqt5_with_qtwebkit' has been removed as it depended on insecure&unmaintained qtwebkit"; # Added 2026-04-26
+  pyqtwebengine = "'pyqtwebengine' has been removed as it depended on the removed qt5 webengine"; # Added 2026-02-10
   pyramid_beaker = throw "'pyramid_beaker' has been renamed to/replaced by 'pyramid-beaker'"; # Converted to throw 2025-10-29
   pyramid_chameleon = throw "'pyramid_chameleon' has been renamed to/replaced by 'pyramid-chameleon'"; # Converted to throw 2025-10-29
   pyramid_exclog = throw "'pyramid_exclog' has been renamed to/replaced by 'pyramid-exclog'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 54eb41cdff2c..5d6657fb3a3b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -722,6 +722,8 @@ self: super: with self; {
 
   amcrest = callPackage ../development/python-modules/amcrest { };
 
+  amd-aiter = callPackage ../development/python-modules/amd-aiter { };
+
   amd-quark = callPackage ../development/python-modules/amd-quark { };
 
   amdsmi = toPythonModule (
@@ -3634,6 +3636,8 @@ self: super: with self; {
 
   datasets = callPackage ../development/python-modules/datasets { };
 
+  datasets_3 = callPackage ../development/python-modules/datasets/3.nix { };
+
   datasette = callPackage ../development/python-modules/datasette { };
 
   datasette-publish-fly = callPackage ../development/python-modules/datasette-publish-fly { };
@@ -4984,8 +4988,6 @@ self: super: with self; {
 
   email-validator = callPackage ../development/python-modules/email-validator { };
 
-  emailthreads = callPackage ../development/python-modules/emailthreads { };
-
   embedding-reader = callPackage ../development/python-modules/embedding-reader { };
 
   emborg = callPackage ../development/python-modules/emborg { };
@@ -5014,6 +5016,8 @@ self: super: with self; {
 
   encodec = callPackage ../development/python-modules/encodec { };
 
+  encutils = callPackage ../development/python-modules/encutils { };
+
   energyflip-client = callPackage ../development/python-modules/energyflip-client { };
 
   energyflow = callPackage ../development/python-modules/energyflow { };
@@ -5192,6 +5196,8 @@ self: super: with self; {
 
   ewmhlib = callPackage ../development/python-modules/ewmhlib { };
 
+  exa-py = callPackage ../development/python-modules/exa-py { };
+
   example-robot-data = callPackage ../development/python-modules/example-robot-data {
     inherit (pkgs) example-robot-data;
   };
@@ -5627,6 +5633,8 @@ self: super: with self; {
 
   flash-attn = callPackage ../development/python-modules/flash-attn { };
 
+  flash-mla = callPackage ../development/python-modules/flash-mla { };
+
   flashinfer = callPackage ../development/python-modules/flashinfer { };
 
   flashtext = callPackage ../development/python-modules/flashtext { };
@@ -7150,8 +7158,6 @@ self: super: with self; {
 
   housekeeping = callPackage ../development/python-modules/housekeeping { };
 
-  howdoi = callPackage ../development/python-modules/howdoi { };
-
   hpack = callPackage ../development/python-modules/hpack { };
 
   hpccm = callPackage ../development/python-modules/hpccm { };
@@ -7246,6 +7252,8 @@ self: super: with self; {
 
   httpx-oauth = callPackage ../development/python-modules/httpx-oauth { };
 
+  httpx-retries = callPackage ../development/python-modules/httpx-retries { };
+
   httpx-socks = callPackage ../development/python-modules/httpx-socks { };
 
   httpx-sse = callPackage ../development/python-modules/httpx-sse { };
@@ -7402,8 +7410,6 @@ self: super: with self; {
 
   idna = callPackage ../development/python-modules/idna { };
 
-  idna-ssl = callPackage ../development/python-modules/idna-ssl { };
-
   idrive-e2-client = callPackage ../development/python-modules/idrive-e2-client { };
 
   idstools = callPackage ../development/python-modules/idstools { };
@@ -10194,8 +10200,6 @@ self: super: with self; {
 
   monkeyhex = callPackage ../development/python-modules/monkeyhex { };
 
-  monkeytype = callPackage ../development/python-modules/monkeytype { };
-
   monosat = callPackage pkgs.monosat.python { };
 
   monotonic = callPackage ../development/python-modules/monotonic { };
@@ -11134,6 +11138,10 @@ self: super: with self; {
 
   nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { };
 
+  nixl = callPackage ../development/python-modules/nixl {
+    nixl = pkgs.nixl.override { python3Packages = self; };
+  };
+
   nixpkgs-plugin-update = callPackage ../development/python-modules/nixpkgs-plugin-update { };
 
   nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { };
@@ -11188,8 +11196,6 @@ self: super: with self; {
 
   nominatim-api = callPackage ../by-name/no/nominatim/nominatim-api.nix { };
 
-  nonbloat-db = callPackage ../development/python-modules/nonbloat-db { };
-
   noneprompt = callPackage ../development/python-modules/noneprompt { };
 
   nonestorage = callPackage ../development/python-modules/nonestorage { };
@@ -11847,6 +11853,8 @@ self: super: with self; {
 
   optax = callPackage ../development/python-modules/optax { };
 
+  optiland = callPackage ../development/python-modules/optiland { };
+
   optimistix = callPackage ../development/python-modules/optimistix { };
 
   optimum = callPackage ../development/python-modules/optimum { };
@@ -11869,12 +11877,6 @@ self: super: with self; {
 
   oralb-ble = callPackage ../development/python-modules/oralb-ble { };
 
-  orange-canvas-core = callPackage ../development/python-modules/orange-canvas-core { };
-
-  orange-widget-base = callPackage ../development/python-modules/orange-widget-base { };
-
-  orange3 = callPackage ../development/python-modules/orange3 { };
-
   oras = callPackage ../development/python-modules/oras { };
 
   orbax-checkpoint = callPackage ../development/python-modules/orbax-checkpoint { };
@@ -12660,6 +12662,24 @@ self: super: with self; {
 
   plotpy = callPackage ../development/python-modules/plotpy { };
 
+  # Plover 5 moves from PyQt5 to PySide6,
+  # which is a backward-incompatible change to praphical plugins.
+  # Use Plover 4 for now (2026-04-26),
+  # as the upstream still warns about this in every Plover 5 release,
+  # List of unsupported plugins:
+  # https://github.com/opensteno/plover_plugins_registry/blob/master/unsupported.json
+  plover = plover_4;
+
+  plover-stroke = callPackage ../development/python-modules/plover-stroke { };
+
+  plover_4 = callPackage ../development/python-modules/plover/4.nix {
+    inherit (pkgs.libsForQt5) wrapQtAppsHook;
+  };
+
+  plover_5 = callPackage ../development/python-modules/plover/5.nix {
+    inherit (pkgs.qt6) qtbase wrapQtAppsHook;
+  };
+
   pluggy = callPackage ../development/python-modules/pluggy { };
 
   pluginbase = callPackage ../development/python-modules/pluginbase { };
@@ -13215,6 +13235,8 @@ self: super: with self; {
 
   py-pdf-parser = callPackage ../development/python-modules/py-pdf-parser { };
 
+  py-radix = callPackage ../development/python-modules/py-radix { };
+
   py-radix-sr = callPackage ../development/python-modules/py-radix-sr { };
 
   py-rust-stemmers = callPackage ../development/python-modules/py-rust-stemmers { };
@@ -14730,13 +14752,6 @@ self: super: with self; {
     inherit (pkgs) mesa;
   };
 
-  pyqt5-stubs = callPackage ../development/python-modules/pyqt5-stubs { };
-
-  # `pyqt5-webkit` should not be used by python libraries in
-  # pkgs/development/python-modules/*. Putting this attribute in
-  # `propagatedBuildInputs` may cause collisions.
-  pyqt5-webkit = self.pyqt5.override { withWebKit = true; };
-
   pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix {
     inherit (pkgs) mesa;
   };
@@ -14781,10 +14796,6 @@ self: super: with self; {
 
   pyqtgraph = callPackage ../development/python-modules/pyqtgraph { };
 
-  pyqtwebengine = callPackage ../development/python-modules/pyqtwebengine {
-    inherit (pkgs) mesa;
-  };
-
   pyquaternion = callPackage ../development/python-modules/pyquaternion { };
 
   pyquery = callPackage ../development/python-modules/pyquery { };
@@ -15260,6 +15271,8 @@ self: super: with self; {
 
   pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { };
 
+  pytest-assume = callPackage ../development/python-modules/pytest-assume { };
+
   pytest-astropy = callPackage ../development/python-modules/pytest-astropy { };
 
   pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { };
@@ -16700,7 +16713,7 @@ self: super: with self; {
 
   reflex-chakra = callPackage ../development/python-modules/reflex-chakra { };
 
-  reflex-hosting-cli = callPackage ../development/python-modules/reflex-hosting-cli { };
+  inherit (reflex.subPkgs) reflex-hosting-cli;
 
   reflink = callPackage ../development/python-modules/reflink { };
 
@@ -16830,6 +16843,8 @@ self: super: with self; {
 
   requests-ratelimiter = callPackage ../development/python-modules/requests-ratelimiter { };
 
+  requests-sse = callPackage ../development/python-modules/requests-sse { };
+
   requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { };
 
   requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { };
@@ -16892,6 +16907,8 @@ self: super: with self; {
 
   reverse-geocode = callPackage ../development/python-modules/reverse-geocode { };
 
+  rf-protocols = callPackage ../development/python-modules/rf-protocols { };
+
   rfc3161-client = callPackage ../development/python-modules/rfc3161-client { };
 
   rfc3339 = callPackage ../development/python-modules/rfc3339 { };
@@ -16918,6 +16935,8 @@ self: super: with self; {
 
   rflink = callPackage ../development/python-modules/rflink { };
 
+  rgbxy = callPackage ../development/python-modules/rgbxy { };
+
   rgpio = toPythonModule (
     pkgs.lgpio.override {
       inherit buildPythonPackage;
@@ -17151,6 +17170,8 @@ self: super: with self; {
 
   rtb-data = callPackage ../development/python-modules/rtb-data { };
 
+  rtf-tokenize = callPackage ../development/python-modules/rtf-tokenize { };
+
   rtfde = callPackage ../development/python-modules/rtfde { };
 
   rtfunicode = callPackage ../development/python-modules/rtfunicode { };
@@ -17187,6 +17208,8 @@ self: super: with self; {
 
   ruff-api = callPackage ../development/python-modules/ruff-api { };
 
+  ruff-format = callPackage ../development/python-modules/ruff-format { };
+
   rules = callPackage ../development/python-modules/rules { };
 
   rumps = callPackage ../development/python-modules/rumps { };
@@ -17457,6 +17480,8 @@ self: super: with self; {
 
   seatconnect = callPackage ../development/python-modules/seatconnect { };
 
+  sebaubuntu-libs = callPackage ../development/python-modules/sebaubuntu-libs { };
+
   seccomp = callPackage ../development/python-modules/seccomp { };
 
   secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1; };
@@ -17662,6 +17687,10 @@ self: super: with self; {
     callPackage ../development/python-modules/shiboken6 { inherit (pkgs) cmake llvmPackages; }
   );
 
+  shiboken6-generator = toPythonModule (
+    callPackage ../development/python-modules/shiboken6-generator { inherit (pkgs) cmake llvmPackages; }
+  );
+
   shimmy = callPackage ../development/python-modules/shimmy { };
 
   shiny = callPackage ../development/python-modules/shiny { };
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 0daf7f661e54..1a52c4faa1be 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -108,10 +108,6 @@ makeScopeWithSplicing' {
 
         liblastfm = callPackage ../development/libraries/liblastfm { };
 
-        libopenshot = callPackage ../development/libraries/libopenshot { };
-
-        libopenshot-audio = callPackage ../development/libraries/libopenshot-audio { };
-
         libqglviewer = callPackage ../development/libraries/libqglviewer { };
 
         libqofono = callPackage ../development/libraries/libqofono { };
@@ -223,8 +219,6 @@ makeScopeWithSplicing' {
 
         telepathy = callPackage ../development/libraries/telepathy/qt { };
 
-        qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
-
         signond = callPackage ../development/libraries/signond { };
 
         timed = callPackage ../applications/system/timed { };
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 94d921fe217f..48cf97bd9653 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -66,9 +66,7 @@ let
     ghc948
     ghc967
     ghc984
-    ghc9102
     ghc9103
-    ghc9122 # TODO(@sternenseemann): drop
     ghc9123
   ];
 
@@ -527,7 +525,6 @@ let
       ] released;
       Cabal_3_10_3_0 = lib.subtractLists [
         # time < 1.13 conflicts with time == 1.14.*
-        compilerNames.ghc9122
         compilerNames.ghc9123
       ] released;
       Cabal_3_12_1_0 = released;
@@ -536,12 +533,12 @@ let
       cabal2nix = released;
       cabal2nix-unstable = released;
       funcmp = released;
+      haskell-debugger = [
+        compilerNames.ghc9141
+      ];
       haskell-language-server = released;
       hoogle = released;
       hlint = lib.subtractLists [
-        compilerNames.ghc9102
-        compilerNames.ghc9103
-        compilerNames.ghc9122
         compilerNames.ghc9123
       ] released;
       hpack = released;
@@ -554,24 +551,22 @@ let
       ghc-lib-parser = released;
       ghc-lib-parser-ex = released;
       ghc-source-gen = lib.subtractLists [
-        compilerNames.ghc9122
         compilerNames.ghc9123
       ] released;
       ghc-tags = lib.subtractLists [
-        compilerNames.ghc9122
         compilerNames.ghc9123
       ] released;
       hashable = released;
       primitive = released;
+      scrod = [
+        compilerNames.ghc9141
+      ];
       semaphore-compat = [
         # Compiler < 9.8 don't have the semaphore-compat core package, but
         # requires unix >= 2.8.1.0 which implies GHC >= 9.6 for us.
         compilerNames.ghc967
       ];
       weeder = lib.subtractLists [
-        compilerNames.ghc9102
-        compilerNames.ghc9103
-        compilerNames.ghc9122
         compilerNames.ghc9123
       ] released;
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 089094edd990..4c02d11a9169 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -45,8 +45,8 @@
       # so users choosing to allow don't have to rebuild them every time.
       permittedInsecurePackages = [
         "olm-3.2.16" # see PR #347899
-        "kanidm_1_7-1.7.4"
-        "kanidmWithSecretProvisioning_1_7-1.7.4"
+        "kanidm_1_8-1.8.6"
+        "kanidmWithSecretProvisioning_1_8-1.8.6"
       ];
     };